From peter at korsgaard.com Thu Feb 1 11:00:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 01 Feb 2024 12:00:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpsl: fix legal info In-Reply-To: <20240131204704.2099316-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 21:47:04 +0100") References: <20240131204704.2099316-1-fontaine.fabrice@gmail.com> Message-ID: <87h6iswith.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 863131cad9fec0a54a4b4281f5fa3cd5ed8ea462 forgot to update hash of > COPYING (update in year with: > https://github.com/rockdaboot/libpsl/commit/80c17cc237861318a680ae170995d44a11029dad) > Fixes: > - http://autobuild.buildroot.org/results/2b09ca88a08fdba8ca75153688ed5dd9362c7520 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 1 11:01:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 01 Feb 2024 12:01:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/cpio: fix tar.bz2 hash In-Reply-To: <20240131211939.2222338-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 22:19:39 +0100") References: <20240131211939.2222338-1-fontaine.fabrice@gmail.com> Message-ID: <87cytgwiru.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit b0306d94b29d6f5e08735db0448019f9f4e4234b forgot to update > cpio-2.13.tar.bz2 to cpio-2.14.tar.bz2 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 1 11:01:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 01 Feb 2024 12:01:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.11.5 In-Reply-To: <20240131210645.2212414-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 22:06:45 +0100") References: <20240131210645.2212414-1-fontaine.fabrice@gmail.com> Message-ID: <878r44wir0.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2024-22211 > - Update Upstream tag in patches > https://github.com/FreeRDP/FreeRDP/blob/2.11.5/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 1 11:02:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 12:02:36 +0100 Subject: [Buildroot] [PATCH 1/2] package/glibc: add CVE ignore for CVE-2023-4806 In-Reply-To: <20240131081254.175261-1-peter@korsgaard.com> References: <20240131081254.175261-1-peter@korsgaard.com> Message-ID: <93dd1849-3725-4bf1-b411-55f175e40471@korsgaard.com> On 31/01/2024 09.12, Peter Korsgaard wrote: > Commit 8519de517e22 (package/{glibc, localedef}: security bump to version > glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701) correctly mentioned > CVE-2023-4806 in the commit message, but forgot to add an ignore for it. > > Fix that. > > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 1 11:02:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 12:02:53 +0100 Subject: [Buildroot] [PATCH 2/2] package/{glibc, localedef}: security bump to version glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 In-Reply-To: <20240131081254.175261-2-peter@korsgaard.com> References: <20240131081254.175261-1-peter@korsgaard.com> <20240131081254.175261-2-peter@korsgaard.com> Message-ID: <9a26b0d0-120f-4ff9-b72f-7b99edbca93c@korsgaard.com> On 31/01/2024 09.12, Peter Korsgaard wrote: > Fixed the following security issues: > > CVE-2023-6246: syslog: Fix heap buffer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD > > CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD > > CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD > > For details, see the Qualys advisory: > https://www.openwall.com/lists/oss-security/2024/01/30/6 > > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 1 11:00:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 12:00:58 +0100 Subject: [Buildroot] [git commit] package/cpio: fix tar.bz2 hash Message-ID: <20240201110345.11E3F866FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0694cef47b4942447fa8532f55e11e5fcae48f2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit b0306d94b29d6f5e08735db0448019f9f4e4234b forgot to update cpio-2.13.tar.bz2 to cpio-2.14.tar.bz2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cpio/cpio.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cpio/cpio.hash b/package/cpio/cpio.hash index 20fd9392e7..c67fbc1f61 100644 --- a/package/cpio/cpio.hash +++ b/package/cpio/cpio.hash @@ -1,6 +1,6 @@ # From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00001.html sha1 cbac50a61079b6f3bdcf9ffe42171d9257cfe877 cpio-2.14.tar.bz2 # Locally calculated after checking pgp signature -sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.13.tar.bz2 +sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.14.tar.bz2 # Locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING From peter at korsgaard.com Thu Feb 1 10:58:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 11:58:42 +0100 Subject: [Buildroot] [git commit] package/glibc: add CVE ignore for CVE-2023-4806 Message-ID: <20240201110344.E3D6D866F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62b767fd3ed27d245937066f77ec53bd0b1e9329 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 8519de517e22 (package/{glibc, localedef}: security bump to version glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701) correctly mentioned CVE-2023-4806 in the commit message, but forgot to add an ignore for it. Fix that. Signed-off-by: Peter Korsgaard --- package/glibc/glibc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 596697bb8f..d49da6457c 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -28,6 +28,10 @@ GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) # 2.38 and the version we're really using GLIBC_IGNORE_CVES += CVE-2023-4527 +# Fixed by 5ee59ca371b99984232d7584fe2b1a758b4421d3, which is between +# 2.38 and the version we're really using +GLIBC_IGNORE_CVES += CVE-2023-4806 + # Fixed by 750a45a783906a19591fb8ff6b7841470f1f5710, which is between # 2.38 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-4911 From peter at korsgaard.com Thu Feb 1 10:58:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 11:58:51 +0100 Subject: [Buildroot] [git commit] package/{glibc, localedef}: security bump to version glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 Message-ID: <20240201110344.EE01B864DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75e7c7ba8cddb2644350a7f59c943f5c4e99b3b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: CVE-2023-6246: syslog: Fix heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD For details, see the Qualys advisory: https://www.openwall.com/lists/oss-security/2024/01/30/6 Signed-off-by: Peter Korsgaard --- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 14 +++++++++++++- package/localedef/localedef.mk | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 00d9f1c985..15ae55b9e6 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 fd991e43997ff6e4994264c3cbc23fa87fa28b1b3c446eda8fc2d1d3834a2cfb glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701.tar.gz +sha256 e38f4284d6909c6b5db7d79c6e450daeaf136a67e547290eec0b063a55eaaa42 glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d49da6457c..d198d6f04c 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701 +GLIBC_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -40,6 +40,18 @@ GLIBC_IGNORE_CVES += CVE-2023-4911 # 2.38 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-5156 +# Fixed by 23514c72b780f3da097ecf33a793b7ba9c2070d2, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6246 + +# Fixed by d0338312aace5bbfef85e03055e1212dd0e49578, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6779 + +# Fixed by d37c2b20a4787463d192b32041c3406c2bd91de0, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6780 + # All these CVEs are considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index ed6d4b4968..c017c0e00e 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701 +LOCALEDEF_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From peter at korsgaard.com Thu Feb 1 11:01:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 12:01:23 +0100 Subject: [Buildroot] [git commit] package/freerdp: security bump to version 2.11.5 Message-ID: <20240201110345.20F4486704@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dbe037dc9998155373b0a96687c55982f9c1a536 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fix CVE-2024-22211 - Update Upstream tag in patches https://github.com/FreeRDP/FreeRDP/blob/2.11.5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 --- package/freerdp/0001-Fix-variable-declaration-in-loop.patch | 3 +-- package/freerdp/0002-Fixed-variable-declaration-in-loop.patch | 3 +-- .../freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch | 2 +- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 55a55752a2..a95aaf262c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -415,9 +415,6 @@ package/flite/0001-fix-alsa-static.patch Upstream package/fltk/0001-disable-tests.patch Upstream package/fluxbox/0001-fixes-bug-1138.patch Upstream package/freeradius-client/0001-fix-for-nettle.patch Upstream -package/freerdp/0001-Fix-variable-declaration-in-loop.patch Upstream -package/freerdp/0002-Fixed-variable-declaration-in-loop.patch Upstream -package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch Upstream package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch Upstream package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch Upstream package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables diff --git a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch index a391e42ee6..799a92734b 100644 --- a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch +++ b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: Armin Novak Date: Wed, 16 Sep 2020 09:30:37 +0200 Subject: [PATCH] Fix variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 3 ++- diff --git a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch index 14e1d6c8f4..1a4e899430 100644 --- a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch +++ b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: akallabeth Date: Tue, 22 Sep 2020 07:43:56 +0200 Subject: [PATCH] Fixed variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 4 ++-- diff --git a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch index d8dfe13d1b..63434e58f7 100644 --- a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch +++ b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/31e770a330158035e24b7b952bec0030138482b7 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FreeRDP/FreeRDP/pull/7205] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/0976cce458f2281cef6e8c417daf4bbd22bcc087 --- winpr/include/winpr/file.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 02268f55ea..daf933e0af 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.0.tar.gz.sha256 -sha256 8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e freerdp-2.11.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.5.tar.gz.sha256 +sha256 70785ad9934d75aed1734f8918a05aff95788e58e53081e84651106b24303dc2 freerdp-2.11.5.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 6f71ef796f..29b33f61c3 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.0 +FREERDP_VERSION = 2.11.5 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From peter at korsgaard.com Thu Feb 1 10:59:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 11:59:22 +0100 Subject: [Buildroot] [git commit] package/libpsl: fix legal info Message-ID: <20240201110345.05719866FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ffb716da34a4c2c87fe47f6cce7b718d5217354 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 863131cad9fec0a54a4b4281f5fa3cd5ed8ea462 forgot to update hash of COPYING (update in year with: https://github.com/rockdaboot/libpsl/commit/80c17cc237861318a680ae170995d44a11029dad) Fixes: - http://autobuild.buildroot.org/results/2b09ca88a08fdba8ca75153688ed5dd9362c7520 Signed-off-by: Fabrice Fontaine Reviewed-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/libpsl/libpsl.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash index d800ba6a77..caf760c496 100644 --- a/package/libpsl/libpsl.hash +++ b/package/libpsl/libpsl.hash @@ -2,5 +2,5 @@ sha256 1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208 libpsl-0.21.5.tar.gz # Hashes for license files: -sha256 776cd11d54f0ea3e5efdd25ff1a0d952a1744215bb5858ea7aeb91808e70c9f7 COPYING +sha256 322392e6001b2b3b0fca705dc9f11f26e12441188ecde50eb1d22909980b2925 COPYING sha256 1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3 src/LICENSE.chromium From thierry.bultel at linatsea.fr Thu Feb 1 12:41:48 2024 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Thu, 1 Feb 2024 13:41:48 +0100 Subject: [Buildroot] dracut: no longer works since bump to 059 Message-ID: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> Hi, since bump to this version, invocation of 'ldd' wrapper fails in dracut-install. After analysis, this is because version uses "execlp" for launching the 'ldd' wrapper variable, which in out case consists in the executable name + the rootfs argument, leading to the fault. Version 057 used to call "popen" instead that what Ok with that. Thierry -- Re: test www.linatsea.fr -- www.linatsea.fr -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: penguin.png Type: image/png Size: 60087 bytes Desc: not available URL: From thierry.bultel at linatsea.fr Thu Feb 1 13:07:48 2024 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Thu, 1 Feb 2024 14:07:48 +0100 Subject: [Buildroot] Systemd unit complains about cgroup with 5.15.x kernel Message-ID: <9a9a9c97-156a-49e1-bdcd-43ed22580778@linatsea.fr> Hi, I am using systemd 254.5, buildroot and currently using a kernel vendor branch : git at github.com:varigit/linux-imx.git lf-5.15.y_var01 imx_v7_defconfig I have verified that every options fixed by SYSTEM_CONFIG_FIXUPS have been set accordingly ---> systemd is failing to start some units: systemd[1]: wpa_supplicant.service: Failed to create cgroup /system.slice/wpa_supplicant.service: No such file or directory and also; ?(agetty)[217]: serial-getty at ttymxc0.service: Failed to attach to cgroup /system.slice/system-serial\x2dgetty.slice/serial-getty at ttymxc0.service: No medium found ... and I do not have a serial console. I am currently digging into systemd code to find out what is possibly wrong .. but if anyone gets a clue, I would appreciate ! Thanks ! Thierry -- Re: test From qiusihao23 at mails.ucas.ac.cn Thu Feb 1 15:11:37 2024 From: qiusihao23 at mails.ucas.ac.cn (=?UTF-8?B?6YKx5oCd6LGq?=) Date: Thu, 1 Feb 2024 23:11:37 +0800 (GMT+08:00) Subject: [Buildroot] Use Clang as toolchain for buildroot Message-ID: <524bf2c.ae1d.18d6539b773.Coremail.qiusihao23@mails.ucas.ac.cn> Hi, I am new to the embedding things, and I'm looking to use buildroot to get c/c++ packages compiled with multiple parameters like compiler, architecture and optimization level, for academic purpose. E.g, in my dataset, Binutils 2.32 will be compiled in [gcc11, arm64, O0], [gcc11, arm64, O1], ... along with other variable settings. I noticed that buildroot can set most of variables in .config file, but regarding adding external toolchains, information are relatively insufficient. I would like to know if there are some ways to add compilers like clang into the phase of building target packages. -------------- next part -------------- An HTML attachment was scrubbed... URL: From qiusihao23 at mails.ucas.ac.cn Thu Feb 1 15:26:03 2024 From: qiusihao23 at mails.ucas.ac.cn (=?UTF-8?B?6YKx5oCd6LGq?=) Date: Thu, 1 Feb 2024 23:26:03 +0800 (GMT+08:00) Subject: [Buildroot] Use Clang as toolchain for buildroot Message-ID: <7b899b93.ae5f.18d6546ee9a.Coremail.qiusihao23@mails.ucas.ac.cn> Hi, I'm not sure if my original letter sent by my another mail account reached properly, I'm sorry if this is a duplicate one. I'm new to the embedding things, and I'm looking to use buildroot to get c/c++ packages compiled with multiple parameters like compiler, architecture and optimization level, for academic purpose. E.g, in my dataset, Binutils 2.32 will be compiled in [gcc11, arm64, O0], [gcc11, arm64, O1], ... along with other variable settings. I noticed that buildroot can set most of variables in .config file, but regarding adding external toolchains, information are relatively insufficient. I would like to know if there are some ways to add compilers like clang into the phase of building target packages. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Thu Feb 1 17:20:51 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:20:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvips: update LIBVIPS_CPE_ID_VENDOR Message-ID: <20240201172051.165994-1-fontaine.fabrice@gmail.com> cpe:2.3:a:libvips_project:libvips has been deprecated in favor of cpe:2.3:a:libvips:libvips in September 2023: libvips Project libvips 8.10.6 - Project Change Log Signed-off-by: Fabrice Fontaine --- package/libvips/libvips.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 1a0f9d5ead..8eb1f0964e 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -9,7 +9,7 @@ LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -LIBVIPS_CPE_ID_VENDOR = libvips_project +LIBVIPS_CPE_ID_VENDOR = libvips # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 17:42:05 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:42:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR Message-ID: <20240201174205.180556-1-fontaine.fabrice@gmail.com> cpe:2.3:a:kernel:wireless-regdb added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb Signed-off-by: Fabrice Fontaine --- package/wireless-regdb/wireless-regdb.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index e9003ce2e6..5c8ef96398 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -9,7 +9,6 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE -WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 17:44:32 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:44:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR Message-ID: <20240201174432.182161-1-fontaine.fabrice@gmail.com> cpe:2.3:a:kernel:linux-firmware added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware Signed-off-by: Fabrice Fontaine --- package/linux-firmware/linux-firmware.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 58fbaab1d7..60e8861abe 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel - # Intel SST DSP ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 17:46:41 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:46:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/crda: drop CRDA_CPE_ID_VENDOR Message-ID: <20240201174641.183601-1-fontaine.fabrice@gmail.com> cpe:2.3:a:kernel:crda added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda Signed-off-by: Fabrice Fontaine --- package/crda/crda.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/crda/crda.mk b/package/crda/crda.mk index a73c9aa26d..8043260cfc 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -9,7 +9,6 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE -CRDA_CPE_ID_VENDOR = kernel define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 17:48:29 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:48:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/depot-tools: drop DEPOT_TOOLS_CPE_ID_VENDOR Message-ID: <20240201174829.184788-1-fontaine.fabrice@gmail.com> cpe:2.3:a:google:depot-tools added by commit 48730a1a9d882a7c56146bd2955e074aed790dcb has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:google:depot-tools Signed-off-by: Fabrice Fontaine --- package/depot-tools/depot-tools.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index 634258ffbb..a53afa14d6 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -9,7 +9,6 @@ DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause DEPOT_TOOLS_LICENSE_FILES = LICENSE -DEPOT_TOOLS_CPE_ID_VENDOR = google HOST_DEPOT_TOOLS_DEPENDENCIES = \ host-python3 \ -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 17:52:02 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:52:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpfr: fix CPE variables Message-ID: <20240201175202.186929-1-fontaine.fabrice@gmail.com> cpe:2.3:a:gnu:mpfr added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE identifier for this package cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF Signed-off-by: Fabrice Fontaine --- package/mpfr/mpfr.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 8d12c7502b..c0c8c04646 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -9,7 +9,8 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER -MPFR_CPE_ID_VENDOR = gnu +MPFR_CPE_ID_VENDOR = mpfr +MPFR_CPE_ID_PRODUCT = gnu_mpfr MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 21:43:04 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 22:43:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: fix CPE variable Message-ID: <20240201214304.301544-1-fontaine.fabrice@gmail.com> Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR Signed-off-by: Fabrice Fontaine --- package/lvm2/lvm2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index ee43cb6c19..02ea748439 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB -LVM2_CPE_ID_PRODUCT = redhat +LVM2_CPE_ID_VENDOR = redhat LVM2_SELINUX_MODULES = lvm # Make sure that binaries and libraries are installed with write -- 2.43.0 From kris at embeddedts.com Thu Feb 1 21:59:54 2024 From: kris at embeddedts.com (Kris Bahnsen) Date: Thu, 01 Feb 2024 13:59:54 -0800 Subject: [Buildroot] [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 Message-ID: <399bbbdbc865bb5fab6fa7dbdad653f9aa240da2.camel@embeddedTS.com> >From 55e8d294997af933bb3d832b73229bebefa45044 Mon Sep 17 00:00:00 2001 From: Kris Bahnsen Date: Thu, 1 Feb 2024 20:46:39 +0000 Subject: [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 Release changelog: - Use default values for IQ calibration correction when the eFuse register has zero values. - Fix for "WILC1000 Firmware initialization issue" by updating the PMU clock switching sequence during firmware initialization. Signed-off-by: Kris Bahnsen --- package/wilc-firmware/wilc-firmware.hash | 2 +- package/wilc-firmware/wilc-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc-firmware/wilc-firmware.hash index 802cb4f9b1..8a7957a1d2 100644 --- a/package/wilc-firmware/wilc-firmware.hash +++ b/package/wilc-firmware/wilc-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0 wilc-firmware-wilc_linux_16_1.tar.gz +sha256 6cd5fc52150520bedb736f58124063041b4d9849ea33481a8b075f51aec64f8e wilc-firmware-wilc_linux_16_1_2.tar.gz sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc-firmware/wilc-firmware.mk index 12c825cf92..3381162bbd 100644 --- a/package/wilc-firmware/wilc-firmware.mk +++ b/package/wilc-firmware/wilc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -WILC_FIRMWARE_VERSION = wilc_linux_16_1 +WILC_FIRMWARE_VERSION = wilc_linux_16_1_2 WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) WILC_FIRMWARE_LICENSE = PROPRIETARY -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 1 22:16:59 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 23:16:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/minizip: fix CPE variables Message-ID: <20240201221659.320957-1-fontaine.fabrice@gmail.com> cpe:2.3:a:minizip_project:minizip added by commit 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 Signed-off-by: Fabrice Fontaine --- package/minizip/minizip.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 5a4d920369..819b33b701 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -14,7 +14,8 @@ MINIZIP_CONF_OPTS = \ -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project +MINIZIP_CPE_ID_VENDOR = zlib-ng +MINIZIP_CPE_ID_PRODUCT = minizip-ng ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 -- 2.43.0 From stefan at ott.net Fri Feb 2 02:02:57 2024 From: stefan at ott.net (Stefan Ott) Date: Fri, 2 Feb 2024 03:02:57 +0100 Subject: [Buildroot] [PATCH v3] package/sway: make systemd optional Message-ID: <20240202020258.600562-1-stefan@ott.net> Sway works perfectly fine without it. Signed-off-by: Stefan Ott --- Changes v2 -> v3: - Make BR2_PACKAGE_SWAY_SWAYBAR_TRAY depend on systemd and set sd-bus-provider=libsystemd if SWAY_SWAYBAR_TRAY is enabled Changes v1 -> v2: - Automatically enable systemd integration for builds with systemd support (suggested by Thomas Petazzoni) --- package/sway/Config.in | 10 ++++++---- package/sway/sway.mk | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/sway/Config.in b/package/sway/Config.in index 4f6d9fb215..f11c473fa8 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_SWAY bool "sway" - depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider depends on !BR2_STATIC_LIBS # wlroots depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wlroots depends on BR2_PACKAGE_HAS_LIBEGL # wlroots @@ -42,9 +41,13 @@ if BR2_PACKAGE_SWAY_SWAYBAR config BR2_PACKAGE_SWAY_SWAYBAR_TRAY bool "swaybar tray" + depends on BR2_PACKAGE_SYSTEMD help Enable support for swaybar tray +comment "swaybar tray needs systemd" + depends on !BR2_PACKAGE_SYSTEMD + endif # BR2_PACKAGE_SWAY_SWAYBAR config BR2_PACKAGE_SWAY_SWAYNAG @@ -54,9 +57,8 @@ config BR2_PACKAGE_SWAY_SWAYNAG endif # BR2_PACKAGE_SWAY -comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" - depends on !BR2_PACKAGE_SYSTEMD || \ - !BR2_PACKAGE_HAS_UDEV || \ +comment "sway needs udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_HAS_UDEV || \ !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ !BR2_PACKAGE_HAS_LIBGLES diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 0aad9de712..87a01002f0 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -8,13 +8,12 @@ SWAY_VERSION = 1.8.1 SWAY_SITE = https://github.com/swaywm/sway/releases/download/$(SWAY_VERSION) SWAY_LICENSE = MIT SWAY_LICENSE_FILES = LICENSE -SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango +SWAY_DEPENDENCIES = host-pkgconf wlroots json-c pcre cairo pango SWAY_CONF_OPTS = \ -Dwerror=false \ -Dzsh-completions=false \ -Dfish-completions=false \ - -Dman-pages=disabled \ - -Dsd-bus-provider=libsystemd + -Dman-pages=disabled ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) SWAY_CONF_OPTS += -Dxwayland=enabled @@ -54,7 +53,8 @@ SWAY_CONF_OPTS += -Dswaynag=false endif ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y) -SWAY_CONF_OPTS += -Dtray=enabled +SWAY_DEPENDENCIES += systemd +SWAY_CONF_OPTS += -Dtray=enabled -Dsd-bus-provider=libsystemd else SWAY_CONF_OPTS += -Dtray=disabled endif -- 2.43.0 From qiusihao23 at mails.ucas.ac.cn Fri Feb 2 06:21:18 2024 From: qiusihao23 at mails.ucas.ac.cn (=?UTF-8?B?6YKx5oCd6LGq?=) Date: Fri, 2 Feb 2024 14:21:18 +0800 (GMT+08:00) Subject: [Buildroot] Is host-clang available for compiling other packages In-Reply-To: <7b899b93.ae5f.18d6546ee9a.Coremail.qiusihao23@mails.ucas.ac.cn> References: <7b899b93.ae5f.18d6546ee9a.Coremail.qiusihao23@mails.ucas.ac.cn> Message-ID: <2a6ae556.25c81.18d687a8cb8.Coremail.qiusihao23@mails.ucas.ac.cn> I noticed that there is a 'host-clang' package. I wonder if it can be used when compiling other packages. For now, I simply add 'CC = "$(HOST_DIR)/bin/clang" in some packages' .mk file, but seem no use when compiling. The folder generated after 'make host-clang' cannot be used for sysroot either. -----????----- ???:"???" ????:2024-02-01 23:26:03 (???) ???: buildroot at buildroot.org ??: ??: Use Clang as toolchain for buildroot Hi, I'm not sure if my original letter sent by my another mail account reached properly, I'm sorry if this is a duplicate one. I'm new to the embedding things, and I'm looking to use buildroot to get c/c++ packages compiled with multiple parameters like compiler, architecture and optimization level, for academic purpose. E.g, in my dataset, Binutils 2.32 will be compiled in [gcc11, arm64, O0], [gcc11, arm64, O1], ... along with other variable settings. I noticed that buildroot can set most of variables in .config file, but regarding adding external toolchains, information are relatively insufficient. I would like to know if there are some ways to add compilers like clang into the phase of building target packages. -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Fri Feb 2 06:53:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 02 Feb 2024 06:53:45 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-01 Message-ID: <20240202065351.6074440AA5@smtp2.osuosl.org> Hello, Autobuild statistics for 2024-02-01 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 0 | 3 | 0 | 3 | 2023.11.x | 1 | 3 | 0 | 4 | master | 33 | 50 | 0 | 83 | Classification of failures by reason for master ----------------------------------------------- libressl-3.8.2 | 6 axel-2.17.12 | 4 stunnel-5.71 | 4 attr-2.5.2 | 3 host-rust-1.74.1 | 3 linux-5.10.162-cip24-rt10 | 2 linux-6.6.14 | 2 openssh-9.6p1 | 2 package/libpsl/libpsl.mk:33... | 2 elfutils-0.189 | 1 fs/jffs2/jffs2.mk:71: /home... | 1 glibc-2.38-27-g750a45a78390... | 1 glibc-2.38-44-gd37c2b20a478... | 1 glibmm-2.76.0 | 1 gobject-introspection-1.76.1 | 1 host-sentry-cli-2.20.3 | 1 ipmitool-1_8_19 | 1 kvmtool-f77d646ba01d04be5aa... | 1 libcamera-apps-1.2.1 | 1 libtracefs-1.8.0 | 1 linux-5.10.162-cip24 | 1 lttng-modules-2.13.10 | 1 Makefile:727: target-finalize | 1 memtest86-6.20 | 1 ngrep-1.47 | 1 rygel-0.40.2 | 1 samba4-4.19.3 | 1 tcf-agent-1.8.0 | 1 unknown | 1 wampcc-1.6 | 1 zeek-4.1.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/9af7e787e8077936b1a05259f729582a9614b2af | microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/790d67ae8ea9e8fbc8ed8cdd328b9532bb100607 | microblaze | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/0a77d44e6eb2f91c9d4388ddb45a04922dd51b16 | x86_64 | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/662fa6c7782f5f7a9f22de33bd5bec8c3291aa08 | arceb | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/a0aea4bbdebd5de6f76ffe6e51c6e10248fd97ba | arm | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/0a1298ef932038a7424546d7008797bf59c7d42c | or1k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/4f7e1014a63e969ed01ed48cfeb82cdb0e8830d9 | microblazeel | elfutils-0.189 | NOK | http://autobuild.buildroot.net/results/6cfbaff48595f92e9dce9f886ea0f2401e49036f | ORPH arm | fs/jffs2/jffs2.mk:71: /home... | NOK | http://autobuild.buildroot.net/results/f03996539ddf219d274039f3dc29bcbf8c008ada | powerpc | glibc-2.38-27-g750a45a78390... | NOK | http://autobuild.buildroot.net/results/d2646173c7705f617cf3825cd728d8ae5b43c5f3 | arceb | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/69af5f9dac22874aeb3970e8875b9e913e3b3bdd | i686 | glibmm-2.76.0 | NOK | http://autobuild.buildroot.net/results/1486a0bde352dc7e555810d9e4741f0e95a5e333 | m68k | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/d15742461101ecc0c57b61126a3d9d8b73a2a34a | ORPH mipsel | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/80949b0782347964226daff0cb6070a6ff08f33d | sparc64 | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/d1d3149b131d147d9483884227086649e2b01f2d | aarch64 | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/f2755733475bc6e07e257ad40519591a41947db6 | xtensa | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/b98b846918ce8ed92e1afd7c1ca2ce98eb00a8d4 | nios2 | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/41b3ea01cd6639200508f5684b02af78e5562acf | i686 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/94282249b3be51322adae66911982f833b25c192 | ORPH x86_64 | libcamera-apps-1.2.1 | NOK | http://autobuild.buildroot.net/results/e6eecef2753bcf5b925acc2f5bbd313c169d5eb0 | or1k | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/ca5e1df65fb5c571c6448efb897b182fc7266734 | ORPH mips64el | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/ed379db9c4aa6b18cb66be632b8d0ba52e5f7197 | ORPH powerpc64le | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/918e1000aac7c22bb1dd4a5f7c189f4358eede11 | ORPH arceb | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/31f3479f2cac64440635eea3d9c55f90f701ff34 | ORPH arc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/5c2eb577770ce0fdcfef670d99902c29992c36d7 | ORPH sh4a | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/15ecb7a4b257f2bb74eaebc060eeef1aa463bf22 | ORPH mips64el | libtracefs-1.8.0 | NOK | http://autobuild.buildroot.net/results/21ee0fa42aaef4220cbcc0b7fc2c72029cdefab1 | aarch64_be | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/4a2cf86b3a3b8d85125db1c436a6c65927f93073 | ORPH or1k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/5bc0c9daaa34c037a0746805ab7ecb8d9a8ed681 | ORPH m68k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/b818ff6cbb6e69b6bd8f5187778cf641821858bc | ORPH mipsel | linux-6.6.14 | NOK | http://autobuild.buildroot.net/results/62b336d0f8cb23e276685e6322cbc42a715e9542 | ORPH powerpc | linux-6.6.14 | NOK | http://autobuild.buildroot.net/results/d4d7397ef1d858ea3fcf42945b42881938cff63b | ORPH mips64el | lttng-modules-2.13.10 | NOK | http://autobuild.buildroot.net/results/2988c4250697e33032e134abfe7dc6d29729d40e | aarch64_be | Makefile:727: target-finalize | NOK | http://autobuild.buildroot.net/results/d4d926952d5c6f1516762406b1cfa3bd00035966 | x86_64 | memtest86-6.20 | NOK | http://autobuild.buildroot.net/results/d1c29928fffd88aab08b462b045a07c0ee80651e | armeb | ngrep-1.47 | NOK | http://autobuild.buildroot.net/results/4e93773aa6d3a9659e0278769cbfe6e5dfe27513 | powerpc64 | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/48c925b17ce4b722c0706abb94cc69b2cced8292 | ORPH powerpc64 | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/77cf67c68b2e9205a2d6d0143650a6c28e6eb40b | ORPH sh4eb | package/libpsl/libpsl.mk:33... | NOK | http://autobuild.buildroot.net/results/92e260c94cd4014fb8aa0301c0f6d65797c62a36 | or1k | package/libpsl/libpsl.mk:33... | NOK | http://autobuild.buildroot.net/results/9ddf8f6c324687c3df14368f97cb8a7fab765e16 | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/42f5056c0fc18e73e8c92f257e4a05b894e8f297 | m68k | samba4-4.19.3 | NOK | http://autobuild.buildroot.net/results/1425154816d1b63aa106c98e3e365a0da502576a | aarch64_be | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/3c6f8fb2c78967a19bc1ad856fe5f8ff3535773c | powerpc64 | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/65d6dd016dbe9069cae16bca535c54d8112cee46 | mips | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/54a3df17f5131e0bd1111db0d18052fe5c5fd91b | x86_64 | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/b5a1b55bc2b0b8457cdb84412ac357c6799139fe | powerpc64 | tcf-agent-1.8.0 | NOK | http://autobuild.buildroot.net/results/363b4a241f25f21a2c4fa35f38e138ad41bf7562 | arc | unknown | NOK | http://autobuild.buildroot.net/results/a78f55a73117b484e9287f7b846a891b804688c4 | or1k | wampcc-1.6 | NOK | http://autobuild.buildroot.net/results/d1ed86ff9d984c0c17936f322552120764244f77 | ORPH aarch64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/b5c744a9fc9ace759333bb5a02b1aff66c6f3f92 | Classification of failures by reason for 2023.02.x -------------------------------------------------- glibc-2.36-118-g22955ad8518... | 1 imagemagick-7.1.1-21 | 1 mariadb-10.11.6 | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | glibc-2.36-118-g22955ad8518... | NOK | http://autobuild.buildroot.net/results/283ca78053d7add977661777f4a4748473b3e167 | sh4 | imagemagick-7.1.1-21 | NOK | http://autobuild.buildroot.net/results/c52223d0e0265bcf821d6d63bed606c48250ce61 | ORPH microblazeel | mariadb-10.11.6 | NOK | http://autobuild.buildroot.net/results/609251bc1ef18dd4300ca7a99d614f7369741d84 | ORPH Classification of failures by reason for 2023.11.x -------------------------------------------------- linux-6.6.11 | 2 glibc-2.38-27-g750a45a78390... | 1 Detail of failures for 2023.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | glibc-2.38-27-g750a45a78390... | NOK | http://autobuild.buildroot.net/results/b9d5226616ab30b0f4f62bbf016416e452d09d85 | s390x | linux-6.6.11 | NOK | http://autobuild.buildroot.net/results/4080bc9c1267e5413ca52bf5e5d378d5ac578608 | ORPH riscv32 | linux-6.6.11 | NOK | http://autobuild.buildroot.net/results/b343cfb567f91cdf57c368b5a3423840bdeb5497 | ORPH -- http://autobuild.buildroot.net From antoine.coutant at smile.fr Fri Feb 2 09:36:19 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:19 +0100 Subject: [Buildroot] [PATCH v4 1/7] package/meson: bump version to 1.3.1 In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-2-antoine.coutant@smile.fr> The meson upgrade from 1.1.1 to 1.2.0 have been reverted because host-qemu (version v8.0.3) was searching libraries in the build machine instead of buildroot host directory [1]. $ grep -r LINK_ARGS * | grep "\-L/usr" build.ninja: LINK_ARGS = -L/usr/lib/gcc/x86_64-linux-gnu/10 \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../../lib -L/usr/lib \ -L/lib/x86_64-linux-gnu \ -L/lib/../lib \ -L/usr/lib/../lib \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../.. \ -L/lib \ -I/[...]/host/include \ -L/[...]/host/lib \ -I/[...]/host/include/libfdt \ ... Upgrading qemu to version v8.1.0 solves the problem: $ grep -r LINK_ARGS * | grep "\-L/usr" build.ninja: LINK_ARGS = -I/[...]/host/include \ -L/[...]/host/lib \ -I/[...]/host/include/libfdt \ ... Those two tests were done with the same buildroot version (2023.08) on the same machine were the bug appeared. Using, git bisect, in this environment, it was found that the problem was fixed in qemu by the commit [2]. Thus, it is possible that the problem was introduced by improper use of meson by qemu <= v8.0.3. Also, meson has been updated to version 1.2.1 and 1.3.0 in yocto and it doesn't seem to create any issue. [3] The original problem is no longer present and some projects require meson > 1.1.1 (e.g. rusticl requires meson 1.2.0 since mesa 23.3.0 and meson 1.3.1 since mesa 24.0.0). "pkgconfig" field is deprecated by meson 1.3.0 and replaced by "pkg-config". See: [4] The patch that adds the pkg_config_static property has been rebased. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/acfdf21f0b752e844a33c70a0fd2f82f4534a5a0 [2] https://gitlab.com/qemu-project/qemu/-/commit/Fc9a809e0d28417fa1e7f7efc19f845bda4c1be9 [3] https://github.com/yoctoproject/poky/commits/master/meta/recipes-devtools/meson [4] https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig Signed-off-by: Antoine Coutant --- Changes v3 -> v4: - cross-compilation.conf.in have been changed. - Bump version from 1.3.0 to 1.3.1. Signed-off-by: Antoine Coutant --- ...dencies-base.py-add-pkg_config_stati.patch | 29 ++++++++++--------- package/meson/meson.hash | 4 +-- package/meson/meson.mk | 2 +- support/misc/cross-compilation.conf.in | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch index 8e15d3210c..49a0ef93dc 100644 --- a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +++ b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -1,4 +1,4 @@ -From 3d6a2db2270346236dd6247e0648ea0c949ba468 Mon Sep 17 00:00:00 2001 +From 59934e2116e025ecfe23baf6febc4a0eb85f60cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static @@ -20,24 +20,25 @@ Signed-off-by: Fabrice Fontaine Signed-off-by: Romain Naour [Rebased on 0.57.1] Signed-off-by: Peter Seiderer +[rebased on 1.3.0] +Signed-off-by: Antoine Coutant --- - mesonbuild/dependencies/pkgconfig.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + mesonbuild/dependencies/pkgconfig.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py -index 1e8d9132e..d902ba215 100644 +index e86206b88..94888657d 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py -@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency): - env = None - libcmd = ['--libs'] - -- if self.static: -+ if self.static or \ -+ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): - libcmd.append('--static') - - libcmd.append(self.name) +@@ -169,7 +169,7 @@ class PkgConfigCLI(PkgConfigInterface): + env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1' + args: T.List[str] = [] + args += self._define_variable_args(define_variable) +- if static: ++ if static or (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): + args.append('--static') + args += ['--libs', name] + ret, out, err = self._call_pkgbin(args, env=env) -- 2.25.1 diff --git a/package/meson/meson.hash b/package/meson/meson.hash index cb36b674fa..150fd6d1bb 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc -sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc +sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 503aca8c25..467569d28b 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.1.1 +MESON_VERSION = 1.3.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 7053df472b..a58ab553d0 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -10,7 +10,7 @@ ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' cmake = '@BR2_CMAKE@' fortran = '@TARGET_FC@' -pkgconfig = '@PKGCONF_HOST_BINARY@' +pkg-config = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:20 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:20 +0100 Subject: [Buildroot] [PATCH v4 2/7] package/pkg-meson.mk: add rust cross-compiler support In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-3-antoine.coutant@smile.fr> From: Romain Naour This change is needed to be able to build target packages requiring rust. If a package has rust in its project or in an add_language() call in their meson.build file, meson will try to find a suitable compiler for this language[1]. If the language is classified as required but not found, it will abort the build. It is necessary to specify rust and rust_ld separately in support/misc/cross-compilation.conf.in. If you specify it in one line just as "rust", it will generate the following warning: WARNING: Please do not put -C linker= in your compiler command, set rust_ld=command in your cross file or use the RUST_LD environment variable, otherwise meson will override your selection. [1] https://mesonbuild.com/Reference-manual_functions.html#add_languages Signed-off-by: Romain Naour Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant --- package/pkg-meson.mk | 13 +++++++++++++ support/misc/cross-compilation.conf.in | 2 ++ 2 files changed, 15 insertions(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 65cabf23ba..25dd4f0d7f 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -82,6 +82,16 @@ else PKG_MESON_TARGET_FC = /bin/false endif +ifeq ($(BR2_PACKAGE_HOST_RUSTC),y) +PKG_MESON_TARGET_RUSTC = $(HOST_DIR)/bin/rustc +PKG_MESON_TARGET_RUSTC_LINKER = $(notdir $(TARGET_CROSS))gcc +PKG_MESON_TARGET_RUSTC_TARGET_NAME = $(RUSTC_TARGET_NAME) +else +PKG_MESON_TARGET_RUSTC = /bin/false +PKG_MESON_TARGET_RUSTC_LINKER = /bin/false +PKG_MESON_TARGET_RUSTC_TARGET_NAME = +endif + # Generates sed patterns for patching the cross-compilation.conf template, # since Flags might contain commas the arguments are passed indirectly by # variable name (stripped to deal with whitespaces). @@ -91,6 +101,7 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CXX@%$(PKG_MESON_TARGET_CXX)%g" \ -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ -e "s%@TARGET_FC@%$(PKG_MESON_TARGET_FC)%g" \ + -e "s%@TARGET_RUSTC@%$(PKG_MESON_TARGET_RUSTC)%g" \ -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ @@ -99,6 +110,8 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@TARGET_RUSTC_LINKER@%$(PKG_MESON_TARGET_RUSTC_LINKER)%g" \ + -e "s%@RUSTC_TARGET_NAME@%$(PKG_MESON_TARGET_RUSTC_TARGET_NAME)%g" \ -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index a58ab553d0..21cec10b82 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -13,6 +13,8 @@ fortran = '@TARGET_FC@' pkg-config = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' +rust = ['@TARGET_RUSTC@', '--target', '@RUSTC_TARGET_NAME@' ] +rust_ld = '@TARGET_RUSTC_LINKER@' [built-in options] c_args = [@TARGET_CFLAGS@] -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:18 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:18 +0100 Subject: [Buildroot] [PATCH v4 0/7] Adding RustiCL Message-ID: <20240202093625.1409559-1-antoine.coutant@smile.fr> RustiCL requires meson >= 1.2.1 and will soon require meson >= 1.3.1 (when mesa will be upgraded to version 24.0.x). The problems that appeared with host-qemu don't exist anymore. So, I think that meson must be upgraded. While testing RustiCL on the khadas vim3, I encountered a problem with mesa clc cross-compilation and made a merge request that just got accepted. The 3 added patches are from this MR. (https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25568.) This new version of the patch series changes the way OpenCL is selected. When an implementation is available (Clover or Rusticl), a menuconfig appears. Then, it is possible to select Clover and/or RustiCL. Both can be selected at the same time thanks to OpenCL-ICD-Loader. RusitCL have been tested on the khadas vim 3. Using ?khadas_vim3_defconfig? with bootlin toolchain ?aarch64 glibc bleeding-edge 2023.11-1?. I hope that this series will be merged during the FOSDEM buildroot meeting. Indeed, I'm not sure that I will have time to work on this after the 5th of march. Also, I wrote an article in French to explain how RustiCL works. It can allow (French speakers) to understand what it does and why it requires its dependencies. https://www.linuxembedded.fr/2024/01/introduction-a-opencl-et-rusticl Antoine Coutant (2): package/meson: bump version to 1.3.1 package/llvm-project: add opencl-c-base.h on target Romain Naour (3): package/pkg-meson.mk: add rust cross-compiler support package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib package/mesa3d: add RustiCL support Sebastian Weyer (2): package/opencl-headers: new package package/opencl-icd-loader: new package DEVELOPERS | 2 + package/Config.in | 3 + package/llvm-project/clang/clang.mk | 9 ++ ...ncl-external-clang-headers-option-an.patch | 72 ++++++++++++++++ ...or-every-user-when-using-shared-LLVM.patch | 40 +++++++++ ...lc-retrieve-libclang-path-at-runtime.patch | 86 +++++++++++++++++++ package/mesa3d/Config.in | 50 +++++++++-- package/mesa3d/mesa3d.mk | 18 +++- ...dencies-base.py-add-pkg_config_stati.patch | 29 ++++--- package/meson/meson.hash | 4 +- package/meson/meson.mk | 2 +- package/opencl-headers/Config.in | 7 ++ package/opencl-headers/opencl-headers.hash | 3 + package/opencl-headers/opencl-headers.mk | 22 +++++ package/opencl-icd-loader/Config.in | 12 +++ .../opencl-icd-loader/opencl-icd-loader.hash | 3 + .../opencl-icd-loader/opencl-icd-loader.mk | 19 ++++ package/pkg-meson.mk | 13 +++ package/spirv-llvm-translator/Config.in | 22 +++++ .../spirv-llvm-translator.mk | 12 ++- support/misc/cross-compilation.conf.in | 4 +- 21 files changed, 406 insertions(+), 26 deletions(-) create mode 100644 package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch create mode 100644 package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch create mode 100644 package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch create mode 100644 package/opencl-headers/Config.in create mode 100644 package/opencl-headers/opencl-headers.hash create mode 100644 package/opencl-headers/opencl-headers.mk create mode 100644 package/opencl-icd-loader/Config.in create mode 100644 package/opencl-icd-loader/opencl-icd-loader.hash create mode 100644 package/opencl-icd-loader/opencl-icd-loader.mk create mode 100644 package/spirv-llvm-translator/Config.in -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:21 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:21 +0100 Subject: [Buildroot] [PATCH v4 3/7] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-4-antoine.coutant@smile.fr> From: Romain Naour This target version is needed for Rusticl which is an LLVM based OpenCL framework[1]. Rusticl allow programs to compile OpenCL C/C++ code at runtime with Clang. Clang generates LLVM IR which is translated into SPIR-V by spirv-llvm-translator. Finally, mesa can use its internal tools to manage SPIR-V. [1]: https://docs.mesa3d.org/rusticl.html Signed-off-by: Romain Naour Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant --- Changes v2 -> v3: - resolution of the conflict created by adding spirv-llvm-translator to package/Config.in - resolution of the conflict created by adding spirv-headers and zlib to spirv-llvm-translator dependencies Changes v3 -> v4: - explain why the target version is needed in the commit log. Signed-off-by: Antoine Coutant --- package/Config.in | 1 + package/spirv-llvm-translator/Config.in | 22 +++++++++++++++++++ .../spirv-llvm-translator.mk | 12 +++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 package/spirv-llvm-translator/Config.in diff --git a/package/Config.in b/package/Config.in index 426bd7d090..9324d1e4c8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -334,6 +334,7 @@ comment "Graphic applications" source "package/pngquant/Config.in" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" + source "package/spirv-llvm-translator/Config.in" source "package/spirv-tools/Config.in" source "package/stellarium/Config.in" source "package/sway/Config.in" diff --git a/package/spirv-llvm-translator/Config.in b/package/spirv-llvm-translator/Config.in new file mode 100644 index 0000000000..73ca787d8a --- /dev/null +++ b/package/spirv-llvm-translator/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + bool "spirv-translator" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm + select BR2_PACKAGE_LLVM + select BR2_PACKAGE_SPIRV_HEADERS + select BR2_PACKAGE_ZLIB + help + LLVM/SPIR-V Bi-Directional Translator is a library and tool + for translation between LLVM IR and SPIR-V. + + https://github.com/khronosGroup/SPIRV-LLVM-Translator + +comment "spirv-translator needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, host gcc >= 7" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk index 523890a986..8361a74c59 100644 --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk @@ -10,7 +10,7 @@ SPIRV_LLVM_TRANSLATOR_VERSION = v15.0.0-46-ge82ecc2bd7295604fcf1824e47c95fa6a09c SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT -HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers +HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers spirv-headers zlib HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ -DLLVM_BUILD_TOOLS=ON \ -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ @@ -19,4 +19,14 @@ HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ -DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(HOST_DIR)/include +SPIRV_LLVM_TRANSLATOR_INSTALL_STAGING = YES +SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm llvm +SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${STAGING_DIR}/usr \ + -DLLVM_BUILD_TOOLS=ON \ + -DLLVM_DIR=$(STAGING_DIR)/lib/cmake/llvm \ + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ + -DLLVM_SPIRV_INCLUDE_TESTS=OFF + +$(eval $(cmake-package)) $(eval $(host-cmake-package)) -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:22 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:22 +0100 Subject: [Buildroot] [PATCH v4 4/7] package/opencl-headers: new package In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-5-antoine.coutant@smile.fr> From: Sebastian Weyer These headers provide the C language API bindings. It is a complement to the C++ bindings already available in opencl-clhpp. This package is required to build opencl-icd-loader: https://github.com/KhronosGroup/OpenCL-ICD-Loader#dependencies Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant --- Changes v2 -> v3: - resolution of the conflict created by adding opencl-headers under Sebastian Weyer in DEVELOPERS - resolution of the conflict created by adding opencl-headers to package/Config.in Changes v3 -> v4: - bump version from v2023.04.17 to v2023.12.14: add cl_function_types.h to the header files to keep this header added in commit e049b16b5f157e2f28e7b5c301e71e1ccb3fe288 - remove the list of headers to install as it is exhaustive. Instead, select all files with "*". Signed-off-by: Antoine Coutant --- DEVELOPERS | 1 + package/Config.in | 1 + package/opencl-headers/Config.in | 7 +++++++ package/opencl-headers/opencl-headers.hash | 3 +++ package/opencl-headers/opencl-headers.mk | 22 ++++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/opencl-headers/Config.in create mode 100644 package/opencl-headers/opencl-headers.hash create mode 100644 package/opencl-headers/opencl-headers.mk diff --git a/DEVELOPERS b/DEVELOPERS index cc9bc5b5cc..79c46c3539 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2693,6 +2693,7 @@ F: package/ripgrep/ N: Sebastian Weyer F: package/amlogic-boot-fip/ F: package/nushell/ +F: package/opencl-headers F: package/rust-bindgen/ F: package/spirv-headers/ F: support/testing/tests/package/sample_nu.nu diff --git a/package/Config.in b/package/Config.in index 9324d1e4c8..dfbd20e889 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1696,6 +1696,7 @@ menu "Graphics" source "package/menu-cache/Config.in" source "package/onevpl-intel-gpu/Config.in" source "package/opencl-clhpp/Config.in" + source "package/opencl-headers/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" source "package/opencv4-contrib/Config.in" diff --git a/package/opencl-headers/Config.in b/package/opencl-headers/Config.in new file mode 100644 index 0000000000..092d8a2a4d --- /dev/null +++ b/package/opencl-headers/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_OPENCL_HEADERS + bool "opencl-headers" + depends on BR2_PACKAGE_HAS_LIBOPENCL + help + C language headers for the OpenCL API + + https://github.com/KhronosGroup/OpenCL-Headers diff --git a/package/opencl-headers/opencl-headers.hash b/package/opencl-headers/opencl-headers.hash new file mode 100644 index 0000000000..802ed05450 --- /dev/null +++ b/package/opencl-headers/opencl-headers.hash @@ -0,0 +1,3 @@ +#Locally generated +sha256 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d OpenCL-Headers-2023.12.14.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencl-headers/opencl-headers.mk b/package/opencl-headers/opencl-headers.mk new file mode 100644 index 0000000000..7aa0e0d168 --- /dev/null +++ b/package/opencl-headers/opencl-headers.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# opencl-headers +# +################################################################################ + +OPENCL_HEADERS_VERSION = 2023.12.14 +OPENCL_HEADERS_SOURCE = OpenCL-Headers-$(OPENCL_HEADERS_VERSION).tar.gz +OPENCL_HEADERS_SITE = $(call github,KhronosGroup,OpenCL-Headers,v$(OPENCL_HEADERS_VERSION)) +OPENCL_HEADERS_LICENSE = Apache-2.0 +OPENCL_HEADERS_LICENSE_FILES = LICENSE +OPENCL_HEADERS_INSTALL_STAGING = YES + +OPENCL_HEADERS_INSTALL_TARGET = NO + +define OPENCL_HEADERS_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/CL + $(INSTALL) -D -m 0644 $(@D)/CL/* \ + $(STAGING_DIR)/usr/include/CL +endef + +$(eval $(generic-package)) -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:23 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:23 +0100 Subject: [Buildroot] [PATCH v4 5/7] package/opencl-icd-loader: new package In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-6-antoine.coutant@smile.fr> From: Sebastian Weyer With this package it is possible to have multiple implementations of OpenCL at the same time. This package provides a libOpenCL.so file that captures the OpenCL API calls and forwards them to the correct implementation of OpenCL. OpenCL implementations can be manually registered by creating a file containing its full file path in /etc/OpenCL/vendors/.icd[1] This package is required by certain OpenCL implementations, for example Mesa3D's Clover implementation if it is not built in standalone mode. [1] https://github.com/KhronosGroup/OpenCL-ICD-Loader#registering-icds Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant --- Changes v2 -> v3: -resolution of the conflict created by adding opencl-icd-loader under Sebastian Weyer in DEVELOPERS - resolution of the conflict created by adding opencl-icd-loader to package/Config.in Changes v3 -> v4: - bump version from v2023.04.17 to v2023.12.14 Signed-off-by: Antoine Coutant --- DEVELOPERS | 1 + package/Config.in | 1 + package/opencl-icd-loader/Config.in | 12 ++++++++++++ .../opencl-icd-loader/opencl-icd-loader.hash | 3 +++ .../opencl-icd-loader/opencl-icd-loader.mk | 19 +++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/opencl-icd-loader/Config.in create mode 100644 package/opencl-icd-loader/opencl-icd-loader.hash create mode 100644 package/opencl-icd-loader/opencl-icd-loader.mk diff --git a/DEVELOPERS b/DEVELOPERS index 79c46c3539..907a29f53b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2694,6 +2694,7 @@ N: Sebastian Weyer F: package/amlogic-boot-fip/ F: package/nushell/ F: package/opencl-headers +F: package/opencl-icd-loader F: package/rust-bindgen/ F: package/spirv-headers/ F: support/testing/tests/package/sample_nu.nu diff --git a/package/Config.in b/package/Config.in index dfbd20e889..7b1324306c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1697,6 +1697,7 @@ menu "Graphics" source "package/onevpl-intel-gpu/Config.in" source "package/opencl-clhpp/Config.in" source "package/opencl-headers/Config.in" + source "package/opencl-icd-loader/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" source "package/opencv4-contrib/Config.in" diff --git a/package/opencl-icd-loader/Config.in b/package/opencl-icd-loader/Config.in new file mode 100644 index 0000000000..405dc5401a --- /dev/null +++ b/package/opencl-icd-loader/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_OPENCL_ICD_LOADER + bool "OpenCL-ICD-Loader" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBOPENCL + select BR2_PACKAGE_OPENCL_HEADERS + help + OpenCL defines an Installable Client Driver (ICD) mechanism to + allow developers to build applications against an Installable + Client Driver loader (ICD loader) rather than linking their + applications against a specific OpenCL implementation. + + https://github.com/KhronosGroup/OpenCL-ICD-Loader diff --git a/package/opencl-icd-loader/opencl-icd-loader.hash b/package/opencl-icd-loader/opencl-icd-loader.hash new file mode 100644 index 0000000000..1c894f1293 --- /dev/null +++ b/package/opencl-icd-loader/opencl-icd-loader.hash @@ -0,0 +1,3 @@ +# locally generated +sha256 af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917 OpenCL-ICD-Loader-2023.12.14.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/opencl-icd-loader/opencl-icd-loader.mk b/package/opencl-icd-loader/opencl-icd-loader.mk new file mode 100644 index 0000000000..04f6fb4b85 --- /dev/null +++ b/package/opencl-icd-loader/opencl-icd-loader.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# opencl-icd-loader +# +################################################################################ + +OPENCL_ICD_LOADER_VERSION = 2023.12.14 +OPENCL_ICD_LOADER_SOURCE = OpenCL-ICD-Loader-$(OPENCL_ICD_LOADER_VERSION).tar.gz +OPENCL_ICD_LOADER_SITE = $(call github,KhronosGroup,OpenCL-ICD-Loader,v$(OPENCL_ICD_LOADER_VERSION)) +OPENCL_ICD_LOADER_LICENSE = Apache-2.0 +OPENCL_ICD_LOADER_LICENSE_FILES = LICENSE +OPENCL_ICD_LOADER_INSTALL_STAGING = YES + +OPENCL_ICD_LOADER_DEPENDENCIES = opencl-headers + +OPENCL_ICD_LOADER_CONF_OPTS += -DOPENCL_ICD_LOADER_HEADERS_DIR=$(STAGING_DIR)/usr/include + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:24 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:24 +0100 Subject: [Buildroot] [PATCH v4 6/7] package/llvm-project: add opencl-c-base.h on target In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-7-antoine.coutant@smile.fr> rusticl depends on the mesa clc_compile_to_llvm_module function. This function requires opencl-c-base.h when LLVM version >= 15. The header is deleted automatically by CLANG_FILES_TO_REMOVE post install target hook in llvm-project/clang package. When rusticl is enabled, after the whole clang directory has been removed, the header is copied back to /usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/ By default, the mesa3d variable used to retrieve the header is set to the staging directory on the host machine. A merge request on mesa's gitlab solved this problem. See: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25568 The patches have been backported to mesa 23.3.4. Signed-off-by: Antoine Coutant --- Changes v3 -> v4: - Add patches merged by mesa upstream. --- Running an app that uses rusticl leads to an error. Example: RUSTICL_ENABLE=panfrost clpeak Platform: rusticl Device: Mali-G52 (Panfrost) Driver version : 23.3.4 (Linux ARM64) Compute units : 2 Clock frequency : 800 MHz Build Log: :1:10: fatal error: 'opencl-c-base.h' file not found Error executing LLVM compilation action. Signed-off-by: Antoine Coutant --- package/llvm-project/clang/clang.mk | 9 ++ ...ncl-external-clang-headers-option-an.patch | 72 ++++++++++++++++ ...or-every-user-when-using-shared-LLVM.patch | 40 +++++++++ ...lc-retrieve-libclang-path-at-runtime.patch | 86 +++++++++++++++++++ 4 files changed, 207 insertions(+) create mode 100644 package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch create mode 100644 package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch create mode 100644 package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk index 0bafd6461b..09aac7f0ec 100644 --- a/package/llvm-project/clang/clang.mk +++ b/package/llvm-project/clang/clang.mk @@ -90,6 +90,15 @@ define HOST_CLANG_INSTALL_CLANG_TBLGEN endef HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN +# Rusticl needs opencl-c-base.h to be present on the target. +define CLANG_OPENCL_C_BASE_HEADER_TO_TARGET + mkdir -p $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include + $(INSTALL) -D -m 0644 $(@D)/lib/Headers/opencl-c-base.h $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/opencl-c-base.h +endef +ifeq ($(BR2_PACKAGE_MESA3D_RUSTICL),y) +CLANG_POST_INSTALL_TARGET_HOOKS += CLANG_OPENCL_C_BASE_HEADER_TO_TARGET +endif + # This option must be enabled to link libclang dynamically against libLLVM.so HOST_CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON diff --git a/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch new file mode 100644 index 0000000000..ebe3542627 --- /dev/null +++ b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch @@ -0,0 +1,72 @@ +From b7f2ada31d85dfd2e9906a7343d14a3b0b85cf14 Mon Sep 17 00:00:00 2001 +From: Karol Herbst +Date: Tue, 2 Jan 2024 22:58:39 +0100 +Subject: [PATCH 1/3] meson: remove opencl-external-clang-headers option and + rely on shared-llvm + +Setting opencl-external-clang-headers to enabled while using shared LLVM +was broken and this option was mostly used for windows to force static +inclusion of opencl base headers. + +Simply relying on the shared-llvm option here is enough to get what we +want. + +Signed-off-by: Karol Herbst +Reviewed-by: Jesse Natalie +Part-of: +[antoine.coutant at smile.fr: backported to mesa-23.3.4] +Signed-off-by: Antoine Coutant +--- + .gitlab-ci/windows/mesa_build.ps1 | 1 - + meson_options.txt | 7 ------- + src/compiler/clc/meson.build | 4 +--- + 3 files changed, 1 insertion(+), 11 deletions(-) + +diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 +index a4f87c4eadb..e79eb6b6587 100644 +--- a/.gitlab-ci/windows/mesa_build.ps1 ++++ b/.gitlab-ci/windows/mesa_build.ps1 +@@ -59,7 +59,6 @@ meson setup ` + -Dopencl-spirv=true ` + -Dmicrosoft-clc=enabled ` + -Dstatic-libclc=all ` +--Dopencl-external-clang-headers=disabled ` + -Dspirv-to-dxil=true ` + -Dbuild-tests=true ` + -Dwerror=true ` +diff --git a/meson_options.txt b/meson_options.txt +index e885ba61a8a..537ba797407 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -191,13 +191,6 @@ option( + description : 'Link libclc SPIR-V statically.', + ) + +-option( +- 'opencl-external-clang-headers', +- type : 'feature', +- description : 'Use system Clang headers at runtime for OpenCL kernel ' + +- 'compilation.', +-) +- + option( + 'd3d-drivers-path', + type : 'string', +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build +index 3e4f1a7f441..81345225768 100644 +--- a/src/compiler/clc/meson.build ++++ b/src/compiler/clc/meson.build +@@ -30,9 +30,7 @@ _libmesaclc_c_args = [] + _libmesaclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)] + _libmesaclc_sources = [] + +-if get_option('opencl-external-clang-headers') \ +- .disable_auto_if(host_machine.system() == 'windows') \ +- .disabled() ++if not _shared_llvm + # LLVM 16 moved clang header path from using full version to only major version + if dep_llvm.version().version_compare('< 16') + # Prior to LLVM 16, this path used a full version +-- +2.25.1 + diff --git a/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch new file mode 100644 index 0000000000..3560f6805f --- /dev/null +++ b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch @@ -0,0 +1,40 @@ +From 56c85c4c7a757a9ba3d8ac08e6c4c4c7f19e6cab Mon Sep 17 00:00:00 2001 +From: Karol Herbst +Date: Thu, 11 Jan 2024 14:55:46 +0100 +Subject: [PATCH 2/3] clc: force fPIC for every user when using shared LLVM + +As we want to start using `dladdr`, this is needed to prevent `dladdr` +returning information of the wrong file. + +Fixes tag as it's required by the actual fix. + +Signed-off-by: Karol Herbst +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") +Part-of: +[antoine.coutant at smile.fr: backported to mesa-23.3.4] +Signed-off-by: Antoine Coutant +--- + src/compiler/clc/meson.build | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build +index 81345225768..442a583065b 100644 +--- a/src/compiler/clc/meson.build ++++ b/src/compiler/clc/meson.build +@@ -123,7 +123,13 @@ _libmesaclc = static_library( + idep_mesautil, dep_spirv_tools] + ) + ++_idep_mesaclc_link_args = [] ++if _shared_llvm ++ _idep_mesaclc_link_args += cc.get_supported_link_arguments('-fPIC') ++endif ++ + idep_mesaclc = declare_dependency( + link_with : _libmesaclc, + include_directories : include_directories('.'), ++ link_args : _idep_mesaclc_link_args, + ) +-- +2.25.1 + diff --git a/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch new file mode 100644 index 0000000000..c19ba7d2b7 --- /dev/null +++ b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch @@ -0,0 +1,86 @@ +From fa2c045e04370beb454951c32bccc087638e04c7 Mon Sep 17 00:00:00 2001 +From: Antoine Coutant +Date: Thu, 30 Nov 2023 11:10:20 +0100 +Subject: [PATCH 3/3] clc: retrieve libclang path at runtime. + +LLVM_LIB_DIR is a variable used for runtime compilations. +When cross compiling, LLVM_LIB_DIR must be set to the +libclang path on the target. So, this path should not +be retrieved during compilation but at runtime. + +dladdr uses an address to search for a loaded library. +If a library is found, it returns information about it. +The path to the libclang library can therefore be +retrieved using one of its functions. This is useful +because we don't know the name of the libclang library +(libclang.so.X or libclang-cpp.so.X) + +v2 (Karol): use clang::CompilerInvocation::CreateFromArgs for dladdr +v3 (Karol): follow symlinks to fix errors on debian + +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") +Signed-off-by: Antoine Coutant +Reviewed-by: Karol Herbst +Reviewed-by (v1): Jesse Natalie +[antoine.coutant at smile.fr: backported to mesa-23.3.4] + +Part-of: +--- + src/compiler/clc/clc_helpers.cpp | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp +index 55287f22683..22eb3495be9 100644 +--- a/src/compiler/clc/clc_helpers.cpp ++++ b/src/compiler/clc/clc_helpers.cpp +@@ -23,6 +23,7 @@ + // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + // OTHER DEALINGS IN THE SOFTWARE. + ++#include + #include + #include + #include +@@ -57,6 +58,10 @@ + + #include "spirv.h" + ++#if DETECT_OS_UNIX ++#include ++#endif ++ + #ifdef USE_STATIC_OPENCL_C_H + #if LLVM_VERSION_MAJOR < 15 + #include "opencl-c.h.h" +@@ -876,12 +881,25 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx, + #endif + } + #else ++ ++ Dl_info info; ++ if (dladdr((void *)clang::CompilerInvocation::CreateFromArgs, &info) == 0) { ++ clc_error(logger, "Couldn't find libclang path.\n"); ++ return {}; ++ } ++ ++ char *clang_path = realpath(info.dli_fname, NULL); ++ if (clang_path == nullptr) { ++ clc_error(logger, "Couldn't find libclang path.\n"); ++ return {}; ++ } ++ + // GetResourcePath is a way to retrive the actual libclang resource dir based on a given binary +- // or library. The path doesn't even need to exist, we just have to put something in there, +- // because we might have linked clang statically. ++ // or library. + auto libclang_path = fs::path(LLVM_LIB_DIR) / "libclang.so"; + auto clang_res_path = +- fs::path(Driver::GetResourcesPath(libclang_path.string(), CLANG_RESOURCE_DIR)) / "include"; ++ fs::path(Driver::GetResourcesPath(std::string(clang_path), CLANG_RESOURCE_DIR)) / "include"; ++ free(clang_path); + + c->getHeaderSearchOpts().UseBuiltinIncludes = true; + c->getHeaderSearchOpts().UseStandardSystemIncludes = true; +-- +2.25.1 + -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:25 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:25 +0100 Subject: [Buildroot] [PATCH v4 7/7] package/mesa3d: add RustiCL support In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-8-antoine.coutant@smile.fr> From: Romain Naour To build Rusticl you need to satisfy the following build dependencies: rustc rustfmt (highly recommended, but only required for CI builds or when authoring patches) bindgen LLVM built with libclc and -DLLVM_ENABLE_DUMP=ON. SPIRV-Tools SPIRV-LLVM-Translator for a libLLVMSPIRVLib.so matching your version of LLVM, i.e. if you?re using LLVM 15 (libLLVM.so.15), then you need a libLLVMSPIRVLib.so.15. See: https://docs.mesa3d.org/rusticl.html Since rusticl is an implementation of OpenCL, make it a provider of OpenCL. We need to use opencl-icd-loader in order to be able to capture API calls and forward them to the correct implementation of OpenCL (RustiCL in this case) opencl-icd-loader needs to be installed in the toolchain's sysroot as well to be able to compile packages depending on libopencl since otherwise there's only for example libRustiOpenCL.so and no libOpenCL.so Many Gallium drivers are compatible with rusticl. However, tests were performed with panfrost. Thus only panfrost is actived for the moment. To activate another driver, make it select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER. The list of all compatible drivers can be found here: https://docs.mesa3d.org/envvars.html#envvar-RUSTICL_ENABLE Signed-off-by: Romain Naour Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant --- v2: change commit header -> RustiCL support is not experimental Changes v3 -> v4: - Add a menuconfig to select OpenCL implementation between Clover and RustiCL - Add BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER. Signed-off-by: Antoine Coutant --- package/mesa3d/Config.in | 50 ++++++++++++++++++++++++++++++++++++---- package/mesa3d/mesa3d.mk | 18 +++++++++++++-- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 39a4f706e2..84d281a0a9 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -44,17 +44,56 @@ comment "llvm support needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 -# clang and libclc dependencies are satisfied by -# BR2_PACKAGE_MESA3D_LLVM -config BR2_PACKAGE_MESA3D_OPENCL +menuconfig BR2_PACKAGE_MESA3D_OPENCL bool "OpenCL support" + default n depends on BR2_PACKAGE_MESA3D_LLVM depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \ + BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS && \ + BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER select BR2_PACKAGE_LLVM_RTTI select BR2_PACKAGE_CLANG select BR2_PACKAGE_LIBCLC select BR2_PACKAGE_HAS_LIBOPENCL + help + OpenCL is a standard for parallel programming of heterogeneous + systems (CPUs, GPUs, DSPs, FPGAs, etc.) + + http://www.khronos.org/opencl/ + +if BR2_PACKAGE_MESA3D_OPENCL + +# clang and libclc dependencies are satisfied by +# BR2_PACKAGE_MESA3D_LLVM +config BR2_PACKAGE_MESA3D_CLOVER + bool "Clover" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + +# libclc dependency is satisfied by +# BR2_PACKAGE_MESA3D_LLVM +config BR2_PACKAGE_MESA3D_RUSTICL + bool "RustiCL" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_LLVM_DUMP + select BR2_PACKAGE_OPENCL_ICD_LOADER + select BR2_PACKAGE_SPIRV_TOOLS + select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + help + RustiCL is an OpenCL implementation written in Rust. + + By default devices are disabled in RustiCL. If you want to enable a device, + you need to set the environment variable RUSTICL_ENABLE to the driver you + are using. + ref: https://docs.mesa3d.org/envvars.html#envvar-RUSTICL_ENABLE + +endif # BR2_PACKAGE_MESA3D_OPENCL + +config BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER + bool # inform the .mk file of gallium, dri, dri3 or vulkan driver selection config BR2_PACKAGE_MESA3D_DRI3 @@ -160,6 +199,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help Mesa driver for ARM Mali Midgard and Bifrost GPUs. @@ -396,7 +436,7 @@ config BR2_PACKAGE_PROVIDES_LIBGLES default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES && !BR2_PACKAGE_LIBGLVND config BR2_PACKAGE_PROVIDES_LIBOPENCL - default "mesa3d" if BR2_PACKAGE_MESA3D_OPENCL + default "mesa3d" if BR2_PACKAGE_MESA3D_CLOVER || BR2_PACKAGE_MESA3D_RUSTICL endif # BR2_PACKAGE_MESA3D diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d8d8fb8dd6..9a86fdacd7 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -58,15 +58,29 @@ else MESA3D_CONF_OPTS += -Dllvm=disabled endif -# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of -# libMesaOpenCL and CL headers are installed ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) MESA3D_PROVIDES += libopencl MESA3D_DEPENDENCIES += clang libclc +ifeq ($(BR2_PACKAGE_MESA3D_CLOVER),y) +ifeq ($(BR2_PACKAGE_OPENCL_ICD_LOADER),y) +MESA3D_CONF_OPTS += -Dgallium-opencl=icd +MESA3D_DEPENDENCIES += opencl-icd-loader +else +# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of +# libMesaOpenCL and CL headers are installed MESA3D_CONF_OPTS += -Dgallium-opencl=standalone +endif else MESA3D_CONF_OPTS += -Dgallium-opencl=disabled endif +ifeq ($(BR2_PACKAGE_MESA3D_RUSTICL),y) +MESA3D_DEPENDENCIES += host-rustc host-rust-bindgen opencl-icd-loader spirv-tools spirv-llvm-translator +# -Drust_std=2021: known meson bug (https://github.com/mesonbuild/meson/issues/10664) +MESA3D_CONF_OPTS += -Dgallium-rusticl=true -Drust_std=2021 +else +MESA3D_CONF_OPTS += -Dgallium-rusticl=false +endif +endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) MESA3D_DEPENDENCIES += elfutils -- 2.25.1 From neal.frager at amd.com Fri Feb 2 12:11:29 2024 From: neal.frager at amd.com (Frager, Neal) Date: Fri, 2 Feb 2024 12:11:29 +0000 Subject: [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: new package In-Reply-To: <20240131112223.2175855-4-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-4-neal.frager@amd.com> Message-ID: Hi Thomas, Have you had a chance to look at v9 of the bare-metal patch set? > + > +define NEWLIB_BARE_METAL_FIXUP > + mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/include \ > + $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/include > + mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/lib \ > + $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/lib > +endef > +NEWLIB_BARE_METAL_POST_INSTALL_STAGING_HOOKS += NEWLIB_BARE_METAL_FIXUP > + > +$(eval $(generic-package)) There are two things I wish to highlight. 1. Thanks to the binutils 2.42 release, we do not need microblaze patches anymore. 2. I chose to keep the newlib fixup. Even though the --with-tooldir patch was accepted upstream, newlib requires autoconf 2.69 for this patch to be applied. So rather than including a version of the patch that works on the output configure script directly, I thought it would be better to just keep the fixup for now. We can remove the fixup with the next newlib release which will have a configurable --with-tooldir option. What are your thoughts? Do you think any more changes are needed before applying this bare-metal toolchain patch set? Thank you for your support. Best regards, Neal Frager AMD From wbx at openadk.org Fri Feb 2 15:56:14 2024 From: wbx at openadk.org (Waldemar Brodkorb) Date: Fri, 2 Feb 2024 16:56:14 +0100 Subject: [Buildroot] [PATCH 1/2 v2] package/libjwt: new package Message-ID: JSON Web Tokens are an open, industry standard RFC 7519 method for representing claims securely between two parties. This Library is used by Asterisk 20.6.0 and newer. We need to use autotools to install pkgconfig file. Signed-off-by: Waldemar Brodkorb --- package/Config.in | 1 + package/libjwt/Config.in | 9 +++++++++ package/libjwt/libjwt.hash | 3 +++ package/libjwt/libjwt.mk | 16 ++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/libjwt/Config.in create mode 100644 package/libjwt/libjwt.hash create mode 100644 package/libjwt/libjwt.mk diff --git a/package/Config.in b/package/Config.in index 426bd7d090..75a94177eb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1846,6 +1846,7 @@ menu "JSON/XML" source "package/libbson/Config.in" source "package/libfastjson/Config.in" source "package/libjson/Config.in" + source "package/libjwt/Config.in" source "package/libroxml/Config.in" source "package/libucl/Config.in" source "package/libxml2/Config.in" diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in new file mode 100644 index 0000000000..d6bca54adc --- /dev/null +++ b/package/libjwt/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBJWT + bool "libjwt" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_JANSSON + help + JSON Web Tokens are an open, industry standard RFC 7519 + method for representing claims securely between two parties. + + https://github.com/benmcollins/libjwt diff --git a/package/libjwt/libjwt.hash b/package/libjwt/libjwt.hash new file mode 100644 index 0000000000..2235fa3f99 --- /dev/null +++ b/package/libjwt/libjwt.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 cb2fd95123689e7d209a3a8c060e02f68341c9a5ded524c0cd881a8cd20d711f libjwt-1.15.3.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk new file mode 100644 index 0000000000..f7be28d206 --- /dev/null +++ b/package/libjwt/libjwt.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libjwt +# +################################################################################ + +LIBJWT_VERSION = 1.15.3 +LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) +LIBJWT_SOURCE = libjwt-$(LIBJWT_VERSION).tar.gz +LIBJWT_DEPENDENCIES = jansson openssl +LIBJWT_AUTORECONF = YES +LIBJWT_INSTALL_STAGING = YES +LIBJWT_LICENSE = MPL-2.0 +LIBJWT_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) -- 2.39.2 From wbx at openadk.org Fri Feb 2 15:58:56 2024 From: wbx at openadk.org (Waldemar Brodkorb) Date: Fri, 2 Feb 2024 16:58:56 +0100 Subject: [Buildroot] [PATCH 2/2 v2] package/asterisk: bump to 20.6.0 Message-ID: See here for changes: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md Signed-off-by: Waldemar Brodkorb --- v1->v2: - use separate libjwt package instead of bundled one, suggested by Peter Korsgaard --- package/asterisk/Config.in | 1 + package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in index c52456f8fc..662f070dac 100644 --- a/package/asterisk/Config.in +++ b/package/asterisk/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_ASTERISK select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBILBC + select BR2_PACKAGE_LIBJWT select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_SQLITE select BR2_PACKAGE_UTIL_LINUX diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 246f4219aa..d50955dd2b 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.tar.gz +sha256 088dbc08916e21528dba364f5452b2090b066dbba4548b32ec10af138d4b442f asterisk-20.6.0.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index d1f3ea82d3..869e4128ff 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 20.5.2 +ASTERISK_VERSION = 20.6.0 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) @@ -27,7 +27,7 @@ ASTERISK_SELINUX_MODULES = asterisk # For patches 0002 and 0003 ASTERISK_AUTORECONF = YES -ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson +ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson -Ithird-party/libjwt ASTERISK_DEPENDENCIES = \ host-asterisk \ @@ -35,6 +35,7 @@ ASTERISK_DEPENDENCIES = \ jansson \ libcurl \ libedit \ + libjwt \ libxml2 \ sqlite \ util-linux @@ -89,6 +90,7 @@ ASTERISK_CONF_OPTS = \ --with-jansson \ --with-libcurl \ --with-ilbc \ + --with-libjwt="$(STAGING_DIR)/usr" \ --with-libxml2 \ --with-libedit="$(STAGING_DIR)/usr" \ --with-pjproject \ -- 2.39.2 From buildroot at busybox.net Fri Feb 2 18:22:19 2024 From: buildroot at busybox.net (Postmaster) Date: 2 Feb 2024 19:22:19 +0100 Subject: [Buildroot] Undeliverable: Outgoing Mail Returned to Sender Message-ID: <20240202192219.5C1FB049A2E1A5D9@busybox.net> An HTML attachment was scrubbed... URL: From bernd at kuhls.net Fri Feb 2 19:21:26 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 2 Feb 2024 20:21:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 23.3.5 Message-ID: <20240202192126.51102-1-bernd@kuhls.net> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index d04fa10342..b9b328b268 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.3.4 +MESA3D_HEADERS_VERSION = 23.3.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e99027c013..7e49119c41 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-January/000745.html -sha256 df12d765be4650fe532860b18aa18e6da1d0b07d1a21dfdfe04660e6b7bac39a mesa-23.3.4.tar.xz -sha512 026c424989a594dd840dc158ca09e0f57e604f0b1bd2a3981110b4b2b5a47c6cd9c7241c7f48957a781e2dd9f9760cc9db79b2fb7c7fe39b64eddb18dcf18412 mesa-23.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html +sha256 69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f mesa-23.3.5.tar.xz +sha512 1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea mesa-23.3.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d3bc7020b1..4e6cb3571a 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.3.4 +MESA3D_VERSION = 23.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.39.2 From bernd at kuhls.net Fri Feb 2 19:29:33 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 2 Feb 2024 20:29:33 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240202192933.53122-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 662bd09162..da22b439e3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.15" 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 d7082aa629..10edcc2ed9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584 linux-6.6.14.tar.xz -sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz +sha256 ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa linux-6.6.15.tar.xz +sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index bf55c8714a..a0e572adc0 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.75" if BR2_KERNEL_HEADERS_6_1 - default "6.6.14" if BR2_KERNEL_HEADERS_6_6 + default "6.1.76" if BR2_KERNEL_HEADERS_6_1 + default "6.6.15" if BR2_KERNEL_HEADERS_6_6 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 \ -- 2.39.2 From bernd at kuhls.net Fri Feb 2 19:35:06 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 2 Feb 2024 20:35:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-peripheral-joystick: bump version to 20.1.15-Nexus Message-ID: <20240202193506.58522-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 550da61981..d4765d2b2c 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8c3dde851e45549d13ca3fcead9c27c440dfe070d68fb473ae71c522bc54753a kodi-peripheral-joystick-20.1.14-Nexus.tar.gz +sha256 7292431b26e3ea969967a02f42ce48cae7742398b148ca041470c17934d06272 kodi-peripheral-joystick-20.1.15-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 2fe6c29c0d..d81962562c 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.14-Nexus +KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.15-Nexus KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md -- 2.39.2 From raphael.pavlidis at gmail.com Fri Feb 2 20:29:54 2024 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Fri, 2 Feb 2024 21:29:54 +0100 Subject: [Buildroot] [PATCH v3] package/sway: make systemd optional In-Reply-To: <20240202020258.600562-1-stefan@ott.net> References: <20240202020258.600562-1-stefan@ott.net> Message-ID: Hello Stefan, Thanks for the new iteration! On 2/2/24 03:02, Stefan Ott wrote: [SNIP] > > +comment "swaybar tray needs systemd" > + depends on !BR2_PACKAGE_SYSTEMD > + > endif # BR2_PACKAGE_SWAY_SWAYBAR > > config BR2_PACKAGE_SWAY_SWAYNAG > @@ -54,9 +57,8 @@ config BR2_PACKAGE_SWAY_SWAYNAG > > endif # BR2_PACKAGE_SWAY > I like it more if the tray feature is enabled automatically if systemd is present, without making it an option. Thanks, Raphael Pavlidis From bernd at kuhls.net Fri Feb 2 22:20:39 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 2 Feb 2024 23:20:39 +0100 Subject: [Buildroot] [PATCH 1/2] package/intel-mediadriver: bump version to 24.1.3 Message-ID: <20240202222040.2390770-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index feade4974c..a1b098094b 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 da90f3c38176936f6315bb4b0f04f6f83080f9a6a228294538aa6befe9ce20e0 intel-media-24.1.1.tar.gz +sha256 a024e96abd662193e4295f427a76c5894087503df46bd82c0e5bea103e44b171 intel-media-24.1.3.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index efff3d44b0..efedf407e5 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.1.1 +INTEL_MEDIADRIVER_VERSION = 24.1.3 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause -- 2.39.2 From bernd at kuhls.net Fri Feb 2 22:20:40 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 2 Feb 2024 23:20:40 +0100 Subject: [Buildroot] [PATCH 2/2] package/onevpl-intel-gpu: bump version to 24.1.3 In-Reply-To: <20240202222040.2390770-1-bernd@kuhls.net> References: <20240202222040.2390770-1-bernd@kuhls.net> Message-ID: <20240202222040.2390770-2-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index d1e671f96a..a45758a2c3 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e0bd388c04740dd9f2e8ca989bc54428c13a531ed4c097d00f06aa6e58a6d15c onevpl-intel-gpu-24.1.1.tar.gz +sha256 15d34e4304d7aeb5ea5e529b6f51171109cef42525113321f675bc14e56c697e onevpl-intel-gpu-24.1.3.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index 52fbe2ed9b..509698ce26 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 24.1.1 +ONEVPL_INTEL_GPU_VERSION = 24.1.3 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE -- 2.39.2 From kilian.zinnecker at mail.de Fri Feb 2 23:30:30 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sat, 3 Feb 2024 00:30:30 +0100 Subject: [Buildroot] [PATCH 1/1] board/radxa/rock5b: Disable FIQ debug interface Message-ID: <20240202233030.1192392-1-kilian.zinnecker@mail.de> The custom kernel used for the Rock5B features an FIQ debug interface which is enabled by default. As it is not needed, it is disabled. The documentation features instructions on how to re-enable it, if it is needed. Signed-off-by: Kilian Zinnecker --- board/radxa/rock5b/linux.fragment | 1 + board/radxa/rock5b/readme.txt | 20 ++++++++++++++++++++ board/radxa/rock5b/rock5b.dts | 12 ++++++++++++ board/radxa/rock5b/rock5b.its | 2 +- configs/rock5b_defconfig | 3 ++- 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 board/radxa/rock5b/rock5b.dts diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 6d65cb7bb8..28bb373ef2 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1,4 +1,5 @@ CONFIG_R8169=y +# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set # Disable Rockchip specific WiFi drivers, as the kernel # code cannot be build with GCC 12 due to several Werrors # CONFIG_WL_ROCKCHIP is not set diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index f02f3d380e..b3eb06851a 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -20,6 +20,7 @@ output/images ??? rk3588-rock-5b.dtb ??? rk3588_bl31_v1.40.elf ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin +??? rock5b.dts ??? rock5b.its ??? rootfs.ext2 ??? rootfs.ext4 @@ -64,6 +65,8 @@ https://forum.radxa.com/c/rock5 Issues: ======= +WiFi +---- The custom Radxa kernel provides custom code to support WiFi. However, that code does not compile with GCC 12, which is the current default version in buildroot. Hence, the WiFi kernel drivers are disabled, until @@ -80,3 +83,20 @@ BR2_GCC_VERSION_11_X=y board/radxa/rock5b/linux.fragment: # CONFIG_WL_ROCKCHIP is not set + +Rockchip FIQ Debugger +--------------------- +The custom kernel used for this board features an FIQ debugger, which +can be activated by typing "fiq" on the serial interface. As this can be +annoying if a user wants to type these charakters and it is not needed +for most users, this board support disables the FIQ debugger by default. +To re-enable the FIQ debugger follow the steps: + +1. In board/radxa/rock5b/rock5b.dts set the status property of the +fiq_debugger node to "okay" and set the status property of the uart2 +node to "disabled" + +2. Re-enable the fiq debugger module by removing the following line +from board/radxa/rock5b/linux.fragment: + +# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts new file mode 100644 index 0000000000..71a4e42b5e --- /dev/null +++ b/board/radxa/rock5b/rock5b.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "rockchip/rk3588-rock-5b.dts" + +&fiq_debugger { + status = "disabled"; +}; + +&uart2 { + pinctrl-0 = <&uart2m0_xfer>; + status = "okay"; +}; diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its index d73659a56e..9ce235d041 100644 --- a/board/radxa/rock5b/rock5b.its +++ b/board/radxa/rock5b/rock5b.its @@ -20,7 +20,7 @@ }; fdt { description = "Device Tree"; - data = /incbin/("rk3588-rock-5b.dtb"); + data = /incbin/("rock5b.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 2e72b386b1..7175aa66bf 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -14,7 +14,8 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" +# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" BR2_TARGET_ROOTFS_EXT2=y -- 2.34.1 From stefan at ott.net Sat Feb 3 03:01:37 2024 From: stefan at ott.net (Stefan Ott) Date: Sat, 3 Feb 2024 04:01:37 +0100 Subject: [Buildroot] [PATCH v4] package/sway: make systemd optional In-Reply-To: References: Message-ID: <20240203030138.1934339-1-stefan@ott.net> Sway works perfectly fine without it. Signed-off-by: Stefan Ott --- Changes v3 -> v4: - Automatically enable tray support if systemd is enabled (suggested by Raphael Pavlidis) Changes v2 -> v3: - Make BR2_PACKAGE_SWAY_SWAYBAR_TRAY depend on systemd and set sd-bus-provider=libsystemd if SWAY_SWAYBAR_TRAY is enabled Changes v1 -> v2: - Automatically enable systemd integration for builds with systemd support (suggested by Thomas Petazzoni) --- package/sway/Config.in | 15 ++------------- package/sway/sway.mk | 10 +++++----- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/package/sway/Config.in b/package/sway/Config.in index 4f6d9fb215..d2fcdc6d70 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_SWAY bool "sway" - depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider depends on !BR2_STATIC_LIBS # wlroots depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wlroots depends on BR2_PACKAGE_HAS_LIBEGL # wlroots @@ -38,15 +37,6 @@ config BR2_PACKAGE_SWAY_SWAYBAR help Enable support for swaybar -if BR2_PACKAGE_SWAY_SWAYBAR - -config BR2_PACKAGE_SWAY_SWAYBAR_TRAY - bool "swaybar tray" - help - Enable support for swaybar tray - -endif # BR2_PACKAGE_SWAY_SWAYBAR - config BR2_PACKAGE_SWAY_SWAYNAG bool "swaynag" help @@ -54,9 +44,8 @@ config BR2_PACKAGE_SWAY_SWAYNAG endif # BR2_PACKAGE_SWAY -comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" - depends on !BR2_PACKAGE_SYSTEMD || \ - !BR2_PACKAGE_HAS_UDEV || \ +comment "sway needs udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_HAS_UDEV || \ !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ !BR2_PACKAGE_HAS_LIBGLES diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 0aad9de712..089b533baf 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -8,13 +8,12 @@ SWAY_VERSION = 1.8.1 SWAY_SITE = https://github.com/swaywm/sway/releases/download/$(SWAY_VERSION) SWAY_LICENSE = MIT SWAY_LICENSE_FILES = LICENSE -SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango +SWAY_DEPENDENCIES = host-pkgconf wlroots json-c pcre cairo pango SWAY_CONF_OPTS = \ -Dwerror=false \ -Dzsh-completions=false \ -Dfish-completions=false \ - -Dman-pages=disabled \ - -Dsd-bus-provider=libsystemd + -Dman-pages=disabled ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) SWAY_CONF_OPTS += -Dxwayland=enabled @@ -53,8 +52,9 @@ else SWAY_CONF_OPTS += -Dswaynag=false endif -ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y) -SWAY_CONF_OPTS += -Dtray=enabled +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SWAY_DEPENDENCIES += systemd +SWAY_CONF_OPTS += -Dtray=enabled -Dsd-bus-provider=libsystemd else SWAY_CONF_OPTS += -Dtray=disabled endif -- 2.43.0 From thomas.petazzoni at bootlin.com Sat Feb 3 06:55:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 03 Feb 2024 06:55:05 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-02 Message-ID: Hello, Autobuild statistics for 2024-02-02 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 5 | 4 | 0 | 9 | 2023.11.x | 3 | 3 | 0 | 6 | master | 48 | 46 | 0 | 94 | Classification of failures by reason for master ----------------------------------------------- axel-2.17.12 | 6 libressl-3.8.2 | 6 linux-6.6.14 | 3 attr-2.5.2 | 2 cegui-00b4e1fe174da53b7ed72... | 2 libarchive-3.7.2 | 2 libopenssl-3.2.0 | 2 openblas-0.3.25 | 2 stunnel-5.71 | 2 bluez5_utils-5.68 | 1 boost-1.83.0 | 1 check-11970a7e112dfe243a2e6... | 1 crun-1.12 | 1 dmraid-1.0.0.rc16-3 | 1 glibc-2.38-44-gd37c2b20a478... | 1 gobject-introspection-1.76.1 | 1 host-gcc-final-12.3.0 | 1 host-rust-1.74.1 | 1 host-sentry-cli-2.20.3 | 1 htop-3.3.0 | 1 ipmitool-1_8_19 | 1 libabseil-cpp-20230802.1 | 1 libcamera-apps-1.2.1 | 1 linux-tools | 1 Makefile:727: target-finalize | 1 openssh-9.6p1 | 1 php-8.2.15 | 1 tcf-agent-1.8.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/cf06fd96f7e16cff9980af6f61edff0268970d6b | microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/05ce01cd38eb843727c63b0b234784be8640d5d0 | aarch64_be | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/87cf5cca360001e3d5ed0524c0dd82daf1d958f4 | mips64 | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/185366701155050bc57c15cca7fe00d7b03212dd | powerpc64le | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/12f2a9002fcd839a5f4810c5c5f3fd990f99c878 | m68k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/33d7c66ed11c29c9e11998fa77fd01c6c01e7794 | sparc64 | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/8bbb5b681fe07a25b1697e61ebdc8ad6a12b68cd | armeb | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/fa8a01b6556e46306d1b4bff5aae1dbc0d547d7f | sh4aeb | bluez5_utils-5.68 | NOK | http://autobuild.buildroot.net/results/a3ef3041d27d13d8d12bbe4a5e38127fb910ed98 | sh4 | boost-1.83.0 | NOK | http://autobuild.buildroot.net/results/4a0c2d637964962c2e31140fb189d67b5c4c6a7c | microblazeel | cegui-00b4e1fe174da53b7ed72... | NOK | http://autobuild.buildroot.net/results/4ff32eff551335875113c7e1c19ef88ec3c80e90 | armeb | cegui-00b4e1fe174da53b7ed72... | NOK | http://autobuild.buildroot.net/results/74a1dcd1581ce3cf8816f458e4fd87a59ac0a6cc | riscv64 | check-11970a7e112dfe243a2e6... | NOK | http://autobuild.buildroot.net/results/f3b25683ab56789d2a31aa58abdd316802e6186a | ORPH arceb | crun-1.12 | NOK | http://autobuild.buildroot.net/results/536614905bc3dd80b4d8994e8d3827a506830bcf | mips64 | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/d79a98238b3dd579186f46792d27231fa062dea9 | ORPH powerpc64le | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/36614be506fed8023485fdf5fe65a97850a9b14e | i686 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/60b92173ed6e2fa921103efe59e6e657099aebc2 | ORPH arm | host-gcc-final-12.3.0 | NOK | http://autobuild.buildroot.net/results/fffd8332f4f7d684b1cd1cf40853665f23addf5c | aarch64 | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/d9dab59fd0fbee06ff3abaffa3e844144476b649 | mips64el | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/4f03ef21b6828110b0ed5d4e8cc250ea2a7f7778 | or1k | htop-3.3.0 | NOK | http://autobuild.buildroot.net/results/45bd7a30d91d82c07a7aed3a79d9e8c30b17406b | ORPH mipsel | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/3c32271c779591e23b09a5e0acd00d3255352689 | microblaze | libabseil-cpp-20230802.1 | NOK | http://autobuild.buildroot.net/results/438f0e5917703f83e392d2830b98e39644cefa6e | powerpc64 | libarchive-3.7.2 | NOK | http://autobuild.buildroot.net/results/2c9a3a308199c99a5f43b4364f8cae0543927b63 | arm | libarchive-3.7.2 | NOK | http://autobuild.buildroot.net/results/031cb8089bda862b1b5b75fb2fb2c71bbdb3c05c | armeb | libcamera-apps-1.2.1 | NOK | http://autobuild.buildroot.net/results/328b9220facf866fed1ab124dfda15cdbc2ea4ba | s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/8774b2bc44d62b5e8232c2453a3586017656d8d2 | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/457aacbdd953b5796ec4682f752014bb9f16c8b8 | ORPH m68k | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/787a284e0d253d30d3bebdc38505f91a4c901ab6 | ORPH mipsel | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/dbc5448b23a446331f30ac5aebc73049bb32da20 | ORPH microblazeel | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/c912a8a2c1f11dbb41d825f7724b2603f98f9f21 | ORPH mipsel | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/8c329dd759cc7fff00ac13c3339b2bf8309aa4bd | ORPH powerpc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/c8e4952fd9ee8befdcaf4e0ba152ddb9f1e27ef0 | ORPH mips | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/aa416a196dc71b34ee9694b9048b8ed16d551f70 | ORPH microblazeel | linux-6.6.14 | NOK | http://autobuild.buildroot.net/results/7fef4db25ef4bf1fd3793a370e924489ce58afcc | ORPH mips64 | linux-6.6.14 | NOK | http://autobuild.buildroot.net/results/018b7dfa2bfd1eaefbdb4de8883594612a0f0219 | ORPH powerpc64le | linux-6.6.14 | NOK | http://autobuild.buildroot.net/results/ad087fcb33886ff06bdeb8532b78cc14028408ee | ORPH powerpc64le | linux-tools | NOK | http://autobuild.buildroot.net/results/4f8a3950c371cf1b9a880ff04e2b3d7097f2711d | ORPH mips64 | Makefile:727: target-finalize | NOK | http://autobuild.buildroot.net/results/358eb1cbc37dc30755747c1a122af27e9cae2333 | mips64 | openblas-0.3.25 | NOK | http://autobuild.buildroot.net/results/e84a7e5c937c8ce3b3b6f5dc09000bc8b1ecd3b2 | i686 | openblas-0.3.25 | NOK | http://autobuild.buildroot.net/results/de38d38309bb5745e4559e2dd5fe140ba178aaa4 | mipsel | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/54396a537689d0063bec92f27b0b233b689355b9 | ORPH microblazeel | php-8.2.15 | NOK | http://autobuild.buildroot.net/results/d272d43046b4bb6b5f567949e0d406074c4bb32b | m68k | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/8854672c48421f99639b1f1c0e783e52a4e8441e | x86_64 | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/a321014c26715945fa3107fdd4995e1d3359499a | powerpc64le | tcf-agent-1.8.0 | NOK | http://autobuild.buildroot.net/results/882e9e0e8d719db357ba5b42b7b290fa493993c0 | Classification of failures by reason for 2023.02.x -------------------------------------------------- coreutils-9.1 | 1 elfutils-0.186 | 1 freeswitch-1.10.11 | 1 raptor-2.0.15 | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4eb | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/49ea74a69b85f3ee23e1360945afbf28cf8d329b | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/428b88bf8435327dff7d82cf53fa4079fada17a2 | ORPH sparc64 | freeswitch-1.10.11 | NOK | http://autobuild.buildroot.net/results/5d6d561eb00de633af582846a7d424db103bbe76 | riscv32 | raptor-2.0.15 | NOK | http://autobuild.buildroot.net/results/c09ae7aa2cd79b5c16d09aaecde10cd2e7d4feaf | ORPH Classification of failures by reason for 2023.11.x -------------------------------------------------- libressl-3.8.2 | 1 micropython-1.22.0 | 1 proj-9.3.0 | 1 Detail of failures for 2023.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/0fbf30496a563b6b7c2ec297bc28fb326659251d | ORPH i686 | micropython-1.22.0 | NOK | http://autobuild.buildroot.net/results/d0fbbb4dbd0c16c07161bc7190d42a0509ac1f68 | sparc64 | proj-9.3.0 | NOK | http://autobuild.buildroot.net/results/3549aaa5942f804ef82ce30e87a2b01555432367 | Gitlab CI results for 2024-02-02 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ acmesystems_arietta_g25_256mb | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069399598 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069399619 | armadeus_apf28 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069399669 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069399714 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400025 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400173 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400233 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400315 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400425 | ORPH beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400527 | broadcom_northstar | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400544 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400560 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400583 | freescale_imx6qsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400600 | freescale_imx8mmevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400636 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400645 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400662 | ORPH grinn_chiliboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400693 | hifive_unleashed | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400702 | imx6-sabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400718 | imx6slevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400735 | imx6ulpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400752 | imx7dpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400759 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400760 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400767 | imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400771 | imxrt1050-evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400773 | kontron_bl_imx8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400779 | kontron_pitx_imx8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400782 | ls1028ardb | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400794 | octavo_osd32mp1_brk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400867 | octavo_osd32mp1_red | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400871 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400906 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400913 | orangepi_zero3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400930 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401106 | ORPH raspberrypizero2w | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401118 | sipeed_licheepi_nano | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401145 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401255 | snps_arc700_nsim | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401262 | ORPH socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401284 | ti_am62x_sk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401414 | ti_am64x_sk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401433 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401437 | -- http://autobuild.buildroot.net From peter at korsgaard.com Sat Feb 3 09:14:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 10:14:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 23.3.5 In-Reply-To: <20240202192126.51102-1-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 2 Feb 2024 20:21:26 +0100") References: <20240202192126.51102-1-bernd@kuhls.net> Message-ID: <8734u9x62r.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 09:14:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 10:14:54 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 6.{1, 6}.x series In-Reply-To: <20240202192933.53122-1-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 2 Feb 2024 20:29:33 +0100") References: <20240202192933.53122-1-bernd@kuhls.net> Message-ID: <87y1c1vrht.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 09:15:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 10:15:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-peripheral-joystick: bump version to 20.1.15-Nexus In-Reply-To: <20240202193506.58522-1-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 2 Feb 2024 20:35:06 +0100") References: <20240202193506.58522-1-bernd@kuhls.net> Message-ID: <87ttmpvrhj.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 09:15:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 10:15:15 +0100 Subject: [Buildroot] [PATCH 1/2] package/intel-mediadriver: bump version to 24.1.3 In-Reply-To: <20240202222040.2390770-1-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 2 Feb 2024 23:20:39 +0100") References: <20240202222040.2390770-1-bernd@kuhls.net> Message-ID: <87plxdvrh8.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 09:20:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 10:20:20 +0100 Subject: [Buildroot] [PATCH 2/2] package/onevpl-intel-gpu: bump version to 24.1.3 In-Reply-To: <20240202222040.2390770-2-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 2 Feb 2024 23:20:40 +0100") References: <20240202222040.2390770-1-bernd@kuhls.net> <20240202222040.2390770-2-bernd@kuhls.net> Message-ID: <87le81vr8r.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 09:14:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 10:14:20 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240203092054.574FE8640A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52a15667b122575919bd7207a16872e8eb229bfd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 662bd09162..da22b439e3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.15" 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 d7082aa629..10edcc2ed9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584 linux-6.6.14.tar.xz -sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz +sha256 ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa linux-6.6.15.tar.xz +sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index bf55c8714a..a0e572adc0 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.75" if BR2_KERNEL_HEADERS_6_1 - default "6.6.14" if BR2_KERNEL_HEADERS_6_6 + default "6.1.76" if BR2_KERNEL_HEADERS_6_1 + default "6.6.15" if BR2_KERNEL_HEADERS_6_6 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 \ From peter at korsgaard.com Sat Feb 3 09:15:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 10:15:28 +0100 Subject: [Buildroot] [git commit] package/onevpl-intel-gpu: bump version to 24.1.3 Message-ID: <20240203092054.7791686418@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62a5510c219e2b45fa6bb6c21b543d7a78c4fbdf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index d1e671f96a..a45758a2c3 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e0bd388c04740dd9f2e8ca989bc54428c13a531ed4c097d00f06aa6e58a6d15c onevpl-intel-gpu-24.1.1.tar.gz +sha256 15d34e4304d7aeb5ea5e529b6f51171109cef42525113321f675bc14e56c697e onevpl-intel-gpu-24.1.3.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index 52fbe2ed9b..509698ce26 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 24.1.1 +ONEVPL_INTEL_GPU_VERSION = 24.1.3 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 3 09:15:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 10:15:02 +0100 Subject: [Buildroot] [git commit] package/kodi-peripheral-joystick: bump version to 20.1.15-Nexus Message-ID: <20240203092054.623EF8640B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49ee9ca5aca21abfc45034424d825bd81434221d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 550da61981..d4765d2b2c 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8c3dde851e45549d13ca3fcead9c27c440dfe070d68fb473ae71c522bc54753a kodi-peripheral-joystick-20.1.14-Nexus.tar.gz +sha256 7292431b26e3ea969967a02f42ce48cae7742398b148ca041470c17934d06272 kodi-peripheral-joystick-20.1.15-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 2fe6c29c0d..d81962562c 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.14-Nexus +KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.15-Nexus KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Sat Feb 3 09:14:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 10:14:12 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 23.3.5 Message-ID: <20240203092054.4C64986409@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=881fbdb674878a010f0ddb3d5d9447be3fc8eea2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index d04fa10342..b9b328b268 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.3.4 +MESA3D_HEADERS_VERSION = 23.3.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e99027c013..7e49119c41 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-January/000745.html -sha256 df12d765be4650fe532860b18aa18e6da1d0b07d1a21dfdfe04660e6b7bac39a mesa-23.3.4.tar.xz -sha512 026c424989a594dd840dc158ca09e0f57e604f0b1bd2a3981110b4b2b5a47c6cd9c7241c7f48957a781e2dd9f9760cc9db79b2fb7c7fe39b64eddb18dcf18412 mesa-23.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html +sha256 69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f mesa-23.3.5.tar.xz +sha512 1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea mesa-23.3.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d8d8fb8dd6..d622d513f0 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.3.4 +MESA3D_VERSION = 23.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From peter at korsgaard.com Sat Feb 3 09:15:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 10:15:12 +0100 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 24.1.3 Message-ID: <20240203092054.6CF5086414@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd31d973d7550f27b954d7987e4a652ff451e7d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index feade4974c..a1b098094b 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 da90f3c38176936f6315bb4b0f04f6f83080f9a6a228294538aa6befe9ce20e0 intel-media-24.1.1.tar.gz +sha256 a024e96abd662193e4295f427a76c5894087503df46bd82c0e5bea103e44b171 intel-media-24.1.3.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index f526de193c..72a22fe5c9 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.1.1 +INTEL_MEDIADRIVER_VERSION = 24.1.3 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From peter at korsgaard.com Sat Feb 3 10:02:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:02:48 +0100 Subject: [Buildroot] [PATCH 1/2 v2] package/libjwt: new package In-Reply-To: (Waldemar Brodkorb's message of "Fri, 2 Feb 2024 16:56:14 +0100") References: Message-ID: <87h6ipvp9z.fsf@48ers.dk> >>>>> "Waldemar" == Waldemar Brodkorb writes: > JSON Web Tokens are an open, industry standard RFC 7519 > method for representing claims securely between two parties. > This Library is used by Asterisk 20.6.0 and newer. > We need to use autotools to install pkgconfig file. > Signed-off-by: Waldemar Brodkorb > --- > package/Config.in | 1 + > package/libjwt/Config.in | 9 +++++++++ > package/libjwt/libjwt.hash | 3 +++ > package/libjwt/libjwt.mk | 16 ++++++++++++++++ > 4 files changed, 29 insertions(+) > create mode 100644 package/libjwt/Config.in > create mode 100644 package/libjwt/libjwt.hash > create mode 100644 package/libjwt/libjwt.mk > diff --git a/package/Config.in b/package/Config.in > index 426bd7d090..75a94177eb 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1846,6 +1846,7 @@ menu "JSON/XML" > source "package/libbson/Config.in" > source "package/libfastjson/Config.in" > source "package/libjson/Config.in" > + source "package/libjwt/Config.in" > source "package/libroxml/Config.in" > source "package/libucl/Config.in" > source "package/libxml2/Config.in" > diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in > new file mode 100644 > index 0000000000..d6bca54adc > --- /dev/null > +++ b/package/libjwt/Config.in > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_LIBJWT > + bool "libjwt" > + select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_JANSSON > + help > + JSON Web Tokens are an open, industry standard RFC 7519 I've dropped the trailing spaces here. > diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk > new file mode 100644 > index 0000000000..f7be28d206 > --- /dev/null > +++ b/package/libjwt/libjwt.mk > @@ -0,0 +1,16 @@ > +################################################################################ > +# > +# libjwt > +# > +################################################################################ > + > +LIBJWT_VERSION = 1.15.3 > +LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) > +LIBJWT_SOURCE = libjwt-$(LIBJWT_VERSION).tar.gz THis is the default value for _SOURCE as pointed out by ./utils/check-package, so I've dropped that. > +LIBJWT_DEPENDENCIES = jansson openssl The configure script uses pkg-config, so I've added host-pkgconf here. You also forgot to add an entry to DEVELOPERS, so I've added that. Committed with those fixes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:02:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:02:05 +0100 Subject: [Buildroot] [git commit] package/libjwt: new package Message-ID: <20240203100313.6E1CA865AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7251775773011e7da38e3a33c6817eceab6a9dfa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master JSON Web Tokens are an open, industry standard RFC 7519 method for representing claims securely between two parties. This Library is used by Asterisk 20.6.0 and newer. We need to use autotools to install pkgconfig file. Signed-off-by: Waldemar Brodkorb [Peter: drop _SOURCE, add host-pkgconf, add to DEVELOPERS] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/libjwt/Config.in | 9 +++++++++ package/libjwt/libjwt.hash | 3 +++ package/libjwt/libjwt.mk | 15 +++++++++++++++ 5 files changed, 29 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index cc9bc5b5cc..02b7516a92 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3116,6 +3116,7 @@ F: package/ngrep/ N: Waldemar Brodkorb F: package/asterisk/ +F: package/libjwt/ F: package/mksh/ F: package/ruby/ F: package/uclibc/ diff --git a/package/Config.in b/package/Config.in index 426bd7d090..75a94177eb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1846,6 +1846,7 @@ menu "JSON/XML" source "package/libbson/Config.in" source "package/libfastjson/Config.in" source "package/libjson/Config.in" + source "package/libjwt/Config.in" source "package/libroxml/Config.in" source "package/libucl/Config.in" source "package/libxml2/Config.in" diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in new file mode 100644 index 0000000000..fa042d67ef --- /dev/null +++ b/package/libjwt/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBJWT + bool "libjwt" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_JANSSON + help + JSON Web Tokens are an open, industry standard RFC 7519 + method for representing claims securely between two parties. + + https://github.com/benmcollins/libjwt diff --git a/package/libjwt/libjwt.hash b/package/libjwt/libjwt.hash new file mode 100644 index 0000000000..47e8b2c506 --- /dev/null +++ b/package/libjwt/libjwt.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cb2fd95123689e7d209a3a8c060e02f68341c9a5ded524c0cd881a8cd20d711f libjwt-1.15.3.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk new file mode 100644 index 0000000000..6ae1717b7d --- /dev/null +++ b/package/libjwt/libjwt.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# libjwt +# +################################################################################ + +LIBJWT_VERSION = 1.15.3 +LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) +LIBJWT_DEPENDENCIES = host-pkgconf jansson openssl +LIBJWT_AUTORECONF = YES +LIBJWT_INSTALL_STAGING = YES +LIBJWT_LICENSE = MPL-2.0 +LIBJWT_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) From peter at korsgaard.com Sat Feb 3 10:05:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:05:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/crda: drop CRDA_CPE_ID_VENDOR In-Reply-To: <20240201174641.183601-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:46:41 +0100") References: <20240201174641.183601-1-fontaine.fabrice@gmail.com> Message-ID: <87cytdvp50.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:kernel:crda added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:05:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:05:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/depot-tools: drop DEPOT_TOOLS_CPE_ID_VENDOR In-Reply-To: <20240201174829.184788-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:48:29 +0100") References: <20240201174829.184788-1-fontaine.fabrice@gmail.com> Message-ID: <878r41vp4w.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:google:depot-tools added by commit > 48730a1a9d882a7c56146bd2955e074aed790dcb has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:google:depot-tools > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:06:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:06:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpfr: fix CPE variables In-Reply-To: <20240201175202.186929-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:52:02 +0100") References: <20240201175202.186929-1-fontaine.fabrice@gmail.com> Message-ID: <874jepvp4a.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:gnu:mpfr added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE > identifier for this package > cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:08:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:08:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: fix CPE variable In-Reply-To: <20240201214304.301544-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 22:43:04 +0100") References: <20240201214304.301544-1-fontaine.fabrice@gmail.com> Message-ID: <87zfwhuag1.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set > LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR > Signed-off-by: Fabrice Fontaine Committed, thanks. > --- > package/lvm2/lvm2.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk > index ee43cb6c19..02ea748439 100644 > --- a/package/lvm2/lvm2.mk > +++ b/package/lvm2/lvm2.mk > @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 > LVM2_INSTALL_STAGING = YES > LVM2_LICENSE = GPL-2.0, LGPL-2.1 > LVM2_LICENSE_FILES = COPYING COPYING.LIB > -LVM2_CPE_ID_PRODUCT = redhat > +LVM2_CPE_ID_VENDOR = redhat > LVM2_SELINUX_MODULES = lvm > # Make sure that binaries and libraries are installed with write FYI, your tree is not in sync with master, so I had to apply this manually. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:07:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:07:45 +0100 Subject: [Buildroot] [git commit] package/lvm2: fix CPE variable Message-ID: <20240203100847.D77558673C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c0d9795a7a75a36574a7cc89107d71cb32fd20e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lvm2/lvm2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 474ea30bdc..810d668ec2 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB -LVM2_CPE_ID_PRODUCT = redhat +LVM2_CPE_ID_VENDOR = redhat # parallel build issues LVM2_MAKE = $(MAKE1) From peter at korsgaard.com Sat Feb 3 10:04:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:04:49 +0100 Subject: [Buildroot] [git commit] package/crda: drop CRDA_CPE_ID_VENDOR Message-ID: <20240203100847.AFA868671F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85d300f1021df905e60e704407b68dbed75ba430 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:kernel:crda added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/crda/crda.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/crda/crda.mk b/package/crda/crda.mk index a73c9aa26d..8043260cfc 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -9,7 +9,6 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE -CRDA_CPE_ID_VENDOR = kernel define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ From peter at korsgaard.com Sat Feb 3 10:05:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:05:30 +0100 Subject: [Buildroot] [git commit] package/depot-tools: drop DEPOT_TOOLS_CPE_ID_VENDOR Message-ID: <20240203100847.C11A786737@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27fafa94a729b2c59d5eb0aec0bedbaf9dce5abb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:google:depot-tools added by commit 48730a1a9d882a7c56146bd2955e074aed790dcb has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:google:depot-tools Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/depot-tools/depot-tools.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index 634258ffbb..a53afa14d6 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -9,7 +9,6 @@ DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause DEPOT_TOOLS_LICENSE_FILES = LICENSE -DEPOT_TOOLS_CPE_ID_VENDOR = google HOST_DEPOT_TOOLS_DEPENDENCIES = \ host-python3 \ From peter at korsgaard.com Sat Feb 3 10:06:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:06:08 +0100 Subject: [Buildroot] [git commit] package/mpfr: fix CPE variables Message-ID: <20240203100847.CDBB58673B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=186883f497cf1c3985c9b802435ddd3b6c431167 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:gnu:mpfr added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE identifier for this package cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mpfr/mpfr.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 8d12c7502b..c0c8c04646 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -9,7 +9,8 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER -MPFR_CPE_ID_VENDOR = gnu +MPFR_CPE_ID_VENDOR = mpfr +MPFR_CPE_ID_PRODUCT = gnu_mpfr MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp From peter at korsgaard.com Sat Feb 3 10:10:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:10:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/minizip: fix CPE variables In-Reply-To: <20240201221659.320957-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 23:16:59 +0100") References: <20240201221659.320957-1-fontaine.fabrice@gmail.com> Message-ID: <87v875uac8.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:minizip_project:minizip added by commit > 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier > for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: > https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:10:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:10:41 +0100 Subject: [Buildroot] [git commit] package/minizip: fix CPE variables Message-ID: <20240203101104.AA02486749@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1e05a8199514310443777bc4dce1e2a6d2b69c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:minizip_project:minizip added by commit 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/minizip/minizip.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 5a4d920369..819b33b701 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -14,7 +14,8 @@ MINIZIP_CONF_OPTS = \ -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project +MINIZIP_CPE_ID_VENDOR = zlib-ng +MINIZIP_CPE_ID_PRODUCT = minizip-ng ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 From peter at korsgaard.com Sat Feb 3 10:11:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:11:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvips: update LIBVIPS_CPE_ID_VENDOR In-Reply-To: <20240201172051.165994-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:20:51 +0100") References: <20240201172051.165994-1-fontaine.fabrice@gmail.com> Message-ID: <87r0htuaap.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:libvips_project:libvips has been deprecated in favor of > cpe:2.3:a:libvips:libvips in September 2023: > > libvips Project libvips 8.10.6 - > Project > Change Log > > > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:11:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:11:24 +0100 Subject: [Buildroot] [git commit] package/libvips: update LIBVIPS_CPE_ID_VENDOR Message-ID: <20240203101303.17CA78673D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e4eba64140eea6adea87234d9736ae211bd352e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:libvips_project:libvips has been deprecated in favor of cpe:2.3:a:libvips:libvips in September 2023: libvips Project libvips 8.10.6 - Project Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libvips/libvips.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 1a0f9d5ead..8eb1f0964e 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -9,7 +9,7 @@ LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -LIBVIPS_CPE_ID_VENDOR = libvips_project +LIBVIPS_CPE_ID_VENDOR = libvips # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported From peter at korsgaard.com Sat Feb 3 10:31:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:31:49 +0100 Subject: [Buildroot] [PATCH 2/2 v2] package/asterisk: bump to 20.6.0 In-Reply-To: (Waldemar Brodkorb's message of "Fri, 2 Feb 2024 16:58:56 +0100") References: Message-ID: <87msshu9d6.fsf@48ers.dk> >>>>> "Waldemar" == Waldemar Brodkorb writes: > See here for changes: > https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md > Signed-off-by: Waldemar Brodkorb > --- v1-> v2: > - use separate libjwt package instead of bundled one, suggested by > Peter Korsgaard > --- > package/asterisk/Config.in | 1 + > package/asterisk/asterisk.hash | 2 +- > package/asterisk/asterisk.mk | 6 ++++-- > 3 files changed, 6 insertions(+), 3 deletions(-) > diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in > index c52456f8fc..662f070dac 100644 > --- a/package/asterisk/Config.in > +++ b/package/asterisk/Config.in > @@ -10,6 +10,7 @@ config BR2_PACKAGE_ASTERISK > select BR2_PACKAGE_LIBCURL > select BR2_PACKAGE_LIBEDIT > select BR2_PACKAGE_LIBILBC > + select BR2_PACKAGE_LIBJWT > select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_SQLITE > select BR2_PACKAGE_UTIL_LINUX > diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash > index 246f4219aa..d50955dd2b 100644 > --- a/package/asterisk/asterisk.hash > +++ b/package/asterisk/asterisk.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.tar.gz > +sha256 088dbc08916e21528dba364f5452b2090b066dbba4548b32ec10af138d4b442f asterisk-20.6.0.tar.gz > # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases > # sha256 locally computed > diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk > index d1f3ea82d3..869e4128ff 100644 > --- a/package/asterisk/asterisk.mk > +++ b/package/asterisk/asterisk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -ASTERISK_VERSION = 20.5.2 > +ASTERISK_VERSION = 20.6.0 > # Use the github mirror: it's an official mirror maintained by Digium, and > # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. > ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) > @@ -27,7 +27,7 @@ ASTERISK_SELINUX_MODULES = asterisk > # For patches 0002 and 0003 > ASTERISK_AUTORECONF = YES > -ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson > +ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson -Ithird-party/libjwt Why do we still need to point autoreconf to the bundle libjwt? Even worse, I see the following during the configure step: checking for embedded pjproject (may have to download)... configuring [pjproject] Downloading https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13.1/pjproject-2.13.1.tar.bz2 to /tmp/pjproject-2.13.1.tar.bz2 [pjproject] Verifying /tmp/pjproject-2.13.1.tar.bz2 [pjproject] Verify successful [pjproject] Verifying /tmp/pjproject-2.13.1.tar.bz2 [pjproject] Verify successful [pjproject] Unpacking /tmp/pjproject-2.13.1.tar.bz2 We don't want packages to download stuff behind our back. Can we use an external pjproject? -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Feb 3 10:35:01 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 11:35:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/rauc-hawkbit-updater: drop RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR Message-ID: <20240203103501.41738-1-fontaine.fabrice@gmail.com> cpe:2.3:a:pengutronix:rauc-hawkbit-updater added by commit 928b7219cd7079864eadadc66dbff21c5cd72804 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:pengutronix:rauc-hawkbit-updater Signed-off-by: Fabrice Fontaine --- package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index 10ba91abbb..a453f75a28 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -9,7 +9,6 @@ RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/release RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE -RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl $(eval $(meson-package)) -- 2.43.0 From peter at korsgaard.com Sat Feb 3 10:39:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:39:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuwsc: fix wolfssl build In-Reply-To: <20240114155626.1563626-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 14 Jan 2024 16:56:26 +0100") References: <20240114155626.1563626-1-fontaine.fabrice@gmail.com> Message-ID: <87il35u90d.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 1567fbd72d4b547f70a7509247bf9abb73ab58e3 didn't fully fix the > wolfssl build failure because the include on wolfssl/options.h was still > missing: > /home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' > 62 | SSL_CTX *ctx; > | ^~~~~~~ > While at it, add upstream tag to patches > Fixes: > - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:39:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:39:09 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/libuwsc: fix wolfssl build Message-ID: <20240203104253.21F748679A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56c80a2830698da2b6d80081625f39697900325f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 1567fbd72d4b547f70a7509247bf9abb73ab58e3 didn't fully fix the wolfssl build failure because the include on wolfssl/options.h was still missing: /home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' 62 | SSL_CTX *ctx; | ^~~~~~~ While at it, add upstream tag to patches Fixes: - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e874fd08e01a8d543520f867d95ae8a6a9fa242e) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 -- .../0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch | 2 +- package/libuwsc/0002-fix-bad-indentation.patch | 3 +- .../libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch | 37 ++++++++++++++++++++++ 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index dde9c6311e..0554ffde5b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -755,8 +755,6 @@ package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch Upstream package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch Upstream package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch Upstream package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch Upstream -package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch Upstream -package/libuwsc/0002-fix-bad-indentation.patch Upstream package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch Upstream package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch Upstream package/libwebsock/0002-fix-ssl.patch Upstream diff --git a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch index 197dd1de0f..87f343a9d9 100644 --- a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch +++ b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch @@ -6,7 +6,7 @@ Subject: [PATCH] CMakeLists.txt: add BUILD_EXAMPLE Allow the user to disable example Signed-off-by: Fabrice Fontaine -[yann.morin.1998 at free.fr: backport from upstream] +Upstream: https://github.com/zhaojh329/libuwsc/commit/bb71b21eb9407479ad729b3c858b0fc350fae335 Signed-off-by: Yann E. MORIN --- CMakeLists.txt | 6 +++++- diff --git a/package/libuwsc/0002-fix-bad-indentation.patch b/package/libuwsc/0002-fix-bad-indentation.patch index f33f944d06..77cae92cf2 100644 --- a/package/libuwsc/0002-fix-bad-indentation.patch +++ b/package/libuwsc/0002-fix-bad-indentation.patch @@ -5,8 +5,7 @@ Subject: [PATCH] fix bad indentation Fixes error with GCC11. -[Retrieved from: -https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab] +Upstream: https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab Signed-off-by: Fabrice Fontaine --- src/lua/uwsc_lua.c | 2 +- diff --git a/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch new file mode 100644 index 0000000000..4c652a63c2 --- /dev/null +++ b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch @@ -0,0 +1,37 @@ +From 1c3579e99163a13d622c3ef44088c23d5eea306d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Jan 2024 16:44:13 +0100 +Subject: [PATCH] src/ssl.c: fix wolfssl build + +wolfssl/options.h must also be included by clients to avoid the +following build failure because OPENSSL_ALL won't be defined: + +/home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' + 62 | SSL_CTX *ctx; + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 + +Signed-off-by: Fabrice Fontaine +Upstream: N/A (already fixed by +https://github.com/zhaojh329/ssl/commit/c40ebcd7b4277321acbbd4b00b4b10fd363c7a97) +--- + src/ssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ssl.c b/src/ssl.c +index 3640022..6a3d250 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -54,6 +54,7 @@ struct uwsc_ssl_ctx { + #include + #elif UWSC_HAVE_WOLFSSL + #define WC_NO_HARDEN ++#include + #include + #include + #endif +-- +2.43.0 + From peter at korsgaard.com Sat Feb 3 10:38:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:38:11 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/libuwsc: fix wolfssl build Message-ID: <20240203104359.5251B8679D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c2621bb60178904ad7914637743a63104173655 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit 1567fbd72d4b547f70a7509247bf9abb73ab58e3 didn't fully fix the wolfssl build failure because the include on wolfssl/options.h was still missing: /home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' 62 | SSL_CTX *ctx; | ^~~~~~~ While at it, add upstream tag to patches Fixes: - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e874fd08e01a8d543520f867d95ae8a6a9fa242e) Signed-off-by: Peter Korsgaard --- .../0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch | 2 +- package/libuwsc/0002-fix-bad-indentation.patch | 3 +- .../libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch | 37 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch index 197dd1de0f..87f343a9d9 100644 --- a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch +++ b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch @@ -6,7 +6,7 @@ Subject: [PATCH] CMakeLists.txt: add BUILD_EXAMPLE Allow the user to disable example Signed-off-by: Fabrice Fontaine -[yann.morin.1998 at free.fr: backport from upstream] +Upstream: https://github.com/zhaojh329/libuwsc/commit/bb71b21eb9407479ad729b3c858b0fc350fae335 Signed-off-by: Yann E. MORIN --- CMakeLists.txt | 6 +++++- diff --git a/package/libuwsc/0002-fix-bad-indentation.patch b/package/libuwsc/0002-fix-bad-indentation.patch index f33f944d06..77cae92cf2 100644 --- a/package/libuwsc/0002-fix-bad-indentation.patch +++ b/package/libuwsc/0002-fix-bad-indentation.patch @@ -5,8 +5,7 @@ Subject: [PATCH] fix bad indentation Fixes error with GCC11. -[Retrieved from: -https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab] +Upstream: https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab Signed-off-by: Fabrice Fontaine --- src/lua/uwsc_lua.c | 2 +- diff --git a/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch new file mode 100644 index 0000000000..4c652a63c2 --- /dev/null +++ b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch @@ -0,0 +1,37 @@ +From 1c3579e99163a13d622c3ef44088c23d5eea306d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Jan 2024 16:44:13 +0100 +Subject: [PATCH] src/ssl.c: fix wolfssl build + +wolfssl/options.h must also be included by clients to avoid the +following build failure because OPENSSL_ALL won't be defined: + +/home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' + 62 | SSL_CTX *ctx; + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 + +Signed-off-by: Fabrice Fontaine +Upstream: N/A (already fixed by +https://github.com/zhaojh329/ssl/commit/c40ebcd7b4277321acbbd4b00b4b10fd363c7a97) +--- + src/ssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ssl.c b/src/ssl.c +index 3640022..6a3d250 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -54,6 +54,7 @@ struct uwsc_ssl_ctx { + #include + #elif UWSC_HAVE_WOLFSSL + #define WC_NO_HARDEN ++#include + #include + #include + #endif +-- +2.43.0 + From peter at korsgaard.com Sat Feb 3 10:56:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:56:24 +0100 Subject: [Buildroot] [PATCH/2023.11.x 1/1] package/onevpl: fix libdrm dependency In-Reply-To: <20240114192123.3237389-1-bernd@kuhls.net> (Bernd Kuhls's message of "Sun, 14 Jan 2024 20:21:23 +0100") References: <20240114192123.3237389-1-bernd@kuhls.net> Message-ID: <87eddtu887.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Buildroot commit c50e9c21f0444b064bc257fcc0d3073fee945623 initially > added the package onevpl and forgot to add all dependencies of > BR2_PACKAGE_LIBDRM_INTEL. > Fixes: > http://autobuild.buildroot.org/results/8fa/8fa0f2cd7a027d3d8fae56125621b0b814e132da/ > Signed-off-by: Bernd Kuhls Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:48:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:48:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/onevpl: fix libdrm dependency Message-ID: <20240203105723.29EB8867A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=710935ea5f988ed36d0184cd0eb3fcfa695a0995 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Buildroot commit c50e9c21f0444b064bc257fcc0d3073fee945623 initially added the package onevpl and forgot to add all dependencies of BR2_PACKAGE_LIBDRM_INTEL. Fixes: http://autobuild.buildroot.org/results/8fa/8fa0f2cd7a027d3d8fae56125621b0b814e132da/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/onevpl/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/onevpl/Config.in b/package/onevpl/Config.in index a750e54d52..cd5b284531 100644 --- a/package/onevpl/Config.in +++ b/package/onevpl/Config.in @@ -12,7 +12,9 @@ config BR2_PACKAGE_ONEVPL depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND # libva support needs a libdrm with intel driver - select BR2_PACKAGE_LIBDRM_INTEL if BR2_PACKAGE_LIBVA + select BR2_PACKAGE_LIBDRM_INTEL if BR2_PACKAGE_LIBVA && \ + (BR2_i386 || BR2_x86_64) && \ + BR2_PACKAGE_LIBDRM_HAS_ATOMIC select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 help From peter at korsgaard.com Sat Feb 3 11:24:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 12:24:38 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/flutter-sdk-bin/Config.in.host: change flutter-pub-cache location In-Reply-To: <20240113194950.11170-1-adam.duskett@amarulasolutions.com> (Adam Duskett's message of "Sat, 13 Jan 2024 12:49:50 -0700") References: <20240113194950.11170-1-adam.duskett@amarulasolutions.com> Message-ID: <87a5ohu6x5.fsf@48ers.dk> >>>>> "Adam" == Adam Duskett writes: > When running the command "flutter pub get," the plugins are stored in the > pub-cache directory along with their sha256sum hashes. The default location of > the pub-cache directory is current $(HOST_DIR)/share/flutter/sdk/.pub-cache, > which is not an acceptable choice by default because every plugin is > re-downloaded during every build of a flutter application either during a new > build or when building with the per-package-directory option enabled. > Furthermore, keeping the pub-cache in its current location prevents users from > committing the pub-cache directory to git for faster rebuilds of a > Buildroot-based system, as users cannot store the pub-cache for later use. > To fix the above issue completely, the following two changes must occur: > - Change the hard-coded Flutter pub-cache location to > $(DL_DIR)/br-flutter-pub-cache. > - Remove the `rm -rf $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache` and the > associated comment about why the build system removes the .pub-cache > directory. After further research, the help text of the precache command > reads, "Populate the Flutter tool's cache of binary artifacts." > The current reasoning listed in the comments is not accurate for a > the following reasons: > 1. We do not want to remove their directory if users already have a pub > cache they have symlinked to. > 2. If the flutter-sdk-bin package previously set up the pub-cache, then > the pub-cache directory is set up with the options we want, and there > is no reason to remove the pub-cache directory. > Signed-off-by: Adam Duskett > --- > changes v3 -> v4: > - Hardcode the directory to $(DL_DIR)/br-flutter-pub-cache. [Yann] > - Remove the `rm -rf $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache` line. [Yann] > - Remove the associated comments about the above line. [Yann] > - Expand the commit log. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 11:27:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 12:27:10 +0100 Subject: [Buildroot] [PATCH v3 02/10] package/depot-tools: bump version to 8d14454ba4a35fd9d2483842b08815a2357ec86f In-Reply-To: (Yann E. MORIN's message of "Sat, 20 Jan 2024 22:45:19 +0100") References: <20240117225049.28443-1-adam.duskett@amarulasolutions.com> <20240117225049.28443-3-adam.duskett@amarulasolutions.com> Message-ID: <875xz5u6sx.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Adam, All, > On 2024-01-17 15:50 -0700, Adam Duskett spake thusly: > The comments you provided in the cover letter really belonged to this > commmit log, so I copied that as-is (apart for line-wrapping). >> Signed-off-by: Adam Duskett > Applied to master, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 11:28:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 12:28:10 +0100 Subject: [Buildroot] [git commit] package/flutter-engine/Config.in: Drop nptl dependency In-Reply-To: <20240120214300.5069386308@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 20 Jan 2024 21:44:12 +0100") References: <20240120214300.5069386308@busybox.osuosl.org> Message-ID: <871q9tu6r9.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=019cfcfc4a108112306f30c38c1a17fc42841e15 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > As Yann mentioned in commit 9d8497e79de3ced144877ba6ee38cc5b7181aaeb, a > dependency on a glibc toolchain implies a dependency on > BR2_TOOLCHAIN_HAS_THREADS_NPTL. As such, remove the dependency from > package/flutter-engine/Config.in. > Signed-off-by: Adam Duskett > Signed-off-by: Yann E. MORIN Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 11:23:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 12:23:28 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-sdk-bin/Config.in.host: change flutter-pub-cache location Message-ID: <20240203112820.74A43867B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=003d02c476b9ff88416f9cc99dbb4a3c0f78664a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x When running the command "flutter pub get," the plugins are stored in the pub-cache directory along with their sha256sum hashes. The default location of the pub-cache directory is current $(HOST_DIR)/share/flutter/sdk/.pub-cache, which is not an acceptable choice by default because every plugin is re-downloaded during every build of a flutter application either during a new build or when building with the per-package-directory option enabled. Furthermore, keeping the pub-cache in its current location prevents users from committing the pub-cache directory to git for faster rebuilds of a Buildroot-based system, as users cannot store the pub-cache for later use. To fix the above issue completely, the following two changes must occur: - Change the hard-coded Flutter pub-cache location to $(DL_DIR)/br-flutter-pub-cache. - Remove the `rm -rf $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache` and the associated comment about why the build system removes the .pub-cache directory. After further research, the help text of the precache command reads, "Populate the Flutter tool's cache of binary artifacts." The current reasoning listed in the comments is not accurate for a the following reasons: 1. We do not want to remove their directory if users already have a pub cache they have symlinked to. 2. If the flutter-sdk-bin package previously set up the pub-cache, then the pub-cache directory is set up with the options we want, and there is no reason to remove the pub-cache directory. Note that upstream considers it safe to have multiple instances of readers/writers to the pub cache concurently, which is a situation that can happen when two flutter-based pacakges are going to be built in parallel. There have been reports upstream [0] [1] [2] where concurrency was an issue, and they have always been fixed [3] [4] (or considered fixed already). So we can assune that, if the conncurrent ccess to the shared pub-cache causes issues, that will be an upstream bug that will get solved. If that turns out to be an unsolvable problem, we'll still have the option to run the pub-get commands under flock. [0] https://github.com/dart-lang/pub/issues/1178 [1] https://github.com/dart-lang/pub/issues/3404 [2] https://github.com/dart-lang/pub/issues/3420 [3] https://github.com/dart-lang/pub/issues/1178#issuecomment-1006489414 [4] https://github.com/dart-lang/pub/issues/1178#issuecomment-1007273739 Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: add blurb about concurrent access] Signed-off-by: Yann E. MORIN (cherry picked from commit 37809258fc014d743f7becbc5ba256234d807bd7) Signed-off-by: Peter Korsgaard --- package/flutter-sdk-bin/flutter-sdk-bin.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index e8e71b6ab0..35bde00b9d 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -41,11 +41,8 @@ define HOST_FLUTTER_SDK_BIN_CONFIGURE_CMDS $(HOST_FLUTTER_SDK_BIN_ENV) $(@D)/bin/dart --disable-analytics endef -# Remove the cache, as we will run precache after setting up flutter and dart -# with the new config options. define HOST_FLUTTER_SDK_BIN_BUILD_CMDS mkdir -p $(HOST_FLUTTER_SDK_BIN_SDK) - rm -rf $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache cd $(@D) && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(@D)/bin/flutter precache; endef @@ -96,4 +93,4 @@ HOST_FLUTTER_SDK_BIN_DART_BIN = \ $(eval $(host-generic-package)) # For target packages to locate said pub-cache -FLUTTER_SDK_BIN_PUB_CACHE = $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache +FLUTTER_SDK_BIN_PUB_CACHE = $(DL_DIR)/br-flutter-pub-cache From peter at korsgaard.com Sat Feb 3 11:26:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 12:26:39 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/depot-tools: bump version to 8d14454ba4a35fd9d2483842b08815a2357ec86f Message-ID: <20240203112820.842E4867B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7207a1242ae137cabf188456f7314becca9a0401 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The current depot-tools version is from Jul 13 2023, and there is a bug where when building with PPD enabled, building a Flutter application on my laptop running Fedora 39 or even in the Debian 11 container fails due to permission issues when running rsync such as: /usr/bin/sed: couldn't open temporary file [...]/output/per-package/flutter-gallery/host/share/flutter/sdk/.vpython-root/0e1e32/lib/python3.8/sed763MrF: Permission denied make: *** [package/pkg-generic.mk:267: [...]/output/build/flutter-gallery-2.10.2/.stamp_configured] Error 123 After several hours of attempting to find the exact cause of the issue by parsing git logs of the depot_tools repository and cross-referencing bugs on https://bugs.chromium.org/p/chromium/issues I am unable to determine the exact reason why the problem occurs or the exact commit that fixes the issue. However, updating depot-tools does indeed fix the issue, and looking at the source code between 4e87f5bf and 8d14454b shows improvements to several bash scripts, such as gclient, vpython3, and spid. All of which could be culprits of this bug. As flutter-engine is the only package that uses host-depot-tools, it is safe to update. This permission bug is present on PPD and normal builds, but causes a build to crash only on PPD because of rsyncing. On non-ppd builds, the bug only causes some minor annoyance when trying to run `make clean` because permission denials crop up when trying to remove the .vpython-root directory. Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: - copy the cover-letter description as commit log ] Signed-off-by: Yann E. MORIN (cherry picked from commit 2b7b68cfe56459f24684cdc2237b35b6c240cbf8) Signed-off-by: Peter Korsgaard --- package/depot-tools/depot-tools.hash | 2 +- package/depot-tools/depot-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/depot-tools/depot-tools.hash b/package/depot-tools/depot-tools.hash index 2109096901..70218e4658 100644 --- a/package/depot-tools/depot-tools.hash +++ b/package/depot-tools/depot-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8e0bccdd6b1231f58d5453dc14a5e1d195295ac8d466dec34961e951e946b50b depot-tools-4e87f5bfe244e903f712408ea68dc3c3a6fe2d00-br1.tar.gz +sha256 5da23d7558975093c6a732f5743c7f224d16dd3f878a6a1b577b1b127a4098cc depot-tools-8d14454ba4a35fd9d2483842b08815a2357ec86f-br1.tar.gz sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d LICENSE diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index e3b840f29a..634258ffbb 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -DEPOT_TOOLS_VERSION = 4e87f5bfe244e903f712408ea68dc3c3a6fe2d00 +DEPOT_TOOLS_VERSION = 8d14454ba4a35fd9d2483842b08815a2357ec86f DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause From peter at korsgaard.com Sat Feb 3 11:27:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 12:27:41 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-engine/Config.in: Drop nptl dependency Message-ID: <20240203112820.8DC6B867B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=196d09d95c5c0658d52ddc807ba494f0935e6111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x As Yann mentioned in commit 9d8497e79de3ced144877ba6ee38cc5b7181aaeb, a dependency on a glibc toolchain implies a dependency on BR2_TOOLCHAIN_HAS_THREADS_NPTL. As such, remove the dependency from package/flutter-engine/Config.in. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit 019cfcfc4a108112306f30c38c1a17fc42841e15) Signed-off-by: Peter Korsgaard --- package/flutter-engine/Config.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/flutter-engine/Config.in b/package/flutter-engine/Config.in index 2ec5b90ffd..559dc0cce5 100644 --- a/package/flutter-engine/Config.in +++ b/package/flutter-engine/Config.in @@ -11,7 +11,6 @@ config BR2_PACKAGE_FLUTTER_ENGINE depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthreads depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS @@ -43,12 +42,11 @@ comment "flutter-engine needs an OpenGL or OpenGLES backend" depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES -comment "flutter-engine needs a glibc toolchain w/ wchar, C++, gcc >= 5, dynamic library, host gcc >= 5, NPTL" +comment "flutter-engine needs a glibc toolchain w/ wchar, C++, gcc >= 5, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ - || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || BR2_STATIC_LIBS \ + || !BR2_USE_WCHAR || !BR2_HOST_GCC_AT_LEAST_5 comment "flutter-engine needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS From peter at korsgaard.com Sat Feb 3 12:09:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:09:23 +0100 Subject: [Buildroot] [PATCH v3 08/10] package/flutter-gallery: add a configure step In-Reply-To: (Yann E. MORIN's message of "Sat, 20 Jan 2024 22:46:36 +0100") References: <20240117225049.28443-1-adam.duskett@amarulasolutions.com> <20240117225049.28443-9-adam.duskett@amarulasolutions.com> Message-ID: <87wmrlsqa4.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Adam, All, > On 2024-01-17 15:50 -0700, Adam Duskett spake thusly: >> To make the next patch easier to understand, add a configure step to the >> flutter-gallery.mk file. The `$(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle` >> command is placed in the configure step because it generates several files >> needed for the flutter_gen_snapshot tool to generate the target .so file. >> >> Signed-off-by: Adam Duskett >> --- >> package/flutter-gallery/flutter-gallery.mk | 11 ++++++++--- >> 1 file changed, 8 insertions(+), 3 deletions(-) >> >> diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk >> index 57a476b1ab..50ddd9ffba 100644 >> --- a/package/flutter-gallery/flutter-gallery.mk >> +++ b/package/flutter-gallery/flutter-gallery.mk >> @@ -14,12 +14,17 @@ FLUTTER_GALLERY_DEPENDENCIES = \ >> >> FLUTTER_GALLERY_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/gallery/$(FLUTTER_ENGINE_RUNTIME_MODE) >> >> -define FLUTTER_GALLERY_BUILD_CMDS >> +define FLUTTER_GALLERY_CONFIGURE_CMDS >> cd $(@D) && \ >> FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ >> $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ >> - $(HOST_FLUTTER_SDK_BIN_FLUTTER) packages get && \ >> + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ > As disucssed on IRC< that belonged to a spearate patch, so I split this > patch int two, and applied to master, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:09:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:09:40 +0100 Subject: [Buildroot] [PATCH v3 09/10] package/flutter-gallery: fix build options In-Reply-To: (Yann E. MORIN's message of "Sat, 20 Jan 2024 22:56:23 +0100") References: <20240117225049.28443-1-adam.duskett@amarulasolutions.com> <20240117225049.28443-10-adam.duskett@amarulasolutions.com> Message-ID: <87sf29sq9n.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > ADam, All, > On 2024-01-17 15:50 -0700, Adam Duskett spake thusly: >> As the flutter-gallery package is a reference package for users wishing to use >> Flutter for their UX with Buildroot, this package must have the correct build >> options. Indeed, this package currently starts and runs, but only because of >> the 0001-remove-GetStorage.patch. Through testing, flutter-gallery fails to >> run during the following scenario: >> - The xdg-user-dirs package is ported and present. >> - flutter-gallery depends on xdg-user-dirs. >> - The 0001-remove-GetStorage.patch file is removed. >> >> After extensive testing and comparing the current build arguments against what >> the meta-flutter repository for Yocto passes to all of the applications that >> inherit flutter-app, it is clear that handling the dart_plugin_registrant.dart >> file is missing from the dart arguments in the flutter-gallery build step. > [--SNIP--] > Great commit log! This is exactly the kind of commit log that gives > confidence in the patch, as it demonstrates that the topic has been > researched, and the solution is explained, and the drawbacks identified > and justified. > I did not understand all the details of it, but the commit log really > helped me just apply the commit wihtout too much thought. > Thank you! ? Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:09:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:09:50 +0100 Subject: [Buildroot] [PATCH v3 10/10] package/flutter-gallery: clean up install_target_cmds In-Reply-To: (Yann E. MORIN's message of "Sat, 20 Jan 2024 22:59:17 +0100") References: <20240117225049.28443-1-adam.duskett@amarulasolutions.com> <20240117225049.28443-11-adam.duskett@amarulasolutions.com> Message-ID: <87o7cxsq9d.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Adam, All, > On 2024-01-17 15:50 -0700, Adam Duskett spake thusly: >> Remove and create the kernel_blob.bin file in the flutter_assets directory: >> >> When Flutter compiles the source code, it creates the kernel_blob.bin file, >> a Dart Kernel Bytecode of the application. >> >> If kernel_blob.bin exists inside the flutter_assets directory, then the >> application source code can be extracted with nothing more than apktool. >> Not only is this a security risk, it's also redundant and a waste of space. >> >> Removing the kernel_blob.bin file generated for flutter-gallery saves 86M! >> Because this package is a reference package, and some applications may check >> if the kernel_blob.bin file exists, we also touch a blank kernel_blob.bin >> file. >> >> Do not use relative symlinks: >> Users may not install their applications in the >> /usr/share/flutter/${package_name} directory. Because this is a reference >> application, using exact symlinks to icudtl.dat and libflutter_engine.so >> is preferable. > It was not directly obvious to me what this section meant, so I reworded > it, and introduced a bad typo... At least I could only spot one... > Sorry... :-( Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:11:33 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:11:33 +0100 Subject: [Buildroot] [PATCH 1/2] package/qt5/qt5base: add QT5BASE_CPE_ID_VENDOR and QT5BASE_CPE_ID_PRODUCT In-Reply-To: <20240110170759.3966933-1-christian@klarinett.li> (Christian Hitz via buildroot's message of "Wed, 10 Jan 2024 18:07:57 +0100") References: <20240110170759.3966933-1-christian@klarinett.li> Message-ID: <87jznlsq6i.fsf@48ers.dk> >>>>> "Christian" == Christian Hitz via buildroot writes: > From: Christian Hitz > cpe:2.3:a:qt:qt:5.15.8:*:*:*:*:*:*:* is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/3A753A6D-0AFE-4E62-9C2F-58C8B630830C > Signed-off-by: Christian Hitz Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:11:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:11:38 +0100 Subject: [Buildroot] [PATCH 2/2] package/qt6/qt6base: add QT6BASE_CPE_ID_VENDOR and QT6BASE_CPE_ID_PRODUCT In-Reply-To: <20240110170759.3966933-2-christian@klarinett.li> (Christian Hitz via buildroot's message of "Wed, 10 Jan 2024 18:07:58 +0100") References: <20240110170759.3966933-1-christian@klarinett.li> <20240110170759.3966933-2-christian@klarinett.li> Message-ID: <87fry9sq6d.fsf@48ers.dk> >>>>> "Christian" == Christian Hitz via buildroot writes: > From: Christian Hitz > cpe:2.3:a:qt:qt:6.4.3:*:*:*:*:*:*:* is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/8397D12E-2D77-458E-B9C3-DC7B4775B1A7 > Signed-off-by: Christian Hitz Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:12:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:12:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sqlparse: add CPE variables In-Reply-To: <20240120201116.48735-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:11:16 +0100") References: <20240120201116.48735-1-fontaine.fabrice@gmail.com> Message-ID: <87bk8xsq5j.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:sqlparse_project:sqlparse is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/BB69AE3A-3268-4EDF-95AF-A05BB61B686F > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:24:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:24:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pycryptodomex: add CPE variables In-Reply-To: <20240120202616.57017-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:26:16 +0100") References: <20240120202616.57017-1-fontaine.fabrice@gmail.com> Message-ID: <877cjlspkx.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:pycryptodome:pycryptodomex is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/2A88F7B5-C414-4104-9B59-A6E28A1E119A > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:24:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:24:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-oauthlib: add CPE variables In-Reply-To: <20240120203351.61397-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:33:51 +0100") References: <20240120203351.61397-1-fontaine.fabrice@gmail.com> Message-ID: <8734u9spkr.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:oauthlib_project:oauthlib is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/204A2244-7F74-4AAE-BA8E-E9FE707EC833 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:24:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:24:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-numpy: add CPE variables In-Reply-To: <20240120203805.64729-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:38:05 +0100") References: <20240120203805.64729-1-fontaine.fabrice@gmail.com> Message-ID: <87y1c1razp.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:numpy:numpy is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/C19878E8-7FFC-4BB4-B1A8-F396CB169DF2 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:25:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:25:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-mako: add CPE variables In-Reply-To: <20240120204701.70123-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:47:01 +0100") References: <20240120204701.70123-1-fontaine.fabrice@gmail.com> Message-ID: <87ttmprayc.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:sqlalchemy:mako is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/3A26A531-FD34-4F27-ADD5-C0C88FA337B3 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:25:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:25:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-html5lib: add CPE variables In-Reply-To: <20240120205838.76973-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:58:38 +0100") References: <20240120205838.76973-1-fontaine.fabrice@gmail.com> Message-ID: <87plxdray7.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:html5lib:html5lib is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/97A353CC-7402-4606-93CA-111308296748 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:26:26 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:26:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-hpack: add CPE variables In-Reply-To: <20240120210152.78860-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 22:01:52 +0100") References: <20240120210152.78860-1-fontaine.fabrice@gmail.com> Message-ID: <87le81rax9.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:python:hpack is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/9DD17147-CB76-4A8F-BE82-4AE1BC7BFCD5 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:26:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:26:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gunicorn: add CPE variables In-Reply-To: <20240120210851.82987-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 22:08:51 +0100") References: <20240120210851.82987-1-fontaine.fabrice@gmail.com> Message-ID: <87h6iprax5.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:gunicorn:gunicorn is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/DAF075D2-70F3-4D2A-B7C9-75A7A1C38C83 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:01:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:01:10 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-gallery: use canonical pub-get Message-ID: <20240203122851.EE5AD86807@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc60cdfe48e26e8298036a12ba03f30969effeb6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The canonical name for the 'pub' action is 'pub', while 'packages' is just an alias. Switch to using the canonical name. Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: split off to its own commit] Signed-off-by: Yann E. MORIN (cherry picked from commit 1cc2c4bb866d8dbb7e6fd7dff7b61e61fdff18af) Signed-off-by: Peter Korsgaard --- package/flutter-gallery/flutter-gallery.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk index 57a476b1ab..a7e7b76070 100644 --- a/package/flutter-gallery/flutter-gallery.mk +++ b/package/flutter-gallery/flutter-gallery.mk @@ -18,7 +18,7 @@ define FLUTTER_GALLERY_BUILD_CMDS cd $(@D) && \ FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) packages get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle && \ $(HOST_FLUTTER_SDK_BIN_DART_BIN) package:gallery/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ From peter at korsgaard.com Sat Feb 3 12:01:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:01:28 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-gallery: clean up install_target_cmds Message-ID: <20240203122852.19E938680B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=404e6cc2eb6442d75c4fba79212adf9465cbac37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Remove and create the kernel_blob.bin file in the flutter_assets directory: When Flutter compiles the source code, it creates the kernel_blob.bin file, a Dart Kernel Bytecode of the application. If kernel_blob.bin exists inside the flutter_assets directory, then the application source code can be extracted with nothing more than apktool. Not only is this a security risk, it's also redundant and a waste of space. Removing the kernel_blob.bin file generated for flutter-gallery saves 86M! Because this package is a reference package, and some applications may check if the kernel_blob.bin file exists, we also touch a blank kernel_blob.bin file. Do not use relative symlinks: Users may install their applications in any arbitaryt location, not necessarily in the /usr/share/flutter/${package_name} directory. Because flutter-gallery is a reference application, using exact symlinks to icudtl.dat and libflutter_engine.so is preferable. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit 0805b8048fc75c8b471acb492aa55ef0690fdabd) Signed-off-by: Peter Korsgaard --- package/flutter-gallery/flutter-gallery.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk index 8f7e325e5a..acad706dae 100644 --- a/package/flutter-gallery/flutter-gallery.mk +++ b/package/flutter-gallery/flutter-gallery.mk @@ -46,10 +46,12 @@ define FLUTTER_GALLERY_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/libapp.so \ $(FLUTTER_GALLERY_INSTALL_DIR)/lib/libapp.so - ln -sf ../../../$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ $(FLUTTER_GALLERY_INSTALL_DIR)/data/ - ln -sf ../../../../../lib/libflutter_engine.so $(FLUTTER_GALLERY_INSTALL_DIR)/lib/ + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_GALLERY_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_GALLERY_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_GALLERY_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin endef $(eval $(generic-package)) From peter at korsgaard.com Sat Feb 3 12:11:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:11:10 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/qt6/qt6base: add QT6BASE_CPE_ID_VENDOR and QT6BASE_CPE_ID_PRODUCT Message-ID: <20240203122852.2E66F8680D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2071d9fe3f9feb39a0b8118a2243221626410e15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:qt:qt:6.4.3:*:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/8397D12E-2D77-458E-B9C3-DC7B4775B1A7 Signed-off-by: Christian Hitz Signed-off-by: Yann E. MORIN (cherry picked from commit a1bac67ba7442b3836621cc96943dffa45ddd880) Signed-off-by: Peter Korsgaard --- package/qt6/qt6base/qt6base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index c32089f551..ba9a10ae06 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -7,6 +7,8 @@ QT6BASE_VERSION = $(QT6_VERSION) QT6BASE_SITE = $(QT6_SITE) QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz +QT6BASE_CPE_ID_VENDOR = qt +QT6BASE_CPE_ID_PRODUCT = qt QT6BASE_CMAKE_BACKEND = ninja From peter at korsgaard.com Sat Feb 3 12:01:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:01:23 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-gallery: fix build options Message-ID: <20240203122852.0F03C867B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d134974a3ad666364a277bce8ece60a7745aa13 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x As the flutter-gallery package is a reference package for users wishing to use Flutter for their UX with Buildroot, this package must have the correct build options. Indeed, this package currently starts and runs, but only because of the 0001-remove-GetStorage.patch. Through testing, flutter-gallery fails to run during the following scenario: - The xdg-user-dirs package is ported and present. - flutter-gallery depends on xdg-user-dirs. - The 0001-remove-GetStorage.patch file is removed. After extensive testing and comparing the current build arguments against what the meta-flutter repository for Yocto passes to all of the applications that inherit flutter-app, it is clear that handling the dart_plugin_registrant.dart file is missing from the dart arguments in the flutter-gallery build step. As the documentation for the dart_plugin_registrant.dart file is nonexistent in any official documentation. However, there is a comment from an issue on the official dart-lang/sdk page on Github that explains what this file is (and refers to the Dark SDK source code instead of official documentation.) >From https://github.com/dart-lang/sdk/issues/52506#issuecomment-1562806787: ``` The dart_plugin_registrant.dart is a very special file. It's neither included in the Dart app nor any dependent packages. Rather it's an artificially created file by the flutter tools. It contains logic to run plugin registration logic. A flutter build will eventually compile the Dart application where it will add /.dart_tool/flutter_build/dart_plugin_registrant.dart as an extra source file (see here). Additionally it will also inject that uri as a constant into Dart source code via a -Dflutter.dart_plugin_registrant=. Once the app runs it will access the package:flutter/src/dart_plugin_registrant.dart:dartPluginRegistrantLibrary constant and use it to look up the library object and then invoke the plugin registration logic. ``` Now that what the dart_plugin_registrant.dart does is understood, we need to pass the following to the dart binary during the flutter-gallery build step: -Dflutter.dart_plugin_registrant=file://[...]/dart_plugin_registrant.dart: Injects a file containing the logic to run the plugin registration logic as a constant into the flutter-application source code. --source file://$(@D)/.dart_tool/flutter_build/dart_plugin_registrant.dart: Adds the dart_plugin_registrant.dart file as a source file to compile. --source package:flutter/src/dart_plugin_registrant.dart: Binds the plugin implementation to the platform interface based on the configuration of the app's pubpec.yaml, and the plugin's pubspec.yaml. The native_assets.yaml file provides the native-assets mapping for @Native external functions. The flutter-gallery package has no functions marked as @Native; however, calling "flutter build bundle" creates a blank template "native_assets.yaml" file, which is safe to include in the build. This line, while not necessary for flutter-gallery, may be helpful for other users who use @Native external functions in their applications, and this example makes porting other applications quicker and easier. Finally, there is a known issue when using the dart_plugin_registrant.dart file outlined here: https://github.com/flutter/flutter/issues/137972. To summarize: If a user fails to pass the --obfuscate flag to gen_snapshsot when using the dart_plugin_registrant.dart file, their application may fail to start. One such application is Gallery, which I have independently verified. As such, pass the --obfuscate flag to gen_snapshot to ensure that flutter-gallery properly starts when building with the additional dart_plugin_registrant.dart arguments above. However, I acknowledge that the obfuscate flag hides function and class names in compiled Dart code, and there are some cases when a user should avoid using the flag. For example, when using the runtimeType API: https://api.flutter.dev/flutter/dart-core/Object/runtimeType.html. However, this is not the case with flutter-gallery, and the --obfuscate flag is needed. Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: restore FLUTTER_RUNTIME_MODES] Signed-off-by: Yann E. MORIN (cherry picked from commit a821aee2d2203e7948415893efbcdee88af16dac) Signed-off-by: Peter Korsgaard --- package/flutter-gallery/flutter-gallery.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk index 50ddd9ffba..8f7e325e5a 100644 --- a/package/flutter-gallery/flutter-gallery.mk +++ b/package/flutter-gallery/flutter-gallery.mk @@ -25,9 +25,15 @@ endef define FLUTTER_GALLERY_BUILD_CMDS cd $(@D) && \ FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ - $(HOST_FLUTTER_SDK_BIN_DART_BIN) package:gallery/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + -Dflutter.dart_plugin_registrant=file://$(@D)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ + --source file://$(@D)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ + --source package:flutter/src/dart_plugin_registrant.dart \ + --native-assets $(@D)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:gallery/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ --deterministic \ + --obfuscate \ --snapshot_kind=app-aot-elf \ --elf=libapp.so \ .dart_tool/flutter_build/*/app.dill From peter at korsgaard.com Sat Feb 3 12:24:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:24:53 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-numpy: add CPE variables Message-ID: <20240203122852.53DE786811@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4207e5cb546e6fb1fae9a02a9a7abf9a641b7f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:numpy:numpy is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/C19878E8-7FFC-4BB4-B1A8-F396CB169DF2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 9899f06170f292bc70a57ac9b364490503c05e42) Signed-off-by: Peter Korsgaard --- package/python-numpy/python-numpy.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index b52e0da17d..383135f9fe 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -14,6 +14,8 @@ PYTHON_NUMPY_LICENSE_FILES = \ numpy/core/include/numpy/libdivide/LICENSE.txt \ numpy/linalg/lapack_lite/LICENSE.txt \ tools/npy_tempita/license.txt +PYTHON_NUMPY_CPE_ID_VENDOR = numpy +PYTHON_NUMPY_CPE_ID_PRODUCT = numpy PYTHON_NUMPY_DEPENDENCIES = host-python-cython python3 HOST_PYTHON_NUMPY_DEPENDENCIES = host-python-cython From peter at korsgaard.com Sat Feb 3 12:01:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:01:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-gallery: add a configure step Message-ID: <20240203122852.044278680A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc1d7fd0c8019b4180d210eb9ca786a767fd67f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x To make the next patch easier to understand, add a configure step to the flutter-gallery.mk file. The `$(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle` command is placed in the configure step because it generates several files needed for the flutter_gen_snapshot tool to generate the target .so file. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit 562ed3dfd4fa60ea21c5c8f0557e0201c22048d6) Signed-off-by: Peter Korsgaard --- package/flutter-gallery/flutter-gallery.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk index a7e7b76070..50ddd9ffba 100644 --- a/package/flutter-gallery/flutter-gallery.mk +++ b/package/flutter-gallery/flutter-gallery.mk @@ -14,12 +14,17 @@ FLUTTER_GALLERY_DEPENDENCIES = \ FLUTTER_GALLERY_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/gallery/$(FLUTTER_ENGINE_RUNTIME_MODE) -define FLUTTER_GALLERY_BUILD_CMDS +define FLUTTER_GALLERY_CONFIGURE_CMDS cd $(@D) && \ FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_GALLERY_BUILD_CMDS + cd $(@D) && \ + FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ $(HOST_FLUTTER_SDK_BIN_DART_BIN) package:gallery/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ --deterministic \ From peter at korsgaard.com Sat Feb 3 12:11:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:11:57 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-sqlparse: add CPE variables Message-ID: <20240203122852.38CD58680E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4e237535e056661a7f18c31d8a9a63496da99de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:sqlparse_project:sqlparse is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/BB69AE3A-3268-4EDF-95AF-A05BB61B686F Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 8ed1bb3628511cb2b408186cb260dc15ef1eb43e) Signed-off-by: Peter Korsgaard --- package/python-sqlparse/python-sqlparse.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 23b1338e49..48b1a24822 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -10,5 +10,7 @@ PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/ba/fa/5b7662b04b6 PYTHON_SQLPARSE_SETUP_TYPE = setuptools PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE +PYTHON_SQLPARSE_CPE_ID_VENDOR = sqlparse_project +PYTHON_SQLPARSE_CPE_ID_PRODUCT = sqlparse $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:10:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:10:40 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/qt5/qt5base: add QT5BASE_CPE_ID_VENDOR and QT5BASE_CPE_ID_PRODUCT Message-ID: <20240203122852.2446C8680C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c1d4ada3b65e0dd00e5d4bfe892e7eef8a91ea8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:qt:qt:5.15.8:*:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/3A753A6D-0AFE-4E62-9C2F-58C8B630830C Signed-off-by: Christian Hitz Signed-off-by: Yann E. MORIN (cherry picked from commit 107d39c1a7e77b3668f923f2f84f961acfaefa53) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index cc29f5523f..91891a2ec2 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -7,6 +7,8 @@ QT5BASE_VERSION = e44097b63d17ba3178a637df7fac51ddc51cb48b QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 +QT5BASE_CPE_ID_VENDOR = qt +QT5BASE_CPE_ID_PRODUCT = qt QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 3 12:24:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:24:07 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-oauthlib: add CPE variables Message-ID: <20240203122852.4B4DE86810@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19322a339e43b260508453698489ebd40648c764 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:oauthlib_project:oauthlib is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/204A2244-7F74-4AAE-BA8E-E9FE707EC833 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 5f905f06bdf212520ab1f37179b5b6d5a2dee132) Signed-off-by: Peter Korsgaard --- package/python-oauthlib/python-oauthlib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk index 1e49487d6a..eb0ccbf46f 100644 --- a/package/python-oauthlib/python-oauthlib.mk +++ b/package/python-oauthlib/python-oauthlib.mk @@ -10,5 +10,7 @@ PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/6d/fa/fbf40010379 PYTHON_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE +PYTHON_OAUTHLIB_CPE_ID_VENDOR = oauthlib_project +PYTHON_OAUTHLIB_CPE_ID_PRODUCT = oauthlib $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:25:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:25:20 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-mako: add CPE variables Message-ID: <20240203122852.5E03186813@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd361dd6c4cebdaeadee9eea34fcbf575e18cd00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:sqlalchemy:mako is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/3A26A531-FD34-4F27-ADD5-C0C88FA337B3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d5a20c7f245313ead143b0c30060e49e1f90d40a) Signed-off-by: Peter Korsgaard --- package/python-mako/python-mako.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 313fbfcab2..7764f32f62 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -10,6 +10,8 @@ PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6 PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE +PYTHON_MAKO_CPE_ID_VENDOR = sqlalchemy +PYTHON_MAKO_CPE_ID_PRODUCT = mako # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe From peter at korsgaard.com Sat Feb 3 12:25:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:25:39 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-html5lib: add CPE variables Message-ID: <20240203122852.6836A80287@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a8e1b35f4ba780b082d1f539e2a3e93c2b6991b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:html5lib:html5lib is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/97A353CC-7402-4606-93CA-111308296748 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 4d361c3d32eb368e479eb65ac6df625804fa805b) Signed-off-by: Peter Korsgaard --- package/python-html5lib/python-html5lib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-html5lib/python-html5lib.mk b/package/python-html5lib/python-html5lib.mk index 84229eabd0..320ef01c7a 100644 --- a/package/python-html5lib/python-html5lib.mk +++ b/package/python-html5lib/python-html5lib.mk @@ -10,5 +10,7 @@ PYTHON_HTML5LIB_SITE = https://files.pythonhosted.org/packages/ac/b6/b55c3f49042 PYTHON_HTML5LIB_LICENSE = MIT PYTHON_HTML5LIB_LICENSE_FILES = LICENSE PYTHON_HTML5LIB_SETUP_TYPE = setuptools +PYTHON_HTML5LIB_CPE_ID_VENDOR = html5lib +PYTHON_HTML5LIB_CPE_ID_PRODUCT = html5lib $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:26:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:26:02 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-hpack: add CPE variables Message-ID: <20240203122852.712F286814@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=637849d11dee2e5d96695e2341881edd16973688 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:python:hpack is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/9DD17147-CB76-4A8F-BE82-4AE1BC7BFCD5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d00b3f17f663368733c035194874965e52f64ad6) Signed-off-by: Peter Korsgaard --- package/python-hpack/python-hpack.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-hpack/python-hpack.mk b/package/python-hpack/python-hpack.mk index 3cf534d055..4b581c1001 100644 --- a/package/python-hpack/python-hpack.mk +++ b/package/python-hpack/python-hpack.mk @@ -10,5 +10,7 @@ PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/3e/9b/fda93fb4d957db PYTHON_HPACK_SETUP_TYPE = setuptools PYTHON_HPACK_LICENSE = MIT PYTHON_HPACK_LICENSE_FILES = LICENSE +PYTHON_HPACK_CPE_ID_VENDOR = python +PYTHON_HPACK_CPE_ID_PRODUCT = hpack $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:26:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:26:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-gunicorn: add CPE variables Message-ID: <20240203122852.79BF486815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7750b558a8c8795c8d41f28b9541cc57fa9e0335 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:gunicorn:gunicorn is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/DAF075D2-70F3-4D2A-B7C9-75A7A1C38C83 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 8c0bfcede9f03cf8277e4cfc9cd33befa28b22bb) Signed-off-by: Peter Korsgaard --- package/python-gunicorn/python-gunicorn.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-gunicorn/python-gunicorn.mk b/package/python-gunicorn/python-gunicorn.mk index 03ff5a49df..effa93e5ef 100644 --- a/package/python-gunicorn/python-gunicorn.mk +++ b/package/python-gunicorn/python-gunicorn.mk @@ -10,5 +10,7 @@ PYTHON_GUNICORN_SITE = https://files.pythonhosted.org/packages/06/89/acd9879fa6a PYTHON_GUNICORN_SETUP_TYPE = setuptools PYTHON_GUNICORN_LICENSE = MIT PYTHON_GUNICORN_LICENSE_FILES = LICENSE +PYTHON_GUNICORN_CPE_ID_VENDOR = gunicorn +PYTHON_GUNICORN_CPE_ID_PRODUCT = gunicorn $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:23:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:23:46 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-pycryptodomex: add CPE variables Message-ID: <20240203122852.42D818680F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b47de9692e837bcf181210648d2a9ffff97cbe11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:pycryptodome:pycryptodomex is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2A88F7B5-C414-4104-9B59-A6E28A1E119A Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 71ff1bd8a4f945ce405a941f806c54b73cf551d5) Signed-off-by: Peter Korsgaard --- package/python-pycryptodomex/python-pycryptodomex.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index d6eb2a9513..a7d5f7883a 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -12,6 +12,8 @@ PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ Public Domain (pycrypto original code) PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto +PYTHON_PYCRYPTODOMEX_CPE_ID_VENDOR = pycryptodome +PYTHON_PYCRYPTODOMEX_CPE_ID_PRODUCT = pycryptodomex PYTHON_PYCRYPTODOMEX_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" HOST_PYTHON_PYCRYPTODOMEX_ENV = CFLAGS="$(HOST_CFLAGS) -std=c99" From peter at korsgaard.com Sat Feb 3 12:10:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:10:46 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/qt5/qt5base: add QT5BASE_CPE_ID_VENDOR and QT5BASE_CPE_ID_PRODUCT Message-ID: <20240203122958.CE4A08687D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91fffdac2eef6d12ea5aa5f987cb3053f721ab41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:qt:qt:5.15.8:*:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/3A753A6D-0AFE-4E62-9C2F-58C8B630830C Signed-off-by: Christian Hitz Signed-off-by: Yann E. MORIN (cherry picked from commit 107d39c1a7e77b3668f923f2f84f961acfaefa53) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index efa0e16e9a..a3161d62bb 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -7,6 +7,8 @@ QT5BASE_VERSION = 2ffb7ad8a1079a0444b9c72affe3d19b089b60de QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 +QT5BASE_CPE_ID_VENDOR = qt +QT5BASE_CPE_ID_PRODUCT = qt QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 3 12:24:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:24:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-oauthlib: add CPE variables Message-ID: <20240203122959.0EC6386882@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67fa11afccc08f6ca9143a0feba63d0e7680e40e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:oauthlib_project:oauthlib is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/204A2244-7F74-4AAE-BA8E-E9FE707EC833 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 5f905f06bdf212520ab1f37179b5b6d5a2dee132) Signed-off-by: Peter Korsgaard --- package/python-oauthlib/python-oauthlib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk index 1e49487d6a..eb0ccbf46f 100644 --- a/package/python-oauthlib/python-oauthlib.mk +++ b/package/python-oauthlib/python-oauthlib.mk @@ -10,5 +10,7 @@ PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/6d/fa/fbf40010379 PYTHON_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE +PYTHON_OAUTHLIB_CPE_ID_VENDOR = oauthlib_project +PYTHON_OAUTHLIB_CPE_ID_PRODUCT = oauthlib $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:25:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:25:30 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-html5lib: add CPE variables Message-ID: <20240203122959.3E54586885@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0dd00d5ea659efdee6554c81ee6b9a6be214859 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:html5lib:html5lib is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/97A353CC-7402-4606-93CA-111308296748 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 4d361c3d32eb368e479eb65ac6df625804fa805b) Signed-off-by: Peter Korsgaard --- package/python-html5lib/python-html5lib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-html5lib/python-html5lib.mk b/package/python-html5lib/python-html5lib.mk index 84229eabd0..320ef01c7a 100644 --- a/package/python-html5lib/python-html5lib.mk +++ b/package/python-html5lib/python-html5lib.mk @@ -10,5 +10,7 @@ PYTHON_HTML5LIB_SITE = https://files.pythonhosted.org/packages/ac/b6/b55c3f49042 PYTHON_HTML5LIB_LICENSE = MIT PYTHON_HTML5LIB_LICENSE_FILES = LICENSE PYTHON_HTML5LIB_SETUP_TYPE = setuptools +PYTHON_HTML5LIB_CPE_ID_VENDOR = html5lib +PYTHON_HTML5LIB_CPE_ID_PRODUCT = html5lib $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:24:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:24:48 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-numpy: add CPE variables Message-ID: <20240203122959.1FD4086883@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab4fb4493e633c1e6946991646b92130c5c8d946 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:numpy:numpy is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/C19878E8-7FFC-4BB4-B1A8-F396CB169DF2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 9899f06170f292bc70a57ac9b364490503c05e42) Signed-off-by: Peter Korsgaard --- package/python-numpy/python-numpy.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 812bfdae4a..fda42e7d9d 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -14,6 +14,8 @@ PYTHON_NUMPY_LICENSE_FILES = \ numpy/core/include/numpy/libdivide/LICENSE.txt \ numpy/linalg/lapack_lite/LICENSE.txt \ tools/npy_tempita/license.txt +PYTHON_NUMPY_CPE_ID_VENDOR = numpy +PYTHON_NUMPY_CPE_ID_PRODUCT = numpy PYTHON_NUMPY_SETUP_TYPE = setuptools PYTHON_NUMPY_DEPENDENCIES = host-python-cython From peter at korsgaard.com Sat Feb 3 12:23:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:23:40 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-pycryptodomex: add CPE variables Message-ID: <20240203122958.F2CB986881@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51ec22b9b0685c9ba4ba584aa58da34ca56dbc64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:pycryptodome:pycryptodomex is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2A88F7B5-C414-4104-9B59-A6E28A1E119A Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 71ff1bd8a4f945ce405a941f806c54b73cf551d5) Signed-off-by: Peter Korsgaard --- package/python-pycryptodomex/python-pycryptodomex.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index b566bdd066..1c927357fe 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -12,6 +12,8 @@ PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ Public Domain (pycrypto original code) PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto +PYTHON_PYCRYPTODOMEX_CPE_ID_VENDOR = pycryptodome +PYTHON_PYCRYPTODOMEX_CPE_ID_PRODUCT = pycryptodomex $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Sat Feb 3 12:26:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:26:06 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-hpack: add CPE variables Message-ID: <20240203122959.4E42F8688B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28454fa55706cd73001377cf6f55284e5ded7315 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:python:hpack is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/9DD17147-CB76-4A8F-BE82-4AE1BC7BFCD5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d00b3f17f663368733c035194874965e52f64ad6) Signed-off-by: Peter Korsgaard --- package/python-hpack/python-hpack.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-hpack/python-hpack.mk b/package/python-hpack/python-hpack.mk index 3cf534d055..4b581c1001 100644 --- a/package/python-hpack/python-hpack.mk +++ b/package/python-hpack/python-hpack.mk @@ -10,5 +10,7 @@ PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/3e/9b/fda93fb4d957db PYTHON_HPACK_SETUP_TYPE = setuptools PYTHON_HPACK_LICENSE = MIT PYTHON_HPACK_LICENSE_FILES = LICENSE +PYTHON_HPACK_CPE_ID_VENDOR = python +PYTHON_HPACK_CPE_ID_PRODUCT = hpack $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:25:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:25:24 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-mako: add CPE variables Message-ID: <20240203122959.2E84686884@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4694fc7b09e9cf6cb2416e6a8b080930656fe0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:sqlalchemy:mako is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/3A26A531-FD34-4F27-ADD5-C0C88FA337B3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d5a20c7f245313ead143b0c30060e49e1f90d40a) Signed-off-by: Peter Korsgaard --- package/python-mako/python-mako.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 313fbfcab2..7764f32f62 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -10,6 +10,8 @@ PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6 PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE +PYTHON_MAKO_CPE_ID_VENDOR = sqlalchemy +PYTHON_MAKO_CPE_ID_PRODUCT = mako # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe From peter at korsgaard.com Sat Feb 3 12:26:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:26:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-gunicorn: add CPE variables Message-ID: <20240203122959.5D6898367C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=343aa7d5a0ddfef8a7ab763db253e05b099b0f2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:gunicorn:gunicorn is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/DAF075D2-70F3-4D2A-B7C9-75A7A1C38C83 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 8c0bfcede9f03cf8277e4cfc9cd33befa28b22bb) Signed-off-by: Peter Korsgaard --- package/python-gunicorn/python-gunicorn.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-gunicorn/python-gunicorn.mk b/package/python-gunicorn/python-gunicorn.mk index fb747bc00e..1e419348b9 100644 --- a/package/python-gunicorn/python-gunicorn.mk +++ b/package/python-gunicorn/python-gunicorn.mk @@ -10,5 +10,7 @@ PYTHON_GUNICORN_SITE = https://files.pythonhosted.org/packages/28/5b/0d1f0296485 PYTHON_GUNICORN_SETUP_TYPE = setuptools PYTHON_GUNICORN_LICENSE = MIT PYTHON_GUNICORN_LICENSE_FILES = LICENSE +PYTHON_GUNICORN_CPE_ID_VENDOR = gunicorn +PYTHON_GUNICORN_CPE_ID_PRODUCT = gunicorn $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:12:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:12:01 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-sqlparse: add CPE variables Message-ID: <20240203122958.E368E8679C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3561064b8eb679fc75ea4e9cd20bc961308c28a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:sqlparse_project:sqlparse is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/BB69AE3A-3268-4EDF-95AF-A05BB61B686F Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 8ed1bb3628511cb2b408186cb260dc15ef1eb43e) Signed-off-by: Peter Korsgaard --- package/python-sqlparse/python-sqlparse.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 23b1338e49..48b1a24822 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -10,5 +10,7 @@ PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/ba/fa/5b7662b04b6 PYTHON_SQLPARSE_SETUP_TYPE = setuptools PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE +PYTHON_SQLPARSE_CPE_ID_VENDOR = sqlparse_project +PYTHON_SQLPARSE_CPE_ID_PRODUCT = sqlparse $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:11:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:11:05 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/qt6/qt6base: add QT6BASE_CPE_ID_VENDOR and QT6BASE_CPE_ID_PRODUCT Message-ID: <20240203122958.D92828687F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64ea5524cc20af551beadd5043bd95fd2d71f81d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:qt:qt:6.4.3:*:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/8397D12E-2D77-458E-B9C3-DC7B4775B1A7 Signed-off-by: Christian Hitz Signed-off-by: Yann E. MORIN (cherry picked from commit a1bac67ba7442b3836621cc96943dffa45ddd880) Signed-off-by: Peter Korsgaard --- package/qt6/qt6base/qt6base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index e6cf4f14bb..1018bce441 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -7,6 +7,8 @@ QT6BASE_VERSION = $(QT6_VERSION) QT6BASE_SITE = $(QT6_SITE) QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz +QT6BASE_CPE_ID_VENDOR = qt +QT6BASE_CPE_ID_PRODUCT = qt QT6BASE_LICENSE = \ GPL-2.0+ or LGPL-3.0, \ From adam.duskett at amarulasolutions.com Sat Feb 3 12:55:47 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Sat, 3 Feb 2024 13:55:47 +0100 Subject: [Buildroot] dracut: no longer works since bump to 059 In-Reply-To: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> References: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> Message-ID: Hello Thierry; I am going to top-post to bother Yann. ;) Dracut support in Buildroot is very broken and must be patched to work properly. I don't have time currently to submit patches, but I do have a working Buildroot with a working Dracut that you can find here: https://gitlab.com/aduskett/buildroot/-/tree/dracut-fixups?ref_type=heads It's only a few months old, but I have tested it, and it works quite well. If you would like to port what I have done to master, and then submit patches based on my work; by all means, please do! Changes include: fs/ - Remove all dracut references from fs/cpio/ - Add fs/dracut/ - Dracut needs to be it's own option in fs/ - Add a dracut option to fs/initramfs/Config.in - Add separate dracut and cpio options to fs/initramfs/initramfs.mk - Add `source "fs/dracut/Config.in"` to fs/Config.in package/dracut: - Add it as a target package, as there are several systemd files it installs on the target. This is a huge problem with the current dracut package in buildroot. - Add linux kernel kconfig fixups - Add options for bash - Add systemd options - Add a cross-ldd script (probably wouldn't be accepted into mainline, but you can try!) - dracut-install is broken and requires a wrapper, so I added one, because of the ldd issue. - Add 0002-ignore-ldd-127.patch - Add 0003-force-symlink-making.patch package/linux/linux.mk: - Add ifeq clauses for rootfs-cpio and rootfs-dracut I have made a diff for you to try here based on commit 5e4eba64 https://pastebin.com/WShjbdYi However, be aware that the patch loses the functionality of defining a dracut.conf file! Thanks so much! Adam On Thu, Feb 1, 2024 at 1:43?PM Thierry Bultel wrote: > Hi, since bump to this version, > > invocation of 'ldd' wrapper fails in dracut-install. > > After analysis, this is because version uses "execlp" for launching the > 'ldd' wrapper variable, > which in out case consists in the executable name + the rootfs argument, > leading to the fault. > > Version 057 used to call "popen" instead that what Ok with that. > > Thierry > > -- > > [image: www.linatsea.fr] > -- > www.linatsea.fr > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: penguin.png Type: image/png Size: 60087 bytes Desc: not available URL: From adam.duskett at amarulasolutions.com Sat Feb 3 13:01:50 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Sat, 3 Feb 2024 14:01:50 +0100 Subject: [Buildroot] [PATCH 02/10] package/ivi-homescreen: fix dependencies for gstreamer plugin In-Reply-To: References: Message-ID: Yann; On Sun, Jan 28, 2024 at 2:21?PM Yann E. MORIN wrote: > > The gstreamer plugin select the EGL backend of gst1-plugins-base, but > forgot to propagate all of its dependencies, notably the _HAS_API > condition, causing unmet dependencies warnings (unfortunately, not > errors), such as; > > $ KCONFIG_SEED=0x597D22A8 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL > Depends on [n]: BR2_PACKAGE_GSTREAMER1 [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API [=n] && BR2_PACKAGE_HAS_LIBEGL [=y] > Selected by [y]: > - BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN [=y] && BR2_PACKAGE_IVI_HOMESCREEN [=y] && BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS [=y] && BR2_PACKAGE_HAS_LIBEGL [=y] > > We can't select _HAS_API, because it is a symbol that represents a > capability provided by other features of gst1-plugins-base; it's > semantically like a virtual package: we can't select it, we can only > depend on it. > > Add this dependency to fix this situation. > > This however causes circular (recursive) dependencies errors: > > package/gstreamer1/gst1-plugins-base/Config.in:135:error: recursive dependency detected! > package/gstreamer1/gst1-plugins-base/Config.in:135: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL is selected by BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN > package/ivi-homescreen/Config.in:221: symbol BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API > package/gstreamer1/gst1-plugins-base/Config.in:149: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API is selected by BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL > package/gstreamer1/gst1-plugins-base/Config.in:152: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL > > Indeed, _HAS_API is only even set when gstreamer1, gst1-plugins-base, > and the gst1-plugins-base's lib-opengl support, are all already enabled. > As such, the dependency on _HAS_API already implies those, and there is > no need to select them. > Thank you so much for the patch. I didn't even notice this! I'm so sorry! Reviewed-by: Adam Duskett Tested-by: Adam Duskett > Signed-off-by: Yann E. MORIN > Cc: Adam Duskett > --- > package/ivi-homescreen/Config.in | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/ivi-homescreen/Config.in b/package/ivi-homescreen/Config.in > index de7509320f..c24df05b6d 100644 > --- a/package/ivi-homescreen/Config.in > +++ b/package/ivi-homescreen/Config.in > @@ -222,10 +222,8 @@ config BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN > bool "GStreamer EGL" > depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS > depends on BR2_PACKAGE_HAS_LIBEGL > + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API # GST1_PLUGINS_BASE_LIB_OPENGL_EGL > select BR2_PACKAGE_FFMPEG > - select BR2_PACKAGE_GSTREAMER1 > - select BR2_PACKAGE_GST1_PLUGINS_BASE > - select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL > select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL > help > A GStreamer-powered alternative to Flutter's video_player that > @@ -233,9 +231,10 @@ config BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN > > https://pub.dev/packages/flutter_gstreamer_player > > -comment "GStreamer plugin needs an EGL backend" > +comment "GStreamer plugin needs gst1-plugins-base with an EGL backend" > depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS > - depends on !BR2_PACKAGE_HAS_LIBEGL > + depends on !BR2_PACKAGE_HAS_LIBEGL \ > + || !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API > > config BR2_PACKAGE_IVI_HOMESCREEN_OPENGL_TEXTURE_PLUGIN > bool "OpenGL Texture" > -- > 2.43.0 > From raphael.pavlidis at gmail.com Sat Feb 3 17:22:50 2024 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Sat, 3 Feb 2024 18:22:50 +0100 Subject: [Buildroot] [PATCH v4] package/sway: make systemd optional In-Reply-To: <20240203030138.1934339-1-stefan@ott.net> References: <20240203030138.1934339-1-stefan@ott.net> Message-ID: <3e7ed18c-9a37-46f2-a85e-f7f9ba35767e@gmail.com> Hi Stefan, looks good to me. Unfortunately, I do not have permission to do that. Thanks, Raphael Pavlidis From fontaine.fabrice at gmail.com Sat Feb 3 17:58:40 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 18:58:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjwt: add gnutls support Message-ID: <20240203175840.141039-1-fontaine.fabrice@gmail.com> gnutls can be used if openssl is not available since the addition of the package in commit 7251775773011e7da38e3a33c6817eceab6a9dfa Signed-off-by: Fabrice Fontaine --- package/libjwt/Config.in | 2 +- package/libjwt/libjwt.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in index fa042d67ef..39d1665e0e 100644 --- a/package/libjwt/Config.in +++ b/package/libjwt/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBJWT bool "libjwt" - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS select BR2_PACKAGE_JANSSON help JSON Web Tokens are an open, industry standard RFC 7519 diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 6ae1717b7d..7e2ea03b09 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -6,10 +6,18 @@ LIBJWT_VERSION = 1.15.3 LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) -LIBJWT_DEPENDENCIES = host-pkgconf jansson openssl +LIBJWT_DEPENDENCIES = host-pkgconf jansson LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBJWT_CONF_OPTS += --with-openssl +LIBJWT_DEPENDENCIES += openssl +else +LIBJWT_CONF_OPTS += --without-openssl +LIBJWT_DEPENDENCIES += gnutls +endif + $(eval $(autotools-package)) -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:02:47 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:02:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: update NETATALK_CPE_ID_VENDOR Message-ID: <20240203180247.143487-1-fontaine.fabrice@gmail.com> cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of cpe:2.3:a:netatalk:netatalk in September 2023: Version Signed-off-by: Fabrice Fontaine --- package/netatalk/netatalk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index a47bfa7e84..40e64dabeb 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -12,7 +12,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT -NETATALK_CPE_ID_VENDOR = netatalk_project +NETATALK_CPE_ID_VENDOR = netatalk # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:08:10 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:08:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xlib_libXpm: update XLIB_LIBXPM_CPE_ID_VENDOR Message-ID: <20240203180810.146553-1-fontaine.fabrice@gmail.com> cpe:2.3:a:libxpm_project:libxpm has been deprecated in favor of cpe:2.3:a:x.org:libxpm in October 2023: Libxpm Project Libxpm 3.5.15 Version Signed-off-by: Fabrice Fontaine --- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 0bba3ea946..1239ba0d4d 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -9,7 +9,7 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT -XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_VENDOR = x.org XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:15:07 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:15:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/json-c: update JSON_C_CPE_ID_VENDOR Message-ID: <20240203181507.150528-1-fontaine.fabrice@gmail.com> cpe:2.3:a:json-c_project:json-c has been deprecated in favor of cpe:2.3:a:json-c:json-c in September 2023: JSON-C Project JSON-C 0.14 Version Signed-off-by: Fabrice Fontaine --- package/json-c/json-c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 517acee4db..68401433b4 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VENDOR = json-c_project +JSON_C_CPE_ID_VENDOR = json-c JSON_C_CONF_OPTS = -DBUILD_APPS=OFF -DDISABLE_EXTRA_LIBS=ON $(eval $(cmake-package)) -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:28:45 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:28:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/flex: update FLEX_CPE_ID_VENDOR Message-ID: <20240203182845.158531-1-fontaine.fabrice@gmail.com> cpe:2.3:a:flex_project:flex has been deprecated in favor of cpe:2.3:a:westes:flex in October 2023: Flex Fast Lexical Analyser 2.6.4 Version Product Signed-off-by: Fabrice Fontaine --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index f1e731ce2e..c6417fea83 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VENDOR = flex_project +FLEX_CPE_ID_VENDOR = westes # bug does not cause stack overflows in the generated code and has been # noted upstream as a bug in the code generator FLEX_IGNORE_CVES = CVE-2019-6293 -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:35:33 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:35:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: fix CPE variables Message-ID: <20240203183533.162251-1-fontaine.fabrice@gmail.com> cpe:2.3:a:d-bus_project:d-bus has been deprecated in favor of cpe:2.3:a:freedesktop:dbus in December 2023: D-Bus Project D-Bus 1.15.6 Version Advisory Signed-off-by: Fabrice Fontaine --- package/dbus/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index c41fbcb4dd..d610846ddb 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -11,8 +11,8 @@ DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.xz DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -DBUS_CPE_ID_VENDOR = d-bus_project -DBUS_CPE_ID_PRODUCT = d-bus +DBUS_CPE_ID_VENDOR = freedesktop +DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:42:31 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:42:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/c-ares: update C_ARES_CPE_ID_VENDOR Message-ID: <20240203184231.166287-1-fontaine.fabrice@gmail.com> cpe:2.3:a:c-ares_project:c-ares has been deprecated in favor of cpe:2.3:a:c-ares:c-ares in September 2023: C-ares Project C-ares 1.17.1 Change Log Signed-off-by: Fabrice Fontaine --- package/c-ares/c-ares.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 7a49b2639a..586fde9afb 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -10,7 +10,7 @@ C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md -C_ARES_CPE_ID_VENDOR = c-ares_project +C_ARES_CPE_ID_VENDOR = c-ares $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:46:37 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:46:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: update PYTHON_AIOHTTP_CPE_ID_VENDOR Message-ID: <20240203184637.168548-1-fontaine.fabrice@gmail.com> cpe:2.3:a:aiohttp_project:aiohttp has been deprecated in favor of cpe:2.3:a:aiohttp:aiohttp in November 2023: Aiohttp Project Aiohttp 3.8.0 Beta 0 Change Log Signed-off-by: Fabrice Fontaine --- package/python-aiohttp/python-aiohttp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 2cb9058b97..3dc822e832 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -10,7 +10,7 @@ PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/54/07/9467d3f8dae2 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp_project +PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp PYTHON_AIOHTTP_CPE_ID_PRODUCT = aiohttp $(eval $(python-package)) -- 2.43.0 From abiliojr at gmail.com Sun Feb 4 06:26:41 2024 From: abiliojr at gmail.com (Abilio Marques) Date: Sat, 3 Feb 2024 22:26:41 -0800 Subject: [Buildroot] [PATCH] package/micropython: add support for manifest.py in the configuration Message-ID: <20240204062645.3616072-1-abiliojr@gmail.com> Micropython can embed packages an modules as frozen bytecode. What code gets built this way can be defined by means of a "manifest.py" file. This commit exposes the variable FROZEN_MANIFEST to Buildroot users through a new variable called BR2_PACKAGE_MICROPYTHON_MANIFEST. Please check Micropython's documentation for more information: https://docs.micropython.org/en/latest/reference/manifest.html Signed-off-by: Abilio Marques --- package/micropython/Config.in | 8 ++++++++ package/micropython/micropython.mk | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 26a00baab0..52717d815a 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -17,6 +17,14 @@ config BR2_PACKAGE_MICROPYTHON_LIB help Core Python libraries ported to MicroPython. +config BR2_PACKAGE_MICROPYTHON_MANIFEST + string "Path to a manifest.py file" + help + MicroPython allows Python code to be ?frozen? as bytecode + into its binary, as an alternative to loading code from + the filesystem. See MicroPython's documentation for more + information. + endif # BR2_PACKAGE_MICROPYTHON comment "micropython needs a toolchain w/ threads, dynamic library" diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 125a0edcfb..5a2c136547 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -43,6 +43,11 @@ else MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 endif +ifneq ($(BR2_PACKAGE_MICROPYTHON_MANIFEST),"") +MICROPYTHON_MAKE_OPTS += \ + FROZEN_MANIFEST=$(BR2_PACKAGE_MICROPYTHON_MANIFEST) +endif + define MICROPYTHON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ -- 2.43.0 From thomas.petazzoni at bootlin.com Sun Feb 4 06:45:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 04 Feb 2024 06:45:06 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-03 Message-ID: <20240204064511.C967A40461@smtp2.osuosl.org> Hello, Autobuild statistics for 2024-02-03 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 2 | 1 | 0 | 3 | 2023.11.x | 1 | 0 | 0 | 1 | master | 56 | 49 | 1 | 106 | Classification of failures by reason for master ----------------------------------------------- stunnel-5.71 | 6 axel-2.17.12 | 4 libressl-3.8.2 | 3 dmraid-1.0.0.rc16-3 | 2 foot-1.16.2 | 2 gobject-introspection-1.76.1 | 2 host-rust-1.74.1 | 2 libopenssl-3.2.0 | 2 openssh-9.6p1 | 2 proj-9.3.0 | 2 quickjs-2023-12-09 | 2 attr-2.5.2 | 1 binutils-arc-2023.09-release | 1 bird-2.0.12 | 1 check-11970a7e112dfe243a2e6... | 1 dhcpcd-10.0.5 | 1 exim-4.97.1 | 1 freeradius-server-3.2.3 | 1 fs/jffs2/jffs2.mk:71: /home... | 1 glibc-2.38-44-gd37c2b20a478... | 1 gobject-introspection | 1 kexec-2.0.28 | 1 libabseil-cpp-20230802.1 | 1 libarchive-3.7.2 | 1 libglvnd-1.4.0 | 1 libselinux-3.5 | 1 linux-fusion-9.0.3 | 1 linux-tools | 1 ngrep-1.47 | 1 owl-linux-1.0.7 | 1 rtl8189fs-5d523593f41c0b8d7... | 1 rygel-0.40.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/54fa4ecbd75cffc953eca39e925904a76918a187 | or1k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/1bec54a60cd882c12f647e927f2881d31f283fc6 | or1k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/e3c75cf272d4e1c9147f0682478ad555b020d888 | m68k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/c0c3e2b15e5c7c98640f30c36f05819d4bd8fd56 | mips64el | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/ab64fea7797d2253cf5eeaeb7b3c68404f3339f4 | arc | binutils-arc-2023.09-release | NOK | http://autobuild.buildroot.net/results/c5b3928c5bf43c9b92235eff79286e14cbae5e32 | powerpc | bird-2.0.12 | NOK | http://autobuild.buildroot.net/results/b7dc99fff8775f82dda3b8dbc3ddcfc1f440cc7e | or1k | check-11970a7e112dfe243a2e6... | NOK | http://autobuild.buildroot.net/results/249512ef82d05f3ee4c3a84dc369a7e43cf4cb0e | ORPH mips64 | dhcpcd-10.0.5 | NOK | http://autobuild.buildroot.net/results/f6f69c648d5ddfa3b86893308aa77658b4335559 | mipsel | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/3bb7bb3c08ee6040f4ebd474772d2258fb6ed7d8 | ORPH powerpc | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/35517c36d1e57859d91d1b83eac02e33b97be6fd | ORPH aarch64_be | exim-4.97.1 | NOK | http://autobuild.buildroot.net/results/1632b4446f85c69c0f4fea39880b9826f8e3454d | nios2 | foot-1.16.2 | NOK | http://autobuild.buildroot.net/results/9be95c713de60039a28374323a193befac5439b8 | microblazeel | foot-1.16.2 | NOK | http://autobuild.buildroot.net/results/46c068efc6aba2579a922b4b7be34f8601c20dc2 | aarch64 | freeradius-server-3.2.3 | NOK | http://autobuild.buildroot.net/results/7944277e8c7805fe6a47ccc4ac676963d92c0b48 | mips64el | fs/jffs2/jffs2.mk:71: /home... | NOK | http://autobuild.buildroot.net/results/98af37b6b0e5f0f636f3ccdc38c937b5b68800c9 | powerpc64 | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/47f3ed9a449e2f7371d9d2565b50e987bacd2a06 | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/03086e91623ecd9b047f4d3439bebf32e8f30a73 | mips | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/b7036f1b7b098521164c9bb0f2f4f325dd5b858b | ORPH sparc64 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/364612e7d7c9e844a3b3433b6055c402df8649d9 | ORPH powerpc64le | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/e7fd50183d758113e768269807c46c5d93fdd996 | powerpc64 | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/89ca4aa002368a7afc9a7c8bdd13b23fb3696293 | armeb | kexec-2.0.28 | NOK | http://autobuild.buildroot.net/results/d509b0f7ff32fe86cecc1d7c17ce91b6959c4cd5 | mips64 | libabseil-cpp-20230802.1 | NOK | http://autobuild.buildroot.net/results/d270d687d41981586b9d4ca4d96cb97eae95cb1a | microblazeel | libarchive-3.7.2 | NOK | http://autobuild.buildroot.net/results/23cf6d163b7ba2dd0e56fad43641ef2815b97f8a | armeb | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/8d3b780a4b820190109809d1445ba26dc601461b | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/8d7adbedd2c66cfac1ede0d160d5b6dbefcf9add | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/5ab84155b946b54fc371515343bac20b8755f30f | ORPH arc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/0eadd0da3a816163dbe01fdd5e7e61dafb84f9f1 | ORPH powerpc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/cbafdb8b0ce79348df7097dc739679bb27bd46ab | ORPH arc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/674f58d1fb5d8bb2e902aab4e34f2f08fa6be59a | ORPH mipsel | libselinux-3.5 | NOK | http://autobuild.buildroot.net/results/63a214194d4c5a65bf24677980f1a2f0eb2d72c4 | mips64 | linux-fusion-9.0.3 | NOK | http://autobuild.buildroot.net/results/cae538ef3a9edab4d91402a6503e586000d51957 | ORPH arc | linux-tools | NOK | http://autobuild.buildroot.net/results/a183b583f962fddf0c4d8f4fba6fd1ce65fab61f | ORPH s390x | ngrep-1.47 | NOK | http://autobuild.buildroot.net/results/fe77dc606b1c3e9932a83d2be9549d159671432e | mips64 | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/f3f2ad35d46eecdef3695bf747a72fe20deaa3a8 | ORPH powerpc64 | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/7e390e56efbba932767ca22204ff85ed4809f95c | ORPH armeb | owl-linux-1.0.7 | NOK | http://autobuild.buildroot.net/results/58a6289afd968ef066a0ab8e57773761820a7563 | aarch64_be | proj-9.3.0 | NOK | http://autobuild.buildroot.net/results/ff8af3147cf33f8aa0643b35b84e186dcdd3971a | sparc64 | proj-9.3.0 | NOK | http://autobuild.buildroot.net/results/cf988f1f70bc105a7d8358d368ff2af14ccdc1f8 | arm | quickjs-2023-12-09 | NOK | http://autobuild.buildroot.net/results/373ae864d98e2ce09f883a0a7c6037526865d4db | mips | quickjs-2023-12-09 | NOK | http://autobuild.buildroot.net/results/e3931354ad77e501340d72c1890110293e67e536 | powerpc64le | rtl8189fs-5d523593f41c0b8d7... | NOK | http://autobuild.buildroot.net/results/90efb55454f51dea56654fb6931eebdc381b23cc | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/df16e1bf0ca6ecd4ae8d08b0e30724e99e69221f | mips | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/2f69a938c594dc616202549b399e56c1508473d2 | nios2 | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/84af3c35cab4101bcfd6a4b543699fb01c2be9a8 | powerpc64 | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/2e3eb561ea70ae7edd48382a846f8305605eec32 | mipsel | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/ff9fe9126509d062b48c12f2d34fbfe77d6a2bea | powerpc64le | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/f2a438e16f27575ac9786e1e945994d66a3788b6 | microblazeel | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/7dec0b934fc6a647d6d6d344f1c75d1f350a5e38 | Classification of failures by reason for 2023.02.x -------------------------------------------------- kmod-30 | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | kmod-30 | NOK | http://autobuild.buildroot.net/results/5eb496e3a342d6e13a777512fb0e710895283ef5 | -- http://autobuild.buildroot.net From wbx at openadk.org Sun Feb 4 07:40:27 2024 From: wbx at openadk.org (Waldemar Brodkorb) Date: Sun, 4 Feb 2024 08:40:27 +0100 Subject: [Buildroot] [PATCH 2/2 v2] package/asterisk: bump to 20.6.0 In-Reply-To: <87msshu9d6.fsf@48ers.dk> References: <87msshu9d6.fsf@48ers.dk> Message-ID: Hi Peter, Peter Korsgaard wrote, > >>>>> "Waldemar" == Waldemar Brodkorb writes: > > > See here for changes: > > https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md > > > Signed-off-by: Waldemar Brodkorb > > --- > v1-> v2: > > - use separate libjwt package instead of bundled one, suggested by > > Peter Korsgaard > > --- > > package/asterisk/Config.in | 1 + > > package/asterisk/asterisk.hash | 2 +- > > package/asterisk/asterisk.mk | 6 ++++-- > > 3 files changed, 6 insertions(+), 3 deletions(-) > > > diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in > > index c52456f8fc..662f070dac 100644 > > --- a/package/asterisk/Config.in > > +++ b/package/asterisk/Config.in > > @@ -10,6 +10,7 @@ config BR2_PACKAGE_ASTERISK > > select BR2_PACKAGE_LIBCURL > > select BR2_PACKAGE_LIBEDIT > > select BR2_PACKAGE_LIBILBC > > + select BR2_PACKAGE_LIBJWT > > select BR2_PACKAGE_LIBXML2 > > select BR2_PACKAGE_SQLITE > > select BR2_PACKAGE_UTIL_LINUX > > diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash > > index 246f4219aa..d50955dd2b 100644 > > --- a/package/asterisk/asterisk.hash > > +++ b/package/asterisk/asterisk.hash > > @@ -1,5 +1,5 @@ > > # Locally computed > > -sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.tar.gz > > +sha256 088dbc08916e21528dba364f5452b2090b066dbba4548b32ec10af138d4b442f asterisk-20.6.0.tar.gz > > > # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases > > # sha256 locally computed > > diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk > > index d1f3ea82d3..869e4128ff 100644 > > --- a/package/asterisk/asterisk.mk > > +++ b/package/asterisk/asterisk.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > -ASTERISK_VERSION = 20.5.2 > > +ASTERISK_VERSION = 20.6.0 > > # Use the github mirror: it's an official mirror maintained by Digium, and > > # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. > > ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) > > @@ -27,7 +27,7 @@ ASTERISK_SELINUX_MODULES = asterisk > > > # For patches 0002 and 0003 > > ASTERISK_AUTORECONF = YES > > -ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson > > +ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson -Ithird-party/libjwt > > Why do we still need to point autoreconf to the bundle libjwt? Otherwise the generated configure does not work. > Even worse, I see the following during the configure step: > > checking for embedded pjproject (may have to download)... configuring > [pjproject] Downloading https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13.1/pjproject-2.13.1.tar.bz2 to /tmp/pjproject-2.13.1.tar.bz2 > [pjproject] Verifying /tmp/pjproject-2.13.1.tar.bz2 > [pjproject] Verify successful > [pjproject] Verifying /tmp/pjproject-2.13.1.tar.bz2 > [pjproject] Verify successful > [pjproject] Unpacking /tmp/pjproject-2.13.1.tar.bz2 > > We don't want packages to download stuff behind our back. Can we use an > external pjproject? I tried with the existing libpjsip in the tree, but asterisk is segfauting with my config: Asterisk Ready. asterisk: ../src/pjsip/sip_transport.c:296: get_tpname: Assertion `!"Invalid transport type!"' failed. Thread 28 "asterisk" received signal SIGABRT, Aborted. Unfortunately the external libpjsip 2.14 does not work well with Asterisk. What can we do about it? best regards Waldemar From wiselord1983 at gmail.com Sun Feb 4 08:51:28 2024 From: wiselord1983 at gmail.com (WiseLord) Date: Sun, 4 Feb 2024 11:51:28 +0300 Subject: [Buildroot] [PATCH 1/1] package/python-mpd2: bump to version 3.1.1 Message-ID: <20240204085128.5059-1-wiselord1983@gmail.com> Signed-off-by: WiseLord --- package/python-mpd2/python-mpd2.hash | 4 ++-- package/python-mpd2/python-mpd2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash index cfe5a7c0c0..0e5d9206a1 100644 --- a/package/python-mpd2/python-mpd2.hash +++ b/package/python-mpd2/python-mpd2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-mpd2/json -md5 f083c107b28525bb4c2580140861d86e python-mpd2-3.1.0.tar.gz -sha256 f33c2cdb0d6baa74a36724f38c1c4a099a7ce2c8ec4a2bb7192150a5855df476 python-mpd2-3.1.0.tar.gz +md5 b218d6f233c23da0bc82c372308bbf8d python-mpd2-3.1.1.tar.gz +sha256 4baec3584cc43ed9948d5559079fafc2679b06b2ade273e909b3582654b2b3f5 python-mpd2-3.1.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk index 124ff57db0..2d2784e89d 100644 --- a/package/python-mpd2/python-mpd2.mk +++ b/package/python-mpd2/python-mpd2.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_MPD2_VERSION = 3.1.0 -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/59/32/e57725251ce3117d2ed2a7b76d9722ea9bea26f54b2cc8981d03350e4103 +PYTHON_MPD2_VERSION = 3.1.1 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/53/be/e77206eb35eb37ccd3506fba237e1431431d04c482707730ce2a6802e95c PYTHON_MPD2_SETUP_TYPE = setuptools PYTHON_MPD2_LICENSE = LGPL-3.0+ PYTHON_MPD2_LICENSE_FILES = LICENSE.txt -- 2.43.0 From peter at korsgaard.com Sun Feb 4 09:04:26 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 10:04:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/petitboot: fix NLS build In-Reply-To: <20240120172839.763337-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 18:28:39 +0100") References: <20240120172839.763337-1-fontaine.fabrice@gmail.com> Message-ID: <878r40r46d.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following NLS build failure on musl raised commit > bf9583a50276f52edbc37d9f85df5f2cc7fdb5dc: > /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/mips64el-buildroot-linux-musl/13.2.0/../../../../mips64el-buildroot-linux-musl/bin/ld: > discover/pb_discover-pb-discover.o: undefined reference to symbol > 'libintl_textdomain' > Fixes: > - http://autobuild.buildroot.org/results/6d440d96e811674041b5a1fdae96d4c377824c2a > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 09:06:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 10:06:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix service runtime In-Reply-To: (Yann E. MORIN's message of "Sun, 21 Jan 2024 10:14:31 +0100") References: <20240117210756.265708-1-ju.o@free.fr> Message-ID: <871q9sr42s.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Julien, All, > On 2024-01-17 22:07 +0100, Julien Olivain spake thusly: >> Since commit 2a8065e "package/postgresql: bump version to 16.1", the >> postgresql service fail to start at runtime with an error: >> >> FATAL: could not load library >> "/usr/lib/postgresql/dict_snowball.so": >> /usr/lib/postgresql/dict_snowball.so: undefined symbol: >> CurrentMemoryContext >> >> This is due to the Posgresql autotool configure script trying to >> detect whether the toolchain linker needs --export-dynamic or not. >> This test is done with a runtime execution of a test program, and >> therefore cannot run in cross-compilation. In that case, the >> configure script assumes it is not needed. See commit [1], included >> in PostgreSQL v16.0. >> >> This commit fixes the issue by forcing the value in _CONF_ENV. The >> package has already a Kconfig dependency on !BR2_STATIC_LIBS, so the >> value can be unconditionally set. >> >> [1] >> https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=9db49fc5bfdc0126be03f4b8986013e59d93b91d > I've added references to the ML thread upstream, with their position > that cross-compiling is not really a supoprted thing. >> Signed-off-by: Julien Olivain > Applied to master, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 09:03:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 10:03:18 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/petitboot: fix NLS build Message-ID: <20240204090648.1FA6C867B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70ab59e19895eb94083bd43fef32ee0bba31156b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix the following NLS build failure on musl raised commit bf9583a50276f52edbc37d9f85df5f2cc7fdb5dc: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/mips64el-buildroot-linux-musl/13.2.0/../../../../mips64el-buildroot-linux-musl/bin/ld: discover/pb_discover-pb-discover.o: undefined reference to symbol 'libintl_textdomain' Fixes: - http://autobuild.buildroot.org/results/6d440d96e811674041b5a1fdae96d4c377824c2a Signed-off-by: Fabrice Fontaine Reviewed-by: Laurent Vivier Signed-off-by: Yann E. MORIN (cherry picked from commit 5159c5c730dc490aced7bc17477f951786f4c405) Signed-off-by: Peter Korsgaard --- package/petitboot/petitboot.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index c4eb20b44d..2087f01b09 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -7,10 +7,18 @@ PETITBOOT_VERSION = 1.14 PETITBOOT_SOURCE = petitboot-v$(PETITBOOT_VERSION).tar.gz PETITBOOT_SITE = https://github.com/open-power/petitboot/releases/download/v$(PETITBOOT_VERSION) -PETITBOOT_DEPENDENCIES = elfutils ncurses udev host-bison host-flex lvm2 +PETITBOOT_DEPENDENCIES = \ + elfutils \ + ncurses \ + udev \ + host-bison \ + host-flex \ + lvm2 \ + $(TARGET_NLS_DEPENDENCIES) PETITBOOT_LICENSE = GPL-2.0 PETITBOOT_LICENSE_FILES = COPYING +PETITBOOT_CONF_ENV = LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" PETITBOOT_CONF_OPTS = \ --enable-crypt \ --enable-platform-auto \ From thierry.bultel at linatsea.fr Sun Feb 4 09:12:45 2024 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Sun, 4 Feb 2024 10:12:45 +0100 Subject: [Buildroot] dracut: no longer works since bump to 059 In-Reply-To: References: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> Message-ID: <977bc5e8-28c7-44b4-8651-9522d205aa59@linatsea.fr> Dear Adam, please see my comments below Le 03/02/2024 ? 13:55, Adam Duskett a ?crit?: > Hello Thierry; > > I am going to top-post to bother Yann. ;) > > Dracut support in Buildroot is very broken and must be patched to work > properly. Not so broken, before the dump to 059 ! I am pretty happy with it. Bu I admit that the ramdisk I need does not have systemd at all, so that in my case, dracut.conf basically consists in removing all systemd modules. I have no idea of how the current integration works with a aimed systemd ramdisk. > I don't have time currently to submit patches, but I do have a working > Buildroot with a working Dracut > that you can find here: > https://gitlab.com/aduskett/buildroot/-/tree/dracut-fixups?ref_type=heads > I have read your patches and there are a couple of things that puzzle me. In the very first patch series I submitted about 2 years ago, it worked this way: - new fs target, not just cpio variant - usage of cross-ldd as recommended by dracut documentation But this was reviewed appropriately, and finally integrated as the version we currently have (only the replacement of cross-ldd by rtls-prelink, IMHO, buy I did not notice any issues from one to the other). So I am afraid (despite of being rather agnostic) that your patches would not be accepted as such either, for the same reasons. I notice some pieces in your patches, that we do need, indeed, for instance the kernel config fixups, and the forced symlinks. > It's only a few months old, but I have tested it, and it works quite > well. If you would like to port what I have > done to master, and then submit patches based on my work; by all > means, please do! > > Changes include: > > fs/ > ? - Remove all dracut references from fs/cpio/ > ? - Add fs/dracut/ > ? - Dracut needs to be it's own option in fs/ > ? - Add a dracut option to fs/initramfs/Config.in > ? - Add separate dracut and cpio options to fs/initramfs/initramfs.mk > > ? - Add `source "fs/dracut/Config.in"` to fs/Config.in > > package/dracut: > ? - Add it as a target package, as there are several systemd files it > installs on the target. > ? ? This is a huge problem with the current dracut package in buildroot. > ? - Add linux kernel kconfig fixups > ? - Add options for bash > ? - Add systemd options > ? - Add a cross-ldd script (probably wouldn't be accepted into > mainline, but you can try!) > ? - dracut-install is broken and requires a wrapper, so I added one, > because of the ldd issue. > ? - Add 0002-ignore-ldd-127.patch > ? - Add 0003-force-symlink-making.patch > > package/linux/linux.mk : > ? - Add ifeq clauses for rootfs-cpio and rootfs-dracut > > I have made a diff?for?you to?try here based on commit 5e4eba64 > https://pastebin.com/WShjbdYi > > However, be aware that the patch loses the functionality of defining a > dracut.conf file! As long as producing a busybox-init based ramdisk still works ... > > > Thanks so much! Best regards Thierry > Adam > > On Thu, Feb 1, 2024 at 1:43?PM Thierry Bultel > wrote: > > Hi, since bump to this version, > > invocation of 'ldd' wrapper fails in dracut-install. > > After analysis, this is because version uses "execlp" for > launching the 'ldd' wrapper variable, > which in out case consists in the executable name + the rootfs > argument, leading to the fault. > > Version 057 used to call "popen" instead that what Ok with that. > > Thierry > > -- > > www.linatsea.fr > -- > www.linatsea.fr > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -- Re: test -- www.linatsea.fr -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: penguin.png Type: image/png Size: 60087 bytes Desc: not available URL: From ju.o at free.fr Sun Feb 4 09:31:48 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 4 Feb 2024 10:31:48 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: micropython: add micropython-lib test Message-ID: <20240204093148.11282-1-ju.o@free.fr> Commit 8f403f0 "package/micropython-lib: merge with, and install as part of micropython" brought micropython library within the package. This commit improves the micropython runtime test by enabling the micropython-lib and by also adding a runtime test using one of its module. Signed-off-by: Julien Olivain --- support/testing/tests/package/test_micropython.py | 13 ++++++++++++- .../test_micropython/rootfs-overlay/root/zcat.py | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100755 support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py diff --git a/support/testing/tests/package/test_micropython.py b/support/testing/tests/package/test_micropython.py index 0ecd4790bd..371deb2978 100644 --- a/support/testing/tests/package/test_micropython.py +++ b/support/testing/tests/package/test_micropython.py @@ -7,6 +7,7 @@ class TestMicroPython(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ f""" BR2_PACKAGE_MICROPYTHON=y + BR2_PACKAGE_MICROPYTHON_LIB=y BR2_ROOTFS_OVERLAY="{infra.filepath("tests/package/test_micropython/rootfs-overlay")}" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set @@ -64,5 +65,15 @@ class TestMicroPython(infra.basetest.BRTest): output = self.run_upy_code(py_code) self.assertEqual(output[0], expected_output) - # Finally, Check a small script can execute. + # Check a small script can execute. self.assertRunOk("/root/mandel.py", timeout=10) + + # Check we can use a micropython-lib module. + msg = "Hello Buildroot!" + filename = "file.txt" + gz_filename = f"{filename}.gz" + self.assertRunOk(f"echo '{msg}' > {filename}") + self.assertRunOk(f"gzip {filename}") + out, ret = self.emulator.run(f"/root/zcat.py {gz_filename}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) diff --git a/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py new file mode 100755 index 0000000000..3b8c60bdd1 --- /dev/null +++ b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py @@ -0,0 +1,15 @@ +#! /usr/bin/env micropython + +import gzip +import sys + + +def main(fname): + with open(fname, "rb") as f: + with gzip.GzipFile(fileobj=f) as g: + s = g.read() + print(s.decode("UTF-8"), end="") + + +if __name__ == "__main__": + main(sys.argv[1]) -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 10:06:13 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:06:13 +0100 Subject: [Buildroot] [git commit] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR Message-ID: <20240204100707.2674C86891@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=380d4a75f5e3c2ae52ebc1afd409713fdb6ced37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:kernel:linux-firmware added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/linux-firmware/linux-firmware.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 58fbaab1d7..60e8861abe 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel - # Intel SST DSP ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master From yann.morin.1998 at free.fr Sun Feb 4 10:06:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:06:06 +0100 Subject: [Buildroot] [git commit] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR Message-ID: <20240204100707.1B8C386890@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05617160dd0bc4aef6cc91930d7985009e854142 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:kernel:wireless-regdb added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/wireless-regdb/wireless-regdb.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index e9003ce2e6..5c8ef96398 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -9,7 +9,6 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE -WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS From yann.morin.1998 at free.fr Sun Feb 4 10:06:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:06:18 +0100 Subject: [Buildroot] [git commit] package/rauc-hawkbit-updater: drop RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR Message-ID: <20240204100707.3170C86892@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed40db6dfba553df8571fcb96c29b8f20dc43dca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:pengutronix:rauc-hawkbit-updater added by commit 928b7219cd7079864eadadc66dbff21c5cd72804 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:pengutronix:rauc-hawkbit-updater Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index 10ba91abbb..a453f75a28 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -9,7 +9,6 @@ RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/release RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE -RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl $(eval $(meson-package)) From yann.morin.1998 at free.fr Sun Feb 4 10:07:20 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:07:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR In-Reply-To: <20240201174205.180556-1-fontaine.fabrice@gmail.com> References: <20240201174205.180556-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-01 18:42 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:kernel:wireless-regdb added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > > https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/wireless-regdb/wireless-regdb.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk > index e9003ce2e6..5c8ef96398 100644 > --- a/package/wireless-regdb/wireless-regdb.mk > +++ b/package/wireless-regdb/wireless-regdb.mk > @@ -9,7 +9,6 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz > WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb > WIRELESS_REGDB_LICENSE = ISC > WIRELESS_REGDB_LICENSE_FILES = LICENSE > -WIRELESS_REGDB_CPE_ID_VENDOR = kernel > > ifeq ($(BR2_PACKAGE_CRDA),y) > define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 4 10:07:42 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:07:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR In-Reply-To: <20240201174432.182161-1-fontaine.fabrice@gmail.com> References: <20240201174432.182161-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-01 18:44 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:kernel:linux-firmware added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/linux-firmware/linux-firmware.mk | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk > index 58fbaab1d7..60e8861abe 100644 > --- a/package/linux-firmware/linux-firmware.mk > +++ b/package/linux-firmware/linux-firmware.mk > @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz > LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware > LINUX_FIRMWARE_INSTALL_IMAGES = YES > > -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel > - > # Intel SST DSP > ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) > LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 4 10:08:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:08:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/rauc-hawkbit-updater: drop RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR In-Reply-To: <20240203103501.41738-1-fontaine.fabrice@gmail.com> References: <20240203103501.41738-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-03 11:35 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:pengutronix:rauc-hawkbit-updater added by commit > 928b7219cd7079864eadadc66dbff21c5cd72804 has never been a valid CPE ID > for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:pengutronix:rauc-hawkbit-updater > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > index 10ba91abbb..a453f75a28 100644 > --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > @@ -9,7 +9,6 @@ RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/release > RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz > RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 > RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE > -RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix > RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl > > $(eval $(meson-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 4 10:11:40 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 11:11:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/htop: fix BR2_SHARED_STATIC_LIBS build Message-ID: <20240204101140.1403357-1-fontaine.fabrice@gmail.com> With BR2_SHARED_STATIC_LIBS=y, the generic infrastructure adds a --enable-static flags causing htop to be built as a static binary. Adding a --disable-static reverts this. This will fix the following build failure with hwloc raised since bump to version 3.3.0 in commit 09243186df3168022f0b23b8a9677c6313033769 and https://github.com/htop-dev/htop/commit/c8a61850dd31ab64eb8ad83929ce86d2adbeb96c: /home/autobuild/autobuild/instance-3/output-1/host/bin/mipsel-buildroot-linux-gnu-gcc -std=c99 -pedantic -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -I/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include -I/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/include/libxml2 -Wall -Wcast-align -Wcast-qual -Wextra -Wfloat-equal -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wpointer-arith -Wshadow -Wstrict-prototypes -Wundef -Wunused -Wwrite-strings -Wnull-dereference -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR="\"/etc\"" -I"./linux" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=2 -static -rdynamic -static -o htop htop.o Action.o Affinity.o AffinityPanel.o AvailableColumnsPanel.o AvailableMetersPanel.o BatteryMeter.o CategoriesPanel.o ClockMeter.o ColorsPanel.o ColumnsPanel.o CommandLine.o CommandScreen.o Compat.o CPUMeter.o CRT.o DateMeter.o DateTimeMeter.o DiskIOMeter.o DisplayOptionsPanel.o DynamicColumn.o DynamicMeter.o DynamicScreen.o EnvScreen.o FileDescriptorMeter.o FunctionBar.o Hashtable.o Header.o HeaderOptionsPanel.o HostnameMeter.o IncSet.o InfoScreen.o ListItem.o LoadAverageMeter.o Machine.o MainPanel.o MemoryMeter.o MemorySwapMeter.o Meter.o MetersPanel.o NetworkIOMeter.o Object.o OpenFilesScreen.o OptionItem.o Panel.o Process.o ProcessLocksScreen.o ProcessTable.o Row.o RichString.o Scheduling.o ScreenManager.o ScreensPanel.o ScreenTabsPanel.o Settings.o SignalsPanel.o SwapMeter.o SysArchMeter.o Table.o TasksMeter.o TraceScreen.o UptimeMeter.o UsersTable.o Vector.o XUtils.o generic/gettime.o generic/hostname.o generic/uname.o linux/CGroupUtils.o linux/HugePageMeter.o linux/IOPriorityPanel.o linux/LibSensors.o linux/LinuxMachine.o linux/LinuxProcess.o linux/LinuxProcessTable.o linux/Platform.o linux/PressureStallMeter.o linux/SELinuxMeter.o linux/SystemdMeter.o linux/ZramMeter.o zfs/ZfsArcMeter.o zfs/ZfsCompressedArcMeter.o -lcap -llzma -L/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib -lncurses -lm -L/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/lib -lhwloc /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Action.o: in function `Action_setUserOnly': Action.c:(.text+0x2490): warning: Using 'getpwnam' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Settings.o: in function `Settings_new': Settings.c:(.text+0x2dd0): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/libhwloc.a(topology-xml-libxml.o): in function `hwloc_libxml_free_buffer': topology-xml-libxml.c:(.text+0x2c): undefined reference to `xmlFree' Fixes: - http://autobuild.buildroot.org/results/04bd5633750ff5cef048ea78c9de043d3ffcfa32 Signed-off-by: Fabrice Fontaine --- package/htop/htop.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 6dbaae3796..af8eff4860 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -17,6 +17,13 @@ HTOP_LICENSE_FILES = COPYING # provided by autoconf relies on wchar_t. HTOP_CONF_ENV += ac_cv_prog_cc_c99=-std=gnu99 +# With BR2_SHARED_STATIC_LIBS=y, the generic infrastructure adds a +# --enable-static flags causing htop to be built as a static binary. +# Adding a --disable-static reverts this +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +HTOP_CONF_OPTS += --disable-static +endif + ifeq ($(BR2_PACKAGE_HWLOC),y) HTOP_CONF_OPTS += --enable-hwloc HTOP_DEPENDENCIES += hwloc -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 10:16:13 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:13 +0100 Subject: [Buildroot] [git commit] package/netatalk: update NETATALK_CPE_ID_VENDOR Message-ID: <20240204101728.C5469868D9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ae38ec621f4821dd3eaf7ad3b0174cad21116ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of cpe:2.3:a:netatalk:netatalk in September 2023: Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/netatalk/netatalk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index a47bfa7e84..40e64dabeb 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -12,7 +12,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT -NETATALK_CPE_ID_VENDOR = netatalk_project +NETATALK_CPE_ID_VENDOR = netatalk # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ From yann.morin.1998 at free.fr Sun Feb 4 10:16:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:34 +0100 Subject: [Buildroot] [git commit] package/dbus: fix CPE variables Message-ID: <20240204101728.F1778868D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=363b4ebf1aaf4821c0c49713eba71937bd5639ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:d-bus_project:d-bus has been deprecated in favor of cpe:2.3:a:freedesktop:dbus in December 2023: D-Bus Project D-Bus 1.15.6 Version Advisory Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/dbus/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index c41fbcb4dd..d610846ddb 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -11,8 +11,8 @@ DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.xz DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -DBUS_CPE_ID_VENDOR = d-bus_project -DBUS_CPE_ID_PRODUCT = d-bus +DBUS_CPE_ID_VENDOR = freedesktop +DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From yann.morin.1998 at free.fr Sun Feb 4 10:16:46 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:46 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp: update PYTHON_AIOHTTP_CPE_ID_VENDOR Message-ID: <20240204101729.11F40868DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a01deb6617ff38914f649f88c71e7c0c5ee71b01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:aiohttp_project:aiohttp has been deprecated in favor of cpe:2.3:a:aiohttp:aiohttp in November 2023: Aiohttp Project Aiohttp 3.8.0 Beta 0 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-aiohttp/python-aiohttp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 2cb9058b97..3dc822e832 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -10,7 +10,7 @@ PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/54/07/9467d3f8dae2 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp_project +PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp PYTHON_AIOHTTP_CPE_ID_PRODUCT = aiohttp $(eval $(python-package)) From yann.morin.1998 at free.fr Sun Feb 4 10:16:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:07 +0100 Subject: [Buildroot] [git commit] package/python-wheel: add CPE variables Message-ID: <20240204101728.BB1BC868D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92f3f04146654f77add9fc14c18d054783006108 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:wheel_project:wheel is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/402C4B59-237A-4399-8189-CC9FC1B4BF39 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-wheel/python-wheel.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-wheel/python-wheel.mk b/package/python-wheel/python-wheel.mk index 159598fd1e..320995521e 100644 --- a/package/python-wheel/python-wheel.mk +++ b/package/python-wheel/python-wheel.mk @@ -10,5 +10,7 @@ PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/fc/ef/0335f7217dd1e8 PYTHON_WHEEL_SETUP_TYPE = flit PYTHON_WHEEL_LICENSE = MIT PYTHON_WHEEL_LICENSE_FILES = LICENSE.txt +PYTHON_WHEEL_CPE_ID_VENDOR = wheel_project +PYTHON_WHEEL_CPE_ID_PRODUCT = wheel $(eval $(host-python-package)) From yann.morin.1998 at free.fr Sun Feb 4 10:16:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:23 +0100 Subject: [Buildroot] [git commit] package/json-c: update JSON_C_CPE_ID_VENDOR Message-ID: <20240204101728.DB00F868DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63118fbb55d3be3fc182470f02fcf7c221ba5ae4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:json-c_project:json-c has been deprecated in favor of cpe:2.3:a:json-c:json-c in September 2023: JSON-C Project JSON-C 0.14 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/json-c/json-c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 517acee4db..68401433b4 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VENDOR = json-c_project +JSON_C_CPE_ID_VENDOR = json-c JSON_C_CONF_OPTS = -DBUILD_APPS=OFF -DDISABLE_EXTRA_LIBS=ON $(eval $(cmake-package)) From yann.morin.1998 at free.fr Sun Feb 4 10:16:29 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:29 +0100 Subject: [Buildroot] [git commit] package/flex: update FLEX_CPE_ID_VENDOR Message-ID: <20240204101728.E5D89868DD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c438422d4972f41c0c59d1b701eefd3028abee43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:flex_project:flex has been deprecated in favor of cpe:2.3:a:westes:flex in October 2023: Flex Fast Lexical Analyser 2.6.4 Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index f1e731ce2e..c6417fea83 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VENDOR = flex_project +FLEX_CPE_ID_VENDOR = westes # bug does not cause stack overflows in the generated code and has been # noted upstream as a bug in the code generator FLEX_IGNORE_CVES = CVE-2019-6293 From yann.morin.1998 at free.fr Sun Feb 4 10:16:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:18 +0100 Subject: [Buildroot] [git commit] package/x11r7/xlib_libXpm: update XLIB_LIBXPM_CPE_ID_VENDOR Message-ID: <20240204101728.D07F6868DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03a9171cced41f2ee94850d6237bcc54fdda0b1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:libxpm_project:libxpm has been deprecated in favor of cpe:2.3:a:x.org:libxpm in October 2023: Libxpm Project Libxpm 3.5.15 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 0bba3ea946..1239ba0d4d 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -9,7 +9,7 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT -XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_VENDOR = x.org XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ From yann.morin.1998 at free.fr Sun Feb 4 10:16:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:39 +0100 Subject: [Buildroot] [git commit] package/c-ares: update C_ARES_CPE_ID_VENDOR Message-ID: <20240204101729.079EB868D9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae2baf1771cbbebae65e32397480deec6bf879e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:c-ares_project:c-ares has been deprecated in favor of cpe:2.3:a:c-ares:c-ares in September 2023: C-ares Project C-ares 1.17.1 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/c-ares/c-ares.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 7a49b2639a..586fde9afb 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -10,7 +10,7 @@ C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md -C_ARES_CPE_ID_VENDOR = c-ares_project +C_ARES_CPE_ID_VENDOR = c-ares $(eval $(autotools-package)) $(eval $(host-autotools-package)) From yann.morin.1998 at free.fr Sun Feb 4 10:17:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:17:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-wheel: add CPE variables In-Reply-To: <20240121213513.2636195-1-fontaine.fabrice@gmail.com> References: <20240121213513.2636195-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-01-21 22:35 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:wheel_project:wheel is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/detail/402C4B59-237A-4399-8189-CC9FC1B4BF39 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-wheel/python-wheel.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/python-wheel/python-wheel.mk b/package/python-wheel/python-wheel.mk > index 159598fd1e..320995521e 100644 > --- a/package/python-wheel/python-wheel.mk > +++ b/package/python-wheel/python-wheel.mk > @@ -10,5 +10,7 @@ PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/fc/ef/0335f7217dd1e8 > PYTHON_WHEEL_SETUP_TYPE = flit > PYTHON_WHEEL_LICENSE = MIT > PYTHON_WHEEL_LICENSE_FILES = LICENSE.txt > +PYTHON_WHEEL_CPE_ID_VENDOR = wheel_project > +PYTHON_WHEEL_CPE_ID_PRODUCT = wheel > > $(eval $(host-python-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 4 10:19:01 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:19:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: update NETATALK_CPE_ID_VENDOR In-Reply-To: <20240203180247.143487-1-fontaine.fabrice@gmail.com> References: <20240203180247.143487-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-03 19:02 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of > cpe:2.3:a:netatalk:netatalk in September 2023: > > > Version > > > > Signed-off-by: Fabrice Fontaine Applied to master, along with the few following CPE updates, thanks! Regards, Yann E. MORIN. > --- > package/netatalk/netatalk.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk > index a47bfa7e84..40e64dabeb 100644 > --- a/package/netatalk/netatalk.mk > +++ b/package/netatalk/netatalk.mk > @@ -12,7 +12,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ > libevent > NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like > NETATALK_LICENSE_FILES = COPYING COPYRIGHT > -NETATALK_CPE_ID_VENDOR = netatalk_project > +NETATALK_CPE_ID_VENDOR = netatalk > > # Don't run ldconfig! > NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 4 10:20:56 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 11:20:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: drop NFS_UTILS_AUTORECONF Message-ID: <20240204102056.1409453-1-fontaine.fabrice@gmail.com> Commit 63332c33aa0771532807fd2684d4eee4eb952435 wrongly set NFS_UTILS_AUTORECONF Signed-off-by: Fabrice Fontaine --- package/nfs-utils/nfs-utils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index a11ba154ad..4f2b41c782 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -11,7 +11,6 @@ NFS_UTILS_LICENSE = GPL-2.0+ NFS_UTILS_LICENSE_FILES = COPYING NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libevent libtirpc sqlite util-linux NFS_UTILS_CPE_ID_VENDOR = linux-nfs -NFS_UTILS_AUTORECONF = YES NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 4 10:32:04 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 11:32:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: drop DBUS_CPE_ID_PRODUCT Message-ID: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the package name (i.e. dbus) by default Signed-off-by: Fabrice Fontaine --- package/dbus/dbus.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d610846ddb..097b89205e 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -12,7 +12,6 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING DBUS_CPE_ID_VENDOR = freedesktop -DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 10:29:49 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:29:49 +0100 Subject: [Buildroot] [git commit] package/nfs-utils: drop NFS_UTILS_AUTORECONF Message-ID: <20240204103513.88AD9868E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6460074bbfef7663d5ed0ec9f9fa96a6fcc6973c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 63332c33aa0771532807fd2684d4eee4eb952435 wrongly set NFS_UTILS_AUTORECONF Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/nfs-utils/nfs-utils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index a11ba154ad..4f2b41c782 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -11,7 +11,6 @@ NFS_UTILS_LICENSE = GPL-2.0+ NFS_UTILS_LICENSE_FILES = COPYING NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libevent libtirpc sqlite util-linux NFS_UTILS_CPE_ID_VENDOR = linux-nfs -NFS_UTILS_AUTORECONF = YES NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no From yann.morin.1998 at free.fr Sun Feb 4 10:36:00 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:36:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: drop NFS_UTILS_AUTORECONF In-Reply-To: <20240204102056.1409453-1-fontaine.fabrice@gmail.com> References: <20240204102056.1409453-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-04 11:20 +0100, Fabrice Fontaine spake thusly: > Commit 63332c33aa0771532807fd2684d4eee4eb952435 wrongly set > NFS_UTILS_AUTORECONF > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/nfs-utils/nfs-utils.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > index a11ba154ad..4f2b41c782 100644 > --- a/package/nfs-utils/nfs-utils.mk > +++ b/package/nfs-utils/nfs-utils.mk > @@ -11,7 +11,6 @@ NFS_UTILS_LICENSE = GPL-2.0+ > NFS_UTILS_LICENSE_FILES = COPYING > NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libevent libtirpc sqlite util-linux > NFS_UTILS_CPE_ID_VENDOR = linux-nfs > -NFS_UTILS_AUTORECONF = YES > > NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd at kuhls.net Sun Feb 4 11:18:42 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 4 Feb 2024 12:18:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-inputstream-adaptive: bump version to 20.3.17-Nexus Message-ID: <20240204111842.513296-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index b608c29fba..e38191c0c4 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 4651c022395f92906be40e8c923c9f90c3e9190d9dafee9e229ca1846605c5c5 kodi-inputstream-adaptive-20.3.16-Nexus.tar.gz +sha256 f67cfef057f8842716db4521a8cd3966c37a1da8fc3fb297527f6f25be20688a kodi-inputstream-adaptive-20.3.17-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 514a1a5f2d..ba4f6de61a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.16-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.17-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ -- 2.39.2 From bernd at kuhls.net Sun Feb 4 11:20:31 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 4 Feb 2024 12:20:31 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/kodi-inputstream-adaptive: bump version to 20.3.17-Nexus Message-ID: <20240204112031.514780-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- v2: squashed with previous bump to 20.3.16-Nexus .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index ebcf32fd4a..e38191c0c4 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 1d7c933d05534e591e11fd204e836a3498fffc6a0717d5427c89acfd16fb9d40 kodi-inputstream-adaptive-20.3.15-Nexus.tar.gz +sha256 f67cfef057f8842716db4521a8cd3966c37a1da8fc3fb297527f6f25be20688a kodi-inputstream-adaptive-20.3.17-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 267541ace9..ba4f6de61a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.15-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.17-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ -- 2.39.2 From yann.morin.1998 at free.fr Sun Feb 4 12:32:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 13:32:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: drop DBUS_CPE_ID_PRODUCT In-Reply-To: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> References: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-04 11:32 +0100, Fabrice Fontaine spake thusly: > Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT > to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the > package name (i.e. dbus) by default Ah, right. Applied to master, thanks. Maybe it would be good to add that check to utils/checkpackagelib/, so that it detects and reports the "FOO_CPE_ID_PRODUCT = foo" case. Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > package/dbus/dbus.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk > index d610846ddb..097b89205e 100644 > --- a/package/dbus/dbus.mk > +++ b/package/dbus/dbus.mk > @@ -12,7 +12,6 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus > DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) > DBUS_LICENSE_FILES = COPYING > DBUS_CPE_ID_VENDOR = freedesktop > -DBUS_CPE_ID_PRODUCT = dbus > DBUS_INSTALL_STAGING = YES > > define DBUS_PERMISSIONS > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 4 12:27:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 13:27:30 +0100 Subject: [Buildroot] [git commit] package/dbus: drop DBUS_CPE_ID_PRODUCT Message-ID: <20240204123306.031A3868E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b878e7bbbc7041c8fd0ce2e410cc7fc9428bb93d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the package name (i.e. dbus) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/dbus/dbus.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d610846ddb..097b89205e 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -12,7 +12,6 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING DBUS_CPE_ID_VENDOR = freedesktop -DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From yann.morin.1998 at free.fr Sun Feb 4 13:25:54 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 14:25:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: drop DBUS_CPE_ID_PRODUCT In-Reply-To: References: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-04 13:32 +0100, Yann E. MORIN spake thusly: > Maybe it would be good to add that check to utils/checkpackagelib/, so > that it detects and reports the "FOO_CPE_ID_PRODUCT = foo" case. It got me thinking that it'd be a good itch to scratch, so I'm working on it. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 4 13:35:55 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 14:35:55 +0100 Subject: [Buildroot] [PATCH 1/3] package/containerd: drop CONTAINERD_CPE_ID_VENDOR Message-ID: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> Commit 35af2bb8011ea57642777acf5613afa244d325d7 set CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as CONTAINERD_CPE_ID_PRODUCT will be set to the package name (i.e. containerd) by default Signed-off-by: Fabrice Fontaine --- package/containerd/containerd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 61a8472ddd..d3ca102797 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 4 13:35:56 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 14:35:56 +0100 Subject: [Buildroot] [PATCH 2/3] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT In-Reply-To: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> Message-ID: <20240204133557.1512951-2-fontaine.fabrice@gmail.com> Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as LIBCURL_CPE_ID_PRODUCT will be set to the package name (i.e. libcurl) by default Signed-off-by: Fabrice Fontaine --- package/libcurl/libcurl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 3ecc587a52..83845b8e87 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 4 13:35:57 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 14:35:57 +0100 Subject: [Buildroot] [PATCH 3/3] utils/checkpackagelib: add RemoveDefaultPackageCpeIdProductVariable In-Reply-To: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> Message-ID: <20240204133557.1512951-3-fontaine.fabrice@gmail.com> As advised by Yann E. Morin [1], add RemoveDefaultPackageCpeIdProductVariable [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240204103204.1415592-1-fontaine.fabrice at gmail.com Signed-off-by: Fabrice Fontaine --- utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 551c87168f..b5cfdd7f41 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -227,6 +227,24 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction): text] +class RemoveDefaultPackageCpeIdProductVariable(_CheckFunction): + def before(self): + package, _ = os.path.splitext(os.path.basename(self.filename)) + package_upper = package.replace("-", "_").upper() + self.package = package + self.FIND_CPE_ID_PRODUCT = re.compile( + r"^{}_CPE_ID_PRODUCT\s*=\s*{}$" + .format(package_upper, package, package_upper)) + + def check_line(self, lineno, text): + if self.FIND_CPE_ID_PRODUCT.search(text): + + return ["{}:{}: remove default value of _CPE_ID_PRODUCT variable " + "({}#generic-package-reference)" + .format(self.filename, lineno, self.url_to_manual), + text] + + class SpaceBeforeBackslash(_CheckFunction): TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*( |\t ?)\\$") -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 13:58:00 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 14:58:00 +0100 Subject: [Buildroot] [PATCH 3/3] utils/checkpackagelib: add RemoveDefaultPackageCpeIdProductVariable In-Reply-To: <20240204133557.1512951-3-fontaine.fabrice@gmail.com> References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> <20240204133557.1512951-3-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, Thanks for working on my suggestion! Sorry, I was not quick enough that I was tackling it on my side... See below for some comments... On 2024-02-04 14:35 +0100, Fabrice Fontaine spake thusly: > As advised by Yann E. Morin [1], add > RemoveDefaultPackageCpeIdProductVariable > > [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240204103204.1415592-1-fontaine.fabrice at gmail.com > > Signed-off-by: Fabrice Fontaine > --- > utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py > index 551c87168f..b5cfdd7f41 100644 > --- a/utils/checkpackagelib/lib_mk.py > +++ b/utils/checkpackagelib/lib_mk.py > @@ -227,6 +227,24 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction): > text] > > > +class RemoveDefaultPackageCpeIdProductVariable(_CheckFunction): > + def before(self): > + package, _ = os.path.splitext(os.path.basename(self.filename)) > + package_upper = package.replace("-", "_").upper() > + self.package = package > + self.FIND_CPE_ID_PRODUCT = re.compile( > + r"^{}_CPE_ID_PRODUCT\s*=\s*{}$" > + .format(package_upper, package, package_upper)) > + > + def check_line(self, lineno, text): > + if self.FIND_CPE_ID_PRODUCT.search(text): > + > + return ["{}:{}: remove default value of _CPE_ID_PRODUCT variable " > + "({}#generic-package-reference)" > + .format(self.filename, lineno, self.url_to_manual), > + text] This is actually a little bit more complex than that. Indeed, if there is no CPE variable set, we do not consider FOO_CPE_ID to be valid, but if the user does provide one CPE variable, then we connsider FOO_CPE_ID to be valid. Of course, in that case, we want to allow for the CPE variable to be the default, if that's the actual value it needs to have. But this is only valid *if* there is only one CPE variable set. So, I am almost done on my side, but if you want to continue on your side, I'm totally fine with letting you do the job! Just tell me. Regards, Yann E. MORIN. > + > class SpaceBeforeBackslash(_CheckFunction): > TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*( |\t ?)\\$") > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 4 14:06:53 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 15:06:53 +0100 Subject: [Buildroot] [PATCH 3/3] utils/checkpackagelib: add RemoveDefaultPackageCpeIdProductVariable In-Reply-To: References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> <20240204133557.1512951-3-fontaine.fabrice@gmail.com> Message-ID: Hello Yann, Le dim. 4 f?vr. 2024 ? 14:58, Yann E. MORIN a ?crit : > > Fabrice, All, > > Thanks for working on my suggestion! Sorry, I was not quick enough that > I was tackling it on my side... See below for some comments... > > On 2024-02-04 14:35 +0100, Fabrice Fontaine spake thusly: > > As advised by Yann E. Morin [1], add > > RemoveDefaultPackageCpeIdProductVariable > > > > [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240204103204.1415592-1-fontaine.fabrice at gmail.com > > > > Signed-off-by: Fabrice Fontaine > > --- > > utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++++++ > > 1 file changed, 18 insertions(+) > > > > diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py > > index 551c87168f..b5cfdd7f41 100644 > > --- a/utils/checkpackagelib/lib_mk.py > > +++ b/utils/checkpackagelib/lib_mk.py > > @@ -227,6 +227,24 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction): > > text] > > > > > > +class RemoveDefaultPackageCpeIdProductVariable(_CheckFunction): > > + def before(self): > > + package, _ = os.path.splitext(os.path.basename(self.filename)) > > + package_upper = package.replace("-", "_").upper() > > + self.package = package > > + self.FIND_CPE_ID_PRODUCT = re.compile( > > + r"^{}_CPE_ID_PRODUCT\s*=\s*{}$" > > + .format(package_upper, package, package_upper)) > > + > > + def check_line(self, lineno, text): > > + if self.FIND_CPE_ID_PRODUCT.search(text): > > + > > + return ["{}:{}: remove default value of _CPE_ID_PRODUCT variable " > > + "({}#generic-package-reference)" > > + .format(self.filename, lineno, self.url_to_manual), > > + text] > > This is actually a little bit more complex than that. Indeed, if there > is no CPE variable set, we do not consider FOO_CPE_ID to be valid, but > if the user does provide one CPE variable, then we connsider FOO_CPE_ID > to be valid. > > Of course, in that case, we want to allow for the CPE variable to be the > default, if that's the actual value it needs to have. But this is only > valid *if* there is only one CPE variable set. > > So, I am almost done on my side, but if you want to continue on your > side, I'm totally fine with letting you do the job! Just tell me. Indeed, I didn't manage all the corner cases. I'll let you handle the rest. > > Regards, > Yann E. MORIN. > > > + > > class SpaceBeforeBackslash(_CheckFunction): > > TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*( |\t ?)\\$") > > > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From peter at korsgaard.com Sun Feb 4 14:50:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 15:50:18 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/redis: security bump to v7.0.15 Message-ID: <20240204145122.E62A9868F2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fcef868c6088a628eef2a82eac48af2fffe832aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x ================================================================================ Redis 7.0.15 Released Tue 09 Jan 2024 10:45:52 IST ================================================================================ Upgrade urgency SECURITY: See security fixes below. Security fixes ============== * (CVE-2023-41056) In some cases, Redis may incorrectly handle resizing of memory buffers which can result in incorrect accounting of buffer sizes and lead to heap overflow and potential remote code execution. Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index cbbb29ca13..61ae276de9 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 7e1cdf347f4970ea39d5b7fdb19aedec4c21942e202de65bdeb782d38d2f299f redis-7.0.14.tar.gz +sha256 98066f5363504b26c34dd20fbcc3c957990d764cdf42576c836fc021073f4341 redis-7.0.15.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 5bf15821ba..2c5702d10d 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.0.14 +REDIS_VERSION = 7.0.15 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 4 14:37:26 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 15:37:26 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/redis: security bump to v7.2.4 Message-ID: <20240204145230.E8BDC868F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7964cf52a0f3137ca3359deef46bcd3e9472f504 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x See release notes (https://github.com/redis/redis/blob/7.2.4/00-RELEASENOTES): ================================================================================ Redis 7.2.4 Released Tue 09 Jan 2024 10:45:52 IST ================================================================================ Upgrade urgency SECURITY: See security fixes below. Security fixes ============== * (CVE-2023-41056) In some cases, Redis may incorrectly handle resizing of memory buffers which can result in incorrect accounting of buffer sizes and lead to heap overflow and potential remote code execution. Bug fixes ========= * Fix crashes of cluster commands clusters with mixed versions of 7.0 and 7.2 (#12805, #12832) * Fix slot ownership not being properly handled when deleting a slot from a node (#12564) * Fix atomicity issues with the RedisModuleEvent_Key module API event (#12733) Signed-off-by: Titouan Christophe Signed-off-by: Peter Korsgaard (cherry picked from commit 5f59c175a484fcc47c6875db49ad03eb83b90523) Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 365fbf4063..378b930374 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 3e2b196d6eb4ddb9e743088bfc2915ccbb42d40f5a8a3edd8cb69c716ec34be7 redis-7.2.3.tar.gz +sha256 8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59 redis-7.2.4.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 77cfb1e0b1..09a3b9448b 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.2.3 +REDIS_VERSION = 7.2.4 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 4 14:52:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 15:52:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/redis: security bump to v7.2.4 In-Reply-To: <877ck3hvez.fsf@48ers.dk> (Peter Korsgaard's message of "Sun, 21 Jan 2024 10:45:24 +0100") References: <20240118193717.915022-1-titouanchristophe@gmail.com> <877ck3hvez.fsf@48ers.dk> Message-ID: <87wmrkp9hr.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Titouan" == Titouan Christophe writes: >> See release notes (https://github.com/redis/redis/blob/7.2.4/00-RELEASENOTES): >> ================================================================================ >> Redis 7.2.4 Released Tue 09 Jan 2024 10:45:52 IST >> ================================================================================ >> Upgrade urgency SECURITY: See security fixes below. >> Security fixes >> ============== >> * (CVE-2023-41056) In some cases, Redis may incorrectly handle resizing of memory >> buffers which can result in incorrect accounting of buffer sizes and lead to >> heap overflow and potential remote code execution. >> Bug fixes >> ========= >> * Fix crashes of cluster commands clusters with mixed versions of 7.0 and 7.2 (#12805, #12832) >> * Fix slot ownership not being properly handled when deleting a slot from a node (#12564) >> * Fix atomicity issues with the RedisModuleEvent_Key module API event (#12733) >> Signed-off-by: Titouan Christophe > Committed, thanks. Committed to 2023.11.x, thanks. For 2023.02.x I have instead bumped to 7.0.15. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 15:07:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 16:07:55 +0100 Subject: [Buildroot] [git commit] package/micropython: fix building after dropping GIT_DIR=. workaround In-Reply-To: <20240121131614.3ADE3863A1@busybox.osuosl.org> (Yann E. MORIN's message of "Sun, 21 Jan 2024 14:12:16 +0100") References: <20240121131614.3ADE3863A1@busybox.osuosl.org> Message-ID: <87sf28p8s4.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=6c9be611a8b7b4caac746920c08035761a9b9d9c > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The MICROPYTHON_MAKE_ENV variable contained two things; > - the comon target environment variables CC, CFLAGS et al. defined in > TARGET_MAKE_ENV, > - the GIT_DIR workaround > Commit 9024e1866523 (package/micropython: drop GIT_DIR=. workaround) > totally dropped the assignment to MICROPYTHON_MAKE_ENV, but did not > replace its expansin with TARGET_MAKE_ENV. > This yields build error like: > LINK build-standard/micropython > arm-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib64/../lib64' > Fix this by expanding TARGET_MAKE_ENV in lieu of MICROPYTHON_MAKE_ENV. > Signed-off-by: Yann E. MORIN Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 15:07:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 16:07:35 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/micropython: fix building after dropping GIT_DIR=. workaround Message-ID: <20240204150804.D457F868F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1297bfb5ad0d42535fb5049e6cd0b813caa6957 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The MICROPYTHON_MAKE_ENV variable contained two things; - the comon target environment variables CC, CFLAGS et al. defined in TARGET_MAKE_ENV, - the GIT_DIR workaround Commit 9024e1866523 (package/micropython: drop GIT_DIR=. workaround) totally dropped the assignment to MICROPYTHON_MAKE_ENV, but did not replace its expansin with TARGET_MAKE_ENV. This yields build error like: LINK build-standard/micropython arm-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib64/../lib64' Fix this by expanding TARGET_MAKE_ENV in lieu of MICROPYTHON_MAKE_ENV. Signed-off-by: Yann E. MORIN (cherry picked from commit 6c9be611a8b7b4caac746920c08035761a9b9d9c) Signed-off-by: Peter Korsgaard --- package/micropython/micropython.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 6e0af59f06..41bd32099b 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -37,13 +37,13 @@ MICROPYTHON_MAKE_OPTS += \ CWARN= define MICROPYTHON_BUILD_CMDS - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) endef define MICROPYTHON_INSTALL_TARGET_CMDS - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) \ PREFIX=/usr \ From peter at korsgaard.com Sun Feb 4 15:07:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 16:07:16 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/micropython: fix building after dropping GIT_DIR=. workaround Message-ID: <20240204150917.65B3C868FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d35d445a1ae2f9fe1682540159c2c32cb2114c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The MICROPYTHON_MAKE_ENV variable contained two things; - the comon target environment variables CC, CFLAGS et al. defined in TARGET_MAKE_ENV, - the GIT_DIR workaround Commit 9024e1866523 (package/micropython: drop GIT_DIR=. workaround) totally dropped the assignment to MICROPYTHON_MAKE_ENV, but did not replace its expansin with TARGET_MAKE_ENV. This yields build error like: LINK build-standard/micropython arm-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib64/../lib64' Fix this by expanding TARGET_MAKE_ENV in lieu of MICROPYTHON_MAKE_ENV. Signed-off-by: Yann E. MORIN (cherry picked from commit 6c9be611a8b7b4caac746920c08035761a9b9d9c) Signed-off-by: Peter Korsgaard --- package/micropython/micropython.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 6e0af59f06..41bd32099b 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -37,13 +37,13 @@ MICROPYTHON_MAKE_OPTS += \ CWARN= define MICROPYTHON_BUILD_CMDS - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) endef define MICROPYTHON_INSTALL_TARGET_CMDS - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) \ PREFIX=/usr \ From yann.morin.1998 at free.fr Sun Feb 4 15:22:49 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 16:22:49 +0100 Subject: [Buildroot] [PATCH 0/4] utils/checkpackagelib: check CPE variables (branch yem/checkpkg-cpe) Message-ID: Hello All! This series removes superfluous CPE variables that are set to their default values, and eventually adds a check-package test that ensures none crop in back in the future. The first two patches are from Fabrice, from his initial attempt at such a check. Thanks! Regards, Yann E. MORIN. ---------------------------------------------------------------- Fabrice Fontaine (2): package/containerd: drop CONTAINERD_CPE_ID_VENDOR package/libcurl: drop LIBCURL_CPE_ID_PRODUCT Yann E. MORIN (2): package/v4l2loopback: drop _CPE_ID_VENDOR utils/checkpackagelib: add check for CPE variables set to defautl values package/containerd/containerd.mk | 1 - package/libcurl/libcurl.mk | 1 - package/v4l2loopback/v4l2loopback.mk | 1 - utils/checkpackagelib/lib_mk.py | 59 ++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 3 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 4 15:22:48 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 16:22:48 +0100 Subject: [Buildroot] [PATCH 1/4] package/containerd: drop CONTAINERD_CPE_ID_VENDOR In-Reply-To: References: Message-ID: From: Fabrice Fontaine Commit 35af2bb8011ea57642777acf5613afa244d325d7 set CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as CONTAINERD_CPE_ID_PRODUCT will be set to the package name (i.e. containerd) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/containerd/containerd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 61a8472ddd..d3ca102797 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 15:22:49 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 16:22:49 +0100 Subject: [Buildroot] [PATCH 2/4] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT In-Reply-To: References: Message-ID: From: Fabrice Fontaine Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as LIBCURL_CPE_ID_PRODUCT will be set to the package name (i.e. libcurl) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libcurl/libcurl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 3ecc587a52..83845b8e87 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 15:22:50 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 16:22:50 +0100 Subject: [Buildroot] [PATCH 3/4] package/v4l2loopback: drop _CPE_ID_VENDOR In-Reply-To: References: Message-ID: <1bfeb8d9649b7bb7fcd44cab8b5bd811bf389c0f.1707060159.git.yann.morin.1998@free.fr> Commit 1edb9d691dec (package/v4l2loopback: add V4L2LOOPBACK_CPE_ID_VENDOR) added that variable, but set to its default value. This is however not required to define a valid CPE ID, as it also defines a non-default CPE_ID_PREFIX. Drop V4L2LOOPBACK_CPE_ID_VENDOR now. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- package/v4l2loopback/v4l2loopback.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/v4l2loopback/v4l2loopback.mk b/package/v4l2loopback/v4l2loopback.mk index 84e1927ce3..50a168fcab 100644 --- a/package/v4l2loopback/v4l2loopback.mk +++ b/package/v4l2loopback/v4l2loopback.mk @@ -8,7 +8,6 @@ V4L2LOOPBACK_VERSION = 0.12.7 V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,v$(V4L2LOOPBACK_VERSION)) V4L2LOOPBACK_LICENSE = GPL-2.0+ V4L2LOOPBACK_LICENSE_FILES = COPYING -V4L2LOOPBACK_CPE_ID_VENDOR = v4l2loopback_project V4L2LOOPBACK_CPE_ID_PREFIX = cpe:2.3:o ifeq ($(BR2_PACKAGE_V4L2LOOPBACK_UTILS),y) -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 15:22:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 16:22:51 +0100 Subject: [Buildroot] [PATCH 4/4] utils/checkpackagelib: add check for CPE variables set to defautl values In-Reply-To: References: Message-ID: The way we handle CPE variable is unsual compared to the other variables: we mostly compute defaults for all of them, and eventually aggregate the various CPE variables to form the CPE ID name. However, we do not consider that CPE ID to valid, unless there is one (or more) CPE variables actually set by thje package. This shows that the CPE ID has been checked to be valid against the NVD CPE database. However, it is totally possible (and very often the case) that the default value we set to those variables are appropriate, and do defne a valid CPE ID. In this case, the package will define any arbitrary cPE variable to tis default value, usually by setting either the VENDOR or PRODUCT field, though there is no rule or requirement that be the case. But since we only need one variable to be set, if they all are set to their default value, or one is set to a non-default value, there is no need to define the others to their default value. So, the rules are really: * no valid CPE ID known: define no CPE variable; * valid CPE ID known, using all defaults fields: set a single CPE variable; * valid CPE ID known, at least one CPE field id non default: only set those CPE variables that are not default. So, we add a new check to checkpakcagelib, that ensures the above rules are met: if a CPE variable is set to its default, then it should be the only CPE variable set at all. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Cc: Ricardo Martincoski --- utils/checkpackagelib/lib_mk.py | 59 +++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index d340882971..1eb20fc04a 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -366,3 +366,62 @@ class VariableWithBraces(_CheckFunction): return ["{}:{}: use $() to delimit variables, not ${{}}" .format(self.filename, lineno), text] + + +class CPEProduct(_CheckFunction): + """ + Check that the values for the CPE variables are not the default. + However, if there is only one such variable set, the default + is acceptable, because that is used to set whether the CPE info + is valid or not. + """ + def before(self): + pkg, _ = os.path.splitext(os.path.basename(self.filename)) + self.CPE_fields = { + "PREFIX": "cpe:2.3:a", + "VENDOR": f"{pkg}_project", + "PRODUCT": pkg, + "VERSION": None, + "UPDATE": "*", + } + self.VAR_SPLIT_RE = re.compile( + r"^.+_CPE_ID_({})\s*=\s*(.+)$" + .format("|".join(self.CPE_fields)), + ) + self.nb_CPE_fields = 0 + self.CPE_info = dict() + self.VERSION_RE = re.compile( + r"^.*_VERSION\s*=\*(.+)$", + ) + + def check_line(self, lineno, text): + match = self.VERSION_RE.match(text) + if match: + self.CPE_fields["VERSION"] = match.groups()[0] + + match = self.VAR_SPLIT_RE.match(text) + if match: + self.nb_CPE_fields += 1 + CPE_f, CPE_v = match.groups() + self.CPE_info[CPE_f] = { + "lineno": lineno, + "text": text, + "val": CPE_v, + } + + def after(self): + if self.nb_CPE_fields <= 1: + return + defaults = list() + for f in self.CPE_fields: + if f not in self.CPE_info: + continue + lineno = self.CPE_info[f]["lineno"] + text = self.CPE_info[f]["text"] + val = self.CPE_info[f]["val"] + if val == self.CPE_fields[f]: + defaults.append( + f"{self.filename}:{lineno}: {val} is the default value: {text}" + ) + + return defaults or None -- 2.43.0 From baruch at tkos.co.il Sun Feb 4 15:40:14 2024 From: baruch at tkos.co.il (Baruch Siach) Date: Sun, 04 Feb 2024 17:40:14 +0200 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix service runtime In-Reply-To: <871q9sr42s.fsf@48ers.dk> References: <20240117210756.265708-1-ju.o@free.fr> <871q9sr42s.fsf@48ers.dk> Message-ID: <87il345jah.fsf@tarshish> Hi Peter, On Sun, Feb 04 2024, Peter Korsgaard wrote: >>>>>> "Yann" == Yann E MORIN writes: > > > Julien, All, > > On 2024-01-17 22:07 +0100, Julien Olivain spake thusly: > >> Since commit 2a8065e "package/postgresql: bump version to 16.1", the > >> postgresql service fail to start at runtime with an error: > >> > >> FATAL: could not load library > >> "/usr/lib/postgresql/dict_snowball.so": > >> /usr/lib/postgresql/dict_snowball.so: undefined symbol: > >> CurrentMemoryContext > >> > >> This is due to the Posgresql autotool configure script trying to > >> detect whether the toolchain linker needs --export-dynamic or not. > >> This test is done with a runtime execution of a test program, and > >> therefore cannot run in cross-compilation. In that case, the > >> configure script assumes it is not needed. See commit [1], included > >> in PostgreSQL v16.0. > >> > >> This commit fixes the issue by forcing the value in _CONF_ENV. The > >> package has already a Kconfig dependency on !BR2_STATIC_LIBS, so the > >> value can be unconditionally set. > >> > >> [1] > >> https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=9db49fc5bfdc0126be03f4b8986013e59d93b91d > > > I've added references to the ML thread upstream, with their position > > that cross-compiling is not really a supoprted thing. > > >> Signed-off-by: Julien Olivain > > > Applied to master, thanks. > > Committed to 2023.11.x, thanks. Not in 2023.11.x as of commit 7d35d445a1ae ("package/micropython: fix building after dropping GIT_DIR=. workaround"). baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From yann.morin.1998 at free.fr Sun Feb 4 16:09:48 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 17:09:48 +0100 Subject: [Buildroot] [PATCH v4] package/sway: make systemd optional In-Reply-To: <20240203030138.1934339-1-stefan@ott.net> References: <20240203030138.1934339-1-stefan@ott.net> Message-ID: Stefan, All, On 2024-02-03 04:01 +0100, Stefan Ott via buildroot spake thusly: > Sway works perfectly fine without it. Thanks for this new iteration. However, there are a few issues with it yet. First, your commit log is way too short to explain the changes: - why is it OK to drop the swaybar option altogether? - why is there no value set for -Dsd-bus-provider when systemd is not enabled? You provided answers to the second, and you did the first because it was suggested, but the explanations really belong to the commit log. Indeed, when we look at the git tree in the future, we need to have that information available right there, rather than buried and lost in a few threads in the mailing list. Also, even though it may make sense to always enable the waybar with systemd, this is semantically a separate change, and should be done in a separate commit (possibly coming before the one making systemd optional). If that were not possible, then this should be dully motivated in the commit log. So, could you please rework this change, so that: - the first patch makes building waybar non-optional once systemd is enabled; note in the commit log that there is no need for legacy handling (I'll let you dig why! ;-)) - the second patch removes the systemd dependency on sway oitself, and explains why the non-systemd case has no otpion set for -Dsd-bus-provider Thanks! Regards, Yann E. MORIN. > Signed-off-by: Stefan Ott > > --- > Changes v3 -> v4: > - Automatically enable tray support if systemd is enabled (suggested > by Raphael Pavlidis) > Changes v2 -> v3: > - Make BR2_PACKAGE_SWAY_SWAYBAR_TRAY depend on systemd and set > sd-bus-provider=libsystemd if SWAY_SWAYBAR_TRAY is enabled > Changes v1 -> v2: > - Automatically enable systemd integration for builds with systemd > support (suggested by Thomas Petazzoni) > --- > package/sway/Config.in | 15 ++------------- > package/sway/sway.mk | 10 +++++----- > 2 files changed, 7 insertions(+), 18 deletions(-) > > diff --git a/package/sway/Config.in b/package/sway/Config.in > index 4f6d9fb215..d2fcdc6d70 100644 > --- a/package/sway/Config.in > +++ b/package/sway/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_SWAY > bool "sway" > - depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider > depends on !BR2_STATIC_LIBS # wlroots > depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wlroots > depends on BR2_PACKAGE_HAS_LIBEGL # wlroots > @@ -38,15 +37,6 @@ config BR2_PACKAGE_SWAY_SWAYBAR > help > Enable support for swaybar > > -if BR2_PACKAGE_SWAY_SWAYBAR > - > -config BR2_PACKAGE_SWAY_SWAYBAR_TRAY > - bool "swaybar tray" > - help > - Enable support for swaybar tray > - > -endif # BR2_PACKAGE_SWAY_SWAYBAR > - > config BR2_PACKAGE_SWAY_SWAYNAG > bool "swaynag" > help > @@ -54,9 +44,8 @@ config BR2_PACKAGE_SWAY_SWAYNAG > > endif # BR2_PACKAGE_SWAY > > -comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" > - depends on !BR2_PACKAGE_SYSTEMD || \ > - !BR2_PACKAGE_HAS_UDEV || \ > +comment "sway needs udev, EGL w/ Wayland backend and OpenGL ES support" > + depends on !BR2_PACKAGE_HAS_UDEV || \ > !BR2_PACKAGE_HAS_LIBEGL || \ > !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ > !BR2_PACKAGE_HAS_LIBGLES > diff --git a/package/sway/sway.mk b/package/sway/sway.mk > index 0aad9de712..089b533baf 100644 > --- a/package/sway/sway.mk > +++ b/package/sway/sway.mk > @@ -8,13 +8,12 @@ SWAY_VERSION = 1.8.1 > SWAY_SITE = https://github.com/swaywm/sway/releases/download/$(SWAY_VERSION) > SWAY_LICENSE = MIT > SWAY_LICENSE_FILES = LICENSE > -SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango > +SWAY_DEPENDENCIES = host-pkgconf wlroots json-c pcre cairo pango > SWAY_CONF_OPTS = \ > -Dwerror=false \ > -Dzsh-completions=false \ > -Dfish-completions=false \ > - -Dman-pages=disabled \ > - -Dsd-bus-provider=libsystemd > + -Dman-pages=disabled > > ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) > SWAY_CONF_OPTS += -Dxwayland=enabled > @@ -53,8 +52,9 @@ else > SWAY_CONF_OPTS += -Dswaynag=false > endif > > -ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y) > -SWAY_CONF_OPTS += -Dtray=enabled > +ifeq ($(BR2_PACKAGE_SYSTEMD),y) > +SWAY_DEPENDENCIES += systemd > +SWAY_CONF_OPTS += -Dtray=enabled -Dsd-bus-provider=libsystemd > else > SWAY_CONF_OPTS += -Dtray=disabled > endif > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 4 18:14:35 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 19:14:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/opus: set OPUS_CPE_ID_VENDOR Message-ID: <20240204181435.1657162-1-fontaine.fabrice@gmail.com> cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B Signed-off-by: Fabrice Fontaine --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 15531b521a..cbc07a091b 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -8,6 +8,7 @@ OPUS_VERSION = 1.4 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING +OPUS_CPE_ID_VENDOR = opus-codec OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 4 18:25:14 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 19:25:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/yasm: add YASM_CPE_ID_VENDOR Message-ID: <20240204182514.1663508-1-fontaine.fabrice@gmail.com> cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E Signed-off-by: Fabrice Fontaine --- package/yasm/yasm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index b294bd3aee..cdb8e15bee 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 YASM_SITE = http://www.tortall.net/projects/yasm/releases YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 +YASM_CPE_ID_VENDOR = tortall # This sed prevents it compiling 2 programs (vsyasm and ytasm) # that are only of use on Microsoft Windows. -- 2.43.0 From ju.o at free.fr Sun Feb 4 19:19:22 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 4 Feb 2024 20:19:22 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add libcamera runtime test Message-ID: <20240204191922.366955-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + .../testing/tests/package/test_libcamera.py | 79 +++++++++++++++++++ .../test_libcamera/linux-vimc.fragment | 4 + 3 files changed, 85 insertions(+) create mode 100644 support/testing/tests/package/test_libcamera.py create mode 100644 support/testing/tests/package/test_libcamera/linux-vimc.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 02b7516a92..0acf49296d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1783,6 +1783,8 @@ F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_kmscube.py F: support/testing/tests/package/test_kmscube/ F: support/testing/tests/package/test_less.py +F: support/testing/tests/package/test_libcamera.py +F: support/testing/tests/package/test_libcamera/ F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py diff --git a/support/testing/tests/package/test_libcamera.py b/support/testing/tests/package/test_libcamera.py new file mode 100644 index 0000000000..8953021b82 --- /dev/null +++ b/support/testing/tests/package/test_libcamera.py @@ -0,0 +1,79 @@ +import os + +import infra.basetest + + +class TestLibCamera(infra.basetest.BRTest): + # A specific configuration is needed for testing libcamera: + # a kernel config fragment enables v4l2 vimc driver. + # The libevent package is also enabled to have the libcamera "cam" + # test application. + kernel_fragment = \ + infra.filepath("tests/package/test_libcamera/linux-vimc.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.76" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_LIBCAMERA=y + BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC=y + BR2_PACKAGE_LIBEVENT=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # The Kernel config of this test has only one v4l2 vimc + # driver. The camera index is expected to be #1. + cam_idx = 1 + + # We test libcamera with its simple "cam" application, by + # requesting a list of available cameras. + cmd = "cam --list" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + # libcamera generates info messages. We filter only the + # line(s) starting with our camera index. + cam_line = [ln for ln in out if ln.startswith(f"{cam_idx}:")] + # We should have the vimc camera in this line. + self.assertIn("platform/vimc.0", cam_line[0]) + + # List the camera information. + cmd = f"cam --camera {cam_idx} --info" + self.assertRunOk(cmd) + + # List the camera controls and check we have a brightness + # control. + cmd = f"cam --camera {cam_idx} --list-controls" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn("Control: Brightness:", "\n".join(out)) + + # List the camera properties and check we have a camera + # "Model" property. + cmd = f"cam --camera {cam_idx} --list-properties" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn("Property: Model = ", "\n".join(out)) + + # Capture few frames. + cmd = f"cam --camera {cam_idx} --capture=5" + cmd += " --stream width=160,height=120,role=video,pixelformat=RGB888" + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_libcamera/linux-vimc.fragment b/support/testing/tests/package/test_libcamera/linux-vimc.fragment new file mode 100644 index 0000000000..04436e7518 --- /dev/null +++ b/support/testing/tests/package/test_libcamera/linux-vimc.fragment @@ -0,0 +1,4 @@ +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_TEST_SUPPORT=y +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIMC=y -- 2.43.0 From aleksandr.o.makarov at gmail.com Sun Feb 4 20:16:56 2024 From: aleksandr.o.makarov at gmail.com (Aleksandr Makarov) Date: Sun, 4 Feb 2024 22:16:56 +0200 Subject: [Buildroot] [PATCH v2] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further Message-ID: <20240204201657.33079-1-aleksandr.o.makarov@gmail.com> This is a re-spin of v1 that was modifying haproxy's Makefile and was rejected by upstream [1]. I made a v2 that makes changes to haproxy.mk recipe instead and dropped the .patch to program source. [1] https://www.mail-archive.com/haproxy at formilux.org/msg44499.html Aleksandr Makarov (1): package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.39.2 From aleksandr.o.makarov at gmail.com Sun Feb 4 20:16:57 2024 From: aleksandr.o.makarov at gmail.com (Aleksandr Makarov) Date: Sun, 4 Feb 2024 22:16:57 +0200 Subject: [Buildroot] [PATCH v2] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' In-Reply-To: <20240204201657.33079-1-aleksandr.o.makarov@gmail.com> References: <20240204201657.33079-1-aleksandr.o.makarov@gmail.com> Message-ID: <20240204201657.33079-2-aleksandr.o.makarov@gmail.com> Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS which were internally set by the haproxy Makefile. Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and and then running the program results in runtime error: $ haproxy FATAL ERROR: invalid code detected -- cannot go further, please recompile! ... To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead of CFLAGS in haproxy.mk. --- Changes v1 -> v2 - Drop patch for haproxy program Makefile, make changes to haproxy.mk instead --- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 63a92090f3..61a9ebebe4 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -82,7 +82,7 @@ endif define HAPROXY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) endef define HAPROXY_INSTALL_TARGET_CMDS -- 2.39.2 From fido_max at inbox.ru Sun Feb 4 20:51:02 2024 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Sun, 4 Feb 2024 23:51:02 +0300 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix service runtime In-Reply-To: <871q9sr42s.fsf@48ers.dk> References: <20240117210756.265708-1-ju.o@free.fr> <871q9sr42s.fsf@48ers.dk> Message-ID: On 04.02.2024 12:06, Peter Korsgaard wrote: >>>>>> "Yann" == Yann E MORIN writes: > > > Julien, All, > > On 2024-01-17 22:07 +0100, Julien Olivain spake thusly: > >> Since commit 2a8065e "package/postgresql: bump version to 16.1", the > >> postgresql service fail to start at runtime with an error: > >> > >> FATAL: could not load library > >> "/usr/lib/postgresql/dict_snowball.so": > >> /usr/lib/postgresql/dict_snowball.so: undefined symbol: > >> CurrentMemoryContext > >> > >> This is due to the Posgresql autotool configure script trying to > >> detect whether the toolchain linker needs --export-dynamic or not. > >> This test is done with a runtime execution of a test program, and > >> therefore cannot run in cross-compilation. In that case, the > >> configure script assumes it is not needed. See commit [1], included > >> in PostgreSQL v16.0. > >> > >> This commit fixes the issue by forcing the value in _CONF_ENV. The > >> package has already a Kconfig dependency on !BR2_STATIC_LIBS, so the > >> value can be unconditionally set. > >> > >> [1] > >> https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=9db49fc5bfdc0126be03f4b8986013e59d93b91d > > > I've added references to the ML thread upstream, with their position > > that cross-compiling is not really a supoprted thing. > > >> Signed-off-by: Julien Olivain > > > Applied to master, thanks. > > Committed to 2023.11.x, thanks. > Not needed for 2023.11. Because it is still on 15.5 Posgresql version From peter at korsgaard.com Sun Feb 4 20:59:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 21:59:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix service runtime In-Reply-To: <87il345jah.fsf@tarshish> (Baruch Siach's message of "Sun, 04 Feb 2024 17:40:14 +0200") References: <20240117210756.265708-1-ju.o@free.fr> <871q9sr42s.fsf@48ers.dk> <87il345jah.fsf@tarshish> Message-ID: <87o7cwoshu.fsf@48ers.dk> >>>>> "Baruch" == Baruch Siach writes: > Hi Peter, > On Sun, Feb 04 2024, Peter Korsgaard wrote: >> > Applied to master, thanks. >> >> Committed to 2023.11.x, thanks. > Not in 2023.11.x as of commit 7d35d445a1ae ("package/micropython: fix > building after dropping GIT_DIR=. workaround"). Ehh, I made a mistake - 2023.11.x doesn't have postgresql 16.x, so this is not backported. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:11:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:11:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/micropython: libffi is optional, not mandatory In-Reply-To: <20240116183629.365115-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 16 Jan 2024 19:36:29 +0100") References: <20240116183629.365115-1-fontaine.fabrice@gmail.com> Message-ID: <87jznkoryk.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libffi is optional, not mandatory since bump to version 1.22.0 in commit > 1e12b7dd49d1c64a5195f226e9e4da21e84f5d0c and > https://github.com/micropython/micropython/commit/89b320737652829edbab921e86d7ad3962d86d9e > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sun Feb 4 21:13:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:13:19 +0100 Subject: [Buildroot] [git commit] package/yasm: add YASM_CPE_ID_VENDOR Message-ID: <20240204211424.08D4E8690E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17dac57e3ebfe8e2371100a632cca4fb11ed9bac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/yasm/yasm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index b294bd3aee..cdb8e15bee 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 YASM_SITE = http://www.tortall.net/projects/yasm/releases YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 +YASM_CPE_ID_VENDOR = tortall # This sed prevents it compiling 2 programs (vsyasm and ytasm) # that are only of use on Microsoft Windows. From yann.morin.1998 at free.fr Sun Feb 4 21:13:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:13:06 +0100 Subject: [Buildroot] [git commit] package/opus: set OPUS_CPE_ID_VENDOR Message-ID: <20240204211423.EFE028690D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=302175353a920402d27d4f7cf23dd78c5a792428 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 15531b521a..cbc07a091b 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -8,6 +8,7 @@ OPUS_VERSION = 1.4 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING +OPUS_CPE_ID_VENDOR = opus-codec OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) From peter at korsgaard.com Sun Feb 4 21:10:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:10:52 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/micropython: libffi is optional, not mandatory Message-ID: <20240204211636.9F76A86918@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4fa5ebff17d899c3c0ef349b4eeb5af7b2aeb81 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x libffi is optional, not mandatory since bump to version 1.22.0 in commit 1e12b7dd49d1c64a5195f226e9e4da21e84f5d0c and https://github.com/micropython/micropython/commit/89b320737652829edbab921e86d7ad3962d86d9e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2c1cac10d8935f66260b8beeea776d3d49633ca4) Signed-off-by: Peter Korsgaard --- package/micropython/Config.in | 1 - package/micropython/micropython.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index b5dc47279d..30161c8b70 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_MICROPYTHON bool "micropython" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI help Micro Python is a lean and fast implementation of the Python 3 programming language that is optimised to run on a diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 41bd32099b..37c148da94 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -12,7 +12,7 @@ MICROPYTHON_SOURCE = micropython-$(MICROPYTHON_VERSION).tar.xz # and most of the copied code is not used in the unix build. MICROPYTHON_LICENSE = MIT, BSD-1-Clause, BSD-3-Clause, Zlib MICROPYTHON_LICENSE_FILES = LICENSE -MICROPYTHON_DEPENDENCIES = host-pkgconf libffi host-python3 +MICROPYTHON_DEPENDENCIES = host-python3 MICROPYTHON_CPE_ID_VENDOR = micropython # Use fallback implementation for exception handling on architectures that don't @@ -36,6 +36,13 @@ MICROPYTHON_MAKE_OPTS += \ LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ CWARN= +ifeq ($(BR2_PACKAGE_LIBFFI),y) +MICROPYTHON_DEPENDENCIES += host-pkgconf libffi +MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=1 +else +MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 +endif + define MICROPYTHON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ From peter at korsgaard.com Sun Feb 4 21:10:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:10:41 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/micropython: libffi is optional, not mandatory Message-ID: <20240204211746.809C88691B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42a271c32e4584c5b73561315825b5416cdf1819 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x libffi is optional, not mandatory since bump to version 1.22.0 in commit 1e12b7dd49d1c64a5195f226e9e4da21e84f5d0c and https://github.com/micropython/micropython/commit/89b320737652829edbab921e86d7ad3962d86d9e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2c1cac10d8935f66260b8beeea776d3d49633ca4) Signed-off-by: Peter Korsgaard --- package/micropython/Config.in | 1 - package/micropython/micropython.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index b5dc47279d..30161c8b70 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_MICROPYTHON bool "micropython" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI help Micro Python is a lean and fast implementation of the Python 3 programming language that is optimised to run on a diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 41bd32099b..37c148da94 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -12,7 +12,7 @@ MICROPYTHON_SOURCE = micropython-$(MICROPYTHON_VERSION).tar.xz # and most of the copied code is not used in the unix build. MICROPYTHON_LICENSE = MIT, BSD-1-Clause, BSD-3-Clause, Zlib MICROPYTHON_LICENSE_FILES = LICENSE -MICROPYTHON_DEPENDENCIES = host-pkgconf libffi host-python3 +MICROPYTHON_DEPENDENCIES = host-python3 MICROPYTHON_CPE_ID_VENDOR = micropython # Use fallback implementation for exception handling on architectures that don't @@ -36,6 +36,13 @@ MICROPYTHON_MAKE_OPTS += \ LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ CWARN= +ifeq ($(BR2_PACKAGE_LIBFFI),y) +MICROPYTHON_DEPENDENCIES += host-pkgconf libffi +MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=1 +else +MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 +endif + define MICROPYTHON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ From yann.morin.1998 at free.fr Sun Feb 4 21:18:50 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:18:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/opus: set OPUS_CPE_ID_VENDOR In-Reply-To: <20240204181435.1657162-1-fontaine.fabrice@gmail.com> References: <20240204181435.1657162-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-04 19:14 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/opus/opus.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/opus/opus.mk b/package/opus/opus.mk > index 15531b521a..cbc07a091b 100644 > --- a/package/opus/opus.mk > +++ b/package/opus/opus.mk > @@ -8,6 +8,7 @@ OPUS_VERSION = 1.4 > OPUS_SITE = https://downloads.xiph.org/releases/opus > OPUS_LICENSE = BSD-3-Clause > OPUS_LICENSE_FILES = COPYING > +OPUS_CPE_ID_VENDOR = opus-codec > OPUS_INSTALL_STAGING = YES > > OPUS_CFLAGS = $(TARGET_CFLAGS) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Sun Feb 4 21:16:02 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 4 Feb 2024 22:16:02 +0100 Subject: [Buildroot] [git commit] support/testing: TestPythonPy3SciPy: increase rootfs size to 250M Message-ID: <20240204211909.AEE6186924@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=393f5494187072533a1c69b82a26cf1f6d203a26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The rootfs generated TestPythonPy3SciPy by doesn't fit anymore in 120M. Increase the rootfs size to 250M and checking the amount of space available on the file system. Filesystem Size Used Available Use% Mounted on /dev/root 232.3M 134.5M 85.3M 61% / Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5880448601 Signed-off-by: Romain Naour Reviewed-by: Antoine Coutant Signed-off-by: Romain Naour --- support/testing/tests/package/test_python_scipy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_python_scipy.py b/support/testing/tests/package/test_python_scipy.py index 06297763c3..fb51f25d79 100644 --- a/support/testing/tests/package/test_python_scipy.py +++ b/support/testing/tests/package/test_python_scipy.py @@ -10,7 +10,7 @@ class TestPythonPy3SciPy(TestPythonPackageBase): BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_SCIPY=y BR2_TARGET_ROOTFS_EXT2=y - BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + BR2_TARGET_ROOTFS_EXT2_SIZE="250M" # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_scipy.py"] From yann.morin.1998 at free.fr Sun Feb 4 21:19:09 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:19:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/yasm: add YASM_CPE_ID_VENDOR In-Reply-To: <20240204182514.1663508-1-fontaine.fabrice@gmail.com> References: <20240204182514.1663508-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-04 19:25 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E > > Signed-off-by: Fabrice Fontaine Regards, Yann E. MORIN. > --- > package/yasm/yasm.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk > index b294bd3aee..cdb8e15bee 100644 > --- a/package/yasm/yasm.mk > +++ b/package/yasm/yasm.mk > @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 > YASM_SITE = http://www.tortall.net/projects/yasm/releases > YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 > YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 > +YASM_CPE_ID_VENDOR = tortall > > # This sed prevents it compiling 2 programs (vsyasm and ytasm) > # that are only of use on Microsoft Windows. > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Feb 4 21:21:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:21:05 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/criu: disable on aarch64_be In-Reply-To: <20240114123845.810225-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 14 Jan 2024 13:38:45 +0100") References: <20240114123845.810225-1-fontaine.fabrice@gmail.com> Message-ID: <87il34vsce.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > armv8a aarch64_be raises the following build failure since the addition > of the package in commit 3e4b479f39c15ffdf307ec8395d856680c727204: > Error (compel/arch/aarch64/src/lib/handle-elf-host.c:30): Unsupported Elf format detected > Fixes: > - http://autobuild.buildroot.org/results/8eaa881a926d138a0bfd3f1076246088994e883f > - http://autobuild.buildroot.org/results/8de9b4d6b26e06f6b4457a31366bdc0d8a8c34ae > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Fix condition to only exclude aarch64_be, not armeb Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:23:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:23:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv4-contrib: fix INSTALL_TARGET value In-Reply-To: <20240123140211.105695-1-maximilian.senftleben@frogblue-tec.com> (Maximilian Senftleben's message of "Tue, 23 Jan 2024 15:02:11 +0100") References: <20240123140211.105695-1-maximilian.senftleben@frogblue-tec.com> Message-ID: <87eddrx6sa.fsf@48ers.dk> >>>>> "Maximilian" == Maximilian Senftleben writes: > The variable should be a YES/NO value, FALSE is not a valid value. > E.g. the yesno-to-bool cmd does not translate a FALSE value and > therefore returns invalid JSON. > Signed-off-by: Maximilian Senftleben Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:25:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:25:13 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/vulkan-loader: fix x11 handling In-Reply-To: (Yann E. MORIN's message of "Tue, 23 Jan 2024 17:04:44 +0100") References: <20230921164809.102741-1-fontaine.fabrice@gmail.com> Message-ID: <87a5ofx6py.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Fabrice, All, > On 2023-09-21 18:48 +0200, Fabrice Fontaine spake thusly: >> Fix the following build failure raised since the addition of the package >> in commit 6aa1bc31678ff9f8013084fda34b9f941cc63fc3: >> >> In file included from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.h:24, >> from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.c:23: >> /home/buildroot/autobuild/run/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/vulkan/vulkan.h:71:10: fatal error: X11/extensions/Xrandr.h: No such file or directory >> 71 | #include >> | ^~~~~~~~~~~~~~~~~~~~~~~~~ >> >> Fixes: >> - http://autobuild.buildroot.org/results/55ddfd44393e3bcc2f25bad2f9ecb7e1b142a985 >> >> Signed-off-by: Fabrice Fontaine > Applied to master, thanks. > Your commits always contain the description of the failure (which is > mildly interesting), but often lacks the actual reason for the change. > In this case, it would have been interesting to state that xcb and xlib > support are orthogonal, but that for xlib, xrandr is also required, as > Adam noticed in his commit log [0]. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:18:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:18:58 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/criu: disable on aarch64_be Message-ID: <20240204212555.938AC86931@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44faf672f3005b41b18318dce25a131177462936 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x armv8a aarch64_be raises the following build failure since the addition of the package in commit 3e4b479f39c15ffdf307ec8395d856680c727204: Error (compel/arch/aarch64/src/lib/handle-elf-host.c:30): Unsupported Elf format detected Fixes: - http://autobuild.buildroot.org/results/8eaa881a926d138a0bfd3f1076246088994e883f - http://autobuild.buildroot.org/results/8de9b4d6b26e06f6b4457a31366bdc0d8a8c34ae Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 3825cc8a38d8cb5cf1d27557b890db099e81b39c) Signed-off-by: Peter Korsgaard --- package/criu/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/criu/Config.in b/package/criu/Config.in index 4c295acf4f..a5adc0cedd 100644 --- a/package/criu/Config.in +++ b/package/criu/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CRIU_ARCH_SUPPORTS default y if BR2_ARM_CPU_ARMV6 default y if BR2_ARM_CPU_ARMV7A default y if BR2_ARM_CPU_ARMV7M - default y if BR2_ARM_CPU_ARMV8A + default y if BR2_ARM_CPU_ARMV8A && !BR2_aarch64_be default y if BR2_aarch64 default y if BR2_x86_64 default y if BR2_powerpc64le # Only support powerpc64 with LE From peter at korsgaard.com Sun Feb 4 21:23:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:23:19 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/opencv4-contrib: fix INSTALL_TARGET value Message-ID: <20240204212555.9C27086932@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93a4ad81741b3b2ce2ae31fa5120ca83510cfcb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The variable should be a YES/NO value, FALSE is not a valid value. E.g. the yesno-to-bool cmd does not translate a FALSE value and therefore returns invalid JSON. Signed-off-by: Maximilian Senftleben Signed-off-by: Yann E. MORIN (cherry picked from commit 9fa01e309781faec1395507405a128deb8f55c56) Signed-off-by: Peter Korsgaard --- package/opencv4-contrib/opencv4-contrib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk index 52d2682b26..f8c8cfd94c 100644 --- a/package/opencv4-contrib/opencv4-contrib.mk +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -6,7 +6,7 @@ OPENCV4_CONTRIB_VERSION = 4.8.1 OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) -OPENCV4_CONTRIB_INSTALL_TARGET = FALSE +OPENCV4_CONTRIB_INSTALL_TARGET = NO OPENCV4_CONTRIB_LICENSE = Apache-2.0 OPENCV4_CONTRIB_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 4 21:24:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:24:32 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/vulkan-loader: fix x11 handling Message-ID: <20240204212555.A5FF686934@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eefe041de30eacce5c0b6e0dcf977b4594819d19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix the following build failure raised since the addition of the package in commit 6aa1bc31678ff9f8013084fda34b9f941cc63fc3: In file included from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.h:24, from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.c:23: /home/buildroot/autobuild/run/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/vulkan/vulkan.h:71:10: fatal error: X11/extensions/Xrandr.h: No such file or directory 71 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/55ddfd44393e3bcc2f25bad2f9ecb7e1b142a985 Signed-off-by: Fabrice Fontaine Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit 3b8b1125adcdb3563a8392e802f0fb5266142e93) Signed-off-by: Peter Korsgaard --- package/vulkan-loader/vulkan-loader.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk index f6dd9d0ac3..b1545a4972 100644 --- a/package/vulkan-loader/vulkan-loader.mk +++ b/package/vulkan-loader/vulkan-loader.mk @@ -26,13 +26,16 @@ endif ifeq ($(BR2_PACKAGE_LIBXCB),y) VULKAN_LOADER_DEPENDENCIES += libxcb -VULKAN_LOADER_CONF_OPTS += \ - -DBUILD_WSI_XCB_SUPPORT=ON \ - -DBUILD_WSI_XLIB_SUPPORT=ON +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON else -VULKAN_LOADER_CONF_OPTS += \ - -DBUILD_WSI_XCB_SUPPORT=OFF \ - -DBUILD_WSI_XLIB_SUPPORT=OFF +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) +VULKAN_LOADER_DEPENDENCIES += xlib_libX11 xlib_libXrandr +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XLIB_SUPPORT=ON +else +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XLIB_SUPPORT=OFF endif ifeq ($(BR2_PACKAGE_WAYLAND),y) From peter at korsgaard.com Sun Feb 4 21:23:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:23:35 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/opencv4-contrib: fix INSTALL_TARGET value Message-ID: <20240204212703.9BDC18693A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=892d471112cc8eef69fcd62653fbe51c775ee390 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The variable should be a YES/NO value, FALSE is not a valid value. E.g. the yesno-to-bool cmd does not translate a FALSE value and therefore returns invalid JSON. Signed-off-by: Maximilian Senftleben Signed-off-by: Yann E. MORIN (cherry picked from commit 9fa01e309781faec1395507405a128deb8f55c56) Signed-off-by: Peter Korsgaard --- package/opencv4-contrib/opencv4-contrib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk index 52d2682b26..f8c8cfd94c 100644 --- a/package/opencv4-contrib/opencv4-contrib.mk +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -6,7 +6,7 @@ OPENCV4_CONTRIB_VERSION = 4.8.1 OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) -OPENCV4_CONTRIB_INSTALL_TARGET = FALSE +OPENCV4_CONTRIB_INSTALL_TARGET = NO OPENCV4_CONTRIB_LICENSE = Apache-2.0 OPENCV4_CONTRIB_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 4 21:32:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:32:29 +0100 Subject: [Buildroot] [PATCH 1/3] package/flutter-pi: remove libgles requirement for gstreamer audio plugin In-Reply-To: <20240123190035.904936-2-adam.duskett@amarulasolutions.com> (Adam Duskett's message of "Tue, 23 Jan 2024 12:00:33 -0700") References: <20240123190035.904936-1-adam.duskett@amarulasolutions.com> <20240123190035.904936-2-adam.duskett@amarulasolutions.com> Message-ID: <875xz3x6du.fsf@48ers.dk> >>>>> "Adam" == Adam Duskett writes: > package/flutter-pi: remove libgles requirement for gstreamer audio plugin > I erroneously added the dependency BR2_PACKAGE_HAS_LIBGLES for the gstreamer > audio player plugin, and the CMakeLists.txt file does not check for gles2 when > the plugin is selected. This error was likely due to a copy/paste mistake. > Remove the requirement. > Signed-off-by: Adam Duskett Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:32:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:32:39 +0100 Subject: [Buildroot] [PATCH 2/3] package/flutter-pi: Fix help text for gstreamer audio player In-Reply-To: <20240123190035.904936-3-adam.duskett@amarulasolutions.com> (Adam Duskett's message of "Tue, 23 Jan 2024 12:00:34 -0700") References: <20240123190035.904936-1-adam.duskett@amarulasolutions.com> <20240123190035.904936-3-adam.duskett@amarulasolutions.com> Message-ID: <871q9rx6dk.fsf@48ers.dk> >>>>> "Adam" == Adam Duskett writes: > The help text is currently copy and pasted from the gstreamer video > player plugin help text. Change it to reflect the text from the > CMakeLists.txt file. > Signed-off-by: Adam Duskett Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sun Feb 4 21:35:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:35:06 +0100 Subject: [Buildroot] [git commit] package/axel: fix openssl build Message-ID: <20240204213721.E67AD86940@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d26991f76b0f6b57282c71a045e5f5fecb8f0374 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace --with-ssl by --with-ssl=openssl to avoid the following build failure raised since bump to version 2.17.12 in commit 50ba0b0a40187b695740a2fce2d2f3ed7cbf58c5 and https://github.com/axel-download-accelerator/axel/commit/21ccacd0c3bb415c550d590cd64aaa9bf08997a8: configure: error: Invalid argument: --with-ssl=yes While at it, also add wolfssl support available since https://github.com/axel-download-accelerator/axel/commit/0759374239acaeac4105f4851cfabc28433f3bcd Fixes: - http://autobuild.buildroot.org/results/a8c00442bc296353c75e393896abe9883b093a57 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/axel/axel.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/axel/axel.mk b/package/axel/axel.mk index b3896e86e3..d3a2f4d42c 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -19,8 +19,11 @@ AXEL_CONF_OPTS = \ CFLAGS="$(TARGET_CFLAGS)" ifeq ($(BR2_PACKAGE_OPENSSL),y) -AXEL_CONF_OPTS += --with-ssl +AXEL_CONF_OPTS += --with-ssl=openssl AXEL_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) +AXEL_CONF_OPTS += --with-ssl=wolfssl +AXEL_DEPENDENCIES += wolfssl else AXEL_CONF_OPTS += --without-ssl endif From yann.morin.1998 at free.fr Sun Feb 4 21:37:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:37:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/axel: fix openssl build In-Reply-To: <20240130222138.136539-1-fontaine.fabrice@gmail.com> References: <20240130222138.136539-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-01-30 23:21 +0100, Fabrice Fontaine spake thusly: > Replace --with-ssl by --with-ssl=openssl to avoid the following build > failure raised since bump to version 2.17.12 in commit > 50ba0b0a40187b695740a2fce2d2f3ed7cbf58c5 and > https://github.com/axel-download-accelerator/axel/commit/21ccacd0c3bb415c550d590cd64aaa9bf08997a8: > > configure: error: Invalid argument: --with-ssl=yes > > While at it, also add wolfssl support available since > https://github.com/axel-download-accelerator/axel/commit/0759374239acaeac4105f4851cfabc28433f3bcd > > Fixes: > - http://autobuild.buildroot.org/results/a8c00442bc296353c75e393896abe9883b093a57 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/axel/axel.mk | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/axel/axel.mk b/package/axel/axel.mk > index b3896e86e3..d3a2f4d42c 100644 > --- a/package/axel/axel.mk > +++ b/package/axel/axel.mk > @@ -19,8 +19,11 @@ AXEL_CONF_OPTS = \ > CFLAGS="$(TARGET_CFLAGS)" > > ifeq ($(BR2_PACKAGE_OPENSSL),y) > -AXEL_CONF_OPTS += --with-ssl > +AXEL_CONF_OPTS += --with-ssl=openssl > AXEL_DEPENDENCIES += openssl > +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) > +AXEL_CONF_OPTS += --with-ssl=wolfssl > +AXEL_DEPENDENCIES += wolfssl > else > AXEL_CONF_OPTS += --without-ssl > endif > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Feb 4 21:40:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:40:54 +0100 Subject: [Buildroot] [PATCH] package/uuu: fix build failure with host gcc 13.x In-Reply-To: (Yann E. MORIN's message of "Tue, 23 Jan 2024 22:28:03 +0100") References: <20240122223037.889955-1-giulio.benetti@benettiengineering.com> Message-ID: <87wmrjvrfd.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Giulio, All, > On 2024-01-22 23:30 +0100, Giulio Benetti spake thusly: >> From: Giulio Benetti >> >> With gcc version >= 13.x stdint.h must be explicitly included according to >> [0] so add local patch to explicitly include stdint.h. > When I read "local patch", it is not immediately obvious that this is a > backport, or that the patch has been upstreamd, and I am wary of such > situations. > But here, this is an actual backport, so a better phrasing would have > been "so backport a commit that...", which I have done when applying. >> [0]: https://gcc.gnu.org/gcc-13/porting_to.html >> >> Fixes: >> still not happened >> >> Signed-off-by: Giulio Benetti >> Signed-off-by: Giulio Benetti > Applied to master, thanks. Committed to 2023.02.x (where it does apply), thanks. -- Bye, Peter Korsgaard From ju.o at free.fr Sun Feb 4 22:19:15 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 4 Feb 2024 23:19:15 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: new jq runtime test Message-ID: <20240204221915.460639-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + support/testing/tests/package/test_jq.py | 62 +++++++++++++++++++ .../test_jq/rootfs-overlay/root/broken.json | 1 + .../test_jq/rootfs-overlay/root/ex13-1.json | 14 +++++ .../test_jq/rootfs-overlay/root/ex13-2.json | 22 +++++++ .../test_jq/rootfs-overlay/root/ex13-3.json | 1 + .../test_jq/rootfs-overlay/root/ex13-4.json | 1 + .../test_jq/rootfs-overlay/root/ex13-5.json | 1 + 8 files changed, 104 insertions(+) create mode 100644 support/testing/tests/package/test_jq.py create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json diff --git a/DEVELOPERS b/DEVELOPERS index 02b7516a92..91d2c6d869 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1778,6 +1778,8 @@ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_jq.py +F: support/testing/tests/package/test_jq/ F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_kmscube.py diff --git a/support/testing/tests/package/test_jq.py b/support/testing/tests/package/test_jq.py new file mode 100644 index 0000000000..67420abb6b --- /dev/null +++ b/support/testing/tests/package/test_jq.py @@ -0,0 +1,62 @@ +import json +import os + +import infra.basetest + + +class TestJq(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_jq/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_JQ=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("jq --version") + + # Run jq on examples extracted from JSON RFC: + # https://www.rfc-editor.org/rfc/rfc8259.txt + for i in range(1, 6): + fname = f"ex13-{i}.json" + cmd = f"jq -M '.' {fname}" + self.assertRunOk(cmd) + + # Check the execution fails on a non JSON file. + cmd = "jq -M '.' broken.json" + _, ret = self.emulator.run(cmd) + self.assertNotEqual(ret, 0) + + # Check an execution of a simple query. Note that output is a + # JSON (quoted) string. + cmd = "jq -M '.[1].City' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], '"SUNNYVALE"') + + # Run the same query with the -r option, to output raw text + # (i.e. strings without quotes). + cmd = "jq -r -M '.[1].City' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], "SUNNYVALE") + + # Print the ex13-2.json file as compact JSON (with option -c). + cmd = "jq -c -M '.' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + # We reload this compact string using the Python json parser, + # to test interoperability. We check the same element as in + # previous queries in the Python object. + json_data = json.loads(out[0]) + self.assertEqual(json_data[1]["City"], "SUNNYVALE") diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json new file mode 100644 index 0000000000..fc2bf94565 --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json @@ -0,0 +1 @@ +[ This is is NOT a JSON file! } diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json new file mode 100644 index 0000000000..52b7b6493f --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json @@ -0,0 +1,14 @@ +{ + "Image": { + "Width": 800, + "Height": 600, + "Title": "View from 15th Floor", + "Thumbnail": { + "Url": "http://www.example.com/image/481989943", + "Height": 125, + "Width": 100 + }, + "Animated" : false, + "IDs": [116, 943, 234, 38793] + } +} diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json new file mode 100644 index 0000000000..b4545b28c8 --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json @@ -0,0 +1,22 @@ +[ + { + "precision": "zip", + "Latitude": 37.7668, + "Longitude": -122.3959, + "Address": "", + "City": "SAN FRANCISCO", + "State": "CA", + "Zip": "94107", + "Country": "US" + }, + { + "precision": "zip", + "Latitude": 37.371991, + "Longitude": -122.026020, + "Address": "", + "City": "SUNNYVALE", + "State": "CA", + "Zip": "94085", + "Country": "US" + } +] diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json new file mode 100644 index 0000000000..6ccebb9abe --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json @@ -0,0 +1 @@ +"Hello world!" diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json @@ -0,0 +1 @@ +42 diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json new file mode 100644 index 0000000000..27ba77ddaf --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json @@ -0,0 +1 @@ +true -- 2.43.0 From peter at korsgaard.com Sun Feb 4 22:33:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 23:33:09 +0100 Subject: [Buildroot] [git commit] package/gnutls: security bump to 3.8.3 In-Reply-To: <20240125212237.46E4C864CC@busybox.osuosl.org> (Peter Korsgaard's message of "Thu, 25 Jan 2024 22:13:07 +0100") References: <20240125212237.46E4C864CC@busybox.osuosl.org> Message-ID: <87sf27vp0a.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=b136bed2fd703548610e2ac3e0d54b33128db716 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > see CVE-2024-0553: Fix more timing side-channel inside RSA-PSK key exchange > see CVE-2024-0567: Fix assertion failure when verifying a certificate > chain with a cycle of cross signatures > Signed-off-by: Francois Perrad > Signed-off-by: Peter Korsgaard Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:51:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:51:52 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gnutls: bump version to 3.8.1 Message-ID: <20240204223330.B0CD68695C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fc43a34d4159a788c9f693dd5293e56c4e66ce7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 05f4c2fd102c0ca0a4e5947ce55e0a09660b6282) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 2f6dba9d3c..a6ba6b22c6 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz.sig -sha256 0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 gnutls-3.8.0.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.1.tar.xz.sig +sha256 ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c gnutls-3.8.1.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index d6b8b229bd..d9b9831fd6 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).0 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).1 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Sun Feb 4 21:52:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:52:09 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gnutls: security bump to 3.8.3 Message-ID: <20240204223330.D86C586935@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=95cbe9cc60c460291fbe6a3a680816c75bb6f35f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x see CVE-2024-0553: Fix more timing side-channel inside RSA-PSK key exchange see CVE-2024-0567: Fix assertion failure when verifying a certificate chain with a cycle of cross signatures Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit b136bed2fd703548610e2ac3e0d54b33128db716) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 6ad363f01d..47fb34ea7c 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.2.tar.xz.sig -sha256 e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 gnutls-3.8.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.3.tar.xz.sig +sha256 f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e gnutls-3.8.3.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 3e9987cdce..8a4f3345aa 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Sun Feb 4 21:35:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:35:35 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/uuu: fix build failure with host gcc 13.x Message-ID: <20240204223330.8E9D18695A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c423dd4a45b4a9d2b4d8c9a186fcdb1961ddf5cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x With gcc version >= 13.x stdint.h must be explicitly included according to [0] so backport a commit to explicitly include stdint.h. [0]: https://gcc.gnu.org/gcc-13/porting_to.html Fixes: still not happened Signed-off-by: Giulio Benetti Signed-off-by: Giulio Benetti Reviewed-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit 04dfeff6242516a1061973fc7af2cc9c5e3dd4e2) Signed-off-by: Peter Korsgaard --- package/uuu/0001-Fix-missing-references.patch | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/package/uuu/0001-Fix-missing-references.patch b/package/uuu/0001-Fix-missing-references.patch new file mode 100644 index 0000000000..140c9755c7 --- /dev/null +++ b/package/uuu/0001-Fix-missing-references.patch @@ -0,0 +1,40 @@ +From 24fd043225903247f71ac10666d820277c0b10b1 Mon Sep 17 00:00:00 2001 +From: nixgnauhcuy +Date: Tue, 9 May 2023 14:32:33 +0800 +Subject: [PATCH] Fix missing references + +Upstream: https://github.com/nxp-imx/mfgtools/commit/24fd043225903247f71ac10666d820277c0b10b1 + +Signed-off-by: Giulio Benetti +--- + libuuu/libcomm.h | 1 + + uuu/buildincmd.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libuuu/libcomm.h b/libuuu/libcomm.h +index 0afdfa3..38d622d 100644 +--- a/libuuu/libcomm.h ++++ b/libuuu/libcomm.h +@@ -28,6 +28,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + * + */ ++#include + #include + #include + #include +diff --git a/uuu/buildincmd.h b/uuu/buildincmd.h +index 9415117..46286cc 100644 +--- a/uuu/buildincmd.h ++++ b/uuu/buildincmd.h +@@ -31,6 +31,7 @@ + + #pragma once + ++#include + #include + #include + #include +-- +2.34.1 + From peter at korsgaard.com Sun Feb 4 21:51:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:51:45 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gnutls: bump version to 3.8.0 Message-ID: <20240204223330.A15C78695B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79dc02abeeae25fcfd8d85c612bb51261e845277 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Updated license hashes due to upstream commit: "Sync GPL/LGPL license files from Gnulib" https://github.com/gnutls/gnutls/commit/a39e528897184c6f6a33d245b82891a8dc8090ce Removed configure options related to guile which were removed upstream: https://github.com/gnutls/gnutls/commit/100cc2a706b8e097cbeb63d08c7ea59717c906ca Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 4528d5093c9a0002be6787024a342979666ce9af) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 8 ++++---- package/gnutls/gnutls.mk | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 303f1351e0..2f6dba9d3c 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.8.tar.xz.sig -sha256 c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114 gnutls-3.7.8.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz.sig +sha256 0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 gnutls-3.8.0.tar.xz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 6e2cc501ef..d6b8b229bd 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,8 +5,8 @@ ################################################################################ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS -GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 +GNUTLS_VERSION_MAJOR = 3.8 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).0 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) @@ -16,7 +16,6 @@ GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 libunistring nettle GNUTLS_CPE_ID_VENDOR = gnu GNUTLS_CONF_OPTS = \ --disable-doc \ - --disable-guile \ --disable-libdane \ --disable-rpath \ --disable-tests \ @@ -44,7 +43,6 @@ GNUTLS_INSTALL_STAGING = YES HOST_GNUTLS_DEPENDENCIES = host-pkgconf host-libtasn1 host-libunistring host-nettle HOST_GNUTLS_CONF_OPTS = \ --disable-doc \ - --disable-guile \ --disable-libdane \ --disable-rpath \ --disable-tests \ From peter at korsgaard.com Sun Feb 4 21:52:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:52:01 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gnutls: bump version to 3.8.2 Message-ID: <20240204223330.C60368695A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ab50b7e5914a6d9825b461aeb04201aa85d18fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a91ad89fe3e4a28ca5ae2ce6e9bada243aa55456) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index a6ba6b22c6..6ad363f01d 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.1.tar.xz.sig -sha256 ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c gnutls-3.8.1.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.2.tar.xz.sig +sha256 e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 gnutls-3.8.2.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index d9b9831fd6..3e9987cdce 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).1 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Sun Feb 4 21:32:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:32:00 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-pi: Fix help text for gstreamer audio player Message-ID: <20240204223444.2BDE68696E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84d9bf5b1863fe5fbd0f9303fe12fed46185fed6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The help text is currently copy and pasted from the gstreamer video player plugin help text. Change it to reflect the text from the CMakeLists.txt file. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit 7437cad0183fbdc0c419547a0cf2cbe006e23814) Signed-off-by: Peter Korsgaard --- package/flutter-pi/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/flutter-pi/Config.in b/package/flutter-pi/Config.in index 72db3f400f..26ce75fa30 100644 --- a/package/flutter-pi/Config.in +++ b/package/flutter-pi/Config.in @@ -32,9 +32,8 @@ config BR2_PACKAGE_FLUTTER_PI_GSTREAMER_AUDIO_PLAYER_PLUGIN select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME help - Include the gstreamer based video plugins in the finished - binary. Allows for more stable, hardware accelerated - video playback in flutter using gstreamer. + Include the gstreamer based audio plugins in the finished + binary. config BR2_PACKAGE_FLUTTER_PI_GSTREAMER_VIDEO_PLAYER_PLUGIN bool "gstreamer video player" From peter at korsgaard.com Sun Feb 4 21:41:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:41:52 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gnutls: security bump to 3.8.3 Message-ID: <20240204223444.352CA8696F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=278aa1eb4265992d1134152928ec1658a7c46544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x see CVE-2024-0553: Fix more timing side-channel inside RSA-PSK key exchange see CVE-2024-0567: Fix assertion failure when verifying a certificate chain with a cycle of cross signatures Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit b136bed2fd703548610e2ac3e0d54b33128db716) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 6ad363f01d..47fb34ea7c 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.2.tar.xz.sig -sha256 e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 gnutls-3.8.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.3.tar.xz.sig +sha256 f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e gnutls-3.8.3.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 3e9987cdce..8a4f3345aa 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Sun Feb 4 21:31:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:31:45 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-pi: remove libgles requirement for gstreamer audio plugin Message-ID: <20240204223444.1FAA78696D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a23af23dff20d858af4e8bc27588127b80e302a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 99a50a8c9804 (package/flutter-pi: new package) erroneously made the gstreamer-based audio plugin depend on GLES, although there is no such requirement defined in the CMakeLists. This error was likely due to a copy/paste mistake. Remove the requirement. Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: reword commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 07c1329814baea1057355525394d51c290acc4c3) Signed-off-by: Peter Korsgaard --- package/flutter-pi/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/flutter-pi/Config.in b/package/flutter-pi/Config.in index ecebfad89b..72db3f400f 100644 --- a/package/flutter-pi/Config.in +++ b/package/flutter-pi/Config.in @@ -25,7 +25,6 @@ comment "plugins" config BR2_PACKAGE_FLUTTER_PI_GSTREAMER_AUDIO_PLAYER_PLUGIN bool "gstreamer audio player" - depends on BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA From petr.vorel at gmail.com Mon Feb 5 00:03:37 2024 From: petr.vorel at gmail.com (Petr Vorel) Date: Mon, 5 Feb 2024 01:03:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: drop NFS_UTILS_AUTORECONF In-Reply-To: <20240204102056.1409453-1-fontaine.fabrice@gmail.com> References: <20240204102056.1409453-1-fontaine.fabrice@gmail.com> Message-ID: <20240205000337.GA166229@pevik> > Commit 63332c33aa0771532807fd2684d4eee4eb952435 wrongly set > NFS_UTILS_AUTORECONF Hi Fabrice, thanks! (too late to review - merged). Kind regards, Petr From jubalh at iodoru.org Mon Feb 5 06:53:35 2024 From: jubalh at iodoru.org (Michael Vetter) Date: Mon, 5 Feb 2024 07:53:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.13.0 Message-ID: <20240205065335.22493-1-jubalh@iodoru.org> Signed-off-by: Michael Vetter --- package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index a6a529eb6c..e284e8cca6 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d82e9e8585b8fc68fb91791377fbfb0051b98259a0ec64cf31c8a09bb7e2621e libstrophe-0.12.3.tar.xz +sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index ad0860ad30..257593bbec 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.12.3 +LIBSTROPHE_VERSION = 0.13.0 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf -- 2.35.3 From thomas.petazzoni at bootlin.com Mon Feb 5 06:48:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 05 Feb 2024 06:48:49 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-04 Message-ID: <20240205064857.3C30560D7B@smtp3.osuosl.org> Hello, Autobuild statistics for 2024-02-04 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 2 | 2 | 0 | 4 | 2023.11.x | 0 | 2 | 0 | 2 | master | 48 | 51 | 0 | 99 | Classification of failures by reason for master ----------------------------------------------- axel-2.17.12 | 7 host-sentry-cli-2.20.3 | 3 libressl-3.8.2 | 3 linux-6.6.15 | 3 sudo-1.9.15p5 | 3 attr-2.5.2 | 2 dc3dd-7.2.641 | 2 elfutils-0.189 | 2 libopenssl-3.2.0 | 2 libselinux-3.5 | 2 unknown | 2 bat-0.24.0 | 1 botan-3.2.0 | 1 brltty-6.6 | 1 cegui-00b4e1fe174da53b7ed72... | 1 check-11970a7e112dfe243a2e6... | 1 dmraid-1.0.0.rc16-3 | 1 dvdauthor-0.7.2 | 1 glibc-2.38-44-gd37c2b20a478... | 1 gobject-introspection-1.76.1 | 1 host-rust-1.74.1 | 1 htop-3.3.0 | 1 ipmitool-1_8_19 | 1 libzenoh-pico-0.10.1-rc | 1 ngrep-1.47 | 1 proj-9.3.0 | 1 python-numpy-1.25.0 | 1 python-rpds-py-0.12.0 | 1 strongswan-5.9.13 | 1 stunnel-5.71 | 1 volk-3.0.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/e4913b74465f4af9329d47a17698f1af8a691b15 | microblaze | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/901c0ef0c7497a83c169b080fe371c27e945f99c | sparc64 | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/78793c01d540b6401db19cb69d9fd6e9c41598fa | sh4aeb | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/dca4a16e2ac78548e8cfb9b810b7c55eacd72be4 | powerpc64le | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/0ede68b4552556fb0be3bd0d7b75c49539ccaeac | microblazeel | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/95d3229021caef736468785ab1baa8fc52df4b62 | mips | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/368d7756a91a867bc02f53b027f1082f96f22ac9 | sparc64 | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/5306d879299cbeb01aa545a62547ac215a7e4213 | or1k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/7168028ff383583e54884082ae2a870ecd077886 | armeb | bat-0.24.0 | NOK | http://autobuild.buildroot.net/results/0c377de66fa3de86ddcffdfd6a3191cef621a13a | sh4eb | botan-3.2.0 | NOK | http://autobuild.buildroot.net/results/3b3a1503a370e470910587dd8f3600228b146584 | ORPH microblazeel | brltty-6.6 | NOK | http://autobuild.buildroot.net/results/fa1a04790b8e9190b50eb6497a526b97c67c32d8 | nios2 | cegui-00b4e1fe174da53b7ed72... | NOK | http://autobuild.buildroot.net/results/d14a1dd87cf72ba0652264b65cb60bf3e569510f | arceb | check-11970a7e112dfe243a2e6... | NOK | http://autobuild.buildroot.net/results/9eef526088b1caae92b99f97fdd318dff7d89e5d | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/6261af2bb60de4bb36795e481e28250573727012 | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/186dd70d61c71e524d6f3c7d9302d3637b36448c | ORPH mips64el | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/573a1171bcec2e11f28592dd1a6805aec287b8c3 | ORPH or1k | dvdauthor-0.7.2 | NOK | http://autobuild.buildroot.net/results/ed5ab6dc804414d8bdfc63da70ce56dee10bf6a1 | microblazeel | elfutils-0.189 | NOK | http://autobuild.buildroot.net/results/e47d32863976576abe21b25d4ffa8459aef15613 | ORPH sh4 | elfutils-0.189 | NOK | http://autobuild.buildroot.net/results/fbfe131673ed78999a07dbc879436e0ef6a8a1c0 | ORPH powerpc64le | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/e869ac8bf8f8c9779688318fbc18915380fb69d7 | i686 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/c94ac8bd95429eae7c71b6dddbc7cf2c88748fcb | ORPH armeb | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/85a50ff377f952987abadf3dd43ce2b1bcdcb16e | i686 | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/fdbd0910e4227deafd273e40475b80f3151eac06 | x86_64 | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/6f908a52ce468e50cf12320ac38c783b775f566c | x86_64 | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/2988e5fc91fc0c4863fe27c099cce9ddc4f863ec | mipsel | htop-3.3.0 | NOK | http://autobuild.buildroot.net/results/04bd5633750ff5cef048ea78c9de043d3ffcfa32 | ORPH aarch64_be | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/694c8fbc3cc92031c1e9b04c85672e51b46ad6c6 | s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/1ca1f88441122eb68462e3f21bb2df4dc2c9d47e | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/d23fcf436c67828cdfde00deaaec3ef5607562dd | ORPH sh4 | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/97dd0ea04087caf649ad0c9b78889dfe589b343e | ORPH arceb | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/f992037ebce5219b2890c936f6ce83c3bb2fe87e | ORPH arc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/e3a137cf81fac2884e0ea4db813846370cdbd451 | ORPH microblazeel | libselinux-3.5 | NOK | http://autobuild.buildroot.net/results/55dd7fdd8539444c0feb5f63f072a92f658d04ad | m68k | libselinux-3.5 | NOK | http://autobuild.buildroot.net/results/7bcc8379e4c1eed9140756147e9ccf3e8393b8d9 | or1k | libzenoh-pico-0.10.1-rc | NOK | http://autobuild.buildroot.net/results/f6628dd3ea15ed27d97880a5b0d58d521d445d50 | arm | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/4122870d414370488bd5462d46ee532d57ffbcb6 | ORPH sparc | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/3e1c64e106d1a220fc5896e0f5d97de7803734be | ORPH aarch64_be | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/22c1aefb0dc00764f12ac5faa6b47c9abbc619e9 | ORPH s390x | ngrep-1.47 | NOK | http://autobuild.buildroot.net/results/c63c89a13712b53b8ef4ed8de7fd1f09820a6ac9 | aarch64_be | proj-9.3.0 | NOK | http://autobuild.buildroot.net/results/2caed684e6ac39f6dee759c6e30964c1534dc8a5 | sh4 | python-numpy-1.25.0 | NOK | http://autobuild.buildroot.net/results/af87fe8708fc259b0c6c93f76764ab3ac3a4c32a | powerpc | python-rpds-py-0.12.0 | NOK | http://autobuild.buildroot.net/results/fe214f18e13a8b423424153247922501572d4846 | riscv32 | strongswan-5.9.13 | NOK | http://autobuild.buildroot.net/results/423b498a87dfa60fff52ce3a9a79d84ac5340009 | mips | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/cdbf43b5e315839c4e90e00bfe5a8ca05c6f1f57 | m68k | sudo-1.9.15p5 | NOK | http://autobuild.buildroot.net/results/2995184777debf8a3e2001bc49e4ac312cc252b2 | ORPH microblazeel | sudo-1.9.15p5 | NOK | http://autobuild.buildroot.net/results/51842c12f3dacf7342d4ada6745042524c88531f | ORPH armeb | sudo-1.9.15p5 | NOK | http://autobuild.buildroot.net/results/7a3f4e279bc7defc44561f1a36416f50378663cc | ORPH aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/241a60f8ecb6fec5dc122d64dd438dd4249f8c3e | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/29b15a88020c41a2c0555b6e4550cfe531821400 | powerpc | volk-3.0.0 | NOK | http://autobuild.buildroot.net/results/92aa8324545dec018d7ca1df3380f32e5706e318 | Classification of failures by reason for 2023.02.x -------------------------------------------------- proj-8.1.1 | 1 unknown | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arceb | proj-8.1.1 | NOK | http://autobuild.buildroot.net/results/8fd46fcc197353abfd7e624131855a4e169fbfc6 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/993e87ad54195899b2707fedfdf872190ecd37b8 | Classification of failures by reason for 2023.11.x -------------------------------------------------- dmraid-1.0.0.rc16-3 | 1 linux-6.6.11 | 1 Detail of failures for 2023.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64_be | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/54d0a6c15850938a1df57cb077953c7f42a787ac | ORPH powerpc | linux-6.6.11 | NOK | http://autobuild.buildroot.net/results/a89ada3b69652a311fb389bf2e388170ee4ef72f | ORPH Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.1.1 | 7.1.3 | ORPH acl | DISTRO | https://release-monitoring.org/project/00016 | 2.3.1 | 2.3.2 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 45.0 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.6.0 | 4.6.1 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2022.1 | 2024.0 | ORPH alsa-lib | DISTRO | https://release-monitoring.org/project/00038 | 1.2.10 | 1.2.11 | alsa-utils | DISTRO | https://release-monitoring.org/project/00037 | 1.2.10 | 1.2.11 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 14.0.0_r21 | angularjs | DISTRO | https://release-monitoring.org/project/21321 | 1.8.2 | 1.8.3 | apitrace | DISTRO | https://release-monitoring.org/project/06170 | 10.0 | 11.1 | apparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.1.2 | 3.1.6 | apr | DISTRO | https://release-monitoring.org/project/00095 | 1.7.2 | 1.7.4 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 12.6.7 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 20.5.2 | 21.1.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.50.0 | 2.51.0 | atkmm | DISTRO | https://release-monitoring.org/project/07962 | 2.36.2 | 2.36.3 | atop | DISTRO | https://release-monitoring.org/project/00135 | 2.9.0 | 2.10.0 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.1.2 | 4.0 | autoconf | DISTRO | https://release-monitoring.org/project/00141 | 2.71 | 2.72 | ORPH avocado | DISTRO | https://release-monitoring.org/project/13385 | 98.0 | 103.0 | ORPH azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_01_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.13.1 | ORPH babeltrace2 | DISTRO | https://release-monitoring.org/project/07137 | 2.0.4 | 2.0.5 | balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 20.10.26 | 20.10.42 | bash | DISTRO | https://release-monitoring.org/project/00166 | 5.2.15 | 5.2.21 | ORPH batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2024.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2023.1 | 2024.0 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.8.2 | 1.10.0 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.3.15 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.2.4 | 8.2.6 | belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.3.15 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.3.15 | bento4 | DISTRO | https://release-monitoring.org/project/241638 | 1.6.0-639... | 1.6.0-641 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.8 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.40 | 2.42 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.12 | 2.14 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 26.0 | bluez5_utils | DISTRO | https://release-monitoring.org/project/10029 | 5.68 | 5.72 | bluez5_utils-headers | DISTRO | https://release-monitoring.org/project/10029 | 5.68 | 5.72 | bmap-tools | DISTRO | https://release-monitoring.org/project/77099 | 3.6 | 3.7 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH boost | DISTRO | https://release-monitoring.org/project/06845 | 1.83.0 | 1.84.0 | bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.3.2 | bpftool | DISTRO | https://release-monitoring.org/project/328454 | v7.1.0 | 7.3.0 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.16.2 | 6.7 | ORPH c-ares | DISTRO | https://release-monitoring.org/project/05840 | 1.20.1 | 1.26.0 | ORPH c-icap | DISTRO | https://release-monitoring.org/project/21325 | 0.5.10 | 0.6.2 | ORPH c-icap-modules | DISTRO | https://release-monitoring.org/project/21326 | 0.5.5 | 0.5.7 | ORPH ca-certificates | DISTRO | https://release-monitoring.org/project/09026 | 20230311 | 20240203 | cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.18.0 | cairomm | DISTRO | https://release-monitoring.org/project/07959 | 1.16.2 | 1.18.0 | cairomm1_14 | DISTRO | https://release-monitoring.org/project/369459 | 1.14.4 | 1.14.5 | cannelloni | DISTRO | https://release-monitoring.org/project/21403 | 1.0.0 | 1.1.0 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH capnproto | DISTRO | https://release-monitoring.org/project/11515 | 0.10.4 | 1.0.2 | ccache | DISTRO | https://release-monitoring.org/project/00257 | 4.8.2 | 4.9 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.5.2 | 1.5.5 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 3.9.1 | 4.4.1 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.5 | 20200710 | chrony | DISTRO | https://release-monitoring.org/project/08810 | 4.4 | 4.5 | ORPH cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.15 | 7.0 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.18.0 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 1.0.4 | 1.2.1 | clang | DISTRO | https://release-monitoring.org/project/11811 | 15.0.3 | 17.0.6 | clinfo | DISTRO | https://release-monitoring.org/project/10503 | 3.0.21.02.21 | 3.0.23.01.25 | cloop | DISTRO | https://release-monitoring.org/project/21332 | 3.14.1.3 | 3.14.1.3+... | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.28.1 | 3.28.2 | cni-plugins | DISTRO | https://release-monitoring.org/project/96794 | 1.3.0 | 1.4.0 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.2 | 4.3.8 | compiler-rt | DISTRO | https://release-monitoring.org/project/17705 | 15.0.3 | 17.0.6 | composer | DISTRO | https://release-monitoring.org/project/09710 | 2.5.8 | 2.6.6 | conmon | DISTRO | https://release-monitoring.org/project/96793 | 2.1.8 | 2.1.10 | conntrack-tools | DISTRO | https://release-monitoring.org/project/00338 | 1.4.7 | 1.4.8 | ORPH containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.7.8 | 1.7.13 | coreutils | DISTRO | https://release-monitoring.org/project/00343 | 9.3 | 9.4 | ORPH cpio | DISTRO | https://release-monitoring.org/project/00353 | 2.14 | 2.15 | crudini | DISTRO | https://release-monitoring.org/project/21669 | 0.9.3 | 0.9.5 | crun | DISTRO | https://release-monitoring.org/project/96792 | 1.12 | 1.14 | cryptsetup | DISTRO | https://release-monitoring.org/project/13709 | 2.6.1 | 2.7.0 | cukinia | DISTRO | https://release-monitoring.org/project/138119 | 0.6.0 | 0.6.2 | ORPH cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.17 | 2.0.0 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 4.0.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 2006-10-MR2 | dado | DISTRO | https://release-monitoring.org/project/58442 | 1.8.3-1 | 2.1.0-1 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.9 | 3.0.14 | dash | DISTRO | https://release-monitoring.org/project/00394 | 0.5.11.5 | 0.5.12 | ORPH datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.13.4 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.3.6 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.2.2 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.4.1 | dbus-broker | DISTRO | https://release-monitoring.org/project/271475 | 33 | 35 | dbus-cxx | DISTRO | https://release-monitoring.org/project/242464 | 2.4.0 | 2.5.1 | dbus-python | DISTRO | https://release-monitoring.org/project/00402 | 1.2.18 | 1.3.2 | ORPH dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.3.1 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.27 | 1.28 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.16 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.20.2 | 1.22.0 | desktop-file-utils | DISTRO | https://release-monitoring.org/project/00421 | 0.26 | 0.27 | ORPH dhcpcd | DISTRO | https://release-monitoring.org/project/11429 | 10.0.5 | 10.0.6 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20220117 | 1.3-20230209 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 24.0.7 | 25.0.2 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 2.23.0 | 2.24.5 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 24.0.7 | 25.0.2 | domoticz | DISTRO | https://release-monitoring.org/project/21342 | 2024.1 | 2024.4 | dos2unix | DISTRO | https://release-monitoring.org/project/00453 | 7.5.0 | 7.5.2 | double-conversion | DISTRO | https://release-monitoring.org/project/07454 | 3.2.1 | 3.3.0 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.21.4 | 9.27.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH dt-utils | DISTRO | https://release-monitoring.org/project/21419 | 2023.08.0 | 2023.11.0 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.19 | 1.20 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202311 | efivar | DISTRO | https://release-monitoring.org/project/00664 | 38 | 39 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.3 | 1.27.0 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 23.04 | 23.10 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.189 | 0.190 | ORPH enchant | DISTRO | https://release-monitoring.org/project/06601 | 2.3.3 | 2.6.6 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.4 | 0.26.0 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 26.0.2 | 26.2.1 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.11.5 | 1.11.6 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.11 | 0.8.0 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.49 | 1.0.51 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.2.7 | 1.2.11 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.16 | 1.1.18 | erlang-p1-xml | DISTRO | https://release-monitoring.org/project/10464 | 1.1.49 | 1.1.51 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.6.2 | 1.8.0 | erofs-utils | DISTRO | https://release-monitoring.org/project/63188 | 1.5 | 1.7.1 | ethtool | DISTRO | https://release-monitoring.org/project/00763 | 6.6 | 6.7 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.9.0.1 | 2.9.4.0 | exempi | DISTRO | https://release-monitoring.org/project/00767 | 2.6.3 | 2.6.5 | exiv2 | DISTRO | https://release-monitoring.org/project/00769 | 0.27.6 | 0.28.1 | eza | DISTRO | https://release-monitoring.org/project/369474 | 0.16.0 | 0.18.0 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.32.1 | 1.33 | ORPH fcft | DISTRO | https://release-monitoring.org/project/143240 | 3.1.6 | 3.1.7 | fdk-aac | DISTRO | https://release-monitoring.org/project/16208 | 2.0.2 | 2.0.3 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.10.2 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.37 | 6.4.38 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.4 | 6.1.1 | fio | DISTRO | https://release-monitoring.org/project/00806 | 3.34 | 3.36 | firewalld | DISTRO | https://release-monitoring.org/project/09989 | 2.0.2 | 2.1.1 | ORPH flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.24.2 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.6 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.9 | ORPH fluent-bit | DISTRO | https://release-monitoring.org/project/267335 | 2.1.7 | 2.2.2 | fmc | GUESS | https://release-monitoring.org/project/145761 | LSDK-21.08 | 0.2.0 | ORPH font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 6.5.1 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.14.2 | 2.15.0 | ORPH freeipmi | DISTRO | https://release-monitoring.org/project/00848 | 1.6.11 | 1.6.14 | freerdp | DISTRO | https://release-monitoring.org/project/10442 | 2.11.5 | 3.2.0 | frr | DISTRO | https://release-monitoring.org/project/18555 | 8.5.4 | 9.1 | fscryptctl | DISTRO | https://release-monitoring.org/project/270981 | 1.0.0 | 1.1.0 | fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.11 | 1.13 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 23.07.00 | 24.01.00 | fwup | DISTRO | https://release-monitoring.org/project/21438 | 1.9.1 | 1.10.1 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 4.2.0 | ORPH gdal | DISTRO | https://release-monitoring.org/project/00881 | 3.8.2 | 3.8.3 | gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.5.5 | 2.8.3 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.12.1 | 2.0.0 | ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 10.02.0 | 10.02.1 | gitlab-runner | DISTRO | https://release-monitoring.org/project/11337 | 15.5.0 | 16.8.0 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.76.0 | 2.78.0 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.76.0 | 2.78.1 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.8 | 1.0.0 | ORPH gnu-efi | DISTRO | https://release-monitoring.org/project/01202 | 3.0.15 | 3.0.17 | gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.4.3 | 2.4.4 | gnuplot | DISTRO | https://release-monitoring.org/project/01216 | 5.4.10 | 6.0.0 | gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.10.7.0 | 3.10.9.2 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.76.1 | 1.79.1 | ORPH gocryptfs | DISTRO | https://release-monitoring.org/project/21085 | 2.3.2 | 2.4.0 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.15.9 | 2.17.3 | gr-osmosdr | DISTRO | https://release-monitoring.org/project/21447 | 0.2.4 | 0.2.5 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.2.0 | 7.4.0 | ORPH grantlee | DISTRO | https://release-monitoring.org/project/21448 | 5.2.0 | 5.3.1 | graphicsmagick | DISTRO | https://release-monitoring.org/project/01248 | 1.3.40 | 1.3.42 | grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.51.1 | 1.61.0 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.2.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.10.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.53.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.6.15 | 2.9.4 | hiawatha | DISTRO | https://release-monitoring.org/project/13375 | 11.2 | 11.5 | hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.23.12 | ORPH hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.373 | 0.378 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.9.3 | 2.10.0 | i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.43.0 | 2.50.2 | icu | DISTRO | https://release-monitoring.org/project/16134 | 73-2 | 74-2 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.14 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.1-21 | 7.1.1-27 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.12.2 | inih | DISTRO | https://release-monitoring.org/project/11600 | 57 | 58 | ORPH inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 4.23.9.0 | ORPH iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.493 | 3.506 | iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.14 | 3.16 | ORPH ipset | DISTRO | https://release-monitoring.org/project/01393 | 7.16 | 7.20 | iptables | DISTRO | https://release-monitoring.org/project/01394 | 1.8.9 | 1.8.10 | ORPH iputils | DISTRO | https://release-monitoring.org/project/01395 | 20231222 | 20240117 | irssi | DISTRO | https://release-monitoring.org/project/01404 | 1.4.4 | 1.4.5 | iw | DISTRO | https://release-monitoring.org/project/01410 | 5.19 | 6.7 | ORPH iwd | DISTRO | https://release-monitoring.org/project/18380 | 2.6 | 2.13 | ORPH janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 1.1.2 | 1.2.1 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 4.1.2 | jbig2dec | DISTRO | https://release-monitoring.org/project/01431 | 0.19 | 0.20 | jimtcl | DISTRO | https://release-monitoring.org/project/01459 | 0.81 | 0.82 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.6 | 1.9 | jose | DISTRO | https://release-monitoring.org/project/11761 | 11 | 12 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.5 | 3.0.2 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.13.1 | 1.13.2 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.2 | jquery-validation | DISTRO | https://release-monitoring.org/project/21817 | 1.19.5 | 1.20.0 | ORPH kbd | DISTRO | https://release-monitoring.org/project/01492 | 2.5.1 | 2.6.4 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.114.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.114.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.114.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.114.0 | kodi | DISTRO | https://release-monitoring.org/project/05511 | 20.3-Nexus | 20.3 | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 20.3.15-N... | 21.4.2-Omega | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 20.5.0-Nexus | 21.3.2-Omega | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 20.3.0-Nexus | 21.1.0-Omega | kodi-jsonschemabuilder | DISTRO | https://release-monitoring.org/project/05511 | 20.3-Nexus | 20.3 | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 20.1.15-N... | 21.1.11-O... | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 20.1.3-Nexus | 21.0.0-Omega | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 20.5.0-Nexus | 21.0.0-Omega | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 20.3.0-Nexus | 21.1.0-Omega | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 20.4.0-Nexus | 21.1.0-Omega | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 20.3.0-Nexus | 21.0.0-Omega | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 20.4.0-Nexus | 21.0.0-Omega | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 20.7.0-Nexus | 21.2.0-Omega | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 20.13.0-N... | 21.7.2-Omega | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 20.3.0-Nexus | 21.0.0-Omega | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 20.5.10-N... | 21.0.4-Omega | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 20.4.3-Nexus | 21.0.2-Omega | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 20.3.0-Nexus | 21.0.0-Omega | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 20.4.0-Nexus | 21.0.0-Omega | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 20.3.1a-N... | 21.0.1-Omega | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 20.3.1-Nexus | 21.0.0-Omega | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 20.4.2-Nexus | 21.1.2-Omega | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 20.4.1-Nexus | 21.1.0-Omega | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 20.5.1-Nexus | 21.1.1-Omega | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 20.11.0-N... | 21.5.0-Omega | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 20.3.0-Nexus | 21.0.0-Omega | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 20.3.14-N... | 21.0.1-Omega | kodi-texturepacker | DISTRO | https://release-monitoring.org/project/05511 | 20.3-Nexus | 20.3 | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 2.2.0 | 2.3.0 | kvm-unit-tests | DISTRO | https://release-monitoring.org/project/242797 | 2023-01-05 | 2024-01-08 | lapack | DISTRO | https://release-monitoring.org/project/01534 | 3.10.1 | 3.12.0 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.4 | 0.3.95 | leptonica | DISTRO | https://release-monitoring.org/project/01549 | 1.83.1 | 1.84.1 | libabseil-cpp | DISTRO | https://release-monitoring.org/project/115295 | 20230802.1 | 20240116.0 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libapparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.1.2 | 3.1.6 | libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 3.0.4 | 3.1.0 | libbpf | DISTRO | https://release-monitoring.org/project/141355 | 1.1.0 | 1.3.0 | libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.7 | 0.11.8 | libbytesize | DISTRO | https://release-monitoring.org/project/07869 | 2.7 | 2.10 | ORPH libcamera-apps | DISTRO | https://release-monitoring.org/project/328456 | 1.2.1 | 1.4.2 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 2.0.3 | 3.1.0 | libcpprestsdk | DISTRO | https://release-monitoring.org/project/15531 | 2.10.18 | 2.10.19 | ORPH libcurl | DISTRO | https://release-monitoring.org/project/00381 | 8.5.0 | 8.6.0 | libdecor | DISTRO | https://release-monitoring.org/project/312806 | 0.1.1 | 0.2.2 | libdnet | DISTRO | https://release-monitoring.org/project/06308 | 1.16.4 | 1.17.0 | ORPH libedit | DISTRO | https://release-monitoring.org/project/01599 | 20221030-3.1 | 20230828-3.1 | libevdev | DISTRO | https://release-monitoring.org/project/20540 | 1.12.1 | 1.13.1 | libfastjson | DISTRO | https://release-monitoring.org/project/12043 | 0.99.9.1 | 1.2304.0 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.40.0 | ORPH libglfw | DISTRO | https://release-monitoring.org/project/01180 | 3.3.8 | 3.3.9 | libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.76.1 | 2.79.1 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.4.0 | 1.7.0 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.22.0 | 1.23.2 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.31 | ORPH libgpiod | DISTRO | https://release-monitoring.org/project/20640 | 1.6.4 | 2.1 | ORPH libgsasl | DISTRO | https://release-monitoring.org/project/01563 | 1.10.0 | 2.2.1 | ORPH libgudev | DISTRO | https://release-monitoring.org/project/07735 | 237 | 238 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.41 | 2.42 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.17 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.17 | ORPH libidn | DISTRO | https://release-monitoring.org/project/01639 | 1.41 | 1.42 | libidn2 | DISTRO | https://release-monitoring.org/project/05597 | 2.3.4 | 2.3.7 | libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.3.0 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.23.0 | 1.25.0 | libjpeg | DISTRO | https://release-monitoring.org/project/21362 | 9e | 9f | libjwt | DISTRO | https://release-monitoring.org/project/242868 | 1.15.3 | 1.16.0 | libjxl | DISTRO | https://release-monitoring.org/project/232764 | 0.9.0 | 0.9.1 | libks | DISTRO | https://release-monitoring.org/project/241898 | 2.0.2 | 2.0.3 | liblinear | DISTRO | https://release-monitoring.org/project/21363 | 2.45 | 2.47 | libmaxminddb | DISTRO | https://release-monitoring.org/project/07470 | 1.8.0 | 1.9.1 | libmbim | DISTRO | https://release-monitoring.org/project/07308 | 1.28.2 | 1.30.0 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.12.8 | 0.12.9 | libmicrohttpd | DISTRO | https://release-monitoring.org/project/01658 | 0.9.77 | 1.0.0 | libmodsecurity | DISTRO | https://release-monitoring.org/project/68638 | 3.0.11 | 3.0.12 | libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.11 | libnetconf2 | DISTRO | https://release-monitoring.org/project/31639 | 2.1.28 | 3.0.8 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.2.2 | 6.1.0 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.16 | libopenh264 | DISTRO | https://release-monitoring.org/project/21365 | 2.4.0 | 2.4.1 | libopenssl | DISTRO | https://release-monitoring.org/project/02566 | 3.2.0 | 3.2.1 | ORPH libostree | DISTRO | https://release-monitoring.org/project/10899 | 2023.8 | 2024.1 | libpciaccess | DISTRO | https://release-monitoring.org/project/01703 | 0.17 | 0.18 | libpeas | DISTRO | https://release-monitoring.org/project/06871 | 1.32.0 | 2.0.1 | ORPH libpng | DISTRO | https://release-monitoring.org/project/01705 | 1.6.40 | 1.6.42 | libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 7.7.5 | 7.8.1 | libpri | DISTRO | https://release-monitoring.org/project/11042 | 1.6.0 | 1.6.1 | libqmi | DISTRO | https://release-monitoring.org/project/07307 | 1.32.2 | 1.34.0 | libqrtr-glib | DISTRO | https://release-monitoring.org/project/192056 | 1.0.0 | 1.2.2 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.9 | 2.57.90 | libsecret | DISTRO | https://release-monitoring.org/project/13150 | 0.20.5 | 0.21.3 | ORPH libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.5 | 3.6 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.5 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.5 | 20200710 | libsigc | DISTRO | https://release-monitoring.org/project/07961 | 3.4.0 | 3.6.0 | libsigc2 | DISTRO | https://release-monitoring.org/project/311642 | 2.12.0 | 2.12.1 | libsodium | DISTRO | https://release-monitoring.org/project/01728 | 1.0.18 | 1.0.19 | libsolv | DISTRO | https://release-monitoring.org/project/07908 | 0.7.25 | 0.7.28 | libspdm | DISTRO | https://release-monitoring.org/project/369161 | 3.1.1 | 3.2.0 | libstrophe | DISTRO | https://release-monitoring.org/project/15633 | 0.12.3 | 0.13.0 | libtalloc | DISTRO | https://release-monitoring.org/project/01733 | 2.3.4 | 2.4.2 | libtirpc | DISTRO | https://release-monitoring.org/project/01740 | 1.3.3 | 1.3.4 | libtool | DISTRO | https://release-monitoring.org/project/01741 | 2.4.6 | 2.4.7 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.9 | libucl | DISTRO | https://release-monitoring.org/project/21371 | 0.8.2 | 0.9.0 | libunwind | DISTRO | https://release-monitoring.org/project/01748 | 1.6.2 | 1.8.0 | ORPH libupnpp | DISTRO | https://release-monitoring.org/project/15849 | 0.21.0 | 0.26.2 | ORPH libusb | DISTRO | https://release-monitoring.org/project/01749 | 1.0.26 | 1.0.27 | libuv | DISTRO | https://release-monitoring.org/project/10784 | 1.46.0 | 1.47.0 | libv4l | DISTRO | https://release-monitoring.org/project/09998 | 1.24.1 | 1.26.1 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.15.1 | libvirt | DISTRO | https://release-monitoring.org/project/13830 | 7.10.0 | 10.0.0 | libvpl | DISTRO | https://release-monitoring.org/project/242664 | 2.10.1 | 2023.4.0 | libvpx | DISTRO | https://release-monitoring.org/project/11083 | 1.13.1 | 1.14.0 | libwebsockets | DISTRO | https://release-monitoring.org/project/11181 | 4.3.2 | 4.3.3 | libxcb | DISTRO | https://release-monitoring.org/project/01767 | 1.15 | 1.16 | ORPH libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.4.0 | 1.6.0 | libxml-parser-perl | DISTRO | https://release-monitoring.org/project/03531 | 2.46 | 2.47 | libxml2 | DISTRO | https://release-monitoring.org/project/01783 | 2.12.3 | 2.12.5 | libxmlpp | DISTRO | https://release-monitoring.org/project/11129 | 5.0.2 | 5.2.0 | ORPH libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3176 | 1.59.02 | libyang | DISTRO | https://release-monitoring.org/project/18554 | 2.1.111 | 2.1.148 | libzlib | DISTRO | https://release-monitoring.org/project/05303 | 1.3 | 1.3.1 | ORPH lilv | DISTRO | https://release-monitoring.org/project/01818 | 0.24.12 | 0.24.24 | links | DISTRO | https://release-monitoring.org/project/01822 | 2.26 | 2.29 | ORPH linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.2.1 | ORPH linux-pam | DISTRO | https://release-monitoring.org/project/12244 | 1.5.3 | 1.6.0 | ORPH live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2023.11.30 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 15.0.3 | 17.0.6 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.17 | 1.0.18 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 15.0.3 | 17.0.6 | log4cplus | DISTRO | https://release-monitoring.org/project/01835 | 2.1.0 | 2.1.1 | ORPH log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.13.0 | 1.2.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20230929 | 20240129 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.11 | lttng-libust | DISTRO | https://release-monitoring.org/project/07135 | 2.13.1 | 2.13.7 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.13.10 | 2.13.11 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.8 | 2.13.11 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.6 | lua-iconv | DISTRO | https://release-monitoring.org/project/11668 | 7-1 | 7.1.0 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.17.1 | luarocks | DISTRO | https://release-monitoring.org/project/01856 | 3.9.1 | 3.9.2 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.43.0-0 | 1.47.0-0 | ORPH lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.23 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzip | DISTRO | https://release-monitoring.org/project/01866 | 1.23 | 1.24 | ORPH lzma-alone | DISTRO | https://release-monitoring.org/project/242840 | 9.22 | 2301 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.11.6 | 11.3.1 | ORPH mawk | DISTRO | https://release-monitoring.org/project/01953 | 1.3.4-202... | 1.3.4-202... | mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.7 | 3.5.2 | mbuffer | DISTRO | https://release-monitoring.org/project/15518 | 20220418 | 20240107 | mc | DISTRO | https://release-monitoring.org/project/01954 | 4.8.30 | 4.8.31 | mcelog | DISTRO | https://release-monitoring.org/project/08093 | 194 | 196 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.6.0 | 0.1.6.3 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.3.15 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.22 | 1.6.23 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 6.20 | 7.00 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 23.3.5 | 24.0.0 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 23.3.5 | 24.0.0 | meson | DISTRO | https://release-monitoring.org/project/06472 | 1.1.1 | 1.3.1 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.46.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | micropython | DISTRO | https://release-monitoring.org/project/10539 | 1.22.0 | 1.22.1 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | minetest | DISTRO | https://release-monitoring.org/project/01978 | 5.6.1 | 5.8.0 | minetest-game | DISTRO | https://release-monitoring.org/project/21522 | 5.6.1 | 5.8.0 | minizip | DISTRO | https://release-monitoring.org/project/301509 | 4.0.3 | 4.0.4 | minizip-zlib | DISTRO | https://release-monitoring.org/project/05303 | 1.3 | 1.3.1 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2023.12 | 2024.01 | mobile-broadband-provider-info | DISTRO | https://release-monitoring.org/project/10267 | 20221107 | 20230416 | ORPH moby-buildkit | DISTRO | https://release-monitoring.org/project/20836 | 0.11.6 | 0.12.5 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.20.4 | 1.22.0 | modsecurity2 | DISTRO | https://release-monitoring.org/project/68638 | 2.9.7 | 3.0.12 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 7.2.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.182 | 6.12.0.205 | mpc | DISTRO | https://release-monitoring.org/project/01667 | 1.2.1 | 1.3.1 | ORPH mpd | DISTRO | https://release-monitoring.org/project/14864 | 0.23.14 | 0.23.15 | mpdecimal | DISTRO | https://release-monitoring.org/project/11578 | 2.5.1 | 4.0.0 | mpfr | DISTRO | https://release-monitoring.org/project/02019 | 4.1.1 | 4.2.1 | ORPH mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.32.3 | 1.32.4 | mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.35.1 | 0.37.0 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 6.1.0 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.24 | 1.8.25 | mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.22.0 | 1.23.9 | nanomsg | DISTRO | https://release-monitoring.org/project/14540 | 1.2 | 1.2.1 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.19 | 2.3 | ndisc6 | DISTRO | https://release-monitoring.org/project/21531 | 1.0.7 | 1.0.8 | ORPH neofetch | DISTRO | https://release-monitoring.org/project/16261 | 7.1.0 | 7.3.11 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.32.4 | 0.33.0 | ORPH nerdctl | DISTRO | https://release-monitoring.org/project/242901 | 1.3.1 | 1.7.3 | netatalk | DISTRO | https://release-monitoring.org/project/02063 | 3.1.17 | 3.1.18 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | 1.218 | 1.226 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.33.1 | 1.44.1 | netifrc | DISTRO | https://release-monitoring.org/project/21917 | 0.7.3 | 0.7.8 | netopeer2 | DISTRO | https://release-monitoring.org/project/114978 | 2.1.49 | 2.2.13 | netsnmp | DISTRO | https://release-monitoring.org/project/02062 | 5.9.3 | 5.9.4 | ORPH netsurf | DISTRO | https://release-monitoring.org/project/05386 | 3.10 | 3.11 | newt | DISTRO | https://release-monitoring.org/project/15129 | 0.52.23 | 0.52.24 | ORPH nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.8 | 1.0.9 | nftables-python | DISTRO | https://release-monitoring.org/project/02082 | 1.0.8 | 1.0.9 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.57.0 | 1.59.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.24.0 | 1.25.3 | ninja | DISTRO | https://release-monitoring.org/project/02089 | 1.11.1.g9... | 1.11.1 | nodejs-bin | DISTRO | https://release-monitoring.org/project/08251 | 20.9.0 | 21.6.1 | nodejs-src | DISTRO | https://release-monitoring.org/project/08251 | 20.9.0 | 21.6.1 | noip | DISTRO | https://release-monitoring.org/project/21539 | 2.1.9 | 3.0.0 | ORPH numactl | DISTRO | https://release-monitoring.org/project/02507 | 2.0.16 | 2.0.17 | nushell | DISTRO | https://release-monitoring.org/project/31106 | 0.85.0 | 0.89.0 | nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.151 | 390.157 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 550.40.07 | ORPH nvidia-persistenced | DISTRO | https://release-monitoring.org/project/369496 | 515.48.07 | 550.40.07 | nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 2.7.1 | ORPH ocrad | DISTRO | https://release-monitoring.org/project/02526 | 0.28 | 0.29 | ofono | DISTRO | https://release-monitoring.org/project/16859 | 2.2 | 2.3 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 14.1.2 | omniorb | DISTRO | https://release-monitoring.org/project/21545 | 4.3.1 | 4.3.2 | ORPH openal | DISTRO | https://release-monitoring.org/project/08172 | 1.22.0 | 1.23.1 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.25 | 0.3.26 | opencl-clhpp | DISTRO | https://release-monitoring.org/project/271141 | 2.0.16 | 2023.12.14 | opencore-amr | DISTRO | https://release-monitoring.org/project/21548 | 0.1.5 | 0.1.6 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.19 | 4.9.0 | opencv4 | DISTRO | https://release-monitoring.org/project/06615 | 4.8.1 | 4.9.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 17.0.9+9 | 23+8 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 8.1.0 | 8.2.0 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.1.5 | 5.0.1 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.52.1 | 0.53 | openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 11.3.5-18... | 12.3.5 | opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.6.2 | 0.6.3 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.6.2 | 0.6.3 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 4.0.0 | 4.1.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 4.0.0 | 4.1.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 4.0.0 | 4.1.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.3.0 | ORPH orc | DISTRO | https://release-monitoring.org/project/02573 | 0.4.34 | 0.4.36 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.3.15 | ORPH paho-mqtt-cpp | DISTRO | https://release-monitoring.org/project/21376 | 1.2.0 | 1.3.2 | pango | DISTRO | https://release-monitoring.org/project/11783 | 1.50.14 | 1.51.1 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.50.1 | 2.50.2 | pangomm2_46 | DISTRO | https://release-monitoring.org/project/369412 | 2.46.3 | 2.46.4 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.13 | 0.18.0 | ORPH pcsc-lite | DISTRO | https://release-monitoring.org/project/02611 | 2.0.0 | 2.0.1 | ORPH pdbg | DISTRO | https://release-monitoring.org/project/21378 | 3.5 | 3.6 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-crypt-openssl-aes | DISTRO | https://release-monitoring.org/project/02743 | 0.02 | 0.19 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 5.003 | perl-gd | DISTRO | https://release-monitoring.org/project/12660 | 2.77 | 2.78 | perl-gdgraph | DISTRO | https://release-monitoring.org/project/09187 | 1.54 | 1.56 | perl-http-cookies | DISTRO | https://release-monitoring.org/project/02974 | 6.10 | 6.11 | perl-image-exiftool | DISTRO | https://release-monitoring.org/project/06175 | 12.50 | 12.76 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.080 | 2.085 | perl-libwww-perl | DISTRO | https://release-monitoring.org/project/03024 | 6.67 | 6.76 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20230630 | 1.20240124 | perl-mime-tools | DISTRO | https://release-monitoring.org/project/11809 | 5.509 | 5.513 | perl-net-dns | DISTRO | https://release-monitoring.org/project/03147 | 1.42 | 1.43 | perl-net-ssh2 | DISTRO | https://release-monitoring.org/project/03163 | 0.72 | 0.73 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.93_01 | 1.94 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-uri | DISTRO | https://release-monitoring.org/project/03485 | 5.21 | 5.26 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0210 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.2.15 | 8.3.2 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 2.0.0 | 2.1.2 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.22 | 5.1.23 | php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.4 | 2.2.5 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.2.2 | 3.3.1 | pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.81 | 1.0.3 | pixman | DISTRO | https://release-monitoring.org/project/03648 | 0.42.2 | 0.43.2 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 2.1.1 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.18.0 | 3.0.3 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.12.4 | 1.13.0 | poke | DISTRO | https://release-monitoring.org/project/179926 | 3.0 | 3.3 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/334932 | 3.5 | 3.6 | polkit | DISTRO | https://release-monitoring.org/project/03682 | 123 | 124 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 22.12.0 | 24.02.0 | pound | DISTRO | https://release-monitoring.org/project/05436 | 4.8 | 4.11 | ORPH procps-ng | DISTRO | https://release-monitoring.org/project/03708 | 3.3.17 | 4.0.4 | ORPH procs | DISTRO | https://release-monitoring.org/project/76458 | 0.14.3 | 0.14.4 | proj | DISTRO | https://release-monitoring.org/project/21570 | 9.3.0 | 9.3.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.14 | 0.12.4 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 25.2 | protobuf-c | DISTRO | https://release-monitoring.org/project/03716 | 1.4.1 | 1.5.0 | ORPH proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.16 | 4.17 | ORPH pru-software-support | DISTRO | https://release-monitoring.org/project/21825 | 6.0.1 | 6.3.0 | psmisc | DISTRO | https://release-monitoring.org/project/03721 | 23.5 | 23.6 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pulseaudio | DISTRO | https://release-monitoring.org/project/03729 | 16.1 | 17.0 | ORPH python-aiocoap | DISTRO | https://release-monitoring.org/project/21243 | 0.4.5 | 0.4.7 | python-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.6.2 | 0.7.0 | python-aiohttp | DISTRO | https://release-monitoring.org/project/06713 | 3.9.1 | 3.9.3 | python-aiohttp-debugtoolbar | DISTRO | https://release-monitoring.org/project/56563 | 0.6.0 | 0.6.1 | python-aiohttp-jinja2 | DISTRO | https://release-monitoring.org/project/21247 | 1.5.1 | 1.6 | python-aiohttp-security | DISTRO | https://release-monitoring.org/project/21249 | 0.4.0 | 0.5.0 | python-aiorwlock | DISTRO | https://release-monitoring.org/project/21254 | 1.3.0 | 1.4.0 | python-alembic | DISTRO | https://release-monitoring.org/project/03766 | 1.12.1 | 1.13.1 | python-anyio | DISTRO | https://release-monitoring.org/project/49275 | 3.7.1 | 4.2.0 | python-apispec | DISTRO | https://release-monitoring.org/project/37849 | 6.3.1 | 6.4.0 | python-argh | DISTRO | https://release-monitoring.org/project/09299 | 0.30.4 | 0.31.2 | python-attrs | DISTRO | https://release-monitoring.org/project/15099 | 23.1.0 | 23.2.0 | python-babel | DISTRO | https://release-monitoring.org/project/11984 | 2.13.1 | 2.14.0 | python-bcrypt | DISTRO | https://release-monitoring.org/project/09047 | 4.0.1 | 4.1.2 | python-beautifulsoup4 | DISTRO | https://release-monitoring.org/project/03779 | 4.12.2 | 4.12.3 | python-bitstring | DISTRO | https://release-monitoring.org/project/14665 | 4.1.2 | 4.1.4 | python-boto3 | DISTRO | https://release-monitoring.org/project/29737 | 1.28.78 | 1.34.34 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.31.78 | 1.34.34 | python-can | DISTRO | https://release-monitoring.org/project/17873 | 4.2.2 | 4.3.1 | python-cbor2 | DISTRO | https://release-monitoring.org/project/64102 | 5.5.1 | 5.6.1 | python-certifi | DISTRO | https://release-monitoring.org/project/07995 | 2023.11.17 | 2024.2.2 | python-channels-redis | DISTRO | https://release-monitoring.org/project/21936 | 4.1.0 | 4.2.0 | python-cherrypy | DISTRO | https://release-monitoring.org/project/03799 | 18.8.0 | 18.9.0 | python-colorlog | DISTRO | https://release-monitoring.org/project/12509 | 6.7.0 | 6.8.2 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-construct | DISTRO | https://release-monitoring.org/project/16220 | 2.10.69 | 2.10.70 | python-contourpy | DISTRO | https://release-monitoring.org/project/244705 | 1.1.0 | 1.2.0 | python-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.6.1 | python-cryptography | DISTRO | https://release-monitoring.org/project/05532 | 39.0.2 | 42.0.2 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.36 | 3.0.8 | python-dbus-fast | DISTRO | https://release-monitoring.org/project/287975 | 2.12.0 | 2.21.1 | python-distlib | DISTRO | https://release-monitoring.org/project/34504 | 0.3.7 | 0.3.8 | python-distro | DISTRO | https://release-monitoring.org/project/12202 | 1.8.0 | 1.9.0 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 4.2.7 | 5.0.1 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.4.2 | 2.5.0 | python-docker | DISTRO | https://release-monitoring.org/project/03847 | 6.1.3 | 7.0.0b3 | python-dominate | DISTRO | https://release-monitoring.org/project/19648 | 2.8.0 | 2.9.1 | python-dtschema | DISTRO | https://release-monitoring.org/project/100908 | 2023.9 | 2023.11 | python-engineio | DISTRO | https://release-monitoring.org/project/15064 | 4.8.0 | 4.8.2 | python-esptool | DISTRO | https://release-monitoring.org/project/11619 | 4.6.2 | 4.7.0 | python-falcon | DISTRO | https://release-monitoring.org/project/03860 | 3.1.1 | 3.1.3 | python-fastapi | DISTRO | https://release-monitoring.org/project/47977 | 0.105.0 | 0.109.2 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 3.0.0 | 3.0.2 | python-flask-jsonrpc | DISTRO | https://release-monitoring.org/project/21698 | 2.2.2 | 3.0.0 | python-flask-smorest | DISTRO | https://release-monitoring.org/project/25028 | 0.42.1 | 0.42.3 | python-flatbuffers | DISTRO | https://release-monitoring.org/project/85010 | 2.0.7 | 23.5.26 | python-fonttools | DISTRO | https://release-monitoring.org/project/07388 | 4.44.0 | 4.47.2 | python-frozenlist | DISTRO | https://release-monitoring.org/project/41138 | 1.4.0 | 1.4.1 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.40 | 3.1.41 | python-glslang | DISTRO | https://release-monitoring.org/project/205796 | 11.13.0 | 14.0.0 | python-gnupg | DISTRO | https://release-monitoring.org/project/15157 | 0.5.1 | 0.5.2 | python-gobject | DISTRO | https://release-monitoring.org/project/13158 | 3.42.2 | 3.46.0 | python-google-api-core | DISTRO | https://release-monitoring.org/project/25386 | 2.15.0 | 2.16.2 | python-google-auth | DISTRO | https://release-monitoring.org/project/38039 | 2.25.2 | 2.27.0 | python-greenlet | DISTRO | https://release-monitoring.org/project/06870 | 3.0.1 | 3.0.3 | python-grpc-requests | DISTRO | https://release-monitoring.org/project/132701 | 0.1.13 | 0.1.14 | python-grpcio | DISTRO | https://release-monitoring.org/project/18429 | 1.60.0 | 1.60.1 | python-grpcio-reflection | DISTRO | https://release-monitoring.org/project/30542 | 1.60.0 | 1.60.1 | python-hatch-fancy-pypi-readme | DISTRO | https://release-monitoring.org/project/274452 | 23.1.0 | 24.1.0 | python-hatch-vcs | DISTRO | https://release-monitoring.org/project/301800 | 0.3.0 | 0.4.0 | python-hatchling | DISTRO | https://release-monitoring.org/project/185085 | 1.18.0 | 1.21.1 | python-hiredis | DISTRO | https://release-monitoring.org/project/12002 | 2.2.3 | 2.3.2 | python-httpx | DISTRO | https://release-monitoring.org/project/27210 | 0.25.2 | 0.26.0 | python-hwdata | DISTRO | https://release-monitoring.org/project/11771 | 2.3.7 | 2.4.1-1 | python-idna | DISTRO | https://release-monitoring.org/project/05487 | 3.4 | 3.6 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 8.17.2 | 8.21.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-jinja2 | DISTRO | https://release-monitoring.org/project/03894 | 3.1.2 | 3.1.3 | python-jsonschema | DISTRO | https://release-monitoring.org/project/03898 | 4.19.2 | 4.21.1 | python-jsonschema-specifica... | DISTRO | https://release-monitoring.org/project/316377 | 2023.7.1 | 2023.12.1 | python-keyring | DISTRO | https://release-monitoring.org/project/03901 | 24.2.0 | 24.3.0 | python-lark | DISTRO | https://release-monitoring.org/project/140595 | 1.1.8 | 1.1.9 | python-lxml | DISTRO | https://release-monitoring.org/project/03914 | 4.9.3 | 5.1.0 | python-mako | DISTRO | https://release-monitoring.org/project/03915 | 1.3.0 | 1.3.2 | python-markdown | DISTRO | https://release-monitoring.org/project/03916 | 3.5.1 | 3.5.2 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.10 | 2.4.12 | python-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.1.3 | 2.1.5 | python-marshmallow | DISTRO | https://release-monitoring.org/project/08079 | 3.20.1 | 3.20.2 | python-marshmallow-sqlalchemy | DISTRO | https://release-monitoring.org/project/50566 | 0.29.0 | 1.0.0 | python-maturin | DISTRO | https://release-monitoring.org/project/42653 | 1.3.1 | 1.4.0 | python-ml-dtypes | DISTRO | https://release-monitoring.org/project/330555 | 0.3.1 | 0.3.2 | python-more-itertools | DISTRO | https://release-monitoring.org/project/12201 | 10.1.0 | 10.2.0 | python-mpd2 | DISTRO | https://release-monitoring.org/project/19721 | 3.1.0 | 3.1.1 | python-multidict | DISTRO | https://release-monitoring.org/project/11132 | 6.0.4 | 6.0.5 | python-multipart | DISTRO | https://release-monitoring.org/project/18463 | 0.0.6 | 0.0.7 | python-netaddr | DISTRO | https://release-monitoring.org/project/05586 | 0.9.0 | 0.10.1 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.25.0 | 1.26.3 | python-opcua-asyncio | DISTRO | https://release-monitoring.org/project/131612 | 1.0.1 | 1.05a1 | python-orjson | DISTRO | https://release-monitoring.org/project/31737 | 3.9.10 | 3.9.13 | python-pathspec | DISTRO | https://release-monitoring.org/project/15607 | 0.11.2 | 0.12.1 | python-pexpect | DISTRO | https://release-monitoring.org/project/07654 | 4.8.0 | 4.9.0 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 10.1.0 | 10.2.0 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 23.3.1 | 24.0 | python-pluggy | DISTRO | https://release-monitoring.org/project/07500 | 1.3.0 | 1.4.0 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.41 | 3.0.43 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 25.2 | python-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.9.7 | 5.9.8 | python-pudb | DISTRO | https://release-monitoring.org/project/03980 | 2023.1 | 2024.1 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.19.0 | 3.20.0 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 2.5.2 | 2.6.0 | python-pydantic-core | DISTRO | https://release-monitoring.org/project/273695 | 2.14.5 | 2.16.2 | python-pyftpdlib | DISTRO | https://release-monitoring.org/project/17026 | 1.5.7 | 1.5.9 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.5.2 | python-pygments | DISTRO | https://release-monitoring.org/project/03986 | 2.15.1 | 2.17.2 | python-pyhamcrest | DISTRO | https://release-monitoring.org/project/11633 | 2.0.4 | 2.1.0 | python-pyicu | DISTRO | https://release-monitoring.org/project/12004 | 2.11 | 2.12 | python-pyjwt | DISTRO | https://release-monitoring.org/project/05653 | 2.7.0 | 2.8.0 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.20.0 | 0.21.0 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 3.0.2 | 3.6.3 | python-pymupdf | DISTRO | https://release-monitoring.org/project/17320 | 1.22.0 | 1.23.21 | python-pymysql | DISTRO | https://release-monitoring.org/project/07284 | 1.0.2 | 1.1.0 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 23.0.0 | 24.0.0 | python-pyparted | DISTRO | https://release-monitoring.org/project/15558 | 3.12.0 | 3.13.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.15.6 | 5.15.10 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.7.10 | 0.7.11 | python-pyrsistent | DISTRO | https://release-monitoring.org/project/19676 | 0.19.3 | 0.20.0 | python-pysmb | DISTRO | https://release-monitoring.org/project/21589 | 1.2.9 | 1.2.9.1 | python-pyspnego | DISTRO | https://release-monitoring.org/project/107092 | 0.7.0 | 0.10.2 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.31.3 | 0.31.4 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.64.2 | 1.2.0 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 7.4.2 | 8.0.0 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.21.1 | 0.23.4a2 | python-pythran | DISTRO | https://release-monitoring.org/project/21140 | 0.13.1 | 0.15.0 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2023.3 | 2024.1 | python-pyudev | DISTRO | https://release-monitoring.org/project/08485 | 0.24.0 | 0.24.1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 24.0.1 | 25.1.2 | python-qrcode | DISTRO | https://release-monitoring.org/project/20011 | 7.3.1 | 7.4.2 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 4.5.5 | 5.1.0b3 | python-reedsolo | DISTRO | https://release-monitoring.org/project/81160 | 1.6.0 | 2.0.13 | python-referencing | DISTRO | https://release-monitoring.org/project/304263 | 0.30.2 | 0.33.0 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2022.10.31 | 2023.12.25 | python-requests-toolbelt | DISTRO | https://release-monitoring.org/project/05665 | 0.10.1 | 1.0.0 | python-rpds-py | DISTRO | https://release-monitoring.org/project/368622 | 0.12.0 | 0.17.1 | python-rtoml | DISTRO | https://release-monitoring.org/project/62048 | 0.8.0 | 0.10.0 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-ruamel-yaml | DISTRO | https://release-monitoring.org/project/66067 | 0.17.21 | 0.18.5 | python-s3transfer | DISTRO | https://release-monitoring.org/project/10428 | 0.6.0 | 0.10.0 | python-schedule | DISTRO | https://release-monitoring.org/project/21600 | 1.1.0 | 1.2.1 | python-scipy | DISTRO | https://release-monitoring.org/project/04768 | 1.11.0 | 1.12.0 | python-segno | DISTRO | https://release-monitoring.org/project/59641 | 1.5.2 | 1.6.0 | python-selenium | DISTRO | https://release-monitoring.org/project/05645 | 4.9.1 | 4.17.2 | python-semver | DISTRO | https://release-monitoring.org/project/12989 | 2.13.0 | 3.0.2 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.12.1 | 1.40.0 | python-service-identity | DISTRO | https://release-monitoring.org/project/07917 | 21.1.0 | 24.1.0 | python-setproctitle | DISTRO | https://release-monitoring.org/project/11699 | 1.3.2 | 1.3.3 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 68.2.2 | 69.0.3 | python-setuptools-scm | DISTRO | https://release-monitoring.org/project/07874 | 7.1.0 | 8.0.4 | python-setuptools-scm-git-a... | DISTRO | https://release-monitoring.org/project/28329 | 1.4 | 1.4.1 | python-sh | DISTRO | https://release-monitoring.org/project/10429 | 1.14.3 | 2.0.6 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.18.1 | 3.19.2 | python-simplesqlite | DISTRO | https://release-monitoring.org/project/21608 | 1.3.0 | 1.5.2 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.19.25 | 6.8.2 | python-smbprotocol | DISTRO | https://release-monitoring.org/project/47981 | 1.10.1 | 1.12.0 | python-smmap2 | DISTRO | https://release-monitoring.org/project/12729 | 5.0.0 | 6.0.0 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.7.2 | 5.11.0 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.3.2.post1 | 2.5 | python-sqliteschema | DISTRO | https://release-monitoring.org/project/29718 | 1.3.0 | 2.0.0 | python-sqlparse | DISTRO | https://release-monitoring.org/project/04038 | 0.4.3 | 0.4.4 | python-stack-data | DISTRO | https://release-monitoring.org/project/90020 | 0.6.2 | 0.6.3 | python-starlette | DISTRO | https://release-monitoring.org/project/36570 | 0.27.0 | 0.36.2 | python-tabledata | DISTRO | https://release-monitoring.org/project/21613 | 1.3.0 | 1.3.3 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 5.2.0 | 5.5.0 | python-termcolor | DISTRO | https://release-monitoring.org/project/10198 | 2.2.0 | 2.4.0 | python-texttable | DISTRO | https://release-monitoring.org/project/11635 | 1.6.7 | 1.7.0 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.4 | 1.1.7 | python-tornado | DISTRO | https://release-monitoring.org/project/07498 | 6.2 | 6.4 | python-tqdm | DISTRO | https://release-monitoring.org/project/11524 | 4.64.1 | 4.66.1 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.8.0 | 5.14.1 | python-treq | DISTRO | https://release-monitoring.org/project/19614 | 22.2.0 | 23.11.0 | python-trio | DISTRO | https://release-monitoring.org/project/17451 | 0.22.0 | 0.24.0 | python-trio-websocket | DISTRO | https://release-monitoring.org/project/136283 | 0.9.2 | 0.11.1 | python-trove-classifiers | DISTRO | https://release-monitoring.org/project/88298 | 2023.10.18 | 2024.1.31 | python-twisted | DISTRO | https://release-monitoring.org/project/04071 | 22.10.0 | 23.10.0 | python-txtorcon | DISTRO | https://release-monitoring.org/project/19661 | 22.0.0 | 23.11.0 | python-typeguard | DISTRO | https://release-monitoring.org/project/38819 | 2.13.3 | 4.1.5 | python-typepy | DISTRO | https://release-monitoring.org/project/21617 | 1.3.0 | 1.3.2 | python-types-python-dateutil | DISTRO | https://release-monitoring.org/project/147859 | 2.8.19.14 | 2.8.19.20... | python-typing-inspect | DISTRO | https://release-monitoring.org/project/209826 | 0.8.0 | 0.9.0 | python-u-msgpack | DISTRO | https://release-monitoring.org/project/19764 | 2.7.2 | 2.8.0 | python-ujson | DISTRO | https://release-monitoring.org/project/04076 | 5.7.0 | 5.9.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 2.0.7 | 2.2.0 | python-urwid | DISTRO | https://release-monitoring.org/project/04079 | 2.1.2 | 2.5.1 | python-uvicorn | DISTRO | https://release-monitoring.org/project/28526 | 0.24.0.post1 | 0.27.0.post1 | python-watchdog | DISTRO | https://release-monitoring.org/project/05341 | 2.2.1 | 3.0.0 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.2.5 | 0.2.13 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 59.0 | 60.2 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.26.1 | 2.27.1 | python-webargs | DISTRO | https://release-monitoring.org/project/24711 | 8.2.0 | 8.4.0 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 1.4.2 | 1.7.0 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.4 | 12.0 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 2.3.8 | 3.0.1 | python-wheel | DISTRO | https://release-monitoring.org/project/11428 | 0.40.0 | 0.42.0 | python-wrapt | DISTRO | https://release-monitoring.org/project/06108 | 1.14.1 | 1.16.0 | python-wtforms | DISTRO | https://release-monitoring.org/project/11805 | 3.0.1 | 3.1.2 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.32 | 0.33 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.6 | 3.1.9 | python-yarl | DISTRO | https://release-monitoring.org/project/12895 | 1.9.2 | 1.9.4 | python-yatl | DISTRO | https://release-monitoring.org/project/50636 | 20220907.1 | 20230507.3 | python-zc-lockfile | DISTRO | https://release-monitoring.org/project/04100 | 2.0 | 3.0.post1 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.39.4 | 0.131.0 | python-zlmdb | DISTRO | https://release-monitoring.org/project/66674 | 22.6.1 | 23.1.1 | python-zope-interface | DISTRO | https://release-monitoring.org/project/04112 | 5.5.2 | 6.1a2 | python-zopfli | DISTRO | https://release-monitoring.org/project/50016 | 0.2.2 | 0.2.3 | python3 | DISTRO | https://release-monitoring.org/project/13254 | 3.11.6 | 3.12.1 | qcom-db410c-firmware | DISTRO | https://release-monitoring.org/project/235382 | 1034.2.1 | 1036.1 | qemu | DISTRO | https://release-monitoring.org/project/13607 | 8.1.1 | 8.2.1 | qlibc | DISTRO | https://release-monitoring.org/project/21737 | 2.4.7 | 2.5.0 | ORPH qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 11.8.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.39.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.6.1 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.6.1 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.6.1 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.6.1 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.10 | 6.6.1 | qt6base | DISTRO | https://release-monitoring.org/project/07927 | 6.4.3 | 6.6.1 | qt6core5compat | DISTRO | https://release-monitoring.org/project/07927 | 6.4.3 | 6.6.1 | qt6serialbus | DISTRO | https://release-monitoring.org/project/07927 | 6.4.3 | 6.6.1 | qt6serialport | DISTRO | https://release-monitoring.org/project/07927 | 6.4.3 | 6.6.1 | qt6svg | DISTRO | https://release-monitoring.org/project/07927 | 6.4.3 | 6.6.1 | quickjs | DISTRO | https://release-monitoring.org/project/138263 | 2023-12-09 | 2024-01-13 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH ragel | DISTRO | https://release-monitoring.org/project/12105 | 6.10 | 7.0.4 | ORPH raspberrypi-usbboot | DISTRO | https://release-monitoring.org/project/115700 | 2021.07.01 | 20221215-... | ORPH rauc | DISTRO | https://release-monitoring.org/project/20626 | 1.11 | 1.11.1 | rdma-core | DISTRO | https://release-monitoring.org/project/12907 | 49.0 | 50.0 | re2 | DISTRO | https://release-monitoring.org/project/10500 | 2023-11-01 | 2024-02-01 | redis-plus-plus | DISTRO | https://release-monitoring.org/project/368624 | 1.3.10 | 1.3.12 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.5 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.5 | 2.0.1 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 8.10.0 | rp-pppoe | DISTRO | https://release-monitoring.org/project/04209 | 3.15 | 4.0 | ORPH rt-tests | DISTRO | https://release-monitoring.org/project/59450 | 2.5 | 2.6 | ruby | DISTRO | https://release-monitoring.org/project/04223 | 3.1.3 | 3.3.0 | runc | DISTRO | https://release-monitoring.org/project/07462 | 1.1.9 | 1.1.12 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.74.1 | 1.75.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.74.1 | 1.75.0 | rust-bindgen | DISTRO | https://release-monitoring.org/project/17910 | 0.65.1 | 0.69.4 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.42.5 | s390-tools | DISTRO | https://release-monitoring.org/project/10714 | 2.29.0 | 2.31.0 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.11.1.2 | 2.12.0.3 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.4 | 2.3.7.1 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.8.0 | 1.1.2.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.6.0.0 | 2.6.2.0 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.5.1.1 | 2.7.0.2 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.5.0 | 2.3.0.3 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.3.2 | 0.5.4.2 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.19.3 | 4.19.4 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.1.1 | 1.2.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 4.5.2 | 4.6.0 | sdl2 | DISTRO | https://release-monitoring.org/project/04779 | 2.28.5 | 2.30.0 | sdl2_mixer | DISTRO | https://release-monitoring.org/project/04782 | 2.6.3 | 2.8.0 | ORPH sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.20.2 | 2.22.0 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.27 | ORPH sdl_sound | DISTRO | https://release-monitoring.org/project/10262 | 1.0.3 | 2.0.2 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.5 | 3.6 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.5 | 3.6 | ORPH sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 2.20.3 | 2.27.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.7.0 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.8 | 4.6.1 | serd | DISTRO | https://release-monitoring.org/project/230531 | 0.30.14 | 0.32.2 | setools | DISTRO | https://release-monitoring.org/project/08951 | 4.4.3 | 4.4.4 | ORPH shadow | DISTRO | https://release-monitoring.org/project/04802 | 4.13 | 4.14.3 | shairport-sync | DISTRO | https://release-monitoring.org/project/21384 | 3.3.9 | 4.3.2 | ORPH shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.4 | ORPH shim | DISTRO | https://release-monitoring.org/project/10719 | 15.6 | 15.8 | signal-estimator | DISTRO | https://release-monitoring.org/project/284559 | v0.0.4 | 0.0.9 | ORPH sispmctl | DISTRO | https://release-monitoring.org/project/21653 | 4.9 | 4.11 | skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.12.0.1 | 2.14.1.1 | slirp4netns | DISTRO | https://release-monitoring.org/project/96795 | 1.2.0 | 1.2.2 | smartmontools | DISTRO | https://release-monitoring.org/project/04835 | 7.3 | 7.4 | ORPH sngrep | DISTRO | https://release-monitoring.org/project/17075 | 1.7.0 | 1.8.0 | ORPH snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.5.0 | 3.5.1 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.40.0 | 3.1.78.0 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.42-9798... | ORPH sord | DISTRO | https://release-monitoring.org/project/230536 | 0.16.12 | 0.16.16 | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | spawn-fcgi | DISTRO | https://release-monitoring.org/project/05388 | 1.6.4 | 1.6.5 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice | DISTRO | https://release-monitoring.org/project/04871 | 0.15.0 | 0.15.2 | sqlcipher | DISTRO | https://release-monitoring.org/project/11213 | 4.5.1 | 4.5.6 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.44.2 | 3.45.1 | squid | DISTRO | https://release-monitoring.org/project/04880 | 6.6 | 6.7 | ORPH sratom | DISTRO | https://release-monitoring.org/project/14903 | 0.6.14 | 0.6.16 | start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.22.4 | ORPH stella | DISTRO | https://release-monitoring.org/project/06861 | 6.7 | 6.7.1 | stellarium | DISTRO | https://release-monitoring.org/project/04891 | 23.3 | 23.4 | strace | DISTRO | https://release-monitoring.org/project/04897 | 6.6 | 6.7 | stress-ng | DISTRO | https://release-monitoring.org/project/12538 | 0.15.07 | 0.17.05 | suricata | DISTRO | https://release-monitoring.org/project/10925 | 6.0.15 | 7.0.2 | swig | DISTRO | https://release-monitoring.org/project/04919 | 4.1.1 | 4.2.0 | synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.29.3 | 0.35.1 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 4.3.1 | 4.6.0 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 45.1 | sysrepo | DISTRO | https://release-monitoring.org/project/34820 | 2.2.36 | 2.2.150 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.6.1 | 12.7.5 | ORPH systemd | DISTRO | https://release-monitoring.org/project/05440 | 254.6 | 255.3 | systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 235 | taglib | DISTRO | https://release-monitoring.org/project/01982 | 1.13.1 | 2.0 | tar | DISTRO | https://release-monitoring.org/project/04939 | 1.34 | 1.35 | ORPH targetcli-fb | DISTRO | https://release-monitoring.org/project/09174 | 2.1.54 | 2.1.58 | tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | ORPH terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.12.1 | 1.13.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 5.3.3 | 5.3.4 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.5.1 | 2.5.6 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.19.0 | ORPH timescaledb | DISTRO | https://release-monitoring.org/project/17545 | 2.13.0 | 2.13.1 | tinifier | DISTRO | https://release-monitoring.org/project/241900 | 3.4.0 | 4.1.0 | tinycompress | DISTRO | https://release-monitoring.org/project/09556 | 1.2.8 | 1.2.11 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.47 | 2.7 | tl-expected | DISTRO | https://release-monitoring.org/project/112689 | v1.0.0 | 1.1.0 | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 3.0.0 | ORPH tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 5.2 | 5.6 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.2.2 | 4.0.1 | ORPH traceroute | DISTRO | https://release-monitoring.org/project/14877 | 2.1.3 | 2.1.5 | ttyd | DISTRO | https://release-monitoring.org/project/13890 | 1.7.3 | 1.7.4 | tzdata | DISTRO | https://release-monitoring.org/project/05021 | 2023c | 2024a | uacme | DISTRO | https://release-monitoring.org/project/22795 | 1.7.4 | 1.7.5 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2024.01 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.14 | 0.15.2 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 4.3.0.0 | 4.6.0.0 | unbound | DISTRO | https://release-monitoring.org/project/05042 | 1.17.1 | 1.19.0 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 3.4 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.8.7 | ORPH upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.19 | 1.90.2 | upx | DISTRO | https://release-monitoring.org/project/13737 | 4.2.1 | 4.2.2 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.39.2 | 2.39.3 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.39.2 | 2.39.3 | ORPH uuu | DISTRO | https://release-monitoring.org/project/259328 | 1.5.141 | 1.5.165 | vdr | DISTRO | https://release-monitoring.org/project/05069 | 2.6.3 | 2.6.6 | ORPH vdr-plugin-vnsiserver | DISTRO | https://release-monitoring.org/project/05080 | 1.8.0 | 1.8.3 | ORPH vim | DISTRO | https://release-monitoring.org/project/05092 | 9.0.2136 | 9.1.0076 | ORPH vis-network | DISTRO | https://release-monitoring.org/project/270536 | 9.1.0 | 9.1.9 | vnstat | DISTRO | https://release-monitoring.org/project/07283 | 2.11 | 2.12 | volk | DISTRO | https://release-monitoring.org/project/147733 | 3.0.0 | 3.1.1 | vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.66.2 | 0.75.0 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.3.4 | 3.4.15 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.3.262 | 1.3.277 | ORPH vulkan-loader | DISTRO | https://release-monitoring.org/project/230557 | 1.3.262 | 1.3.277 | ORPH vulkan-tools | DISTRO | https://release-monitoring.org/project/242111 | 1.3.262 | 1.3.277 | ORPH waffle | DISTRO | https://release-monitoring.org/project/21633 | 1.7.0 | 1.8.0 | watchdogd | DISTRO | https://release-monitoring.org/project/236252 | 3.5 | 4.0 | wayland-protocols | DISTRO | https://release-monitoring.org/project/13997 | 1.32 | 1.33 | ORPH webkitgtk | DISTRO | https://release-monitoring.org/project/05355 | 2.42.2 | 2.43.4 | weston | DISTRO | https://release-monitoring.org/project/13745 | 12.0.1 | 13.0.0 | whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.14 | 5.5.20 | wine | DISTRO | https://release-monitoring.org/project/05134 | 8.0.2 | 9.1 | wireless-regdb | DISTRO | https://release-monitoring.org/project/15257 | 2023.09.01 | 2024.01.23 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.8 | 0.4.81 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 4.0.12 | 4.2.2 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.16.2 | 0.17.1 | wolftpm | DISTRO | https://release-monitoring.org/project/256219 | 2.7.0 | 3.1.0 | wtfutil | DISTRO | https://release-monitoring.org/project/243189 | 0.41.0 | 0.43.0 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.19 | 1.4.24 | xapp_bitmap | DISTRO | https://release-monitoring.org/project/00191 | 1.1.0 | 1.1.1 | ORPH xapp_fonttosfnt | DISTRO | https://release-monitoring.org/project/21723 | 1.2.2 | 1.2.3 | ORPH xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20240102 | ORPH xapp_xbiff | DISTRO | https://release-monitoring.org/project/15034 | 1.0.4 | 1.0.5 | ORPH xapp_xeyes | DISTRO | https://release-monitoring.org/project/15025 | 1.2.0 | 1.3.0 | ORPH xapp_xkbcomp | DISTRO | https://release-monitoring.org/project/15018 | 1.4.6 | 1.4.7 | ORPH xapp_xmore | DISTRO | https://release-monitoring.org/project/18845 | 1.0.3 | 1.0.4 | ORPH xapp_xprop | DISTRO | https://release-monitoring.org/project/14958 | 1.2.6 | 1.2.7 | ORPH xcb-proto | DISTRO | https://release-monitoring.org/project/13646 | 1.15.2 | 1.16.0 | ORPH xdriver_xf86-input-libinput | DISTRO | https://release-monitoring.org/project/05782 | 1.3.0 | 1.4.0 | ORPH xdriver_xf86-video-siliconm... | DISTRO | https://release-monitoring.org/project/05236 | 1.7.9 | 1.7.10 | ORPH xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.6 | 4.18.0 | xerces | DISTRO | https://release-monitoring.org/project/05182 | 3.2.4 | 3.2.5 | ORPH xfont_font-adobe-utopia-75dpi | DISTRO | https://release-monitoring.org/project/17200 | 1.0.4 | 1.0.5 | ORPH xfont_font-util | DISTRO | https://release-monitoring.org/project/15055 | 1.4.0 | 1.4.1 | ORPH xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 6.4.0 | 6.5.0 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.38 | 2.41 | ORPH xlib_libXext | DISTRO | https://release-monitoring.org/project/01774 | 1.3.5 | 1.3.6 | ORPH xlib_libXrandr | DISTRO | https://release-monitoring.org/project/01788 | 1.5.3 | 1.5.4 | ORPH xlib_libXvMC | DISTRO | https://release-monitoring.org/project/01796 | 1.0.13 | 1.0.14 | ORPH xlib_libxkbfile | DISTRO | https://release-monitoring.org/project/01781 | 1.1.2 | 1.1.3 | ORPH xorriso | DISTRO | https://release-monitoring.org/project/13270 | 1.5.4.pl02 | 1.5.6.pl02 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 6.03 | 6.08 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.24 | 3.25 | ORPH xutil_makedepend | DISTRO | https://release-monitoring.org/project/13528 | 1.0.8 | 1.0.9 | ORPH xz | DISTRO | https://release-monitoring.org/project/05277 | 5.4.5 | 5.4.6 | ORPH yad | DISTRO | https://release-monitoring.org/project/05280 | 0.40.0 | 13.0 | ytree | DISTRO | https://release-monitoring.org/project/05296 | 2.05 | 2.06 | zabbix | DISTRO | https://release-monitoring.org/project/05492 | 6.2.7 | 6.4.11 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.3.2 | 1.4.0 | zeek | DISTRO | https://release-monitoring.org/project/267106 | 4.1.1 | 6.1.1 | zlib-ng | DISTRO | https://release-monitoring.org/project/115592 | 2.1.3 | 2.1.6 | ORPH zxing-cpp | DISTRO | https://release-monitoring.org/project/101246 | 2.1.0 | 2.2.1 | Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 asn1c | CVE-2020-23910 | https://security-tracker.debian.org/tracker/CVE-2020-23910 asn1c | CVE-2020-23911 | https://security-tracker.debian.org/tracker/CVE-2020-23911 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 avahi | CVE-2023-38469 | https://security-tracker.debian.org/tracker/CVE-2023-38469 avahi | CVE-2023-38470 | https://security-tracker.debian.org/tracker/CVE-2023-38470 avahi | CVE-2023-38471 | https://security-tracker.debian.org/tracker/CVE-2023-38471 avahi | CVE-2023-38472 | https://security-tracker.debian.org/tracker/CVE-2023-38472 avahi | CVE-2023-38473 | https://security-tracker.debian.org/tracker/CVE-2023-38473 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2023-1972 | https://security-tracker.debian.org/tracker/CVE-2023-1972 binutils | CVE-2023-25584 | https://security-tracker.debian.org/tracker/CVE-2023-25584 binutils | CVE-2023-25585 | https://security-tracker.debian.org/tracker/CVE-2023-25585 binutils | CVE-2023-25586 | https://security-tracker.debian.org/tracker/CVE-2023-25586 binutils | CVE-2023-25588 | https://security-tracker.debian.org/tracker/CVE-2023-25588 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bitcoin | CVE-2023-33297 | https://security-tracker.debian.org/tracker/CVE-2023-33297 bitcoin | CVE-2023-50428 | https://security-tracker.debian.org/tracker/CVE-2023-50428 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2023-42363 | https://security-tracker.debian.org/tracker/CVE-2023-42363 busybox | CVE-2023-42364 | https://security-tracker.debian.org/tracker/CVE-2023-42364 busybox | CVE-2023-42365 | https://security-tracker.debian.org/tracker/CVE-2023-42365 busybox | CVE-2023-42366 | https://security-tracker.debian.org/tracker/CVE-2023-42366 bwm-ng | CVE-2023-26129 | https://security-tracker.debian.org/tracker/CVE-2023-26129 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 composer | CVE-2023-43655 | https://security-tracker.debian.org/tracker/CVE-2023-43655 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2023-50979 | https://security-tracker.debian.org/tracker/CVE-2023-50979 cryptopp | CVE-2023-50980 | https://security-tracker.debian.org/tracker/CVE-2023-50980 cryptopp | CVE-2023-50981 | https://security-tracker.debian.org/tracker/CVE-2023-50981 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 emlog | CVE-2023-43291 | https://security-tracker.debian.org/tracker/CVE-2023-43291 erlang | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-48434 | https://security-tracker.debian.org/tracker/CVE-2022-48434 ffmpeg | CVE-2023-46407 | https://security-tracker.debian.org/tracker/CVE-2023-46407 ffmpeg | CVE-2023-47470 | https://security-tracker.debian.org/tracker/CVE-2023-47470 ffmpeg | CVE-2024-22860 | https://security-tracker.debian.org/tracker/CVE-2024-22860 ffmpeg | CVE-2024-22861 | https://security-tracker.debian.org/tracker/CVE-2024-22861 ffmpeg | CVE-2024-22862 | https://security-tracker.debian.org/tracker/CVE-2024-22862 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 ghostscript | CVE-2023-38559 | https://security-tracker.debian.org/tracker/CVE-2023-38559 ghostscript | CVE-2023-38560 | https://security-tracker.debian.org/tracker/CVE-2023-38560 ghostscript | CVE-2023-46751 | https://security-tracker.debian.org/tracker/CVE-2023-46751 giflib | CVE-2023-48161 | https://security-tracker.debian.org/tracker/CVE-2023-48161 glibc | CVE-2023-0687 | https://security-tracker.debian.org/tracker/CVE-2023-0687 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grpc | CVE-2023-1428 | https://security-tracker.debian.org/tracker/CVE-2023-1428 grpc | CVE-2023-32732 | https://security-tracker.debian.org/tracker/CVE-2023-32732 grpc | CVE-2023-33953 | https://security-tracker.debian.org/tracker/CVE-2023-33953 grpc | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 grpc | CVE-2023-4785 | https://security-tracker.debian.org/tracker/CVE-2023-4785 grub2 | CVE-2023-4001 | https://security-tracker.debian.org/tracker/CVE-2023-4001 grub2 | CVE-2023-4692 | https://security-tracker.debian.org/tracker/CVE-2023-4692 grub2 | CVE-2023-4693 | https://security-tracker.debian.org/tracker/CVE-2023-4693 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-0056 | https://security-tracker.debian.org/tracker/CVE-2023-0056 haproxy | CVE-2023-45539 | https://security-tracker.debian.org/tracker/CVE-2023-45539 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-5118 | https://security-tracker.debian.org/tracker/CVE-2016-5118 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 imagemagick | CVE-2023-5341 | https://security-tracker.debian.org/tracker/CVE-2023-5341 jasper | CVE-2023-51257 | https://security-tracker.debian.org/tracker/CVE-2023-51257 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kvmtool | CVE-2021-45464 | https://security-tracker.debian.org/tracker/CVE-2021-45464 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libcoap | CVE-2024-0962 | https://security-tracker.debian.org/tracker/CVE-2024-0962 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libfreeimage | CVE-2020-21426 | https://security-tracker.debian.org/tracker/CVE-2020-21426 libfreeimage | CVE-2020-21427 | https://security-tracker.debian.org/tracker/CVE-2020-21427 libfreeimage | CVE-2020-21428 | https://security-tracker.debian.org/tracker/CVE-2020-21428 libfreeimage | CVE-2021-33367 | https://security-tracker.debian.org/tracker/CVE-2021-33367 libfreeimage | CVE-2023-47992 | https://security-tracker.debian.org/tracker/CVE-2023-47992 libfreeimage | CVE-2023-47993 | https://security-tracker.debian.org/tracker/CVE-2023-47993 libfreeimage | CVE-2023-47994 | https://security-tracker.debian.org/tracker/CVE-2023-47994 libfreeimage | CVE-2023-47995 | https://security-tracker.debian.org/tracker/CVE-2023-47995 libfreeimage | CVE-2023-47996 | https://security-tracker.debian.org/tracker/CVE-2023-47996 libfreeimage | CVE-2023-47997 | https://security-tracker.debian.org/tracker/CVE-2023-47997 libgtk2 | CVE-2014-1949 | https://security-tracker.debian.org/tracker/CVE-2014-1949 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libkrb5 | CVE-2023-36054 | https://security-tracker.debian.org/tracker/CVE-2023-36054 libkrb5 | CVE-2023-39975 | https://security-tracker.debian.org/tracker/CVE-2023-39975 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2023-6129 | https://security-tracker.debian.org/tracker/CVE-2023-6129 libopenssl | CVE-2024-0727 | https://security-tracker.debian.org/tracker/CVE-2024-0727 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-22628 | https://security-tracker.debian.org/tracker/CVE-2020-22628 libraw | CVE-2023-1729 | https://security-tracker.debian.org/tracker/CVE-2023-1729 libsndfile | CVE-2022-33065 | https://security-tracker.debian.org/tracker/CVE-2022-33065 libtommath | CVE-2023-36328 | https://security-tracker.debian.org/tracker/CVE-2023-36328 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libvirt | CVE-2023-3750 | https://security-tracker.debian.org/tracker/CVE-2023-3750 libzlib | CVE-2023-45853 | https://security-tracker.debian.org/tracker/CVE-2023-45853 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzip | CVE-2023-39741 | https://security-tracker.debian.org/tracker/CVE-2023-39741 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-43666 | https://security-tracker.debian.org/tracker/CVE-2021-43666 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mbedtls | CVE-2023-52353 | https://security-tracker.debian.org/tracker/CVE-2023-52353 mbedtls | CVE-2024-23744 | https://security-tracker.debian.org/tracker/CVE-2024-23744 mdadm | CVE-2023-28736 | https://security-tracker.debian.org/tracker/CVE-2023-28736 mdadm | CVE-2023-28938 | https://security-tracker.debian.org/tracker/CVE-2023-28938 micropython | CVE-2023-7152 | https://security-tracker.debian.org/tracker/CVE-2023-7152 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mp4v2 | CVE-2023-33716 | https://security-tracker.debian.org/tracker/CVE-2023-33716 mp4v2 | CVE-2023-33717 | https://security-tracker.debian.org/tracker/CVE-2023-33717 mp4v2 | CVE-2023-33718 | https://security-tracker.debian.org/tracker/CVE-2023-33718 mp4v2 | CVE-2023-33719 | https://security-tracker.debian.org/tracker/CVE-2023-33719 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netatalk | CVE-2022-22995 | https://security-tracker.debian.org/tracker/CVE-2022-22995 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 nginx | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 ninja | CVE-2021-4336 | https://security-tracker.debian.org/tracker/CVE-2021-4336 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 opencv3 | CVE-2023-2618 | https://security-tracker.debian.org/tracker/CVE-2023-2618 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 openvmtools | CVE-2022-31693 | https://security-tracker.debian.org/tracker/CVE-2022-31693 openvmtools | CVE-2023-20867 | https://security-tracker.debian.org/tracker/CVE-2023-20867 openvmtools | CVE-2023-20900 | https://security-tracker.debian.org/tracker/CVE-2023-20900 openvmtools | CVE-2023-34057 | https://security-tracker.debian.org/tracker/CVE-2023-34057 openvmtools | CVE-2023-34058 | https://security-tracker.debian.org/tracker/CVE-2023-34058 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 oracle-mysql | CVE-2023-21977 | https://security-tracker.debian.org/tracker/CVE-2023-21977 oracle-mysql | CVE-2023-21980 | https://security-tracker.debian.org/tracker/CVE-2023-21980 oracle-mysql | CVE-2023-22007 | https://security-tracker.debian.org/tracker/CVE-2023-22007 oracle-mysql | CVE-2023-22015 | https://security-tracker.debian.org/tracker/CVE-2023-22015 oracle-mysql | CVE-2023-22026 | https://security-tracker.debian.org/tracker/CVE-2023-22026 oracle-mysql | CVE-2023-22028 | https://security-tracker.debian.org/tracker/CVE-2023-22028 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 perl-lwp-protocol-https | CVE-2014-3230 | https://security-tracker.debian.org/tracker/CVE-2014-3230 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php | CVE-2022-4900 | https://security-tracker.debian.org/tracker/CVE-2022-4900 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 proftpd | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 python-cryptography | CVE-2023-49083 | https://security-tracker.debian.org/tracker/CVE-2023-49083 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2023-50447 | https://security-tracker.debian.org/tracker/CVE-2023-50447 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pycryptodomex | CVE-2023-52323 | https://security-tracker.debian.org/tracker/CVE-2023-52323 python-sqlparse | CVE-2023-30608 | https://security-tracker.debian.org/tracker/CVE-2023-30608 python-uvicorn | CVE-2020-7694 | https://security-tracker.debian.org/tracker/CVE-2020-7694 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2023-1386 | https://security-tracker.debian.org/tracker/CVE-2023-1386 qemu | CVE-2023-2680 | https://security-tracker.debian.org/tracker/CVE-2023-2680 qemu | CVE-2023-3019 | https://security-tracker.debian.org/tracker/CVE-2023-3019 qemu | CVE-2023-5088 | https://security-tracker.debian.org/tracker/CVE-2023-5088 qemu | CVE-2023-6683 | https://security-tracker.debian.org/tracker/CVE-2023-6683 qemu | CVE-2023-6693 | https://security-tracker.debian.org/tracker/CVE-2023-6693 qt6base | CVE-2023-32573 | https://security-tracker.debian.org/tracker/CVE-2023-32573 qt6base | CVE-2023-32762 | https://security-tracker.debian.org/tracker/CVE-2023-32762 qt6base | CVE-2023-32763 | https://security-tracker.debian.org/tracker/CVE-2023-32763 qt6base | CVE-2023-33285 | https://security-tracker.debian.org/tracker/CVE-2023-33285 qt6base | CVE-2023-34410 | https://security-tracker.debian.org/tracker/CVE-2023-34410 qt6base | CVE-2023-37369 | https://security-tracker.debian.org/tracker/CVE-2023-37369 qt6base | CVE-2023-38197 | https://security-tracker.debian.org/tracker/CVE-2023-38197 qt6base | CVE-2023-51714 | https://security-tracker.debian.org/tracker/CVE-2023-51714 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 samba4 | CVE-2022-37966 | https://security-tracker.debian.org/tracker/CVE-2022-37966 samba4 | CVE-2022-37967 | https://security-tracker.debian.org/tracker/CVE-2022-37967 samba4 | CVE-2022-38023 | https://security-tracker.debian.org/tracker/CVE-2022-38023 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 shadow | CVE-2013-4235 | https://security-tracker.debian.org/tracker/CVE-2013-4235 shim | CVE-2023-40547 | https://security-tracker.debian.org/tracker/CVE-2023-40547 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 snort | CVE-2023-20246 | https://security-tracker.debian.org/tracker/CVE-2023-20246 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 sysstat | CVE-2023-33204 | https://security-tracker.debian.org/tracker/CVE-2023-33204 tcpreplay | CVE-2023-4256 | https://security-tracker.debian.org/tracker/CVE-2023-4256 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2023-3164 | https://security-tracker.debian.org/tracker/CVE-2023-3164 tiff | CVE-2023-52355 | https://security-tracker.debian.org/tracker/CVE-2023-52355 tiff | CVE-2023-52356 | https://security-tracker.debian.org/tracker/CVE-2023-52356 tiff | CVE-2023-6228 | https://security-tracker.debian.org/tracker/CVE-2023-6228 tiff | CVE-2023-6277 | https://security-tracker.debian.org/tracker/CVE-2023-6277 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 vorbis-tools | CVE-2023-43361 | https://security-tracker.debian.org/tracker/CVE-2023-43361 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-40982 | https://security-tracker.debian.org/tracker/CVE-2022-40982 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xen | CVE-2022-42331 | https://security-tracker.debian.org/tracker/CVE-2022-42331 xen | CVE-2022-42332 | https://security-tracker.debian.org/tracker/CVE-2022-42332 xen | CVE-2022-42333 | https://security-tracker.debian.org/tracker/CVE-2022-42333 xen | CVE-2022-42334 | https://security-tracker.debian.org/tracker/CVE-2022-42334 xen | CVE-2022-4949 | https://security-tracker.debian.org/tracker/CVE-2022-4949 xen | CVE-2023-20588 | https://security-tracker.debian.org/tracker/CVE-2023-20588 xen | CVE-2023-34319 | https://security-tracker.debian.org/tracker/CVE-2023-34319 xen | CVE-2023-34320 | https://security-tracker.debian.org/tracker/CVE-2023-34320 xen | CVE-2023-34321 | https://security-tracker.debian.org/tracker/CVE-2023-34321 xen | CVE-2023-34322 | https://security-tracker.debian.org/tracker/CVE-2023-34322 xen | CVE-2023-34323 | https://security-tracker.debian.org/tracker/CVE-2023-34323 xen | CVE-2023-34324 | https://security-tracker.debian.org/tracker/CVE-2023-34324 xen | CVE-2023-34325 | https://security-tracker.debian.org/tracker/CVE-2023-34325 xen | CVE-2023-34326 | https://security-tracker.debian.org/tracker/CVE-2023-34326 xen | CVE-2023-34327 | https://security-tracker.debian.org/tracker/CVE-2023-34327 xen | CVE-2023-46835 | https://security-tracker.debian.org/tracker/CVE-2023-46835 xen | CVE-2023-46836 | https://security-tracker.debian.org/tracker/CVE-2023-46836 xen | CVE-2023-46837 | https://security-tracker.debian.org/tracker/CVE-2023-46837 xen | CVE-2023-4949 | https://security-tracker.debian.org/tracker/CVE-2023-4949 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yajl | CVE-2023-33460 | https://security-tracker.debian.org/tracker/CVE-2023-33460 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 yasm | CVE-2023-31972 | https://security-tracker.debian.org/tracker/CVE-2023-31972 yasm | CVE-2023-31973 | https://security-tracker.debian.org/tracker/CVE-2023-31973 yasm | CVE-2023-31974 | https://security-tracker.debian.org/tracker/CVE-2023-31974 yasm | CVE-2023-51258 | https://security-tracker.debian.org/tracker/CVE-2023-51258 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2023.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 asn1c | CVE-2020-23910 | https://security-tracker.debian.org/tracker/CVE-2020-23910 asn1c | CVE-2020-23911 | https://security-tracker.debian.org/tracker/CVE-2020-23911 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 avahi | CVE-2023-38469 | https://security-tracker.debian.org/tracker/CVE-2023-38469 avahi | CVE-2023-38470 | https://security-tracker.debian.org/tracker/CVE-2023-38470 avahi | CVE-2023-38471 | https://security-tracker.debian.org/tracker/CVE-2023-38471 avahi | CVE-2023-38472 | https://security-tracker.debian.org/tracker/CVE-2023-38472 avahi | CVE-2023-38473 | https://security-tracker.debian.org/tracker/CVE-2023-38473 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 bento4 | CVE-2023-29573 | https://security-tracker.debian.org/tracker/CVE-2023-29573 bento4 | CVE-2023-29574 | https://security-tracker.debian.org/tracker/CVE-2023-29574 bento4 | CVE-2023-29575 | https://security-tracker.debian.org/tracker/CVE-2023-29575 bento4 | CVE-2023-29576 | https://security-tracker.debian.org/tracker/CVE-2023-29576 bento4 | CVE-2023-38666 | https://security-tracker.debian.org/tracker/CVE-2023-38666 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 binutils | CVE-2022-44840 | https://security-tracker.debian.org/tracker/CVE-2022-44840 binutils | CVE-2022-45703 | https://security-tracker.debian.org/tracker/CVE-2022-45703 binutils | CVE-2022-47007 | https://security-tracker.debian.org/tracker/CVE-2022-47007 binutils | CVE-2022-47008 | https://security-tracker.debian.org/tracker/CVE-2022-47008 binutils | CVE-2022-47010 | https://security-tracker.debian.org/tracker/CVE-2022-47010 binutils | CVE-2022-47011 | https://security-tracker.debian.org/tracker/CVE-2022-47011 binutils | CVE-2022-47673 | https://security-tracker.debian.org/tracker/CVE-2022-47673 binutils | CVE-2022-47695 | https://security-tracker.debian.org/tracker/CVE-2022-47695 binutils | CVE-2022-47696 | https://security-tracker.debian.org/tracker/CVE-2022-47696 binutils | CVE-2022-48063 | https://security-tracker.debian.org/tracker/CVE-2022-48063 binutils | CVE-2022-48064 | https://security-tracker.debian.org/tracker/CVE-2022-48064 binutils | CVE-2022-48065 | https://security-tracker.debian.org/tracker/CVE-2022-48065 binutils | CVE-2023-1972 | https://security-tracker.debian.org/tracker/CVE-2023-1972 binutils | CVE-2023-25584 | https://security-tracker.debian.org/tracker/CVE-2023-25584 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bitcoin | CVE-2023-33297 | https://security-tracker.debian.org/tracker/CVE-2023-33297 bitcoin | CVE-2023-50428 | https://security-tracker.debian.org/tracker/CVE-2023-50428 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2023-42363 | https://security-tracker.debian.org/tracker/CVE-2023-42363 busybox | CVE-2023-42364 | https://security-tracker.debian.org/tracker/CVE-2023-42364 busybox | CVE-2023-42365 | https://security-tracker.debian.org/tracker/CVE-2023-42365 busybox | CVE-2023-42366 | https://security-tracker.debian.org/tracker/CVE-2023-42366 bwm-ng | CVE-2023-26129 | https://security-tracker.debian.org/tracker/CVE-2023-26129 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cryptopp | CVE-2023-50979 | https://security-tracker.debian.org/tracker/CVE-2023-50979 cryptopp | CVE-2023-50980 | https://security-tracker.debian.org/tracker/CVE-2023-50980 cryptopp | CVE-2023-50981 | https://security-tracker.debian.org/tracker/CVE-2023-50981 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 emlog | CVE-2023-43291 | https://security-tracker.debian.org/tracker/CVE-2023-43291 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 erlang | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-48434 | https://security-tracker.debian.org/tracker/CVE-2022-48434 ffmpeg | CVE-2023-46407 | https://security-tracker.debian.org/tracker/CVE-2023-46407 ffmpeg | CVE-2023-47470 | https://security-tracker.debian.org/tracker/CVE-2023-47470 ffmpeg | CVE-2024-22860 | https://security-tracker.debian.org/tracker/CVE-2024-22860 ffmpeg | CVE-2024-22861 | https://security-tracker.debian.org/tracker/CVE-2024-22861 ffmpeg | CVE-2024-22862 | https://security-tracker.debian.org/tracker/CVE-2024-22862 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 freerdp | CVE-2024-22211 | https://security-tracker.debian.org/tracker/CVE-2024-22211 ghostscript | CVE-2023-38559 | https://security-tracker.debian.org/tracker/CVE-2023-38559 ghostscript | CVE-2023-38560 | https://security-tracker.debian.org/tracker/CVE-2023-38560 ghostscript | CVE-2023-46751 | https://security-tracker.debian.org/tracker/CVE-2023-46751 giflib | CVE-2023-48161 | https://security-tracker.debian.org/tracker/CVE-2023-48161 glibc | CVE-2023-6246 | https://security-tracker.debian.org/tracker/CVE-2023-6246 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grpc | CVE-2023-1428 | https://security-tracker.debian.org/tracker/CVE-2023-1428 grpc | CVE-2023-32732 | https://security-tracker.debian.org/tracker/CVE-2023-32732 grpc | CVE-2023-33953 | https://security-tracker.debian.org/tracker/CVE-2023-33953 grpc | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 grpc | CVE-2023-4785 | https://security-tracker.debian.org/tracker/CVE-2023-4785 grub2 | CVE-2023-4001 | https://security-tracker.debian.org/tracker/CVE-2023-4001 grub2 | CVE-2023-4692 | https://security-tracker.debian.org/tracker/CVE-2023-4692 grub2 | CVE-2023-4693 | https://security-tracker.debian.org/tracker/CVE-2023-4693 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-0056 | https://security-tracker.debian.org/tracker/CVE-2023-0056 haproxy | CVE-2023-45539 | https://security-tracker.debian.org/tracker/CVE-2023-45539 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-5118 | https://security-tracker.debian.org/tracker/CVE-2016-5118 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 imagemagick | CVE-2023-5341 | https://security-tracker.debian.org/tracker/CVE-2023-5341 jasper | CVE-2023-51257 | https://security-tracker.debian.org/tracker/CVE-2023-51257 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 kodi | CVE-2023-30207 | https://security-tracker.debian.org/tracker/CVE-2023-30207 kvmtool | CVE-2021-45464 | https://security-tracker.debian.org/tracker/CVE-2021-45464 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2023-30571 | https://security-tracker.debian.org/tracker/CVE-2023-30571 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libfreeimage | CVE-2020-21426 | https://security-tracker.debian.org/tracker/CVE-2020-21426 libfreeimage | CVE-2020-21427 | https://security-tracker.debian.org/tracker/CVE-2020-21427 libfreeimage | CVE-2020-21428 | https://security-tracker.debian.org/tracker/CVE-2020-21428 libfreeimage | CVE-2021-33367 | https://security-tracker.debian.org/tracker/CVE-2021-33367 libfreeimage | CVE-2023-47992 | https://security-tracker.debian.org/tracker/CVE-2023-47992 libfreeimage | CVE-2023-47993 | https://security-tracker.debian.org/tracker/CVE-2023-47993 libfreeimage | CVE-2023-47994 | https://security-tracker.debian.org/tracker/CVE-2023-47994 libfreeimage | CVE-2023-47995 | https://security-tracker.debian.org/tracker/CVE-2023-47995 libfreeimage | CVE-2023-47996 | https://security-tracker.debian.org/tracker/CVE-2023-47996 libfreeimage | CVE-2023-47997 | https://security-tracker.debian.org/tracker/CVE-2023-47997 libglib2 | CVE-2023-29499 | https://security-tracker.debian.org/tracker/CVE-2023-29499 libglib2 | CVE-2023-32611 | https://security-tracker.debian.org/tracker/CVE-2023-32611 libglib2 | CVE-2023-32636 | https://security-tracker.debian.org/tracker/CVE-2023-32636 libglib2 | CVE-2023-32643 | https://security-tracker.debian.org/tracker/CVE-2023-32643 libglib2 | CVE-2023-32665 | https://security-tracker.debian.org/tracker/CVE-2023-32665 libgtk2 | CVE-2014-1949 | https://security-tracker.debian.org/tracker/CVE-2014-1949 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libkrb5 | CVE-2023-36054 | https://security-tracker.debian.org/tracker/CVE-2023-36054 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmemcached | CVE-2023-27478 | https://security-tracker.debian.org/tracker/CVE-2023-27478 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2023-5678 | https://security-tracker.debian.org/tracker/CVE-2023-5678 libopenssl | CVE-2024-0727 | https://security-tracker.debian.org/tracker/CVE-2024-0727 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-22628 | https://security-tracker.debian.org/tracker/CVE-2020-22628 libraw | CVE-2023-1729 | https://security-tracker.debian.org/tracker/CVE-2023-1729 libsndfile | CVE-2022-33065 | https://security-tracker.debian.org/tracker/CVE-2022-33065 libtommath | CVE-2023-36328 | https://security-tracker.debian.org/tracker/CVE-2023-36328 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libvirt | CVE-2023-3750 | https://security-tracker.debian.org/tracker/CVE-2023-3750 libvpx | CVE-2023-44488 | https://security-tracker.debian.org/tracker/CVE-2023-44488 libzlib | CVE-2023-45853 | https://security-tracker.debian.org/tracker/CVE-2023-45853 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzip | CVE-2023-39741 | https://security-tracker.debian.org/tracker/CVE-2023-39741 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-43666 | https://security-tracker.debian.org/tracker/CVE-2021-43666 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mbedtls | CVE-2023-52353 | https://security-tracker.debian.org/tracker/CVE-2023-52353 mbedtls | CVE-2024-23744 | https://security-tracker.debian.org/tracker/CVE-2024-23744 mdadm | CVE-2023-28736 | https://security-tracker.debian.org/tracker/CVE-2023-28736 mdadm | CVE-2023-28938 | https://security-tracker.debian.org/tracker/CVE-2023-28938 micropython | CVE-2023-7152 | https://security-tracker.debian.org/tracker/CVE-2023-7152 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mp4v2 | CVE-2023-33716 | https://security-tracker.debian.org/tracker/CVE-2023-33716 mp4v2 | CVE-2023-33717 | https://security-tracker.debian.org/tracker/CVE-2023-33717 mp4v2 | CVE-2023-33718 | https://security-tracker.debian.org/tracker/CVE-2023-33718 mp4v2 | CVE-2023-33719 | https://security-tracker.debian.org/tracker/CVE-2023-33719 mupdf | CVE-2023-31794 | https://security-tracker.debian.org/tracker/CVE-2023-31794 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 nginx | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 ninja | CVE-2021-4336 | https://security-tracker.debian.org/tracker/CVE-2021-4336 nodejs | CVE-2023-30581 | https://security-tracker.debian.org/tracker/CVE-2023-30581 nodejs | CVE-2023-30585 | https://security-tracker.debian.org/tracker/CVE-2023-30585 nodejs | CVE-2023-30588 | https://security-tracker.debian.org/tracker/CVE-2023-30588 nodejs | CVE-2023-30589 | https://security-tracker.debian.org/tracker/CVE-2023-30589 nodejs | CVE-2023-30590 | https://security-tracker.debian.org/tracker/CVE-2023-30590 nodejs | CVE-2023-32002 | https://security-tracker.debian.org/tracker/CVE-2023-32002 nodejs | CVE-2023-32006 | https://security-tracker.debian.org/tracker/CVE-2023-32006 nodejs | CVE-2023-32559 | https://security-tracker.debian.org/tracker/CVE-2023-32559 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 ntp | CVE-2023-26551 | https://security-tracker.debian.org/tracker/CVE-2023-26551 ntp | CVE-2023-26552 | https://security-tracker.debian.org/tracker/CVE-2023-26552 ntp | CVE-2023-26553 | https://security-tracker.debian.org/tracker/CVE-2023-26553 ntp | CVE-2023-26554 | https://security-tracker.debian.org/tracker/CVE-2023-26554 ntp | CVE-2023-26555 | https://security-tracker.debian.org/tracker/CVE-2023-26555 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 opencv3 | CVE-2023-2618 | https://security-tracker.debian.org/tracker/CVE-2023-2618 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 openvmtools | CVE-2022-31693 | https://security-tracker.debian.org/tracker/CVE-2022-31693 openvmtools | CVE-2023-20867 | https://security-tracker.debian.org/tracker/CVE-2023-20867 openvmtools | CVE-2023-20900 | https://security-tracker.debian.org/tracker/CVE-2023-20900 openvmtools | CVE-2023-34057 | https://security-tracker.debian.org/tracker/CVE-2023-34057 openvmtools | CVE-2023-34058 | https://security-tracker.debian.org/tracker/CVE-2023-34058 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 oracle-mysql | CVE-2023-21977 | https://security-tracker.debian.org/tracker/CVE-2023-21977 oracle-mysql | CVE-2023-21980 | https://security-tracker.debian.org/tracker/CVE-2023-21980 oracle-mysql | CVE-2023-22007 | https://security-tracker.debian.org/tracker/CVE-2023-22007 oracle-mysql | CVE-2023-22015 | https://security-tracker.debian.org/tracker/CVE-2023-22015 oracle-mysql | CVE-2023-22026 | https://security-tracker.debian.org/tracker/CVE-2023-22026 oracle-mysql | CVE-2023-22028 | https://security-tracker.debian.org/tracker/CVE-2023-22028 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 perl | CVE-2023-31484 | https://security-tracker.debian.org/tracker/CVE-2023-31484 perl | CVE-2023-31486 | https://security-tracker.debian.org/tracker/CVE-2023-31486 perl | CVE-2023-47100 | https://security-tracker.debian.org/tracker/CVE-2023-47100 perl-lwp-protocol-https | CVE-2014-3230 | https://security-tracker.debian.org/tracker/CVE-2014-3230 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php | CVE-2022-4900 | https://security-tracker.debian.org/tracker/CVE-2022-4900 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 proftpd | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 python-cryptography | CVE-2023-49083 | https://security-tracker.debian.org/tracker/CVE-2023-49083 python-flask | CVE-2023-30861 | https://security-tracker.debian.org/tracker/CVE-2023-30861 python-paramiko | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 python-pillow | CVE-2023-44271 | https://security-tracker.debian.org/tracker/CVE-2023-44271 python-pillow | CVE-2023-50447 | https://security-tracker.debian.org/tracker/CVE-2023-50447 python-pip | CVE-2023-5752 | https://security-tracker.debian.org/tracker/CVE-2023-5752 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pycryptodomex | CVE-2023-52323 | https://security-tracker.debian.org/tracker/CVE-2023-52323 python-pygments | CVE-2022-40896 | https://security-tracker.debian.org/tracker/CVE-2022-40896 python-scipy | CVE-2023-25399 | https://security-tracker.debian.org/tracker/CVE-2023-25399 python-sqlparse | CVE-2023-30608 | https://security-tracker.debian.org/tracker/CVE-2023-30608 python-validators | CVE-2023-45813 | https://security-tracker.debian.org/tracker/CVE-2023-45813 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2023-0330 | https://security-tracker.debian.org/tracker/CVE-2023-0330 qemu | CVE-2023-0664 | https://security-tracker.debian.org/tracker/CVE-2023-0664 qemu | CVE-2023-1386 | https://security-tracker.debian.org/tracker/CVE-2023-1386 qemu | CVE-2023-2680 | https://security-tracker.debian.org/tracker/CVE-2023-2680 qemu | CVE-2023-2861 | https://security-tracker.debian.org/tracker/CVE-2023-2861 qemu | CVE-2023-3019 | https://security-tracker.debian.org/tracker/CVE-2023-3019 qemu | CVE-2023-3180 | https://security-tracker.debian.org/tracker/CVE-2023-3180 qemu | CVE-2023-3255 | https://security-tracker.debian.org/tracker/CVE-2023-3255 qemu | CVE-2023-3301 | https://security-tracker.debian.org/tracker/CVE-2023-3301 qemu | CVE-2023-3354 | https://security-tracker.debian.org/tracker/CVE-2023-3354 qemu | CVE-2023-42467 | https://security-tracker.debian.org/tracker/CVE-2023-42467 qemu | CVE-2023-5088 | https://security-tracker.debian.org/tracker/CVE-2023-5088 qemu | CVE-2023-6683 | https://security-tracker.debian.org/tracker/CVE-2023-6683 qemu | CVE-2023-6693 | https://security-tracker.debian.org/tracker/CVE-2023-6693 qt5base | CVE-2011-3193 | https://security-tracker.debian.org/tracker/CVE-2011-3193 qt5base | CVE-2012-6093 | https://security-tracker.debian.org/tracker/CVE-2012-6093 qt5base | CVE-2014-0190 | https://security-tracker.debian.org/tracker/CVE-2014-0190 qt5base | CVE-2015-1290 | https://security-tracker.debian.org/tracker/CVE-2015-1290 qt5base | CVE-2017-10904 | https://security-tracker.debian.org/tracker/CVE-2017-10904 qt5base | CVE-2017-10905 | https://security-tracker.debian.org/tracker/CVE-2017-10905 qt5base | CVE-2018-19869 | https://security-tracker.debian.org/tracker/CVE-2018-19869 qt5base | CVE-2018-19870 | https://security-tracker.debian.org/tracker/CVE-2018-19870 qt5base | CVE-2018-19871 | https://security-tracker.debian.org/tracker/CVE-2018-19871 qt5base | CVE-2018-19873 | https://security-tracker.debian.org/tracker/CVE-2018-19873 qt5base | CVE-2018-21035 | https://security-tracker.debian.org/tracker/CVE-2018-21035 qt5base | CVE-2020-0570 | https://security-tracker.debian.org/tracker/CVE-2020-0570 qt5base | CVE-2020-17507 | https://security-tracker.debian.org/tracker/CVE-2020-17507 qt5base | CVE-2023-32573 | https://security-tracker.debian.org/tracker/CVE-2023-32573 qt5base | CVE-2023-32762 | https://security-tracker.debian.org/tracker/CVE-2023-32762 qt5base | CVE-2023-32763 | https://security-tracker.debian.org/tracker/CVE-2023-32763 qt5base | CVE-2023-34410 | https://security-tracker.debian.org/tracker/CVE-2023-34410 qt5base | CVE-2023-37369 | https://security-tracker.debian.org/tracker/CVE-2023-37369 qt5base | CVE-2023-38197 | https://security-tracker.debian.org/tracker/CVE-2023-38197 qt5base | CVE-2023-43114 | https://security-tracker.debian.org/tracker/CVE-2023-43114 qt5base | CVE-2023-51714 | https://security-tracker.debian.org/tracker/CVE-2023-51714 qt6base | CVE-2023-32573 | https://security-tracker.debian.org/tracker/CVE-2023-32573 qt6base | CVE-2023-32762 | https://security-tracker.debian.org/tracker/CVE-2023-32762 qt6base | CVE-2023-32763 | https://security-tracker.debian.org/tracker/CVE-2023-32763 qt6base | CVE-2023-33285 | https://security-tracker.debian.org/tracker/CVE-2023-33285 qt6base | CVE-2023-34410 | https://security-tracker.debian.org/tracker/CVE-2023-34410 qt6base | CVE-2023-37369 | https://security-tracker.debian.org/tracker/CVE-2023-37369 qt6base | CVE-2023-38197 | https://security-tracker.debian.org/tracker/CVE-2023-38197 qt6base | CVE-2023-51714 | https://security-tracker.debian.org/tracker/CVE-2023-51714 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rust | CVE-2023-40030 | https://security-tracker.debian.org/tracker/CVE-2023-40030 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 samba4 | CVE-2022-37966 | https://security-tracker.debian.org/tracker/CVE-2022-37966 samba4 | CVE-2022-37967 | https://security-tracker.debian.org/tracker/CVE-2022-37967 samba4 | CVE-2022-38023 | https://security-tracker.debian.org/tracker/CVE-2022-38023 samba4 | CVE-2023-5568 | https://security-tracker.debian.org/tracker/CVE-2023-5568 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 shim | CVE-2023-40547 | https://security-tracker.debian.org/tracker/CVE-2023-40547 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 snort | CVE-2023-20246 | https://security-tracker.debian.org/tracker/CVE-2023-20246 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2023-7104 | https://security-tracker.debian.org/tracker/CVE-2023-7104 sqlite | CVE-2024-0232 | https://security-tracker.debian.org/tracker/CVE-2024-0232 stellarium | CVE-2023-28371 | https://security-tracker.debian.org/tracker/CVE-2023-28371 sudo | CVE-2023-27320 | https://security-tracker.debian.org/tracker/CVE-2023-27320 sudo | CVE-2023-42465 | https://security-tracker.debian.org/tracker/CVE-2023-42465 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 sysstat | CVE-2023-33204 | https://security-tracker.debian.org/tracker/CVE-2023-33204 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2023-3164 | https://security-tracker.debian.org/tracker/CVE-2023-3164 tiff | CVE-2023-52355 | https://security-tracker.debian.org/tracker/CVE-2023-52355 tiff | CVE-2023-52356 | https://security-tracker.debian.org/tracker/CVE-2023-52356 tiff | CVE-2023-6228 | https://security-tracker.debian.org/tracker/CVE-2023-6228 tiff | CVE-2023-6277 | https://security-tracker.debian.org/tracker/CVE-2023-6277 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unrar | CVE-2022-48579 | https://security-tracker.debian.org/tracker/CVE-2022-48579 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 vorbis-tools | CVE-2023-43361 | https://security-tracker.debian.org/tracker/CVE-2023-43361 webkitgtk | CVE-2023-39928 | https://security-tracker.debian.org/tracker/CVE-2023-39928 wpewebkit | CVE-2023-40397 | https://security-tracker.debian.org/tracker/CVE-2023-40397 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-40982 | https://security-tracker.debian.org/tracker/CVE-2022-40982 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xen | CVE-2022-42331 | https://security-tracker.debian.org/tracker/CVE-2022-42331 xen | CVE-2022-42332 | https://security-tracker.debian.org/tracker/CVE-2022-42332 xen | CVE-2022-42333 | https://security-tracker.debian.org/tracker/CVE-2022-42333 xen | CVE-2022-42334 | https://security-tracker.debian.org/tracker/CVE-2022-42334 xen | CVE-2022-4949 | https://security-tracker.debian.org/tracker/CVE-2022-4949 xen | CVE-2023-20588 | https://security-tracker.debian.org/tracker/CVE-2023-20588 xen | CVE-2023-34319 | https://security-tracker.debian.org/tracker/CVE-2023-34319 xen | CVE-2023-34320 | https://security-tracker.debian.org/tracker/CVE-2023-34320 xen | CVE-2023-34321 | https://security-tracker.debian.org/tracker/CVE-2023-34321 xen | CVE-2023-34322 | https://security-tracker.debian.org/tracker/CVE-2023-34322 xen | CVE-2023-34323 | https://security-tracker.debian.org/tracker/CVE-2023-34323 xen | CVE-2023-34324 | https://security-tracker.debian.org/tracker/CVE-2023-34324 xen | CVE-2023-34325 | https://security-tracker.debian.org/tracker/CVE-2023-34325 xen | CVE-2023-34326 | https://security-tracker.debian.org/tracker/CVE-2023-34326 xen | CVE-2023-34327 | https://security-tracker.debian.org/tracker/CVE-2023-34327 xen | CVE-2023-46835 | https://security-tracker.debian.org/tracker/CVE-2023-46835 xen | CVE-2023-46836 | https://security-tracker.debian.org/tracker/CVE-2023-46836 xen | CVE-2023-46837 | https://security-tracker.debian.org/tracker/CVE-2023-46837 xen | CVE-2023-4949 | https://security-tracker.debian.org/tracker/CVE-2023-4949 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xwayland | CVE-2023-6816 | https://security-tracker.debian.org/tracker/CVE-2023-6816 xwayland | CVE-2024-0408 | https://security-tracker.debian.org/tracker/CVE-2024-0408 xwayland | CVE-2024-0409 | https://security-tracker.debian.org/tracker/CVE-2024-0409 yajl | CVE-2023-33460 | https://security-tracker.debian.org/tracker/CVE-2023-33460 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 yasm | CVE-2023-30402 | https://security-tracker.debian.org/tracker/CVE-2023-30402 yasm | CVE-2023-31972 | https://security-tracker.debian.org/tracker/CVE-2023-31972 yasm | CVE-2023-31973 | https://security-tracker.debian.org/tracker/CVE-2023-31973 yasm | CVE-2023-31974 | https://security-tracker.debian.org/tracker/CVE-2023-31974 yasm | CVE-2023-31975 | https://security-tracker.debian.org/tracker/CVE-2023-31975 yasm | CVE-2023-51258 | https://security-tracker.debian.org/tracker/CVE-2023-51258 zbar | CVE-2023-40889 | https://security-tracker.debian.org/tracker/CVE-2023-40889 zbar | CVE-2023-40890 | https://security-tracker.debian.org/tracker/CVE-2023-40890 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2023.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 asn1c | CVE-2020-23910 | https://security-tracker.debian.org/tracker/CVE-2020-23910 asn1c | CVE-2020-23911 | https://security-tracker.debian.org/tracker/CVE-2020-23911 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 avahi | CVE-2023-38469 | https://security-tracker.debian.org/tracker/CVE-2023-38469 avahi | CVE-2023-38470 | https://security-tracker.debian.org/tracker/CVE-2023-38470 avahi | CVE-2023-38471 | https://security-tracker.debian.org/tracker/CVE-2023-38471 avahi | CVE-2023-38472 | https://security-tracker.debian.org/tracker/CVE-2023-38472 avahi | CVE-2023-38473 | https://security-tracker.debian.org/tracker/CVE-2023-38473 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2023-1972 | https://security-tracker.debian.org/tracker/CVE-2023-1972 binutils | CVE-2023-25584 | https://security-tracker.debian.org/tracker/CVE-2023-25584 binutils | CVE-2023-25585 | https://security-tracker.debian.org/tracker/CVE-2023-25585 binutils | CVE-2023-25586 | https://security-tracker.debian.org/tracker/CVE-2023-25586 binutils | CVE-2023-25588 | https://security-tracker.debian.org/tracker/CVE-2023-25588 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bitcoin | CVE-2023-33297 | https://security-tracker.debian.org/tracker/CVE-2023-33297 bitcoin | CVE-2023-50428 | https://security-tracker.debian.org/tracker/CVE-2023-50428 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2023-42363 | https://security-tracker.debian.org/tracker/CVE-2023-42363 busybox | CVE-2023-42364 | https://security-tracker.debian.org/tracker/CVE-2023-42364 busybox | CVE-2023-42365 | https://security-tracker.debian.org/tracker/CVE-2023-42365 busybox | CVE-2023-42366 | https://security-tracker.debian.org/tracker/CVE-2023-42366 bwm-ng | CVE-2023-26129 | https://security-tracker.debian.org/tracker/CVE-2023-26129 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 composer | CVE-2023-43655 | https://security-tracker.debian.org/tracker/CVE-2023-43655 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2023-50979 | https://security-tracker.debian.org/tracker/CVE-2023-50979 cryptopp | CVE-2023-50980 | https://security-tracker.debian.org/tracker/CVE-2023-50980 cryptopp | CVE-2023-50981 | https://security-tracker.debian.org/tracker/CVE-2023-50981 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 emlog | CVE-2023-43291 | https://security-tracker.debian.org/tracker/CVE-2023-43291 erlang | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-48434 | https://security-tracker.debian.org/tracker/CVE-2022-48434 ffmpeg | CVE-2023-46407 | https://security-tracker.debian.org/tracker/CVE-2023-46407 ffmpeg | CVE-2023-47470 | https://security-tracker.debian.org/tracker/CVE-2023-47470 ffmpeg | CVE-2024-22860 | https://security-tracker.debian.org/tracker/CVE-2024-22860 ffmpeg | CVE-2024-22861 | https://security-tracker.debian.org/tracker/CVE-2024-22861 ffmpeg | CVE-2024-22862 | https://security-tracker.debian.org/tracker/CVE-2024-22862 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 freerdp | CVE-2024-22211 | https://security-tracker.debian.org/tracker/CVE-2024-22211 ghostscript | CVE-2023-38559 | https://security-tracker.debian.org/tracker/CVE-2023-38559 ghostscript | CVE-2023-38560 | https://security-tracker.debian.org/tracker/CVE-2023-38560 ghostscript | CVE-2023-46751 | https://security-tracker.debian.org/tracker/CVE-2023-46751 giflib | CVE-2023-48161 | https://security-tracker.debian.org/tracker/CVE-2023-48161 glibc | CVE-2023-0687 | https://security-tracker.debian.org/tracker/CVE-2023-0687 glibc | CVE-2023-6246 | https://security-tracker.debian.org/tracker/CVE-2023-6246 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grpc | CVE-2023-1428 | https://security-tracker.debian.org/tracker/CVE-2023-1428 grpc | CVE-2023-32732 | https://security-tracker.debian.org/tracker/CVE-2023-32732 grpc | CVE-2023-33953 | https://security-tracker.debian.org/tracker/CVE-2023-33953 grpc | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 grpc | CVE-2023-4785 | https://security-tracker.debian.org/tracker/CVE-2023-4785 grub2 | CVE-2023-4001 | https://security-tracker.debian.org/tracker/CVE-2023-4001 grub2 | CVE-2023-4692 | https://security-tracker.debian.org/tracker/CVE-2023-4692 grub2 | CVE-2023-4693 | https://security-tracker.debian.org/tracker/CVE-2023-4693 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-0056 | https://security-tracker.debian.org/tracker/CVE-2023-0056 haproxy | CVE-2023-45539 | https://security-tracker.debian.org/tracker/CVE-2023-45539 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-5118 | https://security-tracker.debian.org/tracker/CVE-2016-5118 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 imagemagick | CVE-2023-5341 | https://security-tracker.debian.org/tracker/CVE-2023-5341 jasper | CVE-2023-51257 | https://security-tracker.debian.org/tracker/CVE-2023-51257 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kvmtool | CVE-2021-45464 | https://security-tracker.debian.org/tracker/CVE-2021-45464 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libcoap | CVE-2024-0962 | https://security-tracker.debian.org/tracker/CVE-2024-0962 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libfreeimage | CVE-2020-21426 | https://security-tracker.debian.org/tracker/CVE-2020-21426 libfreeimage | CVE-2020-21427 | https://security-tracker.debian.org/tracker/CVE-2020-21427 libfreeimage | CVE-2020-21428 | https://security-tracker.debian.org/tracker/CVE-2020-21428 libfreeimage | CVE-2021-33367 | https://security-tracker.debian.org/tracker/CVE-2021-33367 libfreeimage | CVE-2023-47992 | https://security-tracker.debian.org/tracker/CVE-2023-47992 libfreeimage | CVE-2023-47993 | https://security-tracker.debian.org/tracker/CVE-2023-47993 libfreeimage | CVE-2023-47994 | https://security-tracker.debian.org/tracker/CVE-2023-47994 libfreeimage | CVE-2023-47995 | https://security-tracker.debian.org/tracker/CVE-2023-47995 libfreeimage | CVE-2023-47996 | https://security-tracker.debian.org/tracker/CVE-2023-47996 libfreeimage | CVE-2023-47997 | https://security-tracker.debian.org/tracker/CVE-2023-47997 libgtk2 | CVE-2014-1949 | https://security-tracker.debian.org/tracker/CVE-2014-1949 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libkrb5 | CVE-2023-36054 | https://security-tracker.debian.org/tracker/CVE-2023-36054 libkrb5 | CVE-2023-39975 | https://security-tracker.debian.org/tracker/CVE-2023-39975 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2023-5678 | https://security-tracker.debian.org/tracker/CVE-2023-5678 libopenssl | CVE-2023-6129 | https://security-tracker.debian.org/tracker/CVE-2023-6129 libopenssl | CVE-2024-0727 | https://security-tracker.debian.org/tracker/CVE-2024-0727 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-22628 | https://security-tracker.debian.org/tracker/CVE-2020-22628 libraw | CVE-2023-1729 | https://security-tracker.debian.org/tracker/CVE-2023-1729 libsndfile | CVE-2022-33065 | https://security-tracker.debian.org/tracker/CVE-2022-33065 libtommath | CVE-2023-36328 | https://security-tracker.debian.org/tracker/CVE-2023-36328 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libvirt | CVE-2023-3750 | https://security-tracker.debian.org/tracker/CVE-2023-3750 libzlib | CVE-2023-45853 | https://security-tracker.debian.org/tracker/CVE-2023-45853 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzip | CVE-2023-39741 | https://security-tracker.debian.org/tracker/CVE-2023-39741 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-43666 | https://security-tracker.debian.org/tracker/CVE-2021-43666 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mbedtls | CVE-2023-52353 | https://security-tracker.debian.org/tracker/CVE-2023-52353 mbedtls | CVE-2024-23744 | https://security-tracker.debian.org/tracker/CVE-2024-23744 mdadm | CVE-2023-28736 | https://security-tracker.debian.org/tracker/CVE-2023-28736 mdadm | CVE-2023-28938 | https://security-tracker.debian.org/tracker/CVE-2023-28938 micropython | CVE-2023-7152 | https://security-tracker.debian.org/tracker/CVE-2023-7152 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mp4v2 | CVE-2023-33716 | https://security-tracker.debian.org/tracker/CVE-2023-33716 mp4v2 | CVE-2023-33717 | https://security-tracker.debian.org/tracker/CVE-2023-33717 mp4v2 | CVE-2023-33718 | https://security-tracker.debian.org/tracker/CVE-2023-33718 mp4v2 | CVE-2023-33719 | https://security-tracker.debian.org/tracker/CVE-2023-33719 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 nginx | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 ninja | CVE-2021-4336 | https://security-tracker.debian.org/tracker/CVE-2021-4336 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 opencv3 | CVE-2023-2618 | https://security-tracker.debian.org/tracker/CVE-2023-2618 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 openvmtools | CVE-2022-31693 | https://security-tracker.debian.org/tracker/CVE-2022-31693 openvmtools | CVE-2023-20867 | https://security-tracker.debian.org/tracker/CVE-2023-20867 openvmtools | CVE-2023-20900 | https://security-tracker.debian.org/tracker/CVE-2023-20900 openvmtools | CVE-2023-34057 | https://security-tracker.debian.org/tracker/CVE-2023-34057 openvmtools | CVE-2023-34058 | https://security-tracker.debian.org/tracker/CVE-2023-34058 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 oracle-mysql | CVE-2023-21977 | https://security-tracker.debian.org/tracker/CVE-2023-21977 oracle-mysql | CVE-2023-21980 | https://security-tracker.debian.org/tracker/CVE-2023-21980 oracle-mysql | CVE-2023-22007 | https://security-tracker.debian.org/tracker/CVE-2023-22007 oracle-mysql | CVE-2023-22015 | https://security-tracker.debian.org/tracker/CVE-2023-22015 oracle-mysql | CVE-2023-22026 | https://security-tracker.debian.org/tracker/CVE-2023-22026 oracle-mysql | CVE-2023-22028 | https://security-tracker.debian.org/tracker/CVE-2023-22028 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 perl | CVE-2023-31484 | https://security-tracker.debian.org/tracker/CVE-2023-31484 perl | CVE-2023-31486 | https://security-tracker.debian.org/tracker/CVE-2023-31486 perl | CVE-2023-47100 | https://security-tracker.debian.org/tracker/CVE-2023-47100 perl-lwp-protocol-https | CVE-2014-3230 | https://security-tracker.debian.org/tracker/CVE-2014-3230 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php | CVE-2022-4900 | https://security-tracker.debian.org/tracker/CVE-2022-4900 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 proftpd | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 python-cryptography | CVE-2023-49083 | https://security-tracker.debian.org/tracker/CVE-2023-49083 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-paramiko | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 python-pillow | CVE-2023-50447 | https://security-tracker.debian.org/tracker/CVE-2023-50447 python-pip | CVE-2023-5752 | https://security-tracker.debian.org/tracker/CVE-2023-5752 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pycryptodomex | CVE-2023-52323 | https://security-tracker.debian.org/tracker/CVE-2023-52323 python-sqlparse | CVE-2023-30608 | https://security-tracker.debian.org/tracker/CVE-2023-30608 python-validators | CVE-2023-45813 | https://security-tracker.debian.org/tracker/CVE-2023-45813 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2023-1386 | https://security-tracker.debian.org/tracker/CVE-2023-1386 qemu | CVE-2023-2680 | https://security-tracker.debian.org/tracker/CVE-2023-2680 qemu | CVE-2023-3019 | https://security-tracker.debian.org/tracker/CVE-2023-3019 qemu | CVE-2023-5088 | https://security-tracker.debian.org/tracker/CVE-2023-5088 qemu | CVE-2023-6683 | https://security-tracker.debian.org/tracker/CVE-2023-6683 qemu | CVE-2023-6693 | https://security-tracker.debian.org/tracker/CVE-2023-6693 qt6base | CVE-2023-32573 | https://security-tracker.debian.org/tracker/CVE-2023-32573 qt6base | CVE-2023-32762 | https://security-tracker.debian.org/tracker/CVE-2023-32762 qt6base | CVE-2023-32763 | https://security-tracker.debian.org/tracker/CVE-2023-32763 qt6base | CVE-2023-33285 | https://security-tracker.debian.org/tracker/CVE-2023-33285 qt6base | CVE-2023-34410 | https://security-tracker.debian.org/tracker/CVE-2023-34410 qt6base | CVE-2023-37369 | https://security-tracker.debian.org/tracker/CVE-2023-37369 qt6base | CVE-2023-38197 | https://security-tracker.debian.org/tracker/CVE-2023-38197 qt6base | CVE-2023-51714 | https://security-tracker.debian.org/tracker/CVE-2023-51714 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rust | CVE-2023-40030 | https://security-tracker.debian.org/tracker/CVE-2023-40030 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 samba4 | CVE-2022-37966 | https://security-tracker.debian.org/tracker/CVE-2022-37966 samba4 | CVE-2022-37967 | https://security-tracker.debian.org/tracker/CVE-2022-37967 samba4 | CVE-2022-38023 | https://security-tracker.debian.org/tracker/CVE-2022-38023 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 shadow | CVE-2013-4235 | https://security-tracker.debian.org/tracker/CVE-2013-4235 shim | CVE-2023-40547 | https://security-tracker.debian.org/tracker/CVE-2023-40547 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 snort | CVE-2023-20246 | https://security-tracker.debian.org/tracker/CVE-2023-20246 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2024-0232 | https://security-tracker.debian.org/tracker/CVE-2024-0232 sudo | CVE-2023-27320 | https://security-tracker.debian.org/tracker/CVE-2023-27320 sudo | CVE-2023-42465 | https://security-tracker.debian.org/tracker/CVE-2023-42465 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 sysstat | CVE-2023-33204 | https://security-tracker.debian.org/tracker/CVE-2023-33204 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2023-3164 | https://security-tracker.debian.org/tracker/CVE-2023-3164 tiff | CVE-2023-52355 | https://security-tracker.debian.org/tracker/CVE-2023-52355 tiff | CVE-2023-52356 | https://security-tracker.debian.org/tracker/CVE-2023-52356 tiff | CVE-2023-6228 | https://security-tracker.debian.org/tracker/CVE-2023-6228 tiff | CVE-2023-6277 | https://security-tracker.debian.org/tracker/CVE-2023-6277 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 vorbis-tools | CVE-2023-43361 | https://security-tracker.debian.org/tracker/CVE-2023-43361 webkitgtk | CVE-2023-39928 | https://security-tracker.debian.org/tracker/CVE-2023-39928 wpewebkit | CVE-2023-40397 | https://security-tracker.debian.org/tracker/CVE-2023-40397 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-40982 | https://security-tracker.debian.org/tracker/CVE-2022-40982 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xen | CVE-2022-42331 | https://security-tracker.debian.org/tracker/CVE-2022-42331 xen | CVE-2022-42332 | https://security-tracker.debian.org/tracker/CVE-2022-42332 xen | CVE-2022-42333 | https://security-tracker.debian.org/tracker/CVE-2022-42333 xen | CVE-2022-42334 | https://security-tracker.debian.org/tracker/CVE-2022-42334 xen | CVE-2022-4949 | https://security-tracker.debian.org/tracker/CVE-2022-4949 xen | CVE-2023-20588 | https://security-tracker.debian.org/tracker/CVE-2023-20588 xen | CVE-2023-34319 | https://security-tracker.debian.org/tracker/CVE-2023-34319 xen | CVE-2023-34320 | https://security-tracker.debian.org/tracker/CVE-2023-34320 xen | CVE-2023-34321 | https://security-tracker.debian.org/tracker/CVE-2023-34321 xen | CVE-2023-34322 | https://security-tracker.debian.org/tracker/CVE-2023-34322 xen | CVE-2023-34323 | https://security-tracker.debian.org/tracker/CVE-2023-34323 xen | CVE-2023-34324 | https://security-tracker.debian.org/tracker/CVE-2023-34324 xen | CVE-2023-34325 | https://security-tracker.debian.org/tracker/CVE-2023-34325 xen | CVE-2023-34326 | https://security-tracker.debian.org/tracker/CVE-2023-34326 xen | CVE-2023-34327 | https://security-tracker.debian.org/tracker/CVE-2023-34327 xen | CVE-2023-46835 | https://security-tracker.debian.org/tracker/CVE-2023-46835 xen | CVE-2023-46836 | https://security-tracker.debian.org/tracker/CVE-2023-46836 xen | CVE-2023-46837 | https://security-tracker.debian.org/tracker/CVE-2023-46837 xen | CVE-2023-4949 | https://security-tracker.debian.org/tracker/CVE-2023-4949 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xwayland | CVE-2023-6816 | https://security-tracker.debian.org/tracker/CVE-2023-6816 xwayland | CVE-2024-0408 | https://security-tracker.debian.org/tracker/CVE-2024-0408 xwayland | CVE-2024-0409 | https://security-tracker.debian.org/tracker/CVE-2024-0409 yajl | CVE-2023-33460 | https://security-tracker.debian.org/tracker/CVE-2023-33460 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 yasm | CVE-2023-30402 | https://security-tracker.debian.org/tracker/CVE-2023-30402 yasm | CVE-2023-31972 | https://security-tracker.debian.org/tracker/CVE-2023-31972 yasm | CVE-2023-31973 | https://security-tracker.debian.org/tracker/CVE-2023-31973 yasm | CVE-2023-31974 | https://security-tracker.debian.org/tracker/CVE-2023-31974 yasm | CVE-2023-31975 | https://security-tracker.debian.org/tracker/CVE-2023-31975 yasm | CVE-2023-51258 | https://security-tracker.debian.org/tracker/CVE-2023-51258 zbar | CVE-2023-40889 | https://security-tracker.debian.org/tracker/CVE-2023-40889 zbar | CVE-2023-40890 | https://security-tracker.debian.org/tracker/CVE-2023-40890 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Mon Feb 5 09:13:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 10:13:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-mpd2: bump to version 3.1.1 In-Reply-To: <20240204085128.5059-1-wiselord1983@gmail.com> References: <20240204085128.5059-1-wiselord1983@gmail.com> Message-ID: <20240205101344.7725e2ea@windsurf> Hello, On Sun, 4 Feb 2024 11:51:28 +0300 WiseLord wrote: > Signed-off-by: WiseLord Thanks a lot for your contribution! Could you clarify whether "WiseLord" is your real name? Indeed, we unfortunately cannot accept contributions submitted under pseudonyms. Thanks a lot in advance for your clarification, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 09:16:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 10:16:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjpeg: bump to version 9f In-Reply-To: <20240131204524.2098188-1-fontaine.fabrice@gmail.com> References: <20240131204524.2098188-1-fontaine.fabrice@gmail.com> Message-ID: <20240205101644.6bfbb1b4@windsurf> On Wed, 31 Jan 2024 21:45:24 +0100 Fabrice Fontaine wrote: > Update hash of README (changes not related to license) > > https://jpegclub.org/reference/reference-sources/ > > Signed-off-by: Fabrice Fontaine > --- > package/libjpeg/libjpeg.hash | 4 ++-- > package/libjpeg/libjpeg.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 09:15:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 10:15:08 +0100 Subject: [Buildroot] [git commit] package/libjpeg: bump to version 9f Message-ID: <20240205091649.4E6E286990@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c7e6a5d57b83f71f21821cd56c21e0514128a7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of README (changes not related to license) https://jpegclub.org/reference/reference-sources/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libjpeg/libjpeg.hash | 4 ++-- package/libjpeg/libjpeg.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libjpeg/libjpeg.hash b/package/libjpeg/libjpeg.hash index 1a2e82caef..5c223b4e3c 100644 --- a/package/libjpeg/libjpeg.hash +++ b/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v9e.tar.gz -sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 README +sha256 04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b jpegsrc.v9f.tar.gz +sha256 7c25493a9f64fed34d01445467341bda77bc1cdbeccbe33558659ef173fb9ff2 README diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index caf7f05f44..2eb64e83e7 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJPEG_VERSION = 9e +LIBJPEG_VERSION = 9f LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG From yann.morin.1998 at free.fr Mon Feb 5 09:21:54 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 10:21:54 +0100 Subject: [Buildroot] [git commit] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' Message-ID: <20240205092216.D710086995@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b90ef61784d314147ace4972f9bdc0cb4fcce77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS which were internally set by the haproxy Makefile. Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and and then running the program results in runtime error: $ haproxy FATAL ERROR: invalid code detected -- cannot go further, please recompile! ... To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead of CFLAGS in haproxy.mk. Signed-off-by: Yann E. MORIN --- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 63a92090f3..61a9ebebe4 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -82,7 +82,7 @@ endif define HAPROXY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) endef define HAPROXY_INSTALL_TARGET_CMDS From yann.morin.1998 at free.fr Mon Feb 5 09:25:10 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 10:25:10 +0100 Subject: [Buildroot] [PATCH v2] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' In-Reply-To: <20240204201657.33079-2-aleksandr.o.makarov@gmail.com> References: <20240204201657.33079-1-aleksandr.o.makarov@gmail.com> <20240204201657.33079-2-aleksandr.o.makarov@gmail.com> Message-ID: Aleksandr, All, On 2024-02-04 22:16 +0200, Aleksandr Makarov spake thusly: > Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS > which were internally set by the haproxy Makefile. > > Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and > and then running the program results in runtime error: > > $ haproxy > FATAL ERROR: invalid code detected -- cannot go further, please recompile! > ... > > To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead > of CFLAGS in haproxy.mk. You forgot to add your Signed-off-by line here, but I messed up and applied and pushed. /me goes fumble with his git hooks to understand why that was not caught... Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2 > - Drop patch for haproxy program Makefile, make changes to haproxy.mk instead > --- > package/haproxy/haproxy.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk > index 63a92090f3..61a9ebebe4 100644 > --- a/package/haproxy/haproxy.mk > +++ b/package/haproxy/haproxy.mk > @@ -82,7 +82,7 @@ endif > > define HAPROXY_BUILD_CMDS > $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) > + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) > endef > > define HAPROXY_INSTALL_TARGET_CMDS > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From wiselord1983 at gmail.com Mon Feb 5 09:27:55 2024 From: wiselord1983 at gmail.com (Uladzimir Bely) Date: Mon, 05 Feb 2024 12:27:55 +0300 Subject: [Buildroot] [PATCH 1/1] package/python-mpd2: bump to version 3.1.1 In-Reply-To: <20240205101344.7725e2ea@windsurf> References: <20240204085128.5059-1-wiselord1983@gmail.com> <20240205101344.7725e2ea@windsurf> Message-ID: <10609434cc80f8c547228c26bf16a04ce1f14b72.camel@gmail.com> ? ??, 05/02/2024 ? 10:13 +0100, Thomas Petazzoni ?????: > Hello, > > On Sun,? 4 Feb 2024 11:51:28 +0300 > WiseLord wrote: > > > Signed-off-by: WiseLord > > Thanks a lot for your contribution! Could you clarify whether > "WiseLord" is your real name? Indeed, we unfortunately cannot accept > contributions submitted under pseudonyms. > > Thanks a lot in advance for your clarification, > > Thomas Hello, Thomas. Sorry, the nickname was set in my .gitconfig file. I could either resend the patch with a proper username (e.g., "Uladzimir Bely "), or you are free to edit the patch on your own. Regards, Uladzimir Bely. From antoine.coutant at smile.fr Mon Feb 5 09:36:11 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 5 Feb 2024 10:36:11 +0100 Subject: [Buildroot] [PATCH 1/4] package/containerd: drop CONTAINERD_CPE_ID_VENDOR In-Reply-To: References: Message-ID: <54778c37-172e-414c-a4f2-a15f691145d3@smile.fr> On 04/02/2024 16:22, Yann E. MORIN wrote: > From: Fabrice Fontaine > > Commit 35af2bb8011ea57642777acf5613afa244d325d7 set > CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as > CONTAINERD_CPE_ID_PRODUCT will be set to the package name > (i.e. containerd) by default > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN > --- > package/containerd/containerd.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk > index 61a8472ddd..d3ca102797 100644 > --- a/package/containerd/containerd.mk > +++ b/package/containerd/containerd.mk > @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) > CONTAINERD_LICENSE = Apache-2.0 > CONTAINERD_LICENSE_FILES = LICENSE > CONTAINERD_CPE_ID_VENDOR = linuxfoundation > -CONTAINERD_CPE_ID_PRODUCT = containerd > > CONTAINERD_GOMOD = github.com/containerd/containerd > Looks good to me. Reviewed-by: Antoine Coutant Regards, Antoine Coutant. -------------- next part -------------- An HTML attachment was scrubbed... URL: From antoine.coutant at smile.fr Mon Feb 5 09:36:46 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 5 Feb 2024 10:36:46 +0100 Subject: [Buildroot] [PATCH 2/4] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT In-Reply-To: References: Message-ID: <73fc1bce-0fd8-4799-994f-6299dda87f70@smile.fr> On 04/02/2024 16:22, Yann E. MORIN wrote: > From: Fabrice Fontaine > > Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set > LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as > LIBCURL_CPE_ID_PRODUCT will be set to the package name > (i.e. libcurl) by default > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN > --- > package/libcurl/libcurl.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 3ecc587a52..83845b8e87 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ > LIBCURL_LICENSE = curl > LIBCURL_LICENSE_FILES = COPYING > LIBCURL_CPE_ID_VENDOR = haxx > -LIBCURL_CPE_ID_PRODUCT = libcurl > LIBCURL_INSTALL_STAGING = YES > > # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') Looks good to me. Reviewed-by: Antoine Coutant Regards, Antoine Coutant. -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Mon Feb 5 09:44:55 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 10:44:55 +0100 Subject: [Buildroot] [PATCH v2] configs/cubieboard1: new defconfig In-Reply-To: <20230810204844.803954-1-gero@schwaericke.email> References: <20221105194712.541286-1-gero@schwaericke.email> <20230810204844.803954-1-gero@schwaericke.email> Message-ID: <0c46f788-ff09-4506-a1dd-bde02986c438@benettiengineering.com> Hi Gero, sorry for the late reply, On 10/08/23 22:48, Gero Schw?ricke wrote: > Support for Cubieboard 1 from Cubietech. commit log lacks product URL. I'd go with: " This patch adds support for Cubietech Cubieboard1. Cubieboard1 features can be found here: http://www.cubietech.com/product-detail/cubieboard1/ " > Signed-off-by: Gero Schw?ricke > --- > Changes v1 -> v2: > - fix commit subject format > - add myself to DEVELOPERS > - add board/cubieboard1/readme.txt > - use extlinux.conf instead of boot.cmd > > DEVELOPERS | 4 +++ > board/cubietech/cubieboard1/genimage.cfg | 16 +++++++++ > board/cubietech/cubieboard1/readme.txt | 29 ++++++++++++++++ > .../boot/extlinux/extlinux.conf | 5 +++ > configs/cubieboard1_defconfig | 34 +++++++++++++++++++ > 5 files changed, 88 insertions(+) > create mode 100644 board/cubietech/cubieboard1/genimage.cfg > create mode 100644 board/cubietech/cubieboard1/readme.txt > create mode 100644 board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf > create mode 100644 configs/cubieboard1_defconfig > > -- > 2.25.1 > > diff --git a/DEVELOPERS b/DEVELOPERS > index 6ffa3ee693..82f2f8c8cd 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1137,6 +1137,10 @@ F: package/flannel/ > N: Geoffrey Ragot > F: package/python-pyyaml/ > > +N: Gero Schwaericke > +F: board/cubietech/cubieboard1/ > +F: configs/cubieboard1_defconfig > + > N: Gilles Talis > F: board/freescale/imx8mmevk/ > F: board/friendlyarm/nanopi-r2s/ > diff --git a/board/cubietech/cubieboard1/genimage.cfg b/board/cubietech/cubieboard1/genimage.cfg > new file mode 100644 > index 0000000000..92c8677545 > --- /dev/null > +++ b/board/cubietech/cubieboard1/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1016K # 1MB - 8KB > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + } > +} > diff --git a/board/cubietech/cubieboard1/readme.txt b/board/cubietech/cubieboard1/readme.txt > new file mode 100644 > index 0000000000..294b4e5eec > --- /dev/null > +++ b/board/cubietech/cubieboard1/readme.txt > @@ -0,0 +1,29 @@ > +Cubietech Cubieboard1 > +===================== > + > +Minimal configuration for the Cubietech Cubieboard1. It includes just what is > +needed to boot a bare Linux and login via serial console. > + > + > +Building > +======== > + > +Configure and build with > + > + make cubieboard1_defconfig > + make > + > + > +Flashing > +======== > + > +Flash the sdcard image onto a micro sdcard with > + > + dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync > + > + > +Running > +======= > + > +Connect a 3V3 serial interface to the serial header on the top side of the board > +(between the USB jacks and the A10 chip). Then provide power to the board. > diff --git a/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf b/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf > new file mode 100644 > index 0000000000..2fde683f38 > --- /dev/null > +++ b/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf > @@ -0,0 +1,5 @@ > +DEFAULT linux > +LABEL linux > + KERNEL /boot/zImage > + DEVICETREE /boot/sun4i-a10-cubieboard.dtb > + APPEND console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > diff --git a/configs/cubieboard1_defconfig b/configs/cubieboard1_defconfig > new file mode 100644 > index 0000000000..7ef20db669 > --- /dev/null > +++ b/configs/cubieboard1_defconfig > @@ -0,0 +1,34 @@ > +# Architecture > +BR2_arm=y > +BR2_cortex_a8=y > + > +# Toolchain options > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard" > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.9" > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-cubieboard" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_ROOTFS_OVERLAY="board/cubietech/cubieboard1/rootfs_overlay" > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard1/genimage.cfg" I've build tested successfully using utils/docker-run and the rest looks good to me so: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Mon Feb 5 09:46:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 10:46:40 +0100 Subject: [Buildroot] [git commit] packge/linux-pam: bump to version 1.6.0 Message-ID: <20240205094651.29EFA8699D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7794fa4c4e1d19a245bb0367cde94560432a2bc5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://github.com/linux-pam/linux-pam/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-examples-tty_conv-fix-build-on-musl.patch | 40 ---------------------- ...0002-Fix-build-if-crypt_r-isn-t-available.patch | 37 -------------------- package/linux-pam/linux-pam.hash | 4 +-- package/linux-pam/linux-pam.mk | 2 +- 4 files changed, 3 insertions(+), 80 deletions(-) diff --git a/package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch b/package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch deleted file mode 100644 index c1257d64da..0000000000 --- a/package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5374f677e4cae669eb9accf2449178b602e8a40a Mon Sep 17 00:00:00 2001 -From: Violet Purcell -Date: Thu, 11 May 2023 12:50:34 -0400 -Subject: [PATCH] examples/tty_conv: fix build on musl - -termio.h is the old System V version of the interface header, and is -only provided in glibc and dietlibc as far as I can tell. -This fixes it to use the POSIX termios.h instead. - -Upstream: https://github.com/linux-pam/linux-pam/commit/5374f677e4cae669eb9accf2449178b602e8a40a - -Signed-off-by: Bernd Kuhls ---- - examples/tty_conv.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/examples/tty_conv.c b/examples/tty_conv.c -index 23f0684cc..9a0e1ad99 100644 ---- a/examples/tty_conv.c -+++ b/examples/tty_conv.c -@@ -6,8 +6,9 @@ - #include - #include - #include --#include -+#include - #include -+#include - - /*************************************** - * @brief echo off/on -@@ -16,7 +17,7 @@ - ***************************************/ - static void echoOff(int fd, int off) - { -- struct termio tty; -+ struct termios tty; - if (ioctl(fd, TCGETA, &tty) < 0) - { - fprintf(stderr, "TCGETA failed: %s\n", strerror(errno)); diff --git a/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch b/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch deleted file mode 100644 index c7fdd8be36..0000000000 --- a/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b82acc21f1e2f76d4cb0c75bb4958751562039ab Mon Sep 17 00:00:00 2001 -From: Bernhard Rosenkr??nzer -Date: Wed, 7 Jun 2023 19:49:01 +0200 -Subject: [PATCH] Fix build if crypt_r isn't available -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -retval was being defined only in #ifdef HAVE_CRYPT_R, but used -unconditionally. - -Signed-off-by: Bernhard Rosenkr??nzer -Fixes: bcba17939e1b ("modules: make use of secure memory erasure") -Signed-off-by: Waldemar Brodkorb -Upstream: https://github.com/linux-pam/linux-pam/commit/b82acc21f1e2f76d4cb0c75bb4958751562039ab ---- - modules/pam_pwhistory/opasswd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c -index 479e3fc4..fc610e2f 100644 ---- a/modules/pam_pwhistory/opasswd.c -+++ b/modules/pam_pwhistory/opasswd.c -@@ -128,9 +128,9 @@ static int - compare_password(const char *newpass, const char *oldpass) - { - char *outval; -+ int retval; - #ifdef HAVE_CRYPT_R - struct crypt_data output; -- int retval; - - output.initialized = 0; - --- -2.39.2 - diff --git a/package/linux-pam/linux-pam.hash b/package/linux-pam/linux-pam.hash index 97acbd7adc..cd882715cb 100644 --- a/package/linux-pam/linux-pam.hash +++ b/package/linux-pam/linux-pam.hash @@ -1,6 +1,6 @@ # Locally computed hashes after checking signature at -# https://github.com/linux-pam/linux-pam/releases/download/v1.5.3/Linux-PAM-1.5.3.tar.xz.asc +# https://github.com/linux-pam/linux-pam/releases/download/v1.6.0/Linux-PAM-1.6.0.tar.xz.asc # signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB -sha256 7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283 Linux-PAM-1.5.3.tar.xz +sha256 fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad Linux-PAM-1.6.0.tar.xz # Locally computed sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 92d8c952ac..89a46e81df 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.5.3 +LINUX_PAM_VERSION = 1.6.0 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.xz LINUX_PAM_SITE = https://github.com/linux-pam/linux-pam/releases/download/v$(LINUX_PAM_VERSION) LINUX_PAM_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 5 09:49:24 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 10:49:24 +0100 Subject: [Buildroot] [PATCH 1/1] packge/linux-pam: bump to version 1.6.0 In-Reply-To: <20240131212724.2227850-1-fontaine.fabrice@gmail.com> References: <20240131212724.2227850-1-fontaine.fabrice@gmail.com> Message-ID: <20240205104924.7b831670@windsurf> On Wed, 31 Jan 2024 22:27:23 +0100 Fabrice Fontaine wrote: > Drop patches (already in version) > > https://github.com/linux-pam/linux-pam/releases/tag/v1.6.0 > > Signed-off-by: Fabrice Fontaine > --- > ...-examples-tty_conv-fix-build-on-musl.patch | 40 ------------------- > ...Fix-build-if-crypt_r-isn-t-available.patch | 37 ----------------- > package/linux-pam/linux-pam.hash | 4 +- > package/linux-pam/linux-pam.mk | 2 +- > 4 files changed, 3 insertions(+), 80 deletions(-) > delete mode 100644 package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch > delete mode 100644 package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 09:49:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 10:49:18 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: bump to v2.2.2 Message-ID: <20240205094953.45D55869B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00599be13ed5022bab7e49fee8db07e20af8a4ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A bunch of release notes: https://fluentbit.io/announcements/v2.1.8 https://fluentbit.io/announcements/v2.1.9 https://fluentbit.io/announcements/v2.1.10 https://fluentbit.io/announcements/v2.2.0 https://fluentbit.io/announcements/v2.2.1 https://fluentbit.io/announcements/v2.2.2 In addition: - Dropped -fcommon fix for monkey (multiple definitions of `mk_tls_*'), as this is fixed upstream [1]. - Added WAMR related patches. - Rebased the patches for v2.2.2. [1] https://github.com/monkey/monkey/commit/627422b901af5c3c5b770d02c4a4567a0a8a61e6. Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...d-use-the-system-provided-LuaJIT-if-found.patch | 12 +-- ...fka-CMakeLists.txt-allow-compilation-with.patch | 25 +++--- ...txt-disable-cxx-support-for-librdkafka-77.patch | 8 +- ...asm-restore-support-for-some-targets-8401.patch | 43 ++++++++++ ...ting-write-gs-base-with-cmake-variable-30.patch | 99 ++++++++++++++++++++++ package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 6 +- 7 files changed, 167 insertions(+), 28 deletions(-) diff --git a/package/fluent-bit/0001-build-use-the-system-provided-LuaJIT-if-found.patch b/package/fluent-bit/0001-build-use-the-system-provided-LuaJIT-if-found.patch index 9f6f4d0ebb..aca6401ac8 100644 --- a/package/fluent-bit/0001-build-use-the-system-provided-LuaJIT-if-found.patch +++ b/package/fluent-bit/0001-build-use-the-system-provided-LuaJIT-if-found.patch @@ -1,4 +1,4 @@ -From 4f8eb7bb5a39d83374806928b7a5b622136ef055 Mon Sep 17 00:00:00 2001 +From 8d6f6cfb07a8fe32dc0b9577e1b2f1ee1b67b736 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 28 Apr 2023 10:25:16 +0200 Subject: [PATCH] build: use the system provided LuaJIT if found @@ -15,10 +15,10 @@ Signed-off-by: Thomas Devoogdt 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9af783c79..0601b7c18 100644 +index 2da792d53..3229420c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -123,6 +123,7 @@ option(FLB_TESTS_INTERNAL_FUZZ "Enable internal fuzz tests" No) +@@ -128,6 +128,7 @@ option(FLB_TESTS_INTERNAL_FUZZ "Enable internal fuzz tests" No) option(FLB_TESTS_OSSFUZZ "Enable OSS-Fuzz build" No) option(FLB_MTRACE "Enable mtrace support" No) option(FLB_POSIX_TLS "Force POSIX thread storage" No) @@ -26,7 +26,7 @@ index 9af783c79..0601b7c18 100644 option(FLB_INOTIFY "Enable inotify support" Yes) option(FLB_SQLDB "Enable SQL embedded DB" Yes) option(FLB_HTTP_SERVER "Enable HTTP Server" Yes) -@@ -1003,7 +1004,16 @@ endif() +@@ -1023,7 +1024,16 @@ endif() # LuaJIT (Scripting Support) # ========================== if(FLB_LUAJIT) @@ -45,10 +45,10 @@ index 9af783c79..0601b7c18 100644 endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 06a206dd4..8b66ddd22 100644 +index b6233d9f7..67baec456 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -220,7 +220,7 @@ endif() +@@ -221,7 +221,7 @@ endif() if(FLB_LUAJIT) set(extra_libs ${extra_libs} diff --git a/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch b/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch index a315fbf7ef..bcfe3ea859 100644 --- a/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch +++ b/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch @@ -1,4 +1,4 @@ -From d5492ae7a0fa4e2c19b1d091ad28133fed53d8e2 Mon Sep 17 00:00:00 2001 +From 29be5275f6f7e15aca768e9b235998abc5a604e2 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 25 Jul 2023 09:10:41 +0200 Subject: [PATCH] lib: librdkafka: CMakeLists.txt: allow compilation without @@ -10,14 +10,14 @@ Upstream: https://github.com/confluentinc/librdkafka/pull/4366 Upstream: https://github.com/fluent/fluent-bit/pull/7765 Signed-off-by: Thomas Devoogdt --- - lib/librdkafka-2.1.0/CMakeLists.txt | 18 ++++++++++-- - lib/librdkafka-2.1.0/examples/CMakeLists.txt | 30 +++++++++++++------- - 2 files changed, 35 insertions(+), 13 deletions(-) + lib/librdkafka-2.3.0/CMakeLists.txt | 18 ++++++++++-- + lib/librdkafka-2.3.0/examples/CMakeLists.txt | 31 +++++++++++++------- + 2 files changed, 35 insertions(+), 14 deletions(-) -diff --git a/lib/librdkafka-2.1.0/CMakeLists.txt b/lib/librdkafka-2.1.0/CMakeLists.txt +diff --git a/lib/librdkafka-2.3.0/CMakeLists.txt b/lib/librdkafka-2.3.0/CMakeLists.txt index 7f3dd0fc6..c1ee93062 100644 ---- a/lib/librdkafka-2.1.0/CMakeLists.txt -+++ b/lib/librdkafka-2.1.0/CMakeLists.txt +--- a/lib/librdkafka-2.3.0/CMakeLists.txt ++++ b/lib/librdkafka-2.3.0/CMakeLists.txt @@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.2) include("packaging/cmake/parseversion.cmake") parseversion("src/rdkafka.h") @@ -57,10 +57,10 @@ index 7f3dd0fc6..c1ee93062 100644 if(RDKAFKA_BUILD_EXAMPLES) add_subdirectory(examples) -diff --git a/lib/librdkafka-2.1.0/examples/CMakeLists.txt b/lib/librdkafka-2.1.0/examples/CMakeLists.txt -index bbbb89ad9..51b8b04be 100644 ---- a/lib/librdkafka-2.1.0/examples/CMakeLists.txt -+++ b/lib/librdkafka-2.1.0/examples/CMakeLists.txt +diff --git a/lib/librdkafka-2.3.0/examples/CMakeLists.txt b/lib/librdkafka-2.3.0/examples/CMakeLists.txt +index 8c0079abe..c9336b729 100644 +--- a/lib/librdkafka-2.3.0/examples/CMakeLists.txt ++++ b/lib/librdkafka-2.3.0/examples/CMakeLists.txt @@ -5,8 +5,10 @@ endif(WIN32) add_executable(producer producer.c ${win32_sources}) target_link_libraries(producer PUBLIC rdkafka) @@ -101,12 +101,13 @@ index bbbb89ad9..51b8b04be 100644 add_executable(misc misc.c ${win32_sources}) target_link_libraries(misc PUBLIC rdkafka) -@@ -35,6 +43,8 @@ if(NOT WIN32) +@@ -70,7 +78,8 @@ if(NOT WIN32) add_executable(rdkafka_complex_consumer_example rdkafka_complex_consumer_example.c) target_link_libraries(rdkafka_complex_consumer_example PUBLIC rdkafka) - add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp) - target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++) +- + if(RDKAFKA_BUILD_CXX) + add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp) + target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++) diff --git a/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch b/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch index 0022d5929c..c96a7bdaa0 100644 --- a/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch +++ b/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch @@ -1,4 +1,4 @@ -From f5303533fb64bf038dbd8203ac52d94819346239 Mon Sep 17 00:00:00 2001 +From 7f3fc55b734db2d28af63c393b52bc238af9f20a Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 25 Jul 2023 10:00:36 +0200 Subject: [PATCH] CMakeLists.txt: disable cxx support for librdkafka #7741 @@ -6,17 +6,17 @@ Subject: [PATCH] CMakeLists.txt: disable cxx support for librdkafka #7741 Fluent-bit is c only, so no need to compile cxx. This fixes also a compile error in buildroot. -Upstream: https://github.com/fluent/fluent-bit/pull/7765/commits +Upstream: https://github.com/fluent/fluent-bit/pull/7765 Signed-off-by: Thomas Devoogdt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index df6b283cf..10e6071f3 100644 +index 3229420c6..2694f189f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -967,6 +967,7 @@ if(FLB_BACKTRACE) +@@ -979,6 +979,7 @@ if(FLB_BACKTRACE) endif() if(FLB_IN_KAFKA OR FLB_OUT_KAFKA) diff --git a/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch b/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch new file mode 100644 index 0000000000..ed6206268f --- /dev/null +++ b/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch @@ -0,0 +1,43 @@ +From 4a6c5f56cd1a979b91c168fb8e245587c2927aca Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 22 Jan 2024 19:27:56 +0100 +Subject: [PATCH] wasm: restore support for some targets (#8401) + +Somehow, support for ARC, MIPS, and XTENSA got dropped by bumping to v1.3.0, +so restore it now. Remark that those targets are mentioned in the section above. + +See commit fa6a248746f9f481b5f6aef49716141fa0222650. + +Upstream: https://github.com/fluent/fluent-bit/pull/8401 +Signed-off-by: Thomas Devoogdt +--- + src/wasm/CMakeLists.txt | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/wasm/CMakeLists.txt b/src/wasm/CMakeLists.txt +index a258dc063..4ea7eba65 100644 +--- a/src/wasm/CMakeLists.txt ++++ b/src/wasm/CMakeLists.txt +@@ -51,6 +51,10 @@ elseif (WAMR_BUILD_TARGET MATCHES "AARCH64.*") + elseif (WAMR_BUILD_TARGET MATCHES "ARM.*") + add_definitions(-DBUILD_TARGET_ARM) + add_definitions(-DBUILD_TARGET="${WAMR_BUILD_TARGET}") ++elseif (WAMR_BUILD_TARGET STREQUAL "MIPS") ++ add_definitions(-DBUILD_TARGET_MIPS) ++elseif (WAMR_BUILD_TARGET STREQUAL "XTENSA") ++ add_definitions(-DBUILD_TARGET_XTENSA) + elseif (WAMR_BUILD_TARGET STREQUAL "RISCV64" OR WAMR_BUILD_TARGET STREQUAL "RISCV64_LP64D") + add_definitions(-DBUILD_TARGET_RISCV64_LP64D) + elseif (WAMR_BUILD_TARGET STREQUAL "RISCV64_LP64") +@@ -59,6 +63,8 @@ elseif (WAMR_BUILD_TARGET STREQUAL "RISCV32" OR WAMR_BUILD_TARGET STREQUAL "RISC + add_definitions(-DBUILD_TARGET_RISCV32_ILP32D) + elseif (WAMR_BUILD_TARGET STREQUAL "RISCV32_ILP32") + add_definitions(-DBUILD_TARGET_RISCV32_ILP32) ++elseif (WAMR_BUILD_TARGET STREQUAL "ARC") ++ add_definitions(-DBUILD_TARGET_ARC) + else () + message (FATAL_ERROR "-- Build target isn't set") + endif () +-- +2.34.1 + diff --git a/package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch b/package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch new file mode 100644 index 0000000000..9cdab4c47a --- /dev/null +++ b/package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch @@ -0,0 +1,99 @@ +From 7eacb2ab839e74cb07038398def5e3cc198448d4 Mon Sep 17 00:00:00 2001 +From: Wenyong Huang +Date: Tue, 23 Jan 2024 12:21:20 +0800 +Subject: [PATCH] Enhance setting write gs base with cmake variable (#3066) + +In linux x86-64, developer can use cmake variable to configure whether +to enable writing linear memory base address to x86 GS register or not: +- `cmake -DWAMR_DISABLE_WRITE_GS_BASE=1`: disabled it +- `cmake -DWAMR_DISABLE_WRITE_GS_BASE=0`: enabled it +- `cmake` without `-DWAMR_DISABLE_WRITE_GS_BASE=1/0`: + auto-detected by the compiler + +Upstream: https://github.com/bytecodealliance/wasm-micro-runtime/pull/3066 +Signed-off-by: Thomas Devoogdt +--- + .../build-scripts/config_common.cmake | 65 ++++++++++++------- + 1 file changed, 41 insertions(+), 24 deletions(-) + +diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake b/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake +index e73ebc85f..a61a522f3 100644 +--- a/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake ++++ b/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake +@@ -408,32 +408,49 @@ if (WAMR_BUILD_STATIC_PGO EQUAL 1) + add_definitions (-DWASM_ENABLE_STATIC_PGO=1) + message (" AOT static PGO enabled") + endif () +-if (WAMR_DISABLE_WRITE_GS_BASE EQUAL 1) +- add_definitions (-DWASM_DISABLE_WRITE_GS_BASE=1) +- message (" Write linear memory base addr to x86 GS register disabled") +-elseif (WAMR_BUILD_TARGET STREQUAL "X86_64" +- AND WAMR_BUILD_PLATFORM STREQUAL "linux") +- set (TEST_WRGSBASE_SOURCE "${CMAKE_BINARY_DIR}/test_wrgsbase.c") +- file (WRITE "${TEST_WRGSBASE_SOURCE}" " +- #include +- #include +- int main() { +- uint64_t value; +- asm volatile (\"wrgsbase %0\" : : \"r\"(value)); +- printf(\"WRGSBASE instruction is available.\\n\"); +- return 0; +- }") +- # Try to compile and run the test program +- try_run (TEST_WRGSBASE_RESULT +- TEST_WRGSBASE_COMPILED +- ${CMAKE_BINARY_DIR}/test_wrgsbase +- SOURCES ${TEST_WRGSBASE_SOURCE} +- CMAKE_FLAGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} +- ) +- #message("${TEST_WRGSBASE_COMPILED}, ${TEST_WRGSBASE_RESULT}") +- if (NOT TEST_WRGSBASE_RESULT EQUAL 0) ++if (WAMR_BUILD_TARGET STREQUAL "X86_64" ++ AND WAMR_BUILD_PLATFORM STREQUAL "linux") ++ if (WAMR_DISABLE_WRITE_GS_BASE EQUAL 1) ++ # disabled by user ++ set (DISABLE_WRITE_GS_BASE 1) ++ elseif (WAMR_DISABLE_WRITE_GS_BASE EQUAL 0) ++ # enabled by user ++ set (DISABLE_WRITE_GS_BASE 0) ++ elseif (CMAKE_CROSSCOMPILING) ++ # disabled in cross compilation environment ++ set (DISABLE_WRITE_GS_BASE 1) ++ else () ++ # auto-detected by the compiler ++ set (TEST_WRGSBASE_SOURCE "${CMAKE_BINARY_DIR}/test_wrgsbase.c") ++ file (WRITE "${TEST_WRGSBASE_SOURCE}" " ++ #include ++ #include ++ int main() { ++ uint64_t value; ++ asm volatile (\"wrgsbase %0\" : : \"r\"(value)); ++ printf(\"WRGSBASE instruction is available.\\n\"); ++ return 0; ++ }") ++ # Try to compile and run the test program ++ try_run (TEST_WRGSBASE_RESULT ++ TEST_WRGSBASE_COMPILED ++ ${CMAKE_BINARY_DIR}/test_wrgsbase ++ SOURCES ${TEST_WRGSBASE_SOURCE} ++ CMAKE_FLAGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} ++ ) ++ #message("${TEST_WRGSBASE_COMPILED}, ${TEST_WRGSBASE_RESULT}") ++ if (TEST_WRGSBASE_RESULT EQUAL 0) ++ set (DISABLE_WRITE_GS_BASE 0) ++ else () ++ set (DISABLE_WRITE_GS_BASE 1) ++ endif () ++ endif () ++ if (DISABLE_WRITE_GS_BASE EQUAL 1) + add_definitions (-DWASM_DISABLE_WRITE_GS_BASE=1) + message (" Write linear memory base addr to x86 GS register disabled") ++ else () ++ add_definitions (-DWASM_DISABLE_WRITE_GS_BASE=0) ++ message (" Write linear memory base addr to x86 GS register enabled") + endif () + endif () + if (WAMR_CONFIGUABLE_BOUNDS_CHECKS EQUAL 1) +-- +2.34.1 + diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index 7e2059109a..2c34583f7a 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed80291d660be19f8458d81796c7d3f7e8735eb48ec393467a0c9deca2e9abc3 fluent-bit-2.1.7.tar.gz +sha256 8e7e951b2907e9d29508699c71c8949a4a22d750d54ffa5ee5b96537e59371dd fluent-bit-2.2.2.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 1185860661..e51322aad6 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.1.7 +FLUENT_BIT_VERSION = 2.2.2 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE @@ -55,10 +55,6 @@ FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_INSTALL_SYSCONFDIR="/etc/" -# Fix multiple definition of `mk_tls_*'. -# https://github.com/fluent/fluent-bit/issues/5537 -FLUENT_BIT_CFLAGS += -fcommon - # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. # https://bugzilla.redhat.com/show_bug.cgi?id=574992 From peter at korsgaard.com Mon Feb 5 09:50:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 10:50:54 +0100 Subject: [Buildroot] [PATCH v1] package/fluent-bit: bump to v2.2.2 In-Reply-To: <20240123091317.293492-1-thomas@devoogdt.com> (Thomas Devoogdt's message of "Tue, 23 Jan 2024 10:13:17 +0100") References: <20240123091317.293492-1-thomas@devoogdt.com> Message-ID: <877cjjw875.fsf@48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > A bunch of release notes: > https://fluentbit.io/announcements/v2.1.8 > https://fluentbit.io/announcements/v2.1.9 > https://fluentbit.io/announcements/v2.1.10 > https://fluentbit.io/announcements/v2.2.0 > https://fluentbit.io/announcements/v2.2.1 > https://fluentbit.io/announcements/v2.2.2 > In addition: > - Dropped -fcommon fix for monkey (multiple definitions of `mk_tls_*'), > as this is fixed upstream [1]. > - Added WAMR related patches. > - Rebased the patches for v2.2.2. > [1] https://github.com/monkey/monkey/commit/627422b901af5c3c5b770d02c4a4567a0a8a61e6. > Signed-off-by: Thomas Devoogdt Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 5 09:52:31 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 10:52:31 +0100 Subject: [Buildroot] [git commit] package/libblockdev: bump to version 3.1.0 Message-ID: <20240205095256.ED2AA869CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6410ac6918add0070716dbcf61327457a676e4fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master * Rework strerror_l() patch by declaring it only in utils.h as a macro * select BR2_PACKAGE_UTIL_LINUX_LIBUUID since it's now mandatory Signed-off-by: Giulio Benetti [Arnout: - Preserve author of patch 0001. - Update .checkpackageignore. ] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - ...ovide-replacement-function-for-strerror_l.patch | 158 ++++----------------- package/libblockdev/Config.in | 5 +- package/libblockdev/libblockdev.hash | 2 +- package/libblockdev/libblockdev.mk | 2 +- 5 files changed, 34 insertions(+), 134 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index a95aaf262c..15ceb65fd8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -594,7 +594,6 @@ package/libatasmart/0001-strpool-cross-flags.patch Upstream package/libavl/0001-fix-makefile.patch Upstream package/libb64/0001-Integer-overflows.patch Upstream package/libb64/0002-Initialize-C++-objects.patch Upstream -package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch Upstream package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch Upstream package/libcec/0001-cecloader-h-fix-null-return.patch Upstream package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch Upstream diff --git a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch index 987d28f82e..f7f75c9c14 100644 --- a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch +++ b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch @@ -1,29 +1,25 @@ -From 2acf5a8d4858035396ee45d96c824e0481644d36 Mon Sep 17 00:00:00 2001 +From 01883cc14904e55d90955ad7cd9fc55bc18364ac Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni -Date: Sat, 29 Aug 2020 16:04:15 +0200 +Date: Sat, 20 Jan 2024 13:29:28 +0100 Subject: [PATCH] Provide replacement function for strerror_l() strerror_l() is not implemented in some C libraries, such as uClibc, -so let's provide a simple replacement function that falls back on -strerror(). +so let's provide a simple replacement define that falls back on +strerror() in utils.h header and include it where missing. -Upstream status: Not Applicable since it's due uclibc only +Upstream: N/A since it's due uclibc only Signed-off-by: Thomas Petazzoni Signed-off-by: Giulio Benetti -[Giulio: ported to version 3.0+] +[Giulio: ported to version 3.0 and 3.1] --- - configure.ac | 2 ++ - src/plugins/crypto.c | 7 +++++++ - src/plugins/nvme/nvme-error.c | 8 ++++++++ - src/plugins/nvme/nvme-fabrics.c | 8 ++++++++ - src/plugins/nvme/nvme-op.c | 8 ++++++++ - src/plugins/part.c | 9 +++++++++ - src/utils/module.c | 8 +++++++- - 7 files changed, 49 insertions(+), 1 deletion(-) + configure.ac | 2 ++ + src/utils/module.c | 1 + + src/utils/utils.h | 4 ++++ + 3 files changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac -index 0a8ce4a7..dfbddb39 100644 +index 02b26e3e..67341134 100644 --- a/configure.ac +++ b/configure.ac @@ -120,6 +120,8 @@ AC_CHECK_HEADERS([dlfcn.h string.h unistd.h sys/fcntl.h sys/ioctl.h linux/random @@ -35,127 +31,33 @@ index 0a8ce4a7..dfbddb39 100644 AC_ARG_WITH([escrow], AS_HELP_STRING([--with-escrow], [support escrow @<:@default=yes@:>@]), [], -diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c -index c5f719ca..b2ae3f56 100644 ---- a/src/plugins/crypto.c -+++ b/src/plugins/crypto.c -@@ -62,6 +62,13 @@ - - #define UNUSED __attribute__((unused)) - -+#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} -+#endif -+ - /** - * SECTION: crypto - * @short_description: plugin for operations with encrypted devices -diff --git a/src/plugins/nvme/nvme-error.c b/src/plugins/nvme/nvme-error.c -index 4bd4d771..618b6aef 100644 ---- a/src/plugins/nvme/nvme-error.c -+++ b/src/plugins/nvme/nvme-error.c -@@ -34,6 +34,14 @@ - #include "nvme.h" - #include "nvme-private.h" - -+#define UNUSED __attribute__((unused)) -+ -+#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} -+#endif - - /** - * bd_nvme_error_quark: (skip) -diff --git a/src/plugins/nvme/nvme-fabrics.c b/src/plugins/nvme/nvme-fabrics.c -index 1877845f..5fcbeddc 100644 ---- a/src/plugins/nvme/nvme-fabrics.c -+++ b/src/plugins/nvme/nvme-fabrics.c -@@ -36,6 +36,14 @@ - #include "nvme.h" - #include "nvme-private.h" - -+#define UNUSED __attribute__((unused)) -+ -+#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} -+#endif - - /* nvme-cli defaults */ - #define PATH_NVMF_CONFIG "/etc/nvme/config.json" -diff --git a/src/plugins/nvme/nvme-op.c b/src/plugins/nvme/nvme-op.c -index dbef4f3a..7bafd7a3 100644 ---- a/src/plugins/nvme/nvme-op.c -+++ b/src/plugins/nvme/nvme-op.c -@@ -35,6 +35,14 @@ - #include "nvme.h" - #include "nvme-private.h" - -+#define UNUSED __attribute__((unused)) -+ -+#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} -+#endif - - /** - * bd_nvme_device_self_test: -diff --git a/src/plugins/part.c b/src/plugins/part.c -index 46d31137..6234e013 100644 ---- a/src/plugins/part.c -+++ b/src/plugins/part.c -@@ -26,6 +26,15 @@ - - #include "part.h" - -+#define UNUSED __attribute__((unused)) -+ -+#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} -+#endif -+ - /** - * SECTION: part - * @short_description: plugin for operations with partition tables diff --git a/src/utils/module.c b/src/utils/module.c -index 6557c3ab..69dd4731 100644 +index 6557c3ab..5893f0ac 100644 --- a/src/utils/module.c +++ b/src/utils/module.c -@@ -74,6 +74,13 @@ static void set_kmod_logging (struct kmod_ctx *ctx) { - kmod_set_log_fn (ctx, utils_kmod_log_redirect, NULL); - } +@@ -28,6 +28,7 @@ + #include "module.h" + #include "exec.h" + #include "logging.h" ++#include "utils.h" + + #define UNUSED __attribute__((unused)) + +diff --git a/src/utils/utils.h b/src/utils/utils.h +index 801a8b6e..b2bdf0d0 100644 +--- a/src/utils/utils.h ++++ b/src/utils/utils.h +@@ -9,6 +9,10 @@ + #include "dbus.h" + #include "logging.h" +#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} ++#define strerror_l(errnum, locale) strerror(errnum) +#endif + /** - * bd_utils_have_kernel_module: - * @module_name: name of the kernel module to check -@@ -259,7 +266,6 @@ gboolean bd_utils_unload_kernel_module (const gchar *module_name, GError **error - return TRUE; - } - -- - static BDUtilsLinuxVersion detected_linux_ver; - static gboolean have_linux_ver = FALSE; - + * SECTION: utils + * @short_description: library providing utility functions used by the blockdev library and its plugins -- 2.34.1 diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 527ba79e4e..e0449628b4 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_LIBBLOCKDEV depends on BR2_ENABLE_LOCALE select BR2_PACKAGE_KMOD select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help libblockdev is a C library supporting GObject introspection for manipulation of block devices. It has a plugin-based @@ -30,7 +32,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO config BR2_PACKAGE_LIBBLOCKDEV_FS bool "filesystem" depends on BR2_ENABLE_LOCALE # parted - select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_PARTED select BR2_PACKAGE_E2FSPROGS @@ -62,7 +63,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_PART bool "part" depends on BR2_ENABLE_LOCALE # parted select BR2_PACKAGE_PARTED - select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBFDISK comment "part plugin needs a toolchain w/ locale" @@ -70,7 +70,6 @@ comment "part plugin needs a toolchain w/ locale" config BR2_PACKAGE_LIBBLOCKDEV_SWAP bool "swap" - select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID endif diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash index 5f9a8a7e6c..79700a4996 100644 --- a/package/libblockdev/libblockdev.hash +++ b/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 49841ff92db0ab032931e6f2b5eab63e5969b0ddc14b067b60e46a6eb6c60e47 libblockdev-3.0.4.tar.gz +sha256 41e4af66c9d78e795302d37825dfd88a4970f82da7b4ebe6487feba2afae44fb libblockdev-3.1.0.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index e0fca2b95c..ebf01acfb5 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 3.0.4 +LIBBLOCKDEV_VERSION = 3.1.0 LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 09:54:29 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 10:54:29 +0100 Subject: [Buildroot] [PATCH v2] package/libblockdev: bump to version 3.1.0 In-Reply-To: <20240122160949.4052959-1-giulio.benetti@benettiengineering.com> References: <20240122160949.4052959-1-giulio.benetti@benettiengineering.com> Message-ID: On 22/01/2024 17:09, Giulio Benetti wrote: > * Rework strerror_l() patch by declaring it only in utils.h as a macro > * select BR2_PACKAGE_UTIL_LINUX_LIBUUID since it's now mandatory > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * reworked local strerror_l() patch as a macro to avoid adding a second patch > * selected BR2_PACKAGE_UTIL_LINUX_LIBUUID by default > --- > ...-replacement-function-for-strerror_l.patch | 160 ++++-------------- > package/libblockdev/Config.in | 5 +- > package/libblockdev/libblockdev.hash | 2 +- > package/libblockdev/libblockdev.mk | 2 +- > 4 files changed, 35 insertions(+), 134 deletions(-) > > diff --git a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch > index 987d28f82e..e5819a4e9c 100644 > --- a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch > +++ b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch > @@ -1,29 +1,25 @@ > -From 2acf5a8d4858035396ee45d96c824e0481644d36 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Sat, 29 Aug 2020 16:04:15 +0200 > +From 01883cc14904e55d90955ad7cd9fc55bc18364ac Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti You really should have kept Thomas as the author. > +Date: Sat, 20 Jan 2024 13:29:28 +0100 > Subject: [PATCH] Provide replacement function for strerror_l() > > strerror_l() is not implemented in some C libraries, such as uClibc, > -so let's provide a simple replacement function that falls back on > -strerror(). > +so let's provide a simple replacement define that falls back on > +strerror() in utils.h header and include it where missing. > > -Upstream status: Not Applicable since it's due uclibc only > +Upstream: N/A since it's due uclibc only This fixes check-package, so it must be removed from .checkpackageignore. Applied to master with those two fixed, thanks. Regards, Arnout > > Signed-off-by: Thomas Petazzoni > Signed-off-by: Giulio Benetti > -[Giulio: ported to version 3.0+] > +[Giulio: ported to version 3.0 and 3.1] > --- > - configure.ac | 2 ++ > - src/plugins/crypto.c | 7 +++++++ > - src/plugins/nvme/nvme-error.c | 8 ++++++++ > - src/plugins/nvme/nvme-fabrics.c | 8 ++++++++ > - src/plugins/nvme/nvme-op.c | 8 ++++++++ > - src/plugins/part.c | 9 +++++++++ > - src/utils/module.c | 8 +++++++- > - 7 files changed, 49 insertions(+), 1 deletion(-) > + configure.ac | 2 ++ > + src/utils/module.c | 1 + > + src/utils/utils.h | 4 ++++ > + 3 files changed, 7 insertions(+) > > diff --git a/configure.ac b/configure.ac > -index 0a8ce4a7..dfbddb39 100644 > +index 02b26e3e..67341134 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -120,6 +120,8 @@ AC_CHECK_HEADERS([dlfcn.h string.h unistd.h sys/fcntl.h sys/ioctl.h linux/random > @@ -35,127 +31,33 @@ index 0a8ce4a7..dfbddb39 100644 > AC_ARG_WITH([escrow], > AS_HELP_STRING([--with-escrow], [support escrow @<:@default=yes@:>@]), > [], > -diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c > -index c5f719ca..b2ae3f56 100644 > ---- a/src/plugins/crypto.c > -+++ b/src/plugins/crypto.c > -@@ -62,6 +62,13 @@ > - > - #define UNUSED __attribute__((unused)) > - > -+#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > -+#endif > -+ > - /** > - * SECTION: crypto > - * @short_description: plugin for operations with encrypted devices > -diff --git a/src/plugins/nvme/nvme-error.c b/src/plugins/nvme/nvme-error.c > -index 4bd4d771..618b6aef 100644 > ---- a/src/plugins/nvme/nvme-error.c > -+++ b/src/plugins/nvme/nvme-error.c > -@@ -34,6 +34,14 @@ > - #include "nvme.h" > - #include "nvme-private.h" > - > -+#define UNUSED __attribute__((unused)) > -+ > -+#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > -+#endif > - > - /** > - * bd_nvme_error_quark: (skip) > -diff --git a/src/plugins/nvme/nvme-fabrics.c b/src/plugins/nvme/nvme-fabrics.c > -index 1877845f..5fcbeddc 100644 > ---- a/src/plugins/nvme/nvme-fabrics.c > -+++ b/src/plugins/nvme/nvme-fabrics.c > -@@ -36,6 +36,14 @@ > - #include "nvme.h" > - #include "nvme-private.h" > - > -+#define UNUSED __attribute__((unused)) > -+ > -+#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > -+#endif > - > - /* nvme-cli defaults */ > - #define PATH_NVMF_CONFIG "/etc/nvme/config.json" > -diff --git a/src/plugins/nvme/nvme-op.c b/src/plugins/nvme/nvme-op.c > -index dbef4f3a..7bafd7a3 100644 > ---- a/src/plugins/nvme/nvme-op.c > -+++ b/src/plugins/nvme/nvme-op.c > -@@ -35,6 +35,14 @@ > - #include "nvme.h" > - #include "nvme-private.h" > - > -+#define UNUSED __attribute__((unused)) > -+ > -+#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > -+#endif > - > - /** > - * bd_nvme_device_self_test: > -diff --git a/src/plugins/part.c b/src/plugins/part.c > -index 46d31137..6234e013 100644 > ---- a/src/plugins/part.c > -+++ b/src/plugins/part.c > -@@ -26,6 +26,15 @@ > - > - #include "part.h" > - > -+#define UNUSED __attribute__((unused)) > -+ > -+#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > -+#endif > -+ > - /** > - * SECTION: part > - * @short_description: plugin for operations with partition tables > diff --git a/src/utils/module.c b/src/utils/module.c > -index 6557c3ab..69dd4731 100644 > +index 6557c3ab..5893f0ac 100644 > --- a/src/utils/module.c > +++ b/src/utils/module.c > -@@ -74,6 +74,13 @@ static void set_kmod_logging (struct kmod_ctx *ctx) { > - kmod_set_log_fn (ctx, utils_kmod_log_redirect, NULL); > - } > +@@ -28,6 +28,7 @@ > + #include "module.h" > + #include "exec.h" > + #include "logging.h" > ++#include "utils.h" > + > + #define UNUSED __attribute__((unused)) > + > +diff --git a/src/utils/utils.h b/src/utils/utils.h > +index 801a8b6e..b2bdf0d0 100644 > +--- a/src/utils/utils.h > ++++ b/src/utils/utils.h > +@@ -9,6 +9,10 @@ > + #include "dbus.h" > + #include "logging.h" > > +#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > ++#define strerror_l(errnum, locale) strerror(errnum) > +#endif > + > /** > - * bd_utils_have_kernel_module: > - * @module_name: name of the kernel module to check > -@@ -259,7 +266,6 @@ gboolean bd_utils_unload_kernel_module (const gchar *module_name, GError **error > - return TRUE; > - } > - > -- > - static BDUtilsLinuxVersion detected_linux_ver; > - static gboolean have_linux_ver = FALSE; > - > + * SECTION: utils > + * @short_description: library providing utility functions used by the blockdev library and its plugins > -- > 2.34.1 > > diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in > index 527ba79e4e..e0449628b4 100644 > --- a/package/libblockdev/Config.in > +++ b/package/libblockdev/Config.in > @@ -8,6 +8,8 @@ config BR2_PACKAGE_LIBBLOCKDEV > depends on BR2_ENABLE_LOCALE > select BR2_PACKAGE_KMOD > select BR2_PACKAGE_LIBGLIB2 > + select BR2_PACKAGE_UTIL_LINUX > + select BR2_PACKAGE_UTIL_LINUX_LIBUUID > help > libblockdev is a C library supporting GObject introspection > for manipulation of block devices. It has a plugin-based > @@ -30,7 +32,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO > config BR2_PACKAGE_LIBBLOCKDEV_FS > bool "filesystem" > depends on BR2_ENABLE_LOCALE # parted > - select BR2_PACKAGE_UTIL_LINUX > select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT > select BR2_PACKAGE_PARTED > select BR2_PACKAGE_E2FSPROGS > @@ -62,7 +63,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_PART > bool "part" > depends on BR2_ENABLE_LOCALE # parted > select BR2_PACKAGE_PARTED > - select BR2_PACKAGE_UTIL_LINUX > select BR2_PACKAGE_UTIL_LINUX_LIBFDISK > > comment "part plugin needs a toolchain w/ locale" > @@ -70,7 +70,6 @@ comment "part plugin needs a toolchain w/ locale" > > config BR2_PACKAGE_LIBBLOCKDEV_SWAP > bool "swap" > - select BR2_PACKAGE_UTIL_LINUX > select BR2_PACKAGE_UTIL_LINUX_LIBBLKID > > endif > diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash > index 5f9a8a7e6c..79700a4996 100644 > --- a/package/libblockdev/libblockdev.hash > +++ b/package/libblockdev/libblockdev.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 49841ff92db0ab032931e6f2b5eab63e5969b0ddc14b067b60e46a6eb6c60e47 libblockdev-3.0.4.tar.gz > +sha256 41e4af66c9d78e795302d37825dfd88a4970f82da7b4ebe6487feba2afae44fb libblockdev-3.1.0.tar.gz > sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE > diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk > index e0fca2b95c..ebf01acfb5 100644 > --- a/package/libblockdev/libblockdev.mk > +++ b/package/libblockdev/libblockdev.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBLOCKDEV_VERSION = 3.0.4 > +LIBBLOCKDEV_VERSION = 3.1.0 > LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 > LIBBLOCKDEV_LICENSE = LGPL-2.1 > LIBBLOCKDEV_LICENSE_FILES = LICENSE From giulio.benetti at benettiengineering.com Mon Feb 5 10:00:55 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 11:00:55 +0100 Subject: [Buildroot] [PATCH v4 1/1] configs/mangopi_mangopi_mq_d1s: new defconfig In-Reply-To: <20230907200013.11620-1-indrek.kruusa@gmail.com> References: <20230907200013.11620-1-indrek.kruusa@gmail.com> Message-ID: <57cacd5b-aa2c-4199-b1d0-1de38b5ffd27@benettiengineering.com> Hi Indrek, sorry for the late reply, On 07/09/23 22:00, Indrek Kruusa wrote: Here we need a commit log, something like: " Add support for MangoPi MQ1RW: https://mangopi.org/mqr An Allwinner D1S(1xRISCV C906 R1S0 + 64MB DDR2-1066 embedded) based SBC with: * USB-OTG Type-C socket * USB-HOST Type-C socket * 2x 18 pin GPIO headers * TF card slot * RTL8723DS WiFi module with ext. antenna connector * 40 pin RGB FPC connector * 6 pin CTP FPC connector * 24 pin DVP FPC connector * onboard mic * onboard audio amplifier * FEL,reset button " > Signed-off-by: Indrek Kruusa > --- > Changes v3 -> v4: > - fixed whitespace errors in readme.txt > - linux kernel bump to 6.4.14 > > Changes v2 -> v3: > - resend without line wrapping > > Changes v1 -> v2: > - using "mangopi" as a vendor string, so creating the boards/mangopi/ folder > - renaming board's config accordingly > - updating DEVELOPERS' entry > - updating readme.txt > - using custom defconfig for linux kernel instead of linux.fragment > - linux kernel version bump to 6.4.11 > - renaming custom uboot config file to uboot.config > - custom uboot version points to a certain commit now > > board/mangopi/mangopi-mq-d1s/genimage.cfg | 20 ++ > board/mangopi/mangopi-mq-d1s/linux.config | 226 ++++++++++++++++++ > .../overlay/boot/extlinux/extlinux.conf | 4 + > .../overlay/etc/network/interfaces | 6 + > .../overlay/etc/wpa_supplicant.conf | 8 + > board/mangopi/mangopi-mq-d1s/readme.txt | 48 ++++ > board/mangopi/mangopi-mq-d1s/uboot.config | 10 + > configs/mangopi_mangopi_mq_d1s_defconfig | 47 ++++ > 8 files changed, 369 insertions(+) > create mode 100644 board/mangopi/mangopi-mq-d1s/genimage.cfg > create mode 100644 board/mangopi/mangopi-mq-d1s/linux.config > create mode 100644 board/mangopi/mangopi-mq-d1s/overlay/boot/extlinux/extlinux.conf > create mode 100644 board/mangopi/mangopi-mq-d1s/overlay/etc/network/interfaces > create mode 100644 board/mangopi/mangopi-mq-d1s/overlay/etc/wpa_supplicant.conf > create mode 100644 board/mangopi/mangopi-mq-d1s/readme.txt > create mode 100644 board/mangopi/mangopi-mq-d1s/uboot.config > create mode 100644 configs/mangopi_mangopi_mq_d1s_defconfig > > diff --git a/board/mangopi/mangopi-mq-d1s/genimage.cfg b/board/mangopi/mangopi-mq-d1s/genimage.cfg > new file mode 100644 > index 0000000000..3acf78a3ab > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/genimage.cfg > @@ -0,0 +1,20 @@ > +# Minimal SD card image for the MangoPi MQ F133 D1s > +# https://mangopi.org/mangopi_mq > + > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + bootable = "true" > + offset = 1M > + } > +} > diff --git a/board/mangopi/mangopi-mq-d1s/linux.config b/board/mangopi/mangopi-mq-d1s/linux.config > new file mode 100644 > index 0000000000..8bdf6134e4 > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/linux.config > @@ -0,0 +1,226 @@ > +CONFIG_SYSVIPC=y > +CONFIG_POSIX_MQUEUE=y > +CONFIG_NO_HZ_IDLE=y > +CONFIG_HIGH_RES_TIMERS=y > +CONFIG_BPF_SYSCALL=y > +CONFIG_PREEMPT=y > +CONFIG_IKCONFIG=y > +CONFIG_IKCONFIG_PROC=y > +CONFIG_CGROUPS=y > +CONFIG_MEMCG=y > +CONFIG_CGROUP_SCHED=y > +CONFIG_CFS_BANDWIDTH=y > +CONFIG_RT_GROUP_SCHED=y > +CONFIG_CGROUP_PIDS=y > +CONFIG_CGROUP_FREEZER=y > +CONFIG_CGROUP_DEVICE=y > +CONFIG_CGROUP_CPUACCT=y > +CONFIG_CGROUP_BPF=y > +CONFIG_NAMESPACES=y > +CONFIG_USER_NS=y > +CONFIG_EXPERT=y > +# CONFIG_SYSFS_SYSCALL is not set > +CONFIG_PERF_EVENTS=y > +CONFIG_ARCH_SUNXI=y > +CONFIG_NONPORTABLE=y > +# CONFIG_EFI is not set > +CONFIG_PM=y > +CONFIG_CPU_IDLE=y > +CONFIG_RISCV_SBI_CPUIDLE=y > +CONFIG_JUMP_LABEL=y > +# CONFIG_STACKPROTECTOR is not set > +# CONFIG_GCC_PLUGINS is not set > +CONFIG_MODULES=y > +CONFIG_MODULE_UNLOAD=y > +# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set > +# CONFIG_BLK_DEBUG_FS is not set > +# CONFIG_MQ_IOSCHED_DEADLINE is not set > +# CONFIG_MQ_IOSCHED_KYBER is not set > +# CONFIG_IOSCHED_BFQ is not set > +# CONFIG_SWAP is not set > +CONFIG_PAGE_REPORTING=y > +CONFIG_NET=y > +CONFIG_PACKET=y > +CONFIG_UNIX=y > +CONFIG_XFRM_USER=m > +CONFIG_INET=y > +CONFIG_IP_MULTICAST=y > +CONFIG_IP_ADVANCED_ROUTER=y > +CONFIG_IP_PNP=y > +CONFIG_IP_PNP_DHCP=y > +CONFIG_IP_PNP_BOOTP=y > +CONFIG_IP_PNP_RARP=y > +CONFIG_INET_ESP=m > +CONFIG_NETFILTER=y > +CONFIG_BRIDGE_NETFILTER=m > +CONFIG_NF_CONNTRACK=m > +CONFIG_NF_CONNTRACK_FTP=m > +CONFIG_NF_CONNTRACK_TFTP=m > +CONFIG_NETFILTER_XT_MARK=m > +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m > +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m > +CONFIG_NETFILTER_XT_MATCH_IPVS=m > +CONFIG_IP_VS=m > +CONFIG_IP_VS_PROTO_TCP=y > +CONFIG_IP_VS_PROTO_UDP=y > +CONFIG_IP_VS_RR=m > +CONFIG_IP_VS_NFCT=y > +CONFIG_NF_LOG_ARP=m > +CONFIG_NF_LOG_IPV4=m > +CONFIG_IP_NF_IPTABLES=m > +CONFIG_IP_NF_FILTER=m > +CONFIG_IP_NF_TARGET_REJECT=m > +CONFIG_IP_NF_NAT=m > +CONFIG_IP_NF_TARGET_MASQUERADE=m > +CONFIG_IP_NF_TARGET_REDIRECT=m > +CONFIG_IP_NF_MANGLE=m > +CONFIG_NF_LOG_IPV6=m > +CONFIG_IP6_NF_IPTABLES=m > +CONFIG_IP6_NF_MATCH_IPV6HEADER=m > +CONFIG_IP6_NF_FILTER=m > +CONFIG_IP6_NF_TARGET_REJECT=m > +CONFIG_IP6_NF_MANGLE=m > +CONFIG_BRIDGE=m > +CONFIG_BRIDGE_VLAN_FILTERING=y > +CONFIG_VLAN_8021Q=m > +CONFIG_NET_SCHED=y > +CONFIG_NET_CLS_CGROUP=m > +CONFIG_NETLINK_DIAG=y > +CONFIG_CGROUP_NET_PRIO=y > +CONFIG_CFG80211=y > +CONFIG_MAC80211=y > +CONFIG_PCI=y > +CONFIG_PCIEPORTBUS=y > +CONFIG_PCI_HOST_GENERIC=y > +CONFIG_PCIE_XILINX=y > +CONFIG_DEVTMPFS=y > +CONFIG_DEVTMPFS_MOUNT=y > +CONFIG_SUN50I_DE2_BUS=y > +CONFIG_SUNXI_RSB=y > +CONFIG_BLK_DEV_LOOP=y > +CONFIG_NETDEVICES=y > +CONFIG_DUMMY=m > +CONFIG_MACVLAN=m > +CONFIG_IPVLAN=m > +CONFIG_VXLAN=m > +CONFIG_VETH=m > +CONFIG_VIRTIO_NET=y > +# CONFIG_ETHERNET is not set > +CONFIG_MDIO_DEVICE=y > +# CONFIG_USB_NET_DRIVERS is not set > +# CONFIG_WLAN is not set > +CONFIG_INPUT_MOUSEDEV=y > +CONFIG_KEYBOARD_SUN4I_LRADC=m > +# CONFIG_LEGACY_PTYS is not set > +# CONFIG_LEGACY_TIOCSTI is not set > +CONFIG_SERIAL_8250=y > +CONFIG_SERIAL_8250_CONSOLE=y > +# CONFIG_SERIAL_8250_PCI is not set > +CONFIG_SERIAL_8250_DW=y > +CONFIG_SERIAL_OF_PLATFORM=y > +CONFIG_VIRTIO_CONSOLE=y > +CONFIG_HW_RANDOM=y > +CONFIG_HW_RANDOM_VIRTIO=y > +CONFIG_I2C_MV64XXX=m > +CONFIG_PINCTRL=y > +CONFIG_GPIO_GENERIC_PLATFORM=y > +CONFIG_POWER_RESET=y > +CONFIG_POWER_RESET_SYSCON=y > +CONFIG_POWER_RESET_SYSCON_POWEROFF=y > +CONFIG_POWER_SUPPLY=y > +CONFIG_WATCHDOG=y > +CONFIG_SUNXI_WATCHDOG=y > +CONFIG_REGULATOR=y > +CONFIG_REGULATOR_FIXED_VOLTAGE=y > +CONFIG_DRM=m > +CONFIG_DRM_I2C_CH7006=m > +CONFIG_DRM_I2C_SIL164=m > +CONFIG_DRM_SUN4I=m > +CONFIG_FB=y > +CONFIG_BACKLIGHT_CLASS_DEVICE=m > +CONFIG_FRAMEBUFFER_CONSOLE=y > +CONFIG_USB=y > +CONFIG_USB_XHCI_HCD=y > +CONFIG_USB_XHCI_PLATFORM=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_HCD_PLATFORM=y > +CONFIG_USB_OHCI_HCD=y > +CONFIG_USB_OHCI_HCD_PLATFORM=y > +CONFIG_USB_MUSB_HDRC=m > +CONFIG_USB_MUSB_SUNXI=m > +CONFIG_NOP_USB_XCEIV=m > +CONFIG_MMC=y > +CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_PLTFM=y > +CONFIG_MMC_SDHCI_CADENCE=y > +CONFIG_MMC_SUNXI=y > +CONFIG_RTC_CLASS=y > +CONFIG_RTC_DRV_SUN6I=y > +CONFIG_RTC_DRV_GOLDFISH=y > +CONFIG_DMADEVICES=y > +CONFIG_DMA_SUN6I=m > +# CONFIG_VIRTIO_MENU is not set > +# CONFIG_VHOST_MENU is not set > +CONFIG_SUN8I_DE2_CCU=m > +CONFIG_SUN50I_IOMMU=y > +CONFIG_RPMSG_CHAR=y > +CONFIG_RPMSG_CTRL=y > +CONFIG_RPMSG_VIRTIO=y > +CONFIG_PHY_SUN4I_USB=m > +CONFIG_NVMEM_SUNXI_SID=y > +CONFIG_EXT4_FS=y > +CONFIG_EXT4_FS_POSIX_ACL=y > +CONFIG_EXT4_FS_SECURITY=y > +CONFIG_BTRFS_FS=m > +CONFIG_BTRFS_FS_POSIX_ACL=y > +CONFIG_AUTOFS4_FS=y > +CONFIG_OVERLAY_FS=m > +CONFIG_ISO9660_FS=y > +CONFIG_JOLIET=y > +CONFIG_ZISOFS=y > +CONFIG_MSDOS_FS=y > +CONFIG_VFAT_FS=y > +CONFIG_PROC_CHILDREN=y > +CONFIG_TMPFS=y > +CONFIG_TMPFS_POSIX_ACL=y > +CONFIG_HUGETLBFS=y > +CONFIG_NFS_FS=y > +CONFIG_NFS_V4=y > +CONFIG_NFS_V4_1=y > +CONFIG_NFS_V4_2=y > +CONFIG_ROOT_NFS=y > +CONFIG_NLS_CODEPAGE_437=y > +CONFIG_NLS_ISO8859_1=m > +CONFIG_SECURITY=y > +CONFIG_SECURITY_SELINUX=y > +CONFIG_SECURITY_APPARMOR=y > +CONFIG_DEFAULT_SECURITY_DAC=y > +CONFIG_CRYPTO_USER_API_HASH=y > +CONFIG_CRYPTO_DEV_VIRTIO=y > +# CONFIG_RAID6_PQ_BENCHMARK is not set > +CONFIG_CRC_ITU_T=y > +CONFIG_CRC7=y > +CONFIG_XZ_DEC=y > +CONFIG_PRINTK_TIME=y > +CONFIG_DEBUG_FS=y > +CONFIG_DEBUG_PAGEALLOC=y > +CONFIG_SCHED_STACK_END_CHECK=y > +CONFIG_DEBUG_VM=y > +CONFIG_DEBUG_VM_PGFLAGS=y > +CONFIG_DEBUG_MEMORY_INIT=y > +CONFIG_SOFTLOCKUP_DETECTOR=y > +CONFIG_WQ_WATCHDOG=y > +CONFIG_DEBUG_TIMEKEEPING=y > +CONFIG_DEBUG_RT_MUTEXES=y > +CONFIG_DEBUG_SPINLOCK=y > +CONFIG_DEBUG_MUTEXES=y > +CONFIG_DEBUG_RWSEMS=y > +CONFIG_DEBUG_ATOMIC_SLEEP=y > +CONFIG_DEBUG_LIST=y > +CONFIG_DEBUG_PLIST=y > +CONFIG_DEBUG_SG=y > +# CONFIG_RCU_TRACE is not set > +CONFIG_RCU_EQS_DEBUG=y > +# CONFIG_FTRACE is not set > +# CONFIG_RUNTIME_TESTING_MENU is not set > +CONFIG_MEMTEST=y > diff --git a/board/mangopi/mangopi-mq-d1s/overlay/boot/extlinux/extlinux.conf b/board/mangopi/mangopi-mq-d1s/overlay/boot/extlinux/extlinux.conf > new file mode 100644 > index 0000000000..c825ad4667 > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/overlay/boot/extlinux/extlinux.conf > @@ -0,0 +1,4 @@ > +label linux > + kernel /boot/Image > + # use devicetree from u-boot > + append console=ttyS3,115200 root=/dev/mmcblk0p1 ro rootwait > diff --git a/board/mangopi/mangopi-mq-d1s/overlay/etc/network/interfaces b/board/mangopi/mangopi-mq-d1s/overlay/etc/network/interfaces > new file mode 100644 > index 0000000000..89e7d74aff > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/overlay/etc/network/interfaces > @@ -0,0 +1,6 @@ > +auto lo > +iface lo inet loopback > + > +auto wlan0 > +iface wlan0 inet dhcp > +wpa-conf /etc/wpa_supplicant.conf > diff --git a/board/mangopi/mangopi-mq-d1s/overlay/etc/wpa_supplicant.conf b/board/mangopi/mangopi-mq-d1s/overlay/etc/wpa_supplicant.conf > new file mode 100644 > index 0000000000..b43292b0a7 > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/overlay/etc/wpa_supplicant.conf > @@ -0,0 +1,8 @@ > +ap_scan=1 > + > +network={ > + ssid="YOURSSID" > + scan_ssid=1 > + key_mgmt=WPA-PSK > + psk="YOURPASSWD" > +} > diff --git a/board/mangopi/mangopi-mq-d1s/readme.txt b/board/mangopi/mangopi-mq-d1s/readme.txt > new file mode 100644 > index 0000000000..0f8114f46a > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/readme.txt > @@ -0,0 +1,48 @@ > +MangoPi MQ D1s (RISC-V) > +======================= > + > +MangoPi MQ D1s (board model MQ1W) is a tiny (4x4cm) RISC-V based single board computer. It's built around > +Allwinner D1s (also referred as F133) single core 1GHz CPU with integrated 64MB DDR2 RAM. > +Board features: > +- USB-OTG Type-C socket > +- USB-HOST Type-C socket > +- 2x 22 pin GPIO headers > +- TF card slot > +- RTL8189FTV WiFi module with ext. antenna connector > +- 15 pin DSI FPC connector > +- 40 pin RGB FPC connector > +- 6 pin CTP FPC connector > +- 24 pin DVP FPC connector > +- onboard mic > +- onboard audio amplifier > +- FEL,reset button > + > +There is no HDMI connector. > + > +How to build > +============ > + > +$ make mangopi_mangopi_mq_d1s_defconfig > +$ make > + > +Wifi > +========== > + > +Edit board/mangopi/mangopi-mq-d1s/overlay/etc/wpa_supplicant.conf or > +/etc/wpa_supplicant.conf once connected to the board: > + > +* Replace YOURSSID with your AP ssid > +* Replace YOURPASSWD with your AP password > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > + > +Connect a TTL UART to the UART3 on P8 header (unpopulated), insert the microSD card and > +plug in a USB-C cable to the OTG or HOST connector to boot the system. > diff --git a/board/mangopi/mangopi-mq-d1s/uboot.config b/board/mangopi/mangopi-mq-d1s/uboot.config > new file mode 100644 > index 0000000000..0a3d8ded01 > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/uboot.config > @@ -0,0 +1,10 @@ > +CONFIG_RISCV=y > +CONFIG_DEFAULT_DEVICE_TREE="sun20i-d1s-mangopi-mq" > +CONFIG_TARGET_SUN20I_D1=y > +CONFIG_ARCH_RV64I=y > +CONFIG_RISCV_SMODE=y > +# CONFIG_SPL_SMP is not set > +CONFIG_SYS_SPL_MALLOC=y > +CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 > +# CONFIG_SYS_I2C_MVTWSI is not set > +CONFIG_DM_REGULATOR_FIXED=y > diff --git a/configs/mangopi_mangopi_mq_d1s_defconfig b/configs/mangopi_mangopi_mq_d1s_defconfig > new file mode 100644 > index 0000000000..11f1e94bd7 > --- /dev/null > +++ b/configs/mangopi_mangopi_mq_d1s_defconfig > @@ -0,0 +1,47 @@ > +BR2_riscv=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > +BR2_ROOTFS_OVERLAY="board/mangopi/mangopi-mq-d1s/overlay" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/mangopi/mangopi-mq-d1s/genimage.cfg" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.14" > +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/mangopi/mangopi-mq-d1s/linux.config" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1s-mangopi-mq" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y Here we need: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_RTL8189FS=y > +BR2_PACKAGE_WIRELESS_TOOLS=y > +BR2_PACKAGE_WPA_SUPPLICANT=y > +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y > +BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y > +BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y > +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y > +BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_PLAT="generic" > +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set > +BR2_TARGET_OPENSBI_LATEST_VERSION=y > +# BR2_TARGET_OPENSBI_CUSTOM_VERSION is not set > +BR2_TARGET_OPENSBI_VERSION="1.3" > +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,smaeul,u-boot,3f3b76b3749e796edd4b8cac9081c55574be49c7)/uboot-3f3b76b3749e796edd4b8cac9081c55574be49c7.tar.gz" > +# BR2_TARGET_UBOOT_USE_DEFCONFIG is not set > +BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/mangopi/mangopi-mq-d1s/uboot.config" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" > +BR2_PACKAGE_HOST_GENIMAGE=y I've build tested successfully with the change above using utils/docker run and the rest looks good to me so with the commit log reworded and the missing "BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y" added: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Feb 5 10:03:24 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 11:03:24 +0100 Subject: [Buildroot] [PATCH v2] package/libblockdev: bump to version 3.1.0 In-Reply-To: References: <20240122160949.4052959-1-giulio.benetti@benettiengineering.com> Message-ID: On 05/02/24 10:54, Arnout Vandecappelle via buildroot wrote: > > > On 22/01/2024 17:09, Giulio Benetti wrote: >> * Rework strerror_l() patch by declaring it only in utils.h as a macro >> * select BR2_PACKAGE_UTIL_LINUX_LIBUUID since it's now mandatory >> >> Signed-off-by: Giulio Benetti >> --- >> V1->V2: >> * reworked local strerror_l() patch as a macro to avoid adding a >> second patch >> * selected BR2_PACKAGE_UTIL_LINUX_LIBUUID by default >> --- >> ? ...-replacement-function-for-strerror_l.patch | 160 ++++-------------- >> ? package/libblockdev/Config.in???????????????? |?? 5 +- >> ? package/libblockdev/libblockdev.hash????????? |?? 2 +- >> ? package/libblockdev/libblockdev.mk??????????? |?? 2 +- >> ? 4 files changed, 35 insertions(+), 134 deletions(-) >> >> diff --git >> a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch >> index 987d28f82e..e5819a4e9c 100644 >> --- >> a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch >> +++ >> b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch >> @@ -1,29 +1,25 @@ >> -From 2acf5a8d4858035396ee45d96c824e0481644d36 Mon Sep 17 00:00:00 2001 >> -From: Thomas Petazzoni >> -Date: Sat, 29 Aug 2020 16:04:15 +0200 >> +From 01883cc14904e55d90955ad7cd9fc55bc18364ac Mon Sep 17 00:00:00 2001 >> +From: Giulio Benetti > > ?You really should have kept Thomas as the author. Ah yes, I've messed up a bit, > >> +Date: Sat, 20 Jan 2024 13:29:28 +0100 >> ? Subject: [PATCH] Provide replacement function for strerror_l() >> ? strerror_l() is not implemented in some C libraries, such as uClibc, >> -so let's provide a simple replacement function that falls back on >> -strerror(). >> +so let's provide a simple replacement define that falls back on >> +strerror() in utils.h header and include it where missing. >> -Upstream status: Not Applicable since it's due uclibc only >> +Upstream: N/A since it's due uclibc only > > ?This fixes check-package, so it must be removed from .checkpackageignore. Thank you, this is new to me. I'll take care on next patches. Thank you for reviewing! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > > > ?Applied to master with those two fixed, thanks. > > ?Regards, > ?Arnout > >> ? Signed-off-by: Thomas Petazzoni >> ? Signed-off-by: Giulio Benetti >> -[Giulio: ported to version 3.0+] >> +[Giulio: ported to version 3.0 and 3.1] >> ? --- >> - configure.ac??????????????????? | 2 ++ >> - src/plugins/crypto.c??????????? | 7 +++++++ >> - src/plugins/nvme/nvme-error.c?? | 8 ++++++++ >> - src/plugins/nvme/nvme-fabrics.c | 8 ++++++++ >> - src/plugins/nvme/nvme-op.c????? | 8 ++++++++ >> - src/plugins/part.c????????????? | 9 +++++++++ >> - src/utils/module.c????????????? | 8 +++++++- >> - 7 files changed, 49 insertions(+), 1 deletion(-) >> + configure.ac?????? | 2 ++ >> + src/utils/module.c | 1 + >> + src/utils/utils.h? | 4 ++++ >> + 3 files changed, 7 insertions(+) >> ? diff --git a/configure.ac b/configure.ac >> -index 0a8ce4a7..dfbddb39 100644 >> +index 02b26e3e..67341134 100644 >> ? --- a/configure.ac >> ? +++ b/configure.ac >> ? @@ -120,6 +120,8 @@ AC_CHECK_HEADERS([dlfcn.h string.h unistd.h >> sys/fcntl.h sys/ioctl.h linux/random >> @@ -35,127 +31,33 @@ index 0a8ce4a7..dfbddb39 100644 >> ?? AC_ARG_WITH([escrow], >> ?????? AS_HELP_STRING([--with-escrow], [support escrow >> @<:@default=yes@:>@]), >> ?????? [], >> -diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c >> -index c5f719ca..b2ae3f56 100644 >> ---- a/src/plugins/crypto.c >> -+++ b/src/plugins/crypto.c >> -@@ -62,6 +62,13 @@ >> - >> - #define UNUSED __attribute__((unused)) >> - >> -+#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> -+#endif >> -+ >> - /** >> -? * SECTION: crypto >> -? * @short_description: plugin for operations with encrypted devices >> -diff --git a/src/plugins/nvme/nvme-error.c >> b/src/plugins/nvme/nvme-error.c >> -index 4bd4d771..618b6aef 100644 >> ---- a/src/plugins/nvme/nvme-error.c >> -+++ b/src/plugins/nvme/nvme-error.c >> -@@ -34,6 +34,14 @@ >> - #include "nvme.h" >> - #include "nvme-private.h" >> - >> -+#define UNUSED __attribute__((unused)) >> -+ >> -+#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> -+#endif >> - >> - /** >> -? * bd_nvme_error_quark: (skip) >> -diff --git a/src/plugins/nvme/nvme-fabrics.c >> b/src/plugins/nvme/nvme-fabrics.c >> -index 1877845f..5fcbeddc 100644 >> ---- a/src/plugins/nvme/nvme-fabrics.c >> -+++ b/src/plugins/nvme/nvme-fabrics.c >> -@@ -36,6 +36,14 @@ >> - #include "nvme.h" >> - #include "nvme-private.h" >> - >> -+#define UNUSED __attribute__((unused)) >> -+ >> -+#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> -+#endif >> - >> - /* nvme-cli defaults */ >> - #define PATH_NVMF_CONFIG? "/etc/nvme/config.json" >> -diff --git a/src/plugins/nvme/nvme-op.c b/src/plugins/nvme/nvme-op.c >> -index dbef4f3a..7bafd7a3 100644 >> ---- a/src/plugins/nvme/nvme-op.c >> -+++ b/src/plugins/nvme/nvme-op.c >> -@@ -35,6 +35,14 @@ >> - #include "nvme.h" >> - #include "nvme-private.h" >> - >> -+#define UNUSED __attribute__((unused)) >> -+ >> -+#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> -+#endif >> - >> - /** >> -? * bd_nvme_device_self_test: >> -diff --git a/src/plugins/part.c b/src/plugins/part.c >> -index 46d31137..6234e013 100644 >> ---- a/src/plugins/part.c >> -+++ b/src/plugins/part.c >> -@@ -26,6 +26,15 @@ >> - >> - #include "part.h" >> - >> -+#define UNUSED __attribute__((unused)) >> -+ >> -+#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> -+#endif >> -+ >> - /** >> -? * SECTION: part >> -? * @short_description: plugin for operations with partition tables >> ? diff --git a/src/utils/module.c b/src/utils/module.c >> -index 6557c3ab..69dd4731 100644 >> +index 6557c3ab..5893f0ac 100644 >> ? --- a/src/utils/module.c >> ? +++ b/src/utils/module.c >> -@@ -74,6 +74,13 @@ static void set_kmod_logging (struct kmod_ctx *ctx) { >> -???? kmod_set_log_fn (ctx, utils_kmod_log_redirect, NULL); >> - } >> +@@ -28,6 +28,7 @@ >> + #include "module.h" >> + #include "exec.h" >> + #include "logging.h" >> ++#include "utils.h" >> + >> + #define UNUSED __attribute__((unused)) >> + >> +diff --git a/src/utils/utils.h b/src/utils/utils.h >> +index 801a8b6e..b2bdf0d0 100644 >> +--- a/src/utils/utils.h >> ++++ b/src/utils/utils.h >> +@@ -9,6 +9,10 @@ >> + #include "dbus.h" >> + #include "logging.h" >> ? +#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> ++#define strerror_l(errnum, locale)????? strerror(errnum) >> ? +#endif >> ? + >> ?? /** >> -? * bd_utils_have_kernel_module: >> -? * @module_name: name of the kernel module to check >> -@@ -259,7 +266,6 @@ gboolean bd_utils_unload_kernel_module (const >> gchar *module_name, GError **error >> -???? return TRUE; >> - } >> - >> -- >> - static BDUtilsLinuxVersion detected_linux_ver; >> - static gboolean have_linux_ver = FALSE; >> - >> +? * SECTION: utils >> +? * @short_description: library providing utility functions used by >> the blockdev library and its plugins >> ? -- >> ? 2.34.1 >> diff --git a/package/libblockdev/Config.in >> b/package/libblockdev/Config.in >> index 527ba79e4e..e0449628b4 100644 >> --- a/package/libblockdev/Config.in >> +++ b/package/libblockdev/Config.in >> @@ -8,6 +8,8 @@ config BR2_PACKAGE_LIBBLOCKDEV >> ????? depends on BR2_ENABLE_LOCALE >> ????? select BR2_PACKAGE_KMOD >> ????? select BR2_PACKAGE_LIBGLIB2 >> +??? select BR2_PACKAGE_UTIL_LINUX >> +??? select BR2_PACKAGE_UTIL_LINUX_LIBUUID >> ????? help >> ??????? libblockdev is a C library supporting GObject introspection >> ??????? for manipulation of block devices. It has a plugin-based >> @@ -30,7 +32,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO >> ? config BR2_PACKAGE_LIBBLOCKDEV_FS >> ????? bool "filesystem" >> ????? depends on BR2_ENABLE_LOCALE # parted >> -??? select BR2_PACKAGE_UTIL_LINUX >> ????? select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT >> ????? select BR2_PACKAGE_PARTED >> ????? select BR2_PACKAGE_E2FSPROGS >> @@ -62,7 +63,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_PART >> ????? bool "part" >> ????? depends on BR2_ENABLE_LOCALE # parted >> ????? select BR2_PACKAGE_PARTED >> -??? select BR2_PACKAGE_UTIL_LINUX >> ????? select BR2_PACKAGE_UTIL_LINUX_LIBFDISK >> ? comment "part plugin needs a toolchain w/ locale" >> @@ -70,7 +70,6 @@ comment "part plugin needs a toolchain w/ locale" >> ? config BR2_PACKAGE_LIBBLOCKDEV_SWAP >> ????? bool "swap" >> -??? select BR2_PACKAGE_UTIL_LINUX >> ????? select BR2_PACKAGE_UTIL_LINUX_LIBBLKID >> ? endif >> diff --git a/package/libblockdev/libblockdev.hash >> b/package/libblockdev/libblockdev.hash >> index 5f9a8a7e6c..79700a4996 100644 >> --- a/package/libblockdev/libblockdev.hash >> +++ b/package/libblockdev/libblockdev.hash >> @@ -1,3 +1,3 @@ >> ? # Locally calculated >> -sha256 >> 49841ff92db0ab032931e6f2b5eab63e5969b0ddc14b067b60e46a6eb6c60e47 >> libblockdev-3.0.4.tar.gz >> +sha256 >> 41e4af66c9d78e795302d37825dfd88a4970f82da7b4ebe6487feba2afae44fb >> libblockdev-3.1.0.tar.gz >> ? sha256 >> 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946? LICENSE >> diff --git a/package/libblockdev/libblockdev.mk >> b/package/libblockdev/libblockdev.mk >> index e0fca2b95c..ebf01acfb5 100644 >> --- a/package/libblockdev/libblockdev.mk >> +++ b/package/libblockdev/libblockdev.mk >> @@ -4,7 +4,7 @@ >> ? # >> >> ################################################################################ >> -LIBBLOCKDEV_VERSION = 3.0.4 >> +LIBBLOCKDEV_VERSION = 3.1.0 >> ? LIBBLOCKDEV_SITE = >> https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 >> ? LIBBLOCKDEV_LICENSE = LGPL-2.1 >> ? LIBBLOCKDEV_LICENSE_FILES = LICENSE > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Mon Feb 5 10:01:38 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:01:38 +0100 Subject: [Buildroot] [git commit] package/python-mpd2: bump to version 3.1.1 Message-ID: <20240205100427.52003869DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2d461d134d27a3c27abc0efd9c429e08b2beb26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Uladzimir Bely Signed-off-by: Thomas Petazzoni --- package/python-mpd2/python-mpd2.hash | 4 ++-- package/python-mpd2/python-mpd2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash index cfe5a7c0c0..0e5d9206a1 100644 --- a/package/python-mpd2/python-mpd2.hash +++ b/package/python-mpd2/python-mpd2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-mpd2/json -md5 f083c107b28525bb4c2580140861d86e python-mpd2-3.1.0.tar.gz -sha256 f33c2cdb0d6baa74a36724f38c1c4a099a7ce2c8ec4a2bb7192150a5855df476 python-mpd2-3.1.0.tar.gz +md5 b218d6f233c23da0bc82c372308bbf8d python-mpd2-3.1.1.tar.gz +sha256 4baec3584cc43ed9948d5559079fafc2679b06b2ade273e909b3582654b2b3f5 python-mpd2-3.1.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk index 124ff57db0..2d2784e89d 100644 --- a/package/python-mpd2/python-mpd2.mk +++ b/package/python-mpd2/python-mpd2.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_MPD2_VERSION = 3.1.0 -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/59/32/e57725251ce3117d2ed2a7b76d9722ea9bea26f54b2cc8981d03350e4103 +PYTHON_MPD2_VERSION = 3.1.1 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/53/be/e77206eb35eb37ccd3506fba237e1431431d04c482707730ce2a6802e95c PYTHON_MPD2_SETUP_TYPE = setuptools PYTHON_MPD2_LICENSE = LGPL-3.0+ PYTHON_MPD2_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Mon Feb 5 10:07:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:07:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-mpd2: bump to version 3.1.1 In-Reply-To: <10609434cc80f8c547228c26bf16a04ce1f14b72.camel@gmail.com> References: <20240204085128.5059-1-wiselord1983@gmail.com> <20240205101344.7725e2ea@windsurf> <10609434cc80f8c547228c26bf16a04ce1f14b72.camel@gmail.com> Message-ID: <20240205110744.17924bc0@windsurf> On Mon, 05 Feb 2024 12:27:55 +0300 Uladzimir Bely wrote: > I could either resend the patch with a proper username (e.g., > "Uladzimir Bely "), or you are free to edit the > patch on your own. Thanks, I have amended your patch when applying. It's now pushed to master. Thanks for your contribution! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Mon Feb 5 10:08:02 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:08:02 +0100 Subject: [Buildroot] [git commit] package/libressl: don't export arc4random Message-ID: <20240205101102.E7437869E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f1e3841f5c2da36e1833068ba948c52a58c07ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Don't export arc4random to fix the following libcurl build failure raised since bump of libcurl to version 8.5.0 in commit aaa9438b96f88b1ecbf5eb9a1aebef8010835b8d and https://github.com/curl/curl/commit/7925ba431b9a099daee1fa21d36c21887f787ad5: rand.c: In function 'randit': rand.c:146:26: error: implicit declaration of function 'arc4random'; did you mean 'srandom'? [-Werror=implicit-function-declaration] 146 | *rnd = (unsigned int)arc4random(); | ^~~~~~~~~~ | srandom cc1: some warnings being treated as errors Fixes: - http://autobuild.buildroot.org/results/8b7988629f1887be15c97b8c511d25443ba110d8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .../0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch | 133 +++++++++++++++++++++ ...Prefix-some-compat-symbols-with-libressl_.patch | 130 ++++++++++++++++++++ 2 files changed, 263 insertions(+) diff --git a/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch new file mode 100644 index 0000000000..411132ff20 --- /dev/null +++ b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch @@ -0,0 +1,133 @@ +From c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Mon, 11 Dec 2023 17:56:33 +0100 +Subject: [PATCH] Fix a few symbols in EXTRA_EXPORT + +I thought we stopped doing this, but that's for a separate thread. + +Upstream: https://github.com/libressl/portable/commit/c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd +Signed-off-by: Fabrice Fontaine +--- + crypto/CMakeLists.txt | 37 +++++++++++++++++++------------------ + 1 file changed, 19 insertions(+), 18 deletions(-) + +diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt +index 605647151..8046efe87 100644 +--- a/crypto/CMakeLists.txt ++++ b/crypto/CMakeLists.txt +@@ -767,13 +767,13 @@ endif() + + if(NOT HAVE_ASPRINTF) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/bsd-asprintf.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} asprintf) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} vasprintf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_asprintf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_vasprintf) + endif() + + if(NOT HAVE_FREEZERO) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/freezero.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} freezero) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_freezero) + endif() + + if(NOT HAVE_GETOPT) +@@ -799,46 +799,46 @@ endif() + + if(NOT HAVE_REALLOCARRAY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_reallocarray) + endif() + + if(NOT HAVE_RECALLOCARRAY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/recallocarray.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} recallocarray) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_recallocarray) + endif() + + if(NOT HAVE_STRCASECMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strcasecmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strcasecmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strcasecmp) + endif() + + if(NOT HAVE_STRLCAT) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcat.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcat) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcat) + endif() + + if(NOT HAVE_STRLCPY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcpy.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcpy) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcpy) + endif() + + if(NOT HAVE_STRNDUP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strndup.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strndup) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strndup) + if(NOT HAVE_STRNLEN) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strnlen.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strnlen) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strnlen) + endif() + endif() + + if(NOT HAVE_STRSEP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strsep.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strsep) + endif() + + if(NOT HAVE_STRTONUM) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strtonum.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strtonum) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strtonum) + endif() + + if(NOT HAVE_SYSLOG_R) +@@ -857,15 +857,15 @@ if(NOT HAVE_EXPLICIT_BZERO) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) + set_source_files_properties(compat/explicit_bzero.c PROPERTIES COMPILE_FLAGS -O0) + endif() +- set(EXTRA_EXPORT ${EXTRA_EXPORT} explicit_bzero) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_explicit_bzero) + endif() + + if(NOT HAVE_ARC4RANDOM_BUF) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_buf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_uniform) + + if(NOT HAVE_GETENTROPY) + if(WIN32) +@@ -891,12 +891,12 @@ endif() + + if(NOT HAVE_TIMINGSAFE_BCMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_bcmp) + endif() + + if(NOT HAVE_TIMINGSAFE_MEMCMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_memcmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_memcmp) + endif() + + if(NOT ENABLE_ASM) +@@ -919,6 +919,7 @@ foreach(SYM IN LISTS CRYPTO_UNEXPORT) + string(REPLACE "${SYM}\n" "" SYMS ${SYMS}) + endforeach() + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym ${SYMS}) ++# XXX should we still be doing this? + if(EXTRA_EXPORT) + list(SORT EXTRA_EXPORT) + foreach(SYM IN LISTS EXTRA_EXPORT) diff --git a/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch new file mode 100644 index 0000000000..42fbbe9069 --- /dev/null +++ b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch @@ -0,0 +1,130 @@ +From 0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Sat, 18 Nov 2023 10:53:09 +0100 +Subject: [PATCH] Prefix some compat symbols with libressl_ + +See #928. This isn't a full fix, but should remove much of the friction +already. + +Upstream: https://github.com/libressl/portable/pull/961/commits/0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 +Signed-off-by: Fabrice Fontaine +--- + include/compat/stdio.h | 2 ++ + include/compat/stdlib.h | 10 ++++++++++ + include/compat/string.h | 11 +++++++++++ + 3 files changed, 23 insertions(+) + +diff --git a/include/compat/stdio.h b/include/compat/stdio.h +index d5725c9ac9..4ddd63aee1 100644 +--- a/include/compat/stdio.h ++++ b/include/compat/stdio.h +@@ -20,7 +20,9 @@ + + #ifndef HAVE_ASPRINTF + #include ++#define vasprintf libressl_vasprintf + int vasprintf(char **str, const char *fmt, va_list ap); ++#define asprintf libressl_asprintf + int asprintf(char **str, const char *fmt, ...); + #endif + +diff --git a/include/compat/stdlib.h b/include/compat/stdlib.h +index 2eaea244c0..76dc07c35a 100644 +--- a/include/compat/stdlib.h ++++ b/include/compat/stdlib.h +@@ -20,26 +20,36 @@ + #include + + #ifndef HAVE_ARC4RANDOM_BUF ++#define arc4random libressl_arc4random + uint32_t arc4random(void); ++#define arc4random_buf libressl_arc4random_buf + void arc4random_buf(void *_buf, size_t n); ++#define arc4random_uniform libressl_arc4random_uniform + uint32_t arc4random_uniform(uint32_t upper_bound); + #endif + + #ifndef HAVE_FREEZERO ++#define freezero libressl_freezero + void freezero(void *ptr, size_t sz); + #endif + + #ifndef HAVE_GETPROGNAME ++#define getprogname libressl_getprogname + const char * getprogname(void); + #endif + ++#ifndef HAVE_REALLOCARRAY ++#define reallocarray libressl_reallocarray + void *reallocarray(void *, size_t, size_t); ++#endif + + #ifndef HAVE_RECALLOCARRAY ++#define recallocarray libressl_recallocarray + void *recallocarray(void *, size_t, size_t, size_t); + #endif + + #ifndef HAVE_STRTONUM ++#define strtonum libressl_strtonum + long long strtonum(const char *nptr, long long minval, + long long maxval, const char **errstr); + #endif +diff --git a/include/compat/string.h b/include/compat/string.h +index 4bf7519b5b..6a82793f62 100644 +--- a/include/compat/string.h ++++ b/include/compat/string.h +@@ -27,43 +27,54 @@ + #endif + + #ifndef HAVE_STRCASECMP ++#define strcasecmp libressl_strcasecmp + int strcasecmp(const char *s1, const char *s2); ++#define strncasecmp libressl_strncasecmp + int strncasecmp(const char *s1, const char *s2, size_t len); + #endif + + #ifndef HAVE_STRLCPY ++#define strlcpy libressl_strlcpy + size_t strlcpy(char *dst, const char *src, size_t siz); + #endif + + #ifndef HAVE_STRLCAT ++#define strlcat libressl_strlcat + size_t strlcat(char *dst, const char *src, size_t siz); + #endif + + #ifndef HAVE_STRNDUP ++#define strndup libressl_strndup + char * strndup(const char *str, size_t maxlen); + /* the only user of strnlen is strndup, so only build it if needed */ + #ifndef HAVE_STRNLEN ++#define strnlen libressl_strnlen + size_t strnlen(const char *str, size_t maxlen); + #endif + #endif + + #ifndef HAVE_STRSEP ++#define strsep libressl_strsep + char *strsep(char **stringp, const char *delim); + #endif + + #ifndef HAVE_EXPLICIT_BZERO ++#define explicit_bzero libressl_explicit_bzero + void explicit_bzero(void *, size_t); + #endif + + #ifndef HAVE_TIMINGSAFE_BCMP ++#define timingsafe_bcmp libressl_timingsafe_bcmp + int timingsafe_bcmp(const void *b1, const void *b2, size_t n); + #endif + + #ifndef HAVE_TIMINGSAFE_MEMCMP ++#define timingsafe_memcmp libressl_timingsafe_memcmp + int timingsafe_memcmp(const void *b1, const void *b2, size_t len); + #endif + + #ifndef HAVE_MEMMEM ++#define memmem libressl_memmem + void * memmem(const void *big, size_t big_len, const void *little, + size_t little_len); + #endif From arnout at mind.be Mon Feb 5 10:11:01 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:11:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/libressl: don't export arc4random In-Reply-To: <20240121202422.1598129-1-fontaine.fabrice@gmail.com> References: <20240121202422.1598129-1-fontaine.fabrice@gmail.com> Message-ID: On 21/01/2024 21:24, Fabrice Fontaine wrote: > Don't export arc4random to fix the following libcurl build failure > raised since bump of libcurl to version 8.5.0 in commit > aaa9438b96f88b1ecbf5eb9a1aebef8010835b8d and > https://github.com/curl/curl/commit/7925ba431b9a099daee1fa21d36c21887f787ad5: > > rand.c: In function 'randit': > rand.c:146:26: error: implicit declaration of function 'arc4random'; did you mean 'srandom'? [-Werror=implicit-function-declaration] > 146 | *rnd = (unsigned int)arc4random(); > | ^~~~~~~~~~ > | srandom > cc1: some warnings being treated as errors > > Fixes: > - http://autobuild.buildroot.org/results/8b7988629f1887be15c97b8c511d25443ba110d8 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...02-Fix-a-few-symbols-in-EXTRA_EXPORT.patch | 133 ++++++++++++++++++ > ...x-some-compat-symbols-with-libressl_.patch | 130 +++++++++++++++++ > 2 files changed, 263 insertions(+) > create mode 100644 package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch > create mode 100644 package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch > > diff --git a/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch > new file mode 100644 > index 0000000000..411132ff20 > --- /dev/null > +++ b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch > @@ -0,0 +1,133 @@ > +From c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd Mon Sep 17 00:00:00 2001 > +From: Theo Buehler > +Date: Mon, 11 Dec 2023 17:56:33 +0100 > +Subject: [PATCH] Fix a few symbols in EXTRA_EXPORT > + > +I thought we stopped doing this, but that's for a separate thread. > + > +Upstream: https://github.com/libressl/portable/commit/c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd > +Signed-off-by: Fabrice Fontaine > +--- > + crypto/CMakeLists.txt | 37 +++++++++++++++++++------------------ > + 1 file changed, 19 insertions(+), 18 deletions(-) > + > +diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt > +index 605647151..8046efe87 100644 > +--- a/crypto/CMakeLists.txt > ++++ b/crypto/CMakeLists.txt > +@@ -767,13 +767,13 @@ endif() > + > + if(NOT HAVE_ASPRINTF) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/bsd-asprintf.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} asprintf) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} vasprintf) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_asprintf) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_vasprintf) > + endif() > + > + if(NOT HAVE_FREEZERO) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/freezero.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} freezero) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_freezero) > + endif() > + > + if(NOT HAVE_GETOPT) > +@@ -799,46 +799,46 @@ endif() > + > + if(NOT HAVE_REALLOCARRAY) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_reallocarray) > + endif() > + > + if(NOT HAVE_RECALLOCARRAY) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/recallocarray.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} recallocarray) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_recallocarray) > + endif() > + > + if(NOT HAVE_STRCASECMP) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strcasecmp.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strcasecmp) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strcasecmp) > + endif() > + > + if(NOT HAVE_STRLCAT) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcat.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcat) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcat) > + endif() > + > + if(NOT HAVE_STRLCPY) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcpy.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcpy) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcpy) > + endif() > + > + if(NOT HAVE_STRNDUP) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strndup.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strndup) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strndup) > + if(NOT HAVE_STRNLEN) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strnlen.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strnlen) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strnlen) > + endif() > + endif() > + > + if(NOT HAVE_STRSEP) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strsep.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strsep) > + endif() > + > + if(NOT HAVE_STRTONUM) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strtonum.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strtonum) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strtonum) > + endif() > + > + if(NOT HAVE_SYSLOG_R) > +@@ -857,15 +857,15 @@ if(NOT HAVE_EXPLICIT_BZERO) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) > + set_source_files_properties(compat/explicit_bzero.c PROPERTIES COMPILE_FLAGS -O0) > + endif() > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} explicit_bzero) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_explicit_bzero) > + endif() > + > + if(NOT HAVE_ARC4RANDOM_BUF) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_buf) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_uniform) > + > + if(NOT HAVE_GETENTROPY) > + if(WIN32) > +@@ -891,12 +891,12 @@ endif() > + > + if(NOT HAVE_TIMINGSAFE_BCMP) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_bcmp) > + endif() > + > + if(NOT HAVE_TIMINGSAFE_MEMCMP) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_memcmp) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_memcmp) > + endif() > + > + if(NOT ENABLE_ASM) > +@@ -919,6 +919,7 @@ foreach(SYM IN LISTS CRYPTO_UNEXPORT) > + string(REPLACE "${SYM}\n" "" SYMS ${SYMS}) > + endforeach() > + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym ${SYMS}) > ++# XXX should we still be doing this? > + if(EXTRA_EXPORT) > + list(SORT EXTRA_EXPORT) > + foreach(SYM IN LISTS EXTRA_EXPORT) > diff --git a/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch > new file mode 100644 > index 0000000000..42fbbe9069 > --- /dev/null > +++ b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch > @@ -0,0 +1,130 @@ > +From 0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 Mon Sep 17 00:00:00 2001 > +From: Theo Buehler > +Date: Sat, 18 Nov 2023 10:53:09 +0100 > +Subject: [PATCH] Prefix some compat symbols with libressl_ > + > +See #928. This isn't a full fix, but should remove much of the friction > +already. > + > +Upstream: https://github.com/libressl/portable/pull/961/commits/0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 > +Signed-off-by: Fabrice Fontaine > +--- > + include/compat/stdio.h | 2 ++ > + include/compat/stdlib.h | 10 ++++++++++ > + include/compat/string.h | 11 +++++++++++ > + 3 files changed, 23 insertions(+) > + > +diff --git a/include/compat/stdio.h b/include/compat/stdio.h > +index d5725c9ac9..4ddd63aee1 100644 > +--- a/include/compat/stdio.h > ++++ b/include/compat/stdio.h > +@@ -20,7 +20,9 @@ > + > + #ifndef HAVE_ASPRINTF > + #include > ++#define vasprintf libressl_vasprintf > + int vasprintf(char **str, const char *fmt, va_list ap); > ++#define asprintf libressl_asprintf > + int asprintf(char **str, const char *fmt, ...); > + #endif > + > +diff --git a/include/compat/stdlib.h b/include/compat/stdlib.h > +index 2eaea244c0..76dc07c35a 100644 > +--- a/include/compat/stdlib.h > ++++ b/include/compat/stdlib.h > +@@ -20,26 +20,36 @@ > + #include > + > + #ifndef HAVE_ARC4RANDOM_BUF > ++#define arc4random libressl_arc4random > + uint32_t arc4random(void); > ++#define arc4random_buf libressl_arc4random_buf > + void arc4random_buf(void *_buf, size_t n); > ++#define arc4random_uniform libressl_arc4random_uniform > + uint32_t arc4random_uniform(uint32_t upper_bound); > + #endif > + > + #ifndef HAVE_FREEZERO > ++#define freezero libressl_freezero > + void freezero(void *ptr, size_t sz); > + #endif > + > + #ifndef HAVE_GETPROGNAME > ++#define getprogname libressl_getprogname > + const char * getprogname(void); > + #endif > + > ++#ifndef HAVE_REALLOCARRAY > ++#define reallocarray libressl_reallocarray > + void *reallocarray(void *, size_t, size_t); > ++#endif > + > + #ifndef HAVE_RECALLOCARRAY > ++#define recallocarray libressl_recallocarray > + void *recallocarray(void *, size_t, size_t, size_t); > + #endif > + > + #ifndef HAVE_STRTONUM > ++#define strtonum libressl_strtonum > + long long strtonum(const char *nptr, long long minval, > + long long maxval, const char **errstr); > + #endif > +diff --git a/include/compat/string.h b/include/compat/string.h > +index 4bf7519b5b..6a82793f62 100644 > +--- a/include/compat/string.h > ++++ b/include/compat/string.h > +@@ -27,43 +27,54 @@ > + #endif > + > + #ifndef HAVE_STRCASECMP > ++#define strcasecmp libressl_strcasecmp > + int strcasecmp(const char *s1, const char *s2); > ++#define strncasecmp libressl_strncasecmp > + int strncasecmp(const char *s1, const char *s2, size_t len); > + #endif > + > + #ifndef HAVE_STRLCPY > ++#define strlcpy libressl_strlcpy > + size_t strlcpy(char *dst, const char *src, size_t siz); > + #endif > + > + #ifndef HAVE_STRLCAT > ++#define strlcat libressl_strlcat > + size_t strlcat(char *dst, const char *src, size_t siz); > + #endif > + > + #ifndef HAVE_STRNDUP > ++#define strndup libressl_strndup > + char * strndup(const char *str, size_t maxlen); > + /* the only user of strnlen is strndup, so only build it if needed */ > + #ifndef HAVE_STRNLEN > ++#define strnlen libressl_strnlen > + size_t strnlen(const char *str, size_t maxlen); > + #endif > + #endif > + > + #ifndef HAVE_STRSEP > ++#define strsep libressl_strsep > + char *strsep(char **stringp, const char *delim); > + #endif > + > + #ifndef HAVE_EXPLICIT_BZERO > ++#define explicit_bzero libressl_explicit_bzero > + void explicit_bzero(void *, size_t); > + #endif > + > + #ifndef HAVE_TIMINGSAFE_BCMP > ++#define timingsafe_bcmp libressl_timingsafe_bcmp > + int timingsafe_bcmp(const void *b1, const void *b2, size_t n); > + #endif > + > + #ifndef HAVE_TIMINGSAFE_MEMCMP > ++#define timingsafe_memcmp libressl_timingsafe_memcmp > + int timingsafe_memcmp(const void *b1, const void *b2, size_t len); > + #endif > + > + #ifndef HAVE_MEMMEM > ++#define memmem libressl_memmem > + void * memmem(const void *big, size_t big_len, const void *little, > + size_t little_len); > + #endif From arnout at mind.be Mon Feb 5 10:13:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:13:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pymysql: bump to version 1.1.0 In-Reply-To: <20240111014940.2567842-1-james.hilliard1@gmail.com> References: <20240111014940.2567842-1-james.hilliard1@gmail.com> Message-ID: <3500c600-833a-46d9-a6e6-83ed46554f8c@mind.be> On 11/01/2024 02:49, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pymysql/python-pymysql.hash | 4 ++-- > package/python-pymysql/python-pymysql.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pymysql/python-pymysql.hash b/package/python-pymysql/python-pymysql.hash > index dd81bdab7e..641d5dba97 100644 > --- a/package/python-pymysql/python-pymysql.hash > +++ b/package/python-pymysql/python-pymysql.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pymysql/json > -md5 3fe6ff2eefb58af5c54d335c6e0216de PyMySQL-1.0.2.tar.gz > -sha256 816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36 PyMySQL-1.0.2.tar.gz > +md5 81d559c87414017075de030d8ce93257 PyMySQL-1.1.0.tar.gz > +sha256 4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96 PyMySQL-1.1.0.tar.gz > # Locally computed sha256 checksums > sha256 314120dc65f0800f738a4b31400c76ee14decd1fbe77ce9c3540a421b86ea7b6 LICENSE > diff --git a/package/python-pymysql/python-pymysql.mk b/package/python-pymysql/python-pymysql.mk > index 3703572f35..c600fe515c 100644 > --- a/package/python-pymysql/python-pymysql.mk > +++ b/package/python-pymysql/python-pymysql.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYMYSQL_VERSION = 1.0.2 > +PYTHON_PYMYSQL_VERSION = 1.1.0 > PYTHON_PYMYSQL_SOURCE = PyMySQL-$(PYTHON_PYMYSQL_VERSION).tar.gz > -PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/60/ea/33b8430115d9b617b713959b21dfd5db1df77425e38efea08d121e83b712 > +PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/41/9d/ee68dee1c8821c839bb31e6e5f40e61035a5278f7c1307dde758f0c90452 > PYTHON_PYMYSQL_LICENSE = MIT > PYTHON_PYMYSQL_LICENSE_FILES = LICENSE > PYTHON_PYMYSQL_SETUP_TYPE = setuptools From arnout at mind.be Mon Feb 5 10:12:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:12:22 +0100 Subject: [Buildroot] [git commit] package/python-pymysql: bump to version 1.1.0 Message-ID: <20240205101326.37C90869EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8120f29935c0070c2c7ebdcfeceb37d2c3dc0d7d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pymysql/python-pymysql.hash | 4 ++-- package/python-pymysql/python-pymysql.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pymysql/python-pymysql.hash b/package/python-pymysql/python-pymysql.hash index dd81bdab7e..641d5dba97 100644 --- a/package/python-pymysql/python-pymysql.hash +++ b/package/python-pymysql/python-pymysql.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymysql/json -md5 3fe6ff2eefb58af5c54d335c6e0216de PyMySQL-1.0.2.tar.gz -sha256 816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36 PyMySQL-1.0.2.tar.gz +md5 81d559c87414017075de030d8ce93257 PyMySQL-1.1.0.tar.gz +sha256 4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96 PyMySQL-1.1.0.tar.gz # Locally computed sha256 checksums sha256 314120dc65f0800f738a4b31400c76ee14decd1fbe77ce9c3540a421b86ea7b6 LICENSE diff --git a/package/python-pymysql/python-pymysql.mk b/package/python-pymysql/python-pymysql.mk index 3703572f35..c600fe515c 100644 --- a/package/python-pymysql/python-pymysql.mk +++ b/package/python-pymysql/python-pymysql.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMYSQL_VERSION = 1.0.2 +PYTHON_PYMYSQL_VERSION = 1.1.0 PYTHON_PYMYSQL_SOURCE = PyMySQL-$(PYTHON_PYMYSQL_VERSION).tar.gz -PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/60/ea/33b8430115d9b617b713959b21dfd5db1df77425e38efea08d121e83b712 +PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/41/9d/ee68dee1c8821c839bb31e6e5f40e61035a5278f7c1307dde758f0c90452 PYTHON_PYMYSQL_LICENSE = MIT PYTHON_PYMYSQL_LICENSE_FILES = LICENSE PYTHON_PYMYSQL_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Mon Feb 5 10:14:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:14:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libwebsockets: bump to version 4.3.3 In-Reply-To: <20240131213512.2261698-1-fontaine.fabrice@gmail.com> References: <20240131213512.2261698-1-fontaine.fabrice@gmail.com> Message-ID: <20240205111433.1a82d7e2@windsurf> On Wed, 31 Jan 2024 22:35:12 +0100 Fabrice Fontaine wrote: > Drop first patch (already in version) > > https://github.com/warmcat/libwebsockets/compare/v4.3.2...v4.3.3 > > Signed-off-by: Fabrice Fontaine > --- > .checkpackageignore | 1 - > ...Lists.txt-fix-build-with-pkg-config.patch} | 0 > ...eLists.txt-fix-build-without-threads.patch | 47 ------------------- > package/libwebsockets/libwebsockets.hash | 2 +- > package/libwebsockets/libwebsockets.mk | 2 +- > 5 files changed, 2 insertions(+), 50 deletions(-) > rename package/libwebsockets/{0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch => 0001-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch} (100%) > delete mode 100644 package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 10:14:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 11:14:30 +0100 Subject: [Buildroot] [git commit] package/wilc_firmware: bump to 16.1.2 Message-ID: <20240205101443.8305A869F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c5981d1a119bc9779a9c1d507899f835559f7b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release changelog: - Use default values for IQ calibration correction when the eFuse register has zero values. - Fix for "WILC1000 Firmware initialization issue" by updating the PMU clock switching sequence during firmware initialization. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN --- package/wilc-firmware/wilc-firmware.hash | 2 +- package/wilc-firmware/wilc-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc-firmware/wilc-firmware.hash index 802cb4f9b1..8a7957a1d2 100644 --- a/package/wilc-firmware/wilc-firmware.hash +++ b/package/wilc-firmware/wilc-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0 wilc-firmware-wilc_linux_16_1.tar.gz +sha256 6cd5fc52150520bedb736f58124063041b4d9849ea33481a8b075f51aec64f8e wilc-firmware-wilc_linux_16_1_2.tar.gz sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc-firmware/wilc-firmware.mk index 12c825cf92..3381162bbd 100644 --- a/package/wilc-firmware/wilc-firmware.mk +++ b/package/wilc-firmware/wilc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -WILC_FIRMWARE_VERSION = wilc_linux_16_1 +WILC_FIRMWARE_VERSION = wilc_linux_16_1_2 WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) WILC_FIRMWARE_LICENSE = PROPRIETARY From arnout at mind.be Mon Feb 5 10:15:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:15:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyopenssl: bump to version 23.3.0 In-Reply-To: <20240111015855.2645577-1-james.hilliard1@gmail.com> References: <20240111015855.2645577-1-james.hilliard1@gmail.com> Message-ID: <3a627241-c297-44bf-bf25-8006c2498451@mind.be> On 11/01/2024 02:58, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyopenssl/python-pyopenssl.hash | 4 ++-- > package/python-pyopenssl/python-pyopenssl.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash > index f9b1e4a86b..fb5f75db96 100644 > --- a/package/python-pyopenssl/python-pyopenssl.hash > +++ b/package/python-pyopenssl/python-pyopenssl.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyopenssl/json > -md5 1be2c02bf3c0c4e5e7c51b9ac90ebd72 pyOpenSSL-23.0.0.tar.gz > -sha256 c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f pyOpenSSL-23.0.0.tar.gz > +md5 4c4f6f9e1c731b8ee7adcd9fbeccec62 pyOpenSSL-23.3.0.tar.gz > +sha256 6b2cba5cc46e822750ec3e5a81ee12819850b11303630d575e98108a079c2b12 pyOpenSSL-23.3.0.tar.gz > # Locally computed sha256 checksums > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk > index 1d89f5b696..9865f2bb00 100644 > --- a/package/python-pyopenssl/python-pyopenssl.mk > +++ b/package/python-pyopenssl/python-pyopenssl.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYOPENSSL_VERSION = 23.0.0 > +PYTHON_PYOPENSSL_VERSION = 23.3.0 > PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz > -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/af/6e/0706d5e0eac08fcff586366f5198c9bf0a8b46f0f45b1858324e0d94c295 > +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/bf/a0/e667c3c43b65a188cc3041fa00c50655315b93be45182b2c94d185a2610e > PYTHON_PYOPENSSL_LICENSE = Apache-2.0 > PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE > PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl From thomas.petazzoni at bootlin.com Mon Feb 5 10:14:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:14:43 +0100 Subject: [Buildroot] [git commit] package/libwebsockets: bump to version 4.3.3 Message-ID: <20240205101559.6157186A0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d6e5ca41f174b8cc18d668445ebd4d9578dd013 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop first patch (already in version) https://github.com/warmcat/libwebsockets/compare/v4.3.2...v4.3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...CMakeLists.txt-fix-build-with-pkg-config.patch} | 0 ...-CMakeLists.txt-fix-build-without-threads.patch | 47 ---------------------- package/libwebsockets/libwebsockets.hash | 2 +- package/libwebsockets/libwebsockets.mk | 2 +- 5 files changed, 2 insertions(+), 50 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 15ceb65fd8..bcb6aff6ce 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -727,7 +727,6 @@ package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch Upstream package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch Upstream package/libwebsock/0002-fix-ssl.patch Upstream package/libwebsock/0003-fix-incorrect-inline.patch Upstream -package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch Upstream package/libyuv/0001-i386-sse2.patch Upstream package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch Upstream package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables diff --git a/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch b/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch similarity index 100% rename from package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch rename to package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch diff --git a/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch b/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch deleted file mode 100644 index ae46602a53..0000000000 --- a/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c83cf48b9095a6914a0844bec4439763bb0c9138 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 28 May 2022 23:15:40 +0200 -Subject: [PATCH] lib/tls/CMakeLists.txt: fix build without threads - -openssl can be built without threads resulting in the following build -failure: - --- Looking for HMAC_CTX_new --- Looking for HMAC_CTX_new - not found - -[...] - -In file included from /home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/include/libwebsockets.h:661, - from /home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/lib/core/./private-lib-core.h:140, - from /home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/lib/plat/unix/unix-misc.c:28: -/home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/include/libwebsockets/lws-genhash.h:85:18: error: field 'ctx' has incomplete type - 85 | HMAC_CTX ctx; - | ^~~ - -To fix this build failure, don't unconditionally add pthread if openssl -has been found through pkg-config as openssl.pc will contain the -appropriate dependencies (i.e. -lpthread but also -lz or -latomic) - -Fixes: - - http://autobuild.buildroot.org/results/2ae9e3249b6fcc9e6c30e7783e264fc6599e61df - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/warmcat/libwebsockets/commit/c83cf48b9095a6914a0844bec4439763bb0c9138] ---- - lib/tls/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt -index 559be9abb..a2b78c252 100644 ---- a/lib/tls/CMakeLists.txt -+++ b/lib/tls/CMakeLists.txt -@@ -311,7 +311,7 @@ endif() - if (UNIX AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX")) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_DL_LIBS}) - endif() --if ((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX")) -+if ((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT ((${CMAKE_SYSTEM_NAME} MATCHES "QNX") OR PC_OPENSSL_FOUND)) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} pthread) - endif() - diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index 4bff068241..01e7c7bfd1 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1 libwebsockets-4.3.2.tar.gz +sha256 6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90 libwebsockets-4.3.3.tar.gz sha256 2b5dd8030691f3d1870a040f085c37e45d9ab9c684a7f1284f5f379c1e829b28 LICENSE diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index daf481b3bc..c00c44cac3 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = 4.3.2 +LIBWEBSOCKETS_VERSION = 4.3.3 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = MIT with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:15:06 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:15:06 +0100 Subject: [Buildroot] [git commit] package/python-pyopenssl: bump to version 23.3.0 Message-ID: <20240205101559.6B43E86A0F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c80a1b9f19b8cb7c40aa0f9b34a2b9214d2451d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyopenssl/python-pyopenssl.hash | 4 ++-- package/python-pyopenssl/python-pyopenssl.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index f9b1e4a86b..fb5f75db96 100644 --- a/package/python-pyopenssl/python-pyopenssl.hash +++ b/package/python-pyopenssl/python-pyopenssl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyopenssl/json -md5 1be2c02bf3c0c4e5e7c51b9ac90ebd72 pyOpenSSL-23.0.0.tar.gz -sha256 c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f pyOpenSSL-23.0.0.tar.gz +md5 4c4f6f9e1c731b8ee7adcd9fbeccec62 pyOpenSSL-23.3.0.tar.gz +sha256 6b2cba5cc46e822750ec3e5a81ee12819850b11303630d575e98108a079c2b12 pyOpenSSL-23.3.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk index 1d89f5b696..9865f2bb00 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 23.0.0 +PYTHON_PYOPENSSL_VERSION = 23.3.0 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/af/6e/0706d5e0eac08fcff586366f5198c9bf0a8b46f0f45b1858324e0d94c295 +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/bf/a0/e667c3c43b65a188cc3041fa00c50655315b93be45182b2c94d185a2610e PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl From antoine.coutant at smile.fr Mon Feb 5 10:16:50 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 5 Feb 2024 11:16:50 +0100 Subject: [Buildroot] [PATCH v2] package/environment-setup: add variable KERNEL_DIR alongside KERNELDIR In-Reply-To: <20240131-kernel_dir-v2-1-555eeeee1722@microchip.com> References: <20240131-kernel_dir-v2-1-555eeeee1722@microchip.com> Message-ID: On 31/01/2024 19:18, Nayab Sayed via buildroot wrote: > Update host environment setup helper script to incorporate the variable > KENREL_DIR alongside the existing KERNELDIR. This adjustment ensures > consistency, as some projects utilize KERNELDIR while others use KERNEL_DIR. > > Signed-off-by: Nayab Sayed > --- > Changes in v2: > - Keep both KERNEL_DIR and KERNELDIR. > - Update commit message > - Link to v1:https://lore.kernel.org/r/20240124-kernel_dir-v1-1-4125408cf65d at microchip.com > --- > package/environment-setup/environment-setup | 3 ++- > package/environment-setup/environment-setup.mk | 2 ++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/environment-setup/environment-setup b/package/environment-setup/environment-setup > index 84a9843c24..0bae813e1a 100644 > --- a/package/environment-setup/environment-setup > +++ b/package/environment-setup/environment-setup > @@ -10,7 +10,8 @@ cat <<'EOF' > Some tips: > * PATH now contains the SDK utilities > * Standard autotools variables (CC, LD, CFLAGS) are exported > -* Kernel compilation variables (ARCH, CROSS_COMPILE, KERNELDIR) are exported > +* Kernel compilation variables (ARCH, CROSS_COMPILE, KERNELDIR or KERNEL_DIR) > + are exported > * To configure do "./configure $CONFIGURE_FLAGS" or use > the "configure" alias > * To build CMake-based projects, use the "cmake" alias > diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk > index 29ec5a9a95..4a71f18f3a 100644 > --- a/package/environment-setup/environment-setup.mk > +++ b/package/environment-setup/environment-setup.mk > @@ -35,6 +35,8 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS > > $(if $(BR2_LINUX_KERNEL),\ > printf "export \"KERNELDIR=$(LINUX_BUILDDIR)\"\n" \ > + >> $(ENVIRONMENT_SETUP_FILE) > + printf "export \"KERNEL_DIR=$(LINUX_BUILDDIR)\"\n" \ > >> $(ENVIRONMENT_SETUP_FILE),) > endef > > > --- > base-commit: 04dfeff6242516a1061973fc7af2cc9c5e3dd4e2 > change-id: 20240124-kernel_dir-41a48fd97b75 > > Best regards, Looks good to me. Reviewed-by: Antoine Coutant Regards, Antoine Coutant. -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Mon Feb 5 10:15:30 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:15:30 +0100 Subject: [Buildroot] [git commit] package/python-pyrsistent: bump to version 0.20.0 Message-ID: <20240205101722.2390F86A14@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6925d696c1fdd89e2e86fca5ae70dc36c3b11d0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/tobgu/pyrsistent/commit/acdffe6967a821165155ac16bee48054fd61385a Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyrsistent/python-pyrsistent.hash | 6 +++--- package/python-pyrsistent/python-pyrsistent.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyrsistent/python-pyrsistent.hash b/package/python-pyrsistent/python-pyrsistent.hash index d5c9a22656..780a7f09d9 100644 --- a/package/python-pyrsistent/python-pyrsistent.hash +++ b/package/python-pyrsistent/python-pyrsistent.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyrsistent/json -md5 761266eab1f9dc9280cdb0a6d2dedb08 pyrsistent-0.19.3.tar.gz -sha256 1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 pyrsistent-0.19.3.tar.gz +md5 dce0f9a13668dbf8bb76f74954b4a42a pyrsistent-0.20.0.tar.gz +sha256 4c48f78f62ab596c679086084d0dd13254ae4f3d6c72a83ffdf5ebdef8f265a4 pyrsistent-0.20.0.tar.gz # Locally computed sha256 checksums -sha256 3ea56753cbd0cc897d3f4414a902f5694991db7c1b3abb8230216381185f9112 LICENSE.mit +sha256 3fd3d3d1ab9c733ee453fbf3bbbaa845440d0d8c20d7b5a039d2e46a2ed7fc01 LICENSE.mit diff --git a/package/python-pyrsistent/python-pyrsistent.mk b/package/python-pyrsistent/python-pyrsistent.mk index f3457feebe..6c52d7dbc8 100644 --- a/package/python-pyrsistent/python-pyrsistent.mk +++ b/package/python-pyrsistent/python-pyrsistent.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYRSISTENT_VERSION = 0.19.3 +PYTHON_PYRSISTENT_VERSION = 0.20.0 PYTHON_PYRSISTENT_SOURCE = pyrsistent-$(PYTHON_PYRSISTENT_VERSION).tar.gz -PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/bf/90/445a7dbd275c654c268f47fa9452152709134f61f09605cf776407055a89 +PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/ce/3a/5031723c09068e9c8c2f0bc25c3a9245f2b1d1aea8396c787a408f2b95ca PYTHON_PYRSISTENT_SETUP_TYPE = setuptools PYTHON_PYRSISTENT_LICENSE = MIT PYTHON_PYRSISTENT_LICENSE_FILES = LICENSE.mit From thomas.petazzoni at bootlin.com Mon Feb 5 10:18:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:18:30 +0100 Subject: [Buildroot] [PATCH] package/autoconf: bump to version 2.72 In-Reply-To: <20240118182808.551258-1-francois.perrad@gadz.org> References: <20240118182808.551258-1-francois.perrad@gadz.org> Message-ID: <20240205111830.14a6a456@windsurf> Hello Fran?ois, On Thu, 18 Jan 2024 19:28:08 +0100 Francois Perrad wrote: > https://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS?h=v2.72 > Signed-off-by: Francois Perrad > --- > package/autoconf/0001-dont-add-dirty-to-version.patch | 2 +- > package/autoconf/autoconf.hash | 2 +- > package/autoconf/autoconf.mk | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Following your feedback, I applied and pushed your patch to master. Let's watch and see how things go in the autobuilders in the next few days. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 10:17:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:17:52 +0100 Subject: [Buildroot] [git commit] package/autoconf: bump to version 2.72 Message-ID: <20240205101903.C345286A1D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=524f3536029dace3ce9aa154d3ca4685582e1955 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS?h=v2.72 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/autoconf/0001-dont-add-dirty-to-version.patch | 2 +- package/autoconf/autoconf.hash | 2 +- package/autoconf/autoconf.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/autoconf/0001-dont-add-dirty-to-version.patch b/package/autoconf/0001-dont-add-dirty-to-version.patch index e8d9f6a29d..8df2276865 100644 --- a/package/autoconf/0001-dont-add-dirty-to-version.patch +++ b/package/autoconf/0001-dont-add-dirty-to-version.patch @@ -17,7 +17,7 @@ Signed-off-by: Gustavo Zacarias diff -Nura autoconf-2.69.orig/build-aux/git-version-gen autoconf-2.69/build-aux/git-version-gen --- autoconf-2.69.orig/build-aux/git-version-gen 2013-06-27 11:31:02.340200154 -0300 +++ autoconf-2.69/build-aux/git-version-gen 2013-06-27 11:31:13.734577033 -0300 -@@ -203,7 +203,7 @@ +@@ -210,7 +210,7 @@ *) # Append the suffix only if there isn't one already. case $v in *-dirty) ;; diff --git a/package/autoconf/autoconf.hash b/package/autoconf/autoconf.hash index de0840dd84..f94b2d9de5 100644 --- a/package/autoconf/autoconf.hash +++ b/package/autoconf/autoconf.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 autoconf-2.71.tar.xz +sha256 ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a autoconf-2.72.tar.xz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYINGv3 sha256 1f1cde9fb68b9b3cff18c420894bec5bd4defacd700b7d13df54a887301e5350 COPYING.EXCEPTION diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 15ce9d5927..48bfc80e7f 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_VERSION = 2.71 +AUTOCONF_VERSION = 2.72 AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.xz AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf From yann.morin.1998 at free.fr Mon Feb 5 10:19:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 11:19:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 In-Reply-To: <399bbbdbc865bb5fab6fa7dbdad653f9aa240da2.camel@embeddedTS.com> References: <399bbbdbc865bb5fab6fa7dbdad653f9aa240da2.camel@embeddedTS.com> Message-ID: Kris, All, On 2024-02-01 13:59 -0800, Kris Bahnsen via buildroot spake thusly: > From 55e8d294997af933bb3d832b73229bebefa45044 Mon Sep 17 00:00:00 2001 > From: Kris Bahnsen > Date: Thu, 1 Feb 2024 20:46:39 +0000 > Subject: [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 > > Release changelog: > - Use default values for IQ calibration correction when the eFuse > register has zero values. > - Fix for "WILC1000 Firmware initialization issue" by updating > the PMU clock switching sequence during firmware initialization. > > Signed-off-by: Kris Bahnsen It seems your patch got badly mangled, and I had issues applying it (git-am whined the patch was empty). And I notice that the mail headers are included in the patch. Not sure what happen. Using "git send-email" is known to send correctly formatted patches, so maybe check if you can do that next time. Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/wilc-firmware/wilc-firmware.hash | 2 +- > package/wilc-firmware/wilc-firmware.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc-firmware/wilc-firmware.hash > index 802cb4f9b1..8a7957a1d2 100644 > --- a/package/wilc-firmware/wilc-firmware.hash > +++ b/package/wilc-firmware/wilc-firmware.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0 wilc-firmware-wilc_linux_16_1.tar.gz > +sha256 6cd5fc52150520bedb736f58124063041b4d9849ea33481a8b075f51aec64f8e wilc-firmware-wilc_linux_16_1_2.tar.gz > sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw > diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc-firmware/wilc-firmware.mk > index 12c825cf92..3381162bbd 100644 > --- a/package/wilc-firmware/wilc-firmware.mk > +++ b/package/wilc-firmware/wilc-firmware.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WILC_FIRMWARE_VERSION = wilc_linux_16_1 > +WILC_FIRMWARE_VERSION = wilc_linux_16_1_2 > WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) > > WILC_FIRMWARE_LICENSE = PROPRIETARY > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Mon Feb 5 10:19:17 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:19:17 +0100 Subject: [Buildroot] [git commit] package/python-pyspnego: bump to version 0.10.2 Message-ID: <20240205102047.E5E8286A22@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66310c8ccb3b2022bcb2a938147040bf589b8636 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyspnego/python-pyspnego.hash | 7 +++---- package/python-pyspnego/python-pyspnego.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash index 0ae6cf1d4e..dc808d4204 100644 --- a/package/python-pyspnego/python-pyspnego.hash +++ b/package/python-pyspnego/python-pyspnego.hash @@ -1,6 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyspnego/json -md5 93ab1a088d65e6a7c97efdb567ba37b0 pyspnego-0.7.0.tar.gz -sha256 da78096fd7c9f40e716f6fbe3e30d913103d75fd676f839f98fc3a6fee92fbe3 pyspnego-0.7.0.tar.gz - -# Locally computed +md5 b633cab73a1481c5dbc2d6f6857569d0 pyspnego-0.10.2.tar.gz +sha256 9a22c23aeae7b4424fdb2482450d3f8302ac012e2644e1cfe735cf468fcd12ed pyspnego-0.10.2.tar.gz +# Locally computed sha256 checksums sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk index 2fbb779d98..740e6eec15 100644 --- a/package/python-pyspnego/python-pyspnego.mk +++ b/package/python-pyspnego/python-pyspnego.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSPNEGO_VERSION = 0.7.0 +PYTHON_PYSPNEGO_VERSION = 0.10.2 PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz -PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/97/f3/bdf3cd5f4c5a1bf9e1d4bb771c133850ee08241c18cafd90a6d872937a9f +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/3a/c3/401a5ae889b51f80e91474b6acda7dae8d704c6fe8424fd40e0ff0702812 PYTHON_PYSPNEGO_SETUP_TYPE = setuptools PYTHON_PYSPNEGO_LICENSE = MIT PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 10:21:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:21:50 +0100 Subject: [Buildroot] [PATCH] package/flannel: Bump to version 0.24.2 In-Reply-To: References: Message-ID: <7c076341-a91b-461c-86e2-27e0bca1a5ed@korsgaard.com> On 20/01/2024 12.00, Geoff Levand wrote: > Signed-off-by: Geoff Levand > > --- > package/flannel/flannel.hash | 2 +- > package/flannel/flannel.mk | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash > index bafc453097..c1ceeed9e8 100644 > --- a/package/flannel/flannel.hash > +++ b/package/flannel/flannel.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz > +sha256 f9e68bc9c5b41ee7f721a754c9fa4eddf3da775faa9e638581a564e33b3fabcf flannel-0.24.2.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk > index b4e2b2f777..515ecfca86 100644 > --- a/package/flannel/flannel.mk > +++ b/package/flannel/flannel.mk > @@ -4,7 +4,8 @@ > # > ################################################################################ > > -FLANNEL_VERSION = 0.14.0 > +FLANNEL_VERSION = 0.24.2 > +FLANNEL_SOURCE = flannel-$(FLANNEL_VERSION).tar.gz I am not sure why you are adding this, as that is already the default value as pointed out by utils/check-package: package/flannel/flannel.mk:8: remove default value of _SOURCE variable (http://nightly.buildroot.org/#generic-package-reference) Committed with that fixed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 10:22:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:22:01 +0100 Subject: [Buildroot] [git commit] package/flannel: Bump to version 0.24.2 Message-ID: <20240205102214.94AEC86A3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2aec6008e861ccaec6ce473d7b911ce41ad253e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Geoff Levand [Peter: drop _SOURCE] Signed-off-by: Peter Korsgaard --- package/flannel/flannel.hash | 2 +- package/flannel/flannel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index bafc453097..c1ceeed9e8 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz +sha256 f9e68bc9c5b41ee7f721a754c9fa4eddf3da775faa9e638581a564e33b3fabcf flannel-0.24.2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index b4e2b2f777..02e62256cf 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLANNEL_VERSION = 0.14.0 +FLANNEL_VERSION = 0.24.2 FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 From arnout at mind.be Mon Feb 5 10:16:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:16:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyrsistent: bump to version 0.20.0 In-Reply-To: <20240111021434.2655120-1-james.hilliard1@gmail.com> References: <20240111021434.2655120-1-james.hilliard1@gmail.com> Message-ID: <7636c39e-89a7-43a9-a758-c08c11d04735@mind.be> On 11/01/2024 03:14, James Hilliard wrote: > License hash changed due to year update: > https://github.com/tobgu/pyrsistent/commit/acdffe6967a821165155ac16bee48054fd61385a > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyrsistent/python-pyrsistent.hash | 6 +++--- > package/python-pyrsistent/python-pyrsistent.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-pyrsistent/python-pyrsistent.hash b/package/python-pyrsistent/python-pyrsistent.hash > index d5c9a22656..780a7f09d9 100644 > --- a/package/python-pyrsistent/python-pyrsistent.hash > +++ b/package/python-pyrsistent/python-pyrsistent.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyrsistent/json > -md5 761266eab1f9dc9280cdb0a6d2dedb08 pyrsistent-0.19.3.tar.gz > -sha256 1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 pyrsistent-0.19.3.tar.gz > +md5 dce0f9a13668dbf8bb76f74954b4a42a pyrsistent-0.20.0.tar.gz > +sha256 4c48f78f62ab596c679086084d0dd13254ae4f3d6c72a83ffdf5ebdef8f265a4 pyrsistent-0.20.0.tar.gz > # Locally computed sha256 checksums > -sha256 3ea56753cbd0cc897d3f4414a902f5694991db7c1b3abb8230216381185f9112 LICENSE.mit > +sha256 3fd3d3d1ab9c733ee453fbf3bbbaa845440d0d8c20d7b5a039d2e46a2ed7fc01 LICENSE.mit > diff --git a/package/python-pyrsistent/python-pyrsistent.mk b/package/python-pyrsistent/python-pyrsistent.mk > index f3457feebe..6c52d7dbc8 100644 > --- a/package/python-pyrsistent/python-pyrsistent.mk > +++ b/package/python-pyrsistent/python-pyrsistent.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYRSISTENT_VERSION = 0.19.3 > +PYTHON_PYRSISTENT_VERSION = 0.20.0 > PYTHON_PYRSISTENT_SOURCE = pyrsistent-$(PYTHON_PYRSISTENT_VERSION).tar.gz > -PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/bf/90/445a7dbd275c654c268f47fa9452152709134f61f09605cf776407055a89 > +PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/ce/3a/5031723c09068e9c8c2f0bc25c3a9245f2b1d1aea8396c787a408f2b95ca > PYTHON_PYRSISTENT_SETUP_TYPE = setuptools > PYTHON_PYRSISTENT_LICENSE = MIT > PYTHON_PYRSISTENT_LICENSE_FILES = LICENSE.mit From arnout at mind.be Mon Feb 5 10:19:09 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:19:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyspnego: bump to version 0.10.2 In-Reply-To: <20240111023429.2663712-1-james.hilliard1@gmail.com> References: <20240111023429.2663712-1-james.hilliard1@gmail.com> Message-ID: <600a04b9-5378-47b8-9483-17d65718ac75@mind.be> On 11/01/2024 03:34, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyspnego/python-pyspnego.hash | 7 +++---- > package/python-pyspnego/python-pyspnego.mk | 4 ++-- > 2 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash > index 0ae6cf1d4e..dc808d4204 100644 > --- a/package/python-pyspnego/python-pyspnego.hash > +++ b/package/python-pyspnego/python-pyspnego.hash > @@ -1,6 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyspnego/json > -md5 93ab1a088d65e6a7c97efdb567ba37b0 pyspnego-0.7.0.tar.gz > -sha256 da78096fd7c9f40e716f6fbe3e30d913103d75fd676f839f98fc3a6fee92fbe3 pyspnego-0.7.0.tar.gz > - > -# Locally computed > +md5 b633cab73a1481c5dbc2d6f6857569d0 pyspnego-0.10.2.tar.gz > +sha256 9a22c23aeae7b4424fdb2482450d3f8302ac012e2644e1cfe735cf468fcd12ed pyspnego-0.10.2.tar.gz > +# Locally computed sha256 checksums > sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE > diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk > index 2fbb779d98..740e6eec15 100644 > --- a/package/python-pyspnego/python-pyspnego.mk > +++ b/package/python-pyspnego/python-pyspnego.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYSPNEGO_VERSION = 0.7.0 > +PYTHON_PYSPNEGO_VERSION = 0.10.2 > PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz > -PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/97/f3/bdf3cd5f4c5a1bf9e1d4bb771c133850ee08241c18cafd90a6d872937a9f > +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/3a/c3/401a5ae889b51f80e91474b6acda7dae8d704c6fe8424fd40e0ff0702812 > PYTHON_PYSPNEGO_SETUP_TYPE = setuptools > PYTHON_PYSPNEGO_LICENSE = MIT > PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:25:41 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:25:41 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-path: new package In-Reply-To: <20240111025127.2671669-1-james.hilliard1@gmail.com> References: <20240111025127.2671669-1-james.hilliard1@gmail.com> Message-ID: <55897da4-f07d-4456-b3e5-8f5210e4e5b4@mind.be> On 11/01/2024 03:51, James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/Config.in | 1 + > package/python-path/Config.in | 6 ++++++ > package/python-path/python-path.hash | 5 +++++ > package/python-path/python-path.mk | 15 +++++++++++++++ > 4 files changed, 27 insertions(+) > create mode 100644 package/python-path/Config.in > create mode 100644 package/python-path/python-path.hash > create mode 100644 package/python-path/python-path.mk > > diff --git a/package/Config.in b/package/Config.in > index 5b8b15fa54..5ef72e15e2 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1217,6 +1217,7 @@ menu "External python modules" > source "package/python-paramiko/Config.in" > source "package/python-parso/Config.in" > source "package/python-passlib/Config.in" > + source "package/python-path/Config.in" > source "package/python-pathpy/Config.in" > source "package/python-pathtools/Config.in" > source "package/python-pathvalidate/Config.in" > diff --git a/package/python-path/Config.in b/package/python-path/Config.in > new file mode 100644 > index 0000000000..df1eb81a59 > --- /dev/null > +++ b/package/python-path/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_PYTHON_PATH > + bool "python-path" > + help > + A module wrapper for os.path. > + > + https://github.com/jaraco/path This is actually python-pathpy, so why create a new package? Regards, Arnout > diff --git a/package/python-path/python-path.hash b/package/python-path/python-path.hash > new file mode 100644 > index 0000000000..73723302f3 > --- /dev/null > +++ b/package/python-path/python-path.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/path/json > +md5 e4fe8dac2ad5d6e7ea539bdb26d47329 path-16.9.0.tar.gz > +sha256 dfd31c2af60e8889a13538bef302ade7adacdb5351836be22638e2349ddd5d7b path-16.9.0.tar.gz > +# Locally computed sha256 checksums > +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE > diff --git a/package/python-path/python-path.mk b/package/python-path/python-path.mk > new file mode 100644 > index 0000000000..620fc88e53 > --- /dev/null > +++ b/package/python-path/python-path.mk > @@ -0,0 +1,15 @@ > +################################################################################ > +# > +# python-path > +# > +################################################################################ > + > +PYTHON_PATH_VERSION = 16.9.0 > +PYTHON_PATH_SOURCE = path-$(PYTHON_PATH_VERSION).tar.gz > +PYTHON_PATH_SITE = https://files.pythonhosted.org/packages/8d/50/2a1a3287715c87d135dd1dcbd9f7bca4200302cfcc8c28ced1a8035d7894 > +PYTHON_PATH_SETUP_TYPE = setuptools > +PYTHON_PATH_LICENSE = MIT > +PYTHON_PATH_LICENSE_FILES = LICENSE > +PYTHON_PATH_DEPENDENCIES = host-python-setuptools-scm > + > +$(eval $(python-package)) From peter at korsgaard.com Mon Feb 5 10:26:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:26:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/wolftpm: bump version to v3.1.0 In-Reply-To: <20240119165659.155158-1-dimi@tpm.dev> References: <20240119165659.155158-1-dimi@tpm.dev> Message-ID: On 19/01/2024 17.56, Dimi Tomov wrote: > From: Dimitar Tomov > > Signed-off-by: Dimitar Tomov > --- > package/wolftpm/wolftpm.hash | 2 +- > package/wolftpm/wolftpm.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/wolftpm/wolftpm.hash b/package/wolftpm/wolftpm.hash > index 3329528095..33d0aa2414 100644 > --- a/package/wolftpm/wolftpm.hash > +++ b/package/wolftpm/wolftpm.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 d8e06e77893f104be7eb9421cac50518552ad9c5fc7fe8a9c1cdfaf4f11b92df wolftpm-2.7.0.tar.gz > +sha256 b4f6c090cad7fdbd4fd976f1bd8f271694669459b240fa14bec60a89b749dc1b wolftpm-3.1.0.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE > diff --git a/package/wolftpm/wolftpm.mk b/package/wolftpm/wolftpm.mk > index db332712f5..4d1d459801 100644 > --- a/package/wolftpm/wolftpm.mk > +++ b/package/wolftpm/wolftpm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WOLFTPM_VERSION = 2.7.0 > +WOLFTPM_VERSION = 3.1.0 > WOLFTPM_SITE = $(call github,wolfSSL,wolfTPM,v$(WOLFTPM_VERSION)) > WOLFTPM_INSTALL_STAGING = YES > WOLFTPM_LICENSE = GPL-2.0+ Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 10:23:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:23:37 +0100 Subject: [Buildroot] [git commit] package/wolftpm: bump version to v3.1.0 Message-ID: <20240205102653.D8FE586A35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4585259743e0ff3977c05c864dc752c040023738 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Dimitar Tomov Signed-off-by: Peter Korsgaard --- package/wolftpm/wolftpm.hash | 2 +- package/wolftpm/wolftpm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wolftpm/wolftpm.hash b/package/wolftpm/wolftpm.hash index 3329528095..33d0aa2414 100644 --- a/package/wolftpm/wolftpm.hash +++ b/package/wolftpm/wolftpm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d8e06e77893f104be7eb9421cac50518552ad9c5fc7fe8a9c1cdfaf4f11b92df wolftpm-2.7.0.tar.gz +sha256 b4f6c090cad7fdbd4fd976f1bd8f271694669459b240fa14bec60a89b749dc1b wolftpm-3.1.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/wolftpm/wolftpm.mk b/package/wolftpm/wolftpm.mk index db332712f5..4d1d459801 100644 --- a/package/wolftpm/wolftpm.mk +++ b/package/wolftpm/wolftpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -WOLFTPM_VERSION = 2.7.0 +WOLFTPM_VERSION = 3.1.0 WOLFTPM_SITE = $(call github,wolfSSL,wolfTPM,v$(WOLFTPM_VERSION)) WOLFTPM_INSTALL_STAGING = YES WOLFTPM_LICENSE = GPL-2.0+ From arnout at mind.be Mon Feb 5 10:31:10 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:31:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pytest: bump to version 7.4.4 In-Reply-To: <20240111031649.2684726-1-james.hilliard1@gmail.com> References: <20240111031649.2684726-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 04:16, James Hilliard wrote: > Drop no longer required python-py runtime dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Thank you Marcin for reviewing. Regards, Arnout > --- > package/python-pytest/Config.in | 1 - > package/python-pytest/python-pytest.hash | 4 ++-- > package/python-pytest/python-pytest.mk | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in > index c8f9a6eb5b..b42457e67d 100644 > --- a/package/python-pytest/Config.in > +++ b/package/python-pytest/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_PYTEST > select BR2_PACKAGE_PYTHON_INICONFIG # runtime > select BR2_PACKAGE_PYTHON_PACKAGING # runtime > select BR2_PACKAGE_PYTHON_PLUGGY # runtime > - select BR2_PACKAGE_PYTHON_PY # runtime > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > help > diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash > index 7f79b94d8d..e710003535 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 8620558e8971b11207b2d6b083906cf9 pytest-7.4.2.tar.gz > -sha256 a766259cfab564a2ad52cb1aae1b881a75c3eb7e34ca3779697c23ed47c47069 pytest-7.4.2.tar.gz > +md5 e2ac4c70861f26d735b64e5687bb218e pytest-7.4.4.tar.gz > +sha256 2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280 pytest-7.4.4.tar.gz > # Locally computer sha256 > sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE > diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk > index 326d951a32..3170a1a9db 100644 > --- a/package/python-pytest/python-pytest.mk > +++ b/package/python-pytest/python-pytest.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYTEST_VERSION = 7.4.2 > +PYTHON_PYTEST_VERSION = 7.4.4 > PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz > -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/e5/d0/18209bb95db8ee693a9a04fe056ab0663c6d6b1baf67dd50819dd9cd4bd7 > +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/80/1f/9d8e98e4133ffb16c90f3b405c43e38d3abb715bb5d7a63a5a684f7e46a3 > PYTHON_PYTEST_SETUP_TYPE = setuptools > PYTHON_PYTEST_LICENSE = MIT > PYTHON_PYTEST_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:31:01 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:31:01 +0100 Subject: [Buildroot] [git commit] package/python-pytest: bump to version 7.4.4 Message-ID: <20240205103117.DF6B386A88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0149b50166e11d90c90f603dc488c2b964c019a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required python-py runtime dependency. Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-pytest/Config.in | 1 - package/python-pytest/python-pytest.hash | 4 ++-- package/python-pytest/python-pytest.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in index c8f9a6eb5b..b42457e67d 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_PYTEST select BR2_PACKAGE_PYTHON_INICONFIG # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PLUGGY # runtime - select BR2_PACKAGE_PYTHON_PY # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash index 7f79b94d8d..e710003535 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 8620558e8971b11207b2d6b083906cf9 pytest-7.4.2.tar.gz -sha256 a766259cfab564a2ad52cb1aae1b881a75c3eb7e34ca3779697c23ed47c47069 pytest-7.4.2.tar.gz +md5 e2ac4c70861f26d735b64e5687bb218e pytest-7.4.4.tar.gz +sha256 2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280 pytest-7.4.4.tar.gz # Locally computer sha256 sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk index 326d951a32..3170a1a9db 100644 --- a/package/python-pytest/python-pytest.mk +++ b/package/python-pytest/python-pytest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_VERSION = 7.4.2 +PYTHON_PYTEST_VERSION = 7.4.4 PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/e5/d0/18209bb95db8ee693a9a04fe056ab0663c6d6b1baf67dd50819dd9cd4bd7 +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/80/1f/9d8e98e4133ffb16c90f3b405c43e38d3abb715bb5d7a63a5a684f7e46a3 PYTHON_PYTEST_SETUP_TYPE = setuptools PYTHON_PYTEST_LICENSE = MIT PYTHON_PYTEST_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:30:59 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:30:59 +0100 Subject: [Buildroot] [git commit] package/python-pytest-asyncio: bump to version 0.23.3 Message-ID: <20240205103117.D430C86A81@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a7afebe03803484261a82b5ca3fa59813e9b324 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new host-python-setuptools-scm build dependency. Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-pytest-asyncio/python-pytest-asyncio.hash | 4 ++-- package/python-pytest-asyncio/python-pytest-asyncio.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index f6cc1d2413..29a38c7dc7 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json -md5 1d10f607444a375c1425a2a90960006e pytest-asyncio-0.21.1.tar.gz -sha256 40a7eae6dded22c7b604986855ea48400ab15b069ae38116e8c01238e9eeb64d pytest-asyncio-0.21.1.tar.gz +md5 0c81f6de855e546180de424c0db05c20 pytest-asyncio-0.23.3.tar.gz +sha256 af313ce900a62fbe2b1aed18e37ad757f1ef9940c6b6a88e2954de38d6b1fb9f pytest-asyncio-0.23.3.tar.gz # Locally computed sha256 checksums sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index 5c5efd819c..8464c70f5f 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PYTEST_ASYNCIO_VERSION = 0.21.1 +PYTHON_PYTEST_ASYNCIO_VERSION = 0.23.3 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/5a/85/d39ef5f69d5597a206f213ce387bcdfa47922423875829f7a98a87d33281 +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/1d/27/f036ec4bcbfd056c54572d7169ba3dbb54e7181f02f21caadd3aecb9cf5b PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE +PYTHON_PYTEST_ASYNCIO_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From arnout at mind.be Mon Feb 5 10:31:20 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:31:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pytest-asyncio: bump to version 0.23.3 In-Reply-To: <20240111030356.2678848-1-james.hilliard1@gmail.com> References: <20240111030356.2678848-1-james.hilliard1@gmail.com> Message-ID: <8a7596c5-c74a-477c-994a-30f2f779a0f6@mind.be> On 11/01/2024 04:03, James Hilliard wrote: > Add new host-python-setuptools-scm build dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Thank you Marcin for reviewing. Regards, Arnout > --- > package/python-pytest-asyncio/python-pytest-asyncio.hash | 4 ++-- > package/python-pytest-asyncio/python-pytest-asyncio.mk | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash > index f6cc1d2413..29a38c7dc7 100644 > --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash > +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json > -md5 1d10f607444a375c1425a2a90960006e pytest-asyncio-0.21.1.tar.gz > -sha256 40a7eae6dded22c7b604986855ea48400ab15b069ae38116e8c01238e9eeb64d pytest-asyncio-0.21.1.tar.gz > +md5 0c81f6de855e546180de424c0db05c20 pytest-asyncio-0.23.3.tar.gz > +sha256 af313ce900a62fbe2b1aed18e37ad757f1ef9940c6b6a88e2954de38d6b1fb9f pytest-asyncio-0.23.3.tar.gz > # Locally computed sha256 checksums > sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE > diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk > index 5c5efd819c..8464c70f5f 100644 > --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk > +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -PYTHON_PYTEST_ASYNCIO_VERSION = 0.21.1 > +PYTHON_PYTEST_ASYNCIO_VERSION = 0.23.3 > PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz > -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/5a/85/d39ef5f69d5597a206f213ce387bcdfa47922423875829f7a98a87d33281 > +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/1d/27/f036ec4bcbfd056c54572d7169ba3dbb54e7181f02f21caadd3aecb9cf5b > PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools > PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 > PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE > +PYTHON_PYTEST_ASYNCIO_DEPENDENCIES = host-python-setuptools-scm > > $(eval $(python-package)) From bubu at git.sr.ht Mon Feb 5 10:32:15 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 10:32:15 -0000 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package Message-ID: <170712853287.18164.6368517214119629150-0@git.sr.ht> From: Marcus Hoffmann Calling `setup.py` build builds and installs an empty package after upstream changed their packaging. Calling setuptools via `python -m build` builds the package correctly. --- package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk index 5a6e7733be..cb8a0d8cc9 100644 --- a/package/python-minimalmodbus/python-minimalmodbus.mk +++ b/package/python-minimalmodbus/python-minimalmodbus.mk @@ -7,7 +7,8 @@ PYTHON_MINIMALMODBUS_VERSION = 2.1.1 PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE -- 2.38.5 From peter at korsgaard.com Mon Feb 5 10:32:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:32:12 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add strace runtime test In-Reply-To: <20240118211148.70993-1-ju.o@free.fr> References: <20240118211148.70993-1-ju.o@free.fr> Message-ID: <74a89cd6-f4b6-4661-b744-cf6eebc566d7@korsgaard.com> On 18/01/2024 22.11, Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit b200632 with commands: > > make check-package > ... > 0 warnings generated > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_strace > ... > OK Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 5 10:32:33 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:32:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pythran: bump to version 0.15.0 In-Reply-To: <20240111040835.2702608-1-james.hilliard1@gmail.com> References: <20240111040835.2702608-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 05:08, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pythran/python-pythran.hash | 4 ++-- > package/python-pythran/python-pythran.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pythran/python-pythran.hash b/package/python-pythran/python-pythran.hash > index 2dfc445b2f..a46825c933 100644 > --- a/package/python-pythran/python-pythran.hash > +++ b/package/python-pythran/python-pythran.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/pythran/json > -md5 3090288af50566af75cb058d1878aaad pythran-0.13.1.tar.gz > -sha256 8aad08162f010e5425a7b254dd68d83311b430bb29f9252dce2eff3ba39497dd pythran-0.13.1.tar.gz > +md5 cc6fa05e583733182d06d2e41e03cc10 pythran-0.15.0.tar.gz > +sha256 f9bc61bcb96df2cd4b578abc5a62dfb3fbb0b0ef02c264513dfb615c5f87871c pythran-0.15.0.tar.gz > # Locally computed sha256 checksums > sha256 0be9f14c66a9a3cb66d5263a6495437862ce0c9cdf60d4a6c36d1e51b1244c6e LICENSE > sha256 e1c0ed0a99e4462016d79d835f1f479b78c4d4a07fe66598e97f449503ffd178 docs/LICENSE.rst > diff --git a/package/python-pythran/python-pythran.mk b/package/python-pythran/python-pythran.mk > index 25735ad95a..43853a514d 100644 > --- a/package/python-pythran/python-pythran.mk > +++ b/package/python-pythran/python-pythran.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYTHRAN_VERSION = 0.13.1 > +PYTHON_PYTHRAN_VERSION = 0.15.0 > PYTHON_PYTHRAN_SOURCE = pythran-$(PYTHON_PYTHRAN_VERSION).tar.gz > -PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/8d/d8/b27e8dc3f3a03dcd317d40d9df0ae07ebbd85444585973ceba07716934d0 > +PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/82/31/cc6fd7a2b91efc6cdb03e7c42df895b4a65a8f049b074579d45d1def746f > PYTHON_PYTHRAN_SETUP_TYPE = setuptools > PYTHON_PYTHRAN_LICENSE = BSD-3-Clause > PYTHON_PYTHRAN_LICENSE_FILES = LICENSE docs/LICENSE.rst From peter at korsgaard.com Mon Feb 5 10:31:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:31:27 +0100 Subject: [Buildroot] [git commit] support/testing: add strace runtime test Message-ID: <20240205103244.2E20E86A8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=988a2115c2fe65c8a2f5cfa049aa8f4e38c149dc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_strace.py | 37 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 02b7516a92..8d280eff47 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1818,6 +1818,7 @@ F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py +F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ diff --git a/support/testing/tests/package/test_strace.py b/support/testing/tests/package/test_strace.py new file mode 100644 index 0000000000..c1cba2173f --- /dev/null +++ b/support/testing/tests/package/test_strace.py @@ -0,0 +1,37 @@ +import os + +import infra.basetest + + +class TestStrace(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_STRACE=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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("strace --version") + + test_file = "buildroot-strace-test.txt" + test_file_mode = "0600" + strace_log = "strace.log" + + # Create a test file. + self.assertRunOk(f"touch {test_file}") + + # Run strace on a chmod + cmd = f"strace -o {strace_log} chmod {test_file_mode} {test_file}" + self.assertRunOk(cmd) + + # Check the strace log contain a call to chmod() + expected_str = f"chmod(\"{test_file}\", {test_file_mode}) = 0" + self.assertRunOk(f"grep -F '{expected_str}' {strace_log}") From arnout at mind.be Mon Feb 5 10:33:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:33:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pytz: bump to version 2023.3.post1 In-Reply-To: <20240111041150.2704233-1-james.hilliard1@gmail.com> References: <20240111041150.2704233-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 05:11, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pytz/python-pytz.hash | 4 ++-- > package/python-pytz/python-pytz.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash > index 861f9d6f35..be6f0e976b 100644 > --- a/package/python-pytz/python-pytz.hash > +++ b/package/python-pytz/python-pytz.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pytz/json > -md5 fe54c8f8a1544b4e78b523b264ab071b pytz-2023.3.tar.gz > -sha256 1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588 pytz-2023.3.tar.gz > +md5 84e6569fcc917b096cca1063819c4ab0 pytz-2023.3.post1.tar.gz > +sha256 7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b pytz-2023.3.post1.tar.gz > # Locally computed sha256 checksums > sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt > diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk > index 4754efe41a..182d8156fc 100644 > --- a/package/python-pytz/python-pytz.mk > +++ b/package/python-pytz/python-pytz.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYTZ_VERSION = 2023.3 > +PYTHON_PYTZ_VERSION = 2023.3.post1 > PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz > -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/5e/32/12032aa8c673ee16707a9b6cdda2b09c0089131f35af55d443b6a9c69c1d > +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/69/4f/7bf883f12ad496ecc9514cd9e267b29a68b3e9629661a2bbc24f80eff168 > PYTHON_PYTZ_SETUP_TYPE = setuptools > PYTHON_PYTZ_LICENSE = MIT > PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From giulio.benetti at benettiengineering.com Mon Feb 5 10:33:26 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 11:33:26 +0100 Subject: [Buildroot] [PATCH v3 3/3] board/d-link/dns320l: new board In-Reply-To: <20231006140511.3840643-4-enki@fsck.pl> References: <20231004131256.2113233-2-enki@fsck.pl> <20231006140511.3840643-4-enki@fsck.pl> Message-ID: <4551a4fa-db14-41dd-8bc0-c384d552e3c5@benettiengineering.com> Hi Maciej, sorry for the late reply, On 06/10/23 16:05, Maciej Grela wrote: > Add support for the D-Link DNS-320L using: > > - U-Boot 1.1.4 (in device flash) > - Linux kernel 6.5.5 > > This is a 2-Bay 3.5'' SATA NAS with the following specs: > > - Marvell 88F6702 (1 GHz) CPU > - 256 MiB DDR2 RAM > - 128 MiB NAND Flash > - 2 x SATA > - 1 x 1000 Mbit/s Ethernet port > - 1 x USB 2.0 > > The builtin bootloader banner is: > U-Boot 1.1.4 (Aug 22 2012 - 17:06:54) Marvell version: 3.6.0.DNS-320L.01 > > Manufacturer product page: http://sharecenter.dlink.com/products/DNS-320 > Device wiki: https://wikidevi.wi-cat.ru/D-Link_DNS-320L_rev_A1 > > Signed-off-by: Maciej Grela > --- > DEVELOPERS | 6 + > board/d-link/dns320l/dts/kirkwood-dns320l.dts | 218 ++++++++++++++++++ > configs/dns320l_defconfig | 16 ++ > 3 files changed, 240 insertions(+) > create mode 100644 board/d-link/dns320l/dts/kirkwood-dns320l.dts > create mode 100644 configs/dns320l_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index c45e7315da..76e8644073 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1950,6 +1950,12 @@ N: Ludwig Kormann > F: board/in-circuit/ > F: configs/icnova* > > +N: Maciej Grela > +F: board/d-link/dns320l/ > +F: configs/dns320l_defconfig > +F: package/dns320l-daemon > +F: package/iniparser The 2 lines above should be part of the respective patches and not of this one, > + > N: Maeva Manuel > F: board/freescale/imx8qmmek/ > F: configs/freescale_imx8qmmek_defconfig > diff --git a/board/d-link/dns320l/dts/kirkwood-dns320l.dts b/board/d-link/dns320l/dts/kirkwood-dns320l.dts > new file mode 100644 > index 0000000000..660508a51a > --- /dev/null > +++ b/board/d-link/dns320l/dts/kirkwood-dns320l.dts > @@ -0,0 +1,218 @@ > +/dts-v1/; > + > +/* > + * Device Tree file for DLINK DNS-320L > + * > + * Copyright (C) 2015, Sunke Schl?ters > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version > + * 2 of the License, or (at your option) any later version. > + * > + * > + * This file is based on the work of Andreas B?hler : > + * - http://www.aboehler.at/doku/doku.php/projects:dns320l > + * - http://www.aboehler.at/hg/linux-dns320l/file/ba7a60ad7687/linux-3.12/kirkwood-dns320l.dts > + */ > + > +#include "marvell/kirkwood.dtsi" > +#include "marvell/kirkwood-6281.dtsi" > + > +/ { > + model = "D-Link DNS-320L"; > + compatible = "dlink,dns-320l", "marvell,kirkwood-88f6702", "marvell,kirkwood"; > + > + memory { > + device_type = "memory"; > + reg = <0x00000000 0x10000000>; > + }; > + > + chosen { > + bootargs = "console=ttyS0,115200n8 earlyprintk"; > + stdout-path = &uart0; > + }; > + > + gpio-keys { > + compatible = "gpio-keys"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>; > + pinctrl-names = "default"; > + > + button at 1 { > + label = "Reset push button"; > + linux,code = ; > + gpios = <&gpio0 28 1>; > + }; > + button at 2 { > + label = "USB unmount button"; > + linux,code = ; > + gpios = <&gpio0 27 1>; > + }; > + }; > + > + gpio-leds { > + compatible = "gpio-leds"; > + pinctrl-0 = <&pmx_led_usb_blue &pmx_led_red_right_hdd > + &pmx_led_red_left_hdd &pmx_led_usb_orange>; > + pinctrl-names = "default"; > + > + blue-usb { > + label = "usb_blue"; > + gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; > + }; > + orange-usb { > + label = "usb_orange"; > + gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; > + }; > + orange-l_hdd { > + label = "hdd1_orange"; > + gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; > + }; > + orange-r_hdd { > + label = "hdd2_orange"; > + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; > + }; > + }; > + > + ocp at f1000000 { > + pinctrl: pin-controller at 10000 { > + > + pinctrl-0 = <&pmx_button_power>; > + pinctrl-names = "default"; > + > + pmx_sata0: pmx-sata0 { > + marvell,pins = "mpp20"; > + marvell,function = "sata0"; > + }; > + pmx_sata1: pmx-sata1 { > + marvell,pins = "mpp21"; > + marvell,function = "sata1"; > + }; > + pmx_led_red_right_hdd: pmx-led-red-right-hdd { > + marvell,pins = "mpp22"; > + marvell,function = "gpio"; > + }; > + pmx_led_red_left_hdd: pmx-led-red-left-hdd { > + marvell,pins = "mpp23"; > + marvell,function = "gpio"; > + }; > + pmx_power_sata: pmx-power-sata { > + marvell,pins = "mpp24"; > + marvell,function = "gpio"; > + }; > + pmx_led_usb_blue: pmx-led-usb-blue { > + marvell,pins = "mpp25"; > + marvell,function = "gpio"; > + }; > + pmx_led_usb_orange: pmx-led-usb-orange { > + marvell,pins = "mpp26"; > + marvell,function = "gpio"; > + }; > + pmx_button_usb_copy: pmx-button-usb-copy { > + marvell,pins = "mpp27"; > + marvell,function = "gpio"; > + }; > + pmx_button_reset: pmx-button-reset { > + marvell,pins = "mpp28"; > + marvell,function = "gpio"; > + }; > + pmx_button_power: pmx-button-power { // I can't get this one to trigger a button press... > + marvell,pins = "mpp29"; > + marvell,function = "gpio"; > + }; > + }; > + sata at 80000 { > + status = "okay"; > + nr-ports = <2>; > + }; > + serial at 12000 { > + status = "okay"; > + }; > + > + serial at 12100 { > + pinctrl-0 = <&pmx_uart1>; > + pinctrl-names = "default"; > + status = "okay"; > + }; > + }; > + > + regulators { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_power_sata>; > + pinctrl-names = "default"; > + > + sata_power: regulator at 1 { > + compatible = "regulator-fixed"; > + reg = <1>; > + regulator-name = "SATA Power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + gpio = <&gpio1 24 0>; > + }; > + }; > +}; > + > +&nand { > + pinctrl-0 = <&pmx_nand>; > + pinctrl-names = "default"; > + status = "okay"; > + chip-delay = <35>; > + > + partition at 0 { > + label = "u-boot"; > + reg = <0x0000000 0x100000>; > + read-only; > + }; > + > + partition at 100000 { > + label = "uImage"; > + reg = <0x0100000 0x500000>; > + }; > + > + partition at 600000 { > + label = "ramdisk"; > + reg = <0x0600000 0x500000>; > + }; > + > + partition at b00000 { > + label = "image"; > + reg = <0x0b00000 0x6400000>; > + }; > + > + partition at 6f00000 { > + label = "mini firmware"; > + reg = <0x6f00000 0xa00000>; > + }; > + > + partition at 7900000 { > + label = "config"; > + reg = <0x7900000 0x500000>; > + }; > + > + partition at 7e00000 { > + label = "my-dlink"; > + reg = <0x7e00000 0x200000>; > + }; > +}; > + > +&mdio { > + status = "okay"; > + > + ethphy0: ethernet-phy at 0 { > + reg = <0>; > + }; > +}; > + > +ð0 { > + status = "okay"; > + ethernet0-port at 0 { > + phy-handle = <ðphy0>; > + }; > +}; Is this ^^^ dts pending upstream? > diff --git a/configs/dns320l_defconfig b/configs/dns320l_defconfig > new file mode 100644 > index 0000000000..f281984267 > --- /dev/null > +++ b/configs/dns320l_defconfig > @@ -0,0 +1,16 @@ > +BR2_arm=y Here you haven't specified any particular Arm architecture but MV78260 is specified as a: " ARMv7-compliant CPU cores with the latest Marvell micro-architecture enhancements, with a double precision IEEE-compliant Floating Point Unit (FPU) per core " Maybe you could give a try to enable VFP3-16 since the SoC supports it: https://datasheet.datasheetarchive.com/originals/crawler/marvell.com/1657ba38481c63b54928f3c1d60858fd.pdf Here instead you need: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y because if not set if changes while Buildroot increase Latest Linux Version resulting in build failure: " Incorrect selection of kernel headers: expected 6.6.x, got 6.5.x " > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_SYSTEM_DHCP="eth0" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.5" > +BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" > +BR2_LINUX_KERNEL_APPENDED_UIMAGE=y > +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/d-link/dns320l/dts/kirkwood-dns320l.dts" > +BR2_TARGET_ROOTFS_CPIO=y > +BR2_TARGET_ROOTFS_CPIO_GZIP=y > +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y > + > +# The package is required for proper power management > +BR2_PACKAGE_DNS320L_DAEMON=y I've built tested successfully with utils/docker-run so with the changes above: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Mon Feb 5 10:34:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:34:11 +0100 Subject: [Buildroot] [git commit] support/testing: add tcpdump runtime test Message-ID: <20240205103443.E4AA186A99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=035b4ee8a9ccacfa20c483595acaa65a1af4ad8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_tcpdump.py | 46 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8d280eff47..a03018ab2b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1822,6 +1822,7 @@ F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ +F: support/testing/tests/package/test_tcpdump.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_tcpdump.py b/support/testing/tests/package/test_tcpdump.py new file mode 100644 index 0000000000..42bfc96082 --- /dev/null +++ b/support/testing/tests/package/test_tcpdump.py @@ -0,0 +1,46 @@ +import os +import time + +import infra.basetest + + +class TestTcpdump(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_TCPDUMP=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]) + self.emulator.login() + + capture_file = "capture.pcap" + decode_log = "decode.log" + + # Check the program can execute. + self.assertRunOk("tcpdump --version") + + # Run ping in background. + cmd = "ping localhost >/dev/null &" + self.assertRunOk(cmd) + + time.sleep(1) + + # Capture 3 packets with the message. + cmd = f"tcpdump -c 3 -w {capture_file} icmp" + self.assertRunOk(cmd) + + # Decode the capture file. + cmd = f"tcpdump -r {capture_file} > {decode_log}" + self.assertRunOk(cmd) + + # Check we have ICMP echo requests/replies in the + # decoded capture. + cmd = f"grep -E 'ICMP echo (request|reply)' {decode_log}" + self.assertRunOk(cmd) From peter at korsgaard.com Mon Feb 5 10:35:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:35:12 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add tcpdump runtime test In-Reply-To: <20240118214938.160908-1-ju.o@free.fr> References: <20240118214938.160908-1-ju.o@free.fr> Message-ID: <147a1c36-4289-452a-bc78-a9e2a476a38f@korsgaard.com> On 18/01/2024 22.49, Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit b200632 with commands: > > make check-package > ... > 0 warnings generated > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_tcpdump > ... > OK Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 5 10:36:30 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:36:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyudev: bump to version 0.24.1 In-Reply-To: <20240111041757.2707481-1-james.hilliard1@gmail.com> References: <20240111041757.2707481-1-james.hilliard1@gmail.com> Message-ID: <354c59e5-1320-476d-a18a-5f8ca6991d74@mind.be> On 11/01/2024 05:17, James Hilliard wrote: > Drop no longer required python-six runtime dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyudev/Config.in | 1 - > package/python-pyudev/python-pyudev.hash | 4 ++-- > package/python-pyudev/python-pyudev.mk | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in > index e0da067cc2..aa98c2cc61 100644 > --- a/package/python-pyudev/Config.in > +++ b/package/python-pyudev/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PYUDEV > bool "python-pyudev" > depends on BR2_PACKAGE_HAS_UDEV > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > help > pyudev is a LGPL licenced, pure Python 2/3 binding to > libudev, the device and hardware management and information > diff --git a/package/python-pyudev/python-pyudev.hash b/package/python-pyudev/python-pyudev.hash > index 014bf20933..72eb323e1f 100644 > --- a/package/python-pyudev/python-pyudev.hash > +++ b/package/python-pyudev/python-pyudev.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyudev/json > -md5 17c0a41f0e4dfc016350806a0a60f630 pyudev-0.24.0.tar.gz > -sha256 b2a3afe1c99ea751f8296652557eac559874da2a1b1ec0625178706ec5a345f3 pyudev-0.24.0.tar.gz > +md5 fecaabe9eaa890d2173c7b49ab63a412 pyudev-0.24.1.tar.gz > +sha256 75e54d37218f5ac45b0da1f0fd9cc5e526a3cac3ef1cfad410cf7ab338b01471 pyudev-0.24.1.tar.gz > # Locally computed sha256 checksums > sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING > diff --git a/package/python-pyudev/python-pyudev.mk b/package/python-pyudev/python-pyudev.mk > index 5d48cd4f7c..53d60572a8 100644 > --- a/package/python-pyudev/python-pyudev.mk > +++ b/package/python-pyudev/python-pyudev.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYUDEV_VERSION = 0.24.0 > +PYTHON_PYUDEV_VERSION = 0.24.1 > PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz > -PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/00/8d/810750cb2fc64d7e0dbefc106a9137b157616a95be3f0ea51ca3cf6c762a > +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/20/b6/16961ac3575575260c72928f17df9c99c2a696871e486965ec6e2fa2aff4 > PYTHON_PYUDEV_LICENSE = LGPL-2.1+ > PYTHON_PYUDEV_LICENSE_FILES = COPYING > PYTHON_PYUDEV_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Mon Feb 5 10:37:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:37:01 +0100 Subject: [Buildroot] [git commit] package/esp-hosted: bump version to 2024-01-30 Message-ID: <20240205103709.96BE186ABF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40e36cadf7e17a33408c35f078824109b34f7677 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master * support Linux 6.8 * support ESP32 and ESP32C6 Targets Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/esp-hosted/Config.in | 14 ++++++++++++++ package/esp-hosted/esp-hosted.hash | 2 +- package/esp-hosted/esp-hosted.mk | 8 +++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/package/esp-hosted/Config.in b/package/esp-hosted/Config.in index 42e1afa8c5..5abab73b57 100644 --- a/package/esp-hosted/Config.in +++ b/package/esp-hosted/Config.in @@ -28,4 +28,18 @@ config BR2_PACKAGE_ESP_HOSTED_SPI endchoice +choice + prompt "Target" + default BR2_PACKAGE_ESP_HOSTED_TARGET_ESP32 + help + Select which SoC Target driver is used for + +config BR2_PACKAGE_ESP_HOSTED_TARGET_ESP32 + bool "ESP32" + +config BR2_PACKAGE_ESP_HOSTED_TARGET_ESP32C6 + bool "ESP32C6" + +endchoice + endif diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index b129bb42f9..ff0839076e 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6e023c26355643f2aaf6d79d5910f64c49ea638063235d519075629643518a71 esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404.tar.gz +sha256 1c4df08132d5204a01adc2797e8f6f6d7ff945609b288cfe2dc2ea50789e8af4 esp-hosted-6a25417fc880fd744b3b0d93c11659c3e7d86384.tar.gz sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index 578108c91d..cc61e39b36 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESP_HOSTED_VERSION = ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404 +ESP_HOSTED_VERSION = 6a25417fc880fd744b3b0d93c11659c3e7d86384 ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0 @@ -28,5 +28,11 @@ else ESP_HOSTED_MODULE_MAKE_OPTS = target=sdio endif +ifeq ($(BR2_PACKAGE_ESP_HOSTED_TARGET_ESP32),y) +ESP_HOSTED_MODULE_MAKE_OPTS += ESP_SLAVE=CONFIG_TARGET_ESP32=y +else +ESP_HOSTED_MODULE_MAKE_OPTS += ESP_SLAVE=CONFIG_TARGET_ESP32C6=y +endif + $(eval $(kernel-module)) $(eval $(generic-package)) From thomas.petazzoni at bootlin.com Mon Feb 5 10:37:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:37:36 +0100 Subject: [Buildroot] [PATCH v2] package/esp-hosted: bump version to 2024-01-30 In-Reply-To: <20240130110504.559989-1-giulio.benetti@benettiengineering.com> References: <20240130110504.559989-1-giulio.benetti@benettiengineering.com> Message-ID: <20240205113736.249927a6@windsurf> On Tue, 30 Jan 2024 12:05:04 +0100 Giulio Benetti wrote: > * support Linux 6.8 > * support ESP32 and ESP32C6 Targets > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * drop local patches since they have been upstreamed > * update commit log since Linux 6.8 is supported > --- > package/esp-hosted/Config.in | 14 ++++++++++++++ > package/esp-hosted/esp-hosted.hash | 2 +- > package/esp-hosted/esp-hosted.mk | 8 +++++++- > 3 files changed, 22 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 10:37:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 11:37:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/rdma-core: fix mips4 build In-Reply-To: <20240122212121.7805-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 22 Jan 2024 22:21:21 +0100") References: <20240122212121.7805-1-fontaine.fabrice@gmail.com> Message-ID: <871q9rw60v.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > The 'sync' instruction for MIPS was defined in MIPS-II as taking no > operands. MIPS32 extended the define of 'sync' as taking an optional > unsigned 5 bit immediate. > As a result, replace "sync 0" by "sync" to fix the following build > failure on mips4 raised since the addition of the package in commit > ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 and > https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: > /tmp/ccrBy9fV.s: Assembler messages: > /tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' > Fixes: > - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 > - http://autobuild.buildroot.org/results/2df58f9b98aacf00960932f53510b29199393461 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 5 10:38:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:38:10 +0100 Subject: [Buildroot] [git commit] configs/icnova-a20-adb4006: bump Linux and U-Boot version Message-ID: <20240205103820.2C96586ACD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c39bf6823ae947b215ac870d2b5f54b7e7b65073 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump version of Linux to 6.6.14 and U-Boot to 2024.01 and also use upstream configs and dts. Signed-off-by: Ludwig Kormann Signed-off-by: Thomas Petazzoni --- .../sun7i-a20-icnova-a20-adb4006.dts | 137 --------------------- .../sun7i-a20-icnova-a20-adb4006_uboot_defconfig | 20 --- .../icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi | 62 ---------- configs/icnova-a20-adb4006_defconfig | 14 +-- 4 files changed, 6 insertions(+), 227 deletions(-) diff --git a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts b/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts deleted file mode 100644 index 577ead1d02..0000000000 --- a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts +++ /dev/null @@ -1,137 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -// Copyright (C) 2023 In-Circuit GmbH - -/dts-v1/; - -#include "sun7i-a20-icnova-a20.dtsi" - -#include -#include - -/ { - model = "In-Circuit ICnova A20 ADB4006"; - compatible = "incircuit,icnova-a20-adb4006", "incircuit,icnova-a20", - "allwinner,sun7i-a20"; - - aliases { - serial0 = &uart0; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - hdmi-connector { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi_con_in: endpoint { - remote-endpoint = <&hdmi_out_con>; - }; - }; - }; - - leds { - compatible = "gpio-leds"; - - led-0 { - function = LED_FUNCTION_POWER; - color = ; - gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; /* PH21 */ - default-state = "on"; - }; - - led-1 { - function = LED_FUNCTION_HEARTBEAT; - color = ; - gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* PH20 */ - linux,default-trigger = "heartbeat"; - }; - }; -}; - -&ahci { - target-supply = <®_ahci_5v>; - status = "okay"; -}; - -&codec { - status = "okay"; -}; - -&de { - status = "okay"; -}; - -&ehci0 { - status = "okay"; -}; - -&ehci1 { - status = "okay"; -}; - -&hdmi { - status = "okay"; -}; - -&hdmi_out { - hdmi_out_con: endpoint { - remote-endpoint = <&hdmi_con_in>; - }; -}; - -&mmc0 { - vmmc-supply = <®_vcc3v3>; - bus-width = <4>; - cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ - status = "okay"; -}; - -&ohci0 { - status = "okay"; -}; - -&ohci1 { - status = "okay"; -}; - -&otg_sram { - status = "okay"; -}; - -®_ahci_5v { - status = "okay"; -}; - -&ac_power_supply { - status = "okay"; -}; - -®_usb1_vbus { - status = "okay"; -}; - -®_usb2_vbus { - status = "okay"; -}; - -&uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pb_pins>; - status = "okay"; -}; - -&usb_otg { - dr_mode = "otg"; - status = "okay"; -}; - -&usbphy { - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ - usb1_vbus-supply = <®_usb1_vbus>; - usb2_vbus-supply = <®_usb2_vbus>; - status = "okay"; -}; diff --git a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006_uboot_defconfig b/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006_uboot_defconfig deleted file mode 100644 index f70ffe45ab..0000000000 --- a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006_uboot_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_SUNXI=y -CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-a20-adb4006" -CONFIG_SPL=y -CONFIG_MACH_SUN7I=y -CONFIG_DRAM_CLK=384 -CONFIG_AHCI=y -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SPL_I2C=y -CONFIG_SCSI_AHCI=y -CONFIG_SYS_I2C_MVTWSI=y -CONFIG_SYS_I2C_SLAVE=0x7f -CONFIG_SYS_I2C_SPEED=400000 -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_SUN7I_GMAC=y -CONFIG_AXP_ALDO4_VOLT=2800 -CONFIG_SCSI=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_OHCI_HCD=y diff --git a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi b/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi deleted file mode 100644 index 46616c6bc8..0000000000 --- a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi +++ /dev/null @@ -1,62 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -// Copyright (C) 2023 In-Circuit GmbH - -#include "sun7i-a20.dtsi" -#include "sunxi-common-regulators.dtsi" - -#include - -&cpu0 { - cpu-supply = <®_dcdc2>; -}; - -&gmac { - pinctrl-names = "default"; - pinctrl-0 = <&gmac_mii_pins>; - phy-handle = <&phy1>; - phy-mode = "mii"; - status = "okay"; -}; - -&i2c0 { - status = "okay"; - - axp209: pmic at 34 { - reg = <0x34>; - interrupt-parent = <&nmi_intc>; - interrupts = <0 IRQ_TYPE_LEVEL_LOW>; - }; -}; - -&gmac_mdio { - phy1: ethernet-phy at 1 { - reg = <1>; - }; -}; - -#include "axp209.dtsi" - -®_dcdc2 { - regulator-always-on; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1400000>; - regulator-name = "vdd-cpu"; -}; - -®_dcdc3 { - regulator-always-on; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1400000>; - regulator-name = "vdd-int-dll"; -}; - -®_ldo1 { - regulator-name = "vdd-rtc"; -}; - -®_ldo2 { - regulator-always-on; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-name = "avcc"; -}; diff --git a/configs/icnova-a20-adb4006_defconfig b/configs/icnova-a20-adb4006_defconfig index d572bbd0b5..ba529c8db5 100644 --- a/configs/icnova-a20-adb4006_defconfig +++ b/configs/icnova-a20-adb4006_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 6.1 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System BR2_TARGET_GENERIC_HOSTNAME="ICnova A20 ADB4006" @@ -20,11 +20,11 @@ BR2_PACKAGE_HOST_MTOOLS=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.35" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/in-circuit/icnova-a20-adb4006/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-icnova-a20-adb4006" BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem @@ -36,15 +36,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="128M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" -BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006_uboot_defconfig" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="icnova-a20-adb4006" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/in-circuit/icnova-a20-adb4006/boot.cmd" From peter at korsgaard.com Mon Feb 5 10:37:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:37:38 +0100 Subject: [Buildroot] [git commit] package/rdma-core: fix mips4 build Message-ID: <20240205103820.2231B86ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e5a90f1b75e59aa5707394f3c707fbbf03204b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The 'sync' instruction for MIPS was defined in MIPS-II as taking no operands. MIPS32 extended the define of 'sync' as taking an optional unsigned 5 bit immediate. As a result, replace "sync 0" by "sync" to fix the following build failure on mips4 raised since the addition of the package in commit ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 and https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: /tmp/ccrBy9fV.s: Assembler messages: /tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' Fixes: - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 - http://autobuild.buildroot.org/results/2df58f9b98aacf00960932f53510b29199393461 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-util-udma_barrier.h-fix-mips4-build.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch new file mode 100644 index 0000000000..6dfb476faa --- /dev/null +++ b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch @@ -0,0 +1,56 @@ +From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jan 2024 18:55:34 +0100 +Subject: [PATCH] util/udma_barrier.h: fix mips4 build + +The 'sync' instruction for MIPS was defined in MIPS-II as taking no +operands. MIPS32 extended the define of 'sync' as taking an optional +unsigned 5 bit immediate. + +As a result, replace "sync 0" by "sync" to fix the following build +failure on mips4 raised since version 43.0 and +https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: + +/tmp/ccrBy9fV.s: Assembler messages: +/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' + +Fixes: + - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 +--- + util/udma_barrier.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/util/udma_barrier.h b/util/udma_barrier.h +index 0a1f8a45b..3793d2f18 100644 +--- a/util/udma_barrier.h ++++ b/util/udma_barrier.h +@@ -101,7 +101,7 @@ + #elif defined(__riscv) + #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") + #elif defined(__mips__) +-#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_to_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -139,7 +139,7 @@ + #elif defined(__riscv) + #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") + #elif defined(__mips__) +-#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_from_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -212,7 +212,7 @@ + #include "s390_mmio_insn.h" + #define mmio_flush_writes() s390_pciwb() + #elif defined(__mips__) +-#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") ++#define mmio_flush_writes() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif From thomas.petazzoni at bootlin.com Mon Feb 5 10:38:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:38:22 +0100 Subject: [Buildroot] [PATCH 1/1] configs/icnova-a20-adb4006: Bump Linux and U-Boot version In-Reply-To: <20240130131750.3802767-1-ludwig.kormann@ict42.de> References: <20240130131750.3802767-1-ludwig.kormann@ict42.de> Message-ID: <20240205113822.3e017b35@windsurf> On Tue, 30 Jan 2024 14:17:50 +0100 Ludwig Kormann wrote: > Bump version of Linux to 6.6.14 and U-Boot to 2024.01 > and also use upstream configs and dts. > > Signed-off-by: Ludwig Kormann > --- > .../sun7i-a20-icnova-a20-adb4006.dts | 137 ------------------ > ...n7i-a20-icnova-a20-adb4006_uboot_defconfig | 20 --- > .../sun7i-a20-icnova-a20.dtsi | 62 -------- > configs/icnova-a20-adb4006_defconfig | 14 +- > 4 files changed, 6 insertions(+), 227 deletions(-) > delete mode 100644 board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts > delete mode 100644 board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006_uboot_defconfig > delete mode 100644 board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi Applied to master, thanks for your contribution! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Mon Feb 5 10:39:06 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:39:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyzmq: bump to version 25.1.2 In-Reply-To: <20240111043052.2880841-1-james.hilliard1@gmail.com> References: <20240111043052.2880841-1-james.hilliard1@gmail.com> Message-ID: <1be43d03-99b9-47ff-b63b-b418c9cf5981@mind.be> On 11/01/2024 05:30, James Hilliard wrote: > License hashes/names changed due to rename/reformat: > https://github.com/zeromq/pyzmq/pull/1837 > > Add new host-python-setuptools-scm build dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyzmq/python-pyzmq.hash | 8 ++++---- > package/python-pyzmq/python-pyzmq.mk | 11 +++++++---- > 2 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash > index efbc91d83c..3c91d25995 100644 > --- a/package/python-pyzmq/python-pyzmq.hash > +++ b/package/python-pyzmq/python-pyzmq.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/pyzmq/json > -md5 f10b7c3dee2c03557e2c5d00b73dfc7f pyzmq-24.0.1.tar.gz > -sha256 216f5d7dbb67166759e59b0479bca82b8acf9bed6015b526b8eb10143fb08e77 pyzmq-24.0.1.tar.gz > +md5 280afc0992b0a9f109dafc1e672d2f26 pyzmq-25.1.2.tar.gz > +sha256 93f1aa311e8bb912e34f004cf186407a4e90eec4f0ecc0efd26056bf7eda0226 pyzmq-25.1.2.tar.gz > # Locally computed sha256 checksums > -sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD > -sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER > +sha256 c0cf5f5c03f8d6772f7a271df1cb671054578bd3d79527c72fc1f28f8cc72a7a LICENSE.BSD > +sha256 5f1dac83d6c25674004810ec9e54b304ccbb8303ac5961813b09235966abfd48 LICENSE.LESSER > diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk > index 5792957eaf..1d9a7d01cb 100644 > --- a/package/python-pyzmq/python-pyzmq.mk > +++ b/package/python-pyzmq/python-pyzmq.mk > @@ -4,15 +4,18 @@ > # > ################################################################################ > > -PYTHON_PYZMQ_VERSION = 24.0.1 > +PYTHON_PYZMQ_VERSION = 25.1.2 > PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz > -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/46/0d/b06cf99a64d4187632f4ac9ddf6be99cd35de06fe72d75140496a8e0eef5 > +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/3a/33/1a3683fc9a4bd64d8ccc0290da75c8f042184a1a49c146d28398414d3341 > PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 > # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 > -PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD > -PYTHON_PYZMQ_DEPENDENCIES = host-python-packaging zeromq > +PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD > PYTHON_PYZMQ_SETUP_TYPE = setuptools > PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr > +PYTHON_PYZMQ_DEPENDENCIES = \ > + host-python-packaging \ > + host-python-setuptools-scm \ > + zeromq > > # Due to issues with cross-compiling, hardcode to the zeromq in BR > define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION From arnout at mind.be Mon Feb 5 10:39:11 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:39:11 +0100 Subject: [Buildroot] [git commit] package/python-pytz: bump to version 2023.3.post1 Message-ID: <20240205103946.DE2D286AF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db3aa2d36ded61436674e6e248f9988e1e59a750 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pytz/python-pytz.hash | 4 ++-- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index 861f9d6f35..be6f0e976b 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 fe54c8f8a1544b4e78b523b264ab071b pytz-2023.3.tar.gz -sha256 1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588 pytz-2023.3.tar.gz +md5 84e6569fcc917b096cca1063819c4ab0 pytz-2023.3.post1.tar.gz +sha256 7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b pytz-2023.3.post1.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 4754efe41a..182d8156fc 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2023.3 +PYTHON_PYTZ_VERSION = 2023.3.post1 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/5e/32/12032aa8c673ee16707a9b6cdda2b09c0089131f35af55d443b6a9c69c1d +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/69/4f/7bf883f12ad496ecc9514cd9e267b29a68b3e9629661a2bbc24f80eff168 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From arnout at mind.be Mon Feb 5 10:39:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:39:13 +0100 Subject: [Buildroot] [git commit] package/python-pyudev: bump to version 0.24.1 Message-ID: <20240205103946.EC31C86B02@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8129c3c2c5985d2e4eeae6cb05948601d0b59772 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required python-six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyudev/Config.in | 1 - package/python-pyudev/python-pyudev.hash | 4 ++-- package/python-pyudev/python-pyudev.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in index e0da067cc2..aa98c2cc61 100644 --- a/package/python-pyudev/Config.in +++ b/package/python-pyudev/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PYUDEV bool "python-pyudev" depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_PYTHON3_ZLIB # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help pyudev is a LGPL licenced, pure Python 2/3 binding to libudev, the device and hardware management and information diff --git a/package/python-pyudev/python-pyudev.hash b/package/python-pyudev/python-pyudev.hash index 014bf20933..72eb323e1f 100644 --- a/package/python-pyudev/python-pyudev.hash +++ b/package/python-pyudev/python-pyudev.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyudev/json -md5 17c0a41f0e4dfc016350806a0a60f630 pyudev-0.24.0.tar.gz -sha256 b2a3afe1c99ea751f8296652557eac559874da2a1b1ec0625178706ec5a345f3 pyudev-0.24.0.tar.gz +md5 fecaabe9eaa890d2173c7b49ab63a412 pyudev-0.24.1.tar.gz +sha256 75e54d37218f5ac45b0da1f0fd9cc5e526a3cac3ef1cfad410cf7ab338b01471 pyudev-0.24.1.tar.gz # Locally computed sha256 checksums sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/python-pyudev/python-pyudev.mk b/package/python-pyudev/python-pyudev.mk index 5d48cd4f7c..53d60572a8 100644 --- a/package/python-pyudev/python-pyudev.mk +++ b/package/python-pyudev/python-pyudev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUDEV_VERSION = 0.24.0 +PYTHON_PYUDEV_VERSION = 0.24.1 PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz -PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/00/8d/810750cb2fc64d7e0dbefc106a9137b157616a95be3f0ea51ca3cf6c762a +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/20/b6/16961ac3575575260c72928f17df9c99c2a696871e486965ec6e2fa2aff4 PYTHON_PYUDEV_LICENSE = LGPL-2.1+ PYTHON_PYUDEV_LICENSE_FILES = COPYING PYTHON_PYUDEV_SETUP_TYPE = setuptools From arnout at mind.be Mon Feb 5 10:39:14 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:39:14 +0100 Subject: [Buildroot] [git commit] package/python-pyzmq: bump to version 25.1.2 Message-ID: <20240205103947.093F686AF7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67b1eb8a6de5378b041cff9a0289a42a6760cbca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hashes/names changed due to rename/reformat: https://github.com/zeromq/pyzmq/pull/1837 Add new host-python-setuptools-scm build dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyzmq/python-pyzmq.hash | 8 ++++---- package/python-pyzmq/python-pyzmq.mk | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash index efbc91d83c..3c91d25995 100644 --- a/package/python-pyzmq/python-pyzmq.hash +++ b/package/python-pyzmq/python-pyzmq.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pyzmq/json -md5 f10b7c3dee2c03557e2c5d00b73dfc7f pyzmq-24.0.1.tar.gz -sha256 216f5d7dbb67166759e59b0479bca82b8acf9bed6015b526b8eb10143fb08e77 pyzmq-24.0.1.tar.gz +md5 280afc0992b0a9f109dafc1e672d2f26 pyzmq-25.1.2.tar.gz +sha256 93f1aa311e8bb912e34f004cf186407a4e90eec4f0ecc0efd26056bf7eda0226 pyzmq-25.1.2.tar.gz # Locally computed sha256 checksums -sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD -sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER +sha256 c0cf5f5c03f8d6772f7a271df1cb671054578bd3d79527c72fc1f28f8cc72a7a LICENSE.BSD +sha256 5f1dac83d6c25674004810ec9e54b304ccbb8303ac5961813b09235966abfd48 LICENSE.LESSER diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index 5792957eaf..1d9a7d01cb 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -4,15 +4,18 @@ # ################################################################################ -PYTHON_PYZMQ_VERSION = 24.0.1 +PYTHON_PYZMQ_VERSION = 25.1.2 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/46/0d/b06cf99a64d4187632f4ac9ddf6be99cd35de06fe72d75140496a8e0eef5 +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/3a/33/1a3683fc9a4bd64d8ccc0290da75c8f042184a1a49c146d28398414d3341 PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 -PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD -PYTHON_PYZMQ_DEPENDENCIES = host-python-packaging zeromq +PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD PYTHON_PYZMQ_SETUP_TYPE = setuptools PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr +PYTHON_PYZMQ_DEPENDENCIES = \ + host-python-packaging \ + host-python-setuptools-scm \ + zeromq # Due to issues with cross-compiling, hardcode to the zeromq in BR define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION From arnout at mind.be Mon Feb 5 10:39:10 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:39:10 +0100 Subject: [Buildroot] [git commit] package/python-pythran: bump to version 0.15.0 Message-ID: <20240205103946.D229F86AF7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4265ac62b84091c231f318fb950800926036426f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pythran/python-pythran.hash | 4 ++-- package/python-pythran/python-pythran.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pythran/python-pythran.hash b/package/python-pythran/python-pythran.hash index 2dfc445b2f..a46825c933 100644 --- a/package/python-pythran/python-pythran.hash +++ b/package/python-pythran/python-pythran.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pythran/json -md5 3090288af50566af75cb058d1878aaad pythran-0.13.1.tar.gz -sha256 8aad08162f010e5425a7b254dd68d83311b430bb29f9252dce2eff3ba39497dd pythran-0.13.1.tar.gz +md5 cc6fa05e583733182d06d2e41e03cc10 pythran-0.15.0.tar.gz +sha256 f9bc61bcb96df2cd4b578abc5a62dfb3fbb0b0ef02c264513dfb615c5f87871c pythran-0.15.0.tar.gz # Locally computed sha256 checksums sha256 0be9f14c66a9a3cb66d5263a6495437862ce0c9cdf60d4a6c36d1e51b1244c6e LICENSE sha256 e1c0ed0a99e4462016d79d835f1f479b78c4d4a07fe66598e97f449503ffd178 docs/LICENSE.rst diff --git a/package/python-pythran/python-pythran.mk b/package/python-pythran/python-pythran.mk index 25735ad95a..43853a514d 100644 --- a/package/python-pythran/python-pythran.mk +++ b/package/python-pythran/python-pythran.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTHRAN_VERSION = 0.13.1 +PYTHON_PYTHRAN_VERSION = 0.15.0 PYTHON_PYTHRAN_SOURCE = pythran-$(PYTHON_PYTHRAN_VERSION).tar.gz -PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/8d/d8/b27e8dc3f3a03dcd317d40d9df0ae07ebbd85444585973ceba07716934d0 +PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/82/31/cc6fd7a2b91efc6cdb03e7c42df895b4a65a8f049b074579d45d1def746f PYTHON_PYTHRAN_SETUP_TYPE = setuptools PYTHON_PYTHRAN_LICENSE = BSD-3-Clause PYTHON_PYTHRAN_LICENSE_FILES = LICENSE docs/LICENSE.rst From peter at korsgaard.com Mon Feb 5 10:42:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:42:01 +0100 Subject: [Buildroot] [PATCH v2] package/ruby: bump to 3.3.0 In-Reply-To: References: Message-ID: <84311d05-8dd7-4d0b-85d4-2a5a947ef2ee@korsgaard.com> On 27/01/2024 03.20, Waldemar Brodkorb wrote: > See here for changes: > https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ > > Patch applied upstream. > > License file LEGAL changed. > [ext/psych/yaml] got removed. > [lib/bundler/vendor/molinillo] got removed. > [lib/bundler/vendor/pub_grub] added with MIT License. > > Signed-off-by: Waldemar Brodkorb Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 10:42:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:42:16 +0100 Subject: [Buildroot] [git commit] package/ruby: bump to 3.3.0 Message-ID: <20240205104226.834CD86B0B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a01c278df7892c8a6736334aa008b2d7c09e9258 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See here for changes: https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ Patch applied upstream. License file LEGAL changed. [ext/psych/yaml] got removed. [lib/bundler/vendor/molinillo] got removed. [lib/bundler/vendor/pub_grub] added with MIT License. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../ruby/0001-Fix-build-with-LibreSSL-3-5.patch | 25 ---------------------- package/ruby/ruby.hash | 6 +++--- package/ruby/ruby.mk | 6 +++--- 4 files changed, 6 insertions(+), 32 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index bcb6aff6ce..095fa5b283 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1182,7 +1182,6 @@ package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch Upstream package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch Upstream package/rubix/0001-dont-use-legacy-functions.patch Upstream package/rubix/0002-misc-fixes.patch Sob Upstream -package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch Upstream package/rygel/0001-build-Add-man_pages-build-options.patch Upstream package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch Upstream package/rygel/S99rygel Indent Shellcheck Variables diff --git a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch b/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch deleted file mode 100644 index 805dfd2f89..0000000000 --- a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d Mon Sep 17 00:00:00 2001 -From: Jeremy Evans -Date: Fri, 25 Mar 2022 13:11:31 -0700 -Subject: [PATCH] Fix build with LibreSSL 3.5 - -[Retrieved from: -https://github.com/ruby/openssl/commit/e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d] -Signed-off-by: Fabrice Fontaine ---- - ext/openssl/ossl_pkey.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c -index 2a4835a2..24d0da46 100644 ---- a/ext/openssl/ossl_pkey.c -+++ b/ext/openssl/ossl_pkey.c -@@ -710,7 +710,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der) - } - } - else { --#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) -+#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0) - if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0, - ossl_pem_passwd_cb, - (void *)pass)) { diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 42d8a2497f..c729c59453 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,7 +1,7 @@ -# https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/ -sha512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69 ruby-3.1.3.tar.xz +# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ +sha512 7959c5753bfa0bfc4d6d74060869aabbe9815c1c97930659da11b917ee0803ddbbd80e869e00c48b8694b4ba48709c3b6493fd045568e36e902616c35ababf01 ruby-3.3.0.tar.xz # License files, Locally calculated -sha256 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc LEGAL +sha256 e849b28d324423e636a3e6bc5d583cdaf4bd046c2b20872c53886b612d01a4a1 LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING sha256 36a9a6e7347214bbba599a412617204e65bff065dcbe5c46f5cb454c80de9eb0 BSDL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 28b1ec13ef..b2396010c5 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -4,9 +4,9 @@ # ################################################################################ -RUBY_VERSION_MAJOR = 3.1 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 -RUBY_VERSION_EXT = 3.1.0 +RUBY_VERSION_MAJOR = 3.3 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 +RUBY_VERSION_EXT = 3.3.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From peter at korsgaard.com Mon Feb 5 10:46:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:46:22 +0100 Subject: [Buildroot] [PATCH v1] package/nghttp2: bump version to 1.58.0 In-Reply-To: <20240117211424.22038-1-ps.report@gmx.net> References: <20240117211424.22038-1-ps.report@gmx.net> Message-ID: <08873d3f-1b71-4a37-8477-e1346111156c@korsgaard.com> On 17/01/2024 22.14, Peter Seiderer via buildroot wrote: > For details see [1]. > > [1] https://github.com/nghttp2/nghttp2/releases/tag/v1.58.0 > > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 10:45:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:45:03 +0100 Subject: [Buildroot] [git commit] package/nghttp2: bump version to 1.58.0 Message-ID: <20240205104644.2E1EA86B12@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f08fa1bd2fe1af13cca867cd522c4f23be0d770f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://github.com/nghttp2/nghttp2/releases/tag/v1.58.0 Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/nghttp2/nghttp2.hash | 2 +- package/nghttp2/nghttp2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nghttp2/nghttp2.hash b/package/nghttp2/nghttp2.hash index 18774d01d4..dddf6fe1bd 100644 --- a/package/nghttp2/nghttp2.hash +++ b/package/nghttp2/nghttp2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9210b0113109f43be526ac5835d58a701411821a4d39e155c40d67c40f47a958 nghttp2-1.57.0.tar.xz +sha256 4a68a3040da92fd9872c056d0f6b0cd60de8410de10b578f8ade9ecc14d297e0 nghttp2-1.58.0.tar.xz sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING diff --git a/package/nghttp2/nghttp2.mk b/package/nghttp2/nghttp2.mk index 70a25d409c..7a05e38fa9 100644 --- a/package/nghttp2/nghttp2.mk +++ b/package/nghttp2/nghttp2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGHTTP2_VERSION = 1.57.0 +NGHTTP2_VERSION = 1.58.0 NGHTTP2_SOURCE = nghttp2-$(NGHTTP2_VERSION).tar.xz NGHTTP2_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(NGHTTP2_VERSION) NGHTTP2_LICENSE = MIT From arnout at mind.be Mon Feb 5 10:48:17 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:48:17 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-pypng: new package In-Reply-To: <20240111044530.2889558-1-james.hilliard1@gmail.com> References: <20240111044530.2889558-1-james.hilliard1@gmail.com> Message-ID: <2b4b608b-1525-42ef-961f-a73354327ff8@mind.be> On 11/01/2024 05:45, James Hilliard wrote: > Signed-off-by: James Hilliard Applied both to master, thanks. Regards, Arnout > --- > package/Config.in | 1 + > package/python-pypng/Config.in | 6 ++++++ > package/python-pypng/python-pypng.hash | 5 +++++ > package/python-pypng/python-pypng.mk | 14 ++++++++++++++ > 4 files changed, 26 insertions(+) > create mode 100644 package/python-pypng/Config.in > create mode 100644 package/python-pypng/python-pypng.hash > create mode 100644 package/python-pypng/python-pypng.mk > > diff --git a/package/Config.in b/package/Config.in > index 5b8b15fa54..1375d28116 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1276,6 +1276,7 @@ menu "External python modules" > source "package/python-pyparsing/Config.in" > source "package/python-pyparted/Config.in" > source "package/python-pyphen/Config.in" > + source "package/python-pypng/Config.in" > source "package/python-pyqrcode/Config.in" > source "package/python-pyqt5/Config.in" > source "package/python-pyratemp/Config.in" > diff --git a/package/python-pypng/Config.in b/package/python-pypng/Config.in > new file mode 100644 > index 0000000000..c1ed405615 > --- /dev/null > +++ b/package/python-pypng/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_PYTHON_PYPNG > + bool "python-pypng" > + help > + Pure Python library for saving and loading PNG images. > + > + https://gitlab.com/drj11/pypng > diff --git a/package/python-pypng/python-pypng.hash b/package/python-pypng/python-pypng.hash > new file mode 100644 > index 0000000000..0f55eef702 > --- /dev/null > +++ b/package/python-pypng/python-pypng.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/pypng/json > +md5 7d9cce86ceb19524784ade86fb13a063 pypng-0.20220715.0.tar.gz > +sha256 739c433ba96f078315de54c0db975aee537cbc3e1d0ae4ed9aab0ca1e427e2c1 pypng-0.20220715.0.tar.gz > +# Locally computed sha256 checksums > +sha256 8dd127d87bb901ab9c8f584e98b7c7aa8539db27fe62ff01b1ee4be93b6a513a LICENCE > diff --git a/package/python-pypng/python-pypng.mk b/package/python-pypng/python-pypng.mk > new file mode 100644 > index 0000000000..07ad16b67b > --- /dev/null > +++ b/package/python-pypng/python-pypng.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-pypng > +# > +################################################################################ > + > +PYTHON_PYPNG_VERSION = 0.20220715.0 > +PYTHON_PYPNG_SOURCE = pypng-$(PYTHON_PYPNG_VERSION).tar.gz > +PYTHON_PYPNG_SITE = https://files.pythonhosted.org/packages/93/cd/112f092ec27cca83e0516de0a3368dbd9128c187fb6b52aaaa7cde39c96d > +PYTHON_PYPNG_SETUP_TYPE = setuptools > +PYTHON_PYPNG_LICENSE = MIT > +PYTHON_PYPNG_LICENSE_FILES = LICENCE > + > +$(eval $(python-package)) From arnout at mind.be Mon Feb 5 10:49:16 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:49:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-redis: bump to version 5.0.1 In-Reply-To: <20240111045405.2894223-1-james.hilliard1@gmail.com> References: <20240111045405.2894223-1-james.hilliard1@gmail.com> Message-ID: <3f39f2e2-e773-408f-8dfc-0877e6a9b115@mind.be> On 11/01/2024 05:54, James Hilliard wrote: > License hash changed due to year update: > https://github.com/redis/redis-py/commit/28cc65c18cc4fb37ef14497c963eb181dba8d25d > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-redis/Config.in | 4 ++-- > package/python-redis/python-redis.hash | 6 +++--- > package/python-redis/python-redis.mk | 4 ++-- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/package/python-redis/Config.in b/package/python-redis/Config.in > index 4143e1f1c1..e22959cf7b 100644 > --- a/package/python-redis/Config.in > +++ b/package/python-redis/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_PYTHON_REDIS > bool "python-redis" > help > - Python client for Redis key-value store. > + Python client for Redis database and key-value store. > > - https://github.com/andymccurdy/redis-py > + https://github.com/redis/redis-py > diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash > index e27f87bd50..2d9df87a10 100644 > --- a/package/python-redis/python-redis.hash > +++ b/package/python-redis/python-redis.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/redis/json > -md5 ad365234df634680d15294ddc87c42de redis-4.5.5.tar.gz > -sha256 dc87a0bdef6c8bfe1ef1e1c40be7034390c2ae02d92dcd0c7ca1729443899880 redis-4.5.5.tar.gz > +md5 f4bff9e3819ec832bb789b8b58363d6b redis-5.0.1.tar.gz > +sha256 0dab495cd5753069d3bc650a0dde8a8f9edde16fc5691b689a566eda58100d0f redis-5.0.1.tar.gz > # Locally computed sha256 checksums > -sha256 7801a39e3a1aec58a7ea7c9f4dc1238cf0922c36a1fc8eff0bb7d684ff6dd354 LICENSE > +sha256 a57b250a5bf03d7afe55b74063313f2adb7b00d546c0ab149a89398333fe3cc8 LICENSE > diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk > index 186702dc83..067a754352 100644 > --- a/package/python-redis/python-redis.mk > +++ b/package/python-redis/python-redis.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_REDIS_VERSION = 4.5.5 > +PYTHON_REDIS_VERSION = 5.0.1 > PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz > -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/53/30/128c5599bc3fa61488866be0228326b3e486be34480126f70e572043adf8 > +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/4a/4c/3c3b766f4ecbb3f0bec91ef342ee98d179e040c25b6ecc99e510c2570f2a > PYTHON_REDIS_SETUP_TYPE = setuptools > PYTHON_REDIS_LICENSE = MIT > PYTHON_REDIS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:50:25 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:50:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-reedsolo: bump to version 1.7.0 In-Reply-To: <20240111050053.2897660-1-james.hilliard1@gmail.com> References: <20240111050053.2897660-1-james.hilliard1@gmail.com> Message-ID: <08b99de6-e8ec-4692-a7f9-f0b4ce986cf7@mind.be> On 11/01/2024 06:00, James Hilliard wrote: > License changed to Unlicense/MIT-0: > https://github.com/tomerfiliba-org/reedsolomon/commit/7b97461684701cf19451db1fd348d831dc526dc2 > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-reedsolo/python-reedsolo.hash | 6 +++--- > package/python-reedsolo/python-reedsolo.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-reedsolo/python-reedsolo.hash b/package/python-reedsolo/python-reedsolo.hash > index fdafc89f49..c1729f0aeb 100644 > --- a/package/python-reedsolo/python-reedsolo.hash > +++ b/package/python-reedsolo/python-reedsolo.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/reedsolo/json > -md5 b67a04027a1825c63a63b6793ec660a3 reedsolo-1.6.0.tar.gz > -sha256 4e290d3b0a7207ac7aac186790766c752b5fcdf5e0b04dfd260349579052bbac reedsolo-1.6.0.tar.gz > +md5 5bbd7741f915ad67b6d425f93ab9d103 reedsolo-1.7.0.tar.gz > +sha256 c1359f02742751afe0f1c0de9f0772cc113835aa2855d2db420ea24393c87732 reedsolo-1.7.0.tar.gz > # Locally computed sha256 checksums > -sha256 0babd7b573efc3dcf5bb3c28b583150726f775d3dd8d54d6cd062834735b3d73 LICENSE > +sha256 2da9536c23b72bac15603bb1f8dbf269dc68ecfbc35a75f8d0aa9cb209ba0934 LICENSE > diff --git a/package/python-reedsolo/python-reedsolo.mk b/package/python-reedsolo/python-reedsolo.mk > index 2a7fd42a05..66e85fb40a 100644 > --- a/package/python-reedsolo/python-reedsolo.mk > +++ b/package/python-reedsolo/python-reedsolo.mk > @@ -4,11 +4,11 @@ > # > ################################################################################ > > -PYTHON_REEDSOLO_VERSION = 1.6.0 > +PYTHON_REEDSOLO_VERSION = 1.7.0 > PYTHON_REEDSOLO_SOURCE = reedsolo-$(PYTHON_REEDSOLO_VERSION).tar.gz > -PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/9b/10/28d1492cc82a103bc06f18cb9a9dbb3a9168ab2e4068801fa0aa0c76b231 > +PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/f7/61/a67338cbecf370d464e71b10e9a31355f909d6937c3a8d6b17dd5d5beb5e > PYTHON_REEDSOLO_SETUP_TYPE = setuptools > -PYTHON_REEDSOLO_LICENSE = Public Domain > +PYTHON_REEDSOLO_LICENSE = MIT-0, Unlicense > PYTHON_REEDSOLO_LICENSE_FILES = LICENSE > > $(eval $(python-package)) From arnout at mind.be Mon Feb 5 10:51:02 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:51:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-referencing: bump to version 0.32.1 In-Reply-To: <20240111050439.2900236-1-james.hilliard1@gmail.com> References: <20240111050439.2900236-1-james.hilliard1@gmail.com> Message-ID: <99937e20-13a9-449c-9b57-ecaf061f5feb@mind.be> On 11/01/2024 06:04, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-referencing/python-referencing.hash | 4 ++-- > package/python-referencing/python-referencing.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-referencing/python-referencing.hash b/package/python-referencing/python-referencing.hash > index d4f3dce5a4..2880a47477 100644 > --- a/package/python-referencing/python-referencing.hash > +++ b/package/python-referencing/python-referencing.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/referencing/json > -md5 617d973b9ce86b6f74b2216c6f3af5c9 referencing-0.30.2.tar.gz > -sha256 794ad8003c65938edcdbc027f1933215e0d0ccc0291e3ce20a4d87432b59efc0 referencing-0.30.2.tar.gz > +md5 d1a0a4ae03ebba4b86b22bfb825f150b referencing-0.32.1.tar.gz > +sha256 3c57da0513e9563eb7e203ebe9bb3a1b509b042016433bd1e45a2853466c3dd3 referencing-0.32.1.tar.gz > # Locally computed sha256 checksums > sha256 42dcd63495f87b4eb7c7757afa379bb55a53f94afd7a5f657d9adf57236e515c COPYING > diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk > index 4d11c99deb..27d1452e91 100644 > --- a/package/python-referencing/python-referencing.mk > +++ b/package/python-referencing/python-referencing.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_REFERENCING_VERSION = 0.30.2 > +PYTHON_REFERENCING_VERSION = 0.32.1 > PYTHON_REFERENCING_SOURCE = referencing-$(PYTHON_REFERENCING_VERSION).tar.gz > -PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/e1/43/d3f6cf3e1ec9003520c5fb31dc363ee488c517f09402abd2a1c90df63bbb > +PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/81/ce/910573eca7b1a1c6358b0dc0774ce1eeb81f4c98d4ee371f1c85f22040a1 > PYTHON_REFERENCING_SETUP_TYPE = pep517 > PYTHON_REFERENCING_LICENSE = MIT > PYTHON_REFERENCING_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 5 10:51:42 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:51:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-regex: bump to version 2023.12.25 In-Reply-To: <20240111050729.2902435-1-james.hilliard1@gmail.com> References: <20240111050729.2902435-1-james.hilliard1@gmail.com> Message-ID: <69cfc932-d7dc-4ee8-ab41-609e0900db99@mind.be> On 11/01/2024 06:07, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-regex/Config.in | 2 +- > package/python-regex/python-regex.hash | 4 ++-- > package/python-regex/python-regex.mk | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-regex/Config.in b/package/python-regex/Config.in > index 5f582d085a..89ead69c04 100644 > --- a/package/python-regex/Config.in > +++ b/package/python-regex/Config.in > @@ -3,4 +3,4 @@ config BR2_PACKAGE_PYTHON_REGEX > help > Alternative regular expression module, to replace re. > > - https://bitbucket.org/mrabarnett/mrab-regex > + https://github.com/mrabarnett/mrab-regex > diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash > index 11a5765e41..7454db99bb 100644 > --- a/package/python-regex/python-regex.hash > +++ b/package/python-regex/python-regex.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/regex/json > -md5 a85ced10be8bfe76fed4f30c42d32d5c regex-2022.10.31.tar.gz > -sha256 a3a98921da9a1bf8457aeee6a551948a83601689e5ecdd736894ea9bbec77e83 regex-2022.10.31.tar.gz > +md5 3f97f0aef9bf334fe50ae5980b183e68 regex-2023.12.25.tar.gz > +sha256 29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5 regex-2023.12.25.tar.gz > # Locally computed sha256 checksums > sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt > diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk > index 81bd460ecc..6b1938bc0c 100644 > --- a/package/python-regex/python-regex.mk > +++ b/package/python-regex/python-regex.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_REGEX_VERSION = 2022.10.31 > +PYTHON_REGEX_VERSION = 2023.12.25 > PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz > -PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/27/b5/92d404279fd5f4f0a17235211bb0f5ae7a0d9afb7f439086ec247441ed28 > +PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/b5/39/31626e7e75b187fae7f121af3c538a991e725c744ac893cc2cfd70ce2853 > PYTHON_REGEX_SETUP_TYPE = setuptools > PYTHON_REGEX_LICENSE = Apache-2.0 > PYTHON_REGEX_LICENSE_FILES = LICENSE.txt From arnout at mind.be Mon Feb 5 10:53:20 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:53:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-requests-toolbelt: bump to version 1.0.0 In-Reply-To: <20240111051107.2905870-1-james.hilliard1@gmail.com> References: <20240111051107.2905870-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 06:11, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-requests-toolbelt/Config.in | 2 +- > .../python-requests-toolbelt/python-requests-toolbelt.hash | 4 ++-- > package/python-requests-toolbelt/python-requests-toolbelt.mk | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in > index ba2b95152e..7d5b4b65c2 100644 > --- a/package/python-requests-toolbelt/Config.in > +++ b/package/python-requests-toolbelt/Config.in > @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT > help > A utility belt for advanced users of python-requests. > > - https://toolbelt.readthedocs.org > + https://toolbelt.readthedocs.io/ > diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.hash b/package/python-requests-toolbelt/python-requests-toolbelt.hash > index 28abf2c628..12bc58131d 100644 > --- a/package/python-requests-toolbelt/python-requests-toolbelt.hash > +++ b/package/python-requests-toolbelt/python-requests-toolbelt.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/requests-toolbelt/json > -md5 636d226d03632d013269aebbc85f4f4b requests-toolbelt-0.10.1.tar.gz > -sha256 62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d requests-toolbelt-0.10.1.tar.gz > +md5 6a8348cfc9991b44e499345db1c6f925 requests-toolbelt-1.0.0.tar.gz > +sha256 7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6 requests-toolbelt-1.0.0.tar.gz > # Locally computed sha256 checksums > sha256 1f8cf8bdacd98ed6d36d0fec0c07f7765acebd6e81205962ab5146023b3c858d LICENSE > diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.mk b/package/python-requests-toolbelt/python-requests-toolbelt.mk > index 8c141e3aa9..d0bcb1bb21 100644 > --- a/package/python-requests-toolbelt/python-requests-toolbelt.mk > +++ b/package/python-requests-toolbelt/python-requests-toolbelt.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_REQUESTS_TOOLBELT_VERSION = 0.10.1 > +PYTHON_REQUESTS_TOOLBELT_VERSION = 1.0.0 > PYTHON_REQUESTS_TOOLBELT_SOURCE = requests-toolbelt-$(PYTHON_REQUESTS_TOOLBELT_VERSION).tar.gz > -PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/0c/4c/07f01c6ac44f7784fa399137fbc8d0cdc1b5d35304e8c0f278ad82105b58 > +PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/f3/61/d7545dafb7ac2230c70d38d31cbfe4cc64f7144dc41f6e4e4b78ecd9f5bb > PYTHON_REQUESTS_TOOLBELT_SETUP_TYPE = setuptools > PYTHON_REQUESTS_TOOLBELT_LICENSE = Apache-2.0 > PYTHON_REQUESTS_TOOLBELT_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:53:42 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:53:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: <20240111051726.2918732-1-james.hilliard1@gmail.com> References: <20240111051726.2918732-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 06:17, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-rpds-py/python-rpds-py.hash | 2 +- > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > index b04aa210d3..8c4b6181d0 100644 > --- a/package/python-rpds-py/python-rpds-py.hash > +++ b/package/python-rpds-py/python-rpds-py.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz > # Locally computed sha256 checksums > sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE > diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk > index 6f71d02047..5f0d30d002 100644 > --- a/package/python-rpds-py/python-rpds-py.mk > +++ b/package/python-rpds-py/python-rpds-py.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > +PYTHON_RPDS_PY_VERSION = 0.16.2 > PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz > -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 > +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 > PYTHON_RPDS_PY_SETUP_TYPE = maturin > PYTHON_RPDS_PY_LICENSE = MIT > PYTHON_RPDS_PY_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:55:58 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:55:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyzmq: bump to version 25.1.2 In-Reply-To: <20240111043052.2880841-1-james.hilliard1@gmail.com> References: <20240111043052.2880841-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 05:30, James Hilliard wrote: > License hashes/names changed due to rename/reformat: > https://github.com/zeromq/pyzmq/pull/1837 > > Add new host-python-setuptools-scm build dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyzmq/python-pyzmq.hash | 8 ++++---- > package/python-pyzmq/python-pyzmq.mk | 11 +++++++---- > 2 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash > index efbc91d83c..3c91d25995 100644 > --- a/package/python-pyzmq/python-pyzmq.hash > +++ b/package/python-pyzmq/python-pyzmq.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/pyzmq/json > -md5 f10b7c3dee2c03557e2c5d00b73dfc7f pyzmq-24.0.1.tar.gz > -sha256 216f5d7dbb67166759e59b0479bca82b8acf9bed6015b526b8eb10143fb08e77 pyzmq-24.0.1.tar.gz > +md5 280afc0992b0a9f109dafc1e672d2f26 pyzmq-25.1.2.tar.gz > +sha256 93f1aa311e8bb912e34f004cf186407a4e90eec4f0ecc0efd26056bf7eda0226 pyzmq-25.1.2.tar.gz > # Locally computed sha256 checksums > -sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD > -sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER > +sha256 c0cf5f5c03f8d6772f7a271df1cb671054578bd3d79527c72fc1f28f8cc72a7a LICENSE.BSD > +sha256 5f1dac83d6c25674004810ec9e54b304ccbb8303ac5961813b09235966abfd48 LICENSE.LESSER > diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk > index 5792957eaf..1d9a7d01cb 100644 > --- a/package/python-pyzmq/python-pyzmq.mk > +++ b/package/python-pyzmq/python-pyzmq.mk > @@ -4,15 +4,18 @@ > # > ################################################################################ > > -PYTHON_PYZMQ_VERSION = 24.0.1 > +PYTHON_PYZMQ_VERSION = 25.1.2 > PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz > -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/46/0d/b06cf99a64d4187632f4ac9ddf6be99cd35de06fe72d75140496a8e0eef5 > +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/3a/33/1a3683fc9a4bd64d8ccc0290da75c8f042184a1a49c146d28398414d3341 > PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 > # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 > -PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD > -PYTHON_PYZMQ_DEPENDENCIES = host-python-packaging zeromq > +PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD > PYTHON_PYZMQ_SETUP_TYPE = setuptools > PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr > +PYTHON_PYZMQ_DEPENDENCIES = \ > + host-python-packaging \ > + host-python-setuptools-scm \ > + zeromq > > # Due to issues with cross-compiling, hardcode to the zeromq in BR > define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION From arnout at mind.be Mon Feb 5 10:56:02 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:56:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyudev: bump to version 0.24.1 In-Reply-To: <20240111041757.2707481-1-james.hilliard1@gmail.com> References: <20240111041757.2707481-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 05:17, James Hilliard wrote: > Drop no longer required python-six runtime dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyudev/Config.in | 1 - > package/python-pyudev/python-pyudev.hash | 4 ++-- > package/python-pyudev/python-pyudev.mk | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in > index e0da067cc2..aa98c2cc61 100644 > --- a/package/python-pyudev/Config.in > +++ b/package/python-pyudev/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PYUDEV > bool "python-pyudev" > depends on BR2_PACKAGE_HAS_UDEV > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > help > pyudev is a LGPL licenced, pure Python 2/3 binding to > libudev, the device and hardware management and information > diff --git a/package/python-pyudev/python-pyudev.hash b/package/python-pyudev/python-pyudev.hash > index 014bf20933..72eb323e1f 100644 > --- a/package/python-pyudev/python-pyudev.hash > +++ b/package/python-pyudev/python-pyudev.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyudev/json > -md5 17c0a41f0e4dfc016350806a0a60f630 pyudev-0.24.0.tar.gz > -sha256 b2a3afe1c99ea751f8296652557eac559874da2a1b1ec0625178706ec5a345f3 pyudev-0.24.0.tar.gz > +md5 fecaabe9eaa890d2173c7b49ab63a412 pyudev-0.24.1.tar.gz > +sha256 75e54d37218f5ac45b0da1f0fd9cc5e526a3cac3ef1cfad410cf7ab338b01471 pyudev-0.24.1.tar.gz > # Locally computed sha256 checksums > sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING > diff --git a/package/python-pyudev/python-pyudev.mk b/package/python-pyudev/python-pyudev.mk > index 5d48cd4f7c..53d60572a8 100644 > --- a/package/python-pyudev/python-pyudev.mk > +++ b/package/python-pyudev/python-pyudev.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYUDEV_VERSION = 0.24.0 > +PYTHON_PYUDEV_VERSION = 0.24.1 > PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz > -PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/00/8d/810750cb2fc64d7e0dbefc106a9137b157616a95be3f0ea51ca3cf6c762a > +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/20/b6/16961ac3575575260c72928f17df9c99c2a696871e486965ec6e2fa2aff4 > PYTHON_PYUDEV_LICENSE = LGPL-2.1+ > PYTHON_PYUDEV_LICENSE_FILES = COPYING > PYTHON_PYUDEV_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Mon Feb 5 10:56:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:56:36 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: fix webrtcdsp plugin build Message-ID: <20240205105644.D955C86B1C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0c65ba09063adf8bc29a4f3fc82f654f3196a36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The webrtc-audio-processing package was bumped from version 0.3.1 to version 1.3 in commit ef0fa986eb7ff25c0a5db70ec0b62032e2d71538 which broke compatibility with the gst1-plugins-bad webrtcdsp plugin. To fix this backport a commit from upstream adding support for webrtc-audio-processing version 1.3 to gst1-plugins-bad. Fixes: output/build/gst1-plugins-bad-1.22.9/ext/webrtcdsp/meson.build:7:13: ERROR: Dependency "webrtc-audio-processing" not found, tried pkgconfig and cmake Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...Update-code-for-webrtc-audio-processing-1.patch | 883 +++++++++++++++++++++ 1 file changed, 883 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/0001-webrtcdsp-Update-code-for-webrtc-audio-processing-1.patch b/package/gstreamer1/gst1-plugins-bad/0001-webrtcdsp-Update-code-for-webrtc-audio-processing-1.patch new file mode 100644 index 0000000000..a2ab0ef6d8 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/0001-webrtcdsp-Update-code-for-webrtc-audio-processing-1.patch @@ -0,0 +1,883 @@ +From d5755744c3e2b70e9f04704ae9d18b928d9fa456 Mon Sep 17 00:00:00 2001 +From: Arun Raghavan +Date: Wed, 2 Dec 2020 18:31:44 -0500 +Subject: [PATCH] webrtcdsp: Update code for webrtc-audio-processing-1 + +Updated API usage appropriately, and now we have a versioned package to +track breaking vs. non-breaking updates. + +Deprecates a number of properties (and we have to plug in our own values +for related enums which are now gone): + + * echo-suprression-level + * experimental-agc + * extended-filter + * delay-agnostic + * voice-detection-frame-size-ms + * voice-detection-likelihood + +Part-of: +Signed-off-by: James Hilliard +Upstream: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d5755744c3e2b70e9f04704ae9d18b928d9fa456 +--- + .../ext/webrtcdsp/gstwebrtcdsp.cpp | 271 +++++++----------- + .../ext/webrtcdsp/gstwebrtcechoprobe.cpp | 87 +++--- + .../ext/webrtcdsp/gstwebrtcechoprobe.h | 9 +- + .../gst-plugins-bad/ext/webrtcdsp/meson.build | 4 +- + 4 files changed, 164 insertions(+), 207 deletions(-) + +diff --git a/ext/webrtcdsp/gstwebrtcdsp.cpp b/ext/webrtcdsp/gstwebrtcdsp.cpp +index 7ee09488fb..c9a7cdae2f 100644 +--- a/ext/webrtcdsp/gstwebrtcdsp.cpp ++++ b/ext/webrtcdsp/gstwebrtcdsp.cpp +@@ -71,9 +71,7 @@ + #include "gstwebrtcdsp.h" + #include "gstwebrtcechoprobe.h" + +-#include +-#include +-#include ++#include + + GST_DEBUG_CATEGORY (webrtc_dsp_debug); + #define GST_CAT_DEFAULT (webrtc_dsp_debug) +@@ -82,10 +80,9 @@ GST_DEBUG_CATEGORY (webrtc_dsp_debug); + #define DEFAULT_COMPRESSION_GAIN_DB 9 + #define DEFAULT_STARTUP_MIN_VOLUME 12 + #define DEFAULT_LIMITER TRUE +-#define DEFAULT_GAIN_CONTROL_MODE webrtc::GainControl::kAdaptiveDigital ++#define DEFAULT_GAIN_CONTROL_MODE webrtc::AudioProcessing::Config::GainController1::Mode::kAdaptiveDigital + #define DEFAULT_VOICE_DETECTION FALSE + #define DEFAULT_VOICE_DETECTION_FRAME_SIZE_MS 10 +-#define DEFAULT_VOICE_DETECTION_LIKELIHOOD webrtc::VoiceDetection::kLowLikelihood + + static GstStaticPadTemplate gst_webrtc_dsp_sink_template = + GST_STATIC_PAD_TEMPLATE ("sink", +@@ -119,7 +116,7 @@ GST_STATIC_PAD_TEMPLATE ("src", + "channels = (int) [1, MAX]") + ); + +-typedef webrtc::EchoCancellation::SuppressionLevel GstWebrtcEchoSuppressionLevel; ++typedef int GstWebrtcEchoSuppressionLevel; + #define GST_TYPE_WEBRTC_ECHO_SUPPRESSION_LEVEL \ + (gst_webrtc_echo_suppression_level_get_type ()) + static GType +@@ -127,10 +124,9 @@ gst_webrtc_echo_suppression_level_get_type (void) + { + static GType suppression_level_type = 0; + static const GEnumValue level_types[] = { +- {webrtc::EchoCancellation::kLowSuppression, "Low Suppression", "low"}, +- {webrtc::EchoCancellation::kModerateSuppression, +- "Moderate Suppression", "moderate"}, +- {webrtc::EchoCancellation::kHighSuppression, "high Suppression", "high"}, ++ {1, "Low Suppression", "low"}, ++ {2, "Moderate Suppression", "moderate"}, ++ {3, "high Suppression", "high"}, + {0, NULL, NULL} + }; + +@@ -141,7 +137,7 @@ gst_webrtc_echo_suppression_level_get_type (void) + return suppression_level_type; + } + +-typedef webrtc::NoiseSuppression::Level GstWebrtcNoiseSuppressionLevel; ++typedef webrtc::AudioProcessing::Config::NoiseSuppression::Level GstWebrtcNoiseSuppressionLevel; + #define GST_TYPE_WEBRTC_NOISE_SUPPRESSION_LEVEL \ + (gst_webrtc_noise_suppression_level_get_type ()) + static GType +@@ -149,10 +145,10 @@ gst_webrtc_noise_suppression_level_get_type (void) + { + static GType suppression_level_type = 0; + static const GEnumValue level_types[] = { +- {webrtc::NoiseSuppression::kLow, "Low Suppression", "low"}, +- {webrtc::NoiseSuppression::kModerate, "Moderate Suppression", "moderate"}, +- {webrtc::NoiseSuppression::kHigh, "High Suppression", "high"}, +- {webrtc::NoiseSuppression::kVeryHigh, "Very High Suppression", ++ {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kLow, "Low Suppression", "low"}, ++ {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kModerate, "Moderate Suppression", "moderate"}, ++ {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kHigh, "High Suppression", "high"}, ++ {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kVeryHigh, "Very High Suppression", + "very-high"}, + {0, NULL, NULL} + }; +@@ -164,7 +160,7 @@ gst_webrtc_noise_suppression_level_get_type (void) + return suppression_level_type; + } + +-typedef webrtc::GainControl::Mode GstWebrtcGainControlMode; ++typedef webrtc::AudioProcessing::Config::GainController1::Mode GstWebrtcGainControlMode; + #define GST_TYPE_WEBRTC_GAIN_CONTROL_MODE \ + (gst_webrtc_gain_control_mode_get_type ()) + static GType +@@ -172,8 +168,9 @@ gst_webrtc_gain_control_mode_get_type (void) + { + static GType gain_control_mode_type = 0; + static const GEnumValue mode_types[] = { +- {webrtc::GainControl::kAdaptiveDigital, "Adaptive Digital", "adaptive-digital"}, +- {webrtc::GainControl::kFixedDigital, "Fixed Digital", "fixed-digital"}, ++ {webrtc::AudioProcessing::Config::GainController1::kAdaptiveDigital, "Adaptive Digital", "adaptive-digital"}, ++ {webrtc::AudioProcessing::Config::GainController1::kFixedDigital, "Fixed Digital", "fixed-digital"}, ++ {webrtc::AudioProcessing::Config::GainController1::kAdaptiveAnalog, "Adaptive Analog", "adaptive-analog"}, + {0, NULL, NULL} + }; + +@@ -184,7 +181,7 @@ gst_webrtc_gain_control_mode_get_type (void) + return gain_control_mode_type; + } + +-typedef webrtc::VoiceDetection::Likelihood GstWebrtcVoiceDetectionLikelihood; ++typedef int GstWebrtcVoiceDetectionLikelihood; + #define GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD \ + (gst_webrtc_voice_detection_likelihood_get_type ()) + static GType +@@ -192,10 +189,10 @@ gst_webrtc_voice_detection_likelihood_get_type (void) + { + static GType likelihood_type = 0; + static const GEnumValue likelihood_types[] = { +- {webrtc::VoiceDetection::kVeryLowLikelihood, "Very Low Likelihood", "very-low"}, +- {webrtc::VoiceDetection::kLowLikelihood, "Low Likelihood", "low"}, +- {webrtc::VoiceDetection::kModerateLikelihood, "Moderate Likelihood", "moderate"}, +- {webrtc::VoiceDetection::kHighLikelihood, "High Likelihood", "high"}, ++ {1, "Very Low Likelihood", "very-low"}, ++ {2, "Low Likelihood", "low"}, ++ {3, "Moderate Likelihood", "moderate"}, ++ {4, "High Likelihood", "high"}, + {0, NULL, NULL} + }; + +@@ -227,6 +224,7 @@ enum + PROP_VOICE_DETECTION, + PROP_VOICE_DETECTION_FRAME_SIZE_MS, + PROP_VOICE_DETECTION_LIKELIHOOD, ++ PROP_EXTRA_DELAY_MS, + }; + + /** +@@ -248,7 +246,7 @@ struct _GstWebrtcDsp + /* Protected by the stream lock */ + GstAdapter *adapter; + GstPlanarAudioAdapter *padapter; +- webrtc::AudioProcessing * apm; ++ webrtc::AudioProcessing *apm; + + /* Protected by the object lock */ + gchar *probe_name; +@@ -257,21 +255,15 @@ struct _GstWebrtcDsp + /* Properties */ + gboolean high_pass_filter; + gboolean echo_cancel; +- webrtc::EchoCancellation::SuppressionLevel echo_suppression_level; + gboolean noise_suppression; +- webrtc::NoiseSuppression::Level noise_suppression_level; ++ webrtc::AudioProcessing::Config::NoiseSuppression::Level noise_suppression_level; + gboolean gain_control; +- gboolean experimental_agc; +- gboolean extended_filter; +- gboolean delay_agnostic; + gint target_level_dbfs; + gint compression_gain_db; + gint startup_min_volume; + gboolean limiter; +- webrtc::GainControl::Mode gain_control_mode; ++ webrtc::AudioProcessing::Config::GainController1::Mode gain_control_mode; + gboolean voice_detection; +- gint voice_detection_frame_size_ms; +- webrtc::VoiceDetection::Likelihood voice_detection_likelihood; + }; + + G_DEFINE_TYPE_WITH_CODE (GstWebrtcDsp, gst_webrtc_dsp, GST_TYPE_AUDIO_FILTER, +@@ -376,9 +368,9 @@ gst_webrtc_dsp_analyze_reverse_stream (GstWebrtcDsp * self, + GstClockTime rec_time) + { + GstWebrtcEchoProbe *probe = NULL; +- webrtc::AudioProcessing * apm; +- webrtc::AudioFrame frame; ++ webrtc::AudioProcessing *apm; + GstBuffer *buf = NULL; ++ GstAudioBuffer abuf; + GstFlowReturn ret = GST_FLOW_OK; + gint err, delay; + +@@ -391,48 +383,44 @@ gst_webrtc_dsp_analyze_reverse_stream (GstWebrtcDsp * self, + if (!probe) + return GST_FLOW_OK; + ++ webrtc::StreamConfig config (probe->info.rate, probe->info.channels, ++ false); + apm = self->apm; + +- if (self->delay_agnostic) +- rec_time = GST_CLOCK_TIME_NONE; +- +-again: +- delay = gst_webrtc_echo_probe_read (probe, rec_time, (gpointer) &frame, &buf); ++ delay = gst_webrtc_echo_probe_read (probe, rec_time, &buf); + apm->set_stream_delay_ms (delay); + ++ g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR); ++ + if (delay < 0) + goto done; + +- if (frame.sample_rate_hz_ != self->info.rate) { ++ if (probe->info.rate != self->info.rate) { + GST_ELEMENT_ERROR (self, STREAM, FORMAT, + ("Echo Probe has rate %i , while the DSP is running at rate %i," + " use a caps filter to ensure those are the same.", +- frame.sample_rate_hz_, self->info.rate), (NULL)); ++ probe->info.rate, self->info.rate), (NULL)); + ret = GST_FLOW_ERROR; + goto done; + } + +- if (buf) { +- webrtc::StreamConfig config (frame.sample_rate_hz_, frame.num_channels_, +- false); +- GstAudioBuffer abuf; +- float * const * data; ++ gst_audio_buffer_map (&abuf, &self->info, buf, GST_MAP_READWRITE); ++ ++ if (probe->interleaved) { ++ int16_t * const data = (int16_t * const) abuf.planes[0]; + +- gst_audio_buffer_map (&abuf, &self->info, buf, GST_MAP_READWRITE); +- data = (float * const *) abuf.planes; + if ((err = apm->ProcessReverseStream (data, config, config, data)) < 0) + GST_WARNING_OBJECT (self, "Reverse stream analyses failed: %s.", + webrtc_error_to_string (err)); +- gst_audio_buffer_unmap (&abuf); +- gst_buffer_replace (&buf, NULL); + } else { +- if ((err = apm->AnalyzeReverseStream (&frame)) < 0) ++ float * const * data = (float * const *) abuf.planes; ++ ++ if ((err = apm->ProcessReverseStream (data, config, config, data)) < 0) + GST_WARNING_OBJECT (self, "Reverse stream analyses failed: %s.", + webrtc_error_to_string (err)); + } + +- if (self->delay_agnostic) +- goto again; ++ gst_audio_buffer_unmap (&abuf); + + done: + gst_object_unref (probe); +@@ -443,16 +431,14 @@ done: + + static void + gst_webrtc_vad_post_activity (GstWebrtcDsp *self, GstBuffer *buffer, +- gboolean stream_has_voice) ++ gboolean stream_has_voice, guint8 level) + { + GstClockTime timestamp = GST_BUFFER_PTS (buffer); + GstBaseTransform *trans = GST_BASE_TRANSFORM_CAST (self); + GstStructure *s; + GstClockTime stream_time; + GstAudioLevelMeta *meta; +- guint8 level; + +- level = self->apm->level_estimator ()->RMS (); + meta = gst_buffer_get_audio_level_meta (buffer); + if (meta) { + meta->voice_activity = stream_has_voice; +@@ -481,6 +467,7 @@ gst_webrtc_dsp_process_stream (GstWebrtcDsp * self, + { + GstAudioBuffer abuf; + webrtc::AudioProcessing * apm = self->apm; ++ webrtc::StreamConfig config (self->info.rate, self->info.channels, false); + gint err; + + if (!gst_audio_buffer_map (&abuf, &self->info, buffer, +@@ -490,19 +477,10 @@ gst_webrtc_dsp_process_stream (GstWebrtcDsp * self, + } + + if (self->interleaved) { +- webrtc::AudioFrame frame; +- frame.num_channels_ = self->info.channels; +- frame.sample_rate_hz_ = self->info.rate; +- frame.samples_per_channel_ = self->period_samples; +- +- memcpy (frame.data_, abuf.planes[0], self->period_size); +- err = apm->ProcessStream (&frame); +- if (err >= 0) +- memcpy (abuf.planes[0], frame.data_, self->period_size); ++ int16_t * const data = (int16_t * const) abuf.planes[0]; ++ err = apm->ProcessStream (data, config, config, data); + } else { + float * const * data = (float * const *) abuf.planes; +- webrtc::StreamConfig config (self->info.rate, self->info.channels, false); +- + err = apm->ProcessStream (data, config, config, data); + } + +@@ -511,10 +489,13 @@ gst_webrtc_dsp_process_stream (GstWebrtcDsp * self, + webrtc_error_to_string (err)); + } else { + if (self->voice_detection) { +- gboolean stream_has_voice = apm->voice_detection ()->stream_has_voice (); ++ webrtc::AudioProcessingStats stats = apm->GetStatistics (); ++ gboolean stream_has_voice = stats.voice_detected && *stats.voice_detected; ++ // The meta takes the value as -dbov, so we negate ++ guint8 level = stats.output_rms_dbfs ? (guint8) -(*stats.output_rms_dbfs) : 127; + + if (stream_has_voice != self->stream_has_voice) +- gst_webrtc_vad_post_activity (self, buffer, stream_has_voice); ++ gst_webrtc_vad_post_activity (self, buffer, stream_has_voice, level); + + self->stream_has_voice = stream_has_voice; + } +@@ -583,21 +564,9 @@ static gboolean + gst_webrtc_dsp_start (GstBaseTransform * btrans) + { + GstWebrtcDsp *self = GST_WEBRTC_DSP (btrans); +- webrtc::Config config; + + GST_OBJECT_LOCK (self); + +- config.Set < webrtc::ExtendedFilter > +- (new webrtc::ExtendedFilter (self->extended_filter)); +- config.Set < webrtc::ExperimentalAgc > +- (new webrtc::ExperimentalAgc (self->experimental_agc, self->startup_min_volume)); +- config.Set < webrtc::DelayAgnostic > +- (new webrtc::DelayAgnostic (self->delay_agnostic)); +- +- /* TODO Intelligibility enhancer, Beamforming, etc. */ +- +- self->apm = webrtc::AudioProcessing::Create (config); +- + if (self->echo_cancel) { + self->probe = gst_webrtc_acquire_echo_probe (self->probe_name); + +@@ -618,10 +587,8 @@ static gboolean + gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + { + GstWebrtcDsp *self = GST_WEBRTC_DSP (filter); +- webrtc::AudioProcessing * apm; +- webrtc::ProcessingConfig pconfig; ++ webrtc::AudioProcessing::Config config; + GstAudioInfo probe_info = *info; +- gint err = 0; + + GST_LOG_OBJECT (self, "setting format to %s with %i Hz and %i channels", + info->finfo->description, info->rate, info->channels); +@@ -633,7 +600,7 @@ gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + + self->info = *info; + self->interleaved = (info->layout == GST_AUDIO_LAYOUT_INTERLEAVED); +- apm = self->apm; ++ self->apm = webrtc::AudioProcessingBuilder().Create(); + + if (!self->interleaved) + gst_planar_audio_adapter_configure (self->padapter, info); +@@ -642,8 +609,7 @@ gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + self->period_samples = info->rate / 100; + self->period_size = self->period_samples * info->bpf; + +- if (self->interleaved && +- (webrtc::AudioFrame::kMaxDataSizeSamples * 2) < self->period_size) ++ if (self->interleaved && (self->period_size > MAX_DATA_SIZE_SAMPLES * 2)) + goto period_too_big; + + if (self->probe) { +@@ -658,40 +624,31 @@ gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + GST_WEBRTC_ECHO_PROBE_UNLOCK (self->probe); + } + +- /* input stream */ +- pconfig.streams[webrtc::ProcessingConfig::kInputStream] = +- webrtc::StreamConfig (info->rate, info->channels, false); +- /* output stream */ +- pconfig.streams[webrtc::ProcessingConfig::kOutputStream] = +- webrtc::StreamConfig (info->rate, info->channels, false); +- /* reverse input stream */ +- pconfig.streams[webrtc::ProcessingConfig::kReverseInputStream] = +- webrtc::StreamConfig (probe_info.rate, probe_info.channels, false); +- /* reverse output stream */ +- pconfig.streams[webrtc::ProcessingConfig::kReverseOutputStream] = +- webrtc::StreamConfig (probe_info.rate, probe_info.channels, false); +- +- if ((err = apm->Initialize (pconfig)) < 0) +- goto initialize_failed; +- + /* Setup Filters */ ++ // TODO: expose pre_amplifier ++ + if (self->high_pass_filter) { + GST_DEBUG_OBJECT (self, "Enabling High Pass filter"); +- apm->high_pass_filter ()->Enable (true); ++ config.high_pass_filter.enabled = true; + } + + if (self->echo_cancel) { + GST_DEBUG_OBJECT (self, "Enabling Echo Cancellation"); +- apm->echo_cancellation ()->enable_drift_compensation (false); +- apm->echo_cancellation () +- ->set_suppression_level (self->echo_suppression_level); +- apm->echo_cancellation ()->Enable (true); ++ config.echo_canceller.enabled = true; + } + + if (self->noise_suppression) { + GST_DEBUG_OBJECT (self, "Enabling Noise Suppression"); +- apm->noise_suppression ()->set_level (self->noise_suppression_level); +- apm->noise_suppression ()->Enable (true); ++ config.noise_suppression.enabled = true; ++ config.noise_suppression.level = self->noise_suppression_level; ++ } ++ ++ // TODO: expose transient suppression ++ ++ if (self->voice_detection) { ++ GST_DEBUG_OBJECT (self, "Enabling Voice Activity Detection"); ++ config.voice_detection.enabled = true; ++ self->stream_has_voice = FALSE; + } + + if (self->gain_control) { +@@ -706,30 +663,17 @@ gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + + g_type_class_unref (mode_class); + +- apm->gain_control ()->set_mode (self->gain_control_mode); +- apm->gain_control ()->set_target_level_dbfs (self->target_level_dbfs); +- apm->gain_control ()->set_compression_gain_db (self->compression_gain_db); +- apm->gain_control ()->enable_limiter (self->limiter); +- apm->gain_control ()->Enable (true); ++ config.gain_controller1.enabled = true; ++ config.gain_controller1.target_level_dbfs = self->target_level_dbfs; ++ config.gain_controller1.compression_gain_db = self->compression_gain_db; ++ config.gain_controller1.enable_limiter = self->limiter; ++ config.level_estimation.enabled = true; + } + +- if (self->voice_detection) { +- GEnumClass *likelihood_class = (GEnumClass *) +- g_type_class_ref (GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD); +- GST_DEBUG_OBJECT (self, "Enabling Voice Activity Detection, frame size " +- "%d milliseconds, likelihood: %s", self->voice_detection_frame_size_ms, +- g_enum_get_value (likelihood_class, +- self->voice_detection_likelihood)->value_name); +- g_type_class_unref (likelihood_class); ++ // TODO: expose gain controller 2 ++ // TODO: expose residual echo detector + +- self->stream_has_voice = FALSE; +- +- apm->voice_detection ()->Enable (true); +- apm->voice_detection ()->set_likelihood (self->voice_detection_likelihood); +- apm->voice_detection ()->set_frame_size_ms ( +- self->voice_detection_frame_size_ms); +- apm->level_estimator ()->Enable (true); +- } ++ self->apm->ApplyConfig (config); + + GST_OBJECT_UNLOCK (self); + +@@ -738,9 +682,9 @@ gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + period_too_big: + GST_OBJECT_UNLOCK (self); + GST_WARNING_OBJECT (self, "webrtcdsp format produce too big period " +- "(maximum is %" G_GSIZE_FORMAT " samples and we have %u samples), " ++ "(maximum is %d samples and we have %u samples), " + "reduce the number of channels or the rate.", +- webrtc::AudioFrame::kMaxDataSizeSamples, self->period_size / 2); ++ MAX_DATA_SIZE_SAMPLES, self->period_size / 2); + return FALSE; + + probe_has_wrong_rate: +@@ -751,14 +695,6 @@ probe_has_wrong_rate: + " use a caps filter to ensure those are the same.", + probe_info.rate, info->rate), (NULL)); + return FALSE; +- +-initialize_failed: +- GST_OBJECT_UNLOCK (self); +- GST_ELEMENT_ERROR (self, LIBRARY, INIT, +- ("Failed to initialize WebRTC Audio Processing library"), +- ("webrtc::AudioProcessing::Initialize() failed: %s", +- webrtc_error_to_string (err))); +- return FALSE; + } + + static gboolean +@@ -803,8 +739,6 @@ gst_webrtc_dsp_set_property (GObject * object, + self->echo_cancel = g_value_get_boolean (value); + break; + case PROP_ECHO_SUPPRESSION_LEVEL: +- self->echo_suppression_level = +- (GstWebrtcEchoSuppressionLevel) g_value_get_enum (value); + break; + case PROP_NOISE_SUPPRESSION: + self->noise_suppression = g_value_get_boolean (value); +@@ -817,13 +751,10 @@ gst_webrtc_dsp_set_property (GObject * object, + self->gain_control = g_value_get_boolean (value); + break; + case PROP_EXPERIMENTAL_AGC: +- self->experimental_agc = g_value_get_boolean (value); + break; + case PROP_EXTENDED_FILTER: +- self->extended_filter = g_value_get_boolean (value); + break; + case PROP_DELAY_AGNOSTIC: +- self->delay_agnostic = g_value_get_boolean (value); + break; + case PROP_TARGET_LEVEL_DBFS: + self->target_level_dbfs = g_value_get_int (value); +@@ -845,11 +776,8 @@ gst_webrtc_dsp_set_property (GObject * object, + self->voice_detection = g_value_get_boolean (value); + break; + case PROP_VOICE_DETECTION_FRAME_SIZE_MS: +- self->voice_detection_frame_size_ms = g_value_get_int (value); + break; + case PROP_VOICE_DETECTION_LIKELIHOOD: +- self->voice_detection_likelihood = +- (GstWebrtcVoiceDetectionLikelihood) g_value_get_enum (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +@@ -876,7 +804,7 @@ gst_webrtc_dsp_get_property (GObject * object, + g_value_set_boolean (value, self->echo_cancel); + break; + case PROP_ECHO_SUPPRESSION_LEVEL: +- g_value_set_enum (value, self->echo_suppression_level); ++ g_value_set_enum (value, (GstWebrtcEchoSuppressionLevel) 2); + break; + case PROP_NOISE_SUPPRESSION: + g_value_set_boolean (value, self->noise_suppression); +@@ -888,13 +816,13 @@ gst_webrtc_dsp_get_property (GObject * object, + g_value_set_boolean (value, self->gain_control); + break; + case PROP_EXPERIMENTAL_AGC: +- g_value_set_boolean (value, self->experimental_agc); ++ g_value_set_boolean (value, false); + break; + case PROP_EXTENDED_FILTER: +- g_value_set_boolean (value, self->extended_filter); ++ g_value_set_boolean (value, false); + break; + case PROP_DELAY_AGNOSTIC: +- g_value_set_boolean (value, self->delay_agnostic); ++ g_value_set_boolean (value, false); + break; + case PROP_TARGET_LEVEL_DBFS: + g_value_set_int (value, self->target_level_dbfs); +@@ -915,10 +843,10 @@ gst_webrtc_dsp_get_property (GObject * object, + g_value_set_boolean (value, self->voice_detection); + break; + case PROP_VOICE_DETECTION_FRAME_SIZE_MS: +- g_value_set_int (value, self->voice_detection_frame_size_ms); ++ g_value_set_int (value, 0); + break; + case PROP_VOICE_DETECTION_LIKELIHOOD: +- g_value_set_enum (value, self->voice_detection_likelihood); ++ g_value_set_enum (value, 2); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +@@ -1005,13 +933,13 @@ gst_webrtc_dsp_class_init (GstWebrtcDspClass * klass) + + g_object_class_install_property (gobject_class, + PROP_ECHO_SUPPRESSION_LEVEL, +- g_param_spec_enum ("echo-suppression-level", "Echo Suppression Level", ++ g_param_spec_enum ("echo-suppression-level", ++ "Echo Suppression Level (does nothing)", + "Controls the aggressiveness of the suppressor. A higher level " + "trades off double-talk performance for increased echo suppression.", +- GST_TYPE_WEBRTC_ECHO_SUPPRESSION_LEVEL, +- webrtc::EchoCancellation::kModerateSuppression, ++ GST_TYPE_WEBRTC_ECHO_SUPPRESSION_LEVEL, 2, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + g_object_class_install_property (gobject_class, + PROP_NOISE_SUPPRESSION, +@@ -1026,7 +954,7 @@ gst_webrtc_dsp_class_init (GstWebrtcDspClass * klass) + "Controls the aggressiveness of the suppression. Increasing the " + "level will reduce the noise level at the expense of a higher " + "speech distortion.", GST_TYPE_WEBRTC_NOISE_SUPPRESSION_LEVEL, +- webrtc::EchoCancellation::kModerateSuppression, ++ webrtc::AudioProcessing::Config::NoiseSuppression::Level::kModerate, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT))); + +@@ -1039,24 +967,26 @@ gst_webrtc_dsp_class_init (GstWebrtcDspClass * klass) + + g_object_class_install_property (gobject_class, + PROP_EXPERIMENTAL_AGC, +- g_param_spec_boolean ("experimental-agc", "Experimental AGC", ++ g_param_spec_boolean ("experimental-agc", ++ "Experimental AGC (does nothing)", + "Enable or disable experimental automatic gain control.", + FALSE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + g_object_class_install_property (gobject_class, + PROP_EXTENDED_FILTER, + g_param_spec_boolean ("extended-filter", "Extended Filter", + "Enable or disable the extended filter.", + TRUE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + g_object_class_install_property (gobject_class, + PROP_DELAY_AGNOSTIC, +- g_param_spec_boolean ("delay-agnostic", "Delay Agnostic", ++ g_param_spec_boolean ("delay-agnostic", ++ "Delay agnostic mode (does nothing)", + "Enable or disable the delay agnostic mode.", + FALSE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + g_object_class_install_property (gobject_class, + PROP_TARGET_LEVEL_DBFS, +@@ -1111,24 +1041,23 @@ gst_webrtc_dsp_class_init (GstWebrtcDspClass * klass) + g_object_class_install_property (gobject_class, + PROP_VOICE_DETECTION_FRAME_SIZE_MS, + g_param_spec_int ("voice-detection-frame-size-ms", +- "Voice Detection Frame Size Milliseconds", ++ "Voice detection frame size in milliseconds (does nothing)", + "Sets the |size| of the frames in ms on which the VAD will operate. " + "Larger frames will improve detection accuracy, but reduce the " + "frequency of updates", + 10, 30, DEFAULT_VOICE_DETECTION_FRAME_SIZE_MS, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + g_object_class_install_property (gobject_class, + PROP_VOICE_DETECTION_LIKELIHOOD, + g_param_spec_enum ("voice-detection-likelihood", +- "Voice Detection Likelihood", ++ "Voice detection likelihood (does nothing)", + "Specifies the likelihood that a frame will be declared to contain " + "voice.", +- GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD, +- DEFAULT_VOICE_DETECTION_LIKELIHOOD, ++ GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD, 2, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_GAIN_CONTROL_MODE, (GstPluginAPIFlags) 0); + gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_NOISE_SUPPRESSION_LEVEL, (GstPluginAPIFlags) 0); +diff --git a/ext/webrtcdsp/gstwebrtcechoprobe.cpp b/ext/webrtcdsp/gstwebrtcechoprobe.cpp +index acdb3d8a7d..8e8ca064c4 100644 +--- a/ext/webrtcdsp/gstwebrtcechoprobe.cpp ++++ b/ext/webrtcdsp/gstwebrtcechoprobe.cpp +@@ -33,7 +33,8 @@ + + #include "gstwebrtcechoprobe.h" + +-#include ++#include ++ + #include + + GST_DEBUG_CATEGORY_EXTERN (webrtc_dsp_debug); +@@ -102,7 +103,7 @@ gst_webrtc_echo_probe_setup (GstAudioFilter * filter, const GstAudioInfo * info) + self->period_size = self->period_samples * info->bpf; + + if (self->interleaved && +- (webrtc::AudioFrame::kMaxDataSizeSamples * 2) < self->period_size) ++ (MAX_DATA_SIZE_SAMPLES * 2) < self->period_size) + goto period_too_big; + + GST_WEBRTC_ECHO_PROBE_UNLOCK (self); +@@ -112,9 +113,9 @@ gst_webrtc_echo_probe_setup (GstAudioFilter * filter, const GstAudioInfo * info) + period_too_big: + GST_WEBRTC_ECHO_PROBE_UNLOCK (self); + GST_WARNING_OBJECT (self, "webrtcdsp format produce too big period " +- "(maximum is %" G_GSIZE_FORMAT " samples and we have %u samples), " ++ "(maximum is %d samples and we have %u samples), " + "reduce the number of channels or the rate.", +- webrtc::AudioFrame::kMaxDataSizeSamples, self->period_size / 2); ++ MAX_DATA_SIZE_SAMPLES, self->period_size / 2); + return FALSE; + } + +@@ -303,18 +304,20 @@ gst_webrtc_release_echo_probe (GstWebrtcEchoProbe * probe) + + gint + gst_webrtc_echo_probe_read (GstWebrtcEchoProbe * self, GstClockTime rec_time, +- gpointer _frame, GstBuffer ** buf) ++ GstBuffer ** buf) + { +- webrtc::AudioFrame * frame = (webrtc::AudioFrame *) _frame; + GstClockTimeDiff diff; +- gsize avail, skip, offset, size; ++ gsize avail, skip, offset, size = 0; + gint delay = -1; + + GST_WEBRTC_ECHO_PROBE_LOCK (self); + ++ /* We always return a buffer -- if don't have data (size == 0), we generate a ++ * silence buffer */ ++ + if (!GST_CLOCK_TIME_IS_VALID (self->latency) || + !GST_AUDIO_INFO_IS_VALID (&self->info)) +- goto done; ++ goto copy; + + if (self->interleaved) + avail = gst_adapter_available (self->adapter) / self->info.bpf; +@@ -324,7 +327,7 @@ gst_webrtc_echo_probe_read (GstWebrtcEchoProbe * self, GstClockTime rec_time, + /* In delay agnostic mode, just return 10ms of data */ + if (!GST_CLOCK_TIME_IS_VALID (rec_time)) { + if (avail < self->period_samples) +- goto done; ++ goto copy; + + size = self->period_samples; + skip = 0; +@@ -371,23 +374,51 @@ gst_webrtc_echo_probe_read (GstWebrtcEchoProbe * self, GstClockTime rec_time, + size = MIN (avail - offset, self->period_samples - skip); + + copy: +- if (self->interleaved) { +- skip *= self->info.bpf; +- offset *= self->info.bpf; +- size *= self->info.bpf; +- +- if (size < self->period_size) +- memset (frame->data_, 0, self->period_size); +- +- if (size) { +- gst_adapter_copy (self->adapter, (guint8 *) frame->data_ + skip, +- offset, size); +- gst_adapter_flush (self->adapter, offset + size); +- } ++ if (!size) { ++ /* No data, provide a period's worth of silence */ ++ *buf = gst_buffer_new_allocate (NULL, self->period_size, NULL); ++ gst_buffer_memset (*buf, 0, 0, self->period_size); ++ gst_buffer_add_audio_meta (*buf, &self->info, self->period_samples, ++ NULL); + } else { ++ /* We have some actual data, pop period_samples' worth if have it, else pad ++ * with silence and provide what we do have */ + GstBuffer *ret, *taken, *tmp; + +- if (size) { ++ if (self->interleaved) { ++ skip *= self->info.bpf; ++ offset *= self->info.bpf; ++ size *= self->info.bpf; ++ ++ gst_adapter_flush (self->adapter, offset); ++ ++ /* we need to fill silence at the beginning and/or the end of the ++ * buffer in order to have period_samples in the buffer */ ++ if (size < self->period_size) { ++ gsize padding = self->period_size - (skip + size); ++ ++ taken = gst_adapter_take_buffer (self->adapter, size); ++ ret = gst_buffer_new (); ++ ++ /* need some silence at the beginning */ ++ if (skip) { ++ tmp = gst_buffer_new_allocate (NULL, skip, NULL); ++ gst_buffer_memset (tmp, 0, 0, skip); ++ ret = gst_buffer_append (ret, tmp); ++ } ++ ++ ret = gst_buffer_append (ret, taken); ++ ++ /* need some silence at the end */ ++ if (padding) { ++ tmp = gst_buffer_new_allocate (NULL, padding, NULL); ++ gst_buffer_memset (tmp, 0, 0, padding); ++ ret = gst_buffer_append (ret, tmp); ++ } ++ } else { ++ ret = gst_adapter_take_buffer (self->adapter, size); ++ } ++ } else { + gst_planar_audio_adapter_flush (self->padapter, offset); + + /* we need to fill silence at the beginning and/or the end of each +@@ -430,23 +461,13 @@ copy: + ret = gst_planar_audio_adapter_take_buffer (self->padapter, size, + GST_MAP_READWRITE); + } +- } else { +- ret = gst_buffer_new_allocate (NULL, self->period_size, NULL); +- gst_buffer_memset (ret, 0, 0, self->period_size); +- gst_buffer_add_audio_meta (ret, &self->info, self->period_samples, +- NULL); + } + + *buf = ret; + } + +- frame->num_channels_ = self->info.channels; +- frame->sample_rate_hz_ = self->info.rate; +- frame->samples_per_channel_ = self->period_samples; +- + delay = self->delay; + +-done: + GST_WEBRTC_ECHO_PROBE_UNLOCK (self); + + return delay; +diff --git a/ext/webrtcdsp/gstwebrtcechoprobe.h b/ext/webrtcdsp/gstwebrtcechoprobe.h +index 36fd34f179..488c0e958f 100644 +--- a/ext/webrtcdsp/gstwebrtcechoprobe.h ++++ b/ext/webrtcdsp/gstwebrtcechoprobe.h +@@ -45,6 +45,12 @@ G_BEGIN_DECLS + #define GST_WEBRTC_ECHO_PROBE_LOCK(obj) g_mutex_lock (&GST_WEBRTC_ECHO_PROBE (obj)->lock) + #define GST_WEBRTC_ECHO_PROBE_UNLOCK(obj) g_mutex_unlock (&GST_WEBRTC_ECHO_PROBE (obj)->lock) + ++/* From the webrtc audio_frame.h definition of kMaxDataSizeSamples: ++ * Stereo, 32 kHz, 120 ms (2 * 32 * 120) ++ * Stereo, 192 kHz, 20 ms (2 * 192 * 20) ++ */ ++#define MAX_DATA_SIZE_SAMPLES 7680 ++ + typedef struct _GstWebrtcEchoProbe GstWebrtcEchoProbe; + typedef struct _GstWebrtcEchoProbeClass GstWebrtcEchoProbeClass; + +@@ -71,6 +77,7 @@ struct _GstWebrtcEchoProbe + GstClockTime latency; + gint delay; + gboolean interleaved; ++ gint extra_delay; + + GstSegment segment; + GstAdapter *adapter; +@@ -92,7 +99,7 @@ GST_ELEMENT_REGISTER_DECLARE (webrtcechoprobe); + GstWebrtcEchoProbe *gst_webrtc_acquire_echo_probe (const gchar * name); + void gst_webrtc_release_echo_probe (GstWebrtcEchoProbe * probe); + gint gst_webrtc_echo_probe_read (GstWebrtcEchoProbe * self, +- GstClockTime rec_time, gpointer frame, GstBuffer ** buf); ++ GstClockTime rec_time, GstBuffer ** buf); + + G_END_DECLS + #endif /* __GST_WEBRTC_ECHO_PROBE_H__ */ +diff --git a/ext/webrtcdsp/meson.build b/ext/webrtcdsp/meson.build +index 5aeae69a44..09565e27c7 100644 +--- a/ext/webrtcdsp/meson.build ++++ b/ext/webrtcdsp/meson.build +@@ -4,7 +4,7 @@ webrtc_sources = [ + 'gstwebrtcdspplugin.cpp' + ] + +-webrtc_dep = dependency('webrtc-audio-processing', version : ['>= 0.2', '< 0.4'], ++webrtc_dep = dependency('webrtc-audio-processing-1', version : ['>= 1.0'], + required : get_option('webrtcdsp')) + + if not gnustl_dep.found() and get_option('webrtcdsp').enabled() +@@ -20,7 +20,7 @@ if webrtc_dep.found() and gnustl_dep.found() + dependencies : [gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep, gnustl_dep], + install : true, + install_dir : plugins_install_dir, +- override_options : ['cpp_std=c++11'], ++ override_options : ['cpp_std=c++17'], + ) + plugins += [gstwebrtcdsp] + endif +-- +2.34.1 + From thomas.petazzoni at bootlin.com Mon Feb 5 10:57:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:57:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/gst1-plugins-bad: fix webrtcdsp plugin build In-Reply-To: <20240130192932.888169-1-james.hilliard1@gmail.com> References: <20240130192932.888169-1-james.hilliard1@gmail.com> Message-ID: <20240205115737.74590ae9@windsurf> On Tue, 30 Jan 2024 12:29:32 -0700 James Hilliard wrote: > The webrtc-audio-processing package was bumped from version 0.3.1 to > version 1.3 in commit ef0fa986eb7ff25c0a5db70ec0b62032e2d71538 which > broke compatibility with the gst1-plugins-bad webrtcdsp plugin. > > To fix this backport a commit from upstream adding support for > webrtc-audio-processing version 1.3 to gst1-plugins-bad. > > Fixes: > output/build/gst1-plugins-bad-1.22.9/ext/webrtcdsp/meson.build:7:13: ERROR: Dependency "webrtc-audio-processing" not found, tried pkgconfig and cmake > > Signed-off-by: James Hilliard > --- > ...e-code-for-webrtc-audio-processing-1.patch | 884 ++++++++++++++++++ > 1 file changed, 884 insertions(+) > create mode 100644 package/gstreamer1/gst1-plugins-bad/0001-webrtcdsp-Update-code-for-webrtc-audio-processing-1.patch Thanks for the investigation and fixing! The patch added was missing an "Upstream:" tag, so I added that by slightly updating the reference to the commit being backported. It's now applied to master. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From sergio.prado at e-labworks.com Mon Feb 5 11:00:00 2024 From: sergio.prado at e-labworks.com (sergio.prado at e-labworks.com) Date: Mon, 5 Feb 2024 08:00:00 -0300 Subject: [Buildroot] [PATCH] package/stella: bump to version 6.7.1 Message-ID: <20240205110000.1869845-1-sergio.prado@e-labworks.com> From: Sergio Prado Signed-off-by: Sergio Prado --- package/stella/stella.hash | 2 +- package/stella/stella.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/stella/stella.hash b/package/stella/stella.hash index 17d059226cfd..59c68064590b 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 babfcbb39abbd1a992cb1e6d3b2f508df7ed19cb9d0b5b5d624828bb98f97267 stella-6.7-src.tar.xz +sha256 9ef880df87f2d3ffebfbad915247d1fd5a3aca41dfd6a754dcf7a142ac826752 stella-6.7.1-src.tar.xz sha256 e82dd017fea2c70a16726aa1d7c05c5b7597e10f7229511c1b110bf84cb507c0 Copyright.txt sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index aa5da1996e1f..c48bb593a42a 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.7 +STELLA_VERSION = 6.7.1 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 5 11:01:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:01:18 +0100 Subject: [Buildroot] [git commit] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.72 Message-ID: <20240205110150.6961186B27@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8f092e59b70adf41418a743f09fcccabbb865e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog Removed patch which is included in this release. Signed-off-by: Yang Li Signed-off-by: Thomas Petazzoni --- .../bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- .../0001-configure-Check-ell-path.patch | 35 ---------------------- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 4 +-- 4 files changed, 3 insertions(+), 40 deletions(-) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 0790dd7e0e..74b385e110 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.68 +BLUEZ5_UTILS_HEADERS_VERSION = 5.72 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/0001-configure-Check-ell-path.patch b/package/bluez5_utils/0001-configure-Check-ell-path.patch deleted file mode 100644 index 3e5f7c6516..0000000000 --- a/package/bluez5_utils/0001-configure-Check-ell-path.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 124187ef9abed60a7c40f751153e9c4516cd1f91 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Sat, 1 Jul 2023 01:31:20 +0000 -Subject: [PATCH] configure: Check ell path - -Use of AC_CHECK_FILE prevents cross compilation. -Instead use test to support cross compiling. - -Signed-off-by: Rudi Heitbaum - -Upstream: https://github.com/bluez/bluez/pull/546 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index eff297960..bc7edfcd3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -298,9 +298,10 @@ if (test "${enable_external_ell}" = "yes"); then - AC_SUBST(ELL_LIBS) - fi - if (test "${enable_external_ell}" != "yes"); then -- AC_CHECK_FILE(${srcdir}/ell/ell.h, dummy=yes, -- AC_CHECK_FILE(${srcdir}/../ell/ell/ell.h, dummy=yes, -- AC_MSG_ERROR(ELL source is required or use --enable-external-ell))) -+ if (test ! -f ${srcdir}/ell/ell.h) && -+ (test ! -f ${srcdir}/../ell/ell/ell.h); then -+ AC_MSG_ERROR(ELL source is required or use --enable-external-ell) -+ fi - fi - AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes" || - (test "${enable_btpclient}" != "yes" && diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 45952e60f1..46680cf3c9 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 fc505e6445cb579a55cacee6821fe70d633921522043d322b696de0a175ff933 bluez-5.68.tar.xz +sha256 499d7fa345a996c1bb650f5c6749e1d929111fa6ece0be0e98687fee6124536e bluez-5.72.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 82800c0430..3ccb63948c 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,12 +5,10 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.68 +BLUEZ5_UTILS_VERSION = 5.72 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES -# 0001-configure-Check-ell-path.patch -BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez From thomas.petazzoni at bootlin.com Mon Feb 5 11:02:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:02:20 +0100 Subject: [Buildroot] [PATCH] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.72 In-Reply-To: <20240124082835.1995939-1-yang.li@amlogic.com> References: <20240124082835.1995939-1-yang.li@amlogic.com> Message-ID: <20240205120220.590fe561@windsurf> On Wed, 24 Jan 2024 16:28:34 +0800 Yang Li wrote: > Changelog: > https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog > > Removed patch which is included in this release. > > Signed-off-by: Yang Li > --- > .../bluez5_utils-headers.mk | 2 +- > .../0001-configure-Check-ell-path.patch | 35 ------------------- > package/bluez5_utils/bluez5_utils.hash | 2 +- > package/bluez5_utils/bluez5_utils.mk | 4 +-- > 4 files changed, 3 insertions(+), 40 deletions(-) > delete mode 100644 package/bluez5_utils/0001-configure-Check-ell-path.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 11:03:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:03:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/uboot-tools: install fit_check_sign if available In-Reply-To: <20240117212634.1334907-1-wdouglass@carnegierobotics.com> References: <20240117212634.1334907-1-wdouglass@carnegierobotics.com> Message-ID: <5614e73d-4356-4e36-ba10-2ad7d3cef8fb@korsgaard.com> On 17/01/2024 22.26, Woodrow Douglass via buildroot wrote: > fit_check_sign is a tool for verifying fit image signatures. > it gets built by host-uboot-tools, but not installed in the path. > > Signed-off-by: Woodrow Douglass Committed after rewording the commit message a bit, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 5 11:02:29 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:02:29 +0100 Subject: [Buildroot] [git commit] package/cryptsetup: bump version to 2.7.0 Message-ID: <20240205110457.ED32B86B31@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=101f5f276cfc74c906a2a66181b5b0f3ab29e3d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/cryptsetup/cryptsetup.hash | 4 ++-- package/cryptsetup/cryptsetup.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 87cdf840c3..df92ff36b8 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc -sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc +sha256 94003a00cd5a81944f45e8dc529e0cfd2a6ff629bd2cd21cf5e574e465daf795 cryptsetup-2.7.0.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 3f3034475f..1b181e1b75 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.6 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 +CRYPTSETUP_VERSION_MAJOR = 2.7 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From arnout at mind.be Mon Feb 5 11:05:30 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: <20240111051726.2918732-1-james.hilliard1@gmail.com> References: <20240111051726.2918732-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 06:17, James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-rpds-py/python-rpds-py.hash | 2 +- > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > index b04aa210d3..8c4b6181d0 100644 > --- a/package/python-rpds-py/python-rpds-py.hash > +++ b/package/python-rpds-py/python-rpds-py.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz ERROR: while checking hashes from package/python-rpds-py//python-rpds-py.hash ERROR: rpds_py-0.16.2.tar.gz has wrong sha256 hash: ERROR: expected: 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb ERROR: got : bc62a37913de53569414f6eb4a16a005b1dd04afb473c3c27561b11614f92034 ERROR: Incomplete download, or man-in-the-middle (MITM) attack This might be the gitattributes issue that Yann has a patch series for. I'm marking this patch as Changes Requested, you can try to re-submit after Yann's series is merged. Regards, Arnout > # Locally computed sha256 checksums > sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE > diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk > index 6f71d02047..5f0d30d002 100644 > --- a/package/python-rpds-py/python-rpds-py.mk > +++ b/package/python-rpds-py/python-rpds-py.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > +PYTHON_RPDS_PY_VERSION = 0.16.2 > PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz > -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 > +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 > PYTHON_RPDS_PY_SETUP_TYPE = maturin > PYTHON_RPDS_PY_LICENSE = MIT > PYTHON_RPDS_PY_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 11:05:54 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:54 +0100 Subject: [Buildroot] [git commit] package/python-redis: bump to version 5.0.1 Message-ID: <20240205110640.5858086B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ebe576da4e79dc5c71502385f9c080cee024f08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/redis/redis-py/commit/28cc65c18cc4fb37ef14497c963eb181dba8d25d Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-redis/Config.in | 4 ++-- package/python-redis/python-redis.hash | 6 +++--- package/python-redis/python-redis.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/python-redis/Config.in b/package/python-redis/Config.in index 4143e1f1c1..e22959cf7b 100644 --- a/package/python-redis/Config.in +++ b/package/python-redis/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_REDIS bool "python-redis" help - Python client for Redis key-value store. + Python client for Redis database and key-value store. - https://github.com/andymccurdy/redis-py + https://github.com/redis/redis-py diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index e27f87bd50..2d9df87a10 100644 --- a/package/python-redis/python-redis.hash +++ b/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 ad365234df634680d15294ddc87c42de redis-4.5.5.tar.gz -sha256 dc87a0bdef6c8bfe1ef1e1c40be7034390c2ae02d92dcd0c7ca1729443899880 redis-4.5.5.tar.gz +md5 f4bff9e3819ec832bb789b8b58363d6b redis-5.0.1.tar.gz +sha256 0dab495cd5753069d3bc650a0dde8a8f9edde16fc5691b689a566eda58100d0f redis-5.0.1.tar.gz # Locally computed sha256 checksums -sha256 7801a39e3a1aec58a7ea7c9f4dc1238cf0922c36a1fc8eff0bb7d684ff6dd354 LICENSE +sha256 a57b250a5bf03d7afe55b74063313f2adb7b00d546c0ab149a89398333fe3cc8 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index 186702dc83..067a754352 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 4.5.5 +PYTHON_REDIS_VERSION = 5.0.1 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/53/30/128c5599bc3fa61488866be0228326b3e486be34480126f70e572043adf8 +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/4a/4c/3c3b766f4ecbb3f0bec91ef342ee98d179e040c25b6ecc99e510c2570f2a PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 11:05:53 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:53 +0100 Subject: [Buildroot] [git commit] package/python-qrcode: bump to version 7.4.2 Message-ID: <20240205110640.4C1A486B6E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cfd08bd302e7d2e3585ef4d25e448abec3c8453 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new python-pypng runtime dependency. Add new python-typing-extensions runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-qrcode/Config.in | 2 ++ package/python-qrcode/python-qrcode.hash | 8 ++++---- package/python-qrcode/python-qrcode.mk | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/python-qrcode/Config.in b/package/python-qrcode/Config.in index 9a17cc1f08..6e63d83e41 100644 --- a/package/python-qrcode/Config.in +++ b/package/python-qrcode/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_QRCODE bool "python-qrcode" + select BR2_PACKAGE_PYTHON_PYPNG # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Pure python QR Code generator diff --git a/package/python-qrcode/python-qrcode.hash b/package/python-qrcode/python-qrcode.hash index 1ab84dd355..48b2d7b2b0 100644 --- a/package/python-qrcode/python-qrcode.hash +++ b/package/python-qrcode/python-qrcode.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/qrcode/json -md5 124103c685e96ba3b7a1616760f31c11 qrcode-7.3.1.tar.gz -sha256 375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578 qrcode-7.3.1.tar.gz -# Locally computed +# md5, sha256 from https://pypi.org/pypi/qrcode/json +md5 a4c47fe5ff966b105098998cfb2294de qrcode-7.4.2.tar.gz +sha256 9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b30f5845 qrcode-7.4.2.tar.gz +# Locally computed sha256 checksums sha256 40dfb903c94ee3f789500131311186548ecba5cefd3557623d7700e2522ab994 LICENSE diff --git a/package/python-qrcode/python-qrcode.mk b/package/python-qrcode/python-qrcode.mk index 23e7dd3b88..97b181a1e1 100644 --- a/package/python-qrcode/python-qrcode.mk +++ b/package/python-qrcode/python-qrcode.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_QRCODE_VERSION = 7.3.1 +PYTHON_QRCODE_VERSION = 7.4.2 PYTHON_QRCODE_SOURCE = qrcode-$(PYTHON_QRCODE_VERSION).tar.gz -PYTHON_QRCODE_SITE = https://files.pythonhosted.org/packages/94/9f/31f33cdf3cf8f98e64c42582fb82f39ca718264df61957f28b0bbb09b134 +PYTHON_QRCODE_SITE = https://files.pythonhosted.org/packages/30/35/ad6d4c5a547fe9a5baf85a9edbafff93fc6394b014fab30595877305fa59 PYTHON_QRCODE_SETUP_TYPE = setuptools PYTHON_QRCODE_LICENSE = BSD-3-Clause PYTHON_QRCODE_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 11:05:59 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:59 +0100 Subject: [Buildroot] [git commit] package/python-requests-toolbelt: bump to version 1.0.0 Message-ID: <20240205110640.85DD886B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f996ed3a8e8274d4acc604097909550b0a09087 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-requests-toolbelt/Config.in | 2 +- package/python-requests-toolbelt/python-requests-toolbelt.hash | 4 ++-- package/python-requests-toolbelt/python-requests-toolbelt.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in index ba2b95152e..7d5b4b65c2 100644 --- a/package/python-requests-toolbelt/Config.in +++ b/package/python-requests-toolbelt/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT help A utility belt for advanced users of python-requests. - https://toolbelt.readthedocs.org + https://toolbelt.readthedocs.io/ diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.hash b/package/python-requests-toolbelt/python-requests-toolbelt.hash index 28abf2c628..12bc58131d 100644 --- a/package/python-requests-toolbelt/python-requests-toolbelt.hash +++ b/package/python-requests-toolbelt/python-requests-toolbelt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests-toolbelt/json -md5 636d226d03632d013269aebbc85f4f4b requests-toolbelt-0.10.1.tar.gz -sha256 62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d requests-toolbelt-0.10.1.tar.gz +md5 6a8348cfc9991b44e499345db1c6f925 requests-toolbelt-1.0.0.tar.gz +sha256 7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6 requests-toolbelt-1.0.0.tar.gz # Locally computed sha256 checksums sha256 1f8cf8bdacd98ed6d36d0fec0c07f7765acebd6e81205962ab5146023b3c858d LICENSE diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.mk b/package/python-requests-toolbelt/python-requests-toolbelt.mk index 8c141e3aa9..d0bcb1bb21 100644 --- a/package/python-requests-toolbelt/python-requests-toolbelt.mk +++ b/package/python-requests-toolbelt/python-requests-toolbelt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_TOOLBELT_VERSION = 0.10.1 +PYTHON_REQUESTS_TOOLBELT_VERSION = 1.0.0 PYTHON_REQUESTS_TOOLBELT_SOURCE = requests-toolbelt-$(PYTHON_REQUESTS_TOOLBELT_VERSION).tar.gz -PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/0c/4c/07f01c6ac44f7784fa399137fbc8d0cdc1b5d35304e8c0f278ad82105b58 +PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/f3/61/d7545dafb7ac2230c70d38d31cbfe4cc64f7144dc41f6e4e4b78ecd9f5bb PYTHON_REQUESTS_TOOLBELT_SETUP_TYPE = setuptools PYTHON_REQUESTS_TOOLBELT_LICENSE = Apache-2.0 PYTHON_REQUESTS_TOOLBELT_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 11:05:56 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:56 +0100 Subject: [Buildroot] [git commit] package/python-reedsolo: bump to version 1.7.0 Message-ID: <20240205110640.631F986B70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a114e72a4716d3a19480317894d5ac46e318a5f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License changed to Unlicense/MIT-0: https://github.com/tomerfiliba-org/reedsolomon/commit/7b97461684701cf19451db1fd348d831dc526dc2 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-reedsolo/python-reedsolo.hash | 6 +++--- package/python-reedsolo/python-reedsolo.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-reedsolo/python-reedsolo.hash b/package/python-reedsolo/python-reedsolo.hash index fdafc89f49..c1729f0aeb 100644 --- a/package/python-reedsolo/python-reedsolo.hash +++ b/package/python-reedsolo/python-reedsolo.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/reedsolo/json -md5 b67a04027a1825c63a63b6793ec660a3 reedsolo-1.6.0.tar.gz -sha256 4e290d3b0a7207ac7aac186790766c752b5fcdf5e0b04dfd260349579052bbac reedsolo-1.6.0.tar.gz +md5 5bbd7741f915ad67b6d425f93ab9d103 reedsolo-1.7.0.tar.gz +sha256 c1359f02742751afe0f1c0de9f0772cc113835aa2855d2db420ea24393c87732 reedsolo-1.7.0.tar.gz # Locally computed sha256 checksums -sha256 0babd7b573efc3dcf5bb3c28b583150726f775d3dd8d54d6cd062834735b3d73 LICENSE +sha256 2da9536c23b72bac15603bb1f8dbf269dc68ecfbc35a75f8d0aa9cb209ba0934 LICENSE diff --git a/package/python-reedsolo/python-reedsolo.mk b/package/python-reedsolo/python-reedsolo.mk index 2a7fd42a05..66e85fb40a 100644 --- a/package/python-reedsolo/python-reedsolo.mk +++ b/package/python-reedsolo/python-reedsolo.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_REEDSOLO_VERSION = 1.6.0 +PYTHON_REEDSOLO_VERSION = 1.7.0 PYTHON_REEDSOLO_SOURCE = reedsolo-$(PYTHON_REEDSOLO_VERSION).tar.gz -PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/9b/10/28d1492cc82a103bc06f18cb9a9dbb3a9168ab2e4068801fa0aa0c76b231 +PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/f7/61/a67338cbecf370d464e71b10e9a31355f909d6937c3a8d6b17dd5d5beb5e PYTHON_REEDSOLO_SETUP_TYPE = setuptools -PYTHON_REEDSOLO_LICENSE = Public Domain +PYTHON_REEDSOLO_LICENSE = MIT-0, Unlicense PYTHON_REEDSOLO_LICENSE_FILES = LICENSE $(eval $(python-package)) From arnout at mind.be Mon Feb 5 11:05:57 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:57 +0100 Subject: [Buildroot] [git commit] package/python-referencing: bump to version 0.32.1 Message-ID: <20240205110640.6E09D86B6D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=585b0bab9e263f57b0aef60502eb34b73214e8c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-referencing/python-referencing.hash | 4 ++-- package/python-referencing/python-referencing.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-referencing/python-referencing.hash b/package/python-referencing/python-referencing.hash index d4f3dce5a4..2880a47477 100644 --- a/package/python-referencing/python-referencing.hash +++ b/package/python-referencing/python-referencing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/referencing/json -md5 617d973b9ce86b6f74b2216c6f3af5c9 referencing-0.30.2.tar.gz -sha256 794ad8003c65938edcdbc027f1933215e0d0ccc0291e3ce20a4d87432b59efc0 referencing-0.30.2.tar.gz +md5 d1a0a4ae03ebba4b86b22bfb825f150b referencing-0.32.1.tar.gz +sha256 3c57da0513e9563eb7e203ebe9bb3a1b509b042016433bd1e45a2853466c3dd3 referencing-0.32.1.tar.gz # Locally computed sha256 checksums sha256 42dcd63495f87b4eb7c7757afa379bb55a53f94afd7a5f657d9adf57236e515c COPYING diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 4d11c99deb..27d1452e91 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REFERENCING_VERSION = 0.30.2 +PYTHON_REFERENCING_VERSION = 0.32.1 PYTHON_REFERENCING_SOURCE = referencing-$(PYTHON_REFERENCING_VERSION).tar.gz -PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/e1/43/d3f6cf3e1ec9003520c5fb31dc363ee488c517f09402abd2a1c90df63bbb +PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/81/ce/910573eca7b1a1c6358b0dc0774ce1eeb81f4c98d4ee371f1c85f22040a1 PYTHON_REFERENCING_SETUP_TYPE = pep517 PYTHON_REFERENCING_LICENSE = MIT PYTHON_REFERENCING_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 5 11:05:58 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:58 +0100 Subject: [Buildroot] [git commit] package/python-regex: bump to version 2023.12.25 Message-ID: <20240205110640.7A27C86B6E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d1fc26f04698517afa225968cdfcd4c615870fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-regex/Config.in | 2 +- package/python-regex/python-regex.hash | 4 ++-- package/python-regex/python-regex.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-regex/Config.in b/package/python-regex/Config.in index 5f582d085a..89ead69c04 100644 --- a/package/python-regex/Config.in +++ b/package/python-regex/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PYTHON_REGEX help Alternative regular expression module, to replace re. - https://bitbucket.org/mrabarnett/mrab-regex + https://github.com/mrabarnett/mrab-regex diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index 11a5765e41..7454db99bb 100644 --- a/package/python-regex/python-regex.hash +++ b/package/python-regex/python-regex.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/regex/json -md5 a85ced10be8bfe76fed4f30c42d32d5c regex-2022.10.31.tar.gz -sha256 a3a98921da9a1bf8457aeee6a551948a83601689e5ecdd736894ea9bbec77e83 regex-2022.10.31.tar.gz +md5 3f97f0aef9bf334fe50ae5980b183e68 regex-2023.12.25.tar.gz +sha256 29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5 regex-2023.12.25.tar.gz # Locally computed sha256 checksums sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index 81bd460ecc..6b1938bc0c 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REGEX_VERSION = 2022.10.31 +PYTHON_REGEX_VERSION = 2023.12.25 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz -PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/27/b5/92d404279fd5f4f0a17235211bb0f5ae7a0d9afb7f439086ec247441ed28 +PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/b5/39/31626e7e75b187fae7f121af3c538a991e725c744ac893cc2cfd70ce2853 PYTHON_REGEX_SETUP_TYPE = setuptools PYTHON_REGEX_LICENSE = Apache-2.0 PYTHON_REGEX_LICENSE_FILES = LICENSE.txt From arnout at mind.be Mon Feb 5 11:05:52 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:52 +0100 Subject: [Buildroot] [git commit] package/python-pypng: new package Message-ID: <20240205110640.42D0C86B6D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fff23fd15d6b22e5099304b7e914ee2f81c930f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + package/python-pypng/Config.in | 6 ++++++ package/python-pypng/python-pypng.hash | 5 +++++ package/python-pypng/python-pypng.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/package/Config.in b/package/Config.in index 75a94177eb..ca1368124f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1275,6 +1275,7 @@ menu "External python modules" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" source "package/python-pyphen/Config.in" + source "package/python-pypng/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" source "package/python-pyratemp/Config.in" diff --git a/package/python-pypng/Config.in b/package/python-pypng/Config.in new file mode 100644 index 0000000000..c1ed405615 --- /dev/null +++ b/package/python-pypng/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYPNG + bool "python-pypng" + help + Pure Python library for saving and loading PNG images. + + https://gitlab.com/drj11/pypng diff --git a/package/python-pypng/python-pypng.hash b/package/python-pypng/python-pypng.hash new file mode 100644 index 0000000000..0f55eef702 --- /dev/null +++ b/package/python-pypng/python-pypng.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pypng/json +md5 7d9cce86ceb19524784ade86fb13a063 pypng-0.20220715.0.tar.gz +sha256 739c433ba96f078315de54c0db975aee537cbc3e1d0ae4ed9aab0ca1e427e2c1 pypng-0.20220715.0.tar.gz +# Locally computed sha256 checksums +sha256 8dd127d87bb901ab9c8f584e98b7c7aa8539db27fe62ff01b1ee4be93b6a513a LICENCE diff --git a/package/python-pypng/python-pypng.mk b/package/python-pypng/python-pypng.mk new file mode 100644 index 0000000000..07ad16b67b --- /dev/null +++ b/package/python-pypng/python-pypng.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pypng +# +################################################################################ + +PYTHON_PYPNG_VERSION = 0.20220715.0 +PYTHON_PYPNG_SOURCE = pypng-$(PYTHON_PYPNG_VERSION).tar.gz +PYTHON_PYPNG_SITE = https://files.pythonhosted.org/packages/93/cd/112f092ec27cca83e0516de0a3368dbd9128c187fb6b52aaaa7cde39c96d +PYTHON_PYPNG_SETUP_TYPE = setuptools +PYTHON_PYPNG_LICENSE = MIT +PYTHON_PYPNG_LICENSE_FILES = LICENCE + +$(eval $(python-package)) From peter at korsgaard.com Mon Feb 5 11:06:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:06:49 +0100 Subject: [Buildroot] [git commit] package/uboot-tools: install host-fit_check_sign Message-ID: <20240205110801.3DC8E86B74@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c8ba31a722affbbfade9e5c9411ef0bc7b461bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master fit_check_sign is a tool for verifying fit image signatures, which gets built if host-uboot-tools is built with fit signature support. Install it if so. Signed-off-by: Woodrow Douglass [Peter: reword commit message] Signed-off-by: Peter Korsgaard --- package/uboot-tools/uboot-tools.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index d884a010fb..12e10dea91 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -130,6 +130,9 @@ endif ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y) HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 HOST_UBOOT_TOOLS_DEPENDENCIES += host-openssl +define HOST_UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN + $(INSTALL) -m 0755 -D $(@D)/tools/fit_check_sign $(HOST_DIR)/bin/fit_check_sign +endef endif ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE),y) @@ -215,6 +218,7 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkeficapsule $(HOST_DIR)/bin/mkeficapsule $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage + $(HOST_UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN) $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(HOST_DIR)/bin/fw_printenv ln -sf $(HOST_DIR)/bin/fw_printenv $(HOST_DIR)/bin/fw_setenv $(HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE) From yann.morin.1998 at free.fr Mon Feb 5 11:10:03 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 12:10:03 +0100 Subject: [Buildroot] [git commit] support/testing: micropython: add micropython-lib test Message-ID: <20240205111025.246EB86B8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=094fb84320ab99ab508879b4f1230ea81bf00da8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 8f403f0 "package/micropython-lib: merge with, and install as part of micropython" brought micropython library within the package. This commit improves the micropython runtime test by enabling the micropython-lib and by also adding a runtime test using one of its module. We choose to use the gzip module, and check whther decodign q simple gziped file works; the micropython-lib gzip can only decompress, so we need to prepare it from the shell. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_micropython.py | 13 ++++++++++++- .../package/test_micropython/rootfs-overlay/root/zcat.py | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_micropython.py b/support/testing/tests/package/test_micropython.py index 0ecd4790bd..371deb2978 100644 --- a/support/testing/tests/package/test_micropython.py +++ b/support/testing/tests/package/test_micropython.py @@ -7,6 +7,7 @@ class TestMicroPython(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ f""" BR2_PACKAGE_MICROPYTHON=y + BR2_PACKAGE_MICROPYTHON_LIB=y BR2_ROOTFS_OVERLAY="{infra.filepath("tests/package/test_micropython/rootfs-overlay")}" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set @@ -64,5 +65,15 @@ class TestMicroPython(infra.basetest.BRTest): output = self.run_upy_code(py_code) self.assertEqual(output[0], expected_output) - # Finally, Check a small script can execute. + # Check a small script can execute. self.assertRunOk("/root/mandel.py", timeout=10) + + # Check we can use a micropython-lib module. + msg = "Hello Buildroot!" + filename = "file.txt" + gz_filename = f"{filename}.gz" + self.assertRunOk(f"echo '{msg}' > {filename}") + self.assertRunOk(f"gzip {filename}") + out, ret = self.emulator.run(f"/root/zcat.py {gz_filename}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) diff --git a/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py new file mode 100755 index 0000000000..3b8c60bdd1 --- /dev/null +++ b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py @@ -0,0 +1,15 @@ +#! /usr/bin/env micropython + +import gzip +import sys + + +def main(fname): + with open(fname, "rb") as f: + with gzip.GzipFile(fileobj=f) as g: + s = g.read() + print(s.decode("UTF-8"), end="") + + +if __name__ == "__main__": + main(sys.argv[1]) From thomas.petazzoni at bootlin.com Mon Feb 5 11:13:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:13:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: drop libnl dependency In-Reply-To: <20240128215205.3690716-1-fontaine.fabrice@gmail.com> References: <20240128215205.3690716-1-fontaine.fabrice@gmail.com> Message-ID: <20240205121309.20362244@windsurf> On Sun, 28 Jan 2024 22:52:05 +0100 Fabrice Fontaine wrote: > libnl is not needed to build frr since the addition of the package in > commit 26d82d006ba15777d19892b327bde343d82a9ff5 > > No mention of libnl found in https://github.com/FRRouting/frr or > https://docs.frrouting.org/projects/dev-guide/en/latest/building.html > > Signed-off-by: Fabrice Fontaine > --- > package/frr/Config.in | 1 - > package/frr/frr.mk | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 11:13:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:13:17 +0100 Subject: [Buildroot] [git commit] package/frr: drop libnl dependency Message-ID: <20240205111326.9FAA27F98A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efa955ac415e2b50f63710e4fc1de8fd3e0dc099 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libnl is not needed to build frr since the addition of the package in commit 26d82d006ba15777d19892b327bde343d82a9ff5 No mention of libnl found in https://github.com/FRRouting/frr or https://docs.frrouting.org/projects/dev-guide/en/latest/building.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/frr/Config.in | 1 - package/frr/frr.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/frr/Config.in b/package/frr/Config.in index c2e9577a27..f6c058e6df 100644 --- a/package/frr/Config.in +++ b/package/frr/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_FRR select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_LIBYANG - select BR2_PACKAGE_LIBNL select BR2_PACKAGE_READLINE select BR2_PACKAGE_JSON_C help diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 19f346fd7b..a4b4bccaf9 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -12,7 +12,7 @@ FRR_CPE_ID_VENDOR = linuxfoundation FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES -FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ +FRR_DEPENDENCIES = host-frr readline json-c libyang \ $(if $(BR2_PACKAGE_C_ARES),c-ares) HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 From peter at korsgaard.com Mon Feb 5 11:14:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:14:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-tabledata: bump to version 1.3.3 In-Reply-To: <20240111073226.3084555-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:32:26 -0700") References: <20240111073226.3084555-1-james.hilliard1@gmail.com> Message-ID: <87wmrjupqr.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:15:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:15:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-starlette: bump to version 0.34.0 In-Reply-To: <20240111072922.3082638-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:29:22 -0700") References: <20240111072922.3082638-1-james.hilliard1@gmail.com> Message-ID: <87sf27upph.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:16:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:16:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-stack-data: bump to version 0.6.3 In-Reply-To: <20240111072601.3080032-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:26:01 -0700") References: <20240111072601.3080032-1-james.hilliard1@gmail.com> Message-ID: <87o7cvupnt.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:17:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:17:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-socketio: bump to version 5.11.0 In-Reply-To: <20240111070910.3068587-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:09:10 -0700") References: <20240111070910.3068587-1-james.hilliard1@gmail.com> Message-ID: <87jznjupmu.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:17:25 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:17:25 +0100 Subject: [Buildroot] [git commit] package/python-socketio: bump to version 5.11.0 Message-ID: <20240205111738.2FC7786BB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85c5071bfea948fabbac6c3e81103c7979fa6646 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-socketio/python-socketio.hash | 4 ++-- package/python-socketio/python-socketio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-socketio/python-socketio.hash b/package/python-socketio/python-socketio.hash index abdcc3a5b7..a7756eb39d 100644 --- a/package/python-socketio/python-socketio.hash +++ b/package/python-socketio/python-socketio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-socketio/json -md5 e63369252a9d383cbfc503337b864733 python-socketio-5.7.2.tar.gz -sha256 92395062d9db3c13d30e7cdedaa0e1330bba78505645db695415f9a3c628d097 python-socketio-5.7.2.tar.gz +md5 207c7452bf6f1f444d8b70cac8801647 python-socketio-5.11.0.tar.gz +sha256 b03186e04b942088781f6286c13604a853e5e35ed59158c51ff7af22fa032e6f python-socketio-5.11.0.tar.gz # Locally computed sha256 checksums sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/package/python-socketio/python-socketio.mk b/package/python-socketio/python-socketio.mk index aecff55ef4..dc0c24fef5 100644 --- a/package/python-socketio/python-socketio.mk +++ b/package/python-socketio/python-socketio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_SOCKETIO_VERSION = 5.7.2 -PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/ee/56/294629986bf6cea96e0edb3933a7f2fac7a079d12909e893903a2effc670 +PYTHON_SOCKETIO_VERSION = 5.11.0 +PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/7a/e1/2817819a5635a099fda9fc758c51dc2f07996d6928d744639afcf5c5ddbb PYTHON_SOCKETIO_SETUP_TYPE = setuptools PYTHON_SOCKETIO_LICENSE = MIT PYTHON_SOCKETIO_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 11:17:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:17:24 +0100 Subject: [Buildroot] [git commit] package/python-stack-data: bump to version 0.6.3 Message-ID: <20240205111738.1F14586BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9eb7860257442d7ab98ec7a417a7fb8d99fe797a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-stack-data/python-stack-data.hash | 4 ++-- package/python-stack-data/python-stack-data.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-stack-data/python-stack-data.hash b/package/python-stack-data/python-stack-data.hash index 6decd3ca8e..b155a77c81 100644 --- a/package/python-stack-data/python-stack-data.hash +++ b/package/python-stack-data/python-stack-data.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/stack_data/json -md5 bf86c3c81a0158e1e7f3979da5a0033b stack_data-0.6.2.tar.gz -sha256 32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815 stack_data-0.6.2.tar.gz +md5 d04f7cda6589138e90691aec1edbf0d5 stack_data-0.6.3.tar.gz +sha256 836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9 stack_data-0.6.3.tar.gz # Locally computed sha256 checksums sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-stack-data/python-stack-data.mk b/package/python-stack-data/python-stack-data.mk index 1a85938311..7c38d2c4eb 100644 --- a/package/python-stack-data/python-stack-data.mk +++ b/package/python-stack-data/python-stack-data.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_STACK_DATA_VERSION = 0.6.2 +PYTHON_STACK_DATA_VERSION = 0.6.3 PYTHON_STACK_DATA_SOURCE = stack_data-$(PYTHON_STACK_DATA_VERSION).tar.gz -PYTHON_STACK_DATA_SITE = https://files.pythonhosted.org/packages/db/18/aa7f2b111aeba2cd83503254d9133a912d7f61f459a0c8561858f0d72a56 +PYTHON_STACK_DATA_SITE = https://files.pythonhosted.org/packages/28/e3/55dcc2cfbc3ca9c29519eb6884dd1415ecb53b0e934862d3559ddcb7e20b PYTHON_STACK_DATA_SETUP_TYPE = pep517 PYTHON_STACK_DATA_LICENSE = MIT PYTHON_STACK_DATA_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 5 11:17:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:17:23 +0100 Subject: [Buildroot] [git commit] package/python-starlette: bump to version 0.34.0 Message-ID: <20240205111738.0FC3D86BBA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8928608c19048ac140cfc5e5f0e84d50d5d590d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-starlette/python-starlette.hash | 4 ++-- package/python-starlette/python-starlette.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash index a7f1f66446..820026b70b 100644 --- a/package/python-starlette/python-starlette.hash +++ b/package/python-starlette/python-starlette.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/starlette/json -md5 5193c4b7d2ea4c93635c340a7ba9b54f starlette-0.27.0.tar.gz -sha256 6a6b0d042acb8d469a01eba54e9cda6cbd24ac602c4cd016723117d6a7e73b75 starlette-0.27.0.tar.gz +md5 2ef2fc635691fd4a1823564218292dce starlette-0.34.0.tar.gz +sha256 ed050aaf3896945bfaae93bdf337e53ef3f29115a9d9c153e402985115cd9c8e starlette-0.34.0.tar.gz # Locally computed sha256 checksums sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk index b04b95a797..07f9d6be5e 100644 --- a/package/python-starlette/python-starlette.mk +++ b/package/python-starlette/python-starlette.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_STARLETTE_VERSION = 0.27.0 +PYTHON_STARLETTE_VERSION = 0.34.0 PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/06/68/559bed5484e746f1ab2ebbe22312f2c25ec62e4b534916d41a8c21147bf8 +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/4f/36/168ba6d56a28382f3b081b23b0cc431de35786e120b94c1f372708ed3059 PYTHON_STARLETTE_SETUP_TYPE = pep517 PYTHON_STARLETTE_LICENSE = BSD-3-Clause PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Mon Feb 5 11:17:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:17:23 +0100 Subject: [Buildroot] [git commit] package/python-tabledata: bump to version 1.3.3 Message-ID: <20240205111737.F0D9986BB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83763e58de2393eac2db52af3f5ea825bf77f88f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-tabledata/Config.in | 2 -- package/python-tabledata/python-tabledata.hash | 4 ++-- package/python-tabledata/python-tabledata.mk | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/python-tabledata/Config.in b/package/python-tabledata/Config.in index 9947f41af6..3ee3057a39 100644 --- a/package/python-tabledata/Config.in +++ b/package/python-tabledata/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_TABLEDATA bool "python-tabledata" select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help A Python library to represent tabular data for diff --git a/package/python-tabledata/python-tabledata.hash b/package/python-tabledata/python-tabledata.hash index 3613589ae0..19fd4ea9c5 100644 --- a/package/python-tabledata/python-tabledata.hash +++ b/package/python-tabledata/python-tabledata.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tabledata/json -md5 1874cb0bf69cbc824a7bec67431023a9 tabledata-1.3.0.tar.gz -sha256 54541b0c9e58f8fa38251ea0a60965dbaf95737027fa80e6ab56f98d7e4d61e9 tabledata-1.3.0.tar.gz +md5 579c4e7454a837d252d4977b73556aae tabledata-1.3.3.tar.gz +sha256 c90daaba9a408e4397934b3ff2f6c06797d5289676420bf520c741ad43e6ff91 tabledata-1.3.3.tar.gz # Locally computed sha256 checksums sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE diff --git a/package/python-tabledata/python-tabledata.mk b/package/python-tabledata/python-tabledata.mk index 48f544b115..43e22d45d1 100644 --- a/package/python-tabledata/python-tabledata.mk +++ b/package/python-tabledata/python-tabledata.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TABLEDATA_VERSION = 1.3.0 +PYTHON_TABLEDATA_VERSION = 1.3.3 PYTHON_TABLEDATA_SOURCE = tabledata-$(PYTHON_TABLEDATA_VERSION).tar.gz -PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/ed/ed/dd0d6975963967492ac2c230107587593c7bd94acfa802b0c60a5395125c +PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/48/6a/7f78fbf883f325b70ba9ce5c10d97652f5c371e224940097c2cea9d0f456 PYTHON_TABLEDATA_SETUP_TYPE = setuptools PYTHON_TABLEDATA_LICENSE = MIT PYTHON_TABLEDATA_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 5 11:18:26 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 12:18:26 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: micropython: add micropython-lib test In-Reply-To: <20240204093148.11282-1-ju.o@free.fr> References: <20240204093148.11282-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-04 10:31 +0100, Julien Olivain spake thusly: > Commit 8f403f0 "package/micropython-lib: merge with, and install > as part of micropython" brought micropython library within the > package. > > This commit improves the micropython runtime test by enabling the > micropython-lib and by also adding a runtime test using one of its > module. I added a little blurb explaining why we can't use the gzip module itself to generate the compressed file. > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/testing/tests/package/test_micropython.py | 13 ++++++++++++- > .../test_micropython/rootfs-overlay/root/zcat.py | 15 +++++++++++++++ > 2 files changed, 27 insertions(+), 1 deletion(-) > create mode 100755 support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py > > diff --git a/support/testing/tests/package/test_micropython.py b/support/testing/tests/package/test_micropython.py > index 0ecd4790bd..371deb2978 100644 > --- a/support/testing/tests/package/test_micropython.py > +++ b/support/testing/tests/package/test_micropython.py > @@ -7,6 +7,7 @@ class TestMicroPython(infra.basetest.BRTest): > config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > f""" > BR2_PACKAGE_MICROPYTHON=y > + BR2_PACKAGE_MICROPYTHON_LIB=y > BR2_ROOTFS_OVERLAY="{infra.filepath("tests/package/test_micropython/rootfs-overlay")}" > BR2_TARGET_ROOTFS_CPIO=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -64,5 +65,15 @@ class TestMicroPython(infra.basetest.BRTest): > output = self.run_upy_code(py_code) > self.assertEqual(output[0], expected_output) > > - # Finally, Check a small script can execute. > + # Check a small script can execute. > self.assertRunOk("/root/mandel.py", timeout=10) > + > + # Check we can use a micropython-lib module. > + msg = "Hello Buildroot!" > + filename = "file.txt" > + gz_filename = f"{filename}.gz" > + self.assertRunOk(f"echo '{msg}' > {filename}") > + self.assertRunOk(f"gzip {filename}") > + out, ret = self.emulator.run(f"/root/zcat.py {gz_filename}") > + self.assertEqual(ret, 0) > + self.assertEqual(out[0], msg) > diff --git a/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py > new file mode 100755 > index 0000000000..3b8c60bdd1 > --- /dev/null > +++ b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py > @@ -0,0 +1,15 @@ > +#! /usr/bin/env micropython > + > +import gzip > +import sys > + > + > +def main(fname): > + with open(fname, "rb") as f: > + with gzip.GzipFile(fileobj=f) as g: > + s = g.read() > + print(s.decode("UTF-8"), end="") > + > + > +if __name__ == "__main__": > + main(sys.argv[1]) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Mon Feb 5 11:25:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:25:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-simplesqlite: bump to version 1.5.2 In-Reply-To: <20240111065524.3060233-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 23:55:24 -0700") References: <20240111065524.3060233-1-james.hilliard1@gmail.com> Message-ID: <87fry7up8x.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Drop no longer required python-setuptools runtime dependency. > Drop no longer required python-six runtime dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:17:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:17:36 +0100 Subject: [Buildroot] [git commit] package/python-simplesqlite: bump to version 1.5.2 Message-ID: <20240205112551.B026B86BC0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0a4e392daccac896f3bf07b971377fde56ec484 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required python-setuptools runtime dependency. Drop no longer required python-six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-simplesqlite/Config.in | 2 -- package/python-simplesqlite/python-simplesqlite.hash | 4 ++-- package/python-simplesqlite/python-simplesqlite.mk | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/python-simplesqlite/Config.in b/package/python-simplesqlite/Config.in index 81501c9e83..d650439dce 100644 --- a/package/python-simplesqlite/Config.in +++ b/package/python-simplesqlite/Config.in @@ -3,8 +3,6 @@ config BR2_PACKAGE_PYTHON_SIMPLESQLITE select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_SQLITESCHEMA # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime diff --git a/package/python-simplesqlite/python-simplesqlite.hash b/package/python-simplesqlite/python-simplesqlite.hash index 06edbfab3d..8060437718 100644 --- a/package/python-simplesqlite/python-simplesqlite.hash +++ b/package/python-simplesqlite/python-simplesqlite.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplesqlite/json -md5 11f2ef73243fb0d677ed00d22f1441b2 SimpleSQLite-1.3.0.tar.gz -sha256 f7e862bec5982059e665cc73b6fdb4c8340a1f565ba3497387c3c48f10d43bf8 SimpleSQLite-1.3.0.tar.gz +md5 a907352592539345bf8145c3e39015cb SimpleSQLite-1.5.2.tar.gz +sha256 f9a25b9e43d7aa28f551d170a42cfae10139c5c81a1bcb8776f857816ef5ae0f SimpleSQLite-1.5.2.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-simplesqlite/python-simplesqlite.mk b/package/python-simplesqlite/python-simplesqlite.mk index ea60cefc16..d8efe23a6c 100644 --- a/package/python-simplesqlite/python-simplesqlite.mk +++ b/package/python-simplesqlite/python-simplesqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLESQLITE_VERSION = 1.3.0 +PYTHON_SIMPLESQLITE_VERSION = 1.5.2 PYTHON_SIMPLESQLITE_SOURCE = SimpleSQLite-$(PYTHON_SIMPLESQLITE_VERSION).tar.gz -PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/a0/2c/39a9e7dc4af46d101f48753086c686982790ecc2bdf5e9fa88f85f027e7a +PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/c8/07/92e3291fda6f1bbf6e7ff4721d87566e1615572d9c205ef64398c5d22efe PYTHON_SIMPLESQLITE_SETUP_TYPE = setuptools PYTHON_SIMPLESQLITE_LICENSE = MIT PYTHON_SIMPLESQLITE_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 11:28:59 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:28:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rtoml: bump to version 0.10.0 In-Reply-To: <20240111052225.2922249-1-james.hilliard1@gmail.com> References: <20240111052225.2922249-1-james.hilliard1@gmail.com> Message-ID: <687fa6af-4d6f-4890-bd3a-c420ede9cdfd@mind.be> On 11/01/2024 06:22, James Hilliard wrote: > Migrate from setuptools-rust to maturin infrastructure. > > Signed-off-by: James Hilliard > --- > package/python-rtoml/python-rtoml.hash | 2 +- > package/python-rtoml/python-rtoml.mk | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash > index 04d22ed1a4..59f17d9d62 100644 > --- a/package/python-rtoml/python-rtoml.hash > +++ b/package/python-rtoml/python-rtoml.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz > +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz Same problem: ERROR: while checking hashes from package/python-rtoml//python-rtoml.hash ERROR: rtoml-0.10.0.tar.gz has wrong sha256 hash: ERROR: expected: 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 ERROR: got : 624cc1ff2b3fdea42aeee3a4d1537d37431ec001870dfee1e04a12bd3076a2d3 Regards, Arnout > # Locally computed sha256 checksums > sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE > diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk > index 819dcf3288..16f9dea573 100644 > --- a/package/python-rtoml/python-rtoml.mk > +++ b/package/python-rtoml/python-rtoml.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PYTHON_RTOML_VERSION = 0.8.0 > +PYTHON_RTOML_VERSION = 0.10.0 > PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz > -PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 > -PYTHON_RTOML_SETUP_TYPE = setuptools-rust > +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/ca/b2/0e77a00e75ed582ec1c4c3a9e1eeed886a15c195bcce87b7daf1171c4115 > +PYTHON_RTOML_SETUP_TYPE = maturin > PYTHON_RTOML_LICENSE = MIT > PYTHON_RTOML_LICENSE_FILES = LICENSE > From peter at korsgaard.com Mon Feb 5 11:33:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:33:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-segno: bump to version 1.6.0 In-Reply-To: <20240111055229.3019251-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:52:29 -0700") References: <20240111055229.3019251-1-james.hilliard1@gmail.com> Message-ID: <87bk8vuov0.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > License hash changed due to formatting change: > https://github.com/heuer/segno/commit/5f61bc42535b836c30015a0cef5db1e52ef8ac67 > Drop no longer required python-setuptools runtime dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:32:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:32:03 +0100 Subject: [Buildroot] [git commit] package/python-segno: bump to version 1.6.0 Message-ID: <20240205113409.5472186BE3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=081162580f99d1a68133f7f513bf2cd6d1b8b6b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to formatting change: https://github.com/heuer/segno/commit/5f61bc42535b836c30015a0cef5db1e52ef8ac67 Drop no longer required python-setuptools runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-segno/Config.in | 3 +-- package/python-segno/python-segno.hash | 6 +++--- package/python-segno/python-segno.mk | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/python-segno/Config.in b/package/python-segno/Config.in index 3957cd79bf..7107e67443 100644 --- a/package/python-segno/Config.in +++ b/package/python-segno/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_SEGNO bool "python-segno" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help - QR Code and Micro QR Code generator for Python 2 and Python 3 + QR Code and Micro QR Code generator for Python. https://github.com/heuer/segno/ diff --git a/package/python-segno/python-segno.hash b/package/python-segno/python-segno.hash index 286bdf3615..58142c184f 100644 --- a/package/python-segno/python-segno.hash +++ b/package/python-segno/python-segno.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/segno/json -md5 6d7c852f951501cd3af85ef061d6bee4 segno-1.5.2.tar.gz -sha256 983424b296e62189d70fc73460cd946cf56dcbe82b9bda18c066fc1b24371cdc segno-1.5.2.tar.gz +md5 b80c19075a7a07cce50b054e9e221cf7 segno-1.6.0.tar.gz +sha256 8d3b11098ac6dd93161499544dedbfb187d4459088109b8855ff0bbe98105047 segno-1.6.0.tar.gz # Locally computed sha256 checksums -sha256 98b0a86ca0cbf68c95051741bc983425a43fdece775fe0e2712e66be459cc9d1 LICENSE +sha256 3af9b2f15c736a571978760b2d60598502c205eb6daebe2ec36f0272c380ed28 LICENSE diff --git a/package/python-segno/python-segno.mk b/package/python-segno/python-segno.mk index c832f38f4b..2c230ee26b 100644 --- a/package/python-segno/python-segno.mk +++ b/package/python-segno/python-segno.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SEGNO_VERSION = 1.5.2 +PYTHON_SEGNO_VERSION = 1.6.0 PYTHON_SEGNO_SOURCE = segno-$(PYTHON_SEGNO_VERSION).tar.gz -PYTHON_SEGNO_SITE = https://files.pythonhosted.org/packages/90/2a/2fedf1023f9273d8326362df7936748ebadef92ba53ab7970d9b8df1a6c2 +PYTHON_SEGNO_SITE = https://files.pythonhosted.org/packages/51/a8/960844fec8d853a4e8e91f64bdde323ea5a2a44357eca799e7f7f7bf2f1e PYTHON_SEGNO_SETUP_TYPE = setuptools PYTHON_SEGNO_LICENSE = BSD-3-Clause PYTHON_SEGNO_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 11:34:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:34:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-segno: bump to version 1.6.0 In-Reply-To: <20240111055229.3019251-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:52:29 -0700") References: <20240111055229.3019251-1-james.hilliard1@gmail.com> Message-ID: <877cjjuotl.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > License hash changed due to formatting change: > https://github.com/heuer/segno/commit/5f61bc42535b836c30015a0cef5db1e52ef8ac67 > Drop no longer required python-setuptools runtime dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:34:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:34:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-scipy: bump to version 1.11.4 In-Reply-To: <20240111054740.3015662-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:47:40 -0700") References: <20240111054740.3015662-1-james.hilliard1@gmail.com> Message-ID: <8734u7uotc.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:35:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:35:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-schedule: bump to version 1.2.1 In-Reply-To: <20240111053716.2931403-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:37:16 -0700") References: <20240111053716.2931403-1-james.hilliard1@gmail.com> Message-ID: <87y1bzta85.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 5 11:35:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:35:21 +0100 Subject: [Buildroot] [git commit] package/libxml-parser-perl: bump to version 2.47 Message-ID: <20240205113531.8882886BEA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7fd6473a2b8c4ca274bd8a3b53e55d6af5242f9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The license file 'README' has changed due to the following diff: - $p3->parse($foo, ProtocolEncoding => 'ISO-8859-1'); - close($foo); + $p3->parse($fh, ProtocolEncoding => 'ISO-8859-1'); + close($fh); This does not affect the licensing terms. A 'LICENSE' file was added in 2.47, but it contains the terms of the wrong license (Artistic 2.0), while this package is under Artistic or GPL-1.0+. This has been reported upstream at https://github.com/cpan-authors/XML-Parser/pull/99. Signed-off-by: Kevin Cui Signed-off-by: Thomas Petazzoni --- package/libxml-parser-perl/libxml-parser-perl.hash | 4 ++-- package/libxml-parser-perl/libxml-parser-perl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml-parser-perl/libxml-parser-perl.hash b/package/libxml-parser-perl/libxml-parser-perl.hash index c3ef1016e8..4b91386573 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.hash +++ b/package/libxml-parser-perl/libxml-parser-perl.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d XML-Parser-2.46.tar.gz -sha256 6a2e768443ed00f09d3d4bc4dd14451035eac13c6864d68d8e2f76edf5a044f2 README +sha256 ad4aae643ec784f489b956abe952432871a622d4e2b5c619e8855accbfc4d1d8 XML-Parser-2.47.tar.gz +sha256 3bedfe79fbad08a2b50e1b2b6123e40c68b58b1988d53763b63b6fd295bb0f90 README diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk index 37cef2e418..06bbd3b1ad 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.mk +++ b/package/libxml-parser-perl/libxml-parser-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXML_PARSER_PERL_VERSION = 2.46 +LIBXML_PARSER_PERL_VERSION = 2.47 LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz LIBXML_PARSER_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat From peter at korsgaard.com Mon Feb 5 11:35:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:35:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-s3transfer: bump to version 0.10.0 In-Reply-To: <20240111053548.2930141-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:35:48 -0700") References: <20240111053548.2930141-1-james.hilliard1@gmail.com> Message-ID: <87ttmnta76.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 5 11:36:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:36:50 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libxml-parser-perl: bump to version 2.47 In-Reply-To: <20240129034403.10232-2-bh@bugs.cc> References: <87ede3236l.fsf@48ers.dk> <20240129034403.10232-2-bh@bugs.cc> Message-ID: <20240205123650.23b78a48@windsurf> On Mon, 29 Jan 2024 11:44:04 +0800 Kevin Cui wrote: > Signed-off-by: Kevin Cui > > --- > Changes for v2: > - use real name in "From" and "Signed-off-by" > --- > package/libxml-parser-perl/libxml-parser-perl.hash | 4 ++-- > package/libxml-parser-perl/libxml-parser-perl.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Thanks for your patch! You forgot to explain in the commit log why the README file hash changed. It's important to look into this and provide explanation in the commit log, as it's the very reason why we have those hashes in the first place: to detect license changes and account for them. And it turns out that a separate LICENSE file got added in 2.47. But (!) this new license file is wrong: it doesn't contain the right license text. This was already seen by Debian, and reported upstream: https://github.com/cpan-authors/XML-Parser/pull/99. So I expanded significantly the commit log to explain all of this. See the final commit at https://gitlab.com/buildroot.org/buildroot/-/commit/7fd6473a2b8c4ca274bd8a3b53e55d6af5242f9a. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 11:36:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:36:04 +0100 Subject: [Buildroot] [git commit] package/python-scipy: bump to version 1.11.4 Message-ID: <20240205113720.BBE6F86C04@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac774255e87a934f43f8048f7dd9a9d82de79cd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-scipy/python-scipy.hash | 6 ++++-- package/python-scipy/python-scipy.mk | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash index 9634771139..bee5d698a0 100644 --- a/package/python-scipy/python-scipy.hash +++ b/package/python-scipy/python-scipy.hash @@ -1,5 +1,7 @@ -# Locally generated -sha256 f9b0248cb9d08eead44cde47cbf6339f1e9aa0dfde28f5fb27950743e317bd5d scipy-1.11.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/scipy/json +md5 0e8eea0f7c4fe7d8102366230c96d66d scipy-1.11.4.tar.gz +sha256 90a2b78e7f5733b9de748f589f09225013685f9b218275257f8a8168ededaeaa scipy-1.11.4.tar.gz +# Locally computed sha256 checksums sha256 5517022426a56179540ee6eace15fd723ef8fdb83b2900fed2152dd2e2f972a2 LICENSE.txt sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk index 3010cfbd54..6626826e33 100644 --- a/package/python-scipy/python-scipy.mk +++ b/package/python-scipy/python-scipy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCIPY_VERSION = 1.11.0 +PYTHON_SCIPY_VERSION = 1.11.4 PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.gz -PYTHON_SCIPY_SITE = https://files.pythonhosted.org/packages/fa/d0/724c8204f87b6f807e3e67de32b8b4922d579154a448ce94e89129064bf1 +PYTHON_SCIPY_SITE = https://files.pythonhosted.org/packages/6e/1f/91144ba78dccea567a6466262922786ffc97be1e9b06ed9574ef0edc11e1 PYTHON_SCIPY_LICENSE = \ BSD-3-Clause, \ BSD-2-Clause, \ From peter at korsgaard.com Mon Feb 5 11:36:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:36:05 +0100 Subject: [Buildroot] [git commit] package/python-schedule: bump to version 1.2.1 Message-ID: <20240205113720.C550E86C05@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=435f71ad2ef340b0e89a77702c1e273bb4dad1a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-schedule/python-schedule.hash | 4 ++-- package/python-schedule/python-schedule.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-schedule/python-schedule.hash b/package/python-schedule/python-schedule.hash index 3d67be0f5e..59c84c2002 100644 --- a/package/python-schedule/python-schedule.hash +++ b/package/python-schedule/python-schedule.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/schedule/json -md5 9bf7544e37824e450457187633a17b17 schedule-1.1.0.tar.gz -sha256 e6ca13585e62c810e13a08682e0a6a8ad245372e376ba2b8679294f377dfc8e4 schedule-1.1.0.tar.gz +md5 ecb436a797e1a149bac4643330b268ca schedule-1.2.1.tar.gz +sha256 843bc0538b99c93f02b8b50e3e39886c06f2d003b24f48e1aa4cadfa3f341279 schedule-1.2.1.tar.gz # Locally computed sha256 checksums sha256 30a8352c318ce1b645acde0299697342d4380ed2637d7ca18a8ad25661e3b41b LICENSE.txt diff --git a/package/python-schedule/python-schedule.mk b/package/python-schedule/python-schedule.mk index fc6081cf22..11be2e49d4 100644 --- a/package/python-schedule/python-schedule.mk +++ b/package/python-schedule/python-schedule.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCHEDULE_VERSION = 1.1.0 +PYTHON_SCHEDULE_VERSION = 1.2.1 PYTHON_SCHEDULE_SOURCE = schedule-$(PYTHON_SCHEDULE_VERSION).tar.gz -PYTHON_SCHEDULE_SITE = https://files.pythonhosted.org/packages/a8/b5/a291a4c0faa491fd5baefa6d89011ece581cff47b23c0a39b42a63383358 +PYTHON_SCHEDULE_SITE = https://files.pythonhosted.org/packages/29/22/9dd374cbf76a42ece1f1f41cc8f4957f0ad512577372527cd3dd52758241 PYTHON_SCHEDULE_SETUP_TYPE = setuptools PYTHON_SCHEDULE_LICENSE = MIT PYTHON_SCHEDULE_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 5 11:36:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:36:05 +0100 Subject: [Buildroot] [git commit] package/python-s3transfer: bump to version 0.10.0 Message-ID: <20240205113720.D032886C06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63c571096ffbf484ead8d0fc7d8c3b222853e8c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-s3transfer/python-s3transfer.hash | 5 +++-- package/python-s3transfer/python-s3transfer.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-s3transfer/python-s3transfer.hash b/package/python-s3transfer/python-s3transfer.hash index 16f0face72..48be6b3a8b 100644 --- a/package/python-s3transfer/python-s3transfer.hash +++ b/package/python-s3transfer/python-s3transfer.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/s3transfer/json -sha256 2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947 s3transfer-0.6.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/s3transfer/json +md5 ba84e7c06bc1dcd3151c3d2132621cfc s3transfer-0.10.0.tar.gz +sha256 d0c8bbf672d5eebbe4e57945e23b972d963f07d82f661cabf678a5c88831595b s3transfer-0.10.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/python-s3transfer/python-s3transfer.mk b/package/python-s3transfer/python-s3transfer.mk index 60a72da729..6fae824862 100644 --- a/package/python-s3transfer/python-s3transfer.mk +++ b/package/python-s3transfer/python-s3transfer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_S3TRANSFER_VERSION = 0.6.0 +PYTHON_S3TRANSFER_VERSION = 0.10.0 PYTHON_S3TRANSFER_SOURCE = s3transfer-$(PYTHON_S3TRANSFER_VERSION).tar.gz -PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/e1/eb/e57c93d5cd5edf8c1d124c831ef916601540db70acd96fa21fe60cef1365 +PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/a0/b5/4c570b08cb85fdcc65037b5229e00412583bb38d974efecb7ec3495f40ba PYTHON_S3TRANSFER_SETUP_TYPE = setuptools PYTHON_S3TRANSFER_LICENSE = Apache-2.0 PYTHON_S3TRANSFER_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 5 11:39:26 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:39:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <20240111053157.2928259-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:31:57 -0700") References: <20240111053157.2928259-1-james.hilliard1@gmail.com> Message-ID: <87plxbta1d.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > License hash changed due to year update: > https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ > Signed-off-by: James Hilliard > --- > package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- > package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash > index 29852a51ed..7b5dc1e29a 100644 > --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/rfc3987/json > -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz > -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz > +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz > +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 ruamel.yaml-0.18.5.tar.gz Hmm, I get a different hash: ruamel.yaml-0.18.5.tar.gz: OK (md5: 24fac3544a3c7bd7eeaf6e4f704a056e) ERROR: while checking hashes from package/python-ruamel-yaml//python-ruamel-yaml.hash ERROR: ruamel.yaml-0.18.5.tar.gz has wrong sha256 hash: ERROR: expected: ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 ERROR: got : 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ERROR: Incomplete download, or man-in-the-middle (MITM) attack Any ideas? -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Mon Feb 5 11:41:50 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 12:41:50 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/iniparser: new package In-Reply-To: <20231006140511.3840643-2-enki@fsck.pl> References: <20231004131256.2113233-2-enki@fsck.pl> <20231006140511.3840643-2-enki@fsck.pl> Message-ID: <9525ca43-ac12-46bb-b2da-9e1e1d8d6e02@benettiengineering.com> Hi Maciej, On 06/10/23 16:05, Maciej Grela wrote: > iniparser is a required dependency of dns320l-daemon This is a package itself and also a required dependency of dns320l-daemon, but you shouldn't specify it here. Here you have to describe what is iniparser package, for example as written in project github: " Iniparser is a modules that offers parsing of .ini files from C. " > Signed-off-by: Maciej Grela > --- > package/Config.in | 1 + > package/iniparser/Config.in | 6 ++++ > package/iniparser/iniparser.hash | 2 ++ > package/iniparser/iniparser.mk | 56 ++++++++++++++++++++++++++++++++ > 4 files changed, 65 insertions(+) > create mode 100644 package/iniparser/Config.in > create mode 100644 package/iniparser/iniparser.hash > create mode 100644 package/iniparser/iniparser.mk > > diff --git a/package/Config.in b/package/Config.in > index 009f7ba186..228e9eb1e3 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2085,6 +2085,7 @@ menu "Other" > source "package/gtest/Config.in" > source "package/gumbo-parser/Config.in" > source "package/highway/Config.in" > + source "package/iniparser/Config.in" > source "package/jemalloc/Config.in" > source "package/lapack/Config.in" > source "package/libabseil-cpp/Config.in" > diff --git a/package/iniparser/Config.in b/package/iniparser/Config.in > new file mode 100644 > index 0000000000..4932869943 > --- /dev/null > +++ b/package/iniparser/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_INIPARSER > + bool "iniparser" > + help > + ini file parser Here ^^^ you can repeat more or less what I've suggested for commit log > + > + https://github.com/ndevilla/iniparser > diff --git a/package/iniparser/iniparser.hash b/package/iniparser/iniparser.hash > new file mode 100644 > index 0000000000..a745062fcd > --- /dev/null > +++ b/package/iniparser/iniparser.hash > @@ -0,0 +1,2 @@ > +# From https://github.com/ndevilla/iniparser/releases > +sha256 960daa800dd31d70ba1bacf3ea2d22e8ddfc2906534bf328319495966443f3ae iniparser-4.1.tar.gz > diff --git a/package/iniparser/iniparser.mk b/package/iniparser/iniparser.mk > new file mode 100644 > index 0000000000..f3f74601f3 > --- /dev/null > +++ b/package/iniparser/iniparser.mk > @@ -0,0 +1,56 @@ > +################################################################################ > +# > +# iniparser > +# > +################################################################################ > + > +INIPARSER_VERSION = 4.1 > +INIPARSER_SITE = $(call github,ndevilla,iniparser,v$(INIPARSER_VERSION)) > +INIPARSER_INSTALL_STAGING = YES > +INIPARSER_LICENSE = MIT > +INIPARSER_LICENSE_FILES = LICENSE > +INIPARSER_SO_TARGET = libiniparser.so.1 > +INIPARSER_A_TARGET = libiniparser.a > +INIPARSER_BUILD_TARGETS = > +INIPARSER_STAGING_INSTALL_TGTS = > +INIPARSER_TARGET_INSTALL_TGTS = > + > +INIPARSER_CONFIGURE_OPTS = $(TARGET_CONFIGURE_OPTS) > + > +ifeq ($(BR2_STATIC_LIBS),y) > +INIPARSER_BUILD_TARGETS = $(INIPARSER_A_TARGET) > +INIPARSER_STAGING_INSTALL_TGTS = $(INIPARSER_A_TARGET) > +INIPARSER_TARGET_INSTALL_TGTS = $(INIPARSER_A_TARGET) > +else ifeq ($(BR2_SHARED_LIBS),y) > +INIPARSER_LINK_SO = y > + > +INIPARSER_BUILD_TARGETS = $(INIPARSER_SO_TARGET) > +INIPARSER_STAGING_INSTALL_TGTS = $(INIPARSER_SO_TARGET) > + > +INIPARSER_TARGET_INSTALL_TGTS = $(INIPARSER_SO_TARGET) > +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +INIPARSER_LINK_SO = y > + > +INIPARSER_BUILD_TARGETS = $(INIPARSER_A_TARGET) $(INIPARSER_SO_TARGET) > +INIPARSER_STAGING_INSTALL_TGTS = $(INIPARSER_A_TARGET) $(INIPARSER_SO_TARGET) > + > +# Don't install static libs on target > +INIPARSER_TARGET_INSTALL_TGTS = $(INIPARSER_SO_TARGET) > +endif > + > +define INIPARSER_BUILD_CMDS > + $(INIPARSER_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(INIPARSER_BUILD_TARGETS) > +endef > + > +define INIPARSER_INSTALL_STAGING_CMDS > + $(INSTALL) -D -m 0644 $(@D)/src/iniparser.h $(@D)/src/dictionary.h $(STAGING_DIR)/usr/include/ > + $(foreach target,$(INIPARSER_STAGING_INSTALL_TGTS),$(INSTALL) -D -m 0755 $(@D)/$(target) $(STAGING_DIR)/usr/lib/) > + $(if $(INIPARSER_LINK_SO),ln -s -r $(STAGING_DIR)/usr/lib/$(INIPARSER_SO_TARGET) $(STAGING_DIR)/usr/lib/libiniparser.so) > +endef > + > +define INIPARSER_INSTALL_TARGET_CMDS > + $(foreach target,$(INIPARSER_TARGET_INSTALL_TGTS),$(INSTALL) -D -m 0755 $(@D)/$(target) $(TARGET_DIR)/usr/lib/) > + $(if $(INIPARSER_LINK_SO),ln -s -r $(TARGET_DIR)/usr/lib/$(INIPARSER_SO_TARGET) $(TARGET_DIR)/usr/lib/libiniparser.so) > +endef > + > +$(eval $(generic-package)) -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Feb 5 11:44:00 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 12:44:00 +0100 Subject: [Buildroot] [PATCH v3 3/3] board/d-link/dns320l: new board In-Reply-To: <4551a4fa-db14-41dd-8bc0-c384d552e3c5@benettiengineering.com> References: <20231004131256.2113233-2-enki@fsck.pl> <20231006140511.3840643-4-enki@fsck.pl> <4551a4fa-db14-41dd-8bc0-c384d552e3c5@benettiengineering.com> Message-ID: Hi Maciej, On 05/02/24 11:33, Giulio Benetti wrote: > Hi Maciej, > > sorry for the late reply, > > On 06/10/23 16:05, Maciej Grela wrote: >> Add support for the D-Link DNS-320L using: >> >> - U-Boot 1.1.4 (in device flash) >> - Linux kernel 6.5.5 >> >> This is a 2-Bay 3.5'' SATA NAS with the following specs: >> >> - Marvell 88F6702 (1 GHz) CPU >> - 256 MiB DDR2 RAM >> - 128 MiB NAND Flash >> - 2 x SATA >> - 1 x 1000 Mbit/s Ethernet port >> - 1 x USB 2.0 >> >> The builtin bootloader banner is: >> U-Boot 1.1.4 (Aug 22 2012 - 17:06:54) Marvell version: 3.6.0.DNS-320L.01 >> >> Manufacturer product page: http://sharecenter.dlink.com/products/DNS-320 >> Device wiki: https://wikidevi.wi-cat.ru/D-Link_DNS-320L_rev_A1 >> >> Signed-off-by: Maciej Grela >> --- >> ? DEVELOPERS??????????????????????????????????? |?? 6 + >> ? board/d-link/dns320l/dts/kirkwood-dns320l.dts | 218 ++++++++++++++++++ >> ? configs/dns320l_defconfig???????????????????? |? 16 ++ >> ? 3 files changed, 240 insertions(+) >> ? create mode 100644 board/d-link/dns320l/dts/kirkwood-dns320l.dts >> ? create mode 100644 configs/dns320l_defconfig >> >> diff --git a/DEVELOPERS b/DEVELOPERS >> index c45e7315da..76e8644073 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -1950,6 +1950,12 @@ N:??? Ludwig Kormann >> ? F:??? board/in-circuit/ >> ? F:??? configs/icnova* >> +N:??? Maciej Grela >> +F:??? board/d-link/dns320l/ >> +F:??? configs/dns320l_defconfig >> +F:??? package/dns320l-daemon >> +F:??? package/iniparser > > The 2 lines above should be part of the respective patches and not of > this one, > >> + >> ? N:??? Maeva Manuel >> ? F:??? board/freescale/imx8qmmek/ >> ? F:??? configs/freescale_imx8qmmek_defconfig >> diff --git a/board/d-link/dns320l/dts/kirkwood-dns320l.dts >> b/board/d-link/dns320l/dts/kirkwood-dns320l.dts >> new file mode 100644 >> index 0000000000..660508a51a >> --- /dev/null >> +++ b/board/d-link/dns320l/dts/kirkwood-dns320l.dts >> @@ -0,0 +1,218 @@ >> +/dts-v1/; >> + >> +/* >> + * Device Tree file for DLINK DNS-320L >> + * >> + * Copyright (C) 2015, Sunke Schl?ters >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU General Public License >> + * as published by the Free Software Foundation; either version >> + * 2 of the License, or (at your option) any later version. >> + * >> + * >> + * This file is based on the work of Andreas B?hler : >> + *?? - http://www.aboehler.at/doku/doku.php/projects:dns320l >> + *?? - >> http://www.aboehler.at/hg/linux-dns320l/file/ba7a60ad7687/linux-3.12/kirkwood-dns320l.dts >> + */ >> + >> +#include "marvell/kirkwood.dtsi" >> +#include "marvell/kirkwood-6281.dtsi" >> + >> +/ { >> +??? model = "D-Link DNS-320L"; >> +??? compatible = "dlink,dns-320l", "marvell,kirkwood-88f6702", >> "marvell,kirkwood"; >> + >> +??? memory { >> +??????? device_type = "memory"; >> +??????? reg = <0x00000000 0x10000000>; >> +??? }; >> + >> +??? chosen { >> +??????? bootargs = "console=ttyS0,115200n8 earlyprintk"; >> +??????? stdout-path = &uart0; >> +??? }; >> + >> +??? gpio-keys { >> +??????? compatible = "gpio-keys"; >> +??????? #address-cells = <1>; >> +??????? #size-cells = <0>; >> +??????? pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>; >> +??????? pinctrl-names = "default"; >> + >> +??????? button at 1 { >> +??????????? label = "Reset push button"; >> +??????????? linux,code = ; >> +??????????? gpios = <&gpio0 28 1>; >> +??????? }; >> +??????? button at 2 { >> +??????????? label = "USB unmount button"; >> +??????????? linux,code = ; >> +??????????? gpios = <&gpio0 27 1>; >> +??????? }; >> +??? }; >> + >> +??? gpio-leds { >> +??????? compatible = "gpio-leds"; >> +??????? pinctrl-0 = <&pmx_led_usb_blue &pmx_led_red_right_hdd >> +???????????????? &pmx_led_red_left_hdd? &pmx_led_usb_orange>; >> +??????? pinctrl-names = "default"; >> + >> +??????? blue-usb { >> +??????????? label = "usb_blue"; >> +??????????? gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; >> +??????? }; >> +??????? orange-usb { >> +??????????? label = "usb_orange"; >> +??????????? gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; >> +??????? }; >> +??????? orange-l_hdd { >> +??????????? label = "hdd1_orange"; >> +??????????? gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; >> +??????? }; >> +??????? orange-r_hdd { >> +??????????? label = "hdd2_orange"; >> +??????????? gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; >> +??????? }; >> +??? }; >> + >> +???? ocp at f1000000 { >> +??????? pinctrl: pin-controller at 10000 { >> + >> +??????????? pinctrl-0 = <&pmx_button_power>; >> +??????????? pinctrl-names = "default"; >> + >> +??????????? pmx_sata0: pmx-sata0 { >> +??????????????? marvell,pins = "mpp20"; >> +??????????????? marvell,function = "sata0"; >> +??????????? }; >> +??????????? pmx_sata1: pmx-sata1 { >> +??????????????? marvell,pins = "mpp21"; >> +??????????????? marvell,function = "sata1"; >> +??????????? }; >> +??????????? pmx_led_red_right_hdd: pmx-led-red-right-hdd { >> +??????????????? marvell,pins = "mpp22"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_led_red_left_hdd: pmx-led-red-left-hdd { >> +??????????????? marvell,pins = "mpp23"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_power_sata: pmx-power-sata { >> +??????????????? marvell,pins = "mpp24"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_led_usb_blue: pmx-led-usb-blue { >> +??????????????? marvell,pins = "mpp25"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_led_usb_orange: pmx-led-usb-orange { >> +??????????????? marvell,pins = "mpp26"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_button_usb_copy: pmx-button-usb-copy { >> +??????????????? marvell,pins = "mpp27"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_button_reset: pmx-button-reset { >> +??????????????? marvell,pins = "mpp28"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_button_power: pmx-button-power { // I can't get this >> one to trigger a button press... >> +??????????????? marvell,pins = "mpp29"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????? }; >> +??????? sata at 80000 { >> +??????????? status = "okay"; >> +??????????? nr-ports = <2>; >> +??????? }; >> +??????? serial at 12000 { >> +??????????? status = "okay"; >> +??????? }; >> + >> +??????? serial at 12100 { >> +??????????? pinctrl-0 = <&pmx_uart1>; >> +??????????? pinctrl-names = "default"; >> +??????????? status = "okay"; >> +??????? }; >> +??? }; >> + >> +??? regulators { >> +??????? compatible = "simple-bus"; >> +??????? #address-cells = <1>; >> +??????? #size-cells = <0>; >> +??????? pinctrl-0 = <&pmx_power_sata>; >> +??????? pinctrl-names = "default"; >> + >> +??????? sata_power: regulator at 1 { >> +??????????? compatible = "regulator-fixed"; >> +??????????? reg = <1>; >> +??????????? regulator-name = "SATA Power"; >> +??????????? regulator-min-microvolt = <5000000>; >> +??????????? regulator-max-microvolt = <5000000>; >> +??????????? enable-active-high; >> +??????????? regulator-always-on; >> +??????????? regulator-boot-on; >> +??????????? gpio = <&gpio1 24 0>; >> +??????? }; >> +??? }; >> +}; >> + >> +&nand { >> +??? pinctrl-0 = <&pmx_nand>; >> +??? pinctrl-names = "default"; >> +??? status = "okay"; >> +??? chip-delay = <35>; >> + >> +??? partition at 0 { >> +??????? label = "u-boot"; >> +??????? reg = <0x0000000 0x100000>; >> +??????? read-only; >> +??? }; >> + >> +??? partition at 100000 { >> +??????? label = "uImage"; >> +??????? reg = <0x0100000 0x500000>; >> +??? }; >> + >> +??? partition at 600000 { >> +??????? label = "ramdisk"; >> +??????? reg = <0x0600000 0x500000>; >> +??? }; >> + >> +??? partition at b00000 { >> +??????? label = "image"; >> +??????? reg = <0x0b00000 0x6400000>; >> +??? }; >> + >> +??? partition at 6f00000 { >> +??????? label = "mini firmware"; >> +??????? reg = <0x6f00000 0xa00000>; >> +??? }; >> + >> +??? partition at 7900000 { >> +??????? label = "config"; >> +??????? reg = <0x7900000 0x500000>; >> +??? }; >> + >> +??? partition at 7e00000 { >> +??????? label = "my-dlink"; >> +??????? reg = <0x7e00000 0x200000>; >> +??? }; >> +}; >> + >> +&mdio { >> +??? status = "okay"; >> + >> +??? ethphy0: ethernet-phy at 0 { >> +??????? reg = <0>; >> +??? }; >> +}; >> + >> +ð0 { >> +??? status = "okay"; >> +??? ethernet0-port at 0 { >> +??????? phy-handle = <ðphy0>; >> +??? }; >> +}; > > Is this ^^^ dts pending upstream? > >> diff --git a/configs/dns320l_defconfig b/configs/dns320l_defconfig >> new file mode 100644 >> index 0000000000..f281984267 >> --- /dev/null >> +++ b/configs/dns320l_defconfig >> @@ -0,0 +1,16 @@ >> +BR2_arm=y > > Here you haven't specified any particular Arm architecture but MV78260 > is specified as a: > " > ARMv7-compliant CPU cores with the latest Marvell > micro-architecture enhancements, with a double > precision IEEE-compliant Floating Point Unit (FPU) > per core > " > > Maybe you could give a try to enable VFP3-16 since the SoC supports it: > https://datasheet.datasheetarchive.com/originals/crawler/marvell.com/1657ba38481c63b54928f3c1d60858fd.pdf > > Here instead you need: > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y > because if not set if changes while Buildroot increase Latest Linux > Version resulting in build failure: > " > Incorrect selection of kernel headers: expected 6.6.x, got 6.5.x > " > >> +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" >> +BR2_SYSTEM_DHCP="eth0" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.5" >> +BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" >> +BR2_LINUX_KERNEL_APPENDED_UIMAGE=y >> +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" >> +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/d-link/dns320l/dts/kirkwood-dns320l.dts" forgotten to mention you also need: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> +BR2_TARGET_ROOTFS_CPIO=y >> +BR2_TARGET_ROOTFS_CPIO_GZIP=y >> +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y >> + >> +# The package is required for proper power management >> +BR2_PACKAGE_DNS320L_DAEMON=y > > I've built tested successfully with utils/docker-run so with the changes > above: > Reviewed-by: Giulio Benetti > > Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Mon Feb 5 11:46:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:46:02 +0100 Subject: [Buildroot] [PATCH] package/sysstat: do not autodetect sa_lib_dir In-Reply-To: <78273b30-5659-4cc0-91f8-23a8775fedf2@sord.co.jp> (Atsushi Nemoto's message of "Thu, 11 Jan 2024 14:47:48 +0900") References: <78273b30-5659-4cc0-91f8-23a8775fedf2@sord.co.jp> Message-ID: <87le7zt9qd.fsf@48ers.dk> >>>>> "Atsushi" == Atsushi Nemoto writes: > The configure script of sysstat package checks host's /usr/lib64 > directory for default sa_lib_dir. > Specify sa_lib_dir exclicitly to avoid host dependency. > Signed-off-by: Atsushi Nemoto Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:45:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:45:09 +0100 Subject: [Buildroot] [git commit] package/sysstat: do not autodetect sa_lib_dir Message-ID: <20240205114617.A334E86C09@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eef5c297e765bb1414d6d6c629ce8e690c6370d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The configure script of sysstat package checks host's /usr/lib64 directory for default sa_lib_dir. Specify sa_lib_dir exclicitly to avoid host dependency. Signed-off-by: Atsushi Nemoto Signed-off-by: Peter Korsgaard --- package/sysstat/sysstat.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 377396d986..ca05ec50d8 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -20,5 +20,7 @@ SYSSTAT_CONF_OPTS += --enable-sensors else SYSSTAT_CONF_OPTS += --disable-sensors endif +# do not look at host's /usr/lib64 +SYSSTAT_CONF_OPTS += sa_lib_dir=/usr/lib/sa $(eval $(autotools-package)) From giulio.benetti at benettiengineering.com Mon Feb 5 11:47:20 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 12:47:20 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/dns320l-daemon: new package In-Reply-To: <20231006140511.3840643-3-enki@fsck.pl> References: <20231004131256.2113233-2-enki@fsck.pl> <20231006140511.3840643-3-enki@fsck.pl> Message-ID: <8d3fbd57-3100-46f5-8740-0998ead5b029@benettiengineering.com> Hi Maciej, On 06/10/23 16:05, Maciej Grela wrote: > dns320l-daemon is a simple system management daemon for the D-Link DNS-320L > NAS. It handles power, Wake-on-LAN, temperature, fan speed and some LEDs. > > Signed-off-by: Maciej Grela > --- > package/Config.in | 1 + > .../0001-listen-on-localhost.patch | 21 ++++++++++ > package/dns320l-daemon/Config.in | 8 ++++ > package/dns320l-daemon/S50dns320l-daemon | 42 +++++++++++++++++++ > package/dns320l-daemon/dns320l-daemon.hash | 1 + > package/dns320l-daemon/dns320l-daemon.mk | 32 ++++++++++++++ > 6 files changed, 105 insertions(+) > create mode 100644 package/dns320l-daemon/0001-listen-on-localhost.patch > create mode 100644 package/dns320l-daemon/Config.in > create mode 100644 package/dns320l-daemon/S50dns320l-daemon > create mode 100644 package/dns320l-daemon/dns320l-daemon.hash > create mode 100644 package/dns320l-daemon/dns320l-daemon.mk > > diff --git a/package/Config.in b/package/Config.in > index 228e9eb1e3..f1c451890f 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2684,6 +2684,7 @@ menu "System tools" > source "package/dcron/Config.in" > source "package/ddrescue/Config.in" > source "package/debianutils/Config.in" > + source "package/dns320l-daemon/Config.in" > source "package/docker-cli/Config.in" > source "package/docker-compose/Config.in" > source "package/docker-engine/Config.in" > diff --git a/package/dns320l-daemon/0001-listen-on-localhost.patch b/package/dns320l-daemon/0001-listen-on-localhost.patch > new file mode 100644 > index 0000000000..50da024024 > --- /dev/null > +++ b/package/dns320l-daemon/0001-listen-on-localhost.patch > @@ -0,0 +1,21 @@ > +# HG changeset patch > +# User Maciej Grela > +# Date 1696540279 -7200 > +# Thu Oct 05 23:11:19 2023 +0200 > +# Node ID eca5ed65582402e64c36145290c214aee84b012b > +# Parent 1f945ce22321a876143b38aaf5610c8915172b90 > +Subject: [PATCH] Listen on localhost by default > +Signed-off-by: Maciej Grela > + > +diff -r 1f945ce22321 -r eca5ed655824 dns320l-daemon.ini > +--- a/dns320l-daemon.ini Tue Dec 09 12:24:29 2014 +0100 > ++++ b/dns320l-daemon.ini Thu Oct 05 23:11:19 2023 +0200 > +@@ -4,7 +4,7 @@ > + > + [Daemon] > + ServerPort = 57367 > +-ServerAddr = 0.0.0.0 > ++ServerAddr = 127.0.0.1 > + SyncTimeOnStartup = 0 > + SyncTimeOnShutdown = 0 > + DeviceShutdownDelay = 30 > diff --git a/package/dns320l-daemon/Config.in b/package/dns320l-daemon/Config.in > new file mode 100644 > index 0000000000..35bd30a9e5 > --- /dev/null > +++ b/package/dns320l-daemon/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_DNS320L_DAEMON > + bool "dns320l-daemon" > + depends on BR2_USE_MMU # fork() > + select BR2_PACKAGE_INIPARSER > + help > + MCU Daemon for the D-Link DNS-320L > + > + https://www.aboehler.at/hg/dns320l-daemon > diff --git a/package/dns320l-daemon/S50dns320l-daemon b/package/dns320l-daemon/S50dns320l-daemon > new file mode 100644 > index 0000000000..3bc2a60d0b > --- /dev/null > +++ b/package/dns320l-daemon/S50dns320l-daemon > @@ -0,0 +1,42 @@ > +#!/bin/sh > + > +DAEMON="dns320l-daemon" > + > +start() { > + printf 'Starting %s: ' "$DAEMON" > + start-stop-daemon -S -x "/usr/bin/$DAEMON" > + status="$?" > + if [ "$status" -eq 0 ]; then > + echo "OK" > + else > + echo "FAIL" > + fi > + return "$status" > +} > + > +stop() { > + printf 'Stopping %s: ' "$DAEMON" > + start-stop-daemon -s INT -K -x "/usr/bin/$DAEMON" > +} > + > +poweroff() { > + printf 'Stopping %s: ' "$DAEMON" > + start-stop-daemon -s TERM -K -x "/usr/bin/$DAEMON" > +} > + > +restart() { > + stop > + sleep 1 > + start > +} > + > +case "$1" in > + start|stop|restart) > + "$1";; > + reload) > + restart;; > + *) > + echo "Usage: $0 {start|stop|restart|poweroff}" > + exit 1 > + ;; > +esac > diff --git a/package/dns320l-daemon/dns320l-daemon.hash b/package/dns320l-daemon/dns320l-daemon.hash > new file mode 100644 > index 0000000000..4396eb8f5d > --- /dev/null > +++ b/package/dns320l-daemon/dns320l-daemon.hash > @@ -0,0 +1 @@ > +sha256 eac74a64f0d4127748e629b8a5f723eab58ac83064a3f249f97b85bcd7faf061 tip.tar.bz2 > diff --git a/package/dns320l-daemon/dns320l-daemon.mk b/package/dns320l-daemon/dns320l-daemon.mk > new file mode 100644 > index 0000000000..bc24a553c2 > --- /dev/null > +++ b/package/dns320l-daemon/dns320l-daemon.mk > @@ -0,0 +1,32 @@ > +################################################################################ > +# > +# dns320l-daemon > +# > +################################################################################ > + > +DNS320L_DAEMON_VERSION = 1.0 > +DNS320L_DAEMON_SOURCE = tip.tar.bz2 > +DNS320L_DAEMON_SITE = https://www.aboehler.at/hg/dns320l-daemon/archive URL has moved to: https://gitlab.aboehler.at/andreas/dns320l-daemon and there are no Releases or git tags, so can you use as VERSION the latest git SHA1? Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > +DNS320L_DAEMON_LICENSE = GPL-3 > +DNS320L_DAEMON_DEPENDENCIES = iniparser > +DNS320l_DAEMON_PATCH = 0001-listen-on-localhost.patch > + > +define DNS320L_DAEMON_BUILD_CMDS > + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ > + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" > +endef > + > +define DNS320L_DAEMON_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/dns320l-daemon $(TARGET_DIR)/usr/bin/ > + $(INSTALL) -D -m 0600 $(@D)/dns320l-daemon.ini $(TARGET_DIR)/etc/ > +endef > + > +define DNS320L_DAEMON_INSTALL_INIT_SYSTEMD > + $(INSTALL) -D -m 0644 $(@D)/dns320l-daemon.service $(TARGET_DIR)/lib/systemd/system/ > +endef > + > +define DNS320L_DAEMON_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 0755 package/dns320l-daemon/S50dns320l-daemon $(TARGET_DIR)/etc/init.d/S50dns320l-daemon > +endef > + > +$(eval $(generic-package)) From giulio.benetti at benettiengineering.com Mon Feb 5 12:03:08 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 13:03:08 +0100 Subject: [Buildroot] [v1 3/4] configs/raspberrypi*: bump kernel version to feb4ea5 (6.1.55) In-Reply-To: <20231121193448.1151936-4-gael.portay@rtone.fr> References: <20231121193448.1151936-1-gael.portay@rtone.fr> <20231121193448.1151936-4-gael.portay@rtone.fr> Message-ID: Hi Ga?l, unfortunately this patch has been superseded by the following one that's been committed: https://gitlab.com/buildroot.org/buildroot/-/commit/13ba668a2da3a0dcb386578ce15b00a444101dbe So it can be dropped from Patchwork. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas On 21/11/23 20:34, Ga?l PORTAY wrote: > Now based on 6.1.55 (from 5.10.92). > > Signed-off-by: Ga?l PORTAY > --- > configs/raspberrypi0_defconfig | 2 +- > configs/raspberrypi0w_defconfig | 2 +- > configs/raspberrypi2_defconfig | 2 +- > configs/raspberrypi3_64_defconfig | 2 +- > configs/raspberrypi3_defconfig | 2 +- > configs/raspberrypi3_qt5we_defconfig | 2 +- > configs/raspberrypi4_64_defconfig | 2 +- > configs/raspberrypi4_defconfig | 2 +- > configs/raspberrypi_defconfig | 2 +- > configs/raspberrypicm4io_64_defconfig | 2 +- > configs/raspberrypicm4io_defconfig | 2 +- > configs/raspberrypizero2w_defconfig | 2 +- > 12 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig > index 4506e94bce..6beb69d3c3 100644 > --- a/configs/raspberrypi0_defconfig > +++ b/configs/raspberrypi0_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > > # Build the DTBs for A/B from the kernel sources: the zero is the same > diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig > index 7a35794c2d..4db244e719 100644 > --- a/configs/raspberrypi0w_defconfig > +++ b/configs/raspberrypi0w_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" > diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig > index 9b484c5588..8f2ed3a21f 100644 > --- a/configs/raspberrypi2_defconfig > +++ b/configs/raspberrypi2_defconfig > @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig > index 4d838ae0e8..0946bb9f9a 100644 > --- a/configs/raspberrypi3_64_defconfig > +++ b/configs/raspberrypi3_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig > index 0a59ab42a9..26a118f2f1 100644 > --- a/configs/raspberrypi3_defconfig > +++ b/configs/raspberrypi3_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig > index 40d0c0f888..501f12435f 100644 > --- a/configs/raspberrypi3_qt5we_defconfig > +++ b/configs/raspberrypi3_qt5we_defconfig > @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > index 5942f7c4e1..17a2f8cbb2 100644 > --- a/configs/raspberrypi4_64_defconfig > +++ b/configs/raspberrypi4_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > index 4e5580c140..194af0a1b8 100644 > --- a/configs/raspberrypi4_defconfig > +++ b/configs/raspberrypi4_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig > index cca53f9b37..3d50f81278 100644 > --- a/configs/raspberrypi_defconfig > +++ b/configs/raspberrypi_defconfig > @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > > # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources > diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig > index 29cb0472d7..f8f0d6c23a 100644 > --- a/configs/raspberrypicm4io_64_defconfig > +++ b/configs/raspberrypicm4io_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig > index 017aecc0dd..1f0703493b 100644 > --- a/configs/raspberrypicm4io_defconfig > +++ b/configs/raspberrypicm4io_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig > index 2ea503ca24..09082dbc4d 100644 > --- a/configs/raspberrypizero2w_defconfig > +++ b/configs/raspberrypizero2w_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources From antoine.coutant at smile.fr Mon Feb 5 12:47:26 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 5 Feb 2024 13:47:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libheif: add jpeg-turbo support In-Reply-To: <20240131200754.1784621-1-fontaine.fabrice@gmail.com> References: <20240131200754.1784621-1-fontaine.fabrice@gmail.com> Message-ID: On 31/01/2024 21:07, Fabrice Fontaine wrote: > jpeg support is not limited to libjpeg > > Signed-off-by: Fabrice Fontaine > --- > package/libheif/libheif.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk > index bd307deb7b..908e2ce068 100644 > --- a/package/libheif/libheif.mk > +++ b/package/libheif/libheif.mk > @@ -51,9 +51,9 @@ else > LIBHEIF_CONF_OPTS += -DWITH_LIBDE265=OFF > endif > > -ifeq ($(BR2_PACKAGE_LIBJPEG),y) > +ifeq ($(BR2_PACKAGE_JPEG),y) > LIBHEIF_CONF_OPTS += -DWITH_JPEG_DECODER=ON -DWITH_JPEG_ENCODER=ON > -LIBHEIF_DEPENDENCIES += libjpeg > +LIBHEIF_DEPENDENCIES += jpeg > else > LIBHEIF_CONF_OPTS += -DWITH_JPEG_DECODER=OFF -DWITH_JPEG_ENCODER=OFF > endif Looks good to me. Reviewed-by: Antoine Coutant Regards, Antoine Coutant. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Mon Feb 5 13:09:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 14:09:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-termcolor: bump to version 2.4.0 In-Reply-To: <20240111074057.3089507-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:40:57 -0700") References: <20240111074057.3089507-1-james.hilliard1@gmail.com> Message-ID: <87h6int5ui.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 13:10:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 14:10:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-tempora: bump to version 5.5.0 In-Reply-To: <20240111073724.3087490-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:37:24 -0700") References: <20240111073724.3087490-1-james.hilliard1@gmail.com> Message-ID: <87cytbt5ta.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > License hash changed due to copyright notice removal: > https://github.com/jaraco/tempora/commit/5957d58266e479f124b31f30e4322e798fdf386b > Drop no longer required python-six runtime dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 5 13:14:10 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:14:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: bump to version v0.3.26 In-Reply-To: <20240108205150.783168-1-ju.o@free.fr> References: <20240108205150.783168-1-ju.o@free.fr> Message-ID: On 08/01/2024 21:51, Julien Olivain wrote: > For change log since v0.3.25, see: > https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.26 > > This commit also update _SITE url to follow download url published on > the homepage https://www.openblas.net/ > > Also https://github.com/xianyi/OpenBLAS is now redirecting to > https://github.com/OpenMathLib/OpenBLAS > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Arnout > --- > Patch tested on branch master at commit 1d97f8c with commands: > > make check-package > ... > 0 warnings generated > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_openblas > ... > OK > > utils/test-pkg -a -p openblas > ... > 45 builds, 23 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > --- > package/openblas/openblas.hash | 6 +++--- > package/openblas/openblas.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash > index d946ae7296..a0f054dab7 100644 > --- a/package/openblas/openblas.hash > +++ b/package/openblas/openblas.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.25 > -md5 48384e324cd1cdcfbdb0d2e16ca55327 openblas-0.3.25.tar.gz > +# From https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.26 > +md5 bd496a1c81769ed19a161c1f8f904ccd openblas-0.3.26.tar.gz > # Locally calculated > -sha256 4c25cb30c4bb23eddca05d7d0a85997b8db6144f5464ba7f8c09ce91e2f35543 openblas-0.3.25.tar.gz > +sha256 4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68 openblas-0.3.26.tar.gz > sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE > diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk > index 76833121a9..2d6cdaa7bb 100644 > --- a/package/openblas/openblas.mk > +++ b/package/openblas/openblas.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -OPENBLAS_VERSION = 0.3.25 > -OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) > +OPENBLAS_VERSION = 0.3.26 > +OPENBLAS_SITE = https://github.com/OpenMathLib/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) > OPENBLAS_LICENSE = BSD-3-Clause > OPENBLAS_LICENSE_FILES = LICENSE > OPENBLAS_INSTALL_STAGING = YES From buildroot at bubu1.eu Mon Feb 5 13:18:38 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 14:18:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <87plxbta1d.fsf@48ers.dk> References: <20240111053157.2928259-1-james.hilliard1@gmail.com> <87plxbta1d.fsf@48ers.dk> Message-ID: <32c71490-c8f7-43e5-b7c8-091935636340@bubu1.eu> Hi Peter, James On 05.02.24 12:39, Peter Korsgaard wrote: >>>>>> "James" == James Hilliard writes: > > > License hash changed due to year update: > > https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ > > > Signed-off-by: James Hilliard > > --- > > package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- > > package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- > > 2 files changed, 5 insertions(+), 5 deletions(-) > > > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash > > index 29852a51ed..7b5dc1e29a 100644 > > --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash > > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash > > @@ -1,5 +1,5 @@ > > # md5, sha256 from https://pypi.org/pypi/rfc3987/json I think this comment is pointing to the wrong package, maybe some automation went wrong because of that? > > -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz > > -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz > > +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz > > +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 ruamel.yaml-0.18.5.tar.gz > > > Hmm, I get a different hash: > > ruamel.yaml-0.18.5.tar.gz: OK (md5: 24fac3544a3c7bd7eeaf6e4f704a056e) > ERROR: while checking hashes from package/python-ruamel-yaml//python-ruamel-yaml.hash > ERROR: ruamel.yaml-0.18.5.tar.gz has wrong sha256 hash: > ERROR: expected: ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 > ERROR: got : 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e This is the correct one according to https://pypi.org/project/ruamel.yaml/ > ERROR: Incomplete download, or man-in-the-middle (MITM) attack > > Any ideas? > Marcus From arnout at mind.be Mon Feb 5 13:18:57 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:18:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-alembic: bump to version 1.13.1 In-Reply-To: <20240108063845.3446790-1-james.hilliard1@gmail.com> References: <20240108063845.3446790-1-james.hilliard1@gmail.com> Message-ID: <9e5137b9-b1e8-41d9-a8f2-6d1f3a5c3ece@mind.be> On 08/01/2024 07:38, James Hilliard wrote: > Add new runtime dependencies: > - python-sqlalchemy > - python-mako > - python-typing-extensions > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-alembic/Config.in | 3 +++ > package/python-alembic/python-alembic.hash | 4 ++-- > package/python-alembic/python-alembic.mk | 4 ++-- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/package/python-alembic/Config.in b/package/python-alembic/Config.in > index a53dde7f7f..33fe3c3682 100644 > --- a/package/python-alembic/Config.in > +++ b/package/python-alembic/Config.in > @@ -1,5 +1,8 @@ > config BR2_PACKAGE_PYTHON_ALEMBIC > bool "python-alembic" > + select BR2_PACKAGE_PYTHON_MAKO # runtime > + select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime > + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > help > Alembic is a database migrations tool written by the author > of SQLAlchemy. > diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash > index df1f4fba02..1f752ebc7e 100644 > --- a/package/python-alembic/python-alembic.hash > +++ b/package/python-alembic/python-alembic.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/alembic/json > -md5 642d563af853b317f018026f3edd5dba alembic-1.12.1.tar.gz > -sha256 bca5877e9678b454706347bc10b97cb7d67f300320fa5c3a94423e8266e2823f alembic-1.12.1.tar.gz > +md5 29579d34ea694627280b52a3d3116664 alembic-1.13.1.tar.gz > +sha256 4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595 alembic-1.13.1.tar.gz > # Locally computed sha256 checksums > sha256 b285268a86f4416eaf4d05b2ae3880c156f7c59a8f935a402bc056eafb33af08 LICENSE > diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk > index fd41e0df66..52e30e39ba 100644 > --- a/package/python-alembic/python-alembic.mk > +++ b/package/python-alembic/python-alembic.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_ALEMBIC_VERSION = 1.12.1 > +PYTHON_ALEMBIC_VERSION = 1.13.1 > PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz > -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/44/b4/253fe31261d9f5d603d89bd9e6fba1625494a6d761d319902dfe4db59016 > +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/7b/24/ddce068e2ac9b5581bd58602edb2a1be1b0752e1ff2963c696ecdbe0470d > PYTHON_ALEMBIC_SETUP_TYPE = setuptools > PYTHON_ALEMBIC_LICENSE = MIT > PYTHON_ALEMBIC_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:20:32 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:20:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-argh: bump to version 0.31.0 In-Reply-To: <20240108065521.3455564-1-james.hilliard1@gmail.com> References: <20240108065521.3455564-1-james.hilliard1@gmail.com> Message-ID: <240867fc-32ff-45ca-b975-3543ad1946d2@mind.be> On 08/01/2024 07:55, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-argh/python-argh.hash | 8 ++++---- > package/python-argh/python-argh.mk | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-argh/python-argh.hash b/package/python-argh/python-argh.hash > index 8bfb45d1c3..bac9df42d6 100644 > --- a/package/python-argh/python-argh.hash > +++ b/package/python-argh/python-argh.hash > @@ -1,6 +1,6 @@ > -# md5 from https://pypi.python.org/pypi/argh/json > -md5 7001dd9ff619cf1422ddf8bf813bd08a argh-0.30.4.tar.gz > -sha256 9fca8e69c4dad4f8d2a7bdfbdd80b0754462b53510a03e1b5cf2b43a87e6e960 argh-0.30.4.tar.gz > -# Locally computed > +# md5, sha256 from https://pypi.org/pypi/argh/json > +md5 2659a6353589156e6aa65a99797f8913 argh-0.31.0.tar.gz > +sha256 b93093544309ddbfe6c73dc9bfd60dbc4acecef39f3f464774b3084a1ec5d7b0 argh-0.31.0.tar.gz > +# Locally computed sha256 checksums > sha256 2594f46b9b23a5fddeca090faeb270c7ceee8116675fe35082be859aa7466e89 COPYING > sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER > diff --git a/package/python-argh/python-argh.mk b/package/python-argh/python-argh.mk > index ccb9f61d48..0da3281d49 100644 > --- a/package/python-argh/python-argh.mk > +++ b/package/python-argh/python-argh.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_ARGH_VERSION = 0.30.4 > +PYTHON_ARGH_VERSION = 0.31.0 > PYTHON_ARGH_SOURCE = argh-$(PYTHON_ARGH_VERSION).tar.gz > -PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/37/3a/175f4a2c47e8c20e59cf25fe69546f76cf1196251a377b182e8f4542b4c4 > +PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/7c/3c/1b7f3fab380c96d61119178040c0183161fe0f182c4da3933bcb3284538f > PYTHON_ARGH_SETUP_TYPE = flit > PYTHON_ARGH_LICENSE = LGPL-3.0+ > PYTHON_ARGH_LICENSE_FILES = COPYING COPYING.LESSER From arnout at mind.be Mon Feb 5 13:21:33 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:21:33 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-hatch-fancy-pypi-readme: bump to version 24.1.0 In-Reply-To: <20240108070310.3462577-1-james.hilliard1@gmail.com> References: <20240108070310.3462577-1-james.hilliard1@gmail.com> Message-ID: On 08/01/2024 08:03, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > .../python-hatch-fancy-pypi-readme.hash | 6 +++--- > .../python-hatch-fancy-pypi-readme.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash > index d9fdb88e1f..e3a6363eb7 100644 > --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash > +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash > @@ -1,5 +1,5 @@ > -# md5, sha256 from https://pypi.org/pypi/hatch_fancy_pypi_readme/json > -md5 8755cce1a4a4d5e5d84992089801acbf hatch_fancy_pypi_readme-23.1.0.tar.gz > -sha256 b1df44063094af1e8248ceacd47a92c9cf313d6b9823bf66af8a927c3960287d hatch_fancy_pypi_readme-23.1.0.tar.gz > +# md5, sha256 from https://pypi.org/pypi/hatch-fancy-pypi-readme/json > +md5 f5f9e639f066c91f8e623ec6231beae9 hatch_fancy_pypi_readme-24.1.0.tar.gz > +sha256 44dd239f1a779b9dcf8ebc9401a611fd7f7e3e14578dcf22c265dfaf7c1514b8 hatch_fancy_pypi_readme-24.1.0.tar.gz > # Locally computed sha256 checksums > sha256 e69ea57f96e599e617f61af3e85bf326b87e833994709fb5e5908a81197730a2 LICENSE.txt > diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk > index 6195a30436..2a26892388 100644 > --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk > +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_HATCH_FANCY_PYPI_README_VERSION = 23.1.0 > +PYTHON_HATCH_FANCY_PYPI_README_VERSION = 24.1.0 > PYTHON_HATCH_FANCY_PYPI_README_SOURCE = hatch_fancy_pypi_readme-$(PYTHON_HATCH_FANCY_PYPI_README_VERSION).tar.gz > -PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/85/a6/58d585eba4321bf2e7a4d1ed2af141c99d88c1afa4b751926be160f09325 > +PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/b4/c2/c9094283a07dd96c5a8f7a5f1910259d40d2e29223b95dd875a6ca13b58f > PYTHON_HATCH_FANCY_PYPI_README_LICENSE = MIT > PYTHON_HATCH_FANCY_PYPI_README_LICENSE_FILES = LICENSE.txt > PYTHON_HATCH_FANCY_PYPI_README_SETUP_TYPE = pep517 From arnout at mind.be Mon Feb 5 13:22:01 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:22:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.7.0 In-Reply-To: <20240107203517.3310719-1-james.hilliard1@gmail.com> References: <20240107203517.3310719-1-james.hilliard1@gmail.com> Message-ID: On 07/01/2024 21:35, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-aioconsole/python-aioconsole.hash | 4 ++-- > package/python-aioconsole/python-aioconsole.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash > index b8237ed76c..b52140cca5 100644 > --- a/package/python-aioconsole/python-aioconsole.hash > +++ b/package/python-aioconsole/python-aioconsole.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aioconsole/json > -md5 0f7e4db85113d1ffdc5f0fa1dc0a37de aioconsole-0.6.2.tar.gz > -sha256 bac11286f1062613d2523ceee1ba81c676cd269812b865b66b907448a7b5f63e aioconsole-0.6.2.tar.gz > +md5 e8cb2e4dc434e20a3e75acb54d89bdf3 aioconsole-0.7.0.tar.gz > +sha256 c702d24406378d37d9873f91e03ce71520bac503d5ab03f81d8b563ff010bd54 aioconsole-0.7.0.tar.gz > # Locally computed sha256 checksums > sha256 e1c0ad728983d8a57335e52cf1064f1affd1d454173d8cebd3ed8b4a72b48704 LICENSE > diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk > index 602564c290..b109d8e358 100644 > --- a/package/python-aioconsole/python-aioconsole.mk > +++ b/package/python-aioconsole/python-aioconsole.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIOCONSOLE_VERSION = 0.6.2 > +PYTHON_AIOCONSOLE_VERSION = 0.7.0 > PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz > -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/5f/14/e5c634fad6a95ffd602fbbd1aa107f05a8ffb79d33ec0d0477f3b137f8a9 > +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/85/da/6a238a72274fa338b2ff20007f026944a6721245fa65d3bd4adeb83be419 > PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools > PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 > PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 5 13:22:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 14:22:21 +0100 Subject: [Buildroot] [git commit] package/libzenoh-pico: disable on or1k Message-ID: <20240205132229.6521F86C15@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ead797bef768a7f3da7a76dd8510eef48181bb6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The upstream libzenoh-pico code uses asm("nop"), which is completely bogus, and actually breaks build on or1k as the instruction does not exist. In upstream commit https://github.com/eclipse-zenoh/zenoh-pico/commit/7d79a14addcea972e801709413f5c9a5226e3ad3 they made the asm("nop") thing "configurable" with ZP_ASM_NOP, but still that requires some special handling for or1k. The whole thing is a complete mess, and upstream should have to use any of that. Rather than stacking piles of bogus stuff on more bogus stuff, let's simply disable this package for or1k for now. Thanks a lot to Fabrice for all the investigation, and interaction with upstream. See https://patchwork.ozlabs.org/project/buildroot/patch/20240110215515.1263859-1-fontaine.fabrice at gmail.com/ for example. Fixes: - http://autobuild.buildroot.org/results/fd0b2c666a1dc1537162d15b27743abd270243ed Signed-off-by: Thomas Petazzoni --- package/libzenoh-pico/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libzenoh-pico/Config.in b/package/libzenoh-pico/Config.in index 5f7e91c9f6..9dbb260c52 100644 --- a/package/libzenoh-pico/Config.in +++ b/package/libzenoh-pico/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_LIBZENOH_PICO bool "libzenoh-pico" + # upstream hardcodes using asm("nop"), which is bogus and + # doesn't work on or1k + depends on !BR2_or1k depends on BR2_TOOLCHAIN_HAS_THREADS help zenoh-pico is the Eclipse zenoh implementation that targets @@ -11,4 +14,5 @@ config BR2_PACKAGE_LIBZENOH_PICO https://github.com/eclipse-zenoh/zenoh-pico comment "libzenoh-pico needs a toolchain w/ threads" + depends on !BR2_or1k depends on !BR2_TOOLCHAIN_HAS_THREADS From arnout at mind.be Mon Feb 5 13:22:31 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:22:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-security: bump to version 0.5.0 In-Reply-To: <20240107210846.3319912-1-james.hilliard1@gmail.com> References: <20240107210846.3319912-1-james.hilliard1@gmail.com> Message-ID: <7c162b4a-2bf2-4503-ab96-4d28d3cebc01@mind.be> On 07/01/2024 22:08, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-aiohttp-security/python-aiohttp-security.hash | 4 ++-- > package/python-aiohttp-security/python-aiohttp-security.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aiohttp-security/python-aiohttp-security.hash b/package/python-aiohttp-security/python-aiohttp-security.hash > index 2c23df14d6..6a76070298 100644 > --- a/package/python-aiohttp-security/python-aiohttp-security.hash > +++ b/package/python-aiohttp-security/python-aiohttp-security.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aiohttp-security/json > -md5 1624f982d7a779e6ed396ef2ed20acc7 aiohttp-security-0.4.0.tar.gz > -sha256 40d4bb150454e392c2dfa3620f6eab28e140e94cf0c2d3b4bf43aef653ec9405 aiohttp-security-0.4.0.tar.gz > +md5 b34fb62c6f4dd130f3c94f74c3bdc150 aiohttp-security-0.5.0.tar.gz > +sha256 50cb724d310e1d0289798bb98ae852c3b75b77e8f51ce5159c57b7261d0638bd aiohttp-security-0.5.0.tar.gz > # Locally computed sha256 checksums > sha256 a1cc8ff7210897d55d2552fa0792340f8e59720e0160b6918699d40f9a782b1c LICENSE > diff --git a/package/python-aiohttp-security/python-aiohttp-security.mk b/package/python-aiohttp-security/python-aiohttp-security.mk > index 9ab3b16b30..274f60423f 100644 > --- a/package/python-aiohttp-security/python-aiohttp-security.mk > +++ b/package/python-aiohttp-security/python-aiohttp-security.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIOHTTP_SECURITY_VERSION = 0.4.0 > +PYTHON_AIOHTTP_SECURITY_VERSION = 0.5.0 > PYTHON_AIOHTTP_SECURITY_SOURCE = aiohttp-security-$(PYTHON_AIOHTTP_SECURITY_VERSION).tar.gz > -PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/36/01/d85be376b7c1773b3cb7849cd56dc7d38165664df7de2d3e20af507ef5bb > +PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/31/49/56c131fe3dead875ab5907b154dac7fb6ee727662de80b7da0ff045030d4 > PYTHON_AIOHTTP_SECURITY_SETUP_TYPE = setuptools > PYTHON_AIOHTTP_SECURITY_LICENSE = Apache-2.0 > PYTHON_AIOHTTP_SECURITY_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:22:58 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:22:58 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-attrs: bump to version 23.2.0 In-Reply-To: <20240108070310.3462577-2-james.hilliard1@gmail.com> References: <20240108070310.3462577-1-james.hilliard1@gmail.com> <20240108070310.3462577-2-james.hilliard1@gmail.com> Message-ID: <92589d57-9db6-45d2-a7d0-47db210d1146@mind.be> On 08/01/2024 08:03, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-attrs/python-attrs.hash | 4 ++-- > package/python-attrs/python-attrs.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash > index 0e94c7cef4..d8c6d147d5 100644 > --- a/package/python-attrs/python-attrs.hash > +++ b/package/python-attrs/python-attrs.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/attrs/json > -md5 6623fed7ffa22261ba25fccaf4d99539 attrs-23.1.0.tar.gz > -sha256 6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015 attrs-23.1.0.tar.gz > +md5 60588a146fb413a997c7519d77198a5e attrs-23.2.0.tar.gz > +sha256 935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 attrs-23.2.0.tar.gz > # Locally computed sha256 checksums > sha256 882115c95dfc2af1eeb6714f8ec6d5cbcabf667caff8729f42420da63f714e9f LICENSE > diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk > index 0d704ea111..8a1236cc44 100644 > --- a/package/python-attrs/python-attrs.mk > +++ b/package/python-attrs/python-attrs.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_ATTRS_VERSION = 23.1.0 > +PYTHON_ATTRS_VERSION = 23.2.0 > PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz > -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/97/90/81f95d5f705be17872843536b1868f351805acf6971251ff07c1b8334dbb > +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/e3/fc/f800d51204003fa8ae392c4e8278f256206e7a919b708eef054f5f4b650d > PYTHON_ATTRS_SETUP_TYPE = pep517 > PYTHON_ATTRS_LICENSE = MIT > PYTHON_ATTRS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:23:12 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:23:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-babel: bump to version 2.14.0 In-Reply-To: <20240108070725.3469629-1-james.hilliard1@gmail.com> References: <20240108070725.3469629-1-james.hilliard1@gmail.com> Message-ID: On 08/01/2024 08:07, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-babel/python-babel.hash | 4 ++-- > package/python-babel/python-babel.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-babel/python-babel.hash b/package/python-babel/python-babel.hash > index dc48831c44..ab4e022564 100644 > --- a/package/python-babel/python-babel.hash > +++ b/package/python-babel/python-babel.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/babel/json > -md5 3162229c2daa7c32674ed26f87b63127 Babel-2.13.1.tar.gz > -sha256 33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900 Babel-2.13.1.tar.gz > +md5 3bec3f4c842144c15d839bdde41a44d4 Babel-2.14.0.tar.gz > +sha256 6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363 Babel-2.14.0.tar.gz > # Locally computed sha256 checksums > sha256 908e0ad72053ae27c1d17e3340bd14cff9bf935992ed56526d17c983ab6e7af7 LICENSE > diff --git a/package/python-babel/python-babel.mk b/package/python-babel/python-babel.mk > index f8d2ccd258..eb39b9aef7 100644 > --- a/package/python-babel/python-babel.mk > +++ b/package/python-babel/python-babel.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_BABEL_VERSION = 2.13.1 > +PYTHON_BABEL_VERSION = 2.14.0 > PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz > -PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/aa/6c/737d2345d86741eeb594381394016b9c74c1253b4cbe274bb1e7b5e2138e > +PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/e2/80/cfbe44a9085d112e983282ee7ca4c00429bc4d1ce86ee5f4e60259ddff7f > PYTHON_BABEL_SETUP_TYPE = setuptools > PYTHON_BABEL_LICENSE = BSD-3-Clause > PYTHON_BABEL_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:23:37 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:23:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: bump version to 2.30.0 In-Reply-To: <20240108071410.118585-1-egorenar@linux.ibm.com> References: <20240108071410.118585-1-egorenar@linux.ibm.com> Message-ID: On 08/01/2024 08:14, Alexander Egorenkov wrote: > Signed-off-by: Alexander Egorenkov Applied to master, thanks. Regards, Arnout > --- > package/s390-tools/s390-tools.hash | 2 +- > package/s390-tools/s390-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash > index a00e95437b96..c70bf69f008c 100644 > --- a/package/s390-tools/s390-tools.hash > +++ b/package/s390-tools/s390-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 849ff400dc6c1eb7eebe4aa3e7a4871721c25bcee6cfdd0535a056a038fd3ab0 s390-tools-2.29.0.tar.gz > +sha256 9e565701cc6df4808243027706ee0a76c5fc0c7f9aae0afce1479fd4ff68bcdf s390-tools-2.30.0.tar.gz > sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE > diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk > index c3155a13ff5a..bc39a9bd1970 100644 > --- a/package/s390-tools/s390-tools.mk > +++ b/package/s390-tools/s390-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -S390_TOOLS_VERSION = 2.29.0 > +S390_TOOLS_VERSION = 2.30.0 > S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) > S390_TOOLS_LICENSE = MIT > S390_TOOLS_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 5 13:24:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 14:24:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/libzenoh-pico: fix or1k build In-Reply-To: <20240110215515.1263859-1-fontaine.fabrice@gmail.com> References: <20240110215515.1263859-1-fontaine.fabrice@gmail.com> Message-ID: <20240205142414.07741505@windsurf> On Wed, 10 Jan 2024 22:55:15 +0100 Fabrice Fontaine wrote: > Fix the following build failure with or1k raises since the addition of > the package in commit a96361901dcc7b962a0c43f163e97a2de65687f3: > > /home/autobuild/autobuild/instance-1/output-1/build/libzenoh-pico-0.10.0-rc/src/link/endpoint.c: Assembler messages: > /home/autobuild/autobuild/instance-1/output-1/build/libzenoh-pico-0.10.0-rc/src/link/endpoint.c:358: Error: unrecognized instruction `nop' > > Fixes: > - http://autobuild.buildroot.org/results/fd0b2c666a1dc1537162d15b27743abd270243ed > > Signed-off-by: Fabrice Fontaine > --- > ...001-Remove-nop-or-replace-with-macro.patch | 131 ++++++++++++++++++ > package/libzenoh-pico/libzenoh-pico.mk | 6 + > 2 files changed, 137 insertions(+) > create mode 100644 package/libzenoh-pico/0001-Remove-nop-or-replace-with-macro.patch Thanks a lot for this new patch. We discussed it with Arnout, and even with this upstream patch the whole thing is still very messy. There seems to be absolutely no reason for upstream to need this ZP_ASM_NOP macro. So rather than piling bogus things on top of more bogus things, I went ahead and applied a fix that just disables this package on or1k. Ideally, we should explain to upstream that these asm("nop") are useless. Thanks for your work! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 13:24:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 14:24:34 +0100 Subject: [Buildroot] [PATCH] package/micropython: add support for manifest.py in the configuration In-Reply-To: <20240204062645.3616072-1-abiliojr@gmail.com> References: <20240204062645.3616072-1-abiliojr@gmail.com> Message-ID: Abilio, All, On 2024-02-03 22:26 -0800, Abilio Marques spake thusly: > Micropython can embed packages an modules as frozen bytecode. What code > gets built this way can be defined by means of a "manifest.py" file. > > This commit exposes the variable FROZEN_MANIFEST to Buildroot users > through a new variable called BR2_PACKAGE_MICROPYTHON_MANIFEST. > > Please check Micropython's documentation for more information: > https://docs.micropython.org/en/latest/reference/manifest.html Minor nit: this blurb should have been in the help text of the new option, and I could have done that when applying, but I have a much more involved question, see below. > Signed-off-by: Abilio Marques > --- > package/micropython/Config.in | 8 ++++++++ > package/micropython/micropython.mk | 5 +++++ > 2 files changed, 13 insertions(+) > > diff --git a/package/micropython/Config.in b/package/micropython/Config.in > index 26a00baab0..52717d815a 100644 > --- a/package/micropython/Config.in > +++ b/package/micropython/Config.in > @@ -17,6 +17,14 @@ config BR2_PACKAGE_MICROPYTHON_LIB > help > Core Python libraries ported to MicroPython. > > +config BR2_PACKAGE_MICROPYTHON_MANIFEST > + string "Path to a manifest.py file" > + help > + MicroPython allows Python code to be ?frozen? as bytecode > + into its binary, as an alternative to loading code from > + the filesystem. See MicroPython's documentation for more > + information. > + > endif # BR2_PACKAGE_MICROPYTHON > > comment "micropython needs a toolchain w/ threads, dynamic library" > diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk > index 125a0edcfb..5a2c136547 100644 > --- a/package/micropython/micropython.mk > +++ b/package/micropython/micropython.mk > @@ -43,6 +43,11 @@ else > MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 > endif > > +ifneq ($(BR2_PACKAGE_MICROPYTHON_MANIFEST),"") > +MICROPYTHON_MAKE_OPTS += \ > + FROZEN_MANIFEST=$(BR2_PACKAGE_MICROPYTHON_MANIFEST) > +endif So, as I understand this, micropython will grab the files (from modules, files, etc...) listed from the manifest and bundle them in the micropython executable. It seems the paths in the manifest can be either absolute, or relative; in the latter case, it not documented what they would be relative to; additionally there are placeholders (see below) that can be used but are absolute paths. So this has a few implications: - the files must be available before micropython is built, so some dependency order is needed to ensure that: if files are provided in a package, then we need a dependency and it is going to be a little bit difficult to do and we need a way to address that; - the paths can't be hard-coded to absolute paths in the manifest file itself, because we don't know beforehand where the buildroot build directory will be, so we need a way to shoehorn $(TOPDIR) or some such variable in the manifest; - absolute paths must be fixed to accommodate the per-package option, because those paths change for eaach package. From the micropython doc, that you pointed above, there are a few placeholders that will be replaced in the manifest, but I don't think we can reuse those: Any paths used in manifest files can include the following variables. These all resolve to absolute paths. * $(MPY_DIR) ? path to the micropython repo. * $(MPY_LIB_DIR) ? path to the micropython-lib submodule. Prefer to use require(). * $(PORT_DIR) ? path to the current port (e.g. ports/stm32) * $(BOARD_DIR) ? path to the current board (e.g. ports/stm32/boards/PYBV11) So we need a bit more information how this feature is to be used, and an example (or a few) would probably help a lot in this respect. We also have a runtime test for micropython, in: support/testing/tests/package/test_micropython.py It would be nice to extend that runtime test as well. Regards, Yann E. MORIN. > define MICROPYTHON_BUILD_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From dev at andin.de Mon Feb 5 13:25:43 2024 From: dev at andin.de (Andreas Naumann) Date: Mon, 5 Feb 2024 14:25:43 +0100 Subject: [Buildroot] dracut: no longer works since bump to 059 In-Reply-To: <977bc5e8-28c7-44b4-8651-9522d205aa59@linatsea.fr> References: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> <977bc5e8-28c7-44b4-8651-9522d205aa59@linatsea.fr> Message-ID: Hi, On 04.02.24 10:12, Thierry Bultel wrote: > Dear Adam, > > please see my comments below > > Le 03/02/2024 ? 13:55, Adam Duskett a ?crit?: >> Hello Thierry; >> >> I am going to top-post to bother Yann. ;) >> >> Dracut support in Buildroot is very broken and must be patched to work >> properly. I tried pinpointing the problem, which actually is that the test fails because usr/lib/libz.so is no longer in the produced cpio. Bisecting upstream dracut I arrived at d010fa0 refactor(dracut-install): fork() instead of popen(), sanitise line reading This commit is already contained in tag 058, so bumping to that wouldnt help. Unfortunately the content of the change is something I dont understand right now. It has however the effect that none of /usr/lib/* is landing in the cpio anymore. regards, Andreas > > As long as producing a busybox-init based ramdisk still works ... > >> >> >> Thanks so much! > > Best regards > Thierry > >> Adam >> >> On Thu, Feb 1, 2024 at 1:43?PM Thierry Bultel >> wrote: >> >> ??? Hi, since bump to this version, >> >> ??? invocation of 'ldd' wrapper fails in dracut-install. >> >> ??? After analysis, this is because version uses "execlp" for >> ??? launching the 'ldd' wrapper variable, >> ??? which in out case consists in the executable name + the rootfs >> ??? argument, leading to the fault. >> >> ??? Version 057 used to call "popen" instead that what Ok with that. >> >> ??? Thierry >> >> ??? -- >> ??? www.linatsea.fr >> ??? -- ??? www.linatsea.fr >> ??? _______________________________________________ >> ??? buildroot mailing list >> ??? buildroot at buildroot.org >> ??? https://lists.buildroot.org/mailman/listinfo/buildroot >> > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Mon Feb 5 13:26:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 14:26:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sqlparse: bump to version 0.4.4 In-Reply-To: <20240111072146.3076561-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:21:46 -0700") References: <20240111072146.3076561-1-james.hilliard1@gmail.com> Message-ID: <878r3zt52d.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Migrate from setuptools to flit build backend. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 5 13:26:48 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:26:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-bitstring: bump to version 4.1.4 In-Reply-To: <20240107114345.2795252-1-fontaine.fabrice@gmail.com> References: <20240107114345.2795252-1-fontaine.fabrice@gmail.com> Message-ID: <275220a4-24b2-4f21-b8bb-fae239a56d37@mind.be> On 07/01/2024 12:43, Fabrice Fontaine wrote: > This bump will fix the following build failure raised since bump to > version 4.1.2 in commit ce2bf7b96b9dba57bb31aca583283736af27afcc: > > *** Error compiling '/home/buildroot/autobuild/instance-0/output-1/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... > Sorry: IndentationError: expected an indented block after function definition on line 6 (plugin_test.py, line 8) > > https://github.com/scott-griffiths/bitstring/blob/bitstring-4.1.4/release_notes.txt > > Fixes: > - http://autobuild.buildroot.org/results/e6fac4cac16de94862e3b4697dd88e856bc9a398 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/python-bitstring/python-bitstring.hash | 4 ++-- > package/python-bitstring/python-bitstring.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash > index c2ff9a69d5..1889983f47 100644 > --- a/package/python-bitstring/python-bitstring.hash > +++ b/package/python-bitstring/python-bitstring.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/bitstring/json > -md5 1750c35e8e45f597725037d35eed9ba1 bitstring-4.1.2.tar.gz > -sha256 c22283d60fd3e1a8f386ccd4f1915d7fe13481d6349db39711421e24d4a9cccf bitstring-4.1.2.tar.gz > +md5 3909415d89586edabd577b62b0d0c1be bitstring-4.1.4.tar.gz > +sha256 94f3f1c45383ebe8fd4a359424ffeb75c2f290760ae8fcac421b44f89ac85213 bitstring-4.1.4.tar.gz > # Locally computed sha256 checksums > sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE > diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk > index 9a5d8dfe84..983491303d 100644 > --- a/package/python-bitstring/python-bitstring.mk > +++ b/package/python-bitstring/python-bitstring.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_BITSTRING_VERSION = 4.1.2 > +PYTHON_BITSTRING_VERSION = 4.1.4 > PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz > -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/23/fc/b5ace4f51fea5bcc7f8cca8859748ea5eb941680b82a5b3687c980d9589b > +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/7f/07/0fd502a29127b968bada3d1824a8af997546d2b9ff73f00e800b3d9888cb > PYTHON_BITSTRING_SETUP_TYPE = setuptools > PYTHON_BITSTRING_LICENSE = MIT > PYTHON_BITSTRING_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 13:26:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 14:26:56 +0100 Subject: [Buildroot] [git commit] package/python-sqlparse: bump to version 0.4.4 Message-ID: <20240205132708.5A48486C33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e29d91d6ee7513b2a0e4bb49009420c255b9ca5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools to flit build backend. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-sqlparse/python-sqlparse.hash | 4 ++-- package/python-sqlparse/python-sqlparse.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-sqlparse/python-sqlparse.hash b/package/python-sqlparse/python-sqlparse.hash index c78fd2edc3..0b7c14d9ae 100644 --- a/package/python-sqlparse/python-sqlparse.hash +++ b/package/python-sqlparse/python-sqlparse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlparse/json -md5 180fb4e11a3f79b119868d7c102d7816 sqlparse-0.4.3.tar.gz -sha256 69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268 sqlparse-0.4.3.tar.gz +md5 67798c7a0dae90f263d20e9ecf62c8cd sqlparse-0.4.4.tar.gz +sha256 d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c sqlparse-0.4.4.tar.gz # Locally computed sha256 checksums sha256 c1938235b80d39e93138eae89edc3af67e18ecbc40d266529fa57b2dce426310 LICENSE diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 48b1a24822..3f99eb6476 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_SQLPARSE_VERSION = 0.4.3 +PYTHON_SQLPARSE_VERSION = 0.4.4 PYTHON_SQLPARSE_SOURCE = sqlparse-$(PYTHON_SQLPARSE_VERSION).tar.gz -PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/ba/fa/5b7662b04b69f3a34b8867877e4dbf2a37b7f2a5c0bbb5a9eed64efd1ad1 -PYTHON_SQLPARSE_SETUP_TYPE = setuptools +PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/65/16/10f170ec641ed852611b6c9441b23d10b5702ab5288371feab3d36de2574 +PYTHON_SQLPARSE_SETUP_TYPE = flit PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE PYTHON_SQLPARSE_CPE_ID_VENDOR = sqlparse_project From peter at korsgaard.com Mon Feb 5 13:26:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 14:26:55 +0100 Subject: [Buildroot] [git commit] package/python-tempora: bump to version 5.5.0 Message-ID: <20240205132708.4FF7286C31@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d91366dac08f26ce023c757631ccb6cd9e2f2ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to copyright notice removal: https://github.com/jaraco/tempora/commit/5957d58266e479f124b31f30e4322e798fdf386b Drop no longer required python-six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-tempora/Config.in | 1 - package/python-tempora/python-tempora.hash | 6 +++--- package/python-tempora/python-tempora.mk | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-tempora/Config.in b/package/python-tempora/Config.in index 508cbae3f3..3f4481422a 100644 --- a/package/python-tempora/Config.in +++ b/package/python-tempora/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_TEMPORA bool "python-tempora" select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime help Objects and routines pertaining to date and time. diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index ac6483b77f..ff7093394f 100644 --- a/package/python-tempora/python-tempora.hash +++ b/package/python-tempora/python-tempora.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tempora/json -md5 87fc0d99edd557323e61a16017707a8b tempora-5.2.0.tar.gz -sha256 af82eb016decda8daf566d1e4836f94f7f8ba8c7153637460156e081aadc64df tempora-5.2.0.tar.gz +md5 39314c5843bc3f40f8ce4f5cc340c479 tempora-5.5.0.tar.gz +sha256 13e4fcc997d0509c3306d6841f03e9381b7e5e46b2bebfae9151af90085f0c26 tempora-5.5.0.tar.gz # Locally computed sha256 checksums -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index 3074ad0de2..d1b333ec0a 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 5.2.0 +PYTHON_TEMPORA_VERSION = 5.5.0 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/97/70/5cf5031a83ca6d0431a53459b2a98aa387ba23d06710a5e48d681ff3956f +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/c9/dc/97d90b9f64dbe4f599023e19602b33a2cced68462db67a3d4805a77cf784 PYTHON_TEMPORA_LICENSE = MIT PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 5 13:26:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 14:26:55 +0100 Subject: [Buildroot] [git commit] package/python-termcolor: bump to version 2.4.0 Message-ID: <20240205132708.464FE86C2F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11bc1d76bafd858b9178c22c8e0d7e60dde1ebbf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-termcolor/python-termcolor.hash | 4 ++-- package/python-termcolor/python-termcolor.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-termcolor/python-termcolor.hash b/package/python-termcolor/python-termcolor.hash index 9be0ad00c8..ed69ab06d1 100644 --- a/package/python-termcolor/python-termcolor.hash +++ b/package/python-termcolor/python-termcolor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/termcolor/json -md5 ba0af4ee713cd0030c2d436091af4241 termcolor-2.2.0.tar.gz -sha256 dfc8ac3f350788f23b2947b3e6cfa5a53b630b612e6cd8965a015a776020b99a termcolor-2.2.0.tar.gz +md5 1d567737d43835549d2fd1bc87ec6c7d termcolor-2.4.0.tar.gz +sha256 aab9e56047c8ac41ed798fa36d892a37aca6b3e9159f3e0c24bc64a9b3ac7b7a termcolor-2.4.0.tar.gz # Locally computed sha256 checksums sha256 e79b6bd82962c1330caaa7c42278567b08667777673f8e2371a624d5715d4c0e COPYING.txt diff --git a/package/python-termcolor/python-termcolor.mk b/package/python-termcolor/python-termcolor.mk index 5cbedfb396..c242cfa474 100644 --- a/package/python-termcolor/python-termcolor.mk +++ b/package/python-termcolor/python-termcolor.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TERMCOLOR_VERSION = 2.2.0 +PYTHON_TERMCOLOR_VERSION = 2.4.0 PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz -PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/e5/4e/b2a54a21092ad2d5d70b0140e4080811bee06a39cc8481651579fe865c89 +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/10/56/d7d66a84f96d804155f6ff2873d065368b25a07222a6fd51c4f24ef6d764 PYTHON_TERMCOLOR_SETUP_TYPE = pep517 PYTHON_TERMCOLOR_LICENSE = MIT PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt From arnout at mind.be Mon Feb 5 13:27:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:27:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-bitstring: bump to version 4.1.4 In-Reply-To: <20240108072233.3485954-1-james.hilliard1@gmail.com> References: <20240108072233.3485954-1-james.hilliard1@gmail.com> Message-ID: On 08/01/2024 08:22, James Hilliard wrote: > Signed-off-by: James Hilliard Fabrice sent a version of this patch that also has an autobuilder reference, so I applied that one. Regards, Arnout > --- > package/python-bitstring/python-bitstring.hash | 4 ++-- > package/python-bitstring/python-bitstring.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash > index c2ff9a69d5..1889983f47 100644 > --- a/package/python-bitstring/python-bitstring.hash > +++ b/package/python-bitstring/python-bitstring.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/bitstring/json > -md5 1750c35e8e45f597725037d35eed9ba1 bitstring-4.1.2.tar.gz > -sha256 c22283d60fd3e1a8f386ccd4f1915d7fe13481d6349db39711421e24d4a9cccf bitstring-4.1.2.tar.gz > +md5 3909415d89586edabd577b62b0d0c1be bitstring-4.1.4.tar.gz > +sha256 94f3f1c45383ebe8fd4a359424ffeb75c2f290760ae8fcac421b44f89ac85213 bitstring-4.1.4.tar.gz > # Locally computed sha256 checksums > sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE > diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk > index 9a5d8dfe84..983491303d 100644 > --- a/package/python-bitstring/python-bitstring.mk > +++ b/package/python-bitstring/python-bitstring.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_BITSTRING_VERSION = 4.1.2 > +PYTHON_BITSTRING_VERSION = 4.1.4 > PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz > -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/23/fc/b5ace4f51fea5bcc7f8cca8859748ea5eb941680b82a5b3687c980d9589b > +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/7f/07/0fd502a29127b968bada3d1824a8af997546d2b9ff73f00e800b3d9888cb > PYTHON_BITSTRING_SETUP_TYPE = setuptools > PYTHON_BITSTRING_LICENSE = MIT > PYTHON_BITSTRING_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:14 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:14 +0100 Subject: [Buildroot] [git commit] package/python-hatch-fancy-pypi-readme: bump to version 24.1.0 Message-ID: <20240205132914.F0FE486C7A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06cdc02ef2d0124972448c4b0ffda3da2530bb23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- .../python-hatch-fancy-pypi-readme.hash | 6 +++--- .../python-hatch-fancy-pypi-readme.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash index d9fdb88e1f..e3a6363eb7 100644 --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/hatch_fancy_pypi_readme/json -md5 8755cce1a4a4d5e5d84992089801acbf hatch_fancy_pypi_readme-23.1.0.tar.gz -sha256 b1df44063094af1e8248ceacd47a92c9cf313d6b9823bf66af8a927c3960287d hatch_fancy_pypi_readme-23.1.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/hatch-fancy-pypi-readme/json +md5 f5f9e639f066c91f8e623ec6231beae9 hatch_fancy_pypi_readme-24.1.0.tar.gz +sha256 44dd239f1a779b9dcf8ebc9401a611fd7f7e3e14578dcf22c265dfaf7c1514b8 hatch_fancy_pypi_readme-24.1.0.tar.gz # Locally computed sha256 checksums sha256 e69ea57f96e599e617f61af3e85bf326b87e833994709fb5e5908a81197730a2 LICENSE.txt diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk index 6195a30436..2a26892388 100644 --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCH_FANCY_PYPI_README_VERSION = 23.1.0 +PYTHON_HATCH_FANCY_PYPI_README_VERSION = 24.1.0 PYTHON_HATCH_FANCY_PYPI_README_SOURCE = hatch_fancy_pypi_readme-$(PYTHON_HATCH_FANCY_PYPI_README_VERSION).tar.gz -PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/85/a6/58d585eba4321bf2e7a4d1ed2af141c99d88c1afa4b751926be160f09325 +PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/b4/c2/c9094283a07dd96c5a8f7a5f1910259d40d2e29223b95dd875a6ca13b58f PYTHON_HATCH_FANCY_PYPI_README_LICENSE = MIT PYTHON_HATCH_FANCY_PYPI_README_LICENSE_FILES = LICENSE.txt PYTHON_HATCH_FANCY_PYPI_README_SETUP_TYPE = pep517 From arnout at mind.be Mon Feb 5 13:28:16 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:16 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-security: bump to version 0.5.0 Message-ID: <20240205132915.114DC86C7F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd5546c0465e1abe3f83b6540e09e4d568409537 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-aiohttp-security/python-aiohttp-security.hash | 4 ++-- package/python-aiohttp-security/python-aiohttp-security.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-security/python-aiohttp-security.hash b/package/python-aiohttp-security/python-aiohttp-security.hash index 2c23df14d6..6a76070298 100644 --- a/package/python-aiohttp-security/python-aiohttp-security.hash +++ b/package/python-aiohttp-security/python-aiohttp-security.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-security/json -md5 1624f982d7a779e6ed396ef2ed20acc7 aiohttp-security-0.4.0.tar.gz -sha256 40d4bb150454e392c2dfa3620f6eab28e140e94cf0c2d3b4bf43aef653ec9405 aiohttp-security-0.4.0.tar.gz +md5 b34fb62c6f4dd130f3c94f74c3bdc150 aiohttp-security-0.5.0.tar.gz +sha256 50cb724d310e1d0289798bb98ae852c3b75b77e8f51ce5159c57b7261d0638bd aiohttp-security-0.5.0.tar.gz # Locally computed sha256 checksums sha256 a1cc8ff7210897d55d2552fa0792340f8e59720e0160b6918699d40f9a782b1c LICENSE diff --git a/package/python-aiohttp-security/python-aiohttp-security.mk b/package/python-aiohttp-security/python-aiohttp-security.mk index 9ab3b16b30..274f60423f 100644 --- a/package/python-aiohttp-security/python-aiohttp-security.mk +++ b/package/python-aiohttp-security/python-aiohttp-security.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SECURITY_VERSION = 0.4.0 +PYTHON_AIOHTTP_SECURITY_VERSION = 0.5.0 PYTHON_AIOHTTP_SECURITY_SOURCE = aiohttp-security-$(PYTHON_AIOHTTP_SECURITY_VERSION).tar.gz -PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/36/01/d85be376b7c1773b3cb7849cd56dc7d38165664df7de2d3e20af507ef5bb +PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/31/49/56c131fe3dead875ab5907b154dac7fb6ee727662de80b7da0ff045030d4 PYTHON_AIOHTTP_SECURITY_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SECURITY_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SECURITY_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:11 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:11 +0100 Subject: [Buildroot] [git commit] package/openblas: bump to version v0.3.26 Message-ID: <20240205132914.C6DA386C7A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd3ec6b977a84a324639682f16f82b459382f8e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For change log since v0.3.25, see: https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.26 This commit also update _SITE url to follow download url published on the homepage https://www.openblas.net/ Also https://github.com/xianyi/OpenBLAS is now redirecting to https://github.com/OpenMathLib/OpenBLAS Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/openblas/openblas.hash | 6 +++--- package/openblas/openblas.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index d946ae7296..a0f054dab7 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,5 +1,5 @@ -# From https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.25 -md5 48384e324cd1cdcfbdb0d2e16ca55327 openblas-0.3.25.tar.gz +# From https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.26 +md5 bd496a1c81769ed19a161c1f8f904ccd openblas-0.3.26.tar.gz # Locally calculated -sha256 4c25cb30c4bb23eddca05d7d0a85997b8db6144f5464ba7f8c09ce91e2f35543 openblas-0.3.25.tar.gz +sha256 4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68 openblas-0.3.26.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 76833121a9..2d6cdaa7bb 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.25 -OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) +OPENBLAS_VERSION = 0.3.26 +OPENBLAS_SITE = https://github.com/OpenMathLib/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES From arnout at mind.be Mon Feb 5 13:28:18 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:18 +0100 Subject: [Buildroot] [git commit] package/python-babel: bump to version 2.14.0 Message-ID: <20240205132915.2604186C7A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2af4afbda22b974b8c75abb6ba96b2e3e122e972 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-babel/python-babel.hash | 4 ++-- package/python-babel/python-babel.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-babel/python-babel.hash b/package/python-babel/python-babel.hash index dc48831c44..ab4e022564 100644 --- a/package/python-babel/python-babel.hash +++ b/package/python-babel/python-babel.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/babel/json -md5 3162229c2daa7c32674ed26f87b63127 Babel-2.13.1.tar.gz -sha256 33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900 Babel-2.13.1.tar.gz +md5 3bec3f4c842144c15d839bdde41a44d4 Babel-2.14.0.tar.gz +sha256 6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363 Babel-2.14.0.tar.gz # Locally computed sha256 checksums sha256 908e0ad72053ae27c1d17e3340bd14cff9bf935992ed56526d17c983ab6e7af7 LICENSE diff --git a/package/python-babel/python-babel.mk b/package/python-babel/python-babel.mk index f8d2ccd258..eb39b9aef7 100644 --- a/package/python-babel/python-babel.mk +++ b/package/python-babel/python-babel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BABEL_VERSION = 2.13.1 +PYTHON_BABEL_VERSION = 2.14.0 PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz -PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/aa/6c/737d2345d86741eeb594381394016b9c74c1253b4cbe274bb1e7b5e2138e +PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/e2/80/cfbe44a9085d112e983282ee7ca4c00429bc4d1ce86ee5f4e60259ddff7f PYTHON_BABEL_SETUP_TYPE = setuptools PYTHON_BABEL_LICENSE = BSD-3-Clause PYTHON_BABEL_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:13 +0100 Subject: [Buildroot] [git commit] package/python-argh: bump to version 0.31.0 Message-ID: <20240205132914.E6A2F86C2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=362e5cee6237b2f3a341edad11e435773a0d491a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-argh/python-argh.hash | 8 ++++---- package/python-argh/python-argh.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-argh/python-argh.hash b/package/python-argh/python-argh.hash index 8bfb45d1c3..bac9df42d6 100644 --- a/package/python-argh/python-argh.hash +++ b/package/python-argh/python-argh.hash @@ -1,6 +1,6 @@ -# md5 from https://pypi.python.org/pypi/argh/json -md5 7001dd9ff619cf1422ddf8bf813bd08a argh-0.30.4.tar.gz -sha256 9fca8e69c4dad4f8d2a7bdfbdd80b0754462b53510a03e1b5cf2b43a87e6e960 argh-0.30.4.tar.gz -# Locally computed +# md5, sha256 from https://pypi.org/pypi/argh/json +md5 2659a6353589156e6aa65a99797f8913 argh-0.31.0.tar.gz +sha256 b93093544309ddbfe6c73dc9bfd60dbc4acecef39f3f464774b3084a1ec5d7b0 argh-0.31.0.tar.gz +# Locally computed sha256 checksums sha256 2594f46b9b23a5fddeca090faeb270c7ceee8116675fe35082be859aa7466e89 COPYING sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER diff --git a/package/python-argh/python-argh.mk b/package/python-argh/python-argh.mk index ccb9f61d48..0da3281d49 100644 --- a/package/python-argh/python-argh.mk +++ b/package/python-argh/python-argh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ARGH_VERSION = 0.30.4 +PYTHON_ARGH_VERSION = 0.31.0 PYTHON_ARGH_SOURCE = argh-$(PYTHON_ARGH_VERSION).tar.gz -PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/37/3a/175f4a2c47e8c20e59cf25fe69546f76cf1196251a377b182e8f4542b4c4 +PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/7c/3c/1b7f3fab380c96d61119178040c0183161fe0f182c4da3933bcb3284538f PYTHON_ARGH_SETUP_TYPE = flit PYTHON_ARGH_LICENSE = LGPL-3.0+ PYTHON_ARGH_LICENSE_FILES = COPYING COPYING.LESSER From arnout at mind.be Mon Feb 5 13:28:19 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:19 +0100 Subject: [Buildroot] [git commit] package/s390-tools: bump version to 2.30.0 Message-ID: <20240205132915.2F17086C7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc14e44e63ce84daa338dd85b727b1b263931e0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Alexander Egorenkov Signed-off-by: Arnout Vandecappelle --- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index a00e95437b..c70bf69f00 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 849ff400dc6c1eb7eebe4aa3e7a4871721c25bcee6cfdd0535a056a038fd3ab0 s390-tools-2.29.0.tar.gz +sha256 9e565701cc6df4808243027706ee0a76c5fc0c7f9aae0afce1479fd4ff68bcdf s390-tools-2.30.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index c3155a13ff..bc39a9bd19 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.29.0 +S390_TOOLS_VERSION = 2.30.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:17 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:17 +0100 Subject: [Buildroot] [git commit] package/python-attrs: bump to version 23.2.0 Message-ID: <20240205132915.1B72086C81@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7dd37e75386d40e837619189ff2799643dbc21ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-attrs/python-attrs.hash | 4 ++-- package/python-attrs/python-attrs.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index 0e94c7cef4..d8c6d147d5 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 6623fed7ffa22261ba25fccaf4d99539 attrs-23.1.0.tar.gz -sha256 6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015 attrs-23.1.0.tar.gz +md5 60588a146fb413a997c7519d77198a5e attrs-23.2.0.tar.gz +sha256 935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 attrs-23.2.0.tar.gz # Locally computed sha256 checksums sha256 882115c95dfc2af1eeb6714f8ec6d5cbcabf667caff8729f42420da63f714e9f LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 0d704ea111..8a1236cc44 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 23.1.0 +PYTHON_ATTRS_VERSION = 23.2.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/97/90/81f95d5f705be17872843536b1868f351805acf6971251ff07c1b8334dbb +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/e3/fc/f800d51204003fa8ae392c4e8278f256206e7a919b708eef054f5f4b650d PYTHON_ATTRS_SETUP_TYPE = pep517 PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:48 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:48 +0100 Subject: [Buildroot] [git commit] package/python-bitstring: bump to version 4.1.4 Message-ID: <20240205132915.380F186C7D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae20955be340cbf9133c6a13a7695759aa4f464b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure raised since bump to version 4.1.2 in commit ce2bf7b96b9dba57bb31aca583283736af27afcc: *** Error compiling '/home/buildroot/autobuild/instance-0/output-1/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... Sorry: IndentationError: expected an indented block after function definition on line 6 (plugin_test.py, line 8) https://github.com/scott-griffiths/bitstring/blob/bitstring-4.1.4/release_notes.txt Fixes: - http://autobuild.buildroot.org/results/e6fac4cac16de94862e3b4697dd88e856bc9a398 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/python-bitstring/python-bitstring.hash | 4 ++-- package/python-bitstring/python-bitstring.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash index c2ff9a69d5..1889983f47 100644 --- a/package/python-bitstring/python-bitstring.hash +++ b/package/python-bitstring/python-bitstring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bitstring/json -md5 1750c35e8e45f597725037d35eed9ba1 bitstring-4.1.2.tar.gz -sha256 c22283d60fd3e1a8f386ccd4f1915d7fe13481d6349db39711421e24d4a9cccf bitstring-4.1.2.tar.gz +md5 3909415d89586edabd577b62b0d0c1be bitstring-4.1.4.tar.gz +sha256 94f3f1c45383ebe8fd4a359424ffeb75c2f290760ae8fcac421b44f89ac85213 bitstring-4.1.4.tar.gz # Locally computed sha256 checksums sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk index 9a5d8dfe84..983491303d 100644 --- a/package/python-bitstring/python-bitstring.mk +++ b/package/python-bitstring/python-bitstring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BITSTRING_VERSION = 4.1.2 +PYTHON_BITSTRING_VERSION = 4.1.4 PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/23/fc/b5ace4f51fea5bcc7f8cca8859748ea5eb941680b82a5b3687c980d9589b +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/7f/07/0fd502a29127b968bada3d1824a8af997546d2b9ff73f00e800b3d9888cb PYTHON_BITSTRING_SETUP_TYPE = setuptools PYTHON_BITSTRING_LICENSE = MIT PYTHON_BITSTRING_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:15 +0100 Subject: [Buildroot] [git commit] package/python-aioconsole: bump to version 0.7.0 Message-ID: <20240205132915.06EC986C7E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d8d458ec6f9a5b8aba2fa3f2252965f59c66caf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index b8237ed76c..b52140cca5 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 0f7e4db85113d1ffdc5f0fa1dc0a37de aioconsole-0.6.2.tar.gz -sha256 bac11286f1062613d2523ceee1ba81c676cd269812b865b66b907448a7b5f63e aioconsole-0.6.2.tar.gz +md5 e8cb2e4dc434e20a3e75acb54d89bdf3 aioconsole-0.7.0.tar.gz +sha256 c702d24406378d37d9873f91e03ce71520bac503d5ab03f81d8b563ff010bd54 aioconsole-0.7.0.tar.gz # Locally computed sha256 checksums sha256 e1c0ad728983d8a57335e52cf1064f1affd1d454173d8cebd3ed8b4a72b48704 LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 602564c290..b109d8e358 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.6.2 +PYTHON_AIOCONSOLE_VERSION = 0.7.0 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/5f/14/e5c634fad6a95ffd602fbbd1aa107f05a8ffb79d33ec0d0477f3b137f8a9 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/85/da/6a238a72274fa338b2ff20007f026944a6721245fa65d3bd4adeb83be419 PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:12 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:12 +0100 Subject: [Buildroot] [git commit] package/python-alembic: bump to version 1.13.1 Message-ID: <20240205132914.DA41A86C7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa51f4ac41327eb8277938f2e8f5c11c59113cb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new runtime dependencies: - python-sqlalchemy - python-mako - python-typing-extensions Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-alembic/Config.in | 3 +++ package/python-alembic/python-alembic.hash | 4 ++-- package/python-alembic/python-alembic.mk | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/python-alembic/Config.in b/package/python-alembic/Config.in index a53dde7f7f..33fe3c3682 100644 --- a/package/python-alembic/Config.in +++ b/package/python-alembic/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_PYTHON_ALEMBIC bool "python-alembic" + select BR2_PACKAGE_PYTHON_MAKO # runtime + select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Alembic is a database migrations tool written by the author of SQLAlchemy. diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash index df1f4fba02..1f752ebc7e 100644 --- a/package/python-alembic/python-alembic.hash +++ b/package/python-alembic/python-alembic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/alembic/json -md5 642d563af853b317f018026f3edd5dba alembic-1.12.1.tar.gz -sha256 bca5877e9678b454706347bc10b97cb7d67f300320fa5c3a94423e8266e2823f alembic-1.12.1.tar.gz +md5 29579d34ea694627280b52a3d3116664 alembic-1.13.1.tar.gz +sha256 4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595 alembic-1.13.1.tar.gz # Locally computed sha256 checksums sha256 b285268a86f4416eaf4d05b2ae3880c156f7c59a8f935a402bc056eafb33af08 LICENSE diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk index fd41e0df66..52e30e39ba 100644 --- a/package/python-alembic/python-alembic.mk +++ b/package/python-alembic/python-alembic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALEMBIC_VERSION = 1.12.1 +PYTHON_ALEMBIC_VERSION = 1.13.1 PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/44/b4/253fe31261d9f5d603d89bd9e6fba1625494a6d761d319902dfe4db59016 +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/7b/24/ddce068e2ac9b5581bd58602edb2a1be1b0752e1ff2963c696ecdbe0470d PYTHON_ALEMBIC_SETUP_TYPE = setuptools PYTHON_ALEMBIC_LICENSE = MIT PYTHON_ALEMBIC_LICENSE_FILES = LICENSE From bubu at git.sr.ht Mon Feb 5 13:08:32 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 14:08:32 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: add minimalmodbus runtime test Message-ID: <170713978507.21324.6362507954144029814-0@git.sr.ht> From: Marcus Hoffmann Signed-off-by: Marcus Hoffmann --- .../tests/package/sample_python_minimalmodbus.py | 7 +++++++ .../tests/package/test_python_minimalmodbus.py | 11 +++++++++++ 2 files changed, 18 insertions(+) create mode 100644 support/testing/tests/package/sample_python_minimalmodbus.py create mode 100644 support/testing/tests/package/test_python_minimalmodbus.py diff --git a/support/testing/tests/package/sample_python_minimalmodbus.py b/support/testing/tests/package/sample_python_minimalmodbus.py new file mode 100644 index 0000000000..a75145f900 --- /dev/null +++ b/support/testing/tests/package/sample_python_minimalmodbus.py @@ -0,0 +1,7 @@ +import minimalmodbus +from serial.serialutil import SerialException + +try: + instrument = minimalmodbus.Instrument('/dev/ttyUSB99', 1) +except SerialException: + pass diff --git a/support/testing/tests/package/test_python_minimalmodbus.py b/support/testing/tests/package/test_python_minimalmodbus.py new file mode 100644 index 0000000000..53813406de --- /dev/null +++ b/support/testing/tests/package/test_python_minimalmodbus.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Minimalmodbus(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MINIMALMODBUS=y + """ + sample_scripts = ["tests/package/sample_python_minimalmodbus.py"] -- 2.38.5 From thomas.petazzoni at bootlin.com Mon Feb 5 13:32:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 14:32:26 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-tcolorpy: new package In-Reply-To: <20240111030022.2676853-1-james.hilliard1@gmail.com> References: <20240111030022.2676853-1-james.hilliard1@gmail.com> Message-ID: <20240205143226.1aefed76@windsurf> On Wed, 10 Jan 2024 20:00:21 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/Config.in | 1 + > package/python-tcolorpy/Config.in | 7 +++++++ > package/python-tcolorpy/python-tcolorpy.hash | 5 +++++ > package/python-tcolorpy/python-tcolorpy.mk | 14 ++++++++++++++ > 4 files changed, 27 insertions(+) > create mode 100644 package/python-tcolorpy/Config.in > create mode 100644 package/python-tcolorpy/python-tcolorpy.hash > create mode 100644 package/python-tcolorpy/python-tcolorpy.mk Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 13:33:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 14:33:50 +0100 Subject: [Buildroot] [git commit] package/python-pytablewriter: bump to version 1.2.0 Message-ID: <20240205133402.A37FF86C90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f62d1ad32a2d1903840be8416b7d5b5f419fa86e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required python-msgfy runtime dependency. Drop no longer required python-six runtime dependency. Add new python-tcolorpy runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pytablewriter/Config.in | 11 ++++++----- package/python-pytablewriter/python-pytablewriter.hash | 4 ++-- package/python-pytablewriter/python-pytablewriter.mk | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package/python-pytablewriter/Config.in b/package/python-pytablewriter/Config.in index 041c30eb6c..e0252625cd 100644 --- a/package/python-pytablewriter/Config.in +++ b/package/python-pytablewriter/Config.in @@ -2,14 +2,15 @@ config BR2_PACKAGE_PYTHON_PYTABLEWRITER bool "python-pytablewriter" select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime - select BR2_PACKAGE_PYTHON_MSGFY # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime + select BR2_PACKAGE_PYTHON_TCOLORPY # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help - pytablewriter is a python library to write a table in various - formats: CSV, HTML, JavaScript, JSON, Markdown, Excel, Pandas, - Python, reStructuredText. + pytablewriter is a Python library to write a table in + various formats: AsciiDoc / CSV / Elasticsearch / HTML / + JavaScript / JSON / LaTeX / LDJSON / LTSV / Markdown / + MediaWiki / NumPy / Excel / Pandas / Python / + reStructuredText / SQLite / TOML / TSV / YAML. https://github.com/thombashi/pytablewriter diff --git a/package/python-pytablewriter/python-pytablewriter.hash b/package/python-pytablewriter/python-pytablewriter.hash index f082542dfb..d4432ee121 100644 --- a/package/python-pytablewriter/python-pytablewriter.hash +++ b/package/python-pytablewriter/python-pytablewriter.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytablewriter/json -md5 0eaa4a2429d22389b5e4b8c5f5135bbb pytablewriter-0.64.2.tar.gz -sha256 99409d401d6ef5f06d1bc40f265a8e3053afe4cbfbaf709f71124076afb40dbb pytablewriter-0.64.2.tar.gz +md5 4e3d421d026f30fadec4ac1670e524ee pytablewriter-1.2.0.tar.gz +sha256 0204a4bb684a22140d640f2599f09e137bcdc18b3dd49426f4a555016e246b46 pytablewriter-1.2.0.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-pytablewriter/python-pytablewriter.mk b/package/python-pytablewriter/python-pytablewriter.mk index d865a89330..d8bc3615dd 100644 --- a/package/python-pytablewriter/python-pytablewriter.mk +++ b/package/python-pytablewriter/python-pytablewriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEWRITER_VERSION = 0.64.2 +PYTHON_PYTABLEWRITER_VERSION = 1.2.0 PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz -PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/a6/e1/50c1cd9734a9edc1386913b178f9e4757c1bc37665c1855a6596c25957d6 +PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/cc/a9/76aa4430d32ae10b23e4347006dc4c67a3e2a00621e4bb38a60c1a77f15e PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools PYTHON_PYTABLEWRITER_LICENSE = MIT PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 5 13:33:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 14:33:49 +0100 Subject: [Buildroot] [git commit] package/python-tcolorpy: new package Message-ID: <20240205133402.99DAC86C8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5351578b9698021704df06e840047b0b0c7b372b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-tcolorpy/Config.in | 7 +++++++ package/python-tcolorpy/python-tcolorpy.hash | 5 +++++ package/python-tcolorpy/python-tcolorpy.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) diff --git a/package/Config.in b/package/Config.in index ca1368124f..7fc383da83 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1365,6 +1365,7 @@ menu "External python modules" source "package/python-starlette/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" + source "package/python-tcolorpy/Config.in" source "package/python-tempora/Config.in" source "package/python-termcolor/Config.in" source "package/python-terminaltables/Config.in" diff --git a/package/python-tcolorpy/Config.in b/package/python-tcolorpy/Config.in new file mode 100644 index 0000000000..e3e9058483 --- /dev/null +++ b/package/python-tcolorpy/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TCOLORPY + bool "python-tcolorpy" + help + Tcolopy is a Python library to apply true color for + terminal text. + + https://github.com/thombashi/tcolorpy diff --git a/package/python-tcolorpy/python-tcolorpy.hash b/package/python-tcolorpy/python-tcolorpy.hash new file mode 100644 index 0000000000..cf5ca0e5f3 --- /dev/null +++ b/package/python-tcolorpy/python-tcolorpy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tcolorpy/json +md5 ca571cccff812ecdc0c73968c9d24ebf tcolorpy-0.1.4.tar.gz +sha256 f0dceb1cb95e554cee63024b3cd2fd8d4628c568773de2d1e6b4f0478461901c tcolorpy-0.1.4.tar.gz +# Locally computed sha256 checksums +sha256 f41a0456d5f2bba25fd4d7e50b51a95de304770ff1db5a79515d03397a914d8d LICENSE diff --git a/package/python-tcolorpy/python-tcolorpy.mk b/package/python-tcolorpy/python-tcolorpy.mk new file mode 100644 index 0000000000..5c42320c17 --- /dev/null +++ b/package/python-tcolorpy/python-tcolorpy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-tcolorpy +# +################################################################################ + +PYTHON_TCOLORPY_VERSION = 0.1.4 +PYTHON_TCOLORPY_SOURCE = tcolorpy-$(PYTHON_TCOLORPY_VERSION).tar.gz +PYTHON_TCOLORPY_SITE = https://files.pythonhosted.org/packages/ba/e0/20b99847e76bb89784b68634399261d770b01054bca16cd19a06ac9c2e67 +PYTHON_TCOLORPY_SETUP_TYPE = setuptools +PYTHON_TCOLORPY_LICENSE = MIT +PYTHON_TCOLORPY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From buildroot at bubu1.eu Mon Feb 5 13:34:05 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 14:34:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-starlette: bump to version 0.34.0 In-Reply-To: <87sf27upph.fsf@48ers.dk> References: <20240111072922.3082638-1-james.hilliard1@gmail.com> <87sf27upph.fsf@48ers.dk> Message-ID: <42594955-dcd4-4161-9a84-879f096d49f7@bubu1.eu> Hi Peter, On 05.02.24 12:15, Peter Korsgaard wrote: >>>>>> "James" == James Hilliard writes: > > > Signed-off-by: James Hilliard > > Committed, thanks. > We currently have fastapi 0.105.0 in buildroot which depends on starlette < 0.28.0. There's a pending patch by James that bumps it to 0.108.0, which unfortunately is also not compatible with starlette 0.34.0 [1] :-/ In fact there's no fastapi release that is compatible with starlette 0.34.0 (newer fastapi releases require even newer starlette versions...) I guess I'll send a series that bumps *both* again to compatible versions? Marcus [1] https://github.com/tiangolo/fastapi/blob/0.108.0/pyproject.toml#L43C27-L43C29 From romain.naour at smile.fr Mon Feb 5 13:35:30 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 14:35:30 +0100 Subject: [Buildroot] [PATCH] support/testing: TestGrubX8664EFI: use Nehalem cpu emulation Message-ID: <20240205133530.1188319-1-romain.naour@smile.fr> Following the Bootlin toolchain bump to 2023.11-1 [1], the TestGrubX8664EFI failed with this error: # efivar -l traps: efivar[86] trap invalid opcode ip:7fc187f4c7f4 sp:7fff9bbaa930 error:0 in libefivar.so.1.38[7fc187f4c000+16000] Illegal instruction Actually this error can be reproduced by installing other packages like "file" because the qemu emulation doesn't provide all assembler instruction emulation required by x86-64-core-i7 target used by TestGrubX8664EFI. A similar issue has been fixed in toolchain-builder by adding Nehalem cpu emulation on the qemu command line [2]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 [1] 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 [2] https://gitlab.com/buildroot.org/toolchains-builder/-/commit/f2b253732b4d1fc5b87badba7c2d48f12a197f76 Signed-off-by: Romain Naour --- support/testing/tests/boot/test_grub.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py index 9f3a6a8495..5315fa23ba 100644 --- a/support/testing/tests/boot/test_grub.py +++ b/support/testing/tests/boot/test_grub.py @@ -120,7 +120,7 @@ class TestGrubX8664EFI(infra.basetest.BRTest): # https://github.com/tianocore/edk2/commit/bf5678b5802685e07583e3c7ec56d883cbdd5da3 # http://lists.busybox.net/pipermail/buildroot/2023-July/670825.html qemu_fw_cfg = "name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes" - self.emulator.boot(arch="x86_64", options=["-bios", bios, "-hda", hda, "-fw_cfg", qemu_fw_cfg]) + self.emulator.boot(arch="x86_64", options=["-bios", bios, "-cpu", "Nehalem", "-hda", hda, "-fw_cfg", qemu_fw_cfg]) self.emulator.login() cmd = "modprobe efivarfs" -- 2.43.0 From buildroot at bubu1.eu Mon Feb 5 13:38:12 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 14:38:12 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package In-Reply-To: <170712853287.18164.6368517214119629150-0@git.sr.ht> References: <170712853287.18164.6368517214119629150-0@git.sr.ht> Message-ID: <02f46330-bc2b-4dec-a933-0e086db94f2c@bubu1.eu> Forgot my SoB On 21.09.23 22:39, ~bubu wrote: > From: Marcus Hoffmann > > Calling `setup.py` build builds and installs an empty package > after upstream changed their packaging. Calling setuptools via > `python -m build` builds the package correctly. Signed-off-by: Marcus Hoffmann > --- > package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk > index 5a6e7733be..cb8a0d8cc9 100644 > --- a/package/python-minimalmodbus/python-minimalmodbus.mk > +++ b/package/python-minimalmodbus/python-minimalmodbus.mk > @@ -7,7 +7,8 @@ > PYTHON_MINIMALMODBUS_VERSION = 2.1.1 > PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz > PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 > -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools > +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools > +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 > PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 > PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE > From yann.morin.1998 at free.fr Mon Feb 5 13:47:40 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 14:47:40 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package In-Reply-To: <02f46330-bc2b-4dec-a933-0e086db94f2c@bubu1.eu> References: <170712853287.18164.6368517214119629150-0@git.sr.ht> <02f46330-bc2b-4dec-a933-0e086db94f2c@bubu1.eu> Message-ID: Marcus, All, On 2024-02-05 14:38 +0100, Marcus Hoffmann via buildroot spake thusly: > Forgot my SoB > On 21.09.23 22:39, ~bubu wrote: > > From: Marcus Hoffmann > > Calling `setup.py` build builds and installs an empty package > > after upstream changed their packaging. Calling setuptools via > > `python -m build` builds the package correctly. > Signed-off-by: Marcus Hoffmann Thanks. However, the SoB line needs to match the author of the commit, and that does not match: Author: Marcus Hoffmann Signed-off-by: Marcus Hoffmann Regards, Yann E. MORIN. > > --- > > package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk > > index 5a6e7733be..cb8a0d8cc9 100644 > > --- a/package/python-minimalmodbus/python-minimalmodbus.mk > > +++ b/package/python-minimalmodbus/python-minimalmodbus.mk > > @@ -7,7 +7,8 @@ > > PYTHON_MINIMALMODBUS_VERSION = 2.1.1 > > PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz > > PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 > > -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools > > +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools > > +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 > > PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 > > PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From asd617140123 at gmail.com Mon Feb 5 13:58:31 2024 From: asd617140123 at gmail.com (Nigel Wang) Date: Mon, 5 Feb 2024 21:58:31 +0800 Subject: [Buildroot] [PATCH 1/1] board/cubietech/cubieboard4 : Add config file for cubieboard4. Message-ID: <20240205135831.34656-1-asd617140123@gmail.com> From: nigel_wang This is a new defconfig for cubieboard4. The following is board's detail. - SOC: sunxiA80. - DRAM: 2GiB DDR3 @ 672MHZ. - NAND: 8GBeMMC - Power: DC 5V. - Network: Wifi 80211 b/g/n. - Ethernet: RTL8211E reference: https://linux-sunxi.org/Cubietech_Cubieboard4 Board support package includes the following components: - mainline Linux Kernel 6.6.8 - mainline U-boot 2021.10. Signed-off-by: Nigel Wang --- v3 -> v4 * squash all commit, make the commit log is clear. v2 -> v3 * Add BR2_cortex_a15_a7=y in buildroot defconfig. * Bump linux version to 6.6.8 * Using sunxi_defconfig in kernel. * Using "make savedefconfig" to save defconfig, it can only save the changed config in buildroot. * Change kernel's path in extlinux. Make it can boot up successfully. --- board/cubietech/cubieboard4/boot.cmd | 5 +++ board/cubietech/cubieboard4/extlinux.conf | 5 +++ board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 board/cubietech/cubieboard4/boot.cmd create mode 100644 board/cubietech/cubieboard4/extlinux.conf create mode 100644 board/cubietech/cubieboard4/genimage.cfg create mode 100755 board/cubietech/cubieboard4/post-image.sh create mode 100644 configs/cubieboard4_defconfig diff --git a/board/cubietech/cubieboard4/boot.cmd b/board/cubietech/cubieboard4/boot.cmd new file mode 100644 index 0000000000..6521243696 --- /dev/null +++ b/board/cubietech/cubieboard4/boot.cmd @@ -0,0 +1,5 @@ +setenv fdt_high ffffffff +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +fatload mmc 0 $kernel_addr_r zImage +fatload mmc 0 $fdt_addr_r sun9i-a80-cubieboard4.dtb +bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf new file mode 100644 index 0000000000..5084e2237b --- /dev/null +++ b/board/cubietech/cubieboard4/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /boot/zImage + devicetree /sun9i-a80-cubieboard4.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg new file mode 100644 index 0000000000..f1dee13923 --- /dev/null +++ b/board/cubietech/cubieboard4/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the Cubieboard2 +# Based in the Orange Pi genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun9i-a80-cubieboard4.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh new file mode 100755 index 0000000000..e37b960a4d --- /dev/null +++ b/board/cubietech/cubieboard4/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig new file mode 100644 index 0000000000..0592fe4a2d --- /dev/null +++ b/configs/cubieboard4_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 5 14:10:27 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 15:10:27 +0100 Subject: [Buildroot] [v1 4/4] configs: add raspberrypi 5 defconfig In-Reply-To: <20231121193448.1151936-5-gael.portay@rtone.fr> References: <20231121193448.1151936-1-gael.portay@rtone.fr> <20231121193448.1151936-5-gael.portay@rtone.fr> Message-ID: Hi Ga?l, On 21/11/23 20:34, Ga?l PORTAY wrote: > This configuration builds an image for the RaspberryPi 5. can you please point an URL to the product page and briefly description of the board? > Signed-off-by: Ga?l PORTAY > --- > board/raspberrypi/cmdline_5.txt | 1 + > board/raspberrypi/config_5.txt | 24 ++++++++++++++++++++ > board/raspberrypi/readme.txt | 8 ++++++- > board/raspberrypi5 | 1 + > configs/raspberrypi5_defconfig | 39 +++++++++++++++++++++++++++++++++ > 5 files changed, 72 insertions(+), 1 deletion(-) > create mode 100644 board/raspberrypi/cmdline_5.txt > create mode 100644 board/raspberrypi/config_5.txt > create mode 120000 board/raspberrypi5 > create mode 100644 configs/raspberrypi5_defconfig > > diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt > new file mode 100644 > index 0000000000..ac457353e2 > --- /dev/null > +++ b/board/raspberrypi/cmdline_5.txt > @@ -0,0 +1 @@ > +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 > diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt > new file mode 100644 > index 0000000000..d25c29558d > --- /dev/null > +++ b/board/raspberrypi/config_5.txt > @@ -0,0 +1,24 @@ > +# Please note that this is only a sample, we recommend you to change it to fit > +# your needs. > +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. > +# See http://buildroot.org/manual.html#rootfs-custom > +# and http://elinux.org/RPiconfig for a description of config.txt syntax > + > +kernel=Image > + > +# To use an external initramfs file > +#initramfs rootfs.cpio.gz > + > +# Disable overscan assuming the display supports displaying the full resolution > +# If the text shown on the screen disappears off the edge, comment this out > +disable_overscan=1 > + > +# How much memory in MB to assign to the GPU on Pi models having > +# 256, 512 or 1024 MB total memory > +gpu_mem_256=100 > +gpu_mem_512=100 > +gpu_mem_1024=100 > + > +dtoverlay=vc4-kms-v3d-pi5 > +dtoverlay=imx219 > +#dtoverlay=ov5647 please drop this last line ^^^ > diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt > index c81fd801ae..4bdd7b3e8c 100644 > --- a/board/raspberrypi/readme.txt > +++ b/board/raspberrypi/readme.txt > @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: > - the model B3 (aka Raspberry Pi 3). > - the model B4 (aka Raspberry Pi 4). > - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). > + - the model B5 (aka Raspberry Pi 5). > > How to build it > =============== > @@ -17,7 +18,7 @@ How to build it > Configure Buildroot > ------------------- > > -There are two RaspberryPi defconfig files in Buildroot, one for each > +There are serveral RaspberryPi defconfig files in Buildroot, one for each > major variant, which you should base your work on: > > For models A, B, A+ or B+: > @@ -60,6 +61,10 @@ or for CM4 (on IO Board - 64 bit): > > $ make raspberrypicm4io_64_defconfig > > +For model 5 B (64 bit): > + > + $ make raspberrypi5_64_defconfig > + > Build the rootfs > ---------------- > > @@ -90,6 +95,7 @@ After building, you should obtain this tree: > +-- bcm2710-rpi-cm3.dtb [1] > +-- bcm2711-rpi-4-b.dtb [1] > +-- bcm2711-rpi-cm4.dtb [1] > + +-- bcm2712-rpi-5-b.dtb [1] > +-- bcm2837-rpi-3-b.dtb [1] > +-- boot.vfat > +-- rootfs.ext4 > diff --git a/board/raspberrypi5 b/board/raspberrypi5 > new file mode 120000 > index 0000000000..fcdafc81ed > --- /dev/null > +++ b/board/raspberrypi5 > @@ -0,0 +1 @@ > +raspberrypi > \ No newline at end of file Please add newline > diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig > new file mode 100644 > index 0000000000..391df9696a > --- /dev/null > +++ b/configs/raspberrypi5_defconfig > @@ -0,0 +1,39 @@ > +BR2_aarch64=y > +BR2_cortex_a76_a55=y I've found that BCM2712 is a quad-cortex A76 and not A76+A55, so if I'm correct with BCM2712 on Raspberry 5 SoC model you should enable: BR2_cortex_a76=y > +BR2_ARM_FPU_VFPV4=y I can't find informations on which type of FPU implementation BCM2712 has but here: https://en.wikipedia.org/wiki/Raspberry_Pi I see: that all Raspberry up to version 4 support VFPV4 so it makes sense to enable VFPV4. Have you tested some package that uses FPU extensively? > +BR2_ARM64_PAGE_SIZE_16K=y > + > +BR2_TOOLCHAIN_BUILDROOT_CXX=y Is there a reason for CXX to be added? > + > +BR2_SYSTEM_DHCP="eth0" > + > +# Linux headers same as kernel, a 6.1 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > + > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" > + > +# Build the DTB from the kernel sources > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" > + > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_RPI_FIRMWARE=y > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Feb 5 14:20:21 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 15:20:21 +0100 Subject: [Buildroot] [PATCH 1/1] board/cubietech/cubieboard4 : Add config file for cubieboard4. In-Reply-To: <20240205135831.34656-1-asd617140123@gmail.com> References: <20240205135831.34656-1-asd617140123@gmail.com> Message-ID: Hi Nigel, On 05/02/24 14:58, Nigel Wang wrote: > From: nigel_wang > > This is a new defconfig for cubieboard4. The following is board's > detail. > - SOC: sunxiA80. > - DRAM: 2GiB DDR3 @ 672MHZ. > - NAND: 8GBeMMC > - Power: DC 5V. > - Network: Wifi 80211 b/g/n. > - Ethernet: RTL8211E > reference: > https://linux-sunxi.org/Cubietech_Cubieboard4 > > Board support package includes the following components: > - mainline Linux Kernel 6.6.8 > - mainline U-boot 2021.10. > > Signed-off-by: Nigel Wang > --- > v3 -> v4 > * squash all commit, make the commit log is clear. > > v2 -> v3 > * Add BR2_cortex_a15_a7=y in buildroot defconfig. > * Bump linux version to 6.6.8 > * Using sunxi_defconfig in kernel. > * Using "make savedefconfig" to save defconfig, it can only save the > changed config in buildroot. > * Change kernel's path in extlinux. Make it can boot up successfully. > > --- > board/cubietech/cubieboard4/boot.cmd | 5 +++ > board/cubietech/cubieboard4/extlinux.conf | 5 +++ > board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ > board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ > configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ > 5 files changed, 105 insertions(+) > create mode 100644 board/cubietech/cubieboard4/boot.cmd > create mode 100644 board/cubietech/cubieboard4/extlinux.conf > create mode 100644 board/cubietech/cubieboard4/genimage.cfg > create mode 100755 board/cubietech/cubieboard4/post-image.sh > create mode 100644 configs/cubieboard4_defconfig > > diff --git a/board/cubietech/cubieboard4/boot.cmd b/board/cubietech/cubieboard4/boot.cmd > new file mode 100644 > index 0000000000..6521243696 > --- /dev/null > +++ b/board/cubietech/cubieboard4/boot.cmd > @@ -0,0 +1,5 @@ > +setenv fdt_high ffffffff > +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > +fatload mmc 0 $kernel_addr_r zImage > +fatload mmc 0 $fdt_addr_r sun9i-a80-cubieboard4.dtb > +bootz $kernel_addr_r - $fdt_addr_r since now you've added extlinux.conf you can drop boot.cmd file above ^^^ > diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf > new file mode 100644 > index 0000000000..5084e2237b > --- /dev/null > +++ b/board/cubietech/cubieboard4/extlinux.conf > @@ -0,0 +1,5 @@ > +label linux > + kernel /boot/zImage > + devicetree /sun9i-a80-cubieboard4.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > + > diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg > new file mode 100644 > index 0000000000..f1dee13923 > --- /dev/null > +++ b/board/cubietech/cubieboard4/genimage.cfg > @@ -0,0 +1,38 @@ > +# Minimal SD card image for the Cubieboard2 > +# Based in the Orange Pi genimage.cfg > + > +image boot.vfat { > + vfat { > + files = { > + "zImage", > + "sun9i-a80-cubieboard4.dtb", > + "extlinux" > + } > + } > + > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1016K # 1MB - 8KB > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 512M > + } > +} > diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh > new file mode 100755 > index 0000000000..e37b960a4d > --- /dev/null > +++ b/board/cubietech/cubieboard4/post-image.sh > @@ -0,0 +1,18 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf > + > +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > + > +rm -rf "${GENIMAGE_TMP}" > + > +genimage \ > + --rootpath "${TARGET_DIR}" \ > + --tmppath "${GENIMAGE_TMP}" \ > + --inputpath "${BINARIES_DIR}" \ > + --outputpath "${BINARIES_DIR}" \ > + --config "${GENIMAGE_CFG}" > + > +exit $? > diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig > new file mode 100644 > index 0000000000..0592fe4a2d > --- /dev/null > +++ b/configs/cubieboard4_defconfig > @@ -0,0 +1,39 @@ > +# Architecture > +BR2_arm=y > +BR2_cortex_a15_a7=y > +BR2_ARM_FPU_NEON_VFPV4=y > + > +# System > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y You need to add your entry in DEVELOPERS file as this board maintainer. When sending next patch please tag it as V2 with: $ git format-patch -s -M -o . -1 -v2 Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Mon Feb 5 14:27:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:27:05 +0100 Subject: [Buildroot] [git commit] package/sysstat: update upstream location Message-ID: <20240205142727.38F9D86C99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35a2cb02277acae94f018a0d22138dc9de005fdf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The http://pagesperso-orange.fr service being down, http://pagesperso-orange.fr/sebastien.godard/ is no longer accessible (or more precisely serves some HTML junk), meaning that we currently cannot download the tarball of sysstat from the official upstream location, and we always fallback to sources.buildroot.net. This commit therefore updates to use the new upstream location on github.io. The 12.6.1 release is available there, with the same hash, so we can just point to the new upstream location. Fixes: ERROR: while checking hashes from package/sysstat//sysstat.hash ERROR: sysstat-12.6.1.tar.xz has wrong sha1 hash: ERROR: expected: a730982e0c2d4964a0022c1509f3ea0a345402bc ERROR: got : d64a079729f2ff5b304294d68fbc041a46c4966d ERROR: Incomplete download, or man-in-the-middle (MITM) attack Signed-off-by: Thomas Petazzoni --- package/sysstat/Config.in | 2 +- package/sysstat/sysstat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in index 442b787684..efb640fd43 100644 --- a/package/sysstat/Config.in +++ b/package/sysstat/Config.in @@ -36,4 +36,4 @@ config BR2_PACKAGE_SYSSTAT * TTY device activity * Power management statistics - http://pagesperso-orange.fr/sebastien.godard/ + https://sysstat.github.io/ diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index ca05ec50d8..ec0c666157 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -6,7 +6,7 @@ SYSSTAT_VERSION = 12.6.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz -SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard +SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ From sebastien.szymanski at armadeus.com Mon Feb 5 14:20:06 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Mon, 5 Feb 2024 15:20:06 +0100 Subject: [Buildroot] [PATCH] configs/imx8mpevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20240115105827.3179346-1-festevam@gmail.com> References: <20240115105827.3179346-1-festevam@gmail.com> Message-ID: <397f4464-2f02-4b7f-b71f-ca38f950fa7f@armadeus.com> Hi Fabio, All, On 1/15/24 11:58, Fabio Estevam wrote: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > > include/image.h:1394:12: fatal error: openssl/evp.h: No such file or directory > 1394 | # include > > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180070 > Signed-off-by: Fabio Estevam > --- > configs/freescale_imx8mpevk_defconfig | 1 + > 1 file changed, 1 insertion(+) > I confirmed this patch fixes the build error mentioned: Tested-By: S?bastien Szymanski Regards, > diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig > index 82ed68c5a9f1..2aed04848265 100644 > --- a/configs/freescale_imx8mpevk_defconfig > +++ b/configs/freescale_imx8mpevk_defconfig > @@ -29,6 +29,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1 > 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 > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y > BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -- S?bastien Szymanski, Armadeus Systems Software engineer From thomas.petazzoni at bootlin.com Mon Feb 5 14:34:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:34:09 +0100 Subject: [Buildroot] [PATCH 2/3] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 6}.x series In-Reply-To: <20240115214137.2350453-3-petr.vorel@gmail.com> References: <20240115214137.2350453-1-petr.vorel@gmail.com> <20240115214137.2350453-3-petr.vorel@gmail.com> Message-ID: <20240205153409.042e2be1@windsurf> Hello Petr, On Mon, 15 Jan 2024 22:41:36 +0100 Petr Vorel wrote: > # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc > -sha256 afe2e5a661bb886d762684ebea71607d1ee8cb9dd100279d2810ba20d9671e52 linux-6.6.11.tar.xz > -sha256 98dce69077c35cffca799dcdbbd32a02242aad6b0950eb931936bb2ef69f0926 linux-6.1.72.tar.xz > +sha256 1fd7ec8c3d9c4e4b3a41d11e2c6d151e5fbf875dd08b3577f73afd6ee6674605 linux-6.6.12.tar.xz > +sha256 6cad48706bf1cde342613dca2a2cd6dd4f79f88f9e4d356263564e4b2a5d7e87 linux-6.1.73.tar.xz > # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc > -sha256 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192 linux-5.15.146.tar.xz > -sha256 86ace9892296bf1534d574894edd27614b68de4085c03fd3f60121751a334f1b linux-5.10.207.tar.xz > -sha256 da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6 linux-5.4.266.tar.xz > +sha256 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 linux-5.15.147.tar.xz > +sha256 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e linux-5.10.208.tar.xz > +sha256 42d28def2cc1502251edbfeaca3b25ee764ad1e471b6c703ccb2267f38471c43 linux-5.4.267.tar.xz > # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc > -sha256 cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598 linux-4.19.304.tar.xz > +sha256 da82425c7410623dfb2405915347ee9617fc0e33a63ca821c33aeed160cddae8 linux-4.19.305.tar.xz Many of these bumps already took place (because we were too slow to apply your patch), but some did not (like the 5.15.x bump). Could you resubmit on top of master? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 14:37:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 15:37:34 +0100 Subject: [Buildroot] [git commit] package/python-minimalmodbus: fix empty package Message-ID: <20240205143757.E6FC386CA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7e45215a4faaef8d6eb993b38d5a70ad7d309b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Calling `setup.py` build builds and installs an empty package after upstream changed their packaging. Calling setuptools via `python -m build` builds the package correctly. Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk index 5a6e7733be..cb8a0d8cc9 100644 --- a/package/python-minimalmodbus/python-minimalmodbus.mk +++ b/package/python-minimalmodbus/python-minimalmodbus.mk @@ -7,7 +7,8 @@ PYTHON_MINIMALMODBUS_VERSION = 2.1.1 PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 14:38:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:38:05 +0100 Subject: [Buildroot] [PATCH v6 1/3] package/cairo: bump to 1.17.4 In-Reply-To: <20240107105539.1214363-1-thomas@devoogdt.com> (Thomas Devoogdt's message of "Sun, 7 Jan 2024 11:55:37 +0100") References: <20240105101105.6a181dcd@windsurf> <20240107105539.1214363-1-thomas@devoogdt.com> Message-ID: <874jent1rm.fsf@48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > News: > - https://www.cairographics.org/news/cairo-1.17.2/ > - https://www.cairographics.org/news/cairo-1.17.4/ > !! This is a bump to a snapshot release: 1.17.4. > But it is the first version that supports meson, > and the only version that supports both meson and autotools. > This is just an intermediate bump in order to > switch over to meson in a later commit. > Patches: > - drop 0001-fix-nofork-build.patch, upstream: [1] > - drop > 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch, > upstream: [2] > - add 0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch, upstream: [3] > [1]: > https://gitlab.freedesktop.org/cairo/cairo/-/commit/cb2357f481396820ec954dc4b69eafc01a8d162a > [2]: > https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645 > [3]: https://gitlab.freedesktop.org/cairo/cairo/-/issues/792 > Signed-off-by: Thomas Devoogdt > --- > v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ > --- > ...r_tolerance_normalized-fix-infinite.patch} | 0 > package/cairo/0001-fix-nofork-build.patch | 29 ---------------- > ...-Fix-mask-usage-in-image-compositor.patch} | 0 > ...vailable-in-cairo_ft_apply_variation.patch | 33 ------------------- > ...private.h-fix-missing-FT_Color-error.patch | 32 ++++++++++++++++++ > package/cairo/cairo.hash | 6 ++-- > package/cairo/cairo.mk | 10 +++--- You forgot to update the .checkpackageignore file. Committed with that fixed, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Mon Feb 5 14:39:20 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 15:39:20 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package In-Reply-To: <170712853287.18164.6368517214119629150-0@git.sr.ht> References: <170712853287.18164.6368517214119629150-0@git.sr.ht> Message-ID: Marcus, All, On 2023-09-21 22:39 +0200, ~bubu spake thusly: > From: Marcus Hoffmann > > Calling `setup.py` build builds and installs an empty package > after upstream changed their packaging. Calling setuptools via > `python -m build` builds the package correctly. Applied to master, after fixing the authroship and Sob as we discussed IRL, thanks. Regards, Yann E. MORIN. > --- > package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk > index 5a6e7733be..cb8a0d8cc9 100644 > --- a/package/python-minimalmodbus/python-minimalmodbus.mk > +++ b/package/python-minimalmodbus/python-minimalmodbus.mk > @@ -7,7 +7,8 @@ > PYTHON_MINIMALMODBUS_VERSION = 2.1.1 > PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz > PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 > -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools > +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools > +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 > PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 > PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE > > -- > 2.38.5 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Feb 5 14:41:53 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 15:41:53 +0100 Subject: [Buildroot] [PATCH 1/1] configs/rzboard_v2L_defconfig: new defconfig In-Reply-To: <20231130223101.132221-1-kilian.zinnecker@mail.de> References: <20231130223101.132221-1-kilian.zinnecker@mail.de> Message-ID: <40167f4d-5e01-4801-a735-e797c725f82c@benettiengineering.com> Hi Kilian, On 30/11/23 23:31, Frager, Neal via buildroot wrote: > From: Kilian Zinnecker > > This patch adds support for the AVNET RZBoard V2L. > > The board support creates a bootable sd card image. The board is > shipped with a u-boot inside its eMMC. The board support uses this > u-boot and does not build and deploy a u-boot onto the sd card. > Instead the sd card only contains a uEnv.txt, a kernel image and > the rootfs. Can you please add the board's URL like: https://embedded.avnet.com/product/rzboard-v2l/ ? > > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 2 + > board/avnet/rzboard_v2l/genimage.cfg | 30 ++++++++++++ > board/avnet/rzboard_v2l/post-image.sh | 5 ++ > board/avnet/rzboard_v2l/readme.txt | 69 +++++++++++++++++++++++++++ > board/avnet/rzboard_v2l/uEnv.txt | 3 ++ > configs/rzboard_v2l_defconfig | 19 ++++++++ > 6 files changed, 128 insertions(+) > create mode 100644 board/avnet/rzboard_v2l/genimage.cfg > create mode 100755 board/avnet/rzboard_v2l/post-image.sh > create mode 100644 board/avnet/rzboard_v2l/readme.txt > create mode 100644 board/avnet/rzboard_v2l/uEnv.txt > create mode 100644 configs/rzboard_v2l_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index 1f26e9bc81..794e0a5d91 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1842,7 +1842,9 @@ F: package/libcamera/ > N: Kilian Zinnecker > F: package/rockchip-rkbin/ > F: configs/rock5b_defconfig > +F: configs/rzboard_v2l_defconfig > F: board/radxa/rock5b/ > +F: board/avnet/rzboard_v2l/ Here ^^^ please swap the 2 lines above for alphabetic order, > > N: Klaus Heinrich Kiwi > F: package/wqy-zenhei/ > diff --git a/board/avnet/rzboard_v2l/genimage.cfg b/board/avnet/rzboard_v2l/genimage.cfg > new file mode 100644 > index 0000000000..af4ee7cd86 > --- /dev/null > +++ b/board/avnet/rzboard_v2l/genimage.cfg > @@ -0,0 +1,30 @@ > +# SD card image for RZBoard V2L > + > +image boot.vfat { > + vfat { > + files = { > + "Image", > + "rzboard.dtb", > + "uEnv.txt" > + } > + } > + size = 24M > +} > + > +image sdcard.img { > + hdimage { > + partition-table-type = "hybrid" > + } > + > + partition boot { > + partition-type = "0xC" > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext2" > + size = 64M You can remove the size if it's not strictly necessary, it will be 64M anyway because rootfs.ext2 is defined in board's defconfig, > + } > +} > diff --git a/board/avnet/rzboard_v2l/post-image.sh b/board/avnet/rzboard_v2l/post-image.sh > new file mode 100755 > index 0000000000..25bef8f793 > --- /dev/null > +++ b/board/avnet/rzboard_v2l/post-image.sh > @@ -0,0 +1,5 @@ > +#!/usr/bin/env bash > +set -e > + > +cp board/avnet/rzboard_v2l/uEnv.txt "${BINARIES_DIR}" > +support/scripts/genimage.sh -c board/avnet/rzboard_v2l/genimage.cfg > diff --git a/board/avnet/rzboard_v2l/readme.txt b/board/avnet/rzboard_v2l/readme.txt > new file mode 100644 > index 0000000000..0f1efd2812 > --- /dev/null > +++ b/board/avnet/rzboard_v2l/readme.txt > @@ -0,0 +1,69 @@ > +RZBoard V2L > +=========== > +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ This ^^^ is the URL to be added to commit log > + > +This board support creates a bootable sd card image for the AVNET RZBoard V2L. > +This board is shipped with a u-boot inside its eMMC. This board support uses > +that u-boot and only puts uEnv.txt, kernel image and rootfs onto the sd card. > + > +Build: > +====== > + $ make rzboard_v2l_defconfig > + $ make > + > +Files created in output directory > +================================= > + > +output/images > +. > +??? Image > +??? boot.vfat > +??? rootfs.ext2 > +??? rootfs.ext4 > +??? rootfs.tar > +??? rzboard.dtb > +??? sdcard.img > +??? uEnv.txt > + > +Creating bootable SD card: > +========================== > + > +Simply invoke (as root) > + > +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync > + > +Where X is your SD card device. > + > +Booting: > +======== > + > +Configure board for sd card boot: > +--------------------------------- > +Set the 'BOOT1' switch (next to the audio jack) to '1' (away from 'ON') in > +order to let the board boot kernel and rootfs from SD card. > + > +Serial console: > +--------------- > +The RZBoard V2L has a 4-pin header "J19" right next to the micro USB. Its > +layout can be seen in the Quick-Start Guide, or the Hardware User Guide, > +obtainable from: > +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ > + > +The uart pins are as follows (from left to right - orientation according to the > +board's labeling): > + > +pin 1: n/a (most away from the board's corner) > +pin 2: tx > +pin 3: rx > +pin 4: gnd (nearest to the board's corner) > + > +Baudrate for this board is 115200. > + > +Power-Up: > +--------- > +Plug in a suitable USB-C power supply and press the button 'S1' (next to the > +USB-C port) for 2 seconds until the LED goes on. > + > +Login: > +------ > +Enter 'root' as login user, and the prompt is ready. > diff --git a/board/avnet/rzboard_v2l/uEnv.txt b/board/avnet/rzboard_v2l/uEnv.txt > new file mode 100644 > index 0000000000..28b8acb8c6 > --- /dev/null > +++ b/board/avnet/rzboard_v2l/uEnv.txt > @@ -0,0 +1,3 @@ > +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} > +uenvcmd=fatload mmc 0:1 ${kernel_addr_r} Image; fatload mmc 0:1 ${fdt_addr_r} rzboard.dtb > +bootargs=root=/dev/mmcblk0p2 rw rootfstype=ext4 earlyprintk console=ttyS0,115200 rootwait earlycon clk_ignore_unused debug > diff --git a/configs/rzboard_v2l_defconfig b/configs/rzboard_v2l_defconfig > new file mode 100644 > index 0000000000..29f38cb2aa > --- /dev/null > +++ b/configs/rzboard_v2l_defconfig > @@ -0,0 +1,19 @@ > +BR2_aarch64=y > +BR2_cortex_a55=y > +BR2_KERNEL_HEADERS_5_10=y > +BR2_TARGET_GENERIC_HOSTNAME="rzboard_v2l" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the AVNET RZBoard V2L" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/avnet/rzboard_v2l/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Avnet/renesas-linux-cip.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c197622df526c82ae9e3674e06b4092dac33eafa" > +BR2_LINUX_KERNEL_DEFCONFIG="rzboard" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="renesas/rzboard" > +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y Do we actually need DTB_OVERLAY_SUPPORT in this defconfig? I mean, are there any overlay dtbo files that are dynamically applied? If not please drop the line above Here you also need: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y Wait for V2 patch then. Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From yann.morin.1998 at free.fr Mon Feb 5 14:43:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 15:43:30 +0100 Subject: [Buildroot] [git commit] configs/imx8mpevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20240205144352.6193686CA8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bce4fe6d1bc8a71918e3d862ebf85d342bf535b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1394:12: fatal error: openssl/evp.h: No such file or directory 1394 | # include Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180070 Signed-off-by: Fabio Estevam Tested-By: S??bastien Szymanski Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mpevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 82ed68c5a9..2aed048482 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -29,6 +29,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1 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 +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From yann.morin.1998 at free.fr Mon Feb 5 14:44:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 15:44:06 +0100 Subject: [Buildroot] [PATCH] configs/imx8mpevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20240115105827.3179346-1-festevam@gmail.com> References: <20240115105827.3179346-1-festevam@gmail.com> Message-ID: Fabio, All, On 2024-01-15 07:58 -0300, Fabio Estevam spake thusly: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > > include/image.h:1394:12: fatal error: openssl/evp.h: No such file or directory > 1394 | # include > > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180070 > Signed-off-by: Fabio Estevam Applied to master, thanks. Regards, Yann E. MORIN. > --- > configs/freescale_imx8mpevk_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig > index 82ed68c5a9f1..2aed04848265 100644 > --- a/configs/freescale_imx8mpevk_defconfig > +++ b/configs/freescale_imx8mpevk_defconfig > @@ -29,6 +29,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1 > 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 > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y > BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Feb 5 14:45:32 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 15:45:32 +0100 Subject: [Buildroot] [PATCH 1/1] configs/rzboard_v2L_defconfig: new defconfig In-Reply-To: <40167f4d-5e01-4801-a735-e797c725f82c@benettiengineering.com> References: <20231130223101.132221-1-kilian.zinnecker@mail.de> <40167f4d-5e01-4801-a735-e797c725f82c@benettiengineering.com> Message-ID: <370ba5b2-0b0b-42a5-90c7-d38044d805d9@benettiengineering.com> Forgotten to mention, see below, On 05/02/24 15:41, Giulio Benetti wrote: > Hi Kilian, > > On 30/11/23 23:31, Frager, Neal via buildroot wrote: >> From: Kilian Zinnecker >> >> This patch adds support for the AVNET RZBoard V2L. >> >> The board support creates a bootable sd card image. The board is >> shipped with a u-boot inside its eMMC. The board support uses this >> u-boot and does not build and deploy a u-boot onto the sd card. >> Instead the sd card only contains a uEnv.txt, a kernel image and >> the rootfs. > > Can you please add the board's URL like: > https://embedded.avnet.com/product/rzboard-v2l/ > ? > >> >> Signed-off-by: Kilian Zinnecker >> --- >> ? DEVELOPERS??????????????????????????? |? 2 + >> ? board/avnet/rzboard_v2l/genimage.cfg? | 30 ++++++++++++ >> ? board/avnet/rzboard_v2l/post-image.sh |? 5 ++ >> ? board/avnet/rzboard_v2l/readme.txt??? | 69 +++++++++++++++++++++++++++ >> ? board/avnet/rzboard_v2l/uEnv.txt????? |? 3 ++ >> ? configs/rzboard_v2l_defconfig???????? | 19 ++++++++ >> ? 6 files changed, 128 insertions(+) >> ? create mode 100644 board/avnet/rzboard_v2l/genimage.cfg >> ? create mode 100755 board/avnet/rzboard_v2l/post-image.sh >> ? create mode 100644 board/avnet/rzboard_v2l/readme.txt >> ? create mode 100644 board/avnet/rzboard_v2l/uEnv.txt >> ? create mode 100644 configs/rzboard_v2l_defconfig >> >> diff --git a/DEVELOPERS b/DEVELOPERS >> index 1f26e9bc81..794e0a5d91 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -1842,7 +1842,9 @@ F:??? package/libcamera/ >> ? N:??? Kilian Zinnecker >> ? F:??? package/rockchip-rkbin/ >> ? F:??? configs/rock5b_defconfig >> +F:??? configs/rzboard_v2l_defconfig >> ? F:??? board/radxa/rock5b/ >> +F:??? board/avnet/rzboard_v2l/ > > Here ^^^ please swap the 2 lines above for alphabetic order, > >> ? N:??? Klaus Heinrich Kiwi >> ? F:??? package/wqy-zenhei/ >> diff --git a/board/avnet/rzboard_v2l/genimage.cfg >> b/board/avnet/rzboard_v2l/genimage.cfg >> new file mode 100644 >> index 0000000000..af4ee7cd86 >> --- /dev/null >> +++ b/board/avnet/rzboard_v2l/genimage.cfg >> @@ -0,0 +1,30 @@ >> +# SD card image for RZBoard V2L >> + >> +image boot.vfat { >> +??? vfat { >> +??????? files = { >> +??????????? "Image", >> +??????????? "rzboard.dtb", >> +??????????? "uEnv.txt" >> +??????? } >> +??? } >> +??? size = 24M >> +} >> + >> +image sdcard.img { >> +??? hdimage { >> +??????? partition-table-type = "hybrid" >> +??? } >> + >> +??? partition boot { >> +??????? partition-type = "0xC" >> +??????? bootable = "true" >> +??????? image = "boot.vfat" >> +??? } >> + >> +??? partition rootfs { >> +??????? partition-type = 0x83 >> +??????? image = "rootfs.ext2" >> +??????? size = 64M > > You can remove the size if it's not strictly necessary, it will be > 64M anyway because rootfs.ext2 is defined in board's defconfig, > >> +??? } >> +} >> diff --git a/board/avnet/rzboard_v2l/post-image.sh >> b/board/avnet/rzboard_v2l/post-image.sh >> new file mode 100755 >> index 0000000000..25bef8f793 >> --- /dev/null >> +++ b/board/avnet/rzboard_v2l/post-image.sh >> @@ -0,0 +1,5 @@ >> +#!/usr/bin/env bash >> +set -e >> + >> +cp board/avnet/rzboard_v2l/uEnv.txt "${BINARIES_DIR}" >> +support/scripts/genimage.sh -c board/avnet/rzboard_v2l/genimage.cfg >> diff --git a/board/avnet/rzboard_v2l/readme.txt >> b/board/avnet/rzboard_v2l/readme.txt >> new file mode 100644 >> index 0000000000..0f1efd2812 >> --- /dev/null >> +++ b/board/avnet/rzboard_v2l/readme.txt >> @@ -0,0 +1,69 @@ >> +RZBoard V2L >> +=========== >> +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ > > This ^^^ is the URL to be added to commit log > >> + >> +This board support creates a bootable sd card image for the AVNET >> RZBoard V2L. >> +This board is shipped with a u-boot inside its eMMC. This board >> support uses >> +that u-boot and only puts uEnv.txt, kernel image and rootfs onto the >> sd card. >> + >> +Build: >> +====== >> +? $ make rzboard_v2l_defconfig >> +? $ make >> + >> +Files created in output directory >> +================================= >> + >> +output/images >> +. >> +??? Image >> +??? boot.vfat >> +??? rootfs.ext2 >> +??? rootfs.ext4 >> +??? rootfs.tar >> +??? rzboard.dtb >> +??? sdcard.img >> +??? uEnv.txt >> + >> +Creating bootable SD card: >> +========================== >> + >> +Simply invoke (as root) >> + >> +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync >> + >> +Where X is your SD card device. >> + >> +Booting: >> +======== >> + >> +Configure board for sd card boot: >> +--------------------------------- >> +Set the 'BOOT1' switch (next to the audio jack) to '1' (away from >> 'ON') in >> +order to let the board boot kernel and rootfs from SD card. >> + >> +Serial console: >> +--------------- >> +The RZBoard V2L has a 4-pin header "J19" right next to the micro USB. >> Its >> +layout can be seen in the Quick-Start Guide, or the Hardware User Guide, >> +obtainable from: >> +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ >> + >> +The uart pins are as follows (from left to right - orientation >> according to the >> +board's labeling): >> + >> +pin 1: n/a? (most away from the board's corner) >> +pin 2: tx >> +pin 3: rx >> +pin 4: gnd? (nearest to the board's corner) >> + >> +Baudrate for this board is 115200. >> + >> +Power-Up: >> +--------- >> +Plug in a suitable USB-C power supply and press the button 'S1' (next >> to the >> +USB-C port) for 2 seconds until the LED goes on. >> + >> +Login: >> +------ >> +Enter 'root' as login user, and the prompt is ready. >> diff --git a/board/avnet/rzboard_v2l/uEnv.txt >> b/board/avnet/rzboard_v2l/uEnv.txt >> new file mode 100644 >> index 0000000000..28b8acb8c6 >> --- /dev/null >> +++ b/board/avnet/rzboard_v2l/uEnv.txt >> @@ -0,0 +1,3 @@ >> +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} >> +uenvcmd=fatload mmc 0:1 ${kernel_addr_r} Image; fatload mmc 0:1 >> ${fdt_addr_r} rzboard.dtb >> +bootargs=root=/dev/mmcblk0p2 rw rootfstype=ext4 earlyprintk >> console=ttyS0,115200 rootwait earlycon clk_ignore_unused debug >> diff --git a/configs/rzboard_v2l_defconfig >> b/configs/rzboard_v2l_defconfig >> new file mode 100644 >> index 0000000000..29f38cb2aa >> --- /dev/null >> +++ b/configs/rzboard_v2l_defconfig >> @@ -0,0 +1,19 @@ >> +BR2_aarch64=y >> +BR2_cortex_a55=y >> +BR2_KERNEL_HEADERS_5_10=y >> +BR2_TARGET_GENERIC_HOSTNAME="rzboard_v2l" >> +BR2_TARGET_GENERIC_ISSUE="Welcome to the AVNET RZBoard V2L" >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/avnet/rzboard_v2l/post-image.sh" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Avnet/renesas-linux-cip.git" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c197622df526c82ae9e3674e06b4092dac33eafa" >> +BR2_LINUX_KERNEL_DEFCONFIG="rzboard" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="renesas/rzboard" >> +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > > Do we actually need DTB_OVERLAY_SUPPORT in this defconfig? I mean, are > there any overlay dtbo files that are dynamically applied? > If not please drop the line above > > Here you also need: > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" >> +BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_DOSFSTOOLS=y >> +BR2_PACKAGE_HOST_GENIMAGE=y Please always test build using buildroot/utils/docker-run Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Mon Feb 5 14:49:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:49:21 +0100 Subject: [Buildroot] [PATCH v6 2/3] package/cairo: move to the meson build system In-Reply-To: <20240107105539.1214363-2-thomas@devoogdt.com> (Thomas Devoogdt's message of "Sun, 7 Jan 2024 11:55:38 +0100") References: <20240105101105.6a181dcd@windsurf> <20240107105539.1214363-1-thomas@devoogdt.com> <20240107105539.1214363-2-thomas@devoogdt.com> Message-ID: <87zfwfrmoe.fsf@48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > Signed-off-by: Thomas Devoogdt > --- > v2: added -std=gnu11 (allow inline int declaration in if loop, 99 > caused some directives problems) > v3: enabled host-zlib, needed for librsvg > v4: also added gnu11 for host-cairo compiling (fixes my compilation on > a gcc 4.9.2 based system) > v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ > v6: fix host-zlib option (again) > --- > package/cairo/Config.in | 34 ++++---- > package/cairo/cairo.mk | 168 ++++++++++++---------------------------- > 2 files changed, 66 insertions(+), 136 deletions(-) > diff --git a/package/cairo/Config.in b/package/cairo/Config.in > index 0c87a2904b..caa6c37195 100644 > --- a/package/cairo/Config.in > +++ b/package/cairo/Config.in > @@ -4,6 +4,7 @@ config BR2_PACKAGE_CAIRO > select BR2_PACKAGE_FONTCONFIG > select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 How come the change of build system adds libxrandr? This needs to be described in the commit message. > help > Cairo is a 2D graphics library with support for multiple > output devices. Currently supported output targets include > @@ -15,34 +16,35 @@ config BR2_PACKAGE_CAIRO > if BR2_PACKAGE_CAIRO > -config BR2_PACKAGE_CAIRO_PS > - bool "postscript support" > - select BR2_PACKAGE_ZLIB > - select BR2_PACKAGE_CAIRO_PDF > - > -config BR2_PACKAGE_CAIRO_PDF > - bool "pdf support" > - select BR2_PACKAGE_ZLIB Please don't move options around. They were indeed not alphabetically sorted, but after your move it is even worse. You are also changing a number of dependencies without any clear (to me) reason? -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 14:49:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 15:49:40 +0100 Subject: [Buildroot] [git commit] package/cairo: bump to 1.17.4 Message-ID: <20240205144949.E11BD86CB1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b392d656c7f3ecb1e36945615c543e5ee230315b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master News: - https://www.cairographics.org/news/cairo-1.17.2/ - https://www.cairographics.org/news/cairo-1.17.4/ !! This is a bump to a snapshot release: 1.17.4. But it is the first version that supports meson, and the only version that supports both meson and autotools. This is just an intermediate bump in order to switch over to meson in a later commit. Patches: - drop 0001-fix-nofork-build.patch, upstream: [1] - drop 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch, upstream: [2] - add 0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch, upstream: [3] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/cb2357f481396820ec954dc4b69eafc01a8d162a [2]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/issues/792 Signed-off-by: Thomas Devoogdt Reviewed-by: Adrian Perez de Castro Tested-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- .checkpackageignore | 6 ++-- ...le_for_tolerance_normalized-fix-infinite.patch} | 0 package/cairo/0001-fix-nofork-build.patch | 29 ------------------- ... 0002-Fix-mask-usage-in-image-compositor.patch} | 0 ...hen-available-in-cairo_ft_apply_variation.patch | 33 ---------------------- ...o-ft-private.h-fix-missing-FT_Color-error.patch | 32 +++++++++++++++++++++ package/cairo/cairo.hash | 6 ++-- package/cairo/cairo.mk | 10 +++---- 8 files changed, 41 insertions(+), 75 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 095fa5b283..348cf3d289 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -227,10 +227,8 @@ package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch Upstrea package/c-icap/S96cicap Indent Shellcheck Variables package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch Upstream package/cache-calibrator/0001-Fix-conflicting-round-function.patch Upstream -package/cairo/0001-fix-nofork-build.patch Upstream -package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch Upstream -package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream -package/cairo/0004-Fix-mask-usage-in-image-compositor.patch Upstream +package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream +package/cairo/0002-Fix-mask-usage-in-image-compositor.patch Upstream package/caps/0001-Fix-stdint-types-with-musl.patch Upstream package/cdrkit/0001-no-rcmd.patch Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch Upstream diff --git a/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch similarity index 100% rename from package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch rename to package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch diff --git a/package/cairo/0001-fix-nofork-build.patch b/package/cairo/0001-fix-nofork-build.patch deleted file mode 100644 index 702e9910a5..0000000000 --- a/package/cairo/0001-fix-nofork-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -test: fix build when SHOULD_FORK is false - -The code in test/cairo-test-runner.c properly takes into account -platforms that do have fork() support, and uses the SHOULD_FORK define -to know whether fork is available or not. - -However, this SHOULD_FORK macro is used to guard the inclusion of -, which is needed to get the prototype of other functions -(namely readlink and getppid), that are used in portions of this file -not guarded by SHOULD_FORK. - -Signed-off-by: Thomas Petazzoni - -Index: b/test/cairo-test-runner.c -=================================================================== ---- a/test/cairo-test-runner.c -+++ b/test/cairo-test-runner.c -@@ -36,10 +36,10 @@ - #include /* for version information */ - - #define SHOULD_FORK HAVE_FORK && HAVE_WAITPID --#if SHOULD_FORK - #if HAVE_UNISTD_H - #include - #endif -+#if SHOULD_FORK - #if HAVE_SIGNAL_H - #include - #endif diff --git a/package/cairo/0004-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch similarity index 100% rename from package/cairo/0004-Fix-mask-usage-in-image-compositor.patch rename to package/cairo/0002-Fix-mask-usage-in-image-compositor.patch diff --git a/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch b/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch deleted file mode 100644 index 10e000d16f..0000000000 --- a/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >= 2.9 -[Retrieved from: -https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645] -Signed-off-by: Fabrice Fontaine ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..981973f78 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } - --- -2.24.1 - diff --git a/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch b/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch new file mode 100644 index 0000000000..3b18d8077b --- /dev/null +++ b/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch @@ -0,0 +1,32 @@ +From da698db0c20507f0e07492cbe40dbaf1c9053f71 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sun, 12 Nov 2023 09:58:05 +0100 +Subject: [PATCH] cairo-ft-private.h: fix missing FT_Color error + +In file included from ../src/cairo-colr-glyph-render.c:37: +../src/cairo-ft-private.h:87:30: error: unknown type name 'FT_Color' + 87 | FT_Color *palette, + | ^~~~~~~~ + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/issues/792 +Signed-off-by: Thomas Devoogdt +--- + src/cairo-ft-private.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/cairo-ft-private.h b/src/cairo-ft-private.h +index 836f7e523..6b0e30223 100644 +--- a/src/cairo-ft-private.h ++++ b/src/cairo-ft-private.h +@@ -43,6 +43,8 @@ + + #if CAIRO_HAS_FT_FONT + ++#include FT_COLOR_H ++ + CAIRO_BEGIN_DECLS + + typedef struct _cairo_ft_unscaled_font cairo_ft_unscaled_font_t; +-- +2.34.1 + diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index 3b93e24a22..fca9ff678c 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,7 +1,7 @@ -# From https://www.cairographics.org/releases/cairo-1.16.0.tar.xz.sha1 -sha1 00e81842ae5e81bb0343108884eb5205be0eac14 cairo-1.16.0.tar.xz +# From https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz.sha1 +sha1 68712ae1039b114347be3b7200bc1c901d47a636 cairo-1.17.4.tar.xz # Calculated based on the hash above -sha256 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 cairo-1.16.0.tar.xz +sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 cairo-1.17.4.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 7bc8f92deb..4515b76075 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,19 +4,17 @@ # ################################################################################ -CAIRO_VERSION = 1.16.0 +CAIRO_VERSION = 1.17.4 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics -CAIRO_SITE = http://cairographics.org/releases +CAIRO_SITE = http://cairographics.org/snapshots CAIRO_INSTALL_STAGING = YES -# 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch -CAIRO_IGNORE_CVES += CVE-2018-19876 -# 0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +# 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch CAIRO_IGNORE_CVES += CVE-2019-6462 -# 0004-Fix-mask-usage-in-image-compositor.patch +# 0002-Fix-mask-usage-in-image-compositor.patch CAIRO_IGNORE_CVES += CVE-2020-35492 CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" From thomas.petazzoni at bootlin.com Mon Feb 5 14:51:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:51:09 +0100 Subject: [Buildroot] [git commit] package/domoticz: drop fmt dependency Message-ID: <20240205145119.04B3486CB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc3609c53f927289a9681f30ab283d190cb34e09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master fmt is not a dependency since bump to version 2022.1 in commit adca60540f4fd271dda48b9a121986492700e73a and https://github.com/domoticz/domoticz/commit/82043c4d5c79003792379be79b931eb85ab890c8 https://github.com/domoticz/domoticz/commit/9e02d9a79c70c36db180d3242cbd03ff9b63e3cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/domoticz/Config.in | 1 - package/domoticz/domoticz.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 85361eecf0..a0e69a7601 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -16,7 +16,6 @@ config BR2_PACKAGE_DOMOTICZ select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_CEREAL - select BR2_PACKAGE_FMT select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_MINIZIP_ZLIB diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index d0856b71af..88bad15427 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -12,7 +12,6 @@ DOMOTICZ_CPE_ID_VENDOR = domoticz DOMOTICZ_DEPENDENCIES = \ boost \ cereal \ - fmt \ host-pkgconf \ jsoncpp \ libcurl \ @@ -36,7 +35,6 @@ DOMOTICZ_CONF_OPTS += \ # jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ - -DUSE_BUILTIN_LIBFMT=OFF \ -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF From thomas.petazzoni at bootlin.com Mon Feb 5 14:51:46 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:51:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: drop fmt dependency In-Reply-To: <20240116220258.1003073-1-fontaine.fabrice@gmail.com> References: <20240116220258.1003073-1-fontaine.fabrice@gmail.com> Message-ID: <20240205155146.128e4d41@windsurf> On Tue, 16 Jan 2024 23:02:58 +0100 Fabrice Fontaine wrote: > fmt is not a dependency since bump to version 2022.1 in commit > adca60540f4fd271dda48b9a121986492700e73a and > https://github.com/domoticz/domoticz/commit/82043c4d5c79003792379be79b931eb85ab890c8 > https://github.com/domoticz/domoticz/commit/9e02d9a79c70c36db180d3242cbd03ff9b63e3cc > > Signed-off-by: Fabrice Fontaine > --- > package/domoticz/Config.in | 1 - > package/domoticz/domoticz.mk | 2 -- > 2 files changed, 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 14:54:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:54:01 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add tesseract-ocr test In-Reply-To: <20240107120902.136457-1-ju.o@free.fr> (Julien Olivain's message of "Sun, 7 Jan 2024 13:09:02 +0100") References: <20240107120902.136457-1-ju.o@free.fr> Message-ID: <87v873rmgm.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Cc: Gilles Talis > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit b372495 with commands: > make check-package > ... > 0 warnings generated > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_tesseract_ocr > ... > OK Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 5 14:51:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:51:54 +0100 Subject: [Buildroot] [git commit] package/libevdev: bump to version 1.13.1 Message-ID: <20240205145446.B325986CCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a917500442b62441c88ff3f7ab84e6a230d6bc69 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- package/libevdev/libevdev.hash | 6 +++--- package/libevdev/libevdev.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash index dd76e158ef..acaedfad56 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/input-tools/2022-March/001574.html -sha256 1dbba41bc516d3ca7abc0da5b862efe3ea8a7018fa6e9b97ce9d39401b22426c libevdev-1.12.1.tar.xz -sha512 eefce287a665e4f89eb2e0437dfefd45ecf8925c7dac35a1bdd46158541f77f2032c6146900a30a01321751d55a9b537bd1d61777cca9cfa02c39a6e31c97be4 libevdev-1.12.1.tar.xz +# From https://lists.freedesktop.org/archives/input-tools/2023-May/001585.html +sha256 06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36 libevdev-1.13.1.tar.xz +sha512 9b75bad4bc13948854c8dff7a7a46aca6c06d1410ccb000f881bf76055ccac040595c3b24fb1a574be875b5c262eb86820b9ec3383752641bc2047135e5a412f libevdev-1.13.1.tar.xz # Hash for license files: sha256 6f13de7ce28e4948ba95170e0723ee1254c1978ce1f127af82aeca597b567cb9 COPYING diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index 726a5afcee..b0cf6c9ba8 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.12.1 +LIBEVDEV_VERSION = 1.13.1 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = MIT From peter at korsgaard.com Mon Feb 5 14:54:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:54:49 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add coremark test In-Reply-To: <20240107125621.248063-1-ju.o@free.fr> (Julien Olivain's message of "Sun, 7 Jan 2024 13:56:21 +0100") References: <20240107125621.248063-1-ju.o@free.fr> Message-ID: <87r0hrrmfa.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 14:55:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:55:48 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/kodi-inputstream-adaptive: bump version to 20.3.17-Nexus In-Reply-To: <20240204112031.514780-1-bernd@kuhls.net> (Bernd Kuhls's message of "Sun, 4 Feb 2024 12:20:31 +0100") References: <20240204112031.514780-1-bernd@kuhls.net> Message-ID: <87mssfrmdn.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls > --- > v2: squashed with previous bump to 20.3.16-Nexus Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 14:55:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 15:55:53 +0100 Subject: [Buildroot] [git commit] support/testing: add tesseract-ocr test Message-ID: <20240205145609.1095486CF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b89435db602e3ce39e73562cfd8b01fcc637368c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Cc: Gilles Talis Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + .../testing/tests/package/test_tesseract_ocr.py | 43 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a03018ab2b..b1178150ed 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1823,6 +1823,7 @@ F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_tcpdump.py +F: support/testing/tests/package/test_tesseract_ocr.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_tesseract_ocr.py b/support/testing/tests/package/test_tesseract_ocr.py new file mode 100644 index 0000000000..232025bad2 --- /dev/null +++ b/support/testing/tests/package/test_tesseract_ocr.py @@ -0,0 +1,43 @@ +import os + +import infra.basetest + + +class TestTesseractOcr(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_FREETYPE=y + BR2_PACKAGE_GHOSTSCRIPT_FONTS=y + BR2_PACKAGE_GRAPHICSMAGICK=y + BR2_PACKAGE_TESSERACT_OCR=y + BR2_PACKAGE_TESSERACT_OCR_LANG_ENG=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]) + self.emulator.login() + + msg = "Hello from Buildroot runtime test." + img_file = "image.pgm" + txt_basename = "text" + txt_file = f"{txt_basename}.txt" + + # Check the program execute. + self.assertRunOk("tesseract --version") + + # Generate an image file including a text message. + cmd = f"gm convert -pointsize 16 label:'{msg}' {img_file}" + self.assertRunOk(cmd) + + # Perform the character recognition. + cmd = f"tesseract {img_file} {txt_basename}" + self.assertRunOk(cmd, timeout=30) + + # Check the decoded text matches the original message. + cmd = f"grep -F '{msg}' {txt_file}" + self.assertRunOk(cmd) From peter at korsgaard.com Mon Feb 5 14:55:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 15:55:54 +0100 Subject: [Buildroot] [git commit] support/testing: add coremark test Message-ID: <20240205145609.1A41486CF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c47da268be75a64fe264f4833538be7bae1320c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_coremark.py | 33 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b1178150ed..ebc1af84cb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1763,6 +1763,7 @@ F: support/testing/tests/package/test_bc.py F: support/testing/tests/package/test_brotli.py F: support/testing/tests/package/test_bzip2.py F: support/testing/tests/package/test_compressor_base.py +F: support/testing/tests/package/test_coremark.py F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py diff --git a/support/testing/tests/package/test_coremark.py b/support/testing/tests/package/test_coremark.py new file mode 100644 index 0000000000..8bd2f32143 --- /dev/null +++ b/support/testing/tests/package/test_coremark.py @@ -0,0 +1,33 @@ +import os + +import infra.basetest + + +class TestCoreMark(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_COREMARK=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]) + self.emulator.login() + + log_file = "run1.log" + + # Run a CoreMark benchmark. + self.assertRunOk(f"coremark > {log_file}", timeout=60) + + # Print the log file on console, for debugging. + self.assertRunOk(f"cat {log_file}") + + # The "coremark" program return code is always 0 (success). + # So the correct execution is validated from the run log. + valid_msg = "Correct operation validated." + cmd = f"grep -F '{valid_msg}' {log_file}" + self.assertRunOk(cmd) From peter at korsgaard.com Mon Feb 5 14:55:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 15:55:54 +0100 Subject: [Buildroot] [git commit] package/kodi-inputstream-adaptive: bump version to 20.3.17-Nexus Message-ID: <20240205145609.2427F86CF3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8366622fc8eba8187240a0141147326e99a4f932 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index ebcf32fd4a..e38191c0c4 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 1d7c933d05534e591e11fd204e836a3498fffc6a0717d5427c89acfd16fb9d40 kodi-inputstream-adaptive-20.3.15-Nexus.tar.gz +sha256 f67cfef057f8842716db4521a8cd3966c37a1da8fc3fb297527f6f25be20688a kodi-inputstream-adaptive-20.3.17-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 267541ace9..ba4f6de61a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.15-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.17-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ From thomas.petazzoni at bootlin.com Mon Feb 5 14:57:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:57:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/libevdev: bump to version 1.13.1 In-Reply-To: <20240117130522.628211-1-anaumann@ultratronik.de> References: <20240117130522.628211-1-anaumann@ultratronik.de> Message-ID: <20240205155715.77215856@windsurf> On Wed, 17 Jan 2024 14:05:22 +0100 Andreas Naumann wrote: > Signed-off-by: Andreas Naumann > --- > package/libevdev/libevdev.hash | 6 +++--- > package/libevdev/libevdev.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 14:58:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:58:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-starlette: bump to version 0.34.0 In-Reply-To: <42594955-dcd4-4161-9a84-879f096d49f7@bubu1.eu> (Marcus Hoffmann via buildroot's message of "Mon, 5 Feb 2024 14:34:05 +0100") References: <20240111072922.3082638-1-james.hilliard1@gmail.com> <87sf27upph.fsf@48ers.dk> <42594955-dcd4-4161-9a84-879f096d49f7@bubu1.eu> Message-ID: <87il33rm9s.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Hi Peter, > On 05.02.24 12:15, Peter Korsgaard wrote: >>>>>>> "James" == James Hilliard writes: >> > Signed-off-by: James Hilliard >> Committed, thanks. >> > We currently have fastapi 0.105.0 in buildroot which depends on > starlette < 0.28.0. > There's a pending patch by James that bumps it to 0.108.0, which > unfortunately is also not compatible with starlette 0.34.0 [1] :-/ > In fact there's no fastapi release that is compatible with starlette > 0.34.0 (newer fastapi releases require even newer starlette > versions...) Argh :( > I guess I'll send a series that bumps *both* again to compatible versions? Yes please! -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Mon Feb 5 15:02:40 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 16:02:40 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: add minimalmodbus runtime test In-Reply-To: <170713978507.21324.6362507954144029814-0@git.sr.ht> References: <170713978507.21324.6362507954144029814-0@git.sr.ht> Message-ID: Marcus, All, On 2024-02-05 14:08 +0100, ~bubu spake thusly: > From: Marcus Hoffmann Thanks for this new test. This commit log needs however to be a little bit more detailed; see below... > Signed-off-by: Marcus Hoffmann > --- > .../tests/package/sample_python_minimalmodbus.py | 7 +++++++ > .../tests/package/test_python_minimalmodbus.py | 11 +++++++++++ > 2 files changed, 18 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_minimalmodbus.py > create mode 100644 support/testing/tests/package/test_python_minimalmodbus.py > > diff --git a/support/testing/tests/package/sample_python_minimalmodbus.py b/support/testing/tests/package/sample_python_minimalmodbus.py > new file mode 100644 > index 0000000000..a75145f900 > --- /dev/null > +++ b/support/testing/tests/package/sample_python_minimalmodbus.py > @@ -0,0 +1,7 @@ > +import minimalmodbus > +from serial.serialutil import SerialException > + > +try: > + instrument = minimalmodbus.Instrument('/dev/ttyUSB99', 1) > +except SerialException: > + pass So, it took me a little while to understand how this test works, because it uses the default kernel, which is probably lacking the appropriate modbus driver. So the test just checks that the initialisation fails, and we assume that if the failure happens as we expect, we consider the module to be working correctly. Which is a weird situation: failure means success! I've added a bit of comments to explain that. Applied to master, thanks. Regards, Yann E. MORIN. > diff --git a/support/testing/tests/package/test_python_minimalmodbus.py b/support/testing/tests/package/test_python_minimalmodbus.py > new file mode 100644 > index 0000000000..53813406de > --- /dev/null > +++ b/support/testing/tests/package/test_python_minimalmodbus.py > @@ -0,0 +1,11 @@ > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy3Minimalmodbus(TestPythonPackageBase): > + __test__ = True > + config = TestPythonPackageBase.config + \ > + """ > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_MINIMALMODBUS=y > + """ > + sample_scripts = ["tests/package/sample_python_minimalmodbus.py"] > -- > 2.38.5 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Feb 5 15:05:35 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 16:05:35 +0100 Subject: [Buildroot] [PATCH v5] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20231208003746.9505-1-fancp2007@gmail.com> References: <20231104192335.2920640-1-fancp2007@gmail.com> <20231208003746.9505-1-fancp2007@gmail.com> Message-ID: Hi Scott, On 08/12/23 01:37, Scott Fan wrote: > Add support for the FriendlyARM NanoPi NEO2 with mainline components: > - U-Boot 2023.10 > - Linux 6.1.65 > > Board's wiki page: > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > Signed-off-by: Scott Fan > --- > Changes v1 -> v2: > - Fix issues from 'utils/docker-run make check-package' > - Add atf custom version in the defconfig > - No need for sudo to run sync > > Changes v2 -> v3: > - Update patch file, add the upstream tag > > Changes v3 -> v4: > - Use a single integrated image file (u-boot-sunxi-with-spl.bin) > - Remove patch file for uboot, switch to binman > - Merge boot partition into rootfs partition > - Bump kernel version to 6.1.61 > > Changes v4 -> v5: > - Bump kernel version to 6.1.65 > > Signed-off-by: Scott Fan > --- > board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ > board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ > board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ > board/friendlyarm/nanopi-neo2/readme.txt | 34 +++++++++++++++ > configs/friendlyarm_nanopi_neo2_defconfig | 48 +++++++++++++++++++++ > 5 files changed, 107 insertions(+) > create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf > create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg > create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh > create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt > create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig > > diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf > new file mode 100644 > index 0000000000..482a069f74 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf > @@ -0,0 +1,4 @@ > +label friendlyarm-nanopi-buildroot > + kernel /boot/Image > + devicetree /boot/sun50i-h5-nanopi-neo2.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg > new file mode 100644 > index 0000000000..67e4e5efdb > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot-tpl-spl-dtb { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + offset = 1M > + } > +} > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh > new file mode 100755 > index 0000000000..c7ec875068 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt > new file mode 100644 > index 0000000000..c896a57525 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/readme.txt > @@ -0,0 +1,34 @@ > +Intro > +===== > + > +This default configuration will allow you to start experimenting with the > +buildroot environment for the NanoPi NEO2. With the current configuration > +it will bring-up the board, and allow access through the serial console. > + > +Wiki link: > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > + > +This configuration uses U-Boot mainline and kernel mainline. > + > +How to build > +============ > + > + $ make friendlyarm_nanopi_neo2_defconfig > + $ make > + > +Note: you will need access to the internet to download the required > +sources. > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > + $ sync > + > +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console > +is on the serial line, 115200 8N1. > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig > new file mode 100644 > index 0000000000..a955ec323a > --- /dev/null > +++ b/configs/friendlyarm_nanopi_neo2_defconfig > @@ -0,0 +1,48 @@ > +BR2_aarch64=y > +BR2_cortex_a53=y > +BR2_ARM_FPU_VFPV4=y > + > +# Linux headers same as kernel, a 6.1 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > + > +# Firmware > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.65" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" It looks good to me except you miss: BR2_TARGET_UBOOT_NEEDS_OPENSSL=y So adding that line: Reviewed-by: Giulio Benetti [Only build-tested using docker-run] Tested-by: Giulio Benetti Please use buildroot/utils/docker-run to check defconfigs and packages so we're sure that all host dependencies are met. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From yann.morin.1998 at free.fr Mon Feb 5 15:06:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 16:06:19 +0100 Subject: [Buildroot] [git commit] support/testing: add minimalmodbus runtime test Message-ID: <20240205150659.657C086CFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f7e112ab20265e9005b9b97c6a129d6bec66f12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann [yann.morin.1998 at free.fr: add the comment to explain failure is success] Signed-off-by: Yann E. MORIN --- support/testing/tests/package/sample_python_minimalmodbus.py | 11 +++++++++++ support/testing/tests/package/test_python_minimalmodbus.py | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/support/testing/tests/package/sample_python_minimalmodbus.py b/support/testing/tests/package/sample_python_minimalmodbus.py new file mode 100644 index 0000000000..dc5db8d9e2 --- /dev/null +++ b/support/testing/tests/package/sample_python_minimalmodbus.py @@ -0,0 +1,11 @@ +import minimalmodbus +from serial.serialutil import SerialException + +# We can't test proper behaviour in emulation, because there is +# actually no emulated modbus hardware, so we rely on the module +# to fail in an expected way to consider it is working correctly. +# Failure (of the script) is success (of the test)! +try: + instrument = minimalmodbus.Instrument('/dev/ttyUSB99', 1) +except SerialException: + pass diff --git a/support/testing/tests/package/test_python_minimalmodbus.py b/support/testing/tests/package/test_python_minimalmodbus.py new file mode 100644 index 0000000000..53813406de --- /dev/null +++ b/support/testing/tests/package/test_python_minimalmodbus.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Minimalmodbus(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MINIMALMODBUS=y + """ + sample_scripts = ["tests/package/sample_python_minimalmodbus.py"] From thomas.petazzoni at bootlin.com Mon Feb 5 15:07:51 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:07:51 +0100 Subject: [Buildroot] [git commit] package/opencv4: bump to version 4.9.0 Message-ID: <20240205150800.3273A86D08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b2dc9add3f84196f3dd326c26f64abaf84642c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/opencv/opencv/wiki/ChangeLog#version490 Signed-off-by: Woodrow Douglass Signed-off-by: Thomas Petazzoni --- package/opencv4-contrib/opencv4-contrib.hash | 2 +- package/opencv4-contrib/opencv4-contrib.mk | 2 +- package/opencv4/opencv4.hash | 2 +- package/opencv4/opencv4.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/opencv4-contrib/opencv4-contrib.hash b/package/opencv4-contrib/opencv4-contrib.hash index 954a0c2beb..2e20717c76 100644 --- a/package/opencv4-contrib/opencv4-contrib.hash +++ b/package/opencv4-contrib/opencv4-contrib.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0c082a0b29b3118f2a0a1856b403bb098643af7b994a0080f402a12159a99c6e opencv4-contrib-4.8.1.tar.gz +sha256 8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae opencv4-contrib-4.9.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk index f8c8cfd94c..a4d0179472 100644 --- a/package/opencv4-contrib/opencv4-contrib.mk +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV4_CONTRIB_VERSION = 4.8.1 +OPENCV4_CONTRIB_VERSION = 4.9.0 OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) OPENCV4_CONTRIB_INSTALL_TARGET = NO OPENCV4_CONTRIB_LICENSE = Apache-2.0 diff --git a/package/opencv4/opencv4.hash b/package/opencv4/opencv4.hash index 2736752633..15f5e37278 100644 --- a/package/opencv4/opencv4.hash +++ b/package/opencv4/opencv4.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 62f650467a60a38794d681ae7e66e3e8cfba38f445e0bf87867e2f2cdc8be9d5 opencv4-4.8.1.tar.gz +sha256 ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c opencv4-4.9.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index 74cec511a9..b535761cb2 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV4_VERSION = 4.8.1 +OPENCV4_VERSION = 4.9.0 OPENCV4_SITE = $(call github,opencv,opencv,$(OPENCV4_VERSION)) OPENCV4_INSTALL_STAGING = YES OPENCV4_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Mon Feb 5 15:09:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:09:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv4: bump to version 4.9.0 In-Reply-To: <20240117135713.36729-1-wdouglass@carnegierobotics.com> References: <20240117135713.36729-1-wdouglass@carnegierobotics.com> Message-ID: <20240205160930.0c2fb755@windsurf> On Wed, 17 Jan 2024 08:57:13 -0500 Woodrow Douglass via buildroot wrote: > https://github.com/opencv/opencv/wiki/ChangeLog#version490 > > Signed-off-by: Woodrow Douglass > --- > package/opencv4-contrib/opencv4-contrib.hash | 2 +- > package/opencv4-contrib/opencv4-contrib.mk | 2 +- > package/opencv4/opencv4.hash | 2 +- > package/opencv4/opencv4.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:11:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:11:37 +0100 Subject: [Buildroot] [PATCH] package/iputils: bump release to 20240117 In-Reply-To: <20240117234630.2728809-1-petr.vorel@gmail.com> References: <20240117234630.2728809-1-petr.vorel@gmail.com> Message-ID: <20240205161137.5a56b402@windsurf> On Thu, 18 Jan 2024 00:46:30 +0100 Petr Vorel wrote: > Signed-off-by: Petr Vorel > --- > package/iputils/iputils.hash | 4 ++-- > package/iputils/iputils.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:10:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:10:18 +0100 Subject: [Buildroot] [git commit] package/iputils: bump release to 20240117 Message-ID: <20240205151304.8299E86D19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20b622fd05785906cd8bf6bfd8348cc52830cfb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/iputils/iputils.hash | 4 ++-- package/iputils/iputils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index c2f6a40797..a3e48d60a9 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,5 +1,5 @@ -# https://github.com/iputils/iputils/releases/download/20231222/sha256sums.asc -sha256 e3ce5e1a1f795c2d520985463b90e20f9388b7060796d54ad64509aa8e4af775 iputils-20231222.tar.gz +# https://github.com/iputils/iputils/releases/download/20240117/sha256sums.asc +sha256 7ed46e876e4157e1d20c40ec945e1ce0f3af3b10b5f6373e423135c6f22cd116 iputils-20240117.tar.gz # Locally computed sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index bcf440ec93..58e44d673a 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPUTILS_VERSION = 20231222 +IPUTILS_VERSION = 20240117 IPUTILS_SITE = https://github.com/iputils/iputils/releases/download/$(IPUTILS_VERSION) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 From thomas.petazzoni at bootlin.com Mon Feb 5 15:12:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:12:36 +0100 Subject: [Buildroot] [git commit] support/testing: add pciutils runtime test Message-ID: <20240205151304.97F5286D07@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f50c4cd2b72b8a04600e525e9d848df0ad42e14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_pciutils.py | 83 ++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ebc1af84cb..31496cbcc6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1804,6 +1804,7 @@ F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_openblas.py +F: support/testing/tests/package/test_pciutils.py F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_pigz.py F: support/testing/tests/package/test_python_distro.py diff --git a/support/testing/tests/package/test_pciutils.py b/support/testing/tests/package/test_pciutils.py new file mode 100644 index 0000000000..3221b0cfd1 --- /dev/null +++ b/support/testing/tests/package/test_pciutils.py @@ -0,0 +1,83 @@ +import os + +import infra.basetest + + +class TestPCIUtils(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_PCIUTILS=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") + + # Note: we add a qemu pci-testdev in order to have a stable + # device ID, and for writing in configuration space without + # interfering with the rest of the emulation. See: + # https://www.qemu.org/docs/master/specs/pci-testdev.html + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file, + "-device", "pci-testdev"]) + self.emulator.login() + + # Check the program executes. This test also check that we + # have "lspci" from the pciutils package, rather than the + # busybox applet (which does not recognize the --version + # option)" + self.assertRunOk("lspci --version") + + # Check few program invocations. + self.assertRunOk("lspci") + for lspci_opt in ["-t", "-n", "-v", "-vv", "-x"]: + self.assertRunOk(f"lspci {lspci_opt}") + + # Check we can see the qemu pci-testdev. + # Vendor: 1b36: Red Hat, Inc. + # Device: 0005: QEMU PCI Test Device + pci_vendor_id = "1b36" + pci_device_id = "0005" + pci_dev = f"{pci_vendor_id}:{pci_device_id}" + cmd = f"lspci -d {pci_dev}" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn("Red Hat, Inc.", output[0]) + self.assertIn("QEMU PCI Test Device", output[0]) + + # We disable INTx emulation by setting bit 10 of the COMMAND + # register in the configuration space. See: + # https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/tree/lib/header.h?h=v3.10.0#n26 + dis_int_x = 0x400 + data_mask = f"{hex(dis_int_x)}:{hex(dis_int_x)}" + cmd = f"setpci -d {pci_dev} COMMAND.w={data_mask}" + self.assertRunOk(cmd) + + # We read back and check the value. + cmd = f"setpci -d {pci_dev} COMMAND.w" + output, exit_code = self.emulator.run(cmd) + read_value = int(output[0], 16) + self.assertEqual(exit_code, 0) + self.assertTrue((read_value & dis_int_x) == dis_int_x) + + # We check lspci now see the disabled INTx emulation. + cmd = f"lspci -vv -d {pci_dev} | grep -F 'DisINTx+'" + self.assertRunOk(cmd) + + # We re-enable the INTx emulation by clearing the bit 10. + data_mask = f"0x0:{hex(dis_int_x)}" + cmd = f"setpci -d {pci_dev} COMMAND.w={data_mask}" + self.assertRunOk(cmd) + + # We read back and check the value, again. + cmd = f"setpci -d {pci_dev} COMMAND.w" + output, exit_code = self.emulator.run(cmd) + read_value = int(output[0], 16) + self.assertEqual(exit_code, 0) + self.assertTrue((read_value & dis_int_x) == 0) + + # We check lspci now see the enabled INTx emulation. + cmd = f"lspci -vv -d {pci_dev} | grep -F 'DisINTx-'" + self.assertRunOk(cmd) From thomas.petazzoni at bootlin.com Mon Feb 5 15:13:07 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:13:07 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add pciutils runtime test In-Reply-To: <20240117201157.51827-1-ju.o@free.fr> References: <20240117201157.51827-1-ju.o@free.fr> Message-ID: <20240205161307.0e653997@windsurf> On Wed, 17 Jan 2024 21:11:57 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit b200632 with commands: Applied to master, thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:13:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:13:40 +0100 Subject: [Buildroot] [PATCH 1/1] configs/acmesystems_acqua_a5_*: bump to Linux 6.6.12 In-Reply-To: References: Message-ID: <20240205161340.4d3befb2@windsurf> On Tue, 16 Jan 2024 12:49:01 +0100 Edgar Bonet wrote: > Also adjust the include path for the device tree. Since Linux 6.5-rc1 > (724ba67515 "ARM: dts: Move .dts files to vendor sub-directories"), > sama5d31.dtsi lives in the microchip subdirectory. > > Signed-off-by: Edgar Bonet > --- > board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts | 2 +- > configs/acmesystems_acqua_a5_256mb_defconfig | 4 ++-- > configs/acmesystems_acqua_a5_512mb_defconfig | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Mon Feb 5 15:13:48 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 16:13:48 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am62x_sk_defconfig: explicitly set the kernel version In-Reply-To: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> References: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> Message-ID: <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> Hi Dario, On 23/11/23 14:40, Dario Binacchi wrote: > Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig) forgot to > specify the Linux kernel version, so do that now. > > When the defconfig was added, the default version was 6.4.x, so use > version 6.4.16. > > Signed-off-by: Dario Binacchi > --- > configs/ti_am62x_sk_defconfig | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index b98a68ff153f..6610e6fcf890 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,7 +1,10 @@ > BR2_aarch64=y > +BR2_KERNEL_HEADERS_6_4=y here ^^^ you need to specify BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 and not the line above, > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" > BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" Can you please correct and send V2? Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Mon Feb 5 15:13:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:13:21 +0100 Subject: [Buildroot] [git commit] configs/acmesystems_acqua_a5_*: bump to Linux 6.6.12 Message-ID: <20240205151436.9C91086D24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8fb52098859fa5cf7ecf4db30ff8e0276687832f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Also adjust the include path for the device tree. Since Linux 6.5-rc1 (724ba67515 "ARM: dts: Move .dts files to vendor sub-directories"), sama5d31.dtsi lives in the microchip subdirectory. Signed-off-by: Edgar Bonet Signed-off-by: Thomas Petazzoni --- board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts | 2 +- configs/acmesystems_acqua_a5_256mb_defconfig | 4 ++-- configs/acmesystems_acqua_a5_512mb_defconfig | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts index 39fa4df1b1..a7a4a20352 100644 --- a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts +++ b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts @@ -9,7 +9,7 @@ * Licensed under GPLv2 or later. */ /dts-v1/; -#include "sama5d31.dtsi" +#include "microchip/sama5d31.dtsi" / { model = "Acme Systems Acqua SOM"; diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index 5b32234294..ef57734194 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.27" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index 69294cbec0..a69e2a2251 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.27" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" From giulio.benetti at benettiengineering.com Mon Feb 5 15:16:19 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 16:16:19 +0100 Subject: [Buildroot] [PATCH 2/2] configs/ti_am62x_sk_defconfig: drop redundant defconfig choice In-Reply-To: <20231123134052.239690-2-dario.binacchi@amarulasolutions.com> References: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> <20231123134052.239690-2-dario.binacchi@amarulasolutions.com> Message-ID: <0f0ddd79-6aee-4fa7-8b60-dce12339e94b@benettiengineering.com> Hi Dario, On 23/11/23 14:40, Dario Binacchi wrote: > The defconfig choice is the default one, so it is redundant and can be > removed without effect. > > Signed-off-by: Dario Binacchi > --- > configs/ti_am62x_sk_defconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 6610e6fcf890..130d092e304f 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -24,7 +24,6 @@ BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3" > BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" > BR2_TARGET_UBOOT=y From thomas.petazzoni at bootlin.com Mon Feb 5 15:26:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:26:31 +0100 Subject: [Buildroot] [git commit] package/libtracefs: needs threads Message-ID: <20240205152743.B295586D2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5524c00656c314626862e54b2cd38865486cf55 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libtracefs needs threads resulting in the following build failure since its addition in commit b1dbd3f679e6660325472e3fdca72127d74e6929: In file included from /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, from ../src/tracefs-instance.c:10: /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] 218 | # warning requested reentrant code, but thread support was disabled | ^~~~~~~ ../src/tracefs-instance.c:20:10: fatal error: pthread.h: No such file or directory 20 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e0a8dd0781a1d1824a4cb78f47dcff4055083959 Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libtracefs/Config.in | 5 +++-- package/linux-tools/Config.in | 5 +++-- package/trace-cmd/Config.in | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/libtracefs/Config.in b/package/libtracefs/Config.in index bb0777b16c..a46bbe0bb1 100644 --- a/package/libtracefs/Config.in +++ b/package/libtracefs/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBTRACEFS bool "libtracefs" + depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # libtraceevent select BR2_PACKAGE_LIBTRACEEVENT help @@ -8,5 +9,5 @@ config BR2_PACKAGE_LIBTRACEFS https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/ -comment "libtracefs needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "libtracefs needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index ce744663f1..fb158f84d4 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -104,6 +104,7 @@ endif config BR2_PACKAGE_LINUX_TOOLS_RTLA bool "rtla" + depends on BR2_TOOLCHAIN_HAS_THREADS # libtracefs depends on !BR2_STATIC_LIBS # libtracefs select BR2_PACKAGE_LINUX_TOOLS select BR2_PACKAGE_LIBTRACEFS @@ -124,8 +125,8 @@ config BR2_PACKAGE_LINUX_TOOLS_RTLA not available in Buildroot, so only rtla in kernels 5.19 onwards is actually supported in Buildroot. -comment "rtla needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "rtla needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS bool"selftests" diff --git a/package/trace-cmd/Config.in b/package/trace-cmd/Config.in index 00b9ebbd9a..c47b1f57ca 100644 --- a/package/trace-cmd/Config.in +++ b/package/trace-cmd/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_TRACE_CMD depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS # libtracefs select BR2_PACKAGE_LIBTRACEEVENT select BR2_PACKAGE_LIBTRACEFS help @@ -16,6 +17,7 @@ config BR2_PACKAGE_TRACE_CMD http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git -comment "trace-cmd needs a toolchain w/ NPTL, dynamic library" +comment "trace-cmd needs a toolchain w/ threads, NPTL, dynamic library" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS From thomas.petazzoni at bootlin.com Mon Feb 5 15:33:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:33:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: needs threads In-Reply-To: <20240116214427.945514-1-fontaine.fabrice@gmail.com> References: <20240116214427.945514-1-fontaine.fabrice@gmail.com> Message-ID: <20240205163358.7752aec0@windsurf> On Tue, 16 Jan 2024 22:44:27 +0100 Fabrice Fontaine wrote: > libtracefs needs threads resulting in the following build failure since > its addition in commit b1dbd3f679e6660325472e3fdca72127d74e6929: > > In file included from /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, > from ../src/tracefs-instance.c:10: > /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] > 218 | # warning requested reentrant code, but thread support was disabled > | ^~~~~~~ > ../src/tracefs-instance.c:20:10: fatal error: pthread.h: No such file or directory > 20 | #include > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/e0a8dd0781a1d1824a4cb78f47dcff4055083959 > > Signed-off-by: Fabrice Fontaine > --- > package/libtracefs/Config.in | 5 +++-- > package/linux-tools/Config.in | 5 +++-- > 2 files changed, 6 insertions(+), 4 deletions(-) Thanks a lot! It looks like you missed trace-cmd package, which also selects libtracefs, so I fixed that up when applying. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Mon Feb 5 15:34:43 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 16:34:43 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am62x_sk_defconfig: explicitly set the kernel version In-Reply-To: <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> References: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> Message-ID: <53ee955f-0870-456f-8c46-67fafb8bfff8@benettiengineering.com> Dario, I've also tried to build this defconfig and it fails while building ti-k3-r5-loader with: ``` COPY spl/u-boot-spl.bin ./tools/k3_gen_x509_cert.sh -c 16 -b spl/u-boot-spl.bin \ -o tiboot3.bin -l 0x43c00000 -r 1 -k "" SWRV = 1 Could not open file or uri for loading private key from eckey.pem: No such file or directory cat: certificate.bin: No such file or directory rm: cannot remove 'certificate.bin': No such file or directory rm: cannot remove 'eckey.pem': No such file or directory make[3]: *** [arch/arm/mach-k3//config.mk:55: tiboot3.bin] Error 1 make[3]: *** Deleting file 'tiboot3.bin' ``` Can you please take a look into it? Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas On 05/02/24 16:13, Giulio Benetti wrote: > Hi Dario, > > On 23/11/23 14:40, Dario Binacchi wrote: >> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig) forgot to >> specify the Linux kernel version, so do that now. >> >> When the defconfig was added, the default version was 6.4.x, so use >> version 6.4.16. >> >> Signed-off-by: Dario Binacchi > --- >> ? configs/ti_am62x_sk_defconfig | 3 +++ >> ? 1 file changed, 3 insertions(+) >> >> diff --git a/configs/ti_am62x_sk_defconfig >> b/configs/ti_am62x_sk_defconfig >> index b98a68ff153f..6610e6fcf890 100644 >> --- a/configs/ti_am62x_sk_defconfig >> +++ b/configs/ti_am62x_sk_defconfig >> @@ -1,7 +1,10 @@ >> ? BR2_aarch64=y >> +BR2_KERNEL_HEADERS_6_4=y > > here ^^^ you need to specify BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 > and not the line above, > >> ? BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> ? BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" >> ? BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" >> ? BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >> ? BR2_LINUX_KERNEL_DTS_SUPPORT=y >> ? BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > > Can you please correct and send V2? > > Thank you! > > Best regards From giulio.benetti at benettiengineering.com Mon Feb 5 15:36:21 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 16:36:21 +0100 Subject: [Buildroot] [PATCH] configs/am574x_idk_defconfig: new defconfig In-Reply-To: <20240131173827.1281120-1-romain.naour@smile.fr> References: <20240131173827.1281120-1-romain.naour@smile.fr> Message-ID: Hi Romain, On 31/01/24 18:38, Romain Naour wrote: > This patch adds a basic support for AM574x Industrial Development Kit > [1]. > > Use multi_v7_defconfig as kernel configuration file instead of > the deprecated omap2plus_defconfig [2]. > > The main differences between upstream kernels and the TI vendor tree > (5.10.x based) are: > > - pru based 100M ethernet ports will not work with upstream kernels > since the prueth driver for AM57 is not upstream yet (as of 6.8-rc2) > [3]. > > - The ARM/DSP examples provided by TI [4] will not work either since > they requires an experimental patch [5] adding "remote-processor > messaging sockets". > > - There is no support for the POWERVR GPU SGX544 that requires > additional userpace vendor (closed source) libraries. > > [1] https://www.ti.com/tool/TMDSIDK574 > [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cca9f6838bac3441a42fa906314bf5e3bff50ac5 > [3] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=792b57aac224416f66175c15d60379a4cf581d0f > [4] https://git.ti.com/cgit/processor-sdk/big-data-ipc-examples > [5] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=f4b978a978c38149f712ddd137f12ed5fb914161 > > Signed-off-by: Romain Naour > --- > board/ti/am574x-idk/extlinux.conf | 4 +++ > board/ti/am574x-idk/genimage.cfg | 30 +++++++++++++++++++++ > board/ti/am574x-idk/post-build.sh | 4 +++ > board/ti/am574x-idk/readme.txt | 28 +++++++++++++++++++ > configs/am574x_idk_defconfig | 45 +++++++++++++++++++++++++++++++ > 5 files changed, 111 insertions(+) > create mode 100644 board/ti/am574x-idk/extlinux.conf > create mode 100644 board/ti/am574x-idk/genimage.cfg > create mode 100755 board/ti/am574x-idk/post-build.sh > create mode 100644 board/ti/am574x-idk/readme.txt > create mode 100644 configs/am574x_idk_defconfig > > diff --git a/board/ti/am574x-idk/extlinux.conf b/board/ti/am574x-idk/extlinux.conf > new file mode 100644 > index 0000000000..29e0ecfa14 > --- /dev/null > +++ b/board/ti/am574x-idk/extlinux.conf > @@ -0,0 +1,4 @@ > +label am5749-idk-buildroot > + kernel /zImage > + fdtdir / > + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait > diff --git a/board/ti/am574x-idk/genimage.cfg b/board/ti/am574x-idk/genimage.cfg > new file mode 100644 > index 0000000000..02a9ffe013 > --- /dev/null > +++ b/board/ti/am574x-idk/genimage.cfg > @@ -0,0 +1,30 @@ > +image boot.vfat { > + vfat { > + files = { > + "MLO", > + "u-boot.img", > + "zImage", > + "am574x-idk.dtb", > + "extlinux" > + } > + } > + > + size = 16M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 1G > + } > +} > diff --git a/board/ti/am574x-idk/post-build.sh b/board/ti/am574x-idk/post-build.sh > new file mode 100755 > index 0000000000..5dcdb352eb > --- /dev/null > +++ b/board/ti/am574x-idk/post-build.sh > @@ -0,0 +1,4 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${BINARIES_DIR}"/extlinux/extlinux.conf > diff --git a/board/ti/am574x-idk/readme.txt b/board/ti/am574x-idk/readme.txt > new file mode 100644 > index 0000000000..4869984cf1 > --- /dev/null > +++ b/board/ti/am574x-idk/readme.txt > @@ -0,0 +1,28 @@ > +Texas Instuments AM574x IDK Test and Development Board > + > +Description > +=========== > + > +This configuration will build a basic image for the TI AM574x IDK > +board: https://www.ti.com/tool/TMDSIDK574 > + > +How to build it > +=============== > + > +Configure Buildroot: > + > + $ make am574x_idk_defconfig > + > +Compile everything and build the USB flash drive image: > + > + $ make > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > diff --git a/configs/am574x_idk_defconfig b/configs/am574x_idk_defconfig > new file mode 100644 > index 0000000000..bbae73dff4 > --- /dev/null > +++ b/configs/am574x_idk_defconfig > @@ -0,0 +1,45 @@ > +# Architecture > +BR2_arm=y > +BR2_cortex_a15=y > + > +# System > +BR2_SYSTEM_DHCP="eth0" > + > +# Linux headers same as kernel, a 6.6 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" > +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am574x-idk" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am574x-idk/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am574x-idk/genimage.cfg" > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_IMG=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="MLO" > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y It looks good to me and I've build tested it using docker-run. Reviewed-by: Giulio Benetti [Build Tested] Tested-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From fontaine.fabrice at gmail.com Mon Feb 5 15:36:45 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 5 Feb 2024 16:36:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: needs threads In-Reply-To: <20240205163358.7752aec0@windsurf> References: <20240116214427.945514-1-fontaine.fabrice@gmail.com> <20240205163358.7752aec0@windsurf> Message-ID: Hi Thomas, Le lun. 5 f?vr. 2024 ? 16:34, Thomas Petazzoni a ?crit : > > On Tue, 16 Jan 2024 22:44:27 +0100 > Fabrice Fontaine wrote: > > > libtracefs needs threads resulting in the following build failure since > > its addition in commit b1dbd3f679e6660325472e3fdca72127d74e6929: > > > > In file included from /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, > > from ../src/tracefs-instance.c:10: > > /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] > > 218 | # warning requested reentrant code, but thread support was disabled > > | ^~~~~~~ > > ../src/tracefs-instance.c:20:10: fatal error: pthread.h: No such file or directory > > 20 | #include > > | ^~~~~~~~~~~ > > > > Fixes: > > - http://autobuild.buildroot.org/results/e0a8dd0781a1d1824a4cb78f47dcff4055083959 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/libtracefs/Config.in | 5 +++-- > > package/linux-tools/Config.in | 5 +++-- > > 2 files changed, 6 insertions(+), 4 deletions(-) > > Thanks a lot! It looks like you missed trace-cmd package, which also > selects libtracefs, so I fixed that up when applying. Thanks! I didn't miss trace-cmd, it already has a dependency on BR2_TOOLCHAIN_HAS_THREADS_NPTL. > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice From thomas.petazzoni at bootlin.com Mon Feb 5 15:37:24 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:37:24 +0100 Subject: [Buildroot] [git commit] package/libtirpc: bump version to 1.3.4 Message-ID: <20240205153822.80E4486D44@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26890624ef64d06982d952335603ee8a9cd3c73a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/libtirpc/libtirpc.hash | 4 ++-- package/libtirpc/libtirpc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libtirpc/libtirpc.hash b/package/libtirpc/libtirpc.hash index 1efc3e47e2..40e59f9bcb 100644 --- a/package/libtirpc/libtirpc.hash +++ b/package/libtirpc/libtirpc.hash @@ -1,5 +1,5 @@ # From sourceforge's info on download page: -sha1 6e52c39148494e4836e2d5d4f28b11ddfa65394b libtirpc-1.3.3.tar.bz2 +sha1 63c800f81f823254d2706637bab551dec176b99b libtirpc-1.3.4.tar.bz2 # Locally computed -sha256 6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3 libtirpc-1.3.3.tar.bz2 +sha256 1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860 libtirpc-1.3.4.tar.bz2 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 179adc97d0..298b3c36bd 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.3.3 +LIBTIRPC_VERSION = 1.3.4 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Mon Feb 5 15:36:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:36:54 +0100 Subject: [Buildroot] [git commit] package/libqrtr-glib: bump version to 1.2.2 Message-ID: <20240205153822.75F3F86D43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b50bb982208011841fe0a9a7e4309808085cf493 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Project switched to meson. Use gitlab.freedesktop.org for download (previous URL did not work for meson), thus moving to tar.gz archive. Disable gtkdocize (not only to follow Buildroot approach, but also to avoid build failure: ERROR: Program 'gtkdoc-scan' not found or not executable). License file got renamed: https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/commit/974e4231eaf4a3bf087c1df54e77df8cac935e15 Signed-off-by: Petr Vorel Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/libqrtr-glib/libqrtr-glib.hash | 4 ++-- package/libqrtr-glib/libqrtr-glib.mk | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/libqrtr-glib/libqrtr-glib.hash b/package/libqrtr-glib/libqrtr-glib.hash index e00dd0cb94..38543f7de9 100644 --- a/package/libqrtr-glib/libqrtr-glib.hash +++ b/package/libqrtr-glib/libqrtr-glib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee libqrtr-glib-1.0.0.tar.xz +sha256 c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763 libqrtr-glib-1.2.2.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt diff --git a/package/libqrtr-glib/libqrtr-glib.mk b/package/libqrtr-glib/libqrtr-glib.mk index 6ab8335417..c3df76dc84 100644 --- a/package/libqrtr-glib/libqrtr-glib.mk +++ b/package/libqrtr-glib/libqrtr-glib.mk @@ -4,19 +4,21 @@ # ################################################################################ -LIBQRTR_GLIB_VERSION = 1.0.0 -LIBQRTR_GLIB_SITE = http://www.freedesktop.org/software/libqmi -LIBQRTR_GLIB_SOURCE = libqrtr-glib-$(LIBQRTR_GLIB_VERSION).tar.xz +LIBQRTR_GLIB_VERSION = 1.2.2 +LIBQRTR_GLIB_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/archive/$(LIBQRTR_GLIB_VERSION) LIBQRTR_GLIB_LICENSE = LGPL-2.1+ -LIBQRTR_GLIB_LICENSE_FILES = COPYING.LIB +LIBQRTR_GLIB_LICENSE_FILES = LICENSES/LGPL-2.1-or-later.txt LIBQRTR_GLIB_INSTALL_STAGING = YES LIBQRTR_GLIB_DEPENDENCIES = libglib2 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBQRTR_GLIB_CONF_OPTS += --enable-introspection +LIBQRTR_GLIB_CONF_OPTS += -Dintrospection=true LIBQRTR_GLIB_DEPENDENCIES += gobject-introspection else -LIBQRTR_GLIB_CONF_OPTS += --disable-introspection +LIBQRTR_GLIB_CONF_OPTS += -Dintrospection=false endif -$(eval $(autotools-package)) +# disable gtkdocize +LIBQRTR_GLIB_CONF_OPTS += -Dgtk_doc=false + +$(eval $(meson-package)) From thomas.petazzoni at bootlin.com Mon Feb 5 15:38:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:38:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqrtr-glib: bump version to 1.2.2 In-Reply-To: <20240115223952.2532111-1-petr.vorel@gmail.com> References: <20240115223952.2532111-1-petr.vorel@gmail.com> Message-ID: <20240205163834.4f365ce7@windsurf> On Mon, 15 Jan 2024 23:39:52 +0100 Petr Vorel wrote: > Project switched to meson. > Use gitlab.freedesktop.org for download (previous URL did not work for > meson), thus moving to tar.gz archive. > > Disable gtkdocize (not only to follow Buildroot approach, but also to avoid > build failure: ERROR: Program 'gtkdoc-scan' not found or not executable). > > License file got renamed: > https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/commit/974e4231eaf4a3bf087c1df54e77df8cac935e15 > > Signed-off-by: Petr Vorel > --- > Hi, Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:38:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:38:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtirpc: bump version to 1.3.4 In-Reply-To: <20240115214809.2352232-1-petr.vorel@gmail.com> References: <20240115214809.2352232-1-petr.vorel@gmail.com> Message-ID: <20240205163845.74b6cd72@windsurf> On Mon, 15 Jan 2024 22:48:09 +0100 Petr Vorel wrote: > Signed-off-by: Petr Vorel > --- > package/libtirpc/libtirpc.hash | 4 ++-- > package/libtirpc/libtirpc.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:39:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:39:52 +0100 Subject: [Buildroot] [git commit] package/kvm-unit-tests: bump to version 2024-01-08 Message-ID: <20240205154129.E9A2C86D4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4ac946347cc0792956aca4d3ab2252aa9fbe2e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A new kvm-unit-tests version has recently been tagged, so we can use this version now for buildroot. It ships now with a full version of the GPL v2 license in the LICENSE file, thus we add a hash for that file, too. Signed-off-by: Thomas Huth Signed-off-by: Thomas Petazzoni --- package/kvm-unit-tests/kvm-unit-tests.hash | 5 +++-- package/kvm-unit-tests/kvm-unit-tests.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index 3b6d02dd8e..d4db9f2b75 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 9c9b093ffe3fa33145a53102de9c3e2d55cd0cdc8a20cf172b726296ffe22f4f kvm-unit-tests-v2023-01-05.tar.bz2 -sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT +sha256 8636994e10240705f10a9150ef688ae6832d0ea0dcc8860c826c645ecfc1169f kvm-unit-tests-v2024-01-08.tar.bz2 +sha256 b3c9ca9e257f2eaae070cf0ccdf8770764f05a947a39a835e633413750a5777b COPYRIGHT +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 956f07b304..73d20d6b2e 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,11 +4,11 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = 2023-01-05 +KVM_UNIT_TESTS_VERSION = 2024-01-08 KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) KVM_UNIT_TESTS_LICENSE = GPL-2.0, LGPL-2.0 -KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT +KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT LICENSE ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) KVM_UNIT_TESTS_ARCH = aarch64 From thomas.petazzoni at bootlin.com Mon Feb 5 15:41:32 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:41:32 +0100 Subject: [Buildroot] [PATCH] package/kvm-unit-tests: bump to version 2024-01-08 In-Reply-To: <20240116084826.917058-1-huth@tuxfamily.org> References: <20240116084826.917058-1-huth@tuxfamily.org> Message-ID: <20240205164132.41ef9664@windsurf> On Tue, 16 Jan 2024 09:48:26 +0100 Thomas Huth wrote: > A new kvm-unit-tests version has recently been tagged, so we can use this > version now for buildroot. It ships now with a full version of the GPL v2 > license in the LICENSE file, thus we add a hash for that file, too. > > Signed-off-by: Thomas Huth > --- > package/kvm-unit-tests/kvm-unit-tests.hash | 5 +++-- > package/kvm-unit-tests/kvm-unit-tests.mk | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:42:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:42:05 +0100 Subject: [Buildroot] [PATCH 1/1] configs/asus_tinker-s_rk3288: bump Linux to 6.1.72 In-Reply-To: <20240115180946.1646186-1-flavio.tapajos@newtesc.com.br> References: <20240115180946.1646186-1-flavio.tapajos@newtesc.com.br> Message-ID: <20240205164205.33c28a05@windsurf> On Mon, 15 Jan 2024 15:09:46 -0300 Fl?vio Tapaj?s wrote: > Signed-off-by: Fl?vio Tapaj?s > --- > configs/asus_tinker-s_rk3288_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:41:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:41:56 +0100 Subject: [Buildroot] [git commit] configs/asus_tinker-s_rk3288: bump Linux to 6.1.72 Message-ID: <20240205154307.6421086D51@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ff00badaa23549f6a339a43f8ce19b4115a0796 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fl??vio Tapaj??s Signed-off-by: Thomas Petazzoni --- configs/asus_tinker-s_rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/asus_tinker-s_rk3288_defconfig b/configs/asus_tinker-s_rk3288_defconfig index fc1b3b3505..de03336cbb 100644 --- a/configs/asus_tinker-s_rk3288_defconfig +++ b/configs/asus_tinker-s_rk3288_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.70" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.72" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker-s" From thomas.petazzoni at bootlin.com Mon Feb 5 15:46:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:46:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: needs threads In-Reply-To: References: <20240116214427.945514-1-fontaine.fabrice@gmail.com> <20240205163358.7752aec0@windsurf> Message-ID: <20240205164652.535887b4@windsurf> On Mon, 5 Feb 2024 16:36:45 +0100 Fabrice Fontaine wrote: > > Thanks a lot! It looks like you missed trace-cmd package, which also > > selects libtracefs, so I fixed that up when applying. Thanks! > > I didn't miss trace-cmd, it already has a dependency on > BR2_TOOLCHAIN_HAS_THREADS_NPTL. It is totally true, but in general we try to propagate the dependencies anyway so that we keep track of why we have those dependencies. I agree it's not a 100% accurate rule in the way we apply it. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 16:02:24 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 17:02:24 +0100 Subject: [Buildroot] [git commit] support/testing: use Nehalem cpu emulation for TestGrubX8664EFI Message-ID: <20240205160313.0224086D5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f565b52225785bfa268ea19c4c347917d38ade4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In commit 7e0e6e3b8618 (toolchain/toolchain-external/toolchain-external-bootlin: update to 2023.11-1) the TestGrubX8664EFI fails with this error: # efivar -l traps: efivar[86] trap invalid opcode ip:7fc187f4c7f4 sp:7fff9bbaa930 error:0 in libefivar.so.1.38[7fc187f4c000+16000] Illegal instruction This error can be reproduced by installing other packages like "file". The 2023.11-1 Bootlin toolchains are built for a corei7 CPU [0], which is in fact a Nehalem CPU; we switched to the new names in commit 653fa001f304 (arch/Config.in.x86: add "newer" names for several Intel x86 CPU variants). This means that the Bootlin toolchains may use Nehalem-specific instructions. The TestGrubX8664EFI test is also setup for BR2_x86_corei7, so our executables will also contain Nehalem instructions. However, the default Qemu x86_64 is not guaranteed to emulate all the instructions specific to Nehalem, causing runtime issues as reported above. A similar issue has been fixed in toolchain-builder by adding Nehalem cpu emulation on the qemu command line [0]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 [0] https://gitlab.com/buildroot.org/toolchains-builder/-/commit/f2b253732b4d1fc5b87badba7c2d48f12a197f76 Signed-off-by: Romain Naour [yann.morin.1998 at free.fr: - reword the commit log to explain corei7 -> Nehalem equivalence - note that the toolchain-builder *and* our test target corei7, thus Nehalem ] Signed-off-by: Yann E. MORIN --- support/testing/tests/boot/test_grub.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py index 9f3a6a8495..5315fa23ba 100644 --- a/support/testing/tests/boot/test_grub.py +++ b/support/testing/tests/boot/test_grub.py @@ -120,7 +120,7 @@ class TestGrubX8664EFI(infra.basetest.BRTest): # https://github.com/tianocore/edk2/commit/bf5678b5802685e07583e3c7ec56d883cbdd5da3 # http://lists.busybox.net/pipermail/buildroot/2023-July/670825.html qemu_fw_cfg = "name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes" - self.emulator.boot(arch="x86_64", options=["-bios", bios, "-hda", hda, "-fw_cfg", qemu_fw_cfg]) + self.emulator.boot(arch="x86_64", options=["-bios", bios, "-cpu", "Nehalem", "-hda", hda, "-fw_cfg", qemu_fw_cfg]) self.emulator.login() cmd = "modprobe efivarfs" From yann.morin.1998 at free.fr Mon Feb 5 16:04:40 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 17:04:40 +0100 Subject: [Buildroot] [PATCH] support/testing: TestGrubX8664EFI: use Nehalem cpu emulation In-Reply-To: <20240205133530.1188319-1-romain.naour@smile.fr> References: <20240205133530.1188319-1-romain.naour@smile.fr> Message-ID: Romain, All, On 2024-02-05 14:35 +0100, Romain Naour spake thusly: > Following the Bootlin toolchain bump to 2023.11-1 [1], the > TestGrubX8664EFI failed with this error: As we discussed IRL, I've reworded the commit log with your input. > # efivar -l > traps: efivar[86] trap invalid opcode ip:7fc187f4c7f4 sp:7fff9bbaa930 error:0 in libefivar.so.1.38[7fc187f4c000+16000] > Illegal instruction > > Actually this error can be reproduced by installing other packages like > "file" because the qemu emulation doesn't provide all assembler > instruction emulation required by x86-64-core-i7 target used by > TestGrubX8664EFI. > > A similar issue has been fixed in toolchain-builder by adding Nehalem > cpu emulation on the qemu command line [2]. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 > > [1] 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 > [2] https://gitlab.com/buildroot.org/toolchains-builder/-/commit/f2b253732b4d1fc5b87badba7c2d48f12a197f76 > > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/testing/tests/boot/test_grub.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py > index 9f3a6a8495..5315fa23ba 100644 > --- a/support/testing/tests/boot/test_grub.py > +++ b/support/testing/tests/boot/test_grub.py > @@ -120,7 +120,7 @@ class TestGrubX8664EFI(infra.basetest.BRTest): > # https://github.com/tianocore/edk2/commit/bf5678b5802685e07583e3c7ec56d883cbdd5da3 > # http://lists.busybox.net/pipermail/buildroot/2023-July/670825.html > qemu_fw_cfg = "name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes" > - self.emulator.boot(arch="x86_64", options=["-bios", bios, "-hda", hda, "-fw_cfg", qemu_fw_cfg]) > + self.emulator.boot(arch="x86_64", options=["-bios", bios, "-cpu", "Nehalem", "-hda", hda, "-fw_cfg", qemu_fw_cfg]) > self.emulator.login() > > cmd = "modprobe efivarfs" > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ismael at iodev.co.uk Mon Feb 5 16:18:44 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Mon, 5 Feb 2024 17:18:44 +0100 Subject: [Buildroot] [PATCH] package/mawk: bump version to 1.3.4-20240123 Message-ID: <20240205161846.30230-1-ismael@iodev.co.uk> Signed-off-by: Ismael Luceno --- package/mawk/mawk.hash | 2 +- package/mawk/mawk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mawk/mawk.hash b/package/mawk/mawk.hash index 0a31675ac8e9..31a74cab606e 100644 --- a/package/mawk/mawk.hash +++ b/package/mawk/mawk.hash @@ -1,2 +1,2 @@ -sha256 88f55a632e2736ff5c5f69944abc151734d89d8298d5005921180f39ab7ba6d0 mawk-1.3.4-20230808.tgz +sha256 a8e319a83744b1f1fb6988dfa189d61887f866e9140cc9a49eb003b2b0655e88 mawk-1.3.4-20240123.tgz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mawk/mawk.mk b/package/mawk/mawk.mk index d747f887ce39..9aadf6d9727e 100644 --- a/package/mawk/mawk.mk +++ b/package/mawk/mawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAWK_VERSION = 1.3.4-20230808 +MAWK_VERSION = 1.3.4-20240123 MAWK_SITE = https://invisible-mirror.net/archives/mawk MAWK_SOURCE = mawk-$(MAWK_VERSION).tgz MAWK_LICENSE = GPL-2.0 -- 2.43.0 From thomas.petazzoni at bootlin.com Mon Feb 5 16:23:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 17:23:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/leptonica: affected by gcc bug 101737 In-Reply-To: <20240115211427.4291-1-fontaine.fabrice@gmail.com> References: <20240115211427.4291-1-fontaine.fabrice@gmail.com> Message-ID: <20240205172321.6c7602e4@windsurf> On Mon, 15 Jan 2024 22:14:27 +0100 Fabrice Fontaine wrote: > leptonica is affected by gcc bug 101737 resulting in the following build > failure since at least bump to version 1.82.0 in commit > 81a961c545cc9f240841b75d6c21f13b334bc274: > > sh4eb-buildroot-linux-gnu-gcc.br_real: internal compiler error: Segmentation fault signal terminated program cc1 > Please submit a full bug report, with preprocessed source (by using -freport-bug). > See for instructions. > > Fixes: > - http://autobuild.buildroot.org/results/f18979454399d9c728f9e017e4cc3a1b27458f5b > - http://autobuild.buildroot.org/results/f3c803892175b3bb2ce68e3140c879b4a4d4b302 > > Signed-off-by: Fabrice Fontaine > --- > package/leptonica/leptonica.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 16:26:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 17:26:26 +0100 Subject: [Buildroot] [git commit] package/leptonica: affected by gcc bug 101737 Message-ID: <20240205162635.A70D886D62@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31b488337921d57c14893c34766ac22c53e5382b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master leptonica is affected by gcc bug 101737 resulting in the following build failure since at least bump to version 1.82.0 in commit 81a961c545cc9f240841b75d6c21f13b334bc274: sh4eb-buildroot-linux-gnu-gcc.br_real: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source (by using -freport-bug). See for instructions. Fixes: - http://autobuild.buildroot.org/results/f18979454399d9c728f9e017e4cc3a1b27458f5b - http://autobuild.buildroot.org/results/f3c803892175b3bb2ce68e3140c879b4a4d4b302 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/leptonica/leptonica.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 8eedf2fda9..4cb73296e8 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -14,6 +14,10 @@ LEPTONICA_DEPENDENCIES = host-pkgconf LEPTONICA_CONF_OPTS += --disable-programs +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +LEPTONICA_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -O0" +endif + ifeq ($(BR2_PACKAGE_GIFLIB),y) LEPTONICA_DEPENDENCIES += giflib LEPTONICA_CONF_OPTS += --with-giflib From james.hilliard1 at gmail.com Mon Feb 5 16:30:24 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:30:24 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/python-ruamel-yaml: bump to version 0.18.5 Message-ID: <20240205163024.500599-1-james.hilliard1@gmail.com> License hash changed due to year update: https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ Signed-off-by: James Hilliard --- Changes v1 -> v2: - fix package hash typo --- package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index 29852a51ed..b614c01d79 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/rfc3987/json -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz +sha256 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ruamel.yaml-0.18.5.tar.gz # Locally computed sha256 checksums -sha256 ab837b032c5aae84503fc0c733a116a26fd272e90dc4402fa68d3c9e51aed3b0 LICENSE +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 LICENSE diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk index a6fed3bc2c..bbdac591ca 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RUAMEL_YAML_VERSION = 0.17.21 +PYTHON_RUAMEL_YAML_VERSION = 0.18.5 PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/82/43/fa976e03a4a9ae406904489119cd7dd4509752ca692b2e0a19491ca1782c PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools PYTHON_RUAMEL_YAML_LICENSE = MIT PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 5 16:32:18 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:32:18 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <87plxbta1d.fsf@48ers.dk> References: <20240111053157.2928259-1-james.hilliard1@gmail.com> <87plxbta1d.fsf@48ers.dk> Message-ID: On Mon, Feb 5, 2024 at 4:39?AM Peter Korsgaard wrote: > > >>>>> "James" == James Hilliard writes: > > > License hash changed due to year update: > > https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ > > > Signed-off-by: James Hilliard > > --- > > package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- > > package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- > > 2 files changed, 5 insertions(+), 5 deletions(-) > > > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash > > index 29852a51ed..7b5dc1e29a 100644 > > --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash > > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash > > @@ -1,5 +1,5 @@ > > # md5, sha256 from https://pypi.org/pypi/rfc3987/json > > -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz > > -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz > > +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz > > +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 ruamel.yaml-0.18.5.tar.gz > > > Hmm, I get a different hash: > > ruamel.yaml-0.18.5.tar.gz: OK (md5: 24fac3544a3c7bd7eeaf6e4f704a056e) > ERROR: while checking hashes from package/python-ruamel-yaml//python-ruamel-yaml.hash > ERROR: ruamel.yaml-0.18.5.tar.gz has wrong sha256 hash: > ERROR: expected: ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 > ERROR: got : 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e > ERROR: Incomplete download, or man-in-the-middle (MITM) attack Looks like I typo'd the package hash(copy pasted license hash to package hash), fixed in v2: https://patchwork.ozlabs.org/project/buildroot/patch/20240205163024.500599-1-james.hilliard1 at gmail.com/ > > Any ideas? > > -- > Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 5 16:46:15 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:46:15 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-fastapi: bump to version 0.109.2 In-Reply-To: <20240205164615.510688-1-james.hilliard1@gmail.com> References: <20240205164615.510688-1-james.hilliard1@gmail.com> Message-ID: <20240205164615.510688-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.105.0 +PYTHON_FASTAPI_VERSION = 0.109.2 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 5 16:46:14 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:46:14 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-starlette: bump to version 0.36.3 Message-ID: <20240205164615.510688-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-starlette/python-starlette.hash | 4 ++-- package/python-starlette/python-starlette.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash index 820026b70b..03d77cf5be 100644 --- a/package/python-starlette/python-starlette.hash +++ b/package/python-starlette/python-starlette.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/starlette/json -md5 2ef2fc635691fd4a1823564218292dce starlette-0.34.0.tar.gz -sha256 ed050aaf3896945bfaae93bdf337e53ef3f29115a9d9c153e402985115cd9c8e starlette-0.34.0.tar.gz +md5 0a1e026d653dc448ae07f47eefe1dc8b starlette-0.36.3.tar.gz +sha256 90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080 starlette-0.36.3.tar.gz # Locally computed sha256 checksums sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk index 07f9d6be5e..9d137f5f5a 100644 --- a/package/python-starlette/python-starlette.mk +++ b/package/python-starlette/python-starlette.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_STARLETTE_VERSION = 0.34.0 +PYTHON_STARLETTE_VERSION = 0.36.3 PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/4f/36/168ba6d56a28382f3b081b23b0cc431de35786e120b94c1f372708ed3059 +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/be/47/1bba49d42d63f4453f0a64a20acbf2d0bd2f5a8cde6a166ee66c074a08f8 PYTHON_STARLETTE_SETUP_TYPE = pep517 PYTHON_STARLETTE_LICENSE = BSD-3-Clause PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 5 16:47:33 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:47:33 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-starlette: bump to version 0.34.0 In-Reply-To: <87il33rm9s.fsf@48ers.dk> References: <20240111072922.3082638-1-james.hilliard1@gmail.com> <87sf27upph.fsf@48ers.dk> <42594955-dcd4-4161-9a84-879f096d49f7@bubu1.eu> <87il33rm9s.fsf@48ers.dk> Message-ID: On Mon, Feb 5, 2024 at 7:58?AM Peter Korsgaard wrote: > > >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > > > Hi Peter, > > On 05.02.24 12:15, Peter Korsgaard wrote: > >>>>>>> "James" == James Hilliard writes: > >> > Signed-off-by: James Hilliard > >> Committed, thanks. > >> > > > We currently have fastapi 0.105.0 in buildroot which depends on > > starlette < 0.28.0. > > > There's a pending patch by James that bumps it to 0.108.0, which > > unfortunately is also not compatible with starlette 0.34.0 [1] :-/ > > > In fact there's no fastapi release that is compatible with starlette > > 0.34.0 (newer fastapi releases require even newer starlette > > versions...) > > Argh :( > > > I guess I'll send a series that bumps *both* again to compatible versions? > > Yes please! Updated both to compatible versions here: https://patchwork.ozlabs.org/project/buildroot/list/?series=393659 > > -- > Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 5 16:53:53 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:53:53 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.17.1 Message-ID: <20240205165353.515894-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-rpds-py/python-rpds-py.hash | 2 +- package/python-rpds-py/python-rpds-py.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash index b04aa210d3..4650d9c385 100644 --- a/package/python-rpds-py/python-rpds-py.hash +++ b/package/python-rpds-py/python-rpds-py.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz +sha256 760b05720269195d86071ac7cf627b3a4ab9366680d8d449a6a63b84d96a5bc0 rpds_py-0.17.1.tar.gz # Locally computed sha256 checksums sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 6f71d02047..80670f2e4f 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPDS_PY_VERSION = 0.12.0 +PYTHON_RPDS_PY_VERSION = 0.17.1 PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/b7/0a/e3bdcc977e6db3bf32a3f42172f583adfa7c3604091a03d512333e0161fe PYTHON_RPDS_PY_SETUP_TYPE = maturin PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 5 16:58:48 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:58:48 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pymodbus: bump to version 3.6.4 Message-ID: <20240205165848.519437-1-james.hilliard1@gmail.com> License hash changed due to year range update: https://github.com/pymodbus-dev/pymodbus/commit/131d30391efd9c64f1fec857ae0372746374e6d2 Drop no longer required python-six runtime dependency. Drop no longer required python-serial runtime dependency. Signed-off-by: James Hilliard --- package/python-pymodbus/Config.in | 6 ++---- package/python-pymodbus/python-pymodbus.hash | 6 +++--- package/python-pymodbus/python-pymodbus.mk | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/python-pymodbus/Config.in b/package/python-pymodbus/Config.in index 0ba6fb88f0..dac6716b87 100644 --- a/package/python-pymodbus/Config.in +++ b/package/python-pymodbus/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_PYMODBUS bool "python-pymodbus" - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_SERIAL # runtime help - Pymodbus is a full Modbus protocol implementation. + A fully featured modbus protocol stack in python. - https://github.com/riptideio/pymodbus + https://github.com/pymodbus-dev/pymodbus/ diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index d9337ffe84..2e9e87148a 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 89da6585b27b8c4b3887eb9f7d1e950b pymodbus-3.0.2.tar.gz -sha256 704cb7fb90631c45f9c3a70b89d0c990fe0e208ac56f14a5c449e21bebd1e201 pymodbus-3.0.2.tar.gz +md5 977e0f1fa05dc5b07fd151544c508675 pymodbus-3.6.4.tar.gz +sha256 6eee2c7eedb794317784c967096fa1fe42200357e9b5a349d838ee9159624fe2 pymodbus-3.6.4.tar.gz # Locally computed sha256 checksums -sha256 796a47993313691ea404d8af7e4c0f9daf1d2760e3900938985b59c9008eee2f LICENSE +sha256 47f904249172e795a6b32de91f471073297befffd74e17cafc288d348a55972e LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 54879d38e9..c1c17ae799 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 3.0.2 +PYTHON_PYMODBUS_VERSION = 3.6.4 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/94/f7/6149a1b107fa54378a7adec83db7cd3679bf02216a6f5c83b37f55335897 +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/5b/7f/51eb8704092417ef8ab1d883ad793c27f7f34d67468efe36ca03c6c7863d PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = LICENSE -- 2.34.1 From sebastien.szymanski at armadeus.com Mon Feb 5 16:53:00 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Mon, 5 Feb 2024 17:53:00 +0100 Subject: [Buildroot] [PATCH 1/1] board/freescale/common/imx: imx8-bootloader-prepare: enable error checking In-Reply-To: <20230914165046.3687491-1-wojciech.nizinski@grinn-global.com> References: <20230914165046.3687491-1-wojciech.nizinski@grinn-global.com> Message-ID: <506452af-5722-41d3-a5f2-2a9eed0d4263@armadeus.com> Hi Wojciech, All, I tested your patch and it does work. I have some comments though, see below... On 9/14/23 18:50, Wojciech Nizinski wrote: > Run script with 'errexit' bash option to detect any errors from > subcommands. > > It will fix situation where 'ddr_fw.bin' was missing but successfull > build created broken boot image. Post image script report this by: > > cat: /home/user/buildroot/output/images/ddr_fw.bin: No such file or > directory > > and build finish with success. > > Signed-off-by: Wojciech Nizinski > --- > board/freescale/common/imx/imx8-bootloader-prepare.sh | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh > index 7ebf15b6ff..8d44e588c5 100755 > --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh > +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh > @@ -73,4 +73,5 @@ main () > exit $? > } > > +set -o errexit For consistency, maybe you should use 'set -e' here. (utils/docker-run is the only script that uses '+set -o errexit') Also, the only way (I am thinking of) to not have the ddr_fw.bin file is if the user didn't select the firmware-imx package. Maybe, the script should produces an hint to the user about how to get that ddr_fw bin file? "ddr_fw file not found: did you select firmware-imx package?" Regards, > main $@ -- S?bastien Szymanski, Armadeus Systems Software engineer From thomas.petazzoni at bootlin.com Mon Feb 5 17:09:59 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 18:09:59 +0100 Subject: [Buildroot] [PATCH] package/ifplugd: add option to override sysconfdir In-Reply-To: <20240115142744.70711-1-aolvolk@salutedevices.com> References: <20240115142744.70711-1-aolvolk@salutedevices.com> Message-ID: <20240205180959.5c662ae1@windsurf> Hello Alisa, On Mon, 15 Jan 2024 17:27:44 +0300 Alisa Volk via buildroot wrote: > Add BR2_PACKAGE_IFPLUGD_SYSCONFDIR option to pass custom --sysconfdir argument. > > Ifplugd init script is auto-generated with sysconfdir="etc/" by default. > As a result path to ifplugd configuration file is hardcoded > to /etc/ifplugd/ifplugd.conf. Thanks a lot for your patch! However, looking at it, the --sysconfdir option has no impact on the path to the ifplugd.conf file. This file is sourced by the init script before starting ifplugd, as explained in the ifplugd man page: FILES /etc/ifplugd/ifplugd.conf: this file is sourced by the init script /etc/init.d/ifplugd and contains the interface to be monitored and the options to be used. Looking at the code, the only file affected by the --sysconfdir option is ifplugd.action, and the path to this file can be overridden at runtime using: -r | --run= EXEC Specify program to execute when link status changes (default: /etc/ifplugd/ifplugd.action) So, in the end, it looks like your patch is not needed, as the location of both ifplugd.conf and ifplugd.action is runtime configurable. BTW, the ifplugd package does not have a Buildroot init script, it would be nice to add one, if you have some time of course :-) Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From james.hilliard1 at gmail.com Mon Feb 5 17:20:35 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 10:20:35 -0700 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package In-Reply-To: References: <170712853287.18164.6368517214119629150-0@git.sr.ht> Message-ID: On Mon, Feb 5, 2024 at 7:39?AM Yann E. MORIN wrote: > > Marcus, All, > > On 2023-09-21 22:39 +0200, ~bubu spake thusly: > > From: Marcus Hoffmann > > > > Calling `setup.py` build builds and installs an empty package > > after upstream changed their packaging. Calling setuptools via > > `python -m build` builds the package correctly. > > Applied to master, after fixing the authroship and Sob as we discussed > IRL, thanks. FYI we should be able to revert this once we migrate setuptools infrastructure to pep517: https://patchwork.ozlabs.org/project/buildroot/patch/20231126180840.2081945-5-james.hilliard1 at gmail.com/ > > Regards, > Yann E. MORIN. > > > --- > > package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk > > index 5a6e7733be..cb8a0d8cc9 100644 > > --- a/package/python-minimalmodbus/python-minimalmodbus.mk > > +++ b/package/python-minimalmodbus/python-minimalmodbus.mk > > @@ -7,7 +7,8 @@ > > PYTHON_MINIMALMODBUS_VERSION = 2.1.1 > > PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz > > PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 > > -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools > > +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools > > +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 > > PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 > > PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE > > > > -- > > 2.38.5 > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Mon Feb 5 17:21:13 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 10:21:13 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-rtoml: bump to version 0.10.0 In-Reply-To: <687fa6af-4d6f-4890-bd3a-c420ede9cdfd@mind.be> References: <20240111052225.2922249-1-james.hilliard1@gmail.com> <687fa6af-4d6f-4890-bd3a-c420ede9cdfd@mind.be> Message-ID: On Mon, Feb 5, 2024 at 4:29?AM Arnout Vandecappelle wrote: > > > > On 11/01/2024 06:22, James Hilliard wrote: > > Migrate from setuptools-rust to maturin infrastructure. > > > > Signed-off-by: James Hilliard > > --- > > package/python-rtoml/python-rtoml.hash | 2 +- > > package/python-rtoml/python-rtoml.mk | 6 +++--- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash > > index 04d22ed1a4..59f17d9d62 100644 > > --- a/package/python-rtoml/python-rtoml.hash > > +++ b/package/python-rtoml/python-rtoml.hash > > @@ -1,4 +1,4 @@ > > # Locally calculated after vendoring > > -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz > > +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz > > Same problem: > > ERROR: while checking hashes from package/python-rtoml//python-rtoml.hash > ERROR: rtoml-0.10.0.tar.gz has wrong sha256 hash: > ERROR: expected: 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 > ERROR: got : 624cc1ff2b3fdea42aeee3a4d1537d37431ec001870dfee1e04a12bd3076a2d3 Hmm, I'm unable to reproduce this issue. > > > Regards, > Arnout > > > # Locally computed sha256 checksums > > sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE > > diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk > > index 819dcf3288..16f9dea573 100644 > > --- a/package/python-rtoml/python-rtoml.mk > > +++ b/package/python-rtoml/python-rtoml.mk > > @@ -4,10 +4,10 @@ > > # > > ################################################################################ > > > > -PYTHON_RTOML_VERSION = 0.8.0 > > +PYTHON_RTOML_VERSION = 0.10.0 > > PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz > > -PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 > > -PYTHON_RTOML_SETUP_TYPE = setuptools-rust > > +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/ca/b2/0e77a00e75ed582ec1c4c3a9e1eeed886a15c195bcce87b7daf1171c4115 > > +PYTHON_RTOML_SETUP_TYPE = maturin > > PYTHON_RTOML_LICENSE = MIT > > PYTHON_RTOML_LICENSE_FILES = LICENSE > > From peter at korsgaard.com Mon Feb 5 17:21:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:21:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjwt: add gnutls support In-Reply-To: <20240203175840.141039-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 18:58:40 +0100") References: <20240203175840.141039-1-fontaine.fabrice@gmail.com> Message-ID: <87eddqsu7a.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > gnutls can be used if openssl is not available since the addition of the > package in commit 7251775773011e7da38e3a33c6817eceab6a9dfa > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 17:22:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:22:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/sqlciper: bump to version 4.5.5 In-Reply-To: <20240110173916.1113864-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 10 Jan 2024 18:39:16 +0100") References: <20240110173916.1113864-1-fontaine.fabrice@gmail.com> Message-ID: <87a5oesu58.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update hash of LICENSE file (update in year: > https://github.com/sqlcipher/sqlcipher/commit/b942636547ad68b1c38053099e7e877b2495d4cc) > https://github.com/sqlcipher/sqlcipher/blob/v4.5.5/CHANGELOG.md > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 17:23:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:23:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/sispmctl: bump to version 4.11 In-Reply-To: <20240110174742.1130350-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 10 Jan 2024 18:47:42 +0100") References: <20240110174742.1130350-1-fontaine.fabrice@gmail.com> Message-ID: <875xz2su4f.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Switch to https to avoid a redirection because of HSTS > https://sourceforge.net/p/sispmctl/git/ci/release-4.11/tree/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Mon Feb 5 17:23:27 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 18:23:27 +0100 Subject: [Buildroot] [PATCH 2/2] package/htop: fix build failure due to gcc bug 109809 In-Reply-To: <20240205172327.2537523-1-giulio.benetti@benettiengineering.com> References: <20240205172327.2537523-1-giulio.benetti@benettiengineering.com> Message-ID: <20240205172327.2537523-2-giulio.benetti@benettiengineering.com> The htop package exhibits gcc bug 109809 when built for the RISCV64 architecture with optimization enabled, which causes a build failure. As done for other packages in Buildroot work around this gcc bug by setting optimization to -O0 if BR2_TOOLCHAIN_HAS_GCC_BUG_109809=y. Fixes: still not happened. It shows up while building under docker-run this pending patch-set: https://patchwork.ozlabs.org/project/buildroot/list/?series=384841 Signed-off-by: Giulio Benetti --- package/htop/htop.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 6dbaae3796..853620dfe8 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -13,10 +13,18 @@ HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONF HTOP_LICENSE = GPL-2.0+ HTOP_LICENSE_FILES = COPYING +HTOP_CFLAGS = $(TARGET_CFLAGS) + # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test # provided by autoconf relies on wchar_t. HTOP_CONF_ENV += ac_cv_prog_cc_c99=-std=gnu99 +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_109809),y) +HTOP_CFLAGS += -O0 +endif + +HTOP_CONF_ENV += CFLAGS="$(HTOP_CFLAGS)" + ifeq ($(BR2_PACKAGE_HWLOC),y) HTOP_CONF_OPTS += --enable-hwloc HTOP_DEPENDENCIES += hwloc -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 5 17:23:26 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 18:23:26 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain: introduce BR2_TOOLCHAIN_HAS_GCC_BUG_109809 Message-ID: <20240205172327.2537523-1-giulio.benetti@benettiengineering.com> htop package fails to build for the RISCV64 architecture with optimization enabled with gcc = 13.2.0 and it's still present in gcc = 14.x as reported upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109809 So let's introduce BR2_TOOLCHAIN_HAS_GCC_BUG_109809 to handle packages affected by it like htop. Signed-off-by: Giulio Benetti --- toolchain/Config.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/toolchain/Config.in b/toolchain/Config.in index 34e0ae2c5f..64084dffe3 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -250,6 +250,14 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_107728 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_OPTIMIZE_0 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109809 +# ICE: in dwarf2out_frame_debug_cfa_offset +# Shows up starting from Gcc 13.2.0 and still has to be fixed +config BR2_TOOLCHAIN_HAS_GCC_BUG_109809 + bool + default y if BR2_RISCV_64 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_13 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934 # ICE: on M68K: in change_address_1, at emit-rtl.cc:2287 # This bug exists in gcc = 12.3.0 and gcc = 13.2.0 -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 5 17:25:45 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 18:25:45 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/milkv_duo: new defconfig In-Reply-To: References: Message-ID: Hi Hanyuan, thank for contributing, one important note is to swap Patch 1/2 and 2/2. This is because they are bisectable this way since on Patch 1/2 you enable packages appearing in Patch 2/2, also, On 02/12/23 03:57, hanyuan wrote: > Milk-V Duo is an ultra-compact embedded development platform based on the CV1800B chip. > It can run Linux and RTOS, providing a reliable, low-cost, and high-performance platform > for professionals, industrial ODMs, AIoT enthusiasts, DIY hobbyists, and creators. can you please provide the board product webpage URL here? And also some ION indications too? > Co-authored-by: Emil S > Co-authored-by: GP Orcullo > Signed-off-by: Hanyuan Zhao > --- > board/milkv/duo/genimage.cfg | 25 ++++++++ > board/milkv/duo/post-image.sh | 58 ++++++++++++++++++ > board/milkv/duo/readme.txt | 49 +++++++++++++++ > configs/milkv_duo_musl_riscv64_defconfig | 63 ++++++++++++++++++++ > configs/milkv_duo_musl_riscv64_ion_defconfig | 63 ++++++++++++++++++++ > 5 files changed, 258 insertions(+) > create mode 100644 board/milkv/duo/genimage.cfg > create mode 100755 board/milkv/duo/post-image.sh > create mode 100644 board/milkv/duo/readme.txt > create mode 100644 configs/milkv_duo_musl_riscv64_defconfig > create mode 100644 configs/milkv_duo_musl_riscv64_ion_defconfig > > diff --git a/board/milkv/duo/genimage.cfg b/board/milkv/duo/genimage.cfg > new file mode 100644 > index 0000000000..1fd74f845a > --- /dev/null > +++ b/board/milkv/duo/genimage.cfg > @@ -0,0 +1,25 @@ > +image boot.vfat { > + vfat { > + files = { > + "fip.bin", > + "boot.sd", > + } > + } > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + } > +} > diff --git a/board/milkv/duo/post-image.sh b/board/milkv/duo/post-image.sh > new file mode 100755 > index 0000000000..6dc6d7853b > --- /dev/null > +++ b/board/milkv/duo/post-image.sh > @@ -0,0 +1,58 @@ > +#!/bin/sh > + > +########################################################### > +# File: post-image.sh > +# Author: GP Orcullo > +# Hanyuan Zhao > +# Description: this sh will make the fip.bin and boot.sd, > +# then pack everything to an image file. > +########################################################### > + > +if [ -f ${BINARIES_DIR}/cvirtos.bin ]; then > + ${BINARIES_DIR}/fiptool.py genfip ${BINARIES_DIR}/fip.bin \ > + --MONITOR_RUNADDR=0x80000000 \ > + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ > + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ > + --NAND_INFO=00000000 \ > + --BL2=${BINARIES_DIR}/bl2.bin \ > + --BLCP_IMG_RUNADDR=0x05200200 \ > + --BLCP_PARAM_LOADADDR=0 \ > + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ > + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ > + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin \ All this if statement is redundant with the else part. Can you add a variable like: FIPTOOL_ARGUMENTS = genfip ${BINARIES_DIR}/fip.bin \ --MONITOR_RUNADDR=0x80000000 \ --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ --NAND_INFO=00000000 \ --BL2=${BINARIES_DIR}/bl2.bin \ --BLCP_IMG_RUNADDR=0x05200200 \ --BLCP_PARAM_LOADADDR=0 \ --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ --LOADER_2ND=${BINARIES_DIR}/u-boot.bin \ and then you add or not the remaining BLCP* variables below and execute ${BINARIES_DIR}/fiptool.py ${FIPTOOL_ARGUMENTS} > + --BLCP=${BINARIES_DIR}/empty.bin \ > + --BLCP_2ND=${BINARIES_DIR}/cvirtos.bin \ > + --BLCP_2ND_RUNADDR=0x83f40000 \ > + > ${BINARIES_DIR}/fip.log 2>&1 > + if [ -f ${BINARIES_DIR}/fip.bin ]; then > + echo "[Duo Post-Image fiptool.py] FreeRTOS integrated" > + fi Then this nested if statement and.. > +else > + ${BINARIES_DIR}/fiptool.py genfip ${BINARIES_DIR}/fip.bin \ > + --MONITOR_RUNADDR=0x80000000 \ > + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ > + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ > + --NAND_INFO=00000000 \ > + --BL2=${BINARIES_DIR}/bl2.bin \ > + --BLCP_IMG_RUNADDR=0x05200200 \ > + --BLCP_PARAM_LOADADDR=0 \ > + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ > + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ > + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin \ > + > ${BINARIES_DIR}/fip.log 2>&1 > + if [ -f ${BINARIES_DIR}/fip.bin ]; then > + echo "[Duo Post-Image fiptool.py] No FreeRTOS integrated" > + fi ..this are redundant too. Can you provide a single if-else-fi statement outside the main if statement... > +fi ... here? > + > +cp ${BINARIES_DIR}/u-boot.dtb ${BINARIES_DIR}/cv1800b_milkv_duo_sd.dtb > +lzma -fk ${BINARIES_DIR}/Image > +mkimage -f ${BINARIES_DIR}/multi.its ${BINARIES_DIR}/boot.sd > +if [ -f ${BINARIES_DIR}/boot.sd ]; then > + echo "[Duo Post-Image] > boot.sd generated!" > +fi > +support/scripts/genimage.sh -c $(pwd)/board/milkv/duo/genimage.cfg > +gzip -fk ${BINARIES_DIR}/sdcard.img > +if [ -f ${BINARIES_DIR}/sdcard.img ]; then > + echo "[Duo Post-Image] > sdcard.img generated!" > +fi > diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt > new file mode 100644 > index 0000000000..a483a73a19 > --- /dev/null > +++ b/board/milkv/duo/readme.txt > @@ -0,0 +1,49 @@ > +Milk-V Duo (https://milkv.io/docs/duo/overview) > + > +Intro > +===== > + > +Milk-V Duo is an ultra-compact embedded development platform > +based on the rv64 CV1800B chip. It can run Linux and RTOS, > +providing a reliable, cost-effective, and high-performance > +platform for professionals, industrial ODMs, AIoT enthusiasts, > +DIY enthusiasts, and creators. > + > +How to build it > +=============== > + > +Configure Buildroot: > + > + $ make milkv_duo_musl_riscv64_defconfig > + > +The milkv_duo_musl_riscv64_defconfig will by default provide > +the full 64MiB free RAM. If you want to build with memory > +reserved for ION, please try: > + > + $ make milkv_duo_musl_riscv64_ion_defconfig Can you please provide more informations about ION here? Or a link to it? > + > +Modify configuration if needed, e.g. add more packages to target: > + > + $ make menuconfig > + > +Compile everything and build the SD card image: > + > + $ make > + > +To configure the linux kernel or u-boot: > + > + $ make linux-menuconfig > + > +To rebuild something (e.g. linux): > + > + $ make linux-rebuild > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image > +called "sdcard.img" in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_musl_riscv64_defconfig > new file mode 100644 > index 0000000000..4f5180891f > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_defconfig > @@ -0,0 +1,63 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Using gcc13 and musl to have t-head's optimization and features > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_CXX=y Is CXX needed by any package selected here? > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_64mb" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y here you need: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > diff --git a/configs/milkv_duo_musl_riscv64_ion_defconfig b/configs/milkv_duo_musl_riscv64_ion_defconfig > new file mode 100644 > index 0000000000..7875853711 > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_ion_defconfig > @@ -0,0 +1,63 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Using gcc13 and musl to have t-head's optimization and features > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_CXX=y > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_ion" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y here you need: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y For the rest the patch looks good and builds fine using utils/docker-run except package htop that fails to build due to gcc ICE 109809 for which I've sent a patch: https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 So this patchset depends on patchset above for htop gcc ICE. Anyway a V2 must be sent with BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y fix. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Mon Feb 5 17:26:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:26:09 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/imx8mmpico: uboot needs openssl In-Reply-To: <20240110205100.147660-1-ju.o@free.fr> (Julien Olivain's message of "Wed, 10 Jan 2024 21:51:00 +0100") References: <20240110205100.147660-1-ju.o@free.fr> Message-ID: <871q9qstzi.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Commit 78e8f383 "configs/imx8mmpico: bump bsp components to version > tn-kirkstone_5.15.71-2.2.0" bumped components, but forgot to add > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y. > This commit adds it to the defconfig to fix the build. > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180248 > In file included from tools/imagetool.h:24, > from tools/aisimage.c:7: > include/image.h:1166:12: fatal error: openssl/evp.h: No such file or directory > 1166 | # include > | ^~~~~~~~~~~~~~~ > Signed-off-by: Julien Olivain > --- > Change v1 -> v2: > - Regenerated the patch, to fix a corrupted patch context. Committed, thanks. -- Bye, Peter Korsgaard From bubu at git.sr.ht Mon Feb 5 17:09:43 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 18:09:43 +0100 Subject: [Buildroot] [PATCH buildroot 1/2] package/python-uvicorn: requires PYTHON3_SSL Message-ID: <170715438947.30890.14026766289772625544-0@git.sr.ht> From: Marcus Hoffmann Uvicorn has a hard requirement on the python ssl module. Without it even running uvicorn --help fails. --- package/python-uvicorn/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-uvicorn/Config.in b/package/python-uvicorn/Config.in index 3e769392f9..c84f54781f 100644 --- a/package/python-uvicorn/Config.in +++ b/package/python-uvicorn/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_UVICORN bool "python-uvicorn" select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_H11 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help The lightning-fast ASGI server. -- 2.38.5 From bubu at git.sr.ht Mon Feb 5 17:25:10 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 18:25:10 +0100 Subject: [Buildroot] [PATCH buildroot 2/2] support/testing: add fastapi runtime test In-Reply-To: <170715438947.30890.14026766289772625544-0@git.sr.ht> Message-ID: <170715438947.30890.14026766289772625544-1@git.sr.ht> From: Marcus Hoffmann Add a runtime test for fastapi. Use uvicorn as the asgi server application as does the fastapi hello world example [1]. Fastapi depends on PydanticV2 now which is written in rust so we need to run the test on armv7. [1] https://fastapi.tiangolo.com/tutorial/first-steps/ --- .../tests/package/sample_python_fastapi.py | 8 ++++ .../tests/package/test_python_fastapi.py | 47 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 support/testing/tests/package/sample_python_fastapi.py create mode 100644 support/testing/tests/package/test_python_fastapi.py diff --git a/support/testing/tests/package/sample_python_fastapi.py b/support/testing/tests/package/sample_python_fastapi.py new file mode 100644 index 0000000000..3116df3a93 --- /dev/null +++ b/support/testing/tests/package/sample_python_fastapi.py @@ -0,0 +1,8 @@ +from fastapi import FastAPI + +app = FastAPI() + + at app.get("/") +async def root(): + return {"message": "Hello World"} + diff --git a/support/testing/tests/package/test_python_fastapi.py b/support/testing/tests/package/test_python_fastapi.py new file mode 100644 index 0000000000..1a78fa6c58 --- /dev/null +++ b/support/testing/tests/package/test_python_fastapi.py @@ -0,0 +1,47 @@ +import os +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Fastapi(TestPythonPackageBase): + __test__ = True + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_FASTAPI=y + BR2_PACKAGE_PYTHON_UVICORN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_CCACHE=y + BR2_CCACHE_DIR="/home/bubu/.buildroot-ccache" + """ + sample_scripts = ["tests/package/sample_python_fastapi.py"] + timeout = 60 + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + cmd = "uvicorn sample_python_fastapi:app > /dev/null 2>&1 &" + + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) + + # Give enough time for the uvicorn server to start up + time.sleep(30) + + cmd = "wget -q -O - http://127.0.0.1:8000/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], '{"message":"Hello World"}') + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() -- 2.38.5 From bubu at git.sr.ht Mon Feb 5 17:09:43 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 18:09:43 +0100 Subject: [Buildroot] [PATCH buildroot v2 1/2] package/python-uvicorn: requires PYTHON3_SSL Message-ID: <170715461915.13905.5968173515742280918-0@git.sr.ht> From: Marcus Hoffmann Uvicorn has a hard requirement on the python ssl module. Without it even running uvicorn --help fails. Signed-off-by: Marcus Hoffmann --- package/python-uvicorn/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-uvicorn/Config.in b/package/python-uvicorn/Config.in index 3e769392f9..c84f54781f 100644 --- a/package/python-uvicorn/Config.in +++ b/package/python-uvicorn/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_UVICORN bool "python-uvicorn" select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_H11 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help The lightning-fast ASGI server. -- 2.38.5 From bubu at git.sr.ht Mon Feb 5 17:25:10 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 18:25:10 +0100 Subject: [Buildroot] [PATCH buildroot v2 2/2] support/testing: add fastapi runtime test In-Reply-To: <170715461915.13905.5968173515742280918-0@git.sr.ht> Message-ID: <170715461915.13905.5968173515742280918-1@git.sr.ht> From: Marcus Hoffmann Add a runtime test for fastapi. Use uvicorn as the asgi server application as does the fastapi hello world example [1]. Fastapi depends on PydanticV2 now which is written in rust so we need to run the test on armv7. [1] https://fastapi.tiangolo.com/tutorial/first-steps/ Signed-off-by: Marcus Hoffmann --- .../tests/package/sample_python_fastapi.py | 8 ++++ .../tests/package/test_python_fastapi.py | 47 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 support/testing/tests/package/sample_python_fastapi.py create mode 100644 support/testing/tests/package/test_python_fastapi.py diff --git a/support/testing/tests/package/sample_python_fastapi.py b/support/testing/tests/package/sample_python_fastapi.py new file mode 100644 index 0000000000..3116df3a93 --- /dev/null +++ b/support/testing/tests/package/sample_python_fastapi.py @@ -0,0 +1,8 @@ +from fastapi import FastAPI + +app = FastAPI() + + at app.get("/") +async def root(): + return {"message": "Hello World"} + diff --git a/support/testing/tests/package/test_python_fastapi.py b/support/testing/tests/package/test_python_fastapi.py new file mode 100644 index 0000000000..1a78fa6c58 --- /dev/null +++ b/support/testing/tests/package/test_python_fastapi.py @@ -0,0 +1,47 @@ +import os +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Fastapi(TestPythonPackageBase): + __test__ = True + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_FASTAPI=y + BR2_PACKAGE_PYTHON_UVICORN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_CCACHE=y + BR2_CCACHE_DIR="/home/bubu/.buildroot-ccache" + """ + sample_scripts = ["tests/package/sample_python_fastapi.py"] + timeout = 60 + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + cmd = "uvicorn sample_python_fastapi:app > /dev/null 2>&1 &" + + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) + + # Give enough time for the uvicorn server to start up + time.sleep(30) + + cmd = "wget -q -O - http://127.0.0.1:8000/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], '{"message":"Hello World"}') + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() -- 2.38.5 From romain.naour at smile.fr Mon Feb 5 17:37:38 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 18:37:38 +0100 Subject: [Buildroot] [PATCH] support/testing: TestGrubX8664EFI: use Nehalem cpu emulation In-Reply-To: References: <20240205133530.1188319-1-romain.naour@smile.fr> Message-ID: <3f004ed2-3c15-4717-a071-eddebe0e6c10@smile.fr> Hello Yann, All, Le 05/02/2024 ? 17:04, Yann E. MORIN a ?crit?: > Romain, All, > > On 2024-02-05 14:35 +0100, Romain Naour spake thusly: >> Following the Bootlin toolchain bump to 2023.11-1 [1], the >> TestGrubX8664EFI failed with this error: > > As we discussed IRL, I've reworded the commit log with your input. Thanks for improving the commit log with additional important informations about the root cause of the issue. I really appreciate and I'll try to do even better next time :) Best regards, Romain > >> # efivar -l >> traps: efivar[86] trap invalid opcode ip:7fc187f4c7f4 sp:7fff9bbaa930 error:0 in libefivar.so.1.38[7fc187f4c000+16000] >> Illegal instruction >> >> Actually this error can be reproduced by installing other packages like >> "file" because the qemu emulation doesn't provide all assembler >> instruction emulation required by x86-64-core-i7 target used by >> TestGrubX8664EFI. >> >> A similar issue has been fixed in toolchain-builder by adding Nehalem >> cpu emulation on the qemu command line [2]. >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 >> >> [1] 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 >> [2] https://gitlab.com/buildroot.org/toolchains-builder/-/commit/f2b253732b4d1fc5b87badba7c2d48f12a197f76 >> >> Signed-off-by: Romain Naour > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > >> --- >> support/testing/tests/boot/test_grub.py | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py >> index 9f3a6a8495..5315fa23ba 100644 >> --- a/support/testing/tests/boot/test_grub.py >> +++ b/support/testing/tests/boot/test_grub.py >> @@ -120,7 +120,7 @@ class TestGrubX8664EFI(infra.basetest.BRTest): >> # https://github.com/tianocore/edk2/commit/bf5678b5802685e07583e3c7ec56d883cbdd5da3 >> # http://lists.busybox.net/pipermail/buildroot/2023-July/670825.html >> qemu_fw_cfg = "name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes" >> - self.emulator.boot(arch="x86_64", options=["-bios", bios, "-hda", hda, "-fw_cfg", qemu_fw_cfg]) >> + self.emulator.boot(arch="x86_64", options=["-bios", bios, "-cpu", "Nehalem", "-hda", hda, "-fw_cfg", qemu_fw_cfg]) >> self.emulator.login() >> >> cmd = "modprobe efivarfs" >> -- >> 2.43.0 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Mon Feb 5 17:40:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:40:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-can: bump to version 4.3.1 In-Reply-To: (Marcus Hoffmann via buildroot's message of "Tue, 9 Jan 2024 18:49:24 +0100") References: <20240109045635.3951040-1-james.hilliard1@gmail.com> Message-ID: <87ttmmrequ.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Hi James, > On 09.01.24 05:56, James Hilliard wrote: >> Drop no longer used python-aenum runtime dependency. >> Signed-off-by: James Hilliard >> --- >> package/python-can/Config.in | 1 - >> package/python-can/python-can.hash | 4 ++-- >> package/python-can/python-can.mk | 4 ++-- >> 3 files changed, 4 insertions(+), 5 deletions(-) >> diff --git a/package/python-can/Config.in >> b/package/python-can/Config.in >> index 68a9ffca71..27dc16fa33 100644 >> --- a/package/python-can/Config.in >> +++ b/package/python-can/Config.in >> @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_CAN >> bool "python-can" >> select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > setuptools is no longer required as well: > https://github.com/hardbyte/python-can/commit/1a3f5e3769aa565ada8c27177a94f7db43d019dc Committed after dropping the setuptools dependency, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 17:41:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:41:29 +0100 Subject: [Buildroot] [PATCH] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot In-Reply-To: <20240108192533.2720-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 8 Jan 2024 20:25:33 +0100") References: <20240108192533.2720-1-francois.perrad@gadz.org> Message-ID: <87plxarepi.fsf@48ers.dk> >>>>> "Francois" == Francois Perrad writes: > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 17:26:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:26:14 +0100 Subject: [Buildroot] [git commit] package/libjwt: add gnutls support Message-ID: <20240205174221.B291286D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a860f330a4ecd2fa442ea2a35e16c0f87611306 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gnutls can be used if openssl is not available since the addition of the package in commit 7251775773011e7da38e3a33c6817eceab6a9dfa Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libjwt/Config.in | 2 +- package/libjwt/libjwt.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in index fa042d67ef..39d1665e0e 100644 --- a/package/libjwt/Config.in +++ b/package/libjwt/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBJWT bool "libjwt" - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS select BR2_PACKAGE_JANSSON help JSON Web Tokens are an open, industry standard RFC 7519 diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 6ae1717b7d..7e2ea03b09 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -6,10 +6,18 @@ LIBJWT_VERSION = 1.15.3 LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) -LIBJWT_DEPENDENCIES = host-pkgconf jansson openssl +LIBJWT_DEPENDENCIES = host-pkgconf jansson LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBJWT_CONF_OPTS += --with-openssl +LIBJWT_DEPENDENCIES += openssl +else +LIBJWT_CONF_OPTS += --without-openssl +LIBJWT_DEPENDENCIES += gnutls +endif + $(eval $(autotools-package)) From peter at korsgaard.com Mon Feb 5 17:26:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:26:17 +0100 Subject: [Buildroot] [git commit] package/sispmctl: bump to version 4.11 Message-ID: <20240205174221.C5F6086D95@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14fa799c576f1dbd1027fb85d1bf39fd449299e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to https to avoid a redirection because of HSTS https://sourceforge.net/p/sispmctl/git/ci/release-4.11/tree/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/sispmctl/sispmctl.hash | 2 +- package/sispmctl/sispmctl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sispmctl/sispmctl.hash b/package/sispmctl/sispmctl.hash index e22efcfbed..f6cff1910b 100644 --- a/package/sispmctl/sispmctl.hash +++ b/package/sispmctl/sispmctl.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6a9ec7125e8c01bb45d4a3b56f07fb41fc437020c8dcd8c0f29ebb98dc55a647 sispmctl-4.9.tar.gz +sha256 74b94a3710046b15070c7311f0cacb81554c86b4227719cc2733cb96c7052578 sispmctl-4.11.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sispmctl/sispmctl.mk b/package/sispmctl/sispmctl.mk index b6e156c66a..df39793845 100644 --- a/package/sispmctl/sispmctl.mk +++ b/package/sispmctl/sispmctl.mk @@ -4,8 +4,8 @@ # ################################################################################ -SISPMCTL_VERSION = 4.9 -SISPMCTL_SITE = http://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION) +SISPMCTL_VERSION = 4.11 +SISPMCTL_SITE = https://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION) SISPMCTL_LICENSE = GPL-2.0+ SISPMCTL_LICENSE_FILES = COPYING SISPMCTL_DEPENDENCIES = libusb-compat From peter at korsgaard.com Mon Feb 5 17:26:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:26:16 +0100 Subject: [Buildroot] [git commit] package/sqlciper: bump to version 4.5.5 Message-ID: <20240205174221.BBBC386D94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19370420baa3d98f9e6fa041822d1fccf375f862 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of LICENSE file (update in year: https://github.com/sqlcipher/sqlcipher/commit/b942636547ad68b1c38053099e7e877b2495d4cc) https://github.com/sqlcipher/sqlcipher/blob/v4.5.5/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/sqlcipher/sqlcipher.hash | 4 ++-- package/sqlcipher/sqlcipher.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlcipher/sqlcipher.hash b/package/sqlcipher/sqlcipher.hash index c655165172..7632c1c887 100644 --- a/package/sqlcipher/sqlcipher.hash +++ b/package/sqlcipher/sqlcipher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 023499516ef2ade14fbcdbe93fb81cc69458ae6cb3544614df8dbef34835b406 sqlcipher-4.5.1.tar.gz -sha256 3eee3c7964a9becc94d747bd36703d31fc86eb994680b06a61bfd4f2661eaac8 LICENSE +sha256 014ef9d4f5b5f4e7af4d93ad399667947bb55e31860e671f0def1b8ae6f05de0 sqlcipher-4.5.5.tar.gz +sha256 09e4af560ce2e3c9c2aa6b564e35947b03db7d1ae345f22a32793ed46542cc14 LICENSE diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk index c0c53acdd2..8d062ccf81 100644 --- a/package/sqlcipher/sqlcipher.mk +++ b/package/sqlcipher/sqlcipher.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLCIPHER_VERSION = 4.5.1 +SQLCIPHER_VERSION = 4.5.5 SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,v$(SQLCIPHER_VERSION)) SQLCIPHER_LICENSE = BSD-3-Clause SQLCIPHER_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 17:26:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:26:18 +0100 Subject: [Buildroot] [git commit] configs/imx8mmpico: uboot needs openssl Message-ID: <20240205174221.CF0B786D96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88d3e8ca112cc932b39da21cdf4268b580a35f8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 78e8f383 "configs/imx8mmpico: bump bsp components to version tn-kirkstone_5.15.71-2.2.0" bumped components, but forgot to add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y. This commit adds it to the defconfig to fix the build. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180248 In file included from tools/imagetool.h:24, from tools/aisimage.c:7: include/image.h:1166:12: fatal error: openssl/evp.h: No such file or directory 1166 | # include | ^~~~~~~~~~~~~~~ Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- configs/imx8mmpico_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx8mmpico_defconfig b/configs/imx8mmpico_defconfig index c402ea675d..711cdeb390 100644 --- a/configs/imx8mmpico_defconfig +++ b/configs/imx8mmpico_defconfig @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-tn-imx,tn-kirkstone_5.15.71-2.2.0_20230512)/u-boot-tn-imx-tn-kirkstone_5.15.71-2.2.0_20230512.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mm" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y From peter at korsgaard.com Mon Feb 5 17:41:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:41:01 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot Message-ID: <20240205174221.E35A786D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=999c0fbc9f951536f6a1fda42fb7bf406da5f3a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime2_defconfig | 10 +++++----- configs/olimex_a20_olinuxino_lime_defconfig | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 3294748b14..bf44207393 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 6.1 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -23,12 +23,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.55" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.10" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-olinuxino-lime2" BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages @@ -45,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 6b46794df3..5e26eaf857 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 6.1 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -23,12 +23,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.55" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.10" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages @@ -45,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From peter at korsgaard.com Mon Feb 5 17:39:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:39:51 +0100 Subject: [Buildroot] [git commit] package/python-can: bump to version 4.3.1 Message-ID: <20240205174221.D96FE86D97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cec6ed4e5ef8c5438c05691c109efd1cf2b8208e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer used python-aenum runtime dependency. Signed-off-by: James Hilliard [Peter: drop python-setuptools as pointed out by Marcus Hoffmann] Signed-off-by: Peter Korsgaard --- package/python-can/Config.in | 2 -- package/python-can/python-can.hash | 4 ++-- package/python-can/python-can.mk | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 68a9ffca71..a00c9263cf 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SQLITE # runtime - select BR2_PACKAGE_PYTHON_AENUM # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 35e752ea54..4e706519be 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-can/json -md5 26d799fe952cb590fba03f3d26ee66a4 python-can-4.2.2.tar.gz -sha256 6ad50f4613289f3c4d276b6d2ac8901d776dcb929994cce93f55a69e858c595f python-can-4.2.2.tar.gz +md5 a84ace55fdeca8efd50986deacfba584 python-can-4.3.1.tar.gz +sha256 008bea1c12e31586e1aa76971126b831bf01056a900e91862a11360e011ab933 python-can-4.3.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index 012c82682c..c7100e3dda 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 4.2.2 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/dd/f1/327caaf05b6bca594250053058a2adac537a88dfb5c41bb5498cfda9de78 +PYTHON_CAN_VERSION = 4.3.1 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/02/fc/d5fd33ee93f17a4eb0dcd75aebf522396e3f511bf474058e99e86ae4e33f PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 5 17:45:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:45:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: bump to version 0.5.2 In-Reply-To: <20240109075228.4051839-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 9 Jan 2024 00:52:28 -0700") References: <20240109075228.4051839-1-james.hilliard1@gmail.com> Message-ID: <87le7yrejb.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 17:44:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:44:36 +0100 Subject: [Buildroot] [git commit] package/python-gnupg: bump to version 0.5.2 Message-ID: <20240205174526.2459186D9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb6163cf96de64ac6df271f3080fce4dacaa7a71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-gnupg/python-gnupg.hash | 7 ++----- package/python-gnupg/python-gnupg.mk | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/python-gnupg/python-gnupg.hash b/package/python-gnupg/python-gnupg.hash index d52b634b8d..4a194ad41e 100644 --- a/package/python-gnupg/python-gnupg.hash +++ b/package/python-gnupg/python-gnupg.hash @@ -1,8 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-gnupg/json -# also checked PGP signature from: -# https://bitbucket.org/vinay.sajip/python-gnupg/downloads/python-gnupg-0.5.1.tar.gz.asc -# with key: 9147B477339A9B86 -md5 c5d99c5f0456f8cbf69324ec5e6acaff python-gnupg-0.5.1.tar.gz -sha256 5674bad4e93876c0b0d3197e314d7f942d39018bf31e2b833f6788a6813c3fb8 python-gnupg-0.5.1.tar.gz +md5 b263ea268692cfe687d29d52daab4770 python-gnupg-0.5.2.tar.gz +sha256 01d8013931c9fa3f45824bbea7054c03d6e11f258a72e7e086e168dbcb91854c python-gnupg-0.5.2.tar.gz # Locally computed sha256 checksums sha256 4104ca980dbca7603fc553078378eb14566a76f819d033d7bff89fd6a97e181b LICENSE.txt diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk index f582f4cdb7..ddf2287f9b 100644 --- a/package/python-gnupg/python-gnupg.mk +++ b/package/python-gnupg/python-gnupg.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_GNUPG_VERSION = 0.5.1 -PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/98/62/7737485f44bd4d7d904f4094372f4119195865b29f119fa51a98e121a13a +PYTHON_GNUPG_VERSION = 0.5.2 +PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/5d/4425390ad81d22b330a1b0df204c4d39fb3cb7c39e081d51e9f7426ce716 PYTHON_GNUPG_LICENSE = BSD-3-Clause PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt PYTHON_GNUPG_CPE_ID_VENDOR = python From thomas.petazzoni at bootlin.com Mon Feb 5 17:48:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 18:48:08 +0100 Subject: [Buildroot] [git commit] package/ngrep: fix build with libnet Message-ID: <20240205174820.101FF86DA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14c0c37eaf0f91ef61a88b3085c15028f566a394 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use pkg-config to find libnet and avoid the following build failure raised since commit 100ba8351c088fd764effdcaba848cfd92de79dd if libnet-config is found on the host: /home/autobuild/autobuild/instance-4/output-1/host/bin/mips64el-buildroot-linux-gnu-gcc -s -o ngrep ngrep.o tcpkill.o -lpcap -lnet -lpcre -L/usr/lib -lnet mips64el-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' While at it, format Upstream tag of other patches Fixes: - http://autobuild.buildroot.org/results/05c916162b9c1027cf53f1699a1f5653151098ed Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 3 -- ...in-configure-in-when-testing-for-use_pcre.patch | 3 +- ...002-Check-for-libnet_init-in-configure-in.patch | 3 +- package/ngrep/0003-fix-disable-tcpkill.patch | 2 +- ...onfigure.in-use-pkg-config-to-find-libnet.patch | 38 ++++++++++++++++++++++ package/ngrep/ngrep.mk | 2 +- 6 files changed, 42 insertions(+), 9 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 348cf3d289..2fc974e2f2 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -897,9 +897,6 @@ package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch Up package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch Upstream package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch Upstream package/nginx/S50nginx Indent Variables -package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch Upstream -package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch Upstream -package/ngrep/0003-fix-disable-tcpkill.patch Upstream package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch Upstream package/nmap/0001-libdnet-wrapper-configure.patch Upstream package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch Upstream diff --git a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch index 69c5c887e8..c7f0dec360 100644 --- a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch +++ b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch @@ -4,8 +4,7 @@ Date: Mon, 1 Jan 2018 18:00:34 +0100 Subject: [PATCH] Fix typo in configure.in when testing for use_pcre Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe] +Upstream: https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch index 22b18ab7ee..7fa2e2f3bc 100644 --- a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch +++ b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch @@ -7,8 +7,7 @@ libnet_init_packet was the old libnet 1.0 function which is now long deprecated. Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5] +Upstream: https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0003-fix-disable-tcpkill.patch b/package/ngrep/0003-fix-disable-tcpkill.patch index 1264fd7e3b..894cd95b0f 100644 --- a/package/ngrep/0003-fix-disable-tcpkill.patch +++ b/package/ngrep/0003-fix-disable-tcpkill.patch @@ -9,7 +9,7 @@ found on the system. To fix this, move AC_CHECK_LIB to found libnet outside AC_ARG_ENABLE Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/jpr5/ngrep/pull/15] +Upstream: https://github.com/jpr5/ngrep/pull/15 --- configure.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch new file mode 100644 index 0000000000..71550da943 --- /dev/null +++ b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch @@ -0,0 +1,38 @@ +From 4788988827bf4c0d996d3e1e3b6ac52a23b97941 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 9 Jan 2024 21:15:47 +0100 +Subject: [PATCH] configure.in: use pkg-config to find libnet + +libnet-config is deprecated: +https://github.com/libnet/libnet/commit/1ec4a6e7d1d23811f0a14ecb51e46489a0175727 + +Signed-off-by: Fabrice Fontaine +Upstream: unsent (upstream seems dead, no commit since 5 years +--- + configure.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 7c3dd43..882ff86 100644 +--- a/configure.in ++++ b/configure.in +@@ -176,12 +176,14 @@ AC_ARG_ENABLE(tcpkill, + [ use_tcpkill="$enableval" ], + [ use_tcpkill="no" ]) + ++PKG_PROG_PKG_CONFIG + if test $use_tcpkill = yes; then + AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit) + USE_TCPKILL="1" + EXTRA_OBJS="$EXTRA_OBJS tcpkill.o" +- EXTRA_DEFINES="$EXTRA_DEFINES $(libnet-config --defines)" +- EXTRA_LIBS="$EXTRA_LIBS $(libnet-config --libs)" ++ PKG_CHECK_MODULES(LIBNET, libnet) ++ EXTRA_DEFINES="$EXTRA_DEFINES $LIBNET_CFLAGS" ++ EXTRA_LIBS="$EXTRA_LIBS $LIBNET_LIBS" + else + USE_TCPKILL="0" + fi +-- +2.43.0 + diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk index c4750f7504..dc69a34235 100644 --- a/package/ngrep/ngrep.mk +++ b/package/ngrep/ngrep.mk @@ -22,7 +22,7 @@ NGREP_CONF_OPTS = \ --disable-dropprivs \ --disable-pcap-restart -NGREP_DEPENDENCIES = libpcap pcre +NGREP_DEPENDENCIES = host-pkgconf libpcap pcre ifeq ($(BR2_PACKAGE_LIBNET),y) NGREP_DEPENDENCIES += libnet From thomas.petazzoni at bootlin.com Mon Feb 5 17:48:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 18:48:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/ngrep: fix build with libnet In-Reply-To: <20240109211801.565524-1-fontaine.fabrice@gmail.com> References: <20240109211801.565524-1-fontaine.fabrice@gmail.com> Message-ID: <20240205184839.3f230f02@windsurf> On Tue, 9 Jan 2024 22:18:01 +0100 Fabrice Fontaine wrote: > Use pkg-config to find libnet and avoid the following build failure > raised since commit 100ba8351c088fd764effdcaba848cfd92de79dd if > libnet-config is found on the host: > > /home/autobuild/autobuild/instance-4/output-1/host/bin/mips64el-buildroot-linux-gnu-gcc -s -o ngrep ngrep.o tcpkill.o -lpcap -lnet -lpcre -L/usr/lib -lnet > mips64el-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' > > While at it, format Upstream tag of other patches > > Fixes: > - http://autobuild.buildroot.org/results/05c916162b9c1027cf53f1699a1f5653151098ed > > Signed-off-by: Fabrice Fontaine > --- > .checkpackageignore | 3 -- > ...nfigure-in-when-testing-for-use_pcre.patch | 3 +- > ...heck-for-libnet_init-in-configure-in.patch | 3 +- > package/ngrep/0003-fix-disable-tcpkill.patch | 2 +- > ...ure.in-use-pkg-config-to-find-libnet.patch | 38 +++++++++++++++++++ > package/ngrep/ngrep.mk | 2 +- > 6 files changed, 42 insertions(+), 9 deletions(-) > create mode 100644 package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Mon Feb 5 17:49:32 2024 From: romain.naour at smile.fr (Romain NAOUR) Date: Mon, 5 Feb 2024 18:49:32 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add netcat runtime test In-Reply-To: References: <20240113201532.121274-1-ju.o@free.fr> Message-ID: Hello Julien, All, On Sun, Jan 21, 2024 at 11:20?AM Yann E. MORIN wrote: > > Julien, All, > > On 2024-01-13 21:15 +0100, Julien Olivain spake thusly: > > Signed-off-by: Julien Olivain > > Applied to master, thanks. It seems this test is failing in gitlab-ci for some reason: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854664 can you have a look? Best regards, Romain > > Regards, > Yann E. MORIN. > > > --- > > DEVELOPERS | 1 + > > support/testing/tests/package/test_netcat.py | 41 ++++++++++++++++++++ > > 2 files changed, 42 insertions(+) > > create mode 100644 support/testing/tests/package/test_netcat.py > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 94a89c63d5..d25f31f0ff 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -1791,6 +1791,7 @@ F: support/testing/tests/package/test_lz4.py > > F: support/testing/tests/package/test_lzop.py > > F: support/testing/tests/package/test_mtools.py > > F: support/testing/tests/package/test_ncdu.py > > +F: support/testing/tests/package/test_netcat.py > > F: support/testing/tests/package/test_nftables.py > > F: support/testing/tests/package/test_nftables/ > > F: support/testing/tests/package/test_octave.py > > diff --git a/support/testing/tests/package/test_netcat.py b/support/testing/tests/package/test_netcat.py > > new file mode 100644 > > index 0000000000..b3efa4c40b > > --- /dev/null > > +++ b/support/testing/tests/package/test_netcat.py > > @@ -0,0 +1,41 @@ > > +import os > > +import time > > + > > +import infra.basetest > > + > > + > > +class TestNetCat(infra.basetest.BRTest): > > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > > + """ > > + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > > + BR2_PACKAGE_NETCAT=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]) > > + self.emulator.login() > > + > > + self.assertRunOk("nc --version") > > + > > + in_file = "input.bin" > > + out_file = "output.bin" > > + port = 12345 > > + > > + cmd = f"dd if=/dev/urandom of={in_file} bs=1k count=1k" > > + self.assertRunOk(cmd) > > + > > + cmd = f"nc -l -p {port} > {out_file} &" > > + self.assertRunOk(cmd) > > + > > + time.sleep(1) > > + > > + cmd = f"cat {in_file} | nc -c 127.0.0.1 {port}" > > + self.assertRunOk(cmd) > > + > > + cmd = f"cmp {in_file} {out_file}" > > + self.assertRunOk(cmd) > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From buildroot at bubu1.eu Mon Feb 5 17:52:48 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 18:52:48 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-starlette: bump to version 0.36.3 In-Reply-To: <20240205164615.510688-1-james.hilliard1@gmail.com> References: <20240205164615.510688-1-james.hilliard1@gmail.com> Message-ID: On 05.02.24 17:46, James Hilliard wrote: > Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann > --- > package/python-starlette/python-starlette.hash | 4 ++-- > package/python-starlette/python-starlette.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash > index 820026b70b..03d77cf5be 100644 > --- a/package/python-starlette/python-starlette.hash > +++ b/package/python-starlette/python-starlette.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/starlette/json > -md5 2ef2fc635691fd4a1823564218292dce starlette-0.34.0.tar.gz > -sha256 ed050aaf3896945bfaae93bdf337e53ef3f29115a9d9c153e402985115cd9c8e starlette-0.34.0.tar.gz > +md5 0a1e026d653dc448ae07f47eefe1dc8b starlette-0.36.3.tar.gz > +sha256 90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080 starlette-0.36.3.tar.gz > # Locally computed sha256 checksums > sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md > diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk > index 07f9d6be5e..9d137f5f5a 100644 > --- a/package/python-starlette/python-starlette.mk > +++ b/package/python-starlette/python-starlette.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_STARLETTE_VERSION = 0.34.0 > +PYTHON_STARLETTE_VERSION = 0.36.3 > PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz > -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/4f/36/168ba6d56a28382f3b081b23b0cc431de35786e120b94c1f372708ed3059 > +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/be/47/1bba49d42d63f4453f0a64a20acbf2d0bd2f5a8cde6a166ee66c074a08f8 > PYTHON_STARLETTE_SETUP_TYPE = pep517 > PYTHON_STARLETTE_LICENSE = BSD-3-Clause > PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Mon Feb 5 17:51:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 18:51:35 +0100 Subject: [Buildroot] [git commit] package/openssh: fix build error on powerpc Message-ID: <20240205175616.58D5086DAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=325fe1aecfd20d2653cce6bc189824c6fdfcafec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following error message introducted by OpenSSH v9.6p1. sshkey.c: In function 'sshkey_set_filename': sshkey.c:3705:1: sorry, unimplemented: '-fzero-call-used-regs' not supported on this target 3705 | } Fixes: http://autobuild.buildroot.org/results/ec7/ec780aed5b1c4fdf9b91f6e7be99e8d4c42efa58 Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- ...-detection-of-broken-fzero-call-used-regs.patch | 57 ++++++++++++++++++++++ package/openssh/openssh.mk | 3 ++ 2 files changed, 60 insertions(+) diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch new file mode 100644 index 0000000000..5c056033a9 --- /dev/null +++ b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch @@ -0,0 +1,57 @@ +From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Fri, 22 Dec 2023 17:56:26 +1100 +Subject: [PATCH] better detection of broken -fzero-call-used-regs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gcc 13.2.0 on ppc64le refuses to compile some function, including +cipher.c:compression_alg_list() with an error: + +> sorry, unimplemented: argument ???used??? is not supportedcw +> for ???-fzero-call-used-regs??? on this target + +This extends the autoconf will-it-work test with a similarly- +structured function that seems to catch this. + +Spotted/tested by Colin Watson; bz3645 + +Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch +Signed-off-by: Brandon Maier +--- + m4/openssh.m4 | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 5d4c56280fc..033df501c3d 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,18 +20,24 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++const char *f3(int s) { ++ return s ? "good" : "gooder"; ++} + int main(int argc, char **argv) { +- (void)argv; + char b[256], *cp; ++ const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ (void)argv; + f(1); +- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ s = f3(f(2)); ++ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); +- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); ++ if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ec9e6613b0..ef530cc850 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,6 +13,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE +# 0001-better-detection-of-broken-fzero-call-used-regs.patch +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From thomas.petazzoni at bootlin.com Mon Feb 5 17:56:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 18:56:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: fix build error on powerpc In-Reply-To: <20240118222310.62234-1-brandon.maier@collins.com> References: <20240118222310.62234-1-brandon.maier@collins.com> Message-ID: <20240205185616.13fb5202@windsurf> On Thu, 18 Jan 2024 22:23:01 +0000 Brandon Maier via buildroot wrote: > Fixes the following error message introducted by OpenSSH v9.6p1. > > sshkey.c: In function 'sshkey_set_filename': > sshkey.c:3705:1: sorry, unimplemented: '-fzero-call-used-regs' not supported on this target > 3705 | } > > Fixes: > http://autobuild.buildroot.org/results/ec7/ec780aed5b1c4fdf9b91f6e7be99e8d4c42efa58 > > Signed-off-by: Brandon Maier > --- > ...ction-of-broken-fzero-call-used-regs.patch | 57 +++++++++++++++++++ > package/openssh/openssh.mk | 3 + > 2 files changed, 60 insertions(+) > create mode 100644 package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From bubu at git.sr.ht Mon Feb 5 14:12:02 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 15:12:02 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-fastapi: bump to 0.109.2 Message-ID: <170715586410.13905.2351857620201846100-0@git.sr.ht> From: Marcus Hoffmann Drop no longer required dependency on python-anyio. Signed-off-by: Marcus Hoffmann --- package/python-fastapi/Config.in | 1 - package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-fastapi/Config.in b/package/python-fastapi/Config.in index 7d376d3dd7..d4a527c601 100644 --- a/package/python-fastapi/Config.in +++ b/package/python-fastapi/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_FASTAPI bool "python-fastapi" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core - select BR2_PACKAGE_PYTHON_ANYIO # runtime select BR2_PACKAGE_PYTHON_PYDANTIC # runtime select BR2_PACKAGE_PYTHON_STARLETTE # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.105.0 +PYTHON_FASTAPI_VERSION = 0.109.2 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE -- 2.38.5 From romain.naour at smile.fr Mon Feb 5 17:57:49 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 18:57:49 +0100 Subject: [Buildroot] [git commit] package/rustc: rust >= 1.73.0 needs cmake >= 3.20 Message-ID: <20240205175814.9F6C786DB2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c43f12293d3a6668a79f5cfece402d46a87a473e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The bump to rust 1.74.1 [1] introduced a regression on host using cmake < 3.20 since the llvm libraries used in rust compiler was bumpted to llvm 17 [2] and now requires cmake >= 3.20 [3]. Select BR2_HOST_CMAKE_AT_LEAST_3_20 to build host-cmake when needed. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/05392a5eae61c2855bc8d94f5bf9677ebbc5462a [2] https://github.com/rust-lang/rust/commit/8c1c7d37b29d72bad1f218798d121074918e9616 [3] https://github.com/llvm/llvm-project/commit/cbaa3597aaf6273e66b3f445ed36a6458143fe6a Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5880448635 Signed-off-by: Romain Naour Cc: Antoine Coutant Reviewed-by: Antoine Coutant Signed-off-by: Romain Naour --- package/rustc/Config.in.host | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 6beaad0425..baa68994e6 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -149,6 +149,8 @@ config BR2_PACKAGE_HOST_RUST depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # triggers ICE on trunc_int_for_mode, at explow.c:56 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_aarch64 + # rust uses llvm >= 17 since 1.73.0 + select BR2_HOST_CMAKE_AT_LEAST_3_20 help This package will build the compiler for the host as well as two flavors of the standard library: one for the host, another From buildroot at bubu1.eu Mon Feb 5 17:59:46 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 18:59:46 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-fastapi: bump to version 0.109.2 In-Reply-To: <20240205164615.510688-2-james.hilliard1@gmail.com> References: <20240205164615.510688-1-james.hilliard1@gmail.com> <20240205164615.510688-2-james.hilliard1@gmail.com> Message-ID: <193a6600-b432-4f26-a265-fbeea0b72a34@bubu1.eu> Hi James, On 05.02.24 17:46, James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-fastapi/python-fastapi.hash | 4 ++-- > package/python-fastapi/python-fastapi.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash > index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz > -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz > +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz > +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 > --- a/package/python-fastapi/python-fastapi.mk > +++ b/package/python-fastapi/python-fastapi.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_FASTAPI_VERSION = 0.105.0 > +PYTHON_FASTAPI_VERSION = 0.109.2 This misses dropping the anyio dependency, I send a patch that includes this: https://patchwork.ozlabs.org/project/buildroot/patch/170715586410.13905.2351857620201846100-0 at git.sr.ht/ > PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz > -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 > +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 > PYTHON_FASTAPI_SETUP_TYPE = pep517 > PYTHON_FASTAPI_LICENSE = MIT > PYTHON_FASTAPI_LICENSE_FILES = LICENSE From sebastien.szymanski at armadeus.com Mon Feb 5 15:29:58 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Mon, 5 Feb 2024 16:29:58 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/imx8mmpico: uboot needs openssl In-Reply-To: <20240110205100.147660-1-ju.o@free.fr> References: <20240110205100.147660-1-ju.o@free.fr> Message-ID: Hi Julien, All, On 1/10/24 21:51, Julien Olivain wrote: > Commit 78e8f383 "configs/imx8mmpico: bump bsp components to version > tn-kirkstone_5.15.71-2.2.0" bumped components, but forgot to add > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y. > > This commit adds it to the defconfig to fix the build. > > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180248 > > In file included from tools/imagetool.h:24, > from tools/aisimage.c:7: > include/image.h:1166:12: fatal error: openssl/evp.h: No such file or directory > 1166 | # include > | ^~~~~~~~~~~~~~~ > > Signed-off-by: Julien Olivain > --- > Change v1 -> v2: > - Regenerated the patch, to fix a corrupted patch context. > --- > configs/imx8mmpico_defconfig | 1 + > 1 file changed, 1 insertion(+) I confirm that this patch fixes the build error mentioned: Tested-By: S?bastien Szymanski Regards, > > diff --git a/configs/imx8mmpico_defconfig b/configs/imx8mmpico_defconfig > index c402ea675d..711cdeb390 100644 > --- a/configs/imx8mmpico_defconfig > +++ b/configs/imx8mmpico_defconfig > @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-tn-imx,tn-kirkstone_5.15.71-2.2.0_20230512)/u-boot-tn-imx-tn-kirkstone_5.15.71-2.2.0_20230512.tar.gz" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mm" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" > BR2_TARGET_UBOOT_SPL=y -- S?bastien Szymanski, Armadeus Systems Software engineer From yann.morin.1998 at free.fr Mon Feb 5 18:00:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 19:00:12 +0100 Subject: [Buildroot] [git commit] host-python-numpy: correct implied host-lapack/host-blas dependency. Message-ID: <20240205180105.7594986DB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6c33f3e89f7f26e5b7613a757c82c9efc62654a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Before commit ca63464e3777 (package/python-numpy: bump to version 1.25.0), numpy was using python distuils. Then, the default for BLAS and LAPACK detection was to disable support if they were not found, even when OPENBLAS is installed on the host system. Commit ca63464e3777 switched python-numpy to use the meson-package infrastructure, where the default has changed, and now fails when the host system does have OPENBLAS installed: buildroot$ make >>> host-python-numpy 1.25.0 Configuring [...] Run-time dependency openblas found: NO (tried pkgconfig and cmake) WARNING: CMake Toolchain: Failed to determine CMake compilers state Run-time dependency openblas found: YES 0.3.21 Dependency openblas found: YES 0.3.21 (cached) Program _build_utils/process_src_template.py found: YES (/path/to/buildroot/output/host/bin/python3 /path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/process_src_template.py) Program _build_utils/tempita.py found: YES (/path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/tempita.py) output/build/host-python-numpy-1.25.0/numpy/meson.build:201:44: ERROR: Could not get cmake variable and no default provided for [...] Two obvious ways to correct this: - Add some kind of host-lapack / host-openblas dependency to host-python-numpy, or - Tell host-python-numpy not to look for (or rely on) external code. Because the host numpy environment shouldn't be doing any numerical heavy lifting, we opt for the latter here. Signed-off-by: Graeme Smecher [yann.morin.1998 at free.fr: - explain why the issue was not found before ] Signed-off-by: Yann E. MORIN --- package/python-numpy/python-numpy.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 383135f9fe..200fac20a1 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -38,6 +38,10 @@ else PYTHON_NUMPY_CONF_OPTS += -Dblas="" endif +# Rather than add a host-blas or host-lapack dependencies, just use unoptimized, +# in-tree code. +HOST_PYTHON_NUMPY_CONF_OPTS = -Dblas="" -Dlapack="" + # Fixup the npymath.ini prefix path with actual target staging area where # numpy core was built. Without this, target builds using numpy distutils # extensions like python-scipy, python-numba cannot find -lnpymath since From yann.morin.1998 at free.fr Mon Feb 5 18:04:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 19:04:30 +0100 Subject: [Buildroot] [PATCH] host-python-numpy: correct implied host-lapack/host-blas dependency. In-Reply-To: <20240129204032.1980414-1-gsmecher@threespeedlogic.com> References: <20240129204032.1980414-1-gsmecher@threespeedlogic.com> Message-ID: Graeme, All, On 2024-01-29 12:40 -0800, gsmecher at threespeedlogic.com spake thusly: > From: Graeme Smecher > > Before this patch, host-python-numpy attempted (and failed) to detect > OpenBLAS as follows: > > buildroot$ make > >>> host-python-numpy 1.25.0 Configuring > [...] > Run-time dependency openblas found: NO (tried pkgconfig and cmake) > WARNING: CMake Toolchain: Failed to determine CMake compilers state > Run-time dependency openblas found: YES 0.3.21 > Dependency openblas found: YES 0.3.21 (cached) > Program _build_utils/process_src_template.py found: YES (/path/to/buildroot/output/host/bin/python3 /path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/process_src_template.py) > Program _build_utils/tempita.py found: YES (/path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/tempita.py) > > output/build/host-python-numpy-1.25.0/numpy/meson.build:201:44: ERROR: Could not get cmake variable and no default provided for > [...] So I dug in the Numpy git history, and before we bumped to 1.25, it was using distutils, which would only warn and disable BLAS support if not found, but the meson switch made the default to fail. > Two obvious ways to correct this: > > - Add some kind of host-lapack / host-openblas dependency to > host-python-numpy, or > - Tell host-python-numpy not to look for (or rely on) external code. > > Because the host numpy environment shouldn't be doing any numerical > heavy lifting, we opt for the latter here. > > Signed-off-by: Graeme Smecher Applied to master, with an extended commit log about the history, thanks. Regards, Yann E. MORIN. > --- > package/python-numpy/python-numpy.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk > index b52e0da17d..cc5dfc9224 100644 > --- a/package/python-numpy/python-numpy.mk > +++ b/package/python-numpy/python-numpy.mk > @@ -36,6 +36,10 @@ else > PYTHON_NUMPY_CONF_OPTS += -Dblas="" > endif > > +# Rather than add a host-blas or host-lapack dependencies, just use unoptimized, > +# in-tree code. > +HOST_PYTHON_NUMPY_CONF_OPTS = -Dblas="" -Dlapack="" > + > # Fixup the npymath.ini prefix path with actual target staging area where > # numpy core was built. Without this, target builds using numpy distutils > # extensions like python-scipy, python-numba cannot find -lnpymath since > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Mon Feb 5 18:09:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 19:09:04 +0100 Subject: [Buildroot] [git commit] package/protobuf-c: bump to version 1.5.0 Message-ID: <20240205180912.D25CA86DC7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e97fc89e7ba75f5f664161916b44e727820a04a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - drops support for proto2 - fixes compatibility with protobuf >= 22.0 (which we did not yet bump) - to be compatible with new protobuf versions c++17 is now required when building with protoc (which we only do for the host package) [0] hence require host gcc >= 7 for c++17 support, propagate to depending packages - the license file has changed with a change of the copyright years, nothing else [0] https://github.com/protobuf-c/protobuf-c/pull/673 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/collectd/Config.in | 10 ++++++++-- package/criu/Config.in | 6 ++++-- package/kismet/Config.in | 6 ++++-- package/protobuf-c/Config.in | 5 +++-- package/protobuf-c/protobuf-c.hash | 4 ++-- package/protobuf-c/protobuf-c.mk | 6 +++--- package/riemann-c-client/Config.in | 6 ++++-- 7 files changed, 28 insertions(+), 15 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index d3b686771d..a0c367c78d 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -738,12 +738,17 @@ config BR2_PACKAGE_COLLECTD_RIEMANN # riemann-c-client -> protobuf-c depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c select BR2_PACKAGE_RIEMANN_C_CLIENT select BR2_PACKAGE_LIBTOOL help Sends data to Riemann, a stream processing and monitoring system. +comment "riemann needs a toolchain w/ C++, host gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_7 + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + config BR2_PACKAGE_COLLECTD_UNIXSOCK bool "unixsock" help @@ -772,14 +777,15 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS bool "write_prometheus" depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c select BR2_PACKAGE_LIBMICROHTTPD select BR2_PACKAGE_PROTOBUF_C help Publishes values using an embedded HTTP server, in a format compatible with Prometheus' collectd_exporter. -comment "write_prometheus needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "write_prometheus needs a toolchain w/ C++, host gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_7 depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_COLLECTD_WRITEREDIS diff --git a/package/criu/Config.in b/package/criu/Config.in index a5adc0cedd..30b131cd30 100644 --- a/package/criu/Config.in +++ b/package/criu/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_CRIU_ARCH_SUPPORTS config BR2_PACKAGE_CRIU bool "criu" depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # -march=armv7-a+fp depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 # rseq.h depends on !BR2_TOOLCHAIN_USES_UCLIBC # no aio.h @@ -43,9 +44,10 @@ config BR2_PACKAGE_CRIU https://criu.org/Main_Page -comment "criu needs a glibc or musl toolchain w/ threads, gcc >= 8, headers >= 4.18, C++, dynamic library, wchar" +comment "criu needs a glibc or musl toolchain w/ threads, host gcc >= 7, gcc >= 8, headers >= 4.18, C++, dynamic library, wchar" depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 \ || BR2_TOOLCHAIN_USES_UCLIBC || !BR2_INSTALL_LIBSTDCPP \ - || BR2_STATIC_LIBS || !BR2_USE_WCHAR + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ + || BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/kismet/Config.in b/package/kismet/Config.in index 80e68743a5..2e1e0cfbd0 100644 --- a/package/kismet/Config.in +++ b/package/kismet/Config.in @@ -1,8 +1,9 @@ -comment "kismet needs a toolchain w/ threads, C++, gcc >= 5" +comment "kismet needs a toolchain w/ threads, C++, gcc >= 5, host gcc >= 7" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_HOST_GCC_AT_LEAST_7 depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_KISMET @@ -11,6 +12,7 @@ config BR2_PACKAGE_KISMET depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_PROTOBUF_C diff --git a/package/protobuf-c/Config.in b/package/protobuf-c/Config.in index d96cd7b382..a438b32221 100644 --- a/package/protobuf-c/Config.in +++ b/package/protobuf-c/Config.in @@ -4,12 +4,13 @@ config BR2_PACKAGE_PROTOBUF_C depends on BR2_TOOLCHAIN_HAS_THREADS # host-protobuf only builds on certain architectures depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_7 # c++17 for host variant help Code generator and runtime libraries to use Protocol Buffers from pure C (not C++). https://github.com/protobuf-c/protobuf-c -comment "protobuf-c needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "protobuf-c needs a toolchain w/ C++, threads, host gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_HOST_GCC_AT_LEAST_7 depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS diff --git a/package/protobuf-c/protobuf-c.hash b/package/protobuf-c/protobuf-c.hash index ec00442277..aafd98416a 100644 --- a/package/protobuf-c/protobuf-c.hash +++ b/package/protobuf-c/protobuf-c.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4cc4facd508172f3e0a4d3a8736225d472418aee35b4ad053384b137b220339f protobuf-c-1.4.1.tar.gz -sha256 b8999cb392cc5bbe8cd679de59584ad8d2f26033123e76f1d662fa14b9d4f287 LICENSE +sha256 7b404c63361ed35b3667aec75cc37b54298d56dd2bcf369de3373212cc06fd98 protobuf-c-1.5.0.tar.gz +sha256 ad28bbf89340b86d15aad1ff62c4f4590025d836415307dc66cf0338235cc2f4 LICENSE diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk index 0742a33db2..ccabd4723f 100644 --- a/package/protobuf-c/protobuf-c.mk +++ b/package/protobuf-c/protobuf-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROTOBUF_C_VERSION = 1.4.1 +PROTOBUF_C_VERSION = 1.5.0 PROTOBUF_C_SITE = https://github.com/protobuf-c/protobuf-c/releases/download/v$(PROTOBUF_C_VERSION) PROTOBUF_C_DEPENDENCIES = host-protobuf-c HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf @@ -15,8 +15,8 @@ PROTOBUF_C_LICENSE = BSD-2-Clause PROTOBUF_C_LICENSE_FILES = LICENSE PROTOBUF_C_CPE_ID_VENDOR = protobuf-c_project -# host-protobuf needs c++11 (since 3.6.0) -HOST_PROTOBUF_C_CONF_ENV += CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" +# when building with protoc (from host-protobuf) c++17 is now required +HOST_PROTOBUF_C_CONF_ENV += CXXFLAGS="$(HOST_CXXFLAGS) -std=c++17" $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/riemann-c-client/Config.in b/package/riemann-c-client/Config.in index 6c3c35caf8..0985972a8b 100644 --- a/package/riemann-c-client/Config.in +++ b/package/riemann-c-client/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c select BR2_PACKAGE_PROTOBUF_C help Riemann-c-client is a C client library for the Riemann @@ -12,6 +13,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT https://github.com/algernon/riemann-c-client -comment "riemann-c-client needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "riemann-c-client needs a toolchain w/ C++, threads, host gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_HOST_GCC_AT_LEAST_7 depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS From kris at embeddedts.com Mon Feb 5 18:11:12 2024 From: kris at embeddedts.com (Kris Bahnsen) Date: Mon, 05 Feb 2024 10:11:12 -0800 Subject: [Buildroot] [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 In-Reply-To: References: <399bbbdbc865bb5fab6fa7dbdad653f9aa240da2.camel@embeddedTS.com> Message-ID: Hello, Kris, All, On 2024-02-01 13:59 -0800, Kris Bahnsen via buildroot spake thusly: > From 55e8d294997af933bb3d832b73229bebefa45044 Mon Sep 17 00:00:00 > 2001 > From: Kris Bahnsen > Date: Thu, 1 Feb 2024 20:46:39 +0000 > Subject: [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 > > Release changelog: > - Use default values for IQ calibration correction when the eFuse > register has zero values. > - Fix for "WILC1000 Firmware initialization issue" by updating > the PMU clock switching sequence during firmware initialization. > > Signed-off-by: Kris Bahnsen It seems your patch got badly mangled, and I had issues applying it (git-am whined the patch was empty). And I notice that the mail headers are included in the patch. Not sure what happen. Using "git send-email" is known to send correctly formatted patches, so maybe check if you can do that next time. My apologies, I usually use `git send-email`, but had to use an email client to send this patch (and obviously did it incorrectly). Future patches will all come in on `git send-email`. Thanks! Applied to master, thanks. Regards, Yann E. MORIN. > --- > ?package/wilc-firmware/wilc-firmware.hash | 2 +- > ?package/wilc-firmware/wilc-firmware.mk?? | 2 +- > ?2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc- > firmware/wilc-firmware.hash > index 802cb4f9b1..8a7957a1d2 100644 > --- a/package/wilc-firmware/wilc-firmware.hash > +++ b/package/wilc-firmware/wilc-firmware.hash > @@ -1,3 +1,3 @@ > ?# Locally calculated > -sha256? > a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0? > wilc-firmware-wilc_linux_16_1.tar.gz > +sha256? > 6cd5fc52150520bedb736f58124063041b4d9849ea33481a8b075f51aec64f8e? > wilc-firmware-wilc_linux_16_1_2.tar.gz > ?sha256? > 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb? > LICENSE.wilc_fw > diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc- > firmware/wilc-firmware.mk > index 12c825cf92..3381162bbd 100644 > --- a/package/wilc-firmware/wilc-firmware.mk > +++ b/package/wilc-firmware/wilc-firmware.mk > @@ -4,7 +4,7 @@ > ?# > ?#################################################################### > ############ > ? > -WILC_FIRMWARE_VERSION = wilc_linux_16_1 > +WILC_FIRMWARE_VERSION = wilc_linux_16_1_2 > ?WILC_FIRMWARE_SITE = $(call > github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) > ? > ?WILC_FIRMWARE_LICENSE = PROPRIETARY > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Mon Feb 5 18:14:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 19:14:25 +0100 Subject: [Buildroot] [PATCH v2] package/protobuf-c: bump to version 1.5.0 In-Reply-To: <20240119072933.25453-1-buildroot@heine.tech> References: <20240119072933.25453-1-buildroot@heine.tech> Message-ID: <20240205191425.311409b0@windsurf> Hello Michael, On Fri, 19 Jan 2024 08:29:27 +0100 Michael Nosthoff via buildroot wrote: > - drops support for proto2 > - fixes compatibility with protobuf >= 22.0 (which we did not yet bump) > - to be compatible with new protobuf versions c++17 is now required > when building with protoc (which we only do for the host package) [0] > hence require host gcc >= 7 for c++17 support, propagate to depending packets > > [0] https://github.com/protobuf-c/protobuf-c/pull/673 > > Signed-off-by: Michael Nosthoff Thanks, I've applied your patch, but after doing a few more changes. See below. First, you changed the hash of the license file, and that needs to be explained in the commit log so that we have the visibility that you did check why the license file has changed. Indeed, the sole reason for having hashes for the license file is to detect changes in the licensing terms. If we 'blindly' update the hash, we miss the point :-) > diff --git a/package/collectd/Config.in b/package/collectd/Config.in > index d3b686771d..145b9a2a3a 100644 > --- a/package/collectd/Config.in > +++ b/package/collectd/Config.in > @@ -738,6 +738,7 @@ config BR2_PACKAGE_COLLECTD_RIEMANN > # riemann-c-client -> protobuf-c > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS > + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c > select BR2_PACKAGE_RIEMANN_C_CLIENT > select BR2_PACKAGE_LIBTOOL Needed a Config.in comment (which indeed didn't exist until now for existing dependencies). > help > @@ -772,6 +773,7 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS > bool "write_prometheus" > depends on BR2_INSTALL_LIBSTDCPP # protobuf-c > depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c > + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c Needed an update to the existing Config.in comment. > diff --git a/package/criu/Config.in b/package/criu/Config.in > index 4c295acf4f..d223524eee 100644 > --- a/package/criu/Config.in > +++ b/package/criu/Config.in > @@ -12,6 +12,7 @@ config BR2_PACKAGE_CRIU_ARCH_SUPPORTS > # BE/LE endian issues. > depends on BR2_USE_MMU # libcap > depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c > + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c This shouldn't be in BR2_PACKAGE_CRIU_ARCH_SUPPORTS, because it's not an architecture dependency. It should be on BR2_PACKAGE_CRIU, with the appropriate Config.in comment update. > diff --git a/package/kismet/Config.in b/package/kismet/Config.in > index 7bde6c92af..ea2b33fca7 100644 > --- a/package/kismet/Config.in > +++ b/package/kismet/Config.in > @@ -1,8 +1,9 @@ > -comment "kismet needs a toolchain w/ threads, C++, gcc >= 5" > +comment "kismet needs a toolchain w/ threads, C++, gcc >= 5, host-gcc >= 7" ^^^^^ we use "host gcc" everywhere, without the dash > diff --git a/package/protobuf-c/Config.in b/package/protobuf-c/Config.in > index d96cd7b382..56b58afe99 100644 > --- a/package/protobuf-c/Config.in > +++ b/package/protobuf-c/Config.in > @@ -4,12 +4,13 @@ config BR2_PACKAGE_PROTOBUF_C > depends on BR2_TOOLCHAIN_HAS_THREADS > # host-protobuf only builds on certain architectures > depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS > + depends on BR2_HOST_GCC_AT_LEAST_7 # c++17 I've extended the comment to indicate that it is for the host package. Otherwise, the next person coming will wonder why for C++17 we depends on host gcc >= 7, and not target gcc >= 7. Applied with those fixes. Thanks a lot for your contribution! Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 18:22:11 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 19:22:11 +0100 Subject: [Buildroot] [git commit] package/mawk: bump version to 1.3.4-20240123 Message-ID: <20240205182240.3E12680E43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5c3153c6a4c5bd8c4e84624addacc353d1f5724 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Ismael Luceno Signed-off-by: Yann E. MORIN --- package/mawk/mawk.hash | 2 +- package/mawk/mawk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mawk/mawk.hash b/package/mawk/mawk.hash index 0a31675ac8..31a74cab60 100644 --- a/package/mawk/mawk.hash +++ b/package/mawk/mawk.hash @@ -1,2 +1,2 @@ -sha256 88f55a632e2736ff5c5f69944abc151734d89d8298d5005921180f39ab7ba6d0 mawk-1.3.4-20230808.tgz +sha256 a8e319a83744b1f1fb6988dfa189d61887f866e9140cc9a49eb003b2b0655e88 mawk-1.3.4-20240123.tgz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mawk/mawk.mk b/package/mawk/mawk.mk index d747f887ce..9aadf6d972 100644 --- a/package/mawk/mawk.mk +++ b/package/mawk/mawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAWK_VERSION = 1.3.4-20230808 +MAWK_VERSION = 1.3.4-20240123 MAWK_SITE = https://invisible-mirror.net/archives/mawk MAWK_SOURCE = mawk-$(MAWK_VERSION).tgz MAWK_LICENSE = GPL-2.0 From yann.morin.1998 at free.fr Mon Feb 5 18:22:10 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 19:22:10 +0100 Subject: [Buildroot] [git commit] package/stella: bump to version 6.7.1 Message-ID: <20240205182240.2DBB886DC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b64906f88880167cae7513b29b1608f5ca9fe6c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Sergio Prado Signed-off-by: Yann E. MORIN --- package/stella/stella.hash | 2 +- package/stella/stella.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/stella/stella.hash b/package/stella/stella.hash index 17d059226c..59c6806459 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 babfcbb39abbd1a992cb1e6d3b2f508df7ed19cb9d0b5b5d624828bb98f97267 stella-6.7-src.tar.xz +sha256 9ef880df87f2d3ffebfbad915247d1fd5a3aca41dfd6a754dcf7a142ac826752 stella-6.7.1-src.tar.xz sha256 e82dd017fea2c70a16726aa1d7c05c5b7597e10f7229511c1b110bf84cb507c0 Copyright.txt sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index aa5da1996e..c48bb593a4 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.7 +STELLA_VERSION = 6.7.1 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ From james.hilliard1 at gmail.com Mon Feb 5 18:33:08 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 11:33:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/ruby: disable unsupported yjit Message-ID: <20240205183308.2120022-1-james.hilliard1@gmail.com> The yjit feature requires rust toolchain support, since we don't currently handle setting up the rust toolchain for ruby lets disable this feature for now. This broke when ruby was bumped to version 3.3.0 in buildroot commit a01c278df7892c8a6736334aa008b2d7c09e9258. Fixes: linking static-library libruby-static.a LLVM ERROR: Invalid encoding make[2]: *** [Makefile:318: libruby-static.a] Aborted Signed-off-by: James Hilliard --- package/ruby/ruby.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index b2396010c5..4b9ce80e67 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -22,9 +22,14 @@ RUBY_CPE_ID_VENDOR = ruby-lang RUBY_DEPENDENCIES = host-pkgconf host-ruby HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) -RUBY_CONF_OPTS = --disable-install-doc --disable-rpath --disable-rubygems +RUBY_CONF_OPTS = \ + --disable-install-doc \ + --disable-rpath \ + --disable-rubygems \ + --disable-yjit HOST_RUBY_CONF_OPTS = \ --disable-install-doc \ + --disable-yjit \ --with-out-ext=curses,readline \ --without-gmp -- 2.34.1 From buildroot at bubu1.eu Mon Feb 5 18:34:15 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 19:34:15 +0100 Subject: [Buildroot] [PATCH buildroot v2 2/2] support/testing: add fastapi runtime test In-Reply-To: <170715461915.13905.5968173515742280918-1@git.sr.ht> References: <170715461915.13905.5968173515742280918-1@git.sr.ht> Message-ID: <87adf1da-ab34-4ef2-9bd5-0e3e3a8bae33@bubu1.eu> On 05.02.24 18:25, ~bubu wrote: > From: Marcus Hoffmann > > Add a runtime test for fastapi. Use uvicorn as the asgi server > application as does the fastapi hello world example [1]. > > Fastapi depends on PydanticV2 now which is written in rust so we need to > run the test on armv7. > > [1] https://fastapi.tiangolo.com/tutorial/first-steps/ > > Signed-off-by: Marcus Hoffmann > --- > .../tests/package/sample_python_fastapi.py | 8 ++++ > .../tests/package/test_python_fastapi.py | 47 +++++++++++++++++++ > 2 files changed, 55 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_fastapi.py > create mode 100644 support/testing/tests/package/test_python_fastapi.py > > diff --git a/support/testing/tests/package/sample_python_fastapi.py b/support/testing/tests/package/sample_python_fastapi.py > new file mode 100644 > index 0000000000..3116df3a93 > --- /dev/null > +++ b/support/testing/tests/package/sample_python_fastapi.py > @@ -0,0 +1,8 @@ > +from fastapi import FastAPI > + > +app = FastAPI() > + > + at app.get("/") > +async def root(): > + return {"message": "Hello World"} > + > diff --git a/support/testing/tests/package/test_python_fastapi.py b/support/testing/tests/package/test_python_fastapi.py > new file mode 100644 > index 0000000000..1a78fa6c58 > --- /dev/null > +++ b/support/testing/tests/package/test_python_fastapi.py > @@ -0,0 +1,47 @@ > +import os > +import time > + > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy3Fastapi(TestPythonPackageBase): > + __test__ = True > + config = \ > + """ > + BR2_arm=y > + BR2_cortex_a9=y > + BR2_ARM_ENABLE_NEON=y > + BR2_ARM_ENABLE_VFP=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_FASTAPI=y > + BR2_PACKAGE_PYTHON_UVICORN=y > + BR2_TARGET_ROOTFS_CPIO=y > + # BR2_TARGET_ROOTFS_TAR is not set > + BR2_CCACHE=y > + BR2_CCACHE_DIR="/home/bubu/.buildroot-ccache" Oops, I forgot to remove the 2 CCACHE lines before submitting. Don't forget to remove these when applying. :-) > + """ > + sample_scripts = ["tests/package/sample_python_fastapi.py"] > + timeout = 60 > + > + def test_run(self): > + self.login() > + self.check_sample_scripts_exist() > + cmd = "uvicorn sample_python_fastapi:app > /dev/null 2>&1 &" > + > + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) > + > + # Give enough time for the uvicorn server to start up > + time.sleep(30) > + > + cmd = "wget -q -O - http://127.0.0.1:8000/" > + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output[0], '{"message":"Hello World"}') > + > + def login(self): > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > + self.emulator.boot(arch="armv7", > + kernel="builtin", > + options=["-initrd", cpio_file]) > + self.emulator.login() From ju.o at free.fr Mon Feb 5 18:47:57 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 5 Feb 2024 19:47:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/rdma-core: bump to version v50.0 Message-ID: <20240205184757.3404601-1-ju.o@free.fr> For change log, see: https://github.com/linux-rdma/rdma-core/releases/tag/v50.0 This commit drops the package patch, which is now included in the release. Signed-off-by: Julien Olivain --- ...-util-udma_barrier.h-fix-mips4-build.patch | 56 ------------------- package/rdma-core/rdma-core.hash | 2 +- package/rdma-core/rdma-core.mk | 2 +- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch deleted file mode 100644 index 6dfb476faa..0000000000 --- a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 21 Jan 2024 18:55:34 +0100 -Subject: [PATCH] util/udma_barrier.h: fix mips4 build - -The 'sync' instruction for MIPS was defined in MIPS-II as taking no -operands. MIPS32 extended the define of 'sync' as taking an optional -unsigned 5 bit immediate. - -As a result, replace "sync 0" by "sync" to fix the following build -failure on mips4 raised since version 43.0 and -https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: - -/tmp/ccrBy9fV.s: Assembler messages: -/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' - -Fixes: - - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 ---- - util/udma_barrier.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/util/udma_barrier.h b/util/udma_barrier.h -index 0a1f8a45b..3793d2f18 100644 ---- a/util/udma_barrier.h -+++ b/util/udma_barrier.h -@@ -101,7 +101,7 @@ - #elif defined(__riscv) - #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") - #elif defined(__mips__) --#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") -+#define udma_to_device_barrier() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif -@@ -139,7 +139,7 @@ - #elif defined(__riscv) - #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") - #elif defined(__mips__) --#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") -+#define udma_from_device_barrier() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif -@@ -212,7 +212,7 @@ - #include "s390_mmio_insn.h" - #define mmio_flush_writes() s390_pciwb() - #elif defined(__mips__) --#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") -+#define mmio_flush_writes() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash index fc1d319123..27fe7e208d 100644 --- a/package/rdma-core/rdma-core.hash +++ b/package/rdma-core/rdma-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1ea2c2678d48be0b179871e9ae8c58ceab11a0c5b69315a332ff51dd607180b7 rdma-core-49.0.tar.gz +sha256 ecb866caaec7ce13f40074c769860f9c36c3a37a70913c5218217e3293d7cb11 rdma-core-50.0.tar.gz sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk index 5f8989b3bd..7818b396a4 100644 --- a/package/rdma-core/rdma-core.mk +++ b/package/rdma-core/rdma-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -RDMA_CORE_VERSION = 49.0 +RDMA_CORE_VERSION = 50.0 RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md -- 2.43.0 From james.hilliard1 at gmail.com Mon Feb 5 19:31:30 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 12:31:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.75.0 Message-ID: <20240205193130.112131-1-james.hilliard1@gmail.com> Link to Rust 1.71.1 announcement: https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html Drop all mips platforms from target tier 2 platforms due to upstream dropping them to tier 3. See: https://github.com/rust-lang/compiler-team/issues/648 Signed-off-by: James Hilliard --- package/rust-bin/rust-bin.hash | 204 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- package/rustc/Config.in.host | 8 -- 5 files changed, 101 insertions(+), 121 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d44cb2cb67..b6fc7806f2 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,111 +1,99 @@ -# From https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 88d0cd0407ca5bb73b5d72956d85e31e057657c7ec09a58ca634cf36bd5cf626 rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 f58cdf15717e7f6506088e753ffef3ec655a4ccd932eae280d6cb68b0ee3feca rust-1.74.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 d272cec30f3461647861d120af53946142fa2f969f43040c2685425cb67c7d79 rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 17df1fa64083fa508576062a651577e0741d02f4ae5771518a72fd4ea483b00f rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 054a98e8e85e94c187ff8bc16bac8011747839c9ad73584fdd87b904f137eb23 rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 4abc1499e91cfadf7610a08271d1f5ff9284a54ba4a0ba60f105bb9b2413169e rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 3196fd6e4453cd2191e5f8c4f63eaffd045cc1884cf4b64d94990aa81232f85f rust-1.74.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 5483e32fe962e9123cf49c9cf169e60640d4c9d0aad1a054dd4bf232f0f012be rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a776e7b41991ef7a50706d1f9b7752a8d963e67297bfc22471d6e68d544349cc rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.asc -sha256 d712e44d57f3732c294affb26c07d8fb79f25c716b16a4bde910390f34cc9959 rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 38ccd7eeb30e481a27533ec1450c1eb4f3c3fee284f702ee64676b3831bde425 rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 5f1b890faa083afd97ed53c67d859f4de89abe9a059b48c98217d8ee015bedeb rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.asc -sha256 9b57973a9d23e713799169c3b39282655b742c9182e21270f53a3bb46af516f3 rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 26bad270c96de6ca0abbad4a2be63f994fede26b19cfab3362479668f3d1d5c5 rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 c567bf8e062daead8a256ee3097e724e1f70a4be5f69a74c3722719fb338af27 rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 96c81d327c4cd5cd35541dae3db4ed6eef6a943c78b0595396e88264a692b5e2 rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 339b4bf274ba569245a3e7bc1c9e238ce64c1942c5510fb19a4cacae37aa8aa9 rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 915c3648772d1b00b491a204239362aac33b213e95ac7e818b2001a40aae800a rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 e0a61bd2f33e5929a47654dccc5387c56aa847ab028ff2f1992b4dc82da677f0 rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 7402c633f1a765053ca9bd4c03d65ece67651af9ce3698781a8d2a271e76cbaa rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.asc -sha256 7c01117e7db5b77880d2ed5f3874ae10cdf9a3d2d042fc06011a8f5f8346b66c rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.asc -sha256 b2781008ab93083970d5bf18782f6611f80d5b2a0aa1eaf6e6a44e8b0c146d9b rust-std-1.74.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 de7bfa755339d81d0f375c04a6b5432fba8452fdc72154fbe5cd5e1147902b90 rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.asc -sha256 1d0a2aa7fc04896bb73d08ec6b7247d9f8e2db46532c31adff3d7944d66dfb4b rust-std-1.74.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.asc -sha256 c1721bb1f47941b1e6acc2f91b326d9172bf401dd88e92abacbb8084ecbc568f rust-std-1.74.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 d2680c31aabfa896301689a0a03206aad31a59111a3c041c357ba5508f56dcfc rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 7a8b6f7cc454efb57f575ba50956f2530e192ab50c622acf38b29a42a5bb31e0 rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.asc -sha256 733995dec75a90d4039bc3a6e11c44e256bfc4cb074e46a67e2aebfe1ec69a26 rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 7fb458560bccae13f6558df43d5e17f177a084fdcb605d500eda63bc1ac3eb58 rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 931f975a4a4c8dc17552d965b276c7211e25f8c5deec1f41f5db5c181fa15320 rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 40781d07bb9a23d57c2440d70fee6385d8d40553b739d835c38fd0abe96d7ec5 rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 2c4de6689f5008289b791ad15b8cdc2d69947985b81b77d4dbe5d31632532e1d rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 781403a12fef605250869aeb843be6b7f98ed6c0a62f0349fda53ee4d9d8e296 rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 e19c0d79b385454a8e8c9f27c3ca9779ffac778d8b7cd8de701ce413f492d9f1 rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 df435e3254c03ccbfc9e733ae33b399f5f99bd488974bc07d8b1db91a12ee95b rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 98f190039c7e7922838f9716443b7ddfec2aa3dc229f5b1813a26591c557997e rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 990845fa017f4dc55b866ffbfba3670e88b5b3465f420a212a372169fdf98d30 rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 90e51bf23bf94614ddb685211bd6df7c5a8c77065c715f89793e1465f408e8c2 rust-1.75.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 0b85f973c2a3c54b97edd7195069af4de5b5365c50c251a44e934d447ef5253b rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0b69f2c6b8dc010348b65ebb37d14429c858a42af50f45ce21359f65494d8b95 rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 05f8a6b80afd307201c0888a5e4c664412c32596f77bdc03196a93b7bbaf6dc4 rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 fa5a6911cccad0aee8d00a4657ee577122f4d3014672c0cd31583c362029d4c0 rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 da1848e70b781dabb5c397f456be797beedcda075505a96e7bdadc1c6c7a196f rust-1.75.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 6bf166ddcad545aa26aa2d12a186454d7697133b52b7fbbd271ce3ee1ecfedc6 rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 2ea0dc380ac1fced245bafadafd0da50167a4a416b6011e3d73ba3e657a71d15 rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 30faa30402c4d3455efc4e3a510668784908223306bd766289766e6b10a5cb26 rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 e23074ba9e2882a349b8af79a5c6efe8ffe9e644b702e802f2def12310c8adc9 rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 c42114c9fb2ba1426c9dd648b6dc991217f95b8997cc7f5cbcf677068647827e rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 586486d1aae50055ad09cec2a2239c176f66cc9138a5588a200fda5f3de498c3 rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 fdec58e71ada2344be89e6a2c5a84f5ccedda4e3c9d04f2dbd945b6716681706 rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 5a3286edef55ef48ebc65c60f8727c9ab667db54935ac7a962bacad261a1e577 rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 907ce65a7bd3d4c4dbda48a0af8f1d0d68de21fc94148450eb8fafab7449c797 rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 6092b31dd6de399f4d323c743d383e1854dc4e4c2150d44dff756ce416aaebdc rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 218fb7b652d1ae654df5d16ab60748a08285d1e5ea5897d20dc12abe6c7ba096 rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 1674e8b8a57817e338ee3778852a8e089c5c99e38c0a9a2910b9cd1611b43bcf rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 65c1c23c48a537fed5348be109ded1d2456e6952a99cdb6eaf92de1713185727 rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 7bdc6cd915a47e116ca78e07fe8d5d8acb6217e2aa6187806f782d81853a39b3 rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-musl.tar.xz.asc +sha256 f8b90d0de38695a17c71dd06f5dd08afc58d767754f7d2302b5329890c7ee447 rust-std-1.75.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 42c0aba08ddcad191c84adcb5b6479b4599b9e4656e4e2b6d3ed5b46fa4a04fb rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-musl.tar.xz.asc +sha256 235f7787d3fa3b3155c32fc8d638dbecd220f2f2dfb26677c01a10295d78e35f rust-std-1.75.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 eb56d591650773c7ce00f32fde1adcb878b4010167f348ea167d492fba8628d0 rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 776ea8d200f65cacdb619eecae319511ec2ab398321c8d976c846b9dc44b87d5 rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 22286818e4f0f13f712082e7a740aceb32e28ab3f568d6ed0e9e06b4972b30f5 rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 35db7870fbe27308c2a9bad0371cd05af2fd2975e00b7f5a5bb305798960a9cb rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 810be45b498c4ce1ba9181702a2534c5a35e52fbab547d94b62f70e28388748d rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 6943fda4f3958f28883cc5fb9f455611cc42f4d228841984b8a2a0123e7b65a7 rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 136b132199f7bbda2aa0bbff6d1e6ae7d5fca2994a2f2a432a5e99de224b6314 rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 3728f2d2266b5c87fe2a7ae9c46fc43d06f8c855d7d0f141de6bcd24b43ae919 rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index ca35d27d1c..6cee57ece9 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.74.1 +RUST_BIN_VERSION = 1.75.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 175fa71baf..12f91211d0 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.asc -sha256 b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e rustc-1.74.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.xz.asc +sha256 4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340 rustc-1.75.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index f7a5c0fcd5..793544df1b 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.74.1 +RUST_VERSION = 1.75.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index baa68994e6..3ac1a1797e 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -88,14 +88,6 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL # i686-unknown-linux-musl default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL - # mips-unknown-linux-musl - default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 - # mips64-unknown-linux-muslabi64 - default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mips64el-unknown-linux-muslabi64 - default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mipsel-unknown-linux-musl - default y if BR2_mipsel && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # sparc64-unknown-linux-gnu default y if BR2_sparc64 && BR2_TOOLCHAIN_USES_GLIBC -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 5 19:33:23 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 12:33:23 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/{rust, rust-bin}: bump to version 1.75.0 Message-ID: <20240205193323.115009-1-james.hilliard1@gmail.com> Link to Rust 1.75.0 announcement: https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html Drop all mips platforms from target tier 2 platforms due to upstream dropping them to tier 3. See: https://github.com/rust-lang/compiler-team/issues/648 Signed-off-by: James Hilliard --- Changes v1 -> v2: - fix typo --- package/rust-bin/rust-bin.hash | 204 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- package/rustc/Config.in.host | 8 -- 5 files changed, 101 insertions(+), 121 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d44cb2cb67..b6fc7806f2 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,111 +1,99 @@ -# From https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 88d0cd0407ca5bb73b5d72956d85e31e057657c7ec09a58ca634cf36bd5cf626 rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 f58cdf15717e7f6506088e753ffef3ec655a4ccd932eae280d6cb68b0ee3feca rust-1.74.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 d272cec30f3461647861d120af53946142fa2f969f43040c2685425cb67c7d79 rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 17df1fa64083fa508576062a651577e0741d02f4ae5771518a72fd4ea483b00f rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 054a98e8e85e94c187ff8bc16bac8011747839c9ad73584fdd87b904f137eb23 rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 4abc1499e91cfadf7610a08271d1f5ff9284a54ba4a0ba60f105bb9b2413169e rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 3196fd6e4453cd2191e5f8c4f63eaffd045cc1884cf4b64d94990aa81232f85f rust-1.74.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 5483e32fe962e9123cf49c9cf169e60640d4c9d0aad1a054dd4bf232f0f012be rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a776e7b41991ef7a50706d1f9b7752a8d963e67297bfc22471d6e68d544349cc rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.asc -sha256 d712e44d57f3732c294affb26c07d8fb79f25c716b16a4bde910390f34cc9959 rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 38ccd7eeb30e481a27533ec1450c1eb4f3c3fee284f702ee64676b3831bde425 rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 5f1b890faa083afd97ed53c67d859f4de89abe9a059b48c98217d8ee015bedeb rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.asc -sha256 9b57973a9d23e713799169c3b39282655b742c9182e21270f53a3bb46af516f3 rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 26bad270c96de6ca0abbad4a2be63f994fede26b19cfab3362479668f3d1d5c5 rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 c567bf8e062daead8a256ee3097e724e1f70a4be5f69a74c3722719fb338af27 rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 96c81d327c4cd5cd35541dae3db4ed6eef6a943c78b0595396e88264a692b5e2 rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 339b4bf274ba569245a3e7bc1c9e238ce64c1942c5510fb19a4cacae37aa8aa9 rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 915c3648772d1b00b491a204239362aac33b213e95ac7e818b2001a40aae800a rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 e0a61bd2f33e5929a47654dccc5387c56aa847ab028ff2f1992b4dc82da677f0 rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 7402c633f1a765053ca9bd4c03d65ece67651af9ce3698781a8d2a271e76cbaa rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.asc -sha256 7c01117e7db5b77880d2ed5f3874ae10cdf9a3d2d042fc06011a8f5f8346b66c rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.asc -sha256 b2781008ab93083970d5bf18782f6611f80d5b2a0aa1eaf6e6a44e8b0c146d9b rust-std-1.74.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 de7bfa755339d81d0f375c04a6b5432fba8452fdc72154fbe5cd5e1147902b90 rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.asc -sha256 1d0a2aa7fc04896bb73d08ec6b7247d9f8e2db46532c31adff3d7944d66dfb4b rust-std-1.74.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.asc -sha256 c1721bb1f47941b1e6acc2f91b326d9172bf401dd88e92abacbb8084ecbc568f rust-std-1.74.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 d2680c31aabfa896301689a0a03206aad31a59111a3c041c357ba5508f56dcfc rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 7a8b6f7cc454efb57f575ba50956f2530e192ab50c622acf38b29a42a5bb31e0 rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.asc -sha256 733995dec75a90d4039bc3a6e11c44e256bfc4cb074e46a67e2aebfe1ec69a26 rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 7fb458560bccae13f6558df43d5e17f177a084fdcb605d500eda63bc1ac3eb58 rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 931f975a4a4c8dc17552d965b276c7211e25f8c5deec1f41f5db5c181fa15320 rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 40781d07bb9a23d57c2440d70fee6385d8d40553b739d835c38fd0abe96d7ec5 rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 2c4de6689f5008289b791ad15b8cdc2d69947985b81b77d4dbe5d31632532e1d rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 781403a12fef605250869aeb843be6b7f98ed6c0a62f0349fda53ee4d9d8e296 rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 e19c0d79b385454a8e8c9f27c3ca9779ffac778d8b7cd8de701ce413f492d9f1 rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 df435e3254c03ccbfc9e733ae33b399f5f99bd488974bc07d8b1db91a12ee95b rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 98f190039c7e7922838f9716443b7ddfec2aa3dc229f5b1813a26591c557997e rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 990845fa017f4dc55b866ffbfba3670e88b5b3465f420a212a372169fdf98d30 rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 90e51bf23bf94614ddb685211bd6df7c5a8c77065c715f89793e1465f408e8c2 rust-1.75.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 0b85f973c2a3c54b97edd7195069af4de5b5365c50c251a44e934d447ef5253b rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0b69f2c6b8dc010348b65ebb37d14429c858a42af50f45ce21359f65494d8b95 rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 05f8a6b80afd307201c0888a5e4c664412c32596f77bdc03196a93b7bbaf6dc4 rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 fa5a6911cccad0aee8d00a4657ee577122f4d3014672c0cd31583c362029d4c0 rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 da1848e70b781dabb5c397f456be797beedcda075505a96e7bdadc1c6c7a196f rust-1.75.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 6bf166ddcad545aa26aa2d12a186454d7697133b52b7fbbd271ce3ee1ecfedc6 rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 2ea0dc380ac1fced245bafadafd0da50167a4a416b6011e3d73ba3e657a71d15 rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 30faa30402c4d3455efc4e3a510668784908223306bd766289766e6b10a5cb26 rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 e23074ba9e2882a349b8af79a5c6efe8ffe9e644b702e802f2def12310c8adc9 rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 c42114c9fb2ba1426c9dd648b6dc991217f95b8997cc7f5cbcf677068647827e rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 586486d1aae50055ad09cec2a2239c176f66cc9138a5588a200fda5f3de498c3 rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 fdec58e71ada2344be89e6a2c5a84f5ccedda4e3c9d04f2dbd945b6716681706 rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 5a3286edef55ef48ebc65c60f8727c9ab667db54935ac7a962bacad261a1e577 rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 907ce65a7bd3d4c4dbda48a0af8f1d0d68de21fc94148450eb8fafab7449c797 rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 6092b31dd6de399f4d323c743d383e1854dc4e4c2150d44dff756ce416aaebdc rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 218fb7b652d1ae654df5d16ab60748a08285d1e5ea5897d20dc12abe6c7ba096 rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 1674e8b8a57817e338ee3778852a8e089c5c99e38c0a9a2910b9cd1611b43bcf rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 65c1c23c48a537fed5348be109ded1d2456e6952a99cdb6eaf92de1713185727 rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 7bdc6cd915a47e116ca78e07fe8d5d8acb6217e2aa6187806f782d81853a39b3 rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-musl.tar.xz.asc +sha256 f8b90d0de38695a17c71dd06f5dd08afc58d767754f7d2302b5329890c7ee447 rust-std-1.75.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 42c0aba08ddcad191c84adcb5b6479b4599b9e4656e4e2b6d3ed5b46fa4a04fb rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-musl.tar.xz.asc +sha256 235f7787d3fa3b3155c32fc8d638dbecd220f2f2dfb26677c01a10295d78e35f rust-std-1.75.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 eb56d591650773c7ce00f32fde1adcb878b4010167f348ea167d492fba8628d0 rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 776ea8d200f65cacdb619eecae319511ec2ab398321c8d976c846b9dc44b87d5 rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 22286818e4f0f13f712082e7a740aceb32e28ab3f568d6ed0e9e06b4972b30f5 rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 35db7870fbe27308c2a9bad0371cd05af2fd2975e00b7f5a5bb305798960a9cb rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 810be45b498c4ce1ba9181702a2534c5a35e52fbab547d94b62f70e28388748d rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 6943fda4f3958f28883cc5fb9f455611cc42f4d228841984b8a2a0123e7b65a7 rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 136b132199f7bbda2aa0bbff6d1e6ae7d5fca2994a2f2a432a5e99de224b6314 rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 3728f2d2266b5c87fe2a7ae9c46fc43d06f8c855d7d0f141de6bcd24b43ae919 rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index ca35d27d1c..6cee57ece9 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.74.1 +RUST_BIN_VERSION = 1.75.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 175fa71baf..12f91211d0 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.asc -sha256 b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e rustc-1.74.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.xz.asc +sha256 4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340 rustc-1.75.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index f7a5c0fcd5..793544df1b 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.74.1 +RUST_VERSION = 1.75.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index baa68994e6..3ac1a1797e 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -88,14 +88,6 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL # i686-unknown-linux-musl default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL - # mips-unknown-linux-musl - default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 - # mips64-unknown-linux-muslabi64 - default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mips64el-unknown-linux-muslabi64 - default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mipsel-unknown-linux-musl - default y if BR2_mipsel && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # sparc64-unknown-linux-gnu default y if BR2_sparc64 && BR2_TOOLCHAIN_USES_GLIBC -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 5 20:13:42 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 5 Feb 2024 21:13:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR Message-ID: <20240205201342.2995-1-fontaine.fabrice@gmail.com> cpe:2.3:a:green_end:sftpserver has been deprecated in favor of cpe:2.3:a:greenend:sftpserver in December 2022: Version Product Signed-off-by: Fabrice Fontaine --- package/gesftpserver/gesftpserver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 5a3ab0536c..5a7106d707 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -12,7 +12,7 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors -GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_VENDOR = greenend GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling -- 2.43.0 From fontaine.fabrice at gmail.com Mon Feb 5 20:16:25 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 5 Feb 2024 21:16:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjwt: disable examples Message-ID: <20240205201625.5203-1-fontaine.fabrice@gmail.com> Examples are enabled by default since the addition of the package in commit 7251775773011e7da38e3a33c6817eceab6a9dfa Signed-off-by: Fabrice Fontaine --- package/libjwt/libjwt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 7e2ea03b09..1643aa7b7a 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -11,6 +11,7 @@ LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE +LIBJWT_CONF_OPTS = --without-examples ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBJWT_CONF_OPTS += --with-openssl -- 2.43.0 From buildroot at heine.tech Mon Feb 5 20:35:20 2024 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 5 Feb 2024 21:35:20 +0100 Subject: [Buildroot] [PATCH] package/re2: bump to version 2024-02-01 Message-ID: <20240205203521.201702-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 5f590aba6e..543c416087 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a re2-2023-11-01.tar.gz +sha256 cd191a311b84fcf37310e5cd876845b4bf5aee76fdd755008eef3b6478ce07bb re2-2024-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b81a64f2e9..b962b53e3f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2023-11-01 +RE2_VERSION = 2024-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 5 20:41:46 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 5 Feb 2024 21:41:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/lua-http: set CPE variables Message-ID: <20240205204146.284303-1-fontaine.fabrice@gmail.com> cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E Signed-off-by: Fabrice Fontaine --- package/lua-http/lua-http.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index 7fbb09038e..df3e2c0059 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -10,5 +10,7 @@ LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_LICENSE = MIT LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md +LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) +LUA_HTTP_CPE_ID_VENDOR = daurnimator $(eval $(luarocks-package)) -- 2.43.0 From nicola.dilieto at gmail.com Mon Feb 5 20:47:06 2024 From: nicola.dilieto at gmail.com (Nicola Di Lieto) Date: Mon, 5 Feb 2024 21:47:06 +0100 Subject: [Buildroot] [PATCH] package/uacme: bump version to 1.7.5 Message-ID: Signed-off-by: Nicola Di Lieto --- package/uacme/uacme.hash | 2 +- package/uacme/uacme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash index 063b0b57ac..9a274bf394 100644 --- a/package/uacme/uacme.hash +++ b/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a638fe0878dba8fdda62f89e7a284243edbcd31b92c11b5cfdc7d3efd9547bca uacme-1.7.4.tar.gz +sha256 596b2fba75fedc7a410dd71583c828642ecd486dfdcfde109dfebb82a374abbe uacme-1.7.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index b260bd85ee..f02e522761 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.7.4 +UACME_VERSION = 1.7.5 # Released versions are on branch upstream/latest, tagged as # upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not # include .tarball-version -- 2.20.1 From fontaine.fabrice at gmail.com Mon Feb 5 20:49:54 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 5 Feb 2024 21:49:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/cpio: bump to version 2.15 Message-ID: <20240205204954.297515-1-fontaine.fabrice@gmail.com> https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00006.html Signed-off-by: Fabrice Fontaine --- package/cpio/cpio.hash | 6 +++--- package/cpio/cpio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cpio/cpio.hash b/package/cpio/cpio.hash index c67fbc1f61..e300a5f084 100644 --- a/package/cpio/cpio.hash +++ b/package/cpio/cpio.hash @@ -1,6 +1,6 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00001.html -sha1 cbac50a61079b6f3bdcf9ffe42171d9257cfe877 cpio-2.14.tar.bz2 +# From https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00006.html +sha1 db5e3845eb5475ddcb7e8915c3a1458a0c13d787 cpio-2.15.tar.bz2 # Locally calculated after checking pgp signature -sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.14.tar.bz2 +sha256 937610b97c329a1ec9268553fb780037bcfff0dcffe9725ebc4fd9c1aa9075db cpio-2.15.tar.bz2 # Locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk index 911d16822b..452271c8f1 100644 --- a/package/cpio/cpio.mk +++ b/package/cpio/cpio.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPIO_VERSION = 2.14 +CPIO_VERSION = 2.15 CPIO_SOURCE = cpio-$(CPIO_VERSION).tar.bz2 CPIO_SITE = $(BR2_GNU_MIRROR)/cpio CPIO_CONF_OPTS = --bindir=/bin -- 2.43.0 From thomas at devoogdt.com Mon Feb 5 21:22:59 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 5 Feb 2024 22:22:59 +0100 Subject: [Buildroot] [PATCH v7 1/2] package/cairo: move to the meson build system In-Reply-To: <87zfwfrmoe.fsf@48ers.dk> References: <87zfwfrmoe.fsf@48ers.dk> Message-ID: <20240205212300.3178519-1-thomas@devoogdt.com> - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy since they are not selectable anymore in the meson-build options. BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG option already selects that one. This is now in sync with the meson build options. - Note that the dependencies for the various options are slightly changed, but there is not much mentioned about that, the meson introduction is done in one big commit: [1]. - Added xlib_libXrender dependency, which was already required before meson, it just came to my attention since it's a hard error now. - Added two patches to fix cross compiling, upstream: [2]. [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/596a82f2d185b101bd74645492821fe2f9e0daa0 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 Signed-off-by: Thomas Devoogdt --- v2: added -std=gnu11 (allow inline int declaration in if loop, 99 caused some directives problems) v3: enabled host-zlib, needed for librsvg v4: also added gnu11 for host-cairo compiling (fixes my compilation on a gcc 4.9.2 based system) v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v6: fix host-zlib option (again) v7: reworked patch by moving the old config options to legacy and by restoring their original order --- Config.in.legacy | 35 ++++ ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 +++++++ ...p-IPC_RMID_DEFERRED_RELEASE-check-wh.patch | 41 +++++ package/cairo/Config.in | 28 +-- package/cairo/cairo.mk | 160 +++++------------- package/libgtk2/Config.in | 5 +- package/libgtk3/Config.in | 5 +- package/librsvg/Config.in | 2 +- package/libsvg-cairo/Config.in | 2 +- package/rrdtool/Config.in | 4 +- 10 files changed, 194 insertions(+), 150 deletions(-) create mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch create mode 100644 package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/Config.in.legacy b/Config.in.legacy index 82387338d9..431552afe7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,41 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_CAIRO_SVG + bool "cairo svg support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_PNG + help + Cairo SVG is compiled together with PNG, so no need to have this config. + +config BR2_PACKAGE_CAIRO_SCRIPT + bool "cairo script support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo script got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PS + bool "cairo postscript support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PS got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PDF + bool "cairo pdf support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PDF got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_XML + bool "cairo xml support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo XML got merged in to cairo zlib with the introduction of meson. + config BR2_KERNEL_HEADERS_4_14 bool "kernel headers version 4.14.x are no longer supported" select BR2_LEGACY diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch new file mode 100644 index 0000000000..193a210391 --- /dev/null +++ b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch @@ -0,0 +1,62 @@ +From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +Date: Thu, 25 Feb 2021 10:52:45 +0000 +Subject: [PATCH] meson: allow skipping of run check for + IPC_RMID_DEFERRED_RELEASE + +The run check is particularly annoying in cross-compile scenarios, +so allow bypassing the check by having the user provide the value +via a cross file or native file: + + [properties] + ipc_rmid_deferred_release = true + +Closes #408 + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index b159b4071..5f593e54d 100644 +--- a/meson.build ++++ b/meson.build +@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() + ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], + ] + deps += [x11_dep, xext_dep] +- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), +- dependencies: [x11_dep, xext_dep], +- name: 'shmctl IPC_RMID allowes subsequent attaches') + +- if res.returncode() == 0 +- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) ++ # Can skip the run check by providing the result in a cross file or ++ # native file as bool property value. ++ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ # We don't know the type of prop (bool, string) but need to differentiate ++ # between a set value (bool) or the fallback value (string), so convert to ++ # a string and chec the string value. ++ prop_str = '@0@'.format(prop) ++ if prop_str in ['true', 'false'] ++ ipc_rmid_deferred_release = (prop_str == 'true') ++ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) ++ elif prop_str == 'auto' ++ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), ++ dependencies: [x11_dep, xext_dep], ++ name: 'shmctl IPC_RMID allowes subsequent attaches') ++ ++ ipc_rmid_deferred_release = (res.returncode() == 0) ++ else ++ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) + endif ++ ++ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) + endif + + if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 +-- +2.34.1 + diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch new file mode 100644 index 0000000000..b57379fced --- /dev/null +++ b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch @@ -0,0 +1,41 @@ +From d628c24e757e35e53e6e19fea5f23c93611c9cda Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 5 Feb 2024 17:47:07 +0100 +Subject: [PATCH] meson: always skip IPC_RMID_DEFERRED_RELEASE check when cross + compiling + +../../br-test-pkg/bootlin-armv5-uclibc/build/cairo-1.17.4/meson.build:279:13: +ERROR: Can not run test applications in this cross environment. + +Commit 1bec56ea8a931e1ae1c74cc740134497ec365267 added support to define +ipc_rmid_deferred_release in a cross-compile config, but still kept +the default to auto, which anyhow results in an error when cross-compiling. + +Fix that by always assuming 'true', the compilation might fail if IPC_RMID, +is not defined, but that is perhaps desirable. + +See https://www.man7.org/linux/man-pages/man2/shmctl.2.html for more info +about the call defined in meson-cc-tests/ipc_rmid_deferred_release.c + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9100152ee..1de0fac0d 100644 +--- a/meson.build ++++ b/meson.build +@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found() + + # Can skip the run check by providing the result in a cross file or + # native file as bool property value. +- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'true' : 'auto') + # We don't know the type of prop (bool, string) but need to differentiate + # between a set value (bool) or the fallback value (string), so convert to + # a string and check the string value. +-- +2.34.1 + diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 0c87a2904b..c41a12fe81 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_CAIRO select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7 help Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include @@ -15,34 +16,15 @@ config BR2_PACKAGE_CAIRO if BR2_PACKAGE_CAIRO -config BR2_PACKAGE_CAIRO_PS - bool "postscript support" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_CAIRO_PDF - -config BR2_PACKAGE_CAIRO_PDF - bool "pdf support" - select BR2_PACKAGE_ZLIB - config BR2_PACKAGE_CAIRO_PNG - bool "png support" + bool "png support (png and svg surfaces)" select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_ZLIB - -config BR2_PACKAGE_CAIRO_SCRIPT - bool "script support" - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_CAIRO_SVG - bool "svg support" - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PDF config BR2_PACKAGE_CAIRO_TEE bool "tee support" -config BR2_PACKAGE_CAIRO_XML - bool "xml support" - select BR2_PACKAGE_CAIRO_PNG +config BR2_PACKAGE_CAIRO_ZLIB + bool "zlib support (script, ps, pdf, and xml surfaces)" + select BR2_PACKAGE_ZLIB endif diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 4515b76075..3d2a67a6c5 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -17,168 +17,96 @@ CAIRO_IGNORE_CVES += CVE-2019-6462 # 0002-Fix-mask-usage-in-image-compositor.patch CAIRO_IGNORE_CVES += CVE-2020-35492 -CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" +CAIRO_CFLAGS = $(TARGET_CFLAGS) +CAIRO_LDFLAGS = $(TARGET_LDFLAGS) # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) -CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" +CAIRO_CFLAGS += -mxgot endif # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CAIRO_LIBS += -latomic +CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no - -CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman + -Dfontconfig=enabled \ + -Dtests=disabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 +CAIRO_DEPENDENCIES = \ + host-pkgconf \ + fontconfig \ + pixman # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no \ - --disable-directfb \ - --enable-ft \ - --enable-gobject \ - --disable-glesv2 \ - --disable-vg \ - --disable-xlib \ - --disable-xcb \ - --without-x \ - --disable-xlib-xrender \ - --disable-ps \ - --disable-pdf \ - --enable-png \ - --enable-script \ - --disable-svg \ - --disable-tee \ - --disable-xml + -Dfontconfig=enabled \ + -Dfreetype=enabled \ + -Dpng=enabled \ + -Dtee=disabled \ + -Dxcb=disabled \ + -Dxlib=disabled \ + -Dzlib=enabled \ + -Dtests=disabled \ + -Dglib=enabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ host-fontconfig \ host-libglib2 \ host-libpng \ host-pixman \ - host-pkgconf + host-pkgconf \ + host-zlib -# DirectFB svg support rely on Cairo and Cairo DirectFB support depends on -# DirectFB. Break circular dependency by disabling DirectFB support in Cairo -# (which is experimental) -ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx) -CAIRO_CONF_OPTS += --enable-directfb -CAIRO_DEPENDENCIES += directfb -else -CAIRO_CONF_OPTS += --disable-directfb +ifeq ($(BR2_PACKAGE_LZO),y) +CAIRO_DEPENDENCIES += lzo endif ifeq ($(BR2_PACKAGE_FREETYPE),y) -CAIRO_CONF_OPTS += --enable-ft +CAIRO_CONF_OPTS += -Dfreetype=enabled CAIRO_DEPENDENCIES += freetype else -CAIRO_CONF_OPTS += --disable-ft -endif - -ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) -CAIRO_DEPENDENCIES += libexecinfo -CAIRO_LIBS += -lexecinfo +CAIRO_CONF_OPTS += -Dfreetype=disabled endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -CAIRO_CONF_OPTS += --enable-gobject +CAIRO_CONF_OPTS += -Dglib=enabled CAIRO_DEPENDENCIES += libglib2 else -CAIRO_CONF_OPTS += --disable-gobject -endif - -# Can use GL or GLESv2 but not both -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -CAIRO_CONF_OPTS += --enable-gl --disable-glesv2 -CAIRO_DEPENDENCIES += libgl -else -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -CAIRO_CONF_OPTS += --disable-gl --enable-glesv2 -CAIRO_DEPENDENCIES += libgles -else -CAIRO_CONF_OPTS += --disable-gl --disable-glesv2 -endif -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -CAIRO_CONF_OPTS += --enable-vg -CAIRO_DEPENDENCIES += libopenvg -else -CAIRO_CONF_OPTS += --disable-vg -endif - -ifeq ($(BR2_PACKAGE_LZO),y) -CAIRO_DEPENDENCIES += lzo +CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x -CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext -else -CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -CAIRO_CONF_OPTS += --enable-xlib-xrender -CAIRO_DEPENDENCIES += xlib_libXrender -else -CAIRO_CONF_OPTS += --disable-xlib-xrender -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PS),y) -CAIRO_CONF_OPTS += --enable-ps -CAIRO_DEPENDENCIES += zlib +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += --disable-ps -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PDF),y) -CAIRO_CONF_OPTS += --enable-pdf -CAIRO_DEPENDENCIES += zlib -else -CAIRO_CONF_OPTS += --disable-pdf +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -CAIRO_CONF_OPTS += --enable-png +CAIRO_CONF_OPTS += -Dpng=enabled CAIRO_DEPENDENCIES += libpng else -CAIRO_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y) -CAIRO_CONF_OPTS += --enable-script -else -CAIRO_CONF_OPTS += --disable-script -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SVG),y) -CAIRO_CONF_OPTS += --enable-svg -else -CAIRO_CONF_OPTS += --disable-svg +CAIRO_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_TEE),y) -CAIRO_CONF_OPTS += --enable-tee +CAIRO_CONF_OPTS += -Dtee=enabled else -CAIRO_CONF_OPTS += --disable-tee +CAIRO_CONF_OPTS += -Dtee=disabled endif -ifeq ($(BR2_PACKAGE_CAIRO_XML),y) -CAIRO_CONF_OPTS += --enable-xml +ifeq ($(BR2_PACKAGE_CAIRO_ZLIB),y) +CAIRO_CONF_OPTS += -Dzlib=enabled +CAIRO_DEPENDENCIES += zlib else -CAIRO_CONF_OPTS += --disable-xml +CAIRO_CONF_OPTS += -Dzlib=disabled endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index f2888b2f51..f8821ba246 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -9,9 +9,8 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO select BR2_PACKAGE_GDK_PIXBUF diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 34b8d49eb3..9f9a081ecb 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -25,9 +25,8 @@ config BR2_PACKAGE_LIBGTK3 BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 270b524b37..d74359dfc9 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_SCRIPT + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_HOST_RUSTC select BR2_PACKAGE_LIBGLIB2 diff --git a/package/libsvg-cairo/Config.in b/package/libsvg-cairo/Config.in index 9577c69bf0..4602e93c2a 100644 --- a/package/libsvg-cairo/Config.in +++ b/package/libsvg-cairo/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBSVG_CAIRO bool "libsvg-cairo" select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBSVG help Libsvg-cairo provides the ability to render SVG content from diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in index 5ffdc92618..d954fd1214 100644 --- a/package/rrdtool/Config.in +++ b/package/rrdtool/Config.in @@ -19,10 +19,8 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PDF select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_PANGO help This enables the graphing capabilities ('rrdgraph'). -- 2.34.1 From thomas at devoogdt.com Mon Feb 5 21:23:00 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 5 Feb 2024 22:23:00 +0100 Subject: [Buildroot] [PATCH v7 2/2] package/cairo: bump to 1.18.0 In-Reply-To: <20240205212300.3178519-1-thomas@devoogdt.com> References: <87zfwfrmoe.fsf@48ers.dk> <20240205212300.3178519-1-thomas@devoogdt.com> Message-ID: <20240205212300.3178519-2-thomas@devoogdt.com> News: - https://www.cairographics.org/news/cairo-1.17.8/ - https://www.cairographics.org/news/cairo-1.18.0/ Some options are renamed/dropped so fix that along. - GL and GLES drawing has been dropped in 1.17.8. - The XML surface has been removed in 1.18.0. - xlib-xcb was added [1] Patches: - drop 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch, upstream: [2] - drop 0002-Fix-mask-usage-in-image-compositor.patch, upstream: [3] - drop 0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch, upstream: [4] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/3468c67fe91f0c37e0ec5d335082653a6fa609b6 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be [4]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 Signed-off-by: Thomas Devoogdt --- v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v7: rebased on v7-0001-package-cairo-move-to-the-meson-build-system --- ...or_tolerance_normalized-fix-infinite.patch | 39 ------------ ...rivate.h-fix-missing-FT_Color-error.patch} | 0 ...2-Fix-mask-usage-in-image-compositor.patch | 56 ----------------- ...-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} | 0 ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 ------------------- package/cairo/cairo.hash | 6 +- package/cairo/cairo.mk | 21 ++++--- 7 files changed, 14 insertions(+), 170 deletions(-) delete mode 100644 package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch rename package/cairo/{0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch => 0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch} (100%) delete mode 100644 package/cairo/0002-Fix-mask-usage-in-image-compositor.patch rename package/cairo/{0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch => 0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} (100%) delete mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch diff --git a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch deleted file mode 100644 index 078e90fa42..0000000000 --- a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Sun, 1 Aug 2021 11:16:03 +0000 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - -[Retrieved from: -https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] -Signed-off-by: Quentin Schulz ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -2.38.1 - diff --git a/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch b/package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch similarity index 100% rename from package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch rename to package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch diff --git a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch deleted file mode 100644 index 54a95593c5..0000000000 --- a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - -[Retrieved from -https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be] -[Removed changes in test/ directory to remove binary diff so that the -patch can be applied by `patch` tool] -Signed-off-by: Quentin Schulz ---- - src/cairo-image-compositor.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index bbf4cf228..2352c478e 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - unsigned num_spans) - { - cairo_image_span_renderer_t *r = abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); - int x0; - - if (num_spans == 0) - return CAIRO_STATUS_SUCCESS; - - x0 = spans[0].x; -- m = r->_buf; -+ m = base; - do { - int len = spans[1].x - spans[0].x; - if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { -@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - spans[0].x, y, - spans[1].x - spans[0].x, h); - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else if (spans[0].coverage == 0x0) { - if (spans[0].x != x0) { -@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - #endif - } - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else { - *m++ = spans[0].coverage; --- -2.38.1 - diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch similarity index 100% rename from package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch rename to package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch deleted file mode 100644 index 193a210391..0000000000 --- a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Thu, 25 Feb 2021 10:52:45 +0000 -Subject: [PATCH] meson: allow skipping of run check for - IPC_RMID_DEFERRED_RELEASE - -The run check is particularly annoying in cross-compile scenarios, -so allow bypassing the check by having the user provide the value -via a cross file or native file: - - [properties] - ipc_rmid_deferred_release = true - -Closes #408 - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index b159b4071..5f593e54d 100644 ---- a/meson.build -+++ b/meson.build -@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() - ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], - ] - deps += [x11_dep, xext_dep] -- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -- dependencies: [x11_dep, xext_dep], -- name: 'shmctl IPC_RMID allowes subsequent attaches') - -- if res.returncode() == 0 -- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) -+ # Can skip the run check by providing the result in a cross file or -+ # native file as bool property value. -+ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') -+ # We don't know the type of prop (bool, string) but need to differentiate -+ # between a set value (bool) or the fallback value (string), so convert to -+ # a string and chec the string value. -+ prop_str = '@0@'.format(prop) -+ if prop_str in ['true', 'false'] -+ ipc_rmid_deferred_release = (prop_str == 'true') -+ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) -+ elif prop_str == 'auto' -+ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -+ dependencies: [x11_dep, xext_dep], -+ name: 'shmctl IPC_RMID allowes subsequent attaches') -+ -+ ipc_rmid_deferred_release = (res.returncode() == 0) -+ else -+ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) - endif -+ -+ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) - endif - - if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 --- -2.34.1 - diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index fca9ff678c..df9c693bad 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,7 +1,5 @@ -# From https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz.sha1 -sha1 68712ae1039b114347be3b7200bc1c901d47a636 cairo-1.17.4.tar.xz -# Calculated based on the hash above -sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 cairo-1.17.4.tar.xz +# From https://www.cairographics.org/releases/cairo-1.18.0.tar.xz.sha256sum +sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 cairo-1.18.0.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 3d2a67a6c5..4ace04ebbe 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,19 +4,14 @@ # ################################################################################ -CAIRO_VERSION = 1.17.4 +CAIRO_VERSION = 1.18.0 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics -CAIRO_SITE = http://cairographics.org/snapshots +CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES -# 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch -CAIRO_IGNORE_CVES += CVE-2019-6462 -# 0002-Fix-mask-usage-in-image-compositor.patch -CAIRO_IGNORE_CVES += CVE-2020-35492 - CAIRO_CFLAGS = $(TARGET_CFLAGS) CAIRO_LDFLAGS = $(TARGET_LDFLAGS) @@ -32,9 +27,13 @@ CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ + -Dquartz=disabled \ -Dtests=disabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 CAIRO_DEPENDENCIES = \ host-pkgconf \ @@ -43,9 +42,11 @@ CAIRO_DEPENDENCIES = \ # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ -Dfreetype=enabled \ -Dpng=enabled \ + -Dquartz=disabled \ -Dtee=disabled \ -Dxcb=disabled \ -Dxlib=disabled \ @@ -53,6 +54,8 @@ HOST_CAIRO_CONF_OPTS = \ -Dtests=disabled \ -Dglib=enabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ @@ -82,10 +85,10 @@ CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled -Dxlib-xcb=enabled CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled -Dxlib-xcb=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 5 21:23:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:23:15 +0100 Subject: [Buildroot] [git commit] package/shadow: bump to version 4.14.3 Message-ID: <20240205212324.27EE086DE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a01774d9897310c00a0945865f5a6d5167dfca3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Also, the new version has an optional dependency on libbsd. Signed-off-by: Raphael Pavlidis Signed-off-by: Thomas Petazzoni --- package/shadow/0001-Fix-yescrypt-support.patch | 38 -------------------------- package/shadow/shadow.hash | 5 ++-- package/shadow/shadow.mk | 9 +++++- 3 files changed, 11 insertions(+), 41 deletions(-) diff --git a/package/shadow/0001-Fix-yescrypt-support.patch b/package/shadow/0001-Fix-yescrypt-support.patch deleted file mode 100644 index 19427676ca..0000000000 --- a/package/shadow/0001-Fix-yescrypt-support.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7a63017b3c873a59e3482322b7824160a8c8ca67 Mon Sep 17 00:00:00 2001 -11;rgb:f6f6/f5f5/f4f4From: Bernd Kuhls -Date: Sun, 9 Jul 2023 10:55:03 +0200 -Subject: [PATCH] Fix yescrypt support - -Fixes build error: -newusers.c: In function 'update_passwd': -newusers.c:433:21: error: 'sflg' undeclared (first use in this function); did you mean 'rflg'? - -introduced by -https://github.com/shadow-maint/shadow/commit/5cd04d03f94622c12220d4a6352824af081b8531 -which forgot to define sflg for these configure options: - ---without-sha-crypt --without-bcrypt --with-yescrypt - -Upstream: https://github.com/shadow-maint/shadow/commit/29da702491eea314b915ea9c7a83c9af80cf5797 - -Signed-off-by: Bernd Kuhls ---- - src/newusers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/newusers.c b/src/newusers.c -index 7cb8434b..08f79798 100644 ---- a/src/newusers.c -+++ b/src/newusers.c -@@ -60,7 +60,7 @@ static bool rflg = false; /* create a system account */ - #ifndef USE_PAM - static /*@null@*//*@observer@*/char *crypt_method = NULL; - #define cflg (NULL != crypt_method) --#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) -+#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT) - static bool sflg = false; - #endif - #ifdef USE_SHA_CRYPT --- -2.39.2 - diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash index 2e5c4a8168..4689a994de 100644 --- a/package/shadow/shadow.hash +++ b/package/shadow/shadow.hash @@ -1,3 +1,4 @@ -# Locally computed -sha256 9afe245d79a2e7caac5f1ed62519b17416b057ec89df316df1c3935502f9dd2c shadow-4.13.tar.xz +# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.3/shadow-4.14.3.tar.xz.asc +# with key A9348594CE31283A826FBDD8D57633D441E25BB5 +sha256 6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2 shadow-4.14.3.tar.xz sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 4bc3cce037..03eb16a3f4 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHADOW_VERSION = 4.13 +SHADOW_VERSION = 4.14.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 @@ -120,6 +120,13 @@ else SHADOW_CONF_OPTS += --without-yescrypt endif +ifeq ($(BR2_PACKAGE_LIBBSD),y) +SHADOW_CONF_OPTS += --with-libbsd +SHADOW_DEPENDENCIES += libbsd +else +SHADOW_CONF_OPTS += --without-libbsd +endif + define SHADOW_PERMISSIONS /usr/bin/chage f 4755 0 0 - - - - - /usr/bin/chfn f 4755 0 0 - - - - - From thomas.petazzoni at bootlin.com Mon Feb 5 21:24:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:24:27 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/shadow: bump to version 4.14.3 In-Reply-To: <20240117192342.2633-1-raphael.pavlidis@gmail.com> References: <20240117192342.2633-1-raphael.pavlidis@gmail.com> Message-ID: <20240205222427.748f3859@windsurf> On Wed, 17 Jan 2024 19:23:42 +0000 Raphael Pavlidis wrote: > Also, the new version has an optional dependency on libbsd. > > Signed-off-by: Raphael Pavlidis > --- > .../shadow/0001-Fix-yescrypt-support.patch | 38 ------------------- > package/shadow/shadow.hash | 5 ++- > package/shadow/shadow.mk | 9 ++++- > 3 files changed, 11 insertions(+), 41 deletions(-) > delete mode 100644 package/shadow/0001-Fix-yescrypt-support.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:24:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:24:21 +0100 Subject: [Buildroot] [git commit] package/collectd: fix grpc build Message-ID: <20240205212520.0204A86DE6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=282b951ed3315c6e2a37725f0bc033bfab4c72cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following grpc build failure raised since bump of libabseil-cpp to version 20230802.1 in commit aea790392af5358568a4f1c5d2dd9f1adfb29109: configure:25127: checking grpc++/grpc++.h usability configure:25127: /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc64-linux-g++ -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O1 -g0 -D_FORTIFY_SOURCE=2 -std=c++11 -DNOMINMAX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.cpp >&5 In file included from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/config.h:86, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/const_init.h:25, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/synchronization/mutex.h:67, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/impl/codegen/sync.h:32, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/completion_queue.h:41, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/channel.h:25, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/grpcpp.h:52, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpc++/grpc++.h:26, from conftest.cpp:167: /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than C++14 are not supported." 79 | #error "C++ versions less than C++14 are not supported." | ^~~~~ [...] grpc . . . . . . . . no (libgrpc++ not found) (dependency error) [...] configure: error: "Some plugins are missing dependencies - see the summary above for details" Fixes: - http://autobuild.buildroot.org/results/e2cf909ab3c356f1881fd18cfa039e87faa10d7d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-configure.ac-fix-grpc-build.patch | 96 ++++++++++++++++++++++ package/collectd/collectd.mk | 2 + 2 files changed, 98 insertions(+) diff --git a/package/collectd/0002-configure.ac-fix-grpc-build.patch b/package/collectd/0002-configure.ac-fix-grpc-build.patch new file mode 100644 index 0000000000..00de673e89 --- /dev/null +++ b/package/collectd/0002-configure.ac-fix-grpc-build.patch @@ -0,0 +1,96 @@ +From d355618813bb8180e460ba45a0ebd3ce5183e267 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 22 Jan 2024 22:15:21 +0100 +Subject: [PATCH] configure.ac: fix grpc build + +abseil and other google tools are now subject to +"Google's Foundational C++ Support Policy" [0][1]. This currently +mandates gcc 7.3.1 and C++14 as minimum versions. So replace -std=c++11 +by -std=c++14 to fix following build failure: + +checking whether /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc64-linux-g++ accepts -std=c++11 +configure:25105: result: yes +configure:25127: checking grpc++/grpc++.h usability +configure:25127: /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc64-linux-g++ -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O1 -g0 -D_FORTIFY_SOURCE=2 -std=c++11 -DNOMINMAX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.cpp >&5 +In file included from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/config.h:86, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/const_init.h:25, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/synchronization/mutex.h:67, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/impl/codegen/sync.h:32, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/completion_queue.h:41, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/channel.h:25, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/grpcpp.h:52, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpc++/grpc++.h:26, + from conftest.cpp:167: +/home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than C++14 are not supported." + 79 | #error "C++ versions less than C++14 are not supported." + | ^~~~~ + +[0] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 +[1] https://github.com/google/oss-policies-info/blob/b842c39db88e6569dfe2cf98be434b03507cb503/foundational-cxx-support-matrix.md + +Fixes: + - http://autobuild.buildroot.org/results/e2cf909ab3c356f1881fd18cfa039e87faa10d7d + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/collectd/collectd/commit/d355618813bb8180e460ba45a0ebd3ce5183e267 +--- + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c816d3dbbc..dad27f53b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2853,20 +2853,20 @@ PKG_CHECK_MODULES([GRPCPP], [grpc++], + fi + + if test "x$withval" != "xno"; then +- AC_MSG_CHECKING([whether $CXX accepts -std=c++11]) +- if test_cxx_flags -std=c++11; then ++ AC_MSG_CHECKING([whether $CXX accepts -std=c++14]) ++ if test_cxx_flags -std=c++14; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- with_libgrpcpp="no (requires C++11 support)" +- with_libprotobuf="no ( requires C++11 support)" ++ with_libgrpcpp="no (requires C++14 support)" ++ with_libprotobuf="no ( requires C++14 support)" + fi + fi + + if test "x$with_libgrpcpp" = "xyes"; then + AC_LANG_PUSH(C++) + SAVE_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="-std=c++11 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS" ++ CPPFLAGS="-std=c++14 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS" + AC_CHECK_HEADERS([grpc++/grpc++.h], + [with_libgrpcpp="yes"], + [with_libgrpcpp="no ( not found)"] +@@ -2880,7 +2880,7 @@ if test "x$with_libgrpcpp" = "xyes"; then + SAVE_CPPFLAGS="$CPPFLAGS" + SAVE_LDFLAGS="$LDFLAGS" + SAVE_LIBS="$LIBS" +- CPPFLAGS="-std=c++11 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS" ++ CPPFLAGS="-std=c++14 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS" + LDFLAGS="$with_libgrpcpp_ldflags" + if test "x$GRPCPP_LIBS" = "x"; then + LIBS="-lgrpc++" +@@ -2908,7 +2908,7 @@ if test "x$with_libgrpcpp" = "xyes"; then + AC_LANG_POP(C++) + fi + +-BUILD_WITH_LIBGRPCPP_CPPFLAGS="-std=c++11 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS" ++BUILD_WITH_LIBGRPCPP_CPPFLAGS="-std=c++14 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS" + BUILD_WITH_LIBGRPCPP_LDFLAGS="$with_libgrpcpp_ldflags" + BUILD_WITH_LIBGRPCPP_LIBS="$GRPCPP_LIBS" + AC_SUBST([BUILD_WITH_LIBGRPCPP_CPPFLAGS]) +@@ -4852,7 +4852,7 @@ if test "x$withval" != "xno"; then + AC_CHECK_LIB([protobuf], [main], + [ + SAVE_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="-std=c++11 $with_libprotobuf_cppflags $PROTOBUF_CFLAGS" ++ CPPFLAGS="-std=c++14 $with_libprotobuf_cppflags $PROTOBUF_CFLAGS" + if test "x$PROTOBUF_LIBS" = "x" + then + PROTOBUF_LIBS="-lprotobuf" diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 6c993827c4..76f622b8db 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -14,6 +14,8 @@ COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins) COLLECTD_LICENSE_FILES = COPYING COLLECTD_CPE_ID_VENDOR = collectd COLLECTD_SELINUX_MODULES = apache collectd +# We're patching configure.ac +COLLECTD_AUTORECONF = YES # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ From thomas.petazzoni at bootlin.com Mon Feb 5 21:25:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:25:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectd: fix grpc build In-Reply-To: <20240122222351.477993-1-fontaine.fabrice@gmail.com> References: <20240122222351.477993-1-fontaine.fabrice@gmail.com> Message-ID: <20240205222517.2b876f18@windsurf> On Mon, 22 Jan 2024 23:23:51 +0100 Fabrice Fontaine wrote: > Fix the following grpc build failure raised since bump of libabseil-cpp > to version 20230802.1 in commit > aea790392af5358568a4f1c5d2dd9f1adfb29109: > > configure:25127: checking grpc++/grpc++.h usability > configure:25127: /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc64-linux-g++ -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O1 -g0 -D_FORTIFY_SOURCE=2 -std=c++11 -DNOMINMAX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.cpp >&5 > In file included from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/config.h:86, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/const_init.h:25, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/synchronization/mutex.h:67, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/impl/codegen/sync.h:32, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/completion_queue.h:41, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/channel.h:25, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/grpcpp.h:52, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpc++/grpc++.h:26, > from conftest.cpp:167: > /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than C++14 are not supported." > 79 | #error "C++ versions less than C++14 are not supported." > | ^~~~~ > > [...] > > grpc . . . . . . . . no (libgrpc++ not found) (dependency error) > > [...] > > configure: error: "Some plugins are missing dependencies - see the summary above for details" > > Fixes: > - http://autobuild.buildroot.org/results/e2cf909ab3c356f1881fd18cfa039e87faa10d7d > > Signed-off-by: Fabrice Fontaine > --- > .../0002-configure.ac-fix-grpc-build.patch | 96 +++++++++++++++++++ > package/collectd/collectd.mk | 2 + > 2 files changed, 98 insertions(+) > create mode 100644 package/collectd/0002-configure.ac-fix-grpc-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:25:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:25:30 +0100 Subject: [Buildroot] [git commit] package/flutter-pi: enable vulkan if possible Message-ID: <20240205212811.BE6C286DF8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a627753d35d2ba97d5bddfc2491ca8b5577eba49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable the flutter-pi vulkan option if a suitable driver is enabled. Currently, only Mesa provides Vulkan drivers. As such, gating the feature behind the BR2_PACKAGE_MESA3D_VULKAN_DRIVER option is reasonable at the moment and is done by three other packages already: flutter-engine, ivi-home screen, and wlroots. Furthermore, a dependency on BR2_PACKAGE_VULKAN_LOADER is needed as the vulkan-loader package provides the vulkan.pc file, which the configure step relies upon. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/flutter-pi/flutter-pi.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk index f1812b154e..9edc62e7ac 100644 --- a/package/flutter-pi/flutter-pi.mk +++ b/package/flutter-pi/flutter-pi.mk @@ -24,7 +24,6 @@ FLUTTER_PI_CONF_OPTS = \ -DENABLE_TESTS=OFF \ -DENABLE_TSAN=OFF \ -DENABLE_UBSAN=OFF \ - -DENABLE_VULKAN=OFF \ -DFILESYSTEM_LAYOUT=meta-flutter \ -DLINT_EGL_HEADERS=OFF \ -DTRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=OFF \ @@ -75,6 +74,13 @@ else FLUTTER_PI_CONF_OPTS += -DBUILD_TEXT_INPUT_PLUGIN=OFF endif +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER)$(BR2_PACKAGE_VULKAN_LOADER),yy) +FLUTTER_PI_DEPENDENCIES += mesa3d vulkan-loader +FLUTTER_PI_CONF_OPTS += -DENABLE_VULKAN=ON +else +FLUTTER_PI_CONF_OPTS += -DENABLE_VULKAN=OFF +endif + ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) FLUTTER_PI_CONF_OPTS += -DENABLE_OPENGL=ON else From thomas.petazzoni at bootlin.com Mon Feb 5 21:26:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:26:04 +0100 Subject: [Buildroot] [git commit] package/wlroots: update patch with upstream status Message-ID: <20240205212811.D248F86DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=840849afff07f91668f88570c5055eaf6687deb2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been rejected upstream, and the initial pull request was moved to the freedesktop gitlab. Update the patch to reflect these changes. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 2fc974e2f2..31ed5bb5cc 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1395,7 +1395,6 @@ package/wilc-driver/0005-Fix-cast-warnings.patch Upstream package/wipe/0001-musl.patch Upstream package/wireless_tools/0001-remove-bzero.patch Upstream package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch Upstream -package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch Upstream package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch Upstream package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch Upstream package/wpa_supplicant/ifupdown.sh Shellcheck diff --git a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch b/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch index 0ba078708a..0e1ae9d87a 100644 --- a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch +++ b/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch @@ -5,8 +5,10 @@ Subject: [PATCH] Add feature macros to more C files These source files use "struct timespec", which is POSIX 1993.09. -Signed-off-by: Paul Cercueil +Upstream: Rejected (Upstream does not want these workarounds) +see: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2493 +Signed-off-by: Paul Cercueil [Retrieved from: https://github.com/swaywm/wlroots/pull/2493] Signed-off-by: Fabrice Fontaine --- From thomas.petazzoni at bootlin.com Mon Feb 5 21:25:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:25:50 +0100 Subject: [Buildroot] [git commit] package/wlroots: vulkan renderer depends on vulkan loader Message-ID: <20240205212811.C762386DF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f27b0322a5019c4016d2800ccc1b586eb6af7bd5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Without the vulkan-loader package present, the configure step fails with the following error message: ``` Run-time dependency vulkan found: NO (tried pkgconfig and system) Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it. ``` The above error is due to the lack of the vulkan.pc file provided by the vulkan-loader package. A search of autobuild failures containing BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build failures. However, the failure reasons happened before wlroots could compile. One for gerbera-1.10.0 and another for host-rust-1.64.0. Add a dependency on the vulkan-loader package to resolve the above issue. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/wlroots/wlroots.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index bb5c8f497d..fdd2fb8250 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -41,9 +41,9 @@ else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y) +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER)$(BR2_PACKAGE_VULKAN_LOADER),yy) WLROOTS_RENDERERS += vulkan -WLROOTS_DEPENDENCIES += mesa3d +WLROOTS_DEPENDENCIES += mesa3d vulkan-loader endif WLROOTS_CONF_OPTS += \ From thomas.petazzoni at bootlin.com Mon Feb 5 21:28:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:28:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/flutter-pi: enable vulkan if possible In-Reply-To: <20240121205718.155549-1-adam.duskett@amarulasolutions.com> References: <20240121205718.155549-1-adam.duskett@amarulasolutions.com> Message-ID: <20240205222836.3b363b8c@windsurf> Hello Adam, On Sun, 21 Jan 2024 13:57:18 -0700 Adam Duskett wrote: > Enable the flutter-pi vulkan option if a suitable driver is enabled. > Currently, only Mesa provides Vulkan drivers. As such, gating the feature > behind the BR2_PACKAGE_MESA3D_VULKAN_DRIVER option is reasonable at the moment > and is done by three other packages already: > flutter-engine, ivi-home screen, and wlroots. > > Furthermore, a dependency on BR2_PACKAGE_VULKAN_LOADER is needed as the > vulkan-loader package provides the vulkan.pc file, which the configure step > relies upon. > > Signed-off-by: Adam Duskett > --- > package/flutter-pi/flutter-pi.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) Applied to master, thanks. Of course, at some point it would be nice to a vulkan virtual package, but let's do that when we have two supported Vulkan implementations. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:28:47 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:28:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/wlroot: vulkan renderer depends on vulkan loader In-Reply-To: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> Message-ID: <20240205222847.4a492f2f@windsurf> On Sun, 21 Jan 2024 13:42:51 -0700 Adam Duskett wrote: > Without the vulkan-loader package present, the configure step fails with the > following error message: > ``` > Run-time dependency vulkan found: NO (tried pkgconfig and system) > Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it. > ``` > > The above error is due to the lack of the vulkan.pc file provided by the > vulkan-loader package. A search of autobuild failures containing > BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build > failures. However, the failure reasons happened before wlroots could compile. > One for gerbera-1.10.0 and another for host-rust-1.64.0. > > Add a dependency on the vulkan-loader package to resolve the above issue. > > Signed-off-by: Adam Duskett > --- > package/wlroots/wlroots.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:29:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:29:49 +0100 Subject: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status In-Reply-To: <20240121204252.152952-2-adam.duskett@amarulasolutions.com> References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> <20240121204252.152952-2-adam.duskett@amarulasolutions.com> Message-ID: <20240205222949.2805f50f@windsurf> Hello Adam, +Paul Cercueil in Cc, see below. On Sun, 21 Jan 2024 13:42:52 -0700 Adam Duskett wrote: > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been > rejected upstream, and the initial pull request was moved to the > freedesktop gitlab. Update the patch to reflect these changes. > > Signed-off-by: Adam Duskett Thanks, applied! Paul: could you follow-up with upstream (either wlroots, or uclibc, or both) to try to find an acceptable solution so that some day we can drop this patch? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas at devoogdt.com Mon Feb 5 21:30:34 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 5 Feb 2024 22:30:34 +0100 Subject: [Buildroot] [PATCH v8 1/2] package/cairo: move to the meson build system In-Reply-To: <20240205212300.3178519-2-thomas@devoogdt.com> References: <20240205212300.3178519-2-thomas@devoogdt.com> Message-ID: <20240205213035.3180167-1-thomas@devoogdt.com> - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy since they are not selectable anymore in the meson-build options. BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG option already selects that one. This is now in sync with the meson build options. - Note that the dependencies for the various options are slightly changed, but there is not much mentioned about that, the meson introduction is done in one big commit: [1]. - Added xlib_libXrender dependency, which was already required before meson, it just came to my attention since it's a hard error now. - Added two patches to fix cross compiling, upstream: [2]. [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/596a82f2d185b101bd74645492821fe2f9e0daa0 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 Signed-off-by: Thomas Devoogdt --- v2: added -std=gnu11 (allow inline int declaration in if loop, 99 caused some directives problems) v3: enabled host-zlib, needed for librsvg v4: also added gnu11 for host-cairo compiling (fixes my compilation on a gcc 4.9.2 based system) v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v6: fix host-zlib option (again) v7: reworked patch by moving the old config options to legacy and by restoring their original order --- Config.in.legacy | 35 ++++ ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 +++++++ ...p-IPC_RMID_DEFERRED_RELEASE-check-wh.patch | 41 +++++ package/cairo/Config.in | 28 +-- package/cairo/cairo.mk | 160 +++++------------- package/libgtk2/Config.in | 5 +- package/libgtk3/Config.in | 5 +- package/librsvg/Config.in | 2 +- package/libsvg-cairo/Config.in | 2 +- package/rrdtool/Config.in | 4 +- 10 files changed, 194 insertions(+), 150 deletions(-) create mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch create mode 100644 package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/Config.in.legacy b/Config.in.legacy index 82387338d9..431552afe7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,41 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_CAIRO_SVG + bool "cairo svg support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_PNG + help + Cairo SVG is compiled together with PNG, so no need to have this config. + +config BR2_PACKAGE_CAIRO_SCRIPT + bool "cairo script support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo script got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PS + bool "cairo postscript support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PS got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PDF + bool "cairo pdf support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PDF got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_XML + bool "cairo xml support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo XML got merged in to cairo zlib with the introduction of meson. + config BR2_KERNEL_HEADERS_4_14 bool "kernel headers version 4.14.x are no longer supported" select BR2_LEGACY diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch new file mode 100644 index 0000000000..193a210391 --- /dev/null +++ b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch @@ -0,0 +1,62 @@ +From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +Date: Thu, 25 Feb 2021 10:52:45 +0000 +Subject: [PATCH] meson: allow skipping of run check for + IPC_RMID_DEFERRED_RELEASE + +The run check is particularly annoying in cross-compile scenarios, +so allow bypassing the check by having the user provide the value +via a cross file or native file: + + [properties] + ipc_rmid_deferred_release = true + +Closes #408 + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index b159b4071..5f593e54d 100644 +--- a/meson.build ++++ b/meson.build +@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() + ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], + ] + deps += [x11_dep, xext_dep] +- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), +- dependencies: [x11_dep, xext_dep], +- name: 'shmctl IPC_RMID allowes subsequent attaches') + +- if res.returncode() == 0 +- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) ++ # Can skip the run check by providing the result in a cross file or ++ # native file as bool property value. ++ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ # We don't know the type of prop (bool, string) but need to differentiate ++ # between a set value (bool) or the fallback value (string), so convert to ++ # a string and chec the string value. ++ prop_str = '@0@'.format(prop) ++ if prop_str in ['true', 'false'] ++ ipc_rmid_deferred_release = (prop_str == 'true') ++ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) ++ elif prop_str == 'auto' ++ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), ++ dependencies: [x11_dep, xext_dep], ++ name: 'shmctl IPC_RMID allowes subsequent attaches') ++ ++ ipc_rmid_deferred_release = (res.returncode() == 0) ++ else ++ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) + endif ++ ++ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) + endif + + if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 +-- +2.34.1 + diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch new file mode 100644 index 0000000000..b57379fced --- /dev/null +++ b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch @@ -0,0 +1,41 @@ +From d628c24e757e35e53e6e19fea5f23c93611c9cda Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 5 Feb 2024 17:47:07 +0100 +Subject: [PATCH] meson: always skip IPC_RMID_DEFERRED_RELEASE check when cross + compiling + +../../br-test-pkg/bootlin-armv5-uclibc/build/cairo-1.17.4/meson.build:279:13: +ERROR: Can not run test applications in this cross environment. + +Commit 1bec56ea8a931e1ae1c74cc740134497ec365267 added support to define +ipc_rmid_deferred_release in a cross-compile config, but still kept +the default to auto, which anyhow results in an error when cross-compiling. + +Fix that by always assuming 'true', the compilation might fail if IPC_RMID, +is not defined, but that is perhaps desirable. + +See https://www.man7.org/linux/man-pages/man2/shmctl.2.html for more info +about the call defined in meson-cc-tests/ipc_rmid_deferred_release.c + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9100152ee..1de0fac0d 100644 +--- a/meson.build ++++ b/meson.build +@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found() + + # Can skip the run check by providing the result in a cross file or + # native file as bool property value. +- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'true' : 'auto') + # We don't know the type of prop (bool, string) but need to differentiate + # between a set value (bool) or the fallback value (string), so convert to + # a string and check the string value. +-- +2.34.1 + diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 0c87a2904b..c41a12fe81 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_CAIRO select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7 help Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include @@ -15,34 +16,15 @@ config BR2_PACKAGE_CAIRO if BR2_PACKAGE_CAIRO -config BR2_PACKAGE_CAIRO_PS - bool "postscript support" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_CAIRO_PDF - -config BR2_PACKAGE_CAIRO_PDF - bool "pdf support" - select BR2_PACKAGE_ZLIB - config BR2_PACKAGE_CAIRO_PNG - bool "png support" + bool "png support (png and svg surfaces)" select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_ZLIB - -config BR2_PACKAGE_CAIRO_SCRIPT - bool "script support" - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_CAIRO_SVG - bool "svg support" - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PDF config BR2_PACKAGE_CAIRO_TEE bool "tee support" -config BR2_PACKAGE_CAIRO_XML - bool "xml support" - select BR2_PACKAGE_CAIRO_PNG +config BR2_PACKAGE_CAIRO_ZLIB + bool "zlib support (script, ps, pdf, and xml surfaces)" + select BR2_PACKAGE_ZLIB endif diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 4515b76075..3d2a67a6c5 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -17,168 +17,96 @@ CAIRO_IGNORE_CVES += CVE-2019-6462 # 0002-Fix-mask-usage-in-image-compositor.patch CAIRO_IGNORE_CVES += CVE-2020-35492 -CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" +CAIRO_CFLAGS = $(TARGET_CFLAGS) +CAIRO_LDFLAGS = $(TARGET_LDFLAGS) # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) -CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" +CAIRO_CFLAGS += -mxgot endif # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CAIRO_LIBS += -latomic +CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no - -CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman + -Dfontconfig=enabled \ + -Dtests=disabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 +CAIRO_DEPENDENCIES = \ + host-pkgconf \ + fontconfig \ + pixman # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no \ - --disable-directfb \ - --enable-ft \ - --enable-gobject \ - --disable-glesv2 \ - --disable-vg \ - --disable-xlib \ - --disable-xcb \ - --without-x \ - --disable-xlib-xrender \ - --disable-ps \ - --disable-pdf \ - --enable-png \ - --enable-script \ - --disable-svg \ - --disable-tee \ - --disable-xml + -Dfontconfig=enabled \ + -Dfreetype=enabled \ + -Dpng=enabled \ + -Dtee=disabled \ + -Dxcb=disabled \ + -Dxlib=disabled \ + -Dzlib=enabled \ + -Dtests=disabled \ + -Dglib=enabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ host-fontconfig \ host-libglib2 \ host-libpng \ host-pixman \ - host-pkgconf + host-pkgconf \ + host-zlib -# DirectFB svg support rely on Cairo and Cairo DirectFB support depends on -# DirectFB. Break circular dependency by disabling DirectFB support in Cairo -# (which is experimental) -ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx) -CAIRO_CONF_OPTS += --enable-directfb -CAIRO_DEPENDENCIES += directfb -else -CAIRO_CONF_OPTS += --disable-directfb +ifeq ($(BR2_PACKAGE_LZO),y) +CAIRO_DEPENDENCIES += lzo endif ifeq ($(BR2_PACKAGE_FREETYPE),y) -CAIRO_CONF_OPTS += --enable-ft +CAIRO_CONF_OPTS += -Dfreetype=enabled CAIRO_DEPENDENCIES += freetype else -CAIRO_CONF_OPTS += --disable-ft -endif - -ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) -CAIRO_DEPENDENCIES += libexecinfo -CAIRO_LIBS += -lexecinfo +CAIRO_CONF_OPTS += -Dfreetype=disabled endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -CAIRO_CONF_OPTS += --enable-gobject +CAIRO_CONF_OPTS += -Dglib=enabled CAIRO_DEPENDENCIES += libglib2 else -CAIRO_CONF_OPTS += --disable-gobject -endif - -# Can use GL or GLESv2 but not both -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -CAIRO_CONF_OPTS += --enable-gl --disable-glesv2 -CAIRO_DEPENDENCIES += libgl -else -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -CAIRO_CONF_OPTS += --disable-gl --enable-glesv2 -CAIRO_DEPENDENCIES += libgles -else -CAIRO_CONF_OPTS += --disable-gl --disable-glesv2 -endif -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -CAIRO_CONF_OPTS += --enable-vg -CAIRO_DEPENDENCIES += libopenvg -else -CAIRO_CONF_OPTS += --disable-vg -endif - -ifeq ($(BR2_PACKAGE_LZO),y) -CAIRO_DEPENDENCIES += lzo +CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x -CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext -else -CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -CAIRO_CONF_OPTS += --enable-xlib-xrender -CAIRO_DEPENDENCIES += xlib_libXrender -else -CAIRO_CONF_OPTS += --disable-xlib-xrender -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PS),y) -CAIRO_CONF_OPTS += --enable-ps -CAIRO_DEPENDENCIES += zlib +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += --disable-ps -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PDF),y) -CAIRO_CONF_OPTS += --enable-pdf -CAIRO_DEPENDENCIES += zlib -else -CAIRO_CONF_OPTS += --disable-pdf +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -CAIRO_CONF_OPTS += --enable-png +CAIRO_CONF_OPTS += -Dpng=enabled CAIRO_DEPENDENCIES += libpng else -CAIRO_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y) -CAIRO_CONF_OPTS += --enable-script -else -CAIRO_CONF_OPTS += --disable-script -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SVG),y) -CAIRO_CONF_OPTS += --enable-svg -else -CAIRO_CONF_OPTS += --disable-svg +CAIRO_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_TEE),y) -CAIRO_CONF_OPTS += --enable-tee +CAIRO_CONF_OPTS += -Dtee=enabled else -CAIRO_CONF_OPTS += --disable-tee +CAIRO_CONF_OPTS += -Dtee=disabled endif -ifeq ($(BR2_PACKAGE_CAIRO_XML),y) -CAIRO_CONF_OPTS += --enable-xml +ifeq ($(BR2_PACKAGE_CAIRO_ZLIB),y) +CAIRO_CONF_OPTS += -Dzlib=enabled +CAIRO_DEPENDENCIES += zlib else -CAIRO_CONF_OPTS += --disable-xml +CAIRO_CONF_OPTS += -Dzlib=disabled endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index f2888b2f51..f8821ba246 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -9,9 +9,8 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO select BR2_PACKAGE_GDK_PIXBUF diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 34b8d49eb3..9f9a081ecb 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -25,9 +25,8 @@ config BR2_PACKAGE_LIBGTK3 BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 270b524b37..d74359dfc9 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_SCRIPT + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_HOST_RUSTC select BR2_PACKAGE_LIBGLIB2 diff --git a/package/libsvg-cairo/Config.in b/package/libsvg-cairo/Config.in index 9577c69bf0..4602e93c2a 100644 --- a/package/libsvg-cairo/Config.in +++ b/package/libsvg-cairo/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBSVG_CAIRO bool "libsvg-cairo" select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBSVG help Libsvg-cairo provides the ability to render SVG content from diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in index 5ffdc92618..d954fd1214 100644 --- a/package/rrdtool/Config.in +++ b/package/rrdtool/Config.in @@ -19,10 +19,8 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PDF select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_PANGO help This enables the graphing capabilities ('rrdgraph'). -- 2.34.1 From thomas at devoogdt.com Mon Feb 5 21:30:35 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 5 Feb 2024 22:30:35 +0100 Subject: [Buildroot] [PATCH v8 2/2] package/cairo: bump to 1.18.0 In-Reply-To: <20240205213035.3180167-1-thomas@devoogdt.com> References: <20240205212300.3178519-2-thomas@devoogdt.com> <20240205213035.3180167-1-thomas@devoogdt.com> Message-ID: <20240205213035.3180167-2-thomas@devoogdt.com> News: - https://www.cairographics.org/news/cairo-1.17.8/ - https://www.cairographics.org/news/cairo-1.18.0/ Some options are renamed/dropped so fix that along. - GL and GLES drawing has been dropped in 1.17.8. - The XML surface has been removed in 1.18.0. - xlib-xcb was added [1] Patches: - drop 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch, upstream: [2] - drop 0002-Fix-mask-usage-in-image-compositor.patch, upstream: [3] - drop 0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch, upstream: [4] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/3468c67fe91f0c37e0ec5d335082653a6fa609b6 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be [4]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 Signed-off-by: Thomas Devoogdt --- v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v7: rebased on v7-0001-package-cairo-move-to-the-meson-build-system v8: forgot .checkpackageignore --- .checkpackageignore | 2 - ...or_tolerance_normalized-fix-infinite.patch | 39 ------------ ...rivate.h-fix-missing-FT_Color-error.patch} | 0 ...2-Fix-mask-usage-in-image-compositor.patch | 56 ----------------- ...-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} | 0 ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 ------------------- package/cairo/cairo.hash | 6 +- package/cairo/cairo.mk | 21 ++++--- 8 files changed, 14 insertions(+), 172 deletions(-) delete mode 100644 package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch rename package/cairo/{0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch => 0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch} (100%) delete mode 100644 package/cairo/0002-Fix-mask-usage-in-image-compositor.patch rename package/cairo/{0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch => 0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} (100%) delete mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch diff --git a/.checkpackageignore b/.checkpackageignore index 348cf3d289..86a774139a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -227,8 +227,6 @@ package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch Upstrea package/c-icap/S96cicap Indent Shellcheck Variables package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch Upstream package/cache-calibrator/0001-Fix-conflicting-round-function.patch Upstream -package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream -package/cairo/0002-Fix-mask-usage-in-image-compositor.patch Upstream package/caps/0001-Fix-stdint-types-with-musl.patch Upstream package/cdrkit/0001-no-rcmd.patch Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch Upstream diff --git a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch deleted file mode 100644 index 078e90fa42..0000000000 --- a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Sun, 1 Aug 2021 11:16:03 +0000 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - -[Retrieved from: -https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] -Signed-off-by: Quentin Schulz ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -2.38.1 - diff --git a/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch b/package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch similarity index 100% rename from package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch rename to package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch diff --git a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch deleted file mode 100644 index 54a95593c5..0000000000 --- a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - -[Retrieved from -https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be] -[Removed changes in test/ directory to remove binary diff so that the -patch can be applied by `patch` tool] -Signed-off-by: Quentin Schulz ---- - src/cairo-image-compositor.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index bbf4cf228..2352c478e 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - unsigned num_spans) - { - cairo_image_span_renderer_t *r = abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); - int x0; - - if (num_spans == 0) - return CAIRO_STATUS_SUCCESS; - - x0 = spans[0].x; -- m = r->_buf; -+ m = base; - do { - int len = spans[1].x - spans[0].x; - if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { -@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - spans[0].x, y, - spans[1].x - spans[0].x, h); - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else if (spans[0].coverage == 0x0) { - if (spans[0].x != x0) { -@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - #endif - } - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else { - *m++ = spans[0].coverage; --- -2.38.1 - diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch similarity index 100% rename from package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch rename to package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch deleted file mode 100644 index 193a210391..0000000000 --- a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Thu, 25 Feb 2021 10:52:45 +0000 -Subject: [PATCH] meson: allow skipping of run check for - IPC_RMID_DEFERRED_RELEASE - -The run check is particularly annoying in cross-compile scenarios, -so allow bypassing the check by having the user provide the value -via a cross file or native file: - - [properties] - ipc_rmid_deferred_release = true - -Closes #408 - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index b159b4071..5f593e54d 100644 ---- a/meson.build -+++ b/meson.build -@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() - ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], - ] - deps += [x11_dep, xext_dep] -- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -- dependencies: [x11_dep, xext_dep], -- name: 'shmctl IPC_RMID allowes subsequent attaches') - -- if res.returncode() == 0 -- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) -+ # Can skip the run check by providing the result in a cross file or -+ # native file as bool property value. -+ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') -+ # We don't know the type of prop (bool, string) but need to differentiate -+ # between a set value (bool) or the fallback value (string), so convert to -+ # a string and chec the string value. -+ prop_str = '@0@'.format(prop) -+ if prop_str in ['true', 'false'] -+ ipc_rmid_deferred_release = (prop_str == 'true') -+ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) -+ elif prop_str == 'auto' -+ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -+ dependencies: [x11_dep, xext_dep], -+ name: 'shmctl IPC_RMID allowes subsequent attaches') -+ -+ ipc_rmid_deferred_release = (res.returncode() == 0) -+ else -+ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) - endif -+ -+ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) - endif - - if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 --- -2.34.1 - diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index fca9ff678c..df9c693bad 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,7 +1,5 @@ -# From https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz.sha1 -sha1 68712ae1039b114347be3b7200bc1c901d47a636 cairo-1.17.4.tar.xz -# Calculated based on the hash above -sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 cairo-1.17.4.tar.xz +# From https://www.cairographics.org/releases/cairo-1.18.0.tar.xz.sha256sum +sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 cairo-1.18.0.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 3d2a67a6c5..4ace04ebbe 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,19 +4,14 @@ # ################################################################################ -CAIRO_VERSION = 1.17.4 +CAIRO_VERSION = 1.18.0 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics -CAIRO_SITE = http://cairographics.org/snapshots +CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES -# 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch -CAIRO_IGNORE_CVES += CVE-2019-6462 -# 0002-Fix-mask-usage-in-image-compositor.patch -CAIRO_IGNORE_CVES += CVE-2020-35492 - CAIRO_CFLAGS = $(TARGET_CFLAGS) CAIRO_LDFLAGS = $(TARGET_LDFLAGS) @@ -32,9 +27,13 @@ CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ + -Dquartz=disabled \ -Dtests=disabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 CAIRO_DEPENDENCIES = \ host-pkgconf \ @@ -43,9 +42,11 @@ CAIRO_DEPENDENCIES = \ # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ -Dfreetype=enabled \ -Dpng=enabled \ + -Dquartz=disabled \ -Dtee=disabled \ -Dxcb=disabled \ -Dxlib=disabled \ @@ -53,6 +54,8 @@ HOST_CAIRO_CONF_OPTS = \ -Dtests=disabled \ -Dglib=enabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ @@ -82,10 +85,10 @@ CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled -Dxlib-xcb=enabled CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled -Dxlib-xcb=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 5 21:31:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:31:12 +0100 Subject: [Buildroot] [git commit] package/brltty: disable emacs and lua bindings Message-ID: <20240205213122.DD12D86E01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19f06441e8b616159d45a552beac6e1fe05bc42a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable lua bindings to avoid the following build failure if host-lua and lua are built before brltty raised since bump to version 6.5 in commit 82c6e87d5eaaf5b32aa340ab384f88539238cbe1 and https://github.com/brltty/brltty/commit/42bf48ca010d9163652cb0a014662fa243132736: configure: lua package: lua configure: lua includes: configure: lua libs: -L/home/autobuild/autobuild/instance-0/output-1/host/bin/../sparc64-buildroot-linux-gnu/sysroot/usr/lib -llua -lm -ldl checking for lua5.4... no checking for lua... /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua shell: /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua library directory: /home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 [...] /usr/bin/install -c -d /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 /usr/bin/install -c -s --strip-program /bin/true brlapi.so /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/brltty-6.6/Bindings/Lua' [...] brltty: installs files in /home/autobuild/autobuild/instance-0/output-1/target//home/autobuild/autobuild/instance-0/output-1 While at it, disable emacs bindings which have also been added in version 6.5 with https://github.com/brltty/brltty/commit/64a487e29941df54796645229a872ecbe2a06bfe Fixes: - http://autobuild.buildroot.org/results/f424e6727bbe61ea4b7703e93aae6fcab7506898 - http://autobuild.buildroot.org/results/bf4a161fc66fb99a24f08bea3436b13738f2e383 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/brltty/brltty.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index f00a18cc6f..22d58ebd00 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -23,8 +23,10 @@ BRLTTY_CONF_ENV = \ PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf BRLTTY_CONF_OPTS = \ + --disable-emacs-bindings \ --disable-java-bindings \ --disable-lisp-bindings \ + --disable-lua-bindings \ --disable-ocaml-bindings \ --disable-python-bindings \ --disable-tcl-bindings \ From thomas.petazzoni at bootlin.com Mon Feb 5 21:31:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:31:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/brltty: disable emacs and lua bindings In-Reply-To: <20240126172920.1628617-1-fontaine.fabrice@gmail.com> References: <20240126172920.1628617-1-fontaine.fabrice@gmail.com> Message-ID: <20240205223122.32116c63@windsurf> On Fri, 26 Jan 2024 18:29:20 +0100 Fabrice Fontaine wrote: > Disable lua bindings to avoid the following build failure if host-lua > and lua are built before brltty raised since bump to version 6.5 in > commit 82c6e87d5eaaf5b32aa340ab384f88539238cbe1 and > https://github.com/brltty/brltty/commit/42bf48ca010d9163652cb0a014662fa243132736: > > configure: lua package: lua > configure: lua includes: > configure: lua libs: -L/home/autobuild/autobuild/instance-0/output-1/host/bin/../sparc64-buildroot-linux-gnu/sysroot/usr/lib -llua -lm -ldl > checking for lua5.4... no > checking for lua... /home/autobuild/autobuild/instance-0/output-1/host/bin/lua > configure: Lua shell: /home/autobuild/autobuild/instance-0/output-1/host/bin/lua > configure: Lua library directory: /home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > > [...] > > /usr/bin/install -c -d /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > /usr/bin/install -c -s --strip-program /bin/true brlapi.so /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/brltty-6.6/Bindings/Lua' > > [...] > > brltty: installs files in /home/autobuild/autobuild/instance-0/output-1/target//home/autobuild/autobuild/instance-0/output-1 > > While at it, disable emacs bindings which have also been added in > version 6.5 with > https://github.com/brltty/brltty/commit/64a487e29941df54796645229a872ecbe2a06bfe > > Fixes: > - http://autobuild.buildroot.org/results/f424e6727bbe61ea4b7703e93aae6fcab7506898 > - http://autobuild.buildroot.org/results/bf4a161fc66fb99a24f08bea3436b13738f2e383 > > Signed-off-by: Fabrice Fontaine > --- > package/brltty/brltty.mk | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:32:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:32:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/libzlib: bump to version 1.3.1 In-Reply-To: <20240126221237.1780047-1-fontaine.fabrice@gmail.com> References: <20240126221237.1780047-1-fontaine.fabrice@gmail.com> Message-ID: <20240205223231.7c6f5f5a@windsurf> On Fri, 26 Jan 2024 23:12:37 +0100 Fabrice Fontaine wrote: > https://github.com/madler/zlib/releases/tag/v1.3.1 > > Signed-off-by: Fabrice Fontaine > --- > package/libzlib/libzlib.hash | 2 +- > package/libzlib/libzlib.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:32:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:32:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/minizip-zlib: bump to version 1.3.1 In-Reply-To: <20240126221323.1780561-1-fontaine.fabrice@gmail.com> References: <20240126221323.1780561-1-fontaine.fabrice@gmail.com> Message-ID: <20240205223237.6bed1124@windsurf> On Fri, 26 Jan 2024 23:13:23 +0100 Fabrice Fontaine wrote: > Drop patch (already in version) > > https://github.com/madler/zlib/releases/tag/v1.3.1 > > Signed-off-by: Fabrice Fontaine > --- > ...lows-of-zip-header-fields-in-minizip.patch | 39 ------------------- > package/minizip-zlib/minizip-zlib.hash | 2 +- > package/minizip-zlib/minizip-zlib.mk | 4 +- > 3 files changed, 2 insertions(+), 43 deletions(-) > delete mode 100644 package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:31:55 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:31:55 +0100 Subject: [Buildroot] [git commit] package/libzlib: bump to version 1.3.1 Message-ID: <20240205213240.7A11286E0C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=467eb0c337cac8447181c5a126032976a26c13f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/madler/zlib/releases/tag/v1.3.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libzlib/libzlib.hash | 2 +- package/libzlib/libzlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash index 23bfda8474..cbd9313870 100644 --- a/package/libzlib/libzlib.hash +++ b/package/libzlib/libzlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7 zlib-1.3.tar.xz +sha256 38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32 zlib-1.3.1.tar.xz # License files, locally calculated sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index e0a4e454e1..bc5092d9a9 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZLIB_VERSION = 1.3 +LIBZLIB_VERSION = 1.3.1 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz LIBZLIB_SITE = https://www.zlib.net LIBZLIB_LICENSE = Zlib From thomas.petazzoni at bootlin.com Mon Feb 5 21:32:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:32:05 +0100 Subject: [Buildroot] [git commit] package/minizip-zlib: bump to version 1.3.1 Message-ID: <20240205213240.855CE86E0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc125743d4e984ac4d0b1c07bafc99d075fc9686 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/madler/zlib/releases/tag/v1.3.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...overflows-of-zip-header-fields-in-minizip.patch | 39 ---------------------- package/minizip-zlib/minizip-zlib.hash | 2 +- package/minizip-zlib/minizip-zlib.mk | 4 +-- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch b/package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch deleted file mode 100644 index f4eacc7fdc..0000000000 --- a/package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 73331a6a0481067628f065ffe87bb1d8f787d10c Mon Sep 17 00:00:00 2001 -From: Hans Wennborg -Date: Fri, 18 Aug 2023 11:05:33 +0200 -Subject: [PATCH] Reject overflows of zip header fields in minizip. - -This checks the lengths of the file name, extra field, and comment -that would be put in the zip headers, and rejects them if they are -too long. They are each limited to 65535 bytes in length by the zip -format. This also avoids possible buffer overflows if the provided -fields are too long. - -Upstream: https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c -Signed-off-by: Fabrice Fontaine ---- - contrib/minizip/zip.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c -index 3d3d4cadd..0446109b2 100644 ---- a/contrib/minizip/zip.c -+++ b/contrib/minizip/zip.c -@@ -1043,6 +1043,17 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c - return ZIP_PARAMERROR; - #endif - -+ // The filename and comment length must fit in 16 bits. -+ if ((filename!=NULL) && (strlen(filename)>0xffff)) -+ return ZIP_PARAMERROR; -+ if ((comment!=NULL) && (strlen(comment)>0xffff)) -+ return ZIP_PARAMERROR; -+ // The extra field length must fit in 16 bits. If the member also requires -+ // a Zip64 extra block, that will also need to fit within that 16-bit -+ // length, but that will be checked for later. -+ if ((size_extrafield_local>0xffff) || (size_extrafield_global>0xffff)) -+ return ZIP_PARAMERROR; -+ - zi = (zip64_internal*)file; - - if (zi->in_opened_file_inzip == 1) diff --git a/package/minizip-zlib/minizip-zlib.hash b/package/minizip-zlib/minizip-zlib.hash index 23bfda8474..cbd9313870 100644 --- a/package/minizip-zlib/minizip-zlib.hash +++ b/package/minizip-zlib/minizip-zlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7 zlib-1.3.tar.xz +sha256 38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32 zlib-1.3.1.tar.xz # License files, locally calculated sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE diff --git a/package/minizip-zlib/minizip-zlib.mk b/package/minizip-zlib/minizip-zlib.mk index 81fee3c687..6d4a2d2e20 100644 --- a/package/minizip-zlib/minizip-zlib.mk +++ b/package/minizip-zlib/minizip-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIZIP_ZLIB_VERSION = 1.3 +MINIZIP_ZLIB_VERSION = 1.3.1 MINIZIP_ZLIB_SOURCE = zlib-$(MINIZIP_ZLIB_VERSION).tar.xz MINIZIP_ZLIB_SITE = http://www.zlib.net MINIZIP_ZLIB_LICENSE = Zlib @@ -16,7 +16,5 @@ MINIZIP_ZLIB_AUTORECONF = YES MINIZIP_ZLIB_DEPENDENCIES = zlib # demos must be disabled to avoid a conflict with BR2_PACKAGE_MINIZIP_DEMOS MINIZIP_ZLIB_CONF_OPTS = --disable-demos -# 0001-Reject-overflows-of-zip-header-fields-in-minizip.patch -MINIZIP_ZLIB_IGNORE_CVES += CVE-2023-45853 $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 5 21:36:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:36:42 +0100 Subject: [Buildroot] [git commit] support/testing: add cryptsetup runtime test Message-ID: <20240205213718.F24DD86E17@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1dd39dcf12d97637c4b343d49fcddae2ba29774b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_cryptsetup.py | 137 +++++++++++++++++++++ .../test_cryptsetup/linux-cryptsetup.fragment | 5 + 3 files changed, 144 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 31496cbcc6..f8737621b3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1764,6 +1764,8 @@ F: support/testing/tests/package/test_brotli.py F: support/testing/tests/package/test_bzip2.py F: support/testing/tests/package/test_compressor_base.py F: support/testing/tests/package/test_coremark.py +F: support/testing/tests/package/test_cryptsetup.py +F: support/testing/tests/package/test_cryptsetup/ F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py diff --git a/support/testing/tests/package/test_cryptsetup.py b/support/testing/tests/package/test_cryptsetup.py new file mode 100644 index 0000000000..759dfd7c5f --- /dev/null +++ b/support/testing/tests/package/test_cryptsetup.py @@ -0,0 +1,137 @@ +import os +import subprocess + +import infra.basetest + + +class TestCryptSetup(infra.basetest.BRTest): + # A specific configuration is needed for using cryptsetup: + # - A kernel config fragment enables all the parts needed for + # mounting a LUKS2 volume, + # - Enable OpenSSL for cryptsetup crypto backend library, + # - Enable e2fsprog for formatting a ext4 filesystem. + kern_frag = \ + infra.filepath("tests/package/test_cryptsetup/linux-cryptsetup.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.75" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_CRYPTSETUP=y + BR2_PACKAGE_E2FSPROGS=y + BR2_PACKAGE_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + disk_file = os.path.join(self.builddir, "images", "disk.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}") + subprocess.check_call( + ["dd", "if=/dev/urandom", f"of={disk_file}", "bs=1M", "count=20"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + + bootargs = ["console=ttyAMA0"] + qemu_opts = ["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img, + "-drive", f"file={disk_file},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("cryptsetup --version") + + passkey = "ThisIsAPassKey." + dev = "/dev/vda" + dm_name = "luks-vol" + dm_dev = f"/dev/mapper/{dm_name}" + mnt_pt = "/mnt/secure-volume" + + # Check the device is NOT detected as a LUKS volume, because + # it is not formatted yet. + is_luks_cmd = f"cryptsetup isLuks {dev}" + _, ret = self.emulator.run(is_luks_cmd) + self.assertNotEqual(ret, 0) + + # Format the LUKS volume. + cmd = f"echo {passkey} | cryptsetup luksFormat {dev}" + self.assertRunOk(cmd, timeout=30) + + # Check the device is now detected as a LUKS device. + self.assertRunOk(is_luks_cmd) + + # Dump LUKS device header information. + self.assertRunOk(f"cryptsetup luksDump {dev}") + + # Open the LUKS device + luks_open_cmd = f"echo {passkey} | " + luks_open_cmd += f"cryptsetup open --type luks {dev} {dm_name}" + self.assertRunOk(luks_open_cmd, timeout=10) + + # Create an ext4 filesystem. + self.assertRunOk(f"mke2fs -T ext4 {dm_dev}", timeout=10) + + # Create the mount point directory. + self.assertRunOk(f"mkdir {mnt_pt}") + + # Mount the LUKS device. + mount_cmd = f"mount {dm_dev} {mnt_pt}" + self.assertRunOk(mount_cmd) + + # Create a plain text file in the mounted filesystem. + msg = "This is a plain text message" + plain_file = f"{mnt_pt}/file.txt" + self.assertRunOk(f"echo '{msg}' > {plain_file}") + + # Unmount. + self.assertRunOk(f"umount {mnt_pt}") + + # We are supposed to see our plain text message on the + # dm-crypt device. + self.assertRunOk(f"grep -Fq '{msg}' {dm_dev}", timeout=10) + + # Close the LUKS device + self.assertRunOk(f"cryptsetup close {dm_name}") + + # We are NOT supposed to find our plain text message on the + # crypted storage device. + _, ret = self.emulator.run(f"grep -Fq '{msg}' {dev}", timeout=10) + self.assertNotEqual(ret, 0) + + # Try to open LUKS volume with a wrong password. This is + # expected to fail. + cmd = f"echo 'Wrong{passkey}' | " + cmd += f"cryptsetup open --type luks {dev} {dm_name}" + _, ret = self.emulator.run(cmd, timeout=10) + self.assertNotEqual(ret, 0) + + # Check the device-mapper device was NOT created (since we + # tried to open it with a wrong password). + self.assertRunOk(f"test ! -e {dm_dev}") + + # Reopen the LUKS device, with the good passkey this time... + self.assertRunOk(luks_open_cmd, timeout=10) + + # ...remount... + self.assertRunOk(mount_cmd) + + # ...and read back our plain text file. We check we get back + # our original message. + out, ret = self.emulator.run(f"cat {plain_file}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) diff --git a/support/testing/tests/package/test_cryptsetup/linux-cryptsetup.fragment b/support/testing/tests/package/test_cryptsetup/linux-cryptsetup.fragment new file mode 100644 index 0000000000..37d5494fc2 --- /dev/null +++ b/support/testing/tests/package/test_cryptsetup/linux-cryptsetup.fragment @@ -0,0 +1,5 @@ +CONFIG_BLK_DEV_DM=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_XTS=y +CONFIG_DM_CRYPT=y +CONFIG_MD=y From thomas.petazzoni at bootlin.com Mon Feb 5 21:37:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:37:18 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add cryptsetup runtime test In-Reply-To: <20240126230520.427817-1-ju.o@free.fr> References: <20240126230520.427817-1-ju.o@free.fr> Message-ID: <20240205223718.5039e114@windsurf> On Sat, 27 Jan 2024 00:05:20 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 2 + > .../testing/tests/package/test_cryptsetup.py | 137 ++++++++++++++++++ > .../test_cryptsetup/linux-cryptsetup.fragment | 5 + > 3 files changed, 144 insertions(+) > create mode 100644 support/testing/tests/package/test_cryptsetup.py > create mode 100644 support/testing/tests/package/test_cryptsetup/linux-cryptsetup.fragment Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:38:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:38:26 +0100 Subject: [Buildroot] [git commit] package/pkg-utils: add missing licensing data to show-info Message-ID: <20240205213900.1615286E1B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5647d5c1900bde13cedd36efd09404ea5763c0fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While the list of licenses is present in the show-info output, the list of license files and the redistributable status were missing. Add them. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/pkg-utils.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 059e86ae0a..723bbe4e24 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -157,6 +157,10 @@ endef define _json-info-pkg-details "version": $(call mk-json-str,$($(1)_DL_VERSION)), "licenses": $(call mk-json-str,$($(1)_LICENSE)), + "license_files": [ + $(foreach f, $($(1)_LICENSE_FILES),$(call mk-json-str,$(f))$(comma)) + ], + "redistributable": $(if $(filter NO,$($(1)_REDISTRIBUTE)),false,true), "dl_dir": $(call mk-json-str,$($(1)_DL_SUBDIR)), "downloads": [ $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), From thomas.petazzoni at bootlin.com Mon Feb 5 21:39:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:39:06 +0100 Subject: [Buildroot] [PATCH] package/pkg-utils: add missing licensing data to show-info In-Reply-To: <20240127163807.233065-1-yann.morin.1998@free.fr> References: <20240127163807.233065-1-yann.morin.1998@free.fr> Message-ID: <20240205223906.39e92f87@windsurf> On Sat, 27 Jan 2024 17:38:07 +0100 "Yann E. MORIN" wrote: > While the list of licenses is present in the show-info output, the list > of license files and the redistributable status were missing. Add them. > > Signed-off-by: Yann E. MORIN > --- > package/pkg-utils.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 21:41:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 22:41:47 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add fping runtime test In-Reply-To: <20240123215454.81191-1-ju.o@free.fr> (Julien Olivain's message of "Tue, 23 Jan 2024 22:54:54 +0100") References: <20240123215454.81191-1-ju.o@free.fr> Message-ID: <87fry6a8ro.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 1 + > support/testing/tests/package/test_fping.py | 45 +++++++++++++++++++++ > 2 files changed, 46 insertions(+) > create mode 100644 support/testing/tests/package/test_fping.py > diff --git a/DEVELOPERS b/DEVELOPERS > index 9528837dd0..fa760cb3ed 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1769,6 +1769,7 @@ F: support/testing/tests/package/test_ddrescue/ > F: support/testing/tests/package/test_dos2unix.py > F: support/testing/tests/package/test_fluidsynth.py > F: support/testing/tests/package/test_fluidsynth/ > +F: support/testing/tests/package/test_fping.py > F: support/testing/tests/package/test_gawk.py > F: support/testing/tests/package/test_glslsandbox_player.py > F: support/testing/tests/package/test_glslsandbox_player/ > diff --git a/support/testing/tests/package/test_fping.py b/support/testing/tests/package/test_fping.py > new file mode 100644 > index 0000000000..58a1c92c0b > --- /dev/null > +++ b/support/testing/tests/package/test_fping.py > @@ -0,0 +1,45 @@ > +import os > +import time > + > +import infra.basetest > + > + > +class TestFping(infra.basetest.BRTest): > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + """ > + BR2_PACKAGE_FPING=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]) > + self.emulator.login() > + > + # Check the program can execute. > + self.assertRunOk("fping --version") > + > + # Fping v5.1 need to wait few seconds after a kernel booted > + # before starting. This sleep time can be removed when the > + # issue will be closed and the package updated. See: > + # https://github.com/schweikert/fping/issues/288 > + time.sleep(5) That's annoying, but indeed not much we can do about it. From the looks of it, the fping code initializes the timestamp to zero (using calloc) and then complains when (the delta from) CLOCK_REALTIME is less than 10s. The only thing we could do better is to take timeout_multiplier into consideration, so I multiplied with that and applied, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 21:42:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 22:42:11 +0100 Subject: [Buildroot] [git commit] support/testing: add fping runtime test Message-ID: <20240205214224.4D3B786E2C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc2ff8a38e72487f3fd6c7a2700ca664f7828545 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain [Peter: scale delay with timout_multiplier] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_fping.py | 45 +++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f8737621b3..187c8eeca7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1771,6 +1771,7 @@ F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py F: support/testing/tests/package/test_fluidsynth.py F: support/testing/tests/package/test_fluidsynth/ +F: support/testing/tests/package/test_fping.py F: support/testing/tests/package/test_gawk.py F: support/testing/tests/package/test_glslsandbox_player.py F: support/testing/tests/package/test_glslsandbox_player/ diff --git a/support/testing/tests/package/test_fping.py b/support/testing/tests/package/test_fping.py new file mode 100644 index 0000000000..507c4ce73b --- /dev/null +++ b/support/testing/tests/package/test_fping.py @@ -0,0 +1,45 @@ +import os +import time + +import infra.basetest + + +class TestFping(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_FPING=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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("fping --version") + + # Fping v5.1 need to wait few seconds after a kernel booted + # before starting. This sleep time can be removed when the + # issue will be closed and the package updated. See: + # https://github.com/schweikert/fping/issues/288 + time.sleep(5 * self.timeout_multiplier) + + # Run 3 pings on localhost. + self.assertRunOk("fping -e -c 3 localhost") + + # Run pings on a local subnet and print statistics. + self.assertRunOk("fping -s -g 127.0.0.0/28") + + # Test an IPv6 ping. + self.assertRunOk("fping -6 ::1") + + # Create a prohibited route to make fping fail. + self.assertRunOk("ip route add to prohibit 192.168.12.0/24") + + # We expect fping to fail when pinging the prohibited network. + _, ret = self.emulator.run("fping 192.168.12.34") + self.assertNotEqual(ret, 0) From thomas.petazzoni at bootlin.com Mon Feb 5 21:45:47 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:45:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2_mixer: force arm mode instead of Thumb mode In-Reply-To: <20240109214953.724112-1-fontaine.fabrice@gmail.com> References: <20240109214953.724112-1-fontaine.fabrice@gmail.com> Message-ID: <20240205224547.5435732c@windsurf> Hello Fabrice, On Tue, 9 Jan 2024 22:49:53 +0100 Fabrice Fontaine wrote: > +# sdl2_mixer has some assembly function that is not present in Thumb mode: > +# Error: selected processor does not support `clz r2,r3' in Thumb mode > +# so, we desactivate Thumb mode > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > +SDL2_MIXER_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" > +endif Thanks a lot for working on this! However, I think this is not the best fix. Indeed, instead we should patch the sdl2_mixer code so that it only uses the optimized ARM implementation when it makes sense. The code goes like this: #if defined(__GNUC__) || defined(__clang__) #if defined(DRFLAC_X64) /* OPTIMIZED x86-64 code here */ #elif defined(DRFLAC_X86) /* OPTIMIZED i386 code here */ /* This condition is the one that should be changed to exclude using this code on Thumb */ #elif defined(DRFLAC_ARM) && (defined(__ARM_ARCH) && __ARM_ARCH >= 5) && !defined(DRFLAC_64BIT) /* <-- I haven't tested 64-bit inline assembly, so only enabling this for the 32-bit build for now. */ { unsigned int r; __asm__ __volatile__ ( #if defined(DRFLAC_64BIT) "clz %w[out], %w[in]" : [out]"=r"(r) : [in]"r"(x) /* <-- This is untested. If someone in the community could test this, that would be appreciated! */ #else "clz %[out], %[in]" : [out]"=r"(r) : [in]"r"(x) #endif ); return r; } #else /* And so we will fallback here, the "unoptimized" implementation */ if (x == 0) { return sizeof(x)*8; } #ifdef DRFLAC_64BIT return (drflac_uint32)__builtin_clzll((drflac_uint64)x); #else return (drflac_uint32)__builtin_clzl((drflac_uint32)x); #endif #endif You can use some gcc internal macro to detect if we're building for Thumb or not. Could you have a look in this direction? Thanks a lot in advance! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From ju.o at free.fr Mon Feb 5 21:48:37 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 5 Feb 2024 22:48:37 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: netcat: improve test robustness Message-ID: <20240205214837.3497535-1-ju.o@free.fr> Under some conditions (mostly slow execution due to test host load), the netcat runtime test can randomly fail. This is due to several facts: - the sleep time between the server and client is too short, - the use of netcat option -c could close the connection before the server could receive all the data. This commit improves the test robustness by increasing the sleep time, and by reducing the amount of transferred data (from 1MB of random data, to a simpler string of few bytes). Also, to make sure netcat cannot wait on DNS resolution, this commit also adds the -n option. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854664 Signed-off-by: Julien Olivain --- support/testing/tests/package/test_netcat.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/support/testing/tests/package/test_netcat.py b/support/testing/tests/package/test_netcat.py index b3efa4c40b..88d58a72f3 100644 --- a/support/testing/tests/package/test_netcat.py +++ b/support/testing/tests/package/test_netcat.py @@ -22,20 +22,19 @@ class TestNetCat(infra.basetest.BRTest): self.assertRunOk("nc --version") - in_file = "input.bin" - out_file = "output.bin" + msg = "Hello Buildroot!" + out_file = "output.txt" port = 12345 - cmd = f"dd if=/dev/urandom of={in_file} bs=1k count=1k" + cmd = f"nc -n -l -p {port} > {out_file} 2> /dev/null &" self.assertRunOk(cmd) - cmd = f"nc -l -p {port} > {out_file} &" - self.assertRunOk(cmd) - - time.sleep(1) + time.sleep(5) - cmd = f"cat {in_file} | nc -c 127.0.0.1 {port}" + cmd = f"echo '{msg}' | nc -n -c 127.0.0.1 {port}" self.assertRunOk(cmd) - cmd = f"cmp {in_file} {out_file}" - self.assertRunOk(cmd) + cmd = f"cat {out_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) -- 2.43.0 From ju.o at free.fr Mon Feb 5 21:51:45 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 05 Feb 2024 22:51:45 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add netcat runtime test In-Reply-To: References: <20240113201532.121274-1-ju.o@free.fr> Message-ID: <219e4983def7472087fdaae868a9ee59@free.fr> Hi Romain, All, On 05/02/2024 18:49, Romain NAOUR wrote: > Hello Julien, All, > > On Sun, Jan 21, 2024 at 11:20?AM Yann E. MORIN > wrote: >> >> Julien, All, >> >> On 2024-01-13 21:15 +0100, Julien Olivain spake thusly: >> > Signed-off-by: Julien Olivain >> >> Applied to master, thanks. > > It seems this test is failing in gitlab-ci for some reason: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854664 > > can you have a look? I was able to reproduce the issue with a very slow execution. I proposed a fix in: https://patchwork.ozlabs.org/project/buildroot/patch/20240205214837.3497535-1-ju.o at free.fr/ > > Best regards, > Romain Best regards, Julien. From yann.morin.1998 at free.fr Mon Feb 5 21:52:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 22:52:34 +0100 Subject: [Buildroot] [git commit] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT Message-ID: <20240205215302.D05ED86E2B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61295f5ced0749db34095bfbe8b34ed86a692828 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as LIBCURL_CPE_ID_PRODUCT will be set to the package name (i.e. libcurl) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant --- package/libcurl/libcurl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 3ecc587a52..83845b8e87 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') From yann.morin.1998 at free.fr Mon Feb 5 21:52:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 22:52:33 +0100 Subject: [Buildroot] [git commit] package/containerd: drop CONTAINERD_CPE_ID_VENDOR Message-ID: <20240205215302.C1ED386E3C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ed73df9ee774e007432fbf9b6c19b22233f2bfd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 35af2bb8011ea57642777acf5613afa244d325d7 set CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as CONTAINERD_CPE_ID_PRODUCT will be set to the package name (i.e. containerd) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant --- package/containerd/containerd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 61a8472ddd..d3ca102797 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd From thomas.petazzoni at bootlin.com Mon Feb 5 21:54:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:54:10 +0100 Subject: [Buildroot] [PATCH 1/1] board/visionfive2: enable u-boot In-Reply-To: <20240129211248.541383-1-tekieli.lukasz@gmail.com> References: <20240129211248.541383-1-tekieli.lukasz@gmail.com> Message-ID: <20240205225410.0f1c7e14@windsurf> Hello Lukasz, Thanks for the contribution! I have some comments below. On Mon, 29 Jan 2024 22:12:48 +0100 Lukasz Tekieli wrote: > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg" I think this should technically go into a separate commit, it looks like a "bug" in the original visionfive2_defconfig. Of course, today it doesn't cause any harm because the genimage.cfg files for visionfive and visionfive2 are the same, but this modification really isn't related to enabling U-Boot. > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,05533e9c31d6f0da20efc2d436a3b0f6d516ed4b)/linux-05533e9c31d6f0da20efc2d436a3b0f6d516ed4b.tar.gz" > @@ -15,4 +15,18 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_OPENSBI=y You need to set an explicit version for OpenSBI. Indeed, we want our defconfigs to use a fixed version of bootloader/firmware/Linux kernel code. > +BR2_TARGET_OPENSBI_PLAT="generic" > +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set > +BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES="FW_TEXT_START=0x40000000 FW_OPTIONS=0" > +BR2_TARGET_UBOOT=y Same comment for U-Boot: it should use a fixed version. Could you look into these small improvements, and send an updated version? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 21:54:45 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 22:54:45 +0100 Subject: [Buildroot] [PATCH 1/4] package/containerd: drop CONTAINERD_CPE_ID_VENDOR In-Reply-To: References: Message-ID: Fabrice, All, On 2024-02-04 16:22 +0100, Yann E. MORIN spake thusly: > From: Fabrice Fontaine > > Commit 35af2bb8011ea57642777acf5613afa244d325d7 set > CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as > CONTAINERD_CPE_ID_PRODUCT will be set to the package name > (i.e. containerd) by default > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/containerd/containerd.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk > index 61a8472ddd..d3ca102797 100644 > --- a/package/containerd/containerd.mk > +++ b/package/containerd/containerd.mk > @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) > CONTAINERD_LICENSE = Apache-2.0 > CONTAINERD_LICENSE_FILES = LICENSE > CONTAINERD_CPE_ID_VENDOR = linuxfoundation > -CONTAINERD_CPE_ID_PRODUCT = containerd > > CONTAINERD_GOMOD = github.com/containerd/containerd > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 5 21:55:02 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 22:55:02 +0100 Subject: [Buildroot] [PATCH 2/4] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT In-Reply-To: References: Message-ID: Fabrice, All, On 2024-02-04 16:22 +0100, Yann E. MORIN spake thusly: > From: Fabrice Fontaine > > Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set > LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as > LIBCURL_CPE_ID_PRODUCT will be set to the package name > (i.e. libcurl) by default > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libcurl/libcurl.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 3ecc587a52..83845b8e87 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ > LIBCURL_LICENSE = curl > LIBCURL_LICENSE_FILES = COPYING > LIBCURL_CPE_ID_VENDOR = haxx > -LIBCURL_CPE_ID_PRODUCT = libcurl > LIBCURL_INSTALL_STAGING = YES > > # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Mon Feb 5 21:56:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 22:56:28 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add ltrace runtime test In-Reply-To: <20240124222236.15954-1-ju.o@free.fr> (Julien Olivain's message of "Wed, 24 Jan 2024 23:22:36 +0100") References: <20240124222236.15954-1-ju.o@free.fr> Message-ID: <87bk8ua837.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 22:04:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:04:27 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add trace-cmd runtime test In-Reply-To: <20240124222403.16360-1-ju.o@free.fr> (Julien Olivain's message of "Wed, 24 Jan 2024 23:24:03 +0100") References: <20240124222403.16360-1-ju.o@free.fr> Message-ID: <877cjia7pw.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit bc680b5 with commands: > make check-package > ... > 0 warnings generated > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_trace_cmd > ... > OK Committed, thanks. -- Bye, Peter Korsgaard From bubu at git.sr.ht Mon Feb 5 21:47:17 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 22:47:17 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: add python-uvloop runtime test Message-ID: <170717110256.12359.16509380444438086733-0@git.sr.ht> From: Marcus Hoffmann --- .../tests/package/sample_python_uvloop.py | 6 +++++ .../tests/package/test_python_uvloop.py | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 support/testing/tests/package/sample_python_uvloop.py create mode 100644 support/testing/tests/package/test_python_uvloop.py diff --git a/support/testing/tests/package/sample_python_uvloop.py b/support/testing/tests/package/sample_python_uvloop.py new file mode 100644 index 0000000000..dc85d3e04e --- /dev/null +++ b/support/testing/tests/package/sample_python_uvloop.py @@ -0,0 +1,6 @@ +import uvloop + +async def main(): + print("Hello world!") + +uvloop.run(main()) diff --git a/support/testing/tests/package/test_python_uvloop.py b/support/testing/tests/package/test_python_uvloop.py new file mode 100644 index 0000000000..c5079ba59c --- /dev/null +++ b/support/testing/tests/package/test_python_uvloop.py @@ -0,0 +1,22 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Uvloop(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_UVLOOP=y + """ + sample_scripts = ["tests/package/sample_python_uvloop.py"] + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + + cmd = "%s %s" % (self.interpreter, os.path.basename(self.sample_scripts[0])) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "Hello world!") -- 2.38.5 From yann.morin.1998 at free.fr Mon Feb 5 22:12:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:12:25 +0100 Subject: [Buildroot] [git commit] package/watchdogd: add menuconfig support for new system monitors Message-ID: <20240205221745.4539986E4B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3aecae1802f28d1662e29b31167f7959bfe6a7ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/watchdogd/Config.in | 10 ++++++++++ package/watchdogd/watchdogd.mk | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/package/watchdogd/Config.in b/package/watchdogd/Config.in index 0b0480ea27..0aeaad165f 100644 --- a/package/watchdogd/Config.in +++ b/package/watchdogd/Config.in @@ -51,4 +51,14 @@ config BR2_PACKAGE_WATCHDOGD_MEMINFO help Enable memory leak monitor. +config BR2_PACKAGE_WATCHDOGD_FSMON + bool "File system monitor" + help + Enable file system monitor. + +config BR2_PACKAGE_WATCHDOGD_TEMPMON + bool "Temperature monitor" + help + Enable temperature monitor. + endif diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk index 56816de94f..189efc81d4 100644 --- a/package/watchdogd/watchdogd.mk +++ b/package/watchdogd/watchdogd.mk @@ -16,9 +16,7 @@ WATCHDOGD_SELINUX_MODULES = watchdog WATCHDOGD_CONF_OPTS = \ --disable-compat \ --disable-examples \ - --disable-test-mode \ - --without-fsmon \ - --without-tempmon + --disable-test-mode ifneq ($(BR2_PACKAGE_WATCHDOGD_TEST_SUITE),y) WATCHDOGD_CONF_OPTS += --disable-builtin-tests @@ -49,6 +47,17 @@ WATCHDOGD_CONF_OPTS += --without-meminfo else WATCHDOGD_CONF_OPTS += --with-meminfo endif + +ifneq ($(BR2_PACKAGE_WATCHDOGD_FSMON),y) +WATCHDOGD_CONF_OPTS += --without-fsmon +else +WATCHDOGD_CONF_OPTS += --with-fsmon +endif + +ifneq ($(BR2_PACKAGE_WATCHDOGD_TEMPMON),y) +WATCHDOGD_CONF_OPTS += --without-tempmon +else +WATCHDOGD_CONF_OPTS += --with-tempmon endif define WATCHDOGD_INSTALL_INIT_SYSV From yann.morin.1998 at free.fr Mon Feb 5 22:10:54 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:10:54 +0100 Subject: [Buildroot] [git commit] package/watchdogd: bump to version 4.0 Message-ID: <20240205221745.3AAD786E4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7371cb294df4792147fcf1da51139aafb759784a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details, see https://github.com/troglobit/watchdogd/releases/tag/4.0 - Major feature upgrade, command line and .conf files compatible - LICENSE hash update due to update in copyright years - Enabling system monitor plugins have changed syntax upstream. The `--with-foo=SECONDS` is now just `--with-foo` This last upstream change require converting affected Config.in options from int -> bool. Legacy _WRAP:ers have been added to Config.legacy.in, modeled on BR2_TARGET_ROOTFS_EXT2_BLOCKS. Forcibly disable new monitors; they'll be enabled in a followup commit. Signed-off-by: Joachim Wiberg [yann.morin.1998 at free.fr: - forcibly disable new monitors - minor tweaks in Config.in.legacy ] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 60 ++++++++++++++++++++++++++++++++++++++++ package/watchdogd/Config.in | 36 +++++++++++------------- package/watchdogd/watchdogd.hash | 4 +-- package/watchdogd/watchdogd.mk | 27 +++++++++++------- 4 files changed, 95 insertions(+), 32 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 82387338d9..9421d07aa1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -202,6 +202,66 @@ config BR2_KERNEL_HEADERS_6_5 Version 6.5.x of the Linux kernel headers are no longer maintained upstream and are now removed. +config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL + int "watchdogd generic poll has been replaced" + default 0 + help + The generic script poll interval has been replaced upstream + with a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_GENERIC_POLL != 0 + select BR2_LEGACY + +config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL + int "watchdogd loadavg poll has been replaced" + default 0 + help + The CPU load average poll interval has been replaced upstream + with a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL != 0 + select BR2_LEGACY + +config BR2_PACKAGE_WATCHDOGD_FILENR_POLL + int "watchdogd filenr poll has been replaced" + default 0 + help + The file descriptor leak poll has been replaced upstream with + a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_FILENR_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_FILENR_POLL != 0 + select BR2_LEGACY + +config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL + int "watchdogd meminfo poll has been replaced" + default 0 + help + The memleak detector poll interval has been replaced upstream + with a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL != 0 + select BR2_LEGACY + comment "Legacy options removed in 2023.11" config BR2_PACKAGE_PYTHON_PYXB diff --git a/package/watchdogd/Config.in b/package/watchdogd/Config.in index ca5933848d..0b0480ea27 100644 --- a/package/watchdogd/Config.in +++ b/package/watchdogd/Config.in @@ -27,32 +27,28 @@ config BR2_PACKAGE_WATCHDOGD_TEST_SUITE They can be used to verify correct operation of watchdogd and the kernel watchdog driver. -config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL - int "Generic script monitor poll interval (sec)" - default "300" +config BR2_PACKAGE_WATCHDOGD_GENERIC + bool "Generic script monitor" + default y if BR2_PACKAGE_WATCHDOGD_GENERIC_POLL_WRAP # legacy 2024.02 help - Poll interval for generic script monitor, in seconds. A value - of zero (0) disables the monitor. + Enable generic script monitor. -config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL - int "CPU load average monitor poll interval (sec)" - default "300" +config BR2_PACKAGE_WATCHDOGD_LOADAVG + bool "CPU load average monitor" + default y if BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL_WRAP # legacy 2024.02 help - Poll interval for CPU load average monitor, in seconds. A - value of zero (0) disables the monitor. + Enable CPU load average monitor. -config BR2_PACKAGE_WATCHDOGD_FILENR_POLL - int "File descriptor leak monitor poll interval (sec)" - default "300" +config BR2_PACKAGE_WATCHDOGD_FILENR + bool "File descriptor leak monitor" + default y if BR2_PACKAGE_WATCHDOGD_FILENR_POLL_WRAP # legacy 2024.02 help - Poll interval for file descriptor leak monitor, in seconds. A - value of zero (0) disables the monitor. + Enable file descriptor leak monitor. -config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL - int "Memory leak monitor poll interval (sec)" - default "300" +config BR2_PACKAGE_WATCHDOGD_MEMINFO + bool "Memory leak monitor" + default y if BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL_WRAP # legacy 2024.02 help - Poll interval for memory leak monitor, in seconds. A value of - zero (0) disables the monitor. + Enable memory leak monitor. endif diff --git a/package/watchdogd/watchdogd.hash b/package/watchdogd/watchdogd.hash index 4ff1a3485b..0c228666bd 100644 --- a/package/watchdogd/watchdogd.hash +++ b/package/watchdogd/watchdogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 33ec4edc8cb4ada7a4d8324a27d897d33aae5e83257ed64d3d37508825c11237 watchdogd-3.5.tar.gz +sha256 7f38bc691353a51fc6feb2ccab60417c0284dd3f4d55c50d8b1781fda70d8101 watchdogd-4.0.tar.gz # Locally calculated -sha256 fd685e20931174308c45a26418a7ce34d66704c4e4b92ab1d8299deb255cd676 LICENSE +sha256 e233c56d807c74c67f2eff47ad03c216144cdd374d8d7578b996c28c260eadda LICENSE diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk index ea033b4e71..56816de94f 100644 --- a/package/watchdogd/watchdogd.mk +++ b/package/watchdogd/watchdogd.mk @@ -4,44 +4,51 @@ # ################################################################################ -WATCHDOGD_VERSION = 3.5 +WATCHDOGD_VERSION = 4.0 WATCHDOGD_SITE = https://github.com/troglobit/watchdogd/releases/download/$(WATCHDOGD_VERSION) WATCHDOGD_LICENSE = ISC WATCHDOGD_LICENSE_FILES = LICENSE WATCHDOGD_CPE_ID_VENDOR = troglobit WATCHDOGD_INSTALL_STAGING = YES WATCHDOGD_DEPENDENCIES = host-pkgconf libconfuse libite libuev -WATCHDOGD_CONF_OPTS = --disable-compat --disable-examples --disable-test-mode WATCHDOGD_SELINUX_MODULES = watchdog +WATCHDOGD_CONF_OPTS = \ + --disable-compat \ + --disable-examples \ + --disable-test-mode \ + --without-fsmon \ + --without-tempmon + ifneq ($(BR2_PACKAGE_WATCHDOGD_TEST_SUITE),y) WATCHDOGD_CONF_OPTS += --disable-builtin-tests else WATCHDOGD_CONF_OPTS += --enable-builtin-tests endif -ifeq ($(BR2_PACKAGE_WATCHDOGD_GENERIC_POLL),0) +ifneq ($(BR2_PACKAGE_WATCHDOGD_GENERIC),y) WATCHDOGD_CONF_OPTS += --without-generic else -WATCHDOGD_CONF_OPTS += --with-generic=$(BR2_PACKAGE_WATCHDOGD_GENERIC_POLL) +WATCHDOGD_CONF_OPTS += --with-generic endif -ifeq ($(BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL),0) +ifneq ($(BR2_PACKAGE_WATCHDOGD_LOADAVG),y) WATCHDOGD_CONF_OPTS += --without-loadavg else -WATCHDOGD_CONF_OPTS += --with-loadavg=$(BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL) +WATCHDOGD_CONF_OPTS += --with-loadavg endif -ifeq ($(BR2_PACKAGE_WATCHDOGD_FILENR_POLL),0) +ifneq ($(BR2_PACKAGE_WATCHDOGD_FILENR),y) WATCHDOGD_CONF_OPTS += --without-filenr else -WATCHDOGD_CONF_OPTS += --with-filenr=$(BR2_PACKAGE_WATCHDOGD_FILENR_POLL) +WATCHDOGD_CONF_OPTS += --with-filenr endif -ifeq ($(BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL),0) +ifneq ($(BR2_PACKAGE_WATCHDOGD_MEMINFO),y) WATCHDOGD_CONF_OPTS += --without-meminfo else -WATCHDOGD_CONF_OPTS += --with-meminfo=$(BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL) +WATCHDOGD_CONF_OPTS += --with-meminfo +endif endif define WATCHDOGD_INSTALL_INIT_SYSV From buildroot at bubu1.eu Mon Feb 5 22:17:38 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 23:17:38 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: add python-uvloop runtime test In-Reply-To: <170717110256.12359.16509380444438086733-0@git.sr.ht> References: <170717110256.12359.16509380444438086733-0@git.sr.ht> Message-ID: <7e311fd3-0eac-4cff-a87e-da53f01abdf8@bubu1.eu> Eventually I'll manage to sign-off my commits ... On 05.02.24 22:47, ~bubu wrote: > From: Marcus Hoffmann Signed-off-by: Marcus Hoffmann > > --- > .../tests/package/sample_python_uvloop.py | 6 +++++ > .../tests/package/test_python_uvloop.py | 22 +++++++++++++++++++ > 2 files changed, 28 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_uvloop.py > create mode 100644 support/testing/tests/package/test_python_uvloop.py > > diff --git a/support/testing/tests/package/sample_python_uvloop.py b/support/testing/tests/package/sample_python_uvloop.py > new file mode 100644 > index 0000000000..dc85d3e04e > --- /dev/null > +++ b/support/testing/tests/package/sample_python_uvloop.py > @@ -0,0 +1,6 @@ > +import uvloop > + > +async def main(): > + print("Hello world!") > + > +uvloop.run(main()) > diff --git a/support/testing/tests/package/test_python_uvloop.py b/support/testing/tests/package/test_python_uvloop.py > new file mode 100644 > index 0000000000..c5079ba59c > --- /dev/null > +++ b/support/testing/tests/package/test_python_uvloop.py > @@ -0,0 +1,22 @@ > +import os > + > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy3Uvloop(TestPythonPackageBase): > + __test__ = True > + config = TestPythonPackageBase.config + \ > + """ > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_UVLOOP=y > + """ > + sample_scripts = ["tests/package/sample_python_uvloop.py"] > + > + def test_run(self): > + self.login() > + self.check_sample_scripts_exist() > + > + cmd = "%s %s" % (self.interpreter, os.path.basename(self.sample_scripts[0])) > + output, exit_code = self.emulator.run(cmd) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output[0], "Hello world!") From peter at korsgaard.com Mon Feb 5 22:19:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:19:54 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add usbutils runtime test In-Reply-To: <20240124222523.16703-1-ju.o@free.fr> (Julien Olivain's message of "Wed, 24 Jan 2024 23:25:23 +0100") References: <20240124222523.16703-1-ju.o@free.fr> Message-ID: <8734u6a705.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit 7a59c3a with commands: > make check-package > ... > 0 warnings generated > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_usbutils > ... > OK > --- > DEVELOPERS | 2 + > .../testing/tests/package/test_usbutils.py | 60 +++++++++++++++++++ > .../test_usbutils/linux-usbutils.fragment | 2 + > 3 files changed, 64 insertions(+) > create mode 100644 support/testing/tests/package/test_usbutils.py > create mode 100644 support/testing/tests/package/test_usbutils/linux-usbutils.fragment > diff --git a/DEVELOPERS b/DEVELOPERS > index f5b04937b6..5a5ce47d73 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1814,6 +1814,8 @@ F: support/testing/tests/package/test_screen.py > F: support/testing/tests/package/test_stress_ng.py > F: support/testing/tests/package/test_tcl.py > F: support/testing/tests/package/test_tcl/ > +F: support/testing/tests/package/test_usbutils.py > +F: support/testing/tests/package/test_usbutils/ > F: support/testing/tests/package/test_weston.py > F: support/testing/tests/package/test_weston/ > F: support/testing/tests/package/test_xz.py > diff --git a/support/testing/tests/package/test_usbutils.py b/support/testing/tests/package/test_usbutils.py > new file mode 100644 > index 0000000000..9a5484d5e6 > --- /dev/null > +++ b/support/testing/tests/package/test_usbutils.py > @@ -0,0 +1,60 @@ > +import os > + > +import infra.basetest > + > + > +class TestUsbUtils(infra.basetest.BRTest): > + # A specific configuration is needed for testing usbutils, to > + # enable USB 2.0 support in the Kernel. > + linux_fragment = \ > + infra.filepath("tests/package/test_usbutils/linux-usbutils.fragment") > + config = \ > + f""" > + BR2_aarch64=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > + BR2_LINUX_KERNEL=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.73" > + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" > + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{linux_fragment}" > + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + BR2_PACKAGE_EUDEV=y > + BR2_PACKAGE_USBUTILS=y > + BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > + BR2_TARGET_ROOTFS_CPIO=y > + BR2_TARGET_ROOTFS_CPIO_GZIP=y > + # BR2_TARGET_ROOTFS_TAR is not set > + """ > + > + def test_run(self): > + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") > + kern = os.path.join(self.builddir, "images", "Image") > + # We add a USB keyboard and mouse devices for the test. > + self.emulator.boot(arch="aarch64", > + kernel=kern, > + kernel_cmdline=["console=ttyAMA0"], > + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", > + "-initrd", img, > + "-device", "usb-ehci,id=ehci", > + "-device", "usb-kbd,bus=ehci.0", > + "-device", "usb-mouse,bus=ehci.0"]) > + self.emulator.login() > + > + # Check the program can execute. We also check the version > + # string to make sure we have the usbutils version. The > + # BusyBox lsusb ignores arguments. > + output, exit_code = self.emulator.run("lsusb --version") > + self.assertEqual(exit_code, 0) > + self.assertTrue(output[0].startswith("lsusb (usbutils)")) > + > + # Test few simple and common invocations > + self.assertRunOk("lsusb") > + self.assertRunOk("lsusb --tree") > + self.assertRunOk("lsusb --verbose") > + # 1d6b:0002 is Linux Foundation 2.0 root hub > + # it should be present. lsusb return an error if no device > + # is found. > + self.assertRunOk("lsusb -d 1d6b:0002") > + self.assertRunOk("usbhid-dump") It was not directly obvious why this would not fail until I noticed that you configure qemu to emulate a USB keyboard and a mouse, so I added a comment about this and applied - Thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Mon Feb 5 22:19:26 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 23:19:26 +0100 Subject: [Buildroot] [git commit] support/testing: netcat: improve test robustness Message-ID: <20240205222012.F025586E52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f72ba67d081a728a13f76cb8d18e2b5b781d2a46 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Under some conditions (mostly slow execution due to test host load), the netcat runtime test can randomly fail. This is due to several facts: - the sleep time between the server and client is too short, - the use of netcat option -c could close the connection before the server could receive all the data. This commit improves the test robustness by increasing the sleep time, and by reducing the amount of transferred data (from 1MB of random data, to a simpler string of few bytes). Also, to make sure netcat cannot wait on DNS resolution, this commit also adds the -n option. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854664 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- support/testing/tests/package/test_netcat.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/support/testing/tests/package/test_netcat.py b/support/testing/tests/package/test_netcat.py index b3efa4c40b..88d58a72f3 100644 --- a/support/testing/tests/package/test_netcat.py +++ b/support/testing/tests/package/test_netcat.py @@ -22,20 +22,19 @@ class TestNetCat(infra.basetest.BRTest): self.assertRunOk("nc --version") - in_file = "input.bin" - out_file = "output.bin" + msg = "Hello Buildroot!" + out_file = "output.txt" port = 12345 - cmd = f"dd if=/dev/urandom of={in_file} bs=1k count=1k" + cmd = f"nc -n -l -p {port} > {out_file} 2> /dev/null &" self.assertRunOk(cmd) - cmd = f"nc -l -p {port} > {out_file} &" - self.assertRunOk(cmd) - - time.sleep(1) + time.sleep(5) - cmd = f"cat {in_file} | nc -c 127.0.0.1 {port}" + cmd = f"echo '{msg}' | nc -n -c 127.0.0.1 {port}" self.assertRunOk(cmd) - cmd = f"cmp {in_file} {out_file}" - self.assertRunOk(cmd) + cmd = f"cat {out_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) From yann.morin.1998 at free.fr Mon Feb 5 22:20:46 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:20:46 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/watchdogd: bump to version 4.0 In-Reply-To: <20240130215628.884512-2-troglobit@gmail.com> References: <20240130215628.884512-1-troglobit@gmail.com> <20240130215628.884512-2-troglobit@gmail.com> Message-ID: Joachim, All, On 2024-01-30 22:56 +0100, Joachim Wiberg spake thusly: > For details, see https://github.com/troglobit/watchdogd/releases/tag/4.0 > > - Major feature upgrade, command line and .conf files compatible > - LICENSE hash update due to update in copyright years > - Enabling system monitor plugins have changed syntax upstream. The > `--with-foo=SECONDS` is now just `--with-foo` > > This last upstream change require converting affected Config.in options > from int -> bool. Legacy _WRAP:ers have been added to Config.legacy.in, > modeled on BR2_TARGET_ROOTFS_EXT2_BLOCKS. > > Signed-off-by: Joachim Wiberg > --- [--SNIP--] > diff --git a/Config.in.legacy b/Config.in.legacy > index 82387338d9..b6e72d0f24 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -202,6 +202,64 @@ config BR2_KERNEL_HEADERS_6_5 > Version 6.5.x of the Linux kernel headers are no longer > maintained upstream and are now removed. > > +config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL > + int "watchdogd generic poll has been replaced" > + default 0 > + help > + The generic script poll interval has been replaced upstream > + with a boolean on/off. Your configuration has been migrated. > + > + Set this legacy option to 0 here to remove the warning. [--SNIP--] > +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL still referenced in package/watchdogd/Config.in This comment is wrong: it's the _WRAP options that are referenced. So I changed it. I also duplicated right above each such option so it's easier to spot rather than a lone comment way below (I know you did like the existing ext legacy, but that does not prevent improving! ;-) ). Applied to master, thanks. Regards, Yann E. MORIN. > comment "Legacy options removed in 2023.11" > > config BR2_PACKAGE_PYTHON_PYXB > diff --git a/package/watchdogd/Config.in b/package/watchdogd/Config.in > index ca5933848d..0b0480ea27 100644 > --- a/package/watchdogd/Config.in > +++ b/package/watchdogd/Config.in > @@ -27,32 +27,28 @@ config BR2_PACKAGE_WATCHDOGD_TEST_SUITE > They can be used to verify correct operation of watchdogd and > the kernel watchdog driver. > > -config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL > - int "Generic script monitor poll interval (sec)" > - default "300" > +config BR2_PACKAGE_WATCHDOGD_GENERIC > + bool "Generic script monitor" > + default y if BR2_PACKAGE_WATCHDOGD_GENERIC_POLL_WRAP # legacy 2024.02 > help > - Poll interval for generic script monitor, in seconds. A value > - of zero (0) disables the monitor. > + Enable generic script monitor. > > -config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL > - int "CPU load average monitor poll interval (sec)" > - default "300" > +config BR2_PACKAGE_WATCHDOGD_LOADAVG > + bool "CPU load average monitor" > + default y if BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL_WRAP # legacy 2024.02 > help > - Poll interval for CPU load average monitor, in seconds. A > - value of zero (0) disables the monitor. > + Enable CPU load average monitor. > > -config BR2_PACKAGE_WATCHDOGD_FILENR_POLL > - int "File descriptor leak monitor poll interval (sec)" > - default "300" > +config BR2_PACKAGE_WATCHDOGD_FILENR > + bool "File descriptor leak monitor" > + default y if BR2_PACKAGE_WATCHDOGD_FILENR_POLL_WRAP # legacy 2024.02 > help > - Poll interval for file descriptor leak monitor, in seconds. A > - value of zero (0) disables the monitor. > + Enable file descriptor leak monitor. > > -config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL > - int "Memory leak monitor poll interval (sec)" > - default "300" > +config BR2_PACKAGE_WATCHDOGD_MEMINFO > + bool "Memory leak monitor" > + default y if BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL_WRAP # legacy 2024.02 > help > - Poll interval for memory leak monitor, in seconds. A value of > - zero (0) disables the monitor. > + Enable memory leak monitor. > > endif > diff --git a/package/watchdogd/watchdogd.hash b/package/watchdogd/watchdogd.hash > index 4ff1a3485b..0c228666bd 100644 > --- a/package/watchdogd/watchdogd.hash > +++ b/package/watchdogd/watchdogd.hash > @@ -1,5 +1,5 @@ > # Upstream .sha256 from GitHub > -sha256 33ec4edc8cb4ada7a4d8324a27d897d33aae5e83257ed64d3d37508825c11237 watchdogd-3.5.tar.gz > +sha256 7f38bc691353a51fc6feb2ccab60417c0284dd3f4d55c50d8b1781fda70d8101 watchdogd-4.0.tar.gz > > # Locally calculated > -sha256 fd685e20931174308c45a26418a7ce34d66704c4e4b92ab1d8299deb255cd676 LICENSE > +sha256 e233c56d807c74c67f2eff47ad03c216144cdd374d8d7578b996c28c260eadda LICENSE > diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk > index ea033b4e71..2e67c2847e 100644 > --- a/package/watchdogd/watchdogd.mk > +++ b/package/watchdogd/watchdogd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WATCHDOGD_VERSION = 3.5 > +WATCHDOGD_VERSION = 4.0 > WATCHDOGD_SITE = https://github.com/troglobit/watchdogd/releases/download/$(WATCHDOGD_VERSION) > WATCHDOGD_LICENSE = ISC > WATCHDOGD_LICENSE_FILES = LICENSE > @@ -20,28 +20,29 @@ else > WATCHDOGD_CONF_OPTS += --enable-builtin-tests > endif > > -ifeq ($(BR2_PACKAGE_WATCHDOGD_GENERIC_POLL),0) > +ifneq ($(BR2_PACKAGE_WATCHDOGD_GENERIC),y) > WATCHDOGD_CONF_OPTS += --without-generic > else > -WATCHDOGD_CONF_OPTS += --with-generic=$(BR2_PACKAGE_WATCHDOGD_GENERIC_POLL) > +WATCHDOGD_CONF_OPTS += --with-generic > endif > > -ifeq ($(BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL),0) > +ifneq ($(BR2_PACKAGE_WATCHDOGD_LOADAVG),y) > WATCHDOGD_CONF_OPTS += --without-loadavg > else > -WATCHDOGD_CONF_OPTS += --with-loadavg=$(BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL) > +WATCHDOGD_CONF_OPTS += --with-loadavg > endif > > -ifeq ($(BR2_PACKAGE_WATCHDOGD_FILENR_POLL),0) > +ifneq ($(BR2_PACKAGE_WATCHDOGD_FILENR),y) > WATCHDOGD_CONF_OPTS += --without-filenr > else > -WATCHDOGD_CONF_OPTS += --with-filenr=$(BR2_PACKAGE_WATCHDOGD_FILENR_POLL) > +WATCHDOGD_CONF_OPTS += --with-filenr > endif > > -ifeq ($(BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL),0) > +ifneq ($(BR2_PACKAGE_WATCHDOGD_MEMINFO),y) > WATCHDOGD_CONF_OPTS += --without-meminfo > else > -WATCHDOGD_CONF_OPTS += --with-meminfo=$(BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL) > +WATCHDOGD_CONF_OPTS += --with-meminfo > +endif > endif > > define WATCHDOGD_INSTALL_INIT_SYSV > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Mon Feb 5 22:20:50 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 23:20:50 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: netcat: improve test robustness In-Reply-To: <20240205214837.3497535-1-ju.o@free.fr> References: <20240205214837.3497535-1-ju.o@free.fr> Message-ID: <3d4fe1c8-8d8f-4740-9185-2a6ff43405fc@smile.fr> Hello Julien, Le 05/02/2024 ? 22:48, Julien Olivain a ?crit?: > Under some conditions (mostly slow execution due to test host load), > the netcat runtime test can randomly fail. This is due to several > facts: > > - the sleep time between the server and client is too short, > - the use of netcat option -c could close the connection before the > server could receive all the data. > > This commit improves the test robustness by increasing the sleep time, > and by reducing the amount of transferred data (from 1MB of random data, > to a simpler string of few bytes). Also, to make sure netcat cannot wait > on DNS resolution, this commit also adds the -n option. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854664 Applied to master, thanks. Best regards, Romain > > Signed-off-by: Julien Olivain > --- > support/testing/tests/package/test_netcat.py | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/support/testing/tests/package/test_netcat.py b/support/testing/tests/package/test_netcat.py > index b3efa4c40b..88d58a72f3 100644 > --- a/support/testing/tests/package/test_netcat.py > +++ b/support/testing/tests/package/test_netcat.py > @@ -22,20 +22,19 @@ class TestNetCat(infra.basetest.BRTest): > > self.assertRunOk("nc --version") > > - in_file = "input.bin" > - out_file = "output.bin" > + msg = "Hello Buildroot!" > + out_file = "output.txt" > port = 12345 > > - cmd = f"dd if=/dev/urandom of={in_file} bs=1k count=1k" > + cmd = f"nc -n -l -p {port} > {out_file} 2> /dev/null &" > self.assertRunOk(cmd) > > - cmd = f"nc -l -p {port} > {out_file} &" > - self.assertRunOk(cmd) > - > - time.sleep(1) > + time.sleep(5) > > - cmd = f"cat {in_file} | nc -c 127.0.0.1 {port}" > + cmd = f"echo '{msg}' | nc -n -c 127.0.0.1 {port}" > self.assertRunOk(cmd) > > - cmd = f"cmp {in_file} {out_file}" > - self.assertRunOk(cmd) > + cmd = f"cat {out_file}" > + out, ret = self.emulator.run(cmd) > + self.assertEqual(ret, 0) > + self.assertEqual(out[0], msg) From peter at korsgaard.com Mon Feb 5 22:20:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:20:22 +0100 Subject: [Buildroot] [git commit] support/testing: add ltrace runtime test Message-ID: <20240205222152.39D0886E70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d64b36ba1577d6c0169787a14101b2f43ddac206 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_ltrace.py | 32 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 187c8eeca7..a8e1ac9a27 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1790,6 +1790,7 @@ F: support/testing/tests/package/test_less.py F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py +F: support/testing/tests/package/test_ltrace.py F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py diff --git a/support/testing/tests/package/test_ltrace.py b/support/testing/tests/package/test_ltrace.py new file mode 100644 index 0000000000..9ef64ba5dd --- /dev/null +++ b/support/testing/tests/package/test_ltrace.py @@ -0,0 +1,32 @@ +import os + +import infra.basetest + + +class TestLtrace(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LTRACE=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]) + self.emulator.login() + + # Check the program can execute + self.assertRunOk("ltrace --version") + + # Run ltrace on a ls + cmd = "ltrace -a 0 -o ltrace.log ls /" + self.assertRunOk(cmd) + + # Check the ltrace log contains occurrences of libc malloc() + cmd = "grep -Ec 'malloc\\([0-9]+\\)' ltrace.log" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertGreater(int(out[0]), 0) From peter at korsgaard.com Mon Feb 5 22:20:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:20:23 +0100 Subject: [Buildroot] [git commit] support/testing: add trace-cmd runtime test Message-ID: <20240205222152.4675386E71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b342b77938622d89fbe6eca20ed5d251a884569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_trace_cmd.py | 54 ++++++++++++++++++++++ .../package/test_trace_cmd/linux-ftrace.fragment | 1 + 3 files changed, 57 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a8e1ac9a27..12df3bef13 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1830,6 +1830,8 @@ F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_tcpdump.py F: support/testing/tests/package/test_tesseract_ocr.py +F: support/testing/tests/package/test_trace_cmd.py +F: support/testing/tests/package/test_trace_cmd/ F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_trace_cmd.py b/support/testing/tests/package/test_trace_cmd.py new file mode 100644 index 0000000000..e7d5e13bce --- /dev/null +++ b/support/testing/tests/package/test_trace_cmd.py @@ -0,0 +1,54 @@ +import os + +import infra.basetest + + +class TestTraceCmd(infra.basetest.BRTest): + # A specific configuration is needed for testing trace-cmd. + # The function tracer need to be enabled in the Kernel. + kern_fragment = \ + infra.filepath("tests/package/test_trace_cmd/linux-ftrace.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.74" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_TRACE_CMD=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # Record calls to kmalloc() from a simple command. + self.assertRunOk("trace-cmd record -e kmalloc ls -l /") + + # Show information about the trace.dat file. + self.assertRunOk("trace-cmd dump") + + # Generate a text report of the trace. + self.assertRunOk("trace-cmd report > trace.txt") + + # Check we have occurrences of "kmalloc:" in the trace report. + cmd = "grep -Fc kmalloc: trace.txt" + output, exit_code = self.emulator.run(cmd) + self.assertEquals(exit_code, 0) + self.assertTrue(int(output[0]) > 0) diff --git a/support/testing/tests/package/test_trace_cmd/linux-ftrace.fragment b/support/testing/tests/package/test_trace_cmd/linux-ftrace.fragment new file mode 100644 index 0000000000..ef82146616 --- /dev/null +++ b/support/testing/tests/package/test_trace_cmd/linux-ftrace.fragment @@ -0,0 +1 @@ +CONFIG_FTRACE=y From peter at korsgaard.com Mon Feb 5 22:20:25 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:20:25 +0100 Subject: [Buildroot] [git commit] support/testing: add usbutils runtime test Message-ID: <20240205222152.5383186E72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ce02d84ada4fdf6fbf45a60a7934a5edae05c8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain [Peter: add comment about USB keyboard/mouse] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_usbutils.py | 61 ++++++++++++++++++++++ .../package/test_usbutils/linux-usbutils.fragment | 2 + 3 files changed, 65 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 12df3bef13..f7a10c364d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1832,6 +1832,8 @@ F: support/testing/tests/package/test_tcpdump.py F: support/testing/tests/package/test_tesseract_ocr.py F: support/testing/tests/package/test_trace_cmd.py F: support/testing/tests/package/test_trace_cmd/ +F: support/testing/tests/package/test_usbutils.py +F: support/testing/tests/package/test_usbutils/ F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_usbutils.py b/support/testing/tests/package/test_usbutils.py new file mode 100644 index 0000000000..83c3f7f920 --- /dev/null +++ b/support/testing/tests/package/test_usbutils.py @@ -0,0 +1,61 @@ +import os + +import infra.basetest + + +class TestUsbUtils(infra.basetest.BRTest): + # A specific configuration is needed for testing usbutils, to + # enable USB 2.0 support in the Kernel. + linux_fragment = \ + infra.filepath("tests/package/test_usbutils/linux-usbutils.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.73" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{linux_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_EUDEV=y + BR2_PACKAGE_USBUTILS=y + BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + # We add a USB keyboard and mouse devices for the test. + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img, + "-device", "usb-ehci,id=ehci", + "-device", "usb-kbd,bus=ehci.0", + "-device", "usb-mouse,bus=ehci.0"]) + self.emulator.login() + + # Check the program can execute. We also check the version + # string to make sure we have the usbutils version. The + # BusyBox lsusb ignores arguments. + output, exit_code = self.emulator.run("lsusb --version") + self.assertEqual(exit_code, 0) + self.assertTrue(output[0].startswith("lsusb (usbutils)")) + + # Test few simple and common invocations + self.assertRunOk("lsusb") + self.assertRunOk("lsusb --tree") + self.assertRunOk("lsusb --verbose") + # 1d6b:0002 is Linux Foundation 2.0 root hub + # it should be present. lsusb return an error if no device + # is found. + self.assertRunOk("lsusb -d 1d6b:0002") + # we emulate a USB keyboard and mouse, so usbhid-dump should find them + self.assertRunOk("usbhid-dump") diff --git a/support/testing/tests/package/test_usbutils/linux-usbutils.fragment b/support/testing/tests/package/test_usbutils/linux-usbutils.fragment new file mode 100644 index 0000000000..d9abd2821e --- /dev/null +++ b/support/testing/tests/package/test_usbutils/linux-usbutils.fragment @@ -0,0 +1,2 @@ +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y From yann.morin.1998 at free.fr Mon Feb 5 22:22:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:22:15 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/watchdogd: bump to version 4.0 In-Reply-To: <20240130215628.884512-2-troglobit@gmail.com> References: <20240130215628.884512-1-troglobit@gmail.com> <20240130215628.884512-2-troglobit@gmail.com> Message-ID: Joachim, All, On 2024-01-30 22:56 +0100, Joachim Wiberg spake thusly: > For details, see https://github.com/troglobit/watchdogd/releases/tag/4.0 > > - Major feature upgrade, command line and .conf files compatible > - LICENSE hash update due to update in copyright years > - Enabling system monitor plugins have changed syntax upstream. The > `--with-foo=SECONDS` is now just `--with-foo` > > This last upstream change require converting affected Config.in options > from int -> bool. Legacy _WRAP:ers have been added to Config.legacy.in, > modeled on BR2_TARGET_ROOTFS_EXT2_BLOCKS. > > Signed-off-by: Joachim Wiberg > --- [--SNIP--] > diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk > index ea033b4e71..2e67c2847e 100644 > --- a/package/watchdogd/watchdogd.mk > +++ b/package/watchdogd/watchdogd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WATCHDOGD_VERSION = 3.5 > +WATCHDOGD_VERSION = 4.0 > WATCHDOGD_SITE = https://github.com/troglobit/watchdogd/releases/download/$(WATCHDOGD_VERSION) > WATCHDOGD_LICENSE = ISC > WATCHDOGD_LICENSE_FILES = LICENSE > @@ -20,28 +20,29 @@ else > WATCHDOGD_CONF_OPTS += --enable-builtin-tests > endif I also added explicit --without-XXX options for the new monitors, by the way. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 5 22:23:55 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:23:55 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/watchdogd: add menuconfig support for new system monitors In-Reply-To: <20240130215628.884512-3-troglobit@gmail.com> References: <20240130215628.884512-1-troglobit@gmail.com> <20240130215628.884512-3-troglobit@gmail.com> Message-ID: Joachim, All, On 2024-01-30 22:56 +0100, Joachim Wiberg spake thusly: > Signed-off-by: Joachim Wiberg Applied to master after dropping the explicit --without-XX I introduced in the previous patch, thanks. (please check I did not bork anything!) Regards, Yann E. MORIN. > --- > package/watchdogd/Config.in | 10 ++++++++++ > package/watchdogd/watchdogd.mk | 11 +++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/package/watchdogd/Config.in b/package/watchdogd/Config.in > index 0b0480ea27..0aeaad165f 100644 > --- a/package/watchdogd/Config.in > +++ b/package/watchdogd/Config.in > @@ -51,4 +51,14 @@ config BR2_PACKAGE_WATCHDOGD_MEMINFO > help > Enable memory leak monitor. > > +config BR2_PACKAGE_WATCHDOGD_FSMON > + bool "File system monitor" > + help > + Enable file system monitor. > + > +config BR2_PACKAGE_WATCHDOGD_TEMPMON > + bool "Temperature monitor" > + help > + Enable temperature monitor. > + > endif > diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk > index 2e67c2847e..9d06b04bd3 100644 > --- a/package/watchdogd/watchdogd.mk > +++ b/package/watchdogd/watchdogd.mk > @@ -43,6 +43,17 @@ WATCHDOGD_CONF_OPTS += --without-meminfo > else > WATCHDOGD_CONF_OPTS += --with-meminfo > endif > + > +ifneq ($(BR2_PACKAGE_WATCHDOGD_FSMON),y) > +WATCHDOGD_CONF_OPTS += --without-fsmon > +else > +WATCHDOGD_CONF_OPTS += --with-fsmon > +endif > + > +ifneq ($(BR2_PACKAGE_WATCHDOGD_TEMPMON),y) > +WATCHDOGD_CONF_OPTS += --without-tempmon > +else > +WATCHDOGD_CONF_OPTS += --with-tempmon > endif > > define WATCHDOGD_INSTALL_INIT_SYSV > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Mon Feb 5 22:28:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:28:56 +0100 Subject: [Buildroot] [PATCH v2 1/1] support/testing: add a "file" package runtime test In-Reply-To: <20240124221950.14714-1-ju.o@free.fr> (Julien Olivain's message of "Wed, 24 Jan 2024 23:19:50 +0100") References: <20240124221950.14714-1-ju.o@free.fr> Message-ID: <87y1by8s0n.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > Changes v1 -> v2: > Included Yann's comments: > - Moved test data in rootfs-overlay, > - Merged all test cases in a single loop, > - Do the output pattern check in Python, > Other change: > - Added 2 cases (C and shellscript MIME) > Patch tested on branch master at commit fb007c9 with commands: Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 22:27:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:27:35 +0100 Subject: [Buildroot] [git commit] support/testing: add a "file" package runtime test Message-ID: <20240205222916.7B3E786E83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e03513c773a4b58b87abbe906d9ca29b0c50ae5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_file.py | 48 +++++++++++++++++++++ .../package/test_file/rootfs-overlay/root/code.c | 9 ++++ .../test_file/rootfs-overlay/root/plain-text.txt | 1 + .../rootfs-overlay/root/plain-text.txt.gz | Bin 0 -> 62 bytes .../test_file/rootfs-overlay/root/random-data.bin | Bin 0 -> 512 bytes .../test_file/rootfs-overlay/root/script.py | 3 ++ .../test_file/rootfs-overlay/root/script.sh | 3 ++ .../rootfs-overlay/root/symlink-to-plain-text.txt | 1 + 9 files changed, 67 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f7a10c364d..5467e465d6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1769,6 +1769,8 @@ F: support/testing/tests/package/test_cryptsetup/ F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py +F: support/testing/tests/package/test_file.py +F: support/testing/tests/package/test_file/ F: support/testing/tests/package/test_fluidsynth.py F: support/testing/tests/package/test_fluidsynth/ F: support/testing/tests/package/test_fping.py diff --git a/support/testing/tests/package/test_file.py b/support/testing/tests/package/test_file.py new file mode 100644 index 0000000000..84eadc5ead --- /dev/null +++ b/support/testing/tests/package/test_file.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestFile(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_FILE=y + BR2_ROOTFS_OVERLAY="{infra.filepath("tests/package/test_file/rootfs-overlay")}" + 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]) + self.emulator.login() + + self.assertRunOk("file --version") + + tests = [ + ("", "plain-text.txt", "ASCII text"), + ("-i", "plain-text.txt", "text/plain"), + ("", "plain-text.txt.gz", "gzip compressed data"), + ("-i", "plain-text.txt.gz", "application/gzip"), + ("-z", "plain-text.txt.gz", "ASCII text"), + ("", "random-data.bin", "data"), + ("-i", "random-data.bin", "application/octet-stream"), + ("", "code.c", "C source"), + ("-i", "code.c", "text/x-c"), + ("", "script.sh", "POSIX shell script"), + ("-i", "script.sh", "text/x-shellscript"), + ("", "script.py", "Python script"), + ("", "/usr/share/misc/magic.mgc", "magic binary file for file"), + ("", "/usr/bin/file", "ELF"), + ("", "/dev/zero", "character special"), + ("", "/", "directory"), + ("-h", "symlink-to-plain-text.txt", "symbolic link"), + ("-L", "symlink-to-plain-text.txt", "ASCII text") + ] + for opt_str, path, pattern in tests: + cmd = f"file {opt_str} '{path}'" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0, f"Failed to run '{cmd}'") + self.assertIn(pattern, "\n".join(out)) diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/code.c b/support/testing/tests/package/test_file/rootfs-overlay/root/code.c new file mode 100644 index 0000000000..7095eaca31 --- /dev/null +++ b/support/testing/tests/package/test_file/rootfs-overlay/root/code.c @@ -0,0 +1,9 @@ +#include +#include + +int +main(void) +{ + printf("Hello Buildroot!\n"); + exit(EXIT_SUCCESS); +} diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt b/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt new file mode 100644 index 0000000000..1c5aa36037 --- /dev/null +++ b/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt @@ -0,0 +1 @@ +This is a plain text file... diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt.gz b/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt.gz new file mode 100644 index 0000000000..95d398f8d1 Binary files /dev/null and b/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt.gz differ diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/random-data.bin b/support/testing/tests/package/test_file/rootfs-overlay/root/random-data.bin new file mode 100644 index 0000000000..eea0ae8b76 Binary files /dev/null and b/support/testing/tests/package/test_file/rootfs-overlay/root/random-data.bin differ diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/script.py b/support/testing/tests/package/test_file/rootfs-overlay/root/script.py new file mode 100755 index 0000000000..79191b3048 --- /dev/null +++ b/support/testing/tests/package/test_file/rootfs-overlay/root/script.py @@ -0,0 +1,3 @@ +#! /usr/bin/env python3 + +print("Hello Buildroot!") diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/script.sh b/support/testing/tests/package/test_file/rootfs-overlay/root/script.sh new file mode 100755 index 0000000000..75b2d5e017 --- /dev/null +++ b/support/testing/tests/package/test_file/rootfs-overlay/root/script.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +echo "Hello Buildroot!" diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/symlink-to-plain-text.txt b/support/testing/tests/package/test_file/rootfs-overlay/root/symlink-to-plain-text.txt new file mode 120000 index 0000000000..a3ae3c0058 --- /dev/null +++ b/support/testing/tests/package/test_file/rootfs-overlay/root/symlink-to-plain-text.txt @@ -0,0 +1 @@ +plain-text.txt \ No newline at end of file From bubu at git.sr.ht Mon Feb 5 22:28:12 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 23:28:12 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: remove unused import from sample_python_crossbar Message-ID: <170717267442.23753.14671176069067053494-0@git.sr.ht> From: Marcus Hoffmann Signed-off-by: Marcus Hoffmann --- support/testing/tests/package/sample_python_crossbar.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/sample_python_crossbar.py b/support/testing/tests/package/sample_python_crossbar.py index 8160a37219..3695fe92c0 100644 --- a/support/testing/tests/package/sample_python_crossbar.py +++ b/support/testing/tests/package/sample_python_crossbar.py @@ -1,4 +1,3 @@ -import os import crossbar crossbar.run(["version"]) -- 2.38.5 From peter at korsgaard.com Mon Feb 5 22:38:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:38:02 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: new sqlite runtime test In-Reply-To: <20240112195610.151822-1-ju.o@free.fr> (Julien Olivain's message of "Fri, 12 Jan 2024 20:56:10 +0100") References: <20240112195610.151822-1-ju.o@free.fr> Message-ID: <87ttmm8rlh.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 22:40:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:40:18 +0100 Subject: [Buildroot] [PATCH] package/sqlite: use SPDX identifier for license In-Reply-To: <20240110165111.3937223-1-christian@klarinett.li> (Christian Hitz via buildroot's message of "Wed, 10 Jan 2024 17:51:11 +0100") References: <20240110165111.3937223-1-christian@klarinett.li> Message-ID: <87plxa8rhp.fsf@48ers.dk> >>>>> "Christian" == Christian Hitz via buildroot writes: > From: Christian Hitz > Signed-off-by: Christian Hitz Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 22:39:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:39:47 +0100 Subject: [Buildroot] [git commit] package/sqlite: use SPDX identifier for license Message-ID: <20240205224101.73F5A86E93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ddd257ca23e6bcf60676bcd292035fe99e6cbf62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The SPDX identifier for the sqlite license is "blessing": https://spdx.org/licenses/blessing.html Signed-off-by: Christian Hitz Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 99b1c4aa71..b54bd9580c 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -8,7 +8,7 @@ SQLITE_VERSION = 3.44.2 SQLITE_TAR_VERSION = 3440200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2023 -SQLITE_LICENSE = Public domain +SQLITE_LICENSE = blessing SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite SQLITE_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 5 22:38:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:38:20 +0100 Subject: [Buildroot] [git commit] support/testing: new sqlite runtime test Message-ID: <20240205224101.696E386E92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b63c21379491461b5a910a171dcd7f4a6c06e9a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_sqlite.py | 101 +++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5467e465d6..2d3d2cdda8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1826,6 +1826,7 @@ F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py +F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_tcl.py diff --git a/support/testing/tests/package/test_sqlite.py b/support/testing/tests/package/test_sqlite.py new file mode 100644 index 0000000000..215703d7f2 --- /dev/null +++ b/support/testing/tests/package/test_sqlite.py @@ -0,0 +1,101 @@ +import os + +import infra.basetest + + +class TestSQLite(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_SQLITE=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + db_file = "buildroot.db" + db_backup = "db_dump.sql" + + def run_sql_query(self, query): + cmd = f'sqlite3 "{self.db_file}" "{query}"' + self.assertRunOk(cmd) + + def create_tables(self): + sql_query = "CREATE TABLE fruits (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE colors (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE fruit_colors (" + sql_query += "fruit_id integer REFERENCES fruits(id), " + sql_query += "color_id integer REFERENCES colors(id), " + sql_query += "UNIQUE (fruit_id, color_id));" + self.run_sql_query(sql_query) + + def insert_data(self): + fruits = ["Banana", "Blueberry", "Orange", "Raspberry"] + fruit_id = 1 + for fruit in fruits: + sql_query = "INSERT INTO fruits (id, name) " + sql_query += f"VALUES ({fruit_id}, '{fruit}');" + self.run_sql_query(sql_query) + fruit_id += 1 + + colors = ["Blue", "Orange", "Red", "Yellow"] + color_id = 1 + for color in colors: + sql_query = "INSERT INTO colors (id, name) " + sql_query += f"VALUES ({color_id}, '{color}');" + self.run_sql_query(sql_query) + color_id += 1 + + fruit_colors = [(1, 4), (2, 1), (3, 2), (4, 3)] + for fruit_color in fruit_colors: + fruit_id, color_id = fruit_color + sql_query = "INSERT INTO fruit_colors (fruit_id, color_id) " + sql_query += f"VALUES ({fruit_id}, {color_id});" + self.run_sql_query(sql_query) + + def query_database(self): + sql_query = "SELECT " + sql_query += "fruits.name AS fruit, colors.name AS color " + sql_query += "FROM fruits, colors, fruit_colors " + sql_query += "WHERE fruits.id = fruit_colors.fruit_id " + sql_query += "AND colors.id = fruit_colors.color_id " + sql_query += "ORDER BY fruit;" + self.run_sql_query(sql_query) + + 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]) + self.emulator.login() + + # The sqlite3 binary can execute. + self.assertRunOk("sqlite3 --version") + + self.create_tables() + self.insert_data() + self.query_database() + + sql_query = "UPDATE fruits SET name = 'Lemon' WHERE id = 1;" + self.run_sql_query(sql_query) + + # Dump the test database for a backup. + cmd = f'echo .dump | sqlite3 "{self.db_file}" > "{self.db_backup}"' + self.assertRunOk(cmd) + + # Drop all the tables. + tables = ["fruit_colors", "fruits", "colors"] + for table in tables: + sql_query = f"DROP TABLE {table};" + self.run_sql_query(sql_query) + + # Restore the backup. + cmd = f'sqlite3 "{self.db_file}" < "{self.db_backup}"' + self.assertRunOk(cmd) + + # Query on last time our data, to check the backup restoration + # succeeded. + self.query_database() From peter at korsgaard.com Mon Feb 5 22:46:26 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:46:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-hwdata: bump to version 2.4.1 In-Reply-To: <20240109081917.4070744-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 9 Jan 2024 01:19:17 -0700") References: <20240109081917.4070744-1-james.hilliard1@gmail.com> Message-ID: <87le7y8r7h.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Drop no longer required license file download. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Mon Feb 5 22:41:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:41:33 +0100 Subject: [Buildroot] [git commit] package/re2: bump to version 2024-02-01 Message-ID: <20240205224648.58A9586E98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb803fbd91e0b6c0d74a90a15858d18743ed68bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 5f590aba6e..543c416087 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a re2-2023-11-01.tar.gz +sha256 cd191a311b84fcf37310e5cd876845b4bf5aee76fdd755008eef3b6478ce07bb re2-2024-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b81a64f2e9..b962b53e3f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2023-11-01 +RE2_VERSION = 2024-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 5 22:47:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:47:23 +0100 Subject: [Buildroot] [PATCH] package/re2: bump to version 2024-02-01 In-Reply-To: <20240205203521.201702-1-buildroot@heine.tech> References: <20240205203521.201702-1-buildroot@heine.tech> Message-ID: Michael, All, On 2024-02-05 21:35 +0100, Michael Nosthoff via buildroot spake thusly: > Signed-off-by: Michael Nosthoff Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/re2/re2.hash | 2 +- > package/re2/re2.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/re2/re2.hash b/package/re2/re2.hash > index 5f590aba6e..543c416087 100644 > --- a/package/re2/re2.hash > +++ b/package/re2/re2.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a re2-2023-11-01.tar.gz > +sha256 cd191a311b84fcf37310e5cd876845b4bf5aee76fdd755008eef3b6478ce07bb re2-2024-02-01.tar.gz > sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > index b81a64f2e9..b962b53e3f 100644 > --- a/package/re2/re2.mk > +++ b/package/re2/re2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -RE2_VERSION = 2023-11-01 > +RE2_VERSION = 2024-02-01 > RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) > RE2_LICENSE = BSD-3-Clause > RE2_LICENSE_FILES = LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Mon Feb 5 22:48:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:48:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-idna: bump to version 3.6 In-Reply-To: <20240109082244.4072761-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 9 Jan 2024 01:22:44 -0700") References: <20240109082244.4072761-1-james.hilliard1@gmail.com> Message-ID: <87h6im8r4g.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > License file hash changed due to year update: > https://github.com/kjd/idna/commit/89cd0612146a50a720e5aef8f040ca8ed4c6274b > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 22:48:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:48:20 +0100 Subject: [Buildroot] [git commit] package/python-hwdata: bump to version 2.4.1 Message-ID: <20240205224845.1D9F086EAB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beef64d5ea34577f7539d4323d05a0c59bd612c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required license file download. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-hwdata/python-hwdata.hash | 6 +++--- package/python-hwdata/python-hwdata.mk | 13 ++----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/package/python-hwdata/python-hwdata.hash b/package/python-hwdata/python-hwdata.hash index 0c7ca31476..57c2dd0003 100644 --- a/package/python-hwdata/python-hwdata.hash +++ b/package/python-hwdata/python-hwdata.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hwdata/json -md5 dccf3b28d06fb9c6f56875e148356c24 hwdata-2.3.7.tar.gz -sha256 9e5c96be38d9218ffde40834d4ca03344b8dfaed29c8c5afe0030125ea03db03 hwdata-2.3.7.tar.gz -# Locally computed +md5 0344fe7a3e21041c2ef0ed36ee2bef18 hwdata-2.4.1.tar.gz +sha256 9bad80237c81cc091615179d665a3ef1213acca4caa378ff037c81f34538cde9 hwdata-2.4.1.tar.gz +# Locally computed sha256 checksums sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/python-hwdata/python-hwdata.mk b/package/python-hwdata/python-hwdata.mk index 5e968ce847..c277eebccc 100644 --- a/package/python-hwdata/python-hwdata.mk +++ b/package/python-hwdata/python-hwdata.mk @@ -4,20 +4,11 @@ # ################################################################################ -PYTHON_HWDATA_VERSION = 2.3.7 +PYTHON_HWDATA_VERSION = 2.4.1 PYTHON_HWDATA_SOURCE = hwdata-$(PYTHON_HWDATA_VERSION).tar.gz -PYTHON_HWDATA_SITE = https://files.pythonhosted.org/packages/15/26/f5bc1b42129fbcbd1c99c29714af1685fc89e2cf37680a9930d4fcac1808 +PYTHON_HWDATA_SITE = https://files.pythonhosted.org/packages/ff/ec/4a6e57d765a63f7e9a8c5348f0bf3f7d39243dc5bc695fa1e887ca5856c8 PYTHON_HWDATA_SETUP_TYPE = setuptools PYTHON_HWDATA_LICENSE = GPL-2.0+ PYTHON_HWDATA_LICENSE_FILES = LICENSE -# There is no LICENSE file in the PyPi tarball, but it is available in -# upstream git repository: -PYTHON_HWDATA_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/xsuchy/python-hwdata/python-hwdata-$(PYTHON_HWDATA_VERSION)-1/LICENSE - -define PYTHON_HWDATA_ADD_LICENSE_FILE - cp $(PYTHON_HWDATA_DL_DIR)/LICENSE $(@D) -endef -PYTHON_HWDATA_POST_EXTRACT_HOOKS += PYTHON_HWDATA_ADD_LICENSE_FILE - $(eval $(python-package)) From peter at korsgaard.com Mon Feb 5 22:48:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:48:21 +0100 Subject: [Buildroot] [git commit] package/python-idna: bump to version 3.6 Message-ID: <20240205224845.289B386EAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70601ca41c2bb67d056a4c6e5710647385acda29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License file hash changed due to year update: https://github.com/kjd/idna/commit/89cd0612146a50a720e5aef8f040ca8ed4c6274b Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-idna/python-idna.hash | 6 +++--- package/python-idna/python-idna.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index 3a758a6eac..5e6ac716a2 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 13ea24e076212b6baae1135a116d1e0e idna-3.4.tar.gz -sha256 814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 idna-3.4.tar.gz +md5 70f4beef4feb196ac64b75a93271f53c idna-3.6.tar.gz +sha256 9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca idna-3.6.tar.gz # Locally computed sha256 checksums -sha256 a2d6e4d940bd24dbe7b9645cde19a9792cc51db7ae0d5acd301ac860caa3e836 LICENSE.md +sha256 cb2faf0ca18c6d387ec7cb66f321939fba6e67e9dac09d31477cb9d8d3fe6899 LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 3976cb1518..eb92432bd3 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 3.4 +PYTHON_IDNA_VERSION = 3.6 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/8b/e1/43beb3d38dba6cb420cefa297822eac205a277ab43e5ba5d5c46faf96438 +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/bf/3f/ea4b9117521a1e9c50344b909be7886dd00a519552724809bb1f486986c2 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = flit From romain.naour at smile.fr Mon Feb 5 22:49:22 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 23:49:22 +0100 Subject: [Buildroot] [autobuild.buildroot.net] runtime issues analyses In-Reply-To: <20240130064740.9A544417EA@smtp4.osuosl.org> References: <20240130064740.9A544417EA@smtp4.osuosl.org> Message-ID: <28f127e3-b8f8-4ed2-8fa8-d92b50d4884a@smile.fr> Hello, Le 30/01/2024 ? 07:47, Thomas Petazzoni via buildroot a ?crit?: > Hello, > [...] > > Gitlab CI results for 2024-01-29 > ================================ > > Detail of runtime-test failures for master > ------------------------------------------ > > runtime-test | link to the job | orph? > --------------------------+---------------------------------------------------------------+------ > TestCpioDracutGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162462 | ORPH > ...ioDracutGlibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162463 | ORPH > TestCpioDracutMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162465 | ORPH > ...pioDracutMuslMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162468 | ORPH > TestCpioDracutUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162470 | ORPH > ...oDracutUclibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162471 | ORPH Dracut issue under discussion: http://lists.busybox.net/pipermail/buildroot/2024-February/684145.html > TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162761 | ORPH The drisw_glx driver is broken in Mesa 23.x due to dri3 header added unconditionally while the driver can be built without dri3 [1] Surprisingly, the glxinfo test log shows that mesa tried to load zink gallium driver while it was not enabled at build time. Indeed there is no such option in Buildroot. MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so [1] https://gitlab.freedesktop.org/mesa/mesa/-/commit/1887368df4166ae854245c0306d43661ef120e42 > TestGrubX8664EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162292 | ORPH Fixed by: https://gitlab.com/buildroot.org/buildroot/-/commit/4f565b52225785bfa268ea19c4c347917d38ade4 > TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163014 | ORPH > TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163031 | ORPH weird python error: Sorry: IndentationError: expected an indented block after function definition on line 6 (plugin_test.py, line 8) > TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163045 | ORPH > ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163051 | ORPH error[E0432]: unresolved import `std::sync::atomic::AtomicI64` > ...PythonPy3MagicWormhole | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163069 | ORPH Not sure why the test failed... > TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163109 | ORPH Fixed by: https://gitlab.com/buildroot.org/buildroot/-/commit/393f5494187072533a1c69b82a26cf1f6d203a26 > TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163138 | ORPH Fixed by: https://gitlab.com/buildroot.org/buildroot/-/commit/c43f12293d3a6668a79f5cfece402d46a87a473e From yann.morin.1998 at free.fr Mon Feb 5 22:49:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:49:15 +0100 Subject: [Buildroot] [git commit] support/testing: remove unused import from sample_python_crossbar Message-ID: <20240205225539.C4B1486EB1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=420d34a8ad20bc1aefb7ca0c50e7d2beae1d85ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- support/testing/tests/package/sample_python_crossbar.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/sample_python_crossbar.py b/support/testing/tests/package/sample_python_crossbar.py index 8160a37219..3695fe92c0 100644 --- a/support/testing/tests/package/sample_python_crossbar.py +++ b/support/testing/tests/package/sample_python_crossbar.py @@ -1,4 +1,3 @@ -import os import crossbar crossbar.run(["version"]) From yann.morin.1998 at free.fr Mon Feb 5 22:55:44 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:55:44 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: remove unused import from sample_python_crossbar In-Reply-To: <170717267442.23753.14671176069067053494-0@git.sr.ht> References: <170717267442.23753.14671176069067053494-0@git.sr.ht> Message-ID: Marcus, All, On 2024-02-05 23:28 +0100, ~bubu spake thusly: > From: Marcus Hoffmann > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/testing/tests/package/sample_python_crossbar.py | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/support/testing/tests/package/sample_python_crossbar.py b/support/testing/tests/package/sample_python_crossbar.py > index 8160a37219..3695fe92c0 100644 > --- a/support/testing/tests/package/sample_python_crossbar.py > +++ b/support/testing/tests/package/sample_python_crossbar.py > @@ -1,4 +1,3 @@ > -import os > import crossbar > > crossbar.run(["version"]) > -- > 2.38.5 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From hanyuan-z at qq.com Tue Feb 6 02:40:58 2024 From: hanyuan-z at qq.com (hanyuan) Date: Tue, 6 Feb 2024 10:40:58 +0800 Subject: [Buildroot] [PATCH v2 1/2] configs/milkv_duo: new defconfig In-Reply-To: References: Message-ID: Hello Giulio, Thanks! It?s nice to get your reviews. Let me explain some of them. > 2024?2?6? 01:25?Giulio Benetti ??? > > Hi Hanyuan, > > thank for contributing, > one important note is to swap Patch 1/2 and 2/2. This is because they > are bisectable this way since on Patch 1/2 you enable packages appearing > in Patch 2/2, also, Got it. Should I later sent the Patch V3 and make them look like: [v3,1/2] package/milkv-duo: add packages for milkv-duo [v3,2/2] configs/milkv_duo: new defconfig > can you please provide the board product webpage URL here? > And also some ION indications too? Got it. I would append more info to the readme.txt about what the ION means. > All this if statement is redundant with the else part. > Can you add a variable like: > FIPTOOL_ARGUMENTS = genfip ${BINARIES_DIR}/fip.bin \ > --MONITOR_RUNADDR=0x80000000 \ > --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ > --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ > --NAND_INFO=00000000 \ > --BL2=${BINARIES_DIR}/bl2.bin \ > --BLCP_IMG_RUNADDR=0x05200200 \ > --BLCP_PARAM_LOADADDR=0 \ > --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ > --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ > --LOADER_2ND=${BINARIES_DIR}/u-boot.bin \ > > and then you add or not the remaining BLCP* variables below and execute > ${BINARIES_DIR}/fiptool.py ${FIPTOOL_ARGUMENTS} > Then this nested if statement and.. > ..this are redundant too. Can you provide a single if-else-fi statement > outside the main if statement... > ... here? > Sorry for that. OK, I would make these lines look better. > Is CXX needed by any package selected here? At that time I submitted the patch I haven?t understand the buildroot?s minimal philosophy too much. Sorry for that. I would remove this line. > here you need: > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > here you need: > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y OK. I will add them. > For the rest the patch looks good and builds fine using utils/docker-run except package htop that fails to build due to gcc ICE 109809 for which > I've sent a patch: > https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 > > So this patchset depends on patchset above for htop gcc ICE. I think I should tell you this. In fact I encountered another gcc bug when using all the t-head?s optimizations with the glibc. The gcc reported internal errors when we +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" So we have to use musl and find this bug is not reported anymore. Maybe the htop compiling bug comes from these optimizations. I would have a try what would happen if we disable all the t-head features and then compile the htop. If it is really the t-head?s problem, maybe we can let the t-head?s optimizations go. Thanks again for your careful review! Best regards, Hanyuan From asd617140123 at gmail.com Tue Feb 6 03:33:03 2024 From: asd617140123 at gmail.com (Nigel Wang) Date: Tue, 6 Feb 2024 11:33:03 +0800 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. Message-ID: <20240206033303.38280-1-asd617140123@gmail.com> From: nigel_wang configs/cubieboard4_defconfig : add defconfig for cubieboard4. board/cubietech/cubieboard4/extlinux.conf: using the config to make device can boot uboot/kernel correctly. board/cubietech/cubieboard4/genimage.cfg: Adjust boot dtb/sdcard memory layout. board/cubietech/cubieboard4/post-image.sh: using extlinux.conf in the file, it can use "genimage" to generate sdcard image. modified: configs/cubieboard4_defconfig: remove unnecessary option. Replaced boot.cmd by extlinux.conf. Append name in DEVELOPERS file. Signed-off-by: Nigel Wang --- DEVELOPERS | 4 +++ board/cubietech/cubieboard4/extlinux.conf | 5 +++ board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ 5 files changed, 104 insertions(+) create mode 100644 board/cubietech/cubieboard4/extlinux.conf create mode 100644 board/cubietech/cubieboard4/genimage.cfg create mode 100755 board/cubietech/cubieboard4/post-image.sh create mode 100644 configs/cubieboard4_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a03018ab2b..bffb8f2069 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3297,3 +3297,7 @@ F: package/quazip/ F: package/shapelib/ F: package/simple-mail/ F: package/tinc/ + +N: Nigel Wang +F: board/cubietech/cubieboard4/ +F: configs/cubieboard4_defconfig diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf new file mode 100644 index 0000000000..5084e2237b --- /dev/null +++ b/board/cubietech/cubieboard4/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /boot/zImage + devicetree /sun9i-a80-cubieboard4.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg new file mode 100644 index 0000000000..f1dee13923 --- /dev/null +++ b/board/cubietech/cubieboard4/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the Cubieboard2 +# Based in the Orange Pi genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun9i-a80-cubieboard4.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh new file mode 100755 index 0000000000..e37b960a4d --- /dev/null +++ b/board/cubietech/cubieboard4/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig new file mode 100644 index 0000000000..0592fe4a2d --- /dev/null +++ b/configs/cubieboard4_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From asd617140123 at gmail.com Tue Feb 6 03:34:36 2024 From: asd617140123 at gmail.com (Nigel Wang) Date: Tue, 6 Feb 2024 11:34:36 +0800 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. Message-ID: <20240206033436.38436-1-asd617140123@gmail.com> From: nigel_wang This is a new defconfig for cubieboard4. The following is board's detail. - SOC: sunxiA80. - DRAM: 2GiB DDR3 @ 672MHZ. - NAND: 8GBeMMC - Power: DC 5V. - Network: Wifi 80211 b/g/n. - Ethernet: RTL8211E reference: https://linux-sunxi.org/Cubietech_Cubieboard4 Board support package includes the following components: - mainline Linux Kernel 6.6.8 - mainline U-boot 2021.10. Signed-off-by: Nigel Wang --- DEVELOPERS | 4 +++ board/cubietech/cubieboard4/extlinux.conf | 5 +++ board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ 5 files changed, 104 insertions(+) create mode 100644 board/cubietech/cubieboard4/extlinux.conf create mode 100644 board/cubietech/cubieboard4/genimage.cfg create mode 100755 board/cubietech/cubieboard4/post-image.sh create mode 100644 configs/cubieboard4_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a03018ab2b..bffb8f2069 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3297,3 +3297,7 @@ F: package/quazip/ F: package/shapelib/ F: package/simple-mail/ F: package/tinc/ + +N: Nigel Wang +F: board/cubietech/cubieboard4/ +F: configs/cubieboard4_defconfig diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf new file mode 100644 index 0000000000..5084e2237b --- /dev/null +++ b/board/cubietech/cubieboard4/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /boot/zImage + devicetree /sun9i-a80-cubieboard4.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg new file mode 100644 index 0000000000..f1dee13923 --- /dev/null +++ b/board/cubietech/cubieboard4/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the Cubieboard2 +# Based in the Orange Pi genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun9i-a80-cubieboard4.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh new file mode 100755 index 0000000000..e37b960a4d --- /dev/null +++ b/board/cubietech/cubieboard4/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig new file mode 100644 index 0000000000..0592fe4a2d --- /dev/null +++ b/configs/cubieboard4_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From fran.millocs at live.com.ar Tue Feb 6 04:14:50 2024 From: fran.millocs at live.com.ar (franco ariel) Date: Tue, 6 Feb 2024 04:14:50 +0000 Subject: [Buildroot] Best board to fast boot Message-ID: Hello guys! I few weeks ago I started working with buildroot on rpi4, and it's look amazing, thanks to the community I was able to run a flutter app on my rpi4. But now, I want to keep going forward with my project, so ?Witch one are the best board to achieve te best boot time to a Qt application? I was looking for the Rockpro64 from pine but I'm not sure, since there is not so much information about this board. What do you think it will be good for my project? On rpi4 I was able to get 10sec boot time until the qt app shows up. And I want to achieve less than 7s. Thank you so much to all. Franco -------------- next part -------------- An HTML attachment was scrubbed... URL: From asd617140123 at gmail.com Tue Feb 6 05:04:13 2024 From: asd617140123 at gmail.com (Nigel Wang) Date: Tue, 6 Feb 2024 13:04:13 +0800 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. Message-ID: <20240206050413.38810-1-asd617140123@gmail.com> From: nigel_wang add Cubieboard4 board support. - SOC: Allwinner A80. - DRAM: 2GiB DDR3 @ 672MHZ. - NAND: 8GBeMMC - Power: DC 5V. - Wifi: 80211 b/g/n. (module is AP6330) Reference: https://hirokun.jp/AP6330.pdf - Ethernet: RTL8211E Reference: https://linux-sunxi.org/Cubietech_Cubieboard4 Board support package includes the following components: - mainline Linux Kernel 6.6.8 - mainline U-boot 2021.10. Signed-off-by: Nigel Wang --- DEVELOPERS | 4 +++ board/cubietech/cubieboard4/extlinux.conf | 5 +++ board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ 5 files changed, 104 insertions(+) create mode 100644 board/cubietech/cubieboard4/extlinux.conf create mode 100644 board/cubietech/cubieboard4/genimage.cfg create mode 100755 board/cubietech/cubieboard4/post-image.sh create mode 100644 configs/cubieboard4_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a03018ab2b..bffb8f2069 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3297,3 +3297,7 @@ F: package/quazip/ F: package/shapelib/ F: package/simple-mail/ F: package/tinc/ + +N: Nigel Wang +F: board/cubietech/cubieboard4/ +F: configs/cubieboard4_defconfig diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf new file mode 100644 index 0000000000..5084e2237b --- /dev/null +++ b/board/cubietech/cubieboard4/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /boot/zImage + devicetree /sun9i-a80-cubieboard4.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg new file mode 100644 index 0000000000..f1dee13923 --- /dev/null +++ b/board/cubietech/cubieboard4/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the Cubieboard2 +# Based in the Orange Pi genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun9i-a80-cubieboard4.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh new file mode 100755 index 0000000000..e37b960a4d --- /dev/null +++ b/board/cubietech/cubieboard4/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig new file mode 100644 index 0000000000..0592fe4a2d --- /dev/null +++ b/configs/cubieboard4_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From kilian.zinnecker at mail.de Tue Feb 6 06:41:13 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Tue, 06 Feb 2024 07:41:13 +0100 Subject: [Buildroot] [help] configs/rock5b_defconfig: Switch to mainline kernel Message-ID: <2716329.mvXUDI8C0e@laptop> Hello, The board support for the Rock5b uses a custom kernel. However, there already exists some mainline support for its SoC, the Rockchip RK3588 [1]. Some of it seems to already be present in kernel 6.6, which is the current latest version in buildroot. I would like to change the kernel used for the Rock5b from custom to mainline. Unfortunately I face a challenge. In order to get kernel log output on the serial interface, I changed the consosole from ttyS2,1500000n8 to serial2,1500000n8 in the kernel bootargs (as seen in Sebastian Reichel's Kernel Recipes 2023 talk). After that, it shows the kernel messages, but it never reaches a shell: [ 0.321600] mmc_host mmc1: Bus speed (slot 0) = 400000Hz (slot req 400000Hz, actual 400000HZ div = 0) [ 0.370827] hub 4-0:1.0: USB hub found [ 0.371218] hub 4-0:1.0: 1 port detected [ 0.372291] Waiting for root device /dev/mmcblk0p2... [ 0.382457] mmc_host mmc1: Bus speed (slot 0) = 198000000Hz (slot req 200000000Hz, actual 198000000HZ div = 0) [ 0.497629] usb 1-1: new high-speed USB device number 2 using ehci-platform [ 0.655570] hub 1-1:1.0: USB hub found [ 0.656181] hub 1-1:1.0: 4 ports detected [ 0.794063] dwmmc_rockchip fe2c0000.mmc: Successfully tuned phase to 118 [ 0.794672] mmc1: new ultra high speed SDR104 SDHC card at address 5048 [ 0.796162] mmcblk1: mmc1:5048 SD32G 29.7 GiB [ 0.802500] GPT:Primary header thinks Alt. header is not at the end of the disk. [ 0.803155] GPT:563351 != 62357503 [ 0.803459] GPT:Alternate GPT header not at the end of the disk. [ 0.803985] GPT:563351 != 62357503 [ 0.804287] GPT: Use GNU Parted to correct GPT errors. [ 0.804761] mmcblk1: p1 p2 [ 31.717905] vdd_gpu_s0: disabling [ 115.285576] random: crng init done Of course it could be, that it is just not configured anymore to put a shell on the serial interface, but I already tried to address that with: BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="serial2" However, that did not seem to help. Could it be, that there is something wrong with the SD card formatting? It at least complains about it, but I am too unfamiliar with that, so I don't know whether it is a problem. I also tried to change the rootfs partition in the bootargs mmcblk0p2 to mmcblk1p2, but then the boot got stuck at some other place. As kernel defconfig I use the default arm64 defconfig (BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y). Could that also be an issue, i.e., that I should provide a tailored one, e.g., by starting from the one used by the custom kernel? I appreciate any help or suggestions, thanks and best regards, Kilian [1] https://gitlab.collabora.com/hardware-enablement/rockchip-3588/notes-for-rockchip-3588/-/blob/main/mainline-status.md From thomas.petazzoni at bootlin.com Tue Feb 6 06:55:11 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 06 Feb 2024 06:55:11 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-05 Message-ID: Hello, Autobuild statistics for 2024-02-05 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 5 | 3 | 0 | 8 | 2023.11.x | 0 | 5 | 0 | 5 | master | 45 | 44 | 0 | 89 | Classification of failures by reason for master ----------------------------------------------- libpthsem-2.0.8 | 5 unknown | 5 host-sentry-cli-2.20.3 | 3 attr-2.5.2 | 2 glibc-2.38-44-gd37c2b20a478... | 2 gobject-introspection-1.76.1 | 2 libnss-3.97 | 2 libressl-3.8.2 | 2 linux-6.6.15 | 2 Makefile:727: target-finalize | 2 cegui-00b4e1fe174da53b7ed72... | 1 elfutils-0.189 | 1 eza-0.16.0 | 1 fs/jffs2/jffs2.mk:71: /home... | 1 host-rust-1.74.1 | 1 libabseil-cpp-20230802.1 | 1 libarchive-3.7.2 | 1 linux-5.10.162-cip24-rt10 | 1 linux-pam-1.6.0 | 1 linux-tools | 1 memtest86-6.20 | 1 openssh-9.6p1 | 1 rsync-3.2.7 | 1 stunnel-5.71 | 1 util-linux-2.39.2 | 1 v4l2loopback-0.12.7 | 1 valgrind-3.22.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/dff81bf3ca25bd0fab6085ad6f1bd19d3f8db2ce | microblaze | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/a381bb39e8422bb8ddf118a576ea2c705844637f | mips | cegui-00b4e1fe174da53b7ed72... | NOK | http://autobuild.buildroot.net/results/44890d6ee506c7428f7a1898a0f73222efc5b426 | m68k | elfutils-0.189 | NOK | http://autobuild.buildroot.net/results/7c863e736ad4896f26dcc895c8ffba3e95e360ae | ORPH armeb | eza-0.16.0 | NOK | http://autobuild.buildroot.net/results/b61bda2df58ef0a866f747d8a05e49986d043aa4 | powerpc64 | fs/jffs2/jffs2.mk:71: /home... | NOK | http://autobuild.buildroot.net/results/386e725437b9d4bf4000cd8aafae9080dfe8bc8d | powerpc | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/54f1a4303530f18a140577e575c7084a20468aef | riscv64 | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/d9c6a4db7fd02c45cebb5a9687b636cd0fc99a0c | sh4aeb | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/51289ee681e3971e65dd24eaa8c025fbc2888529 | ORPH nios2 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/c253a6bce2ee6afad5c36bf84d0d00a4714d024c | ORPH aarch64 | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/4613ff68965114990566a923c306682bd8c80a82 | riscv64 | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/fc1f5f93d2425d923e2fce51eda6bd11886485b5 | riscv32 | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/5db3fcc34cb47d0d948aadbf37f6449ed34e918c | xtensa | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/9709362a679a1a8b302eb51bebec363a62fabe25 | mips64el | libabseil-cpp-20230802.1 | NOK | http://autobuild.buildroot.net/results/e2a44832f3965e4586de399672827e35524ebc0f | s390x | libarchive-3.7.2 | NOK | http://autobuild.buildroot.net/results/bb88b8c73112af3383625b3cc06134e3eaeaf41e | mips64el | libnss-3.97 | NOK | http://autobuild.buildroot.net/results/2dd0dfb535c8fe9079be4c9e743e342344c89e9a | powerpc64le | libnss-3.97 | NOK | http://autobuild.buildroot.net/results/765a13e3d9377a8042415b0e83b5fe22eda84e8a | arc | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/34e7ce3144b9aa253440e5621fce14990e266afc | arm | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/9c7d636d3532805ef14d6cfb7fa62900c065ab60 | aarch64 | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/ed9e1a47a668cdeec71a40f13cbb37dbf608d0ce | or1k | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/17794a49cdb4748f6282a1b8602e323a7b18d296 | microblaze | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/ef75e960a3cbccb38c14631762937e183f4827b3 | arceb | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/c18ec22b16d7ce0857d228ae8dc51c876ce0e928 | ORPH or1k | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/aeb55fceceeb5938db68411be446e9c462c78bcd | ORPH arc | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/9d9471934f55f45cbd5d6658a73e7cb33e247b14 | ORPH mips64 | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/49f8d5e73465cec539c067382c515be73656816b | ORPH sh4a | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/797a0bde20d4a257ffdc66c38577fc139a6e5bea | ORPH mips64el | linux-pam-1.6.0 | NOK | http://autobuild.buildroot.net/results/f07360f33010a2cf19aace266faae14a834bd9a4 | ORPH x86_64 | linux-tools | NOK | http://autobuild.buildroot.net/results/80abb2e78ad63e28b5717ec4a54aa3fbc2b2251a | ORPH armeb | Makefile:727: target-finalize | NOK | http://autobuild.buildroot.net/results/668800cc90bcd69aca63a20ca19ddbe53c8571ec | mips64 | Makefile:727: target-finalize | NOK | http://autobuild.buildroot.net/results/de0be520e60019becd07523f08448a66070a9f7e | i686 | memtest86-6.20 | NOK | http://autobuild.buildroot.net/results/5a37403206d1af3317c05ee63d92d4fa0488c53c | powerpc64 | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/75e39ca694f09e5ef8bc7f31bf63dff7f0876816 | ORPH microblazeel | rsync-3.2.7 | NOK | http://autobuild.buildroot.net/results/b8589e42e14dbf54809284d577593896cf99fa69 | aarch64_be | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/5d6fcf716f41ab0b7ad465ed7ed2a7e5465bbefd | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/addebf4d3d3f837f03ee80ea8161a75da9a703e4 | armeb | unknown | NOK | http://autobuild.buildroot.net/results/a385e8d7f3441b3867105a75dccd49c8ccc47386 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/7f398fbfe488d8701ca3a04c02d704a72771d5cd | mips | unknown | NOK | http://autobuild.buildroot.net/results/1cc45b9e1516a1ab08120765f6b2a304e9c18208 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/098c036f661b1793df31c0bdc7420252eb1bfdf6 | sh4 | util-linux-2.39.2 | NOK | http://autobuild.buildroot.net/results/1b214c4c2bd524ac2a47b80da2e0252c628be6d0 | ORPH mips64 | v4l2loopback-0.12.7 | NOK | http://autobuild.buildroot.net/results/af5adb61ea068c3be571c34f49ef8d493a3f99ed | powerpc | valgrind-3.22.0 | NOK | http://autobuild.buildroot.net/results/1a2562d8d8a31312b3e2d84ba3e7ec21b05315a7 | ORPH Classification of failures by reason for 2023.02.x -------------------------------------------------- linux-6.1.72 | 1 mosquitto-2.0.18 | 1 raptor-2.0.15 | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | linux-6.1.72 | NOK | http://autobuild.buildroot.net/results/bbea1197de634560cdce29ef3277724bf3253443 | ORPH or1k | mosquitto-2.0.18 | NOK | http://autobuild.buildroot.net/results/ac2575c5aba9531acb6bcd08753237d0f7d1bbe3 | arceb | raptor-2.0.15 | NOK | http://autobuild.buildroot.net/results/b7b62e544182f31a8de1ccb3850a23497b69d17d | ORPH Classification of failures by reason for 2023.11.x -------------------------------------------------- e2fsprogs-1.47.0 | 1 gobject-introspection-1.76.1 | 1 libressl-3.8.2 | 1 spice-0.15.0 | 1 unknown | 1 Detail of failures for 2023.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4aeb | e2fsprogs-1.47.0 | NOK | http://autobuild.buildroot.net/results/45f21ce9dbeec86eae8df45022b4fb408c1ada88 | ORPH powerpc | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/d5c69580e4948da4145de172c4357b9859e605e8 | ORPH arm | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/44faea13cdcfe54f6ec2b49aa49cd778a2b8f059 | ORPH x86_64 | spice-0.15.0 | NOK | http://autobuild.buildroot.net/results/c1ab7fbc5c62671238a07ef91feccea573008329 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/0bbbb0e8264369cd552b58a6941c63bfaf72ecc0 | Gitlab CI results for 2024-02-05 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestCpioDracutGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853966 | ORPH ...ioDracutGlibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853979 | ORPH TestCpioDracutMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854009 | ORPH ...pioDracutMuslMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854017 | ORPH TestCpioDracutUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854027 | ORPH ...oDracutUclibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854034 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854423 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854455 | ORPH TestGrubX8664EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854785 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854810 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854842 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854855 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854998 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093855074 | ORPH -- http://autobuild.buildroot.net From hanyuan-z at qq.com Tue Feb 6 08:06:03 2024 From: hanyuan-z at qq.com (Hanyuan Zhao) Date: Tue, 6 Feb 2024 16:06:03 +0800 Subject: [Buildroot] [PATCH v3 2/2] configs/milkv_duo: new defconfig In-Reply-To: <20240206080603.28916-1-hanyuan-z@qq.com> References: <20240206080603.28916-1-hanyuan-z@qq.com> Message-ID: Milk-V Duo is an ultra-compact embedded RISC-V development platform based on the CV1800B chip. It can run Linux and RTOS, providing a reliable, low-cost, and high-performance platform for professionals, industrial ODMs, AIoT enthusiasts, DIY hobbyists, and creators. https://milkv.io/duo Co-authored-by: Emil S Co-authored-by: GP Orcullo Signed-off-by: Hanyuan Zhao --- board/milkv/duo/genimage.cfg | 25 ++++++++ board/milkv/duo/post-image.sh | 47 +++++++++++++++ board/milkv/duo/readme.txt | 54 +++++++++++++++++ configs/milkv_duo_musl_riscv64_defconfig | 63 ++++++++++++++++++++ configs/milkv_duo_musl_riscv64_ion_defconfig | 63 ++++++++++++++++++++ 5 files changed, 252 insertions(+) create mode 100644 board/milkv/duo/genimage.cfg create mode 100755 board/milkv/duo/post-image.sh create mode 100644 board/milkv/duo/readme.txt create mode 100644 configs/milkv_duo_musl_riscv64_defconfig create mode 100644 configs/milkv_duo_musl_riscv64_ion_defconfig diff --git a/board/milkv/duo/genimage.cfg b/board/milkv/duo/genimage.cfg new file mode 100644 index 0000000000..1fd74f845a --- /dev/null +++ b/board/milkv/duo/genimage.cfg @@ -0,0 +1,25 @@ +image boot.vfat { + vfat { + files = { + "fip.bin", + "boot.sd", + } + } + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/milkv/duo/post-image.sh b/board/milkv/duo/post-image.sh new file mode 100755 index 0000000000..c58233003e --- /dev/null +++ b/board/milkv/duo/post-image.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +########################################################### +# File: post-image.sh +# Author: GP Orcullo +# Hanyuan Zhao +# Description: this sh will make the fip.bin and boot.sd, +# then pack everything to an image file. +########################################################### + +FIPTOOL_OPTS="genfip ${BINARIES_DIR}/fip.bin \ + --MONITOR_RUNADDR=0x80000000 \ + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ + --NAND_INFO=00000000 \ + --BL2=${BINARIES_DIR}/bl2.bin \ + --BLCP_IMG_RUNADDR=0x05200200 \ + --BLCP_PARAM_LOADADDR=0 \ + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin" + +if [ -f ${BINARIES_DIR}/cvirtos.bin ]; then + FIPTOOL_OPTS="${FIPTOOL_OPTS} \ + --BLCP=${BINARIES_DIR}/empty.bin \ + --BLCP_2ND=${BINARIES_DIR}/cvirtos.bin \ + --BLCP_2ND_RUNADDR=0x83f40000" + echo "[Duo Post-Image fiptool.py] Integrating FreeRTOS" +fi + +${BINARIES_DIR}/fiptool.py ${FIPTOOL_OPTS}\ +> ${BINARIES_DIR}/fip.log 2>&1 +if [ -f ${BINARIES_DIR}/fip.bin ]; then + echo "[Duo Post-Image fiptool.py] > fip.bin generated!" +fi + +cp ${BINARIES_DIR}/u-boot.dtb ${BINARIES_DIR}/cv1800b_milkv_duo_sd.dtb +lzma -fk ${BINARIES_DIR}/Image +mkimage -f ${BINARIES_DIR}/multi.its ${BINARIES_DIR}/boot.sd +if [ -f ${BINARIES_DIR}/boot.sd ]; then + echo "[Duo Post-Image] > boot.sd generated!" +fi +support/scripts/genimage.sh -c $(pwd)/board/milkv/duo/genimage.cfg +gzip -fk ${BINARIES_DIR}/sdcard.img +if [ -f ${BINARIES_DIR}/sdcard.img ]; then + echo "[Duo Post-Image] > sdcard.img generated!" +fi diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt new file mode 100644 index 0000000000..1623fa97c5 --- /dev/null +++ b/board/milkv/duo/readme.txt @@ -0,0 +1,54 @@ +Milk-V Duo (https://milkv.io/docs/duo/overview) + +Intro +===== + +Milk-V Duo is an ultra-compact embedded development platform +based on the rv64 CV1800B chip. It can run Linux and RTOS, +providing a reliable, cost-effective, and high-performance +platform for professionals, industrial ODMs, AIoT enthusiasts, +DIY enthusiasts, and creators. + +How to build it +=============== + +Configure Buildroot: + + $ make milkv_duo_musl_riscv64_defconfig + +The milkv_duo_musl_riscv64_defconfig will by default provide +the full 64MiB free RAM. If you want to build with memory +reserved for ION (generalized memory manager in linux, i.e. +some memory will be reserved for the camera algorithms), please try: + + $ make milkv_duo_musl_riscv64_ion_defconfig + +For more information about the ION, please refer to + +https://github.com/milkv-duo/duo-buildroot-sdk/blob/develop/README.md?plain=1#L436 + +Modify configuration if needed, e.g. add more packages to target: + + $ make menuconfig + +Compile everything and build the SD card image: + + $ make + +To configure the linux kernel or u-boot: + + $ make linux-menuconfig + +To rebuild something (e.g. linux): + + $ make linux-rebuild + +How to write the SD card +======================== + +Once the build process is finished you will have an image +called "sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_musl_riscv64_defconfig new file mode 100644 index 0000000000..4155ad1f57 --- /dev/null +++ b/configs/milkv_duo_musl_riscv64_defconfig @@ -0,0 +1,63 @@ +# Architecture +BR2_riscv=y +BR2_riscv_g=y +BR2_RISCV_ISA_RVC=y + +# Linux headers same as kernel 5.10 series +BR2_KERNEL_HEADERS_5_10=y + +# Using gcc13 and musl to have t-head's optimization and features +BR2_GCC_VERSION_13_X=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" + +# opensbi +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_GIT=y +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_OPENSBI_FW_FDT_PATH=y + +# u-boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_64mb" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_LINUX_KERNEL_LZMA=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# SD card image generating script +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" + +# rootfs +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Packages for the sdcard image generating +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB=y +BR2_PACKAGE_MILKV_DUO_PINMUX=y +BR2_PACKAGE_MILKV_DUO_FEATURES=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y + +# Host packages for the sdcard image generating +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_LZMA_ALONE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/milkv_duo_musl_riscv64_ion_defconfig b/configs/milkv_duo_musl_riscv64_ion_defconfig new file mode 100644 index 0000000000..7af0d9a44d --- /dev/null +++ b/configs/milkv_duo_musl_riscv64_ion_defconfig @@ -0,0 +1,63 @@ +# Architecture +BR2_riscv=y +BR2_riscv_g=y +BR2_RISCV_ISA_RVC=y + +# Linux headers same as kernel 5.10 series +BR2_KERNEL_HEADERS_5_10=y + +# Using gcc13 and musl to have t-head's optimization and features +BR2_GCC_VERSION_13_X=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" + +# opensbi +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_GIT=y +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_OPENSBI_FW_FDT_PATH=y + +# u-boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_ion" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_LINUX_KERNEL_LZMA=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# SD card image generating script +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" + +# rootfs +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Packages for the sdcard image generating +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y +BR2_PACKAGE_MILKV_DUO_PINMUX=y +BR2_PACKAGE_MILKV_DUO_FEATURES=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y + +# Host packages for the sdcard image generating +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_LZMA_ALONE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -- 2.34.1 From hanyuan-z at qq.com Tue Feb 6 08:06:02 2024 From: hanyuan-z at qq.com (Hanyuan Zhao) Date: Tue, 6 Feb 2024 16:06:02 +0800 Subject: [Buildroot] [PATCH v3 1/2] package/milkv-duo: add packages for milkv-duo Message-ID: This commit adds the packages that are necessary for milkv-duo image's generating and configurations. https://github.com/milkv-duo/duo-buildroot-sdk/ Co-authored-by: Emil S Signed-off-by: Hanyuan Zhao --- package/Config.in | 2 + package/milkv-duo-libraries/Config.in | 63 ++++++++++ .../milkv-duo-libraries.mk | 51 +++++++++ .../milkv-duo-smallcore-freertos/Config.in | 21 ++++ .../milkv-duo-smallcore-freertos.mk | 108 ++++++++++++++++++ 5 files changed, 245 insertions(+) create mode 100644 package/milkv-duo-libraries/Config.in create mode 100644 package/milkv-duo-libraries/milkv-duo-libraries.mk create mode 100644 package/milkv-duo-smallcore-freertos/Config.in create mode 100644 package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk diff --git a/package/Config.in b/package/Config.in index 7fc383da83..2c560377b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -564,6 +564,8 @@ endmenu source "package/memtester/Config.in" source "package/memtool/Config.in" source "package/mhz/Config.in" + source "package/milkv-duo-libraries/Config.in" + source "package/milkv-duo-smallcore-freertos/Config.in" source "package/minicom/Config.in" source "package/msr-tools/Config.in" source "package/nanocom/Config.in" diff --git a/package/milkv-duo-libraries/Config.in b/package/milkv-duo-libraries/Config.in new file mode 100644 index 0000000000..ea4d0aadac --- /dev/null +++ b/package/milkv-duo-libraries/Config.in @@ -0,0 +1,63 @@ +config BR2_PACKAGE_MILKV_DUO_LIBRARIES + bool "milk-v duo libraries" + depends on BR2_riscv + help + Those packages provide board-specific firmware and + hardware tools for the Milk-V Duo platform. + + https://github.com/milkv-duo/milkv-duo-buildroot-libraries + +if BR2_PACKAGE_MILKV_DUO_LIBRARIES + +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + bool "milkv-duo-firmware-fsbl" + select BR2_PACKAGE_HOST_MTOOLS + help + This package is obtained from + https://github.com/milkv-duo/duo-buildroot-sdk, + from which we download the first stage bootloader source and + compile it, generating the ATF bl2.bin. At the mean time, we + will use the fiptool.py in this package to create the binary + file fip.bin to pack the opensbi, u-boot and so on. + + If you intend to generate the whole sdcard image or the + fip.bin for milk-v duo, you must say Y to this package! + +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB + bool "64 MiB free ram" + default n + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + help + Say Y to this will disable the ION in order to + have the all 64MiB Free memory. + +config BR2_PACKAGE_MILKV_DUO_PINMUX + bool "duo-pinmux tool" + default n + help + Say Y to this will compile the duo-pinmux, which can + get or set function of any Milk-V Duo GPIO Pin. More info at + + https://milkv.io/docs/duo/application-development/pinmux + +config BR2_PACKAGE_MILKV_DUO_FEATURES + bool "duo usb features" + default n + select BR2_PACKAGE_DHCPCD + select BR2_PACKAGE_DNSMASQ + select BR2_PACKAGE_DROPBEAR + select BR2_PACKAGE_LRZSZ + select BR2_PACKAGE_HTOP + help + Say Y to this will copy the cvitek usb shell scripts to have + the USB features. The role could be configured at + + /etc/milkv-duo.conf + + Supported usb functions are rndis, host and mass-storage. + By default Duo has the LED blinking. It could be configured + in that conf file as well. Say Y to this will also select + some packages automatically, to have the same experience + with the official release. + +endif diff --git a/package/milkv-duo-libraries/milkv-duo-libraries.mk b/package/milkv-duo-libraries/milkv-duo-libraries.mk new file mode 100644 index 0000000000..a5cf40a764 --- /dev/null +++ b/package/milkv-duo-libraries/milkv-duo-libraries.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# milkv-duo-libraries +# +################################################################################ + +MILKV_DUO_LIBRARIES_VERSION = f359994bd497f942bb67734280d81f6640c7c168 +MILKV_DUO_LIBRARIES_SITE = $(call github,milkv-duo,milkv-duo-buildroot-libraries,$(MILKV_DUO_LIBRARIES_VERSION)) +MILKV_DUO_LIBRARIES_INSTALL_STAGING = YES +MILKV_DUO_LIBRARIES_DEPENDENCIES = host-python3 host-mtools +MILKV_DUO_LIBRARIES_FSBL_64MB = ION + +ifeq ($(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB),y) +MILKV_DUO_LIBRARIES_FSBL_64MB = 64MB +endif + +define MILKV_DUO_LIBRARIES_BUILD_CMDS + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ + $(MAKE) -C $(@D)/firmware \ + ARCH=riscv BOOT_CPU=riscv CHIP_ARCH=cv180x \ + PROJECT_FULLNAME=cv1800b_milkv_duo_sd \ + CROSS_COMPILE=$(TARGET_CROSS) \ + FREE_RAM_SIZE=$(MILKV_DUO_LIBRARIES_FSBL_64MB) \ + bl2; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + -I $(@D)/pinmux/include $(@D)/pinmux/src/*.c -o $(@D)/pinmux/duo-pinmux; \ + fi +endef + +define MILKV_DUO_LIBRARIES_INSTALL_STAGING_CMDS + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ + $(INSTALL) -D -m 0755 $(@D)/firmware/build/cv180x/bl2.bin $(BINARIES_DIR)/bl2.bin; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/chip_conf.bin $(BINARIES_DIR)/chip_conf.bin; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/fiptool.py $(BINARIES_DIR)/fiptool.py; \ + $(INSTALL) -D -m 0644 $(@D)/firmware/plat/cv180x/multi.its $(BINARIES_DIR)/multi.its; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/test/cv181x/ddr_param.bin $(BINARIES_DIR)/ddr_param.bin; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ + $(INSTALL) -D -m 0755 $(@D)/pinmux/duo-pinmux $(TARGET_DIR)/usr/bin/; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_FEATURES) = y ]; then \ + cp $(@D)/overlay/* -r $(TARGET_DIR); \ + fi +endef + +$(eval $(generic-package)) diff --git a/package/milkv-duo-smallcore-freertos/Config.in b/package/milkv-duo-smallcore-freertos/Config.in new file mode 100644 index 0000000000..8503932461 --- /dev/null +++ b/package/milkv-duo-smallcore-freertos/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS + bool "milkv-duo-smallcore-freertos" + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + select BR2_PACKAGE_HOST_CMAKE + help + This package is obtained from + https://github.com/milkv-duo/duo-buildroot-sdk, + from which we download the FreeRTOS ported to Milk-V Duo + into the Buildroot. This FreeRTOS will run in the small core + and will not do anything because it is simply a template + with some basic UART demos. You can realize your own ideas + by adding code to + + output/build/milkv-duo-smallcore-freertos-hash/cvitek/task + /comm/src/riscv64/comm_main.c + + If you say Y, then every time you make Buildroot, it will + automatically compile and include the FreeRTOS into the + fip.bin, which will then be packed into sdcard.img + + https://github.com/milkv-duo/milkv-duo-smallcore-freertos diff --git a/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk new file mode 100644 index 0000000000..52028f3c90 --- /dev/null +++ b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk @@ -0,0 +1,108 @@ +################################################################################ +# +# milkv-duo-smallcore-freertos +# +################################################################################ + +MILKV_DUO_SMALLCORE_FREERTOS_VERSION = 1dac21ade58b0f9a0a531cfe93ee319337a88d80 +MILKV_DUO_SMALLCORE_FREERTOS_SITE = $(call github,milkv-duo,milkv-duo-smallcore-freertos,$(MILKV_DUO_SMALLCORE_FREERTOS_VERSION)) +MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING = YES +MILKV_DUO_SMALLCORE_FREERTOS_DEPENDENCIES = host-cmake host-ninja +MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV = CROSS_COMPILE=$(TARGET_CROSS) + +define MILKV_DUO_SMALLCORE_FREERTOS_BUILD_CMDS + if [ ! -d $(@D)/cvitek/build/arch ]; then \ + mkdir -p $(@D)/cvitek/build/arch; \ + fi + + cd $(@D)/cvitek/build/arch && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DTOP_DIR=$(@D)/cvitek \ + -DRUN_TYPE=CVIRTOS \ + -DRUN_ARCH=riscv64 \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + $(@D)/cvitek/arch + cd $(@D)/cvitek/build/arch && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + + if [ ! -d $(@D)/cvitek/build/kernel ]; then \ + mkdir -p $(@D)/cvitek/build/kernel; \ + fi + + cd $(@D)/cvitek/build/kernel && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DRUN_ARCH=riscv64 \ + -DTOP_DIR=$(@D)/cvitek \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + $(@D)/cvitek/kernel + cd $(@D)/cvitek/build/kernel && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + + if [ ! -d $(@D)/cvitek/build/common ]; then \ + mkdir -p $(@D)/cvitek/build/common; \ + fi + + cd $(@D)/cvitek/build/common && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DRUN_ARCH=riscv64 \ + -DTOP_DIR=$(@D)/cvitek \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + $(@D)/cvitek/common + cd $(@D)/cvitek/build/common && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + + if [ ! -d $(@D)/cvitek/build/hal ]; then \ + mkdir -p $(@D)/cvitek/build/hal; \ + fi + + cd $(@D)/cvitek/build/hal && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DRUN_ARCH=riscv64 \ + -DTOP_DIR=$(@D)/cvitek \ + -DRUN_TYPE=CVIRTOS \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + -DBOARD_FPGA=n \ + $(@D)/cvitek/hal/cv180x + cd $(@D)/cvitek/build/hal && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + + if [ ! -d $(@D)/cvitek/build/driver ]; then \ + mkdir -p $(@D)/cvitek/build/driver; \ + fi + + cd $(@D)/cvitek/build/driver && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DRUN_ARCH=riscv64 \ + -DTOP_DIR=$(@D)/cvitek \ + -DRUN_TYPE=CVIRTOS \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DBOARD_FPGA=n \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + $(@D)/cvitek/driver + cd $(@D)/cvitek/build/driver && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + + if [ ! -d $(@D)/cvitek/build/task ]; then \ + mkdir -p $(@D)/cvitek/build/task; \ + fi + + cd $(@D)/cvitek/build/task && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DRUN_ARCH=riscv64 \ + -DRUN_TYPE=CVIRTOS \ + -DTOP_DIR=$(@D)/cvitek \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DBOARD_FPGA=n \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + $(@D)/cvitek/task + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target cvirtos.bin -- -v +endef + +define MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0755 $(@D)/cvitek/install/bin/cvirtos.bin $(BINARIES_DIR)/cvirtos.bin + if [ ! -e $(BINARIES_DIR)/empty.bin ]; then \ + touch $(BINARIES_DIR)/empty.bin; \ + fi +endef + +$(eval $(generic-package)) -- 2.34.1 From peter at korsgaard.com Tue Feb 6 08:15:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 09:15:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR In-Reply-To: <20240205201342.2995-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:13:42 +0100") References: <20240205201342.2995-1-fontaine.fabrice@gmail.com> Message-ID: <87cyta80vn.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:green_end:sftpserver has been deprecated in favor of > cpe:2.3:a:greenend:sftpserver in December 2022: > > Version > Product > > > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 08:15:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 09:15:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjwt: disable examples In-Reply-To: <20240205201625.5203-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:16:25 +0100") References: <20240205201625.5203-1-fontaine.fabrice@gmail.com> Message-ID: <878r3y80vi.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Examples are enabled by default since the addition of the package in > commit 7251775773011e7da38e3a33c6817eceab6a9dfa > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 08:15:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 09:15:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/lua-http: set CPE variables In-Reply-To: <20240205204146.284303-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:41:46 +0100") References: <20240205204146.284303-1-fontaine.fabrice@gmail.com> Message-ID: <874jem80v7.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 08:12:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 09:12:31 +0100 Subject: [Buildroot] [git commit] package/libjwt: disable examples Message-ID: <20240206081556.8D41B86ED4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c413d16037e412f81f6cf735f6b4fd0b9723bf2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Examples are enabled by default since the addition of the package in commit 7251775773011e7da38e3a33c6817eceab6a9dfa Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libjwt/libjwt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 7e2ea03b09..1643aa7b7a 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -11,6 +11,7 @@ LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE +LIBJWT_CONF_OPTS = --without-examples ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBJWT_CONF_OPTS += --with-openssl From peter at korsgaard.com Tue Feb 6 08:12:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 09:12:47 +0100 Subject: [Buildroot] [git commit] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR Message-ID: <20240206081556.99DBD86ED6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4adc8b3d24708f180bcbf68df1d0723dc058f68e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:green_end:sftpserver has been deprecated in favor of cpe:2.3:a:greenend:sftpserver in December 2022: Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gesftpserver/gesftpserver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 5a3ab0536c..5a7106d707 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -12,7 +12,7 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors -GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_VENDOR = greenend GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling From peter at korsgaard.com Tue Feb 6 08:13:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 09:13:09 +0100 Subject: [Buildroot] [git commit] package/lua-http: set CPE variables Message-ID: <20240206081556.A810886ED7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ccf4048e43b022feba225b976e55ed3e503d424 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lua-http/lua-http.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index 7fbb09038e..df3e2c0059 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -10,5 +10,7 @@ LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_LICENSE = MIT LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md +LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) +LUA_HTTP_CPE_ID_VENDOR = daurnimator $(eval $(luarocks-package)) From peter at korsgaard.com Tue Feb 6 08:16:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 09:16:27 +0100 Subject: [Buildroot] [PATCH] package/uacme: bump version to 1.7.5 In-Reply-To: (Nicola Di Lieto's message of "Mon, 5 Feb 2024 21:47:06 +0100") References: Message-ID: <87zfwe6m90.fsf@48ers.dk> >>>>> "Nicola" == Nicola Di Lieto writes: > Signed-off-by: Nicola Di Lieto Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 08:16:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 09:16:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/cpio: bump to version 2.15 In-Reply-To: <20240205204954.297515-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:49:54 +0100") References: <20240205204954.297515-1-fontaine.fabrice@gmail.com> Message-ID: <87v8726m8d.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00006.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 08:15:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 09:15:57 +0100 Subject: [Buildroot] [git commit] package/uacme: bump version to 1.7.5 Message-ID: <20240206081733.04F8686EE3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7ee5f3b0e3ef703bafd007cc99da10312d99b9e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Nicola Di Lieto Signed-off-by: Peter Korsgaard --- package/uacme/uacme.hash | 2 +- package/uacme/uacme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash index 063b0b57ac..9a274bf394 100644 --- a/package/uacme/uacme.hash +++ b/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a638fe0878dba8fdda62f89e7a284243edbcd31b92c11b5cfdc7d3efd9547bca uacme-1.7.4.tar.gz +sha256 596b2fba75fedc7a410dd71583c828642ecd486dfdcfde109dfebb82a374abbe uacme-1.7.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index b260bd85ee..f02e522761 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.7.4 +UACME_VERSION = 1.7.5 # Released versions are on branch upstream/latest, tagged as # upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not # include .tarball-version From peter at korsgaard.com Tue Feb 6 08:16:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 09:16:41 +0100 Subject: [Buildroot] [git commit] package/cpio: bump to version 2.15 Message-ID: <20240206081733.0F9B086EE4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71d971fa3bba0528011b4c6419ebbdcd420cf493 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00006.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cpio/cpio.hash | 6 +++--- package/cpio/cpio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cpio/cpio.hash b/package/cpio/cpio.hash index c67fbc1f61..e300a5f084 100644 --- a/package/cpio/cpio.hash +++ b/package/cpio/cpio.hash @@ -1,6 +1,6 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00001.html -sha1 cbac50a61079b6f3bdcf9ffe42171d9257cfe877 cpio-2.14.tar.bz2 +# From https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00006.html +sha1 db5e3845eb5475ddcb7e8915c3a1458a0c13d787 cpio-2.15.tar.bz2 # Locally calculated after checking pgp signature -sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.14.tar.bz2 +sha256 937610b97c329a1ec9268553fb780037bcfff0dcffe9725ebc4fd9c1aa9075db cpio-2.15.tar.bz2 # Locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk index 911d16822b..452271c8f1 100644 --- a/package/cpio/cpio.mk +++ b/package/cpio/cpio.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPIO_VERSION = 2.14 +CPIO_VERSION = 2.15 CPIO_SOURCE = cpio-$(CPIO_VERSION).tar.bz2 CPIO_SITE = $(BR2_GNU_MIRROR)/cpio CPIO_CONF_OPTS = --bindir=/bin From bugzilla at busybox.net Tue Feb 6 08:48:32 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 06 Feb 2024 08:48:32 +0000 Subject: [Buildroot] [Bug 15850] Nodejs failes to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15850 --- Comment #2 from Dr I J Ormshaw --- The problem only seems to occur with Target Architecture Variant of x86-64-v4. With Target Architecture Variant x86-64 and skylake nodejs compiles successfully -- You are receiving this mail because: You are on the CC list for the bug. From arnout at mind.be Tue Feb 6 08:49:29 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 09:49:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rtoml: bump to version 0.10.0 In-Reply-To: References: <20240111052225.2922249-1-james.hilliard1@gmail.com> <687fa6af-4d6f-4890-bd3a-c420ede9cdfd@mind.be> Message-ID: On 05/02/2024 18:21, James Hilliard wrote: > On Mon, Feb 5, 2024 at 4:29?AM Arnout Vandecappelle wrote: >> >> >> >> On 11/01/2024 06:22, James Hilliard wrote: >>> Migrate from setuptools-rust to maturin infrastructure. >>> >>> Signed-off-by: James Hilliard >>> --- >>> package/python-rtoml/python-rtoml.hash | 2 +- >>> package/python-rtoml/python-rtoml.mk | 6 +++--- >>> 2 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash >>> index 04d22ed1a4..59f17d9d62 100644 >>> --- a/package/python-rtoml/python-rtoml.hash >>> +++ b/package/python-rtoml/python-rtoml.hash >>> @@ -1,4 +1,4 @@ >>> # Locally calculated after vendoring >>> -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz >>> +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz >> >> Same problem: >> >> ERROR: while checking hashes from package/python-rtoml//python-rtoml.hash >> ERROR: rtoml-0.10.0.tar.gz has wrong sha256 hash: >> ERROR: expected: 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 >> ERROR: got : 624cc1ff2b3fdea42aeee3a4d1537d37431ec001870dfee1e04a12bd3076a2d3 > > Hmm, I'm unable to reproduce this issue. I suppose that if you already have the vendored dependencies in your cargo cache (BR2_DL_DIR/br-cargo-home) you have the same timestamps on them. But if those are the ones that cause the issue, Yann's series is not going to help, because it only affects the repositories we pull from git ourselves, not the ones that are done by cargo... Perhaps we should do a diffoscope to be sure where the difference is exactly. Could you take my copy from https://ftp.essensium.com/owncloud/index.php/s/WW2jtp5ozW61rMV and do the diffoscope? Regards, Arnout >>> # Locally computed sha256 checksums >>> sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE >>> diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk >>> index 819dcf3288..16f9dea573 100644 >>> --- a/package/python-rtoml/python-rtoml.mk >>> +++ b/package/python-rtoml/python-rtoml.mk >>> @@ -4,10 +4,10 @@ >>> # >>> ################################################################################ >>> >>> -PYTHON_RTOML_VERSION = 0.8.0 >>> +PYTHON_RTOML_VERSION = 0.10.0 >>> PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz >>> -PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 >>> -PYTHON_RTOML_SETUP_TYPE = setuptools-rust >>> +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/ca/b2/0e77a00e75ed582ec1c4c3a9e1eeed886a15c195bcce87b7daf1171c4115 >>> +PYTHON_RTOML_SETUP_TYPE = maturin >>> PYTHON_RTOML_LICENSE = MIT >>> PYTHON_RTOML_LICENSE_FILES = LICENSE >>> From marcus.folkesson at gmail.com Tue Feb 6 09:00:48 2024 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Tue, 6 Feb 2024 10:00:48 +0100 Subject: [Buildroot] [PATCH] package/makedevs: describe the recursive type in the README Message-ID: <20240206090048.2214719-1-marcus.folkesson@gmail.com> The recursive type is described everywhere else, so add it to the README as well. Signed-off-by: Marcus Folkesson --- package/makedevs/README | 1 + 1 file changed, 1 insertion(+) diff --git a/package/makedevs/README b/package/makedevs/README index 70844bf802..6c583609a5 100644 --- a/package/makedevs/README +++ b/package/makedevs/README @@ -26,6 +26,7 @@ where name is the file name, type can be one of: f: A regular file d: Directory + r: Directory recursively c: Character special device file b: Block special device file p: Fifo (named pipe) -- 2.43.0 From thomas.petazzoni at bootlin.com Tue Feb 6 08:56:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 09:56:21 +0100 Subject: [Buildroot] [git commit] package/rlwrap: new package Message-ID: <20240206085701.F3E0586EEF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a1f2fce0494388080af0a4130e62522c26fe4a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Matt Silva Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/rlwrap/Config.in | 42 ++++++++++++++++++++++++++++++++++++++++++ package/rlwrap/rlwrap.hash | 6 ++++++ package/rlwrap/rlwrap.mk | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2d3d2cdda8..c18ae46054 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2122,6 +2122,9 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ +N: Matt Silva +F: package/rlwrap/ + N: Mauro Condarelli F: package/mc/ F: package/python-autobahn/ diff --git a/package/Config.in b/package/Config.in index 7fc383da83..97f590e2b7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2690,6 +2690,7 @@ comment "Utilities" source "package/pinentry/Config.in" source "package/qprint/Config.in" source "package/ranger/Config.in" + source "package/rlwrap/Config.in" source "package/rtty/Config.in" source "package/screen/Config.in" source "package/screenfetch/Config.in" diff --git a/package/rlwrap/Config.in b/package/rlwrap/Config.in new file mode 100644 index 0000000000..0cb3e33fa7 --- /dev/null +++ b/package/rlwrap/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_RLWRAP + bool "rlwrap" + select BR2_PACKAGE_READLINE + help + rlwrap is a 'readline wrapper', a small utility that uses the + GNU Readline library to allow the editing of keyboard input + for any command. + + https://github.com/hanslub42/rlwrap + +if BR2_PACKAGE_RLWRAP + +config BR2_PACKAGE_RLWRAP_SPY_ON_READLINE + bool "spy on readline" + default y + help + If we want to keep the display tidy when re-sizing the + terminal window or printing multi-line prompts, we have to + know whether or not readline is in horizontal-scroll-mode + (i.e. wheter long lines are scrolled or wrapped). At present, + this involves a look at a private readline variable - if you + feel guilty about that, disable this option + +config BR2_PACKAGE_RLWRAP_HOMEGROWN_REDISPLAY + bool "homegrown redisplay" + help + Some people report double echoing of user input. Enabling this + option will cure the problem - though the display will then + flicker over slow connections (cf. BUGS) + +config BR2_PACKAGE_RLWRAP_MULTIBYTE_AWARE + bool "multibyte awareness" + default y + depends on BR2_USE_WCHAR + help + Prevent rlwrap from seeing multibyte characters as multiple + characters + +comment "rlwrap multibyte awareness needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + +endif diff --git a/package/rlwrap/rlwrap.hash b/package/rlwrap/rlwrap.hash new file mode 100644 index 0000000000..b7005e860e --- /dev/null +++ b/package/rlwrap/rlwrap.hash @@ -0,0 +1,6 @@ +# from https://github.com/hanslub42/rlwrap/releases/tag/0.46.1 +sha256 2711986a1248f6ac59e2aecf5586205835970040d300a42b4bf8014397e73e37 rlwrap-0.46.1.tar.gz + +# license files, locally calculated +sha256 656d25fab58016ac6ac11bb126709e4f860ea063d11795232eb55987172f78ff AUTHORS +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/rlwrap/rlwrap.mk b/package/rlwrap/rlwrap.mk new file mode 100644 index 0000000000..e3973e841b --- /dev/null +++ b/package/rlwrap/rlwrap.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# rlwrap +# +################################################################################ + +RLWRAP_VERSION = 0.46.1 +RLWRAP_SITE = https://github.com/hanslub42/rlwrap/releases/download/$(RLWRAP_VERSION) +RLWRAP_LICENSE = GPL-2.0+ +RLWRAP_LICENSE_FILES = AUTHORS COPYING + +RLWRAP_DEPENDENCIES = readline + +ifeq ($(BR2_PACKAGE_RLWRAP_SPY_ON_READLINE),y) +RLWRAP_CONF_OPTS += --enable-spy-on-readline +else +RLWRAP_CONF_OPTS += --disable-spy-on-readline +endif + +ifeq ($(BR2_PACKAGE_RLWRAP_HOMEGROWN_REDISPLAY),y) +RLWRAP_CONF_OPTS += --enable-homegrown-redisplay +else +RLWRAP_CONF_OPTS += --disable-homegrown-redisplay +endif + +ifeq ($(BR2_PACKAGE_RLWRAP_MULTIBYTE_AWARE),y) +RLWRAP_CONF_OPTS += --enable-multibyte-aware +else +RLWRAP_CONF_OPTS += --disable-multibyte-aware +endif + +define RLWRAP_REMOVE_FILTERS + $(RM) -rf $(TARGET_DIR)/usr/share/rlwrap/filters +endef +RLWRAP_POST_INSTALL_TARGET_HOOKS += RLWRAP_REMOVE_FILTERS + +$(eval $(autotools-package)) From romain.naour at smile.fr Tue Feb 6 09:22:00 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 10:22:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-bitstring: bump to version 4.1.4 In-Reply-To: <275220a4-24b2-4f21-b8bb-fae239a56d37@mind.be> References: <20240107114345.2795252-1-fontaine.fabrice@gmail.com> <275220a4-24b2-4f21-b8bb-fae239a56d37@mind.be> Message-ID: <49b59119-b7f6-4d60-b35f-5e353f82c829@smile.fr> Hello Fabrice, All, Le 05/02/2024 ? 14:26, Arnout Vandecappelle via buildroot a ?crit?: > > > On 07/01/2024 12:43, Fabrice Fontaine wrote: >> This bump will fix the following build failure raised since bump to >> version 4.1.2 in commit ce2bf7b96b9dba57bb31aca583283736af27afcc: >> >> *** Error compiling >> '/home/buildroot/autobuild/instance-0/output-1/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... >> Sorry: IndentationError: expected an indented block after function definition >> on line 6 (plugin_test.py, line 8) >> >> https://github.com/scott-griffiths/bitstring/blob/bitstring-4.1.4/release_notes.txt >> >> Fixes: >> ? - >> http://autobuild.buildroot.org/results/e6fac4cac16de94862e3b4697dd88e856bc9a398 >> >> Signed-off-by: Fabrice Fontaine > > ?Applied to master, thanks. I was looking at this issue before noticing this version bump but now the runtime test fail with: # python sample_python_bitstring.py Traceback (most recent call last): File "/root/sample_python_bitstring.py", line 1, in import bitstring File "/usr/lib/python3.11/site-packages/bitstring/__init__.py", line 64, in File "/usr/lib/python3.11/site-packages/bitstring/bits.py", line 15, in ModuleNotFoundError: No module named 'bitarray' Best regards, Romain > > ?Regards, > ?Arnout > >> --- >> ? package/python-bitstring/python-bitstring.hash | 4 ++-- >> ? package/python-bitstring/python-bitstring.mk?? | 4 ++-- >> ? 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/package/python-bitstring/python-bitstring.hash >> b/package/python-bitstring/python-bitstring.hash >> index c2ff9a69d5..1889983f47 100644 >> --- a/package/python-bitstring/python-bitstring.hash >> +++ b/package/python-bitstring/python-bitstring.hash >> @@ -1,5 +1,5 @@ >> ? # md5, sha256 from https://pypi.org/pypi/bitstring/json >> -md5? 1750c35e8e45f597725037d35eed9ba1? bitstring-4.1.2.tar.gz >> -sha256? c22283d60fd3e1a8f386ccd4f1915d7fe13481d6349db39711421e24d4a9cccf? >> bitstring-4.1.2.tar.gz >> +md5? 3909415d89586edabd577b62b0d0c1be? bitstring-4.1.4.tar.gz >> +sha256? 94f3f1c45383ebe8fd4a359424ffeb75c2f290760ae8fcac421b44f89ac85213? >> bitstring-4.1.4.tar.gz >> ? # Locally computed sha256 checksums >> ? sha256? 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea? >> LICENSE >> diff --git a/package/python-bitstring/python-bitstring.mk >> b/package/python-bitstring/python-bitstring.mk >> index 9a5d8dfe84..983491303d 100644 >> --- a/package/python-bitstring/python-bitstring.mk >> +++ b/package/python-bitstring/python-bitstring.mk >> @@ -4,9 +4,9 @@ >> ? # >> ? >> ################################################################################ >> ? -PYTHON_BITSTRING_VERSION = 4.1.2 >> +PYTHON_BITSTRING_VERSION = 4.1.4 >> ? PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz >> -PYTHON_BITSTRING_SITE = >> https://files.pythonhosted.org/packages/23/fc/b5ace4f51fea5bcc7f8cca8859748ea5eb941680b82a5b3687c980d9589b >> +PYTHON_BITSTRING_SITE = >> https://files.pythonhosted.org/packages/7f/07/0fd502a29127b968bada3d1824a8af997546d2b9ff73f00e800b3d9888cb >> ? PYTHON_BITSTRING_SETUP_TYPE = setuptools >> ? PYTHON_BITSTRING_LICENSE = MIT >> ? PYTHON_BITSTRING_LICENSE_FILES = LICENSE > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Tue Feb 6 09:25:45 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 10:25:45 +0100 Subject: [Buildroot] [help] configs/rock5b_defconfig: Switch to mainline kernel In-Reply-To: <2716329.mvXUDI8C0e@laptop> References: <2716329.mvXUDI8C0e@laptop> Message-ID: Hi Kilian, On 06/02/2024 07:41, kilian.zinnecker--- via buildroot wrote: > Hello, > > The board support for the Rock5b uses a custom kernel. However, there already > exists some mainline support for its SoC, the Rockchip RK3588 [1]. Some of it > seems to already be present in kernel 6.6, which is the current latest version > in buildroot. I would like to change the kernel used for the Rock5b from > custom to mainline. Unfortunately I face a challenge. > > In order to get kernel log output on the serial interface, I changed the > consosole from ttyS2,1500000n8 to serial2,1500000n8 in the kernel bootargs (as > seen in Sebastian Reichel's Kernel Recipes 2023 talk). After that, it shows > the kernel messages, but it never reaches a shell: > > [ 0.321600] mmc_host mmc1: Bus speed (slot 0) = 400000Hz (slot req > 400000Hz, actual 400000HZ div = 0) > [ 0.370827] hub 4-0:1.0: USB hub found > [ 0.371218] hub 4-0:1.0: 1 port detected > [ 0.372291] Waiting for root device /dev/mmcblk0p2... > [ 0.382457] mmc_host mmc1: Bus speed (slot 0) = 198000000Hz (slot req > 200000000Hz, actual 198000000HZ div = 0) > [ 0.497629] usb 1-1: new high-speed USB device number 2 using ehci-platform > [ 0.655570] hub 1-1:1.0: USB hub found > [ 0.656181] hub 1-1:1.0: 4 ports detected > [ 0.794063] dwmmc_rockchip fe2c0000.mmc: Successfully tuned phase to 118 > [ 0.794672] mmc1: new ultra high speed SDR104 SDHC card at address 5048 > [ 0.796162] mmcblk1: mmc1:5048 SD32G 29.7 GiB > [ 0.802500] GPT:Primary header thinks Alt. header is not at the end of the > disk. > [ 0.803155] GPT:563351 != 62357503 > [ 0.803459] GPT:Alternate GPT header not at the end of the disk. > [ 0.803985] GPT:563351 != 62357503 > [ 0.804287] GPT: Use GNU Parted to correct GPT errors. > [ 0.804761] mmcblk1: p1 p2 Clearly, the rootfs is on mmcblk1p2, not mmcblk0p2. So if you have mmcblk0p2 on your command line, and rootwait, it will just wait indefinitely for the rootfs to appear. > [ 31.717905] vdd_gpu_s0: disabling > [ 115.285576] random: crng init done That's pretty late for the RNG to be initialized, you'll need the RNG seeder from userspace - but this is enabled by default in Buildroot I think. > Of course it could be, that it is just not configured anymore to put a shell on > the serial interface, but I already tried to address that with: > > BR2_TARGET_GENERIC_GETTY=y > BR2_TARGET_GENERIC_GETTY_PORT="serial2" > > However, that did not seem to help. Could it be, that there is something wrong > with the SD card formatting? It at least complains about it, but I am too > unfamiliar with that, so I don't know whether it is a problem. That's normal. It's because the generated image is not the exact size of your SD card, so the backup GPT partition table is somewhere in the middle instead of at the end. You can run parted on your laptop after writing the SD card and before booting it to fix the issue. But it shouldn't make any difference at all for booting. > I also tried to > change the rootfs partition in the bootargs mmcblk0p2 to mmcblk1p2, but then > the boot got stuck at some other place. That other place is the interesting one, with mmcblk0p2 I would indeed expect it to stop where you've shown it above. > > As kernel defconfig I use the default arm64 defconfig > (BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y). Could that also be an issue, > i.e., that I should provide a tailored one, e.g., by starting from the one > used by the custom kernel? It's indeed possible that the arm64 defconfig misses some things that are needed by the RK3588, hard to say from here. But if it already gets to MMC enumeration, it looks like it's mostly working. Regards, Arnout > I appreciate any help or suggestions, thanks and best regards, > Kilian > > [1] https://gitlab.collabora.com/hardware-enablement/rockchip-3588/notes-for-rockchip-3588/-/blob/main/mainline-status.md > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Tue Feb 6 09:28:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 10:28:22 +0100 Subject: [Buildroot] [help] configs/rock5b_defconfig: Switch to mainline kernel In-Reply-To: References: <2716329.mvXUDI8C0e@laptop> Message-ID: <3a235bc3-897e-4dc0-b2a1-3573467e31e4@mind.be> On 06/02/2024 10:25, Arnout Vandecappelle wrote: > ?Hi Kilian, > > On 06/02/2024 07:41, kilian.zinnecker--- via buildroot wrote: > >> Of course it could be, that it is just not configured anymore to put a shell on >> the serial interface, but I already tried to address that with: >> >> BR2_TARGET_GENERIC_GETTY=y >> BR2_TARGET_GENERIC_GETTY_PORT="serial2" ?Oh, and it's safer to keep this at the default "console" - if you get kernel output on console, the getty on the same location should work fine. With "serial2" you have to be sure that that is really correct and that you're not confusing with the name in device tree or in U-Boot, both of which may be different. Actually, "serial2" is almost certainly wrong, serial ports almost always start with tty. ?Regards, ?Arnout From thomas.petazzoni at bootlin.com Tue Feb 6 09:44:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 10:44:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/rlwrap: new package In-Reply-To: <20240126024914.13825-1-dev@matt-silva.com> References: <20240126024914.13825-1-dev@matt-silva.com> Message-ID: <20240206104450.23163730@windsurf> Hello Matt, On Thu, 25 Jan 2024 21:49:14 -0500 Matt Silva wrote: > Signed-off-by: Matt Silva Thanks a lot for your contribution! I applied your patch to our master branch, after doing a number of changes, see below for the details. > package/Config.in | 1 + > package/rlwrap/Config.in | 58 ++++++++++++++++++++++++++++++++++++++ > package/rlwrap/rlwrap.hash | 6 ++++ > package/rlwrap/rlwrap.mk | 48 +++++++++++++++++++++++++++++++ > 4 files changed, 113 insertions(+) For all new packages, we require to have an entry in the DEVELOPERS file, so that you get notified if there are build failures for this package, or if the package needs to be update for security issues, or when there's a new release upstream. > +config BR2_PACKAGE_RLWRAP_DEBUG > + bool "enable debug" This option is not needed, it should be controlled by BR2_ENABLE_RUNTIME_DEBUG. Actually, I thought BR2_ENABLE_RUNTIME_DEBUG was automatically passing --enable-debug to all packages, but it's not the case. So if you care about debugging, we would need a follow-up patch that passes --enable-debug when BR2_ENABLE_RUNTIME_DEBUG is set. > +config BR2_PACKAGE_RLWRAP_PROC_MOUNTPOINT > + string "proc mountpoint" > + default "/proc" This option is not needed: Buildroot will always mount proc in /proc, and things will anyway break in all sorts of ways if proc is mounted elsewhere. > diff --git a/package/rlwrap/rlwrap.mk b/package/rlwrap/rlwrap.mk > new file mode 100644 > index 0000000000..6f9de8281c > --- /dev/null > +++ b/package/rlwrap/rlwrap.mk > @@ -0,0 +1,48 @@ > +################################################################################ > +# > +# rlwrap > +# > +################################################################################ > + > +# https://github.com/hanslub42/rlwrap/releases/download/0.46.1/rlwrap-0.46.1.tar.gz This comment is not needed. > + > +RLWRAP_VERSION = 0.46.1 > +RLWRAP_SOURCE = rlwrap-$(RLWRAP_VERSION).tar.gz This line is not needed, and actually triggers a "make check-package" warning. > +RLWRAP_SITE = https://github.com/hanslub42/rlwrap/releases/download/$(RLWRAP_VERSION) > +RLWRAP_LICENSE = GPL-2.0 The license really is GPL-2.0+. > +RLWRAP_LICENSE_FILES = AUTHORS COPYING > + > +RLWRAP_DEPENDENCIES = readline > + > +# --enable-spy-on-readline > +ifeq ($(BR2_PACKAGE_RLWRAP_SPY_ON_READLINE),y) > +RLWRAP_CONF_OPTS += --enable-spy-on-readline > +else > +RLWRAP_CONF_OPTS += --disable-spy-on-readline > +endif > + > +# --enable-homegrown-redisplay > +ifeq ($(BR2_PACKAGE_RLWRAP_HOMEGROWN_REDISPLAY),y) > +RLWRAP_CONF_OPTS += --enable-homegrown-redisplay > +else > +RLWRAP_CONF_OPTS += --disable-homegrown-redisplay > +endif > + > +# --enable-debug > +ifeq ($(BR2_PACKAGE_RLWRAP_DEBUG),y) > +RLWRAP_CONF_OPTS += --enable-debug > +else > +RLWRAP_CONF_OPTS += --disable-debug > +endif I dropped this part. > +# --enable-proc-mountpoint > +RLWRAP_CONF_OPTS += --enable-proc-mountpoint=$(BR2_PACKAGE_RLWRAP_PROC_MOUNTPOINT) And this part. Also, I added this: +define RLWRAP_REMOVE_FILTERS + $(RM) -rf $(TARGET_DIR)/usr/share/rlwrap/filters +endef +RLWRAP_POST_INSTALL_TARGET_HOOKS += RLWRAP_REMOVE_FILTERS Indeed, those filters are written in Python or Perl, and your package does not depend on them. In addition, the documentation says: Filters are `perl` or `python` plugins that enable complete (albeit somewhat fragile) control over `rlwrap`'s input and output, echo, prompt, history and completion. They aren't used a lot, and remain therefore somewhat untested. `rlwrap -z listing` lists the installed filters, `rlwrap -z ` displays a short help text for `` "They aren't used a lot". So for now, we drop them unconditionally. We can always revisit if someone needs them later. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 09:47:51 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 10:47:51 +0100 Subject: [Buildroot] [git commit] package/ruby: disable unsupported yjit Message-ID: <20240206094813.C617B86EF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3613cc9b3fe7d60e46ec7ddf5fe50a895797665 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The yjit feature requires rust toolchain support, since we don't currently handle setting up the rust toolchain for ruby lets disable this feature for now. This broke when ruby was bumped to version 3.3.0 in buildroot commit a01c278df7892c8a6736334aa008b2d7c09e9258. Fixes: linking static-library libruby-static.a LLVM ERROR: Invalid encoding make[2]: *** [Makefile:318: libruby-static.a] Aborted Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ruby/ruby.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index b2396010c5..4b9ce80e67 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -22,9 +22,14 @@ RUBY_CPE_ID_VENDOR = ruby-lang RUBY_DEPENDENCIES = host-pkgconf host-ruby HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) -RUBY_CONF_OPTS = --disable-install-doc --disable-rpath --disable-rubygems +RUBY_CONF_OPTS = \ + --disable-install-doc \ + --disable-rpath \ + --disable-rubygems \ + --disable-yjit HOST_RUBY_CONF_OPTS = \ --disable-install-doc \ + --disable-yjit \ --with-out-ext=curses,readline \ --without-gmp From thomas.petazzoni at bootlin.com Tue Feb 6 09:48:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 10:48:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/ruby: disable unsupported yjit In-Reply-To: <20240205183308.2120022-1-james.hilliard1@gmail.com> References: <20240205183308.2120022-1-james.hilliard1@gmail.com> Message-ID: <20240206104810.1e14c852@windsurf> On Mon, 5 Feb 2024 11:33:08 -0700 James Hilliard wrote: > The yjit feature requires rust toolchain support, since we don't > currently handle setting up the rust toolchain for ruby lets disable > this feature for now. > > This broke when ruby was bumped to version 3.3.0 in buildroot commit > a01c278df7892c8a6736334aa008b2d7c09e9258. > > Fixes: > linking static-library libruby-static.a > LLVM ERROR: Invalid encoding > make[2]: *** [Makefile:318: libruby-static.a] Aborted > > Signed-off-by: James Hilliard > --- > package/ruby/ruby.mk | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Tue Feb 6 09:52:30 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 10:52:30 +0100 Subject: [Buildroot] Best board to fast boot In-Reply-To: References: Message-ID: <71301602-56ac-46b4-a853-bd71ed74da27@benettiengineering.com> Hi Franco, On 06/02/24 05:14, franco ariel wrote: > Hello guys! > I few weeks ago I started working with buildroot on rpi4, and it's look > amazing, thanks to the community I was able to run a flutter app on my > rpi4. But now, I want to keep going forward with my project, so ?Witch > one are the best board to achieve te best boot time to a Qt application? > I was looking for the Rockpro64 from pine but I'm not sure, since there > is not so much information about this board. > > What do you think it will be good for my project? On rpi4 I was able to > get 10sec boot time until the qt app shows up. And I want to achieve > less than 7s. This depends a lot on optimization you do on bootloader, linux and init script. I suggest you to take a look at these slides: https://bootlin.com/doc/training/boot-time/boot-time-slides.pdf Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From paul at crapouillou.net Tue Feb 6 09:52:30 2024 From: paul at crapouillou.net (Paul Cercueil) Date: Tue, 06 Feb 2024 10:52:30 +0100 Subject: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status In-Reply-To: <20240205222949.2805f50f@windsurf> References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> <20240121204252.152952-2-adam.duskett@amarulasolutions.com> <20240205222949.2805f50f@windsurf> Message-ID: <15a450739bf459a11093a6182dbdb1d2b2cb1b53.camel@crapouillou.net> I honestly forgot about this. I'll send a new patch upstream. -Paul Le lundi 05 f?vrier 2024 ? 22:29 +0100, Thomas Petazzoni a ?crit?: > Hello Adam, > > +Paul Cercueil in Cc, see below. > > On Sun, 21 Jan 2024 13:42:52 -0700 > Adam Duskett wrote: > > > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has > > been > > rejected upstream, and the initial pull request was moved to the > > freedesktop gitlab. Update the patch to reflect these changes. > > > > Signed-off-by: Adam Duskett > > Thanks, applied! > > Paul: could you follow-up with upstream (either wlroots, or uclibc, > or > both) to try to find an acceptable solution so that some day we can > drop this patch? > > Thanks a lot! > > Thomas From thomas.petazzoni at bootlin.com Tue Feb 6 09:51:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 10:51:10 +0100 Subject: [Buildroot] [git commit] package/rygel: bump to version 0.42.5 Message-ID: <20240206101345.E01EB86F05@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02734c0c22b5567194f187b5650470f90c6db681 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop first patch (already in version) - Refresh second patch - x11 is mandatory since https://gitlab.gnome.org/GNOME/rygel/-/commit/18cd2cff6f64b7a54156ac97e5c4f50eb8fd8d67 and upstream doesn't want to make it optional: https://gitlab.gnome.org/GNOME/rygel/-/issues/221 - This bump will also fix the following build failure raised since bump of gupnp to version 1.6.6 in commit b7938d2ae78ace5bffcf523f06304b27cd4edc0b: ../output-1/build/rygel-0.40.2/meson.build:79:8: ERROR: Dependency "gupnp-1.2" not found, tried pkgconfig and cmake https://gitlab.gnome.org/GNOME/rygel/-/blob/rygel-0.42.5/NEWS Fixes: - http://autobuild.buildroot.org/results/bdf87468199504384f79e4ab59971776d517296b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 3 +- .../0001-build-Add-man_pages-build-options.patch | 150 --------------------- ...0001-meson.build-fix-g_ir_compiler-calls.patch} | 16 +-- package/rygel/Config.in | 3 + package/rygel/rygel.hash | 4 +- package/rygel/rygel.mk | 5 +- 6 files changed, 17 insertions(+), 164 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 31ed5bb5cc..1f85ff2e07 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1177,8 +1177,7 @@ package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch Upstream package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch Upstream package/rubix/0001-dont-use-legacy-functions.patch Upstream package/rubix/0002-misc-fixes.patch Sob Upstream -package/rygel/0001-build-Add-man_pages-build-options.patch Upstream -package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch Upstream +package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch Upstream package/rygel/S99rygel Indent Shellcheck Variables package/s6-linux-init/0001-configure-add-D_GNU_SOURCE.patch Upstream package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch Upstream diff --git a/package/rygel/0001-build-Add-man_pages-build-options.patch b/package/rygel/0001-build-Add-man_pages-build-options.patch deleted file mode 100644 index cdd7cc7721..0000000000 --- a/package/rygel/0001-build-Add-man_pages-build-options.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 5a54c5bb1c9609b7bffe6b3e05f934030e4e990e Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sat, 26 Dec 2020 18:40:51 +0100 -Subject: [PATCH] build: Add man_pages build options - -Check if xsltproc runs succesfully and fail otherwise - -Fixes #192 - -[Retrieved from: -https://gitlab.gnome.org/GNOME/rygel/-/commit/5a54c5bb1c9609b7bffe6b3e05f934030e4e990e] -Signed-off-by: Fabrice Fontaine ---- - doc/man/meson.build | 98 +++++++++++++++++++++++++++------------------ - doc/meson.build | 5 ++- - meson_options.txt | 1 + - 3 files changed, 64 insertions(+), 40 deletions(-) - -diff --git a/doc/man/meson.build b/doc/man/meson.build -index ef3fcfbf5..4c92eab2b 100644 ---- a/doc/man/meson.build -+++ b/doc/man/meson.build -@@ -1,43 +1,63 @@ - xsltproc = find_program('xsltproc', required: false) - - if xsltproc.found() -- xlstproc_flags = [ -- '--nonet', -- '--stringparam', 'man.output.quietly', '1', -- '--stringparam', 'funcsynopsis.style', 'ansi', -- '--stringparam', 'man.authors.section.enabled', '1', -- '--stringparam', 'man.copyright.section.enabled', '1', -- ] -- -- xsltproc_args = [ -- xsltproc, -- xlstproc_flags, -- '-o', '@OUTPUT@', -- 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl', -- '@INPUT@', -- ] -- -- man_input_files = [ -- 'rygel.xml', -- 'rygel.conf.xml' -- ] -- -- man_output_files = [ -- 'rygel.1', -- 'rygel.conf.5' -- ] -- -- custom_target('man 1 pages', -- input: 'rygel.xml', -- output: 'rygel.1', -- command: xsltproc_args, -- install: true, -- install_dir: join_paths(get_option('mandir'), 'man1')) -- -- custom_target('man 5 pages', -- input: 'rygel.conf.xml', -- output: 'rygel.conf.5', -- command: xsltproc_args, -- install: true, -- install_dir: join_paths(get_option('mandir'), 'man5')) -+ stylesheet = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' -+ -+ xlstproc_flags = [ -+ '--nonet', -+ '--stringparam', 'man.output.quietly', '1', -+ '--stringparam', 'funcsynopsis.style', 'ansi', -+ '--stringparam', 'man.authors.section.enabled', '1', -+ '--stringparam', 'man.copyright.section.enabled', '1', -+ ] -+ -+ xsltproc_args = [ -+ xsltproc, -+ xlstproc_flags, -+ '-o', '@OUTPUT@', -+ stylesheet, -+ '@INPUT@', -+ ] -+ -+ man_input_files = [ -+ 'rygel.xml', -+ 'rygel.conf.xml' -+ ] -+ -+ man_output_files = [ -+ 'rygel.1', -+ 'rygel.conf.5' -+ ] -+ -+ r = run_command( -+ [ -+ xsltproc, -+ xlstproc_flags, -+ '-o', '/dev/null', -+ stylesheet, -+ 'rygel.xml' -+ ] -+ ) -+ -+ if (r.returncode() == 0) -+ custom_target( -+ 'man 1 pages', -+ input: 'rygel.xml', -+ output: 'rygel.1', -+ command: xsltproc_args, -+ install: true, -+ install_dir: join_paths(get_option('mandir'), 'man1') -+ ) -+ -+ custom_target( -+ 'man 5 pages', -+ input: 'rygel.conf.xml', -+ output: 'rygel.conf.5', -+ command: xsltproc_args, -+ install: true, -+ install_dir: join_paths(get_option('mandir'), 'man5') -+ ) -+ else -+ error('Cannot bulid man pages, failed to run xsltproc') -+ endif - endif -diff --git a/doc/meson.build b/doc/meson.build -index 41c733e50..91c08fae5 100644 ---- a/doc/meson.build -+++ b/doc/meson.build -@@ -1,2 +1,5 @@ --subdir('man') -+if get_option('man_pages') -+ subdir('man') -+endif -+ - subdir('reference') -diff --git a/meson_options.txt b/meson_options.txt -index cb604c4e9..c60ff1a9a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,5 +1,6 @@ - option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') - option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') -+option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages') - option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') - option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) - option('engines', type : 'array', choices : ['simple', 'gstreamer']) --- -GitLab - diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch similarity index 93% rename from package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch rename to package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch index 3961ad0564..1d8f4599f4 100644 --- a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch +++ b/package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch @@ -35,12 +35,12 @@ index fd43bebe..e6be2b5e 100644 @@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', # so we depend on the custom_target from that step and pass the input through # commandline. - custom_target('RygelCore-2.6.typelib', -- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], + custom_target('RygelCore-2.8.typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.8.gir')], + command: [g_ir_compiler, '--output', '@OUTPUT@', + '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, -+ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], - output: 'RygelCore-2.6.typelib', ++ join_paths(meson.current_build_dir(), 'RygelCore-2.8.gir')], + output: 'RygelCore-2.8.typelib', depends: [ core_lib, core_gir ], install: true, diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build @@ -52,8 +52,8 @@ index ad98a3a7..e8baefe1 100644 '--includedir', core_girdir, '--includedir', renderer_girdir, + '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, - join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], - output: 'RygelRendererGst-2.6.typelib', + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.8.gir')], + output: 'RygelRendererGst-2.8.typelib', depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build index 5f401527..821273ff 100644 @@ -64,7 +64,7 @@ index 5f401527..821273ff 100644 '--output', '@OUTPUT@', '--includedir', core_girdir, + '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, - join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], + join_paths(meson.current_build_dir(), 'RygelRenderer-2.8.gir')], output: 'RygelRenderer-2.6.typelib', depends: [ renderer_lib, renderer_gir, core_gir ], diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build @@ -76,7 +76,7 @@ index a3bd77d9..6b084eb6 100644 '--output', '@OUTPUT@', '--includedir', core_girdir, + '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, - join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], + join_paths(meson.current_build_dir(), 'RygelServer-2.8.gir')], output: 'RygelServer-2.6.typelib', depends: [ server_lib, server_gir, core_gir ], -- diff --git a/package/rygel/Config.in b/package/rygel/Config.in index e160068a55..a3c2bd29da 100644 --- a/package/rygel/Config.in +++ b/package/rygel/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RYGEL bool "rygel" + depends on BR2_PACKAGE_XORG7 depends on BR2_USE_WCHAR # gupnp-av depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av depends on BR2_USE_MMU # gupnp-av, gobject-introspection @@ -15,6 +16,7 @@ config BR2_PACKAGE_RYGEL select BR2_PACKAGE_LIBGEE select BR2_PACKAGE_LIBMEDIAART select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_XLIB_LIBX11 help Rygel is a home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other @@ -57,6 +59,7 @@ endif # BR2_PACKAGE_RYGEL comment "rygel needs python3 and a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on BR2_PACKAGE_XORG7 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ diff --git a/package/rygel/rygel.hash b/package/rygel/rygel.hash index 8bda1c2af7..77db59cf40 100644 --- a/package/rygel/rygel.hash +++ b/package/rygel/rygel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/rygel/0.40/rygel-0.40.2.sha256sum: -sha256 c9e8c736296d22c4defe959727a29d31437bbd2b7aa0c6470d6be24011050697 rygel-0.40.2.tar.xz +# Hash from: https://ftp.gnome.org/pub/gnome/sources/rygel/0.42/rygel-0.42.5.sha256sum: +sha256 1133602d2e6710aade6b22aa98d93384c8d56396f344763413e96e0110b7d89f rygel-0.42.5.tar.xz # Locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index 81d35be833..5c155f8e13 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -4,8 +4,8 @@ # ################################################################################ -RYGEL_VERSION_MAJOR = 0.40 -RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).2 +RYGEL_VERSION_MAJOR = 0.42 +RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).5 RYGEL_SOURCE = rygel-$(RYGEL_VERSION).tar.xz RYGEL_SITE = https://download.gnome.org/sources/rygel/$(RYGEL_VERSION_MAJOR) RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) @@ -18,6 +18,7 @@ RYGEL_DEPENDENCIES = \ libgee \ libmediaart \ sqlite \ + xlib_libX11 \ $(TARGET_NLS_DEPENDENCIES) RYGEL_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Tue Feb 6 10:13:48 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:13:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: bump to version 0.42.5 In-Reply-To: <20240107164400.359352-1-fontaine.fabrice@gmail.com> References: <20240107164400.359352-1-fontaine.fabrice@gmail.com> Message-ID: <20240206111348.025e3c12@windsurf> On Sun, 7 Jan 2024 17:44:00 +0100 Fabrice Fontaine wrote: > - Drop first patch (already in version) > - Refresh second patch > - x11 is mandatory since > https://gitlab.gnome.org/GNOME/rygel/-/commit/18cd2cff6f64b7a54156ac97e5c4f50eb8fd8d67 > and upstream doesn't want to make it optional: > https://gitlab.gnome.org/GNOME/rygel/-/issues/221 > - This bump will also fix the following build failure raised since bump > of gupnp to version 1.6.6 in commit > b7938d2ae78ace5bffcf523f06304b27cd4edc0b: > > ../output-1/build/rygel-0.40.2/meson.build:79:8: ERROR: Dependency "gupnp-1.2" not found, tried pkgconfig and cmake > > https://gitlab.gnome.org/GNOME/rygel/-/blob/rygel-0.42.5/NEWS > > Fixes: > - http://autobuild.buildroot.org/results/bdf87468199504384f79e4ab59971776d517296b > > Signed-off-by: Fabrice Fontaine > --- > .checkpackageignore | 3 +- > ...01-build-Add-man_pages-build-options.patch | 150 ------------------ > ...meson.build-fix-g_ir_compiler-calls.patch} | 16 +- > package/rygel/Config.in | 3 + > package/rygel/rygel.hash | 4 +- > package/rygel/rygel.mk | 5 +- > 6 files changed, 17 insertions(+), 164 deletions(-) > delete mode 100644 package/rygel/0001-build-Add-man_pages-build-options.patch > rename package/rygel/{0002-meson.build-fix-g_ir_compiler-calls.patch => 0001-meson.build-fix-g_ir_compiler-calls.patch} (93%) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:14:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:14:25 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-debugtoolbar: bump to version 0.6.1 Message-ID: <20240206101543.04F6686F0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf2b8d890ec1b9e001e7671f79d7144780f1c815 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to new line removal: https://github.com/aio-libs/aiohttp-debugtoolbar/commit/449550e9c70f17be7b679b90cc3dda2cc90c61e1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash | 6 +++--- package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash b/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash index 3cd9462d72..441574bbe2 100644 --- a/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash +++ b/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp_debugtoolbar/json -md5 496734057cb413d7a49a52a817802dbb aiohttp-debugtoolbar-0.6.0.tar.gz -sha256 ec231661133b40136608d39dfb688e7ea0c3d47b6ae6dee52d5bf24ceb9e4d45 aiohttp-debugtoolbar-0.6.0.tar.gz +md5 3be0e457798dbd301f4cfe8da43166d4 aiohttp-debugtoolbar-0.6.1.tar.gz +sha256 cd7ae54c600db7ae7d9dc3404b81f95209a6367df1d59e13ea20f9926e36e001 aiohttp-debugtoolbar-0.6.1.tar.gz # Locally computed sha256 checksums -sha256 94d638be2cb4f186cc62bb567455837757547c15f1b350863aaf05a38843b542 LICENSE +sha256 dd064918c2da830f543f6b34b699efd423c2ad82fdbda15c25214410fcd3f84b LICENSE diff --git a/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk b/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk index 319d20ffc5..8eb38e86cc 100644 --- a/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk +++ b/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_DEBUGTOOLBAR_VERSION = 0.6.0 +PYTHON_AIOHTTP_DEBUGTOOLBAR_VERSION = 0.6.1 PYTHON_AIOHTTP_DEBUGTOOLBAR_SOURCE = aiohttp-debugtoolbar-$(PYTHON_AIOHTTP_DEBUGTOOLBAR_VERSION).tar.gz -PYTHON_AIOHTTP_DEBUGTOOLBAR_SITE = https://files.pythonhosted.org/packages/3f/dd/5121417dfbeb4661673afa5c8708f1539889d0e54b1509a6fdf66705efc5 +PYTHON_AIOHTTP_DEBUGTOOLBAR_SITE = https://files.pythonhosted.org/packages/bd/72/cd80c0d1d425d5ef50e5b23553040e8d9fa5de5714208d3d18ae8806b6de PYTHON_AIOHTTP_DEBUGTOOLBAR_SETUP_TYPE = setuptools PYTHON_AIOHTTP_DEBUGTOOLBAR_LICENSE = Apache-2.0 PYTHON_AIOHTTP_DEBUGTOOLBAR_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:15:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:15:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-debugtoolbar: bump to version 0.6.1 In-Reply-To: <20240107210645.3318474-1-james.hilliard1@gmail.com> References: <20240107210645.3318474-1-james.hilliard1@gmail.com> Message-ID: <20240206111543.3d636875@windsurf> On Sun, 7 Jan 2024 14:06:45 -0700 James Hilliard wrote: > License hash changed due to new line removal: > https://github.com/aio-libs/aiohttp-debugtoolbar/commit/449550e9c70f17be7b679b90cc3dda2cc90c61e1 > > Signed-off-by: James Hilliard > --- > .../python-aiohttp-debugtoolbar.hash | 6 +++--- > .../python-aiohttp-debugtoolbar.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:15:57 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:15:57 +0100 Subject: [Buildroot] [git commit] package/python-botocore: bump to version 1.34.14 Message-ID: <20240206101720.EB10C86F11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e1aa3be0534bcde65d7ab3af9980c9bdd511317 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-botocore/python-botocore.hash | 4 ++-- package/python-botocore/python-botocore.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-botocore/python-botocore.hash b/package/python-botocore/python-botocore.hash index adf6232b24..47fb30f960 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 ee4f82382518e3af25b4ccfab38587d1 botocore-1.31.78.tar.gz -sha256 320c70bc412157813c2cf60217a592b4b345f8e97e4bf3b1ce49b6be69ed8965 botocore-1.31.78.tar.gz +md5 6c8ba4112df2c114c71522330deb0f9a botocore-1.34.14.tar.gz +sha256 041bed0852649cab7e4dcd4d87f9d1cc084467fb846e5b60015e014761d96414 botocore-1.34.14.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 tests/unit/auth/aws4_testsuite/LICENSE diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index 850fb79aa1..485e973135 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.31.78 +PYTHON_BOTOCORE_VERSION = 1.34.14 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/84/a9/9c2752aa24c050323c37a9d2af6dec348889825b51db07fb7f1bb792e307 +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/35/6d/a5aaf38f980060d17905398301033e9eb45c2552bf281fa7fd4c8e23ebdd PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt tests/unit/auth/aws4_testsuite/LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:17:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:17:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-botocore: bump to version 1.34.14 In-Reply-To: <20240108072652.3496708-1-james.hilliard1@gmail.com> References: <20240108072652.3496708-1-james.hilliard1@gmail.com> Message-ID: <20240206111718.413fb415@windsurf> On Mon, 8 Jan 2024 00:26:52 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-botocore/python-botocore.hash | 4 ++-- > package/python-botocore/python-botocore.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:17:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:17:44 +0100 Subject: [Buildroot] [git commit] package/python-colorlog: bump to version 6.8.0 Message-ID: <20240206102053.95A0D86F40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c2f84e70f592bb3986b5696d9a3e8c8d5268822 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-colorlog/python-colorlog.hash | 4 ++-- package/python-colorlog/python-colorlog.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-colorlog/python-colorlog.hash b/package/python-colorlog/python-colorlog.hash index f4d0dd4c0e..9df94b19ba 100644 --- a/package/python-colorlog/python-colorlog.hash +++ b/package/python-colorlog/python-colorlog.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/colorlog/json -md5 80b79f7824d39d4f3b11c75d1cba094e colorlog-6.7.0.tar.gz -sha256 bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 colorlog-6.7.0.tar.gz +md5 805e982037ba071d3d42c3d53cf73fd8 colorlog-6.8.0.tar.gz +sha256 fbb6fdf9d5685f2517f388fb29bb27d54e8654dd31f58bc2a3b217e967a95ca6 colorlog-6.8.0.tar.gz # Locally computed sha256 checksums sha256 b1d9082bc483623fd59fc7279b457f0e40d942a76426cde257239e04dfe4125a LICENSE diff --git a/package/python-colorlog/python-colorlog.mk b/package/python-colorlog/python-colorlog.mk index 12a1c8ec77..f96318ce5a 100644 --- a/package/python-colorlog/python-colorlog.mk +++ b/package/python-colorlog/python-colorlog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COLORLOG_VERSION = 6.7.0 +PYTHON_COLORLOG_VERSION = 6.8.0 PYTHON_COLORLOG_SOURCE = colorlog-$(PYTHON_COLORLOG_VERSION).tar.gz -PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/78/6b/4e5481ddcdb9c255b2715f54c863629f1543e97bc8c309d1c5c131ad14f2 +PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/1f/b0/e4e3850d43f5429f9e53404056d705117fbb8a4d9e755425e762a9f68317 PYTHON_COLORLOG_SETUP_TYPE = setuptools PYTHON_COLORLOG_LICENSE = MIT PYTHON_COLORLOG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:18:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:18:09 +0100 Subject: [Buildroot] [git commit] package/python-dominate: bump to version 2.9.1 Message-ID: <20240206102053.E45A086F43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc7bab307a77561e5d297312990e7af89ada0730 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-dominate/python-dominate.hash | 4 ++-- package/python-dominate/python-dominate.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dominate/python-dominate.hash b/package/python-dominate/python-dominate.hash index 9993dbe95f..26840e5f0c 100644 --- a/package/python-dominate/python-dominate.hash +++ b/package/python-dominate/python-dominate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dominate/json -md5 df2d30e7c2e7f1e5b085a58820e4cc94 dominate-2.8.0.tar.gz -sha256 4c90c3befaf88e612b71f4b39af7bcbef8977acfa855cec957225a8fbf504007 dominate-2.8.0.tar.gz +md5 4dc4bbb39297999624e2312b6fe2b46f dominate-2.9.1.tar.gz +sha256 558284687d9b8aae1904e3d6051ad132dd4a8c0cf551b37ea4e7e42a31d19dc4 dominate-2.9.1.tar.gz # Locally computed sha256 checksums sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 LICENSE.txt diff --git a/package/python-dominate/python-dominate.mk b/package/python-dominate/python-dominate.mk index 39e2edb82e..d6301af9db 100644 --- a/package/python-dominate/python-dominate.mk +++ b/package/python-dominate/python-dominate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOMINATE_VERSION = 2.8.0 +PYTHON_DOMINATE_VERSION = 2.9.1 PYTHON_DOMINATE_SOURCE = dominate-$(PYTHON_DOMINATE_VERSION).tar.gz -PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/13/3d/8d22916c12184f0c4930b9cdfb136a130e8d8eacf5942fc9883f2a189f6a +PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/fb/f3/1c8088ff19a0fcd9c3234802a0ee47006ea64bd8852f1019194f0e3583ff PYTHON_DOMINATE_SETUP_TYPE = setuptools PYTHON_DOMINATE_LICENSE = LGPL-3.0+ PYTHON_DOMINATE_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Tue Feb 6 10:17:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:17:54 +0100 Subject: [Buildroot] [git commit] package/python-distlib: bump to version 0.3.8 Message-ID: <20240206102053.B756686F43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bea49c2cd3168e11ecf6e858b7e0004f963b4069 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-distlib/python-distlib.hash | 4 ++-- package/python-distlib/python-distlib.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-distlib/python-distlib.hash b/package/python-distlib/python-distlib.hash index 506d10824c..1a14e6ba77 100644 --- a/package/python-distlib/python-distlib.hash +++ b/package/python-distlib/python-distlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/distlib/json -md5 44e4357e35bbd77fdf1b81e174e34f20 distlib-0.3.7.tar.gz -sha256 9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8 distlib-0.3.7.tar.gz +md5 c4df5794463d3710bae3d162bf953ba6 distlib-0.3.8.tar.gz +sha256 1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64 distlib-0.3.8.tar.gz # Locally computed sha256 checksums sha256 808e10c8a6ab8deb149ff9b3fb19f447a808094606d712a9ca57fead3552599d LICENSE.txt diff --git a/package/python-distlib/python-distlib.mk b/package/python-distlib/python-distlib.mk index cae025dbdb..2eba3ae64f 100644 --- a/package/python-distlib/python-distlib.mk +++ b/package/python-distlib/python-distlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DISTLIB_VERSION = 0.3.7 +PYTHON_DISTLIB_VERSION = 0.3.8 PYTHON_DISTLIB_SOURCE = distlib-$(PYTHON_DISTLIB_VERSION).tar.gz -PYTHON_DISTLIB_SITE = https://files.pythonhosted.org/packages/29/34/63be59bdf57b3a8a8dcc252ef45c40f3c018777dc8843d45dd9b869868f0 +PYTHON_DISTLIB_SITE = https://files.pythonhosted.org/packages/c4/91/e2df406fb4efacdf46871c25cde65d3c6ee5e173b7e5a4547a47bae91920 PYTHON_DISTLIB_SETUP_TYPE = setuptools PYTHON_DISTLIB_LICENSE = PSF-2.0 PYTHON_DISTLIB_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Tue Feb 6 10:17:51 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:17:51 +0100 Subject: [Buildroot] [git commit] package/python-construct: bump to version 2.10.70 Message-ID: <20240206102053.A5C9E86F41@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9eb47ddad84fe099d2a57ffd428602b06e3bc5c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-construct/python-construct.hash | 4 ++-- package/python-construct/python-construct.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-construct/python-construct.hash b/package/python-construct/python-construct.hash index a72a79a5b3..395de7a18b 100644 --- a/package/python-construct/python-construct.hash +++ b/package/python-construct/python-construct.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/construct/json -md5 d881ab2198ec6597e603a2d985307353 construct-2.10.69.tar.gz -sha256 08573d1573827a6fe6b846756d54270650e221a6cec6a72e06b582cde775599e construct-2.10.69.tar.gz +md5 e880b97796c16ae362600b7e32339a7e construct-2.10.70.tar.gz +sha256 4d2472f9684731e58cc9c56c463be63baa1447d674e0d66aeb5627b22f512c29 construct-2.10.70.tar.gz # Locally computed sha256 checksums sha256 1552d70acfd0d3fe464ce13d30113ddc6fe4bac21e52212acc98509e3cc1a8f4 LICENSE diff --git a/package/python-construct/python-construct.mk b/package/python-construct/python-construct.mk index 1e30651129..46cae959ea 100644 --- a/package/python-construct/python-construct.mk +++ b/package/python-construct/python-construct.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CONSTRUCT_VERSION = 2.10.69 +PYTHON_CONSTRUCT_VERSION = 2.10.70 PYTHON_CONSTRUCT_SOURCE = construct-$(PYTHON_CONSTRUCT_VERSION).tar.gz -PYTHON_CONSTRUCT_SITE = https://files.pythonhosted.org/packages/02/88/e34d7265863f3c96077aea24041b067d4646d77d596d979110eb94758b03 +PYTHON_CONSTRUCT_SITE = https://files.pythonhosted.org/packages/02/77/8c84b98eca70d245a2a956452f21d57930d22ab88cbeed9290ca630cf03f PYTHON_CONSTRUCT_SETUP_TYPE = setuptools PYTHON_CONSTRUCT_LICENSE = MIT PYTHON_CONSTRUCT_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:17:59 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:17:59 +0100 Subject: [Buildroot] [git commit] package/python-distro: bump to version 1.9.0 Message-ID: <20240206102053.C7B6A86F40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c83d1e930c23d0e62de4eedb99716bc5c0f6a29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-distro/python-distro.hash | 8 ++++---- package/python-distro/python-distro.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash index 3d3e4258de..7f8277896d 100644 --- a/package/python-distro/python-distro.hash +++ b/package/python-distro/python-distro.hash @@ -1,5 +1,5 @@ -# From https://pypi.org/pypi/distro/json -md5 a1e81972bbcfc0dc77dd0cde590c22a6 distro-1.8.0.tar.gz -sha256 02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 distro-1.8.0.tar.gz -# Locally computed +# md5, sha256 from https://pypi.org/pypi/distro/json +md5 c4eee99e1d05691230f223c37b895027 distro-1.9.0.tar.gz +sha256 2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed distro-1.9.0.tar.gz +# Locally computed sha256 checksums sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk index e079d8e265..05faab3888 100644 --- a/package/python-distro/python-distro.mk +++ b/package/python-distro/python-distro.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DISTRO_VERSION = 1.8.0 -PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/4b/89/eaa3a3587ebf8bed93e45aa79be8c2af77d50790d15b53f6dfc85b57f398 +PYTHON_DISTRO_VERSION = 1.9.0 PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/fc/f8/98eea607f65de6527f8a2e8885fc8015d3e6f5775df186e443e0964a11c3 PYTHON_DISTRO_LICENSE = Apache-2.0 PYTHON_DISTRO_LICENSE_FILES = LICENSE PYTHON_DISTRO_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Tue Feb 6 10:18:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:18:04 +0100 Subject: [Buildroot] [git commit] package/python-django: bump to version 5.0.1 Message-ID: <20240206102053.D7C9286F41@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dba7e8abaadae87a2e96de92f9f4f59dc590a77c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 98c338f9d4..39fd9afdae 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 d7afe6a68b631725a1dac116a7832b10 Django-4.2.7.tar.gz -sha256 8e0f1c2c2786b5c0e39fe1afce24c926040fad47c8ea8ad30aaf1188df29fc41 Django-4.2.7.tar.gz +md5 5ff3c69d7e6b4f5ed378ec5713af8df7 Django-5.0.1.tar.gz +sha256 8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854 Django-5.0.1.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 9b710412fa..ed4f4bcdf1 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.2.7 +PYTHON_DJANGO_VERSION = 5.0.1 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/5c/62/0c6ab2f3ac9a242b4562b6be1c418685fa7d1ccb8ca302cdb97e0b23cf4b +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From anaumann at ultratronik.de Tue Feb 6 10:21:44 2024 From: anaumann at ultratronik.de (Andreas Naumann) Date: Tue, 6 Feb 2024 11:21:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/glm: Bump to 1.0.0 Message-ID: <20240206102144.1831146-1-anaumann@ultratronik.de> glm did not install headers since [1], at least in a per-package build. Bumping to 1.0.0 fixes that. The cmake option to avoid building the lib has changed Partially fixes [2], where cegui failed to configure because of the missing glm headers. [1] 01ad113 package/glm: bump to version 0.9.9.8 [2] http://autobuild.buildroot.org/results/241/241a60f8ecb6fec5dc122d64dd438dd4249f8c3e/ Signed-off-by: Andreas Naumann --- note: 0.9.9.8 from 2020 was the latest tag until a 1.0.0 was cut about two weeks ago (24th january 2024). I've seen commit 3a4b550 which might have been responsible but didnt check since 1.0.0 was available. package/glm/glm.hash | 2 +- package/glm/glm.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/glm/glm.hash b/package/glm/glm.hash index c4e21016047..0084bd0930c 100644 --- a/package/glm/glm.hash +++ b/package/glm/glm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz +sha256 e51f6c89ff33b7cfb19daafb215f293d106cd900f8d681b9b1295312ccadbd23 glm-1.0.0.tar.gz sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt diff --git a/package/glm/glm.mk b/package/glm/glm.mk index ef549931f6a..ce8efc11a78 100644 --- a/package/glm/glm.mk +++ b/package/glm/glm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLM_VERSION = 0.9.9.8 +GLM_VERSION = 1.0.0 GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) GLM_LICENSE = MIT GLM_LICENSE_FILES = copying.txt @@ -17,7 +17,6 @@ GLM_INSTALL_TARGET = NO # Don't build libraries as GLM is header-only GLM_CONF_OPTS = \ -DGLM_TEST_ENABLE=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_STATIC_LIBS=OFF + -DGLM_BUILD_LIBRARY=OFF $(eval $(cmake-package)) -- 2.34.1 From yegorslists at googlemail.com Tue Feb 6 10:22:06 2024 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Tue, 6 Feb 2024 11:22:06 +0100 Subject: [Buildroot] Ignore build directories created via make O=dir or the default one Message-ID: Hi all, what about adding a .gitignore file with an "*" everytime we create an output directory? Does anything speak against such an approach? Regards, Yegor From giulio.benetti at benettiengineering.com Tue Feb 6 10:26:40 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 11:26:40 +0100 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. In-Reply-To: <20240206033436.38436-1-asd617140123@gmail.com> References: <20240206033436.38436-1-asd617140123@gmail.com> Message-ID: <07295f28-5618-4e8d-b330-d035f4c053c1@benettiengineering.com> Hi Nigel, please don't resend too many times the same patch slightly changed. If you need to please add RESEND tag in Subject prefix. On 06/02/24 04:34, Nigel Wang wrote: > From: nigel_wang > > This is a new defconfig for cubieboard4. The following is board's > detail. > - SOC: sunxiA80. > - DRAM: 2GiB DDR3 @ 672MHZ. > - NAND: 8GBeMMC > - Power: DC 5V. > - Network: Wifi 80211 b/g/n. > - Ethernet: RTL8211E > reference: > https://linux-sunxi.org/Cubietech_Cubieboard4 > > Board support package includes the following components: > - mainline Linux Kernel 6.6.8 > - mainline U-boot 2021.10. > > Signed-off-by: Nigel Wang > > --- under these ^^^ 3 dashes you should report the changes between patch versions like: V1->V2: * changed this * changed that In this case: * dropped boot.cmd as suggested by Giulio > DEVELOPERS | 4 +++ > board/cubietech/cubieboard4/extlinux.conf | 5 +++ > board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ > board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ > configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ > 5 files changed, 104 insertions(+) > create mode 100644 board/cubietech/cubieboard4/extlinux.conf > create mode 100644 board/cubietech/cubieboard4/genimage.cfg > create mode 100755 board/cubietech/cubieboard4/post-image.sh > create mode 100644 configs/cubieboard4_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index a03018ab2b..bffb8f2069 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -3297,3 +3297,7 @@ F: package/quazip/ > F: package/shapelib/ > F: package/simple-mail/ > F: package/tinc/ > + > +N: Nigel Wang > +F: board/cubietech/cubieboard4/ > +F: configs/cubieboard4_defconfig > diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf > new file mode 100644 > index 0000000000..5084e2237b > --- /dev/null > +++ b/board/cubietech/cubieboard4/extlinux.conf > @@ -0,0 +1,5 @@ > +label linux > + kernel /boot/zImage > + devicetree /sun9i-a80-cubieboard4.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > + > diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg > new file mode 100644 > index 0000000000..f1dee13923 > --- /dev/null > +++ b/board/cubietech/cubieboard4/genimage.cfg > @@ -0,0 +1,38 @@ > +# Minimal SD card image for the Cubieboard2 > +# Based in the Orange Pi genimage.cfg > + > +image boot.vfat { > + vfat { > + files = { > + "zImage", > + "sun9i-a80-cubieboard4.dtb", > + "extlinux" > + } > + } > + > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1016K # 1MB - 8KB > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 512M > + } > +} > diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh > new file mode 100755 > index 0000000000..e37b960a4d > --- /dev/null > +++ b/board/cubietech/cubieboard4/post-image.sh > @@ -0,0 +1,18 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf > + > +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > + > +rm -rf "${GENIMAGE_TMP}" > + > +genimage \ > + --rootpath "${TARGET_DIR}" \ > + --tmppath "${GENIMAGE_TMP}" \ > + --inputpath "${BINARIES_DIR}" \ > + --outputpath "${BINARIES_DIR}" \ > + --config "${GENIMAGE_CFG}" > + > +exit $? > diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig > new file mode 100644 > index 0000000000..0592fe4a2d > --- /dev/null > +++ b/configs/cubieboard4_defconfig > @@ -0,0 +1,39 @@ > +# Architecture > +BR2_arm=y > +BR2_cortex_a15_a7=y > +BR2_ARM_FPU_NEON_VFPV4=y > + > +# System > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -- > 2.34.1 > I've built successfully the defconfig using buildroot/utils/docker-run so: Reviewed-by: Giulio Benetti [Build Tested] Tested-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Tue Feb 6 10:26:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:26:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-colorlog: bump to version 6.8.0 In-Reply-To: <20240109060406.3976484-1-james.hilliard1@gmail.com> References: <20240109060406.3976484-1-james.hilliard1@gmail.com> Message-ID: <20240206112652.52a41aab@windsurf> On Mon, 8 Jan 2024 23:04:06 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-colorlog/python-colorlog.hash | 4 ++-- > package/python-colorlog/python-colorlog.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:26:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:26:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-construct: bump to version 2.10.70 In-Reply-To: <20240109063850.3985537-1-james.hilliard1@gmail.com> References: <20240109063850.3985537-1-james.hilliard1@gmail.com> Message-ID: <20240206112658.16e16815@windsurf> On Mon, 8 Jan 2024 23:38:50 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-construct/python-construct.hash | 4 ++-- > package/python-construct/python-construct.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:27:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:27:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distlib: bump to version 0.3.8 In-Reply-To: <20240109065801.3999176-1-james.hilliard1@gmail.com> References: <20240109065801.3999176-1-james.hilliard1@gmail.com> Message-ID: <20240206112704.26a5f9b3@windsurf> On Mon, 8 Jan 2024 23:58:01 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-distlib/python-distlib.hash | 4 ++-- > package/python-distlib/python-distlib.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:27:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:27:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distro: bump to version 1.9.0 In-Reply-To: <20240109070135.4001715-1-james.hilliard1@gmail.com> References: <20240109070135.4001715-1-james.hilliard1@gmail.com> Message-ID: <20240206112708.0253821d@windsurf> On Tue, 9 Jan 2024 00:01:35 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-distro/python-distro.hash | 8 ++++---- > package/python-distro/python-distro.mk | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:27:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:27:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: bump to version 5.0.1 In-Reply-To: <20240109070626.4019996-1-james.hilliard1@gmail.com> References: <20240109070626.4019996-1-james.hilliard1@gmail.com> Message-ID: <20240206112714.7beb00e5@windsurf> On Tue, 9 Jan 2024 00:06:26 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-django/python-django.hash | 4 ++-- > package/python-django/python-django.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:27:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:27:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-dominate: bump to version 2.9.1 In-Reply-To: <20240109071001.4022321-1-james.hilliard1@gmail.com> References: <20240109071001.4022321-1-james.hilliard1@gmail.com> Message-ID: <20240206112721.7ba51303@windsurf> On Tue, 9 Jan 2024 00:10:01 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-dominate/python-dominate.hash | 4 ++-- > package/python-dominate/python-dominate.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:10 +0100 Subject: [Buildroot] [git commit] package/python-engineio: bump to version 4.8.2 Message-ID: <20240206103428.C45B886F9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff17367e73119a26a0b763cb5484938ed7bbca05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-engineio/python-engineio.hash | 4 ++-- package/python-engineio/python-engineio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-engineio/python-engineio.hash b/package/python-engineio/python-engineio.hash index 98fe647f68..c1b02350bc 100644 --- a/package/python-engineio/python-engineio.hash +++ b/package/python-engineio/python-engineio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-engineio/json -md5 45870fb7b12e6e5dca3cb6a828f70928 python-engineio-4.8.0.tar.gz -sha256 2a32585d8fecd0118264fe0c39788670456ca9aa466d7c026d995cfff68af164 python-engineio-4.8.0.tar.gz +md5 619e7fce0257a8219187f50aa94844a3 python-engineio-4.8.2.tar.gz +sha256 f8609e3afdda318fdc336b4ba2de8dd397bb8f9b8a1b43e56c27330e32c2e34c python-engineio-4.8.2.tar.gz # Locally computed sha256 checksums sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/package/python-engineio/python-engineio.mk b/package/python-engineio/python-engineio.mk index e84acee88f..7702b5f294 100644 --- a/package/python-engineio/python-engineio.mk +++ b/package/python-engineio/python-engineio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_ENGINEIO_VERSION = 4.8.0 -PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/c4/5c/4fa0bf79eb1a433d1e9b69430b3ac818837283c642640658f12949620813 +PYTHON_ENGINEIO_VERSION = 4.8.2 +PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/e2/24/4a69dd119d10e31c4439f910a2a0f71b540b9f835ab60efa1f0f7bcae0c7 PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:25 +0100 Subject: [Buildroot] [git commit] package/python-falcon: bump to version 3.1.3 Message-ID: <20240206103428.EAF8386F9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b2ec7d40f8ac385f29f9ef740dfa5d92e68f318 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-falcon/python-falcon.hash | 4 ++-- package/python-falcon/python-falcon.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash index 497b5d2b57..2d54d27837 100644 --- a/package/python-falcon/python-falcon.hash +++ b/package/python-falcon/python-falcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/falcon/json -md5 383673fc6378428d0db5861a416cad0d falcon-3.1.1.tar.gz -sha256 5dd393dbf01cbaf99493893de4832121bd495dc49a46c571915b79c59aad7ef4 falcon-3.1.1.tar.gz +md5 22a5c32f3d9dd96d498febe8e16ddffe falcon-3.1.3.tar.gz +sha256 23335dbccd44f29e85ec55f2f35d5a0bc12bd7a509f641ab81f5c64b65626263 falcon-3.1.3.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-falcon/python-falcon.mk b/package/python-falcon/python-falcon.mk index b5ebc399dc..6c96bf16eb 100644 --- a/package/python-falcon/python-falcon.mk +++ b/package/python-falcon/python-falcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FALCON_VERSION = 3.1.1 +PYTHON_FALCON_VERSION = 3.1.3 PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz -PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/29/bc/c11c9a14bb5b4d18a024ee51da15b793d1c869d151bb4101e324e0d055a8 +PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/3b/30/a7bc770025b6a7a36d0508e3d735dca239df7c27b862856e54d661f24632 PYTHON_FALCON_SETUP_TYPE = setuptools PYTHON_FALCON_LICENSE = Apache-2.0 PYTHON_FALCON_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:06 +0100 Subject: [Buildroot] [git commit] package/python-dtschema: bump to version 2023.11 Message-ID: <20240206103428.B3A7D86F9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4771d62dd0576c6eb5880aadced514c3c4d15d74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-dtschema/python-dtschema.hash | 4 ++-- package/python-dtschema/python-dtschema.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dtschema/python-dtschema.hash b/package/python-dtschema/python-dtschema.hash index a391e4ab21..3e1dd22133 100644 --- a/package/python-dtschema/python-dtschema.hash +++ b/package/python-dtschema/python-dtschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dtschema/json -md5 bb0ecd8b8680b76f7cb55da002f58d62 dtschema-2023.9.tar.gz -sha256 52c6d271065155ca134d8a0bcf7e0ebed67b3991acbbd7a98b74eb8642f67d87 dtschema-2023.9.tar.gz +md5 cc4be8cfc01804cc31a123b56f68aeb1 dtschema-2023.11.tar.gz +sha256 cf9a449ea743c0a955cf6034ef246668fa5ea177684977c61fef7604af5f273b dtschema-2023.11.tar.gz # Locally computed sha256 checksums sha256 ca0d66263406dc684fe9db60577b234f65ffdf620d7e041c708e969447b69111 LICENSE.txt diff --git a/package/python-dtschema/python-dtschema.mk b/package/python-dtschema/python-dtschema.mk index 0fc13073f8..e1dd5009fd 100644 --- a/package/python-dtschema/python-dtschema.mk +++ b/package/python-dtschema/python-dtschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DTSCHEMA_VERSION = 2023.9 +PYTHON_DTSCHEMA_VERSION = 2023.11 PYTHON_DTSCHEMA_SOURCE = dtschema-$(PYTHON_DTSCHEMA_VERSION).tar.gz -PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/24/97/daa9109a854727cd4e1a715e4123198e5abd47db10c131de5bc0cef0acc3 +PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/5a/94/7890ef663fba1cca84cf0ab64c7f68685343c921ab883f0356cd9978b605 PYTHON_DTSCHEMA_SETUP_TYPE = setuptools PYTHON_DTSCHEMA_LICENSE = BSD-2-Clause PYTHON_DTSCHEMA_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:31 +0100 Subject: [Buildroot] [git commit] package/python-flask-smorest: bump to version 0.42.3 Message-ID: <20240206103429.0A1E386F9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d02aa4dd447ab51c531f52f3c9e7a6057416585e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-flask-smorest/python-flask-smorest.hash | 4 ++-- package/python-flask-smorest/python-flask-smorest.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash index baeddb0e6b..b468c48fd8 100644 --- a/package/python-flask-smorest/python-flask-smorest.hash +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-smorest/json -md5 3d8c01cfe9ec4ba16636d6a3078edc87 flask-smorest-0.42.1.tar.gz -sha256 7fde3f349d464c408c73b7cbbdb1884c1c36cc8c23b2562aba28d9bdfdd14cdc flask-smorest-0.42.1.tar.gz +md5 b10a7a0bdee4505dec3cc7652560bc9e flask-smorest-0.42.3.tar.gz +sha256 736ef072bd5522de750a5a9d9f1bfb6d750d05c66e1b3702bc7a20e4277af9bf flask-smorest-0.42.3.tar.gz # Locally computed sha256 checksums sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE diff --git a/package/python-flask-smorest/python-flask-smorest.mk b/package/python-flask-smorest/python-flask-smorest.mk index 8a11e96d01..6eb1abc6fa 100644 --- a/package/python-flask-smorest/python-flask-smorest.mk +++ b/package/python-flask-smorest/python-flask-smorest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_SMOREST_VERSION = 0.42.1 +PYTHON_FLASK_SMOREST_VERSION = 0.42.3 PYTHON_FLASK_SMOREST_SOURCE = flask-smorest-$(PYTHON_FLASK_SMOREST_VERSION).tar.gz -PYTHON_FLASK_SMOREST_SITE = https://files.pythonhosted.org/packages/be/6e/8e3d0287bfa2da6ca7cf94cd9c053ed209764538dd5fb1d96f535e4d43bb +PYTHON_FLASK_SMOREST_SITE = https://files.pythonhosted.org/packages/25/91/da55ec1288e821069ab61b6db4acfa171fa268c426523bb4f3a8a91210db PYTHON_FLASK_SMOREST_SETUP_TYPE = setuptools PYTHON_FLASK_SMOREST_LICENSE = MIT PYTHON_FLASK_SMOREST_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:20 +0100 Subject: [Buildroot] [git commit] package/python-esptool: bump to version 4.7.0 Message-ID: <20240206103428.D6E6B86F9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40af3cb08a26b797370fd99c51954831edd6a966 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new python-intelhex runtime dependency. Add new python-pyyaml runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-esptool/Config.in | 2 ++ package/python-esptool/python-esptool.hash | 4 ++-- package/python-esptool/python-esptool.mk | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index 36243fa89e..4099957971 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_PYTHON_ESPTOOL select BR2_PACKAGE_PYTHON_BITSTRING # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_ECDSA # runtime + select BR2_PACKAGE_PYTHON_INTELHEX # runtime + select BR2_PACKAGE_PYTHON_PYYAML # runtime select BR2_PACKAGE_PYTHON_REEDSOLO # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime select BR2_PACKAGE_PYTHON3_ZLIB diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index 25fea229b0..490b4e7e9c 100644 --- a/package/python-esptool/python-esptool.hash +++ b/package/python-esptool/python-esptool.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/esptool/json -md5 17853949fd582550a7c270f08d7691d4 esptool-4.6.2.tar.gz -sha256 549ef93eef42ee7e9462ce5a53c16df7a0c71d91b3f77e19ec15749804cdf300 esptool-4.6.2.tar.gz +md5 e7f2012cf31cd23f60049b179fb3b53a esptool-4.7.0.tar.gz +sha256 01454e69e1ef3601215db83ff2cb1fc79ece67d24b0e5d43d451b410447c4893 esptool-4.7.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index c0709c64b1..f5aaface74 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 4.6.2 +PYTHON_ESPTOOL_VERSION = 4.7.0 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/a3/63/c757f50b606996a7e676f000b40626f65be63b3a10030563929c968e431c +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/1b/8b/f0d1e75879dee053874a4f955ed1e9ad97275485f51cb4bc2cb4e9b24479 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:36 +0100 Subject: [Buildroot] [git commit] package/python-fonttools: bump to version 4.47.0 Message-ID: <20240206103429.1A3DE86F9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c89465332292dcf41ed28fc86ae181d65989c6a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-fonttools/python-fonttools.hash | 4 ++-- package/python-fonttools/python-fonttools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash index 8bcabb0c45..7476656410 100644 --- a/package/python-fonttools/python-fonttools.hash +++ b/package/python-fonttools/python-fonttools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fonttools/json -md5 717f907e93dd6be3dd46fbdcdc33bbd7 fonttools-4.44.0.tar.gz -sha256 4e90dd81b6e0d97ebfe52c0d12a17a9ef7f305d6bfbb93081265057d6092f252 fonttools-4.44.0.tar.gz +md5 767059d1d373ade070d38295feaa3f92 fonttools-4.47.0.tar.gz +sha256 ec13a10715eef0e031858c1c23bfaee6cba02b97558e4a7bfa089dba4a8c2ebf fonttools-4.47.0.tar.gz # Locally computed sha256 checksums sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index 2f8a738600..e2472aa184 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.44.0 +PYTHON_FONTTOOLS_VERSION = 4.47.0 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).tar.gz -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/6d/f8/d3116b436553856df4ed9094584ac55c5e99ee9d9f3369f2912bbb8d0b90 +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/dd/e5/9adc30ebca9009d5ad36c7e74462ee5fc51985ca9a845fd26f9f5c99b3df PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:59 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:59 +0100 Subject: [Buildroot] [git commit] package/python-frozenlist: bump to version 1.4.1 Message-ID: <20240206103429.2E42686F9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fc447def738722318fe73fe00da4c10166d012d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-frozenlist/python-frozenlist.hash | 4 ++-- package/python-frozenlist/python-frozenlist.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-frozenlist/python-frozenlist.hash b/package/python-frozenlist/python-frozenlist.hash index 466dd6931b..40a87d2ec0 100644 --- a/package/python-frozenlist/python-frozenlist.hash +++ b/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 4a14df2fe30853d9e18f73002493a860 frozenlist-1.4.0.tar.gz -sha256 09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251 frozenlist-1.4.0.tar.gz +md5 e64b421e8e571623695cd414515f0081 frozenlist-1.4.1.tar.gz +sha256 c037a86e8513059a2613aaba4d817bb90b9d9b6b69aace3ce9c877e8c8ed402b frozenlist-1.4.1.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 10c6bc6314..9333598808 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.4.0 +PYTHON_FROZENLIST_VERSION = 1.4.1 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/8c/1f/49c96ccc87127682ba900b092863ef7c20302a2144b3185412a08480ca22 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/cf/3d/2102257e7acad73efc4a0c306ad3953f68c504c16982bbdfee3ad75d8085 PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:30:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:30:56 +0100 Subject: [Buildroot] [git commit] package/python-greenlet: bump to version 3.0.3 Message-ID: <20240206103429.58CAE86F9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d45f45fb74a2c60e7bc4fed7abe209cd63eee5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-greenlet/python-greenlet.hash | 4 ++-- package/python-greenlet/python-greenlet.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-greenlet/python-greenlet.hash b/package/python-greenlet/python-greenlet.hash index 2de253e1b5..61e7f05346 100644 --- a/package/python-greenlet/python-greenlet.hash +++ b/package/python-greenlet/python-greenlet.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/greenlet/json -md5 3905122960191e81410714f7db4835e4 greenlet-3.0.1.tar.gz -sha256 816bd9488a94cba78d93e1abb58000e8266fa9cc2aa9ccdd6eb0696acb24005b greenlet-3.0.1.tar.gz +md5 170495b0af3b63ca40ca637dd6e5c6ef greenlet-3.0.3.tar.gz +sha256 43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491 greenlet-3.0.3.tar.gz # Locally computed sha256 checksums sha256 769831d6e5dfaf2c20802faccff1fafb4c2025dd8f6253dfa47fcad59d4d0979 LICENSE sha256 e5ff3c23c110e494cd7d736c10fd96d462457bafeca310840db6527298c7d46b LICENSE.PSF diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 7ca1ac1674..1af104519b 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GREENLET_VERSION = 3.0.1 +PYTHON_GREENLET_VERSION = 3.0.3 PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz -PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/54/df/718c9b3e90edba70fa919bb3aaa5c3c8dabf3a8252ad1e93d33c348e5ca4 +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/17/14/3bddb1298b9a6786539ac609ba4b7c9c0842e12aa73aaa4d8d73ec8f8185 PYTHON_GREENLET_SETUP_TYPE = setuptools PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF From thomas.petazzoni at bootlin.com Tue Feb 6 10:31:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:31:01 +0100 Subject: [Buildroot] [git commit] package/python-hatch-vcs: bump to version 0.4.0 Message-ID: <20240206103429.6848286F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9e7dc1f213c417f0d9de1d92bd9721e679dee1bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-hatch-vcs/python-hatch-vcs.hash | 4 ++-- package/python-hatch-vcs/python-hatch-vcs.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatch-vcs/python-hatch-vcs.hash b/package/python-hatch-vcs/python-hatch-vcs.hash index 6e5fe1de13..55cd3b3e5a 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.hash +++ b/package/python-hatch-vcs/python-hatch-vcs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatch_vcs/json -md5 c2f2cbe6851b7b2969cb4aa24c4b9b2f hatch_vcs-0.3.0.tar.gz -sha256 cec5107cfce482c67f8bc96f18bbc320c9aa0d068180e14ad317bbee5a153fee hatch_vcs-0.3.0.tar.gz +md5 d801fe7c3e5955307748f2790bbb3488 hatch_vcs-0.4.0.tar.gz +sha256 093810748fe01db0d451fabcf2c1ac2688caefd232d4ede967090b1c1b07d9f7 hatch_vcs-0.4.0.tar.gz # Locally computed sha256 checksums sha256 117aa5006d8475562f04442ab06dd2a4c501af3a77255eae0deef1f0c2499a1a LICENSE.txt diff --git a/package/python-hatch-vcs/python-hatch-vcs.mk b/package/python-hatch-vcs/python-hatch-vcs.mk index ef5f6541cd..46e59f8aa0 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.mk +++ b/package/python-hatch-vcs/python-hatch-vcs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCH_VCS_VERSION = 0.3.0 +PYTHON_HATCH_VCS_VERSION = 0.4.0 PYTHON_HATCH_VCS_SOURCE = hatch_vcs-$(PYTHON_HATCH_VCS_VERSION).tar.gz -PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/04/33/b68d68e532392d938472d16a03e4ce0ccd749ea31b42d18f8baa6547cbfd +PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/f5/c9/54bb4fa27b4e4a014ef3bb17710cdf692b3aa2cbc7953da885f1bf7e06ea PYTHON_HATCH_VCS_LICENSE = MIT PYTHON_HATCH_VCS_LICENSE_FILES = LICENSE.txt PYTHON_HATCH_VCS_SETUP_TYPE = pep517 From thomas.petazzoni at bootlin.com Tue Feb 6 10:31:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:31:05 +0100 Subject: [Buildroot] [git commit] package/python-hatchling: bump to version 1.21.0 Message-ID: <20240206103429.793BC86F9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1c77f08ac4dd3f963f65da608bb3043011e47a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-hatchling/python-hatchling.hash | 4 ++-- package/python-hatchling/python-hatchling.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index ebb412d197..e1798e882c 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 43f7203cacb6c3c178b93149b8a8151d hatchling-1.18.0.tar.gz -sha256 50e99c3110ce0afc3f7bdbadff1c71c17758e476731c27607940cfa6686489ca hatchling-1.18.0.tar.gz +md5 21e5e7ed5fa6dd0618c5b66eb847f370 hatchling-1.21.0.tar.gz +sha256 5c086772357a50723b825fd5da5278ac7e3697cdf7797d07541a6c90b6ff754c hatchling-1.21.0.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index f13e6d3e28..d1ed4d23c2 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.18.0 +PYTHON_HATCHLING_VERSION = 1.21.0 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/e3/57/87da2c5adc173950ebe9f1acce4d5f2cd0a960783992fd4879a899a0b637 +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/fd/4a/8196e79c0d6e5eb10436dd2fcccc889a76af6ecf9bc35f87408159497d4d PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 From thomas.petazzoni at bootlin.com Tue Feb 6 10:29:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:29:06 +0100 Subject: [Buildroot] [git commit] package/python-google-auth: bump to version 2.26.1 Message-ID: <20240206103429.3DCFF86F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5005df17602305dd8de74264521f3d6e1398b38 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-google-auth/python-google-auth.hash | 4 ++-- package/python-google-auth/python-google-auth.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-google-auth/python-google-auth.hash b/package/python-google-auth/python-google-auth.hash index 2f965edc91..9c201391f4 100644 --- a/package/python-google-auth/python-google-auth.hash +++ b/package/python-google-auth/python-google-auth.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/google-auth/json -md5 40413bc699c6e02d7732e7e09e8cec0c google-auth-2.25.2.tar.gz -sha256 42f707937feb4f5e5a39e6c4f343a17300a459aaf03141457ba505812841cc40 google-auth-2.25.2.tar.gz +md5 718e1a2c55baf3b019e9a42524812113 google-auth-2.26.1.tar.gz +sha256 54385acca5c0fbdda510cd8585ba6f3fcb06eeecf8a6ecca39d3ee148b092590 google-auth-2.26.1.tar.gz # Locally computed sha256 checksums sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-google-auth/python-google-auth.mk b/package/python-google-auth/python-google-auth.mk index 8638a2ca46..02c8c1164f 100644 --- a/package/python-google-auth/python-google-auth.mk +++ b/package/python-google-auth/python-google-auth.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GOOGLE_AUTH_VERSION = 2.25.2 +PYTHON_GOOGLE_AUTH_VERSION = 2.26.1 PYTHON_GOOGLE_AUTH_SOURCE = google-auth-$(PYTHON_GOOGLE_AUTH_VERSION).tar.gz -PYTHON_GOOGLE_AUTH_SITE = https://files.pythonhosted.org/packages/05/77/84608894384e02f3b0b2621b09ecb0b85e57ba368f13eecbbc43cd1b8719 +PYTHON_GOOGLE_AUTH_SITE = https://files.pythonhosted.org/packages/bc/c0/b5119831db4888e703b2adaa912709931181678ae3a50ca08d51a3904765 PYTHON_GOOGLE_AUTH_SETUP_TYPE = setuptools PYTHON_GOOGLE_AUTH_LICENSE = Apache-2.0 PYTHON_GOOGLE_AUTH_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:33:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:33:10 +0100 Subject: [Buildroot] [git commit] package/python-httpx: bump to version 0.26.0 Message-ID: <20240206103429.962F686F9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd181c4de18d7049fa99ba977288dfe19474e121 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-httpx/python-httpx.hash | 4 ++-- package/python-httpx/python-httpx.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-httpx/python-httpx.hash b/package/python-httpx/python-httpx.hash index fc4a68cf51..26e39fcc6d 100644 --- a/package/python-httpx/python-httpx.hash +++ b/package/python-httpx/python-httpx.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httpx/json -md5 f4dcf1002b2116c634a53534ce9d6776 httpx-0.25.2.tar.gz -sha256 8b8fcaa0c8ea7b05edd69a094e63a2094c4efcb48129fb757361bc423c0ad9e8 httpx-0.25.2.tar.gz +md5 3785c8a8930a7c7280206f79c170658f httpx-0.26.0.tar.gz +sha256 451b55c30d5185ea6b23c2c793abf9bb237d2a7dfb901ced6ff69ad37ec1dfaf httpx-0.26.0.tar.gz # Locally computed sha256 checksums sha256 4ec59d544f12b5f539a3a716fd321ac58ccd8030b465221f2c880200cdf28d8d LICENSE.md diff --git a/package/python-httpx/python-httpx.mk b/package/python-httpx/python-httpx.mk index 88166ad242..cbc9c9298b 100644 --- a/package/python-httpx/python-httpx.mk +++ b/package/python-httpx/python-httpx.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPX_VERSION = 0.25.2 +PYTHON_HTTPX_VERSION = 0.26.0 PYTHON_HTTPX_SOURCE = httpx-$(PYTHON_HTTPX_VERSION).tar.gz -PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/8c/23/911d93a022979d3ea295f659fbe7edb07b3f4561a477e83b3a6d0e0c914e +PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/bd/26/2dc654950920f499bd062a211071925533f821ccdca04fa0c2fd914d5d06 PYTHON_HTTPX_SETUP_TYPE = pep517 PYTHON_HTTPX_LICENSE = BSD-3-Clause PYTHON_HTTPX_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Tue Feb 6 10:33:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:33:04 +0100 Subject: [Buildroot] [git commit] package/python-hiredis: bump to version 2.3.2 Message-ID: <20240206103429.873BA86F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a211f917d2f93504f9b78547d7594f46b77a4b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Hash for LICENSE file changed due to license change to MIT: https://github.com/redis/hiredis-py/commit/1e29dd4719a44092e8317d6cddb8075a4a143e0e The vendor/hiredis/COPYING file remains BSD-3-Clause. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-hiredis/python-hiredis.hash | 6 +++--- package/python-hiredis/python-hiredis.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-hiredis/python-hiredis.hash b/package/python-hiredis/python-hiredis.hash index 372f2f50ae..ad33295ad7 100644 --- a/package/python-hiredis/python-hiredis.hash +++ b/package/python-hiredis/python-hiredis.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/hiredis/json -md5 670a932c2972cbd88f910c2b29f85c3c hiredis-2.2.3.tar.gz -sha256 e75163773a309e56a9b58165cf5a50e0f84b755f6ff863b2c01a38918fe92daa hiredis-2.2.3.tar.gz +md5 8823961dc3ba19a6e63ab6329b3b852f hiredis-2.3.2.tar.gz +sha256 733e2456b68f3f126ddaf2cd500a33b25146c3676b97ea843665717bda0c5d43 hiredis-2.3.2.tar.gz # Locally computed sha256 checksums -sha256 65d467915fa36249f60e6942c9d44dfe54d75882e6b66e94fc6c3971fcde1722 LICENSE +sha256 3256b5b77e98aa34ff31a4d2c2c10f7f177b0f3058753a6044430a168987353b LICENSE sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb vendor/hiredis/COPYING diff --git a/package/python-hiredis/python-hiredis.mk b/package/python-hiredis/python-hiredis.mk index 5aceb15ae1..d86fb109dc 100644 --- a/package/python-hiredis/python-hiredis.mk +++ b/package/python-hiredis/python-hiredis.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_HIREDIS_VERSION = 2.2.3 +PYTHON_HIREDIS_VERSION = 2.3.2 PYTHON_HIREDIS_SOURCE = hiredis-$(PYTHON_HIREDIS_VERSION).tar.gz -PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/b0/04/dab6792584fc548803ffa50b5bb2b99f01d3ab04d7c7f64e85f1a22fb847 +PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/fe/2d/a5ae61da1157644f7e52e088fa158ac6f5d09775112d14b1c9b9a5156bf1 PYTHON_HIREDIS_SETUP_TYPE = setuptools -PYTHON_HIREDIS_LICENSE = BSD-3-Clause +PYTHON_HIREDIS_LICENSE = MIT, BSD-3-Clause PYTHON_HIREDIS_LICENSE_FILES = LICENSE vendor/hiredis/COPYING $(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 10:34:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:34:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-dtschema: bump to version 2023.11 In-Reply-To: <20240109071343.4025060-1-james.hilliard1@gmail.com> References: <20240109071343.4025060-1-james.hilliard1@gmail.com> Message-ID: <20240206113440.3bb84626@windsurf> On Tue, 9 Jan 2024 00:13:43 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-dtschema/python-dtschema.hash | 4 ++-- > package/python-dtschema/python-dtschema.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:34:47 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:34:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-engineio: bump to version 4.8.2 In-Reply-To: <20240109071647.4027355-1-james.hilliard1@gmail.com> References: <20240109071647.4027355-1-james.hilliard1@gmail.com> Message-ID: <20240206113447.279e114d@windsurf> On Tue, 9 Jan 2024 00:16:47 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-engineio/python-engineio.hash | 4 ++-- > package/python-engineio/python-engineio.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:34:55 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:34:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-esptool: bump to version 4.7.0 In-Reply-To: <20240109072423.4031745-1-james.hilliard1@gmail.com> References: <20240109072423.4031745-1-james.hilliard1@gmail.com> Message-ID: <20240206113455.797a6d25@windsurf> On Tue, 9 Jan 2024 00:24:23 -0700 James Hilliard wrote: > Add new python-intelhex runtime dependency. > > Add new python-pyyaml runtime dependency. > > Signed-off-by: James Hilliard > --- > package/python-esptool/Config.in | 2 ++ > package/python-esptool/python-esptool.hash | 4 ++-- > package/python-esptool/python-esptool.mk | 4 ++-- > 3 files changed, 6 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-falcon: bump to version 3.1.3 In-Reply-To: <20240109072834.4036277-1-james.hilliard1@gmail.com> References: <20240109072834.4036277-1-james.hilliard1@gmail.com> Message-ID: <20240206113502.0a0332e5@windsurf> On Tue, 9 Jan 2024 00:28:34 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-falcon/python-falcon.hash | 4 ++-- > package/python-falcon/python-falcon.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-flask-smorest: bump to version 0.42.3 In-Reply-To: <20240109073709.4042044-1-james.hilliard1@gmail.com> References: <20240109073709.4042044-1-james.hilliard1@gmail.com> Message-ID: <20240206113508.0b8ed0f5@windsurf> On Tue, 9 Jan 2024 00:37:09 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-flask-smorest/python-flask-smorest.hash | 4 ++-- > package/python-flask-smorest/python-flask-smorest.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-fonttools: bump to version 4.47.0 In-Reply-To: <20240109074024.4045632-1-james.hilliard1@gmail.com> References: <20240109074024.4045632-1-james.hilliard1@gmail.com> Message-ID: <20240206113514.0d220c19@windsurf> On Tue, 9 Jan 2024 00:40:24 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-fonttools/python-fonttools.hash | 4 ++-- > package/python-fonttools/python-fonttools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-frozenlist: bump to version 1.4.1 In-Reply-To: <20240109074803.4049179-1-james.hilliard1@gmail.com> References: <20240109074803.4049179-1-james.hilliard1@gmail.com> Message-ID: <20240206113521.3871c5af@windsurf> On Tue, 9 Jan 2024 00:48:03 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-frozenlist/python-frozenlist.hash | 4 ++-- > package/python-frozenlist/python-frozenlist.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-google-auth: bump to version 2.26.1 In-Reply-To: <20240109075433.4054341-1-james.hilliard1@gmail.com> References: <20240109075433.4054341-1-james.hilliard1@gmail.com> Message-ID: <20240206113531.5d2aae93@windsurf> On Tue, 9 Jan 2024 00:54:33 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-google-auth/python-google-auth.hash | 4 ++-- > package/python-google-auth/python-google-auth.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-greenlet: bump to version 3.0.3 In-Reply-To: <20240109075836.4057394-1-james.hilliard1@gmail.com> References: <20240109075836.4057394-1-james.hilliard1@gmail.com> Message-ID: <20240206113536.11f06c7e@windsurf> On Tue, 9 Jan 2024 00:58:36 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-greenlet/python-greenlet.hash | 4 ++-- > package/python-greenlet/python-greenlet.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-hatch-vcs: bump to version 0.4.0 In-Reply-To: <20240109080239.4060095-1-james.hilliard1@gmail.com> References: <20240109080239.4060095-1-james.hilliard1@gmail.com> Message-ID: <20240206113541.1e26c600@windsurf> On Tue, 9 Jan 2024 01:02:39 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-hatch-vcs/python-hatch-vcs.hash | 4 ++-- > package/python-hatch-vcs/python-hatch-vcs.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-hatchling: bump to version 1.21.0 In-Reply-To: <20240109080546.4062850-1-james.hilliard1@gmail.com> References: <20240109080546.4062850-1-james.hilliard1@gmail.com> Message-ID: <20240206113545.230a4c6a@windsurf> On Tue, 9 Jan 2024 01:05:46 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-hatchling/python-hatchling.hash | 4 ++-- > package/python-hatchling/python-hatchling.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:48 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-hiredis: bump to version 2.3.2 In-Reply-To: <20240109081115.4065619-1-james.hilliard1@gmail.com> References: <20240109081115.4065619-1-james.hilliard1@gmail.com> Message-ID: <20240206113548.2b602528@windsurf> On Tue, 9 Jan 2024 01:11:15 -0700 James Hilliard wrote: > Hash for LICENSE file changed due to license change to MIT: > https://github.com/redis/hiredis-py/commit/1e29dd4719a44092e8317d6cddb8075a4a143e0e > > The vendor/hiredis/COPYING file remains BSD-3-Clause. > > Signed-off-by: James Hilliard > --- > package/python-hiredis/python-hiredis.hash | 6 +++--- > package/python-hiredis/python-hiredis.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-httpx: bump to version 0.26.0 In-Reply-To: <20240109081438.4068105-1-james.hilliard1@gmail.com> References: <20240109081438.4068105-1-james.hilliard1@gmail.com> Message-ID: <20240206113552.410a7350@windsurf> On Tue, 9 Jan 2024 01:14:38 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-httpx/python-httpx.hash | 4 ++-- > package/python-httpx/python-httpx.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:39:46 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:39:46 +0100 Subject: [Buildroot] [git commit] configs/qemu_{arm, aarch64}_ebbr: bump Linux, U-Boot and TF-A Message-ID: <20240206104004.BC4C486FA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73813c56c8bb3e781376f333125a13048be690b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump qemu_arm_ebbr_defconfig and qemu_aarch64_ebbr_defconfig in sync: - Bump Linux to v6.6.11 - Bump U-Boot to 2024.01 - Bump TF-A to v2.10 While at it, adapt Qemu command line arguments to avoid a warning when disabling ACPI. Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/aarch64-ebbr/readme.txt | 6 ++---- board/qemu/arm-ebbr/readme.txt | 3 +-- configs/qemu_aarch64_ebbr_defconfig | 8 ++++---- configs/qemu_arm_ebbr_defconfig | 8 ++++---- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/board/qemu/aarch64-ebbr/readme.txt b/board/qemu/aarch64-ebbr/readme.txt index 76d566045d..15353a8f68 100644 --- a/board/qemu/aarch64-ebbr/readme.txt +++ b/board/qemu/aarch64-ebbr/readme.txt @@ -26,7 +26,7 @@ Running under Qemu Run the emulation with: qemu-system-aarch64 \ - -M virt,secure=on \ + -M virt,secure=on,acpi=off \ -bios output/images/flash.bin \ -cpu cortex-a53 \ -device virtio-blk-device,drive=hd0 \ @@ -35,7 +35,6 @@ Run the emulation with: -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ -m 2048 \ -netdev user,id=eth0 \ - -no-acpi \ -nographic \ -object rng-random,filename=/dev/urandom,id=rng0 \ -rtc base=utc,clock=host \ @@ -63,7 +62,7 @@ image first with: Then run the OS installer iso image on emulation with: qemu-system-aarch64 \ - -M virt,secure=on \ + -M virt,secure=on,acpi=off \ -bios output/images/flash.bin \ -cpu cortex-a53 \ -device virtio-blk-device,drive=hd1 \ @@ -74,7 +73,6 @@ Then run the OS installer iso image on emulation with: -drive file=disk.qcow2,if=none,id=hd1 \ -m 2048 \ -netdev user,id=eth0 \ - -no-acpi \ -nographic \ -object rng-random,filename=/dev/urandom,id=rng0 \ -rtc base=utc,clock=host \ diff --git a/board/qemu/arm-ebbr/readme.txt b/board/qemu/arm-ebbr/readme.txt index dc2b0647a2..19e114579f 100644 --- a/board/qemu/arm-ebbr/readme.txt +++ b/board/qemu/arm-ebbr/readme.txt @@ -26,7 +26,7 @@ Running under Qemu Run the emulation with: qemu-system-arm \ - -M virt,secure=on \ + -M virt,secure=on,acpi=off \ -bios output/images/flash.bin \ -cpu cortex-a15 \ -device virtio-blk-device,drive=hd0 \ @@ -35,7 +35,6 @@ Run the emulation with: -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ -m 1024 \ -netdev user,id=eth0 \ - -no-acpi \ -nographic \ -object rng-random,filename=/dev/urandom,id=rng0 \ -rtc base=utc,clock=host \ diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 7807814aff..75a892f798 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -27,7 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # Firmware and bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -39,7 +39,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index cfeea623ff..a0520edcf4 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # Firmware and bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -42,7 +42,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From thomas.petazzoni at bootlin.com Tue Feb 6 10:40:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:40:02 +0100 Subject: [Buildroot] [PATCH] configs/qemu_{arm, aarch64}_ebbr: bump Linux, U-Boot and TF-A In-Reply-To: <20240111135749.1681557-1-vincent.stehle@arm.com> References: <20240111135749.1681557-1-vincent.stehle@arm.com> Message-ID: <20240206114002.317ff5b6@windsurf> On Thu, 11 Jan 2024 14:57:04 +0100 Vincent Stehl? wrote: > Bump qemu_arm_ebbr_defconfig and qemu_aarch64_ebbr_defconfig in sync: > > - Bump Linux to v6.6.11 > - Bump U-Boot to 2024.01 > - Bump TF-A to v2.10 > > While at it, adapt Qemu command line arguments to avoid a warning when > disabling ACPI. > > Signed-off-by: Vincent Stehl? > Cc: Romain Naour > --- Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Tue Feb 6 10:47:28 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 11:47:28 +0100 Subject: [Buildroot] Ignore build directories created via make O=dir or the default one In-Reply-To: References: Message-ID: On 06/02/2024 11:22, Yegor Yefremov via buildroot wrote: > Hi all, > > what about adding a .gitignore file with an "*" everytime we create an > output directory? Does anything speak against such an approach? I like that idea! And then we can remove output/ from .gitignore as well. I always found that a bit annoying. Regards, Arnout > > Regards, > Yegor > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Tue Feb 6 10:52:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:52:09 +0100 Subject: [Buildroot] [git commit] docs/manual: extend makedev syntax section Message-ID: <20240206105232.28F4C86FAA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=738fb6dfa48b19f39e4a8df38ac9dcc0b37e0aa4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The section of the manual describing the makedev syntax is not up-to-date with the current features, and does not properly describe existing ones. - extend the list of types with the requirements on the existence of the target file or directory; for 'c', 'b', and 'p', the existence requirement is inherited from mknod(2): ERRORS ... ENOENT A directory component in pathname does not exist or is a dangling symbolic link. for the other types, the existence requirements are extracted from the source of makedev.c; - format the types flags, so they are rendered in monospace; - extend the 'mode' description, as it can be set to -1 for 'f', 'd', or 'r', so that only the uid and gid are set. This is most useful for 'r', where setting the same mode recursively for all the sub-directories and files alike does not really make sense; indeed in this case, the modes are usually set correctly when the package (or rootfs overlay) installs the files, and only the uid and gid are interesting to set; - extend and update the examples to show-case the -1 mode use-case. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- docs/manual/makedev-syntax.adoc | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/docs/manual/makedev-syntax.adoc b/docs/manual/makedev-syntax.adoc index d6efb31d42..e63c9233eb 100644 --- a/docs/manual/makedev-syntax.adoc +++ b/docs/manual/makedev-syntax.adoc @@ -22,14 +22,19 @@ There are a few non-trivial blocks: - +name+ is the path to the file you want to create/modify - +type+ is the type of the file, being one of: - * f: a regular file - * d: a directory - * r: a directory recursively - * c: a character device file - * b: a block device file - * p: a named pipe + * `f`: a regular file, which must already exist + * `F`: a regular file, which is ignored and not created if missing + * `d`: a directory, which is created, as well as its parents, if missing + * `r`: a directory recursively, which must already exist + * `c`: a character device file, which parent directory must exist + * `b`: a block device file, which parent directory must exist + * `p`: a named pipe, which parent directory must exist - +mode+ are the usual permissions settings (only numerical values - are allowed) + are allowed); + for type `d`, the mode of existing parents is not changed, but the mode + of created parents is set; + for types `f`, `F`, and `r`, +mode+ can also be set to +-1+ to not + change the mode (and only change uid and gid) - +uid+ and +gid+ are the UID and GID to set on this file; can be either numerical values or actual names - +major+ and +minor+ are here for device files, set to +-+ for other @@ -38,22 +43,22 @@ There are a few non-trivial blocks: of files, and can be reduced to a loop, beginning at +start+, incrementing its counter by +inc+ until it reaches +count+ -Let's say you want to change the permissions of a given file; using -this syntax, you will need to write: +Let's say you want to change the ownership and permissions of a given +file; using this syntax, you will need to write: ---- /usr/bin/foo f 755 0 0 - - - - - /usr/bin/bar f 755 root root - - - - - /data/buz f 644 buz-user buz-group - - - - - +/data/baz f -1 baz-user baz-group - - - - - ---- -Alternatively, if you want to change owner/permission of a directory -recursively, you can write (to set UID to foo, GID to bar and access -rights to rwxr-x--- for the directory /usr/share/myapp and all files -and directories below it): +Alternatively, if you want to change owner of a directory recursively, +you can write (to set UID to `foo` and GID to `bar` for the directory +`/usr/share/myapp` and all files and directories below it): ---- -/usr/share/myapp r 750 foo bar - - - - - +/usr/share/myapp r -1 foo bar - - - - - ---- On the other hand, if you want to create the device file +/dev/hda+ From thomas.petazzoni at bootlin.com Tue Feb 6 10:53:00 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:53:00 +0100 Subject: [Buildroot] [PATCH] docs/manual: extend makedev syntax section In-Reply-To: References: Message-ID: <20240206115300.0bd8b584@windsurf> On Thu, 18 Jan 2024 17:08:50 +0100 wrote: > From: "Yann E. MORIN" > > The section of the manual describing the makedev syntax is not > up-to-date with the current features, and does not properly describe > existing ones. > > - extend the list of types with the requirements on the existence of > the target file or directory; for 'c', 'b', and 'p', the existence > requirement is inherited from mknod(2): > > ERRORS > ... > ENOENT A directory component in pathname does not exist or is a > dangling symbolic link. > > for the other types, the existence requirements are extracted from > the source of makedev.c; > > - format the types fags, so they are rendered in monospace; > > - extend the 'mode' description, as it can be set to -1 for 'f', 'd', > or 'r', so that only the uid and gid are set. This is most useful > for 'r', where setting the same mode recursively for all the > sub-directories and files alike does not really make sense; indeed > in this case, the modes are usually set correctly when the package > (or rootfs overlay) installs the files, and only the uid and gid are > interesting to set; > > - extend and update the examples to show-case the -1 mode use-case. > > Signed-off-by: Yann E. MORIN > --- > docs/manual/makedev-syntax.adoc | 33 +++++++++++++++++++-------------- > 1 file changed, 19 insertions(+), 14 deletions(-) Applied to master (with the typo in the commit log fixed), thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From buildroot at bubu1.eu Tue Feb 6 10:52:37 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:37 +0100 Subject: [Buildroot] [PATCH 1/6] utils/readme.txt: expand check-package description Message-ID: <20240206105246.1220945-1-buildroot@bubu1.eu> check-package does a lot more by now than checking .mk and Config.in files. Add this to the description. Signed-off-by: Marcus Hoffmann --- utils/readme.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/readme.txt b/utils/readme.txt index 3e8833c4ea..d5cda70bfc 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -12,8 +12,11 @@ brmake nothing. check-package - a script that checks the coding style of a package's Config.in and - .mk files, and also tests them for various types of typoes. + a script that checks the coding style across the buildroot tree. It + checks package's Config.in and .mk files, runs shellcheck for all shell + scripts, flake8 for python files, checks for typoes, etc. + It checks the .checkpackageignore file if errors should be ignored and + errors if there's a file listed that doesn't produce an error. genrandconfig a script that generates a random configuration, used by the autobuilders -- 2.43.0 From buildroot at bubu1.eu Tue Feb 6 10:52:38 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:38 +0100 Subject: [Buildroot] [PATCH 2/6] utils/readme.txt: document docker-run script In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: <20240206105246.1220945-2-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- utils/readme.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/readme.txt b/utils/readme.txt index d5cda70bfc..2cb6b0af9b 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -18,6 +18,10 @@ check-package It checks the .checkpackageignore file if errors should be ignored and errors if there's a file listed that doesn't produce an error. +docker-run + a script that runs a command (like make check-package) inside the buildroot + ci docker container. + genrandconfig a script that generates a random configuration, used by the autobuilders (http://autobuild.buildroot.org). It selects a random toolchain from -- 2.43.0 From buildroot at bubu1.eu Tue Feb 6 10:52:39 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:39 +0100 Subject: [Buildroot] [PATCH 3/6] docs/website/support.html: document how to join irc channel from matrix In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: <20240206105246.1220945-3-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- docs/website/support.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/website/support.html b/docs/website/support.html index 9be816f836..13d63b13a9 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -21,7 +21,9 @@

The Buildroot IRC channel is #buildroot, hosted on OFTC. If you do not have an IRC client, you can - use the OFTC web interface. + use the OFTC web interface. The + channel is also bridged to matrix as + #_oftc_#buildroot:matrix.org. When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

-- 2.43.0 From buildroot at bubu1.eu Tue Feb 6 10:52:40 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:40 +0100 Subject: [Buildroot] [PATCH 4/6] docs/website/support.html: document irc channel permission changes In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: <20240206105246.1220945-4-buildroot@bubu1.eu> The #buildroot IRC channel recently changed from only allowing registered users to join to allowing anyone to join but only allowing registered users to talk in the channel. This still avoids the spam problem on IRC while allowing an exception for users bridged from matrix.org. These already have a username registered on the matrix side and thus similar properties as a registered IRC user/nick. The commands to set these options were: * Set +q on all unregistered nicks: ~/mode #buildroot +q $~a~ this lets people join but they can't talk * Set exempt on matrix hosts: ~/mode #buildroot +e $x:matrix.org~ Signed-off-by: Marcus Hoffmann --- docs/website/support.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/support.html b/docs/website/support.html index 13d63b13a9..28873c6d76 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -27,8 +27,8 @@ When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

-

Note that due to excessive spamming on IRC, the channel can only be - joined if you are a registered user with +

Note that due to excessive spamming on IRC, you can only talk in the + channel if you are a registered user with OFTC NickServ service. Follow the instructions to register as a user with a password, and then join the #buildroot channel.

-- 2.43.0 From buildroot at bubu1.eu Tue Feb 6 10:52:41 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:41 +0100 Subject: [Buildroot] [PATCH 5/6] docs/manual/contribute.adoc: link to git-send-email.io In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: <20240206105246.1220945-5-buildroot@bubu1.eu> https://git-send-email.io/ is a page maintained by sourcehut which explains how to setup git send-email on many OS's for many popular email providers. Signed-off-by: Marcus Hoffmann --- docs/manual/contribute.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 2b90d13b41..684e9f4809 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -369,7 +369,7 @@ $ git send-email origin/master --------------------- Note that +git+ should be configured to use your mail account. -To configure +git+, see +man git-send-email+ or google it. +To configure +git+, see +man git-send-email+ or https://git-send-email.io/. If you do not use +git send-email+, make sure posted *patches are not line-wrapped*, otherwise they cannot easily be applied. In such a case, -- 2.43.0 From buildroot at bubu1.eu Tue Feb 6 10:52:42 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:42 +0100 Subject: [Buildroot] [PATCH 6/6] docs/manual/contribute.adoc: mention sr.ht as an alternative for sending patches In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: <20240206105246.1220945-6-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- docs/manual/contribute.adoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 684e9f4809..7d0611be28 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -375,6 +375,14 @@ If you do not use +git send-email+, make sure posted *patches are not line-wrapped*, otherwise they cannot easily be applied. In such a case, fix your e-mail client, or better yet, learn to use +git send-email+. +https://sr.ht also has a light-weight UI for +https://man.sr.ht/git.sr.ht/#sending-patches-upstream[preparing patchseries] +and can also send out the patches for you. There are a few drawbacks to +this, as you cannot edit your patches' status in Patchwork and you +currently can't edit your display name with which the match emails are +sent out but it is an option if you cannot get git send-email to work +with your mail provider (i.e. O365). + ==== Cover letter If you want to present the whole patch set in a separate mail, add -- 2.43.0 From giulio.benetti at benettiengineering.com Tue Feb 6 11:02:57 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 12:02:57 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/milkv_duo: new defconfig In-Reply-To: References: Message-ID: <9e961c64-a539-4c3d-9324-dfe23315bea1@benettiengineering.com> Hi Hanyuan, On 06/02/24 03:40, hanyuan via buildroot wrote: > Hello Giulio, > > Thanks! It?s nice to get your reviews. Let me explain some of them. > >> 2024?2?6? 01:25?Giulio Benetti ??? >> >> Hi Hanyuan, >> >> thank for contributing, >> one important note is to swap Patch 1/2 and 2/2. This is because they >> are bisectable this way since on Patch 1/2 you enable packages appearing >> in Patch 2/2, also, > > Got it. Should I later sent the Patch V3 and make them look like: > > [v3,1/2] package/milkv-duo: add packages for milkv-duo > [v3,2/2] configs/milkv_duo: new defconfig Yes > >> can you please provide the board product webpage URL here? >> And also some ION indications too? > > Got it. I would append more info to the readme.txt about what the ION means. > >> All this if statement is redundant with the else part. >> Can you add a variable like: >> FIPTOOL_ARGUMENTS = genfip ${BINARIES_DIR}/fip.bin \ >> --MONITOR_RUNADDR=0x80000000 \ >> --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ >> --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ >> --NAND_INFO=00000000 \ >> --BL2=${BINARIES_DIR}/bl2.bin \ >> --BLCP_IMG_RUNADDR=0x05200200 \ >> --BLCP_PARAM_LOADADDR=0 \ >> --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ >> --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ >> --LOADER_2ND=${BINARIES_DIR}/u-boot.bin \ >> >> and then you add or not the remaining BLCP* variables below and execute >> ${BINARIES_DIR}/fiptool.py ${FIPTOOL_ARGUMENTS} >> Then this nested if statement and.. >> ..this are redundant too. Can you provide a single if-else-fi statement >> outside the main if statement... >> ... here? >> > > Sorry for that. OK, I would make these lines look better. > >> Is CXX needed by any package selected here? > > At that time I submitted the patch I haven?t understand the buildroot?s minimal > philosophy too much. Sorry for that. I would remove this line. > >> here you need: >> BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> here you need: >> BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > OK. I will add them. > >> For the rest the patch looks good and builds fine using utils/docker-run except package htop that fails to build due to gcc ICE 109809 for which >> I've sent a patch: >> https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 >> >> So this patchset depends on patchset above for htop gcc ICE. > > I think I should tell you this. In fact I encountered another gcc bug > when using all the t-head?s optimizations with the glibc. The gcc reported > internal errors when we > > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > > So we have to use musl and find this bug is not reported anymore. I was wondering why you were using exactly musl and I suspected something like that. > Maybe the htop compiling bug comes from these optimizations. > I would have a try what would happen if we disable all the t-head > features and then compile the htop. If it is really the t-head?s problem, > maybe we can let the t-head?s optimizations go. I've worked it around with this[0], so no need to remove optimizations. [0]: https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > Thanks again for your careful review! > > Best regards, > Hanyuan > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From sergio.prado at e-labworks.com Tue Feb 6 11:21:09 2024 From: sergio.prado at e-labworks.com (sergio.prado at e-labworks.com) Date: Tue, 6 Feb 2024 08:21:09 -0300 Subject: [Buildroot] [PATCH] package/azure-iot-sdk-c: bump to version LTS_08_2023 Message-ID: <20240206112109.2175948-1-sergio.prado@e-labworks.com> From: Sergio Prado Release notes: https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_08_2023 Signed-off-by: Sergio Prado --- package/azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash index b960c0e571d0..d51dcc60aab2 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7b52b9886a3aff20a55a0d5bc5e140c212f85fd06af18c31291c15d363743a77 azure-iot-sdk-c-LTS_01_2023_Ref02-br1.tar.gz +sha256 b853d5ab04f3c6863fe78e3936f0d0840012d5260ae4a3b23f03e157395dc15b azure-iot-sdk-c-LTS_08_2023-br1.tar.gz # Hash for license files: sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index e07cdf986e4f..4d0ecb077f8b 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = LTS_01_2023_Ref02 +AZURE_IOT_SDK_C_VERSION = LTS_08_2023 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES -- 2.34.1 From arnout at mind.be Tue Feb 6 12:33:06 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 13:33:06 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-fastapi: bump to version 0.109.2 In-Reply-To: <20240205164615.510688-2-james.hilliard1@gmail.com> References: <20240205164615.510688-1-james.hilliard1@gmail.com> <20240205164615.510688-2-james.hilliard1@gmail.com> Message-ID: <931454f1-052c-4146-9c91-706cd65770ba@mind.be> On 05/02/2024 17:46, James Hilliard wrote: > Signed-off-by: James Hilliard Instead of this one, I applied Marcus's one. Regards, Arnout > --- > package/python-fastapi/python-fastapi.hash | 4 ++-- > package/python-fastapi/python-fastapi.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash > index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz > -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz > +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz > +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 > --- a/package/python-fastapi/python-fastapi.mk > +++ b/package/python-fastapi/python-fastapi.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_FASTAPI_VERSION = 0.105.0 > +PYTHON_FASTAPI_VERSION = 0.109.2 > PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz > -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 > +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 > PYTHON_FASTAPI_SETUP_TYPE = pep517 > PYTHON_FASTAPI_LICENSE = MIT > PYTHON_FASTAPI_LICENSE_FILES = LICENSE From arnout at mind.be Tue Feb 6 12:33:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 13:33:22 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-starlette: bump to version 0.36.3 In-Reply-To: <20240205164615.510688-1-james.hilliard1@gmail.com> References: <20240205164615.510688-1-james.hilliard1@gmail.com> Message-ID: On 05/02/2024 17:46, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-starlette/python-starlette.hash | 4 ++-- > package/python-starlette/python-starlette.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash > index 820026b70b..03d77cf5be 100644 > --- a/package/python-starlette/python-starlette.hash > +++ b/package/python-starlette/python-starlette.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/starlette/json > -md5 2ef2fc635691fd4a1823564218292dce starlette-0.34.0.tar.gz > -sha256 ed050aaf3896945bfaae93bdf337e53ef3f29115a9d9c153e402985115cd9c8e starlette-0.34.0.tar.gz > +md5 0a1e026d653dc448ae07f47eefe1dc8b starlette-0.36.3.tar.gz > +sha256 90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080 starlette-0.36.3.tar.gz > # Locally computed sha256 checksums > sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md > diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk > index 07f9d6be5e..9d137f5f5a 100644 > --- a/package/python-starlette/python-starlette.mk > +++ b/package/python-starlette/python-starlette.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_STARLETTE_VERSION = 0.34.0 > +PYTHON_STARLETTE_VERSION = 0.36.3 > PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz > -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/4f/36/168ba6d56a28382f3b081b23b0cc431de35786e120b94c1f372708ed3059 > +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/be/47/1bba49d42d63f4453f0a64a20acbf2d0bd2f5a8cde6a166ee66c074a08f8 > PYTHON_STARLETTE_SETUP_TYPE = pep517 > PYTHON_STARLETTE_LICENSE = BSD-3-Clause > PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md From arnout at mind.be Tue Feb 6 12:38:34 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 13:38:34 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-fastapi: bump to 0.109.2 In-Reply-To: <170715586410.13905.2351857620201846100-0@git.sr.ht> References: <170715586410.13905.2351857620201846100-0@git.sr.ht> Message-ID: <20938ad1-04e4-4536-8f2c-b85af0c650ca@mind.be> On 05/02/2024 15:12, ~bubu wrote: > From: Marcus Hoffmann > > Drop no longer required dependency on python-anyio. > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Arnout > --- > package/python-fastapi/Config.in | 1 - > package/python-fastapi/python-fastapi.hash | 4 ++-- > package/python-fastapi/python-fastapi.mk | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/python-fastapi/Config.in b/package/python-fastapi/Config.in > index 7d376d3dd7..d4a527c601 100644 > --- a/package/python-fastapi/Config.in > +++ b/package/python-fastapi/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_FASTAPI > bool "python-fastapi" > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core > - select BR2_PACKAGE_PYTHON_ANYIO # runtime > select BR2_PACKAGE_PYTHON_PYDANTIC # runtime > select BR2_PACKAGE_PYTHON_STARLETTE # runtime > select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash > index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz > -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz > +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz > +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 > --- a/package/python-fastapi/python-fastapi.mk > +++ b/package/python-fastapi/python-fastapi.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_FASTAPI_VERSION = 0.105.0 > +PYTHON_FASTAPI_VERSION = 0.109.2 > PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz > -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 > +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 > PYTHON_FASTAPI_SETUP_TYPE = pep517 > PYTHON_FASTAPI_LICENSE = MIT > PYTHON_FASTAPI_LICENSE_FILES = LICENSE From arnout at mind.be Tue Feb 6 12:39:55 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 13:39:55 +0100 Subject: [Buildroot] [PATCH buildroot v2 2/2] support/testing: add fastapi runtime test In-Reply-To: <170715461915.13905.5968173515742280918-1@git.sr.ht> References: <170715461915.13905.5968173515742280918-1@git.sr.ht> Message-ID: <300bce9b-5a17-49aa-a946-4bfbac6a7fba@mind.be> On 05/02/2024 18:25, ~bubu wrote: > From: Marcus Hoffmann > > Add a runtime test for fastapi. Use uvicorn as the asgi server > application as does the fastapi hello world example [1]. > > Fastapi depends on PydanticV2 now which is written in rust so we need to > run the test on armv7. > > [1] https://fastapi.tiangolo.com/tutorial/first-steps/ > > Signed-off-by: Marcus Hoffmann Both applied to master, but this one with a bunch of modifications: - fix flake8 errors support/testing/tests/package/sample_python_fastapi.py:5:1: E302 expected 2 blank lines, found 1 support/testing/tests/package/sample_python_fastapi.py:8:1: W391 blank line at end of file - Remove BR2_CCACHE (as requested by Marcus). - Add a comment explaining that this also tests uvicorn and pydantic. - Re-try wget in a loop instead of a fixed timeout of 30 seconds. - Add a DEVELOPERS entry. Regards, Arnout > --- > .../tests/package/sample_python_fastapi.py | 8 ++++ > .../tests/package/test_python_fastapi.py | 47 +++++++++++++++++++ > 2 files changed, 55 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_fastapi.py > create mode 100644 support/testing/tests/package/test_python_fastapi.py > > diff --git a/support/testing/tests/package/sample_python_fastapi.py b/support/testing/tests/package/sample_python_fastapi.py > new file mode 100644 > index 0000000000..3116df3a93 > --- /dev/null > +++ b/support/testing/tests/package/sample_python_fastapi.py > @@ -0,0 +1,8 @@ > +from fastapi import FastAPI > + > +app = FastAPI() > + > + at app.get("/") > +async def root(): > + return {"message": "Hello World"} > + > diff --git a/support/testing/tests/package/test_python_fastapi.py b/support/testing/tests/package/test_python_fastapi.py > new file mode 100644 > index 0000000000..1a78fa6c58 > --- /dev/null > +++ b/support/testing/tests/package/test_python_fastapi.py > @@ -0,0 +1,47 @@ > +import os > +import time > + > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy3Fastapi(TestPythonPackageBase): > + __test__ = True > + config = \ > + """ > + BR2_arm=y > + BR2_cortex_a9=y > + BR2_ARM_ENABLE_NEON=y > + BR2_ARM_ENABLE_VFP=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_FASTAPI=y > + BR2_PACKAGE_PYTHON_UVICORN=y > + BR2_TARGET_ROOTFS_CPIO=y > + # BR2_TARGET_ROOTFS_TAR is not set > + BR2_CCACHE=y > + BR2_CCACHE_DIR="/home/bubu/.buildroot-ccache" > + """ > + sample_scripts = ["tests/package/sample_python_fastapi.py"] > + timeout = 60 > + > + def test_run(self): > + self.login() > + self.check_sample_scripts_exist() > + cmd = "uvicorn sample_python_fastapi:app > /dev/null 2>&1 &" > + > + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) > + > + # Give enough time for the uvicorn server to start up > + time.sleep(30) > + > + cmd = "wget -q -O - http://127.0.0.1:8000/" > + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output[0], '{"message":"Hello World"}') > + > + def login(self): > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > + self.emulator.boot(arch="armv7", > + kernel="builtin", > + options=["-initrd", cpio_file]) > + self.emulator.login() From arnout at mind.be Tue Feb 6 11:04:23 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 12:04:23 +0100 Subject: [Buildroot] [git commit] package/python-uvicorn: requires PYTHON3_SSL Message-ID: <20240206124011.36A3F86FD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ab334817a1b7ccbc139f0d64ac04c6d7b0ba48a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Uvicorn has a hard requirement on the python ssl module. Without it even running uvicorn --help fails. Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- package/python-uvicorn/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-uvicorn/Config.in b/package/python-uvicorn/Config.in index 3e769392f9..c84f54781f 100644 --- a/package/python-uvicorn/Config.in +++ b/package/python-uvicorn/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_UVICORN bool "python-uvicorn" select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_H11 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help The lightning-fast ASGI server. From arnout at mind.be Tue Feb 6 11:04:11 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 12:04:11 +0100 Subject: [Buildroot] [git commit] package/python-fastapi: bump to 0.109.2 Message-ID: <20240206124011.2C06B86FD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=683c81a04cef804c3590861351d97277cf84d639 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required dependency on python-anyio. Note that python-starlette still depends on anyio, but there's no direct dependency from fastapi any more. Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- package/python-fastapi/Config.in | 1 - package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-fastapi/Config.in b/package/python-fastapi/Config.in index 7d376d3dd7..d4a527c601 100644 --- a/package/python-fastapi/Config.in +++ b/package/python-fastapi/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_FASTAPI bool "python-fastapi" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core - select BR2_PACKAGE_PYTHON_ANYIO # runtime select BR2_PACKAGE_PYTHON_PYDANTIC # runtime select BR2_PACKAGE_PYTHON_STARLETTE # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.105.0 +PYTHON_FASTAPI_VERSION = 0.109.2 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE From arnout at mind.be Tue Feb 6 12:31:48 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 13:31:48 +0100 Subject: [Buildroot] [git commit] support/testing: add fastapi runtime test Message-ID: <20240206124011.440A986FD2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e5a25a1120bd0caa28d5faa48017c96546cfc78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a runtime test for fastapi. Use uvicorn as the asgi server application as does the fastapi hello world example [1]. Fastapi depends on PydanticV2 now which is written in rust so we need to run the test on armv7. [1] https://fastapi.tiangolo.com/tutorial/first-steps/ Signed-off-by: Marcus Hoffmann [Arnout: - fix flake8 errors support/testing/tests/package/sample_python_fastapi.py:5:1: E302 expected 2 blank lines, found 1 support/testing/tests/package/sample_python_fastapi.py:8:1: W391 blank line at end of file - Remove BR2_CCACHE (as requested by Marcus). - Add a comment explaining that this also tests uvicorn and pydantic. - Re-try wget in a loop instead of a fixed timeout of 30 seconds. - Add a DEVELOPERS entry. ] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 4 ++ .../testing/tests/package/sample_python_fastapi.py | 8 +++ .../testing/tests/package/test_python_fastapi.py | 57 ++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c18ae46054..7a943d1762 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2064,6 +2064,10 @@ F: package/selinux-python/ F: utils/config F: utils/diffconfig +N: Marcus Hoffmann +F: support/testing/tests/package/test_python_fastapi.py +F: support/testing/tests/package/sample_python_fastapi.py + N: Marek Belisko F: package/libatasmart/ F: package/polkit/ diff --git a/support/testing/tests/package/sample_python_fastapi.py b/support/testing/tests/package/sample_python_fastapi.py new file mode 100644 index 0000000000..ee60be1f96 --- /dev/null +++ b/support/testing/tests/package/sample_python_fastapi.py @@ -0,0 +1,8 @@ +from fastapi import FastAPI + +app = FastAPI() + + + at app.get("/") +async def root(): + return {"message": "Hello World"} diff --git a/support/testing/tests/package/test_python_fastapi.py b/support/testing/tests/package/test_python_fastapi.py new file mode 100644 index 0000000000..85cdd0b65a --- /dev/null +++ b/support/testing/tests/package/test_python_fastapi.py @@ -0,0 +1,57 @@ +import os +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Fastapi(TestPythonPackageBase): + """Test fastapi, uvicorn and pydantic2. + + fastapi needs an asgi server to run. Since we select uvicorn as + asgi server here, uvicorn is tested as well. + + pydantic is an major dependency of fastapi so it is implicitly + tested here as well. + """ + __test__ = True + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_FASTAPI=y + BR2_PACKAGE_PYTHON_UVICORN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + sample_scripts = ["tests/package/sample_python_fastapi.py"] + timeout = 60 + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + cmd = "uvicorn sample_python_fastapi:app > /dev/null 2>&1 &" + + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) + + # Give enough time for the uvicorn server to start up + for attempt in range(30): + time.sleep(1) + + cmd = "wget -q -O - http://127.0.0.1:8000/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + if exit_code == 0: + self.assertEqual(output[0], '{"message":"Hello World"}') + break + else: + self.assertTrue(False, "Timeout while waiting for fastapi server") + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() From arnout at mind.be Tue Feb 6 11:04:09 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 12:04:09 +0100 Subject: [Buildroot] [git commit] package/python-starlette: bump to version 0.36.3 Message-ID: <20240206124011.1FE1E86FCF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24d25ac683c8691126635f77c0b2c066f1799a11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- package/python-starlette/python-starlette.hash | 4 ++-- package/python-starlette/python-starlette.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash index 820026b70b..03d77cf5be 100644 --- a/package/python-starlette/python-starlette.hash +++ b/package/python-starlette/python-starlette.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/starlette/json -md5 2ef2fc635691fd4a1823564218292dce starlette-0.34.0.tar.gz -sha256 ed050aaf3896945bfaae93bdf337e53ef3f29115a9d9c153e402985115cd9c8e starlette-0.34.0.tar.gz +md5 0a1e026d653dc448ae07f47eefe1dc8b starlette-0.36.3.tar.gz +sha256 90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080 starlette-0.36.3.tar.gz # Locally computed sha256 checksums sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk index 07f9d6be5e..9d137f5f5a 100644 --- a/package/python-starlette/python-starlette.mk +++ b/package/python-starlette/python-starlette.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_STARLETTE_VERSION = 0.34.0 +PYTHON_STARLETTE_VERSION = 0.36.3 PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/4f/36/168ba6d56a28382f3b081b23b0cc431de35786e120b94c1f372708ed3059 +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/be/47/1bba49d42d63f4453f0a64a20acbf2d0bd2f5a8cde6a166ee66c074a08f8 PYTHON_STARLETTE_SETUP_TYPE = pep517 PYTHON_STARLETTE_LICENSE = BSD-3-Clause PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md From buildroot at bubu1.eu Tue Feb 6 12:42:02 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 13:42:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-anyio: bump to version 4.2.0 In-Reply-To: <0eb549da-1140-4071-8e58-376d9dd5f434@bubu1.eu> References: <20240108064820.3450359-1-james.hilliard1@gmail.com> <0eb549da-1140-4071-8e58-376d9dd5f434@bubu1.eu> Message-ID: Hi, On 08.01.24 14:03, Marcus Hoffmann via buildroot wrote: > Hi James, > > On 08.01.24 07:48, James Hilliard wrote: >> Signed-off-by: James Hilliard >> --- >> ? package/python-anyio/python-anyio.hash | 4 ++-- >> ? package/python-anyio/python-anyio.mk?? | 4 ++-- >> ? 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/package/python-anyio/python-anyio.hash >> b/package/python-anyio/python-anyio.hash >> index 1cea549bc1..e77d30249c 100644 >> --- a/package/python-anyio/python-anyio.hash >> +++ b/package/python-anyio/python-anyio.hash >> @@ -1,5 +1,5 @@ >> ? # md5, sha256 from https://pypi.org/pypi/anyio/json >> -md5? 58d288dd84e28e2507ff9ce7e4620010? anyio-3.7.1.tar.gz >> -sha256 >> 44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780 >> anyio-3.7.1.tar.gz >> +md5? 22e660fff1a584e72281f0d6a083e4e0? anyio-4.2.0.tar.gz >> +sha256 >> e1875bb4b4e2de1669f4bc7869b6d3f54231cdced71605e6e64c9be77e3be50f >> anyio-4.2.0.tar.gz > > This was introduced in this version because fastapi didn't support a > newer version. > > Fastapi 0.108.0 supports starlette 0.32 now, which supports anyio 4.2.0. > So I think these should be bumped together/in the same series? Now that more recent fastapi and starlette versions are available this can be applied. > > >> ? # Locally computed sha256 checksums >> ? sha256 >> 5361ac9dc58f2ef5fd2e9b09c68297c17f04950909bbc8023bdb82eacf22c2b0? LICENSE >> diff --git a/package/python-anyio/python-anyio.mk >> b/package/python-anyio/python-anyio.mk >> index 80404ac660..32c2286157 100644 >> --- a/package/python-anyio/python-anyio.mk >> +++ b/package/python-anyio/python-anyio.mk >> @@ -4,9 +4,9 @@ >> ? # >> >> ################################################################################ >> -PYTHON_ANYIO_VERSION = 3.7.1 >> +PYTHON_ANYIO_VERSION = 4.2.0 >> ? PYTHON_ANYIO_SOURCE = anyio-$(PYTHON_ANYIO_VERSION).tar.gz >> -PYTHON_ANYIO_SITE = >> https://files.pythonhosted.org/packages/28/99/2dfd53fd55ce9838e6ff2d4dac20ce58263798bd1a0dbe18b3a9af3fcfce >> +PYTHON_ANYIO_SITE = >> https://files.pythonhosted.org/packages/2d/b8/7333d87d5f03247215d86a86362fd3e324111788c6cdd8d2e6196a6ba833 >> ? PYTHON_ANYIO_SETUP_TYPE = setuptools >> ? PYTHON_ANYIO_LICENSE = MIT >> ? PYTHON_ANYIO_LICENSE_FILES = LICENSE > > Marcus > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From romain.naour at smile.fr Tue Feb 6 12:49:45 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 13:49:45 +0100 Subject: [Buildroot] [PATCH 0/2] TestGlxinfo fixes Message-ID: <20240206124947.1617078-1-romain.naour@smile.fr> I initially started looking at TestGlxinfo some weeks ago fixing two issues at that time but patches requires some improvement before submitting them upstream. In the mean time a new runtime issue appear due to x86 optimization. Romain Naour (2): package/mesa3d: fix drisw build without dri3 support/testing: use core2duo cpu emulation for TestGlxinfo .../0006-drisw-fix-build-without-dri3.patch | 58 +++++++++++++++++++ ...on-t-try-zink-if-not-enabled-in-mesa.patch | 42 ++++++++++++++ support/testing/tests/package/test_glxinfo.py | 3 +- 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 package/mesa3d/0006-drisw-fix-build-without-dri3.patch create mode 100644 package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch -- 2.43.0 From romain.naour at smile.fr Tue Feb 6 12:49:47 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 13:49:47 +0100 Subject: [Buildroot] [PATCH 2/2] support/testing: use core2duo cpu emulation for TestGlxinfo In-Reply-To: <20240206124947.1617078-1-romain.naour@smile.fr> References: <20240206124947.1617078-1-romain.naour@smile.fr> Message-ID: <20240206124947.1617078-3-romain.naour@smile.fr> TestGlxinfo fail with a new runtime error: # glxinfo -B -display :0 name of display: :0 traps: glxinfo[84] trap invalid opcode ip:b73c7027 sp:bf8433c0 error:0 in swrast_dri.so[b6e4c000+64f000] Illegal instruction The x86-core2 Bootlin toolchains are built for a core2 CPU [0], this means that the Bootlin toolchains may use core2-specific instructions. The TestGlxinfo test is setup for BR2_x86_core2, so our executables will also contain core2 instructions. However, the default Qemu x86 is not guaranteed to emulate all the instructions specific to core2, causing runtime issues as reported above. A similar issue has been fixed by adding Nehalem cpu emulation on the qemu command line. See 4f565b5222 ("support/testing: use Nehalem cpu emulation for TestGrubX8664EFI"). Set core2duo cpu emulation for TestGlxinfo on the qemu command line. [0] https://gitlab.com/buildroot.org/toolchains-builder/-/blob/kubu/toolchain-builder-2023.08/configs/arch/x86-core2.config?ref_type=heads Signed-off-by: Romain Naour --- support/testing/tests/package/test_glxinfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py index 6bedee5298..3ccbdca8d9 100644 --- a/support/testing/tests/package/test_glxinfo.py +++ b/support/testing/tests/package/test_glxinfo.py @@ -42,7 +42,8 @@ class TestGlxinfo(infra.basetest.BRTest): self.emulator.boot(arch="i386", kernel=kern, kernel_cmdline=["root=/dev/vda console=ttyS0"], - options=["-M", "pc", "-m", "512", "-drive", "file={},if=virtio,format=raw".format(img)]) + options=["-M", "pc", "-cpu", "core2duo", "-m", "512", + "-drive", "file={},if=virtio,format=raw".format(img)]) self.emulator.login() def test_run(self): -- 2.43.0 From romain.naour at smile.fr Tue Feb 6 12:49:46 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 13:49:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/mesa3d: fix drisw build without dri3 In-Reply-To: <20240206124947.1617078-1-romain.naour@smile.fr> References: <20240206124947.1617078-1-romain.naour@smile.fr> Message-ID: <20240206124947.1617078-2-romain.naour@smile.fr> mesa3d 23.3 added dri3_priv.h header and dri3_check_multibuffer() function in drisw (part of swrast gallium driver) that can be build without dri3. i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' collect2: error: ld returned 1 exit status Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using dri3_check_multibuffer(). While testing again the TestGlxinfo runtime test, a new unexpected error line appeared in the glxinfo log: MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so mesa3d try to load zink gallium driver even if it was not enabled at build time, indeed there is no such option in Buildroot. Apply patches sent upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854455 Signed-off-by: Romain Naour --- .../0006-drisw-fix-build-without-dri3.patch | 58 +++++++++++++++++++ ...on-t-try-zink-if-not-enabled-in-mesa.patch | 42 ++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 package/mesa3d/0006-drisw-fix-build-without-dri3.patch create mode 100644 package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch diff --git a/package/mesa3d/0006-drisw-fix-build-without-dri3.patch b/package/mesa3d/0006-drisw-fix-build-without-dri3.patch new file mode 100644 index 0000000000..ab27d384cf --- /dev/null +++ b/package/mesa3d/0006-drisw-fix-build-without-dri3.patch @@ -0,0 +1,58 @@ +From 3ab46dcfda9edf5c9bc27c8f5031146d9d9d8ade Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 18 Jan 2024 22:50:16 +0100 +Subject: [PATCH] drisw: fix build without dri3 + +commit 1887368df41 ("glx/sw: check for modifier support in the kopper path") +added dri3_priv.h header and dri3_check_multibuffer() function in drisw that +can be build without dri3. + + i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': + drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' + collect2: error: ld returned 1 exit status + +Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using +dri3_check_multibuffer(). + +Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path") + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 + +Signed-off-by: Romain Naour +--- + src/glx/drisw_glx.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c +index 3d3f75259bc..4b19e2d7707 100644 +--- a/src/glx/drisw_glx.c ++++ b/src/glx/drisw_glx.c +@@ -32,7 +32,9 @@ + #include + #include "dri_common.h" + #include "drisw_priv.h" ++#ifdef HAVE_DRI3 + #include "dri3_priv.h" ++#endif + #include + #include + #include +@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, + goto handle_error; + } + ++#ifdef HAVE_DRI3 + if (pdpyp->zink) { + bool err; + psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err); +@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, + goto handle_error; + } + } ++#endif + + glx_config_destroy_list(psc->base.configs); + psc->base.configs = configs; +-- +2.43.0 + diff --git a/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch b/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch new file mode 100644 index 0000000000..f9e4d50fd7 --- /dev/null +++ b/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch @@ -0,0 +1,42 @@ +From 83b4ff6616708bd7ba5981d22cd5211ca6787d58 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 24 Jan 2024 14:28:32 +0100 +Subject: [PATCH] glxext: don't try zink if not enabled in mesa + +Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") +added an automatic zink fallback even when the zink gallium is not +enabled at build time. + +It leads to unexpected error log while loading drisw driver and +zink is not installed on the rootfs: + + MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so + +Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 + +Signed-off-by: Romain Naour +--- + src/glx/glxext.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/glx/glxext.c b/src/glx/glxext.c +index 39d5f08bdcf..e106eb40046 100644 +--- a/src/glx/glxext.c ++++ b/src/glx/glxext.c +@@ -904,9 +904,11 @@ __glXInitialize(Display * dpy) + #endif /* HAVE_DRI3 */ + if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false)) + dpyPriv->dri2Display = dri2CreateDisplay(dpy); ++#if defined(HAVE_ZINK) + if (!dpyPriv->dri3Display && !dpyPriv->dri2Display) + try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) && + !getenv("GALLIUM_DRIVER"); ++#endif /* HAVE_ZINK */ + } + #endif /* GLX_USE_DRM */ + if (glx_direct) +-- +2.43.0 + -- 2.43.0 From thomas.petazzoni at bootlin.com Tue Feb 6 12:53:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:53:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ml-dtypes: bump to version 0.3.2 In-Reply-To: <29b23c5438f3123feeb6af3a1e4f1d16@free.fr> References: <20240110035911.1020944-1-james.hilliard1@gmail.com> <29b23c5438f3123feeb6af3a1e4f1d16@free.fr> Message-ID: <20240206135352.3722471f@windsurf> Hello Julien, James, On Wed, 10 Jan 2024 20:06:09 +0100 Julien Olivain wrote: > The python-ml_dtypes v0.3.2 changelog says that the pybind11 build > requirement was removed. See: > https://github.com/jax-ml/ml_dtypes/blob/v0.3.2/CHANGELOG.md#032---2024-01-03 > > This patch does not remove it is the _DEPENDENCIES. Did you try to build > the package without it? Thanks for the feedback. There's been no feedback from James, so I'll mark this patch as Changes Requested for now. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From buildroot at bubu1.eu Tue Feb 6 12:57:01 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 13:57:01 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <20240205163024.500599-1-james.hilliard1@gmail.com> References: <20240205163024.500599-1-james.hilliard1@gmail.com> Message-ID: <902c02f6-4b7d-48c6-9e77-685033b71812@bubu1.eu> Hi, On 05.02.24 17:30, James Hilliard wrote: > License hash changed due to year update: > https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - fix package hash typo > --- > package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- > package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash > index 29852a51ed..b614c01d79 100644 > --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/rfc3987/json This should still point to https://pypi.org/pypi/ruamel.yaml/json, maybe this can be changed while applying. > -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz > -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz > +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz > +sha256 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ruamel.yaml-0.18.5.tar.gz > # Locally computed sha256 checksums > -sha256 ab837b032c5aae84503fc0c733a116a26fd272e90dc4402fa68d3c9e51aed3b0 LICENSE > +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 LICENSE > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk > index a6fed3bc2c..bbdac591ca 100644 > --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RUAMEL_YAML_VERSION = 0.17.21 > +PYTHON_RUAMEL_YAML_VERSION = 0.18.5 > PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz > -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c > +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/82/43/fa976e03a4a9ae406904489119cd7dd4509752ca692b2e0a19491ca1782c > PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools > PYTHON_RUAMEL_YAML_LICENSE = MIT > PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-markdown2: bump to version 2.4.12 In-Reply-To: <20240110034052.931500-1-james.hilliard1@gmail.com> References: <20240110034052.931500-1-james.hilliard1@gmail.com> Message-ID: <20240206135705.797a5c7f@windsurf> On Tue, 9 Jan 2024 20:40:52 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-markdown2/python-markdown2.hash | 4 ++-- > package/python-markdown2/python-markdown2.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-marshmallow-sqlalchemy: bump to version 0.30.0 In-Reply-To: <20240110034411.933840-1-james.hilliard1@gmail.com> References: <20240110034411.933840-1-james.hilliard1@gmail.com> Message-ID: <20240206135710.01c79406@windsurf> On Tue, 9 Jan 2024 20:44:11 -0700 James Hilliard wrote: > License hash changed due to date update: > https://github.com/marshmallow-code/marshmallow-sqlalchemy/commit/767a8f965f8c2723b6d98cc45442df536dc8fa0a > > Signed-off-by: James Hilliard > --- > .../python-marshmallow-sqlalchemy.hash | 6 +++--- > .../python-marshmallow-sqlalchemy.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-maturin: bump to version 1.4.0 In-Reply-To: <20240110035054.946683-1-james.hilliard1@gmail.com> References: <20240110035054.946683-1-james.hilliard1@gmail.com> Message-ID: <20240206135714.764315e0@windsurf> On Tue, 9 Jan 2024 20:50:54 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-maturin/python-maturin.hash | 2 +- > package/python-maturin/python-maturin.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-more-itertools: bump to version 10.2.0 In-Reply-To: <20240110040343.1025210-1-james.hilliard1@gmail.com> References: <20240110040343.1025210-1-james.hilliard1@gmail.com> Message-ID: <20240206135722.4bc82ab3@windsurf> On Tue, 9 Jan 2024 21:03:43 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-more-itertools/python-more-itertools.hash | 4 ++-- > package/python-more-itertools/python-more-itertools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-netaddr: bump to version 0.10.1 In-Reply-To: <20240110040751.1028591-1-james.hilliard1@gmail.com> References: <20240110040751.1028591-1-james.hilliard1@gmail.com> Message-ID: <20240206135725.01f393d5@windsurf> On Tue, 9 Jan 2024 21:07:51 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-netaddr/python-netaddr.hash | 4 ++-- > package/python-netaddr/python-netaddr.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pathspec: bump to version 0.12.1 In-Reply-To: <20240110041930.1037925-1-james.hilliard1@gmail.com> References: <20240110041930.1037925-1-james.hilliard1@gmail.com> Message-ID: <20240206135731.27175a79@windsurf> On Tue, 9 Jan 2024 21:19:30 -0700 James Hilliard wrote: > Migrate from setuptools to flit build backend. > > Signed-off-by: James Hilliard > --- > package/python-pathspec/python-pathspec.hash | 4 ++-- > package/python-pathspec/python-pathspec.mk | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pexpect: bump to version 4.9.0 In-Reply-To: <20240110042454.1040891-1-james.hilliard1@gmail.com> References: <20240110042454.1040891-1-james.hilliard1@gmail.com> Message-ID: <20240206135735.60c628e8@windsurf> On Tue, 9 Jan 2024 21:24:54 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pexpect/python-pexpect.hash | 4 ++-- > package/python-pexpect/python-pexpect.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: bump to version 10.2.0 In-Reply-To: <20240110043249.1070442-1-james.hilliard1@gmail.com> References: <20240110043249.1070442-1-james.hilliard1@gmail.com> Message-ID: <20240206135742.28a98a37@windsurf> On Tue, 9 Jan 2024 21:32:49 -0700 James Hilliard wrote: > License hash changed due to year update: > https://github.com/python-pillow/Pillow/commit/ee6e12a8032a8255b2f7a60a40c50377c17a03fe > > Signed-off-by: James Hilliard > --- > package/python-pillow/python-pillow.hash | 6 +++--- > package/python-pillow/python-pillow.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:48 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pip: bump to version 23.3.2 In-Reply-To: <20240110043611.1074941-1-james.hilliard1@gmail.com> References: <20240110043611.1074941-1-james.hilliard1@gmail.com> Message-ID: <20240206135748.791e2f12@windsurf> On Tue, 9 Jan 2024 21:36:11 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pip/python-pip.hash | 4 ++-- > package/python-pip/python-pip.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-prompt-toolkit: bump to version 3.0.43 In-Reply-To: <20240110043921.1077310-1-james.hilliard1@gmail.com> References: <20240110043921.1077310-1-james.hilliard1@gmail.com> Message-ID: <20240206135754.2ab265ba@windsurf> On Tue, 9 Jan 2024 21:39:21 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-prompt-toolkit/python-prompt-toolkit.hash | 4 ++-- > package/python-prompt-toolkit/python-prompt-toolkit.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:15 +0100 Subject: [Buildroot] [git commit] package/python-marshmallow-sqlalchemy: bump to version 0.30.0 Message-ID: <20240206125833.9F26A8702C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c419714117fce61e7fdcbba7fe8872a40551a63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to date update: https://github.com/marshmallow-code/marshmallow-sqlalchemy/commit/767a8f965f8c2723b6d98cc45442df536dc8fa0a Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-marshmallow-sqlalchemy.hash | 6 +++--- .../python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash index d3d1b3876f..3194513dfc 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/marshmallow-sqlalchemy/json -md5 e1b2858be2f0ce6dead48e67080631c4 marshmallow-sqlalchemy-0.29.0.tar.gz -sha256 3523a774390ef0c1c0f7c708a7519809c5396cf608720f14f55c36f74ff5bbec marshmallow-sqlalchemy-0.29.0.tar.gz +md5 61e46e0ad5fabd0e9e11f895e1243bc3 marshmallow-sqlalchemy-0.30.0.tar.gz +sha256 29ad0a4fd1b4a1e52dcb07f9673d284a6b0795141916cc2169d4ee9a5d007347 marshmallow-sqlalchemy-0.30.0.tar.gz # Locally computed sha256 checksums -sha256 625df8e2758a271b4bc90525c0b6161814e0f72cb3504b03ab5206b7abf50072 LICENSE +sha256 5f6cd082e01dda8a7c157687e196be98d68224cf41c0cee1968eb5c08e0c076a LICENSE diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk index 8f176feb4d..a95e53022b 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.29.0 +PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.30.0 PYTHON_MARSHMALLOW_SQLALCHEMY_SOURCE = marshmallow-sqlalchemy-$(PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION).tar.gz -PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/fa/0d/4dd275732213cefb4e49a86c60443cb1e3e0d0bd605625aed3fa7bb22fdd +PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/5d/3f/21aa202f3df31d2d20d4ae8dfe9c7f1ce0a1eecba7003915a986a7599778 PYTHON_MARSHMALLOW_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE = MIT PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:14 +0100 Subject: [Buildroot] [git commit] package/python-markdown2: bump to version 2.4.12 Message-ID: <20240206125833.88C458702A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92de0fe754c2072780b9c33fc42a0f3467e96397 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-markdown2/python-markdown2.hash | 4 ++-- package/python-markdown2/python-markdown2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-markdown2/python-markdown2.hash b/package/python-markdown2/python-markdown2.hash index 0e14f23261..0a76499185 100644 --- a/package/python-markdown2/python-markdown2.hash +++ b/package/python-markdown2/python-markdown2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown2/json -md5 a338c5be41a822914af8211b080659fd markdown2-2.4.10.tar.gz -sha256 cdba126d90dc3aef6f4070ac342f974d63f415678959329cc7909f96cc235d72 markdown2-2.4.10.tar.gz +md5 69cdd2c9ee1f6837cb173a44d6a0622d markdown2-2.4.12.tar.gz +sha256 1bc8692696954d597778e0e25713c14ca56d87992070dedd95c17eddaf709204 markdown2-2.4.12.tar.gz # Locally computed sha256 checksums sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt diff --git a/package/python-markdown2/python-markdown2.mk b/package/python-markdown2/python-markdown2.mk index b4719562fc..4c21eb98e8 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN2_VERSION = 2.4.10 +PYTHON_MARKDOWN2_VERSION = 2.4.12 PYTHON_MARKDOWN2_SOURCE = markdown2-$(PYTHON_MARKDOWN2_VERSION).tar.gz -PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/8e/b3/64c459af88ea8c2eeb020d0edf3e36c62176e988c47e412133c37c5da5e7 +PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/3c/e4/87a454674ac303e2ca6c25713845d2ae1b59c1a88576054cbec25aaebad1 PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:17 +0100 Subject: [Buildroot] [git commit] package/python-netaddr: bump to version 0.10.1 Message-ID: <20240206125833.C735186FCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f300e2021eccfaff5588b535cee774ed7a7df47f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-netaddr/python-netaddr.hash | 4 ++-- package/python-netaddr/python-netaddr.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-netaddr/python-netaddr.hash b/package/python-netaddr/python-netaddr.hash index 04dc9797f6..f969aeecfc 100644 --- a/package/python-netaddr/python-netaddr.hash +++ b/package/python-netaddr/python-netaddr.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/netaddr/json -md5 0c89e96501370d2538ecadca372e55a9 netaddr-0.9.0.tar.gz -sha256 7b46fa9b1a2d71fd5de9e4a3784ef339700a53a08c8040f08baf5f1194da0128 netaddr-0.9.0.tar.gz +md5 c0d7b080da18c851ea436389813d7652 netaddr-0.10.1.tar.gz +sha256 f4da4222ca8c3f43c8e18a8263e5426c750a3a837fdfeccf74c68d0408eaa3bf netaddr-0.10.1.tar.gz # Locally computed sha256 checksums sha256 0e53de62547787462f41eefb5cee31a14f7ea767ba0362c6f9304f1742486d47 LICENSE diff --git a/package/python-netaddr/python-netaddr.mk b/package/python-netaddr/python-netaddr.mk index 1f78f04210..79e55a739f 100644 --- a/package/python-netaddr/python-netaddr.mk +++ b/package/python-netaddr/python-netaddr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_NETADDR_VERSION = 0.9.0 +PYTHON_NETADDR_VERSION = 0.10.1 PYTHON_NETADDR_SOURCE = netaddr-$(PYTHON_NETADDR_VERSION).tar.gz -PYTHON_NETADDR_SITE = https://files.pythonhosted.org/packages/48/4c/2491bfdb868c3f40d985037fa64a3903c125f45d7d3025640e05715db7a3 +PYTHON_NETADDR_SITE = https://files.pythonhosted.org/packages/af/96/f4878091248450bbdebfbd01bf1d95821bd47eb38e756815a0431baa6b07 PYTHON_NETADDR_LICENSE = BSD-3-Clause PYTHON_NETADDR_LICENSE_FILES = LICENSE PYTHON_NETADDR_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:20 +0100 Subject: [Buildroot] [git commit] package/python-pip: bump to version 23.3.2 Message-ID: <20240206125834.3BDE6818E5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5fe80ca7d55bbffedf49ac3be979f9c3baeb978c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pip/python-pip.hash | 4 ++-- package/python-pip/python-pip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index 9518c9d8b8..d2cc649b01 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 f0c9fba61e9d9badcc9921062e993d84 pip-23.3.1.tar.gz -sha256 1fcaa041308d01f14575f6d0d2ea4b75a3e2871fe4f9c694976f908768e14174 pip-23.3.1.tar.gz +md5 38dd5f7ab301167df063405c7fc16c84 pip-23.3.2.tar.gz +sha256 7fd9972f96db22c8077a1ee2691b172c8089b17a5652a44494a9ecb0d78f9149 pip-23.3.2.tar.gz # Locally computed sha256 checksums sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 83a1631a2f..552b47eb7d 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 23.3.1 +PYTHON_PIP_VERSION = 23.3.2 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/1f/7f/4da15e07ccd11c84c1ccc8f6e24288d5e76c99441bf80e315b33542db951 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/b7/06/6b1ad0ae8f97d7a0d6f6ad640db10780578999e647a9593512ceb6f06469 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:16 +0100 Subject: [Buildroot] [git commit] package/python-more-itertools: bump to version 10.2.0 Message-ID: <20240206125833.B944E8702A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cb372f2820a5234d1eb0ccdea72b8d41c0e42420 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-more-itertools/python-more-itertools.hash | 4 ++-- package/python-more-itertools/python-more-itertools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-more-itertools/python-more-itertools.hash b/package/python-more-itertools/python-more-itertools.hash index 6f659ab468..4d119cb203 100644 --- a/package/python-more-itertools/python-more-itertools.hash +++ b/package/python-more-itertools/python-more-itertools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/more-itertools/json -md5 3651461253e7d206073affb491b5c6e0 more-itertools-10.1.0.tar.gz -sha256 626c369fa0eb37bac0291bce8259b332fd59ac792fa5497b59837309cd5b114a more-itertools-10.1.0.tar.gz +md5 1737bb4d9d09501f75f498538efe3cf4 more-itertools-10.2.0.tar.gz +sha256 8fccb480c43d3e99a00087634c06dd02b0d50fbf088b380de5a41a015ec239e1 more-itertools-10.2.0.tar.gz # Locally computed sha256 checksums sha256 09f1c8c9e941af3e584d59641ea9b87d83c0cb0fd007eb5ef391a7e2643c1a46 LICENSE diff --git a/package/python-more-itertools/python-more-itertools.mk b/package/python-more-itertools/python-more-itertools.mk index 71c33bfdf1..98b499c3c0 100644 --- a/package/python-more-itertools/python-more-itertools.mk +++ b/package/python-more-itertools/python-more-itertools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MORE_ITERTOOLS_VERSION = 10.1.0 +PYTHON_MORE_ITERTOOLS_VERSION = 10.2.0 PYTHON_MORE_ITERTOOLS_SOURCE = more-itertools-$(PYTHON_MORE_ITERTOOLS_VERSION).tar.gz -PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/2d/73/3557e45746fcaded71125c0a1c0f87616e8258c78391f0c365bf97bbfc99 +PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/df/ad/7905a7fd46ffb61d976133a4f47799388209e73cbc8c1253593335da88b4 PYTHON_MORE_ITERTOOLS_SETUP_TYPE = flit PYTHON_MORE_ITERTOOLS_LICENSE = MIT PYTHON_MORE_ITERTOOLS_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:15 +0100 Subject: [Buildroot] [git commit] package/python-maturin: bump to version 1.4.0 Message-ID: <20240206125833.ABF278702D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bab27b5c47cc442fe7785168d2822faa79f535e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index fcc6a25713..be6167afea 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 7e2fdc083ae253c0f68f6313a2ad2de423219f09e7fa65ef55189d42128e4cff maturin-1.3.1.tar.gz +sha256 3757ed29fbaa87a7dde95dade795ea80f099a867343e920ccc471f75d141a6fa maturin-1.4.0.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 170dee7649..91507468a2 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 1.3.1 +PYTHON_MATURIN_VERSION = 1.4.0 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/d6/a3/42ff26b2b3011ada67c73db32a9ccf9fa18d459cbef8ed6eefc3b283ee60 +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/20/90/43a3aa35f037e91582ec7516a92084a71f84e89e39ef580813bed072b154 PYTHON_MATURIN_SETUP_TYPE = setuptools-rust PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:18 +0100 Subject: [Buildroot] [git commit] package/python-pexpect: bump to version 4.9.0 Message-ID: <20240206125834.0287B8702A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94dd060c8f8a00e1bf9dc8072c3c4c543866c946 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pexpect/python-pexpect.hash | 4 ++-- package/python-pexpect/python-pexpect.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pexpect/python-pexpect.hash b/package/python-pexpect/python-pexpect.hash index a38c8d5a03..617428feb1 100644 --- a/package/python-pexpect/python-pexpect.hash +++ b/package/python-pexpect/python-pexpect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pexpect/json -md5 153eb25184249d6a85fde9acf4804085 pexpect-4.8.0.tar.gz -sha256 fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c pexpect-4.8.0.tar.gz +md5 f48d48325ee7f1221add0396ea9e2f14 pexpect-4.9.0.tar.gz +sha256 ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f pexpect-4.9.0.tar.gz # Locally computed sha256 checksums sha256 4a483ae1c4dc738a6c8b73feb49074e1835da02ab5aa686f2675029906fa364d LICENSE diff --git a/package/python-pexpect/python-pexpect.mk b/package/python-pexpect/python-pexpect.mk index d230b11338..469144aa60 100644 --- a/package/python-pexpect/python-pexpect.mk +++ b/package/python-pexpect/python-pexpect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PEXPECT_VERSION = 4.8.0 +PYTHON_PEXPECT_VERSION = 4.9.0 PYTHON_PEXPECT_SOURCE = pexpect-$(PYTHON_PEXPECT_VERSION).tar.gz -PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/e5/9b/ff402e0e930e70467a7178abb7c128709a30dfb22d8777c043e501bc1b10 +PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d PYTHON_PEXPECT_LICENSE = ISC PYTHON_PEXPECT_LICENSE_FILES = LICENSE PYTHON_PEXPECT_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:19 +0100 Subject: [Buildroot] [git commit] package/python-pillow: bump to version 10.2.0 Message-ID: <20240206125834.23DBD8702A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=914040cb73a7b3d2082b70e05fba4a2c1268732e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/python-pillow/Pillow/commit/ee6e12a8032a8255b2f7a60a40c50377c17a03fe Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 92258a6712..001fb62676 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 a55618c5d2fd64048dd3ea41bc39f7cd Pillow-10.1.0.tar.gz -sha256 e6bf8de6c36ed96c86ea3b6e1d5273c53f46ef518a062464cd7ef5dd2cf92e38 Pillow-10.1.0.tar.gz +md5 13de96f9f98bc1c26439d64576a48ac6 pillow-10.2.0.tar.gz +sha256 e87f0b2c78157e12d7686b27d63c070fd65d994e8ddae6f328e0dcf4a0cd007e pillow-10.2.0.tar.gz # Locally computed sha256 checksums -sha256 0fdb68ffb39062553be40be4e6eaea9700b4f5e870a720ae86b8925d67613ddd LICENSE +sha256 e706384c6f299d1b6fa782ae657740b372b4bd7938a1a318bf94ac249114758a LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index bc94062da8..10939d8467 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 10.1.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/80/d7/c4b258c9098b469c4a4e77b0a99b5f4fd21e359c2e486c977d231f52fc71 -PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz +PYTHON_PILLOW_VERSION = 10.2.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/f8/3e/32cbd0129a28686621434cbf17bb64bf1458bfb838f1f668262fefce145c +PYTHON_PILLOW_SOURCE = pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:21 +0100 Subject: [Buildroot] [git commit] package/python-prompt-toolkit: bump to version 3.0.43 Message-ID: <20240206125834.538707FCE7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f9ce75df41e9ae4caee9231b9052edb57b25cfe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-prompt-toolkit/python-prompt-toolkit.hash | 4 ++-- package/python-prompt-toolkit/python-prompt-toolkit.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index 54130f3ae0..1821d4d65c 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.hash +++ b/package/python-prompt-toolkit/python-prompt-toolkit.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/prompt-toolkit/json -md5 252a5d200e41d46b65a3076d2bc0a4bd prompt_toolkit-3.0.41.tar.gz -sha256 941367d97fc815548822aa26c2a269fdc4eb21e9ec05fc5d447cf09bad5d75f0 prompt_toolkit-3.0.41.tar.gz +md5 f33c0f4ae8d11addababf6d90c98f8bc prompt_toolkit-3.0.43.tar.gz +sha256 3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d prompt_toolkit-3.0.43.tar.gz # Locally computed sha256 checksums sha256 303574d9bdd85c757d6025017942bf17baeedf2778f62bd7f425d07d880f4c4a LICENSE diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.mk b/package/python-prompt-toolkit/python-prompt-toolkit.mk index db40f6c7eb..31c0d9783f 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.mk +++ b/package/python-prompt-toolkit/python-prompt-toolkit.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.41 +PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.43 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/d9/7b/7d88d94427e1e179e0a62818e68335cf969af5ca38033c0ca02237ab6ee7 +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/cc/c6/25b6a3d5cd295304de1e32c9edbcf319a52e965b339629d37d42bb7126ca PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:18 +0100 Subject: [Buildroot] [git commit] package/python-pathspec: bump to version 0.12.1 Message-ID: <20240206125833.DEA458702D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3045d747369fd8b29be6733b5e85c286ff100552 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools to flit build backend. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pathspec/python-pathspec.hash | 4 ++-- package/python-pathspec/python-pathspec.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pathspec/python-pathspec.hash b/package/python-pathspec/python-pathspec.hash index 01177b7428..15283e3ac2 100644 --- a/package/python-pathspec/python-pathspec.hash +++ b/package/python-pathspec/python-pathspec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathspec/json -md5 92ebd6d735d261952ff99d64083eeff4 pathspec-0.11.2.tar.gz -sha256 e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3 pathspec-0.11.2.tar.gz +md5 2b26ad1981bfa23748e115f00085624c pathspec-0.12.1.tar.gz +sha256 a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712 pathspec-0.12.1.tar.gz # Locally computed sha256 checksums sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/python-pathspec/python-pathspec.mk b/package/python-pathspec/python-pathspec.mk index d32b6a56e1..c4cb34b4c3 100644 --- a/package/python-pathspec/python-pathspec.mk +++ b/package/python-pathspec/python-pathspec.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_PATHSPEC_VERSION = 0.11.2 +PYTHON_PATHSPEC_VERSION = 0.12.1 PYTHON_PATHSPEC_SOURCE = pathspec-$(PYTHON_PATHSPEC_VERSION).tar.gz -PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/a0/2a/bd167cdf116d4f3539caaa4c332752aac0b3a0cc0174cdb302ee68933e81 +PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/ca/bc/f35b8446f4531a7cb215605d100cd88b7ac6f44ab3fc94870c120ab3adbf PYTHON_PATHSPEC_LICENSE = MPL-2.0 PYTHON_PATHSPEC_LICENSE_FILES = LICENSE -PYTHON_PATHSPEC_SETUP_TYPE = setuptools +PYTHON_PATHSPEC_SETUP_TYPE = flit $(eval $(host-python-package)) From laurentbadel at eaton.com Tue Feb 6 12:58:33 2024 From: laurentbadel at eaton.com (Laurent Badel) Date: Tue, 6 Feb 2024 12:58:33 +0000 Subject: [Buildroot] [PATCH V2] boot/mxs-bootlets: add support for zImage with appended DTB Message-ID: <20240206125833.10103-1-laurentbadel@eaton.com> When building a zImage with appended DTBs, buildroot creates copies of the zImage named zImage.$(LINUX_DTS_NAME). mxs-bootlets.mk does not take this into consideration and passes only the original zImage (without DTB appended) to elftosb to generate the SB file. Thus, make sure that the correct zImage files are used in this process. Signed-off-by: Laurent Badel --- boot/mxs-bootlets/mxs-bootlets.mk | 36 +++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/boot/mxs-bootlets/mxs-bootlets.mk b/boot/mxs-bootlets/mxs-bootlets.mk index adc22767..efcee16a 100644 --- a/boot/mxs-bootlets/mxs-bootlets.mk +++ b/boot/mxs-bootlets/mxs-bootlets.mk @@ -38,20 +38,21 @@ endif MXS_BOOTLETS_DEPENDENCIES = host-elftosb MXS_BOOTLETS_LICENSE = GPL-2.0+ +MXS_BOOTLETS_BOOTSTREAM_EXTS = .sb ifeq ($(BR2_TARGET_MXS_BOOTLETS_BAREBOX),y) MXS_BOOTLETS_DEPENDENCIES += barebox MXS_BOOTLETS_BOOTDESC = barebox$(MXS_BOOTLETS_IVT_SUFFIX).bd -MXS_BOOTLETS_BOOTSTREAM = $(MXS_BOOTLETS_BOARD)_barebox$(MXS_BOOTLETS_IVT_SUFFIX).sb +MXS_BOOTLETS_BOOTSTREAM_BASENAME = $(MXS_BOOTLETS_BOARD)_barebox$(MXS_BOOTLETS_IVT_SUFFIX) else ifeq ($(BR2_TARGET_MXS_BOOTLETS_LINUX),y) MXS_BOOTLETS_DEPENDENCIES += linux MXS_BOOTLETS_BOOTDESC = linux$(MXS_BOOTLETS_IVT_SUFFIX).bd -MXS_BOOTLETS_BOOTSTREAM = $(MXS_BOOTLETS_BOARD)_linux$(MXS_BOOTLETS_IVT_SUFFIX).sb +MXS_BOOTLETS_BOOTSTREAM_BASENAME = $(MXS_BOOTLETS_BOARD)_linux$(MXS_BOOTLETS_IVT_SUFFIX) else ifeq ($(BR2_TARGET_MXS_BOOTLETS_UBOOT),y) MXS_BOOTLETS_DEPENDENCIES += uboot MXS_BOOTLETS_BOOTDESC = uboot$(MXS_BOOTLETS_IVT_SUFFIX).bd -MXS_BOOTLETS_BOOTSTREAM = $(MXS_BOOTLETS_BOARD)_uboot$(MXS_BOOTLETS_IVT_SUFFIX).sb +MXS_BOOTLETS_BOOTSTREAM_BASENAME = $(MXS_BOOTLETS_BOARD)_uboot$(MXS_BOOTLETS_IVT_SUFFIX) endif ifeq ($(BR2_TARGET_MXS_BOOTLETS_BAREBOX),y) @@ -65,10 +66,18 @@ define MXS_BOOTLETS_BUILD_LINUX_PREP BOARD=$(MXS_BOOTLETS_BOARD) CROSS_COMPILE="$(TARGET_CROSS)" \ $(MAKE1) -C $(@D) linux_prep endef + define MXS_BOOTLETS_SED_LINUX sed -i 's,[^ *]linux_prep.*;,\tlinux_prep="$(@D)/linux_prep/output-target/linux_prep";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC) - sed -i 's,[^ *]zImage.*;,\tzImage="$(LINUX_DIR)/arch/arm/boot/zImage";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC) endef + +define MXS_BOOTLETS_SED_ZIMAGE + sed -i 's,[^ *]zImage.*;,\tzImage="$(LINUX_DIR)/arch/arm/boot/zImage$(1)";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC) +endef + +ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB), y) + MXS_BOOTLETS_BOOTSTREAM_EXTS = $(foreach dts_name,$(LINUX_DTS_NAME),.$(strip $(dts_name)).sb) +endif endif ifeq ($(BR2_TARGET_MXS_BOOTLETS_UBOOT),y) @@ -83,7 +92,13 @@ endef MXS_BOOTLETS_POST_EXTRACT_HOOKS += MXS_BOOTLETS_INSTALL_BAREBOX_BOOTDESC -define MXS_BOOTLETS_BUILD_CMDS +define MXS_BOOTLETS_ELFTOSB_CMD + $(HOST_DIR)/bin/elftosb $(MXS_BOOTLETS_ELFTOSB_OPTIONS) \ + -z -c $(@D)/$(MXS_BOOTLETS_BOOTDESC) \ + -o $(@D)/$(MXS_BOOTLETS_BOOTSTREAM_BASENAME)$(1) +endef + +define MXS_BOOTLETS_BUILD_CMDS BOARD=$(MXS_BOOTLETS_BOARD) CROSS_COMPILE="$(TARGET_CROSS)" \ $(MAKE1) -C $(@D) power_prep BOARD=$(MXS_BOOTLETS_BOARD) CROSS_COMPILE="$(TARGET_CROSS)" \ @@ -94,13 +109,16 @@ define MXS_BOOTLETS_BUILD_CMDS $(MXS_BOOTLETS_SED_BAREBOX) $(MXS_BOOTLETS_SED_LINUX) $(MXS_BOOTLETS_SED_UBOOT) - $(HOST_DIR)/bin/elftosb $(MXS_BOOTLETS_ELFTOSB_OPTIONS) \ - -z -c $(@D)/$(MXS_BOOTLETS_BOOTDESC) \ - -o $(@D)/$(MXS_BOOTLETS_BOOTSTREAM) + $(foreach ext, $(MXS_BOOTLETS_BOOTSTREAM_EXTS), + $(call MXS_BOOTLETS_SED_ZIMAGE,$(subst .sb,,$(ext))) + $(call MXS_BOOTLETS_ELFTOSB_CMD,$(ext)) + ) endef define MXS_BOOTLETS_INSTALL_TARGET_CMDS - cp $(@D)/$(MXS_BOOTLETS_BOOTSTREAM) $(BINARIES_DIR)/ + $(foreach ext, $(MXS_BOOTLETS_BOOTSTREAM_EXTS), + cp $(@D)/$(MXS_BOOTLETS_BOOTSTREAM_BASENAME)$(ext) $(BINARIES_DIR)/ + ) endef $(eval $(generic-package)) -- 2.17.1 From thomas.petazzoni at bootlin.com Tue Feb 6 12:59:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:59:30 +0100 Subject: [Buildroot] [git commit] package/python-boto3: bump to version 1.34.14 Message-ID: <20240206130048.C157387033@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=606b56c0f0510c15f006bc82243d65ca2cd1a30d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-boto3/python-boto3.hash | 4 ++-- package/python-boto3/python-boto3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-boto3/python-boto3.hash b/package/python-boto3/python-boto3.hash index 253a9de85e..02440a2960 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/boto3/json -md5 12a1c0bb1e9ab692a1e33204a0da7f12 boto3-1.28.78.tar.gz -sha256 aa970b1571321846543a6e615848352fe7621f1cb96b4454e919421924af95f7 boto3-1.28.78.tar.gz +md5 7cc00aa828c5d3a5c09e3af284e6d23e boto3-1.34.14.tar.gz +sha256 5c1bb487c68120aae236354d81b8a1a55d0aa3395d30748a01825ef90891921e boto3-1.34.14.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/python-boto3/python-boto3.mk b/package/python-boto3/python-boto3.mk index f60f3467d4..52bb5bc3b1 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.28.78 +PYTHON_BOTO3_VERSION = 1.34.14 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/70/f7/da69e173dd5663775f114fad3827dcc49537e232e36266463ff70529f1a4 +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/5f/b6/1e45c3a145304c3feaf48959c6a46efe9a256eec4d417a445b0d9827d20c PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 13:00:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:00:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-boto3: bump to version 1.34.14 In-Reply-To: <20240108072436.3487976-1-james.hilliard1@gmail.com> References: <20240108072436.3487976-1-james.hilliard1@gmail.com> Message-ID: <20240206140049.07bac969@windsurf> On Mon, 8 Jan 2024 00:24:36 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-boto3/python-boto3.hash | 4 ++-- > package/python-boto3/python-boto3.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 13:04:53 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:04:53 +0100 Subject: [Buildroot] [git commit] package/python-matplotlib-inline: new package Message-ID: <20240206130733.09785825C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1229b824ad97efd49747770a35d24b9f4218c6be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-matplotlib-inline/Config.in | 7 +++++++ .../python-matplotlib-inline/python-matplotlib-inline.hash | 5 +++++ .../python-matplotlib-inline/python-matplotlib-inline.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) diff --git a/package/Config.in b/package/Config.in index 97f590e2b7..728bd03b80 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1181,6 +1181,7 @@ menu "External python modules" source "package/python-marshmallow/Config.in" source "package/python-marshmallow-sqlalchemy/Config.in" source "package/python-matplotlib/Config.in" + source "package/python-matplotlib-inline/Config.in" source "package/python-mbstrdecoder/Config.in" source "package/python-memory-profiler/Config.in" source "package/python-midiutil/Config.in" diff --git a/package/python-matplotlib-inline/Config.in b/package/python-matplotlib-inline/Config.in new file mode 100644 index 0000000000..2ea9f4d966 --- /dev/null +++ b/package/python-matplotlib-inline/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MATPLOTLIB_INLINE + bool "python-matplotlib-inline" + select BR2_PACKAGE_PYTHON_TRAITLETS # runtime + help + Inline Matplotlib backend for Jupyter. + + https://github.com/ipython/matplotlib-inline diff --git a/package/python-matplotlib-inline/python-matplotlib-inline.hash b/package/python-matplotlib-inline/python-matplotlib-inline.hash new file mode 100644 index 0000000000..7382fc3406 --- /dev/null +++ b/package/python-matplotlib-inline/python-matplotlib-inline.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/matplotlib-inline/json +md5 aded9a57e2f526f76b3a4851d5528d4f matplotlib-inline-0.1.6.tar.gz +sha256 f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304 matplotlib-inline-0.1.6.tar.gz +# Locally computed sha256 checksums +sha256 8521b036c6448e0e0aa7213d4713b6fdee0f4c64c9f320450f77346bf5c0e8e4 LICENSE diff --git a/package/python-matplotlib-inline/python-matplotlib-inline.mk b/package/python-matplotlib-inline/python-matplotlib-inline.mk new file mode 100644 index 0000000000..c9c22605ca --- /dev/null +++ b/package/python-matplotlib-inline/python-matplotlib-inline.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-matplotlib-inline +# +################################################################################ + +PYTHON_MATPLOTLIB_INLINE_VERSION = 0.1.6 +PYTHON_MATPLOTLIB_INLINE_SOURCE = matplotlib-inline-$(PYTHON_MATPLOTLIB_INLINE_VERSION).tar.gz +PYTHON_MATPLOTLIB_INLINE_SITE = https://files.pythonhosted.org/packages/d9/50/3af8c0362f26108e54d58c7f38784a3bdae6b9a450bab48ee8482d737f44 +PYTHON_MATPLOTLIB_INLINE_SETUP_TYPE = setuptools +PYTHON_MATPLOTLIB_INLINE_LICENSE = BSD-3-Clause +PYTHON_MATPLOTLIB_INLINE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 13:06:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:06:35 +0100 Subject: [Buildroot] [git commit] package/python-ipython: bump to version 8.20.0 Message-ID: <20240206130733.143C887044@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b95111c2d47bfdb42ee20396f4722491fa27ffdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new python-matplotlib-inline runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-ipython/Config.in | 1 + package/python-ipython/python-ipython.hash | 4 ++-- package/python-ipython/python-ipython.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index c217efcfd1..87cc3969b0 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_IPYTHON select BR2_PACKAGE_PYTHON_BACKCALL # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime + select BR2_PACKAGE_PYTHON_MATPLOTLIB_INLINE # runtime select BR2_PACKAGE_PYTHON_PICKLESHARE # runtime select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index f68b3ba78c..33f70885b3 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 ac2ff5bad97aa09befdf7f0f27323699 ipython-8.17.2.tar.gz -sha256 126bb57e1895594bb0d91ea3090bbd39384f6fe87c3d57fd558d0670f50339bb ipython-8.17.2.tar.gz +md5 eee726e4cef5fd680110a899b4e5e2cb ipython-8.20.0.tar.gz +sha256 2f21bd3fc1d51550c89ee3944ae04bbc7bc79e129ea0937da6e6c68bfdbf117a ipython-8.20.0.tar.gz # Locally computed sha256 checksums sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index 1335121688..d3c2c05a05 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 8.17.2 +PYTHON_IPYTHON_VERSION = 8.20.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/a9/e9/c83d1a5756bf44f1802045a54dacc910d3d254c5ec56040993978d8c1b8d +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/c5/d1/187474d64bdefcb6804c1a3a1597d9e94f287e71c06f50f7784d56833fb7 PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From thomas.petazzoni at bootlin.com Tue Feb 6 13:19:03 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:19:03 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: added marleen.vos@mind.be for boards/configs based on stm32mp15 Message-ID: <20240206132021.962628705A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3b99c79d9dc5325f33353d3f66e7b0fb2c1cc15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The buildroot manual says this kind of commit should be done together with the actual changes made to a config/board. But since a number of changes will follow for some boards and configs, it seemed more logical to make a separate commit for this. Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7a943d1762..94952f72a8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2089,6 +2089,12 @@ F: board/qemu/riscv64-virt/ F: configs/qemu_riscv32_virt_defconfig F: configs/qemu_riscv64_virt_defconfig +N: Marleen Vos +F: board/stmicroelectronics/common/stm32mp157/ +F: configs/avenger96_defconfig +F: configs/stm32mp157a_dk1_defconfig +F: configs/stm32mp157c_dk2_defconfig + N: Martin Bark F: board/raspberrypi/ F: configs/raspberrypi3_defconfig From thomas.petazzoni at bootlin.com Tue Feb 6 13:19:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:19:42 +0100 Subject: [Buildroot] [git commit] configs/stm32mp157*: bump ATF to v2.6 Message-ID: <20240206132021.B547A8705C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=404a0b6a2a3e8a2ec31f448d0f397361da4e8be2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - v2.6 changes to FIP instead of SSBL boot. - This requires switching to u-boot.bin in U-Boot, and using that instead of .stm32 in ATF. - fiptool expects dtb to be split off from u-boot.bin, so need custom u-boot-nodtb.bin in addition to u-boot.dtb. Caveat: this is perhaps not really obligatory, but the ATF documentation explains it like that. - The partition must be named fip (while it must be named ssbl for SSBL boot). - Since the partition name is set in the common template, all defconfigs using that template must be bumped in a single commit - ATF now produces both fip.bin and .stm32, so fip.bin has been added to the configs - While we're at it, add the structuring comments to avenger96_defconfig similar like the other defconfigs Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- .../common/stm32mp157/genimage.cfg.template | 4 ++-- configs/avenger96_defconfig | 28 ++++++++++++++++++---- configs/stm32mp157a_dk1_defconfig | 14 +++++++---- configs/stm32mp157c_dk2_defconfig | 14 +++++++---- 4 files changed, 45 insertions(+), 15 deletions(-) diff --git a/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template b/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template index ff4aeceeed..c2affd98ea 100644 --- a/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template +++ b/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template @@ -11,8 +11,8 @@ image sdcard.img { image = "%ATFBIN%" } - partition ssbl { - image = "u-boot.stm32" + partition fip { + image = "fip.bin" size = 2M } diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 142f6dd8c9..536899583c 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -1,9 +1,16 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y + +# Linux headers same as kernel, a 5.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y + +# System configuration BR2_GLOBAL_PATCH_DIR="board/arrow/avenger96/patches" BR2_ROOTFS_OVERLAY="board/arrow/avenger96/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" @@ -12,16 +19,24 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dhcor-avenger96" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set + +# Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y @@ -29,7 +44,10 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_STM32=y -BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp15xx-dhcor-avenger96" + +# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index e764a1558d..3122c9647a 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -28,10 +28,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dk1.dtb E=0" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dk1.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y @@ -39,9 +43,11 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1" # Additional tools diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index aa0fcfa843..7472be38bb 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -28,10 +28,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb E=0" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y @@ -39,9 +43,11 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2" # Additional tools From thomas.petazzoni at bootlin.com Tue Feb 6 13:19:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:19:10 +0100 Subject: [Buildroot] [git commit] board/stmicroelectronics: generalise BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES regex Message-ID: <20240206132021.A58A98705B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3debd90836ffa7f30175587e79bbcb13c7b30f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The regex was a bit too strict in which characters it allowed. Thus, if e.g. a file name appears in the BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES string, it no longer matches, and we end up with an empty ATF_VARIABLES. This makes the subsequent grep fail, and the post-image.sh script fails without any error message (thanks to the -e option). Simplify the regex to match everything except the closing quotation mark. Note that Kconfig doesn't allow quotation marks at all inside a string (even escaped ones), so this regular expression is always OK. Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- board/stmicroelectronics/common/stm32mp157/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/stmicroelectronics/common/stm32mp157/post-image.sh b/board/stmicroelectronics/common/stm32mp157/post-image.sh index 65809e46a4..0cf52f4564 100755 --- a/board/stmicroelectronics/common/stm32mp157/post-image.sh +++ b/board/stmicroelectronics/common/stm32mp157/post-image.sh @@ -8,7 +8,7 @@ # atf_image() { - ATF_VARIABLES="$(sed -n 's/^BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="\([\/a-zA-Z0-9_=. \-]*\)"$/\1/p' ${BR2_CONFIG})" + ATF_VARIABLES="$(sed -n 's/^BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="\([^\"]*\)"$/\1/p' ${BR2_CONFIG})" # make sure DTB_FILE_NAME is set printf '%s\n' "${ATF_VARIABLES}" | grep -Eq 'DTB_FILE_NAME=[0-9A-Za-z_\-]*' # extract the value From yegorslists at googlemail.com Tue Feb 6 13:20:51 2024 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Tue, 6 Feb 2024 14:20:51 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory Message-ID: <20240206132051.2838897-1-yegorslists@googlemail.com> From: Yegor Yefremov This .gitignore file ignores all files in an output directory and hence doesn't change the git status. Remove "/output" entry from the main .gitignore file as it is already handled by this general approach. Signed-off-by: Yegor Yefremov --- .gitignore | 1 - Makefile | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bb02d9f572..14b7ca5040 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/output /dl /.auto.deps /.config.cmd diff --git a/Makefile b/Makefile index ac625152c6..86d4444745 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,9 @@ ifneq ($(findstring @,$(CANONICAL_O)),) $(error The build directory can not contain a '@') endif +# Create a default .gitignore file that ignores everything +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") + CANONICAL_CURDIR = $(realpath $(CURDIR)) REQ_UMASK = 0022 -- 2.34.1 From thomas.petazzoni at bootlin.com Tue Feb 6 13:23:38 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:23:38 +0100 Subject: [Buildroot] [PATCH 1/7] DEVELOPERS: added marleen.vos@mind.be for boards/configs based on stm32mp15 In-Reply-To: <20231219121508.1695768-2-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-2-marleen.vos@mind.be> Message-ID: <20240206142338.59a0a577@windsurf> On Tue, 19 Dec 2023 13:15:02 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > The buildroot manual says this kind of commit should be done together > with the actual changes made to a config/board. But since a number of > changes will follow for some boards and configs, it seemed more > logical to make a separate commit for this. > > Signed-off-by: Marleen Vos > --- > DEVELOPERS | 6 ++++++ > 1 file changed, 6 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 13:23:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:23:41 +0100 Subject: [Buildroot] [PATCH 2/7] board/stmicroelectronics: generalise BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES regex In-Reply-To: <20231219121508.1695768-3-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-3-marleen.vos@mind.be> Message-ID: <20240206142341.691cf57c@windsurf> On Tue, 19 Dec 2023 13:15:03 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > The regex was a bit too strict in which characters it allowed. Thus, > if e.g. a file name appears in the > BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES string, it no > longer matches, and we end up with an empty ATF_VARIABLES. This makes > the subsequent grep fail, and the post-image.sh script fails without > any error message (thanks to the -e option). > > Simplify the regex to match everything except the closing quotation > mark. Note that Kconfig doesn't allow quotation marks at all inside a > string (even escaped ones), so this regular expression is always OK. > > Signed-off-by: Marleen Vos > --- > board/stmicroelectronics/common/stm32mp157/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 13:23:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:23:45 +0100 Subject: [Buildroot] [PATCH 3/7] configs/stm32mp157*: bump ATF to v2.6 In-Reply-To: <20231219121508.1695768-4-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-4-marleen.vos@mind.be> Message-ID: <20240206142345.0f064063@windsurf> On Tue, 19 Dec 2023 13:15:04 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > - v2.6 changes to FIP instead of SSBL boot. > - This requires switching to u-boot.bin in U-Boot, and using that > instead of .stm32 in ATF. > - fiptool expects dtb to be split off from u-boot.bin, so need custom > u-boot-nodtb.bin in addition to u-boot.dtb. > Caveat: this is perhaps not really obligatory, but the ATF > documentation explains it like that. > - The partition must be named fip (while it must be named ssbl for > SSBL boot). > - Since the partition name is set in the common template, all > defconfigs using that template must be bumped in a single commit > - ATF now produces both fip.bin and .stm32, so fip.bin has > been added to the configs > - While we're at it, add the structuring comments to > avenger96_defconfig similar like the other defconfigs > > Signed-off-by: Marleen Vos > --- > .../common/stm32mp157/genimage.cfg.template | 4 +-- > configs/avenger96_defconfig | 28 +++++++++++++++---- > configs/stm32mp157a_dk1_defconfig | 14 +++++++--- > configs/stm32mp157c_dk2_defconfig | 14 +++++++--- > 4 files changed, 45 insertions(+), 15 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 13:25:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:25:49 +0100 Subject: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 In-Reply-To: <20231219121508.1695768-5-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-5-marleen.vos@mind.be> Message-ID: <20240206142549.2ad91f3b@windsurf> Hello Marleen, On Tue, 19 Dec 2023 13:15:05 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as > found in v2.8 patch dir has already been applied in lts-v2.8.13 > Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has > been included as 0001-build-tools-avoid-unnecessary-link.patch for > lts-v2.8.13 > > Signed-off-by: Marleen Vos > --- > boot/arm-trusted-firmware/Config.in | 6 ++ > .../arm-trusted-firmware.hash | 1 + > ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++ > 3 files changed, 84 insertions(+) > create mode 100644 boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch Thanks a lot for this patch. However, I don't think we want to add explicit choice options for all "random" versions of TF-A. Instead, if you want to use this lts-v2.8.13 version for STM32MP1 defconfigs, you should simply set BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE to lts-v2.8.13, and have a BR2_GLOBAL_PATCH_DIR with the patch that you need to apply on top of it. Due to this, I will mark your patches 4, 5 and 6 in this series as Changes Requested. If you have the chance to do this update and send a new iteration, it would be nice! Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Tue Feb 6 13:30:21 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:30:21 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: <20240206132051.2838897-1-yegorslists@googlemail.com> References: <20240206132051.2838897-1-yegorslists@googlemail.com> Message-ID: Yegor, All, On 2024-02-06 14:20 +0100, yegorslists--- via buildroot spake thusly: > From: Yegor Yefremov > > This .gitignore file ignores all files in an output directory and > hence doesn't change the git status. > > Remove "/output" entry from the main .gitignore file as it is already > handled by this general approach. What are you trying to achieve with this that does not work currently? Regards, Yann E. MORIN. > Signed-off-by: Yegor Yefremov > --- > .gitignore | 1 - > Makefile | 3 +++ > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/.gitignore b/.gitignore > index bb02d9f572..14b7ca5040 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -1,4 +1,3 @@ > -/output > /dl > /.auto.deps > /.config.cmd > diff --git a/Makefile b/Makefile > index ac625152c6..86d4444745 100644 > --- a/Makefile > +++ b/Makefile > @@ -63,6 +63,9 @@ ifneq ($(findstring @,$(CANONICAL_O)),) > $(error The build directory can not contain a '@') > endif > > +# Create a default .gitignore file that ignores everything > +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") > + > CANONICAL_CURDIR = $(realpath $(CURDIR)) > > REQ_UMASK = 0022 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Tue Feb 6 13:37:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 14:37:13 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: References: <20240206132051.2838897-1-yegorslists@googlemail.com> Message-ID: <67502ba4-3f73-428e-802e-6ee9cbc1fe6a@mind.be> On 06/02/2024 14:30, Yann E. MORIN wrote: > Yegor, All, > > On 2024-02-06 14:20 +0100, yegorslists--- via buildroot spake thusly: >> From: Yegor Yefremov >> >> This .gitignore file ignores all files in an output directory and >> hence doesn't change the git status. >> >> Remove "/output" entry from the main .gitignore file as it is already >> handled by this general approach. > > What are you trying to achieve with this that does not work currently? I you do `make O=output-test-mypkg` (which I do quite a lot), that output directory doesn't get ignored by git. We could ignore output* but maybe you name the output directory o-foo or something. Putting a .gitignore in a generated directory is a very elegant solution for that. It is used by e.g. virtualenv, pytest, and a load of other applications that generate output in a directory. Since the .gitignore is created in the output directory, it is no longer necessary to put output/ in the .gitignore file. All of the above could be put in the commit message, of course, but for me Yegor's commit message was sufficiently clear :-) Regards, Arnout > > Regards, > Yann E. MORIN. > >> Signed-off-by: Yegor Yefremov >> --- >> .gitignore | 1 - >> Makefile | 3 +++ >> 2 files changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/.gitignore b/.gitignore >> index bb02d9f572..14b7ca5040 100644 >> --- a/.gitignore >> +++ b/.gitignore >> @@ -1,4 +1,3 @@ >> -/output >> /dl >> /.auto.deps >> /.config.cmd >> diff --git a/Makefile b/Makefile >> index ac625152c6..86d4444745 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -63,6 +63,9 @@ ifneq ($(findstring @,$(CANONICAL_O)),) >> $(error The build directory can not contain a '@') >> endif >> >> +# Create a default .gitignore file that ignores everything >> +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") >> + >> CANONICAL_CURDIR = $(realpath $(CURDIR)) >> >> REQ_UMASK = 0022 >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Tue Feb 6 13:38:31 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 14:38:31 +0100 Subject: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 In-Reply-To: <20240206142549.2ad91f3b@windsurf> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-5-marleen.vos@mind.be> <20240206142549.2ad91f3b@windsurf> Message-ID: <018bc3f7-2ae5-4d36-8c6b-485f41b4f319@mind.be> On 06/02/2024 14:25, Thomas Petazzoni via buildroot wrote: > Hello Marleen, > > On Tue, 19 Dec 2023 13:15:05 +0100 > Marleen Vos via buildroot wrote: > >> From: Marleen Vos >> >> Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as >> found in v2.8 patch dir has already been applied in lts-v2.8.13 >> Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has >> been included as 0001-build-tools-avoid-unnecessary-link.patch for >> lts-v2.8.13 >> >> Signed-off-by: Marleen Vos >> --- >> boot/arm-trusted-firmware/Config.in | 6 ++ >> .../arm-trusted-firmware.hash | 1 + >> ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++ >> 3 files changed, 84 insertions(+) >> create mode 100644 boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch > > Thanks a lot for this patch. However, I don't think we want to add > explicit choice options for all "random" versions of TF-A. This is the current situation however: $ ls -R boot/arm-trusted-firmware/ boot/arm-trusted-firmware/: Config.in arm-trusted-firmware.hash arm-trusted-firmware.mk v2.2/ v2.3/ v2.4/ v2.5/ v2.6/ v2.7/ v2.8/ v2.9/ boot/arm-trusted-firmware/v2.2: 0001-PATCH-feat-build-add-support-for-new-binutils-versio.patch boot/arm-trusted-firmware/v2.3: 0001-feat-build-add-support-for-new-binutils-versions.patch boot/arm-trusted-firmware/v2.4: 0001-feat-build-add-support-for-new-binutils-versions.patch boot/arm-trusted-firmware/v2.5: 0001-feat-build-add-support-for-new-binutils-versions.patch boot/arm-trusted-firmware/v2.6: 0001-feat-build-add-support-for-new-binutils-versions.patch boot/arm-trusted-firmware/v2.7: 0001-feat-build-add-support-for-new-binutils-versions.patch boot/arm-trusted-firmware/v2.8: 0001-feat-build-add-support-for-new-binutils-versions.patch 0002-build-tools-avoid-unnecessary-link.patch boot/arm-trusted-firmware/v2.9: 0001-build-tools-avoid-unnecessary-link.patch Regards, Arnout > Instead, if > you want to use this lts-v2.8.13 version for STM32MP1 defconfigs, you > should simply set BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE > to lts-v2.8.13, and have a BR2_GLOBAL_PATCH_DIR with the patch that you > need to apply on top of it. > > Due to this, I will mark your patches 4, 5 and 6 in this series as > Changes Requested. If you have the chance to do this update and send a > new iteration, it would be nice! > > Best regards, > > Thomas From thomas.petazzoni at bootlin.com Tue Feb 6 13:39:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:39:25 +0100 Subject: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 In-Reply-To: <018bc3f7-2ae5-4d36-8c6b-485f41b4f319@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-5-marleen.vos@mind.be> <20240206142549.2ad91f3b@windsurf> <018bc3f7-2ae5-4d36-8c6b-485f41b4f319@mind.be> Message-ID: <20240206143925.24537bba@windsurf> On Tue, 6 Feb 2024 14:38:31 +0100 Arnout Vandecappelle wrote: > > Thanks a lot for this patch. However, I don't think we want to add > > explicit choice options for all "random" versions of TF-A. > > This is the current situation however: Yes, but there is no explicit choice options for all those versions. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 13:28:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:28:02 +0100 Subject: [Buildroot] [git commit] boot/arm-trusted-firmware: bump latest version to v2.10 Message-ID: <20240206133952.3813187064@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47647814f57482568683190a399745543cb029aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Patch 0001-build-tools-avoid-unnecessary-link.patch that was applied to v2.9 is already in v2.10, so no new patch dir for v2.10 is added Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 4 ++-- boot/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index a5ac987172..c65f4aaba2 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -14,7 +14,7 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v2.7" + bool "v2.10" config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION bool "Custom version" @@ -42,7 +42,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v2.7" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "v2.10" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index d931610dc4..c63e9d30b0 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz +sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst From thomas.petazzoni at bootlin.com Tue Feb 6 13:39:57 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:39:57 +0100 Subject: [Buildroot] [PATCH 7/7] boot/arm-trusted-firmware: bump latest version to v2.10 In-Reply-To: <20231219121508.1695768-8-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-8-marleen.vos@mind.be> Message-ID: <20240206143957.6bf13eec@windsurf> On Tue, 19 Dec 2023 13:15:08 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > Patch 0001-build-tools-avoid-unnecessary-link.patch that was applied to > v2.9 is already in v2.10, so no new patch dir for v2.10 is added > > Signed-off-by: Marleen Vos > --- > boot/arm-trusted-firmware/Config.in | 4 ++-- > boot/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Tue Feb 6 13:43:17 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:43:17 +0100 Subject: [Buildroot] [git commit] package/python-rtoml: bump to version 0.10.0 Message-ID: <20240206134334.9062987063@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00702e3ffde1ebce9e2a2cfb63af7992a627c149 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools-rust to maturin infrastructure. Signed-off-by: James Hilliard --- package/python-rtoml/python-rtoml.hash | 2 +- package/python-rtoml/python-rtoml.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash index 04d22ed1a4..59f17d9d62 100644 --- a/package/python-rtoml/python-rtoml.hash +++ b/package/python-rtoml/python-rtoml.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz # Locally computed sha256 checksums sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk index 819dcf3288..16f9dea573 100644 --- a/package/python-rtoml/python-rtoml.mk +++ b/package/python-rtoml/python-rtoml.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_RTOML_VERSION = 0.8.0 +PYTHON_RTOML_VERSION = 0.10.0 PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz -PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 -PYTHON_RTOML_SETUP_TYPE = setuptools-rust +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/ca/b2/0e77a00e75ed582ec1c4c3a9e1eeed886a15c195bcce87b7daf1171c4115 +PYTHON_RTOML_SETUP_TYPE = maturin PYTHON_RTOML_LICENSE = MIT PYTHON_RTOML_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Feb 6 13:43:16 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:43:16 +0100 Subject: [Buildroot] [git commit] package/python-rpds-py: bump to version 0.16.2 Message-ID: <20240206134334.80DFB87070@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd5f808be1057434575322711b0e4775403e4d38 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard --- package/python-rpds-py/python-rpds-py.hash | 2 +- package/python-rpds-py/python-rpds-py.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash index b04aa210d3..8c4b6181d0 100644 --- a/package/python-rpds-py/python-rpds-py.hash +++ b/package/python-rpds-py/python-rpds-py.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz # Locally computed sha256 checksums sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 6f71d02047..5f0d30d002 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPDS_PY_VERSION = 0.12.0 +PYTHON_RPDS_PY_VERSION = 0.16.2 PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 PYTHON_RPDS_PY_SETUP_TYPE = maturin PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Feb 6 13:43:41 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:43:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: <20240111051726.2918732-1-james.hilliard1@gmail.com> References: <20240111051726.2918732-1-james.hilliard1@gmail.com> Message-ID: James, all, On 2024-01-10 22:17 -0700, James Hilliard spake thusly: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-rpds-py/python-rpds-py.hash | 2 +- > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > index b04aa210d3..8c4b6181d0 100644 > --- a/package/python-rpds-py/python-rpds-py.hash > +++ b/package/python-rpds-py/python-rpds-py.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz > # Locally computed sha256 checksums > sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE > diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk > index 6f71d02047..5f0d30d002 100644 > --- a/package/python-rpds-py/python-rpds-py.mk > +++ b/package/python-rpds-py/python-rpds-py.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > +PYTHON_RPDS_PY_VERSION = 0.16.2 > PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz > -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 > +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 > PYTHON_RPDS_PY_SETUP_TYPE = maturin > PYTHON_RPDS_PY_LICENSE = MIT > PYTHON_RPDS_PY_LICENSE_FILES = LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 13:44:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:44:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: References: <20240111051726.2918732-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-05 12:05 +0100, Arnout Vandecappelle via buildroot spake thusly: > On 11/01/2024 06:17, James Hilliard wrote: > > Signed-off-by: James Hilliard > > --- > > package/python-rpds-py/python-rpds-py.hash | 2 +- > > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > > index b04aa210d3..8c4b6181d0 100644 > > --- a/package/python-rpds-py/python-rpds-py.hash > > +++ b/package/python-rpds-py/python-rpds-py.hash > > @@ -1,4 +1,4 @@ > > # Locally calculated after vendoring > > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > > +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz > > ERROR: while checking hashes from package/python-rpds-py//python-rpds-py.hash > ERROR: rpds_py-0.16.2.tar.gz has wrong sha256 hash: > ERROR: expected: 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb > ERROR: got : bc62a37913de53569414f6eb4a16a005b1dd04afb473c3c27561b11614f92034 > ERROR: Incomplete download, or man-in-the-middle (MITM) attack > > This might be the gitattributes issue that Yann has a patch series for. I'm > marking this patch as Changes Requested, you can try to re-submit after > Yann's series is merged. It turned out that Arnout had a broken setup, and the archives were made with tar 1.35 rather than the expexted 1.34. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 13:44:42 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:44:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rtoml: bump to version 0.10.0 In-Reply-To: <20240111052225.2922249-1-james.hilliard1@gmail.com> References: <20240111052225.2922249-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-01-10 22:22 -0700, James Hilliard spake thusly: > Migrate from setuptools-rust to maturin infrastructure. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-rtoml/python-rtoml.hash | 2 +- > package/python-rtoml/python-rtoml.mk | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash > index 04d22ed1a4..59f17d9d62 100644 > --- a/package/python-rtoml/python-rtoml.hash > +++ b/package/python-rtoml/python-rtoml.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz > +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz > # Locally computed sha256 checksums > sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE > diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk > index 819dcf3288..16f9dea573 100644 > --- a/package/python-rtoml/python-rtoml.mk > +++ b/package/python-rtoml/python-rtoml.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PYTHON_RTOML_VERSION = 0.8.0 > +PYTHON_RTOML_VERSION = 0.10.0 > PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz > -PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 > -PYTHON_RTOML_SETUP_TYPE = setuptools-rust > +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/ca/b2/0e77a00e75ed582ec1c4c3a9e1eeed886a15c195bcce87b7daf1171c4115 > +PYTHON_RTOML_SETUP_TYPE = maturin > PYTHON_RTOML_LICENSE = MIT > PYTHON_RTOML_LICENSE_FILES = LICENSE > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 13:45:57 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:45:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rtoml: bump to version 0.10.0 In-Reply-To: References: <20240111052225.2922249-1-james.hilliard1@gmail.com> <687fa6af-4d6f-4890-bd3a-c420ede9cdfd@mind.be> Message-ID: Arnout, All, On 2024-02-06 09:49 +0100, Arnout Vandecappelle via buildroot spake thusly: > On 05/02/2024 18:21, James Hilliard wrote: > > On Mon, Feb 5, 2024 at 4:29?AM Arnout Vandecappelle wrote: > > > On 11/01/2024 06:22, James Hilliard wrote: > > > > Migrate from setuptools-rust to maturin infrastructure. > > > > > > > > Signed-off-by: James Hilliard > > > > --- > > > > package/python-rtoml/python-rtoml.hash | 2 +- > > > > package/python-rtoml/python-rtoml.mk | 6 +++--- > > > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > > > > > diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash > > > > index 04d22ed1a4..59f17d9d62 100644 > > > > --- a/package/python-rtoml/python-rtoml.hash > > > > +++ b/package/python-rtoml/python-rtoml.hash > > > > @@ -1,4 +1,4 @@ > > > > # Locally calculated after vendoring > > > > -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz > > > > +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz > > > > > > Same problem: > > > > > > ERROR: while checking hashes from package/python-rtoml//python-rtoml.hash > > > ERROR: rtoml-0.10.0.tar.gz has wrong sha256 hash: > > > ERROR: expected: 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 > > > ERROR: got : 624cc1ff2b3fdea42aeee3a4d1537d37431ec001870dfee1e04a12bd3076a2d3 > > Hmm, I'm unable to reproduce this issue. Turned out that Arnout's setup was slightly borked, and he was using a 1.35 tar to create the archvies... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From dev at andin.de Tue Feb 6 13:58:19 2024 From: dev at andin.de (Andreas Naumann) Date: Tue, 6 Feb 2024 14:58:19 +0100 Subject: [Buildroot] [PATCH 2/2] package/glm: bump version In-Reply-To: <20240114174823.2732695-2-bernd@kuhls.net> References: <20240114174823.2732695-1-bernd@kuhls.net> <20240114174823.2732695-2-bernd@kuhls.net> Message-ID: Hi, Am 14.01.24 um 18:48 schrieb Bernd Kuhls: > Fixes build error with packages depending on glm, like kodi-screensaver* > and kodi-visualisation*: > > CMake Error at /home/buildroot/br2/output/per-package/kodi-screensaver-asteroids/host/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:230 (message): > Could NOT find glm (missing: GLM_INCLUDE_DIR) > > Since glm release 0.9.9.8 (bumped in buildroot with commit > 01ad11343172ea698e4dcc1c64cb02ce26671e49) many fixes were added for its > cmake support: https://github.com/g-truc/glm/pull/1054 > > Instead of backporting all of them we bump to latest git HEAD. > Preparations for glm 1.0.0 are underway: > https://github.com/g-truc/glm/pull/1180 I just now find this patch, after having sent one bumping glm to tag 1.0.0 (which is only about 2 weeks old). However, since it's a tag, I suggest my patch supersedes this one. regards, Andreas > > Fixes build error with this defconfig: > > BR2_x86_64=y > BR2_x86_x86_64_v4=y > BR2_BINUTILS_VERSION_2_41_X=y > BR2_GCC_VERSION_13_X=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PER_PACKAGE_DIRECTORIES=y > BR2_INIT_NONE=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_KODI=y > BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON3_PY_ONLY=y > > Signed-off-by: Bernd Kuhls > --- > package/glm/glm.hash | 2 +- > package/glm/glm.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/glm/glm.hash b/package/glm/glm.hash > index c4e2101604..6bc88739b3 100644 > --- a/package/glm/glm.hash > +++ b/package/glm/glm.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz > +sha256 9dc8c27c2b00d44a0b9d4a619b13848f1092914e7ec60447ac3db528a8e9ba8a glm-b06b775c1c80af51a1183c0e167f9de3b2351a79.tar.gz > sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt > diff --git a/package/glm/glm.mk b/package/glm/glm.mk > index ef549931f6..92357b4fe2 100644 > --- a/package/glm/glm.mk > +++ b/package/glm/glm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GLM_VERSION = 0.9.9.8 > +GLM_VERSION = b06b775c1c80af51a1183c0e167f9de3b2351a79 > GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) > GLM_LICENSE = MIT > GLM_LICENSE_FILES = copying.txt From arnout at mind.be Tue Feb 6 13:59:23 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 14:59:23 +0100 Subject: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 In-Reply-To: <018bc3f7-2ae5-4d36-8c6b-485f41b4f319@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-5-marleen.vos@mind.be> <20240206142549.2ad91f3b@windsurf> <018bc3f7-2ae5-4d36-8c6b-485f41b4f319@mind.be> Message-ID: <11005254-f77b-46ed-8b65-7e23bd97f37d@mind.be> On 06/02/2024 14:38, Arnout Vandecappelle wrote: > > > On 06/02/2024 14:25, Thomas Petazzoni via buildroot wrote: >> Hello Marleen, >> >> On Tue, 19 Dec 2023 13:15:05 +0100 >> Marleen Vos via buildroot wrote: >> >>> From: Marleen Vos >>> >>> Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as >>> found in v2.8 patch dir has already been applied in lts-v2.8.13 >>> Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has >>> been included as 0001-build-tools-avoid-unnecessary-link.patch for >>> lts-v2.8.13 >>> >>> Signed-off-by: Marleen Vos >>> --- >>> ? boot/arm-trusted-firmware/Config.in?????????? |? 6 ++ >>> ? .../arm-trusted-firmware.hash???????????????? |? 1 + >>> ? ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++ >>> ? 3 files changed, 84 insertions(+) >>> ? create mode 100644 >>> boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch >> >> Thanks a lot for this patch. However, I don't think we want to add >> explicit choice options for all "random" versions of TF-A. > > ?This is the current situation however: ?Sorry, I misread your comment. ?The idea is not to create version options for all "random" versions of TF-A. Instead, the idea is to have 3 options: latest, lts, and custom. ?The idea is also that board configs should be able to use the lts version, since the assumption is that lts is not going to break things. I've taken a look at the TF-A LTS branch and the commits in there look relatively safe. From a user perspective, I think it makes sense that you can update Buildroot and get an automatic update of TF-A on the lts branch as well (which is not possible if you specify a custom version). I.e. from a practical point of view, I think this lts version is the one that people should use. It should probably even be the default... ?We could also have removed the "latest" option entirely. Perhaps we should, really, I don't have a really good use case for it. Maybe for "hobby" users who want bleeding edge when they follow Buildroot master. ?So that's the background for adding the LTS option, and using it in the defconfig. That leaves the question why it is called BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION instead of BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_VERSION. The reason behind that is that when we move to a new LTS, we want this to be explicit, with legacy handling and everything - you really _don't_ want a silent update from 2.8 to 2.12 (or whatever) when you update Buildroot. So by giving a different name to the config symbol when the LTS branch is updated, we can make sure that there is legacy handling and things break loudly instead of silently. ?Is this sufficient explanation? ?Regards, ?Arnout > >> Instead, if >> you want to use this lts-v2.8.13 version for STM32MP1 defconfigs, you >> should simply set BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE >> to lts-v2.8.13, and have a BR2_GLOBAL_PATCH_DIR with the patch that you >> need to apply on top of it. >> >> Due to this, I will mark your patches 4, 5 and 6 in this series as >> Changes Requested. If you have the chance to do this update and send a >> new iteration, it would be nice! >> >> Best regards, >> >> Thomas From yann.morin.1998 at free.fr Tue Feb 6 13:48:36 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:48:36 +0100 Subject: [Buildroot] [git commit] package/glm: Bump to 1.0.0 Message-ID: <20240206140239.2DB8881F76@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12b97949ef47161e7117e6092789a00cc8cbaaa7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master glm did not install headers since [1], at least in a per-package build. Bumping to 1.0.0 fixes that. The cmake option to avoid building the lib has changed Partially fixes [2], where cegui failed to configure because of the missing glm headers. It also fixes kodi-screensaver and kodi-visualisation (no autobuidl failures so far): CMake Error at [...]/output/per-package/kodi-screensaver-asteroids/host/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find glm (missing: GLM_INCLUDE_DIR) [1] 01ad113 package/glm: bump to version 0.9.9.8 [2] http://autobuild.buildroot.org/results/241/241a60f8ecb6fec5dc122d64dd438dd4249f8c3e/ Signed-off-by: Andreas Naumann [yann.morin.1998 at free.fr: add kodi failures from Bernd] Signed-off-by: Yann E. MORIN --- package/glm/glm.hash | 2 +- package/glm/glm.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/glm/glm.hash b/package/glm/glm.hash index c4e2101604..0084bd0930 100644 --- a/package/glm/glm.hash +++ b/package/glm/glm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz +sha256 e51f6c89ff33b7cfb19daafb215f293d106cd900f8d681b9b1295312ccadbd23 glm-1.0.0.tar.gz sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt diff --git a/package/glm/glm.mk b/package/glm/glm.mk index ef549931f6..ce8efc11a7 100644 --- a/package/glm/glm.mk +++ b/package/glm/glm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLM_VERSION = 0.9.9.8 +GLM_VERSION = 1.0.0 GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) GLM_LICENSE = MIT GLM_LICENSE_FILES = copying.txt @@ -17,7 +17,6 @@ GLM_INSTALL_TARGET = NO # Don't build libraries as GLM is header-only GLM_CONF_OPTS = \ -DGLM_TEST_ENABLE=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_STATIC_LIBS=OFF + -DGLM_BUILD_LIBRARY=OFF $(eval $(cmake-package)) From yann.morin.1998 at free.fr Tue Feb 6 14:03:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 15:03:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/glm: Bump to 1.0.0 In-Reply-To: <20240206102144.1831146-1-anaumann@ultratronik.de> References: <20240206102144.1831146-1-anaumann@ultratronik.de> Message-ID: Andreas, All, On 2024-02-06 11:21 +0100, Andreas Naumann spake thusly: > glm did not install headers since [1], at least in a per-package > build. Bumping to 1.0.0 fixes that. > The cmake option to avoid building the lib has changed > > Partially fixes [2], where cegui failed to configure because of > the missing glm headers. > > [1] 01ad113 package/glm: bump to version 0.9.9.8 > [2] http://autobuild.buildroot.org/results/241/241a60f8ecb6fec5dc122d64dd438dd4249f8c3e/ > > Signed-off-by: Andreas Naumann Applied to master, thanks. Bernd sent an earlier patch to bump to a random git sha1, and I grabbed the failures from his commit log and added them to this patch when applying. Regards, Yann E. MORIN. > --- > note: 0.9.9.8 from 2020 was the latest tag until a 1.0.0 was cut about > two weeks ago (24th january 2024). I've seen commit 3a4b550 which might > have been responsible but didnt check since 1.0.0 was available. > > > package/glm/glm.hash | 2 +- > package/glm/glm.mk | 5 ++--- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/package/glm/glm.hash b/package/glm/glm.hash > index c4e21016047..0084bd0930c 100644 > --- a/package/glm/glm.hash > +++ b/package/glm/glm.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz > +sha256 e51f6c89ff33b7cfb19daafb215f293d106cd900f8d681b9b1295312ccadbd23 glm-1.0.0.tar.gz > sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt > diff --git a/package/glm/glm.mk b/package/glm/glm.mk > index ef549931f6a..ce8efc11a78 100644 > --- a/package/glm/glm.mk > +++ b/package/glm/glm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GLM_VERSION = 0.9.9.8 > +GLM_VERSION = 1.0.0 > GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) > GLM_LICENSE = MIT > GLM_LICENSE_FILES = copying.txt > @@ -17,7 +17,6 @@ GLM_INSTALL_TARGET = NO > # Don't build libraries as GLM is header-only > GLM_CONF_OPTS = \ > -DGLM_TEST_ENABLE=OFF \ > - -DBUILD_SHARED_LIBS=OFF \ > - -DBUILD_STATIC_LIBS=OFF > + -DGLM_BUILD_LIBRARY=OFF > > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 14:06:16 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 15:06:16 +0100 Subject: [Buildroot] [PATCH 2/2] package/glm: bump version In-Reply-To: References: <20240114174823.2732695-1-bernd@kuhls.net> <20240114174823.2732695-2-bernd@kuhls.net> Message-ID: Andreas, Bernd, All, On 2024-02-06 14:58 +0100, Andreas Naumann spake thusly: > Am 14.01.24 um 18:48 schrieb Bernd Kuhls: > > Fixes build error with packages depending on glm, like kodi-screensaver* > > and kodi-visualisation*: > > > > CMake Error at /home/buildroot/br2/output/per-package/kodi-screensaver-asteroids/host/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:230 (message): > > Could NOT find glm (missing: GLM_INCLUDE_DIR) > > > > Since glm release 0.9.9.8 (bumped in buildroot with commit > > 01ad11343172ea698e4dcc1c64cb02ce26671e49) many fixes were added for its > > cmake support: https://github.com/g-truc/glm/pull/1054 > > > > Instead of backporting all of them we bump to latest git HEAD. > > Preparations for glm 1.0.0 are underway: > > https://github.com/g-truc/glm/pull/1180 > > I just now find this patch, after having sent one bumping glm to tag 1.0.0 > (which is only about 2 weeks old). However, since it's a tag, I suggest my > patch supersedes this one. Ah, I see you evnetually spotted this patch too! ;-) I indeed applied your patch, but as I said, I also grabbed the kodi failures Bernd noticed. Regards, Yann E. MORIN. > regards, > Andreas > > > > > Fixes build error with this defconfig: > > > > BR2_x86_64=y > > BR2_x86_x86_64_v4=y > > BR2_BINUTILS_VERSION_2_41_X=y > > BR2_GCC_VERSION_13_X=y > > BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_PER_PACKAGE_DIRECTORIES=y > > BR2_INIT_NONE=y > > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > > BR2_PACKAGE_KODI=y > > BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS=y > > BR2_PACKAGE_MESA3D=y > > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y > > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > > BR2_PACKAGE_MESA3D_OPENGL_ES=y > > BR2_PACKAGE_PYTHON3=y > > BR2_PACKAGE_PYTHON3_PY_ONLY=y > > > > Signed-off-by: Bernd Kuhls > > --- > > package/glm/glm.hash | 2 +- > > package/glm/glm.mk | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/package/glm/glm.hash b/package/glm/glm.hash > > index c4e2101604..6bc88739b3 100644 > > --- a/package/glm/glm.hash > > +++ b/package/glm/glm.hash > > @@ -1,3 +1,3 @@ > > # Locally calculated > > -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz > > +sha256 9dc8c27c2b00d44a0b9d4a619b13848f1092914e7ec60447ac3db528a8e9ba8a glm-b06b775c1c80af51a1183c0e167f9de3b2351a79.tar.gz > > sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt > > diff --git a/package/glm/glm.mk b/package/glm/glm.mk > > index ef549931f6..92357b4fe2 100644 > > --- a/package/glm/glm.mk > > +++ b/package/glm/glm.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > -GLM_VERSION = 0.9.9.8 > > +GLM_VERSION = b06b775c1c80af51a1183c0e167f9de3b2351a79 > > GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) > > GLM_LICENSE = MIT > > GLM_LICENSE_FILES = copying.txt > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From antoine.coutant at smile.fr Tue Feb 6 14:09:32 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Tue, 6 Feb 2024 15:09:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: <20240111051726.2918732-1-james.hilliard1@gmail.com> References: <20240111051726.2918732-1-james.hilliard1@gmail.com> Message-ID: <1dd4afa6-e225-4e79-bb3a-21d0e04c7571@smile.fr> James, All, On 11/01/2024 06:17, James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-rpds-py/python-rpds-py.hash | 2 +- > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > index b04aa210d3..8c4b6181d0 100644 > --- a/package/python-rpds-py/python-rpds-py.hash > +++ b/package/python-rpds-py/python-rpds-py.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz > # Locally computed sha256 checksums > sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE > diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk > index 6f71d02047..5f0d30d002 100644 > --- a/package/python-rpds-py/python-rpds-py.mk > +++ b/package/python-rpds-py/python-rpds-py.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > +PYTHON_RPDS_PY_VERSION = 0.16.2 > PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz > -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 > +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 > PYTHON_RPDS_PY_SETUP_TYPE = maturin > PYTHON_RPDS_PY_LICENSE = MIT > PYTHON_RPDS_PY_LICENSE_FILES = LICENSE rpds depends on the crate pyo3. This crate uses "std::sync::atomic::AtomicI64" which doesn't exist for 32 bits targets. That leads to an error [1]. An issue have been opened on pyo3's github [2]. A fix have been accepted [3] but it isn't in the last release. Thus, this version bump doesn't fix this problem. [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854842 [2]: https://github.com/PyO3/pyo3/issues/3614 [3]: https://github.com/PyO3/pyo3/pull/3619 regards, Antoine Coutant From thomas.petazzoni at bootlin.com Tue Feb 6 14:11:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:11:44 +0100 Subject: [Buildroot] CVE-2023-0687 version range fix Message-ID: <20240206151144.103d5b2b@windsurf> Dear NVD maintainers, Your entry at https://nvd.nist.gov/vuln/detail/CVE-2023-0687 for CVE-2023-0687 states that the affected CPE ID is cpe:2.3:a:gnu:glibc:2.38:*:*:*:*:*:*:*, which indicates that only glibc 2.38 is affected. But actually, the bug was fixed in glibc 2.38, so it's all versions prior to 2.38 that are affected. According to the bug report at https://sourceware.org/bugzilla/show_bug.cgi?id=29444, this issue was fixed in commit https://sourceware.org/git/?p=glibc.git;a=commit;h=801af9fafd4689337ebf27260aa115335a0cb2bc, and: $ git tag --contains 801af9fafd46 glibc-2.38 glibc-2.38.9000 So the commit fixing this issue made it to the 2.38 release. Do you think you could adjust the NVD entry for this CVE ? Thanks a lot in advance! Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:13:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:13:27 +0100 Subject: [Buildroot] [PATCH 3/3] package/glibc: ignore CVE-2023-0687, disputed In-Reply-To: References: <20231220200110.1819507-1-thomas.petazzoni@bootlin.com> <20231220200110.1819507-3-thomas.petazzoni@bootlin.com> Message-ID: <20240206151327.0855d4b8@windsurf> Hello Yann, On Sat, 23 Dec 2023 11:19:57 +0100 "Yann E. MORIN" wrote: > This CVE is supposed to be fixed by 801af9fafd46 (gmon: Fix allocated > buffer overflow (bug 29444)) which is in 2.38: > > $ git tag --contains 801af9fafd46 > glibc-2.38 > glibc-2.38.9000 > > So the CVE DB should be updated to state that glibc >= 2.38 is not > affected. Good point. Sorry for the delay in getting back to you. I just send a mail to the NVD maintainers, Cc'ed to the Buildroot mailing list. I'll mark my patch as Rejected in patchwork. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:15:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:15:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-jsonschema-specifications: bump to version 2023.12.1 In-Reply-To: <20240109083922.4085395-1-james.hilliard1@gmail.com> References: <20240109083922.4085395-1-james.hilliard1@gmail.com> Message-ID: <20240206151502.5ceb586b@windsurf> On Tue, 9 Jan 2024 01:39:22 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > .../python-jsonschema-specifications.hash | 4 ++-- > .../python-jsonschema-specifications.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:15:07 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:15:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-jsonschema: bump to version 4.20.0 In-Reply-To: <20240109084236.4087932-1-james.hilliard1@gmail.com> References: <20240109084236.4087932-1-james.hilliard1@gmail.com> Message-ID: <20240206151507.5a1ba109@windsurf> On Tue, 9 Jan 2024 01:42:36 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-jsonschema/python-jsonschema.hash | 4 ++-- > package/python-jsonschema/python-jsonschema.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:15:11 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:15:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lxml: bump to version 5.1.0 In-Reply-To: <20240109085421.33259-1-james.hilliard1@gmail.com> References: <20240109085421.33259-1-james.hilliard1@gmail.com> Message-ID: <20240206151511.175b500c@windsurf> On Tue, 9 Jan 2024 01:54:21 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-lxml/python-lxml.hash | 2 +- > package/python-lxml/python-lxml.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:17:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:17:09 +0100 Subject: [Buildroot] [PATCH 1/2] package/kodi: needs host-cmake >= 3.26 In-Reply-To: <20240114174823.2732695-1-bernd@kuhls.net> References: <20240114174823.2732695-1-bernd@kuhls.net> Message-ID: <20240206151709.61d8e308@windsurf> On Sun, 14 Jan 2024 18:48:22 +0100 Bernd Kuhls wrote: > Fixes build error on Debian bookworm with > > $ cmake --version > cmake version 3.25.1 > > -- Found Python3: /home/buildroot/br2/output/per-package/kodi/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/python3.11 > (found suitable exact version "3.11.6") found components: Development Development.Module Development.Embed > -- Could NOT find Python3 (missing: Interpreter) > Reason given by package: > Interpreter: Cannot run the interpreter > "/home/buildroot/br2/output/per-package/kodi/host/x86_64-buildroot-linux-gnu/sysroot/usr/bin/python3" > > CMake Error at cmake/scripts/common/Macros.cmake:432 (message): > PYTHON enabled but not found > Call Stack (most recent call first): > CMakeLists.txt:214 (core_optional_dep) > > -- Configuring incomplete, errors occurred! > > Signed-off-by: Bernd Kuhls > --- > package/kodi/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Since when does kodi needs host-cmake >= 3.26 ? Indeed, we need to understand that so that we can understand if this patch needs to be backported to one of the LTS/stable branches. Could you check this, and submit an updated version that includes those details in the commit log. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:18:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:18:31 +0100 Subject: [Buildroot] [git commit] package/python-jsonschema: bump to version 4.20.0 Message-ID: <20240206141842.49D1B8708D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81b9842d2ad534e3e01b9efb2b353ab3ecc1e4f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-jsonschema/python-jsonschema.hash | 4 ++-- package/python-jsonschema/python-jsonschema.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jsonschema/python-jsonschema.hash b/package/python-jsonschema/python-jsonschema.hash index f421b8a48b..645a6657fe 100644 --- a/package/python-jsonschema/python-jsonschema.hash +++ b/package/python-jsonschema/python-jsonschema.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/jsonschema/json -md5 8bf5f0a2342dc4c8390c28a99be555e7 jsonschema-4.19.2.tar.gz -sha256 c9ff4d7447eed9592c23a12ccee508baf0dd0d59650615e847feb6cdca74f392 jsonschema-4.19.2.tar.gz +md5 e758f0f6a8f3f59d754e7e35ea9f0792 jsonschema-4.20.0.tar.gz +sha256 4f614fd46d8d61258610998997743ec5492a648b33cf478c1ddc23ed4598a5fa jsonschema-4.20.0.tar.gz # Locally computed sha256 checksums sha256 4f92a015a13c4d1a040bef018aa13430b4f1bc73b41b16bb846c346766de7439 COPYING sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a json/LICENSE diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index dee87e8f9d..512c92aa77 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JSONSCHEMA_VERSION = 4.19.2 +PYTHON_JSONSCHEMA_VERSION = 4.20.0 PYTHON_JSONSCHEMA_SOURCE = jsonschema-$(PYTHON_JSONSCHEMA_VERSION).tar.gz -PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/95/18/618159fb2efbe3fb2cd32b16c40278954cde94744957734ef0482286a052 +PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/a8/74/77bf12d3dd32b764692a71d4200f03429c41eee2e8a9225d344d91c03aff PYTHON_JSONSCHEMA_SETUP_TYPE = pep517 PYTHON_JSONSCHEMA_LICENSE = MIT PYTHON_JSONSCHEMA_LICENSE_FILES = COPYING json/LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 14:18:32 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:18:32 +0100 Subject: [Buildroot] [git commit] package/python-jsonschema-specifications: bump to version 2023.12.1 Message-ID: <20240206141842.5509F8708F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=008fabd150c68d55ac1b0d676607d243df97545e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-jsonschema-specifications.hash | 4 ++-- .../python-jsonschema-specifications.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.hash b/package/python-jsonschema-specifications/python-jsonschema-specifications.hash index 5aaba45210..aa919681ac 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.hash +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jsonschema-specifications/json -md5 d37762167688d8a05024b92dc8a1e20f jsonschema_specifications-2023.7.1.tar.gz -sha256 c91a50404e88a1f6ba40636778e2ee08f6e24c5613fe4c53ac24578a5a7f72bb jsonschema_specifications-2023.7.1.tar.gz +md5 de730f6937d1e3660a2d835c4f93f31b jsonschema_specifications-2023.12.1.tar.gz +sha256 48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc jsonschema_specifications-2023.12.1.tar.gz # Locally computed sha256 checksums sha256 42dcd63495f87b4eb7c7757afa379bb55a53f94afd7a5f657d9adf57236e515c COPYING diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 7a19eee423..40879898c9 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JSONSCHEMA_SPECIFICATIONS_VERSION = 2023.7.1 +PYTHON_JSONSCHEMA_SPECIFICATIONS_VERSION = 2023.12.1 PYTHON_JSONSCHEMA_SPECIFICATIONS_SOURCE = jsonschema_specifications-$(PYTHON_JSONSCHEMA_SPECIFICATIONS_VERSION).tar.gz -PYTHON_JSONSCHEMA_SPECIFICATIONS_SITE = https://files.pythonhosted.org/packages/12/ce/eb5396b34c28cbac19a6a8632f0e03d309135d77285536258b82120198d8 +PYTHON_JSONSCHEMA_SPECIFICATIONS_SITE = https://files.pythonhosted.org/packages/f8/b9/cc0cc592e7c195fb8a650c1d5990b10175cf13b4c97465c72ec841de9e4b PYTHON_JSONSCHEMA_SPECIFICATIONS_SETUP_TYPE = pep517 PYTHON_JSONSCHEMA_SPECIFICATIONS_LICENSE = MIT PYTHON_JSONSCHEMA_SPECIFICATIONS_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Tue Feb 6 14:18:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:18:30 +0100 Subject: [Buildroot] [git commit] package/python-lxml: bump to version 5.1.0 Message-ID: <20240206141842.3090C8708A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9ba407d991e108ca40a2059f979ec731f505dc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index e34cb193f4..a23cdcec9e 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # From https://pypi.org/project/lxml/ -sha256 48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c lxml-4.9.3.tar.gz +sha256 3eea6ed6e6c918e468e693c41ef07f3c3acc310b70ddd9cc72d9ef84bc9564ca lxml-5.1.0.tar.gz # Locally computed sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 3ef3aabdbc..519a9a77ac 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.9.3 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/30/39/7305428d1c4f28282a4f5bdbef24e0f905d351f34cf351ceb131f5cddf78 +PYTHON_LXML_VERSION = 5.1.0 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/2b/b4/bbccb250adbee490553b6a52712c46c20ea1ba533a643f1424b27ffc6845 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From giulio.benetti at benettiengineering.com Tue Feb 6 14:18:51 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 15:18:51 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/milkv_duo: new defconfig In-Reply-To: References: <20240206080603.28916-1-hanyuan-z@qq.com> Message-ID: Hi Hanyuan, On 06/02/24 09:06, Hanyuan Zhao wrote: > Milk-V Duo is an ultra-compact embedded RISC-V development platform based on the CV1800B chip. > It can run Linux and RTOS, providing a reliable, low-cost, and high-performance platform > for professionals, industrial ODMs, AIoT enthusiasts, DIY hobbyists, and creators. > > https://milkv.io/duo > > Co-authored-by: Emil S > Co-authored-by: GP Orcullo > Signed-off-by: Hanyuan Zhao > --- Here you definetely need to add that this patch depends on this patchset: https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 to work-around a gcc bug on htop package. After the 3 dashes above you should add changes between patch versions like: V1->V2: * changed this * changed that V2->V3: * change thee etc.. and I usually close with other 3 dashes --- > board/milkv/duo/genimage.cfg | 25 ++++++++ > board/milkv/duo/post-image.sh | 47 +++++++++++++++ > board/milkv/duo/readme.txt | 54 +++++++++++++++++ > configs/milkv_duo_musl_riscv64_defconfig | 63 ++++++++++++++++++++ > configs/milkv_duo_musl_riscv64_ion_defconfig | 63 ++++++++++++++++++++ > 5 files changed, 252 insertions(+) > create mode 100644 board/milkv/duo/genimage.cfg > create mode 100755 board/milkv/duo/post-image.sh > create mode 100644 board/milkv/duo/readme.txt > create mode 100644 configs/milkv_duo_musl_riscv64_defconfig > create mode 100644 configs/milkv_duo_musl_riscv64_ion_defconfig > > diff --git a/board/milkv/duo/genimage.cfg b/board/milkv/duo/genimage.cfg > new file mode 100644 > index 0000000000..1fd74f845a > --- /dev/null > +++ b/board/milkv/duo/genimage.cfg > @@ -0,0 +1,25 @@ > +image boot.vfat { > + vfat { > + files = { > + "fip.bin", > + "boot.sd", > + } > + } > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + } > +} > diff --git a/board/milkv/duo/post-image.sh b/board/milkv/duo/post-image.sh > new file mode 100755 > index 0000000000..c58233003e > --- /dev/null > +++ b/board/milkv/duo/post-image.sh > @@ -0,0 +1,47 @@ > +#!/bin/sh > + > +########################################################### > +# File: post-image.sh > +# Author: GP Orcullo > +# Hanyuan Zhao > +# Description: this sh will make the fip.bin and boot.sd, > +# then pack everything to an image file. > +########################################################### > + > +FIPTOOL_OPTS="genfip ${BINARIES_DIR}/fip.bin \ > + --MONITOR_RUNADDR=0x80000000 \ > + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ > + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ > + --NAND_INFO=00000000 \ > + --BL2=${BINARIES_DIR}/bl2.bin \ > + --BLCP_IMG_RUNADDR=0x05200200 \ > + --BLCP_PARAM_LOADADDR=0 \ > + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ > + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ > + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin" > + > +if [ -f ${BINARIES_DIR}/cvirtos.bin ]; then > + FIPTOOL_OPTS="${FIPTOOL_OPTS} \ > + --BLCP=${BINARIES_DIR}/empty.bin \ > + --BLCP_2ND=${BINARIES_DIR}/cvirtos.bin \ > + --BLCP_2ND_RUNADDR=0x83f40000" > + echo "[Duo Post-Image fiptool.py] Integrating FreeRTOS" > +fi > + > +${BINARIES_DIR}/fiptool.py ${FIPTOOL_OPTS}\ missing space before trailing '\', but maybe a Maintainer can apply while fixing this, > +> ${BINARIES_DIR}/fip.log 2>&1 > +if [ -f ${BINARIES_DIR}/fip.bin ]; then > + echo "[Duo Post-Image fiptool.py] > fip.bin generated!" > +fi > + > +cp ${BINARIES_DIR}/u-boot.dtb ${BINARIES_DIR}/cv1800b_milkv_duo_sd.dtb > +lzma -fk ${BINARIES_DIR}/Image > +mkimage -f ${BINARIES_DIR}/multi.its ${BINARIES_DIR}/boot.sd > +if [ -f ${BINARIES_DIR}/boot.sd ]; then > + echo "[Duo Post-Image] > boot.sd generated!" > +fi > +support/scripts/genimage.sh -c $(pwd)/board/milkv/duo/genimage.cfg > +gzip -fk ${BINARIES_DIR}/sdcard.img > +if [ -f ${BINARIES_DIR}/sdcard.img ]; then > + echo "[Duo Post-Image] > sdcard.img generated!" > +fi > diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt > new file mode 100644 > index 0000000000..1623fa97c5 > --- /dev/null > +++ b/board/milkv/duo/readme.txt > @@ -0,0 +1,54 @@ > +Milk-V Duo (https://milkv.io/docs/duo/overview) > + > +Intro > +===== > + > +Milk-V Duo is an ultra-compact embedded development platform > +based on the rv64 CV1800B chip. It can run Linux and RTOS, > +providing a reliable, cost-effective, and high-performance > +platform for professionals, industrial ODMs, AIoT enthusiasts, > +DIY enthusiasts, and creators. > + > +How to build it > +=============== > + > +Configure Buildroot: > + > + $ make milkv_duo_musl_riscv64_defconfig > + > +The milkv_duo_musl_riscv64_defconfig will by default provide > +the full 64MiB free RAM. If you want to build with memory > +reserved for ION (generalized memory manager in linux, i.e. > +some memory will be reserved for the camera algorithms), please try: > + > + $ make milkv_duo_musl_riscv64_ion_defconfig > + > +For more information about the ION, please refer to > + > +https://github.com/milkv-duo/duo-buildroot-sdk/blob/develop/README.md?plain=1#L436 > + > +Modify configuration if needed, e.g. add more packages to target: > + > + $ make menuconfig > + > +Compile everything and build the SD card image: > + > + $ make > + please drop from here... > +To configure the linux kernel or u-boot: > + > + $ make linux-menuconfig > + > +To rebuild something (e.g. linux): > + > + $ make linux-rebuild > + ...to here, since it's part of Buildroot manual and also you should point "linux-menuconfig and uboot-menuconfig", but it doesn't make sense to me, so yes please drop it, > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image > +called "sdcard.img" in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_musl_riscv64_defconfig > new file mode 100644 > index 0000000000..4155ad1f57 > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_defconfig > @@ -0,0 +1,63 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Using gcc13 and musl to have t-head's optimization and features Here I would expand comment by pointing that glibc is not suitable and why. It should be a gcc ICE, so maybe someone can fix or work it around later with this indication. > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_64mb" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > diff --git a/configs/milkv_duo_musl_riscv64_ion_defconfig b/configs/milkv_duo_musl_riscv64_ion_defconfig > new file mode 100644 > index 0000000000..7af0d9a44d > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_ion_defconfig > @@ -0,0 +1,63 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Using gcc13 and musl to have t-head's optimization and features Ditto, > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_ion" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y Except that it looks good to me so: Reviewed-by: Giulio Benetti [Build Tested only both defconfigs] Tested-by: Giulio Benetti Please keep my 2 tags above while send V4, thanks. Also please wait for me or someone else to review the other patch of the series before respinning. Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Tue Feb 6 14:21:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 15:21:10 +0100 Subject: [Buildroot] [PATCH] package/azure-iot-sdk-c: bump to version LTS_08_2023 In-Reply-To: <20240206112109.2175948-1-sergio.prado@e-labworks.com> (sergio prado's message of "Tue, 6 Feb 2024 08:21:09 -0300") References: <20240206112109.2175948-1-sergio.prado@e-labworks.com> Message-ID: <87o7ct7jxl.fsf@48ers.dk> >>>>> "sergio" == sergio prado writes: > From: Sergio Prado > Release notes: https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_08_2023 > Signed-off-by: Sergio Prado Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 14:21:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 15:21:29 +0100 Subject: [Buildroot] [git commit] package/azure-iot-sdk-c: bump to version LTS_08_2023 Message-ID: <20240206142202.E939287096@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25c255ece8c171adeb86a4b905b72715b05c2bcf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_08_2023 Signed-off-by: Sergio Prado Signed-off-by: Peter Korsgaard --- package/azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash index b960c0e571..d51dcc60aa 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7b52b9886a3aff20a55a0d5bc5e140c212f85fd06af18c31291c15d363743a77 azure-iot-sdk-c-LTS_01_2023_Ref02-br1.tar.gz +sha256 b853d5ab04f3c6863fe78e3936f0d0840012d5260ae4a3b23f03e157395dc15b azure-iot-sdk-c-LTS_08_2023-br1.tar.gz # Hash for license files: sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index e07cdf986e..4d0ecb077f 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = LTS_01_2023_Ref02 +AZURE_IOT_SDK_C_VERSION = LTS_08_2023 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES From peter at korsgaard.com Tue Feb 6 14:25:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 15:25:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/tcf-agent: fix powerpc64 build In-Reply-To: <20240115212003.7847-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 15 Jan 2024 22:20:03 +0100") References: <20240115212003.7847-1-fontaine.fabrice@gmail.com> Message-ID: <87jznh7jr4.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Translation of ppc64 to powerpc has been removed since version 1.8.0 and > https://git.eclipse.org/c/tcf/org.eclipse.tcf.agent.git/commit/?id=94fa43963538afffc1fff77623cd1561a05d0e21 > resulting in the following build failure since commit > 81802e263a12e173e0e1028449d1e1e11b2e5974: > In file included from /home/buildroot/autobuild/instance-0/output-1/build/tcf-agent-1.8.0/agent/system/GNU/Linux/tcf/context-linux.c:58: > /home/buildroot/autobuild/instance-0/output-1/build/tcf-agent-1.8.0/agent/../agent/system/GNU/Linux/tcf/regset.h:25:10: fatal error: tcf/regset-mdep.h: No such file or directory > 25 | #include > | ^~~~~~~~~~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/821049a692d4a64fa45b73e8e18eb48c36d46e6b > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 14:24:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 15:24:08 +0100 Subject: [Buildroot] [git commit] package/tcf-agent: fix powerpc64 build Message-ID: <20240206142517.808748709D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2298ceb213e4ce858f048603c44113057766efcf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Translation of ppc64 to powerpc has been removed since version 1.8.0 and https://git.eclipse.org/c/tcf/org.eclipse.tcf.agent.git/commit/?id=94fa43963538afffc1fff77623cd1561a05d0e21 resulting in the following build failure since commit 81802e263a12e173e0e1028449d1e1e11b2e5974: In file included from /home/buildroot/autobuild/instance-0/output-1/build/tcf-agent-1.8.0/agent/system/GNU/Linux/tcf/context-linux.c:58: /home/buildroot/autobuild/instance-0/output-1/build/tcf-agent-1.8.0/agent/../agent/system/GNU/Linux/tcf/regset.h:25:10: fatal error: tcf/regset-mdep.h: No such file or directory 25 | #include | ^~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/821049a692d4a64fa45b73e8e18eb48c36d46e6b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tcf-agent/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcf-agent/Config.in b/package/tcf-agent/Config.in index 8c7aab0c0b..a016871e6d 100644 --- a/package/tcf-agent/Config.in +++ b/package/tcf-agent/Config.in @@ -27,8 +27,8 @@ config BR2_PACKAGE_TCF_AGENT_ARCH default "i686" if BR2_i386 && BR2_ARCH="i686" default "i386" if BR2_i386 && !BR2_ARCH="i686" default "x86_64" if BR2_x86_64 - default "powerpc" if BR2_powerpc - default "ppc64" if BR2_powerpc64 || BR2_powerpc64le + default "powerpc" if BR2_powerpc || BR2_powerpc64 || \ + BR2_powerpc64le default "microblaze" if BR2_microblaze || BR2_microblazeel config BR2_PACKAGE_TCF_AGENT_ARCH_SUPPORTS From arnout at mind.be Tue Feb 6 14:35:00 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 15:35:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo: configure cargo profiles In-Reply-To: <20221021224448.3502942-1-james.hilliard1@gmail.com> References: <20221021224448.3502942-1-james.hilliard1@gmail.com> Message-ID: Hi James, There's really no reason why this should have taken more than a year, but finally I applied to master. On 22/10/2022 00:44, James Hilliard wrote: > The cargo profile flags currently only select a cargo build flag which > does not accurately reflect the configured build settings, setting the > cargo build flag also only works for packages using the cargo > infrastructure directly and not with other packages using the cargo > environment such as pyo3 based python packages(which indirectly invoke > cargo build via the setuptools-rust and maturn python build backends). I slightly rewrote the commit message to hopefully make it even clearer. > To ensure that cargo uses the correct profile settings for the build > we need to set env variables for the two root profiles(dev/release) > based on the buildroot build settings. > > For reference the default cargo root profile settings are: > https://doc.rust-lang.org/cargo/reference/profiles.html#default-profiles I checked this page, and there are three configs we are not setting at the moment: strip, panic and rpath. They default to the same value for dev and release, and those values look appropriate for Buildroot: - strip = "none" - OK because we strip in post-build. - panic = "unwind" - sounds OK to me - rpath = "false" - OK because all libs should be installed in /usr/lib. Ideally this should have been mentioned in the commit message as well. I didn't do that because I wasn't 100% sure of the above - so can the people in Cc of this mail check if it looks correct? Regards, Arnout > > As applications not using cargo infrastructure do not have a standard > way of configuring a specific build profile due to the selected > profile being determined by the cargo command line flags, the only > reliable way to configure profile settings is to set both root > profiles in the environment as this will ensure that they are used > regardless of which cargo build flag(such as --debug or --release) is > used. > > Cc: Moritz Bitsch > Signed-off-by: James Hilliard > --- > package/pkg-cargo.mk | 100 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 100 insertions(+) > > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > index f7e3f39503..4945770079 100644 > --- a/package/pkg-cargo.mk > +++ b/package/pkg-cargo.mk > @@ -46,6 +46,106 @@ PKG_CARGO_ENV = \ > CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ > CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc > > +# We always set both CARGO_PROFILE_DEV and CARGO_PROFILE_RELEASE > +# as we are unable to select a build profile using the environment. > +# > +# Other cargo profiles generally derive from these two profiles. > + > +# Disable incremental compilation to match release default. > +# > +# Set codegen-units to release default. > +# > +# Set split-debuginfo to default off for ELF platforms. > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_INCREMENTAL="false" \ > + CARGO_PROFILE_RELEASE_INCREMENTAL="false" \ > + CARGO_PROFILE_DEV_CODEGEN_UNITS="16" \ > + CARGO_PROFILE_RELEASE_CODEGEN_UNITS="16" \ > + CARGO_PROFILE_DEV_SPLIT_DEBUGINFO="off" \ > + CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO="off" > + > +# Set the optimization level with the release default as fallback. > +ifeq ($(BR2_OPTIMIZE_0),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="0" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="0" > +else ifeq ($(BR2_OPTIMIZE_1),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="1" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="1" > +else ifeq ($(BR2_OPTIMIZE_2),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="2" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="2" > +else ifeq ($(BR2_OPTIMIZE_3),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" > +else ifeq ($(BR2_OPTIMIZE_G),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="0" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="0" > +else ifeq ($(BR2_OPTIMIZE_S),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="s" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="s" > +else ifeq ($(BR2_OPTIMIZE_FAST),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" > +else > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" > +endif > + > +ifeq ($(BR2_ENABLE_LTO),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_LTO="true" \ > + CARGO_PROFILE_RELEASE_LTO="true" > +else > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_LTO="false" \ > + CARGO_PROFILE_RELEASE_LTO="false" > +endif > + > + > +ifeq ($(BR2_ENABLE_DEBUG),y) > +ifeq ($(BR2_DEBUG_3),y) > +# full debug info > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_DEBUG="2" \ > + CARGO_PROFILE_RELEASE_DEBUG="2" > +else > +# line tables only > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_DEBUG="1" \ > + CARGO_PROFILE_RELEASE_DEBUG="1" > +endif > +else > +# no debug info > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_DEBUG="0" \ > + CARGO_PROFILE_RELEASE_DEBUG="0" > +endif > + > +# Enabling debug-assertions enables the runtime debug_assert! macro. > +# > +# Enabling overflow-checks enables runtime panic on integer overflow. > +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_DEBUG_ASSERTIONS="true" \ > + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="true" \ > + CARGO_PROFILE_DEV_OVERFLOW_CHECKS="true" \ > + CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS="true" > +else > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_DEBUG_ASSERTIONS="false" \ > + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="false" \ > + CARGO_PROFILE_DEV_OVERFLOW_CHECKS="false" \ > + CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS="false" > +endif > + > # > # This is a workaround for https://github.com/rust-lang/compiler-builtins/issues/420 > # and should be removed when fixed upstream From arnout at mind.be Tue Feb 6 14:35:04 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 15:35:04 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo: configure cargo profiles Message-ID: <20240206143519.9F438870A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b0094c1057ba9e38caa98067f695a87e67b5b1b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pkg-cargo currently sets the --release flag unless BR2_ENABLE_DEBUG is set. However, this does not accurately reflect the configured build settings. In addition, it only works for packages that use the cargo infrastructure directory and not with packages using the cargo environment indirectly, such as pyo3 based python packages. To support these, we really want to pass the necessary flags in PKG_CARGO_ENV. In order to accurately reflect the configured build settings (optimization and debug levels), we set the appropriate environment variables according to the global settings. There is no way to specify the profile to use through an environment variable, it has to be set through a cargo flag like --release. Since we can't easily control the profile flags used by non-cargo package infrastructures, we instead set the env variables for both root profiles (dev/release). For the aspects that are not affected by the global settings (incremental, codegen-units, split-debuginfo), we set them equal to the default for release - which in our context is the appropriate choice even when BR2_ENABLE_DEBUG is set. For reference the default cargo root profile settings are: https://doc.rust-lang.org/cargo/reference/profiles.html#default-profiles Cc: Moritz Bitsch Signed-off-by: James Hilliard Tested-by: Moritz Bitsch Tested-by: Adam Duskett Reviewed-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- package/pkg-cargo.mk | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 2c277f7079..47ce68bf02 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -53,6 +53,106 @@ PKG_CARGO_ENV = \ CARGO_HOST_RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \ CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc +# We always set both CARGO_PROFILE_DEV and CARGO_PROFILE_RELEASE +# as we are unable to select a build profile using the environment. +# +# Other cargo profiles generally derive from these two profiles. + +# Disable incremental compilation to match release default. +# +# Set codegen-units to release default. +# +# Set split-debuginfo to default off for ELF platforms. +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_INCREMENTAL="false" \ + CARGO_PROFILE_RELEASE_INCREMENTAL="false" \ + CARGO_PROFILE_DEV_CODEGEN_UNITS="16" \ + CARGO_PROFILE_RELEASE_CODEGEN_UNITS="16" \ + CARGO_PROFILE_DEV_SPLIT_DEBUGINFO="off" \ + CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO="off" + +# Set the optimization level with the release default as fallback. +ifeq ($(BR2_OPTIMIZE_0),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="0" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="0" +else ifeq ($(BR2_OPTIMIZE_1),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="1" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="1" +else ifeq ($(BR2_OPTIMIZE_2),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="2" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="2" +else ifeq ($(BR2_OPTIMIZE_3),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" +else ifeq ($(BR2_OPTIMIZE_G),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="0" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="0" +else ifeq ($(BR2_OPTIMIZE_S),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="s" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="s" +else ifeq ($(BR2_OPTIMIZE_FAST),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" +else +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" +endif + +ifeq ($(BR2_ENABLE_LTO),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_LTO="true" \ + CARGO_PROFILE_RELEASE_LTO="true" +else +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_LTO="false" \ + CARGO_PROFILE_RELEASE_LTO="false" +endif + + +ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_DEBUG_3),y) +# full debug info +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_DEBUG="2" \ + CARGO_PROFILE_RELEASE_DEBUG="2" +else +# line tables only +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_DEBUG="1" \ + CARGO_PROFILE_RELEASE_DEBUG="1" +endif +else +# no debug info +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_DEBUG="0" \ + CARGO_PROFILE_RELEASE_DEBUG="0" +endif + +# Enabling debug-assertions enables the runtime debug_assert! macro. +# +# Enabling overflow-checks enables runtime panic on integer overflow. +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_DEBUG_ASSERTIONS="true" \ + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="true" \ + CARGO_PROFILE_DEV_OVERFLOW_CHECKS="true" \ + CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS="true" +else +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_DEBUG_ASSERTIONS="false" \ + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="false" \ + CARGO_PROFILE_DEV_OVERFLOW_CHECKS="false" \ + CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS="false" +endif + # # This is a workaround for https://github.com/rust-lang/compiler-builtins/issues/420 # and should be removed when fixed upstream From ismael at iodev.co.uk Tue Feb 6 14:40:12 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 15:40:12 +0100 Subject: [Buildroot] [RFC PATCH] docs/website: Add Makefile to pre-generate the website Message-ID: <20240206144030.18329-1-ismael@iodev.co.uk> Supports the current includes plus smu [0] lightweight markup. [0] https://github.com/Gottox/smu Signed-off-by: Ismael Luceno --- docs/website/Makefile | 33 +++++++++++++++++++++++++++++++++ docs/website/incfile.awk | 23 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 docs/website/Makefile create mode 100644 docs/website/incfile.awk diff --git a/docs/website/Makefile b/docs/website/Makefile new file mode 100644 index 000000000000..b0a56919c0e7 --- /dev/null +++ b/docs/website/Makefile @@ -0,0 +1,33 @@ +.PHONY: all +all: + +# Avoid implicit rules +MAKEFLAGS += -r + +AWK ?= mawk + +SRCDIR := ${CURDIR} +DEPLOYDIR := ${CURDIR}/out + +src-pages != find ${SRCDIR} -maxdepth 1 -name \*.html -o -name \*.smu +dst-pages := ${src-pages:${SRCDIR}/%=${DEPLOYDIR}/%} +dst-pages := ${dst-pages:.smu=.html} + +all: ${dst-pages} + +conf-files := ${MAKEFILE_LIST} +conf-files += $(wildcard ${HOME}/.tidyrc) +conf-files += ${SRCDIR}/incfile.awk + +${DEPLOYDIR}/%.html: ${SRCDIR}/%.html ${conf-files} + mkdir -p "${@D}" + tmpfile=$$(mktemp) && \ + ${AWK} -f incfile.awk $< > "$$tmpfile" && \ + { tidy -q -m -i "$$tmpfile"; :; } && \ + mv "$$tmpfile" $@ + +${DEPLOYDIR}/%.html: ${SRCDIR}/%.smu ${conf-files} + mkdir -p "${@D}" + tmpfile=$$(mktemp) && \ + smu < $< | ${AWK} -f incfile.awk | tidy -q -m > "$$tmpfile" && \ + mv "$$tmpfile" $@ diff --git a/docs/website/incfile.awk b/docs/website/incfile.awk new file mode 100644 index 000000000000..350a88e7b956 --- /dev/null +++ b/docs/website/incfile.awk @@ -0,0 +1,23 @@ +BEGIN { + FS="\"" +} + +{ + do { + if (match($0, /^$/)) { + file_stack[++file_cur] = $2 + } else { + print + } + if (file_cur) { + e = getline < file_stack[file_cur] + if (!e) { + --file_cur + } else if (e == -1) { + printf "%s: read error\n", \ + file_stack[file_cur] \ + > "/dev/stderr" + } + } + } while (file_cur) +} -- 2.43.0 From adam.duskett at amarulasolutions.com Tue Feb 6 14:42:08 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Tue, 6 Feb 2024 15:42:08 +0100 Subject: [Buildroot] dracut: no longer works since bump to 059 In-Reply-To: <977bc5e8-28c7-44b4-8651-9522d205aa59@linatsea.fr> References: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> <977bc5e8-28c7-44b4-8651-9522d205aa59@linatsea.fr> Message-ID: Hello again! I have internet again and am back from FOSDEM! On Sun, Feb 4, 2024 at 10:12?AM Thierry Bultel wrote: > Dear Adam, > > please see my comments below > > Le 03/02/2024 ? 13:55, Adam Duskett a ?crit : > > Hello Thierry; > > I am going to top-post to bother Yann. ;) > > Dracut support in Buildroot is very broken and must be patched to work > properly. > > Not so broken, before the dump to 059 ! I am pretty happy with it. > Bu I admit that the ramdisk I need does not have systemd at all, > so that in my case, dracut.conf basically consists in removing all systemd > modules. > I have no idea of how the current integration works with a aimed systemd > ramdisk. > > Yes, but it was broken in the sense that systemd doesn't work at all, which is usually why dracut is used. It provides several systemd services which are used in the initramfs. Having Dracut not work for systemd makes it very broken (in my opinion.) > I don't have time currently to submit patches, but I do have a working > Buildroot with a working Dracut > that you can find here: > https://gitlab.com/aduskett/buildroot/-/tree/dracut-fixups?ref_type=heads > > > I have read your patches and there are a couple of things that puzzle me. > > In the very first patch series I submitted about 2 years ago, > it worked this way: > > - new fs target, not just cpio variant > - usage of cross-ldd as recommended by dracut documentation > > But this was reviewed appropriately, and finally integrated as the version > we currently have (only the replacement of cross-ldd by rtls-prelink, IMHO, > buy I did not notice any issues from one to the other). > So I am afraid (despite of being rather agnostic) that your patches would > not be accepted > as such either, for the same reasons. > > Of course not, which is why I didn't submit them, and never will. Furthermmore, rtls-prelink has been removed from yocto. The only use for it was for gobject-introspection, and they now use objdump for that purpose. As such, it would be best to use a cross-ldd instead. > I notice some pieces in your patches, that we do need, indeed, > for instance the kernel config fixups, and the forced symlinks. > > It's only a few months old, but I have tested it, and it works quite well. > If you would like to port what I have > done to master, and then submit patches based on my work; by all means, > please do! > > Changes include: > > fs/ > - Remove all dracut references from fs/cpio/ > - Add fs/dracut/ > - Dracut needs to be it's own option in fs/ > - Add a dracut option to fs/initramfs/Config.in > - Add separate dracut and cpio options to fs/initramfs/initramfs.mk > - Add `source "fs/dracut/Config.in"` to fs/Config.in > > package/dracut: > - Add it as a target package, as there are several systemd files it > installs on the target. > This is a huge problem with the current dracut package in buildroot. > - Add linux kernel kconfig fixups > - Add options for bash > - Add systemd options > - Add a cross-ldd script (probably wouldn't be accepted into mainline, > but you can try!) > - dracut-install is broken and requires a wrapper, so I added one, > because of the ldd issue. > - Add 0002-ignore-ldd-127.patch > - Add 0003-force-symlink-making.patch > > package/linux/linux.mk: > - Add ifeq clauses for rootfs-cpio and rootfs-dracut > > I have made a diff for you to try here based on commit 5e4eba64 > https://pastebin.com/WShjbdYi > > However, be aware that the patch loses the functionality of defining a > dracut.conf file! > > > As long as producing a busybox-init based ramdisk still works ... > > Probably? It would be easy enough to wrap the dracut.mk logic into a ifeq block and re-add the dracut.conf menuconfig option that would overwrite all the automated logic. > > > Thanks so much! > > > Best regards > Thierry > > Adam > > On Thu, Feb 1, 2024 at 1:43?PM Thierry Bultel > wrote: > >> Hi, since bump to this version, >> >> invocation of 'ldd' wrapper fails in dracut-install. >> >> After analysis, this is because version uses "execlp" for launching the >> 'ldd' wrapper variable, >> which in out case consists in the executable name + the rootfs argument, >> leading to the fault. >> >> Version 057 used to call "popen" instead that what Ok with that. >> >> Thierry >> >> -- >> >> [image: www.linatsea.fr] >> -- >> www.linatsea.fr >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot >> > > -- > > > -- > www.linatsea.fr > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: penguin.png Type: image/png Size: 60087 bytes Desc: not available URL: From yann.morin.1998 at free.fr Tue Feb 6 14:53:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 15:53:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: <1dd4afa6-e225-4e79-bb3a-21d0e04c7571@smile.fr> References: <20240111051726.2918732-1-james.hilliard1@gmail.com> <1dd4afa6-e225-4e79-bb3a-21d0e04c7571@smile.fr> Message-ID: Antoine, All, On 2024-02-06 15:09 +0100, Antoine Coutant spake thusly: > On 11/01/2024 06:17, James Hilliard wrote: > > Signed-off-by: James Hilliard [--SNIP--] > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > > +PYTHON_RPDS_PY_VERSION = 0.16.2 > rpds depends on the crate pyo3. This crate uses > "std::sync::atomic::AtomicI64" which doesn't exist for 32 bits > targets. That leads to an error [1]. I have been discussing this with Romain IRL, and he explained that the issue _already_ happenned with 0.12.0, so this is not a regression and thus reverting this patch will not fix the issue. Is that correct? Also, will std::sync::atomic::AtomicI64 ever be available for 32-bit targets? If not, would that be considered a bug in the std lib? > An issue have been opened on pyo3's github [2]. A fix have been accepted [3] > but it isn't in the last release. Thus, this version bump doesn't > fix this problem. > [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854842 > [2]: https://github.com/PyO3/pyo3/issues/3614 > [3]: https://github.com/PyO3/pyo3/pull/3619 It is not going to be easy to carry this change as a patch in Buildroot: it would require that we be able to patch a package during the vendoring step. In this case, we'd need to do the vendoring (because we need the pyo3 crate to be downloaded), then apply the patch (with mangled paths) to add the new dependency, then restart the vendoring. In the generic case, we'd even need to be able to repeat the process in case that new dependency has to be patched and so on and so on... That's not going to be easy, by far... Meh... We can't even update to a random sha1 from the rpds git tree, because they do nit even have an update to switch to a newer (even if unreleased) pyo3. Meh, again... Not sure what to do... What about adding a dependency on BR2_ARCH_IS_64 to python-rpds-pym and propagate that to all its dependencies? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ismael at iodev.co.uk Tue Feb 6 14:53:50 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 15:53:50 +0100 Subject: [Buildroot] [RFC PATCH v2] docs/website: Add Makefile to pre-generate the website Message-ID: <20240206145353.19868-1-ismael@iodev.co.uk> Supports the current includes plus smu [0] lightweight markup. [0] https://github.com/Gottox/smu Signed-off-by: Ismael Luceno --- docs/website/Makefile | 33 +++++++++++++++++++++++++++++++++ docs/website/incfile.awk | 23 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 docs/website/Makefile create mode 100644 docs/website/incfile.awk diff --git a/docs/website/Makefile b/docs/website/Makefile new file mode 100644 index 000000000000..42069967f7ec --- /dev/null +++ b/docs/website/Makefile @@ -0,0 +1,33 @@ +.PHONY: all +all: + +# Avoid implicit rules +MAKEFLAGS += -r + +AWK ?= mawk + +SRCDIR := ${CURDIR} +DEPLOYDIR := ${CURDIR}/out + +src-pages != find ${SRCDIR} -maxdepth 1 -name \*.html -o -name \*.smu +dst-pages := ${src-pages:${SRCDIR}/%=${DEPLOYDIR}/%} +dst-pages := ${dst-pages:.smu=.html} + +all: ${dst-pages} + +conf-files := ${MAKEFILE_LIST} +conf-files += $(wildcard ${HOME}/.tidyrc) +conf-files += ${SRCDIR}/incfile.awk + +${DEPLOYDIR}/%.html: ${SRCDIR}/%.html ${conf-files} + mkdir -p "${@D}" + tmpfile=$$(mktemp) && \ + ${AWK} -f incfile.awk $< > "$$tmpfile" && \ + { tidy -q -m -i "$$tmpfile"; :; } && \ + mv "$$tmpfile" $@ + +${DEPLOYDIR}/%.html: ${SRCDIR}/%.smu ${conf-files} + mkdir -p "${@D}" + tmpfile=$$(mktemp) && \ + ${AWK} -f incfile.awk $< | smu | tidy -q -m > "$$tmpfile" && \ + mv "$$tmpfile" $@ diff --git a/docs/website/incfile.awk b/docs/website/incfile.awk new file mode 100644 index 000000000000..350a88e7b956 --- /dev/null +++ b/docs/website/incfile.awk @@ -0,0 +1,23 @@ +BEGIN { + FS="\"" +} + +{ + do { + if (match($0, /^$/)) { + file_stack[++file_cur] = $2 + } else { + print + } + if (file_cur) { + e = getline < file_stack[file_cur] + if (!e) { + --file_cur + } else if (e == -1) { + printf "%s: read error\n", \ + file_stack[file_cur] \ + > "/dev/stderr" + } + } + } while (file_cur) +} -- 2.43.0 From giulio.benetti at benettiengineering.com Tue Feb 6 15:02:41 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 16:02:41 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/milkv-duo: add packages for milkv-duo In-Reply-To: References: Message-ID: <987c773c-fb81-4d09-afab-6657773ce26b@benettiengineering.com> Hi Hanyuan, please split this patch into 2 separate patches, one per package: - milkv-duo-libraries - milkv-duo-smallcore-freertos On 06/02/24 09:06, Hanyuan Zhao via buildroot wrote: > This commit adds the packages that are necessary for milkv-duo image's > generating and configurations. > > https://github.com/milkv-duo/duo-buildroot-sdk/ This ^^^ should be part of a cover letter and instead per package you should point what the package does > > Co-authored-by: Emil S > Signed-off-by: Hanyuan Zhao > --- > package/Config.in | 2 + > package/milkv-duo-libraries/Config.in | 63 ++++++++++ > .../milkv-duo-libraries.mk | 51 +++++++++ > .../milkv-duo-smallcore-freertos/Config.in | 21 ++++ > .../milkv-duo-smallcore-freertos.mk | 108 ++++++++++++++++++ > 5 files changed, 245 insertions(+) > create mode 100644 package/milkv-duo-libraries/Config.in > create mode 100644 package/milkv-duo-libraries/milkv-duo-libraries.mk > create mode 100644 package/milkv-duo-smallcore-freertos/Config.in > create mode 100644 package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > > diff --git a/package/Config.in b/package/Config.in > index 7fc383da83..2c560377b4 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -564,6 +564,8 @@ endmenu > source "package/memtester/Config.in" > source "package/memtool/Config.in" > source "package/mhz/Config.in" > + source "package/milkv-duo-libraries/Config.in" > + source "package/milkv-duo-smallcore-freertos/Config.in" > source "package/minicom/Config.in" > source "package/msr-tools/Config.in" > source "package/nanocom/Config.in" > diff --git a/package/milkv-duo-libraries/Config.in b/package/milkv-duo-libraries/Config.in > new file mode 100644 > index 0000000000..ea4d0aadac > --- /dev/null > +++ b/package/milkv-duo-libraries/Config.in > @@ -0,0 +1,63 @@ > +config BR2_PACKAGE_MILKV_DUO_LIBRARIES > + bool "milk-v duo libraries" > + depends on BR2_riscv > + help > + Those packages provide board-specific firmware and > + hardware tools for the Milk-V Duo platform. What about: ` Package providing board-specific firmware and hardware tools for Milk-V Duo platform. ` > + > + https://github.com/milkv-duo/milkv-duo-buildroot-libraries > + > +if BR2_PACKAGE_MILKV_DUO_LIBRARIES > + > +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + bool "milkv-duo-firmware-fsbl" > + select BR2_PACKAGE_HOST_MTOOLS > + help > + This package is obtained from > + https://github.com/milkv-duo/duo-buildroot-sdk, > + from which we download the first stage bootloader source and > + compile it, generating the ATF bl2.bin. At the mean time, we > + will use the fiptool.py in this package to create the binary > + file fip.bin to pack the opensbi, u-boot and so on. > + > + If you intend to generate the whole sdcard image or the > + fip.bin for milk-v duo, you must say Y to this package! > + > +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB > + bool "64 MiB free ram" > + default n > + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + help > + Say Y to this will disable the ION in order to > + have the all 64MiB Free memory. Please add ...the ION(Camera Memory) in order... This ^^^ is my understanding at least, of what ION is, > + > +config BR2_PACKAGE_MILKV_DUO_PINMUX > + bool "duo-pinmux tool" > + default n > + help > + Say Y to this will compile the duo-pinmux, which can > + get or set function of any Milk-V Duo GPIO Pin. More info at > + > + https://milkv.io/docs/duo/application-development/pinmux > + > +config BR2_PACKAGE_MILKV_DUO_FEATURES > + bool "duo usb features" > + default n > + select BR2_PACKAGE_DHCPCD > + select BR2_PACKAGE_DNSMASQ > + select BR2_PACKAGE_DROPBEAR > + select BR2_PACKAGE_LRZSZ > + select BR2_PACKAGE_HTOP > + help > + Say Y to this will copy the cvitek usb shell scripts to have > + the USB features. The role could be configured at > + > + /etc/milkv-duo.conf > + > + Supported usb functions are rndis, host and mass-storage. > + By default Duo has the LED blinking. It could be configured > + in that conf file as well. Say Y to this will also select > + some packages automatically, to have the same experience > + with the official release. > + > +endif > diff --git a/package/milkv-duo-libraries/milkv-duo-libraries.mk b/package/milkv-duo-libraries/milkv-duo-libraries.mk > new file mode 100644 > index 0000000000..a5cf40a764 > --- /dev/null > +++ b/package/milkv-duo-libraries/milkv-duo-libraries.mk > @@ -0,0 +1,51 @@ > +################################################################################ > +# > +# milkv-duo-libraries > +# > +################################################################################ > + > +MILKV_DUO_LIBRARIES_VERSION = f359994bd497f942bb67734280d81f6640c7c168 > +MILKV_DUO_LIBRARIES_SITE = $(call github,milkv-duo,milkv-duo-buildroot-libraries,$(MILKV_DUO_LIBRARIES_VERSION)) > +MILKV_DUO_LIBRARIES_INSTALL_STAGING = YES > +MILKV_DUO_LIBRARIES_DEPENDENCIES = host-python3 host-mtools > +MILKV_DUO_LIBRARIES_FSBL_64MB = ION > + > +ifeq ($(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB),y) > +MILKV_DUO_LIBRARIES_FSBL_64MB = 64MB > +endif > + > +define MILKV_DUO_LIBRARIES_BUILD_CMDS > + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ > + $(MAKE) -C $(@D)/firmware \ > + ARCH=riscv BOOT_CPU=riscv CHIP_ARCH=cv180x \ > + PROJECT_FULLNAME=cv1800b_milkv_duo_sd \ > + CROSS_COMPILE=$(TARGET_CROSS) \ > + FREE_RAM_SIZE=$(MILKV_DUO_LIBRARIES_FSBL_64MB) \ > + bl2; \ > + fi Please for all occurences use Makefile "$(if ...)" statement instead of "if [ ... = y ]" > + > + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ > + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ > + -I $(@D)/pinmux/include $(@D)/pinmux/src/*.c -o $(@D)/pinmux/duo-pinmux; \ > + fi > +endef > + > +define MILKV_DUO_LIBRARIES_INSTALL_STAGING_CMDS > + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/build/cv180x/bl2.bin $(BINARIES_DIR)/bl2.bin; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/chip_conf.bin $(BINARIES_DIR)/chip_conf.bin; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/fiptool.py $(BINARIES_DIR)/fiptool.py; \ > + $(INSTALL) -D -m 0644 $(@D)/firmware/plat/cv180x/multi.its $(BINARIES_DIR)/multi.its; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/test/cv181x/ddr_param.bin $(BINARIES_DIR)/ddr_param.bin; \ > + fi > + > + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ > + $(INSTALL) -D -m 0755 $(@D)/pinmux/duo-pinmux $(TARGET_DIR)/usr/bin/; \ > + fi > + > + if [ $(BR2_PACKAGE_MILKV_DUO_FEATURES) = y ]; then \ > + cp $(@D)/overlay/* -r $(TARGET_DIR); \ > + fi > +endef > + > +$(eval $(generic-package)) > diff --git a/package/milkv-duo-smallcore-freertos/Config.in b/package/milkv-duo-smallcore-freertos/Config.in > new file mode 100644 > index 0000000000..8503932461 > --- /dev/null > +++ b/package/milkv-duo-smallcore-freertos/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS > + bool "milkv-duo-smallcore-freertos" > + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + select BR2_PACKAGE_HOST_CMAKE > + help > + This package is obtained from > + https://github.com/milkv-duo/duo-buildroot-sdk, > + from which we download the FreeRTOS ported to Milk-V Duo > + into the Buildroot. This FreeRTOS will run in the small core > + and will not do anything because it is simply a template > + with some basic UART demos. You can realize your own ideas > + by adding code to > + > + output/build/milkv-duo-smallcore-freertos-hash/cvitek/task > + /comm/src/riscv64/comm_main.c > + > + If you say Y, then every time you make Buildroot, it will > + automatically compile and include the FreeRTOS into the > + fip.bin, which will then be packed into sdcard.img > + > + https://github.com/milkv-duo/milkv-duo-smallcore-freertos > diff --git a/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > new file mode 100644 > index 0000000000..52028f3c90 > --- /dev/null > +++ b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > @@ -0,0 +1,108 @@ > +################################################################################ > +# > +# milkv-duo-smallcore-freertos > +# > +################################################################################ > + > +MILKV_DUO_SMALLCORE_FREERTOS_VERSION = 1dac21ade58b0f9a0a531cfe93ee319337a88d80 > +MILKV_DUO_SMALLCORE_FREERTOS_SITE = $(call github,milkv-duo,milkv-duo-smallcore-freertos,$(MILKV_DUO_SMALLCORE_FREERTOS_VERSION)) > +MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING = YES > +MILKV_DUO_SMALLCORE_FREERTOS_DEPENDENCIES = host-cmake host-ninja > +MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV = CROSS_COMPILE=$(TARGET_CROSS) > + > +define MILKV_DUO_SMALLCORE_FREERTOS_BUILD_CMDS > + if [ ! -d $(@D)/cvitek/build/arch ]; then \ > + mkdir -p $(@D)/cvitek/build/arch; \ > + fi mkdir -p will create new folder if it's not already there, so no need to check for $(@D)/cvitek/build/arch > + > + cd $(@D)/cvitek/build/arch && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DRUN_TYPE=CVIRTOS \ > + -DRUN_ARCH=riscv64 \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > + $(@D)/cvitek/arch > + cd $(@D)/cvitek/build/arch && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + > + if [ ! -d $(@D)/cvitek/build/kernel ]; then \ > + mkdir -p $(@D)/cvitek/build/kernel; \ > + fi Ditto > + > + cd $(@D)/cvitek/build/kernel && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DRUN_ARCH=riscv64 \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > + $(@D)/cvitek/kernel > + cd $(@D)/cvitek/build/kernel && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + > + if [ ! -d $(@D)/cvitek/build/common ]; then \ > + mkdir -p $(@D)/cvitek/build/common; \ > + fi Ditto > + > + cd $(@D)/cvitek/build/common && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DRUN_ARCH=riscv64 \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > + $(@D)/cvitek/common > + cd $(@D)/cvitek/build/common && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + > + if [ ! -d $(@D)/cvitek/build/hal ]; then \ > + mkdir -p $(@D)/cvitek/build/hal; \ > + fi Ditto > + > + cd $(@D)/cvitek/build/hal && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DRUN_ARCH=riscv64 \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DRUN_TYPE=CVIRTOS \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > + -DBOARD_FPGA=n \ > + $(@D)/cvitek/hal/cv180x > + cd $(@D)/cvitek/build/hal && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + > + if [ ! -d $(@D)/cvitek/build/driver ]; then \ > + mkdir -p $(@D)/cvitek/build/driver; \ > + fi Ditto > + > + cd $(@D)/cvitek/build/driver && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DRUN_ARCH=riscv64 \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DRUN_TYPE=CVIRTOS \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DBOARD_FPGA=n \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > + $(@D)/cvitek/driver > + cd $(@D)/cvitek/build/driver && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + > + if [ ! -d $(@D)/cvitek/build/task ]; then \ > + mkdir -p $(@D)/cvitek/build/task; \ > + fi Ditto > + > + cd $(@D)/cvitek/build/task && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DRUN_ARCH=riscv64 \ > + -DRUN_TYPE=CVIRTOS \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DBOARD_FPGA=n \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ The build command is common for every "target", so please declare it into a variable on the top. > + $(@D)/cvitek/task > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target cvirtos.bin -- -v To tell the truth all the points above can be shrinked using a foreach loop through all the build directories since they all look the same except directory name. Can you provide such change? > +endef > + > +define MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING_CMDS > + $(INSTALL) -D -m 0755 $(@D)/cvitek/install/bin/cvirtos.bin $(BINARIES_DIR)/cvirtos.bin > + if [ ! -e $(BINARIES_DIR)/empty.bin ]; then \ > + touch $(BINARIES_DIR)/empty.bin; \ > + fi if you touch an empy file again it recreates an empty file again, so you can remove the if check. > +endef > + > +$(eval $(generic-package)) Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From ismael at iodev.co.uk Tue Feb 6 15:04:24 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 16:04:24 +0100 Subject: [Buildroot] [RFC PATCH v2] docs/website: Add Makefile to pre-generate the website In-Reply-To: <20240206145353.19868-1-ismael@iodev.co.uk> References: <20240206145353.19868-1-ismael@iodev.co.uk> Message-ID: On 06/Feb/2024 15:53, Ismael Luceno wrote: > Supports the current includes plus smu [0] lightweight markup. > > [0] https://github.com/Gottox/smu > Signed-off-by: Ismael Luceno Changes from v1: - Processes includes before passing through smu - Still imperfect because smu mangles many html tags To do: - Maybe special-case html header and footer for smu files. From peter at korsgaard.com Tue Feb 6 15:07:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 16:07:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: bump to version 5.0.1 In-Reply-To: <20240206112714.7beb00e5@windsurf> (Thomas Petazzoni via buildroot's message of "Tue, 6 Feb 2024 11:27:14 +0100") References: <20240109070626.4019996-1-james.hilliard1@gmail.com> <20240206112714.7beb00e5@windsurf> Message-ID: <87cyt97hs9.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Tue, 9 Jan 2024 00:06:26 -0700 > James Hilliard wrote: >> Signed-off-by: James Hilliard >> --- >> package/python-django/python-django.hash | 4 ++-- >> package/python-django/python-django.mk | 4 ++-- >> 2 files changed, 4 insertions(+), 4 deletions(-) > Applied to master, thanks. Notice that django-5.0.x is not a LTS, but given that it goes out of extended support in April 2025 it is probably OK. See (bottow of) https://www.djangoproject.com/download/ -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Tue Feb 6 15:08:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 16:08:39 +0100 Subject: [Buildroot] [RFC PATCH] docs/website: Add Makefile to pre-generate the website In-Reply-To: <20240206144030.18329-1-ismael@iodev.co.uk> References: <20240206144030.18329-1-ismael@iodev.co.uk> Message-ID: Ismael, All, On 2024-02-06 15:40 +0100, Ismael Luceno spake thusly: > Supports the current includes plus smu [0] lightweight markup. > > [0] https://github.com/Gottox/smu > Signed-off-by: Ismael Luceno > --- [--SNIP--] > diff --git a/docs/website/Makefile b/docs/website/Makefile > new file mode 100644 > index 000000000000..b0a56919c0e7 > --- /dev/null > +++ b/docs/website/Makefile > @@ -0,0 +1,33 @@ > +.PHONY: all > +all: > + > +# Avoid implicit rules > +MAKEFLAGS += -r > + > +AWK ?= mawk Make that gawk, so that we can do [0] (see below) > +SRCDIR := ${CURDIR} Use parentheses not curly braces, to expand variables in Makefiles, like we do everyelse in Buildroot: $(..) (yes, both are valid, but lets be consistent throughout our code base) > +DEPLOYDIR := ${CURDIR}/out > + > +src-pages != find ${SRCDIR} -maxdepth 1 -name \*.html -o -name \*.smu > +dst-pages := ${src-pages:${SRCDIR}/%=${DEPLOYDIR}/%} > +dst-pages := ${dst-pages:.smu=.html} > + > +all: ${dst-pages} > + > +conf-files := ${MAKEFILE_LIST} > +conf-files += $(wildcard ${HOME}/.tidyrc) > +conf-files += ${SRCDIR}/incfile.awk > + > +${DEPLOYDIR}/%.html: ${SRCDIR}/%.html ${conf-files} > + mkdir -p "${@D}" > + tmpfile=$$(mktemp) && \ > + ${AWK} -f incfile.awk $< > "$$tmpfile" && \ > + { tidy -q -m -i "$$tmpfile"; :; } && \ > + mv "$$tmpfile" $@ > + > +${DEPLOYDIR}/%.html: ${SRCDIR}/%.smu ${conf-files} > + mkdir -p "${@D}" > + tmpfile=$$(mktemp) && \ > + smu < $< | ${AWK} -f incfile.awk | tidy -q -m > "$$tmpfile" && \ What is the rationale for using smu and tidy to do the deployement? We don't need/want to minimify the content... > + mv "$$tmpfile" $@ > diff --git a/docs/website/incfile.awk b/docs/website/incfile.awk > new file mode 100644 > index 000000000000..350a88e7b956 > --- /dev/null > +++ b/docs/website/incfile.awk > @@ -0,0 +1,23 @@ > +BEGIN { > + FS="\"" > +} > + > +{ > + do { > + if (match($0, /^$/)) { > + file_stack[++file_cur] = $2 > + } else { > + print > + } > + if (file_cur) { > + e = getline < file_stack[file_cur] > + if (!e) { > + --file_cur > + } else if (e == -1) { > + printf "%s: read error\n", \ > + file_stack[file_cur] \ > + > "/dev/stderr" [0] In case of error, we do want to exit in error and be sure this is caught at the Makefile level; by using gawk, you can call: exit 42 Regards, Yann E. MORIN. > + } > + } > + } while (file_cur) > +} > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 15:10:52 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 16:10:52 +0100 Subject: [Buildroot] [RFC PATCH v2] docs/website: Add Makefile to pre-generate the website In-Reply-To: <20240206145353.19868-1-ismael@iodev.co.uk> References: <20240206145353.19868-1-ismael@iodev.co.uk> Message-ID: Ismael, All, I'll do the rest of my review in this new iteration! ;-) On 2024-02-06 15:53 +0100, Ismael Luceno spake thusly: [--SNIP--] > +${DEPLOYDIR}/%.html: ${SRCDIR}/%.smu ${conf-files} > + mkdir -p "${@D}" > + tmpfile=$$(mktemp) && \ > + ${AWK} -f incfile.awk $< | smu | tidy -q -m > "$$tmpfile" && \ Don't use pipes, otherwise we can't catch the failure of any intermediate command. For example, if we can get the awk script to properly fail in case of error, using pipes will not allow the Makefile to catch issues. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Tue Feb 6 15:11:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:11:52 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/attr: affected by gcc bug 101766 In-Reply-To: <20240116065831.9471-2-fontaine.fabrice@gmail.com> References: <20240116065831.9471-1-fontaine.fabrice@gmail.com> <20240116065831.9471-2-fontaine.fabrice@gmail.com> Message-ID: <20240206161152.0e178414@windsurf> Hello Fabrice, On Tue, 16 Jan 2024 07:58:31 +0100 Fabrice Fontaine wrote: > attr is affected by gcc bug 101766 since version 1.5.2 and > https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=11b9069098b4d4c23efb06c9457a085b784354d4 > resulting in the following build failure on microblaze since commit > b31b91296e7f985b909f104f06a098adddef1fea: > > libattr/syscalls.c:133:10: error: symver is only supported on ELF platforms > 133 | # pragma GCC visibility pop > | ^~~ > > So let's disable package attr and packages depending on it. > > Fixes: > - http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a > > Reviewed-by: Giulio Benetti > Signed-off-by: Fabrice Fontaine I don't like this very much. It's annoying to propagate this dependency to all reverse dependencies of attr, and make it unavailable on Microblaze for this silly reason. So I came up with the attached patch for attr, which rather detects if __attribute__(__symver__) works or not, and fall backs to another mechanism if not (this fallback already exists in the attr code). Could you have a look at my proposal, and if it suits you, submit it upstream and as a patch to Buildroot ? :-) (Yeah, I know I'm pushing some of the work for you, my goal is to be able to continue review/merge other patches) Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-configure.ac-add-detection-of-symver-gcc-attribute.patch Type: text/x-patch Size: 1669 bytes Desc: not available URL: From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:01 +0100 Subject: [Buildroot] [git commit] package/python-pydantic: bump to version 2.5.3 Message-ID: <20240206151815.B9408870F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=afbca9230889bc6bbed4d8f9559a8d00cb864461 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pydantic/python-pydantic.hash | 4 ++-- package/python-pydantic/python-pydantic.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index 0848debc1c..75ecb23053 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 348281a5a27eb5253c7a83927aae64e1 pydantic-2.5.2.tar.gz -sha256 ff177ba64c6faf73d7afa2e8cad38fd456c0dbe01c9954e71038001cd15a6edd pydantic-2.5.2.tar.gz +md5 4651fb3374d2a0d74442c2cc780770d0 pydantic-2.5.3.tar.gz +sha256 b3ef57c62535b0941697cce638c08900d87fcb67e29cfa99e8a68f747f393f7a pydantic-2.5.3.tar.gz # Locally computed sha256 checksums sha256 a9e186f3ca16b5eef84318e7a701721351a00cb7b8ae3a4394b67b49e3529ef3 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index b5bb7ff853..7ad7abeb8d 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 2.5.2 +PYTHON_PYDANTIC_VERSION = 2.5.3 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/b7/41/3c8108f79fb7da2d2b17f35744232af4ffcd9e764ebe1e3fd4b26669b325 +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/aa/3f/56142232152145ecbee663d70a19a45d078180633321efb3847d2562b490 PYTHON_PYDANTIC_SETUP_TYPE = pep517 PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:00 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:00 +0100 Subject: [Buildroot] [git commit] package/python-pycryptodomex: bump to version 3.19.1 Message-ID: <20240206151815.A4570870EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a582e9e19c27fc30317e5b4054482af9daab4d4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 2b74e03e76..10447fd800 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 0dc96e1ffb42c955d89c2ce3f3875c9c pycryptodomex-3.19.0.tar.gz -sha256 af83a554b3f077564229865c45af0791be008ac6469ef0098152139e6bd4b5b6 pycryptodomex-3.19.0.tar.gz +md5 db8f8d516e0229f503dd111ac4de177f pycryptodomex-3.19.1.tar.gz +sha256 0b7154aff2272962355f8941fd514104a88cb29db2d8f43a29af900d6398eb1c pycryptodomex-3.19.1.tar.gz # Locally computed sha256 checksums sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index bfb6acf7ba..d969e600a3 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.19.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.19.1 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/14/c9/09d5df04c9f29ae1b49d0e34c9934646b53bb2131a55e8ed2a0d447c7c53 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/3f/13/84f2aea851d75e12e7f32ccc11a00f1defc3d285b4ed710e5d049f31c5a6 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:02 +0100 Subject: [Buildroot] [git commit] package/python-pyftpdlib: bump to version 1.5.9 Message-ID: <20240206151815.C296A870F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc68e20d8525408389866b15f492e9911f92cbe8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pyftpdlib/python-pyftpdlib.hash | 4 ++-- package/python-pyftpdlib/python-pyftpdlib.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyftpdlib/python-pyftpdlib.hash b/package/python-pyftpdlib/python-pyftpdlib.hash index 46b5ae6336..7b5dabdfdc 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.hash +++ b/package/python-pyftpdlib/python-pyftpdlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyftpdlib/json -md5 6d9539aea866d4f959d86ae001cdddf7 pyftpdlib-1.5.7.tar.gz -sha256 7ea3ce4137db8209af1f6b9ea020590f462c63ed7c7a1240bd596e4d3a7b656e pyftpdlib-1.5.7.tar.gz +md5 cb32bca52ba0d4850a92513154c253e1 pyftpdlib-1.5.9.tar.gz +sha256 323d4c42f1406aedb4df18faf680f64f32c080ff66f6c26090ba592f5bfc4a0f pyftpdlib-1.5.9.tar.gz # Locally computed sha256 checksums sha256 67a832551570a5ac5f7901eaa5ece4b9491fda7f2d8c93957c3bbc68a5a76d88 LICENSE diff --git a/package/python-pyftpdlib/python-pyftpdlib.mk b/package/python-pyftpdlib/python-pyftpdlib.mk index bd1ada8125..da101083b6 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 1.5.7 +PYTHON_PYFTPDLIB_VERSION = 1.5.9 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/2f/bc/f03a15bf807698bbecdcf316041e3d79b25a40fa7b6e071e17702ff7b9d4 +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/47/9f/5dc055ab2db58db561f72b1b2f18b1dafc025f2ac5dd842c40259c17195e PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:04 +0100 Subject: [Buildroot] [git commit] package/python-pyicu: bump to version 2.12 Message-ID: <20240206151815.DF295870F0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17c6737d5eb659f4708338aeb147eb304d3083ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pyicu/python-pyicu.hash | 4 ++-- package/python-pyicu/python-pyicu.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyicu/python-pyicu.hash b/package/python-pyicu/python-pyicu.hash index 395d2fe47b..01d4bf7fdf 100644 --- a/package/python-pyicu/python-pyicu.hash +++ b/package/python-pyicu/python-pyicu.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyicu/json -md5 f13ffa91014efde6962c4c1ed6ee7a3c PyICU-2.11.tar.gz -sha256 3ab531264cfe9132b3d2ac5d708da9a4649d25f6e6813730ac88cf040a08a844 PyICU-2.11.tar.gz +md5 a4411ff1ed8a09e3e9c1d0d02dc89ad8 PyICU-2.12.tar.gz +sha256 bd7ab5efa93ad692e6daa29cd249364e521218329221726a113ca3cb281c8611 PyICU-2.12.tar.gz # Locally computed sha256 checksums sha256 00da5bf22f2386c4f6f07c734490e9b818c4dcf70e6ca49f594e9cec636b9c40 LICENSE diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk index 213c099d07..50962f601e 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYICU_VERSION = 2.11 +PYTHON_PYICU_VERSION = 2.12 PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz -PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/03/1b/800fce0236be0b8a99b3ccbb797786dd178028960b3fd65544e2d8bad5ac +PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/c8/25/38a2104fd48373cfd4eac5104f104ef486f61527e48d627de74794354a2c PYTHON_PYICU_LICENSE = MIT PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:03 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:03 +0100 Subject: [Buildroot] [git commit] package/python-pygments: bump to version 2.17.2 Message-ID: <20240206151815.CB8B5870F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d7b0259e21335c8da8566a581ef84d785d5a861 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools to hatchling pep517 build backend. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pygments/python-pygments.hash | 4 ++-- package/python-pygments/python-pygments.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index 9714fd2ea0..a742a05e52 100644 --- a/package/python-pygments/python-pygments.hash +++ b/package/python-pygments/python-pygments.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pygments/json -md5 e40631bb812bbd15954027c23b23013a Pygments-2.15.1.tar.gz -sha256 8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c Pygments-2.15.1.tar.gz +md5 7c059773b0f4808f9402eb0650de6bd4 pygments-2.17.2.tar.gz +sha256 da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367 pygments-2.17.2.tar.gz # Locally computed sha256 checksums sha256 a9d66f1d526df02e29dce73436d34e56e8632f46c275bbdffc70569e882f9f17 LICENSE diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index f151f0061b..e42f613cf1 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,13 +4,14 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.15.1 -PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/89/6b/2114e54b290824197006e41be3f9bbe1a26e9c39d1f5fa20a6d62945a0b3 +PYTHON_PYGMENTS_VERSION = 2.17.2 +PYTHON_PYGMENTS_SOURCE = pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/55/59/8bccf4157baf25e4aa5a0bb7fa3ba8600907de105ebc22b0c78cfbf6f565 PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments PYTHON_PYGMENTS_CPE_ID_PRODUCT = pygments -PYTHON_PYGMENTS_SETUP_TYPE = setuptools +PYTHON_PYGMENTS_SETUP_TYPE = pep517 +PYTHON_PYGMENTS_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:06 +0100 Subject: [Buildroot] [git commit] package/python-pylibftdi: bump to version 0.21.0 Message-ID: <20240206151815.F2B2F870F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f8cd4499afa28b0757013781c7f0509a810092c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/codedstructure/pylibftdi/commit/c96231bb8134a2afeb0b77c12474b97a3355d2dc Fixup patch so that it applies against 0.21.0. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-pylibftdi/0001-do-not-use-find-library.patch | 15 ++++++++------- package/python-pylibftdi/python-pylibftdi.hash | 6 +++--- package/python-pylibftdi/python-pylibftdi.mk | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package/python-pylibftdi/0001-do-not-use-find-library.patch b/package/python-pylibftdi/0001-do-not-use-find-library.patch index 192ed43e54..19dabebffe 100644 --- a/package/python-pylibftdi/0001-do-not-use-find-library.patch +++ b/package/python-pylibftdi/0001-do-not-use-find-library.patch @@ -15,17 +15,18 @@ this package. Signed-off-by: Christian Kellermann --- -diff -purN pylibftdi-0.15.0.orig/pylibftdi/driver.py pylibftdi-0.15.0/pylibftdi/driver.py ---- pylibftdi-0.15.0.orig/pylibftdi/driver.py 2015-04-26 22:41:39.000000000 +0200 -+++ pylibftdi-0.15.0/pylibftdi/driver.py 2017-02-27 13:08:56.502958000 +0100 -@@ -121,8 +121,8 @@ class Driver(object): +diff -purN pylibftdi-0.21.0.orig/src/pylibftdi/driver.py pylibftdi-0.21.0/src/pylibftdi/driver.py +--- pylibftdi-0.21.0.orig/src/pylibftdi/driver.py 2015-04-26 22:41:39.000000000 +0200 ++++ pylibftdi-0.21.0/src/pylibftdi/driver.py 2017-02-27 13:08:56.502958000 +0100 +@@ -148,9 +148,8 @@ class Driver: lib = getattr(cdll, lib_path) break if lib is None: -- raise LibraryMissingError('{} library not found (search: {})'.format( -- name, search_list)) +- raise LibraryMissingError( +- f"{name} library not found (search: {str(search_list)})" +- ) + return cdll.LoadLibrary(name + '.so') + return lib - + @property diff --git a/package/python-pylibftdi/python-pylibftdi.hash b/package/python-pylibftdi/python-pylibftdi.hash index ee0ba127ca..5d8a19647f 100644 --- a/package/python-pylibftdi/python-pylibftdi.hash +++ b/package/python-pylibftdi/python-pylibftdi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pylibftdi/json -md5 fb43ade3283b809d4ebe92bf4a60d7fc pylibftdi-0.20.0.tar.gz -sha256 f4a87fc4af2c9c7d42badd4192ca9b529f32c9d96fdc8daea7e29c509226df5f pylibftdi-0.20.0.tar.gz +md5 75b63f325b760cc6342b7d35fbb84fde pylibftdi-0.21.0.tar.gz +sha256 eb7e2f5052852547f4c6c46022a1665f9d7453439639171eade56fdc80a58832 pylibftdi-0.21.0.tar.gz # Locally computed sha256 checksums -sha256 0d3f1af06b566a783091422061b60e864fc5d5853418b71643041e254b4ae7f9 LICENSE.txt +sha256 b8a7b113cfaa2c01d0701183de16ba653465692b1e29e0229244eee42fb3a9a8 LICENSE.txt diff --git a/package/python-pylibftdi/python-pylibftdi.mk b/package/python-pylibftdi/python-pylibftdi.mk index 34040b72ac..7dca37e416 100644 --- a/package/python-pylibftdi/python-pylibftdi.mk +++ b/package/python-pylibftdi/python-pylibftdi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYLIBFTDI_VERSION = 0.20.0 +PYTHON_PYLIBFTDI_VERSION = 0.21.0 PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz -PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/b8/03/4f778ce6dceea58dc5bfd555c22fdb265afc922d81d3c4496a791a54c479 +PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/d2/ce/ff3e83f3a14eb5b7950ff3657f07cdc3033dd0ded5c8ed093db515e1de33 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:05 +0100 Subject: [Buildroot] [git commit] package/python-pyjwt: bump to version 2.8.0 Message-ID: <20240206151815.E99E5870F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb2f00f621315054b7f6ac5a8b99681af5c4af35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pyjwt/python-pyjwt.hash | 4 ++-- package/python-pyjwt/python-pyjwt.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash index 249f0e478e..06b91bc14a 100644 --- a/package/python-pyjwt/python-pyjwt.hash +++ b/package/python-pyjwt/python-pyjwt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyJWT/json -md5 228adbf1f9d2bcd42bbfb6d3b43dc48a PyJWT-2.7.0.tar.gz -sha256 bd6ca4a3c4285c1a2d4349e5a035fdf8fb94e04ccd0fcbe6ba289dae9cc3e074 PyJWT-2.7.0.tar.gz +md5 a683445793adb7fcf39ad3e55c5c347c PyJWT-2.8.0.tar.gz +sha256 57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de PyJWT-2.8.0.tar.gz # Locally computed sha256 checksums sha256 797a7a20231d4c433e9f1911db1731d06b5828b98f499819a034f7c0f56f5ce5 LICENSE diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk index 982bc758df..d4cf226941 100644 --- a/package/python-pyjwt/python-pyjwt.mk +++ b/package/python-pyjwt/python-pyjwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYJWT_VERSION = 2.7.0 +PYTHON_PYJWT_VERSION = 2.8.0 PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/e0/f0/9804c72e9a314360c135f42c434eb42eaabb5e7ebad760cbd8fc7023be38 +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/30/72/8259b2bccfe4673330cea843ab23f86858a419d8f1493f66d413a76c7e3b PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:04 +0100 Subject: [Buildroot] [git commit] package/python-pyhamcrest: bump to version 2.1.0 Message-ID: <20240206151815.D5B9F870EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f4126a9cc5b7e044a90edad20e2e7de6f090fc7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools to hatchling pep517 build backend. Drop no longer required python-setuptools runtime dependency. Drop no longer required python-six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pyhamcrest/Config.in | 2 -- package/python-pyhamcrest/python-pyhamcrest.hash | 4 ++-- package/python-pyhamcrest/python-pyhamcrest.mk | 9 ++++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-pyhamcrest/Config.in b/package/python-pyhamcrest/Config.in index c2a4dc06f7..27224cdbf1 100644 --- a/package/python-pyhamcrest/Config.in +++ b/package/python-pyhamcrest/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_PYTHON_PYHAMCREST bool "python-pyhamcrest" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help Hamcrest framework for matcher objects. diff --git a/package/python-pyhamcrest/python-pyhamcrest.hash b/package/python-pyhamcrest/python-pyhamcrest.hash index 176079e0f5..ba230d3a07 100644 --- a/package/python-pyhamcrest/python-pyhamcrest.hash +++ b/package/python-pyhamcrest/python-pyhamcrest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyhamcrest/json -md5 c808291b2fca0991d044927884e6d15e pyhamcrest-2.0.4.tar.gz -sha256 b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1 pyhamcrest-2.0.4.tar.gz +md5 c731efc9bcb93ef4f73d110f5ca8e844 pyhamcrest-2.1.0.tar.gz +sha256 c6acbec0923d0cb7e72c22af1926f3e7c97b8e8d69fc7498eabacaf7c975bd9c pyhamcrest-2.1.0.tar.gz # Locally computed sha256 checksums sha256 71beae6c8151362cfe398cbd350191a1cc52d3d28499839a7830b25f5b50a7fe LICENSE.txt diff --git a/package/python-pyhamcrest/python-pyhamcrest.mk b/package/python-pyhamcrest/python-pyhamcrest.mk index de5295e964..6631ff1d6a 100644 --- a/package/python-pyhamcrest/python-pyhamcrest.mk +++ b/package/python-pyhamcrest/python-pyhamcrest.mk @@ -4,11 +4,14 @@ # ################################################################################ -PYTHON_PYHAMCREST_VERSION = 2.0.4 +PYTHON_PYHAMCREST_VERSION = 2.1.0 PYTHON_PYHAMCREST_SOURCE = pyhamcrest-$(PYTHON_PYHAMCREST_VERSION).tar.gz -PYTHON_PYHAMCREST_SITE = https://files.pythonhosted.org/packages/b1/9a/588f086b64ace8d2e9843d8551e9068b2570c3c51b06cb49a107303f8700 -PYTHON_PYHAMCREST_SETUP_TYPE = setuptools +PYTHON_PYHAMCREST_SITE = https://files.pythonhosted.org/packages/16/3f/f286caba4e64391a8dc9200e6de6ce0d07471e3f718248c3276843b7793b +PYTHON_PYHAMCREST_SETUP_TYPE = pep517 PYTHON_PYHAMCREST_LICENSE = BSD-3-Clause PYTHON_PYHAMCREST_LICENSE_FILES = LICENSE.txt +PYTHON_PYHAMCREST_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs $(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:01 +0100 Subject: [Buildroot] [git commit] package/python-pydantic-core: bump to version 2.14.6 Message-ID: <20240206151815.AF80F870F0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2378442d2b6a3618062d3aaebe3dc7def9aff395 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pydantic-core/python-pydantic-core.hash | 2 +- package/python-pydantic-core/python-pydantic-core.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash index 4927d816be..817595ba8c 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 b54296f8317e7ffd72726836636aa3a6c8c977d8f73b68253c443c0fe3731064 pydantic_core-2.14.5.tar.gz +sha256 032fff43cdec54ac579bbdda1a09163e89634c729c1a8163340601a5dfc55eb3 pydantic_core-2.14.6.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 8b61323ab3..8b6e0053e4 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.14.5 +PYTHON_PYDANTIC_CORE_VERSION = 2.14.6 PYTHON_PYDANTIC_CORE_SOURCE = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz -PYTHON_PYDANTIC_CORE_SITE = https://files.pythonhosted.org/packages/64/26/cffb93fe9c6b5a91c497f37fae14a4b073ecbc47fc36a9979c7aa888b245 +PYTHON_PYDANTIC_CORE_SITE = https://files.pythonhosted.org/packages/b2/7d/8304d8471cfe4288f95a3065ebda56f9790d087edc356ad5bd83c89e2d79 PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin PYTHON_PYDANTIC_CORE_LICENSE = MIT PYTHON_PYDANTIC_CORE_LICENSE_FILES = LICENSE From giulio.benetti at benettiengineering.com Tue Feb 6 15:20:09 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 16:20:09 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/attr: affected by gcc bug 101766 In-Reply-To: <20240206161152.0e178414@windsurf> References: <20240116065831.9471-1-fontaine.fabrice@gmail.com> <20240116065831.9471-2-fontaine.fabrice@gmail.com> <20240206161152.0e178414@windsurf> Message-ID: Hi Thomas, Fabrice, On 06/02/24 16:11, Thomas Petazzoni via buildroot wrote: > Hello Fabrice, > > On Tue, 16 Jan 2024 07:58:31 +0100 > Fabrice Fontaine wrote: > >> attr is affected by gcc bug 101766 since version 1.5.2 and >> https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=11b9069098b4d4c23efb06c9457a085b784354d4 >> resulting in the following build failure on microblaze since commit >> b31b91296e7f985b909f104f06a098adddef1fea: >> >> libattr/syscalls.c:133:10: error: symver is only supported on ELF platforms >> 133 | # pragma GCC visibility pop >> | ^~~ >> >> So let's disable package attr and packages depending on it. >> >> Fixes: >> - http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a >> >> Reviewed-by: Giulio Benetti >> Signed-off-by: Fabrice Fontaine > > I don't like this very much. It's annoying to propagate this dependency > to all reverse dependencies of attr, and make it unavailable on > Microblaze for this silly reason. So I came up with the attached patch > for attr, which rather detects if __attribute__(__symver__) works or > not, and fall backs to another mechanism if not (this fallback already > exists in the attr code). > > Could you have a look at my proposal, and if it suits you, submit it > upstream and as a patch to Buildroot ? :-) I deal with attached patch. -- Giulio Benetti CEO&CTO at Benetti Engineering sas > (Yeah, I know I'm pushing some of the work for you, my goal is to be > able to continue review/merge other patches) > > Thanks a lot! > > Thomas > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Tue Feb 6 15:20:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:20:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pycryptodomex: bump to version 3.19.1 In-Reply-To: <20240110044601.1084866-1-james.hilliard1@gmail.com> References: <20240110044601.1084866-1-james.hilliard1@gmail.com> Message-ID: <20240206162039.7feb7ac9@windsurf> On Tue, 9 Jan 2024 21:46:01 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- > package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:20:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:20:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pydantic-core bump to version 2.14.6 In-Reply-To: <20240110045128.1093380-1-james.hilliard1@gmail.com> References: <20240110045128.1093380-1-james.hilliard1@gmail.com> Message-ID: <20240206162043.2399e2c5@windsurf> On Tue, 9 Jan 2024 21:51:28 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pydantic-core/python-pydantic-core.hash | 2 +- > package/python-pydantic-core/python-pydantic-core.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:20:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:20:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pydantic: bump to version 2.5.3 In-Reply-To: <20240110045604.1099561-1-james.hilliard1@gmail.com> References: <20240110045604.1099561-1-james.hilliard1@gmail.com> Message-ID: <20240206162050.26037021@windsurf> On Tue, 9 Jan 2024 21:56:04 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pydantic/python-pydantic.hash | 4 ++-- > package/python-pydantic/python-pydantic.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:00 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyftpdlib: bump to version 1.5.9 In-Reply-To: <20240110045803.1101457-1-james.hilliard1@gmail.com> References: <20240110045803.1101457-1-james.hilliard1@gmail.com> Message-ID: <20240206162100.14d93b73@windsurf> On Tue, 9 Jan 2024 21:58:03 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pyftpdlib/python-pyftpdlib.hash | 4 ++-- > package/python-pyftpdlib/python-pyftpdlib.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pygments: bump to version 2.17.2 In-Reply-To: <20240110050337.1106376-1-james.hilliard1@gmail.com> References: <20240110050337.1106376-1-james.hilliard1@gmail.com> Message-ID: <20240206162104.4a327738@windsurf> On Tue, 9 Jan 2024 22:03:37 -0700 James Hilliard wrote: > Migrate from setuptools to hatchling pep517 build backend. > > Signed-off-by: James Hilliard > --- > package/python-pygments/python-pygments.hash | 4 ++-- > package/python-pygments/python-pygments.mk | 9 +++++---- > 2 files changed, 7 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyhamcrest: bump to version 2.1.0 In-Reply-To: <20240110050813.1109654-1-james.hilliard1@gmail.com> References: <20240110050813.1109654-1-james.hilliard1@gmail.com> Message-ID: <20240206162112.16152573@windsurf> On Tue, 9 Jan 2024 22:08:13 -0700 James Hilliard wrote: > Migrate from setuptools to hatchling pep517 build backend. > > Drop no longer required python-setuptools runtime dependency. > > Drop no longer required python-six runtime dependency. > > Signed-off-by: James Hilliard > --- > package/python-pyhamcrest/Config.in | 2 -- > package/python-pyhamcrest/python-pyhamcrest.hash | 4 ++-- > package/python-pyhamcrest/python-pyhamcrest.mk | 9 ++++++--- > 3 files changed, 8 insertions(+), 7 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyicu: bump to version 2.12 In-Reply-To: <20240110051321.1132678-1-james.hilliard1@gmail.com> References: <20240110051321.1132678-1-james.hilliard1@gmail.com> Message-ID: <20240206162117.2755729b@windsurf> On Tue, 9 Jan 2024 22:13:21 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pyicu/python-pyicu.hash | 4 ++-- > package/python-pyicu/python-pyicu.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:24 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyjwt: bump to version 2.8.0 In-Reply-To: <20240110051911.1137724-1-james.hilliard1@gmail.com> References: <20240110051911.1137724-1-james.hilliard1@gmail.com> Message-ID: <20240206162124.58dd2a51@windsurf> On Tue, 9 Jan 2024 22:19:10 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pyjwt/python-pyjwt.hash | 4 ++-- > package/python-pyjwt/python-pyjwt.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:29 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pylibftdi: bump to version 0.21.0 In-Reply-To: <20240110053449.1157385-1-james.hilliard1@gmail.com> References: <20240110053449.1157385-1-james.hilliard1@gmail.com> Message-ID: <20240206162129.2286080a@windsurf> On Tue, 9 Jan 2024 22:34:49 -0700 James Hilliard wrote: > License hash changed due to year update: > https://github.com/codedstructure/pylibftdi/commit/c96231bb8134a2afeb0b77c12474b97a3355d2dc > > Fixup patch so that it applies against 0.21.0. > > Signed-off-by: James Hilliard > --- > .../0001-do-not-use-find-library.patch | 15 ++++++++------- > package/python-pylibftdi/python-pylibftdi.hash | 6 +++--- > package/python-pylibftdi/python-pylibftdi.mk | 4 ++-- > 3 files changed, 13 insertions(+), 12 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From ismael at iodev.co.uk Tue Feb 6 15:21:50 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 16:21:50 +0100 Subject: [Buildroot] [RFC PATCH] docs/website: Add Makefile to pre-generate the website In-Reply-To: References: <20240206144030.18329-1-ismael@iodev.co.uk> Message-ID: On 06/Feb/2024 16:08, Yann E. MORIN wrote: <...> > Make that gawk, so that we can do [0] (see below) Mawk might be more complete than you think ;-). > > +SRCDIR := ${CURDIR} > > Use parentheses not curly braces, to expand variables in Makefiles, > like we do everyelse in Buildroot: $(..) > > (yes, both are valid, but lets be consistent throughout our code base) OK, I'll change it for v3. I mentioned this before, according to both GNU and BSD this is legacy syntax, and new stuff should use curly braces... <...> > What is the rationale for using smu and tidy to do the deployement? > We don't need/want to minimify the content... smu is for having some markup support, not used for .html files; as for tidy, it just normalises the html indentation, no minification is going on. <...> > [0] In case of error, we do want to exit in error and be sure this is > caught at the Makefile level; by using gawk, you can call: > > exit 42 That also works with any other AWK. From peter at korsgaard.com Tue Feb 6 15:39:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 16:39:42 +0100 Subject: [Buildroot] [git commit] package/python-semver: bump to version 3.0.2 Message-ID: <20240206154117.AEA7A870FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbcdb086677e73a0f0b7ceb6919619c3712b60ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new host-python-setuptools-scm build dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-semver/Config.in | 2 +- package/python-semver/python-semver.hash | 6 +++--- package/python-semver/python-semver.mk | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-semver/Config.in b/package/python-semver/Config.in index 4af2bbf449..db83d8edc4 100644 --- a/package/python-semver/Config.in +++ b/package/python-semver/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_SEMVER bool "python-semver" help - Python helper for Semantic Versioning (http://semver.org/). + Python helper for Semantic Versioning (https://semver.org). https://github.com/python-semver/python-semver diff --git a/package/python-semver/python-semver.hash b/package/python-semver/python-semver.hash index 10cb0a8464..1e06167610 100644 --- a/package/python-semver/python-semver.hash +++ b/package/python-semver/python-semver.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/semver/json -md5 e98b5fb283ea84daa5195087de83ebf1 semver-2.13.0.tar.gz -sha256 fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f semver-2.13.0.tar.gz -# Locally computed +md5 0bbc4d74959c9f1522f75ffb4ae0934d semver-3.0.2.tar.gz +sha256 6253adb39c70f6e51afed2fa7152bcd414c411286088fb4b9effb133885ab4cc semver-3.0.2.tar.gz +# Locally computed sha256 checksums sha256 cda490c32e61d3884dc17791fc8078f2a3e564fba98dd18b4dc64eb2720b2b6f LICENSE.txt diff --git a/package/python-semver/python-semver.mk b/package/python-semver/python-semver.mk index d3a905754f..29d7ba46b1 100644 --- a/package/python-semver/python-semver.mk +++ b/package/python-semver/python-semver.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_SEMVER_VERSION = 2.13.0 +PYTHON_SEMVER_VERSION = 3.0.2 PYTHON_SEMVER_SOURCE = semver-$(PYTHON_SEMVER_VERSION).tar.gz -PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/31/a9/b61190916030ee9af83de342e101f192bbb436c59be20a4cb0cdb7256ece +PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/41/6c/a536cc008f38fd83b3c1b98ce19ead13b746b5588c9a0cb9dd9f6ea434bc PYTHON_SEMVER_SETUP_TYPE = setuptools PYTHON_SEMVER_LICENSE = BSD-3-Clause PYTHON_SEMVER_LICENSE_FILES = LICENSE.txt +PYTHON_SEMVER_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 15:41:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 16:41:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-semver: bump to version 3.0.2 In-Reply-To: <20240111060214.3026046-1-james.hilliard1@gmail.com> References: <20240111060214.3026046-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 07.02, James Hilliard wrote: > Add new host-python-setuptools-scm build dependency. > > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Tue Feb 6 15:51:39 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 16:51:39 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-bitarray: new package Message-ID: <20240206155140.2351424-1-romain.naour@smile.fr> This package is needed at runtime by python-bitstring since 4.1.1 already. Note: the License is under Python-2.0 but Python Software Foundation ("PSF") has been remplaced by the author of bitarray Ilan Schnell. [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.1 Signed-off-by: Romain Naour --- Triple checked the license type with other distribution: https://salsa.debian.org/python-team/packages/python-bitarray/-/blob/master/debian/copyright?ref_type=heads https://src.fedoraproject.org/rpms/python-bitarray/blob/rawhide/f/python-bitarray.spec https://aur.archlinux.org/packages/python-bitarray --- package/Config.in | 1 + package/python-bitarray/Config.in | 6 ++++++ package/python-bitarray/python-bitarray.hash | 5 +++++ package/python-bitarray/python-bitarray.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-bitarray/Config.in create mode 100644 package/python-bitarray/python-bitarray.hash create mode 100644 package/python-bitarray/python-bitarray.mk diff --git a/package/Config.in b/package/Config.in index 728bd03b80..708dc376b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1007,6 +1007,7 @@ menu "External python modules" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bidict/Config.in" + source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" source "package/python-bleak/Config.in" source "package/python-blinker/Config.in" diff --git a/package/python-bitarray/Config.in b/package/python-bitarray/Config.in new file mode 100644 index 0000000000..38d685f4fd --- /dev/null +++ b/package/python-bitarray/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_BITARRAY + bool "python-bitarray" + help + efficient arrays of booleans -- C extension. + + https://github.com/ilanschnell/bitarray diff --git a/package/python-bitarray/python-bitarray.hash b/package/python-bitarray/python-bitarray.hash new file mode 100644 index 0000000000..d91a28af20 --- /dev/null +++ b/package/python-bitarray/python-bitarray.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/bitarray/json +md5 024324a82314e9e68ecdcdefdc69071f bitarray-2.9.2.tar.gz +sha256 a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e bitarray-2.9.2.tar.gz +# Locally computed sha256 checksums +sha256 6b5e04f6e0462e1b97be833f9d65e66cd5eceb3283f4a6f532261087d0ab1233 LICENSE diff --git a/package/python-bitarray/python-bitarray.mk b/package/python-bitarray/python-bitarray.mk new file mode 100644 index 0000000000..f86320c112 --- /dev/null +++ b/package/python-bitarray/python-bitarray.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-bitarray +# +################################################################################ + +PYTHON_BITARRAY_VERSION = 2.9.2 +PYTHON_BITARRAY_SOURCE = bitarray-$(PYTHON_BITARRAY_VERSION).tar.gz +PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/c7/bf/25cf92a83e1fe4948d7935ae3c02f4c9ff9cb9c13e977fba8af11a5f642c +PYTHON_BITARRAY_SETUP_TYPE = setuptools +PYTHON_BITARRAY_LICENSE = Python-2.0 +PYTHON_BITARRAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 6 15:51:40 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 16:51:40 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-bitstring: add missing runtime dependency In-Reply-To: <20240206155140.2351424-1-romain.naour@smile.fr> References: <20240206155140.2351424-1-romain.naour@smile.fr> Message-ID: <20240206155140.2351424-2-romain.naour@smile.fr> python-bitstring require python-bitarray and python-zlib at runtime since 4.0.1 release [1][2]. python-zlib is now needed for the "Experimental support for two 8-bit float types". Intended to fixes (fixed locally): https://gitlab.com/buildroot.org/buildroot/-/jobs/6104227183 (TestPythonPy3Bitstring) https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854810 (TestPythonPy3Crossbar) gitlab-ci reports another issue at build time not reproduced locally: *** Error compiling '[...]/TestPythonPy3Bitstring/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... Sorry: IndentationError: expected an indented block after function definition on line 6 (plugin_test.py, line 8) [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.1 [2] https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 Signed-off-by: Romain Naour Cc: James Hilliard --- package/python-bitstring/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-bitstring/Config.in b/package/python-bitstring/Config.in index 93d7682577..82d0bb29c6 100644 --- a/package/python-bitstring/Config.in +++ b/package/python-bitstring/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_BITSTRING bool "python-bitstring" + select BR2_PACKAGE_PYTHON_BITARRAY # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Simple construction, analysis and modification of binary data. -- 2.43.0 From giulio.benetti at benettiengineering.com Tue Feb 6 15:54:13 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 16:54:13 +0100 Subject: [Buildroot] [PATCH] package/attr: fix build failure on Microblaze architecture In-Reply-To: <20240206161152.0e178414@windsurf> References: <20240206161152.0e178414@windsurf> Message-ID: <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> On Microblaze architecture __has_attribute(__symver__) support is broken and always return true even if symver is not supported so let's add a local patch pending upstream to detect if symver is supported during autoreconf. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Signed-off-by: Giulio Benetti --- ...dd-detection-of-symver-gcc-attribute.patch | 56 +++++++++++++++++++ package/attr/attr.mk | 3 + 2 files changed, 59 insertions(+) create mode 100644 package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch new file mode 100644 index 0000000000..15bd266d7b --- /dev/null +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch @@ -0,0 +1,56 @@ +From 1be7c2251040f1152de9ceb5263e6e96fa5c3d75 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 15:33:15 +0100 +Subject: [PATCH] configure.ac: add detection of symver gcc attribute + +Upstream: https://lists.gnu.org/archive/html/savannah-hackers-public/2024-02/msg00009.html + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Giulio Benetti +--- + configure.ac | 15 +++++++++++++++ + libattr/syscalls.c | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7e362e9..98477b5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,21 @@ AS_CASE([$host_os], + [linux*], [os_linux=yes]) + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) + ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, ++ gcc_cv_symver_attribute, ++ [cat > conftest.c </dev/null 2>&1; then \ ++ gcc_cv_symver_attribute=yes ++ fi ++ rm -f conftest.[cs] ++]) ++AS_IF([test $gcc_cv_symver_attribute = yes], ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) ++ + AC_CONFIG_COMMANDS([include/attr], + [dnl + rm -rf include/attr +diff --git a/libattr/syscalls.c b/libattr/syscalls.c +index 907560a..caa70bc 100644 +--- a/libattr/syscalls.c ++++ b/libattr/syscalls.c +@@ -32,7 +32,7 @@ + * fall back to traditional .symver asm directive otherwise. + */ + #ifdef __has_attribute +-# if __has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) + # elif __has_attribute(__no_reorder__) + /* +-- +2.43.0 + diff --git a/package/attr/attr.mk b/package/attr/attr.mk index 6ecf5c53f4..f4f911333a 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_CPE_ID_VENDOR = attr_project +# Flag added for patch dealing with symver in configure.ac +ATTR_AUTORECONF = YES + ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls -- 2.34.1 From yann.morin.1998 at free.fr Tue Feb 6 15:59:45 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 16:59:45 +0100 Subject: [Buildroot] [PATCH 1/6] utils/readme.txt: expand check-package description In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > check-package does a lot more by now than checking .mk and > Config.in files. Add this to the description. > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > utils/readme.txt | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/utils/readme.txt b/utils/readme.txt > index 3e8833c4ea..d5cda70bfc 100644 > --- a/utils/readme.txt > +++ b/utils/readme.txt > @@ -12,8 +12,11 @@ brmake > nothing. > > check-package > - a script that checks the coding style of a package's Config.in and > - .mk files, and also tests them for various types of typoes. > + a script that checks the coding style across the buildroot tree. It > + checks package's Config.in and .mk files, runs shellcheck for all shell > + scripts, flake8 for python files, checks for typoes, etc. > + It checks the .checkpackageignore file if errors should be ignored and > + errors if there's a file listed that doesn't produce an error. > > genrandconfig > a script that generates a random configuration, used by the autobuilders > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 16:00:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:00:15 +0100 Subject: [Buildroot] [PATCH 2/6] utils/readme.txt: document docker-run script In-Reply-To: <20240206105246.1220945-2-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> <20240206105246.1220945-2-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > Signed-off-by: Marcus Hoffmann > --- > utils/readme.txt | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/utils/readme.txt b/utils/readme.txt > index d5cda70bfc..2cb6b0af9b 100644 > --- a/utils/readme.txt > +++ b/utils/readme.txt > @@ -18,6 +18,10 @@ check-package > It checks the .checkpackageignore file if errors should be ignored and > errors if there's a file listed that doesn't produce an error. > > +docker-run > + a script that runs a command (like make check-package) inside the buildroot > + ci docker container. I've slightly extended that to state that an interactive shell is spawned if not command is specified. Applied to master, thanks. Regards, Yann E. MORIN. > genrandconfig > a script that generates a random configuration, used by the autobuilders > (http://autobuild.buildroot.org). It selects a random toolchain from > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From antoine.coutant at smile.fr Tue Feb 6 16:00:17 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Tue, 6 Feb 2024 17:00:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: References: <20240111051726.2918732-1-james.hilliard1@gmail.com> <1dd4afa6-e225-4e79-bb3a-21d0e04c7571@smile.fr> Message-ID: <8260a015-44ed-4a2a-8d33-67c4268f810d@smile.fr> On 06/02/2024 15:53, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-06 15:09 +0100, Antoine Coutant spake thusly: >> On 11/01/2024 06:17, James Hilliard wrote: >>> Signed-off-by: James Hilliard > [--SNIP--] >>> -PYTHON_RPDS_PY_VERSION = 0.12.0 >>> +PYTHON_RPDS_PY_VERSION = 0.16.2 >> rpds depends on the crate pyo3. This crate uses >> "std::sync::atomic::AtomicI64" which doesn't exist for 32 bits >> targets. That leads to an error [1]. > I have been discussing this with Romain IRL, and he explained that the > issue _already_ happenned with 0.12.0, so this is not a regression and > thus reverting this patch will not fix the issue. > > Is that correct? Yes, this patch is not a regression. I did a test with Buildroot 2023.11 and it failed. This bug is old but i described it here because I was working on it when the version bump was applied and I thought it was related. > > Also, will std::sync::atomic::AtomicI64 ever be available for 32-bit > targets? If not, would that be considered a bug in the std lib? according to the rust doc, std::sync::atomic::AtomicI64 is only available on platforms that support atomic loads and stores of i64 [1]. Moreover, std::sync::atomic types might not be available on all platforms [2]. That's why the crate portable-atomic [3] have been created. It provides atomic types and compare and swap operations for all targets that can use std. That's the crate used by pyo3 upstream to solve the problem [4]. >> An issue have been opened on pyo3's github [2]. A fix have been accepted [3] >> but it isn't in the last release. Thus, this version bump doesn't >> fix this problem. >> [1]:https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854842 >> [2]:https://github.com/PyO3/pyo3/issues/3614 >> [3]:https://github.com/PyO3/pyo3/pull/3619 > It is not going to be easy to carry this change as a patch in Buildroot: > it would require that we be able to patch a package during the vendoring > step. > > In this case, we'd need to do the vendoring (because we need the pyo3 > crate to be downloaded), then apply the patch (with mangled paths) to > add the new dependency, then restart the vendoring. In the generic case, > we'd even need to be able to repeat the process in case that new > dependency has to be patched and so on and so on... That's not going to > be easy, by far... > > Meh... > > We can't even update to a random sha1 from the rpds git tree, because > they do nit even have an update to switch to a newer (even if > unreleased) pyo3. > > Meh, again... > > Not sure what to do... > > What about adding a dependency on BR2_ARCH_IS_64 to python-rpds-pym and > propagate that to all its dependencies? I think this is the best way to avoid this bug. Patching during the vendoring process seams to be possible. But it will be quite impossible to maintain. The dependency on BR2_ARCH_IS_64 must be removed when the version of spo3 used by rpds will use portable-atomic. > > Regards, > Yann E. MORIN. [1]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI64.html [2]: https://doc.rust-lang.org/std/sync/atomic/index.html#portability [3]: https://github.com/taiki-e/portable-atomic [4]: https://github.com/PyO3/pyo3/pull/3619/files Regards, Antoine Coutant -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Tue Feb 6 16:00:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:00:35 +0100 Subject: [Buildroot] [PATCH 3/6] docs/website/support.html: document how to join irc channel from matrix In-Reply-To: <20240206105246.1220945-3-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> <20240206105246.1220945-3-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > docs/website/support.html | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/docs/website/support.html b/docs/website/support.html > index 9be816f836..13d63b13a9 100644 > --- a/docs/website/support.html > +++ b/docs/website/support.html > @@ -21,7 +21,9 @@ >
>

The Buildroot IRC channel is > #buildroot, hosted on OFTC. If you do not have an IRC client, you can > - use the OFTC web interface. > + use the OFTC web interface. The > + channel is also bridged to matrix as > + #_oftc_#buildroot:matrix.org. > When asking for help on IRC, share relevant logs or pieces of code using a code > sharing website.

> > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 16:02:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:06 +0100 Subject: [Buildroot] [PATCH 4/6] docs/website/support.html: document irc channel permission changes In-Reply-To: <20240206105246.1220945-4-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> <20240206105246.1220945-4-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > The #buildroot IRC channel recently changed from only allowing > registered users to join to allowing anyone to join but only allowing > registered users to talk in the channel. This still avoids the spam > problem on IRC while allowing an exception for users bridged from > matrix.org. These already have a username registered on the matrix side > and thus similar properties as a registered IRC user/nick. > > The commands to set these options were: > > * Set +q on all unregistered nicks: ~/mode #buildroot +q $~a~ this lets > people join but they can't talk > * Set exempt on matrix hosts: ~/mode #buildroot +e $x:matrix.org~ > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > docs/website/support.html | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/docs/website/support.html b/docs/website/support.html > index 13d63b13a9..28873c6d76 100644 > --- a/docs/website/support.html > +++ b/docs/website/support.html > @@ -27,8 +27,8 @@ > When asking for help on IRC, share relevant logs or pieces of code using a code > sharing website.

> > -

Note that due to excessive spamming on IRC, the channel can only be > - joined if you are a registered user with > +

Note that due to excessive spamming on IRC, you can only talk in the > + channel if you are a registered user with > OFTC NickServ > service. Follow the instructions to register as a user with a password, > and then join the #buildroot channel.

> -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 16:03:03 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:03:03 +0100 Subject: [Buildroot] [PATCH 5/6] docs/manual/contribute.adoc: link to git-send-email.io In-Reply-To: <20240206105246.1220945-5-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> <20240206105246.1220945-5-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > https://git-send-email.io/ is a page maintained by sourcehut which > explains how to setup git send-email on many OS's for many popular email > providers. > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > docs/manual/contribute.adoc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc > index 2b90d13b41..684e9f4809 100644 > --- a/docs/manual/contribute.adoc > +++ b/docs/manual/contribute.adoc > @@ -369,7 +369,7 @@ $ git send-email origin/master > --------------------- > > Note that +git+ should be configured to use your mail account. > -To configure +git+, see +man git-send-email+ or google it. > +To configure +git+, see +man git-send-email+ or https://git-send-email.io/. > > If you do not use +git send-email+, make sure posted *patches are not > line-wrapped*, otherwise they cannot easily be applied. In such a case, > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 16:02:02 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:02 +0100 Subject: [Buildroot] [git commit] utils/readme.txt: expand check-package description Message-ID: <20240206160322.96B118711A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fba40a9f39cbd6b3f662073d148aad371dc07964 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master check-package does a lot more by now than checking .mk and Config.in files. Add this to the description. Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- utils/readme.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/readme.txt b/utils/readme.txt index 3e8833c4ea..d5cda70bfc 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -12,8 +12,11 @@ brmake nothing. check-package - a script that checks the coding style of a package's Config.in and - .mk files, and also tests them for various types of typoes. + a script that checks the coding style across the buildroot tree. It + checks package's Config.in and .mk files, runs shellcheck for all shell + scripts, flake8 for python files, checks for typoes, etc. + It checks the .checkpackageignore file if errors should be ignored and + errors if there's a file listed that doesn't produce an error. genrandconfig a script that generates a random configuration, used by the autobuilders From yann.morin.1998 at free.fr Tue Feb 6 16:02:03 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:03 +0100 Subject: [Buildroot] [git commit] utils/readme.txt: document docker-run script Message-ID: <20240206160322.A26068711B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21d89a5b86f550958b4e23262b33e8497842b8dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann [yann.morin.1998 at free.fr: the default is an interactive shell] Signed-off-by: Yann E. MORIN --- utils/readme.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/readme.txt b/utils/readme.txt index d5cda70bfc..6488d13c75 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -18,6 +18,11 @@ check-package It checks the .checkpackageignore file if errors should be ignored and errors if there's a file listed that doesn't produce an error. +docker-run + a script that runs a command (like make check-package) inside the + buildroot CI docker container; pass no command to get an interactive + shell. + genrandconfig a script that generates a random configuration, used by the autobuilders (http://autobuild.buildroot.org). It selects a random toolchain from From yann.morin.1998 at free.fr Tue Feb 6 16:02:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:06 +0100 Subject: [Buildroot] [git commit] docs/website/support.html: document irc channel permission changes Message-ID: <20240206160322.B8A958711D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1e6d7845b0f3b450709b84a6e4fc4527f12b196 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The #buildroot IRC channel recently changed from only allowing registered users to join to allowing anyone to join but only allowing registered users to talk in the channel. This still avoids the spam problem on IRC while allowing an exception for users bridged from matrix.org. These already have a username registered on the matrix side and thus similar properties as a registered IRC user/nick. The commands to set these options were: * Set +q on all unregistered nicks: ~/mode #buildroot +q $~a~ this lets people join but they can't talk * Set exempt on matrix hosts: ~/mode #buildroot +e $x:matrix.org~ Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- docs/website/support.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/support.html b/docs/website/support.html index 13d63b13a9..28873c6d76 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -27,8 +27,8 @@ When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

-

Note that due to excessive spamming on IRC, the channel can only be - joined if you are a registered user with +

Note that due to excessive spamming on IRC, you can only talk in the + channel if you are a registered user with OFTC NickServ service. Follow the instructions to register as a user with a password, and then join the #buildroot channel.

From yann.morin.1998 at free.fr Tue Feb 6 16:02:04 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:04 +0100 Subject: [Buildroot] [git commit] docs/website/support.html: document how to join irc channel from matrix Message-ID: <20240206160322.AD36E8711C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb4d03c6a3637c3ab219a93640df3ed33d956555 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- docs/website/support.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/website/support.html b/docs/website/support.html index 9be816f836..13d63b13a9 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -21,7 +21,9 @@

The Buildroot IRC channel is #buildroot, hosted on OFTC. If you do not have an IRC client, you can - use the OFTC web interface. + use the OFTC web interface. The + channel is also bridged to matrix as + #_oftc_#buildroot:matrix.org. When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

From yann.morin.1998 at free.fr Tue Feb 6 16:02:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:07 +0100 Subject: [Buildroot] [git commit] docs/manual/contribute.adoc: link to git-send-email.io Message-ID: <20240206160322.C58528711A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4639b493a9729e1d8bfe0839aed871f1a96a207 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git-send-email.io/ is a page maintained by sourcehut which explains how to setup git send-email on many OS's for many popular email providers. Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- docs/manual/contribute.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 2b90d13b41..684e9f4809 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -369,7 +369,7 @@ $ git send-email origin/master --------------------- Note that +git+ should be configured to use your mail account. -To configure +git+, see +man git-send-email+ or google it. +To configure +git+, see +man git-send-email+ or https://git-send-email.io/. If you do not use +git send-email+, make sure posted *patches are not line-wrapped*, otherwise they cannot easily be applied. In such a case, From hanyuan-z at qq.com Tue Feb 6 16:01:29 2024 From: hanyuan-z at qq.com (=?gb18030?B?aGFueXVhbi16?=) Date: Wed, 7 Feb 2024 00:01:29 +0800 Subject: [Buildroot] [PATCH v3 2/2] configs/milkv_duo: new defconfig Message-ID: Hello Giulio, Thanks for your careful review! However there are a few things I still get confused about. Could you please give me some hints? > Here you definetely need to add that this patch depends on this > patchset: > https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 > to work-around a gcc bug on htop package. Do you mean that I should submit my patches after yours gets merged? Or should I declare that my patch depends on yours, and how? > After the 3 dashes above you should add changes between patch versions like: > V1->V2: > * changed this > * changed that > > V2->V3: > * change thee Could I only add lines from V2 -> V3 since the V1 -> V2 was happened nearly two months ago and the changes from V1 -> V2 were very big. > please drop from here... > > > +To configure the linux kernel or u-boot: > > + > > + $ make linux-menuconfig > > + > > +To rebuild something (e.g. linux): > > + > > + $ make linux-rebuild > > + > > ...to here, since it's part of Buildroot manual and also > you should point "linux-menuconfig and uboot-menuconfig", > but it doesn't make sense to me, so yes please drop it, Do you mean that I should remove those lines? > Here I would expand comment by pointing that glibc is not suitable and > why. It should be a gcc ICE, so maybe someone can fix or work it around > later with this indication. Yes, the problem is gcc ICE. More detailed, the ICE is coming from the t-head optimizations. Once t-head stuff removed, no more ICE. No more glibc and htop problems. However once the optimizations removed, the Milk-v duo board's architect and performance features are gone. So it is troublesome. And I think this problem is associated with the one from another email. Let me put them together. > > I think I should tell you this. In fact I encountered another gcc bug > > when using all the t-head?s optimizations with the glibc. The gcc reported > > internal errors when we > > > > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > > > > So we have to use musl and find this bug is not reported anymore. > I was wondering why you were using exactly musl and I suspected > something like that. The reason I use musl is that the original sdk not prepared for the mainline buildroot is using the musl. And for the compatibility I think it's better to use musl here to rather than the rest option uClibc-ng, though it works fine. So should I put more lines at the defconfig to comment more about these embarrassing situations? > Please for all occurences use Makefile "$(if ...)" statement instead of > "if [ ... = y ]" Sorry for the inconsistency. However the Makefile's if statement is too weird for me to implement such a branch of things to make. So I spend a lot of time to find that the shell's if statement could work this way. And I have find examples that are using the same technique. For example the line 699 at package/systemd/systemd.mk. Could you please kindly give me an exemption here? > > + > > + cd $(@D)/cvitek/build/task && \ > > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > > + -DRUN_ARCH=riscv64 \ > > + -DRUN_TYPE=CVIRTOS \ > > + -DTOP_DIR=$(@D)/cvitek \ > > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > > + -DBOARD_FPGA=n \ > > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > > The build command is common for every "target", so please declare it > into a variable on the top. > > > + $(@D)/cvitek/task > > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target cvirtos.bin -- -v > > To tell the truth all the points above can be shrinked using a foreach > loop through all the build directories since they all look the same > except directory name. Can you provide such change? These are too painful for me. Could I move these code into the remote code repo so that these annoying code will not be included in the buildroot? And then the buildroot package would only have good lines like "$(eval $(generic-package))" Great thanks again for your thorough review and insightful feedback on my code! I truly appreciate your patience and the valuable time you spend on my patches. Best regards, Hanyuan Zhao From giulio.benetti at benettiengineering.com Tue Feb 6 16:15:43 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 17:15:43 +0100 Subject: [Buildroot] [External] - [PATCH] package/attr: fix build failure on Microblaze architecture In-Reply-To: References: <20240206161152.0e178414@windsurf> <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> Message-ID: <40f3713a-2cbe-4cdf-9b7b-3f30d5742b56@benettiengineering.com> Hi Vincent, my thought is, On 06/02/24 17:05, Vincent Fazio wrote: > All, > > Would it make sense to patch GCC for Microblaze to address these at the compiler level instead of constantly patching the packages? until gcc is not fixed yes, but, > I tested https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c6 back when we were solving this problem for xz and had no issues https://gcc.gnu.org/pipermail/gcc/2023-March/240834.html this absolutely makes sense. It would great if you could backport those patches for all gcc versions we deal with like I've done time ago fo OpenRisc and when they merge them upstream we can drop them after bumping gcc versions with that patch applied. -- Giulio Benetti CEO&CTO at Benetti Engineering sas > >> -----Original Message----- >> From: buildroot On Behalf Of Giulio >> Benetti >> Sent: Tuesday, February 6, 2024 9:54 AM >> To: buildroot at buildroot.org; Thomas Petazzoni >> >> Cc: Giulio Benetti ; Fabrice >> Fontaine >> Subject: [External] - [Buildroot] [PATCH] package/attr: fix build failure on >> Microblaze architecture >> >> On Microblaze architecture __has_attribute(__symver__) support is broken >> and always return true even if symver is not supported so let's add a local >> patch pending upstream to detect if symver is supported during autoreconf. >> >> Fixes: >> http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078 >> bf77d2a >> >> Signed-off-by: Giulio Benetti >> --- >> ...dd-detection-of-symver-gcc-attribute.patch | 56 +++++++++++++++++++ >> package/attr/attr.mk | 3 + >> 2 files changed, 59 insertions(+) >> create mode 100644 package/attr/0002-configure.ac-add-detection-of- >> symver-gcc-attribute.patch >> >> diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc- >> attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver- >> gcc-attribute.patch >> new file mode 100644 >> index 0000000000..15bd266d7b >> --- /dev/null >> +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribu >> +++ te.patch >> @@ -0,0 +1,56 @@ >> +From 1be7c2251040f1152de9ceb5263e6e96fa5c3d75 Mon Sep 17 00:00:00 >> 2001 >> +From: Thomas Petazzoni >> +Date: Tue, 6 Feb 2024 15:33:15 +0100 >> +Subject: [PATCH] configure.ac: add detection of symver gcc attribute >> + >> +Upstream: >> +https://lists.gnu.org/archive/html/savannah-hackers-public/2024-02/msg0 >> +0009.html >> + >> +Signed-off-by: Thomas Petazzoni >> +Signed-off-by: Giulio Benetti >> +--- >> + configure.ac | 15 +++++++++++++++ >> + libattr/syscalls.c | 2 +- >> + 2 files changed, 16 insertions(+), 1 deletion(-) >> + >> +diff --git a/configure.ac b/configure.ac index 7e362e9..98477b5 100644 >> +--- a/configure.ac >> ++++ b/configure.ac >> +@@ -57,6 +57,21 @@ AS_CASE([$host_os], >> + [linux*], [os_linux=yes]) >> + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) >> + >> ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, >> ++ gcc_cv_symver_attribute, >> ++ [cat > conftest.c <> ++void foo (void) {} >> ++__typeof(foo) foo __attribute__ ((__symver__("foo at foo"))); EOF >> ++ gcc_cv_symver_attribute=no >> ++ if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then \ >> ++ gcc_cv_symver_attribute=yes >> ++ fi >> ++ rm -f conftest.[cs] >> ++]) >> ++AS_IF([test $gcc_cv_symver_attribute = yes], >> ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver >> ++attribute])]) >> ++ >> + AC_CONFIG_COMMANDS([include/attr], >> + [dnl >> + rm -rf include/attr >> +diff --git a/libattr/syscalls.c b/libattr/syscalls.c index >> +907560a..caa70bc 100644 >> +--- a/libattr/syscalls.c >> ++++ b/libattr/syscalls.c >> +@@ -32,7 +32,7 @@ >> + * fall back to traditional .symver asm directive otherwise. >> + */ >> + #ifdef __has_attribute >> +-# if __has_attribute(__symver__) >> ++# if defined(HAVE_SYMVER_ATTRIBUTE) >> + # define SYMVER(cn, vn) __typeof(cn) cn >> +__attribute__((__symver__(vn))) # elif __has_attribute(__no_reorder__) >> + /* >> +-- >> +2.43.0 >> + >> diff --git a/package/attr/attr.mk b/package/attr/attr.mk index >> 6ecf5c53f4..f4f911333a 100644 >> --- a/package/attr/attr.mk >> +++ b/package/attr/attr.mk >> @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ >> (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL >> ATTR_CPE_ID_VENDOR = attr_project >> >> +# Flag added for patch dealing with symver in configure.ac >> +ATTR_AUTORECONF = YES >> + >> ATTR_INSTALL_STAGING = YES >> >> ATTR_CONF_OPTS = --disable-nls >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot >> CAUTION: This email originated from outside of the organization. Do not click >> links or open attachments unless you recognize the sender and know the >> content is safe. > From james.hilliard1 at gmail.com Tue Feb 6 16:17:15 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 09:17:15 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/python-ml-dtypes: bump to version 0.3.2 Message-ID: <20240206161715.550268-1-james.hilliard1@gmail.com> Migrate from distutils which is being deprecated to setuptools. Drop python-pybind which is no longer required: https://github.com/jax-ml/ml_dtypes/blob/v0.3.2/CHANGELOG.md#032---2024-01-03 Signed-off-by: James Hilliard --- Changes v1 -> v2: - drop pybind --- package/python-ml-dtypes/Config.in | 1 - package/python-ml-dtypes/python-ml-dtypes.hash | 4 ++-- package/python-ml-dtypes/python-ml-dtypes.mk | 9 ++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in index 72506896df..8791564b19 100644 --- a/package/python-ml-dtypes/Config.in +++ b/package/python-ml-dtypes/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy select BR2_PACKAGE_PYTHON_NUMPY - select BR2_PACKAGE_PYTHON_PYBIND help ml_dtypes is a stand-alone implementation of several NumPy dtype extensions used in machine learning libraries. diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash index a440268e39..53bfacb528 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.hash +++ b/package/python-ml-dtypes/python-ml-dtypes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ml_dtypes/json -md5 6adbb05530819bdb4a78d2372d187fe2 ml_dtypes-0.3.1.tar.gz -sha256 60778f99194b4c4f36ba42da200b35ef851ce4d4af698aaf70f5b91fe70fc611 ml_dtypes-0.3.1.tar.gz +md5 438c04dc0d941ec1b3b71667225c74c8 ml_dtypes-0.3.2.tar.gz +sha256 533059bc5f1764fac071ef54598db358c167c51a718f68f5bb55e3dee79d2967 ml_dtypes-0.3.2.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk index 92d23bece4..676137ecf1 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.mk +++ b/package/python-ml-dtypes/python-ml-dtypes.mk @@ -4,16 +4,15 @@ # ################################################################################ -PYTHON_ML_DTYPES_VERSION = 0.3.1 +PYTHON_ML_DTYPES_VERSION = 0.3.2 PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz -PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/16/6e/9a7a51ee1ca24b8e92109128260c5aec8340c8fe5572e9ceecddae559abe +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/39/7d/8d85fcba868758b3a546e6914e727abd8f29ea6918079f816975c9eecd63 PYTHON_ML_DTYPES_LICENSE = Apache-2.0 PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE -PYTHON_ML_DTYPES_SETUP_TYPE = distutils +PYTHON_ML_DTYPES_SETUP_TYPE = setuptools PYTHON_ML_DTYPES_DEPENDENCIES = \ host-python-numpy \ - python-numpy \ - python-pybind + python-numpy $(eval $(python-package)) -- 2.34.1 From vfazio at xes-inc.com Tue Feb 6 16:05:31 2024 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 6 Feb 2024 16:05:31 +0000 Subject: [Buildroot] [External] - [PATCH] package/attr: fix build failure on Microblaze architecture In-Reply-To: <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> References: <20240206161152.0e178414@windsurf> <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> Message-ID: All, Would it make sense to patch GCC for Microblaze to address these at the compiler level instead of constantly patching the packages? I tested https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c6 back when we were solving this problem for xz and had no issues https://gcc.gnu.org/pipermail/gcc/2023-March/240834.html > -----Original Message----- > From: buildroot On Behalf Of Giulio > Benetti > Sent: Tuesday, February 6, 2024 9:54 AM > To: buildroot at buildroot.org; Thomas Petazzoni > > Cc: Giulio Benetti ; Fabrice > Fontaine > Subject: [External] - [Buildroot] [PATCH] package/attr: fix build failure on > Microblaze architecture > > On Microblaze architecture __has_attribute(__symver__) support is broken > and always return true even if symver is not supported so let's add a local > patch pending upstream to detect if symver is supported during autoreconf. > > Fixes: > http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078 > bf77d2a > > Signed-off-by: Giulio Benetti > --- > ...dd-detection-of-symver-gcc-attribute.patch | 56 +++++++++++++++++++ > package/attr/attr.mk | 3 + > 2 files changed, 59 insertions(+) > create mode 100644 package/attr/0002-configure.ac-add-detection-of- > symver-gcc-attribute.patch > > diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc- > attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver- > gcc-attribute.patch > new file mode 100644 > index 0000000000..15bd266d7b > --- /dev/null > +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribu > +++ te.patch > @@ -0,0 +1,56 @@ > +From 1be7c2251040f1152de9ceb5263e6e96fa5c3d75 Mon Sep 17 00:00:00 > 2001 > +From: Thomas Petazzoni > +Date: Tue, 6 Feb 2024 15:33:15 +0100 > +Subject: [PATCH] configure.ac: add detection of symver gcc attribute > + > +Upstream: > +https://lists.gnu.org/archive/html/savannah-hackers-public/2024-02/msg0 > +0009.html > + > +Signed-off-by: Thomas Petazzoni > +Signed-off-by: Giulio Benetti > +--- > + configure.ac | 15 +++++++++++++++ > + libattr/syscalls.c | 2 +- > + 2 files changed, 16 insertions(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac index 7e362e9..98477b5 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -57,6 +57,21 @@ AS_CASE([$host_os], > + [linux*], [os_linux=yes]) > + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) > + > ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, > ++ gcc_cv_symver_attribute, > ++ [cat > conftest.c < ++void foo (void) {} > ++__typeof(foo) foo __attribute__ ((__symver__("foo at foo"))); EOF > ++ gcc_cv_symver_attribute=no > ++ if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then \ > ++ gcc_cv_symver_attribute=yes > ++ fi > ++ rm -f conftest.[cs] > ++]) > ++AS_IF([test $gcc_cv_symver_attribute = yes], > ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver > ++attribute])]) > ++ > + AC_CONFIG_COMMANDS([include/attr], > + [dnl > + rm -rf include/attr > +diff --git a/libattr/syscalls.c b/libattr/syscalls.c index > +907560a..caa70bc 100644 > +--- a/libattr/syscalls.c > ++++ b/libattr/syscalls.c > +@@ -32,7 +32,7 @@ > + * fall back to traditional .symver asm directive otherwise. > + */ > + #ifdef __has_attribute > +-# if __has_attribute(__symver__) > ++# if defined(HAVE_SYMVER_ATTRIBUTE) > + # define SYMVER(cn, vn) __typeof(cn) cn > +__attribute__((__symver__(vn))) # elif __has_attribute(__no_reorder__) > + /* > +-- > +2.43.0 > + > diff --git a/package/attr/attr.mk b/package/attr/attr.mk index > 6ecf5c53f4..f4f911333a 100644 > --- a/package/attr/attr.mk > +++ b/package/attr/attr.mk > @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ > (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL > ATTR_CPE_ID_VENDOR = attr_project > > +# Flag added for patch dealing with symver in configure.ac > +ATTR_AUTORECONF = YES > + > ATTR_INSTALL_STAGING = YES > > ATTR_CONF_OPTS = --disable-nls > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. From thomas.petazzoni at bootlin.com Tue Feb 6 16:25:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:25:40 +0100 Subject: [Buildroot] [External] - [PATCH] package/attr: fix build failure on Microblaze architecture In-Reply-To: References: <20240206161152.0e178414@windsurf> <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> Message-ID: <20240206172540.2d1ed291@windsurf> Hello Vincent, On Tue, 6 Feb 2024 16:05:31 +0000 Vincent Fazio wrote: > Would it make sense to patch GCC for Microblaze to address these at > the compiler level instead of constantly patching the packages? > > I tested https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c6 back > when we were solving this problem for xz and had no issues > https://gcc.gnu.org/pipermail/gcc/2023-March/240834.html It would definitely make sense of course. Have you been able to get the necessary changes accepted in upstream GCC ? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From ismael at iodev.co.uk Tue Feb 6 16:25:53 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 17:25:53 +0100 Subject: [Buildroot] [RFC PATCH v3] docs/website: Add Makefile to pre-generate the website Message-ID: <20240206162555.31657-1-ismael@iodev.co.uk> Supports the current includes plus smu [0] lightweight markup. [0] https://github.com/Gottox/smu Signed-off-by: Ismael Luceno --- Notes: Changes since v2: - Integrate with toplevel makefile - Use parethesis instead of curly braces for variables - Removed smu rule - Copy resources to output directory too - Filter-out footer.html & header.html Makefile | 8 ++++++-- docs/website/incfile.awk | 30 ++++++++++++++++++++++++++++++ docs/website/website.mk | 31 +++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 docs/website/incfile.awk create mode 100644 docs/website/website.mk diff --git a/Makefile b/Makefile index ac625152c678..cd56bc268917 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,8 @@ endif noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \ defconfig %_defconfig allyesconfig allnoconfig alldefconfig syncconfig release \ randpackageconfig allyespackageconfig allnopackageconfig \ - print-version olddefconfig distclean manual manual-% check-package + print-version olddefconfig distclean manual manual-% check-package \ + website # Some global targets do not trigger a build, but are used to collect # metadata, or do various checks. When such targets are triggered, @@ -1180,6 +1181,7 @@ help: @echo ' graph-depends - generate graph of the dependency tree' @echo ' graph-size - generate stats of the filesystem size' @echo ' list-defconfigs - list all defconfigs (pre-configured minimal systems)' + @echo ' website - build website' @echo @echo 'Miscellaneous:' @echo ' source - download all sources needed for offline-build' @@ -1234,7 +1236,7 @@ release: OUT = buildroot-$(BR2_VERSION) # documentation to the git output release: git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar - $(MAKE) O=$(OUT) manual-html manual-text manual-pdf + $(MAKE) O=$(OUT) manual-html manual-text manual-pdf website $(MAKE) O=$(OUT) distclean tar rf $(OUT).tar $(OUT) gzip -9 -c < $(OUT).tar > $(OUT).tar.gz @@ -1253,6 +1255,8 @@ check-package: $(Q)./utils/check-package --failed-only `git ls-tree -r --name-only HEAD` \ > .checkpackageignore +include docs/website/website.mk + include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/docs/website/incfile.awk b/docs/website/incfile.awk new file mode 100644 index 000000000000..e8ae571de271 --- /dev/null +++ b/docs/website/incfile.awk @@ -0,0 +1,30 @@ +BEGIN { + FS="\"" +} + +FNR == 1 { + curdir = FILENAME + sub(/[^/]*$/, "", curdir) + if (curdir !~ /[/]$/) + curdir = curdir "/" +} + +{ + do { + if (match($0, /^$/)) { + file_stack[++file_cur] = curdir $2 + } else { + print + } + if (file_cur > 0) { + e = getline < file_stack[file_cur] + if (!e) { + --file_cur + } else if (e == -1) { + printf "%s: read error\n", \ + file_stack[file_cur] \ + > "/dev/stderr" + } + } + } while (file_cur > 0) +} diff --git a/docs/website/website.mk b/docs/website/website.mk new file mode 100644 index 000000000000..d3f7b28aaa07 --- /dev/null +++ b/docs/website/website.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# The Buildroot website +# +################################################################################ + +AWK ?= mawk + +website-dir = $(TOPDIR)/docs/website +website-src = $(wildcard $(website-dir)/*.html) +website-gen = $(filter-out %/header.html %/footer.html,\ + $(website-src:$(website-dir)/%=$(O)/website/%)) +website-res = $(patsubst $(website-dir)/%,$(O)/website/%,$(wildcard \ + $(website-dir)/js/*.js \ + $(website-dir)/css/*.css \ + $(website-dir)/fonts/* \ + $(website-dir)/images/* \ +)) + +website: $(website-gen) $(website-res) + +$(website-res): $(O)/website/%: $(website-dir)/% + install -m644 -D $< $@ + +website-dep = $(website-dir)/website.mk $(website-dir)/incfile.awk + +$(O)/website/%.html: $(website-dir)/%.html $(website-dep) + mkdir -p "$(@D)" + tmpfile=$$(mktemp) && \ + $(AWK) -f $(website-dir)/incfile.awk $< > "$$tmpfile" && \ + mv "$$tmpfile" $@ -- 2.43.0 From romain.naour at smile.fr Tue Feb 6 16:26:20 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 17:26:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/qemu: reenable Qemu user-land emulation for musl toolchains In-Reply-To: <20230112075509.2200-1-caseorum@gmail.com> References: <20230112075509.2200-1-caseorum@gmail.com> Message-ID: Hello, Le 12/01/2023 ? 08:55, Joseph Burt a ?crit?: > Compatible "struct sigevent" added upstream in musl 1.2.2 [1]. > > [1] https://git.musl-libc.org/cgit/musl/commit/?id=7c71792e87691451f2a6b76348e83ad1889f1dcb Ok but it would fail with existing (old) prebuilt musl toolchains. Is musl 1.2.2 old enough? Best regards, Romain > > Signed-off-by: Joseph Burt > --- > package/qemu/Config.in | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/package/qemu/Config.in b/package/qemu/Config.in > index 154b98a541..d818bebb34 100644 > --- a/package/qemu/Config.in > +++ b/package/qemu/Config.in > @@ -102,16 +102,11 @@ comment "systems emulation needs a toolchain w/ dynamic library" > > config BR2_PACKAGE_QEMU_LINUX_USER > bool "Enable Linux user-land emulation" > - # Incompatible "struct sigevent" definition on musl > - depends on !BR2_TOOLCHAIN_USES_MUSL > help > Say 'y' to build Linux user-land emulators. > > # Note: bsd-user can not be build on Linux > > -comment "Linux user-land emulation needs a glibc or uClibc toolchain" > - depends on BR2_TOOLCHAIN_USES_MUSL > - > config BR2_PACKAGE_QEMU_CHOOSE_TARGETS > bool "Select individual emulator targets" > depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER From ismael at iodev.co.uk Tue Feb 6 16:28:55 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 17:28:55 +0100 Subject: [Buildroot] [RFC PATCH v3] docs/website: Add Makefile to pre-generate the website In-Reply-To: <20240206162555.31657-1-ismael@iodev.co.uk> References: <20240206162555.31657-1-ismael@iodev.co.uk> Message-ID: Ignore the commit message, it only supports the server-side includes now. From yann.morin.1998 at free.fr Tue Feb 6 16:30:37 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:30:37 +0100 Subject: [Buildroot] [RFC PATCH] docs/website: Add Makefile to pre-generate the website In-Reply-To: References: <20240206144030.18329-1-ismael@iodev.co.uk> Message-ID: Ismael, All, On 2024-02-06 16:21 +0100, Ismael Luceno spake thusly: > On 06/Feb/2024 16:08, Yann E. MORIN wrote: [--SNIP--] > > > +SRCDIR := ${CURDIR} > > Use parentheses not curly braces, to expand variables in Makefiles, > > like we do everyelse in Buildroot: $(..) > > > > (yes, both are valid, but lets be consistent throughout our code base) > OK, I'll change it for v3. I mentioned this before, according to > both GNU and BSD this is legacy syntax, and new stuff should use > curly braces... There is no such deprecation in POSIX: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html > > What is the rationale for using smu and tidy to do the deployement? > > We don't need/want to minimify the content... > smu is for having some markup support, not used for .html files; as > for tidy, it just normalises the html indentation, no minification is > going on. As we discussed IRL, there is no reason to run smu, as we have no markup currently; if we want to add markup in the future, then will be the moment to add the processing, not now. Ditto, cleanup the files with tidy, if that is even needed, should be done as a linter step to fixup the files in the tree, not at deployment time. > > [0] In case of error, we do want to exit in error and be sure this is > > caught at the Makefile level; by using gawk, you can call: > > exit 42 > That also works with any other AWK. Ah, right: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/awk.html There is however no requirement on any awk implementation for Buildroot, then just default to: AWK=awk Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Tue Feb 6 16:31:08 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 17:31:08 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <20231204231212.36450-3-kilian.zinnecker@mail.de> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-3-kilian.zinnecker@mail.de> Message-ID: <8f6baf1d-3caa-4b47-aad9-a34fa0761058@benettiengineering.com> Hi Yegor, Kilian, On 05/12/23 00:12, yegorslists--- via buildroot wrote: > From: Kilian Zinnecker > > This patch adds board support for the BeagleV-Ahead. It uses a > custom kernel for the board's SoC. As the SoC has an outdated and > currently not supported version of the RISC-V vector extension, the > vector extension is disabled. can you please provide an URL to the product page? > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 2 + > board/beaglev-ahead/genimage.cfg | 62 ++++++++++++++++ > board/beaglev-ahead/linux.fragment | 2 + > .../0001-Overwrite-bootcmd-by-force.patch | 30 ++++++++ > board/beaglev-ahead/post-image.sh | 6 ++ > board/beaglev-ahead/readme.txt | 70 +++++++++++++++++++ > board/beaglev-ahead/uEnv.txt | 4 ++ > board/beaglev-ahead/uboot.fragment | 2 + > configs/beaglev_ahead_defconfig | 44 ++++++++++++ > 9 files changed, 222 insertions(+) > create mode 100644 board/beaglev-ahead/genimage.cfg > create mode 100644 board/beaglev-ahead/linux.fragment > create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > create mode 100755 board/beaglev-ahead/post-image.sh > create mode 100644 board/beaglev-ahead/readme.txt > create mode 100644 board/beaglev-ahead/uEnv.txt > create mode 100644 board/beaglev-ahead/uboot.fragment > create mode 100644 configs/beaglev_ahead_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index 4d18bc49d4..71f672f9e6 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1839,7 +1839,9 @@ N: Kieran Bingham > F: package/libcamera/ > > N: Kilian Zinnecker > +F: board/beaglev-ahead/ > F: board/radxa/rock5b/ > +F: configs/beaglev_ahead_defconfig > F: configs/rock5b_defconfig > F: package/rockchip-rkbin/ > F: package/xuantie-bins/ > diff --git a/board/beaglev-ahead/genimage.cfg b/board/beaglev-ahead/genimage.cfg > new file mode 100644 > index 0000000000..080b169527 > --- /dev/null > +++ b/board/beaglev-ahead/genimage.cfg > @@ -0,0 +1,62 @@ > +# SD card image for BeagleV-Ahead > + > +image boot.vfat { > + vfat { > + files = { > + "fw_dynamic.bin", > + "Image", > + "light_aon_fpga.bin", > + "light-beagle.dtb", > + "light_c906_audio.bin", > + } > + > + file uEnv.txt { > + image = "uEnv.txt" > + } > + > + file overlays/BBORG_LOAD-00A2.dtbo { > + image = "overlays/BBORG_LOAD-00A2.dtbo" > + } > + > + file overlays/BBORG_RELAY-00A2.dtbo { > + image = "overlays/BBORG_RELAY-00A2.dtbo" > + } > + > + file overlays/BONE-LED_P8_03.dtbo { > + image = "overlays/BONE-LED_P8_03.dtbo" > + } > + > + file overlays/BONE-LED_P9_11.dtbo { > + image = "overlays/BONE-LED_P9_11.dtbo" > + } > + > + file overlays/BVA-MIKROBUS-0.dtbo { > + image = "overlays/BVA-MIKROBUS-0.dtbo" > + } > + } > + size = 48M > +} > + > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 2M > + } > + > + partition uboot { > + in-partition-table = "false" > + image = "u-boot-with-spl.bin" > + offset = 0 > + holes = {"(440; 1048576)"} > + } > + > + partition boot { > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + image = "rootfs.ext2" > + } > +} > + > diff --git a/board/beaglev-ahead/linux.fragment b/board/beaglev-ahead/linux.fragment > new file mode 100644 > index 0000000000..00f93f39a4 > --- /dev/null > +++ b/board/beaglev-ahead/linux.fragment > @@ -0,0 +1,2 @@ > +# CONFIG_VECTOR is not set > +# CONFIG_VECTOR_0_7 is not set > diff --git a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > new file mode 100644 > index 0000000000..32cd6fa975 > --- /dev/null > +++ b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > @@ -0,0 +1,30 @@ > +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 > +From: Kilian Zinnecker > +Date: Mon, 21 Aug 2023 23:51:59 +0200 > +Subject: [PATCH] Overwrite bootcmd by force > + > +This patch is a dirty hack: Trying to overwrite the bootcmd via the > +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted > +to some preset value and could not be changed easily. Therefore a > +hook is used to force the bootcmd to be overwritten. > + > +Signed-off-by: Kilian Zinnecker > +--- > + board/thead/light-c910/light.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c > +index 8d5478e916..1448db974e 100644 > +--- a/board/thead/light-c910/light.c > ++++ b/board/thead/light-c910/light.c > +@@ -2282,6 +2282,7 @@ int board_late_init(void) > + light_usb_boot_check(); > + do_firmware_load(); > + ap_peri_clk_disable(); > ++ run_command("load mmc 1:1 $ramdisk_addr_r uEnv.txt; env import -t $ramdisk_addr_r $filesize; run uenvcmd", 0); > + return 0; > + } > + > +-- > +2.34.1 > + > diff --git a/board/beaglev-ahead/post-image.sh b/board/beaglev-ahead/post-image.sh > new file mode 100755 > index 0000000000..9e16eeff3f > --- /dev/null > +++ b/board/beaglev-ahead/post-image.sh > @@ -0,0 +1,6 @@ > +#!/usr/bin/env bash > +set -e > + > +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ ${BINARIES_DIR} linux-custom should substituted with $(LINUX_DIR) > +cp board/beaglev-ahead/uEnv.txt ${BINARIES_DIR}/ > +support/scripts/genimage.sh -c board/beaglev-ahead/genimage.cfg > diff --git a/board/beaglev-ahead/readme.txt b/board/beaglev-ahead/readme.txt > new file mode 100644 > index 0000000000..21aceb23c9 > --- /dev/null > +++ b/board/beaglev-ahead/readme.txt > @@ -0,0 +1,70 @@ > +BeagleV-Ahead > +============== > +https://forum.beagleboard.org/c/beaglev/ > + > +Build: > +====== > + $ make beaglev_ahead_defconfig > + $ make > + > +Files created in output directory > +================================= > + > +output/images > +. > +??? Image > +??? boot.vfat > +??? bootloader-JH7100-buildroot.bin.out > +??? ddrinit-2133-buildroot.bin.out > +??? fw_dynamic.bin > +??? fw_dynamic.elf > +??? fw_jump.bin > +??? fw_jump.elf > +??? fw_payload.bin > +??? fw_payload.elf > +??? light-beagle.dtb > +??? light_aon_fpga.bin > +??? light_c906_audio.bin > +??? overlays > +??? rootfs.ext2 > +??? rootfs.ext4 > +??? rootfs.tar > +??? sdcard.img > +??? u-boot-with-spl.bin > +??? u-boot.bin > +??? uEnv.txt > + > +Creating bootable SD card: > +========================== > + > +Simply invoke (as root) > + > +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync > + > +Where X is your SD card device. > + > +Booting: > +======== > + > +SD card boot button: > +-------------------- > +To let the board boot from SD card, keep the "SD button" pressed during power > +up / power cycle. The button is near the SD card slot. > + > +Serial console: > +--------------- > +The BeagleV-Ahead has a "Debug" GPIO header. Its layout can be seen here: > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/02-quick-start.html#access-uart-debug-console > + > +Note, that there are reported issues with some uart interface cables/dongles: > +https://forum.beagleboard.org/t/beaglev-ahead-debug-terminal-problems/35331 > + > +Baudrate for this board is 115200. > + > +Login: > +------ > +Enter 'root' as login user, and the prompt is ready. > + > +wiki link: > +---------- > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/index.html > diff --git a/board/beaglev-ahead/uEnv.txt b/board/beaglev-ahead/uEnv.txt > new file mode 100644 > index 0000000000..7e98ae5f81 > --- /dev/null > +++ b/board/beaglev-ahead/uEnv.txt > @@ -0,0 +1,4 @@ > +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} > +uenvcmd=fatload mmc 1:1 ${kernel_addr_r} Image; fatload mmc 1:1 ${fdt_addr_r} light-beagle.dtb > +bootargs=root=/dev/mmcblk1p2 rootfstype=ext4 rootwait ro console=ttyS0,115200 earlycon clk_ignore_unused net.ifnames=0 > + > diff --git a/board/beaglev-ahead/uboot.fragment b/board/beaglev-ahead/uboot.fragment > new file mode 100644 > index 0000000000..1f51cef106 > --- /dev/null > +++ b/board/beaglev-ahead/uboot.fragment > @@ -0,0 +1,2 @@ > +CONFIG_LEGACY_IMAGE_FORMAT=y > +CONFIG_AUTOBOOT=y > diff --git a/configs/beaglev_ahead_defconfig b/configs/beaglev_ahead_defconfig > new file mode 100644 > index 0000000000..4b349cc6f9 > --- /dev/null > +++ b/configs/beaglev_ahead_defconfig > @@ -0,0 +1,44 @@ > +BR2_riscv=y > +BR2_riscv_custom=y > +BR2_RISCV_ISA_CUSTOM_RVM=y > +BR2_RISCV_ISA_CUSTOM_RVA=y > +BR2_RISCV_ISA_CUSTOM_RVF=y > +BR2_RISCV_ISA_CUSTOM_RVD=y > +BR2_RISCV_ISA_CUSTOM_RVC=y With commit cbd91e89e43d600172c62fd1cbd33aa74d0a851a all "_CUSTOM" have been dropped, so can you please replace all the: BR2_RISCV_ISA_CUSTOM_* occurences with: BR2_RISCV_ISA_* ? > +BR2_GCC_VERSION_13_X=y I think there is a reason you force using gcc 13, can you describe it in the commit log and here? > +BR2_GLOBAL_PATCH_DIR="board/beaglev-ahead/patches" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglev-ahead/post-image.sh" > +BR2_TARGET_GENERIC_HOSTNAME="BeagleV-Ahead" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the BeagleV-Ahead" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/linux/archive/refs/heads/beaglev-v5.10.113-1.1.2-ubuntu.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="beaglev" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/light-beagle" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/linux.fragment" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_BEAGLEV_DDRINIT=y > +BR2_TARGET_BEAGLEV_SECONDBOOT=y > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-opensbi/archive/refs/heads/0.9-1.1.2-ubuntu.tar.gz" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-u-boot/archive/refs/heads/beaglev-v2020.01-1.1.2-ubuntu.tar.gz" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="light_beagle" > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragment" > +BR2_TARGET_UBOOT_FORMAT_BIN=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" Here you need to add: BR2_PACKAGE_HOST_DOSFSTOOLS=y otherwise it fails to build under buildroot/utils/docker-run > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_XUANTIE_BINS=y After enabling BR2_RISCV_ISA_ options it builds successfully using buildroot/utils/docker-run Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Tue Feb 6 16:31:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:31:43 +0100 Subject: [Buildroot] [git commit] boot/arm-trusted-firmware: change BR_NO_CHECK_HASH_FOR logic Message-ID: <20240206163157.A9D6487135@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6ab9328e13c6c9a1538b4a33824525a990b623d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, arm-trusted-firmware checks the hash only if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION=y. As we're about to introduce other version options for which the hash checking is needed, let's reverse the logic, and instead ignore hash checking if we're using a custom version or custom git or custom tarball. Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 7f9c896387..89cdf48c70 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -25,7 +25,7 @@ ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif endif -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) endif From thomas.petazzoni at bootlin.com Tue Feb 6 16:31:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:31:45 +0100 Subject: [Buildroot] [git commit] configs/stm32mp157a_dk1_defconfig: update arm-trusted-firmware to lts-v2.8.13 Message-ID: <20240206163157.C36F987137@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5367c08162aea89f0b1140d80a134ce67d0252d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The assumption is that updates to the stable branch should not break anything, so we use the latest LTS rather than a specific version. Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- configs/stm32mp157a_dk1_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index 3122c9647a..aed6cfad34 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -27,8 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y From thomas.petazzoni at bootlin.com Tue Feb 6 16:31:46 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:31:46 +0100 Subject: [Buildroot] [git commit] configs/stm32mp157c_dk2_defconfig: update arm-trusted-firmware to lts-v2.8.13 Message-ID: <20240206163157.D460287138@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81724d15cdaded0b40cd76f1736002fc6fef2554 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The assumption is that updates to the stable branch should not break anything, so we use the latest LTS rather than a specific version. Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- configs/stm32mp157c_dk2_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index 7472be38bb..c48705b2fb 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -27,8 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y From thomas.petazzoni at bootlin.com Tue Feb 6 16:31:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:31:44 +0100 Subject: [Buildroot] [git commit] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 Message-ID: <20240206163157.B64DD87136@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a310666e06c9c5edd6879d32295c63b7851c817 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as found in v2.8 patch dir has already been applied in lts-v2.8.13 Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has been included as 0001-build-tools-avoid-unnecessary-link.patch for lts-v2.8.13 Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 6 ++ .../arm-trusted-firmware/arm-trusted-firmware.hash | 1 + .../0001-build-tools-avoid-unnecessary-link.patch | 77 ++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index c65f4aaba2..2fe3dd1146 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.10" +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION + bool "latest lts-v2.8.x" + help + Select the latest LTS v2.8.x version available + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION bool "Custom version" help @@ -43,6 +48,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string default "v2.10" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "lts-v2.8.13" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index c63e9d30b0..73ab431b9f 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,4 @@ # Locally calculated sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 e55ae7105c996b60f748b2eb6adeaf5ac8946425e1d4294ecc1c56aebf435274 arm-trusted-firmware-lts-v2.8.13.tar.gz sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 0000000000..9e0ea74248 --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehl?? +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + From thomas.petazzoni at bootlin.com Tue Feb 6 16:38:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:38:01 +0100 Subject: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 In-Reply-To: <20231219121508.1695768-5-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-5-marleen.vos@mind.be> Message-ID: <20240206173801.02d805c1@windsurf> Hello Marleen, On Tue, 19 Dec 2023 13:15:05 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as > found in v2.8 patch dir has already been applied in lts-v2.8.13 > Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has > been included as 0001-build-tools-avoid-unnecessary-link.patch for > lts-v2.8.13 > > Signed-off-by: Marleen Vos Thanks for the good arguments from Arnout, we got convinced and applied your patch to master, with a few changes, see below. > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION ^^^ we dropped the "v" from here > sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz > +sha256 e55ae7105c996b60f748b2eb6adeaf5ac8946425e1d4294ecc1c56aebf435274 trusted-firmware-a-lts-v2.8.13.tar.gz We were surprised by the files having different base names here. Turns out the hash of trusted-firmware-a-lts-v2.8.13.tar.gz was in fact never checked, which is why you didn't release that trusted-firmware-a-lts-v2.8.13.tar.gz was an incorrect file name. So we added a preliminary commit to make sure that this hash will be checked, and fixed the file name. See: https://gitlab.com/buildroot.org/buildroot/-/commit/c6ab9328e13c6c9a1538b4a33824525a990b623d https://gitlab.com/buildroot.org/buildroot/-/commit/2a310666e06c9c5edd6879d32295c63b7851c817 Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 16:38:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:38:17 +0100 Subject: [Buildroot] [PATCH 5/7] configs/stm32mp157a_dk1_defconfig: update arm-trusted-firmware to lts-v2.8.13 In-Reply-To: <20231219121508.1695768-6-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-6-marleen.vos@mind.be> Message-ID: <20240206173817.35dea315@windsurf> On Tue, 19 Dec 2023 13:15:06 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > The assumption is that updates to the stable branch should not break anything, > so we use the latest LTS rather than a specific version. > > Signed-off-by: Marleen Vos > --- > configs/stm32mp157a_dk1_defconfig | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Applied to master after adjusting the changes in the defconfig file to the changes we made to the option name, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 16:38:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:38:22 +0100 Subject: [Buildroot] [PATCH 6/7] configs/stm32mp157c_dk2_defconfig: update arm-trusted-firmware to lts-v2.8.13 In-Reply-To: <20231219121508.1695768-7-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-7-marleen.vos@mind.be> Message-ID: <20240206173822.27cbeb7b@windsurf> On Tue, 19 Dec 2023 13:15:07 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > The assumption is that updates to the stable branch should not break anything, > so we use the latest LTS rather than a specific version. > > Signed-off-by: Marleen Vos > --- > configs/stm32mp157c_dk2_defconfig | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Applied to master after adjusting the changes in the defconfig file to the changes we made to the option name, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From vfazio at xes-inc.com Tue Feb 6 16:38:58 2024 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 6 Feb 2024 16:38:58 +0000 Subject: [Buildroot] [External] - [PATCH] package/attr: fix build failure on Microblaze architecture In-Reply-To: <20240206172540.2d1ed291@windsurf> References: <20240206161152.0e178414@windsurf> <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> <20240206172540.2d1ed291@windsurf> Message-ID: Thomas, > -----Original Message----- > From: Thomas Petazzoni > Sent: Tuesday, February 6, 2024 10:26 AM > To: Vincent Fazio > Cc: Giulio Benetti ; > buildroot at buildroot.org; Fabrice Fontaine > Subject: Re: [External] - [Buildroot] [PATCH] package/attr: fix build failure on > Microblaze architecture > > Hello Vincent, > > On Tue, 6 Feb 2024 16:05:31 +0000 > Vincent Fazio wrote: > > > Would it make sense to patch GCC for Microblaze to address these at > > the compiler level instead of constantly patching the packages? > > > > I tested https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c6 back > > when we were solving this problem for xz and had no issues > > https://gcc.gnu.org/pipermail/gcc/2023-March/240834.html > > It would definitely make sense of course. Have you been able to get the > necessary changes accepted in upstream GCC ? > The mailing list conversation died out very quickly, but I can try to submit the patch for this specific fixup. I didn't feel comfortable with migrating all of Microblaze to elfos.h as that got very nasty, very quickly and the only change we (Buildroot) need is the `ASM_OUTPUT_SYMVER_DIRECTIVE` macro. > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel > engineering and training https://bootlin.com From peter at korsgaard.com Tue Feb 6 16:50:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 17:50:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.13.0 In-Reply-To: <20240205065335.22493-1-jubalh@iodoru.org> (Michael Vetter's message of "Mon, 5 Feb 2024 07:53:35 +0100") References: <20240205065335.22493-1-jubalh@iodoru.org> Message-ID: <878r3x7d12.fsf@48ers.dk> >>>>> "Michael" == Michael Vetter writes: > Signed-off-by: Michael Vetter Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 16:48:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 17:48:53 +0100 Subject: [Buildroot] [git commit] package/libstrophe: bump to version 0.13.0 Message-ID: <20240206165036.74EE48713A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4b9ed4792cfc63366afe6f75ee051a105b6e8b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Vetter Signed-off-by: Peter Korsgaard --- package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index a6a529eb6c..e284e8cca6 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d82e9e8585b8fc68fb91791377fbfb0051b98259a0ec64cf31c8a09bb7e2621e libstrophe-0.12.3.tar.xz +sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index ad0860ad30..257593bbec 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.12.3 +LIBSTROPHE_VERSION = 0.13.0 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Tue Feb 6 16:51:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 17:51:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.22.0 In-Reply-To: <20240131201747.23175-1-peter.macleod.thompson@gmail.com> (Peter Thompson's message of "Wed, 31 Jan 2024 13:17:47 -0700") References: <20240131201747.23175-1-peter.macleod.thompson@gmail.com> Message-ID: <874jel7cys.fsf@48ers.dk> >>>>> "Peter" == Peter Thompson writes: > From: Peter Macleod Thompson > Update LICENSE.txt hash for change in copyright year to 2024 > Signed-off-by: Peter Macleod Thompson Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 16:50:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 17:50:52 +0100 Subject: [Buildroot] [git commit] package/sdl2_ttf: bump version to 2.22.0 Message-ID: <20240206165230.711F587141@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99186e42f0243c33666a188c6a1e2bead50e8b97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update LICENSE.txt hash for change in copyright year to 2024 Signed-off-by: Peter Macleod Thompson Signed-off-by: Peter Korsgaard --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index f43ec790fd..7693aeba6b 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9dc71ed93487521b107a2c4a9ca6bf43fb62f6bddd5c26b055e6b91418a22053 SDL2_ttf-2.20.2.tar.gz -sha256 1852c8549e3d154687197d46abababd3e8faae035f19991b2ca850fa3a43ad57 LICENSE.txt +sha256 d48cbd1ce475b9e178206bf3b72d56b66d84d44f64ac05803328396234d67723 SDL2_ttf-2.22.0.tar.gz +sha256 a0e8ce06504966e45088ee1cc7583cc8af9aac615d4cf56d47d847da9cb15139 LICENSE.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index c2c4b660f8..f4f293cec1 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.20.2 +SDL2_TTF_VERSION = 2.22.0 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib From giulio.benetti at benettiengineering.com Tue Feb 6 16:56:06 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 17:56:06 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/xuantie-bins: new package In-Reply-To: <20231204231212.36450-2-kilian.zinnecker@mail.de> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-2-kilian.zinnecker@mail.de> Message-ID: <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> Hi Yegor, Kilian, On 05/12/23 00:12, yegorslists--- via buildroot wrote: > From: Kilian Zinnecker > > This patch adds a package for Xuantie binary blobs. These binaries > are needed for the BeagleV-Ahead. > > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 5 +++-- > package/Config.in | 1 + > package/xuantie-bins/Config.in | 6 ++++++ > package/xuantie-bins/xuantie-bins.hash | 1 + > package/xuantie-bins/xuantie-bins.mk | 27 ++++++++++++++++++++++++++ > 5 files changed, 38 insertions(+), 2 deletions(-) > create mode 100644 package/xuantie-bins/Config.in > create mode 100644 package/xuantie-bins/xuantie-bins.hash > create mode 100644 package/xuantie-bins/xuantie-bins.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index f504ca8d36..4d18bc49d4 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1839,9 +1839,10 @@ N: Kieran Bingham > F: package/libcamera/ > > N: Kilian Zinnecker > -F: package/rockchip-rkbin/ > -F: configs/rock5b_defconfig > F: board/radxa/rock5b/ > +F: configs/rock5b_defconfig can you please provide a separate patch to alphabetize? > +F: package/rockchip-rkbin/ > +F: package/xuantie-bins/ > > N: Klaus Heinrich Kiwi > F: package/wqy-zenhei/ > diff --git a/package/Config.in b/package/Config.in > index fcc09b07c4..3772e2ac81 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -653,6 +653,7 @@ endmenu > source "package/wipe/Config.in" > source "package/xorriso/Config.in" > source "package/xr819-xradio/Config.in" > + source "package/xuantie-bins/Config.in" > endmenu > > menu "Interpreter languages and scripting" > diff --git a/package/xuantie-bins/Config.in b/package/xuantie-bins/Config.in > new file mode 100644 > index 0000000000..a04497ce6b > --- /dev/null > +++ b/package/xuantie-bins/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_XUANTIE_BINS > + bool "xuantie-bins" > + depends on BR2_riscv > + help > + This package provides binary blobs, needed for the > + BeagleV-Ahead's SoC (TH1520). Can you please describe a bit what those binaries are meant for? > diff --git a/package/xuantie-bins/xuantie-bins.hash b/package/xuantie-bins/xuantie-bins.hash > new file mode 100644 > index 0000000000..4d1ec297c9 > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.hash > @@ -0,0 +1 @@ > +sha256 608e9fec79823996004f65ba692a76d741307b0de23552d147ad1b567e7054dc xuantie-bins-0a2e02bb53758cc12448d8670e65c854528a96b4-br1.tar.gz > diff --git a/package/xuantie-bins/xuantie-bins.mk b/package/xuantie-bins/xuantie-bins.mk > new file mode 100644 > index 0000000000..3a5611cf36 > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.mk > @@ -0,0 +1,27 @@ > +################################################################################ > +# > +# xuantie-bins > +# > +################################################################################ > + > +XUANTIE_BINS_VERSION = 0a2e02bb53758cc12448d8670e65c854528a96b4 > +XUANTIE_BINS_SITE = https://github.com/beagleboard/xuantie-ubuntu.git > +XUANTIE_BINS_SITE_METHOD = git > +XUANTIE_BINS_LICENSE = PROPRIETARY > + > +XUANTIE_BINS_INSTALL_IMAGES = YES > +XUANTIE_BINS_INSTALL_TARGET = NO > + > +XUANTIE_BINS_FPGA_BIN_FILENAME = "bins/light_aon_fpga.bin" > +XUANTIE_BINS_AUDIO_BIN_FILENAME = "bins/light_c906_audio.bin" > + > +define XUANTIE_BINS_INSTALL_IMAGES_CMDS > + $(foreach f, \ > + $(XUANTIE_BINS_FPGA_BIN_FILENAME) \ > + $(XUANTIE_BINS_AUDIO_BIN_FILENAME) \ > + , \ > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(f) > + ) > +endef Being only 2 files to be installed I'd prefer to see 2 lines instead of foreach loop. Can you please change it accordingly? Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From arnout at mind.be Tue Feb 6 16:57:09 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 17:57:09 +0100 Subject: [Buildroot] [PATCH] support/pkg-stats: list packages from external trees. In-Reply-To: <20221102103428.82414-1-juan.carrano@ebee.berlin> References: <20221102103428.82414-1-juan.carrano@ebee.berlin> Message-ID: <18a19685-2383-4f27-81d5-b4db3a126b53@mind.be> Hi Juan, On 02/11/2022 11:34, Juan Carrano wrote: > Search the external trees for package files and add them to the list. > The list of directories walked and excluded are the same as for the main > tree, and should work out of the box if the user sticks to the directory > structure suggested in the manual. > > Two additional properties were added to the Package class, the tree name and > the path. For consistency and to simplify the code, packages in the main tree > are marked as coming from "BR2". > > The HTML output has a new column listing the external name (or "BR2") and the > json output has a new property "tree". > > Signed-off-by: Juan Carrano After more than a year, finally applied to master. There's really no excuse that it takes so long, other than that the maintainers are a bit overloaded. I made a few minor changes. - fix flake8 error "'itertools' imported but unused"; - use str.split instead of str.partition; - use BR2_EXTERNAL_BUILDROOT_PATH instead of BR2_EXTERNAL_BR2_PATH; - remove pkgdir variable, instead use self.pkgdir. Regards, Arnout > --- > support/scripts/pkg-stats | 90 ++++++++++++++++++++++++++------------- > 1 file changed, 60 insertions(+), 30 deletions(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index 3248e3678d..2dfcc54d57 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -23,7 +23,7 @@ import asyncio > import datetime > import fnmatch > import os > -from collections import defaultdict > +from collections import defaultdict, namedtuple > import re > import subprocess > import json > @@ -32,6 +32,7 @@ import time > import gzip > import xml.etree.ElementTree > import requests > +import itertools > > brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")) > > @@ -77,6 +78,19 @@ def get_defconfig_list(): > ] > > > +Br2Tree = namedtuple("Br2Tree", ["name", "path"]) > + > + > +def get_trees(): > + raw_variables = subprocess.check_output(["make", "--no-print-directory", "-s", > + "BR2_HAVE_DOT_CONFIG=y", "printvars", > + "VARS=BR2_EXTERNAL_NAMES BR2_EXTERNAL_%_PATH"]) > + variables = dict(line.partition("=")[0::2] for line in raw_variables.decode().split("\n") if line) > + variables["BR2_EXTERNAL_BR2_PATH"] = brpath > + externals = ["BR2", *variables["BR2_EXTERNAL_NAMES"].split()] > + return [Br2Tree(name, os.path.normpath(variables[f"BR2_EXTERNAL_{name}_PATH"])) for name in externals] > + > + > class Package: > all_licenses = dict() > all_license_files = list() > @@ -89,7 +103,9 @@ class Package: > status_checks = ['cve', 'developers', 'hash', 'license', > 'license-files', 'patches', 'pkg-check', 'url', 'version'] > > - def __init__(self, name, path): > + def __init__(self, tree, name, path): > + self.tree = tree.name > + self.tree_path = tree.path > self.name = name > self.path = path > self.pkg_path = os.path.dirname(path) > @@ -118,12 +134,24 @@ class Package: > def pkgvar(self): > return self.name.upper().replace("-", "_") > > + @property > + def pkgdir(self): > + return os.path.join(self.tree_path, self.pkg_path) > + > + @property > + def pkgfile(self): > + return os.path.join(self.tree_path, self.path) > + > + @property > + def hashpath(self): > + return self.pkgfile.replace(".mk", ".hash") > + > def set_url(self): > """ > Fills in the .url field > """ > self.status['url'] = ("warning", "no Config.in") > - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) > + pkgdir = self.pkgdir > for filename in os.listdir(pkgdir): > if fnmatch.fnmatch(filename, 'Config.*'): > fp = open(os.path.join(pkgdir, filename), "r") > @@ -172,7 +200,7 @@ class Package: > keep_target = True > > self.infras = list() > - with open(os.path.join(brpath, self.path), 'r') as f: > + with open(self.pkgfile, 'r') as f: > lines = f.readlines() > for line in lines: > match = INFRA_RE.match(line) > @@ -211,8 +239,7 @@ class Package: > self.status['hash-license'] = ("na", "no valid package infra") > return > > - hashpath = self.path.replace(".mk", ".hash") > - if os.path.exists(os.path.join(brpath, hashpath)): > + if os.path.exists(self.hashpath): > self.status['hash'] = ("ok", "found") > else: > self.status['hash'] = ("error", "missing") > @@ -225,8 +252,7 @@ class Package: > self.status['patches'] = ("na", "no valid package infra") > return > > - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) > - for subdir, _, _ in os.walk(pkgdir): > + for subdir, _, _ in os.walk(self.pkgdir): > self.patch_files = fnmatch.filter(os.listdir(subdir), '*.patch') > > if self.patch_count == 0: > @@ -268,9 +294,8 @@ class Package: > Fills in the .warnings and .status['pkg-check'] fields > """ > cmd = [os.path.join(brpath, "utils/check-package")] > - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) > self.status['pkg-check'] = ("error", "Missing") > - for root, dirs, files in os.walk(pkgdir): > + for root, dirs, files in os.walk(self.pkgdir): > for f in files: > if f.endswith(".mk") or f.endswith(".hash") or f == "Config.in" or f == "Config.in.host": > cmd.append(os.path.join(root, f)) > @@ -328,7 +353,7 @@ class Package: > self.is_status_ok('license-files'), self.status['hash'], self.patch_count) > > > -def get_pkglist(npackages, package_list): > +def get_pkglist(trees, npackages, package_list): > """ > Builds the list of Buildroot packages, returning a list of Package > objects. Only the .name and .path fields of the Package object are > @@ -358,8 +383,8 @@ def get_pkglist(npackages, package_list): > "toolchain/toolchain-wrapper.mk"] > packages = list() > count = 0 > - for root, dirs, files in os.walk(brpath): > - root = os.path.relpath(root, brpath) > + for br_tree, root, dirs, files in ((tree, *rdf) for tree in trees for rdf in os.walk(tree.path)): > + root = os.path.relpath(root, br_tree.path) > rootdir = root.split("/") > if len(rootdir) < 1: > continue > @@ -380,7 +405,7 @@ def get_pkglist(npackages, package_list): > continue > if skip: > continue > - p = Package(pkgname, pkgpath) > + p = Package(br_tree, pkgname, pkgpath) > packages.append(p) > count += 1 > if npackages and count == npackages: > @@ -854,7 +879,7 @@ function expandField(fieldId){ > #package-grid, #results-grid { > display: grid; > grid-gap: 2px; > - grid-template-columns: 1fr repeat(12, min-content); > + grid-template-columns: min-content 1fr repeat(12, min-content); > } > #results-grid { > grid-template-columns: 3fr 1fr; > @@ -920,6 +945,8 @@ def boolean_str(b): > > def dump_html_pkg(f, pkg): > pkg_css_class = pkg.path.replace("/", "_")[:-3] > + f.write(f'
+ class="tree data _{pkg_css_class}">{pkg.tree}
\n') > f.write(f'
class="package data _{pkg_css_class}">{pkg.path}
\n') > # Patch count > @@ -1122,31 +1149,33 @@ def dump_html_pkg(f, pkg): > def dump_html_all_pkgs(f, packages): > f.write(""" >
> -
+
+ class="tree data label">Tree
> +
class="package data label">Package
> -
+
class="centered patch_count data label">Patch count
> -
+
class="centered infrastructure data label">Infrastructure
> -
+
class="centered license data label">License
> -
+
class="centered license_files data label">License files
> -
+
class="centered hash_file data label">Hash file
> -
+
class="centered current_version data label">Current version
> -
+
class="centered latest_version data label">Latest version
> -
+
class="centered warnings data label">Warnings
> -
+
class="centered upstream_url data label">Upstream URL
> -
+
class="centered cves data label">CVEs
> -
+
class="centered ignored_cves data label">CVEs Ignored
> -
+
class="centered cpe_id data label">CPE ID
> """) > for pkg in sorted(packages): > @@ -1217,7 +1246,7 @@ def dump_html(packages, stats, date, commit, output): > def dump_json(packages, defconfigs, stats, date, commit, output): > # Format packages as a dictionnary instead of a list > # Exclude local field that does not contains real date > - excluded_fields = ['url_worker', 'name'] > + excluded_fields = ['url_worker', 'name', 'tree_path'] > pkgs = { > pkg.name: { > k: v > @@ -1305,7 +1334,8 @@ def __main__(): > 'rev-parse', > 'HEAD']).splitlines()[0].decode() > print("Build package list ...") > - packages = get_pkglist(args.npackages, package_list) > + all_trees = get_trees() > + packages = get_pkglist(all_trees, args.npackages, package_list) > print("Getting developers ...") > developers = parse_developers() > print("Build defconfig list ...") From thomas.petazzoni at bootlin.com Tue Feb 6 16:57:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:57:18 +0100 Subject: [Buildroot] [git commit] package/binutils-bare-metal: new package Message-ID: <20240206165731.4216487178@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11b439ce1bd28506051fff14646f8bbdbbbe58d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds a new package for building binutils for a bare-metal toolchain. The cpu architecture is defined by a toolchain-bare-metal virtual package. While any cpu architecture could be used, the default configuration will be a Xilinx microblaze little endian architecture, so that buildroot will be able to build the microblaze firmware applications for zynqmp and versal. In order to build the zynqmp pmufw and versal plm applications without error, binutils version 2.41 or higher is required. Signed-off-by: Neal Frager Signed-off-by: Ibai Erkiaga Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ .../binutils-bare-metal/binutils-bare-metal.hash | 1 + package/binutils-bare-metal/binutils-bare-metal.mk | 33 ++++++++++++++++++++++ package/binutils/binutils.hash | 1 + 4 files changed, 37 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5cc4d37aef..9f93746015 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1386,6 +1386,7 @@ N: Ian Haylock F: package/python-rpi-gpio/ N: Ibai Erkiaga +F: package/binutils-bare-metal/ F: toolchain/toolchain-bare-metal-buildroot/ N: Ignacy Gaw??dzki @@ -2269,6 +2270,7 @@ F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig F: configs/zynqmp_zcu104_defconfig F: configs/zynqmp_zcu106_defconfig +F: package/binutils-bare-metal/ F: package/bootgen/ F: package/versal-firmware/ F: toolchain/toolchain-bare-metal-buildroot/ diff --git a/package/binutils-bare-metal/binutils-bare-metal.hash b/package/binutils-bare-metal/binutils-bare-metal.hash new file mode 120000 index 0000000000..e0655d3af3 --- /dev/null +++ b/package/binutils-bare-metal/binutils-bare-metal.hash @@ -0,0 +1 @@ +../binutils/binutils.hash \ No newline at end of file diff --git a/package/binutils-bare-metal/binutils-bare-metal.mk b/package/binutils-bare-metal/binutils-bare-metal.mk new file mode 100644 index 0000000000..d55c2d081e --- /dev/null +++ b/package/binutils-bare-metal/binutils-bare-metal.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# binutils-bare-metal +# +################################################################################ + +HOST_BINUTILS_BARE_METAL_VERSION = 2.42 +HOST_BINUTILS_BARE_METAL_SITE = $(BR2_GNU_MIRROR)/binutils +HOST_BINUTILS_BARE_METAL_SOURCE = binutils-$(HOST_BINUTILS_BARE_METAL_VERSION).tar.xz + +HOST_BINUTILS_BARE_METAL_LICENSE = GPL-3.0+, libiberty LGPL-2.1+ +HOST_BINUTILS_BARE_METAL_LICENSE_FILES = COPYING3 COPYING.LIB +HOST_BINUTILS_BARE_METAL_CPE_ID_VENDOR = gnu + +HOST_BINUTILS_BARE_METAL_DEPENDENCIES = host-zlib + +# Don't build documentation. It takes up extra space / build time, +# and sometimes needs specific makeinfo versions to work +HOST_BINUTILS_BARE_METAL_CONF_ENV += MAKEINFO=true +HOST_BINUTILS_BARE_METAL_MAKE_OPTS += MAKEINFO=true +HOST_BINUTILS_BARE_METAL_INSTALL_OPTS += MAKEINFO=true install + +HOST_BINUTILS_BARE_METAL_CONF_OPTS = \ + --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \ + --disable-gprof \ + --disable-shared \ + --enable-lto \ + --enable-static \ + --disable-initfini-array \ + --disable-multilib \ + --disable-werror + +$(eval $(host-autotools-package)) diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 519a0ca887..e4c6a0b0b6 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -2,6 +2,7 @@ sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz sha512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 binutils-2.40.tar.xz sha512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 binutils-2.41.tar.xz +sha512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6 binutils-2.42.tar.xz # Locally calculated (fetched from Github) sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d binutils-gdb-arc-2023.09-release.tar.gz From thomas.petazzoni at bootlin.com Tue Feb 6 16:57:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:57:17 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-bare-metal-buildroot: new toolchain Message-ID: <20240206165731.2947487177@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7befbaaea74ff282b4b8ec5b3c3ad52be0d99937 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds a new virtual package for adding a bare-metal toolchain to Buildroot. For now, it depends on nothing, so it will not actually build anything, but it defines some options that will be needed by the various packages that will be part of this toolchain build process. Signed-off-by: Neal Frager Signed-off-by: Ibai Erkiaga Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ toolchain/Config.in | 10 ++++++++++ toolchain/toolchain-bare-metal-buildroot/Config.in | 9 +++++++++ .../toolchain-bare-metal-buildroot.mk | 12 ++++++++++++ utils/checksymbolslib/br.py | 3 +++ 5 files changed, 38 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 94952f72a8..5cc4d37aef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1385,6 +1385,9 @@ F: package/mrp/ N: Ian Haylock F: package/python-rpi-gpio/ +N: Ibai Erkiaga +F: toolchain/toolchain-bare-metal-buildroot/ + N: Ignacy Gaw??dzki F: package/angularjs/ @@ -2268,6 +2271,7 @@ F: configs/zynqmp_zcu104_defconfig F: configs/zynqmp_zcu106_defconfig F: package/bootgen/ F: package/versal-firmware/ +F: toolchain/toolchain-bare-metal-buildroot/ N: Nicola Di Lieto F: package/uacme/ diff --git a/toolchain/Config.in b/toolchain/Config.in index 34e0ae2c5f..64a07f91dc 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -923,4 +923,14 @@ config BR2_TOOLCHAIN_HAS_LIBQUADMATH default y if BR2_i386 || BR2_x86_64 default y if BR2_POWERPC_CPU_HAS_VSX +comment "Bare metal toolchain" + +config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT + bool "Build a bare metal toolchain" + help + Select if you need a bare-metal toolchain for building + platform specific firmware images. + +source "toolchain/toolchain-bare-metal-buildroot/Config.in" + endmenu diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in new file mode 100644 index 0000000000..3c99c7e1b5 --- /dev/null +++ b/toolchain/toolchain-bare-metal-buildroot/Config.in @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_BARE_METAL_BUILDROOT + +config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH + string "architecture tuple" + help + This option allows to define the architecture tuple for the + bare-metal toolchain. + +endif # BR2_TOOLCHAIN_BARE_METAL_BUILDROOT diff --git a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk new file mode 100644 index 0000000000..4dc36ef3f3 --- /dev/null +++ b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# toolchain-bare-metal-buildroot +# +################################################################################ + +TOOLCHAIN_BARE_METAL_BUILDROOT_DEPENDENCIES = +TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE = $(call qstrip,$(BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH)) +TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT = $(HOST_DIR)/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/sysroot +TOOLCHAIN_BARE_METAL_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO + +$(eval $(virtual-package)) diff --git a/utils/checksymbolslib/br.py b/utils/checksymbolslib/br.py index 846a609829..f9dc336e64 100644 --- a/utils/checksymbolslib/br.py +++ b/utils/checksymbolslib/br.py @@ -36,11 +36,14 @@ symbols_defined_only_for_barebox_variant = [ ] # toolchain/toolchain/toolchain.mk # toolchain/toolchain-buildroot/toolchain-buildroot.mk +# toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk symbols_not_defined_for_fake_virtual_packages = [ 'BR2_PACKAGE_HAS_TOOLCHAIN', 'BR2_PACKAGE_HAS_TOOLCHAIN_BUILDROOT', + 'BR2_PACKAGE_HAS_TOOLCHAIN_BARE_METAL_BUILDROOT', 'BR2_PACKAGE_PROVIDES_TOOLCHAIN', 'BR2_PACKAGE_PROVIDES_TOOLCHAIN_BUILDROOT', + 'BR2_PACKAGE_PROVIDES_TOOLCHAIN_BARE_METAL_BUILDROOT', ] # fs/common.mk suffixes_not_defined_for_all_rootfs_types = [ From thomas.petazzoni at bootlin.com Tue Feb 6 16:57:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:57:19 +0100 Subject: [Buildroot] [git commit] package/gcc-bare-metal: new package Message-ID: <20240206165731.4FD9687179@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1bfab23d0cc024425a0b6d69a8cd6e7c6b50432 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds a new package for building gcc for a bare-metal toolchain. The cpu architecture is defined by a toolchain-bare-metal virtual package. While any cpu architecture could be used, the default configuration will be a Xilinx microblaze little endian architecture, so that buildroot will be able to build the microblaze firmware applications for zynqmp and versal. Signed-off-by: Neal Frager Signed-off-by: Ibai Erkiaga Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/gcc-bare-metal/13.2.0 | 1 + package/gcc-bare-metal/gcc-bare-metal.hash | 1 + package/gcc-bare-metal/gcc-bare-metal.mk | 61 ++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9f93746015..0a6e5a9c06 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1387,6 +1387,7 @@ F: package/python-rpi-gpio/ N: Ibai Erkiaga F: package/binutils-bare-metal/ +F: package/gcc-bare-metal/ F: toolchain/toolchain-bare-metal-buildroot/ N: Ignacy Gaw??dzki @@ -2272,6 +2273,7 @@ F: configs/zynqmp_zcu104_defconfig F: configs/zynqmp_zcu106_defconfig F: package/binutils-bare-metal/ F: package/bootgen/ +F: package/gcc-bare-metal/ F: package/versal-firmware/ F: toolchain/toolchain-bare-metal-buildroot/ diff --git a/package/gcc-bare-metal/13.2.0 b/package/gcc-bare-metal/13.2.0 new file mode 120000 index 0000000000..b7a75dc7dd --- /dev/null +++ b/package/gcc-bare-metal/13.2.0 @@ -0,0 +1 @@ +../gcc/13.2.0/ \ No newline at end of file diff --git a/package/gcc-bare-metal/gcc-bare-metal.hash b/package/gcc-bare-metal/gcc-bare-metal.hash new file mode 120000 index 0000000000..d417b0dc77 --- /dev/null +++ b/package/gcc-bare-metal/gcc-bare-metal.hash @@ -0,0 +1 @@ +../gcc/gcc.hash \ No newline at end of file diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk new file mode 100644 index 0000000000..f391f094fe --- /dev/null +++ b/package/gcc-bare-metal/gcc-bare-metal.mk @@ -0,0 +1,61 @@ +################################################################################ +# +# gcc-bare-metal +# +################################################################################ + +HOST_GCC_BARE_METAL_VERSION = 13.2.0 +HOST_GCC_BARE_METAL_SITE = \ + https://ftp.gnu.org/gnu/gcc/gcc-$(HOST_GCC_BARE_METAL_VERSION) +HOST_GCC_BARE_METAL_SOURCE = gcc-$(HOST_GCC_BARE_METAL_VERSION).tar.xz + +HOST_GCC_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 +HOST_GCC_BARE_METAL_LICENSE_FILES = COPYING COPYING3 COPYING.LIB COPYING3.LIB + +HOST_GCC_BARE_METAL_DEPENDENCIES = \ + host-binutils-bare-metal \ + host-gmp \ + host-mpc \ + host-mpfr \ + host-isl + +# gcc doesn't support in-tree build, so we create a 'build' +# subdirectory in the gcc sources, and build from there. +define GCC_BARE_METAL_CONFIGURE_SYMLINK + mkdir -p $(@D)/build + ln -sf ../configure $(@D)/build/configure +endef + +HOST_GCC_BARE_METAL_PRE_CONFIGURE_HOOKS += GCC_BARE_METAL_CONFIGURE_SYMLINK +HOST_GCC_BARE_METAL_SUBDIR = build + +HOST_GCC_BARE_METAL_MAKE_OPTS = \ + $(HOST_GCC_COMMON_MAKE_OPTS) \ + all-gcc \ + all-target-libgcc + +HOST_GCC_BARE_METAL_INSTALL_OPTS = install-gcc install-target-libgcc + +HOST_GCC_BARE_METAL_CONF_OPTS = \ + --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \ + --disable-initfini_array \ + --disable-__cxa_atexit \ + --disable-libstdcxx-pch \ + --with-newlib \ + --disable-threads \ + --enable-plugins \ + --with-gnu-as \ + --disable-libitm \ + --without-long-double-128 \ + --without-headers \ + --enable-languages=c \ + --disable-multilib \ + --with-gmp=$(HOST_DIR) \ + --with-mpc=$(HOST_DIR) \ + --with-mpfr=$(HOST_DIR) \ + --with-isl=$(HOST_DIR) \ + --with-sysroot=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) \ + AR_FOR_TARGET=$(HOST_DIR)/bin/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)-ar \ + RANLIB_FOR_TARGET=$(HOST_DIR)/bin/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)-ranlib + +$(eval $(host-autotools-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 16:57:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:57:20 +0100 Subject: [Buildroot] [git commit] package/newlib-bare-metal: new package Message-ID: <20240206165731.5CF2087177@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b95ff658bf4859eb5cffd28cbbedd1826fad9a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds a new package for building newlib for a bare-metal toolchain. The cpu architecture is defined by a toolchain-bare-metal virtual package. While any cpu architecture could be used, the default configuration will be a Xilinx microblaze little endian architecture, so that buildroot will be able to build the microblaze firmware applications for zynqmp and versal. Signed-off-by: Neal Frager Signed-off-by: Ibai Erkiaga Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/newlib-bare-metal/Config.in | 2 + package/newlib-bare-metal/newlib-bare-metal.hash | 8 ++++ package/newlib-bare-metal/newlib-bare-metal.mk | 52 ++++++++++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0a6e5a9c06..c103bdadf8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1388,6 +1388,7 @@ F: package/python-rpi-gpio/ N: Ibai Erkiaga F: package/binutils-bare-metal/ F: package/gcc-bare-metal/ +F: package/newlib-bare-metal/ F: toolchain/toolchain-bare-metal-buildroot/ N: Ignacy Gaw??dzki @@ -2274,6 +2275,7 @@ F: configs/zynqmp_zcu106_defconfig F: package/binutils-bare-metal/ F: package/bootgen/ F: package/gcc-bare-metal/ +F: package/newlib-bare-metal/ F: package/versal-firmware/ F: toolchain/toolchain-bare-metal-buildroot/ diff --git a/package/newlib-bare-metal/Config.in b/package/newlib-bare-metal/Config.in new file mode 100644 index 0000000000..1ff3d5d8ec --- /dev/null +++ b/package/newlib-bare-metal/Config.in @@ -0,0 +1,2 @@ +config BR2_PACKAGE_NEWLIB_BARE_METAL + bool diff --git a/package/newlib-bare-metal/newlib-bare-metal.hash b/package/newlib-bare-metal/newlib-bare-metal.hash new file mode 100644 index 0000000000..f8c553cf86 --- /dev/null +++ b/package/newlib-bare-metal/newlib-bare-metal.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 0c166a39e1bf0951dfafcd68949fe0e4b6d3658081d6282f39aeefc6310f2f13 newlib-4.4.0.20231231.tar.gz + +# Hashes for license files locally calculated +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 f3b7f3e4426b1fa6f60198dae7adfedd94b77b28db2d108adc0253575011e0ff COPYING.LIBGLOSS +sha256 422aa40293093fb54fc66e692a0d68fd0b24ed5602e5d1d33ad05ba3909057e9 COPYING.NEWLIB diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk new file mode 100644 index 0000000000..452bc4da25 --- /dev/null +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# newlib-bare-metal +# +################################################################################ + +NEWLIB_BARE_METAL_VERSION = 4.4.0 +NEWLIB_BARE_METAL_SITE = ftp://sourceware.org/pub/newlib +NEWLIB_BARE_METAL_SOURCE = newlib-$(NEWLIB_BARE_METAL_VERSION).20231231.tar.gz +NEWLIB_BARE_METAL_DEPENDENCIES = host-gcc-bare-metal +NEWLIB_BARE_METAL_ADD_TOOLCHAIN_DEPENDENCY = NO +NEWLIB_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 +NEWLIB_BARE_METAL_LICENSE_FILES = \ + COPYING \ + COPYING.LIB \ + COPYING.LIBGLOSS \ + COPYING.NEWLIB + +NEWLIB_BARE_METAL_INSTALL_STAGING = YES +NEWLIB_BARE_METAL_INSTALL_TARGET = NO + +define NEWLIB_BARE_METAL_CONFIGURE_CMDS + (cd $(@D) && \ + PATH=$(BR_PATH) \ + ./configure \ + --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \ + --prefix=/usr \ + --enable-newlib-io-c99-formats \ + --enable-newlib-io-long-long \ + --enable-newlib-io-float \ + --enable-newlib-io-long-double \ + --disable-multilib \ + ) +endef + +define NEWLIB_BARE_METAL_BUILD_CMDS + PATH=$(BR_PATH) $(MAKE1) -C $(@D) +endef + +define NEWLIB_BARE_METAL_INSTALL_STAGING_CMDS + PATH=$(BR_PATH) $(MAKE1) -C $(@D) DESTDIR=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) install +endef + +define NEWLIB_BARE_METAL_FIXUP + mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/include \ + $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/include + mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/lib \ + $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/lib +endef +NEWLIB_BARE_METAL_POST_INSTALL_STAGING_HOOKS += NEWLIB_BARE_METAL_FIXUP + +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 16:57:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:57:20 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-bare-metal-buildroot: wire up newlib-bare-metal Message-ID: <20240206165731.66D1A8717B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0e7a1d3d15727a2f14db83b7c651db73f2a50f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 1 + toolchain/toolchain-bare-metal-buildroot/Config.in | 2 ++ .../toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 64a07f91dc..407a03c42e 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -927,6 +927,7 @@ comment "Bare metal toolchain" config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT bool "Build a bare metal toolchain" + select BR2_PACKAGE_NEWLIB_BARE_METAL help Select if you need a bare-metal toolchain for building platform specific firmware images. diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in index 3c99c7e1b5..6fe969357f 100644 --- a/toolchain/toolchain-bare-metal-buildroot/Config.in +++ b/toolchain/toolchain-bare-metal-buildroot/Config.in @@ -6,4 +6,6 @@ config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH This option allows to define the architecture tuple for the bare-metal toolchain. +source "package/newlib-bare-metal/Config.in" + endif # BR2_TOOLCHAIN_BARE_METAL_BUILDROOT diff --git a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk index 4dc36ef3f3..dbfe30a910 100644 --- a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk +++ b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_BARE_METAL_BUILDROOT_DEPENDENCIES = +TOOLCHAIN_BARE_METAL_BUILDROOT_DEPENDENCIES = newlib-bare-metal TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE = $(call qstrip,$(BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH)) TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT = $(HOST_DIR)/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/sysroot TOOLCHAIN_BARE_METAL_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO From buildroot at bubu1.eu Tue Feb 6 17:04:37 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 18:04:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-bitstring: add missing runtime dependency In-Reply-To: <20240206155140.2351424-2-romain.naour@smile.fr> References: <20240206155140.2351424-1-romain.naour@smile.fr> <20240206155140.2351424-2-romain.naour@smile.fr> Message-ID: Hi Romain, On 06.02.24 16:51, Romain Naour wrote: > python-bitstring require python-bitarray and python-zlib at runtime > since 4.0.1 release [1][2]. I needed to look at the version numbers 3 times, but this dependency actually got introduced in 4.1.0 :-). [1] > > python-zlib is now needed for the "Experimental support for two 8-bit > float types". Is there a reference to that somewhere? (I know, nobody documents their dependencies on internal python modules, but where is the quote from?) > > Intended to fixes (fixed locally): > https://gitlab.com/buildroot.org/buildroot/-/jobs/6104227183 (TestPythonPy3Bitstring) > https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854810 (TestPythonPy3Crossbar) This test failed for a different reason: It ran with bitstring version 4.1.2 which included a bogus python file with invalid syntax [2] which the pyc compilation step stumbles over. The version bump to 4.1.4 already solved this. [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 [2] https://github.com/scott-griffiths/bitstring/issues/293 > > gitlab-ci reports another issue at build time not reproduced locally: > > *** Error compiling '[...]/TestPythonPy3Bitstring/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... > Sorry: IndentationError: expected an indented block after function definition on line 6 (plugin_test.py, line 8) > > [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.1 > [2] https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 > > Signed-off-by: Romain Naour > Cc: James Hilliard > --- > package/python-bitstring/Config.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/python-bitstring/Config.in b/package/python-bitstring/Config.in > index 93d7682577..82d0bb29c6 100644 > --- a/package/python-bitstring/Config.in > +++ b/package/python-bitstring/Config.in > @@ -1,5 +1,7 @@ > config BR2_PACKAGE_PYTHON_BITSTRING > bool "python-bitstring" > + select BR2_PACKAGE_PYTHON_BITARRAY # runtime > + select BR2_PACKAGE_PYTHON3_ZLIB # runtime > help > Simple construction, analysis and modification of binary data. > From yann.morin.1998 at free.fr Tue Feb 6 17:03:57 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 18:03:57 +0100 Subject: [Buildroot] [git commit] docs/manual/contribute.adoc: mention sr.ht as a fallback for sending patches Message-ID: <20240206170513.2087287185@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc3d2bcb40e5cc47b4d6a3dd73fc145c1f00db50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann [yann.morin.1998 at free.fr: make it explicit it is not the official way] Signed-off-by: Yann E. MORIN --- docs/manual/contribute.adoc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 684e9f4809..6ff6c15314 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -375,6 +375,15 @@ If you do not use +git send-email+, make sure posted *patches are not line-wrapped*, otherwise they cannot easily be applied. In such a case, fix your e-mail client, or better yet, learn to use +git send-email+. +https://sr.ht also has a light-weight UI for +https://man.sr.ht/git.sr.ht/#sending-patches-upstream[preparing patchseries] +and can also send out the patches for you. There are a few drawbacks to +this, as you cannot edit your patches' status in Patchwork and you +currently can't edit your display name with which the match emails are +sent out but it is an option if you cannot get git send-email to work +with your mail provider (i.e. O365); it shall not be considered the +official way of sending patches, but just a fallback. + ==== Cover letter If you want to present the whole patch set in a separate mail, add From yann.morin.1998 at free.fr Tue Feb 6 17:06:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 18:06:07 +0100 Subject: [Buildroot] [PATCH 6/6] docs/manual/contribute.adoc: mention sr.ht as an alternative for sending patches In-Reply-To: <20240206105246.1220945-6-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> <20240206105246.1220945-6-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > Signed-off-by: Marcus Hoffmann > --- > docs/manual/contribute.adoc | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc > index 684e9f4809..7d0611be28 100644 > --- a/docs/manual/contribute.adoc > +++ b/docs/manual/contribute.adoc > @@ -375,6 +375,14 @@ If you do not use +git send-email+, make sure posted *patches are not > line-wrapped*, otherwise they cannot easily be applied. In such a case, > fix your e-mail client, or better yet, learn to use +git send-email+. > > +https://sr.ht also has a light-weight UI for > +https://man.sr.ht/git.sr.ht/#sending-patches-upstream[preparing patchseries] > +and can also send out the patches for you. There are a few drawbacks to > +this, as you cannot edit your patches' status in Patchwork and you > +currently can't edit your display name with which the match emails are > +sent out but it is an option if you cannot get git send-email to work > +with your mail provider (i.e. O365). As seen IRL, I extended that with a blurb explicitly stating that it's not the official way of sneding patches, just a fallback. Applied to master, thanks. Regards, Yann E. MORIN. > ==== Cover letter > > If you want to present the whole patch set in a separate mail, add > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Tue Feb 6 17:06:50 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 18:06:50 +0100 Subject: [Buildroot] [PATCH v3] buildroot: Add basic support for LoongArch architecture (toolchain only) In-Reply-To: <20221212083457.8308-1-duanzhiwei@loongson.cn> References: <20221212083457.8308-1-duanzhiwei@loongson.cn> Message-ID: <4941efd8-36e6-47b9-b2d8-a9599429fa3d@smile.fr> Hello, Le 12/12/2022 ? 09:34, Zhiwei Duan a ?crit?: > With this patch, the buildroot can compile the rootfs of the loongarch architecture. > Both external toolchain and buildroot toolchain can compile rootfs. > buildroot toolchain: binutils>=2.38 GCC>=12 Linux>=5.19 glibc>=2.36. Thanks for this patch. It would be great if you can add a defconfig targeting qemu for LoongArch architecture in order to perform a runtime test (see other qemu defconfig for other architectures). Nowadays qemu 8.1 support LoongArch architecture so it seems doable without too much patches (if any). > > Signed-off-by: Zhiwei Duan > --- > arch/Config.in | 16 +++++++++++ > arch/Config.in.loongarch | 52 ++++++++++++++++++++++++++++++++++++ > package/glibc/Config.in | 1 + > support/gnuconfig/config.sub | 11 ++++++-- > toolchain/Config.in | 2 +- > 5 files changed, 79 insertions(+), 3 deletions(-) > create mode 100644 arch/Config.in.loongarch > > diff --git a/arch/Config.in b/arch/Config.in > index 1c0c400a98..88f805bb1e 100644 > --- a/arch/Config.in > +++ b/arch/Config.in > @@ -251,6 +251,17 @@ config BR2_xtensa > http://en.wikipedia.org/wiki/Xtensa > http://www.tensilica.com/ > > +config BR2_loongarch64 > + bool "LOONGARCH64 (little endian)" > + select BR2_ARCH_IS_64 > + select BR2_USE_MMU > + help > + LOONGARCH is a RISC microprocessor from LOONGARCH Technologies. Little > + endian. Add an empty line here > + https://www.loongson.cn/ Remove trailing / > + #http://en.wikipedia.org/wiki/MIPS_Technologies Remove the commented line and the additional empty line > + > + > endchoice > > # For some architectures or specific cores, our internal toolchain > @@ -414,6 +425,11 @@ if BR2_xtensa > source "arch/Config.in.xtensa" > endif > > +if BR2_loongarch64 > +source "arch/Config.in.loongarch" > +endif > + > + Remove the additional empty line > # Set up target binary format > choice > prompt "Target Binary Format" > diff --git a/arch/Config.in.loongarch b/arch/Config.in.loongarch > new file mode 100644 > index 0000000000..bf86490cff > --- /dev/null > +++ b/arch/Config.in.loongarch > @@ -0,0 +1,52 @@ > +# loongarch config > +config BR2_LOONGARCH_CPU_LOONGARCH64 > + bool > + select BR2_LOONGARCH_NAN_LEGACY > + > +choice > + prompt "Target Architecture Variant" > + default BR2_loongarch_64 if BR2_loongarch64 > + depends on BR2_loongarch64 > + help > + Specific CPU variant to use > + > +config BR2_loongarch_64 > + bool "Generic LOONGARCH64" > + depends on BR2_ARCH_IS_64 > + select BR2_LOONGARCH_CPU_LOONGARCH64 > +endchoice > + > +config BR2_LOONGARCH_NAN_LEGACY Since it's a new architecture from Buildroot point of view, maybe we don't really want to support legacy features. > + bool > + > +#config BR2_GCC_TARGET_NAN > +# default "legacy" if BR2_LOONGARCH_NAN_LEGACY Please, remove commented lines. > + > +config BR2_ARCH > + default "loongarch64" if BR2_loongarch64 > + > +config BR2_NORMALIZED_ARCH > + default "loongarch" > + > +config BR2_ENDIAN > + default "LITTLE" if BR2_loongarch64 > + > +config BR2_GCC_TARGET_ARCH > + default "loongarch64" if BR2_loongarch_64 > + > +config BR2_READELF_ARCH_NAME > + default "LoongArch" > + > +config BR2_LOONGARCH_SOFT_FLOAT > + bool "Use soft-float" > + #default y Remove commented line. > + select BR2_SOFT_FLOAT > + help > + If your target CPU does not have a Floating Point Unit (FPU) > + or a kernel FPU emulator, but you still wish to support > + floating point functions, then everything will need to be > + compiled with soft floating point support (-msoft-float). > + > + > +# vim: ft=kconfig > +# -*- mode:kconfig; -*- > diff --git a/package/glibc/Config.in b/package/glibc/Config.in > index 71c50504ac..d8325610f5 100644 > --- a/package/glibc/Config.in > +++ b/package/glibc/Config.in > @@ -21,6 +21,7 @@ config BR2_PACKAGE_GLIBC_ARCH_SUPPORTS > default y if BR2_microblaze > default y if BR2_nios2 > default y if BR2_arc && BR2_ARC_ATOMIC_EXT > + default y if BR2_loongarch64 > depends on !BR2_powerpc_SPE > depends on BR2_RISCV_ISA_RVA || !BR2_riscv > depends on BR2_USE_MMU > diff --git a/support/gnuconfig/config.sub b/support/gnuconfig/config.sub > index 9bc49a7e92..c751ddf15a 100755 > --- a/support/gnuconfig/config.sub > +++ b/support/gnuconfig/config.sub In order to ease review, it would be great to split this patch into several smaller patches. > @@ -164,7 +164,7 @@ case $1 in > basic_os=$field2 > ;; > # Manufacturers > - dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ > + dec* | mips* | loongarch* | sequent* | encore* | pc533* | sgi* | sony* \ > | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ > | unicom* | ibm* | next | hp | isi* | apollo | altos* \ > | convergent* | ncr* | news | 32* | 3600* | 3100* \ > @@ -632,6 +632,11 @@ case $1 in > basic_machine=ymp-cray > basic_os=unicos > ;; > + loongarch) > + basic_machine=loongarch-loongson > + basic_os= > + ;; > + > *) > basic_machine=$1 > basic_os= > @@ -1211,6 +1216,7 @@ case $cpu-$vendor in > | mipsisa64sr71k | mipsisa64sr71kel \ > | mipsr5900 | mipsr5900el \ > | mipstx39 | mipstx39el \ > + | loongarch | loongarch64 \ Here you add loongarch while only loongarch64 is supported in Buildroot. Remove loongarch if not needed. > | mmix \ > | mn10200 | mn10300 \ > | moxie \ > @@ -1253,7 +1259,8 @@ case $cpu-$vendor in > | x86 | x86_64 | xc16x | xgate | xps100 \ > | xstormy16 | xtensa* \ > | ymp \ > - | z8k | z80) > + | z8k | z80 \ > + | loongarch | loongarch64) same here > ;; > > *) > diff --git a/toolchain/Config.in b/toolchain/Config.in > index 4947ab3aae..a4939af6fb 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -24,7 +24,7 @@ config BR2_TOOLCHAIN_USES_UCLIBC > # architectures > select BR2_TOOLCHAIN_HAS_UCONTEXT if BR2_ARM_CPU_HAS_ARM || BR2_i386 \ > || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \ > - || BR2_sparc || BR2_x86_64 > + || BR2_sparc || BR2_x86_64 || BR2_loongarch64 > select BR2_TOOLCHAIN_SUPPORTS_PIE if !BR2_m68k && !BR2_microblaze && !BR2_STATIC_LIBS > > config BR2_TOOLCHAIN_USES_MUSL Can you add a new entry in the DEVELOPERS file for arch/Config.in.loongarch in order to get an email about issues related to loongarch64. I'll mark you patch as "changes requested" in the patchwork. Best regards, Romain From arnout at mind.be Tue Feb 6 17:10:32 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:10:32 +0100 Subject: [Buildroot] [git commit] support/pkg-stats: list packages from external trees. Message-ID: <20240206171103.3D6D78718C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbea83fc47046653778e0cf49863b2c4a3bac8e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Search the external trees for package files and add them to the list. The list of directories walked and excluded are the same as for the main tree, and should work out of the box if the user sticks to the directory structure suggested in the manual. Two additional properties were added to the Package class, the tree name and the path. For consistency and to simplify the code, packages in the main tree are marked as coming from "BR2". The HTML output has a new column listing the external name (or "BR2") and the json output has a new property "tree". Signed-off-by: Juan Carrano [Arnout: - fix flake8 error "'itertools' imported but unused"; - use str.split instead of str.partition; - use BR2_EXTERNAL_BUILDROOT_PATH instead of BR2_EXTERNAL_BR2_PATH; - remove pkgdir variable, instead use self.pkgdir. ] Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 92 ++++++++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9349a0df57..05f0cd9e4a 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -23,7 +23,7 @@ import asyncio import datetime import fnmatch import os -from collections import defaultdict +from collections import defaultdict, namedtuple import re import subprocess import json @@ -77,6 +77,19 @@ def get_defconfig_list(): ] +Br2Tree = namedtuple("Br2Tree", ["name", "path"]) + + +def get_trees(): + raw_variables = subprocess.check_output(["make", "--no-print-directory", "-s", + "BR2_HAVE_DOT_CONFIG=y", "printvars", + "VARS=BR2_EXTERNAL_NAMES BR2_EXTERNAL_%_PATH"]) + variables = dict(line.split("=") for line in raw_variables.decode().split("\n") if line) + variables["BR2_EXTERNAL_BUILDROOT_PATH"] = brpath + externals = ["BUILDROOT", *variables["BR2_EXTERNAL_NAMES"].split()] + return [Br2Tree(name, os.path.normpath(variables[f"BR2_EXTERNAL_{name}_PATH"])) for name in externals] + + class Package: all_licenses = dict() all_license_files = list() @@ -89,7 +102,9 @@ class Package: status_checks = ['cve', 'developers', 'hash', 'license', 'license-files', 'patches', 'pkg-check', 'url', 'version'] - def __init__(self, name, path): + def __init__(self, tree, name, path): + self.tree = tree.name + self.tree_path = tree.path self.name = name self.path = path self.pkg_path = os.path.dirname(path) @@ -118,15 +133,26 @@ class Package: def pkgvar(self): return self.name.upper().replace("-", "_") + @property + def pkgdir(self): + return os.path.join(self.tree_path, self.pkg_path) + + @property + def pkgfile(self): + return os.path.join(self.tree_path, self.path) + + @property + def hashpath(self): + return self.pkgfile.replace(".mk", ".hash") + def set_url(self): """ Fills in the .url field """ self.status['url'] = ("warning", "no Config.in") - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) - for filename in os.listdir(pkgdir): + for filename in os.listdir(self.pkgdir): if fnmatch.fnmatch(filename, 'Config.*'): - fp = open(os.path.join(pkgdir, filename), "r") + fp = open(os.path.join(self.pkgdir, filename), "r") for config_line in fp: if URL_RE.match(config_line): self.url = config_line.strip() @@ -172,7 +198,7 @@ class Package: keep_target = True self.infras = list() - with open(os.path.join(brpath, self.path), 'r') as f: + with open(self.pkgfile, 'r') as f: lines = f.readlines() for line in lines: match = INFRA_RE.match(line) @@ -211,8 +237,7 @@ class Package: self.status['hash-license'] = ("na", "no valid package infra") return - hashpath = self.path.replace(".mk", ".hash") - if os.path.exists(os.path.join(brpath, hashpath)): + if os.path.exists(self.hashpath): self.status['hash'] = ("ok", "found") else: self.status['hash'] = ("error", "missing") @@ -225,8 +250,7 @@ class Package: self.status['patches'] = ("na", "no valid package infra") return - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) - for subdir, _, _ in os.walk(pkgdir): + for subdir, _, _ in os.walk(self.pkgdir): self.patch_files = fnmatch.filter(os.listdir(subdir), '*.patch') if self.patch_count == 0: @@ -268,9 +292,8 @@ class Package: Fills in the .warnings and .status['pkg-check'] fields """ cmd = [os.path.join(brpath, "utils/check-package")] - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) self.status['pkg-check'] = ("error", "Missing") - for root, dirs, files in os.walk(pkgdir): + for root, dirs, files in os.walk(self.pkgdir): for f in files: cmd.append(os.path.join(root, f)) o = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[1] @@ -327,7 +350,7 @@ class Package: self.is_status_ok('license-files'), self.status['hash'], self.patch_count) -def get_pkglist(npackages, package_list): +def get_pkglist(trees, npackages, package_list): """ Builds the list of Buildroot packages, returning a list of Package objects. Only the .name and .path fields of the Package object are @@ -362,8 +385,8 @@ def get_pkglist(npackages, package_list): "toolchain/toolchain-wrapper.mk"] packages = list() count = 0 - for root, dirs, files in os.walk(brpath): - root = os.path.relpath(root, brpath) + for br_tree, root, dirs, files in ((tree, *rdf) for tree in trees for rdf in os.walk(tree.path)): + root = os.path.relpath(root, br_tree.path) rootdir = root.split("/") if len(rootdir) < 1: continue @@ -384,7 +407,7 @@ def get_pkglist(npackages, package_list): continue if skip: continue - p = Package(pkgname, pkgpath) + p = Package(br_tree, pkgname, pkgpath) packages.append(p) count += 1 if npackages and count == npackages: @@ -858,7 +881,7 @@ function expandField(fieldId){ #package-grid, #results-grid { display: grid; grid-gap: 2px; - grid-template-columns: 1fr repeat(12, min-content); + grid-template-columns: min-content 1fr repeat(12, min-content); } #results-grid { grid-template-columns: 3fr 1fr; @@ -924,6 +947,8 @@ def boolean_str(b): def dump_html_pkg(f, pkg): pkg_css_class = pkg.path.replace("/", "_")[:-3] + f.write(f'
{pkg.tree}
\n') f.write(f'
{pkg.path}
\n') # Patch count @@ -1128,31 +1153,33 @@ def dump_html_pkg(f, pkg): def dump_html_all_pkgs(f, packages): f.write("""
-
Tree
+
Package
-
Patch count
-
Infrastructure
-
License
-
License files
-
Hash file
-
Current version
-
Latest version
-
Warnings
-
Upstream URL
-
CVEs
-
CVEs Ignored
-
CPE ID
""") for pkg in sorted(packages): @@ -1223,7 +1250,7 @@ def dump_html(packages, stats, date, commit, output): def dump_json(packages, defconfigs, stats, date, commit, output): # Format packages as a dictionnary instead of a list # Exclude local field that does not contains real date - excluded_fields = ['url_worker', 'name'] + excluded_fields = ['url_worker', 'name', 'tree_path'] pkgs = { pkg.name: { k: v @@ -1311,7 +1338,8 @@ def __main__(): 'rev-parse', 'HEAD']).splitlines()[0].decode() print("Build package list ...") - packages = get_pkglist(args.npackages, package_list) + all_trees = get_trees() + packages = get_pkglist(all_trees, args.npackages, package_list) print("Getting developers ...") developers = parse_developers() print("Build defconfig list ...") From yann.morin.1998 at free.fr Tue Feb 6 17:15:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 18:15:25 +0100 Subject: [Buildroot] [git commit] package/python-ml-dtypes: bump to version 0.3.2 Message-ID: <20240206171637.4F6D583A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06e1a3620e5268951be089d2b150c1802de7de4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from distutils which is being deprecated to setuptools. Drop python-pybind which is no longer required: https://github.com/jax-ml/ml_dtypes/blob/v0.3.2/CHANGELOG.md#032---2024-01-03 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-ml-dtypes/Config.in | 1 - package/python-ml-dtypes/python-ml-dtypes.hash | 4 ++-- package/python-ml-dtypes/python-ml-dtypes.mk | 9 ++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in index 72506896df..8791564b19 100644 --- a/package/python-ml-dtypes/Config.in +++ b/package/python-ml-dtypes/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy select BR2_PACKAGE_PYTHON_NUMPY - select BR2_PACKAGE_PYTHON_PYBIND help ml_dtypes is a stand-alone implementation of several NumPy dtype extensions used in machine learning libraries. diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash index a440268e39..53bfacb528 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.hash +++ b/package/python-ml-dtypes/python-ml-dtypes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ml_dtypes/json -md5 6adbb05530819bdb4a78d2372d187fe2 ml_dtypes-0.3.1.tar.gz -sha256 60778f99194b4c4f36ba42da200b35ef851ce4d4af698aaf70f5b91fe70fc611 ml_dtypes-0.3.1.tar.gz +md5 438c04dc0d941ec1b3b71667225c74c8 ml_dtypes-0.3.2.tar.gz +sha256 533059bc5f1764fac071ef54598db358c167c51a718f68f5bb55e3dee79d2967 ml_dtypes-0.3.2.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk index 92d23bece4..676137ecf1 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.mk +++ b/package/python-ml-dtypes/python-ml-dtypes.mk @@ -4,16 +4,15 @@ # ################################################################################ -PYTHON_ML_DTYPES_VERSION = 0.3.1 +PYTHON_ML_DTYPES_VERSION = 0.3.2 PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz -PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/16/6e/9a7a51ee1ca24b8e92109128260c5aec8340c8fe5572e9ceecddae559abe +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/39/7d/8d85fcba868758b3a546e6914e727abd8f29ea6918079f816975c9eecd63 PYTHON_ML_DTYPES_LICENSE = Apache-2.0 PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE -PYTHON_ML_DTYPES_SETUP_TYPE = distutils +PYTHON_ML_DTYPES_SETUP_TYPE = setuptools PYTHON_ML_DTYPES_DEPENDENCIES = \ host-python-numpy \ - python-numpy \ - python-pybind + python-numpy $(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 17:17:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:17:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/ltp-testsuite: bump version to 20240129 In-Reply-To: <20240131181902.26975-1-petr.vorel@gmail.com> (Petr Vorel's message of "Wed, 31 Jan 2024 19:19:02 +0100") References: <20240131181902.26975-1-petr.vorel@gmail.com> Message-ID: <87zfwd5x7h.fsf@48ers.dk> >>>>> "Petr" == Petr Vorel writes: > Signed-off-by: Petr Vorel Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Tue Feb 6 17:17:37 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:17:37 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/python-aiosqlite: new package In-Reply-To: <20240106214410.3294887-2-james.hilliard1@gmail.com> References: <20240106214410.3294887-1-james.hilliard1@gmail.com> <20240106214410.3294887-2-james.hilliard1@gmail.com> Message-ID: On 06/01/2024 22:44, James Hilliard wrote: > Signed-off-by: James Hilliard Applied both to master, thanks. Regards, Arnout > --- > Changes v1 -> v2: > - add missing python sqlite module > --- > package/Config.in | 1 + > package/python-aiosqlite/Config.in | 7 +++++++ > package/python-aiosqlite/python-aiosqlite.hash | 5 +++++ > package/python-aiosqlite/python-aiosqlite.mk | 14 ++++++++++++++ > 4 files changed, 27 insertions(+) > create mode 100644 package/python-aiosqlite/Config.in > create mode 100644 package/python-aiosqlite/python-aiosqlite.hash > create mode 100644 package/python-aiosqlite/python-aiosqlite.mk > > diff --git a/package/Config.in b/package/Config.in > index f5d0c06334..ea023a84ef 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -978,6 +978,7 @@ menu "External python modules" > source "package/python-aioredis/Config.in" > source "package/python-aiorwlock/Config.in" > source "package/python-aiosignal/Config.in" > + source "package/python-aiosqlite/Config.in" > source "package/python-aiozipkin/Config.in" > source "package/python-alembic/Config.in" > source "package/python-alsaaudio/Config.in" > diff --git a/package/python-aiosqlite/Config.in b/package/python-aiosqlite/Config.in > new file mode 100644 > index 0000000000..77c78ea25d > --- /dev/null > +++ b/package/python-aiosqlite/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_PYTHON_AIOSQLITE > + bool "python-aiosqlite" > + select BR2_PACKAGE_PYTHON3_SQLITE # runtime > + help > + asyncio bridge to the standard sqlite3 module. > + > + https://aiosqlite.omnilib.dev/ > diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash > new file mode 100644 > index 0000000000..e06061346c > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/aiosqlite/json > +md5 e829bf8f641ab115c1a9ca0494d35278 aiosqlite-0.19.0.tar.gz > +sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d aiosqlite-0.19.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 > new file mode 100644 > index 0000000000..e513d53c02 > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-aiosqlite > +# > +################################################################################ > + > +PYTHON_AIOSQLITE_VERSION = 0.19.0 > +PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz > +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 > +PYTHON_AIOSQLITE_SETUP_TYPE = flit > +PYTHON_AIOSQLITE_LICENSE = MIT > +PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE > + > +$(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 17:18:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:18:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libheif: add jpeg-turbo support In-Reply-To: <20240131200754.1784621-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 21:07:54 +0100") References: <20240131200754.1784621-1-fontaine.fabrice@gmail.com> Message-ID: <87v8715x69.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > jpeg support is not limited to libjpeg > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 17:17:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:17:03 +0100 Subject: [Buildroot] [git commit] package/ltp-testsuite: bump version to 20240129 Message-ID: <20240206171815.B3651872D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e06febce59f9e9a387e663e79d7f46771eee3de4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/ltp-testsuite/ltp-testsuite.hash | 4 ++-- package/ltp-testsuite/ltp-testsuite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index 2e84e978d1..1562f346b4 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,4 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20230929/ltp-full-20230929.tar.xz.sha256 -sha256 eb161ff8f1966a1f3428fd4561eb20ebb9f83b7519e35cc12fc66bcfa7983b6b ltp-full-20230929.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20240129/ltp-full-20240129.tar.xz.sha256 +sha256 c302f6b2ca09cbb7835f549777bdb9233fe31f7086d7ad8e65472a0804e3e025 ltp-full-20240129.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 2a8c12fc25..ea57686a9c 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20230929 +LTP_TESTSUITE_VERSION = 20240129 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) From yann.morin.1998 at free.fr Tue Feb 6 17:18:20 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 18:18:20 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-ml-dtypes: bump to version 0.3.2 In-Reply-To: <20240206161715.550268-1-james.hilliard1@gmail.com> References: <20240206161715.550268-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-06 09:17 -0700, James Hilliard spake thusly: > Migrate from distutils which is being deprecated to setuptools. > > Drop python-pybind which is no longer required: > https://github.com/jax-ml/ml_dtypes/blob/v0.3.2/CHANGELOG.md#032---2024-01-03 > > Signed-off-by: James Hilliard Applied to master, thanks. Could you check whether the following patches are still valid and required, please: https://patchwork.ozlabs.org/project/buildroot/patch/3afcc982685e876ac9b2ae54f86164647040ab85.1706448055.git.yann.morin.1998 at free.fr/ https://patchwork.ozlabs.org/project/buildroot/patch/20240112221910.14778-1-fontaine.fabrice at gmail.com/ Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - drop pybind > --- > package/python-ml-dtypes/Config.in | 1 - > package/python-ml-dtypes/python-ml-dtypes.hash | 4 ++-- > package/python-ml-dtypes/python-ml-dtypes.mk | 9 ++++----- > 3 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in > index 72506896df..8791564b19 100644 > --- a/package/python-ml-dtypes/Config.in > +++ b/package/python-ml-dtypes/Config.in > @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy > depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy > select BR2_PACKAGE_PYTHON_NUMPY > - select BR2_PACKAGE_PYTHON_PYBIND > help > ml_dtypes is a stand-alone implementation of several NumPy > dtype extensions used in machine learning libraries. > diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash > index a440268e39..53bfacb528 100644 > --- a/package/python-ml-dtypes/python-ml-dtypes.hash > +++ b/package/python-ml-dtypes/python-ml-dtypes.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/ml_dtypes/json > -md5 6adbb05530819bdb4a78d2372d187fe2 ml_dtypes-0.3.1.tar.gz > -sha256 60778f99194b4c4f36ba42da200b35ef851ce4d4af698aaf70f5b91fe70fc611 ml_dtypes-0.3.1.tar.gz > +md5 438c04dc0d941ec1b3b71667225c74c8 ml_dtypes-0.3.2.tar.gz > +sha256 533059bc5f1764fac071ef54598db358c167c51a718f68f5bb55e3dee79d2967 ml_dtypes-0.3.2.tar.gz > # Locally computed sha256 checksums > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk > index 92d23bece4..676137ecf1 100644 > --- a/package/python-ml-dtypes/python-ml-dtypes.mk > +++ b/package/python-ml-dtypes/python-ml-dtypes.mk > @@ -4,16 +4,15 @@ > # > ################################################################################ > > -PYTHON_ML_DTYPES_VERSION = 0.3.1 > +PYTHON_ML_DTYPES_VERSION = 0.3.2 > PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz > -PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/16/6e/9a7a51ee1ca24b8e92109128260c5aec8340c8fe5572e9ceecddae559abe > +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/39/7d/8d85fcba868758b3a546e6914e727abd8f29ea6918079f816975c9eecd63 > PYTHON_ML_DTYPES_LICENSE = Apache-2.0 > PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE > -PYTHON_ML_DTYPES_SETUP_TYPE = distutils > +PYTHON_ML_DTYPES_SETUP_TYPE = setuptools > > PYTHON_ML_DTYPES_DEPENDENCIES = \ > host-python-numpy \ > - python-numpy \ > - python-pybind > + python-numpy > > $(eval $(python-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Tue Feb 6 17:17:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:17:44 +0100 Subject: [Buildroot] [git commit] package/libheif: add jpeg-turbo support Message-ID: <20240206171938.E85F1872E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=854ea58174b38f7556fbc4891d7512c2512a8327 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master jpeg support is not limited to libjpeg Signed-off-by: Fabrice Fontaine Reviewed-by: Antoine Coutant Signed-off-by: Peter Korsgaard --- package/libheif/libheif.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk index bd307deb7b..908e2ce068 100644 --- a/package/libheif/libheif.mk +++ b/package/libheif/libheif.mk @@ -51,9 +51,9 @@ else LIBHEIF_CONF_OPTS += -DWITH_LIBDE265=OFF endif -ifeq ($(BR2_PACKAGE_LIBJPEG),y) +ifeq ($(BR2_PACKAGE_JPEG),y) LIBHEIF_CONF_OPTS += -DWITH_JPEG_DECODER=ON -DWITH_JPEG_ENCODER=ON -LIBHEIF_DEPENDENCIES += libjpeg +LIBHEIF_DEPENDENCIES += jpeg else LIBHEIF_CONF_OPTS += -DWITH_JPEG_DECODER=OFF -DWITH_JPEG_ENCODER=OFF endif From giulio.benetti at benettiengineering.com Tue Feb 6 17:21:52 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 18:21:52 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/milkv_duo: new defconfig In-Reply-To: References: Message-ID: <9ed1a976-a5e3-44c4-8788-d035b618a823@benettiengineering.com> Hi Hanyuan, On 06/02/24 17:01, hanyuan-z wrote: > Hello Giulio, > > Thanks for your careful review! However there are a few > things I still get confused about. Could you please give me > some hints? Sure, > > Here you definetely need to add that this patch depends on this > > patchset: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 > > to work-around a gcc bug on htop package. > > Do you mean that I should submit my patches after yours gets merged? > Or should I declare that my patch depends on yours, and how? The second one, you can note it after the 3 dashes under commit log, something like: --- This patch depends on: https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 to work-around a gcc bug on htop package. --- > > After the 3 dashes above you should add changes between patch versions like: > > V1->V2: > > * changed this > > * changed that > > > > V2->V3: > > * change thee > > Could I only add lines from V2 -> V3 since the V1 -> V2 was happened > nearly two months ago and the changes from V1 -> V2 were very big. No, you need to keep all of them so can keep track of the history of the patch in Mailing List. > > please drop from here... > > > > > +To configure the linux kernel or u-boot: > > > + > > > + $ make linux-menuconfig > > > + > > > +To rebuild something (e.g. linux): > > > + > > > + $ make linux-rebuild > > > + > > > > ...to here, since it's part of Buildroot manual and also > > you should point "linux-menuconfig and uboot-menuconfig", > > but it doesn't make sense to me, so yes please drop it, > > Do you mean that I should remove those lines? Yes please > > > Here I would expand comment by pointing that glibc is not suitable and > > why. It should be a gcc ICE, so maybe someone can fix or work it around > > later with this indication. > > Yes, the problem is gcc ICE. More detailed, the ICE is coming from the t-head > optimizations. Once t-head stuff removed, no more ICE. No more glibc and htop > problems. However once the optimizations removed, the Milk-v duo board's > architect and performance features are gone. So it is troublesome. And I think this > problem is associated with the one from another email. Let me put them together. Yes. Then since my work-around works I think it's ok to keep t-head optimizations. > > > I think I should tell you this. In fact I encountered another gcc bug > > > when using all the t-head?s optimizations with the glibc. The gcc reported > > > internal errors when we > > > > > > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > > > > > > So we have to use musl and find this bug is not reported anymore. > > > I was wondering why you were using exactly musl and I suspected > > something like that. > > The reason I use musl is that the original sdk not prepared for the > mainline buildroot is using the musl. And for the compatibility I think > it's better to use musl here to rather than the rest option uClibc-ng, > though it works fine. Maybe we can go this way and in case change later. Not totally sure what Maintainers will choose. > So should I put more lines at the defconfig to comment more about > these embarrassing situations? Yes please > > Please for all occurences use Makefile "$(if ...)" statement instead of > > "if [ ... = y ]" > > Sorry for the inconsistency. However the Makefile's if statement is > too weird for me to implement such a branch of things to make. > So I spend a lot of time to find that the shell's if statement could work > this way. And I have find examples that are using the same technique. > For example the line 699 at package/systemd/systemd.mk. Could you > please kindly give me an exemption here? Pardon, using $(if ...) makes things harder in this case, check the Makefile manual: https://www.gnu.org/software/make/manual/make.html#Conditional-Functions So please forget about it and leave it as is. > > > + > > > + cd $(@D)/cvitek/build/task && \ > > > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > > > + -DRUN_ARCH=riscv64 \ > > > + -DRUN_TYPE=CVIRTOS \ > > > + -DTOP_DIR=$(@D)/cvitek \ > > > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > > > + -DBOARD_FPGA=n \ > > > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > > > > The build command is common for every "target", so please declare it > > into a variable on the top. > > > > > + $(@D)/cvitek/task > > > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > > > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target cvirtos.bin -- -v > > > > To tell the truth all the points above can be shrinked using a foreach > > loop through all the build directories since they all look the same > > except directory name. Can you provide such change? > > These are too painful for me. Could I move these code into the remote > code repo so that these annoying code will not be included in the buildroot? > And then the buildroot package would only have good lines > like "$(eval $(generic-package))" Sure, if you have access to the repository it's pretty easier then! > Great thanks again for your thorough review and insightful feedback on my > code! I truly appreciate your patience and the valuable time you spend on > my patches. You're welcome :-) Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Tue Feb 6 17:23:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:23:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2: force arm mode instead of Thumb mode In-Reply-To: <20240131203739.2092971-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 21:37:39 +0100") References: <20240131203739.2092971-1-fontaine.fabrice@gmail.com> Message-ID: <87r0hp5wwm.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure in Thumb mode: > /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers > 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers > | ^~~~~ > Fixes: > - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e > - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 17:22:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:22:43 +0100 Subject: [Buildroot] [git commit] package/sdl2: force arm mode instead of Thumb mode Message-ID: <20240206172426.2A888872EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecedc4ae8c0632cdd9ba0bf63a64a51e67a1525b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure in Thumb mode: /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 4646e7d1f8..42b4a433e8 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -54,6 +54,10 @@ SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SDL2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) SDL2_DEPENDENCIES += udev SDL2_CONF_OPTS += --enable-libudev @@ -76,7 +80,7 @@ endif ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config +SDL2_CONF_ENV += ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config else SDL2_CONF_OPTS += --disable-video-directfb endif From james.hilliard1 at gmail.com Tue Feb 6 17:26:50 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 10:26:50 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/python-ml-dtypes: bump to version 0.3.2 In-Reply-To: References: <20240206161715.550268-1-james.hilliard1@gmail.com> Message-ID: On Tue, Feb 6, 2024 at 10:18?AM Yann E. MORIN wrote: > > James, All, > > On 2024-02-06 09:17 -0700, James Hilliard spake thusly: > > Migrate from distutils which is being deprecated to setuptools. > > > > Drop python-pybind which is no longer required: > > https://github.com/jax-ml/ml_dtypes/blob/v0.3.2/CHANGELOG.md#032---2024-01-03 > > > > Signed-off-by: James Hilliard > > Applied to master, thanks. > > Could you check whether the following patches are still valid and > required, please: > > https://patchwork.ozlabs.org/project/buildroot/patch/3afcc982685e876ac9b2ae54f86164647040ab85.1706448055.git.yann.morin.1998 at free.fr/ > https://patchwork.ozlabs.org/project/buildroot/patch/20240112221910.14778-1-fontaine.fabrice at gmail.com/ Yeah, looks like they are still needed due to the numpy dependency, although the python-pybind comment I think can be dropped. > > Regards, > Yann E. MORIN. > > > --- > > Changes v1 -> v2: > > - drop pybind > > --- > > package/python-ml-dtypes/Config.in | 1 - > > package/python-ml-dtypes/python-ml-dtypes.hash | 4 ++-- > > package/python-ml-dtypes/python-ml-dtypes.mk | 9 ++++----- > > 3 files changed, 6 insertions(+), 8 deletions(-) > > > > diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in > > index 72506896df..8791564b19 100644 > > --- a/package/python-ml-dtypes/Config.in > > +++ b/package/python-ml-dtypes/Config.in > > @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES > > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy > > depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy > > select BR2_PACKAGE_PYTHON_NUMPY > > - select BR2_PACKAGE_PYTHON_PYBIND > > help > > ml_dtypes is a stand-alone implementation of several NumPy > > dtype extensions used in machine learning libraries. > > diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash > > index a440268e39..53bfacb528 100644 > > --- a/package/python-ml-dtypes/python-ml-dtypes.hash > > +++ b/package/python-ml-dtypes/python-ml-dtypes.hash > > @@ -1,5 +1,5 @@ > > # md5, sha256 from https://pypi.org/pypi/ml_dtypes/json > > -md5 6adbb05530819bdb4a78d2372d187fe2 ml_dtypes-0.3.1.tar.gz > > -sha256 60778f99194b4c4f36ba42da200b35ef851ce4d4af698aaf70f5b91fe70fc611 ml_dtypes-0.3.1.tar.gz > > +md5 438c04dc0d941ec1b3b71667225c74c8 ml_dtypes-0.3.2.tar.gz > > +sha256 533059bc5f1764fac071ef54598db358c167c51a718f68f5bb55e3dee79d2967 ml_dtypes-0.3.2.tar.gz > > # Locally computed sha256 checksums > > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > > diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk > > index 92d23bece4..676137ecf1 100644 > > --- a/package/python-ml-dtypes/python-ml-dtypes.mk > > +++ b/package/python-ml-dtypes/python-ml-dtypes.mk > > @@ -4,16 +4,15 @@ > > # > > ################################################################################ > > > > -PYTHON_ML_DTYPES_VERSION = 0.3.1 > > +PYTHON_ML_DTYPES_VERSION = 0.3.2 > > PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz > > -PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/16/6e/9a7a51ee1ca24b8e92109128260c5aec8340c8fe5572e9ceecddae559abe > > +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/39/7d/8d85fcba868758b3a546e6914e727abd8f29ea6918079f816975c9eecd63 > > PYTHON_ML_DTYPES_LICENSE = Apache-2.0 > > PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE > > -PYTHON_ML_DTYPES_SETUP_TYPE = distutils > > +PYTHON_ML_DTYPES_SETUP_TYPE = setuptools > > > > PYTHON_ML_DTYPES_DEPENDENCIES = \ > > host-python-numpy \ > > - python-numpy \ > > - python-pybind > > + python-numpy > > > > $(eval $(python-package)) > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From ismael at iodev.co.uk Tue Feb 6 17:29:43 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 18:29:43 +0100 Subject: [Buildroot] [PATCH] package/axel: bump version to 2.17.13 Message-ID: <20240206173002.25650-1-ismael@iodev.co.uk> Signed-off-by: Ismael Luceno --- package/axel/axel.hash | 2 +- package/axel/axel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/axel/axel.hash b/package/axel/axel.hash index ebcdc652fc7f..b2ff52876b4b 100644 --- a/package/axel/axel.hash +++ b/package/axel/axel.hash @@ -1,2 +1,2 @@ -sha256 fb4e70535ebf732211af253bfe24f9ada57d80fd465ac02c721406c7d4e1d496 axel-2.17.12.tar.xz +sha256 6af9c0238ca4fb850baa17878de0361868e3ff6d9302298d83c6d26931c28723 axel-2.17.13.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/axel/axel.mk b/package/axel/axel.mk index d3a2f4d42c8f..fbfbc8be3472 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -4,7 +4,7 @@ # ################################################################################ -AXEL_VERSION = 2.17.12 +AXEL_VERSION = 2.17.13 AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION) AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ -- 2.43.0 From peter at korsgaard.com Tue Feb 6 17:30:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:30:56 +0100 Subject: [Buildroot] [PATCH-2023.02.x] package/{glibc, localedef}: security bump to version glibc-2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7 In-Reply-To: <20240131111301.497468-1-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 31 Jan 2024 12:13:01 +0100") References: <20240131111301.497468-1-peter@korsgaard.com> Message-ID: <87mssd5wkv.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issues: > CVE-2023-6246: syslog: Fix heap buffer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD > CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD > CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD > For details, see the Qualys advisory: > https://www.openwall.com/lists/oss-security/2024/01/30/6 > Signed-off-by: Peter Korsgaard Committed to 2023.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 17:29:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:29:52 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/{glibc, localedef}: security bump to version glibc-2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7 Message-ID: <20240206173113.4AC3C8730F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90f69f4277d037e30c32c4b2503acbbbf963cbbd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following security issues: CVE-2023-6246: syslog: Fix heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD For details, see the Qualys advisory: https://www.openwall.com/lists/oss-security/2024/01/30/6 Signed-off-by: Peter Korsgaard --- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 15 ++++++++++++++- package/localedef/localedef.mk | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index dcff16d465..b2eee2e9af 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 d7d829f90f03e00d42d7d34ff7e972a59b14e2b70fa2e852893018349aafa5f7 glibc-2.36-118-g22955ad85186ee05834e47e665056148ca07699c.tar.gz +sha256 30cdd65d82b6d53d4470e4bf89cab7c5cc1a8edaf8830358d8542e1c847e2d0b glibc-2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 98e7db7b4b..324fb0de9a 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,8 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.36-118-g22955ad85186ee05834e47e665056148ca07699c +GLIBC_VERSION = 2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7 + # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -44,6 +45,18 @@ GLIBC_IGNORE_CVES += CVE-2023-4911 # 2.36 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-5156 +# Fixed by d1a83b6767f68b3cb5b4b4ea2617254acd040c82, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6246 + +# Fixed by 2bc9d7c002bdac38b5c2a3f11b78e309d7765b83, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6779 + +# Fixed by b9b7d6a27aa0632f334352fa400771115b3c69b7, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6780 + # All these CVEs are considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 51d3ddc932..c755f59b34 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.36-118-g22955ad85186ee05834e47e665056148ca07699c +LOCALEDEF_VERSION = 2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From romain.naour at smile.fr Tue Feb 6 17:32:37 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 18:32:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: <20240106101202.495801-1-fontaine.fabrice@gmail.com> References: <20240106101202.495801-1-fontaine.fabrice@gmail.com> Message-ID: <2be6d0df-6165-4da9-b69c-ad0deb5444be@smile.fr> Hello, Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit?: > ncmpc is able to automatically detect NLS support since version 0.47 and > https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 > so let it handle automatically to avoid the following build failure with > a bootlin toolchain which embeds a gettext definition in libintl.h which > will clash with the fake gettext definition provided by ncmpc since > https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: > > In file included from ../src/save_playlist.cxx:8: > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' > 39 | extern char *gettext (const char *__msgid) > | ^~~~~~~ > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' > ../src/i18n.h:22:20: note: to match this '(' > 22 | #define gettext(x) (x) > | ^ > > Indeed, even if NLS is disabled by the user, libintl.h will be included > by > /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h > though include We usually want to explicitly handle such option from Buildroot package to not rely on automatic detection (as currently done). It look like more a bug in ncmpc build system? Best regards, Romain > > Fixes: > - http://autobuild.buildroot.org/results/c860e64909dd3b7fa033db0970e1cfc1376c4ec5 > - http://autobuild.buildroot.org/results/36eab556fac80124755bff4110af3e43fe6edd78 > > Signed-off-by: Fabrice Fontaine > --- > package/ncmpc/ncmpc.mk | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk > index bc8a62daea..0965981f23 100644 > --- a/package/ncmpc/ncmpc.mk > +++ b/package/ncmpc/ncmpc.mk > @@ -20,8 +20,7 @@ NCMPC_CPE_ID_VENDOR = ncmpc_project > > NCMPC_CONF_OPTS = \ > -Dcurses=ncurses \ > - -Ddocumentation=disabled \ > - $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) > + -Ddocumentation=disabled > > ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) > NCMPC_DEPENDENCIES += lirc-tools From fran.millocs at live.com.ar Tue Feb 6 17:34:26 2024 From: fran.millocs at live.com.ar (franco ariel) Date: Tue, 6 Feb 2024 17:34:26 +0000 Subject: [Buildroot] Best board to fast boot In-Reply-To: <71301602-56ac-46b4-a853-bd71ed74da27@benettiengineering.com> References: <71301602-56ac-46b4-a853-bd71ed74da27@benettiengineering.com> Message-ID: Hi Giulio, Thank you for you answer. Based on the PDF I see that I can't do those optimizations on my rpi4, because the bootloader is not open source, right? So, the Beagleboard looks good but, the RAM is quite low, I was looking for something better to run my qt application, which has smooth animations and transitions, BLE, touchscreen support, etc. witch board, with the bootloader open source, can I use to boot as fast as possible into the qt app? Thank you, Franco ________________________________ De: Giulio Benetti Enviado: martes, 6 de febrero de 2024 06:52 Para: franco ariel ; Thomas Petazzoni via buildroot Asunto: Re: [Buildroot] Best board to fast boot Hi Franco, On 06/02/24 05:14, franco ariel wrote: > Hello guys! > I few weeks ago I started working with buildroot on rpi4, and it's look > amazing, thanks to the community I was able to run a flutter app on my > rpi4. But now, I want to keep going forward with my project, so ?Witch > one are the best board to achieve te best boot time to a Qt application? > I was looking for the Rockpro64 from pine but I'm not sure, since there > is not so much information about this board. > > What do you think it will be good for my project? On rpi4 I was able to > get 10sec boot time until the qt app shows up. And I want to achieve > less than 7s. This depends a lot on optimization you do on bootloader, linux and init script. I suggest you to take a look at these slides: https://bootlin.com/doc/training/boot-time/boot-time-slides.pdf Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Tue Feb 6 17:34:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:34:47 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: new jq runtime test In-Reply-To: <20240204221915.460639-1-ju.o@free.fr> (Julien Olivain's message of "Sun, 4 Feb 2024 23:19:15 +0100") References: <20240204221915.460639-1-ju.o@free.fr> Message-ID: <87il315weg.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 17:33:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:33:49 +0100 Subject: [Buildroot] [git commit] support/testing: new jq runtime test Message-ID: <20240206173734.A21F88732F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=feab8290a492ae76d57132f61cd1716a43a0cf78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_jq.py | 62 ++++++++++++++++++++++ .../test_jq/rootfs-overlay/root/broken.json | 1 + .../test_jq/rootfs-overlay/root/ex13-1.json | 14 +++++ .../test_jq/rootfs-overlay/root/ex13-2.json | 22 ++++++++ .../test_jq/rootfs-overlay/root/ex13-3.json | 1 + .../test_jq/rootfs-overlay/root/ex13-4.json | 1 + .../test_jq/rootfs-overlay/root/ex13-5.json | 1 + 8 files changed, 104 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c103bdadf8..4b8d195f9f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1790,6 +1790,8 @@ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_jq.py +F: support/testing/tests/package/test_jq/ F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_kmscube.py diff --git a/support/testing/tests/package/test_jq.py b/support/testing/tests/package/test_jq.py new file mode 100644 index 0000000000..67420abb6b --- /dev/null +++ b/support/testing/tests/package/test_jq.py @@ -0,0 +1,62 @@ +import json +import os + +import infra.basetest + + +class TestJq(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_jq/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_JQ=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("jq --version") + + # Run jq on examples extracted from JSON RFC: + # https://www.rfc-editor.org/rfc/rfc8259.txt + for i in range(1, 6): + fname = f"ex13-{i}.json" + cmd = f"jq -M '.' {fname}" + self.assertRunOk(cmd) + + # Check the execution fails on a non JSON file. + cmd = "jq -M '.' broken.json" + _, ret = self.emulator.run(cmd) + self.assertNotEqual(ret, 0) + + # Check an execution of a simple query. Note that output is a + # JSON (quoted) string. + cmd = "jq -M '.[1].City' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], '"SUNNYVALE"') + + # Run the same query with the -r option, to output raw text + # (i.e. strings without quotes). + cmd = "jq -r -M '.[1].City' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], "SUNNYVALE") + + # Print the ex13-2.json file as compact JSON (with option -c). + cmd = "jq -c -M '.' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + # We reload this compact string using the Python json parser, + # to test interoperability. We check the same element as in + # previous queries in the Python object. + json_data = json.loads(out[0]) + self.assertEqual(json_data[1]["City"], "SUNNYVALE") diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json new file mode 100644 index 0000000000..fc2bf94565 --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json @@ -0,0 +1 @@ +[ This is is NOT a JSON file! } diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json new file mode 100644 index 0000000000..52b7b6493f --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json @@ -0,0 +1,14 @@ +{ + "Image": { + "Width": 800, + "Height": 600, + "Title": "View from 15th Floor", + "Thumbnail": { + "Url": "http://www.example.com/image/481989943", + "Height": 125, + "Width": 100 + }, + "Animated" : false, + "IDs": [116, 943, 234, 38793] + } +} diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json new file mode 100644 index 0000000000..b4545b28c8 --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json @@ -0,0 +1,22 @@ +[ + { + "precision": "zip", + "Latitude": 37.7668, + "Longitude": -122.3959, + "Address": "", + "City": "SAN FRANCISCO", + "State": "CA", + "Zip": "94107", + "Country": "US" + }, + { + "precision": "zip", + "Latitude": 37.371991, + "Longitude": -122.026020, + "Address": "", + "City": "SUNNYVALE", + "State": "CA", + "Zip": "94085", + "Country": "US" + } +] diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json new file mode 100644 index 0000000000..6ccebb9abe --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json @@ -0,0 +1 @@ +"Hello world!" diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json @@ -0,0 +1 @@ +42 diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json new file mode 100644 index 0000000000..27ba77ddaf --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json @@ -0,0 +1 @@ +true From peter at korsgaard.com Tue Feb 6 17:40:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:40:07 +0100 Subject: [Buildroot] [PATCH] package/axel: bump version to 2.17.13 In-Reply-To: <20240206173002.25650-1-ismael@iodev.co.uk> (Ismael Luceno's message of "Tue, 6 Feb 2024 18:29:43 +0100") References: <20240206173002.25650-1-ismael@iodev.co.uk> Message-ID: <87eddp5w5k.fsf@48ers.dk> >>>>> "Ismael" == Ismael Luceno writes: > Signed-off-by: Ismael Luceno Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Tue Feb 6 17:43:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:43:08 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/python-poetry-core: new host package In-Reply-To: <20240106214410.3294887-1-james.hilliard1@gmail.com> References: <20240106214410.3294887-1-james.hilliard1@gmail.com> Message-ID: Hi James, On 06/01/2024 22:44, James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-poetry-core/python-poetry-core.hash | 5 +++++ > package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ > 2 files changed, 19 insertions(+) > create mode 100644 package/python-poetry-core/python-poetry-core.hash > create mode 100644 package/python-poetry-core/python-poetry-core.mk > > diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash > new file mode 100644 > index 0000000000..3c07fef04f > --- /dev/null > +++ b/package/python-poetry-core/python-poetry-core.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/poetry-core/json > +md5 9ed2f2e9244165b34d7233c306a34a2a poetry_core-1.8.1.tar.gz > +sha256 67a76c671da2a70e55047cddda83566035b701f7e463b32a2abfeac6e2a16376 poetry_core-1.8.1.tar.gz > +# Locally computed sha256 checksums > +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE > diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk > new file mode 100644 > index 0000000000..e1acf3179c > --- /dev/null > +++ b/package/python-poetry-core/python-poetry-core.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-poetry-core > +# > +################################################################################ > + > +PYTHON_POETRY_CORE_VERSION = 1.8.1 > +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz > +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/36/66/6af2891495d12020419c8447d0b29c1e96f3be16631faaed6bda5b886d5d > +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 > +PYTHON_POETRY_CORE_LICENSE = MIT > +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE This package has 4 vendored dependencies, each with their own license. Those should also be specified in the LICENSE and LICENSE_FILES. In addition, for lark, there's a file under MPL and a file under GPL, even though neither if those licenses is mentioned in the lark license. Ideally those two should be mentioned in the LICENSES as well. And of course, this should ideally also be done for the python-lark package which suffers from the same issue... Regards, Arnout > + > +$(eval $(host-python-package)) From peter at korsgaard.com Tue Feb 6 17:39:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:39:31 +0100 Subject: [Buildroot] [git commit] package/axel: bump version to 2.17.13 Message-ID: <20240206174452.CD84D87358@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=041e8e7e403121fcdf4c5a5fc363230c5ded2980 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Ismael Luceno Signed-off-by: Peter Korsgaard --- package/axel/axel.hash | 2 +- package/axel/axel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/axel/axel.hash b/package/axel/axel.hash index ebcdc652fc..b2ff52876b 100644 --- a/package/axel/axel.hash +++ b/package/axel/axel.hash @@ -1,2 +1,2 @@ -sha256 fb4e70535ebf732211af253bfe24f9ada57d80fd465ac02c721406c7d4e1d496 axel-2.17.12.tar.xz +sha256 6af9c0238ca4fb850baa17878de0361868e3ff6d9302298d83c6d26931c28723 axel-2.17.13.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/axel/axel.mk b/package/axel/axel.mk index d3a2f4d42c..fbfbc8be34 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -4,7 +4,7 @@ # ################################################################################ -AXEL_VERSION = 2.17.12 +AXEL_VERSION = 2.17.13 AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION) AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ From buildroot at busybox.net Tue Feb 6 17:45:09 2024 From: buildroot at busybox.net (Mail Accounts) Date: 6 Feb 2024 18:45:09 +0100 Subject: [Buildroot] Your mailbox quota is full Message-ID: <20240206184509.4E53D66CEEE201DA@busybox.net> An HTML attachment was scrubbed... URL: From peter at korsgaard.com Tue Feb 6 17:46:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:46:54 +0100 Subject: [Buildroot] [PATCH 1/1] board/radxa/rock5b: Disable FIQ debug interface In-Reply-To: <20240202233030.1192392-1-kilian.zinnecker@mail.de> (Kilian Zinnecker via buildroot's message of "Sat, 3 Feb 2024 00:30:30 +0100") References: <20240202233030.1192392-1-kilian.zinnecker@mail.de> Message-ID: <87a5od5vu9.fsf@48ers.dk> >>>>> "Kilian" == Kilian Zinnecker via buildroot writes: > The custom kernel used for the Rock5B features an FIQ debug > interface which is enabled by default. As it is not needed, it is > disabled. The documentation features instructions on how to > re-enable it, if it is needed. > Signed-off-by: Kilian Zinnecker Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 17:46:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:46:01 +0100 Subject: [Buildroot] [git commit] board/radxa/rock5b: Disable FIQ debug interface Message-ID: <20240206174709.BC7C387390@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c77a7acb8806a775cd6365c1c5de0f03141e138f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The custom kernel used for the Rock5B features an FIQ debug interface which is enabled by default. As it is not needed, it is disabled. The documentation features instructions on how to re-enable it, if it is needed. Signed-off-by: Kilian Zinnecker Signed-off-by: Peter Korsgaard --- board/radxa/rock5b/linux.fragment | 1 + board/radxa/rock5b/readme.txt | 20 ++++++++++++++++++++ board/radxa/rock5b/rock5b.dts | 12 ++++++++++++ board/radxa/rock5b/rock5b.its | 2 +- configs/rock5b_defconfig | 3 ++- 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 6d65cb7bb8..28bb373ef2 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1,4 +1,5 @@ CONFIG_R8169=y +# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set # Disable Rockchip specific WiFi drivers, as the kernel # code cannot be build with GCC 12 due to several Werrors # CONFIG_WL_ROCKCHIP is not set diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index f02f3d380e..b3eb06851a 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -20,6 +20,7 @@ output/images ????????? rk3588-rock-5b.dtb ????????? rk3588_bl31_v1.40.elf ????????? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin +????????? rock5b.dts ????????? rock5b.its ????????? rootfs.ext2 ????????? rootfs.ext4 @@ -64,6 +65,8 @@ https://forum.radxa.com/c/rock5 Issues: ======= +WiFi +---- The custom Radxa kernel provides custom code to support WiFi. However, that code does not compile with GCC 12, which is the current default version in buildroot. Hence, the WiFi kernel drivers are disabled, until @@ -80,3 +83,20 @@ BR2_GCC_VERSION_11_X=y board/radxa/rock5b/linux.fragment: # CONFIG_WL_ROCKCHIP is not set + +Rockchip FIQ Debugger +--------------------- +The custom kernel used for this board features an FIQ debugger, which +can be activated by typing "fiq" on the serial interface. As this can be +annoying if a user wants to type these charakters and it is not needed +for most users, this board support disables the FIQ debugger by default. +To re-enable the FIQ debugger follow the steps: + +1. In board/radxa/rock5b/rock5b.dts set the status property of the +fiq_debugger node to "okay" and set the status property of the uart2 +node to "disabled" + +2. Re-enable the fiq debugger module by removing the following line +from board/radxa/rock5b/linux.fragment: + +# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts new file mode 100644 index 0000000000..71a4e42b5e --- /dev/null +++ b/board/radxa/rock5b/rock5b.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "rockchip/rk3588-rock-5b.dts" + +&fiq_debugger { + status = "disabled"; +}; + +&uart2 { + pinctrl-0 = <&uart2m0_xfer>; + status = "okay"; +}; diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its index d73659a56e..9ce235d041 100644 --- a/board/radxa/rock5b/rock5b.its +++ b/board/radxa/rock5b/rock5b.its @@ -20,7 +20,7 @@ }; fdt { description = "Device Tree"; - data = /incbin/("rk3588-rock-5b.dtb"); + data = /incbin/("rock5b.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 2e72b386b1..7175aa66bf 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -14,7 +14,8 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" +# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" BR2_TARGET_ROOTFS_EXT2=y From arnout at mind.be Tue Feb 6 17:47:20 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:47:20 +0100 Subject: [Buildroot] [PATCH 2/4] package/python-aiosqlite: new package In-Reply-To: <20231214091504.101102-2-james.hilliard1@gmail.com> References: <20231214091504.101102-1-james.hilliard1@gmail.com> <20231214091504.101102-2-james.hilliard1@gmail.com> Message-ID: <28d526e3-7700-4588-881e-2aeaf63e742c@mind.be> On 14/12/2023 10:15, James Hilliard wrote: > Signed-off-by: James Hilliard Applied both to master, thanks. Regards, Arnout > --- > package/Config.in | 1 + > package/python-aiosqlite/Config.in | 6 ++++++ > package/python-aiosqlite/python-aiosqlite.hash | 5 +++++ > package/python-aiosqlite/python-aiosqlite.mk | 14 ++++++++++++++ > 4 files changed, 26 insertions(+) > create mode 100644 package/python-aiosqlite/Config.in > create mode 100644 package/python-aiosqlite/python-aiosqlite.hash > create mode 100644 package/python-aiosqlite/python-aiosqlite.mk > > diff --git a/package/Config.in b/package/Config.in > index fcc09b07c4..d24db2550e 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -971,6 +971,7 @@ menu "External python modules" > source "package/python-aioredis/Config.in" > source "package/python-aiorwlock/Config.in" > source "package/python-aiosignal/Config.in" > + source "package/python-aiosqlite/Config.in" > source "package/python-aiozipkin/Config.in" > source "package/python-alembic/Config.in" > source "package/python-alsaaudio/Config.in" > diff --git a/package/python-aiosqlite/Config.in b/package/python-aiosqlite/Config.in > new file mode 100644 > index 0000000000..950c879a49 > --- /dev/null > +++ b/package/python-aiosqlite/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_PYTHON_AIOSQLITE > + bool "python-aiosqlite" > + help > + asyncio bridge to the standard sqlite3 module. > + > + https://aiosqlite.omnilib.dev/ > diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash > new file mode 100644 > index 0000000000..e06061346c > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/aiosqlite/json > +md5 e829bf8f641ab115c1a9ca0494d35278 aiosqlite-0.19.0.tar.gz > +sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d aiosqlite-0.19.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 > new file mode 100644 > index 0000000000..e513d53c02 > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-aiosqlite > +# > +################################################################################ > + > +PYTHON_AIOSQLITE_VERSION = 0.19.0 > +PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz > +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 > +PYTHON_AIOSQLITE_SETUP_TYPE = flit > +PYTHON_AIOSQLITE_LICENSE = MIT > +PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE > + > +$(eval $(python-package)) From arnout at mind.be Tue Feb 6 17:48:18 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:48:18 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-aiosqlite: new package In-Reply-To: <20231124225945.163643-1-james.hilliard1@gmail.com> References: <20231124225945.163643-1-james.hilliard1@gmail.com> Message-ID: On 24/11/2023 23:59, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/Config.in | 1 + > package/python-aiosqlite/Config.in | 7 +++++++ > package/python-aiosqlite/python-aiosqlite.hash | 5 +++++ > package/python-aiosqlite/python-aiosqlite.mk | 14 ++++++++++++++ > 4 files changed, 27 insertions(+) > create mode 100644 package/python-aiosqlite/Config.in > create mode 100644 package/python-aiosqlite/python-aiosqlite.hash > create mode 100644 package/python-aiosqlite/python-aiosqlite.mk > > diff --git a/package/Config.in b/package/Config.in > index 5a3410d758..1f7d262265 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -971,6 +971,7 @@ menu "External python modules" > source "package/python-aioredis/Config.in" > source "package/python-aiorwlock/Config.in" > source "package/python-aiosignal/Config.in" > + source "package/python-aiosqlite/Config.in" > source "package/python-aiozipkin/Config.in" > source "package/python-alembic/Config.in" > source "package/python-alsaaudio/Config.in" > diff --git a/package/python-aiosqlite/Config.in b/package/python-aiosqlite/Config.in > new file mode 100644 > index 0000000000..6f2af23cef > --- /dev/null > +++ b/package/python-aiosqlite/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_PYTHON_AIOSQLITE > + bool "python-aiosqlite" > + help > + aiosqlite provides a friendly, async interface to sqlite > + databases. > + > + https://aiosqlite.omnilib.dev > diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash > new file mode 100644 > index 0000000000..e06061346c > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/aiosqlite/json > +md5 e829bf8f641ab115c1a9ca0494d35278 aiosqlite-0.19.0.tar.gz > +sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d aiosqlite-0.19.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 > new file mode 100644 > index 0000000000..e513d53c02 > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-aiosqlite > +# > +################################################################################ > + > +PYTHON_AIOSQLITE_VERSION = 0.19.0 > +PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz > +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 > +PYTHON_AIOSQLITE_SETUP_TYPE = flit > +PYTHON_AIOSQLITE_LICENSE = MIT > +PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE > + > +$(eval $(python-package)) From romain.naour at smile.fr Tue Feb 6 17:50:12 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 18:50:12 +0100 Subject: [Buildroot] [PATCH v3 02/11] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <20231218081958.506691-3-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-3-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > The patch sets the configurations required by TI HS systems. Some of these > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > are provided by the ti-k3-core-secdev package in the binaries directory. AFAIK the ti-k3-image-gen tool is deprecated and must be replaced by binman tool provided by upstream u-boot. Is all k3 SoC migrated to binman in the latest u-boot release 2024.01? See the FOSDEM talk: https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/21919/FOSDEM24_Speaker_Slides_y7FsIKM.pdf Best regards, Romain > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3-image-gen/Config.in | 1 + > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > index d76cef82e911..38d1598d9fc0 100644 > --- a/boot/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3-image-gen/Config.in > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > bool "ti-k3-image-gen" > depends on BR2_TARGET_TI_K3_R5_LOADER > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > # We need FIT support in uboot-tools, which is why we select a > # host package > select BR2_PACKAGE_HOST_UBOOT_TOOLS > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > index 64be9a18f2c4..91aed63bab84 100644 > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +else > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > + > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > +endif > > define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > + ) > endef > > define TI_K3_IMAGE_GEN_BUILD_CMDS > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > $(BR2_MAKE) -C $(@D) \ > SOC=$(TI_K3_IMAGE_GEN_SOC) \ > SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > + TI_SECURE_DEV_PKG=$(BINARIES_DIR) \ > CONFIG=evm \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ From giulio.benetti at benettiengineering.com Tue Feb 6 17:51:09 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 18:51:09 +0100 Subject: [Buildroot] Best board to fast boot In-Reply-To: References: <71301602-56ac-46b4-a853-bd71ed74da27@benettiengineering.com> Message-ID: Hi Franco, On 06/02/24 18:34, franco ariel wrote: > Hi Giulio, > > Thank you for you answer. > > Based on the PDF I see that I can't do those optimizations on my rpi4, > because the bootloader is not open source, right? It depends if you already tried all possible rpi bootloader options. Take a look here: https://forums.raspberrypi.com/viewtopic.php?t=277010#p1684446 that way you can zero boot_delay. Someone claims that it doesn't work, but it's worth a try to get 2/3 seconds less. Also I think there could be other options to tweak. Then it depends when you launch your qt application, I mean in which script and it also depends which init system you use. Busybox one is pretty fast, but it depends if for example you leave all init.d scripts as they are. Let's say you wait for network to be connected(waiting for handshake etc.), that will result in many seconds wasted. So, the Beagleboard > looks good but, the RAM is quite low, I was looking for something better > to run my qt application, which has smooth animations and transitions, > BLE, touchscreen support, etc. witch board, with the bootloader open > source, can I use to boot as fast as possible into the qt app? I would try to optimize what you get to understand more deeply what's going on. Because rpi4 processor BCM2711 is really very very fast. Otherwise you can switch to any ready to go defconfig we have and dig the board that fits better for you. That way you will have u-boot in general and you can save time, but again, on boot_delay. The choice is yours of course. -- Giulio Benetti CEO&CTO at Benetti Engineering sas > Thank you, > Franco > > > > ------------------------------------------------------------------------ > *De:*?Giulio Benetti > *Enviado:*?martes, 6 de febrero de 2024 06:52 > *Para:*?franco ariel ; Thomas Petazzoni via > buildroot > *Asunto:*?Re: [Buildroot] Best board to fast boot > Hi Franco, > > On 06/02/24 05:14, franco ariel wrote: >> Hello guys! >> I few weeks ago I started working with buildroot on rpi4, and it's look >> amazing, thanks to the community I was able to run a flutter app on my >> rpi4. But now, I want to keep going forward with my project, so ?Witch >> one are the best board to achieve te best boot time to a Qt application? >> I was looking for the Rockpro64 from pine but I'm not sure, since there >> is not so much information about this board. >> >> What do you think it will be good for my project? On rpi4 I was able to >> get 10sec boot time until the qt app shows up. And I want to achieve >> less than 7s. > > This depends a lot on optimization you do on bootloader, linux and init > script. > > I suggest you to take a look at these slides: > https://bootlin.com/doc/training/boot-time/boot-time-slides.pdf > > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Tue Feb 6 17:52:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:52:34 +0100 Subject: [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain In-Reply-To: <20240131112223.2175855-1-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> Message-ID: <20240206185234.04a67c61@windsurf> On Wed, 31 Jan 2024 11:22:13 +0000 Neal Frager via buildroot wrote: > This patch adds a new virtual package for adding a bare-metal > toolchain to Buildroot. For now, it depends on nothing, so it will not > actually build anything, but it defines some options that will be > needed by the various packages that will be part of this toolchain > build process. > > Signed-off-by: Neal Frager > Signed-off-by: Ibai Erkiaga > Signed-off-by: Thomas Petazzoni > --- > DEVELOPERS | 4 ++++ > toolchain/Config.in | 10 ++++++++++ > toolchain/toolchain-bare-metal-buildroot/Config.in | 9 +++++++++ > .../toolchain-bare-metal-buildroot.mk | 12 ++++++++++++ > utils/checksymbolslib/br.py | 3 +++ > 5 files changed, 38 insertions(+) > create mode 100644 toolchain/toolchain-bare-metal-buildroot/Config.in > create mode 100644 toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 17:52:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:52:37 +0100 Subject: [Buildroot] [PATCH v9 02/11] package/binutils-bare-metal: new package In-Reply-To: <20240131112223.2175855-2-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-2-neal.frager@amd.com> Message-ID: <20240206185237.2eb77996@windsurf> On Wed, 31 Jan 2024 11:22:14 +0000 Neal Frager via buildroot wrote: > This patch adds a new package for building binutils for a bare-metal toolchain. > The cpu architecture is defined by a toolchain-bare-metal virtual package. > While any cpu architecture could be used, the default configuration will be a > Xilinx microblaze little endian architecture, so that buildroot will be able > to build the microblaze firmware applications for zynqmp and versal. > > In order to build the zynqmp pmufw and versal plm applications without error, > binutils version 2.41 or higher is required. > > Signed-off-by: Neal Frager > Signed-off-by: Ibai Erkiaga > Signed-off-by: Thomas Petazzoni > --- > V1->V2: > - removed default enable to be replaced with toolchain select config > V2->V3: > - no changes > V3->V4: > - split tar instruction into multiple lines > - replaced unnecessary =? with = for assignments > - changed xlnx-rel-v2023.1.tar.gz hash to sha256 > - improved menuconfig help comment > V4->V5: > - moved to upstream version 2.41 with needed patches > - reduced all lines to <80 chars > V5->V6: > - migrated to toolchain-bare-metal-buildroot > V6->V7: > - removed Config.in and hard-coded version > V7->V8: > - no changes > V8->V9: > - bumped to binutils 2.42 > - removed patches since they are included with binutils 2.42 > --- > DEVELOPERS | 2 ++ > .../binutils-bare-metal.hash | 1 + > .../binutils-bare-metal.mk | 33 +++++++++++++++++++ > package/binutils/binutils.hash | 1 + > 4 files changed, 37 insertions(+) > create mode 120000 package/binutils-bare-metal/binutils-bare-metal.hash > create mode 100644 package/binutils-bare-metal/binutils-bare-metal.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 17:52:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:52:41 +0100 Subject: [Buildroot] [PATCH v9 03/11] package/gcc-bare-metal: new package In-Reply-To: <20240131112223.2175855-3-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-3-neal.frager@amd.com> Message-ID: <20240206185241.2d3bba6e@windsurf> On Wed, 31 Jan 2024 11:22:15 +0000 Neal Frager via buildroot wrote: > This patch adds a new package for building gcc for a bare-metal toolchain. > The cpu architecture is defined by a toolchain-bare-metal virtual package. > While any cpu architecture could be used, the default configuration will be a > Xilinx microblaze little endian architecture, so that buildroot will be able > to build the microblaze firmware applications for zynqmp and versal. > > Signed-off-by: Neal Frager > Signed-off-by: Ibai Erkiaga > Signed-off-by: Thomas Petazzoni > --- > V1->V2: > - removed default enable to be replaced with toolchain select config > V2->V3: > - no changes > V3->V4: > - split tar instruction into multiple lines > - replaced unnecessary =? with = for assignments > - changed xlnx-rel-v2023.1.tar.gz hash to sha256 > - improved menuconfig help comment > V4->V5: > - moved to upstream gcc without any xilinx patches > - reduced all lines to <80 chars > - added license files > V5->V6: > - migrated to toolchain-bare-metal-buildroot > V6->V7: > - removed Config.in and hard-coded version > - added sysroot for newlib install > V7->V8: > - no changes > V8->V9: > - integrated changes from Thomas > --- > DEVELOPERS | 2 + > package/gcc-bare-metal/13.2.0 | 1 + > package/gcc-bare-metal/gcc-bare-metal.hash | 1 + > package/gcc-bare-metal/gcc-bare-metal.mk | 61 ++++++++++++++++++++++ > 4 files changed, 65 insertions(+) > create mode 120000 package/gcc-bare-metal/13.2.0 > create mode 120000 package/gcc-bare-metal/gcc-bare-metal.hash > create mode 100644 package/gcc-bare-metal/gcc-bare-metal.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 17:52:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:52:44 +0100 Subject: [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: new package In-Reply-To: <20240131112223.2175855-4-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-4-neal.frager@amd.com> Message-ID: <20240206185244.2b75b044@windsurf> On Wed, 31 Jan 2024 11:22:16 +0000 Neal Frager via buildroot wrote: > This patch adds a new package for building newlib for a bare-metal toolchain. > The cpu architecture is defined by a toolchain-bare-metal virtual package. > While any cpu architecture could be used, the default configuration will be a > Xilinx microblaze little endian architecture, so that buildroot will be able > to build the microblaze firmware applications for zynqmp and versal. > > Signed-off-by: Neal Frager > Signed-off-by: Ibai Erkiaga > Signed-off-by: Thomas Petazzoni > --- > V1->V2: > - removed default enable to be replaced with toolchain select config > V2->V3: > - no changes > V3->V4: > - replaced unnecessary =? with = for assignments > - improved menuconfig help comment > V4->V5: > - added license files > - reduced all lines to <80 chars > V5->V6: > - migrated to toolchain-bare-metal-buildroot > V6->V7: > - hard-coded version > - converted to target package with gcc-bare-metal sysroot install > V7->V8: > - no changes > V8->V9: > - bumped to version 4.4.0 > --- > DEVELOPERS | 2 + > package/newlib-bare-metal/Config.in | 2 + > .../newlib-bare-metal/newlib-bare-metal.hash | 8 +++ > .../newlib-bare-metal/newlib-bare-metal.mk | 52 +++++++++++++++++++ > 4 files changed, 64 insertions(+) > create mode 100644 package/newlib-bare-metal/Config.in > create mode 100644 package/newlib-bare-metal/newlib-bare-metal.hash > create mode 100644 package/newlib-bare-metal/newlib-bare-metal.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 17:53:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:53:02 +0100 Subject: [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: new package In-Reply-To: References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-4-neal.frager@amd.com> Message-ID: <20240206185302.75f46cf6@windsurf> On Fri, 2 Feb 2024 12:11:29 +0000 "Frager, Neal via buildroot" wrote: > 1. Thanks to the binutils 2.42 release, we do not need microblaze patches > anymore. Excellent! > 2. I chose to keep the newlib fixup. Even though the --with-tooldir patch was > accepted upstream, newlib requires autoconf 2.69 for this patch to be applied. > So rather than including a version of the patch that works on the output > configure script directly, I thought it would be better to just keep the fixup > for now. We can remove the fixup with the next newlib release which will have > a configurable --with-tooldir option. I think it's a reasonable trade-off indeed. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 17:53:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:53:05 +0100 Subject: [Buildroot] [PATCH v9 05/11] toolchain/toolchain-bare-metal-buildroot: wire up newlib-bare-metal In-Reply-To: <20240131112223.2175855-5-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-5-neal.frager@amd.com> Message-ID: <20240206185305.0ca3bb42@windsurf> On Wed, 31 Jan 2024 11:22:17 +0000 Neal Frager via buildroot wrote: > Signed-off-by: Thomas Petazzoni > Signed-off-by: Neal Frager > --- > toolchain/Config.in | 1 + > toolchain/toolchain-bare-metal-buildroot/Config.in | 2 ++ > .../toolchain-bare-metal-buildroot.mk | 2 +- > 3 files changed, 4 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From dario.binacchi at amarulasolutions.com Tue Feb 6 17:53:28 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 6 Feb 2024 18:53:28 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinyxml2: add host variant Message-ID: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> It is required by package uuu starting from version 1.5.165. Signed-off-by: Dario Binacchi --- package/tinyxml2/tinyxml2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index 5ea9e13a4b0b..f53e8d6b9926 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -16,3 +16,4 @@ TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON endif $(eval $(cmake-package)) +$(eval $(host-cmake-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 6 17:53:29 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 6 Feb 2024 18:53:29 +0100 Subject: [Buildroot] [PATCH 2/2] package/uuu: bump to version 1.5.165 In-Reply-To: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> References: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240206175330.570115-2-dario.binacchi@amarulasolutions.com> It requires the host-tinyxml2 package. The hash of README.md has changed because a reference to the tinyxml2 license has been added: + - tinyxml (zlib license) is from https://github.com/leethomason/tinyxml2 Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.163 https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.165 Signed-off-by: Dario Binacchi --- package/uuu/uuu.hash | 4 ++-- package/uuu/uuu.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index 20816b5081db..c231d5d729f0 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 6972c7a1e76d60a22212913a8867b737104410c2a47ad88c8af460bd4885ec09 uuu_source-uuu_1.5.141.tar.gz +sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE -sha256 2d872c6e5aaea15ec1932bfb378fb62e24ee7ec399fe7f998f03d9b728215335 README.md +sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 93c748ee46d8..d1bae61f528e 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,11 +4,11 @@ # ################################################################################ -UUU_VERSION = 1.5.141 +UUU_VERSION = 1.5.165 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License UUU_LICENSE_FILES = LICENSE README.md -HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd +HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd host-tinyxml2 $(eval $(host-cmake-package)) -- 2.43.0 From arnout at mind.be Tue Feb 6 17:55:45 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:55:45 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/python-aiosqlite: new package In-Reply-To: References: <20240106214410.3294887-1-james.hilliard1@gmail.com> <20240106214410.3294887-2-james.hilliard1@gmail.com> Message-ID: <2e4bb17c-ef38-437b-bc6e-853c92f32646@mind.be> On 06/02/2024 18:17, Arnout Vandecappelle wrote: > > > On 06/01/2024 22:44, James Hilliard wrote: >> Signed-off-by: James Hilliard > > ?Applied both to master, thanks. ?Sorry, I got confused with the different versions. I actually applied this version of python-aiosqlite, but I used the help text from the other one because that was better. ?I didn't apply any other patch from this series because the license of poetry-core is not correct. The rest of the series is also marked Changes Requested. ?Please avoid having the same patch (like this one) in several series. If you need it in several series, just combine those patches in a single series and mark the previous version as Superseded. That makes our live a lot easier. ?Regards, ?Arnout > > ?Regards, > ?Arnout > >> --- >> Changes v1 -> v2: >> ?? - add missing python sqlite module >> --- >> ? package/Config.in????????????????????????????? |? 1 + >> ? package/python-aiosqlite/Config.in???????????? |? 7 +++++++ >> ? package/python-aiosqlite/python-aiosqlite.hash |? 5 +++++ >> ? package/python-aiosqlite/python-aiosqlite.mk?? | 14 ++++++++++++++ >> ? 4 files changed, 27 insertions(+) >> ? create mode 100644 package/python-aiosqlite/Config.in >> ? create mode 100644 package/python-aiosqlite/python-aiosqlite.hash >> ? create mode 100644 package/python-aiosqlite/python-aiosqlite.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index f5d0c06334..ea023a84ef 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -978,6 +978,7 @@ menu "External python modules" >> ????? source "package/python-aioredis/Config.in" >> ????? source "package/python-aiorwlock/Config.in" >> ????? source "package/python-aiosignal/Config.in" >> +??? source "package/python-aiosqlite/Config.in" >> ????? source "package/python-aiozipkin/Config.in" >> ????? source "package/python-alembic/Config.in" >> ????? source "package/python-alsaaudio/Config.in" >> diff --git a/package/python-aiosqlite/Config.in >> b/package/python-aiosqlite/Config.in >> new file mode 100644 >> index 0000000000..77c78ea25d >> --- /dev/null >> +++ b/package/python-aiosqlite/Config.in >> @@ -0,0 +1,7 @@ >> +config BR2_PACKAGE_PYTHON_AIOSQLITE >> +??? bool "python-aiosqlite" >> +??? select BR2_PACKAGE_PYTHON3_SQLITE # runtime >> +??? help >> +????? asyncio bridge to the standard sqlite3 module. >> + >> +????? https://aiosqlite.omnilib.dev/ >> diff --git a/package/python-aiosqlite/python-aiosqlite.hash >> b/package/python-aiosqlite/python-aiosqlite.hash >> new file mode 100644 >> index 0000000000..e06061346c >> --- /dev/null >> +++ b/package/python-aiosqlite/python-aiosqlite.hash >> @@ -0,0 +1,5 @@ >> +# md5, sha256 from https://pypi.org/pypi/aiosqlite/json >> +md5? e829bf8f641ab115c1a9ca0494d35278? aiosqlite-0.19.0.tar.gz >> +sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d >> aiosqlite-0.19.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 >> new file mode 100644 >> index 0000000000..e513d53c02 >> --- /dev/null >> +++ b/package/python-aiosqlite/python-aiosqlite.mk >> @@ -0,0 +1,14 @@ >> +################################################################################ >> >> +# >> +# python-aiosqlite >> +# >> +################################################################################ >> >> + >> +PYTHON_AIOSQLITE_VERSION = 0.19.0 >> +PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz >> +PYTHON_AIOSQLITE_SITE = >> https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 >> +PYTHON_AIOSQLITE_SETUP_TYPE = flit >> +PYTHON_AIOSQLITE_LICENSE = MIT >> +PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE >> + >> +$(eval $(python-package)) From arnout at mind.be Tue Feb 6 17:53:35 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:53:35 +0100 Subject: [Buildroot] [git commit] package/python-opcua-asyncio: bump to version 1.0.5 Message-ID: <20240206175614.47340873AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46a985eb4dacac201dfc8b2b8d272ee3112ef80f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new python-aiosqlite, python-sortedcontainers and python-pyopenssl runtime dependencies. Remove no longer required python-lxml runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-opcua-asyncio/Config.in | 4 +++- package/python-opcua-asyncio/python-opcua-asyncio.hash | 4 ++-- package/python-opcua-asyncio/python-opcua-asyncio.mk | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-opcua-asyncio/Config.in b/package/python-opcua-asyncio/Config.in index e5b8623f0d..139238b5e9 100644 --- a/package/python-opcua-asyncio/Config.in +++ b/package/python-opcua-asyncio/Config.in @@ -2,10 +2,12 @@ config BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO bool "python-opcua-asyncio" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_AIOFILES # runtime + select BR2_PACKAGE_PYTHON_AIOSQLITE # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_DATEUTIL # runtime - select BR2_PACKAGE_PYTHON_LXML # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime + select BR2_PACKAGE_PYTHON_SORTEDCONTAINERS # runtime + select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime help opcua-asyncio is an asyncio-based asynchronous OPC UA client based on python-opcua, removing diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.hash b/package/python-opcua-asyncio/python-opcua-asyncio.hash index 21b5794ebf..f5856019a5 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.hash +++ b/package/python-opcua-asyncio/python-opcua-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asyncua/json -md5 f67770b896d2ffe975adbaea38c5efc9 asyncua-1.0.1.tar.gz -sha256 515342470022b9c391587dcf526015ff4c7582f566c72406c778c9f9a2757cad asyncua-1.0.1.tar.gz +md5 37000bc60b98b4822511ced1c2b4c020 asyncua-1.0.5.tar.gz +sha256 2757163f2a2ff1d8b923297d4af9b8161d25bed95867c1f67078faaf7f2d3f92 asyncua-1.0.5.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index 52c5d5117e..a8be2c8722 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OPCUA_ASYNCIO_VERSION = 1.0.1 +PYTHON_OPCUA_ASYNCIO_VERSION = 1.0.5 PYTHON_OPCUA_ASYNCIO_SOURCE = asyncua-$(PYTHON_OPCUA_ASYNCIO_VERSION).tar.gz -PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/9f/88/c32bd5904c92475dd30fa2c3130c4f9170a36343d390e2ce5b002fdf1cee +PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/bf/c6/3c17b8b5335faffc2f08c728008c5ae7cc46d24f674bc1038a69d1849ef6 PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING From arnout at mind.be Tue Feb 6 17:53:24 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:53:24 +0100 Subject: [Buildroot] [git commit] package/python-aiosqlite: new package Message-ID: <20240206175614.3A925873AE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60a6188a8616fdf5b4c8d71c650ff014c29f7c32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + package/python-aiosqlite/Config.in | 8 ++++++++ package/python-aiosqlite/python-aiosqlite.hash | 5 +++++ package/python-aiosqlite/python-aiosqlite.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/package/Config.in b/package/Config.in index 728bd03b80..b48f9eb1c7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -978,6 +978,7 @@ menu "External python modules" source "package/python-aioredis/Config.in" source "package/python-aiorwlock/Config.in" source "package/python-aiosignal/Config.in" + source "package/python-aiosqlite/Config.in" source "package/python-aiozipkin/Config.in" source "package/python-alembic/Config.in" source "package/python-alsaaudio/Config.in" diff --git a/package/python-aiosqlite/Config.in b/package/python-aiosqlite/Config.in new file mode 100644 index 0000000000..c95c2b9510 --- /dev/null +++ b/package/python-aiosqlite/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_AIOSQLITE + bool "python-aiosqlite" + select BR2_PACKAGE_PYTHON3_SQLITE # runtime + help + aiosqlite provides a friendly, async interface to sqlite + databases. + + https://aiosqlite.omnilib.dev diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash new file mode 100644 index 0000000000..e06061346c --- /dev/null +++ b/package/python-aiosqlite/python-aiosqlite.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiosqlite/json +md5 e829bf8f641ab115c1a9ca0494d35278 aiosqlite-0.19.0.tar.gz +sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d aiosqlite-0.19.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 new file mode 100644 index 0000000000..e513d53c02 --- /dev/null +++ b/package/python-aiosqlite/python-aiosqlite.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiosqlite +# +################################################################################ + +PYTHON_AIOSQLITE_VERSION = 0.19.0 +PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 +PYTHON_AIOSQLITE_SETUP_TYPE = flit +PYTHON_AIOSQLITE_LICENSE = MIT +PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From buildroot at bubu1.eu Tue Feb 6 17:56:12 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 18:56:12 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-bitarray: new package In-Reply-To: <20240206155140.2351424-1-romain.naour@smile.fr> References: <20240206155140.2351424-1-romain.naour@smile.fr> Message-ID: <553ce8df-aa66-4c92-be68-9486821ca36e@bubu1.eu> On 06.02.24 16:51, Romain Naour wrote: > This package is needed at runtime by python-bitstring since > 4.1.1 already. > > Note: the License is under Python-2.0 but Python Software Foundation ("PSF") > has been remplaced by the author of bitarray Ilan Schnell. I had a bit of trouble understanding this sentence, so after IRL discussion: The license of the package is "Python Software Foundation License (PSF)" (with the developer name changed to the package author name). > > [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.1 > > Signed-off-by: Romain Naour > --- > Triple checked the license type with other distribution: > https://salsa.debian.org/python-team/packages/python-bitarray/-/blob/master/debian/copyright?ref_type=heads > https://src.fedoraproject.org/rpms/python-bitarray/blob/rawhide/f/python-bitarray.spec > https://aur.archlinux.org/packages/python-bitarray Reviewed-by: Marcus Hoffmann > --- > package/Config.in | 1 + > package/python-bitarray/Config.in | 6 ++++++ > package/python-bitarray/python-bitarray.hash | 5 +++++ > package/python-bitarray/python-bitarray.mk | 14 ++++++++++++++ > 4 files changed, 26 insertions(+) > create mode 100644 package/python-bitarray/Config.in > create mode 100644 package/python-bitarray/python-bitarray.hash > create mode 100644 package/python-bitarray/python-bitarray.mk > > diff --git a/package/Config.in b/package/Config.in > index 728bd03b80..708dc376b1 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1007,6 +1007,7 @@ menu "External python modules" > source "package/python-bcrypt/Config.in" > source "package/python-beautifulsoup4/Config.in" > source "package/python-bidict/Config.in" > + source "package/python-bitarray/Config.in" > source "package/python-bitstring/Config.in" > source "package/python-bleak/Config.in" > source "package/python-blinker/Config.in" > diff --git a/package/python-bitarray/Config.in b/package/python-bitarray/Config.in > new file mode 100644 > index 0000000000..38d685f4fd > --- /dev/null > +++ b/package/python-bitarray/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_PYTHON_BITARRAY > + bool "python-bitarray" > + help > + efficient arrays of booleans -- C extension. > + > + https://github.com/ilanschnell/bitarray > diff --git a/package/python-bitarray/python-bitarray.hash b/package/python-bitarray/python-bitarray.hash > new file mode 100644 > index 0000000000..d91a28af20 > --- /dev/null > +++ b/package/python-bitarray/python-bitarray.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/bitarray/json > +md5 024324a82314e9e68ecdcdefdc69071f bitarray-2.9.2.tar.gz > +sha256 a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e bitarray-2.9.2.tar.gz > +# Locally computed sha256 checksums > +sha256 6b5e04f6e0462e1b97be833f9d65e66cd5eceb3283f4a6f532261087d0ab1233 LICENSE > diff --git a/package/python-bitarray/python-bitarray.mk b/package/python-bitarray/python-bitarray.mk > new file mode 100644 > index 0000000000..f86320c112 > --- /dev/null > +++ b/package/python-bitarray/python-bitarray.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-bitarray > +# > +################################################################################ > + > +PYTHON_BITARRAY_VERSION = 2.9.2 > +PYTHON_BITARRAY_SOURCE = bitarray-$(PYTHON_BITARRAY_VERSION).tar.gz > +PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/c7/bf/25cf92a83e1fe4948d7935ae3c02f4c9ff9cb9c13e977fba8af11a5f642c > +PYTHON_BITARRAY_SETUP_TYPE = setuptools > +PYTHON_BITARRAY_LICENSE = Python-2.0 > +PYTHON_BITARRAY_LICENSE_FILES = LICENSE > + > +$(eval $(python-package)) From fontaine.fabrice at gmail.com Tue Feb 6 17:59:00 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 18:59:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: <2be6d0df-6165-4da9-b69c-ad0deb5444be@smile.fr> References: <20240106101202.495801-1-fontaine.fabrice@gmail.com> <2be6d0df-6165-4da9-b69c-ad0deb5444be@smile.fr> Message-ID: Hello Romain, Le mar. 6 f?vr. 2024 ? 18:32, Romain Naour a ?crit : > > Hello, > > Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit : > > ncmpc is able to automatically detect NLS support since version 0.47 and > > https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 > > so let it handle automatically to avoid the following build failure with > > a bootlin toolchain which embeds a gettext definition in libintl.h which > > will clash with the fake gettext definition provided by ncmpc since > > https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: > > > > In file included from ../src/save_playlist.cxx:8: > > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' > > 39 | extern char *gettext (const char *__msgid) > > | ^~~~~~~ > > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' > > ../src/i18n.h:22:20: note: to match this '(' > > 22 | #define gettext(x) (x) > > | ^ > > > > Indeed, even if NLS is disabled by the user, libintl.h will be included > > by > > /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h > > though include > > We usually want to explicitly handle such option from Buildroot package to not > rely on automatic detection (as currently done). > > It look like more a bug in ncmpc build system? I don't know, upstream wants to have the same code with and without NLS, so they decided to define a gettext macro when NLS is disabled. I could find an upstreamable solution as upstream will probably reject a patch that removes this gettext define and puts #ifdef ENABLE_NLS before every gettext calls. Do you have an upstreamable solution or should we just add a NLS dependency to ncmpc? > > Best regards, > Romain > > > > > > Fixes: > > - http://autobuild.buildroot.org/results/c860e64909dd3b7fa033db0970e1cfc1376c4ec5 > > - http://autobuild.buildroot.org/results/36eab556fac80124755bff4110af3e43fe6edd78 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/ncmpc/ncmpc.mk | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk > > index bc8a62daea..0965981f23 100644 > > --- a/package/ncmpc/ncmpc.mk > > +++ b/package/ncmpc/ncmpc.mk > > @@ -20,8 +20,7 @@ NCMPC_CPE_ID_VENDOR = ncmpc_project > > > > NCMPC_CONF_OPTS = \ > > -Dcurses=ncurses \ > > - -Ddocumentation=disabled \ > > - $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) > > + -Ddocumentation=disabled > > > > ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) > > NCMPC_DEPENDENCIES += lirc-tools > Best Regards, Fabrice From fontaine.fabrice at gmail.com Tue Feb 6 18:03:41 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 19:03:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/linux-pam: fix musl build Message-ID: <20240206180341.3910-1-fontaine.fabrice@gmail.com> Fix the following musl build failure raised since bump to version 1.6.0 in commit 7794fa4c4e1d19a245bb0367cde94560432a2bc5: pam_namespace.c: In function 'process_line': pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { | ^~~~~~~~ pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? 40 | #include "argv_parse.h" +++ |+#include 41 | Fixes: - http://autobuild.buildroot.org/results/f07360f33010a2cf19aace266faae14a834bd9a4 Signed-off-by: Fabrice Fontaine --- .../0001-pam_namespace-include-stdint-h.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/linux-pam/0001-pam_namespace-include-stdint-h.patch diff --git a/package/linux-pam/0001-pam_namespace-include-stdint-h.patch b/package/linux-pam/0001-pam_namespace-include-stdint-h.patch new file mode 100644 index 0000000000..59d2e8700f --- /dev/null +++ b/package/linux-pam/0001-pam_namespace-include-stdint-h.patch @@ -0,0 +1,42 @@ +From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001 +From: Jacob Heider +Date: Wed, 17 Jan 2024 11:49:26 -0500 +Subject: [PATCH] pam_namespace: include stdint.h + +pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h, +resulting in the following build failures on 1.6.0: + + pam_namespace.c: In function 'process_line': + pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) + 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { + | ^~~~~~~~ + pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? + 40 | #include "argv_parse.h" + +++ |+#include + 41 | + pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in + 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { + | ^~~~~~~~ + +Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config") +Resolves: https://github.com/linux-pam/linux-pam/issues/733 + +Upstream: https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 +SIgned-off-by: Fabrice Fontaine +--- + modules/pam_namespace/pam_namespace.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c +index f72d67189..b16731c22 100644 +--- a/modules/pam_namespace/pam_namespace.c ++++ b/modules/pam_namespace/pam_namespace.c +@@ -34,6 +34,8 @@ + + #define _ATFILE_SOURCE + ++#include "config.h" ++#include + #include "pam_cc_compat.h" + #include "pam_inline.h" + #include "pam_namespace.h" -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 6 18:07:43 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 19:07:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pydantic: add CPE variables Message-ID: <20240206180743.6460-1-fontaine.fabrice@gmail.com> cpe:2.3:a:pydantic_project:pydantic is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/9B7C28E5-ACB1-4252-AE8F-4225C1AF739E Signed-off-by: Fabrice Fontaine --- package/python-pydantic/python-pydantic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index 7ad7abeb8d..0cce5a153f 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -10,6 +10,8 @@ PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/aa/3f/56142232152 PYTHON_PYDANTIC_SETUP_TYPE = pep517 PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE +PYTHON_PYDANTIC_CPE_ID_VENDOR = pydantic_project +PYTHON_PYDANTIC_CPE_ID_PRODUCT = pydantic PYTHON_PYDANTIC_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-fancy-pypi-readme -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 6 18:35:36 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 19:35:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-opcua-asyncio: add CPE variables Message-ID: <20240206183536.284845-1-fontaine.fabrice@gmail.com> cpe:2.3:a:freeopcua:opcua-asyncio is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/39E826E8-04D1-465F-AA4E-7A41B387D7CE Signed-off-by: Fabrice Fontaine --- package/python-opcua-asyncio/python-opcua-asyncio.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index a8be2c8722..226b9bbc21 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -10,5 +10,7 @@ PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/bf/c6/3c17b8 PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING +PYTHON_OPCUA_ASYNCIO_CPE_ID_VENDOR = freeopcua +PYTHON_OPCUA_ASYNCIO_CPE_ID_PRODUCT = opcua-asyncio $(eval $(python-package)) -- 2.43.0 From ddrokosov at salutedevices.com Tue Feb 6 19:25:34 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Tue, 6 Feb 2024 22:25:34 +0300 Subject: [Buildroot] [PATCH v2 2/2] package/linux-tools: multilib build supported In-Reply-To: <20240206192543.7179-1-ddrokosov@salutedevices.com> References: <20240206192543.7179-1-ddrokosov@salutedevices.com> Message-ID: <20240206192543.7179-3-ddrokosov@salutedevices.com> From: Konstantin Menyaev - LINUX_TOOLS_MAKE_OPTS option introduced: allows to override CROSS_COMPILE param Signed-off-by: Konstantin Menyaev Signed-off-by: Dmitry Rokosov --- package/linux-tools/linux-tool-gpio.mk.in | 2 +- package/linux-tools/linux-tool-iio.mk.in | 2 +- package/linux-tools/linux-tool-mm.mk.in | 2 +- package/linux-tools/linux-tool-pci.mk.in | 2 +- package/linux-tools/linux-tool-perf.mk.in | 2 +- package/linux-tools/linux-tool-selftests.mk.in | 2 +- package/linux-tools/linux-tool-tmon.mk.in | 2 +- package/linux-tools/linux-tools.mk | 2 ++ 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package/linux-tools/linux-tool-gpio.mk.in b/package/linux-tools/linux-tool-gpio.mk.in index e825db1b1127..dcee11002e8c 100644 --- a/package/linux-tools/linux-tool-gpio.mk.in +++ b/package/linux-tools/linux-tool-gpio.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += gpio -GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" +GPIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" define GPIO_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-iio.mk.in b/package/linux-tools/linux-tool-iio.mk.in index 27ab0ed7ed63..1372faafd1a8 100644 --- a/package/linux-tools/linux-tool-iio.mk.in +++ b/package/linux-tools/linux-tool-iio.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += iio -IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" +IIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" define IIO_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in index 5431e0574b04..51a54026dea4 100644 --- a/package/linux-tools/linux-tool-mm.mk.in +++ b/package/linux-tools/linux-tool-mm.mk.in @@ -7,7 +7,7 @@ LINUX_TOOLS += mm MM_DEPENDENCIES = linux -MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" +MM_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) CC="$(TARGET_CC)" define MM_BUILD_CMDS $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in index 17246f5d7ed2..48c3435a5c8a 100644 --- a/package/linux-tools/linux-tool-pci.mk.in +++ b/package/linux-tools/linux-tool-pci.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += pci -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" +PCI_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" define PCI_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index ee308a85dfd1..38910cda7d75 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -19,7 +19,7 @@ PERF_ARCH=$(NORMALIZED_ARCH) endif PERF_MAKE_FLAGS = \ - $(LINUX_MAKE_FLAGS) \ + $(LINUX_TOOLS_MAKE_OPTS) \ JOBS=$(PARALLEL_JOBS) \ ARCH=$(PERF_ARCH) \ DESTDIR=$(TARGET_DIR) \ diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in index e29c7f59debd..144dd6616f2b 100644 --- a/package/linux-tools/linux-tool-selftests.mk.in +++ b/package/linux-tools/linux-tool-selftests.mk.in @@ -22,7 +22,7 @@ SELFTESTS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_OPENSSL),openssl) SELFTESTS_MAKE_FLAGS = \ - $(LINUX_MAKE_FLAGS) \ + $(LINUX_TOOLS_MAKE_OPTS) \ ARCH=$(SELFTESTS_ARCH) # O must be redefined here to overwrite the one used by Buildroot for diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in index 56c328c51fd7..7c33915049c2 100644 --- a/package/linux-tools/linux-tool-tmon.mk.in +++ b/package/linux-tools/linux-tool-tmon.mk.in @@ -7,7 +7,7 @@ LINUX_TOOLS += tmon TMON_DEPENDENCIES = host-pkgconf ncurses -TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ +TMON_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) \ CC=$(TARGET_CC) \ LDFLAGS="$(TARGET_LDFLAGS)" \ PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig diff --git a/package/linux-tools/linux-tools.mk b/package/linux-tools/linux-tools.mk index 81b1fbc17605..38bb2c83966a 100644 --- a/package/linux-tools/linux-tools.mk +++ b/package/linux-tools/linux-tools.mk @@ -26,6 +26,8 @@ LINUX_TOOLS_PATCH_DEPENDENCIES = linux # may install shared libraries and headers (e.g. cpupower). LINUX_TOOLS_INSTALL_STAGING = YES +LINUX_TOOLS_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CROSS_COMPILE="$(TARGET_CROSS)" + LINUX_TOOLS_DEPENDENCIES += $(foreach tool,$(LINUX_TOOLS),\ $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ $($(call UPPERCASE,$(tool))_DEPENDENCIES))) -- 2.43.0 From ddrokosov at salutedevices.com Tue Feb 6 19:25:32 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Tue, 6 Feb 2024 22:25:32 +0300 Subject: [Buildroot] [PATCH v2 0/2] package/linux-tools: introduce linux mm tools Message-ID: <20240206192543.7179-1-ddrokosov@salutedevices.com> This toolset was designed to facilitate the testing, monitoring, and tracing of various things with virtual memory, pages, and slab objects. It is an invaluable resource for identifying and analyzing memory-related issues, such as leaks and bottlenecks, and can greatly enhance one's understanding of memory utilization within a system. Also this patch series includes multilib build support for all linux-tools. Changes v2 since v1 at [1]: - instead of comparing kernel versions, verify the presence of the tools/{mm|vm}/Makefile - add multilib build support patch for all linux-tools Links: [1] https://lore.kernel.org/all/20230609113415.13856-1-ddrokosov at sberdevices.ru/ Dmitry Rokosov (1): package/linux-tools: introduce linux mm tools Konstantin Menyaev (1): package/linux-tools: multilib build supported package/linux-tools/Config.in | 18 ++++++++ package/linux-tools/linux-tool-gpio.mk.in | 2 +- package/linux-tools/linux-tool-iio.mk.in | 2 +- package/linux-tools/linux-tool-mm.mk.in | 41 +++++++++++++++++++ package/linux-tools/linux-tool-pci.mk.in | 2 +- package/linux-tools/linux-tool-perf.mk.in | 2 +- .../linux-tools/linux-tool-selftests.mk.in | 2 +- package/linux-tools/linux-tool-tmon.mk.in | 2 +- package/linux-tools/linux-tools.mk | 2 + 9 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 package/linux-tools/linux-tool-mm.mk.in -- 2.43.0 From indrek.kruusa at gmail.com Tue Feb 6 19:30:01 2024 From: indrek.kruusa at gmail.com (Indrek Kruusa) Date: Tue, 6 Feb 2024 21:30:01 +0200 Subject: [Buildroot] [PATCH v4 1/1] configs/mangopi_mangopi_mq_d1s: new defconfig In-Reply-To: <57cacd5b-aa2c-4199-b1d0-1de38b5ffd27@benettiengineering.com> References: <20230907200013.11620-1-indrek.kruusa@gmail.com> <57cacd5b-aa2c-4199-b1d0-1de38b5ffd27@benettiengineering.com> Message-ID: Kontakt Giulio Benetti () kirjutas kuup?eval E, 5. veebruar 2024 kell 12:00: > > Hi Indrek, > > sorry for the late reply, > Hi Giulio, no problem! Thanks for the review! > On 07/09/23 22:00, Indrek Kruusa wrote: > > Here we need a commit log, something like: > " > Add support for MangoPi MQ1RW: > https://mangopi.org/mqr > > An Allwinner D1S(1xRISCV C906 R1S0 + 64MB DDR2-1066 embedded) based SBC > with: > * USB-OTG Type-C socket > * USB-HOST Type-C socket > * 2x 18 pin GPIO headers > * TF card slot > * RTL8723DS WiFi module with ext. antenna connector > * 40 pin RGB FPC connector > * 6 pin CTP FPC connector > * 24 pin DVP FPC connector > * onboard mic > * onboard audio amplifier > * FEL,reset button > " > > > Signed-off-by: Indrek Kruusa > > --- snip > > I've build tested successfully with the change above using utils/docker > run and the rest looks good to me so with the commit log reworded and > the missing "BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y" added: > Reviewed-by: Giulio Benetti > Actually I've been trying to prepare an updated patch for this board. Currently its pointing to the older u-boot but newer version is provided by Samuel Holland. Though, the newer version needs special memory configuration for D1s SOC and I'm a bit stuck with that. When ready I will add a proper commit log also. Best regards, Indrek From james.hilliard1 at gmail.com Tue Feb 6 19:30:46 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 12:30:46 -0700 Subject: [Buildroot] [PATCH v3 1/3] package/python-poetry-core: new host package Message-ID: <20240206193048.658003-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v2 -> v3: - add vendored licenses - bump to version 1.9.0 --- .../python-poetry-core.hash | 9 +++++++ .../python-poetry-core/python-poetry-core.mk | 24 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 package/python-poetry-core/python-poetry-core.hash create mode 100644 package/python-poetry-core/python-poetry-core.mk diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash new file mode 100644 index 0000000000..0d908be0f4 --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.hash @@ -0,0 +1,9 @@ +# md5, sha256 from https://pypi.org/pypi/poetry-core/json +md5 eb8730e30aec5f644754b29587b47122 poetry_core-1.9.0.tar.gz +sha256 fa7a4001eae8aa572ee84f35feb510b321bd652e5cf9293249d62853e1f935a2 poetry_core-1.9.0.tar.gz +# Locally computed sha256 checksums +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE +sha256 8263e5652d07cecb3adadf05140b65e70cfa169ecec5f520fe1671479ce12a83 src/poetry/core/_vendor/lark/LICENSE +sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 src/poetry/core/_vendor/packaging/LICENSE +sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe src/poetry/core/_vendor/tomli/LICENSE +sha256 9ccddf69eb3998a60148debe85b94c5afed53691b6474692e78abcc0a0e544f1 src/poetry/core/_vendor/fastjsonschema/LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk new file mode 100644 index 0000000000..676a0c9a52 --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# python-poetry-core +# +################################################################################ + +PYTHON_POETRY_CORE_VERSION = 1.9.0 +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/f2/db/20a9f9cae3f3c213a8c406deb4395698459fd96962cea8f2ccb230b1943c +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 +PYTHON_POETRY_CORE_LICENSE = \ + Apache-2.0 or BSD-2-Clause (packaging), \ + BSD-3-Clause (fastjsonschema), \ + GPL-2.0-or-later (lark), \ + MIT (lark, poetry-core, tomli), \ + MPL-2.0 (lark) +PYTHON_POETRY_CORE_LICENSE_FILES = \ + LICENSE \ + src/poetry/core/_vendor/lark/LICENSE \ + src/poetry/core/_vendor/packaging/LICENSE \ + src/poetry/core/_vendor/tomli/LICENSE \ + src/poetry/core/_vendor/fastjsonschema/LICENSE + +$(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 6 19:30:47 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 12:30:47 -0700 Subject: [Buildroot] [PATCH v3 2/3] package/python-pypika-tortoise: new package In-Reply-To: <20240206193048.658003-1-james.hilliard1@gmail.com> References: <20240206193048.658003-1-james.hilliard1@gmail.com> Message-ID: <20240206193048.658003-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-pypika-tortoise/Config.in | 6 ++++++ .../python-pypika-tortoise.hash | 5 +++++ .../python-pypika-tortoise.mk | 15 +++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-pypika-tortoise/Config.in create mode 100644 package/python-pypika-tortoise/python-pypika-tortoise.hash create mode 100644 package/python-pypika-tortoise/python-pypika-tortoise.mk diff --git a/package/Config.in b/package/Config.in index b48f9eb1c7..d1ed6cf224 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1277,6 +1277,7 @@ menu "External python modules" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" source "package/python-pyphen/Config.in" + source "package/python-pypika-tortoise/Config.in" source "package/python-pypng/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" diff --git a/package/python-pypika-tortoise/Config.in b/package/python-pypika-tortoise/Config.in new file mode 100644 index 0000000000..62e14c6d50 --- /dev/null +++ b/package/python-pypika-tortoise/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYPIKA_TORTOISE + bool "python-pypika-tortoise" + help + Forked from pypika and streamline just for tortoise-orm. + + https://github.com/tortoise/pypika-tortoise diff --git a/package/python-pypika-tortoise/python-pypika-tortoise.hash b/package/python-pypika-tortoise/python-pypika-tortoise.hash new file mode 100644 index 0000000000..629762f4f7 --- /dev/null +++ b/package/python-pypika-tortoise/python-pypika-tortoise.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pypika-tortoise/json +md5 98c9677516f06f61f211f834d51949a6 pypika-tortoise-0.1.6.tar.gz +sha256 d802868f479a708e3263724c7b5719a26ad79399b2a70cea065f4a4cadbebf36 pypika-tortoise-0.1.6.tar.gz +# Locally computed sha256 checksums +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-pypika-tortoise/python-pypika-tortoise.mk b/package/python-pypika-tortoise/python-pypika-tortoise.mk new file mode 100644 index 0000000000..84aa19cfbb --- /dev/null +++ b/package/python-pypika-tortoise/python-pypika-tortoise.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-pypika-tortoise +# +################################################################################ + +PYTHON_PYPIKA_TORTOISE_VERSION = 0.1.6 +PYTHON_PYPIKA_TORTOISE_SOURCE = pypika-tortoise-$(PYTHON_PYPIKA_TORTOISE_VERSION).tar.gz +PYTHON_PYPIKA_TORTOISE_SITE = https://files.pythonhosted.org/packages/86/55/1bfd4150f664d2e07b36c8f442178cc1f717bb9ae6cae20f21e851c208c6 +PYTHON_PYPIKA_TORTOISE_SETUP_TYPE = pep517 +PYTHON_PYPIKA_TORTOISE_LICENSE = Apache-2.0 +PYTHON_PYPIKA_TORTOISE_LICENSE_FILES = LICENSE +PYTHON_PYPIKA_TORTOISE_DEPENDENCIES = host-python-poetry-core + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 6 19:30:48 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 12:30:48 -0700 Subject: [Buildroot] [PATCH v3 3/3] package/python-tortoise-orm: new package In-Reply-To: <20240206193048.658003-1-james.hilliard1@gmail.com> References: <20240206193048.658003-1-james.hilliard1@gmail.com> Message-ID: <20240206193048.658003-3-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-tortoise-orm/Config.in | 10 ++++++++++ .../python-tortoise-orm/python-tortoise-orm.hash | 5 +++++ .../python-tortoise-orm/python-tortoise-orm.mk | 15 +++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/python-tortoise-orm/Config.in create mode 100644 package/python-tortoise-orm/python-tortoise-orm.hash create mode 100644 package/python-tortoise-orm/python-tortoise-orm.mk diff --git a/package/Config.in b/package/Config.in index d1ed6cf224..30113d1a1b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1381,6 +1381,7 @@ menu "External python modules" source "package/python-toml/Config.in" source "package/python-tomli/Config.in" source "package/python-tornado/Config.in" + source "package/python-tortoise-orm/Config.in" source "package/python-tqdm/Config.in" source "package/python-trafaret/Config.in" source "package/python-traitlets/Config.in" diff --git a/package/python-tortoise-orm/Config.in b/package/python-tortoise-orm/Config.in new file mode 100644 index 0000000000..62b1a5a86e --- /dev/null +++ b/package/python-tortoise-orm/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_TORTOISE_ORM + bool "python-tortoise-orm" + select BR2_PACKAGE_PYTHON_AIOSQLITE # runtime + select BR2_PACKAGE_PYTHON_ISO8601 # runtime + select BR2_PACKAGE_PYTHON_PYPIKA_TORTOISE # runtime + select BR2_PACKAGE_PYTHON_PYTZ # runtime + help + Easy async ORM for python, built with relations in mind. + + https://github.com/tortoise/tortoise-orm diff --git a/package/python-tortoise-orm/python-tortoise-orm.hash b/package/python-tortoise-orm/python-tortoise-orm.hash new file mode 100644 index 0000000000..4796c8277f --- /dev/null +++ b/package/python-tortoise-orm/python-tortoise-orm.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tortoise-orm/json +md5 aa5efa50e69d0a67b75c187f7550acd7 tortoise_orm-0.20.0.tar.gz +sha256 283af584d685dcc58d6cc1da35b9115bb1e41c89075eae2a19c493b39b9b41f7 tortoise_orm-0.20.0.tar.gz +# Locally computed sha256 checksums +sha256 f955d347b975d5867ee364f978476b3012878a706d468571b9758cac74de6041 LICENSE.txt diff --git a/package/python-tortoise-orm/python-tortoise-orm.mk b/package/python-tortoise-orm/python-tortoise-orm.mk new file mode 100644 index 0000000000..cc1c2126b7 --- /dev/null +++ b/package/python-tortoise-orm/python-tortoise-orm.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-tortoise-orm +# +################################################################################ + +PYTHON_TORTOISE_ORM_VERSION = 0.20.0 +PYTHON_TORTOISE_ORM_SOURCE = tortoise_orm-$(PYTHON_TORTOISE_ORM_VERSION).tar.gz +PYTHON_TORTOISE_ORM_SITE = https://files.pythonhosted.org/packages/3b/84/8ca142fe370d59c4e3135825b2822d199c4f885ae855657c1a7361e68511 +PYTHON_TORTOISE_ORM_SETUP_TYPE = pep517 +PYTHON_TORTOISE_ORM_LICENSE = Apache-2.0 +PYTHON_TORTOISE_ORM_LICENSE_FILES = LICENSE.txt +PYTHON_TORTOISE_ORM_DEPENDENCIES = host-python-poetry-core + +$(eval $(python-package)) -- 2.34.1 From ddrokosov at salutedevices.com Tue Feb 6 19:25:33 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Tue, 6 Feb 2024 22:25:33 +0300 Subject: [Buildroot] [PATCH v2 1/2] package/linux-tools: introduce linux mm tools In-Reply-To: <20240206192543.7179-1-ddrokosov@salutedevices.com> References: <20240206192543.7179-1-ddrokosov@salutedevices.com> Message-ID: <20240206192543.7179-2-ddrokosov@salutedevices.com> This toolset was designed to facilitate the testing, monitoring, and tracing of various things with virtual memory, pages, and slab objects. It is an invaluable resource for identifying and analyzing memory-related issues, such as leaks and bottlenecks, and can greatly enhance one's understanding of memory utilization within a system. The mm toolset includes: - page_owner_sort: userspace helper to sort the output of /sys/kernel/debug/page_owner, which helps to know who allocates the page from kernel context - slabinfo: the tool which gets reports about slabs, for example show empty slabs, modify of slab debug options at runtime, display all information about a slabcache - page-types: a handy tool for querying page flags Signed-off-by: Dmitry Rokosov Signed-off-by: Alexey Romanov --- package/linux-tools/Config.in | 18 +++++++++++ package/linux-tools/linux-tool-mm.mk.in | 41 +++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 package/linux-tools/linux-tool-mm.mk.in diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index 8a0b6d5802cc..ede966ec792d 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -185,4 +185,22 @@ config BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON endif # BR2_PACKAGE_LINUX_TOOLS_HV +config BR2_PACKAGE_LINUX_TOOLS_MM + bool "mm" + select BR2_PACKAGE_LINUX_TOOLS + help + mm is a toolset for testing/monitoring/tracing vm/pages/slabs objects. + + - page_owner_sort: userspace helper to sort the output of + /sys/kernel/debug/page_owner, which helps to know who allocates + the page from kernel context + + - slabinfo: the tool which gets reports about slabs, for example + show empty slabs, modify of slab debug options at runtime, display + all information about a slabcache + + - page-types: a handy tool for querying page flags + + These tools are available only from kernel version 3.4. + endmenu diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in new file mode 100644 index 000000000000..5431e0574b04 --- /dev/null +++ b/package/linux-tools/linux-tool-mm.mk.in @@ -0,0 +1,41 @@ +################################################################################ +# +# mm +# +################################################################################ + +LINUX_TOOLS += mm + +MM_DEPENDENCIES = linux +MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" + +define MM_BUILD_CMDS + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ + MM_SUBDIR=vm; \ + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ + MM_SUBDIR=mm; \ + else \ + echo "Your kernel version is too old and does not have the mm tool." ; \ + echo "At least kernel 3.4 must be used." ; \ + exit 1 ; \ + fi ; \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(MM_MAKE_OPTS) $${MM_SUBDIR} +endef + +define MM_INSTALL_TARGET_CMDS + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ + MM_SUBDIR=vm; \ + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ + MM_SUBDIR=mm; \ + else \ + echo "Your kernel version is too old and does not have the mm tool." ; \ + echo "At least kernel 3.4 must be used." ; \ + exit 1 ; \ + fi ; \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(MM_MAKE_OPTS) \ + INSTALL_ROOT=$(TARGET_DIR) \ + DESTDIR=$(TARGET_DIR) \ + $${MM_SUBDIR}_install +endef -- 2.43.0 From james.hilliard1 at gmail.com Tue Feb 6 19:32:33 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 12:32:33 -0700 Subject: [Buildroot] [PATCH v2 1/4] package/python-poetry-core: new host package In-Reply-To: References: <20240106214410.3294887-1-james.hilliard1@gmail.com> Message-ID: On Tue, Feb 6, 2024 at 10:43?AM Arnout Vandecappelle wrote: > > Hi James, > > On 06/01/2024 22:44, James Hilliard wrote: > > Signed-off-by: James Hilliard > > --- > > package/python-poetry-core/python-poetry-core.hash | 5 +++++ > > package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ > > 2 files changed, 19 insertions(+) > > create mode 100644 package/python-poetry-core/python-poetry-core.hash > > create mode 100644 package/python-poetry-core/python-poetry-core.mk > > > > diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash > > new file mode 100644 > > index 0000000000..3c07fef04f > > --- /dev/null > > +++ b/package/python-poetry-core/python-poetry-core.hash > > @@ -0,0 +1,5 @@ > > +# md5, sha256 from https://pypi.org/pypi/poetry-core/json > > +md5 9ed2f2e9244165b34d7233c306a34a2a poetry_core-1.8.1.tar.gz > > +sha256 67a76c671da2a70e55047cddda83566035b701f7e463b32a2abfeac6e2a16376 poetry_core-1.8.1.tar.gz > > +# Locally computed sha256 checksums > > +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE > > diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk > > new file mode 100644 > > index 0000000000..e1acf3179c > > --- /dev/null > > +++ b/package/python-poetry-core/python-poetry-core.mk > > @@ -0,0 +1,14 @@ > > +################################################################################ > > +# > > +# python-poetry-core > > +# > > +################################################################################ > > + > > +PYTHON_POETRY_CORE_VERSION = 1.8.1 > > +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz > > +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/36/66/6af2891495d12020419c8447d0b29c1e96f3be16631faaed6bda5b886d5d > > +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 > > +PYTHON_POETRY_CORE_LICENSE = MIT > > +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE > > This package has 4 vendored dependencies, each with their own license. Those > should also be specified in the LICENSE and LICENSE_FILES. Does this look right? https://patchwork.ozlabs.org/project/buildroot/patch/20240206193048.658003-1-james.hilliard1 at gmail.com/ > > In addition, for lark, there's a file under MPL and a file under GPL, even > though neither if those licenses is mentioned in the lark license. Ideally those > two should be mentioned in the LICENSES as well. And of course, this should > ideally also be done for the python-lark package which suffers from the same > issue... > > Regards, > Arnout > > > + > > +$(eval $(host-python-package)) From caseorum at gmail.com Tue Feb 6 19:46:03 2024 From: caseorum at gmail.com (Joseph Burt) Date: Tue, 6 Feb 2024 19:46:03 +0000 Subject: [Buildroot] [PATCH 1/1] package/qemu: reenable Qemu user-land emulation for musl toolchains In-Reply-To: References: <20230112075509.2200-1-caseorum@gmail.com> Message-ID: Hello Romain, On Tue, Feb 6, 2024 at 4:26?PM Romain Naour wrote: > Ok but it would fail with existing (old) prebuilt musl toolchains. > Is musl 1.2.2 old enough? Musl 1.2.2 is three years old, and anyone building qemu-user pre musl 1.2.2 has patched qemu and buildroot to do so. This fails if someone is building qemu-user for the first time on the latest buildroot with a very old musl toolchain. I hope that is unlikely, but I don't know. Best wishes, Joseph From ddrokosov at salutedevices.com Tue Feb 6 19:47:20 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Tue, 6 Feb 2024 22:47:20 +0300 Subject: [Buildroot] [PATCH v1] package/linux-tools: introduce linux mm tools In-Reply-To: <20240206115217.3r43du5b4wnt23a7@CAB-WSD-L081021> References: <20230609113415.13856-1-ddrokosov@sberdevices.ru> <20230622171806.vywakqz7q7ezqnrv@CAB-WSD-L081021> <20230626121237.4z7alvantlkjc7ha@CAB-WSD-L081021> <20230626154719.GC646621@scaer> <20230627102456.ias6peqvoxxzjyik@CAB-WSD-L081021> <20240206115217.3r43du5b4wnt23a7@CAB-WSD-L081021> Message-ID: <20240206194720.suyww3i3bxcztgn5@CAB-WSD-L081021> Hello Chris, I've sent v2 patch series, please take a look: https://lore.kernel.org/buildroot/20240206192543.7179-2-ddrokosov at salutedevices.com/ On Tue, Feb 06, 2024 at 02:52:17PM +0300, Dmitry Rokosov wrote: > Hello Chris, > > I had actually forgotten about this patch. Today, I will update it and > would appreciate it if you could review it. I will add you to the CC. > > On Tue, Feb 06, 2024 at 06:12:27AM -0500, Christian Hopps wrote: > > > > Hi Dmitry, et al., > > > > I locally modified this patch according to the suggestion and am using it successfully. Will you be resubmitting this patch, or could I resubmit it with the suggested changes? > > > > Thanks, > > Chris. > > > > Dmitry Rokosov via buildroot writes: > > > > > Hello Yann, > > > > > > On Mon, Jun 26, 2023 at 05:47:19PM +0200, Yann E. MORIN wrote: > > > > Dmitry, All, > > > > > > > > On 2023-06-26 15:12 +0300, Dmitry Rokosov spake thusly: > > > > > Please take a look into this patchset. I appreciate any feedback. > > > > > > > > Don't be impatient. Your patch has been pending for about two seeks now. > > > > We have 495 pending patches: https://patchwork.ozlabs.org/project/buildroot/list/ > > > > some of witch are so much older... > > > > > > > > Yes, I know it can be frustrating. For various reasons, we've been a bit > > > > less active than usual the past few months, but we'll eventually get to > > > > it... > > > > > > > > Regards, > > > > Yann E. MORIN. > > > > > > > > > > Thank you so much for the detailed reply! I wasn't aware of the backlog, > > > and I apologize for any misunderstanding caused by my eagerness. I fully > > > understand the situation now, so please don't worry - I'm happy to wait > > > my turn. Thank you for your hard work in maintaining buildroot! > > > > > > > > On Thu, Jun 22, 2023 at 08:18:06PM +0300, Dmitry Rokosov wrote: > > > > > > Hello, > > > > > > > > > > > > Add Peter Korsgaard and move "buildroot" mailing list from Cc. > > > > > > > > > > > > Could you please take a look at this patchset? I believe that linux-mm > > > > > > tools are helpful for investigating kernel memory distribution in > > > > > > embedded systems. > > > > > > > > > > > > On Fri, Jun 09, 2023 at 02:34:15PM +0300, Dmitry Rokosov wrote: > > > > > > > This toolset was designed to facilitate the testing, monitoring, and > > > > > > > tracing of various things with virtual memory, pages, and slab objects. > > > > > > > It is an invaluable resource for identifying and analyzing > > > > > > > memory-related issues, such as leaks and bottlenecks, and can greatly > > > > > > > enhance one's understanding of memory utilization within a system. > > > > > > > > > > > > > > The mm toolset includes: > > > > > > > - page_owner_sort: userspace helper to sort the output of > > > > > > > /sys/kernel/debug/page_owner, which helps to know who allocates > > > > > > > the page from kernel context > > > > > > > - slabinfo: the tool which gets reports about slabs, for example > > > > > > > show empty slabs, modify of slab debug options at runtime, display > > > > > > > all information about a slabcache > > > > > > > - page-types: a handy tool for querying page flags > > > > > > > > > > > > > > Signed-off-by: Dmitry Rokosov > > > > > > > --- > > > > > > > package/linux-tools/Config.in | 18 ++++++++ > > > > > > > package/linux-tools/linux-tool-mm.mk.in | 59 +++++++++++++++++++++++++ > > > > > > > 2 files changed, 77 insertions(+) > > > > > > > create mode 100644 package/linux-tools/linux-tool-mm.mk.in > > > > > > > > > > > > > > diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in > > > > > > > index 880ad08f0f1c..3ecc45574b82 100644 > > > > > > > --- a/package/linux-tools/Config.in > > > > > > > +++ b/package/linux-tools/Config.in > > > > > > > @@ -171,4 +171,22 @@ config BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON > > > > > > > > > > > > > > endif # BR2_PACKAGE_LINUX_TOOLS_HV > > > > > > > > > > > > > > +config BR2_PACKAGE_LINUX_TOOLS_MM > > > > > > > + bool "mm" > > > > > > > + select BR2_PACKAGE_LINUX_TOOLS > > > > > > > + help > > > > > > > + mm is a toolset for testing/monitoring/tracing vm/pages/slabs objects. > > > > > > > + > > > > > > > + - page_owner_sort: userspace helper to sort the output of > > > > > > > + /sys/kernel/debug/page_owner, which helps to know who allocates > > > > > > > + the page from kernel context > > > > > > > + > > > > > > > + - slabinfo: the tool which gets reports about slabs, for example > > > > > > > + show empty slabs, modify of slab debug options at runtime, display > > > > > > > + all information about a slabcache > > > > > > > + > > > > > > > + - page-types: a handy tool for querying page flags > > > > > > > + > > > > > > > + These tools are available only from kernel version 3.4. > > > > > > > + > > > > > > > endmenu > > > > > > > diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in > > > > > > > new file mode 100644 > > > > > > > index 000000000000..a59f1c46ff97 > > > > > > > --- /dev/null > > > > > > > +++ b/package/linux-tools/linux-tool-mm.mk.in > > > > > > > @@ -0,0 +1,59 @@ > > > > > > > +################################################################################ > > > > > > > +# > > > > > > > +# mm > > > > > > > +# > > > > > > > +################################################################################ > > > > > > > + > > > > > > > +LINUX_TOOLS += mm > > > > > > > + > > > > > > > +MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" > > > > > > > + > > > > > > > +KVER = $(shell echo $(LINUX_VERSION_PROBED)) > > > > > > > +KVER_MAJOR = $(word 1,$(subst ., ,$(KVER))) > > > > > > > +KVER_MINOR = $(word 2,$(subst ., ,$(KVER))) > > > > > > > + > > > > > > > +# For the first time tools/vm was introduced in the 3.4 kernel version > > > > > > > +KVER_MAJOR_MIN = 3 > > > > > > > +KVER_MINOR_MIN = 4 > > > > > > > + > > > > > > > +# Starting from 6.3 kernel version mm tools are located at tools/mm folder > > > > > > > +# instead of tools/vm > > > > > > > +KVER_MAJOR_MM = 6 > > > > > > > +KVER_MINOR_MM = 3 > > > > > > > + > > > > > > > +define MM_BUILD_CMDS > > > > > > > + $(Q)if [ $(KVER_MAJOR) -lt $(KVER_MAJOR_MIN) ] || \ > > > > > > > + [ $(KVER_MAJOR) -eq $(KVER_MAJOR_MIN) -a \ > > > > > > > + $(KVER_MINOR) -lt $(KVER_MINOR_MIN) ]; then \ > > > > > > > + echo -n "Your kernel version $(KVER_MAJOR).$(KVER_MINOR) is "; \ > > > > > > > + echo "too old and doesn't have the mm tools." ; \ > > > > > > > + echo -n "At least $(KVER_MAJOR_MIN).$(KVER_MINOR_MIN) "; \ > > > > > > > + echo "kernel must be used." ; \ > > > > > > > + exit 1 ; \ > > > > > > > + fi > > > > > > > + > > > > > > > + $(Q)if [ $(KVER_MAJOR) -gt $(KVER_MAJOR_MM) ] || \ > > > > > > > + [ $(KVER_MAJOR) -eq $(KVER_MAJOR_MM) -a \ > > > > > > > + $(KVER_MINOR) -ge $(KVER_MINOR_MM) ]; then \ > > > > > > > + MM=mm; \ > > > > > > > + else \ > > > > > > > + MM=vm; \ > > > > > > > + fi; \ > > > > > > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > > > > > > > + $(MM_MAKE_OPTS) $${MM} > > > > > > > +endef > > > > > > > + > > > > > > > +define MM_INSTALL_TARGET_CMDS > > > > > > > + $(Q)if [ $(KVER_MAJOR) -gt $(KVER_MAJOR_MM) ] || \ > > > > > > > + [ $(KVER_MAJOR) -eq $(KVER_MAJOR_MM) -a \ > > > > > > > + $(KVER_MINOR) -ge $(KVER_MINOR_MM) ]; then \ > > > > > > > + MM=mm; \ > > > > > > > + else \ > > > > > > > + MM=vm; \ > > > > > > > + fi; \ > > > > > > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > > > > > > > + $(MM_MAKE_OPTS) \ > > > > > > > + INSTALL_ROOT=$(TARGET_DIR) \ > > > > > > > + DESTDIR=$(TARGET_DIR) \ > > > > > > > + $${MM}_install > > > > > > > +endef > > > > > > > -- > > > > > > > 2.36.0 > > > > > > > > > > > > > > > > > > > -- > > > > > > Thank you, > > > > > > Dmitry > > > > > > > > > > -- > > > > > Thank you, > > > > > Dmitry > > > > > > > > -- > > > > .-----------------.--------------------.------------------.--------------------. > > > > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > > > > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > > > > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > > > > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > > > > '------------------------------^-------^------------------^--------------------' > > > > -- > Thank you, > Dmitry -- Thank you, Dmitry From fontaine.fabrice at gmail.com Tue Feb 6 19:47:10 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 20:47:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libp11: drop libressl support Message-ID: <20240206194710.394671-1-fontaine.fabrice@gmail.com> libressl dropped engine support since version 3.8.1 resulting in the following build failure since bump of libressl to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: eng_front.c: In function 'IMPLEMENT_DYNAMIC_CHECK_FN': eng_front.c:262:1: error: expected declaration specifiers before 'IMPLEMENT_DYNAMIC_BIND_FN' 262 | IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) | ^~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/389ed112f082a4917f777f3e236211059c4c6d6e Signed-off-by: Fabrice Fontaine --- package/libp11/Config.in | 1 + package/libp11/libp11.mk | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/libp11/Config.in b/package/libp11/Config.in index ef1e5b4703..3c7ccdee27 100644 --- a/package/libp11/Config.in +++ b/package/libp11/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBP11 depends on !BR2_STATIC_LIBS # dlopen depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help OpenSSL engine for PKCS#11 modules. Part of the OpenSC project. diff --git a/package/libp11/libp11.mk b/package/libp11/libp11.mk index 7718573ace..cd4ed34297 100644 --- a/package/libp11/libp11.mk +++ b/package/libp11/libp11.mk @@ -11,16 +11,10 @@ LIBP11_INSTALL_STAGING = YES LIBP11_LICENSE = LGPL-2.1+ LIBP11_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -LIBP11_ENGINESDIR = enginesdir -else ifeq ($(BR2_PACKAGE_LIBRESSL),y) -LIBP11_ENGINESDIR = libdir -endif - # pkg-config returns a libcrypto enginesdir prefixed with the sysroot, # so let's rip it out. LIBP11_CONF_OPTS = \ - --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable $(LIBP11_ENGINESDIR) libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` + --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable enginesdir libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` ifeq ($(BR2_PACKAGE_P11_KIT),y) LIBP11_CONF_OPTS += --with-pkcs11-module=/usr/lib/p11-kit-proxy.so -- 2.43.0 From ju.o at free.fr Tue Feb 6 19:52:37 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 6 Feb 2024 20:52:37 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: new acl runtime test Message-ID: <20240206195237.55252-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_acl.py | 87 +++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 support/testing/tests/package/test_acl.py diff --git a/DEVELOPERS b/DEVELOPERS index 4b8d195f9f..ce248e8706 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1762,6 +1762,7 @@ F: support/testing/tests/package/sample_python_midiutil.py F: support/testing/tests/package/sample_python_ml_dtypes.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py diff --git a/support/testing/tests/package/test_acl.py b/support/testing/tests/package/test_acl.py new file mode 100644 index 0000000000..e4827c7bec --- /dev/null +++ b/support/testing/tests/package/test_acl.py @@ -0,0 +1,87 @@ +import os + +import infra.basetest + + +class TestAcl(infra.basetest.BRTest): + # Note: this test requires a Kernel with a filesystem on /tmp + # supporting ACLs. This is the case for the basetest reference + # config. Kernel has CONFIG_TMPFS_POSIX_ACL=y, and /tmp is tmpfs + # in the default Buildroot config. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ACL=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]) + self.emulator.login() + + # Check the programs can execute. + self.assertRunOk("getfacl --version") + self.assertRunOk("setfacl --version") + + # Constants used in this test. + test_user = "acltest" + test_data = "Hello Buildroot!" + test_file = "/tmp/file.txt" + + # Create a test user: + # -D don't set a password + # -h set home directory + # -H don't create home directory + # -s set shell to /bin/sh + self.assertRunOk(f"adduser -D -h /tmp -H -s /bin/sh {test_user}") + + # Create a test file, and make sure the owner is "root" with + # standard Unix permissions to read/write only for the owner. + self.assertRunOk(f"echo '{test_data}' > {test_file}") + self.assertRunOk(f"chown root:root {test_file}") + self.assertRunOk(f"chmod 0600 {test_file}") + + # Check we have no ACL for the test user. + getacl_cmd = f"getfacl -c -p {test_file}" + out, ret = self.emulator.run(getacl_cmd) + self.assertEqual(ret, 0) + self.assertNotIn(f"user:{test_user}:", "\n".join(out)) + + # Reading the file as the test user is expected to fail. + test_read_cmd = f"su - {test_user} -c 'cat {test_file}'" + _, ret = self.emulator.run(test_read_cmd) + self.assertNotEqual(ret, 0) + + # We add a special read ACL for the test user. + cmd = f"setfacl -m u:{test_user}:r {test_file}" + self.assertRunOk(cmd) + + # Check we now have an ACL entry for the test user. + out, ret = self.emulator.run(getacl_cmd) + self.assertEqual(ret, 0) + self.assertIn(f"user:{test_user}:", "\n".join(out)) + + # Reading the file as the test user is now expected to + # succeed. + out, ret = self.emulator.run(test_read_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], test_data) + + # Attempting to write to the file as the test user is expected + # to fail (since we put an ACL only for reading). + cmd = f"su - {test_user} -c 'echo WriteTest > {test_file}'" + _, ret = self.emulator.run(cmd) + self.assertNotEqual(ret, 0) + + # Remove all ACLs. This could have been done with the command + # "setfacl -b". Instead, we use the "chacl -B" command which + # is doing the same. The reason is to slightly improve the + # coverage of this test, by including an execution of "chacl". + self.assertRunOk(f"chacl -B {test_file}") + + # Reading the file as the test user is expected to fail again. + _, ret = self.emulator.run(test_read_cmd) + self.assertNotEqual(ret, 0) -- 2.43.0 From ju.o at free.fr Tue Feb 6 20:12:13 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 6 Feb 2024 21:12:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/acl: bump to version 2.3.2 Message-ID: <20240206201213.187788-1-ju.o@free.fr> See release announcement [1]. This commit also updates the _SITE variable to match the download URL published in the release announcement in [1]. The package homepage is also updated to match the one published at [2]. The main motivation of those URL updates is to switch to https. [1] https://lists.nongnu.org/archive/html/acl-devel/2024-01/msg00012.html [2] https://git.savannah.nongnu.org/cgit/acl.git/tree/README?h=v2.3.2#n4 Signed-off-by: Julien Olivain --- package/acl/Config.in | 2 +- package/acl/acl.hash | 2 +- package/acl/acl.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/acl/Config.in b/package/acl/Config.in index 92f2251878..056a31baa8 100644 --- a/package/acl/Config.in +++ b/package/acl/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_ACL directories. This package also provides libacl. - http://savannah.nongnu.org/projects/acl + https://savannah.nongnu.org/projects/acl diff --git a/package/acl/acl.hash b/package/acl/acl.hash index 32e904baf3..a6094fb985 100644 --- a/package/acl/acl.hash +++ b/package/acl/acl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 c0234042e17f11306c23c038b08e5e070edb7be44bef6697fb8734dcff1c66b1 acl-2.3.1.tar.xz +sha256 97203a72cae99ab89a067fe2210c1cbf052bc492b479eca7d226d9830883b0bd acl-2.3.2.tar.xz # Locally calculated sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 doc/COPYING diff --git a/package/acl/acl.mk b/package/acl/acl.mk index c898421dc5..a5371e1aea 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -4,9 +4,9 @@ # ################################################################################ -ACL_VERSION = 2.3.1 +ACL_VERSION = 2.3.2 ACL_SOURCE = acl-$(ACL_VERSION).tar.xz -ACL_SITE = http://download.savannah.gnu.org/releases/acl +ACL_SITE = https://download.savannah.nongnu.org/releases/acl ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ACL_CPE_ID_VENDOR = acl_project -- 2.43.0 From ju.o at free.fr Tue Feb 6 20:13:10 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 6 Feb 2024 21:13:10 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add thttpd runtime test Message-ID: <20240206201310.188097-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_thttpd.py | 26 ++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 support/testing/tests/package/test_thttpd.py diff --git a/DEVELOPERS b/DEVELOPERS index 94a89c63d5..72add029b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1814,6 +1814,7 @@ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ +F: support/testing/tests/package/test_thttpd.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_thttpd.py b/support/testing/tests/package/test_thttpd.py new file mode 100644 index 0000000000..007bc91f2d --- /dev/null +++ b/support/testing/tests/package/test_thttpd.py @@ -0,0 +1,26 @@ +import os + +import infra.basetest + + +class TestThttpd(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_THTTPD=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]) + self.emulator.login() + + msg = "Hello Buildroot!" + + self.assertRunOk("thttpd -V") + self.assertRunOk(f"echo '{msg}' > /var/www/data/index.html") + self.assertRunOk("wget http://localhost/index.html") + self.assertRunOk(f"grep -F '{msg}' index.html") -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 6 20:30:31 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 21:30:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.18 Message-ID: <20240206203031.851666-1-fontaine.fabrice@gmail.com> Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP in their default configuration allows the arbitrary writing of files. By exploiting these combination of primitives, an attacker can execute arbitrary code. https://netatalk.io/CVE-2022-22995 https://netatalk.io/3.1/ReleaseNotes3.1.18 Signed-off-by: Fabrice Fontaine --- package/netatalk/netatalk.hash | 8 ++++---- package/netatalk/netatalk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index a35e6bc36c..9ab5d604a8 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.17/ -md5 a6429a28948f85b69c9012fb437dd9c2 netatalk-3.1.17.tar.xz -sha1 bc6578d9fa874b3816fd4ddd60a30a8f3aadc71d netatalk-3.1.17.tar.xz +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ +md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz +sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz # Locally computed -sha256 8c208e2c94bf3047db33cdbc3ce4325d2b80db61d6cc527f18f9dbd8e95b5cff netatalk-3.1.17.tar.xz +sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 40e64dabeb..53cd53876a 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.17 +NETATALK_VERSION = 3.1.18 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 6 20:42:08 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 21:42:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.6.0 Message-ID: <20240206204209.864622-1-fontaine.fabrice@gmail.com> Security fixes: - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can cause denial of service, in partial where dealing with compressed XML input. Applications that parsed a document in one go -- a single call to functions XML_Parse or XML_ParseBuffer -- were not affected. The smaller the chunks/buffers you use for parsing previously, the bigger the problem prior to the fix. - CVE-2023-52426: Fix billion laughs attacks for users compiling *without* XML_DTD defined (which is not common). Users with XML_DTD defined have been protected since Expat >=2.4.0 (and that was CVE-2013-0340 back then). https://blog.hartwork.org/posts/expat-2-6-0-released/ Signed-off-by: Fabrice Fontaine --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index c6c25aa3e0..043501378b 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.5.0/ -md5 ac6677b6d1b95d209ab697ce8b688704 expat-2.5.0.tar.xz -sha1 5178e13c1e34f4643d5118d5758babfe0e836fe2 expat-2.5.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.0/ +md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz +sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz # Locally calculated -sha256 ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 6f22024cc0..5f4016e0d1 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.5.0 +EXPAT_VERSION = 2.6.0 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -- 2.43.0 From thomas.petazzoni at bootlin.com Tue Feb 6 20:47:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 21:47:35 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/python-poetry-core: new host package In-Reply-To: <20240206193048.658003-1-james.hilliard1@gmail.com> References: <20240206193048.658003-1-james.hilliard1@gmail.com> Message-ID: <20240206214735.7d69db1e@windsurf> On Tue, 6 Feb 2024 12:30:46 -0700 James Hilliard wrote: > +PYTHON_POETRY_CORE_LICENSE = \ > + Apache-2.0 or BSD-2-Clause (packaging), \ > + BSD-3-Clause (fastjsonschema), \ > + GPL-2.0-or-later (lark), \ Didn't review the licensing, but in Buildroot we diverge from SPDX on this point, and we encode GPL-2.0-or-later as GPL-2.0+. No need to resend just for that, it can be fixed when applying. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Tue Feb 6 20:49:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 21:49:36 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add a postgresql runtime test In-Reply-To: <20240111224003.243443-1-ju.o@free.fr> (Julien Olivain's message of "Thu, 11 Jan 2024 23:40:03 +0100") References: <20240111224003.243443-1-ju.o@free.fr> Message-ID: <87h6il5ndr.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > Since commit 2a8065e "package/postgresql: bump version to 16.1", the > postgresql service fail to start at runtime with an error: > FATAL: could not load library "/usr/lib/postgresql/dict_snowball.so": /usr/lib/postgresql/dict_snowball.so: undefined symbol: CurrentMemoryContext > See: https://www.postgresql.org/message-id/flat/1266022.1701958693%40sss.pgh.pa.us > This runtime test works with postgresql 15.5, when this commit is > reverted. > Patch tested on branch master at commit 66414ed with commands: Given that this is now fixed with 16.1, it should work there as well. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 20:49:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 21:49:49 +0100 Subject: [Buildroot] [git commit] support/testing: add a postgresql runtime test Message-ID: <20240206205007.54D47873BD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9add4cbfeaafaf3b1c31140429278cd68bd72150 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_postgresql.py | 197 +++++++++++++++++++++++ 2 files changed, 198 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4b8d195f9f..d0ab37f5c2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1821,6 +1821,7 @@ F: support/testing/tests/package/test_openblas.py F: support/testing/tests/package/test_pciutils.py F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_pigz.py +F: support/testing/tests/package/test_postgresql.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_hkdf.py diff --git a/support/testing/tests/package/test_postgresql.py b/support/testing/tests/package/test_postgresql.py new file mode 100644 index 0000000000..bd41fc3f1b --- /dev/null +++ b/support/testing/tests/package/test_postgresql.py @@ -0,0 +1,197 @@ +import os + +import infra.basetest + + +class TestPostgreSQL(infra.basetest.BRTest): + # We use a specific configuration for: + # - using Aarch64, to have more than 256MB memory, + # - to have an ext4 rootfs image exposed as a virtio storage + # (rather than cpio initrd). This will save some memory, as the + # rootfs image is big. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.72" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_POSTGRESQL=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="256M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def __init__(self, names): + super(TestPostgreSQL, self).__init__(names) + self.db_admin = "postgres" + self.db_user = "br_user" + self.db_name = "br_database" + self.backup_file = "dump.sql" + self.pgdata_dir = "/var/lib/pgsql" + + def run_user_db_query(self, user, database, query, opts=None): + cmd = f"psql --username={user} --dbname={database}" + cmd += f' --command="{query}"' + if opts is not None: + cmd += " " + opts + self.assertRunOk(cmd) + + def run_admin_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_admin, self.db_admin, query, opts) + + def run_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_user, self.db_name, query, opts) + + def cleanup_database(self): + # This cleanup is useful when run-test -k is used. It makes + # this test idempotent. Since the drive storage is preserved + # between reboots, this cleanup will prevent errors during the + # user/db creation. + + # Drop the test database, if it exists. + cmd = f"dropdb --username={self.db_admin} " + cmd += f"--if-exists {self.db_name}" + self.assertRunOk(cmd) + + # Drop the test user, if it exists. + cmd = f"dropuser --username={self.db_admin} " + cmd += f"--if-exists {self.db_user}" + self.assertRunOk(cmd) + + def create_tables(self): + sql_query = "CREATE TABLE fruits (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE colors (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE fruit_colors (" + sql_query += "fruit_id integer REFERENCES fruits(id), " + sql_query += "color_id integer REFERENCES colors(id), " + sql_query += "UNIQUE (fruit_id, color_id));" + self.run_sql_query(sql_query) + + def insert_data(self): + fruits = ["Banana", "Blueberry", "Orange", "Raspberry"] + fruit_id = 1 + for fruit in fruits: + sql_query = "INSERT INTO fruits (id, name) " + sql_query += f"VALUES ({fruit_id}, '{fruit}');" + self.run_sql_query(sql_query) + fruit_id += 1 + + colors = ["Blue", "Orange", "Red", "Yellow"] + color_id = 1 + for color in colors: + sql_query = "INSERT INTO colors (id, name) " + sql_query += f"VALUES ({color_id}, '{color}');" + self.run_sql_query(sql_query) + color_id += 1 + + fruit_colors = [(1, 4), (2, 1), (3, 2), (4, 3)] + for fruit_color in fruit_colors: + fruit_id, color_id = fruit_color + sql_query = "INSERT INTO fruit_colors (fruit_id, color_id) " + sql_query += f"VALUES ({fruit_id}, {color_id});" + self.run_sql_query(sql_query) + + def query_database(self): + sql_query = "SELECT " + sql_query += "fruits.name AS fruit, colors.name AS color " + sql_query += "FROM fruits, colors, fruit_colors " + sql_query += "WHERE fruits.id = fruit_colors.fruit_id " + sql_query += "AND colors.id = fruit_colors.color_id " + sql_query += "ORDER BY fruit;" + self.run_sql_query(sql_query) + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "512M", + "-smp", "2", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Check the server binary can execute. + self.assertRunOk("postgres --version") + + # Check the client binary can execute. + self.assertRunOk("psql --version") + + # Check the server is ready. + self.assertRunOk("pg_isready") + + # Query the server version from the client. + sql_query = "SELECT version();" + self.run_admin_sql_query(sql_query, + opts="--tuples-only --no-align") + + self.cleanup_database() + + # Create a new user. + cmd = f"createuser --username={self.db_admin} " + cmd += "--no-superuser --no-createdb --no-createrole " + cmd += self.db_user + self.assertRunOk(cmd) + + # Create a new database. + cmd = f"createdb --username={self.db_admin} " + cmd += f"--owner={self.db_user} " + cmd += f'{self.db_name} "Test Database for Buildroot Test"' + self.assertRunOk(cmd) + + self.create_tables() + + self.insert_data() + + self.query_database() + + # Update a table. + sql_query = "UPDATE fruits SET name = 'Lemon' WHERE id = 1;" + self.run_sql_query(sql_query) + + # Backup the test database. + cmd = f"pg_dump --username={self.db_user} --dbname={self.db_name} " + cmd += f"--file={self.backup_file} --inserts" + self.assertRunOk(cmd) + + # Drop all the tables. + sql_query = "DROP TABLE fruit_colors, fruits, colors;" + self.run_sql_query(sql_query) + + # Query the server status. + cmd = f"su - {self.db_admin} -c 'pg_ctl status -D {self.pgdata_dir}'" + self.assertRunOk(cmd) + + # Stop the server. + cmd = f"su - {self.db_admin} -c 'pg_ctl stop -D {self.pgdata_dir}'" + self.assertRunOk(cmd) + + # Check the server is no longer ready. + _, exit_code = self.emulator.run("pg_isready") + self.assertNotEqual(exit_code, 0) + + # Restart the server. + cmd = f"su - {self.db_admin} -c 'pg_ctl start -D {self.pgdata_dir}'" + self.assertRunOk(cmd) + + # Restore the backup. + cmd = f"psql --username={self.db_user} --dbname={self.db_name} " + cmd += f"--file={self.backup_file}" + self.assertRunOk(cmd) + + # Query on last time our data, to check the backup restoration + # succeeded. + self.query_database() From peter at korsgaard.com Tue Feb 6 20:51:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 21:51:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/acl: bump to version 2.3.2 In-Reply-To: <20240206201213.187788-1-ju.o@free.fr> (Julien Olivain's message of "Tue, 6 Feb 2024 21:12:13 +0100") References: <20240206201213.187788-1-ju.o@free.fr> Message-ID: <87cyt95nbb.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > See release announcement [1]. > This commit also updates the _SITE variable to match the download URL > published in the release announcement in [1]. The package homepage is > also updated to match the one published at [2]. The main motivation > of those URL updates is to switch to https. > [1] https://lists.nongnu.org/archive/html/acl-devel/2024-01/msg00012.html > [2] https://git.savannah.nongnu.org/cgit/acl.git/tree/README?h=v2.3.2#n4 > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 20:50:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 21:50:36 +0100 Subject: [Buildroot] [git commit] package/acl: bump to version 2.3.2 Message-ID: <20240206205120.10621873C6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09cc83df9f75cc378e1f2acd418dda50aa0db294 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See release announcement [1]. This commit also updates the _SITE variable to match the download URL published in the release announcement in [1]. The package homepage is also updated to match the one published at [2]. The main motivation of those URL updates is to switch to https. [1] https://lists.nongnu.org/archive/html/acl-devel/2024-01/msg00012.html [2] https://git.savannah.nongnu.org/cgit/acl.git/tree/README?h=v2.3.2#n4 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/acl/Config.in | 2 +- package/acl/acl.hash | 2 +- package/acl/acl.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/acl/Config.in b/package/acl/Config.in index 92f2251878..056a31baa8 100644 --- a/package/acl/Config.in +++ b/package/acl/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_ACL directories. This package also provides libacl. - http://savannah.nongnu.org/projects/acl + https://savannah.nongnu.org/projects/acl diff --git a/package/acl/acl.hash b/package/acl/acl.hash index 32e904baf3..a6094fb985 100644 --- a/package/acl/acl.hash +++ b/package/acl/acl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 c0234042e17f11306c23c038b08e5e070edb7be44bef6697fb8734dcff1c66b1 acl-2.3.1.tar.xz +sha256 97203a72cae99ab89a067fe2210c1cbf052bc492b479eca7d226d9830883b0bd acl-2.3.2.tar.xz # Locally calculated sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 doc/COPYING diff --git a/package/acl/acl.mk b/package/acl/acl.mk index c898421dc5..a5371e1aea 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -4,9 +4,9 @@ # ################################################################################ -ACL_VERSION = 2.3.1 +ACL_VERSION = 2.3.2 ACL_SOURCE = acl-$(ACL_VERSION).tar.xz -ACL_SITE = http://download.savannah.gnu.org/releases/acl +ACL_SITE = https://download.savannah.nongnu.org/releases/acl ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ACL_CPE_ID_VENDOR = acl_project From peter at korsgaard.com Tue Feb 6 20:51:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 21:51:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.18 In-Reply-To: <20240206203031.851666-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 21:30:31 +0100") References: <20240206203031.851666-1-fontaine.fabrice@gmail.com> Message-ID: <878r3x5na3.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP > in their default configuration allows the arbitrary writing of files. By > exploiting these combination of primitives, an attacker can execute > arbitrary code. > https://netatalk.io/CVE-2022-22995 > https://netatalk.io/3.1/ReleaseNotes3.1.18 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 20:52:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 21:52:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.6.0 In-Reply-To: <20240206204209.864622-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 21:42:08 +0100") References: <20240206204209.864622-1-fontaine.fabrice@gmail.com> Message-ID: <874jel5n8g.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Security fixes: > - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can > cause denial of service, in partial where dealing with compressed XML > input. Applications that parsed a document in one go -- a single call > to functions XML_Parse or XML_ParseBuffer -- were not affected. The > smaller the chunks/buffers you use for parsing previously, the bigger > the problem prior to the fix. > - CVE-2023-52426: Fix billion laughs attacks for users compiling > *without* XML_DTD defined (which is not common). Users with XML_DTD > defined have been protected since Expat >=2.4.0 (and that was > CVE-2013-0340 back then). > https://blog.hartwork.org/posts/expat-2-6-0-released/ > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 20:51:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 21:51:19 +0100 Subject: [Buildroot] [git commit] package/netatalk: security bump to version 3.1.18 Message-ID: <20240206205253.C146A873D9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e472e0872a71395cf8a3541b5883081e929bc11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP in their default configuration allows the arbitrary writing of files. By exploiting these combination of primitives, an attacker can execute arbitrary code. https://netatalk.io/CVE-2022-22995 https://netatalk.io/3.1/ReleaseNotes3.1.18 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.hash | 8 ++++---- package/netatalk/netatalk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index a35e6bc36c..9ab5d604a8 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.17/ -md5 a6429a28948f85b69c9012fb437dd9c2 netatalk-3.1.17.tar.xz -sha1 bc6578d9fa874b3816fd4ddd60a30a8f3aadc71d netatalk-3.1.17.tar.xz +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ +md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz +sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz # Locally computed -sha256 8c208e2c94bf3047db33cdbc3ce4325d2b80db61d6cc527f18f9dbd8e95b5cff netatalk-3.1.17.tar.xz +sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 40e64dabeb..53cd53876a 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.17 +NETATALK_VERSION = 3.1.18 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config From peter at korsgaard.com Tue Feb 6 20:51:59 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 21:51:59 +0100 Subject: [Buildroot] [git commit] package/expat: security bump to version 2.6.0 Message-ID: <20240206205253.D95FB873DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dad5e7d7f7bc03e648621b9be6974e7ae39a467 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Security fixes: - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can cause denial of service, in partial where dealing with compressed XML input. Applications that parsed a document in one go -- a single call to functions XML_Parse or XML_ParseBuffer -- were not affected. The smaller the chunks/buffers you use for parsing previously, the bigger the problem prior to the fix. - CVE-2023-52426: Fix billion laughs attacks for users compiling *without* XML_DTD defined (which is not common). Users with XML_DTD defined have been protected since Expat >=2.4.0 (and that was CVE-2013-0340 back then). https://blog.hartwork.org/posts/expat-2-6-0-released/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index c6c25aa3e0..043501378b 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.5.0/ -md5 ac6677b6d1b95d209ab697ce8b688704 expat-2.5.0.tar.xz -sha1 5178e13c1e34f4643d5118d5758babfe0e836fe2 expat-2.5.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.0/ +md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz +sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz # Locally calculated -sha256 ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 6f22024cc0..5f4016e0d1 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.5.0 +EXPAT_VERSION = 2.6.0 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From fontaine.fabrice at gmail.com Tue Feb 6 21:06:41 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 22:06:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-esptool: add CPE variables Message-ID: <20240206210641.878279-1-fontaine.fabrice@gmail.com> cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E Signed-off-by: Fabrice Fontaine --- package/python-esptool/python-esptool.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index f5aaface74..648748237d 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -10,5 +10,7 @@ PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/1b/8b/f0d1e75879de PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE +PYTHON_ESPTOOL_CPE_ID_VENDOR = espressif +PYTHON_ESPTOOL_CPE_ID_PRODUCT = esptool $(eval $(python-package)) -- 2.43.0 From peter at korsgaard.com Tue Feb 6 21:06:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:06:52 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add mdadm runtime test In-Reply-To: <20240127223838.274418-1-ju.o@free.fr> (Julien Olivain's message of "Sat, 27 Jan 2024 23:38:38 +0100") References: <20240127223838.274418-1-ju.o@free.fr> Message-ID: <87zfwd480j.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 2 + > support/testing/tests/package/test_mdadm.py | 138 ++++++++++++++++++ > .../package/test_mdadm/linux-mdadm.fragment | 3 + > 3 files changed, 143 insertions(+) > create mode 100644 support/testing/tests/package/test_mdadm.py > create mode 100644 support/testing/tests/package/test_mdadm/linux-mdadm.fragment .. > + > + # We add back this blank drive to the array. > + self.assertRunOk(f"mdadm {md_dev} --add {failing_dev}") > + > + # We wait few seconds to let the device rebuild. > + time.sleep(3) > + > + # The array should no longer be marked as degraded. > + out, ret = self.emulator.run(monitor_cmd) > + self.assertEqual(ret, 0) > + self.assertNotIn("DegradedArray", "\n".join(out)) That hard coded 3s is likely to cause problems on gitlab as the runners can be quite slow. How about reworking this to to check every few seconds for up to E.G. 30s if it has gotten out of the DegradedArray state? That can be done later though - So committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 20:54:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 21:54:20 +0100 Subject: [Buildroot] [git commit] support/testing: add mdadm runtime test Message-ID: <20240206210737.4FE5D873E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6338bdfc1c772956de13d2ff7c6abaa23740325d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_mdadm.py | 138 +++++++++++++++++++++ .../tests/package/test_mdadm/linux-mdadm.fragment | 3 + 3 files changed, 143 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d0ab37f5c2..ac65cbb450 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1805,6 +1805,8 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_mdadm.py +F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py F: support/testing/tests/package/test_micropython/ F: support/testing/tests/package/test_mtools.py diff --git a/support/testing/tests/package/test_mdadm.py b/support/testing/tests/package/test_mdadm.py new file mode 100644 index 0000000000..75385309a6 --- /dev/null +++ b/support/testing/tests/package/test_mdadm.py @@ -0,0 +1,138 @@ +import os +import subprocess +import time + +import infra.basetest + + +class TestMdadm(infra.basetest.BRTest): + # This test creates a dm-raid volume with mdadm. A specific Kernel + # need to be built with a config fragment enabling this support. + kernel_fragment = \ + infra.filepath("tests/package/test_mdadm/linux-mdadm.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.75" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_E2FSPROGS=y + BR2_PACKAGE_MDADM=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + # Test configuration: + md_dev = "/dev/md0" + storage_devs = ["/dev/vda", "/dev/vdb", "/dev/vdc"] + storage_size = 16 # Mega Bytes + failing_dev = storage_devs[-1] + mnt_pt = "/mnt/raid-storage" + data_file = f"{mnt_pt}/data.bin" + + qemu_storage_opts = [] + for i in range(len(storage_devs)): + disk_file = os.path.join(self.builddir, "images", f"disk{i}.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}\n") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", + "bs=1M", f"count={storage_size}"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + opts = ["-drive", f"file={disk_file},if=virtio,format=raw"] + qemu_storage_opts += opts + + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img] + qemu_storage_opts) + self.emulator.login() + + # Test the program can execute. + self.assertRunOk("mdadm --version") + + # Show the mdstat, to confirm the Kernel has support and the + # configuration is empty. + cat_mdstat_cmd = "cat /proc/mdstat" + self.assertRunOk(cat_mdstat_cmd) + + # We create a raid5 array with the drives. + cmd = f"mdadm --create --verbose {md_dev} --level=5 " + cmd += f"--raid-devices={len(storage_devs)} " + cmd += " ".join(storage_devs) + self.assertRunOk(cmd) + + # We show again mdstat, to confirm the array creation. This is + # also for debugging. + self.assertRunOk(cat_mdstat_cmd) + + # We format the device as ext4 and mount it. + self.assertRunOk(f"mkfs.ext4 {md_dev}") + self.assertRunOk(f"mkdir -p {mnt_pt}") + self.assertRunOk(f"mount {md_dev} {mnt_pt}") + + # We store some random data on this new filesystem. Note: this + # file is slightly larger than a single storage drive. This + # data file should span over two drives and use the raid5. + file_size = storage_size + 4 + cmd = f"dd if=/dev/urandom of={data_file} bs=1M count={file_size}" + self.assertRunOk(cmd) + + # We compute the hash of our data, and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # We run few common mdadm commands. + self.assertRunOk("mdadm --detail --scan") + self.assertRunOk(f"mdadm --query {md_dev}") + self.assertRunOk(f"mdadm --detail --test {md_dev}") + self.assertRunOk(f"mdadm --action=check {md_dev}") + self.assertRunOk(f"mdadm --monitor --oneshot {md_dev}") + + # We mark a device as "failed". + self.assertRunOk(f"mdadm {md_dev} --fail {failing_dev}") + + # The monitoring should now report the array as degraded. + monitor_cmd = f"mdadm --monitor --oneshot {md_dev}" + out, ret = self.emulator.run(monitor_cmd) + self.assertEqual(ret, 0) + self.assertIn("DegradedArray", "\n".join(out)) + + # We remove the failing drive from the array. + self.assertRunOk(f"mdadm {md_dev} --remove {failing_dev}") + + # We wipe the failing drive by writing zeroes. + cmd = f"dd if=/dev/zero of={failing_dev} bs=1M count={storage_size}" + self.assertRunOk(cmd) + + # We add back this blank drive to the array. + self.assertRunOk(f"mdadm {md_dev} --add {failing_dev}") + + # We wait few seconds to let the device rebuild. + time.sleep(3) + + # The array should no longer be marked as degraded. + out, ret = self.emulator.run(monitor_cmd) + self.assertEqual(ret, 0) + self.assertNotIn("DegradedArray", "\n".join(out)) + + # With all those array manipulations, the data file should not + # be corrupted. We should be able to recompute the same hash + # as before. + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) diff --git a/support/testing/tests/package/test_mdadm/linux-mdadm.fragment b/support/testing/tests/package/test_mdadm/linux-mdadm.fragment new file mode 100644 index 0000000000..152192ceb4 --- /dev/null +++ b/support/testing/tests/package/test_mdadm/linux-mdadm.fragment @@ -0,0 +1,3 @@ +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_RAID=y From peter at korsgaard.com Tue Feb 6 21:10:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:10:10 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add numactl runtime test In-Reply-To: <20240129203635.183112-1-ju.o@free.fr> (Julien Olivain's message of "Mon, 29 Jan 2024 21:36:35 +0100") References: <20240129203635.183112-1-ju.o@free.fr> Message-ID: <87v87147v1.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:08:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:08:50 +0100 Subject: [Buildroot] [git commit] support/testing: add numactl runtime test Message-ID: <20240206212609.81147873F2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=506073c3edff7fcb913924c1dd06c50fafe9665b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_numactl.py | 142 +++++++++++++++++++++ .../package/test_numactl/linux-numactl.fragment | 1 + 3 files changed, 145 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac65cbb450..dffbbf4605 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1816,6 +1816,8 @@ F: support/testing/tests/package/test_netcat.py F: support/testing/tests/package/test_nftables.py F: support/testing/tests/package/test_nftables/ F: support/testing/tests/package/test_ngrep.py +F: support/testing/tests/package/test_numactl.py +F: support/testing/tests/package/test_numactl/ F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ diff --git a/support/testing/tests/package/test_numactl.py b/support/testing/tests/package/test_numactl.py new file mode 100644 index 0000000000..2ef9eb3635 --- /dev/null +++ b/support/testing/tests/package/test_numactl.py @@ -0,0 +1,142 @@ +import os +import re + +import infra.basetest + + +class TestNumaCtl(infra.basetest.BRTest): + # A specific configuration is needed for testing numactl: + # - This test uses a x86_64 config, which has mature NUMA support. + # - A kernel need to compiled with a NUMA support. + kernel_fragment = \ + infra.filepath("tests/package/test_numactl/linux-numactl.fragment") + config = \ + f""" + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.75" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + BR2_PACKAGE_NUMACTL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def check_numactl_preferred(self): + # Show the default NUMA policy settings. We check we have the + # 4 physical cpus on 2 nodes we configured the emulator + # command line. + out, ret = self.emulator.run("numactl --show") + self.assertEqual(ret, 0) + checks = [ + "policy: default", + "preferred node: current", + "physcpubind: 0 1 2 3 ", + "nodebind: 0 1 ", + "membind: 0 1 " + ] + for pattern in checks: + self.assertIn(pattern, out) + + # Check the preferred policy on different nodes. This command + # is taken from the numactl man page. + for pref_node in range(2): + cmd = f"numactl --preferred={pref_node} numactl --show" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + checks = [ + "policy: preferred", + f"preferred node: {pref_node}" + ] + for pattern in checks: + self.assertIn(pattern, out) + + def get_numa_node_free_mem(self): + out, ret = self.emulator.run("numactl --hardware") + self.assertEqual(ret, 0) + free_mem = {} + p = re.compile("^node ([0-9]+) free: ([0-9]+) MB") + for line in out: + m = p.match(line) + if m: + node = int(m.group(1)) + mem = int(m.group(2)) + free_mem[node] = mem + return free_mem + + def check_numactl_membind(self): + # We get the current amount of free memory on each node, for + # later comparison. + initial_node_free_mem = self.get_numa_node_free_mem() + + # We allocate a shared memory file with a restriction to be in + # node 1 memory only. + shm_file = "/dev/shm/file" + file_size = 100 + cmd = f"numactl --membind=1 dd if=/dev/zero of={shm_file} bs=1M count={file_size}" + self.assertRunOk(cmd) + + # We collect again the amount of free memory per node. + node_free_mem = self.get_numa_node_free_mem() + + # Since we allocated 100M on node 1 only, we check the free + # space on node 0 did not significantly changed and on node 1 + # approximately reduced of the file size. + diff = initial_node_free_mem[0] - node_free_mem[0] + self.assertAlmostEqual(diff, 0, delta=10) + diff = initial_node_free_mem[1] - node_free_mem[1] + self.assertAlmostEqual(diff, file_size, delta=10) + + # Remove the file, to free the memory. + self.assertRunOk(f"rm -f {shm_file}") + + # We allocate again a file in shared memory, but this time in + # two chunks. Each chunk is requested to be allocated in two + # different nodes. This example is taken from the numactl man + # page. + chunk_size = file_size // 2 + cmd = "numactl --membind=0 " + cmd += f"dd if=/dev/zero of={shm_file} bs=1M count={chunk_size}" + self.assertRunOk(cmd) + cmd = "numactl --membind=1 " + cmd += f"dd if=/dev/zero of={shm_file} bs=1M count={chunk_size} seek={chunk_size}" + self.assertRunOk(cmd) + + # We collect again the amount of free memory. + node_free_mem = self.get_numa_node_free_mem() + + # We check the free memory space approximately reduced of each + # chunk size. + for node in range(2): + free_mem_diff = initial_node_free_mem[node] - node_free_mem[node] + self.assertAlmostEqual(free_mem_diff, chunk_size, delta=5) + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "bzImage") + # We start the Qemu emulator with 4 processors on 2 NUMA nodes. + self.emulator.boot(arch="x86_64", + kernel=kern, + kernel_cmdline=["console=ttyS0"], + options=["-cpu", "Nehalem", "-m", "512M", + "-smp", "cpus=4,sockets=2,cores=2,maxcpus=4", + "-object", "memory-backend-ram,size=256M,id=m0", + "-object", "memory-backend-ram,size=256M,id=m1", + "-numa", "node,cpus=0-1,nodeid=0,memdev=m0", + "-numa", "node,cpus=2-3,nodeid=1,memdev=m1", + "-initrd", img]) + self.emulator.login() + + # Check a simple numactl invication: + # show the NUMA hardware inventory. + self.assertRunOk("numactl --hardware") + + self.check_numactl_preferred() + self.check_numactl_membind() diff --git a/support/testing/tests/package/test_numactl/linux-numactl.fragment b/support/testing/tests/package/test_numactl/linux-numactl.fragment new file mode 100644 index 0000000000..e480f0c042 --- /dev/null +++ b/support/testing/tests/package/test_numactl/linux-numactl.fragment @@ -0,0 +1 @@ +CONFIG_NUMA=y From peter at korsgaard.com Tue Feb 6 21:38:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:38:53 +0100 Subject: [Buildroot] [git commit] package/python-esptool: add CPE variables Message-ID: <20240206214130.D2C84873FA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81fab735aee5d052e02a1304fb537b001c7d69c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-esptool/python-esptool.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index f5aaface74..648748237d 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -10,5 +10,7 @@ PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/1b/8b/f0d1e75879de PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE +PYTHON_ESPTOOL_CPE_ID_VENDOR = espressif +PYTHON_ESPTOOL_CPE_ID_PRODUCT = esptool $(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 21:41:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:41:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-esptool: add CPE variables In-Reply-To: <20240206210641.878279-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 22:06:41 +0100") References: <20240206210641.878279-1-fontaine.fabrice@gmail.com> Message-ID: <87plx946fh.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:42:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:42:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/libp11: drop libressl support In-Reply-To: <20240206194710.394671-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 20:47:10 +0100") References: <20240206194710.394671-1-fontaine.fabrice@gmail.com> Message-ID: <87le7x46dm.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libressl dropped engine support since version 3.8.1 resulting in the > following build failure since bump of libressl to version 3.8.2 in > commit 21eca49ed5110872407b76ab9337d2877c4cda24: > eng_front.c: In function 'IMPLEMENT_DYNAMIC_CHECK_FN': > eng_front.c:262:1: error: expected declaration specifiers before 'IMPLEMENT_DYNAMIC_BIND_FN' > 262 | IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/389ed112f082a4917f777f3e236211059c4c6d6e > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:41:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:41:55 +0100 Subject: [Buildroot] [git commit] package/libp11: drop libressl support Message-ID: <20240206214329.85E3187403@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f622944bc88a895601955d5ce13a2b7015e54232 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libressl dropped engine support since version 3.8.1 resulting in the following build failure since bump of libressl to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: eng_front.c: In function 'IMPLEMENT_DYNAMIC_CHECK_FN': eng_front.c:262:1: error: expected declaration specifiers before 'IMPLEMENT_DYNAMIC_BIND_FN' 262 | IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) | ^~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/389ed112f082a4917f777f3e236211059c4c6d6e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libp11/Config.in | 1 + package/libp11/libp11.mk | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/libp11/Config.in b/package/libp11/Config.in index ef1e5b4703..3c7ccdee27 100644 --- a/package/libp11/Config.in +++ b/package/libp11/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBP11 depends on !BR2_STATIC_LIBS # dlopen depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help OpenSSL engine for PKCS#11 modules. Part of the OpenSC project. diff --git a/package/libp11/libp11.mk b/package/libp11/libp11.mk index 7718573ace..cd4ed34297 100644 --- a/package/libp11/libp11.mk +++ b/package/libp11/libp11.mk @@ -11,16 +11,10 @@ LIBP11_INSTALL_STAGING = YES LIBP11_LICENSE = LGPL-2.1+ LIBP11_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -LIBP11_ENGINESDIR = enginesdir -else ifeq ($(BR2_PACKAGE_LIBRESSL),y) -LIBP11_ENGINESDIR = libdir -endif - # pkg-config returns a libcrypto enginesdir prefixed with the sysroot, # so let's rip it out. LIBP11_CONF_OPTS = \ - --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable $(LIBP11_ENGINESDIR) libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` + --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable enginesdir libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` ifeq ($(BR2_PACKAGE_P11_KIT),y) LIBP11_CONF_OPTS += --with-pkcs11-module=/usr/lib/p11-kit-proxy.so From peter at korsgaard.com Tue Feb 6 21:48:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:48:51 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: new acl runtime test In-Reply-To: <20240206195237.55252-1-ju.o@free.fr> (Julien Olivain's message of "Tue, 6 Feb 2024 20:52:37 +0100") References: <20240206195237.55252-1-ju.o@free.fr> Message-ID: <87h6il462k.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 1 + > support/testing/tests/package/test_acl.py | 87 +++++++++++++++++++++++ > 2 files changed, 88 insertions(+) > create mode 100644 support/testing/tests/package/test_acl.py > diff --git a/DEVELOPERS b/DEVELOPERS > index 4b8d195f9f..ce248e8706 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1762,6 +1762,7 @@ F: support/testing/tests/package/sample_python_midiutil.py > F: support/testing/tests/package/sample_python_ml_dtypes.py > F: support/testing/tests/package/sample_python_pyalsa.py > F: support/testing/tests/package/sample_python_spake2.py > +F: support/testing/tests/package/test_acl.py > F: support/testing/tests/package/test_acpica.py > F: support/testing/tests/package/test_acpica/ > F: support/testing/tests/package/test_apache.py > diff --git a/support/testing/tests/package/test_acl.py b/support/testing/tests/package/test_acl.py > new file mode 100644 > index 0000000000..e4827c7bec > --- /dev/null > +++ b/support/testing/tests/package/test_acl.py > @@ -0,0 +1,87 @@ > +import os > + > +import infra.basetest > + > + > +class TestAcl(infra.basetest.BRTest): > + # Note: this test requires a Kernel with a filesystem on /tmp > + # supporting ACLs. This is the case for the basetest reference > + # config. Kernel has CONFIG_TMPFS_POSIX_ACL=y, and /tmp is tmpfs > + # in the default Buildroot config. > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + """ > + BR2_PACKAGE_ACL=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]) > + self.emulator.login() > + > + # Check the programs can execute. > + self.assertRunOk("getfacl --version") > + self.assertRunOk("setfacl --version") > + > + # Constants used in this test. > + test_user = "acltest" > + test_data = "Hello Buildroot!" > + test_file = "/tmp/file.txt" > + > + # Create a test user: > + # -D don't set a password > + # -h set home directory > + # -H don't create home directory > + # -s set shell to /bin/sh > + self.assertRunOk(f"adduser -D -h /tmp -H -s /bin/sh {test_user}") > + > + # Create a test file, and make sure the owner is "root" with > + # standard Unix permissions to read/write only for the owner. > + self.assertRunOk(f"echo '{test_data}' > {test_file}") > + self.assertRunOk(f"chown root:root {test_file}") > + self.assertRunOk(f"chmod 0600 {test_file}") > + > + # Check we have no ACL for the test user. > + getacl_cmd = f"getfacl -c -p {test_file}" > + out, ret = self.emulator.run(getacl_cmd) > + self.assertEqual(ret, 0) NIT: Maybe we should consider making assertRunOk() return the stdout output so we don't need to open code the exit code check every time that we also need stdout? Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:49:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:49:08 +0100 Subject: [Buildroot] [git commit] support/testing: new acl runtime test Message-ID: <20240206214927.6B2AB8740E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26b7e0f2824e6df7d865ffae8ff2ec17fd58a9e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_acl.py | 87 +++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index dffbbf4605..4d916ff6a1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1762,6 +1762,7 @@ F: support/testing/tests/package/sample_python_midiutil.py F: support/testing/tests/package/sample_python_ml_dtypes.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py diff --git a/support/testing/tests/package/test_acl.py b/support/testing/tests/package/test_acl.py new file mode 100644 index 0000000000..e4827c7bec --- /dev/null +++ b/support/testing/tests/package/test_acl.py @@ -0,0 +1,87 @@ +import os + +import infra.basetest + + +class TestAcl(infra.basetest.BRTest): + # Note: this test requires a Kernel with a filesystem on /tmp + # supporting ACLs. This is the case for the basetest reference + # config. Kernel has CONFIG_TMPFS_POSIX_ACL=y, and /tmp is tmpfs + # in the default Buildroot config. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ACL=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]) + self.emulator.login() + + # Check the programs can execute. + self.assertRunOk("getfacl --version") + self.assertRunOk("setfacl --version") + + # Constants used in this test. + test_user = "acltest" + test_data = "Hello Buildroot!" + test_file = "/tmp/file.txt" + + # Create a test user: + # -D don't set a password + # -h set home directory + # -H don't create home directory + # -s set shell to /bin/sh + self.assertRunOk(f"adduser -D -h /tmp -H -s /bin/sh {test_user}") + + # Create a test file, and make sure the owner is "root" with + # standard Unix permissions to read/write only for the owner. + self.assertRunOk(f"echo '{test_data}' > {test_file}") + self.assertRunOk(f"chown root:root {test_file}") + self.assertRunOk(f"chmod 0600 {test_file}") + + # Check we have no ACL for the test user. + getacl_cmd = f"getfacl -c -p {test_file}" + out, ret = self.emulator.run(getacl_cmd) + self.assertEqual(ret, 0) + self.assertNotIn(f"user:{test_user}:", "\n".join(out)) + + # Reading the file as the test user is expected to fail. + test_read_cmd = f"su - {test_user} -c 'cat {test_file}'" + _, ret = self.emulator.run(test_read_cmd) + self.assertNotEqual(ret, 0) + + # We add a special read ACL for the test user. + cmd = f"setfacl -m u:{test_user}:r {test_file}" + self.assertRunOk(cmd) + + # Check we now have an ACL entry for the test user. + out, ret = self.emulator.run(getacl_cmd) + self.assertEqual(ret, 0) + self.assertIn(f"user:{test_user}:", "\n".join(out)) + + # Reading the file as the test user is now expected to + # succeed. + out, ret = self.emulator.run(test_read_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], test_data) + + # Attempting to write to the file as the test user is expected + # to fail (since we put an ACL only for reading). + cmd = f"su - {test_user} -c 'echo WriteTest > {test_file}'" + _, ret = self.emulator.run(cmd) + self.assertNotEqual(ret, 0) + + # Remove all ACLs. This could have been done with the command + # "setfacl -b". Instead, we use the "chacl -B" command which + # is doing the same. The reason is to slightly improve the + # coverage of this test, by including an execution of "chacl". + self.assertRunOk(f"chacl -B {test_file}") + + # Reading the file as the test user is expected to fail again. + _, ret = self.emulator.run(test_read_cmd) + self.assertNotEqual(ret, 0) From peter at korsgaard.com Tue Feb 6 21:50:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:50:50 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add thttpd runtime test In-Reply-To: <20240206201310.188097-1-ju.o@free.fr> (Julien Olivain's message of "Tue, 6 Feb 2024 21:13:10 +0100") References: <20240206201310.188097-1-ju.o@free.fr> Message-ID: <87cyt945z9.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:52:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:52:29 +0100 Subject: [Buildroot] [git commit] support/testing: add thttpd runtime test Message-ID: <20240206215310.01FF987416@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7bbea9a6c4780210afc6ff6da3513b83a8a0270 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_thttpd.py | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4d916ff6a1..376a1662d9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1847,6 +1847,7 @@ F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_tcpdump.py F: support/testing/tests/package/test_tesseract_ocr.py +F: support/testing/tests/package/test_thttpd.py F: support/testing/tests/package/test_trace_cmd.py F: support/testing/tests/package/test_trace_cmd/ F: support/testing/tests/package/test_usbutils.py diff --git a/support/testing/tests/package/test_thttpd.py b/support/testing/tests/package/test_thttpd.py new file mode 100644 index 0000000000..007bc91f2d --- /dev/null +++ b/support/testing/tests/package/test_thttpd.py @@ -0,0 +1,26 @@ +import os + +import infra.basetest + + +class TestThttpd(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_THTTPD=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]) + self.emulator.login() + + msg = "Hello Buildroot!" + + self.assertRunOk("thttpd -V") + self.assertRunOk(f"echo '{msg}' > /var/www/data/index.html") + self.assertRunOk("wget http://localhost/index.html") + self.assertRunOk(f"grep -F '{msg}' index.html") From peter at korsgaard.com Tue Feb 6 21:54:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:54:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pydantic: add CPE variables In-Reply-To: <20240206180743.6460-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 19:07:43 +0100") References: <20240206180743.6460-1-fontaine.fabrice@gmail.com> Message-ID: <878r3x45sp.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:pydantic_project:pydantic is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/9B7C28E5-ACB1-4252-AE8F-4225C1AF739E > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:55:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:55:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-opcua-asyncio: add CPE variables In-Reply-To: <20240206183536.284845-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 19:35:36 +0100") References: <20240206183536.284845-1-fontaine.fabrice@gmail.com> Message-ID: <874jel45sb.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:freeopcua:opcua-asyncio is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/39E826E8-04D1-465F-AA4E-7A41B387D7CE > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:54:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:54:55 +0100 Subject: [Buildroot] [git commit] package/python-opcua-asyncio: add CPE variables Message-ID: <20240206215536.8612787421@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa44cc4aaa7f47f6fb0e725d33c776d526a82da0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:freeopcua:opcua-asyncio is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/39E826E8-04D1-465F-AA4E-7A41B387D7CE Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-opcua-asyncio/python-opcua-asyncio.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index a8be2c8722..226b9bbc21 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -10,5 +10,7 @@ PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/bf/c6/3c17b8 PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING +PYTHON_OPCUA_ASYNCIO_CPE_ID_VENDOR = freeopcua +PYTHON_OPCUA_ASYNCIO_CPE_ID_PRODUCT = opcua-asyncio $(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 21:53:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:53:23 +0100 Subject: [Buildroot] [git commit] package/python-pydantic: add CPE variables Message-ID: <20240206215536.7AE8587420@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3803513e87cb75795edfd3205337996ad971bb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:pydantic_project:pydantic is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/9B7C28E5-ACB1-4252-AE8F-4225C1AF739E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-pydantic/python-pydantic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index 7ad7abeb8d..0cce5a153f 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -10,6 +10,8 @@ PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/aa/3f/56142232152 PYTHON_PYDANTIC_SETUP_TYPE = pep517 PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE +PYTHON_PYDANTIC_CPE_ID_VENDOR = pydantic_project +PYTHON_PYDANTIC_CPE_ID_PRODUCT = pydantic PYTHON_PYDANTIC_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-fancy-pypi-readme From fontaine.fabrice at gmail.com Tue Feb 6 22:07:25 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 23:07:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lmdb: add CPE variables Message-ID: <20240206220725.910499-1-fontaine.fabrice@gmail.com> cpe:2.3:a:py-lmdb_project:py-lmdb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AFE6D0BA-D905-43F6-81FE-308D591A82B8 Signed-off-by: Fabrice Fontaine --- package/python-lmdb/python-lmdb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index 52617b6ed0..7906d388ae 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -9,6 +9,8 @@ PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/de/13/dd9b0c1924f0becc93e0bacd123a4e7a347966e3e74753ace3b1e85acc39 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE +PYTHON_LMDB_CPE_ID_VENDOR = py-lmdb_project +PYTHON_LMDB_CPE_ID_PRODUCT = py-lmdb PYTHON_LMDB_SETUP_TYPE = setuptools PYTHON_LMDB_DEPENDENCIES = host-python-cffi -- 2.43.0 From christian at aperture.us Tue Feb 6 22:17:22 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 14:17:22 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/go: bump version to go1.21.7 Message-ID: <20240206221722.33303-1-christian@aperture.us> go1.21.7 (released 2024-02-06) includes fixes to the compiler, the go command, the runtime, and the crypto/x509 package. https://go.dev/doc/devel/release#go1.21.7 Signed-off-by: Christian Stewart --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index bee10089a7..d008019e94 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248 go1.21.6.src.tar.gz +sha256 00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6 go1.21.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index f9d31aacac..9efd4a3123 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.6 +GO_VERSION = 1.21.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.43.0 From peter at korsgaard.com Tue Feb 6 22:19:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 23:19:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-selenium: bump to version 4.16.0 In-Reply-To: <20240111055742.3023327-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:57:42 -0700") References: <20240111055742.3023327-1-james.hilliard1@gmail.com> Message-ID: <87zfwd2q38.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 22:18:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 23:18:41 +0100 Subject: [Buildroot] [git commit] package/python-selenium: bump to version 4.16.0 Message-ID: <20240206221953.9DBEA87426@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84fd8580aaaa346176e43df35823b78fd3fa686a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-selenium/python-selenium.hash | 4 ++-- package/python-selenium/python-selenium.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-selenium/python-selenium.hash b/package/python-selenium/python-selenium.hash index 03a9683a21..ef1c34bfd3 100644 --- a/package/python-selenium/python-selenium.hash +++ b/package/python-selenium/python-selenium.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/selenium/json -md5 02404033a10b2b29aa098f50503c0a1a selenium-4.9.1.tar.gz -sha256 3444f4376321530c36ce8355b6b357d8cf4a7d588ce5cf772183465930bbed0e selenium-4.9.1.tar.gz +md5 9afd7110a9e06721baae028ac42a2221 selenium-4.16.0.tar.gz +sha256 b2e987a445306151f7be0e6dfe2aa72a479c2ac6a91b9d5ef2d6dd4e49ad0435 selenium-4.16.0.tar.gz diff --git a/package/python-selenium/python-selenium.mk b/package/python-selenium/python-selenium.mk index d59a16a57d..0428cefa46 100644 --- a/package/python-selenium/python-selenium.mk +++ b/package/python-selenium/python-selenium.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SELENIUM_VERSION = 4.9.1 +PYTHON_SELENIUM_VERSION = 4.16.0 PYTHON_SELENIUM_SOURCE = selenium-$(PYTHON_SELENIUM_VERSION).tar.gz -PYTHON_SELENIUM_SITE = https://files.pythonhosted.org/packages/fd/e2/0e5bee6762a7bf7852b47a79c5b12f9e526e6962958dbb9719fa490ba24c +PYTHON_SELENIUM_SITE = https://files.pythonhosted.org/packages/16/fd/a0ef793383077dd6296e4637acc82d1e9893e9a49a47f56e96996909e427 PYTHON_SELENIUM_SETUP_TYPE = setuptools PYTHON_SELENIUM_LICENSE = Apache-2.0 From romain.naour at smile.fr Tue Feb 6 22:20:07 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 23:20:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: References: <20240106101202.495801-1-fontaine.fabrice@gmail.com> <2be6d0df-6165-4da9-b69c-ad0deb5444be@smile.fr> Message-ID: Le 06/02/2024 ? 18:59, Fabrice Fontaine a ?crit?: > Hello Romain, > > Le mar. 6 f?vr. 2024 ? 18:32, Romain Naour a ?crit : >> >> Hello, >> >> Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit : >>> ncmpc is able to automatically detect NLS support since version 0.47 and >>> https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 >>> so let it handle automatically to avoid the following build failure with >>> a bootlin toolchain which embeds a gettext definition in libintl.h which >>> will clash with the fake gettext definition provided by ncmpc since >>> https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: >>> >>> In file included from ../src/save_playlist.cxx:8: >>> /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' >>> 39 | extern char *gettext (const char *__msgid) >>> | ^~~~~~~ >>> /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' >>> ../src/i18n.h:22:20: note: to match this '(' >>> 22 | #define gettext(x) (x) >>> | ^ >>> >>> Indeed, even if NLS is disabled by the user, libintl.h will be included >>> by >>> /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h >>> though include >> >> We usually want to explicitly handle such option from Buildroot package to not >> rely on automatic detection (as currently done). >> >> It look like more a bug in ncmpc build system? > > I don't know, upstream wants to have the same code with and without > NLS, so they decided to define a gettext macro when NLS is disabled. > I could find an upstreamable solution as upstream will probably reject > a patch that removes this gettext define and puts #ifdef ENABLE_NLS > before every gettext calls. > Do you have an upstreamable solution or should we just add a NLS > dependency to ncmpc? The problem here is that libintl.h header is present in the staging directory when a glibc based toolchain is used with or without NLS enabled. If ncmpc want to define gettext as a macro when NLS is disabled, its build system should at least do some check before defining gettext as a macro since the libintl.h header can be included indirectly. When libintl.h header provide gettext, it should be undef before adding the gettext macro. Something like this (untested): i18n.h: #ifdef HAVE_INTL #include #endif #ifdef ENABLE_NLS ... #else #undef gettext #define gettext(x) (x) ... #endif Best regards, Romain > >> >> Best regards, >> Romain >> >> >>> >>> Fixes: >>> - http://autobuild.buildroot.org/results/c860e64909dd3b7fa033db0970e1cfc1376c4ec5 >>> - http://autobuild.buildroot.org/results/36eab556fac80124755bff4110af3e43fe6edd78 >>> >>> Signed-off-by: Fabrice Fontaine >>> --- >>> package/ncmpc/ncmpc.mk | 3 +-- >>> 1 file changed, 1 insertion(+), 2 deletions(-) >>> >>> diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk >>> index bc8a62daea..0965981f23 100644 >>> --- a/package/ncmpc/ncmpc.mk >>> +++ b/package/ncmpc/ncmpc.mk >>> @@ -20,8 +20,7 @@ NCMPC_CPE_ID_VENDOR = ncmpc_project >>> >>> NCMPC_CONF_OPTS = \ >>> -Dcurses=ncurses \ >>> - -Ddocumentation=disabled \ >>> - $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) >>> + -Ddocumentation=disabled >>> >>> ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) >>> NCMPC_DEPENDENCIES += lirc-tools >> > > Best Regards, > > Fabrice From thomas.petazzoni at bootlin.com Tue Feb 6 22:21:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:21:22 +0100 Subject: [Buildroot] [git commit] package/python3: bump version to 3.12.1 Message-ID: <20240206222231.8950D87481@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36e635d2d5c0166476858aa239ccbe78e8f2af14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Python 3.12.1 has removed distutils support. As such, we remove the distutils option from pkg-python.mk as well. Tested on Fedora 39, and Debian 11. All 68 package tests pass. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 44 +++------ ...1-Make-the-build-of-pyc-files-conditional.patch | 32 +++--- ...gy_getaddrinfo-configure-test-when-cross-.patch | 8 +- ...ructure-to-disable-the-build-of-certain-e.patch | 108 --------------------- ...brary-header-paths-for-cross-compilation.patch} | 37 +++---- ...nd.patch => 0004-Serial-ioctl-workaround.patch} | 6 +- ...n-t-look-in-usr-lib-termcap-for-libraries.patch | 31 ------ ...config.sh.in-ensure-sed-invocations-only.patch} | 6 +- .../0006-Add-an-option-to-disable-pydoc.patch | 84 ++++++++++++++++ .../python3/0006-Don-t-add-multiarch-paths.patch | 37 ------- .../0007-Abort-on-failed-module-build.patch | 30 ------ ...=> 0007-Add-an-option-to-disable-lib2to3.patch} | 94 ++++++++---------- ...ch => 0008-Add-an-option-to-disable-IDLE.patch} | 63 ++++++------ ...st-the-shebang-of-Python-scripts-for-cros.patch | 35 ------- ...9-python-config.sh-don-t-reassign-prefix.patch} | 6 +- ...e.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch | 44 +++++++++ .../0011-Add-an-option-to-disable-pydoc.patch | 100 ------------------- ...Add-option-to-disable-the-sqlite3-module.patch} | 35 ++++--- ...12-Add-an-option-to-disable-the-tk-module.patch | 79 +++++++++++++++ ...d-an-option-to-disable-the-curses-module.patch} | 39 ++++---- ...h => 0014-Add-an-option-to-disable-expat.patch} | 59 +++++------ ...14-Add-an-option-to-disable-the-tk-module.patch | 77 --------------- ...0015-fix-building-on-older-distributions.patch} | 16 +-- ...-fixup-CC-print-multiarch-output-for-mus.patch} | 8 +- .../0017-Add-an-option-to-disable-CJK-codecs.patch | 30 ------ ...libc-ng-doesn-t-set-errno-when-encryptio.patch} | 6 +- .../0018-Add-an-option-to-disable-NIS.patch | 33 ------- ...0019-Add-an-option-to-disable-unicodedata.patch | 30 ------ .../0021-Add-an-option-to-disable-decimal.patch | 54 ----------- ...-option-to-disable-the-ossaudiodev-module.patch | 30 ------ ...-Add-an-option-to-disable-openssl-support.patch | 30 ------ ...-an-option-to-disable-the-readline-module.patch | 30 ------ ...ions-to-disable-zlib-bzip2-and-xz-modules.patch | 42 -------- ...0027-Add-an-option-to-disable-uuid-module.patch | 33 ------- ...n-option-to-disable-the-berkeleydb-module.patch | 30 ------ package/python3/python3.hash | 6 +- package/python3/python3.mk | 62 +++++++----- 37 files changed, 456 insertions(+), 1038 deletions(-) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Tue Feb 6 22:21:23 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:21:23 +0100 Subject: [Buildroot] [git commit] docs/manual: update documentation about support python _SETUP_TYPE Message-ID: <20240206222231.94FEB87482@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89e67a96383f1a0d8f44a9385637798f8c31ef3f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Note that we do not document the special flit-bootstrap value, as it is considered an internal implementation detail, and shouldn't normally be used by packages. Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.adoc | 4 ++-- docs/manual/adding-packages-python.adoc | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index e994b7e1f6..03249ca06f 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -429,8 +429,8 @@ different way, using different infrastructures: and xref:cmake-package-reference[reference]. * *Makefiles for Python modules*: We have a dedicated infrastructure - for Python modules that use the +flit+, +pep517+ or +setuptools+ - mechanisms. We cover them through a + for Python modules that use the +flit+, +pep517+, +setuptools+, + +setuptools-rust+ or +maturin+ mechanisms. We cover them through a xref:python-package-tutorial[tutorial] and a xref:python-package-reference[reference]. diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 44fd77fd1d..9953be6639 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -4,9 +4,9 @@ === Infrastructure for Python packages This infrastructure applies to Python packages that use the standard -Python setuptools or pep517 mechanisms as their build system, generally -recognizable by the usage of a +setup.py+ script or +pyproject.toml+ -file. +Python setuptools, pep517, flit or maturin mechanisms as their build +system, generally recognizable by the usage of a +setup.py+ script or ++pyproject.toml+ file. [[python-package-tutorial]] @@ -51,8 +51,9 @@ On line 13, we declare our dependencies, so that they are built before the build process of our package starts. On line 14, we declare the specific Python build system being used. In -this case the +setuptools+ Python build system is used. The three -supported ones are +flit+, +pep517+ and +setuptools+. +this case the +setuptools+ Python build system is used. The five +supported ones are +flit+, +pep517+, +setuptools+, +setuptools-rust+ +and +maturin+. Finally, on line 16, we invoke the +python-package+ macro that generates all the Makefile rules that actually allow the package to be @@ -98,13 +99,14 @@ Note that: One variable specific to the Python infrastructure is mandatory: * +PYTHON_FOO_SETUP_TYPE+, to define which Python build system is used - by the package. The three supported values are +flit+, +pep517+ and - +setuptools+. If you don't know which one is used in your package, - look at the +setup.py+ or +pyproject.toml+ file in your package - source code, and see whether it imports things from the +flit+ - module or the +setuptools+ module. If the package is using a - +pyproject.toml+ file without any build-system requires and with a - local in-tree backend-path one should use +pep517+. + by the package. The five supported values are +flit+, +pep517+ and + +setuptools+, +setuptools-rust+ and +maturin+. If you don't know + which one is used in your package, look at the +setup.py+ or + +pyproject.toml+ file in your package source code, and see whether + it imports things from the +flit+ module or the +setuptools+ + module. If the package is using a +pyproject.toml+ file without any + build-system requires and with a local in-tree backend-path one + should use +pep517+. A few additional variables, specific to the Python infrastructure, can optionally be defined, depending on the package's needs. Many of them From thomas.petazzoni at bootlin.com Tue Feb 6 22:21:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:21:21 +0100 Subject: [Buildroot] [git commit] package/pkg-python.mk: remove distutils support Message-ID: <20240206222231.74FDF87485@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09de823cbc7bd50a40e25f4166b4e42be94b0c7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All Python packages have been migrated to a different setup type, and we're about to bump to Python 3.12 which no longer supports distutils, so let's drop support for distutils in our python-package infrastructure. Signed-off-by: Adam Duskett [Thomas: also update the Buildroot manual] Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.adoc | 4 +-- docs/manual/adding-packages-python.adoc | 46 ++++++++++++++---------------- package/pkg-python.mk | 38 ++---------------------- 3 files changed, 26 insertions(+), 62 deletions(-) diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index 5a0f298eb1..e994b7e1f6 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -429,8 +429,8 @@ different way, using different infrastructures: and xref:cmake-package-reference[reference]. * *Makefiles for Python modules*: We have a dedicated infrastructure - for Python modules that use the +distutils+, +flit+, +pep517+ or - +setuptools+ mechanisms. We cover them through a + for Python modules that use the +flit+, +pep517+ or +setuptools+ + mechanisms. We cover them through a xref:python-package-tutorial[tutorial] and a xref:python-package-reference[reference]. diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 33dbfc30a5..44fd77fd1d 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -29,7 +29,7 @@ with an example : 11: PYTHON_FOO_LICENSE_FILES = LICENSE 12: PYTHON_FOO_ENV = SOME_VAR=1 13: PYTHON_FOO_DEPENDENCIES = libmad -14: PYTHON_FOO_SETUP_TYPE = distutils +14: PYTHON_FOO_SETUP_TYPE = setuptools 15: 16: $(eval $(python-package)) ------------------------ @@ -51,8 +51,8 @@ On line 13, we declare our dependencies, so that they are built before the build process of our package starts. On line 14, we declare the specific Python build system being used. In -this case the +distutils+ Python build system is used. The four -supported ones are +distutils+, +flit+, +pep517+ and +setuptools+. +this case the +setuptools+ Python build system is used. The three +supported ones are +flit+, +pep517+ and +setuptools+. Finally, on line 16, we invoke the +python-package+ macro that generates all the Makefile rules that actually allow the package to be @@ -98,13 +98,13 @@ Note that: One variable specific to the Python infrastructure is mandatory: * +PYTHON_FOO_SETUP_TYPE+, to define which Python build system is used - by the package. The four supported values are +distutils+, +flit+, - +pep517+ and +setuptools+. If you don't know which one is used in - your package, look at the +setup.py+ or +pyproject.toml+ file in your - package source code, and see whether it imports things from the - +distutils+, +flit+ module or the +setuptools+ module. If the package - is using a +pyproject.toml+ file without any build-system requires - and with a local in-tree backend-path one should use +pep517+. + by the package. The three supported values are +flit+, +pep517+ and + +setuptools+. If you don't know which one is used in your package, + look at the +setup.py+ or +pyproject.toml+ file in your package + source code, and see whether it imports things from the +flit+ + module or the +setuptools+ module. If the package is using a + +pyproject.toml+ file without any build-system requires and with a + local in-tree backend-path one should use +pep517+. A few additional variables, specific to the Python infrastructure, can optionally be defined, depending on the package's needs. Many of them @@ -119,27 +119,25 @@ therefore only use a few of them, or none. +PYTHON_FOO_SUBDIR+. * +PYTHON_FOO_ENV+, to specify additional environment variables to - pass to the Python +setup.py+ script (for distutils/setuptools - packages) or the +support/scripts/pyinstaller.py+ script (for - flit/pep517 packages) for both the build and install steps. Note - that the infrastructure is automatically passing several standard - variables, defined in +PKG_PYTHON_DISTUTILS_ENV+ (for distutils - target packages), +HOST_PKG_PYTHON_DISTUTILS_ENV+ (for distutils - host packages), +PKG_PYTHON_SETUPTOOLS_ENV+ (for setuptools target + pass to the Python +setup.py+ script (for setuptools packages) or + the +support/scripts/pyinstaller.py+ script (for flit/pep517 + packages) for both the build and install steps. Note that the + infrastructure is automatically passing several standard variables, + defined in +PKG_PYTHON_SETUPTOOLS_ENV+ (for setuptools target packages), +HOST_PKG_PYTHON_SETUPTOOLS_ENV+ (for setuptools host packages), +PKG_PYTHON_PEP517_ENV+ (for flit/pep517 target packages) and +HOST_PKG_PYTHON_PEP517_ENV+ (for flit/pep517 host packages). -* +PYTHON_FOO_BUILD_OPTS+, to specify additional options to pass to the - Python +setup.py+ script during the build step, this generally only - makes sense to use for distutils/setuptools based packages as - flit/pep517 based packages do not pass these options to a +setup.py+ - script but instead pass them to +support/scripts/pyinstaller.py+. +* +PYTHON_FOO_BUILD_OPTS+, to specify additional options to pass to + the Python +setup.py+ script during the build step, this generally + only makes sense to use for setuptools based packages as flit/pep517 + based packages do not pass these options to a +setup.py+ script but + instead pass them to +support/scripts/pyinstaller.py+. * +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+, +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass - to the Python +setup.py+ script (for distutils/setuptools packages) - or +support/scripts/pyinstaller.py+ (for flit/pep517 packages) during + to the Python +setup.py+ script (for setuptools packages) or + +support/scripts/pyinstaller.py+ (for flit/pep517 packages) during the target installation step, the staging installation step or the host installation, respectively. diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 4bed5a1835..94f28ff841 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -52,40 +52,6 @@ HOST_PKG_PYTHON_ENV = \ PYTHONNOUSERSITE=1 \ $(HOST_CONFIGURE_OPTS) -# Target distutils-based packages -PKG_PYTHON_DISTUTILS_ENV = \ - $(PKG_PYTHON_ENV) \ - LDSHARED="$(TARGET_CROSS)gcc -shared" - -PKG_PYTHON_DISTUTILS_BUILD_CMD = \ - setup.py build \ - --executable=/usr/bin/python - -PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ - --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr - -PKG_PYTHON_DISTUTILS_INSTALL_TARGET_CMD = \ - setup.py install --no-compile \ - $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ - --root=$(TARGET_DIR) - -PKG_PYTHON_DISTUTILS_INSTALL_STAGING_CMD = \ - setup.py install \ - $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ - --root=$(STAGING_DIR) - -# Host distutils-based packages -HOST_PKG_PYTHON_DISTUTILS_ENV = \ - $(HOST_PKG_PYTHON_ENV) - -HOST_PKG_PYTHON_DISTUTILS_BUILD_CMD = \ - setup.py build \ - -HOST_PKG_PYTHON_DISTUTILS_INSTALL_CMD = \ - setup.py install \ - --prefix=$(HOST_DIR) - # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ $(PKG_PYTHON_ENV) @@ -287,8 +253,8 @@ endif $(2)_SETUP_TYPE_UPPER = $$(call UPPERCASE,$$($(2)_SETUP_TYPE)) -ifneq ($$(filter-out distutils setuptools setuptools-rust pep517 flit flit-bootstrap maturin,$$($(2)_SETUP_TYPE)),) -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'maturin', 'setuptools', 'setuptools-rust', 'pep517' or 'flit'.") +ifneq ($$(filter-out setuptools setuptools-rust pep517 flit flit-bootstrap maturin,$$($(2)_SETUP_TYPE)),) +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'maturin', 'setuptools', 'setuptools-rust', 'pep517' or 'flit'.") endif ifeq ($(4)-$$($(2)_SETUP_TYPE),target-flit-bootstrap) $$(error flit-bootstrap setup type only supported for host packages) From thomas.petazzoni at bootlin.com Tue Feb 6 22:21:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:21:20 +0100 Subject: [Buildroot] [git commit] package/python-crossbar: drop package Message-ID: <20240206222231.6834B87482@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dcf0c3612dff3445d2de5862d34246ab18a43b8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The current package has not recieved an update since Sat Oct 9 2021 33ece2446e25e20929d1c7eefa9f3244a3b79a92 and is not python 3.12 compatible. Furthermore, the current version requires at least 42 new packages worth of depedencies of which several require patches to be python 3.12 compatible. As nobody has stepped up to maintain the package and its ever-growing list of dependencies, along with the other problems, it is time to drop the package. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 3 - Config.in.legacy | 16 +++++ DEVELOPERS | 1 - package/Config.in | 1 - .../0001-Avoid-intentional-syntax-error.patch | 29 --------- ...ements-min.txt-drop-indirect-dependencies.patch | 74 ---------------------- ...bservice-wap-use-markupsafe-instead-of-we.patch | 53 ---------------- package/python-crossbar/Config.in | 72 --------------------- package/python-crossbar/python-crossbar.hash | 5 -- package/python-crossbar/python-crossbar.mk | 14 ---- .../tests/package/sample_python_crossbar.py | 3 - .../testing/tests/package/test_python_crossbar.py | 23 ------- 12 files changed, 16 insertions(+), 278 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 1f85ff2e07..bda57f46b0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1064,9 +1064,6 @@ package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch package/pulseview/0003-Support-glibmm-2.68.patch Upstream package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch Upstream package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch Upstream -package/python-crossbar/0001-Avoid-intentional-syntax-error.patch Upstream -package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch Upstream -package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch Upstream package/python-daphne/0001-remove-pytest-runner-requirement.patch Upstream package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch Upstream package/python-pylibftdi/0001-do-not-use-find-library.patch Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 208f8347c4..5fbe5d9030 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,22 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_PYTHON_CROSSBAR + bool "python-crossbar removed" + select BR2_LEGACY + help + python-crossbar has been removed. The current package has + not received an update since Sat Oct 9 13:55:06 2021 commit: + 33ece2446e25e20929d1c7eefa9f3244a3b79a92 and is not python + 3.12.0 compatible. + + Furthermore, the current version requires at least 42 new + packages worth of depedencies of which several require + patches to be python 3.12.0 compatible. As nobody has + stepped up to maintain the package and its ever-growing list + of dependencies, along with the other problems, it was time + to drop the package. + config BR2_PACKAGE_PYTHON_PYGAME bool "python-pygame removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index cf98d56aa1..3e0b2e5c9c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2155,7 +2155,6 @@ F: package/python-autobahn/ F: package/python-cbor/ F: package/python-characteristic/ F: package/python-click/ -F: package/python-crossbar/ F: package/python-lmdb/ F: package/python-mistune/ F: package/python-netaddr/ diff --git a/package/Config.in b/package/Config.in index e10fbd8b35..047877c960 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1047,7 +1047,6 @@ menu "External python modules" source "package/python-crc16/Config.in" source "package/python-crcmod/Config.in" source "package/python-crontab/Config.in" - source "package/python-crossbar/Config.in" source "package/python-cryptography/Config.in" source "package/python-cssselect/Config.in" source "package/python-cssselect2/Config.in" diff --git a/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch b/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch deleted file mode 100644 index 0ff7cae21a..0000000000 --- a/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 423a1b081f6b7198f6a921ca83043270ebbace1a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 1 May 2016 15:35:32 +0200 -Subject: [PATCH] Avoid intentional syntax error - -This file has an intentional syntax error, meant to validate QA, but -it breaks byte compilation of this package. - -Issue reported upstream: -https://github.com/crossbario/crossbar/issues/750. - -Signed-off-by: Thomas Petazzoni ---- - crossbar/worker/test/examples/syntaxerror.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/crossbar/worker/test/examples/syntaxerror.py b/crossbar/worker/test/examples/syntaxerror.py -index 7b88e088..cd7de901 100644 ---- a/crossbar/worker/test/examples/syntaxerror.py -+++ b/crossbar/worker/test/examples/syntaxerror.py -@@ -27,5 +27,3 @@ - # with this program. If not, see . - # - ##################################################################################### -- --class # noqa --- -2.20.1 - diff --git a/package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch b/package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch deleted file mode 100644 index 12027d779c..0000000000 --- a/package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3ae2b36e48fc0f75f0bb6c89f893ece033bccd87 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Aug 2022 18:44:29 +0200 -Subject: [PATCH] requirements-min.txt: drop indirect dependencies - -For some interesting reason, the crossbar maintainers have decided to -include indirect dependencies in their requirements-min.txt, i.e -dependencies that they don't use directly, but that packages they -depend on themselves depend on. - -This makes the packaging in Buildroot confusing, as it means not all -dependencies in requirements-min.txt should be taken into -account. Also some of these indirect dependencies cause issues due to -upper bounds set on the version (which is the case for idna and -urllib3). - -This patch therefore clarifies the situation by removing such indirect -dependencies from requirements-min.txt. As the patch is obviously not -upstreamable, it will require some maintenance effort, but that effort -is anyway already there to sort out direct dependencies from indirect -dependencies when updating the Buildroot packaging for crossbar. - -Signed-off-by: Thomas Petazzoni ---- - requirements-min.txt | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/requirements-min.txt b/requirements-min.txt -index 5ac4e0ee..cdd82d27 100644 ---- a/requirements-min.txt -+++ b/requirements-min.txt -@@ -1,20 +1,13 @@ --attrs>=17.2.0 - autobahn[asyncio,twisted,encryption,compress,serialization,scram]>=21.3.1 - bitstring>=3.1.5 --bcrypt>=3.1.6 - cbor>=1.0.0 - click>=6.7 - colorama>=0.4.4 --constantly>=15.1.0 - cryptography>=2.6.1 --h2>=3.2.0 --idna<2.6,>=2.5 - importlib-resources>=4.1.1 --incremental>=17.5.0 - jinja2>=2.10.1 - lmdb>=0.92 - mistune>=0.7.4 --netaddr>=0.7.19 - passlib>=1.7.1 - priority>=1.3.0 - psutil>=5.2.2 -@@ -28,7 +21,6 @@ pyqrcode>=1.2.1 - pytrie>=0.3 - pyyaml>=4.2b4 - sdnotify>=0.3.1 --service_identity>=17.0.0 - setproctitle>=1.1.10 - setuptools>=36.2.7 - treq>=20.4.1 -@@ -37,10 +29,6 @@ twisted[tls,conch,http2,osx_platform]>=20.3.0; sys_platform == 'darwin' - twisted[tls,conch,http2,windows_platform]>=20.3.0; sys_platform == 'win32' - txaio>=21.2.1 - txtorcon>=20.0.0 --u-msgpack-python>=2.4.1 --# urllib3 is an indirect dependency, but we force a recent version because of https://nvd.nist.gov/vuln/detail/CVE-2019-11324 --# workaround for version conflict in requests vs sth else: --urllib3<1.25,>=1.21.1 - vmprof>=0.4.12; platform_machine=='x86_64' or platform_machine=='i386' or platform_machine=='arm' - watchdog>=0.8.3 - werkzeug>=0.14.1 --- -2.37.1 - diff --git a/package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch b/package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch deleted file mode 100644 index ab2d4709bd..0000000000 --- a/package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a6866509b0387ab6d6f99f68cd82bcac922fe839 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 30 May 2022 19:38:11 +0200 -Subject: [PATCH] crossbar/webservice/wap: use markupsafe instead of werkzeug - -wap.py use escape from werkzeug but it has been removed since -the version 2.1.0 [1]. - -Replace with escape from markupsafe like upstream commit [2] -(wihout other changes). - -[1] https://github.com/pallets/werkzeug/commit/22d1e9ac13829b83347107a9b4d77072a8e1af6a -[2] https://github.com/crossbario/crossbar/commit/ca8d383f01231e2b3f986e791f215f12f2deee5d - -Signed-off-by: Romain Naour ---- - crossbar/webservice/wap.py | 7 ++++++- - requirements-min.txt | 1 + - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/crossbar/webservice/wap.py b/crossbar/webservice/wap.py -index 825558b1..6daa9b21 100644 ---- a/crossbar/webservice/wap.py -+++ b/crossbar/webservice/wap.py -@@ -36,7 +36,12 @@ from collections.abc import Mapping, Sequence - - from werkzeug.routing import Map, Rule - from werkzeug.exceptions import NotFound, MethodNotAllowed --from werkzeug.utils import escape -+ -+try: -+ # removed in werkzeug 2.1.0 -+ from werkzeug.utils import escape -+except ImportError: -+ from markupsafe import escape - - from jinja2 import Environment, FileSystemLoader - from jinja2.sandbox import SandboxedEnvironment -diff --git a/requirements-min.txt b/requirements-min.txt -index cdd82d27..50cb1489 100644 ---- a/requirements-min.txt -+++ b/requirements-min.txt -@@ -7,6 +7,7 @@ cryptography>=2.6.1 - importlib-resources>=4.1.1 - jinja2>=2.10.1 - lmdb>=0.92 -+MarkupSafe>=1.1.1 - mistune>=0.7.4 - passlib>=1.7.1 - priority>=1.3.0 --- -2.37.1 - diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in deleted file mode 100644 index 357be4803c..0000000000 --- a/package/python-crossbar/Config.in +++ /dev/null @@ -1,72 +0,0 @@ -config BR2_PACKAGE_PYTHON_CROSSBAR - bool "python-crossbar" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography - depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy - depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy - depends on BR2_INSTALL_LIBSTDCPP # python-autobahn's compress and serialization - # All the following dependencies are runtime dependencies. It - # matches almost 1:1 the requirements-min.txt from crossbar - # with the following exceptions: - # - importlib-resources is in Python itself, so no external - # module is needed - # - vmprof, while listed as a needed dependency, isn't - # actually strictly necesary - # - wsaccel is not a direct dependency, it is there to make - # sure autobahn has the 'accelerate' feature, when the - # Python implementation is CPython, and our package does - # enable autobahn[accelerate] - select BR2_PACKAGE_PYTHON_AUTOBAHN - select BR2_PACKAGE_PYTHON_AUTOBAHN_ACCELERATE - select BR2_PACKAGE_PYTHON_AUTOBAHN_COMPRESS - select BR2_PACKAGE_PYTHON_AUTOBAHN_ENCRYPTION - select BR2_PACKAGE_PYTHON_AUTOBAHN_SCRAM - select BR2_PACKAGE_PYTHON_AUTOBAHN_SERIALIZATION - select BR2_PACKAGE_PYTHON_AUTOBAHN_TWISTED - select BR2_PACKAGE_PYTHON_BITSTRING - select BR2_PACKAGE_PYTHON_CBOR - select BR2_PACKAGE_PYTHON_CLICK - select BR2_PACKAGE_PYTHON_COLORAMA - select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY - select BR2_PACKAGE_PYTHON_JINJA2 - select BR2_PACKAGE_PYTHON_LMDB - select BR2_PACKAGE_PYTHON_MARKUPSAFE - select BR2_PACKAGE_PYTHON_MISTUNE - select BR2_PACKAGE_PYTHON_PASSLIB - select BR2_PACKAGE_PYTHON_PRIORITY - select BR2_PACKAGE_PYTHON_PSUTIL - select BR2_PACKAGE_PYTHON_PYASN1 - select BR2_PACKAGE_PYTHON_PYASN1_MODULES - select BR2_PACKAGE_PYTHON_PYGMENTS - select BR2_PACKAGE_PYTHON_PYNACL - select BR2_PACKAGE_PYTHON_PYOPENSSL - select BR2_PACKAGE_PYTHON_PYQRCODE - select BR2_PACKAGE_PYTHON_PYTRIE - select BR2_PACKAGE_PYTHON_PYYAML - select BR2_PACKAGE_PYTHON_SDNOTIFY - select BR2_PACKAGE_PYTHON_SETPROCTITLE - select BR2_PACKAGE_PYTHON_SETUPTOOLS - select BR2_PACKAGE_PYTHON_TREQ - select BR2_PACKAGE_PYTHON_TWISTED - select BR2_PACKAGE_PYTHON_TWISTED_CONCH - select BR2_PACKAGE_PYTHON_TWISTED_HTTP2 - select BR2_PACKAGE_PYTHON_TWISTED_TLS - select BR2_PACKAGE_PYTHON_TXAIO - select BR2_PACKAGE_PYTHON_TXTORCON - select BR2_PACKAGE_PYTHON_UBJSON - select BR2_PACKAGE_PYTHON_WATCHDOG - select BR2_PACKAGE_PYTHON_WERKZEUG - select BR2_PACKAGE_PYTHON_ZLMDB - select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE - help - Crossbar.io is an open-source WAMP application router that - allows to build advanced applications from loosely-coupled - components that can talk in real-time with each other. - - https://pypi.python.org/pypi/crossbar - -comment "python-crossbar needs a glibc or musl toolchain w/ C++, gcc >= 9" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 diff --git a/package/python-crossbar/python-crossbar.hash b/package/python-crossbar/python-crossbar.hash deleted file mode 100644 index 4441578a29..0000000000 --- a/package/python-crossbar/python-crossbar.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/crossbar/json -md5 df576100bcf6e423cdc1e2e96b602140 crossbar-21.3.1.tar.gz -sha256 ac71959f0c57ab08d43f7830b85c6312e000b25543a179cd751ac357944dd7ef crossbar-21.3.1.tar.gz -# Locally computed -sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 crossbar/LICENSE diff --git a/package/python-crossbar/python-crossbar.mk b/package/python-crossbar/python-crossbar.mk deleted file mode 100644 index aae61cd2e8..0000000000 --- a/package/python-crossbar/python-crossbar.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-crossbar -# -################################################################################ - -PYTHON_CROSSBAR_VERSION = 21.3.1 -PYTHON_CROSSBAR_SOURCE = crossbar-$(PYTHON_CROSSBAR_VERSION).tar.gz -PYTHON_CROSSBAR_SITE = https://files.pythonhosted.org/packages/17/37/aafc4ec30068fd7ebb97f1a00d4ddf8de482dfa4c1d2a1fc6bb814d91400 -PYTHON_CROSSBAR_LICENSE = AGPL-3.0 -PYTHON_CROSSBAR_LICENSE_FILES = crossbar/LICENSE -PYTHON_CROSSBAR_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_crossbar.py b/support/testing/tests/package/sample_python_crossbar.py deleted file mode 100644 index 3695fe92c0..0000000000 --- a/support/testing/tests/package/sample_python_crossbar.py +++ /dev/null @@ -1,3 +0,0 @@ -import crossbar - -crossbar.run(["version"]) diff --git a/support/testing/tests/package/test_python_crossbar.py b/support/testing/tests/package/test_python_crossbar.py deleted file mode 100644 index e67ab9ff6e..0000000000 --- a/support/testing/tests/package/test_python_crossbar.py +++ /dev/null @@ -1,23 +0,0 @@ -from tests.package.test_python import TestPythonPackageBase -import os - - -class TestPythonPy3Crossbar(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON3=y - BR2_PACKAGE_PYTHON_CROSSBAR=y - BR2_TARGET_ROOTFS_EXT2=y - BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - """ - sample_scripts = ["tests/package/sample_python_crossbar.py"] - timeout = 60 - - def login(self): - ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") - self.emulator.boot(arch="armv5", - kernel="builtin", - options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], - kernel_cmdline=["rootwait", "root=/dev/sda"]) - self.emulator.login() From thomas.petazzoni at bootlin.com Tue Feb 6 22:21:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:21:19 +0100 Subject: [Buildroot] [git commit] package/python-pygame: drop package Message-ID: <20240206222231.55E6B87481@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd8b5d18507b9e01075fa6f90b981e79b400e3f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The python-pygame package has not recieved any update since Sun May 1 22:15:17 2016 (commit: a9ec96e545102ae5ccd4280323d35360b0a5072d) Also, this package no longer builds properly against python 3.12.0. Receiving the following error when building: ``` src/surface.c:2812:14: error: invalid type argument of unary ???*??? (have ???int???) 2812 | ch = *PyUnicode_AS_UNICODE (obj); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ src/surface.c: In function ???PySurface_Blit???: ``` If someone wants to re-introduce this package at a later date they are more than welcome to do so! Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 ++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pygame/Config.in | 50 -------------- package/python-pygame/python-pygame.hash | 3 - package/python-pygame/python-pygame.mk | 111 ------------------------------- 6 files changed, 7 insertions(+), 166 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 9421d07aa1..208f8347c4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_PYTHON_PYGAME + bool "python-pygame removed" + select BR2_LEGACY + help + python-pygame has been removed due to being abandoned and + the old version no longer building with python 3.12.0. + config BR2_KERNEL_HEADERS_4_14 bool "kernel headers version 4.14.x are no longer supported" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 376a1662d9..cf98d56aa1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1704,7 +1704,6 @@ F: package/libcddb/ F: package/libmodbus/ F: package/ltris/ F: package/opentyrian/ -F: package/python-pygame/ N: Julien Corjon F: package/qt5/ diff --git a/package/Config.in b/package/Config.in index b48f9eb1c7..e10fbd8b35 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1259,7 +1259,6 @@ menu "External python modules" source "package/python-pydyf/Config.in" source "package/python-pyelftools/Config.in" source "package/python-pyftpdlib/Config.in" - source "package/python-pygame/Config.in" source "package/python-pygments/Config.in" source "package/python-pyhamcrest/Config.in" source "package/python-pyicu/Config.in" diff --git a/package/python-pygame/Config.in b/package/python-pygame/Config.in deleted file mode 100644 index 57eb020742..0000000000 --- a/package/python-pygame/Config.in +++ /dev/null @@ -1,50 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYGAME - bool "python-pygame" - select BR2_PACKAGE_SDL - help - Pygame is a cross-platfrom library designed to make it easy - to write multimedia software, such as games, in - Python. Pygame requires the Python language and SDL - multimedia library. - It can also make use of several other popular libraries. - - http://www.pygame.org/ - -if BR2_PACKAGE_PYTHON_PYGAME -config BR2_PACKAGE_PYTHON_PYGAME_IMAGE - bool "pygame.image" - select BR2_PACKAGE_SDL_IMAGE - select BR2_PACKAGE_SDL_IMAGE_PNG - select BR2_PACKAGE_SDL_IMAGE_JPEG - help - pygame module for loading, saving and transfering images. - Will autoselect sdl_image with png and jpeg support. - -config BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES - bool "pygame.examples" - help - Include examples. - Selecting this option adds about 1.5 MB to the target file - system. - -config BR2_PACKAGE_PYTHON_PYGAME_FONT - bool "pygame.font" - select BR2_PACKAGE_SDL_TTF - help - pygame module for loading and rendering fonts. - Will autoselect sdl_ttf. - -config BR2_PACKAGE_PYTHON_PYGAME_MIXER - bool "pygame.mixer" - select BR2_PACKAGE_SDL_MIXER - help - pygame module for loading and playing sounds. - Will autoselect sdl_mixer. - -config BR2_PACKAGE_PYTHON_PYGAME_SCRAP - bool "pygame.scrap" - depends on BR2_PACKAGE_SDL_X11 - help - pygame module for clipboard support (X11 needed) - -endif diff --git a/package/python-pygame/python-pygame.hash b/package/python-pygame/python-pygame.hash deleted file mode 100644 index c0496515e2..0000000000 --- a/package/python-pygame/python-pygame.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 f95a7dd68ea294d415e36e068d2f533c5a01c67773452d14a535c5c7455681fe pygame-d61ea8eabd56.tar.gz -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 LGPL diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk deleted file mode 100644 index 84fd6df4e2..0000000000 --- a/package/python-pygame/python-pygame.mk +++ /dev/null @@ -1,111 +0,0 @@ -################################################################################ -# -# python-pygame -# -################################################################################ - -# stable 1.9.1 release requires V4L which has been wiped out of recent Linux -# kernels, so use latest mercurial revision until next stable release is out. -PYTHON_PYGAME_VERSION = d61ea8eabd56 -PYTHON_PYGAME_SOURCE = pygame-$(PYTHON_PYGAME_VERSION).tar.gz -PYTHON_PYGAME_SITE = https://bitbucket.org/pygame/pygame -PYTHON_PYGAME_SITE_METHOD = hg -PYTHON_PYGAME_SETUP_TYPE = setuptools -PYTHON_PYGAME_LICENSE = LGPL-2.1+ -PYTHON_PYGAME_LICENSE_FILES = LGPL - -ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y) -PYTHON_PYGAME_OPT_DEPENDS += sdl_image -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y) -PYTHON_PYGAME_OPT_DEPENDS += sdl_ttf -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y) -PYTHON_PYGAME_OPT_DEPENDS += sdl_mixer -endif - -PYTHON_PYGAME_DEPENDENCIES = sdl $(PYTHON_PYGAME_OPT_DEPENDS) - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y) -define PYTHON_PYGAME_UNCONFIGURE_IMAGE - $(SED) 's/^imageext/#imageext/' $(@D)/Setup -endef -endif - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y) -define PYTHON_PYGAME_UNCONFIGURE_FONT - $(SED) 's/^font/#font/' $(@D)/Setup -endef -endif - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y) -define PYTHON_PYGAME_UNCONFIGURE_MIXER - $(SED) 's/^mixer/#mixer/g' $(@D)/Setup -endef -endif - -# Both require numpy or numeric python module -define PYTHON_PYGAME_UNCONFIGURE_SNDARRAY - $(SED) 's/^_numericsndarray/#_numericsndarray/' $(@D)/Setup -endef - -define PYTHON_PYGAME_UNCONFIGURE_SURFARRAY - $(SED) 's/^_numericsurfarray/#_numericsurfarray/' $(@D)/Setup -endef - -# Requires smpeg -define PYTHON_PYGAME_UNCONFIGURE_MOVIE - $(SED) 's/^movie/#movie/' $(@D)/Setup -endef - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_SCRAP),y) -define PYTHON_PYGAME_UNCONFIGURE_SCRAP - $(SED) 's/^scrap/#scrap/' $(@D)/Setup -endef -endif - -define PYTHON_PYGAME_UNCONFIGURE_FREETYPE - $(SED) 's/^_freetype/#_freetype/' $(@D)/Setup -endef - -PYTHON_PYGAME_SDL_FLAGS = `$(STAGING_DIR)/usr/bin/sdl-config --cflags` -PYTHON_PYGAME_SDL_FLAGS += `$(STAGING_DIR)/usr/bin/sdl-config --libs` - -# Pygame needs a Setup file where options should be commented out if -# dependencies are not available -define PYTHON_PYGAME_CONFIGURE_CMDS - cp -f $(@D)/Setup.in $(@D)/Setup - $(SED) "s~^SDL = ~SDL = $(PYTHON_PYGAME_SDL_FLAGS) \n#~" $(@D)/Setup - $(SED) 's/^pypm/#pypm/' $(@D)/Setup - $(PYTHON_PYGAME_UNCONFIGURE_IMAGE) - $(PYTHON_PYGAME_UNCONFIGURE_FONT) - $(PYTHON_PYGAME_UNCONFIGURE_MIXER) - $(PYTHON_PYGAME_UNCONFIGURE_SNDARRAY) - $(PYTHON_PYGAME_UNCONFIGURE_SURFARRAY) - $(PYTHON_PYGAME_UNCONFIGURE_MOVIE) - $(PYTHON_PYGAME_UNCONFIGURE_SCRAP) - $(PYTHON_PYGAME_UNCONFIGURE_FREETYPE) -endef - -define PYTHON_PYGAME_REMOVE_DOC - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs -endef - -PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_DOC - -define PYTHON_PYGAME_REMOVE_TESTS - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests -endef - -PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES),y) -define PYTHON_PYGAME_REMOVE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pygame/examples -endef -PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_EXAMPLES -endif - -$(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 22:25:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 23:25:55 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add libcamera runtime test In-Reply-To: <20240204191922.366955-1-ju.o@free.fr> (Julien Olivain's message of "Sun, 4 Feb 2024 20:19:22 +0100") References: <20240204191922.366955-1-ju.o@free.fr> Message-ID: <87v8712psc.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 22:26:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 23:26:02 +0100 Subject: [Buildroot] [git commit] support/testing: add libcamera runtime test Message-ID: <20240206222624.6E52587494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22f9ce63a30200696dbcbe6ae3a6cc417f007979 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_libcamera.py | 79 ++++++++++++++++++++++ .../package/test_libcamera/linux-vimc.fragment | 4 ++ 3 files changed, 85 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3e0b2e5c9c..fc47c51d33 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1797,6 +1797,8 @@ F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_kmscube.py F: support/testing/tests/package/test_kmscube/ F: support/testing/tests/package/test_less.py +F: support/testing/tests/package/test_libcamera.py +F: support/testing/tests/package/test_libcamera/ F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py diff --git a/support/testing/tests/package/test_libcamera.py b/support/testing/tests/package/test_libcamera.py new file mode 100644 index 0000000000..8953021b82 --- /dev/null +++ b/support/testing/tests/package/test_libcamera.py @@ -0,0 +1,79 @@ +import os + +import infra.basetest + + +class TestLibCamera(infra.basetest.BRTest): + # A specific configuration is needed for testing libcamera: + # a kernel config fragment enables v4l2 vimc driver. + # The libevent package is also enabled to have the libcamera "cam" + # test application. + kernel_fragment = \ + infra.filepath("tests/package/test_libcamera/linux-vimc.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.76" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_LIBCAMERA=y + BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC=y + BR2_PACKAGE_LIBEVENT=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # The Kernel config of this test has only one v4l2 vimc + # driver. The camera index is expected to be #1. + cam_idx = 1 + + # We test libcamera with its simple "cam" application, by + # requesting a list of available cameras. + cmd = "cam --list" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + # libcamera generates info messages. We filter only the + # line(s) starting with our camera index. + cam_line = [ln for ln in out if ln.startswith(f"{cam_idx}:")] + # We should have the vimc camera in this line. + self.assertIn("platform/vimc.0", cam_line[0]) + + # List the camera information. + cmd = f"cam --camera {cam_idx} --info" + self.assertRunOk(cmd) + + # List the camera controls and check we have a brightness + # control. + cmd = f"cam --camera {cam_idx} --list-controls" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn("Control: Brightness:", "\n".join(out)) + + # List the camera properties and check we have a camera + # "Model" property. + cmd = f"cam --camera {cam_idx} --list-properties" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn("Property: Model = ", "\n".join(out)) + + # Capture few frames. + cmd = f"cam --camera {cam_idx} --capture=5" + cmd += " --stream width=160,height=120,role=video,pixelformat=RGB888" + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_libcamera/linux-vimc.fragment b/support/testing/tests/package/test_libcamera/linux-vimc.fragment new file mode 100644 index 0000000000..04436e7518 --- /dev/null +++ b/support/testing/tests/package/test_libcamera/linux-vimc.fragment @@ -0,0 +1,4 @@ +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_TEST_SUPPORT=y +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIMC=y From peter at korsgaard.com Tue Feb 6 22:30:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 23:30:35 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/go: bump version to go1.21.7 In-Reply-To: <20240206221722.33303-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 14:17:22 -0800") References: <20240206221722.33303-1-christian@aperture.us> Message-ID: <87r0hp2pkk.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > go1.21.7 (released 2024-02-06) includes fixes to the compiler, the go command, > the runtime, and the crypto/x509 package. > https://go.dev/doc/devel/release#go1.21.7 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From buildroot at bubu1.eu Tue Feb 6 22:31:01 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 23:31:01 +0100 Subject: [Buildroot] [PATCH v6 5/5] package/pkg-python.mk: migrate setuptools to pep517 In-Reply-To: <20231126180840.2081945-5-james.hilliard1@gmail.com> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-5-james.hilliard1@gmail.com> Message-ID: <6049c19d-3ba6-4991-b47f-72b5d46c1e91@bubu1.eu> Hi James, all On 26.11.23 19:08, James Hilliard wrote: > Now that setuptools and its dependencies are using pep517 we can > migrate the setuptools infrastructure itself to use the pep517 > build frontend. > > As part of this we need to migrate the all python packages using > _BUILD_OPTS to the new config settings format used by the pep517 > build frontend. > > Use new setup type variables to define setup type specific > dependencies instead of using the conditional block. > > Signed-off-by: James Hilliard > Reviewed-by: Yegor Yefremov I tested this with all python packages we use in our project and except for uvloop (see below) it all went well. The patch looks sensible to me as well. Reviewed-by: Marcus Hoffmann Tested-by: Marcus Hoffmann > --- > Changes v5 -> v6: > - use setup type variables for dependencies > Changes v4 -> v5: > - rebase on next > Changes v1 -> v3: > - rebase on master > - combine setuptools-rust and maturin env variables > - drop patch which is now upstream > --- > package/pkg-python.mk | 160 ++++++++++----------- > package/python-evdev/python-evdev.mk | 4 +- > package/python-lxml/python-lxml.mk | 8 +- > package/python-m2crypto/python-m2crypto.mk | 4 +- > package/python-pillow/python-pillow.mk | 35 +++-- > package/python-psycopg2/python-psycopg2.mk | 5 +- > package/python-pyzmq/python-pyzmq.mk | 4 +- This parts needs a rebase. > package/python-uvloop/python-uvloop.mk | 6 +- > 8 files changed, 113 insertions(+), 113 deletions(-) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index bda79116c8..cb9f6ab5e6 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -86,15 +86,62 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_CMD = \ > setup.py install \ > --prefix=$(HOST_DIR) > > -# Target setuptools-based packages > -PKG_PYTHON_SETUPTOOLS_ENV = \ > +# Target pep517-based packages > +PKG_PYTHON_PEP517_ENV = \ > $(PKG_PYTHON_ENV) > > -PKG_PYTHON_SETUPTOOLS_CMD = \ > - $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') > +PKG_PYTHON_PEP517_BUILD_CMD = \ > + -m build -n -w > + > +PKG_PYTHON_PEP517_INSTALL_OPTS = \ > + --interpreter=/usr/bin/python \ > + --script-kind=posix > + > +PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ > + $(TOPDIR)/support/scripts/pyinstaller.py \ > + dist/* \ > + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ > + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > + --scripts=$(TARGET_DIR)/usr/bin \ > + --data=$(TARGET_DIR)/usr > + > +PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ > + $(TOPDIR)/support/scripts/pyinstaller.py \ > + dist/* \ > + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ > + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > + --scripts=$(STAGING_DIR)/usr/bin \ > + --data=$(STAGING_DIR)/usr > + > +PKG_PYTHON_PEP517_DEPENDENCIES = \ > + host-python-pypa-build \ > + host-python-installer > + > +# Host pep517-based packages > +HOST_PKG_PYTHON_PEP517_ENV = \ > + $(HOST_PKG_PYTHON_ENV) > + > +HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ > + -m build -n -w > + > +HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ > + $(TOPDIR)/support/scripts/pyinstaller.py \ > + dist/* \ > + --interpreter=$(HOST_DIR)/bin/python \ > + --script-kind=posix \ > + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > + --scripts=$(HOST_DIR)/bin \ > + --data=$(HOST_DIR) > + > +# Target setuptools-based packages > +PKG_PYTHON_SETUPTOOLS_ENV = \ > + $(PKG_PYTHON_PEP517_ENV) > > PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ > - $(PKG_PYTHON_SETUPTOOLS_CMD) build > + $(PKG_PYTHON_PEP517_BUILD_CMD) > > PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ > --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > @@ -103,30 +150,24 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ > --single-version-externally-managed > > PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD = \ > - $(PKG_PYTHON_SETUPTOOLS_CMD) \ > - install --no-compile \ > - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ > - --root=$(TARGET_DIR) > + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) > > PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD = \ > - $(PKG_PYTHON_SETUPTOOLS_CMD) \ > - install \ > - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ > - --root=$(STAGING_DIR) > + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) > + > +PKG_PYTHON_SETUPTOOLS_DEPENDENCIES = \ > + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ > + host-python-setuptools > > # Host setuptools-based packages > HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ > - $(HOST_PKG_PYTHON_ENV) > + $(HOST_PKG_PYTHON_PEP517_ENV) > > HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ > - $(PKG_PYTHON_SETUPTOOLS_CMD) build > + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) > > HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD = \ > - $(PKG_PYTHON_SETUPTOOLS_CMD) \ > - install \ > - --prefix=$(HOST_DIR) \ > - --root=/ \ > - --single-version-externally-managed > + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) > > # Target setuptools-rust-based packages > PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ > @@ -143,6 +184,10 @@ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_TARGET_CMD = \ > PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_STAGING_CMD = \ > $(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD) > > +PKG_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ > + $(PKG_PYTHON_SETUPTOOLS_DEPENDENCIES) \ > + host-python-setuptools-rust > + > # Host setuptools-rust-based packages > HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ > $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ > @@ -155,52 +200,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ > HOST_PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_CMD = \ > $(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD) > > -# Target pep517-based packages > -PKG_PYTHON_PEP517_ENV = \ > - $(PKG_PYTHON_ENV) > - > -PKG_PYTHON_PEP517_BUILD_CMD = \ > - -m build -n -w > - > -PKG_PYTHON_PEP517_INSTALL_OPTS = \ > - --interpreter=/usr/bin/python \ > - --script-kind=posix > - > -PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ > - $(TOPDIR)/support/scripts/pyinstaller.py \ > - dist/* \ > - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ > - --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > - --scripts=$(TARGET_DIR)/usr/bin \ > - --data=$(TARGET_DIR)/usr > - > -PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ > - $(TOPDIR)/support/scripts/pyinstaller.py \ > - dist/* \ > - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ > - --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > - --scripts=$(STAGING_DIR)/usr/bin \ > - --data=$(STAGING_DIR)/usr > - > -# Host pep517-based packages > -HOST_PKG_PYTHON_PEP517_ENV = \ > - $(HOST_PKG_PYTHON_ENV) > - > -HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ > - -m build -n -w > - > -HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ > - $(TOPDIR)/support/scripts/pyinstaller.py \ > - dist/* \ > - --interpreter=$(HOST_DIR)/bin/python \ > - --script-kind=posix \ > - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > - --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > - --scripts=$(HOST_DIR)/bin \ > - --data=$(HOST_DIR) > - > # Target flit packages > PKG_PYTHON_FLIT_ENV = \ > $(PKG_PYTHON_PEP517_ENV) > @@ -214,6 +213,10 @@ PKG_PYTHON_FLIT_INSTALL_TARGET_CMD = \ > PKG_PYTHON_FLIT_INSTALL_STAGING_CMD = \ > $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) > > +PKG_PYTHON_FLIT_DEPENDENCIES = \ > + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ > + host-python-flit-core > + > # Host flit packages > HOST_PKG_PYTHON_FLIT_ENV = \ > $(HOST_PKG_PYTHON_PEP517_ENV) > @@ -249,6 +252,10 @@ PKG_PYTHON_MATURIN_INSTALL_TARGET_CMD = \ > PKG_PYTHON_MATURIN_INSTALL_STAGING_CMD = \ > $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) > > +PKG_PYTHON_MATURIN_DEPENDENCIES = \ > + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ > + host-python-maturin > + > # Host maturin packages > HOST_PKG_PYTHON_MATURIN_ENV = \ > $(HOST_PKG_PYTHON_PEP517_ENV) \ > @@ -327,28 +334,17 @@ else > $(2)_DEPENDENCIES += host-python3 > endif # ($(4),target) > > -# Setuptools based packages will need setuptools for the host Python > -# interpreter (both host and target). > +# Setup type specific dependencies are the same whether we are > +# building for the host or the target. > # > -ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) > -$(2)_DEPENDENCIES += host-python-setuptools > -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) > -$(2)_DEPENDENCIES += host-python-setuptools-rust > -endif > -else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) > -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer > -ifeq ($$($(2)_SETUP_TYPE),flit) > -$(2)_DEPENDENCIES += host-python-flit-core > -endif > -ifeq ($$($(2)_SETUP_TYPE),maturin) > -$(2)_DEPENDENCIES += host-python-maturin > -endif > -else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) > +ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) > # Don't add dependency on host-python-installer for > # host-python-installer itself, and its dependencies. > ifeq ($$(filter host-python-flit-core host-python-installer,$(1)),) > $(2)_DEPENDENCIES += host-python-installer > endif > +else > +$(2)_DEPENDENCIES += $$(PKG_PYTHON_$$($(2)_SETUP_TYPE_UPPER)_DEPENDENCIES) > endif > > # Pyo3 based packages(setuptools-rust and maturin) will need rust > diff --git a/package/python-evdev/python-evdev.mk b/package/python-evdev/python-evdev.mk > index 5cf62b5160..b509b43e8a 100644 > --- a/package/python-evdev/python-evdev.mk > +++ b/package/python-evdev/python-evdev.mk > @@ -12,7 +12,7 @@ PYTHON_EVDEV_LICENSE = Revised BSD License > PYTHON_EVDEV_LICENSE_FILES = LICENSE > > PYTHON_EVDEV_BUILD_OPTS = \ > - build_ecodes \ > - --evdev-headers $(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h > + -C--build-option=build_ecodes \ > + -C--build-option=--evdev-headers=$(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h > > $(eval $(python-package)) > diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk > index 3ef3aabdbc..4454f5aa0c 100644 > --- a/package/python-lxml/python-lxml.mk > +++ b/package/python-lxml/python-lxml.mk > @@ -28,11 +28,11 @@ HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib > # python-lxml needs these scripts in order to properly detect libxml2 and > # libxslt compiler and linker flags > PYTHON_LXML_BUILD_OPTS = \ > - --xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ > - --xml2-config=$(STAGING_DIR)/usr/bin/xml2-config > + -C--build-option=--xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ > + -C--build-option=--xml2-config=$(STAGING_DIR)/usr/bin/xml2-config > HOST_PYTHON_LXML_BUILD_OPTS = \ > - --xslt-config=$(HOST_DIR)/bin/xslt-config \ > - --xml2-config=$(HOST_DIR)/bin/xml2-config > + -C--build-option=--xslt-config=$(HOST_DIR)/bin/xslt-config \ > + -C--build-option=--xml2-config=$(HOST_DIR)/bin/xml2-config > > $(eval $(python-package)) > $(eval $(host-python-package)) > diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk > index 69a0c28df5..6c07f42d06 100644 > --- a/package/python-m2crypto/python-m2crypto.mk > +++ b/package/python-m2crypto/python-m2crypto.mk > @@ -13,6 +13,8 @@ PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE > PYTHON_M2CRYPTO_CPE_ID_VENDOR = m2crypto_project > PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto > PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig > -PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr > +PYTHON_M2CRYPTO_BUILD_OPTS = \ > + -C--build-option=build_ext \ > + -C--build-option=--openssl=$(STAGING_DIR)/usr > > $(eval $(python-package)) > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk > index bc94062da8..e2077654d2 100644 > --- a/package/python-pillow/python-pillow.mk > +++ b/package/python-pillow/python-pillow.mk > @@ -14,61 +14,60 @@ PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > PYTHON_PILLOW_SETUP_TYPE = setuptools > > PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > -PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing > -PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) > +PYTHON_PILLOW_BUILD_OPTS = -C--build-option=build_ext -C--build-option=--disable-platform-guessing > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > PYTHON_PILLOW_DEPENDENCIES += freetype > -PYTHON_PILLOW_BUILD_OPTS += --enable-freetype > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-freetype > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-freetype > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-freetype > endif > > ifeq ($(BR2_PACKAGE_JPEG),y) > PYTHON_PILLOW_DEPENDENCIES += jpeg > -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg > endif > > ifeq ($(BR2_PACKAGE_LCMS2),y) > PYTHON_PILLOW_DEPENDENCIES += lcms2 > -PYTHON_PILLOW_BUILD_OPTS += --enable-lcms > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-lcms > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-lcms > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-lcms > endif > > ifeq ($(BR2_PACKAGE_LIBXCB),y) > PYTHON_PILLOW_DEPENDENCIES += libxcb > -PYTHON_PILLOW_BUILD_OPTS += --enable-xcb > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-xcb > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-xcb > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-xcb > endif > > ifeq ($(BR2_PACKAGE_OPENJPEG),y) > PYTHON_PILLOW_DEPENDENCIES += openjpeg > -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000 > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg2000 > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg2000 > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg2000 > endif > > ifeq ($(BR2_PACKAGE_TIFF),y) > PYTHON_PILLOW_DEPENDENCIES += tiff > -PYTHON_PILLOW_BUILD_OPTS += --enable-tiff > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-tiff > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-tiff > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-tiff > endif > > ifeq ($(BR2_PACKAGE_WEBP),y) > PYTHON_PILLOW_DEPENDENCIES += webp > -PYTHON_PILLOW_BUILD_OPTS += --enable-webp > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webp > ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) > -PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webpmux > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webpmux > endif > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webp -C--build-option=--disable-webpmux > endif > > $(eval $(python-package)) > diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk > index 0149b8d185..1b33b7505d 100644 > --- a/package/python-psycopg2/python-psycopg2.mk > +++ b/package/python-psycopg2/python-psycopg2.mk > @@ -13,7 +13,8 @@ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE > PYTHON_PSYCOPG2_DEPENDENCIES = postgresql > # Force psycopg2 to use the Buildroot provided postgresql version > # instead of the one from the host machine > -PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config > -PYTHON_PSYCOPG2_INSTALL_TARGET_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config > +PYTHON_PSYCOPG2_BUILD_OPTS = \ > + -C--build-option=build_ext \ > + -C--build-option=--pg-config=$(STAGING_DIR)/usr/bin/pg_config > > $(eval $(python-package)) > diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk > index 5792957eaf..1b7bceae5e 100644 > --- a/package/python-pyzmq/python-pyzmq.mk > +++ b/package/python-pyzmq/python-pyzmq.mk > @@ -12,7 +12,7 @@ PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 > PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD > PYTHON_PYZMQ_DEPENDENCIES = host-python-packaging zeromq > PYTHON_PYZMQ_SETUP_TYPE = setuptools > -PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr > +PYTHON_PYZMQ_BUILD_OPTS = -C--build-option=--zmq=$(STAGING_DIR)/usr > > # Due to issues with cross-compiling, hardcode to the zeromq in BR > define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION > @@ -23,7 +23,7 @@ endef > PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION > > ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y) > -PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts > +PYTHON_PYZMQ_BUILD_OPTS += -C--build-option=--enable-drafts > endif > > $(eval $(python-package)) > diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk > index 285884a2bb..70508fb6de 100644 > --- a/package/python-uvloop/python-uvloop.mk > +++ b/package/python-uvloop/python-uvloop.mk > @@ -10,8 +10,10 @@ PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/9c/16/728cc5dde368e > PYTHON_UVLOOP_SETUP_TYPE = setuptools > PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT > PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT > -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv > -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace --use-system-libuv > PYTHON_UVLOOP_DEPENDENCIES = libuv This needs a new dependency on host-python-cython now. Otherwise it fails with the following error: ERROR Missing dependencies: Cython<0.30.0,>=0.29.36 > +PYTHON_UVLOOP_BUILD_OPTS = \ > + -C--build-option=build_ext \ > + -C--build-option=--inplace \ > + -C--build-option=--use-system-libuv > > $(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 22:31:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:31:16 +0100 Subject: [Buildroot] [PATCH v4 1/3] package/python-pygame: drop package In-Reply-To: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> Message-ID: <20240206233116.7f7c2602@windsurf> On Mon, 18 Dec 2023 15:04:54 -0700 Adam Duskett wrote: > The python-pygame package has not recieved any update since > Sun May 1 22:15:17 2016 (commit: a9ec96e545102ae5ccd4280323d35360b0a5072d) > > Also, this package no longer builds properly against python 3.12.0. Recieving > the following error when building: > > ``` > src/surface.c:2812:14: error: invalid type argument of unary ?*? (have > ?int?) > 2812 | ch = *PyUnicode_AS_UNICODE (obj); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > src/surface.c: In function ?PySurface_Blit?: > ``` > > If someone wants to re-introduce this package at a later date they are more > than welcome to do so! > > Signed-off-by: Adam Duskett > --- > Config.in.legacy | 9 ++ > DEVELOPERS | 1 - > package/Config.in | 1 - > package/python-pygame/Config.in | 50 ---------- > package/python-pygame/python-pygame.hash | 3 - > package/python-pygame/python-pygame.mk | 111 ----------------------- > 6 files changed, 9 insertions(+), 166 deletions(-) > delete mode 100644 package/python-pygame/Config.in > delete mode 100644 package/python-pygame/python-pygame.hash > delete mode 100644 package/python-pygame/python-pygame.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 22:31:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:31:22 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/python-crossbar: drop package In-Reply-To: <20231218220457.1705749-2-adam.duskett@amarulasolutions.com> References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-2-adam.duskett@amarulasolutions.com> Message-ID: <20240206233122.30f9be84@windsurf> On Mon, 18 Dec 2023 15:04:55 -0700 Adam Duskett wrote: > The current package has not recieved an update since Sat Oct 9 2021 > 33ece2446e25e20929d1c7eefa9f3244a3b79a92 and is not python 3.12 compatible. > > Furthermore, the current version requires at least 42 new packages worth of > depedencies of which several require patches to be python 3.12 compatible. > As nobody has stepped up to maintain the package and its ever-growing list of > dependencies, along with the other problems, it is time to drop the package. > > Signed-off-by: Adam Duskett > --- > Config.in.legacy | 16 ++++ > DEVELOPERS | 1 - > package/Config.in | 1 - > .../0001-Avoid-intentional-syntax-error.patch | 29 -------- > ...s-min.txt-drop-indirect-dependencies.patch | 74 ------------------- > ...ice-wap-use-markupsafe-instead-of-we.patch | 53 ------------- > package/python-crossbar/Config.in | 72 ------------------ > package/python-crossbar/python-crossbar.hash | 5 -- > package/python-crossbar/python-crossbar.mk | 14 ---- > 9 files changed, 16 insertions(+), 249 deletions(-) > delete mode 100644 package/python-crossbar/0001-Avoid-intentional-syntax-error.patch > delete mode 100644 package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch > delete mode 100644 package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch > delete mode 100644 package/python-crossbar/Config.in > delete mode 100644 package/python-crossbar/python-crossbar.hash > delete mode 100644 package/python-crossbar/python-crossbar.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Tue Feb 6 22:29:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 23:29:14 +0100 Subject: [Buildroot] [git commit] package/go: bump version to go1.21.7 Message-ID: <20240206223127.BB378870FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=568bd6c39d1a28f27d6509d885e09de281953e63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master go1.21.7 (released 2024-02-06) includes fixes to the compiler, the go command, the runtime, and the crypto/x509 package. https://go.dev/doc/devel/release#go1.21.7 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index bee10089a7..d008019e94 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248 go1.21.6.src.tar.gz +sha256 00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6 go1.21.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index f9d31aacac..9efd4a3123 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.6 +GO_VERSION = 1.21.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Tue Feb 6 22:32:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 23:32:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lmdb: add CPE variables In-Reply-To: <20240206220725.910499-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 23:07:25 +0100") References: <20240206220725.910499-1-fontaine.fabrice@gmail.com> Message-ID: <87mssd2pi3.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:py-lmdb_project:py-lmdb is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/AFE6D0BA-D905-43F6-81FE-308D591A82B8 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 22:31:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 23:31:43 +0100 Subject: [Buildroot] [git commit] package/python-lmdb: add CPE variables Message-ID: <20240206223241.EAF89873F6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d496d7a215af398e9708cfd8d1f458b8b92dbfe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:py-lmdb_project:py-lmdb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AFE6D0BA-D905-43F6-81FE-308D591A82B8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-lmdb/python-lmdb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index 52617b6ed0..7906d388ae 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -9,6 +9,8 @@ PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/de/13/dd9b0c1924f0becc93e0bacd123a4e7a347966e3e74753ace3b1e85acc39 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE +PYTHON_LMDB_CPE_ID_VENDOR = py-lmdb_project +PYTHON_LMDB_CPE_ID_PRODUCT = py-lmdb PYTHON_LMDB_SETUP_TYPE = setuptools PYTHON_LMDB_DEPENDENCIES = host-python-cffi From thomas.petazzoni at bootlin.com Tue Feb 6 22:33:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:33:18 +0100 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 In-Reply-To: <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> Message-ID: <20240206233318.593730bd@windsurf> Hello Adam, On Mon, 18 Dec 2023 15:04:56 -0700 Adam Duskett wrote: > Python 3.12.1 has removed distutils support. As such, we remove the distutils > option from pkg-python.mk as well. > > Tested on Fedora 39, and Debian 11. All 68 package tests pass. > > Signed-off-by: Adam Duskett > --- > v3 -> v4: > - Drop distutils in pkg-python.mk > - 3.12.0 -> 3.12.1 I applied, but after doing a number of changes. The most important one is that I had to reintroduce some of our --disable options: for ncurses, sqlite and expat. Indeed, without these, you ended up with the Python code installed, but not the correspond native library (the py_cv_module__=n/a only disables building the native library). I split up the pkg-python.mk change into a separate commit, which is made before the python 3.12 bump. Indeed, it's semantically separate. Finally, I updated the Buildroot manual to no longer mention distutils support. And I did a separate commit to update the Buildroot manual with other _SETUP_TYPE values that we support. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Tue Feb 6 22:42:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 23:42:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-anyio: bump to version 4.2.0 In-Reply-To: (Marcus Hoffmann via buildroot's message of "Tue, 6 Feb 2024 13:42:02 +0100") References: <20240108064820.3450359-1-james.hilliard1@gmail.com> <0eb549da-1140-4071-8e58-376d9dd5f434@bubu1.eu> Message-ID: <87fry52p11.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Hi, > On 08.01.24 14:03, Marcus Hoffmann via buildroot wrote: >> Hi James, >> On 08.01.24 07:48, James Hilliard wrote: >>> Signed-off-by: James Hilliard >>> --- >>> ? package/python-anyio/python-anyio.hash | 4 ++-- >>> ? package/python-anyio/python-anyio.mk?? | 4 ++-- >>> ? 2 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/package/python-anyio/python-anyio.hash >>> b/package/python-anyio/python-anyio.hash >>> index 1cea549bc1..e77d30249c 100644 >>> --- a/package/python-anyio/python-anyio.hash >>> +++ b/package/python-anyio/python-anyio.hash >>> @@ -1,5 +1,5 @@ >>> ? # md5, sha256 from https://pypi.org/pypi/anyio/json >>> -md5? 58d288dd84e28e2507ff9ce7e4620010? anyio-3.7.1.tar.gz >>> -sha256 >>> 44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780 >>> anyio-3.7.1.tar.gz >>> +md5? 22e660fff1a584e72281f0d6a083e4e0? anyio-4.2.0.tar.gz >>> +sha256 >>> e1875bb4b4e2de1669f4bc7869b6d3f54231cdced71605e6e64c9be77e3be50f >>> anyio-4.2.0.tar.gz >> This was introduced in this version because fastapi didn't support a >> newer version. >> Fastapi 0.108.0 supports starlette 0.32 now, which supports anyio >> 4.2.0. >> So I think these should be bumped together/in the same series? > Now that more recent fastapi and starlette versions are available this > can be applied. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 22:41:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 23:41:49 +0100 Subject: [Buildroot] [git commit] package/python-anyio: bump to version 4.2.0 Message-ID: <20240206224250.9384386E4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f20fbc9c28cfbe077b4d446f868dbf17c594aa5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-anyio/python-anyio.hash | 4 ++-- package/python-anyio/python-anyio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-anyio/python-anyio.hash b/package/python-anyio/python-anyio.hash index 1cea549bc1..e77d30249c 100644 --- a/package/python-anyio/python-anyio.hash +++ b/package/python-anyio/python-anyio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/anyio/json -md5 58d288dd84e28e2507ff9ce7e4620010 anyio-3.7.1.tar.gz -sha256 44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780 anyio-3.7.1.tar.gz +md5 22e660fff1a584e72281f0d6a083e4e0 anyio-4.2.0.tar.gz +sha256 e1875bb4b4e2de1669f4bc7869b6d3f54231cdced71605e6e64c9be77e3be50f anyio-4.2.0.tar.gz # Locally computed sha256 checksums sha256 5361ac9dc58f2ef5fd2e9b09c68297c17f04950909bbc8023bdb82eacf22c2b0 LICENSE diff --git a/package/python-anyio/python-anyio.mk b/package/python-anyio/python-anyio.mk index 80404ac660..32c2286157 100644 --- a/package/python-anyio/python-anyio.mk +++ b/package/python-anyio/python-anyio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ANYIO_VERSION = 3.7.1 +PYTHON_ANYIO_VERSION = 4.2.0 PYTHON_ANYIO_SOURCE = anyio-$(PYTHON_ANYIO_VERSION).tar.gz -PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/28/99/2dfd53fd55ce9838e6ff2d4dac20ce58263798bd1a0dbe18b3a9af3fcfce +PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/2d/b8/7333d87d5f03247215d86a86362fd3e324111788c6cdd8d2e6196a6ba833 PYTHON_ANYIO_SETUP_TYPE = setuptools PYTHON_ANYIO_LICENSE = MIT PYTHON_ANYIO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 22:59:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:59:27 +0100 Subject: [Buildroot] [PATCH] package/python3: add option to disable ensurepip Message-ID: <20240206225928.2290100-1-thomas.petazzoni@bootlin.com> This module takes 2.1 MB and is not needed in most Python installations. Reported-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- ...-add-disable-ensurepip-module-option.patch | 68 +++++++++++++++++++ package/python3/Config.in | 5 ++ package/python3/python3.mk | 6 ++ 3 files changed, 79 insertions(+) create mode 100644 package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch diff --git a/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch b/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch new file mode 100644 index 0000000000..2761236c9b --- /dev/null +++ b/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch @@ -0,0 +1,68 @@ +From 10b67aeb6a6be10218c3dd675d3e54874ced1a55 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 23:49:32 +0100 +Subject: [PATCH] configure.ac: add --disable-ensurepip-module option + +The ensurepip module weights 2.1 MB and is only needed if you need +"support for bootstrapping the pip installer into an existing Python +installation or virtual environment" [1]. + +This patch adds a --disable-ensurepip-module option that allows to not +install it. It should not be confused with --without-ensurepip, which +already exists, but even with --without-ensurepip, the ensurepip +module gets installed, but not used during the build to bootstrap the +pip installer. + +[1] https://docs.python.org/3/library/ensurepip.html + +Upstream: non-cooperative upstream +Signed-off-by: Thomas Petazzoni +--- + Makefile.pre.in | 5 ++++- + configure.ac | 7 +++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index d9fae62aa9c..3a8e6200891 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -2096,7 +2096,6 @@ LIBSUBDIRS= asyncio \ + dbm \ + email email/mime \ + encodings \ +- ensurepip ensurepip/_bundled \ + html \ + http \ + importlib importlib/resources importlib/metadata \ +@@ -2274,6 +2273,10 @@ ifeq (@EXPAT@,yes) + LIBSUBDIRS += $(XMLLIBSUBDIRS) + endif + ++ifeq (@ENSUREPIP_MODULE@,yes) ++LIBSUBDIRS += ensurepip ensurepip/_bundled ++endif ++ + TEST_MODULES=@TEST_MODULES@ + + .PHONY: libinstall +diff --git a/configure.ac b/configure.ac +index 06df165ccc8..5774297b9da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6944,6 +6944,13 @@ AS_CASE([$with_ensurepip], + AC_MSG_RESULT([$ENSUREPIP]) + AC_SUBST([ENSUREPIP]) + ++AC_ARG_ENABLE([ensurepip-module], ++ AS_HELP_STRING([--disable-ensurepip-module], [disable ensurepip module installation]), ++ [ENSUREPIP_MODULE="${enableval}"], ++ [ENSUREPIP_MODULE="yes"]) ++AS_IF([test "${ENSUREPIP}" != "no"], [ENSUREPIP_MODULE="yes"]) ++AC_SUBST([ENSUREPIP_MODULE]) ++ + # check if the dirent structure of a d_type field and DT_UNKNOWN is defined + AC_CACHE_CHECK([if the dirent structure of a d_type field], [ac_cv_dirent_d_type], [ + AC_LINK_IFELSE( +-- +2.43.0 + diff --git a/package/python3/Config.in b/package/python3/Config.in index 38f0580aa4..a398a1d7dd 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -75,6 +75,11 @@ config BR2_PACKAGE_PYTHON3_DECIMAL help decimal module for Python3. +config BR2_PACKAGE_PYTHON3_ENSUREPIP + bool "ensurepip module" + help + ensurepip module for Python3. + config BR2_PACKAGE_PYTHON3_OSSAUDIODEV bool "ossaudiodev module" help diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 42765abcf4..8685ca238d 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -107,6 +107,12 @@ else PYTHON3_CONF_ENV += py_cv_module__decimal=n/a endif +ifeq ($(BR2_PACKAGE_PYTHON3_ENSUREPIP),y) +PYTHON3_CONF_OPTS += --enable-ensurepip-module +else +PYTHON3_CONF_OPTS += --disable-ensurepip-module +endif + ifeq ($(BR2_PACKAGE_PYTHON3_PYEXPAT),y) PYTHON3_DEPENDENCIES += expat PYTHON3_CONF_OPTS += --with-expat=system -- 2.43.0 From thomas.petazzoni at bootlin.com Tue Feb 6 23:00:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:00:33 +0100 Subject: [Buildroot] [PATCH v2] configs/asus_tinker_rk3288_defconfig: switch to zImage and bump Linux to 6.1.44, U-Boot to 2023.07 In-Reply-To: <20230810221020.12181-1-giulio.benetti@benettiengineering.com> References: <20230810221020.12181-1-giulio.benetti@benettiengineering.com> Message-ID: <20240207000033.55001acb@windsurf> On Fri, 11 Aug 2023 00:10:20 +0200 Giulio Benetti wrote: > uImage is almost deprecated so let's switch to zImage. Let's also bump > Linux version to 6.1.44, U-Boot to 2023.07 and remove > BR2_TARGET_UBOOT_NEEDS_PYTHON3 since it's selected by > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT. > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * changed uImage to zImage in extlinux.conf > --- > board/asus/tinker/extlinux.conf | 2 +- > configs/asus_tinker_rk3288_defconfig | 7 ++----- > 2 files changed, 3 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 23:01:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:01:20 +0100 Subject: [Buildroot] [git commit] configs/asus_tinker_rk3288_defconfig: switch to zImage and bump Linux to 6.1.44, U-Boot to 2023.07 Message-ID: <20240206230133.8914E874A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=842f19849edeadd5846df3723e906b347383b164 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master uImage is almost deprecated so let's switch to zImage. Let's also bump Linux version to 6.1.44, U-Boot to 2023.07 and remove BR2_TARGET_UBOOT_NEEDS_PYTHON3 since it's selected by BR2_TARGET_UBOOT_NEEDS_PYLIBFDT. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/extlinux.conf | 2 +- configs/asus_tinker_rk3288_defconfig | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index bb96ddb893..be21e246ec 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ label Tinker linux - kernel /boot/uImage + kernel /boot/zImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 40f4125880..b3e4502a45 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -10,10 +10,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y @@ -23,10 +22,8 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker" BR2_LINUX_KERNEL_INSTALL_TARGET=y From thomas.petazzoni at bootlin.com Tue Feb 6 23:01:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:01:20 +0100 Subject: [Buildroot] [git commit] package/linux-pam: fix musl build Message-ID: <20240206230133.937D3874AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4f2cd9a2caeeacde0803b331b3f17c8be98584c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following musl build failure raised since bump to version 1.6.0 in commit 7794fa4c4e1d19a245bb0367cde94560432a2bc5: pam_namespace.c: In function 'process_line': pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { | ^~~~~~~~ pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? 40 | #include "argv_parse.h" +++ |+#include 41 | Fixes: - http://autobuild.buildroot.org/results/f07360f33010a2cf19aace266faae14a834bd9a4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-pam_namespace-include-stdint-h.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/package/linux-pam/0001-pam_namespace-include-stdint-h.patch b/package/linux-pam/0001-pam_namespace-include-stdint-h.patch new file mode 100644 index 0000000000..5eda619505 --- /dev/null +++ b/package/linux-pam/0001-pam_namespace-include-stdint-h.patch @@ -0,0 +1,42 @@ +From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001 +From: Jacob Heider +Date: Wed, 17 Jan 2024 11:49:26 -0500 +Subject: [PATCH] pam_namespace: include stdint.h + +pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h, +resulting in the following build failures on 1.6.0: + + pam_namespace.c: In function 'process_line': + pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) + 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { + | ^~~~~~~~ + pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? + 40 | #include "argv_parse.h" + +++ |+#include + 41 | + pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in + 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { + | ^~~~~~~~ + +Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config") +Resolves: https://github.com/linux-pam/linux-pam/issues/733 + +Upstream: https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 +Signed-off-by: Fabrice Fontaine +--- + modules/pam_namespace/pam_namespace.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c +index f72d67189..b16731c22 100644 +--- a/modules/pam_namespace/pam_namespace.c ++++ b/modules/pam_namespace/pam_namespace.c +@@ -34,6 +34,8 @@ + + #define _ATFILE_SOURCE + ++#include "config.h" ++#include + #include "pam_cc_compat.h" + #include "pam_inline.h" + #include "pam_namespace.h" From thomas.petazzoni at bootlin.com Tue Feb 6 23:01:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:01:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/linux-pam: fix musl build In-Reply-To: <20240206180341.3910-1-fontaine.fabrice@gmail.com> References: <20240206180341.3910-1-fontaine.fabrice@gmail.com> Message-ID: <20240207000133.71a948a2@windsurf> On Tue, 6 Feb 2024 19:03:41 +0100 Fabrice Fontaine wrote: > Fix the following musl build failure raised since bump to version 1.6.0 > in commit 7794fa4c4e1d19a245bb0367cde94560432a2bc5: > > pam_namespace.c: In function 'process_line': > pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) > 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { > | ^~~~~~~~ > pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? > 40 | #include "argv_parse.h" > +++ |+#include > 41 | > > Fixes: > - http://autobuild.buildroot.org/results/f07360f33010a2cf19aace266faae14a834bd9a4 > > Signed-off-by: Fabrice Fontaine > --- > .../0001-pam_namespace-include-stdint-h.patch | 42 +++++++++++++++++++ > 1 file changed, 42 insertions(+) > create mode 100644 package/linux-pam/0001-pam_namespace-include-stdint-h.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 23:09:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:09:09 +0100 Subject: [Buildroot] [git commit] package/stunnel: fix build without psk Message-ID: <20240206230924.09A85874AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e1b7be3abb5424a906d57fb4e5bcb64db5b4fda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without psk raised since bump to version 5.71 in commit 059259eabbd8d15c1e60c0c3b8631d0c02b93898: ocsp.c: In function 'ocsp_init': ocsp.c:112:20: error: 'SERVICE_OPTIONS' {aka 'struct service_options_struct'} has no member named 'psk_keys' 112 | if(!section->psk_keys) { | ^~ Fixes: - http://autobuild.buildroot.org/results/1707beea413a8da8713ad2dc59db947329da45d2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-src-ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/package/stunnel/0001-src-ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch b/package/stunnel/0001-src-ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch new file mode 100644 index 0000000000..a8edc1d465 --- /dev/null +++ b/package/stunnel/0001-src-ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch @@ -0,0 +1,45 @@ +From 93e5cdd68b13cc3161d9b0094b0f331bdaf07cbc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 6 Jan 2024 17:28:20 +0100 +Subject: [PATCH] src/ocsp.c: fix build with OPENSSL_NO_PSK + +Fix the following build failure with OPENSSL_NO_PSK: + +ocsp.c: In function 'ocsp_init': +ocsp.c:112:20: error: 'SERVICE_OPTIONS' {aka 'struct service_options_struct'} has no member named 'psk_keys' + 112 | if(!section->psk_keys) { + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/1707beea413a8da8713ad2dc59db947329da45d2 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/mtrojnar/stunnel/pull/18 +--- + src/ocsp.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/ocsp.c b/src/ocsp.c +index 5073ded..12792af 100644 +--- a/src/ocsp.c ++++ b/src/ocsp.c +@@ -109,12 +109,16 @@ int ocsp_init(SERVICE_OPTIONS *section) { + s_log(LOG_DEBUG, "OCSP: Client OCSP stapling enabled"); + } else { + #if OPENSSL_VERSION_NUMBER>=0x10002000L ++#ifndef OPENSSL_NO_PSK + if(!section->psk_keys) { ++#endif + if(SSL_CTX_set_tlsext_status_cb(section->ctx, ocsp_server_cb)==TLSEXT_STATUSTYPE_ocsp) + s_log(LOG_DEBUG, "OCSP: Server OCSP stapling enabled"); ++#ifndef OPENSSL_NO_PSK + } else { + s_log(LOG_NOTICE, "OCSP: Server OCSP stapling is incompatible with PSK"); + } ++#endif + #else /* OpenSSL version 1.0.2 or later */ + s_log(LOG_NOTICE, "OCSP: Server OCSP stapling not supported"); + #endif /* OpenSSL version 1.0.2 or later */ +-- +2.43.0 + From thomas.petazzoni at bootlin.com Tue Feb 6 23:09:23 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:09:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/stunnel: fix build without psk In-Reply-To: <20240107172201.734515-1-fontaine.fabrice@gmail.com> References: <20240107172201.734515-1-fontaine.fabrice@gmail.com> Message-ID: <20240207000923.7a16983e@windsurf> On Sun, 7 Jan 2024 18:22:01 +0100 Fabrice Fontaine wrote: > Fix the following build failure without psk raised since bump to version > 5.71 in commit 059259eabbd8d15c1e60c0c3b8631d0c02b93898: > > ocsp.c: In function 'ocsp_init': > ocsp.c:112:20: error: 'SERVICE_OPTIONS' {aka 'struct service_options_struct'} has no member named 'psk_keys' > 112 | if(!section->psk_keys) { > | ^~ > > Fixes: > - http://autobuild.buildroot.org/results/1707beea413a8da8713ad2dc59db947329da45d2 > > Signed-off-by: Fabrice Fontaine > --- > ...ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch | 45 +++++++++++++++++++ > 1 file changed, 45 insertions(+) > create mode 100644 package/stunnel/0001-src-ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Tue Feb 6 23:13:38 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 00:13:38 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-bitstring: add missing runtime dependency In-Reply-To: References: <20240206155140.2351424-1-romain.naour@smile.fr> <20240206155140.2351424-2-romain.naour@smile.fr> Message-ID: <3d9bb061-0dd0-4400-891e-9e9612e3906c@smile.fr> Hi Marcus, Le 06/02/2024 ? 18:04, Marcus Hoffmann a ?crit?: > Hi Romain, > > On 06.02.24 16:51, Romain Naour wrote: >> python-bitstring require python-bitarray and python-zlib at runtime >> since 4.0.1 release [1][2]. > > I needed to look at the version numbers 3 times, but this dependency actually > got introduced in 4.1.0? :-). [1] Indeed, the version is not even good in my first link "[1]" below. > >> >> python-zlib is now needed for the "Experimental support for two 8-bit >> float types". > > Is there a reference to that somewhere? (I know, nobody documents their > dependencies on internal python modules, but where is the quote from?) it's the commit title introducing python-zlib dependency (second link [2]). > >> >> Intended to fixes (fixed locally): >> https://gitlab.com/buildroot.org/buildroot/-/jobs/6104227183 >> (TestPythonPy3Bitstring) >> https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854810 >> (TestPythonPy3Crossbar) > > This test failed for a different reason: It ran with bitstring version 4.1.2 > which included a bogus python file with invalid syntax [2] which the pyc > compilation step stumbles over. The version bump to 4.1.4 already solved this. Indeed, I missed the version bump to 4.1.4 but still there is a missing runtime dependency that prevent to use python-bitstream. Best regards, Romain > > [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 > [2] https://github.com/scott-griffiths/bitstring/issues/293 > >> >> gitlab-ci reports another issue at build time not reproduced locally: >> >> ?? *** Error compiling >> '[...]/TestPythonPy3Bitstring/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... >> ?? Sorry: IndentationError: expected an indented block after function >> definition on line 6 (plugin_test.py, line 8) >> >> [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.1 >> [2] >> https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 >> >> Signed-off-by: Romain Naour >> Cc: James Hilliard >> --- >> ? package/python-bitstring/Config.in | 2 ++ >> ? 1 file changed, 2 insertions(+) >> >> diff --git a/package/python-bitstring/Config.in >> b/package/python-bitstring/Config.in >> index 93d7682577..82d0bb29c6 100644 >> --- a/package/python-bitstring/Config.in >> +++ b/package/python-bitstring/Config.in >> @@ -1,5 +1,7 @@ >> ? config BR2_PACKAGE_PYTHON_BITSTRING >> ????? bool "python-bitstring" >> +??? select BR2_PACKAGE_PYTHON_BITARRAY # runtime >> +??? select BR2_PACKAGE_PYTHON3_ZLIB # runtime >> ????? help >> ??????? Simple construction, analysis and modification of binary data. >> ? From christian at aperture.us Wed Feb 7 02:21:56 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:21:56 -0800 Subject: [Buildroot] [PATCH v1 1/2] package/docker-engine: bump version to v25.0.3 Message-ID: <20240207022157.2560531-1-christian@aperture.us> https://github.com/moby/moby/releases/tag/v25.0.3 Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 931d6529e1..40293be7e0 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 docker-engine-24.0.7.tar.gz +sha256 4cdb516f5d6f5caf8b3bcf93c2962277ba727cfd2d1620176a3bb0cf153b3590 docker-engine-25.0.3.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 262be2df20..066959e0c0 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 24.0.7 +DOCKER_ENGINE_VERSION = 25.0.3 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 -- 2.43.0 From christian at aperture.us Wed Feb 7 02:21:57 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:21:57 -0800 Subject: [Buildroot] [PATCH v1 2/2] package/docker-cli: bump version to v25.0.3 In-Reply-To: <20240207022157.2560531-1-christian@aperture.us> References: <20240207022157.2560531-1-christian@aperture.us> Message-ID: <20240207022157.2560531-2-christian@aperture.us> https://github.com/moby/moby/releases/tag/v25.0.3 Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 9c8d08bba5..17b179852a 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 72a54d131c28938221c81bd08364459fed9c71c093d4d615d324aaf31de6db1d docker-cli-24.0.7.tar.gz +sha256 04ad0cea992a65db20cb1b0dbf6d1ce32c705ce879de51b22095fe8d28030815 docker-cli-25.0.3.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 95fce27ffb..9d307e991c 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 24.0.7 +DOCKER_CLI_VERSION = 25.0.3 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 -- 2.43.0 From christian at aperture.us Wed Feb 7 02:22:45 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:22:45 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump version to v2.24.5 Message-ID: <20240207022245.2560726-1-christian@aperture.us> https://github.com/docker/compose/releases/tag/v2.24.5 Signed-off-by: Christian Stewart --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index afccafd994..92f7b227d3 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8a1109124e7dfef736ad3db0457d807eb41a0068211bd13e52051252cab28dda docker-compose-2.23.0.tar.gz +sha256 ed132bcc226261a595469f5ca6d4ea20b02965867216b56d4e7a5962efb46570 docker-compose-2.24.5.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 54557b9841..947f09d0b3 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.23.0 +DOCKER_COMPOSE_VERSION = 2.24.5 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE -- 2.43.0 From christian at aperture.us Wed Feb 7 02:31:58 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:31:58 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump version to v1.7.13 Message-ID: <20240207023158.2572044-1-christian@aperture.us> https://github.com/containerd/containerd/releases/tag/v1.7.13 Signed-off-by: Christian Stewart --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 5524a1a44e..25dc7ff55d 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 containerd-1.7.8.tar.gz +sha256 ae2b914bff0ddbb9b29d5fc689a51e1ce89ea4edfc4df9ae10517c6f5d2d5aaf containerd-1.7.13.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index d3ca102797..50c2965b87 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.8 +CONTAINERD_VERSION = 1.7.13 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE -- 2.43.0 From christian at aperture.us Wed Feb 7 02:32:25 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:32:25 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/runc: bump version to v1.1.12 Message-ID: <20240207023225.2572189-1-christian@aperture.us> https://github.com/opencontainers/runc/releases/tag/v1.1.12 Signed-off-by: Christian Stewart --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 5ffd21a5dd..d6eb27d352 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 509993674481aad7e14aedfb280e0eb160f3a34c0b77e2e98c4b3c0b1df76894 runc-1.1.9.tar.gz +sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 runc-1.1.12.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 62e117685a..273509b860 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.9 +RUNC_VERSION = 1.1.12 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE -- 2.43.0 From james.hilliard1 at gmail.com Wed Feb 7 02:32:34 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 19:32:34 -0700 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 In-Reply-To: <20240206233318.593730bd@windsurf> References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> <20240206233318.593730bd@windsurf> Message-ID: On Tue, Feb 6, 2024 at 3:33?PM Thomas Petazzoni wrote: > > Hello Adam, > > On Mon, 18 Dec 2023 15:04:56 -0700 > Adam Duskett wrote: > > > Python 3.12.1 has removed distutils support. As such, we remove the distutils > > option from pkg-python.mk as well. > > > > Tested on Fedora 39, and Debian 11. All 68 package tests pass. > > > > Signed-off-by: Adam Duskett > > --- > > v3 -> v4: > > - Drop distutils in pkg-python.mk > > - 3.12.0 -> 3.12.1 > > I applied, but after doing a number of changes. The most important one > is that I had to reintroduce some of our --disable options: for > ncurses, sqlite and expat. Indeed, without these, you ended up with the > Python code installed, but not the correspond native library (the > py_cv_module__=n/a only disables building the native > library). > > I split up the pkg-python.mk change into a separate commit, which is > made before the python 3.12 bump. Indeed, it's semantically separate. > > Finally, I updated the Buildroot manual to no longer mention distutils > support. And I did a separate commit to update the Buildroot manual > with other _SETUP_TYPE values that we support. There seems to be a bug somewhere here breaking builds when the host and target have the same architecture: /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -I./Modules/_sqlite -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -fPIC -c ./Modules/_sqlite/util.c -o Modules/_sqlite/util.o /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -shared Modules/_sqlite/blob.o Modules/_sqlite/connection.o Modules/_sqlite/cursor.o Modules/_sqlite/microprotocols.o Modules/_sqlite/module.o Modules/_sqlite/prepare_protocol.o Modules/_sqlite/row.o Modules/_sqlite/statement.o Modules/_sqlite/util.o -L/home/buildroot/buildroot/output/per-package/python3/host/bin/../x86_64-buildroot-linux-gnu/sysroot/usr/lib -lsqlite3 -o Modules/_sqlite3.cpython-312-x86_64-linux-gnu.so /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -I/home/buildroot/buildroot/output/per-package/python3/host/x86_64-buildroot-linux-gnu/sysroot/usr/include -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -fPIC -c ./Modules/_ssl.c -o Modules/_ssl.o /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -shared Modules/_ssl.o -L/home/buildroot/buildroot/output/per-package/python3/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib -lssl -lcrypto -o Modules/_ssl.cpython-312-x86_64-linux-gnu.so /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -I/home/buildroot/buildroot/output/per-package/python3/host/x86_64-buildroot-linux-gnu/sysroot/usr/include -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -fPIC -c ./Modules/_hashopenssl.c -o Modules/_hashopenssl.o /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -shared Modules/_hashopenssl.o -L/home/buildroot/buildroot/output/per-package/python3/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib -lcrypto -o Modules/_hashlib.cpython-312-x86_64-linux-gnu.so /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -fPIC -c ./Modules/xxlimited.c -o Modules/xxlimited.o /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -shared Modules/xxlimited.o -o Modules/xxlimited.cpython-312-x86_64-linux-gnu.so /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -fPIC -c ./Modules/xxlimited_35.c -o Modules/xxlimited_35.o /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -shared Modules/xxlimited_35.o -o Modules/xxlimited_35.cpython-312-x86_64-linux-gnu.so /usr/bin/install -c -m 644 ./Tools/gdb/libpython.py python-gdb.py /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -c -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -DPy_BUILD_CORE -o Programs/_testembed.o ./Programs/_testembed.c /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -Xlinker -export-dynamic -o Programs/_testembed Programs/_testembed.o -L. -lpython3.12 -ldl -lpthread -lm sed -e "s,/usr/bin/env python3,/usr/bin/python3.12," < ./Tools/scripts/2to3 > build/scripts-3.12/2to3-3.12 sed -e "s,/usr/bin/env python3,/usr/bin/python3.12," < ./Tools/scripts/idle3 > build/scripts-3.12/idle3.12 sed -e "s,/usr/bin/env python3,/usr/bin/python3.12," < ./Tools/scripts/pydoc3 > build/scripts-3.12/pydoc3.12 sed -e "s, at EXENAME@,/usr/bin/python3.12," < ./Misc/python-config.in >python-config.py LC_ALL=C sed -e 's,\$(\([A-Za-z0-9_]*\)),\$\{\1\},g' < Misc/python-config.sh >python-config Traceback (most recent call last): File "/home/buildroot/buildroot/output/build/python3-3.12.1/./Tools/build/check_extension_modules.py", line 25, in import pathlib File "/home/buildroot/buildroot/output/build/python3-3.12.1/Lib/pathlib.py", line 20, in from urllib.parse import quote_from_bytes as urlquote_from_bytes File "/home/buildroot/buildroot/output/build/python3-3.12.1/Lib/urllib/parse.py", line 36, in import math ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' not found (required by /home/buildroot/buildroot/output/build/python3-3.12.1/build/lib.linux-x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) make[2]: *** [Makefile:1136: checksharedmods] Error 1 make[1]: *** [package/pkg-generic.mk:283: /home/buildroot/buildroot/output/build/python3-3.12.1/.stamp_built] Error 2 > > Thanks! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From christian at aperture.us Wed Feb 7 02:32:57 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:32:57 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/nerdctl: bump version to v1.7.3 Message-ID: <20240207023258.2572359-1-christian@aperture.us> https://github.com/containerd/nerdctl/releases/tag/v1.7.3 Signed-off-by: Christian Stewart --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index 1fb0649fb2..52e249824f 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 574438dd7c88e6a607c6f82932f8ada174b1133a66ee0fa0f7510e7c3bebacb4 nerdctl-1.3.1.tar.gz +sha256 fff8c348efa4ff6753e1aacded0dedddcb255c50b00d8b3a37a660b1fb1dd31a nerdctl-1.7.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index 43e862f7f9..66b22df646 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.3.1 +NERDCTL_VERSION = 1.7.3 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 -- 2.43.0 From asd617140123 at gmail.com Wed Feb 7 03:03:39 2024 From: asd617140123 at gmail.com (Nigel Wang) Date: Wed, 7 Feb 2024 11:03:39 +0800 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. Message-ID: <20240207030339.3910-1-asd617140123@gmail.com> From: nigel_wang add Cubieboard4 board support. - SOC: Allwinner A80. - DRAM: 2GiB DDR3 @ 672MHZ. - NAND: 8GBeMMC - Power: DC 5V. - Wifi: 80211 b/g/n. (module is AP6330) Reference: https://hirokun.jp/AP6330.pdf - Ethernet: RTL8211E The detail of board: https://linux-sunxi.org/Cubietech_Cubieboard4 Board support package includes the following components: - mainline Linux Kernel 6.6.8 - mainline U-boot 2021.10. Signed-off-by: Nigel Wang --- v1 -> v2 * Add BR2_cortex_a15_a7=y in buildroot defconfig. * Bump linux version to 6.6.8 * Using sunxi_defconfig in kernel. * Using "make savedefconfig" to save defconfig. * Remove boot.cmd. --- DEVELOPERS | 4 +++ board/cubietech/cubieboard4/extlinux.conf | 5 +++ board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ 5 files changed, 104 insertions(+) create mode 100644 board/cubietech/cubieboard4/extlinux.conf create mode 100644 board/cubietech/cubieboard4/genimage.cfg create mode 100755 board/cubietech/cubieboard4/post-image.sh create mode 100644 configs/cubieboard4_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a03018ab2b..bffb8f2069 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3297,3 +3297,7 @@ F: package/quazip/ F: package/shapelib/ F: package/simple-mail/ F: package/tinc/ + +N: Nigel Wang +F: board/cubietech/cubieboard4/ +F: configs/cubieboard4_defconfig diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf new file mode 100644 index 0000000000..5084e2237b --- /dev/null +++ b/board/cubietech/cubieboard4/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /boot/zImage + devicetree /sun9i-a80-cubieboard4.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg new file mode 100644 index 0000000000..f1dee13923 --- /dev/null +++ b/board/cubietech/cubieboard4/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the Cubieboard2 +# Based in the Orange Pi genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun9i-a80-cubieboard4.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh new file mode 100755 index 0000000000..e37b960a4d --- /dev/null +++ b/board/cubietech/cubieboard4/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig new file mode 100644 index 0000000000..0592fe4a2d --- /dev/null +++ b/configs/cubieboard4_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From fido_max at inbox.ru Wed Feb 7 06:33:24 2024 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 7 Feb 2024 09:33:24 +0300 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: bump version to 2.13.1 Message-ID: <20240207063324.1003727-1-fido_max@inbox.ru> Release notes: https://github.com/timescale/timescaledb/blob/2.13.1/CHANGELOG.md Signed-off-by: Maxim Kochetkov --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index b7e4c71774..8d0fc125d6 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 584a351c7775f0e067eaa0e7277ea88cab9077cc4c455cbbf09a5d9723dce95d timescaledb-2.13.0.tar.gz +sha256 ca4f48147cb1bf3bf22af9f643822a5931e12a89909cc73c4a89ddae3c828ac1 timescaledb-2.13.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 34a48ad0c3..a5d77eda80 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.13.0 +TIMESCALEDB_VERSION = 2.13.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE -- 2.43.0 From thomas.petazzoni at bootlin.com Wed Feb 7 06:47:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 07 Feb 2024 06:47:19 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-06 Message-ID: Hello, Autobuild statistics for 2024-02-06 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 1 | 6 | 0 | 7 | 2023.11.x | 7 | 4 | 0 | 11 | master | 38 | 57 | 0 | 95 | Classification of failures by reason for master ----------------------------------------------- libressl-3.8.2 | 6 prboom-2.5.0 | 6 libpthsem-2.0.8 | 5 host-erlang-26.0.2 | 3 host-heimdal-f4faaeaba371ff... | 3 libopenssl-3.2.0 | 3 linux-6.6.15 | 3 stunnel-5.71 | 3 unknown | 3 attr-2.5.2 | 2 gobject-introspection-1.76.1 | 2 openssh-9.6p1 | 2 cegui-00b4e1fe174da53b7ed72... | 1 coreutils-9.3 | 1 dmraid-1.0.0.rc16-3 | 1 elfutils-0.189 | 1 eza-0.16.0 | 1 frr-8.5.4 | 1 fs/axfs/axfs.mk:32: /home/a... | 1 host-rust-1.74.1 | 1 ipmitool-1_8_19 | 1 libarchive-3.7.2 | 1 libp11-0.4.12 | 1 linux-5.10.162-cip24-rt10 | 1 memtest86-6.20 | 1 openvmtools-11.3.5-18557794 | 1 strongswan-5.9.13 | 1 sudo-1.9.15p5 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/4238e6e079fe419d6d3c3a380077168f93ccc565 | microblaze | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/abfb6cbe4ad1fe7884427737324b8f803bacbbfc | sparc64 | cegui-00b4e1fe174da53b7ed72... | NOK | http://autobuild.buildroot.net/results/05e5d98ee545db0126a74e61ad4bab8905766fa3 | powerpc | coreutils-9.3 | NOK | http://autobuild.buildroot.net/results/9f4c318f695c5c49f02a419e43cdce799c87e76f | ORPH mips64el | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/82749d726687bd86c86f8e8381068a4ef5a67059 | ORPH microblazeel | elfutils-0.189 | NOK | http://autobuild.buildroot.net/results/8966b479902f42a449a3a4154e751d6f07e96152 | ORPH armeb | eza-0.16.0 | NOK | http://autobuild.buildroot.net/results/9f09e9351ba9b18a3cbbadebb42eb6982c8ebb32 | arceb | frr-8.5.4 | NOK | http://autobuild.buildroot.net/results/8980db502421b3e3830bdbb54bb93883d467f2c2 | microblazeel | fs/axfs/axfs.mk:32: /home/a... | NOK | http://autobuild.buildroot.net/results/cf4e5b2aaccc54c3538c491765f0b015bc5159d9 | nios2 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/d9d1e477d1c01a42ba0041e2fd5f9316a044271a | ORPH i686 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/d8f01f0ddd2d5c1f5f263d7fd4b7502953570886 | ORPH i686 | host-erlang-26.0.2 | NOK | http://autobuild.buildroot.net/results/fccf20aae3f7d0d29defe0073fdd7c36a594d087 | arm | host-erlang-26.0.2 | NOK | http://autobuild.buildroot.net/results/0a901a05401cf5ca525c8a093390ecf16cff2d4e | arm | host-erlang-26.0.2 | NOK | http://autobuild.buildroot.net/results/e431a680aad0eacc77d8dfd53c2d47e4d76d4f0a | mips64 | host-heimdal-f4faaeaba371ff... | NOK | http://autobuild.buildroot.net/results/63265677734dd9d9318da01864ac14c8f10fa1bb | ORPH mips64 | host-heimdal-f4faaeaba371ff... | NOK | http://autobuild.buildroot.net/results/175fb65f0151866cd2d83c91c23b453d8c4489f7 | ORPH m68k | host-heimdal-f4faaeaba371ff... | NOK | http://autobuild.buildroot.net/results/c644c218aa1173ad00bd0fa85ef90db5cbeef543 | ORPH armeb | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/d4022ba7480aca5173f3cc4f74cbfdc619e13bb6 | armeb | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/b27bd257fba655a767322cf53943644d636b587a | powerpc64 | libarchive-3.7.2 | NOK | http://autobuild.buildroot.net/results/cdc08582a7eed6e2c8595aff12ae165e9c835dc1 | s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/dfdb7c1892f7ee7889496d28957a7a61b19571aa | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/2b931bb75dc27f7ecc70e49f9200b1358aa8faba | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/e52d6f890180ca189b07577de883584bcdbe0f8f | ORPH x86_64 | libp11-0.4.12 | NOK | http://autobuild.buildroot.net/results/389ed112f082a4917f777f3e236211059c4c6d6e | ORPH mips64 | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/61f8fa01cea96a5741e7742e2642c9c7d3a8205a | arceb | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/b339bce76f457ae410d0bda41df9e43834cc4be4 | aarch64_be | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/18a46c290f4e1d56e75935d4758b26cf015890ca | arceb | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/c2cb591e3f52d0bc9761939a922c0241e2c06f57 | nios2 | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/6d9f85ba9ba3baa2c1fc09672be3272af109b715 | powerpc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/5aa4e4fe7b6edbbb305e8af5f4d78b4eea6991b2 | ORPH arc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/5d9e9502dc76357aaae2bdb5caf21ac65ee31368 | ORPH powerpc64le | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/687c1b945911259ab09f2720abd425e1526deef6 | ORPH mips64el | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/928e96eef2930fd6f60afee0907f971608b61aa6 | ORPH arceb | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/96e8ab7061d70971b0ab4023100532b0b420aee2 | ORPH mips64el | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/d11d4190d2c242240dcba870ce243c6108d53ef6 | ORPH sh4eb | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/840ea58e5a68ccd571cdf70ae56d18aa1e6bae4a | ORPH sh4a | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/138accf6123d92d9b90b7c7648f4dd41d601cea0 | ORPH nios2 | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/de547d66c32293abe87a9ed21c4d5bb4bac9e8da | ORPH sparc64 | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/403156920015806119096b8c45c833c7512a4c11 | ORPH x86_64 | memtest86-6.20 | NOK | http://autobuild.buildroot.net/results/aedc886e12eca0a995f3755da1d4197c2aa56a47 | mips | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/c8019d1930b3bbdda52b1365e896cb8faf965923 | ORPH mips | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/6127d174c7e259c08d73f743b9050d3fa0e347e1 | ORPH x86_64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/44cca7d0f5faf0c389be11b15f7baf370ef3acb9 | powerpc64 | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/bf979078b19d05e9a705e98d4d3d081d00795ecb | ORPH or1k | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/c78ec1714fcef43cc17a0295f1d55c9c41563529 | ORPH aarch64_be | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/42818e9d6c672a4b844ce5264cffb2262a9f28a8 | ORPH mips64 | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/8a34fe357c4726f658595e445b2678fb27dff0a3 | ORPH m68k | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/5e3d74505002dba176ddcaceab7097b88428aa66 | ORPH sparc64 | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/56aa83036ad0de6cd0be2faaf0a16184ec5d66d2 | ORPH powerpc64 | strongswan-5.9.13 | NOK | http://autobuild.buildroot.net/results/1cef4d5e1631b0841a5a6218039bff8458c2906a | armeb | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/7e3439e298744c1d96855d8777491246938d7011 | mips | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/5b8337a4061ee1ac17ebe3114066f4558bfa5b00 | arc | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/a3ae9b8cb4f40abe3d7d561bc1eb75b1daf94593 | mips | sudo-1.9.15p5 | NOK | http://autobuild.buildroot.net/results/9c0ff3bf8620a36bb4d6dabe14b5a94a376791e8 | ORPH x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/b3ec10f6a50a63ed0bd1adce2fe6ad34581a5395 | mips | unknown | NOK | http://autobuild.buildroot.net/results/055ccc7ab71823fefbfa8430b58c88ad3510ebd9 | arc | unknown | NOK | http://autobuild.buildroot.net/results/7cb470fe00b1eb3a49dab028a2ac85a99cb76765 | Classification of failures by reason for 2023.02.x -------------------------------------------------- acpica-20220331 | 1 fontconfig-2.13.1 | 1 host-gcc-final-11.4.0 | 1 libsepol-3.3 | 1 linux-5.10.162-cip24-rt10 | 1 raptor-2.0.15 | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64le | acpica-20220331 | NOK | http://autobuild.buildroot.net/results/ae4acb746bad649ef14258d00d36b6a250722ce1 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/2ce1ae6df4645d1da9de48469c3f7003cb47429c | ORPH microblazeel | host-gcc-final-11.4.0 | NOK | http://autobuild.buildroot.net/results/3866fe052e878aba04e19d8920559a059fd8b773 | mips64 | libsepol-3.3 | NOK | http://autobuild.buildroot.net/results/f0414712a59cc3ebbd2f20fe49279e0fe96995d8 | arm | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/7ddeb9a4b5175dd2bcdeb021bbd82f9dcd99919c | ORPH mipsel | raptor-2.0.15 | NOK | http://autobuild.buildroot.net/results/7fdb119beeb8f2c29300fcb14fbf5c324ddacf80 | ORPH Classification of failures by reason for 2023.11.x -------------------------------------------------- host-rust-1.71.1 | 2 freeswitch-1.10.11 | 1 libabseil-cpp-20220623.1 | 1 Detail of failures for 2023.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | freeswitch-1.10.11 | NOK | http://autobuild.buildroot.net/results/aea32de0be0cb5de38d8871bd575dd0bda096920 | powerpc64le | host-rust-1.71.1 | NOK | http://autobuild.buildroot.net/results/c80e3934bd6ac5b599a7e2c84fd8ea5431e55204 | powerpc | host-rust-1.71.1 | NOK | http://autobuild.buildroot.net/results/457a86557af5db3320e0c4ce1b9ea6af7c4fe63c | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/6211b5584518655fa3ee2b7c80c4a4a128670c22 | Gitlab CI results for 2024-02-06 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestCpioDracutGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853966 | ORPH ...ioDracutGlibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853979 | ORPH TestCpioDracutMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854009 | ORPH ...pioDracutMuslMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854017 | ORPH TestCpioDracutUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854027 | ORPH ...oDracutUclibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854034 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854423 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854455 | ORPH TestGrubX8664EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/6104227183 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854810 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854842 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854855 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854998 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093855074 | ORPH -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Wed Feb 7 07:05:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 08:05:40 +0100 Subject: [Buildroot] [PATCH] utils/genrandconfig: add default setting for bare-metal toolchain arch Message-ID: <20240207070541.2296330-1-thomas.petazzoni@bootlin.com> We recently added support for building a bare-metal toolchain, and the autobuilders are therefore trying to build such toolchains. However, by default the BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH option is empty, causing the target tuple to be empty, and therefore host-gcc-bare-metal tries to build a toolchain for the target "x86_64-pc-linux-gnu", which isn't a bare-metal target, and fails badly. In order to properly test this bare-metal support, this commit adjusts the genrandconfig script so that it injects a valid target architecture tuple. Fixes: http://autobuild.buildroot.net/results/6cb1514b19bfe056fb984d3538bdccdda5e174c1/ Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 52edad06d8..eb1f8cbd4a 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -315,6 +315,10 @@ def fixup_config(sysinfo, configfile): 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: return False + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y' in configlines: + configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""') + configlines.add('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"') + if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: return False -- 2.43.0 From thomas.petazzoni at bootlin.com Wed Feb 7 07:07:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 08:07:54 +0100 Subject: [Buildroot] [PATCH] package/autoconf: bump to version 2.72 In-Reply-To: <20240118182808.551258-1-francois.perrad@gadz.org> References: <20240118182808.551258-1-francois.perrad@gadz.org> Message-ID: <20240207080754.606a403e@windsurf> On Thu, 18 Jan 2024 19:28:08 +0100 Francois Perrad wrote: > https://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS?h=v2.72 > Signed-off-by: Francois Perrad > --- > package/autoconf/0001-dont-add-dirty-to-version.patch | 2 +- > package/autoconf/autoconf.hash | 2 +- > package/autoconf/autoconf.mk | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) This version bump broke the build of host-erlang: http://autobuild.buildroot.net/results/cab/cabca5a5ed9bb0874ed33e58a69947b50a6e2318/build-end.log Could you have a look? Perhaps it's just the host-erlang configure machinery that is too strict, and simply their check needs to be relaxed. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From kilian.zinnecker at mail.de Wed Feb 7 07:08:05 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Wed, 7 Feb 2024 08:08:05 +0100 Subject: [Buildroot] [PATCH 0/1] Fix alphabetical order of DEVELOPERS file entry Message-ID: <20240207070806.7331-1-kilian.zinnecker@mail.de> The files in my own entry in the DEVELOPERS file are not in alphabetical order. I currently have two further board supports submitted. I was asked to fix that seperately, and this makes sense, because else the patches of the two board supports can easily become non compatible, if they both try to fix the DEVELOPERS file. Kilian Zinnecker (1): Fix alphabetical order of DEVELOPER's file entry DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.34.1 From kilian.zinnecker at mail.de Wed Feb 7 07:08:06 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Wed, 7 Feb 2024 08:08:06 +0100 Subject: [Buildroot] [PATCH 1/1] Fix alphabetical order of DEVELOPERS file entry In-Reply-To: <20240207070806.7331-1-kilian.zinnecker@mail.de> References: <20240207070806.7331-1-kilian.zinnecker@mail.de> Message-ID: <20240207070806.7331-2-kilian.zinnecker@mail.de> Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index fc47c51d33..dd29f395d9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1887,9 +1887,9 @@ N: Kieran Bingham F: package/libcamera/ N: Kilian Zinnecker -F: package/rockchip-rkbin/ -F: configs/rock5b_defconfig F: board/radxa/rock5b/ +F: configs/rock5b_defconfig +F: package/rockchip-rkbin/ N: Klaus Heinrich Kiwi F: package/wqy-zenhei/ -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 7 07:12:07 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 08:12:07 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: libopenssl needs perl Math::BigInt on s390 In-Reply-To: <20240110204909.795AC85DB2@busybox.osuosl.org> References: <20240110204909.795AC85DB2@busybox.osuosl.org> Message-ID: <20240207081207.27f3ca68@windsurf> Hello Fabrice, It looks like this patch isn't sufficient (or there is some other issue?) because the issue pops up in the autobuilders: http://autobuild.buildroot.net/results/dfd/dfdb7c1892f7ee7889496d28957a7a61b19571aa/build-end.log Could you have a look? Thomas On Wed, 10 Jan 2024 21:22:57 +0100 Thomas Petazzoni via buildroot wrote: > commit: https://git.buildroot.net/buildroot/commit/?id=7ea38660e01a87ab70c02e38c78a49202e8e5c21 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > libopenssl needs perl Math::BigInt for s390x asm to avoid the following > build failure since commit a5cacb63082b9e58194c4b9f8b2af2c3e38ff15c: > > Can't locate bigint.pm in @INC (you may need to install the bigint module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/build/libopenssl-3.2.0/crypto/poly1305/asm/../.. /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/libopenssl-3.2.0/crypto/poly1305/asm/../../perlasm/s390x.pm line 16. > BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/libopenssl-3.2.0/crypto/poly1305/asm/../../perlasm/s390x.pm line 16. > > Fixes: > - http://autobuild.buildroot.org/results/986cb07d368c7214ffbc9d60c378e7ac00797f00 > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Thomas Petazzoni > --- > support/dependencies/dependencies.sh | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh > index 6e7d067ccd..3d83cb3285 100755 > --- a/support/dependencies/dependencies.sh > +++ b/support/dependencies/dependencies.sh > @@ -282,6 +282,10 @@ required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-auto > required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl > required_perl_modules="$required_perl_modules IPC::Cmd" # Used by (host-)libopenssl > > +if grep -q ^BR2_PACKAGE_LIBOPENSSL=y $BR2_CONFIG && grep -q ^BR2_s390x=y $BR2_CONFIG ; then > + required_perl_modules="$required_perl_modules Math::BigInt" > +fi > + > if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then > required_perl_modules="$required_perl_modules diagnostics" > fi > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From hanyuan-z at qq.com Wed Feb 7 07:49:49 2024 From: hanyuan-z at qq.com (Hanyuan Zhao) Date: Wed, 7 Feb 2024 15:49:49 +0800 Subject: [Buildroot] [PATCH v4 1/3] package/milkv-duo-libraries: new package Message-ID: This commit adds the libraries for RISC-V dev board milk-v duo, containing board-specific firmware and hardware tools. https://github.com/milkv-duo/milkv-duo-buildroot-libraries Co-authored-by: Emil S Signed-off-by: Hanyuan Zhao --- Changes v3 -> v4: - Update the info in help section - Provide more info about ION (camera memory use) Changes v2 -> v3: - Update the desc's repo url Changes v1 -> v2: - Lint the code - Refactor the select and depend logic --- package/Config.in | 1 + package/milkv-duo-libraries/Config.in | 63 +++++++++++++++++++ .../milkv-duo-libraries.mk | 51 +++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 package/milkv-duo-libraries/Config.in create mode 100644 package/milkv-duo-libraries/milkv-duo-libraries.mk diff --git a/package/Config.in b/package/Config.in index 047877c960..322aba90b8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -564,6 +564,7 @@ endmenu source "package/memtester/Config.in" source "package/memtool/Config.in" source "package/mhz/Config.in" + source "package/milkv-duo-libraries/Config.in" source "package/minicom/Config.in" source "package/msr-tools/Config.in" source "package/nanocom/Config.in" diff --git a/package/milkv-duo-libraries/Config.in b/package/milkv-duo-libraries/Config.in new file mode 100644 index 0000000000..047b78fb7b --- /dev/null +++ b/package/milkv-duo-libraries/Config.in @@ -0,0 +1,63 @@ +config BR2_PACKAGE_MILKV_DUO_LIBRARIES + bool "milk-v duo libraries" + depends on BR2_riscv + help + Package providing board-specific firmware and hardware tools + for Milk-V Duo platform. + + https://github.com/milkv-duo/milkv-duo-buildroot-libraries + +if BR2_PACKAGE_MILKV_DUO_LIBRARIES + +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + bool "milkv-duo-firmware-fsbl" + select BR2_PACKAGE_HOST_MTOOLS + help + This package is obtained from + https://github.com/milkv-duo/duo-buildroot-sdk, + from which we download the first stage bootloader source and + compile it, generating the ATF bl2.bin. At the mean time, we + will use the fiptool.py in this package to create the binary + file fip.bin to pack the opensbi, u-boot and so on. + + If you intend to generate the whole sdcard image or the + fip.bin for milk-v duo, you must say Y to this package! + +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB + bool "64 MiB free ram" + default n + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + help + Say Y to this will disable the ION (Camera Algorithm Memory) + in order to have the all 64MiB Free memory. + +config BR2_PACKAGE_MILKV_DUO_PINMUX + bool "duo-pinmux tool" + default n + help + Say Y to this will compile the duo-pinmux, which can + get or set function of any Milk-V Duo GPIO Pin. More info at + + https://milkv.io/docs/duo/application-development/pinmux + +config BR2_PACKAGE_MILKV_DUO_FEATURES + bool "duo usb features" + default n + select BR2_PACKAGE_DHCPCD + select BR2_PACKAGE_DNSMASQ + select BR2_PACKAGE_DROPBEAR + select BR2_PACKAGE_LRZSZ + select BR2_PACKAGE_HTOP + help + Say Y to this will copy the cvitek usb shell scripts to have + the USB features. The role could be configured at + + /etc/milkv-duo.conf + + Supported usb functions are rndis, host and mass-storage. + By default Duo has the LED blinking. It could be configured + in that conf file as well. Say Y to this will also select + some packages automatically, to have the same experience + with the official release. + +endif diff --git a/package/milkv-duo-libraries/milkv-duo-libraries.mk b/package/milkv-duo-libraries/milkv-duo-libraries.mk new file mode 100644 index 0000000000..a5cf40a764 --- /dev/null +++ b/package/milkv-duo-libraries/milkv-duo-libraries.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# milkv-duo-libraries +# +################################################################################ + +MILKV_DUO_LIBRARIES_VERSION = f359994bd497f942bb67734280d81f6640c7c168 +MILKV_DUO_LIBRARIES_SITE = $(call github,milkv-duo,milkv-duo-buildroot-libraries,$(MILKV_DUO_LIBRARIES_VERSION)) +MILKV_DUO_LIBRARIES_INSTALL_STAGING = YES +MILKV_DUO_LIBRARIES_DEPENDENCIES = host-python3 host-mtools +MILKV_DUO_LIBRARIES_FSBL_64MB = ION + +ifeq ($(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB),y) +MILKV_DUO_LIBRARIES_FSBL_64MB = 64MB +endif + +define MILKV_DUO_LIBRARIES_BUILD_CMDS + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ + $(MAKE) -C $(@D)/firmware \ + ARCH=riscv BOOT_CPU=riscv CHIP_ARCH=cv180x \ + PROJECT_FULLNAME=cv1800b_milkv_duo_sd \ + CROSS_COMPILE=$(TARGET_CROSS) \ + FREE_RAM_SIZE=$(MILKV_DUO_LIBRARIES_FSBL_64MB) \ + bl2; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + -I $(@D)/pinmux/include $(@D)/pinmux/src/*.c -o $(@D)/pinmux/duo-pinmux; \ + fi +endef + +define MILKV_DUO_LIBRARIES_INSTALL_STAGING_CMDS + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ + $(INSTALL) -D -m 0755 $(@D)/firmware/build/cv180x/bl2.bin $(BINARIES_DIR)/bl2.bin; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/chip_conf.bin $(BINARIES_DIR)/chip_conf.bin; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/fiptool.py $(BINARIES_DIR)/fiptool.py; \ + $(INSTALL) -D -m 0644 $(@D)/firmware/plat/cv180x/multi.its $(BINARIES_DIR)/multi.its; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/test/cv181x/ddr_param.bin $(BINARIES_DIR)/ddr_param.bin; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ + $(INSTALL) -D -m 0755 $(@D)/pinmux/duo-pinmux $(TARGET_DIR)/usr/bin/; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_FEATURES) = y ]; then \ + cp $(@D)/overlay/* -r $(TARGET_DIR); \ + fi +endef + +$(eval $(generic-package)) -- 2.34.1 From hanyuan-z at qq.com Wed Feb 7 07:49:53 2024 From: hanyuan-z at qq.com (Hanyuan Zhao) Date: Wed, 7 Feb 2024 15:49:53 +0800 Subject: [Buildroot] [PATCH v4 3/3] configs/milkv_duo: new defconfig In-Reply-To: <20240207074950.2049-1-hanyuan-z@qq.com> References: <20240207074950.2049-1-hanyuan-z@qq.com> Message-ID: Milk-V Duo is an ultra-compact embedded RISC-V development platform based on the CV1800B chip. It can run Linux and RTOS, providing a reliable, low-cost, and high-performance platform for professionals, industrial ODMs, AIoT enthusiasts, DIY hobbyists, and creators. https://milkv.io/duo Co-authored-by: Emil S Co-authored-by: GP Orcullo Signed-off-by: Hanyuan Zhao Reviewed-by: Giulio Benetti [Build Tested only both defconfigs] Tested-by: Giulio Benetti --- This patch depends on: https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 to work-around a gcc bug on htop package. --- Changes v3 -> v4: - Lint the code - Add more comments about gcc ICE in defconfig - Remove unnecessary comments Changes v2 -> v3: - Remove BR2_TOOLCHAIN_BUILDROOT_CXX in defconfig - Refactor post-image.sh - Provide more info about ION and camera memory use Changes v1 -> v2: - Refactor defconfig - Set the boot partition size to 8M - Refactor the image generating logic --- board/milkv/duo/genimage.cfg | 25 ++++++++ board/milkv/duo/post-image.sh | 47 ++++++++++++++ board/milkv/duo/readme.txt | 46 ++++++++++++++ configs/milkv_duo_musl_riscv64_defconfig | 67 ++++++++++++++++++++ configs/milkv_duo_musl_riscv64_ion_defconfig | 67 ++++++++++++++++++++ 5 files changed, 252 insertions(+) create mode 100644 board/milkv/duo/genimage.cfg create mode 100755 board/milkv/duo/post-image.sh create mode 100644 board/milkv/duo/readme.txt create mode 100644 configs/milkv_duo_musl_riscv64_defconfig create mode 100644 configs/milkv_duo_musl_riscv64_ion_defconfig diff --git a/board/milkv/duo/genimage.cfg b/board/milkv/duo/genimage.cfg new file mode 100644 index 0000000000..1fd74f845a --- /dev/null +++ b/board/milkv/duo/genimage.cfg @@ -0,0 +1,25 @@ +image boot.vfat { + vfat { + files = { + "fip.bin", + "boot.sd", + } + } + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/milkv/duo/post-image.sh b/board/milkv/duo/post-image.sh new file mode 100755 index 0000000000..3856d977df --- /dev/null +++ b/board/milkv/duo/post-image.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +########################################################### +# File: post-image.sh +# Author: GP Orcullo +# Hanyuan Zhao +# Description: this sh will make the fip.bin and boot.sd, +# then pack everything to an image file. +########################################################### + +FIPTOOL_OPTS="genfip ${BINARIES_DIR}/fip.bin \ + --MONITOR_RUNADDR=0x80000000 \ + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ + --NAND_INFO=00000000 \ + --BL2=${BINARIES_DIR}/bl2.bin \ + --BLCP_IMG_RUNADDR=0x05200200 \ + --BLCP_PARAM_LOADADDR=0 \ + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin" + +if [ -f ${BINARIES_DIR}/cvirtos.bin ]; then + FIPTOOL_OPTS="${FIPTOOL_OPTS} \ + --BLCP=${BINARIES_DIR}/empty.bin \ + --BLCP_2ND=${BINARIES_DIR}/cvirtos.bin \ + --BLCP_2ND_RUNADDR=0x83f40000" + echo "[Duo Post-Image fiptool.py] Integrating FreeRTOS" +fi + +${BINARIES_DIR}/fiptool.py ${FIPTOOL_OPTS} \ +> ${BINARIES_DIR}/fip.log 2>&1 +if [ -f ${BINARIES_DIR}/fip.bin ]; then + echo "[Duo Post-Image fiptool.py] > fip.bin generated!" +fi + +cp ${BINARIES_DIR}/u-boot.dtb ${BINARIES_DIR}/cv1800b_milkv_duo_sd.dtb +lzma -fk ${BINARIES_DIR}/Image +mkimage -f ${BINARIES_DIR}/multi.its ${BINARIES_DIR}/boot.sd +if [ -f ${BINARIES_DIR}/boot.sd ]; then + echo "[Duo Post-Image] > boot.sd generated!" +fi +support/scripts/genimage.sh -c $(pwd)/board/milkv/duo/genimage.cfg +gzip -fk ${BINARIES_DIR}/sdcard.img +if [ -f ${BINARIES_DIR}/sdcard.img ]; then + echo "[Duo Post-Image] > sdcard.img generated!" +fi diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt new file mode 100644 index 0000000000..bb05050245 --- /dev/null +++ b/board/milkv/duo/readme.txt @@ -0,0 +1,46 @@ +Milk-V Duo (https://milkv.io/docs/duo/overview) + +Intro +===== + +Milk-V Duo is an ultra-compact embedded development platform +based on the rv64 CV1800B chip. It can run Linux and RTOS, +providing a reliable, cost-effective, and high-performance +platform for professionals, industrial ODMs, AIoT enthusiasts, +DIY enthusiasts, and creators. + +How to build it +=============== + +Configure Buildroot: + + $ make milkv_duo_musl_riscv64_defconfig + +The milkv_duo_musl_riscv64_defconfig will by default provide +the full 64MiB free RAM. If you want to build with memory +reserved for ION (generalized memory manager in linux, i.e. +some memory will be reserved for the camera algorithms), please try: + + $ make milkv_duo_musl_riscv64_ion_defconfig + +For more information about the ION, please refer to + +https://github.com/milkv-duo/duo-buildroot-sdk/blob/develop/README.md?plain=1#L436 + +Modify configuration if needed, e.g. add more packages to target: + + $ make menuconfig + +Compile everything and build the SD card image: + + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image +called "sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_musl_riscv64_defconfig new file mode 100644 index 0000000000..0773924072 --- /dev/null +++ b/configs/milkv_duo_musl_riscv64_defconfig @@ -0,0 +1,67 @@ +# Architecture +BR2_riscv=y +BR2_riscv_g=y +BR2_RISCV_ISA_RVC=y + +# Linux headers same as kernel 5.10 series +BR2_KERNEL_HEADERS_5_10=y + +# Since gcc 13 and later versions with the t-head's optimizations +# below are currently not well compatible with glibc, which will +# throw gcc ICE (Internal Compiler Error) when the buildroot is +# compiling the glibc, so we choose musl used by the official sdk +# until this ICE gets fixed. +BR2_GCC_VERSION_13_X=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" + +# opensbi +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_GIT=y +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_OPENSBI_FW_FDT_PATH=y + +# u-boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_64mb" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_LINUX_KERNEL_LZMA=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# SD card image generating script +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" + +# rootfs +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Packages for the sdcard image generating +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB=y +BR2_PACKAGE_MILKV_DUO_PINMUX=y +BR2_PACKAGE_MILKV_DUO_FEATURES=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y + +# Host packages for the sdcard image generating +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_LZMA_ALONE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/milkv_duo_musl_riscv64_ion_defconfig b/configs/milkv_duo_musl_riscv64_ion_defconfig new file mode 100644 index 0000000000..18458726d9 --- /dev/null +++ b/configs/milkv_duo_musl_riscv64_ion_defconfig @@ -0,0 +1,67 @@ +# Architecture +BR2_riscv=y +BR2_riscv_g=y +BR2_RISCV_ISA_RVC=y + +# Linux headers same as kernel 5.10 series +BR2_KERNEL_HEADERS_5_10=y + +# Since gcc 13 and later versions with the t-head's optimizations +# below are currently not well compatible with glibc, which will +# throw gcc ICE (Internal Compiler Error) when the buildroot is +# compiling the glibc, so we choose musl used by the official sdk +# until this ICE gets fixed. +BR2_GCC_VERSION_13_X=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" + +# opensbi +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_GIT=y +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_OPENSBI_FW_FDT_PATH=y + +# u-boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_ion" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_LINUX_KERNEL_LZMA=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# SD card image generating script +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" + +# rootfs +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Packages for the sdcard image generating +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y +BR2_PACKAGE_MILKV_DUO_PINMUX=y +BR2_PACKAGE_MILKV_DUO_FEATURES=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y + +# Host packages for the sdcard image generating +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_LZMA_ALONE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -- 2.34.1 From hanyuan-z at qq.com Wed Feb 7 07:49:51 2024 From: hanyuan-z at qq.com (Hanyuan Zhao) Date: Wed, 7 Feb 2024 15:49:51 +0800 Subject: [Buildroot] [PATCH v4 2/3] package/milkv-duo-smallcore-freertos: new package In-Reply-To: <20240207074950.2049-1-hanyuan-z@qq.com> References: <20240207074950.2049-1-hanyuan-z@qq.com> Message-ID: This commit adds the freertos support for the RISC-V dev board milk-v duo. https://github.com/milkv-duo/milkv-duo-smallcore-freertos Co-authored-by: Emil S Signed-off-by: Hanyuan Zhao --- Changes v3 -> v4: - Move the make recipes to the repo - Bump the version to latest Changes v2 -> v3: - No Changes Changes v1 -> v2: - Set the depends and select logic - Add host tools --- package/Config.in | 1 + .../milkv-duo-smallcore-freertos/Config.in | 21 ++++++++++++++++++ .../milkv-duo-smallcore-freertos.mk | 22 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 package/milkv-duo-smallcore-freertos/Config.in create mode 100644 package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk diff --git a/package/Config.in b/package/Config.in index 322aba90b8..7be3316f71 100644 --- a/package/Config.in +++ b/package/Config.in @@ -565,6 +565,7 @@ endmenu source "package/memtool/Config.in" source "package/mhz/Config.in" source "package/milkv-duo-libraries/Config.in" + source "package/milkv-duo-smallcore-freertos/Config.in" source "package/minicom/Config.in" source "package/msr-tools/Config.in" source "package/nanocom/Config.in" diff --git a/package/milkv-duo-smallcore-freertos/Config.in b/package/milkv-duo-smallcore-freertos/Config.in new file mode 100644 index 0000000000..8503932461 --- /dev/null +++ b/package/milkv-duo-smallcore-freertos/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS + bool "milkv-duo-smallcore-freertos" + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + select BR2_PACKAGE_HOST_CMAKE + help + This package is obtained from + https://github.com/milkv-duo/duo-buildroot-sdk, + from which we download the FreeRTOS ported to Milk-V Duo + into the Buildroot. This FreeRTOS will run in the small core + and will not do anything because it is simply a template + with some basic UART demos. You can realize your own ideas + by adding code to + + output/build/milkv-duo-smallcore-freertos-hash/cvitek/task + /comm/src/riscv64/comm_main.c + + If you say Y, then every time you make Buildroot, it will + automatically compile and include the FreeRTOS into the + fip.bin, which will then be packed into sdcard.img + + https://github.com/milkv-duo/milkv-duo-smallcore-freertos diff --git a/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk new file mode 100644 index 0000000000..1d8d4fcf12 --- /dev/null +++ b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# milkv-duo-smallcore-freertos +# +################################################################################ + +MILKV_DUO_SMALLCORE_FREERTOS_VERSION = 10b86e308ca2305a464ae2bb3eb868a72295f7ab +MILKV_DUO_SMALLCORE_FREERTOS_SITE = $(call github,milkv-duo,milkv-duo-smallcore-freertos,$(MILKV_DUO_SMALLCORE_FREERTOS_VERSION)) +MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING = YES +MILKV_DUO_SMALLCORE_FREERTOS_DEPENDENCIES = host-cmake host-ninja +MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV = CROSS_COMPILE=$(TARGET_CROSS) MK_ENV=$(TARGET_MAKE_ENV) TARGET_CMAKE=$(BR2_CMAKE) BUILD_PATH=$(@D) + +define MILKV_DUO_SMALLCORE_FREERTOS_BUILD_CMDS + $(MAKE) -C $(@D) all $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) +endef + +define MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0755 $(@D)/cvitek/install/bin/cvirtos.bin $(BINARIES_DIR)/cvirtos.bin + touch $(BINARIES_DIR)/empty.bin +endef + +$(eval $(generic-package)) -- 2.34.1 From peter at korsgaard.com Wed Feb 7 08:16:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 09:16:29 +0100 Subject: [Buildroot] [PATCH v2] package/minisign: new package In-Reply-To: <20240108222957.3567-1-patrick.oppenlander@gmail.com> (patrick oppenlander's message of "Tue, 9 Jan 2024 09:25:51 +1100") References: <20240108222957.3567-1-patrick.oppenlander@gmail.com> Message-ID: <87bk8s3d0i.fsf@48ers.dk> >>>>> "patrick" == patrick oppenlander writes: > From: Patrick Oppenlander > Signed-off-by: Patrick Oppenlander > --- > Changes from v1 (reviewed by Baruch Siach): > * host-libsodium dependency was incorrectly on to the target dependencies list. ./utils/check-package points out a few minor issues: package/Config.in:1572: Packages in: menu "Crypto", are not alphabetically ordered; correct order: '-', '_', digits, capitals, lowercase; first incorrect package: minisign package/minisign/Config.in:6: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/minisign/Config.in.host:4: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) You put it in Libraries/Crypto, but I isn't a library, so I think it makes more sense to put it under "shell and utilities" like we do for gnupg2. Committed with those issues fixed and an entry in DEVELOPERS added, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 08:20:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 09:20:38 +0100 Subject: [Buildroot] [git commit] package/minisign: new package Message-ID: <20240207082105.001BE874DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d90ac63d9b3448a239bb9aa8030326699a3fdc3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Patrick Oppenlander [Peter: Fix check-package warnings, move to "Shell and utilities" and add DEVELOPERS entry] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/Config.in.host | 1 + package/minisign/Config.in | 9 +++++++++ package/minisign/Config.in.host | 7 +++++++ package/minisign/minisign.hash | 3 +++ package/minisign/minisign.mk | 19 +++++++++++++++++++ 7 files changed, 43 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index fc47c51d33..471c739678 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2402,6 +2402,9 @@ N: Patrick Havelange F: support/testing/tests/package/test_lxc.py F: support/testing/tests/package/test_lxc/ +N: Patrick Oppenlander +F: package/minisign/ + N: Paul Cercueil F: package/libiio/ F: package/lightning/ diff --git a/package/Config.in b/package/Config.in index 047877c960..24e5f04ed6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2685,6 +2685,7 @@ comment "Utilities" source "package/lockfile-progs/Config.in" source "package/logrotate/Config.in" source "package/logsurfer/Config.in" + source "package/minisign/Config.in" source "package/neofetch/Config.in" source "package/pdmenu/Config.in" source "package/pinentry/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index c80842c33a..f03ca16b7b 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -64,6 +64,7 @@ menu "Host utilities" source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" source "package/microchip-hss-payload-generator/Config.in.host" + source "package/minisign/Config.in.host" source "package/mkpasswd/Config.in.host" source "package/moby-buildkit/Config.in.host" source "package/mosquitto/Config.in.host" diff --git a/package/minisign/Config.in b/package/minisign/Config.in new file mode 100644 index 0000000000..b852903921 --- /dev/null +++ b/package/minisign/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_MINISIGN + bool "minisign" + select BR2_PACKAGE_LIBSODIUM + select BR2_PACKAGE_LIBSODIUM_FULL + help + Minisign is a dead simple tool to sign files and verify + signatures. + + https://github.com/jedisct1/minisign diff --git a/package/minisign/Config.in.host b/package/minisign/Config.in.host new file mode 100644 index 0000000000..99a89b7cf3 --- /dev/null +++ b/package/minisign/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_MINISIGN + bool "host minisign" + help + Minisign is a dead simple tool to sign files and verify + signatures. + + https://github.com/jedisct1/minisign diff --git a/package/minisign/minisign.hash b/package/minisign/minisign.hash new file mode 100644 index 0000000000..12cde42a43 --- /dev/null +++ b/package/minisign/minisign.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 74c2c78a1cd51a43a6c98f46a4eabefbc8668074ca9aa14115544276b663fc55 minisign-0.11.tar.gz +sha256 d775d155cbf31638714c31c6f990f9fdc5f07998d91e42d1bf15483bd2d1706b LICENSE diff --git a/package/minisign/minisign.mk b/package/minisign/minisign.mk new file mode 100644 index 0000000000..34b3f4046e --- /dev/null +++ b/package/minisign/minisign.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# minisign +# +################################################################################ + +MINISIGN_VERSION = 0.11 +MINISIGN_SITE = $(call github,jedisct1,minisign,$(MINISIGN_VERSION)) +MINISIGN_LICENSE = ISC +MINISIGN_LICENSE_FILES = LICENSE +MINISIGN_DEPENDENCIES = libsodium +HOST_MINISIGN_DEPENDENCIES = host-libsodium + +ifeq ($(BR2_STATIC_LIBS),y) +MINISIGN_CONF_OPTS += -DBUILD_STATIC_EXECUTABLES=1 +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From arnout at mind.be Wed Feb 7 08:23:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 09:23:15 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/python-poetry-core: new host package In-Reply-To: References: <20240106214410.3294887-1-james.hilliard1@gmail.com> Message-ID: <9b42a9e2-c741-41f3-be5a-cc36c421b1bf@mind.be> On 06/02/2024 20:32, James Hilliard wrote: > On Tue, Feb 6, 2024 at 10:43?AM Arnout Vandecappelle wrote: >> >> Hi James, >> >> On 06/01/2024 22:44, James Hilliard wrote: >>> Signed-off-by: James Hilliard >>> --- >>> package/python-poetry-core/python-poetry-core.hash | 5 +++++ >>> package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ >>> 2 files changed, 19 insertions(+) >>> create mode 100644 package/python-poetry-core/python-poetry-core.hash >>> create mode 100644 package/python-poetry-core/python-poetry-core.mk >>> >>> diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash >>> new file mode 100644 >>> index 0000000000..3c07fef04f >>> --- /dev/null >>> +++ b/package/python-poetry-core/python-poetry-core.hash >>> @@ -0,0 +1,5 @@ >>> +# md5, sha256 from https://pypi.org/pypi/poetry-core/json >>> +md5 9ed2f2e9244165b34d7233c306a34a2a poetry_core-1.8.1.tar.gz >>> +sha256 67a76c671da2a70e55047cddda83566035b701f7e463b32a2abfeac6e2a16376 poetry_core-1.8.1.tar.gz >>> +# Locally computed sha256 checksums >>> +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE >>> diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk >>> new file mode 100644 >>> index 0000000000..e1acf3179c >>> --- /dev/null >>> +++ b/package/python-poetry-core/python-poetry-core.mk >>> @@ -0,0 +1,14 @@ >>> +################################################################################ >>> +# >>> +# python-poetry-core >>> +# >>> +################################################################################ >>> + >>> +PYTHON_POETRY_CORE_VERSION = 1.8.1 >>> +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz >>> +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/36/66/6af2891495d12020419c8447d0b29c1e96f3be16631faaed6bda5b886d5d >>> +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 >>> +PYTHON_POETRY_CORE_LICENSE = MIT >>> +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE >> >> This package has 4 vendored dependencies, each with their own license. Those >> should also be specified in the LICENSE and LICENSE_FILES. > > Does this look right? > https://patchwork.ozlabs.org/project/buildroot/patch/20240206193048.658003-1-james.hilliard1 at gmail.com/ Excellent, thank you! Regards, Arnout > >> >> In addition, for lark, there's a file under MPL and a file under GPL, even >> though neither if those licenses is mentioned in the lark license. Ideally those >> two should be mentioned in the LICENSES as well. And of course, this should >> ideally also be done for the python-lark package which suffers from the same >> issue... >> >> Regards, >> Arnout >> >>> + >>> +$(eval $(host-python-package)) From peter at korsgaard.com Wed Feb 7 08:37:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 09:37:24 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump version to v1.7.13 In-Reply-To: <20240207023158.2572044-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 18:31:58 -0800") References: <20240207023158.2572044-1-christian@aperture.us> Message-ID: <877cjg3c1n.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/containerd/containerd/releases/tag/v1.7.13 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 08:38:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 09:38:34 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/runc: bump version to v1.1.12 In-Reply-To: <20240207023225.2572189-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 18:32:25 -0800") References: <20240207023225.2572189-1-christian@aperture.us> Message-ID: <8734u43bzp.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/opencontainers/runc/releases/tag/v1.1.12 As clearly stated in the release notes this is a security fix (for https://github.com/advisories/GHSA-xr7r-f8xq-vfvv), so I've marked it as such and committed, thanks. > Signed-off-by: Christian Stewart > --- > package/runc/runc.hash | 2 +- > package/runc/runc.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > diff --git a/package/runc/runc.hash b/package/runc/runc.hash > index 5ffd21a5dd..d6eb27d352 100644 > --- a/package/runc/runc.hash > +++ b/package/runc/runc.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 509993674481aad7e14aedfb280e0eb160f3a34c0b77e2e98c4b3c0b1df76894 runc-1.1.9.tar.gz > +sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 runc-1.1.12.tar.gz > sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE > diff --git a/package/runc/runc.mk b/package/runc/runc.mk > index 62e117685a..273509b860 100644 > --- a/package/runc/runc.mk > +++ b/package/runc/runc.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -RUNC_VERSION = 1.1.9 > +RUNC_VERSION = 1.1.12 > RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) > RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) > RUNC_LICENSE_FILES = LICENSE > -- > 2.43.0 -- Bye, Peter Korsgaard From romain.naour at smile.fr Wed Feb 7 08:45:02 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 09:45:02 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/python-bitarray: new package Message-ID: <20240207084503.11109-1-romain.naour@smile.fr> This package is needed at runtime by python-bitstring since 4.1.0 already [1]. Note: the License is under Python-2.0 but "Python Software Foundation License (PSF)" has been remplaced by the author of bitarray Ilan Schnell. [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 Signed-off-by: Romain Naour Reviewed-by: Marcus Hoffmann --- Triple checked the license type with other distribution: https://salsa.debian.org/python-team/packages/python-bitarray/-/blob/master/debian/copyright?ref_type=heads https://src.fedoraproject.org/rpms/python-bitarray/blob/rawhide/f/python-bitarray.spec https://aur.archlinux.org/packages/python-bitarray v2: update python-bitstring version (Marcus Hoffmann) --- package/Config.in | 1 + package/python-bitarray/Config.in | 6 ++++++ package/python-bitarray/python-bitarray.hash | 5 +++++ package/python-bitarray/python-bitarray.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-bitarray/Config.in create mode 100644 package/python-bitarray/python-bitarray.hash create mode 100644 package/python-bitarray/python-bitarray.mk diff --git a/package/Config.in b/package/Config.in index 24e5f04ed6..89537f87b6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1008,6 +1008,7 @@ menu "External python modules" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bidict/Config.in" + source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" source "package/python-bleak/Config.in" source "package/python-blinker/Config.in" diff --git a/package/python-bitarray/Config.in b/package/python-bitarray/Config.in new file mode 100644 index 0000000000..38d685f4fd --- /dev/null +++ b/package/python-bitarray/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_BITARRAY + bool "python-bitarray" + help + efficient arrays of booleans -- C extension. + + https://github.com/ilanschnell/bitarray diff --git a/package/python-bitarray/python-bitarray.hash b/package/python-bitarray/python-bitarray.hash new file mode 100644 index 0000000000..d91a28af20 --- /dev/null +++ b/package/python-bitarray/python-bitarray.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/bitarray/json +md5 024324a82314e9e68ecdcdefdc69071f bitarray-2.9.2.tar.gz +sha256 a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e bitarray-2.9.2.tar.gz +# Locally computed sha256 checksums +sha256 6b5e04f6e0462e1b97be833f9d65e66cd5eceb3283f4a6f532261087d0ab1233 LICENSE diff --git a/package/python-bitarray/python-bitarray.mk b/package/python-bitarray/python-bitarray.mk new file mode 100644 index 0000000000..f86320c112 --- /dev/null +++ b/package/python-bitarray/python-bitarray.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-bitarray +# +################################################################################ + +PYTHON_BITARRAY_VERSION = 2.9.2 +PYTHON_BITARRAY_SOURCE = bitarray-$(PYTHON_BITARRAY_VERSION).tar.gz +PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/c7/bf/25cf92a83e1fe4948d7935ae3c02f4c9ff9cb9c13e977fba8af11a5f642c +PYTHON_BITARRAY_SETUP_TYPE = setuptools +PYTHON_BITARRAY_LICENSE = Python-2.0 +PYTHON_BITARRAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) -- 2.43.0 From romain.naour at smile.fr Wed Feb 7 08:45:03 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 09:45:03 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/python-bitstring: add missing runtime dependency In-Reply-To: <20240207084503.11109-1-romain.naour@smile.fr> References: <20240207084503.11109-1-romain.naour@smile.fr> Message-ID: <20240207084503.11109-2-romain.naour@smile.fr> python-bitstring require python-bitarray and python-zlib at runtime since 4.1.0 release [1][2]. python-zlib is now needed for the "Experimental support for two 8-bit float types" [2]. Fixes: https://gitlab.com/kubu93/buildroot/-/jobs/6114047821 [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 [2] https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 Signed-off-by: Romain Naour Cc: James Hilliard --- v2: fix commit log about python-bitstring release (Marcus Hoffmann) reproduce the issue on gitlab-ci and update the Fixes tag url. --- package/python-bitstring/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-bitstring/Config.in b/package/python-bitstring/Config.in index 93d7682577..82d0bb29c6 100644 --- a/package/python-bitstring/Config.in +++ b/package/python-bitstring/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_BITSTRING bool "python-bitstring" + select BR2_PACKAGE_PYTHON_BITARRAY # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Simple construction, analysis and modification of binary data. -- 2.43.0 From peter at korsgaard.com Wed Feb 7 08:35:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 09:35:01 +0100 Subject: [Buildroot] [git commit] package/containerd: bump version to v1.7.13 Message-ID: <20240207084729.86562874ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54e95ba1711bb4fd389f07d803a5518dcfe97745 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/containerd/containerd/releases/tag/v1.7.13 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 5524a1a44e..25dc7ff55d 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 containerd-1.7.8.tar.gz +sha256 ae2b914bff0ddbb9b29d5fc689a51e1ce89ea4edfc4df9ae10517c6f5d2d5aaf containerd-1.7.13.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index d3ca102797..50c2965b87 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.8 +CONTAINERD_VERSION = 1.7.13 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 7 08:38:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 09:38:38 +0100 Subject: [Buildroot] [git commit] package/runc: security bump to version v1.1.12 Message-ID: <20240207084729.951F3874EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0b5beea44005a38ab563067fedbe27a0c015cd5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following vulnerabilities: - CVE-2024-21626: runc vulnerable to container breakout through process.cwd trickery and leaked fds https://github.com/advisories/GHSA-xr7r-f8xq-vfvv https://github.com/opencontainers/runc/releases/tag/v1.1.12 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 5ffd21a5dd..d6eb27d352 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 509993674481aad7e14aedfb280e0eb160f3a34c0b77e2e98c4b3c0b1df76894 runc-1.1.9.tar.gz +sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 runc-1.1.12.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 62e117685a..273509b860 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.9 +RUNC_VERSION = 1.1.12 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Feb 7 08:50:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 09:50:12 +0100 Subject: [Buildroot] [git commit] package/linux-tools: introduce linux mm tools Message-ID: <20240207085040.0A7DC874F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39aaf091ae0a88a7f84c50d52aff84c36caeadaa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This toolset was designed to facilitate the testing, monitoring, and tracing of various things with virtual memory, pages, and slab objects. It is an invaluable resource for identifying and analyzing memory-related issues, such as leaks and bottlenecks, and can greatly enhance one's understanding of memory utilization within a system. The mm toolset includes: - page_owner_sort: userspace helper to sort the output of /sys/kernel/debug/page_owner, which helps to know who allocates the page from kernel context - slabinfo: the tool which gets reports about slabs, for example show empty slabs, modify of slab debug options at runtime, display all information about a slabcache - page-types: a handy tool for querying page flags Signed-off-by: Dmitry Rokosov Signed-off-by: Alexey Romanov [yann.morin.1998 at free.fr: - don't depend on linux, already a patch dependency - don't set CC: default is based on CROSS_COMPILE - no need to fully recheck at install time - move the option for alphabetical ordering - fix check-package ] Signed-off-by: Yann E. MORIN --- package/linux-tools/Config.in | 19 +++++++++++++++++ package/linux-tools/linux-tool-mm.mk.in | 37 +++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index fb158f84d4..5a38f6dafe 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -38,6 +38,25 @@ config BR2_PACKAGE_LINUX_TOOLS_IIO These tools are available only from kernel version 4.7. +config BR2_PACKAGE_LINUX_TOOLS_MM + bool "mm" + select BR2_PACKAGE_LINUX_TOOLS + help + mm is a toolset for testing/monitoring/tracing vm/pages/slabs + objects. + + - page_owner_sort: userspace helper to sort the output of + /sys/kernel/debug/page_owner, which helps to know who + allocates the page from kernel context + + - slabinfo: the tool which gets reports about slabs, for + example show empty slabs, modify of slab debug options at + runtime, display all information about a slabcache + + - page-types: a handy tool for querying page flags + + These tools are available only from kernel version 3.4. + config BR2_PACKAGE_LINUX_TOOLS_PCI bool "pci" select BR2_PACKAGE_LINUX_TOOLS diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in new file mode 100644 index 0000000000..b2ec090fc0 --- /dev/null +++ b/package/linux-tools/linux-tool-mm.mk.in @@ -0,0 +1,37 @@ +################################################################################ +# +# mm +# +################################################################################ + +LINUX_TOOLS += mm + +define MM_BUILD_CMDS + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ + MM_SUBDIR=vm; \ + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ + MM_SUBDIR=mm; \ + else \ + echo "Your kernel version is too old and does not have the mm tool." ; \ + echo "At least kernel 3.4 must be used." ; \ + exit 1 ; \ + fi ; \ + $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR)/tools \ + $(MM_MAKE_OPTS) $${MM_SUBDIR} +endef + +# For install no need to recheck both cases: we know at least one +# exists, because that was checked at build time already; we just +# need to find which of the two: if not one, then the other. +define MM_INSTALL_TARGET_CMDS + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ + MM_SUBDIR=vm; \ + else \ + MM_SUBDIR=mm; \ + fi ; \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(LINUX_MAKE_FLAGS) \ + INSTALL_ROOT=$(TARGET_DIR) \ + DESTDIR=$(TARGET_DIR) \ + $${MM_SUBDIR}_install +endef From peter at korsgaard.com Wed Feb 7 08:51:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 09:51:17 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/nerdctl: bump version to v1.7.3 In-Reply-To: <20240207023258.2572359-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 18:32:57 -0800") References: <20240207023258.2572359-1-christian@aperture.us> Message-ID: <87y1bw1wu2.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/containerd/nerdctl/releases/tag/v1.7.3 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Wed Feb 7 08:55:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 09:55:23 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/linux-tools: introduce linux mm tools In-Reply-To: <20240206192543.7179-2-ddrokosov@salutedevices.com> References: <20240206192543.7179-1-ddrokosov@salutedevices.com> <20240206192543.7179-2-ddrokosov@salutedevices.com> Message-ID: Dmitry, All, On 2024-02-06 22:25 +0300, Dmitry Rokosov spake thusly: > This toolset was designed to facilitate the testing, monitoring, and > tracing of various things with virtual memory, pages, and slab objects. > It is an invaluable resource for identifying and analyzing > memory-related issues, such as leaks and bottlenecks, and can greatly > enhance one's understanding of memory utilization within a system. > > The mm toolset includes: > - page_owner_sort: userspace helper to sort the output of > /sys/kernel/debug/page_owner, which helps to know who allocates > the page from kernel context > - slabinfo: the tool which gets reports about slabs, for example > show empty slabs, modify of slab debug options at runtime, display > all information about a slabcache > - page-types: a handy tool for querying page flags > > Signed-off-by: Dmitry Rokosov > Signed-off-by: Alexey Romanov I've applied, after making a few changes: - don't depend on linux, already a patch dependency - don't set CC: default is based on CROSS_COMPILE - no need to fully recheck at install time - move the option for alphabetical ordering - fix check-package See below for a few more omments... > --- > package/linux-tools/Config.in | 18 +++++++++++ > package/linux-tools/linux-tool-mm.mk.in | 41 +++++++++++++++++++++++++ > 2 files changed, 59 insertions(+) > create mode 100644 package/linux-tools/linux-tool-mm.mk.in > > diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in > index 8a0b6d5802cc..ede966ec792d 100644 > --- a/package/linux-tools/Config.in > +++ b/package/linux-tools/Config.in > @@ -185,4 +185,22 @@ config BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON > > endif # BR2_PACKAGE_LINUX_TOOLS_HV > > +config BR2_PACKAGE_LINUX_TOOLS_MM > + bool "mm" > + select BR2_PACKAGE_LINUX_TOOLS > + help > + mm is a toolset for testing/monitoring/tracing vm/pages/slabs objects. > + > + - page_owner_sort: userspace helper to sort the output of > + /sys/kernel/debug/page_owner, which helps to know who allocates > + the page from kernel context > + > + - slabinfo: the tool which gets reports about slabs, for example > + show empty slabs, modify of slab debug options at runtime, display > + all information about a slabcache > + > + - page-types: a handy tool for querying page flags > + > + These tools are available only from kernel version 3.4. $ ./utils/docker-run make check-package package/linux-tools/Config.in:244: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/linux-tools/Config.in:247: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/linux-tools/Config.in:250: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/linux-tools/Config.in:251: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > endmenu > diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in > new file mode 100644 > index 000000000000..5431e0574b04 > --- /dev/null > +++ b/package/linux-tools/linux-tool-mm.mk.in > @@ -0,0 +1,41 @@ > +################################################################################ > +# > +# mm > +# > +################################################################################ > + > +LINUX_TOOLS += mm > + > +MM_DEPENDENCIES = linux No need to add an explicit dependency: the linux-tools micro-infra already handles it in a generic way; indeed, there is no reason for each individual linux-tool to add a dependency on linux: they all have that dependency. > +MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" No need to explicitly set CC: the kernel Makefile sets it based on CROSS_COMPILE already. > +define MM_BUILD_CMDS > + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > + MM_SUBDIR=vm; \ > + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ > + MM_SUBDIR=mm; \ > + else \ > + echo "Your kernel version is too old and does not have the mm tool." ; \ > + echo "At least kernel 3.4 must be used." ; \ > + exit 1 ; \ > + fi ; \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > + $(MM_MAKE_OPTS) $${MM_SUBDIR} > +endef > + > +define MM_INSTALL_TARGET_CMDS > + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > + MM_SUBDIR=vm; \ > + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ > + MM_SUBDIR=mm; \ > + else \ > + echo "Your kernel version is too old and does not have the mm tool." ; \ > + echo "At least kernel 3.4 must be used." ; \ > + exit 1 ; \ > + fi ; \ For install, we do need to know which directory to use, indeed, but we already do know one exists, as it was used at build, above; so we do not need the error case. I've simplified this part and added a comment to explain it. Applied to master with those changes, thanks. Regards, Yann E. MORIN. > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > + $(MM_MAKE_OPTS) \ > + INSTALL_ROOT=$(TARGET_DIR) \ > + DESTDIR=$(TARGET_DIR) \ > + $${MM_SUBDIR}_install > +endef > -- > 2.43.0 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Feb 7 08:58:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 09:58:20 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/docker-engine: bump version to v25.0.3 In-Reply-To: <20240207022157.2560531-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 18:21:56 -0800") References: <20240207022157.2560531-1-christian@aperture.us> Message-ID: <87ttmk1wib.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/moby/moby/releases/tag/v25.0.3 This is also a security bump. In fact, it would be nicer to first bump to 24.0.9 which could then be backported to 2023.02.x and 2023.11.x and then afterwards bump to 25.0.3. I see the buildkit issues are not fixed in 24.0.9, but I guess it is unlikely that we have Buildroot based systems BUILDING containers, so that is probably less critical. Care to rework it as two bumps? > Signed-off-by: Christian Stewart > --- > package/docker-engine/docker-engine.hash | 2 +- > package/docker-engine/docker-engine.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash > index 931d6529e1..40293be7e0 100644 > --- a/package/docker-engine/docker-engine.hash > +++ b/package/docker-engine/docker-engine.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 docker-engine-24.0.7.tar.gz > +sha256 4cdb516f5d6f5caf8b3bcf93c2962277ba727cfd2d1620176a3bb0cf153b3590 docker-engine-25.0.3.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk > index 262be2df20..066959e0c0 100644 > --- a/package/docker-engine/docker-engine.mk > +++ b/package/docker-engine/docker-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -DOCKER_ENGINE_VERSION = 24.0.7 > +DOCKER_ENGINE_VERSION = 25.0.3 > DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) > DOCKER_ENGINE_LICENSE = Apache-2.0 > -- > 2.43.0 -- Bye, Peter Korsgaard From neal.frager at amd.com Wed Feb 7 09:00:00 2024 From: neal.frager at amd.com (Frager, Neal) Date: Wed, 7 Feb 2024 09:00:00 +0000 Subject: [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware In-Reply-To: <20240131112223.2175855-6-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-6-neal.frager@amd.com> Message-ID: Hello everyone, Now that the toolchain-bare-metal-buildroot has been applied, do you have any feedback regarding the remainder of the patch set? One open question I have is regarding the patches for zynqmp-firmware and versal-firmware. These patches are no longer neeeded since being applied to release version xilinx_v2023.2. I kept them with the idea that users may still be using older versions of software, so the patches enable users to work with versions as old as 2022.2 for zynqmp and 2023.1 for versal. Do you agree with keeping the patches or do you think it is better not to include them and to say that support begins starting with version xilinx_v2023.2? What are your thoughts? > create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch > create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch Best regards, Neal Frager AMD From peter at korsgaard.com Wed Feb 7 09:01:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:01:53 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump version to v2.24.5 In-Reply-To: <20240207022245.2560726-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 18:22:45 -0800") References: <20240207022245.2560726-1-christian@aperture.us> Message-ID: <87plx81wce.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/docker/compose/releases/tag/v2.24.5 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:02:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:02:01 +0100 Subject: [Buildroot] [git commit] package/nerdctl: bump version to v1.7.3 Message-ID: <20240207090226.D2BED87500@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e37b73f7a2a6f4d2628c7d35f402557357a11101 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/containerd/nerdctl/releases/tag/v1.7.3 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index 1fb0649fb2..52e249824f 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 574438dd7c88e6a607c6f82932f8ada174b1133a66ee0fa0f7510e7c3bebacb4 nerdctl-1.3.1.tar.gz +sha256 fff8c348efa4ff6753e1aacded0dedddcb255c50b00d8b3a37a660b1fb1dd31a nerdctl-1.7.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index 43e862f7f9..66b22df646 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.3.1 +NERDCTL_VERSION = 1.7.3 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 From peter at korsgaard.com Wed Feb 7 09:02:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:02:02 +0100 Subject: [Buildroot] [git commit] package/docker-compose: bump version to v2.24.5 Message-ID: <20240207090226.E11FD874F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=457db5c328d777ada4c9c0d5ff3c84c189dea5e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/docker/compose/releases/tag/v2.24.5 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index afccafd994..92f7b227d3 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8a1109124e7dfef736ad3db0457d807eb41a0068211bd13e52051252cab28dda docker-compose-2.23.0.tar.gz +sha256 ed132bcc226261a595469f5ca6d4ea20b02965867216b56d4e7a5962efb46570 docker-compose-2.24.5.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 54557b9841..947f09d0b3 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.23.0 +DOCKER_COMPOSE_VERSION = 2.24.5 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 7 09:07:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:07:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: bump version to 2.13.1 In-Reply-To: <20240207063324.1003727-1-fido_max@inbox.ru> (Maxim Kochetkov via buildroot's message of "Wed, 7 Feb 2024 09:33:24 +0300") References: <20240207063324.1003727-1-fido_max@inbox.ru> Message-ID: <87le7w1w3s.fsf@48ers.dk> >>>>> "Maxim" == Maxim Kochetkov via buildroot writes: > Release notes: https://github.com/timescale/timescaledb/blob/2.13.1/CHANGELOG.md > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:03:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:03:24 +0100 Subject: [Buildroot] [git commit] package/timescaledb: bump version to 2.13.1 Message-ID: <20240207090723.649FF87505@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d2e694b95e4f1410ac5c76687db695401c5649c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/timescale/timescaledb/blob/2.13.1/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index b7e4c71774..8d0fc125d6 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 584a351c7775f0e067eaa0e7277ea88cab9077cc4c455cbbf09a5d9723dce95d timescaledb-2.13.0.tar.gz +sha256 ca4f48147cb1bf3bf22af9f643822a5931e12a89909cc73c4a89ddae3c828ac1 timescaledb-2.13.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 34a48ad0c3..a5d77eda80 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.13.0 +TIMESCALEDB_VERSION = 2.13.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Feb 7 09:07:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:07:51 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/linux-tools: multilib build supported In-Reply-To: <20240206192543.7179-3-ddrokosov@salutedevices.com> References: <20240206192543.7179-1-ddrokosov@salutedevices.com> <20240206192543.7179-3-ddrokosov@salutedevices.com> Message-ID: Dmitry, All, On 2024-02-06 22:25 +0300, Dmitry Rokosov spake thusly: > From: Konstantin Menyaev > > - LINUX_TOOLS_MAKE_OPTS option introduced: > allows to override CROSS_COMPILE param What is the rationale for this? How is it supposed to be used? CROSS_COMPILE is already part of LINUX_MAKE_FLAGS, so there is no reason to pass it explicitly either. Otherwise, I am not convinced anout the "multilib" title either, because Buildroot does not do multilib systems anyway, so I am missing the point of the patch... If you feel there really is a nedd, please resubmit with an extended commit log. Thanks! Regards, Yann E. MORIN. > Signed-off-by: Konstantin Menyaev > Signed-off-by: Dmitry Rokosov > --- > package/linux-tools/linux-tool-gpio.mk.in | 2 +- > package/linux-tools/linux-tool-iio.mk.in | 2 +- > package/linux-tools/linux-tool-mm.mk.in | 2 +- > package/linux-tools/linux-tool-pci.mk.in | 2 +- > package/linux-tools/linux-tool-perf.mk.in | 2 +- > package/linux-tools/linux-tool-selftests.mk.in | 2 +- > package/linux-tools/linux-tool-tmon.mk.in | 2 +- > package/linux-tools/linux-tools.mk | 2 ++ > 8 files changed, 9 insertions(+), 7 deletions(-) > > diff --git a/package/linux-tools/linux-tool-gpio.mk.in b/package/linux-tools/linux-tool-gpio.mk.in > index e825db1b1127..dcee11002e8c 100644 > --- a/package/linux-tools/linux-tool-gpio.mk.in > +++ b/package/linux-tools/linux-tool-gpio.mk.in > @@ -6,7 +6,7 @@ > > LINUX_TOOLS += gpio > > -GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > +GPIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > define GPIO_BUILD_CMDS > $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ > diff --git a/package/linux-tools/linux-tool-iio.mk.in b/package/linux-tools/linux-tool-iio.mk.in > index 27ab0ed7ed63..1372faafd1a8 100644 > --- a/package/linux-tools/linux-tool-iio.mk.in > +++ b/package/linux-tools/linux-tool-iio.mk.in > @@ -6,7 +6,7 @@ > > LINUX_TOOLS += iio > > -IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > +IIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > define IIO_BUILD_CMDS > $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ > diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in > index 5431e0574b04..51a54026dea4 100644 > --- a/package/linux-tools/linux-tool-mm.mk.in > +++ b/package/linux-tools/linux-tool-mm.mk.in > @@ -7,7 +7,7 @@ > LINUX_TOOLS += mm > > MM_DEPENDENCIES = linux > -MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" > +MM_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) CC="$(TARGET_CC)" > > define MM_BUILD_CMDS > $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in > index 17246f5d7ed2..48c3435a5c8a 100644 > --- a/package/linux-tools/linux-tool-pci.mk.in > +++ b/package/linux-tools/linux-tool-pci.mk.in > @@ -6,7 +6,7 @@ > > LINUX_TOOLS += pci > > -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > +PCI_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > define PCI_BUILD_CMDS > $(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \ > diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in > index ee308a85dfd1..38910cda7d75 100644 > --- a/package/linux-tools/linux-tool-perf.mk.in > +++ b/package/linux-tools/linux-tool-perf.mk.in > @@ -19,7 +19,7 @@ PERF_ARCH=$(NORMALIZED_ARCH) > endif > > PERF_MAKE_FLAGS = \ > - $(LINUX_MAKE_FLAGS) \ > + $(LINUX_TOOLS_MAKE_OPTS) \ > JOBS=$(PARALLEL_JOBS) \ > ARCH=$(PERF_ARCH) \ > DESTDIR=$(TARGET_DIR) \ > diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in > index e29c7f59debd..144dd6616f2b 100644 > --- a/package/linux-tools/linux-tool-selftests.mk.in > +++ b/package/linux-tools/linux-tool-selftests.mk.in > @@ -22,7 +22,7 @@ SELFTESTS_DEPENDENCIES = \ > $(if $(BR2_PACKAGE_OPENSSL),openssl) > > SELFTESTS_MAKE_FLAGS = \ > - $(LINUX_MAKE_FLAGS) \ > + $(LINUX_TOOLS_MAKE_OPTS) \ > ARCH=$(SELFTESTS_ARCH) > > # O must be redefined here to overwrite the one used by Buildroot for > diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in > index 56c328c51fd7..7c33915049c2 100644 > --- a/package/linux-tools/linux-tool-tmon.mk.in > +++ b/package/linux-tools/linux-tool-tmon.mk.in > @@ -7,7 +7,7 @@ > LINUX_TOOLS += tmon > > TMON_DEPENDENCIES = host-pkgconf ncurses > -TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ > +TMON_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) \ > CC=$(TARGET_CC) \ > LDFLAGS="$(TARGET_LDFLAGS)" \ > PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig > diff --git a/package/linux-tools/linux-tools.mk b/package/linux-tools/linux-tools.mk > index 81b1fbc17605..38bb2c83966a 100644 > --- a/package/linux-tools/linux-tools.mk > +++ b/package/linux-tools/linux-tools.mk > @@ -26,6 +26,8 @@ LINUX_TOOLS_PATCH_DEPENDENCIES = linux > # may install shared libraries and headers (e.g. cpupower). > LINUX_TOOLS_INSTALL_STAGING = YES > > +LINUX_TOOLS_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CROSS_COMPILE="$(TARGET_CROSS)" > + > LINUX_TOOLS_DEPENDENCIES += $(foreach tool,$(LINUX_TOOLS),\ > $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ > $($(call UPPERCASE,$(tool))_DEPENDENCIES))) > -- > 2.43.0 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Feb 7 09:08:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:08:39 +0100 Subject: [Buildroot] [PATCH 1/1] Fix alphabetical order of DEVELOPERS file entry In-Reply-To: <20240207070806.7331-2-kilian.zinnecker@mail.de> (Kilian Zinnecker via buildroot's message of "Wed, 7 Feb 2024 08:08:06 +0100") References: <20240207070806.7331-1-kilian.zinnecker@mail.de> <20240207070806.7331-2-kilian.zinnecker@mail.de> Message-ID: <87h6ik1w14.fsf@48ers.dk> >>>>> "Kilian" == Kilian Zinnecker via buildroot writes: > Signed-off-by: Kilian Zinnecker Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:08:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:08:28 +0100 Subject: [Buildroot] [git commit] Fix alphabetical order of DEVELOPERS file entry Message-ID: <20240207090857.B36D187509@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53fad3242d74b9fad11978429d6cc2879f783f4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Kilian Zinnecker Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 471c739678..7906a940a9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1887,9 +1887,9 @@ N: Kieran Bingham F: package/libcamera/ N: Kilian Zinnecker -F: package/rockchip-rkbin/ -F: configs/rock5b_defconfig F: board/radxa/rock5b/ +F: configs/rock5b_defconfig +F: package/rockchip-rkbin/ N: Klaus Heinrich Kiwi F: package/wqy-zenhei/ From thomas.petazzoni at bootlin.com Wed Feb 7 09:09:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 10:09:14 +0100 Subject: [Buildroot] [git commit] boot/arm-trusted-firmware: fix hash checking Message-ID: <20240207091027.96A568750E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de964d7b784442e598ea40accff364a661ad893e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c6ab9328e13c6c9a1538b4a33824525a990b623d ("boot/arm-trusted-firmware: change BR_NO_CHECK_HASH_FOR logic") was written too hastily, and is actually broken as it does the reverse of what it should do. It really should disable the check when we're using a custom version/git/tarball of TF-A, not the opposite. Thanks to Romain for pointing out the problem, and providing an IRL patch to solve the issue. Reported-by: Romain Naour Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 89cdf48c70..2d554c1da8 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -25,7 +25,7 @@ ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif endif -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE):$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y:y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) endif From romain.naour at smile.fr Wed Feb 7 09:21:10 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:21:10 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am64x_sk_defconfig: explicitly set the kernel version Message-ID: <20240207092111.236577-1-romain.naour@smile.fr> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the Linux kernel version, so do that now. When the defconfig was added, the default version was 6.4.x, so use version 6.4.16. Signed-off-by: Romain Naour --- configs/ti_am64x_sk_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 052c440093..b3e69e9e93 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,7 +1,10 @@ BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" -- 2.43.0 From romain.naour at smile.fr Wed Feb 7 09:21:11 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:21:11 +0100 Subject: [Buildroot] [PATCH 2/2] configs/ti_am64x_sk_defconfig: drop redundant defconfig choice In-Reply-To: <20240207092111.236577-1-romain.naour@smile.fr> References: <20240207092111.236577-1-romain.naour@smile.fr> Message-ID: <20240207092111.236577-2-romain.naour@smile.fr> The defconfig choice is the default one, so it is redundant and can be removed without effect. Signed-off-by: Romain Naour --- configs/ti_am64x_sk_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index b3e69e9e93..4bfd31f0c8 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -24,7 +24,6 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y -BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y -- 2.43.0 From romain.naour at smile.fr Wed Feb 7 09:19:23 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:19:23 +0100 Subject: [Buildroot] [git commit] configs/ti_am62x_sk_defconfig: explicitly set the kernel version Message-ID: <20240207092234.A448D87517@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b75fb9f5a51261843807779a99c6c383cdad95c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig) forgot to specify the Linux kernel version, so do that now. When the defconfig was added, the default version was 6.4.x, so use version 6.4.16. Signed-off-by: Dario Binacchi [Romain: use BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 as suggested by Giulio Benetti] Signed-off-by: Romain Naour --- configs/ti_am62x_sk_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index b98a68ff15..495b233789 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,7 +1,10 @@ BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" From romain.naour at smile.fr Wed Feb 7 09:19:25 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:19:25 +0100 Subject: [Buildroot] [git commit] configs/ti_am62x_sk_defconfig: drop redundant defconfig choice Message-ID: <20240207092234.B2BFB87518@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=694001df1ad6024b2a3f2748bb3712c782573087 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The defconfig choice is the default one, so it is redundant and can be removed without effect. Signed-off-by: Dario Binacchi Reviewed-by: Giulio Benetti Signed-off-by: Romain Naour --- configs/ti_am62x_sk_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 495b233789..f88252a89c 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -24,7 +24,6 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y -BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y From yann.morin.1998 at free.fr Wed Feb 7 09:24:10 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:24:10 +0100 Subject: [Buildroot] [PATCH] utils/genrandconfig: add default setting for bare-metal toolchain arch In-Reply-To: <20240207070541.2296330-1-thomas.petazzoni@bootlin.com> References: <20240207070541.2296330-1-thomas.petazzoni@bootlin.com> Message-ID: Thomas, All, On 2024-02-07 08:05 +0100, Thomas Petazzoni via buildroot spake thusly: > We recently added support for building a bare-metal toolchain, and the > autobuilders are therefore trying to build such toolchains. However, > by default the BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH option is > empty, causing the target tuple to be empty, and therefore > host-gcc-bare-metal tries to build a toolchain for the target > "x86_64-pc-linux-gnu", which isn't a bare-metal target, and fails > badly. > > In order to properly test this bare-metal support, this commit adjusts > the genrandconfig script so that it injects a valid target > architecture tuple. > > Fixes: > > http://autobuild.buildroot.net/results/6cb1514b19bfe056fb984d3538bdccdda5e174c1/ > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > utils/genrandconfig | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/utils/genrandconfig b/utils/genrandconfig > index 52edad06d8..eb1f8cbd4a 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -315,6 +315,10 @@ def fixup_config(sysinfo, configfile): > 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: > return False > > + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y' in configlines: > + configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""') > + configlines.add('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"') > + > if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ > 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: > return False > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Wed Feb 7 09:24:46 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:24:46 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am62x_sk_defconfig: explicitly set the kernel version In-Reply-To: <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> References: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> Message-ID: <56e14939-d7e3-4cc4-87f1-90c4e3decac1@smile.fr> Hello Dario, All, Le 05/02/2024 ? 16:13, Giulio Benetti a ?crit?: > Hi Dario, > > On 23/11/23 14:40, Dario Binacchi wrote: >> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig) forgot to >> specify the Linux kernel version, so do that now. >> >> When the defconfig was added, the default version was 6.4.x, so use >> version 6.4.16. >> >> Signed-off-by: Dario Binacchi > --- >> ? configs/ti_am62x_sk_defconfig | 3 +++ >> ? 1 file changed, 3 insertions(+) >> >> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >> index b98a68ff153f..6610e6fcf890 100644 >> --- a/configs/ti_am62x_sk_defconfig >> +++ b/configs/ti_am62x_sk_defconfig >> @@ -1,7 +1,10 @@ >> ? BR2_aarch64=y >> +BR2_KERNEL_HEADERS_6_4=y > > here ^^^ you need to specify BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 > and not the line above, > >> ? BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> ? BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" >> ? BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" >> ? BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >> ? BR2_LINUX_KERNEL_DTS_SUPPORT=y >> ? BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > > Can you please correct and send V2? I fixed the kernel header symbol before pushing. Both patches applied to master, thanks. Best regards, Romain > > Thank you! > > Best regards From dario.binacchi at amarulasolutions.com Wed Feb 7 09:24:45 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 10:24:45 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/davinci-bootcount: update GitHub URL Message-ID: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> The patch updates the GitHub URL, which has recently changed. Signed-off-by: Dario Binacchi --- (no changes since v2) package/davinci-bootcount/Config.in | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/davinci-bootcount/Config.in b/package/davinci-bootcount/Config.in index e34adde570af..0201530f9166 100644 --- a/package/davinci-bootcount/Config.in +++ b/package/davinci-bootcount/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_DAVINCI_BOOTCOUNT SCRATCH2 register. This tool allows to read and write this register from userspace. - https://github.com/VoltServer/uboot-davinci-bootcount + https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 695d39688ac6..884bf420f396 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -5,7 +5,7 @@ ################################################################################ DAVINCI_BOOTCOUNT_VERSION = 2.0.0 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING -- 2.43.0 From dario.binacchi at amarulasolutions.com Wed Feb 7 09:24:46 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 10:24:46 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/davinci-bootcount: rename to uboot-bootcount In-Reply-To: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> References: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207092447.2094160-2-dario.binacchi@amarulasolutions.com> Born as a project to read/write the bootcount on the TI am3xx platform, over time it has introduced bootcount management on EEPROM and for the stm32mp1 platform. As a result, the project removed the 'davinci' tag from its name and GitHub link. The patch aligns the package name in Buildroot with the current one on GitHub. Signed-off-by: Dario Binacchi --- Config.in.legacy | 6 ++++++ DEVELOPERS | 2 +- package/Config.in | 2 +- package/davinci-bootcount/Config.in | 11 ----------- package/davinci-bootcount/davinci-bootcount.mk | 15 --------------- package/uboot-bootcount/Config.in | 10 ++++++++++ .../uboot-bootcount.hash} | 2 +- package/uboot-bootcount/uboot-bootcount.mk | 15 +++++++++++++++ 8 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 package/davinci-bootcount/Config.in delete mode 100644 package/davinci-bootcount/davinci-bootcount.mk create mode 100644 package/uboot-bootcount/Config.in rename package/{davinci-bootcount/davinci-bootcount.hash => uboot-bootcount/uboot-bootcount.hash} (80%) create mode 100644 package/uboot-bootcount/uboot-bootcount.mk diff --git a/Config.in.legacy b/Config.in.legacy index 5fbe5d903074..cf32f887d4b0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_DAVINCI_BOOTCOUNT + bool "davinci-bootcount has been renamed" + select BR2_LEGACY + help + The davinci-bootcount package has been renamed. + config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7906a940a9b2..43dd5c8cb49d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -760,7 +760,7 @@ F: package/sscep/ F: package/uuu/ N: Dario Binacchi -F: package/davinci-bootcount/ +F: package/uboot-bootcount/ F: package/libmnl/ N: David Bachelart diff --git a/package/Config.in b/package/Config.in index 24e5f04ed671..4c6deb13337c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -486,7 +486,6 @@ endmenu source "package/cwiid/Config.in" source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" - source "package/davinci-bootcount/Config.in" source "package/dbus/Config.in" source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" @@ -638,6 +637,7 @@ endmenu source "package/ti-utils/Config.in" source "package/tio/Config.in" source "package/triggerhappy/Config.in" + source "package/uboot-bootcount/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" source "package/udev/Config.in" diff --git a/package/davinci-bootcount/Config.in b/package/davinci-bootcount/Config.in deleted file mode 100644 index 0201530f9166..000000000000 --- a/package/davinci-bootcount/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_DAVINCI_BOOTCOUNT - bool "davinci-bootcount" - depends on BR2_arm # only relevant for TI am335x - help - U-Boot implements a boot count scheme that can be used to - detect multiple failed attempts to boot Linux. On Davinci - platform (TI AM 335x) the `bootcount' is stored in the RTC - SCRATCH2 register. This tool allows to read and write this - register from userspace. - - https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk deleted file mode 100644 index 884bf420f396..000000000000 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# davinci-bootcount -# -################################################################################ - -DAVINCI_BOOTCOUNT_VERSION = 2.0.0 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) -DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 -DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING - -# sources fetched from github, no configure script -DAVINCI_BOOTCOUNT_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package/uboot-bootcount/Config.in b/package/uboot-bootcount/Config.in new file mode 100644 index 000000000000..53a0bd9174a4 --- /dev/null +++ b/package/uboot-bootcount/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_UBOOT_BOOTCOUNT + bool "uboot-bootcount" + default y if BR2_PACKAGE_DAVINCI_BOOTCOUNT # legacy + help + U-Boot implements a boot count scheme that can be used to + detect multiple failed attempts to boot Linux. This tool + allows to read and write bootcount from userspace for some + platforms (TI AM335X or STM32MP1) or from I2C EEPROM. + + https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash similarity index 80% rename from package/davinci-bootcount/davinci-bootcount.hash rename to package/uboot-bootcount/uboot-bootcount.hash index 53435b1d1d6d..e1ebc442357e 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/uboot-bootcount/uboot-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-2.0.0.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e uboot-bootcount-2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk new file mode 100644 index 000000000000..07b52ab89eb5 --- /dev/null +++ b/package/uboot-bootcount/uboot-bootcount.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# uboot-bootcount +# +################################################################################ + +UBOOT_BOOTCOUNT_VERSION = 2.0.0 +UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION)) +UBOOT_BOOTCOUNT_LICENSE = GPL-3.0 +UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING + +# sources fetched from github, no configure script +UBOOT_BOOTCOUNT_AUTORECONF = YES + +$(eval $(autotools-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Wed Feb 7 09:24:47 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 10:24:47 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/uboot-bootcount: bump to version 3.0.0 In-Reply-To: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> References: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207092447.2094160-3-dario.binacchi@amarulasolutions.com> - Support for i.MX 8M chipsets - README: updated documentation and source comments Release notes: https://github.com/VoltServer/uboot-bootcount/releases/tag/v3.0.0 Signed-off-by: Dario Binacchi --- Changes in v3: - The patch has been added to the series because a new version has been released in the meantime. package/uboot-bootcount/uboot-bootcount.hash | 2 +- package/uboot-bootcount/uboot-bootcount.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uboot-bootcount/uboot-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash index e1ebc442357e..7f46da22ebe0 100644 --- a/package/uboot-bootcount/uboot-bootcount.hash +++ b/package/uboot-bootcount/uboot-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e uboot-bootcount-2.0.0.tar.gz +sha256 b26b9135716afb2ea967edc2327d1d307cdd15a643bd105dc223d062e18f2dda uboot-bootcount-3.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk index 07b52ab89eb5..48a45b91aae0 100644 --- a/package/uboot-bootcount/uboot-bootcount.mk +++ b/package/uboot-bootcount/uboot-bootcount.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_BOOTCOUNT_VERSION = 2.0.0 +UBOOT_BOOTCOUNT_VERSION = 3.0.0 UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION)) UBOOT_BOOTCOUNT_LICENSE = GPL-3.0 UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING -- 2.43.0 From yann.morin.1998 at free.fr Wed Feb 7 09:23:48 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:23:48 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: add default setting for bare-metal toolchain arch Message-ID: <20240207093130.758A88751C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7232c51dd402afb361d7c310855e0bf5666958d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We recently added support for building a bare-metal toolchain, and the autobuilders are therefore trying to build such toolchains. However, by default the BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH option is empty, causing the target tuple to be empty, and therefore host-gcc-bare-metal tries to build a toolchain for the target "x86_64-pc-linux-gnu", which isn't a bare-metal target, and fails badly. In order to properly test this bare-metal support, this commit adjusts the genrandconfig script so that it injects a valid target architecture tuple. Fixes: http://autobuild.buildroot.net/results/6cb1514b19bfe056fb984d3538bdccdda5e174c1/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 52edad06d8..eb1f8cbd4a 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -315,6 +315,10 @@ def fixup_config(sysinfo, configfile): 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: return False + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y' in configlines: + configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""') + configlines.add('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"') + if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: return False From peter at korsgaard.com Wed Feb 7 09:35:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:35:37 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/davinci-bootcount: update GitHub URL In-Reply-To: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> (Dario Binacchi's message of "Wed, 7 Feb 2024 10:24:45 +0100") References: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> Message-ID: <87a5oc1us6.fsf@48ers.dk> >>>>> "Dario" == Dario Binacchi writes: > The patch updates the GitHub URL, which has recently changed. > Signed-off-by: Dario Binacchi > --- > (no changes since v2) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:37:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:37:23 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/davinci-bootcount: rename to uboot-bootcount In-Reply-To: <20240207092447.2094160-2-dario.binacchi@amarulasolutions.com> (Dario Binacchi's message of "Wed, 7 Feb 2024 10:24:46 +0100") References: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> <20240207092447.2094160-2-dario.binacchi@amarulasolutions.com> Message-ID: <875xz01up8.fsf@48ers.dk> >>>>> "Dario" == Dario Binacchi writes: > Born as a project to read/write the bootcount on the TI am3xx platform, > over time it has introduced bootcount management on EEPROM and for the > stm32mp1 platform. As a result, the project removed the 'davinci' tag > from its name and GitHub link. > The patch aligns the package name in Buildroot with the current one on > GitHub. > Signed-off-by: Dario Binacchi > --- > Config.in.legacy | 6 ++++++ > DEVELOPERS | 2 +- > package/Config.in | 2 +- > package/davinci-bootcount/Config.in | 11 ----------- > package/davinci-bootcount/davinci-bootcount.mk | 15 --------------- > package/uboot-bootcount/Config.in | 10 ++++++++++ > .../uboot-bootcount.hash} | 2 +- > package/uboot-bootcount/uboot-bootcount.mk | 15 +++++++++++++++ > 8 files changed, 34 insertions(+), 29 deletions(-) > delete mode 100644 package/davinci-bootcount/Config.in > delete mode 100644 package/davinci-bootcount/davinci-bootcount.mk > create mode 100644 package/uboot-bootcount/Config.in > rename package/{davinci-bootcount/davinci-bootcount.hash => > uboot-bootcount/uboot-bootcount.hash} (80%) > create mode 100644 package/uboot-bootcount/uboot-bootcount.mk > diff --git a/Config.in.legacy b/Config.in.legacy > index 5fbe5d903074..cf32f887d4b0 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,12 @@ endif > comment "Legacy options removed in 2024.02" > +config BR2_PACKAGE_DAVINCI_BOOTCOUNT > + bool "davinci-bootcount has been renamed" > + select BR2_LEGACY We normally add the legacy handling here, so I've added select BR2_PACKAGE_UBOOT_BOOTCOUNT (and dropped it from the package). > + help > + The davinci-bootcount package has been renamed. And extended this to mention the new name. Committed with these changes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:38:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:38:57 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/uboot-bootcount: bump to version 3.0.0 In-Reply-To: <20240207092447.2094160-3-dario.binacchi@amarulasolutions.com> (Dario Binacchi's message of "Wed, 7 Feb 2024 10:24:47 +0100") References: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> <20240207092447.2094160-3-dario.binacchi@amarulasolutions.com> Message-ID: <871q9o1umm.fsf@48ers.dk> >>>>> "Dario" == Dario Binacchi writes: > - Support for i.MX 8M chipsets > - README: updated documentation and source comments > Release notes: > https://github.com/VoltServer/uboot-bootcount/releases/tag/v3.0.0 > Signed-off-by: Dario Binacchi > --- > Changes in v3: > - The patch has been added to the series because a new version has been > released in the meantime. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:39:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:39:10 +0100 Subject: [Buildroot] [git commit] package/uboot-bootcount: bump to version 3.0.0 Message-ID: <20240207093924.4C0F687535@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f8035296fe603c2457821c022d5c0f14b46d819 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Support for i.MX 8M chipsets - README: updated documentation and source comments Release notes: https://github.com/VoltServer/uboot-bootcount/releases/tag/v3.0.0 Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard --- package/uboot-bootcount/uboot-bootcount.hash | 2 +- package/uboot-bootcount/uboot-bootcount.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uboot-bootcount/uboot-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash index e1ebc44235..7f46da22eb 100644 --- a/package/uboot-bootcount/uboot-bootcount.hash +++ b/package/uboot-bootcount/uboot-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e uboot-bootcount-2.0.0.tar.gz +sha256 b26b9135716afb2ea967edc2327d1d307cdd15a643bd105dc223d062e18f2dda uboot-bootcount-3.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk index 07b52ab89e..48a45b91aa 100644 --- a/package/uboot-bootcount/uboot-bootcount.mk +++ b/package/uboot-bootcount/uboot-bootcount.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_BOOTCOUNT_VERSION = 2.0.0 +UBOOT_BOOTCOUNT_VERSION = 3.0.0 UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION)) UBOOT_BOOTCOUNT_LICENSE = GPL-3.0 UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 7 09:39:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:39:08 +0100 Subject: [Buildroot] [git commit] package/davinci-bootcount: update GitHub URL Message-ID: <20240207093924.2AAE787532@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f443c7236d42c21f676cfb2cd3c8deea2423a3c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The patch updates the GitHub URL, which has recently changed. Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard --- package/davinci-bootcount/Config.in | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/davinci-bootcount/Config.in b/package/davinci-bootcount/Config.in index e34adde570..0201530f91 100644 --- a/package/davinci-bootcount/Config.in +++ b/package/davinci-bootcount/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_DAVINCI_BOOTCOUNT SCRATCH2 register. This tool allows to read and write this register from userspace. - https://github.com/VoltServer/uboot-davinci-bootcount + https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 695d39688a..884bf420f3 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -5,7 +5,7 @@ ################################################################################ DAVINCI_BOOTCOUNT_VERSION = 2.0.0 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 7 09:39:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:39:09 +0100 Subject: [Buildroot] [git commit] package/davinci-bootcount: rename to uboot-bootcount Message-ID: <20240207093924.3DC5F8751B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=678cf889ec2551a0a523dbf67cf08d8880cc0aa7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Born as a project to read/write the bootcount on the TI am3xx platform, over time it has introduced bootcount management on EEPROM and for the stm32mp1 platform. As a result, the project removed the 'davinci' tag from its name and GitHub link. The patch aligns the package name in Buildroot with the current one on GitHub. Signed-off-by: Dario Binacchi [Peter: extend/rework legacy handling] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 2 +- package/Config.in | 2 +- package/davinci-bootcount/Config.in | 11 ----------- package/davinci-bootcount/davinci-bootcount.mk | 15 --------------- package/uboot-bootcount/Config.in | 9 +++++++++ .../uboot-bootcount.hash} | 2 +- package/uboot-bootcount/uboot-bootcount.mk | 15 +++++++++++++++ 8 files changed, 35 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5fbe5d9030..5e0db855cc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_DAVINCI_BOOTCOUNT + bool "davinci-bootcount has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_UBOOT_BOOTCOUNT + help + The davinci-bootcount package has been renamed to + uboot-bootcount. + config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7906a940a9..43dd5c8cb4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -760,7 +760,7 @@ F: package/sscep/ F: package/uuu/ N: Dario Binacchi -F: package/davinci-bootcount/ +F: package/uboot-bootcount/ F: package/libmnl/ N: David Bachelart diff --git a/package/Config.in b/package/Config.in index 24e5f04ed6..4c6deb1333 100644 --- a/package/Config.in +++ b/package/Config.in @@ -486,7 +486,6 @@ endmenu source "package/cwiid/Config.in" source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" - source "package/davinci-bootcount/Config.in" source "package/dbus/Config.in" source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" @@ -638,6 +637,7 @@ endmenu source "package/ti-utils/Config.in" source "package/tio/Config.in" source "package/triggerhappy/Config.in" + source "package/uboot-bootcount/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" source "package/udev/Config.in" diff --git a/package/davinci-bootcount/Config.in b/package/davinci-bootcount/Config.in deleted file mode 100644 index 0201530f91..0000000000 --- a/package/davinci-bootcount/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_DAVINCI_BOOTCOUNT - bool "davinci-bootcount" - depends on BR2_arm # only relevant for TI am335x - help - U-Boot implements a boot count scheme that can be used to - detect multiple failed attempts to boot Linux. On Davinci - platform (TI AM 335x) the `bootcount' is stored in the RTC - SCRATCH2 register. This tool allows to read and write this - register from userspace. - - https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk deleted file mode 100644 index 884bf420f3..0000000000 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# davinci-bootcount -# -################################################################################ - -DAVINCI_BOOTCOUNT_VERSION = 2.0.0 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) -DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 -DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING - -# sources fetched from github, no configure script -DAVINCI_BOOTCOUNT_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package/uboot-bootcount/Config.in b/package/uboot-bootcount/Config.in new file mode 100644 index 0000000000..ae936b424a --- /dev/null +++ b/package/uboot-bootcount/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_UBOOT_BOOTCOUNT + bool "uboot-bootcount" + help + U-Boot implements a boot count scheme that can be used to + detect multiple failed attempts to boot Linux. This tool + allows to read and write bootcount from userspace for some + platforms (TI AM335X or STM32MP1) or from I2C EEPROM. + + https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash similarity index 80% rename from package/davinci-bootcount/davinci-bootcount.hash rename to package/uboot-bootcount/uboot-bootcount.hash index 53435b1d1d..e1ebc44235 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/uboot-bootcount/uboot-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-2.0.0.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e uboot-bootcount-2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk new file mode 100644 index 0000000000..07b52ab89e --- /dev/null +++ b/package/uboot-bootcount/uboot-bootcount.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# uboot-bootcount +# +################################################################################ + +UBOOT_BOOTCOUNT_VERSION = 2.0.0 +UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION)) +UBOOT_BOOTCOUNT_LICENSE = GPL-3.0 +UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING + +# sources fetched from github, no configure script +UBOOT_BOOTCOUNT_AUTORECONF = YES + +$(eval $(autotools-package)) From yann.morin.1998 at free.fr Wed Feb 7 09:39:42 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:39:42 +0100 Subject: [Buildroot] [git commit] package/tinyxml2: add host variant Message-ID: <20240207094101.70AE68753D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a572abf8a552b42f3107a05871255f44d77f217 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It is required by package uuu starting from version 1.5.165. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/tinyxml2/tinyxml2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index 5ea9e13a4b..f53e8d6b99 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -16,3 +16,4 @@ TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON endif $(eval $(cmake-package)) +$(eval $(host-cmake-package)) From yann.morin.1998 at free.fr Wed Feb 7 09:39:43 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:39:43 +0100 Subject: [Buildroot] [git commit] package/uuu: bump to version 1.5.165 Message-ID: <20240207094101.7B2D48753F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b13cc2c264d20698d7f48a4bbbbdffc0698b06f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It requires the host-tinyxml2 package. The hash of README.md has changed because a reference to the tinyxml2 license has been added: + - tinyxml (zlib license) is from https://github.com/leethomason/tinyxml2 Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.163 https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.165 Signed-off-by: Dario Binacchi [yann.morin.1998 at free.fr: - split long dependency line - reorder dependencies alphabetically ] Signed-off-by: Yann E. MORIN --- package/uuu/uuu.hash | 4 ++-- package/uuu/uuu.mk | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index 20816b5081..c231d5d729 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 6972c7a1e76d60a22212913a8867b737104410c2a47ad88c8af460bd4885ec09 uuu_source-uuu_1.5.141.tar.gz +sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE -sha256 2d872c6e5aaea15ec1932bfb378fb62e24ee7ec399fe7f998f03d9b728215335 README.md +sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 93c748ee46..80d5e1937a 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,11 +4,17 @@ # ################################################################################ -UUU_VERSION = 1.5.141 +UUU_VERSION = 1.5.165 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License UUU_LICENSE_FILES = LICENSE README.md -HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd +HOST_UUU_DEPENDENCIES = \ + host-bzip2 \ + host-libusb \ + host-openssl \ + host-tinyxml2 \ + host-zlib \ + host-zstd $(eval $(host-cmake-package)) From yann.morin.1998 at free.fr Wed Feb 7 09:41:11 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:41:11 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinyxml2: add host variant In-Reply-To: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> References: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> Message-ID: Dario, All, On 2024-02-06 18:53 +0100, Dario Binacchi spake thusly: > It is required by package uuu starting from version 1.5.165. > > Signed-off-by: Dario Binacchi Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/tinyxml2/tinyxml2.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk > index 5ea9e13a4b0b..f53e8d6b9926 100644 > --- a/package/tinyxml2/tinyxml2.mk > +++ b/package/tinyxml2/tinyxml2.mk > @@ -16,3 +16,4 @@ TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON > endif > > $(eval $(cmake-package)) > +$(eval $(host-cmake-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Wed Feb 7 09:52:31 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:52:31 +0100 Subject: [Buildroot] [PATCH v3 01/11] boot/ti-k3-core-secdev: new package In-Reply-To: <20231218081958.506691-2-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-2-dario.binacchi@amarulasolutions.com> Message-ID: <51c20d9b-e85b-4ae1-a4e2-fa6c8741be3c@smile.fr> Hello Dario, All, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > This is a security development package containing tools for > High-Security(HS) TI K3 platform devices. > > Signed-off-by: Dario Binacchi > --- > DEVELOPERS | 1 + > boot/Config.in | 1 + > boot/ti-k3-core-secdev/Config.in | 9 +++++++++ > boot/ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 +++ > boot/ti-k3-core-secdev/ti-k3-core-secdev.mk | 19 +++++++++++++++++++ > 5 files changed, 33 insertions(+) > create mode 100644 boot/ti-k3-core-secdev/Config.in > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 311dcd950481..60a95434c70f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -754,6 +754,7 @@ F: package/xinetd/ > N: Dario Binacchi > F: board/bsh/ > F: board/stmicroelectronics/stm32f769-disco/ > +F: boot/ti-k3-core-secdev/ > F: configs/imx8mn_bsh_smm_s2_defconfig > F: configs/imx8mn_bsh_smm_s2_pro_defconfig > F: configs/stm32f769_disco_sd_defconfig > diff --git a/boot/Config.in b/boot/Config.in > index e5fdf7ad439e..18a7d268f95a 100644 > --- a/boot/Config.in > +++ b/boot/Config.in > @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" > source "boot/shim/Config.in" > source "boot/syslinux/Config.in" > source "boot/ti-k3-boot-firmware/Config.in" > +source "boot/ti-k3-core-secdev/Config.in" > source "boot/ti-k3-image-gen/Config.in" > source "boot/ti-k3-r5-loader/Config.in" > source "boot/uboot/Config.in" > diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in > new file mode 100644 > index 000000000000..1749b7ab5fd9 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/Config.in > @@ -0,0 +1,9 @@ > +config BR2_TARGET_TI_K3_CORE_SECDEV > + bool "ti-k3-core-secdev" > + depends on BR2_aarch64 > + help > + This package downloads and installs development tools for > + High-Security(HS) TI K3 platforms (which include AM62x, > + AM64x, AM65x and more). > + > + https://git.ti.com/cgit/security-development-tools/core-secdev-k3/ Remove the trailing '/' at the end of the url. > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > new file mode 100644 > index 000000000000..0460cff6c59f > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06 core-secdev-k3-08.06.00.007.tar.xz > +sha256 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369 k3-secdev-0.2-manifest.html > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > new file mode 100644 > index 000000000000..0127e6503d4d > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > @@ -0,0 +1,19 @@ > +################################################################################ > +# > +# ti-k3-core-secdev > +# > +################################################################################ > + > +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 > +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot > +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz > +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES > +TI_K3_CORE_SECDEV_LICENSE = TI Text File, Apache-2.0 What's the meaning of "TI Text File"? meta-ti's ti-k3-secdev package use BSD-3-Clause as license: https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb?h=kirkstone#n4 Can you verify the license? > +TI_K3_CORE_SECDEV_LICENSE_FILES = k3-secdev-0.2-manifest.html legal-info doesn't work since this file is under "manifest" directory. > + > +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS > + cp -dpfr $(@D)/keys $(BINARIES_DIR)/ > + cp -dpfr $(@D)/scripts $(BINARIES_DIR)/ > +endef I would suggest to create a sub-directory under $(BINARIES_DIR) to avoid any file conflict. Best regards, Romain > + > +$(eval $(generic-package)) From yann.morin.1998 at free.fr Wed Feb 7 09:56:10 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:56:10 +0100 Subject: [Buildroot] [PATCH 2/2] package/uuu: bump to version 1.5.165 In-Reply-To: <20240206175330.570115-2-dario.binacchi@amarulasolutions.com> References: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> <20240206175330.570115-2-dario.binacchi@amarulasolutions.com> Message-ID: Dario, All, On 2024-02-06 18:53 +0100, Dario Binacchi spake thusly: > It requires the host-tinyxml2 package. > > The hash of README.md has changed because a reference to the tinyxml2 > license has been added: > > + - tinyxml (zlib license) is from https://github.com/leethomason/tinyxml2 Thanks for explaining the hash change. :-) I wonder if it really makes sense to keep using the README file as a license file in Buildroot. Indeed, the licensing terms are for third-party libraries uuu links to, and even though they are bundled in the source tree of uuu|mfgtools, they are not used by Buildroot as we use the ones we build. Thoughts? > Release notes: > https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.163 > https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.165 > > Signed-off-by: Dario Binacchi Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/uuu/uuu.hash | 4 ++-- > package/uuu/uuu.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash > index 20816b5081db..c231d5d729f0 100644 > --- a/package/uuu/uuu.hash > +++ b/package/uuu/uuu.hash > @@ -1,4 +1,4 @@ > # locally computed > -sha256 6972c7a1e76d60a22212913a8867b737104410c2a47ad88c8af460bd4885ec09 uuu_source-uuu_1.5.141.tar.gz > +sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz > sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE > -sha256 2d872c6e5aaea15ec1932bfb378fb62e24ee7ec399fe7f998f03d9b728215335 README.md > +sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md > diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk > index 93c748ee46d8..d1bae61f528e 100644 > --- a/package/uuu/uuu.mk > +++ b/package/uuu/uuu.mk > @@ -4,11 +4,11 @@ > # > ################################################################################ > > -UUU_VERSION = 1.5.141 > +UUU_VERSION = 1.5.165 > UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz > UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) > UUU_LICENSE = BSD 3-Clause "New" or "Revised" License > UUU_LICENSE_FILES = LICENSE README.md > -HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd > +HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd host-tinyxml2 > > $(eval $(host-cmake-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From buildroot at bubu1.eu Wed Feb 7 09:58:48 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 10:58:48 +0100 Subject: [Buildroot] [PATCH] package/python3: add option to disable ensurepip In-Reply-To: <20240206225928.2290100-1-thomas.petazzoni@bootlin.com> References: <20240206225928.2290100-1-thomas.petazzoni@bootlin.com> Message-ID: Hi Thomas, On 06.02.24 23:59, Thomas Petazzoni via buildroot wrote: > This module takes 2.1 MB and is not needed in most Python > installations. > > Reported-by: Marcus Hoffmann > Signed-off-by: Thomas Petazzoni Thanks a lot for this patch after my suggestion! Patch looks good, but given the unfortunate "non-cooperative upstream", I still wonder if this wouldn't be easier to maintain if we just remove the installed module after the fact with a post install hook? I suppose a similar thing could be done for the other optional modules as well with the new py_cv_module_XYZ, which disables the native part but still requires patching makefile/configure.ac for not installing the python lib part. Both approaches work and get us to the same end result, so it's not too important to worry about, I guess :). Reviewed-by: Marcus Hoffmann > --- > ...-add-disable-ensurepip-module-option.patch | 68 +++++++++++++++++++ > package/python3/Config.in | 5 ++ > package/python3/python3.mk | 6 ++ > 3 files changed, 79 insertions(+) > create mode 100644 package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch > > diff --git a/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch b/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch > new file mode 100644 > index 0000000000..2761236c9b > --- /dev/null > +++ b/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch > @@ -0,0 +1,68 @@ > +From 10b67aeb6a6be10218c3dd675d3e54874ced1a55 Mon Sep 17 00:00:00 2001 > +From: Thomas Petazzoni > +Date: Tue, 6 Feb 2024 23:49:32 +0100 > +Subject: [PATCH] configure.ac: add --disable-ensurepip-module option > + > +The ensurepip module weights 2.1 MB and is only needed if you need > +"support for bootstrapping the pip installer into an existing Python > +installation or virtual environment" [1]. > + > +This patch adds a --disable-ensurepip-module option that allows to not > +install it. It should not be confused with --without-ensurepip, which > +already exists, but even with --without-ensurepip, the ensurepip > +module gets installed, but not used during the build to bootstrap the > +pip installer. > + > +[1] https://docs.python.org/3/library/ensurepip.html > + > +Upstream: non-cooperative upstream > +Signed-off-by: Thomas Petazzoni > +--- > + Makefile.pre.in | 5 ++++- > + configure.ac | 7 +++++++ > + 2 files changed, 11 insertions(+), 1 deletion(-) > + > +diff --git a/Makefile.pre.in b/Makefile.pre.in > +index d9fae62aa9c..3a8e6200891 100644 > +--- a/Makefile.pre.in > ++++ b/Makefile.pre.in > +@@ -2096,7 +2096,6 @@ LIBSUBDIRS= asyncio \ > + dbm \ > + email email/mime \ > + encodings \ > +- ensurepip ensurepip/_bundled \ > + html \ > + http \ > + importlib importlib/resources importlib/metadata \ > +@@ -2274,6 +2273,10 @@ ifeq (@EXPAT@,yes) > + LIBSUBDIRS += $(XMLLIBSUBDIRS) > + endif > + > ++ifeq (@ENSUREPIP_MODULE@,yes) > ++LIBSUBDIRS += ensurepip ensurepip/_bundled > ++endif > ++ > + TEST_MODULES=@TEST_MODULES@ > + > + .PHONY: libinstall > +diff --git a/configure.ac b/configure.ac > +index 06df165ccc8..5774297b9da 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -6944,6 +6944,13 @@ AS_CASE([$with_ensurepip], > + AC_MSG_RESULT([$ENSUREPIP]) > + AC_SUBST([ENSUREPIP]) > + > ++AC_ARG_ENABLE([ensurepip-module], > ++ AS_HELP_STRING([--disable-ensurepip-module], [disable ensurepip module installation]), > ++ [ENSUREPIP_MODULE="${enableval}"], > ++ [ENSUREPIP_MODULE="yes"]) > ++AS_IF([test "${ENSUREPIP}" != "no"], [ENSUREPIP_MODULE="yes"]) > ++AC_SUBST([ENSUREPIP_MODULE]) > ++ > + # check if the dirent structure of a d_type field and DT_UNKNOWN is defined > + AC_CACHE_CHECK([if the dirent structure of a d_type field], [ac_cv_dirent_d_type], [ > + AC_LINK_IFELSE( > +-- > +2.43.0 > + > diff --git a/package/python3/Config.in b/package/python3/Config.in > index 38f0580aa4..a398a1d7dd 100644 > --- a/package/python3/Config.in > +++ b/package/python3/Config.in > @@ -75,6 +75,11 @@ config BR2_PACKAGE_PYTHON3_DECIMAL > help > decimal module for Python3. > > +config BR2_PACKAGE_PYTHON3_ENSUREPIP > + bool "ensurepip module" > + help > + ensurepip module for Python3. > + > config BR2_PACKAGE_PYTHON3_OSSAUDIODEV > bool "ossaudiodev module" > help > diff --git a/package/python3/python3.mk b/package/python3/python3.mk > index 42765abcf4..8685ca238d 100644 > --- a/package/python3/python3.mk > +++ b/package/python3/python3.mk > @@ -107,6 +107,12 @@ else > PYTHON3_CONF_ENV += py_cv_module__decimal=n/a > endif > > +ifeq ($(BR2_PACKAGE_PYTHON3_ENSUREPIP),y) > +PYTHON3_CONF_OPTS += --enable-ensurepip-module > +else > +PYTHON3_CONF_OPTS += --disable-ensurepip-module > +endif > + > ifeq ($(BR2_PACKAGE_PYTHON3_PYEXPAT),y) > PYTHON3_DEPENDENCIES += expat > PYTHON3_CONF_OPTS += --with-expat=system From buildroot at bubu1.eu Wed Feb 7 10:01:36 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 11:01:36 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/python-bitstring: add missing runtime dependency In-Reply-To: <20240207084503.11109-2-romain.naour@smile.fr> References: <20240207084503.11109-1-romain.naour@smile.fr> <20240207084503.11109-2-romain.naour@smile.fr> Message-ID: <0662d5f1-1582-480a-a10f-f714586cf546@bubu1.eu> On 07.02.24 09:45, Romain Naour wrote: > python-bitstring require python-bitarray and python-zlib at runtime > since 4.1.0 release [1][2]. > > python-zlib is now needed for the "Experimental support for two 8-bit > float types" [2]. > > Fixes: > https://gitlab.com/kubu93/buildroot/-/jobs/6114047821 > > [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 > [2] https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 > > Signed-off-by: Romain Naour > Cc: James Hilliard Reviewed-by: Marcus Hoffmann > --- > v2: fix commit log about python-bitstring release (Marcus Hoffmann) > reproduce the issue on gitlab-ci and update the Fixes tag url. > --- > package/python-bitstring/Config.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/python-bitstring/Config.in b/package/python-bitstring/Config.in > index 93d7682577..82d0bb29c6 100644 > --- a/package/python-bitstring/Config.in > +++ b/package/python-bitstring/Config.in > @@ -1,5 +1,7 @@ > config BR2_PACKAGE_PYTHON_BITSTRING > bool "python-bitstring" > + select BR2_PACKAGE_PYTHON_BITARRAY # runtime > + select BR2_PACKAGE_PYTHON3_ZLIB # runtime > help > Simple construction, analysis and modification of binary data. > From romain.naour at smile.fr Wed Feb 7 10:04:26 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 11:04:26 +0100 Subject: [Buildroot] [PATCH v3 02/11] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-3-dario.binacchi@amarulasolutions.com> Message-ID: <3d674bd1-a53f-4f82-93c1-58cbe14ab1db@smile.fr> Hello Dario, All, Le 06/02/2024 ? 18:50, Romain Naour a ?crit?: > Hello Dario, > > Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: >> The patch sets the configurations required by TI HS systems. Some of these >> configurations (i. e. HS SYSFW image signing key, HS Software Revision) >> are provided by the ti-k3-core-secdev package in the binaries directory. > > AFAIK the ti-k3-image-gen tool is deprecated and must be replaced by binman tool > provided by upstream u-boot. > > Is all k3 SoC migrated to binman in the latest u-boot release 2024.01? > > See the FOSDEM talk: > > https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/21919/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > > Best regards, > Romain > > >> >> Signed-off-by: Dario Binacchi >> --- >> boot/ti-k3-image-gen/Config.in | 1 + >> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- >> 2 files changed, 15 insertions(+), 2 deletions(-) >> >> diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in >> index d76cef82e911..38d1598d9fc0 100644 >> --- a/boot/ti-k3-image-gen/Config.in >> +++ b/boot/ti-k3-image-gen/Config.in >> @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >> bool "ti-k3-image-gen" >> depends on BR2_TARGET_TI_K3_R5_LOADER >> select BR2_TARGET_TI_K3_BOOT_FIRMWARE >> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS Does it means that currently TI HS configuration are missing the ti-k3-core-secdev tool to build properly? It seems this patch should fixes them. Best regards, Romain >> # We need FIT support in uboot-tools, which is why we select a >> # host package >> select BR2_PACKAGE_HOST_UBOOT_TOOLS >> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> index 64be9a18f2c4..91aed63bab84 100644 >> --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) >> TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) >> TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) >> >> -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >> +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) >> +TI_K3_IMAGE_GEN_SYSFW = \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >> +else >> +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev >> + >> +TI_K3_IMAGE_GEN_SYSFW = \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin >> +endif >> >> define TI_K3_IMAGE_GEN_CONFIGURE_CMDS >> - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) >> + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ >> + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ >> + ) >> endef >> >> define TI_K3_IMAGE_GEN_BUILD_CMDS >> @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS >> $(BR2_MAKE) -C $(@D) \ >> SOC=$(TI_K3_IMAGE_GEN_SOC) \ >> SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ >> + TI_SECURE_DEV_PKG=$(BINARIES_DIR) \ >> CONFIG=evm \ >> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ >> SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > From dario.binacchi at amarulasolutions.com Wed Feb 7 10:04:56 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 11:04:56 +0100 Subject: [Buildroot] [PATCH 1/4] configs/stm32f429_disco_xip_defconfig: drop redundant defconfig choice Message-ID: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi --- configs/stm32f429_disco_xip_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index d4e000487a80..99ae8cc7533b 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Wed Feb 7 10:04:57 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 11:04:57 +0100 Subject: [Buildroot] [PATCH 2/4] configs/stm32f469_disco_sd_defconfig: drop redundant defconfig choice In-Reply-To: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> References: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207100459.2896502-2-dario.binacchi@amarulasolutions.com> The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi --- configs/stm32f469_disco_sd_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index 8b10bc674176..66840a774230 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Wed Feb 7 10:04:58 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 11:04:58 +0100 Subject: [Buildroot] [PATCH 3/4] configs/stm32f469_disco_xip_defconfig: drop redundant defconfig choice In-Reply-To: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> References: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207100459.2896502-3-dario.binacchi@amarulasolutions.com> The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi --- configs/stm32f469_disco_xip_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index e362a9985116..6e6ead0fdebb 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Wed Feb 7 10:04:59 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 11:04:59 +0100 Subject: [Buildroot] [PATCH 4/4] configs/stm32f769_disco_sd_defconfig: drop redundant defconfig choice In-Reply-To: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> References: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207100459.2896502-4-dario.binacchi@amarulasolutions.com> The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi --- configs/stm32f769_disco_sd_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index 2ae27fb2d852..725c985ec04e 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f769-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" -- 2.43.0 From romain.naour at smile.fr Wed Feb 7 10:09:50 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 11:09:50 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/python-referencing: add host variant In-Reply-To: <20231218081958.506691-6-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-6-dario.binacchi@amarulasolutions.com> Message-ID: <272a9412-ca98-4e6f-b91c-e5ff58bd0e92@smile.fr> Hello Dario, All, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. This package is required by binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi > > --- > > Changes in v3: > - Drop Config.in.host > > package/python-referencing/python-referencing.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk > index 4d11c99deb3b..9d8fc5a2f541 100644 > --- a/package/python-referencing/python-referencing.mk > +++ b/package/python-referencing/python-referencing.mk > @@ -11,7 +11,14 @@ PYTHON_REFERENCING_SETUP_TYPE = pep517 > PYTHON_REFERENCING_LICENSE = MIT > PYTHON_REFERENCING_LICENSE_FILES = COPYING > PYTHON_REFERENCING_DEPENDENCIES = \ > + host-python-attrs \ > + host-python-hatchling \ > + host-python-hatch-vcs Why are you adding host-python-attrs in dependency? is host-python-attrs already missing and should be fixed in a separate patch? Best regards, Romain > + > +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ > + host-python-attrs \ > host-python-hatchling \ > host-python-hatch-vcs > > $(eval $(python-package)) > +$(eval $(host-python-package)) From buildroot at bubu1.eu Wed Feb 7 10:10:15 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 11:10:15 +0100 Subject: [Buildroot] [PATCH v6 5/5] package/pkg-python.mk: migrate setuptools to pep517 In-Reply-To: <6049c19d-3ba6-4991-b47f-72b5d46c1e91@bubu1.eu> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-5-james.hilliard1@gmail.com> <6049c19d-3ba6-4991-b47f-72b5d46c1e91@bubu1.eu> Message-ID: <42b067d8-57ff-4cb8-836b-d8449226ec8a@bubu1.eu> On 06.02.24 23:31, Marcus Hoffmann wrote: > Hi James, all > [...] >> diff --git a/package/python-uvloop/python-uvloop.mk >> b/package/python-uvloop/python-uvloop.mk >> index 285884a2bb..70508fb6de 100644 >> --- a/package/python-uvloop/python-uvloop.mk >> +++ b/package/python-uvloop/python-uvloop.mk >> @@ -10,8 +10,10 @@ PYTHON_UVLOOP_SITE = >> https://files.pythonhosted.org/packages/9c/16/728cc5dde368e >> ? PYTHON_UVLOOP_SETUP_TYPE = setuptools >> ? PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT >> ? PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT >> -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv >> -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace >> --use-system-libuv >> ? PYTHON_UVLOOP_DEPENDENCIES = libuv > > This needs a new dependency on host-python-cython now. Otherwise it > fails with the following error: > > ERROR Missing dependencies: > ????Cython<0.30.0,>=0.29.36 To try and clarify why this is related to the pep517 switch: This dependency is also mentioned in the pyproject.toml [1]. When using the old setup.py this way to build the project this was only sometimes required. I.e. when you either explicitly forced a rebuild of the cython-generate files or were building from a git checkout instead of the pypi source tarball. I don't know why this logic didn't carry over to the pep517 world. @James, can we systematically check for packages that might now require cython? Did you build all setuptools packages with this patch at some point and only msgpack came up with the same problem? [1] https://github.com/MagicStack/uvloop/blob/v0.18.0/pyproject.toml#L59 >> +PYTHON_UVLOOP_BUILD_OPTS = \ >> +??? -C--build-option=build_ext \ >> +??? -C--build-option=--inplace \ >> +??? -C--build-option=--use-system-libuv >> ? $(eval $(python-package)) From buildroot at bubu1.eu Wed Feb 7 10:16:27 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 11:16:27 +0100 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <20231126180840.2081945-3-james.hilliard1@gmail.com> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> Message-ID: <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> Hi James, On 26.11.23 19:08, James Hilliard wrote: > We need host-python-cython for python-msgpack to build correctly. > This is a hard error when using a pep517 frontend. > > Fixes: > * Getting build dependencies for wheel... > running egg_info > writing msgpack.egg-info/PKG-INFO > writing dependency_links to msgpack.egg-info/dependency_links.txt > writing top-level names to msgpack.egg-info/top_level.txt > reading manifest file 'msgpack.egg-info/SOURCES.txt' > reading manifest template 'MANIFEST.in' > warning: no files found matching '*.c' under directory 'msgpack' > adding license file 'COPYING' > writing manifest file 'msgpack.egg-info/SOURCES.txt' > > ERROR Missing dependencies: > Cython~=0.29.30 > Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop still uses) also seem to be still developed in parallel. So maybe we need both as build host packages? Or do you see another solution? Marcus > Signed-off-by: James Hilliard > --- > package/python-msgpack/python-msgpack.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk > index 061ff5a761..c915b23bf4 100644 > --- a/package/python-msgpack/python-msgpack.mk > +++ b/package/python-msgpack/python-msgpack.mk > @@ -10,5 +10,6 @@ PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/c2/d5/5662032db157 > PYTHON_MSGPACK_LICENSE = Apache-2.0 > PYTHON_MSGPACK_LICENSE_FILES = COPYING > PYTHON_MSGPACK_SETUP_TYPE = setuptools > +PYTHON_MSGPACK_DEPENDENCIES = host-python-cython > > $(eval $(python-package)) From buildroot at bubu1.eu Wed Feb 7 10:17:38 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 11:17:38 +0100 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> Message-ID: <8bc41c70-4156-4c8d-8c8f-ed75df205c12@bubu1.eu> Forgot the reference link... On 07.02.24 11:16, Marcus Hoffmann via buildroot wrote: > Hi James, > > On 26.11.23 19:08, James Hilliard wrote: >> We need host-python-cython for python-msgpack to build correctly. >> This is a hard error when using a pep517 frontend. >> >> Fixes: >> * Getting build dependencies for wheel... >> running egg_info >> writing msgpack.egg-info/PKG-INFO >> writing dependency_links to msgpack.egg-info/dependency_links.txt >> writing top-level names to msgpack.egg-info/top_level.txt >> reading manifest file 'msgpack.egg-info/SOURCES.txt' >> reading manifest template 'MANIFEST.in' >> warning: no files found matching '*.c' under directory 'msgpack' >> adding license file 'COPYING' >> writing manifest file 'msgpack.egg-info/SOURCES.txt' >> >> ERROR Missing dependencies: >> ????Cython~=0.29.30 >> > > Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 > [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop > still uses) also seem to be still developed in parallel. So maybe we > need both as build host packages? Or do you see another solution? > > Marcus [1] https://github.com/msgpack/msgpack-python/blob/v1.0.7/pyproject.toml#L5 > >> Signed-off-by: James Hilliard >> --- >> ? package/python-msgpack/python-msgpack.mk | 1 + >> ? 1 file changed, 1 insertion(+) >> >> diff --git a/package/python-msgpack/python-msgpack.mk >> b/package/python-msgpack/python-msgpack.mk >> index 061ff5a761..c915b23bf4 100644 >> --- a/package/python-msgpack/python-msgpack.mk >> +++ b/package/python-msgpack/python-msgpack.mk >> @@ -10,5 +10,6 @@ PYTHON_MSGPACK_SITE = >> https://files.pythonhosted.org/packages/c2/d5/5662032db157 >> ? PYTHON_MSGPACK_LICENSE = Apache-2.0 >> ? PYTHON_MSGPACK_LICENSE_FILES = COPYING >> ? PYTHON_MSGPACK_SETUP_TYPE = setuptools >> +PYTHON_MSGPACK_DEPENDENCIES = host-python-cython >> ? $(eval $(python-package)) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Wed Feb 7 10:20:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:20:58 +0100 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> Message-ID: <20240207112058.37534f3d@windsurf> On Wed, 7 Feb 2024 11:16:27 +0100 Marcus Hoffmann wrote: > Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 > [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop > still uses) also seem to be still developed in parallel. So maybe we > need both as build host packages? Or do you see another solution? If we were to have both in parallel, then the big question is whether it is possible to install them both in parallel without them conflicting with each other. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Wed Feb 7 10:26:02 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 11:26:02 +0100 Subject: [Buildroot] [PATCH v3 08/11] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20231218081958.506691-9-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-9-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > The patch set the BINMAN_INDIRS environment variable to provide the > directory to search for binary blobs and select the packages required by > binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi > > --- > > Changes in v2: > - Change commit message > - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > - Select packages required by binman if > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > > boot/ti-k3-r5-loader/Config.in | 13 +++++++++++++ > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 15 +++++++++++++++ > 2 files changed, 28 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in > index 8c8368a1a5a8..a40eaed9467b 100644 > --- a/boot/ti-k3-r5-loader/Config.in > +++ b/boot/ti-k3-r5-loader/Config.in > @@ -93,4 +93,17 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE > help > Path to the TI K3 R5 Loader configuration file. > > +config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN > + bool "U-Boot uses binman" > + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT > + select BR2_PACKAGE_HOST_PYTHON_ATTRS > + select BR2_PACKAGE_HOST_PYTHON_JSONSCHEMA > + select BR2_PACKAGE_HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS > + select BR2_PACKAGE_HOST_PYTHON_PYYAML > + select BR2_PACKAGE_HOST_PYTHON_REFERENCING > + select BR2_PACKAGE_HOST_PYTHON_RPDS_PY There is no such BR2_PACKAGE_HOST_PYTHON_* symbols added when you enabled host variant. We don't really need such option for host package, just add them in ti-k3-r5-loader build dependency from .mk file. > + help > + Select this option if your U-Boot version uses binman > + for building images. It seems that this is a TI specific script tools/binman/etype/ti_board_config.py that requires python-jsonschema but its already a requirement for buildman [1]. So it should also be handled in u-boot package. [1] https://source.denx.de/u-boot/u-boot/-/blob/master/tools/buildman/requirements.txt?ref_type=heads Best regards, Romain > + > endif > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0ffcb8235f2e..7f6da0fb24ea 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -49,6 +49,20 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ > $(BR2_BISON_HOST_DEPENDENCY) \ > $(BR2_FLEX_HOST_DEPENDENCY) > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) > +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt > +endif > + > +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) > +TI_K3_R5_LOADER_DEPENDENCIES += \ > + host-python-attrs \ > + host-python-jsonschema \ > + host-python-jsonschema-specifications \ > + host-python-pyyaml \ > + host-python-referencing \ > + host-python-rpds-py > +endif > + > ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) > TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig > else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) > @@ -58,6 +72,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ARCH=arm \ > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > + BINMAN_INDIRS=$(BINARIES_DIR) \ > HOSTLDFLAGS="$(HOST_LDFLAGS)" > > define TI_K3_R5_LOADER_BUILD_CMDS From thomas.petazzoni at bootlin.com Wed Feb 7 10:34:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:34:01 +0100 Subject: [Buildroot] [PATCH 10/10] package/atkmm: propagate dependency from at-spi2-core In-Reply-To: References: Message-ID: <20240207113401.30235a22@windsurf> On Sun, 28 Jan 2024 14:20:59 +0100 "Yann E. MORIN" wrote: > Commit 2c3ca7bea1de (package/atk: remove package) forgot to propagate to > atkmm, the then just introduced dependency on !static from at-spi2-core, > causing unmet dependencies warnings (unfortuantely, not errors), such > as: > > $ KCONFIG_SEED=0xAFA763CA make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_AT_SPI2_CORE > Depends on [n]: BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_USE_MMU [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=y] > Selected by [y]: > - BR2_PACKAGE_ATKMM [=y] && BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_7 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_USE_MMU [=y] && BR2_USE_WCHAR [=y] > > Propagate the dependency now. > > Signed-off-by: Yann E. MORIN > Cc: James Knight > Cc: Daniel Lang > --- > package/atkmm/Config.in | 1 + > 1 file changed, 1 insertion(+) There's a patch at https://patchwork.ozlabs.org/project/buildroot/patch/20230916154940.746749-1-fontaine.fabrice at gmail.com/ that propagates many more dependencies of at-spi2-core. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Wed Feb 7 10:39:40 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 11:39:40 +0100 Subject: [Buildroot] [PATCH v3 10/11] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2023.10 In-Reply-To: <20231218081958.506691-11-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-11-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > The 2023.10 version of U-Boot for the am62x-sk board has introduced two > major changes: > - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in > /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET > and the use of extlinux.conf for the proper loading of the device tree. > Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to > auto-generate the extlinux.conf file so that developers can change the > kernel loading options by modifying the .config. > - The use of binman for building images. > > Tested on SK-AM62B-P1. > > Signed-off-by: Dario Binacchi > > --- > > Changes in v2: > - Update the commit message > - Drop Python options required by binman. > - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically > selects the Python modules required by binman. > > board/ti/am62x-sk/genimage.cfg | 7 ++++- > board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++++++++++++++++++++ > board/ti/am62x-sk/post-image.sh | 5 ++++ > configs/ti_am62x_sk_defconfig | 11 +++++--- > 4 files changed, 67 insertions(+), 5 deletions(-) > create mode 100755 board/ti/am62x-sk/post-build.sh > create mode 100755 board/ti/am62x-sk/post-image.sh > > diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg > index 26304fe98f99..398209f4d831 100644 > --- a/board/ti/am62x-sk/genimage.cfg > +++ b/board/ti/am62x-sk/genimage.cfg > @@ -4,10 +4,15 @@ image boot.vfat { > "tiboot3.bin", > "tispl.bin", > "u-boot.img", > + "k3-am625-sk.dtb", > + "Image" > + } > + file extlinux/extlinux.conf { > + image = extlinux.conf > } > } > > - size = 16M > + size = 64M > } > > image sdcard.img { > diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh > new file mode 100755 > index 000000000000..0f1f98ef217a > --- /dev/null > +++ b/board/ti/am62x-sk/post-build.sh > @@ -0,0 +1,49 @@ > +#!/bin/sh -x > + > +# genimage will need to find the extlinux.conf > +# in the binaries directory > + > +die() { > + cat <&2 > +Error: $@ > + > +Usage: ${0} -c -r [-x ] > +EOF > + exit 1 > +} > + > +o='c:r:x:' > +O='console:,root:,extra-args:' > +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" > +eval set -- "${opts}" > +while [ ${#} -gt 0 ]; do > + case "${1}" in > + (-c|--console) > + CONSOLE="${2}"; shift 2 > + ;; > + (-r|--root) > + ROOT="${2}"; shift 2 > + ;; > + (-x|--extra-args) > + EXTRA_ARGS="${2}"; shift 2 > + ;; > + (--) > + shift 1; break > + ;; > + esac > +done > + > +[ -n "${CONSOLE}" ] || die "Missing argument" > +[ -n "${ROOT}" ] || die "Missing argument" > +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" > +if [ -n "${EXTRA_ARGS}" ]; then > + append="${append} ${EXTRA_ARGS}" > +fi > + > +mkdir -p "${BINARIES_DIR}" > +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" > + label am62x-sk-buildroot > + kernel /Image > + fdtdir / > + append ${append} > + __HEADER_EOF > diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh > new file mode 100755 > index 000000000000..34f732c091ad > --- /dev/null > +++ b/board/ti/am62x-sk/post-image.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh -x > + > +BOARD_DIR="$(dirname "$0")" > + > +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index b98a68ff153f..0fb9a2f0246c 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r PARTUUID=00000000-02 -x earlycon=ns16550a,mmio32,0x02800000" Can the harcoded PARTUUID be avoided by using uuidgen as for some other defconfigs? > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > -BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > BR2_TARGET_ROOTFS_EXT2=y > @@ -23,11 +23,14 @@ BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > BR2_TARGET_TI_K3_R5_LOADER=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2023.10" Maybe the BR2_TARGET_TI_K3_R5_LOADER version should be fixed in this defconfig before your version bump. Indded it would be better to fix the BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE to 2022.10 even if it's the default one. Care to update BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION to 2024.01? Best regards, Romain > BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" > +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From thomas.petazzoni at bootlin.com Wed Feb 7 10:39:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:39:43 +0100 Subject: [Buildroot] [git commit] package/util-linux: propagate linux-pam dependencies Message-ID: <20240207104003.A5CE287547@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20ee36e0b096185853835aea848b86a7fccd238b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c77e25c3f113 (package/linux-pam: needs gcc >= 4.9) forgot to propagate that new dependency to the util-linux runuser and su, yielding unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0x8AE589A3 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=n] Selected by [y]: - BR2_PACKAGE_UTIL_LINUX_RUNUSER [=y] && BR2_PACKAGE_UTIL_LINUX [=y] && BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && !BR2_TOOLCHAIN_USES_MUSL [=n] && BR2_USE_MMU [=y] - BR2_PACKAGE_UTIL_LINUX_SU [=y] && BR2_PACKAGE_UTIL_LINUX [=y] && BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && !BR2_TOOLCHAIN_USES_MUSL [=n] && BR2_USE_MMU [=y] Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/util-linux/Config.in | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index be87494b35..73fa11380e 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -88,13 +88,15 @@ config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # linux-pam + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam select BR2_PACKAGE_LINUX_PAM help Change login shell, real user name and information -comment "chfn/chsh needs a toolchain w/ wchar, locale, dynamic library" +comment "chfn/chsh needs a toolchain w/ wchar, locale, dynamic library, gcc >= 4.9" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_UTIL_LINUX_CHMEM bool "chmem" @@ -196,13 +198,16 @@ config BR2_PACKAGE_UTIL_LINUX_LOGIN depends on !BR2_STATIC_LIBS # linux-pam depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam select BR2_PACKAGE_LINUX_PAM help Begin a session on the system -comment "login needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "login needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library, gcc >= 4.9" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_UTIL_LINUX_LOSETUP bool "losetup" @@ -343,15 +348,18 @@ config BR2_PACKAGE_UTIL_LINUX_RUNUSER depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam select BR2_PACKAGE_LINUX_PAM help Run a command with substitute user and group ID (does not need to ask for a password, because it may be executed by the root user only) -comment "runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library, gcc >= 4.9" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS bool "scheduling utilities" @@ -380,13 +388,16 @@ config BR2_PACKAGE_UTIL_LINUX_SU depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam select BR2_PACKAGE_LINUX_PAM help Run a command with substitute user and group ID -comment "su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library, gcc >= 4.9" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_UTIL_LINUX_SULOGIN bool "sulogin" From thomas.petazzoni at bootlin.com Wed Feb 7 10:41:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:41:26 +0100 Subject: [Buildroot] [git commit] package/ivi-homescreen: fix dependencies for gstreamer plugin Message-ID: <20240207104142.933F78754B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0ef9213e4a99c7cf12aed4d21dc3b5338d81d50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The gstreamer plugin select the EGL backend of gst1-plugins-base, but forgot to propagate all of its dependencies, notably the _HAS_API condition, causing unmet dependencies warnings (unfortunately, not errors), such as; $ KCONFIG_SEED=0x597D22A8 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL Depends on [n]: BR2_PACKAGE_GSTREAMER1 [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API [=n] && BR2_PACKAGE_HAS_LIBEGL [=y] Selected by [y]: - BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN [=y] && BR2_PACKAGE_IVI_HOMESCREEN [=y] && BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS [=y] && BR2_PACKAGE_HAS_LIBEGL [=y] We can't select _HAS_API, because it is a symbol that represents a capability provided by other features of gst1-plugins-base; it's semantically like a virtual package: we can't select it, we can only depend on it. Add this dependency to fix this situation. This however causes circular (recursive) dependencies errors: package/gstreamer1/gst1-plugins-base/Config.in:135:error: recursive dependency detected! package/gstreamer1/gst1-plugins-base/Config.in:135: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL is selected by BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN package/ivi-homescreen/Config.in:221: symbol BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API package/gstreamer1/gst1-plugins-base/Config.in:149: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API is selected by BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL package/gstreamer1/gst1-plugins-base/Config.in:152: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL Indeed, _HAS_API is only even set when gstreamer1, gst1-plugins-base, and the gst1-plugins-base's lib-opengl support, are all already enabled. As such, the dependency on _HAS_API already implies those, and there is no need to select them. Signed-off-by: Yann E. MORIN Cc: Adam Duskett Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/ivi-homescreen/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/ivi-homescreen/Config.in b/package/ivi-homescreen/Config.in index de7509320f..c24df05b6d 100644 --- a/package/ivi-homescreen/Config.in +++ b/package/ivi-homescreen/Config.in @@ -222,10 +222,8 @@ config BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN bool "GStreamer EGL" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API # GST1_PLUGINS_BASE_LIB_OPENGL_EGL select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL help A GStreamer-powered alternative to Flutter's video_player that @@ -233,9 +231,10 @@ config BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN https://pub.dev/packages/flutter_gstreamer_player -comment "GStreamer plugin needs an EGL backend" +comment "GStreamer plugin needs gst1-plugins-base with an EGL backend" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on !BR2_PACKAGE_HAS_LIBEGL + depends on !BR2_PACKAGE_HAS_LIBEGL \ + || !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API config BR2_PACKAGE_IVI_HOMESCREEN_OPENGL_TEXTURE_PLUGIN bool "OpenGL Texture" From thomas.petazzoni at bootlin.com Wed Feb 7 10:41:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:41:43 +0100 Subject: [Buildroot] [PATCH 01/10] package/util-linux: propagate linux-pam dependencies In-Reply-To: References: Message-ID: <20240207114143.786a5be8@windsurf> On Sun, 28 Jan 2024 14:20:50 +0100 "Yann E. MORIN" wrote: > Commit c77e25c3f113 (package/linux-pam: needs gcc >= 4.9) forgot to > propagate that new dependency to the util-linux runuser and su, yielding > unmet dependencies warnings (unfortunately, not errors), such as: > > $ KCONFIG_SEED=0x8AE589A3 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM > Depends on [n]: BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=n] > Selected by [y]: > - BR2_PACKAGE_UTIL_LINUX_RUNUSER [=y] && BR2_PACKAGE_UTIL_LINUX [=y] && BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && !BR2_TOOLCHAIN_USES_MUSL [=n] && BR2_USE_MMU [=y] > - BR2_PACKAGE_UTIL_LINUX_SU [=y] && BR2_PACKAGE_UTIL_LINUX [=y] && BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && !BR2_TOOLCHAIN_USES_MUSL [=n] && BR2_USE_MMU [=y] > > Signed-off-by: Yann E. MORIN > Cc: Fabrice Fontaine > --- > package/util-linux/Config.in | 27 +++++++++++++++++++-------- > 1 file changed, 19 insertions(+), 8 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 10:41:46 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:41:46 +0100 Subject: [Buildroot] [PATCH 02/10] package/ivi-homescreen: fix dependencies for gstreamer plugin In-Reply-To: References: Message-ID: <20240207114146.3335b6b8@windsurf> On Sun, 28 Jan 2024 14:20:51 +0100 "Yann E. MORIN" wrote: > The gstreamer plugin select the EGL backend of gst1-plugins-base, but > forgot to propagate all of its dependencies, notably the _HAS_API > condition, causing unmet dependencies warnings (unfortunately, not > errors), such as; > > $ KCONFIG_SEED=0x597D22A8 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL > Depends on [n]: BR2_PACKAGE_GSTREAMER1 [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API [=n] && BR2_PACKAGE_HAS_LIBEGL [=y] > Selected by [y]: > - BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN [=y] && BR2_PACKAGE_IVI_HOMESCREEN [=y] && BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS [=y] && BR2_PACKAGE_HAS_LIBEGL [=y] > > We can't select _HAS_API, because it is a symbol that represents a > capability provided by other features of gst1-plugins-base; it's > semantically like a virtual package: we can't select it, we can only > depend on it. > > Add this dependency to fix this situation. > > This however causes circular (recursive) dependencies errors: > > package/gstreamer1/gst1-plugins-base/Config.in:135:error: recursive dependency detected! > package/gstreamer1/gst1-plugins-base/Config.in:135: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL is selected by BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN > package/ivi-homescreen/Config.in:221: symbol BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API > package/gstreamer1/gst1-plugins-base/Config.in:149: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API is selected by BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL > package/gstreamer1/gst1-plugins-base/Config.in:152: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL > > Indeed, _HAS_API is only even set when gstreamer1, gst1-plugins-base, > and the gst1-plugins-base's lib-opengl support, are all already enabled. > As such, the dependency on _HAS_API already implies those, and there is > no need to select them. > > Signed-off-by: Yann E. MORIN > Cc: Adam Duskett > --- > package/ivi-homescreen/Config.in | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Wed Feb 7 10:43:13 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 11:43:13 +0100 Subject: [Buildroot] [PATCH v3 11/11] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 In-Reply-To: <20231218081958.506691-12-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-12-dario.binacchi@amarulasolutions.com> Message-ID: <5c8f11b3-6142-47d9-a05f-bd4c8750f10b@smile.fr> Hello Dario, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > Tested on SK-AM62B-P1. > > Signed-off-by: Dario Binacchi > --- > configs/ti_am62x_sk_defconfig | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 0fb9a2f0246c..9e825d65c0f6 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,8 +1,11 @@ > BR2_aarch64=y > +BR2_KERNEL_HEADERS_6_6=y As reported by Giulio Benetti in a preview patch, BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 must be used instead. This patch series needs some rework, I'll mark it as "changes requested". Thank you, Best regards, Romain > BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r PARTUUID=00000000-02 -x earlycon=ns16550a,mmio32,0x02800000" > BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.1" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" From yann.morin.1998 at free.fr Wed Feb 7 11:06:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 12:06:14 +0100 Subject: [Buildroot] [git commit] package/makedevs: used manual's description Message-ID: <20240207110648.315F387552@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f4be5c41bdf296e6f5c7ad7b9811d34386f89ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, the makedevs syntax explanations are duplicated: one in the package directory, which was introduced firat but bit-rotted for a while each time the makedevs was updated, and once in the manual, which lagged much less. As for all duplicated documentation, the two diverged and one was not updated. In commit 738fb6dfa48b (docs/manual: extend makedev syntax section), we recently updated the makedevs syntax description, but that indeed missed the old README. Get rid of the README and replace it with a symlink to the manual makedevs section. Signed-off-by: Marcus Folkesson Signed-off-by: Yann E. MORIN --- package/makedevs/README | 35 ----------------------------------- package/makedevs/README.adoc | 1 + 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/package/makedevs/README b/package/makedevs/README deleted file mode 100644 index 70844bf802..0000000000 --- a/package/makedevs/README +++ /dev/null @@ -1,35 +0,0 @@ -When building a target filesystem, it is desirable to not have to -become root and then run 'mknod' a thousand times. Using a device -table you can create device nodes and directories "on the fly". - -You can do all sorts of interesting things with a device table file. -For example, if you want to adjust the permissions on a particular -file you can just add an entry like: - - /sbin/foobar f 2755 0 0 - - - - - - -and (assuming the file /sbin/foobar exists) it will be made setuid -root (regardless of what its permissions are on the host filesystem. - -Furthermore, you can use a single table entry to create a many device -minors. For example, if I wanted to create /dev/hda and -/dev/hda[0-15] I could just use the following two table entries: - - /dev/hda b 640 0 0 3 0 0 0 - - /dev/hda b 640 0 0 3 1 1 1 15 - -Device table entries take the form of: - - - -where name is the file name, type can be one of: - - f: A regular file - d: Directory - c: Character special device file - b: Block special device file - p: Fifo (named pipe) - -uid is the user id for the target file, gid is the group id for the -target file. The rest of the entries (major, minor, etc) apply only -to device special files. diff --git a/package/makedevs/README.adoc b/package/makedevs/README.adoc new file mode 120000 index 0000000000..d62887a747 --- /dev/null +++ b/package/makedevs/README.adoc @@ -0,0 +1 @@ +../../docs/manual/makedev-syntax.adoc \ No newline at end of file From giulio.benetti at benettiengineering.com Wed Feb 7 11:06:52 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 12:06:52 +0100 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. In-Reply-To: <20240207030339.3910-1-asd617140123@gmail.com> References: <20240207030339.3910-1-asd617140123@gmail.com> Message-ID: <0e623797-b573-4604-b89e-737c7c503350@benettiengineering.com> Hi Nigel, On 07/02/24 04:03, Nigel Wang wrote: > From: nigel_wang > > add Cubieboard4 board support. > > - SOC: Allwinner A80. > - DRAM: 2GiB DDR3 @ 672MHZ. > - NAND: 8GBeMMC > - Power: DC 5V. > - Wifi: 80211 b/g/n. (module is AP6330) > Reference: https://hirokun.jp/AP6330.pdf > - Ethernet: RTL8211E > > The detail of board: https://linux-sunxi.org/Cubietech_Cubieboard4 > > Board support package includes the following components: > - mainline Linux Kernel 6.6.8 > - mainline U-boot 2021.10. > > Signed-off-by: Nigel Wang Here you have to keep the previous tags when sending new version of patches: Reviewed-by: Giulio Benetti [Build Tested] Tested-by: Giulio Benetti > --- > v1 -> v2 > * Add BR2_cortex_a15_a7=y in buildroot defconfig. > * Bump linux version to 6.6.8 > * Using sunxi_defconfig in kernel. > * Using "make savedefconfig" to save defconfig. > * Remove boot.cmd. this patch had to be V3, but don't mind at this point. I ask you when you send newer patches to set as superseded the previous patch in patchwork: https://patchwork.ozlabs.org/project/buildroot/list/ > --- > DEVELOPERS | 4 +++ > board/cubietech/cubieboard4/extlinux.conf | 5 +++ > board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ > board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ > configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ > 5 files changed, 104 insertions(+) > create mode 100644 board/cubietech/cubieboard4/extlinux.conf > create mode 100644 board/cubietech/cubieboard4/genimage.cfg > create mode 100755 board/cubietech/cubieboard4/post-image.sh > create mode 100644 configs/cubieboard4_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index a03018ab2b..bffb8f2069 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -3297,3 +3297,7 @@ F: package/quazip/ > F: package/shapelib/ > F: package/simple-mail/ > F: package/tinc/ > + > +N: Nigel Wang > +F: board/cubietech/cubieboard4/ > +F: configs/cubieboard4_defconfig > diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf > new file mode 100644 > index 0000000000..5084e2237b > --- /dev/null > +++ b/board/cubietech/cubieboard4/extlinux.conf > @@ -0,0 +1,5 @@ > +label linux > + kernel /boot/zImage > + devicetree /sun9i-a80-cubieboard4.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > + > diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg > new file mode 100644 > index 0000000000..f1dee13923 > --- /dev/null > +++ b/board/cubietech/cubieboard4/genimage.cfg > @@ -0,0 +1,38 @@ > +# Minimal SD card image for the Cubieboard2 > +# Based in the Orange Pi genimage.cfg > + > +image boot.vfat { > + vfat { > + files = { > + "zImage", > + "sun9i-a80-cubieboard4.dtb", > + "extlinux" > + } > + } > + > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1016K # 1MB - 8KB > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 512M > + } > +} > diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh > new file mode 100755 > index 0000000000..e37b960a4d > --- /dev/null > +++ b/board/cubietech/cubieboard4/post-image.sh > @@ -0,0 +1,18 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf > + > +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > + > +rm -rf "${GENIMAGE_TMP}" > + > +genimage \ > + --rootpath "${TARGET_DIR}" \ > + --tmppath "${GENIMAGE_TMP}" \ > + --inputpath "${BINARIES_DIR}" \ > + --outputpath "${BINARIES_DIR}" \ > + --config "${GENIMAGE_CFG}" > + > +exit $? > diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig > new file mode 100644 > index 0000000000..0592fe4a2d > --- /dev/null > +++ b/configs/cubieboard4_defconfig > @@ -0,0 +1,39 @@ > +# Architecture > +BR2_arm=y > +BR2_cortex_a15_a7=y > +BR2_ARM_FPU_NEON_VFPV4=y > + > +# System > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" Here the option below is missing and it's needed otherwise the newest Linux version will be picked and build will fail. Now we don't see the problem because the latest version is exactly 6.6, so need this: # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -- > 2.34.1 > This patch looks to me, except missing Linux header version. I've added that option and re-built successfully so I confirm my: Reviewed-by: Giulio Benetti [Build Tested] Tested-by: Giulio Benetti Maybe a Maintainer can edit while committing, of if you can please send a V3 with that missing line. Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From romain.naour at smile.fr Wed Feb 7 11:07:12 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 12:07:12 +0100 Subject: [Buildroot] [PATCH 1/4] configs/stm32f429_disco_xip_defconfig: drop redundant defconfig choice In-Reply-To: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> References: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> Message-ID: <7fdd9207-c7e1-40db-a20e-e64cd8709a94@smile.fr> Hello Dario, Le 07/02/2024 ? 11:04, Dario Binacchi a ?crit?: > The package/busybox/busybox-minimal.config is the default configuration > for MMU-less systems, so the setting is redundant and can be removed > without effect. This is due to a change in Buildroot 2023.11 [1] and several other boards are explicitly selecting busybox-minimal.config $ git grep BR2_PACKAGE_BUSYBOX_CONFIG | grep minimal configs/canaan_kd233_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/imxrt1050-evk_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/qemu_m68k_mcf5208_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/qemu_riscv64_nommu_virt_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/qemu_xtensa_lx60_nommu_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_bit_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_bit_sdcard_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_dock_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_dock_sdcard_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_go_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_go_sdcard_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maixduino_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maixduino_sdcard_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/stm32f429_disco_xip_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/stm32f469_disco_sd_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/stm32f469_disco_xip_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/stm32f769_disco_sd_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" Can you do this change in one commit ? [1] https://gitlab.com/buildroot.org/buildroot/-/commit/80b56887006cfba50833881dc31f045d494af185 Best regards, Romain > > Signed-off-by: Dario Binacchi > --- > configs/stm32f429_disco_xip_defconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig > index d4e000487a80..99ae8cc7533b 100644 > --- a/configs/stm32f429_disco_xip_defconfig > +++ b/configs/stm32f429_disco_xip_defconfig > @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" > -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" > BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" > # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set > BR2_TARGET_ROOTFS_INITRAMFS=y From yann.morin.1998 at free.fr Wed Feb 7 11:10:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 12:10:25 +0100 Subject: [Buildroot] [PATCH] package/makedevs: describe the recursive type in the README In-Reply-To: <20240206090048.2214719-1-marcus.folkesson@gmail.com> References: <20240206090048.2214719-1-marcus.folkesson@gmail.com> Message-ID: Marcus, All, On 2024-02-06 10:00 +0100, Marcus Folkesson spake thusly: > The recursive type is described everywhere else, so add it to > the README as well. Instead of updating the README file, I removed it and repalced it with a symlink to the corresponding section in the manujal, to avoid duplicating the documentation. Indeed, the manual section for makedevs was already recently updated, but the README was missed. Having the symlink will prevvent the two from diverging in the future. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Marcus Folkesson > --- > package/makedevs/README | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/makedevs/README b/package/makedevs/README > index 70844bf802..6c583609a5 100644 > --- a/package/makedevs/README > +++ b/package/makedevs/README > @@ -26,6 +26,7 @@ where name is the file name, type can be one of: > > f: A regular file > d: Directory > + r: Directory recursively > c: Character special device file > b: Block special device file > p: Fifo (named pipe) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Feb 7 11:24:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 12:24:34 +0100 Subject: [Buildroot] [PATCH] package/libtalloc: bump version to 2.4.2 Message-ID: <20240207112435.3712652-1-peter@korsgaard.com> Fixes build issue of the python support with python 3.12 (2.3.4 unconditionally uses distutils). Signed-off-by: Peter Korsgaard --- package/libtalloc/libtalloc.hash | 4 ++-- package/libtalloc/libtalloc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libtalloc/libtalloc.hash b/package/libtalloc/libtalloc.hash index 0bc8edb695..5577583881 100644 --- a/package/libtalloc/libtalloc.hash +++ b/package/libtalloc/libtalloc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505 talloc-2.3.4.tar.gz -sha256 f8340c449dd64a55c6605b02fcad2aec6f473612ac6026739a22995380a8043c talloc.h +sha256 85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6 talloc-2.4.2.tar.gz +sha256 e01fb092aaed2b431be26674e2b791c77fb5984537c29b514e957582c6b31465 talloc.h diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk index ca15180d22..676076b857 100644 --- a/package/libtalloc/libtalloc.mk +++ b/package/libtalloc/libtalloc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTALLOC_VERSION = 2.3.4 +LIBTALLOC_VERSION = 2.4.2 LIBTALLOC_SOURCE = talloc-$(LIBTALLOC_VERSION).tar.gz LIBTALLOC_SITE = https://www.samba.org/ftp/talloc LIBTALLOC_LICENSE = LGPL-3.0+ -- 2.39.2 From peter at korsgaard.com Wed Feb 7 11:25:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 12:25:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeradius-server: fix python3 build with -Ofast In-Reply-To: <20240111194242.2572172-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 11 Jan 2024 20:42:42 +0100") References: <20240111194242.2572172-1-fontaine.fabrice@gmail.com> Message-ID: <87wmrgzfc5.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following python3 build failure with -Ofast raised since commit > 4513f5198a8f24af7bd24fdfc1ede143eb4e844a: > powerpc64-buildroot-linux-gnu-gcc.br_real: error: ast: linker input > file not found: No such file or directory > Fixes: > - http://autobuild.buildroot.org/results/904c43241b99a8d848c1891cb5af132a291311b4 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 11:25:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 12:25:21 +0100 Subject: [Buildroot] [git commit] package/freeradius-server: fix python3 build with -Ofast Message-ID: <20240207112532.1663087559@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef199d362985031d473754c42a64f7ab2e9e57d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following python3 build failure with -Ofast raised since commit 4513f5198a8f24af7bd24fdfc1ede143eb4e844a: powerpc64-buildroot-linux-gnu-gcc.br_real: error: ast: linker input file not found: No such file or directory Fixes: - http://autobuild.buildroot.org/results/904c43241b99a8d848c1891cb5af132a291311b4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...c-modules-rlm_python-fix-build-with-Ofast.patch | 49 ++++++++++++++++++++++ package/freeradius-server/freeradius-server.mk | 6 +++ 2 files changed, 55 insertions(+) diff --git a/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch b/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch new file mode 100644 index 0000000000..c92b4171d2 --- /dev/null +++ b/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch @@ -0,0 +1,49 @@ +From 963edf3f87d34e274885d9cc448651d8a1601a6f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 11 Jan 2024 17:38:41 +0100 +Subject: [PATCH] src/modules/rlm_python: fix build with -Ofast + +Stripping logic wrongly translates -Ofast into ast resulting in the +following build failure: + +configure: /home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/bin/python3-config's cflags were "-I/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -I/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -Wsign-compare -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -DNDEBUG -g -fwrapv -O3 -Wall" +configure: Sanitized cflags were " -isystem/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -isystem/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ast -D_FORTIFY_SOURCE=2 -fwrapv " + +[...] + +powerpc64-buildroot-linux-gnu-gcc.br_real: error: ast: linker input file not found: No such file or directory + +Fixes: + - http://autobuild.buildroot.org/results/904c43241b99a8d848c1891cb5af132a291311b4 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/5263 +--- + src/modules/rlm_python/configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac +index e2f74574fb..ee30b324d9 100644 +--- a/src/modules/rlm_python3/configure.ac ++++ b/src/modules/rlm_python3/configure.ac +@@ -59,7 +59,7 @@ else + + dnl # Convert -I to -isystem to get rid of warnings about issues in Python headers + dnl # Strip -systemroot +- dnl # Strip optimisation flags (-O[0-9]?). We decide our optimisation level, not python. ++ dnl # Strip optimisation flags (-O[0-9|fast]?). We decide our optimisation level, not python. + dnl # -D_FORTIFY_SOURCE needs -O. + dnl # Strip debug symbol flags (-g[0-9]?). We decide on debugging symbols, not python + dnl # Strip -W*, we decide what warnings are important +@@ -73,7 +73,7 @@ else + mod_cflags=`echo " $python_cflags" | sed -e '\ + s/ -I/ -isystem/g;\ + s/ -isysroot[[ =]]\{0,1\}[[^-]]*/ /g;\ +- s/ -O[[^[[:blank:]]]]*/ /g;\ ++ s/ -O[[^[[:blank:]]*]]*/ /g;\ + s/ -Wp,-D_FORTIFY_SOURCE=[[[:digit:]]]/ /g;\ + s/ -g[[^ ]]*/ /g;\ + s/ -W[[^ ]]*/ /g;\ +-- +2.43.0 + diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 16a817b680..1b5751d753 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -21,6 +21,12 @@ define FREERADIUS_SERVER_RUN_KRB5_AUTORECONF endef FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_KRB5_AUTORECONF +# We're patching src/modules/rlm_python3/configure.ac +define FREERADIUS_SERVER_RUN_PYTHON3_AUTORECONF + cd $(@D)/src/modules/rlm_python3; $(AUTORECONF) -I$(@D)/m4 +endef +FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_PYTHON3_AUTORECONF + # some compiler checks are not supported while cross compiling. # instead of removing those checks, we cache the answers FREERADIUS_SERVER_CONF_OPTS += \ From thomas.petazzoni at bootlin.com Wed Feb 7 11:27:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:27:26 +0100 Subject: [Buildroot] [PATCH 03/10] package/openssh: fix dependencies with refpolicy In-Reply-To: <0fab83c33d4c5d4afe807e78169f68d539bcf5af.1706448055.git.yann.morin.1998@free.fr> References: <0fab83c33d4c5d4afe807e78169f68d539bcf5af.1706448055.git.yann.morin.1998@free.fr> Message-ID: <20240207122726.2aa4be3c@windsurf> Hello, On Sun, 28 Jan 2024 14:20:52 +0100 "Yann E. MORIN" wrote: > Commit 2c5a82a29ceb(package/openssh: select linux-pam if refpolicy > upstream is selected) did not account for the linux-pam dependencies > before selecting it, causing unmet dependencies warnings (unfortunately, > not errors), such as: > > $ KCONFIG_SEED=0x8D55903B make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LIBABSEIL_CPP > Depends on [n]: BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_8 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] && !BR2_STATIC_LIBS [=n] && BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS [=n] > Selected by [y]: > - BR2_PACKAGE_RE2 [=y] && BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_8 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] Seems like this was copy/pasted from the wrong error :-) Also, as we discussed during the meeting, it seems like we want to: - Move this select to the refpolicy package - Handle it as a "soft select" that selects linux-pam if possible, to not have some crazy dependencies for a quite corner case (using SELinux non a non-glibc system, with a toolchain missing locale/wchar, etc.) Could you rework according to our discussion? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From giulio.benetti at benettiengineering.com Wed Feb 7 11:31:27 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 12:31:27 +0100 Subject: [Buildroot] [PATCH v4 1/3] package/milkv-duo-libraries: new package In-Reply-To: References: Message-ID: <0ae0fea1-c044-4016-85e2-cf7090ce8905@benettiengineering.com> Hi Hanyuan, On 07/02/24 08:49, Hanyuan Zhao wrote: > This commit adds the libraries for RISC-V dev board > milk-v duo, containing board-specific firmware and > hardware tools. > > https://github.com/milkv-duo/milkv-duo-buildroot-libraries > > Co-authored-by: Emil S > Signed-off-by: Hanyuan Zhao It looks good to me: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > > --- > Changes v3 -> v4: > - Update the info in help section > - Provide more info about ION (camera memory use) > > Changes v2 -> v3: > - Update the desc's repo url > > Changes v1 -> v2: > - Lint the code > - Refactor the select and depend logic > --- > package/Config.in | 1 + > package/milkv-duo-libraries/Config.in | 63 +++++++++++++++++++ > .../milkv-duo-libraries.mk | 51 +++++++++++++++ > 3 files changed, 115 insertions(+) > create mode 100644 package/milkv-duo-libraries/Config.in > create mode 100644 package/milkv-duo-libraries/milkv-duo-libraries.mk > > diff --git a/package/Config.in b/package/Config.in > index 047877c960..322aba90b8 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -564,6 +564,7 @@ endmenu > source "package/memtester/Config.in" > source "package/memtool/Config.in" > source "package/mhz/Config.in" > + source "package/milkv-duo-libraries/Config.in" > source "package/minicom/Config.in" > source "package/msr-tools/Config.in" > source "package/nanocom/Config.in" > diff --git a/package/milkv-duo-libraries/Config.in b/package/milkv-duo-libraries/Config.in > new file mode 100644 > index 0000000000..047b78fb7b > --- /dev/null > +++ b/package/milkv-duo-libraries/Config.in > @@ -0,0 +1,63 @@ > +config BR2_PACKAGE_MILKV_DUO_LIBRARIES > + bool "milk-v duo libraries" > + depends on BR2_riscv > + help > + Package providing board-specific firmware and hardware tools > + for Milk-V Duo platform. > + > + https://github.com/milkv-duo/milkv-duo-buildroot-libraries > + > +if BR2_PACKAGE_MILKV_DUO_LIBRARIES > + > +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + bool "milkv-duo-firmware-fsbl" > + select BR2_PACKAGE_HOST_MTOOLS > + help > + This package is obtained from > + https://github.com/milkv-duo/duo-buildroot-sdk, > + from which we download the first stage bootloader source and > + compile it, generating the ATF bl2.bin. At the mean time, we > + will use the fiptool.py in this package to create the binary > + file fip.bin to pack the opensbi, u-boot and so on. > + > + If you intend to generate the whole sdcard image or the > + fip.bin for milk-v duo, you must say Y to this package! > + > +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB > + bool "64 MiB free ram" > + default n > + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + help > + Say Y to this will disable the ION (Camera Algorithm Memory) > + in order to have the all 64MiB Free memory. > + > +config BR2_PACKAGE_MILKV_DUO_PINMUX > + bool "duo-pinmux tool" > + default n > + help > + Say Y to this will compile the duo-pinmux, which can > + get or set function of any Milk-V Duo GPIO Pin. More info at > + > + https://milkv.io/docs/duo/application-development/pinmux > + > +config BR2_PACKAGE_MILKV_DUO_FEATURES > + bool "duo usb features" > + default n > + select BR2_PACKAGE_DHCPCD > + select BR2_PACKAGE_DNSMASQ > + select BR2_PACKAGE_DROPBEAR > + select BR2_PACKAGE_LRZSZ > + select BR2_PACKAGE_HTOP > + help > + Say Y to this will copy the cvitek usb shell scripts to have > + the USB features. The role could be configured at > + > + /etc/milkv-duo.conf > + > + Supported usb functions are rndis, host and mass-storage. > + By default Duo has the LED blinking. It could be configured > + in that conf file as well. Say Y to this will also select > + some packages automatically, to have the same experience > + with the official release. > + > +endif > diff --git a/package/milkv-duo-libraries/milkv-duo-libraries.mk b/package/milkv-duo-libraries/milkv-duo-libraries.mk > new file mode 100644 > index 0000000000..a5cf40a764 > --- /dev/null > +++ b/package/milkv-duo-libraries/milkv-duo-libraries.mk > @@ -0,0 +1,51 @@ > +################################################################################ > +# > +# milkv-duo-libraries > +# > +################################################################################ > + > +MILKV_DUO_LIBRARIES_VERSION = f359994bd497f942bb67734280d81f6640c7c168 > +MILKV_DUO_LIBRARIES_SITE = $(call github,milkv-duo,milkv-duo-buildroot-libraries,$(MILKV_DUO_LIBRARIES_VERSION)) > +MILKV_DUO_LIBRARIES_INSTALL_STAGING = YES > +MILKV_DUO_LIBRARIES_DEPENDENCIES = host-python3 host-mtools > +MILKV_DUO_LIBRARIES_FSBL_64MB = ION > + > +ifeq ($(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB),y) > +MILKV_DUO_LIBRARIES_FSBL_64MB = 64MB > +endif > + > +define MILKV_DUO_LIBRARIES_BUILD_CMDS > + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ > + $(MAKE) -C $(@D)/firmware \ > + ARCH=riscv BOOT_CPU=riscv CHIP_ARCH=cv180x \ > + PROJECT_FULLNAME=cv1800b_milkv_duo_sd \ > + CROSS_COMPILE=$(TARGET_CROSS) \ > + FREE_RAM_SIZE=$(MILKV_DUO_LIBRARIES_FSBL_64MB) \ > + bl2; \ > + fi > + > + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ > + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ > + -I $(@D)/pinmux/include $(@D)/pinmux/src/*.c -o $(@D)/pinmux/duo-pinmux; \ > + fi > +endef > + > +define MILKV_DUO_LIBRARIES_INSTALL_STAGING_CMDS > + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/build/cv180x/bl2.bin $(BINARIES_DIR)/bl2.bin; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/chip_conf.bin $(BINARIES_DIR)/chip_conf.bin; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/fiptool.py $(BINARIES_DIR)/fiptool.py; \ > + $(INSTALL) -D -m 0644 $(@D)/firmware/plat/cv180x/multi.its $(BINARIES_DIR)/multi.its; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/test/cv181x/ddr_param.bin $(BINARIES_DIR)/ddr_param.bin; \ > + fi > + > + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ > + $(INSTALL) -D -m 0755 $(@D)/pinmux/duo-pinmux $(TARGET_DIR)/usr/bin/; \ > + fi > + > + if [ $(BR2_PACKAGE_MILKV_DUO_FEATURES) = y ]; then \ > + cp $(@D)/overlay/* -r $(TARGET_DIR); \ > + fi > +endef > + > +$(eval $(generic-package)) From yann.morin.1998 at free.fr Wed Feb 7 11:38:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 12:38:15 +0100 Subject: [Buildroot] [git commit] support/testing: add python-uvloop runtime test Message-ID: <20240207113846.0AD7987564@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a232ee101d70c8e1f72e9e9eaac3144543dd5cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- .../testing/tests/package/sample_python_uvloop.py | 6 ++++++ .../testing/tests/package/test_python_uvloop.py | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/support/testing/tests/package/sample_python_uvloop.py b/support/testing/tests/package/sample_python_uvloop.py new file mode 100644 index 0000000000..dc85d3e04e --- /dev/null +++ b/support/testing/tests/package/sample_python_uvloop.py @@ -0,0 +1,6 @@ +import uvloop + +async def main(): + print("Hello world!") + +uvloop.run(main()) diff --git a/support/testing/tests/package/test_python_uvloop.py b/support/testing/tests/package/test_python_uvloop.py new file mode 100644 index 0000000000..c5079ba59c --- /dev/null +++ b/support/testing/tests/package/test_python_uvloop.py @@ -0,0 +1,22 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Uvloop(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_UVLOOP=y + """ + sample_scripts = ["tests/package/sample_python_uvloop.py"] + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + + cmd = "%s %s" % (self.interpreter, os.path.basename(self.sample_scripts[0])) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "Hello world!") From br015 at umbiko.net Wed Feb 7 11:30:11 2024 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 07 Feb 2024 11:30:11 +0000 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: References: Message-ID: Hi Fabrice, sorry in case I do not reply to the latest message in the thread; my in-box is currently a bit crowded ... On 2024-02-06 18:59, Fabrice Fontaine wrote: > Message: 30 > Date: Tue, 6 Feb 2024 18:59:00 +0100 > From: Fabrice Fontaine > To: Romain Naour > Cc: buildroot at buildroot.org > Subject: Re: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS > Message-ID: > > Content-Type: text/plain; charset="UTF-8" > > Hello Romain, > > Le mar. 6 f?vr. 2024 ? 18:32, Romain Naour a > ?crit : >> >> Hello, >> >> Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit : >> > ncmpc is able to automatically detect NLS support since version 0.47 and >> > https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 >> > so let it handle automatically to avoid the following build failure with >> > a bootlin toolchain which embeds a gettext definition in libintl.h which >> > will clash with the fake gettext definition provided by ncmpc since >> > https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: >> > >> > In file included from ../src/save_playlist.cxx:8: >> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' >> > 39 | extern char *gettext (const char *__msgid) >> > | ^~~~~~~ >> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' >> > ../src/i18n.h:22:20: note: to match this '(' >> > 22 | #define gettext(x) (x) >> > | ^ >> > >> > Indeed, even if NLS is disabled by the user, libintl.h will be included >> > by >> > /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h >> > though include >> >> We usually want to explicitly handle such option from Buildroot >> package to not >> rely on automatic detection (as currently done). >> >> It look like more a bug in ncmpc build system? > > I don't know, upstream wants to have the same code with and without > NLS, so they decided to define a gettext macro when NLS is disabled. > I could find an upstreamable solution as upstream will probably reject > a patch that removes this gettext define and puts #ifdef ENABLE_NLS > before every gettext calls. > Do you have an upstreamable solution or should we just add a NLS > dependency to ncmpc? This is probably not related to NLS, but to gettext being included in the build by some other package. This tricks Meson into believing that NLS is enabled. Also, the code in meson.txt may lead to unexpected results: if meson.version().version_compare('>= 0.59') and not mini # Meson 0.59 has native libintl support intl_dep = dependency('intl', required: enable_nls) enable_nls = intl_dep.found() elif enable_nls.disabled() or mini intl_dep = dependency('', required: false) enable_nls = false elif cc.has_header('libintl.h') intl_dep = dependency('', required: false) enable_nls = true elif enable_nls.auto() intl_dep = dependency('', required: false) enable_nls = false else error('libintl.h not found') -- build is (Meson) version dependent -- 'disabled' command line option overridden by the build system (> 0.59) -- 'auto' treated as 'disabled' (< 0.59) It would be better to handle 'disabled' first (untested): intl_dep = dependency('', required: false) if enable_nls.disabled() or mini enable_nls = false # Meson from 0.59: New custom dependency for libintl elif meson.version().version_compare('>= 0.59') require_intl = enable_nls if enable_nls.auto() require_intl = false intl_dep = dependency('intl', required: require_intl) enable_nls = intl_dep.found() # Meson prior to 0.59 elif cc.has_header('libintl.h') # auto and enabled w/ dependency met enable_nls = true elif enable_nls.enabled() # enabled with w/ dependency unmet error('libintl.h not found') Kind regards, Andreas >> >> Best regards, >> Romain >> >> >> > >> > Fixes: >> > - http://autobuild.buildroot.org/results/c860e64909dd3b7fa033db0970e1cfc1376c4ec5 >> > - http://autobuild.buildroot.org/results/36eab556fac80124755bff4110af3e43fe6edd78 >> > >> > Signed-off-by: Fabrice Fontaine >> > --- >> > package/ncmpc/ncmpc.mk | 3 +-- >> > 1 file changed, 1 insertion(+), 2 deletions(-) >> > >> > diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk >> > index bc8a62daea..0965981f23 100644 >> > --- a/package/ncmpc/ncmpc.mk >> > +++ b/package/ncmpc/ncmpc.mk >> > @@ -20,8 +20,7 @@ NCMPC_CPE_ID_VENDOR = ncmpc_project >> > >> > NCMPC_CONF_OPTS = \ >> > -Dcurses=ncurses \ >> > - -Ddocumentation=disabled \ >> > - $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) >> > + -Ddocumentation=disabled >> > >> > ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) >> > NCMPC_DEPENDENCIES += lirc-tools >> > > Best Regards, > > Fabrice From giulio.benetti at benettiengineering.com Wed Feb 7 11:39:09 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 12:39:09 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/milkv-duo-smallcore-freertos: new package In-Reply-To: References: <20240207074950.2049-1-hanyuan-z@qq.com> Message-ID: <8b908c45-80d2-428f-885f-febedfc5e4bf@benettiengineering.com> Hi Hanyuan, On 07/02/24 08:49, Hanyuan Zhao wrote: > This commit adds the freertos support for the > RISC-V dev board milk-v duo. > > https://github.com/milkv-duo/milkv-duo-smallcore-freertos > > Co-authored-by: Emil S > Signed-off-by: Hanyuan Zhao > > --- > Changes v3 -> v4: > - Move the make recipes to the repo > - Bump the version to latest > > Changes v2 -> v3: > - No Changes > > Changes v1 -> v2: > - Set the depends and select logic > - Add host tools > --- > package/Config.in | 1 + > .../milkv-duo-smallcore-freertos/Config.in | 21 ++++++++++++++++++ > .../milkv-duo-smallcore-freertos.mk | 22 +++++++++++++++++++ > 3 files changed, 44 insertions(+) > create mode 100644 package/milkv-duo-smallcore-freertos/Config.in > create mode 100644 package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > > diff --git a/package/Config.in b/package/Config.in > index 322aba90b8..7be3316f71 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -565,6 +565,7 @@ endmenu > source "package/memtool/Config.in" > source "package/mhz/Config.in" > source "package/milkv-duo-libraries/Config.in" > + source "package/milkv-duo-smallcore-freertos/Config.in" > source "package/minicom/Config.in" > source "package/msr-tools/Config.in" > source "package/nanocom/Config.in" > diff --git a/package/milkv-duo-smallcore-freertos/Config.in b/package/milkv-duo-smallcore-freertos/Config.in > new file mode 100644 > index 0000000000..8503932461 > --- /dev/null > +++ b/package/milkv-duo-smallcore-freertos/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS > + bool "milkv-duo-smallcore-freertos" > + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + select BR2_PACKAGE_HOST_CMAKE > + help > + This package is obtained from > + https://github.com/milkv-duo/duo-buildroot-sdk, > + from which we download the FreeRTOS ported to Milk-V Duo > + into the Buildroot. This FreeRTOS will run in the small core > + and will not do anything because it is simply a template > + with some basic UART demos. You can realize your own ideas > + by adding code to > + > + output/build/milkv-duo-smallcore-freertos-hash/cvitek/task > + /comm/src/riscv64/comm_main.c > + > + If you say Y, then every time you make Buildroot, it will > + automatically compile and include the FreeRTOS into the > + fip.bin, which will then be packed into sdcard.img > + > + https://github.com/milkv-duo/milkv-duo-smallcore-freertos > diff --git a/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > new file mode 100644 > index 0000000000..1d8d4fcf12 > --- /dev/null > +++ b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# milkv-duo-smallcore-freertos > +# > +################################################################################ > + > +MILKV_DUO_SMALLCORE_FREERTOS_VERSION = 10b86e308ca2305a464ae2bb3eb868a72295f7ab > +MILKV_DUO_SMALLCORE_FREERTOS_SITE = $(call github,milkv-duo,milkv-duo-smallcore-freertos,$(MILKV_DUO_SMALLCORE_FREERTOS_VERSION)) > +MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING = YES > +MILKV_DUO_SMALLCORE_FREERTOS_DEPENDENCIES = host-cmake host-ninja > +MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV = CROSS_COMPILE=$(TARGET_CROSS) MK_ENV=$(TARGET_MAKE_ENV) TARGET_CMAKE=$(BR2_CMAKE) BUILD_PATH=$(@D) > + > +define MILKV_DUO_SMALLCORE_FREERTOS_BUILD_CMDS > + $(MAKE) -C $(@D) all $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) > +endef > + > +define MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING_CMDS > + $(INSTALL) -D -m 0755 $(@D)/cvitek/install/bin/cvirtos.bin $(BINARIES_DIR)/cvirtos.bin > + touch $(BINARIES_DIR)/empty.bin > +endef > + > +$(eval $(generic-package)) It looks good to me, moving build system to repository made it really easier, so: Reviewed-by: Giulio Benetti Just FYI, buildroot also deal with cmake package using: $(eval $(cmake-package)) so in the future you can use that or other infrastructure that it provides that you can find under buildroot/package/pkg-*.mk Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From yann.morin.1998 at free.fr Wed Feb 7 11:39:11 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 12:39:11 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: add python-uvloop runtime test In-Reply-To: <170717110256.12359.16509380444438086733-0@git.sr.ht> References: <170717110256.12359.16509380444438086733-0@git.sr.ht> Message-ID: Marcus, All, On 2024-02-05 22:47 +0100, ~bubu spake thusly: > From: Marcus Hoffmann Applied to master, with your SoB added, thanks. Regards, Yann E. MORIN. > --- > .../tests/package/sample_python_uvloop.py | 6 +++++ > .../tests/package/test_python_uvloop.py | 22 +++++++++++++++++++ > 2 files changed, 28 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_uvloop.py > create mode 100644 support/testing/tests/package/test_python_uvloop.py > > diff --git a/support/testing/tests/package/sample_python_uvloop.py b/support/testing/tests/package/sample_python_uvloop.py > new file mode 100644 > index 0000000000..dc85d3e04e > --- /dev/null > +++ b/support/testing/tests/package/sample_python_uvloop.py > @@ -0,0 +1,6 @@ > +import uvloop > + > +async def main(): > + print("Hello world!") > + > +uvloop.run(main()) > diff --git a/support/testing/tests/package/test_python_uvloop.py b/support/testing/tests/package/test_python_uvloop.py > new file mode 100644 > index 0000000000..c5079ba59c > --- /dev/null > +++ b/support/testing/tests/package/test_python_uvloop.py > @@ -0,0 +1,22 @@ > +import os > + > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy3Uvloop(TestPythonPackageBase): > + __test__ = True > + config = TestPythonPackageBase.config + \ > + """ > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_UVLOOP=y > + """ > + sample_scripts = ["tests/package/sample_python_uvloop.py"] > + > + def test_run(self): > + self.login() > + self.check_sample_scripts_exist() > + > + cmd = "%s %s" % (self.interpreter, os.path.basename(self.sample_scripts[0])) > + output, exit_code = self.emulator.run(cmd) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output[0], "Hello world!") > -- > 2.38.5 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Wed Feb 7 11:41:00 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 12:41:00 +0100 Subject: [Buildroot] [PATCH v4 3/3] configs/milkv_duo: new defconfig In-Reply-To: References: <20240207074950.2049-1-hanyuan-z@qq.com> Message-ID: <9957d4b8-944a-4314-a8f4-471446deda52@benettiengineering.com> Hi Hanyuan, On 07/02/24 08:49, Hanyuan Zhao wrote: > Milk-V Duo is an ultra-compact embedded RISC-V development platform based on the CV1800B chip. > It can run Linux and RTOS, providing a reliable, low-cost, and high-performance platform > for professionals, industrial ODMs, AIoT enthusiasts, DIY hobbyists, and creators. > > https://milkv.io/duo > > Co-authored-by: Emil S > Co-authored-by: GP Orcullo > Signed-off-by: Hanyuan Zhao > Reviewed-by: Giulio Benetti > [Build Tested only both defconfigs] > Tested-by: Giulio Benetti > > --- > This patch depends on: > https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 > to work-around a gcc bug on htop package. > --- > Changes v3 -> v4: > - Lint the code > - Add more comments about gcc ICE in defconfig > - Remove unnecessary comments > > Changes v2 -> v3: > - Remove BR2_TOOLCHAIN_BUILDROOT_CXX in defconfig > - Refactor post-image.sh > - Provide more info about ION and camera memory use > > Changes v1 -> v2: > - Refactor defconfig > - Set the boot partition size to 8M > - Refactor the image generating logic > --- > board/milkv/duo/genimage.cfg | 25 ++++++++ > board/milkv/duo/post-image.sh | 47 ++++++++++++++ > board/milkv/duo/readme.txt | 46 ++++++++++++++ > configs/milkv_duo_musl_riscv64_defconfig | 67 ++++++++++++++++++++ > configs/milkv_duo_musl_riscv64_ion_defconfig | 67 ++++++++++++++++++++ > 5 files changed, 252 insertions(+) > create mode 100644 board/milkv/duo/genimage.cfg > create mode 100755 board/milkv/duo/post-image.sh > create mode 100644 board/milkv/duo/readme.txt > create mode 100644 configs/milkv_duo_musl_riscv64_defconfig > create mode 100644 configs/milkv_duo_musl_riscv64_ion_defconfig > > diff --git a/board/milkv/duo/genimage.cfg b/board/milkv/duo/genimage.cfg > new file mode 100644 > index 0000000000..1fd74f845a > --- /dev/null > +++ b/board/milkv/duo/genimage.cfg > @@ -0,0 +1,25 @@ > +image boot.vfat { > + vfat { > + files = { > + "fip.bin", > + "boot.sd", > + } > + } > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + } > +} > diff --git a/board/milkv/duo/post-image.sh b/board/milkv/duo/post-image.sh > new file mode 100755 > index 0000000000..3856d977df > --- /dev/null > +++ b/board/milkv/duo/post-image.sh > @@ -0,0 +1,47 @@ > +#!/bin/sh > + > +########################################################### > +# File: post-image.sh > +# Author: GP Orcullo > +# Hanyuan Zhao > +# Description: this sh will make the fip.bin and boot.sd, > +# then pack everything to an image file. > +########################################################### > + > +FIPTOOL_OPTS="genfip ${BINARIES_DIR}/fip.bin \ > + --MONITOR_RUNADDR=0x80000000 \ > + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ > + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ > + --NAND_INFO=00000000 \ > + --BL2=${BINARIES_DIR}/bl2.bin \ > + --BLCP_IMG_RUNADDR=0x05200200 \ > + --BLCP_PARAM_LOADADDR=0 \ > + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ > + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ > + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin" > + > +if [ -f ${BINARIES_DIR}/cvirtos.bin ]; then > + FIPTOOL_OPTS="${FIPTOOL_OPTS} \ > + --BLCP=${BINARIES_DIR}/empty.bin \ > + --BLCP_2ND=${BINARIES_DIR}/cvirtos.bin \ > + --BLCP_2ND_RUNADDR=0x83f40000" > + echo "[Duo Post-Image fiptool.py] Integrating FreeRTOS" > +fi > + > +${BINARIES_DIR}/fiptool.py ${FIPTOOL_OPTS} \ > +> ${BINARIES_DIR}/fip.log 2>&1 > +if [ -f ${BINARIES_DIR}/fip.bin ]; then > + echo "[Duo Post-Image fiptool.py] > fip.bin generated!" > +fi > + > +cp ${BINARIES_DIR}/u-boot.dtb ${BINARIES_DIR}/cv1800b_milkv_duo_sd.dtb > +lzma -fk ${BINARIES_DIR}/Image > +mkimage -f ${BINARIES_DIR}/multi.its ${BINARIES_DIR}/boot.sd > +if [ -f ${BINARIES_DIR}/boot.sd ]; then > + echo "[Duo Post-Image] > boot.sd generated!" > +fi > +support/scripts/genimage.sh -c $(pwd)/board/milkv/duo/genimage.cfg > +gzip -fk ${BINARIES_DIR}/sdcard.img > +if [ -f ${BINARIES_DIR}/sdcard.img ]; then > + echo "[Duo Post-Image] > sdcard.img generated!" > +fi > diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt > new file mode 100644 > index 0000000000..bb05050245 > --- /dev/null > +++ b/board/milkv/duo/readme.txt > @@ -0,0 +1,46 @@ > +Milk-V Duo (https://milkv.io/docs/duo/overview) > + > +Intro > +===== > + > +Milk-V Duo is an ultra-compact embedded development platform > +based on the rv64 CV1800B chip. It can run Linux and RTOS, > +providing a reliable, cost-effective, and high-performance > +platform for professionals, industrial ODMs, AIoT enthusiasts, > +DIY enthusiasts, and creators. > + > +How to build it > +=============== > + > +Configure Buildroot: > + > + $ make milkv_duo_musl_riscv64_defconfig > + > +The milkv_duo_musl_riscv64_defconfig will by default provide > +the full 64MiB free RAM. If you want to build with memory > +reserved for ION (generalized memory manager in linux, i.e. > +some memory will be reserved for the camera algorithms), please try: > + > + $ make milkv_duo_musl_riscv64_ion_defconfig > + > +For more information about the ION, please refer to > + > +https://github.com/milkv-duo/duo-buildroot-sdk/blob/develop/README.md?plain=1#L436 > + > +Modify configuration if needed, e.g. add more packages to target: > + > + $ make menuconfig > + > +Compile everything and build the SD card image: > + > + $ make > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image > +called "sdcard.img" in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_musl_riscv64_defconfig > new file mode 100644 > index 0000000000..0773924072 > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_defconfig > @@ -0,0 +1,67 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Since gcc 13 and later versions with the t-head's optimizations > +# below are currently not well compatible with glibc, which will > +# throw gcc ICE (Internal Compiler Error) when the buildroot is > +# compiling the glibc, so we choose musl used by the official sdk > +# until this ICE gets fixed. > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_64mb" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > diff --git a/configs/milkv_duo_musl_riscv64_ion_defconfig b/configs/milkv_duo_musl_riscv64_ion_defconfig > new file mode 100644 > index 0000000000..18458726d9 > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_ion_defconfig > @@ -0,0 +1,67 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Since gcc 13 and later versions with the t-head's optimizations > +# below are currently not well compatible with glibc, which will > +# throw gcc ICE (Internal Compiler Error) when the buildroot is > +# compiling the glibc, so we choose musl used by the official sdk > +# until this ICE gets fixed. > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_ion" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y Everything looks good to me now, so let's wait for some Maintainer to take care of this patch along with the others in the patchset. Best regards! -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Wed Feb 7 11:44:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:44:04 +0100 Subject: [Buildroot] [git commit] package/re2: propagate libabseil-cpp dependencies Message-ID: <20240207114414.E163F8756E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f7f0565699b5f396b918954c3c7a91a7ede16b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit fc7606010e4edde7a34c545fac0fe7f82d4a5e18 forgot to propagate libabseil-cpp dependencies to re2 Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Reviewed-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/grpc/Config.in | 2 +- package/qt5/qt5webengine/Config.in | 6 ++++-- package/re2/Config.in | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package/grpc/Config.in b/package/grpc/Config.in index ef3e1c86cb..7664948b40 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_GRPC depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp, re2 - depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp + depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp, re2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS select BR2_PACKAGE_C_ARES diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index cfa5893f41..99a2980a25 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -9,12 +9,13 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative depends on !BR2_BINFMT_FLAT # qt5base-icu depends on BR2_USE_MMU # libglib2, qt5base-dbus + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # re2 -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar" +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, dynamic library, threads, wchar" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ - !BR2_HOST_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR comment "qt5webengine needs an OpenGL and EGL-capable backend" @@ -24,6 +25,7 @@ comment "qt5webengine needs an OpenGL and EGL-capable backend" config BR2_PACKAGE_QT5WEBENGINE bool "qt5webengine" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS # re2 depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2 diff --git a/package/re2/Config.in b/package/re2/Config.in index 0ac0041f6d..b79e711ad3 100644 --- a/package/re2/Config.in +++ b/package/re2/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_RE2 bool "re2" + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS # libabseil-cpp select BR2_PACKAGE_LIBABSEIL_CPP help RE2 is a fast, safe, thread-friendly alternative @@ -12,7 +14,8 @@ config BR2_PACKAGE_RE2 https://github.com/google/re2 -comment "re2 needs a toolchain w/ C++, threads, gcc >= 8" +comment "re2 needs a toolchain w/ C++, threads, dynamic library, gcc >= 8" + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 From romain.naour at smile.fr Wed Feb 7 11:49:41 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 12:49:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/swipl: new package In-Reply-To: <20221216221934.465323-1-ju.o@free.fr> References: <20221216221934.465323-1-ju.o@free.fr> Message-ID: <0d0380e0-e56c-4b0a-bdfa-4a6253124b0b@smile.fr> Hello Julien, Le 16/12/2022 ? 23:19, Julien Olivain a ?crit?: > SWI-Prolog offers a comprehensive free Prolog environment. Since its > start in 1987, SWI-Prolog development has been driven by the needs of > real world applications. SWI-Prolog is widely used in research and > education as well as commercial applications. > > Signed-off-by: Julien Olivain > --- > Tested on top of branch master at commit f62d409 with commands: > > make check-package > ... > 0 warnings generated > > python3 -m flake8 support/testing/tests/package/test_swipl.py > [no-output] > > ./utils/test-pkg -a -p swipl > arm-aarch64 [ 1/44]: OK > bootlin-aarch64-glibc [ 2/44]: OK > bootlin-arcle-hs38-uclibc [ 3/44]: SKIPPED > bootlin-armv5-uclibc [ 4/44]: SKIPPED > bootlin-armv7-glibc [ 5/44]: OK > bootlin-armv7m-uclibc [ 6/44]: SKIPPED > bootlin-armv7-musl [ 7/44]: OK > bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED > bootlin-m68k-68040-uclibc [ 9/44]: SKIPPED > bootlin-microblazeel-uclibc [10/44]: SKIPPED > bootlin-mipsel32r6-glibc [11/44]: OK > bootlin-mipsel-uclibc [12/44]: SKIPPED > bootlin-nios2-glibc [13/44]: SKIPPED > bootlin-openrisc-uclibc [14/44]: SKIPPED > bootlin-powerpc64le-power8-glibc [15/44]: OK > bootlin-powerpc-e500mc-uclibc [16/44]: SKIPPED > bootlin-riscv32-glibc [17/44]: OK > bootlin-riscv64-glibc [18/44]: OK > bootlin-riscv64-musl [19/44]: OK > bootlin-sh4-uclibc [20/44]: SKIPPED > bootlin-sparc64-glibc [21/44]: OK > bootlin-sparc-uclibc [22/44]: SKIPPED > bootlin-x86-64-glibc [23/44]: OK > bootlin-x86-64-musl [24/44]: OK > bootlin-x86-64-uclibc [25/44]: SKIPPED > bootlin-xtensa-uclibc [26/44]: SKIPPED > br-arm-basic [27/44]: SKIPPED > br-arm-full-nothread [28/44]: SKIPPED > br-arm-full-static [29/44]: SKIPPED > br-i386-pentium4-full [30/44]: SKIPPED > br-i386-pentium-mmx-musl [31/44]: OK > br-mips64-n64-full [32/44]: SKIPPED > br-mips64r6-el-hf-glibc [33/44]: OK > br-powerpc-603e-basic-cpp [34/44]: SKIPPED > br-powerpc64-power7-glibc [35/44]: OK > linaro-aarch64-be [36/44]: OK > linaro-aarch64 [37/44]: OK > linaro-arm [38/44]: OK > sourcery-arm-armv4t [39/44]: SKIPPED > sourcery-arm [40/44]: SKIPPED > sourcery-arm-thumb2 [41/44]: SKIPPED > sourcery-mips64 [42/44]: OK > sourcery-mips [43/44]: OK > sourcery-nios2 [44/44]: SKIPPED > 44 builds, 24 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_swipl.TestSWIPL > ... > OK > --- > DEVELOPERS | 3 + > package/Config.in | 1 + > package/swipl/Config.in | 38 +++++++++++++ > package/swipl/swipl.hash | 4 ++ > package/swipl/swipl.mk | 55 +++++++++++++++++++ > support/testing/tests/package/test_swipl.py | 52 ++++++++++++++++++ > .../test_swipl/rootfs-overlay/root/sudoku.pl | 42 ++++++++++++++ > 7 files changed, 195 insertions(+) > create mode 100644 package/swipl/Config.in > create mode 100644 package/swipl/swipl.hash > create mode 100644 package/swipl/swipl.mk > create mode 100644 support/testing/tests/package/test_swipl.py > create mode 100644 support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl > > diff --git a/DEVELOPERS b/DEVELOPERS > index 3a0e3c14ab..38259fd0d8 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1682,6 +1682,7 @@ F: package/python-distro/ > F: package/python-gnupg/ > F: package/python-pyalsa/ > F: package/riscv-isa-sim/ > +F: package/swipl/ > F: package/tinycompress/ > F: package/z3/ > F: package/zynaddsubfx/ > @@ -1696,6 +1697,8 @@ F: support/testing/tests/package/test_ola/ > F: support/testing/tests/package/test_python_distro.py > F: support/testing/tests/package/test_python_gnupg.py > F: support/testing/tests/package/test_python_pyalsa.py > +F: support/testing/tests/package/test_swipl.py > +F: support/testing/tests/package/test_swipl/ > F: support/testing/tests/package/test_z3.py > > N: Julien Viard de Galbert > diff --git a/package/Config.in b/package/Config.in > index 914c3584e9..64e2bdd991 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1351,6 +1351,7 @@ endmenu > endif > source "package/quickjs/Config.in" > source "package/ruby/Config.in" > + source "package/swipl/Config.in" > source "package/tcl/Config.in" > if BR2_PACKAGE_TCL > menu "Tcl libraries/modules" > diff --git a/package/swipl/Config.in b/package/swipl/Config.in > new file mode 100644 > index 0000000000..8d8d5b1b76 > --- /dev/null > +++ b/package/swipl/Config.in > @@ -0,0 +1,38 @@ > +# swipl supports arch for which libc fenv.h provides all four macros: > +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD > +# See for example in glibc https://sourceware.org/git/glibc.git > +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ > +config BR2_PACKAGE_SWIPL_ARCH_SUPPORTS > + bool > + default y if BR2_aarch64 || BR2_aarch64_be > + default y if BR2_arceb || BR2_arcle > + default y if BR2_arm || BR2_armeb > + default y if BR2_i386 > + default y if BR2_m68k > + # BR2_microblaze has only FE_TONEAREST > + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el > + # BR2_nios2 has only FE_TONEAREST > + default y if BR2_or1k > + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le > + default y if BR2_riscv > + default y if BR2_s390x > + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} > + default y if BR2_sparc || BR2_sparc64 > + default y if BR2_x86_64 > + # BR2_xtensa supports only uclibc which does not have fenv.h > + > +config BR2_PACKAGE_SWIPL > + bool "SWI-Prolog" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # __has_attribute() > + depends on BR2_PACKAGE_SWIPL_ARCH_SUPPORTS > + # swipl needs fenv.h which is not provided by uclibc > + depends on !BR2_TOOLCHAIN_USES_UCLIBC > + select BR2_PACKAGE_ZLIB > + help > + SWI-Prolog offers a comprehensive free Prolog > + environment. Since its start in 1987, SWI-Prolog development > + has been driven by the needs of real world > + applications. SWI-Prolog is widely used in research and > + education as well as commercial applications. > + > + https://swi-prolog.org > diff --git a/package/swipl/swipl.hash b/package/swipl/swipl.hash > new file mode 100644 > index 0000000000..be448a5604 > --- /dev/null > +++ b/package/swipl/swipl.hash > @@ -0,0 +1,4 @@ > +# From https://www.swi-prolog.org/download/stable > +sha256 33b5de34712d58f14c1e019bd1613df9a474f5e5fd024155a0f6e67ebb01c307 swipl-9.0.2.tar.gz > +# Locally calculated > +sha256 770594d0f4463b71f1485f00e4bc5cf4b6f667d62ef6bc9bde2fee236541992a LICENSE > diff --git a/package/swipl/swipl.mk b/package/swipl/swipl.mk > new file mode 100644 > index 0000000000..3f232f47f3 > --- /dev/null > +++ b/package/swipl/swipl.mk > @@ -0,0 +1,55 @@ > +################################################################################ > +# > +# swipl > +# > +################################################################################ > + > +SWIPL_VERSION = 9.0.2 > +SWIPL_SITE = https://www.swi-prolog.org/download/stable/src > +SWIPL_LICENSE = BSD-2-Clause > +SWIPL_LICENSE_FILES = LICENSE > + > +SWIPL_DEPENDENCIES = host-swipl zlib > + > +# A host-swipl is needed to compile the target prolog boot > +# boot.prl file. > +HOST_SWIPL_CONF_OPTS = \ > + -DBUILD_PDF_DOCUMENTATION=OFF \ > + -DSWIPL_PACKAGES=OFF \ > + -DUSE_GMP=OFF \ > + -DUSE_TCMALLOC=OFF > + > +# swipl uses cmake macros try_run() and check_c_source_runs(), which > +# are not suitable for cross compilation. We add results in cache to > +# avoid running those tests. The SWIPL_NATIVE_FRIEND variable, is > +# meant to point to build directory of a host native swipl, rather > +# than the binary itself. The Cmake macro will append "src/swipl" to > +# the path set to this variable. Therefore, we cannot use the host > +# "swipl" binary installed in $(HOST_DIR)/usr/bin. > +SWIPL_CONF_OPTS = \ > + -DBUILD_PDF_DOCUMENTATION=OFF \ > + -DHAVE_WEAK_ATTRIBUTE=1 \ > + -DLLROUND_OK=1 \ > + -DMODF_OK=1 \ > + -DQSORT_R_GNU=1 \ > + -DSWIPL_NATIVE_FRIEND=$(BUILD_DIR)/host-swipl-$(SWIPL_VERSION) \ > + -DSWIPL_PACKAGES=OFF \ > + -DUSE_TCMALLOC=OFF > + > +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > +SWIPL_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > +endif > + > +ifeq ($(BR2_PACKAGE_GMP),y) > +SWIPL_CONF_OPTS += -DUSE_GMP=ON > +SWIPL_DEPENDENCIES += gmp > +else > +SWIPL_CONF_OPTS += -DUSE_GMP=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_NCURSES),y) > +SWIPL_DEPENDENCIES += ncurses > +endif > + > +$(eval $(cmake-package)) > +$(eval $(host-cmake-package)) > diff --git a/support/testing/tests/package/test_swipl.py b/support/testing/tests/package/test_swipl.py > new file mode 100644 > index 0000000000..4248f6f13c > --- /dev/null > +++ b/support/testing/tests/package/test_swipl.py > @@ -0,0 +1,52 @@ > +import os > + > +import infra.basetest > + > + > +class TestSWIPL(infra.basetest.BRTest): > + # Need to use a different toolchain than the default due to > + # swipl requiring fenv.h not provided by uclibc. This not true anymore, the Buildroot testing infrastructure switched from uClibc to Glibc somewhere between 2022 and 2024 :) Hopefully the runtime test still pass on the current Buildroot master: ./support/testing/run-tests -k -d dl/ -o testsuite-master tests.package.test_swipl.TestSWIPL 12:33:08 TestSWIPL Starting 12:33:09 TestSWIPL Building 12:35:49 TestSWIPL Building done 12:36:02 TestSWIPL Cleaning up . ---------------------------------------------------------------------- Ran 1 test in 173.451s The complexity of the architecture dependency and the buildsystem make it difficult to review in details. Without going into the details, it seems ok for me. Obviously, the DEVELOPERS file conflict nowadays since several entries has been added since then. Best regards, Romain > + config = \ > + """ > + BR2_arm=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y > + BR2_PACKAGE_SWIPL=y > + BR2_ROOTFS_OVERLAY="{}" > + BR2_TARGET_ROOTFS_CPIO=y > + # BR2_TARGET_ROOTFS_TAR is not set > + """.format( > + # overlay to add a swi prolog test scripts > + infra.filepath("tests/package/test_swipl/rootfs-overlay")) > + > + 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]) > + self.emulator.login() > + > + # Check program executes > + cmd = "swipl --version" > + self.assertRunOk(cmd) > + > + # Check swipl fails when goal is false > + cmd = "swipl -g false" > + _, exit_code = self.emulator.run(cmd) > + self.assertNotEqual(exit_code, 0) > + > + # Test output > + string = "Hello Buildroot !" > + cmd = "swipl -g 'writeln(\"{}\")' -t halt".format(string) > + output, exit_code = self.emulator.run(cmd) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output, [string]) > + > + # Check the swipl demo file works (ex: "sam" likes "pizza") > + cmd = "swipl -g '[swi(demo/likes)]' -g 'likes(sam,pizza)' -t halt" > + self.assertRunOk(cmd) > + > + # Run a more complex logic program (solve a sudoku) > + cmd = "swipl -g top -t halt /root/sudoku.pl" > + self.assertRunOk(cmd, timeout=10) > diff --git a/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl b/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl > new file mode 100644 > index 0000000000..2b68b6cc89 > --- /dev/null > +++ b/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl > @@ -0,0 +1,42 @@ > +% taken from: > +% https://www.swi-prolog.org/pldoc/man?section=clpfd-sudoku > + > +:- use_module(library(clpfd)). > + > +sudoku(Rows) :- > + length(Rows, 9), maplist(same_length(Rows), Rows), > + append(Rows, Vs), Vs ins 1..9, > + maplist(all_distinct, Rows), > + transpose(Rows, Columns), > + maplist(all_distinct, Columns), > + Rows = [As,Bs,Cs,Ds,Es,Fs,Gs,Hs,Is], > + blocks(As, Bs, Cs), > + blocks(Ds, Es, Fs), > + blocks(Gs, Hs, Is). > + > +blocks([], [], []). > +blocks([N1,N2,N3|Ns1], [N4,N5,N6|Ns2], [N7,N8,N9|Ns3]) :- > + all_distinct([N1,N2,N3,N4,N5,N6,N7,N8,N9]), > + blocks(Ns1, Ns2, Ns3). > + > +problem(1, [[_,_,_,_,_,_,_,_,_], > + [_,_,_,_,_,3,_,8,5], > + [_,_,1,_,2,_,_,_,_], > + [_,_,_,5,_,7,_,_,_], > + [_,_,4,_,_,_,1,_,_], > + [_,9,_,_,_,_,_,_,_], > + [5,_,_,_,_,_,_,7,3], > + [_,_,2,_,1,_,_,_,_], > + [_,_,_,_,4,_,_,_,9]]). > + > +top :- writeln("Sudoku solution:"), > + problem(1, Rows), sudoku(Rows), maplist(portray_clause, Rows), > + Rows = [[9, 8, 7, 6, 5, 4, 3, 2, 1], > + [2, 4, 6, 1, 7, 3, 9, 8, 5], > + [3, 5, 1, 9, 2, 8, 7, 4, 6], > + [1, 2, 8, 5, 3, 7, 6, 9, 4], > + [6, 3, 4, 8, 9, 2, 1, 5, 7], > + [7, 9, 5, 4, 6, 1, 8, 3, 2], > + [5, 1, 9, 2, 8, 6, 4, 7, 3], > + [4, 7, 2, 3, 1, 9, 5, 6, 8], > + [8, 6, 3, 7, 4, 5, 2, 1, 9]]. From thomas.petazzoni at bootlin.com Wed Feb 7 11:50:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:50:06 +0100 Subject: [Buildroot] [PATCH 04/10] package/re2: propagate dependencies from libabseil-cpp In-Reply-To: References: Message-ID: <20240207125006.27c84c03@windsurf> On Sun, 28 Jan 2024 14:20:53 +0100 "Yann E. MORIN" wrote: > Commit fc7606010e4e (package/re2: bump to version 2023.11.01) forgot to > propagate the arch dependency from libabsel-cpp to re2, and transitively > to its dependees, causing unmet dependencies warnings (unfortunately, > not errors), such as: > > $ KCONFIG_SEED=0xCCB17344 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LIBABSEIL_CPP > Depends on [n]: BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_8 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] && !BR2_STATIC_LIBS [=n] && BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS [=n] > Selected by [y]: > - BR2_PACKAGE_RE2 [=y] && BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_8 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] > > Fix that, and propagate the dependency. > > Note that qt5webengine depends on glibc, so that implies !static > already. > > Signed-off-by: Yann E. MORIN > Cc: Michael Nosthoff > Cc: Julien Corjon > Cc: Giulio Benetti > --- > package/grpc/Config.in | 2 +- > package/qt5/qt5webengine/Config.in | 1 + > package/re2/Config.in | 8 ++++++-- > 3 files changed, 8 insertions(+), 3 deletions(-) There was already a previous patch from Fabrice to fix this, so I applied his patch https://patchwork.ozlabs.org/project/buildroot/patch/20240118220422.167000-1-fontaine.fabrice at gmail.com/, with some edits. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 11:50:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:50:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: propagate libabseil-cpp dependencies In-Reply-To: <20240118220422.167000-1-fontaine.fabrice@gmail.com> References: <20240118220422.167000-1-fontaine.fabrice@gmail.com> Message-ID: <20240207125041.175fb99a@windsurf> On Thu, 18 Jan 2024 23:04:22 +0100 Fabrice Fontaine wrote: > Commit fc7606010e4edde7a34c545fac0fe7f82d4a5e18 forgot to propagate > libabseil-cpp dependencies to re2 > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > package/qt5/qt5webengine/Config.in | 7 +++++-- > package/re2/Config.in | 7 +++++-- > 2 files changed, 10 insertions(+), 4 deletions(-) I updated the package/grpc/Config.in package, as Yann did in his patch. > diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in > index cfa5893f41..49c9d0e450 100644 > --- a/package/qt5/qt5webengine/Config.in > +++ b/package/qt5/qt5webengine/Config.in > @@ -10,11 +10,12 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS > depends on !BR2_BINFMT_FLAT # qt5base-icu > depends on BR2_USE_MMU # libglib2, qt5base-dbus > > -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar" > +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, dynamic library, threads, wchar" > depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS > + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS This should have gone into BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS, so I moved it there. Thanks, applied with those two changes! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 11:51:00 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:51:00 +0100 Subject: [Buildroot] [git commit] package/petitboot: fix ordering of comments and sub-options Message-ID: <20240207115109.76B8C87574@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06dcbdf8ad3d55b92df4bc3ded82c08e21cbb60e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, the comment about availability is between the package main symbol and its suboptions, breaking the threading in menuconfig. Invert the order, and move the comment last. Also enclose the suboptions between an if-block, as it is more customary. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/petitboot/Config.in | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 93ed3642c3..f931ab91cd 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -19,17 +19,20 @@ config BR2_PACKAGE_PETITBOOT http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html -comment "petitboot needs a toolchain w/ wchar, dynamic library, threads, udev /dev management" - depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_PACKAGE_HAS_UDEV +if BR2_PACKAGE_PETITBOOT config BR2_PACKAGE_PETITBOOT_GETTY_PORT string "TTY port(s)" default "console" - depends on BR2_PACKAGE_PETITBOOT help Specify a space-separated list of ports to run the petitboot UI on. Wildcards are allowed. Example: "hvc* ttys0 ttyS*" + +endif # BR2_PACKAGE_PETITBOOT + +comment "petitboot needs a toolchain w/ wchar, dynamic library, threads, udev /dev management" + depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_PACKAGE_HAS_UDEV From thomas.petazzoni at bootlin.com Wed Feb 7 11:51:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:51:12 +0100 Subject: [Buildroot] [PATCH 05/10] package/petitboot: fix ordering of comments and sub-options In-Reply-To: References: Message-ID: <20240207125112.4d4f7de2@windsurf> On Sun, 28 Jan 2024 14:20:54 +0100 "Yann E. MORIN" wrote: > Currently, the comment about availability is between the package main > symbol and its suboptions, breaking the threading in menuconfig. > > Invert the order, and move the comment last. Also enclose the suboptions > between an if-block, as it is more customary. > > Signed-off-by: Yann E. MORIN > --- > package/petitboot/Config.in | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Wed Feb 7 11:57:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 12:57:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ml-dtypes: needs C++ In-Reply-To: <20240112221910.14778-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 12 Jan 2024 23:19:10 +0100") References: <20240112221910.14778-1-fontaine.fabrice@gmail.com> Message-ID: <87sf24zdu7.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit ebe47e7605c6cde295e209d80690508cfd11ba61 forgot to add C++ > dependency resulting in the following build failure: > ../output-1/build/python-numpy-1.25.0/meson.build:1:0: ERROR: Unable to detect GNU compiler type: > Fixes: > - http://autobuild.buildroot.org/results/6f3532598355732b289730fc751e9aebdab4b0e4 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 11:58:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 12:58:13 +0100 Subject: [Buildroot] [git commit] package/python-ml-dtypes: needs C++ Message-ID: <20240207115839.087798757A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=650c2b83b515bf6941189b837d87819a901ec901 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit ebe47e7605c6cde295e209d80690508cfd11ba61 forgot to add C++ dependency resulting in the following build failure: ../output-1/build/python-numpy-1.25.0/meson.build:1:0: ERROR: Unable to detect GNU compiler type: Fixes: - http://autobuild.buildroot.org/results/6f3532598355732b289730fc751e9aebdab4b0e4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-ml-dtypes/Config.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in index 8791564b19..58c218b214 100644 --- a/package/python-ml-dtypes/Config.in +++ b/package/python-ml-dtypes/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES bool "python-ml-dtypes" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # python-pybind, python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy @@ -10,3 +11,9 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES dtype extensions used in machine learning libraries. https://github.com/jax-ml/ml_dtypes + +comment "python-ml-dtypes needs a glibc or musl toolchain w/ C++, gcc >= 9" + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) From giulio.benetti at benettiengineering.com Wed Feb 7 13:48:50 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 14:48:50 +0100 Subject: [Buildroot] [PATCH v4 3/3] configs/freescale_imx93evk: new defconfig In-Reply-To: <20240115-imx93-support-v4-3-8d7f90f60980@armadeus.com> References: <20240115-imx93-support-v4-0-8d7f90f60980@armadeus.com> <20240115-imx93-support-v4-3-8d7f90f60980@armadeus.com> Message-ID: <89d38f8c-5190-4813-9163-fb2dfa222a6c@benettiengineering.com> Hi S?bastien, On 23/01/24 09:45, S?bastien Szymanski wrote: > This patch adds support for the NXP i.MX 93 11x11 EVK board [1]. > > [1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-93-evaluation-kit:i.MX93EVK > > Reviewed-by: Julien Olivain > Tested-by: Julien Olivain > [Julien: tested on NXP board i.MX93EVK, cpu rev A1, board rev B] > Signed-off-by: S?bastien Szymanski > Reviewed-by: Gary Bisson > --- > Changes for v4: > - None > > Changes for v3: > - BR2_PACKAGE_FIRMWARE_SENTINEL=y -> BR2_PACKAGE_FIRMWARE_ELE_IMX=y > - add a note about the debug UART in the readme.txt file (Julien Olivain) > - add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y and > BR2_TARGET_UBOOT_NEEDS_GNUTLS=y to the defconfig file (Julien Olivain) > - bump ATF, U-Boot and Linux to latest NXP release lf-6.1.55-2.2.0 > (Julien Olivain) > > Changes for v2: > - none > --- > .../common/imx/genimage.cfg.template_imx9 | 41 ++++++++++++ > .../common/imx/imx9-bootloader-prepare.sh | 34 ++++++++++ > board/freescale/common/imx/post-image.sh | 4 ++ > board/freescale/imx93evk/readme.txt | 77 ++++++++++++++++++++++ > configs/freescale_imx93evk_defconfig | 39 +++++++++++ > 5 files changed, 195 insertions(+) > > diff --git a/board/freescale/common/imx/genimage.cfg.template_imx9 b/board/freescale/common/imx/genimage.cfg.template_imx9 > new file mode 100644 > index 000000000000..10e192ce5774 > --- /dev/null > +++ b/board/freescale/common/imx/genimage.cfg.template_imx9 > @@ -0,0 +1,41 @@ > +# Minimal SD card image for the Freescale iMX9 boards > +# > +# We mimic the .sdcard Freescale's image format: > +# * the SD card must have 32 kB free space at the beginning, > +# * U-Boot is integrated into imx9-boot-sd.bin and is dumped as is, > +# * a FAT partition at offset 8MB is containing Image and DTB files > +# * a single root filesystem partition is required (ext2, ext3 or ext4) > +# > + > +image boot.vfat { > + vfat { > + label = "boot" > + files = { > + %FILES% > + } > + } > + size = 64M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "imx9-boot-sd.bin" > + offset = %IMXOFFSET% > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + offset = 8M > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext2" > + } > +} Please format genimage.cfg file according to Buildroot Manual: https://buildroot.org/downloads/manual/manual.html#writing-genimage-cfg > diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh > new file mode 100755 > index 000000000000..4ff92fa4cd23 > --- /dev/null > +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh > @@ -0,0 +1,34 @@ > +#!/usr/bin/env bash > + > +main () > +{ > + SPL_LOAD_ADDR=0x2049A000 > + ATF_LOAD_ADDR=0x204E0000 > + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" ${BR2_CONFIG}; then > + SPL_LOAD_ADDR=0x204A0000 > + ATF_LOAD_ADDR=0x204C0000 > + fi > + > + dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync > + cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin > + > + ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit > + cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin > + rm -f ${BINARIES_DIR}/mkimg.commit > + > + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then > + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -c -ap ${BINARIES_DIR}/bl31.bin a35 ${ATF_LOAD_ADDR} -ap ${BINARIES_DIR}/u-boot-hash.bin a35 0x80200000 -ap ${BINARIES_DIR}/tee.bin a35 0x96000000 -out ${BINARIES_DIR}/u-boot-atf-container.img > + else > + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -c -ap ${BINARIES_DIR}/bl31.bin a35 ${ATF_LOAD_ADDR} -ap ${BINARIES_DIR}/u-boot-hash.bin a35 0x80200000 -out ${BINARIES_DIR}/u-boot-atf-container.img > + fi > + > + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -append ${BINARIES_DIR}/ahab-container.img -c -ap ${BINARIES_DIR}/u-boot-spl-ddr.bin a35 ${SPL_LOAD_ADDR} -out ${BINARIES_DIR}/imx9-boot-sd.bin > + > + flashbin_size=$(wc -c ${BINARIES_DIR}/imx9-boot-sd.bin | awk '{print $1}') > + pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400)) > + dd if=${BINARIES_DIR}/u-boot-atf-container.img of=${BINARIES_DIR}/imx9-boot-sd.bin bs=1K seek=${pad_cnt} > + > + exit $? > +} > + > +main $@ > diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh > index c359ef6032a6..3df7e820938b 100755 > --- a/board/freescale/common/imx/post-image.sh > +++ b/board/freescale/common/imx/post-image.sh > @@ -48,6 +48,10 @@ genimage_type() > echo "genimage.cfg.template_imx8" > elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" ${BR2_CONFIG}; then > echo "genimage.cfg.template_imx8" > + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" ${BR2_CONFIG}; then > + echo "genimage.cfg.template_imx9" > + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y$" ${BR2_CONFIG}; then > + echo "genimage.cfg.template_imx9" > elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then > if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then > echo "genimage.cfg.template_no_boot_part_spl" > diff --git a/board/freescale/imx93evk/readme.txt b/board/freescale/imx93evk/readme.txt > new file mode 100644 > index 000000000000..1173de39dbb1 > --- /dev/null > +++ b/board/freescale/imx93evk/readme.txt > @@ -0,0 +1,77 @@ > +********************* > +NXP i.MX93 EVK board > +********************* > + > +This file documents the Buildroot support for the i.MX 93 EVK board. > + > +Build > +===== > + > +First, configure Buildroot for the i.MX 93 EVK board: > + > + make freescale_imx93evk_defconfig > + > +Build all components: > + > + make > + > +You will find in output/images/ the following files: > + - ahab-container.img > + - bl31.bin > + - boot.vfat > + - ddr_fw.bin > + - Image > + - imx93-11x11-evk.dtb > + - imx9-boot-sd.bin > + - lpddr4_pmu_train_fw.bin > + - rootfs.ext2 > + - rootfs.ext4 > + - rootfs.tar > + - sdcard.img > + - u-boot-atf-container.img > + - u-boot.bin > + - u-boot-hash.bin > + - u-boot-spl.bin > + - u-boot-spl-ddr.bin > + - u-boot-spl-padded.bin > + > +Create a bootable SD card > +========================= > + > +To determine the device associated to the SD card have a look in the > +/proc/partitions file: > + > + cat /proc/partitions > + > +Buildroot prepares a bootable "sdcard.img" image in the output/images/ > +directory, ready to be dumped on a SD card. Launch the following > +command as root: > + > + dd if=output/images/sdcard.img of=/dev/ > + > +*** WARNING! This will destroy all the card content. Use with care! *** > + > +For details about the medium image layout, see the definition in > +board/freescale/common/imx/genimage.cfg.template_imx9. > + > +Boot the i.MX 93 EVK board > +=============================== > + > +To boot your newly created system (refer to the i.MX 93 EVK Documentation > +[1] for guidance): > +- insert the SD card in the SD slot of the board; > +- Configure the switches as follows: > +SW1301: 0100 SW1301[1-4] > +- put a micro USB cable into the Debug USB Port and connect using a terminal > + emulator at 115200 bps, 8n1; > +- power on the board. > + > +Note: the debug USB connector presents 4 UARTs (for example /dev/ttyUSB[0-3]), > +the Cortex-A55 UART should be the 3rd one (in the previous example, /dev/ttyUSB2). > +Refer to the documentation [1] for more details. > + > +Enjoy! > + > +References > +========== > +[1] https://www.nxp.com/document/guide/getting-started-with-the-i-mx93-evk:GS-IMX93EVK > diff --git a/configs/freescale_imx93evk_defconfig b/configs/freescale_imx93evk_defconfig > new file mode 100644 > index 000000000000..34baf04c88db > --- /dev/null > +++ b/configs/freescale_imx93evk_defconfig > @@ -0,0 +1,39 @@ > +BR2_aarch64=y > +BR2_cortex_a55=y > +BR2_ARM_FPU_VFPV4D16=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > +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.1.55-2.2.0)/linux-imx-lf-6.1.55-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" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y > +BR2_PACKAGE_FIRMWARE_ELE_IMX=y > +BR2_PACKAGE_FIRMWARE_IMX=y > +BR2_TARGET_ROOTFS_EXT2=y > +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.1.55-2.2.0)/imx-atf-lf-6.1.55-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.1.55-2.2.0)/uboot-imx-lf-6.1.55-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 > +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_IMX_MKIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y For the rest all the patchset looks good to me and I've built this defconfig successfully using buildroot/utils/docker-run so: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Wed Feb 7 14:06:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:06:16 +0100 Subject: [Buildroot] Call for more autobuilder machines Message-ID: <20240207150616.2683d894@windsurf> Dear Buildroot community members, Our "autobuilder" infrastructure, whose results are presented at http://autobuild.buildroot.net/, and sent on a daily basis to the mailing list and individual developers, is critical to the proper testing of Buildroot. Unfortunately, over recent times, less and less machines have been contributing build results, to the point where we only test 100-120 builds per day, which is not enough to have good coverage. Indeed, the builds are done by various machines that contribute their results to autobuild.buildroot.net. Therefore, the way to increase the number of builds done per day is to increase the number of machines that contributes to the build. So this e-mail is a call for participation: if you have some machines that could be used to run Buildroot builds 24/7, or at least during the night and/or week-end, it would be useful. However, beware that it only makes sense to contribute if you have a sufficiently powerful machine at hand: enough RAM, fast storage, recently recent CPU. At least 4 cores (not threads), 32 GB of RAM, and SSD/NVMe. If you are interested in contributing to this, contact us and we will give you the details. It's pretty much as simple as running https://git.buildroot.org/buildroot-test/tree/scripts/autobuild-run on your machine, as an unprivileged user (no root/sudo access needed), and that's it. Thanks a lot for your collaboration! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:25:23 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:25:23 +0100 Subject: [Buildroot] [git commit] package/petitboot: propagate dependencies from kexec/kexec-lite Message-ID: <20240207142542.5284687589@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c721a583790ef9e35e2a974450bdcbc5662621c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 719921bebe17 (package/kexec: bump to version 2.0.27) forgot to propagate the new dependency on kernel headers to petitboot, which may select kexec, causing unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0x84462FFC make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_KEXEC Depends on [n]: BR2_PACKAGE_KEXEC_ARCH_SUPPORTS [=y] && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 [=n] Selected by [y]: - BR2_PACKAGE_PETITBOOT [=y] && (BR2_PACKAGE_KEXEC_ARCH_SUPPORTS [=y] || BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS [=n]) && BR2_USE_MMU [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_PACKAGE_HAS_UDEV [=y] && !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS [=n] Propagate the dependency from kexec, and add comments about dependencies also inherited from kexec-lite. Signed-off-by: Yann E. MORIN Cc: Laurent Vivier Cc: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/petitboot/Config.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index f931ab91cd..6a3d476b11 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -2,10 +2,11 @@ config BR2_PACKAGE_PETITBOOT bool "petitboot" depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS || BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS depends on BR2_USE_MMU # lvm2 - depends on BR2_USE_WCHAR # elfutils - depends on !BR2_STATIC_LIBS # elfutils, lvm2 - depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, lvm2 + depends on BR2_USE_WCHAR # elfutils, kexec-lite + depends on !BR2_STATIC_LIBS # elfutils, kexec-lite, lvm2 + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, kexec-lite, lvm2 depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || !BR2_PACKAGE_KEXEC_ARCH_SUPPORTS # kexec select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LVM2 # devmapper select BR2_PACKAGE_NCURSES @@ -36,3 +37,7 @@ comment "petitboot needs a toolchain w/ wchar, dynamic library, threads, udev /d depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_PACKAGE_HAS_UDEV + +comment "petitboot w/ kexec needs a toolchain w/ headers >= 3.17" + depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 From thomas.petazzoni at bootlin.com Wed Feb 7 14:25:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:25:49 +0100 Subject: [Buildroot] [PATCH 06/10] package/petitboot: propagate depednencies from kexec/kexec-lite In-Reply-To: <7a6ed8af0a4692069c8b146c6b14647db89c9d23.1706448055.git.yann.morin.1998@free.fr> References: <7a6ed8af0a4692069c8b146c6b14647db89c9d23.1706448055.git.yann.morin.1998@free.fr> Message-ID: <20240207152549.767b3a75@windsurf> On Sun, 28 Jan 2024 14:20:55 +0100 "Yann E. MORIN" wrote: > Commit 719921bebe17 (package/kexec: bump to version 2.0.27) forgot to > propagate the new dependency on kernel headers to petitboot, which may > select kexec, causing unmet dependencies warnings (unfortunately, not > errors), such as; > > $ KCONFIG_SEED=0x84462FFC make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_KEXEC > Depends on [n]: BR2_PACKAGE_KEXEC_ARCH_SUPPORTS [=y] && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 [=n] > Selected by [y]: > - BR2_PACKAGE_PETITBOOT [=y] && (BR2_PACKAGE_KEXEC_ARCH_SUPPORTS [=y] || BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS [=n]) && BR2_USE_MMU [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_PACKAGE_HAS_UDEV [=y] && !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS [=n] > > Propagate the dependency from kexec, and add comments about dependencies > also inherited from kexec-lite. > > Signed-off-by: Yann E. MORIN > Cc: Laurent Vivier > Cc: Julien Olivain > --- > package/petitboot/Config.in | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:26:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:26:43 +0100 Subject: [Buildroot] [PATCH 07/10] package/python-ml-dtypes: propagate dependencies from numpy, pybind In-Reply-To: <3afcc982685e876ac9b2ae54f86164647040ab85.1706448055.git.yann.morin.1998@free.fr> References: <3afcc982685e876ac9b2ae54f86164647040ab85.1706448055.git.yann.morin.1998@free.fr> Message-ID: <20240207152643.1443c46a@windsurf> On Sun, 28 Jan 2024 14:20:56 +0100 "Yann E. MORIN" wrote: > Commit ebe47e7605c6 (package/python-ml-dtypes: new package) forgot to > account for all the dependencies from python-pybind and python-numpy, > causing unmet dependencies warnings (unfortunately, not errors), such > as: > > $ KCONFIG_SEED=0x85C244F4 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_NUMPY > Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS [=y] && BR2_INSTALL_LIBSTDCPP [=n] && (BR2_TOOLCHAIN_USES_GLIBC [=y] || BR2_TOOLCHAIN_USES_MUSL [=n]) && BR2_TOOLCHAIN_GCC_AT_LEAST_9 [=y] > Selected by [y]: > - BR2_PACKAGE_PYTHON_ML_DTYPES [=y] && BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS [=y] && (BR2_TOOLCHAIN_USES_GLIBC [=y] || BR2_TOOLCHAIN_USES_MUSL [=n]) && BR2_TOOLCHAIN_GCC_AT_LEAST_9 [=y] && BR2_HOST_GCC_AT_LEAST_9 [=y] > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PYBIND > Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=n] > Selected by [y]: > - BR2_PACKAGE_PYTHON_ML_DTYPES [=y] && BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS [=y] && (BR2_TOOLCHAIN_USES_GLIBC [=y] || BR2_TOOLCHAIN_USES_MUSL [=n]) && BR2_TOOLCHAIN_GCC_AT_LEAST_9 [=y] && BR2_HOST_GCC_AT_LEAST_9 [=y] > > Propagate the C++ dependency from both numpy and pybind. > > Signed-off-by: Yann E. MORIN > Cc: Julien Olivain > --- > package/python-ml-dtypes/Config.in | 1 + > 1 file changed, 1 insertion(+) This has already been fixed by 650c2b83b515bf6941189b837d87819a901ec901, which also added the Config.in comment. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:45:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:45:31 +0100 Subject: [Buildroot] Invitation to the Buildroot Association General Assembly Message-ID: <20240207154531.02546408@windsurf> Hello, The Buildroot project is supported by the "Buildroot Association" a french "association loi 1901" non-profit organization. As per its bylaws, the Buildroot Association will organize its yearly General Assembly on February 28, at 9 PM UTC+1, online. The agenda of the General Assembly is: - Presentation and approval of the 2023 moral report - Presentation and approval of the 2023 financial report - Election of the new association board - Misc topics, Q&A The General Assembly is open to everyone. Only the members of the association will be allowed to vote. How to become a member of the association is described at https://buildroot.org/association.html. The link to join the video call for the General Assembly is: https://meet.google.com/ffc-exxp-piv Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:53:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:53:49 +0100 Subject: [Buildroot] [git commit] package/opencv-contrib: propagate opencv4 dependencies Message-ID: <20240207145429.846BB8759B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2e01b23fc441a4be4416e68d91e331e00db3bbd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit a7736afacaef (package/opencv4-contrib: properly note dependencies between modules) forgot to propagate the dependencies of selected symbols, causing unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0x9F66F854 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_OPENCV4_LIB_DNN Depends on [n]: BR2_PACKAGE_OPENCV4 [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=y] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y] Selected by [y]: - BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT [=y] && BR2_PACKAGE_OPENCV4_CONTRIB [=y] Propagate the dependencies and add associated comments. Signed-off-by: Yann E. MORIN Cc: Woodrow Douglass Signed-off-by: Thomas Petazzoni --- package/opencv4-contrib/Config.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/opencv4-contrib/Config.in b/package/opencv4-contrib/Config.in index 951d5f71ad..261d414869 100644 --- a/package/opencv4-contrib/Config.in +++ b/package/opencv4-contrib/Config.in @@ -74,19 +74,31 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DATASETS config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT bool "dnn_objdetect" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 dnn + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 dnn select BR2_PACKAGE_OPENCV4_LIB_DNN help Object Detection using CNNs -- Implements compact CNN Model for object detection. Trained using Caffe but uses opencv_dnn module. +comment "dnn_objdetect needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_SUPERRES bool "dnn_superres" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 dnn + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 dnn select BR2_PACKAGE_OPENCV4_LIB_DNN help Superresolution using CNNs -- Contains four trained convolutional neural networks to upscale images. +comment "dnn_superres needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED bool "dnns_easily_fooled" help From thomas.petazzoni at bootlin.com Wed Feb 7 14:52:00 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:52:00 +0100 Subject: [Buildroot] [git commit] package/opencv4: propagate internal dependencies Message-ID: <20240207145429.78E4A87599@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b553c9123b9fff5e7a97c19668bee20b15c1d736 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit e22994378553 (package/opencv4: BR2_PACKAGE_OPENCV4_LIB_OBJDETECT requires BR2_PACKAGE_OPENCV4_LIB_DNN) forgot to propagate the dependency to the internal stitching option, and to the contrib options dpm, face, and xobjdetect, causing unmet dependencies warning (unfortunately, not errors) such as: $ KCONFIG_SEED=0x9F66F854 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_OPENCV4_LIB_OBJDETECT Depends on [n]: BR2_PACKAGE_OPENCV4 [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=y] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y] Selected by [y]: - BR2_PACKAGE_OPENCV4_LIB_STITCHING [=y] && BR2_PACKAGE_OPENCV4 [=y] - BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT [=y] && BR2_PACKAGE_OPENCV4_CONTRIB [=y] Propagate the dependencies. Signed-off-by: Yann E. MORIN Cc: Woodrow Douglass Cc: Fabrice Fontaine Cc: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/opencv4-contrib/Config.in | 18 ++++++++++++++++++ package/opencv4/Config.in | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/package/opencv4-contrib/Config.in b/package/opencv4-contrib/Config.in index 851241ce5e..951d5f71ad 100644 --- a/package/opencv4-contrib/Config.in +++ b/package/opencv4-contrib/Config.in @@ -95,18 +95,30 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DPM bool "dpm" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT help Deformable Part Model -- Felzenszwalb's Cascade with deformable parts object recognition code. +comment "dpm needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FACE bool "face" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT help Face Recognition -- Face recognition techniques: Eigen, Fisher and Local Binary Pattern Histograms LBPH methods. +comment "face needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FREETYPE bool "freetype" help @@ -317,12 +329,18 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XIMGPROC config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT bool "xobjdetect" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT help Boosted 2D Object Detection -- Uses a Waldboost cascade and local binary patterns computed as integral features for 2D object detection. +comment "xobjdetect needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO bool "xphoto" select BR2_PACKAGE_OPENCV4_LIB_PHOTO diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in index 78ec7c2e41..f1a2d02d50 100644 --- a/package/opencv4/Config.in +++ b/package/opencv4/Config.in @@ -203,6 +203,8 @@ config BR2_PACKAGE_OPENCV4_LIB_SHAPE config BR2_PACKAGE_OPENCV4_LIB_STITCHING bool "stitching" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # objdetect select BR2_PACKAGE_OPENCV4_LIB_CALIB3D select BR2_PACKAGE_OPENCV4_LIB_FEATURES2D select BR2_PACKAGE_OPENCV4_LIB_IMGPROC @@ -211,6 +213,10 @@ config BR2_PACKAGE_OPENCV4_LIB_STITCHING Include opencv_stitching (images stitching) module into the OpenCV build. +comment "stitching needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_LIB_SUPERRES bool "superres" select BR2_PACKAGE_OPENCV4_LIB_IMGPROC From thomas.petazzoni at bootlin.com Wed Feb 7 14:55:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:55:12 +0100 Subject: [Buildroot] [PATCH 08/10] package/opencv4: propagate internal dependencies In-Reply-To: <4ec42d32f6ea3c94fee3da6d63c884b5594d2c0e.1706448055.git.yann.morin.1998@free.fr> References: <4ec42d32f6ea3c94fee3da6d63c884b5594d2c0e.1706448055.git.yann.morin.1998@free.fr> Message-ID: <20240207155512.150c4abc@windsurf> On Sun, 28 Jan 2024 14:20:57 +0100 "Yann E. MORIN" wrote: > Commit e22994378553 (package/opencv4: BR2_PACKAGE_OPENCV4_LIB_OBJDETECT > requires BR2_PACKAGE_OPENCV4_LIB_DNN) forgot to propagate the dependency > to the internal stitching option, and to the contrib options dpm, face, > and xobjdetect, causing unmet dependencies warning (unfortunately, not > errors) such as: > > $ KCONFIG_SEED=0x9F66F854 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_OPENCV4_LIB_OBJDETECT > Depends on [n]: BR2_PACKAGE_OPENCV4 [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=y] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y] > Selected by [y]: > - BR2_PACKAGE_OPENCV4_LIB_STITCHING [=y] && BR2_PACKAGE_OPENCV4 [=y] > - BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT [=y] && BR2_PACKAGE_OPENCV4_CONTRIB [=y] > > Propagate the dependencies. > > Signed-off-by: Yann E. MORIN > Cc: Woodrow Douglass > Cc: Fabrice Fontaine > Cc: Giulio Benetti > --- > package/opencv4-contrib/Config.in | 18 ++++++++++++++++++ > package/opencv4/Config.in | 6 ++++++ > 2 files changed, 24 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:55:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:55:15 +0100 Subject: [Buildroot] [PATCH 09/10] package/opencv-contrib: propagate opencv4 dependencies In-Reply-To: <681d58c130501398b80678a980d2fe511d35015f.1706448055.git.yann.morin.1998@free.fr> References: <681d58c130501398b80678a980d2fe511d35015f.1706448055.git.yann.morin.1998@free.fr> Message-ID: <20240207155515.6cd7da0f@windsurf> On Sun, 28 Jan 2024 14:20:58 +0100 "Yann E. MORIN" wrote: > Commit a7736afacaef (package/opencv4-contrib: properly note dependencies > between modules) forgot to propagate the dependencies of selected > symbols, causing unmet dependencies warnings (unfortunately, not > errors), such as: > > $ KCONFIG_SEED=0x9F66F854 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_OPENCV4_LIB_DNN > Depends on [n]: BR2_PACKAGE_OPENCV4 [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=y] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y] > Selected by [y]: > - BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT [=y] && BR2_PACKAGE_OPENCV4_CONTRIB [=y] > > Propagate the dependencies and add associated comments. > > Signed-off-by: Yann E. MORIN > Cc: Woodrow Douglass > --- > package/opencv4-contrib/Config.in | 12 ++++++++++++ > 1 file changed, 12 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:56:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:56:15 +0100 Subject: [Buildroot] [git commit] package/libtalloc: bump version to 2.4.2 Message-ID: <20240207145654.C144B875A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=647edeba3476921c0dab901c7124ecbfeaa5da97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes build issue of the python support with python 3.12 (2.3.4 unconditionally uses distutils). The license file used being a header file, it has changed due to code changes, but the license is still LGPL-3.0+. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/libtalloc/libtalloc.hash | 4 ++-- package/libtalloc/libtalloc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libtalloc/libtalloc.hash b/package/libtalloc/libtalloc.hash index 0bc8edb695..5577583881 100644 --- a/package/libtalloc/libtalloc.hash +++ b/package/libtalloc/libtalloc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505 talloc-2.3.4.tar.gz -sha256 f8340c449dd64a55c6605b02fcad2aec6f473612ac6026739a22995380a8043c talloc.h +sha256 85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6 talloc-2.4.2.tar.gz +sha256 e01fb092aaed2b431be26674e2b791c77fb5984537c29b514e957582c6b31465 talloc.h diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk index ca15180d22..676076b857 100644 --- a/package/libtalloc/libtalloc.mk +++ b/package/libtalloc/libtalloc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTALLOC_VERSION = 2.3.4 +LIBTALLOC_VERSION = 2.4.2 LIBTALLOC_SOURCE = talloc-$(LIBTALLOC_VERSION).tar.gz LIBTALLOC_SITE = https://www.samba.org/ftp/talloc LIBTALLOC_LICENSE = LGPL-3.0+ From thomas.petazzoni at bootlin.com Wed Feb 7 14:57:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:57:42 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am64x_sk_defconfig: explicitly set the kernel version In-Reply-To: <20240207092111.236577-1-romain.naour@smile.fr> References: <20240207092111.236577-1-romain.naour@smile.fr> Message-ID: <20240207155742.1d6e70a2@windsurf> On Wed, 7 Feb 2024 10:21:10 +0100 Romain Naour wrote: > Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to > specify the Linux kernel version, so do that now. > > When the defconfig was added, the default version was 6.4.x, so use > version 6.4.16. > > Signed-off-by: Romain Naour > --- > configs/ti_am64x_sk_defconfig | 3 +++ > 1 file changed, 3 insertions(+) Both applied to master, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:57:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:57:27 +0100 Subject: [Buildroot] [git commit] configs/ti_am64x_sk_defconfig: explicitly set the kernel version Message-ID: <20240207145844.C7072875A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=820db039f2d6e34326400f01ab61d21cb664fa34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the Linux kernel version, so do that now. When the defconfig was added, the default version was 6.4.x, so use version 6.4.16. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/ti_am64x_sk_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 052c440093..b3e69e9e93 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,7 +1,10 @@ BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" From thomas.petazzoni at bootlin.com Wed Feb 7 14:57:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:57:30 +0100 Subject: [Buildroot] [git commit] configs/ti_am64x_sk_defconfig: drop redundant defconfig choice Message-ID: <20240207145844.D0B72875AB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65a12fb53ab95a22a2a7b19b8f53396ce4fb561c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The defconfig choice is the default one, so it is redundant and can be removed without effect. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/ti_am64x_sk_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index b3e69e9e93..4bfd31f0c8 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -24,7 +24,6 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y -BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y From yann.morin.1998 at free.fr Wed Feb 7 15:08:42 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:08:42 +0100 Subject: [Buildroot] [PATCH v4 3/7] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib In-Reply-To: <20240202093625.1409559-4-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-4-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > From: Romain Naour > > This target version is needed for Rusticl which is an LLVM based OpenCL > framework[1]. Rusticl allow programs to compile OpenCL C/C++ code > at runtime with Clang. Clang generates LLVM IR which is translated into > SPIR-V by spirv-llvm-translator. Finally, mesa can use its internal > tools to manage SPIR-V. > > [1]: https://docs.mesa3d.org/rusticl.html > > Signed-off-by: Romain Naour > Signed-off-by: Sebastian Weyer > Signed-off-by: Antoine Coutant > --- [--SNIP--] > diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk > index 523890a986..8361a74c59 100644 > --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk > +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk > @@ -10,7 +10,7 @@ SPIRV_LLVM_TRANSLATOR_VERSION = v15.0.0-46-ge82ecc2bd7295604fcf1824e47c95fa6a09c > SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) > SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA > SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT > -HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers > +HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers spirv-headers zlib It looks dubious that a host package, host-spirv-llvm-translator, depends on target packages, spirv-headers and zlib. If this is really the case, then this would require a good explanation in the commit log. > HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ > -DLLVM_BUILD_TOOLS=ON \ > -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ > @@ -19,4 +19,14 @@ HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ > -DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \ > -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(HOST_DIR)/include > > +SPIRV_LLVM_TRANSLATOR_INSTALL_STAGING = YES > +SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm llvm > +SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ > + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${STAGING_DIR}/usr \ $ ./utils/docker-run make check-package package/spirv-llvm-translator/spirv-llvm-translator.mk:25: use $() to delimit variables, not ${} Regards, Yann E. MORIN. > + -DLLVM_BUILD_TOOLS=ON \ > + -DLLVM_DIR=$(STAGING_DIR)/lib/cmake/llvm \ > + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ > + -DLLVM_SPIRV_INCLUDE_TESTS=OFF > + > +$(eval $(cmake-package)) > $(eval $(host-cmake-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Feb 7 14:59:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:59:02 +0100 Subject: [Buildroot] [git commit] package/python-bitarray: new package Message-ID: <20240207150901.E23EA875B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=218fa820f541df593f35ee8468c4f531499caf4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package is needed at runtime by python-bitstring since 4.1.0 already [1]. Note: the License is under Python-2.0 but "Python Software Foundation License (PSF)" has been remplaced by the author of bitarray Ilan Schnell. [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 Signed-off-by: Romain Naour Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-bitarray/Config.in | 6 ++++++ package/python-bitarray/python-bitarray.hash | 5 +++++ package/python-bitarray/python-bitarray.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/package/Config.in b/package/Config.in index 4c6deb1333..91a6f1de00 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1008,6 +1008,7 @@ menu "External python modules" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bidict/Config.in" + source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" source "package/python-bleak/Config.in" source "package/python-blinker/Config.in" diff --git a/package/python-bitarray/Config.in b/package/python-bitarray/Config.in new file mode 100644 index 0000000000..38d685f4fd --- /dev/null +++ b/package/python-bitarray/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_BITARRAY + bool "python-bitarray" + help + efficient arrays of booleans -- C extension. + + https://github.com/ilanschnell/bitarray diff --git a/package/python-bitarray/python-bitarray.hash b/package/python-bitarray/python-bitarray.hash new file mode 100644 index 0000000000..d91a28af20 --- /dev/null +++ b/package/python-bitarray/python-bitarray.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/bitarray/json +md5 024324a82314e9e68ecdcdefdc69071f bitarray-2.9.2.tar.gz +sha256 a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e bitarray-2.9.2.tar.gz +# Locally computed sha256 checksums +sha256 6b5e04f6e0462e1b97be833f9d65e66cd5eceb3283f4a6f532261087d0ab1233 LICENSE diff --git a/package/python-bitarray/python-bitarray.mk b/package/python-bitarray/python-bitarray.mk new file mode 100644 index 0000000000..f86320c112 --- /dev/null +++ b/package/python-bitarray/python-bitarray.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-bitarray +# +################################################################################ + +PYTHON_BITARRAY_VERSION = 2.9.2 +PYTHON_BITARRAY_SOURCE = bitarray-$(PYTHON_BITARRAY_VERSION).tar.gz +PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/c7/bf/25cf92a83e1fe4948d7935ae3c02f4c9ff9cb9c13e977fba8af11a5f642c +PYTHON_BITARRAY_SETUP_TYPE = setuptools +PYTHON_BITARRAY_LICENSE = Python-2.0 +PYTHON_BITARRAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 7 15:08:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:08:31 +0100 Subject: [Buildroot] [git commit] package/python-bitstring: add missing runtime dependency Message-ID: <20240207150901.F1D8F875A8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f1e1b1b171618952725bffdbe73827e062735c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-bitstring require python-bitarray and python-zlib at runtime since 4.1.0 release [1][2]. python-zlib is now needed for the "Experimental support for two 8-bit float types" [2]. Fixes: https://gitlab.com/kubu93/buildroot/-/jobs/6114047821 [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 [2] https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 Signed-off-by: Romain Naour Cc: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-bitstring/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-bitstring/Config.in b/package/python-bitstring/Config.in index 93d7682577..82d0bb29c6 100644 --- a/package/python-bitstring/Config.in +++ b/package/python-bitstring/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_BITSTRING bool "python-bitstring" + select BR2_PACKAGE_PYTHON_BITARRAY # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Simple construction, analysis and modification of binary data. From yann.morin.1998 at free.fr Wed Feb 7 15:13:20 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:13:20 +0100 Subject: [Buildroot] [PATCH v4 2/7] package/pkg-meson.mk: add rust cross-compiler support In-Reply-To: <20240202093625.1409559-3-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-3-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > From: Romain Naour > > This change is needed to be able to build target packages requiring > rust. If a package has rust in its project or in an add_language() > call in their meson.build file, meson will try to find a suitable > compiler for this language[1]. If the language is classified as > required but not found, it will abort the build. > > It is necessary to specify rust and rust_ld separately in > support/misc/cross-compilation.conf.in. If you specify it in one line > just as "rust", it will generate the following warning: > WARNING: Please do not put -C linker= in your compiler command, > set rust_ld=command in your cross file or use the RUST_LD environment > variable, otherwise meson will override your selection. > > [1] https://mesonbuild.com/Reference-manual_functions.html#add_languages > > Signed-off-by: Romain Naour > Signed-off-by: Sebastian Weyer > Signed-off-by: Antoine Coutant > --- > package/pkg-meson.mk | 13 +++++++++++++ > support/misc/cross-compilation.conf.in | 2 ++ > 2 files changed, 15 insertions(+) > > diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk > index 65cabf23ba..25dd4f0d7f 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -82,6 +82,16 @@ else > PKG_MESON_TARGET_FC = /bin/false > endif > > +ifeq ($(BR2_PACKAGE_HOST_RUSTC),y) > +PKG_MESON_TARGET_RUSTC = $(HOST_DIR)/bin/rustc > +PKG_MESON_TARGET_RUSTC_LINKER = $(notdir $(TARGET_CROSS))gcc Why can't PKG_MESON_TARGET_RUSTC_LINKER be an absolute path, when PKG_MESON_TARGET_RUSTC is one, and [...] > +PKG_MESON_TARGET_RUSTC_TARGET_NAME = $(RUSTC_TARGET_NAME) > +else > +PKG_MESON_TARGET_RUSTC = /bin/false > +PKG_MESON_TARGET_RUSTC_LINKER = /bin/false [...] especially since here PKG_MESON_TARGET_RUSTC_LINKER is an absolute path? Regards, Yann E. MORIN. > +PKG_MESON_TARGET_RUSTC_TARGET_NAME = > +endif > + > # Generates sed patterns for patching the cross-compilation.conf template, > # since Flags might contain commas the arguments are passed indirectly by > # variable name (stripped to deal with whitespaces). > @@ -91,6 +101,7 @@ define PKG_MESON_CROSSCONFIG_SED > -e "s%@TARGET_CXX@%$(PKG_MESON_TARGET_CXX)%g" \ > -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ > -e "s%@TARGET_FC@%$(PKG_MESON_TARGET_FC)%g" \ > + -e "s%@TARGET_RUSTC@%$(PKG_MESON_TARGET_RUSTC)%g" \ > -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ > -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ > -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ > @@ -99,6 +110,8 @@ define PKG_MESON_CROSSCONFIG_SED > -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ > -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ > -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ > + -e "s%@TARGET_RUSTC_LINKER@%$(PKG_MESON_TARGET_RUSTC_LINKER)%g" \ > + -e "s%@RUSTC_TARGET_NAME@%$(PKG_MESON_TARGET_RUSTC_TARGET_NAME)%g" \ > -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ > -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ > -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ > diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in > index a58ab553d0..21cec10b82 100644 > --- a/support/misc/cross-compilation.conf.in > +++ b/support/misc/cross-compilation.conf.in > @@ -13,6 +13,8 @@ fortran = '@TARGET_FC@' > pkg-config = '@PKGCONF_HOST_BINARY@' > g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' > g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' > +rust = ['@TARGET_RUSTC@', '--target', '@RUSTC_TARGET_NAME@' ] > +rust_ld = '@TARGET_RUSTC_LINKER@' > > [built-in options] > c_args = [@TARGET_CFLAGS@] > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Wed Feb 7 15:15:40 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:15:40 +0100 Subject: [Buildroot] [PATCH v4 3/7] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-4-antoine.coutant@smile.fr> Message-ID: <93c369b0-12f2-466b-bf6c-af8802bf706f@mind.be> On 07/02/2024 16:08, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >> From: Romain Naour >> >> This target version is needed for Rusticl which is an LLVM based OpenCL >> framework[1]. Rusticl allow programs to compile OpenCL C/C++ code >> at runtime with Clang. Clang generates LLVM IR which is translated into >> SPIR-V by spirv-llvm-translator. Finally, mesa can use its internal >> tools to manage SPIR-V. >> >> [1]: https://docs.mesa3d.org/rusticl.html >> >> Signed-off-by: Romain Naour >> Signed-off-by: Sebastian Weyer >> Signed-off-by: Antoine Coutant >> --- > [--SNIP--] >> diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk >> index 523890a986..8361a74c59 100644 >> --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk >> +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk >> @@ -10,7 +10,7 @@ SPIRV_LLVM_TRANSLATOR_VERSION = v15.0.0-46-ge82ecc2bd7295604fcf1824e47c95fa6a09c >> SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) >> SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA >> SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT >> -HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers >> +HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers spirv-headers zlib > > It looks dubious that a host package, host-spirv-llvm-translator, > depends on target packages, spirv-headers and zlib. Purely based on the names of the packages, it sounds similar to hos host-gcc-final depends on target glibc, or host-rust depends on target toolchain. "host" often means "cross", so it _can_ indeed depend on target packages. > If this is really the case, then this would require a good explanation > in the commit log. > That is absolutely true! Regards, Arnout >> HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ >> -DLLVM_BUILD_TOOLS=ON \ >> -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ >> @@ -19,4 +19,14 @@ HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ >> -DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \ >> -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(HOST_DIR)/include >> >> +SPIRV_LLVM_TRANSLATOR_INSTALL_STAGING = YES >> +SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm llvm >> +SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ >> + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${STAGING_DIR}/usr \ > > $ ./utils/docker-run make check-package > package/spirv-llvm-translator/spirv-llvm-translator.mk:25: use $() to delimit variables, not ${} > > Regards, > Yann E. MORIN. > >> + -DLLVM_BUILD_TOOLS=ON \ >> + -DLLVM_DIR=$(STAGING_DIR)/lib/cmake/llvm \ >> + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ >> + -DLLVM_SPIRV_INCLUDE_TESTS=OFF >> + >> +$(eval $(cmake-package)) >> $(eval $(host-cmake-package)) >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From thomas.petazzoni at bootlin.com Wed Feb 7 15:18:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:18:27 +0100 Subject: [Buildroot] [git commit] support/testing: use core2duo cpu emulation for TestGlxinfo Message-ID: <20240207151854.9C31B875C6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc25b8d99f812777294b5e188d7975c0e36dd5ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master TestGlxinfo fail with a new runtime error: # glxinfo -B -display :0 name of display: :0 traps: glxinfo[84] trap invalid opcode ip:b73c7027 sp:bf8433c0 error:0 in swrast_dri.so[b6e4c000+64f000] Illegal instruction The x86-core2 Bootlin toolchains are built for a core2 CPU [0], this means that the Bootlin toolchains may use core2-specific instructions. The TestGlxinfo test is setup for BR2_x86_core2, so our executables will also contain core2 instructions. However, the default Qemu x86 is not guaranteed to emulate all the instructions specific to core2, causing runtime issues as reported above. A similar issue has been fixed by adding Nehalem cpu emulation on the qemu command line. See 4f565b5222 ("support/testing: use Nehalem cpu emulation for TestGrubX8664EFI"). Set core2duo cpu emulation for TestGlxinfo on the qemu command line. [0] https://gitlab.com/buildroot.org/toolchains-builder/-/blob/kubu/toolchain-builder-2023.08/configs/arch/x86-core2.config?ref_type=heads Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_glxinfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py index 6bedee5298..3ccbdca8d9 100644 --- a/support/testing/tests/package/test_glxinfo.py +++ b/support/testing/tests/package/test_glxinfo.py @@ -42,7 +42,8 @@ class TestGlxinfo(infra.basetest.BRTest): self.emulator.boot(arch="i386", kernel=kern, kernel_cmdline=["root=/dev/vda console=ttyS0"], - options=["-M", "pc", "-m", "512", "-drive", "file={},if=virtio,format=raw".format(img)]) + options=["-M", "pc", "-cpu", "core2duo", "-m", "512", + "-drive", "file={},if=virtio,format=raw".format(img)]) self.emulator.login() def test_run(self): From thomas.petazzoni at bootlin.com Wed Feb 7 15:18:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:18:20 +0100 Subject: [Buildroot] [git commit] package/mesa3d: fix drisw build without dri3 Message-ID: <20240207151854.933B2875C5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b114822e9897d33089cd7203edbf3d7cb7dd5d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master mesa3d 23.3 added dri3_priv.h header and dri3_check_multibuffer() function in drisw (part of swrast gallium driver) that can be build without dri3. i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' collect2: error: ld returned 1 exit status Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using dri3_check_multibuffer(). While testing again the TestGlxinfo runtime test, a new unexpected error line appeared in the glxinfo log: MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so mesa3d try to load zink gallium driver even if it was not enabled at build time, indeed there is no such option in Buildroot. Apply patches sent upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854455 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../mesa3d/0006-drisw-fix-build-without-dri3.patch | 58 ++++++++++++++++++++++ ...ext-don-t-try-zink-if-not-enabled-in-mesa.patch | 42 ++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/package/mesa3d/0006-drisw-fix-build-without-dri3.patch b/package/mesa3d/0006-drisw-fix-build-without-dri3.patch new file mode 100644 index 0000000000..ab27d384cf --- /dev/null +++ b/package/mesa3d/0006-drisw-fix-build-without-dri3.patch @@ -0,0 +1,58 @@ +From 3ab46dcfda9edf5c9bc27c8f5031146d9d9d8ade Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 18 Jan 2024 22:50:16 +0100 +Subject: [PATCH] drisw: fix build without dri3 + +commit 1887368df41 ("glx/sw: check for modifier support in the kopper path") +added dri3_priv.h header and dri3_check_multibuffer() function in drisw that +can be build without dri3. + + i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': + drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' + collect2: error: ld returned 1 exit status + +Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using +dri3_check_multibuffer(). + +Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path") + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 + +Signed-off-by: Romain Naour +--- + src/glx/drisw_glx.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c +index 3d3f75259bc..4b19e2d7707 100644 +--- a/src/glx/drisw_glx.c ++++ b/src/glx/drisw_glx.c +@@ -32,7 +32,9 @@ + #include + #include "dri_common.h" + #include "drisw_priv.h" ++#ifdef HAVE_DRI3 + #include "dri3_priv.h" ++#endif + #include + #include + #include +@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, + goto handle_error; + } + ++#ifdef HAVE_DRI3 + if (pdpyp->zink) { + bool err; + psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err); +@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, + goto handle_error; + } + } ++#endif + + glx_config_destroy_list(psc->base.configs); + psc->base.configs = configs; +-- +2.43.0 + diff --git a/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch b/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch new file mode 100644 index 0000000000..f9e4d50fd7 --- /dev/null +++ b/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch @@ -0,0 +1,42 @@ +From 83b4ff6616708bd7ba5981d22cd5211ca6787d58 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 24 Jan 2024 14:28:32 +0100 +Subject: [PATCH] glxext: don't try zink if not enabled in mesa + +Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") +added an automatic zink fallback even when the zink gallium is not +enabled at build time. + +It leads to unexpected error log while loading drisw driver and +zink is not installed on the rootfs: + + MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so + +Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 + +Signed-off-by: Romain Naour +--- + src/glx/glxext.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/glx/glxext.c b/src/glx/glxext.c +index 39d5f08bdcf..e106eb40046 100644 +--- a/src/glx/glxext.c ++++ b/src/glx/glxext.c +@@ -904,9 +904,11 @@ __glXInitialize(Display * dpy) + #endif /* HAVE_DRI3 */ + if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false)) + dpyPriv->dri2Display = dri2CreateDisplay(dpy); ++#if defined(HAVE_ZINK) + if (!dpyPriv->dri3Display && !dpyPriv->dri2Display) + try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) && + !getenv("GALLIUM_DRIVER"); ++#endif /* HAVE_ZINK */ + } + #endif /* GLX_USE_DRM */ + if (glx_direct) +-- +2.43.0 + From thomas.petazzoni at bootlin.com Wed Feb 7 15:19:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:19:20 +0100 Subject: [Buildroot] [PATCH 1/2] package/mesa3d: fix drisw build without dri3 In-Reply-To: <20240206124947.1617078-2-romain.naour@smile.fr> References: <20240206124947.1617078-1-romain.naour@smile.fr> <20240206124947.1617078-2-romain.naour@smile.fr> Message-ID: <20240207161920.61fb7da9@windsurf> On Tue, 6 Feb 2024 13:49:46 +0100 Romain Naour wrote: > mesa3d 23.3 added dri3_priv.h header and dri3_check_multibuffer() function in > drisw (part of swrast gallium driver) that can be build without dri3. > > i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': > drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' > collect2: error: ld returned 1 exit status > > Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using > dri3_check_multibuffer(). > > While testing again the TestGlxinfo runtime test, a new unexpected error line > appeared in the glxinfo log: > > MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so > > mesa3d try to load zink gallium driver even if it was not enabled at > build time, indeed there is no such option in Buildroot. > > Apply patches sent upstream: > https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854455 > > Signed-off-by: Romain Naour > --- > .../0006-drisw-fix-build-without-dri3.patch | 58 +++++++++++++++++++ > ...on-t-try-zink-if-not-enabled-in-mesa.patch | 42 ++++++++++++++ > 2 files changed, 100 insertions(+) > create mode 100644 package/mesa3d/0006-drisw-fix-build-without-dri3.patch > create mode 100644 package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch Both applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 7 15:19:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:19:35 +0100 Subject: [Buildroot] [git commit] package/meson: bump version to 1.3.1 Message-ID: <20240207152251.3A128875D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3118b7e222e8a56847daa17aae5ea1c2bb083837 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The meson upgrade from 1.1.1 to 1.2.0 have been reverted because host-qemu (version v8.0.3) was searching libraries in the build machine instead of buildroot host directory [1]. $ grep -r LINK_ARGS * | grep "\-L/usr" build.ninja: LINK_ARGS = -L/usr/lib/gcc/x86_64-linux-gnu/10 \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../../lib -L/usr/lib \ -L/lib/x86_64-linux-gnu \ -L/lib/../lib \ -L/usr/lib/../lib \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../.. \ -L/lib \ -I/[...]/host/include \ -L/[...]/host/lib \ -I/[...]/host/include/libfdt \ ... Upgrading qemu to version v8.1.0 solves the problem: $ grep -r LINK_ARGS * | grep "\-L/usr" build.ninja: LINK_ARGS = -I/[...]/host/include \ -L/[...]/host/lib \ -I/[...]/host/include/libfdt \ ... Those two tests were done with the same buildroot version (2023.08) on the same machine were the bug appeared. Using, git bisect, in this environment, it was found that the problem was fixed in qemu by the commit [2]. Thus, it is possible that the problem was introduced by improper use of meson by qemu <= v8.0.3. Also, meson has been updated to version 1.2.1 and 1.3.0 in yocto and it doesn't seem to create any issue. [3] The original problem is no longer present and some projects require meson > 1.1.1 (e.g. rusticl requires meson 1.2.0 since mesa 23.3.0 and meson 1.3.1 since mesa 24.0.0). "pkgconfig" field is deprecated by meson 1.3.0 and replaced by "pkg-config". See: [4] The patch that adds the pkg_config_static property has been rebased. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/acfdf21f0b752e844a33c70a0fd2f82f4534a5a0 [2] https://gitlab.com/qemu-project/qemu/-/commit/Fc9a809e0d28417fa1e7f7efc19f845bda4c1be9 [3] https://github.com/yoctoproject/poky/commits/master/meta/recipes-devtools/meson [4] https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig Signed-off-by: Antoine Coutant [yann.morin.1998 at free.fr: - keep our formatting in the patch - reflow commit log (to keep busy while test-building!) ] Signed-off-by: Yann E. MORIN --- ...dependencies-base.py-add-pkg_config_stati.patch | 30 ++++++++++++---------- package/meson/meson.hash | 4 +-- package/meson/meson.mk | 2 +- support/misc/cross-compilation.conf.in | 2 +- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch index 8e15d3210c..8b95dc7592 100644 --- a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +++ b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -1,4 +1,4 @@ -From 3d6a2db2270346236dd6247e0648ea0c949ba468 Mon Sep 17 00:00:00 2001 +From 59934e2116e025ecfe23baf6febc4a0eb85f60cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static @@ -20,24 +20,26 @@ Signed-off-by: Fabrice Fontaine Signed-off-by: Romain Naour [Rebased on 0.57.1] Signed-off-by: Peter Seiderer +[rebased on 1.3.0] +Signed-off-by: Antoine Coutant --- - mesonbuild/dependencies/pkgconfig.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + mesonbuild/dependencies/pkgconfig.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py -index 1e8d9132e..d902ba215 100644 +index e86206b88..94888657d 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py -@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency): - env = None - libcmd = ['--libs'] - -- if self.static: -+ if self.static or \ +@@ -169,7 +169,8 @@ class PkgConfigCLI(PkgConfigInterface): + env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1' + args: T.List[str] = [] + args += self._define_variable_args(define_variable) +- if static: ++ if static or \ + (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): - libcmd.append('--static') - - libcmd.append(self.name) --- + args.append('--static') + args += ['--libs', name] + ret, out, err = self._call_pkgbin(args, env=env) +-- 2.25.1 diff --git a/package/meson/meson.hash b/package/meson/meson.hash index cb36b674fa..150fd6d1bb 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc -sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc +sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 503aca8c25..467569d28b 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.1.1 +MESON_VERSION = 1.3.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 7053df472b..a58ab553d0 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -10,7 +10,7 @@ ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' cmake = '@BR2_CMAKE@' fortran = '@TARGET_FC@' -pkgconfig = '@PKGCONF_HOST_BINARY@' +pkg-config = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' From yann.morin.1998 at free.fr Wed Feb 7 15:23:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:23:23 +0100 Subject: [Buildroot] [PATCH v4 1/7] package/meson: bump version to 1.3.1 In-Reply-To: <20240202093625.1409559-2-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-2-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > The meson upgrade from 1.1.1 to 1.2.0 have been reverted > because host-qemu (version v8.0.3) was searching > libraries in the build machine instead of buildroot host > directory [1]. > $ grep -r LINK_ARGS * | grep "\-L/usr" > build.ninja: LINK_ARGS = > -L/usr/lib/gcc/x86_64-linux-gnu/10 \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../../lib -L/usr/lib \ > -L/lib/x86_64-linux-gnu \ > -L/lib/../lib \ > -L/usr/lib/../lib \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../.. \ > -L/lib \ > -I/[...]/host/include \ > -L/[...]/host/lib \ > -I/[...]/host/include/libfdt \ > ... > > Upgrading qemu to version v8.1.0 solves the problem: > $ grep -r LINK_ARGS * | grep "\-L/usr" > build.ninja: LINK_ARGS = > -I/[...]/host/include \ > -L/[...]/host/lib \ > -I/[...]/host/include/libfdt \ > ... > > Those two tests were done with the same buildroot version > (2023.08) on the same machine were the bug appeared. Using, > git bisect, in this environment, it was found that the > problem was fixed in qemu by the commit [2]. > > Thus, it is possible that the problem was introduced by > improper use of meson by qemu <= v8.0.3. Also, meson has > been updated to version 1.2.1 and 1.3.0 in yocto and it > doesn't seem to create any issue. [3] > > The original problem is no longer present and some > projects require meson > 1.1.1 (e.g. rusticl requires > meson 1.2.0 since mesa 23.3.0 and meson 1.3.1 since mesa > 24.0.0). > > "pkgconfig" field is deprecated by meson 1.3.0 and > replaced by "pkg-config". See: [4] > > The patch that adds the pkg_config_static property has > been rebased. > > [1] https://gitlab.com/buildroot.org/buildroot/-/commit/acfdf21f0b752e844a33c70a0fd2f82f4534a5a0 > [2] https://gitlab.com/qemu-project/qemu/-/commit/Fc9a809e0d28417fa1e7f7efc19f845bda4c1be9 > [3] https://github.com/yoctoproject/poky/commits/master/meta/recipes-devtools/meson > [4] https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig > > Signed-off-by: Antoine Coutant Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v3 -> v4: > - cross-compilation.conf.in have been changed. > - Bump version from 1.3.0 to 1.3.1. > > Signed-off-by: Antoine Coutant > --- > ...dencies-base.py-add-pkg_config_stati.patch | 29 ++++++++++--------- > package/meson/meson.hash | 4 +-- > package/meson/meson.mk | 2 +- > support/misc/cross-compilation.conf.in | 2 +- > 4 files changed, 19 insertions(+), 18 deletions(-) > > diff --git a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch > index 8e15d3210c..49a0ef93dc 100644 > --- a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch > +++ b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch > @@ -1,4 +1,4 @@ > -From 3d6a2db2270346236dd6247e0648ea0c949ba468 Mon Sep 17 00:00:00 2001 > +From 59934e2116e025ecfe23baf6febc4a0eb85f60cd Mon Sep 17 00:00:00 2001 > From: Fabrice Fontaine > Date: Sat, 15 Feb 2020 15:13:59 +0100 > Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static > @@ -20,24 +20,25 @@ Signed-off-by: Fabrice Fontaine > Signed-off-by: Romain Naour > [Rebased on 0.57.1] > Signed-off-by: Peter Seiderer > +[rebased on 1.3.0] > +Signed-off-by: Antoine Coutant > --- > - mesonbuild/dependencies/pkgconfig.py | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > + mesonbuild/dependencies/pkgconfig.py | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py > -index 1e8d9132e..d902ba215 100644 > +index e86206b88..94888657d 100644 > --- a/mesonbuild/dependencies/pkgconfig.py > +++ b/mesonbuild/dependencies/pkgconfig.py > -@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency): > - env = None > - libcmd = ['--libs'] > - > -- if self.static: > -+ if self.static or \ > -+ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): > - libcmd.append('--static') > - > - libcmd.append(self.name) > +@@ -169,7 +169,7 @@ class PkgConfigCLI(PkgConfigInterface): > + env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1' > + args: T.List[str] = [] > + args += self._define_variable_args(define_variable) > +- if static: > ++ if static or (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): > + args.append('--static') > + args += ['--libs', name] > + ret, out, err = self._call_pkgbin(args, env=env) > -- > 2.25.1 > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > index cb36b674fa..150fd6d1bb 100644 > --- a/package/meson/meson.hash > +++ b/package/meson/meson.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc > -sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz > +# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc > +sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index 503aca8c25..467569d28b 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MESON_VERSION = 1.1.1 > +MESON_VERSION = 1.3.1 > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > MESON_LICENSE = Apache-2.0 > MESON_LICENSE_FILES = COPYING > diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in > index 7053df472b..a58ab553d0 100644 > --- a/support/misc/cross-compilation.conf.in > +++ b/support/misc/cross-compilation.conf.in > @@ -10,7 +10,7 @@ ar = '@TARGET_AR@' > strip = '@TARGET_STRIP@' > cmake = '@BR2_CMAKE@' > fortran = '@TARGET_FC@' > -pkgconfig = '@PKGCONF_HOST_BINARY@' > +pkg-config = '@PKGCONF_HOST_BINARY@' > g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' > g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 7 15:30:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:30:51 +0100 Subject: [Buildroot] [PATCH v4 1/7] package/meson: bump version to 1.3.1 In-Reply-To: <20240202093625.1409559-2-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-2-antoine.coutant@smile.fr> Message-ID: Antoine, All, (sorry, I sent too fast, here are a bit more details below...) On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > The meson upgrade from 1.1.1 to 1.2.0 have been reverted > because host-qemu (version v8.0.3) was searching > libraries in the build machine instead of buildroot host > directory [1]. > $ grep -r LINK_ARGS * | grep "\-L/usr" > build.ninja: LINK_ARGS = > -L/usr/lib/gcc/x86_64-linux-gnu/10 \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../../lib -L/usr/lib \ > -L/lib/x86_64-linux-gnu \ > -L/lib/../lib \ > -L/usr/lib/../lib \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../.. \ > -L/lib \ > -I/[...]/host/include \ > -L/[...]/host/lib \ > -I/[...]/host/include/libfdt \ > ... > > Upgrading qemu to version v8.1.0 solves the problem: > $ grep -r LINK_ARGS * | grep "\-L/usr" > build.ninja: LINK_ARGS = > -I/[...]/host/include \ > -L/[...]/host/lib \ > -I/[...]/host/include/libfdt \ > ... > > Those two tests were done with the same buildroot version > (2023.08) on the same machine were the bug appeared. Using, > git bisect, in this environment, it was found that the > problem was fixed in qemu by the commit [2]. > > Thus, it is possible that the problem was introduced by > improper use of meson by qemu <= v8.0.3. Also, meson has > been updated to version 1.2.1 and 1.3.0 in yocto and it > doesn't seem to create any issue. [3] > > The original problem is no longer present and some > projects require meson > 1.1.1 (e.g. rusticl requires > meson 1.2.0 since mesa 23.3.0 and meson 1.3.1 since mesa > 24.0.0). > > "pkgconfig" field is deprecated by meson 1.3.0 and > replaced by "pkg-config". See: [4] > > The patch that adds the pkg_config_static property has > been rebased. I reflowed the commit log to approach the 72-char limit on line length (I needed soemthing to do while there aas a test-build on-going!) > [1] https://gitlab.com/buildroot.org/buildroot/-/commit/acfdf21f0b752e844a33c70a0fd2f82f4534a5a0 > [2] https://gitlab.com/qemu-project/qemu/-/commit/Fc9a809e0d28417fa1e7f7efc19f845bda4c1be9 > [3] https://github.com/yoctoproject/poky/commits/master/meta/recipes-devtools/meson > [4] https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig > > Signed-off-by: Antoine Coutant > --- [--SNIP--] > diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py > -index 1e8d9132e..d902ba215 100644 > +index e86206b88..94888657d 100644 > --- a/mesonbuild/dependencies/pkgconfig.py > +++ b/mesonbuild/dependencies/pkgconfig.py > -@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency): > - env = None > - libcmd = ['--libs'] > - > -- if self.static: > -+ if self.static or \ > -+ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): > - libcmd.append('--static') > - > - libcmd.append(self.name) > +@@ -169,7 +169,7 @@ class PkgConfigCLI(PkgConfigInterface): > + env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1' > + args: T.List[str] = [] > + args += self._define_variable_args(define_variable) > +- if static: > ++ if static or (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): I changed that code back to have our addition on a separate line, so that it stands out better when updating the patch. Applied to master, thanks. Regards, Yann E. MORIN. > + args.append('--static') > + args += ['--libs', name] > + ret, out, err = self._call_pkgbin(args, env=env) > -- > 2.25.1 > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > index cb36b674fa..150fd6d1bb 100644 > --- a/package/meson/meson.hash > +++ b/package/meson/meson.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc > -sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz > +# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc > +sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index 503aca8c25..467569d28b 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MESON_VERSION = 1.1.1 > +MESON_VERSION = 1.3.1 > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > MESON_LICENSE = Apache-2.0 > MESON_LICENSE_FILES = COPYING > diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in > index 7053df472b..a58ab553d0 100644 > --- a/support/misc/cross-compilation.conf.in > +++ b/support/misc/cross-compilation.conf.in > @@ -10,7 +10,7 @@ ar = '@TARGET_AR@' > strip = '@TARGET_STRIP@' > cmake = '@BR2_CMAKE@' > fortran = '@TARGET_FC@' > -pkgconfig = '@PKGCONF_HOST_BINARY@' > +pkg-config = '@PKGCONF_HOST_BINARY@' > g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' > g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Wed Feb 7 15:35:17 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:35:17 +0100 Subject: [Buildroot] [PATCH 1/3] support/scripts/pkg-stats: remove checking the CPE database Message-ID: <20240207153519.657048-1-arnout@mind.be> We currently check the CPE database to see if the CPE ID we use (including the version) is already in the database. However, the version part of the CPE ID is not actually used for CVE matching. Instead, the CVEs have a range of versions associated with them and we match against those ranges. In addition, NVD is moving to a new API for accessing the CPE database. It will not longer be possible to simply download all the CPE IDs, and due to rate limiting, the download will have to be done in several queries. Since all of this is anyway of limited use, drop the CPE database lookup entirely. Instead, as long as a CPE ID is defined in a package, it is considered OK, without any checks. Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 50 ++------------------------------------- 1 file changed, 2 insertions(+), 48 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 05f0cd9e4a..caef159afe 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -40,7 +40,6 @@ from getdeveloperlib import parse_developers # noqa: E402 INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)") URL_RE = re.compile(r"\s*https?://\S*\s*$") -CPEDB_URL = "https://static.nvd.nist.gov/feeds/xml/cpe/dictionary/official-cpe-dictionary_v2.3.xml.gz" RM_API_STATUS_ERROR = 1 RM_API_STATUS_FOUND_BY_DISTRO = 2 @@ -282,8 +281,7 @@ class Package: if var in self.all_cpeids: self.cpeid = self.all_cpeids[var] - # Set a preliminary status, it might be overridden by check_package_cpes() - self.status['cpe'] = ("warning", "not checked against CPE dictionary") + self.status['cpe'] = ("ok", "(not checked against CPE dictionary)") else: self.status['cpe'] = ("error", "no verified CPE identifier") @@ -674,47 +672,6 @@ def check_package_cves(nvd_path, packages): pkg.status['cve'] = ("ok", "not affected by CVEs") -def check_package_cpes(nvd_path, packages): - class CpeXmlParser: - cpes = [] - - def start(self, tag, attrib): - if tag == "{http://scap.nist.gov/schema/cpe-extension/2.3}cpe23-item": - self.cpes.append(attrib['name']) - - def close(self): - return self.cpes - - print("CPE: Setting up NIST dictionary") - if not os.path.exists(os.path.join(nvd_path, "cpe")): - os.makedirs(os.path.join(nvd_path, "cpe")) - - cpe_dict_local = os.path.join(nvd_path, "cpe", os.path.basename(CPEDB_URL)) - if not os.path.exists(cpe_dict_local) or os.stat(cpe_dict_local).st_mtime < time.time() - 86400: - print("CPE: Fetching xml manifest from [" + CPEDB_URL + "]") - cpe_dict = requests.get(CPEDB_URL) - open(cpe_dict_local, "wb").write(cpe_dict.content) - - print("CPE: Unzipping xml manifest...") - nist_cpe_file = gzip.GzipFile(fileobj=open(cpe_dict_local, 'rb')) - - parser = xml.etree.ElementTree.XMLParser(target=CpeXmlParser()) - while True: - c = nist_cpe_file.read(1024*1024) - if not c: - break - parser.feed(c) - cpes = parser.close() - - for p in packages: - if not p.cpeid: - continue - if p.cpeid in cpes: - p.status['cpe'] = ("ok", "verified CPE identifier") - else: - p.status['cpe'] = ("error", "CPE version unknown in CPE database") - - def calculate_stats(packages): stats = defaultdict(int) stats['packages'] = len(packages) @@ -1309,7 +1266,7 @@ def parse_args(): parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) parser.add_argument('--disable', type=list_str, - help='Features to disable, comma-separated (cve, upstream, url, cpe, warning)', + help='Features to disable, comma-separated (cve, upstream, url, warning)', default=[]) args = parser.parse_args() if not args.html and not args.json: @@ -1372,9 +1329,6 @@ def __main__(): if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) - if "cpe" not in args.disable and args.nvd_path: - print("Checking packages CPEs") - check_package_cpes(args.nvd_path, packages) print("Calculate stats") stats = calculate_stats(packages) if args.html: -- 2.43.0 From arnout at mind.be Wed Feb 7 15:35:18 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:35:18 +0100 Subject: [Buildroot] [PATCH 2/3] support/scripts/cve.py: switch from NVD to FKIE for the JSON files In-Reply-To: <20240207153519.657048-1-arnout@mind.be> References: <20240207153519.657048-1-arnout@mind.be> Message-ID: <20240207153519.657048-2-arnout@mind.be> NVD will deprecate the v1.1 API which allows us to download the full database as individual JSON files. Instead, there's a horribly crappy API that is extremely slow and subject to race conditions. Fortunately, there is a project, Fraunhofer FKIE - Cyber Analysis and Defense [1], that goes through the effort of adapting to this new API and regenerating the convenient JSON files. The JSON files and meta files are re-generated daily. Instead of implementing the NVD v2 API, we decided to just use the JSON files generatd by fkie-cad. That saves us the effort of solving the race conditions, devising a cache mechanism that works, handling the frequent gateway timeouts on the NVD servers, dealing with the rate limiting, and keeping up with changes in the API. Switch to this repository on github as NVD_BASE_URL. The file name is also slightly different (CVE-20XX.json instead of nvdcve-1.1-20XX.json). The fkie-cad repository compresses with xz instead of gz. Therefore: - rename the filename variables to _xz instead of _gz; - use xz as a subprocess because there is no xz decompressor in Python stdlib. [1] https://www.fkie.fraunhofer.de/en/departments/cad.html Cc: Daniel Lang Signed-off-by: Arnout Vandecappelle --- Even better would be to clone the https://github.com/fkie-cad/nvd-json-data-feeds repository so we can cache with simple "git pull". I leave that as an exercise to the reader :-) --- support/scripts/cve.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 7cd6fce4d8..46c384955c 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -22,7 +22,7 @@ import os import requests # URL checking import distutils.version import time -import gzip +import subprocess import sys import operator @@ -41,8 +41,7 @@ except ImportError: sys.path.append('utils/') NVD_START_YEAR = 2002 -NVD_JSON_VERSION = "1.1" -NVD_BASE_URL = "https://nvd.nist.gov/feeds/json/cve/" + NVD_JSON_VERSION +NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" ops = { '>=': operator.ge, @@ -83,15 +82,15 @@ class CVE: @staticmethod def download_nvd_year(nvd_path, year): - metaf = "nvdcve-%s-%s.meta" % (NVD_JSON_VERSION, year) + metaf = "CVE-%s.meta" % year path_metaf = os.path.join(nvd_path, metaf) - jsonf_gz = "nvdcve-%s-%s.json.gz" % (NVD_JSON_VERSION, year) - path_jsonf_gz = os.path.join(nvd_path, jsonf_gz) + jsonf_xz = "CVE-%s.json.xz" % year + path_jsonf_xz = os.path.join(nvd_path, jsonf_xz) # If the database file is less than a day old, we assume the NVD data # locally available is recent enough. - if os.path.exists(path_jsonf_gz) and os.stat(path_jsonf_gz).st_mtime >= time.time() - 86400: - return path_jsonf_gz + if os.path.exists(path_jsonf_xz) and os.stat(path_jsonf_xz).st_mtime >= time.time() - 86400: + return path_jsonf_xz # If not, we download the meta file url = "%s/%s" % (NVD_BASE_URL, metaf) @@ -104,19 +103,19 @@ class CVE: # we need to re-download the database. # If the database does not exist locally, we need to redownload it in # any case. - if os.path.exists(path_metaf) and os.path.exists(path_jsonf_gz): + if os.path.exists(path_metaf) and os.path.exists(path_jsonf_xz): meta_known = open(path_metaf, "r").read() if page_meta.text == meta_known: - return path_jsonf_gz + return path_jsonf_xz # Grab the compressed JSON NVD, and write files to disk - url = "%s/%s" % (NVD_BASE_URL, jsonf_gz) + url = "%s/%s" % (NVD_BASE_URL, jsonf_xz) print("Getting %s" % url) page_json = requests.get(url) page_json.raise_for_status() - open(path_jsonf_gz, "wb").write(page_json.content) + open(path_jsonf_xz, "wb").write(page_json.content) open(path_metaf, "w").write(page_meta.text) - return path_jsonf_gz + return path_jsonf_xz @classmethod def read_nvd_dir(cls, nvd_dir): @@ -128,7 +127,8 @@ class CVE: for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - content = ijson.items(gzip.GzipFile(filename), 'CVE_Items.item') + uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) + content = ijson.items(uncompressed, 'CVE_Items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise -- 2.43.0 From arnout at mind.be Wed Feb 7 15:35:19 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:35:19 +0100 Subject: [Buildroot] [PATCH 3/3] support/scripts/cve.py: start in 1999 In-Reply-To: <20240207153519.657048-1-arnout@mind.be> References: <20240207153519.657048-1-arnout@mind.be> Message-ID: <20240207153519.657048-3-arnout@mind.be> When the CVE lookup was added in commit 4a157be9efac8ba8888e4972f42eda213077152c, the starting year of the JSON files was set to 2002. However, there are also CVEs from 1999, 2000 and 2001. It is not clear why these were skipped back then. Set the start year to 1999 to capture these old CVEs too. Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 46c384955c..f12a8048cd 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -40,7 +40,7 @@ except ImportError: sys.path.append('utils/') -NVD_START_YEAR = 2002 +NVD_START_YEAR = 1999 NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" ops = { -- 2.43.0 From sergio.prado at e-labworks.com Wed Feb 7 15:35:32 2024 From: sergio.prado at e-labworks.com (Sergio Prado) Date: Wed, 7 Feb 2024 12:35:32 -0300 Subject: [Buildroot] [PATCH] package/tio: bump to version 2.7 Message-ID: <20240207153532.1199300-1-sergio.prado@e-labworks.com> Signed-off-by: Sergio Prado --- package/tio/tio.hash | 4 ++-- package/tio/tio.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tio/tio.hash b/package/tio/tio.hash index cb0311a752ed..02699fdeb435 100644 --- a/package/tio/tio.hash +++ b/package/tio/tio.hash @@ -1,5 +1,5 @@ -# From https://github.com/tio/tio/releases/download/v1.47/tio-1.47.tar.xz.sha256sum: -sha256 6f39ac582de747feb9a64c14e6b378c61cb0c3bfa6639e62050022c1b7f5c544 tio-1.47.tar.xz +# From https://github.com/tio/tio/releases/download/v2.7/tio-2.7.tar.xz.sha256sum: +sha256 bf8fe434848c2c1b6540af0b42503c986068176ddc1a988cf02e521e7de5daa5 tio-2.7.tar.xz # Hash for license files: sha256 9248dee77ee136321f24556a96e07ff8f90461013941884a9defd0ac825ef131 LICENSE diff --git a/package/tio/tio.mk b/package/tio/tio.mk index 0035ce445ee2..d7b554ee8478 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIO_VERSION = 1.47 +TIO_VERSION = 2.7 TIO_SOURCE = tio-$(TIO_VERSION).tar.xz TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 7 15:36:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:36:25 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add optee-os runtime test In-Reply-To: <20240120232854.1938582-1-ju.o@free.fr> References: <20240120232854.1938582-1-ju.o@free.fr> Message-ID: <20240207163625.75917cf7@windsurf> On Sun, 21 Jan 2024 00:28:54 +0100 Julien Olivain wrote: > Cc: Etienne Carriere > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit 3780925 with commands: Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 15:36:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:36:31 +0100 Subject: [Buildroot] [git commit] support/testing: add optee-os runtime test Message-ID: <20240207153646.BD600875E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd56ac9eb63f0acecd78b1983f9d889f21f8fe0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Cc: Etienne Carriere Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/boot/test_optee_os.py | 74 ++++++++++++++++++++++ .../tests/boot/test_optee_os/u-boot.fragment | 8 +++ 3 files changed, 84 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 43dd5c8cb4..8e65a93122 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1754,6 +1754,8 @@ F: package/riscv-isa-sim/ F: package/tinycompress/ F: package/z3/ F: package/zynaddsubfx/ +F: support/testing/tests/boot/test_optee_os.py +F: support/testing/tests/boot/test_optee_os/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_hwdata.py diff --git a/support/testing/tests/boot/test_optee_os.py b/support/testing/tests/boot/test_optee_os.py new file mode 100644 index 0000000000..5f5cd17464 --- /dev/null +++ b/support/testing/tests/boot/test_optee_os.py @@ -0,0 +1,74 @@ +import os + +import infra.basetest + + +class TestOptee(infra.basetest.BRTest): + # A custom configuration is needed to enable OP-TEE support in the + # Kernel. This config is inspired from: + # configs/qemu_arm_vexpress_tz_defconfig + uboot_fragment = \ + infra.filepath("tests/boot/test_optee_os/u-boot.fragment") + config = \ + f""" + BR2_arm=y + BR2_cortex_a15=y + BR2_ARM_FPU_VFPV3D16=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/arm-vexpress-tz/post-build.sh" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.73" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" + BR2_PACKAGE_OPTEE_EXAMPLES=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + BR2_TARGET_ROOTFS_CPIO_UIMAGE=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ARM_TRUSTED_FIRMWARE=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" + BR2_TARGET_OPTEE_OS=y + BR2_TARGET_OPTEE_OS_NEEDS_DTC=y + BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" + BR2_TARGET_UBOOT=y + BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y + BR2_TARGET_UBOOT_CUSTOM_VERSION=y + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" + BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" + BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="{uboot_fragment}" + """ + + def test_run(self): + # There is no Kernel nor rootfs image here. They will be + # loaded by TFTP through the emulated network interface in + # u-boot. + bios = os.path.join(self.builddir, "images", "flash.bin") + tftp_dir = os.path.join(self.builddir, "images") + self.emulator.boot(arch="arm", + options=["-M", "virt,secure=on", + "-d", "unimp", + "-cpu", "cortex-a15", + "-m", "1024M", + "-netdev", f"user,id=vmnic,tftp={tftp_dir}", + "-device", "virtio-net-device,netdev=vmnic", + "-bios", bios]) + self.emulator.login() + + # Check the Kernel has OP-TEE messages + self.assertRunOk("dmesg | grep -F optee:") + + # Check we have OP-TEE devices + self.assertRunOk("ls -al /dev/tee*") + + # Run some OP-TEE examples + examples = ["aes", "hello_world", "hotp", "random", "secure_storage"] + for ex in examples: + self.assertRunOk(f"optee_example_{ex}") diff --git a/support/testing/tests/boot/test_optee_os/u-boot.fragment b/support/testing/tests/boot/test_optee_os/u-boot.fragment new file mode 100644 index 0000000000..b9505a1ff8 --- /dev/null +++ b/support/testing/tests/boot/test_optee_os/u-boot.fragment @@ -0,0 +1,8 @@ +CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_BOOTCOMMAND="setenv ipaddr 10.0.2.15 && setenv serverip 10.0.2.2 && tftp ${kernel_addr_r} zImage && tftp ${ramdisk_addr_r} rootfs.cpio.uboot && setenv bootargs console=ttyAMA0,115200 earlyprintk=serial,ttyAMA0,115200 && bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr}" +CONFIG_SEMIHOSTING=y +# Drop flash accesses +CONFIG_ENV_IS_IN_FLASH=n +CONFIG_MTD=n +CONFIG_MTD_NOR_FLASH=n +CONFIG_ENV_IS_NOWHERE=y From thomas.petazzoni at bootlin.com Wed Feb 7 15:40:07 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:40:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/libnss: fix musl build In-Reply-To: <23F59953-57A8-48F0-9809-4841CC10CA0F@benettiengineering.com> References: <23F59953-57A8-48F0-9809-4841CC10CA0F@benettiengineering.com> Message-ID: <20240207164007.566c2d6b@windsurf> Hello Giulio, On Fri, 12 Jan 2024 23:39:55 +0100 Giulio Benetti wrote: > > So basically, when FREEBL_NO_DEPEND is set to 1, freebl shall not > > depend on PR_SetError as this function is defined by nspr. > > > Yes but your patch only comment out PR_SetError() while it should > depend on FREEBL_NO_DEPEND at this point even if I didn?t go in depth > again after 1/2 years. > > But the point is why this only happens on musl and specific > architectures. This is indeed the question that we need to answer. Why is that musl only? According to Fabrice's explanation, it should happen on all platforms, regarding of the C library. So there is something "more" to it, that we don't yet understand. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 15:40:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:40:30 +0100 Subject: [Buildroot] [git commit] package/elfutils: drop -fpic workaround Message-ID: <20240207154043.3C1A7875EB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2abe228230a017a7014d7aefd002ebb2c904442 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master -fpic workaround is not needed since bump to version 0.166 in commit 794ae61a15f7a36e199b62b2e5224cfc41bdabea and https://sourceware.org/git/?p=elfutils.git;a=commit;h=133509fa406e0e8d4d0f0632e2ee8c5e32dcb010 https://sourceware.org/git/?p=elfutils.git;a=commit;h=6a20e20ea9f122aea86533d28a688e7bb2812aa1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/elfutils/elfutils.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 24eb168894..d43b545f2f 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -33,11 +33,6 @@ HOST_ELFUTILS_CONF_OPTS = \ ELFUTILS_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) ELFUTILS_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) -# sparc64 needs -fPIC instead of -fpic -ifeq ($(BR2_sparc64),y) -ELFUTILS_CFLAGS += -fPIC -endif - ELFUTILS_CONF_ENV += \ CFLAGS="$(ELFUTILS_CFLAGS)" \ CPPFLAGS="$(ELFUTILS_CPPFLAGS)" From thomas.petazzoni at bootlin.com Wed Feb 7 15:40:48 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:40:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/elfutils: drop -fpic workaround In-Reply-To: <20240112192154.1005937-1-fontaine.fabrice@gmail.com> References: <20240112192154.1005937-1-fontaine.fabrice@gmail.com> Message-ID: <20240207164048.65fe5d46@windsurf> On Fri, 12 Jan 2024 20:21:54 +0100 Fabrice Fontaine wrote: > -fpic workaround is not needed since bump to version 0.166 in commit > 794ae61a15f7a36e199b62b2e5224cfc41bdabea and > https://sourceware.org/git/?p=elfutils.git;a=commit;h=133509fa406e0e8d4d0f0632e2ee8c5e32dcb010 > https://sourceware.org/git/?p=elfutils.git;a=commit;h=6a20e20ea9f122aea86533d28a688e7bb2812aa1 > > Signed-off-by: Fabrice Fontaine > --- > package/elfutils/elfutils.mk | 5 ----- > 1 file changed, 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 15:47:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:47:41 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/tinymembench: force arm mode instead of Thumb mode In-Reply-To: <20240114135446.1156025-1-fontaine.fabrice@gmail.com> References: <20240114135446.1156025-1-fontaine.fabrice@gmail.com> Message-ID: <20240207164741.1bad9b44@windsurf> Hello Fabrice, On Sun, 14 Jan 2024 14:54:46 +0100 Fabrice Fontaine wrote: > +# tinymembench has some assembly function that is not present in Thumb mode: > +# Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' > +# so, we desactivate Thumb mode > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > +TINYMEMBENCH_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -marm" > +endif Why don't we simply extend the existing patch in the same way? It's just that new code has been added in main.c that isn't Thumb compatible, so I think you could change: #ifdef __arm__ to #if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) in main.c, and this should get you going. Could you try this instead? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Wed Feb 7 15:58:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:58:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sentry-sdk: bump to version 1.39.2 In-Reply-To: <20240111060552.3028285-1-james.hilliard1@gmail.com> References: <20240111060552.3028285-1-james.hilliard1@gmail.com> Message-ID: <56eb755c-7365-477c-baf8-898ea62dd24c@mind.be> On 11/01/2024 07:05, James Hilliard wrote: > License changed to MIT: > https://github.com/getsentry/sentry-python/commit/9ed5e27636d05bc30cd363c19a032ace8447f5ad > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-sentry-sdk/python-sentry-sdk.hash | 6 +++--- > package/python-sentry-sdk/python-sentry-sdk.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash > index 38ae3380a8..2534a48221 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 ea2d728c847879f66c3d24cfbade2026 sentry-sdk-1.12.1.tar.gz > -sha256 5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c sentry-sdk-1.12.1.tar.gz > +md5 94ba9002bbfaf8c443c496b05bbc32eb sentry-sdk-1.39.2.tar.gz > +sha256 24c83b0b41c887d33328a9166f5950dc37ad58f01c9f2fbff6b87a6f1094170c sentry-sdk-1.39.2.tar.gz > # Locally computed sha256 checksums > -sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c 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 c3092a5184..f1c5648f07 100644 > --- a/package/python-sentry-sdk/python-sentry-sdk.mk > +++ b/package/python-sentry-sdk/python-sentry-sdk.mk > @@ -4,11 +4,11 @@ > # > ################################################################################ > > -PYTHON_SENTRY_SDK_VERSION = 1.12.1 > +PYTHON_SENTRY_SDK_VERSION = 1.39.2 > PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz > -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/32/03/496a7c8313658dec419303e8add969f314b7538c29f4ec5ebe6d86fb8ce2 > +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/66/90/9deac5c137e9f0ede908757d886af77938ef28f94b24decedbdf98f1ca4d > PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools > -PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause > +PYTHON_SENTRY_SDK_LICENSE = MIT > PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE > > $(eval $(python-package)) From arnout at mind.be Wed Feb 7 15:58:11 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:58:11 +0100 Subject: [Buildroot] [git commit] package/python-sentry-sdk: bump to version 1.39.2 Message-ID: <20240207155839.036E7875F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc1181524da559b684320ee4d3a5a0fdd69dc3bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License changed to MIT: https://github.com/getsentry/sentry-python/commit/9ed5e27636d05bc30cd363c19a032ace8447f5ad Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-sentry-sdk/python-sentry-sdk.hash | 6 +++--- package/python-sentry-sdk/python-sentry-sdk.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 38ae3380a8..2534a48221 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 ea2d728c847879f66c3d24cfbade2026 sentry-sdk-1.12.1.tar.gz -sha256 5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c sentry-sdk-1.12.1.tar.gz +md5 94ba9002bbfaf8c443c496b05bbc32eb sentry-sdk-1.39.2.tar.gz +sha256 24c83b0b41c887d33328a9166f5950dc37ad58f01c9f2fbff6b87a6f1094170c sentry-sdk-1.39.2.tar.gz # Locally computed sha256 checksums -sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c 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 c3092a5184..f1c5648f07 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 1.12.1 +PYTHON_SENTRY_SDK_VERSION = 1.39.2 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/32/03/496a7c8313658dec419303e8add969f314b7538c29f4ec5ebe6d86fb8ce2 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/66/90/9deac5c137e9f0ede908757d886af77938ef28f94b24decedbdf98f1ca4d PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools -PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause +PYTHON_SENTRY_SDK_LICENSE = MIT PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 7 15:58:59 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:58:59 +0100 Subject: [Buildroot] [PATCH v4 4/7] package/opencl-headers: new package In-Reply-To: <20240202093625.1409559-5-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-5-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > From: Sebastian Weyer > > These headers provide the C language API bindings. It is a complement to > the C++ bindings already available in opencl-clhpp. This package is > required to build opencl-icd-loader: > > https://github.com/KhronosGroup/OpenCL-ICD-Loader#dependencies > > Signed-off-by: Sebastian Weyer > Signed-off-by: Antoine Coutant > --- [--SNIP--] > diff --git a/package/opencl-headers/Config.in b/package/opencl-headers/Config.in > new file mode 100644 > index 0000000000..092d8a2a4d > --- /dev/null > +++ b/package/opencl-headers/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_OPENCL_HEADERS > + bool "opencl-headers" > + depends on BR2_PACKAGE_HAS_LIBOPENCL BR2_PACKAGE_HAS_LIBOPENCL can be set by mesa3d when BR2_PACKAGE_MESA3D_OPENCL is enabled. In this case, will mesa3d install its own headers? If so, that will generate a conflict. Furthermore, this will also conflict with mesa3d-headers, and it also installs CL headers. So, why do we need opencl-headers and can't rely on the existing mesa3d-headers package? Regards, Yann E. MORIN. > + help > + C language headers for the OpenCL API > + > + https://github.com/KhronosGroup/OpenCL-Headers > diff --git a/package/opencl-headers/opencl-headers.hash b/package/opencl-headers/opencl-headers.hash > new file mode 100644 > index 0000000000..802ed05450 > --- /dev/null > +++ b/package/opencl-headers/opencl-headers.hash > @@ -0,0 +1,3 @@ > +#Locally generated > +sha256 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d OpenCL-Headers-2023.12.14.tar.gz > +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/opencl-headers/opencl-headers.mk b/package/opencl-headers/opencl-headers.mk > new file mode 100644 > index 0000000000..7aa0e0d168 > --- /dev/null > +++ b/package/opencl-headers/opencl-headers.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# opencl-headers > +# > +################################################################################ > + > +OPENCL_HEADERS_VERSION = 2023.12.14 > +OPENCL_HEADERS_SOURCE = OpenCL-Headers-$(OPENCL_HEADERS_VERSION).tar.gz > +OPENCL_HEADERS_SITE = $(call github,KhronosGroup,OpenCL-Headers,v$(OPENCL_HEADERS_VERSION)) > +OPENCL_HEADERS_LICENSE = Apache-2.0 > +OPENCL_HEADERS_LICENSE_FILES = LICENSE > +OPENCL_HEADERS_INSTALL_STAGING = YES > + > +OPENCL_HEADERS_INSTALL_TARGET = NO > + > +define OPENCL_HEADERS_INSTALL_STAGING_CMDS > + mkdir -p $(STAGING_DIR)/usr/include/CL > + $(INSTALL) -D -m 0644 $(@D)/CL/* \ > + $(STAGING_DIR)/usr/include/CL > +endef > + > +$(eval $(generic-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Wed Feb 7 16:01:06 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:01:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-service-identity: bump to version 23.1.0 In-Reply-To: <20240111061658.3034731-1-james.hilliard1@gmail.com> References: <20240111061658.3034731-1-james.hilliard1@gmail.com> Message-ID: <457e9920-3397-40b6-a746-9ba3bf0511f7@mind.be> On 11/01/2024 07:16, James Hilliard wrote: > License hash changed due to MIT header added: > https://github.com/pyca/service-identity/commit/a4a82c1b646d07cf2f3b4705ce17f22e6484556c > > Migrate from setuptools to hatchling pep517 build backend. > > Drop no longer python-pyopenssl runtime dependency. > > Drop no longer python-six runtime dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-service-identity/Config.in | 2 -- > .../python-service-identity.hash | 6 +++--- > .../python-service-identity.mk | 12 ++++++++---- > 3 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in > index 278900971e..dccd8f37c0 100644 > --- a/package/python-service-identity/Config.in > +++ b/package/python-service-identity/Config.in > @@ -5,8 +5,6 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_PYASN1 # runtime > select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime > - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > help > Service identity verification for pyOpenSSL. > > diff --git a/package/python-service-identity/python-service-identity.hash b/package/python-service-identity/python-service-identity.hash > index f648918dbd..32d8f21ad4 100644 > --- a/package/python-service-identity/python-service-identity.hash > +++ b/package/python-service-identity/python-service-identity.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/service-identity/json > -md5 5e5c195d8fcedc72f9068be2ad9b5a13 service-identity-21.1.0.tar.gz > -sha256 6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34 service-identity-21.1.0.tar.gz > +md5 14a751406024544784459474d93d1ea5 service_identity-23.1.0.tar.gz > +sha256 ecb33cd96307755041e978ab14f8b14e13b40f1fbd525a4dc78f46d2b986431d service_identity-23.1.0.tar.gz > # Locally computed sha256 checksums > -sha256 c5075126e1272b176504e36af369781a95c5c1124239da8e4f61b0f9c15a56cf LICENSE > +sha256 51f7c647190e74d19f9f24f1b19645b425eb8f30f049196053686bff188505cf LICENSE > diff --git a/package/python-service-identity/python-service-identity.mk b/package/python-service-identity/python-service-identity.mk > index e4ae8e6889..6e61dd951b 100644 > --- a/package/python-service-identity/python-service-identity.mk > +++ b/package/python-service-identity/python-service-identity.mk > @@ -4,11 +4,15 @@ > # > ################################################################################ > > -PYTHON_SERVICE_IDENTITY_VERSION = 21.1.0 > -PYTHON_SERVICE_IDENTITY_SOURCE = service-identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz > -PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/09/2e/26ade69944773df4748c19d3053e025b282f48de02aad84906d34a29d28b > +PYTHON_SERVICE_IDENTITY_VERSION = 23.1.0 > +PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz > +PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/3b/98/2a46c7414ffc1d06ba67d2c2dd62a207a70cb351028a8cd8c85b3dbd1cf7 > PYTHON_SERVICE_IDENTITY_LICENSE = MIT > PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE > -PYTHON_SERVICE_IDENTITY_SETUP_TYPE = setuptools > +PYTHON_SERVICE_IDENTITY_SETUP_TYPE = pep517 > +PYTHON_SERVICE_IDENTITY_DEPENDENCIES = \ > + host-python-hatchling \ > + host-python-hatch-vcs \ > + host-python-hatch-fancy-pypi-readme > > $(eval $(python-package)) From arnout at mind.be Wed Feb 7 15:58:44 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:58:44 +0100 Subject: [Buildroot] [git commit] package/python-service-identity: bump to version 23.1.0 Message-ID: <20240207160129.C517F875FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6008f2b1b901be1374ac201b5e560cca61b4b61e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to MIT header added: https://github.com/pyca/service-identity/commit/a4a82c1b646d07cf2f3b4705ce17f22e6484556c Migrate from setuptools to hatchling pep517 build backend. Drop no longer python-pyopenssl runtime dependency. Drop no longer python-six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-service-identity/Config.in | 2 -- package/python-service-identity/python-service-identity.hash | 6 +++--- package/python-service-identity/python-service-identity.mk | 12 ++++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index 278900971e..dccd8f37c0 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -5,8 +5,6 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_PYASN1 # runtime select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help Service identity verification for pyOpenSSL. diff --git a/package/python-service-identity/python-service-identity.hash b/package/python-service-identity/python-service-identity.hash index f648918dbd..32d8f21ad4 100644 --- a/package/python-service-identity/python-service-identity.hash +++ b/package/python-service-identity/python-service-identity.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/service-identity/json -md5 5e5c195d8fcedc72f9068be2ad9b5a13 service-identity-21.1.0.tar.gz -sha256 6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34 service-identity-21.1.0.tar.gz +md5 14a751406024544784459474d93d1ea5 service_identity-23.1.0.tar.gz +sha256 ecb33cd96307755041e978ab14f8b14e13b40f1fbd525a4dc78f46d2b986431d service_identity-23.1.0.tar.gz # Locally computed sha256 checksums -sha256 c5075126e1272b176504e36af369781a95c5c1124239da8e4f61b0f9c15a56cf LICENSE +sha256 51f7c647190e74d19f9f24f1b19645b425eb8f30f049196053686bff188505cf LICENSE diff --git a/package/python-service-identity/python-service-identity.mk b/package/python-service-identity/python-service-identity.mk index e4ae8e6889..6e61dd951b 100644 --- a/package/python-service-identity/python-service-identity.mk +++ b/package/python-service-identity/python-service-identity.mk @@ -4,11 +4,15 @@ # ################################################################################ -PYTHON_SERVICE_IDENTITY_VERSION = 21.1.0 -PYTHON_SERVICE_IDENTITY_SOURCE = service-identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz -PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/09/2e/26ade69944773df4748c19d3053e025b282f48de02aad84906d34a29d28b +PYTHON_SERVICE_IDENTITY_VERSION = 23.1.0 +PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz +PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/3b/98/2a46c7414ffc1d06ba67d2c2dd62a207a70cb351028a8cd8c85b3dbd1cf7 PYTHON_SERVICE_IDENTITY_LICENSE = MIT PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE -PYTHON_SERVICE_IDENTITY_SETUP_TYPE = setuptools +PYTHON_SERVICE_IDENTITY_SETUP_TYPE = pep517 +PYTHON_SERVICE_IDENTITY_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs \ + host-python-hatch-fancy-pypi-readme $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 7 16:01:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 17:01:39 +0100 Subject: [Buildroot] [PATCH v4 5/7] package/opencl-icd-loader: new package In-Reply-To: <20240202093625.1409559-6-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-6-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > From: Sebastian Weyer > > With this package it is possible to have multiple implementations of > OpenCL at the same time. This package provides a libOpenCL.so file that > captures the OpenCL API calls and forwards them to the correct > implementation of OpenCL. OpenCL implementations can be manually > registered by creating a file containing its full file path in > /etc/OpenCL/vendors/.icd[1] > > This package is required by certain OpenCL implementations, for example > Mesa3D's Clover implementation if it is not built in standalone mode. > > [1] https://github.com/KhronosGroup/OpenCL-ICD-Loader#registering-icds > > Signed-off-by: Sebastian Weyer > Signed-off-by: Antoine Coutant > --- [--SNIP--] > diff --git a/package/opencl-icd-loader/Config.in b/package/opencl-icd-loader/Config.in > new file mode 100644 > index 0000000000..405dc5401a > --- /dev/null > +++ b/package/opencl-icd-loader/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_OPENCL_ICD_LOADER > + bool "OpenCL-ICD-Loader" > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_PACKAGE_HAS_LIBOPENCL > + select BR2_PACKAGE_OPENCL_HEADERS Following on the review of the previous patch: maybe that could rely on mesa3d-headers, and if so, we'ds not need to introduce a new opencl-headers package. Regards, Yann E. MORIN. > + help > + OpenCL defines an Installable Client Driver (ICD) mechanism to > + allow developers to build applications against an Installable > + Client Driver loader (ICD loader) rather than linking their > + applications against a specific OpenCL implementation. > + > + https://github.com/KhronosGroup/OpenCL-ICD-Loader > diff --git a/package/opencl-icd-loader/opencl-icd-loader.hash b/package/opencl-icd-loader/opencl-icd-loader.hash > new file mode 100644 > index 0000000000..1c894f1293 > --- /dev/null > +++ b/package/opencl-icd-loader/opencl-icd-loader.hash > @@ -0,0 +1,3 @@ > +# locally generated > +sha256 af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917 OpenCL-ICD-Loader-2023.12.14.tar.gz > +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE > diff --git a/package/opencl-icd-loader/opencl-icd-loader.mk b/package/opencl-icd-loader/opencl-icd-loader.mk > new file mode 100644 > index 0000000000..04f6fb4b85 > --- /dev/null > +++ b/package/opencl-icd-loader/opencl-icd-loader.mk > @@ -0,0 +1,19 @@ > +################################################################################ > +# > +# opencl-icd-loader > +# > +################################################################################ > + > +OPENCL_ICD_LOADER_VERSION = 2023.12.14 > +OPENCL_ICD_LOADER_SOURCE = OpenCL-ICD-Loader-$(OPENCL_ICD_LOADER_VERSION).tar.gz > +OPENCL_ICD_LOADER_SITE = $(call github,KhronosGroup,OpenCL-ICD-Loader,v$(OPENCL_ICD_LOADER_VERSION)) > +OPENCL_ICD_LOADER_LICENSE = Apache-2.0 > +OPENCL_ICD_LOADER_LICENSE_FILES = LICENSE > +OPENCL_ICD_LOADER_INSTALL_STAGING = YES > + > +OPENCL_ICD_LOADER_DEPENDENCIES = opencl-headers > + > +OPENCL_ICD_LOADER_CONF_OPTS += -DOPENCL_ICD_LOADER_HEADERS_DIR=$(STAGING_DIR)/usr/include > + > +$(eval $(cmake-package)) > +$(eval $(host-cmake-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Wed Feb 7 16:03:37 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:03:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setproctitle: bump to version 1.3.3 In-Reply-To: <20240111062157.3037879-1-james.hilliard1@gmail.com> References: <20240111062157.3037879-1-james.hilliard1@gmail.com> Message-ID: <3cee30f6-97c4-4a42-b5eb-5128313584dd@mind.be> On 11/01/2024 07:21, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-setproctitle/python-setproctitle.hash | 6 +++--- > package/python-setproctitle/python-setproctitle.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-setproctitle/python-setproctitle.hash b/package/python-setproctitle/python-setproctitle.hash > index ac8fed986a..f60595bf6c 100644 > --- a/package/python-setproctitle/python-setproctitle.hash > +++ b/package/python-setproctitle/python-setproctitle.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/setproctitle/json > -md5 fa9771540422a59a8dee1331ad6fd3a9 setproctitle-1.3.2.tar.gz > -sha256 b9fb97907c830d260fa0658ed58afd48a86b2b88aac521135c352ff7fd3477fd setproctitle-1.3.2.tar.gz > -# Locally computed > +md5 1c042d6717212de791c4f9b63e7b544e setproctitle-1.3.3.tar.gz > +sha256 c913e151e7ea01567837ff037a23ca8740192880198b7fbb90b16d181607caae setproctitle-1.3.3.tar.gz > +# Locally computed sha256 checksums > sha256 4ace14d0836da75079088cfc5cef6f2ddc8ce16f600609b36ee1bf10f8101f61 COPYRIGHT > diff --git a/package/python-setproctitle/python-setproctitle.mk b/package/python-setproctitle/python-setproctitle.mk > index 7055920c08..ca2d0ffbc6 100644 > --- a/package/python-setproctitle/python-setproctitle.mk > +++ b/package/python-setproctitle/python-setproctitle.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SETPROCTITLE_VERSION = 1.3.2 > +PYTHON_SETPROCTITLE_VERSION = 1.3.3 > PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz > -PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/b5/47/ac709629ddb9779fee29b7d10ae9580f60a4b37e49bce72360ddf9a79cdc > +PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/ff/e1/b16b16a1aa12174349d15b73fd4b87e641a8ae3fb1163e80938dbbf6ae98 > PYTHON_SETPROCTITLE_LICENSE = BSD-3-Clause > PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT > PYTHON_SETPROCTITLE_SETUP_TYPE = setuptools From arnout at mind.be Wed Feb 7 16:01:32 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:01:32 +0100 Subject: [Buildroot] [git commit] package/python-setproctitle: bump to version 1.3.3 Message-ID: <20240207160356.3B0CC87605@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33ac66e792b559bcbf31d69c58750a97b188933c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-setproctitle/python-setproctitle.hash | 6 +++--- package/python-setproctitle/python-setproctitle.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-setproctitle/python-setproctitle.hash b/package/python-setproctitle/python-setproctitle.hash index ac8fed986a..f60595bf6c 100644 --- a/package/python-setproctitle/python-setproctitle.hash +++ b/package/python-setproctitle/python-setproctitle.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setproctitle/json -md5 fa9771540422a59a8dee1331ad6fd3a9 setproctitle-1.3.2.tar.gz -sha256 b9fb97907c830d260fa0658ed58afd48a86b2b88aac521135c352ff7fd3477fd setproctitle-1.3.2.tar.gz -# Locally computed +md5 1c042d6717212de791c4f9b63e7b544e setproctitle-1.3.3.tar.gz +sha256 c913e151e7ea01567837ff037a23ca8740192880198b7fbb90b16d181607caae setproctitle-1.3.3.tar.gz +# Locally computed sha256 checksums sha256 4ace14d0836da75079088cfc5cef6f2ddc8ce16f600609b36ee1bf10f8101f61 COPYRIGHT diff --git a/package/python-setproctitle/python-setproctitle.mk b/package/python-setproctitle/python-setproctitle.mk index 7055920c08..ca2d0ffbc6 100644 --- a/package/python-setproctitle/python-setproctitle.mk +++ b/package/python-setproctitle/python-setproctitle.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETPROCTITLE_VERSION = 1.3.2 +PYTHON_SETPROCTITLE_VERSION = 1.3.3 PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz -PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/b5/47/ac709629ddb9779fee29b7d10ae9580f60a4b37e49bce72360ddf9a79cdc +PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/ff/e1/b16b16a1aa12174349d15b73fd4b87e641a8ae3fb1163e80938dbbf6ae98 PYTHON_SETPROCTITLE_LICENSE = BSD-3-Clause PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT PYTHON_SETPROCTITLE_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Wed Feb 7 16:07:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:07:15 +0100 Subject: [Buildroot] [git commit] package/libglib2: fix libiconv (intl) support Message-ID: <20240207160746.39F598760C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3641347ff13267fe8a7f45d0207d333dac9ca38a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Libglib2 can compile without localization support, but still depends on libiconv, which is selected in Config.in. This fallback support was broken, and is fixed in this upstream commit: https://gitlab.gnome.org/GNOME/glib/-/commit/a497d5be122f193dcf8679334308333bbbc14a71, which partially reverts commits that were brought through merge commit 4a8120ec22be0b63705c1ed28b47920b99388087, that landed in 2.74.0 (as the first stable release). The other patch is purely added to avoid merge conflicts while cherry-picking. Fixes: http://autobuild.buildroot.org/results/04d9a17e64503e0bece7bad33549ef3ad4b237c9/ Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- ...etection-of-a-system-provided-proxy-libin.patch | 53 ++++++++++++++++++++++ .../0005-meson-try-iconv-in-libintl-lookup.patch | 53 ++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch b/package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch new file mode 100644 index 0000000000..57404705d0 --- /dev/null +++ b/package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch @@ -0,0 +1,53 @@ +From 2ca9f53327308e85e376bcbef7f8259a6331a453 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan +Date: Thu, 8 Sep 2022 02:36:33 +0530 +Subject: [PATCH] meson: Fix detection of a system-provided proxy-libintl + +proxy-libintl defines ngettext() as a define in the header that points +to the actual symbol in the library which is g_libintl_ngettext(). +Same with bind_textdomain_codeset(). + +Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/32249a22fc39319651e7c23442d37ec837f05764 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 0cbc9689f..de0bee5a3 100644 +--- a/meson.build ++++ b/meson.build +@@ -2089,6 +2089,7 @@ libz_dep = dependency('zlib') + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible + # implementations. This could be extended if issues are found in some platforms. + libintl_deps = [] ++libintl_prefix = '#include ' + libintl = dependency('intl', required: false, allow_fallback: false) + if libintl.found() + # libintl supports different threading APIs, which may not +@@ -2100,11 +2101,11 @@ if libintl.found() + # + # Meson's builtin dependency lookup as of 0.60.0 doesn't check for + # pthread, so we do this manually here. +- if cc.has_function('ngettext', dependencies : libintl) ++ if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix) + libintl_deps += [libintl] + else + libintl_pthread = cc.find_library('pthread', required : false) +- if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread]) ++ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) + libintl_deps += [libintl, libintl_pthread] + else + libintl = disabler() +@@ -2113,7 +2114,7 @@ if libintl.found() + endif + + if libintl.found() +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) ++ have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps, prefix: libintl_prefix) + else + libintl = dependency('intl', allow_fallback: true) + assert(libintl.type_name() == 'internal') +-- +2.34.1 + diff --git a/package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch b/package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch new file mode 100644 index 0000000000..a342ee95d6 --- /dev/null +++ b/package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch @@ -0,0 +1,53 @@ +From fe7f54d4f339b7948c961b60729f620f2eaec716 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Tue, 23 May 2023 23:42:37 +0200 +Subject: [PATCH] meson: try iconv in libintl lookup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This was originally removed in !2734 but still appears to be required for +some MinGW setups, such as the `x86_64-w64-mingw32.static` target in +[mxe](https://github.com/mxe/mxe). + +Currently, this configuration fails the libintl internal assert on line +2128, as on this platform `ngettext()` is only found inside libiconv. + +This commit will look up iconv potentially twice, once as `libiconv` and +potentially once as `libintl_iconv`. This is what the code did before +!2734 landed, so it???s known to work reliably on a number of platforms. + +Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/a497d5be122f193dcf8679334308333bbbc14a71 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index de0bee5a3..653f9eddf 100644 +--- a/meson.build ++++ b/meson.build +@@ -2104,11 +2104,16 @@ if libintl.found() + if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix) + libintl_deps += [libintl] + else +- libintl_pthread = cc.find_library('pthread', required : false) +- if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) +- libintl_deps += [libintl, libintl_pthread] ++ libintl_iconv = cc.find_library('iconv', required : false) ++ if libintl_iconv.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv]) ++ libintl_deps += [libintl, libintl_iconv] + else +- libintl = disabler() ++ libintl_pthread = cc.find_library('pthread', required : false) ++ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) ++ libintl_deps += [libintl, libintl_pthread] ++ else ++ libintl = disabler() ++ endif + endif + endif + endif +-- +2.34.1 + From thomas.petazzoni at bootlin.com Wed Feb 7 16:10:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:10:34 +0100 Subject: [Buildroot] [PATCH v2] package/libglib2: fix libiconv (intl) support In-Reply-To: <20240114184111.454187-1-thomas@devoogdt.com> References: <20240114184111.454187-1-thomas@devoogdt.com> Message-ID: <20240207171034.535dd392@windsurf> On Sun, 14 Jan 2024 19:41:11 +0100 Thomas Devoogdt wrote: > Libglib2 can compile without localization support, > but still depends on libiconv, which is selected in Config.in. > > This fallback support was broken, and is fixed in this upstream commit: > https://gitlab.gnome.org/GNOME/glib/-/commit/a497d5be122f193dcf8679334308333bbbc14a71 > > The other patch is purely added to avoid merge conflicts while cherry-picking. > > Fixes: http://autobuild.buildroot.org/results/04d/04d9a17e64503e0bece7bad33549ef3ad4b237c9/build-end.log. > > Signed-off-by: Thomas Devoogdt > --- > v2: dropped meson libintl wrap, problem was the libiconv detection > --- > ...ion-of-a-system-provided-proxy-libin.patch | 53 +++++++++++++++++++ > ...05-meson-try-iconv-in-libintl-lookup.patch | 53 +++++++++++++++++++ > 2 files changed, 106 insertions(+) > create mode 100644 package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch > create mode 100644 package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch Applied to master after doing some research to explain when the problem was introduced, so that Peter can more easily decide if this should be backported, and to which branches. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 16:11:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:11:05 +0100 Subject: [Buildroot] [git commit] package/swugenerator: add missing runtime dependencies Message-ID: <20240207161143.F3E0987610@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34da86d1ef85226f758e83a381a81c03c6824734 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master swugenerator might use openssl to encrypt files in .swu(cpio) resulting output archive and gzip or zlib to compress the same files but we're not sure whether build environment have or not openssl, gzip and zlib installed so we add them as host dependencies. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/swugenerator/swugenerator.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/swugenerator/swugenerator.mk b/package/swugenerator/swugenerator.mk index f4ead1d229..466fe1f046 100644 --- a/package/swugenerator/swugenerator.mk +++ b/package/swugenerator/swugenerator.mk @@ -9,6 +9,10 @@ SWUGENERATOR_SITE = $(call github,sbabic,swugenerator,v$(SWUGENERATOR_VERSION)) SWUGENERATOR_LICENSE = GPL-3.0 SWUGENERATOR_LICENSE_FILES = LICENSE HOST_SWUGENERATOR_SETUP_TYPE = setuptools -HOST_SWUGENERATOR_DEPENDENCIES = host-python-libconf +HOST_SWUGENERATOR_DEPENDENCIES = \ + host-gzip \ + host-openssl \ + host-python-libconf \ + host-zstd $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Wed Feb 7 16:11:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:11:49 +0100 Subject: [Buildroot] [PATCH v3] package/swugenerator: add missing runtime dependencies In-Reply-To: <20240107115958.173945-1-giulio.benetti@benettiengineering.com> References: <20240105140611.6a19a037@windsurf> <20240107115958.173945-1-giulio.benetti@benettiengineering.com> Message-ID: <20240207171149.2f609365@windsurf> On Sun, 7 Jan 2024 12:59:58 +0100 Giulio Benetti wrote: > From: Giulio Benetti > > Package swugenerator can use openssl to encrypt files in .swu(cpio) > resulting output archive and gzip or zlib to compress the same files but > we're not sure build environment have or not openssl, gzip and zlib > installed so add them as host dependencies like: > * host-openssl > * host-gzip > * host-zlib > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * V1->V2: > * add host-zstd and clarify in commit log these are runtime dependencies as > pointed by Thomas Petazzoni > V2->V3: > * improve commit log explaining why we need this patch as pointed by > Thomas Petazzoni > --- > package/swugenerator/swugenerator.mk | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Wed Feb 7 16:17:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 17:17:00 +0100 Subject: [Buildroot] [PATCH v8 1/2] package/cairo: move to the meson build system In-Reply-To: <20240205213035.3180167-1-thomas@devoogdt.com> (Thomas Devoogdt's message of "Mon, 5 Feb 2024 22:30:34 +0100") References: <20240205212300.3178519-2-thomas@devoogdt.com> <20240205213035.3180167-1-thomas@devoogdt.com> Message-ID: <87le7wz1tv.fsf@48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy > since they are not selectable anymore in the meson-build options. > BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. > - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG > option already selects that one. This is now in sync with the > meson build options. > - Note that the dependencies for the various options are slightly changed, > but there is not much mentioned about that, the meson introduction is done > in one big commit: [1]. > - Added xlib_libXrender dependency, which was already required > before meson, it just came to my attention since it's a hard > error now. In what configuration do you see that? I just did a test with current master (commit 6008f2b1b901b) and the following defconfig without issues: BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_XORG7=y BR2_PACKAGE_CAIRO=y # BR2_TARGET_ROOTFS_TAR is not set -- Bye, Peter Korsgaard From dario.binacchi at amarulasolutions.com Wed Feb 7 16:17:04 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 17:17:04 +0100 Subject: [Buildroot] [PATCH 1/1] configs: drop redundant configuration for no MMU platforms Message-ID: <20240207161704.2981151-1-dario.binacchi@amarulasolutions.com> The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi --- configs/canaan_kd233_defconfig | 1 - configs/imxrt1050-evk_defconfig | 3 --- configs/qemu_m68k_mcf5208_defconfig | 3 --- configs/qemu_riscv64_nommu_virt_defconfig | 3 --- configs/qemu_xtensa_lx60_nommu_defconfig | 3 --- configs/sipeed_maix_bit_defconfig | 1 - configs/sipeed_maix_bit_sdcard_defconfig | 1 - configs/sipeed_maix_dock_defconfig | 1 - configs/sipeed_maix_dock_sdcard_defconfig | 1 - configs/sipeed_maix_go_defconfig | 1 - configs/sipeed_maix_go_sdcard_defconfig | 1 - configs/sipeed_maixduino_defconfig | 1 - configs/sipeed_maixduino_sdcard_defconfig | 1 - configs/stm32f429_disco_xip_defconfig | 1 - configs/stm32f469_disco_sd_defconfig | 1 - configs/stm32f469_disco_xip_defconfig | 1 - configs/stm32f769_disco_sd_defconfig | 1 - 17 files changed, 25 deletions(-) diff --git a/configs/canaan_kd233_defconfig b/configs/canaan_kd233_defconfig index 3335195f2589..672fee57a185 100644 --- a/configs/canaan_kd233_defconfig +++ b/configs/canaan_kd233_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig index 947abe5df206..b493c1109820 100644 --- a/configs/imxrt1050-evk_defconfig +++ b/configs/imxrt1050-evk_defconfig @@ -23,9 +23,6 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="16M" -# NOMMU Busybox -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index e35f3546fed4..0c95756a8e16 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -29,9 +29,6 @@ BR2_LINUX_KERNEL_VMLINUX=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -# use minimal busybox with hush and networking tools -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index 2a0aea01d703..9999bcf7f336 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -6,9 +6,6 @@ BR2_RISCV_64=y # Linux headers same as kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y -# Busybox with hush -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # System BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index c3224576f76b..d1d59b95254f 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -4,9 +4,6 @@ BR2_XTENSA_CUSTOM=y BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz" # BR2_XTENSA_USE_MMU is not set -# Use minimal busybox with hush and networking tools -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" diff --git a/configs/sipeed_maix_bit_defconfig b/configs/sipeed_maix_bit_defconfig index 03ae57e1b7fd..e45996879a6a 100644 --- a/configs/sipeed_maix_bit_defconfig +++ b/configs/sipeed_maix_bit_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig index 720d2169205a..7e293e5a490c 100644 --- a/configs/sipeed_maix_bit_sdcard_defconfig +++ b/configs/sipeed_maix_bit_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_bit" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maix_dock_defconfig b/configs/sipeed_maix_dock_defconfig index 045967f5899b..0352382fcd86 100644 --- a/configs/sipeed_maix_dock_defconfig +++ b/configs/sipeed_maix_dock_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig index eb7294d55911..20658813bad1 100644 --- a/configs/sipeed_maix_dock_sdcard_defconfig +++ b/configs/sipeed_maix_dock_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_dock" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maix_go_defconfig b/configs/sipeed_maix_go_defconfig index c320d19703ab..27272dac4c44 100644 --- a/configs/sipeed_maix_go_defconfig +++ b/configs/sipeed_maix_go_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig index d2392ba822fb..1bc12dd05819 100644 --- a/configs/sipeed_maix_go_sdcard_defconfig +++ b/configs/sipeed_maix_go_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_go" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maixduino_defconfig b/configs/sipeed_maixduino_defconfig index ba83dd76ee7f..3e04ea3a046a 100644 --- a/configs/sipeed_maixduino_defconfig +++ b/configs/sipeed_maixduino_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig index 09bc1b4ab15a..253ee7d7cfc3 100644 --- a/configs/sipeed_maixduino_sdcard_defconfig +++ b/configs/sipeed_maixduino_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maixduino" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index d4e000487a80..99ae8cc7533b 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index 8b10bc674176..66840a774230 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index e362a9985116..6e6ead0fdebb 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index 2ae27fb2d852..725c985ec04e 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f769-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" -- 2.43.0 From yann.morin.1998 at free.fr Wed Feb 7 16:19:42 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 17:19:42 +0100 Subject: [Buildroot] [git commit] package/python-rpds-py: bump to version 0.17.1 Message-ID: <20240207161954.61A0287616@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=538332d944883ebeb2b91d3b31425593165c0d34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-rpds-py/python-rpds-py.hash | 2 +- package/python-rpds-py/python-rpds-py.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash index 8c4b6181d0..4650d9c385 100644 --- a/package/python-rpds-py/python-rpds-py.hash +++ b/package/python-rpds-py/python-rpds-py.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz +sha256 760b05720269195d86071ac7cf627b3a4ab9366680d8d449a6a63b84d96a5bc0 rpds_py-0.17.1.tar.gz # Locally computed sha256 checksums sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 5f0d30d002..80670f2e4f 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPDS_PY_VERSION = 0.16.2 +PYTHON_RPDS_PY_VERSION = 0.17.1 PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/b7/0a/e3bdcc977e6db3bf32a3f42172f583adfa7c3604091a03d512333e0161fe PYTHON_RPDS_PY_SETUP_TYPE = maturin PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/bayer2rgb-neon: fix aarch64 build with BR2_OPTIMIZE_0 In-Reply-To: <20240106224233.3637602-1-fontaine.fabrice@gmail.com> References: <20240106224233.3637602-1-fontaine.fabrice@gmail.com> Message-ID: <20240207172418.45613b76@windsurf> On Sat, 6 Jan 2024 23:42:33 +0100 Fabrice Fontaine wrote: > Fix the following build failure with aarch64 and BR2_OPTIMIZE_0 raised > since commit 0512910e4901edcb78bb1daa4eb3be9bdc4dc8a9: > > src/convert-neon-body-bayer8.inc.h: In function 'bayer2rgb_convert_neon': > src/convert-neon.c:233:17: error: third argument to '__builtin_prefetch' must be a constant > 233 | __builtin_prefetch(((void const *)(_addr)) + 64, 0, (_lvl)); \ > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > src/convert-neon-body-bayer8.inc.h:8:9: note: in expansion of macro 'do_prefetch' > 8 | do_prefetch(&in[+1*stride - 1], (rows_per_loop) < 3 ? 3 : 0); > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/307c1c448becd99dfba3a17b3ef816db0bb5cad6 > > Signed-off-by: Fabrice Fontaine > --- > package/bayer2rgb-neon/bayer2rgb-neon.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/bayer2rgb-neon: bump to latest commit In-Reply-To: <20240106224320.3638136-1-fontaine.fabrice@gmail.com> References: <20240106224320.3638136-1-fontaine.fabrice@gmail.com> Message-ID: <20240207172422.09b472a7@windsurf> On Sat, 6 Jan 2024 23:43:20 +0100 Fabrice Fontaine wrote: > Drop patch (already in version) > > Signed-off-by: Fabrice Fontaine > --- > .checkpackageignore | 1 - > ...add-some-_always_inline_-annotations.patch | 75 ------------------- > package/bayer2rgb-neon/bayer2rgb-neon.hash | 2 +- > package/bayer2rgb-neon/bayer2rgb-neon.mk | 2 +- > 4 files changed, 2 insertions(+), 78 deletions(-) > delete mode 100644 package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 7 16:24:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 17:24:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.17.1 In-Reply-To: <20240205165353.515894-1-james.hilliard1@gmail.com> References: <20240205165353.515894-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-05 09:53 -0700, James Hilliard spake thusly: > Signed-off-by: James Hilliard > --- > package/python-rpds-py/python-rpds-py.hash | 2 +- > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > index b04aa210d3..4650d9c385 100644 > --- a/package/python-rpds-py/python-rpds-py.hash > +++ b/package/python-rpds-py/python-rpds-py.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > +sha256 760b05720269195d86071ac7cf627b3a4ab9366680d8d449a6a63b84d96a5bc0 rpds_py-0.17.1.tar.gz > # Locally computed sha256 checksums > sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE > diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk > index 6f71d02047..80670f2e4f 100644 > --- a/package/python-rpds-py/python-rpds-py.mk > +++ b/package/python-rpds-py/python-rpds-py.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > +PYTHON_RPDS_PY_VERSION = 0.17.1 Your previous patch bumping to 0.16.2 was still in patchwork and not marked superseded, so that's what Arnout was looking at yet=sterday; we missed your newer version bump. Be sure to mark your superseded patches as such in patchwork, it will help reduce the load. Applied to master, after fixing the conflicts, thanks. Also, as discussed previously with Antoine, rpds-py is currently 64-bit only and breaks on 32-bit architectures. Could you look into fixing that by making it "depends on BR2_ARCH_IS_64" (and propagate that dependency) until it eventually gets fixed upstream (and maybe work with them)? Regards, Yann E. MORIN. > PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz > -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 > +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/b7/0a/e3bdcc977e6db3bf32a3f42172f583adfa7c3604091a03d512333e0161fe > PYTHON_RPDS_PY_SETUP_TYPE = maturin > PYTHON_RPDS_PY_LICENSE = MIT > PYTHON_RPDS_PY_LICENSE_FILES = LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:34 +0100 Subject: [Buildroot] [git commit] package/bayer2rgb-neon: fix aarch64 build with BR2_OPTIMIZE_0 Message-ID: <20240207162449.B16EA87623@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13f8df8ed6e69f102d71d2040176b9374ff81706 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with aarch64 and BR2_OPTIMIZE_0 raised since commit 0512910e4901edcb78bb1daa4eb3be9bdc4dc8a9: src/convert-neon-body-bayer8.inc.h: In function 'bayer2rgb_convert_neon': src/convert-neon.c:233:17: error: third argument to '__builtin_prefetch' must be a constant 233 | __builtin_prefetch(((void const *)(_addr)) + 64, 0, (_lvl)); \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/convert-neon-body-bayer8.inc.h:8:9: note: in expansion of macro 'do_prefetch' 8 | do_prefetch(&in[+1*stride - 1], (rows_per_loop) < 3 ? 3 : 0); | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/307c1c448becd99dfba3a17b3ef816db0bb5cad6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/bayer2rgb-neon/bayer2rgb-neon.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/bayer2rgb-neon/bayer2rgb-neon.mk b/package/bayer2rgb-neon/bayer2rgb-neon.mk index 212fe76766..5147a985e8 100644 --- a/package/bayer2rgb-neon/bayer2rgb-neon.mk +++ b/package/bayer2rgb-neon/bayer2rgb-neon.mk @@ -19,6 +19,14 @@ ifeq ($(BR2_arm),y) BAYER2RGB_NEON_CFLAGS += -mfpu=neon endif +# __builtin_prefetch() third argument must be a constant, but +# bayer2rgb-neon uses a variable, derived from a constant, so some +# optimization is needed to allow the compiler to turn it into a +# constant, otherwise the build fails +ifeq ($(BR2_OPTIMIZE_0),y) +BAYER2RGB_NEON_CFLAGS += -O1 +endif + BAYER2RGB_NEON_CONF_ENV = CFLAGS="$(BAYER2RGB_NEON_CFLAGS)" $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:35 +0100 Subject: [Buildroot] [git commit] package/bayer2rgb-neon: bump to latest commit Message-ID: <20240207162449.BD12D87624@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e591475b4d0c2e2661d3710abd0964b5b42275e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...0001-add-some-_always_inline_-annotations.patch | 75 ---------------------- package/bayer2rgb-neon/bayer2rgb-neon.hash | 2 +- package/bayer2rgb-neon/bayer2rgb-neon.mk | 2 +- 4 files changed, 2 insertions(+), 78 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 93489b5e0a..d099fd3761 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -178,7 +178,6 @@ package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch Upstream package/bash/0001-input.h-add-missing-include-on-stdio.h.patch Upstream package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch Upstream package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch Upstream -package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch Upstream package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch Upstream package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch Upstream package/bc/0003-dc-fix-exit-code-of-q-command.patch Upstream diff --git a/package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch b/package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch deleted file mode 100644 index 281f90c875..0000000000 --- a/package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 4e5d8be1b0d18453b76fca2c5139222a071dd207 Mon Sep 17 00:00:00 2001 -From: Enrico Scholz -Date: Mon, 4 Jul 2022 12:05:30 +0200 -Subject: [PATCH] add some _always_inline_ annotations - -enforce inlining to fix build errors with '-Og' - -fixes #1 - -Signed-off-by: Enrico Scholz -[Retrieved from: -https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb/-/commit/4e5d8be1b0d18453b76fca2c5139222a071dd207] -Signed-off-by: Fabrice Fontaine ---- - src/convert.c | 5 +++-- - src/main.c | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/convert.c b/src/convert.c -index c852a14..ec77040 100644 ---- a/src/convert.c -+++ b/src/convert.c -@@ -17,8 +17,9 @@ - #include - #include - #include "bayer2rgb.h" -+#include "compiler.h" - --static bool have_neon() -+inline static _always_inline_ bool have_neon() - { - #ifdef HAVE_NEON - return true; -@@ -27,7 +28,7 @@ static bool have_neon() - #endif - } - --static bool have_cplusplus() -+inline static _always_inline_ bool have_cplusplus() - { - #ifdef HAVE_CPLUSPLUS - return true; -diff --git a/src/main.c b/src/main.c -index 841a142..087e8e5 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -33,6 +33,7 @@ - - #include "src/bayer2rgb.h" - #include "src/bayer2rgb-cmdline.h" -+#include "src/compiler.h" - - #define BPP_TO_BYTE(_bpp) (((_bpp) + 7) / 8) - -@@ -68,7 +69,7 @@ struct x_image_out { - size_t total_size; - }; - --inline static bool have_neon(void) -+inline static _always_inline_ bool have_neon(void) - { - #ifdef HAVE_NEON - return true; -@@ -77,7 +78,7 @@ inline static bool have_neon(void) - #endif - } - --static bool have_cplusplus() -+inline static _always_inline_ bool have_cplusplus() - { - #ifdef HAVE_CPLUSPLUS - return true; --- -GitLab - diff --git a/package/bayer2rgb-neon/bayer2rgb-neon.hash b/package/bayer2rgb-neon/bayer2rgb-neon.hash index 26a14fcb51..7b26073de0 100644 --- a/package/bayer2rgb-neon/bayer2rgb-neon.hash +++ b/package/bayer2rgb-neon/bayer2rgb-neon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 edf451dbb52ad67eb35f9043390bd75ea7228d493c99184aae80b3bd27beab62 bayer2rgb-neon-15feb1115b4828488cc36d09f625e23e8b6a0ec5-br1.tar.gz +sha256 35b38a40e98e9fa7fb8042c718f460fb806e916d2bf3e9721c07bbe4b42faad5 bayer2rgb-neon-bc950b3398ba034fe5cc39f625796a6111cdb87f-br1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bayer2rgb-neon/bayer2rgb-neon.mk b/package/bayer2rgb-neon/bayer2rgb-neon.mk index 5147a985e8..61d6334979 100644 --- a/package/bayer2rgb-neon/bayer2rgb-neon.mk +++ b/package/bayer2rgb-neon/bayer2rgb-neon.mk @@ -4,7 +4,7 @@ # ################################################################################ -BAYER2RGB_NEON_VERSION = 15feb1115b4828488cc36d09f625e23e8b6a0ec5 +BAYER2RGB_NEON_VERSION = bc950b3398ba034fe5cc39f625796a6111cdb87f BAYER2RGB_NEON_SITE = https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb.git BAYER2RGB_NEON_SITE_METHOD = git BAYER2RGB_NEON_LICENSE = GPL-3.0 From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:44 +0100 Subject: [Buildroot] [git commit] package/tio: bump to version 2.7 Message-ID: <20240207162621.45DA98763E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b33d7a47dd41fed5364a398320c2b7d0687ba5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Sergio Prado Signed-off-by: Thomas Petazzoni --- package/tio/tio.hash | 4 ++-- package/tio/tio.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tio/tio.hash b/package/tio/tio.hash index cb0311a752..02699fdeb4 100644 --- a/package/tio/tio.hash +++ b/package/tio/tio.hash @@ -1,5 +1,5 @@ -# From https://github.com/tio/tio/releases/download/v1.47/tio-1.47.tar.xz.sha256sum: -sha256 6f39ac582de747feb9a64c14e6b378c61cb0c3bfa6639e62050022c1b7f5c544 tio-1.47.tar.xz +# From https://github.com/tio/tio/releases/download/v2.7/tio-2.7.tar.xz.sha256sum: +sha256 bf8fe434848c2c1b6540af0b42503c986068176ddc1a988cf02e521e7de5daa5 tio-2.7.tar.xz # Hash for license files: sha256 9248dee77ee136321f24556a96e07ff8f90461013941884a9defd0ac825ef131 LICENSE diff --git a/package/tio/tio.mk b/package/tio/tio.mk index 0035ce445e..d7b554ee84 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIO_VERSION = 1.47 +TIO_VERSION = 2.7 TIO_SOURCE = tio-$(TIO_VERSION).tar.xz TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:50 +0100 Subject: [Buildroot] [git commit] configs: drop redundant configuration for no MMU platforms Message-ID: <20240207162621.5C21F8763F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98a49edda69e868c95bd8cf4e923eb0bd0a65ff7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- configs/canaan_kd233_defconfig | 1 - configs/imxrt1050-evk_defconfig | 3 --- configs/qemu_m68k_mcf5208_defconfig | 3 --- configs/qemu_riscv64_nommu_virt_defconfig | 3 --- configs/qemu_xtensa_lx60_nommu_defconfig | 3 --- configs/sipeed_maix_bit_defconfig | 1 - configs/sipeed_maix_bit_sdcard_defconfig | 1 - configs/sipeed_maix_dock_defconfig | 1 - configs/sipeed_maix_dock_sdcard_defconfig | 1 - configs/sipeed_maix_go_defconfig | 1 - configs/sipeed_maix_go_sdcard_defconfig | 1 - configs/sipeed_maixduino_defconfig | 1 - configs/sipeed_maixduino_sdcard_defconfig | 1 - configs/stm32f429_disco_xip_defconfig | 1 - configs/stm32f469_disco_sd_defconfig | 1 - configs/stm32f469_disco_xip_defconfig | 1 - configs/stm32f769_disco_sd_defconfig | 1 - 17 files changed, 25 deletions(-) diff --git a/configs/canaan_kd233_defconfig b/configs/canaan_kd233_defconfig index 3335195f25..672fee57a1 100644 --- a/configs/canaan_kd233_defconfig +++ b/configs/canaan_kd233_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig index 947abe5df2..b493c11098 100644 --- a/configs/imxrt1050-evk_defconfig +++ b/configs/imxrt1050-evk_defconfig @@ -23,9 +23,6 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="16M" -# NOMMU Busybox -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index e35f3546fe..0c95756a8e 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -29,9 +29,6 @@ BR2_LINUX_KERNEL_VMLINUX=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -# use minimal busybox with hush and networking tools -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index 2a0aea01d7..9999bcf7f3 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -6,9 +6,6 @@ BR2_RISCV_64=y # Linux headers same as kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y -# Busybox with hush -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # System BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index c3224576f7..d1d59b9525 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -4,9 +4,6 @@ BR2_XTENSA_CUSTOM=y BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz" # BR2_XTENSA_USE_MMU is not set -# Use minimal busybox with hush and networking tools -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" diff --git a/configs/sipeed_maix_bit_defconfig b/configs/sipeed_maix_bit_defconfig index 03ae57e1b7..e45996879a 100644 --- a/configs/sipeed_maix_bit_defconfig +++ b/configs/sipeed_maix_bit_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig index 720d216920..7e293e5a49 100644 --- a/configs/sipeed_maix_bit_sdcard_defconfig +++ b/configs/sipeed_maix_bit_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_bit" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maix_dock_defconfig b/configs/sipeed_maix_dock_defconfig index 045967f589..0352382fcd 100644 --- a/configs/sipeed_maix_dock_defconfig +++ b/configs/sipeed_maix_dock_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig index eb7294d559..20658813ba 100644 --- a/configs/sipeed_maix_dock_sdcard_defconfig +++ b/configs/sipeed_maix_dock_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_dock" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maix_go_defconfig b/configs/sipeed_maix_go_defconfig index c320d19703..27272dac4c 100644 --- a/configs/sipeed_maix_go_defconfig +++ b/configs/sipeed_maix_go_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig index d2392ba822..1bc12dd058 100644 --- a/configs/sipeed_maix_go_sdcard_defconfig +++ b/configs/sipeed_maix_go_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_go" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maixduino_defconfig b/configs/sipeed_maixduino_defconfig index ba83dd76ee..3e04ea3a04 100644 --- a/configs/sipeed_maixduino_defconfig +++ b/configs/sipeed_maixduino_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig index 09bc1b4ab1..253ee7d7cf 100644 --- a/configs/sipeed_maixduino_sdcard_defconfig +++ b/configs/sipeed_maixduino_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maixduino" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index d4e000487a..99ae8cc753 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index 8b10bc6741..66840a7742 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index e362a99851..6e6ead0fde 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index 2ae27fb2d8..725c985ec0 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f769-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" From arnout at mind.be Wed Feb 7 16:27:19 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:27:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sentry-sdk: bump to version 1.39.2 In-Reply-To: <20240111060552.3028285-1-james.hilliard1@gmail.com> References: <20240111060552.3028285-1-james.hilliard1@gmail.com> Message-ID: <43277e98-686d-40c5-a88c-ce1ef879a230@mind.be> On 11/01/2024 07:05, James Hilliard wrote: > License changed to MIT: > https://github.com/getsentry/sentry-python/commit/9ed5e27636d05bc30cd363c19a032ace8447f5ad > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-sentry-sdk/python-sentry-sdk.hash | 6 +++--- > package/python-sentry-sdk/python-sentry-sdk.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash > index 38ae3380a8..2534a48221 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 ea2d728c847879f66c3d24cfbade2026 sentry-sdk-1.12.1.tar.gz > -sha256 5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c sentry-sdk-1.12.1.tar.gz > +md5 94ba9002bbfaf8c443c496b05bbc32eb sentry-sdk-1.39.2.tar.gz > +sha256 24c83b0b41c887d33328a9166f5950dc37ad58f01c9f2fbff6b87a6f1094170c sentry-sdk-1.39.2.tar.gz > # Locally computed sha256 checksums > -sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c 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 c3092a5184..f1c5648f07 100644 > --- a/package/python-sentry-sdk/python-sentry-sdk.mk > +++ b/package/python-sentry-sdk/python-sentry-sdk.mk > @@ -4,11 +4,11 @@ > # > ################################################################################ > > -PYTHON_SENTRY_SDK_VERSION = 1.12.1 > +PYTHON_SENTRY_SDK_VERSION = 1.39.2 > PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz > -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/32/03/496a7c8313658dec419303e8add969f314b7538c29f4ec5ebe6d86fb8ce2 > +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/66/90/9deac5c137e9f0ede908757d886af77938ef28f94b24decedbdf98f1ca4d > PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools > -PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause > +PYTHON_SENTRY_SDK_LICENSE = MIT > PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE > > $(eval $(python-package)) From dario.binacchi at amarulasolutions.com Wed Feb 7 16:28:45 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 17:28:45 +0100 Subject: [Buildroot] [PATCH 2/2] package/uuu: bump to version 1.5.165 In-Reply-To: References: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> <20240206175330.570115-2-dario.binacchi@amarulasolutions.com> Message-ID: Yann, All On Wed, Feb 7, 2024 at 10:56?AM Yann E. MORIN wrote: > > Dario, All, > > On 2024-02-06 18:53 +0100, Dario Binacchi spake thusly: > > It requires the host-tinyxml2 package. > > > > The hash of README.md has changed because a reference to the tinyxml2 > > license has been added: > > > > + - tinyxml (zlib license) is from https://github.com/leethomason/tinyxml2 > > Thanks for explaining the hash change. :-) > > I wonder if it really makes sense to keep using the README file as a > license file in Buildroot. I agree with you. The license of the package is located in the file LICENSE. Additionally, by removing the file README.md from the license files, we simplify the bump to new versions. So, if you agree, I will submit a patch for the removal of README.md from the license files. Thanks and regards, Dario > Indeed, the licensing terms are for > third-party libraries uuu links to, and even though they are bundled in > the source tree of uuu|mfgtools, they are not used by Buildroot as we > use the ones we build. > > Thoughts? > > > Release notes: > > https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.163 > > https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.165 > > > > Signed-off-by: Dario Binacchi > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > > > --- > > package/uuu/uuu.hash | 4 ++-- > > package/uuu/uuu.mk | 4 ++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash > > index 20816b5081db..c231d5d729f0 100644 > > --- a/package/uuu/uuu.hash > > +++ b/package/uuu/uuu.hash > > @@ -1,4 +1,4 @@ > > # locally computed > > -sha256 6972c7a1e76d60a22212913a8867b737104410c2a47ad88c8af460bd4885ec09 uuu_source-uuu_1.5.141.tar.gz > > +sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz > > sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE > > -sha256 2d872c6e5aaea15ec1932bfb378fb62e24ee7ec399fe7f998f03d9b728215335 README.md > > +sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md > > diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk > > index 93c748ee46d8..d1bae61f528e 100644 > > --- a/package/uuu/uuu.mk > > +++ b/package/uuu/uuu.mk > > @@ -4,11 +4,11 @@ > > # > > ################################################################################ > > > > -UUU_VERSION = 1.5.141 > > +UUU_VERSION = 1.5.165 > > UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz > > UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) > > UUU_LICENSE = BSD 3-Clause "New" or "Revised" License > > UUU_LICENSE_FILES = LICENSE README.md > > -HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd > > +HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd host-tinyxml2 > > > > $(eval $(host-cmake-package)) > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From yann.morin.1998 at free.fr Wed Feb 7 16:34:52 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 17:34:52 +0100 Subject: [Buildroot] [PATCH 2/2] package/uuu: bump to version 1.5.165 In-Reply-To: References: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> <20240206175330.570115-2-dario.binacchi@amarulasolutions.com> Message-ID: Dario, All, On 2024-02-07 17:28 +0100, Dario Binacchi spake thusly: > On Wed, Feb 7, 2024 at 10:56?AM Yann E. MORIN wrote: > > I wonder if it really makes sense to keep using the README file as a > > license file in Buildroot. > I agree with you. The license of the package is located in the file LICENSE. > Additionally, by removing the file README.md from the license files, we > simplify the bump to new versions. > So, if you agree, I will submit a patch for the removal of README.md from > the license files. Yes, please go ahead! Just sumarise the situation in the commit log. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Wed Feb 7 16:36:44 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:36:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm-git-archive: bump to version 1.4.1 In-Reply-To: <20240111062711.3041375-1-james.hilliard1@gmail.com> References: <20240111062711.3041375-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 07:27, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > .../python-setuptools-scm-git-archive.hash | 4 ++-- > .../python-setuptools-scm-git-archive.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash > index 40b4b0e7f7..ce790a3d59 100644 > --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash > +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/setuptools-scm-git-archive/json > -md5 df3933d33c49c5d9aca06715b4c65370 setuptools_scm_git_archive-1.4.tar.gz > -sha256 b048b27b32e1e76ec865b0caa4bb85df6ddbf4697d6909f567ac36709f6ef2f0 setuptools_scm_git_archive-1.4.tar.gz > +md5 cfcdab6edbe6b710ab24ad355e7cf7a3 setuptools_scm_git_archive-1.4.1.tar.gz > +sha256 c418bc77b3974d3ac65f268f058f23e01dc5f991f2233128b0e16a69de227b09 setuptools_scm_git_archive-1.4.1.tar.gz > # Locally computed sha256 checksums > sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE > diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > index 278fc972e5..153343788b 100644 > --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4 > +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4.1 > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SOURCE = setuptools_scm_git_archive-$(PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION).tar.gz > -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/69/5f/7135eec07395c51d3dd6899251b277405ecc2f8f7a80ef80a483e3c5a2bd > +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/47/d6/c9a8d1ea95613f79b9b914cf9a5e8e420b7625fc54137c1d7c9cbbda5adf > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 7 16:37:57 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:37:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm: bump to version 8.0.4 In-Reply-To: <20240111063622.3047258-1-james.hilliard1@gmail.com> References: <20240111063622.3047258-1-james.hilliard1@gmail.com> Message-ID: <143e5206-5b0a-4860-a575-44fbef70c582@mind.be> On 11/01/2024 07:36, James Hilliard wrote: > Migrate from setuptools to intree pep517 build backend. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-setuptools-scm/python-setuptools-scm.hash | 6 +++--- > package/python-setuptools-scm/python-setuptools-scm.mk | 9 +++++---- > 2 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash > index 8cfe07d1d9..1a884dbbbf 100644 > --- a/package/python-setuptools-scm/python-setuptools-scm.hash > +++ b/package/python-setuptools-scm/python-setuptools-scm.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json > -md5 158dc741637fb4fa4b955c62bd2c08be setuptools_scm-7.1.0.tar.gz > -sha256 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 setuptools_scm-7.1.0.tar.gz > -# sha256 locally computed > +md5 a05e98ab9ae447e173f0c747e0d49e81 setuptools-scm-8.0.4.tar.gz > +sha256 b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7 setuptools-scm-8.0.4.tar.gz > +# Locally computed sha256 checksums > sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE > diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk > index 5a35c35a1f..4cbf914690 100644 > --- a/package/python-setuptools-scm/python-setuptools-scm.mk > +++ b/package/python-setuptools-scm/python-setuptools-scm.mk > @@ -4,15 +4,16 @@ > # > ################################################################################ > > -PYTHON_SETUPTOOLS_SCM_VERSION = 7.1.0 > -PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz > -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/98/12/2c1e579bb968759fc512391473340d0661b1a8c96a59fb7c65b02eec1321 > +PYTHON_SETUPTOOLS_SCM_VERSION = 8.0.4 > +PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools-scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz > +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/eb/b1/0248705f10f6de5eefe7ff93e399f7192257b23df4d431d2f5680bb2778f > PYTHON_SETUPTOOLS_SCM_LICENSE = MIT > PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE > -PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools > +PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = pep517 > > HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = \ > host-python-packaging \ > + host-python-setuptools \ > host-python-typing-extensions > > $(eval $(host-python-package)) From arnout at mind.be Wed Feb 7 16:38:24 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:38:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 69.0.3 In-Reply-To: <20240111064140.3051598-1-james.hilliard1@gmail.com> References: <20240111064140.3051598-1-james.hilliard1@gmail.com> Message-ID: <01de635a-74e6-4784-9b1a-d5b357a41603@mind.be> On 11/01/2024 07:41, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-setuptools/python-setuptools.hash | 7 ++++--- > package/python-setuptools/python-setuptools.mk | 4 ++-- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash > index 6e1df42e3f..7f13ac3896 100644 > --- a/package/python-setuptools/python-setuptools.hash > +++ b/package/python-setuptools/python-setuptools.hash > @@ -1,4 +1,5 @@ > -# From https://pypi.org/pypi/setuptools/json > -md5 d967ca2ba7f46db887daee2d5c9bd6a2 setuptools-68.2.2.tar.gz > -sha256 4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 setuptools-68.2.2.tar.gz > +# md5, sha256 from https://pypi.org/pypi/setuptools/json > +md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz > +sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz > +# Locally computed sha256 checksums > sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE > diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk > index f26f427ccc..0aea3c6cfa 100644 > --- a/package/python-setuptools/python-setuptools.mk > +++ b/package/python-setuptools/python-setuptools.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SETUPTOOLS_VERSION = 68.2.2 > +PYTHON_SETUPTOOLS_VERSION = 69.0.3 > PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz > -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9 > +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 > PYTHON_SETUPTOOLS_LICENSE = MIT > PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE > PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From thomas.petazzoni at bootlin.com Wed Feb 7 16:29:13 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:29:13 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: remove checking the CPE database Message-ID: <20240207163840.BB1CF87653@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2bf75464d6027b8079431c34410ab9d070b818f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We currently check the CPE database to see if the CPE ID we use (including the version) is already in the database. However, the version part of the CPE ID is not actually used for CVE matching. Instead, the CVEs have a range of versions associated with them and we match against those ranges. In addition, NVD is moving to a new API for accessing the CPE database. It will not longer be possible to simply download all the CPE IDs, and due to rate limiting, the download will have to be done in several queries. Since all of this is anyway of limited use, drop the CPE database lookup entirely. Instead, as long as a CPE ID is defined in a package, it is considered OK, without any checks. Signed-off-by: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 54 ++--------------------------------------------- 1 file changed, 2 insertions(+), 52 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 05f0cd9e4a..7835cb3d62 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -28,10 +28,6 @@ import re import subprocess import json import sys -import time -import gzip -import xml.etree.ElementTree -import requests brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")) @@ -40,7 +36,6 @@ from getdeveloperlib import parse_developers # noqa: E402 INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)") URL_RE = re.compile(r"\s*https?://\S*\s*$") -CPEDB_URL = "https://static.nvd.nist.gov/feeds/xml/cpe/dictionary/official-cpe-dictionary_v2.3.xml.gz" RM_API_STATUS_ERROR = 1 RM_API_STATUS_FOUND_BY_DISTRO = 2 @@ -282,8 +277,7 @@ class Package: if var in self.all_cpeids: self.cpeid = self.all_cpeids[var] - # Set a preliminary status, it might be overridden by check_package_cpes() - self.status['cpe'] = ("warning", "not checked against CPE dictionary") + self.status['cpe'] = ("ok", "(not checked against CPE dictionary)") else: self.status['cpe'] = ("error", "no verified CPE identifier") @@ -674,47 +668,6 @@ def check_package_cves(nvd_path, packages): pkg.status['cve'] = ("ok", "not affected by CVEs") -def check_package_cpes(nvd_path, packages): - class CpeXmlParser: - cpes = [] - - def start(self, tag, attrib): - if tag == "{http://scap.nist.gov/schema/cpe-extension/2.3}cpe23-item": - self.cpes.append(attrib['name']) - - def close(self): - return self.cpes - - print("CPE: Setting up NIST dictionary") - if not os.path.exists(os.path.join(nvd_path, "cpe")): - os.makedirs(os.path.join(nvd_path, "cpe")) - - cpe_dict_local = os.path.join(nvd_path, "cpe", os.path.basename(CPEDB_URL)) - if not os.path.exists(cpe_dict_local) or os.stat(cpe_dict_local).st_mtime < time.time() - 86400: - print("CPE: Fetching xml manifest from [" + CPEDB_URL + "]") - cpe_dict = requests.get(CPEDB_URL) - open(cpe_dict_local, "wb").write(cpe_dict.content) - - print("CPE: Unzipping xml manifest...") - nist_cpe_file = gzip.GzipFile(fileobj=open(cpe_dict_local, 'rb')) - - parser = xml.etree.ElementTree.XMLParser(target=CpeXmlParser()) - while True: - c = nist_cpe_file.read(1024*1024) - if not c: - break - parser.feed(c) - cpes = parser.close() - - for p in packages: - if not p.cpeid: - continue - if p.cpeid in cpes: - p.status['cpe'] = ("ok", "verified CPE identifier") - else: - p.status['cpe'] = ("error", "CPE version unknown in CPE database") - - def calculate_stats(packages): stats = defaultdict(int) stats['packages'] = len(packages) @@ -1309,7 +1262,7 @@ def parse_args(): parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) parser.add_argument('--disable', type=list_str, - help='Features to disable, comma-separated (cve, upstream, url, cpe, warning)', + help='Features to disable, comma-separated (cve, upstream, url, warning)', default=[]) args = parser.parse_args() if not args.html and not args.json: @@ -1372,9 +1325,6 @@ def __main__(): if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) - if "cpe" not in args.disable and args.nvd_path: - print("Checking packages CPEs") - check_package_cpes(args.nvd_path, packages) print("Calculate stats") stats = calculate_stats(packages) if args.html: From thomas.petazzoni at bootlin.com Wed Feb 7 16:29:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:29:34 +0100 Subject: [Buildroot] [git commit] support/scripts/cve.py: switch from NVD to FKIE for the JSON files Message-ID: <20240207163840.D093F8763D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22b69455526f3d12744bc285a33b74bbad58e4bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master NVD will deprecate the v1.1 API which allows us to download the full database as individual JSON files. Instead, there's a horribly crappy API that is extremely slow and subject to race conditions. Fortunately, there is a project, Fraunhofer FKIE - Cyber Analysis and Defense [1], that goes through the effort of adapting to this new API and regenerating the convenient JSON files. The JSON files and meta files are re-generated daily. Instead of implementing the NVD v2 API, we decided to just use the JSON files generatd by fkie-cad. That saves us the effort of solving the race conditions, devising a cache mechanism that works, handling the frequent gateway timeouts on the NVD servers, dealing with the rate limiting, and keeping up with changes in the API. Switch to this repository on github as NVD_BASE_URL. The file name is also slightly different (CVE-20XX.json instead of nvdcve-1.1-20XX.json). The fkie-cad repository compresses with xz instead of gz. Therefore: - rename the filename variables to _xz instead of _gz; - use xz as a subprocess because there is no xz decompressor in Python stdlib. [1] https://www.fkie.fraunhofer.de/en/departments/cad.html Cc: Daniel Lang Signed-off-by: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- support/scripts/cve.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 7cd6fce4d8..46c384955c 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -22,7 +22,7 @@ import os import requests # URL checking import distutils.version import time -import gzip +import subprocess import sys import operator @@ -41,8 +41,7 @@ except ImportError: sys.path.append('utils/') NVD_START_YEAR = 2002 -NVD_JSON_VERSION = "1.1" -NVD_BASE_URL = "https://nvd.nist.gov/feeds/json/cve/" + NVD_JSON_VERSION +NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" ops = { '>=': operator.ge, @@ -83,15 +82,15 @@ class CVE: @staticmethod def download_nvd_year(nvd_path, year): - metaf = "nvdcve-%s-%s.meta" % (NVD_JSON_VERSION, year) + metaf = "CVE-%s.meta" % year path_metaf = os.path.join(nvd_path, metaf) - jsonf_gz = "nvdcve-%s-%s.json.gz" % (NVD_JSON_VERSION, year) - path_jsonf_gz = os.path.join(nvd_path, jsonf_gz) + jsonf_xz = "CVE-%s.json.xz" % year + path_jsonf_xz = os.path.join(nvd_path, jsonf_xz) # If the database file is less than a day old, we assume the NVD data # locally available is recent enough. - if os.path.exists(path_jsonf_gz) and os.stat(path_jsonf_gz).st_mtime >= time.time() - 86400: - return path_jsonf_gz + if os.path.exists(path_jsonf_xz) and os.stat(path_jsonf_xz).st_mtime >= time.time() - 86400: + return path_jsonf_xz # If not, we download the meta file url = "%s/%s" % (NVD_BASE_URL, metaf) @@ -104,19 +103,19 @@ class CVE: # we need to re-download the database. # If the database does not exist locally, we need to redownload it in # any case. - if os.path.exists(path_metaf) and os.path.exists(path_jsonf_gz): + if os.path.exists(path_metaf) and os.path.exists(path_jsonf_xz): meta_known = open(path_metaf, "r").read() if page_meta.text == meta_known: - return path_jsonf_gz + return path_jsonf_xz # Grab the compressed JSON NVD, and write files to disk - url = "%s/%s" % (NVD_BASE_URL, jsonf_gz) + url = "%s/%s" % (NVD_BASE_URL, jsonf_xz) print("Getting %s" % url) page_json = requests.get(url) page_json.raise_for_status() - open(path_jsonf_gz, "wb").write(page_json.content) + open(path_jsonf_xz, "wb").write(page_json.content) open(path_metaf, "w").write(page_meta.text) - return path_jsonf_gz + return path_jsonf_xz @classmethod def read_nvd_dir(cls, nvd_dir): @@ -128,7 +127,8 @@ class CVE: for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - content = ijson.items(gzip.GzipFile(filename), 'CVE_Items.item') + uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) + content = ijson.items(uncompressed, 'CVE_Items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise From thomas.petazzoni at bootlin.com Wed Feb 7 16:29:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:29:41 +0100 Subject: [Buildroot] [git commit] support/scripts/cve.py: start in 1999 Message-ID: <20240207163840.DBF6787655@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b2d0b466cf79e25d95a06213b803c1554aec2aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When the CVE lookup was added in commit 4a157be9efac8ba8888e4972f42eda213077152c, the starting year of the JSON files was set to 2002. However, there are also CVEs from 1999, 2000 and 2001. It is not clear why these were skipped back then. Set the start year to 1999 to capture these old CVEs too. Signed-off-by: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- support/scripts/cve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 46c384955c..f12a8048cd 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -40,7 +40,7 @@ except ImportError: sys.path.append('utils/') -NVD_START_YEAR = 2002 +NVD_START_YEAR = 1999 NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" ops = { From arnout at mind.be Wed Feb 7 16:39:50 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:39:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sh: bump to version 2.0.6 In-Reply-To: <20240111064511.3053913-1-james.hilliard1@gmail.com> References: <20240111064511.3053913-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 07:45, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-sh/python-sh.hash | 4 ++-- > package/python-sh/python-sh.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-sh/python-sh.hash b/package/python-sh/python-sh.hash > index a31aacdee1..c0d3f62f12 100644 > --- a/package/python-sh/python-sh.hash > +++ b/package/python-sh/python-sh.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/sh/json > -md5 d60498172876f35aef6303a9cbb8eb11 sh-1.14.3.tar.gz > -sha256 e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7 sh-1.14.3.tar.gz > +md5 aadf37759a9cb4862257cef3cf44a27b sh-2.0.6.tar.gz > +sha256 9b2998f313f201c777e2c0061f0b1367497097ef13388595be147e2a00bf7ba1 sh-2.0.6.tar.gz > # Locally computed sha256 checksums > sha256 d8491c6e236568d04f7c8c07f2f1b8f5d142706dab6ab88f6e0d2dd476b6c706 LICENSE.txt > diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk > index 781de88ab1..af4da3f6c9 100644 > --- a/package/python-sh/python-sh.mk > +++ b/package/python-sh/python-sh.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SH_VERSION = 1.14.3 > +PYTHON_SH_VERSION = 2.0.6 > PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz > -PYTHON_SH_SITE = https://files.pythonhosted.org/packages/b7/09/89c28aaf2a49f226fef8587c90c6386bd2cc03a0295bc4ff7fc6ee43c01d > +PYTHON_SH_SITE = https://files.pythonhosted.org/packages/cd/51/7355831d8e1cee8348157d769ccda8a31ca9fa0548e7f93d87837d83866d > PYTHON_SH_SETUP_TYPE = setuptools > PYTHON_SH_LICENSE = MIT > PYTHON_SH_LICENSE_FILES = LICENSE.txt From arnout at mind.be Wed Feb 7 16:38:42 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:38:42 +0100 Subject: [Buildroot] [git commit] package/python-setuptools: bump to version 69.0.3 Message-ID: <20240207164000.CDB6587666@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b62384e3d2a9e1d200b5b99783bd3d1611175ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-setuptools/python-setuptools.hash | 7 ++++--- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 6e1df42e3f..7f13ac3896 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,5 @@ -# From https://pypi.org/pypi/setuptools/json -md5 d967ca2ba7f46db887daee2d5c9bd6a2 setuptools-68.2.2.tar.gz -sha256 4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 setuptools-68.2.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/setuptools/json +md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz +sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz +# Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index f26f427ccc..0aea3c6cfa 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 68.2.2 +PYTHON_SETUPTOOLS_VERSION = 69.0.3 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From arnout at mind.be Wed Feb 7 16:38:40 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:38:40 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-scm-git-archive: bump to version 1.4.1 Message-ID: <20240207164000.B345A81001@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8bdb470c7b41e7c0425f59a23f78a398dba883fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- .../python-setuptools-scm-git-archive.hash | 4 ++-- .../python-setuptools-scm-git-archive.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash index 40b4b0e7f7..ce790a3d59 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm-git-archive/json -md5 df3933d33c49c5d9aca06715b4c65370 setuptools_scm_git_archive-1.4.tar.gz -sha256 b048b27b32e1e76ec865b0caa4bb85df6ddbf4697d6909f567ac36709f6ef2f0 setuptools_scm_git_archive-1.4.tar.gz +md5 cfcdab6edbe6b710ab24ad355e7cf7a3 setuptools_scm_git_archive-1.4.1.tar.gz +sha256 c418bc77b3974d3ac65f268f058f23e01dc5f991f2233128b0e16a69de227b09 setuptools_scm_git_archive-1.4.1.tar.gz # Locally computed sha256 checksums sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 278fc972e5..153343788b 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4 +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4.1 PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SOURCE = setuptools_scm_git_archive-$(PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/69/5f/7135eec07395c51d3dd6899251b277405ecc2f8f7a80ef80a483e3c5a2bd +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/47/d6/c9a8d1ea95613f79b9b914cf9a5e8e420b7625fc54137c1d7c9cbbda5adf PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 7 16:38:41 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:38:41 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-scm: bump to version 8.0.4 Message-ID: <20240207164000.C0E2487665@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03e360c380f5398fe168296284c7cf46318ca425 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools to intree pep517 build backend. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-setuptools-scm/python-setuptools-scm.hash | 6 +++--- package/python-setuptools-scm/python-setuptools-scm.mk | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 8cfe07d1d9..1a884dbbbf 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 158dc741637fb4fa4b955c62bd2c08be setuptools_scm-7.1.0.tar.gz -sha256 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 setuptools_scm-7.1.0.tar.gz -# sha256 locally computed +md5 a05e98ab9ae447e173f0c747e0d49e81 setuptools-scm-8.0.4.tar.gz +sha256 b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7 setuptools-scm-8.0.4.tar.gz +# Locally computed sha256 checksums sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index 5a35c35a1f..4cbf914690 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,15 +4,16 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 7.1.0 -PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/98/12/2c1e579bb968759fc512391473340d0661b1a8c96a59fb7c65b02eec1321 +PYTHON_SETUPTOOLS_SCM_VERSION = 8.0.4 +PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools-scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/eb/b1/0248705f10f6de5eefe7ff93e399f7192257b23df4d431d2f5680bb2778f PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE -PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools +PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = pep517 HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = \ host-python-packaging \ + host-python-setuptools \ host-python-typing-extensions $(eval $(host-python-package)) From arnout at mind.be Wed Feb 7 16:40:10 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:40:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-simplejson: bump to version 3.19.2 In-Reply-To: <20240111065011.3057364-1-james.hilliard1@gmail.com> References: <20240111065011.3057364-1-james.hilliard1@gmail.com> Message-ID: <8275fdf4-c20b-4f30-b6bd-a3ef1c03575c@mind.be> On 11/01/2024 07:50, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-simplejson/python-simplejson.hash | 4 ++-- > package/python-simplejson/python-simplejson.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash > index a8b946b2c4..9f96f99bf4 100644 > --- a/package/python-simplejson/python-simplejson.hash > +++ b/package/python-simplejson/python-simplejson.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/simplejson/json > -md5 ecd07fca7a7fa0bcc9acdf9d82e41eb1 simplejson-3.18.1.tar.gz > -sha256 746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa simplejson-3.18.1.tar.gz > +md5 3b334627d870a3c849e1322d18a7bfe7 simplejson-3.19.2.tar.gz > +sha256 9eb442a2442ce417801c912df68e1f6ccfcd41577ae7274953ab3ad24ef7d82c simplejson-3.19.2.tar.gz > # Locally computed sha256 checksums > sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt > diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk > index 5782626387..d5ba3948b7 100644 > --- a/package/python-simplejson/python-simplejson.mk > +++ b/package/python-simplejson/python-simplejson.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SIMPLEJSON_VERSION = 3.18.1 > +PYTHON_SIMPLEJSON_VERSION = 3.19.2 > PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz > -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/0f/a0/79d2bec499cb53678bc20d41f9706ca02777f0876efa9b29a69fb3d55dfd > +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/79/79/3ccb95bb4154952532f280f7a41979fbfb0fbbaee4d609810ecb01650afa > PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT > PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt > PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project From thomas.petazzoni at bootlin.com Wed Feb 7 16:40:32 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:40:32 +0100 Subject: [Buildroot] [PATCH 1/1] configs: drop redundant configuration for no MMU platforms In-Reply-To: <20240207161704.2981151-1-dario.binacchi@amarulasolutions.com> References: <20240207161704.2981151-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207174032.5de5fb81@windsurf> On Wed, 7 Feb 2024 17:17:04 +0100 Dario Binacchi wrote: > The package/busybox/busybox-minimal.config is the default configuration > for MMU-less systems, so the setting is redundant and can be removed > without effect. > > Signed-off-by: Dario Binacchi > --- > configs/canaan_kd233_defconfig | 1 - > configs/imxrt1050-evk_defconfig | 3 --- > configs/qemu_m68k_mcf5208_defconfig | 3 --- > configs/qemu_riscv64_nommu_virt_defconfig | 3 --- > configs/qemu_xtensa_lx60_nommu_defconfig | 3 --- > configs/sipeed_maix_bit_defconfig | 1 - > configs/sipeed_maix_bit_sdcard_defconfig | 1 - > configs/sipeed_maix_dock_defconfig | 1 - > configs/sipeed_maix_dock_sdcard_defconfig | 1 - > configs/sipeed_maix_go_defconfig | 1 - > configs/sipeed_maix_go_sdcard_defconfig | 1 - > configs/sipeed_maixduino_defconfig | 1 - > configs/sipeed_maixduino_sdcard_defconfig | 1 - > configs/stm32f429_disco_xip_defconfig | 1 - > configs/stm32f469_disco_sd_defconfig | 1 - > configs/stm32f469_disco_xip_defconfig | 1 - > configs/stm32f769_disco_sd_defconfig | 1 - > 17 files changed, 25 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 7 16:41:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:41:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-smbprotocol: bump to version 1.12.0 In-Reply-To: <20240111070215.3064748-1-james.hilliard1@gmail.com> References: <20240111070215.3064748-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 08:02, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-smbprotocol/python-smbprotocol.hash | 7 +++---- > package/python-smbprotocol/python-smbprotocol.mk | 4 ++-- > 2 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/package/python-smbprotocol/python-smbprotocol.hash b/package/python-smbprotocol/python-smbprotocol.hash > index a46f9f635b..b9d5f74999 100644 > --- a/package/python-smbprotocol/python-smbprotocol.hash > +++ b/package/python-smbprotocol/python-smbprotocol.hash > @@ -1,6 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/smbprotocol/json > -md5 a7474ab4cf8912dffaab56ad5067f429 smbprotocol-1.10.1.tar.gz > -sha256 b5bc9d4930ec947d42c21089a4d373b97e3f6488fd15d32d27189312fd8a04c9 smbprotocol-1.10.1.tar.gz > - > -# Locally computed > +md5 ccbb42bdd58a0070f56e966d8562451b smbprotocol-1.12.0.tar.gz > +sha256 5916a4b6c948bb70f82c246bdbfc86cf152226b71dac9f33b3d731d91e86274f smbprotocol-1.12.0.tar.gz > +# Locally computed sha256 checksums > sha256 4c3c550abc2b04c507ed0d641dd7e524eaff5bd06c7862af957301836d496d15 LICENSE > diff --git a/package/python-smbprotocol/python-smbprotocol.mk b/package/python-smbprotocol/python-smbprotocol.mk > index 17c2b17dbc..ece0744252 100644 > --- a/package/python-smbprotocol/python-smbprotocol.mk > +++ b/package/python-smbprotocol/python-smbprotocol.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SMBPROTOCOL_VERSION = 1.10.1 > +PYTHON_SMBPROTOCOL_VERSION = 1.12.0 > PYTHON_SMBPROTOCOL_SOURCE = smbprotocol-$(PYTHON_SMBPROTOCOL_VERSION).tar.gz > -PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/13/1a/73ad1883beebe4f6f47879cb9880690944faa00681141920c7a2219f6152 > +PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/57/72/d95216a9fd5da1b2fa225130741f50d4949c8f76d46669d30921c06d69ff > PYTHON_SMBPROTOCOL_SETUP_TYPE = setuptools > PYTHON_SMBPROTOCOL_LICENSE = MIT > PYTHON_SMBPROTOCOL_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 7 16:41:53 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:41:53 +0100 Subject: [Buildroot] [PATCH 1/3] support/scripts/pkg-stats: remove checking the CPE database In-Reply-To: <20240207153519.657048-1-arnout@mind.be> References: <20240207153519.657048-1-arnout@mind.be> Message-ID: <20240207174153.2023e1a6@windsurf> On Wed, 7 Feb 2024 16:35:17 +0100 Arnout Vandecappelle via buildroot wrote: > We currently check the CPE database to see if the CPE ID we use > (including the version) is already in the database. > > However, the version part of the CPE ID is not actually used for CVE > matching. Instead, the CVEs have a range of versions associated with > them and we match against those ranges. > > In addition, NVD is moving to a new API for accessing the CPE database. > It will not longer be possible to simply download all the CPE IDs, and > due to rate limiting, the download will have to be done in several > queries. > > Since all of this is anyway of limited use, drop the CPE database lookup > entirely. Instead, as long as a CPE ID is defined in a package, it is > considered OK, without any checks. > > Signed-off-by: Arnout Vandecappelle > --- > support/scripts/pkg-stats | 50 ++------------------------------------- > 1 file changed, 2 insertions(+), 48 deletions(-) Series applied, thanks! There were only a few flake8 warnings on PATCH 1/3 due to Python imports that were no longer needed. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 7 16:39:42 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:39:42 +0100 Subject: [Buildroot] [git commit] package/python-simplejson: bump to version 3.19.2 Message-ID: <20240207164326.5925B8767B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bb00267175bc0d0cc5de0c14b03a9dd5d1cc627 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-simplejson/python-simplejson.hash | 4 ++-- package/python-simplejson/python-simplejson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index a8b946b2c4..9f96f99bf4 100644 --- a/package/python-simplejson/python-simplejson.hash +++ b/package/python-simplejson/python-simplejson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplejson/json -md5 ecd07fca7a7fa0bcc9acdf9d82e41eb1 simplejson-3.18.1.tar.gz -sha256 746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa simplejson-3.18.1.tar.gz +md5 3b334627d870a3c849e1322d18a7bfe7 simplejson-3.19.2.tar.gz +sha256 9eb442a2442ce417801c912df68e1f6ccfcd41577ae7274953ab3ad24ef7d82c simplejson-3.19.2.tar.gz # Locally computed sha256 checksums sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk index 5782626387..d5ba3948b7 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.18.1 +PYTHON_SIMPLEJSON_VERSION = 3.19.2 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/0f/a0/79d2bec499cb53678bc20d41f9706ca02777f0876efa9b29a69fb3d55dfd +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/79/79/3ccb95bb4154952532f280f7a41979fbfb0fbbaee4d609810ecb01650afa PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project From arnout at mind.be Wed Feb 7 16:40:24 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:40:24 +0100 Subject: [Buildroot] [git commit] package/python-smbprotocol: bump to version 1.12.0 Message-ID: <20240207164326.6438F8767C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea08bfdf4511180def1a04befa5b06f5a627af3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-smbprotocol/python-smbprotocol.hash | 7 +++---- package/python-smbprotocol/python-smbprotocol.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-smbprotocol/python-smbprotocol.hash b/package/python-smbprotocol/python-smbprotocol.hash index a46f9f635b..b9d5f74999 100644 --- a/package/python-smbprotocol/python-smbprotocol.hash +++ b/package/python-smbprotocol/python-smbprotocol.hash @@ -1,6 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/smbprotocol/json -md5 a7474ab4cf8912dffaab56ad5067f429 smbprotocol-1.10.1.tar.gz -sha256 b5bc9d4930ec947d42c21089a4d373b97e3f6488fd15d32d27189312fd8a04c9 smbprotocol-1.10.1.tar.gz - -# Locally computed +md5 ccbb42bdd58a0070f56e966d8562451b smbprotocol-1.12.0.tar.gz +sha256 5916a4b6c948bb70f82c246bdbfc86cf152226b71dac9f33b3d731d91e86274f smbprotocol-1.12.0.tar.gz +# Locally computed sha256 checksums sha256 4c3c550abc2b04c507ed0d641dd7e524eaff5bd06c7862af957301836d496d15 LICENSE diff --git a/package/python-smbprotocol/python-smbprotocol.mk b/package/python-smbprotocol/python-smbprotocol.mk index 17c2b17dbc..ece0744252 100644 --- a/package/python-smbprotocol/python-smbprotocol.mk +++ b/package/python-smbprotocol/python-smbprotocol.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SMBPROTOCOL_VERSION = 1.10.1 +PYTHON_SMBPROTOCOL_VERSION = 1.12.0 PYTHON_SMBPROTOCOL_SOURCE = smbprotocol-$(PYTHON_SMBPROTOCOL_VERSION).tar.gz -PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/13/1a/73ad1883beebe4f6f47879cb9880690944faa00681141920c7a2219f6152 +PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/57/72/d95216a9fd5da1b2fa225130741f50d4949c8f76d46669d30921c06d69ff PYTHON_SMBPROTOCOL_SETUP_TYPE = setuptools PYTHON_SMBPROTOCOL_LICENSE = MIT PYTHON_SMBPROTOCOL_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 7 16:39:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:39:08 +0100 Subject: [Buildroot] [git commit] package/python-sh: bump to version 2.0.6 Message-ID: <20240207164326.4F64A8767A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1269073e7b4a2a7f92ebfe88581eaf9e09616a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-sh/python-sh.hash | 4 ++-- package/python-sh/python-sh.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sh/python-sh.hash b/package/python-sh/python-sh.hash index a31aacdee1..c0d3f62f12 100644 --- a/package/python-sh/python-sh.hash +++ b/package/python-sh/python-sh.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sh/json -md5 d60498172876f35aef6303a9cbb8eb11 sh-1.14.3.tar.gz -sha256 e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7 sh-1.14.3.tar.gz +md5 aadf37759a9cb4862257cef3cf44a27b sh-2.0.6.tar.gz +sha256 9b2998f313f201c777e2c0061f0b1367497097ef13388595be147e2a00bf7ba1 sh-2.0.6.tar.gz # Locally computed sha256 checksums sha256 d8491c6e236568d04f7c8c07f2f1b8f5d142706dab6ab88f6e0d2dd476b6c706 LICENSE.txt diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk index 781de88ab1..af4da3f6c9 100644 --- a/package/python-sh/python-sh.mk +++ b/package/python-sh/python-sh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SH_VERSION = 1.14.3 +PYTHON_SH_VERSION = 2.0.6 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz -PYTHON_SH_SITE = https://files.pythonhosted.org/packages/b7/09/89c28aaf2a49f226fef8587c90c6386bd2cc03a0295bc4ff7fc6ee43c01d +PYTHON_SH_SITE = https://files.pythonhosted.org/packages/cd/51/7355831d8e1cee8348157d769ccda8a31ca9fa0548e7f93d87837d83866d PYTHON_SH_SETUP_TYPE = setuptools PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt From arnout at mind.be Wed Feb 7 16:44:27 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:44:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-soupsieve: bump to version 2.5 In-Reply-To: <20240111071354.3071382-1-james.hilliard1@gmail.com> References: <20240111071354.3071382-1-james.hilliard1@gmail.com> Message-ID: <72875bd7-8a7d-4db1-917d-17dbc90ce35b@mind.be> On 11/01/2024 08:13, James Hilliard wrote: > License hash changed due to year update: > https://github.com/facelessuser/soupsieve/commit/1615584814d597ce87d4b4d675250cbe20e3fa30 > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-soupsieve/python-soupsieve.hash | 6 +++--- > package/python-soupsieve/python-soupsieve.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-soupsieve/python-soupsieve.hash b/package/python-soupsieve/python-soupsieve.hash > index cf348d441f..278c7d1b0c 100644 > --- a/package/python-soupsieve/python-soupsieve.hash > +++ b/package/python-soupsieve/python-soupsieve.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/soupsieve/json > -md5 4c824620563604cbf783de149c8b8889 soupsieve-2.3.2.post1.tar.gz > -sha256 fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d soupsieve-2.3.2.post1.tar.gz > +md5 88ae72bd970b425692235d17224204e6 soupsieve-2.5.tar.gz > +sha256 5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690 soupsieve-2.5.tar.gz > # Locally computed sha256 checksums > -sha256 bc66234cadd3f6e7aaf7160faf165f3f869ffc8a11b6b0d6c44a2e2a83314dd0 LICENSE.md > +sha256 ceb7b9053b88addffa3102a457302bd840d123925ee9ed9c2ac90cf6548b33bf LICENSE.md > diff --git a/package/python-soupsieve/python-soupsieve.mk b/package/python-soupsieve/python-soupsieve.mk > index ebf2ada7ac..581df7e787 100644 > --- a/package/python-soupsieve/python-soupsieve.mk > +++ b/package/python-soupsieve/python-soupsieve.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SOUPSIEVE_VERSION = 2.3.2.post1 > +PYTHON_SOUPSIEVE_VERSION = 2.5 > PYTHON_SOUPSIEVE_SOURCE = soupsieve-$(PYTHON_SOUPSIEVE_VERSION).tar.gz > -PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/f3/03/bac179d539362319b4779a00764e95f7542f4920084163db6b0fd4742d38 > +PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/ce/21/952a240de1c196c7e3fbcd4e559681f0419b1280c617db21157a0390717b > PYTHON_SOUPSIEVE_SETUP_TYPE = pep517 > PYTHON_SOUPSIEVE_LICENSE = MIT > PYTHON_SOUPSIEVE_LICENSE_FILES = LICENSE.md From arnout at mind.be Wed Feb 7 16:45:23 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:45:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sqliteschema: bump to version 2.0.0 In-Reply-To: <20240111071706.3073259-1-james.hilliard1@gmail.com> References: <20240111071706.3073259-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 08:17, James Hilliard wrote: > Drop no longer required python-setuptools runtime dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-sqliteschema/Config.in | 1 - > package/python-sqliteschema/python-sqliteschema.hash | 4 ++-- > package/python-sqliteschema/python-sqliteschema.mk | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in > index 102a615765..3097102100 100644 > --- a/package/python-sqliteschema/Config.in > +++ b/package/python-sqliteschema/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SQLITESCHEMA > bool "python-sqliteschema" > - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > select BR2_PACKAGE_PYTHON_TABLEDATA # runtime > select BR2_PACKAGE_PYTHON_TYPEPY # runtime > diff --git a/package/python-sqliteschema/python-sqliteschema.hash b/package/python-sqliteschema/python-sqliteschema.hash > index d5fe6e7af1..7fe8ee925d 100644 > --- a/package/python-sqliteschema/python-sqliteschema.hash > +++ b/package/python-sqliteschema/python-sqliteschema.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/sqliteschema/json > -md5 46da4f7575a0cc6c1d92377a279e5188 sqliteschema-1.3.0.tar.gz > -sha256 1acdd5087cab54a099135a5623bb1960019816e2e3042b889c637901a832d3c3 sqliteschema-1.3.0.tar.gz > +md5 b7fd543b82ad709f70cdc06c4ec8639a sqliteschema-2.0.0.tar.gz > +sha256 fe6cedddf10de8934ec1ace8319340a2256667e4a1a36f3da4fd1c0956124dc8 sqliteschema-2.0.0.tar.gz > # Locally computed sha256 checksums > sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE > diff --git a/package/python-sqliteschema/python-sqliteschema.mk b/package/python-sqliteschema/python-sqliteschema.mk > index c399ebd6f6..4b224048f9 100644 > --- a/package/python-sqliteschema/python-sqliteschema.mk > +++ b/package/python-sqliteschema/python-sqliteschema.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SQLITESCHEMA_VERSION = 1.3.0 > +PYTHON_SQLITESCHEMA_VERSION = 2.0.0 > PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz > -PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/3d/ff/91cfff0c96f9ba2bddc27d6855db4907af77551a267b86740c8842beeb78 > +PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/29/e7/4482eebf6d8ff7923bb3fd0e9239d3e634f67125cfda3001c88506b939b9 > PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools > PYTHON_SQLITESCHEMA_LICENSE = MIT > PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 7 16:43:31 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:43:31 +0100 Subject: [Buildroot] [git commit] package/python-soupsieve: bump to version 2.5 Message-ID: <20240207164556.05CC98768C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcaf6b43279ba711888222bdad5b6988831b2d70 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/facelessuser/soupsieve/commit/1615584814d597ce87d4b4d675250cbe20e3fa30 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-soupsieve/python-soupsieve.hash | 6 +++--- package/python-soupsieve/python-soupsieve.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-soupsieve/python-soupsieve.hash b/package/python-soupsieve/python-soupsieve.hash index cf348d441f..278c7d1b0c 100644 --- a/package/python-soupsieve/python-soupsieve.hash +++ b/package/python-soupsieve/python-soupsieve.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/soupsieve/json -md5 4c824620563604cbf783de149c8b8889 soupsieve-2.3.2.post1.tar.gz -sha256 fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d soupsieve-2.3.2.post1.tar.gz +md5 88ae72bd970b425692235d17224204e6 soupsieve-2.5.tar.gz +sha256 5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690 soupsieve-2.5.tar.gz # Locally computed sha256 checksums -sha256 bc66234cadd3f6e7aaf7160faf165f3f869ffc8a11b6b0d6c44a2e2a83314dd0 LICENSE.md +sha256 ceb7b9053b88addffa3102a457302bd840d123925ee9ed9c2ac90cf6548b33bf LICENSE.md diff --git a/package/python-soupsieve/python-soupsieve.mk b/package/python-soupsieve/python-soupsieve.mk index ebf2ada7ac..581df7e787 100644 --- a/package/python-soupsieve/python-soupsieve.mk +++ b/package/python-soupsieve/python-soupsieve.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SOUPSIEVE_VERSION = 2.3.2.post1 +PYTHON_SOUPSIEVE_VERSION = 2.5 PYTHON_SOUPSIEVE_SOURCE = soupsieve-$(PYTHON_SOUPSIEVE_VERSION).tar.gz -PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/f3/03/bac179d539362319b4779a00764e95f7542f4920084163db6b0fd4742d38 +PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/ce/21/952a240de1c196c7e3fbcd4e559681f0419b1280c617db21157a0390717b PYTHON_SOUPSIEVE_SETUP_TYPE = pep517 PYTHON_SOUPSIEVE_LICENSE = MIT PYTHON_SOUPSIEVE_LICENSE_FILES = LICENSE.md From arnout at mind.be Wed Feb 7 16:44:37 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:44:37 +0100 Subject: [Buildroot] [git commit] package/python-sqliteschema: bump to version 2.0.0 Message-ID: <20240207164556.1BC7187679@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29524958d52db07f749aef9d405ef06dee47ba22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required python-setuptools runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-sqliteschema/Config.in | 1 - package/python-sqliteschema/python-sqliteschema.hash | 4 ++-- package/python-sqliteschema/python-sqliteschema.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in index 102a615765..3097102100 100644 --- a/package/python-sqliteschema/Config.in +++ b/package/python-sqliteschema/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SQLITESCHEMA bool "python-sqliteschema" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime diff --git a/package/python-sqliteschema/python-sqliteschema.hash b/package/python-sqliteschema/python-sqliteschema.hash index d5fe6e7af1..7fe8ee925d 100644 --- a/package/python-sqliteschema/python-sqliteschema.hash +++ b/package/python-sqliteschema/python-sqliteschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqliteschema/json -md5 46da4f7575a0cc6c1d92377a279e5188 sqliteschema-1.3.0.tar.gz -sha256 1acdd5087cab54a099135a5623bb1960019816e2e3042b889c637901a832d3c3 sqliteschema-1.3.0.tar.gz +md5 b7fd543b82ad709f70cdc06c4ec8639a sqliteschema-2.0.0.tar.gz +sha256 fe6cedddf10de8934ec1ace8319340a2256667e4a1a36f3da4fd1c0956124dc8 sqliteschema-2.0.0.tar.gz # Locally computed sha256 checksums sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-sqliteschema/python-sqliteschema.mk b/package/python-sqliteschema/python-sqliteschema.mk index c399ebd6f6..4b224048f9 100644 --- a/package/python-sqliteschema/python-sqliteschema.mk +++ b/package/python-sqliteschema/python-sqliteschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLITESCHEMA_VERSION = 1.3.0 +PYTHON_SQLITESCHEMA_VERSION = 2.0.0 PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz -PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/3d/ff/91cfff0c96f9ba2bddc27d6855db4907af77551a267b86740c8842beeb78 +PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/29/e7/4482eebf6d8ff7923bb3fd0e9239d3e634f67125cfda3001c88506b939b9 PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools PYTHON_SQLITESCHEMA_LICENSE = MIT PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 7 16:46:55 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:46:55 +0100 Subject: [Buildroot] [PATCH] package/tio: bump to version 2.7 In-Reply-To: <20240207153532.1199300-1-sergio.prado@e-labworks.com> References: <20240207153532.1199300-1-sergio.prado@e-labworks.com> Message-ID: <20240207174655.283732cb@windsurf> On Wed, 7 Feb 2024 12:35:32 -0300 Sergio Prado wrote: > Signed-off-by: Sergio Prado > --- > package/tio/tio.hash | 4 ++-- > package/tio/tio.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From buildroot at bubu1.eu Wed Feb 7 17:09:53 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:09:53 +0100 Subject: [Buildroot] [PATCH 1/4] package/python-ruamel-yaml: fix comment in hash file Message-ID: <20240207170959.2672846-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- package/python-ruamel-yaml/python-ruamel-yaml.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index 29852a51ed..ee5016835b 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,4 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/rfc3987/json +# md5, sha256 from https://pypi.org/pypi/ruamel.yaml/json md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz # Locally computed sha256 checksums -- 2.43.0 From buildroot at bubu1.eu Wed Feb 7 17:09:54 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:09:54 +0100 Subject: [Buildroot] [PATCH 2/4] support/testing: add new python-ruamel-yaml runtime test In-Reply-To: <20240207170959.2672846-1-buildroot@bubu1.eu> References: <20240207170959.2672846-1-buildroot@bubu1.eu> Message-ID: <20240207170959.2672846-2-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- .../package/sample_python_ruamel_yaml.py | 27 +++++++++++++++++++ .../tests/package/test_python_ruamel_yaml.py | 12 +++++++++ 2 files changed, 39 insertions(+) create mode 100644 support/testing/tests/package/sample_python_ruamel_yaml.py create mode 100644 support/testing/tests/package/test_python_ruamel_yaml.py diff --git a/support/testing/tests/package/sample_python_ruamel_yaml.py b/support/testing/tests/package/sample_python_ruamel_yaml.py new file mode 100644 index 0000000000..5b3a079471 --- /dev/null +++ b/support/testing/tests/package/sample_python_ruamel_yaml.py @@ -0,0 +1,27 @@ +from ruamel.yaml import YAML + +yaml_text = """ +Rootkey: + - ListEntry +AnotherRootKey: some-string + +ListRoot: + - float-value: '1.0' + int-value: 10234 + NestedList: + - 1 + - 2 + + - another-float: '1.1' + another-int: 1111 + +OneMoreRootKey: 9.99 +""" + +# Tests the pure python based implementation +yaml = YAML(typ='safe', pure=True) + +parsed = yaml.load(yaml_text) + +assert parsed['OneMoreRootKey'] == 9.99 +assert parsed['ListRoot'][1]['another-int'] == 1111 diff --git a/support/testing/tests/package/test_python_ruamel_yaml.py b/support/testing/tests/package/test_python_ruamel_yaml.py new file mode 100644 index 0000000000..15062b4455 --- /dev/null +++ b/support/testing/tests/package/test_python_ruamel_yaml.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3RuamelYaml(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_RUAMEL_YAML=y + """ + sample_scripts = ["tests/package/sample_python_ruamel_yaml.py"] + timeout = 40 -- 2.43.0 From buildroot at bubu1.eu Wed Feb 7 17:09:55 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:09:55 +0100 Subject: [Buildroot] [PATCH 3/4] package/python-ruamel-yaml-clib: new package In-Reply-To: <20240207170959.2672846-1-buildroot@bubu1.eu> References: <20240207170959.2672846-1-buildroot@bubu1.eu> Message-ID: <20240207170959.2672846-3-buildroot@bubu1.eu> Add optional c extension for python-ruamel-yaml which can speed up yaml loading/parsing. Extend the ruamel-yaml runtime test to check if the c extension works correctly. Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/python-ruamel-yaml-clib/Config.in | 9 +++++++++ .../python-ruamel-yaml-clib.hash | 5 +++++ .../python-ruamel-yaml-clib.mk | 16 ++++++++++++++++ .../tests/package/sample_python_ruamel_yaml.py | 12 ++++++++++++ .../tests/package/test_python_ruamel_yaml.py | 1 + 6 files changed, 44 insertions(+) create mode 100644 package/python-ruamel-yaml-clib/Config.in create mode 100644 package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash create mode 100644 package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk diff --git a/package/Config.in b/package/Config.in index bf8c325e99..e256202276 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1320,6 +1320,7 @@ menu "External python modules" source "package/python-rtoml/Config.in" source "package/python-rtslib-fb/Config.in" source "package/python-ruamel-yaml/Config.in" + source "package/python-ruamel-yaml-clib/Config.in" source "package/python-s3transfer/Config.in" source "package/python-scandir/Config.in" source "package/python-scapy/Config.in" diff --git a/package/python-ruamel-yaml-clib/Config.in b/package/python-ruamel-yaml-clib/Config.in new file mode 100644 index 0000000000..a06080873f --- /dev/null +++ b/package/python-ruamel-yaml-clib/Config.in @@ -0,0 +1,9 @@ +if BR2_PACKAGE_PYTHON_RUAMEL_YAML +config BR2_PACKAGE_PYTHON_RUAMEL_YAML_CLIB + bool "python-ruamel-yaml-clib" + help + C version of reader, parser and emitter for ruamel.yaml + derived from libyaml + + https://sourceforge.net/projects/ruamel-yaml/ +endif diff --git a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash new file mode 100644 index 0000000000..937afc3df1 --- /dev/null +++ b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/ruamel.yaml.clib/json +md5 b72e549363fa1b9c4f9123e98f2b46cc ruamel.yaml.clib-0.2.8.tar.gz +sha256 beb2e0404003de9a4cab9753a8805a8fe9320ee6673136ed7f04255fe60bb512 ruamel.yaml.clib-0.2.8.tar.gz +# Locally computed sha256 checksums +sha256 5458f90e82366f660f956b3c929ba5f7a0efdb99a99a847e2f51f2020ffbe887 LICENSE diff --git a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk new file mode 100644 index 0000000000..3e5434fa9a --- /dev/null +++ b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-ruamel-yaml +# +################################################################################ + +PYTHON_RUAMEL_YAML_CLIB_VERSION = 0.2.8 +PYTHON_RUAMEL_YAML_CLIB_SOURCE = ruamel.yaml.clib-$(PYTHON_RUAMEL_YAML_CLIB_VERSION).tar.gz +PYTHON_RUAMEL_YAML_CLIB_SITE = https://files.pythonhosted.org/packages/46/ab/bab9eb1566cd16f060b54055dd39cf6a34bfa0240c53a7218c43e974295b +PYTHON_RUAMEL_YAML_CLIB_SETUP_TYPE = setuptools +PYTHON_RUAMEL_YAML_CLIB_LICENSE = MIT +PYTHON_RUAMEL_YAML_CLIB_LICENSE_FILES = LICENSE +PYTHON_RUAMEL_YAML_CLIB_CPE_ID_VENDOR = ruamel.yaml_project +PYTHON_RUAMEL_YAML_CLIB_CPE_ID_PRODUCT = ruamel.yaml + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_ruamel_yaml.py b/support/testing/tests/package/sample_python_ruamel_yaml.py index 5b3a079471..55cd696278 100644 --- a/support/testing/tests/package/sample_python_ruamel_yaml.py +++ b/support/testing/tests/package/sample_python_ruamel_yaml.py @@ -25,3 +25,15 @@ parsed = yaml.load(yaml_text) assert parsed['OneMoreRootKey'] == 9.99 assert parsed['ListRoot'][1]['another-int'] == 1111 + +# Tests the C extension based loader +# ruamel.yaml automatically falls back to the pure python version, so we need +# to explicitly check if importing the CLoader works here. +# Import this here, so it's clearer what part of the test is failing. +from ruamel.yaml import CLoader # noqa: E402 +assert CLoader is not None +yaml = YAML(typ='safe') +parsed_from_c = yaml.load(yaml_text) + +assert parsed_from_c['OneMoreRootKey'] == 9.99 +assert parsed_from_c['ListRoot'][1]['another-int'] == 1111 diff --git a/support/testing/tests/package/test_python_ruamel_yaml.py b/support/testing/tests/package/test_python_ruamel_yaml.py index 15062b4455..b145da4b24 100644 --- a/support/testing/tests/package/test_python_ruamel_yaml.py +++ b/support/testing/tests/package/test_python_ruamel_yaml.py @@ -7,6 +7,7 @@ class TestPythonPy3RuamelYaml(TestPythonPackageBase): """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_RUAMEL_YAML=y + BR2_PACKAGE_PYTHON_RUAMEL_YAML_CLIB=y """ sample_scripts = ["tests/package/sample_python_ruamel_yaml.py"] timeout = 40 -- 2.43.0 From buildroot at bubu1.eu Wed Feb 7 17:09:56 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:09:56 +0100 Subject: [Buildroot] [PATCH 4/4] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <20240207170959.2672846-1-buildroot@bubu1.eu> References: <20240207170959.2672846-1-buildroot@bubu1.eu> Message-ID: <20240207170959.2672846-4-buildroot@bubu1.eu> From: James Hilliard License hash changed due to year update: https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ Signed-off-by: James Hilliard Signed-off-by: Marcus Hoffmann --- package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index ee5016835b..02845d112b 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ruamel.yaml/json -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz +sha256 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ruamel.yaml-0.18.5.tar.gz # Locally computed sha256 checksums -sha256 ab837b032c5aae84503fc0c733a116a26fd272e90dc4402fa68d3c9e51aed3b0 LICENSE +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 LICENSE diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk index a6fed3bc2c..bbdac591ca 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RUAMEL_YAML_VERSION = 0.17.21 +PYTHON_RUAMEL_YAML_VERSION = 0.18.5 PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/82/43/fa976e03a4a9ae406904489119cd7dd4509752ca692b2e0a19491ca1782c PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools PYTHON_RUAMEL_YAML_LICENSE = MIT PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE -- 2.43.0 From buildroot at bubu1.eu Wed Feb 7 17:13:29 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:13:29 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <20240205163024.500599-1-james.hilliard1@gmail.com> References: <20240205163024.500599-1-james.hilliard1@gmail.com> Message-ID: <5e97bc80-0758-4685-a614-7eb9fb2f8b6b@bubu1.eu> On 05.02.24 17:30, James Hilliard wrote: > License hash changed due to year update: > https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - fix package hash typo > --- > package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- > package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash > index 29852a51ed..b614c01d79 100644 > --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/rfc3987/json This still points to the wrong package, but was wrong before. I've resend this patch as part of https://patchwork.ozlabs.org/project/buildroot/list/?series=394024 as fixing this introduced a merge conflict. > -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz > -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz > +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz > +sha256 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ruamel.yaml-0.18.5.tar.gz > # Locally computed sha256 checksums > -sha256 ab837b032c5aae84503fc0c733a116a26fd272e90dc4402fa68d3c9e51aed3b0 LICENSE > +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 LICENSE > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk > index a6fed3bc2c..bbdac591ca 100644 > --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RUAMEL_YAML_VERSION = 0.17.21 > +PYTHON_RUAMEL_YAML_VERSION = 0.18.5 > PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz > -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c > +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/82/43/fa976e03a4a9ae406904489119cd7dd4509752ca692b2e0a19491ca1782c > PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools > PYTHON_RUAMEL_YAML_LICENSE = MIT > PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE From buildroot at bubu1.eu Wed Feb 7 17:15:12 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:15:12 +0100 Subject: [Buildroot] [PATCH] support/testing: remove hardcoded sleep from python-flask test Message-ID: <20240207171513.2673706-1-buildroot@bubu1.eu> Similar to the new fastapi test, instead of waiting for a hard coded amount of time we can retry every second until the server is available and abort if after the timeout we still didn't manage to connect. Signed-off-by: Marcus Hoffmann --- support/testing/tests/package/test_python_flask.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/support/testing/tests/package/test_python_flask.py b/support/testing/tests/package/test_python_flask.py index 9d8587e918..32d9da34a5 100644 --- a/support/testing/tests/package/test_python_flask.py +++ b/support/testing/tests/package/test_python_flask.py @@ -21,9 +21,13 @@ class TestPythonPy3Flask(TestPythonPackageBase): _, exit_code = self.emulator.run(cmd, timeout=self.timeout) # Give enough time for the flask server to start up - time.sleep(30) + for attempt in range(30): + time.sleep(1) - cmd = "wget -q -O - http://127.0.0.1:5000/" - output, exit_code = self.emulator.run(cmd, timeout=self.timeout) - self.assertEqual(exit_code, 0) - self.assertEqual(output[0], "Hello, World!") + cmd = "wget -q -O - http://127.0.0.1:5000/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + if exit_code == 0: + self.assertEqual(output[0], 'Hello, World!') + break + else: + self.assertTrue(False, "Timeout while waiting for flask server") -- 2.43.0 From ddrokosov at salutedevices.com Wed Feb 7 17:15:52 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Wed, 7 Feb 2024 20:15:52 +0300 Subject: [Buildroot] [PATCH v2 1/2] package/linux-tools: introduce linux mm tools In-Reply-To: References: <20240206192543.7179-1-ddrokosov@salutedevices.com> <20240206192543.7179-2-ddrokosov@salutedevices.com> Message-ID: <20240207171552.nrn7dnbvltc3oy4b@CAB-WSD-L081021> Hello Yann, Thank you for such a quick response! On Wed, Feb 07, 2024 at 09:55:23AM +0100, Yann E. MORIN wrote: > Dmitry, All, > > On 2024-02-06 22:25 +0300, Dmitry Rokosov spake thusly: > > This toolset was designed to facilitate the testing, monitoring, and > > tracing of various things with virtual memory, pages, and slab objects. > > It is an invaluable resource for identifying and analyzing > > memory-related issues, such as leaks and bottlenecks, and can greatly > > enhance one's understanding of memory utilization within a system. > > > > The mm toolset includes: > > - page_owner_sort: userspace helper to sort the output of > > /sys/kernel/debug/page_owner, which helps to know who allocates > > the page from kernel context > > - slabinfo: the tool which gets reports about slabs, for example > > show empty slabs, modify of slab debug options at runtime, display > > all information about a slabcache > > - page-types: a handy tool for querying page flags > > > > Signed-off-by: Dmitry Rokosov > > Signed-off-by: Alexey Romanov > > I've applied, after making a few changes: > > - don't depend on linux, already a patch dependency > - don't set CC: default is based on CROSS_COMPILE > - no need to fully recheck at install time > - move the option for alphabetical ordering > - fix check-package > > See below for a few more omments... > > > --- > > package/linux-tools/Config.in | 18 +++++++++++ > > package/linux-tools/linux-tool-mm.mk.in | 41 +++++++++++++++++++++++++ > > 2 files changed, 59 insertions(+) > > create mode 100644 package/linux-tools/linux-tool-mm.mk.in > > > > diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in > > index 8a0b6d5802cc..ede966ec792d 100644 > > --- a/package/linux-tools/Config.in > > +++ b/package/linux-tools/Config.in > > @@ -185,4 +185,22 @@ config BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON > > > > endif # BR2_PACKAGE_LINUX_TOOLS_HV > > > > +config BR2_PACKAGE_LINUX_TOOLS_MM > > + bool "mm" > > + select BR2_PACKAGE_LINUX_TOOLS > > + help > > + mm is a toolset for testing/monitoring/tracing vm/pages/slabs objects. > > + > > + - page_owner_sort: userspace helper to sort the output of > > + /sys/kernel/debug/page_owner, which helps to know who allocates > > + the page from kernel context > > + > > + - slabinfo: the tool which gets reports about slabs, for example > > + show empty slabs, modify of slab debug options at runtime, display > > + all information about a slabcache > > + > > + - page-types: a handy tool for querying page flags > > + > > + These tools are available only from kernel version 3.4. > > $ ./utils/docker-run make check-package > package/linux-tools/Config.in:244: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > package/linux-tools/Config.in:247: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > package/linux-tools/Config.in:250: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > package/linux-tools/Config.in:251: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > I will run check-package for the next contribution. Thank you very much for fixing the coding style problems. > > endmenu > > diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in > > new file mode 100644 > > index 000000000000..5431e0574b04 > > --- /dev/null > > +++ b/package/linux-tools/linux-tool-mm.mk.in > > @@ -0,0 +1,41 @@ > > +################################################################################ > > +# > > +# mm > > +# > > +################################################################################ > > + > > +LINUX_TOOLS += mm > > + > > +MM_DEPENDENCIES = linux > > No need to add an explicit dependency: the linux-tools micro-infra > already handles it in a generic way; indeed, there is no reason for each > individual linux-tool to add a dependency on linux: they all have that > dependency. > Yep, you are totally right. It was needed for LINUX_VERSION_PROBED variable. Without this dependency we couldn't get LINUX_VERSION_PROBED environment value. > > +MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" > > No need to explicitly set CC: the kernel Makefile sets it based on > CROSS_COMPILE already. > Hmmmm, very strange. AFAIR, withoug explicit CC I can't build linux-tools-mm with cross compilation. I will check the final merged patchset and back to the thread if any. > > +define MM_BUILD_CMDS > > + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > > + MM_SUBDIR=vm; \ > > + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ > > + MM_SUBDIR=mm; \ > > + else \ > > + echo "Your kernel version is too old and does not have the mm tool." ; \ > > + echo "At least kernel 3.4 must be used." ; \ > > + exit 1 ; \ > > + fi ; \ > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > > + $(MM_MAKE_OPTS) $${MM_SUBDIR} > > +endef > > + > > +define MM_INSTALL_TARGET_CMDS > > + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > > + MM_SUBDIR=vm; \ > > + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ > > + MM_SUBDIR=mm; \ > > + else \ > > + echo "Your kernel version is too old and does not have the mm tool." ; \ > > + echo "At least kernel 3.4 must be used." ; \ > > + exit 1 ; \ > > + fi ; \ > > For install, we do need to know which directory to use, indeed, but we > already do know one exists, as it was used at build, above; so we do not > need the error case. I've simplified this part and added a comment to > explain it. > > Applied to master with those changes, thanks. Okay, many thanks, appreciate it so much! > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > > + $(MM_MAKE_OPTS) \ > > + INSTALL_ROOT=$(TARGET_DIR) \ > > + DESTDIR=$(TARGET_DIR) \ > > + $${MM_SUBDIR}_install > > +endef > > -- > > 2.43.0 > > > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -- Thank you, Dmitry From buildroot at bubu1.eu Wed Feb 7 17:18:27 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:18:27 +0100 Subject: [Buildroot] [PATCH] package/python-waitress: new package Message-ID: <20240207171829.2676569-1-buildroot@bubu1.eu> The test runs the flask sample app through the waitress wsgi server instead of the flask development server. Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/python-waitress/Config.in | 11 ++++++ package/python-waitress/python-waitress.hash | 5 +++ package/python-waitress/python-waitress.mk | 14 ++++++++ .../tests/package/test_python_waitress.py | 34 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 package/python-waitress/Config.in create mode 100644 package/python-waitress/python-waitress.hash create mode 100644 package/python-waitress/python-waitress.mk create mode 100644 support/testing/tests/package/test_python_waitress.py diff --git a/package/Config.in b/package/Config.in index 97f590e2b7..bf8c325e99 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1406,6 +1406,7 @@ menu "External python modules" source "package/python-validators/Config.in" source "package/python-versiontools/Config.in" source "package/python-visitor/Config.in" + source "package/python-waitress/Config.in" source "package/python-watchdog/Config.in" source "package/python-wcwidth/Config.in" source "package/python-weasyprint/Config.in" diff --git a/package/python-waitress/Config.in b/package/python-waitress/Config.in new file mode 100644 index 0000000000..7d8c73a650 --- /dev/null +++ b/package/python-waitress/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_WAITRESS + bool "python-waitress" + help + Waitress WSGI server. + + Waitress is a production-quality pure-Python WSGI server + with very acceptable performance. It has no dependencies + except ones which live in the Python standard library. + It supports HTTP/1.0 and HTTP/1.1. + + https://github.com/Pylons/waitress diff --git a/package/python-waitress/python-waitress.hash b/package/python-waitress/python-waitress.hash new file mode 100644 index 0000000000..c1663a351a --- /dev/null +++ b/package/python-waitress/python-waitress.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/waitress/json +md5 b8c671ed131b84a0099493f445c98014 waitress-3.0.0.tar.gz +sha256 005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1 waitress-3.0.0.tar.gz +# Locally computed sha256 checksums +sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-waitress/python-waitress.mk b/package/python-waitress/python-waitress.mk new file mode 100644 index 0000000000..c1618817dc --- /dev/null +++ b/package/python-waitress/python-waitress.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-waitress +# +################################################################################ + +PYTHON_WAITRESS_VERSION = 3.0.0 +PYTHON_WAITRESS_SOURCE = waitress-$(PYTHON_WAITRESS_VERSION).tar.gz +PYTHON_WAITRESS_SITE = https://files.pythonhosted.org/packages/70/34/cb77e5249c433eb177a11ab7425056b32d3b57855377fa1e38b397412859 +PYTHON_WAITRESS_SETUP_TYPE = setuptools +PYTHON_WAITRESS_LICENSE = ZPL-2.1 +PYTHON_WAITRESS_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_waitress.py b/support/testing/tests/package/test_python_waitress.py new file mode 100644 index 0000000000..46f04109c0 --- /dev/null +++ b/support/testing/tests/package/test_python_waitress.py @@ -0,0 +1,34 @@ +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonWaitress(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_FLASK=y + BR2_PACKAGE_PYTHON_WAITRESS=y + """ + + sample_scripts = ["tests/package/sample_python_flask.py"] + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + cmd = self.interpreter + " -m waitress sample_python_flask:app > /dev/null 2>&1 &" + # give some time to setup the server + _, exit = self.emulator.run(cmd, timeout=self.timeout) + + # Give enough time for the uvicorn server to start up + for attempt in range(30): + time.sleep(1) + + cmd = "wget -q -O - http://127.0.0.1:8080/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + if exit_code == 0: + self.assertEqual(output[0], 'Hello, World!') + break + else: + self.assertTrue(False, "Timeout while waiting for waitress server") -- 2.43.0 From ddrokosov at salutedevices.com Wed Feb 7 17:19:07 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Wed, 7 Feb 2024 20:19:07 +0300 Subject: [Buildroot] [PATCH v2 2/2] package/linux-tools: multilib build supported In-Reply-To: References: <20240206192543.7179-1-ddrokosov@salutedevices.com> <20240206192543.7179-3-ddrokosov@salutedevices.com> Message-ID: <20240207171907.m3ksufcpalqhahfz@CAB-WSD-L081021> Hello Yann, Thank you very much for such a quick response! On Wed, Feb 07, 2024 at 10:07:51AM +0100, Yann E. MORIN wrote: > Dmitry, All, > > On 2024-02-06 22:25 +0300, Dmitry Rokosov spake thusly: > > From: Konstantin Menyaev > > > > - LINUX_TOOLS_MAKE_OPTS option introduced: > > allows to override CROSS_COMPILE param > > What is the rationale for this? How is it supposed to be used? > > CROSS_COMPILE is already part of LINUX_MAKE_FLAGS, so there is no reason > to pass it explicitly either. > > Otherwise, I am not convinced anout the "multilib" title either, because > Buildroot does not do multilib systems anyway, so I am missing the point > of the patch... > > If you feel there really is a nedd, please resubmit with an extended > commit log. Thanks! Okay, we will try to describe it with extra comments and resubmit the patch in the separate email. > > Regards, > Yann E. MORIN. > > > Signed-off-by: Konstantin Menyaev > > Signed-off-by: Dmitry Rokosov > > --- > > package/linux-tools/linux-tool-gpio.mk.in | 2 +- > > package/linux-tools/linux-tool-iio.mk.in | 2 +- > > package/linux-tools/linux-tool-mm.mk.in | 2 +- > > package/linux-tools/linux-tool-pci.mk.in | 2 +- > > package/linux-tools/linux-tool-perf.mk.in | 2 +- > > package/linux-tools/linux-tool-selftests.mk.in | 2 +- > > package/linux-tools/linux-tool-tmon.mk.in | 2 +- > > package/linux-tools/linux-tools.mk | 2 ++ > > 8 files changed, 9 insertions(+), 7 deletions(-) > > > > diff --git a/package/linux-tools/linux-tool-gpio.mk.in b/package/linux-tools/linux-tool-gpio.mk.in > > index e825db1b1127..dcee11002e8c 100644 > > --- a/package/linux-tools/linux-tool-gpio.mk.in > > +++ b/package/linux-tools/linux-tool-gpio.mk.in > > @@ -6,7 +6,7 @@ > > > > LINUX_TOOLS += gpio > > > > -GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > > +GPIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > > > define GPIO_BUILD_CMDS > > $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ > > diff --git a/package/linux-tools/linux-tool-iio.mk.in b/package/linux-tools/linux-tool-iio.mk.in > > index 27ab0ed7ed63..1372faafd1a8 100644 > > --- a/package/linux-tools/linux-tool-iio.mk.in > > +++ b/package/linux-tools/linux-tool-iio.mk.in > > @@ -6,7 +6,7 @@ > > > > LINUX_TOOLS += iio > > > > -IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > > +IIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > > > define IIO_BUILD_CMDS > > $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ > > diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in > > index 5431e0574b04..51a54026dea4 100644 > > --- a/package/linux-tools/linux-tool-mm.mk.in > > +++ b/package/linux-tools/linux-tool-mm.mk.in > > @@ -7,7 +7,7 @@ > > LINUX_TOOLS += mm > > > > MM_DEPENDENCIES = linux > > -MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" > > +MM_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) CC="$(TARGET_CC)" > > > > define MM_BUILD_CMDS > > $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > > diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in > > index 17246f5d7ed2..48c3435a5c8a 100644 > > --- a/package/linux-tools/linux-tool-pci.mk.in > > +++ b/package/linux-tools/linux-tool-pci.mk.in > > @@ -6,7 +6,7 @@ > > > > LINUX_TOOLS += pci > > > > -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > > +PCI_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > > > define PCI_BUILD_CMDS > > $(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \ > > diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in > > index ee308a85dfd1..38910cda7d75 100644 > > --- a/package/linux-tools/linux-tool-perf.mk.in > > +++ b/package/linux-tools/linux-tool-perf.mk.in > > @@ -19,7 +19,7 @@ PERF_ARCH=$(NORMALIZED_ARCH) > > endif > > > > PERF_MAKE_FLAGS = \ > > - $(LINUX_MAKE_FLAGS) \ > > + $(LINUX_TOOLS_MAKE_OPTS) \ > > JOBS=$(PARALLEL_JOBS) \ > > ARCH=$(PERF_ARCH) \ > > DESTDIR=$(TARGET_DIR) \ > > diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in > > index e29c7f59debd..144dd6616f2b 100644 > > --- a/package/linux-tools/linux-tool-selftests.mk.in > > +++ b/package/linux-tools/linux-tool-selftests.mk.in > > @@ -22,7 +22,7 @@ SELFTESTS_DEPENDENCIES = \ > > $(if $(BR2_PACKAGE_OPENSSL),openssl) > > > > SELFTESTS_MAKE_FLAGS = \ > > - $(LINUX_MAKE_FLAGS) \ > > + $(LINUX_TOOLS_MAKE_OPTS) \ > > ARCH=$(SELFTESTS_ARCH) > > > > # O must be redefined here to overwrite the one used by Buildroot for > > diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in > > index 56c328c51fd7..7c33915049c2 100644 > > --- a/package/linux-tools/linux-tool-tmon.mk.in > > +++ b/package/linux-tools/linux-tool-tmon.mk.in > > @@ -7,7 +7,7 @@ > > LINUX_TOOLS += tmon > > > > TMON_DEPENDENCIES = host-pkgconf ncurses > > -TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ > > +TMON_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) \ > > CC=$(TARGET_CC) \ > > LDFLAGS="$(TARGET_LDFLAGS)" \ > > PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig > > diff --git a/package/linux-tools/linux-tools.mk b/package/linux-tools/linux-tools.mk > > index 81b1fbc17605..38bb2c83966a 100644 > > --- a/package/linux-tools/linux-tools.mk > > +++ b/package/linux-tools/linux-tools.mk > > @@ -26,6 +26,8 @@ LINUX_TOOLS_PATCH_DEPENDENCIES = linux > > # may install shared libraries and headers (e.g. cpupower). > > LINUX_TOOLS_INSTALL_STAGING = YES > > > > +LINUX_TOOLS_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CROSS_COMPILE="$(TARGET_CROSS)" > > + > > LINUX_TOOLS_DEPENDENCIES += $(foreach tool,$(LINUX_TOOLS),\ > > $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ > > $($(call UPPERCASE,$(tool))_DEPENDENCIES))) > > -- > > 2.43.0 > > > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -- Thank you, Dmitry From dario.binacchi at amarulasolutions.com Wed Feb 7 17:39:11 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 18:39:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/uuu: drop README.md from license files Message-ID: <20240207173911.3704142-1-dario.binacchi@amarulasolutions.com> The patch drops the file README.md from the license files. Indeed, the licensing terms apply to third-party libraries that uuu links to, and even though they are bundled in the source tree of uuu|mfgtools, they are not used by Buildroot as we use the ones we build. Therefore, the actual license file of the package is the file LICENSE. Moreover, this also leads to simplifying the bump to new versions. Signed-off-by: Dario Binacchi --- package/uuu/uuu.hash | 1 - package/uuu/uuu.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index c231d5d729f0..e45cbb868078 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,3 @@ # locally computed sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE -sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 80d5e1937a97..5800277b10d5 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -8,7 +8,7 @@ UUU_VERSION = 1.5.165 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License -UUU_LICENSE_FILES = LICENSE README.md +UUU_LICENSE_FILES = LICENSE HOST_UUU_DEPENDENCIES = \ host-bzip2 \ host-libusb \ -- 2.43.0 From buildroot at bubu1.eu Wed Feb 7 17:39:25 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:39:25 +0100 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <20240207112058.37534f3d@windsurf> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> <20240207112058.37534f3d@windsurf> Message-ID: On 07.02.24 11:20, Thomas Petazzoni via buildroot wrote: > On Wed, 7 Feb 2024 11:16:27 +0100 > Marcus Hoffmann wrote: > >> Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 >> [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop >> still uses) also seem to be still developed in parallel. So maybe we >> need both as build host packages? Or do you see another solution? > > If we were to have both in parallel, then the big question is whether > it is possible to install them both in parallel without them > conflicting with each other. They would conflict and there's no easy way to avoid that AFAIK. I think the best path forward is upgrading to cython 3.0 and passing the language_level=2 compatibility option[1], which seems to restore the 0.29.x behavior? I've yet to understand how to pass this option for a pep517 build though. uvloop at least also has a pending MR to support cython 3 directly [2] but we have a bunch of other packages depending on cython. [1] https://cython.readthedocs.io/en/stable/src/userguide/migrating_to_cy30.html#python-3-syntax-semantics [2] https://github.com/MagicStack/uvloop/pull/587/files > > Thomas From arbab at linux.ibm.com Wed Feb 7 17:51:31 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 7 Feb 2024 11:51:31 -0600 Subject: [Buildroot] [PATCH v5 1/5] package/petitboot: minor makefile cleanup In-Reply-To: <20240207175135.1532037-1-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> Message-ID: <20240207175135.1532037-2-arbab@linux.ibm.com> Normalize the order of arguments to $(INSTALL). Remove an unnecessary pair of parentheses. Signed-off-by: Reza Arbab --- package/petitboot/petitboot.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 2087f01b090c..4c8bc35adb38 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -63,15 +63,15 @@ define PETITBOOT_POST_INSTALL $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb - $(INSTALL) -m 0755 -D $(PETITBOOT_PKGDIR)/S15pb-discover \ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ $(TARGET_DIR)/etc/init.d/S15pb-discover $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-console \ $(TARGET_DIR)/etc/init.d/pb-console mkdir -p $(TARGET_DIR)/etc/udev/rules.d - (for port in $(PETITBOOT_GETTY_PORT); do \ + for port in $(PETITBOOT_GETTY_PORT); do \ printf 'SUBSYSTEM=="tty", KERNEL=="%s", RUN+="/etc/init.d/pb-console start $$name"\n' "$$port"; \ - done) > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules + done > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules mkdir -p $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ ln -sf /usr/sbin/pb-udhcpc \ -- 2.39.3 From arbab at linux.ibm.com Wed Feb 7 17:51:34 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 7 Feb 2024 11:51:34 -0600 Subject: [Buildroot] [PATCH v5 4/5] package/petitboot: run script when exiting to shell In-Reply-To: <20240207175135.1532037-1-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> Message-ID: <20240207175135.1532037-5-arbab@linux.ibm.com> When the user selects the shell escape option from the petitboot menu, reset the terminal so output is raw rather than being confined to the ncurses window set up for the petitboot menu, and print some helpful text before running the shell. To do this, override the default HOST_PROG_SH (/bin/sh) with a small script. Doing so also enables someone to customize this behavior by overlaying a different script. Signed-off-by: Reza Arbab --- package/petitboot/pb-shell | 10 ++++++++++ package/petitboot/petitboot.mk | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 package/petitboot/pb-shell diff --git a/package/petitboot/pb-shell b/package/petitboot/pb-shell new file mode 100644 index 000000000000..99887c3f3b87 --- /dev/null +++ b/package/petitboot/pb-shell @@ -0,0 +1,10 @@ +#!/bin/sh + +reset + +cat < References: <20240207175135.1532037-1-arbab@linux.ibm.com> Message-ID: <20240207175135.1532037-3-arbab@linux.ibm.com> The petitboot UI looks much nicer in a Unicode locale: * Items in the language selection submenu use multibyte Unicode characters. In other locales, they say "Unable to display text in this locale". * The combination of TERM=linux with a UTF-8 locale is required to trigger a special-case workaround in ncurses code[1]. Without this, line-drawing characters in the menu look like q's. Turn on wchar support in ncurses, and add a reminder that a UTF-8 locale should be generated for things to look right. [1] https://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing Signed-off-by: Reza Arbab --- package/petitboot/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 6a3d476b11b3..4f3b1c1ea4d1 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_PETITBOOT select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LVM2 # devmapper select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR # run-time dependencies select BR2_PACKAGE_KEXEC if !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS select BR2_PACKAGE_KEXEC_LITE if BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC @@ -18,6 +19,8 @@ config BR2_PACKAGE_PETITBOOT help Petitboot is a small kexec-based bootloader + NOTE: petitboot looks best in a UTF-8 locale (BR2_GENERATE_LOCALE) + http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html if BR2_PACKAGE_PETITBOOT -- 2.39.3 From arbab at linux.ibm.com Wed Feb 7 17:51:35 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 7 Feb 2024 11:51:35 -0600 Subject: [Buildroot] [PATCH v5 5/5] package/petitboot: run UI as non-root user In-Reply-To: <20240207175135.1532037-1-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> Message-ID: <20240207175135.1532037-6-arbab@linux.ibm.com> Though the petitboot UI is a user application, it is currently being run by root only because we use getty to display it on the console. Create an unprivileged user to run the UI instead. The unix socket the pb-discover daemon sets up is accessible to "petitgroup", so that should be the gid, with arbitrary uid "petituser" to match. This is currently the chain of processes leading to the UI: 1. /etc/init.d/pb-console start console 2. /usr/libexec/petitboot/pb-console --getty --detach -- -n -i 0 console linux 3. /sbin/getty -l/usr/libexec/petitboot/pb-console -n -i 0 console linux 4. /usr/libexec/petitboot/pb-console 5. /usr/sbin/petitboot-nc Instead of (3) running the pb-console helper directly with "getty -l", we can use "agetty -a" to autologin petituser, and run pb-console via petituser's login shell: 1. /etc/init.d/pb-console start console 2. /usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i console linux 3. /sbin/agetty -a petituser -n -i console linux 4. /home/petituser/.profile 5. /usr/libexec/petitboot/pb-console 6. /usr/sbin/petiboot-nc Here, everything from (4) down is running as petituser. In (4), use $PPID to determine if we're logging in via getty, so that logging in by other means will give a normal shell. Signed-off-by: Reza Arbab --- package/petitboot/Config.in | 1 + package/petitboot/S15pb-discover | 4 +++- package/petitboot/pb-console | 6 ++++-- package/petitboot/petitboot.mk | 6 ++++++ package/petitboot/shell_profile | 3 +++ 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 package/petitboot/shell_profile diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 4f3b1c1ea4d1..e561547c10c8 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_PETITBOOT select BR2_PACKAGE_KEXEC_LITE if BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC select BR2_PACKAGE_NVME if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + select BR2_PACKAGE_UTIL_LINUX_AGETTY help Petitboot is a small kexec-based bootloader diff --git a/package/petitboot/S15pb-discover b/package/petitboot/S15pb-discover index 71ab62d99859..9e8f6c87f8bb 100644 --- a/package/petitboot/S15pb-discover +++ b/package/petitboot/S15pb-discover @@ -12,7 +12,9 @@ fi start() { printf 'Starting %s: ' "$DAEMON" - mkdir -p /var/log/petitboot + # shellcheck disable=SC2174 # only apply -m to deepest dir + mkdir -p -m 0775 /var/log/petitboot + chown petituser:petitgroup /var/log/petitboot # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -b -m -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ diff --git a/package/petitboot/pb-console b/package/petitboot/pb-console index 407ff3b30232..8b23b2233dee 100644 --- a/package/petitboot/pb-console +++ b/package/petitboot/pb-console @@ -3,14 +3,16 @@ DAEMON="pb-console" PB_CONSOLE_PORT=${2:-"console"} -PB_CONSOLE_ARGS="--getty --detach -- -n -i 0 $PB_CONSOLE_PORT linux" +PB_CONSOLE_ARGS="--getty=/sbin/agetty --detach -- -a petituser -n -i $PB_CONSOLE_PORT linux" # shellcheck source=/dev/null [ -r "/etc/default/petitboot" ] && . "/etc/default/petitboot" start() { printf 'Starting %s on %s: ' "$DAEMON" "$PB_CONSOLE_PORT" - mkdir -p /var/log/petitboot + # shellcheck disable=SC2174 # only apply -m to deepest dir + mkdir -p -m 0775 /var/log/petitboot + chown petituser:petitgroup /var/log/petitboot # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -x "/usr/libexec/petitboot/$DAEMON" \ diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index e2f762842534..8e02118f25f1 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -84,6 +84,8 @@ define PETITBOOT_POST_INSTALL $(TARGET_DIR)/etc/init.d/pb-console $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-shell \ $(TARGET_DIR)/usr/libexec/petitboot/pb-shell + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_profile \ + $(TARGET_DIR)/home/petituser/.profile mkdir -p $(TARGET_DIR)/etc/udev/rules.d for port in $(PETITBOOT_GETTY_PORT); do \ @@ -97,4 +99,8 @@ endef PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL +define PETITBOOT_USERS + petituser -1 petitgroup -1 * /home/petituser /bin/sh - petitboot user +endef + $(eval $(autotools-package)) diff --git a/package/petitboot/shell_profile b/package/petitboot/shell_profile new file mode 100644 index 000000000000..a958ca4402f2 --- /dev/null +++ b/package/petitboot/shell_profile @@ -0,0 +1,3 @@ +if [ "$PPID" = "1" ]; then + exec /usr/libexec/petitboot/pb-console +fi -- 2.39.3 From arbab at linux.ibm.com Wed Feb 7 17:51:30 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 7 Feb 2024 11:51:30 -0600 Subject: [Buildroot] [PATCH v5 0/5] package/petitboot: misc fixes/enhancement Message-ID: <20240207175135.1532037-1-arbab@linux.ibm.com> The br2-external tree used to build OpenPOWER firmware has long carried petitboot as a custom package[1]. Now that petitboot has been added to buildroot proper, it would be nice to leverage the base package instead. To make that transition easier, here is a set of patches which port over some of the enhancements made to that external package. [1] https://github.com/open-power/op-build/tree/master/openpower/package/petitboot --- v5: * Rebase to apply on top of some recent NLS fixes. * Nobody replied to v4. Cc'ing some more people in hopes of getting these changes into the next release. v4: * Change the buildroot menu help to say that petitboot *looks best* in a UTF-8 locale, not that it *needs* one. * Change the shutdown patch to accomodate any buildroot init system. * Split the user separation patch into a couple of smaller ones with better log messages. v3: * Add a number of small fixes. * Add user separation, so the UI runs as non-root. * Remove udev rules that enabled some additional types of boot devices. These should more appropriately live outside of buildroot. * Remove a sysctl.d file to silence kernel output. I think there's a bug upstream; see https://github.com/open-power/petitboot/pull/103 v2: * Use Laurent's suggested additions to "run pb-console at boot" patch. Reza Arbab (5): package/petitboot: minor makefile cleanup package/petitboot: prefer UTF-8 support package/petitboot: fix shutdown package/petitboot: run script when exiting to shell package/petitboot: run UI as non-root user package/petitboot/Config.in | 4 ++++ package/petitboot/S15pb-discover | 4 +++- package/petitboot/kexec-restart | 26 ++++++++++++++++++++++++ package/petitboot/pb-console | 6 ++++-- package/petitboot/pb-shell | 10 +++++++++ package/petitboot/petitboot.mk | 35 ++++++++++++++++++++++++++------ package/petitboot/shell_profile | 3 +++ 7 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 package/petitboot/kexec-restart create mode 100644 package/petitboot/pb-shell create mode 100644 package/petitboot/shell_profile -- 2.39.3 From arbab at linux.ibm.com Wed Feb 7 17:51:33 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 7 Feb 2024 11:51:33 -0600 Subject: [Buildroot] [PATCH v5 3/5] package/petitboot: fix shutdown In-Reply-To: <20240207175135.1532037-1-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> Message-ID: <20240207175135.1532037-4-arbab@linux.ibm.com> It's good practice to unmount filesystems and gracefully terminate running services before running "kexec -e". So when a boot option has been chosen from the petitboot menu, poke init to shut the system down and kexec the new kernel. One benefit to us in particular is that when pb-console is killed, it notifies the user that we're booting: trap 'reset; echo "SIGTERM received, booting..."; sleep 2' SIGTERM This terminal reset is also useful, exiting the ncurses visual mode so subsequent boot output is raw rather than being confined to the window set up for the petitboot menu. Currently we assume busybox init, but do not add an accompanying entry in the inittab to run kexec, so things aren't working. Fix this and accomodate the other buildroot init systems as well. Signed-off-by: Reza Arbab --- package/petitboot/kexec-restart | 26 ++++++++++++++++++++++++++ package/petitboot/petitboot.mk | 20 +++++++++++++++++--- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 package/petitboot/kexec-restart diff --git a/package/petitboot/kexec-restart b/package/petitboot/kexec-restart new file mode 100644 index 000000000000..14e6899f70bb --- /dev/null +++ b/package/petitboot/kexec-restart @@ -0,0 +1,26 @@ +#!/bin/sh + +case "$(/usr/bin/readlink -f /proc/1/exe)" in + /bin/busybox) + # inittab "restart" runlevel entry runs kexec + /bin/kill -QUIT 1 + ;; + /sbin/init) + # inittab runlevel 6 entry runs kexec + /sbin/shutdown -r now + ;; + /sbin/openrc-init) + /sbin/openrc-shutdown --kexec now + ;; + /usr/lib/systemd/systemd) + /usr/bin/systemctl kexec + ;; + *) + /usr/sbin/kexec -f -e + ;; +esac + +while : +do + sleep 1 +done diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 4c8bc35adb38..291083269ae9 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -29,7 +29,7 @@ PETITBOOT_CONF_OPTS = \ --without-twin-x11 \ $(if $(BR2_PACKAGE_BUSYBOX),--enable-busybox,--disable-busybox) \ HOST_PROG_KEXEC=/usr/sbin/kexec \ - HOST_PROG_SHUTDOWN=/usr/libexec/petitboot/bb-kexec-reboot + HOST_PROG_SHUTDOWN=/usr/sbin/kexec-restart # HPA and Busybox tftp are supported. HPA tftp is part of Buildroot's tftpd # package. @@ -54,17 +54,31 @@ else PETITBOOT_CONF_OPTS += --without-fdt endif +ifeq ($(BR2_INIT_BUSYBOX),y) +define PETITBOOT_BUSYBOX_INITTAB + grep -q kexec $(TARGET_DIR)/etc/inittab || \ + printf "\nnull::restart:/usr/sbin/kexec -f -e\n" >> $(TARGET_DIR)/etc/inittab +endef +PETITBOOT_TARGET_FINALIZE_HOOKS += PETITBOOT_BUSYBOX_INITTAB +else ifeq ($(BR2_INIT_SYSV),y) +define PETITBOOT_SYSV_INITTAB + grep -q kexec $(TARGET_DIR)/etc/inittab || \ + $(SED) 's~^reb0:.*~reb0:6:wait:/usr/sbin/kexec -f -e~' $(TARGET_DIR)/etc/inittab +endef +PETITBOOT_TARGET_FINALIZE_HOOKS += PETITBOOT_SYSV_INITTAB +endif + PETITBOOT_GETTY_PORT = $(patsubst %,'%',$(call qstrip,$(BR2_PACKAGE_PETITBOOT_GETTY_PORT))) define PETITBOOT_POST_INSTALL - $(INSTALL) -D -m 0755 $(@D)/utils/bb-kexec-reboot \ - $(TARGET_DIR)/usr/libexec/petitboot/bb-kexec-reboot $(INSTALL) -D -m 0755 $(@D)/utils/hooks/01-create-default-dtb \ $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ $(TARGET_DIR)/etc/init.d/S15pb-discover + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/kexec-restart \ + $(TARGET_DIR)/usr/sbin/kexec-restart $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-console \ $(TARGET_DIR)/etc/init.d/pb-console -- 2.39.3 From peter at korsgaard.com Wed Feb 7 18:06:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 19:06:19 +0100 Subject: [Buildroot] [PATCH] package/ruby: build host-ruby with yaml support Message-ID: <20240207180620.298393-1-peter@korsgaard.com> webkitgtk/wpewebkit needs a host-ruby with yaml support, otherwise the build fails with errors like: cd /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore && \ /home/peko/source/buildroot/output/host/bin/ruby \ /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/GenerateSettings.rb \ --outputDir /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/WebCore/DerivedSources \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.cpp.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.idl.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.h.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/Settings.cpp.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/Settings.h.erb \ /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml \ /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/page/Settings.yaml /home/peko/source/buildroot/output/host/lib/ruby/3.3.0/yaml.rb:3: warning: It seems your ruby installation is missing psych (for YAML output). To eliminate this warning, please install libyaml and reinstall your ruby. We do not currently have any Config.in.host options for ruby or libyaml, but given how small/fast libyaml is to build just do it unconditionally. Signed-off-by: Peter Korsgaard --- package/ruby/ruby.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 4b9ce80e67..00fa0e0f65 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -20,7 +20,7 @@ RUBY_LICENSE_FILES = LEGAL COPYING BSDL RUBY_CPE_ID_VENDOR = ruby-lang RUBY_DEPENDENCIES = host-pkgconf host-ruby -HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl +HOST_RUBY_DEPENDENCIES = host-libyaml host-pkgconf host-openssl RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) RUBY_CONF_OPTS = \ --disable-install-doc \ -- 2.39.2 From yann.morin.1998 at free.fr Wed Feb 7 18:48:22 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 19:48:22 +0100 Subject: [Buildroot] [git commit] package/uuu: drop README.md from license files Message-ID: <20240207184901.EAC7C87694@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5d83b4b649ee1e77811d9bf8ca6398725f6cce1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The patch drops the file README.md from the license files. Indeed, the licensing terms apply to third-party libraries that uuu links to, and even though they are bundled in the source tree of uuu|mfgtools, they are not used by Buildroot as we use the ones we build. Therefore, the actual license file of the package is the file LICENSE. Moreover, this also leads to simplifying the bump to new versions. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/uuu/uuu.hash | 1 - package/uuu/uuu.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index c231d5d729..e45cbb8680 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,3 @@ # locally computed sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE -sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 80d5e1937a..5800277b10 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -8,7 +8,7 @@ UUU_VERSION = 1.5.165 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License -UUU_LICENSE_FILES = LICENSE README.md +UUU_LICENSE_FILES = LICENSE HOST_UUU_DEPENDENCIES = \ host-bzip2 \ host-libusb \ From yann.morin.1998 at free.fr Wed Feb 7 18:49:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 19:49:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/uuu: drop README.md from license files In-Reply-To: <20240207173911.3704142-1-dario.binacchi@amarulasolutions.com> References: <20240207173911.3704142-1-dario.binacchi@amarulasolutions.com> Message-ID: Darrio, All, On 2024-02-07 18:39 +0100, Dario Binacchi spake thusly: > The patch drops the file README.md from the license files. Indeed, the > licensing terms apply to third-party libraries that uuu links to, and > even though they are bundled in the source tree of uuu|mfgtools, they > are not used by Buildroot as we use the ones we build. Therefore, the > actual license file of the package is the file LICENSE. > > Moreover, this also leads to simplifying the bump to new versions. > > Signed-off-by: Dario Binacchi Applied to master from Brussels airport, thanks. Regards, Yann E. MORIN. > --- > package/uuu/uuu.hash | 1 - > package/uuu/uuu.mk | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash > index c231d5d729f0..e45cbb868078 100644 > --- a/package/uuu/uuu.hash > +++ b/package/uuu/uuu.hash > @@ -1,4 +1,3 @@ > # locally computed > sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz > sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE > -sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md > diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk > index 80d5e1937a97..5800277b10d5 100644 > --- a/package/uuu/uuu.mk > +++ b/package/uuu/uuu.mk > @@ -8,7 +8,7 @@ UUU_VERSION = 1.5.165 > UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz > UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) > UUU_LICENSE = BSD 3-Clause "New" or "Revised" License > -UUU_LICENSE_FILES = LICENSE README.md > +UUU_LICENSE_FILES = LICENSE > HOST_UUU_DEPENDENCIES = \ > host-bzip2 \ > host-libusb \ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Feb 7 18:51:23 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 19:51:23 +0100 Subject: [Buildroot] [git commit] package/libopenssl: add patches fixing hangs asn1parse Message-ID: <20240207185138.CB0DC8769C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55c6ae5656a0bbd04baf5d6fbbeb060124e71e4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The asn1parse command hangs forever on 3.2.0 when the genstr or genconf option is passed. This commit fixes the issue by adding upstream commits [1] [2]. [1] https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 [2] https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e Signed-off-by: Martin Kurbanov Signed-off-by: Thomas Petazzoni --- ...05-Fix-genstr-genconf-option-in-asn1parse.patch | 42 +++++++ ...-Harden-asn1-oid-loader-to-invalid-inputs.patch | 122 +++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch b/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch new file mode 100644 index 0000000000..9fa36d83be --- /dev/null +++ b/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch @@ -0,0 +1,42 @@ +From 749fcc0e3ce796474a15d6fac221e57daeacff1e Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Tue, 5 Dec 2023 14:50:01 -0500 +Subject: [PATCH] Fix genstr/genconf option in asn1parse + +At some point the asn1parse applet was changed to default the inform to +PEM, and defalt input file to stdin. Doing so broke the -genstr|conf options, +in that, before we attempt to generate an ASN1 block from the provided +genstr string, we attempt to read a PEM input from stdin. As a result, +this command: +openssl asn1parse -genstr OID:1.2.3.4 +hangs because we are attempting a blocking read on stdin, waiting for +data that never arrives + +Fix it by giving priority to genstr|genconf, such that, if set, will just run +do_generate on that string and exit + +Reviewed-by: Hugo Landau +Reviewed-by: Tomas Mraz +(Merged from https://github.com/openssl/openssl/pull/22957) +Upstream: https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e +Signed-off-by: Martin Kurbanov +--- + apps/asn1parse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apps/asn1parse.c b/apps/asn1parse.c +index 097b0cc1ed..6597a6180b 100644 +--- a/apps/asn1parse.c ++++ b/apps/asn1parse.c +@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) + + if ((buf = BUF_MEM_new()) == NULL) + goto end; +- if (informat == FORMAT_PEM) { ++ if (genstr == NULL && informat == FORMAT_PEM) { + if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { + BIO_printf(bio_err, "Error reading PEM file\n"); + ERR_print_errors(bio_err); +-- +2.40.0 + diff --git a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch b/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch new file mode 100644 index 0000000000..299ecbc2ed --- /dev/null +++ b/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch @@ -0,0 +1,122 @@ +From a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Tue, 5 Dec 2023 15:24:20 -0500 +Subject: [PATCH] Harden asn1 oid loader to invalid inputs + +In the event that a config file contains this sequence: +======= +openssl_conf = openssl_init + +config_diagnostics = 1 + +[openssl_init] +oid_section = oids + +[oids] +testoid1 = 1.2.3.4.1 +testoid2 = A Very Long OID Name, 1.2.3.4.2 +testoid3 = ,1.2.3.4.3 +====== + +The leading comma in testoid3 can cause a heap buffer overflow, as the +parsing code will move the string pointer back 1 character, thereby +pointing to an invalid memory space + +correct the parser to detect this condition and handle it by treating it +as if the comma doesn't exist (i.e. an empty long oid name) + +Reviewed-by: Hugo Landau +Reviewed-by: Tomas Mraz +(Merged from https://github.com/openssl/openssl/pull/22957) +Upstream: https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 +Signed-off-by: Martin Kurbanov +--- + apps/asn1parse.c | 2 +- + crypto/asn1/asn_moid.c | 4 ++++ + test/recipes/04-test_asn1_parse.t | 26 ++++++++++++++++++++++++++ + test/test_asn1_parse.cnf | 12 ++++++++++++ + 4 files changed, 43 insertions(+), 1 deletion(-) + create mode 100644 test/recipes/04-test_asn1_parse.t + create mode 100644 test/test_asn1_parse.cnf + +diff --git a/apps/asn1parse.c b/apps/asn1parse.c +index 6597a6180b..bf62f85947 100644 +--- a/apps/asn1parse.c ++++ b/apps/asn1parse.c +@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) + + if ((buf = BUF_MEM_new()) == NULL) + goto end; +- if (genstr == NULL && informat == FORMAT_PEM) { ++ if (genconf == NULL && genstr == NULL && informat == FORMAT_PEM) { + if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { + BIO_printf(bio_err, "Error reading PEM file\n"); + ERR_print_errors(bio_err); +diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c +index 6f816307af..1e183f4f18 100644 +--- a/crypto/asn1/asn_moid.c ++++ b/crypto/asn1/asn_moid.c +@@ -67,6 +67,10 @@ static int do_create(const char *value, const char *name) + if (p == NULL) { + ln = name; + ostr = value; ++ } else if (p == value) { ++ /* we started with a leading comma */ ++ ln = name; ++ ostr = p + 1; + } else { + ln = value; + ostr = p + 1; +diff --git a/test/recipes/04-test_asn1_parse.t b/test/recipes/04-test_asn1_parse.t +new file mode 100644 +index 0000000000..f3af436592 +--- /dev/null ++++ b/test/recipes/04-test_asn1_parse.t +@@ -0,0 +1,26 @@ ++#! /usr/bin/env perl ++# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. ++# ++# Licensed under the Apache License 2.0 (the "License"). You may not use ++# this file except in compliance with the License. You can obtain a copy ++# in the file LICENSE in the source distribution or at ++# https://www.openssl.org/source/license.html ++ ++use strict; ++use OpenSSL::Test qw(:DEFAULT srctop_file); ++use OpenSSL::Test::Utils; ++ ++setup("test_asn1_parse"); ++ ++plan tests => 3; ++ ++$ENV{OPENSSL_CONF} = srctop_file("test", "test_asn1_parse.cnf"); ++ ++ok(run(app(([ 'openssl', 'asn1parse', ++ '-genstr', 'OID:1.2.3.4.1'])))); ++ ++ok(run(app(([ 'openssl', 'asn1parse', ++ '-genstr', 'OID:1.2.3.4.2'])))); ++ ++ok(run(app(([ 'openssl', 'asn1parse', ++ '-genstr', 'OID:1.2.3.4.3'])))); +diff --git a/test/test_asn1_parse.cnf b/test/test_asn1_parse.cnf +new file mode 100644 +index 0000000000..5f0305657e +--- /dev/null ++++ b/test/test_asn1_parse.cnf +@@ -0,0 +1,12 @@ ++openssl_conf = openssl_init ++ ++# Comment out the next line to ignore configuration errors ++config_diagnostics = 1 ++ ++[openssl_init] ++oid_section = oids ++ ++[oids] ++testoid1 = 1.2.3.4.1 ++testoid2 = A Very Long OID Name, 1.2.3.4.2 ++testoid3 = ,1.2.3.4.3 +-- +2.40.0 + From thomas.petazzoni at bootlin.com Wed Feb 7 18:52:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 19:52:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/libopenssl: add patches fixing hangs asn1parse In-Reply-To: <20240119150244.204049-1-mmkurbanov@salutedevices.com> References: <20240119150244.204049-1-mmkurbanov@salutedevices.com> Message-ID: <20240207195216.5ded8acb@windsurf> On Fri, 19 Jan 2024 18:02:44 +0300 Martin Kurbanov via buildroot wrote: > The asn1parse command hangs forever on 3.2.0 when the genstr or genconf > option is passed. > > This commit fixes the issue by adding upstream commits [1] [2]. > > [1] https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 > [2] https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e > > Signed-off-by: Martin Kurbanov > --- > ...x-genstr-genconf-option-in-asn1parse.patch | 42 ++++++ > ...en-asn1-oid-loader-to-invalid-inputs.patch | 122 ++++++++++++++++++ > 2 files changed, 164 insertions(+) > create mode 100644 package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch > create mode 100644 package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch Sorry for the delay in getting back to you! I have applied your patch, after updating the two patches to indicate the final upstream commit references, rather than the reference to the pull request. Thanks a lot for your contribution! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 18:56:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 19:56:12 +0100 Subject: [Buildroot] [PATCH 1/1] boot/ti-k3-r5-loader: add support for patch files and URLs In-Reply-To: <20231129172852.1684628-1-dario.binacchi@amarulasolutions.com> References: <20231129172852.1684628-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207195612.7ea08e54@windsurf> On Wed, 29 Nov 2023 18:28:52 +0100 Dario Binacchi wrote: > The patch adds support for URLs using similar code as found > in linux/linux.mk and uboot/uboot.mk. > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3-r5-loader/Config.in | 11 +++++++++++ > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 18 ++++++++++++++++++ > 2 files changed, 29 insertions(+) Thanks a lot for your proposal, but we no longer add package-specific options to apply patches, as BR2_GLOBAL_PATCH_DIR allows to patch all packages. We do have options that exist for linux and u-boot indeed, because they predate BR2_GLOBAL_PATCH_DIR, and we need to keep them for backwards compatibility. But we do not introduce such options for new packages. For the example, the arm-trusted-firmware has no custom patch option, because BR2_GLOBAL_PATCH_DIR can/should be used instead. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 18:58:28 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 19:58:28 +0100 Subject: [Buildroot] [git commit] utils/scanpypi: use a set comprehension for dependencies Message-ID: <20240207185839.909778769F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c12e1c7b5946aa7ddc744e17ba5d3d04d639b075 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This ensures that we don't have duplicate dependencies. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- utils/scanpypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 021c99a172..5a58550145 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -411,8 +411,8 @@ class BuildrootPackage(): for req in self.pkg_req] # get rid of commented lines and also strip the package strings - self.pkg_req = [item.strip() for item in self.pkg_req - if len(item) > 0 and item[0] != '#'] + self.pkg_req = {item.strip() for item in self.pkg_req + if len(item) > 0 and item[0] != '#'} req_not_found = self.pkg_req self.pkg_req = list(map(pkg_buildroot_name, self.pkg_req)) From thomas.petazzoni at bootlin.com Wed Feb 7 19:00:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:00:08 +0100 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: use a set comprehension for dependencies In-Reply-To: <20231130211910.2298144-1-james.hilliard1@gmail.com> References: <20231130211910.2298144-1-james.hilliard1@gmail.com> Message-ID: <20240207200008.3a125f1c@windsurf> On Thu, 30 Nov 2023 14:19:10 -0700 James Hilliard wrote: > This ensures that we don't have duplicate dependencies. > > Signed-off-by: James Hilliard > --- > utils/scanpypi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 7 19:07:46 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 20:07:46 +0100 Subject: [Buildroot] [PATCH v4 6/7] package/llvm-project: add opencl-c-base.h on target In-Reply-To: <20240202093625.1409559-7-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-7-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > rusticl depends on the mesa clc_compile_to_llvm_module function. > This function requires opencl-c-base.h when LLVM version >= 15. > > The header is deleted automatically by CLANG_FILES_TO_REMOVE > post install target hook in llvm-project/clang package. > When rusticl is enabled, after the whole clang directory has > been removed, the header is copied back to > /usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/ > > By default, the mesa3d variable used to retrieve the header > is set to the staging directory on the host machine. A merge > request on mesa's gitlab solved this problem. See: > > https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25568 > > The patches have been backported to mesa 23.3.4. > > Signed-off-by: Antoine Coutant > --- > Changes v3 -> v4: > - Add patches merged by mesa upstream. Adding those patches has nothing to do in this commit, but should in the next one, that adds rusticl support in mesa3d, right? Regards, Yann E. MORIN. > --- > Running an app that uses rusticl leads to an error. > Example: > > RUSTICL_ENABLE=panfrost clpeak > > Platform: rusticl > Device: Mali-G52 (Panfrost) > Driver version : 23.3.4 (Linux ARM64) > Compute units : 2 > Clock frequency : 800 MHz > Build Log: :1:10: fatal error: 'opencl-c-base.h' file not found > Error executing LLVM compilation action. > > Signed-off-by: Antoine Coutant > --- > package/llvm-project/clang/clang.mk | 9 ++ > ...ncl-external-clang-headers-option-an.patch | 72 ++++++++++++++++ > ...or-every-user-when-using-shared-LLVM.patch | 40 +++++++++ > ...lc-retrieve-libclang-path-at-runtime.patch | 86 +++++++++++++++++++ > 4 files changed, 207 insertions(+) > create mode 100644 package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch > create mode 100644 package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch > create mode 100644 package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch > > diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk > index 0bafd6461b..09aac7f0ec 100644 > --- a/package/llvm-project/clang/clang.mk > +++ b/package/llvm-project/clang/clang.mk > @@ -90,6 +90,15 @@ define HOST_CLANG_INSTALL_CLANG_TBLGEN > endef > HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN > > +# Rusticl needs opencl-c-base.h to be present on the target. > +define CLANG_OPENCL_C_BASE_HEADER_TO_TARGET > + mkdir -p $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include > + $(INSTALL) -D -m 0644 $(@D)/lib/Headers/opencl-c-base.h $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/opencl-c-base.h > +endef > +ifeq ($(BR2_PACKAGE_MESA3D_RUSTICL),y) > +CLANG_POST_INSTALL_TARGET_HOOKS += CLANG_OPENCL_C_BASE_HEADER_TO_TARGET > +endif > + > # This option must be enabled to link libclang dynamically against libLLVM.so > HOST_CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON > CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON > diff --git a/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch > new file mode 100644 > index 0000000000..ebe3542627 > --- /dev/null > +++ b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch > @@ -0,0 +1,72 @@ > +From b7f2ada31d85dfd2e9906a7343d14a3b0b85cf14 Mon Sep 17 00:00:00 2001 > +From: Karol Herbst > +Date: Tue, 2 Jan 2024 22:58:39 +0100 > +Subject: [PATCH 1/3] meson: remove opencl-external-clang-headers option and > + rely on shared-llvm > + > +Setting opencl-external-clang-headers to enabled while using shared LLVM > +was broken and this option was mostly used for windows to force static > +inclusion of opencl base headers. > + > +Simply relying on the shared-llvm option here is enough to get what we > +want. > + > +Signed-off-by: Karol Herbst > +Reviewed-by: Jesse Natalie > +Part-of: > +[antoine.coutant at smile.fr: backported to mesa-23.3.4] > +Signed-off-by: Antoine Coutant > +--- > + .gitlab-ci/windows/mesa_build.ps1 | 1 - > + meson_options.txt | 7 ------- > + src/compiler/clc/meson.build | 4 +--- > + 3 files changed, 1 insertion(+), 11 deletions(-) > + > +diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 > +index a4f87c4eadb..e79eb6b6587 100644 > +--- a/.gitlab-ci/windows/mesa_build.ps1 > ++++ b/.gitlab-ci/windows/mesa_build.ps1 > +@@ -59,7 +59,6 @@ meson setup ` > + -Dopencl-spirv=true ` > + -Dmicrosoft-clc=enabled ` > + -Dstatic-libclc=all ` > +--Dopencl-external-clang-headers=disabled ` > + -Dspirv-to-dxil=true ` > + -Dbuild-tests=true ` > + -Dwerror=true ` > +diff --git a/meson_options.txt b/meson_options.txt > +index e885ba61a8a..537ba797407 100644 > +--- a/meson_options.txt > ++++ b/meson_options.txt > +@@ -191,13 +191,6 @@ option( > + description : 'Link libclc SPIR-V statically.', > + ) > + > +-option( > +- 'opencl-external-clang-headers', > +- type : 'feature', > +- description : 'Use system Clang headers at runtime for OpenCL kernel ' + > +- 'compilation.', > +-) > +- > + option( > + 'd3d-drivers-path', > + type : 'string', > +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build > +index 3e4f1a7f441..81345225768 100644 > +--- a/src/compiler/clc/meson.build > ++++ b/src/compiler/clc/meson.build > +@@ -30,9 +30,7 @@ _libmesaclc_c_args = [] > + _libmesaclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)] > + _libmesaclc_sources = [] > + > +-if get_option('opencl-external-clang-headers') \ > +- .disable_auto_if(host_machine.system() == 'windows') \ > +- .disabled() > ++if not _shared_llvm > + # LLVM 16 moved clang header path from using full version to only major version > + if dep_llvm.version().version_compare('< 16') > + # Prior to LLVM 16, this path used a full version > +-- > +2.25.1 > + > diff --git a/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch > new file mode 100644 > index 0000000000..3560f6805f > --- /dev/null > +++ b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch > @@ -0,0 +1,40 @@ > +From 56c85c4c7a757a9ba3d8ac08e6c4c4c7f19e6cab Mon Sep 17 00:00:00 2001 > +From: Karol Herbst > +Date: Thu, 11 Jan 2024 14:55:46 +0100 > +Subject: [PATCH 2/3] clc: force fPIC for every user when using shared LLVM > + > +As we want to start using `dladdr`, this is needed to prevent `dladdr` > +returning information of the wrong file. > + > +Fixes tag as it's required by the actual fix. > + > +Signed-off-by: Karol Herbst > +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") > +Part-of: > +[antoine.coutant at smile.fr: backported to mesa-23.3.4] > +Signed-off-by: Antoine Coutant > +--- > + src/compiler/clc/meson.build | 6 ++++++ > + 1 file changed, 6 insertions(+) > + > +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build > +index 81345225768..442a583065b 100644 > +--- a/src/compiler/clc/meson.build > ++++ b/src/compiler/clc/meson.build > +@@ -123,7 +123,13 @@ _libmesaclc = static_library( > + idep_mesautil, dep_spirv_tools] > + ) > + > ++_idep_mesaclc_link_args = [] > ++if _shared_llvm > ++ _idep_mesaclc_link_args += cc.get_supported_link_arguments('-fPIC') > ++endif > ++ > + idep_mesaclc = declare_dependency( > + link_with : _libmesaclc, > + include_directories : include_directories('.'), > ++ link_args : _idep_mesaclc_link_args, > + ) > +-- > +2.25.1 > + > diff --git a/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch > new file mode 100644 > index 0000000000..c19ba7d2b7 > --- /dev/null > +++ b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch > @@ -0,0 +1,86 @@ > +From fa2c045e04370beb454951c32bccc087638e04c7 Mon Sep 17 00:00:00 2001 > +From: Antoine Coutant > +Date: Thu, 30 Nov 2023 11:10:20 +0100 > +Subject: [PATCH 3/3] clc: retrieve libclang path at runtime. > + > +LLVM_LIB_DIR is a variable used for runtime compilations. > +When cross compiling, LLVM_LIB_DIR must be set to the > +libclang path on the target. So, this path should not > +be retrieved during compilation but at runtime. > + > +dladdr uses an address to search for a loaded library. > +If a library is found, it returns information about it. > +The path to the libclang library can therefore be > +retrieved using one of its functions. This is useful > +because we don't know the name of the libclang library > +(libclang.so.X or libclang-cpp.so.X) > + > +v2 (Karol): use clang::CompilerInvocation::CreateFromArgs for dladdr > +v3 (Karol): follow symlinks to fix errors on debian > + > +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") > +Signed-off-by: Antoine Coutant > +Reviewed-by: Karol Herbst > +Reviewed-by (v1): Jesse Natalie > +[antoine.coutant at smile.fr: backported to mesa-23.3.4] > + > +Part-of: > +--- > + src/compiler/clc/clc_helpers.cpp | 24 +++++++++++++++++++++--- > + 1 file changed, 21 insertions(+), 3 deletions(-) > + > +diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp > +index 55287f22683..22eb3495be9 100644 > +--- a/src/compiler/clc/clc_helpers.cpp > ++++ b/src/compiler/clc/clc_helpers.cpp > +@@ -23,6 +23,7 @@ > + // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + // OTHER DEALINGS IN THE SOFTWARE. > + > ++#include > + #include > + #include > + #include > +@@ -57,6 +58,10 @@ > + > + #include "spirv.h" > + > ++#if DETECT_OS_UNIX > ++#include > ++#endif > ++ > + #ifdef USE_STATIC_OPENCL_C_H > + #if LLVM_VERSION_MAJOR < 15 > + #include "opencl-c.h.h" > +@@ -876,12 +881,25 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx, > + #endif > + } > + #else > ++ > ++ Dl_info info; > ++ if (dladdr((void *)clang::CompilerInvocation::CreateFromArgs, &info) == 0) { > ++ clc_error(logger, "Couldn't find libclang path.\n"); > ++ return {}; > ++ } > ++ > ++ char *clang_path = realpath(info.dli_fname, NULL); > ++ if (clang_path == nullptr) { > ++ clc_error(logger, "Couldn't find libclang path.\n"); > ++ return {}; > ++ } > ++ > + // GetResourcePath is a way to retrive the actual libclang resource dir based on a given binary > +- // or library. The path doesn't even need to exist, we just have to put something in there, > +- // because we might have linked clang statically. > ++ // or library. > + auto libclang_path = fs::path(LLVM_LIB_DIR) / "libclang.so"; > + auto clang_res_path = > +- fs::path(Driver::GetResourcesPath(libclang_path.string(), CLANG_RESOURCE_DIR)) / "include"; > ++ fs::path(Driver::GetResourcesPath(std::string(clang_path), CLANG_RESOURCE_DIR)) / "include"; > ++ free(clang_path); > + > + c->getHeaderSearchOpts().UseBuiltinIncludes = true; > + c->getHeaderSearchOpts().UseStandardSystemIncludes = true; > +-- > +2.25.1 > + > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 7 19:13:48 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 20:13:48 +0100 Subject: [Buildroot] [git commit] package/petitboot: minor makefile cleanup Message-ID: <20240207191413.2325C876A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de86cac61bb2cbe875707990e49e80eccdba2796 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Normalize the order of arguments to $(INSTALL). Remove an unnecessary pair of parentheses. Signed-off-by: Reza Arbab Signed-off-by: Yann E. MORIN --- package/petitboot/petitboot.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 2087f01b09..4c8bc35adb 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -63,15 +63,15 @@ define PETITBOOT_POST_INSTALL $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb - $(INSTALL) -m 0755 -D $(PETITBOOT_PKGDIR)/S15pb-discover \ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ $(TARGET_DIR)/etc/init.d/S15pb-discover $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-console \ $(TARGET_DIR)/etc/init.d/pb-console mkdir -p $(TARGET_DIR)/etc/udev/rules.d - (for port in $(PETITBOOT_GETTY_PORT); do \ + for port in $(PETITBOOT_GETTY_PORT); do \ printf 'SUBSYSTEM=="tty", KERNEL=="%s", RUN+="/etc/init.d/pb-console start $$name"\n' "$$port"; \ - done) > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules + done > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules mkdir -p $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ ln -sf /usr/sbin/pb-udhcpc \ From yann.morin.1998 at free.fr Wed Feb 7 19:14:16 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 20:14:16 +0100 Subject: [Buildroot] [PATCH v5 1/5] package/petitboot: minor makefile cleanup In-Reply-To: <20240207175135.1532037-2-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> <20240207175135.1532037-2-arbab@linux.ibm.com> Message-ID: Reza, All, On 2024-02-07 11:51 -0600, Reza Arbab spake thusly: > Normalize the order of arguments to $(INSTALL). Remove an unnecessary > pair of parentheses. > > Signed-off-by: Reza Arbab Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/petitboot/petitboot.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk > index 2087f01b090c..4c8bc35adb38 100644 > --- a/package/petitboot/petitboot.mk > +++ b/package/petitboot/petitboot.mk > @@ -63,15 +63,15 @@ define PETITBOOT_POST_INSTALL > $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb > $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ > $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb > - $(INSTALL) -m 0755 -D $(PETITBOOT_PKGDIR)/S15pb-discover \ > + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ > $(TARGET_DIR)/etc/init.d/S15pb-discover > $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-console \ > $(TARGET_DIR)/etc/init.d/pb-console > > mkdir -p $(TARGET_DIR)/etc/udev/rules.d > - (for port in $(PETITBOOT_GETTY_PORT); do \ > + for port in $(PETITBOOT_GETTY_PORT); do \ > printf 'SUBSYSTEM=="tty", KERNEL=="%s", RUN+="/etc/init.d/pb-console start $$name"\n' "$$port"; \ > - done) > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules > + done > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules > > mkdir -p $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ > ln -sf /usr/sbin/pb-udhcpc \ > -- > 2.39.3 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas at devoogdt.com Wed Feb 7 19:15:04 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 7 Feb 2024 20:15:04 +0100 Subject: [Buildroot] [PATCH v8 1/2] package/cairo: move to the meson build system In-Reply-To: <87le7wz1tv.fsf@48ers.dk> References: <20240205212300.3178519-2-thomas@devoogdt.com> <20240205213035.3180167-1-thomas@devoogdt.com> <87le7wz1tv.fsf@48ers.dk> Message-ID: Hi Peter, I compiled cairo with the same config, once with autotools (current master), and once with the meson patch. Compile with autotools-package: CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x cairo (version 1.17.4 [snapshot]) will be compiled with: The following surface backends: ... Xlib: yes Xlib Xrender: no (disabled, use --enable-xlib-xrender to enable) XCB: yes The following functions: ... X11-xcb functions: no (disabled, use --enable-xlib-xcb to enable) XCB-shm functions: yes Compile with meson-package: CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled cairo 1.17.4 Surface Backends ... Xlib : YES Xlib Xrender : YES XCB : YES Functions ... X11-xcb : YES XCB-shm : YES So it seems that autotools just didn't compile xrender support, while meson does require it. See https://gitlab.freedesktop.org/cairo/cairo/-/blame/1.17.4/meson.build#L277. So it seems that the git commit message should be adapted slightly. Kr, Thomas Op wo 7 feb 2024 om 17:17 schreef Peter Korsgaard : > > >>>>> "Thomas" == Thomas Devoogdt writes: > > > - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy > > since they are not selectable anymore in the meson-build options. > > BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. > > > - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG > > option already selects that one. This is now in sync with the > > meson build options. > > > - Note that the dependencies for the various options are slightly changed, > > but there is not much mentioned about that, the meson introduction is done > > in one big commit: [1]. > > > - Added xlib_libXrender dependency, which was already required > > before meson, it just came to my attention since it's a hard > > error now. > > In what configuration do you see that? I just did a test with current > master (commit 6008f2b1b901b) and the following defconfig without > issues: > > BR2_arm=y > BR2_cortex_a9=y > BR2_ARM_ENABLE_VFP=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_INIT_NONE=y > BR2_SYSTEM_BIN_SH_NONE=y > # BR2_PACKAGE_BUSYBOX is not set > BR2_PACKAGE_XORG7=y > BR2_PACKAGE_CAIRO=y > # BR2_TARGET_ROOTFS_TAR is not set > > -- > Bye, Peter Korsgaard > From thomas.petazzoni at bootlin.com Wed Feb 7 19:22:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:22:25 +0100 Subject: [Buildroot] [PATCH v2 1/1] utils/scanpypi: refactor setuptools handling to not use imp In-Reply-To: <20231130212153.2299051-1-james.hilliard1@gmail.com> References: <20231130212153.2299051-1-james.hilliard1@gmail.com> Message-ID: <20240207202225.1755a09b@windsurf> Hello James, On Thu, 30 Nov 2023 14:21:53 -0700 James Hilliard wrote: > The imp module is deprecated as of python verison 3.12. > > Refactor setuptools handling to remove monkeypatching hack and > instead do pep517 metadata generation and dependency resolution. How does it work without monkeypatching? Why was monkeypatching needed before and no longer needed now? > Invert setuptools/pyproject fallback ordering so that we try > parsing pyproject.toml files first. What is the motivation for this particular change (inverting the order between setuptools and pyproject)? Also, this patch should be split into several ones, as you're really doing several independent things, as far as I can see. > diff --git a/utils/scanpypi b/utils/scanpypi > index 021c99a172..9de1b5d402 100755 > --- a/utils/scanpypi > +++ b/utils/scanpypi > @@ -18,8 +18,8 @@ import hashlib > import re > import textwrap > import tempfile > -import imp > -from functools import wraps > +import importlib > +from setuptools.build_meta import prepare_metadata_for_build_wheel This is part of the "don't use imp / remove monkeypatching" thing if I understand correctly. > import six.moves.urllib.request > import six.moves.urllib.error > import six.moves.urllib.parse > @@ -93,32 +93,6 @@ def toml_load(f): > raise ex > > > -def setup_decorator(func, method): > - """ > - Decorator for distutils.core.setup and setuptools.setup. > - Puts the arguments with which setup is called as a dict > - Add key 'method' which should be either 'setuptools' or 'distutils'. > - > - Keyword arguments: > - func -- either setuptools.setup or distutils.core.setup > - method -- either 'setuptools' or 'distutils' > - """ > - > - @wraps(func) > - def closure(*args, **kwargs): > - # Any python packages calls its setup function to be installed. > - # Argument 'name' of this setup function is the package's name > - BuildrootPackage.setup_args[kwargs['name']] = kwargs > - BuildrootPackage.setup_args[kwargs['name']]['method'] = method > - return closure > - > -# monkey patch > -import setuptools # noqa E402 > -setuptools.setup = setup_decorator(setuptools.setup, 'setuptools') > -import distutils # noqa E402 > -distutils.core.setup = setup_decorator(setuptools.setup, 'distutils') This is part of the "don't use imp / remove monkeypatching" thing if I understand correctly. > def find_file_upper_case(filenames, path='./'): > """ > List generator: > @@ -345,26 +319,18 @@ class BuildrootPackage(): > """ > current_dir = os.getcwd() > os.chdir(self.tmp_extract) > - sys.path.insert(0, self.tmp_extract) Not sure to what this is related? The monkeypatching as well? The use of imp? > try: > - s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) > - imp.load_module('__main__', s_file, s_path, s_desc) > - if self.metadata_name in self.setup_args: > - pass > - elif self.metadata_name.replace('_', '-') in self.setup_args: > - self.metadata_name = self.metadata_name.replace('_', '-') > - elif self.metadata_name.replace('-', '_') in self.setup_args: > - self.metadata_name = self.metadata_name.replace('-', '_') > + metadata = prepare_metadata_for_build_wheel(self.tmp_extract) > try: > - self.setup_metadata = self.setup_args[self.metadata_name] > - except KeyError: > - # This means setup was not called > - print('ERROR: Could not determine package metadata for {pkg}.\n' > - .format(pkg=self.real_name)) > - raise > + dist = importlib.metadata.Distribution.at(metadata) > + self.metadata_name = dist.name > + self.setup_metadata = {'method': 'setuptools'} > + if dist.requires: > + self.setup_metadata['install_requires'] = dist.requires > + finally: > + shutil.rmtree(metadata) This is part of the "don't use imp / remove monkeypatching" thing if I understand correctly. > finally: > os.chdir(current_dir) > - sys.path.remove(self.tmp_extract) > > def load_pyproject(self): > """ > @@ -372,7 +338,6 @@ class BuildrootPackage(): > """ > current_dir = os.getcwd() > os.chdir(self.tmp_extract) > - sys.path.insert(0, self.tmp_extract) > try: > pyproject_data = toml_load('pyproject.toml') > try: > @@ -380,20 +345,25 @@ class BuildrootPackage(): > self.metadata_name = self.setup_metadata.get('name', self.real_name) > build_system = pyproject_data.get('build-system', {}) > build_backend = build_system.get('build-backend', None) > - if build_backend and build_backend == 'flit_core.buildapi': > - self.setup_metadata['method'] = 'flit' > + if build_backend: > + if build_backend == 'flit_core.buildapi': > + self.setup_metadata['method'] = 'flit' > + elif build_backend == 'setuptools.build_meta': > + raise Exception("handle setuptools") > + else: > + self.setup_metadata['method'] = 'unknown' This seems more related to PEP517 handling improvements? > elif build_system.get('backend-path', None): > self.setup_metadata['method'] = 'pep517' > else: > - self.setup_metadata['method'] = 'unknown' > + raise Exception("handle setuptools") So we don't support setuptools as a PEP517 backend? I guess it was already the case before your patch? > except KeyError: > print('ERROR: Could not determine package metadata for {pkg}.\n' > .format(pkg=self.real_name)) > raise > except FileNotFoundError: > raise > - os.chdir(current_dir) > - sys.path.remove(self.tmp_extract) Related to what? > + finally: > + os.chdir(current_dir) > > def get_requirements(self, pkg_folder): > """ > @@ -778,15 +748,15 @@ def main(): > > # Loading the package install info from the package > try: > - package.load_setup() > - except ImportError as err: > - if 'buildutils' in str(err): > - print('This package needs buildutils') > - continue > - else: > - try: > - package.load_pyproject() > - except Exception: > + package.load_pyproject() > + except Exception: > + try: > + package.load_setup() > + except ImportError as err: > + if 'buildutils' in str(err): > + print('This package needs buildutils') > + continue > + else: This is a separate change, about the ordering between .load_setup() and .load_pyproject(). Could you split this useful patch into smaller chunks, with a better justification for each chunk? Believe me, if you do this, patches like this will be merged, much, much, much faster. Thanks a lot for your contribution! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas at devoogdt.com Wed Feb 7 19:31:22 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 7 Feb 2024 20:31:22 +0100 Subject: [Buildroot] [PATCH v9 1/2] package/cairo: move to the meson build system In-Reply-To: References: Message-ID: <20240207193123.3400214-1-thomas@devoogdt.com> - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy since they are not selectable anymore in the meson-build options. BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG option already selects that one. This is now in sync with the meson build options. - Note that the dependencies for the various options are slightly changed, but there is not much mentioned about that, the meson introduction is done in one big commit: [1]. - Added xlib_libXrender dependency, which was optional when using autotools (--enable-xlib-xrender), but became mandatory when using meson [2]. - Added two patches to fix cross compiling, upstream: [3] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/596a82f2d185b101bd74645492821fe2f9e0daa0 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/blame/1.17.4/meson.build#L277 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 Signed-off-by: Thomas Devoogdt --- v2: added -std=gnu11 (allow inline int declaration in if loop, 99 caused some directives problems) v3: enabled host-zlib, needed for librsvg v4: also added gnu11 for host-cairo compiling (fixes my compilation on a gcc 4.9.2 based system) v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v6: fix host-zlib option (again) v7: reworked patch by moving the old config options to legacy and by restoring their original order v9: update git message wrt xlib_libXrender + made ipc_rmid_deferred_release false again by default --- Config.in.legacy | 35 ++++ ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 +++++++ ...p-IPC_RMID_DEFERRED_RELEASE-check-wh.patch | 42 +++++ package/cairo/Config.in | 28 +-- package/cairo/cairo.mk | 160 +++++------------- package/libgtk2/Config.in | 5 +- package/libgtk3/Config.in | 5 +- package/librsvg/Config.in | 2 +- package/libsvg-cairo/Config.in | 2 +- package/rrdtool/Config.in | 4 +- 10 files changed, 195 insertions(+), 150 deletions(-) create mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch create mode 100644 package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/Config.in.legacy b/Config.in.legacy index 82387338d9..431552afe7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,41 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_CAIRO_SVG + bool "cairo svg support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_PNG + help + Cairo SVG is compiled together with PNG, so no need to have this config. + +config BR2_PACKAGE_CAIRO_SCRIPT + bool "cairo script support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo script got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PS + bool "cairo postscript support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PS got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PDF + bool "cairo pdf support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PDF got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_XML + bool "cairo xml support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo XML got merged in to cairo zlib with the introduction of meson. + config BR2_KERNEL_HEADERS_4_14 bool "kernel headers version 4.14.x are no longer supported" select BR2_LEGACY diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch new file mode 100644 index 0000000000..193a210391 --- /dev/null +++ b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch @@ -0,0 +1,62 @@ +From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +Date: Thu, 25 Feb 2021 10:52:45 +0000 +Subject: [PATCH] meson: allow skipping of run check for + IPC_RMID_DEFERRED_RELEASE + +The run check is particularly annoying in cross-compile scenarios, +so allow bypassing the check by having the user provide the value +via a cross file or native file: + + [properties] + ipc_rmid_deferred_release = true + +Closes #408 + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index b159b4071..5f593e54d 100644 +--- a/meson.build ++++ b/meson.build +@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() + ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], + ] + deps += [x11_dep, xext_dep] +- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), +- dependencies: [x11_dep, xext_dep], +- name: 'shmctl IPC_RMID allowes subsequent attaches') + +- if res.returncode() == 0 +- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) ++ # Can skip the run check by providing the result in a cross file or ++ # native file as bool property value. ++ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ # We don't know the type of prop (bool, string) but need to differentiate ++ # between a set value (bool) or the fallback value (string), so convert to ++ # a string and chec the string value. ++ prop_str = '@0@'.format(prop) ++ if prop_str in ['true', 'false'] ++ ipc_rmid_deferred_release = (prop_str == 'true') ++ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) ++ elif prop_str == 'auto' ++ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), ++ dependencies: [x11_dep, xext_dep], ++ name: 'shmctl IPC_RMID allowes subsequent attaches') ++ ++ ipc_rmid_deferred_release = (res.returncode() == 0) ++ else ++ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) + endif ++ ++ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) + endif + + if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 +-- +2.34.1 + diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch new file mode 100644 index 0000000000..157508b704 --- /dev/null +++ b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch @@ -0,0 +1,42 @@ +From 8d5037ed642b02cdb018e49866aa286f30a7b59a Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 5 Feb 2024 17:47:07 +0100 +Subject: [PATCH] meson: always skip IPC_RMID_DEFERRED_RELEASE check when + cross-compiling + +../../br-test-pkg/bootlin-armv5-uclibc/build/cairo-1.17.4/meson.build:279:13: +ERROR: Can not run test applications in this cross environment. + +Commit 1bec56ea8a931e1ae1c74cc740134497ec365267 added support to define +ipc_rmid_deferred_release in a cross-compile config, but still kept +the default to auto, which anyhow results in an error when cross-compiling. + +There is only one usage of the ipc_rmid_deferred_release compile declarative +which was originally added in this commit: 5041b462d084de8552336275914d30c23bf5dd35. + +If ipc_rmid_deferred_release is set to FALSE, an additional XSync is performed. +This doesn't sound very harmful, so that is why this commit defaults to FALSE +and thus avoids any cross-compile errors. + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9efe91978..6a670bf94 100644 +--- a/meson.build ++++ b/meson.build +@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found() + + # Can skip the run check by providing the result in a cross file or + # native file as bool property value. +- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'false' : 'auto') + # We don't know the type of prop (bool, string) but need to differentiate + # between a set value (bool) or the fallback value (string), so convert to + # a string and check the string value. +-- +2.34.1 + diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 0c87a2904b..c41a12fe81 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_CAIRO select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7 help Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include @@ -15,34 +16,15 @@ config BR2_PACKAGE_CAIRO if BR2_PACKAGE_CAIRO -config BR2_PACKAGE_CAIRO_PS - bool "postscript support" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_CAIRO_PDF - -config BR2_PACKAGE_CAIRO_PDF - bool "pdf support" - select BR2_PACKAGE_ZLIB - config BR2_PACKAGE_CAIRO_PNG - bool "png support" + bool "png support (png and svg surfaces)" select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_ZLIB - -config BR2_PACKAGE_CAIRO_SCRIPT - bool "script support" - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_CAIRO_SVG - bool "svg support" - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PDF config BR2_PACKAGE_CAIRO_TEE bool "tee support" -config BR2_PACKAGE_CAIRO_XML - bool "xml support" - select BR2_PACKAGE_CAIRO_PNG +config BR2_PACKAGE_CAIRO_ZLIB + bool "zlib support (script, ps, pdf, and xml surfaces)" + select BR2_PACKAGE_ZLIB endif diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 4515b76075..3d2a67a6c5 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -17,168 +17,96 @@ CAIRO_IGNORE_CVES += CVE-2019-6462 # 0002-Fix-mask-usage-in-image-compositor.patch CAIRO_IGNORE_CVES += CVE-2020-35492 -CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" +CAIRO_CFLAGS = $(TARGET_CFLAGS) +CAIRO_LDFLAGS = $(TARGET_LDFLAGS) # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) -CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" +CAIRO_CFLAGS += -mxgot endif # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CAIRO_LIBS += -latomic +CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no - -CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman + -Dfontconfig=enabled \ + -Dtests=disabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 +CAIRO_DEPENDENCIES = \ + host-pkgconf \ + fontconfig \ + pixman # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no \ - --disable-directfb \ - --enable-ft \ - --enable-gobject \ - --disable-glesv2 \ - --disable-vg \ - --disable-xlib \ - --disable-xcb \ - --without-x \ - --disable-xlib-xrender \ - --disable-ps \ - --disable-pdf \ - --enable-png \ - --enable-script \ - --disable-svg \ - --disable-tee \ - --disable-xml + -Dfontconfig=enabled \ + -Dfreetype=enabled \ + -Dpng=enabled \ + -Dtee=disabled \ + -Dxcb=disabled \ + -Dxlib=disabled \ + -Dzlib=enabled \ + -Dtests=disabled \ + -Dglib=enabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ host-fontconfig \ host-libglib2 \ host-libpng \ host-pixman \ - host-pkgconf + host-pkgconf \ + host-zlib -# DirectFB svg support rely on Cairo and Cairo DirectFB support depends on -# DirectFB. Break circular dependency by disabling DirectFB support in Cairo -# (which is experimental) -ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx) -CAIRO_CONF_OPTS += --enable-directfb -CAIRO_DEPENDENCIES += directfb -else -CAIRO_CONF_OPTS += --disable-directfb +ifeq ($(BR2_PACKAGE_LZO),y) +CAIRO_DEPENDENCIES += lzo endif ifeq ($(BR2_PACKAGE_FREETYPE),y) -CAIRO_CONF_OPTS += --enable-ft +CAIRO_CONF_OPTS += -Dfreetype=enabled CAIRO_DEPENDENCIES += freetype else -CAIRO_CONF_OPTS += --disable-ft -endif - -ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) -CAIRO_DEPENDENCIES += libexecinfo -CAIRO_LIBS += -lexecinfo +CAIRO_CONF_OPTS += -Dfreetype=disabled endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -CAIRO_CONF_OPTS += --enable-gobject +CAIRO_CONF_OPTS += -Dglib=enabled CAIRO_DEPENDENCIES += libglib2 else -CAIRO_CONF_OPTS += --disable-gobject -endif - -# Can use GL or GLESv2 but not both -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -CAIRO_CONF_OPTS += --enable-gl --disable-glesv2 -CAIRO_DEPENDENCIES += libgl -else -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -CAIRO_CONF_OPTS += --disable-gl --enable-glesv2 -CAIRO_DEPENDENCIES += libgles -else -CAIRO_CONF_OPTS += --disable-gl --disable-glesv2 -endif -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -CAIRO_CONF_OPTS += --enable-vg -CAIRO_DEPENDENCIES += libopenvg -else -CAIRO_CONF_OPTS += --disable-vg -endif - -ifeq ($(BR2_PACKAGE_LZO),y) -CAIRO_DEPENDENCIES += lzo +CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x -CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext -else -CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -CAIRO_CONF_OPTS += --enable-xlib-xrender -CAIRO_DEPENDENCIES += xlib_libXrender -else -CAIRO_CONF_OPTS += --disable-xlib-xrender -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PS),y) -CAIRO_CONF_OPTS += --enable-ps -CAIRO_DEPENDENCIES += zlib +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += --disable-ps -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PDF),y) -CAIRO_CONF_OPTS += --enable-pdf -CAIRO_DEPENDENCIES += zlib -else -CAIRO_CONF_OPTS += --disable-pdf +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -CAIRO_CONF_OPTS += --enable-png +CAIRO_CONF_OPTS += -Dpng=enabled CAIRO_DEPENDENCIES += libpng else -CAIRO_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y) -CAIRO_CONF_OPTS += --enable-script -else -CAIRO_CONF_OPTS += --disable-script -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SVG),y) -CAIRO_CONF_OPTS += --enable-svg -else -CAIRO_CONF_OPTS += --disable-svg +CAIRO_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_TEE),y) -CAIRO_CONF_OPTS += --enable-tee +CAIRO_CONF_OPTS += -Dtee=enabled else -CAIRO_CONF_OPTS += --disable-tee +CAIRO_CONF_OPTS += -Dtee=disabled endif -ifeq ($(BR2_PACKAGE_CAIRO_XML),y) -CAIRO_CONF_OPTS += --enable-xml +ifeq ($(BR2_PACKAGE_CAIRO_ZLIB),y) +CAIRO_CONF_OPTS += -Dzlib=enabled +CAIRO_DEPENDENCIES += zlib else -CAIRO_CONF_OPTS += --disable-xml +CAIRO_CONF_OPTS += -Dzlib=disabled endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index f2888b2f51..f8821ba246 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -9,9 +9,8 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO select BR2_PACKAGE_GDK_PIXBUF diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 34b8d49eb3..9f9a081ecb 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -25,9 +25,8 @@ config BR2_PACKAGE_LIBGTK3 BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 270b524b37..d74359dfc9 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_SCRIPT + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_HOST_RUSTC select BR2_PACKAGE_LIBGLIB2 diff --git a/package/libsvg-cairo/Config.in b/package/libsvg-cairo/Config.in index 9577c69bf0..4602e93c2a 100644 --- a/package/libsvg-cairo/Config.in +++ b/package/libsvg-cairo/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBSVG_CAIRO bool "libsvg-cairo" select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBSVG help Libsvg-cairo provides the ability to render SVG content from diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in index 5ffdc92618..d954fd1214 100644 --- a/package/rrdtool/Config.in +++ b/package/rrdtool/Config.in @@ -19,10 +19,8 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PDF select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_PANGO help This enables the graphing capabilities ('rrdgraph'). -- 2.34.1 From thomas at devoogdt.com Wed Feb 7 19:31:23 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 7 Feb 2024 20:31:23 +0100 Subject: [Buildroot] [PATCH v9 2/2] package/cairo: bump to 1.18.0 In-Reply-To: <20240207193123.3400214-1-thomas@devoogdt.com> References: <20240207193123.3400214-1-thomas@devoogdt.com> Message-ID: <20240207193123.3400214-2-thomas@devoogdt.com> News: - https://www.cairographics.org/news/cairo-1.17.8/ - https://www.cairographics.org/news/cairo-1.18.0/ Some options are renamed/dropped so fix that along. - GL and GLES drawing has been dropped in 1.17.8. - The XML surface has been removed in 1.18.0. - xlib-xcb was added [1] Patches: - drop 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch, upstream: [2] - drop 0002-Fix-mask-usage-in-image-compositor.patch, upstream: [3] - drop 0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch, upstream: [4] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/3468c67fe91f0c37e0ec5d335082653a6fa609b6 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be [4]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 Signed-off-by: Thomas Devoogdt --- v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v7: rebased on v7-0001-package-cairo-move-to-the-meson-build-system v8: forgot .checkpackageignore v9: n/a --- .checkpackageignore | 2 - ...or_tolerance_normalized-fix-infinite.patch | 39 ------------ ...rivate.h-fix-missing-FT_Color-error.patch} | 0 ...2-Fix-mask-usage-in-image-compositor.patch | 56 ----------------- ...-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} | 0 ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 ------------------- package/cairo/cairo.hash | 6 +- package/cairo/cairo.mk | 21 ++++--- 8 files changed, 14 insertions(+), 172 deletions(-) delete mode 100644 package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch rename package/cairo/{0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch => 0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch} (100%) delete mode 100644 package/cairo/0002-Fix-mask-usage-in-image-compositor.patch rename package/cairo/{0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch => 0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} (100%) delete mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch diff --git a/.checkpackageignore b/.checkpackageignore index 348cf3d289..86a774139a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -227,8 +227,6 @@ package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch Upstrea package/c-icap/S96cicap Indent Shellcheck Variables package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch Upstream package/cache-calibrator/0001-Fix-conflicting-round-function.patch Upstream -package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream -package/cairo/0002-Fix-mask-usage-in-image-compositor.patch Upstream package/caps/0001-Fix-stdint-types-with-musl.patch Upstream package/cdrkit/0001-no-rcmd.patch Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch Upstream diff --git a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch deleted file mode 100644 index 078e90fa42..0000000000 --- a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Sun, 1 Aug 2021 11:16:03 +0000 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - -[Retrieved from: -https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] -Signed-off-by: Quentin Schulz ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -2.38.1 - diff --git a/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch b/package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch similarity index 100% rename from package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch rename to package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch diff --git a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch deleted file mode 100644 index 54a95593c5..0000000000 --- a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - -[Retrieved from -https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be] -[Removed changes in test/ directory to remove binary diff so that the -patch can be applied by `patch` tool] -Signed-off-by: Quentin Schulz ---- - src/cairo-image-compositor.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index bbf4cf228..2352c478e 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - unsigned num_spans) - { - cairo_image_span_renderer_t *r = abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); - int x0; - - if (num_spans == 0) - return CAIRO_STATUS_SUCCESS; - - x0 = spans[0].x; -- m = r->_buf; -+ m = base; - do { - int len = spans[1].x - spans[0].x; - if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { -@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - spans[0].x, y, - spans[1].x - spans[0].x, h); - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else if (spans[0].coverage == 0x0) { - if (spans[0].x != x0) { -@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - #endif - } - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else { - *m++ = spans[0].coverage; --- -2.38.1 - diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch similarity index 100% rename from package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch rename to package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch deleted file mode 100644 index 193a210391..0000000000 --- a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Thu, 25 Feb 2021 10:52:45 +0000 -Subject: [PATCH] meson: allow skipping of run check for - IPC_RMID_DEFERRED_RELEASE - -The run check is particularly annoying in cross-compile scenarios, -so allow bypassing the check by having the user provide the value -via a cross file or native file: - - [properties] - ipc_rmid_deferred_release = true - -Closes #408 - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index b159b4071..5f593e54d 100644 ---- a/meson.build -+++ b/meson.build -@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() - ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], - ] - deps += [x11_dep, xext_dep] -- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -- dependencies: [x11_dep, xext_dep], -- name: 'shmctl IPC_RMID allowes subsequent attaches') - -- if res.returncode() == 0 -- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) -+ # Can skip the run check by providing the result in a cross file or -+ # native file as bool property value. -+ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') -+ # We don't know the type of prop (bool, string) but need to differentiate -+ # between a set value (bool) or the fallback value (string), so convert to -+ # a string and chec the string value. -+ prop_str = '@0@'.format(prop) -+ if prop_str in ['true', 'false'] -+ ipc_rmid_deferred_release = (prop_str == 'true') -+ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) -+ elif prop_str == 'auto' -+ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -+ dependencies: [x11_dep, xext_dep], -+ name: 'shmctl IPC_RMID allowes subsequent attaches') -+ -+ ipc_rmid_deferred_release = (res.returncode() == 0) -+ else -+ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) - endif -+ -+ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) - endif - - if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 --- -2.34.1 - diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index fca9ff678c..df9c693bad 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,7 +1,5 @@ -# From https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz.sha1 -sha1 68712ae1039b114347be3b7200bc1c901d47a636 cairo-1.17.4.tar.xz -# Calculated based on the hash above -sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 cairo-1.17.4.tar.xz +# From https://www.cairographics.org/releases/cairo-1.18.0.tar.xz.sha256sum +sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 cairo-1.18.0.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 3d2a67a6c5..4ace04ebbe 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,19 +4,14 @@ # ################################################################################ -CAIRO_VERSION = 1.17.4 +CAIRO_VERSION = 1.18.0 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics -CAIRO_SITE = http://cairographics.org/snapshots +CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES -# 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch -CAIRO_IGNORE_CVES += CVE-2019-6462 -# 0002-Fix-mask-usage-in-image-compositor.patch -CAIRO_IGNORE_CVES += CVE-2020-35492 - CAIRO_CFLAGS = $(TARGET_CFLAGS) CAIRO_LDFLAGS = $(TARGET_LDFLAGS) @@ -32,9 +27,13 @@ CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ + -Dquartz=disabled \ -Dtests=disabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 CAIRO_DEPENDENCIES = \ host-pkgconf \ @@ -43,9 +42,11 @@ CAIRO_DEPENDENCIES = \ # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ -Dfreetype=enabled \ -Dpng=enabled \ + -Dquartz=disabled \ -Dtee=disabled \ -Dxcb=disabled \ -Dxlib=disabled \ @@ -53,6 +54,8 @@ HOST_CAIRO_CONF_OPTS = \ -Dtests=disabled \ -Dglib=enabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ @@ -82,10 +85,10 @@ CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled -Dxlib-xcb=enabled CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled -Dxlib-xcb=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -- 2.34.1 From ju.o at free.fr Wed Feb 7 19:42:33 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 7 Feb 2024 20:42:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnupg2: security bump to version 2.4.4 Message-ID: <20240207194233.590328-1-ju.o@free.fr> See release announce: https://lists.gnupg.org/pipermail/gnupg-announce/2024q1/000481.html For the details about the security advisory for GnuPG created smartcard keys, see: https://gnupg.org/blog/20240125-smartcard-backup-key.html This commit also drops the package patch, which is now included in this new version. Signed-off-by: Julien Olivain --- ...he-call-of-ks_ldap_help_variables-wh.patch | 36 ------------------- package/gnupg2/gnupg2.hash | 4 +-- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch diff --git a/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch b/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch deleted file mode 100644 index 53dd39cf47..0000000000 --- a/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch +++ /dev/null @@ -1,36 +0,0 @@ -From dc13361524c1477b2106c7385f2059f9ea111b84 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Wed, 5 Jul 2023 09:29:54 +0900 -Subject: [PATCH] dirmngr: Enable the call of ks_ldap_help_variables when - USE_LDAP. - -* dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize. - --- - -Signed-off-by: NIIBE Yutaka - -Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=dc13361524c1477b2106c7385f2059f9ea111b84 - -Signed-off-by: Bernd Kuhls ---- - dirmngr/server.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dirmngr/server.c b/dirmngr/server.c -index 51a149cb2..ee61f63d6 100644 ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line) - - if (opt_help) - { -+#if USE_LDAP - ks_ldap_help_variables (ctrl); -+#endif - err = 0; - goto leave; - } --- -2.11.0 - diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index 4b770fa520..c821afb55e 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 79a60c8e415e3daaa33d0546398174252a56f7ac gnupg-2.4.3.tar.bz2 -sha256 a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d gnupg-2.4.3.tar.bz2 +sha1 228b3984325fdeebc5e3f2d165c6419a5ebc28de gnupg-2.4.4.tar.bz2 +sha256 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 gnupg-2.4.4.tar.bz2 # Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index d21c1e242d..986da4790c 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.3 +GNUPG2_VERSION = 2.4.4 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ -- 2.43.0 From yann.morin.1998 at free.fr Wed Feb 7 19:41:36 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 20:41:36 +0100 Subject: [Buildroot] [git commit] package/petitboot: prefer UTF-8 support Message-ID: <20240207194320.4A6F7876AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=026338f66bdb2d9436898bd968a3f22995851b92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The petitboot UI looks much nicer in a Unicode locale: * Items in the language selection submenu use multibyte Unicode characters. In other locales, they say "Unable to display text in this locale". * The combination of TERM=linux with a UTF-8 locale is required to trigger a special-case workaround in ncurses code[1]. Without this, line-drawing characters in the menu look like q's. Turn on wchar support in ncurses, and add a reminder that a UTF-8 locale should be generated for things to look right. [1] https://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing Signed-off-by: Reza Arbab Signed-off-by: Yann E. MORIN --- package/petitboot/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 6a3d476b11..533c7a9f29 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_PETITBOOT select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LVM2 # devmapper select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR # run-time dependencies select BR2_PACKAGE_KEXEC if !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS select BR2_PACKAGE_KEXEC_LITE if BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC @@ -18,6 +19,9 @@ config BR2_PACKAGE_PETITBOOT help Petitboot is a small kexec-based bootloader + NOTE: petitboot looks best in a UTF-8 locale; be sure there + is one listed in BR2_GENERATE_LOCALE. + http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html if BR2_PACKAGE_PETITBOOT From thomas.petazzoni at bootlin.com Wed Feb 7 19:43:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:43:37 +0100 Subject: [Buildroot] [PATCH 1/1] configs/rzboard_v2L_defconfig: new defconfig In-Reply-To: <20231130223101.132221-1-kilian.zinnecker@mail.de> References: <20231130223101.132221-1-kilian.zinnecker@mail.de> Message-ID: <20240207204337.561d3b54@windsurf> Hello, On Thu, 30 Nov 2023 23:31:01 +0100 "kilian.zinnecker--- via buildroot" wrote: > From: Kilian Zinnecker > > This patch adds support for the AVNET RZBoard V2L. > > The board support creates a bootable sd card image. The board is > shipped with a u-boot inside its eMMC. The board support uses this > u-boot and does not build and deploy a u-boot onto the sd card. > Instead the sd card only contains a uEnv.txt, a kernel image and > the rootfs. > > Signed-off-by: Kilian Zinnecker Thanks, I have applied to master, after renaming to avnet_rzboard_v2l_defconfig, and taking into account the feedback from Giulio. However, I find it not so nice that we don't build a fully bootable image that includes U-Boot. Could you work on this and submit a follow-up patch? There is a DIP switch on the board that allows to boot from SD, see page 15 of the board hardware manual; Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 7 19:43:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 20:43:33 +0100 Subject: [Buildroot] [PATCH v5 2/5] package/petitboot: prefer UTF-8 support In-Reply-To: <20240207175135.1532037-3-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> <20240207175135.1532037-3-arbab@linux.ibm.com> Message-ID: Reza, All, On 2024-02-07 11:51 -0600, Reza Arbab spake thusly: > The petitboot UI looks much nicer in a Unicode locale: > > * Items in the language selection submenu use multibyte Unicode > characters. In other locales, they say "Unable to display text in this > locale". > > * The combination of TERM=linux with a UTF-8 locale is required to > trigger a special-case workaround in ncurses code[1]. Without > this, line-drawing characters in the menu look like q's. > > Turn on wchar support in ncurses, and add a reminder that a UTF-8 locale > should be generated for things to look right. > > [1] https://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing > > Signed-off-by: Reza Arbab > --- > package/petitboot/Config.in | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in > index 6a3d476b11b3..4f3b1c1ea4d1 100644 > --- a/package/petitboot/Config.in > +++ b/package/petitboot/Config.in > @@ -10,6 +10,7 @@ config BR2_PACKAGE_PETITBOOT > select BR2_PACKAGE_ELFUTILS > select BR2_PACKAGE_LVM2 # devmapper > select BR2_PACKAGE_NCURSES > + select BR2_PACKAGE_NCURSES_WCHAR > # run-time dependencies > select BR2_PACKAGE_KEXEC if !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS > select BR2_PACKAGE_KEXEC_LITE if BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC > @@ -18,6 +19,8 @@ config BR2_PACKAGE_PETITBOOT > help > Petitboot is a small kexec-based bootloader > > + NOTE: petitboot looks best in a UTF-8 locale (BR2_GENERATE_LOCALE) $ ./utils/docker-run make check-package package/petitboot/Config.in:22: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) I slightly reworded that sentence to better fit. Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html > > if BR2_PACKAGE_PETITBOOT > -- > 2.39.3 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ju.o at free.fr Wed Feb 7 19:44:28 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 7 Feb 2024 20:44:28 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: gnupg2: increase a timeout Message-ID: <20240207194428.591147-1-ju.o@free.fr> The symmetric encryption test can sometimes take longer than the default timeout. This commit increase the timeout to 10 seconds for that command. Signed-off-by: Julien Olivain --- support/testing/tests/package/test_gnupg2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_gnupg2.py b/support/testing/tests/package/test_gnupg2.py index 4505e1c339..2b18f54fa3 100644 --- a/support/testing/tests/package/test_gnupg2.py +++ b/support/testing/tests/package/test_gnupg2.py @@ -37,7 +37,7 @@ class TestGnupg2(infra.basetest.BRTest): # Test symmetric encrypt cmd = "gpg --batch --symmetric" cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=10) # Test symmetric decrypt cmd = "gpg --batch --decrypt" -- 2.43.0 From thomas.petazzoni at bootlin.com Wed Feb 7 19:46:53 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:46:53 +0100 Subject: [Buildroot] [git commit] configs/avnet_rzboard_v2l: new defconfig Message-ID: <20240207194713.652EC876BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f003675119c9ca503afa19c04074e81c49538baf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds support for the AVNET RZBoard V2L. The board support creates a bootable sd card image. The board is shipped with a u-boot inside its eMMC. The board support uses this u-boot and does not build and deploy a u-boot onto the sd card. Instead the sd card only contains a uEnv.txt, a kernel image and the rootfs. Signed-off-by: Kilian Zinnecker Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + board/avnet/rzboard_v2l/genimage.cfg | 29 ++++++++++++++ board/avnet/rzboard_v2l/post-image.sh | 5 +++ board/avnet/rzboard_v2l/readme.txt | 71 +++++++++++++++++++++++++++++++++++ board/avnet/rzboard_v2l/uEnv.txt | 3 ++ configs/avnet_rzboard_v2l_defconfig | 20 ++++++++++ 6 files changed, 130 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8e65a93122..1c6c84b05b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1889,8 +1889,10 @@ N: Kieran Bingham F: package/libcamera/ N: Kilian Zinnecker +F: board/avnet/rzboard_v2l/ F: board/radxa/rock5b/ F: configs/rock5b_defconfig +F: configs/avnet_rzboard_v2l_defconfig F: package/rockchip-rkbin/ N: Klaus Heinrich Kiwi diff --git a/board/avnet/rzboard_v2l/genimage.cfg b/board/avnet/rzboard_v2l/genimage.cfg new file mode 100644 index 0000000000..94f35cb360 --- /dev/null +++ b/board/avnet/rzboard_v2l/genimage.cfg @@ -0,0 +1,29 @@ +# SD card image for RZBoard V2L + +image boot.vfat { + vfat { + files = { + "Image", + "rzboard.dtb", + "uEnv.txt" + } + } + size = 24M +} + +image sdcard.img { + hdimage { + partition-table-type = "hybrid" + } + + partition boot { + partition-type = "0xC" + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/avnet/rzboard_v2l/post-image.sh b/board/avnet/rzboard_v2l/post-image.sh new file mode 100755 index 0000000000..25bef8f793 --- /dev/null +++ b/board/avnet/rzboard_v2l/post-image.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -e + +cp board/avnet/rzboard_v2l/uEnv.txt "${BINARIES_DIR}" +support/scripts/genimage.sh -c board/avnet/rzboard_v2l/genimage.cfg diff --git a/board/avnet/rzboard_v2l/readme.txt b/board/avnet/rzboard_v2l/readme.txt new file mode 100644 index 0000000000..24b5680874 --- /dev/null +++ b/board/avnet/rzboard_v2l/readme.txt @@ -0,0 +1,71 @@ +RZBoard V2L +=========== + +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ + +This board support creates a bootable sd card image for the AVNET RZBoard V2L. +This board is shipped with a u-boot inside its eMMC. This board support uses +that u-boot and only puts uEnv.txt, kernel image and rootfs onto the sd card. + +Build: +====== + + $ make rzboard_v2l_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +????????? Image +????????? boot.vfat +????????? rootfs.ext2 +????????? rootfs.ext4 +????????? rootfs.tar +????????? rzboard.dtb +????????? sdcard.img +????????? uEnv.txt + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +Configure board for sd card boot: +--------------------------------- +Set the 'BOOT1' switch (next to the audio jack) to '1' (away from 'ON') in +order to let the board boot kernel and rootfs from SD card. + +Serial console: +--------------- +The RZBoard V2L has a 4-pin header "J19" right next to the micro USB. Its +layout can be seen in the Quick-Start Guide, or the Hardware User Guide, +obtainable from: +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ + +The uart pins are as follows (from left to right - orientation according to the +board's labeling): + +pin 1: n/a (most away from the board's corner) +pin 2: tx +pin 3: rx +pin 4: gnd (nearest to the board's corner) + +Baudrate for this board is 115200. + +Power-Up: +--------- +Plug in a suitable USB-C power supply and press the button 'S1' (next to the +USB-C port) for 2 seconds until the LED goes on. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. diff --git a/board/avnet/rzboard_v2l/uEnv.txt b/board/avnet/rzboard_v2l/uEnv.txt new file mode 100644 index 0000000000..28b8acb8c6 --- /dev/null +++ b/board/avnet/rzboard_v2l/uEnv.txt @@ -0,0 +1,3 @@ +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} +uenvcmd=fatload mmc 0:1 ${kernel_addr_r} Image; fatload mmc 0:1 ${fdt_addr_r} rzboard.dtb +bootargs=root=/dev/mmcblk0p2 rw rootfstype=ext4 earlyprintk console=ttyS0,115200 rootwait earlycon clk_ignore_unused debug diff --git a/configs/avnet_rzboard_v2l_defconfig b/configs/avnet_rzboard_v2l_defconfig new file mode 100644 index 0000000000..285aef39bc --- /dev/null +++ b/configs/avnet_rzboard_v2l_defconfig @@ -0,0 +1,20 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_KERNEL_HEADERS_5_10=y +BR2_TARGET_GENERIC_HOSTNAME="rzboard_v2l" +BR2_TARGET_GENERIC_ISSUE="Welcome to the AVNET RZBoard V2L" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/avnet/rzboard_v2l/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Avnet/renesas-linux-cip.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c197622df526c82ae9e3674e06b4092dac33eafa" +BR2_LINUX_KERNEL_DEFCONFIG="rzboard" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="renesas/rzboard" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Wed Feb 7 19:47:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:47:42 +0100 Subject: [Buildroot] [PATCH] package/rtl8189es: en/disable runtime debug according to BR2_ENABLE_RUNTIME_DEBUG In-Reply-To: <20231121173318.724862-1-giulio.benetti@benettiengineering.com> References: <20231121173318.724862-1-giulio.benetti@benettiengineering.com> Message-ID: <20240207204742.60127fe3@windsurf> On Tue, 21 Nov 2023 18:33:18 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > package/rtl8189es/rtl8189es.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 19:47:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:47:08 +0100 Subject: [Buildroot] [git commit] package/rtl8189es: en/disable runtime debug according to BR2_ENABLE_RUNTIME_DEBUG Message-ID: <20240207194841.DF6E8876C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f7bd4ef67013e3f94f91e0c5be4e2dc950d5bae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8189es/rtl8189es.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index 17d76aceb7..8bac0a125f 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -14,6 +14,10 @@ RTL8189ES_MODULE_MAKE_OPTS = \ KSRC=$(LINUX_DIR) \ USER_EXTRA_CFLAGS="-Wno-error" +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),) +RTL8189ES_MODULE_MAKE_OPTS += CONFIG_RTW_DEBUG=n +endif + define RTL8189ES_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) From thomas.petazzoni at bootlin.com Wed Feb 7 19:49:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:49:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnupg2: security bump to version 2.4.4 In-Reply-To: <20240207194233.590328-1-ju.o@free.fr> References: <20240207194233.590328-1-ju.o@free.fr> Message-ID: <20240207204934.7b726238@windsurf> On Wed, 7 Feb 2024 20:42:33 +0100 Julien Olivain wrote: > See release announce: > https://lists.gnupg.org/pipermail/gnupg-announce/2024q1/000481.html > > For the details about the security advisory for GnuPG created > smartcard keys, see: > https://gnupg.org/blog/20240125-smartcard-backup-key.html > > This commit also drops the package patch, which is now included in > this new version. > > Signed-off-by: Julien Olivain > --- > ...he-call-of-ks_ldap_help_variables-wh.patch | 36 ------------------- > package/gnupg2/gnupg2.hash | 4 +-- > package/gnupg2/gnupg2.mk | 2 +- > 3 files changed, 3 insertions(+), 39 deletions(-) > delete mode 100644 package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 19:49:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:49:37 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: gnupg2: increase a timeout In-Reply-To: <20240207194428.591147-1-ju.o@free.fr> References: <20240207194428.591147-1-ju.o@free.fr> Message-ID: <20240207204937.49368b78@windsurf> On Wed, 7 Feb 2024 20:44:28 +0100 Julien Olivain wrote: > The symmetric encryption test can sometimes take longer than the default > timeout. This commit increase the timeout to 10 seconds for that > command. > > Signed-off-by: Julien Olivain > --- > support/testing/tests/package/test_gnupg2.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 19:49:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:49:15 +0100 Subject: [Buildroot] [git commit] support/testing: gnupg2: increase a timeout Message-ID: <20240207195030.8BF5E876D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f44c0807c63f0bdd9640b7b29c131590f03be0ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The symmetric encryption test can sometimes take longer than the default timeout. This commit increase the timeout to 10 seconds for that command. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_gnupg2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_gnupg2.py b/support/testing/tests/package/test_gnupg2.py index 4505e1c339..2b18f54fa3 100644 --- a/support/testing/tests/package/test_gnupg2.py +++ b/support/testing/tests/package/test_gnupg2.py @@ -37,7 +37,7 @@ class TestGnupg2(infra.basetest.BRTest): # Test symmetric encrypt cmd = "gpg --batch --symmetric" cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=10) # Test symmetric decrypt cmd = "gpg --batch --decrypt" From thomas.petazzoni at bootlin.com Wed Feb 7 19:48:32 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:48:32 +0100 Subject: [Buildroot] [git commit] package/gnupg2: security bump to version 2.4.4 Message-ID: <20240207195030.82965876D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bdcd5adf39186e8c67a2b55c05a67fd45bc04110 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See release announce: https://lists.gnupg.org/pipermail/gnupg-announce/2024q1/000481.html For the details about the security advisory for GnuPG created smartcard keys, see: https://gnupg.org/blog/20240125-smartcard-backup-key.html This commit also drops the package patch, which is now included in this new version. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...ble-the-call-of-ks_ldap_help_variables-wh.patch | 36 ---------------------- package/gnupg2/gnupg2.hash | 4 +-- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch b/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch deleted file mode 100644 index 53dd39cf47..0000000000 --- a/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch +++ /dev/null @@ -1,36 +0,0 @@ -From dc13361524c1477b2106c7385f2059f9ea111b84 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Wed, 5 Jul 2023 09:29:54 +0900 -Subject: [PATCH] dirmngr: Enable the call of ks_ldap_help_variables when - USE_LDAP. - -* dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize. - --- - -Signed-off-by: NIIBE Yutaka - -Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=dc13361524c1477b2106c7385f2059f9ea111b84 - -Signed-off-by: Bernd Kuhls ---- - dirmngr/server.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dirmngr/server.c b/dirmngr/server.c -index 51a149cb2..ee61f63d6 100644 ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line) - - if (opt_help) - { -+#if USE_LDAP - ks_ldap_help_variables (ctrl); -+#endif - err = 0; - goto leave; - } --- -2.11.0 - diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index 4b770fa520..c821afb55e 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 79a60c8e415e3daaa33d0546398174252a56f7ac gnupg-2.4.3.tar.bz2 -sha256 a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d gnupg-2.4.3.tar.bz2 +sha1 228b3984325fdeebc5e3f2d165c6419a5ebc28de gnupg-2.4.4.tar.bz2 +sha256 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 gnupg-2.4.4.tar.bz2 # Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index d21c1e242d..986da4790c 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.3 +GNUPG2_VERSION = 2.4.4 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From thomas.petazzoni at bootlin.com Wed Feb 7 19:50:53 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:50:53 +0100 Subject: [Buildroot] [git commit] package/python-aiocoap: bump to version 0.4.7 Message-ID: <20240207195229.57729876D6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae5274dd545eb011f18cae24331300d944b8be0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License file moved: https://github.com/chrysn/aiocoap/commit/8f2e96d76bcf1f6f8d7b8065b5c5865afa50d20f https://github.com/chrysn/aiocoap/commit/065945fb7f34db33f641199aceb527527c1a3431 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-aiocoap/python-aiocoap.hash | 6 +++--- package/python-aiocoap/python-aiocoap.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-aiocoap/python-aiocoap.hash b/package/python-aiocoap/python-aiocoap.hash index ab50ff0958..c9d73cda26 100644 --- a/package/python-aiocoap/python-aiocoap.hash +++ b/package/python-aiocoap/python-aiocoap.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiocoap/json -md5 03ca0411b7401bfd6e9bdaefe09bd88a aiocoap-0.4.5.tar.gz -sha256 906c927822185c8acf04fdcc1dd98fd845f31dabf5d5e395c39137dcbd6ba1e3 aiocoap-0.4.5.tar.gz +md5 baebbc38bc8db31472c438521f7121e3 aiocoap-0.4.7.tar.gz +sha256 90f3bcaffd454f5421d3ad55ddbe3fe10a686d4b9f3c4445d427b130493a96a4 aiocoap-0.4.7.tar.gz # Locally computed sha256 checksums -sha256 2bb211d412a6bfa4b2a9cf01123c7fe90e5e6185938896e23ab07b84f8494180 LICENSE +sha256 0ad39132b3529369998eb7493b950dc7452b07ba9d8cca7619766b6c6d8270fa doc/LICENSE.rst diff --git a/package/python-aiocoap/python-aiocoap.mk b/package/python-aiocoap/python-aiocoap.mk index 92f47b7a4f..73a0d61eba 100644 --- a/package/python-aiocoap/python-aiocoap.mk +++ b/package/python-aiocoap/python-aiocoap.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_AIOCOAP_VERSION = 0.4.5 +PYTHON_AIOCOAP_VERSION = 0.4.7 PYTHON_AIOCOAP_SOURCE = aiocoap-$(PYTHON_AIOCOAP_VERSION).tar.gz -PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/65/63/9051af6a2fc498f50b71f23bdbde0cc1d1f0a69eb767776dbf6d1411e240 +PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/de/14/843232b56c0f09b2ceddae3da37598d9109c4b1d9383b1ab72232018e9e8 PYTHON_AIOCOAP_SETUP_TYPE = setuptools PYTHON_AIOCOAP_LICENSE = MIT -PYTHON_AIOCOAP_LICENSE_FILES = LICENSE +PYTHON_AIOCOAP_LICENSE_FILES = doc/LICENSE.rst $(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 7 19:52:29 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:52:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiocoap: bump to version 0.4.7 In-Reply-To: <20231104231506.2669884-1-james.hilliard1@gmail.com> References: <20231104231506.2669884-1-james.hilliard1@gmail.com> Message-ID: <20240207205229.1ff8abfc@windsurf> On Sat, 4 Nov 2023 17:15:06 -0600 James Hilliard wrote: > License file moved: > https://github.com/chrysn/aiocoap/commit/8f2e96d76bcf1f6f8d7b8065b5c5865afa50d20f > https://github.com/chrysn/aiocoap/commit/065945fb7f34db33f641199aceb527527c1a3431 > > Signed-off-by: James Hilliard > --- > package/python-aiocoap/python-aiocoap.hash | 6 +++--- > package/python-aiocoap/python-aiocoap.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From james.hilliard1 at gmail.com Wed Feb 7 19:56:55 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 7 Feb 2024 12:56:55 -0700 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <20240207112058.37534f3d@windsurf> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> <20240207112058.37534f3d@windsurf> Message-ID: On Wed, Feb 7, 2024 at 3:21?AM Thomas Petazzoni wrote: > > On Wed, 7 Feb 2024 11:16:27 +0100 > Marcus Hoffmann wrote: > > > Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 > > [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop > > still uses) also seem to be still developed in parallel. So maybe we > > need both as build host packages? Or do you see another solution? That's annoying, maybe the easiest option is to downgrade msgpack for now until everything supports cython 3.0? > > If we were to have both in parallel, then the big question is whether > it is possible to install them both in parallel without them > conflicting with each other. Seems tricky. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From dario.binacchi at amarulasolutions.com Wed Feb 7 20:11:41 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 21:11:41 +0100 Subject: [Buildroot] [PATCH 1/1] boot/ti-k3-r5-loader: add support for patch files and URLs In-Reply-To: <20240207195612.7ea08e54@windsurf> References: <20231129172852.1684628-1-dario.binacchi@amarulasolutions.com> <20240207195612.7ea08e54@windsurf> Message-ID: Hi Thomas, On Wed, Feb 7, 2024 at 7:56?PM Thomas Petazzoni wrote: > > On Wed, 29 Nov 2023 18:28:52 +0100 > Dario Binacchi wrote: > > > The patch adds support for URLs using similar code as found > > in linux/linux.mk and uboot/uboot.mk. > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3-r5-loader/Config.in | 11 +++++++++++ > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 18 ++++++++++++++++++ > > 2 files changed, 29 insertions(+) > > Thanks a lot for your proposal, but we no longer add package-specific > options to apply patches, as BR2_GLOBAL_PATCH_DIR allows to patch all > packages. We do have options that exist for linux and u-boot indeed, > because they predate BR2_GLOBAL_PATCH_DIR, and we need to keep them for > backwards compatibility. But we do not introduce such options for new > packages. For the example, the arm-trusted-firmware has no custom patch > option, because BR2_GLOBAL_PATCH_DIR can/should be used instead. Thank you for your explanations. Best regards, Dario > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Wed Feb 7 20:15:00 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 21:15:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/uuu: drop README.md from license files In-Reply-To: References: <20240207173911.3704142-1-dario.binacchi@amarulasolutions.com> Message-ID: Hi Yann, On Wed, Feb 7, 2024 at 7:49?PM Yann E. MORIN wrote: > > Darrio, All, > > On 2024-02-07 18:39 +0100, Dario Binacchi spake thusly: > > The patch drops the file README.md from the license files. Indeed, the > > licensing terms apply to third-party libraries that uuu links to, and > > even though they are bundled in the source tree of uuu|mfgtools, they > > are not used by Buildroot as we use the ones we build. Therefore, the > > actual license file of the package is the file LICENSE. > > > > Moreover, this also leads to simplifying the bump to new versions. > > > > Signed-off-by: Dario Binacchi > > Applied to master from Brussels airport, thanks. Thank you very much, and please remember to put your laptop in airplane mode at least during the flight. :) Best regards, Dario > > Regards, > Yann E. MORIN. > > > --- > > package/uuu/uuu.hash | 1 - > > package/uuu/uuu.mk | 2 +- > > 2 files changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash > > index c231d5d729f0..e45cbb868078 100644 > > --- a/package/uuu/uuu.hash > > +++ b/package/uuu/uuu.hash > > @@ -1,4 +1,3 @@ > > # locally computed > > sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz > > sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE > > -sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md > > diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk > > index 80d5e1937a97..5800277b10d5 100644 > > --- a/package/uuu/uuu.mk > > +++ b/package/uuu/uuu.mk > > @@ -8,7 +8,7 @@ UUU_VERSION = 1.5.165 > > UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz > > UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) > > UUU_LICENSE = BSD 3-Clause "New" or "Revised" License > > -UUU_LICENSE_FILES = LICENSE README.md > > +UUU_LICENSE_FILES = LICENSE > > HOST_UUU_DEPENDENCIES = \ > > host-bzip2 \ > > host-libusb \ > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From fontaine.fabrice at gmail.com Wed Feb 7 20:48:51 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 7 Feb 2024 21:48:51 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/tinymembench: force arm mode instead of Thumb mode In-Reply-To: <20240207164741.1bad9b44@windsurf> References: <20240114135446.1156025-1-fontaine.fabrice@gmail.com> <20240207164741.1bad9b44@windsurf> Message-ID: Hello, Le mer. 7 f?vr. 2024 ? 16:47, Thomas Petazzoni a ?crit : > > Hello Fabrice, > > On Sun, 14 Jan 2024 14:54:46 +0100 > Fabrice Fontaine wrote: > > > +# tinymembench has some assembly function that is not present in Thumb mode: > > +# Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' > > +# so, we desactivate Thumb mode > > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > > +TINYMEMBENCH_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -marm" > > +endif > > Why don't we simply extend the existing patch in the same way? It's > just that new code has been added in main.c that isn't Thumb > compatible, so I think you could change: > > #ifdef __arm__ > > to > > #if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) > > in main.c, and this should get you going. Could you try this instead? First, it should be noted that the build failure is not related to any new code, this code was already there in v0.3: https://github.com/ssvb/tinymembench/blob/v0.3/main.c Moreover, I already tried that approach and this doesn't work as __ARM_ARCH_ISA_ARM is defined by the toolchain. __ARM_ARCH_ISA_THUMB value could be checked instead but I was not confident in this solution as: - I don't fully understand what are the different meaning of __ARM_ARCH_ISA_{ARM,THUMB} values - upstream feedback on first patch was not really positive back in 2017 - upstream seems dead now so non upstreamable patches will have to be kept "forever" > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From giulio.benetti at benettiengineering.com Wed Feb 7 21:47:29 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 22:47:29 +0100 Subject: [Buildroot] [PATCH] package/rtl8188eu: bump to 2024-02-06 version on v5.2.2.4 branch Message-ID: <20240207214729.115691-1-giulio.benetti@benettiengineering.com> This version allows to build with Linux 6.8 Signed-off-by: Giulio Benetti --- package/rtl8188eu/rtl8188eu.hash | 2 +- package/rtl8188eu/rtl8188eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8188eu/rtl8188eu.hash b/package/rtl8188eu/rtl8188eu.hash index eb28e6cf0a..4f8f83e78c 100644 --- a/package/rtl8188eu/rtl8188eu.hash +++ b/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cb10a047d39f13c776b0097ef1290f6b3c63590fd57bc0827e8638c878819f0 rtl8188eu-306f3e62cf7cddf8cee74f70f88a7a7b3af46f56.tar.gz +sha256 507d32eb91d3d407c7758319c81a36a9dc69e2b89378cabcd382411153927b7b rtl8188eu-f42fc9c45d2086c415dce70d3018031b54a7beef.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk index 36a84d34de..eca0fb8007 100644 --- a/package/rtl8188eu/rtl8188eu.mk +++ b/package/rtl8188eu/rtl8188eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8188EU_VERSION = 306f3e62cf7cddf8cee74f70f88a7a7b3af46f56 +RTL8188EU_VERSION = f42fc9c45d2086c415dce70d3018031b54a7beef RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING -- 2.34.1 From ju.o at free.fr Wed Feb 7 22:51:00 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 7 Feb 2024 23:51:00 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/swipl: new package Message-ID: <20240207225100.1320837-1-ju.o@free.fr> SWI-Prolog offers a comprehensive free Prolog environment. Since its start in 1987, SWI-Prolog development has been driven by the needs of real world applications. SWI-Prolog is widely used in research and education as well as commercial applications. Signed-off-by: Julien Olivain --- Changes v1 -> v2: Updates and changes from comments by Romain Naour: - udpate homepage URL in Config.in to match the http redirect. - package updated from 9.0.2 to latest version 9.2.0 - runtime test updated to use basetest config (since it's now using glibc toolchain) - minor runtime test style changes (use python f-strings) - rebased DEVELOPERS entries Patch tested on branch master at commit ae5274d with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_swipl ... OK ./utils/test-pkg -a -p swipl arm-aarch64 [ 1/45]: OK bootlin-aarch64-glibc [ 2/45]: OK bootlin-arcle-hs38-uclibc [ 3/45]: SKIPPED bootlin-armv5-uclibc [ 4/45]: SKIPPED bootlin-armv7-glibc [ 5/45]: OK bootlin-armv7m-uclibc [ 6/45]: SKIPPED bootlin-armv7-musl [ 7/45]: OK bootlin-m68k-5208-uclibc [ 8/45]: SKIPPED bootlin-m68k-68040-uclibc [ 9/45]: SKIPPED bootlin-microblazeel-uclibc [10/45]: SKIPPED bootlin-mipsel32r6-glibc [11/45]: OK bootlin-mipsel-uclibc [12/45]: SKIPPED bootlin-nios2-glibc [13/45]: SKIPPED bootlin-openrisc-uclibc [14/45]: SKIPPED bootlin-powerpc64le-power8-glibc [15/45]: OK bootlin-powerpc-e500mc-uclibc [16/45]: SKIPPED bootlin-riscv32-glibc [17/45]: OK bootlin-riscv64-glibc [18/45]: OK bootlin-riscv64-musl [19/45]: OK bootlin-s390x-z13-glibc [20/45]: OK bootlin-sh4-uclibc [21/45]: SKIPPED bootlin-sparc64-glibc [22/45]: OK bootlin-sparc-uclibc [23/45]: SKIPPED bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: SKIPPED bootlin-xtensa-uclibc [27/45]: SKIPPED br-arm-basic [28/45]: SKIPPED br-arm-full-nothread [29/45]: SKIPPED br-arm-full-static [30/45]: SKIPPED br-i386-pentium4-full [31/45]: SKIPPED br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: SKIPPED br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: SKIPPED br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: SKIPPED sourcery-arm [41/45]: SKIPPED sourcery-arm-thumb2 [42/45]: SKIPPED sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: SKIPPED 45 builds, 24 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- DEVELOPERS | 3 + package/Config.in | 1 + package/swipl/Config.in | 38 +++++++++++++ package/swipl/swipl.hash | 4 ++ package/swipl/swipl.mk | 55 +++++++++++++++++++ support/testing/tests/package/test_swipl.py | 46 ++++++++++++++++ .../test_swipl/rootfs-overlay/root/sudoku.pl | 42 ++++++++++++++ 7 files changed, 189 insertions(+) create mode 100644 package/swipl/Config.in create mode 100644 package/swipl/swipl.hash create mode 100644 package/swipl/swipl.mk create mode 100644 support/testing/tests/package/test_swipl.py create mode 100644 support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..8d3c17c3cb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1751,6 +1751,7 @@ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ F: package/riscv-isa-sim/ +F: package/swipl/ F: package/tinycompress/ F: package/z3/ F: package/zynaddsubfx/ @@ -1846,6 +1847,8 @@ F: support/testing/tests/package/test_sed.py F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py +F: support/testing/tests/package/test_swipl.py +F: support/testing/tests/package/test_swipl/ F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_tcpdump.py diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..b1a9d74af1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1443,6 +1443,7 @@ endmenu endif source "package/quickjs/Config.in" source "package/ruby/Config.in" + source "package/swipl/Config.in" source "package/tcl/Config.in" if BR2_PACKAGE_TCL menu "Tcl libraries/modules" diff --git a/package/swipl/Config.in b/package/swipl/Config.in new file mode 100644 index 0000000000..f0fb2d786d --- /dev/null +++ b/package/swipl/Config.in @@ -0,0 +1,38 @@ +# swipl supports arch for which libc fenv.h provides all four macros: +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD +# See for example in glibc https://sourceware.org/git/glibc.git +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ +config BR2_PACKAGE_SWIPL_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arceb || BR2_arcle + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + default y if BR2_m68k + # BR2_microblaze has only FE_TONEAREST + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + # BR2_nios2 has only FE_TONEAREST + default y if BR2_or1k + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_s390x + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} + default y if BR2_sparc || BR2_sparc64 + default y if BR2_x86_64 + # BR2_xtensa supports only uclibc which does not have fenv.h + +config BR2_PACKAGE_SWIPL + bool "SWI-Prolog" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # __has_attribute() + depends on BR2_PACKAGE_SWIPL_ARCH_SUPPORTS + # swipl needs fenv.h which is not provided by uclibc + depends on !BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_ZLIB + help + SWI-Prolog offers a comprehensive free Prolog + environment. Since its start in 1987, SWI-Prolog development + has been driven by the needs of real world + applications. SWI-Prolog is widely used in research and + education as well as commercial applications. + + https://www.swi-prolog.org diff --git a/package/swipl/swipl.hash b/package/swipl/swipl.hash new file mode 100644 index 0000000000..9f980654ba --- /dev/null +++ b/package/swipl/swipl.hash @@ -0,0 +1,4 @@ +# From https://www.swi-prolog.org/download/stable +sha256 10d90b15734d14d0d7972dc11a3584defd300d65a9f0b1185821af8c3896da5e swipl-9.2.0.tar.gz +# Locally calculated +sha256 770594d0f4463b71f1485f00e4bc5cf4b6f667d62ef6bc9bde2fee236541992a LICENSE diff --git a/package/swipl/swipl.mk b/package/swipl/swipl.mk new file mode 100644 index 0000000000..8514b9d449 --- /dev/null +++ b/package/swipl/swipl.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# swipl +# +################################################################################ + +SWIPL_VERSION = 9.2.0 +SWIPL_SITE = https://www.swi-prolog.org/download/stable/src +SWIPL_LICENSE = BSD-2-Clause +SWIPL_LICENSE_FILES = LICENSE + +SWIPL_DEPENDENCIES = host-swipl zlib + +# A host-swipl is needed to compile the target prolog boot +# boot.prl file. +HOST_SWIPL_CONF_OPTS = \ + -DBUILD_PDF_DOCUMENTATION=OFF \ + -DSWIPL_PACKAGES=OFF \ + -DUSE_GMP=OFF \ + -DUSE_TCMALLOC=OFF + +# swipl uses cmake macros try_run() and check_c_source_runs(), which +# are not suitable for cross compilation. We add results in cache to +# avoid running those tests. The SWIPL_NATIVE_FRIEND variable, is +# meant to point to build directory of a host native swipl, rather +# than the binary itself. The Cmake macro will append "src/swipl" to +# the path set to this variable. Therefore, we cannot use the host +# "swipl" binary installed in $(HOST_DIR)/usr/bin. +SWIPL_CONF_OPTS = \ + -DBUILD_PDF_DOCUMENTATION=OFF \ + -DHAVE_WEAK_ATTRIBUTE=1 \ + -DLLROUND_OK=1 \ + -DMODF_OK=1 \ + -DQSORT_R_GNU=1 \ + -DSWIPL_NATIVE_FRIEND=$(BUILD_DIR)/host-swipl-$(SWIPL_VERSION) \ + -DSWIPL_PACKAGES=OFF \ + -DUSE_TCMALLOC=OFF + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +SWIPL_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ifeq ($(BR2_PACKAGE_GMP),y) +SWIPL_CONF_OPTS += -DUSE_GMP=ON +SWIPL_DEPENDENCIES += gmp +else +SWIPL_CONF_OPTS += -DUSE_GMP=OFF +endif + +ifeq ($(BR2_PACKAGE_NCURSES),y) +SWIPL_DEPENDENCIES += ncurses +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/support/testing/tests/package/test_swipl.py b/support/testing/tests/package/test_swipl.py new file mode 100644 index 0000000000..0839101599 --- /dev/null +++ b/support/testing/tests/package/test_swipl.py @@ -0,0 +1,46 @@ +import os + +import infra.basetest + + +class TestSWIPL(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_swipl/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_SWIPL=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + 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]) + self.emulator.login() + + # Check program executes. + cmd = "swipl --version" + self.assertRunOk(cmd) + + # Check swipl fails when goal is false. + cmd = "swipl -g false" + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Test output. + string = "Hello Buildroot !" + cmd = f"swipl -g 'writeln(\"{string}\")' -t halt" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], string) + + # Check the swipl demo file works (ex: "sam" likes "pizza"). + cmd = "swipl -g '[swi(demo/likes)]' -g 'likes(sam,pizza)' -t halt" + self.assertRunOk(cmd) + + # Run a more complex logic program (solve a sudoku). + cmd = "swipl -g top -t halt /root/sudoku.pl" + self.assertRunOk(cmd, timeout=10) diff --git a/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl b/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl new file mode 100644 index 0000000000..2b68b6cc89 --- /dev/null +++ b/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl @@ -0,0 +1,42 @@ +% taken from: +% https://www.swi-prolog.org/pldoc/man?section=clpfd-sudoku + +:- use_module(library(clpfd)). + +sudoku(Rows) :- + length(Rows, 9), maplist(same_length(Rows), Rows), + append(Rows, Vs), Vs ins 1..9, + maplist(all_distinct, Rows), + transpose(Rows, Columns), + maplist(all_distinct, Columns), + Rows = [As,Bs,Cs,Ds,Es,Fs,Gs,Hs,Is], + blocks(As, Bs, Cs), + blocks(Ds, Es, Fs), + blocks(Gs, Hs, Is). + +blocks([], [], []). +blocks([N1,N2,N3|Ns1], [N4,N5,N6|Ns2], [N7,N8,N9|Ns3]) :- + all_distinct([N1,N2,N3,N4,N5,N6,N7,N8,N9]), + blocks(Ns1, Ns2, Ns3). + +problem(1, [[_,_,_,_,_,_,_,_,_], + [_,_,_,_,_,3,_,8,5], + [_,_,1,_,2,_,_,_,_], + [_,_,_,5,_,7,_,_,_], + [_,_,4,_,_,_,1,_,_], + [_,9,_,_,_,_,_,_,_], + [5,_,_,_,_,_,_,7,3], + [_,_,2,_,1,_,_,_,_], + [_,_,_,_,4,_,_,_,9]]). + +top :- writeln("Sudoku solution:"), + problem(1, Rows), sudoku(Rows), maplist(portray_clause, Rows), + Rows = [[9, 8, 7, 6, 5, 4, 3, 2, 1], + [2, 4, 6, 1, 7, 3, 9, 8, 5], + [3, 5, 1, 9, 2, 8, 7, 4, 6], + [1, 2, 8, 5, 3, 7, 6, 9, 4], + [6, 3, 4, 8, 9, 2, 1, 5, 7], + [7, 9, 5, 4, 6, 1, 8, 3, 2], + [5, 1, 9, 2, 8, 6, 4, 7, 3], + [4, 7, 2, 3, 1, 9, 5, 6, 8], + [8, 6, 3, 7, 4, 5, 2, 1, 9]]. -- 2.43.0 From ju.o at free.fr Wed Feb 7 22:55:24 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 07 Feb 2024 23:55:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/swipl: new package In-Reply-To: <0d0380e0-e56c-4b0a-bdfa-4a6253124b0b@smile.fr> References: <20221216221934.465323-1-ju.o@free.fr> <0d0380e0-e56c-4b0a-bdfa-4a6253124b0b@smile.fr> Message-ID: <7111666ff232bb1c937f292eb04a01fe@free.fr> Hi Romain, On 07/02/2024 12:49, Romain Naour wrote: > Hello Julien, > > Le 16/12/2022 ? 23:19, Julien Olivain a ?crit?: >> SWI-Prolog offers a comprehensive free Prolog environment. Since its >> start in 1987, SWI-Prolog development has been driven by the needs of >> real world applications. SWI-Prolog is widely used in research and >> education as well as commercial applications. >> >> Signed-off-by: Julien Olivain [...] >> +class TestSWIPL(infra.basetest.BRTest): >> + # Need to use a different toolchain than the default due to >> + # swipl requiring fenv.h not provided by uclibc. > > This not true anymore, the Buildroot testing infrastructure switched > from uClibc > to Glibc somewhere between 2022 and 2024 :) > > Hopefully the runtime test still pass on the current Buildroot master: > > ./support/testing/run-tests -k -d dl/ -o testsuite-master > tests.package.test_swipl.TestSWIPL > 12:33:08 TestSWIPL Starting > 12:33:09 TestSWIPL Building > 12:35:49 TestSWIPL Building done > 12:36:02 TestSWIPL Cleaning up > . > ---------------------------------------------------------------------- > Ran 1 test in 173.451s > > The complexity of the architecture dependency and the buildsystem make > it > difficult to review in details. > > Without going into the details, it seems ok for me. > > Obviously, the DEVELOPERS file conflict nowadays since several entries > has been > added since then. Thanks for the review. I sent a v2 to refresh this old patch. See: https://patchwork.ozlabs.org/project/buildroot/patch/20240207225100.1320837-1-ju.o at free.fr/ > > Best regards, > Romain > Best regards, Julien. From kilian.zinnecker at mail.de Wed Feb 7 23:22:21 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Thu, 08 Feb 2024 00:22:21 +0100 Subject: [Buildroot] [PATCH 1/1] configs/rzboard_v2L_defconfig: new defconfig In-Reply-To: <20240207204337.561d3b54@windsurf> References: <20231130223101.132221-1-kilian.zinnecker@mail.de> <20240207204337.561d3b54@windsurf> Message-ID: <2254622.iZASKD2KPV@laptop> Hello Thomas, Giulio, all, Thanks Giulio for reviewing my patch and your feedback! [--SNIP--] > Thanks, I have applied to master, after renaming to > avnet_rzboard_v2l_defconfig, and taking into account the feedback from > Giulio. Thanks for fixing the issues and applying the patch! > However, I find it not so nice that we don't build a fully bootable > image that includes U-Boot. Could you work on this and submit a > follow-up patch? > > There is a DIP switch on the board that allows to boot from SD, see > page 15 of the board hardware manual; Yes, I agree and would prefer a bootable image, containing a uboot built by buildroot as part of the boot chain, too. I therefore tried to run uboot from SD card at first (using the information from the hardware manual you refered to), but I was not successful. Hence I asked the author of a hackster.io article about the RZBoard V2L boot [1], whether he could help me. He told me, that he asked the Avnet BSP team, and "they confirmed there is no official support for storing bootloader files on micro sd". This matches his article, listing only eMMC and QSPI as possible locations for the bootloader. However, maybe this information is incomplete and there is in fact a way to run uboot from SD card, which I just was not able to get working. I can try to reach out to the Avnet support myself. And even if there is no way to do that, I can try to adjust the board support to build uboot, figure out how to flash uboot to the eMMC and document that in the readme. May take me some time though at the moment. Best regards, Kilian [1] https://www.hackster.io/lucas-keller/mastering-rzboardv2l-emmc-micro-sd-and-network-booting-dc87f3 From peter at korsgaard.com Thu Feb 8 07:09:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 08:09:39 +0100 Subject: [Buildroot] [PATCH] package/webkitgtk: security bump to version 2.42.5 Message-ID: <20240208070939.493203-1-peter@korsgaard.com> Fixes the following security issues: https://webkitgtk.org/security/WSA-2024-0001.html - CVE-2024-23222: Processing maliciously crafted web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been exploited. Description: A type confusion issue was addressed with improved checks. - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint the user. Description: An access issue was addressed with improved access restrictions. - CVE-2024-23213: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. - CVE-2023-40414: Processing web content may lead to arbitrary code execution. Description: A use-after-free issue was addressed with improved memory management. - CVE-2023-42833: Processing web content may lead to arbitrary code execution. Description: A correctness issue was addressed with improved checks. - CVE-2014-1745: Processing a file may lead to a denial-of-service or potentially disclose memory contents. Description: The issue was addressed with improved checks. https://webkitgtk.org/security/WSA-2023-0012.html - CVE-2023-42883: Processing a SVG image may lead to a denial-of-service. Description: The issue was addressed with improved memory handling. - CVE-2023-42890: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. https://webkitgtk.org/security/WSA-2023-0011.html - CVE-2023-42916: Processing web content may disclose sensitive information. Apple is aware of a report that this issue may have been actively exploited. Description: An out-of-bounds read was addressed with improved input validation. - CVE-2023-42917: Processing web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been actively exploited. Description: A memory corruption vulnerability was addressed with improved locking. Add an upstream post-2.42.5 patch to fix an issue with an invalid backport causing a build issue. Signed-off-by: Peter Korsgaard --- ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++ package/webkitgtk/webkitgtk.hash | 6 +-- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch diff --git a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 0000000000..c9667fedbd --- /dev/null +++ b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Peter Korsgaard +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.39.2 + diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 59782732c3..ac4799d4cf 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.42.2.tar.xz.sums -sha1 05bec6a824e46f043b865478735bc8395249510e webkitgtk-2.42.2.tar.xz -sha256 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 webkitgtk-2.42.2.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.5.tar.xz.sums +sha1 c3ffb2beaac56f1089029f2254482f48d9e3db37 webkitgtk-2.42.5.tar.xz +sha256 b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 webkitgtk-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 611d7f65d3..075a36654f 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.42.2 +WEBKITGTK_VERSION = 2.42.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES -- 2.39.2 From roykollensvendsen at gmail.com Thu Feb 8 07:49:00 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Thu, 8 Feb 2024 08:49:00 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install Message-ID: <20240208074901.1654224-1-roy.kollen.svendsen@akersolutions.com> Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... --- package/python3/python3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 42765abcf4..81d9a904c7 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -34,6 +34,7 @@ HOST_PYTHON3_CONF_OPTS += \ HOST_PYTHON3_CONF_ENV += \ LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ py_cv_module_nis=n/a \ + py_cv_module__tkinter=n/a \ py_cv_module_unicodedata=yes \ py_cv_module__codecs_cn=n/a \ py_cv_module__codecs_hk=n/a \ -- 2.43.0 From br015 at umbiko.net Thu Feb 8 07:59:20 2024 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 08 Feb 2024 07:59:20 +0000 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: References: Message-ID: Hi Fabrice, Romain, *, more complicated than I thought ... On 2024-02-07 11:30, Andreas Ziegler wrote: > Hi Fabrice, > > sorry in case I do not reply to the latest message in the thread; my > in-box is currently a bit crowded ... > > On 2024-02-06 18:59, Fabrice Fontaine wrote: > >> Message: 30 >> Date: Tue, 6 Feb 2024 18:59:00 +0100 >> From: Fabrice Fontaine >> To: Romain Naour >> Cc: buildroot at buildroot.org >> Subject: Re: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS >> Message-ID: >> >> Content-Type: text/plain; charset="UTF-8" >> >> Hello Romain, >> >> Le mar. 6 f?vr. 2024 ? 18:32, Romain Naour a >> ?crit : >>> >>> Hello, >>> >>> Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit : >>> > ncmpc is able to automatically detect NLS support since version 0.47 and >>> > https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 >>> > so let it handle automatically to avoid the following build failure with >>> > a bootlin toolchain which embeds a gettext definition in libintl.h which >>> > will clash with the fake gettext definition provided by ncmpc since >>> > https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: >>> > >>> > In file included from ../src/save_playlist.cxx:8: >>> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' >>> > 39 | extern char *gettext (const char *__msgid) >>> > | ^~~~~~~ >>> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' >>> > ../src/i18n.h:22:20: note: to match this '(' >>> > 22 | #define gettext(x) (x) >>> > | ^ >>> > >>> > Indeed, even if NLS is disabled by the user, libintl.h will be included >>> > by >>> > /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h >>> > though include >>> >>> We usually want to explicitly handle such option from Buildroot >>> package to not >>> rely on automatic detection (as currently done). >>> >>> It look like more a bug in ncmpc build system? >> >> I don't know, upstream wants to have the same code with and without >> NLS, so they decided to define a gettext macro when NLS is disabled. >> I could find an upstreamable solution as upstream will probably reject >> a patch that removes this gettext define and puts #ifdef ENABLE_NLS >> before every gettext calls. >> Do you have an upstreamable solution or should we just add a NLS >> dependency to ncmpc? > > This is probably not related to NLS, but to gettext being included in > the build by some other package. This tricks Meson into believing that > NLS is enabled. > > Also, the code in meson.txt may lead to unexpected results: > > if meson.version().version_compare('>= 0.59') and not mini > # Meson 0.59 has native libintl support > intl_dep = dependency('intl', required: enable_nls) > enable_nls = intl_dep.found() > elif enable_nls.disabled() or mini > intl_dep = dependency('', required: false) > enable_nls = false > elif cc.has_header('libintl.h') > intl_dep = dependency('', required: false) > enable_nls = true > elif enable_nls.auto() > intl_dep = dependency('', required: false) > enable_nls = false > else > error('libintl.h not found') > meson.txt works like nls=auto within Buildroot, thus reflecting the setting of BR2_SYSTEM_ENABLE_NLS, so no worries. The toolchain seems to have been built with NLS support; the C++ library makes use of this: [3/73] Compiling C++ object src/event/libevent.a.p/TimerList.cxx.o FAILED: src/event/libevent.a.p/TimerList.cxx.o /home/data/test/autobuild/host/bin/or1k-linux-g++ -Isrc/event/libevent.a.p -Isrc/event -I../src/event -Isrc -I../src -I. -I.. -fdiagnostics-color=always -Wall -Winvalid-pch -Wextra -Wpedantic -std=c++2a -O3 -Wcast-qual -Wcast-align -Wdouble-promotion -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wredundant-decls -Wshadow -Wundef -Wvla -Wwrite-strings -fno-threadsafe-statics -fmerge-all-constants -Wno-non-virtual-dtor -Wno-format-truncation -D_GNU_SOURCE -fvisibility=hidden -ffunction-sections -fdata-sections -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=2 -fPIC -MD -MQ src/event/libevent.a.p/TimerList.cxx.o -MF src/event/libevent.a.p/TimerList.cxx.o.d -o src/event/libevent.a.p/TimerList.cxx.o -c ../src/event/TimerList.cxx In file included from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h:36, from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/bits/locale_facets_nonio.h:2064, from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/locale:43, from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/iomanip:45, from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/bits/chrono_io.h:38, from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/chrono:3330, from ../src/event/Chrono.hxx:6, from ../src/event/TimerList.hxx:7, from ../src/event/TimerList.cxx:5: /home/data/test/autobuild/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:23:2: error: #error "libintl.h included here" 23 | #error "libintl.h included here" | ^~~~~ Probably the least invasive solution would be to add a new ncmpc dependency: + depends on !BR2_TOOLCHAIN_HAS_FULL_GETTEXT || BR2_SYSTEM_ENABLE_NLS Kind regards, Andreas From thomas.petazzoni at bootlin.com Thu Feb 8 08:01:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 8 Feb 2024 09:01:20 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install In-Reply-To: <20240208074901.1654224-1-roy.kollen.svendsen@akersolutions.com> References: <20240208074901.1654224-1-roy.kollen.svendsen@akersolutions.com> Message-ID: <20240208090120.4d886b8c@windsurf> Hello Roy, On Thu, 8 Feb 2024 08:49:00 +0100 Roy Kollen Svendsen wrote: > diff --git a/package/python3/python3.mk b/package/python3/python3.mk > index 42765abcf4..81d9a904c7 100644 > --- a/package/python3/python3.mk > +++ b/package/python3/python3.mk > @@ -34,6 +34,7 @@ HOST_PYTHON3_CONF_OPTS += \ > HOST_PYTHON3_CONF_ENV += \ > LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ > py_cv_module_nis=n/a \ > + py_cv_module__tkinter=n/a \ > py_cv_module_unicodedata=yes \ > py_cv_module__codecs_cn=n/a \ > py_cv_module__codecs_hk=n/a \ Thanks a lot for your patch! However, in order to be consistent with how we do it with ncurses, sqlite, etc, I think it is the --disable-tk option that should automatically set py_cv_module__tkinter=n/a. +AC_SUBST(TK) +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) should be followed by something like AS_IF([test "${enable_tk}" = "no"], [PY_STDLIB_MOD_SET_NA([_tkinter])]) something like this (in package/python3/0012-Add-an-option-to-disable-the-tk-module.patch). Or, we need to turn around how things are done, and instead of adding those --enable/--disable, look at whether py_cv_module_ is passed to appropriately disable things. Might be more upstreamable (but I thought about this idea *after* redoing the 3.12 patches). That said, the 3.12 bump is for now causing quite a few issues, so it is not impossible that we revert it before the 2024.02 release. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 8 08:02:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 8 Feb 2024 09:02:56 +0100 Subject: [Buildroot] [PATCH 1/1] configs/rzboard_v2L_defconfig: new defconfig In-Reply-To: <2254622.iZASKD2KPV@laptop> References: <20231130223101.132221-1-kilian.zinnecker@mail.de> <20240207204337.561d3b54@windsurf> <2254622.iZASKD2KPV@laptop> Message-ID: <20240208090256.25b75053@windsurf> Hello Kilian, On Thu, 08 Feb 2024 00:22:21 +0100 kilian.zinnecker at mail.de wrote: > Yes, I agree and would prefer a bootable image, containing a uboot built by > buildroot as part of the boot chain, too. I therefore tried to run uboot from > SD card at first (using the information from the hardware manual you refered > to), but I was not successful. Hence I asked the author of a hackster.io > article about the RZBoard V2L boot [1], whether he could help me. He told me, > that he asked the Avnet BSP team, and "they confirmed there is no official > support for storing bootloader files on micro sd". This matches his article, > listing only eMMC and QSPI as possible locations for the bootloader. > > However, maybe this information is incomplete and there is in fact a way to > run uboot from SD card, which I just was not able to get working. I can try to > reach out to the Avnet support myself. And even if there is no way to do that, > I can try to adjust the board support to build uboot, figure out how to flash > uboot to the eMMC and document that in the readme. May take me some time > though at the moment. Thanks for the additional details. Indeed in this case, the best option would be to have our defconfig build a uboot that works on QSPI, or eMMC, and provide the instructions on how to reflash the QSPI or eMMC. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Thu Feb 8 08:38:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 09:38:04 +0100 Subject: [Buildroot] [PATCH] boot/shim: security bump to version 15.8 Message-ID: <20240208083805.528949-1-peter@korsgaard.com> Fixes the following security issues: CVE-2023-40546 mok: fix LogError() invocation CVE-2023-40547 - avoid incorrectly trusting HTTP headers CVE-2023-40548 Fix integer overflow on SBAT section size on 32-bit system CVE-2023-40549 Authenticode: verify that the signature header is in bounds. CVE-2023-40550 pe: Fix an out-of-bound read in verify_buffer_sbat() CVE-2023-40551: pe-relocate: Fix bounds check for MZ binaries https://github.com/rhboot/shim/tree/15.8 Signed-off-by: Peter Korsgaard --- boot/shim/shim.hash | 2 +- boot/shim/shim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/shim/shim.hash b/boot/shim/shim.hash index c9c489fd2f..5aa4ca06e8 100644 --- a/boot/shim/shim.hash +++ b/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 eab91644a3efe91a666399f5d8eb3eed0e04d04f79d4b6c0b278ef7747a239a5 shim-15.6.tar.bz2 +sha256 a79f0a9b89f3681ab384865b1a46ab3f79d88b11b4ca59aa040ab03fffae80a9 shim-15.8.tar.bz2 sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index bbef81cfc4..19b11f4086 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHIM_VERSION = 15.6 +SHIM_VERSION = 15.8 SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION) SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2 SHIM_LICENSE = BSD-2-Clause -- 2.39.2 From aperez at igalia.com Thu Feb 8 09:28:26 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 8 Feb 2024 11:28:26 +0200 Subject: [Buildroot] [PATCH] package/webkitgtk: security bump to version 2.42.5 In-Reply-To: <20240208070939.493203-1-peter@korsgaard.com> References: <20240208070939.493203-1-peter@korsgaard.com> Message-ID: <20240208112826.GB3464513@igalia.com> Hi Peter, I was about to submit basically the same patch, you have beaten me to it. Thanks! (Later today I to submit the wpewebkit update as well :D) On Thu, 08 Feb 2024 08:09:39 +0100 Peter Korsgaard wrote: > Fixes the following security issues: > > https://webkitgtk.org/security/WSA-2024-0001.html > > - CVE-2024-23222: Processing maliciously crafted web content may lead to > arbitrary code execution. Apple is aware of a report that this issue may > have been exploited. Description: A type confusion issue was addressed > with improved checks. > > - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint > the user. Description: An access issue was addressed with improved access > restrictions. > > - CVE-2024-23213: Processing web content may lead to arbitrary code execution. > Description: The issue was addressed with improved memory handling. > > - CVE-2023-40414: Processing web content may lead to arbitrary code > execution. Description: A use-after-free issue was addressed with > improved memory management. > > - CVE-2023-42833: Processing web content may lead to arbitrary code execution. > Description: A correctness issue was addressed with improved checks. > > - CVE-2014-1745: Processing a file may lead to a denial-of-service or > potentially disclose memory contents. Description: The issue was > addressed with improved checks. > > https://webkitgtk.org/security/WSA-2023-0012.html > > - CVE-2023-42883: Processing a SVG image may lead to a denial-of-service. > Description: The issue was addressed with improved memory handling. > > - CVE-2023-42890: Processing web content may lead to arbitrary code > execution. Description: The issue was addressed with improved memory > handling. > > https://webkitgtk.org/security/WSA-2023-0011.html > > - CVE-2023-42916: Processing web content may disclose sensitive information. > Apple is aware of a report that this issue may have been actively > exploited. Description: An out-of-bounds read was addressed with improved > input validation. > > - CVE-2023-42917: Processing web content may lead to arbitrary code > execution. Apple is aware of a report that this issue may have been > actively exploited. Description: A memory corruption vulnerability was > addressed with improved locking. > > Add an upstream post-2.42.5 patch to fix an issue with an invalid backport > causing a build issue. > > Signed-off-by: Peter Korsgaard Acked-by: Adrian Perez de Castro > --- > ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++ > package/webkitgtk/webkitgtk.hash | 6 +-- > package/webkitgtk/webkitgtk.mk | 2 +- > 3 files changed, 43 insertions(+), 4 deletions(-) > create mode 100644 package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > > diff --git a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > new file mode 100644 > index 0000000000..c9667fedbd > --- /dev/null > +++ b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > @@ -0,0 +1,39 @@ > +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 > +From: Michael Catanzaro > +Date: Mon, 5 Feb 2024 11:00:49 -0600 > +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= > + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= > + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= > + =?UTF-8?q?=3D268739?= > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Unreviewed build fix. Seems a backport went badly, and we didn't notice > +because the code is architecture-specific. > + > +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: > +(JSC::CLoop::execute): > + > +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff > +Signed-off-by: Peter Korsgaard > +--- > + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- > + 1 file changed, 2 deletions(-) > + > +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > +index 5064ead6cd2e..9a2e2653b121 100644 > +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, > + UNUSED_VARIABLE(t2); > + UNUSED_VARIABLE(t3); > + UNUSED_VARIABLE(t5); > +- UNUSED_VARIABLE(t6); > +- UNUSED_VARIABLE(t7); > + > + struct StackPointerScope { > + StackPointerScope(CLoopStack& stack) > +-- > +2.39.2 > + > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > index 59782732c3..ac4799d4cf 100644 > --- a/package/webkitgtk/webkitgtk.hash > +++ b/package/webkitgtk/webkitgtk.hash > @@ -1,6 +1,6 @@ > -# From https://www.webkitgtk.org/releases/webkitgtk-2.42.2.tar.xz.sums > -sha1 05bec6a824e46f043b865478735bc8395249510e webkitgtk-2.42.2.tar.xz > -sha256 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 webkitgtk-2.42.2.tar.xz > +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.5.tar.xz.sums > +sha1 c3ffb2beaac56f1089029f2254482f48d9e3db37 webkitgtk-2.42.5.tar.xz > +sha256 b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 webkitgtk-2.42.5.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > index 611d7f65d3..075a36654f 100644 > --- a/package/webkitgtk/webkitgtk.mk > +++ b/package/webkitgtk/webkitgtk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WEBKITGTK_VERSION = 2.42.2 > +WEBKITGTK_VERSION = 2.42.5 > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > WEBKITGTK_INSTALL_STAGING = YES > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From roykollensvendsen at gmail.com Thu Feb 8 09:38:12 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Thu, 8 Feb 2024 10:38:12 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install Message-ID: <20240208093813.2395828-1-roy.kollen.svendsen@akersolutions.com> Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... Signed-off-by: Roy Kollen Svendsen --- Changes v1 -> v2: Make the --disable-tk option automatically set py_cv_module__tkinter=n/a (suggested by Thomas Petazzoni) --- .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 7fafbedddb..08617241a6 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,6 +70,8 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) -- 2.43.0 From roykollensvendsen at gmail.com Thu Feb 8 09:41:36 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Thu, 8 Feb 2024 10:41:36 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install Message-ID: <20240208094137.2396094-1-roy.kollen.svendsen@akersolutions.com> Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... Signed-off-by: Roy Kollen Svendsen --- Changes v1 -> v2: Make the --disable-tk option automatically set py_cv_module__tkinter=n/a (suggested by Thomas Petazzoni) --- .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 7fafbedddb..08617241a6 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,6 +70,8 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) -- 2.43.0 From aperez at igalia.com Thu Feb 8 09:55:28 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 8 Feb 2024 11:55:28 +0200 Subject: [Buildroot] [PATCH 1/3] package/wpebackend-rdk: new package In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> Message-ID: <20240208095531.99049-2-aperez@igalia.com> The wpebackend-rdk can be used as an alternative to wpebackend-fdo in some cases, and also supports a few additional configurations. For now only the Wayland-EGL and Broadcom RaspberryPi userland implementations can be enabled. The former is useful for testing, and the latter allows using WPE WebKit directly on top of Dispmanx in combination with the rpi-userland package in supported RaspberryPi models. This only adds the new package, follow-up commits will un-hardcode the usage of wpebackend-fdo and allow selecting either which of both to build. Signed-off-by: Adrian Perez de Castro --- package/Config.in | 1 + package/wpebackend-rdk/Config.in | 57 ++++++++++++++++++++++ package/wpebackend-rdk/wpebackend-rdk.hash | 5 ++ package/wpebackend-rdk/wpebackend-rdk.mk | 43 ++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 package/wpebackend-rdk/Config.in create mode 100644 package/wpebackend-rdk/wpebackend-rdk.hash create mode 100644 package/wpebackend-rdk/wpebackend-rdk.mk diff --git a/package/Config.in b/package/Config.in index 91a6f1de00d..99bd6fee22e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1723,6 +1723,7 @@ menu "Graphics" source "package/wlroots/Config.in" source "package/woff2/Config.in" source "package/wpebackend-fdo/Config.in" + source "package/wpebackend-rdk/Config.in" source "package/wpewebkit/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" diff --git a/package/wpebackend-rdk/Config.in b/package/wpebackend-rdk/Config.in new file mode 100644 index 00000000000..6125911bec9 --- /dev/null +++ b/package/wpebackend-rdk/Config.in @@ -0,0 +1,57 @@ +comment "wpebackend-rdk needs a toolchain w/ C++, wchar, threads, dynamic library, and rpi-userland or an OpenGL-capable Wayland backend" + depends on !(BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_HAS_LIBEGL_WAYLAND) \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +config BR2_PACKAGE_WPEBACKEND_RDK + bool "wpebackend-rdk" + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBWPE + help + WPEBackend interface supporting a number of configurations. + +if BR2_PACKAGE_WPEBACKEND_RDK + +choice + prompt Implementation + default BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI if BR2_PACKAGE_RPI_USERLAND + default BR2_PACKAGE_WPEBACKEND_RDK_IMPL_WAYLAND_EGL if BR2_PACKAGE_HAS_LIBEGL_WAYLAND + +comment "brcm-rpi needs rpi-userland" + depends on !BR2_PACKAGE_RPI_USERLAND || !BR2_arm + +config BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI + bool "brcm-rpi" + depends on BR2_arm + depends on BR2_PACKAGE_RPI_USERLAND + help + Build RaspberryPi support using Broadcom's rpi-userland. + +comment "wayland-egl needs an EGL capable Wayland implementation" + depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + +config BR2_PACKAGE_WPEBACKEND_RDK_IMPL_WAYLAND_EGL + bool "wayland-egl" + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + help + Build Wayland-EGL support. + +endchoice + +if BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI + +config BR2_PACKAGE_WPEBACKEND_RDK_LIBINPUT + bool "libinput support" + select BR2_PACKAGE_LIBINPUT + help + Support keyboard and mouse input through libinput + +endif + +endif diff --git a/package/wpebackend-rdk/wpebackend-rdk.hash b/package/wpebackend-rdk/wpebackend-rdk.hash new file mode 100644 index 00000000000..af7dab6a365 --- /dev/null +++ b/package/wpebackend-rdk/wpebackend-rdk.hash @@ -0,0 +1,5 @@ +# Generated locally +sha256 4c6ae288cf66f0a47052a50972e3d3727617c4c3e104db20494a3c5feb262f40 wpebackend-rdk-4.4.1.tar.gz + +# License files +sha256 a5ba969938c2896411ea1a23ee7d9ccb68306a65615b6711afe738c8f6ff2153 COPYING diff --git a/package/wpebackend-rdk/wpebackend-rdk.mk b/package/wpebackend-rdk/wpebackend-rdk.mk new file mode 100644 index 00000000000..f9740eb46cd --- /dev/null +++ b/package/wpebackend-rdk/wpebackend-rdk.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# wpebackend-rdk +# +################################################################################ + +WPEBACKEND_RDK_VERSION = 4.4.1 +WPEBACKEND_RDK_SITE = $(call github,WebPlatformForEmbedded,WPEBackend-rdk,R$(WPEBACKEND_RDK_VERSION)) +WPEBACKEND_RDK_INSTALL_STAGING = YES +WPEBACKEND_RDK_LICENSE = BSD-2-Clause +WPEBACKEND_RDK_LICENSE_FILES = COPYING +WPEBACKEND_RDK_DEPENDENCIES = libglib2 libwpe +WPEBACKEND_RDK_CONF_OPTS = \ + -DUSE_BACKEND_BCM_NEXUS=OFF \ + -DUSE_BACKEND_BCM_NEXUS_WAYLAND=OFF \ + -DUSE_BACKEND_INTEL_CE=OFF \ + -DUSE_BACKEND_WESTEROS=OFF \ + -DUSE_BACKEND_WPEFRAMEWORK=OFF \ + -DUSE_HOLE_PUNCH_GSTREAMER=OFF \ + -DUSE_VIRTUAL_KEYBOARD=OFF + +ifeq ($(BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI),y) +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_BCM_RPI=ON +WPEBACKEND_RDK_DEPENDENCIES += rpi-userland +else +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_BCM_RPI=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEBACKEND_RDK_IMPL_WAYLAND_EGL),y) +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_WAYLAND_EGL=ON +WPEBACKEND_RDK_DEPENDENCIES += libegl wayland +else +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_WAYLAND_EGL=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEBACKEND_RDK_LIBINPUT),y) +WPEBACKEND_RDK_CONF_OPTS += -DUSE_INPUT_LIBINPUT=ON +WPEBACKEND_RDK_DEPENDENCIES += libinput +else +WPEBACKEND_RDK_CONF_OPTS += -DUSE_INPUT_LIBINPUT=OFF +endif + +$(eval $(cmake-package)) -- 2.43.0 From aperez at igalia.com Thu Feb 8 09:55:30 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 8 Feb 2024 11:55:30 +0200 Subject: [Buildroot] [PATCH 3/3] package/wpewebkit: do not depend on wpebackend-fdo In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> Message-ID: <20240208095531.99049-4-aperez@igalia.com> Remove the wpewebkit package dependency on wpebackend-fdo, as it is not needed at all during the build. What is needed is a WPE backend at run time, which may be provided by wpebackend-fdo or wpebackend-rdk. To reflect this, we make wpewebkit depend on either being selected. Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/Config.in | 9 ++++----- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 432aa4c3a30..779af0c892e 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -24,11 +24,11 @@ comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gc || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ || !BR2_HOST_GCC_AT_LEAST_4_9 -comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" +comment "wpewebkit needs an OpenGL ES w/ EGL-capable implementation and an WPE backend" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT - depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL \ - || !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL + depends on !BR2_PACKAGE_WPEBACKEND_FDO && !BR2_PACKAGE_WPEBACKEND_RDK config BR2_PACKAGE_WPEWEBKIT bool "wpewebkit" @@ -41,8 +41,8 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wpebackend-fdo depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_WPEBACKEND_FDO || BR2_PACKAGE_WPEBACKEND_RDK select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_HARFBUZZ @@ -59,7 +59,6 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX - select BR2_PACKAGE_WPEBACKEND_FDO help WPE (Web Platform for Embedded) port of the WebKit engine, to allow embedders to create simple and performant systems diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 13143efb38b..e54ec2952ff 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -16,7 +16,7 @@ WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby host-unifdef \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup3 libtasn1 \ - libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo + libpng libxslt libwpe openjpeg wayland-protocols webp WPEWEBKIT_CMAKE_BACKEND = ninja -- 2.43.0 From aperez at igalia.com Thu Feb 8 09:55:29 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 8 Feb 2024 11:55:29 +0200 Subject: [Buildroot] [PATCH 2/3] package/cog: depend on wpebackend-fdo only if needed In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> Message-ID: <20240208095531.99049-3-aperez@igalia.com> Make the Cog headless platform plug-in selectable, allowing to configure the build without any plug-in at all. When all plug-ins are disabled, Cog does not require wpebackend-fdo at build time, and it is still able to use its built-in "fallback" support to load other WPE backends like wpebackend-rdk. Signed-off-by: Adrian Perez de Castro --- package/cog/Config.in | 28 ++++++++++++++++++++++++++-- package/cog/cog.mk | 13 ++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/package/cog/Config.in b/package/cog/Config.in index d2a910f9b89..d706b045b15 100644 --- a/package/cog/Config.in +++ b/package/cog/Config.in @@ -19,6 +19,10 @@ config BR2_PACKAGE_COG if BR2_PACKAGE_COG +config BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO + bool + default n + config BR2_PACKAGE_COG_PROGRAMS_HOME_URI string "home uri" default "https://wpewebkit.org" @@ -30,6 +34,8 @@ config BR2_PACKAGE_COG_PROGRAMS_HOME_URI config BR2_PACKAGE_COG_PLATFORM_FDO bool "Wayland backend" default y + depends on BR2_PACKAGE_WPEBACKEND_FDO + select BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_WAYLAND_PROTOCOLS help @@ -43,6 +49,8 @@ config BR2_PACKAGE_COG_PLATFORM_DRM depends on BR2_PACKAGE_HAS_LIBGBM depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT + depends on BR2_PACKAGE_WPEBACKEND_FDO + select BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT help @@ -50,16 +58,32 @@ config BR2_PACKAGE_COG_PLATFORM_DRM with video drivers that support kernel mode-setting (KMS) via the DRM user-space API. +config BR2_PACKAGE_COG_PLATFORM_HEADLESS + bool "Headless backend" + depends on BR2_PACKAGE_WPEBACKEND_FDO + select BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO + help + Enable the headless platform backend. + config BR2_PACKAGE_COG_USE_SYSTEM_DBUS bool "expose system D-Bus control interface" help Expose remote control interface on system bus -comment "DRM platform needs EGL and GBM" +comment "Headless platform needs wpebackend-fdo" + depends on \ + !BR2_PACKAGE_WPEBACKEND_FDO + +comment "DRM platform needs EGL, GBM, wpebackend-fdo" depends on \ !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_PACKAGE_HAS_LIBGBM || \ !BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF || \ - !BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT + !BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT || \ + !BR2_PACKAGE_WPEBACKEND_FDO + +comment "Wayland platform needs wpebackend-fdo" + depends on \ + !BR2_PACKAGE_WPEBACKEND_FDO endif diff --git a/package/cog/cog.mk b/package/cog/cog.mk index e96909f7796..8fc50de56f1 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -8,7 +8,7 @@ COG_VERSION = 0.18.2 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland +COG_DEPENDENCIES = dbus wpewebkit wayland COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ @@ -19,8 +19,6 @@ COG_CONF_OPTS = \ -Dcog_home_uri='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ -Dplatforms='$(subst $(space),$(comma),$(strip $(COG_PLATFORMS_LIST)))' -COG_PLATFORMS_LIST = headless - ifeq ($(BR2_PACKAGE_WESTON),y) COG_CONF_OPTS += -Dwayland_weston_direct_display=true COG_DEPENDENCIES += weston @@ -28,6 +26,11 @@ else COG_CONF_OPTS += -Dwayland_weston_direct_display=false endif +ifeq ($(BR2_PACKAGE_COG_PLATFORM_HEADLESS),y) +COG_PLATFORMS_LIST += headless +COG_DEPENDENCIES += wpebackend-fdo +endif + ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) COG_PLATFORMS_LIST += wayland COG_DEPENDENCIES += libxkbcommon wayland-protocols @@ -48,4 +51,8 @@ ifeq ($(BR2_PACKAGE_LIBMANETTE),y) COG_DEPENDENCIES += libmanette endif +ifeq ($(BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO),y) +COG_DEPENDENCIES += wpebackend-fdo +endif + $(eval $(meson-package)) -- 2.43.0 From aperez at igalia.com Thu Feb 8 09:55:27 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 8 Feb 2024 11:55:27 +0200 Subject: [Buildroot] [PATCH 0/3] Add support for the WPE WebKit RDK backend Message-ID: <20240208095531.99049-1-aperez@igalia.com> Hello all, This patch series allows using the RDK backend for WPE WebKit. Currently the main use case is to run WPEWebKit on RaspberryPi boards using on Dispmanx via the rpi-userland EGL/GLES libraries. In order to allow using the new wpebackend-rdk package I needed to un-hardcode usage of wpebackend-fdo, in two places: - The cog package may be built without wpebackend-fdo, passing an empty list of platform plug-ins. It has built-in support to load "simple" WPE backends like wpebackend-rdk. This was done by adding a config option for the headless plug-in, instead of always building it, and adjusting dependencies. - The wpewebkit package does not need wpebackend-fdo at all during the build. It only needs a backend installed at run time. This means it is enough to make wpewebkit have a "depends on" on any of the backends, to make sure they will be in the build, but none needs to be listed in WPEWEBKIT_DEPENDENCIES. I have tested this making builds based on raspberrypi3_defconfig, adding rpi-userland and then picking wpebackend-rdk + wpewebkit + cog. Hopefully the patch set is fine and nothing has slipped in the Kconfig dependencies (typically my weakest part of Buildroot contributions). Best regards, -Adrian Adrian Perez de Castro (3): package/wpebackend-rdk: new package package/cog: depend on wpebackend-fdo only if needed package/wpewebkit: do not depend on wpebackend-fdo package/Config.in | 1 + package/cog/Config.in | 28 ++++++++++- package/cog/cog.mk | 13 +++-- package/wpebackend-rdk/Config.in | 57 ++++++++++++++++++++++ package/wpebackend-rdk/wpebackend-rdk.hash | 5 ++ package/wpebackend-rdk/wpebackend-rdk.mk | 43 ++++++++++++++++ package/wpewebkit/Config.in | 9 ++-- package/wpewebkit/wpewebkit.mk | 2 +- 8 files changed, 147 insertions(+), 11 deletions(-) create mode 100644 package/wpebackend-rdk/Config.in create mode 100644 package/wpebackend-rdk/wpebackend-rdk.hash create mode 100644 package/wpebackend-rdk/wpebackend-rdk.mk -- 2.43.0 From roykollensvendsen at gmail.com Thu Feb 8 09:56:14 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Thu, 8 Feb 2024 10:56:14 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install Message-ID: <20240208095615.2397148-1-roy.kollen.svendsen@akersolutions.com> Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... Signed-off-by: Roy Kollen Svendsen --- Changes v1 -> v2: Make the --disable-tk option automatically set py_cv_module__tkinter=n/a (suggested by Thomas Petazzoni) --- .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 7fafbedddb..08617241a6 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,6 +70,8 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) -- 2.43.0 From antoine.coutant at smile.fr Thu Feb 8 10:25:22 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Thu, 8 Feb 2024 11:25:22 +0100 Subject: [Buildroot] [PATCH v4 2/7] package/pkg-meson.mk: add rust cross-compiler support In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-3-antoine.coutant@smile.fr> Message-ID: On 07/02/2024 16:13, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >> From: Romain Naour >> >> This change is needed to be able to build target packages requiring >> rust. If a package has rust in its project or in an add_language() >> call in their meson.build file, meson will try to find a suitable >> compiler for this language[1]. If the language is classified as >> required but not found, it will abort the build. >> >> It is necessary to specify rust and rust_ld separately in >> support/misc/cross-compilation.conf.in. If you specify it in one line >> just as "rust", it will generate the following warning: >> WARNING: Please do not put -C linker= in your compiler command, >> set rust_ld=command in your cross file or use the RUST_LD environment >> variable, otherwise meson will override your selection. >> >> [1] https://mesonbuild.com/Reference-manual_functions.html#add_languages >> >> Signed-off-by: Romain Naour >> Signed-off-by: Sebastian Weyer >> Signed-off-by: Antoine Coutant >> --- >> package/pkg-meson.mk | 13 +++++++++++++ >> support/misc/cross-compilation.conf.in | 2 ++ >> 2 files changed, 15 insertions(+) >> >> diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk >> index 65cabf23ba..25dd4f0d7f 100644 >> --- a/package/pkg-meson.mk >> +++ b/package/pkg-meson.mk >> @@ -82,6 +82,16 @@ else >> PKG_MESON_TARGET_FC = /bin/false >> endif >> >> +ifeq ($(BR2_PACKAGE_HOST_RUSTC),y) >> +PKG_MESON_TARGET_RUSTC = $(HOST_DIR)/bin/rustc >> +PKG_MESON_TARGET_RUSTC_LINKER = $(notdir $(TARGET_CROSS))gcc > Why can't PKG_MESON_TARGET_RUSTC_LINKER be an absolute path, when > PKG_MESON_TARGET_RUSTC is one, and [...] I tested with an absolute path and it worked. I don't know why I chose to use a relative path. Thanks for the report, I will make the change in the v5. Regards, Antoine Coutant >> +PKG_MESON_TARGET_RUSTC_TARGET_NAME = $(RUSTC_TARGET_NAME) >> +else >> +PKG_MESON_TARGET_RUSTC = /bin/false >> +PKG_MESON_TARGET_RUSTC_LINKER = /bin/false > [...] especially since here PKG_MESON_TARGET_RUSTC_LINKER is an absolute > path? > > Regards, > Yann E. MORIN. > >> +PKG_MESON_TARGET_RUSTC_TARGET_NAME = >> +endif >> + >> # Generates sed patterns for patching the cross-compilation.conf template, >> # since Flags might contain commas the arguments are passed indirectly by >> # variable name (stripped to deal with whitespaces). >> @@ -91,6 +101,7 @@ define PKG_MESON_CROSSCONFIG_SED >> -e "s%@TARGET_CXX@%$(PKG_MESON_TARGET_CXX)%g" \ >> -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ >> -e "s%@TARGET_FC@%$(PKG_MESON_TARGET_FC)%g" \ >> + -e "s%@TARGET_RUSTC@%$(PKG_MESON_TARGET_RUSTC)%g" \ >> -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ >> -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ >> -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ >> @@ -99,6 +110,8 @@ define PKG_MESON_CROSSCONFIG_SED >> -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ >> -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ >> -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ >> + -e "s%@TARGET_RUSTC_LINKER@%$(PKG_MESON_TARGET_RUSTC_LINKER)%g" \ >> + -e "s%@RUSTC_TARGET_NAME@%$(PKG_MESON_TARGET_RUSTC_TARGET_NAME)%g" \ >> -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ >> -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ >> -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ >> diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in >> index a58ab553d0..21cec10b82 100644 >> --- a/support/misc/cross-compilation.conf.in >> +++ b/support/misc/cross-compilation.conf.in >> @@ -13,6 +13,8 @@ fortran = '@TARGET_FC@' >> pkg-config = '@PKGCONF_HOST_BINARY@' >> g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' >> g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' >> +rust = ['@TARGET_RUSTC@', '--target', '@RUSTC_TARGET_NAME@' ] >> +rust_ld = '@TARGET_RUSTC_LINKER@' >> >> [built-in options] >> c_args = [@TARGET_CFLAGS@] >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Thu Feb 8 10:29:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 8 Feb 2024 11:29:40 +0100 Subject: [Buildroot] [PATCH 0/3] Add support for the WPE WebKit RDK backend In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> Message-ID: <20240208112940.6fa6e89b@windsurf> Hello Adrian, On Thu, 8 Feb 2024 11:55:27 +0200 Adrian Perez de Castro wrote: > This patch series allows using the RDK backend for WPE WebKit. Currently the > main use case is to run WPEWebKit on RaspberryPi boards using on Dispmanx via > the rpi-userland EGL/GLES libraries. Thanks for this patch series! We have some other patches in patchwork related to webkit: Some from you: https://patchwork.ozlabs.org/project/buildroot/patch/20230423213001.2961215-1-aperez at igalia.com/ https://patchwork.ozlabs.org/project/buildroot/patch/20230423213233.2961770-1-aperez at igalia.com/ Are they still valid/application? We also have twice the same (?) patch from Giulio: https://patchwork.ozlabs.org/project/buildroot/patch/20230221161522.3749804-1-giulio.benetti at benettiengineering.com/ https://patchwork.ozlabs.org/project/buildroot/patch/20230221161522.3749804-2-giulio.benetti at benettiengineering.com/ is it relevant? Could you have a look so we can hopefully clear up the backlog? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From roykollensvendsen at gmail.com Thu Feb 8 10:50:34 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Thu, 8 Feb 2024 11:50:34 +0100 Subject: [Buildroot] [PATCH v2] package/python3: fix install In-Reply-To: <20240208074901.1654224-1-roy.kollen.svendsen@akersolutions.com> References: <20240208074901.1654224-1-roy.kollen.svendsen@akersolutions.com> Message-ID: <20240208105034.2401301-2-roy.kollen.svendsen@akersolutions.com> Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... Signed-off-by: Roy Kollen Svendsen --- Changes v1 -> v2: Make the --disable-tk option automatically set py_cv_module__tkinter=n/a (suggested by Thomas Petazzoni) --- .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 7fafbedddb..08617241a6 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,6 +70,8 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) -- 2.43.0 From thomas.petazzoni at bootlin.com Thu Feb 8 10:52:59 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 8 Feb 2024 11:52:59 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/tinymembench: force arm mode instead of Thumb mode In-Reply-To: References: <20240114135446.1156025-1-fontaine.fabrice@gmail.com> <20240207164741.1bad9b44@windsurf> Message-ID: <20240208115259.150a3219@windsurf> On Wed, 7 Feb 2024 21:48:51 +0100 Fabrice Fontaine wrote: > - upstream seems dead now so non upstreamable patches will have to be > kept "forever" Indeed. The repo has not seen any commits since 11 years, despite PRs and issues being opened by several people. I think we should drop this package, and stop bothering. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Thu Feb 8 11:12:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 12:12:13 +0100 Subject: [Buildroot] [PATCH] package/libopenssl: security bump to version 3.2.1 Message-ID: <20240208111214.679980-1-peter@korsgaard.com> And drop the now upstreamed patches. Fixes the following (low severity) issues: - CVE-2023-6129 POLY1305 MAC implementation corrupts vector registers on PowerPC https://www.openssl.org/news/secadv/20240109.txt - CVE-2023-6237 Excessive time spent checking invalid RSA public keys https://www.openssl.org/news/secadv/20240115.txt - CVE-2024-0727 PKCS12 Decoding crashes https://www.openssl.org/news/secadv/20240125.txt Signed-off-by: Peter Korsgaard --- ...x-mispelling-of-extension-test-macro.patch | 30 ----- ...x-genstr-genconf-option-in-asn1parse.patch | 42 ------ ...en-asn1-oid-loader-to-invalid-inputs.patch | 122 ------------------ package/libopenssl/libopenssl.hash | 4 +- package/libopenssl/libopenssl.mk | 2 +- 5 files changed, 3 insertions(+), 197 deletions(-) delete mode 100644 package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch delete mode 100644 package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch delete mode 100644 package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch diff --git a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch deleted file mode 100644 index 93b191a61c..0000000000 --- a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001 -From: Grant Nichol -Date: Fri, 22 Dec 2023 23:46:39 -0600 -Subject: [PATCH] riscv: Fix mispelling of extension test macro - -When refactoring the riscv extension test macros, -RISCV_HAS_ZKND_AND_ZKNE was mispelled. - -Upstream: https://github.com/openssl/openssl/pull/23139 -Signed-off-by: Grant Nichol ---- - providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c -index b35b71020e..65adc47d1f 100644 ---- a/providers/implementations/ciphers/cipher_aes_xts_hw.c -+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c -@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \ - # define PROV_CIPHER_HW_select_xts() \ - if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \ - return &aes_xts_rv32i_zbkb_zknd_zkne; \ --if (RISCV_HAS_ZKND_ZKNE()) \ -+if (RISCV_HAS_ZKND_AND_ZKNE()) \ - return &aes_xts_rv32i_zknd_zkne; - # else - /* The generic case */ --- -2.43.0 - diff --git a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch b/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch deleted file mode 100644 index 9fa36d83be..0000000000 --- a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 749fcc0e3ce796474a15d6fac221e57daeacff1e Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Tue, 5 Dec 2023 14:50:01 -0500 -Subject: [PATCH] Fix genstr/genconf option in asn1parse - -At some point the asn1parse applet was changed to default the inform to -PEM, and defalt input file to stdin. Doing so broke the -genstr|conf options, -in that, before we attempt to generate an ASN1 block from the provided -genstr string, we attempt to read a PEM input from stdin. As a result, -this command: -openssl asn1parse -genstr OID:1.2.3.4 -hangs because we are attempting a blocking read on stdin, waiting for -data that never arrives - -Fix it by giving priority to genstr|genconf, such that, if set, will just run -do_generate on that string and exit - -Reviewed-by: Hugo Landau -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/22957) -Upstream: https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e -Signed-off-by: Martin Kurbanov ---- - apps/asn1parse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apps/asn1parse.c b/apps/asn1parse.c -index 097b0cc1ed..6597a6180b 100644 ---- a/apps/asn1parse.c -+++ b/apps/asn1parse.c -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) - - if ((buf = BUF_MEM_new()) == NULL) - goto end; -- if (informat == FORMAT_PEM) { -+ if (genstr == NULL && informat == FORMAT_PEM) { - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { - BIO_printf(bio_err, "Error reading PEM file\n"); - ERR_print_errors(bio_err); --- -2.40.0 - diff --git a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch b/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch deleted file mode 100644 index 299ecbc2ed..0000000000 --- a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch +++ /dev/null @@ -1,122 +0,0 @@ -From a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Tue, 5 Dec 2023 15:24:20 -0500 -Subject: [PATCH] Harden asn1 oid loader to invalid inputs - -In the event that a config file contains this sequence: -======= -openssl_conf = openssl_init - -config_diagnostics = 1 - -[openssl_init] -oid_section = oids - -[oids] -testoid1 = 1.2.3.4.1 -testoid2 = A Very Long OID Name, 1.2.3.4.2 -testoid3 = ,1.2.3.4.3 -====== - -The leading comma in testoid3 can cause a heap buffer overflow, as the -parsing code will move the string pointer back 1 character, thereby -pointing to an invalid memory space - -correct the parser to detect this condition and handle it by treating it -as if the comma doesn't exist (i.e. an empty long oid name) - -Reviewed-by: Hugo Landau -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/22957) -Upstream: https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 -Signed-off-by: Martin Kurbanov ---- - apps/asn1parse.c | 2 +- - crypto/asn1/asn_moid.c | 4 ++++ - test/recipes/04-test_asn1_parse.t | 26 ++++++++++++++++++++++++++ - test/test_asn1_parse.cnf | 12 ++++++++++++ - 4 files changed, 43 insertions(+), 1 deletion(-) - create mode 100644 test/recipes/04-test_asn1_parse.t - create mode 100644 test/test_asn1_parse.cnf - -diff --git a/apps/asn1parse.c b/apps/asn1parse.c -index 6597a6180b..bf62f85947 100644 ---- a/apps/asn1parse.c -+++ b/apps/asn1parse.c -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) - - if ((buf = BUF_MEM_new()) == NULL) - goto end; -- if (genstr == NULL && informat == FORMAT_PEM) { -+ if (genconf == NULL && genstr == NULL && informat == FORMAT_PEM) { - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { - BIO_printf(bio_err, "Error reading PEM file\n"); - ERR_print_errors(bio_err); -diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c -index 6f816307af..1e183f4f18 100644 ---- a/crypto/asn1/asn_moid.c -+++ b/crypto/asn1/asn_moid.c -@@ -67,6 +67,10 @@ static int do_create(const char *value, const char *name) - if (p == NULL) { - ln = name; - ostr = value; -+ } else if (p == value) { -+ /* we started with a leading comma */ -+ ln = name; -+ ostr = p + 1; - } else { - ln = value; - ostr = p + 1; -diff --git a/test/recipes/04-test_asn1_parse.t b/test/recipes/04-test_asn1_parse.t -new file mode 100644 -index 0000000000..f3af436592 ---- /dev/null -+++ b/test/recipes/04-test_asn1_parse.t -@@ -0,0 +1,26 @@ -+#! /usr/bin/env perl -+# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. -+# -+# Licensed under the Apache License 2.0 (the "License"). You may not use -+# this file except in compliance with the License. You can obtain a copy -+# in the file LICENSE in the source distribution or at -+# https://www.openssl.org/source/license.html -+ -+use strict; -+use OpenSSL::Test qw(:DEFAULT srctop_file); -+use OpenSSL::Test::Utils; -+ -+setup("test_asn1_parse"); -+ -+plan tests => 3; -+ -+$ENV{OPENSSL_CONF} = srctop_file("test", "test_asn1_parse.cnf"); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.1'])))); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.2'])))); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.3'])))); -diff --git a/test/test_asn1_parse.cnf b/test/test_asn1_parse.cnf -new file mode 100644 -index 0000000000..5f0305657e ---- /dev/null -+++ b/test/test_asn1_parse.cnf -@@ -0,0 +1,12 @@ -+openssl_conf = openssl_init -+ -+# Comment out the next line to ignore configuration errors -+config_diagnostics = 1 -+ -+[openssl_init] -+oid_section = oids -+ -+[oids] -+testoid1 = 1.2.3.4.1 -+testoid2 = A Very Long OID Name, 1.2.3.4.2 -+testoid3 = ,1.2.3.4.3 --- -2.40.0 - diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 9e09e12461..841d4b4cfd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.2.0.tar.gz.sha256 -sha256 14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e openssl-3.2.0.tar.gz +# From https://www.openssl.org/source/openssl-3.2.1.tar.gz.sha256 +sha256 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 openssl-3.2.1.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 7dc6d93256..feb5026c02 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.2.0 +LIBOPENSSL_VERSION = 3.2.1 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 -- 2.39.2 From raphael.melotte at mind.be Thu Feb 8 11:28:10 2024 From: raphael.melotte at mind.be (=?UTF-8?B?UmFwaGHDq2wgTcOpbG90dGU=?=) Date: Thu, 8 Feb 2024 12:28:10 +0100 Subject: [Buildroot] [PATCH 6/6] package/python-pymupdf: bump to version 1.23.9rc2 In-Reply-To: <20240110093850.2302133-6-james.hilliard1@gmail.com> References: <20240110093850.2302133-1-james.hilliard1@gmail.com> <20240110093850.2302133-6-james.hilliard1@gmail.com> Message-ID: <454a12aa-fe40-4435-8c6e-5f020d960bb5@mind.be> Hi James, all, Thanks for the patches! I added a few comments/questions below. On 1/10/24 10:38, James Hilliard wrote: > Migrate to in tree pep517 based build backend. > Does this new version cross-compile for you? I get the following error because the wrong python-config is used (I only briefly tried armv5 so far): error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > Note that version 1.23.8 is not compatible with mupdf 1.23.8 due to > header conflict bugs that were fixed after the 1.23.8 release. > > Signed-off-by: James Hilliard > --- > package/python-pymupdf/python-pymupdf.hash | 4 +-- > package/python-pymupdf/python-pymupdf.mk | 33 ++++++++++++---------- > 2 files changed, 20 insertions(+), 17 deletions(-) > > diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash > index 9fd8150088..e57652ab69 100644 > --- a/package/python-pymupdf/python-pymupdf.hash > +++ b/package/python-pymupdf/python-pymupdf.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pymupdf/json > -md5 468fe56375a1fca99e83fe0aa0b9f8bd PyMuPDF-1.22.0.tar.gz > -sha256 6e1694e5c0cd8b92d503a506ee8e4ba1bed768528de586889d3ec90e9dc4a7d3 PyMuPDF-1.22.0.tar.gz > +md5 eb0b65eaa063c2417d89c5453e7c82ad PyMuPDF-1.23.9rc2.tar.gz > +sha256 ba6fdd907814acb968ce669f49b0c14ef9ef8b1e2d161829b7a31461aab04429 PyMuPDF-1.23.9rc2.tar.gz > # Locally computed sha256 checksums > sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING > diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk > index 639ce0e00e..ac76afa3f6 100644 > --- a/package/python-pymupdf/python-pymupdf.mk > +++ b/package/python-pymupdf/python-pymupdf.mk > @@ -5,25 +5,28 @@ > ################################################################################ > > # python-pymupdf's version must match mupdf's version > -PYTHON_PYMUPDF_VERSION = 1.22.0 > +PYTHON_PYMUPDF_VERSION = 1.23.9rc2 > PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz > -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/28/ba/d6bb6fd678e8396d7b944870286fb25fd6f499b8cb599b5436c8f725adbf > -PYTHON_PYMUPDF_SETUP_TYPE = setuptools > +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/b4/ff/db44303d60b8cc310a7187d500c7765b3b48aa113c86428d5d1c390b8fb5 > +PYTHON_PYMUPDF_SETUP_TYPE = pep517 > PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ > PYTHON_PYMUPDF_LICENSE_FILES = COPYING > # No license file included in pip, but it's present on github > -PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib > +PYTHON_PYMUPDF_DEPENDENCIES = \ > + host-python-libclang \ Isn't libclang only required by the PyMuPDF plumbing when it builds the bundled MuPDF? In our case since we're building MuPDF as a separate package, we hopefully don't need it... > + host-python-psutil \ From a quick look at the PyMuPDF code, this seems to be needed only for a single test (which we don't run, so we don't need it). > + host-python-setuptools \ > + host-python-swig \ The way I understand it, PyMuPDF added this host-python-swig dependency as a way to make sure swig is available when building. Since we already have host-swig as a dependency, we can probably use that one to build as Yann suggested? > + host-swig \ > + freetype \ > + mupdf \ > + zlib > > -PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" > - > -# We need to remove the original paths as we provide them in the CFLAGS: > -define PYTHON_PYMUPDF_REMOVE_PATHS > - sed -i "/\/usr\/include\/mupdf/d" $(@D)/setup.py > - sed -i "/\/usr\/include\/freetype2/d" $(@D)/setup.py > - sed -i "/\/usr\/local\/include\/mupdf/d" $(@D)/setup.py > - sed -i "/mupdf\/thirdparty\/freetype\/include/d" $(@D)/setup.py > -endef > - > -PYTHON_PYMUPDF_POST_PATCH_HOOKS = PYTHON_PYMUPDF_REMOVE_PATHS > +PYTHON_PYMUPDF_ENV = \ > + PYMUPDF_INCLUDES="$(STAGING_DIR)/usr/include/freetype2:$(STAGING_DIR)/usr/include" \ > + PYMUPDF_MUPDF_LIB="$(STAGING_DIR)/usr/lib" \ > + PYMUPDF_SETUP_FLAVOUR=p \> + PYMUPDF_SETUP_IMPLEMENTATIONS=a \ It's worth noting that PyMuPDF is gradually switching to a new implementation which will require MuPDF to be built with python bindings in the future (but for now, both implementations are still available AFAICT). > + PYMUPDF_SETUP_MUPDF_BUILD= > > $(eval $(python-package)) There seem to be more work needed to get this new version to work, I'll try to have a closer look at it in the next few days. Kind regards, Rapha?l From peter at korsgaard.com Thu Feb 8 12:52:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 13:52:47 +0100 Subject: [Buildroot] [PATCH 3/4] package/v4l2loopback: drop _CPE_ID_VENDOR In-Reply-To: <1bfeb8d9649b7bb7fcd44cab8b5bd811bf389c0f.1707060159.git.yann.morin.1998@free.fr> References: <1bfeb8d9649b7bb7fcd44cab8b5bd811bf389c0f.1707060159.git.yann.morin.1998@free.fr> Message-ID: <6433c090-b23b-4c5c-8097-9c3a77086509@korsgaard.com> On 04/02/2024 16.22, Yann E. MORIN wrote: > Commit 1edb9d691dec (package/v4l2loopback: add > V4L2LOOPBACK_CPE_ID_VENDOR) added that variable, but set to its default > value. > > This is however not required to define a valid CPE ID, as it also > defines a non-default CPE_ID_PREFIX. > > Drop V4L2LOOPBACK_CPE_ID_VENDOR now. > > Signed-off-by: Yann E. MORIN > Cc: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 8 12:57:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 08 Feb 2024 13:57:44 +0100 Subject: [Buildroot] [PATCH] package/webkitgtk: security bump to version 2.42.5 In-Reply-To: <20240208070939.493203-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 8 Feb 2024 08:09:39 +0100") References: <20240208070939.493203-1-peter@korsgaard.com> Message-ID: <87h6ijyuyf.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issues: > https://webkitgtk.org/security/WSA-2024-0001.html > - CVE-2024-23222: Processing maliciously crafted web content may lead to > arbitrary code execution. Apple is aware of a report that this issue may > have been exploited. Description: A type confusion issue was addressed > with improved checks. > - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint > the user. Description: An access issue was addressed with improved access > restrictions. > - CVE-2024-23213: Processing web content may lead to arbitrary code execution. > Description: The issue was addressed with improved memory handling. > - CVE-2023-40414: Processing web content may lead to arbitrary code > execution. Description: A use-after-free issue was addressed with > improved memory management. > - CVE-2023-42833: Processing web content may lead to arbitrary code execution. > Description: A correctness issue was addressed with improved checks. > - CVE-2014-1745: Processing a file may lead to a denial-of-service or > potentially disclose memory contents. Description: The issue was > addressed with improved checks. > https://webkitgtk.org/security/WSA-2023-0012.html > - CVE-2023-42883: Processing a SVG image may lead to a denial-of-service. > Description: The issue was addressed with improved memory handling. > - CVE-2023-42890: Processing web content may lead to arbitrary code > execution. Description: The issue was addressed with improved memory > handling. > https://webkitgtk.org/security/WSA-2023-0011.html > - CVE-2023-42916: Processing web content may disclose sensitive information. > Apple is aware of a report that this issue may have been actively > exploited. Description: An out-of-bounds read was addressed with improved > input validation. > - CVE-2023-42917: Processing web content may lead to arbitrary code > execution. Apple is aware of a report that this issue may have been > actively exploited. Description: A memory corruption vulnerability was > addressed with improved locking. > Add an upstream post-2.42.5 patch to fix an issue with an invalid backport > causing a build issue. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 8 12:48:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 13:48:01 +0100 Subject: [Buildroot] [git commit] package/v4l2loopback: drop _CPE_ID_VENDOR Message-ID: <20240208125807.0101787563@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74682e07df455aa49a637ebbda580df969e64ccf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 1edb9d691dec (package/v4l2loopback: add V4L2LOOPBACK_CPE_ID_VENDOR) added that variable, but set to its default value. This is however not required to define a valid CPE ID, as it also defines a non-default CPE_ID_PREFIX. Drop V4L2LOOPBACK_CPE_ID_VENDOR now. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/v4l2loopback/v4l2loopback.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/v4l2loopback/v4l2loopback.mk b/package/v4l2loopback/v4l2loopback.mk index 84e1927ce3..50a168fcab 100644 --- a/package/v4l2loopback/v4l2loopback.mk +++ b/package/v4l2loopback/v4l2loopback.mk @@ -8,7 +8,6 @@ V4L2LOOPBACK_VERSION = 0.12.7 V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,v$(V4L2LOOPBACK_VERSION)) V4L2LOOPBACK_LICENSE = GPL-2.0+ V4L2LOOPBACK_LICENSE_FILES = COPYING -V4L2LOOPBACK_CPE_ID_VENDOR = v4l2loopback_project V4L2LOOPBACK_CPE_ID_PREFIX = cpe:2.3:o ifeq ($(BR2_PACKAGE_V4L2LOOPBACK_UTILS),y) From peter at korsgaard.com Thu Feb 8 12:52:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 13:52:57 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: security bump to version 2.42.5 Message-ID: <20240208125807.0D3CA87565@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de3684f57df79c19eba34dac98418ceeaccd03db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: https://webkitgtk.org/security/WSA-2024-0001.html - CVE-2024-23222: Processing maliciously crafted web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been exploited. Description: A type confusion issue was addressed with improved checks. - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint the user. Description: An access issue was addressed with improved access restrictions. - CVE-2024-23213: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. - CVE-2023-40414: Processing web content may lead to arbitrary code execution. Description: A use-after-free issue was addressed with improved memory management. - CVE-2023-42833: Processing web content may lead to arbitrary code execution. Description: A correctness issue was addressed with improved checks. - CVE-2014-1745: Processing a file may lead to a denial-of-service or potentially disclose memory contents. Description: The issue was addressed with improved checks. https://webkitgtk.org/security/WSA-2023-0012.html - CVE-2023-42883: Processing a SVG image may lead to a denial-of-service. Description: The issue was addressed with improved memory handling. - CVE-2023-42890: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. https://webkitgtk.org/security/WSA-2023-0011.html - CVE-2023-42916: Processing web content may disclose sensitive information. Apple is aware of a report that this issue may have been actively exploited. Description: An out-of-bounds read was addressed with improved input validation. - CVE-2023-42917: Processing web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been actively exploited. Description: A memory corruption vulnerability was addressed with improved locking. Add an upstream post-2.42.5 patch to fix an issue with an invalid backport causing a build issue. Signed-off-by: Peter Korsgaard Acked-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...LowLevelInterpreter.cpp-339-21-error-t6-w.patch | 39 ++++++++++++++++++++++ package/webkitgtk/webkitgtk.hash | 6 ++-- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 0000000000..c9667fedbd --- /dev/null +++ b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Peter Korsgaard +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.39.2 + diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 59782732c3..ac4799d4cf 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.42.2.tar.xz.sums -sha1 05bec6a824e46f043b865478735bc8395249510e webkitgtk-2.42.2.tar.xz -sha256 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 webkitgtk-2.42.2.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.5.tar.xz.sums +sha1 c3ffb2beaac56f1089029f2254482f48d9e3db37 webkitgtk-2.42.5.tar.xz +sha256 b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 webkitgtk-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 611d7f65d3..075a36654f 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.42.2 +WEBKITGTK_VERSION = 2.42.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From sebastien.szymanski at armadeus.com Thu Feb 8 12:54:21 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Thu, 8 Feb 2024 13:54:21 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> Message-ID: <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> This commit adds i.MX91 and i.MX93 support to Buildroot. https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors:IMX9-PROCESSORS There is no i.MX95 software provided by NXP at the moment that's why i.MX95 is left behind. Adapt package firmware-imx for the LPPDR4 firwmares binaries. Reviewed-by: Gary Bisson Signed-off-by: S?bastien Szymanski --- Changes for v5: - none Changes for v4 - move i.MX Silicon Revision changes into this patch (Gary Bisson) - BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION default to "v202201" instead of just "202201" (Gary Bisson) - Copy all DDR files to $(BINARIES_DIR) as U-Boot can now create a bootable image: https://source.denx.de/u-boot/u-boot/-/commit/f637dfe8c468229c9fb313d13c46d51cdbb88824 - remove "pmu_train" from generated _pad binary file names Changes for v3: - none Changes for v2: - none --- package/freescale-imx/Config.in | 37 ++++++++++++++++++++++ package/freescale-imx/firmware-imx/Config.in | 9 ++++++ package/freescale-imx/firmware-imx/firmware-imx.mk | 25 +++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 1c26b3cc6f4c..ba169ead18cb 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -61,6 +61,41 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL bool "imx8dxl" +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + bool "imx91" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + bool "imx93" + +endchoice + +choice + prompt "i.MX Silicon Revision" + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 \ + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 \ + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + help + Some packages related to the selected i.MX platform need to know the + silicon revision of the platform they will run on. + If you don't know, leave the default value. + + Note - mismatches may result in a failure to boot! + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 + bool "imx91a1" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 + bool "imx93a0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + bool "imx93a1" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + endchoice config BR2_PACKAGE_FREESCALE_IMX_PLATFORM @@ -80,6 +115,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM default "IMX8MN" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN default "IMX8MP" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default "IMX91" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + default "IMX93" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU bool diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 087ddef8771b..d83b5e129a9f 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -55,6 +55,8 @@ config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW @@ -73,11 +75,15 @@ config BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 config BR2_PACKAGE_FIRMWARE_IMX_DDR4 bool "DDR4" + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 help Use DDR4 binaries (i.e.: ddr4_*_201810.bin). config BR2_PACKAGE_FIRMWARE_IMX_DDR3 bool "DDR3" + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 help Use DDR3 binaries (i.e.: ddr3_*_201810.bin). @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION # unconditionally use HW version 201810 when DDR3/DDR4 was # selected default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || BR2_PACKAGE_FIRMWARE_IMX_DDR4 + default "v202201" if \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 help Use a specific version of the imx ddr binaries. Leaving this field empty will select the default version. diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 66ef8c3930be..1f36f917cdc8 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -48,6 +48,30 @@ endif ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW + # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate lpddr4_fw.bin. + # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin + # which is done in post-image script. + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_1d_fw) + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_2d_fw) + cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ + $(BINARIES_DIR)/lpddr4_fw.bin + ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin + + # U-Boot supports creation of the combined flash.bin image. To make + # sure that U-Boot can access all available files copy them to + # the binary dir. + cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ +endef +else define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW # Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin. # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ endef endif +endif ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys -- 2.43.0 From sebastien.szymanski at armadeus.com Thu Feb 8 12:54:20 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Thu, 8 Feb 2024 13:54:20 +0100 Subject: [Buildroot] [PATCH v5 0/3] i.MX91 and i.MX93 support Message-ID: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> This series adds i.MX91, i.MX93 and i.MX93 11x11 EVK to Buildroot. --- Changes for v5: - follow BR coding style for the genimage.cfg.template_imx9 file (Giulio Benetti) Changes for v4: - "i.MX platform asic version" -> "i.MX Silicon Revision" (Gary Bisson) - move i.MX Silicon Revision changes into first patch (Gary Bisson) - BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION default to "v202201" instead of just "202201" (Gary Bisson) - Copy all DDR files to $(BINARIES_DIR) as U-Boot can now create a bootable image: https://source.denx.de/u-boot/u-boot/-/commit/f637dfe8c468229c9fb313d13c46d51cdbb88824 - remove "pmu_train" from generated _pad binary file names Changes for v3: - rename package firmware-sentinel to firmware-ele-imx - add a note about the debug UART in the readme.txt file (Julien Olivain) - add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y and BR2_TARGET_UBOOT_NEEDS_GNUTLS=y to the defconfig file (Julien Olivain) - bump ATF, U-Boot and Linux to latest NXP release lf-6.1.55-2.2.0 (Julien Olivain) Changes for v2: - patch 1 of v1 has been applied - move SoC asic version selection to package/freescale-imx/Config.in - minor fixes in latest patch --- S?bastien Szymanski (3): package/freescale-imx: add i.MX91 and i.MX93 SoC support package/freescale-imx/firmware-ele-imx: new package configs/freescale_imx93evk: new defconfig .../common/imx/genimage.cfg.template_imx9 | 42 ++++++++++++ .../common/imx/imx9-bootloader-prepare.sh | 34 ++++++++++ board/freescale/common/imx/post-image.sh | 4 ++ board/freescale/imx93evk/readme.txt | 77 ++++++++++++++++++++++ configs/freescale_imx93evk_defconfig | 39 +++++++++++ package/freescale-imx/Config.in | 38 +++++++++++ package/freescale-imx/firmware-ele-imx/Config.in | 21 ++++++ .../firmware-ele-imx/firmware-ele-imx.hash | 4 ++ .../firmware-ele-imx/firmware-ele-imx.mk | 27 ++++++++ package/freescale-imx/firmware-imx/Config.in | 9 +++ package/freescale-imx/firmware-imx/firmware-imx.mk | 25 +++++++ 11 files changed, 320 insertions(+) --- base-commit: ae5274dd545eb011f18cae24331300d944b8be0f change-id: 20240115-imx93-support-16671b5b7f12 Best regards, -- S?bastien Szymanski From buildroot at bubu1.eu Thu Feb 8 13:08:37 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 8 Feb 2024 14:08:37 +0100 Subject: [Buildroot] [PATCH] package/python-django: security bump to 5.0.2 Message-ID: <20240208130838.196406-1-buildroot@bubu1.eu> Minor 5.0 bugfix release [1] fixing one "moderate" severity CVE. Fixes: CVE-2024-24680 [1] https://docs.djangoproject.com/en/5.0/releases/5.0.2/#django-5-0-2-release-notes Signed-off-by: Marcus Hoffmann --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 39fd9afdae..20b66a4106 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 5ff3c69d7e6b4f5ed378ec5713af8df7 Django-5.0.1.tar.gz -sha256 8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854 Django-5.0.1.tar.gz +md5 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz +sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index ed4f4bcdf1..231de0b833 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.1 +PYTHON_DJANGO_VERSION = 5.0.2 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject -- 2.34.1 From buildroot at bubu1.eu Thu Feb 8 13:13:42 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 8 Feb 2024 14:13:42 +0100 Subject: [Buildroot] [PATCH] package/python-django: security bump to 5.0.2 In-Reply-To: <20240208130838.196406-1-buildroot@bubu1.eu> References: <20240208130838.196406-1-buildroot@bubu1.eu> Message-ID: <83bcb5ed-83bb-4680-9fbb-34e3d155cd21@bubu1.eu> Hi Peter, On 08.02.24 14:08, Marcus Hoffmann via buildroot wrote: > Minor 5.0 bugfix release [1] fixing one "moderate" severity CVE. > > Fixes: CVE-2024-24680 > > [1] https://docs.djangoproject.com/en/5.0/releases/5.0.2/#django-5-0-2-release-notes Buildroot stable releases should probably be updated to 4.2.10: https://www.djangoproject.com/weblog/2024/feb/06/security-releases/ > > Signed-off-by: Marcus Hoffmann > --- > package/python-django/python-django.hash | 4 ++-- > package/python-django/python-django.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash > index 39fd9afdae..20b66a4106 100644 > --- a/package/python-django/python-django.hash > +++ b/package/python-django/python-django.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/django/json > -md5 5ff3c69d7e6b4f5ed378ec5713af8df7 Django-5.0.1.tar.gz > -sha256 8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854 Django-5.0.1.tar.gz > +md5 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz > +sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz > # Locally computed sha256 checksums > sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE > diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk > index ed4f4bcdf1..231de0b833 100644 > --- a/package/python-django/python-django.mk > +++ b/package/python-django/python-django.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PYTHON_DJANGO_VERSION = 5.0.1 > +PYTHON_DJANGO_VERSION = 5.0.2 > PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz > # The official Django site has an unpractical URL > -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269 > +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa > PYTHON_DJANGO_LICENSE = BSD-3-Clause > PYTHON_DJANGO_LICENSE_FILES = LICENSE > PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From sebastien.szymanski at armadeus.com Thu Feb 8 12:54:22 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Thu, 8 Feb 2024 13:54:22 +0100 Subject: [Buildroot] [PATCH v5 2/3] package/freescale-imx/firmware-ele-imx: new package In-Reply-To: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> Message-ID: <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> This package provides firmware blobs for the Edgelock Secure Enclave (ELE) [1] present on i.MX8ULP and i.MX9 Socs. This version comes from the 6.1.55-2.2.0 release. [1] https://www.nxp.com/products/nxp-product-information/nxp-product-programs/edgelock-secure-enclave:EDGELOCK-SECURE-ENCLAVE Reviewed-by: Gary Bisson Signed-off-by: S?bastien Szymanski --- Changes for v5: - none Changes for v4: - move i.MX Silicon Revision changes into first patch (Gary Bisson) Changes for v3: - rename package from firmware-sentinel to package firmware-ele-imx Changes for v2: - none --- package/freescale-imx/Config.in | 1 + package/freescale-imx/firmware-ele-imx/Config.in | 21 +++++++++++++++++ .../firmware-ele-imx/firmware-ele-imx.hash | 4 ++++ .../firmware-ele-imx/firmware-ele-imx.mk | 27 ++++++++++++++++++++++ 4 files changed, 53 insertions(+) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index ba169ead18cb..f12acc3bd024 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -154,6 +154,7 @@ source "package/freescale-imx/imx-uuc/Config.in" source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/imx-vpu-hantro/Config.in" source "package/freescale-imx/imx-vpuwrap/Config.in" +source "package/freescale-imx/firmware-ele-imx/Config.in" source "package/freescale-imx/firmware-imx/Config.in" source "package/freescale-imx/imx-sc-firmware/Config.in" source "package/freescale-imx/imx-seco/Config.in" diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in new file mode 100644 index 000000000000..7867c3712c9c --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_FIRMWARE_ELE_IMX + bool "firmware-ele-imx" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + help + Firmware blobs for the Edgelock Secure Enclave (ELE) + present on i.MX8ULP and i.MX9 SoCs. + + This library is provided by NXP as-is and doesn't have an + upstream. + +if BR2_PACKAGE_FIRMWARE_ELE_IMX + +config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE + string + default "mx93a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 + default "mx93a1-ahab-container.img" if \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + +endif # BR2_PACKAGE_FIRMWARE_ELE_IMX diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash new file mode 100644 index 000000000000..58565cef43e9 --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca firmware-ele-imx-0.1.0.bin +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING +sha256 c800aaca3a7e9f470d99d7cde0a48c95982ed601d4c306f7b8f43f3710054f28 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 new file mode 100644 index 000000000000..600b50c5b456 --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# firmware-ele-imx +# +################################################################################ + +FIRMWARE_ELE_IMX_VERSION = 0.1.0 +FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) +FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin + +FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING SCR.txt +FIRMWARE_ELE_IMX_REDISTRIBUTE = NO + +FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES + +define FIRMWARE_ELE_IMX_EXTRACT_CMDS + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_ELE_IMX_DL_DIR)/$(FIRMWARE_ELE_IMX_SOURCE)) +endef + +FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE)) + +define FIRMWARE_ELE_IMX_INSTALL_IMAGES_CMDS + cp $(@D)/$(FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE) $(BINARIES_DIR)/ahab-container.img +endef + +$(eval $(generic-package)) -- 2.43.0 From peter at korsgaard.com Thu Feb 8 13:51:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 08 Feb 2024 14:51:32 +0100 Subject: [Buildroot] [PATCH] package/python-django: security bump to 5.0.2 In-Reply-To: <83bcb5ed-83bb-4680-9fbb-34e3d155cd21@bubu1.eu> (Marcus Hoffmann's message of "Thu, 8 Feb 2024 14:13:42 +0100") References: <20240208130838.196406-1-buildroot@bubu1.eu> <83bcb5ed-83bb-4680-9fbb-34e3d155cd21@bubu1.eu> Message-ID: <87cyt7ysgr.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann writes: > Hi Peter, > On 08.02.24 14:08, Marcus Hoffmann via buildroot wrote: >> Minor 5.0 bugfix release [1] fixing one "moderate" severity CVE. >> Fixes: CVE-2024-24680 >> [1] >> https://docs.djangoproject.com/en/5.0/releases/5.0.2/#django-5-0-2-release-notes > Buildroot stable releases should probably be updated to 4.2.10: > https://www.djangoproject.com/weblog/2024/feb/06/security-releases/ Yes, care to send a patch? 2023.02.x is using 4.1.13, but it looks like the 4.1.x series is EOL, so I'll also update that to 4.2.10. -- Bye, Peter Korsgaard From buildroot at bubu1.eu Thu Feb 8 14:08:01 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 8 Feb 2024 15:08:01 +0100 Subject: [Buildroot] [PATCH] package/python-uvicorn: bump to 0.27.0.post1 Message-ID: <20240208140802.984184-1-buildroot@bubu1.eu> Changelog: https://github.com/encode/uvicorn/blob/master/CHANGELOG.md#0270post1---2024-01-29 Signed-off-by: Marcus Hoffmann --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index cfa999e210..c7feaf3bfe 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 a1af843e7e305d551030abfa09dd3b15 uvicorn-0.24.0.post1.tar.gz -sha256 09c8e5a79dc466bdf28dead50093957db184de356fcdc48697bad3bde4c2588e uvicorn-0.24.0.post1.tar.gz +md5 a98f96c2578d9e6d454e271d0eae3ba3 uvicorn-0.27.0.post1.tar.gz +sha256 54898fcd80c13ff1cd28bf77b04ec9dbd8ff60c5259b499b4b12bb0917f22907 uvicorn-0.27.0.post1.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 04e6dd66a7..502cc06ad8 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.24.0.post1 +PYTHON_UVICORN_VERSION = 0.27.0.post1 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/e5/84/d43ce8fe6b31a316ef0ed04ea0d58cab981bdf7f17f8423491fa8b4f50b6 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/38/56/7bc5cf1d693d0c8e5d9dd66c29808691c17260b31346e4ddfbee26ba9bc2 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md -- 2.34.1 From peter at korsgaard.com Thu Feb 8 14:29:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 08 Feb 2024 15:29:28 +0100 Subject: [Buildroot] [PATCH] package/python-django: security bump to 5.0.2 In-Reply-To: <20240208130838.196406-1-buildroot@bubu1.eu> (Marcus Hoffmann via buildroot's message of "Thu, 8 Feb 2024 14:08:37 +0100") References: <20240208130838.196406-1-buildroot@bubu1.eu> Message-ID: <878r3vyqpj.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Minor 5.0 bugfix release [1] fixing one "moderate" severity CVE. > Fixes: CVE-2024-24680 > [1] https://docs.djangoproject.com/en/5.0/releases/5.0.2/#django-5-0-2-release-notes > Signed-off-by: Marcus Hoffmann Committed, thanks. > --- > package/python-django/python-django.hash | 4 ++-- > package/python-django/python-django.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash > index 39fd9afdae..20b66a4106 100644 > --- a/package/python-django/python-django.hash > +++ b/package/python-django/python-django.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/django/json > -md5 5ff3c69d7e6b4f5ed378ec5713af8df7 Django-5.0.1.tar.gz > -sha256 8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854 Django-5.0.1.tar.gz > +md5 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz > +sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz > # Locally computed sha256 checksums > sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE > diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk > index ed4f4bcdf1..231de0b833 100644 > --- a/package/python-django/python-django.mk > +++ b/package/python-django/python-django.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > -PYTHON_DJANGO_VERSION = 5.0.1 > +PYTHON_DJANGO_VERSION = 5.0.2 > PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz > # The official Django site has an unpractical URL > -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269 > +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa > PYTHON_DJANGO_LICENSE = BSD-3-Clause > PYTHON_DJANGO_LICENSE_FILES = LICENSE > PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject > -- > 2.34.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 8 14:29:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 15:29:18 +0100 Subject: [Buildroot] [git commit] package/python-django: security bump to 5.0.2 Message-ID: <20240208143011.D348E87598@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=034c57b2e24acaa236ac5f6a23e6e42b0522b221 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Minor 5.0 bugfix release [1] fixing one "moderate" severity CVE. Fixes: CVE-2024-24680 [1] https://docs.djangoproject.com/en/5.0/releases/5.0.2/#django-5-0-2-release-notes Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 39fd9afdae..20b66a4106 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 5ff3c69d7e6b4f5ed378ec5713af8df7 Django-5.0.1.tar.gz -sha256 8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854 Django-5.0.1.tar.gz +md5 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz +sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index ed4f4bcdf1..231de0b833 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.1 +PYTHON_DJANGO_VERSION = 5.0.2 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From sebastien.szymanski at armadeus.com Thu Feb 8 12:54:23 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Thu, 8 Feb 2024 13:54:23 +0100 Subject: [Buildroot] [PATCH v5 3/3] configs/freescale_imx93evk: new defconfig In-Reply-To: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> Message-ID: <20240115-imx93-support-v5-3-c2c950104c58@armadeus.com> This patch adds support for the NXP i.MX 93 11x11 EVK board [1]. [1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-93-evaluation-kit:i.MX93EVK Reviewed-by: Julien Olivain Tested-by: Julien Olivain [Julien: tested on NXP board i.MX93EVK, cpu rev A1, board rev B] Reviewed-by: Gary Bisson Reviewed-by: Giulio Benetti Signed-off-by: S?bastien Szymanski --- Changes for v5: - follow BR coding style for the genimage.cfg.template_imx9 file (Giulio Benetti) Changes for v4: - None Changes for v3: - BR2_PACKAGE_FIRMWARE_SENTINEL=y -> BR2_PACKAGE_FIRMWARE_ELE_IMX=y - add a note about the debug UART in the readme.txt file (Julien Olivain) - add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y and BR2_TARGET_UBOOT_NEEDS_GNUTLS=y to the defconfig file (Julien Olivain) - bump ATF, U-Boot and Linux to latest NXP release lf-6.1.55-2.2.0 (Julien Olivain) Changes for v2: - none --- .../common/imx/genimage.cfg.template_imx9 | 42 ++++++++++++ .../common/imx/imx9-bootloader-prepare.sh | 34 ++++++++++ board/freescale/common/imx/post-image.sh | 4 ++ board/freescale/imx93evk/readme.txt | 77 ++++++++++++++++++++++ configs/freescale_imx93evk_defconfig | 39 +++++++++++ 5 files changed, 196 insertions(+) diff --git a/board/freescale/common/imx/genimage.cfg.template_imx9 b/board/freescale/common/imx/genimage.cfg.template_imx9 new file mode 100644 index 000000000000..df7ddc25b73e --- /dev/null +++ b/board/freescale/common/imx/genimage.cfg.template_imx9 @@ -0,0 +1,42 @@ +# Minimal SD card image for the NXP i.MX9 boards +# +# We mimic the .sdcard NXP's image format: +# * the SD card must have 32 kB free space at the beginning, +# * U-Boot is integrated into imx9-boot-sd.bin and is dumped as is, +# * a FAT partition at offset 8MB is containing Image and DTB files +# * a single root filesystem partition is required (ext2, ext3 or ext4) +# + +image boot.vfat { + vfat { + label = "boot" + files = { + %FILES% + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition imx-boot { + in-partition-table = "no" + image = "imx9-boot-sd.bin" + offset = %IMXOFFSET% + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh new file mode 100755 index 000000000000..4ff92fa4cd23 --- /dev/null +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +main () +{ + SPL_LOAD_ADDR=0x2049A000 + ATF_LOAD_ADDR=0x204E0000 + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" ${BR2_CONFIG}; then + SPL_LOAD_ADDR=0x204A0000 + ATF_LOAD_ADDR=0x204C0000 + fi + + dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync + cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + + ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit + cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin + rm -f ${BINARIES_DIR}/mkimg.commit + + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -c -ap ${BINARIES_DIR}/bl31.bin a35 ${ATF_LOAD_ADDR} -ap ${BINARIES_DIR}/u-boot-hash.bin a35 0x80200000 -ap ${BINARIES_DIR}/tee.bin a35 0x96000000 -out ${BINARIES_DIR}/u-boot-atf-container.img + else + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -c -ap ${BINARIES_DIR}/bl31.bin a35 ${ATF_LOAD_ADDR} -ap ${BINARIES_DIR}/u-boot-hash.bin a35 0x80200000 -out ${BINARIES_DIR}/u-boot-atf-container.img + fi + + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -append ${BINARIES_DIR}/ahab-container.img -c -ap ${BINARIES_DIR}/u-boot-spl-ddr.bin a35 ${SPL_LOAD_ADDR} -out ${BINARIES_DIR}/imx9-boot-sd.bin + + flashbin_size=$(wc -c ${BINARIES_DIR}/imx9-boot-sd.bin | awk '{print $1}') + pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400)) + dd if=${BINARIES_DIR}/u-boot-atf-container.img of=${BINARIES_DIR}/imx9-boot-sd.bin bs=1K seek=${pad_cnt} + + exit $? +} + +main $@ diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index c359ef6032a6..3df7e820938b 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -48,6 +48,10 @@ genimage_type() echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx9" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx9" elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_no_boot_part_spl" diff --git a/board/freescale/imx93evk/readme.txt b/board/freescale/imx93evk/readme.txt new file mode 100644 index 000000000000..1173de39dbb1 --- /dev/null +++ b/board/freescale/imx93evk/readme.txt @@ -0,0 +1,77 @@ +********************* +NXP i.MX93 EVK board +********************* + +This file documents the Buildroot support for the i.MX 93 EVK board. + +Build +===== + +First, configure Buildroot for the i.MX 93 EVK board: + + make freescale_imx93evk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - ddr_fw.bin + - Image + - imx93-11x11-evk.dtb + - imx9-boot-sd.bin + - lpddr4_pmu_train_fw.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf-container.img + - u-boot.bin + - u-boot-hash.bin + - u-boot-spl.bin + - u-boot-spl-ddr.bin + - u-boot-spl-padded.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx9. + +Boot the i.MX 93 EVK board +=============================== + +To boot your newly created system (refer to the i.MX 93 EVK Documentation +[1] for guidance): +- insert the SD card in the SD slot of the board; +- Configure the switches as follows: +SW1301: 0100 SW1301[1-4] +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Note: the debug USB connector presents 4 UARTs (for example /dev/ttyUSB[0-3]), +the Cortex-A55 UART should be the 3rd one (in the previous example, /dev/ttyUSB2). +Refer to the documentation [1] for more details. + +Enjoy! + +References +========== +[1] https://www.nxp.com/document/guide/getting-started-with-the-i-mx93-evk:GS-IMX93EVK diff --git a/configs/freescale_imx93evk_defconfig b/configs/freescale_imx93evk_defconfig new file mode 100644 index 000000000000..34baf04c88db --- /dev/null +++ b/configs/freescale_imx93evk_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_ARM_FPU_VFPV4D16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +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.1.55-2.2.0)/linux-imx-lf-6.1.55-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" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y +BR2_PACKAGE_FIRMWARE_ELE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +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.1.55-2.2.0)/imx-atf-lf-6.1.55-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.1.55-2.2.0)/uboot-imx-lf-6.1.55-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 +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.43.0 From james.d.knight at live.com Thu Feb 8 16:55:30 2024 From: james.d.knight at live.com (James Knight) Date: Thu, 8 Feb 2024 11:55:30 -0500 Subject: [Buildroot] [PATCH 1/1] elfutils: drop lfs tweak Message-ID: When the elfutils package was first introduced, it filtered out LFS-related compiler flags due to issues with the package's implementation. This package has since evolved over the years to support LFS (e.g. using `AC_SYS_LARGEFILE` [1]). Filtering out `-D_FILE_OFFSET_BITS=64` can lead to a configuration error when `BR2_TIME_BITS_64` is enabled: checking whether gcc supports -Wl,-z,relro... yes checking for __thread support... no configure: error: __thread support required ... With the configuration log providing the specific reason: configure:7175: .../output-1/host/bin/m68k-buildroot-linux-gnu-gcc -o conftest -fPIC -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -shared -Wl,-z,defs -Wl,-z,relro -latomic -Wl,--build-id conftest.c >&5 In file included from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/stdlib.h:26, from conftest.c:13: .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ configure:7175: $? = 1 ... Fixes: - http://autobuild.buildroot.org/results/fbfe131673ed78999a07dbc879436e0ef6a8a1c0 [1]: https://sourceware.org/git/?p=elfutils.git;a=commit;h=3425454a10d307fae891fb667cf7969e945cde79 Signed-off-by: James Knight --- package/elfutils/elfutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index d43b545f2f81ec728573b5ac994e0b45a6813762..3531142fd2dafb01dedf583574ff3ad33524ba97 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -29,10 +29,6 @@ HOST_ELFUTILS_CONF_OPTS = \ --without-zstd \ --disable-progs -# elfutils gets confused when lfs mode is forced, so don't -ELFUTILS_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) -ELFUTILS_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) - ELFUTILS_CONF_ENV += \ CFLAGS="$(ELFUTILS_CFLAGS)" \ CPPFLAGS="$(ELFUTILS_CPPFLAGS)" -- 2.40.1.windows.1 From romain.naour at smile.fr Thu Feb 8 17:13:54 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 8 Feb 2024 18:13:54 +0100 Subject: [Buildroot] [git commit] configs/am574x_idk_defconfig: new defconfig Message-ID: <20240208171528.D14F6875E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35eb74c6343a9ec1407fb473271dda0516792391 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds a basic support for AM574x Industrial Development Kit [1]. Use multi_v7_defconfig as kernel configuration file instead of the deprecated omap2plus_defconfig [2]. The main differences between upstream kernels and the TI vendor tree (5.10.x based) are: - pru based 100M ethernet ports will not work with upstream kernels since the prueth driver for AM57 is not upstream yet (as of 6.8-rc2) [3]. - The ARM/DSP examples provided by TI [4] will not work either since they requires an experimental patch [5] adding "remote-processor messaging sockets". - There is no support for the POWERVR GPU SGX544 that requires additional userpace vendor (closed source) libraries. [1] https://www.ti.com/tool/TMDSIDK574 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cca9f6838bac3441a42fa906314bf5e3bff50ac5 [3] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=792b57aac224416f66175c15d60379a4cf581d0f [4] https://git.ti.com/cgit/processor-sdk/big-data-ipc-examples [5] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=f4b978a978c38149f712ddd137f12ed5fb914161 Signed-off-by: Romain Naour Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Romain Naour --- board/ti/am574x-idk/extlinux.conf | 4 ++++ board/ti/am574x-idk/genimage.cfg | 30 ++++++++++++++++++++++++++ board/ti/am574x-idk/post-build.sh | 4 ++++ board/ti/am574x-idk/readme.txt | 28 ++++++++++++++++++++++++ configs/am574x_idk_defconfig | 45 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+) diff --git a/board/ti/am574x-idk/extlinux.conf b/board/ti/am574x-idk/extlinux.conf new file mode 100644 index 0000000000..29e0ecfa14 --- /dev/null +++ b/board/ti/am574x-idk/extlinux.conf @@ -0,0 +1,4 @@ +label am5749-idk-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/board/ti/am574x-idk/genimage.cfg b/board/ti/am574x-idk/genimage.cfg new file mode 100644 index 0000000000..02a9ffe013 --- /dev/null +++ b/board/ti/am574x-idk/genimage.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "MLO", + "u-boot.img", + "zImage", + "am574x-idk.dtb", + "extlinux" + } + } + + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 1G + } +} diff --git a/board/ti/am574x-idk/post-build.sh b/board/ti/am574x-idk/post-build.sh new file mode 100755 index 0000000000..5dcdb352eb --- /dev/null +++ b/board/ti/am574x-idk/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${BINARIES_DIR}"/extlinux/extlinux.conf diff --git a/board/ti/am574x-idk/readme.txt b/board/ti/am574x-idk/readme.txt new file mode 100644 index 0000000000..4869984cf1 --- /dev/null +++ b/board/ti/am574x-idk/readme.txt @@ -0,0 +1,28 @@ +Texas Instuments AM574x IDK Test and Development Board + +Description +=========== + +This configuration will build a basic image for the TI AM574x IDK +board: https://www.ti.com/tool/TMDSIDK574 + +How to build it +=============== + +Configure Buildroot: + + $ make am574x_idk_defconfig + +Compile everything and build the USB flash drive image: + + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/am574x_idk_defconfig b/configs/am574x_idk_defconfig new file mode 100644 index 0000000000..bbae73dff4 --- /dev/null +++ b/configs/am574x_idk_defconfig @@ -0,0 +1,45 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am574x-idk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am574x-idk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am574x-idk/genimage.cfg" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="MLO" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From romain.naour at smile.fr Thu Feb 8 17:16:39 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 8 Feb 2024 18:16:39 +0100 Subject: [Buildroot] [PATCH] configs/am574x_idk_defconfig: new defconfig In-Reply-To: References: <20240131173827.1281120-1-romain.naour@smile.fr> Message-ID: <89be08e4-f2a3-4fb6-b1b5-b62cd2d03a82@smile.fr> Hello Giulio, Le 05/02/2024 ? 16:36, Giulio Benetti a ?crit?: > Hi Romain, > > On 31/01/24 18:38, Romain Naour wrote: >> This patch adds a basic support for AM574x Industrial Development Kit >> [1]. >> >> Use multi_v7_defconfig as kernel configuration file instead of >> the deprecated omap2plus_defconfig [2]. >> >> The main differences between upstream kernels and the TI vendor tree >> (5.10.x based) are: >> >> ?? - pru based 100M ethernet ports will not work with upstream kernels >> ?? since the prueth driver for AM57 is not upstream yet (as of 6.8-rc2) >> ?? [3]. >> >> ?? - The ARM/DSP examples provided by TI [4] will not work either since >> ?? they requires an experimental patch [5] adding "remote-processor >> ?? messaging sockets". >> >> ?? - There is no support for the POWERVR GPU SGX544 that requires >> ?? additional userpace vendor (closed source) libraries. >> >> [1] https://www.ti.com/tool/TMDSIDK574 >> [2] >> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cca9f6838bac3441a42fa906314bf5e3bff50ac5 >> [3] >> https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=792b57aac224416f66175c15d60379a4cf581d0f >> [4] https://git.ti.com/cgit/processor-sdk/big-data-ipc-examples >> [5] >> https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=f4b978a978c38149f712ddd137f12ed5fb914161 >> >> Signed-off-by: Romain Naour >> --- >> ? board/ti/am574x-idk/extlinux.conf |? 4 +++ >> ? board/ti/am574x-idk/genimage.cfg? | 30 +++++++++++++++++++++ >> ? board/ti/am574x-idk/post-build.sh |? 4 +++ >> ? board/ti/am574x-idk/readme.txt??? | 28 +++++++++++++++++++ >> ? configs/am574x_idk_defconfig????? | 45 +++++++++++++++++++++++++++++++ >> ? 5 files changed, 111 insertions(+) >> ? create mode 100644 board/ti/am574x-idk/extlinux.conf >> ? create mode 100644 board/ti/am574x-idk/genimage.cfg >> ? create mode 100755 board/ti/am574x-idk/post-build.sh >> ? create mode 100644 board/ti/am574x-idk/readme.txt >> ? create mode 100644 configs/am574x_idk_defconfig >> >> diff --git a/board/ti/am574x-idk/extlinux.conf >> b/board/ti/am574x-idk/extlinux.conf >> new file mode 100644 >> index 0000000000..29e0ecfa14 >> --- /dev/null >> +++ b/board/ti/am574x-idk/extlinux.conf >> @@ -0,0 +1,4 @@ >> +label am5749-idk-buildroot >> +? kernel /zImage >> +? fdtdir / >> +? append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait >> diff --git a/board/ti/am574x-idk/genimage.cfg b/board/ti/am574x-idk/genimage.cfg >> new file mode 100644 >> index 0000000000..02a9ffe013 >> --- /dev/null >> +++ b/board/ti/am574x-idk/genimage.cfg >> @@ -0,0 +1,30 @@ >> +image boot.vfat { >> +??? vfat { >> +??????? files = { >> +??????????? "MLO", >> +??????????? "u-boot.img", >> +??????????? "zImage", >> +??????????? "am574x-idk.dtb", >> +??????????? "extlinux" >> +??????? } >> +??? } >> + >> +??? size = 16M >> +} >> + >> +image sdcard.img { >> +??? hdimage { >> +??? } >> + >> +??? partition u-boot { >> +??????? partition-type = 0xC >> +??????? bootable = "true" >> +??????????????? image = "boot.vfat" >> +??? } >> + >> +??? partition rootfs { >> +??????? partition-type = 0x83 >> +??????? image = "rootfs.ext4" >> +??????? size = 1G >> +??? } >> +} >> diff --git a/board/ti/am574x-idk/post-build.sh >> b/board/ti/am574x-idk/post-build.sh >> new file mode 100755 >> index 0000000000..5dcdb352eb >> --- /dev/null >> +++ b/board/ti/am574x-idk/post-build.sh >> @@ -0,0 +1,4 @@ >> +#!/bin/sh >> +BOARD_DIR="$(dirname "$0")" >> + >> +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf >> "${BINARIES_DIR}"/extlinux/extlinux.conf >> diff --git a/board/ti/am574x-idk/readme.txt b/board/ti/am574x-idk/readme.txt >> new file mode 100644 >> index 0000000000..4869984cf1 >> --- /dev/null >> +++ b/board/ti/am574x-idk/readme.txt >> @@ -0,0 +1,28 @@ >> +Texas Instuments AM574x IDK Test and Development Board >> + >> +Description >> +=========== >> + >> +This configuration will build a basic image for the TI AM574x IDK >> +board: https://www.ti.com/tool/TMDSIDK574 >> + >> +How to build it >> +=============== >> + >> +Configure Buildroot: >> + >> +??? $ make am574x_idk_defconfig >> + >> +Compile everything and build the USB flash drive image: >> + >> +??? $ make >> + >> +How to write the SD card >> +======================== >> + >> +Once the build process is finished you will have an image called "sdcard.img" >> +in the output/images/ directory. >> + >> +Copy the bootable "sdcard.img" onto an SD card with "dd": >> + >> +? $ sudo dd if=output/images/sdcard.img of=/dev/sdX >> diff --git a/configs/am574x_idk_defconfig b/configs/am574x_idk_defconfig >> new file mode 100644 >> index 0000000000..bbae73dff4 >> --- /dev/null >> +++ b/configs/am574x_idk_defconfig >> @@ -0,0 +1,45 @@ >> +# Architecture >> +BR2_arm=y >> +BR2_cortex_a15=y >> + >> +# System >> +BR2_SYSTEM_DHCP="eth0" >> + >> +# Linux headers same as kernel, a 6.6 series >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y >> + >> +# Kernel >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" >> +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am574x-idk" >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> + >> +# Filesystem >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> + >> +# Image >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am574x-idk/post-build.sh" >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am574x-idk/genimage.cfg" >> + >> +# Bootloader >> +BR2_TARGET_UBOOT=y >> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y >> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" >> +BR2_TARGET_UBOOT_NEEDS_DTC=y >> +# BR2_TARGET_UBOOT_FORMAT_BIN is not set >> +BR2_TARGET_UBOOT_FORMAT_IMG=y >> +BR2_TARGET_UBOOT_SPL=y >> +BR2_TARGET_UBOOT_SPL_NAME="MLO" >> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >> + >> +# Required tools to create the SD image >> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >> +BR2_PACKAGE_HOST_GENIMAGE=y >> +BR2_PACKAGE_HOST_MTOOLS=y > > It looks good to me and I've build tested it using docker-run. > > Reviewed-by: Giulio Benetti > [Build Tested] > Tested-by: Giulio Benetti Thanks for the review and testing! Applied to master. Best regards, Romain > > Best regards From fontaine.fabrice at gmail.com Thu Feb 8 19:01:13 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 8 Feb 2024 20:01:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: References: Message-ID: Hi Andreas, Romain, Le jeu. 8 f?vr. 2024 ? 08:59, Andreas Ziegler a ?crit : > > Hi Fabrice, Romain, *, > > more complicated than I thought ... > > On 2024-02-07 11:30, Andreas Ziegler wrote: > > Hi Fabrice, > > > > sorry in case I do not reply to the latest message in the thread; my > > in-box is currently a bit crowded ... > > > > On 2024-02-06 18:59, Fabrice Fontaine wrote: > > > >> Message: 30 > >> Date: Tue, 6 Feb 2024 18:59:00 +0100 > >> From: Fabrice Fontaine > >> To: Romain Naour > >> Cc: buildroot at buildroot.org > >> Subject: Re: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS > >> Message-ID: > >> > >> Content-Type: text/plain; charset="UTF-8" > >> > >> Hello Romain, > >> > >> Le mar. 6 f?vr. 2024 ? 18:32, Romain Naour a > >> ?crit : > >>> > >>> Hello, > >>> > >>> Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit : > >>> > ncmpc is able to automatically detect NLS support since version 0.47 and > >>> > https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 > >>> > so let it handle automatically to avoid the following build failure with > >>> > a bootlin toolchain which embeds a gettext definition in libintl.h which > >>> > will clash with the fake gettext definition provided by ncmpc since > >>> > https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: > >>> > > >>> > In file included from ../src/save_playlist.cxx:8: > >>> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' > >>> > 39 | extern char *gettext (const char *__msgid) > >>> > | ^~~~~~~ > >>> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' > >>> > ../src/i18n.h:22:20: note: to match this '(' > >>> > 22 | #define gettext(x) (x) > >>> > | ^ > >>> > > >>> > Indeed, even if NLS is disabled by the user, libintl.h will be included > >>> > by > >>> > /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h > >>> > though include > >>> > >>> We usually want to explicitly handle such option from Buildroot > >>> package to not > >>> rely on automatic detection (as currently done). > >>> > >>> It look like more a bug in ncmpc build system? > >> > >> I don't know, upstream wants to have the same code with and without > >> NLS, so they decided to define a gettext macro when NLS is disabled. > >> I could find an upstreamable solution as upstream will probably reject > >> a patch that removes this gettext define and puts #ifdef ENABLE_NLS > >> before every gettext calls. > >> Do you have an upstreamable solution or should we just add a NLS > >> dependency to ncmpc? > > > > This is probably not related to NLS, but to gettext being included in > > the build by some other package. This tricks Meson into believing that > > NLS is enabled. > > > > Also, the code in meson.txt may lead to unexpected results: > > > > if meson.version().version_compare('>= 0.59') and not mini > > # Meson 0.59 has native libintl support > > intl_dep = dependency('intl', required: enable_nls) > > enable_nls = intl_dep.found() > > elif enable_nls.disabled() or mini > > intl_dep = dependency('', required: false) > > enable_nls = false > > elif cc.has_header('libintl.h') > > intl_dep = dependency('', required: false) > > enable_nls = true > > elif enable_nls.auto() > > intl_dep = dependency('', required: false) > > enable_nls = false > > else > > error('libintl.h not found') > > > > > > meson.txt works like nls=auto within Buildroot, thus reflecting the > setting of BR2_SYSTEM_ENABLE_NLS, so no worries. > > The toolchain seems to have been built with NLS support; the C++ library > makes use of this: > > [3/73] Compiling C++ object src/event/libevent.a.p/TimerList.cxx.o > FAILED: src/event/libevent.a.p/TimerList.cxx.o > /home/data/test/autobuild/host/bin/or1k-linux-g++ > -Isrc/event/libevent.a.p -Isrc/event -I../src/event -Isrc -I../src -I. > -I.. -fdiagnostics-color=always -Wall -Winvalid-pch -Wextra -Wpedantic > -std=c++2a -O3 -Wcast-qual -Wcast-align -Wdouble-promotion > -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn > -Wredundant-decls -Wshadow -Wundef -Wvla -Wwrite-strings > -fno-threadsafe-statics -fmerge-all-constants -Wno-non-virtual-dtor > -Wno-format-truncation -D_GNU_SOURCE -fvisibility=hidden > -ffunction-sections -fdata-sections -D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=2 > -fPIC -MD -MQ src/event/libevent.a.p/TimerList.cxx.o -MF > src/event/libevent.a.p/TimerList.cxx.o.d -o > src/event/libevent.a.p/TimerList.cxx.o -c ../src/event/TimerList.cxx > In file included from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h:36, > from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/bits/locale_facets_nonio.h:2064, > from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/locale:43, > from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/iomanip:45, > from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/bits/chrono_io.h:38, > from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/chrono:3330, > from ../src/event/Chrono.hxx:6, > from ../src/event/TimerList.hxx:7, > from ../src/event/TimerList.cxx:5: > /home/data/test/autobuild/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:23:2: > error: #error "libintl.h included here" > 23 | #error "libintl.h included here" > | ^~~~~ > > Probably the least invasive solution would be to add a new ncmpc > dependency: > > + depends on !BR2_TOOLCHAIN_HAS_FULL_GETTEXT || BR2_SYSTEM_ENABLE_NLS The following PR should fix the issue: https://github.com/MusicPlayerDaemon/ncmpc/pull/142 Waiting for upstream feedback. > > Kind regards, > Andreas Best Regards, Fabrice From fontaine.fabrice at gmail.com Thu Feb 8 19:54:38 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 8 Feb 2024 20:54:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinymembench: drop package Message-ID: <20240208195438.89814-1-fontaine.fabrice@gmail.com> As advised by Thomas Petazzoni in [1], drop tinymembench which is abandonned (last commit in 2017). Moreover, it raises the following build failure in Thumb mode: /tmp/ccaZHrla.s:40: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' /tmp/ccaZHrla.s:43: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' main.c:45: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode main.c:46: Error: unshifted register required -- `and r8,r7,r2,lsr#16' main.c:47: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode main.c:48: Error: unshifted register required -- `and r9,r6,r2,lsr#8' main.c:49: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240114135446.1156025-1-fontaine.fabrice at gmail.com/ Fixes: - http://autobuild.buildroot.org/results/1e359c294a8d71fb1833e5d04a6bc7d4fd533510 - http://autobuild.buildroot.org/results/c06010d7a2bdb33a1707266133a3880e14be7657 Signed-off-by: Fabrice Fontaine --- .checkpackageignore | 1 - Config.in.legacy | 6 +++ DEVELOPERS | 1 - package/Config.in | 1 - ...ix-build-on-Thumb-only-architectures.patch | 47 ------------------- package/tinymembench/Config.in | 12 ----- package/tinymembench/tinymembench.hash | 3 -- package/tinymembench/tinymembench.mk | 21 --------- 8 files changed, 6 insertions(+), 86 deletions(-) delete mode 100644 package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch delete mode 100644 package/tinymembench/Config.in delete mode 100644 package/tinymembench/tinymembench.hash delete mode 100644 package/tinymembench/tinymembench.mk diff --git a/.checkpackageignore b/.checkpackageignore index 4a1041a84a..a2b5c14a94 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1265,7 +1265,6 @@ package/tinyalsa/0001-include-time.h-before-asound.h.patch Upstream package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch Upstream package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch Upstream package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream -package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch Upstream package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables diff --git a/Config.in.legacy b/Config.in.legacy index 5e0db855cc..a869279af7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_TINYMEMBENCH + bool "tinymembench removed" + select BR2_LEGACY + help + tinymembench has been removed due to being abandoned. + config BR2_PACKAGE_DAVINCI_BOOTCOUNT bool "davinci-bootcount has been renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index eeca05cd94..5632d2771d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1064,7 +1064,6 @@ F: package/snort3/ F: package/suricata/ F: package/tinycbor/ F: package/tinydtls/ -F: package/tinymembench/ F: package/whois/ F: package/x11r7/xlib_libXpresent/ F: package/zeek/ diff --git a/package/Config.in b/package/Config.in index ee4058155d..ebcc8c2655 100644 --- a/package/Config.in +++ b/package/Config.in @@ -156,7 +156,6 @@ menu "Debugging, profiling and benchmark" source "package/sysdig/Config.in" source "package/sysprof/Config.in" source "package/tcf-agent/Config.in" - source "package/tinymembench/Config.in" source "package/trace-cmd/Config.in" source "package/trinity/Config.in" source "package/uclibc-ng-test/Config.in" diff --git a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch b/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch deleted file mode 100644 index 88559ec012..0000000000 --- a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 034a3552e9700c6d424bd706db106f5bce1f5a5e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 11 Nov 2016 21:49:39 +0100 -Subject: [PATCH] arm: fix build on Thumb-only architectures - -Building tinymembench for ARM Cortex-M currently fails, because the -arm-neon.S file contains ARM code that doesn't build on Thumb-only -architectures. To account for this and fix the build for Cortex-M, -this patch adjusts the compile time condition to also verify that the -architecture supports the ARM instruction set, by testing the -__ARM_ARCH_ISA_ARM compiler define. - -Signed-off-by: Thomas Petazzoni ---- - arm-neon.S | 2 +- - asm-opt.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arm-neon.S b/arm-neon.S -index 4db78ce..19c30ad 100644 ---- a/arm-neon.S -+++ b/arm-neon.S -@@ -21,7 +21,7 @@ - * DEALINGS IN THE SOFTWARE. - */ - --#ifdef __arm__ -+#if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) - - .text - .fpu neon -diff --git a/asm-opt.c b/asm-opt.c -index 9da4596..eba1183 100644 ---- a/asm-opt.c -+++ b/asm-opt.c -@@ -202,7 +202,7 @@ bench_info *get_asm_framebuffer_benchmarks(void) - return empty; - } - --#elif defined(__arm__) -+#elif defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) - - #include "arm-neon.h" - --- -2.7.4 - diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in deleted file mode 100644 index 8f6e1a2b35..0000000000 --- a/package/tinymembench/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_TINYMEMBENCH - bool "tinymembench" - depends on !BR2_MIPS_NABI32 && !BR2_MIPS_NABI64 - help - Tinymembench is a simple memory benchmark program, which - tries to measure the peak bandwidth of sequential memory - accesses and the latency of random memory accesses. - Bandwidth is measured by running different assembly code for - the aligned memory blocks and attempting different prefetch - strategies. - - https://github.com/ssvb/tinymembench diff --git a/package/tinymembench/tinymembench.hash b/package/tinymembench/tinymembench.hash deleted file mode 100644 index 04dbd30f81..0000000000 --- a/package/tinymembench/tinymembench.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-0.4.tar.gz -sha256 8ba473aced4630aee2808efe17b53e904a9d68a9b3361de491717f9a4e75da39 LICENSE diff --git a/package/tinymembench/tinymembench.mk b/package/tinymembench/tinymembench.mk deleted file mode 100644 index 016d680ce7..0000000000 --- a/package/tinymembench/tinymembench.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# tinymembench -# -################################################################################ - -TINYMEMBENCH_VERSION = 0.4 -TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,v$(TINYMEMBENCH_VERSION)) -TINYMEMBENCH_LICENSE = MIT -TINYMEMBENCH_LICENSE_FILES = LICENSE - -define TINYMEMBENCH_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define TINYMEMBENCH_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/tinymembench \ - $(TARGET_DIR)/usr/bin/tinymembench -endef - -$(eval $(generic-package)) -- 2.43.0 From ju.o at free.fr Thu Feb 8 20:15:59 2024 From: ju.o at free.fr (Julien Olivain) Date: Thu, 8 Feb 2024 21:15:59 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add attr runtime test Message-ID: <20240208201559.112223-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_attr.py | 75 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 support/testing/tests/package/test_attr.py diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..635d7aedd1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1767,6 +1767,7 @@ F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py +F: support/testing/tests/package/test_attr.py F: support/testing/tests/package/test_bc.py F: support/testing/tests/package/test_brotli.py F: support/testing/tests/package/test_bzip2.py diff --git a/support/testing/tests/package/test_attr.py b/support/testing/tests/package/test_attr.py new file mode 100644 index 0000000000..1b43f7daf6 --- /dev/null +++ b/support/testing/tests/package/test_attr.py @@ -0,0 +1,75 @@ +import os + + +import infra.basetest + + +class TestAttr(infra.basetest.BRTest): + # Note: this test uses extended attributes (xattr). We use a ext4 + # rootfs (which fully supports xattrs). Note that tmpfs has + # partial support of xattrs, and cpio initrd has not. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ATTR=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + disk_file = os.path.join(self.builddir, "images", "rootfs.ext4") + self.emulator.boot(arch="armv5", + kernel="builtin", + kernel_cmdline=["rootwait", "root=/dev/sda"], + options=["-drive", f"file={disk_file},if=scsi,format=raw"]) + self.emulator.login() + + # Check the programs can execute. + self.assertRunOk("getfattr --version") + self.assertRunOk("setfattr --version") + + test_file = "/root/file.txt" + attr_name = "buildroot" + attr_value = "is-great" + + # Create a test file. + self.assertRunOk(f"echo 'Hello Buildroot!' > {test_file}") + + # Set an extended attribute. + cmd = f"setfattr -n user.{attr_name} -v {attr_value} {test_file}" + self.assertRunOk(cmd) + + # Read back the attribute value. We add an extra "echo" to add + # a new line. getfattr --only-values prints raw attribute + # values and lack of a new line. + cmd = "getfattr" + cmd += f" -n user.{attr_name} --absolute-names --only-values" + cmd += f" {test_file} && echo" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], attr_value) + + # We read back the attribute value again, but with the "attr" + # command this time. + cmd = f"attr -q -g {attr_name} {test_file} && echo" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], attr_value) + + # List extended attributes with "attr", and check we see our + # test attribute. + cmd = f"attr -l {test_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn(attr_name, "\n".join(out)) + + # Remove the test attribute with setfattr. + cmd = f"setfattr -x user.{attr_name} {test_file}" + self.assertRunOk(cmd) + + # We check the test attribute is no longer listed by the attr + # command. + cmd = f"attr -l {test_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertNotIn(attr_name, "\n".join(out)) -- 2.43.0 From tekieli.lukasz at gmail.com Thu Feb 8 21:15:15 2024 From: tekieli.lukasz at gmail.com (Lukasz Tekieli) Date: Thu, 8 Feb 2024 22:15:15 +0100 Subject: [Buildroot] [PATCH v2 0/2] board/visionfive2: enable u-boot Message-ID: <20240208211517.9234-1-tekieli.lukasz@gmail.com> This series adds support for U-Boot deployment in SD card image. Lukasz Tekieli (2): board/visionfive2: fix genimage.cfg path board/visionfive2: enable u-boot board/visionfive2/genimage.cfg | 16 +++++++++------- configs/visionfive2_defconfig | 21 ++++++++++++++++++++- 2 files changed, 29 insertions(+), 8 deletions(-) -- 2.39.2 From tekieli.lukasz at gmail.com Thu Feb 8 21:15:16 2024 From: tekieli.lukasz at gmail.com (Lukasz Tekieli) Date: Thu, 8 Feb 2024 22:15:16 +0100 Subject: [Buildroot] [PATCH v2 1/2] board/visionfive2: fix genimage.cfg path In-Reply-To: <20240208211517.9234-1-tekieli.lukasz@gmail.com> References: <20240208211517.9234-1-tekieli.lukasz@gmail.com> Message-ID: <20240208211517.9234-2-tekieli.lukasz@gmail.com> Set correct directory for the BR2_ROOTFS_POST_SCRIPT_ARGS. Signed-off-by: Lukasz Tekieli --- Changes for v2: - fix extracted to a separate commit --- configs/visionfive2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index dc086953a0..3a1a4f527c 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,05533e9c31d6f0da20efc2d436a3b0f6d516ed4b)/linux-05533e9c31d6f0da20efc2d436a3b0f6d516ed4b.tar.gz" -- 2.39.2 From tekieli.lukasz at gmail.com Thu Feb 8 21:15:17 2024 From: tekieli.lukasz at gmail.com (Lukasz Tekieli) Date: Thu, 8 Feb 2024 22:15:17 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/visionfive2: enable u-boot In-Reply-To: <20240208211517.9234-1-tekieli.lukasz@gmail.com> References: <20240208211517.9234-1-tekieli.lukasz@gmail.com> Message-ID: <20240208211517.9234-3-tekieli.lukasz@gmail.com> Enables U-Boot and required OpenSBI builds for the VisionFive2. Changes the sdcard.img to use GPT and adds the SPL and U-Boot to partitons specified in U-Boot's documentation for the board. U-Boot config uses BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME with value "u-boot.itb". Using BR2_TARGET_UBOOT_FORMAT_ITB fails, because the build does not support u-boot.itb make target. Signed-off-by: Lukasz Tekieli --- Changes for v2: - added fixed U-Boot version - added fixed OpenSBI version --- board/visionfive2/genimage.cfg | 16 +++++++++------- configs/visionfive2_defconfig | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/board/visionfive2/genimage.cfg b/board/visionfive2/genimage.cfg index c221b49c7b..8133e740c0 100644 --- a/board/visionfive2/genimage.cfg +++ b/board/visionfive2/genimage.cfg @@ -2,20 +2,22 @@ image sdcard.img { hdimage { + partition-table-type = "gpt" } - # u-boot is hard coded to look at 3rd partition - partition dummy1 { - size = 512 + partition spl { + partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + image = "u-boot-spl.bin.normal.out" } - partition dummy2 { - size = 512 + partition uboot { + partition-type-uuid = BC13C2FF-59E6-4262-A352-B275FD6F7172 + image = "u-boot.itb" } partition rootfs { - partition-type = 0x83 + partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + bootable = true image = "rootfs.ext4" - bootable = "true" } } diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index 3a1a4f527c..c8576a35a7 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -15,4 +15,23 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.4" +BR2_TARGET_OPENSBI_PLAT="generic" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES="FW_TEXT_START=0x40000000 FW_OPTIONS=0" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin.normal.out" BR2_PACKAGE_HOST_GENIMAGE=y -- 2.39.2 From ju.o at free.fr Thu Feb 8 21:26:09 2024 From: ju.o at free.fr (Julien Olivain) Date: Thu, 8 Feb 2024 22:26:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/ddrescue: bump to version 1.28 Message-ID: <20240208212610.256053-1-ju.o@free.fr> See the release announce: https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00014.html Signed-off-by: Julien Olivain --- package/ddrescue/ddrescue.hash | 4 ++-- package/ddrescue/ddrescue.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ddrescue/ddrescue.hash b/package/ddrescue/ddrescue.hash index 3caec5667f..4103d4fd6f 100644 --- a/package/ddrescue/ddrescue.hash +++ b/package/ddrescue/ddrescue.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-01/msg00011.html -sha256 38c80c98c5a44f15e53663e4510097fd68d6ec20758efdf3a925037c183232eb ddrescue-1.27.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00014.html +sha256 6626c07a7ca1cc1d03cad0958522c5279b156222d32c342e81117cfefaeb10c1 ddrescue-1.28.tar.lz # Locally computed sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk index f4376a9340..13798bb4bb 100644 --- a/package/ddrescue/ddrescue.mk +++ b/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.27 +DDRESCUE_VERSION = 1.28 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ -- 2.43.0 From arnout at mind.be Thu Feb 8 21:29:24 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 8 Feb 2024 22:29:24 +0100 Subject: [Buildroot] [PATCH 6/6] package/python-pymupdf: bump to version 1.23.9rc2 In-Reply-To: <454a12aa-fe40-4435-8c6e-5f020d960bb5@mind.be> References: <20240110093850.2302133-1-james.hilliard1@gmail.com> <20240110093850.2302133-6-james.hilliard1@gmail.com> <454a12aa-fe40-4435-8c6e-5f020d960bb5@mind.be> Message-ID: <269f1999-249c-4ede-82a6-6240bc36dbdd@mind.be> Hi Raphae?l, On 08/02/2024 12:28, Rapha?l M?lotte via buildroot wrote: > Hi James, all, > > Thanks for the patches! > I added a few comments/questions below. Your comments actually sound pretty essential, and I think they affect the earlier patches in the series as well. Should I mark the entire series as Changes Requested? Also, will you work on fixing the issues or should James take it on? Regards, Arnout > > On 1/10/24 10:38, James Hilliard wrote: >> Migrate to in tree pep517 based build backend. >> > > Does this new version cross-compile for you? > I get the following error because the wrong python-config is used (I only > briefly tried armv5 so far): > > error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc > config?)." > >> Note that version 1.23.8 is not compatible with mupdf 1.23.8 due to >> header conflict bugs that were fixed after the 1.23.8 release. >> >> Signed-off-by: James Hilliard >> --- >> ? package/python-pymupdf/python-pymupdf.hash |? 4 +-- >> ? package/python-pymupdf/python-pymupdf.mk?? | 33 ++++++++++++---------- >> ? 2 files changed, 20 insertions(+), 17 deletions(-) >> >> diff --git a/package/python-pymupdf/python-pymupdf.hash >> b/package/python-pymupdf/python-pymupdf.hash >> index 9fd8150088..e57652ab69 100644 >> --- a/package/python-pymupdf/python-pymupdf.hash >> +++ b/package/python-pymupdf/python-pymupdf.hash >> @@ -1,5 +1,5 @@ >> ? # md5, sha256 from https://pypi.org/pypi/pymupdf/json >> -md5? 468fe56375a1fca99e83fe0aa0b9f8bd? PyMuPDF-1.22.0.tar.gz >> -sha256? 6e1694e5c0cd8b92d503a506ee8e4ba1bed768528de586889d3ec90e9dc4a7d3 >> PyMuPDF-1.22.0.tar.gz >> +md5? eb0b65eaa063c2417d89c5453e7c82ad? PyMuPDF-1.23.9rc2.tar.gz >> +sha256? ba6fdd907814acb968ce669f49b0c14ef9ef8b1e2d161829b7a31461aab04429 >> PyMuPDF-1.23.9rc2.tar.gz >> ? # Locally computed sha256 checksums >> ? sha256? 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 >> COPYING >> diff --git a/package/python-pymupdf/python-pymupdf.mk >> b/package/python-pymupdf/python-pymupdf.mk >> index 639ce0e00e..ac76afa3f6 100644 >> --- a/package/python-pymupdf/python-pymupdf.mk >> +++ b/package/python-pymupdf/python-pymupdf.mk >> @@ -5,25 +5,28 @@ >> >> ################################################################################ >> ? # python-pymupdf's version must match mupdf's version >> -PYTHON_PYMUPDF_VERSION = 1.22.0 >> +PYTHON_PYMUPDF_VERSION = 1.23.9rc2 >> ? PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz >> -PYTHON_PYMUPDF_SITE = >> https://files.pythonhosted.org/packages/28/ba/d6bb6fd678e8396d7b944870286fb25fd6f499b8cb599b5436c8f725adbf >> -PYTHON_PYMUPDF_SETUP_TYPE = setuptools >> +PYTHON_PYMUPDF_SITE = >> https://files.pythonhosted.org/packages/b4/ff/db44303d60b8cc310a7187d500c7765b3b48aa113c86428d5d1c390b8fb5 >> +PYTHON_PYMUPDF_SETUP_TYPE = pep517 >> ? PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ >> ? PYTHON_PYMUPDF_LICENSE_FILES = COPYING >> ? # No license file included in pip, but it's present on github >> -PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib >> +PYTHON_PYMUPDF_DEPENDENCIES = \ >> +??? host-python-libclang \ > > Isn't libclang only required by the PyMuPDF plumbing when it builds the bundled > MuPDF? > In our case since we're building MuPDF as a separate package, we hopefully don't > need it... > >> +??? host-python-psutil \ > > From a quick look at the PyMuPDF code, this seems to be needed only for a > single test (which we don't run, so we don't need it). > >> +??? host-python-setuptools \ >> +??? host-python-swig \ > > The way I understand it, PyMuPDF added this host-python-swig dependency as a way > to make sure swig is available when building. > Since we already have host-swig as a dependency, we can probably use that one to > build as Yann suggested? > >> +??? host-swig \ >> +??? freetype \ >> +??? mupdf \ >> +??? zlib >> -PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf >> -I$(STAGING_DIR)/usr/include/freetype2" >> - >> -# We need to remove the original paths as we provide them in the CFLAGS: >> -define PYTHON_PYMUPDF_REMOVE_PATHS >> -??? sed -i "/\/usr\/include\/mupdf/d" $(@D)/setup.py >> -??? sed -i "/\/usr\/include\/freetype2/d" $(@D)/setup.py >> -??? sed -i "/\/usr\/local\/include\/mupdf/d" $(@D)/setup.py >> -??? sed -i "/mupdf\/thirdparty\/freetype\/include/d" $(@D)/setup.py >> -endef >> - >> -PYTHON_PYMUPDF_POST_PATCH_HOOKS = PYTHON_PYMUPDF_REMOVE_PATHS >> +PYTHON_PYMUPDF_ENV = \ >> + >> PYMUPDF_INCLUDES="$(STAGING_DIR)/usr/include/freetype2:$(STAGING_DIR)/usr/include" \ >> +??? PYMUPDF_MUPDF_LIB="$(STAGING_DIR)/usr/lib" \ >> +??? PYMUPDF_SETUP_FLAVOUR=p \> +??? PYMUPDF_SETUP_IMPLEMENTATIONS=a \ > > It's worth noting that PyMuPDF is gradually switching to a new implementation > which will require MuPDF to be built with python bindings in the future (but for > now, both implementations are still available AFAICT). > >> +??? PYMUPDF_SETUP_MUPDF_BUILD= >> ? $(eval $(python-package)) > > There seem to be more work needed to get this new version to work, I'll try to > have a closer look at it in the next few days. > > > Kind regards, > > Rapha?l > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Feb 8 21:42:58 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 8 Feb 2024 22:42:58 +0100 Subject: [Buildroot] [PATCH] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20231211181504.3035423-1-roy.kollen.svendsen@akersolutions.com> References: <20231211181504.3035423-1-roy.kollen.svendsen@akersolutions.com> Message-ID: Hi Roy, On 11/12/2023 19:15, Roy Kollen Svendsen wrote: > Bump qt5 packages to latest submodule versions from: > https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > Signed-off-by: Roy Kollen Svendsen > --- > package/qt5/qt5.mk | 2 +- > package/qt5/qt53d/qt53d.hash | 2 +- > package/qt5/qt53d/qt53d.mk | 2 +- Sebastien Weyer submitted the same version bump earlier [1], but he left out qt53d because it doesn't build. Was it working for you or did you just not test qt53d? > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > package/qt5/qt5charts/qt5charts.hash | 2 +- > package/qt5/qt5charts/qt5charts.mk | 2 +- > package/qt5/qt5connectivity/qt5connectivity.hash | 2 +- > package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- > package/qt5/qt5declarative/qt5declarative.hash | 2 +- > package/qt5/qt5declarative/qt5declarative.mk | 2 +- > package/qt5/qt5doc/qt5doc.hash | 2 +- > package/qt5/qt5doc/qt5doc.mk | 2 +- I don't know why, but Sebastian didn't update qt5doc either... Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20231012132616.2180337-1-sebastian.weyer at smile.fr/ > package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 +- > package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- > package/qt5/qt5imageformats/qt5imageformats.hash | 2 +- > package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- > package/qt5/qt5location/qt5location.mk | 2 +- > package/qt5/qt5lottie/qt5lottie.hash | 2 +- > package/qt5/qt5lottie/qt5lottie.mk | 2 +- > package/qt5/qt5multimedia/qt5multimedia.hash | 2 +- > package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- > package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 +- > package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- > package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 +- > package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- > package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 2 +- > package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 2 +- > package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 2 +- > package/qt5/qt5remoteobjects/qt5remoteobjects.mk | 2 +- > package/qt5/qt5script/qt5script.hash | 2 +- > package/qt5/qt5script/qt5script.mk | 2 +- > package/qt5/qt5scxml/qt5scxml.hash | 2 +- > package/qt5/qt5scxml/qt5scxml.mk | 2 +- > package/qt5/qt5sensors/qt5sensors.hash | 2 +- > package/qt5/qt5sensors/qt5sensors.mk | 2 +- > package/qt5/qt5serialbus/qt5serialbus.hash | 2 +- > package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- > package/qt5/qt5serialport/qt5serialport.hash | 2 +- > package/qt5/qt5serialport/qt5serialport.mk | 2 +- > package/qt5/qt5speech/qt5speech.hash | 2 +- > package/qt5/qt5speech/qt5speech.mk | 2 +- > package/qt5/qt5svg/qt5svg.hash | 2 +- > package/qt5/qt5svg/qt5svg.mk | 2 +- > package/qt5/qt5tools/qt5tools.hash | 2 +- > package/qt5/qt5tools/qt5tools.mk | 2 +- > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 2 +- > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- > package/qt5/qt5wayland/qt5wayland.hash | 2 +- > package/qt5/qt5wayland/qt5wayland.mk | 2 +- > package/qt5/qt5webchannel/qt5webchannel.hash | 2 +- > package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- > package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash | 4 ++-- > package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk | 2 +- > package/qt5/qt5websockets/qt5websockets.hash | 2 +- > package/qt5/qt5websockets/qt5websockets.mk | 2 +- > package/qt5/qt5webview/qt5webview.hash | 2 +- > package/qt5/qt5webview/qt5webview.mk | 2 +- > package/qt5/qt5x11extras/qt5x11extras.hash | 2 +- > package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- > 62 files changed, 63 insertions(+), 63 deletions(-) [snip] From arnout at mind.be Thu Feb 8 22:36:48 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 8 Feb 2024 23:36:48 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> Message-ID: Hi Se?bastien, It's no fun that I still have questions on v5, but unfortunately... On 08/02/2024 13:54, S?bastien Szymanski wrote: > This commit adds i.MX91 and i.MX93 support to Buildroot. > https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors:IMX9-PROCESSORS > > There is no i.MX95 software provided by NXP at the moment that's why > i.MX95 is left behind. > > Adapt package firmware-imx for the LPPDR4 firwmares binaries. > > Reviewed-by: Gary Bisson > Signed-off-by: S?bastien Szymanski [snip] > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + bool "imx91" > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + bool "imx93" > + > +endchoice > + > +choice > + prompt "i.MX Silicon Revision" > + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 \ > + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 \ > + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + help > + Some packages related to the selected i.MX platform need to know the > + silicon revision of the platform they will run on. > + If you don't know, leave the default value. > + > + Note - mismatches may result in a failure to boot! This sentence conflicts with "If you don't know, leave the default value"... So I think that "If you don't know" sentence should be dropped. > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 > + bool "imx91a1" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 Since for IMX91 there is only one option, I think it makes more sense to not offer a choice for this. Just always use this one for the IMX91. We can still add it back if there ever turns out to be an imx91a2. > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 > + bool "imx93a0" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 > + bool "imx93a1" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + > endchoice > [snip] > @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION > # unconditionally use HW version 201810 when DDR3/DDR4 was > # selected > default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || BR2_PACKAGE_FIRMWARE_IMX_DDR4 > + default "v202201" if \ For the time being, there is only one version for the IMX91/3. So it makes no sense to give an option for it. (In fact, this really should have been a choice instead of a string option because there are only a fixed set of options... But that's a separate topic.) By the way, do these SoCs use the plain 202006 version for DDR4 like the other SoCs? And do they also support DDR3? > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > help > Use a specific version of the imx ddr binaries. Leaving this > field empty will select the default version. > diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk > index 66ef8c3930be..1f36f917cdc8 100644 > --- a/package/freescale-imx/firmware-imx/firmware-imx.mk > +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk > @@ -48,6 +48,30 @@ endif > ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) > FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys > > +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) To make the conditions more symmetrical/regular, perhaps it's better to create a new BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X option and encode the platform conditions there. The prompt would be the same for BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 and for BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X ("lpddr4" for both). But perhaps I'm overthinking things. > +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > + # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate lpddr4_fw.bin. > + # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin > + # which is done in post-image script. > + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ > + lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), So the v202201 could be hardcoded here. > + lpddr4_1d_fw) > + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ > + lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_2d_fw) > + cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ > + $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ > + $(BINARIES_DIR)/lpddr4_fw.bin > + ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin > + > + # U-Boot supports creation of the combined flash.bin image. To make > + # sure that U-Boot can access all available files copy them to > + # the binary dir. > + cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ We now have 3 instances of this exact same code block with only the file names that differ, so perhaps it's time to factor this into a second helper function. Or better, define a few auxiliary variables FIRMWARE_IMX_DDRFW_IMEM_1D, FIRMWARE_IMX_DDRFW_DMEM_1D etc that are set for each variant, and then one definition of FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW that uses those variables. If that sounds too complex, don't worry, it's just a "niceification" so not really necessary to do. In fact, the only of my comments above that is really important is dropping BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1. Regards, Arnout > +endef > +else > define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > # Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin. > # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin > @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ > endef > endif > +endif > > ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) > FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys > From arnout at mind.be Thu Feb 8 22:39:52 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 8 Feb 2024 23:39:52 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> Message-ID: <41227294-6a3d-42d7-a3cd-fefa713a3546@mind.be> On 08/02/2024 23:36, Arnout Vandecappelle wrote: > ?To make the conditions more symmetrical/regular, perhaps it's better to > create a new BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X option and encode the > platform conditions there. The prompt would be the same for > BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 and for BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X > ("lpddr4" for both).? But perhaps I'm overthinking things. ?That would be BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9, not IMX9X. ?Regards, ?Arnout From arnout at mind.be Thu Feb 8 22:43:04 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 8 Feb 2024 23:43:04 +0100 Subject: [Buildroot] [PATCH v5 2/3] package/freescale-imx/firmware-ele-imx: new package In-Reply-To: <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> Message-ID: <7cc235a5-b0ee-4517-a4ce-941e6f868c19@mind.be> On 08/02/2024 13:54, S?bastien Szymanski wrote: > This package provides firmware blobs for the Edgelock Secure > Enclave (ELE) [1] present on i.MX8ULP and i.MX9 Socs. > This version comes from the 6.1.55-2.2.0 release. > > [1] https://www.nxp.com/products/nxp-product-information/nxp-product-programs/edgelock-secure-enclave:EDGELOCK-SECURE-ENCLAVE > > Reviewed-by: Gary Bisson > Signed-off-by: S?bastien Szymanski > --- > Changes for v5: > - none > > Changes for v4: > - move i.MX Silicon Revision changes into first patch (Gary Bisson) > > Changes for v3: > - rename package from firmware-sentinel to package firmware-ele-imx > > Changes for v2: > - none > --- > package/freescale-imx/Config.in | 1 + > package/freescale-imx/firmware-ele-imx/Config.in | 21 +++++++++++++++++ > .../firmware-ele-imx/firmware-ele-imx.hash | 4 ++++ > .../firmware-ele-imx/firmware-ele-imx.mk | 27 ++++++++++++++++++++++ > 4 files changed, 53 insertions(+) > > diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in > index ba169ead18cb..f12acc3bd024 100644 > --- a/package/freescale-imx/Config.in > +++ b/package/freescale-imx/Config.in > @@ -154,6 +154,7 @@ source "package/freescale-imx/imx-uuc/Config.in" > source "package/freescale-imx/imx-vpu/Config.in" > source "package/freescale-imx/imx-vpu-hantro/Config.in" > source "package/freescale-imx/imx-vpuwrap/Config.in" > +source "package/freescale-imx/firmware-ele-imx/Config.in" > source "package/freescale-imx/firmware-imx/Config.in" > source "package/freescale-imx/imx-sc-firmware/Config.in" > source "package/freescale-imx/imx-seco/Config.in" > diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in > new file mode 100644 > index 000000000000..7867c3712c9c > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_FIRMWARE_ELE_IMX > + bool "firmware-ele-imx" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + help > + Firmware blobs for the Edgelock Secure Enclave (ELE) ELE, not ELSE? Weird... > + present on i.MX8ULP and i.MX9 SoCs. I guess we simply don't have support for i.MX8ULP yet in Buildroot? Perhaps it's better to create a BR2_PACKAGE_FREESCALE_IMX_HAS_ELE option in freescale-imx/Config.in > + > + This library is provided by NXP as-is and doesn't have an > + upstream. > + > +if BR2_PACKAGE_FIRMWARE_ELE_IMX > + > +config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE > + string > + default "mx93a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 > + default "mx93a1-ahab-container.img" if \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 || \ So i.MX91 uses the mx93 image? Weird... Regards, Arnout > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 > + > +endif # BR2_PACKAGE_FIRMWARE_ELE_IMX > diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash > new file mode 100644 > index 000000000000..58565cef43e9 > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash > @@ -0,0 +1,4 @@ > +# Locally calculated > +sha256 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca firmware-ele-imx-0.1.0.bin > +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING > +sha256 c800aaca3a7e9f470d99d7cde0a48c95982ed601d4c306f7b8f43f3710054f28 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 > new file mode 100644 > index 000000000000..600b50c5b456 > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk > @@ -0,0 +1,27 @@ > +################################################################################ > +# > +# firmware-ele-imx > +# > +################################################################################ > + > +FIRMWARE_ELE_IMX_VERSION = 0.1.0 > +FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) > +FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin > + > +FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement > +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING SCR.txt > +FIRMWARE_ELE_IMX_REDISTRIBUTE = NO > + > +FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES > + > +define FIRMWARE_ELE_IMX_EXTRACT_CMDS > + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_ELE_IMX_DL_DIR)/$(FIRMWARE_ELE_IMX_SOURCE)) > +endef > + > +FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE)) > + > +define FIRMWARE_ELE_IMX_INSTALL_IMAGES_CMDS > + cp $(@D)/$(FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE) $(BINARIES_DIR)/ahab-container.img > +endef > + > +$(eval $(generic-package)) > From james.d.knight at live.com Fri Feb 9 02:14:52 2024 From: james.d.knight at live.com (James Knight) Date: Thu, 8 Feb 2024 21:14:52 -0500 Subject: [Buildroot] [git commit] package/python3: bump version to 3.12.1 In-Reply-To: <20240206222231.8950D87481@busybox.osuosl.org> References: <20240206222231.8950D87481@busybox.osuosl.org> Message-ID: For those playing with this new Python version, On Tue, Feb 6, 2024 at 5:21?PM Thomas Petazzoni via buildroot wrote: > commit: https://git.buildroot.net/buildroot/commit/?id=36e635d2d5c0166476858aa239ccbe78e8f2af14 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master I noticed after this patch, I can no longer build the "python3" package for my x86_64 configuration. I see some talk on the mailing list about maybe other issues with this version of Python (if I have interpreted this correctly). I am also planning to investigate why I'm having this issue soon, but I wanted to give a heads-up just in case this information helps. The build issue that occurs is the following: >>> python3 3.12.1 Building GIT_DIR=. PATH="/builds/buildroot/output/host/bin:/builds/buildroot/output/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j33 -C /builds/buildroot/output/build/python3-3.12.1/ make[1]: Entering directory '/builds/buildroot/output/build/python3-3.12.1' ... /builds/buildroot/output/host/bin/x86_64-ottchain-linux-gnu-gcc -shared -Wl,--no-as-needed -o libpython3.so -Wl,-hlibpython3.so libpython3.12.so /builds/buildroot/output/host/bin/x86_64-ottchain-linux-gnu-gcc -Xlinker -export-dynamic -o python Programs/python.o -L. -lpython3.12 -ldl -lpthread -lm /builds/buildroot/output/host/bin/x86_64-ottchain-linux-gnu-gcc -Xlinker -export-dynamic -o Programs/_testembed Programs/_testembed.o -L. -lpython3.12 -ldl -lpthread -lm Traceback (most recent call last): File "/builds/buildroot/output/build/python3-3.12.1/./Tools/build/check_extension_modules.py", line 25, in import pathlib File "/builds/buildroot/output/build/python3-3.12.1/Lib/pathlib.py", line 20, in from urllib.parse import quote_from_bytes as urlquote_from_bytes File "/builds/buildroot/output/build/python3-3.12.1/Lib/urllib/parse.py", line 36, in import math ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' not found (required by /builds/buildroot/output/build/python3-3.12.1/build/lib.linux-x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) make[1]: Leaving directory '/builds/buildroot/output/build/python3-3.12.1' make[1]: *** [Makefile:1120: checksharedmods] Error 1 make: *** [package/pkg-generic.mk:283: /builds/buildroot/output/build/python3-3.12.1/.stamp_built] Error 2 First noticed this issue using the most recent sources of Buildroot (at the time: 35eb74c6343a9ec1407fb473271dda0516792391). Tested my build against some old commits and was able to confirm that the build works with "09de823cbc7bd50a40e25f4166b4e42be94b0c7b", but fails at "36e635d2d5c0166476858aa239ccbe78e8f2af14" (this patch). Additional information: - Buildroot configuration: BR2_x86_64=y, using a crosstool-ng toolchain (v1.26.0+6cf65d; CT_ARCH_X86=y; CT_ARCH_64=y; GCC 13) - Host: Ubuntu 22.04.3 LTS (Jammy Jellyfish) (Docker container: ubuntu:latest) From roykollensvendsen at gmail.com Fri Feb 9 05:14:26 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Fri, 9 Feb 2024 06:14:26 +0100 Subject: [Buildroot] [PATCH] package/qt5: bump packages to latest kde submodule versions In-Reply-To: References: <20231211181504.3035423-1-roy.kollen.svendsen@akersolutions.com> Message-ID: Hi Arnout, This patch broke the build for me too, after activating all the modules in menuconfig. I tried to change the state in patchwork to indicate this, but i should probably have pointed it out on the mailinglist. I believe i fixed the build at a later point though, but then I ran into problems again related to qt5webengine...I will trace my steps today Regards, Roy tor. 8. feb. 2024, 22:43 skrev Arnout Vandecappelle : > Hi Roy, > > On 11/12/2023 19:15, Roy Kollen Svendsen wrote: > > Bump qt5 packages to latest submodule versions from: > > https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > > > Signed-off-by: Roy Kollen Svendsen < > roy.kollen.svendsen at akersolutions.com> > > --- > > package/qt5/qt5.mk | 2 +- > > package/qt5/qt53d/qt53d.hash | 2 +- > > package/qt5/qt53d/qt53d.mk | 2 +- > > Sebastien Weyer submitted the same version bump earlier [1], but he left > out > qt53d because it doesn't build. Was it working for you or did you just not > test > qt53d? > > > package/qt5/qt5base/qt5base.hash | 2 +- > > package/qt5/qt5base/qt5base.mk | 2 +- > > package/qt5/qt5charts/qt5charts.hash | 2 +- > > package/qt5/qt5charts/qt5charts.mk | 2 +- > > package/qt5/qt5connectivity/qt5connectivity.hash | 2 +- > > package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- > > package/qt5/qt5declarative/qt5declarative.hash | 2 +- > > package/qt5/qt5declarative/qt5declarative.mk | 2 +- > > package/qt5/qt5doc/qt5doc.hash | 2 +- > > package/qt5/qt5doc/qt5doc.mk | 2 +- > > I don't know why, but Sebastian didn't update qt5doc either... > > > Regards, > Arnout > > [1] > > https://patchwork.ozlabs.org/project/buildroot/patch/20231012132616.2180337-1-sebastian.weyer at smile.fr/ > > > > package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 +- > > package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- > > package/qt5/qt5imageformats/qt5imageformats.hash | 2 +- > > package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- > > package/qt5/qt5location/qt5location.mk | 2 +- > > package/qt5/qt5lottie/qt5lottie.hash | 2 +- > > package/qt5/qt5lottie/qt5lottie.mk | 2 +- > > package/qt5/qt5multimedia/qt5multimedia.hash | 2 +- > > package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- > > package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 +- > > package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- > > package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 +- > > package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- > > package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 2 +- > > package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 2 +- > > package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 2 +- > > package/qt5/qt5remoteobjects/qt5remoteobjects.mk | 2 +- > > package/qt5/qt5script/qt5script.hash | 2 +- > > package/qt5/qt5script/qt5script.mk | 2 +- > > package/qt5/qt5scxml/qt5scxml.hash | 2 +- > > package/qt5/qt5scxml/qt5scxml.mk | 2 +- > > package/qt5/qt5sensors/qt5sensors.hash | 2 +- > > package/qt5/qt5sensors/qt5sensors.mk | 2 +- > > package/qt5/qt5serialbus/qt5serialbus.hash | 2 +- > > package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- > > package/qt5/qt5serialport/qt5serialport.hash | 2 +- > > package/qt5/qt5serialport/qt5serialport.mk | 2 +- > > package/qt5/qt5speech/qt5speech.hash | 2 +- > > package/qt5/qt5speech/qt5speech.mk | 2 +- > > package/qt5/qt5svg/qt5svg.hash | 2 +- > > package/qt5/qt5svg/qt5svg.mk | 2 +- > > package/qt5/qt5tools/qt5tools.hash | 2 +- > > package/qt5/qt5tools/qt5tools.mk | 2 +- > > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 2 +- > > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- > > package/qt5/qt5wayland/qt5wayland.hash | 2 +- > > package/qt5/qt5wayland/qt5wayland.mk | 2 +- > > package/qt5/qt5webchannel/qt5webchannel.hash | 2 +- > > package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- > > package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash | 4 ++-- > > package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk | 2 +- > > package/qt5/qt5websockets/qt5websockets.hash | 2 +- > > package/qt5/qt5websockets/qt5websockets.mk | 2 +- > > package/qt5/qt5webview/qt5webview.hash | 2 +- > > package/qt5/qt5webview/qt5webview.mk | 2 +- > > package/qt5/qt5x11extras/qt5x11extras.hash | 2 +- > > package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- > > package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 +- > > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- > > 62 files changed, 63 insertions(+), 63 deletions(-) > [snip] > -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Fri Feb 9 07:50:36 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 9 Feb 2024 08:50:36 +0100 Subject: [Buildroot] [PATCH] package/qt5: bump packages to latest kde submodule versions In-Reply-To: References: <20231211181504.3035423-1-roy.kollen.svendsen@akersolutions.com> Message-ID: <9c06da48-ccdd-4e56-95e5-40089d298c4c@mind.be> On 09/02/2024 06:14, Roy Kollen Svendsen wrote: > Hi Arnout, > > This patch broke the build for me too, after? activating all the modules in > menuconfig. I tried to change the state in patchwork to indicate this, but i > should probably have pointed it out on the mailinglist. I believe i fixed the > build at a later point though, but then I ran into problems again related to > qt5webengine...I will trace my steps today Ah, yes indeed the patch was marked as Changes Requested in patchwork, but since I didn't see any comment about it on the mailing list, I assumed that that was a mistake. I will move it back to Changes Requested and merge Sebastian's patch. Regards, Arnout > > Regards, > Roy > > tor. 8. feb. 2024, 22:43 skrev Arnout Vandecappelle >: > > ? Hi Roy, > > On 11/12/2023 19:15, Roy Kollen Svendsen wrote: > > Bump qt5 packages to latest submodule versions from: > > https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > > > > Signed-off-by: Roy Kollen Svendsen > > > --- > >? ?package/qt5/qt5.mk > ? ? ?| 2 +- > >? ?package/qt5/qt53d/qt53d.hash? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt53d/qt53d.mk > ? ? ? ?| 2 +- > > ? Sebastien Weyer submitted the same version bump earlier [1], but he left out > qt53d because it doesn't build. Was it working for you or did you just not test > qt53d? > > >? ?package/qt5/qt5base/qt5base.hash? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5base/qt5base.mk > ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5charts/qt5charts.hash? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5charts/qt5charts.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5connectivity/qt5connectivity.hash? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5connectivity/qt5connectivity.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5declarative/qt5declarative.hash? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5declarative/qt5declarative.mk > ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5doc/qt5doc.hash? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5doc/qt5doc.mk > ? ? ? ? ?| 2 +- > > ? I don't know why, but Sebastian didn't update qt5doc either... > > > ? Regards, > ? Arnout > > [1] > https://patchwork.ozlabs.org/project/buildroot/patch/20231012132616.2180337-1-sebastian.weyer at smile.fr/ > > > >? ?package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash? ? ?| 2 +- > >? ?package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > ? ? ? ?| 2 +- > >? ?package/qt5/qt5imageformats/qt5imageformats.hash? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5imageformats/qt5imageformats.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5location/qt5location.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5lottie/qt5lottie.hash? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5lottie/qt5lottie.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5multimedia/qt5multimedia.hash? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5multimedia/qt5multimedia.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quickcontrols/qt5quickcontrols.hash? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quickcontrols/qt5quickcontrols.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quicktimeline/qt5quicktimeline.hash? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quicktimeline/qt5quicktimeline.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5remoteobjects/qt5remoteobjects.hash? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5remoteobjects/qt5remoteobjects.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5script/qt5script.hash? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5script/qt5script.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5scxml/qt5scxml.hash? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5scxml/qt5scxml.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5sensors/qt5sensors.hash? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5sensors/qt5sensors.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5serialbus/qt5serialbus.hash? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5serialbus/qt5serialbus.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5serialport/qt5serialport.hash? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5serialport/qt5serialport.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5speech/qt5speech.hash? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5speech/qt5speech.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5svg/qt5svg.hash? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5svg/qt5svg.mk > ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5tools/qt5tools.hash? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5tools/qt5tools.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash? ? ? ?| 2 +- > >? ?package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5wayland/qt5wayland.hash? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5wayland/qt5wayland.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5webchannel/qt5webchannel.hash? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5webchannel/qt5webchannel.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash | 4 ++-- > >? ?package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk > ? ?| 2 +- > >? ?package/qt5/qt5websockets/qt5websockets.hash? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5websockets/qt5websockets.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5webview/qt5webview.hash? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5webview/qt5webview.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5x11extras/qt5x11extras.hash? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5x11extras/qt5x11extras.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > ? ? ? ? ? ? ? ? ?| 2 +- > >? ?62 files changed, 63 insertions(+), 63 deletions(-) > [snip] > From arnout at mind.be Fri Feb 9 07:53:26 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 9 Feb 2024 08:53:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20231012132616.2180337-1-sebastian.weyer@smile.fr> References: <20231012132616.2180337-1-sebastian.weyer@smile.fr> Message-ID: <67c8c262-ac4b-46a5-93fa-b3bb18a1d9cb@mind.be> On 12/10/2023 15:26, Sebastian Weyer wrote: > Bump qt5 packages to latest submodule versions from: > https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > Signed-off-by: Sebastian Weyer > --- > The package qt53d was not updated with the rest as it fails with > > qgltf.cpp:29:10: fatal error: assimp/Importer.hpp: No such file or directory > 29 | #include > > although assimp is installed and the header file is present in > host/aarch64-buildroot-linux-gnu/sysroot/usr/include/assimp/Importer.hpp > > This package was also not updated in the last version bump to 5.15.10 in > 6b23dff9e71786191797d3b41ce80afe659f0396. Starting from 5.15.9 it fails > with this error. I couldn't find out why this package wasn't updated to > 5.15.10 to begin with but it seems like it could be this error? So I thought > it might be okay to leave it at 5.15.8 for now. What do you think? > > Signed-off-by: Sebastian Weyer Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5.mk | 2 +- > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > package/qt5/qt5charts/qt5charts.hash | 2 +- > package/qt5/qt5charts/qt5charts.mk | 2 +- > package/qt5/qt5connectivity/qt5connectivity.hash | 2 +- > package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- > package/qt5/qt5declarative/qt5declarative.hash | 2 +- > package/qt5/qt5declarative/qt5declarative.mk | 2 +- > package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 +- > package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- > package/qt5/qt5imageformats/qt5imageformats.hash | 2 +- > package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- > package/qt5/qt5location/qt5location.hash | 2 +- > package/qt5/qt5location/qt5location.mk | 2 +- > package/qt5/qt5lottie/qt5lottie.hash | 2 +- > package/qt5/qt5lottie/qt5lottie.mk | 2 +- > package/qt5/qt5multimedia/qt5multimedia.hash | 2 +- > package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- > package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 +- > package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- > package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 +- > package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- > package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 2 +- > package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 2 +- > package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 2 +- > package/qt5/qt5remoteobjects/qt5remoteobjects.mk | 2 +- > package/qt5/qt5scxml/qt5scxml.hash | 2 +- > package/qt5/qt5scxml/qt5scxml.mk | 2 +- > package/qt5/qt5sensors/qt5sensors.hash | 2 +- > package/qt5/qt5sensors/qt5sensors.mk | 2 +- > package/qt5/qt5serialbus/qt5serialbus.hash | 2 +- > package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- > package/qt5/qt5serialport/qt5serialport.hash | 2 +- > package/qt5/qt5serialport/qt5serialport.mk | 2 +- > package/qt5/qt5speech/qt5speech.hash | 2 +- > package/qt5/qt5speech/qt5speech.mk | 2 +- > package/qt5/qt5svg/qt5svg.hash | 2 +- > package/qt5/qt5svg/qt5svg.mk | 2 +- > package/qt5/qt5tools/qt5tools.hash | 2 +- > package/qt5/qt5tools/qt5tools.mk | 2 +- > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 2 +- > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- > package/qt5/qt5wayland/qt5wayland.hash | 2 +- > package/qt5/qt5wayland/qt5wayland.mk | 2 +- > package/qt5/qt5webchannel/qt5webchannel.hash | 2 +- > package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- > package/qt5/qt5webengine/qt5webengine.hash | 2 +- > package/qt5/qt5websockets/qt5websockets.hash | 2 +- > package/qt5/qt5websockets/qt5websockets.mk | 2 +- > package/qt5/qt5webview/qt5webview.hash | 2 +- > package/qt5/qt5webview/qt5webview.mk | 2 +- > package/qt5/qt5x11extras/qt5x11extras.hash | 2 +- > package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- > 56 files changed, 56 insertions(+), 56 deletions(-) > > diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk > index b55accacf1..a43b36dd51 100644 > --- a/package/qt5/qt5.mk > +++ b/package/qt5/qt5.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > QT5_VERSION_MAJOR = 5.15 > -QT5_VERSION = $(QT5_VERSION_MAJOR).10 > +QT5_VERSION = $(QT5_VERSION_MAJOR).11 > QT5_SITE = https://invent.kde.org/qt/qt > > include $(sort $(wildcard package/qt5/*/*.mk)) > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index 4efc8fa172..ffc474f49e 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 5622a9053154af9a353b8e8be217104c6af068b5b5aba8b07ef4fea2dc79fded qtbase-e44097b63d17ba3178a637df7fac51ddc51cb48b.tar.bz2 > +sha256 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index cc29f5523f..7ee6124d4b 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5BASE_VERSION = e44097b63d17ba3178a637df7fac51ddc51cb48b > +QT5BASE_VERSION = da6e958319e95fe564d3b30c931492dd666bfaff > QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash > index 0688f64615..fec54c86b1 100644 > --- a/package/qt5/qt5charts/qt5charts.hash > +++ b/package/qt5/qt5charts/qt5charts.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 9d2ad94a054bd7df08e5d11bc77b6422ccecbf99ea8dd6f06908bafc72ea869d qtcharts-841083c263f16f8acb81e4915bf24bbed0461c9a.tar.bz2 > +sha256 66dae46a8bcb1dfc10dd3404296701c41e50658792e4a6a7317a182fad6f36c8 qtcharts-e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk > index fa69263be4..bfc6021289 100644 > --- a/package/qt5/qt5charts/qt5charts.mk > +++ b/package/qt5/qt5charts/qt5charts.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5CHARTS_VERSION = 841083c263f16f8acb81e4915bf24bbed0461c9a > +QT5CHARTS_VERSION = e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826 > QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) > QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 > QT5CHARTS_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash > index 1252a73247..776448502b 100644 > --- a/package/qt5/qt5connectivity/qt5connectivity.hash > +++ b/package/qt5/qt5connectivity/qt5connectivity.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 ec1d91fc35d8b4a333209fb5fd85e00ab77345bff48b60b4e43b804a59f60979 qtconnectivity-c5f35f89e975c2ad58c83c6b606d40ba41057f15.tar.bz2 > +sha256 7a44848e113e1d7232c077f9fa8021ab038f59765123920e11936e7d4b8e3c66 qtconnectivity-f0c98c39447894bba493aa91c65053d7f18d68cb.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk > index 72797de1a0..dc5e647e0b 100644 > --- a/package/qt5/qt5connectivity/qt5connectivity.mk > +++ b/package/qt5/qt5connectivity/qt5connectivity.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5CONNECTIVITY_VERSION = c5f35f89e975c2ad58c83c6b606d40ba41057f15 > +QT5CONNECTIVITY_VERSION = f0c98c39447894bba493aa91c65053d7f18d68cb > QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) > QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 > QT5CONNECTIVITY_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash > index 0e7978dc58..3db5c94458 100644 > --- a/package/qt5/qt5declarative/qt5declarative.hash > +++ b/package/qt5/qt5declarative/qt5declarative.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 dbe0cdf84767564a56abf9d0d867c9cfcc754827169357a0f8162309c11882b5 qtdeclarative-b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a.tar.bz2 > +sha256 bebd1205aa087f529b8824f0284e127e08672ff7ce36a6b865cd921514ec1192 qtdeclarative-960a980dc885622cb84990c4da75d5060318302d.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk > index 18c1608fca..99c88e7d06 100644 > --- a/package/qt5/qt5declarative/qt5declarative.mk > +++ b/package/qt5/qt5declarative/qt5declarative.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5DECLARATIVE_VERSION = b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a > +QT5DECLARATIVE_VERSION = 960a980dc885622cb84990c4da75d5060318302d > QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) > QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 > QT5DECLARATIVE_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > index 95567b2476..e5fdaf67bf 100644 > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 de41af344889d35252fec9a6b6c78e1f67b7a7be15a5d3986b2ec20e2fcafadc qtgraphicaleffects-e6e1e58ec28fd0f2e6426e6962cc4ccddb493349.tar.bz2 > +sha256 18afbc24b40420ce0fe6bfad8331f43a1d8c8ec22501b7987ecec9334b69e9a2 qtgraphicaleffects-cce7d784237cd2dd4af1abe2757d048e34e02685.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > index f829c67122..ddf805303b 100644 > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5GRAPHICALEFFECTS_VERSION = e6e1e58ec28fd0f2e6426e6962cc4ccddb493349 > +QT5GRAPHICALEFFECTS_VERSION = cce7d784237cd2dd4af1abe2757d048e34e02685 > QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) > QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 > QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash > index 9d821672b3..779db8d109 100644 > --- a/package/qt5/qt5imageformats/qt5imageformats.hash > +++ b/package/qt5/qt5imageformats/qt5imageformats.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 8bf646d4db7d0099dd49b7c049a64fb585a3e180d73fc2b6edf22a1384529d1d qtimageformats-9044695f4b1acdd7ec24e7b01f6a6ca61f982a75.tar.bz2 > +sha256 bac150b9c5eaf0132a39a0b2a75cfca5400c11f4b8bf60f7362a6e0307f5c19e qtimageformats-6a1af670d52492ab0955933b830026b2a18ed6d6.tar.bz2 > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk > index 0ce6e4ffb4..27ef05777d 100644 > --- a/package/qt5/qt5imageformats/qt5imageformats.mk > +++ b/package/qt5/qt5imageformats/qt5imageformats.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5IMAGEFORMATS_VERSION = 9044695f4b1acdd7ec24e7b01f6a6ca61f982a75 > +QT5IMAGEFORMATS_VERSION = 6a1af670d52492ab0955933b830026b2a18ed6d6 > QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) > QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 > QT5IMAGEFORMATS_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash > index f73053f388..0188f51c83 100644 > --- a/package/qt5/qt5location/qt5location.hash > +++ b/package/qt5/qt5location/qt5location.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 90b57a335d8c7311a86865a56b2b9cd944a8a1cafa6a7499de5b35a105c5b247 qt5location-ebdf5b38da6e3fe0a183702bcca395c589c459ed-br1.tar.gz > +sha256 133d28fc0071e419682b7ed736c17b39240545c8e9d6ff7e9905f365bb1eb693 qt5location-0ec8f5e82da7369a92824167c4d7331f6c502325-br1.tar.gz > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk > index 904d31a983..88bf3d289c 100644 > --- a/package/qt5/qt5location/qt5location.mk > +++ b/package/qt5/qt5location/qt5location.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5LOCATION_VERSION = ebdf5b38da6e3fe0a183702bcca395c589c459ed > +QT5LOCATION_VERSION = 0ec8f5e82da7369a92824167c4d7331f6c502325 > QT5LOCATION_SITE = $(QT5_SITE)/qtlocation > QT5LOCATION_SITE_METHOD = git > QT5LOCATION_GIT_SUBMODULES = YES > diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash > index cbd94fd111..642625753c 100644 > --- a/package/qt5/qt5lottie/qt5lottie.hash > +++ b/package/qt5/qt5lottie/qt5lottie.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 82336dd063f8bedc28e9545cc8c0123053434d6c681e470434c80ad3908ca4b0 qtlottie-d40b67401afe7156b03c62c9a4d517b07555fe64.tar.bz2 > +sha256 4d8a063687c25675b012821e252a1afd455bdb4ea43e6d79787f9991c68cb5c5 qtlottie-909b79f4810b8ac62baa3544837793cfb132593b.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk > index 42a920582a..d4ad3afc63 100644 > --- a/package/qt5/qt5lottie/qt5lottie.mk > +++ b/package/qt5/qt5lottie/qt5lottie.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5LOTTIE_VERSION = d40b67401afe7156b03c62c9a4d517b07555fe64 > +QT5LOTTIE_VERSION = 909b79f4810b8ac62baa3544837793cfb132593b > QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) > QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 > QT5LOTTIE_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash > index 4803ef9230..7925c4fe05 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.hash > +++ b/package/qt5/qt5multimedia/qt5multimedia.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 842c5be64dafe7a68d2b120e24faffd14af6e4d9d8e9c0aa8bbf4330b3491aa3 qtmultimedia-76f84c545429a1b988b79f971734ef4bc3e6643f.tar.bz2 > +sha256 3f78ede5dcc231d0e92e9907d11fa1d7a7cf506eb73d3f035e8461b57dc692b4 qtmultimedia-b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk > index 0d0f5dd53d..7a56d238f2 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.mk > +++ b/package/qt5/qt5multimedia/qt5multimedia.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5MULTIMEDIA_VERSION = 76f84c545429a1b988b79f971734ef4bc3e6643f > +QT5MULTIMEDIA_VERSION = b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4 > QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) > QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 > QT5MULTIMEDIA_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > index 05a021e8b2..219dc8d588 100644 > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 e2c7bc6346a8eb4c21510f8fbf7e752648f68a0c5af8525a784e64503570f72c qtquickcontrols-e62b8b6d2f45a79652238b33f4bbe23023004ae7.tar.bz2 > +sha256 8c02691d3eb45b9f144bef64c9705e26e8a4c725a0731b18450d39a589965c49 qtquickcontrols-dcc90558d9c0cba41eec7df290943994289b0e87.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > index 25c1a74f5c..86792ddd8e 100644 > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5QUICKCONTROLS_VERSION = e62b8b6d2f45a79652238b33f4bbe23023004ae7 > +QT5QUICKCONTROLS_VERSION = dcc90558d9c0cba41eec7df290943994289b0e87 > QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) > QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 > QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > index 88777a5cc3..91fb31a7b7 100644 > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 53caea73e6bdf234cb445067be3bc4e07ed59af7da967638ac598188b719958e qtquickcontrols2-74e8db97fdb9b55c4b4614b83f4bf17e00df55e9.tar.bz2 > +sha256 481220682ce3127711465d6ade22c9ce0e4a4130dd9735344f7464f9147d8f0d qtquickcontrols2-1ce461bd1dc713cd2f79fc16c5454d587b45eefa.tar.bz2 > > # Hashes for license files: > sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > index 1732921203..a2503eb9a3 100644 > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5QUICKCONTROLS2_VERSION = 74e8db97fdb9b55c4b4614b83f4bf17e00df55e9 > +QT5QUICKCONTROLS2_VERSION = 1ce461bd1dc713cd2f79fc16c5454d587b45eefa > QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) > QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 > QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > index a8acf3c5a2..1c9f436b1b 100644 > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 d22637609c4afcc7560d92c894eb55d4afa01706bb5c86499bf56f7c8723a605 qtquicktimeline-87ad61716a7cba5a070d8a7b1756c8b2b48d5d53.tar.bz2 > +sha256 ee404943ef00dbac33928cf001b613ca517fdfdf2767b932a8def5f8c2b0797f qtquicktimeline-b1b4b882dabaa036c3fb73c4a879ba8efbb02ded.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > index de94bd0375..3a8542ab1b 100644 > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5QUICKTIMELINE_VERSION = 87ad61716a7cba5a070d8a7b1756c8b2b48d5d53 > +QT5QUICKTIMELINE_VERSION = b1b4b882dabaa036c3fb73c4a879ba8efbb02ded > QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) > QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 > QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > index 1b41ab675f..a931ce09cb 100644 > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 ef8e1f64911f7e03da6306693031fdf953af00d453ec154497178bb7ceab1aa2 qtremoteobjects-aa705010da0f658b78c1155babce7091ae44529a.tar.bz2 > +sha256 677b8ccb5c07673296c4fa01bcbc6bd9b8e3a534d332624f61fe0360a5649703 qtremoteobjects-bdc316aca82769b43cb7821c10d80a1ca02b846e.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > index 3160d37ad7..5fea3487a5 100644 > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5REMOTEOBJECTS_VERSION = aa705010da0f658b78c1155babce7091ae44529a > +QT5REMOTEOBJECTS_VERSION = bdc316aca82769b43cb7821c10d80a1ca02b846e > QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) > QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 > QT5REMOTEOBJECTS_DEPENDENCIES = qt5base > diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash > index f4d52b8a52..0f13743f45 100644 > --- a/package/qt5/qt5scxml/qt5scxml.hash > +++ b/package/qt5/qt5scxml/qt5scxml.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 a0113f54d9df14ebae15dd85530f87f093a284372ee8237d1ccceb02e6a4607b qtscxml-631fd7bcc34802b7650c2b1dc73691463954d982.tar.bz2 > +sha256 d598238bfa3bbbe283a8bd2907a4e8e813e00c522f08297a856e6595bbd44099 qtscxml-e8727aabe55526956295407d27317ec15e12b283.tar.bz2 > > # Hashes for license files: > sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT > diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk > index f6ccb9298e..32ef425e97 100644 > --- a/package/qt5/qt5scxml/qt5scxml.mk > +++ b/package/qt5/qt5scxml/qt5scxml.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SCXML_VERSION = 631fd7bcc34802b7650c2b1dc73691463954d982 > +QT5SCXML_VERSION = e8727aabe55526956295407d27317ec15e12b283 > QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) > QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 > QT5SCXML_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash > index d43fa8ba65..37a23516df 100644 > --- a/package/qt5/qt5sensors/qt5sensors.hash > +++ b/package/qt5/qt5sensors/qt5sensors.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 8325826a259189fc7dea66651df4022a92a73664e953f86bce5bf5946ebacdf5 qtsensors-35eb5ac7eaef4745a38958c3ca780d7baa2e4f30.tar.bz2 > +sha256 f44148d1a21f3959d79f973d8aa233ddfacf37af6e27902fca8c885b91933fcc qtsensors-a41492b23cde20d1e00427d31e4637d06aea3638.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk > index 40bb72e038..29e257fdda 100644 > --- a/package/qt5/qt5sensors/qt5sensors.mk > +++ b/package/qt5/qt5sensors/qt5sensors.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SENSORS_VERSION = 35eb5ac7eaef4745a38958c3ca780d7baa2e4f30 > +QT5SENSORS_VERSION = a41492b23cde20d1e00427d31e4637d06aea3638 > QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) > QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 > QT5SENSORS_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash > index 01ffd7c215..1d1861a4a3 100644 > --- a/package/qt5/qt5serialbus/qt5serialbus.hash > +++ b/package/qt5/qt5serialbus/qt5serialbus.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 fe08415d2348797429dc09722478630ceee3d7477652a2712460e79127b7291b qtserialbus-f9f7eee60adac72fcf6617d164e3bf61222bb5c5.tar.bz2 > +sha256 952b145ae64e03208d7c2a0b0b2b94b928e8998eb72c6762b54e4d9760737dde qtserialbus-c41785c9f36560722b917d373ee97eed8cc4089a.tar.bz2 > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk > index c718414932..3315ef5be7 100644 > --- a/package/qt5/qt5serialbus/qt5serialbus.mk > +++ b/package/qt5/qt5serialbus/qt5serialbus.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SERIALBUS_VERSION = f9f7eee60adac72fcf6617d164e3bf61222bb5c5 > +QT5SERIALBUS_VERSION = c41785c9f36560722b917d373ee97eed8cc4089a > QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) > QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 > QT5SERIALBUS_DEPENDENCIES = qt5serialport > diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash > index 58461430c7..e95392b880 100644 > --- a/package/qt5/qt5serialport/qt5serialport.hash > +++ b/package/qt5/qt5serialport/qt5serialport.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 6d49d0da174632f51291b0190f6f1db2397a3b339cf293514252766f8a20c63b qtserialport-c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694.tar.bz2 > +sha256 2b7584de148f0b6ea2cf162609d44d7ad3bb893b1995427ceed72cb4562db6d7 qtserialport-3380465d5d4977326616c5e57789a81681be650e.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk > index 7d00bd2ab7..462d1dd7b9 100644 > --- a/package/qt5/qt5serialport/qt5serialport.mk > +++ b/package/qt5/qt5serialport/qt5serialport.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SERIALPORT_VERSION = c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694 > +QT5SERIALPORT_VERSION = 3380465d5d4977326616c5e57789a81681be650e > QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) > QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 > QT5SERIALPORT_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5speech/qt5speech.hash b/package/qt5/qt5speech/qt5speech.hash > index 595aac9f22..3be66a77fe 100644 > --- a/package/qt5/qt5speech/qt5speech.hash > +++ b/package/qt5/qt5speech/qt5speech.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 6d0794ab9d5286d04fbac2db44c00ed3306e569c876f84cfd91ac0e79c834b1e qtspeech-d32f4a479d38a11f547598004b975f4356424a16.tar.bz2 > +sha256 4be0161595806cfc5c9c3160a83d0379269a2813dd4b3ffe2e2a1328f23d8fbc qtspeech-214dcefc7c408e11a3e9fe9d221e4a384e2eaca1.tar.bz2 > > # Hashes for license files: > sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 > diff --git a/package/qt5/qt5speech/qt5speech.mk b/package/qt5/qt5speech/qt5speech.mk > index 8cf6fe19c1..c8054431df 100644 > --- a/package/qt5/qt5speech/qt5speech.mk > +++ b/package/qt5/qt5speech/qt5speech.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SPEECH_VERSION = d32f4a479d38a11f547598004b975f4356424a16 > +QT5SPEECH_VERSION = 214dcefc7c408e11a3e9fe9d221e4a384e2eaca1 > QT5SPEECH_SITE = $(QT5_SITE)/qtspeech/-/archive/$(QT5SPEECH_VERSION) > QT5SPEECH_SOURCE = qtspeech-$(QT5SPEECH_VERSION).tar.bz2 > QT5SPEECH_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash > index 4816206d64..f3e47da5de 100644 > --- a/package/qt5/qt5svg/qt5svg.hash > +++ b/package/qt5/qt5svg/qt5svg.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 063ee53515b934c00a65838fe8521142e4a9161b07c8e19b5bb0ea26a0ce9ab3 qtsvg-a9752b00a03438de8e5b080073816e12409404b7.tar.bz2 > +sha256 6a71029b46e71667f86c48923f0b292c3057ea56b2aedb8aeaa5af70e85e71c3 qtsvg-3385b64df939815e9df5955f991d270d47a5515b.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk > index 2a39ed18fe..c1d019000b 100644 > --- a/package/qt5/qt5svg/qt5svg.mk > +++ b/package/qt5/qt5svg/qt5svg.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SVG_VERSION = a9752b00a03438de8e5b080073816e12409404b7 > +QT5SVG_VERSION = 3385b64df939815e9df5955f991d270d47a5515b > QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) > QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 > QT5SVG_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash > index d603598257..d4ea0dc047 100644 > --- a/package/qt5/qt5tools/qt5tools.hash > +++ b/package/qt5/qt5tools/qt5tools.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 b6eebbd61dcde981d63ce6de39b3c957bad8f11b0140585ba4d57d166c4dd79d qttools-32912a06aadfc3dcbc34e0a668ce2c78351eee6e.tar.bz2 > +sha256 7214584115d0b89a362c6b0e8586d6228ac138f3ed5e52c97962b8634edbbcfd qttools-ddf6686e9bce7a3232af14a2966b4c895e654f02.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk > index a01a336584..98f3948d17 100644 > --- a/package/qt5/qt5tools/qt5tools.mk > +++ b/package/qt5/qt5tools/qt5tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5TOOLS_VERSION = 32912a06aadfc3dcbc34e0a668ce2c78351eee6e > +QT5TOOLS_VERSION = ddf6686e9bce7a3232af14a2966b4c895e654f02 > QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) > QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 > > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > index 60d51fa5fe..89559b63f2 100644 > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 e1e356e81f3a3fb5da6f6739aa475c15aab15090e202de6704441a3bf41c335b qtvirtualkeyboard-9fbb837b55887bec5d73fad142c853ef68db35b3.tar.bz2 > +sha256 c8dfb16614a63e39c714673abe35a7c30107d359356695634af619e62e8ce6cd qtvirtualkeyboard-817378aa10176fd26eed36542bc657e48d9dd42e.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > index 49ce71b75e..5657d78c30 100644 > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5VIRTUALKEYBOARD_VERSION = 9fbb837b55887bec5d73fad142c853ef68db35b3 > +QT5VIRTUALKEYBOARD_VERSION = 817378aa10176fd26eed36542bc657e48d9dd42e > QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) > QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 > QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg > diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash > index c9d7f3434c..f4a1663add 100644 > --- a/package/qt5/qt5wayland/qt5wayland.hash > +++ b/package/qt5/qt5wayland/qt5wayland.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 c881745403a7c3639ee928f64ac9e7252d7a941cb62ef682a7ee83ccf3ae0a60 qtwayland-8faf74a7966b520f0ac3eb4d88235f8ec63b31b8.tar.bz2 > +sha256 d45149cce43ad76f0c8ee43f0469728259d2ab341cf7e2c02ddab6163c5f1d13 qtwayland-b8f1882df7215b6e00f66b7a6a08afafe230de29.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk > index aeca1b0381..4ce89fc46a 100644 > --- a/package/qt5/qt5wayland/qt5wayland.mk > +++ b/package/qt5/qt5wayland/qt5wayland.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5WAYLAND_VERSION = 8faf74a7966b520f0ac3eb4d88235f8ec63b31b8 > +QT5WAYLAND_VERSION = b8f1882df7215b6e00f66b7a6a08afafe230de29 > QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) > QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 > QT5WAYLAND_DEPENDENCIES = wayland > diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash > index b5e9f1a043..7f2a357dbb 100644 > --- a/package/qt5/qt5webchannel/qt5webchannel.hash > +++ b/package/qt5/qt5webchannel/qt5webchannel.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 a281a053471f5c480d7c2679caa0a759e8628f6eafc07c1781f1eb8bb97ee37d qtwebchannel-8c842152da613f941892481d62267c73c4a4f006.tar.bz2 > +sha256 7d482e5140d789b417c359f557da783ed2cc07e8148133971caeb5b48b418645 qtwebchannel-48a520c11a0ef57f2553746159acf739c7f3863d.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk > index 54e6a70ddb..8ba81383d1 100644 > --- a/package/qt5/qt5webchannel/qt5webchannel.mk > +++ b/package/qt5/qt5webchannel/qt5webchannel.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5WEBCHANNEL_VERSION = 8c842152da613f941892481d62267c73c4a4f006 > +QT5WEBCHANNEL_VERSION = 48a520c11a0ef57f2553746159acf739c7f3863d > QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) > QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 > QT5WEBCHANNEL_DEPENDENCIES = qt5websockets > diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash > index 038446a9f4..e0447c70b1 100644 > --- a/package/qt5/qt5webengine/qt5webengine.hash > +++ b/package/qt5/qt5webengine/qt5webengine.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 4a3456df42e1c1b859232b3ee1d58360e629d55daf6e5ad308871142c1b0c2fa qtwebengine-v5.15.10-lts.tar.bz2 > +sha256 e7c9534453472311c06605f2892e038e9920bf10ca3a0dad99b46955ea124618 qtwebengine-v5.15.11-lts.tar.bz2 > > # Locally calculated > sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium > diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash > index 72fbb4a599..fa3cc48995 100644 > --- a/package/qt5/qt5websockets/qt5websockets.hash > +++ b/package/qt5/qt5websockets/qt5websockets.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 00a6d312f2e0ec8c64c12f6a178681d5936ec65bc7f1b85948b58cdb5021a8b6 qtwebsockets-6a4991250793cd38efa5e8db858cd49c82439130.tar.bz2 > +sha256 2e024a4c0706d58a9c846cc1d036f383906e392f3cd7c3051fc56915b7530eee qtwebsockets-50f3853a83ffc80a978cfa0882bdc2859e8de71e.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk > index 4eafb0b212..bb96fefe82 100644 > --- a/package/qt5/qt5websockets/qt5websockets.mk > +++ b/package/qt5/qt5websockets/qt5websockets.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5WEBSOCKETS_VERSION = 6a4991250793cd38efa5e8db858cd49c82439130 > +QT5WEBSOCKETS_VERSION = 50f3853a83ffc80a978cfa0882bdc2859e8de71e > QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) > QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 > QT5WEBSOCKETS_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash > index d928c7cdce..00525dbad2 100644 > --- a/package/qt5/qt5webview/qt5webview.hash > +++ b/package/qt5/qt5webview/qt5webview.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 38f6c0a2863e9144632286b0ef43db506b8631eeff0f8facae14b0da86ca0491 qtwebview-87577dde04ed219bda776dabca86176149736331.tar.bz2 > +sha256 2427179da946d6df409e334c94ffe3f8589035a5d566caf52db2333cc9bfe47c qtwebview-f078642eb9a440f6aa88f2beaf10f445de1e29bb.tar.bz2 > > # Hashes for license files: > sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL > diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk > index a55fd8ae74..01a377c27b 100644 > --- a/package/qt5/qt5webview/qt5webview.mk > +++ b/package/qt5/qt5webview/qt5webview.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5WEBVIEW_VERSION = 87577dde04ed219bda776dabca86176149736331 > +QT5WEBVIEW_VERSION = f078642eb9a440f6aa88f2beaf10f445de1e29bb > QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) > QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 > QT5WEBVIEW_DEPENDENCIES = qt5webengine > diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash > index 87dac8625e..132c28dd96 100644 > --- a/package/qt5/qt5x11extras/qt5x11extras.hash > +++ b/package/qt5/qt5x11extras/qt5x11extras.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 cf9124f3d35f1c8db4e9e47943cb1ec86834abf2be38d70412d0452e64462906 qtx11extras-982f20eb585d77e5b5c721e05a466d7161f7f2d1.tar.bz2 > +sha256 7d99fa4d900207c0ae1c7a514e7dc0b607c04e0232d2842a8d84f52534bd16e6 qtx11extras-5fb2e067a38d3583684310130f5d8aad064f512f.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk > index 80c5498518..a6fade0135 100644 > --- a/package/qt5/qt5x11extras/qt5x11extras.mk > +++ b/package/qt5/qt5x11extras/qt5x11extras.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5X11EXTRAS_VERSION = 982f20eb585d77e5b5c721e05a466d7161f7f2d1 > +QT5X11EXTRAS_VERSION = 5fb2e067a38d3583684310130f5d8aad064f512f > QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) > QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 > QT5X11EXTRAS_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > index 353dfc8485..9be7bb7831 100644 > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 067b801049f6fada8e7ebcfbce0530db6217a1a94b8ed34c99c530be4129889d qtxmlpatterns-30e6c84fe2752cde8b53aff9d38c2095cd7c8761.tar.bz2 > +sha256 7770b333f2c0079cf65aa19dafd9e7d80fe058baf8e924f1c0d6e75c0b6e7374 qtxmlpatterns-5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > index 803c36cf04..2126d3c915 100644 > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5XMLPATTERNS_VERSION = 30e6c84fe2752cde8b53aff9d38c2095cd7c8761 > +QT5XMLPATTERNS_VERSION = 5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2 > QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) > QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 > QT5XMLPATTERNS_INSTALL_STAGING = YES From arnout at mind.be Fri Feb 9 07:51:49 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 9 Feb 2024 08:51:49 +0100 Subject: [Buildroot] [git commit] package/qt5: bump packages to latest kde submodule versions Message-ID: <20240209075338.E37388770E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ab4a0a348b255a074d16b640e8a372fe94596dc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump qt5 packages to latest submodule versions from: https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 Signed-off-by: Sebastian Weyer Signed-off-by: Arnout Vandecappelle --- package/qt5/qt5.mk | 2 +- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/qt5/qt5charts/qt5charts.hash | 2 +- package/qt5/qt5charts/qt5charts.mk | 2 +- package/qt5/qt5connectivity/qt5connectivity.hash | 2 +- package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- package/qt5/qt5declarative/qt5declarative.hash | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 +- package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- package/qt5/qt5imageformats/qt5imageformats.hash | 2 +- package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- package/qt5/qt5location/qt5location.hash | 2 +- package/qt5/qt5location/qt5location.mk | 2 +- package/qt5/qt5lottie/qt5lottie.hash | 2 +- package/qt5/qt5lottie/qt5lottie.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 2 +- package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 +- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 +- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 2 +- package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 2 +- package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 2 +- package/qt5/qt5remoteobjects/qt5remoteobjects.mk | 2 +- package/qt5/qt5scxml/qt5scxml.hash | 2 +- package/qt5/qt5scxml/qt5scxml.mk | 2 +- package/qt5/qt5sensors/qt5sensors.hash | 2 +- package/qt5/qt5sensors/qt5sensors.mk | 2 +- package/qt5/qt5serialbus/qt5serialbus.hash | 2 +- package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- package/qt5/qt5serialport/qt5serialport.hash | 2 +- package/qt5/qt5serialport/qt5serialport.mk | 2 +- package/qt5/qt5speech/qt5speech.hash | 2 +- package/qt5/qt5speech/qt5speech.mk | 2 +- package/qt5/qt5svg/qt5svg.hash | 2 +- package/qt5/qt5svg/qt5svg.mk | 2 +- package/qt5/qt5tools/qt5tools.hash | 2 +- package/qt5/qt5tools/qt5tools.mk | 2 +- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 2 +- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- package/qt5/qt5wayland/qt5wayland.hash | 2 +- package/qt5/qt5wayland/qt5wayland.mk | 2 +- package/qt5/qt5webchannel/qt5webchannel.hash | 2 +- package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- package/qt5/qt5webengine/qt5webengine.hash | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 2 +- package/qt5/qt5websockets/qt5websockets.mk | 2 +- package/qt5/qt5webview/qt5webview.hash | 2 +- package/qt5/qt5webview/qt5webview.mk | 2 +- package/qt5/qt5x11extras/qt5x11extras.hash | 2 +- package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- 56 files changed, 56 insertions(+), 56 deletions(-) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index b55accacf1..a43b36dd51 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,7 +5,7 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).10 +QT5_VERSION = $(QT5_VERSION_MAJOR).11 QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 4efc8fa172..ffc474f49e 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5622a9053154af9a353b8e8be217104c6af068b5b5aba8b07ef4fea2dc79fded qtbase-e44097b63d17ba3178a637df7fac51ddc51cb48b.tar.bz2 +sha256 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 91891a2ec2..fbd882da21 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = e44097b63d17ba3178a637df7fac51ddc51cb48b +QT5BASE_VERSION = da6e958319e95fe564d3b30c931492dd666bfaff QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_CPE_ID_VENDOR = qt diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index 0688f64615..fec54c86b1 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9d2ad94a054bd7df08e5d11bc77b6422ccecbf99ea8dd6f06908bafc72ea869d qtcharts-841083c263f16f8acb81e4915bf24bbed0461c9a.tar.bz2 +sha256 66dae46a8bcb1dfc10dd3404296701c41e50658792e4a6a7317a182fad6f36c8 qtcharts-e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index fa69263be4..bfc6021289 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CHARTS_VERSION = 841083c263f16f8acb81e4915bf24bbed0461c9a +QT5CHARTS_VERSION = e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826 QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 1252a73247..776448502b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ec1d91fc35d8b4a333209fb5fd85e00ab77345bff48b60b4e43b804a59f60979 qtconnectivity-c5f35f89e975c2ad58c83c6b606d40ba41057f15.tar.bz2 +sha256 7a44848e113e1d7232c077f9fa8021ab038f59765123920e11936e7d4b8e3c66 qtconnectivity-f0c98c39447894bba493aa91c65053d7f18d68cb.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 72797de1a0..dc5e647e0b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = c5f35f89e975c2ad58c83c6b606d40ba41057f15 +QT5CONNECTIVITY_VERSION = f0c98c39447894bba493aa91c65053d7f18d68cb QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 0e7978dc58..3db5c94458 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 dbe0cdf84767564a56abf9d0d867c9cfcc754827169357a0f8162309c11882b5 qtdeclarative-b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a.tar.bz2 +sha256 bebd1205aa087f529b8824f0284e127e08672ff7ce36a6b865cd921514ec1192 qtdeclarative-960a980dc885622cb84990c4da75d5060318302d.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 18c1608fca..99c88e7d06 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a +QT5DECLARATIVE_VERSION = 960a980dc885622cb84990c4da75d5060318302d QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 95567b2476..e5fdaf67bf 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 de41af344889d35252fec9a6b6c78e1f67b7a7be15a5d3986b2ec20e2fcafadc qtgraphicaleffects-e6e1e58ec28fd0f2e6426e6962cc4ccddb493349.tar.bz2 +sha256 18afbc24b40420ce0fe6bfad8331f43a1d8c8ec22501b7987ecec9334b69e9a2 qtgraphicaleffects-cce7d784237cd2dd4af1abe2757d048e34e02685.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index f829c67122..ddf805303b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = e6e1e58ec28fd0f2e6426e6962cc4ccddb493349 +QT5GRAPHICALEFFECTS_VERSION = cce7d784237cd2dd4af1abe2757d048e34e02685 QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 9d821672b3..779db8d109 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8bf646d4db7d0099dd49b7c049a64fb585a3e180d73fc2b6edf22a1384529d1d qtimageformats-9044695f4b1acdd7ec24e7b01f6a6ca61f982a75.tar.bz2 +sha256 bac150b9c5eaf0132a39a0b2a75cfca5400c11f4b8bf60f7362a6e0307f5c19e qtimageformats-6a1af670d52492ab0955933b830026b2a18ed6d6.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 0ce6e4ffb4..27ef05777d 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = 9044695f4b1acdd7ec24e7b01f6a6ca61f982a75 +QT5IMAGEFORMATS_VERSION = 6a1af670d52492ab0955933b830026b2a18ed6d6 QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index f73053f388..0188f51c83 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 90b57a335d8c7311a86865a56b2b9cd944a8a1cafa6a7499de5b35a105c5b247 qt5location-ebdf5b38da6e3fe0a183702bcca395c589c459ed-br1.tar.gz +sha256 133d28fc0071e419682b7ed736c17b39240545c8e9d6ff7e9905f365bb1eb693 qt5location-0ec8f5e82da7369a92824167c4d7331f6c502325-br1.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index 904d31a983..88bf3d289c 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOCATION_VERSION = ebdf5b38da6e3fe0a183702bcca395c589c459ed +QT5LOCATION_VERSION = 0ec8f5e82da7369a92824167c4d7331f6c502325 QT5LOCATION_SITE = $(QT5_SITE)/qtlocation QT5LOCATION_SITE_METHOD = git QT5LOCATION_GIT_SUBMODULES = YES diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index cbd94fd111..642625753c 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 82336dd063f8bedc28e9545cc8c0123053434d6c681e470434c80ad3908ca4b0 qtlottie-d40b67401afe7156b03c62c9a4d517b07555fe64.tar.bz2 +sha256 4d8a063687c25675b012821e252a1afd455bdb4ea43e6d79787f9991c68cb5c5 qtlottie-909b79f4810b8ac62baa3544837793cfb132593b.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 42a920582a..d4ad3afc63 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOTTIE_VERSION = d40b67401afe7156b03c62c9a4d517b07555fe64 +QT5LOTTIE_VERSION = 909b79f4810b8ac62baa3544837793cfb132593b QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 4803ef9230..7925c4fe05 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 842c5be64dafe7a68d2b120e24faffd14af6e4d9d8e9c0aa8bbf4330b3491aa3 qtmultimedia-76f84c545429a1b988b79f971734ef4bc3e6643f.tar.bz2 +sha256 3f78ede5dcc231d0e92e9907d11fa1d7a7cf506eb73d3f035e8461b57dc692b4 qtmultimedia-b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 0d0f5dd53d..7a56d238f2 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = 76f84c545429a1b988b79f971734ef4bc3e6643f +QT5MULTIMEDIA_VERSION = b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4 QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 05a021e8b2..219dc8d588 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e2c7bc6346a8eb4c21510f8fbf7e752648f68a0c5af8525a784e64503570f72c qtquickcontrols-e62b8b6d2f45a79652238b33f4bbe23023004ae7.tar.bz2 +sha256 8c02691d3eb45b9f144bef64c9705e26e8a4c725a0731b18450d39a589965c49 qtquickcontrols-dcc90558d9c0cba41eec7df290943994289b0e87.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 25c1a74f5c..86792ddd8e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = e62b8b6d2f45a79652238b33f4bbe23023004ae7 +QT5QUICKCONTROLS_VERSION = dcc90558d9c0cba41eec7df290943994289b0e87 QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 88777a5cc3..91fb31a7b7 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 53caea73e6bdf234cb445067be3bc4e07ed59af7da967638ac598188b719958e qtquickcontrols2-74e8db97fdb9b55c4b4614b83f4bf17e00df55e9.tar.bz2 +sha256 481220682ce3127711465d6ade22c9ce0e4a4130dd9735344f7464f9147d8f0d qtquickcontrols2-1ce461bd1dc713cd2f79fc16c5454d587b45eefa.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 1732921203..a2503eb9a3 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = 74e8db97fdb9b55c4b4614b83f4bf17e00df55e9 +QT5QUICKCONTROLS2_VERSION = 1ce461bd1dc713cd2f79fc16c5454d587b45eefa QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index a8acf3c5a2..1c9f436b1b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 d22637609c4afcc7560d92c894eb55d4afa01706bb5c86499bf56f7c8723a605 qtquicktimeline-87ad61716a7cba5a070d8a7b1756c8b2b48d5d53.tar.bz2 +sha256 ee404943ef00dbac33928cf001b613ca517fdfdf2767b932a8def5f8c2b0797f qtquicktimeline-b1b4b882dabaa036c3fb73c4a879ba8efbb02ded.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index de94bd0375..3a8542ab1b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = 87ad61716a7cba5a070d8a7b1756c8b2b48d5d53 +QT5QUICKTIMELINE_VERSION = b1b4b882dabaa036c3fb73c4a879ba8efbb02ded QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 1b41ab675f..a931ce09cb 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ef8e1f64911f7e03da6306693031fdf953af00d453ec154497178bb7ceab1aa2 qtremoteobjects-aa705010da0f658b78c1155babce7091ae44529a.tar.bz2 +sha256 677b8ccb5c07673296c4fa01bcbc6bd9b8e3a534d332624f61fe0360a5649703 qtremoteobjects-bdc316aca82769b43cb7821c10d80a1ca02b846e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index 3160d37ad7..5fea3487a5 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = aa705010da0f658b78c1155babce7091ae44529a +QT5REMOTEOBJECTS_VERSION = bdc316aca82769b43cb7821c10d80a1ca02b846e QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index f4d52b8a52..0f13743f45 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a0113f54d9df14ebae15dd85530f87f093a284372ee8237d1ccceb02e6a4607b qtscxml-631fd7bcc34802b7650c2b1dc73691463954d982.tar.bz2 +sha256 d598238bfa3bbbe283a8bd2907a4e8e813e00c522f08297a856e6595bbd44099 qtscxml-e8727aabe55526956295407d27317ec15e12b283.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index f6ccb9298e..32ef425e97 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SCXML_VERSION = 631fd7bcc34802b7650c2b1dc73691463954d982 +QT5SCXML_VERSION = e8727aabe55526956295407d27317ec15e12b283 QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index d43fa8ba65..37a23516df 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8325826a259189fc7dea66651df4022a92a73664e953f86bce5bf5946ebacdf5 qtsensors-35eb5ac7eaef4745a38958c3ca780d7baa2e4f30.tar.bz2 +sha256 f44148d1a21f3959d79f973d8aa233ddfacf37af6e27902fca8c885b91933fcc qtsensors-a41492b23cde20d1e00427d31e4637d06aea3638.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index 40bb72e038..29e257fdda 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SENSORS_VERSION = 35eb5ac7eaef4745a38958c3ca780d7baa2e4f30 +QT5SENSORS_VERSION = a41492b23cde20d1e00427d31e4637d06aea3638 QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 01ffd7c215..1d1861a4a3 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fe08415d2348797429dc09722478630ceee3d7477652a2712460e79127b7291b qtserialbus-f9f7eee60adac72fcf6617d164e3bf61222bb5c5.tar.bz2 +sha256 952b145ae64e03208d7c2a0b0b2b94b928e8998eb72c6762b54e4d9760737dde qtserialbus-c41785c9f36560722b917d373ee97eed8cc4089a.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index c718414932..3315ef5be7 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALBUS_VERSION = f9f7eee60adac72fcf6617d164e3bf61222bb5c5 +QT5SERIALBUS_VERSION = c41785c9f36560722b917d373ee97eed8cc4089a QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 58461430c7..e95392b880 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6d49d0da174632f51291b0190f6f1db2397a3b339cf293514252766f8a20c63b qtserialport-c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694.tar.bz2 +sha256 2b7584de148f0b6ea2cf162609d44d7ad3bb893b1995427ceed72cb4562db6d7 qtserialport-3380465d5d4977326616c5e57789a81681be650e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 7d00bd2ab7..462d1dd7b9 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALPORT_VERSION = c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694 +QT5SERIALPORT_VERSION = 3380465d5d4977326616c5e57789a81681be650e QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5speech/qt5speech.hash b/package/qt5/qt5speech/qt5speech.hash index 595aac9f22..3be66a77fe 100644 --- a/package/qt5/qt5speech/qt5speech.hash +++ b/package/qt5/qt5speech/qt5speech.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6d0794ab9d5286d04fbac2db44c00ed3306e569c876f84cfd91ac0e79c834b1e qtspeech-d32f4a479d38a11f547598004b975f4356424a16.tar.bz2 +sha256 4be0161595806cfc5c9c3160a83d0379269a2813dd4b3ffe2e2a1328f23d8fbc qtspeech-214dcefc7c408e11a3e9fe9d221e4a384e2eaca1.tar.bz2 # Hashes for license files: sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 diff --git a/package/qt5/qt5speech/qt5speech.mk b/package/qt5/qt5speech/qt5speech.mk index 8cf6fe19c1..c8054431df 100644 --- a/package/qt5/qt5speech/qt5speech.mk +++ b/package/qt5/qt5speech/qt5speech.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SPEECH_VERSION = d32f4a479d38a11f547598004b975f4356424a16 +QT5SPEECH_VERSION = 214dcefc7c408e11a3e9fe9d221e4a384e2eaca1 QT5SPEECH_SITE = $(QT5_SITE)/qtspeech/-/archive/$(QT5SPEECH_VERSION) QT5SPEECH_SOURCE = qtspeech-$(QT5SPEECH_VERSION).tar.bz2 QT5SPEECH_INSTALL_STAGING = YES diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 4816206d64..f3e47da5de 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 063ee53515b934c00a65838fe8521142e4a9161b07c8e19b5bb0ea26a0ce9ab3 qtsvg-a9752b00a03438de8e5b080073816e12409404b7.tar.bz2 +sha256 6a71029b46e71667f86c48923f0b292c3057ea56b2aedb8aeaa5af70e85e71c3 qtsvg-3385b64df939815e9df5955f991d270d47a5515b.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index 2a39ed18fe..c1d019000b 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SVG_VERSION = a9752b00a03438de8e5b080073816e12409404b7 +QT5SVG_VERSION = 3385b64df939815e9df5955f991d270d47a5515b QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index d603598257..d4ea0dc047 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b6eebbd61dcde981d63ce6de39b3c957bad8f11b0140585ba4d57d166c4dd79d qttools-32912a06aadfc3dcbc34e0a668ce2c78351eee6e.tar.bz2 +sha256 7214584115d0b89a362c6b0e8586d6228ac138f3ed5e52c97962b8634edbbcfd qttools-ddf6686e9bce7a3232af14a2966b4c895e654f02.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index a01a336584..98f3948d17 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5TOOLS_VERSION = 32912a06aadfc3dcbc34e0a668ce2c78351eee6e +QT5TOOLS_VERSION = ddf6686e9bce7a3232af14a2966b4c895e654f02 QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 60d51fa5fe..89559b63f2 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e1e356e81f3a3fb5da6f6739aa475c15aab15090e202de6704441a3bf41c335b qtvirtualkeyboard-9fbb837b55887bec5d73fad142c853ef68db35b3.tar.bz2 +sha256 c8dfb16614a63e39c714673abe35a7c30107d359356695634af619e62e8ce6cd qtvirtualkeyboard-817378aa10176fd26eed36542bc657e48d9dd42e.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 49ce71b75e..5657d78c30 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = 9fbb837b55887bec5d73fad142c853ef68db35b3 +QT5VIRTUALKEYBOARD_VERSION = 817378aa10176fd26eed36542bc657e48d9dd42e QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index c9d7f3434c..f4a1663add 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c881745403a7c3639ee928f64ac9e7252d7a941cb62ef682a7ee83ccf3ae0a60 qtwayland-8faf74a7966b520f0ac3eb4d88235f8ec63b31b8.tar.bz2 +sha256 d45149cce43ad76f0c8ee43f0469728259d2ab341cf7e2c02ddab6163c5f1d13 qtwayland-b8f1882df7215b6e00f66b7a6a08afafe230de29.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index aeca1b0381..4ce89fc46a 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WAYLAND_VERSION = 8faf74a7966b520f0ac3eb4d88235f8ec63b31b8 +QT5WAYLAND_VERSION = b8f1882df7215b6e00f66b7a6a08afafe230de29 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index b5e9f1a043..7f2a357dbb 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a281a053471f5c480d7c2679caa0a759e8628f6eafc07c1781f1eb8bb97ee37d qtwebchannel-8c842152da613f941892481d62267c73c4a4f006.tar.bz2 +sha256 7d482e5140d789b417c359f557da783ed2cc07e8148133971caeb5b48b418645 qtwebchannel-48a520c11a0ef57f2553746159acf739c7f3863d.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 54e6a70ddb..8ba81383d1 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = 8c842152da613f941892481d62267c73c4a4f006 +QT5WEBCHANNEL_VERSION = 48a520c11a0ef57f2553746159acf739c7f3863d QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 038446a9f4..e0447c70b1 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4a3456df42e1c1b859232b3ee1d58360e629d55daf6e5ad308871142c1b0c2fa qtwebengine-v5.15.10-lts.tar.bz2 +sha256 e7c9534453472311c06605f2892e038e9920bf10ca3a0dad99b46955ea124618 qtwebengine-v5.15.11-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 72fbb4a599..fa3cc48995 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 00a6d312f2e0ec8c64c12f6a178681d5936ec65bc7f1b85948b58cdb5021a8b6 qtwebsockets-6a4991250793cd38efa5e8db858cd49c82439130.tar.bz2 +sha256 2e024a4c0706d58a9c846cc1d036f383906e392f3cd7c3051fc56915b7530eee qtwebsockets-50f3853a83ffc80a978cfa0882bdc2859e8de71e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index 4eafb0b212..bb96fefe82 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = 6a4991250793cd38efa5e8db858cd49c82439130 +QT5WEBSOCKETS_VERSION = 50f3853a83ffc80a978cfa0882bdc2859e8de71e QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index d928c7cdce..00525dbad2 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 38f6c0a2863e9144632286b0ef43db506b8631eeff0f8facae14b0da86ca0491 qtwebview-87577dde04ed219bda776dabca86176149736331.tar.bz2 +sha256 2427179da946d6df409e334c94ffe3f8589035a5d566caf52db2333cc9bfe47c qtwebview-f078642eb9a440f6aa88f2beaf10f445de1e29bb.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index a55fd8ae74..01a377c27b 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBVIEW_VERSION = 87577dde04ed219bda776dabca86176149736331 +QT5WEBVIEW_VERSION = f078642eb9a440f6aa88f2beaf10f445de1e29bb QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 87dac8625e..132c28dd96 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 cf9124f3d35f1c8db4e9e47943cb1ec86834abf2be38d70412d0452e64462906 qtx11extras-982f20eb585d77e5b5c721e05a466d7161f7f2d1.tar.bz2 +sha256 7d99fa4d900207c0ae1c7a514e7dc0b607c04e0232d2842a8d84f52534bd16e6 qtx11extras-5fb2e067a38d3583684310130f5d8aad064f512f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 80c5498518..a6fade0135 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = 982f20eb585d77e5b5c721e05a466d7161f7f2d1 +QT5X11EXTRAS_VERSION = 5fb2e067a38d3583684310130f5d8aad064f512f QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 353dfc8485..9be7bb7831 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 067b801049f6fada8e7ebcfbce0530db6217a1a94b8ed34c99c530be4129889d qtxmlpatterns-30e6c84fe2752cde8b53aff9d38c2095cd7c8761.tar.bz2 +sha256 7770b333f2c0079cf65aa19dafd9e7d80fe058baf8e924f1c0d6e75c0b6e7374 qtxmlpatterns-5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 803c36cf04..2126d3c915 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = 30e6c84fe2752cde8b53aff9d38c2095cd7c8761 +QT5XMLPATTERNS_VERSION = 5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2 QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES From sebastien.szymanski at armadeus.com Fri Feb 9 09:29:13 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Fri, 9 Feb 2024 10:29:13 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> Message-ID: Hi Arnout, On 2/8/24 23:36, Arnout Vandecappelle wrote: > ?Hi Se?bastien, > > ?It's no fun that I still have questions on v5, but unfortunately... > > On 08/02/2024 13:54, S?bastien Szymanski wrote: >> This commit adds i.MX91 and i.MX93 support to Buildroot. >> https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors:IMX9-PROCESSORS >> >> There is no i.MX95 software provided by NXP at the moment that's why >> i.MX95 is left behind. >> >> Adapt package firmware-imx for the LPPDR4 firwmares binaries. >> >> Reviewed-by: Gary Bisson >> Signed-off-by: S?bastien Szymanski > > [snip] >> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 >> +??? bool "imx91" >> + >> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> +??? bool "imx93" >> + >> +endchoice >> + >> +choice >> +??? prompt "i.MX Silicon Revision" >> +??? default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 \ >> +??????? if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 >> +??? default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 \ >> +??????? if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> +??? help >> +????? Some packages related to the selected i.MX platform need to >> know the >> +????? silicon revision of the platform they will run on. >> +????? If you don't know, leave the default value. >> + >> +????? Note - mismatches may result in a failure to boot! > > ?This sentence conflicts with "If you don't know, leave the default > value"... So I think that "If you don't know" sentence should be dropped. > ok. >> + >> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 >> +??? bool "imx91a1" >> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > > ?Since for IMX91 there is only one option, I think it makes more sense > to not offer a choice for this. Just always use this one for the IMX91. > We can still add it back if there ever turns out to be an imx91a2. > >> + >> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 >> +??? bool "imx93a0" >> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> + >> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 >> +??? bool "imx93a1" >> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> + >> ? endchoice > > [snip] >> @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION >> ????? # unconditionally use HW version 201810 when DDR3/DDR4 was >> ????? # selected >> ????? default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || >> BR2_PACKAGE_FIRMWARE_IMX_DDR4 >> +??? default "v202201" if \ > > ?For the time being, there is only one version for the IMX91/3. So it > makes no sense to give an option for it. (In fact, this really should > have been a choice instead of a string option because there are only a > fixed set of options... But that's a separate topic.) > > ?By the way, do these SoCs use the plain 202006 version for DDR4 like > the other SoCs? And do they also support DDR3? The i.MX9{1,3} SoCs don't support DDR4 and DDR3... Only LPDDR4 or LPDDR4X, hence my changes below BR2_PACKAGE_FIRMWARE_IMX_DDR{3,4} options. > >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> ????? help >> ??????? Use a specific version of the imx ddr binaries. Leaving this >> ??????? field empty will select the default version. >> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk >> b/package/freescale-imx/firmware-imx/firmware-imx.mk >> index 66ef8c3930be..1f36f917cdc8 100644 >> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk >> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk >> @@ -48,6 +48,30 @@ endif >> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) >> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >> +ifeq >> ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) > > ?To make the conditions more symmetrical/regular, perhaps it's better > to create a new BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X option and encode > the platform conditions there. The prompt would be the same for > BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 and for > BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X ("lpddr4" for both).? But perhaps > I'm overthinking things. I don't see the benefits to do so. Also, i.MX95 supports LPPDR5. > >> +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >> +??? # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate >> lpddr4_fw.bin. >> +??? # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin >> +??? # which is done in post-image script. >> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >> +??????? lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >> +??????? lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > > ?So the v202201 could be hardcoded here. > >> +??????? lpddr4_1d_fw) >> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >> +??????? lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >> +??????? lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >> +??????? lpddr4_2d_fw) >> +??? cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ >> +??????? $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ >> +??????? $(BINARIES_DIR)/lpddr4_fw.bin >> +??? ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin >> + >> +??? # U-Boot supports creation of the combined flash.bin image. To make >> +??? # sure that U-Boot can access all available files copy them to >> +??? # the binary dir. >> +??? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ > > ?We now have 3 instances of this exact same code block with only the > file names that differ, so perhaps it's time to factor this into a > second helper function. Or better, define a few auxiliary variables > FIRMWARE_IMX_DDRFW_IMEM_1D, FIRMWARE_IMX_DDRFW_DMEM_1D etc that are set > for each variant, and then one definition of > FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW that uses those variables. > > ?If that sounds too complex, don't worry, it's just a "niceification" > so not really necessary to do. This should done be in a separated patch, right ? > > ?In fact, the only of my comments above that is really important is > dropping BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1. ok ! Regards, > > ?Regards, > ?Arnout > >> +endef >> +else >> ? define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >> ????? # Create padded versions of lpddr4_pmu_* and generate >> lpddr4_pmu_train_fw.bin. >> ????? # lpddr4_pmu_train_fw.bin is needed when generating >> imx8-boot-sd.bin >> @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >> ????? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ >> ? endef >> ? endif >> +endif >> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) >> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >> -- S?bastien Szymanski, Armadeus Systems Software engineer From sebastien.szymanski at armadeus.com Fri Feb 9 09:34:51 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Fri, 9 Feb 2024 10:34:51 +0100 Subject: [Buildroot] [PATCH v5 2/3] package/freescale-imx/firmware-ele-imx: new package In-Reply-To: <7cc235a5-b0ee-4517-a4ce-941e6f868c19@mind.be> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> <7cc235a5-b0ee-4517-a4ce-941e6f868c19@mind.be> Message-ID: <02fc9dc6-4cc4-4bac-a5d8-218c1ed04446@armadeus.com> Hi Arnout, On 2/8/24 23:43, Arnout Vandecappelle wrote: > > > On 08/02/2024 13:54, S?bastien Szymanski wrote: >> This package provides firmware blobs for the Edgelock Secure >> Enclave (ELE) [1] present on i.MX8ULP and i.MX9 Socs. >> This version comes from the 6.1.55-2.2.0 release. >> >> [1] >> https://www.nxp.com/products/nxp-product-information/nxp-product-programs/edgelock-secure-enclave:EDGELOCK-SECURE-ENCLAVE >> >> Reviewed-by: Gary Bisson >> Signed-off-by: S?bastien Szymanski >> --- >> Changes for v5: >> ? - none >> >> Changes for v4: >> ? - move i.MX Silicon Revision changes into first patch (Gary Bisson) >> >> Changes for v3: >> ? - rename package from firmware-sentinel to package firmware-ele-imx >> >> Changes for v2: >> ? - none >> --- >> ? package/freescale-imx/Config.in??????????????????? |? 1 + >> ? package/freescale-imx/firmware-ele-imx/Config.in?? | 21 >> +++++++++++++++++ >> ? .../firmware-ele-imx/firmware-ele-imx.hash???????? |? 4 ++++ >> ? .../firmware-ele-imx/firmware-ele-imx.mk?????????? | 27 >> ++++++++++++++++++++++ >> ? 4 files changed, 53 insertions(+) >> >> diff --git a/package/freescale-imx/Config.in >> b/package/freescale-imx/Config.in >> index ba169ead18cb..f12acc3bd024 100644 >> --- a/package/freescale-imx/Config.in >> +++ b/package/freescale-imx/Config.in >> @@ -154,6 +154,7 @@ source "package/freescale-imx/imx-uuc/Config.in" >> ? source "package/freescale-imx/imx-vpu/Config.in" >> ? source "package/freescale-imx/imx-vpu-hantro/Config.in" >> ? source "package/freescale-imx/imx-vpuwrap/Config.in" >> +source "package/freescale-imx/firmware-ele-imx/Config.in" >> ? source "package/freescale-imx/firmware-imx/Config.in" >> ? source "package/freescale-imx/imx-sc-firmware/Config.in" >> ? source "package/freescale-imx/imx-seco/Config.in" >> diff --git a/package/freescale-imx/firmware-ele-imx/Config.in >> b/package/freescale-imx/firmware-ele-imx/Config.in >> new file mode 100644 >> index 000000000000..7867c3712c9c >> --- /dev/null >> +++ b/package/freescale-imx/firmware-ele-imx/Config.in >> @@ -0,0 +1,21 @@ >> +config BR2_PACKAGE_FIRMWARE_ELE_IMX >> +??? bool "firmware-ele-imx" >> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> +??? help >> +????? Firmware blobs for the Edgelock Secure Enclave (ELE) > > ?ELE, not ELSE? Weird... Following NXP here... > >> +????? present on i.MX8ULP and i.MX9 SoCs. > > ?I guess we simply don't have support for i.MX8ULP yet in Buildroot? Nope, not yet. > > ?Perhaps it's better to create a BR2_PACKAGE_FREESCALE_IMX_HAS_ELE > option in freescale-imx/Config.in > >> + >> +????? This library is provided by NXP as-is and doesn't have an >> +????? upstream. >> + >> +if BR2_PACKAGE_FIRMWARE_ELE_IMX >> + >> +config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE >> +??? string >> +??? default "mx93a0-ahab-container.img" if >> BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 >> +??? default "mx93a1-ahab-container.img" if \ >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 || \ > > ?So i.MX91 uses the mx93 image? Weird... Yes, there is no specific files for i.MX91 in the package. Regards, > > ?Regards, > ?Arnout > > >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 >> + >> +endif # BR2_PACKAGE_FIRMWARE_ELE_IMX >> diff --git >> a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash >> b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash >> new file mode 100644 >> index 000000000000..58565cef43e9 >> --- /dev/null >> +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash >> @@ -0,0 +1,4 @@ >> +# Locally calculated >> +sha256 >> 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca >> firmware-ele-imx-0.1.0.bin >> +sha256 >> 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84? COPYING >> +sha256 >> c800aaca3a7e9f470d99d7cde0a48c95982ed601d4c306f7b8f43f3710054f28? 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 >> new file mode 100644 >> index 000000000000..600b50c5b456 >> --- /dev/null >> +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk >> @@ -0,0 +1,27 @@ >> +################################################################################ >> +# >> +# firmware-ele-imx >> +# >> +################################################################################ >> + >> +FIRMWARE_ELE_IMX_VERSION = 0.1.0 >> +FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) >> +FIRMWARE_ELE_IMX_SOURCE = >> firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin >> + >> +FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement >> +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING SCR.txt >> +FIRMWARE_ELE_IMX_REDISTRIBUTE = NO >> + >> +FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES >> + >> +define FIRMWARE_ELE_IMX_EXTRACT_CMDS >> +??? $(call >> NXP_EXTRACT_HELPER,$(FIRMWARE_ELE_IMX_DL_DIR)/$(FIRMWARE_ELE_IMX_SOURCE)) >> +endef >> + >> +FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE = $(call >> qstrip,$(BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE)) >> + >> +define FIRMWARE_ELE_IMX_INSTALL_IMAGES_CMDS >> +??? cp $(@D)/$(FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE) >> $(BINARIES_DIR)/ahab-container.img >> +endef >> + >> +$(eval $(generic-package)) >> -- S?bastien Szymanski, Armadeus Systems Software engineer From arnout at mind.be Fri Feb 9 10:25:39 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 9 Feb 2024 11:25:39 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> Message-ID: <6211cb6a-632a-404a-94c8-998f499c7cf2@mind.be> On 09/02/2024 10:29, S?bastien Szymanski wrote: > Hi Arnout, > > On 2/8/24 23:36, Arnout Vandecappelle wrote: >> ??Hi Se?bastien, >> >> ??It's no fun that I still have questions on v5, but unfortunately... I'll see this weekend if I can merge v5 with the feedback you give below. Unless you send a v6 before that of course! [snip] >>> + >>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 >>> +??? bool "imx91a1" >>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 >> >> ??Since for IMX91 there is only one option, I think it makes more sense to not >> offer a choice for this. Just always use this one for the IMX91. We can still >> add it back if there ever turns out to be an imx91a2. This is actually the main thing I wanted confirmation about from you... Do you agree that we only need the revision option for IMX93, not for IMX91? >> >>> + >>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 >>> +??? bool "imx93a0" >>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>> + >>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 >>> +??? bool "imx93a1" >>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>> + >>> ? endchoice >> >> [snip] >>> @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION >>> ????? # unconditionally use HW version 201810 when DDR3/DDR4 was >>> ????? # selected >>> ????? default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || >>> BR2_PACKAGE_FIRMWARE_IMX_DDR4 >>> +??? default "v202201" if \ >> >> ??For the time being, there is only one version for the IMX91/3. So it makes >> no sense to give an option for it. (In fact, this really should have been a >> choice instead of a string option because there are only a fixed set of >> options... But that's a separate topic.) >> >> ??By the way, do these SoCs use the plain 202006 version for DDR4 like the >> other SoCs? And do they also support DDR3? > > The i.MX9{1,3} SoCs don't support DDR4 and DDR3... Only LPDDR4 or LPDDR4X, hence > my changes below BR2_PACKAGE_FIRMWARE_IMX_DDR{3,4} options. Oh, I missed that. So for IMX9 there is no actual choice, it's always LPDDR4 (because we have no LPDDR4X option at the moment, and there also doesn't seem to be any firmware for it...)? >>> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ >>> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>> ????? help >>> ??????? Use a specific version of the imx ddr binaries. Leaving this >>> ??????? field empty will select the default version. >>> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk >>> b/package/freescale-imx/firmware-imx/firmware-imx.mk >>> index 66ef8c3930be..1f36f917cdc8 100644 >>> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk >>> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk >>> @@ -48,6 +48,30 @@ endif >>> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) >>> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >>> +ifeq >>> ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) >> >> ??To make the conditions more symmetrical/regular, perhaps it's better to >> create a new BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X option and encode the >> platform conditions there. The prompt would be the same for >> BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 and for BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X >> ("lpddr4" for both).? But perhaps I'm overthinking things. > > I don't see the benefits to do so. Also, i.MX95 supports LPPDR5. But there also doesn't seem to be firmware for LPDDR5? >>> +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>> +??? # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate >>> lpddr4_fw.bin. >>> +??? # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin >>> +??? # which is done in post-image script. >>> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >>> +??????? lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>> +??????? lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >> >> ??So the v202201 could be hardcoded here. >> >>> +??????? lpddr4_1d_fw) >>> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >>> +??????? lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>> +??????? lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>> +??????? lpddr4_2d_fw) >>> +??? cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ >>> +??????? $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ >>> +??????? $(BINARIES_DIR)/lpddr4_fw.bin >>> +??? ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin >>> + >>> +??? # U-Boot supports creation of the combined flash.bin image. To make >>> +??? # sure that U-Boot can access all available files copy them to >>> +??? # the binary dir. >>> +??? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ >> >> ??We now have 3 instances of this exact same code block with only the file >> names that differ, so perhaps it's time to factor this into a second helper >> function. Or better, define a few auxiliary variables >> FIRMWARE_IMX_DDRFW_IMEM_1D, FIRMWARE_IMX_DDRFW_DMEM_1D etc that are set for >> each variant, and then one definition of FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >> that uses those variables. >> >> ??If that sounds too complex, don't worry, it's just a "niceification" so not >> really necessary to do. > > This should done be in a separated patch, right ? Yes, I think it's better to merge this series pretty much as is (except for dropping IMX91A1), and then do a refactoring patch seperately. I actually have a bunch more refactoring ideas, so perhaps it's better if I make a PoC patch of my ideas and you fix up all the mistakes I make in it? Regards, Arnout > >> >> ??In fact, the only of my comments above that is really important is dropping >> BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1. > > ok ! > > Regards, > >> >> ??Regards, >> ??Arnout >> >>> +endef >>> +else >>> ? define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>> ????? # Create padded versions of lpddr4_pmu_* and generate >>> lpddr4_pmu_train_fw.bin. >>> ????? # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin >>> @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>> ????? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ >>> ? endef >>> ? endif >>> +endif >>> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) >>> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >>> > From buildroot at bubu1.eu Fri Feb 9 10:25:55 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Fri, 9 Feb 2024 11:25:55 +0100 Subject: [Buildroot] [PATCH] package/python-jc: new package Message-ID: <20240209102556.2020962-1-buildroot@bubu1.eu> This version still requires xmltodict and pyexpat for the cli tool to work correctly but this should become optional in a future release. [1] The other dependencies are already optional and this only mentioned in the package's help text. [2] [1] https://github.com/kellyjonbrazil/jc/issues/537 [2] https://github.com/kellyjonbrazil/jc/issues/108 Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/python-jc/Config.in | 12 ++++++++++ package/python-jc/python-jc.hash | 5 +++++ package/python-jc/python-jc.mk | 14 ++++++++++++ .../testing/tests/package/test_python_jc.py | 22 +++++++++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 package/python-jc/Config.in create mode 100644 package/python-jc/python-jc.hash create mode 100644 package/python-jc/python-jc.mk create mode 100644 support/testing/tests/package/test_python_jc.py diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..7f4d0740ac 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1151,6 +1151,7 @@ menu "External python modules" source "package/python-janus/Config.in" source "package/python-jaraco-classes/Config.in" source "package/python-jaraco-functools/Config.in" + source "package/python-jc/Config.in" source "package/python-jedi/Config.in" source "package/python-jeepney/Config.in" source "package/python-jinja2/Config.in" diff --git a/package/python-jc/Config.in b/package/python-jc/Config.in new file mode 100644 index 0000000000..ec1f855b8c --- /dev/null +++ b/package/python-jc/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_JC + bool "python-jc" + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON_XMLTODICT + help + Converts the output of popular command-line tools and file- + types to JSON. + + Optionally requires python-pygments for syntax highlighting, + python-ruamel-yaml for yaml parsing and output. + + https://github.com/kellyjonbrazil/jc diff --git a/package/python-jc/python-jc.hash b/package/python-jc/python-jc.hash new file mode 100644 index 0000000000..b06c660a51 --- /dev/null +++ b/package/python-jc/python-jc.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jc/json +md5 dffc3f8e92e4c535f5653641abfa5397 jc-1.25.0.tar.gz +sha256 eba4aaaf5128f18a16121c0bcfc1b794fc80b665ee97f6a25da9c156559da54e jc-1.25.0.tar.gz +# Locally computed sha256 checksums +sha256 6493f2db400f4166ca0956cf192a41aa092bd1396ff463e7fdaf51f257c10497 LICENSE.md diff --git a/package/python-jc/python-jc.mk b/package/python-jc/python-jc.mk new file mode 100644 index 0000000000..872c1aa377 --- /dev/null +++ b/package/python-jc/python-jc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jc +# +################################################################################ + +PYTHON_JC_VERSION = 1.25.0 +PYTHON_JC_SOURCE = jc-$(PYTHON_JC_VERSION).tar.gz +PYTHON_JC_SITE = https://files.pythonhosted.org/packages/b7/42/be8a1d0410bfddc1a30c06d77d06a1856c49fb18ec5545474a6f17dc3399 +PYTHON_JC_SETUP_TYPE = setuptools +PYTHON_JC_LICENSE = MIT +PYTHON_JC_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_jc.py b/support/testing/tests/package/test_python_jc.py new file mode 100644 index 0000000000..6c7fb34cac --- /dev/null +++ b/support/testing/tests/package/test_python_jc.py @@ -0,0 +1,22 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonJc(TestPythonPackageBase): + __test__ = True + # We deliberately run the test without the optional dependencies, + # as this configuration is less tested upstream. + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_JC=y + """ + timeout = 60 + + def test_run(self): + self.login() + cmd = "jc -h > /dev/null 2>&1" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc id | grep -q root" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc env | grep -q PATH" + self.assertRunOk(cmd, self.timeout) -- 2.34.1 From sebastian.weyer at smile.fr Fri Feb 9 10:47:04 2024 From: sebastian.weyer at smile.fr (Sebastian Weyer) Date: Fri, 9 Feb 2024 11:47:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5doc: bump to latest kde submodule version Message-ID: <20240209104705.1825396-1-sebastian.weyer@smile.fr> Bump qt5doc that was missing from the latest version bump to latest submodule versions from: https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 Signed-off-by: Sebastian Weyer --- This was not the only package that was not touched in the latest update of the submodule versions. Here is a list of the missing packages and the reason why it hasn't been updated: - qt53d: does not compile qgltf.cpp:29:10: fatal error: assimp/Importer.hpp: No such file or directory 29 | #include - qt5coap: no tag 5.15.11, last one 5.15.2, already at latest version - qt5enginio: no tag 5.15.11, last one 5.6.3, already at latest version - qt5knx: no tag 5.15.11, last one 5.15.2, already at latest version - qt5mqtt: no tag 5.15.11, last one 5.15.2, already at latest version - qt5opcua: no tag 5.15.11, last one 5.15.2, already at latest version - qt5script: already got updated to 5.15.11 during version bump to 5.15.10 in commit 6b23dff9e71786191797d3b41ce80afe659f0396 - qt5webengine-chromium: no tag 5.15.11, last one 5.15.2, already at latest version - qt5webengine-chromium-catapult: no tags in repo, not sure which version corresponds to 5.15.11 - qt5webkit: no tag 5.15.11, last stable version 5.5.0, currently used version 5.212.0-alpha4 Signed-off-by: Sebastian Weyer --- package/qt5/qt5doc/qt5doc.hash | 2 +- package/qt5/qt5doc/qt5doc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5doc/qt5doc.hash b/package/qt5/qt5doc/qt5doc.hash index ec84ecdcb5..13a3167211 100644 --- a/package/qt5/qt5doc/qt5doc.hash +++ b/package/qt5/qt5doc/qt5doc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 87ef0ba72ede78148dfae8fbe78c839f0e9966e1ab4a58d7725041144c0de70f qtdoc-897e90fe304d844beaf694b82a93a50237fa8b9e.tar.bz2 +sha256 1dda7d710bc463cc0d33ad6c88762f5a7fe4606ad9cb73feb24b3c4ea8ab66f5 qtdoc-b7b96305c8cdc23bfd63e77a336802d0d3d99004.tar.bz2 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5doc/qt5doc.mk b/package/qt5/qt5doc/qt5doc.mk index 77845a347f..5dbfafd94a 100644 --- a/package/qt5/qt5doc/qt5doc.mk +++ b/package/qt5/qt5doc/qt5doc.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DOC_VERSION = 897e90fe304d844beaf694b82a93a50237fa8b9e +QT5DOC_VERSION = b7b96305c8cdc23bfd63e77a336802d0d3d99004 QT5DOC_SITE = $(QT5_SITE)/qtdoc/-/archive/$(QT5DOC_VERSION) QT5DOC_SOURCE = qtdoc-$(QT5DOC_VERSION).tar.bz2 QT5DOC_DEPENDENCIES = qt5declarative -- 2.42.0 From arnout at mind.be Fri Feb 9 11:16:24 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 9 Feb 2024 12:16:24 +0100 Subject: [Buildroot] Buildroot on LInkedIn Message-ID: ?Hello all Buildroot users! ?In order to do a bit more marketing for Buildroot, we have created a LinkedIn page for us! ?If you would like to spread the word a little, you can re-post the announcement: https://www.linkedin.com/posts/buildroot_buildroot-finally-has-a-linkedin-presence-activity-7161677759159721985-mCzP?utm_source=share&utm_medium=member_desktop And of course, follow the page :-) Better yet, tell other people (who don't want to be on the mailing list - I'm thinking manager types here) to follow the page. ?Now of course the question is if there will be any content to post... ?Regards, ?Arnout From raphael.melotte at mind.be Fri Feb 9 13:15:45 2024 From: raphael.melotte at mind.be (=?UTF-8?B?UmFwaGHDq2wgTcOpbG90dGU=?=) Date: Fri, 9 Feb 2024 14:15:45 +0100 Subject: [Buildroot] [PATCH 6/6] package/python-pymupdf: bump to version 1.23.9rc2 In-Reply-To: <269f1999-249c-4ede-82a6-6240bc36dbdd@mind.be> References: <20240110093850.2302133-1-james.hilliard1@gmail.com> <20240110093850.2302133-6-james.hilliard1@gmail.com> <454a12aa-fe40-4435-8c6e-5f020d960bb5@mind.be> <269f1999-249c-4ede-82a6-6240bc36dbdd@mind.be> Message-ID: <36c6330f-b003-4649-87c8-a9691e185325@mind.be> Hi Arnout, On 2/8/24 22:29, Arnout Vandecappelle wrote: > ?Hi Raphae?l, > > On 08/02/2024 12:28, Rapha?l M?lotte via buildroot wrote: >> Hi James, all, >> >> Thanks for the patches! >> I added a few comments/questions below. > > ?Your comments actually sound pretty essential, and I think they affect the earlier patches in the series as well. Should I mark the entire series as Changes Requested? The new python-pymupdf version from this series doesn't cross-compile, and updating mupdf alone would also break python-pymupdf (as their versions have to be kept in sync) so to me, yes. > > ?Also, will you work on fixing the issues or should James take it on? I have some idea of what is causing the new build failure for python-pymupdf, I will take care of it (I should be able to do that within the next few days). Kind regards, Rapha?l From sebastien.szymanski at armadeus.com Fri Feb 9 11:09:08 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Fri, 9 Feb 2024 12:09:08 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: <6211cb6a-632a-404a-94c8-998f499c7cf2@mind.be> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> <6211cb6a-632a-404a-94c8-998f499c7cf2@mind.be> Message-ID: Hi Arnout, On 2/9/24 11:25, Arnout Vandecappelle wrote: > > > On 09/02/2024 10:29, S?bastien Szymanski wrote: >> Hi Arnout, >> >> On 2/8/24 23:36, Arnout Vandecappelle wrote: >>> ??Hi Se?bastien, >>> >>> ??It's no fun that I still have questions on v5, but unfortunately... > > ?I'll see this weekend if I can merge v5 with the feedback you give > below. Unless you send a v6 before that of course! > > [snip] >>>> + >>>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 >>>> +??? bool "imx91a1" >>>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 >>> >>> ??Since for IMX91 there is only one option, I think it makes more >>> sense to not offer a choice for this. Just always use this one for >>> the IMX91. We can still add it back if there ever turns out to be an >>> imx91a2. > > ?This is actually the main thing I wanted confirmation about from > you... Do you agree that we only need the revision option for IMX93, not > for IMX91? I don't know :-) I guess there probably are i.MX91A0 out there. Maybe I should add an option for i.MX91A0 ? > >>> >>>> + >>>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 >>>> +??? bool "imx93a0" >>>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>>> + >>>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 >>>> +??? bool "imx93a1" >>>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>>> + >>>> ? endchoice >>> >>> [snip] >>>> @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION >>>> ????? # unconditionally use HW version 201810 when DDR3/DDR4 was >>>> ????? # selected >>>> ????? default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || >>>> BR2_PACKAGE_FIRMWARE_IMX_DDR4 >>>> +??? default "v202201" if \ >>> >>> ??For the time being, there is only one version for the IMX91/3. So >>> it makes no sense to give an option for it. (In fact, this really >>> should have been a choice instead of a string option because there >>> are only a fixed set of options... But that's a separate topic.) >>> >>> ??By the way, do these SoCs use the plain 202006 version for DDR4 >>> like the other SoCs? And do they also support DDR3? >> >> The i.MX9{1,3} SoCs don't support DDR4 and DDR3... Only LPDDR4 or >> LPDDR4X, hence my changes below BR2_PACKAGE_FIRMWARE_IMX_DDR{3,4} >> options. > > ?Oh, I missed that. So for IMX9 there is no actual choice, it's always > LPDDR4 (because we have no LPDDR4X option at the moment, and there also > doesn't seem to be any firmware for it...)? I don't think LPDDR4X needs a specific firmware. > > >>>> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ >>>> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>>> ????? help >>>> ??????? Use a specific version of the imx ddr binaries. Leaving this >>>> ??????? field empty will select the default version. >>>> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk >>>> b/package/freescale-imx/firmware-imx/firmware-imx.mk >>>> index 66ef8c3930be..1f36f917cdc8 100644 >>>> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk >>>> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk >>>> @@ -48,6 +48,30 @@ endif >>>> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) >>>> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >>>> +ifeq >>>> ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) >>> >>> ??To make the conditions more symmetrical/regular, perhaps it's >>> better to create a new BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X option >>> and encode the platform conditions there. The prompt would be the >>> same for BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 and for >>> BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X ("lpddr4" for both).? But >>> perhaps I'm overthinking things. >> >> I don't see the benefits to do so. Also, i.MX95 supports LPPDR5. > > ?But there also doesn't seem to be firmware for LPDDR5? There is no support for i.MX95 in the latest release from NXP yet. However, I just found out there are two lpddr5*.bin files here: https://github.com/nxp-imx/imx-mkimage/tree/lf-6.1.55_2.2.0/iMX9 :-) > >>>> +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>>> +??? # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and >>>> generate lpddr4_fw.bin. >>>> +??? # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin >>>> +??? # which is done in post-image script. >>>> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >>>> +??????? lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>>> +??????? lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>> >>> ??So the v202201 could be hardcoded here. >>> >>>> +??????? lpddr4_1d_fw) >>>> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >>>> +??????? lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>>> +??????? lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>>> +??????? lpddr4_2d_fw) >>>> +??? cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ >>>> +??????? $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ >>>> +??????? $(BINARIES_DIR)/lpddr4_fw.bin >>>> +??? ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin >>>> + >>>> +??? # U-Boot supports creation of the combined flash.bin image. To >>>> make >>>> +??? # sure that U-Boot can access all available files copy them to >>>> +??? # the binary dir. >>>> +??? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ >>> >>> ??We now have 3 instances of this exact same code block with only the >>> file names that differ, so perhaps it's time to factor this into a >>> second helper function. Or better, define a few auxiliary variables >>> FIRMWARE_IMX_DDRFW_IMEM_1D, FIRMWARE_IMX_DDRFW_DMEM_1D etc that are >>> set for each variant, and then one definition of >>> FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW that uses those variables. >>> >>> ??If that sounds too complex, don't worry, it's just a >>> "niceification" so not really necessary to do. >> >> This should done be in a separated patch, right ? > > ?Yes, I think it's better to merge this series pretty much as is > (except for dropping IMX91A1), and then do a refactoring patch seperately. > > ?I actually have a bunch more refactoring ideas, so perhaps it's better > if I make a PoC patch of my ideas and you fix up all the mistakes I make > in it? Sure :) Regards, > > > ?Regards, > ?Arnout > > >> >>> >>> ??In fact, the only of my comments above that is really important is >>> dropping BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1. >> >> ok ! >> >> Regards, >> >>> >>> ??Regards, >>> ??Arnout >>> >>>> +endef >>>> +else >>>> ? define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>>> ????? # Create padded versions of lpddr4_pmu_* and generate >>>> lpddr4_pmu_train_fw.bin. >>>> ????? # lpddr4_pmu_train_fw.bin is needed when generating >>>> imx8-boot-sd.bin >>>> @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>>> ????? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ >>>> ? endef >>>> ? endif >>>> +endif >>>> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) >>>> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >>>> >> -- S?bastien Szymanski, Armadeus Systems Software engineer From dario.binacchi at amarulasolutions.com Fri Feb 9 13:48:01 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Fri, 9 Feb 2024 14:48:01 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am62x_sk_defconfig: explicitly set the kernel version In-Reply-To: <53ee955f-0870-456f-8c46-67fafb8bfff8@benettiengineering.com> References: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> <53ee955f-0870-456f-8c46-67fafb8bfff8@benettiengineering.com> Message-ID: Hi Giulio and Romain, All On Mon, Feb 5, 2024 at 4:34?PM Giulio Benetti wrote: > > Dario, > > I've also tried to build this defconfig and it fails while building > ti-k3-r5-loader > with: > ``` > COPY spl/u-boot-spl.bin > ./tools/k3_gen_x509_cert.sh -c 16 -b spl/u-boot-spl.bin \ > -o tiboot3.bin -l 0x43c00000 -r 1 -k "" > SWRV = 1 > Could not open file or uri for loading private key from eckey.pem: No > such file or directory > cat: certificate.bin: No such file or directory > rm: cannot remove 'certificate.bin': No such file or directory > rm: cannot remove 'eckey.pem': No such file or directory > make[3]: *** [arch/arm/mach-k3//config.mk:55: tiboot3.bin] Error 1 > make[3]: *** Deleting file 'tiboot3.bin' > ``` > > Can you please take a look into it? The compilation with `BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP` enabled is fine, while the compilation with `BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS` enabled is broken. Have you enabled the `BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS` or `BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS` option? Thanks and regards, Dario > > Thank you > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > > On 05/02/24 16:13, Giulio Benetti wrote: > > Hi Dario, > > > > On 23/11/23 14:40, Dario Binacchi wrote: > >> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig) forgot to > >> specify the Linux kernel version, so do that now. > >> > >> When the defconfig was added, the default version was 6.4.x, so use > >> version 6.4.16. > >> > >> Signed-off-by: Dario Binacchi > --- > >> configs/ti_am62x_sk_defconfig | 3 +++ > >> 1 file changed, 3 insertions(+) > >> > >> diff --git a/configs/ti_am62x_sk_defconfig > >> b/configs/ti_am62x_sk_defconfig > >> index b98a68ff153f..6610e6fcf890 100644 > >> --- a/configs/ti_am62x_sk_defconfig > >> +++ b/configs/ti_am62x_sk_defconfig > >> @@ -1,7 +1,10 @@ > >> BR2_aarch64=y > >> +BR2_KERNEL_HEADERS_6_4=y > > > > here ^^^ you need to specify BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 > > and not the line above, > > > >> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > >> BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" > >> BR2_LINUX_KERNEL=y > >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > >> BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > >> BR2_LINUX_KERNEL_DTS_SUPPORT=y > >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > > > > Can you please correct and send V2? > > > > Thank you! > > > > Best regards > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Fri Feb 9 13:58:17 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Fri, 9 Feb 2024 14:58:17 +0100 Subject: [Buildroot] [PATCH v3 02/11] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <3d674bd1-a53f-4f82-93c1-58cbe14ab1db@smile.fr> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-3-dario.binacchi@amarulasolutions.com> <3d674bd1-a53f-4f82-93c1-58cbe14ab1db@smile.fr> Message-ID: Hi Romain, All On Wed, Feb 7, 2024 at 11:04?AM Romain Naour wrote: > > Hello Dario, All, > > Le 06/02/2024 ? 18:50, Romain Naour a ?crit : > > Hello Dario, > > > > Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit : > >> The patch sets the configurations required by TI HS systems. Some of these > >> configurations (i. e. HS SYSFW image signing key, HS Software Revision) > >> are provided by the ti-k3-core-secdev package in the binaries directory. > > > > AFAIK the ti-k3-image-gen tool is deprecated and must be replaced by binman tool > > provided by upstream u-boot. > > > > Is all k3 SoC migrated to binman in the latest u-boot release 2024.01? > > > > See the FOSDEM talk: > > > > https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/21919/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > > > > Best regards, > > Romain > > > > > >> > >> Signed-off-by: Dario Binacchi > >> --- > >> boot/ti-k3-image-gen/Config.in | 1 + > >> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > >> 2 files changed, 15 insertions(+), 2 deletions(-) > >> > >> diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > >> index d76cef82e911..38d1598d9fc0 100644 > >> --- a/boot/ti-k3-image-gen/Config.in > >> +++ b/boot/ti-k3-image-gen/Config.in > >> @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > >> bool "ti-k3-image-gen" > >> depends on BR2_TARGET_TI_K3_R5_LOADER > >> select BR2_TARGET_TI_K3_BOOT_FIRMWARE > >> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > Does it means that currently TI HS configuration are missing the > ti-k3-core-secdev tool to build properly? Yes, you are right. Currently, the compilation with BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS enabled is broken: ./tools/k3_gen_x509_cert.sh -c 16 -b spl/u-boot-spl.bin \ -o tiboot3.bin -l 0x43c00000 -r 1 -k "" SWRV = 1 >>> ti-k3-r5-loader 2022.10 Installing to target >>> ti-k3-r5-loader 2022.10 Installing to images directory cp /home/dario/projects/buildroot/output/build/ti-k3-r5-loader-2022.10/spl/u-boot-spl.bin /home/dario/projects/buildroot/output/images/r5-u-boot-spl.bin k3-image-gen-08.06.00.007.tar.gz: OK (sha256: f89ea4b1f5c992455b1a682fde48359221b53f3294135df4bf20feea6aea90e4) >>> ti-k3-image-gen 08.06.00.007 Extracting gzip -d -c /home/dario/projects/buildroot/dl/ti-k3-image-gen/k3-image-gen-08.06.00.007.tar.gz | tar --strip-components=1 -C /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007 -xf - >>> ti-k3-image-gen 08.06.00.007 Patching >>> ti-k3-image-gen 08.06.00.007 Configuring cp /home/dario/projects/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007 cp: cannot stat '/home/dario/projects/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin': No such file or directory make[1]: *** [package/pkg-generic.mk:273: /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007/.stamp_configured] Error 1 make: *** [Makefile:82: _all] Error 2 What do you think if, for this series, I fix the compilation issue for HS configurations by continuing to use the `ti-k3-image-gen` package, and then once the series is merged, I try and test the the bump of u-boot to version 2024.01 to see if it is indeed possible to do without `ti-k3-image-gen`? Meanwhile, let's at least fix this problem immediately. Thanks and regards, Dario > > It seems this patch should fixes them. > > Best regards, > Romain > > >> # We need FIT support in uboot-tools, which is why we select a > >> # host package > >> select BR2_PACKAGE_HOST_UBOOT_TOOLS > >> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > >> index 64be9a18f2c4..91aed63bab84 100644 > >> --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > >> +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > >> @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > >> TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > >> TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > >> > >> -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > >> +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > >> +TI_K3_IMAGE_GEN_SYSFW = \ > >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > >> +else > >> +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > >> + > >> +TI_K3_IMAGE_GEN_SYSFW = \ > >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > >> +endif > >> > >> define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > >> - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > >> + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > >> + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > >> + ) > >> endef > >> > >> define TI_K3_IMAGE_GEN_BUILD_CMDS > >> @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > >> $(BR2_MAKE) -C $(@D) \ > >> SOC=$(TI_K3_IMAGE_GEN_SOC) \ > >> SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > >> + TI_SECURE_DEV_PKG=$(BINARIES_DIR) \ > >> CONFIG=evm \ > >> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > >> SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From roykollensvendsen at gmail.com Fri Feb 9 14:23:26 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Fri, 9 Feb 2024 15:23:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version In-Reply-To: <20240209104705.1825396-1-sebastian.weyer@smile.fr> References: <20240209104705.1825396-1-sebastian.weyer@smile.fr> Message-ID: <20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com> The build failed because assimp was missing. Use git instead of downloading the tar-ball so that we also fetch the associated assimp src submodule. Signed-off-by: Roy Kollen Svendsen --- package/qt5/qt53d/qt53d.hash | 2 +- package/qt5/qt53d/qt53d.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 0f63aab72a..81de91558e 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 +sha256 bab48eab35184144fc8789d2958a983a60bfc8dfa242cb65966a3d129fddaea7 qt53d-e1b1a0d2970fd384bd52c734a72536d8452ad070-br1.tar.gz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index 4b748a4972..8fcfb72fec 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,9 +4,10 @@ # ################################################################################ -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 -QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) -QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 +QT53D_VERSION = e1b1a0d2970fd384bd52c734a72536d8452ad070 +QT53D_SITE = $(QT5_SITE)/qt3d +QT53D_SITE_METHOD = git +QT53D_GIT_SUBMODULES = YES QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES QT53D_SYNC_QT_HEADERS = YES -- 2.43.0 From ps.report at gmx.net Fri Feb 9 15:05:04 2024 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 9 Feb 2024 16:05:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version In-Reply-To: <20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com> References: <20240209104705.1825396-1-sebastian.weyer@smile.fr> <20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com> Message-ID: <20240209160504.1d6f7ae5@gmx.net> On Fri, 9 Feb 2024 15:23:26 +0100, Roy Kollen Svendsen wrote: > The build failed because assimp was missing. There is already an assimp dependency in package/qt5/qt53d/qt53d.mk (see [1]): 14: ifeq ($(BR2_PACKAGE_ASSIMP),y) 15: QT53D_DEPENDENCIES += assimp 16: endif Regards, Peter [1] https://gitlab.com/buildroot.org/buildroot/-/blame/master/package/qt5/qt53d/qt53d.mk?ref_type=heads#L14 > > Use git instead of downloading the tar-ball so that > we also fetch the associated assimp src submodule. > > Signed-off-by: Roy Kollen Svendsen > --- > package/qt5/qt53d/qt53d.hash | 2 +- > package/qt5/qt53d/qt53d.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > index 0f63aab72a..81de91558e 100644 > --- a/package/qt5/qt53d/qt53d.hash > +++ b/package/qt5/qt53d/qt53d.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 > +sha256 bab48eab35184144fc8789d2958a983a60bfc8dfa242cb65966a3d129fddaea7 qt53d-e1b1a0d2970fd384bd52c734a72536d8452ad070-br1.tar.gz > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > index 4b748a4972..8fcfb72fec 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 > -QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > -QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > +QT53D_VERSION = e1b1a0d2970fd384bd52c734a72536d8452ad070 > +QT53D_SITE = $(QT5_SITE)/qt3d > +QT53D_SITE_METHOD = git > +QT53D_GIT_SUBMODULES = YES > QT53D_DEPENDENCIES = qt5declarative > QT53D_INSTALL_STAGING = YES > QT53D_SYNC_QT_HEADERS = YES From Roy.Kollen.Svendsen at akersolutions.com Fri Feb 9 15:29:44 2024 From: Roy.Kollen.Svendsen at akersolutions.com (Svendsen, Roy Kollen) Date: Fri, 9 Feb 2024 15:29:44 +0000 Subject: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version In-Reply-To: <20240209160504.1d6f7ae5@gmx.net> References: <20240209104705.1825396-1-sebastian.weyer@smile.fr> <20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com> <20240209160504.1d6f7ae5@gmx.net> Message-ID: Hi Peter, What do you recommand doing? These are the options avilable for assimp in qt53d: Qt3D options: -assimp .............. Select used assimp library [system/qt/no] ... Last time i tried 'system' and 'no' failed. If this is the case I should either make assimp configurable or hardcode it to qt. Regards, Roy ________________________________ From: Peter Seiderer Sent: Friday, February 9, 2024 4:05 PM To: Roy Kollen Svendsen Cc: buildroot at buildroot.org ; Svendsen, Roy Kollen ; sebastian.weyer at smile.fr ; Giulio Benetti ; Julien Corjon Subject: Re: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version [You don't often get email from ps.report at gmx.net. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] CAUTION: This email originated from outside of Aker Solutions. Exercise caution when responding, opening attachments and clicking links. On Fri, 9 Feb 2024 15:23:26 +0100, Roy Kollen Svendsen wrote: > The build failed because assimp was missing. There is already an assimp dependency in package/qt5/qt53d/qt53d.mk (see [1]): 14: ifeq ($(BR2_PACKAGE_ASSIMP),y) 15: QT53D_DEPENDENCIES += assimp 16: endif Regards, Peter [1] https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.com%2Fbuildroot.org%2Fbuildroot%2F-%2Fblame%2Fmaster%2Fpackage%2Fqt5%2Fqt53d%2Fqt53d.mk%3Fref_type%3Dheads%23L14&data=05%7C02%7Croy.kollen.svendsen%40akersolutions.com%7Cc9ad43b7795d4a21fbb008dc298082d7%7C26b749f68c7244e3bbdeae3de07b4206%7C0%7C0%7C638430879122415164%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7C%7C%7C&sdata=VDhBLxcvmZSPA96XrMcW9EDA%2B0%2BCM6DxSj2F7AKIWto%3D&reserved=0 > > Use git instead of downloading the tar-ball so that > we also fetch the associated assimp src submodule. > > Signed-off-by: Roy Kollen Svendsen > --- > package/qt5/qt53d/qt53d.hash | 2 +- > package/qt5/qt53d/qt53d.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > index 0f63aab72a..81de91558e 100644 > --- a/package/qt5/qt53d/qt53d.hash > +++ b/package/qt5/qt53d/qt53d.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 > +sha256 bab48eab35184144fc8789d2958a983a60bfc8dfa242cb65966a3d129fddaea7 qt53d-e1b1a0d2970fd384bd52c734a72536d8452ad070-br1.tar.gz > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > index 4b748a4972..8fcfb72fec 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 > -QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > -QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > +QT53D_VERSION = e1b1a0d2970fd384bd52c734a72536d8452ad070 > +QT53D_SITE = $(QT5_SITE)/qt3d > +QT53D_SITE_METHOD = git > +QT53D_GIT_SUBMODULES = YES > QT53D_DEPENDENCIES = qt5declarative > QT53D_INSTALL_STAGING = YES > QT53D_SYNC_QT_HEADERS = YES This e-mail and any attachment are confidential and may be privileged or otherwise protected from disclosure. It is solely intended for the person(s) named above. If you are not the intended recipient, any reading, use, disclosure, copying or distribution of all or parts of this e-mail or associated attachments is strictly prohibited. If you are not an intended recipient, please notify the sender immediately by replying to this message or by telephone and delete this e-mail and any attachments permanently from your system. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bernd at kuhls.net Fri Feb 9 16:10:29 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 09 Feb 2024 17:10:29 +0100 Subject: [Buildroot] [git commit] package/python3: bump version to 3.12.1 References: <20240206222231.8950D87481@busybox.osuosl.org> Message-ID: Am Thu, 8 Feb 2024 21:14:52 -0500 schrieb James Knight: > import math > ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' > not found (required by > /builds/buildroot/output/build/python3-3.12.1/build/lib.linux- x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) Hi James, same here on Debian 12.4/bookworm, try this patch: https://github.com/bkuhls/buildroot/commit/ dca8b5bee7742ffedf81a027affadd4b7e18fc3f Regards, Bernd From james.hilliard1 at gmail.com Fri Feb 9 17:56:31 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 9 Feb 2024 10:56:31 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-cython: bump to version 3.0.8 In-Reply-To: <20240209175631.1337370-1-james.hilliard1@gmail.com> References: <20240209175631.1337370-1-james.hilliard1@gmail.com> Message-ID: <20240209175631.1337370-2-james.hilliard1@gmail.com> License hash changed due to changing links from http to https: https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 Signed-off-by: James Hilliard --- package/python-cython/python-cython.hash | 6 +++--- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 08ad8f6d84..55e4a6f203 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 a4d0f9fbc9c137f1a88937cd40e8c5ee Cython-0.29.36.tar.gz -sha256 41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f Cython-0.29.36.tar.gz +md5 9f7baaa983e1bd06eaeb4fa0adfc77e5 Cython-3.0.8.tar.gz +sha256 8333423d8fd5765e7cceea3a9985dd1e0a5dfeb2734629e1a2ed2d6233d39de6 Cython-3.0.8.tar.gz # Locally computed sha256 checksums -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt +sha256 9568a2b155e66ac3e0ba1fd80b52b827b9460e6cf6f233125e7cbca8e206ddc3 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 47e105c065..d76bfb766d 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.36 +PYTHON_CYTHON_VERSION = 3.0.8 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 9 17:56:30 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 9 Feb 2024 10:56:30 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 Message-ID: <20240209175631.1337370-1-james.hilliard1@gmail.com> Add patches from pending upstream pull request which add cython3 compatibility. Signed-off-by: James Hilliard --- .../0001-Updates-for-Cython3.patch | 631 ++++++++++++++++++ ...ebug-has-args-difference-in-python-3.patch | 30 + .../0003-fix-tests-on-python-3.8.patch | 31 + .../0004-fix-arg-count-for-wrap.patch | 52 ++ 4 files changed, 744 insertions(+) create mode 100644 package/python-uvloop/0001-Updates-for-Cython3.patch create mode 100644 package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch create mode 100644 package/python-uvloop/0003-fix-tests-on-python-3.8.patch create mode 100644 package/python-uvloop/0004-fix-arg-count-for-wrap.patch diff --git a/package/python-uvloop/0001-Updates-for-Cython3.patch b/package/python-uvloop/0001-Updates-for-Cython3.patch new file mode 100644 index 0000000000..b7ef1091ac --- /dev/null +++ b/package/python-uvloop/0001-Updates-for-Cython3.patch @@ -0,0 +1,631 @@ +From 087a2983c8022598232cb7ed0a49da334d7af9ff Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 12:18:15 +0000 +Subject: [PATCH] Updates for Cython3 Remove SSL depreciation warnings buillt + on debian 12.6 python-3.22 Cython-3.0.7 libuv-1.46.0 + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/MagicStack/uvloop/pull/587] +--- + Makefile | 2 +- + setup.py | 6 ++++-- + tests/test_process.py | 4 ++-- + tests/test_tcp.py | 19 ++++++++++++------- + uvloop/_testbase.py | 4 +++- + uvloop/cbhandles.pyx | 4 ++-- + uvloop/dns.pyx | 4 ++-- + uvloop/handles/basetransport.pxd | 4 ++-- + uvloop/handles/basetransport.pyx | 4 ++-- + uvloop/handles/handle.pyx | 2 +- + uvloop/handles/pipe.pyx | 2 +- + uvloop/handles/poll.pxd | 2 +- + uvloop/handles/poll.pyx | 2 +- + uvloop/handles/stream.pyx | 16 ++++++++++------ + uvloop/handles/udp.pyx | 4 ++-- + uvloop/includes/consts.pxi | 25 ------------------------- + uvloop/includes/fork_handler.h | 6 +++++- + uvloop/includes/system.h | 16 ++++++++++++++++ + uvloop/includes/system.pxd | 12 ++++-------- + uvloop/includes/uv.pxd | 6 +++--- + uvloop/loop.pxd | 28 ++++++++++++++++++++++++---- + uvloop/loop.pyx | 10 +++++----- + uvloop/sslproto.pxd | 4 ++-- + uvloop/sslproto.pyx | 4 ++-- + 24 files changed, 107 insertions(+), 83 deletions(-) + delete mode 100644 uvloop/includes/consts.pxi + create mode 100755 uvloop/includes/system.h + +diff --git a/Makefile b/Makefile +index 4375e5d..6a0475a 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,7 @@ _default: compile + + + clean: +- rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd ++ rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd + rm -fr uvloop/*.c uvloop/*.html uvloop/*.so + rm -fr uvloop/handles/*.html uvloop/includes/*.html + find . -name '__pycache__' | xargs rm -rf +diff --git a/setup.py b/setup.py +index ba15af5..8fdf0e5 100644 +--- a/setup.py ++++ b/setup.py +@@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext + from setuptools.command.sdist import sdist + + +-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)' ++CYTHON_DEPENDENCY = 'Cython(>=0.29.36)' + MACHINE = platform.machine() + MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')] + _ROOT = pathlib.Path(__file__).parent +@@ -144,7 +144,9 @@ class uvloop_build_ext(build_ext): + self.distribution.ext_modules[:] = cythonize( + self.distribution.ext_modules, + compiler_directives=directives, +- annotate=self.cython_annotate) ++ annotate=self.cython_annotate, ++ compile_time_env=dict(DEFAULT_FREELIST_SIZE=250, SSL_READ_MAX_SIZE=256 * 1024), ++ emit_linenums=True) + + super().finalize_options() + +diff --git a/tests/test_process.py b/tests/test_process.py +index bfcbba1..95e1c9e 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -912,7 +912,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +@@ -931,7 +931,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +diff --git a/tests/test_tcp.py b/tests/test_tcp.py +index 812e62b..213e2d9 100644 +--- a/tests/test_tcp.py ++++ b/tests/test_tcp.py +@@ -1630,17 +1630,22 @@ class _TestSSL(tb.SSLTestCase): + self.fail("unexpected call to connection_made()") + + def test_ssl_connect_accepted_socket(self): +- if hasattr(ssl, 'PROTOCOL_TLS'): +- proto = ssl.PROTOCOL_TLS ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ server_proto = ssl.PROTOCOL_TLS_SERVER ++ client_proto = ssl.PROTOCOL_TLS_CLIENT + else: +- proto = ssl.PROTOCOL_SSLv23 +- server_context = ssl.SSLContext(proto) ++ if hasattr(ssl, 'PROTOCOL_TLS'): ++ client_proto = server_proto = ssl.PROTOCOL_TLS ++ else: ++ client_proto = server_proto = ssl.PROTOCOL_SSLv23 ++ ++ server_context = ssl.SSLContext(server_proto) + server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY) + if hasattr(server_context, 'check_hostname'): + server_context.check_hostname = False + server_context.verify_mode = ssl.CERT_NONE + +- client_context = ssl.SSLContext(proto) ++ client_context = ssl.SSLContext(client_proto) + if hasattr(server_context, 'check_hostname'): + client_context.check_hostname = False + client_context.verify_mode = ssl.CERT_NONE +@@ -2233,7 +2238,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx.use_privatekey_file(self.ONLYKEY) + sslctx.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + def server(sock): +@@ -2592,7 +2597,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx_openssl.use_privatekey_file(self.ONLYKEY) + sslctx_openssl.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + future = None +diff --git a/uvloop/_testbase.py b/uvloop/_testbase.py +index c4a7595..e620e15 100644 +--- a/uvloop/_testbase.py ++++ b/uvloop/_testbase.py +@@ -269,7 +269,9 @@ def find_free_port(start_from=50000): + class SSLTestCase: + + def _create_server_ssl_context(self, certfile, keyfile=None): +- if hasattr(ssl, 'PROTOCOL_TLS'): ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) ++ elif hasattr(ssl, 'PROTOCOL_TLS'): + sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS) + else: + sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) +diff --git a/uvloop/cbhandles.pyx b/uvloop/cbhandles.pyx +index 2914b42..8bcc5aa 100644 +--- a/uvloop/cbhandles.pyx ++++ b/uvloop/cbhandles.pyx +@@ -76,8 +76,8 @@ cdef class Handle: + self.arg1, self.arg2, self.arg3, self.arg4) + + else: +- raise RuntimeError('invalid Handle.cb_type: {}'.format( +- cb_type)) ++ raise RuntimeError('invalid Handle.cb_type: {} {!r}/{!r}'.format( ++ cb_type, self.args1, self.args2)) + + except (KeyboardInterrupt, SystemExit): + raise +diff --git a/uvloop/dns.pyx b/uvloop/dns.pyx +index 7aad631..09b9282 100644 +--- a/uvloop/dns.pyx ++++ b/uvloop/dns.pyx +@@ -298,7 +298,7 @@ cdef class AddrInfo: + uv.uv_freeaddrinfo(self.data) # returns void + self.data = NULL + +- cdef void set_data(self, system.addrinfo *data): ++ cdef void set_data(self, system.addrinfo *data) noexcept: + self.data = data + + cdef unpack(self): +@@ -326,7 +326,7 @@ cdef class AddrInfo: + return result + + @staticmethod +- cdef int isinstance(object other): ++ cdef int isinstance(object other) noexcept: + return type(other) is AddrInfo + + +diff --git a/uvloop/handles/basetransport.pxd b/uvloop/handles/basetransport.pxd +index ba356a7..8112622 100644 +--- a/uvloop/handles/basetransport.pxd ++++ b/uvloop/handles/basetransport.pxd +@@ -47,8 +47,8 @@ cdef class UVBaseTransport(UVSocketHandle): + # === overloads === + + cdef _new_socket(self) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + +- cdef bint _is_reading(self) ++ cdef bint _is_reading(self) noexcept + cdef _start_reading(self) + cdef _stop_reading(self) +diff --git a/uvloop/handles/basetransport.pyx b/uvloop/handles/basetransport.pyx +index 28b3079..a8592f2 100644 +--- a/uvloop/handles/basetransport.pyx ++++ b/uvloop/handles/basetransport.pyx +@@ -18,7 +18,7 @@ cdef class UVBaseTransport(UVSocketHandle): + + self._closing = 0 + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return 0 + + cdef inline _schedule_call_connection_made(self): +@@ -211,7 +211,7 @@ cdef class UVBaseTransport(UVSocketHandle): + self._extra_info = {} + self._extra_info[name] = obj + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + raise NotImplementedError + + cdef _start_reading(self): +diff --git a/uvloop/handles/handle.pyx b/uvloop/handles/handle.pyx +index 6efe375..2c96458 100644 +--- a/uvloop/handles/handle.pyx ++++ b/uvloop/handles/handle.pyx +@@ -363,7 +363,7 @@ cdef void __uv_close_handle_cb(uv.uv_handle_t* handle) noexcept with gil: + Py_DECREF(h) # Was INCREFed in UVHandle._close + + +-cdef void __close_all_handles(Loop loop): ++cdef void __close_all_handles(Loop loop) noexcept: + uv.uv_walk(loop.uvloop, + __uv_walk_close_all_handles_cb, + loop) # void +diff --git a/uvloop/handles/pipe.pyx b/uvloop/handles/pipe.pyx +index 195576c..d30a736 100644 +--- a/uvloop/handles/pipe.pyx ++++ b/uvloop/handles/pipe.pyx +@@ -25,7 +25,7 @@ cdef __pipe_init_uv_handle(UVStream handle, Loop loop): + cdef __pipe_open(UVStream handle, int fd): + cdef int err + err = uv.uv_pipe_open(handle._handle, +- fd) ++ fd) + if err < 0: + exc = convert_error(err) + raise exc +diff --git a/uvloop/handles/poll.pxd b/uvloop/handles/poll.pxd +index d07030b..c220540 100644 +--- a/uvloop/handles/poll.pxd ++++ b/uvloop/handles/poll.pxd +@@ -10,7 +10,7 @@ cdef class UVPoll(UVHandle): + cdef inline _poll_start(self, int flags) + cdef inline _poll_stop(self) + +- cdef int is_active(self) ++ cdef int is_active(self) noexcept + + cdef is_reading(self) + cdef is_writing(self) +diff --git a/uvloop/handles/poll.pyx b/uvloop/handles/poll.pyx +index fca5981..c905e9b 100644 +--- a/uvloop/handles/poll.pyx ++++ b/uvloop/handles/poll.pyx +@@ -29,7 +29,7 @@ cdef class UVPoll(UVHandle): + handle._init(loop, fd) + return handle + +- cdef int is_active(self): ++ cdef int is_active(self) noexcept: + return (self.reading_handle is not None or + self.writing_handle is not None) + +diff --git a/uvloop/handles/stream.pyx b/uvloop/handles/stream.pyx +index d4e02e3..09df887 100644 +--- a/uvloop/handles/stream.pyx ++++ b/uvloop/handles/stream.pyx +@@ -1,4 +1,8 @@ +-DEF __PREALLOCED_BUFS = 4 ++cdef extern from *: ++ ''' ++ enum {__PREALLOCED_BUFS = 4}; ++ ''' ++ const bint __PREALLOCED_BUFS + + + @cython.no_gc_clear +@@ -279,7 +283,7 @@ cdef class UVStream(UVBaseTransport): + cdef inline _close_on_read_error(self): + self.__read_error_close = 1 + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__reading + + cdef _start_reading(self): +@@ -578,7 +582,7 @@ cdef class UVStream(UVBaseTransport): + + self._maybe_resume_protocol() + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return ((self._handle).write_queue_size + +@@ -755,7 +759,7 @@ cdef inline bint __uv_stream_on_read_common( + UVStream sc, + Loop loop, + ssize_t nread, +-): ++) noexcept: + if sc._closed: + # The stream was closed, there is no reason to + # do any work now. +@@ -818,7 +822,7 @@ cdef inline void __uv_stream_on_read_impl( + uv.uv_stream_t* stream, + ssize_t nread, + const uv.uv_buf_t* buf, +-): ++) noexcept: + cdef: + UVStream sc = stream.data + Loop loop = sc._loop +@@ -849,7 +853,7 @@ cdef inline void __uv_stream_on_read_impl( + cdef inline void __uv_stream_on_write_impl( + uv.uv_write_t* req, + int status, +-): ++) noexcept: + cdef: + _StreamWriteContext ctx = <_StreamWriteContext> req.data + UVStream stream = ctx.stream +diff --git a/uvloop/handles/udp.pyx b/uvloop/handles/udp.pyx +index bbe60d5..fdd1d8b 100644 +--- a/uvloop/handles/udp.pyx ++++ b/uvloop/handles/udp.pyx +@@ -127,12 +127,12 @@ cdef class UDPTransport(UVBaseTransport): + exc = convert_error(err) + raise exc + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return (self._handle).send_queue_size + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__receiving + + cdef _start_reading(self): +diff --git a/uvloop/includes/consts.pxi b/uvloop/includes/consts.pxi +deleted file mode 100644 +index f765053..0000000 +--- a/uvloop/includes/consts.pxi ++++ /dev/null +@@ -1,25 +0,0 @@ +-DEF UV_STREAM_RECV_BUF_SIZE = 256000 # 250kb +- +-DEF FLOW_CONTROL_HIGH_WATER = 64 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB +- +-DEF DEFAULT_FREELIST_SIZE = 250 +-DEF DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 +- +-DEF DEBUG_STACK_DEPTH = 10 +- +- +-DEF __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 +- +- +-DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 +- +- +-# Number of seconds to wait for SSL handshake to complete +-# The default timeout matches that of Nginx. +-DEF SSL_HANDSHAKE_TIMEOUT = 60.0 +-# Number of seconds to wait for SSL shutdown to complete +-# The default timeout mimics lingering_time +-DEF SSL_SHUTDOWN_TIMEOUT = 30.0 +-DEF SSL_READ_MAX_SIZE = 256 * 1024 +diff --git a/uvloop/includes/fork_handler.h b/uvloop/includes/fork_handler.h +index 47bbe03..9d3573a 100644 +--- a/uvloop/includes/fork_handler.h ++++ b/uvloop/includes/fork_handler.h +@@ -1,7 +1,10 @@ ++#ifndef UVLOOP_FORK_HANDLER_H_ ++#define UVLOOP_FORK_HANDLER_H_ ++ + volatile uint64_t MAIN_THREAD_ID = 0; + volatile int8_t MAIN_THREAD_ID_SET = 0; + +-typedef void (*OnForkHandler)(); ++typedef void (*OnForkHandler)(void); + + OnForkHandler __forkHandler = NULL; + +@@ -36,3 +39,4 @@ void setMainThreadID(uint64_t id) { + MAIN_THREAD_ID = id; + MAIN_THREAD_ID_SET = 1; + } ++#endif +diff --git a/uvloop/includes/system.h b/uvloop/includes/system.h +new file mode 100755 +index 0000000..e143bb5 +--- /dev/null ++++ b/uvloop/includes/system.h +@@ -0,0 +1,16 @@ ++#ifndef UVLOOP_SYSTEM_H_ ++#define UVLOOP_SYSTEM_H_ ++#if defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER) ++#include "Winsock2.h" ++#include "ws2def.h" ++#include "includes/fork_handler.h" ++#else ++#include "arpa/inet.h" ++#include "sys/socket.h" ++#include "sys/un.h" ++#include "unistd.h" ++#include "pthread.h" ++#endif ++#endif ++ ++ +diff --git a/uvloop/includes/system.pxd b/uvloop/includes/system.pxd +index 367fedd..d1da74e 100644 +--- a/uvloop/includes/system.pxd ++++ b/uvloop/includes/system.pxd +@@ -1,13 +1,9 @@ + from libc.stdint cimport int8_t, uint64_t + +-cdef extern from "arpa/inet.h" nogil: +- +- int ntohl(int) +- int htonl(int) +- int ntohs(int) +- +- +-cdef extern from "sys/socket.h" nogil: ++cdef extern from "includes/system.h": ++ int ntohl(int) nogil ++ int htonl(int) nogil ++ int ntohs(int) nogil + + struct sockaddr: + unsigned short sa_family +diff --git a/uvloop/includes/uv.pxd b/uvloop/includes/uv.pxd +index 8765130..ddd9738 100644 +--- a/uvloop/includes/uv.pxd ++++ b/uvloop/includes/uv.pxd +@@ -220,7 +220,7 @@ cdef extern from "uv.h" nogil: + UV_LEAVE_GROUP = 0, + UV_JOIN_GROUP + +- cpdef enum uv_fs_event: ++ cdef enum uv_fs_event: + UV_RENAME = 1, + UV_CHANGE = 2 + +@@ -282,7 +282,7 @@ cdef extern from "uv.h" nogil: + int uv_loop_close(uv_loop_t* loop) + int uv_loop_alive(uv_loop_t* loop) + int uv_loop_fork(uv_loop_t* loop) +- int uv_backend_fd(uv_loop_t* loop) ++ uv_os_fd_t uv_backend_fd(uv_loop_t* loop) + + void uv_update_time(uv_loop_t* loop) + uint64_t uv_now(const uv_loop_t*) +@@ -378,7 +378,7 @@ cdef extern from "uv.h" nogil: + # Pipes + + int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) +- int uv_pipe_open(uv_pipe_t* handle, uv_file file) ++ int uv_pipe_open(uv_pipe_t* handle, uv_os_fd_t file) + int uv_pipe_bind(uv_pipe_t* handle, const char* name) + + void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index 5613473..f90c704 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -1,15 +1,35 @@ + # cython: language_level=3 + ++cdef extern from *: ++ ''' ++ enum { UV_STREAM_RECV_BUF_SIZE = 256000, ++ SSL_READ_MAX_SIZE = 256 * 1024, // 250kb ++ }; ++ const float SSL_HANDSHAKE_TIMEOUT = 60.0; // Number of seconds to wait for SSL handshake to complete The default timeout matches that of Nginx. ++ const float SSL_SHUTDOWN_TIMEOUT = 30.0; // Number of seconds to wait for SSL shutdown to complete The default timeout mimics lingering_time ++ ''' ++ const bint UV_STREAM_RECV_BUF_SIZE ++ const bint SSL_READ_MAX_SIZE ++ ++ const float SSL_HANDSHAKE_TIMEOUT ++ const float SSL_SHUTDOWN_TIMEOUT ++ ++cdef enum: ++ FLOW_CONTROL_HIGH_WATER = 64 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB ++ ++ DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 ++ DEBUG_STACK_DEPTH = 10 ++ __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 ++ LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 ++ + + from .includes cimport uv + from .includes cimport system + + from libc.stdint cimport uint64_t, uint32_t, int64_t + +- +-include "includes/consts.pxi" +- +- + cdef extern from *: + ctypedef int vint "volatile int" + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 334d8d5..53e1160 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -43,7 +43,7 @@ from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer + from . import _noop + + +-include "includes/consts.pxi" ++ + include "includes/stdlib.pxi" + + include "errors.pyx" +@@ -1118,7 +1118,7 @@ cdef class Loop: + + cdef _sock_set_reuseport(self, int fd): + cdef: +- int err ++ int err = 0 + int reuseport_flag = 1 + + err = system.setsockopt( +@@ -1397,7 +1397,7 @@ cdef class Loop: + self._debug = bool(enabled) + if self.is_running(): + self.call_soon_threadsafe( +- self._set_coroutine_debug, self, self._debug) ++ self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +@@ -2750,7 +2750,7 @@ cdef class Loop: + executable=None, + pass_fds=(), + # For tests only! Do not use in your code. Ever. +- __uvloop_sleep_after_fork=False): ++ uvloop_sleep_after_fork=False): + + # TODO: Implement close_fds (might not be very important in + # Python 3.5, since all FDs aren't inheritable by default.) +@@ -2770,7 +2770,7 @@ cdef class Loop: + if executable is not None: + args[0] = executable + +- if __uvloop_sleep_after_fork: ++ if uvloop_sleep_after_fork: + debug_flags |= __PROCESS_DEBUG_SLEEP_AFTER_FORK + + waiter = self._new_future() +diff --git a/uvloop/sslproto.pxd b/uvloop/sslproto.pxd +index 3da10f0..68e4d57 100644 +--- a/uvloop/sslproto.pxd ++++ b/uvloop/sslproto.pxd +@@ -122,7 +122,7 @@ cdef class SSLProtocol: + # Flow control for writes from APP socket + + cdef _control_app_writing(self, object context=*) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + cdef _set_write_buffer_limits(self, high=*, low=*) + + # Flow control for reads to APP socket +@@ -134,5 +134,5 @@ cdef class SSLProtocol: + + cdef _control_ssl_reading(self) + cdef _set_read_buffer_limits(self, high=*, low=*) +- cdef size_t _get_read_buffer_size(self) ++ cdef size_t _get_read_buffer_size(self) noexcept + cdef _fatal_error(self, exc, message=*) +diff --git a/uvloop/sslproto.pyx b/uvloop/sslproto.pyx +index 42bb764..0a43746 100644 +--- a/uvloop/sslproto.pyx ++++ b/uvloop/sslproto.pyx +@@ -861,7 +861,7 @@ cdef class SSLProtocol: + 'protocol': self, + }) + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return self._outgoing.pending + self._write_buffer_size + + cdef _set_write_buffer_limits(self, high=None, low=None): +@@ -903,7 +903,7 @@ cdef class SSLProtocol: + self._incoming_high_water = high + self._incoming_low_water = low + +- cdef size_t _get_read_buffer_size(self): ++ cdef size_t _get_read_buffer_size(self) noexcept: + return self._incoming.pending + + # Flow control for writes to SSL socket +-- +2.34.1 + diff --git a/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch new file mode 100644 index 0000000000..ac6170aff3 --- /dev/null +++ b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch @@ -0,0 +1,30 @@ +From 8b63801bfdb1f0cf7fde4f58e96f8628a587b186 Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 16:17:49 +0000 +Subject: [PATCH] _set_coroutine_debug has args difference in python 3.11 + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/MagicStack/uvloop/pull/587] +--- + uvloop/loop.pyx | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 53e1160..5ca718e 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,8 +1396,9 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): ++ args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) + self.call_soon_threadsafe( +- self._set_coroutine_debug, self._debug) ++ self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0003-fix-tests-on-python-3.8.patch b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch new file mode 100644 index 0000000000..42f04f2241 --- /dev/null +++ b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch @@ -0,0 +1,31 @@ +From ef5c3e5c6f331692ebcbea9e4c6aead8b2187038 Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 19:58:11 +0000 +Subject: [PATCH] fix tests on python 3.8 + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/MagicStack/uvloop/pull/587] +--- + uvloop/loop.pyx | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 5ca718e..75b915a 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,9 +1396,8 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe( +- self._set_coroutine_debug, *args) ++ args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) ++ self.call_soon_threadsafe(self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0004-fix-arg-count-for-wrap.patch b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch new file mode 100644 index 0000000000..fe082f4f90 --- /dev/null +++ b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch @@ -0,0 +1,52 @@ +From afef6364c2c3100ab23c2bb2de82d2da330b258c Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Fri, 29 Dec 2023 11:24:19 +0000 +Subject: [PATCH] fix arg count for wrap() + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/MagicStack/uvloop/pull/587] +--- + uvloop/loop.pxd | 2 +- + uvloop/loop.pyx | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index f90c704..d34ffeb 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -220,7 +220,7 @@ cdef class Loop: + cdef inline _ceval_process_signals(self) + cdef _invoke_signals(self, bytes data) + +- cdef _set_coroutine_debug(self, bint enabled) ++ cpdef _set_coroutine_debug(self, bint enabled) + + cdef _print_debug_info(self) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 75b915a..a3eeb60 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1131,7 +1131,7 @@ cdef class Loop: + if err < 0: + raise convert_error(-errno.errno) + +- cdef _set_coroutine_debug(self, bint enabled): ++ cpdef _set_coroutine_debug(self, bint enabled): + enabled = bool(enabled) + if self._coroutine_debug_set == enabled: + return +@@ -1396,8 +1396,7 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe(self._set_coroutine_debug, *args) ++ self.call_soon_threadsafe(self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 9 17:59:06 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 9 Feb 2024 10:59:06 -0700 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> <20240207112058.37534f3d@windsurf> Message-ID: On Wed, Feb 7, 2024 at 12:56?PM James Hilliard wrote: > > On Wed, Feb 7, 2024 at 3:21?AM Thomas Petazzoni > wrote: > > > > On Wed, 7 Feb 2024 11:16:27 +0100 > > Marcus Hoffmann wrote: > > > > > Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 > > > [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop > > > still uses) also seem to be still developed in parallel. So maybe we > > > need both as build host packages? Or do you see another solution? > > That's annoying, maybe the easiest option is to downgrade msgpack for now > until everything supports cython 3.0? There are patches adding cython 3 support to uvloop(gentoo also uses these), so I've gone ahead and added those and bumped cython to version 3.0: https://patchwork.ozlabs.org/project/buildroot/patch/20240209175631.1337370-1-james.hilliard1 at gmail.com/ https://patchwork.ozlabs.org/project/buildroot/patch/20240209175631.1337370-2-james.hilliard1 at gmail.com/ > > > > > If we were to have both in parallel, then the big question is whether > > it is possible to install them both in parallel without them > > conflicting with each other. > > Seems tricky. > > > > > Thomas > > -- > > Thomas Petazzoni, co-owner and CEO, Bootlin > > Embedded Linux and Kernel engineering and training > > https://bootlin.com From james.hilliard1 at gmail.com Fri Feb 9 18:48:14 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 9 Feb 2024 11:48:14 -0700 Subject: [Buildroot] [PATCH 1/1] package/gst1-python: disable tests Message-ID: <20240209184814.1438551-1-james.hilliard1@gmail.com> We don't need tests enabled which can also cause build issues. Signed-off-by: James Hilliard --- package/gstreamer1/gst1-python/gst1-python.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index f843e37052..501ca5e02b 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -34,6 +34,7 @@ GST1_PYTHON_CONF_ENV += \ # the correct .so file, and the resulting compiled library has the appropriate # path of /usr/lib/python3.$(PYTHON3_VERSION_MAJOR).so GST1_PYTHON_CONF_OPTS += \ - -Dlibpython-dir=/usr/lib/ + -Dlibpython-dir=/usr/lib/ \ + -Dtests=disabled $(eval $(meson-package)) -- 2.34.1 From Roy.Kollen.Svendsen at akersolutions.com Fri Feb 9 19:02:17 2024 From: Roy.Kollen.Svendsen at akersolutions.com (Svendsen, Roy Kollen) Date: Fri, 9 Feb 2024 19:02:17 +0000 Subject: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version In-Reply-To: <20240209160504.1d6f7ae5@gmx.net> References: <20240209104705.1825396-1-sebastian.weyer@smile.fr> <20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com> <20240209160504.1d6f7ae5@gmx.net> Message-ID: Hi, I will change the state of this patch to 'Not Applicable' since the version that was recently pushed to master builds successfully. This patch was actually meant as part of a bump to 5.15.12. Regards, Roy ________________________________ From: Peter Seiderer Sent: Friday, February 9, 2024 4:05 PM To: Roy Kollen Svendsen Cc: buildroot at buildroot.org ; Svendsen, Roy Kollen ; sebastian.weyer at smile.fr ; Giulio Benetti ; Julien Corjon Subject: Re: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version [You don't often get email from ps.report at gmx.net. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] CAUTION: This email originated from outside of Aker Solutions. Exercise caution when responding, opening attachments and clicking links. On Fri, 9 Feb 2024 15:23:26 +0100, Roy Kollen Svendsen wrote: > The build failed because assimp was missing. There is already an assimp dependency in package/qt5/qt53d/qt53d.mk (see [1]): 14: ifeq ($(BR2_PACKAGE_ASSIMP),y) 15: QT53D_DEPENDENCIES += assimp 16: endif Regards, Peter [1] https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.com%2Fbuildroot.org%2Fbuildroot%2F-%2Fblame%2Fmaster%2Fpackage%2Fqt5%2Fqt53d%2Fqt53d.mk%3Fref_type%3Dheads%23L14&data=05%7C02%7Croy.kollen.svendsen%40akersolutions.com%7Cc9ad43b7795d4a21fbb008dc298082d7%7C26b749f68c7244e3bbdeae3de07b4206%7C0%7C0%7C638430879122415164%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7C%7C%7C&sdata=VDhBLxcvmZSPA96XrMcW9EDA%2B0%2BCM6DxSj2F7AKIWto%3D&reserved=0 > > Use git instead of downloading the tar-ball so that > we also fetch the associated assimp src submodule. > > Signed-off-by: Roy Kollen Svendsen > --- > package/qt5/qt53d/qt53d.hash | 2 +- > package/qt5/qt53d/qt53d.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > index 0f63aab72a..81de91558e 100644 > --- a/package/qt5/qt53d/qt53d.hash > +++ b/package/qt5/qt53d/qt53d.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 > +sha256 bab48eab35184144fc8789d2958a983a60bfc8dfa242cb65966a3d129fddaea7 qt53d-e1b1a0d2970fd384bd52c734a72536d8452ad070-br1.tar.gz > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > index 4b748a4972..8fcfb72fec 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 > -QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > -QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > +QT53D_VERSION = e1b1a0d2970fd384bd52c734a72536d8452ad070 > +QT53D_SITE = $(QT5_SITE)/qt3d > +QT53D_SITE_METHOD = git > +QT53D_GIT_SUBMODULES = YES > QT53D_DEPENDENCIES = qt5declarative > QT53D_INSTALL_STAGING = YES > QT53D_SYNC_QT_HEADERS = YES This e-mail and any attachment are confidential and may be privileged or otherwise protected from disclosure. It is solely intended for the person(s) named above. If you are not the intended recipient, any reading, use, disclosure, copying or distribution of all or parts of this e-mail or associated attachments is strictly prohibited. If you are not an intended recipient, please notify the sender immediately by replying to this message or by telephone and delete this e-mail and any attachments permanently from your system. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ju.o at free.fr Fri Feb 9 19:29:23 2024 From: ju.o at free.fr (Julien Olivain) Date: Fri, 9 Feb 2024 20:29:23 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add ghostscript runtime test Message-ID: <20240209192923.1201371-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + .../testing/tests/package/test_ghostscript.py | 48 +++++++++++++++++++ .../rootfs-overlay/root/document.ps | 9 ++++ 3 files changed, 59 insertions(+) create mode 100644 support/testing/tests/package/test_ghostscript.py create mode 100644 support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..db0821c82b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1783,6 +1783,8 @@ F: support/testing/tests/package/test_fluidsynth.py F: support/testing/tests/package/test_fluidsynth/ F: support/testing/tests/package/test_fping.py F: support/testing/tests/package/test_gawk.py +F: support/testing/tests/package/test_ghostscript.py +F: support/testing/tests/package/test_ghostscript/ F: support/testing/tests/package/test_glslsandbox_player.py F: support/testing/tests/package/test_glslsandbox_player/ F: support/testing/tests/package/test_gnupg2.py diff --git a/support/testing/tests/package/test_ghostscript.py b/support/testing/tests/package/test_ghostscript.py new file mode 100644 index 0000000000..3c6c16ef2c --- /dev/null +++ b/support/testing/tests/package/test_ghostscript.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestGhostscript(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_ghostscript/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_GHOSTSCRIPT=y + BR2_PACKAGE_TESSERACT_OCR=y + BR2_PACKAGE_TESSERACT_OCR_LANG_ENG=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("gs --version") + + doc_basename = "document" + ps_file = doc_basename + ".ps" + pgm_file = doc_basename + ".pgm" + txt_file = doc_basename + ".txt" + + # Render a basic PostScript file to an image file. + cmd = "gs -dSAFER -dBATCH -dNOPAUSE -sDEVICE=pgmraw -r150" + cmd += f" -dTextAlphaBits=4 -sOutputFile='{pgm_file}' {ps_file}" + self.assertRunOk(cmd) + + # Run text recognition on the image file. + cmd = f"tesseract {pgm_file} {doc_basename}" + self.assertRunOk(cmd, timeout=30) + + # Check we extracted the expected string from the input + # PostScript file. + cmd = f"cat {txt_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello Buildroot!") diff --git a/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps b/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps new file mode 100644 index 0000000000..5ca2b3581f --- /dev/null +++ b/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps @@ -0,0 +1,9 @@ +%!PS +% See: PostScript: Language Reference, third edition +% Example 5.1, page 314 +% https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf +/Helvetica findfont +16 scalefont setfont +54 720 moveto +(Hello Buildroot!) show +showpage -- 2.43.0 From ju.o at free.fr Fri Feb 9 19:37:43 2024 From: ju.o at free.fr (Julien Olivain) Date: Fri, 9 Feb 2024 20:37:43 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add iozone runtime test Message-ID: <20240209193743.1204013-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_iozone.py | 22 ++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 support/testing/tests/package/test_iozone.py diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..45cafc6a03 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1791,6 +1791,7 @@ F: support/testing/tests/package/test_gnuradio/ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf3.py F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ diff --git a/support/testing/tests/package/test_iozone.py b/support/testing/tests/package/test_iozone.py new file mode 100644 index 0000000000..9a9843df56 --- /dev/null +++ b/support/testing/tests/package/test_iozone.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestIozone(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IOZONE=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]) + self.emulator.login() + + self.assertRunOk("iozone -v") + self.assertRunOk("iozone -s64 -r4") -- 2.43.0 From fontaine.fabrice at gmail.com Fri Feb 9 19:50:21 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 9 Feb 2024 20:50:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/rlwrap: needs MMU Message-ID: <20240209195021.341782-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 0a1f2fce0494388080af0a4130e62522c26fe4a9: /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: pty.o: in function `my_pty_fork': pty.c:(.text+0x68): undefined reference to `fork' /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: filter.o: in function `.L0 ': filter.c:(.text+0x134): undefined reference to `fork' Fixes: - http://autobuild.buildroot.org/results/0a3a68cfb181bc67a7dbf1d44f64b0a29df75987 Signed-off-by: Fabrice Fontaine --- package/rlwrap/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rlwrap/Config.in b/package/rlwrap/Config.in index 0cb3e33fa7..4e18dfde52 100644 --- a/package/rlwrap/Config.in +++ b/package/rlwrap/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RLWRAP bool "rlwrap" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_READLINE help rlwrap is a 'readline wrapper', a small utility that uses the -- 2.43.0 From gael.portay at rtone.fr Fri Feb 9 20:44:39 2024 From: gael.portay at rtone.fr (=?UTF-8?q?Ga=C3=ABl=20PORTAY?=) Date: Fri, 9 Feb 2024 21:44:39 +0100 Subject: [Buildroot] [PATCH v3 1/1] configs: add raspberrypi 5 defconfig Message-ID: <20240209204441.86187-1-gael.portay@rtone.fr> This configuration builds an image for the RaspberryPi 5. Cc: Adam Duskett Cc: Yann E. MORIN Signed-off-by: Ga?l PORTAY --- Dear maintainers, That change adds the raspberrypi5_defconfig for the Raspberry Pi 5 64-bit. It uses the defconfig bcm2712_defconfig[2] and the device-tree source bcm2712-rpi-5-b.dts[3]. Note: The kernel defconfig defaults to 16k page-size; a kernel fragment is added to use a 4k page-size to compile and run using all toolchains. The Raspberry Pi 5 has now a dedicated debug UART connector[4] (it is always active and enabled; there is no more need to enable_uart=1 in the file config.txt). The UART device name changes to ttyAMA10 and the command line has to be updated in the file cmdline.txt. The Raspberry Pi 5 only supports 64-bit kernel[5]. Tested on internal toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1117-g95a905918c) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Fri Feb 9 20:09:08 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Tested on external Bootlin toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-linux-gcc.br_real (Buildroot 2021.11-10014-g6257e8c) 13.2.0, GNU ld (GNU Binutils) 2.41) #1 SMP PREEMPT Fri Feb 9 20:54:08 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Tested on external ARM toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 13.2.1 20231009, GNU ld (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 2.41.0.20231009) #1 SMP PREEMPT Fri Feb 9 21:00:24 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Changes since RFC: - Update README to add model Pi 5 B - Add support for 64K MMU page-size for ARM64 and Raspberry Pi 5 - Add Raspberry Pi 5 specific cmdline_5.txt to set its console on its debug uart (ttyAMA10 instead of ttyAMA0) - Remove 32-bit variant since Raspberry Pi 5 supports booting a 64-bit kernel only - Remove the property arm_64bit=1 from config_5_64bit.txt - Remove the _64bit suffix - Remove unecessary Pi 5 variant from package rpi-firmware Changes since v1: - Rebase on top of master - Remove the bumps for the rpi-firmware and linux packages - Bump the kernel to linux-17f135b742c4edb340afb365873c3a574f7e16cb (6.1.61, i.e. the same version as the other raspberrypi defconfigs) Changes since v2: - Rebase on top of master (remove applied patch) - Add a kernel fragment to force 4k page-size - Remove BR2_ARM64_PAGE_SIZE_16K from the board's defconfig [0]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#introduction [1]: https://www.raspberrypi.com/documentation/computers/config_txt.html#kernel [2]: https://github.com/raspberrypi/linux/commit/9cfb379147f803b0362b0fe249e5b145d232bea3 [3]: https://github.com/raspberrypi/linux/commit/1196bf1a7736ff0ab79f5012fa84082e298031a7 [4]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#uart-connector [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#arm_64bit Kind Regards, Ga?l PORTAY board/raspberrypi/cmdline_5.txt | 1 + board/raspberrypi/config_5.txt | 14 ++++++ board/raspberrypi/linux-4k-page-size.fragment | 1 + board/raspberrypi/readme.txt | 6 +++ board/raspberrypi5 | 1 + configs/raspberrypi5_defconfig | 47 +++++++++++++++++++ 6 files changed, 70 insertions(+) create mode 100644 board/raspberrypi/cmdline_5.txt create mode 100644 board/raspberrypi/config_5.txt create mode 100644 board/raspberrypi/linux-4k-page-size.fragment create mode 120000 board/raspberrypi5 create mode 100644 configs/raspberrypi5_defconfig diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt new file mode 100644 index 0000000000..ac457353e2 --- /dev/null +++ b/board/raspberrypi/cmdline_5.txt @@ -0,0 +1 @@ +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt new file mode 100644 index 0000000000..bbed19fe46 --- /dev/null +++ b/board/raspberrypi/config_5.txt @@ -0,0 +1,14 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 diff --git a/board/raspberrypi/linux-4k-page-size.fragment b/board/raspberrypi/linux-4k-page-size.fragment new file mode 100644 index 0000000000..5df91df1aa --- /dev/null +++ b/board/raspberrypi/linux-4k-page-size.fragment @@ -0,0 +1 @@ +CONFIG_ARM64_4K_PAGES=y diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 9202b5ff37..aa6421ea01 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: - the model B3 (aka Raspberry Pi 3). - the model B4 (aka Raspberry Pi 4). - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). + - the model B5 (aka Raspberry Pi 5). How to build it =============== @@ -64,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): $ make raspberrypicm4io_64_defconfig +For model 5 B: + + $ make raspberrypi5_defconfig + Build the rootfs ---------------- @@ -94,6 +99,7 @@ After building, you should obtain this tree: +-- bcm2710-rpi-cm3.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] + +-- bcm2712-rpi-5-b.dtb [1] +-- bcm2837-rpi-3-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 diff --git a/board/raspberrypi5 b/board/raspberrypi5 new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypi5 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig new file mode 100644 index 0000000000..d0760824bd --- /dev/null +++ b/configs/raspberrypi5_defconfig @@ -0,0 +1,47 @@ +BR2_aarch64=y +BR2_cortex_a76_a55=y +BR2_ARM_FPU_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y -- 2.43.0 From gael.portay at rtone.fr Fri Feb 9 20:45:44 2024 From: gael.portay at rtone.fr (=?UTF-8?q?Ga=C3=ABl=20PORTAY?=) Date: Fri, 9 Feb 2024 21:45:44 +0100 Subject: [Buildroot] [PATCH v3 1/1] configs: add raspberrypi 5 defconfig Message-ID: <20240209204545.86221-1-gael.portay@rtone.fr> This configuration builds an image for the RaspberryPi 5. Cc: Adam Duskett Cc: Yann E. MORIN Signed-off-by: Ga?l PORTAY --- Dear maintainers, That change adds the raspberrypi5_defconfig for the Raspberry Pi 5 64-bit. It uses the defconfig bcm2712_defconfig[2] and the device-tree source bcm2712-rpi-5-b.dts[3]. Note: The kernel defconfig defaults to 16k page-size; a kernel fragment is added to use a 4k page-size to compile and run using all toolchains. The Raspberry Pi 5 has now a dedicated debug UART connector[4] (it is always active and enabled; there is no more need to enable_uart=1 in the file config.txt). The UART device name changes to ttyAMA10 and the command line has to be updated in the file cmdline.txt. The Raspberry Pi 5 only supports 64-bit kernel[5]. Tested on internal toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1117-g95a905918c) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Fri Feb 9 20:09:08 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Tested on external Bootlin toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-linux-gcc.br_real (Buildroot 2021.11-10014-g6257e8c) 13.2.0, GNU ld (GNU Binutils) 2.41) #1 SMP PREEMPT Fri Feb 9 20:54:08 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Tested on external ARM toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 13.2.1 20231009, GNU ld (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 2.41.0.20231009) #1 SMP PREEMPT Fri Feb 9 21:00:24 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Changes since RFC: - Update README to add model Pi 5 B - Add support for 64K MMU page-size for ARM64 and Raspberry Pi 5 - Add Raspberry Pi 5 specific cmdline_5.txt to set its console on its debug uart (ttyAMA10 instead of ttyAMA0) - Remove 32-bit variant since Raspberry Pi 5 supports booting a 64-bit kernel only - Remove the property arm_64bit=1 from config_5_64bit.txt - Remove the _64bit suffix - Remove unecessary Pi 5 variant from package rpi-firmware Changes since v1: - Rebase on top of master - Remove the bumps for the rpi-firmware and linux packages - Bump the kernel to linux-17f135b742c4edb340afb365873c3a574f7e16cb (6.1.61, i.e. the same version as the other raspberrypi defconfigs) Changes since v2: - Rebase on top of master (remove applied patch) - Add a kernel fragment to force 4k page-size - Remove BR2_ARM64_PAGE_SIZE_16K from the board's defconfig [0]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#introduction [1]: https://www.raspberrypi.com/documentation/computers/config_txt.html#kernel [2]: https://github.com/raspberrypi/linux/commit/9cfb379147f803b0362b0fe249e5b145d232bea3 [3]: https://github.com/raspberrypi/linux/commit/1196bf1a7736ff0ab79f5012fa84082e298031a7 [4]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#uart-connector [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#arm_64bit Kind Regards, Ga?l PORTAY board/raspberrypi/cmdline_5.txt | 1 + board/raspberrypi/config_5.txt | 14 ++++++ board/raspberrypi/linux-4k-page-size.fragment | 1 + board/raspberrypi/readme.txt | 6 +++ board/raspberrypi5 | 1 + configs/raspberrypi5_defconfig | 47 +++++++++++++++++++ 6 files changed, 70 insertions(+) create mode 100644 board/raspberrypi/cmdline_5.txt create mode 100644 board/raspberrypi/config_5.txt create mode 100644 board/raspberrypi/linux-4k-page-size.fragment create mode 120000 board/raspberrypi5 create mode 100644 configs/raspberrypi5_defconfig diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt new file mode 100644 index 0000000000..ac457353e2 --- /dev/null +++ b/board/raspberrypi/cmdline_5.txt @@ -0,0 +1 @@ +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt new file mode 100644 index 0000000000..bbed19fe46 --- /dev/null +++ b/board/raspberrypi/config_5.txt @@ -0,0 +1,14 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 diff --git a/board/raspberrypi/linux-4k-page-size.fragment b/board/raspberrypi/linux-4k-page-size.fragment new file mode 100644 index 0000000000..5df91df1aa --- /dev/null +++ b/board/raspberrypi/linux-4k-page-size.fragment @@ -0,0 +1 @@ +CONFIG_ARM64_4K_PAGES=y diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 9202b5ff37..aa6421ea01 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: - the model B3 (aka Raspberry Pi 3). - the model B4 (aka Raspberry Pi 4). - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). + - the model B5 (aka Raspberry Pi 5). How to build it =============== @@ -64,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): $ make raspberrypicm4io_64_defconfig +For model 5 B: + + $ make raspberrypi5_defconfig + Build the rootfs ---------------- @@ -94,6 +99,7 @@ After building, you should obtain this tree: +-- bcm2710-rpi-cm3.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] + +-- bcm2712-rpi-5-b.dtb [1] +-- bcm2837-rpi-3-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 diff --git a/board/raspberrypi5 b/board/raspberrypi5 new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypi5 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig new file mode 100644 index 0000000000..d0760824bd --- /dev/null +++ b/configs/raspberrypi5_defconfig @@ -0,0 +1,47 @@ +BR2_aarch64=y +BR2_cortex_a76_a55=y +BR2_ARM_FPU_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y -- 2.43.0 From fontaine.fabrice at gmail.com Fri Feb 9 20:38:52 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 9 Feb 2024 21:38:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqrtr-glib: fix static build Message-ID: <20240209203852.671387-1-fontaine.fabrice@gmail.com> Fix the following static build failure raised since bump to version 1.2.2 in commit b50bb982208011841fe0a9a7e4309808085cf493: [5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 Fixes: - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d Signed-off-by: Fabrice Fontaine --- ...rtr-lib-meson.build-fix-static-build.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch diff --git a/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch b/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch new file mode 100644 index 0000000000..8c0db7bed5 --- /dev/null +++ b/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch @@ -0,0 +1,36 @@ +From dd9d68259c1fb79bcf40fcdf6aa1e6026edec9b2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 9 Feb 2024 21:16:39 +0100 +Subject: [PATCH] src/libqrtr-lib/meson.build: fix static build + +Replace shared_library by library to avoid the following static build +failure: + +[5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 +FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 + +Fixes: + - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/merge_requests/24 +--- + src/libqrtr-glib/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libqrtr-glib/meson.build b/src/libqrtr-glib/meson.build +index bbdd869..0cddcc7 100644 +--- a/src/libqrtr-glib/meson.build ++++ b/src/libqrtr-glib/meson.build +@@ -39,7 +39,7 @@ c_flags = [ + '-DLIBEXEC_PATH="@0@"'.format(qrtr_prefix / qrtr_libexecdir), + ] + +-libqrtr_glib = shared_library( ++libqrtr_glib = library( + libname, + version: qrtr_glib_version, + sources: sources + [version_header], +-- +2.43.0 + -- 2.43.0 From gael.portay at rtone.fr Fri Feb 9 20:50:29 2024 From: gael.portay at rtone.fr (=?utf-8?q?Ga=C3=ABl_PORTAY?=) Date: Fri, 09 Feb 2024 21:50:29 +0100 Subject: [Buildroot] [PATCH v3 1/1] configs: add raspberrypi 5 defconfig In-Reply-To: <20240209204545.86221-1-gael.portay@rtone.fr> References: <20240209204545.86221-1-gael.portay@rtone.fr> Message-ID: Sorry for that double post. On Fri Feb 9, 2024 at 9:45 PM CET, Ga?l PORTAY wrote: > This configuration builds an image for the RaspberryPi 5. > > Cc: Adam Duskett > Cc: Yann E. MORIN > Signed-off-by: Ga?l PORTAY > --- > Dear maintainers, > > That change adds the raspberrypi5_defconfig for the Raspberry Pi 5 > 64-bit. > > It uses the defconfig bcm2712_defconfig[2] and the device-tree source > bcm2712-rpi-5-b.dts[3]. > > Note: The kernel defconfig defaults to 16k page-size; a kernel fragment > is added to use a 4k page-size to compile and run using all toolchains. > > The Raspberry Pi 5 has now a dedicated debug UART connector[4] (it is > always active and enabled; there is no more need to enable_uart=1 in the > file config.txt). > > The UART device name changes to ttyAMA10 and the command line has to be > updated in the file cmdline.txt. > > The Raspberry Pi 5 only supports 64-bit kernel[5]. > > Tested on internal toolchain: > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1117-g95a905918c) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Fri Feb 9 20:09:08 CET 2024 > (...) > # grep PageSize /proc/1/smaps | sort -u > KernelPageSize: 4 kB > MMUPageSize: 4 kB > > Tested on external Bootlin toolchain: > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-linux-gcc.br_real (Buildroot 2021.11-10014-g6257e8c) 13.2.0, GNU ld (GNU Binutils) 2.41) #1 SMP PREEMPT Fri Feb 9 20:54:08 CET 2024 > (...) > # grep PageSize /proc/1/smaps | sort -u > KernelPageSize: 4 kB > MMUPageSize: 4 kB > > Tested on external ARM toolchain: > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 13.2.1 20231009, GNU ld (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 2.41.0.20231009) #1 SMP PREEMPT Fri Feb 9 21:00:24 CET 2024 > (...) > # grep PageSize /proc/1/smaps | sort -u > KernelPageSize: 4 kB > MMUPageSize: 4 kB > > Changes since RFC: > - Update README to add model Pi 5 B > - Add support for 64K MMU page-size for ARM64 and Raspberry Pi 5 > - Add Raspberry Pi 5 specific cmdline_5.txt to set its console on its > debug uart (ttyAMA10 instead of ttyAMA0) > - Remove 32-bit variant since Raspberry Pi 5 supports booting a 64-bit > kernel only > - Remove the property arm_64bit=1 from config_5_64bit.txt > - Remove the _64bit suffix > - Remove unecessary Pi 5 variant from package rpi-firmware > > Changes since v1: > - Rebase on top of master > - Remove the bumps for the rpi-firmware and linux packages > - Bump the kernel to linux-17f135b742c4edb340afb365873c3a574f7e16cb > (6.1.61, i.e. the same version as the other raspberrypi defconfigs) > > Changes since v2: > - Rebase on top of master (remove applied patch) > - Add a kernel fragment to force 4k page-size > - Remove BR2_ARM64_PAGE_SIZE_16K from the board's defconfig > > [0]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#introduction > [1]: https://www.raspberrypi.com/documentation/computers/config_txt.html#kernel > [2]: https://github.com/raspberrypi/linux/commit/9cfb379147f803b0362b0fe249e5b145d232bea3 > [3]: https://github.com/raspberrypi/linux/commit/1196bf1a7736ff0ab79f5012fa84082e298031a7 > [4]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#uart-connector > [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#arm_64bit > > Kind Regards, > Ga?l PORTAY > > board/raspberrypi/cmdline_5.txt | 1 + > board/raspberrypi/config_5.txt | 14 ++++++ > board/raspberrypi/linux-4k-page-size.fragment | 1 + > board/raspberrypi/readme.txt | 6 +++ > board/raspberrypi5 | 1 + > configs/raspberrypi5_defconfig | 47 +++++++++++++++++++ > 6 files changed, 70 insertions(+) > create mode 100644 board/raspberrypi/cmdline_5.txt > create mode 100644 board/raspberrypi/config_5.txt > create mode 100644 board/raspberrypi/linux-4k-page-size.fragment > create mode 120000 board/raspberrypi5 > create mode 100644 configs/raspberrypi5_defconfig > > diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt > new file mode 100644 > index 0000000000..ac457353e2 > --- /dev/null > +++ b/board/raspberrypi/cmdline_5.txt > @@ -0,0 +1 @@ > +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 > diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt > new file mode 100644 > index 0000000000..bbed19fe46 > --- /dev/null > +++ b/board/raspberrypi/config_5.txt > @@ -0,0 +1,14 @@ > +# Please note that this is only a sample, we recommend you to change it to fit > +# your needs. > +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. > +# See http://buildroot.org/manual.html#rootfs-custom > +# and http://elinux.org/RPiconfig for a description of config.txt syntax > + > +kernel=Image > + > +# To use an external initramfs file > +#initramfs rootfs.cpio.gz > + > +# Disable overscan assuming the display supports displaying the full resolution > +# If the text shown on the screen disappears off the edge, comment this out > +disable_overscan=1 > diff --git a/board/raspberrypi/linux-4k-page-size.fragment b/board/raspberrypi/linux-4k-page-size.fragment > new file mode 100644 > index 0000000000..5df91df1aa > --- /dev/null > +++ b/board/raspberrypi/linux-4k-page-size.fragment > @@ -0,0 +1 @@ > +CONFIG_ARM64_4K_PAGES=y > diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt > index 9202b5ff37..aa6421ea01 100644 > --- a/board/raspberrypi/readme.txt > +++ b/board/raspberrypi/readme.txt > @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: > - the model B3 (aka Raspberry Pi 3). > - the model B4 (aka Raspberry Pi 4). > - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). > + - the model B5 (aka Raspberry Pi 5). > > How to build it > =============== > @@ -64,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): > > $ make raspberrypicm4io_64_defconfig > > +For model 5 B: > + > + $ make raspberrypi5_defconfig > + > Build the rootfs > ---------------- > > @@ -94,6 +99,7 @@ After building, you should obtain this tree: > +-- bcm2710-rpi-cm3.dtb [1] > +-- bcm2711-rpi-4-b.dtb [1] > +-- bcm2711-rpi-cm4.dtb [1] > + +-- bcm2712-rpi-5-b.dtb [1] > +-- bcm2837-rpi-3-b.dtb [1] > +-- boot.vfat > +-- rootfs.ext4 > diff --git a/board/raspberrypi5 b/board/raspberrypi5 > new file mode 120000 > index 0000000000..fcdafc81ed > --- /dev/null > +++ b/board/raspberrypi5 > @@ -0,0 +1 @@ > +raspberrypi > \ No newline at end of file > diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig > new file mode 100644 > index 0000000000..d0760824bd > --- /dev/null > +++ b/configs/raspberrypi5_defconfig > @@ -0,0 +1,47 @@ > +BR2_aarch64=y > +BR2_cortex_a76_a55=y > +BR2_ARM_FPU_VFPV4=y > + > +BR2_TOOLCHAIN_BUILDROOT_CXX=y > + > +BR2_SYSTEM_DHCP="eth0" > + > +# Linux headers same as kernel, a 6.1 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > + > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" > + > +# Build the DTB from the kernel sources > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" > + > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_RPI_FIRMWARE=y > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" > +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" > + > +# Enable compressed kernel module support > +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > +BR2_PACKAGE_KMOD_TOOLS=y > +BR2_PACKAGE_XZ=y > +BR2_PACKAGE_KMOD=y > +BR2_PACKAGE_HOST_KMOD_XZ=y > -- > 2.43.0 From fontaine.fabrice at gmail.com Fri Feb 9 21:08:01 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 9 Feb 2024 22:08:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/uhd: fix build with gcc >= 13 Message-ID: <20240209210801.880001-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc >= 13: In file included from /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/lib/cal/database.cpp:7: /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:86:24: error: 'uint8_t' was not declared in this scope 86 | static std::vector read_cal_data(const std::string& key, | ^~~~~~~ /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:14:1: note: 'uint8_t' is defined in header ''; did you forget to '#include '? 13 | #include +++ |+#include 14 | Fixes: - http://autobuild.buildroot.org/results/cc52f2ed4fa43fe9c92713eb8561afcba29e12f3 Signed-off-by: Fabrice Fontaine --- ...h-GCC-13-add-missing-cstdint-include.patch | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch diff --git a/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch b/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch new file mode 100644 index 0000000000..acf720a15d --- /dev/null +++ b/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch @@ -0,0 +1,117 @@ +From 3acf784e988608cbce34cd0be0a8703ba53ea515 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 3 Jan 2023 23:04:52 +0000 +Subject: [PATCH] Fix build with GCC 13 (add missing include) + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so is no longer transitively included. + +Explicitly include for uint8_t. + +``` +/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:43:14: error: 'uint32_t' does not name a type + 43 | static const uint32_t DEFAULT_NOC_ID = 0xFFFFFFFF; + | ^~~~~~~~ +/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:1:1: note: 'uint32_t' is defined in header ''; did you forget to '#include '? + +++ |+#include + 1 | // +``` + +Signed-off-by: Sam James + +Upstream: https://github.com/EttusResearch/uhd/commit/3acf784e988608cbce34cd0be0a8703ba53ea515 +Signed-off-by: Fabrice Fontaine +--- + host/include/uhd/cal/database.hpp | 1 + + host/include/uhd/rfnoc/defaults.hpp | 1 + + host/include/uhd/types/eeprom.hpp | 1 + + host/include/uhd/usrp/zbx_tune_map_item.hpp | 1 + + host/lib/usrp/dboard/magnesium/magnesium_constants.hpp | 1 + + host/lib/usrp/dboard/rhodium/rhodium_constants.hpp | 1 + + host/lib/utils/serial_number.cpp | 1 + + 7 files changed, 7 insertions(+) + +diff --git a/host/include/uhd/cal/database.hpp b/host/include/uhd/cal/database.hpp +index b6abbb6df7..9d47febedd 100644 +--- a/host/include/uhd/cal/database.hpp ++++ b/host/include/uhd/cal/database.hpp +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp +index aa7778aacf..6c878a8d70 100644 +--- a/host/include/uhd/rfnoc/defaults.hpp ++++ b/host/include/uhd/rfnoc/defaults.hpp +@@ -8,6 +8,7 @@ + + #pragma once + ++#include + #include + + namespace uhd { namespace rfnoc { +diff --git a/host/include/uhd/types/eeprom.hpp b/host/include/uhd/types/eeprom.hpp +index 3a7605d3cb..420440aa64 100644 +--- a/host/include/uhd/types/eeprom.hpp ++++ b/host/include/uhd/types/eeprom.hpp +@@ -6,6 +6,7 @@ + + #pragma once + ++#include + #include + #include + #include +diff --git a/host/include/uhd/usrp/zbx_tune_map_item.hpp b/host/include/uhd/usrp/zbx_tune_map_item.hpp +index e49f49f785..ce95623de2 100644 +--- a/host/include/uhd/usrp/zbx_tune_map_item.hpp ++++ b/host/include/uhd/usrp/zbx_tune_map_item.hpp +@@ -6,6 +6,7 @@ + + #pragma once + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp +index 99f2b910c6..99f5a4933f 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp +index 591d02d305..1577e02d9e 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/host/lib/utils/serial_number.cpp b/host/lib/utils/serial_number.cpp +index 61296a9139..c07730e24d 100644 +--- a/host/lib/utils/serial_number.cpp ++++ b/host/lib/utils/serial_number.cpp +@@ -5,6 +5,7 @@ + // + + #include ++#include + #include + #include + -- 2.43.0 From thomas.petazzoni at bootlin.com Fri Feb 9 22:00:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 9 Feb 2024 23:00:08 +0100 Subject: [Buildroot] [PATCH] package/ifplugd: add option to override sysconfdir In-Reply-To: References: <20240115142744.70711-1-aolvolk@salutedevices.com> <20240205180959.5c662ae1@windsurf> Message-ID: <20240209230008.615bf94e@windsurf> Hello Alisa, Your e-mail wraps very weirdly the messages you reply to, as it forgets the quotation mark on the second line of the quoted text. On Fri, 9 Feb 2024 14:02:14 +0300 Alisa Volk wrote: > The init script is auto-generated, and the path to ifplugd.conf file > inside it is configured with sysconfdir option. Correct, I hadn't realized this init script was installed. Usually, Buildroot provides its own init scripts. My suggestion here will be to patch/override this init script in your root filesystem overlay, or using a post-build script. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From petr.vorel at gmail.com Sat Feb 10 00:03:57 2024 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 10 Feb 2024 01:03:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqrtr-glib: fix static build In-Reply-To: <20240209203852.671387-1-fontaine.fabrice@gmail.com> References: <20240209203852.671387-1-fontaine.fabrice@gmail.com> Message-ID: <20240210000357.GA381153@pevik> Hi Fabrice, Reviewed-by: Petr Vorel Thanks! > Fix the following static build failure raised since bump to version > 1.2.2 in commit b50bb982208011841fe0a9a7e4309808085cf493: > [5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 > FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 > Fixes: > - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d I would also add usual Fixes:, but Buildroot might not use it. Fixes: b50bb98220 ("package/libqrtr-glib: bump version to 1.2.2") Kind regards, Petr From bernd at kuhls.net Sat Feb 10 07:36:59 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 10 Feb 2024 08:36:59 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240210073659.5018-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index da22b439e3..773cb4fbb5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.15" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.16" 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 10edcc2ed9..52fb480af2 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa linux-6.6.15.tar.xz -sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz +sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz +sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a0e572adc0..69857566e3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.76" if BR2_KERNEL_HEADERS_6_1 - default "6.6.15" if BR2_KERNEL_HEADERS_6_6 + default "6.1.77" if BR2_KERNEL_HEADERS_6_1 + default "6.6.16" if BR2_KERNEL_HEADERS_6_6 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 \ -- 2.39.2 From fperrad at gmail.com Sat Feb 10 08:27:51 2024 From: fperrad at gmail.com (Francois Perrad) Date: Sat, 10 Feb 2024 09:27:51 +0100 Subject: [Buildroot] [PATCH] package/lua-http: fix CVE-2023-4540 Message-ID: <20240210082751.12920-1-francois.perrad@gadz.org> see https://nvd.nist.gov/vuln/detail/CVE-2023-4540 & https://cert.pl/en/posts/2023/09/CVE-2023-4540 Signed-off-by: Francois Perrad --- ...andle-EOF-when-body_read_type-length.patch | 68 +++++++++++++++++++ package/lua-http/lua-http.mk | 3 + 2 files changed, 71 insertions(+) create mode 100644 package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch diff --git a/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch new file mode 100644 index 000000000..e8f88f1ae --- /dev/null +++ b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch @@ -0,0 +1,68 @@ +From ddab2835c583d45dec62680ca8d3cbde55e0bae6 Mon Sep 17 00:00:00 2001 +From: daurnimator +Date: Tue, 22 Aug 2023 23:30:20 +1000 +Subject: [PATCH] http/h1_stream: handle EOF when `body_read_type==length` + +If a client closes the connection before sending the expected number of bytes +then return `EPIPE`. +This fixes a potential infinite draining loop when trying to trying to +`:shutdown()` a stream. +--- + http/h1_stream.lua | 2 ++ + spec/h1_stream_spec.lua | 27 +++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/lua-http-0.4/http/h1_stream.lua b/lua-http-0.4/http/h1_stream.lua +index b2469a1..b0ca821 100644 +--- a/lua-http-0.4/http/h1_stream.lua ++++ b/lua-http-0.4/http/h1_stream.lua +@@ -861,6 +861,8 @@ function stream_methods:read_next_chunk(timeout) + if chunk ~= nil then + self.body_read_left = length_n - #chunk + end_stream = (self.body_read_left == 0) ++ elseif err == nil then ++ return nil, ce.strerror(ce.EPIPE), ce.EPIPE + end + elseif length_n == 0 then + chunk = "" +diff --git a/lua-http-0.4/spec/h1_stream_spec.lua b/lua-http-0.4/spec/h1_stream_spec.lua +index f9cfea9..1303f94 100644 +--- a/lua-http-0.4/spec/h1_stream_spec.lua ++++ b/lua-http-0.4/spec/h1_stream_spec.lua +@@ -295,6 +295,33 @@ describe("http1 stream", function() + server:close() + client:close() + end) ++ it("Doesn't hang when a content-length delimited stream is closed", function() ++ local server, client = new_pair(1.1) ++ local cq = cqueues.new() ++ cq:wrap(function() ++ local stream = client:new_stream() ++ local headers = new_headers() ++ headers:append(":method", "GET") ++ headers:append(":scheme", "http") ++ headers:append(":authority", "myauthority") ++ headers:append(":path", "/a") ++ assert(stream:write_headers(headers, true)) ++ end) ++ cq:wrap(function() ++ local stream = server:get_next_incoming_stream() ++ assert(stream:get_headers()) ++ local res_headers = new_headers() ++ res_headers:append(":status", "200") ++ res_headers:append("content-length", "100") ++ assert(stream:write_headers(res_headers, false)) ++ assert(stream:write_chunk("foo", false)) ++ assert(stream:shutdown()) ++ end) ++ assert_loop(cq, TEST_TIMEOUT) ++ assert.truthy(cq:empty()) ++ server:close() ++ client:close() ++ end) + it("allows pipelining", function() + local server, client = new_pair(1.1) + local cq = cqueues.new() +-- +2.40.1 + diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index df3e2c005..34387c12e 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -13,4 +13,7 @@ LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_CPE_ID_VENDOR = daurnimator +# 0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch +LUA_HTTP_IGNORE_CVES += CVE-2023-4540 + $(eval $(luarocks-package)) -- 2.40.1 From cjts at protonmail.ch Sat Feb 10 09:32:00 2024 From: cjts at protonmail.ch (cjts) Date: Sat, 10 Feb 2024 09:32:00 +0000 Subject: [Buildroot] Unable to build host python3.12 Message-ID: Hi I checked out the master branch at 8ab4a0a348b255a074d16b640e8a372fe94596dc and tried to build a defconfig (x86_64) with HOST_PYTHON3 enabled. The install part fails thus: ost/lib/python3.12/lib-dynload/_tkinter.cpython-312-x86_64-linux-gnu.so /usr/bin/install -c -m 644 ./Lib/shutil.py /mnt/vmtmp/buildroot/output/host/lib/python3.12 /usr/bin/install -c -m 644 ./Lib/signal.py /mnt/vmtmp/buildroot/output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory I looked at the makefile.pre.in but I cannot see why tkinter is being included. Cheers CJ From ju.o at free.fr Sat Feb 10 10:09:28 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 10 Feb 2024 11:09:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/ghostscript: security bump to version 10.02.1 Message-ID: <20240210100928.172584-1-ju.o@free.fr> For release note, see: https://ghostscript.readthedocs.io/en/gs10.02.1/News.html For detailed history, see: https://git.ghostscript.com/?p=ghostpdl.git;a=shortlog;h=refs/tags/ghostpdl-10.02.1 Fixes: - CVE-2023-46751: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-46751 Signed-off-by: Julien Olivain --- package/ghostscript/ghostscript.hash | 4 ++-- package/ghostscript/ghostscript.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 77c8faccbe..849f6c64ba 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10020/SHA512SUMS -sha512 c49344151063e915add55a0a842c2a645d8362a5cbca663bd07638f4bd3699a08cade37a9efe905ad5a41e014353e5e1b1268b7925e43128ad30d5b031396b71 ghostscript-10.02.0.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10021/SHA512SUMS +sha512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11 ghostscript-10.02.1.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 161521f970..da23ebbadb 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.02.0 +GHOSTSCRIPT_VERSION = 10.02.1 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 -- 2.43.0 From bernd at kuhls.net Sat Feb 10 10:36:34 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 10 Feb 2024 11:36:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/heimdal: Fix build with autoconf-2.72 Message-ID: <20240210103634.3502847-1-bernd@kuhls.net> Fixes: http://autobuild.buildroot.net/results/175/175fb65f0151866cd2d83c91c23b453d8c4489f7/ Signed-off-by: Bernd Kuhls --- ...file.m4-Fix-build-with-autoconf-2.72.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch diff --git a/package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch b/package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch new file mode 100644 index 0000000000..655ede2af6 --- /dev/null +++ b/package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch @@ -0,0 +1,30 @@ +From 2b372170c894ed9aa3fe2fca976f3541ea7041d9 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 10 Feb 2024 09:33:48 +0100 +Subject: [PATCH] cf/largefile.m4: Fix build with autoconf-2.72 + +Fixes https://github.com/heimdal/heimdal/issues/1201 + +Upstream: https://github.com/heimdal/heimdal/pull/1229 + +Signed-off-by: Bernd Kuhls +--- + cf/largefile.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cf/largefile.m4 b/cf/largefile.m4 +index 5c54897be..cdbbc5543 100644 +--- a/cf/largefile.m4 ++++ b/cf/largefile.m4 +@@ -10,7 +10,7 @@ dnl with generated code, such as lex + if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then + CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files" + fi +-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then ++if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then + CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" + fi + ]) +-- +2.39.2 + -- 2.39.2 From ju.o at free.fr Sat Feb 10 12:23:38 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 10 Feb 2024 13:23:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgpgme: bump to version 1.23.2 Message-ID: <20240210122338.999772-1-ju.o@free.fr> For change log, see [1] and [2]. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-1.23.2 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=shortlog;h=gpgme-1.23.2 Signed-off-by: Julien Olivain --- Patch tested on branch master at commit 8ab4a0a with commands: make check-package ... 0 warnings generated utils/test-pkg -p libgpgme ... 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_libgpgme ... OK --- package/libgpgme/libgpgme.hash | 4 ++-- package/libgpgme/libgpgme.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index 5c47db76d5..64099df4c3 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 12f4c98ffa75bdbfc4934d38757f57ba718b5aa0 gpgme-1.22.0.tar.bz2 -sha256 9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71 gpgme-1.22.0.tar.bz2 +sha1 b3a938939a9fb2182684aa9ba094c8e8ecd6167b gpgme-1.23.2.tar.bz2 +sha256 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 gpgme-1.23.2.tar.bz2 # Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 036103b7fc..dd39b37aa2 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPGME_VERSION = 1.22.0 +LIBGPGME_VERSION = 1.23.2 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ -- 2.43.0 From ju.o at free.fr Sat Feb 10 12:25:52 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 10 Feb 2024 13:25:52 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: libgpgme: increase gpg key generation timeout Message-ID: <20240210122552.1001346-1-ju.o@free.fr> gpg key generation can take longer than the default timeout on a loaded or slow test host. The commit increase the timeout for the key generation command to prevent the test to randomly fail. Signed-off-by: Julien Olivain --- support/testing/tests/package/test_libgpgme.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_libgpgme.py b/support/testing/tests/package/test_libgpgme.py index 28a33bab03..b497891249 100644 --- a/support/testing/tests/package/test_libgpgme.py +++ b/support/testing/tests/package/test_libgpgme.py @@ -37,7 +37,7 @@ class TestLibGpgme(infra.basetest.BRTest): # We now create our gpg key. cmd = "gpg --batch --passphrase ''" cmd += f" --quick-generate-key {gpg_userid} default default" - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=30) # We should now see our key in the list. self.assertRunOk(gpgme_listkey) -- 2.43.0 From kilian.zinnecker at mail.de Sat Feb 10 15:22:10 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Sat, 10 Feb 2024 16:22:10 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/xuantie-bins: new package In-Reply-To: <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-2-kilian.zinnecker@mail.de> <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> Message-ID: <4544153.LvFx2qVVIh@laptop> Hello Giulio, all, > Hi Yegor, Kilian, This is strange, maybe someone can have a look here: On ozlabs, there are a lot of patches, which have the submitter "kilian.zinnecker--- via buildroot". However, most of them are NOT from me. E.g., one from Yegor Yefremov [1] is marked with submitter "kilian.zinnecker--- via buildroot" - However, I am definitively not Yegor, and none of his patches is from me. There are even more patches marked with "kilian.zinnecker--- via buildroot" [2], some of them even from before I ever submitted my first patch (the Rock5B board support) to buildroot. Does anyone have any idea what this is about, or can have a deeper look at this? (The BeagleV-Ahead patches are from me.) [1] https://patchwork.ozlabs.org/project/buildroot/patch/ 20240206132051.2838897-1-yegorslists at googlemail.com/ [2] https://patchwork.ozlabs.org/project/buildroot/list/? submitter=82609&archive=both&state=* [--SNIP--] Thanks for your review Giulio. I will try to address the issues and prepare a new version of the patches. Best regards, Kilian From kilian.zinnecker at mail.de Sat Feb 10 18:37:22 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Sat, 10 Feb 2024 19:37:22 +0100 Subject: [Buildroot] [help] configs/rock5b_defconfig: Switch to mainline kernel In-Reply-To: References: <2716329.mvXUDI8C0e@laptop> Message-ID: <1956485.PYKUYFuaPT@laptop> Hello Arnout, all, I was told that from kernel 6.7 on the ethernet of the Rock5B is supported, so I switched to that version (precisely 6.7.4 currently). > Clearly, the rootfs is on mmcblk1p2, not mmcblk0p2. So if you have > mmcblk0p2 on your command line, and rootwait, it will just wait > indefinitely for the rootfs to appear. Yes, correct, when I switch to mmcblk1p2 it works now! But I also switched to kernel 6.7.4 for now and switched the console in the bootargs to ttyS2 again. > > [ 31.717905] vdd_gpu_s0: disabling > > [ 115.285576] random: crng init done > > That's pretty late for the RNG to be initialized, you'll need the RNG > seeder from userspace - but this is enabled by default in Buildroot I > think. How could I check that? > > Of course it could be, that it is just not configured anymore to put a > > shell on the serial interface, but I already tried to address that with: > > > > BR2_TARGET_GENERIC_GETTY=y > > BR2_TARGET_GENERIC_GETTY_PORT="serial2" > > > > However, that did not seem to help. Could it be, that there is something > > wrong with the SD card formatting? It at least complains about it, but I > > am too unfamiliar with that, so I don't know whether it is a problem. > > That's normal. It's because the generated image is not the exact size of > your SD card, so the backup GPT partition table is somewhere in the middle > instead of at the end. You can run parted on your laptop after writing the > SD card and before booting it to fix the issue. But it shouldn't make any > difference at all for booting. Thanks, I am not familiar with this and thought, it might cause some troubles. Currently the Rock5B does boot now with the 6.7.4 upstream kernel, but ethernet does not work yet. I try to figure out how to get it working, then I will submit a patch. Thanks for your help and best regards, Kilian From yann.morin.1998 at free.fr Sat Feb 10 21:24:59 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:59 +0100 Subject: [Buildroot] [PATCH 6/6 v2] utils/checkpackagelib: add check for CPE variables set to default values In-Reply-To: References: Message-ID: Now that we can specify that the default values for the CPE_ID variables are valid, without having to actually set one (or more) to their default, add a check-package check that validates that the CPE_ID variables are indeed not set to their default. It also validates that CPE_ID_VALID is not set when another CPE_ID variable is set to a non-default value. Add an anchor in the manual so that we can easily point to it. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Cc: Ricardo Martincoski --- docs/manual/adding-packages-generic.adoc | 2 +- utils/checkpackagelib/lib_mk.py | 73 ++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index ce8608682f..9d365a10ca 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -511,7 +511,7 @@ LIBFOO_IGNORE_CVES += CVE-2020-12345 LIBFOO_IGNORE_CVES += CVE-2020-54321 ---------------------- -* +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the +* [[cpe-id]] +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the package to define its https://nvd.nist.gov/products/cpe[CPE identifier]. The available variables are: + diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index d340882971..ce2ab5157c 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -366,3 +366,76 @@ class VariableWithBraces(_CheckFunction): return ["{}:{}: use $() to delimit variables, not ${{}}" .format(self.filename, lineno), text] + + +class CPEVariables(_CheckFunction): + """ + Check that the values for the CPE variables are not the default. + - CPE_ID_* variables must not be set to their default + - CPE_ID_VALID must not be set if a non-default CPE_ID variable is set + """ + def before(self): + pkg, _ = os.path.splitext(os.path.basename(self.filename)) + self.CPE_fields_defaults = { + "VALID": "NO", + "PREFIX": "cpe:2.3:a", + "VENDOR": f"{pkg}_project", + "PRODUCT": pkg, + "VERSION": None, + "UPDATE": "*", + } + self.valid = None + self.non_defaults = 0 + self.CPE_FIELDS_RE = re.compile( + r"^\s*(.+_CPE_ID_({}))\s*=\s*(.+)$" + .format("|".join(self.CPE_fields_defaults)), + ) + self.VERSION_RE = re.compile( + rf"^(HOST_)?{pkg.upper().replace('-', '_')}_VERSION\s*=\s*(.+)$", + ) + self.COMMENT_RE = re.compile(r"^\s*#.*") + + def check_line(self, lineno, text): + text = self.COMMENT_RE.sub('', text.rstrip()) + + # WARNING! The VERSION_RE can _also_ match the same lines as CPE_FIELDS_RE, + # but not the other way around. So we must first check for CPE_FIELDS_RE, + # and if not matched, then and only then check for VERSION_RE. + match = self.CPE_FIELDS_RE.match(text) + if match: + var, field, val = match.groups() + return self._check_field(lineno, text, field, var, val) + + match = self.VERSION_RE.match(text) + if match: + self.CPE_fields_defaults["VERSION"] = match.groups()[1] + + def after(self): + # "VALID" counts in the non-defaults; so when "VALID" is present, + # 1 non-default means only "VALID" is present, so that's OK. + if self.valid and self.non_defaults > 1: + return ["{}:{}: 'YES' is implied when a non-default CPE_ID field is specified: {} ({}#cpe-id)".format( + self.filename, + self.valid["lineno"], + self.valid["text"], + self.url_to_manual, + )] + + def _check_field(self, lineno, text, field, var, val): + if field == "VERSION" and self.CPE_fields_defaults[field] is None: + return ["{}:{}: expecting package version to be set before CPE_ID_VERSION".format( + self.filename, + lineno, + )] + if val == self.CPE_fields_defaults[field]: + return ["{}:{}: '{}' is the default value for {} ({}#cpe-id)".format( + self.filename, + lineno, + val, + var, + self.url_to_manual, + )] + else: + if field == "VALID": + self.valid = {"lineno": lineno, "text": text} + self.non_defaults += 1 -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 10 21:24:54 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:54 +0100 Subject: [Buildroot] [PATCH 1/6 v2] utils/check-package: use https for the manual URL In-Reply-To: References: Message-ID: Signed-off-by: Yann E. MORIN --- utils/check-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/check-package b/utils/check-package index 105902303e..de41891b56 100755 --- a/utils/check-package +++ b/utils/check-package @@ -69,7 +69,7 @@ def parse_args(): help='override the default list of ignored warnings') parser.add_argument("--manual-url", action="store", - default="http://nightly.buildroot.org/", + default="https://nightly.buildroot.org/", help="default: %(default)s") parser.add_argument("--verbose", "-v", action="count", default=0) parser.add_argument("--quiet", "-q", action="count", default=0) -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 10 21:24:55 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:55 +0100 Subject: [Buildroot] [PATCH 2/6 v2] doc/manual: fixup ordered lists In-Reply-To: References: Message-ID: <62cf7f8a3ab7e42c2354cfa3881477d35ae5890d.1707600292.git.yann.morin.1998@free.fr> With recent asiidoc versions (at least 10.2.0 is known to report that), rendering the manual yields a few warnings related to ordered lists: asciidoc: WARNING: customize-quick-guide.adoc: line 13: list item index: expected 2 got 1 asciidoc: WARNING: customize-quick-guide.adoc: line 15: list item index: expected 3 got 1 [...] asciidoc: WARNING: customize-quick-guide.adoc: line 65: list item index: expected 13 got 1 asciidoc: WARNING: customize-quick-guide.adoc: line 66: list item index: expected 14 got 1 asciidoc: WARNING: adding-packages-gettext.adoc: line 30: list item index: expected 2 got 1 asciidoc: WARNING: adding-packages-gettext.adoc: line 41: list item index: expected 3 got 1 The reason is that we use the same index to tell asciidoc to automatically number items. However, the official way to provide an automatic index is to write no index: https://docs.asciidoctor.org/asciidoc/latest/lists/ordered/ [...] since the numbering is obvious, the AsciiDoc processor will insert the numbers for you if you omit them: [...] If you number the ordered list explicitly, you have to manually keep the list numerals sequential. Otherwise, you will get a warning. So, abide by the documentation, and drop the repeating indices to ordered lists where we want automatic numbering. Note that there is another ordered list, in adding-packages-directory.adoc, but it does use explicit, sequential numbering. For consistency within the whole document, we also convert it. To avoid extra useless churn, the indentation of the items is not changed to match the elided indices. Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-directory.adoc | 14 +++++------ docs/manual/adding-packages-gettext.adoc | 6 ++--- docs/manual/customize-quick-guide.adoc | 28 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index 03249ca06f..0b7221aae0 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -44,13 +44,13 @@ project after an empty line. As a convention specific to Buildroot, the ordering of the attributes is as follows: -1. The type of option: +bool+, +string+... with the prompt -2. If needed, the +default+ value(s) -3. Any dependencies on the target in +depends on+ form -4. Any dependencies on the toolchain in +depends on+ form -5. Any dependencies on other packages in +depends on+ form -6. Any dependency of the +select+ form -7. The help keyword and help text. +. The type of option: +bool+, +string+... with the prompt +. If needed, the +default+ value(s) +. Any dependencies on the target in +depends on+ form +. Any dependencies on the toolchain in +depends on+ form +. Any dependencies on other packages in +depends on+ form +. Any dependency of the +select+ form +. The help keyword and help text. You can add other sub-options into a +if BR2_PACKAGE_LIBFOO...endif+ statement to configure particular things in your software. You can look at diff --git a/docs/manual/adding-packages-gettext.adoc b/docs/manual/adding-packages-gettext.adoc index e9c6968e79..739bed25d5 100644 --- a/docs/manual/adding-packages-gettext.adoc +++ b/docs/manual/adding-packages-gettext.adoc @@ -23,11 +23,11 @@ Due to this, and in order to make sure that Native Language Support is properly handled, packages in Buildroot that can use NLS support should: -1. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This +. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This is done automatically for 'autotools' packages and therefore should only be done for packages using other package infrastructures. -1. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +_DEPENDENCIES+ variable. This addition should be done unconditionally: the value of this variable is automatically adjusted by the core infrastructure to contain the relevant list of @@ -38,7 +38,7 @@ should: also contains +gettext+ in order to get the full-blown 'gettext' implementation. -1. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that +. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that the package gets linked with +libintl+. This is generally not needed with 'autotools' packages as they usually detect automatically that they should link with +libintl+. However, diff --git a/docs/manual/customize-quick-guide.adoc b/docs/manual/customize-quick-guide.adoc index 627ecbacb1..315027c590 100644 --- a/docs/manual/customize-quick-guide.adoc +++ b/docs/manual/customize-quick-guide.adoc @@ -9,11 +9,11 @@ now summarize all this by providing step-by-step instructions to storing your project-specific customizations. Clearly, the steps that are not relevant to your project can be skipped. -1. +make menuconfig+ to configure toolchain, packages and kernel. -1. +make linux-menuconfig+ to update the kernel config, similar for +. +make menuconfig+ to configure toolchain, packages and kernel. +. +make linux-menuconfig+ to update the kernel config, similar for other configuration like busybox, uclibc, ... -1. +mkdir -p board//+ -1. Set the following options to +board///.config+ +. +mkdir -p board//+ +. Set the following options to +board///.config+ (as far as they are relevant): * +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+ * +BR2_PACKAGE_BUSYBOX_CONFIG+ @@ -21,7 +21,7 @@ your project can be skipped. * +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE+ -1. Write the configuration files: +. Write the configuration files: * +make linux-update-defconfig+ * +make busybox-update-config+ * +make uclibc-update-config+ @@ -29,38 +29,38 @@ your project can be skipped. board///at91bootstrap3.config+ * +make barebox-update-defconfig+ * +make uboot-update-defconfig+ -1. Create +board///rootfs-overlay/+ and fill it +. Create +board///rootfs-overlay/+ and fill it with additional files you need on your rootfs, e.g. +board///rootfs-overlay/etc/inittab+. Set +BR2_ROOTFS_OVERLAY+ to +board///rootfs-overlay+. -1. Create a post-build script +. Create a post-build script +board///post_build.sh+. Set +BR2_ROOTFS_POST_BUILD_SCRIPT+ to +board///post_build.sh+ -1. If additional setuid permissions have to be set or device nodes have +. If additional setuid permissions have to be set or device nodes have to be created, create +board///device_table.txt+ and add that path to +BR2_ROOTFS_DEVICE_TABLE+. -1. If additional user accounts have to be created, create +. If additional user accounts have to be created, create +board///users_table.txt+ and add that path to +BR2_ROOTFS_USERS_TABLES+. -1. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ +. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ to +board///patches/+ and add your patches for each package in a subdirectory named after the package. Each patch should be called +--.patch+. -1. Specifically for the Linux kernel, there also exists the option +. Specifically for the Linux kernel, there also exists the option +BR2_LINUX_KERNEL_PATCH+ with as main advantage that it can also download patches from a URL. If you do not need this, +BR2_GLOBAL_PATCH_DIR+ is preferred. U-Boot, Barebox, at91bootstrap and at91bootstrap3 also have separate options, but these do not provide any advantage over +BR2_GLOBAL_PATCH_DIR+ and will likely be removed in the future. -1. If you need to add project-specific packages, create +. If you need to add project-specific packages, create +package//+ and place your packages in that directory. Create an overall +.mk+ file that includes the +.mk+ files of all your packages. Create an overall +Config.in+ file that sources the +Config.in+ files of all your packages. Include this +Config.in+ file from Buildroot's +package/Config.in+ file. -1. +make savedefconfig+ to save the buildroot configuration. -1. +cp defconfig configs/_defconfig+ +. +make savedefconfig+ to save the buildroot configuration. +. +cp defconfig configs/_defconfig+ -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 10 21:24:56 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:56 +0100 Subject: [Buildroot] [PATCH 0/6 v2] utils/checkpackagelib: check CPE variables (branch yem/checkpkg-cpe) Message-ID: Hello All! This series removes superfluous CPE variables that are set to their default values, replaces them with the specific _CPE_VALID one, and eventually adds a check-package test that ensures none crop in back in the future. The series also includes a few preliminary cleanups and fixes. Cha?es v1 -> v2: - drop applied patches - use CPE_ID_VALID to assert the defaults are valid - manual cleanups - https URL! Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (6): utils/check-package: use https for the manual URL doc/manual: fixup ordered lists doc/manual: indent the CVE example the same as the CVE list item doc/manual: document _CPE_ID_VALID package: switch to _CPE_ID_VALID utils/checkpackagelib: add check for CPE variables set to default values docs/manual/adding-packages-directory.adoc | 14 ++--- docs/manual/adding-packages-generic.adoc | 8 ++- docs/manual/adding-packages-gettext.adoc | 6 +- docs/manual/customize-quick-guide.adoc | 28 ++++----- package/acl/acl.mk | 2 +- package/asn1c/asn1c.mk | 2 +- package/atftp/atftp.mk | 2 +- package/atop/atop.mk | 2 +- package/attr/attr.mk | 2 +- package/axel/axel.mk | 2 +- package/bdwgc/bdwgc.mk | 2 +- package/beecrypt/beecrypt.mk | 2 +- package/blktrace/blktrace.mk | 2 +- package/botan/botan.mk | 2 +- package/bwm-ng/bwm-ng.mk | 2 +- package/c-icap/c-icap.mk | 2 +- package/c-periphery/c-periphery.mk | 2 +- package/cgroupfs-mount/cgroupfs-mount.mk | 2 +- package/civetweb/civetweb.mk | 2 +- package/cjson/cjson.mk | 2 +- package/cmake/cmake.mk | 2 +- package/cracklib/cracklib.mk | 2 +- package/crun/crun.mk | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- package/cups-pk-helper/cups-pk-helper.mk | 2 +- package/darkhttpd/darkhttpd.mk | 2 +- package/dbus-broker/dbus-broker.mk | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- package/dosfstools/dosfstools.mk | 2 +- package/dracut/dracut.mk | 2 +- package/dtc/dtc.mk | 2 +- package/duktape/duktape.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 2 +- package/elfutils/elfutils.mk | 2 +- package/exempi/exempi.mk | 2 +- package/exfat/exfat.mk | 2 +- package/f2fs-tools/f2fs-tools.mk | 2 +- package/feh/feh.mk | 2 +- package/file/file.mk | 2 +- package/flac/flac.mk | 2 +- package/fontconfig/fontconfig.mk | 2 +- package/giflib/giflib.mk | 2 +- package/gnuplot/gnuplot.mk | 2 +- package/gpsd/gpsd.mk | 2 +- package/gutenprint/gutenprint.mk | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- package/haserl/haserl.mk | 2 +- package/heimdal/heimdal.mk | 2 +- package/i2c-tools/i2c-tools.mk | 2 +- package/ipmitool/ipmitool.mk | 2 +- package/iproute2/iproute2.mk | 2 +- package/iputils/iputils.mk | 2 +- package/iucode-tool/iucode-tool.mk | 2 +- package/jansson/jansson.mk | 2 +- package/jasper/jasper.mk | 2 +- package/jhead/jhead.mk | 2 +- package/jq/jq.mk | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- package/jszip/jszip.mk | 2 +- package/keyutils/keyutils.mk | 2 +- package/kvmtool/kvmtool.mk | 2 +- package/lame/lame.mk | 2 +- package/lapack/lapack.mk | 2 +- package/lftp/lftp.mk | 2 +- package/libaio/libaio.mk | 2 +- package/libass/libass.mk | 2 +- package/libatomic_ops/libatomic_ops.mk | 2 +- package/libbpf/libbpf.mk | 2 +- package/libcap-ng/libcap-ng.mk | 2 +- package/libcap/libcap.mk | 2 +- package/libcgroup/libcgroup.mk | 2 +- package/libconfuse/libconfuse.mk | 2 +- package/libdaemon/libdaemon.mk | 2 +- package/libesmtp/libesmtp.mk | 2 +- package/libevent/libevent.mk | 2 +- package/libexif/libexif.mk | 2 +- package/libffi/libffi.mk | 2 +- package/libfuse/libfuse.mk | 2 +- package/libgit2/libgit2.mk | 2 +- package/libical/libical.mk | 2 +- package/libjxl/libjxl.mk | 2 +- package/libmms/libmms.mk | 2 +- package/libnet/libnet.mk | 2 +- package/libnids/libnids.mk | 2 +- package/libnl/libnl.mk | 2 +- package/libqmi/libqmi.mk | 2 +- package/librsync/librsync.mk | 2 +- package/libsamplerate/libsamplerate.mk | 2 +- package/libseccomp/libseccomp.mk | 2 +- package/libsndfile/libsndfile.mk | 2 +- package/libtirpc/libtirpc.mk | 2 +- package/libunwind/libunwind.mk | 2 +- package/libupnp/libupnp.mk | 2 +- package/libvncserver/libvncserver.mk | 2 +- package/linuxptp/linuxptp.mk | 2 +- package/lldpd/lldpd.mk | 2 +- package/logrotate/logrotate.mk | 2 +- package/lrzsz/lrzsz.mk | 2 +- package/lsof/lsof.mk | 2 +- package/lynx/lynx.mk | 2 +- package/lz4/lz4.mk | 2 +- package/lzo/lzo.mk | 2 +- package/matio/matio.mk | 2 +- package/mdadm/mdadm.mk | 2 +- package/minicom/minicom.mk | 2 +- package/motion/motion.mk | 2 +- package/ncmpc/ncmpc.mk | 2 +- package/net-tools/net-tools.mk | 2 +- package/netcat/netcat.mk | 2 +- package/nettle/nettle.mk | 2 +- package/oniguruma/oniguruma.mk | 2 +- package/open-iscsi/open-iscsi.mk | 2 +- package/openblas/openblas.mk | 2 +- package/openrc/openrc.mk | 2 +- package/openresolv/openresolv.mk | 2 +- package/opensc/opensc.mk | 2 +- package/p11-kit/p11-kit.mk | 2 +- package/parted/parted.mk | 2 +- package/pcmanfm/pcmanfm.mk | 2 +- package/picocom/picocom.mk | 2 +- package/polkit/polkit.mk | 2 +- package/popt/popt.mk | 2 +- package/powerpc-utils/powerpc-utils.mk | 2 +- package/procps-ng/procps-ng.mk | 2 +- package/protobuf-c/protobuf-c.mk | 2 +- package/proxychains-ng/proxychains-ng.mk | 2 +- package/pugixml/pugixml.mk | 2 +- package/pwgen/pwgen.mk | 2 +- package/python-ecdsa/python-ecdsa.mk | 2 +- package/python-engineio/python-engineio.mk | 2 +- package/python-markdown2/python-markdown2.mk | 2 +- package/python-rsa/python-rsa.mk | 2 +- package/qdecoder/qdecoder.mk | 2 +- package/qpdf/qpdf.mk | 2 +- package/quazip/quazip.mk | 2 +- package/quickjs/quickjs.mk | 2 +- package/rabbitmq-c/rabbitmq-c.mk | 2 +- package/rhash/rhash.mk | 2 +- package/ripgrep/ripgrep.mk | 2 +- package/rng-tools/rng-tools.mk | 2 +- package/rp-pppoe/rp-pppoe.mk | 2 +- package/rpcbind/rpcbind.mk | 2 +- package/rtl_433/rtl_433.mk | 2 +- package/rtmpdump/rtmpdump.mk | 2 +- package/sane-backends/sane-backends.mk | 2 +- package/shellinabox/shellinabox.mk | 2 +- package/spice/spice.mk | 2 +- package/squashfs/squashfs.mk | 2 +- package/sslh/sslh.mk | 2 +- package/strace/strace.mk | 2 +- package/sylpheed/sylpheed.mk | 2 +- package/sysklogd/sysklogd.mk | 2 +- package/sysstat/sysstat.mk | 2 +- package/systemd/systemd.mk | 2 +- package/sysvinit/sysvinit.mk | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- package/tclap/tclap.mk | 2 +- package/tini/tini.mk | 2 +- package/tinyproxy/tinyproxy.mk | 2 +- package/tinyxml/tinyxml.mk | 2 +- package/tinyxml2/tinyxml2.mk | 2 +- package/tmux/tmux.mk | 2 +- package/tpm2-tools/tpm2-tools.mk | 2 +- package/trinity/trinity.mk | 2 +- package/unzip/unzip.mk | 2 +- package/upx/upx.mk | 2 +- package/usbguard/usbguard.mk | 2 +- package/valijson/valijson.mk | 2 +- package/vsftpd/vsftpd.mk | 2 +- package/x11vnc/x11vnc.mk | 2 +- package/xscreensaver/xscreensaver.mk | 2 +- package/yajl/yajl.mk | 2 +- package/yaml-cpp/yaml-cpp.mk | 2 +- package/zbar/zbar.mk | 2 +- package/zlog/zlog.mk | 2 +- package/zziplib/zziplib.mk | 2 +- utils/check-package | 2 +- utils/checkpackagelib/lib_mk.py | 73 ++++++++++++++++++++++ 179 files changed, 277 insertions(+), 200 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Feb 10 21:24:56 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:56 +0100 Subject: [Buildroot] [PATCH 3/6 v2] doc/manual: indent the CVE example the same as the CVE list item In-Reply-To: References: Message-ID: Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- docs/manual/adding-packages-generic.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 76b037f436..935270a19c 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -503,7 +503,7 @@ not and can not work as people would expect it should: the package, or when the CVE for some reason does not affect the Buildroot package. A Makefile comment must always precede the addition of a CVE to this variable. Example: - ++ ---------------------- # 0001-fix-cve-2020-12345.patch LIBFOO_IGNORE_CVES += CVE-2020-12345 -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 10 21:24:57 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:57 +0100 Subject: [Buildroot] [PATCH 4/6 v2] doc/manual: document _CPE_ID_VALID In-Reply-To: References: Message-ID: The way we handle CPE_ID variable is unsual compared to the other variables: we mostly compute defaults for all of them, and eventually aggregate the various CPE_ID variables to form the CPE ID name. However, we do not consider that CPE ID to valid, unless there is one (or more) CPE_ID variables actually set by the package; this shows that the CPE ID has been checked to be valid against the NVD CPE database. In that situation, we internally define the duly undocumented _CPE_ID_VALID variable. However, it is totally possible (and very often the case) that the default value we set to those variables are appropriate, and do defne a valid CPE ID. In this case, the package will define any arbitrary CPE_ID variable to its default value, usually by setting either the VENDOR or PRODUCT field, though there is no rule or requirement that be the case. This is not very clean, non-obvious, and does not allow for easily adding checks in check-package. Add the _CPE_ID_VALID variable to the manual, to make it official that it should be used when the default values of the others are valid. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- docs/manual/adding-packages-generic.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 935270a19c..ce8608682f 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -516,6 +516,10 @@ LIBFOO_IGNORE_CVES += CVE-2020-54321 identifier]. The available variables are: + -- +** +LIBFOO_CPE_ID_VALID+, if set to +YES+, specifies that the default + values for each of the following variables is appropriate, and + generates a valid CPE ID. + ** +LIBFOO_CPE_ID_PREFIX+, specifies the prefix of the CPE identifier, i.e the first three fields. When not defined, the default value is +cpe:2.3:a+. -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 10 21:24:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:58 +0100 Subject: [Buildroot] [PATCH 5/6 v2] package: switch to _CPE_ID_VALID In-Reply-To: References: Message-ID: Now that we document _CPE_ID_VALID, and that it shall be used instead of setting a default value to one of the other _CPE_ID_* variables, change all of the existing packages to use it, to avoid any error when we later extend check-package to validate the sanity ofthe _CPE_ID_* variables. Mechanical change done within the reference container, running the new check in check-package, to report the CPE_ID errors: $ make check-package 2>/dev/null \ |awk '{ split($(1), a, ":"); fname = a[1] split($(2), a, "'\''"); val = a[2] new_var = $(8); gsub("_CPE_ID_.*", "_CPE_ID_VALID", new_var) printf("%s %s %s %s\n", fname, $(8), val, new_var) }' \ |while read fname var val new_var; do sed -r -i -e "s/${var}[[:space:]]*=[[:space:]]*${val}/${new_var} = YES/" "${fname}" done $ git diff -I'CPE_ID_(VENDOR|VALID)' [empty] Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- package/acl/acl.mk | 2 +- package/asn1c/asn1c.mk | 2 +- package/atftp/atftp.mk | 2 +- package/atop/atop.mk | 2 +- package/attr/attr.mk | 2 +- package/axel/axel.mk | 2 +- package/bdwgc/bdwgc.mk | 2 +- package/beecrypt/beecrypt.mk | 2 +- package/blktrace/blktrace.mk | 2 +- package/botan/botan.mk | 2 +- package/bwm-ng/bwm-ng.mk | 2 +- package/c-icap/c-icap.mk | 2 +- package/c-periphery/c-periphery.mk | 2 +- package/cgroupfs-mount/cgroupfs-mount.mk | 2 +- package/civetweb/civetweb.mk | 2 +- package/cjson/cjson.mk | 2 +- package/cmake/cmake.mk | 2 +- package/cracklib/cracklib.mk | 2 +- package/crun/crun.mk | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- package/cups-pk-helper/cups-pk-helper.mk | 2 +- package/darkhttpd/darkhttpd.mk | 2 +- package/dbus-broker/dbus-broker.mk | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- package/dosfstools/dosfstools.mk | 2 +- package/dracut/dracut.mk | 2 +- package/dtc/dtc.mk | 2 +- package/duktape/duktape.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 2 +- package/elfutils/elfutils.mk | 2 +- package/exempi/exempi.mk | 2 +- package/exfat/exfat.mk | 2 +- package/f2fs-tools/f2fs-tools.mk | 2 +- package/feh/feh.mk | 2 +- package/file/file.mk | 2 +- package/flac/flac.mk | 2 +- package/fontconfig/fontconfig.mk | 2 +- package/giflib/giflib.mk | 2 +- package/gnuplot/gnuplot.mk | 2 +- package/gpsd/gpsd.mk | 2 +- package/gutenprint/gutenprint.mk | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- package/haserl/haserl.mk | 2 +- package/heimdal/heimdal.mk | 2 +- package/i2c-tools/i2c-tools.mk | 2 +- package/ipmitool/ipmitool.mk | 2 +- package/iproute2/iproute2.mk | 2 +- package/iputils/iputils.mk | 2 +- package/iucode-tool/iucode-tool.mk | 2 +- package/jansson/jansson.mk | 2 +- package/jasper/jasper.mk | 2 +- package/jhead/jhead.mk | 2 +- package/jq/jq.mk | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- package/jszip/jszip.mk | 2 +- package/keyutils/keyutils.mk | 2 +- package/kvmtool/kvmtool.mk | 2 +- package/lame/lame.mk | 2 +- package/lapack/lapack.mk | 2 +- package/lftp/lftp.mk | 2 +- package/libaio/libaio.mk | 2 +- package/libass/libass.mk | 2 +- package/libatomic_ops/libatomic_ops.mk | 2 +- package/libbpf/libbpf.mk | 2 +- package/libcap-ng/libcap-ng.mk | 2 +- package/libcap/libcap.mk | 2 +- package/libcgroup/libcgroup.mk | 2 +- package/libconfuse/libconfuse.mk | 2 +- package/libdaemon/libdaemon.mk | 2 +- package/libesmtp/libesmtp.mk | 2 +- package/libevent/libevent.mk | 2 +- package/libexif/libexif.mk | 2 +- package/libffi/libffi.mk | 2 +- package/libfuse/libfuse.mk | 2 +- package/libgit2/libgit2.mk | 2 +- package/libical/libical.mk | 2 +- package/libjxl/libjxl.mk | 2 +- package/libmms/libmms.mk | 2 +- package/libnet/libnet.mk | 2 +- package/libnids/libnids.mk | 2 +- package/libnl/libnl.mk | 2 +- package/libqmi/libqmi.mk | 2 +- package/librsync/librsync.mk | 2 +- package/libsamplerate/libsamplerate.mk | 2 +- package/libseccomp/libseccomp.mk | 2 +- package/libsndfile/libsndfile.mk | 2 +- package/libtirpc/libtirpc.mk | 2 +- package/libunwind/libunwind.mk | 2 +- package/libupnp/libupnp.mk | 2 +- package/libvncserver/libvncserver.mk | 2 +- package/linuxptp/linuxptp.mk | 2 +- package/lldpd/lldpd.mk | 2 +- package/logrotate/logrotate.mk | 2 +- package/lrzsz/lrzsz.mk | 2 +- package/lsof/lsof.mk | 2 +- package/lynx/lynx.mk | 2 +- package/lz4/lz4.mk | 2 +- package/lzo/lzo.mk | 2 +- package/matio/matio.mk | 2 +- package/mdadm/mdadm.mk | 2 +- package/minicom/minicom.mk | 2 +- package/motion/motion.mk | 2 +- package/ncmpc/ncmpc.mk | 2 +- package/net-tools/net-tools.mk | 2 +- package/netcat/netcat.mk | 2 +- package/nettle/nettle.mk | 2 +- package/oniguruma/oniguruma.mk | 2 +- package/open-iscsi/open-iscsi.mk | 2 +- package/openblas/openblas.mk | 2 +- package/openrc/openrc.mk | 2 +- package/openresolv/openresolv.mk | 2 +- package/opensc/opensc.mk | 2 +- package/p11-kit/p11-kit.mk | 2 +- package/parted/parted.mk | 2 +- package/pcmanfm/pcmanfm.mk | 2 +- package/picocom/picocom.mk | 2 +- package/polkit/polkit.mk | 2 +- package/popt/popt.mk | 2 +- package/powerpc-utils/powerpc-utils.mk | 2 +- package/procps-ng/procps-ng.mk | 2 +- package/protobuf-c/protobuf-c.mk | 2 +- package/proxychains-ng/proxychains-ng.mk | 2 +- package/pugixml/pugixml.mk | 2 +- package/pwgen/pwgen.mk | 2 +- package/python-ecdsa/python-ecdsa.mk | 2 +- package/python-engineio/python-engineio.mk | 2 +- package/python-markdown2/python-markdown2.mk | 2 +- package/python-rsa/python-rsa.mk | 2 +- package/qdecoder/qdecoder.mk | 2 +- package/qpdf/qpdf.mk | 2 +- package/quazip/quazip.mk | 2 +- package/quickjs/quickjs.mk | 2 +- package/rabbitmq-c/rabbitmq-c.mk | 2 +- package/rhash/rhash.mk | 2 +- package/ripgrep/ripgrep.mk | 2 +- package/rng-tools/rng-tools.mk | 2 +- package/rp-pppoe/rp-pppoe.mk | 2 +- package/rpcbind/rpcbind.mk | 2 +- package/rtl_433/rtl_433.mk | 2 +- package/rtmpdump/rtmpdump.mk | 2 +- package/sane-backends/sane-backends.mk | 2 +- package/shellinabox/shellinabox.mk | 2 +- package/spice/spice.mk | 2 +- package/squashfs/squashfs.mk | 2 +- package/sslh/sslh.mk | 2 +- package/strace/strace.mk | 2 +- package/sylpheed/sylpheed.mk | 2 +- package/sysklogd/sysklogd.mk | 2 +- package/sysstat/sysstat.mk | 2 +- package/systemd/systemd.mk | 2 +- package/sysvinit/sysvinit.mk | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- package/tclap/tclap.mk | 2 +- package/tini/tini.mk | 2 +- package/tinyproxy/tinyproxy.mk | 2 +- package/tinyxml/tinyxml.mk | 2 +- package/tinyxml2/tinyxml2.mk | 2 +- package/tmux/tmux.mk | 2 +- package/tpm2-tools/tpm2-tools.mk | 2 +- package/trinity/trinity.mk | 2 +- package/unzip/unzip.mk | 2 +- package/upx/upx.mk | 2 +- package/usbguard/usbguard.mk | 2 +- package/valijson/valijson.mk | 2 +- package/vsftpd/vsftpd.mk | 2 +- package/x11vnc/x11vnc.mk | 2 +- package/xscreensaver/xscreensaver.mk | 2 +- package/yajl/yajl.mk | 2 +- package/yaml-cpp/yaml-cpp.mk | 2 +- package/zbar/zbar.mk | 2 +- package/zlog/zlog.mk | 2 +- package/zziplib/zziplib.mk | 2 +- 173 files changed, 173 insertions(+), 173 deletions(-) diff --git a/package/acl/acl.mk b/package/acl/acl.mk index a5371e1aea..6ae0581ef5 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -9,7 +9,7 @@ ACL_SOURCE = acl-$(ACL_VERSION).tar.xz ACL_SITE = https://download.savannah.nongnu.org/releases/acl ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL -ACL_CPE_ID_VENDOR = acl_project +ACL_CPE_ID_VALID = YES ACL_DEPENDENCIES = attr HOST_ACL_DEPENDENCIES = host-attr diff --git a/package/asn1c/asn1c.mk b/package/asn1c/asn1c.mk index a5fb9ccf1b..e76a9f84fd 100644 --- a/package/asn1c/asn1c.mk +++ b/package/asn1c/asn1c.mk @@ -8,6 +8,6 @@ ASN1C_VERSION = 0.9.28 ASN1C_SITE = https://github.com/vlm/asn1c/releases/download/v$(ASN1C_VERSION) ASN1C_LICENSE = BSD-2-Clause ASN1C_LICENSE_FILES = LICENSE -ASN1C_CPE_ID_VENDOR = asn1c_project +ASN1C_CPE_ID_VALID = YES $(eval $(host-autotools-package)) diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk index 288501bc11..d41178cac4 100644 --- a/package/atftp/atftp.mk +++ b/package/atftp/atftp.mk @@ -8,7 +8,7 @@ ATFTP_VERSION = 0.8.0 ATFTP_SITE = http://sourceforge.net/projects/atftp/files ATFTP_LICENSE = GPL-2.0+ ATFTP_LICENSE_FILES = LICENSE -ATFTP_CPE_ID_VENDOR = atftp_project +ATFTP_CPE_ID_VALID = YES ATFTP_SELINUX_MODULES = tftp # No configure in tarball ATFTP_AUTORECONF = YES diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 6a0ff3a0d1..27cd537f64 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -8,7 +8,7 @@ ATOP_VERSION = 2.9.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING -ATOP_CPE_ID_VENDOR = atop_project +ATOP_CPE_ID_VALID = YES ATOP_DEPENDENCIES = ncurses zlib ATOP_CFLAGS = $(TARGET_CFLAGS) diff --git a/package/attr/attr.mk b/package/attr/attr.mk index 6ecf5c53f4..d1397921ff 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -9,7 +9,7 @@ ATTR_SOURCE = attr-$(ATTR_VERSION).tar.xz ATTR_SITE = http://download.savannah.gnu.org/releases/attr ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL -ATTR_CPE_ID_VENDOR = attr_project +ATTR_CPE_ID_VALID = YES ATTR_INSTALL_STAGING = YES diff --git a/package/axel/axel.mk b/package/axel/axel.mk index fbfbc8be34..90e5156e06 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -9,7 +9,7 @@ AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/ AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ AXEL_LICENSE_FILES = COPYING -AXEL_CPE_ID_VENDOR = axel_project +AXEL_CPE_ID_VALID = YES AXEL_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk index bff703ee98..0e9c9d849c 100644 --- a/package/bdwgc/bdwgc.mk +++ b/package/bdwgc/bdwgc.mk @@ -10,7 +10,7 @@ BDWGC_SITE = https://github.com/ivmai/bdwgc/releases/download/v$(BDWGC_VERSION) BDWGC_INSTALL_STAGING = YES BDWGC_LICENSE = bdwgc license BDWGC_LICENSE_FILES = README.QUICK -BDWGC_CPE_ID_VENDOR = bdwgc_project +BDWGC_CPE_ID_VALID = YES BDWGC_DEPENDENCIES = libatomic_ops host-pkgconf HOST_BDWGC_DEPENDENCIES = host-libatomic_ops host-pkgconf diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk index 78c3c2ebb1..20e1a122d0 100644 --- a/package/beecrypt/beecrypt.mk +++ b/package/beecrypt/beecrypt.mk @@ -10,7 +10,7 @@ BEECRYPT_AUTORECONF = YES BEECRYPT_INSTALL_STAGING = YES BEECRYPT_LICENSE = LGPL-2.1+ BEECRYPT_LICENSE_FILES = COPYING.LIB -BEECRYPT_CPE_ID_VENDOR = beecrypt_project +BEECRYPT_CPE_ID_VALID = YES BEECRYPT_CONF_OPTS = \ --disable-expert-mode \ diff --git a/package/blktrace/blktrace.mk b/package/blktrace/blktrace.mk index d66a35227e..90038fc788 100644 --- a/package/blktrace/blktrace.mk +++ b/package/blktrace/blktrace.mk @@ -10,7 +10,7 @@ BLKTRACE_SITE = http://brick.kernel.dk/snaps BLKTRACE_DEPENDENCIES = libaio BLKTRACE_LICENSE = GPL-2.0+ BLKTRACE_LICENSE_FILES = COPYING -BLKTRACE_CPE_ID_VENDOR = blktrace_project +BLKTRACE_CPE_ID_VALID = YES define BLKTRACE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 74cf6175dd..b933e99785 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -9,7 +9,7 @@ BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause BOTAN_LICENSE_FILES = license.txt -BOTAN_CPE_ID_VENDOR = botan_project +BOTAN_CPE_ID_VALID = YES BOTAN_INSTALL_STAGING = YES diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk index bf3ed74afc..31edda0c23 100644 --- a/package/bwm-ng/bwm-ng.mk +++ b/package/bwm-ng/bwm-ng.mk @@ -9,7 +9,7 @@ BWM_NG_SITE = $(call github,vgropp,bwm-ng,v$(BWM_NG_VERSION)) BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats BWM_NG_LICENSE = GPL-2.0+ BWM_NG_LICENSE_FILES = COPYING -BWM_NG_CPE_ID_VENDOR = bwm-ng_project +BWM_NG_CPE_ID_VALID = YES BWM_NG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_NCURSES),y) diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk index 707069870d..36ef1c8b12 100644 --- a/package/c-icap/c-icap.mk +++ b/package/c-icap/c-icap.mk @@ -9,7 +9,7 @@ C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ C_ICAP_LICENSE_FILES = COPYING -C_ICAP_CPE_ID_VENDOR = c-icap_project +C_ICAP_CPE_ID_VALID = YES C_ICAP_INSTALL_STAGING = YES C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config C_ICAP_CONF_OPTS = \ diff --git a/package/c-periphery/c-periphery.mk b/package/c-periphery/c-periphery.mk index 367ac319b3..e3745c4af6 100644 --- a/package/c-periphery/c-periphery.mk +++ b/package/c-periphery/c-periphery.mk @@ -9,6 +9,6 @@ C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,v$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES C_PERIPHERY_LICENSE = MIT C_PERIPHERY_LICENSE_FILES = LICENSE -C_PERIPHERY_CPE_ID_VENDOR = c-periphery_project +C_PERIPHERY_CPE_ID_VALID = YES $(eval $(cmake-package)) diff --git a/package/cgroupfs-mount/cgroupfs-mount.mk b/package/cgroupfs-mount/cgroupfs-mount.mk index acf7442056..5af87629ea 100644 --- a/package/cgroupfs-mount/cgroupfs-mount.mk +++ b/package/cgroupfs-mount/cgroupfs-mount.mk @@ -8,7 +8,7 @@ CGROUPFS_MOUNT_VERSION = 1.4 CGROUPFS_MOUNT_SITE = $(call github,tianon,cgroupfs-mount,$(CGROUPFS_MOUNT_VERSION)) CGROUPFS_MOUNT_LICENSE = GPL-3.0+ CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright -CGROUPFS_MOUNT_CPE_ID_VENDOR = cgroupfs-mount_project +CGROUPFS_MOUNT_CPE_ID_VALID = YES define CGROUPFS_MOUNT_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/cgroupfs-mount $(TARGET_DIR)/usr/bin/cgroupfs-mount diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index 633ae21c00..629c1b59b2 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -8,7 +8,7 @@ CIVETWEB_VERSION = 1.16 CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION)) CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md -CIVETWEB_CPE_ID_VENDOR = civetweb_project +CIVETWEB_CPE_ID_VALID = YES CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \ $(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1) diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index f699c160ef..4719a3dc9b 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -9,7 +9,7 @@ CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE -CJSON_CPE_ID_VENDOR = cjson_project +CJSON_CPE_ID_VALID = YES # Set ENABLE_CUSTOM_COMPILER_FLAGS to OFF in particular to disable # -fstack-protector-strong which depends on BR2_TOOLCHAIN_HAS_SSP CJSON_CONF_OPTS += \ diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index f56be9ba5c..23d00b95c5 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -10,7 +10,7 @@ CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt -CMAKE_CPE_ID_VENDOR = cmake_project +CMAKE_CPE_ID_VALID = YES # Tool download MITM attack warning if using npm package to install cmake CMAKE_IGNORE_CVES = CVE-2016-10642 diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index c1834b4730..c5226b3326 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -9,7 +9,7 @@ CRACKLIB_SOURCE = cracklib-$(CRACKLIB_VERSION).tar.xz CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/v$(CRACKLIB_VERSION) CRACKLIB_LICENSE = LGPL-2.1 CRACKLIB_LICENSE_FILES = COPYING.LIB -CRACKLIB_CPE_ID_VENDOR = cracklib_project +CRACKLIB_CPE_ID_VALID = YES CRACKLIB_INSTALL_STAGING = YES CRACKLIB_DEPENDENCIES = host-cracklib $(TARGET_NLS_DEPENDENCIES) CRACKLIB_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/crun/crun.mk b/package/crun/crun.mk index a6088c13a0..005d5fb397 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -10,7 +10,7 @@ CRUN_DEPENDENCIES = host-pkgconf yajl CRUN_LICENSE = GPL-2.0+ (crun binary), LGPL-2.1+ (libcrun) CRUN_LICENSE_FILES = COPYING COPYING.libcrun -CRUN_CPE_ID_VENDOR = crun_project +CRUN_CPE_ID_VALID = YES CRUN_AUTORECONF = YES CRUN_CONF_OPTS = --disable-embedded-yajl diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 1b181e1b75..d17de96143 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -15,7 +15,7 @@ CRYPTSETUP_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL -CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project +CRYPTSETUP_CPE_ID_VALID = YES CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" diff --git a/package/cups-pk-helper/cups-pk-helper.mk b/package/cups-pk-helper/cups-pk-helper.mk index 2bd00c6912..2e057c2de0 100644 --- a/package/cups-pk-helper/cups-pk-helper.mk +++ b/package/cups-pk-helper/cups-pk-helper.mk @@ -9,7 +9,7 @@ CUPS_PK_HELPER_SITE = https://www.freedesktop.org/software/cups-pk-helper/releas CUPS_PK_HELPER_SOURCE = cups-pk-helper-$(CUPS_PK_HELPER_VERSION).tar.xz CUPS_PK_HELPER_LICENSE = GPL-2.0+ CUPS_PK_HELPER_LICENSE_FILES = COPYING -CUPS_PK_HELPER_CPE_ID_VENDOR = cups-pk-helper_project +CUPS_PK_HELPER_CPE_ID_VALID = YES CUPS_PK_HELPER_DEPENDENCIES = cups libglib2 polkit $(eval $(meson-package)) diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index e13f8f7770..956ef4042c 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -8,7 +8,7 @@ DARKHTTPD_VERSION = 1.15 DARKHTTPD_SITE = $(call github,emikulic,darkhttpd,v$(DARKHTTPD_VERSION)) DARKHTTPD_LICENSE = ISC DARKHTTPD_LICENSE_FILES = COPYING -DARKHTTPD_CPE_ID_VENDOR = darkhttpd_project +DARKHTTPD_CPE_ID_VALID = YES define DARKHTTPD_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index c4e3679a2e..4266441ac9 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -23,7 +23,7 @@ DBUS_BROKER_LICENSE_FILES = \ subprojects/libcstdaux-1/AUTHORS subprojects/libcstdaux-1/README.md \ subprojects/libcutf8-1/AUTHORS subprojects/libcutf8-1/README.md -DBUS_BROKER_CPE_ID_VENDOR = dbus-broker_project +DBUS_BROKER_CPE_ID_VALID = YES DBUS_BROKER_DEPENDENCIES = expat systemd DBUS_BROKER_CONF_OPTS = -Dlauncher=true diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index ab3f98dd5a..991c5cca57 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -10,7 +10,7 @@ DHCPCD_SITE = https://github.com/NetworkConfiguration/dhcpcd/releases/download/v DHCPCD_DEPENDENCIES = host-pkgconf DHCPCD_LICENSE = BSD-2-Clause DHCPCD_LICENSE_FILES = LICENSE -DHCPCD_CPE_ID_VENDOR = dhcpcd_project +DHCPCD_CPE_ID_VALID = YES DHCPCD_CONFIG_OPTS = \ --libexecdir=/lib/dhcpcd \ diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk index 26a28670c0..5019bd125d 100644 --- a/package/dosfstools/dosfstools.mk +++ b/package/dosfstools/dosfstools.mk @@ -8,7 +8,7 @@ DOSFSTOOLS_VERSION = 4.2 DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION) DOSFSTOOLS_LICENSE = GPL-3.0+ DOSFSTOOLS_LICENSE_FILES = COPYING -DOSFSTOOLS_CPE_ID_VENDOR = dosfstools_project +DOSFSTOOLS_CPE_ID_VALID = YES DOSFSTOOLS_SELINUX_MODULES = fstools DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/ HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk index 1de11d208d..8573e64055 100644 --- a/package/dracut/dracut.mk +++ b/package/dracut/dracut.mk @@ -8,7 +8,7 @@ DRACUT_VERSION = 059 DRACUT_SITE = $(call github,dracutdevs,dracut,$(DRACUT_VERSION)) DRACUT_LICENSE = GPL-2.0 DRACUT_LICENSE_FILES = COPYING -DRACUT_CPE_ID_VENDOR = dracut_project +DRACUT_CPE_ID_VALID = YES HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-prelink-cross diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk index ff3ed49b37..5868ae0e5a 100644 --- a/package/dtc/dtc.mk +++ b/package/dtc/dtc.mk @@ -9,7 +9,7 @@ DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz DTC_SITE = https://www.kernel.org/pub/software/utils/dtc DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library) DTC_LICENSE_FILES = README.license GPL BSD-2-Clause -DTC_CPE_ID_VENDOR = dtc_project +DTC_CPE_ID_VALID = YES DTC_INSTALL_STAGING = YES DTC_DEPENDENCIES = host-bison host-flex host-pkgconf HOST_DTC_DEPENDENCIES = host-bison host-flex host-pkgconf diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index 9b5fb65f06..59fc17f7ed 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -11,7 +11,7 @@ DUKTAPE_SITE = \ DUKTAPE_LICENSE = MIT DUKTAPE_LICENSE_FILES = LICENSE.txt DUKTAPE_INSTALL_STAGING = YES -DUKTAPE_CPE_ID_VENDOR = duktape_project +DUKTAPE_CPE_ID_VALID = YES define DUKTAPE_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f Makefile.sharedlibrary diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 7491f4c067..cbaac4f40b 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -9,7 +9,7 @@ E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h -E2FSPROGS_CPE_ID_VENDOR = e2fsprogs_project +E2FSPROGS_CPE_ID_VALID = YES E2FSPROGS_INSTALL_STAGING = YES # Use libblkid and libuuid from util-linux for host and target packages. diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index d43b545f2f..521c37a776 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -10,7 +10,7 @@ ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 -ELFUTILS_CPE_ID_VENDOR = elfutils_project +ELFUTILS_CPE_ID_VALID = YES ELFUTILS_DEPENDENCIES = host-pkgconf zlib $(TARGET_NLS_DEPENDENCIES) HOST_ELFUTILS_DEPENDENCIES = host-pkgconf host-zlib host-bzip2 host-xz diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index f808afd53c..b5156c1e3c 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -13,6 +13,6 @@ EXEMPI_DEPENDENCIES = host-pkgconf expat zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) EXEMPI_LICENSE = BSD-3-Clause EXEMPI_LICENSE_FILES = COPYING -EXEMPI_CPE_ID_VENDOR = exempi_project +EXEMPI_CPE_ID_VALID = YES $(eval $(autotools-package)) diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk index a8efe5b0ba..d8c28464db 100644 --- a/package/exfat/exfat.mk +++ b/package/exfat/exfat.mk @@ -12,7 +12,7 @@ EXFAT_DEPENDENCIES = \ host-pkgconf EXFAT_LICENSE = GPL-2.0+ EXFAT_LICENSE_FILES = COPYING -EXFAT_CPE_ID_VENDOR = exfat_project +EXFAT_CPE_ID_VALID = YES EXFAT_CONF_OPTS += --exec-prefix=/ diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk index a92ab4fe3e..87f4487750 100644 --- a/package/f2fs-tools/f2fs-tools.mk +++ b/package/f2fs-tools/f2fs-tools.mk @@ -14,7 +14,7 @@ F2FS_TOOLS_AUTORECONF = YES F2FS_TOOLS_INSTALL_STAGING = YES F2FS_TOOLS_LICENSE = GPL-2.0 F2FS_TOOLS_LICENSE_FILES = COPYING -F2FS_TOOLS_CPE_ID_VENDOR = f2fs-tools_project +F2FS_TOOLS_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBSELINUX),y) F2FS_TOOLS_CONF_OPTS += --with-selinux diff --git a/package/feh/feh.mk b/package/feh/feh.mk index 3aa509abfe..df03deedde 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -10,7 +10,7 @@ FEH_SITE = http://feh.finalrewind.org FEH_DEPENDENCIES = imlib2 libpng xlib_libXt FEH_LICENSE = MIT FEH_LICENSE_FILES = COPYING -FEH_CPE_ID_VENDOR = feh_project +FEH_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBCURL),y) FEH_DEPENDENCIES += libcurl diff --git a/package/file/file.mk b/package/file/file.mk index 5fc540bc9d..b67fcaead4 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -8,7 +8,7 @@ FILE_VERSION = 5.45 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c -FILE_CPE_ID_VENDOR = file_project +FILE_CPE_ID_VALID = YES FILE_AUTORECONF = YES diff --git a/package/flac/flac.mk b/package/flac/flac.mk index ab06af826e..6bac9ef8a7 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -11,7 +11,7 @@ FLAC_INSTALL_STAGING = YES FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries) FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL -FLAC_CPE_ID_VENDOR = flac_project +FLAC_CPE_ID_VALID = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index d2eb76e40a..11758a4c80 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -18,7 +18,7 @@ HOST_FONTCONFIG_DEPENDENCIES = \ host-gettext FONTCONFIG_LICENSE = fontconfig license FONTCONFIG_LICENSE_FILES = COPYING -FONTCONFIG_CPE_ID_VENDOR = fontconfig_project +FONTCONFIG_CPE_ID_VALID = YES FONTCONFIG_CONF_OPTS = \ --with-arch=$(GNU_TARGET_NAME) \ diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index d91c77e2ee..3ac74f9244 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -9,7 +9,7 @@ GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING -GIFLIB_CPE_ID_VENDOR = giflib_project +GIFLIB_CPE_ID_VALID = YES # 0002-Fix-CVE-2022-28506.patch GIFLIB_IGNORE_CVES = CVE-2022-28506 diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 825863d080..91e9bfb9bf 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -8,7 +8,7 @@ GNUPLOT_VERSION = 5.4.10 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright -GNUPLOT_CPE_ID_VENDOR = gnuplot_project +GNUPLOT_CPE_ID_VALID = YES GNUPLOT_AUTORECONF = YES diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index d7425513fd..1d4013d122 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -8,7 +8,7 @@ GPSD_VERSION = 3.25 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING -GPSD_CPE_ID_VENDOR = gpsd_project +GPSD_CPE_ID_VALID = YES GPSD_SELINUX_MODULES = gpsd GPSD_INSTALL_STAGING = YES diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk index b0fcd5a598..bcc9c54beb 100644 --- a/package/gutenprint/gutenprint.mk +++ b/package/gutenprint/gutenprint.mk @@ -10,7 +10,7 @@ GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2 GUTENPRINT_LICENSE = GPL-2.0+ GUTENPRINT_LICENSE_FILES = COPYING -GUTENPRINT_CPE_ID_VENDOR = gutenprint_project +GUTENPRINT_CPE_ID_VALID = YES # Needed, as we touch Makefile.am GUTENPRINT_AUTORECONF = YES diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 4435cbb736..599ea548d0 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -9,7 +9,7 @@ HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZ HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) HARFBUZZ_LICENSE_FILES = COPYING -HARFBUZZ_CPE_ID_VENDOR = harfbuzz_project +HARFBUZZ_CPE_ID_VALID = YES HARFBUZZ_INSTALL_STAGING = YES HARFBUZZ_CONF_OPTS = \ -Dgdi=disabled \ diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index 22950f4d6d..f2a9d714b7 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -8,7 +8,7 @@ HASERL_VERSION = 0.9.36 HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel HASERL_LICENSE = GPL-2.0 HASERL_LICENSE_FILES = COPYING -HASERL_CPE_ID_VENDOR = haserl_project +HASERL_CPE_ID_VALID = YES HASERL_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y) diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 59b64c358b..786d94a1aa 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -32,7 +32,7 @@ HOST_HEIMDAL_CONF_OPTS = \ HOST_HEIMDAL_CONF_ENV = ac_cv_prog_COMPILE_ET=no MAKEINFO=true HEIMDAL_LICENSE = BSD-3-Clause HEIMDAL_LICENSE_FILES = LICENSE -HEIMDAL_CPE_ID_VENDOR = heimdal_project +HEIMDAL_CPE_ID_VALID = YES # We need compile_et for samba4 define HOST_HEIMDAL_INSTALL_COMPILE_ET diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index f8d1bcb4b0..99388d9537 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -9,7 +9,7 @@ I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.xz I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus), LGPL-2.1+ (libi2c) I2C_TOOLS_LICENSE_FILES = COPYING COPYING.LGPL README -I2C_TOOLS_CPE_ID_VENDOR = i2c-tools_project +I2C_TOOLS_CPE_ID_VALID = YES I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog I2C_TOOLS_INSTALL_STAGING = YES diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index b3f1e217ff..4f2151904d 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -8,7 +8,7 @@ IPMITOOL_VERSION = 1_8_19 IPMITOOL_SITE = $(call github,ipmitool,ipmitool,IPMITOOL_$(IPMITOOL_VERSION)) IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING -IPMITOOL_CPE_ID_VENDOR = ipmitool_project +IPMITOOL_CPE_ID_VALID = YES # From git IPMITOOL_AUTORECONF = YES IPMITOOL_DEPENDENCIES = host-pkgconf diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 7e70f62ff2..4adb4e3356 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -11,7 +11,7 @@ IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ $(if $(BR2_PACKAGE_LIBMNL),libmnl) IPROUTE2_LICENSE = GPL-2.0+ IPROUTE2_LICENSE_FILES = COPYING -IPROUTE2_CPE_ID_VENDOR = iproute2_project +IPROUTE2_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_ELFUTILS),y) IPROUTE2_DEPENDENCIES += elfutils diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 58e44d673a..08d849e69d 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -8,7 +8,7 @@ IPUTILS_VERSION = 20240117 IPUTILS_SITE = https://github.com/iputils/iputils/releases/download/$(IPUTILS_VERSION) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 -IPUTILS_CPE_ID_VENDOR = iputils_project +IPUTILS_CPE_ID_VALID = YES IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # Selectively build binaries diff --git a/package/iucode-tool/iucode-tool.mk b/package/iucode-tool/iucode-tool.mk index b123973a90..e22e782804 100644 --- a/package/iucode-tool/iucode-tool.mk +++ b/package/iucode-tool/iucode-tool.mk @@ -9,7 +9,7 @@ IUCODE_TOOL_SOURCE = iucode-tool_$(IUCODE_TOOL_VERSION).tar.xz IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/master IUCODE_TOOL_LICENSE = GPL-2.0+ IUCODE_TOOL_LICENSE_FILES = COPYING -IUCODE_TOOL_CPE_ID_VENDOR = iucode-tool_project +IUCODE_TOOL_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) IUCODE_TOOL_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) diff --git a/package/jansson/jansson.mk b/package/jansson/jansson.mk index 99e1817eef..8efe28bf4a 100644 --- a/package/jansson/jansson.mk +++ b/package/jansson/jansson.mk @@ -10,7 +10,7 @@ JANSSON_SITE = \ https://github.com/akheron/jansson/releases/download/v$(JANSSON_VERSION) JANSSON_LICENSE = MIT JANSSON_LICENSE_FILES = LICENSE -JANSSON_CPE_ID_VENDOR = jansson_project +JANSSON_CPE_ID_VALID = YES JANSSON_INSTALL_STAGING = YES JANSSON_CONF_ENV = LIBS="-lm" diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 6b6bbcd6e6..45b9c49558 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -9,7 +9,7 @@ JASPER_SITE = https://github.com/jasper-software/jasper/releases/download/versio JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE -JASPER_CPE_ID_VENDOR = jasper_project +JASPER_CPE_ID_VALID = YES JASPER_SUPPORTS_IN_SOURCE_BUILD = NO JASPER_CONF_OPTS = \ -DJAS_ENABLE_DOC=OFF \ diff --git a/package/jhead/jhead.mk b/package/jhead/jhead.mk index f07739bc21..940312780e 100644 --- a/package/jhead/jhead.mk +++ b/package/jhead/jhead.mk @@ -8,7 +8,7 @@ JHEAD_VERSION = 3.08 JHEAD_SITE = $(call github,Matthias-Wandel,jhead,$(JHEAD_VERSION)) JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt -JHEAD_CPE_ID_VENDOR = jhead_project +JHEAD_CPE_ID_VALID = YES define JHEAD_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) diff --git a/package/jq/jq.mk b/package/jq/jq.mk index 8c417fad31..ba27e22f7f 100644 --- a/package/jq/jq.mk +++ b/package/jq/jq.mk @@ -8,7 +8,7 @@ JQ_VERSION = 1.7.1 JQ_SITE = https://github.com/jqlang/jq/releases/download/jq-$(JQ_VERSION) JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation) JQ_LICENSE_FILES = COPYING -JQ_CPE_ID_VENDOR = jq_project +JQ_CPE_ID_VALID = YES JQ_INSTALL_STAGING = YES # uses c99 specific features diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index b89eb32a45..345280b346 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -9,7 +9,7 @@ JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT JSON_FOR_MODERN_CPP_LICENSE_FILES = LICENSE.MIT -JSON_FOR_MODERN_CPP_CPE_ID_VENDOR = json-for-modern-cpp_project +JSON_FOR_MODERN_CPP_CPE_ID_VALID = YES JSON_FOR_MODERN_CPP_INSTALL_STAGING = YES # header only library diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index e7022bfd39..5ef62befbc 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -8,7 +8,7 @@ JSONCPP_VERSION = 1.9.5 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE -JSONCPP_CPE_ID_VENDOR = jsoncpp_project +JSONCPP_CPE_ID_VALID = YES JSONCPP_INSTALL_STAGING = YES JSONCPP_CONF_OPTS = -Dtests=false diff --git a/package/jszip/jszip.mk b/package/jszip/jszip.mk index b282610a0d..f038263a77 100644 --- a/package/jszip/jszip.mk +++ b/package/jszip/jszip.mk @@ -8,7 +8,7 @@ JSZIP_VERSION = 3.10.1 JSZIP_SITE = $(call github,Stuk,jszip,v$(JSZIP_VERSION)) JSZIP_LICENSE = MIT or GPL-3.0 JSZIP_LICENSE_FILES = LICENSE.markdown -JSZIP_CPE_ID_VENDOR = jszip_project +JSZIP_CPE_ID_VALID = YES define JSZIP_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/dist/jszip.min.js \ diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk index 5af5c4e92c..fb387ed1a3 100644 --- a/package/keyutils/keyutils.mk +++ b/package/keyutils/keyutils.mk @@ -8,7 +8,7 @@ KEYUTILS_VERSION = 1.6.3 KEYUTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot KEYUTILS_LICENSE = GPL-2.0+, LGPL-2.1+ KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL -KEYUTILS_CPE_ID_VENDOR = keyutils_project +KEYUTILS_CPE_ID_VALID = YES KEYUTILS_INSTALL_STAGING = YES KEYUTILS_MAKE_PARAMS = \ diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk index 9c58e44876..2bcd556f9b 100644 --- a/package/kvmtool/kvmtool.mk +++ b/package/kvmtool/kvmtool.mk @@ -17,7 +17,7 @@ KVMTOOL_DEPENDENCIES = \ $(if $(BR2_PACKAGE_ZLIB),zlib) KVMTOOL_LICENSE = GPL-2.0 KVMTOOL_LICENSE_FILES = COPYING -KVMTOOL_CPE_ID_VENDOR = kvmtool_project +KVMTOOL_CPE_ID_VALID = YES # Disable -Werror, otherwise musl is not happy KVMTOOL_MAKE_OPTS = \ diff --git a/package/lame/lame.mk b/package/lame/lame.mk index 3a57cffe3d..206e4407c9 100644 --- a/package/lame/lame.mk +++ b/package/lame/lame.mk @@ -12,7 +12,7 @@ LAME_CONF_ENV = GTK_CONFIG=/bin/false LAME_CONF_OPTS = --enable-dynamic-frontends LAME_LICENSE = LGPL-2.0+ LAME_LICENSE_FILES = COPYING -LAME_CPE_ID_VENDOR = lame_project +LAME_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) LAME_DEPENDENCIES += libsndfile diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index 3db2797202..3c1ab1fc67 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -8,7 +8,7 @@ LAPACK_VERSION = 3.10.1 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) -LAPACK_CPE_ID_VENDOR = lapack_project +LAPACK_CPE_ID_VALID = YES LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk index 00b33b91fb..483ca298cd 100644 --- a/package/lftp/lftp.mk +++ b/package/lftp/lftp.mk @@ -9,7 +9,7 @@ LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz LFTP_SITE = http://lftp.yar.ru/ftp LFTP_LICENSE = GPL-3.0+ LFTP_LICENSE_FILES = COPYING -LFTP_CPE_ID_VENDOR = lftp_project +LFTP_CPE_ID_VALID = YES LFTP_DEPENDENCIES = readline zlib host-pkgconf # Help lftp finding readline and zlib diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index 12cfbc4ef4..16cb502f16 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -9,7 +9,7 @@ LIBAIO_SITE = https://releases.pagure.org/libaio LIBAIO_INSTALL_STAGING = YES LIBAIO_LICENSE = LGPL-2.1+ LIBAIO_LICENSE_FILES = COPYING -LIBAIO_CPE_ID_VENDOR = libaio_project +LIBAIO_CPE_ID_VALID = YES LIBAIO_CONFIGURE_OPTS = $(TARGET_CONFIGURE_OPTS) diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 8b14c899c4..f48673014a 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -12,7 +12,7 @@ LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSIO LIBASS_INSTALL_STAGING = YES LIBASS_LICENSE = ISC LIBASS_LICENSE_FILES = COPYING -LIBASS_CPE_ID_VENDOR = libass_project +LIBASS_CPE_ID_VALID = YES LIBASS_DEPENDENCIES = \ host-pkgconf \ freetype \ diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index bf6994b3a0..555ba678fe 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -16,7 +16,7 @@ LIBATOMIC_OPS_AUTORECONF = YES # library, libatomic_ops_gpl.a." LIBATOMIC_OPS_LICENSE = MIT (main library) / GPL-2.0+ (gpl extension) LIBATOMIC_OPS_LICENSE_FILES = COPYING LICENSE -LIBATOMIC_OPS_CPE_ID_VENDOR = libatomic_ops_project +LIBATOMIC_OPS_CPE_ID_VALID = YES LIBATOMIC_OPS_INSTALL_STAGING = YES diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 670dbee87e..ef33542f2d 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -8,7 +8,7 @@ LIBBPF_VERSION = 1.1.0 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 -LIBBPF_CPE_ID_VENDOR = libbpf_project +LIBBPF_CPE_ID_VALID = YES LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib HOST_LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf host-elfutils host-zlib LIBBPF_INSTALL_STAGING = YES diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 5e3ca20029..2ec88810b4 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -8,7 +8,7 @@ LIBCAP_NG_VERSION = 0.8.4 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB -LIBCAP_NG_CPE_ID_VENDOR = libcap-ng_project +LIBCAP_NG_CPE_ID_VALID = YES LIBCAP_NG_INSTALL_STAGING = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index c9727c75c9..fe2f24ad8c 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -9,7 +9,7 @@ LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause LIBCAP_LICENSE_FILES = License -LIBCAP_CPE_ID_VENDOR = libcap_project +LIBCAP_CPE_ID_VALID = YES LIBCAP_DEPENDENCIES = host-gperf LIBCAP_INSTALL_STAGING = YES diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk index e3de48c561..cfe1d0f9f8 100644 --- a/package/libcgroup/libcgroup.mk +++ b/package/libcgroup/libcgroup.mk @@ -8,7 +8,7 @@ LIBCGROUP_VERSION = 2.0.3 LIBCGROUP_SITE = https://github.com/libcgroup/libcgroup/releases/download/v$(LIBCGROUP_VERSION) LIBCGROUP_LICENSE = LGPL-2.1 LIBCGROUP_LICENSE_FILES = COPYING -LIBCGROUP_CPE_ID_VENDOR = libcgroup_project +LIBCGROUP_CPE_ID_VALID = YES LIBCGROUP_DEPENDENCIES = host-bison host-flex LIBCGROUP_INSTALL_STAGING = YES diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index e7c2ef0a84..76123a7e6b 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -11,7 +11,7 @@ LIBCONFUSE_INSTALL_STAGING = YES LIBCONFUSE_CONF_OPTS = --disable-rpath LIBCONFUSE_LICENSE = ISC LIBCONFUSE_LICENSE_FILES = LICENSE -LIBCONFUSE_CPE_ID_VENDOR = libconfuse_project +LIBCONFUSE_CPE_ID_VALID = YES LIBCONFUSE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # 0001-Fix-163-unterminated-username-used-with-getpwnam.patch diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index cdf0819e68..aa9bb8080e 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -8,7 +8,7 @@ LIBDAEMON_VERSION = 0.14 LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon LIBDAEMON_LICENSE = LGPL-2.1+ LIBDAEMON_LICENSE_FILES = LICENSE -LIBDAEMON_CPE_ID_VENDOR = libdaemon_project +LIBDAEMON_CPE_ID_VALID = YES LIBDAEMON_INSTALL_STAGING = YES LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk index 10fe7bf324..6456e83e10 100644 --- a/package/libesmtp/libesmtp.mk +++ b/package/libesmtp/libesmtp.mk @@ -9,7 +9,7 @@ LIBESMTP_SITE = $(call github,libesmtp,libESMTP,v$(LIBESMTP_VERSION)) LIBESMTP_INSTALL_STAGING = YES LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBESMTP_LICENSE_FILES = COPYING.GPL LICENSE -LIBESMTP_CPE_ID_VENDOR = libesmtp_project +LIBESMTP_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBESMTP_CONF_OPTS += -Dtls=enabled diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 4c23156f72..355dfedcc1 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -10,7 +10,7 @@ LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz LIBEVENT_INSTALL_STAGING = YES LIBEVENT_LICENSE = BSD-3-Clause, OpenBSD LIBEVENT_LICENSE_FILES = LICENSE -LIBEVENT_CPE_ID_VENDOR = libevent_project +LIBEVENT_CPE_ID_VALID = YES LIBEVENT_CONF_OPTS = \ --disable-libevent-regress \ --disable-samples diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk index 921029b4ac..858901f40e 100644 --- a/package/libexif/libexif.mk +++ b/package/libexif/libexif.mk @@ -12,6 +12,6 @@ LIBEXIF_INSTALL_STAGING = YES LIBEXIF_DEPENDENCIES = host-pkgconf LIBEXIF_LICENSE = LGPL-2.1+ LIBEXIF_LICENSE_FILES = COPYING -LIBEXIF_CPE_ID_VENDOR = libexif_project +LIBEXIF_CPE_ID_VALID = YES $(eval $(autotools-package)) diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 8f6844113c..6249023eae 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -9,7 +9,7 @@ LIBFFI_SITE = \ https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION) LIBFFI_LICENSE = MIT LIBFFI_LICENSE_FILES = LICENSE -LIBFFI_CPE_ID_VENDOR = libffi_project +LIBFFI_CPE_ID_VALID = YES LIBFFI_INSTALL_STAGING = YES # We're patching Makefile.am LIBFFI_AUTORECONF = YES diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index 723060931f..147b38b2e2 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -9,7 +9,7 @@ LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION) LIBFUSE_LICENSE = GPL-2.0, LGPL-2.1 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB -LIBFUSE_CPE_ID_VENDOR = libfuse_project +LIBFUSE_CPE_ID_VALID = YES LIBFUSE_INSTALL_STAGING = YES # We're patching configure.ac LIBFUSE_AUTORECONF = YES diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 92563d24bb..46ccc1e517 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -15,7 +15,7 @@ LIBGIT2_LICENSE = \ BSD-2-Clause (basename_r), \ LGPL-2.1+ (libxdiff) LIBGIT2_LICENSE_FILES = COPYING -LIBGIT2_CPE_ID_VENDOR = libgit2_project +LIBGIT2_CPE_ID_VALID = YES LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ diff --git a/package/libical/libical.mk b/package/libical/libical.mk index afbbfd98c8..992ef51375 100644 --- a/package/libical/libical.mk +++ b/package/libical/libical.mk @@ -9,7 +9,7 @@ LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_V LIBICAL_INSTALL_STAGING = YES LIBICAL_LICENSE = MPL-1.0 or LGPL-2.1 LIBICAL_LICENSE_FILES = LICENSE -LIBICAL_CPE_ID_VENDOR = libical_project +LIBICAL_CPE_ID_VALID = YES # 0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch LIBICAL_IGNORE_CVES += CVE-2016-9584 diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index d2c5e70c98..4072633ffe 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -8,7 +8,7 @@ LIBJXL_VERSION = 0.9.0 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS -LIBJXL_CPE_ID_VENDOR = libjxl_project +LIBJXL_CPE_ID_VALID = YES LIBJXL_INSTALL_STAGING = YES LIBJXL_DEPENDENCIES = \ diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk index a4c40ad60a..1140996cb8 100644 --- a/package/libmms/libmms.mk +++ b/package/libmms/libmms.mk @@ -10,6 +10,6 @@ LIBMMS_INSTALL_STAGING = YES LIBMMS_DEPENDENCIES = host-pkgconf libglib2 LIBMMS_LICENSE = LGPL-2.1+ LIBMMS_LICENSE_FILES = COPYING.LIB -LIBMMS_CPE_ID_VENDOR = libmms_project +LIBMMS_CPE_ID_VALID = YES $(eval $(autotools-package)) diff --git a/package/libnet/libnet.mk b/package/libnet/libnet.mk index a803fcd17a..3bc9e30dfa 100644 --- a/package/libnet/libnet.mk +++ b/package/libnet/libnet.mk @@ -14,7 +14,7 @@ LIBNET_CONF_OPTS = \ --disable-doxygen-doc LIBNET_LICENSE = BSD-2-Clause, BSD-3-Clause LIBNET_LICENSE_FILES = LICENSE -LIBNET_CPE_ID_VENDOR = libnet_project +LIBNET_CPE_ID_VALID = YES LIBNET_CONFIG_SCRIPTS = libnet-config $(eval $(autotools-package)) diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk index 40620eca57..712630bac8 100644 --- a/package/libnids/libnids.mk +++ b/package/libnids/libnids.mk @@ -8,7 +8,7 @@ LIBNIDS_VERSION = 1.26 LIBNIDS_SITE = $(call github,MITRECND,libnids,$(LIBNIDS_VERSION)) LIBNIDS_LICENSE = GPL-2.0 LIBNIDS_LICENSE_FILES = COPYING -LIBNIDS_CPE_ID_VENDOR = libnids_project +LIBNIDS_CPE_ID_VALID = YES LIBNIDS_INSTALL_STAGING = YES LIBNIDS_DEPENDENCIES = host-pkgconf libpcap LIBNIDS_AUTORECONF = YES diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index 8fbea3db5f..6f50fd6afc 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -8,7 +8,7 @@ LIBNL_VERSION = 3.9.0 LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION)) LIBNL_LICENSE = LGPL-2.1+ LIBNL_LICENSE_FILES = COPYING -LIBNL_CPE_ID_VENDOR = libnl_project +LIBNL_CPE_ID_VALID = YES LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison host-flex host-pkgconf diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index c3db50a92c..eae41446e2 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -8,7 +8,7 @@ LIBQMI_VERSION = 1.32.2 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB -LIBQMI_CPE_ID_VENDOR = libqmi_project +LIBQMI_CPE_ID_VALID = YES LIBQMI_INSTALL_STAGING = YES LIBQMI_DEPENDENCIES = libglib2 diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk index 1465963c61..26c003be21 100644 --- a/package/librsync/librsync.mk +++ b/package/librsync/librsync.mk @@ -8,7 +8,7 @@ LIBRSYNC_VERSION = 2.3.4 LIBRSYNC_SITE = https://github.com/librsync/librsync/releases/download/v$(LIBRSYNC_VERSION) LIBRSYNC_LICENSE = LGPL-2.1+ LIBRSYNC_LICENSE_FILES = COPYING -LIBRSYNC_CPE_ID_VENDOR = librsync_project +LIBRSYNC_CPE_ID_VALID = YES LIBRSYNC_INSTALL_STAGING = YES LIBRSYNC_DEPENDENCIES = host-pkgconf zlib bzip2 popt diff --git a/package/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk index 2844fde33c..0ac3c42451 100644 --- a/package/libsamplerate/libsamplerate.mk +++ b/package/libsamplerate/libsamplerate.mk @@ -17,7 +17,7 @@ LIBSAMPLERATE_CONF_OPTS = \ --program-transform-name='' LIBSAMPLERATE_LICENSE = BSD-2-Clause LIBSAMPLERATE_LICENSE_FILES = COPYING -LIBSAMPLERATE_CPE_ID_VENDOR = libsamplerate_project +LIBSAMPLERATE_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_ALSA_LIB),y) LIBSAMPLERATE_DEPENDENCIES += alsa-lib diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk index ff295e986a..10d57bb78c 100644 --- a/package/libseccomp/libseccomp.mk +++ b/package/libseccomp/libseccomp.mk @@ -8,7 +8,7 @@ LIBSECCOMP_VERSION = 2.5.5 LIBSECCOMP_SITE = https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE -LIBSECCOMP_CPE_ID_VENDOR = libseccomp_project +LIBSECCOMP_CPE_ID_VALID = YES LIBSECCOMP_INSTALL_STAGING = YES LIBSECCOMP_DEPENDENCIES = host-gperf diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index 89eb4f3c1d..dc23d94cb1 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -10,7 +10,7 @@ LIBSNDFILE_SITE = https://github.com/libsndfile/libsndfile/releases/download/$(L LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING -LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project +LIBSNDFILE_CPE_ID_VALID = YES LIBSNDFILE_DEPENDENCIES = host-pkgconf LIBSNDFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 298b3c36bd..04196f2f7c 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -9,7 +9,7 @@ LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause LIBTIRPC_LICENSE_FILES = COPYING -LIBTIRPC_CPE_ID_VENDOR = libtirpc_project +LIBTIRPC_CPE_ID_VALID = YES LIBTIRPC_INSTALL_STAGING = YES diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index afc17f7b25..d7ddb8f179 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -9,7 +9,7 @@ LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING LIBUNWIND_LICENSE = MIT -LIBUNWIND_CPE_ID_VENDOR = libunwind_project +LIBUNWIND_CPE_ID_VALID = YES LIBUNWIND_AUTORECONF = YES LIBUNWIND_CONF_OPTS = \ diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index f8551a2a0d..61e52c095a 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -12,7 +12,7 @@ LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no LIBUPNP_INSTALL_STAGING = YES LIBUPNP_LICENSE = BSD-3-Clause LIBUPNP_LICENSE_FILES = COPYING -LIBUPNP_CPE_ID_VENDOR = libupnp_project +LIBUPNP_CPE_ID_VALID = YES LIBUPNP_DEPENDENCIES = host-pkgconf # Bind the internal miniserver socket with reuseaddr to allow clean restarts. diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index 700e26a8d6..3a15a82d08 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -9,7 +9,7 @@ LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ LIBVNCSERVER_LICENSE_FILES = COPYING -LIBVNCSERVER_CPE_ID_VENDOR = libvncserver_project +LIBVNCSERVER_CPE_ID_VALID = YES LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON diff --git a/package/linuxptp/linuxptp.mk b/package/linuxptp/linuxptp.mk index e0ab82a2c4..eea41f0baf 100644 --- a/package/linuxptp/linuxptp.mk +++ b/package/linuxptp/linuxptp.mk @@ -9,7 +9,7 @@ LINUXPTP_SOURCE = linuxptp-$(LINUXPTP_VERSION).tgz LINUXPTP_SITE = http://downloads.sourceforge.net/linuxptp LINUXPTP_LICENSE = GPL-2.0+ LINUXPTP_LICENSE_FILES = COPYING -LINUXPTP_CPE_ID_VENDOR = linuxptp_project +LINUXPTP_CPE_ID_VALID = YES LINUXPTP_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index 75457a25e3..34e1c8c249 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -14,7 +14,7 @@ LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_VALGRIND),valgrind) LLDPD_LICENSE = ISC LLDPD_LICENSE_FILES = LICENSE -LLDPD_CPE_ID_VENDOR = lldpd_project +LLDPD_CPE_ID_VALID = YES # Detection of c99 support in configure fails without WCHAR. To enable # automatic detection of c99 support by configure, we need to enable diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index 37c48121f1..3fed1b957f 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -9,7 +9,7 @@ LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.xz LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION) LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE_FILES = COPYING -LOGROTATE_CPE_ID_VENDOR = logrotate_project +LOGROTATE_CPE_ID_VALID = YES LOGROTATE_DEPENDENCIES = popt host-pkgconf LOGROTATE_SELINUX_MODULES = logrotate LOGROTATE_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`" diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 3897975d73..d9be23540e 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -9,7 +9,7 @@ LRZSZ_SITE = http://www.ohse.de/uwe/releases LRZSZ_CONF_OPTS = --disable-timesync LRZSZ_LICENSE = GPL-2.0+ LRZSZ_LICENSE_FILES = COPYING -LRZSZ_CPE_ID_VENDOR = lrzsz_project +LRZSZ_CPE_ID_VALID = YES LRZSZ_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LRZSZ_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 1831080b17..cb4e987bd5 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -8,7 +8,7 @@ LSOF_VERSION = 4.99.3 LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION)) LSOF_LICENSE = lsof license LSOF_LICENSE_FILES = COPYING -LSOF_CPE_ID_VENDOR = lsof_project +LSOF_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBTIRPC),y) LSOF_DEPENDENCIES += libtirpc diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index b441eacef7..da57eb2601 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -13,7 +13,7 @@ LYNX_PATCH = \ LYNX_IGNORE_CVES += CVE-2021-38165 LYNX_LICENSE = GPL-2.0 LYNX_LICENSE_FILES = COPYING -LYNX_CPE_ID_VENDOR = lynx_project +LYNX_CPE_ID_VALID = YES LYNX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index 5da1ae2703..202dc172f7 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -9,7 +9,7 @@ LZ4_SITE = $(call github,lz4,lz4,v$(LZ4_VERSION)) LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs) LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING -LZ4_CPE_ID_VENDOR = lz4_project +LZ4_CPE_ID_VALID = YES ifeq ($(BR2_STATIC_LIBS),y) LZ4_MAKE_OPTS += BUILD_SHARED=no diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 0682d8d0ff..76c00615d5 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -8,7 +8,7 @@ LZO_VERSION = 2.10 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download LZO_LICENSE = GPL-2.0+ LZO_LICENSE_FILES = COPYING -LZO_CPE_ID_VENDOR = lzo_project +LZO_CPE_ID_VALID = YES LZO_INSTALL_STAGING = YES LZO_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/package/matio/matio.mk b/package/matio/matio.mk index d8268a109f..dc9be2ac18 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -10,7 +10,7 @@ MATIO_SITE = \ https://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING -MATIO_CPE_ID_VENDOR = matio_project +MATIO_CPE_ID_VALID = YES MATIO_DEPENDENCIES = zlib MATIO_INSTALL_STAGING = YES diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index ef518cd238..b54e34b230 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -9,7 +9,7 @@ MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING -MDADM_CPE_ID_VENDOR = mdadm_project +MDADM_CPE_ID_VALID = YES MDADM_CXFLAGS = $(TARGET_CFLAGS) diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk index 2f10fe627b..8bc5717417 100644 --- a/package/minicom/minicom.mk +++ b/package/minicom/minicom.mk @@ -10,7 +10,7 @@ MINICOM_SITE = \ https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION) MINICOM_LICENSE = GPL-2.0+ MINICOM_LICENSE_FILES = COPYING -MINICOM_CPE_ID_VENDOR = minicom_project +MINICOM_CPE_ID_VALID = YES MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \ $(TARGET_NLS_DEPENDENCIES) host-pkgconf diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 554d056999..a42c2ad149 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -8,7 +8,7 @@ MOTION_VERSION = 4.6.0 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = LICENSE -MOTION_CPE_ID_VENDOR = motion_project +MOTION_CPE_ID_VALID = YES MOTION_DEPENDENCIES = host-pkgconf jpeg libmicrohttpd $(TARGET_NLS_DEPENDENCIES) # From git MOTION_AUTORECONF = YES diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index bc8a62daea..ee75c2a676 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -16,7 +16,7 @@ NCMPC_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING -NCMPC_CPE_ID_VENDOR = ncmpc_project +NCMPC_CPE_ID_VALID = YES NCMPC_CONF_OPTS = \ -Dcurses=ncurses \ diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk index 4a03e3d846..0744bf18cb 100644 --- a/package/net-tools/net-tools.mk +++ b/package/net-tools/net-tools.mk @@ -10,7 +10,7 @@ NET_TOOLS_SITE = http://downloads.sourceforge.net/project/net-tools NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) NET_TOOLS_LICENSE = GPL-2.0+ NET_TOOLS_LICENSE_FILES = COPYING -NET_TOOLS_CPE_ID_VENDOR = net-tools_project +NET_TOOLS_CPE_ID_VALID = YES define NET_TOOLS_CONFIGURE_CMDS (cd $(@D); yes "" | ./configure.sh config.in ) diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index 939c9fa9fb..c9d7952e59 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -8,6 +8,6 @@ NETCAT_VERSION = 0.7.1 NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION) NETCAT_LICENSE = GPL-2.0+ NETCAT_LICENSE_FILES = COPYING -NETCAT_CPE_ID_VENDOR = netcat_project +NETCAT_CPE_ID_VALID = YES $(eval $(autotools-package)) diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index adeaf40868..20f755cc98 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -10,7 +10,7 @@ NETTLE_DEPENDENCIES = host-m4 gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 -NETTLE_CPE_ID_VENDOR = nettle_project +NETTLE_CPE_ID_VALID = YES # don't include openssl support for (unused) examples as it has problems # with static linking NETTLE_CONF_OPTS = --disable-openssl diff --git a/package/oniguruma/oniguruma.mk b/package/oniguruma/oniguruma.mk index 1e8a119cf1..e056048cb5 100644 --- a/package/oniguruma/oniguruma.mk +++ b/package/oniguruma/oniguruma.mk @@ -10,7 +10,7 @@ ONIGURUMA_SITE = \ ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz ONIGURUMA_LICENSE = BSD-2-Clause ONIGURUMA_LICENSE_FILES = COPYING -ONIGURUMA_CPE_ID_VENDOR = oniguruma_project +ONIGURUMA_CPE_ID_VALID = YES ONIGURUMA_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index 00370a339a..d1f40d3e20 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -8,7 +8,7 @@ OPEN_ISCSI_VERSION = 2.1.9 OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING README libopeniscsiusr/COPYING -OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project +OPEN_ISCSI_CPE_ID_VALID = YES OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 2d6cdaa7bb..a678153d7b 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,7 +9,7 @@ OPENBLAS_SITE = https://github.com/OpenMathLib/OpenBLAS/releases/download/v$(OPE OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES -OPENBLAS_CPE_ID_VENDOR = openblas_project +OPENBLAS_CPE_ID_VALID = YES # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index 0dd6a5d1ac..f8e51f6720 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -8,7 +8,7 @@ OPENRC_VERSION = 0.52.1 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) OPENRC_LICENSE = BSD-2-Clause OPENRC_LICENSE_FILES = LICENSE -OPENRC_CPE_ID_VENDOR = openrc_project +OPENRC_CPE_ID_VALID = YES OPENRC_DEPENDENCIES = ncurses diff --git a/package/openresolv/openresolv.mk b/package/openresolv/openresolv.mk index 176f6dab3a..8a8b578781 100644 --- a/package/openresolv/openresolv.mk +++ b/package/openresolv/openresolv.mk @@ -9,7 +9,7 @@ OPENRESOLV_SITE = https://github.com/rsmarples/openresolv/releases/download/v$(O OPENRESOLV_SOURCE = openresolv-$(OPENRESOLV_VERSION).tar.xz OPENRESOLV_LICENSE = BSD-2-Clause OPENRESOLV_LICENSE_FILES = LICENSE -OPENRESOLV_CPE_ID_VENDOR = openresolv_project +OPENRESOLV_CPE_ID_VALID = YES define OPENRESOLV_CONFIGURE_CMDS cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure --sysconfdir=/etc diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index 49bdcae37a..aa82bd18da 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -8,7 +8,7 @@ OPENSC_VERSION = 0.24.0 OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) OPENSC_LICENSE = LGPL-2.1+ OPENSC_LICENSE_FILES = COPYING -OPENSC_CPE_ID_VENDOR = opensc_project +OPENSC_CPE_ID_VALID = YES OPENSC_DEPENDENCIES = openssl pcsc-lite OPENSC_INSTALL_STAGING = YES OPENSC_CONF_OPTS = --disable-cmocka --disable-strict --disable-tests diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk index 8547ee33c2..53e953e070 100644 --- a/package/p11-kit/p11-kit.mk +++ b/package/p11-kit/p11-kit.mk @@ -13,7 +13,7 @@ P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \ ac_cv_have_decl___progname=no P11_KIT_LICENSE = BSD-3-Clause P11_KIT_LICENSE_FILES = COPYING -P11_KIT_CPE_ID_VENDOR = p11-kit_project +P11_KIT_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBFFI),y) P11_KIT_DEPENDENCIES += host-pkgconf libffi diff --git a/package/parted/parted.mk b/package/parted/parted.mk index bfd9ef3432..5b55a9f21e 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -11,7 +11,7 @@ PARTED_DEPENDENCIES = host-pkgconf util-linux PARTED_INSTALL_STAGING = YES PARTED_LICENSE = GPL-3.0+ PARTED_LICENSE_FILES = COPYING -PARTED_CPE_ID_VENDOR = parted_project +PARTED_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_READLINE),y) PARTED_DEPENDENCIES += readline diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk index 1379b19f5d..9b233f614d 100644 --- a/package/pcmanfm/pcmanfm.mk +++ b/package/pcmanfm/pcmanfm.mk @@ -10,7 +10,7 @@ PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm $(TARGET_NLS_DEPENDENCIES) PCMANFM_LICENSE = GPL-2.0+ PCMANFM_LICENSE_FILES = COPYING -PCMANFM_CPE_ID_VENDOR = pcmanfm_project +PCMANFM_CPE_ID_VALID = YES PCMANFM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk index 2828c98fb7..bb55c3c1d1 100644 --- a/package/picocom/picocom.mk +++ b/package/picocom/picocom.mk @@ -8,7 +8,7 @@ PICOCOM_VERSION = 2023-04 PICOCOM_SITE = $(call gitlab,wsakernel,picocom,$(PICOCOM_VERSION)) PICOCOM_LICENSE = GPL-2.0+ PICOCOM_LICENSE_FILES = LICENSE.txt -PICOCOM_CPE_ID_VENDOR = picocom_project +PICOCOM_CPE_ID_VALID = YES define PICOCOM_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index f58dbe43de..e393672c1e 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -8,7 +8,7 @@ POLKIT_VERSION = 123 POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING -POLKIT_CPE_ID_VENDOR = polkit_project +POLKIT_CPE_ID_VALID = YES POLKIT_INSTALL_STAGING = YES POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) diff --git a/package/popt/popt.mk b/package/popt/popt.mk index 5cee8e9673..06bab375f6 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -9,7 +9,7 @@ POPT_SITE = http://ftp.rpm.org/popt/releases/popt-1.x POPT_INSTALL_STAGING = YES POPT_LICENSE = MIT POPT_LICENSE_FILES = COPYING -POPT_CPE_ID_VENDOR = popt_project +POPT_CPE_ID_VALID = YES POPT_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) diff --git a/package/powerpc-utils/powerpc-utils.mk b/package/powerpc-utils/powerpc-utils.mk index 8d5491133b..ddeb830b07 100644 --- a/package/powerpc-utils/powerpc-utils.mk +++ b/package/powerpc-utils/powerpc-utils.mk @@ -10,7 +10,7 @@ POWERPC_UTILS_DEPENDENCIES = zlib numactl POWERPC_UTILS_AUTORECONF = YES POWERPC_UTILS_LICENSE = GPL-2.0+ POWERPC_UTILS_LICENSE_FILES = COPYING -POWERPC_UTILS_CPE_ID_VENDOR = powerpc-utils_project +POWERPC_UTILS_CPE_ID_VALID = YES POWERPC_UTILS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 46f75a48ef..ba8958d146 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -9,7 +9,7 @@ PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB -PROCPS_NG_CPE_ID_VENDOR = procps-ng_project +PROCPS_NG_CPE_ID_VALID = YES PROCPS_NG_INSTALL_STAGING = YES # We're patching configure.ac PROCPS_NG_AUTORECONF = YES diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk index ccabd4723f..2b3e86a1bc 100644 --- a/package/protobuf-c/protobuf-c.mk +++ b/package/protobuf-c/protobuf-c.mk @@ -13,7 +13,7 @@ PROTOBUF_C_CONF_OPTS = --disable-protoc PROTOBUF_C_INSTALL_STAGING = YES PROTOBUF_C_LICENSE = BSD-2-Clause PROTOBUF_C_LICENSE_FILES = LICENSE -PROTOBUF_C_CPE_ID_VENDOR = protobuf-c_project +PROTOBUF_C_CPE_ID_VALID = YES # when building with protoc (from host-protobuf) c++17 is now required HOST_PROTOBUF_C_CONF_ENV += CXXFLAGS="$(HOST_CXXFLAGS) -std=c++17" diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index beb8909088..3573cf1f09 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -9,7 +9,7 @@ PROXYCHAINS_NG_SOURCE = proxychains-ng-$(PROXYCHAINS_NG_VERSION).tar.xz PROXYCHAINS_NG_SITE = https://github.com/rofl0r/proxychains-ng/releases/download/v$(PROXYCHAINS_NG_VERSION) PROXYCHAINS_NG_LICENSE = GPL-2.0+ PROXYCHAINS_NG_LICENSE_FILES = COPYING -PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project +PROXYCHAINS_NG_CPE_ID_VALID = YES define PROXYCHAINS_NG_CONFIGURE_CMDS cd $(@D) && \ diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 9772788d2d..3935526af6 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -8,7 +8,7 @@ PUGIXML_VERSION = 1.14 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md -PUGIXML_CPE_ID_VENDOR = pugixml_project +PUGIXML_CPE_ID_VALID = YES PUGIXML_INSTALL_STAGING = YES diff --git a/package/pwgen/pwgen.mk b/package/pwgen/pwgen.mk index 89925bb300..90b5ac63fa 100644 --- a/package/pwgen/pwgen.mk +++ b/package/pwgen/pwgen.mk @@ -8,7 +8,7 @@ PWGEN_VERSION = 2.08 PWGEN_SITE = http://downloads.sourceforge.net/project/pwgen/pwgen/$(PWGEN_VERSION) PWGEN_LICENSE = GPL-2.0 PWGEN_LICENSE_FILES = debian/copyright -PWGEN_CPE_ID_VENDOR = pwgen_project +PWGEN_CPE_ID_VALID = YES $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/python-ecdsa/python-ecdsa.mk b/package/python-ecdsa/python-ecdsa.mk index d3d49c2520..321e87e0a3 100644 --- a/package/python-ecdsa/python-ecdsa.mk +++ b/package/python-ecdsa/python-ecdsa.mk @@ -10,6 +10,6 @@ PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/ff/7b/ba6547a76c468a PYTHON_ECDSA_SETUP_TYPE = setuptools PYTHON_ECDSA_LICENSE = MIT PYTHON_ECDSA_LICENSE_FILES = LICENSE -PYTHON_ECDSA_CPE_ID_VENDOR = python-ecdsa_project +PYTHON_ECDSA_CPE_ID_VALID = YES $(eval $(python-package)) diff --git a/package/python-engineio/python-engineio.mk b/package/python-engineio/python-engineio.mk index 7702b5f294..67092402b4 100644 --- a/package/python-engineio/python-engineio.mk +++ b/package/python-engineio/python-engineio.mk @@ -9,6 +9,6 @@ PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/e2/24/4a69dd119d1 PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE -PYTHON_ENGINEIO_CPE_ID_VENDOR = python-engineio_project +PYTHON_ENGINEIO_CPE_ID_VALID = YES $(eval $(python-package)) diff --git a/package/python-markdown2/python-markdown2.mk b/package/python-markdown2/python-markdown2.mk index 4c21eb98e8..a78e6ea0d8 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -10,6 +10,6 @@ PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/3c/e4/87a454674a PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt -PYTHON_MARKDOWN2_CPE_ID_VENDOR = python-markdown2_project +PYTHON_MARKDOWN2_CPE_ID_VALID = YES $(eval $(python-package)) diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk index 01b5c49b50..d84ba8b431 100644 --- a/package/python-rsa/python-rsa.mk +++ b/package/python-rsa/python-rsa.mk @@ -10,6 +10,6 @@ PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/aa/65/7d973b89c4d2351d PYTHON_RSA_SETUP_TYPE = setuptools PYTHON_RSA_LICENSE = Apache-2.0 PYTHON_RSA_LICENSE_FILES = LICENSE -PYTHON_RSA_CPE_ID_VENDOR = python-rsa_project +PYTHON_RSA_CPE_ID_VALID = YES $(eval $(python-package)) diff --git a/package/qdecoder/qdecoder.mk b/package/qdecoder/qdecoder.mk index c465617e26..9544dcf5e1 100644 --- a/package/qdecoder/qdecoder.mk +++ b/package/qdecoder/qdecoder.mk @@ -8,7 +8,7 @@ QDECODER_VERSION = 12.1.0 QDECODER_SITE = $(call github,wolkykim,qdecoder,v$(QDECODER_VERSION)) QDECODER_LICENSE = BSD-2-Clause QDECODER_LICENSE_FILES = COPYING -QDECODER_CPE_ID_VENDOR = qdecoder_project +QDECODER_CPE_ID_VALID = YES QDECODER_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' QDECODER_INSTALL_STAGING = YES diff --git a/package/qpdf/qpdf.mk b/package/qpdf/qpdf.mk index a58781f4f1..d479515789 100644 --- a/package/qpdf/qpdf.mk +++ b/package/qpdf/qpdf.mk @@ -9,7 +9,7 @@ QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION) QPDF_INSTALL_STAGING = YES QPDF_LICENSE = Apache-2.0 or Artistic-2.0 QPDF_LICENSE_FILES = LICENSE.txt Artistic-2.0 -QPDF_CPE_ID_VENDOR = qpdf_project +QPDF_CPE_ID_VALID = YES QPDF_DEPENDENCIES = host-pkgconf zlib jpeg QPDF_CONF_OPTS = --with-random=/dev/urandom diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index 665058d890..ac28792f20 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -18,6 +18,6 @@ endif QUAZIP_LICENSE = LGPL-2.1 QUAZIP_LICENSE_FILES = COPYING -QUAZIP_CPE_ID_VENDOR = quazip_project +QUAZIP_CPE_ID_VALID = YES $(eval $(cmake-package)) diff --git a/package/quickjs/quickjs.mk b/package/quickjs/quickjs.mk index 091862635e..186397f9aa 100644 --- a/package/quickjs/quickjs.mk +++ b/package/quickjs/quickjs.mk @@ -9,7 +9,7 @@ QUICKJS_SOURCE = quickjs-$(QUICKJS_VERSION).tar.xz QUICKJS_SITE = https://bellard.org/quickjs QUICKJS_LICENSE = MIT QUICKJS_LICENSE_FILES = LICENSE -QUICKJS_CPE_ID_VENDOR = quickjs_project +QUICKJS_CPE_ID_VALID = YES QUICKJS_INSTALL_STAGING = YES ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) diff --git a/package/rabbitmq-c/rabbitmq-c.mk b/package/rabbitmq-c/rabbitmq-c.mk index cac0f67ddc..5a0775f353 100644 --- a/package/rabbitmq-c/rabbitmq-c.mk +++ b/package/rabbitmq-c/rabbitmq-c.mk @@ -8,7 +8,7 @@ RABBITMQ_C_VERSION = 0.13.0 RABBITMQ_C_SITE = $(call github,alanxz,rabbitmq-c,v$(RABBITMQ_C_VERSION)) RABBITMQ_C_LICENSE = MIT RABBITMQ_C_LICENSE_FILES = LICENSE README.md -RABBITMQ_C_CPE_ID_VENDOR = rabbitmq-c_project +RABBITMQ_C_CPE_ID_VALID = YES RABBITMQ_C_INSTALL_STAGING = YES RABBITMQ_C_CONF_OPTS = \ -DBUILD_API_DOCS=OFF \ diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 99762ec0c7..3cc9d427a7 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -9,7 +9,7 @@ RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) RHASH_LICENSE = 0BSD RHASH_LICENSE_FILES = COPYING -RHASH_CPE_ID_VENDOR = rhash_project +RHASH_CPE_ID_VALID = YES RHASH_INSTALL_STAGING = YES RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 05b8d5c48e..288c20ee95 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -8,7 +8,7 @@ RIPGREP_VERSION = 14.1.0 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT -RIPGREP_CPE_ID_VENDOR = ripgrep_project +RIPGREP_CPE_ID_VALID = YES # CVE only impacts ripgrep on Windows RIPGREP_IGNORE_CVES += CVE-2021-3013 diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 933370c9a9..f50005343b 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -8,7 +8,7 @@ RNG_TOOLS_VERSION = 6.16 RNG_TOOLS_SITE = $(call github,nhorman,rng-tools,v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING -RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project +RNG_TOOLS_CPE_ID_VALID = YES RNG_TOOLS_SELINUX_MODULES = rngd RNG_TOOLS_DEPENDENCIES = host-pkgconf libcap openssl diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index 698894fda9..f50f1e5a1f 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -8,7 +8,7 @@ RP_PPPOE_VERSION = 3.15 RP_PPPOE_SITE = https://dianne.skoll.ca/projects/rp-pppoe/download RP_PPPOE_LICENSE = GPL-2.0 RP_PPPOE_LICENSE_FILES = doc/LICENSE -RP_PPPOE_CPE_ID_VENDOR = rp-pppoe_project +RP_PPPOE_CPE_ID_VALID = YES RP_PPPOE_DEPENDENCIES = pppd RP_PPPOE_SUBDIR = src diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk index 2eee116755..2c158213ad 100644 --- a/package/rpcbind/rpcbind.mk +++ b/package/rpcbind/rpcbind.mk @@ -9,7 +9,7 @@ RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIN RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 RPCBIND_LICENSE = BSD-3-Clause RPCBIND_LICENSE_FILES = COPYING -RPCBIND_CPE_ID_VENDOR = rpcbind_project +RPCBIND_CPE_ID_VALID = YES RPCBIND_SELINUX_MODULES = rpcbind RPCBIND_CONF_ENV += \ diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index 7c33a71f31..0af25c7936 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -8,7 +8,7 @@ RTL_433_VERSION = 23.11 RTL_433_SITE = $(call github,merbanan,rtl_433,$(RTL_433_VERSION)) RTL_433_LICENSE = GPL-2.0+ RTL_433_LICENSE_FILES = COPYING -RTL_433_CPE_ID_VENDOR = rtl_433_project +RTL_433_CPE_ID_VALID = YES # Force Release build to remove ASAN. RTL_433_CONF_OPTS = \ diff --git a/package/rtmpdump/rtmpdump.mk b/package/rtmpdump/rtmpdump.mk index fb381d0e10..4c8ecfe127 100644 --- a/package/rtmpdump/rtmpdump.mk +++ b/package/rtmpdump/rtmpdump.mk @@ -12,7 +12,7 @@ RTMPDUMP_INSTALL_STAGING = YES # care about librtmp, it's LGPL-2.1+ RTMPDUMP_LICENSE = LGPL-2.1+ RTMPDUMP_LICENSE_FILES = librtmp/COPYING -RTMPDUMP_CPE_ID_VENDOR = rtmpdump_project +RTMPDUMP_CPE_ID_VALID = YES RTMPDUMP_DEPENDENCIES = zlib ifeq ($(BR2_PACKAGE_GNUTLS),y) diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk index 83c40e684f..fe89e7747d 100644 --- a/package/sane-backends/sane-backends.mk +++ b/package/sane-backends/sane-backends.mk @@ -10,7 +10,7 @@ SANE_BACKENDS_SITE = \ SANE_BACKENDS_CONFIG_SCRIPTS = sane-config SANE_BACKENDS_LICENSE = GPL-2.0+ SANE_BACKENDS_LICENSE_FILES = COPYING -SANE_BACKENDS_CPE_ID_VENDOR = sane-backends_project +SANE_BACKENDS_CPE_ID_VALID = YES SANE_BACKENDS_INSTALL_STAGING = YES SANE_BACKENDS_CONF_OPTS = \ diff --git a/package/shellinabox/shellinabox.mk b/package/shellinabox/shellinabox.mk index 58c1668112..725b8d9c52 100644 --- a/package/shellinabox/shellinabox.mk +++ b/package/shellinabox/shellinabox.mk @@ -8,7 +8,7 @@ SHELLINABOX_VERSION = 2.20 SHELLINABOX_SITE = $(call github,shellinabox,shellinabox,v$(SHELLINABOX_VERSION)) SHELLINABOX_LICENSE = GPL-2.0 with OpenSSL exception SHELLINABOX_LICENSE_FILES = COPYING GPL-2 -SHELLINABOX_CPE_ID_VENDOR = shellinabox_project +SHELLINABOX_CPE_ID_VALID = YES # 0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch SHELLINABOX_IGNORE_CVES += CVE-2018-16789 diff --git a/package/spice/spice.mk b/package/spice/spice.mk index 5f7bcd9d2f..608a9413fe 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -9,7 +9,7 @@ SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases/spice-server SPICE_LICENSE = LGPL-2.1+ SPICE_LICENSE_FILES = COPYING -SPICE_CPE_ID_VENDOR = spice_project +SPICE_CPE_ID_VALID = YES SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ host-pkgconf \ diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 082104b6d4..b9fbf54b01 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -8,7 +8,7 @@ SQUASHFS_VERSION = 4.6.1 SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING -SQUASHFS_CPE_ID_VENDOR = squashfs_project +SQUASHFS_CPE_ID_VALID = YES SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y) diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index 5dad6aafc2..e829af0bba 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -9,7 +9,7 @@ SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz SSLH_SITE = http://www.rutschle.net/tech/sslh SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING -SSLH_CPE_ID_VENDOR = sslh_project +SSLH_CPE_ID_VALID = YES SSLH_DEPENDENCIES = pcre2 SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 6279622fdb..70b4a8f6c6 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -9,7 +9,7 @@ STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ STRACE_LICENSE_FILES = COPYING LGPL-2.1-or-later -STRACE_CPE_ID_VENDOR = strace_project +STRACE_CPE_ID_VALID = YES STRACE_CONF_OPTS = --enable-mpers=no ifeq ($(BR2_PACKAGE_LIBUNWIND),y) diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk index a7c7adade3..fc419e2867 100644 --- a/package/sylpheed/sylpheed.mk +++ b/package/sylpheed/sylpheed.mk @@ -10,7 +10,7 @@ SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.xz SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR) SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPL-2.1+ (library, attachment plugin) SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB -SYLPHEED_CPE_ID_VENDOR = sylpheed_project +SYLPHEED_CPE_ID_VALID = YES SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2 diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 7a46d759d3..083f505a2b 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -9,7 +9,7 @@ SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKL SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE SYSKLOGD_INSTALL_STAGING = YES -SYSKLOGD_CPE_ID_VENDOR = sysklogd_project +SYSKLOGD_CPE_ID_VALID = YES # Busybox install logger in /usr/bin, and syslogd in /sbin, so install in # the same locations so that busybox does not install its applets in there. diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index ec0c666157..f77a60b1da 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -11,7 +11,7 @@ SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ SYSSTAT_LICENSE_FILES = COPYING -SYSSTAT_CPE_ID_VENDOR = sysstat_project +SYSSTAT_CPE_ID_VALID = YES SYSSTAT_SELINUX_MODULES = sysstat ifeq ($(BR2_PACKAGE_LM_SENSORS),y) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index d371233cfe..528fe60b1d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -46,7 +46,7 @@ SYSTEMD_LICENSE_FILES = \ LICENSES/murmurhash2-public-domain.txt \ LICENSES/OFL-1.1.txt \ LICENSES/README.md -SYSTEMD_CPE_ID_VENDOR = systemd_project +SYSTEMD_CPE_ID_VALID = YES SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index b7fe39ca43..49c92ec2ac 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -9,7 +9,7 @@ SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit SYSVINIT_LICENSE = GPL-2.0+ SYSVINIT_LICENSE_FILES = COPYING -SYSVINIT_CPE_ID_VENDOR = sysvinit_project +SYSVINIT_CPE_ID_VALID = YES SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR) diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index c6ca776b27..d2cbf79e26 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -10,7 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.54 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING -TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project +TARGETCLI_FB_CPE_ID_VALID = YES TARGETCLI_FB_SETUP_TYPE = setuptools TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six diff --git a/package/tclap/tclap.mk b/package/tclap/tclap.mk index d7f96bd034..665bec2d67 100644 --- a/package/tclap/tclap.mk +++ b/package/tclap/tclap.mk @@ -9,7 +9,7 @@ TCLAP_SITE = http://downloads.sourceforge.net/project/tclap TCLAP_LICENSE = MIT TCLAP_LICENSE_FILES = COPYING TCLAP_INSTALL_STAGING = YES -TCLAP_CPE_ID_VENDOR = tclap_project +TCLAP_CPE_ID_VALID = YES # This package is a pure C++ template library, only made of headers. TCLAP_INSTALL_TARGET = NO diff --git a/package/tini/tini.mk b/package/tini/tini.mk index aa8e259db2..83e86237d4 100644 --- a/package/tini/tini.mk +++ b/package/tini/tini.mk @@ -8,7 +8,7 @@ TINI_VERSION = 0.19.0 TINI_SITE = $(call github,krallin,tini,v$(TINI_VERSION)) TINI_LICENSE = MIT TINI_LICENSE_FILES = LICENSE -TINI_CPE_ID_VENDOR = tini_project +TINI_CPE_ID_VALID = YES TINI_CFLAGS = $(TARGET_CFLAGS) \ -static \ diff --git a/package/tinyproxy/tinyproxy.mk b/package/tinyproxy/tinyproxy.mk index e91a886888..e989f70a22 100644 --- a/package/tinyproxy/tinyproxy.mk +++ b/package/tinyproxy/tinyproxy.mk @@ -9,7 +9,7 @@ TINYPROXY_SITE = https://github.com/tinyproxy/tinyproxy/releases/download/$(TINY TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.xz TINYPROXY_LICENSE = GPL-2.0+ TINYPROXY_LICENSE_FILES = COPYING -TINYPROXY_CPE_ID_VENDOR = tinyproxy_project +TINYPROXY_CPE_ID_VALID = YES # 0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch TINYPROXY_IGNORE_CVES += CVE-2022-40468 diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 8e706f1a1e..01c25f7c1c 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,7 +12,7 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README -TINYXML_CPE_ID_VENDOR = tinyxml_project +TINYXML_CPE_ID_VALID = YES # 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch TINYXML_IGNORE_CVES += CVE-2021-42260 diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index f53e8d6b99..044b8f82db 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -9,7 +9,7 @@ TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib TINYXML2_LICENSE_FILES = LICENSE.txt TINYXML2_INSTALL_STAGING = YES -TINYXML2_CPE_ID_VENDOR = tinyxml2_project +TINYXML2_CPE_ID_VALID = YES ifeq ($(BR2_STATIC_LIBS),y) TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index af06c8570b..533a82bbad 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -8,7 +8,7 @@ TMUX_VERSION = 3.3a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING -TMUX_CPE_ID_VENDOR = tmux_project +TMUX_CPE_ID_VALID = YES TMUX_DEPENDENCIES = libevent ncurses host-pkgconf ifeq ($(BR2_PACKAGE_SYSTEMD),y) diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 01b029d942..12f924eee5 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -8,7 +8,7 @@ TPM2_TOOLS_VERSION = 5.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE -TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project +TPM2_TOOLS_CPE_ID_VALID = YES TPM2_TOOLS_SELINUX_MODULES = tpm2 TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk index 4dca50c0b6..f6b56f6241 100644 --- a/package/trinity/trinity.mk +++ b/package/trinity/trinity.mk @@ -9,7 +9,7 @@ TRINITY_SITE = http://codemonkey.org.uk/projects/trinity TRINITY_SOURCE = trinity-$(TRINITY_VERSION).tar.xz TRINITY_LICENSE = GPL-2.0 TRINITY_LICENSE_FILES = COPYING -TRINITY_CPE_ID_VENDOR = trinity_project +TRINITY_CPE_ID_VALID = YES TRINITY_LDFLAGS = $(TARGET_LDFLAGS) diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk index 14ccedd48f..5effebee4a 100644 --- a/package/unzip/unzip.mk +++ b/package/unzip/unzip.mk @@ -10,7 +10,7 @@ UNZIP_PATCH = unzip_$(UNZIP_VERSION)-27.debian.tar.xz UNZIP_SITE = https://snapshot.debian.org/archive/debian/20220916T090657Z/pool/main/u/unzip UNZIP_LICENSE = Info-ZIP UNZIP_LICENSE_FILES = LICENSE -UNZIP_CPE_ID_VENDOR = unzip_project +UNZIP_CPE_ID_VALID = YES # unzip_$(UNZIP_VERSION)-27.debian.tar.xz has patches to fix: UNZIP_IGNORE_CVES = \ diff --git a/package/upx/upx.mk b/package/upx/upx.mk index d6c068fc3b..65f4bac517 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -9,7 +9,7 @@ UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING -UPX_CPE_ID_VENDOR = upx_project +UPX_CPE_ID_VALID = YES UPX_SUPPORTS_IN_SOURCE_BUILD = NO $(eval $(host-cmake-package)) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 60b69df3be..4a5028f509 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,7 +8,7 @@ USBGUARD_VERSION = 1.1.2 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE -USBGUARD_CPE_ID_VENDOR = usbguard_project +USBGUARD_CPE_ID_VALID = YES USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_ENV = ac_cv_prog_A2X="" USBGUARD_CONF_OPTS = \ diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index 5b68dc9864..df640577ac 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -8,7 +8,7 @@ VALIJSON_VERSION = 1.0.2 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE -VALIJSON_CPE_ID_VENDOR = valijson_project +VALIJSON_CPE_ID_VALID = YES VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO VALIJSON_CONF_OPTS = -Dvalijson_BUILD_TESTS=FALSE diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index 3e7b233e48..6742843c19 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -9,7 +9,7 @@ VSFTPD_SITE = https://security.appspot.com/downloads VSFTPD_LIBS = -lcrypt VSFTPD_LICENSE = GPL-2.0 VSFTPD_LICENSE_FILES = COPYING -VSFTPD_CPE_ID_VENDOR = vsftpd_project +VSFTPD_CPE_ID_VALID = YES VSFTPD_SELINUX_MODULES = ftp define VSFTPD_DISABLE_UTMPX diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk index 1eda717c68..aa0f14c456 100644 --- a/package/x11vnc/x11vnc.mk +++ b/package/x11vnc/x11vnc.mk @@ -12,7 +12,7 @@ X11VNC_CONF_OPTS = --without-sdl X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver X11VNC_LICENSE = GPL-2.0+ X11VNC_LICENSE_FILES = COPYING -X11VNC_CPE_ID_VENDOR = x11vnc_project +X11VNC_CPE_ID_VALID = YES # 0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch X11VNC_IGNORE_CVES += CVE-2020-29074 diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 6cc7e8febe..466d309940 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -10,7 +10,7 @@ XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h -XSCREENSAVER_CPE_ID_VENDOR = xscreensaver_project +XSCREENSAVER_CPE_ID_VALID = YES XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver XSCREENSAVER_DEPENDENCIES = \ diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index cd23c8728d..1a13cb9da8 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -9,6 +9,6 @@ YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING -YAJL_CPE_ID_VENDOR = yajl_project +YAJL_CPE_ID_VALID = YES $(eval $(cmake-package)) diff --git a/package/yaml-cpp/yaml-cpp.mk b/package/yaml-cpp/yaml-cpp.mk index 1f87956589..c259f1e531 100644 --- a/package/yaml-cpp/yaml-cpp.mk +++ b/package/yaml-cpp/yaml-cpp.mk @@ -9,7 +9,7 @@ YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,$(YAML_CPP_VERSION)) YAML_CPP_INSTALL_STAGING = YES YAML_CPP_LICENSE = MIT YAML_CPP_LICENSE_FILES = LICENSE -YAML_CPP_CPE_ID_VENDOR = yaml-cpp_project +YAML_CPP_CPE_ID_VALID = YES # Disable testing and parse tools YAML_CPP_CONF_OPTS += \ diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index 1a1e4eb24b..0e79004bb3 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -9,7 +9,7 @@ ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2 ZBAR_SITE = https://www.linuxtv.org/downloads/zbar ZBAR_LICENSE = LGPL-2.1+ ZBAR_LICENSE_FILES = LICENSE.md -ZBAR_CPE_ID_VENDOR = zbar_project +ZBAR_CPE_ID_VALID = YES ZBAR_INSTALL_STAGING = YES ZBAR_DEPENDENCIES = libv4l jpeg $(TARGET_NLS_DEPENDENCIES) # uses C99 features diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk index 347f482211..e5bbf6ff3b 100644 --- a/package/zlog/zlog.mk +++ b/package/zlog/zlog.mk @@ -8,7 +8,7 @@ ZLOG_VERSION = 1.2.17 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) ZLOG_LICENSE = Apache-2.0 ZLOG_LICENSE_FILES = LICENSE -ZLOG_CPE_ID_VENDOR = zlog_project +ZLOG_CPE_ID_VALID = YES ZLOG_INSTALL_STAGING = YES define ZLOG_BUILD_CMDS diff --git a/package/zziplib/zziplib.mk b/package/zziplib/zziplib.mk index 6b7b64cacc..6cb9dedce8 100644 --- a/package/zziplib/zziplib.mk +++ b/package/zziplib/zziplib.mk @@ -8,7 +8,7 @@ ZZIPLIB_VERSION = 0.13.72 ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm -ZZIPLIB_CPE_ID_VENDOR = zziplib_project +ZZIPLIB_CPE_ID_VALID = YES ZZIPLIB_INSTALL_STAGING = YES ZZIPLIB_CONF_OPTS += \ -DZZIPDOCS=OFF \ -- 2.43.0 From ju.o at free.fr Sat Feb 10 22:26:59 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 10 Feb 2024 23:26:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/jailhouse: install files to /usr Message-ID: <20240210222659.805747-1-ju.o@free.fr> The jailhouse package installs files in the /usr/local prefix. This is not convenient, because the jailhouse binary ends up in /usr/local/sbin, which is not in the default Buildroot PATH. See [1]. Moreover, all other Buildroot packages install files in /usr. This is because the Buildroot package recipe does not set any prefix value, and the upstream Jailhouse Makefile has a default to /usr/local. See [2]. This commit sets the prefix value in the JAILHOUSE_MAKE_OPTS and also updates other installation commands to put all the files in /usr. [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2023.11.1/system/Config.in#L495 [2] https://github.com/siemens/jailhouse/blob/v0.12/scripts/include.mk#L22 Signed-off-by: Julien Olivain --- package/jailhouse/jailhouse.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index c239e75e76..e7de40cf8c 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -15,7 +15,8 @@ JAILHOUSE_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(KERNEL_ARCH)" \ KDIR="$(LINUX_DIR)" \ - DESTDIR="$(TARGET_DIR)" + DESTDIR="$(TARGET_DIR)" \ + prefix=/usr ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) JAILHOUSE_DEPENDENCIES += \ @@ -60,8 +61,8 @@ define JAILHOUSE_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/jailhouse $(INSTALL) -D -m 0644 $(@D)/configs/*/*.cell $(TARGET_DIR)/etc/jailhouse - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/libexec/jailhouse/demos - $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/local/libexec/jailhouse/demos + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/libexec/jailhouse/demos + $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/libexec/jailhouse/demos $(JAILHOUSE_INSTALL_HELPER_SCRIPTS) endef -- 2.43.0 From ju.o at free.fr Sat Feb 10 22:29:40 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 10 Feb 2024 23:29:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/jailhouse: bump to commit e57d1ef Message-ID: <20240210222940.806905-1-ju.o@free.fr> The last Jailhouse tag is v0.12. It dates from 2020-02-04, which is 4 years old. This version no longer compiles with recent Kernels. This commit updates Jailhouse to the latest commit e57d1ef, which dates from 2023-01-10. For commit logs, see: https://github.com/siemens/jailhouse/commits/master/ Signed-off-by: Julien Olivain --- package/jailhouse/jailhouse.hash | 2 +- package/jailhouse/jailhouse.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jailhouse/jailhouse.hash b/package/jailhouse/jailhouse.hash index 297d0f1930..96d5819847 100644 --- a/package/jailhouse/jailhouse.hash +++ b/package/jailhouse/jailhouse.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3777a553c2acb2b693843fe4d16ab80333879daedd47d9c9f3717c9644e6cf93 jailhouse-0.12.tar.gz +sha256 38ea5d2d9672ce7f76fd0c163edaa8968711aca58f245aec3c8934f140e828b6 jailhouse-e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560.tar.gz sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index c239e75e76..907ad92c0f 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -4,8 +4,8 @@ # ################################################################################ -JAILHOUSE_VERSION = 0.12 -JAILHOUSE_SITE = $(call github,siemens,jailhouse,v$(JAILHOUSE_VERSION)) +JAILHOUSE_VERSION = e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560 +JAILHOUSE_SITE = $(call github,siemens,jailhouse,$(JAILHOUSE_VERSION)) JAILHOUSE_LICENSE = GPL-2.0 JAILHOUSE_LICENSE_FILES = COPYING JAILHOUSE_DEPENDENCIES = \ -- 2.43.0 From kadambini.nema at gmail.com Sun Feb 11 05:19:07 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 10 Feb 2024 21:19:07 -0800 Subject: [Buildroot] [PATCH 1/1] package/strace: bump to version 6.7 Message-ID: <20240211051907.551771-1-kadambini.nema@gmail.com> - Updated hash of COPYING (year updated with https://github.com/strace/strace/commit/eba0ac1fc4f8896b938d41081e0643cb06283a9b) Signed-off-by: Kadambini Nema --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 75a35d7cf4..a35d2b0be6 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.6/strace-6.6.tar.xz.asc -sha256 421b4186c06b705163e64dc85f271ebdcf67660af8667283147d5e859fc8a96c strace-6.6.tar.xz -sha256 6e5648c0ed522b163f9df1dc500c73491b1743495bd78388e99685cecfa79707 COPYING +# https://strace.io/files/6.7/strace-6.7.tar.xz.asc +sha256 2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7 strace-6.7.tar.xz +sha256 1988d0e1aa101d68855e8c4f940aacf2531051b82f6b608eb026c5fad1f33df1 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 6279622fdb..f916936207 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.6 +STRACE_VERSION = 6.7 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ -- 2.25.1 From kadambini.nema at gmail.com Sun Feb 11 09:14:22 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sun, 11 Feb 2024 01:14:22 -0800 Subject: [Buildroot] [PATCH 1/1] package/ustreamer: new package Message-ID: <20240211091422.597625-1-kadambini.nema@gmail.com> Lightweight and fast MJPEG-HTTP streamer (https://github.com/pikvm/ustreamer/tree/master#%C2%B5streamer) Signed-off-by: Kadambini Nema --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/ustreamer/Config.in | 17 +++++++++++++++++ package/ustreamer/ustreamer.hash | 3 +++ package/ustreamer/ustreamer.mk | 24 ++++++++++++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 package/ustreamer/Config.in create mode 100644 package/ustreamer/ustreamer.hash create mode 100644 package/ustreamer/ustreamer.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..cf22054970 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1870,6 +1870,9 @@ F: package/easy-rsa/ N: Justin Maggard F: package/dtach/ +N: Kadambini Nema +F: package/ustreamer/ + N: Kamel Bouhara F: package/libodb-boost/ F: package/libodb-mysql/ diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..ea3ecd6fdc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2596,6 +2596,7 @@ endif source "package/uredir/Config.in" source "package/ushare/Config.in" source "package/ussp-push/Config.in" + source "package/ustreamer/Config.in" source "package/vde2/Config.in" source "package/vdr/Config.in" source "package/vdr-plugin-vnsiserver/Config.in" diff --git a/package/ustreamer/Config.in b/package/ustreamer/Config.in new file mode 100644 index 0000000000..52c511e22d --- /dev/null +++ b/package/ustreamer/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_USTREAMER + bool "ustreamer" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 # V4L2_EVENT_SOURCE_CHANGE + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_ATOMIC + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBBSD + select BR2_PACKAGE_LIBGPIOD + help + Lightweight and fast MJPEG-HTTP streamer + + https://github.com/pikvm/ustreamer + +comment "ustreamer needs a toolchain w/ threads, headers >= 3.16, dynamic library" diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash new file mode 100644 index 0000000000..b7a85ca2d5 --- /dev/null +++ b/package/ustreamer/ustreamer.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 198283aaea5e7aa51da54426eb79ea436641ffb9b431e9ebace8fe5a76dfb105 ustreamer-b2ebcf99c8c51f97c44eccb6c768f5e824ecf952.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk new file mode 100644 index 0000000000..86ce18f476 --- /dev/null +++ b/package/ustreamer/ustreamer.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# ustreamer +# +################################################################################ + +USTREAMER_VERSION = b2ebcf99c8c51f97c44eccb6c768f5e824ecf952 +USTREAMER_SITE = $(call github,pikvm,ustreamer,$(USTREAMER_VERSION)) +USTREAMER_SUBDIR = ustreamer +USTREAMER_LICENSE = GPL-3.0-or-later +USTREAMER_LICENSE_FILES = $(USTREAMER_SUBDIR)/LICENSE +USTREAMER_DEPENDENCIES = jpeg libevent libbsd libgpiod +USTREAMER_CONF_ENV = "CFLAGS=$(TARGET_CFLAGS)" + +define USTREAMER_BUILD_CMDS + $(MAKE) $(if $(BR2_PACKAGE_SYSTEMD),WITH_SYSTEMD=1, ) WITH_PTHREAD_NP=1 WITH_SETPROCTITLE=1 HAS_PDEATHSIG=1 $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define USTREAMER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/ustreamer $(TARGET_DIR)/usr/bin/ustreamer + $(INSTALL) -D -m 0755 $(@D)/ustreamer-dump $(TARGET_DIR)/usr/bin/ustreamer-dump +endef + +$(eval $(generic-package)) -- 2.25.1 From yann.morin.1998 at free.fr Sun Feb 11 09:35:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 10:35:18 +0100 Subject: [Buildroot] [git commit] package/jailhouse: bump to commit e57d1ef Message-ID: <20240211093811.23CC6820E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52b43a12472a9853ff5d69b136144427c41f2803 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The last Jailhouse tag is v0.12. It dates from 2020-02-04, which is 4 years old. This version no longer compiles with recent Kernels. This commit updates Jailhouse to the latest commit e57d1ef, which dates from 2023-01-10. For commit logs, see: https://github.com/siemens/jailhouse/commits/master/ Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/jailhouse/jailhouse.hash | 2 +- package/jailhouse/jailhouse.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jailhouse/jailhouse.hash b/package/jailhouse/jailhouse.hash index 297d0f1930..96d5819847 100644 --- a/package/jailhouse/jailhouse.hash +++ b/package/jailhouse/jailhouse.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3777a553c2acb2b693843fe4d16ab80333879daedd47d9c9f3717c9644e6cf93 jailhouse-0.12.tar.gz +sha256 38ea5d2d9672ce7f76fd0c163edaa8968711aca58f245aec3c8934f140e828b6 jailhouse-e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560.tar.gz sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index e7de40cf8c..b5a8b40fdd 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -4,8 +4,8 @@ # ################################################################################ -JAILHOUSE_VERSION = 0.12 -JAILHOUSE_SITE = $(call github,siemens,jailhouse,v$(JAILHOUSE_VERSION)) +JAILHOUSE_VERSION = e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560 +JAILHOUSE_SITE = $(call github,siemens,jailhouse,$(JAILHOUSE_VERSION)) JAILHOUSE_LICENSE = GPL-2.0 JAILHOUSE_LICENSE_FILES = COPYING JAILHOUSE_DEPENDENCIES = \ From yann.morin.1998 at free.fr Sun Feb 11 09:31:41 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 10:31:41 +0100 Subject: [Buildroot] [git commit] package/jailhouse: install files to /usr Message-ID: <20240211093811.19E0E873FA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e40ca97d71330c153041b4db856698be8a47c823 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The jailhouse package installs files in the /usr/local prefix. This is not convenient, because the jailhouse binary ends up in /usr/local/sbin, which is not in the default Buildroot PATH. See [1]. Moreover, all other Buildroot packages install files in /usr. This is because the Buildroot package recipe does not set any prefix value, and the upstream Jailhouse Makefile has a default to /usr/local. See [2]. This commit sets the prefix value in the JAILHOUSE_MAKE_OPTS and also updates other installation commands to put all the files in /usr. [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2023.11.1/system/Config.in#L495 [2] https://github.com/siemens/jailhouse/blob/v0.12/scripts/include.mk#L22 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/jailhouse/jailhouse.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index c239e75e76..e7de40cf8c 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -15,7 +15,8 @@ JAILHOUSE_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(KERNEL_ARCH)" \ KDIR="$(LINUX_DIR)" \ - DESTDIR="$(TARGET_DIR)" + DESTDIR="$(TARGET_DIR)" \ + prefix=/usr ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) JAILHOUSE_DEPENDENCIES += \ @@ -60,8 +61,8 @@ define JAILHOUSE_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/jailhouse $(INSTALL) -D -m 0644 $(@D)/configs/*/*.cell $(TARGET_DIR)/etc/jailhouse - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/libexec/jailhouse/demos - $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/local/libexec/jailhouse/demos + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/libexec/jailhouse/demos + $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/libexec/jailhouse/demos $(JAILHOUSE_INSTALL_HELPER_SCRIPTS) endef From yann.morin.1998 at free.fr Sun Feb 11 09:38:43 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 10:38:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/jailhouse: install files to /usr In-Reply-To: <20240210222659.805747-1-ju.o@free.fr> References: <20240210222659.805747-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-10 23:26 +0100, Julien Olivain spake thusly: > The jailhouse package installs files in the /usr/local prefix. This is > not convenient, because the jailhouse binary ends up in /usr/local/sbin, > which is not in the default Buildroot PATH. See [1]. Moreover, all > other Buildroot packages install files in /usr. > > This is because the Buildroot package recipe does not set any prefix > value, and the upstream Jailhouse Makefile has a default to /usr/local. > See [2]. > > This commit sets the prefix value in the JAILHOUSE_MAKE_OPTS and also > updates other installation commands to put all the files in /usr. > > [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2023.11.1/system/Config.in#L495 > [2] https://github.com/siemens/jailhouse/blob/v0.12/scripts/include.mk#L22 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/jailhouse/jailhouse.mk | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk > index c239e75e76..e7de40cf8c 100644 > --- a/package/jailhouse/jailhouse.mk > +++ b/package/jailhouse/jailhouse.mk > @@ -15,7 +15,8 @@ JAILHOUSE_MAKE_OPTS = \ > CROSS_COMPILE="$(TARGET_CROSS)" \ > ARCH="$(KERNEL_ARCH)" \ > KDIR="$(LINUX_DIR)" \ > - DESTDIR="$(TARGET_DIR)" > + DESTDIR="$(TARGET_DIR)" \ > + prefix=/usr > > ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) > JAILHOUSE_DEPENDENCIES += \ > @@ -60,8 +61,8 @@ define JAILHOUSE_INSTALL_TARGET_CMDS > $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/jailhouse > $(INSTALL) -D -m 0644 $(@D)/configs/*/*.cell $(TARGET_DIR)/etc/jailhouse > > - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/libexec/jailhouse/demos > - $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/local/libexec/jailhouse/demos > + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/libexec/jailhouse/demos > + $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/libexec/jailhouse/demos > > $(JAILHOUSE_INSTALL_HELPER_SCRIPTS) > endef > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 11 09:38:58 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 10:38:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/minisign: needs threads Message-ID: <20240211093858.14022-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit d90ac63d9b3448a239bb9aa8030326699a3fdc3d: Could NOT find Threads (missing: Threads_FOUND) Fixes: - http://autobuild.buildroot.org/results/8d63a88291de945661a936d2437917a3428de276 Signed-off-by: Fabrice Fontaine --- package/minisign/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/minisign/Config.in b/package/minisign/Config.in index b852903921..a211177925 100644 --- a/package/minisign/Config.in +++ b/package/minisign/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MINISIGN bool "minisign" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBSODIUM select BR2_PACKAGE_LIBSODIUM_FULL help @@ -7,3 +8,6 @@ config BR2_PACKAGE_MINISIGN signatures. https://github.com/jedisct1/minisign + +comment "minisign needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 11 09:57:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 10:57:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/jailhouse: bump to commit e57d1ef In-Reply-To: <20240210222940.806905-1-ju.o@free.fr> References: <20240210222940.806905-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-10 23:29 +0100, Julien Olivain spake thusly: > The last Jailhouse tag is v0.12. It dates from 2020-02-04, which is > 4 years old. This version no longer compiles with recent Kernels. > > This commit updates Jailhouse to the latest commit e57d1ef, which > dates from 2023-01-10. I wonder how relevant it is to keep a security-related package that hasn't had any release in 4 years, and that has not had a single commit for more than a year now. I mean, the system partitiomnning provided by Jailhouse, apart from separating resource usage, is a mean of protecting the various cells from each other, so the compromise of one does not trickle down to the other cells and to the rest of the system. Carlo, do you have any insights as to where Jailhouse might be going in the future? > For commit logs, see: > https://github.com/siemens/jailhouse/commits/master/ > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/jailhouse/jailhouse.hash | 2 +- > package/jailhouse/jailhouse.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/jailhouse/jailhouse.hash b/package/jailhouse/jailhouse.hash > index 297d0f1930..96d5819847 100644 > --- a/package/jailhouse/jailhouse.hash > +++ b/package/jailhouse/jailhouse.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 3777a553c2acb2b693843fe4d16ab80333879daedd47d9c9f3717c9644e6cf93 jailhouse-0.12.tar.gz > +sha256 38ea5d2d9672ce7f76fd0c163edaa8968711aca58f245aec3c8934f140e828b6 jailhouse-e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560.tar.gz > sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING > diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk > index c239e75e76..907ad92c0f 100644 > --- a/package/jailhouse/jailhouse.mk > +++ b/package/jailhouse/jailhouse.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -JAILHOUSE_VERSION = 0.12 > -JAILHOUSE_SITE = $(call github,siemens,jailhouse,v$(JAILHOUSE_VERSION)) > +JAILHOUSE_VERSION = e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560 > +JAILHOUSE_SITE = $(call github,siemens,jailhouse,$(JAILHOUSE_VERSION)) > JAILHOUSE_LICENSE = GPL-2.0 > JAILHOUSE_LICENSE_FILES = COPYING > JAILHOUSE_DEPENDENCIES = \ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ju.o at free.fr Sun Feb 11 10:12:12 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 11 Feb 2024 11:12:12 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add jailhouse runtime test Message-ID: <20240211101212.171127-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + .../testing/tests/package/test_jailhouse.py | 103 ++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 support/testing/tests/package/test_jailhouse.py diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..1826fd59c6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1792,6 +1792,7 @@ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ F: support/testing/tests/package/test_kexec.py diff --git a/support/testing/tests/package/test_jailhouse.py b/support/testing/tests/package/test_jailhouse.py new file mode 100644 index 0000000000..4634fc4de2 --- /dev/null +++ b/support/testing/tests/package/test_jailhouse.py @@ -0,0 +1,103 @@ +import os +import time + +import infra.basetest + + +class TestJailhouse(infra.basetest.BRTest): + # This test uses a specific configuration, mainly for matching the + # requirements of the Jailhouse Qemu inmate demo. We also use the + # Linux kernel from Siemens, which includes patches for + # Jailhouse. Finally, we use the kernel config from + # board/qemu/aarch64-virt rather than the Kernel defconfig, for + # faster build (as it enable less components, but includes + # everything needed for this test). + kernel_ver = "eb6927f7eea77f823b96c0c22ad9d4a2d7ffdfce" + kernel_url = \ + f"$(call github,siemens,linux,{kernel_ver})/linux-{kernel_ver}.tar.gz" + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_TARBALL=y + BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="{kernel_url}" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_JAILHOUSE=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + # Qemu option and Kernel args are taken from Jailhouse demo. See: + # https://github.com/siemens/jailhouse/blob/master/README.md + # We also add oops=panic to improve the test coverage. + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0 mem=768M oops=panic"], + options=["-M", "virt,gic-version=3,virtualization=on,its=off", + "-cpu", "cortex-a57", + "-m", "1G", + "-smp", "16", + "-drive", f"file={drive},if=none,format=raw,id=hd0", + "-device", "virtio-blk-device,drive=hd0"]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("jailhouse --version") + + # Load the kernel module. + self.assertRunOk("modprobe jailhouse") + + # Check the device is present. + self.assertRunOk("ls -al /dev/jailhouse") + + # Load the cell config this this qemu test. + self.assertRunOk("jailhouse enable /etc/jailhouse/qemu-arm64.cell") + + # Dump the jailhouse console, and check we see its + # initialization string. + out, ret = self.emulator.run("jailhouse console") + self.assertEqual(ret, 0) + self.assertIn("Initializing Jailhouse hypervisor", "\n".join(out)) + + # Create the cell. + cell_cfg = "/etc/jailhouse/qemu-arm64-inmate-demo.cell" + cmd = f"jailhouse cell create {cell_cfg}" + self.assertRunOk(cmd) + + # Load the demo image. + cell_name = "inmate-demo" + img = "/usr/libexec/jailhouse/demos/gic-demo.bin" + cmd = f"jailhouse cell load {cell_name} {img}" + self.assertRunOk(cmd) + + # List Jailhouse cells and check we see the one we loaded. + out, ret = self.emulator.run("jailhouse cell list") + self.assertEqual(ret, 0) + self.assertIn(cell_name, "\n".join(out)) + + # We should also see our cell in sysfs. + cmd = "cat /sys/devices/jailhouse/cells/1/name" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], cell_name) + + # Start the cell. + self.assertRunOk(f"jailhouse cell start {cell_name}") + + # Let the demo cell run for few seconds... + time.sleep(3) + + # Stop and unload the cell. + self.assertRunOk(f"jailhouse cell shutdown {cell_name}") + self.assertRunOk(f"jailhouse cell destroy {cell_name}") + + # Stop and unload jailhouse. + self.assertRunOk("jailhouse disable") + self.assertRunOk("modprobe -r jailhouse") -- 2.43.0 From kilian.zinnecker at mail.de Sun Feb 11 12:08:54 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sun, 11 Feb 2024 13:08:54 +0100 Subject: [Buildroot] [PATCH v3 0/2] Add board support for the BeagleV-Ahead Message-ID: <20240211120857.6622-1-kilian.zinnecker@mail.de> This patch series adds board support for the BeagleV-Ahead. This patch series introduces a package which fetches binaries for the SoC, i.e., one binary blob for an on-chip FPGA and one binary blob for audio. Currently they are not used, but are intended to be used in the future. This board support generates an image suitable for SD card. The boot command for uboot to boot the kernel could not easily be changed. It seemed that a default boot command was persisent and any change to it by normal means (e.g., uboot config parameters like CONFIG_BOOT_COMMAND) did not have any effect. Hence a patch for the custom u-boot is introduced for now, to insert the proper boot command. v2 -> v3: - Added brief description what the xuantie bin binaries are for - Unrolled loop in XUANTIE_BINS_INSTALL_IMAGES_CMDS of package/xuantie-bins/xuantie-bins.mk - Added a second product page link to board's readme.txt - Added URL to the product page to git commit message - Dropped "_CUSTOM" from all "BR2_RISCV_ISA_*" in the board's defconfig - Add description to the board's readme.txt and defconfig why GCC v13 is chosen - Added BR2_PACKAGE_HOST_DOSFSTOOLS to board's defconfig v1 -> v2: - Added hash file for xuantie-bins package - Now uses uEnv.txt for actual boot commands - Removed extlinux.conf - Removed superflous comments inside config files Kilian Zinnecker (2): package/xuantie-bins: new package configs/beaglev_ahead: new defconfig DEVELOPERS | 3 + board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ board/beaglev-ahead/linux.fragment | 2 + .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ board/beaglev-ahead/post-image.sh | 6 ++ board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ board/beaglev-ahead/uEnv.txt | 4 + board/beaglev-ahead/uboot.fragment | 2 + configs/beaglev_ahead_defconfig | 46 +++++++++++ package/Config.in | 1 + package/xuantie-bins/Config.in | 8 ++ package/xuantie-bins/xuantie-bins.hash | 1 + package/xuantie-bins/xuantie-bins.mk | 23 ++++++ 13 files changed, 266 insertions(+) create mode 100644 board/beaglev-ahead/genimage.cfg create mode 100644 board/beaglev-ahead/linux.fragment create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch create mode 100755 board/beaglev-ahead/post-image.sh create mode 100644 board/beaglev-ahead/readme.txt create mode 100644 board/beaglev-ahead/uEnv.txt create mode 100644 board/beaglev-ahead/uboot.fragment create mode 100644 configs/beaglev_ahead_defconfig create mode 100644 package/xuantie-bins/Config.in create mode 100644 package/xuantie-bins/xuantie-bins.hash create mode 100644 package/xuantie-bins/xuantie-bins.mk -- 2.34.1 From kilian.zinnecker at mail.de Sun Feb 11 12:08:55 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sun, 11 Feb 2024 13:08:55 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/xuantie-bins: new package In-Reply-To: <20240211120857.6622-1-kilian.zinnecker@mail.de> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> Message-ID: <20240211120857.6622-2-kilian.zinnecker@mail.de> This patch adds a package for Xuantie binary blobs. These binaries are needed for the BeagleV-Ahead. Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 1 + package/Config.in | 1 + package/xuantie-bins/Config.in | 8 ++++++++ package/xuantie-bins/xuantie-bins.hash | 1 + package/xuantie-bins/xuantie-bins.mk | 23 +++++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/xuantie-bins/Config.in create mode 100644 package/xuantie-bins/xuantie-bins.hash create mode 100644 package/xuantie-bins/xuantie-bins.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..fa0596fd6b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1894,6 +1894,7 @@ F: board/radxa/rock5b/ F: configs/rock5b_defconfig F: configs/avnet_rzboard_v2l_defconfig F: package/rockchip-rkbin/ +F: package/xuantie-bins/ N: Klaus Heinrich Kiwi F: package/wqy-zenhei/ diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..5e28fb6e88 100644 --- a/package/Config.in +++ b/package/Config.in @@ -657,6 +657,7 @@ endmenu source "package/wipe/Config.in" source "package/xorriso/Config.in" source "package/xr819-xradio/Config.in" + source "package/xuantie-bins/Config.in" endmenu menu "Interpreter languages and scripting" diff --git a/package/xuantie-bins/Config.in b/package/xuantie-bins/Config.in new file mode 100644 index 0000000000..40388edd06 --- /dev/null +++ b/package/xuantie-bins/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_XUANTIE_BINS + bool "xuantie-bins" + depends on BR2_riscv + help + This package provides binary blobs, needed for the + BeagleV-Ahead's SoC (TH1520). They contain an FPGA binary + (light_aon_fpga.bin) for power management and a binary for + the audio system (light_c906_audio.bin). diff --git a/package/xuantie-bins/xuantie-bins.hash b/package/xuantie-bins/xuantie-bins.hash new file mode 100644 index 0000000000..4d1ec297c9 --- /dev/null +++ b/package/xuantie-bins/xuantie-bins.hash @@ -0,0 +1 @@ +sha256 608e9fec79823996004f65ba692a76d741307b0de23552d147ad1b567e7054dc xuantie-bins-0a2e02bb53758cc12448d8670e65c854528a96b4-br1.tar.gz diff --git a/package/xuantie-bins/xuantie-bins.mk b/package/xuantie-bins/xuantie-bins.mk new file mode 100644 index 0000000000..6db18685bc --- /dev/null +++ b/package/xuantie-bins/xuantie-bins.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# xuantie-bins +# +################################################################################ + +XUANTIE_BINS_VERSION = 0a2e02bb53758cc12448d8670e65c854528a96b4 +XUANTIE_BINS_SITE = https://github.com/beagleboard/xuantie-ubuntu.git +XUANTIE_BINS_SITE_METHOD = git +XUANTIE_BINS_LICENSE = PROPRIETARY + +XUANTIE_BINS_INSTALL_IMAGES = YES +XUANTIE_BINS_INSTALL_TARGET = NO + +XUANTIE_BINS_FPGA_BIN_FILENAME = "bins/light_aon_fpga.bin" +XUANTIE_BINS_AUDIO_BIN_FILENAME = "bins/light_c906_audio.bin" + +define XUANTIE_BINS_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(XUANTIE_BINS_FPGA_BIN_FILENAME) + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(XUANTIE_BINS_AUDIO_BIN_FILENAME) +endef + +$(eval $(generic-package)) -- 2.34.1 From kilian.zinnecker at mail.de Sun Feb 11 12:08:56 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sun, 11 Feb 2024 13:08:56 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <20240211120857.6622-1-kilian.zinnecker@mail.de> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> Message-ID: <20240211120857.6622-3-kilian.zinnecker@mail.de> This patch adds board support for the BeagleV-Ahead. It uses a custom kernel for the board's SoC. As the SoC has an outdated and currently not supported version of the RISC-V vector extension, the vector extension is disabled. The used OpenSBI version for this board support does not define the neccessary flags for GCC 12 to activate the zicsr and zifencei extensions. Therefore this board support uses GCC 13. https://www.beagleboard.org/boards/beaglev-ahead Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 2 + board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ board/beaglev-ahead/linux.fragment | 2 + .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ board/beaglev-ahead/post-image.sh | 6 ++ board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ board/beaglev-ahead/uEnv.txt | 4 + board/beaglev-ahead/uboot.fragment | 2 + configs/beaglev_ahead_defconfig | 46 +++++++++++ 9 files changed, 232 insertions(+) create mode 100644 board/beaglev-ahead/genimage.cfg create mode 100644 board/beaglev-ahead/linux.fragment create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch create mode 100755 board/beaglev-ahead/post-image.sh create mode 100644 board/beaglev-ahead/readme.txt create mode 100644 board/beaglev-ahead/uEnv.txt create mode 100644 board/beaglev-ahead/uboot.fragment create mode 100644 configs/beaglev_ahead_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index fa0596fd6b..3ede2a111d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1890,9 +1890,11 @@ F: package/libcamera/ N: Kilian Zinnecker F: board/avnet/rzboard_v2l/ +F: board/beaglev-ahead/ F: board/radxa/rock5b/ F: configs/rock5b_defconfig F: configs/avnet_rzboard_v2l_defconfig +F: configs/beaglev_ahead_defconfig F: package/rockchip-rkbin/ F: package/xuantie-bins/ diff --git a/board/beaglev-ahead/genimage.cfg b/board/beaglev-ahead/genimage.cfg new file mode 100644 index 0000000000..080b169527 --- /dev/null +++ b/board/beaglev-ahead/genimage.cfg @@ -0,0 +1,62 @@ +# SD card image for BeagleV-Ahead + +image boot.vfat { + vfat { + files = { + "fw_dynamic.bin", + "Image", + "light_aon_fpga.bin", + "light-beagle.dtb", + "light_c906_audio.bin", + } + + file uEnv.txt { + image = "uEnv.txt" + } + + file overlays/BBORG_LOAD-00A2.dtbo { + image = "overlays/BBORG_LOAD-00A2.dtbo" + } + + file overlays/BBORG_RELAY-00A2.dtbo { + image = "overlays/BBORG_RELAY-00A2.dtbo" + } + + file overlays/BONE-LED_P8_03.dtbo { + image = "overlays/BONE-LED_P8_03.dtbo" + } + + file overlays/BONE-LED_P9_11.dtbo { + image = "overlays/BONE-LED_P9_11.dtbo" + } + + file overlays/BVA-MIKROBUS-0.dtbo { + image = "overlays/BVA-MIKROBUS-0.dtbo" + } + } + size = 48M +} + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 2M + } + + partition uboot { + in-partition-table = "false" + image = "u-boot-with-spl.bin" + offset = 0 + holes = {"(440; 1048576)"} + } + + partition boot { + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + image = "rootfs.ext2" + } +} + diff --git a/board/beaglev-ahead/linux.fragment b/board/beaglev-ahead/linux.fragment new file mode 100644 index 0000000000..00f93f39a4 --- /dev/null +++ b/board/beaglev-ahead/linux.fragment @@ -0,0 +1,2 @@ +# CONFIG_VECTOR is not set +# CONFIG_VECTOR_0_7 is not set diff --git a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch new file mode 100644 index 0000000000..bcf5b965ce --- /dev/null +++ b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch @@ -0,0 +1,30 @@ +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 +From: Kilian Zinnecker +Date: Mon, 21 Aug 2023 23:51:59 +0200 +Subject: [PATCH] Overwrite bootcmd by force + +This patch is a dirty hack: Trying to overwrite the bootcmd via the +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted +to some preset value and could not be changed easily. Therefore a +hook is used to force the bootcmd to be overwritten. + +Signed-off-by: Kilian Zinnecker +--- + board/thead/light-c910/light.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c +index 8d5478e916..1448db974e 100644 +--- a/board/thead/light-c910/light.c ++++ b/board/thead/light-c910/light.c +@@ -2282,6 +2282,7 @@ int board_late_init(void) + light_usb_boot_check(); + do_firmware_load(); + ap_peri_clk_disable(); ++ run_command("load mmc 1:1 $ramdisk_addr_r uEnv.txt; env import -t $ramdisk_addr_r $filesize; run uenvcmd", 0); + return 0; + } + +-- +2.34.1 + diff --git a/board/beaglev-ahead/post-image.sh b/board/beaglev-ahead/post-image.sh new file mode 100755 index 0000000000..9e16eeff3f --- /dev/null +++ b/board/beaglev-ahead/post-image.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -e + +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ ${BINARIES_DIR} +cp board/beaglev-ahead/uEnv.txt ${BINARIES_DIR}/ +support/scripts/genimage.sh -c board/beaglev-ahead/genimage.cfg diff --git a/board/beaglev-ahead/readme.txt b/board/beaglev-ahead/readme.txt new file mode 100644 index 0000000000..758082a792 --- /dev/null +++ b/board/beaglev-ahead/readme.txt @@ -0,0 +1,78 @@ +BeagleV-Ahead +============== +https://www.beagleboard.org/boards/beaglev-ahead +https://forum.beagleboard.org/c/beaglev/ + +The SoC (TH1520) of the BeagleV-Ahead implements an outdated and +currently not supported version of the RISC-V vector extension. Hence, +the vector extension is disabled. The used OpenSBI version for this +board support does not define the neccessary flags for GCC 12 to +activate the zicsr and zifencei extensions. Therefore this board +support uses GCC 13. + +Build: +====== + $ make beaglev_ahead_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +??? boot.vfat +??? bootloader-JH7100-buildroot.bin.out +??? ddrinit-2133-buildroot.bin.out +??? fw_dynamic.bin +??? fw_dynamic.elf +??? fw_jump.bin +??? fw_jump.elf +??? fw_payload.bin +??? fw_payload.elf +??? Image +??? light-beagle.dtb +??? light_aon_fpga.bin +??? light_c906_audio.bin +??? overlays +??? rootfs.ext2 +??? rootfs.ext4 +??? rootfs.tar +??? sdcard.img +??? u-boot-with-spl.bin +??? u-boot.bin +??? uEnv.txt + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +SD card boot button: +-------------------- +To let the board boot from SD card, keep the "SD button" pressed during power +up / power cycle. The button is near the SD card slot. + +Serial console: +--------------- +The BeagleV-Ahead has a "Debug" GPIO header. Its layout can be seen here: +https://docs.beagleboard.org/latest/boards/beaglev/ahead/02-quick-start.html#access-uart-debug-console + +Note, that there are reported issues with some uart interface cables/dongles: +https://forum.beagleboard.org/t/beaglev-ahead-debug-terminal-problems/35331 + +Baudrate for this board is 115200. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +wiki link: +---------- +https://docs.beagleboard.org/latest/boards/beaglev/ahead/index.html diff --git a/board/beaglev-ahead/uEnv.txt b/board/beaglev-ahead/uEnv.txt new file mode 100644 index 0000000000..7e98ae5f81 --- /dev/null +++ b/board/beaglev-ahead/uEnv.txt @@ -0,0 +1,4 @@ +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} +uenvcmd=fatload mmc 1:1 ${kernel_addr_r} Image; fatload mmc 1:1 ${fdt_addr_r} light-beagle.dtb +bootargs=root=/dev/mmcblk1p2 rootfstype=ext4 rootwait ro console=ttyS0,115200 earlycon clk_ignore_unused net.ifnames=0 + diff --git a/board/beaglev-ahead/uboot.fragment b/board/beaglev-ahead/uboot.fragment new file mode 100644 index 0000000000..1f51cef106 --- /dev/null +++ b/board/beaglev-ahead/uboot.fragment @@ -0,0 +1,2 @@ +CONFIG_LEGACY_IMAGE_FORMAT=y +CONFIG_AUTOBOOT=y diff --git a/configs/beaglev_ahead_defconfig b/configs/beaglev_ahead_defconfig new file mode 100644 index 0000000000..9000b1f0ad --- /dev/null +++ b/configs/beaglev_ahead_defconfig @@ -0,0 +1,46 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_RVM=y +BR2_RISCV_ISA_RVA=y +BR2_RISCV_ISA_RVF=y +BR2_RISCV_ISA_RVD=y +BR2_RISCV_ISA_RVC=y +# Use GCC 13 for OpenSBI zicsr zifencei issue +BR2_GCC_VERSION_13_X=y +BR2_GLOBAL_PATCH_DIR="board/beaglev-ahead/patches" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglev-ahead/post-image.sh" +BR2_TARGET_GENERIC_HOSTNAME="BeagleV-Ahead" +BR2_TARGET_GENERIC_ISSUE="Welcome to the BeagleV-Ahead" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/linux/archive/refs/heads/beaglev-v5.10.113-1.1.2-ubuntu.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="beaglev" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/light-beagle" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/linux.fragment" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_BEAGLEV_DDRINIT=y +BR2_TARGET_BEAGLEV_SECONDBOOT=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-opensbi/archive/refs/heads/0.9-1.1.2-ubuntu.tar.gz" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-u-boot/archive/refs/heads/beaglev-v2020.01-1.1.2-ubuntu.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="light_beagle" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragment" +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_XUANTIE_BINS=y -- 2.34.1 From kilian.zinnecker at mail.de Sun Feb 11 12:15:35 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Sun, 11 Feb 2024 13:15:35 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/xuantie-bins: new package In-Reply-To: <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-2-kilian.zinnecker@mail.de> <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> Message-ID: <6015348.lOV4Wx5bFT@laptop> Hello Giulio, all, [--SNIP--] > can you please provide a separate patch to alphabetize? I did so: https://gitlab.com/buildroot.org/buildroot/-/commit/ 53fad3242d74b9fad11978429d6cc2879f783f4b However, unfortunately Thomas de-alphabetized it again when he applied my RZBoard V2L patches: https://gitlab.com/buildroot.org/buildroot/-/commit/ f003675119c9ca503afa19c04074e81c49538baf I just send a v3 of the BeagleV-Ahead patches. After we get this series applied, I will then again send a single patch to alphabetize. [--SNIP--] > > --- /dev/null > > +++ b/package/xuantie-bins/Config.in > > @@ -0,0 +1,6 @@ > > +config BR2_PACKAGE_XUANTIE_BINS > > + bool "xuantie-bins" > > + depends on BR2_riscv > > + help > > + This package provides binary blobs, needed for the > > + BeagleV-Ahead's SoC (TH1520). > > Can you please describe a bit what those binaries are meant for? I gave a brief description, but I don't know much about these. Maybe Robert can give even more information, if more is needed? [--SNIP--] > > +XUANTIE_BINS_FPGA_BIN_FILENAME = "bins/light_aon_fpga.bin" > > +XUANTIE_BINS_AUDIO_BIN_FILENAME = "bins/light_c906_audio.bin" > > + > > +define XUANTIE_BINS_INSTALL_IMAGES_CMDS > > + $(foreach f, \ > > + $(XUANTIE_BINS_FPGA_BIN_FILENAME) \ > > + $(XUANTIE_BINS_AUDIO_BIN_FILENAME) \ > > + , \ > > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(f) > > + ) > > +endef > > Being only 2 files to be installed I'd prefer to see 2 lines instead of > foreach loop. Can you please change it accordingly? I unrolled the loop in my v3 of the patches. Thanks for reviewing and best regards, Kilian From kilian.zinnecker at mail.de Sun Feb 11 12:24:57 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Sun, 11 Feb 2024 13:24:57 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <8f6baf1d-3caa-4b47-aad9-a34fa0761058@benettiengineering.com> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-3-kilian.zinnecker@mail.de> <8f6baf1d-3caa-4b47-aad9-a34fa0761058@benettiengineering.com> Message-ID: <2172310.irdbgypaU6@laptop> Hello Giulio, all, > > This patch adds board support for the BeagleV-Ahead. It uses a > > custom kernel for the board's SoC. As the SoC has an outdated and > > currently not supported version of the RISC-V vector extension, the > > vector extension is disabled. > > can you please provide an URL to the product page? Yes, I added an URL into the commit message of v3. [--SNIP--] > > --- /dev/null > > +++ b/board/beaglev-ahead/post-image.sh > > @@ -0,0 +1,6 @@ > > +#!/usr/bin/env bash > > +set -e > > + > > +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ > > ${BINARIES_DIR} > linux-custom should substituted with $(LINUX_DIR) I tried $(LINUX_DIR) and ${LINUX_DIR}, but both resulted in an empty string and as a consequence in a wrong path and broke the build. So in my v3 I kept it as it is for now. Should I try something else? > > --- /dev/null > > +++ b/configs/beaglev_ahead_defconfig > > @@ -0,0 +1,44 @@ > > +BR2_riscv=y > > +BR2_riscv_custom=y > > +BR2_RISCV_ISA_CUSTOM_RVM=y > > +BR2_RISCV_ISA_CUSTOM_RVA=y > > +BR2_RISCV_ISA_CUSTOM_RVF=y > > +BR2_RISCV_ISA_CUSTOM_RVD=y > > +BR2_RISCV_ISA_CUSTOM_RVC=y > > With commit cbd91e89e43d600172c62fd1cbd33aa74d0a851a all "_CUSTOM" have > been dropped, so can you please replace all the: > BR2_RISCV_ISA_CUSTOM_* > occurences with: > BR2_RISCV_ISA_* > ? I fixed it, thanks. > > +BR2_GCC_VERSION_13_X=y > > I think there is a reason you force using gcc 13, can you describe it in > the commit log and here? Yes, there were problems. I am not 100% sure, but as I remember it: the OpenSBI used has an old version and in its build, it does not define certain flags, which are needed by GCC 12 to activate the needed zifencei and zicsr extension. Those extension where redefined to be in some other extension pack of RiscV (or something like that, I don't remeber this exactly). Anyway it threw an error in GCC 12, and I thinkt to fix that, one would have to touch the old OpenSBI version. Switching to GCC 13 (where it works out of the box) seems then to be cleaner for me. [--SNIP--] > > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragmen > > t" +BR2_TARGET_UBOOT_FORMAT_BIN=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" > > Here you need to add: > BR2_PACKAGE_HOST_DOSFSTOOLS=y > otherwise it fails to build under buildroot/utils/docker-run Added dosfstools to the defconfig, thanks! > > +BR2_PACKAGE_HOST_MTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_XUANTIE_BINS=y > > After enabling BR2_RISCV_ISA_ options it builds successfully using > buildroot/utils/docker-run I build the image with buildroot/utils/docker-run and it boots. Thanks for the hint, I will use buildroot/utils/docker-run in the future as well! Thanks for your review and best regards, Kilian From thomas.petazzoni at bootlin.com Sun Feb 11 12:38:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 13:38:39 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/xuantie-bins: new package In-Reply-To: <4544153.LvFx2qVVIh@laptop> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-2-kilian.zinnecker@mail.de> <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> <4544153.LvFx2qVVIh@laptop> Message-ID: <20240211133839.5b235cbb@windsurf> On Sat, 10 Feb 2024 16:22:10 +0100 kilian.zinnecker at mail.de wrote: > This is strange, maybe someone can have a look here: On ozlabs, there are a > lot of patches, which have the submitter "kilian.zinnecker--- via buildroot". > However, most of them are NOT from me. E.g., one from Yegor Yefremov [1] is > marked with submitter "kilian.zinnecker--- via buildroot" - However, I am > definitively not Yegor, and none of his patches is from me. There are even more > patches marked with "kilian.zinnecker--- via buildroot" [2], some of them even > from before I ever submitted my first patch (the Rock5B board support) to > buildroot. Does anyone have any idea what this is about, or can have a deeper > look at this? (The BeagleV-Ahead patches are from me.) Yes, this is a known issue, caused by an interaction between the From: rewriting by mailman (needed due to strict DMARC policies by some SMTP servers) and a bug in patchwork. Sadly, the patchwork instance we are using (ozlabs.org) is using an ancient version of patchwork, which is no longer updated. We have asked the kernel.org people if we could migrate to the patchwork.kernel.org, but we still haven't heard back a definitive answer. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From sen at phobosdpl.com Sun Feb 11 13:16:35 2024 From: sen at phobosdpl.com (Sen Hastings) Date: Sun, 11 Feb 2024 13:16:35 +0000 Subject: [Buildroot] [PATCH 1/1] update sen hastings email in DEVELOPERS file Message-ID: <20240211131635.152044-1-sen@phobosdpl.com> phobosdpl is an old work email I don't really use anymore, so I'm changing it to my personal email. Signed-off-by: Sen Hastings --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..1c035eeb8f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2765,7 +2765,7 @@ F: package/libbson/ F: package/lua-resty-http/ F: package/mpir/ -N: Sen Hastings +N: Sen Hastings F: package/systemd F: support/scripts/pkg-stats -- 2.25.1 From bernd at kuhls.net Sun Feb 11 14:54:46 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 15:54:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 8.6.0 Message-ID: <20240211145446.270865-1-bernd@kuhls.net> Changelog: https://curl.se/changes.html#8_6_0 Removed patch which was included in upstream release. Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/57cc70e559aa065426021e22e2af8166af6084f6 Added configure options for optional libpsl support due to upstream commit which throws an error during configure when libpsl is missing and --without-libpsl was not used: https://github.com/curl/curl/commit/2998874bb61ac6ef3b72d6a61467cd2aaf6e53ea Signed-off-by: Bernd Kuhls --- ...nutls-fix-build-with-disable-verbose.patch | 60 ------------------- package/libcurl/libcurl.hash | 6 +- package/libcurl/libcurl.mk | 9 ++- 3 files changed, 11 insertions(+), 64 deletions(-) delete mode 100644 package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch diff --git a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch deleted file mode 100644 index 25e389c972..0000000000 --- a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0d9f9c5ea8c15c70eb420242b60179d9083c70b7 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Mon, 11 Dec 2023 20:45:01 +0200 -Subject: [PATCH] gnutls: fix build with --disable-verbose - -infof() parameters must be defined event with --disable-verbose since -commit dac293cfb702 ("lib: apache style infof and trace -macros/functions"). - -Move also 'ptr' definition under !CURL_DISABLE_VERBOSE_STRINGS. - -Fixes the following build failure: - -In file included from ../lib/sendf.h:29, - from vtls/gtls.c:44: -vtls/gtls.c: In function 'Curl_gtls_verifyserver': -vtls/gtls.c:841:34: error: 'version' undeclared (first use in this function); did you mean 'session'? - 841 | gnutls_protocol_get_name(version), ptr); - | ^~~~~~~ - -Signed-off-by: Baruch Siach -Upstream: https://github.com/curl/curl/commit/af520ac9fec7d88e942f05fdcd90704adb9fa566 ---- - lib/vtls/gtls.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c -index f42b6d6691de..b95c5be3c5e5 100644 ---- a/lib/vtls/gtls.c -+++ b/lib/vtls/gtls.c -@@ -818,16 +818,17 @@ Curl_gtls_verifyserver(struct Curl_easy *data, - char certname[65] = ""; /* limited to 64 chars by ASN.1 */ - size_t size; - time_t certclock; -- const char *ptr; - int rc; - CURLcode result = CURLE_OK; - #ifndef CURL_DISABLE_VERBOSE_STRINGS -+ const char *ptr; - unsigned int algo; - unsigned int bits; - gnutls_protocol_t version = gnutls_protocol_get_version(session); - #endif - long * const certverifyresult = &ssl_config->certverifyresult; - -+#ifndef CURL_DISABLE_VERBOSE_STRINGS - /* the name of the cipher suite used, e.g. ECDHE_RSA_AES_256_GCM_SHA384. */ - ptr = gnutls_cipher_suite_get_name(gnutls_kx_get(session), - gnutls_cipher_get(session), -@@ -835,6 +836,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data, - - infof(data, "SSL connection using %s / %s", - gnutls_protocol_get_name(version), ptr); -+#endif - - /* This function will return the peer's raw certificate (chain) as sent by - the peer. These certificates are in raw format (DER encoded for --- -2.43.0 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index d5c20d29d3..1f3dce0fd5 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.5.0.tar.xz.asc +# https://curl.se/download/curl-8.6.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb curl-8.5.0.tar.xz -sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING +sha256 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 curl-8.6.0.tar.xz +sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 83845b8e87..9dafe90c82 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.5.0 +LIBCURL_VERSION = 8.6.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -112,6 +112,13 @@ else LIBCURL_CONF_OPTS += --without-libidn2 endif +ifeq ($(BR2_PACKAGE_LIBPSL),y) +LIBCURL_DEPENDENCIES += libpsl +LIBCURL_CONF_OPTS += --with-libpsl +else +LIBCURL_CONF_OPTS += --without-libpsl +endif + # Configure curl to support libssh2 ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBCURL_DEPENDENCIES += libssh2 -- 2.39.2 From thomas.petazzoni at bootlin.com Sun Feb 11 15:08:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:08:54 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: update Sen Hastings email Message-ID: <20240211150926.1CACF87497@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=622fec1bb39fb1ca6aa9c5a9df2f93b3246be4a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master phobosdpl is an old work email I don't really use anymore, so I'm changing it to my personal email. Signed-off-by: Sen Hastings Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..1c035eeb8f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2765,7 +2765,7 @@ F: package/libbson/ F: package/lua-resty-http/ F: package/mpir/ -N: Sen Hastings +N: Sen Hastings F: package/systemd F: support/scripts/pkg-stats From thomas.petazzoni at bootlin.com Sun Feb 11 15:09:24 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:09:24 +0100 Subject: [Buildroot] [PATCH 1/1] update sen hastings email in DEVELOPERS file In-Reply-To: <20240211131635.152044-1-sen@phobosdpl.com> References: <20240211131635.152044-1-sen@phobosdpl.com> Message-ID: <20240211160924.775f7908@windsurf> On Sun, 11 Feb 2024 13:16:35 +0000 Sen Hastings wrote: > phobosdpl is an old work email I don't really use anymore, > so I'm changing it to my personal email. > > Signed-off-by: Sen Hastings > --- > DEVELOPERS | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:09:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:09:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 8.6.0 In-Reply-To: <20240211145446.270865-1-bernd@kuhls.net> References: <20240211145446.270865-1-bernd@kuhls.net> Message-ID: <20240211160958.40721d40@windsurf> On Sun, 11 Feb 2024 15:54:46 +0100 Bernd Kuhls wrote: > Changelog: https://curl.se/changes.html#8_6_0 > > Removed patch which was included in upstream release. > > Updated license hash due to copyright year bump: > https://github.com/curl/curl/commit/57cc70e559aa065426021e22e2af8166af6084f6 > > Added configure options for optional libpsl support due to upstream > commit which throws an error during configure when libpsl is missing and > --without-libpsl was not used: > https://github.com/curl/curl/commit/2998874bb61ac6ef3b72d6a61467cd2aaf6e53ea > > Signed-off-by: Bernd Kuhls > --- > ...nutls-fix-build-with-disable-verbose.patch | 60 ------------------- > package/libcurl/libcurl.hash | 6 +- > package/libcurl/libcurl.mk | 9 ++- > 3 files changed, 11 insertions(+), 64 deletions(-) > delete mode 100644 package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:09:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:09:39 +0100 Subject: [Buildroot] [git commit] package/libcurl: bump version to 8.6.0 Message-ID: <20240211151102.C55EB874CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cee6b6be6524e443012d130e09b0e6983b0ff90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://curl.se/changes.html#8_6_0 Removed patch which was included in upstream release. Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/57cc70e559aa065426021e22e2af8166af6084f6 Added configure options for optional libpsl support due to upstream commit which throws an error during configure when libpsl is missing and --without-libpsl was not used: https://github.com/curl/curl/commit/2998874bb61ac6ef3b72d6a61467cd2aaf6e53ea Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...001-gnutls-fix-build-with-disable-verbose.patch | 60 ---------------------- package/libcurl/libcurl.hash | 6 +-- package/libcurl/libcurl.mk | 9 +++- 3 files changed, 11 insertions(+), 64 deletions(-) diff --git a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch deleted file mode 100644 index 25e389c972..0000000000 --- a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0d9f9c5ea8c15c70eb420242b60179d9083c70b7 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Mon, 11 Dec 2023 20:45:01 +0200 -Subject: [PATCH] gnutls: fix build with --disable-verbose - -infof() parameters must be defined event with --disable-verbose since -commit dac293cfb702 ("lib: apache style infof and trace -macros/functions"). - -Move also 'ptr' definition under !CURL_DISABLE_VERBOSE_STRINGS. - -Fixes the following build failure: - -In file included from ../lib/sendf.h:29, - from vtls/gtls.c:44: -vtls/gtls.c: In function 'Curl_gtls_verifyserver': -vtls/gtls.c:841:34: error: 'version' undeclared (first use in this function); did you mean 'session'? - 841 | gnutls_protocol_get_name(version), ptr); - | ^~~~~~~ - -Signed-off-by: Baruch Siach -Upstream: https://github.com/curl/curl/commit/af520ac9fec7d88e942f05fdcd90704adb9fa566 ---- - lib/vtls/gtls.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c -index f42b6d6691de..b95c5be3c5e5 100644 ---- a/lib/vtls/gtls.c -+++ b/lib/vtls/gtls.c -@@ -818,16 +818,17 @@ Curl_gtls_verifyserver(struct Curl_easy *data, - char certname[65] = ""; /* limited to 64 chars by ASN.1 */ - size_t size; - time_t certclock; -- const char *ptr; - int rc; - CURLcode result = CURLE_OK; - #ifndef CURL_DISABLE_VERBOSE_STRINGS -+ const char *ptr; - unsigned int algo; - unsigned int bits; - gnutls_protocol_t version = gnutls_protocol_get_version(session); - #endif - long * const certverifyresult = &ssl_config->certverifyresult; - -+#ifndef CURL_DISABLE_VERBOSE_STRINGS - /* the name of the cipher suite used, e.g. ECDHE_RSA_AES_256_GCM_SHA384. */ - ptr = gnutls_cipher_suite_get_name(gnutls_kx_get(session), - gnutls_cipher_get(session), -@@ -835,6 +836,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data, - - infof(data, "SSL connection using %s / %s", - gnutls_protocol_get_name(version), ptr); -+#endif - - /* This function will return the peer's raw certificate (chain) as sent by - the peer. These certificates are in raw format (DER encoded for --- -2.43.0 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index d5c20d29d3..1f3dce0fd5 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.5.0.tar.xz.asc +# https://curl.se/download/curl-8.6.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb curl-8.5.0.tar.xz -sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING +sha256 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 curl-8.6.0.tar.xz +sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 83845b8e87..9dafe90c82 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.5.0 +LIBCURL_VERSION = 8.6.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -112,6 +112,13 @@ else LIBCURL_CONF_OPTS += --without-libidn2 endif +ifeq ($(BR2_PACKAGE_LIBPSL),y) +LIBCURL_DEPENDENCIES += libpsl +LIBCURL_CONF_OPTS += --with-libpsl +else +LIBCURL_CONF_OPTS += --without-libpsl +endif + # Configure curl to support libssh2 ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBCURL_DEPENDENCIES += libssh2 From thomas.petazzoni at bootlin.com Sun Feb 11 15:11:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:11:25 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add jailhouse runtime test In-Reply-To: <20240211101212.171127-1-ju.o@free.fr> References: <20240211101212.171127-1-ju.o@free.fr> Message-ID: <20240211161125.419a1bcf@windsurf> On Sun, 11 Feb 2024 11:12:12 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 1 + > .../testing/tests/package/test_jailhouse.py | 103 ++++++++++++++++++ > 2 files changed, 104 insertions(+) > create mode 100644 support/testing/tests/package/test_jailhouse.py Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:11:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:11:39 +0100 Subject: [Buildroot] [git commit] package/minisign: needs threads Message-ID: <20240211151227.7C9C28755D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79f38212c5fc95f64fc59c96b651024dc39cc0ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit d90ac63d9b3448a239bb9aa8030326699a3fdc3d: Could NOT find Threads (missing: Threads_FOUND) Fixes: - http://autobuild.buildroot.org/results/8d63a88291de945661a936d2437917a3428de276 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/minisign/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/minisign/Config.in b/package/minisign/Config.in index b852903921..a211177925 100644 --- a/package/minisign/Config.in +++ b/package/minisign/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MINISIGN bool "minisign" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBSODIUM select BR2_PACKAGE_LIBSODIUM_FULL help @@ -7,3 +8,6 @@ config BR2_PACKAGE_MINISIGN signatures. https://github.com/jedisct1/minisign + +comment "minisign needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS From thomas.petazzoni at bootlin.com Sun Feb 11 15:11:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:11:15 +0100 Subject: [Buildroot] [git commit] support/testing: add jailhouse runtime test Message-ID: <20240211151227.6F8558755A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74ffd0a4df3f321b5d5ac6b14b52174b3e7ef2de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_jailhouse.py | 103 ++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1c035eeb8f..d7947821e4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1792,6 +1792,7 @@ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ F: support/testing/tests/package/test_kexec.py diff --git a/support/testing/tests/package/test_jailhouse.py b/support/testing/tests/package/test_jailhouse.py new file mode 100644 index 0000000000..4634fc4de2 --- /dev/null +++ b/support/testing/tests/package/test_jailhouse.py @@ -0,0 +1,103 @@ +import os +import time + +import infra.basetest + + +class TestJailhouse(infra.basetest.BRTest): + # This test uses a specific configuration, mainly for matching the + # requirements of the Jailhouse Qemu inmate demo. We also use the + # Linux kernel from Siemens, which includes patches for + # Jailhouse. Finally, we use the kernel config from + # board/qemu/aarch64-virt rather than the Kernel defconfig, for + # faster build (as it enable less components, but includes + # everything needed for this test). + kernel_ver = "eb6927f7eea77f823b96c0c22ad9d4a2d7ffdfce" + kernel_url = \ + f"$(call github,siemens,linux,{kernel_ver})/linux-{kernel_ver}.tar.gz" + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_TARBALL=y + BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="{kernel_url}" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_JAILHOUSE=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + # Qemu option and Kernel args are taken from Jailhouse demo. See: + # https://github.com/siemens/jailhouse/blob/master/README.md + # We also add oops=panic to improve the test coverage. + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0 mem=768M oops=panic"], + options=["-M", "virt,gic-version=3,virtualization=on,its=off", + "-cpu", "cortex-a57", + "-m", "1G", + "-smp", "16", + "-drive", f"file={drive},if=none,format=raw,id=hd0", + "-device", "virtio-blk-device,drive=hd0"]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("jailhouse --version") + + # Load the kernel module. + self.assertRunOk("modprobe jailhouse") + + # Check the device is present. + self.assertRunOk("ls -al /dev/jailhouse") + + # Load the cell config this this qemu test. + self.assertRunOk("jailhouse enable /etc/jailhouse/qemu-arm64.cell") + + # Dump the jailhouse console, and check we see its + # initialization string. + out, ret = self.emulator.run("jailhouse console") + self.assertEqual(ret, 0) + self.assertIn("Initializing Jailhouse hypervisor", "\n".join(out)) + + # Create the cell. + cell_cfg = "/etc/jailhouse/qemu-arm64-inmate-demo.cell" + cmd = f"jailhouse cell create {cell_cfg}" + self.assertRunOk(cmd) + + # Load the demo image. + cell_name = "inmate-demo" + img = "/usr/libexec/jailhouse/demos/gic-demo.bin" + cmd = f"jailhouse cell load {cell_name} {img}" + self.assertRunOk(cmd) + + # List Jailhouse cells and check we see the one we loaded. + out, ret = self.emulator.run("jailhouse cell list") + self.assertEqual(ret, 0) + self.assertIn(cell_name, "\n".join(out)) + + # We should also see our cell in sysfs. + cmd = "cat /sys/devices/jailhouse/cells/1/name" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], cell_name) + + # Start the cell. + self.assertRunOk(f"jailhouse cell start {cell_name}") + + # Let the demo cell run for few seconds... + time.sleep(3) + + # Stop and unload the cell. + self.assertRunOk(f"jailhouse cell shutdown {cell_name}") + self.assertRunOk(f"jailhouse cell destroy {cell_name}") + + # Stop and unload jailhouse. + self.assertRunOk("jailhouse disable") + self.assertRunOk("modprobe -r jailhouse") From bernd at kuhls.net Sun Feb 11 15:14:18 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:14:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump version to 1.0.5 Message-ID: <20240211151418.1615015-1-bernd@kuhls.net> Release notes: https://blog.clamav.net/2023/11/clamav-130-122-105-released.html Fixes CVE-2024-20290 & CVE-2024-20328. Signed-off-by: Bernd Kuhls --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index cb4f67156c..cd03a11840 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3d6b99644874558b7de5faf9b340737a9bbc1083878fcd95a49f989c7c980146 clamav-1.0.4.tar.gz +sha256 aa67ee9679f747af3c492353d768464c27d614b3fed62eb7f988b6776d4aedbb clamav-1.0.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index c9012261fa..7c6dfce6f2 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 1.0.4 +CLAMAV_VERSION = 1.0.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = \ -- 2.39.2 From bernd at kuhls.net Sun Feb 11 15:15:46 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:15:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: bump version to 20.4-Nexus Message-ID: <20240211151546.1615163-1-bernd@kuhls.net> Release notes: https://github.com/xbmc/xbmc/releases/tag/20.4-Nexus Signed-off-by: Bernd Kuhls --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 2ed4961e68..b785a71b6e 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 20.3-Nexus +KODI_JSONSCHEMABUILDER_VERSION = 20.4-Nexus KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 728e25606c..9810193014 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 20.3-Nexus +KODI_TEXTUREPACKER_VERSION = 20.4-Nexus KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 81d26f1cb1..7b26778b68 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 1dbf1d9f4d5eeeb6aa2593813703343a8a377e88a00c68226354e4d67467f64d kodi-20.3-Nexus.tar.gz +sha256 ccb2d3e382b5ae628a89db2325f5e778f1770a2a182f6eaa25645a22ccdffb18 kodi-20.4-Nexus.tar.gz sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 97d02e9b92..d057eb3f05 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 20.3 +KODI_VERSION_MAJOR = 20.4 KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) -- 2.39.2 From thomas.petazzoni at bootlin.com Sun Feb 11 15:27:51 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:27:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/minisign: needs threads In-Reply-To: <20240211093858.14022-1-fontaine.fabrice@gmail.com> References: <20240211093858.14022-1-fontaine.fabrice@gmail.com> Message-ID: <20240211162751.38fdb544@windsurf> On Sun, 11 Feb 2024 10:38:58 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit d90ac63d9b3448a239bb9aa8030326699a3fdc3d: > Could NOT find Threads (missing: Threads_FOUND) > > Fixes: > - http://autobuild.buildroot.org/results/8d63a88291de945661a936d2437917a3428de276 > > Signed-off-by: Fabrice Fontaine > --- > package/minisign/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:27:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:27:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/strace: bump to version 6.7 In-Reply-To: <20240211051907.551771-1-kadambini.nema@gmail.com> References: <20240211051907.551771-1-kadambini.nema@gmail.com> Message-ID: <20240211162754.68a62dfd@windsurf> On Sat, 10 Feb 2024 21:19:07 -0800 Kadambini Nema wrote: > - Updated hash of COPYING (year updated with > https://github.com/strace/strace/commit/eba0ac1fc4f8896b938d41081e0643cb06283a9b) > > Signed-off-by: Kadambini Nema > --- > package/strace/strace.hash | 6 +++--- > package/strace/strace.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:11:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:11:56 +0100 Subject: [Buildroot] [git commit] package/strace: bump to version 6.7 Message-ID: <20240211152805.6F7568757E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ebeb4f435303bf6802b647ac83373d5ed9980de5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Updated hash of COPYING (year updated with https://github.com/strace/strace/commit/eba0ac1fc4f8896b938d41081e0643cb06283a9b) Signed-off-by: Kadambini Nema Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 75a35d7cf4..a35d2b0be6 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.6/strace-6.6.tar.xz.asc -sha256 421b4186c06b705163e64dc85f271ebdcf67660af8667283147d5e859fc8a96c strace-6.6.tar.xz -sha256 6e5648c0ed522b163f9df1dc500c73491b1743495bd78388e99685cecfa79707 COPYING +# https://strace.io/files/6.7/strace-6.7.tar.xz.asc +sha256 2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7 strace-6.7.tar.xz +sha256 1988d0e1aa101d68855e8c4f940aacf2531051b82f6b608eb026c5fad1f33df1 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 6279622fdb..f916936207 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.6 +STRACE_VERSION = 6.7 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From bernd at kuhls.net Sun Feb 11 15:28:28 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:28:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.19.4 Message-ID: <20240211152828.2164674-1-bernd@kuhls.net> Release notes: https://www.samba.org/samba/history/samba-4.19.4.html Signed-off-by: Bernd Kuhls --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 81e8a6f2e9..3353221959 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.3.tar.asc -sha256 280553b90f131b1940580df293653c9e9bd8906201f5def6e5e8c160f0bfac96 samba-4.19.3.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc +sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 42bcd0a928..78c5db308d 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.3 +SAMBA4_VERSION = 4.19.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES -- 2.39.2 From thomas.petazzoni at bootlin.com Sun Feb 11 15:28:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:28:10 +0100 Subject: [Buildroot] [git commit] utils/check-package: use https for the manual URL Message-ID: <20240211153111.3302187482@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dfed5acb5610c90115235a78433e798a6a692b29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- utils/check-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/check-package b/utils/check-package index 105902303e..de41891b56 100755 --- a/utils/check-package +++ b/utils/check-package @@ -69,7 +69,7 @@ def parse_args(): help='override the default list of ignored warnings') parser.add_argument("--manual-url", action="store", - default="http://nightly.buildroot.org/", + default="https://nightly.buildroot.org/", help="default: %(default)s") parser.add_argument("--verbose", "-v", action="count", default=0) parser.add_argument("--quiet", "-q", action="count", default=0) From thomas.petazzoni at bootlin.com Sun Feb 11 15:28:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:28:45 +0100 Subject: [Buildroot] [git commit] doc/manual: indent the CVE example the same as the CVE list item Message-ID: <20240211153111.47019875E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=949c1a51b7f31982b66efe2d4adc55095a4c7811 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 76b037f436..935270a19c 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -503,7 +503,7 @@ not and can not work as people would expect it should: the package, or when the CVE for some reason does not affect the Buildroot package. A Makefile comment must always precede the addition of a CVE to this variable. Example: - ++ ---------------------- # 0001-fix-cve-2020-12345.patch LIBFOO_IGNORE_CVES += CVE-2020-12345 From thomas.petazzoni at bootlin.com Sun Feb 11 15:30:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:30:06 +0100 Subject: [Buildroot] [git commit] package: switch to _CPE_ID_VALID Message-ID: <20240211153111.6D5BF875E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c19cca045225164e7df4046c500c5e7117114f1b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that we document _CPE_ID_VALID, and that it shall be used instead of setting a default value to one of the other _CPE_ID_* variables, change all of the existing packages to use it, to avoid any error when we later extend check-package to validate the sanity ofthe _CPE_ID_* variables. Mechanical change done within the reference container, running the new check in check-package, to report the CPE_ID errors: $ make check-package 2>/dev/null \ |awk '{ split($(1), a, ":"); fname = a[1] split($(2), a, "'\''"); val = a[2] new_var = $(8); gsub("_CPE_ID_.*", "_CPE_ID_VALID", new_var) printf("%s %s %s %s\n", fname, $(8), val, new_var) }' \ |while read fname var val new_var; do sed -r -i -e "s/${var}[[:space:]]*=[[:space:]]*${val}/${new_var} = YES/" "${fname}" done $ git diff -I'CPE_ID_(VENDOR|VALID)' [empty] Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/acl/acl.mk | 2 +- package/asn1c/asn1c.mk | 2 +- package/atftp/atftp.mk | 2 +- package/atop/atop.mk | 2 +- package/attr/attr.mk | 2 +- package/axel/axel.mk | 2 +- package/bdwgc/bdwgc.mk | 2 +- package/beecrypt/beecrypt.mk | 2 +- package/blktrace/blktrace.mk | 2 +- package/botan/botan.mk | 2 +- package/bwm-ng/bwm-ng.mk | 2 +- package/c-icap/c-icap.mk | 2 +- package/c-periphery/c-periphery.mk | 2 +- package/cgroupfs-mount/cgroupfs-mount.mk | 2 +- package/civetweb/civetweb.mk | 2 +- package/cjson/cjson.mk | 2 +- package/cmake/cmake.mk | 2 +- package/cracklib/cracklib.mk | 2 +- package/crun/crun.mk | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- package/cups-pk-helper/cups-pk-helper.mk | 2 +- package/darkhttpd/darkhttpd.mk | 2 +- package/dbus-broker/dbus-broker.mk | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- package/dosfstools/dosfstools.mk | 2 +- package/dracut/dracut.mk | 2 +- package/dtc/dtc.mk | 2 +- package/duktape/duktape.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 2 +- package/elfutils/elfutils.mk | 2 +- package/exempi/exempi.mk | 2 +- package/exfat/exfat.mk | 2 +- package/f2fs-tools/f2fs-tools.mk | 2 +- package/feh/feh.mk | 2 +- package/file/file.mk | 2 +- package/flac/flac.mk | 2 +- package/fontconfig/fontconfig.mk | 2 +- package/giflib/giflib.mk | 2 +- package/gnuplot/gnuplot.mk | 2 +- package/gpsd/gpsd.mk | 2 +- package/gutenprint/gutenprint.mk | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- package/haserl/haserl.mk | 2 +- package/heimdal/heimdal.mk | 2 +- package/i2c-tools/i2c-tools.mk | 2 +- package/ipmitool/ipmitool.mk | 2 +- package/iproute2/iproute2.mk | 2 +- package/iputils/iputils.mk | 2 +- package/iucode-tool/iucode-tool.mk | 2 +- package/jansson/jansson.mk | 2 +- package/jasper/jasper.mk | 2 +- package/jhead/jhead.mk | 2 +- package/jq/jq.mk | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- package/jszip/jszip.mk | 2 +- package/keyutils/keyutils.mk | 2 +- package/kvmtool/kvmtool.mk | 2 +- package/lame/lame.mk | 2 +- package/lapack/lapack.mk | 2 +- package/lftp/lftp.mk | 2 +- package/libaio/libaio.mk | 2 +- package/libass/libass.mk | 2 +- package/libatomic_ops/libatomic_ops.mk | 2 +- package/libbpf/libbpf.mk | 2 +- package/libcap-ng/libcap-ng.mk | 2 +- package/libcap/libcap.mk | 2 +- package/libcgroup/libcgroup.mk | 2 +- package/libconfuse/libconfuse.mk | 2 +- package/libdaemon/libdaemon.mk | 2 +- package/libesmtp/libesmtp.mk | 2 +- package/libevent/libevent.mk | 2 +- package/libexif/libexif.mk | 2 +- package/libffi/libffi.mk | 2 +- package/libfuse/libfuse.mk | 2 +- package/libgit2/libgit2.mk | 2 +- package/libical/libical.mk | 2 +- package/libjxl/libjxl.mk | 2 +- package/libmms/libmms.mk | 2 +- package/libnet/libnet.mk | 2 +- package/libnids/libnids.mk | 2 +- package/libnl/libnl.mk | 2 +- package/libqmi/libqmi.mk | 2 +- package/librsync/librsync.mk | 2 +- package/libsamplerate/libsamplerate.mk | 2 +- package/libseccomp/libseccomp.mk | 2 +- package/libsndfile/libsndfile.mk | 2 +- package/libtirpc/libtirpc.mk | 2 +- package/libunwind/libunwind.mk | 2 +- package/libupnp/libupnp.mk | 2 +- package/libvncserver/libvncserver.mk | 2 +- package/linuxptp/linuxptp.mk | 2 +- package/lldpd/lldpd.mk | 2 +- package/logrotate/logrotate.mk | 2 +- package/lrzsz/lrzsz.mk | 2 +- package/lsof/lsof.mk | 2 +- package/lynx/lynx.mk | 2 +- package/lz4/lz4.mk | 2 +- package/lzo/lzo.mk | 2 +- package/matio/matio.mk | 2 +- package/mdadm/mdadm.mk | 2 +- package/minicom/minicom.mk | 2 +- package/motion/motion.mk | 2 +- package/ncmpc/ncmpc.mk | 2 +- package/net-tools/net-tools.mk | 2 +- package/netcat/netcat.mk | 2 +- package/nettle/nettle.mk | 2 +- package/oniguruma/oniguruma.mk | 2 +- package/open-iscsi/open-iscsi.mk | 2 +- package/openblas/openblas.mk | 2 +- package/openrc/openrc.mk | 2 +- package/openresolv/openresolv.mk | 2 +- package/opensc/opensc.mk | 2 +- package/p11-kit/p11-kit.mk | 2 +- package/parted/parted.mk | 2 +- package/pcmanfm/pcmanfm.mk | 2 +- package/picocom/picocom.mk | 2 +- package/polkit/polkit.mk | 2 +- package/popt/popt.mk | 2 +- package/powerpc-utils/powerpc-utils.mk | 2 +- package/procps-ng/procps-ng.mk | 2 +- package/protobuf-c/protobuf-c.mk | 2 +- package/proxychains-ng/proxychains-ng.mk | 2 +- package/pugixml/pugixml.mk | 2 +- package/pwgen/pwgen.mk | 2 +- package/python-ecdsa/python-ecdsa.mk | 2 +- package/python-engineio/python-engineio.mk | 2 +- package/python-markdown2/python-markdown2.mk | 2 +- package/python-rsa/python-rsa.mk | 2 +- package/qdecoder/qdecoder.mk | 2 +- package/qpdf/qpdf.mk | 2 +- package/quazip/quazip.mk | 2 +- package/quickjs/quickjs.mk | 2 +- package/rabbitmq-c/rabbitmq-c.mk | 2 +- package/rhash/rhash.mk | 2 +- package/ripgrep/ripgrep.mk | 2 +- package/rng-tools/rng-tools.mk | 2 +- package/rp-pppoe/rp-pppoe.mk | 2 +- package/rpcbind/rpcbind.mk | 2 +- package/rtl_433/rtl_433.mk | 2 +- package/rtmpdump/rtmpdump.mk | 2 +- package/sane-backends/sane-backends.mk | 2 +- package/shellinabox/shellinabox.mk | 2 +- package/spice/spice.mk | 2 +- package/squashfs/squashfs.mk | 2 +- package/sslh/sslh.mk | 2 +- package/strace/strace.mk | 2 +- package/sylpheed/sylpheed.mk | 2 +- package/sysklogd/sysklogd.mk | 2 +- package/sysstat/sysstat.mk | 2 +- package/systemd/systemd.mk | 2 +- package/sysvinit/sysvinit.mk | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- package/tclap/tclap.mk | 2 +- package/tini/tini.mk | 2 +- package/tinyproxy/tinyproxy.mk | 2 +- package/tinyxml/tinyxml.mk | 2 +- package/tinyxml2/tinyxml2.mk | 2 +- package/tmux/tmux.mk | 2 +- package/tpm2-tools/tpm2-tools.mk | 2 +- package/trinity/trinity.mk | 2 +- package/unzip/unzip.mk | 2 +- package/upx/upx.mk | 2 +- package/usbguard/usbguard.mk | 2 +- package/valijson/valijson.mk | 2 +- package/vsftpd/vsftpd.mk | 2 +- package/x11vnc/x11vnc.mk | 2 +- package/xscreensaver/xscreensaver.mk | 2 +- package/yajl/yajl.mk | 2 +- package/yaml-cpp/yaml-cpp.mk | 2 +- package/zbar/zbar.mk | 2 +- package/zlog/zlog.mk | 2 +- package/zziplib/zziplib.mk | 2 +- 173 files changed, 173 insertions(+), 173 deletions(-) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Sun Feb 11 15:29:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:29:02 +0100 Subject: [Buildroot] [git commit] doc/manual: document _CPE_ID_VALID Message-ID: <20240211153111.52BC687482@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ddf66867b192b5576632a44c4edfe23c98d8a3d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The way we handle CPE_ID variable is unusual compared to the other variables: we mostly compute defaults for all of them, and eventually aggregate the various CPE_ID variables to form the CPE ID name. However, we do not consider that CPE ID to valid, unless there is one (or more) CPE_ID variables actually set by the package; this shows that the CPE ID has been checked to be valid against the NVD CPE database. In that situation, we internally define the duly undocumented _CPE_ID_VALID variable. However, it is totally possible (and very often the case) that the default value we set to those variables are appropriate, and do defne a valid CPE ID. In this case, the package will define any arbitrary CPE_ID variable to its default value, usually by setting either the VENDOR or PRODUCT field, though there is no rule or requirement that be the case. This is not very clean, non-obvious, and does not allow for easily adding checks in check-package. Add the _CPE_ID_VALID variable to the manual, to make it official that it should be used when the default values of the others are valid. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 935270a19c..ce8608682f 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -516,6 +516,10 @@ LIBFOO_IGNORE_CVES += CVE-2020-54321 identifier]. The available variables are: + -- +** +LIBFOO_CPE_ID_VALID+, if set to +YES+, specifies that the default + values for each of the following variables is appropriate, and + generates a valid CPE ID. + ** +LIBFOO_CPE_ID_PREFIX+, specifies the prefix of the CPE identifier, i.e the first three fields. When not defined, the default value is +cpe:2.3:a+. From thomas.petazzoni at bootlin.com Sun Feb 11 15:28:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:28:35 +0100 Subject: [Buildroot] [git commit] doc/manual: fixup ordered lists Message-ID: <20240211153111.3D3EA875E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c24d83cc80c25f60fe7974495a43b5cc34b72f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master With recent asiidoc versions (at least 10.2.0 is known to report that), rendering the manual yields a few warnings related to ordered lists: asciidoc: WARNING: customize-quick-guide.adoc: line 13: list item index: expected 2 got 1 asciidoc: WARNING: customize-quick-guide.adoc: line 15: list item index: expected 3 got 1 [...] asciidoc: WARNING: customize-quick-guide.adoc: line 65: list item index: expected 13 got 1 asciidoc: WARNING: customize-quick-guide.adoc: line 66: list item index: expected 14 got 1 asciidoc: WARNING: adding-packages-gettext.adoc: line 30: list item index: expected 2 got 1 asciidoc: WARNING: adding-packages-gettext.adoc: line 41: list item index: expected 3 got 1 The reason is that we use the same index to tell asciidoc to automatically number items. However, the official way to provide an automatic index is to write no index: https://docs.asciidoctor.org/asciidoc/latest/lists/ordered/ [...] since the numbering is obvious, the AsciiDoc processor will insert the numbers for you if you omit them: [...] If you number the ordered list explicitly, you have to manually keep the list numerals sequential. Otherwise, you will get a warning. So, abide by the documentation, and drop the repeating indices to ordered lists where we want automatic numbering. Note that there is another ordered list, in adding-packages-directory.adoc, but it does use explicit, sequential numbering. For consistency within the whole document, we also convert it. To avoid extra useless churn, the indentation of the items is not changed to match the elided indices. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.adoc | 14 +++++++------- docs/manual/adding-packages-gettext.adoc | 6 +++--- docs/manual/customize-quick-guide.adoc | 28 ++++++++++++++-------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index 03249ca06f..0b7221aae0 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -44,13 +44,13 @@ project after an empty line. As a convention specific to Buildroot, the ordering of the attributes is as follows: -1. The type of option: +bool+, +string+... with the prompt -2. If needed, the +default+ value(s) -3. Any dependencies on the target in +depends on+ form -4. Any dependencies on the toolchain in +depends on+ form -5. Any dependencies on other packages in +depends on+ form -6. Any dependency of the +select+ form -7. The help keyword and help text. +. The type of option: +bool+, +string+... with the prompt +. If needed, the +default+ value(s) +. Any dependencies on the target in +depends on+ form +. Any dependencies on the toolchain in +depends on+ form +. Any dependencies on other packages in +depends on+ form +. Any dependency of the +select+ form +. The help keyword and help text. You can add other sub-options into a +if BR2_PACKAGE_LIBFOO...endif+ statement to configure particular things in your software. You can look at diff --git a/docs/manual/adding-packages-gettext.adoc b/docs/manual/adding-packages-gettext.adoc index e9c6968e79..739bed25d5 100644 --- a/docs/manual/adding-packages-gettext.adoc +++ b/docs/manual/adding-packages-gettext.adoc @@ -23,11 +23,11 @@ Due to this, and in order to make sure that Native Language Support is properly handled, packages in Buildroot that can use NLS support should: -1. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This +. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This is done automatically for 'autotools' packages and therefore should only be done for packages using other package infrastructures. -1. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +_DEPENDENCIES+ variable. This addition should be done unconditionally: the value of this variable is automatically adjusted by the core infrastructure to contain the relevant list of @@ -38,7 +38,7 @@ should: also contains +gettext+ in order to get the full-blown 'gettext' implementation. -1. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that +. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that the package gets linked with +libintl+. This is generally not needed with 'autotools' packages as they usually detect automatically that they should link with +libintl+. However, diff --git a/docs/manual/customize-quick-guide.adoc b/docs/manual/customize-quick-guide.adoc index 627ecbacb1..315027c590 100644 --- a/docs/manual/customize-quick-guide.adoc +++ b/docs/manual/customize-quick-guide.adoc @@ -9,11 +9,11 @@ now summarize all this by providing step-by-step instructions to storing your project-specific customizations. Clearly, the steps that are not relevant to your project can be skipped. -1. +make menuconfig+ to configure toolchain, packages and kernel. -1. +make linux-menuconfig+ to update the kernel config, similar for +. +make menuconfig+ to configure toolchain, packages and kernel. +. +make linux-menuconfig+ to update the kernel config, similar for other configuration like busybox, uclibc, ... -1. +mkdir -p board//+ -1. Set the following options to +board///.config+ +. +mkdir -p board//+ +. Set the following options to +board///.config+ (as far as they are relevant): * +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+ * +BR2_PACKAGE_BUSYBOX_CONFIG+ @@ -21,7 +21,7 @@ your project can be skipped. * +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE+ -1. Write the configuration files: +. Write the configuration files: * +make linux-update-defconfig+ * +make busybox-update-config+ * +make uclibc-update-config+ @@ -29,38 +29,38 @@ your project can be skipped. board///at91bootstrap3.config+ * +make barebox-update-defconfig+ * +make uboot-update-defconfig+ -1. Create +board///rootfs-overlay/+ and fill it +. Create +board///rootfs-overlay/+ and fill it with additional files you need on your rootfs, e.g. +board///rootfs-overlay/etc/inittab+. Set +BR2_ROOTFS_OVERLAY+ to +board///rootfs-overlay+. -1. Create a post-build script +. Create a post-build script +board///post_build.sh+. Set +BR2_ROOTFS_POST_BUILD_SCRIPT+ to +board///post_build.sh+ -1. If additional setuid permissions have to be set or device nodes have +. If additional setuid permissions have to be set or device nodes have to be created, create +board///device_table.txt+ and add that path to +BR2_ROOTFS_DEVICE_TABLE+. -1. If additional user accounts have to be created, create +. If additional user accounts have to be created, create +board///users_table.txt+ and add that path to +BR2_ROOTFS_USERS_TABLES+. -1. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ +. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ to +board///patches/+ and add your patches for each package in a subdirectory named after the package. Each patch should be called +--.patch+. -1. Specifically for the Linux kernel, there also exists the option +. Specifically for the Linux kernel, there also exists the option +BR2_LINUX_KERNEL_PATCH+ with as main advantage that it can also download patches from a URL. If you do not need this, +BR2_GLOBAL_PATCH_DIR+ is preferred. U-Boot, Barebox, at91bootstrap and at91bootstrap3 also have separate options, but these do not provide any advantage over +BR2_GLOBAL_PATCH_DIR+ and will likely be removed in the future. -1. If you need to add project-specific packages, create +. If you need to add project-specific packages, create +package//+ and place your packages in that directory. Create an overall +.mk+ file that includes the +.mk+ files of all your packages. Create an overall +Config.in+ file that sources the +Config.in+ files of all your packages. Include this +Config.in+ file from Buildroot's +package/Config.in+ file. -1. +make savedefconfig+ to save the buildroot configuration. -1. +cp defconfig configs/_defconfig+ +. +make savedefconfig+ to save the buildroot configuration. +. +cp defconfig configs/_defconfig+ From thomas.petazzoni at bootlin.com Sun Feb 11 15:30:59 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:30:59 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: add check for CPE variables set to default values Message-ID: <20240211153111.77A0A875E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fcf465d04bac45e447378ec02b50f019ca2864e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that we can specify that the default values for the CPE_ID variables are valid, without having to actually set one (or more) to their default, add a check-package check that validates that the CPE_ID variables are indeed not set to their default. It also validates that CPE_ID_VALID is not set when another CPE_ID variable is set to a non-default value. Add an anchor in the manual so that we can easily point to it. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Cc: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.adoc | 2 +- utils/checkpackagelib/lib_mk.py | 73 ++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index ce8608682f..9d365a10ca 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -511,7 +511,7 @@ LIBFOO_IGNORE_CVES += CVE-2020-12345 LIBFOO_IGNORE_CVES += CVE-2020-54321 ---------------------- -* +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the +* [[cpe-id]] +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the package to define its https://nvd.nist.gov/products/cpe[CPE identifier]. The available variables are: + diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index d340882971..ce2ab5157c 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -366,3 +366,76 @@ class VariableWithBraces(_CheckFunction): return ["{}:{}: use $() to delimit variables, not ${{}}" .format(self.filename, lineno), text] + + +class CPEVariables(_CheckFunction): + """ + Check that the values for the CPE variables are not the default. + - CPE_ID_* variables must not be set to their default + - CPE_ID_VALID must not be set if a non-default CPE_ID variable is set + """ + def before(self): + pkg, _ = os.path.splitext(os.path.basename(self.filename)) + self.CPE_fields_defaults = { + "VALID": "NO", + "PREFIX": "cpe:2.3:a", + "VENDOR": f"{pkg}_project", + "PRODUCT": pkg, + "VERSION": None, + "UPDATE": "*", + } + self.valid = None + self.non_defaults = 0 + self.CPE_FIELDS_RE = re.compile( + r"^\s*(.+_CPE_ID_({}))\s*=\s*(.+)$" + .format("|".join(self.CPE_fields_defaults)), + ) + self.VERSION_RE = re.compile( + rf"^(HOST_)?{pkg.upper().replace('-', '_')}_VERSION\s*=\s*(.+)$", + ) + self.COMMENT_RE = re.compile(r"^\s*#.*") + + def check_line(self, lineno, text): + text = self.COMMENT_RE.sub('', text.rstrip()) + + # WARNING! The VERSION_RE can _also_ match the same lines as CPE_FIELDS_RE, + # but not the other way around. So we must first check for CPE_FIELDS_RE, + # and if not matched, then and only then check for VERSION_RE. + match = self.CPE_FIELDS_RE.match(text) + if match: + var, field, val = match.groups() + return self._check_field(lineno, text, field, var, val) + + match = self.VERSION_RE.match(text) + if match: + self.CPE_fields_defaults["VERSION"] = match.groups()[1] + + def after(self): + # "VALID" counts in the non-defaults; so when "VALID" is present, + # 1 non-default means only "VALID" is present, so that's OK. + if self.valid and self.non_defaults > 1: + return ["{}:{}: 'YES' is implied when a non-default CPE_ID field is specified: {} ({}#cpe-id)".format( + self.filename, + self.valid["lineno"], + self.valid["text"], + self.url_to_manual, + )] + + def _check_field(self, lineno, text, field, var, val): + if field == "VERSION" and self.CPE_fields_defaults[field] is None: + return ["{}:{}: expecting package version to be set before CPE_ID_VERSION".format( + self.filename, + lineno, + )] + if val == self.CPE_fields_defaults[field]: + return ["{}:{}: '{}' is the default value for {} ({}#cpe-id)".format( + self.filename, + lineno, + val, + var, + self.url_to_manual, + )] + else: + if field == "VALID": + self.valid = {"lineno": lineno, "text": text} + self.non_defaults += 1 From thomas.petazzoni at bootlin.com Sun Feb 11 15:31:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:31:35 +0100 Subject: [Buildroot] [PATCH 0/6 v2] utils/checkpackagelib: check CPE variables (branch yem/checkpkg-cpe) In-Reply-To: References: Message-ID: <20240211163135.04c16bc4@windsurf> On Sat, 10 Feb 2024 22:24:56 +0100 "Yann E. MORIN" wrote: > Yann E. MORIN (6): > utils/check-package: use https for the manual URL > doc/manual: fixup ordered lists > doc/manual: indent the CVE example the same as the CVE list item > doc/manual: document _CPE_ID_VALID > package: switch to _CPE_ID_VALID > utils/checkpackagelib: add check for CPE variables set to default values Thanks, series applied! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:32:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:32:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/gst1-python: disable tests In-Reply-To: <20240209184814.1438551-1-james.hilliard1@gmail.com> References: <20240209184814.1438551-1-james.hilliard1@gmail.com> Message-ID: <20240211163205.79ceedd3@windsurf> On Fri, 9 Feb 2024 11:48:14 -0700 James Hilliard wrote: > We don't need tests enabled which can also cause build issues. > > Signed-off-by: James Hilliard > --- > package/gstreamer1/gst1-python/gst1-python.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From bernd at kuhls.net Sun Feb 11 15:32:11 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:32:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/fetchmail: bump version to 6.4.38 Message-ID: <20240211153211.2187231-1-bernd@kuhls.net> Release notes: https://sourceforge.net/p/fetchmail/mailman/message/58731594/ Signed-off-by: Bernd Kuhls --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 9ca6b2c7a7..3c0403fa78 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37783197/ -sha256 4a182e5d893e9abe6ac37ae71e542651fce6d606234fc735c2aaae18657e69ea fetchmail-6.4.37.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/58731594/ +sha256 a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9 fetchmail-6.4.38.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 6d418f9739..c74b259698 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).37 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).38 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING -- 2.39.2 From thomas.petazzoni at bootlin.com Sun Feb 11 15:31:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:31:56 +0100 Subject: [Buildroot] [git commit] package/gst1-python: disable tests Message-ID: <20240211153246.1BF488768B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae8cb9b2bfa95a3107ad312748316a11801d8472 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We don't need tests enabled which can also cause build issues. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-python/gst1-python.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index f843e37052..501ca5e02b 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -34,6 +34,7 @@ GST1_PYTHON_CONF_ENV += \ # the correct .so file, and the resulting compiled library has the appropriate # path of /usr/lib/python3.$(PYTHON3_VERSION_MAJOR).so GST1_PYTHON_CONF_OPTS += \ - -Dlibpython-dir=/usr/lib/ + -Dlibpython-dir=/usr/lib/ \ + -Dtests=disabled $(eval $(meson-package)) From thomas.petazzoni at bootlin.com Sun Feb 11 15:32:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:32:33 +0100 Subject: [Buildroot] [git commit] package/rlwrap: needs MMU Message-ID: <20240211153246.31C718768C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e0826d0672e9347fba03cf96ac9e7a48c36dac6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit 0a1f2fce0494388080af0a4130e62522c26fe4a9: /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: pty.o: in function `my_pty_fork': pty.c:(.text+0x68): undefined reference to `fork' /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: filter.o: in function `.L0 ': filter.c:(.text+0x134): undefined reference to `fork' Fixes: - http://autobuild.buildroot.org/results/0a3a68cfb181bc67a7dbf1d44f64b0a29df75987 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rlwrap/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rlwrap/Config.in b/package/rlwrap/Config.in index 0cb3e33fa7..4e18dfde52 100644 --- a/package/rlwrap/Config.in +++ b/package/rlwrap/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RLWRAP bool "rlwrap" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_READLINE help rlwrap is a 'readline wrapper', a small utility that uses the From thomas.petazzoni at bootlin.com Sun Feb 11 15:32:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:32:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/rlwrap: needs MMU In-Reply-To: <20240209195021.341782-1-fontaine.fabrice@gmail.com> References: <20240209195021.341782-1-fontaine.fabrice@gmail.com> Message-ID: <20240211163256.0471a81d@windsurf> On Fri, 9 Feb 2024 20:50:21 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit 0a1f2fce0494388080af0a4130e62522c26fe4a9: > > /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: pty.o: in function `my_pty_fork': > pty.c:(.text+0x68): undefined reference to `fork' > /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: filter.o: in function `.L0 ': > filter.c:(.text+0x134): undefined reference to `fork' > > Fixes: > - http://autobuild.buildroot.org/results/0a3a68cfb181bc67a7dbf1d44f64b0a29df75987 > > Signed-off-by: Fabrice Fontaine > --- > package/rlwrap/Config.in | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:33:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:33:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqrtr-glib: fix static build In-Reply-To: <20240209203852.671387-1-fontaine.fabrice@gmail.com> References: <20240209203852.671387-1-fontaine.fabrice@gmail.com> Message-ID: <20240211163317.68b199d6@windsurf> On Fri, 9 Feb 2024 21:38:52 +0100 Fabrice Fontaine wrote: > Fix the following static build failure raised since bump to version > 1.2.2 in commit b50bb982208011841fe0a9a7e4309808085cf493: > > [5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 > FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 > > Fixes: > - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d > > Signed-off-by: Fabrice Fontaine > --- > ...rtr-lib-meson.build-fix-static-build.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:33:11 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:33:11 +0100 Subject: [Buildroot] [git commit] package/libqrtr-glib: fix static build Message-ID: <20240211153429.F35CF8770E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=614e05f91524ae0f4c7d0bb8c7844645a85497fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following static build failure raised since bump to version 1.2.2 in commit b50bb982208011841fe0a9a7e4309808085cf493: [5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 Fixes: - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d Signed-off-by: Fabrice Fontaine Reviewed-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...-libqrtr-lib-meson.build-fix-static-build.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch b/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch new file mode 100644 index 0000000000..8c0db7bed5 --- /dev/null +++ b/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch @@ -0,0 +1,36 @@ +From dd9d68259c1fb79bcf40fcdf6aa1e6026edec9b2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 9 Feb 2024 21:16:39 +0100 +Subject: [PATCH] src/libqrtr-lib/meson.build: fix static build + +Replace shared_library by library to avoid the following static build +failure: + +[5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 +FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 + +Fixes: + - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/merge_requests/24 +--- + src/libqrtr-glib/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libqrtr-glib/meson.build b/src/libqrtr-glib/meson.build +index bbdd869..0cddcc7 100644 +--- a/src/libqrtr-glib/meson.build ++++ b/src/libqrtr-glib/meson.build +@@ -39,7 +39,7 @@ c_flags = [ + '-DLIBEXEC_PATH="@0@"'.format(qrtr_prefix / qrtr_libexecdir), + ] + +-libqrtr_glib = shared_library( ++libqrtr_glib = library( + libname, + version: qrtr_glib_version, + sources: sources + [version_header], +-- +2.43.0 + From fontaine.fabrice at gmail.com Sun Feb 11 15:44:01 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 16:44:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdk-pixbuf: fix static build Message-ID: <20240211154401.5516-1-fontaine.fabrice@gmail.com> Fix the following static build failure raised, at least, since bump to version 2.42.10 in commit cd2757bd76d2bc2411e67a27a25b8ab55d40bdb7: FAILED: gdk-pixbuf/gdk-pixbuf-csource /home/autobuild/autobuild/instance-9/output-1/host/bin/mips-buildroot-linux-musl-gcc -o gdk-pixbuf/gdk-pixbuf-csource gdk-pixbuf/gdk-pixbuf-csource.p/gdk-pixbuf-csource.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static -Wl,--start-group gdk-pixbuf/libgdk_pixbuf-2.0.a -lm /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libglib-2.0.a -pthread /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libpcre2-8.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libffi.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libblkid.a -Wl,--end-group /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/12.3.0/../../../../mips-buildroot-linux-musl/bin/ld: gdk-pixbuf/libgdk_pixbuf-2.0.a(io-png.c.o): in function `png_simple_error_callback': io-png.c:(.text+0xf8): undefined reference to `png_get_error_ptr' Fixes: - http://autobuild.buildroot.org/results/e194d8f90caed7ceefd200d4e40d5fa5b3567d03 Signed-off-by: Fabrice Fontaine --- ...-pixbuf-meson.build-fix-static-build.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/gdk-pixbuf/0001-gdk-pixbuf-meson.build-fix-static-build.patch diff --git a/package/gdk-pixbuf/0001-gdk-pixbuf-meson.build-fix-static-build.patch b/package/gdk-pixbuf/0001-gdk-pixbuf-meson.build-fix-static-build.patch new file mode 100644 index 0000000000..44fff9b66d --- /dev/null +++ b/package/gdk-pixbuf/0001-gdk-pixbuf-meson.build-fix-static-build.patch @@ -0,0 +1,38 @@ +From 02cb9c96528a756c346aae59facb8bb7a18463c4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 10 Feb 2024 18:32:06 +0100 +Subject: [PATCH] gdk-pixbuf/meson.build: fix static build + +Add included_loaders_deps to dependencies of gdkpixbuf_dep to avoid the +following build failure when building statically: + +FAILED: gdk-pixbuf/gdk-pixbuf-csource +/home/autobuild/autobuild/instance-9/output-1/host/bin/mips-buildroot-linux-musl-gcc -o gdk-pixbuf/gdk-pixbuf-csource gdk-pixbuf/gdk-pixbuf-csource.p/gdk-pixbuf-csource.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static -Wl,--start-group gdk-pixbuf/libgdk_pixbuf-2.0.a -lm /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libglib-2.0.a -pthread /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libpcre2-8.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libffi.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libblkid.a -Wl,--end-group +/home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/12.3.0/../../../../mips-buildroot-linux-musl/bin/ld: gdk-pixbuf/libgdk_pixbuf-2.0.a(io-png.c.o): in function `png_simple_error_callback': +io-png.c:(.text+0xf8): undefined reference to `png_get_error_ptr' + +Fixes: + - http://autobuild.buildroot.org/results/e194d8f90caed7ceefd200d4e40d5fa5b3567d03 + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/162 +--- + gdk-pixbuf/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +index a11926eee..450484d68 100644 +--- a/gdk-pixbuf/meson.build ++++ b/gdk-pixbuf/meson.build +@@ -269,7 +269,7 @@ endif + gdkpixbuf_dep = declare_dependency( + link_with: gdkpixbuf, + include_directories: root_inc, +- dependencies: gdk_pixbuf_deps, ++ dependencies: [ gdk_pixbuf_deps, included_loaders_deps ], + sources: [ gdkpixbuf_enum_h, built_girs ], + ) + meson.override_dependency('gdk-pixbuf-2.0', gdkpixbuf_dep) +-- +2.43.0 + -- 2.43.0 From bernd at kuhls.net Sun Feb 11 15:47:13 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:47:13 +0100 Subject: [Buildroot] [PATCH 1/2] package/alsa-lib: bump version to 1.2.11 Message-ID: <20240211154714.2311642-1-bernd@kuhls.net> Removed patch which is included in this release. Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.10_v1.2.11#alsa-lib Signed-off-by: Bernd Kuhls --- ...STRING-macro-outside-PIC-ifdef-block.patch | 50 ------------------- package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch diff --git a/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch b/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch deleted file mode 100644 index 7bd67507fd..0000000000 --- a/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 6 Sep 2023 15:16:44 +0200 -Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block - -It solves the musl libc compilation issue. - -control.c: In function 'snd_ctl_open_conf': -../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio] - 98 | #define SND_DLSYM_VERSION(version) __STRING(version) - | ^~~~~~~~ - -Fixes: https://github.com/alsa-project/alsa-lib/issues/350 -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c - -Signed-off-by: Bernd Kuhls ---- - include/global.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/global.h b/include/global.h -index dfe9bc2b..3ecaeee8 100644 ---- a/include/global.h -+++ b/include/global.h -@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void); - #define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) - #endif - -+#ifndef __STRING -+/** \brief Return 'x' argument as string */ -+#define __STRING(x) #x -+#endif -+ - #ifdef PIC /* dynamic build */ - - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ -@@ -71,11 +76,6 @@ struct snd_dlsym_link { - - extern struct snd_dlsym_link *snd_dlsym_start; - --#ifndef __STRING --/** \brief Return 'x' argument as string */ --#define __STRING(x) #x --#endif -- - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ - #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version - /** diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index a6d9c7dbdc..830643dea8 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e alsa-lib-1.2.10.tar.bz2 +sha256 9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d alsa-lib-1.2.11.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 5dfcd1e861..246761d4e6 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.10 +ALSA_LIB_VERSION = 1.2.11 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) -- 2.39.2 From bernd at kuhls.net Sun Feb 11 15:47:14 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:47:14 +0100 Subject: [Buildroot] [PATCH 2/2] package/alsa-utils: bump version to 1.2.11 In-Reply-To: <20240211154714.2311642-1-bernd@kuhls.net> References: <20240211154714.2311642-1-bernd@kuhls.net> Message-ID: <20240211154714.2311642-2-bernd@kuhls.net> Removed patches which are included in this release. Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.10_v1.2.11#alsa-utils Signed-off-by: Bernd Kuhls --- ...UTE_UNUSED-instead-remove-argument-n.patch | 233 ------------- ...UTE_UNUSED-instead-remove-argument-n.patch | 34 -- ...RIBUTE_UNUSED-instead-remove-argumen.patch | 57 ---- ...E_UNUSED-instead-remove-argument-nam.patch | 67 ---- ...E_UNUSED-instead-remove-argument-nam.patch | 93 ------ ...IBUTE_UNUSED-instead-remove-argument.patch | 109 ------ ...RIBUTE_UNUSED-instead-remove-argumen.patch | 312 ------------------ .../0009-topology-include-locale.h.patch | 33 -- ...nhlt-dmic-info.c-include-sys-types.h.patch | 33 -- ...nfigure.ac-fix-UMP-support-detection.patch | 38 --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 12 files changed, 2 insertions(+), 1011 deletions(-) delete mode 100644 package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch delete mode 100644 package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch delete mode 100644 package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch delete mode 100644 package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch delete mode 100644 package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch delete mode 100644 package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch delete mode 100644 package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch delete mode 100644 package/alsa-utils/0009-topology-include-locale.h.patch delete mode 100644 package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch delete mode 100644 package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch diff --git a/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch b/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch deleted file mode 100644 index 92622292c0..0000000000 --- a/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch +++ /dev/null @@ -1,233 +0,0 @@ -From a90faa2dd644af585d6a00f0aaf297c15ea0aa7b Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:33:47 +0200 -Subject: [PATCH] axfer: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: ad5a1c0 ("axfer: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/a90faa2dd644af585d6a00f0aaf297c15ea0aa7b - -Signed-off-by: Bernd Kuhls ---- - axfer/container-raw.c | 14 +++++++------- - axfer/mapper-single.c | 6 +++--- - axfer/subcmd-list.c | 2 +- - axfer/subcmd-transfer.c | 4 ++-- - axfer/waiter-poll.c | 4 ++-- - axfer/waiter-select.c | 4 ++-- - axfer/waiter.h | 1 + - axfer/xfer-libasound-irq-rw.c | 2 +- - axfer/xfer-libasound.c | 4 ++-- - axfer/xfer-options.c | 3 ++- - 10 files changed, 23 insertions(+), 21 deletions(-) - -diff --git a/axfer/container-raw.c b/axfer/container-raw.c -index 071f94c..1886045 100644 ---- a/axfer/container-raw.c -+++ b/axfer/container-raw.c -@@ -13,10 +13,10 @@ - #include - #include - --static int raw_builder_pre_process(struct container_context *, -- snd_pcm_format_t *, -- unsigned int *, -- unsigned int *, -+static int raw_builder_pre_process(struct container_context *cntr ATTRIBUTE_UNUSED, -+ snd_pcm_format_t *format ATTRIBUTE_UNUSED, -+ unsigned int *samples_per_frame ATTRIBUTE_UNUSED, -+ unsigned int *frames_per_second ATTRIBUTE_UNUSED, - uint64_t *byte_count) - { - *byte_count = UINT64_MAX; -@@ -25,9 +25,9 @@ static int raw_builder_pre_process(struct container_context *, - } - - static int raw_parser_pre_process(struct container_context *cntr, -- snd_pcm_format_t *, -- unsigned int *, -- unsigned int *, -+ snd_pcm_format_t *format ATTRIBUTE_UNUSED, -+ unsigned int *samples_per_frame ATTRIBUTE_UNUSED, -+ unsigned int *frames_per_second ATTRIBUTE_UNUSED, - uint64_t *byte_count) - { - struct stat buf = {0}; -diff --git a/axfer/mapper-single.c b/axfer/mapper-single.c -index 13e7fc5..f669f7f 100644 ---- a/axfer/mapper-single.c -+++ b/axfer/mapper-single.c -@@ -62,7 +62,7 @@ static void align_from_vector(void *frame_buf, unsigned int frame_count, - - static int single_pre_process(struct mapper_context *mapper, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - unsigned int bytes_per_buffer; -@@ -110,7 +110,7 @@ static int single_muxer_process_frames(struct mapper_context *mapper, - void *frame_buf, - unsigned int *frame_count, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - void *src; -@@ -141,7 +141,7 @@ static int single_demuxer_process_frames(struct mapper_context *mapper, - void *frame_buf, - unsigned int *frame_count, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - void *dst; -diff --git a/axfer/subcmd-list.c b/axfer/subcmd-list.c -index f9c8e0f..187e1d7 100644 ---- a/axfer/subcmd-list.c -+++ b/axfer/subcmd-list.c -@@ -19,7 +19,7 @@ enum list_op { - }; - - static int dump_device(snd_ctl_t *handle, const char *id, const char *name, -- snd_pcm_stream_t, snd_pcm_info_t *info) -+ snd_pcm_stream_t stream ATTRIBUTE_UNUSED, snd_pcm_info_t *info) - { - unsigned int i, count; - int err; -diff --git a/axfer/subcmd-transfer.c b/axfer/subcmd-transfer.c -index b39fde8..8d63043 100644 ---- a/axfer/subcmd-transfer.c -+++ b/axfer/subcmd-transfer.c -@@ -40,7 +40,7 @@ static void handle_unix_signal_for_finish(int sig) - ctx_ptr->interrupted = true; - } - --static void handle_unix_signal_for_suspend(int) -+static void handle_unix_signal_for_suspend(int sig ATTRIBUTE_UNUSED) - { - sigset_t curr, prev; - struct sigaction sa = {0}; -@@ -439,7 +439,7 @@ static int context_process_frames(struct context *ctx, - } - - static void context_post_process(struct context *ctx, -- uint64_t) -+ uint64_t accumulated_frame_count ATTRIBUTE_UNUSED) - { - uint64_t total_frame_count; - unsigned int i; -diff --git a/axfer/waiter-poll.c b/axfer/waiter-poll.c -index 31fab88..b81300c 100644 ---- a/axfer/waiter-poll.c -+++ b/axfer/waiter-poll.c -@@ -13,7 +13,7 @@ - #include - #include - --static int poll_prepare(struct waiter_context *) -+static int poll_prepare(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - // Nothing to do because an instance of waiter has required data. - return 0; -@@ -30,7 +30,7 @@ static int poll_wait_event(struct waiter_context *waiter, int timeout_msec) - return err; - } - --static void poll_release(struct waiter_context *) -+static void poll_release(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - // Nothing to do because an instance of waiter has required data. - return; -diff --git a/axfer/waiter-select.c b/axfer/waiter-select.c -index 164c9c8..fe19776 100644 ---- a/axfer/waiter-select.c -+++ b/axfer/waiter-select.c -@@ -34,7 +34,7 @@ struct select_state { - fd_set rfds_ex; - }; - --static int select_prepare(struct waiter_context *) -+static int select_prepare(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - return 0; - } -@@ -94,7 +94,7 @@ static int select_wait_event(struct waiter_context *waiter, int timeout_msec) - return err; - } - --static void select_release(struct waiter_context *) -+static void select_release(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - return; - } -diff --git a/axfer/waiter.h b/axfer/waiter.h -index db18e33..0f4e9b9 100644 ---- a/axfer/waiter.h -+++ b/axfer/waiter.h -@@ -9,6 +9,7 @@ - #ifndef __ALSA_UTILS_AXFER_WAITER__H_ - #define __ALSA_UTILS_AXFER_WAITER__H_ - -+#include - #include - - enum waiter_type { -diff --git a/axfer/xfer-libasound-irq-rw.c b/axfer/xfer-libasound-irq-rw.c -index b7f0645..45fb6d5 100644 ---- a/axfer/xfer-libasound-irq-rw.c -+++ b/axfer/xfer-libasound-irq-rw.c -@@ -313,7 +313,7 @@ error: - } - - static int w_process_frames_nonblocking(struct libasound_state *state, -- snd_pcm_state_t, -+ snd_pcm_state_t pcm_state ATTRIBUTE_UNUSED, - unsigned int *frame_count, - struct mapper_context *mapper, - struct container_context *cntrs) -diff --git a/axfer/xfer-libasound.c b/axfer/xfer-libasound.c -index 9713533..36ee08d 100644 ---- a/axfer/xfer-libasound.c -+++ b/axfer/xfer-libasound.c -@@ -60,7 +60,7 @@ static const struct option l_opts[] = { - }; - - static int xfer_libasound_init(struct xfer_context *xfer, -- snd_pcm_stream_t) -+ snd_pcm_stream_t stream ATTRIBUTE_UNUSED) - { - struct libasound_state *state = xfer->private_data; - int err; -@@ -887,7 +887,7 @@ static void xfer_libasound_destroy(struct xfer_context *xfer) - state->log = NULL; - } - --static void xfer_libasound_help(struct xfer_context *) -+static void xfer_libasound_help(struct xfer_context *xfer ATTRIBUTE_UNUSED) - { - printf( - " [BASICS]\n" -diff --git a/axfer/xfer-options.c b/axfer/xfer-options.c -index 974570c..e716ded 100644 ---- a/axfer/xfer-options.c -+++ b/axfer/xfer-options.c -@@ -447,7 +447,8 @@ static int generate_path_with_suffix(struct xfer_context *xfer, - - static int generate_path_without_suffix(struct xfer_context *xfer, - const char *template, -- unsigned int index, const char *) -+ unsigned int index, -+ const char *suffix ATTRIBUTE_UNUSED) - { - static const char *const single_format = "%s"; - static const char *const multiple_format = "%s-%i"; --- -2.39.2 - diff --git a/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch b/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch deleted file mode 100644 index 12a098b6fb..0000000000 --- a/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2db896afd475b0b3ad07e97ba74ec9680b4f7f6d Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:37:24 +0200 -Subject: [PATCH] amidi: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 1843540 ("amidi: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/2db896afd475b0b3ad07e97ba74ec9680b4f7f6d - -Signed-off-by: Bernd Kuhls ---- - amidi/amidi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amidi/amidi.c b/amidi/amidi.c -index f930ca8..75fb8c0 100644 ---- a/amidi/amidi.c -+++ b/amidi/amidi.c -@@ -446,7 +446,7 @@ static void print_byte(unsigned char byte, struct timespec *ts) - printf("%02X", byte); - } - --static void sig_handler(int) -+static void sig_handler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } --- -2.39.2 - diff --git a/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch b/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch deleted file mode 100644 index 4720531415..0000000000 --- a/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7552aef6e08b5b1fd8c1704e21cb9f6f15017bfa Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:45:09 +0200 -Subject: [PATCH] alsaloop: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: d609a58 ("alsaloop: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/7552aef6e08b5b1fd8c1704e21cb9f6f15017bfa - -Signed-off-by: Bernd Kuhls ---- - alsaloop/alsaloop.c | 2 +- - alsaloop/pcmjob.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/alsaloop/alsaloop.c b/alsaloop/alsaloop.c -index b10733e..51fb646 100644 ---- a/alsaloop/alsaloop.c -+++ b/alsaloop/alsaloop.c -@@ -821,7 +821,7 @@ static void send_to_all(int sig) - } - } - --static void signal_handler(int) -+static void signal_handler(int sig ATTRIBUTE_UNUSED) - { - quit = 1; - send_to_all(SIGUSR2); -diff --git a/alsaloop/pcmjob.c b/alsaloop/pcmjob.c -index be71971..ffb439b 100644 ---- a/alsaloop/pcmjob.c -+++ b/alsaloop/pcmjob.c -@@ -625,7 +625,7 @@ static void buf_add_src(struct loopback *loop) - } - } - #else --static void buf_add_src(struct loopback *) -+static void buf_add_src(struct loopback *loop ATTRIBUTE_UNUSED) - { - } - #endif -@@ -1794,7 +1794,7 @@ static int ctl_event_check(snd_ctl_elem_value_t *val, snd_ctl_event_t *ev) - } - - static int handle_ctl_events(struct loopback_handle *lhandle, -- unsigned short) -+ unsigned short events ATTRIBUTE_UNUSED) - { - struct loopback *loop = lhandle->loopback; - snd_ctl_event_t *ev; --- -2.39.2 - diff --git a/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch b/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch deleted file mode 100644 index 1a42f24d3c..0000000000 --- a/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 94eeb5a40f77e92624eb32d2e9c50b1cd9e4f837 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:49:03 +0200 -Subject: [PATCH] bat: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: b366875 ("bat: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/94eeb5a40f77e92624eb32d2e9c50b1cd9e4f837 - -Signed-off-by: Bernd Kuhls ---- - bat/bat.c | 3 ++- - bat/common.c | 3 ++- - bat/common.h | 5 +++++ - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/bat/bat.c b/bat/bat.c -index e88c65f..ea04ed9 100644 ---- a/bat/bat.c -+++ b/bat/bat.c -@@ -158,7 +158,8 @@ static void get_format(struct bat *bat, char *optarg) - } - } - --static inline int thread_wait_completion(struct bat *, pthread_t id, int **val) -+static inline int thread_wait_completion(struct bat *bat ATTRIBUTE_UNUSED, -+ pthread_t id, int **val) - { - int err; - -diff --git a/bat/common.c b/bat/common.c -index 9ff9405..470a7e6 100644 ---- a/bat/common.c -+++ b/bat/common.c -@@ -47,7 +47,8 @@ static int update_fmt_to_bat(struct bat *bat, struct chunk_fmt *fmt) - } - - /* calculate frames and update to bat */ --static int update_frames_to_bat(struct bat *bat, struct wav_chunk_header *header, FILE *) -+static int update_frames_to_bat(struct bat *bat, struct wav_chunk_header *header, -+ FILE *file ATTRIBUTE_UNUSED) - { - /* The number of analyzed captured frames is arbitrarily set to half of - the number of frames of the wav file or the number of frames of the -diff --git a/bat/common.h b/bat/common.h -index a9bae5d..bb51b0d 100644 ---- a/bat/common.h -+++ b/bat/common.h -@@ -13,6 +13,11 @@ - * - */ - -+#ifndef ATTRIBUTE_UNUSED -+/** do not print warning (gcc) when function parameter is not used */ -+#define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -+#endif -+ - #define TEMP_RECORD_FILE_NAME "/tmp/bat.wav.XXXXXX" - #define DEFAULT_DEV_NAME "default" - --- -2.39.2 - diff --git a/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch b/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch deleted file mode 100644 index 9e7e7da5ce..0000000000 --- a/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 66112d60e4ce68720022eaf26080c0f1a2caf81f Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:52:46 +0200 -Subject: [PATCH] seq: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 181e190 ("aplaymidi: fix the verbose compilation warnings for latest gcc") -Fixes: a03377a ("aseqnet: fix the verbose compilation warnings for latest gcc") -Fixes: 429c32a ("aseqdump: fix the verbose compilation warnings for latest gcc") -Fixes: 0b48dd6 ("aconnect: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/66112d60e4ce68720022eaf26080c0f1a2caf81f - -Signed-off-by: Bernd Kuhls ---- - seq/aconnect/aconnect.c | 9 ++++++--- - seq/aplaymidi/arecordmidi.c | 2 +- - seq/aseqdump/aseqdump.c | 2 +- - seq/aseqnet/aseqnet.c | 2 +- - 4 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/seq/aconnect/aconnect.c b/seq/aconnect/aconnect.c -index 3a10de9..7096feb 100644 ---- a/seq/aconnect/aconnect.c -+++ b/seq/aconnect/aconnect.c -@@ -193,7 +193,8 @@ static void do_search_port(snd_seq_t *seq, int perm, action_func_t do_action) - } - - --static void print_port(snd_seq_t *, snd_seq_client_info_t *cinfo, -+static void print_port(snd_seq_t *seq ATTRIBUTE_UNUSED, -+ snd_seq_client_info_t *cinfo, - snd_seq_port_info_t *pinfo, int count) - { - if (! count) { -@@ -247,8 +248,10 @@ static void print_port_and_subs(snd_seq_t *seq, snd_seq_client_info_t *cinfo, - /* - * remove all (exported) connections - */ --static void remove_connection(snd_seq_t *seq, snd_seq_client_info_t *, -- snd_seq_port_info_t *pinfo, int) -+static void remove_connection(snd_seq_t *seq, -+ snd_seq_client_info_t *info ATTRIBUTE_UNUSED, -+ snd_seq_port_info_t *pinfo, -+ int count ATTRIBUTE_UNUSED) - { - snd_seq_query_subscribe_t *query; - snd_seq_port_info_t *port; -diff --git a/seq/aplaymidi/arecordmidi.c b/seq/aplaymidi/arecordmidi.c -index ce71472..a4c1181 100644 ---- a/seq/aplaymidi/arecordmidi.c -+++ b/seq/aplaymidi/arecordmidi.c -@@ -719,7 +719,7 @@ static void version(void) - fputs("arecordmidi version " SND_UTIL_VERSION_STR "\n", stderr); - } - --static void sighandler(int) -+static void sighandler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } -diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c -index 8455ecb..af4ca21 100644 ---- a/seq/aseqdump/aseqdump.c -+++ b/seq/aseqdump/aseqdump.c -@@ -676,7 +676,7 @@ static void version(void) - puts("aseqdump version " SND_UTIL_VERSION_STR); - } - --static void sighandler(int) -+static void sighandler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } -diff --git a/seq/aseqnet/aseqnet.c b/seq/aseqnet/aseqnet.c -index f40de7d..aa70b50 100644 ---- a/seq/aseqnet/aseqnet.c -+++ b/seq/aseqnet/aseqnet.c -@@ -334,7 +334,7 @@ static void get_net_addr(struct addrinfo *rp, char *buf, size_t buflen) - /* - * signal handler - */ --static void sigterm_exit(int) -+static void sigterm_exit(int sig ATTRIBUTE_UNUSED) - { - close_files(); - exit(1); --- -2.39.2 - diff --git a/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch b/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch deleted file mode 100644 index 66826c4515..0000000000 --- a/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 9e5e9a6d70de63bea01f0669b01319952f2cfdea Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:57:47 +0200 -Subject: [PATCH] alsaucm: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: d7bbc26 ("alsaucm: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/9e5e9a6d70de63bea01f0669b01319952f2cfdea - -Signed-off-by: Bernd Kuhls ---- - alsaucm/dump.c | 22 ++++++++++++---------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -diff --git a/alsaucm/dump.c b/alsaucm/dump.c -index 102ac4d..a5c57f2 100644 ---- a/alsaucm/dump.c -+++ b/alsaucm/dump.c -@@ -93,7 +93,8 @@ static char *tesc(const char *s, char *buf, size_t buf_len) - - #define ESC(s, esc) tesc((s), (esc), sizeof(esc)) - --static int text_verb_start(struct renderer *, const char *verb, const char *comment) -+static int text_verb_start(struct renderer *r ATTRIBUTE_UNUSED, -+ const char *verb, const char *comment) - { - char buf1[128], buf2[128]; - printf("Verb.%s {\n", ESC(verb, buf1)); -@@ -102,13 +103,13 @@ static int text_verb_start(struct renderer *, const char *verb, const char *comm - return 0; - } - --static int text_verb_end(struct renderer *) -+static int text_verb_end(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("}\n"); - return 0; - } - --static int text_2nd_level_begin(struct renderer *, -+static int text_2nd_level_begin(struct renderer *r ATTRIBUTE_UNUSED, - const char *key, - const char *val, - const char *comment) -@@ -120,19 +121,19 @@ static int text_2nd_level_begin(struct renderer *, - return 0; - } - --static int text_2nd_level_end(struct renderer *) -+static int text_2nd_level_end(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("\t}\n"); - return 0; - } - --static int text_2nd_level(struct renderer *, const char *txt) -+static int text_2nd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf("\t\t%s", txt); - return 0; - } - --static int text_3rd_level(struct renderer *, const char *txt) -+static int text_3rd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf("\t\t\t%s", txt); - return 0; -@@ -266,7 +267,7 @@ static void json_block(struct renderer *r, int level, int last) - j->block[level] = last ? 0 : 1; - } - --static int json_init(struct renderer *) -+static int json_init(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("{\n \"Verbs\": {"); - return 0; -@@ -325,13 +326,13 @@ static int json_2nd_level_end(struct renderer *r) - return 0; - } - --static int json_2nd_level(struct renderer *, const char *txt) -+static int json_2nd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf(" %s", txt); - return 0; - } - --static int json_3rd_level(struct renderer *, const char *txt) -+static int json_3rd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf(" %s", txt); - return 0; -@@ -360,7 +361,8 @@ static int json_supcon_start(struct renderer *r, const char *key) - return 0; - } - --static int json_supcon_value(struct renderer *r, const char *value, int) -+static int json_supcon_value(struct renderer *r, const char *value, -+ int last ATTRIBUTE_UNUSED) - { - char buf[256]; - JESC(value, buf); --- -2.39.2 - diff --git a/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch b/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch deleted file mode 100644 index 07b10b3ab8..0000000000 --- a/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch +++ /dev/null @@ -1,312 +0,0 @@ -From dfe1c7143ab6ea01789e276b1ba361a00e545997 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 17:11:05 +0200 -Subject: [PATCH] topology: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 153d185 ("topology: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/dfe1c7143ab6ea01789e276b1ba361a00e545997 - -Signed-off-by: Bernd Kuhls ---- - topology/nhlt/intel/dmic-nhlt.c | 3 ++- - topology/nhlt/intel/dmic/dmic-debug.c | 7 ++++--- - topology/nhlt/intel/ssp/ssp-debug.c | 5 +++-- - topology/nhlt/intel/ssp/ssp-process.c | 4 +++- - topology/nhlt/nhlt-processor.c | 7 +++++-- - topology/pre-process-class.c | 10 +++++----- - topology/pre-process-object.c | 21 +++++++++++---------- - topology/pre-processor.c | 10 ++++++---- - 8 files changed, 39 insertions(+), 28 deletions(-) - -diff --git a/topology/nhlt/intel/dmic-nhlt.c b/topology/nhlt/intel/dmic-nhlt.c -index 70a22e3..de659cf 100644 ---- a/topology/nhlt/intel/dmic-nhlt.c -+++ b/topology/nhlt/intel/dmic-nhlt.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -155,7 +156,7 @@ static int set_vendor_mic_data(struct intel_nhlt_params *nhlt, snd_config_t *cfg - horizontal_angle_end); - } - --static int set_bytes_data(struct intel_nhlt_params *, snd_config_t *cfg) -+static int set_bytes_data(struct intel_nhlt_params *nhlt ATTRIBUTE_UNUSED, snd_config_t *cfg) - { - snd_config_iterator_t i, next; - snd_config_t *n; -diff --git a/topology/nhlt/intel/dmic/dmic-debug.c b/topology/nhlt/intel/dmic/dmic-debug.c -index f99d308..a977c93 100644 ---- a/topology/nhlt/intel/dmic/dmic-debug.c -+++ b/topology/nhlt/intel/dmic/dmic-debug.c -@@ -8,6 +8,7 @@ - #include "aconfig.h" - #include - #include -+#include - #include "dmic-debug.h" - - #ifdef NHLT_DEBUG -@@ -181,7 +182,7 @@ void dmic_print_internal(struct intel_dmic_params *dmic) - } - - #else /* NHLT_DEBUG */ --void dmic_print_bytes_as_hex(uint8_t *, size_t) {} --void dmic_print_integers_as_hex(uint32_t *, size_t) {} --void dmic_print_internal(struct intel_dmic_params *) {} -+void dmic_print_bytes_as_hex(uint8_t *src ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED) {} -+void dmic_print_integers_as_hex(uint32_t *src ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED) {} -+void dmic_print_internal(struct intel_dmic_params *dmic ATTRIBUTE_UNUSED) {} - #endif -diff --git a/topology/nhlt/intel/ssp/ssp-debug.c b/topology/nhlt/intel/ssp/ssp-debug.c -index 8c64675..2d2f6b0 100644 ---- a/topology/nhlt/intel/ssp/ssp-debug.c -+++ b/topology/nhlt/intel/ssp/ssp-debug.c -@@ -7,6 +7,7 @@ - #include "aconfig.h" - #include - #include -+#include - #include "ssp-debug.h" - #include "../intel-nhlt.h" - -@@ -252,6 +253,6 @@ void ssp_print_internal(struct intel_ssp_params *ssp) - } - - #else /* NHLT_DEBUG */ --void ssp_print_internal(struct intel_ssp_params *) {} --void ssp_print_calculated(struct intel_ssp_params *) {} -+void ssp_print_internal(struct intel_ssp_params *ssp ATTRIBUTE_UNUSED) {} -+void ssp_print_calculated(struct intel_ssp_params *ssp ATTRIBUTE_UNUSED) {} - #endif -diff --git a/topology/nhlt/intel/ssp/ssp-process.c b/topology/nhlt/intel/ssp/ssp-process.c -index 9cda5c3..17b88d2 100644 ---- a/topology/nhlt/intel/ssp/ssp-process.c -+++ b/topology/nhlt/intel/ssp/ssp-process.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -952,7 +953,8 @@ int ssp_set_params(struct intel_nhlt_params *nhlt, const char *dir, int dai_inde - return 0; - } - --int ssp_hw_set_params(struct intel_nhlt_params *nhlt, const char *format, const char *, -+int ssp_hw_set_params(struct intel_nhlt_params *nhlt, const char *format, -+ const char *mclk ATTRIBUTE_UNUSED, - const char *bclk, const char *bclk_invert, const char *fsync, - const char *fsync_invert, int mclk_freq, int bclk_freq, int fsync_freq, - int tdm_slots, int tdm_slot_width, int tx_slots, int rx_slots) -diff --git a/topology/nhlt/nhlt-processor.c b/topology/nhlt/nhlt-processor.c -index 567fa5c..ca539c3 100644 ---- a/topology/nhlt/nhlt-processor.c -+++ b/topology/nhlt/nhlt-processor.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -87,7 +88,8 @@ static void debug_print_nhlt(struct nhlt *blob, struct endpoint_descriptor **eps - fprintf(stdout, "\n"); - } - #else --static void debug_print_nhlt(struct nhlt *, struct endpoint_descriptor **) {} -+static void debug_print_nhlt(struct nhlt *blob ATTRIBUTE_UNUSED, -+ struct endpoint_descriptor **eps ATTRIBUTE_UNUSED) {} - #endif - - static int print_as_hex_bytes(uint8_t *manifest_buffer, uint32_t manifest_size, -@@ -313,7 +315,8 @@ static int nhlt_get_flat_buffer(struct nhlt *blob, struct endpoint_descriptor ** - } - - /* called at the end of topology pre-processing, create flat buffer from variable size nhlt */ --static int nhlt_create(struct intel_nhlt_params *nhlt, snd_config_t *input, snd_config_t *, -+static int nhlt_create(struct intel_nhlt_params *nhlt, snd_config_t *input, -+ snd_config_t *output ATTRIBUTE_UNUSED, - uint8_t **nhlt_buffer, uint32_t *nhlt_size) - { - struct endpoint_descriptor *eps[MAX_ENDPOINT_COUNT]; -diff --git a/topology/pre-process-class.c b/topology/pre-process-class.c -index d883d05..bedcebe 100644 ---- a/topology/pre-process-class.c -+++ b/topology/pre-process-class.c -@@ -127,7 +127,7 @@ snd_config_t *tplg_class_lookup(struct tplg_pre_processor *tplg_pp, snd_config_t - } - - /* find the attribute config by name in the class definition */ --snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *, -+snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *tplg_p ATTRIBUTE_UNUSED, - snd_config_t *class, const char *name) - { - snd_config_t *attr = NULL; -@@ -152,7 +152,7 @@ snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *, - } - - /* get the name of the attribute that must have a unique value in the object instance */ --const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *, -+const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class) - { - snd_config_t *unique; -@@ -177,7 +177,7 @@ const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *, - } - - /* get attribute type from the definition */ --snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *, -+snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *attr) - { - snd_config_t *type; -@@ -208,7 +208,7 @@ snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *, - } - - /* get token_ref for attribute with name attr_name in the class */ --const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *, -+const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, const char *attr_name) - { - snd_config_t *attributes, *attr, *token_ref; -@@ -235,7 +235,7 @@ const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *, - } - - /* convert a valid attribute string value to the corresponding tuple value */ --long tplg_class_attribute_valid_tuple_value(struct tplg_pre_processor *, -+long tplg_class_attribute_valid_tuple_value(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, snd_config_t *attr) - { - -diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c -index 48555e7..61cc85f 100644 ---- a/topology/pre-process-object.c -+++ b/topology/pre-process-object.c -@@ -31,7 +31,8 @@ - - /* Parse VendorToken object, create the "SectionVendorToken" and save it */ - int tplg_build_vendor_token_object(struct tplg_pre_processor *tplg_pp, -- snd_config_t *obj_cfg, snd_config_t *) -+ snd_config_t *obj_cfg, -+ snd_config_t *parent ATTRIBUTE_UNUSED) - { - snd_config_iterator_t i, next; - snd_config_t *vtop, *n, *obj; -@@ -196,7 +197,7 @@ int tplg_build_data_object(struct tplg_pre_processor *tplg_pp, snd_config_t *obj - return tplg_parent_update(tplg_pp, parent, "data", name); - } - --static int tplg_create_config_template(struct tplg_pre_processor *, -+static int tplg_create_config_template(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t **template, - const struct config_template_items *items) - { -@@ -499,7 +500,7 @@ min_max_check: - } - - /* get object's name attribute value */ --const char *tplg_object_get_name(struct tplg_pre_processor *, -+const char *tplg_object_get_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *object) - { - snd_config_t *cfg; -@@ -518,7 +519,7 @@ const char *tplg_object_get_name(struct tplg_pre_processor *, - } - - /* look up the instance of object in a config */ --static snd_config_t *tplg_object_lookup_in_config(struct tplg_pre_processor *, -+static snd_config_t *tplg_object_lookup_in_config(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, const char *type, - const char *class_name, const char *id) - { -@@ -977,7 +978,7 @@ template: - } - - static int tplg_build_generic_object(struct tplg_pre_processor *tplg_pp, snd_config_t *obj_cfg, -- snd_config_t *) -+ snd_config_t *parent ATTRIBUTE_UNUSED) - { - snd_config_t *wtop; - const char *name; -@@ -1090,7 +1091,7 @@ const struct build_function_map object_build_map[] = { - NULL, &pcm_caps_config}, - }; - --static const struct build_function_map *tplg_object_get_map(struct tplg_pre_processor *, -+static const struct build_function_map *tplg_object_get_map(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *obj) - { - snd_config_iterator_t first; -@@ -1145,7 +1146,7 @@ snd_config_t *tplg_object_get_section(struct tplg_pre_processor *tplg_pp, snd_co - } - - /* return 1 if attribute not found in search_config, 0 on success and negative value on error */ --static int tplg_object_copy_and_add_param(struct tplg_pre_processor *, -+static int tplg_object_copy_and_add_param(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *obj, - snd_config_t *attr_cfg, - snd_config_t *search_config) -@@ -1351,8 +1352,8 @@ static int tplg_object_pre_process_children(struct tplg_pre_processor *tplg_pp, - return 0; - } - --static int tplg_construct_object_name(struct tplg_pre_processor *, snd_config_t *obj, -- snd_config_t *class_cfg) -+static int tplg_construct_object_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ snd_config_t *obj, snd_config_t *class_cfg) - { - snd_config_iterator_t i, next; - snd_config_t *args, *n; -@@ -1547,7 +1548,7 @@ static int tplg_object_set_unique_attribute(struct tplg_pre_processor *tplg_pp, - * Helper function to get object instance config which is 2 nodes down from class_type config. - * ex: Get the pointer to the config node with ID "0" from the input config Widget.pga.0 {} - */ --snd_config_t *tplg_object_get_instance_config(struct tplg_pre_processor *, -+snd_config_t *tplg_object_get_instance_config(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class_type) - { - snd_config_iterator_t first; -diff --git a/topology/pre-processor.c b/topology/pre-processor.c -index 3903dee..01f8a5d 100644 ---- a/topology/pre-processor.c -+++ b/topology/pre-processor.c -@@ -231,8 +231,9 @@ void tplg_pp_config_debug(struct tplg_pre_processor *tplg_pp, snd_config_t *cfg) - snd_config_save(cfg, tplg_pp->dbg_output); - } - #else --void tplg_pp_debug(char *, ...) {} --void tplg_pp_config_debug(struct tplg_pre_processor *, snd_config_t *){} -+void tplg_pp_debug(char *fmt ATTRIBUTE_UNUSED, ...) {} -+void tplg_pp_config_debug(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ snd_config_t *cfg ATTRIBUTE_UNUSED) {} - #endif - - static int pre_process_config(struct tplg_pre_processor *tplg_pp, snd_config_t *cfg) -@@ -640,8 +641,9 @@ static int pre_process_includes_all(struct tplg_pre_processor *tplg_pp, snd_conf - } - - /* duplicate the existing objects in src into dest and update with new attribute */ --static int pre_process_add_objects(struct tplg_pre_processor *, int *object_count, -- snd_config_t *src, snd_config_t *dest, snd_config_t *attr_cfg) -+static int pre_process_add_objects(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ int *object_count, snd_config_t *src, -+ snd_config_t *dest, snd_config_t *attr_cfg) - { - snd_config_iterator_t i, next; - int ret; --- -2.39.2 - diff --git a/package/alsa-utils/0009-topology-include-locale.h.patch b/package/alsa-utils/0009-topology-include-locale.h.patch deleted file mode 100644 index 14a059cbf6..0000000000 --- a/package/alsa-utils/0009-topology-include-locale.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8c229270f6bae83b705a03714c46067a7aa57b02 Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Tue, 19 Sep 2023 13:14:29 +0200 -Subject: [PATCH] topology: include locale.h - -This solves an issue compiling with the musl libc. - -Fixes: https://github.com/alsa-project/alsa-utils/issues/239 -Signed-off-by: Michael Opdenacker -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/8c229270f6bae83b705a03714c46067a7aa57b02 - -Signed-off-by: Bernd Kuhls ---- - topology/topology.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/topology/topology.c b/topology/topology.c -index 1840ffe..5d03a8b 100644 ---- a/topology/topology.c -+++ b/topology/topology.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.39.2 - diff --git a/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch b/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch deleted file mode 100644 index b5f8489703..0000000000 --- a/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3 Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Tue, 19 Sep 2023 13:14:30 +0200 -Subject: [PATCH] nhlt-dmic-info.c: include sys/types.h - -This fixes an issue compiling with the musl libc. - -Fixes: https://github.com/alsa-project/alsa-utils/issues/238 -Signed-off-by: Michael Opdenacker -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3 - -Signed-off-by: Bernd Kuhls ---- - nhlt/nhlt-dmic-info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/nhlt/nhlt-dmic-info.c b/nhlt/nhlt-dmic-info.c -index 3f6c64d..331555a 100644 ---- a/nhlt/nhlt-dmic-info.c -+++ b/nhlt/nhlt-dmic-info.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - - int debug = 0; --- -2.39.2 - diff --git a/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch b/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch deleted file mode 100644 index 66cf051733..0000000000 --- a/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8a0da6d4484cd2ca4f1939a6c44941e070db2147 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 13 Oct 2023 20:32:32 +0200 -Subject: [PATCH] configure.ac: fix UMP support detection - -https://github.com/alsa-project/alsa-utils/commit/b399fb85a919636b7da34e8bcf17f484dd9046f7 -added usage of alsa/ump_msg.h without checking whether alsa-lib was -compiled with rawmidi support: -https://github.com/alsa-project/alsa-lib/blob/master/include/Makefile.am#L37 - -Fixes a build error when alsa-lib was compiled with --disable-rawmidi - -aplaymidi.c:34:10: fatal error: alsa/ump_msg.h: No such file or directory - 34 | #include - -Upstream: https://github.com/alsa-project/alsa-utils/pull/240 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index beb4963..4217741 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,7 +55,7 @@ if test "$HAVE_SEQ_CLIENT_INFO_GET_PID" = "yes" ; then - AC_DEFINE([HAVE_SEQ_CLIENT_INFO_GET_PID], 1, [alsa-lib supports snd_seq_client_info_get_pid]) - fi - AC_CHECK_LIB([asound], [snd_seq_client_info_get_midi_version], [HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION="yes"]) --if test "$HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION" = "yes" ; then -+if test "$HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION" = "yes" -a "$have_rawmidi" = "yes"; then - AC_DEFINE([HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION], 1, [alsa-lib supports snd_seq_client_info_get_midi_version]) - fi - AC_CHECK_LIB([atopology], [snd_tplg_save], [have_topology="yes"], [have_topology="no"]) --- -2.39.2 - diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index 0ace406286..bf98f578cd 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a alsa-utils-1.2.10.tar.bz2 +sha256 9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7 alsa-utils-1.2.11.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 6f6021400e..3ece7ddca4 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.10 +ALSA_UTILS_VERSION = 1.2.11 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 -- 2.39.2 From fontaine.fabrice at gmail.com Sun Feb 11 16:05:53 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 17:05:53 +0100 Subject: [Buildroot] [PATCH 1/1] package:libselinux: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211160553.429144-1-fontaine.fabrice@gmail.com> Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as libselinux uses setuptools instead of distutils since version 3.5 and https://github.com/SELinuxProject/selinux/commit/2b5d5585754eb731a68158b613c7676fc3195ed9 This will avoid the following build failure raised since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: In file included from /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/Python.h:38, from selinuxswig_python_wrap.c:168: /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/3fbbb741de33310c8cacab753a32e79c5e531036 Signed-off-by: Fabrice Fontaine --- package/libselinux/libselinux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 529745f82e..734084ba50 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -38,7 +38,7 @@ LIBSELINUX_DEPENDENCIES += \ host-swig LIBSELINUX_MAKE_OPTS += \ - $(PKG_PYTHON_DISTUTILS_ENV) \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ PYTHON=python$(PYTHON3_VERSION_MAJOR) LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap @@ -85,7 +85,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ PREFIX=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/lib \ - $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ + $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ PYTHON=python$(PYTHON3_VERSION_MAJOR) \ USE_PCRE2=y -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 11 16:12:19 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 17:12:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdnet: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211161219.453635-1-fontaine.fabrice@gmail.com> Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as libdnet uses setuptools instead of distutils since version 1.16.2 and https://github.com/ofalk/libdnet/commit/4e4fc687953105b66bcc847a68869126ac3ec918 This will avoid the following build failure raised since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: In file included from /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/Python.h:38, from ./dnet.c:40: /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/libdnet/libdnet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index fc2995979d..e678565bdf 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -19,7 +19,7 @@ LIBDNET_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin -LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +LIBDNET_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endif -- 2.43.0 From bernd at kuhls.net Sun Feb 11 16:31:16 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 17:31:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpng: bump version to 1.6.42 Message-ID: <20240211163116.2318321-1-bernd@kuhls.net> Release notes: https://raw.githubusercontent.com/pnggroup/libpng/v1.6.42/ANNOUNCE Removed patch which disabled pngfix and png-fix-itxt tools and use the new upstream-provided configure option --disable-tools instead: https://github.com/pnggroup/libpng/commit/22ad62c25e7355b20d1486da301cb69159db0915 https://github.com/pnggroup/libpng/commit/71475b064f3e628e55a2f89f55e873945650afe9 Updated license hash due to copyright year bump: https://github.com/pnggroup/libpng/commit/0dfe422e9f872d3a851d52fc45047bdfd6da0cf4 Signed-off-by: Bernd Kuhls --- ...0001-Disable-pngfix-and-png-fix-itxt.patch | 47 ------------------- package/libpng/libpng.hash | 6 +-- package/libpng/libpng.mk | 3 +- 3 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch diff --git a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch deleted file mode 100644 index d16bdb2b11..0000000000 --- a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 60c3ee917c8e7a4760b1ef7c3dc2b44a615150d3 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 26 May 2016 16:26:18 -0300 -Subject: [PATCH] Disable pngfix and png-fix-itxt - -Disable the new pngfix and png-fix-itxt tools: they take up space, fail -to build on some oddball toolchain configurations and aren't -expected/needed in a non-interactive embedded system. - -[Julien: update for 1.6.25] -Signed-off-by: Julien Boibessot - -Signed-off-by: Gustavo Zacarias ---- - Makefile.am | 2 +- - Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 7212951..3430dca 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,7 +18,7 @@ check_PROGRAMS += timepng - endif - - # Utilities - installed --bin_PROGRAMS= pngfix png-fix-itxt -+bin_PROGRAMS= - - # This ensures that pnglibconf.h gets built at the start of 'make all' or - # 'make check', but it does not add dependencies to the individual programs, -diff --git a/Makefile.in b/Makefile.in -index a66f6aa..4e67782 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -104,7 +104,7 @@ check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \ - pngstest$(EXEEXT) pngvalid$(EXEEXT) pngimage$(EXEEXT) \ - pngcp$(EXEEXT) $(am__EXEEXT_1) - @HAVE_CLOCK_GETTIME_TRUE at am__append_1 = timepng --bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT) -+bin_PROGRAMS = - @PNG_ARM_NEON_TRUE at am__append_2 = arm/arm_init.c\ - @PNG_ARM_NEON_TRUE@ arm/filter_neon.S arm/filter_neon_intrinsics.c \ - @PNG_ARM_NEON_TRUE@ arm/palette_neon_intrinsics.c --- -2.7.3 - diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index d864850b06..fbae14c51d 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/png-mng/mailman/message/37860896/ -sha256 535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1 libpng-1.6.40.tar.xz +# From https://sourceforge.net/p/png-mng/mailman/message/58731120/ +sha256 c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450 libpng-1.6.42.tar.xz # Locally computed: -sha256 5c0bb4b05b1354ae7c173532b6702ea68b611047ff9b91c4d3af77da39c195d9 LICENSE +sha256 7317e078e2d3b5d7ba5a6159e650945153262b44b76f6700f8e9edb261c5143e LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index b7bacd9217..c4da9f89c7 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.40 +LIBPNG_VERSION = 1.6.42 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) @@ -15,6 +15,7 @@ LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config +LIBPNG_CONF_OPTS = --disable-tools ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon -- 2.39.2 From yann.morin.1998 at free.fr Sun Feb 11 17:02:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:02:25 +0100 Subject: [Buildroot] [git commit] package/libdnet: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211170407.9FB368770D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dfaa179dbc6efba3f2033e35ef9c3b2653061b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as libdnet uses setuptools instead of distutils since version 1.16.2 and https://github.com/ofalk/libdnet/commit/4e4fc687953105b66bcc847a68869126ac3ec918 This will avoid the following build failure raised since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: In file included from /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/Python.h:38, from ./dnet.c:40: /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b (No autobuilder failure (yet)) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libdnet/libdnet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index fc2995979d..e678565bdf 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -19,7 +19,7 @@ LIBDNET_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin -LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +LIBDNET_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endif From yann.morin.1998 at free.fr Sun Feb 11 17:01:01 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:01:01 +0100 Subject: [Buildroot] [git commit] package:libselinux: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211170407.942CA8771B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c10349bf67c113444c9f9081b18cf15457f78d04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as libselinux uses setuptools instead of distutils since version 3.5 and https://github.com/SELinuxProject/selinux/commit/2b5d5585754eb731a68158b613c7676fc3195ed9 This will avoid the following build failure raised since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: In file included from /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/Python.h:38, from selinuxswig_python_wrap.c:168: /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Fixes: http://autobuild.buildroot.org/results/3fbbb741de33310c8cacab753a32e79c5e531036 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libselinux/libselinux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index b8de21edaa..4a8d71050d 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -38,7 +38,7 @@ LIBSELINUX_DEPENDENCIES += \ host-swig LIBSELINUX_MAKE_OPTS += \ - $(PKG_PYTHON_DISTUTILS_ENV) \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ PYTHON=python$(PYTHON3_VERSION_MAJOR) LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap @@ -93,7 +93,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ PREFIX=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/lib \ - $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ + $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ PYTHON=python$(PYTHON3_VERSION_MAJOR) \ USE_PCRE2=y From yann.morin.1998 at free.fr Sun Feb 11 17:04:49 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:04:49 +0100 Subject: [Buildroot] [PATCH 1/1] package:libselinux: replace PKG_PYTHON_DISTUTILS_ENV In-Reply-To: <20240211160553.429144-1-fontaine.fabrice@gmail.com> References: <20240211160553.429144-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-11 17:05 +0100, Fabrice Fontaine spake thusly: > Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as > libselinux uses setuptools instead of distutils since version 3.5 and > https://github.com/SELinuxProject/selinux/commit/2b5d5585754eb731a68158b613c7676fc3195ed9 > > This will avoid the following build failure raised since commit > 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: > > In file included from /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/Python.h:38, > from selinuxswig_python_wrap.c:168: > /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > | ^~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/3fbbb741de33310c8cacab753a32e79c5e531036 I've slightly changes the formatting of the "fixes" tag, to also point to the commit introducing the issue. > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libselinux/libselinux.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk > index 529745f82e..734084ba50 100644 > --- a/package/libselinux/libselinux.mk > +++ b/package/libselinux/libselinux.mk > @@ -38,7 +38,7 @@ LIBSELINUX_DEPENDENCIES += \ > host-swig > > LIBSELINUX_MAKE_OPTS += \ > - $(PKG_PYTHON_DISTUTILS_ENV) \ > + $(PKG_PYTHON_SETUPTOOLS_ENV) \ > PYTHON=python$(PYTHON3_VERSION_MAJOR) > > LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap > @@ -85,7 +85,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ > $(HOST_CONFIGURE_OPTS) \ > PREFIX=$(HOST_DIR) \ > SHLIBDIR=$(HOST_DIR)/lib \ > - $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ > + $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ > PYTHON=python$(PYTHON3_VERSION_MAJOR) \ > USE_PCRE2=y > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 11 17:05:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:05:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdnet: replace PKG_PYTHON_DISTUTILS_ENV In-Reply-To: <20240211161219.453635-1-fontaine.fabrice@gmail.com> References: <20240211161219.453635-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-11 17:12 +0100, Fabrice Fontaine spake thusly: > Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as libdnet > uses setuptools instead of distutils since version 1.16.2 and > https://github.com/ofalk/libdnet/commit/4e4fc687953105b66bcc847a68869126ac3ec918 > > This will avoid the following build failure raised since commit > 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: > > In file included from /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/Python.h:38, > from ./dnet.c:40: > /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > | ^~~~~ > > Fixes: > - No autobuilder failures (yet) I've also added a reference to the commit that introduced the issue. > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libdnet/libdnet.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk > index fc2995979d..e678565bdf 100644 > --- a/package/libdnet/libdnet.mk > +++ b/package/libdnet/libdnet.mk > @@ -19,7 +19,7 @@ LIBDNET_DEPENDENCIES = host-pkgconf > ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) > LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 > LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin > -LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) > +LIBDNET_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) > LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec > LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install > endif > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 11 17:05:53 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:05:53 +0100 Subject: [Buildroot] [git commit] package/clamav: security bump version to 1.0.5 Message-ID: <20240211170609.E0D8587729@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6e54416adb3146972e29ba1ac0991bb77088c29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://blog.clamav.net/2023/11/clamav-130-122-105-released.html Fixes CVE-2024-20290 & CVE-2024-20328. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index cb4f67156c..cd03a11840 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3d6b99644874558b7de5faf9b340737a9bbc1083878fcd95a49f989c7c980146 clamav-1.0.4.tar.gz +sha256 aa67ee9679f747af3c492353d768464c27d614b3fed62eb7f988b6776d4aedbb clamav-1.0.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index c9012261fa..7c6dfce6f2 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 1.0.4 +CLAMAV_VERSION = 1.0.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = \ From yann.morin.1998 at free.fr Sun Feb 11 17:06:26 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:06:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump version to 1.0.5 In-Reply-To: <20240211151418.1615015-1-bernd@kuhls.net> References: <20240211151418.1615015-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-11 16:14 +0100, Bernd Kuhls spake thusly: > Release notes: > https://blog.clamav.net/2023/11/clamav-130-122-105-released.html > > Fixes CVE-2024-20290 & CVE-2024-20328. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/clamav/clamav.hash | 2 +- > package/clamav/clamav.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash > index cb4f67156c..cd03a11840 100644 > --- a/package/clamav/clamav.hash > +++ b/package/clamav/clamav.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 3d6b99644874558b7de5faf9b340737a9bbc1083878fcd95a49f989c7c980146 clamav-1.0.4.tar.gz > +sha256 aa67ee9679f747af3c492353d768464c27d614b3fed62eb7f988b6776d4aedbb clamav-1.0.5.tar.gz > sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt > sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 > sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file > diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk > index c9012261fa..7c6dfce6f2 100644 > --- a/package/clamav/clamav.mk > +++ b/package/clamav/clamav.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CLAMAV_VERSION = 1.0.4 > +CLAMAV_VERSION = 1.0.5 > CLAMAV_SITE = https://www.clamav.net/downloads/production > CLAMAV_LICENSE = GPL-2.0 > CLAMAV_LICENSE_FILES = \ > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 11 17:07:07 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 18:07:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/cracklib: python needs autoreconf Message-ID: <20240211170707.524645-1-fontaine.fabrice@gmail.com> Set CRACKLIB_AUTORECONF when building python to regenerate python/test/Makefile and avoid the following build failure with python 3.12 (which removed imp mpodule) raised since commit 36e635d2d5c0166476858aa239ccbe78e8f2af14: Traceback (most recent call last): File "", line 2, in ModuleNotFoundError: No module named 'imp' make[3]: *** [Makefile:485: install-pythonPYTHON] Error 1 Fixes: - http://autobuild.buildroot.org/results/aec4c19fdf8087c76c1d5f472e855e0f84fcf7fd Signed-off-by: Fabrice Fontaine --- package/cracklib/cracklib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index c5226b3326..dce1fe9c9f 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -22,6 +22,8 @@ CRACKLIB_CONF_OPTS += --without-zlib endif ifeq ($(BR2_PACKAGE_PYTHON3),y) +# Needed because python 3.12 removed imp module +CRACKLIB_AUTORECONF = YES CRACKLIB_CONF_OPTS += --with-python CRACKLIB_CONF_ENV += \ ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 \ -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 11 17:08:16 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:08:16 +0100 Subject: [Buildroot] [git commit] package/kodi: bump version to 20.4-Nexus Message-ID: <20240211171006.139BE87735@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f523f899fd810b37f75806ec6598c6b72d675d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/xbmc/xbmc/releases/tag/20.4-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 2ed4961e68..b785a71b6e 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 20.3-Nexus +KODI_JSONSCHEMABUILDER_VERSION = 20.4-Nexus KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 728e25606c..9810193014 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 20.3-Nexus +KODI_TEXTUREPACKER_VERSION = 20.4-Nexus KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 81d26f1cb1..7b26778b68 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 1dbf1d9f4d5eeeb6aa2593813703343a8a377e88a00c68226354e4d67467f64d kodi-20.3-Nexus.tar.gz +sha256 ccb2d3e382b5ae628a89db2325f5e778f1770a2a182f6eaa25645a22ccdffb18 kodi-20.4-Nexus.tar.gz sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 97d02e9b92..d057eb3f05 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 20.3 +KODI_VERSION_MAJOR = 20.4 KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) From yann.morin.1998 at free.fr Sun Feb 11 17:11:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:11:39 +0100 Subject: [Buildroot] [git commit] package/samba4: bump version to 4.19.4 Message-ID: <20240211171154.1DF348773D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d414c757fdb18093e2930bbebfb4f2705ce8b96d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.samba.org/samba/history/samba-4.19.4.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 81e8a6f2e9..3353221959 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.3.tar.asc -sha256 280553b90f131b1940580df293653c9e9bd8906201f5def6e5e8c160f0bfac96 samba-4.19.3.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc +sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 42bcd0a928..78c5db308d 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.3 +SAMBA4_VERSION = 4.19.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sun Feb 11 17:12:03 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:12:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: bump version to 20.4-Nexus In-Reply-To: <20240211151546.1615163-1-bernd@kuhls.net> References: <20240211151546.1615163-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-11 16:15 +0100, Bernd Kuhls spake thusly: > Release notes: https://github.com/xbmc/xbmc/releases/tag/20.4-Nexus > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- > package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- > package/kodi/kodi.hash | 2 +- > package/kodi/kodi.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > index 2ed4961e68..b785a71b6e 100644 > --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > @@ -6,7 +6,7 @@ > > # Not possible to directly refer to kodi variables, because of > # first/second expansion trickery... > -KODI_JSONSCHEMABUILDER_VERSION = 20.3-Nexus > +KODI_JSONSCHEMABUILDER_VERSION = 20.4-Nexus > KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) > KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz > KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi > diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk > index 728e25606c..9810193014 100644 > --- a/package/kodi-texturepacker/kodi-texturepacker.mk > +++ b/package/kodi-texturepacker/kodi-texturepacker.mk > @@ -6,7 +6,7 @@ > > # Not possible to directly refer to kodi variables, because of > # first/second expansion trickery... > -KODI_TEXTUREPACKER_VERSION = 20.3-Nexus > +KODI_TEXTUREPACKER_VERSION = 20.4-Nexus > KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) > KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz > KODI_TEXTUREPACKER_DL_SUBDIR = kodi > diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash > index 81d26f1cb1..7b26778b68 100644 > --- a/package/kodi/kodi.hash > +++ b/package/kodi/kodi.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 1dbf1d9f4d5eeeb6aa2593813703343a8a377e88a00c68226354e4d67467f64d kodi-20.3-Nexus.tar.gz > +sha256 ccb2d3e382b5ae628a89db2325f5e778f1770a2a182f6eaa25645a22ccdffb18 kodi-20.4-Nexus.tar.gz > sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz > sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz > sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz > diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk > index 97d02e9b92..d057eb3f05 100644 > --- a/package/kodi/kodi.mk > +++ b/package/kodi/kodi.mk > @@ -6,7 +6,7 @@ > > # When updating the version, please also update kodi-jsonschemabuilder > # and kodi-texturepacker > -KODI_VERSION_MAJOR = 20.3 > +KODI_VERSION_MAJOR = 20.4 > KODI_VERSION_NAME = Nexus > KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) > KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 11 17:12:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:12:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.19.4 In-Reply-To: <20240211152828.2164674-1-bernd@kuhls.net> References: <20240211152828.2164674-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-11 16:28 +0100, Bernd Kuhls spake thusly: > Release notes: https://www.samba.org/samba/history/samba-4.19.4.html > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/samba4/samba4.hash | 4 ++-- > package/samba4/samba4.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash > index 81e8a6f2e9..3353221959 100644 > --- a/package/samba4/samba4.hash > +++ b/package/samba4/samba4.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://download.samba.org/pub/samba/stable/samba-4.19.3.tar.asc > -sha256 280553b90f131b1940580df293653c9e9bd8906201f5def6e5e8c160f0bfac96 samba-4.19.3.tar.gz > +# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc > +sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk > index 42bcd0a928..78c5db308d 100644 > --- a/package/samba4/samba4.mk > +++ b/package/samba4/samba4.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SAMBA4_VERSION = 4.19.3 > +SAMBA4_VERSION = 4.19.4 > SAMBA4_SITE = https://download.samba.org/pub/samba/stable > SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz > SAMBA4_INSTALL_STAGING = YES > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 11 17:12:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:12:30 +0100 Subject: [Buildroot] [git commit] package/fetchmail: bump version to 6.4.38 Message-ID: <20240211171420.776C587746@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3abd1ca5ca02e620370988dc3878bdd940ddc23d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://sourceforge.net/p/fetchmail/mailman/message/58731594/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 9ca6b2c7a7..3c0403fa78 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37783197/ -sha256 4a182e5d893e9abe6ac37ae71e542651fce6d606234fc735c2aaae18657e69ea fetchmail-6.4.37.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/58731594/ +sha256 a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9 fetchmail-6.4.38.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 6d418f9739..c74b259698 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).37 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).38 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From yann.morin.1998 at free.fr Sun Feb 11 17:14:47 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:14:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/fetchmail: bump version to 6.4.38 In-Reply-To: <20240211153211.2187231-1-bernd@kuhls.net> References: <20240211153211.2187231-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-11 16:32 +0100, Bernd Kuhls spake thusly: > Release notes: > https://sourceforge.net/p/fetchmail/mailman/message/58731594/ > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/fetchmail/fetchmail.hash | 4 ++-- > package/fetchmail/fetchmail.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash > index 9ca6b2c7a7..3c0403fa78 100644 > --- a/package/fetchmail/fetchmail.hash > +++ b/package/fetchmail/fetchmail.hash > @@ -1,4 +1,4 @@ > -# From https://sourceforge.net/p/fetchmail/mailman/message/37783197/ > -sha256 4a182e5d893e9abe6ac37ae71e542651fce6d606234fc735c2aaae18657e69ea fetchmail-6.4.37.tar.xz > +# From https://sourceforge.net/p/fetchmail/mailman/message/58731594/ > +sha256 a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9 fetchmail-6.4.38.tar.xz > # Locally computed: > sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING > diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk > index 6d418f9739..c74b259698 100644 > --- a/package/fetchmail/fetchmail.mk > +++ b/package/fetchmail/fetchmail.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > FETCHMAIL_VERSION_MAJOR = 6.4 > -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).37 > +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).38 > FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz > FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) > FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From abiliojr at gmail.com Sun Feb 11 17:15:12 2024 From: abiliojr at gmail.com (Abilio Marques) Date: Sun, 11 Feb 2024 09:15:12 -0800 Subject: [Buildroot] [PATCH] package/micropython: add support for manifest.py in the configuration In-Reply-To: References: <20240204062645.3616072-1-abiliojr@gmail.com> Message-ID: Hello Yann, One of the uses of manifest.py is to specify which modules of micropython-lib should be frozen within the binary. For those modules you don't need to include the path. e.g., package('os') That's the application I'm going for. I know it seems limited but it's really useful, and probably welcomed by other people using Micropython in the next release of Buildroot. I have ideas on how to solve the path and dependency order problem while still using the "official" manifest.py concept. The biggest challenge is that currently there are no other 3rd party Micropython modules available for Buildroot, so that makes it all very theoretical. All solutions require a bigger amount of work than the one needed for this patch. Also, I would like to discuss them before actually presenting a patch that allows 3rd party modules to be frozen. I always try to go for an incremental approach, where I get the bigger bang for the buck. I believe that allowing people to freeze the official Micropython modules is already a big step forward. But at the same time, I'm new to the Buildroot project, so please advice on the approach. Kind regards, Abilio On Mon, Feb 5, 2024 at 5:24?AM Yann E. MORIN wrote: > Abilio, All, > > On 2024-02-03 22:26 -0800, Abilio Marques spake thusly: > > Micropython can embed packages an modules as frozen bytecode. What code > > gets built this way can be defined by means of a "manifest.py" file. > > > > This commit exposes the variable FROZEN_MANIFEST to Buildroot users > > through a new variable called BR2_PACKAGE_MICROPYTHON_MANIFEST. > > > > Please check Micropython's documentation for more information: > > https://docs.micropython.org/en/latest/reference/manifest.html > > Minor nit: this blurb should have been in the help text of the new > option, and I could have done that when applying, but I have a much > more involved question, see below. > > > Signed-off-by: Abilio Marques > > --- > > package/micropython/Config.in | 8 ++++++++ > > package/micropython/micropython.mk | 5 +++++ > > 2 files changed, 13 insertions(+) > > > > diff --git a/package/micropython/Config.in > b/package/micropython/Config.in > > index 26a00baab0..52717d815a 100644 > > --- a/package/micropython/Config.in > > +++ b/package/micropython/Config.in > > @@ -17,6 +17,14 @@ config BR2_PACKAGE_MICROPYTHON_LIB > > help > > Core Python libraries ported to MicroPython. > > > > +config BR2_PACKAGE_MICROPYTHON_MANIFEST > > + string "Path to a manifest.py file" > > + help > > + MicroPython allows Python code to be ?frozen? as bytecode > > + into its binary, as an alternative to loading code from > > + the filesystem. See MicroPython's documentation for more > > + information. > > + > > endif # BR2_PACKAGE_MICROPYTHON > > > > comment "micropython needs a toolchain w/ threads, dynamic library" > > diff --git a/package/micropython/micropython.mk b/package/micropython/ > micropython.mk > > index 125a0edcfb..5a2c136547 100644 > > --- a/package/micropython/micropython.mk > > +++ b/package/micropython/micropython.mk > > @@ -43,6 +43,11 @@ else > > MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 > > endif > > > > +ifneq ($(BR2_PACKAGE_MICROPYTHON_MANIFEST),"") > > +MICROPYTHON_MAKE_OPTS += \ > > + FROZEN_MANIFEST=$(BR2_PACKAGE_MICROPYTHON_MANIFEST) > > +endif > > So, as I understand this, micropython will grab the files (from modules, > files, etc...) listed from the manifest and bundle them in the > micropython executable. It seems the paths in the manifest can be either > absolute, or relative; in the latter case, it not documented what they > would be relative to; additionally there are placeholders (see below) > that can be used but are absolute paths. > > So this has a few implications: > > - the files must be available before micropython is built, so some > dependency order is needed to ensure that: if files are provided in > a package, then we need a dependency and it is going to be a little > bit difficult to do and we need a way to address that; > > - the paths can't be hard-coded to absolute paths in the manifest file > itself, because we don't know beforehand where the buildroot build > directory will be, so we need a way to shoehorn $(TOPDIR) or some > such variable in the manifest; > > - absolute paths must be fixed to accommodate the per-package option, > because those paths change for eaach package. > > From the micropython doc, that you pointed above, there are a few > placeholders that will be replaced in the manifest, but I don't think > we can reuse those: > > Any paths used in manifest files can include the following variables. > These all resolve to absolute paths. > * $(MPY_DIR) ? path to the micropython repo. > * $(MPY_LIB_DIR) ? path to the micropython-lib submodule. Prefer to > use require(). > * $(PORT_DIR) ? path to the current port (e.g. ports/stm32) > * $(BOARD_DIR) ? path to the current board (e.g. > ports/stm32/boards/PYBV11) > > So we need a bit more information how this feature is to be used, and an > example (or a few) would probably help a lot in this respect. We also > have a runtime test for micropython, in: > support/testing/tests/package/test_micropython.py > > It would be nice to extend that runtime test as well. > > Regards, > Yann E. MORIN. > > > define MICROPYTHON_BUILD_CMDS > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' > conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ > | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is > no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v > conspiracy. | > > '------------------------------^-------^------------------^--------------------' > -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sun Feb 11 17:14:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:14:34 +0100 Subject: [Buildroot] [git commit] support/testing: libgpgme: increase gpg key generation timeout Message-ID: <20240211172644.CDD698774F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3efc611f531c708b0292061fd0049b4012724c09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gpg key generation can take longer than the default timeout on a loaded or slow test host. The commit increase the timeout for the key generation command to prevent the test to randomly fail. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_libgpgme.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_libgpgme.py b/support/testing/tests/package/test_libgpgme.py index 28a33bab03..b497891249 100644 --- a/support/testing/tests/package/test_libgpgme.py +++ b/support/testing/tests/package/test_libgpgme.py @@ -37,7 +37,7 @@ class TestLibGpgme(infra.basetest.BRTest): # We now create our gpg key. cmd = "gpg --batch --passphrase ''" cmd += f" --quick-generate-key {gpg_userid} default default" - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=30) # We should now see our key in the list. self.assertRunOk(gpgme_listkey) From yann.morin.1998 at free.fr Sun Feb 11 17:27:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:27:27 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: libgpgme: increase gpg key generation timeout In-Reply-To: <20240210122552.1001346-1-ju.o@free.fr> References: <20240210122552.1001346-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-10 13:25 +0100, Julien Olivain spake thusly: > gpg key generation can take longer than the default timeout on a > loaded or slow test host. The commit increase the timeout for the > key generation command to prevent the test to randomly fail. > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/testing/tests/package/test_libgpgme.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/testing/tests/package/test_libgpgme.py b/support/testing/tests/package/test_libgpgme.py > index 28a33bab03..b497891249 100644 > --- a/support/testing/tests/package/test_libgpgme.py > +++ b/support/testing/tests/package/test_libgpgme.py > @@ -37,7 +37,7 @@ class TestLibGpgme(infra.basetest.BRTest): > # We now create our gpg key. > cmd = "gpg --batch --passphrase ''" > cmd += f" --quick-generate-key {gpg_userid} default default" > - self.assertRunOk(cmd) > + self.assertRunOk(cmd, timeout=30) > > # We should now see our key in the list. > self.assertRunOk(gpgme_listkey) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 11 17:27:56 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 18:27:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpwquality: fix build with python 3.12 Message-ID: <20240211172756.704681-1-fontaine.fabrice@gmail.com> Switch from distutils to setuptools to avoid the following build failure raised since bump of python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14: Traceback (most recent call last): File "/home/fabrice/buildroot/output/build/libpwquality-1.4.5/python/setup.py", line 9, in from distutils.core import setup, Extension ModuleNotFoundError: No module named 'distutils' Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- ...-Use-setuptools-instead-of-distutils.patch | 78 +++++++++++++++++++ package/libpwquality/libpwquality.mk | 6 +- 2 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch diff --git a/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch b/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 0000000000..4d4e4c8f54 --- /dev/null +++ b/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,78 @@ +From 7b5e0f0097faebdcc6a8b783237bbba7a983147a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Fri, 31 Mar 2023 14:52:19 +0200 +Subject: [PATCH] Use setuptools instead of distutils + +distutils is removed from Python 3.12+: +https://peps.python.org/pep-0632/ + +Upstream: https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a +Signed-off-by: Fabrice Fontaine +--- + libpwquality.spec.in | 11 ++--------- + python/Makefile.am | 2 +- + python/setup.py.in | 6 +++--- + 3 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/libpwquality.spec.in b/libpwquality.spec.in +index 70a6f53..0809126 100644 +--- a/libpwquality.spec.in ++++ b/libpwquality.spec.in +@@ -33,9 +33,11 @@ BuildRequires: gettext + BuildRequires: pam-devel + %if %{with python2} + BuildRequires: python2-devel ++BuildRequires: python2-setuptools + %endif + %if %{with python3} + BuildRequires: python3-devel ++BuildRequires: python3-setuptools + %endif + + URL: https://github.com/libpwquality/libpwquality/ +@@ -103,15 +105,6 @@ cp -a . %{py3dir} + pushd %{py3dir} + %endif + %if %{with python3} +-# setuptools >= 60 changes the environment to use its bundled copy of distutils +-# by default, not the Python-bundled one. To run the Python's standard library +-# distutils, the environment variable must be set. +-# Although technically setuptools is not needed for this package, if it's +-# pulled by another package, it changes the environment and consequently, +-# the build fails. This was reported in: +-# https://github.com/pypa/setuptools/issues/3143 +-export SETUPTOOLS_USE_DISTUTILS=stdlib +- + %configure \ + --with-securedir=%{_moduledir} \ + --with-pythonsitedir=%{python3_sitearch} \ +diff --git a/python/Makefile.am b/python/Makefile.am +index 1d00c0c..6e51744 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} + + clean-local: + rm -rf py$(PYTHONREV) +diff --git a/python/setup.py.in b/python/setup.py.in +index a741b91..f934c50 100755 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -6,9 +6,9 @@ + + import os + +-from distutils.core import setup, Extension +-from distutils.command.build_ext import build_ext as _build_ext +-from distutils.command.sdist import sdist as _sdist ++from setuptools import setup, Extension ++from setuptools.command.build_ext import build_ext as _build_ext ++from setuptools.command.sdist import sdist as _sdist + + def genconstants(headerfile, outputfile): + hf = open(headerfile, 'r') diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index ae6babbcae..f12e583b2d 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -11,11 +11,13 @@ LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING +# We're patching python/Makefile.am +LIBPWQUALITY_AUTORECONF = YES ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += python3 -LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +LIBPWQUALITY_DEPENDENCIES += python3 host-python-setuptools +LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings endif -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 11 17:26:47 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:26:47 +0100 Subject: [Buildroot] [git commit] package/libgpgme: bump to version 1.23.2 Message-ID: <20240211173048.23BE387757@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9e02b8896fee9a5e657231c30182750ef206cf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For change log, see [1] and [2]. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-1.23.2 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=shortlog;h=gpgme-1.23.2 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/libgpgme/libgpgme.hash | 4 ++-- package/libgpgme/libgpgme.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index 5c47db76d5..64099df4c3 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 12f4c98ffa75bdbfc4934d38757f57ba718b5aa0 gpgme-1.22.0.tar.bz2 -sha256 9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71 gpgme-1.22.0.tar.bz2 +sha1 b3a938939a9fb2182684aa9ba094c8e8ecd6167b gpgme-1.23.2.tar.bz2 +sha256 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 gpgme-1.23.2.tar.bz2 # Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 036103b7fc..dd39b37aa2 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPGME_VERSION = 1.22.0 +LIBGPGME_VERSION = 1.23.2 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Sun Feb 11 17:31:01 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:31:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgpgme: bump to version 1.23.2 In-Reply-To: <20240210122338.999772-1-ju.o@free.fr> References: <20240210122338.999772-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-10 13:23 +0100, Julien Olivain spake thusly: > For change log, see [1] and [2]. > > [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-1.23.2 > [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=shortlog;h=gpgme-1.23.2 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > Patch tested on branch master at commit 8ab4a0a with commands: > > make check-package > ... > 0 warnings generated > > utils/test-pkg -p libgpgme > ... > 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_libgpgme > ... > OK > --- > package/libgpgme/libgpgme.hash | 4 ++-- > package/libgpgme/libgpgme.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash > index 5c47db76d5..64099df4c3 100644 > --- a/package/libgpgme/libgpgme.hash > +++ b/package/libgpgme/libgpgme.hash > @@ -1,5 +1,5 @@ > # From https://www.gnupg.org/download/integrity_check.html > -sha1 12f4c98ffa75bdbfc4934d38757f57ba718b5aa0 gpgme-1.22.0.tar.bz2 > -sha256 9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71 gpgme-1.22.0.tar.bz2 > +sha1 b3a938939a9fb2182684aa9ba094c8e8ecd6167b gpgme-1.23.2.tar.bz2 > +sha256 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 gpgme-1.23.2.tar.bz2 > # Locally calculated > sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER > diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk > index 036103b7fc..dd39b37aa2 100644 > --- a/package/libgpgme/libgpgme.mk > +++ b/package/libgpgme/libgpgme.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBGPGME_VERSION = 1.22.0 > +LIBGPGME_VERSION = 1.23.2 > LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme > LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 > LIBGPGME_LICENSE = LGPL-2.1+ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd at kuhls.net Sun Feb 11 17:33:23 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 18:33:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 24.0.0 Message-ID: <20240211173323.2755976-1-bernd@kuhls.net> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html https://cgit.freedesktop.org/mesa/mesa/tree/docs/relnotes/24.0.0.rst?h=24.0 Removed patch which is included in this release. Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...e_description-fix-unknown-linux-3.5-.patch | 68 ------------------- package/mesa3d/mesa3d.hash | 6 +- package/mesa3d/mesa3d.mk | 2 +- 4 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index b9b328b268..1d006dbc91 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.3.5 +MESA3D_HEADERS_VERSION = 24.0.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch b/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch deleted file mode 100644 index c011580f6b..0000000000 --- a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b60974fac8a2f4c85cbb2ca788fc4ec3e81998f9 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Tue, 17 Aug 2021 11:54:49 +0200 -Subject: [PATCH] util: os_same_file_description: fix unknown linux < 3.5 - syscall SYS_kcmp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -https://man7.org/linux/man-pages/man2/kcmp.2.html - -The kcmp() system call first appeared in Linux 3.5. - -But was probably also not supported by all major platforms -at that time. So fallback to the check that is done for windows. - -Signed-off-by: Thomas Devoogdt -Acked-by: Yonggang Luo -Acked-by: Michel D?nzer -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/3ef514982441ce496aa127611edd26b9867f4b95 -Signed-off-by: Thomas Devoogdt ---- - src/util/os_file.c | 18 ++++++------------ - 1 file changed, 6 insertions(+), 12 deletions(-) - -diff --git a/src/util/os_file.c b/src/util/os_file.c -index 5fb30f2d908..464425a9b87 100644 ---- a/src/util/os_file.c -+++ b/src/util/os_file.c -@@ -202,29 +202,23 @@ os_read_file(const char *filename, size_t *size) - /* copied from */ - #define KCMP_FILE 0 - -+#endif -+ - int - os_same_file_description(int fd1, int fd2) - { -+#ifdef SYS_kcmp - pid_t pid = getpid(); -+#endif - - /* Same file descriptor trivially implies same file description */ - if (fd1 == fd2) - return 0; - -+#ifdef SYS_kcmp - return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); --} -- - #else -- --int --os_same_file_description(int fd1, int fd2) --{ -- /* Same file descriptor trivially implies same file description */ -- if (fd1 == fd2) -- return 0; -- - /* Otherwise we can't tell */ - return -1; --} -- - #endif -+} --- -2.34.1 - diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 7e49119c41..49b42e2132 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html -sha256 69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f mesa-23.3.5.tar.xz -sha512 1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea mesa-23.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html +sha256 dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 mesa-24.0.0.tar.xz +sha512 9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15 mesa-24.0.0.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 4e6cb3571a..2d13f7336f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.3.5 +MESA3D_VERSION = 24.0.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.39.2 From yann.morin.1998 at free.fr Sun Feb 11 17:54:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:54:51 +0100 Subject: [Buildroot] [PATCH] package/micropython: add support for manifest.py in the configuration In-Reply-To: References: <20240204062645.3616072-1-abiliojr@gmail.com> Message-ID: Abilio, All, [Please, don't top-post, but reply in-line] On 2024-02-11 09:15 -0800, Abilio Marques spake thusly: > One of the uses of manifest.py is to specify which modules of > micropython-lib should be frozen within the binary. For those modules you > don't need to include the path. e.g., > package('os') > > That's the application I'm going for. I know it seems limited but it's > really useful, OK, so maybe this can be explained in the help text of the new option, like: Note: in Buildroot, only modules provided with micropython-lib can be frozen with a manifest; freezing arbitrary files is not supported. along with a little blurb in the commit log, statng something like; We only support freezing of modules from micropython-lib. Freezing arbitrary modules would require some handling of absoulte paths, and a guarantee that the files be available before micropython is built, which is considered a bit too complex; an interested party can provide such support in the future. And thus, would it be possible to sanity-check the manifest to ensure that it indeed only references modules from icropython-lib, so that people do not get the impression it works when in fact it does not? Like, grep that only require(...) are used? (Note: you mentioned package(...) but that is not limited to files from micropython-lib; require(...) however is.) > and probably welcomed by other people using Micropython in > the next release of Buildroot. One question I was wondering about: if a module is frozen in the binary, then it is no longer needed in the filesystem, right? If so, should we have a way to remove them? > I have ideas on how to solve the path and dependency order problem while > still using the "official" manifest.py concept. The biggest challenge is > that currently there are no other 3rd party Micropython modules available > for Buildroot, so that makes it all very theoretical. All solutions require > a bigger amount of work than the one needed for this patch. Also, I would > like to discuss them before actually presenting a patch that allows 3rd > party modules to be frozen. Indeed, without a few actual examples, it's going to be difficult to see a common pattern and abstract that away. Are there any pulicly available? > I always try to go for an incremental approach, where I get the bigger bang > for the buck. I believe that allowing people to freeze the official > Micropython modules is already a big step forward. But at the same time, > I'm new to the Buildroot project, so please advice on the approach. The incremental path is totally OK; I even prefer it. Of course, any limitation (such as those we are discussing) should be explained in the commit log. Given all the feedback in this thread, can you respin a v2 taking the comments into account? As for your ideas for lifting those limitations, you can just explain them in a reply in this thread. Usually, a patchset doing the job is also a good first step to start the dicsussion. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 11 18:36:31 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 19:36:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv3: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211183631.1162846-1-fontaine.fabrice@gmail.com> Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV to avoid an issue with naming of python modules since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Signed-off-by: Fabrice Fontaine --- package/opencv3/opencv3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 29fb246e65..5064496ca6 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -341,7 +341,7 @@ OPENCV3_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV3_DEPENDENCIES += python3 OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +OPENCV3_CONF_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) OPENCV3_DEPENDENCIES += python-numpy else OPENCV3_CONF_OPTS += \ -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 11 18:38:13 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 19:38:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv4: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211183813.1164093-1-fontaine.fabrice@gmail.com> Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV to avoid an issue with naming of python modules since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Signed-off-by: Fabrice Fontaine --- package/opencv4/opencv4.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index b535761cb2..e50e0f99a9 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -410,7 +410,7 @@ OPENCV4_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV4_DEPENDENCIES += python3 OPENCV4_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -OPENCV4_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +OPENCV4_CONF_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) OPENCV4_DEPENDENCIES += python-numpy else OPENCV4_CONF_OPTS += \ -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 11 19:33:45 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 20:33:45 +0100 Subject: [Buildroot] [git commit] package/libselinux: drop remnant of PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211193527.0DFF98775F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d381b8823b29534932b23ac800ef71eeb954ec7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c10349bf67c1 (package:libselinux: replace PKG_PYTHON_DISTUTILS_ENV) forgot to update a comment that refered to PKG_PYTHON_DISTUTILS_ENV. Replace that now. Signed-off-by: Yann E. MORIN --- package/libselinux/libselinux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 4a8d71050d..601038e46f 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -54,7 +54,7 @@ endif # python3 # Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc 2.22. We # set CFLAGS, CPPFLAGS and LDFLAGS here because we want to win over the -# CFLAGS/CPPFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_DISTUTILS_ENV) +# CFLAGS/CPPFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_SETUPTOOLS_ENV) # when the python binding is enabled. LIBSELINUX_MAKE_OPTS += \ CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ From yann.morin.1998 at free.fr Sun Feb 11 19:36:45 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 20:36:45 +0100 Subject: [Buildroot] [PATCH 1/1] package:libselinux: replace PKG_PYTHON_DISTUTILS_ENV In-Reply-To: <20240211160553.429144-1-fontaine.fabrice@gmail.com> References: <20240211160553.429144-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-11 17:05 +0100, Fabrice Fontaine spake thusly: > Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as > libselinux uses setuptools instead of distutils since version 3.5 and > https://github.com/SELinuxProject/selinux/commit/2b5d5585754eb731a68158b613c7676fc3195ed9 [--SNIP--] > diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk > index 529745f82e..734084ba50 100644 > --- a/package/libselinux/libselinux.mk > +++ b/package/libselinux/libselinux.mk > @@ -38,7 +38,7 @@ LIBSELINUX_DEPENDENCIES += \ > host-swig > > LIBSELINUX_MAKE_OPTS += \ > - $(PKG_PYTHON_DISTUTILS_ENV) \ > + $(PKG_PYTHON_SETUPTOOLS_ENV) \ > PYTHON=python$(PYTHON3_VERSION_MAJOR) You had forgotten to update the comment a few lines below, and I just noticed, so I pushed a follow-up commit. Regards, Yann E. MORIN. > LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap > @@ -85,7 +85,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ > $(HOST_CONFIGURE_OPTS) \ > PREFIX=$(HOST_DIR) \ > SHLIBDIR=$(HOST_DIR)/lib \ > - $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ > + $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ > PYTHON=python$(PYTHON3_VERSION_MAJOR) \ > USE_PCRE2=y > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 20:41:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 21:41:16 +0100 Subject: [Buildroot] [PATCH] package/lua-http: fix CVE-2023-4540 In-Reply-To: <20240210082751.12920-1-francois.perrad@gadz.org> References: <20240210082751.12920-1-francois.perrad@gadz.org> Message-ID: <20240211214116.72131219@windsurf> On Sat, 10 Feb 2024 09:27:51 +0100 Francois Perrad wrote: > see https://nvd.nist.gov/vuln/detail/CVE-2023-4540 > & https://cert.pl/en/posts/2023/09/CVE-2023-4540 > > Signed-off-by: Francois Perrad Thanks, this looks good, but... > diff --git a/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch > new file mode 100644 > index 000000000..e8f88f1ae > --- /dev/null > +++ b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch > @@ -0,0 +1,68 @@ > +From ddab2835c583d45dec62680ca8d3cbde55e0bae6 Mon Sep 17 00:00:00 2001 > +From: daurnimator > +Date: Tue, 22 Aug 2023 23:30:20 +1000 > +Subject: [PATCH] http/h1_stream: handle EOF when `body_read_type==length` > + > +If a client closes the connection before sending the expected number of bytes > +then return `EPIPE`. > +This fixes a potential infinite draining loop when trying to trying to > +`:shutdown()` a stream. We need you to add your Signed-off-by here, and a Upstream: tag with the reference to the upstream commit. (Please use "make check-package", which would have warned about those two issues) Could you send an updated version? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 20:34:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 21:34:27 +0100 Subject: [Buildroot] [git commit] package/ddrescue: bump to version 1.28 Message-ID: <20240211203442.DA66E87768@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd011d097fa41cf9e449843e78439d43f66b87ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See the release announce: https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00014.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ddrescue/ddrescue.hash | 4 ++-- package/ddrescue/ddrescue.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ddrescue/ddrescue.hash b/package/ddrescue/ddrescue.hash index 3caec5667f..4103d4fd6f 100644 --- a/package/ddrescue/ddrescue.hash +++ b/package/ddrescue/ddrescue.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-01/msg00011.html -sha256 38c80c98c5a44f15e53663e4510097fd68d6ec20758efdf3a925037c183232eb ddrescue-1.27.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00014.html +sha256 6626c07a7ca1cc1d03cad0958522c5279b156222d32c342e81117cfefaeb10c1 ddrescue-1.28.tar.lz # Locally computed sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk index f4376a9340..13798bb4bb 100644 --- a/package/ddrescue/ddrescue.mk +++ b/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.27 +DDRESCUE_VERSION = 1.28 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Sun Feb 11 20:39:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 21:39:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/ddrescue: bump to version 1.28 In-Reply-To: <20240208212610.256053-1-ju.o@free.fr> References: <20240208212610.256053-1-ju.o@free.fr> Message-ID: <20240211213943.0c2155a7@windsurf> On Thu, 8 Feb 2024 22:26:09 +0100 Julien Olivain wrote: > See the release announce: > https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00014.html > > Signed-off-by: Julien Olivain > --- > package/ddrescue/ddrescue.hash | 4 ++-- > package/ddrescue/ddrescue.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 11 21:10:22 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 22:10:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/exim: fix libressl build Message-ID: <20240211211022.2003157-1-fontaine.fabrice@gmail.com> Fix the following libressl build failure raised since bump to version 4.97 in commit faec3ca30e358575f70a036879029f63f7da9b29 and https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: In file included from tls.c:473: tls-openssl.c: In function 'tls_client_stapling_cb': tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} 2652 | bs->certs | ^~ Fixes: faec3ca30e358575f70a036879029f63f7da9b29 - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d Signed-off-by: Fabrice Fontaine --- package/exim/0007-typoes.patch | 58 +++++++++++++++++++ ...nssl.c-fix-build-with-libressl-3.5.0.patch | 43 ++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 package/exim/0007-typoes.patch create mode 100644 package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch diff --git a/package/exim/0007-typoes.patch b/package/exim/0007-typoes.patch new file mode 100644 index 0000000000..6bbfc9eecd --- /dev/null +++ b/package/exim/0007-typoes.patch @@ -0,0 +1,58 @@ +From caf57fe7eb5018b8df196e6d9f99586232798eb3 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 8 Nov 2023 14:22:37 +0000 +Subject: [PATCH] typoes + +Upstream: https://git.exim.org/exim.git/commit/caf57fe7eb5018b8df196e6d9f99586232798eb3 +Signed-off-by: Fabrice Fontaine +--- + src/src/tls-openssl.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/tls-openssl.c b/src/tls-openssl.c +index 851ac77c5..237303ba9 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -77,9 +77,9 @@ change this guard and punt the issue for a while longer. */ + # define EXIM_HAVE_OPENSSL_KEYLOG + # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID + # define EXIM_HAVE_SESSION_TICKET +-# define EXIM_HAVE_OPESSL_TRACE +-# define EXIM_HAVE_OPESSL_GET0_SERIAL +-# define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS ++# define EXIM_HAVE_OPENSSL_TRACE ++# define EXIM_HAVE_OPENSSL_GET0_SERIAL ++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS + # define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN + # ifndef DISABLE_OCSP + # define EXIM_HAVE_OCSP +@@ -1756,7 +1756,7 @@ level. */ + DEBUG(D_tls) + { + SSL_CTX_set_info_callback(ctx, info_callback); +-#if defined(EXIM_HAVE_OPESSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) ++#if defined(EXIM_HAVE_OPENSSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) + /* this needs a debug build of OpenSSL */ + SSL_CTX_set_msg_callback(ctx, SSL_trace); + #endif +@@ -2442,7 +2442,7 @@ tls_in.ocsp = OCSP_NOT_RESP; + if (!olist) + return SSL_TLSEXT_ERR_NOACK; + +-#ifdef EXIM_HAVE_OPESSL_GET0_SERIAL ++#ifdef EXIM_HAVE_OPENSSL_GET0_SERIAL + { + const X509 * cert_sent = SSL_get_certificate(s); + const ASN1_INTEGER * cert_serial = X509_get0_serialNumber(cert_sent); +@@ -2646,7 +2646,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) + + debug_printf("certs contained in basicresp:\n"); + x509_stack_dump_cert_s_names( +-#ifdef EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS ++#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS + OCSP_resp_get0_certs(bs) + #else + bs->certs +-- +2.30.2 + diff --git a/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..67d96fc1af --- /dev/null +++ b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,43 @@ +From 88f45502272a9a674948204e460ebe90202827d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 11 Feb 2024 21:45:42 +0100 +Subject: [PATCH] src/src/tls-openssl.c: fix build with libressl >= 3.5.0 + +OCSP_BASICRESP is an opaque structure since libressl 3.5.0 and +https://github.com/libressl/openbsd/commit/57442b0028fb09287793f279ee57ebb38e9ab954 +resulting in the following build failure since version 4.97 and +https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: + +In file included from tls.c:473: +tls-openssl.c: In function 'tls_client_stapling_cb': +tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} + 2652 | bs->certs + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d + +Signed-off-by: Fabrice Fontaine +Upstream: https://bugs.exim.org/show_bug.cgi?id=3074 +--- + src/src/tls-openssl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tls-openssl.c b/src/tls-openssl.c +index 237303ba9..c7f94c160 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -98,6 +98,10 @@ change this guard and punt the issue for a while longer. */ + # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID + #endif + ++#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS ++#endif ++ + #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x030000000L) + # define EXIM_HAVE_EXPORT_CHNL_BNGNG + # define EXIM_HAVE_OPENSSL_X509_STORE_GET1_ALL_CERTS +-- +2.43.0 + -- 2.43.0 From james.hilliard1 at gmail.com Sun Feb 11 21:20:31 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 14:20:31 -0700 Subject: [Buildroot] [git commit] package/python3: bump version to 3.12.1 In-Reply-To: References: <20240206222231.8950D87481@busybox.osuosl.org> Message-ID: On Fri, Feb 9, 2024 at 9:11?AM Bernd Kuhls wrote: > > Am Thu, 8 Feb 2024 21:14:52 -0500 schrieb James Knight: > > > import math > > ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' > > not found (required by > > /builds/buildroot/output/build/python3-3.12.1/build/lib.linux- > x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) > > Hi James, > > same here on Debian 12.4/bookworm, try this patch: > https://github.com/bkuhls/buildroot/commit/ > dca8b5bee7742ffedf81a027affadd4b7e18fc3f Yeah, this fixes the issue for me as well. > > Regards, Bernd > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From yann.morin.1998 at free.fr Sun Feb 11 21:24:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:24:14 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: <20240209175631.1337370-1-james.hilliard1@gmail.com> References: <20240209175631.1337370-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > Add patches from pending upstream pull request which add cython3 > compatibility. We are a little bit cautious at applying random patches that have not yet been at least reviewd by upstream. In this case, there has not been any upstream activity since the last release, and not muc before that either... We have no in-tree user of uvloop, so I wonder whether it makes snse to keep it, espcially since it mau be blocking the bumps of other packages (like cython 3.x being required by whats-its-name). Plus, see below... > Signed-off-by: James Hilliard > --- > .../0001-Updates-for-Cython3.patch | 631 ++++++++++++++++++ > ...ebug-has-args-difference-in-python-3.patch | 30 + > .../0003-fix-tests-on-python-3.8.patch | 31 + > .../0004-fix-arg-count-for-wrap.patch | 52 ++ > 4 files changed, 744 insertions(+) > create mode 100644 package/python-uvloop/0001-Updates-for-Cython3.patch > create mode 100644 package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > create mode 100644 package/python-uvloop/0003-fix-tests-on-python-3.8.patch > create mode 100644 package/python-uvloop/0004-fix-arg-count-for-wrap.patch > > diff --git a/package/python-uvloop/0001-Updates-for-Cython3.patch b/package/python-uvloop/0001-Updates-for-Cython3.patch > new file mode 100644 > index 0000000000..b7ef1091ac > --- /dev/null > +++ b/package/python-uvloop/0001-Updates-for-Cython3.patch > @@ -0,0 +1,631 @@ > +From 087a2983c8022598232cb7ed0a49da334d7af9ff Mon Sep 17 00:00:00 2001 > +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> > +Date: Thu, 28 Dec 2023 12:18:15 +0000 > +Subject: [PATCH] Updates for Cython3 Remove SSL depreciation warnings buillt > + on debian 12.6 python-3.22 Cython-3.0.7 libuv-1.46.0 > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/MagicStack/uvloop/pull/587] $ ./utils/docker-run make check-package package/python-uvloop/0001-Updates-for-Cython3.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) package/python-uvloop/0003-fix-tests-on-python-3.8.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) package/python-uvloop/0004-fix-arg-count-for-wrap.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) Runing check-package is really a trivial thing to do locally before sending patches, and we've been advertising it for long enough now... Regards, Yann E. MORIN. > +--- > + Makefile | 2 +- > + setup.py | 6 ++++-- > + tests/test_process.py | 4 ++-- > + tests/test_tcp.py | 19 ++++++++++++------- > + uvloop/_testbase.py | 4 +++- > + uvloop/cbhandles.pyx | 4 ++-- > + uvloop/dns.pyx | 4 ++-- > + uvloop/handles/basetransport.pxd | 4 ++-- > + uvloop/handles/basetransport.pyx | 4 ++-- > + uvloop/handles/handle.pyx | 2 +- > + uvloop/handles/pipe.pyx | 2 +- > + uvloop/handles/poll.pxd | 2 +- > + uvloop/handles/poll.pyx | 2 +- > + uvloop/handles/stream.pyx | 16 ++++++++++------ > + uvloop/handles/udp.pyx | 4 ++-- > + uvloop/includes/consts.pxi | 25 ------------------------- > + uvloop/includes/fork_handler.h | 6 +++++- > + uvloop/includes/system.h | 16 ++++++++++++++++ > + uvloop/includes/system.pxd | 12 ++++-------- > + uvloop/includes/uv.pxd | 6 +++--- > + uvloop/loop.pxd | 28 ++++++++++++++++++++++++---- > + uvloop/loop.pyx | 10 +++++----- > + uvloop/sslproto.pxd | 4 ++-- > + uvloop/sslproto.pyx | 4 ++-- > + 24 files changed, 107 insertions(+), 83 deletions(-) > + delete mode 100644 uvloop/includes/consts.pxi > + create mode 100755 uvloop/includes/system.h > + > +diff --git a/Makefile b/Makefile > +index 4375e5d..6a0475a 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -9,7 +9,7 @@ _default: compile > + > + > + clean: > +- rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd > ++ rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd > + rm -fr uvloop/*.c uvloop/*.html uvloop/*.so > + rm -fr uvloop/handles/*.html uvloop/includes/*.html > + find . -name '__pycache__' | xargs rm -rf > +diff --git a/setup.py b/setup.py > +index ba15af5..8fdf0e5 100644 > +--- a/setup.py > ++++ b/setup.py > +@@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext > + from setuptools.command.sdist import sdist > + > + > +-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)' > ++CYTHON_DEPENDENCY = 'Cython(>=0.29.36)' > + MACHINE = platform.machine() > + MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')] > + _ROOT = pathlib.Path(__file__).parent > +@@ -144,7 +144,9 @@ class uvloop_build_ext(build_ext): > + self.distribution.ext_modules[:] = cythonize( > + self.distribution.ext_modules, > + compiler_directives=directives, > +- annotate=self.cython_annotate) > ++ annotate=self.cython_annotate, > ++ compile_time_env=dict(DEFAULT_FREELIST_SIZE=250, SSL_READ_MAX_SIZE=256 * 1024), > ++ emit_linenums=True) > + > + super().finalize_options() > + > +diff --git a/tests/test_process.py b/tests/test_process.py > +index bfcbba1..95e1c9e 100644 > +--- a/tests/test_process.py > ++++ b/tests/test_process.py > +@@ -912,7 +912,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): > + stdin=subprocess.PIPE, > + stdout=subprocess.PIPE, > + stderr=subprocess.PIPE, > +- __uvloop_sleep_after_fork=True)) > ++ uvloop_sleep_after_fork=True)) > + self.assertIsNot(transport, None) > + self.assertEqual(transport.get_returncode(), 0) > + self.assertEqual( > +@@ -931,7 +931,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): > + stdin=None, > + stdout=subprocess.PIPE, > + stderr=subprocess.PIPE, > +- __uvloop_sleep_after_fork=True)) > ++ uvloop_sleep_after_fork=True)) > + self.assertIsNot(transport, None) > + self.assertEqual(transport.get_returncode(), 0) > + self.assertEqual( > +diff --git a/tests/test_tcp.py b/tests/test_tcp.py > +index 812e62b..213e2d9 100644 > +--- a/tests/test_tcp.py > ++++ b/tests/test_tcp.py > +@@ -1630,17 +1630,22 @@ class _TestSSL(tb.SSLTestCase): > + self.fail("unexpected call to connection_made()") > + > + def test_ssl_connect_accepted_socket(self): > +- if hasattr(ssl, 'PROTOCOL_TLS'): > +- proto = ssl.PROTOCOL_TLS > ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): > ++ server_proto = ssl.PROTOCOL_TLS_SERVER > ++ client_proto = ssl.PROTOCOL_TLS_CLIENT > + else: > +- proto = ssl.PROTOCOL_SSLv23 > +- server_context = ssl.SSLContext(proto) > ++ if hasattr(ssl, 'PROTOCOL_TLS'): > ++ client_proto = server_proto = ssl.PROTOCOL_TLS > ++ else: > ++ client_proto = server_proto = ssl.PROTOCOL_SSLv23 > ++ > ++ server_context = ssl.SSLContext(server_proto) > + server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY) > + if hasattr(server_context, 'check_hostname'): > + server_context.check_hostname = False > + server_context.verify_mode = ssl.CERT_NONE > + > +- client_context = ssl.SSLContext(proto) > ++ client_context = ssl.SSLContext(client_proto) > + if hasattr(server_context, 'check_hostname'): > + client_context.check_hostname = False > + client_context.verify_mode = ssl.CERT_NONE > +@@ -2233,7 +2238,7 @@ class _TestSSL(tb.SSLTestCase): > + sslctx.use_privatekey_file(self.ONLYKEY) > + sslctx.use_certificate_chain_file(self.ONLYCERT) > + client_sslctx = self._create_client_ssl_context() > +- if hasattr(ssl, 'OP_NO_TLSv1_3'): > ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): > + client_sslctx.options |= ssl.OP_NO_TLSv1_3 > + > + def server(sock): > +@@ -2592,7 +2597,7 @@ class _TestSSL(tb.SSLTestCase): > + sslctx_openssl.use_privatekey_file(self.ONLYKEY) > + sslctx_openssl.use_certificate_chain_file(self.ONLYCERT) > + client_sslctx = self._create_client_ssl_context() > +- if hasattr(ssl, 'OP_NO_TLSv1_3'): > ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): > + client_sslctx.options |= ssl.OP_NO_TLSv1_3 > + > + future = None > +diff --git a/uvloop/_testbase.py b/uvloop/_testbase.py > +index c4a7595..e620e15 100644 > +--- a/uvloop/_testbase.py > ++++ b/uvloop/_testbase.py > +@@ -269,7 +269,9 @@ def find_free_port(start_from=50000): > + class SSLTestCase: > + > + def _create_server_ssl_context(self, certfile, keyfile=None): > +- if hasattr(ssl, 'PROTOCOL_TLS'): > ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): > ++ sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) > ++ elif hasattr(ssl, 'PROTOCOL_TLS'): > + sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS) > + else: > + sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) > +diff --git a/uvloop/cbhandles.pyx b/uvloop/cbhandles.pyx > +index 2914b42..8bcc5aa 100644 > +--- a/uvloop/cbhandles.pyx > ++++ b/uvloop/cbhandles.pyx > +@@ -76,8 +76,8 @@ cdef class Handle: > + self.arg1, self.arg2, self.arg3, self.arg4) > + > + else: > +- raise RuntimeError('invalid Handle.cb_type: {}'.format( > +- cb_type)) > ++ raise RuntimeError('invalid Handle.cb_type: {} {!r}/{!r}'.format( > ++ cb_type, self.args1, self.args2)) > + > + except (KeyboardInterrupt, SystemExit): > + raise > +diff --git a/uvloop/dns.pyx b/uvloop/dns.pyx > +index 7aad631..09b9282 100644 > +--- a/uvloop/dns.pyx > ++++ b/uvloop/dns.pyx > +@@ -298,7 +298,7 @@ cdef class AddrInfo: > + uv.uv_freeaddrinfo(self.data) # returns void > + self.data = NULL > + > +- cdef void set_data(self, system.addrinfo *data): > ++ cdef void set_data(self, system.addrinfo *data) noexcept: > + self.data = data > + > + cdef unpack(self): > +@@ -326,7 +326,7 @@ cdef class AddrInfo: > + return result > + > + @staticmethod > +- cdef int isinstance(object other): > ++ cdef int isinstance(object other) noexcept: > + return type(other) is AddrInfo > + > + > +diff --git a/uvloop/handles/basetransport.pxd b/uvloop/handles/basetransport.pxd > +index ba356a7..8112622 100644 > +--- a/uvloop/handles/basetransport.pxd > ++++ b/uvloop/handles/basetransport.pxd > +@@ -47,8 +47,8 @@ cdef class UVBaseTransport(UVSocketHandle): > + # === overloads === > + > + cdef _new_socket(self) > +- cdef size_t _get_write_buffer_size(self) > ++ cdef size_t _get_write_buffer_size(self) noexcept > + > +- cdef bint _is_reading(self) > ++ cdef bint _is_reading(self) noexcept > + cdef _start_reading(self) > + cdef _stop_reading(self) > +diff --git a/uvloop/handles/basetransport.pyx b/uvloop/handles/basetransport.pyx > +index 28b3079..a8592f2 100644 > +--- a/uvloop/handles/basetransport.pyx > ++++ b/uvloop/handles/basetransport.pyx > +@@ -18,7 +18,7 @@ cdef class UVBaseTransport(UVSocketHandle): > + > + self._closing = 0 > + > +- cdef size_t _get_write_buffer_size(self): > ++ cdef size_t _get_write_buffer_size(self) noexcept: > + return 0 > + > + cdef inline _schedule_call_connection_made(self): > +@@ -211,7 +211,7 @@ cdef class UVBaseTransport(UVSocketHandle): > + self._extra_info = {} > + self._extra_info[name] = obj > + > +- cdef bint _is_reading(self): > ++ cdef bint _is_reading(self) noexcept: > + raise NotImplementedError > + > + cdef _start_reading(self): > +diff --git a/uvloop/handles/handle.pyx b/uvloop/handles/handle.pyx > +index 6efe375..2c96458 100644 > +--- a/uvloop/handles/handle.pyx > ++++ b/uvloop/handles/handle.pyx > +@@ -363,7 +363,7 @@ cdef void __uv_close_handle_cb(uv.uv_handle_t* handle) noexcept with gil: > + Py_DECREF(h) # Was INCREFed in UVHandle._close > + > + > +-cdef void __close_all_handles(Loop loop): > ++cdef void __close_all_handles(Loop loop) noexcept: > + uv.uv_walk(loop.uvloop, > + __uv_walk_close_all_handles_cb, > + loop) # void > +diff --git a/uvloop/handles/pipe.pyx b/uvloop/handles/pipe.pyx > +index 195576c..d30a736 100644 > +--- a/uvloop/handles/pipe.pyx > ++++ b/uvloop/handles/pipe.pyx > +@@ -25,7 +25,7 @@ cdef __pipe_init_uv_handle(UVStream handle, Loop loop): > + cdef __pipe_open(UVStream handle, int fd): > + cdef int err > + err = uv.uv_pipe_open(handle._handle, > +- fd) > ++ fd) > + if err < 0: > + exc = convert_error(err) > + raise exc > +diff --git a/uvloop/handles/poll.pxd b/uvloop/handles/poll.pxd > +index d07030b..c220540 100644 > +--- a/uvloop/handles/poll.pxd > ++++ b/uvloop/handles/poll.pxd > +@@ -10,7 +10,7 @@ cdef class UVPoll(UVHandle): > + cdef inline _poll_start(self, int flags) > + cdef inline _poll_stop(self) > + > +- cdef int is_active(self) > ++ cdef int is_active(self) noexcept > + > + cdef is_reading(self) > + cdef is_writing(self) > +diff --git a/uvloop/handles/poll.pyx b/uvloop/handles/poll.pyx > +index fca5981..c905e9b 100644 > +--- a/uvloop/handles/poll.pyx > ++++ b/uvloop/handles/poll.pyx > +@@ -29,7 +29,7 @@ cdef class UVPoll(UVHandle): > + handle._init(loop, fd) > + return handle > + > +- cdef int is_active(self): > ++ cdef int is_active(self) noexcept: > + return (self.reading_handle is not None or > + self.writing_handle is not None) > + > +diff --git a/uvloop/handles/stream.pyx b/uvloop/handles/stream.pyx > +index d4e02e3..09df887 100644 > +--- a/uvloop/handles/stream.pyx > ++++ b/uvloop/handles/stream.pyx > +@@ -1,4 +1,8 @@ > +-DEF __PREALLOCED_BUFS = 4 > ++cdef extern from *: > ++ ''' > ++ enum {__PREALLOCED_BUFS = 4}; > ++ ''' > ++ const bint __PREALLOCED_BUFS > + > + > + @cython.no_gc_clear > +@@ -279,7 +283,7 @@ cdef class UVStream(UVBaseTransport): > + cdef inline _close_on_read_error(self): > + self.__read_error_close = 1 > + > +- cdef bint _is_reading(self): > ++ cdef bint _is_reading(self) noexcept: > + return self.__reading > + > + cdef _start_reading(self): > +@@ -578,7 +582,7 @@ cdef class UVStream(UVBaseTransport): > + > + self._maybe_resume_protocol() > + > +- cdef size_t _get_write_buffer_size(self): > ++ cdef size_t _get_write_buffer_size(self) noexcept: > + if self._handle is NULL: > + return 0 > + return ((self._handle).write_queue_size + > +@@ -755,7 +759,7 @@ cdef inline bint __uv_stream_on_read_common( > + UVStream sc, > + Loop loop, > + ssize_t nread, > +-): > ++) noexcept: > + if sc._closed: > + # The stream was closed, there is no reason to > + # do any work now. > +@@ -818,7 +822,7 @@ cdef inline void __uv_stream_on_read_impl( > + uv.uv_stream_t* stream, > + ssize_t nread, > + const uv.uv_buf_t* buf, > +-): > ++) noexcept: > + cdef: > + UVStream sc = stream.data > + Loop loop = sc._loop > +@@ -849,7 +853,7 @@ cdef inline void __uv_stream_on_read_impl( > + cdef inline void __uv_stream_on_write_impl( > + uv.uv_write_t* req, > + int status, > +-): > ++) noexcept: > + cdef: > + _StreamWriteContext ctx = <_StreamWriteContext> req.data > + UVStream stream = ctx.stream > +diff --git a/uvloop/handles/udp.pyx b/uvloop/handles/udp.pyx > +index bbe60d5..fdd1d8b 100644 > +--- a/uvloop/handles/udp.pyx > ++++ b/uvloop/handles/udp.pyx > +@@ -127,12 +127,12 @@ cdef class UDPTransport(UVBaseTransport): > + exc = convert_error(err) > + raise exc > + > +- cdef size_t _get_write_buffer_size(self): > ++ cdef size_t _get_write_buffer_size(self) noexcept: > + if self._handle is NULL: > + return 0 > + return (self._handle).send_queue_size > + > +- cdef bint _is_reading(self): > ++ cdef bint _is_reading(self) noexcept: > + return self.__receiving > + > + cdef _start_reading(self): > +diff --git a/uvloop/includes/consts.pxi b/uvloop/includes/consts.pxi > +deleted file mode 100644 > +index f765053..0000000 > +--- a/uvloop/includes/consts.pxi > ++++ /dev/null > +@@ -1,25 +0,0 @@ > +-DEF UV_STREAM_RECV_BUF_SIZE = 256000 # 250kb > +- > +-DEF FLOW_CONTROL_HIGH_WATER = 64 # KiB > +-DEF FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB > +-DEF FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB > +- > +-DEF DEFAULT_FREELIST_SIZE = 250 > +-DEF DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 > +- > +-DEF DEBUG_STACK_DEPTH = 10 > +- > +- > +-DEF __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 > +- > +- > +-DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 > +- > +- > +-# Number of seconds to wait for SSL handshake to complete > +-# The default timeout matches that of Nginx. > +-DEF SSL_HANDSHAKE_TIMEOUT = 60.0 > +-# Number of seconds to wait for SSL shutdown to complete > +-# The default timeout mimics lingering_time > +-DEF SSL_SHUTDOWN_TIMEOUT = 30.0 > +-DEF SSL_READ_MAX_SIZE = 256 * 1024 > +diff --git a/uvloop/includes/fork_handler.h b/uvloop/includes/fork_handler.h > +index 47bbe03..9d3573a 100644 > +--- a/uvloop/includes/fork_handler.h > ++++ b/uvloop/includes/fork_handler.h > +@@ -1,7 +1,10 @@ > ++#ifndef UVLOOP_FORK_HANDLER_H_ > ++#define UVLOOP_FORK_HANDLER_H_ > ++ > + volatile uint64_t MAIN_THREAD_ID = 0; > + volatile int8_t MAIN_THREAD_ID_SET = 0; > + > +-typedef void (*OnForkHandler)(); > ++typedef void (*OnForkHandler)(void); > + > + OnForkHandler __forkHandler = NULL; > + > +@@ -36,3 +39,4 @@ void setMainThreadID(uint64_t id) { > + MAIN_THREAD_ID = id; > + MAIN_THREAD_ID_SET = 1; > + } > ++#endif > +diff --git a/uvloop/includes/system.h b/uvloop/includes/system.h > +new file mode 100755 > +index 0000000..e143bb5 > +--- /dev/null > ++++ b/uvloop/includes/system.h > +@@ -0,0 +1,16 @@ > ++#ifndef UVLOOP_SYSTEM_H_ > ++#define UVLOOP_SYSTEM_H_ > ++#if defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER) > ++#include "Winsock2.h" > ++#include "ws2def.h" > ++#include "includes/fork_handler.h" > ++#else > ++#include "arpa/inet.h" > ++#include "sys/socket.h" > ++#include "sys/un.h" > ++#include "unistd.h" > ++#include "pthread.h" > ++#endif > ++#endif > ++ > ++ > +diff --git a/uvloop/includes/system.pxd b/uvloop/includes/system.pxd > +index 367fedd..d1da74e 100644 > +--- a/uvloop/includes/system.pxd > ++++ b/uvloop/includes/system.pxd > +@@ -1,13 +1,9 @@ > + from libc.stdint cimport int8_t, uint64_t > + > +-cdef extern from "arpa/inet.h" nogil: > +- > +- int ntohl(int) > +- int htonl(int) > +- int ntohs(int) > +- > +- > +-cdef extern from "sys/socket.h" nogil: > ++cdef extern from "includes/system.h": > ++ int ntohl(int) nogil > ++ int htonl(int) nogil > ++ int ntohs(int) nogil > + > + struct sockaddr: > + unsigned short sa_family > +diff --git a/uvloop/includes/uv.pxd b/uvloop/includes/uv.pxd > +index 8765130..ddd9738 100644 > +--- a/uvloop/includes/uv.pxd > ++++ b/uvloop/includes/uv.pxd > +@@ -220,7 +220,7 @@ cdef extern from "uv.h" nogil: > + UV_LEAVE_GROUP = 0, > + UV_JOIN_GROUP > + > +- cpdef enum uv_fs_event: > ++ cdef enum uv_fs_event: > + UV_RENAME = 1, > + UV_CHANGE = 2 > + > +@@ -282,7 +282,7 @@ cdef extern from "uv.h" nogil: > + int uv_loop_close(uv_loop_t* loop) > + int uv_loop_alive(uv_loop_t* loop) > + int uv_loop_fork(uv_loop_t* loop) > +- int uv_backend_fd(uv_loop_t* loop) > ++ uv_os_fd_t uv_backend_fd(uv_loop_t* loop) > + > + void uv_update_time(uv_loop_t* loop) > + uint64_t uv_now(const uv_loop_t*) > +@@ -378,7 +378,7 @@ cdef extern from "uv.h" nogil: > + # Pipes > + > + int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) > +- int uv_pipe_open(uv_pipe_t* handle, uv_file file) > ++ int uv_pipe_open(uv_pipe_t* handle, uv_os_fd_t file) > + int uv_pipe_bind(uv_pipe_t* handle, const char* name) > + > + void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, > +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd > +index 5613473..f90c704 100644 > +--- a/uvloop/loop.pxd > ++++ b/uvloop/loop.pxd > +@@ -1,15 +1,35 @@ > + # cython: language_level=3 > + > ++cdef extern from *: > ++ ''' > ++ enum { UV_STREAM_RECV_BUF_SIZE = 256000, > ++ SSL_READ_MAX_SIZE = 256 * 1024, // 250kb > ++ }; > ++ const float SSL_HANDSHAKE_TIMEOUT = 60.0; // Number of seconds to wait for SSL handshake to complete The default timeout matches that of Nginx. > ++ const float SSL_SHUTDOWN_TIMEOUT = 30.0; // Number of seconds to wait for SSL shutdown to complete The default timeout mimics lingering_time > ++ ''' > ++ const bint UV_STREAM_RECV_BUF_SIZE > ++ const bint SSL_READ_MAX_SIZE > ++ > ++ const float SSL_HANDSHAKE_TIMEOUT > ++ const float SSL_SHUTDOWN_TIMEOUT > ++ > ++cdef enum: > ++ FLOW_CONTROL_HIGH_WATER = 64 # KiB > ++ FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB > ++ FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB > ++ > ++ DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 > ++ DEBUG_STACK_DEPTH = 10 > ++ __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 > ++ LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 > ++ > + > + from .includes cimport uv > + from .includes cimport system > + > + from libc.stdint cimport uint64_t, uint32_t, int64_t > + > +- > +-include "includes/consts.pxi" > +- > +- > + cdef extern from *: > + ctypedef int vint "volatile int" > + > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > +index 334d8d5..53e1160 100644 > +--- a/uvloop/loop.pyx > ++++ b/uvloop/loop.pyx > +@@ -43,7 +43,7 @@ from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer > + from . import _noop > + > + > +-include "includes/consts.pxi" > ++ > + include "includes/stdlib.pxi" > + > + include "errors.pyx" > +@@ -1118,7 +1118,7 @@ cdef class Loop: > + > + cdef _sock_set_reuseport(self, int fd): > + cdef: > +- int err > ++ int err = 0 > + int reuseport_flag = 1 > + > + err = system.setsockopt( > +@@ -1397,7 +1397,7 @@ cdef class Loop: > + self._debug = bool(enabled) > + if self.is_running(): > + self.call_soon_threadsafe( > +- self._set_coroutine_debug, self, self._debug) > ++ self._set_coroutine_debug, self._debug) > + > + def is_running(self): > + """Return whether the event loop is currently running.""" > +@@ -2750,7 +2750,7 @@ cdef class Loop: > + executable=None, > + pass_fds=(), > + # For tests only! Do not use in your code. Ever. > +- __uvloop_sleep_after_fork=False): > ++ uvloop_sleep_after_fork=False): > + > + # TODO: Implement close_fds (might not be very important in > + # Python 3.5, since all FDs aren't inheritable by default.) > +@@ -2770,7 +2770,7 @@ cdef class Loop: > + if executable is not None: > + args[0] = executable > + > +- if __uvloop_sleep_after_fork: > ++ if uvloop_sleep_after_fork: > + debug_flags |= __PROCESS_DEBUG_SLEEP_AFTER_FORK > + > + waiter = self._new_future() > +diff --git a/uvloop/sslproto.pxd b/uvloop/sslproto.pxd > +index 3da10f0..68e4d57 100644 > +--- a/uvloop/sslproto.pxd > ++++ b/uvloop/sslproto.pxd > +@@ -122,7 +122,7 @@ cdef class SSLProtocol: > + # Flow control for writes from APP socket > + > + cdef _control_app_writing(self, object context=*) > +- cdef size_t _get_write_buffer_size(self) > ++ cdef size_t _get_write_buffer_size(self) noexcept > + cdef _set_write_buffer_limits(self, high=*, low=*) > + > + # Flow control for reads to APP socket > +@@ -134,5 +134,5 @@ cdef class SSLProtocol: > + > + cdef _control_ssl_reading(self) > + cdef _set_read_buffer_limits(self, high=*, low=*) > +- cdef size_t _get_read_buffer_size(self) > ++ cdef size_t _get_read_buffer_size(self) noexcept > + cdef _fatal_error(self, exc, message=*) > +diff --git a/uvloop/sslproto.pyx b/uvloop/sslproto.pyx > +index 42bb764..0a43746 100644 > +--- a/uvloop/sslproto.pyx > ++++ b/uvloop/sslproto.pyx > +@@ -861,7 +861,7 @@ cdef class SSLProtocol: > + 'protocol': self, > + }) > + > +- cdef size_t _get_write_buffer_size(self): > ++ cdef size_t _get_write_buffer_size(self) noexcept: > + return self._outgoing.pending + self._write_buffer_size > + > + cdef _set_write_buffer_limits(self, high=None, low=None): > +@@ -903,7 +903,7 @@ cdef class SSLProtocol: > + self._incoming_high_water = high > + self._incoming_low_water = low > + > +- cdef size_t _get_read_buffer_size(self): > ++ cdef size_t _get_read_buffer_size(self) noexcept: > + return self._incoming.pending > + > + # Flow control for writes to SSL socket > +-- > +2.34.1 > + > diff --git a/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > new file mode 100644 > index 0000000000..ac6170aff3 > --- /dev/null > +++ b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > @@ -0,0 +1,30 @@ > +From 8b63801bfdb1f0cf7fde4f58e96f8628a587b186 Mon Sep 17 00:00:00 2001 > +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> > +Date: Thu, 28 Dec 2023 16:17:49 +0000 > +Subject: [PATCH] _set_coroutine_debug has args difference in python 3.11 > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/MagicStack/uvloop/pull/587] > +--- > + uvloop/loop.pyx | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > +index 53e1160..5ca718e 100644 > +--- a/uvloop/loop.pyx > ++++ b/uvloop/loop.pyx > +@@ -1396,8 +1396,9 @@ cdef class Loop: > + def set_debug(self, enabled): > + self._debug = bool(enabled) > + if self.is_running(): > ++ args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) > + self.call_soon_threadsafe( > +- self._set_coroutine_debug, self._debug) > ++ self._set_coroutine_debug, *args) > + > + def is_running(self): > + """Return whether the event loop is currently running.""" > +-- > +2.34.1 > + > diff --git a/package/python-uvloop/0003-fix-tests-on-python-3.8.patch b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch > new file mode 100644 > index 0000000000..42f04f2241 > --- /dev/null > +++ b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch > @@ -0,0 +1,31 @@ > +From ef5c3e5c6f331692ebcbea9e4c6aead8b2187038 Mon Sep 17 00:00:00 2001 > +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> > +Date: Thu, 28 Dec 2023 19:58:11 +0000 > +Subject: [PATCH] fix tests on python 3.8 > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/MagicStack/uvloop/pull/587] > +--- > + uvloop/loop.pyx | 5 ++--- > + 1 file changed, 2 insertions(+), 3 deletions(-) > + > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > +index 5ca718e..75b915a 100644 > +--- a/uvloop/loop.pyx > ++++ b/uvloop/loop.pyx > +@@ -1396,9 +1396,8 @@ cdef class Loop: > + def set_debug(self, enabled): > + self._debug = bool(enabled) > + if self.is_running(): > +- args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) > +- self.call_soon_threadsafe( > +- self._set_coroutine_debug, *args) > ++ args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) > ++ self.call_soon_threadsafe(self._set_coroutine_debug, *args) > + > + def is_running(self): > + """Return whether the event loop is currently running.""" > +-- > +2.34.1 > + > diff --git a/package/python-uvloop/0004-fix-arg-count-for-wrap.patch b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch > new file mode 100644 > index 0000000000..fe082f4f90 > --- /dev/null > +++ b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch > @@ -0,0 +1,52 @@ > +From afef6364c2c3100ab23c2bb2de82d2da330b258c Mon Sep 17 00:00:00 2001 > +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> > +Date: Fri, 29 Dec 2023 11:24:19 +0000 > +Subject: [PATCH] fix arg count for wrap() > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/MagicStack/uvloop/pull/587] > +--- > + uvloop/loop.pxd | 2 +- > + uvloop/loop.pyx | 5 ++--- > + 2 files changed, 3 insertions(+), 4 deletions(-) > + > +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd > +index f90c704..d34ffeb 100644 > +--- a/uvloop/loop.pxd > ++++ b/uvloop/loop.pxd > +@@ -220,7 +220,7 @@ cdef class Loop: > + cdef inline _ceval_process_signals(self) > + cdef _invoke_signals(self, bytes data) > + > +- cdef _set_coroutine_debug(self, bint enabled) > ++ cpdef _set_coroutine_debug(self, bint enabled) > + > + cdef _print_debug_info(self) > + > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > +index 75b915a..a3eeb60 100644 > +--- a/uvloop/loop.pyx > ++++ b/uvloop/loop.pyx > +@@ -1131,7 +1131,7 @@ cdef class Loop: > + if err < 0: > + raise convert_error(-errno.errno) > + > +- cdef _set_coroutine_debug(self, bint enabled): > ++ cpdef _set_coroutine_debug(self, bint enabled): > + enabled = bool(enabled) > + if self._coroutine_debug_set == enabled: > + return > +@@ -1396,8 +1396,7 @@ cdef class Loop: > + def set_debug(self, enabled): > + self._debug = bool(enabled) > + if self.is_running(): > +- args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) > +- self.call_soon_threadsafe(self._set_coroutine_debug, *args) > ++ self.call_soon_threadsafe(self._set_coroutine_debug, self._debug) > + > + def is_running(self): > + """Return whether the event loop is currently running.""" > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 21:26:38 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:26:38 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240211212652.8E02C87773@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e5229c252abbf4b86476cfafbc26753f803cfd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index da22b439e3..773cb4fbb5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.15" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.16" 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 10edcc2ed9..52fb480af2 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa linux-6.6.15.tar.xz -sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz +sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz +sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a0e572adc0..69857566e3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.76" if BR2_KERNEL_HEADERS_6_1 - default "6.6.15" if BR2_KERNEL_HEADERS_6_6 + default "6.1.77" if BR2_KERNEL_HEADERS_6_1 + default "6.6.16" if BR2_KERNEL_HEADERS_6_6 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 \ From thomas.petazzoni at bootlin.com Sun Feb 11 21:26:57 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:26:57 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 6.{1, 6}.x series In-Reply-To: <20240210073659.5018-1-bernd@kuhls.net> References: <20240210073659.5018-1-bernd@kuhls.net> Message-ID: <20240211222657.4861ec2a@windsurf> On Sat, 10 Feb 2024 08:36:59 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > linux/Config.in | 2 +- > linux/linux.hash | 4 ++-- > package/linux-headers/Config.in.host | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:27:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:27:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/uhd: fix build with gcc >= 13 In-Reply-To: <20240209210801.880001-1-fontaine.fabrice@gmail.com> References: <20240209210801.880001-1-fontaine.fabrice@gmail.com> Message-ID: <20240211222741.501ddbc4@windsurf> On Fri, 9 Feb 2024 22:08:01 +0100 Fabrice Fontaine wrote: > Fix the following build failure with gcc >= 13: > > In file included from /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/lib/cal/database.cpp:7: > /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:86:24: error: 'uint8_t' was not declared in this scope > 86 | static std::vector read_cal_data(const std::string& key, > | ^~~~~~~ > /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:14:1: note: 'uint8_t' is defined in header ''; did you forget to '#include '? > 13 | #include > +++ |+#include > 14 | > > Fixes: > - http://autobuild.buildroot.org/results/cc52f2ed4fa43fe9c92713eb8561afcba29e12f3 > > Signed-off-by: Fabrice Fontaine > --- > ...h-GCC-13-add-missing-cstdint-include.patch | 117 ++++++++++++++++++ > 1 file changed, 117 insertions(+) > create mode 100644 package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:27:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:27:10 +0100 Subject: [Buildroot] [git commit] package/uhd: fix build with gcc >= 13 Message-ID: <20240211212840.63A5A87779@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69ad593a410ac734a629fd0dc4590ec7f43308ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc >= 13: In file included from /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/lib/cal/database.cpp:7: /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:86:24: error: 'uint8_t' was not declared in this scope 86 | static std::vector read_cal_data(const std::string& key, | ^~~~~~~ /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:14:1: note: 'uint8_t' is defined in header ''; did you forget to '#include '? 13 | #include +++ |+#include 14 | Fixes: - http://autobuild.buildroot.org/results/cc52f2ed4fa43fe9c92713eb8561afcba29e12f3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...d-with-GCC-13-add-missing-cstdint-include.patch | 117 +++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch b/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch new file mode 100644 index 0000000000..acf720a15d --- /dev/null +++ b/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch @@ -0,0 +1,117 @@ +From 3acf784e988608cbce34cd0be0a8703ba53ea515 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 3 Jan 2023 23:04:52 +0000 +Subject: [PATCH] Fix build with GCC 13 (add missing include) + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so is no longer transitively included. + +Explicitly include for uint8_t. + +``` +/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:43:14: error: 'uint32_t' does not name a type + 43 | static const uint32_t DEFAULT_NOC_ID = 0xFFFFFFFF; + | ^~~~~~~~ +/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:1:1: note: 'uint32_t' is defined in header ''; did you forget to '#include '? + +++ |+#include + 1 | // +``` + +Signed-off-by: Sam James + +Upstream: https://github.com/EttusResearch/uhd/commit/3acf784e988608cbce34cd0be0a8703ba53ea515 +Signed-off-by: Fabrice Fontaine +--- + host/include/uhd/cal/database.hpp | 1 + + host/include/uhd/rfnoc/defaults.hpp | 1 + + host/include/uhd/types/eeprom.hpp | 1 + + host/include/uhd/usrp/zbx_tune_map_item.hpp | 1 + + host/lib/usrp/dboard/magnesium/magnesium_constants.hpp | 1 + + host/lib/usrp/dboard/rhodium/rhodium_constants.hpp | 1 + + host/lib/utils/serial_number.cpp | 1 + + 7 files changed, 7 insertions(+) + +diff --git a/host/include/uhd/cal/database.hpp b/host/include/uhd/cal/database.hpp +index b6abbb6df7..9d47febedd 100644 +--- a/host/include/uhd/cal/database.hpp ++++ b/host/include/uhd/cal/database.hpp +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp +index aa7778aacf..6c878a8d70 100644 +--- a/host/include/uhd/rfnoc/defaults.hpp ++++ b/host/include/uhd/rfnoc/defaults.hpp +@@ -8,6 +8,7 @@ + + #pragma once + ++#include + #include + + namespace uhd { namespace rfnoc { +diff --git a/host/include/uhd/types/eeprom.hpp b/host/include/uhd/types/eeprom.hpp +index 3a7605d3cb..420440aa64 100644 +--- a/host/include/uhd/types/eeprom.hpp ++++ b/host/include/uhd/types/eeprom.hpp +@@ -6,6 +6,7 @@ + + #pragma once + ++#include + #include + #include + #include +diff --git a/host/include/uhd/usrp/zbx_tune_map_item.hpp b/host/include/uhd/usrp/zbx_tune_map_item.hpp +index e49f49f785..ce95623de2 100644 +--- a/host/include/uhd/usrp/zbx_tune_map_item.hpp ++++ b/host/include/uhd/usrp/zbx_tune_map_item.hpp +@@ -6,6 +6,7 @@ + + #pragma once + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp +index 99f2b910c6..99f5a4933f 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp +index 591d02d305..1577e02d9e 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/host/lib/utils/serial_number.cpp b/host/lib/utils/serial_number.cpp +index 61296a9139..c07730e24d 100644 +--- a/host/lib/utils/serial_number.cpp ++++ b/host/lib/utils/serial_number.cpp +@@ -5,6 +5,7 @@ + // + + #include ++#include + #include + #include + From thomas.petazzoni at bootlin.com Sun Feb 11 21:29:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:29:27 +0100 Subject: [Buildroot] [PATCH 1/2] package/alsa-lib: bump version to 1.2.11 In-Reply-To: <20240211154714.2311642-1-bernd@kuhls.net> References: <20240211154714.2311642-1-bernd@kuhls.net> Message-ID: <20240211222927.4587f57b@windsurf> On Sun, 11 Feb 2024 16:47:13 +0100 Bernd Kuhls wrote: > Removed patch which is included in this release. > > Changelog: > https://www.alsa-project.org/wiki/Changes_v1.2.10_v1.2.11#alsa-lib > > Signed-off-by: Bernd Kuhls > --- > ...STRING-macro-outside-PIC-ifdef-block.patch | 50 ------------------- > package/alsa-lib/alsa-lib.hash | 2 +- > package/alsa-lib/alsa-lib.mk | 2 +- > 3 files changed, 2 insertions(+), 52 deletions(-) > delete mode 100644 package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:28:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:28:40 +0100 Subject: [Buildroot] [git commit] package/alsa-lib: bump version to 1.2.11 Message-ID: <20240211213031.9C31187789@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd27bde7f0d1d254b386fb7a719fe3b0f892bc9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patch which is included in this release. Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.10_v1.2.11#alsa-lib Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ve-__STRING-macro-outside-PIC-ifdef-block.patch | 50 ---------------------- package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch b/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch deleted file mode 100644 index 7bd67507fd..0000000000 --- a/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 6 Sep 2023 15:16:44 +0200 -Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block - -It solves the musl libc compilation issue. - -control.c: In function 'snd_ctl_open_conf': -../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio] - 98 | #define SND_DLSYM_VERSION(version) __STRING(version) - | ^~~~~~~~ - -Fixes: https://github.com/alsa-project/alsa-lib/issues/350 -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c - -Signed-off-by: Bernd Kuhls ---- - include/global.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/global.h b/include/global.h -index dfe9bc2b..3ecaeee8 100644 ---- a/include/global.h -+++ b/include/global.h -@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void); - #define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) - #endif - -+#ifndef __STRING -+/** \brief Return 'x' argument as string */ -+#define __STRING(x) #x -+#endif -+ - #ifdef PIC /* dynamic build */ - - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ -@@ -71,11 +76,6 @@ struct snd_dlsym_link { - - extern struct snd_dlsym_link *snd_dlsym_start; - --#ifndef __STRING --/** \brief Return 'x' argument as string */ --#define __STRING(x) #x --#endif -- - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ - #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version - /** diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index a6d9c7dbdc..830643dea8 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e alsa-lib-1.2.10.tar.bz2 +sha256 9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d alsa-lib-1.2.11.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 5dfcd1e861..246761d4e6 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.10 +ALSA_LIB_VERSION = 1.2.11 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) From thomas.petazzoni at bootlin.com Sun Feb 11 21:28:57 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:28:57 +0100 Subject: [Buildroot] [git commit] package/alsa-utils: bump version to 1.2.11 Message-ID: <20240211213031.A7D0487777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96a7db5a4b7526ecf744d89d9c19986b91626325 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patches which are included in this release. Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.10_v1.2.11#alsa-utils Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...TTRIBUTE_UNUSED-instead-remove-argument-n.patch | 233 --------------- ...TTRIBUTE_UNUSED-instead-remove-argument-n.patch | 34 --- ...e-ATTRIBUTE_UNUSED-instead-remove-argumen.patch | 57 ---- ...RIBUTE_UNUSED-instead-remove-argument-nam.patch | 67 ----- ...RIBUTE_UNUSED-instead-remove-argument-nam.patch | 93 ------ ...-ATTRIBUTE_UNUSED-instead-remove-argument.patch | 109 ------- ...e-ATTRIBUTE_UNUSED-instead-remove-argumen.patch | 312 --------------------- .../0009-topology-include-locale.h.patch | 33 --- ...0010-nhlt-dmic-info.c-include-sys-types.h.patch | 33 --- ...11-configure.ac-fix-UMP-support-detection.patch | 38 --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 12 files changed, 2 insertions(+), 1011 deletions(-) diff --git a/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch b/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch deleted file mode 100644 index 92622292c0..0000000000 --- a/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch +++ /dev/null @@ -1,233 +0,0 @@ -From a90faa2dd644af585d6a00f0aaf297c15ea0aa7b Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:33:47 +0200 -Subject: [PATCH] axfer: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: ad5a1c0 ("axfer: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/a90faa2dd644af585d6a00f0aaf297c15ea0aa7b - -Signed-off-by: Bernd Kuhls ---- - axfer/container-raw.c | 14 +++++++------- - axfer/mapper-single.c | 6 +++--- - axfer/subcmd-list.c | 2 +- - axfer/subcmd-transfer.c | 4 ++-- - axfer/waiter-poll.c | 4 ++-- - axfer/waiter-select.c | 4 ++-- - axfer/waiter.h | 1 + - axfer/xfer-libasound-irq-rw.c | 2 +- - axfer/xfer-libasound.c | 4 ++-- - axfer/xfer-options.c | 3 ++- - 10 files changed, 23 insertions(+), 21 deletions(-) - -diff --git a/axfer/container-raw.c b/axfer/container-raw.c -index 071f94c..1886045 100644 ---- a/axfer/container-raw.c -+++ b/axfer/container-raw.c -@@ -13,10 +13,10 @@ - #include - #include - --static int raw_builder_pre_process(struct container_context *, -- snd_pcm_format_t *, -- unsigned int *, -- unsigned int *, -+static int raw_builder_pre_process(struct container_context *cntr ATTRIBUTE_UNUSED, -+ snd_pcm_format_t *format ATTRIBUTE_UNUSED, -+ unsigned int *samples_per_frame ATTRIBUTE_UNUSED, -+ unsigned int *frames_per_second ATTRIBUTE_UNUSED, - uint64_t *byte_count) - { - *byte_count = UINT64_MAX; -@@ -25,9 +25,9 @@ static int raw_builder_pre_process(struct container_context *, - } - - static int raw_parser_pre_process(struct container_context *cntr, -- snd_pcm_format_t *, -- unsigned int *, -- unsigned int *, -+ snd_pcm_format_t *format ATTRIBUTE_UNUSED, -+ unsigned int *samples_per_frame ATTRIBUTE_UNUSED, -+ unsigned int *frames_per_second ATTRIBUTE_UNUSED, - uint64_t *byte_count) - { - struct stat buf = {0}; -diff --git a/axfer/mapper-single.c b/axfer/mapper-single.c -index 13e7fc5..f669f7f 100644 ---- a/axfer/mapper-single.c -+++ b/axfer/mapper-single.c -@@ -62,7 +62,7 @@ static void align_from_vector(void *frame_buf, unsigned int frame_count, - - static int single_pre_process(struct mapper_context *mapper, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - unsigned int bytes_per_buffer; -@@ -110,7 +110,7 @@ static int single_muxer_process_frames(struct mapper_context *mapper, - void *frame_buf, - unsigned int *frame_count, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - void *src; -@@ -141,7 +141,7 @@ static int single_demuxer_process_frames(struct mapper_context *mapper, - void *frame_buf, - unsigned int *frame_count, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - void *dst; -diff --git a/axfer/subcmd-list.c b/axfer/subcmd-list.c -index f9c8e0f..187e1d7 100644 ---- a/axfer/subcmd-list.c -+++ b/axfer/subcmd-list.c -@@ -19,7 +19,7 @@ enum list_op { - }; - - static int dump_device(snd_ctl_t *handle, const char *id, const char *name, -- snd_pcm_stream_t, snd_pcm_info_t *info) -+ snd_pcm_stream_t stream ATTRIBUTE_UNUSED, snd_pcm_info_t *info) - { - unsigned int i, count; - int err; -diff --git a/axfer/subcmd-transfer.c b/axfer/subcmd-transfer.c -index b39fde8..8d63043 100644 ---- a/axfer/subcmd-transfer.c -+++ b/axfer/subcmd-transfer.c -@@ -40,7 +40,7 @@ static void handle_unix_signal_for_finish(int sig) - ctx_ptr->interrupted = true; - } - --static void handle_unix_signal_for_suspend(int) -+static void handle_unix_signal_for_suspend(int sig ATTRIBUTE_UNUSED) - { - sigset_t curr, prev; - struct sigaction sa = {0}; -@@ -439,7 +439,7 @@ static int context_process_frames(struct context *ctx, - } - - static void context_post_process(struct context *ctx, -- uint64_t) -+ uint64_t accumulated_frame_count ATTRIBUTE_UNUSED) - { - uint64_t total_frame_count; - unsigned int i; -diff --git a/axfer/waiter-poll.c b/axfer/waiter-poll.c -index 31fab88..b81300c 100644 ---- a/axfer/waiter-poll.c -+++ b/axfer/waiter-poll.c -@@ -13,7 +13,7 @@ - #include - #include - --static int poll_prepare(struct waiter_context *) -+static int poll_prepare(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - // Nothing to do because an instance of waiter has required data. - return 0; -@@ -30,7 +30,7 @@ static int poll_wait_event(struct waiter_context *waiter, int timeout_msec) - return err; - } - --static void poll_release(struct waiter_context *) -+static void poll_release(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - // Nothing to do because an instance of waiter has required data. - return; -diff --git a/axfer/waiter-select.c b/axfer/waiter-select.c -index 164c9c8..fe19776 100644 ---- a/axfer/waiter-select.c -+++ b/axfer/waiter-select.c -@@ -34,7 +34,7 @@ struct select_state { - fd_set rfds_ex; - }; - --static int select_prepare(struct waiter_context *) -+static int select_prepare(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - return 0; - } -@@ -94,7 +94,7 @@ static int select_wait_event(struct waiter_context *waiter, int timeout_msec) - return err; - } - --static void select_release(struct waiter_context *) -+static void select_release(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - return; - } -diff --git a/axfer/waiter.h b/axfer/waiter.h -index db18e33..0f4e9b9 100644 ---- a/axfer/waiter.h -+++ b/axfer/waiter.h -@@ -9,6 +9,7 @@ - #ifndef __ALSA_UTILS_AXFER_WAITER__H_ - #define __ALSA_UTILS_AXFER_WAITER__H_ - -+#include - #include - - enum waiter_type { -diff --git a/axfer/xfer-libasound-irq-rw.c b/axfer/xfer-libasound-irq-rw.c -index b7f0645..45fb6d5 100644 ---- a/axfer/xfer-libasound-irq-rw.c -+++ b/axfer/xfer-libasound-irq-rw.c -@@ -313,7 +313,7 @@ error: - } - - static int w_process_frames_nonblocking(struct libasound_state *state, -- snd_pcm_state_t, -+ snd_pcm_state_t pcm_state ATTRIBUTE_UNUSED, - unsigned int *frame_count, - struct mapper_context *mapper, - struct container_context *cntrs) -diff --git a/axfer/xfer-libasound.c b/axfer/xfer-libasound.c -index 9713533..36ee08d 100644 ---- a/axfer/xfer-libasound.c -+++ b/axfer/xfer-libasound.c -@@ -60,7 +60,7 @@ static const struct option l_opts[] = { - }; - - static int xfer_libasound_init(struct xfer_context *xfer, -- snd_pcm_stream_t) -+ snd_pcm_stream_t stream ATTRIBUTE_UNUSED) - { - struct libasound_state *state = xfer->private_data; - int err; -@@ -887,7 +887,7 @@ static void xfer_libasound_destroy(struct xfer_context *xfer) - state->log = NULL; - } - --static void xfer_libasound_help(struct xfer_context *) -+static void xfer_libasound_help(struct xfer_context *xfer ATTRIBUTE_UNUSED) - { - printf( - " [BASICS]\n" -diff --git a/axfer/xfer-options.c b/axfer/xfer-options.c -index 974570c..e716ded 100644 ---- a/axfer/xfer-options.c -+++ b/axfer/xfer-options.c -@@ -447,7 +447,8 @@ static int generate_path_with_suffix(struct xfer_context *xfer, - - static int generate_path_without_suffix(struct xfer_context *xfer, - const char *template, -- unsigned int index, const char *) -+ unsigned int index, -+ const char *suffix ATTRIBUTE_UNUSED) - { - static const char *const single_format = "%s"; - static const char *const multiple_format = "%s-%i"; --- -2.39.2 - diff --git a/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch b/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch deleted file mode 100644 index 12a098b6fb..0000000000 --- a/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2db896afd475b0b3ad07e97ba74ec9680b4f7f6d Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:37:24 +0200 -Subject: [PATCH] amidi: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 1843540 ("amidi: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/2db896afd475b0b3ad07e97ba74ec9680b4f7f6d - -Signed-off-by: Bernd Kuhls ---- - amidi/amidi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amidi/amidi.c b/amidi/amidi.c -index f930ca8..75fb8c0 100644 ---- a/amidi/amidi.c -+++ b/amidi/amidi.c -@@ -446,7 +446,7 @@ static void print_byte(unsigned char byte, struct timespec *ts) - printf("%02X", byte); - } - --static void sig_handler(int) -+static void sig_handler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } --- -2.39.2 - diff --git a/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch b/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch deleted file mode 100644 index 4720531415..0000000000 --- a/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7552aef6e08b5b1fd8c1704e21cb9f6f15017bfa Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:45:09 +0200 -Subject: [PATCH] alsaloop: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: d609a58 ("alsaloop: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/7552aef6e08b5b1fd8c1704e21cb9f6f15017bfa - -Signed-off-by: Bernd Kuhls ---- - alsaloop/alsaloop.c | 2 +- - alsaloop/pcmjob.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/alsaloop/alsaloop.c b/alsaloop/alsaloop.c -index b10733e..51fb646 100644 ---- a/alsaloop/alsaloop.c -+++ b/alsaloop/alsaloop.c -@@ -821,7 +821,7 @@ static void send_to_all(int sig) - } - } - --static void signal_handler(int) -+static void signal_handler(int sig ATTRIBUTE_UNUSED) - { - quit = 1; - send_to_all(SIGUSR2); -diff --git a/alsaloop/pcmjob.c b/alsaloop/pcmjob.c -index be71971..ffb439b 100644 ---- a/alsaloop/pcmjob.c -+++ b/alsaloop/pcmjob.c -@@ -625,7 +625,7 @@ static void buf_add_src(struct loopback *loop) - } - } - #else --static void buf_add_src(struct loopback *) -+static void buf_add_src(struct loopback *loop ATTRIBUTE_UNUSED) - { - } - #endif -@@ -1794,7 +1794,7 @@ static int ctl_event_check(snd_ctl_elem_value_t *val, snd_ctl_event_t *ev) - } - - static int handle_ctl_events(struct loopback_handle *lhandle, -- unsigned short) -+ unsigned short events ATTRIBUTE_UNUSED) - { - struct loopback *loop = lhandle->loopback; - snd_ctl_event_t *ev; --- -2.39.2 - diff --git a/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch b/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch deleted file mode 100644 index 1a42f24d3c..0000000000 --- a/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 94eeb5a40f77e92624eb32d2e9c50b1cd9e4f837 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:49:03 +0200 -Subject: [PATCH] bat: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: b366875 ("bat: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/94eeb5a40f77e92624eb32d2e9c50b1cd9e4f837 - -Signed-off-by: Bernd Kuhls ---- - bat/bat.c | 3 ++- - bat/common.c | 3 ++- - bat/common.h | 5 +++++ - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/bat/bat.c b/bat/bat.c -index e88c65f..ea04ed9 100644 ---- a/bat/bat.c -+++ b/bat/bat.c -@@ -158,7 +158,8 @@ static void get_format(struct bat *bat, char *optarg) - } - } - --static inline int thread_wait_completion(struct bat *, pthread_t id, int **val) -+static inline int thread_wait_completion(struct bat *bat ATTRIBUTE_UNUSED, -+ pthread_t id, int **val) - { - int err; - -diff --git a/bat/common.c b/bat/common.c -index 9ff9405..470a7e6 100644 ---- a/bat/common.c -+++ b/bat/common.c -@@ -47,7 +47,8 @@ static int update_fmt_to_bat(struct bat *bat, struct chunk_fmt *fmt) - } - - /* calculate frames and update to bat */ --static int update_frames_to_bat(struct bat *bat, struct wav_chunk_header *header, FILE *) -+static int update_frames_to_bat(struct bat *bat, struct wav_chunk_header *header, -+ FILE *file ATTRIBUTE_UNUSED) - { - /* The number of analyzed captured frames is arbitrarily set to half of - the number of frames of the wav file or the number of frames of the -diff --git a/bat/common.h b/bat/common.h -index a9bae5d..bb51b0d 100644 ---- a/bat/common.h -+++ b/bat/common.h -@@ -13,6 +13,11 @@ - * - */ - -+#ifndef ATTRIBUTE_UNUSED -+/** do not print warning (gcc) when function parameter is not used */ -+#define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -+#endif -+ - #define TEMP_RECORD_FILE_NAME "/tmp/bat.wav.XXXXXX" - #define DEFAULT_DEV_NAME "default" - --- -2.39.2 - diff --git a/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch b/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch deleted file mode 100644 index 9e7e7da5ce..0000000000 --- a/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 66112d60e4ce68720022eaf26080c0f1a2caf81f Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:52:46 +0200 -Subject: [PATCH] seq: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 181e190 ("aplaymidi: fix the verbose compilation warnings for latest gcc") -Fixes: a03377a ("aseqnet: fix the verbose compilation warnings for latest gcc") -Fixes: 429c32a ("aseqdump: fix the verbose compilation warnings for latest gcc") -Fixes: 0b48dd6 ("aconnect: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/66112d60e4ce68720022eaf26080c0f1a2caf81f - -Signed-off-by: Bernd Kuhls ---- - seq/aconnect/aconnect.c | 9 ++++++--- - seq/aplaymidi/arecordmidi.c | 2 +- - seq/aseqdump/aseqdump.c | 2 +- - seq/aseqnet/aseqnet.c | 2 +- - 4 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/seq/aconnect/aconnect.c b/seq/aconnect/aconnect.c -index 3a10de9..7096feb 100644 ---- a/seq/aconnect/aconnect.c -+++ b/seq/aconnect/aconnect.c -@@ -193,7 +193,8 @@ static void do_search_port(snd_seq_t *seq, int perm, action_func_t do_action) - } - - --static void print_port(snd_seq_t *, snd_seq_client_info_t *cinfo, -+static void print_port(snd_seq_t *seq ATTRIBUTE_UNUSED, -+ snd_seq_client_info_t *cinfo, - snd_seq_port_info_t *pinfo, int count) - { - if (! count) { -@@ -247,8 +248,10 @@ static void print_port_and_subs(snd_seq_t *seq, snd_seq_client_info_t *cinfo, - /* - * remove all (exported) connections - */ --static void remove_connection(snd_seq_t *seq, snd_seq_client_info_t *, -- snd_seq_port_info_t *pinfo, int) -+static void remove_connection(snd_seq_t *seq, -+ snd_seq_client_info_t *info ATTRIBUTE_UNUSED, -+ snd_seq_port_info_t *pinfo, -+ int count ATTRIBUTE_UNUSED) - { - snd_seq_query_subscribe_t *query; - snd_seq_port_info_t *port; -diff --git a/seq/aplaymidi/arecordmidi.c b/seq/aplaymidi/arecordmidi.c -index ce71472..a4c1181 100644 ---- a/seq/aplaymidi/arecordmidi.c -+++ b/seq/aplaymidi/arecordmidi.c -@@ -719,7 +719,7 @@ static void version(void) - fputs("arecordmidi version " SND_UTIL_VERSION_STR "\n", stderr); - } - --static void sighandler(int) -+static void sighandler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } -diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c -index 8455ecb..af4ca21 100644 ---- a/seq/aseqdump/aseqdump.c -+++ b/seq/aseqdump/aseqdump.c -@@ -676,7 +676,7 @@ static void version(void) - puts("aseqdump version " SND_UTIL_VERSION_STR); - } - --static void sighandler(int) -+static void sighandler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } -diff --git a/seq/aseqnet/aseqnet.c b/seq/aseqnet/aseqnet.c -index f40de7d..aa70b50 100644 ---- a/seq/aseqnet/aseqnet.c -+++ b/seq/aseqnet/aseqnet.c -@@ -334,7 +334,7 @@ static void get_net_addr(struct addrinfo *rp, char *buf, size_t buflen) - /* - * signal handler - */ --static void sigterm_exit(int) -+static void sigterm_exit(int sig ATTRIBUTE_UNUSED) - { - close_files(); - exit(1); --- -2.39.2 - diff --git a/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch b/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch deleted file mode 100644 index 66826c4515..0000000000 --- a/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 9e5e9a6d70de63bea01f0669b01319952f2cfdea Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:57:47 +0200 -Subject: [PATCH] alsaucm: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: d7bbc26 ("alsaucm: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/9e5e9a6d70de63bea01f0669b01319952f2cfdea - -Signed-off-by: Bernd Kuhls ---- - alsaucm/dump.c | 22 ++++++++++++---------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -diff --git a/alsaucm/dump.c b/alsaucm/dump.c -index 102ac4d..a5c57f2 100644 ---- a/alsaucm/dump.c -+++ b/alsaucm/dump.c -@@ -93,7 +93,8 @@ static char *tesc(const char *s, char *buf, size_t buf_len) - - #define ESC(s, esc) tesc((s), (esc), sizeof(esc)) - --static int text_verb_start(struct renderer *, const char *verb, const char *comment) -+static int text_verb_start(struct renderer *r ATTRIBUTE_UNUSED, -+ const char *verb, const char *comment) - { - char buf1[128], buf2[128]; - printf("Verb.%s {\n", ESC(verb, buf1)); -@@ -102,13 +103,13 @@ static int text_verb_start(struct renderer *, const char *verb, const char *comm - return 0; - } - --static int text_verb_end(struct renderer *) -+static int text_verb_end(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("}\n"); - return 0; - } - --static int text_2nd_level_begin(struct renderer *, -+static int text_2nd_level_begin(struct renderer *r ATTRIBUTE_UNUSED, - const char *key, - const char *val, - const char *comment) -@@ -120,19 +121,19 @@ static int text_2nd_level_begin(struct renderer *, - return 0; - } - --static int text_2nd_level_end(struct renderer *) -+static int text_2nd_level_end(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("\t}\n"); - return 0; - } - --static int text_2nd_level(struct renderer *, const char *txt) -+static int text_2nd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf("\t\t%s", txt); - return 0; - } - --static int text_3rd_level(struct renderer *, const char *txt) -+static int text_3rd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf("\t\t\t%s", txt); - return 0; -@@ -266,7 +267,7 @@ static void json_block(struct renderer *r, int level, int last) - j->block[level] = last ? 0 : 1; - } - --static int json_init(struct renderer *) -+static int json_init(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("{\n \"Verbs\": {"); - return 0; -@@ -325,13 +326,13 @@ static int json_2nd_level_end(struct renderer *r) - return 0; - } - --static int json_2nd_level(struct renderer *, const char *txt) -+static int json_2nd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf(" %s", txt); - return 0; - } - --static int json_3rd_level(struct renderer *, const char *txt) -+static int json_3rd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf(" %s", txt); - return 0; -@@ -360,7 +361,8 @@ static int json_supcon_start(struct renderer *r, const char *key) - return 0; - } - --static int json_supcon_value(struct renderer *r, const char *value, int) -+static int json_supcon_value(struct renderer *r, const char *value, -+ int last ATTRIBUTE_UNUSED) - { - char buf[256]; - JESC(value, buf); --- -2.39.2 - diff --git a/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch b/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch deleted file mode 100644 index 07b10b3ab8..0000000000 --- a/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch +++ /dev/null @@ -1,312 +0,0 @@ -From dfe1c7143ab6ea01789e276b1ba361a00e545997 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 17:11:05 +0200 -Subject: [PATCH] topology: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 153d185 ("topology: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/dfe1c7143ab6ea01789e276b1ba361a00e545997 - -Signed-off-by: Bernd Kuhls ---- - topology/nhlt/intel/dmic-nhlt.c | 3 ++- - topology/nhlt/intel/dmic/dmic-debug.c | 7 ++++--- - topology/nhlt/intel/ssp/ssp-debug.c | 5 +++-- - topology/nhlt/intel/ssp/ssp-process.c | 4 +++- - topology/nhlt/nhlt-processor.c | 7 +++++-- - topology/pre-process-class.c | 10 +++++----- - topology/pre-process-object.c | 21 +++++++++++---------- - topology/pre-processor.c | 10 ++++++---- - 8 files changed, 39 insertions(+), 28 deletions(-) - -diff --git a/topology/nhlt/intel/dmic-nhlt.c b/topology/nhlt/intel/dmic-nhlt.c -index 70a22e3..de659cf 100644 ---- a/topology/nhlt/intel/dmic-nhlt.c -+++ b/topology/nhlt/intel/dmic-nhlt.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -155,7 +156,7 @@ static int set_vendor_mic_data(struct intel_nhlt_params *nhlt, snd_config_t *cfg - horizontal_angle_end); - } - --static int set_bytes_data(struct intel_nhlt_params *, snd_config_t *cfg) -+static int set_bytes_data(struct intel_nhlt_params *nhlt ATTRIBUTE_UNUSED, snd_config_t *cfg) - { - snd_config_iterator_t i, next; - snd_config_t *n; -diff --git a/topology/nhlt/intel/dmic/dmic-debug.c b/topology/nhlt/intel/dmic/dmic-debug.c -index f99d308..a977c93 100644 ---- a/topology/nhlt/intel/dmic/dmic-debug.c -+++ b/topology/nhlt/intel/dmic/dmic-debug.c -@@ -8,6 +8,7 @@ - #include "aconfig.h" - #include - #include -+#include - #include "dmic-debug.h" - - #ifdef NHLT_DEBUG -@@ -181,7 +182,7 @@ void dmic_print_internal(struct intel_dmic_params *dmic) - } - - #else /* NHLT_DEBUG */ --void dmic_print_bytes_as_hex(uint8_t *, size_t) {} --void dmic_print_integers_as_hex(uint32_t *, size_t) {} --void dmic_print_internal(struct intel_dmic_params *) {} -+void dmic_print_bytes_as_hex(uint8_t *src ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED) {} -+void dmic_print_integers_as_hex(uint32_t *src ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED) {} -+void dmic_print_internal(struct intel_dmic_params *dmic ATTRIBUTE_UNUSED) {} - #endif -diff --git a/topology/nhlt/intel/ssp/ssp-debug.c b/topology/nhlt/intel/ssp/ssp-debug.c -index 8c64675..2d2f6b0 100644 ---- a/topology/nhlt/intel/ssp/ssp-debug.c -+++ b/topology/nhlt/intel/ssp/ssp-debug.c -@@ -7,6 +7,7 @@ - #include "aconfig.h" - #include - #include -+#include - #include "ssp-debug.h" - #include "../intel-nhlt.h" - -@@ -252,6 +253,6 @@ void ssp_print_internal(struct intel_ssp_params *ssp) - } - - #else /* NHLT_DEBUG */ --void ssp_print_internal(struct intel_ssp_params *) {} --void ssp_print_calculated(struct intel_ssp_params *) {} -+void ssp_print_internal(struct intel_ssp_params *ssp ATTRIBUTE_UNUSED) {} -+void ssp_print_calculated(struct intel_ssp_params *ssp ATTRIBUTE_UNUSED) {} - #endif -diff --git a/topology/nhlt/intel/ssp/ssp-process.c b/topology/nhlt/intel/ssp/ssp-process.c -index 9cda5c3..17b88d2 100644 ---- a/topology/nhlt/intel/ssp/ssp-process.c -+++ b/topology/nhlt/intel/ssp/ssp-process.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -952,7 +953,8 @@ int ssp_set_params(struct intel_nhlt_params *nhlt, const char *dir, int dai_inde - return 0; - } - --int ssp_hw_set_params(struct intel_nhlt_params *nhlt, const char *format, const char *, -+int ssp_hw_set_params(struct intel_nhlt_params *nhlt, const char *format, -+ const char *mclk ATTRIBUTE_UNUSED, - const char *bclk, const char *bclk_invert, const char *fsync, - const char *fsync_invert, int mclk_freq, int bclk_freq, int fsync_freq, - int tdm_slots, int tdm_slot_width, int tx_slots, int rx_slots) -diff --git a/topology/nhlt/nhlt-processor.c b/topology/nhlt/nhlt-processor.c -index 567fa5c..ca539c3 100644 ---- a/topology/nhlt/nhlt-processor.c -+++ b/topology/nhlt/nhlt-processor.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -87,7 +88,8 @@ static void debug_print_nhlt(struct nhlt *blob, struct endpoint_descriptor **eps - fprintf(stdout, "\n"); - } - #else --static void debug_print_nhlt(struct nhlt *, struct endpoint_descriptor **) {} -+static void debug_print_nhlt(struct nhlt *blob ATTRIBUTE_UNUSED, -+ struct endpoint_descriptor **eps ATTRIBUTE_UNUSED) {} - #endif - - static int print_as_hex_bytes(uint8_t *manifest_buffer, uint32_t manifest_size, -@@ -313,7 +315,8 @@ static int nhlt_get_flat_buffer(struct nhlt *blob, struct endpoint_descriptor ** - } - - /* called at the end of topology pre-processing, create flat buffer from variable size nhlt */ --static int nhlt_create(struct intel_nhlt_params *nhlt, snd_config_t *input, snd_config_t *, -+static int nhlt_create(struct intel_nhlt_params *nhlt, snd_config_t *input, -+ snd_config_t *output ATTRIBUTE_UNUSED, - uint8_t **nhlt_buffer, uint32_t *nhlt_size) - { - struct endpoint_descriptor *eps[MAX_ENDPOINT_COUNT]; -diff --git a/topology/pre-process-class.c b/topology/pre-process-class.c -index d883d05..bedcebe 100644 ---- a/topology/pre-process-class.c -+++ b/topology/pre-process-class.c -@@ -127,7 +127,7 @@ snd_config_t *tplg_class_lookup(struct tplg_pre_processor *tplg_pp, snd_config_t - } - - /* find the attribute config by name in the class definition */ --snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *, -+snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *tplg_p ATTRIBUTE_UNUSED, - snd_config_t *class, const char *name) - { - snd_config_t *attr = NULL; -@@ -152,7 +152,7 @@ snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *, - } - - /* get the name of the attribute that must have a unique value in the object instance */ --const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *, -+const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class) - { - snd_config_t *unique; -@@ -177,7 +177,7 @@ const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *, - } - - /* get attribute type from the definition */ --snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *, -+snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *attr) - { - snd_config_t *type; -@@ -208,7 +208,7 @@ snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *, - } - - /* get token_ref for attribute with name attr_name in the class */ --const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *, -+const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, const char *attr_name) - { - snd_config_t *attributes, *attr, *token_ref; -@@ -235,7 +235,7 @@ const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *, - } - - /* convert a valid attribute string value to the corresponding tuple value */ --long tplg_class_attribute_valid_tuple_value(struct tplg_pre_processor *, -+long tplg_class_attribute_valid_tuple_value(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, snd_config_t *attr) - { - -diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c -index 48555e7..61cc85f 100644 ---- a/topology/pre-process-object.c -+++ b/topology/pre-process-object.c -@@ -31,7 +31,8 @@ - - /* Parse VendorToken object, create the "SectionVendorToken" and save it */ - int tplg_build_vendor_token_object(struct tplg_pre_processor *tplg_pp, -- snd_config_t *obj_cfg, snd_config_t *) -+ snd_config_t *obj_cfg, -+ snd_config_t *parent ATTRIBUTE_UNUSED) - { - snd_config_iterator_t i, next; - snd_config_t *vtop, *n, *obj; -@@ -196,7 +197,7 @@ int tplg_build_data_object(struct tplg_pre_processor *tplg_pp, snd_config_t *obj - return tplg_parent_update(tplg_pp, parent, "data", name); - } - --static int tplg_create_config_template(struct tplg_pre_processor *, -+static int tplg_create_config_template(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t **template, - const struct config_template_items *items) - { -@@ -499,7 +500,7 @@ min_max_check: - } - - /* get object's name attribute value */ --const char *tplg_object_get_name(struct tplg_pre_processor *, -+const char *tplg_object_get_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *object) - { - snd_config_t *cfg; -@@ -518,7 +519,7 @@ const char *tplg_object_get_name(struct tplg_pre_processor *, - } - - /* look up the instance of object in a config */ --static snd_config_t *tplg_object_lookup_in_config(struct tplg_pre_processor *, -+static snd_config_t *tplg_object_lookup_in_config(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, const char *type, - const char *class_name, const char *id) - { -@@ -977,7 +978,7 @@ template: - } - - static int tplg_build_generic_object(struct tplg_pre_processor *tplg_pp, snd_config_t *obj_cfg, -- snd_config_t *) -+ snd_config_t *parent ATTRIBUTE_UNUSED) - { - snd_config_t *wtop; - const char *name; -@@ -1090,7 +1091,7 @@ const struct build_function_map object_build_map[] = { - NULL, &pcm_caps_config}, - }; - --static const struct build_function_map *tplg_object_get_map(struct tplg_pre_processor *, -+static const struct build_function_map *tplg_object_get_map(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *obj) - { - snd_config_iterator_t first; -@@ -1145,7 +1146,7 @@ snd_config_t *tplg_object_get_section(struct tplg_pre_processor *tplg_pp, snd_co - } - - /* return 1 if attribute not found in search_config, 0 on success and negative value on error */ --static int tplg_object_copy_and_add_param(struct tplg_pre_processor *, -+static int tplg_object_copy_and_add_param(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *obj, - snd_config_t *attr_cfg, - snd_config_t *search_config) -@@ -1351,8 +1352,8 @@ static int tplg_object_pre_process_children(struct tplg_pre_processor *tplg_pp, - return 0; - } - --static int tplg_construct_object_name(struct tplg_pre_processor *, snd_config_t *obj, -- snd_config_t *class_cfg) -+static int tplg_construct_object_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ snd_config_t *obj, snd_config_t *class_cfg) - { - snd_config_iterator_t i, next; - snd_config_t *args, *n; -@@ -1547,7 +1548,7 @@ static int tplg_object_set_unique_attribute(struct tplg_pre_processor *tplg_pp, - * Helper function to get object instance config which is 2 nodes down from class_type config. - * ex: Get the pointer to the config node with ID "0" from the input config Widget.pga.0 {} - */ --snd_config_t *tplg_object_get_instance_config(struct tplg_pre_processor *, -+snd_config_t *tplg_object_get_instance_config(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class_type) - { - snd_config_iterator_t first; -diff --git a/topology/pre-processor.c b/topology/pre-processor.c -index 3903dee..01f8a5d 100644 ---- a/topology/pre-processor.c -+++ b/topology/pre-processor.c -@@ -231,8 +231,9 @@ void tplg_pp_config_debug(struct tplg_pre_processor *tplg_pp, snd_config_t *cfg) - snd_config_save(cfg, tplg_pp->dbg_output); - } - #else --void tplg_pp_debug(char *, ...) {} --void tplg_pp_config_debug(struct tplg_pre_processor *, snd_config_t *){} -+void tplg_pp_debug(char *fmt ATTRIBUTE_UNUSED, ...) {} -+void tplg_pp_config_debug(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ snd_config_t *cfg ATTRIBUTE_UNUSED) {} - #endif - - static int pre_process_config(struct tplg_pre_processor *tplg_pp, snd_config_t *cfg) -@@ -640,8 +641,9 @@ static int pre_process_includes_all(struct tplg_pre_processor *tplg_pp, snd_conf - } - - /* duplicate the existing objects in src into dest and update with new attribute */ --static int pre_process_add_objects(struct tplg_pre_processor *, int *object_count, -- snd_config_t *src, snd_config_t *dest, snd_config_t *attr_cfg) -+static int pre_process_add_objects(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ int *object_count, snd_config_t *src, -+ snd_config_t *dest, snd_config_t *attr_cfg) - { - snd_config_iterator_t i, next; - int ret; --- -2.39.2 - diff --git a/package/alsa-utils/0009-topology-include-locale.h.patch b/package/alsa-utils/0009-topology-include-locale.h.patch deleted file mode 100644 index 14a059cbf6..0000000000 --- a/package/alsa-utils/0009-topology-include-locale.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8c229270f6bae83b705a03714c46067a7aa57b02 Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Tue, 19 Sep 2023 13:14:29 +0200 -Subject: [PATCH] topology: include locale.h - -This solves an issue compiling with the musl libc. - -Fixes: https://github.com/alsa-project/alsa-utils/issues/239 -Signed-off-by: Michael Opdenacker -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/8c229270f6bae83b705a03714c46067a7aa57b02 - -Signed-off-by: Bernd Kuhls ---- - topology/topology.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/topology/topology.c b/topology/topology.c -index 1840ffe..5d03a8b 100644 ---- a/topology/topology.c -+++ b/topology/topology.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.39.2 - diff --git a/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch b/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch deleted file mode 100644 index b5f8489703..0000000000 --- a/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3 Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Tue, 19 Sep 2023 13:14:30 +0200 -Subject: [PATCH] nhlt-dmic-info.c: include sys/types.h - -This fixes an issue compiling with the musl libc. - -Fixes: https://github.com/alsa-project/alsa-utils/issues/238 -Signed-off-by: Michael Opdenacker -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3 - -Signed-off-by: Bernd Kuhls ---- - nhlt/nhlt-dmic-info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/nhlt/nhlt-dmic-info.c b/nhlt/nhlt-dmic-info.c -index 3f6c64d..331555a 100644 ---- a/nhlt/nhlt-dmic-info.c -+++ b/nhlt/nhlt-dmic-info.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - - int debug = 0; --- -2.39.2 - diff --git a/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch b/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch deleted file mode 100644 index 66cf051733..0000000000 --- a/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8a0da6d4484cd2ca4f1939a6c44941e070db2147 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 13 Oct 2023 20:32:32 +0200 -Subject: [PATCH] configure.ac: fix UMP support detection - -https://github.com/alsa-project/alsa-utils/commit/b399fb85a919636b7da34e8bcf17f484dd9046f7 -added usage of alsa/ump_msg.h without checking whether alsa-lib was -compiled with rawmidi support: -https://github.com/alsa-project/alsa-lib/blob/master/include/Makefile.am#L37 - -Fixes a build error when alsa-lib was compiled with --disable-rawmidi - -aplaymidi.c:34:10: fatal error: alsa/ump_msg.h: No such file or directory - 34 | #include - -Upstream: https://github.com/alsa-project/alsa-utils/pull/240 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index beb4963..4217741 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,7 +55,7 @@ if test "$HAVE_SEQ_CLIENT_INFO_GET_PID" = "yes" ; then - AC_DEFINE([HAVE_SEQ_CLIENT_INFO_GET_PID], 1, [alsa-lib supports snd_seq_client_info_get_pid]) - fi - AC_CHECK_LIB([asound], [snd_seq_client_info_get_midi_version], [HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION="yes"]) --if test "$HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION" = "yes" ; then -+if test "$HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION" = "yes" -a "$have_rawmidi" = "yes"; then - AC_DEFINE([HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION], 1, [alsa-lib supports snd_seq_client_info_get_midi_version]) - fi - AC_CHECK_LIB([atopology], [snd_tplg_save], [have_topology="yes"], [have_topology="no"]) --- -2.39.2 - diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index 0ace406286..bf98f578cd 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a alsa-utils-1.2.10.tar.bz2 +sha256 9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7 alsa-utils-1.2.11.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 6f6021400e..3ece7ddca4 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.10 +ALSA_UTILS_VERSION = 1.2.11 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 From yann.morin.1998 at free.fr Sun Feb 11 21:30:29 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:30:29 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-cython: bump to version 3.0.8 In-Reply-To: <20240209175631.1337370-2-james.hilliard1@gmail.com> References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <20240209175631.1337370-2-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > License hash changed due to changing links from http to https: > https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 Thanks for the simple and sufficient explanation. ? > Signed-off-by: James Hilliard > --- [--SNIP--] > diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk > index 47e105c065..d76bfb766d 100644 > --- a/package/python-cython/python-cython.mk > +++ b/package/python-cython/python-cython.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_CYTHON_VERSION = 0.29.36 > +PYTHON_CYTHON_VERSION = 3.0.8 Given there was an earlier discussion about how the cython bump was causing some issues with various packages, I would have expected at least a post-commit summarising what tests were done to ensure the bump was OK. Also, as those same discussions hinted at, cython 0.29 seems to still be in active development (or at least active maintenance), so the commit log should have also explained why it was decided to go with a full bump to 3.0.x rather than intriducing a cython3 package and installing both in parallel. Or that it was not possiblr to do so becaus they can't be installed in parallel. Could you respin this series, fixing the check-package issues in patch 1, and extending the commit log pqtch 2 to better assess the situation, please? Regards, Yann E. MORIN. > PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz > -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 > +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 > PYTHON_CYTHON_SETUP_TYPE = setuptools > PYTHON_CYTHON_LICENSE = Apache-2.0 > PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 21:31:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:31:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpng: bump version to 1.6.42 In-Reply-To: <20240211163116.2318321-1-bernd@kuhls.net> References: <20240211163116.2318321-1-bernd@kuhls.net> Message-ID: <20240211223133.3d6c3247@windsurf> On Sun, 11 Feb 2024 17:31:16 +0100 Bernd Kuhls wrote: > Release notes: > https://raw.githubusercontent.com/pnggroup/libpng/v1.6.42/ANNOUNCE > > Removed patch which disabled pngfix and png-fix-itxt tools and use the > new upstream-provided configure option --disable-tools instead: > https://github.com/pnggroup/libpng/commit/22ad62c25e7355b20d1486da301cb69159db0915 > https://github.com/pnggroup/libpng/commit/71475b064f3e628e55a2f89f55e873945650afe9 > > Updated license hash due to copyright year bump: > https://github.com/pnggroup/libpng/commit/0dfe422e9f872d3a851d52fc45047bdfd6da0cf4 > > Signed-off-by: Bernd Kuhls > --- > ...0001-Disable-pngfix-and-png-fix-itxt.patch | 47 ------------------- > package/libpng/libpng.hash | 6 +-- > package/libpng/libpng.mk | 3 +- > 3 files changed, 5 insertions(+), 51 deletions(-) > delete mode 100644 package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:30:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:30:33 +0100 Subject: [Buildroot] [git commit] package/libpng: bump version to 1.6.42 Message-ID: <20240211213233.06FA887791@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=632d8f25b7a36708cddf9628dfaa92d84acc5151 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://raw.githubusercontent.com/pnggroup/libpng/v1.6.42/ANNOUNCE Removed patch which disabled pngfix and png-fix-itxt tools and use the new upstream-provided configure option --disable-tools instead: https://github.com/pnggroup/libpng/commit/22ad62c25e7355b20d1486da301cb69159db0915 https://github.com/pnggroup/libpng/commit/71475b064f3e628e55a2f89f55e873945650afe9 Updated license hash due to copyright year bump: https://github.com/pnggroup/libpng/commit/0dfe422e9f872d3a851d52fc45047bdfd6da0cf4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-Disable-pngfix-and-png-fix-itxt.patch | 47 ---------------------- package/libpng/libpng.hash | 6 +-- package/libpng/libpng.mk | 3 +- 4 files changed, 5 insertions(+), 52 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index d099fd3761..5948492d07 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -676,7 +676,6 @@ package/liboping/0004-Fix-compile-error-on-GCC-7.patch Upstream package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch Upstream package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch Upstream package/libplatform/0001-cmake-require-c-11-as-the-minimum-standard.patch Upstream -package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch Upstream package/libpthsem/0001-fix-build-on-linux-3.x-host.patch Upstream package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch Upstream package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch Upstream diff --git a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch deleted file mode 100644 index d16bdb2b11..0000000000 --- a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 60c3ee917c8e7a4760b1ef7c3dc2b44a615150d3 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 26 May 2016 16:26:18 -0300 -Subject: [PATCH] Disable pngfix and png-fix-itxt - -Disable the new pngfix and png-fix-itxt tools: they take up space, fail -to build on some oddball toolchain configurations and aren't -expected/needed in a non-interactive embedded system. - -[Julien: update for 1.6.25] -Signed-off-by: Julien Boibessot - -Signed-off-by: Gustavo Zacarias ---- - Makefile.am | 2 +- - Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 7212951..3430dca 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,7 +18,7 @@ check_PROGRAMS += timepng - endif - - # Utilities - installed --bin_PROGRAMS= pngfix png-fix-itxt -+bin_PROGRAMS= - - # This ensures that pnglibconf.h gets built at the start of 'make all' or - # 'make check', but it does not add dependencies to the individual programs, -diff --git a/Makefile.in b/Makefile.in -index a66f6aa..4e67782 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -104,7 +104,7 @@ check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \ - pngstest$(EXEEXT) pngvalid$(EXEEXT) pngimage$(EXEEXT) \ - pngcp$(EXEEXT) $(am__EXEEXT_1) - @HAVE_CLOCK_GETTIME_TRUE at am__append_1 = timepng --bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT) -+bin_PROGRAMS = - @PNG_ARM_NEON_TRUE at am__append_2 = arm/arm_init.c\ - @PNG_ARM_NEON_TRUE@ arm/filter_neon.S arm/filter_neon_intrinsics.c \ - @PNG_ARM_NEON_TRUE@ arm/palette_neon_intrinsics.c --- -2.7.3 - diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index d864850b06..fbae14c51d 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/png-mng/mailman/message/37860896/ -sha256 535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1 libpng-1.6.40.tar.xz +# From https://sourceforge.net/p/png-mng/mailman/message/58731120/ +sha256 c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450 libpng-1.6.42.tar.xz # Locally computed: -sha256 5c0bb4b05b1354ae7c173532b6702ea68b611047ff9b91c4d3af77da39c195d9 LICENSE +sha256 7317e078e2d3b5d7ba5a6159e650945153262b44b76f6700f8e9edb261c5143e LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index b7bacd9217..c4da9f89c7 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.40 +LIBPNG_VERSION = 1.6.42 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) @@ -15,6 +15,7 @@ LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config +LIBPNG_CONF_OPTS = --disable-tools ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon From thomas.petazzoni at bootlin.com Sun Feb 11 21:33:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:33:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/cracklib: python needs autoreconf In-Reply-To: <20240211170707.524645-1-fontaine.fabrice@gmail.com> References: <20240211170707.524645-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223345.2298964c@windsurf> On Sun, 11 Feb 2024 18:07:07 +0100 Fabrice Fontaine wrote: > Set CRACKLIB_AUTORECONF when building python to regenerate > python/test/Makefile and avoid the following build failure with python > 3.12 (which removed imp mpodule) raised since commit > 36e635d2d5c0166476858aa239ccbe78e8f2af14: > > Traceback (most recent call last): > File "", line 2, in > ModuleNotFoundError: No module named 'imp' > make[3]: *** [Makefile:485: install-pythonPYTHON] Error 1 > > Fixes: > - http://autobuild.buildroot.org/results/aec4c19fdf8087c76c1d5f472e855e0f84fcf7fd Thanks for the fix. Could you describe a bit how an autoreconf helps in resolving this? Is it because the new Python comes with a newer set of .m4 macros? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:34:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:34:19 +0100 Subject: [Buildroot] [git commit] package/libpwquality: fix build with python 3.12 Message-ID: <20240211213440.9EF6A87797@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1662a165c6d9762c4e77743ea930dcfa3ffd4cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch from distutils to setuptools to avoid the following build failure raised since bump of python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14: Traceback (most recent call last): File "/home/fabrice/buildroot/output/build/libpwquality-1.4.5/python/setup.py", line 9, in from distutils.core import setup, Extension ModuleNotFoundError: No module named 'distutils' Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Use-setuptools-instead-of-distutils.patch | 78 ++++++++++++++++++++++ package/libpwquality/libpwquality.mk | 6 +- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch b/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 0000000000..4d4e4c8f54 --- /dev/null +++ b/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,78 @@ +From 7b5e0f0097faebdcc6a8b783237bbba7a983147a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Fri, 31 Mar 2023 14:52:19 +0200 +Subject: [PATCH] Use setuptools instead of distutils + +distutils is removed from Python 3.12+: +https://peps.python.org/pep-0632/ + +Upstream: https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a +Signed-off-by: Fabrice Fontaine +--- + libpwquality.spec.in | 11 ++--------- + python/Makefile.am | 2 +- + python/setup.py.in | 6 +++--- + 3 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/libpwquality.spec.in b/libpwquality.spec.in +index 70a6f53..0809126 100644 +--- a/libpwquality.spec.in ++++ b/libpwquality.spec.in +@@ -33,9 +33,11 @@ BuildRequires: gettext + BuildRequires: pam-devel + %if %{with python2} + BuildRequires: python2-devel ++BuildRequires: python2-setuptools + %endif + %if %{with python3} + BuildRequires: python3-devel ++BuildRequires: python3-setuptools + %endif + + URL: https://github.com/libpwquality/libpwquality/ +@@ -103,15 +105,6 @@ cp -a . %{py3dir} + pushd %{py3dir} + %endif + %if %{with python3} +-# setuptools >= 60 changes the environment to use its bundled copy of distutils +-# by default, not the Python-bundled one. To run the Python's standard library +-# distutils, the environment variable must be set. +-# Although technically setuptools is not needed for this package, if it's +-# pulled by another package, it changes the environment and consequently, +-# the build fails. This was reported in: +-# https://github.com/pypa/setuptools/issues/3143 +-export SETUPTOOLS_USE_DISTUTILS=stdlib +- + %configure \ + --with-securedir=%{_moduledir} \ + --with-pythonsitedir=%{python3_sitearch} \ +diff --git a/python/Makefile.am b/python/Makefile.am +index 1d00c0c..6e51744 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} + + clean-local: + rm -rf py$(PYTHONREV) +diff --git a/python/setup.py.in b/python/setup.py.in +index a741b91..f934c50 100755 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -6,9 +6,9 @@ + + import os + +-from distutils.core import setup, Extension +-from distutils.command.build_ext import build_ext as _build_ext +-from distutils.command.sdist import sdist as _sdist ++from setuptools import setup, Extension ++from setuptools.command.build_ext import build_ext as _build_ext ++from setuptools.command.sdist import sdist as _sdist + + def genconstants(headerfile, outputfile): + hf = open(headerfile, 'r') diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index ae6babbcae..f12e583b2d 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -11,11 +11,13 @@ LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING +# We're patching python/Makefile.am +LIBPWQUALITY_AUTORECONF = YES ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += python3 -LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +LIBPWQUALITY_DEPENDENCIES += python3 host-python-setuptools +LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings endif From thomas.petazzoni at bootlin.com Sun Feb 11 21:34:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:34:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpwquality: fix build with python 3.12 In-Reply-To: <20240211172756.704681-1-fontaine.fabrice@gmail.com> References: <20240211172756.704681-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223439.01ab2bb7@windsurf> On Sun, 11 Feb 2024 18:27:56 +0100 Fabrice Fontaine wrote: > Switch from distutils to setuptools to avoid the following build failure > raised since bump of python to version 3.12.1 in commit > 36e635d2d5c0166476858aa239ccbe78e8f2af14: > > Traceback (most recent call last): > File "/home/fabrice/buildroot/output/build/libpwquality-1.4.5/python/setup.py", line 9, in > from distutils.core import setup, Extension > ModuleNotFoundError: No module named 'distutils' > > Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 > No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > ...-Use-setuptools-instead-of-distutils.patch | 78 +++++++++++++++++++ > package/libpwquality/libpwquality.mk | 6 +- > 2 files changed, 82 insertions(+), 2 deletions(-) > create mode 100644 package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:34:55 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:34:55 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 24.0.0 Message-ID: <20240211213616.F06BA877A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad8608df6b95737eb9a93e7335ab714fee45ae1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html https://cgit.freedesktop.org/mesa/mesa/tree/docs/relnotes/24.0.0.rst?h=24.0 Removed patch which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...e_file_description-fix-unknown-linux-3.5-.patch | 68 ---------------------- package/mesa3d/mesa3d.hash | 6 +- package/mesa3d/mesa3d.mk | 2 +- 4 files changed, 5 insertions(+), 73 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index b9b328b268..1d006dbc91 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.3.5 +MESA3D_HEADERS_VERSION = 24.0.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch b/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch deleted file mode 100644 index c011580f6b..0000000000 --- a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b60974fac8a2f4c85cbb2ca788fc4ec3e81998f9 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Tue, 17 Aug 2021 11:54:49 +0200 -Subject: [PATCH] util: os_same_file_description: fix unknown linux < 3.5 - syscall SYS_kcmp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -https://man7.org/linux/man-pages/man2/kcmp.2.html - -The kcmp() system call first appeared in Linux 3.5. - -But was probably also not supported by all major platforms -at that time. So fallback to the check that is done for windows. - -Signed-off-by: Thomas Devoogdt -Acked-by: Yonggang Luo -Acked-by: Michel D??nzer -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/3ef514982441ce496aa127611edd26b9867f4b95 -Signed-off-by: Thomas Devoogdt ---- - src/util/os_file.c | 18 ++++++------------ - 1 file changed, 6 insertions(+), 12 deletions(-) - -diff --git a/src/util/os_file.c b/src/util/os_file.c -index 5fb30f2d908..464425a9b87 100644 ---- a/src/util/os_file.c -+++ b/src/util/os_file.c -@@ -202,29 +202,23 @@ os_read_file(const char *filename, size_t *size) - /* copied from */ - #define KCMP_FILE 0 - -+#endif -+ - int - os_same_file_description(int fd1, int fd2) - { -+#ifdef SYS_kcmp - pid_t pid = getpid(); -+#endif - - /* Same file descriptor trivially implies same file description */ - if (fd1 == fd2) - return 0; - -+#ifdef SYS_kcmp - return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); --} -- - #else -- --int --os_same_file_description(int fd1, int fd2) --{ -- /* Same file descriptor trivially implies same file description */ -- if (fd1 == fd2) -- return 0; -- - /* Otherwise we can't tell */ - return -1; --} -- - #endif -+} --- -2.34.1 - diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 7e49119c41..49b42e2132 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html -sha256 69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f mesa-23.3.5.tar.xz -sha512 1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea mesa-23.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html +sha256 dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 mesa-24.0.0.tar.xz +sha512 9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15 mesa-24.0.0.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d622d513f0..8e3cd7245d 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.3.5 +MESA3D_VERSION = 24.0.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From thomas.petazzoni at bootlin.com Sun Feb 11 21:36:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:36:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 24.0.0 In-Reply-To: <20240211173323.2755976-1-bernd@kuhls.net> References: <20240211173323.2755976-1-bernd@kuhls.net> Message-ID: <20240211223618.7ec20dc6@windsurf> On Sun, 11 Feb 2024 18:33:23 +0100 Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html > https://cgit.freedesktop.org/mesa/mesa/tree/docs/relnotes/24.0.0.rst?h=24.0 > > Removed patch which is included in this release. > > Signed-off-by: Bernd Kuhls > --- > package/mesa3d-headers/mesa3d-headers.mk | 2 +- > ...e_description-fix-unknown-linux-3.5-.patch | 68 ------------------- > package/mesa3d/mesa3d.hash | 6 +- > package/mesa3d/mesa3d.mk | 2 +- > 4 files changed, 5 insertions(+), 73 deletions(-) > delete mode 100644 package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:37:03 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:37:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv3: replace PKG_PYTHON_DISTUTILS_ENV In-Reply-To: <20240211183631.1162846-1-fontaine.fabrice@gmail.com> References: <20240211183631.1162846-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223703.2d5ec6a5@windsurf> On Sun, 11 Feb 2024 19:36:31 +0100 Fabrice Fontaine wrote: > Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV > to avoid an issue with naming of python modules since commit > 09de823cbc7bd50a40e25f4166b4e42be94b0c7b > > Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b > > Signed-off-by: Fabrice Fontaine > --- > package/opencv3/opencv3.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:37:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:37:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv4: replace PKG_PYTHON_DISTUTILS_ENV In-Reply-To: <20240211183813.1164093-1-fontaine.fabrice@gmail.com> References: <20240211183813.1164093-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223706.0199eaa9@windsurf> On Sun, 11 Feb 2024 19:38:13 +0100 Fabrice Fontaine wrote: > Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV > to avoid an issue with naming of python modules since commit > 09de823cbc7bd50a40e25f4166b4e42be94b0c7b > > Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b > > Signed-off-by: Fabrice Fontaine > --- > package/opencv4/opencv4.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:36:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:36:26 +0100 Subject: [Buildroot] [git commit] package/opencv3: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211213756.31664877AE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6444c4278d643f4f315afa3e42d8cce7faf20da4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV to avoid an issue with naming of python modules since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/opencv3/opencv3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 29fb246e65..5064496ca6 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -341,7 +341,7 @@ OPENCV3_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV3_DEPENDENCIES += python3 OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +OPENCV3_CONF_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) OPENCV3_DEPENDENCIES += python-numpy else OPENCV3_CONF_OPTS += \ From thomas.petazzoni at bootlin.com Sun Feb 11 21:36:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:36:56 +0100 Subject: [Buildroot] [git commit] package/opencv4: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211213756.3E7F2877AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d95ad6100036debde5670262ececac336b5f252 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV to avoid an issue with naming of python modules since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/opencv4/opencv4.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index b535761cb2..e50e0f99a9 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -410,7 +410,7 @@ OPENCV4_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV4_DEPENDENCIES += python3 OPENCV4_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -OPENCV4_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +OPENCV4_CONF_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) OPENCV4_DEPENDENCIES += python-numpy else OPENCV4_CONF_OPTS += \ From thomas.petazzoni at bootlin.com Sun Feb 11 21:37:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:37:41 +0100 Subject: [Buildroot] [git commit] package/exim: fix libressl build Message-ID: <20240211213857.0C47C877B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc59cbe4674f9d0f953857edff11cd93d570f360 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following libressl build failure raised since bump to version 4.97 in commit faec3ca30e358575f70a036879029f63f7da9b29 and https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: In file included from tls.c:473: tls-openssl.c: In function 'tls_client_stapling_cb': tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} 2652 | bs->certs | ^~ Fixes: faec3ca30e358575f70a036879029f63f7da9b29 - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/exim/0007-typoes.patch | 58 ++++++++++++++++++++++ ...s-openssl.c-fix-build-with-libressl-3.5.0.patch | 43 ++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/package/exim/0007-typoes.patch b/package/exim/0007-typoes.patch new file mode 100644 index 0000000000..6bbfc9eecd --- /dev/null +++ b/package/exim/0007-typoes.patch @@ -0,0 +1,58 @@ +From caf57fe7eb5018b8df196e6d9f99586232798eb3 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 8 Nov 2023 14:22:37 +0000 +Subject: [PATCH] typoes + +Upstream: https://git.exim.org/exim.git/commit/caf57fe7eb5018b8df196e6d9f99586232798eb3 +Signed-off-by: Fabrice Fontaine +--- + src/src/tls-openssl.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/tls-openssl.c b/src/tls-openssl.c +index 851ac77c5..237303ba9 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -77,9 +77,9 @@ change this guard and punt the issue for a while longer. */ + # define EXIM_HAVE_OPENSSL_KEYLOG + # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID + # define EXIM_HAVE_SESSION_TICKET +-# define EXIM_HAVE_OPESSL_TRACE +-# define EXIM_HAVE_OPESSL_GET0_SERIAL +-# define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS ++# define EXIM_HAVE_OPENSSL_TRACE ++# define EXIM_HAVE_OPENSSL_GET0_SERIAL ++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS + # define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN + # ifndef DISABLE_OCSP + # define EXIM_HAVE_OCSP +@@ -1756,7 +1756,7 @@ level. */ + DEBUG(D_tls) + { + SSL_CTX_set_info_callback(ctx, info_callback); +-#if defined(EXIM_HAVE_OPESSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) ++#if defined(EXIM_HAVE_OPENSSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) + /* this needs a debug build of OpenSSL */ + SSL_CTX_set_msg_callback(ctx, SSL_trace); + #endif +@@ -2442,7 +2442,7 @@ tls_in.ocsp = OCSP_NOT_RESP; + if (!olist) + return SSL_TLSEXT_ERR_NOACK; + +-#ifdef EXIM_HAVE_OPESSL_GET0_SERIAL ++#ifdef EXIM_HAVE_OPENSSL_GET0_SERIAL + { + const X509 * cert_sent = SSL_get_certificate(s); + const ASN1_INTEGER * cert_serial = X509_get0_serialNumber(cert_sent); +@@ -2646,7 +2646,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) + + debug_printf("certs contained in basicresp:\n"); + x509_stack_dump_cert_s_names( +-#ifdef EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS ++#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS + OCSP_resp_get0_certs(bs) + #else + bs->certs +-- +2.30.2 + diff --git a/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..67d96fc1af --- /dev/null +++ b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,43 @@ +From 88f45502272a9a674948204e460ebe90202827d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 11 Feb 2024 21:45:42 +0100 +Subject: [PATCH] src/src/tls-openssl.c: fix build with libressl >= 3.5.0 + +OCSP_BASICRESP is an opaque structure since libressl 3.5.0 and +https://github.com/libressl/openbsd/commit/57442b0028fb09287793f279ee57ebb38e9ab954 +resulting in the following build failure since version 4.97 and +https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: + +In file included from tls.c:473: +tls-openssl.c: In function 'tls_client_stapling_cb': +tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} + 2652 | bs->certs + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d + +Signed-off-by: Fabrice Fontaine +Upstream: https://bugs.exim.org/show_bug.cgi?id=3074 +--- + src/src/tls-openssl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tls-openssl.c b/src/tls-openssl.c +index 237303ba9..c7f94c160 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -98,6 +98,10 @@ change this guard and punt the issue for a while longer. */ + # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID + #endif + ++#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS ++#endif ++ + #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x030000000L) + # define EXIM_HAVE_EXPORT_CHNL_BNGNG + # define EXIM_HAVE_OPENSSL_X509_STORE_GET1_ALL_CERTS +-- +2.43.0 + From thomas.petazzoni at bootlin.com Sun Feb 11 21:38:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:38:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/exim: fix libressl build In-Reply-To: <20240211211022.2003157-1-fontaine.fabrice@gmail.com> References: <20240211211022.2003157-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223858.559fe171@windsurf> On Sun, 11 Feb 2024 22:10:22 +0100 Fabrice Fontaine wrote: > Fix the following libressl build failure raised since bump to version > 4.97 in commit faec3ca30e358575f70a036879029f63f7da9b29 and > https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: > > In file included from tls.c:473: > tls-openssl.c: In function 'tls_client_stapling_cb': > tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} > 2652 | bs->certs > | ^~ > > Fixes: faec3ca30e358575f70a036879029f63f7da9b29 > - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d > > Signed-off-by: Fabrice Fontaine > --- > package/exim/0007-typoes.patch | 58 +++++++++++++++++++ > ...nssl.c-fix-build-with-libressl-3.5.0.patch | 43 ++++++++++++++ > 2 files changed, 101 insertions(+) > create mode 100644 package/exim/0007-typoes.patch > create mode 100644 package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:39:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:39:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdk-pixbuf: fix static build In-Reply-To: <20240211154401.5516-1-fontaine.fabrice@gmail.com> References: <20240211154401.5516-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223944.19730c36@windsurf> On Sun, 11 Feb 2024 16:44:01 +0100 Fabrice Fontaine wrote: > Fix the following static build failure raised, at least, since bump to > version 2.42.10 in commit cd2757bd76d2bc2411e67a27a25b8ab55d40bdb7: > [...] > Fixes: > - http://autobuild.buildroot.org/results/e194d8f90caed7ceefd200d4e40d5fa5b3567d03 > > Signed-off-by: Fabrice Fontaine > --- > ...-pixbuf-meson.build-fix-static-build.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/gdk-pixbuf/0001-gdk-pixbuf-meson.build-fix-static-build.patch I am not sure to fully grasp the issue and the fix, so I was planning on waiting to get some feedback from upstream (hopefully). Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From james.hilliard1 at gmail.com Sun Feb 11 21:39:40 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 14:39:40 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> Message-ID: On Sun, Feb 11, 2024 at 2:24?PM Yann E. MORIN wrote: > > James, All, > > On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > > Add patches from pending upstream pull request which add cython3 > > compatibility. > > We are a little bit cautious at applying random patches that have not > yet been at least reviewd by upstream. In this case, there has not been > any upstream activity since the last release, and not muc before that > either... Well these patches are being used by gentoo so they are not entirely untested in the real world. > > We have no in-tree user of uvloop, so I wonder whether it makes snse to > keep it, espcially since it mau be blocking the bumps of other packages > (like cython 3.x being required by whats-its-name). That's not entirely true, it's a common optional dependency for packages like python-uvicorn for example. > > Plus, see below... > > > Signed-off-by: James Hilliard > > --- > > .../0001-Updates-for-Cython3.patch | 631 ++++++++++++++++++ > > ...ebug-has-args-difference-in-python-3.patch | 30 + > > .../0003-fix-tests-on-python-3.8.patch | 31 + > > .../0004-fix-arg-count-for-wrap.patch | 52 ++ > > 4 files changed, 744 insertions(+) > > create mode 100644 package/python-uvloop/0001-Updates-for-Cython3.patch > > create mode 100644 package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > > create mode 100644 package/python-uvloop/0003-fix-tests-on-python-3.8.patch > > create mode 100644 package/python-uvloop/0004-fix-arg-count-for-wrap.patch > > > > diff --git a/package/python-uvloop/0001-Updates-for-Cython3.patch b/package/python-uvloop/0001-Updates-for-Cython3.patch > > new file mode 100644 > > index 0000000000..b7ef1091ac > > --- /dev/null > > +++ b/package/python-uvloop/0001-Updates-for-Cython3.patch > > @@ -0,0 +1,631 @@ > > +From 087a2983c8022598232cb7ed0a49da334d7af9ff Mon Sep 17 00:00:00 2001 > > +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> > > +Date: Thu, 28 Dec 2023 12:18:15 +0000 > > +Subject: [PATCH] Updates for Cython3 Remove SSL depreciation warnings buillt > > + on debian 12.6 python-3.22 Cython-3.0.7 libuv-1.46.0 > > + > > +Signed-off-by: James Hilliard > > +[Upstream status: > > +https://github.com/MagicStack/uvloop/pull/587] > > $ ./utils/docker-run make check-package > package/python-uvloop/0001-Updates-for-Cython3.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) > package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) > package/python-uvloop/0003-fix-tests-on-python-3.8.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) > package/python-uvloop/0004-fix-arg-count-for-wrap.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) > > Runing check-package is really a trivial thing to do locally before > sending patches, and we've been advertising it for long enough now... Oh, must have forgotten to do that, I usually do run that for anything that's not a version bump. I'll fix and resend. > > Regards, > Yann E. MORIN. > > > +--- > > + Makefile | 2 +- > > + setup.py | 6 ++++-- > > + tests/test_process.py | 4 ++-- > > + tests/test_tcp.py | 19 ++++++++++++------- > > + uvloop/_testbase.py | 4 +++- > > + uvloop/cbhandles.pyx | 4 ++-- > > + uvloop/dns.pyx | 4 ++-- > > + uvloop/handles/basetransport.pxd | 4 ++-- > > + uvloop/handles/basetransport.pyx | 4 ++-- > > + uvloop/handles/handle.pyx | 2 +- > > + uvloop/handles/pipe.pyx | 2 +- > > + uvloop/handles/poll.pxd | 2 +- > > + uvloop/handles/poll.pyx | 2 +- > > + uvloop/handles/stream.pyx | 16 ++++++++++------ > > + uvloop/handles/udp.pyx | 4 ++-- > > + uvloop/includes/consts.pxi | 25 ------------------------- > > + uvloop/includes/fork_handler.h | 6 +++++- > > + uvloop/includes/system.h | 16 ++++++++++++++++ > > + uvloop/includes/system.pxd | 12 ++++-------- > > + uvloop/includes/uv.pxd | 6 +++--- > > + uvloop/loop.pxd | 28 ++++++++++++++++++++++++---- > > + uvloop/loop.pyx | 10 +++++----- > > + uvloop/sslproto.pxd | 4 ++-- > > + uvloop/sslproto.pyx | 4 ++-- > > + 24 files changed, 107 insertions(+), 83 deletions(-) > > + delete mode 100644 uvloop/includes/consts.pxi > > + create mode 100755 uvloop/includes/system.h > > + > > +diff --git a/Makefile b/Makefile > > +index 4375e5d..6a0475a 100644 > > +--- a/Makefile > > ++++ b/Makefile > > +@@ -9,7 +9,7 @@ _default: compile > > + > > + > > + clean: > > +- rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd > > ++ rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd > > + rm -fr uvloop/*.c uvloop/*.html uvloop/*.so > > + rm -fr uvloop/handles/*.html uvloop/includes/*.html > > + find . -name '__pycache__' | xargs rm -rf > > +diff --git a/setup.py b/setup.py > > +index ba15af5..8fdf0e5 100644 > > +--- a/setup.py > > ++++ b/setup.py > > +@@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext > > + from setuptools.command.sdist import sdist > > + > > + > > +-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)' > > ++CYTHON_DEPENDENCY = 'Cython(>=0.29.36)' > > + MACHINE = platform.machine() > > + MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')] > > + _ROOT = pathlib.Path(__file__).parent > > +@@ -144,7 +144,9 @@ class uvloop_build_ext(build_ext): > > + self.distribution.ext_modules[:] = cythonize( > > + self.distribution.ext_modules, > > + compiler_directives=directives, > > +- annotate=self.cython_annotate) > > ++ annotate=self.cython_annotate, > > ++ compile_time_env=dict(DEFAULT_FREELIST_SIZE=250, SSL_READ_MAX_SIZE=256 * 1024), > > ++ emit_linenums=True) > > + > > + super().finalize_options() > > + > > +diff --git a/tests/test_process.py b/tests/test_process.py > > +index bfcbba1..95e1c9e 100644 > > +--- a/tests/test_process.py > > ++++ b/tests/test_process.py > > +@@ -912,7 +912,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): > > + stdin=subprocess.PIPE, > > + stdout=subprocess.PIPE, > > + stderr=subprocess.PIPE, > > +- __uvloop_sleep_after_fork=True)) > > ++ uvloop_sleep_after_fork=True)) > > + self.assertIsNot(transport, None) > > + self.assertEqual(transport.get_returncode(), 0) > > + self.assertEqual( > > +@@ -931,7 +931,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): > > + stdin=None, > > + stdout=subprocess.PIPE, > > + stderr=subprocess.PIPE, > > +- __uvloop_sleep_after_fork=True)) > > ++ uvloop_sleep_after_fork=True)) > > + self.assertIsNot(transport, None) > > + self.assertEqual(transport.get_returncode(), 0) > > + self.assertEqual( > > +diff --git a/tests/test_tcp.py b/tests/test_tcp.py > > +index 812e62b..213e2d9 100644 > > +--- a/tests/test_tcp.py > > ++++ b/tests/test_tcp.py > > +@@ -1630,17 +1630,22 @@ class _TestSSL(tb.SSLTestCase): > > + self.fail("unexpected call to connection_made()") > > + > > + def test_ssl_connect_accepted_socket(self): > > +- if hasattr(ssl, 'PROTOCOL_TLS'): > > +- proto = ssl.PROTOCOL_TLS > > ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): > > ++ server_proto = ssl.PROTOCOL_TLS_SERVER > > ++ client_proto = ssl.PROTOCOL_TLS_CLIENT > > + else: > > +- proto = ssl.PROTOCOL_SSLv23 > > +- server_context = ssl.SSLContext(proto) > > ++ if hasattr(ssl, 'PROTOCOL_TLS'): > > ++ client_proto = server_proto = ssl.PROTOCOL_TLS > > ++ else: > > ++ client_proto = server_proto = ssl.PROTOCOL_SSLv23 > > ++ > > ++ server_context = ssl.SSLContext(server_proto) > > + server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY) > > + if hasattr(server_context, 'check_hostname'): > > + server_context.check_hostname = False > > + server_context.verify_mode = ssl.CERT_NONE > > + > > +- client_context = ssl.SSLContext(proto) > > ++ client_context = ssl.SSLContext(client_proto) > > + if hasattr(server_context, 'check_hostname'): > > + client_context.check_hostname = False > > + client_context.verify_mode = ssl.CERT_NONE > > +@@ -2233,7 +2238,7 @@ class _TestSSL(tb.SSLTestCase): > > + sslctx.use_privatekey_file(self.ONLYKEY) > > + sslctx.use_certificate_chain_file(self.ONLYCERT) > > + client_sslctx = self._create_client_ssl_context() > > +- if hasattr(ssl, 'OP_NO_TLSv1_3'): > > ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): > > + client_sslctx.options |= ssl.OP_NO_TLSv1_3 > > + > > + def server(sock): > > +@@ -2592,7 +2597,7 @@ class _TestSSL(tb.SSLTestCase): > > + sslctx_openssl.use_privatekey_file(self.ONLYKEY) > > + sslctx_openssl.use_certificate_chain_file(self.ONLYCERT) > > + client_sslctx = self._create_client_ssl_context() > > +- if hasattr(ssl, 'OP_NO_TLSv1_3'): > > ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): > > + client_sslctx.options |= ssl.OP_NO_TLSv1_3 > > + > > + future = None > > +diff --git a/uvloop/_testbase.py b/uvloop/_testbase.py > > +index c4a7595..e620e15 100644 > > +--- a/uvloop/_testbase.py > > ++++ b/uvloop/_testbase.py > > +@@ -269,7 +269,9 @@ def find_free_port(start_from=50000): > > + class SSLTestCase: > > + > > + def _create_server_ssl_context(self, certfile, keyfile=None): > > +- if hasattr(ssl, 'PROTOCOL_TLS'): > > ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): > > ++ sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) > > ++ elif hasattr(ssl, 'PROTOCOL_TLS'): > > + sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS) > > + else: > > + sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) > > +diff --git a/uvloop/cbhandles.pyx b/uvloop/cbhandles.pyx > > +index 2914b42..8bcc5aa 100644 > > +--- a/uvloop/cbhandles.pyx > > ++++ b/uvloop/cbhandles.pyx > > +@@ -76,8 +76,8 @@ cdef class Handle: > > + self.arg1, self.arg2, self.arg3, self.arg4) > > + > > + else: > > +- raise RuntimeError('invalid Handle.cb_type: {}'.format( > > +- cb_type)) > > ++ raise RuntimeError('invalid Handle.cb_type: {} {!r}/{!r}'.format( > > ++ cb_type, self.args1, self.args2)) > > + > > + except (KeyboardInterrupt, SystemExit): > > + raise > > +diff --git a/uvloop/dns.pyx b/uvloop/dns.pyx > > +index 7aad631..09b9282 100644 > > +--- a/uvloop/dns.pyx > > ++++ b/uvloop/dns.pyx > > +@@ -298,7 +298,7 @@ cdef class AddrInfo: > > + uv.uv_freeaddrinfo(self.data) # returns void > > + self.data = NULL > > + > > +- cdef void set_data(self, system.addrinfo *data): > > ++ cdef void set_data(self, system.addrinfo *data) noexcept: > > + self.data = data > > + > > + cdef unpack(self): > > +@@ -326,7 +326,7 @@ cdef class AddrInfo: > > + return result > > + > > + @staticmethod > > +- cdef int isinstance(object other): > > ++ cdef int isinstance(object other) noexcept: > > + return type(other) is AddrInfo > > + > > + > > +diff --git a/uvloop/handles/basetransport.pxd b/uvloop/handles/basetransport.pxd > > +index ba356a7..8112622 100644 > > +--- a/uvloop/handles/basetransport.pxd > > ++++ b/uvloop/handles/basetransport.pxd > > +@@ -47,8 +47,8 @@ cdef class UVBaseTransport(UVSocketHandle): > > + # === overloads === > > + > > + cdef _new_socket(self) > > +- cdef size_t _get_write_buffer_size(self) > > ++ cdef size_t _get_write_buffer_size(self) noexcept > > + > > +- cdef bint _is_reading(self) > > ++ cdef bint _is_reading(self) noexcept > > + cdef _start_reading(self) > > + cdef _stop_reading(self) > > +diff --git a/uvloop/handles/basetransport.pyx b/uvloop/handles/basetransport.pyx > > +index 28b3079..a8592f2 100644 > > +--- a/uvloop/handles/basetransport.pyx > > ++++ b/uvloop/handles/basetransport.pyx > > +@@ -18,7 +18,7 @@ cdef class UVBaseTransport(UVSocketHandle): > > + > > + self._closing = 0 > > + > > +- cdef size_t _get_write_buffer_size(self): > > ++ cdef size_t _get_write_buffer_size(self) noexcept: > > + return 0 > > + > > + cdef inline _schedule_call_connection_made(self): > > +@@ -211,7 +211,7 @@ cdef class UVBaseTransport(UVSocketHandle): > > + self._extra_info = {} > > + self._extra_info[name] = obj > > + > > +- cdef bint _is_reading(self): > > ++ cdef bint _is_reading(self) noexcept: > > + raise NotImplementedError > > + > > + cdef _start_reading(self): > > +diff --git a/uvloop/handles/handle.pyx b/uvloop/handles/handle.pyx > > +index 6efe375..2c96458 100644 > > +--- a/uvloop/handles/handle.pyx > > ++++ b/uvloop/handles/handle.pyx > > +@@ -363,7 +363,7 @@ cdef void __uv_close_handle_cb(uv.uv_handle_t* handle) noexcept with gil: > > + Py_DECREF(h) # Was INCREFed in UVHandle._close > > + > > + > > +-cdef void __close_all_handles(Loop loop): > > ++cdef void __close_all_handles(Loop loop) noexcept: > > + uv.uv_walk(loop.uvloop, > > + __uv_walk_close_all_handles_cb, > > + loop) # void > > +diff --git a/uvloop/handles/pipe.pyx b/uvloop/handles/pipe.pyx > > +index 195576c..d30a736 100644 > > +--- a/uvloop/handles/pipe.pyx > > ++++ b/uvloop/handles/pipe.pyx > > +@@ -25,7 +25,7 @@ cdef __pipe_init_uv_handle(UVStream handle, Loop loop): > > + cdef __pipe_open(UVStream handle, int fd): > > + cdef int err > > + err = uv.uv_pipe_open(handle._handle, > > +- fd) > > ++ fd) > > + if err < 0: > > + exc = convert_error(err) > > + raise exc > > +diff --git a/uvloop/handles/poll.pxd b/uvloop/handles/poll.pxd > > +index d07030b..c220540 100644 > > +--- a/uvloop/handles/poll.pxd > > ++++ b/uvloop/handles/poll.pxd > > +@@ -10,7 +10,7 @@ cdef class UVPoll(UVHandle): > > + cdef inline _poll_start(self, int flags) > > + cdef inline _poll_stop(self) > > + > > +- cdef int is_active(self) > > ++ cdef int is_active(self) noexcept > > + > > + cdef is_reading(self) > > + cdef is_writing(self) > > +diff --git a/uvloop/handles/poll.pyx b/uvloop/handles/poll.pyx > > +index fca5981..c905e9b 100644 > > +--- a/uvloop/handles/poll.pyx > > ++++ b/uvloop/handles/poll.pyx > > +@@ -29,7 +29,7 @@ cdef class UVPoll(UVHandle): > > + handle._init(loop, fd) > > + return handle > > + > > +- cdef int is_active(self): > > ++ cdef int is_active(self) noexcept: > > + return (self.reading_handle is not None or > > + self.writing_handle is not None) > > + > > +diff --git a/uvloop/handles/stream.pyx b/uvloop/handles/stream.pyx > > +index d4e02e3..09df887 100644 > > +--- a/uvloop/handles/stream.pyx > > ++++ b/uvloop/handles/stream.pyx > > +@@ -1,4 +1,8 @@ > > +-DEF __PREALLOCED_BUFS = 4 > > ++cdef extern from *: > > ++ ''' > > ++ enum {__PREALLOCED_BUFS = 4}; > > ++ ''' > > ++ const bint __PREALLOCED_BUFS > > + > > + > > + @cython.no_gc_clear > > +@@ -279,7 +283,7 @@ cdef class UVStream(UVBaseTransport): > > + cdef inline _close_on_read_error(self): > > + self.__read_error_close = 1 > > + > > +- cdef bint _is_reading(self): > > ++ cdef bint _is_reading(self) noexcept: > > + return self.__reading > > + > > + cdef _start_reading(self): > > +@@ -578,7 +582,7 @@ cdef class UVStream(UVBaseTransport): > > + > > + self._maybe_resume_protocol() > > + > > +- cdef size_t _get_write_buffer_size(self): > > ++ cdef size_t _get_write_buffer_size(self) noexcept: > > + if self._handle is NULL: > > + return 0 > > + return ((self._handle).write_queue_size + > > +@@ -755,7 +759,7 @@ cdef inline bint __uv_stream_on_read_common( > > + UVStream sc, > > + Loop loop, > > + ssize_t nread, > > +-): > > ++) noexcept: > > + if sc._closed: > > + # The stream was closed, there is no reason to > > + # do any work now. > > +@@ -818,7 +822,7 @@ cdef inline void __uv_stream_on_read_impl( > > + uv.uv_stream_t* stream, > > + ssize_t nread, > > + const uv.uv_buf_t* buf, > > +-): > > ++) noexcept: > > + cdef: > > + UVStream sc = stream.data > > + Loop loop = sc._loop > > +@@ -849,7 +853,7 @@ cdef inline void __uv_stream_on_read_impl( > > + cdef inline void __uv_stream_on_write_impl( > > + uv.uv_write_t* req, > > + int status, > > +-): > > ++) noexcept: > > + cdef: > > + _StreamWriteContext ctx = <_StreamWriteContext> req.data > > + UVStream stream = ctx.stream > > +diff --git a/uvloop/handles/udp.pyx b/uvloop/handles/udp.pyx > > +index bbe60d5..fdd1d8b 100644 > > +--- a/uvloop/handles/udp.pyx > > ++++ b/uvloop/handles/udp.pyx > > +@@ -127,12 +127,12 @@ cdef class UDPTransport(UVBaseTransport): > > + exc = convert_error(err) > > + raise exc > > + > > +- cdef size_t _get_write_buffer_size(self): > > ++ cdef size_t _get_write_buffer_size(self) noexcept: > > + if self._handle is NULL: > > + return 0 > > + return (self._handle).send_queue_size > > + > > +- cdef bint _is_reading(self): > > ++ cdef bint _is_reading(self) noexcept: > > + return self.__receiving > > + > > + cdef _start_reading(self): > > +diff --git a/uvloop/includes/consts.pxi b/uvloop/includes/consts.pxi > > +deleted file mode 100644 > > +index f765053..0000000 > > +--- a/uvloop/includes/consts.pxi > > ++++ /dev/null > > +@@ -1,25 +0,0 @@ > > +-DEF UV_STREAM_RECV_BUF_SIZE = 256000 # 250kb > > +- > > +-DEF FLOW_CONTROL_HIGH_WATER = 64 # KiB > > +-DEF FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB > > +-DEF FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB > > +- > > +-DEF DEFAULT_FREELIST_SIZE = 250 > > +-DEF DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 > > +- > > +-DEF DEBUG_STACK_DEPTH = 10 > > +- > > +- > > +-DEF __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 > > +- > > +- > > +-DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 > > +- > > +- > > +-# Number of seconds to wait for SSL handshake to complete > > +-# The default timeout matches that of Nginx. > > +-DEF SSL_HANDSHAKE_TIMEOUT = 60.0 > > +-# Number of seconds to wait for SSL shutdown to complete > > +-# The default timeout mimics lingering_time > > +-DEF SSL_SHUTDOWN_TIMEOUT = 30.0 > > +-DEF SSL_READ_MAX_SIZE = 256 * 1024 > > +diff --git a/uvloop/includes/fork_handler.h b/uvloop/includes/fork_handler.h > > +index 47bbe03..9d3573a 100644 > > +--- a/uvloop/includes/fork_handler.h > > ++++ b/uvloop/includes/fork_handler.h > > +@@ -1,7 +1,10 @@ > > ++#ifndef UVLOOP_FORK_HANDLER_H_ > > ++#define UVLOOP_FORK_HANDLER_H_ > > ++ > > + volatile uint64_t MAIN_THREAD_ID = 0; > > + volatile int8_t MAIN_THREAD_ID_SET = 0; > > + > > +-typedef void (*OnForkHandler)(); > > ++typedef void (*OnForkHandler)(void); > > + > > + OnForkHandler __forkHandler = NULL; > > + > > +@@ -36,3 +39,4 @@ void setMainThreadID(uint64_t id) { > > + MAIN_THREAD_ID = id; > > + MAIN_THREAD_ID_SET = 1; > > + } > > ++#endif > > +diff --git a/uvloop/includes/system.h b/uvloop/includes/system.h > > +new file mode 100755 > > +index 0000000..e143bb5 > > +--- /dev/null > > ++++ b/uvloop/includes/system.h > > +@@ -0,0 +1,16 @@ > > ++#ifndef UVLOOP_SYSTEM_H_ > > ++#define UVLOOP_SYSTEM_H_ > > ++#if defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER) > > ++#include "Winsock2.h" > > ++#include "ws2def.h" > > ++#include "includes/fork_handler.h" > > ++#else > > ++#include "arpa/inet.h" > > ++#include "sys/socket.h" > > ++#include "sys/un.h" > > ++#include "unistd.h" > > ++#include "pthread.h" > > ++#endif > > ++#endif > > ++ > > ++ > > +diff --git a/uvloop/includes/system.pxd b/uvloop/includes/system.pxd > > +index 367fedd..d1da74e 100644 > > +--- a/uvloop/includes/system.pxd > > ++++ b/uvloop/includes/system.pxd > > +@@ -1,13 +1,9 @@ > > + from libc.stdint cimport int8_t, uint64_t > > + > > +-cdef extern from "arpa/inet.h" nogil: > > +- > > +- int ntohl(int) > > +- int htonl(int) > > +- int ntohs(int) > > +- > > +- > > +-cdef extern from "sys/socket.h" nogil: > > ++cdef extern from "includes/system.h": > > ++ int ntohl(int) nogil > > ++ int htonl(int) nogil > > ++ int ntohs(int) nogil > > + > > + struct sockaddr: > > + unsigned short sa_family > > +diff --git a/uvloop/includes/uv.pxd b/uvloop/includes/uv.pxd > > +index 8765130..ddd9738 100644 > > +--- a/uvloop/includes/uv.pxd > > ++++ b/uvloop/includes/uv.pxd > > +@@ -220,7 +220,7 @@ cdef extern from "uv.h" nogil: > > + UV_LEAVE_GROUP = 0, > > + UV_JOIN_GROUP > > + > > +- cpdef enum uv_fs_event: > > ++ cdef enum uv_fs_event: > > + UV_RENAME = 1, > > + UV_CHANGE = 2 > > + > > +@@ -282,7 +282,7 @@ cdef extern from "uv.h" nogil: > > + int uv_loop_close(uv_loop_t* loop) > > + int uv_loop_alive(uv_loop_t* loop) > > + int uv_loop_fork(uv_loop_t* loop) > > +- int uv_backend_fd(uv_loop_t* loop) > > ++ uv_os_fd_t uv_backend_fd(uv_loop_t* loop) > > + > > + void uv_update_time(uv_loop_t* loop) > > + uint64_t uv_now(const uv_loop_t*) > > +@@ -378,7 +378,7 @@ cdef extern from "uv.h" nogil: > > + # Pipes > > + > > + int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) > > +- int uv_pipe_open(uv_pipe_t* handle, uv_file file) > > ++ int uv_pipe_open(uv_pipe_t* handle, uv_os_fd_t file) > > + int uv_pipe_bind(uv_pipe_t* handle, const char* name) > > + > > + void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, > > +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd > > +index 5613473..f90c704 100644 > > +--- a/uvloop/loop.pxd > > ++++ b/uvloop/loop.pxd > > +@@ -1,15 +1,35 @@ > > + # cython: language_level=3 > > + > > ++cdef extern from *: > > ++ ''' > > ++ enum { UV_STREAM_RECV_BUF_SIZE = 256000, > > ++ SSL_READ_MAX_SIZE = 256 * 1024, // 250kb > > ++ }; > > ++ const float SSL_HANDSHAKE_TIMEOUT = 60.0; // Number of seconds to wait for SSL handshake to complete The default timeout matches that of Nginx. > > ++ const float SSL_SHUTDOWN_TIMEOUT = 30.0; // Number of seconds to wait for SSL shutdown to complete The default timeout mimics lingering_time > > ++ ''' > > ++ const bint UV_STREAM_RECV_BUF_SIZE > > ++ const bint SSL_READ_MAX_SIZE > > ++ > > ++ const float SSL_HANDSHAKE_TIMEOUT > > ++ const float SSL_SHUTDOWN_TIMEOUT > > ++ > > ++cdef enum: > > ++ FLOW_CONTROL_HIGH_WATER = 64 # KiB > > ++ FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB > > ++ FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB > > ++ > > ++ DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 > > ++ DEBUG_STACK_DEPTH = 10 > > ++ __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 > > ++ LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 > > ++ > > + > > + from .includes cimport uv > > + from .includes cimport system > > + > > + from libc.stdint cimport uint64_t, uint32_t, int64_t > > + > > +- > > +-include "includes/consts.pxi" > > +- > > +- > > + cdef extern from *: > > + ctypedef int vint "volatile int" > > + > > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > > +index 334d8d5..53e1160 100644 > > +--- a/uvloop/loop.pyx > > ++++ b/uvloop/loop.pyx > > +@@ -43,7 +43,7 @@ from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer > > + from . import _noop > > + > > + > > +-include "includes/consts.pxi" > > ++ > > + include "includes/stdlib.pxi" > > + > > + include "errors.pyx" > > +@@ -1118,7 +1118,7 @@ cdef class Loop: > > + > > + cdef _sock_set_reuseport(self, int fd): > > + cdef: > > +- int err > > ++ int err = 0 > > + int reuseport_flag = 1 > > + > > + err = system.setsockopt( > > +@@ -1397,7 +1397,7 @@ cdef class Loop: > > + self._debug = bool(enabled) > > + if self.is_running(): > > + self.call_soon_threadsafe( > > +- self._set_coroutine_debug, self, self._debug) > > ++ self._set_coroutine_debug, self._debug) > > + > > + def is_running(self): > > + """Return whether the event loop is currently running.""" > > +@@ -2750,7 +2750,7 @@ cdef class Loop: > > + executable=None, > > + pass_fds=(), > > + # For tests only! Do not use in your code. Ever. > > +- __uvloop_sleep_after_fork=False): > > ++ uvloop_sleep_after_fork=False): > > + > > + # TODO: Implement close_fds (might not be very important in > > + # Python 3.5, since all FDs aren't inheritable by default.) > > +@@ -2770,7 +2770,7 @@ cdef class Loop: > > + if executable is not None: > > + args[0] = executable > > + > > +- if __uvloop_sleep_after_fork: > > ++ if uvloop_sleep_after_fork: > > + debug_flags |= __PROCESS_DEBUG_SLEEP_AFTER_FORK > > + > > + waiter = self._new_future() > > +diff --git a/uvloop/sslproto.pxd b/uvloop/sslproto.pxd > > +index 3da10f0..68e4d57 100644 > > +--- a/uvloop/sslproto.pxd > > ++++ b/uvloop/sslproto.pxd > > +@@ -122,7 +122,7 @@ cdef class SSLProtocol: > > + # Flow control for writes from APP socket > > + > > + cdef _control_app_writing(self, object context=*) > > +- cdef size_t _get_write_buffer_size(self) > > ++ cdef size_t _get_write_buffer_size(self) noexcept > > + cdef _set_write_buffer_limits(self, high=*, low=*) > > + > > + # Flow control for reads to APP socket > > +@@ -134,5 +134,5 @@ cdef class SSLProtocol: > > + > > + cdef _control_ssl_reading(self) > > + cdef _set_read_buffer_limits(self, high=*, low=*) > > +- cdef size_t _get_read_buffer_size(self) > > ++ cdef size_t _get_read_buffer_size(self) noexcept > > + cdef _fatal_error(self, exc, message=*) > > +diff --git a/uvloop/sslproto.pyx b/uvloop/sslproto.pyx > > +index 42bb764..0a43746 100644 > > +--- a/uvloop/sslproto.pyx > > ++++ b/uvloop/sslproto.pyx > > +@@ -861,7 +861,7 @@ cdef class SSLProtocol: > > + 'protocol': self, > > + }) > > + > > +- cdef size_t _get_write_buffer_size(self): > > ++ cdef size_t _get_write_buffer_size(self) noexcept: > > + return self._outgoing.pending + self._write_buffer_size > > + > > + cdef _set_write_buffer_limits(self, high=None, low=None): > > +@@ -903,7 +903,7 @@ cdef class SSLProtocol: > > + self._incoming_high_water = high > > + self._incoming_low_water = low > > + > > +- cdef size_t _get_read_buffer_size(self): > > ++ cdef size_t _get_read_buffer_size(self) noexcept: > > + return self._incoming.pending > > + > > + # Flow control for writes to SSL socket > > +-- > > +2.34.1 > > + > > diff --git a/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > > new file mode 100644 > > index 0000000000..ac6170aff3 > > --- /dev/null > > +++ b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > > @@ -0,0 +1,30 @@ > > +From 8b63801bfdb1f0cf7fde4f58e96f8628a587b186 Mon Sep 17 00:00:00 2001 > > +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> > > +Date: Thu, 28 Dec 2023 16:17:49 +0000 > > +Subject: [PATCH] _set_coroutine_debug has args difference in python 3.11 > > + > > +Signed-off-by: James Hilliard > > +[Upstream status: > > +https://github.com/MagicStack/uvloop/pull/587] > > +--- > > + uvloop/loop.pyx | 3 ++- > > + 1 file changed, 2 insertions(+), 1 deletion(-) > > + > > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > > +index 53e1160..5ca718e 100644 > > +--- a/uvloop/loop.pyx > > ++++ b/uvloop/loop.pyx > > +@@ -1396,8 +1396,9 @@ cdef class Loop: > > + def set_debug(self, enabled): > > + self._debug = bool(enabled) > > + if self.is_running(): > > ++ args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) > > + self.call_soon_threadsafe( > > +- self._set_coroutine_debug, self._debug) > > ++ self._set_coroutine_debug, *args) > > + > > + def is_running(self): > > + """Return whether the event loop is currently running.""" > > +-- > > +2.34.1 > > + > > diff --git a/package/python-uvloop/0003-fix-tests-on-python-3.8.patch b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch > > new file mode 100644 > > index 0000000000..42f04f2241 > > --- /dev/null > > +++ b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch > > @@ -0,0 +1,31 @@ > > +From ef5c3e5c6f331692ebcbea9e4c6aead8b2187038 Mon Sep 17 00:00:00 2001 > > +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> > > +Date: Thu, 28 Dec 2023 19:58:11 +0000 > > +Subject: [PATCH] fix tests on python 3.8 > > + > > +Signed-off-by: James Hilliard > > +[Upstream status: > > +https://github.com/MagicStack/uvloop/pull/587] > > +--- > > + uvloop/loop.pyx | 5 ++--- > > + 1 file changed, 2 insertions(+), 3 deletions(-) > > + > > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > > +index 5ca718e..75b915a 100644 > > +--- a/uvloop/loop.pyx > > ++++ b/uvloop/loop.pyx > > +@@ -1396,9 +1396,8 @@ cdef class Loop: > > + def set_debug(self, enabled): > > + self._debug = bool(enabled) > > + if self.is_running(): > > +- args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) > > +- self.call_soon_threadsafe( > > +- self._set_coroutine_debug, *args) > > ++ args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) > > ++ self.call_soon_threadsafe(self._set_coroutine_debug, *args) > > + > > + def is_running(self): > > + """Return whether the event loop is currently running.""" > > +-- > > +2.34.1 > > + > > diff --git a/package/python-uvloop/0004-fix-arg-count-for-wrap.patch b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch > > new file mode 100644 > > index 0000000000..fe082f4f90 > > --- /dev/null > > +++ b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch > > @@ -0,0 +1,52 @@ > > +From afef6364c2c3100ab23c2bb2de82d2da330b258c Mon Sep 17 00:00:00 2001 > > +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> > > +Date: Fri, 29 Dec 2023 11:24:19 +0000 > > +Subject: [PATCH] fix arg count for wrap() > > + > > +Signed-off-by: James Hilliard > > +[Upstream status: > > +https://github.com/MagicStack/uvloop/pull/587] > > +--- > > + uvloop/loop.pxd | 2 +- > > + uvloop/loop.pyx | 5 ++--- > > + 2 files changed, 3 insertions(+), 4 deletions(-) > > + > > +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd > > +index f90c704..d34ffeb 100644 > > +--- a/uvloop/loop.pxd > > ++++ b/uvloop/loop.pxd > > +@@ -220,7 +220,7 @@ cdef class Loop: > > + cdef inline _ceval_process_signals(self) > > + cdef _invoke_signals(self, bytes data) > > + > > +- cdef _set_coroutine_debug(self, bint enabled) > > ++ cpdef _set_coroutine_debug(self, bint enabled) > > + > > + cdef _print_debug_info(self) > > + > > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > > +index 75b915a..a3eeb60 100644 > > +--- a/uvloop/loop.pyx > > ++++ b/uvloop/loop.pyx > > +@@ -1131,7 +1131,7 @@ cdef class Loop: > > + if err < 0: > > + raise convert_error(-errno.errno) > > + > > +- cdef _set_coroutine_debug(self, bint enabled): > > ++ cpdef _set_coroutine_debug(self, bint enabled): > > + enabled = bool(enabled) > > + if self._coroutine_debug_set == enabled: > > + return > > +@@ -1396,8 +1396,7 @@ cdef class Loop: > > + def set_debug(self, enabled): > > + self._debug = bool(enabled) > > + if self.is_running(): > > +- args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) > > +- self.call_soon_threadsafe(self._set_coroutine_debug, *args) > > ++ self.call_soon_threadsafe(self._set_coroutine_debug, self._debug) > > + > > + def is_running(self): > > + """Return whether the event loop is currently running.""" > > +-- > > +2.34.1 > > + > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 21:40:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:40:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/ghostscript: security bump to version 10.02.1 In-Reply-To: <20240210100928.172584-1-ju.o@free.fr> References: <20240210100928.172584-1-ju.o@free.fr> Message-ID: <20240211224035.69db8394@windsurf> On Sat, 10 Feb 2024 11:09:28 +0100 Julien Olivain wrote: > For release note, see: > https://ghostscript.readthedocs.io/en/gs10.02.1/News.html > > For detailed history, see: > https://git.ghostscript.com/?p=ghostpdl.git;a=shortlog;h=refs/tags/ghostpdl-10.02.1 > > Fixes: > - CVE-2023-46751: > https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-46751 > > Signed-off-by: Julien Olivain > --- > package/ghostscript/ghostscript.hash | 4 ++-- > package/ghostscript/ghostscript.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Sun Feb 11 21:41:24 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:41:24 +0100 Subject: [Buildroot] [git commit] package/tinymembench: drop package Message-ID: <20240211214202.19B13877C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16eec251427b3075d68ea43d7f1395567e2effe4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As advised by Thomas Petazzoni in [1], drop tinymembench which is abandonned (last commit in 2017). Moreover, it raises the following build failure in Thumb mode: /tmp/ccaZHrla.s:40: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' /tmp/ccaZHrla.s:43: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' main.c:45: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode main.c:46: Error: unshifted register required -- `and r8,r7,r2,lsr#16' main.c:47: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode main.c:48: Error: unshifted register required -- `and r9,r6,r2,lsr#8' main.c:49: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240114135446.1156025-1-fontaine.fabrice at gmail.com/ Fixes: - http://autobuild.buildroot.org/results/1e359c294a8d71fb1833e5d04a6bc7d4fd533510 - http://autobuild.buildroot.org/results/c06010d7a2bdb33a1707266133a3880e14be7657 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - Config.in.legacy | 6 +++ DEVELOPERS | 1 - package/Config.in | 1 - ...arm-fix-build-on-Thumb-only-architectures.patch | 47 ---------------------- package/tinymembench/Config.in | 12 ------ package/tinymembench/tinymembench.hash | 3 -- package/tinymembench/tinymembench.mk | 21 ---------- 8 files changed, 6 insertions(+), 86 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 5948492d07..c2e107ce96 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1274,7 +1274,6 @@ package/tinyalsa/0001-include-time.h-before-asound.h.patch Upstream package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch Upstream package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch Upstream package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream -package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch Upstream package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables diff --git a/Config.in.legacy b/Config.in.legacy index 5e0db855cc..a869279af7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_TINYMEMBENCH + bool "tinymembench removed" + select BR2_LEGACY + help + tinymembench has been removed due to being abandoned. + config BR2_PACKAGE_DAVINCI_BOOTCOUNT bool "davinci-bootcount has been renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index d7947821e4..8234d578cf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1062,7 +1062,6 @@ F: package/snort3/ F: package/suricata/ F: package/tinycbor/ F: package/tinydtls/ -F: package/tinymembench/ F: package/whois/ F: package/x11r7/xlib_libXpresent/ F: package/zeek/ diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..bf0fe078b9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -156,7 +156,6 @@ menu "Debugging, profiling and benchmark" source "package/sysdig/Config.in" source "package/sysprof/Config.in" source "package/tcf-agent/Config.in" - source "package/tinymembench/Config.in" source "package/trace-cmd/Config.in" source "package/trinity/Config.in" source "package/uclibc-ng-test/Config.in" diff --git a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch b/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch deleted file mode 100644 index 88559ec012..0000000000 --- a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 034a3552e9700c6d424bd706db106f5bce1f5a5e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 11 Nov 2016 21:49:39 +0100 -Subject: [PATCH] arm: fix build on Thumb-only architectures - -Building tinymembench for ARM Cortex-M currently fails, because the -arm-neon.S file contains ARM code that doesn't build on Thumb-only -architectures. To account for this and fix the build for Cortex-M, -this patch adjusts the compile time condition to also verify that the -architecture supports the ARM instruction set, by testing the -__ARM_ARCH_ISA_ARM compiler define. - -Signed-off-by: Thomas Petazzoni ---- - arm-neon.S | 2 +- - asm-opt.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arm-neon.S b/arm-neon.S -index 4db78ce..19c30ad 100644 ---- a/arm-neon.S -+++ b/arm-neon.S -@@ -21,7 +21,7 @@ - * DEALINGS IN THE SOFTWARE. - */ - --#ifdef __arm__ -+#if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) - - .text - .fpu neon -diff --git a/asm-opt.c b/asm-opt.c -index 9da4596..eba1183 100644 ---- a/asm-opt.c -+++ b/asm-opt.c -@@ -202,7 +202,7 @@ bench_info *get_asm_framebuffer_benchmarks(void) - return empty; - } - --#elif defined(__arm__) -+#elif defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) - - #include "arm-neon.h" - --- -2.7.4 - diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in deleted file mode 100644 index 8f6e1a2b35..0000000000 --- a/package/tinymembench/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_TINYMEMBENCH - bool "tinymembench" - depends on !BR2_MIPS_NABI32 && !BR2_MIPS_NABI64 - help - Tinymembench is a simple memory benchmark program, which - tries to measure the peak bandwidth of sequential memory - accesses and the latency of random memory accesses. - Bandwidth is measured by running different assembly code for - the aligned memory blocks and attempting different prefetch - strategies. - - https://github.com/ssvb/tinymembench diff --git a/package/tinymembench/tinymembench.hash b/package/tinymembench/tinymembench.hash deleted file mode 100644 index 04dbd30f81..0000000000 --- a/package/tinymembench/tinymembench.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-0.4.tar.gz -sha256 8ba473aced4630aee2808efe17b53e904a9d68a9b3361de491717f9a4e75da39 LICENSE diff --git a/package/tinymembench/tinymembench.mk b/package/tinymembench/tinymembench.mk deleted file mode 100644 index 016d680ce7..0000000000 --- a/package/tinymembench/tinymembench.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# tinymembench -# -################################################################################ - -TINYMEMBENCH_VERSION = 0.4 -TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,v$(TINYMEMBENCH_VERSION)) -TINYMEMBENCH_LICENSE = MIT -TINYMEMBENCH_LICENSE_FILES = LICENSE - -define TINYMEMBENCH_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define TINYMEMBENCH_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/tinymembench \ - $(TARGET_DIR)/usr/bin/tinymembench -endef - -$(eval $(generic-package)) From yann.morin.1998 at free.fr Sun Feb 11 21:42:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:42:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinymembench: drop package In-Reply-To: <20240208195438.89814-1-fontaine.fabrice@gmail.com> References: <20240208195438.89814-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-08 20:54 +0100, Fabrice Fontaine spake thusly: > As advised by Thomas Petazzoni in [1], drop tinymembench which is > abandonned (last commit in 2017). Moreover, it raises the following > build failure in Thumb mode: > > /tmp/ccaZHrla.s:40: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' > /tmp/ccaZHrla.s:43: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' > main.c:45: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode > main.c:46: Error: unshifted register required -- `and r8,r7,r2,lsr#16' > main.c:47: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode > main.c:48: Error: unshifted register required -- `and r9,r6,r2,lsr#8' > main.c:49: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode > > [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240114135446.1156025-1-fontaine.fabrice at gmail.com/ > > Fixes: > - http://autobuild.buildroot.org/results/1e359c294a8d71fb1833e5d04a6bc7d4fd533510 > - http://autobuild.buildroot.org/results/c06010d7a2bdb33a1707266133a3880e14be7657 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > .checkpackageignore | 1 - > Config.in.legacy | 6 +++ > DEVELOPERS | 1 - > package/Config.in | 1 - > ...ix-build-on-Thumb-only-architectures.patch | 47 ------------------- > package/tinymembench/Config.in | 12 ----- > package/tinymembench/tinymembench.hash | 3 -- > package/tinymembench/tinymembench.mk | 21 --------- > 8 files changed, 6 insertions(+), 86 deletions(-) > delete mode 100644 package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch > delete mode 100644 package/tinymembench/Config.in > delete mode 100644 package/tinymembench/tinymembench.hash > delete mode 100644 package/tinymembench/tinymembench.mk > > diff --git a/.checkpackageignore b/.checkpackageignore > index 4a1041a84a..a2b5c14a94 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -1265,7 +1265,6 @@ package/tinyalsa/0001-include-time.h-before-asound.h.patch Upstream > package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch Upstream > package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch Upstream > package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream > -package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch Upstream > package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream > package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream > package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables > diff --git a/Config.in.legacy b/Config.in.legacy > index 5e0db855cc..a869279af7 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,12 @@ endif > > comment "Legacy options removed in 2024.02" > > +config BR2_PACKAGE_TINYMEMBENCH > + bool "tinymembench removed" > + select BR2_LEGACY > + help > + tinymembench has been removed due to being abandoned. > + > config BR2_PACKAGE_DAVINCI_BOOTCOUNT > bool "davinci-bootcount has been renamed" > select BR2_LEGACY > diff --git a/DEVELOPERS b/DEVELOPERS > index eeca05cd94..5632d2771d 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1064,7 +1064,6 @@ F: package/snort3/ > F: package/suricata/ > F: package/tinycbor/ > F: package/tinydtls/ > -F: package/tinymembench/ > F: package/whois/ > F: package/x11r7/xlib_libXpresent/ > F: package/zeek/ > diff --git a/package/Config.in b/package/Config.in > index ee4058155d..ebcc8c2655 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -156,7 +156,6 @@ menu "Debugging, profiling and benchmark" > source "package/sysdig/Config.in" > source "package/sysprof/Config.in" > source "package/tcf-agent/Config.in" > - source "package/tinymembench/Config.in" > source "package/trace-cmd/Config.in" > source "package/trinity/Config.in" > source "package/uclibc-ng-test/Config.in" > diff --git a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch b/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch > deleted file mode 100644 > index 88559ec012..0000000000 > --- a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch > +++ /dev/null > @@ -1,47 +0,0 @@ > -From 034a3552e9700c6d424bd706db106f5bce1f5a5e Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Fri, 11 Nov 2016 21:49:39 +0100 > -Subject: [PATCH] arm: fix build on Thumb-only architectures > - > -Building tinymembench for ARM Cortex-M currently fails, because the > -arm-neon.S file contains ARM code that doesn't build on Thumb-only > -architectures. To account for this and fix the build for Cortex-M, > -this patch adjusts the compile time condition to also verify that the > -architecture supports the ARM instruction set, by testing the > -__ARM_ARCH_ISA_ARM compiler define. > - > -Signed-off-by: Thomas Petazzoni > ---- > - arm-neon.S | 2 +- > - asm-opt.c | 2 +- > - 2 files changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/arm-neon.S b/arm-neon.S > -index 4db78ce..19c30ad 100644 > ---- a/arm-neon.S > -+++ b/arm-neon.S > -@@ -21,7 +21,7 @@ > - * DEALINGS IN THE SOFTWARE. > - */ > - > --#ifdef __arm__ > -+#if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) > - > - .text > - .fpu neon > -diff --git a/asm-opt.c b/asm-opt.c > -index 9da4596..eba1183 100644 > ---- a/asm-opt.c > -+++ b/asm-opt.c > -@@ -202,7 +202,7 @@ bench_info *get_asm_framebuffer_benchmarks(void) > - return empty; > - } > - > --#elif defined(__arm__) > -+#elif defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) > - > - #include "arm-neon.h" > - > --- > -2.7.4 > - > diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in > deleted file mode 100644 > index 8f6e1a2b35..0000000000 > --- a/package/tinymembench/Config.in > +++ /dev/null > @@ -1,12 +0,0 @@ > -config BR2_PACKAGE_TINYMEMBENCH > - bool "tinymembench" > - depends on !BR2_MIPS_NABI32 && !BR2_MIPS_NABI64 > - help > - Tinymembench is a simple memory benchmark program, which > - tries to measure the peak bandwidth of sequential memory > - accesses and the latency of random memory accesses. > - Bandwidth is measured by running different assembly code for > - the aligned memory blocks and attempting different prefetch > - strategies. > - > - https://github.com/ssvb/tinymembench > diff --git a/package/tinymembench/tinymembench.hash b/package/tinymembench/tinymembench.hash > deleted file mode 100644 > index 04dbd30f81..0000000000 > --- a/package/tinymembench/tinymembench.hash > +++ /dev/null > @@ -1,3 +0,0 @@ > -# Locally calculated > -sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-0.4.tar.gz > -sha256 8ba473aced4630aee2808efe17b53e904a9d68a9b3361de491717f9a4e75da39 LICENSE > diff --git a/package/tinymembench/tinymembench.mk b/package/tinymembench/tinymembench.mk > deleted file mode 100644 > index 016d680ce7..0000000000 > --- a/package/tinymembench/tinymembench.mk > +++ /dev/null > @@ -1,21 +0,0 @@ > -################################################################################ > -# > -# tinymembench > -# > -################################################################################ > - > -TINYMEMBENCH_VERSION = 0.4 > -TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,v$(TINYMEMBENCH_VERSION)) > -TINYMEMBENCH_LICENSE = MIT > -TINYMEMBENCH_LICENSE_FILES = LICENSE > - > -define TINYMEMBENCH_BUILD_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) > -endef > - > -define TINYMEMBENCH_INSTALL_TARGET_CMDS > - $(INSTALL) -m 0755 -D $(@D)/tinymembench \ > - $(TARGET_DIR)/usr/bin/tinymembench > -endef > - > -$(eval $(generic-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 11 21:43:00 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:43:00 +0100 Subject: [Buildroot] [git commit] package/libopenssl: security bump to version 3.2.1 Message-ID: <20240211214348.E9E8A877CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce4d278739953c830cea0c017836f26ceabef63a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master And drop the now upstreamed patches. Fixes the following (low severity) issues: - CVE-2023-6129 POLY1305 MAC implementation corrupts vector registers on PowerPC https://www.openssl.org/news/secadv/20240109.txt - CVE-2023-6237 Excessive time spent checking invalid RSA public keys https://www.openssl.org/news/secadv/20240115.txt - CVE-2024-0727 PKCS12 Decoding crashes https://www.openssl.org/news/secadv/20240125.txt Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- ...cv-Fix-mispelling-of-extension-test-macro.patch | 30 ----- ...05-Fix-genstr-genconf-option-in-asn1parse.patch | 42 ------- ...-Harden-asn1-oid-loader-to-invalid-inputs.patch | 122 --------------------- package/libopenssl/libopenssl.hash | 4 +- package/libopenssl/libopenssl.mk | 2 +- 5 files changed, 3 insertions(+), 197 deletions(-) diff --git a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch deleted file mode 100644 index 93b191a61c..0000000000 --- a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001 -From: Grant Nichol -Date: Fri, 22 Dec 2023 23:46:39 -0600 -Subject: [PATCH] riscv: Fix mispelling of extension test macro - -When refactoring the riscv extension test macros, -RISCV_HAS_ZKND_AND_ZKNE was mispelled. - -Upstream: https://github.com/openssl/openssl/pull/23139 -Signed-off-by: Grant Nichol ---- - providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c -index b35b71020e..65adc47d1f 100644 ---- a/providers/implementations/ciphers/cipher_aes_xts_hw.c -+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c -@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \ - # define PROV_CIPHER_HW_select_xts() \ - if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \ - return &aes_xts_rv32i_zbkb_zknd_zkne; \ --if (RISCV_HAS_ZKND_ZKNE()) \ -+if (RISCV_HAS_ZKND_AND_ZKNE()) \ - return &aes_xts_rv32i_zknd_zkne; - # else - /* The generic case */ --- -2.43.0 - diff --git a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch b/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch deleted file mode 100644 index 9fa36d83be..0000000000 --- a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 749fcc0e3ce796474a15d6fac221e57daeacff1e Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Tue, 5 Dec 2023 14:50:01 -0500 -Subject: [PATCH] Fix genstr/genconf option in asn1parse - -At some point the asn1parse applet was changed to default the inform to -PEM, and defalt input file to stdin. Doing so broke the -genstr|conf options, -in that, before we attempt to generate an ASN1 block from the provided -genstr string, we attempt to read a PEM input from stdin. As a result, -this command: -openssl asn1parse -genstr OID:1.2.3.4 -hangs because we are attempting a blocking read on stdin, waiting for -data that never arrives - -Fix it by giving priority to genstr|genconf, such that, if set, will just run -do_generate on that string and exit - -Reviewed-by: Hugo Landau -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/22957) -Upstream: https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e -Signed-off-by: Martin Kurbanov ---- - apps/asn1parse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apps/asn1parse.c b/apps/asn1parse.c -index 097b0cc1ed..6597a6180b 100644 ---- a/apps/asn1parse.c -+++ b/apps/asn1parse.c -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) - - if ((buf = BUF_MEM_new()) == NULL) - goto end; -- if (informat == FORMAT_PEM) { -+ if (genstr == NULL && informat == FORMAT_PEM) { - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { - BIO_printf(bio_err, "Error reading PEM file\n"); - ERR_print_errors(bio_err); --- -2.40.0 - diff --git a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch b/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch deleted file mode 100644 index 299ecbc2ed..0000000000 --- a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch +++ /dev/null @@ -1,122 +0,0 @@ -From a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Tue, 5 Dec 2023 15:24:20 -0500 -Subject: [PATCH] Harden asn1 oid loader to invalid inputs - -In the event that a config file contains this sequence: -======= -openssl_conf = openssl_init - -config_diagnostics = 1 - -[openssl_init] -oid_section = oids - -[oids] -testoid1 = 1.2.3.4.1 -testoid2 = A Very Long OID Name, 1.2.3.4.2 -testoid3 = ,1.2.3.4.3 -====== - -The leading comma in testoid3 can cause a heap buffer overflow, as the -parsing code will move the string pointer back 1 character, thereby -pointing to an invalid memory space - -correct the parser to detect this condition and handle it by treating it -as if the comma doesn't exist (i.e. an empty long oid name) - -Reviewed-by: Hugo Landau -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/22957) -Upstream: https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 -Signed-off-by: Martin Kurbanov ---- - apps/asn1parse.c | 2 +- - crypto/asn1/asn_moid.c | 4 ++++ - test/recipes/04-test_asn1_parse.t | 26 ++++++++++++++++++++++++++ - test/test_asn1_parse.cnf | 12 ++++++++++++ - 4 files changed, 43 insertions(+), 1 deletion(-) - create mode 100644 test/recipes/04-test_asn1_parse.t - create mode 100644 test/test_asn1_parse.cnf - -diff --git a/apps/asn1parse.c b/apps/asn1parse.c -index 6597a6180b..bf62f85947 100644 ---- a/apps/asn1parse.c -+++ b/apps/asn1parse.c -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) - - if ((buf = BUF_MEM_new()) == NULL) - goto end; -- if (genstr == NULL && informat == FORMAT_PEM) { -+ if (genconf == NULL && genstr == NULL && informat == FORMAT_PEM) { - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { - BIO_printf(bio_err, "Error reading PEM file\n"); - ERR_print_errors(bio_err); -diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c -index 6f816307af..1e183f4f18 100644 ---- a/crypto/asn1/asn_moid.c -+++ b/crypto/asn1/asn_moid.c -@@ -67,6 +67,10 @@ static int do_create(const char *value, const char *name) - if (p == NULL) { - ln = name; - ostr = value; -+ } else if (p == value) { -+ /* we started with a leading comma */ -+ ln = name; -+ ostr = p + 1; - } else { - ln = value; - ostr = p + 1; -diff --git a/test/recipes/04-test_asn1_parse.t b/test/recipes/04-test_asn1_parse.t -new file mode 100644 -index 0000000000..f3af436592 ---- /dev/null -+++ b/test/recipes/04-test_asn1_parse.t -@@ -0,0 +1,26 @@ -+#! /usr/bin/env perl -+# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. -+# -+# Licensed under the Apache License 2.0 (the "License"). You may not use -+# this file except in compliance with the License. You can obtain a copy -+# in the file LICENSE in the source distribution or at -+# https://www.openssl.org/source/license.html -+ -+use strict; -+use OpenSSL::Test qw(:DEFAULT srctop_file); -+use OpenSSL::Test::Utils; -+ -+setup("test_asn1_parse"); -+ -+plan tests => 3; -+ -+$ENV{OPENSSL_CONF} = srctop_file("test", "test_asn1_parse.cnf"); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.1'])))); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.2'])))); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.3'])))); -diff --git a/test/test_asn1_parse.cnf b/test/test_asn1_parse.cnf -new file mode 100644 -index 0000000000..5f0305657e ---- /dev/null -+++ b/test/test_asn1_parse.cnf -@@ -0,0 +1,12 @@ -+openssl_conf = openssl_init -+ -+# Comment out the next line to ignore configuration errors -+config_diagnostics = 1 -+ -+[openssl_init] -+oid_section = oids -+ -+[oids] -+testoid1 = 1.2.3.4.1 -+testoid2 = A Very Long OID Name, 1.2.3.4.2 -+testoid3 = ,1.2.3.4.3 --- -2.40.0 - diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 9e09e12461..841d4b4cfd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.2.0.tar.gz.sha256 -sha256 14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e openssl-3.2.0.tar.gz +# From https://www.openssl.org/source/openssl-3.2.1.tar.gz.sha256 +sha256 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 openssl-3.2.1.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 7dc6d93256..feb5026c02 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.2.0 +LIBOPENSSL_VERSION = 3.2.1 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Sun Feb 11 21:44:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:44:07 +0100 Subject: [Buildroot] [PATCH] package/libopenssl: security bump to version 3.2.1 In-Reply-To: <20240208111214.679980-1-peter@korsgaard.com> References: <20240208111214.679980-1-peter@korsgaard.com> Message-ID: Peter, all, On 2024-02-08 12:12 +0100, Peter Korsgaard spake thusly: > And drop the now upstreamed patches. > > Fixes the following (low severity) issues: > > - CVE-2023-6129 POLY1305 MAC implementation corrupts vector registers on > PowerPC > https://www.openssl.org/news/secadv/20240109.txt > > - CVE-2023-6237 Excessive time spent checking invalid RSA public keys > https://www.openssl.org/news/secadv/20240115.txt > > - CVE-2024-0727 PKCS12 Decoding crashes > https://www.openssl.org/news/secadv/20240125.txt > > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...x-mispelling-of-extension-test-macro.patch | 30 ----- > ...x-genstr-genconf-option-in-asn1parse.patch | 42 ------ > ...en-asn1-oid-loader-to-invalid-inputs.patch | 122 ------------------ > package/libopenssl/libopenssl.hash | 4 +- > package/libopenssl/libopenssl.mk | 2 +- > 5 files changed, 3 insertions(+), 197 deletions(-) > delete mode 100644 package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch > delete mode 100644 package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch > delete mode 100644 package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch > > diff --git a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch > deleted file mode 100644 > index 93b191a61c..0000000000 > --- a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001 > -From: Grant Nichol > -Date: Fri, 22 Dec 2023 23:46:39 -0600 > -Subject: [PATCH] riscv: Fix mispelling of extension test macro > - > -When refactoring the riscv extension test macros, > -RISCV_HAS_ZKND_AND_ZKNE was mispelled. > - > -Upstream: https://github.com/openssl/openssl/pull/23139 > -Signed-off-by: Grant Nichol > ---- > - providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c > -index b35b71020e..65adc47d1f 100644 > ---- a/providers/implementations/ciphers/cipher_aes_xts_hw.c > -+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c > -@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \ > - # define PROV_CIPHER_HW_select_xts() \ > - if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \ > - return &aes_xts_rv32i_zbkb_zknd_zkne; \ > --if (RISCV_HAS_ZKND_ZKNE()) \ > -+if (RISCV_HAS_ZKND_AND_ZKNE()) \ > - return &aes_xts_rv32i_zknd_zkne; > - # else > - /* The generic case */ > --- > -2.43.0 > - > diff --git a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch b/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch > deleted file mode 100644 > index 9fa36d83be..0000000000 > --- a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -From 749fcc0e3ce796474a15d6fac221e57daeacff1e Mon Sep 17 00:00:00 2001 > -From: Neil Horman > -Date: Tue, 5 Dec 2023 14:50:01 -0500 > -Subject: [PATCH] Fix genstr/genconf option in asn1parse > - > -At some point the asn1parse applet was changed to default the inform to > -PEM, and defalt input file to stdin. Doing so broke the -genstr|conf options, > -in that, before we attempt to generate an ASN1 block from the provided > -genstr string, we attempt to read a PEM input from stdin. As a result, > -this command: > -openssl asn1parse -genstr OID:1.2.3.4 > -hangs because we are attempting a blocking read on stdin, waiting for > -data that never arrives > - > -Fix it by giving priority to genstr|genconf, such that, if set, will just run > -do_generate on that string and exit > - > -Reviewed-by: Hugo Landau > -Reviewed-by: Tomas Mraz > -(Merged from https://github.com/openssl/openssl/pull/22957) > -Upstream: https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e > -Signed-off-by: Martin Kurbanov > ---- > - apps/asn1parse.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/apps/asn1parse.c b/apps/asn1parse.c > -index 097b0cc1ed..6597a6180b 100644 > ---- a/apps/asn1parse.c > -+++ b/apps/asn1parse.c > -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) > - > - if ((buf = BUF_MEM_new()) == NULL) > - goto end; > -- if (informat == FORMAT_PEM) { > -+ if (genstr == NULL && informat == FORMAT_PEM) { > - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { > - BIO_printf(bio_err, "Error reading PEM file\n"); > - ERR_print_errors(bio_err); > --- > -2.40.0 > - > diff --git a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch b/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch > deleted file mode 100644 > index 299ecbc2ed..0000000000 > --- a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch > +++ /dev/null > @@ -1,122 +0,0 @@ > -From a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 Mon Sep 17 00:00:00 2001 > -From: Neil Horman > -Date: Tue, 5 Dec 2023 15:24:20 -0500 > -Subject: [PATCH] Harden asn1 oid loader to invalid inputs > - > -In the event that a config file contains this sequence: > -======= > -openssl_conf = openssl_init > - > -config_diagnostics = 1 > - > -[openssl_init] > -oid_section = oids > - > -[oids] > -testoid1 = 1.2.3.4.1 > -testoid2 = A Very Long OID Name, 1.2.3.4.2 > -testoid3 = ,1.2.3.4.3 > -====== > - > -The leading comma in testoid3 can cause a heap buffer overflow, as the > -parsing code will move the string pointer back 1 character, thereby > -pointing to an invalid memory space > - > -correct the parser to detect this condition and handle it by treating it > -as if the comma doesn't exist (i.e. an empty long oid name) > - > -Reviewed-by: Hugo Landau > -Reviewed-by: Tomas Mraz > -(Merged from https://github.com/openssl/openssl/pull/22957) > -Upstream: https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 > -Signed-off-by: Martin Kurbanov > ---- > - apps/asn1parse.c | 2 +- > - crypto/asn1/asn_moid.c | 4 ++++ > - test/recipes/04-test_asn1_parse.t | 26 ++++++++++++++++++++++++++ > - test/test_asn1_parse.cnf | 12 ++++++++++++ > - 4 files changed, 43 insertions(+), 1 deletion(-) > - create mode 100644 test/recipes/04-test_asn1_parse.t > - create mode 100644 test/test_asn1_parse.cnf > - > -diff --git a/apps/asn1parse.c b/apps/asn1parse.c > -index 6597a6180b..bf62f85947 100644 > ---- a/apps/asn1parse.c > -+++ b/apps/asn1parse.c > -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) > - > - if ((buf = BUF_MEM_new()) == NULL) > - goto end; > -- if (genstr == NULL && informat == FORMAT_PEM) { > -+ if (genconf == NULL && genstr == NULL && informat == FORMAT_PEM) { > - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { > - BIO_printf(bio_err, "Error reading PEM file\n"); > - ERR_print_errors(bio_err); > -diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c > -index 6f816307af..1e183f4f18 100644 > ---- a/crypto/asn1/asn_moid.c > -+++ b/crypto/asn1/asn_moid.c > -@@ -67,6 +67,10 @@ static int do_create(const char *value, const char *name) > - if (p == NULL) { > - ln = name; > - ostr = value; > -+ } else if (p == value) { > -+ /* we started with a leading comma */ > -+ ln = name; > -+ ostr = p + 1; > - } else { > - ln = value; > - ostr = p + 1; > -diff --git a/test/recipes/04-test_asn1_parse.t b/test/recipes/04-test_asn1_parse.t > -new file mode 100644 > -index 0000000000..f3af436592 > ---- /dev/null > -+++ b/test/recipes/04-test_asn1_parse.t > -@@ -0,0 +1,26 @@ > -+#! /usr/bin/env perl > -+# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. > -+# > -+# Licensed under the Apache License 2.0 (the "License"). You may not use > -+# this file except in compliance with the License. You can obtain a copy > -+# in the file LICENSE in the source distribution or at > -+# https://www.openssl.org/source/license.html > -+ > -+use strict; > -+use OpenSSL::Test qw(:DEFAULT srctop_file); > -+use OpenSSL::Test::Utils; > -+ > -+setup("test_asn1_parse"); > -+ > -+plan tests => 3; > -+ > -+$ENV{OPENSSL_CONF} = srctop_file("test", "test_asn1_parse.cnf"); > -+ > -+ok(run(app(([ 'openssl', 'asn1parse', > -+ '-genstr', 'OID:1.2.3.4.1'])))); > -+ > -+ok(run(app(([ 'openssl', 'asn1parse', > -+ '-genstr', 'OID:1.2.3.4.2'])))); > -+ > -+ok(run(app(([ 'openssl', 'asn1parse', > -+ '-genstr', 'OID:1.2.3.4.3'])))); > -diff --git a/test/test_asn1_parse.cnf b/test/test_asn1_parse.cnf > -new file mode 100644 > -index 0000000000..5f0305657e > ---- /dev/null > -+++ b/test/test_asn1_parse.cnf > -@@ -0,0 +1,12 @@ > -+openssl_conf = openssl_init > -+ > -+# Comment out the next line to ignore configuration errors > -+config_diagnostics = 1 > -+ > -+[openssl_init] > -+oid_section = oids > -+ > -+[oids] > -+testoid1 = 1.2.3.4.1 > -+testoid2 = A Very Long OID Name, 1.2.3.4.2 > -+testoid3 = ,1.2.3.4.3 > --- > -2.40.0 > - > diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash > index 9e09e12461..841d4b4cfd 100644 > --- a/package/libopenssl/libopenssl.hash > +++ b/package/libopenssl/libopenssl.hash > @@ -1,5 +1,5 @@ > -# From https://www.openssl.org/source/openssl-3.2.0.tar.gz.sha256 > -sha256 14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e openssl-3.2.0.tar.gz > +# From https://www.openssl.org/source/openssl-3.2.1.tar.gz.sha256 > +sha256 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 openssl-3.2.1.tar.gz > > # License files > sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt > diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk > index 7dc6d93256..feb5026c02 100644 > --- a/package/libopenssl/libopenssl.mk > +++ b/package/libopenssl/libopenssl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBOPENSSL_VERSION = 3.2.0 > +LIBOPENSSL_VERSION = 3.2.1 > LIBOPENSSL_SITE = https://www.openssl.org/source > LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz > LIBOPENSSL_LICENSE = Apache-2.0 > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 21:46:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:46:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/heimdal: Fix build with autoconf-2.72 In-Reply-To: <20240210103634.3502847-1-bernd@kuhls.net> References: <20240210103634.3502847-1-bernd@kuhls.net> Message-ID: <20240211224621.32d6eb40@windsurf> On Sat, 10 Feb 2024 11:36:34 +0100 Bernd Kuhls wrote: > +-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then > ++if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then Could you provide more details? I don't see the relation ship between this change and the build failure. Also, you're using && while the rest of the test is using -a. And you're testing if the strong is non empty *after* testing if it's different from no. We really need more details. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 11 21:47:51 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 22:47:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/shadow: drop BR2_PACKAGE_SHADOW_UTMPX Message-ID: <20240211214751.2522403-1-fontaine.fabrice@gmail.com> utmpx is not available since bump to version 4.14.3 in commit 8a01774d9897310c00a0945865f5a6d5167dfca3 and https://github.com/shadow-maint/shadow/commit/3be7b9d75a6b73fe24394d7ac1e315d60d45b5ee: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-utmpx Fixes: 8a01774d9897310c00a0945865f5a6d5167dfca3 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 6 ++++++ package/shadow/Config.in | 5 ----- package/shadow/shadow.mk | 6 ------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index a869279af7..576148c4af 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_SHADOW_UTMPX + bool "shadow utmpx removed" + select BR2_LEGACY + help + UTMPX has been dropped by upstream. + config BR2_PACKAGE_TINYMEMBENCH bool "tinymembench removed" select BR2_LEGACY diff --git a/package/shadow/Config.in b/package/shadow/Config.in index e85e5884d2..230271af7d 100644 --- a/package/shadow/Config.in +++ b/package/shadow/Config.in @@ -31,11 +31,6 @@ comment "account-tools-setuid needs a toolchain w/ dynamic library, wchar, local depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -config BR2_PACKAGE_SHADOW_UTMPX - bool "utmpx" - help - Enable loggin in utmpx / wtmpx. - config BR2_PACKAGE_SHADOW_SUBORDINATE_IDS bool "subordinate-ids" help diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 03eb16a3f4..1e7ada6148 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -43,12 +43,6 @@ else SHADOW_CONF_OPTS += --disable-account-tools-setuid endif -ifeq ($(BR2_PACKAGE_SHADOW_UTMPX),y) -SHADOW_CONF_OPTS += --enable-utmpx -else -SHADOW_CONF_OPTS += --disable-utmpx -endif - ifeq ($(BR2_PACKAGE_SHADOW_SUBORDINATE_IDS),y) SHADOW_CONF_OPTS += --enable-subordinate-ids define SHADOW_SUBORDINATE_IDS_PERMISSIONS -- 2.43.0 From thomas.petazzoni at bootlin.com Sun Feb 11 21:48:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:48:36 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add ghostscript runtime test In-Reply-To: <20240209192923.1201371-1-ju.o@free.fr> References: <20240209192923.1201371-1-ju.o@free.fr> Message-ID: <20240211224836.70745fbd@windsurf> On Fri, 9 Feb 2024 20:29:23 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 2 + > .../testing/tests/package/test_ghostscript.py | 48 +++++++++++++++++++ > .../rootfs-overlay/root/document.ps | 9 ++++ > 3 files changed, 59 insertions(+) > create mode 100644 support/testing/tests/package/test_ghostscript.py > create mode 100644 support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:48:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:48:43 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add iozone runtime test In-Reply-To: <20240209193743.1204013-1-ju.o@free.fr> References: <20240209193743.1204013-1-ju.o@free.fr> Message-ID: <20240211224843.36f35b11@windsurf> On Fri, 9 Feb 2024 20:37:43 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 1 + > support/testing/tests/package/test_iozone.py | 22 ++++++++++++++++++++ > 2 files changed, 23 insertions(+) > create mode 100644 support/testing/tests/package/test_iozone.py Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From james.hilliard1 at gmail.com Sun Feb 11 21:49:04 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 14:49:04 -0700 Subject: [Buildroot] [PATCH v2 2/2] package/python-cython: bump to version 3.0.8 In-Reply-To: <20240211214904.89575-1-james.hilliard1@gmail.com> References: <20240211214904.89575-1-james.hilliard1@gmail.com> Message-ID: <20240211214904.89575-2-james.hilliard1@gmail.com> License hash changed due to changing links from http to https: https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 Signed-off-by: James Hilliard --- package/python-cython/python-cython.hash | 6 +++--- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 08ad8f6d84..55e4a6f203 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 a4d0f9fbc9c137f1a88937cd40e8c5ee Cython-0.29.36.tar.gz -sha256 41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f Cython-0.29.36.tar.gz +md5 9f7baaa983e1bd06eaeb4fa0adfc77e5 Cython-3.0.8.tar.gz +sha256 8333423d8fd5765e7cceea3a9985dd1e0a5dfeb2734629e1a2ed2d6233d39de6 Cython-3.0.8.tar.gz # Locally computed sha256 checksums -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt +sha256 9568a2b155e66ac3e0ba1fd80b52b827b9460e6cf6f233125e7cbca8e206ddc3 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 47e105c065..d76bfb766d 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.36 +PYTHON_CYTHON_VERSION = 3.0.8 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -- 2.34.1 From james.hilliard1 at gmail.com Sun Feb 11 21:49:03 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 14:49:03 -0700 Subject: [Buildroot] [PATCH v2 1/2] package/python-uvloop: add support for cython3 Message-ID: <20240211214904.89575-1-james.hilliard1@gmail.com> Add patches from pending upstream pull request which add cython3 compatibility. These patches have been in use by gentoo so they should be have a decent amount of real world testing/usage. See: https://github.com/gentoo/gentoo/commit/cd37f8eb287497af5a30b3c68beafc82412cd88d Signed-off-by: James Hilliard --- Changes v1 -> v2: - fix header for check-package --- .../0001-Updates-for-Cython3.patch | 630 ++++++++++++++++++ ...ebug-has-args-difference-in-python-3.patch | 29 + .../0003-fix-tests-on-python-3.8.patch | 30 + .../0004-fix-arg-count-for-wrap.patch | 51 ++ 4 files changed, 740 insertions(+) create mode 100644 package/python-uvloop/0001-Updates-for-Cython3.patch create mode 100644 package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch create mode 100644 package/python-uvloop/0003-fix-tests-on-python-3.8.patch create mode 100644 package/python-uvloop/0004-fix-arg-count-for-wrap.patch diff --git a/package/python-uvloop/0001-Updates-for-Cython3.patch b/package/python-uvloop/0001-Updates-for-Cython3.patch new file mode 100644 index 0000000000..5ed1c7536f --- /dev/null +++ b/package/python-uvloop/0001-Updates-for-Cython3.patch @@ -0,0 +1,630 @@ +From 087a2983c8022598232cb7ed0a49da334d7af9ff Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 12:18:15 +0000 +Subject: [PATCH] Updates for Cython3 Remove SSL depreciation warnings buillt + on debian 12.6 python-3.22 Cython-3.0.7 libuv-1.46.0 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + Makefile | 2 +- + setup.py | 6 ++++-- + tests/test_process.py | 4 ++-- + tests/test_tcp.py | 19 ++++++++++++------- + uvloop/_testbase.py | 4 +++- + uvloop/cbhandles.pyx | 4 ++-- + uvloop/dns.pyx | 4 ++-- + uvloop/handles/basetransport.pxd | 4 ++-- + uvloop/handles/basetransport.pyx | 4 ++-- + uvloop/handles/handle.pyx | 2 +- + uvloop/handles/pipe.pyx | 2 +- + uvloop/handles/poll.pxd | 2 +- + uvloop/handles/poll.pyx | 2 +- + uvloop/handles/stream.pyx | 16 ++++++++++------ + uvloop/handles/udp.pyx | 4 ++-- + uvloop/includes/consts.pxi | 25 ------------------------- + uvloop/includes/fork_handler.h | 6 +++++- + uvloop/includes/system.h | 16 ++++++++++++++++ + uvloop/includes/system.pxd | 12 ++++-------- + uvloop/includes/uv.pxd | 6 +++--- + uvloop/loop.pxd | 28 ++++++++++++++++++++++++---- + uvloop/loop.pyx | 10 +++++----- + uvloop/sslproto.pxd | 4 ++-- + uvloop/sslproto.pyx | 4 ++-- + 24 files changed, 107 insertions(+), 83 deletions(-) + delete mode 100644 uvloop/includes/consts.pxi + create mode 100755 uvloop/includes/system.h + +diff --git a/Makefile b/Makefile +index 4375e5d..6a0475a 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,7 @@ _default: compile + + + clean: +- rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd ++ rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd + rm -fr uvloop/*.c uvloop/*.html uvloop/*.so + rm -fr uvloop/handles/*.html uvloop/includes/*.html + find . -name '__pycache__' | xargs rm -rf +diff --git a/setup.py b/setup.py +index ba15af5..8fdf0e5 100644 +--- a/setup.py ++++ b/setup.py +@@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext + from setuptools.command.sdist import sdist + + +-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)' ++CYTHON_DEPENDENCY = 'Cython(>=0.29.36)' + MACHINE = platform.machine() + MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')] + _ROOT = pathlib.Path(__file__).parent +@@ -144,7 +144,9 @@ class uvloop_build_ext(build_ext): + self.distribution.ext_modules[:] = cythonize( + self.distribution.ext_modules, + compiler_directives=directives, +- annotate=self.cython_annotate) ++ annotate=self.cython_annotate, ++ compile_time_env=dict(DEFAULT_FREELIST_SIZE=250, SSL_READ_MAX_SIZE=256 * 1024), ++ emit_linenums=True) + + super().finalize_options() + +diff --git a/tests/test_process.py b/tests/test_process.py +index bfcbba1..95e1c9e 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -912,7 +912,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +@@ -931,7 +931,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +diff --git a/tests/test_tcp.py b/tests/test_tcp.py +index 812e62b..213e2d9 100644 +--- a/tests/test_tcp.py ++++ b/tests/test_tcp.py +@@ -1630,17 +1630,22 @@ class _TestSSL(tb.SSLTestCase): + self.fail("unexpected call to connection_made()") + + def test_ssl_connect_accepted_socket(self): +- if hasattr(ssl, 'PROTOCOL_TLS'): +- proto = ssl.PROTOCOL_TLS ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ server_proto = ssl.PROTOCOL_TLS_SERVER ++ client_proto = ssl.PROTOCOL_TLS_CLIENT + else: +- proto = ssl.PROTOCOL_SSLv23 +- server_context = ssl.SSLContext(proto) ++ if hasattr(ssl, 'PROTOCOL_TLS'): ++ client_proto = server_proto = ssl.PROTOCOL_TLS ++ else: ++ client_proto = server_proto = ssl.PROTOCOL_SSLv23 ++ ++ server_context = ssl.SSLContext(server_proto) + server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY) + if hasattr(server_context, 'check_hostname'): + server_context.check_hostname = False + server_context.verify_mode = ssl.CERT_NONE + +- client_context = ssl.SSLContext(proto) ++ client_context = ssl.SSLContext(client_proto) + if hasattr(server_context, 'check_hostname'): + client_context.check_hostname = False + client_context.verify_mode = ssl.CERT_NONE +@@ -2233,7 +2238,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx.use_privatekey_file(self.ONLYKEY) + sslctx.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + def server(sock): +@@ -2592,7 +2597,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx_openssl.use_privatekey_file(self.ONLYKEY) + sslctx_openssl.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + future = None +diff --git a/uvloop/_testbase.py b/uvloop/_testbase.py +index c4a7595..e620e15 100644 +--- a/uvloop/_testbase.py ++++ b/uvloop/_testbase.py +@@ -269,7 +269,9 @@ def find_free_port(start_from=50000): + class SSLTestCase: + + def _create_server_ssl_context(self, certfile, keyfile=None): +- if hasattr(ssl, 'PROTOCOL_TLS'): ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) ++ elif hasattr(ssl, 'PROTOCOL_TLS'): + sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS) + else: + sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) +diff --git a/uvloop/cbhandles.pyx b/uvloop/cbhandles.pyx +index 2914b42..8bcc5aa 100644 +--- a/uvloop/cbhandles.pyx ++++ b/uvloop/cbhandles.pyx +@@ -76,8 +76,8 @@ cdef class Handle: + self.arg1, self.arg2, self.arg3, self.arg4) + + else: +- raise RuntimeError('invalid Handle.cb_type: {}'.format( +- cb_type)) ++ raise RuntimeError('invalid Handle.cb_type: {} {!r}/{!r}'.format( ++ cb_type, self.args1, self.args2)) + + except (KeyboardInterrupt, SystemExit): + raise +diff --git a/uvloop/dns.pyx b/uvloop/dns.pyx +index 7aad631..09b9282 100644 +--- a/uvloop/dns.pyx ++++ b/uvloop/dns.pyx +@@ -298,7 +298,7 @@ cdef class AddrInfo: + uv.uv_freeaddrinfo(self.data) # returns void + self.data = NULL + +- cdef void set_data(self, system.addrinfo *data): ++ cdef void set_data(self, system.addrinfo *data) noexcept: + self.data = data + + cdef unpack(self): +@@ -326,7 +326,7 @@ cdef class AddrInfo: + return result + + @staticmethod +- cdef int isinstance(object other): ++ cdef int isinstance(object other) noexcept: + return type(other) is AddrInfo + + +diff --git a/uvloop/handles/basetransport.pxd b/uvloop/handles/basetransport.pxd +index ba356a7..8112622 100644 +--- a/uvloop/handles/basetransport.pxd ++++ b/uvloop/handles/basetransport.pxd +@@ -47,8 +47,8 @@ cdef class UVBaseTransport(UVSocketHandle): + # === overloads === + + cdef _new_socket(self) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + +- cdef bint _is_reading(self) ++ cdef bint _is_reading(self) noexcept + cdef _start_reading(self) + cdef _stop_reading(self) +diff --git a/uvloop/handles/basetransport.pyx b/uvloop/handles/basetransport.pyx +index 28b3079..a8592f2 100644 +--- a/uvloop/handles/basetransport.pyx ++++ b/uvloop/handles/basetransport.pyx +@@ -18,7 +18,7 @@ cdef class UVBaseTransport(UVSocketHandle): + + self._closing = 0 + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return 0 + + cdef inline _schedule_call_connection_made(self): +@@ -211,7 +211,7 @@ cdef class UVBaseTransport(UVSocketHandle): + self._extra_info = {} + self._extra_info[name] = obj + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + raise NotImplementedError + + cdef _start_reading(self): +diff --git a/uvloop/handles/handle.pyx b/uvloop/handles/handle.pyx +index 6efe375..2c96458 100644 +--- a/uvloop/handles/handle.pyx ++++ b/uvloop/handles/handle.pyx +@@ -363,7 +363,7 @@ cdef void __uv_close_handle_cb(uv.uv_handle_t* handle) noexcept with gil: + Py_DECREF(h) # Was INCREFed in UVHandle._close + + +-cdef void __close_all_handles(Loop loop): ++cdef void __close_all_handles(Loop loop) noexcept: + uv.uv_walk(loop.uvloop, + __uv_walk_close_all_handles_cb, + loop) # void +diff --git a/uvloop/handles/pipe.pyx b/uvloop/handles/pipe.pyx +index 195576c..d30a736 100644 +--- a/uvloop/handles/pipe.pyx ++++ b/uvloop/handles/pipe.pyx +@@ -25,7 +25,7 @@ cdef __pipe_init_uv_handle(UVStream handle, Loop loop): + cdef __pipe_open(UVStream handle, int fd): + cdef int err + err = uv.uv_pipe_open(handle._handle, +- fd) ++ fd) + if err < 0: + exc = convert_error(err) + raise exc +diff --git a/uvloop/handles/poll.pxd b/uvloop/handles/poll.pxd +index d07030b..c220540 100644 +--- a/uvloop/handles/poll.pxd ++++ b/uvloop/handles/poll.pxd +@@ -10,7 +10,7 @@ cdef class UVPoll(UVHandle): + cdef inline _poll_start(self, int flags) + cdef inline _poll_stop(self) + +- cdef int is_active(self) ++ cdef int is_active(self) noexcept + + cdef is_reading(self) + cdef is_writing(self) +diff --git a/uvloop/handles/poll.pyx b/uvloop/handles/poll.pyx +index fca5981..c905e9b 100644 +--- a/uvloop/handles/poll.pyx ++++ b/uvloop/handles/poll.pyx +@@ -29,7 +29,7 @@ cdef class UVPoll(UVHandle): + handle._init(loop, fd) + return handle + +- cdef int is_active(self): ++ cdef int is_active(self) noexcept: + return (self.reading_handle is not None or + self.writing_handle is not None) + +diff --git a/uvloop/handles/stream.pyx b/uvloop/handles/stream.pyx +index d4e02e3..09df887 100644 +--- a/uvloop/handles/stream.pyx ++++ b/uvloop/handles/stream.pyx +@@ -1,4 +1,8 @@ +-DEF __PREALLOCED_BUFS = 4 ++cdef extern from *: ++ ''' ++ enum {__PREALLOCED_BUFS = 4}; ++ ''' ++ const bint __PREALLOCED_BUFS + + + @cython.no_gc_clear +@@ -279,7 +283,7 @@ cdef class UVStream(UVBaseTransport): + cdef inline _close_on_read_error(self): + self.__read_error_close = 1 + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__reading + + cdef _start_reading(self): +@@ -578,7 +582,7 @@ cdef class UVStream(UVBaseTransport): + + self._maybe_resume_protocol() + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return ((self._handle).write_queue_size + +@@ -755,7 +759,7 @@ cdef inline bint __uv_stream_on_read_common( + UVStream sc, + Loop loop, + ssize_t nread, +-): ++) noexcept: + if sc._closed: + # The stream was closed, there is no reason to + # do any work now. +@@ -818,7 +822,7 @@ cdef inline void __uv_stream_on_read_impl( + uv.uv_stream_t* stream, + ssize_t nread, + const uv.uv_buf_t* buf, +-): ++) noexcept: + cdef: + UVStream sc = stream.data + Loop loop = sc._loop +@@ -849,7 +853,7 @@ cdef inline void __uv_stream_on_read_impl( + cdef inline void __uv_stream_on_write_impl( + uv.uv_write_t* req, + int status, +-): ++) noexcept: + cdef: + _StreamWriteContext ctx = <_StreamWriteContext> req.data + UVStream stream = ctx.stream +diff --git a/uvloop/handles/udp.pyx b/uvloop/handles/udp.pyx +index bbe60d5..fdd1d8b 100644 +--- a/uvloop/handles/udp.pyx ++++ b/uvloop/handles/udp.pyx +@@ -127,12 +127,12 @@ cdef class UDPTransport(UVBaseTransport): + exc = convert_error(err) + raise exc + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return (self._handle).send_queue_size + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__receiving + + cdef _start_reading(self): +diff --git a/uvloop/includes/consts.pxi b/uvloop/includes/consts.pxi +deleted file mode 100644 +index f765053..0000000 +--- a/uvloop/includes/consts.pxi ++++ /dev/null +@@ -1,25 +0,0 @@ +-DEF UV_STREAM_RECV_BUF_SIZE = 256000 # 250kb +- +-DEF FLOW_CONTROL_HIGH_WATER = 64 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB +- +-DEF DEFAULT_FREELIST_SIZE = 250 +-DEF DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 +- +-DEF DEBUG_STACK_DEPTH = 10 +- +- +-DEF __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 +- +- +-DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 +- +- +-# Number of seconds to wait for SSL handshake to complete +-# The default timeout matches that of Nginx. +-DEF SSL_HANDSHAKE_TIMEOUT = 60.0 +-# Number of seconds to wait for SSL shutdown to complete +-# The default timeout mimics lingering_time +-DEF SSL_SHUTDOWN_TIMEOUT = 30.0 +-DEF SSL_READ_MAX_SIZE = 256 * 1024 +diff --git a/uvloop/includes/fork_handler.h b/uvloop/includes/fork_handler.h +index 47bbe03..9d3573a 100644 +--- a/uvloop/includes/fork_handler.h ++++ b/uvloop/includes/fork_handler.h +@@ -1,7 +1,10 @@ ++#ifndef UVLOOP_FORK_HANDLER_H_ ++#define UVLOOP_FORK_HANDLER_H_ ++ + volatile uint64_t MAIN_THREAD_ID = 0; + volatile int8_t MAIN_THREAD_ID_SET = 0; + +-typedef void (*OnForkHandler)(); ++typedef void (*OnForkHandler)(void); + + OnForkHandler __forkHandler = NULL; + +@@ -36,3 +39,4 @@ void setMainThreadID(uint64_t id) { + MAIN_THREAD_ID = id; + MAIN_THREAD_ID_SET = 1; + } ++#endif +diff --git a/uvloop/includes/system.h b/uvloop/includes/system.h +new file mode 100755 +index 0000000..e143bb5 +--- /dev/null ++++ b/uvloop/includes/system.h +@@ -0,0 +1,16 @@ ++#ifndef UVLOOP_SYSTEM_H_ ++#define UVLOOP_SYSTEM_H_ ++#if defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER) ++#include "Winsock2.h" ++#include "ws2def.h" ++#include "includes/fork_handler.h" ++#else ++#include "arpa/inet.h" ++#include "sys/socket.h" ++#include "sys/un.h" ++#include "unistd.h" ++#include "pthread.h" ++#endif ++#endif ++ ++ +diff --git a/uvloop/includes/system.pxd b/uvloop/includes/system.pxd +index 367fedd..d1da74e 100644 +--- a/uvloop/includes/system.pxd ++++ b/uvloop/includes/system.pxd +@@ -1,13 +1,9 @@ + from libc.stdint cimport int8_t, uint64_t + +-cdef extern from "arpa/inet.h" nogil: +- +- int ntohl(int) +- int htonl(int) +- int ntohs(int) +- +- +-cdef extern from "sys/socket.h" nogil: ++cdef extern from "includes/system.h": ++ int ntohl(int) nogil ++ int htonl(int) nogil ++ int ntohs(int) nogil + + struct sockaddr: + unsigned short sa_family +diff --git a/uvloop/includes/uv.pxd b/uvloop/includes/uv.pxd +index 8765130..ddd9738 100644 +--- a/uvloop/includes/uv.pxd ++++ b/uvloop/includes/uv.pxd +@@ -220,7 +220,7 @@ cdef extern from "uv.h" nogil: + UV_LEAVE_GROUP = 0, + UV_JOIN_GROUP + +- cpdef enum uv_fs_event: ++ cdef enum uv_fs_event: + UV_RENAME = 1, + UV_CHANGE = 2 + +@@ -282,7 +282,7 @@ cdef extern from "uv.h" nogil: + int uv_loop_close(uv_loop_t* loop) + int uv_loop_alive(uv_loop_t* loop) + int uv_loop_fork(uv_loop_t* loop) +- int uv_backend_fd(uv_loop_t* loop) ++ uv_os_fd_t uv_backend_fd(uv_loop_t* loop) + + void uv_update_time(uv_loop_t* loop) + uint64_t uv_now(const uv_loop_t*) +@@ -378,7 +378,7 @@ cdef extern from "uv.h" nogil: + # Pipes + + int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) +- int uv_pipe_open(uv_pipe_t* handle, uv_file file) ++ int uv_pipe_open(uv_pipe_t* handle, uv_os_fd_t file) + int uv_pipe_bind(uv_pipe_t* handle, const char* name) + + void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index 5613473..f90c704 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -1,15 +1,35 @@ + # cython: language_level=3 + ++cdef extern from *: ++ ''' ++ enum { UV_STREAM_RECV_BUF_SIZE = 256000, ++ SSL_READ_MAX_SIZE = 256 * 1024, // 250kb ++ }; ++ const float SSL_HANDSHAKE_TIMEOUT = 60.0; // Number of seconds to wait for SSL handshake to complete The default timeout matches that of Nginx. ++ const float SSL_SHUTDOWN_TIMEOUT = 30.0; // Number of seconds to wait for SSL shutdown to complete The default timeout mimics lingering_time ++ ''' ++ const bint UV_STREAM_RECV_BUF_SIZE ++ const bint SSL_READ_MAX_SIZE ++ ++ const float SSL_HANDSHAKE_TIMEOUT ++ const float SSL_SHUTDOWN_TIMEOUT ++ ++cdef enum: ++ FLOW_CONTROL_HIGH_WATER = 64 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB ++ ++ DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 ++ DEBUG_STACK_DEPTH = 10 ++ __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 ++ LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 ++ + + from .includes cimport uv + from .includes cimport system + + from libc.stdint cimport uint64_t, uint32_t, int64_t + +- +-include "includes/consts.pxi" +- +- + cdef extern from *: + ctypedef int vint "volatile int" + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 334d8d5..53e1160 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -43,7 +43,7 @@ from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer + from . import _noop + + +-include "includes/consts.pxi" ++ + include "includes/stdlib.pxi" + + include "errors.pyx" +@@ -1118,7 +1118,7 @@ cdef class Loop: + + cdef _sock_set_reuseport(self, int fd): + cdef: +- int err ++ int err = 0 + int reuseport_flag = 1 + + err = system.setsockopt( +@@ -1397,7 +1397,7 @@ cdef class Loop: + self._debug = bool(enabled) + if self.is_running(): + self.call_soon_threadsafe( +- self._set_coroutine_debug, self, self._debug) ++ self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +@@ -2750,7 +2750,7 @@ cdef class Loop: + executable=None, + pass_fds=(), + # For tests only! Do not use in your code. Ever. +- __uvloop_sleep_after_fork=False): ++ uvloop_sleep_after_fork=False): + + # TODO: Implement close_fds (might not be very important in + # Python 3.5, since all FDs aren't inheritable by default.) +@@ -2770,7 +2770,7 @@ cdef class Loop: + if executable is not None: + args[0] = executable + +- if __uvloop_sleep_after_fork: ++ if uvloop_sleep_after_fork: + debug_flags |= __PROCESS_DEBUG_SLEEP_AFTER_FORK + + waiter = self._new_future() +diff --git a/uvloop/sslproto.pxd b/uvloop/sslproto.pxd +index 3da10f0..68e4d57 100644 +--- a/uvloop/sslproto.pxd ++++ b/uvloop/sslproto.pxd +@@ -122,7 +122,7 @@ cdef class SSLProtocol: + # Flow control for writes from APP socket + + cdef _control_app_writing(self, object context=*) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + cdef _set_write_buffer_limits(self, high=*, low=*) + + # Flow control for reads to APP socket +@@ -134,5 +134,5 @@ cdef class SSLProtocol: + + cdef _control_ssl_reading(self) + cdef _set_read_buffer_limits(self, high=*, low=*) +- cdef size_t _get_read_buffer_size(self) ++ cdef size_t _get_read_buffer_size(self) noexcept + cdef _fatal_error(self, exc, message=*) +diff --git a/uvloop/sslproto.pyx b/uvloop/sslproto.pyx +index 42bb764..0a43746 100644 +--- a/uvloop/sslproto.pyx ++++ b/uvloop/sslproto.pyx +@@ -861,7 +861,7 @@ cdef class SSLProtocol: + 'protocol': self, + }) + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return self._outgoing.pending + self._write_buffer_size + + cdef _set_write_buffer_limits(self, high=None, low=None): +@@ -903,7 +903,7 @@ cdef class SSLProtocol: + self._incoming_high_water = high + self._incoming_low_water = low + +- cdef size_t _get_read_buffer_size(self): ++ cdef size_t _get_read_buffer_size(self) noexcept: + return self._incoming.pending + + # Flow control for writes to SSL socket +-- +2.34.1 + diff --git a/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch new file mode 100644 index 0000000000..0567eebe82 --- /dev/null +++ b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch @@ -0,0 +1,29 @@ +From 8b63801bfdb1f0cf7fde4f58e96f8628a587b186 Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 16:17:49 +0000 +Subject: [PATCH] _set_coroutine_debug has args difference in python 3.11 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pyx | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 53e1160..5ca718e 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,8 +1396,9 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): ++ args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) + self.call_soon_threadsafe( +- self._set_coroutine_debug, self._debug) ++ self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0003-fix-tests-on-python-3.8.patch b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch new file mode 100644 index 0000000000..e9bed5e877 --- /dev/null +++ b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch @@ -0,0 +1,30 @@ +From ef5c3e5c6f331692ebcbea9e4c6aead8b2187038 Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 19:58:11 +0000 +Subject: [PATCH] fix tests on python 3.8 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pyx | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 5ca718e..75b915a 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,9 +1396,8 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe( +- self._set_coroutine_debug, *args) ++ args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) ++ self.call_soon_threadsafe(self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0004-fix-arg-count-for-wrap.patch b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch new file mode 100644 index 0000000000..d19923a5bc --- /dev/null +++ b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch @@ -0,0 +1,51 @@ +From afef6364c2c3100ab23c2bb2de82d2da330b258c Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Fri, 29 Dec 2023 11:24:19 +0000 +Subject: [PATCH] fix arg count for wrap() + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pxd | 2 +- + uvloop/loop.pyx | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index f90c704..d34ffeb 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -220,7 +220,7 @@ cdef class Loop: + cdef inline _ceval_process_signals(self) + cdef _invoke_signals(self, bytes data) + +- cdef _set_coroutine_debug(self, bint enabled) ++ cpdef _set_coroutine_debug(self, bint enabled) + + cdef _print_debug_info(self) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 75b915a..a3eeb60 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1131,7 +1131,7 @@ cdef class Loop: + if err < 0: + raise convert_error(-errno.errno) + +- cdef _set_coroutine_debug(self, bint enabled): ++ cpdef _set_coroutine_debug(self, bint enabled): + enabled = bool(enabled) + if self._coroutine_debug_set == enabled: + return +@@ -1396,8 +1396,7 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe(self._set_coroutine_debug, *args) ++ self.call_soon_threadsafe(self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + -- 2.34.1 From ju.o at free.fr Sun Feb 11 21:49:35 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 11 Feb 2024 22:49:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: bump to version 3.0.17 Message-ID: <20240211214935.1603160-1-ju.o@free.fr> For commit logs, see: https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ Signed-off-by: Julien Olivain --- package/gnu-efi/gnu-efi.hash | 6 +++--- package/gnu-efi/gnu-efi.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gnu-efi/gnu-efi.hash b/package/gnu-efi/gnu-efi.hash index 251a99e5d7..7d98650991 100644 --- a/package/gnu-efi/gnu-efi.hash +++ b/package/gnu-efi/gnu-efi.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/gnu-efi/files -md5 192d94e995ddd4ebdce4903adfd06039 gnu-efi-3.0.15.tar.bz2 -sha1 40c8a4715cf8c409a093c8d2ca9f5d5b24d73058 gnu-efi-3.0.15.tar.bz2 +md5 832496719182e7d6a4b12bc7c0b534d2 gnu-efi-3.0.17.tar.bz2 +sha1 9715285022124b231520d58b26709f5ab338e981 gnu-efi-3.0.17.tar.bz2 # Locally computed -sha256 931a257b9c5c1ba65ff519f18373c438a26825f2db7866b163e96d1b168f20ea gnu-efi-3.0.15.tar.bz2 +sha256 7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4 gnu-efi-3.0.17.tar.bz2 sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 686a14be01..8b9a6aa4c6 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNU_EFI_VERSION = 3.0.15 +GNU_EFI_VERSION = 3.0.17 GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2 GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi GNU_EFI_INSTALL_STAGING = YES -- 2.43.0 From thomas.petazzoni at bootlin.com Sun Feb 11 21:49:38 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:49:38 +0100 Subject: [Buildroot] [git commit] support/testing: add iozone runtime test Message-ID: <20240211214949.4DD4787804@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e728889e8c8aeab4dde27210e983e295c0e21068 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_iozone.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index caf8a5fb37..26868f74fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1792,6 +1792,7 @@ F: support/testing/tests/package/test_gnuradio/ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf3.py F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py diff --git a/support/testing/tests/package/test_iozone.py b/support/testing/tests/package/test_iozone.py new file mode 100644 index 0000000000..9a9843df56 --- /dev/null +++ b/support/testing/tests/package/test_iozone.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestIozone(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IOZONE=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]) + self.emulator.login() + + self.assertRunOk("iozone -v") + self.assertRunOk("iozone -s64 -r4") From thomas.petazzoni at bootlin.com Sun Feb 11 21:49:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:49:37 +0100 Subject: [Buildroot] [git commit] support/testing: add ghostscript runtime test Message-ID: <20240211214949.4352887803@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72c4c5740d52220669b519f6b76d80b748dc012a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_ghostscript.py | 48 ++++++++++++++++++++++ .../rootfs-overlay/root/document.ps | 9 ++++ 3 files changed, 59 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8234d578cf..caf8a5fb37 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1782,6 +1782,8 @@ F: support/testing/tests/package/test_fluidsynth.py F: support/testing/tests/package/test_fluidsynth/ F: support/testing/tests/package/test_fping.py F: support/testing/tests/package/test_gawk.py +F: support/testing/tests/package/test_ghostscript.py +F: support/testing/tests/package/test_ghostscript/ F: support/testing/tests/package/test_glslsandbox_player.py F: support/testing/tests/package/test_glslsandbox_player/ F: support/testing/tests/package/test_gnupg2.py diff --git a/support/testing/tests/package/test_ghostscript.py b/support/testing/tests/package/test_ghostscript.py new file mode 100644 index 0000000000..3c6c16ef2c --- /dev/null +++ b/support/testing/tests/package/test_ghostscript.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestGhostscript(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_ghostscript/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_GHOSTSCRIPT=y + BR2_PACKAGE_TESSERACT_OCR=y + BR2_PACKAGE_TESSERACT_OCR_LANG_ENG=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("gs --version") + + doc_basename = "document" + ps_file = doc_basename + ".ps" + pgm_file = doc_basename + ".pgm" + txt_file = doc_basename + ".txt" + + # Render a basic PostScript file to an image file. + cmd = "gs -dSAFER -dBATCH -dNOPAUSE -sDEVICE=pgmraw -r150" + cmd += f" -dTextAlphaBits=4 -sOutputFile='{pgm_file}' {ps_file}" + self.assertRunOk(cmd) + + # Run text recognition on the image file. + cmd = f"tesseract {pgm_file} {doc_basename}" + self.assertRunOk(cmd, timeout=30) + + # Check we extracted the expected string from the input + # PostScript file. + cmd = f"cat {txt_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello Buildroot!") diff --git a/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps b/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps new file mode 100644 index 0000000000..5ca2b3581f --- /dev/null +++ b/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps @@ -0,0 +1,9 @@ +%!PS +% See: PostScript: Language Reference, third edition +% Example 5.1, page 314 +% https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf +/Helvetica findfont +16 scalefont setfont +54 720 moveto +(Hello Buildroot!) show +showpage From thomas.petazzoni at bootlin.com Sun Feb 11 21:49:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:49:36 +0100 Subject: [Buildroot] [git commit] package/ghostscript: security bump to version 10.02.1 Message-ID: <20240211214949.38A2F87802@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c456fefb9120ef9a9580b1a97d6fd67b90a42a82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For release note, see: https://ghostscript.readthedocs.io/en/gs10.02.1/News.html For detailed history, see: https://git.ghostscript.com/?p=ghostpdl.git;a=shortlog;h=refs/tags/ghostpdl-10.02.1 Fixes: - CVE-2023-46751: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-46751 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ghostscript/ghostscript.hash | 4 ++-- package/ghostscript/ghostscript.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 77c8faccbe..849f6c64ba 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10020/SHA512SUMS -sha512 c49344151063e915add55a0a842c2a645d8362a5cbca663bd07638f4bd3699a08cade37a9efe905ad5a41e014353e5e1b1268b7925e43128ad30d5b031396b71 ghostscript-10.02.0.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10021/SHA512SUMS +sha512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11 ghostscript-10.02.1.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 161521f970..da23ebbadb 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.02.0 +GHOSTSCRIPT_VERSION = 10.02.1 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 From yann.morin.1998 at free.fr Sun Feb 11 21:57:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:57:51 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-11 14:39 -0700, James Hilliard spake thusly: > On Sun, Feb 11, 2024 at 2:24?PM Yann E. MORIN wrote: > > On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > > > Add patches from pending upstream pull request which add cython3 > > > compatibility. > > We are a little bit cautious at applying random patches that have not > > yet been at least reviewd by upstream. In this case, there has not been > > any upstream activity since the last release, and not muc before that > > either... > Well these patches are being used by gentoo so they are not entirely > untested in the real world. It's not that they are tested or not. It is about whether they'll have a chance to be accepted upstream, or whether we'll have to carry and maintain them forever in Buildroot. Maybe it's time that someone pings upstream about that PR? > > We have no in-tree user of uvloop, so I wonder whether it makes snse to > > keep it, espcially since it mau be blocking the bumps of other packages > > (like cython 3.x being required by whats-its-name). > That's not entirely true, it's a common optional dependency for packages > like python-uvicorn for example. $ git grep -i -E python.uvloop would turn only python-uvloop itself, and its runtime test. If it is only optional, and prevents us from updating unless we apply non-upstreamable patches, then I'd argue we should drop it. [--SNIP--] > I'll fix and resend. Thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 11 22:02:22 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 23:02:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack2: fix build with python 3.12 Message-ID: <20240211220223.2819553-1-fontaine.fabrice@gmail.com> Fix the following build failure with python 3.12 (which removed imp module): Traceback (most recent call last): File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/./waf", line 166, in from waflib import Scripting File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Scripting.py", line 10, in from waflib import Utils, Configure, Logs, Options, ConfigSet, Context, Errors, Build, Node File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Configure.py", line 16, in from waflib import ConfigSet, Utils, Options, Logs, Context, Build, Errors File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Options.py", line 14, in from waflib import Logs, Utils, Context, Errors File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Context.py", line 9, in import os, re, imp, sys ModuleNotFoundError: No module named 'imp' Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 - http://autobuild.buildroot.org/results/1bfe34e10ffdab80647ac01863165e93bcc9b0d8 Signed-off-by: Fabrice Fontaine --- package/jack2/0001-Update-to-waf-2-0-26.patch | 3480 +++++++++++++++++ 1 file changed, 3480 insertions(+) create mode 100644 package/jack2/0001-Update-to-waf-2-0-26.patch diff --git a/package/jack2/0001-Update-to-waf-2-0-26.patch b/package/jack2/0001-Update-to-waf-2-0-26.patch new file mode 100644 index 0000000000..8471de09bc --- /dev/null +++ b/package/jack2/0001-Update-to-waf-2-0-26.patch @@ -0,0 +1,3480 @@ +From 553ca1e649293ef87e96dd3e7621fd87e0b59986 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Tue, 29 Aug 2023 12:41:46 +0200 +Subject: [PATCH] Update to waf 2.0.26 + +This makes waf compatible with Python 3.12 again. + +Also, apply modifications needed for MacOS and add as a patch file (see +commits 0f2e3b2 and dc6c995). + +Signed-off-by: Nils Philippsen + +Upstream: https://github.com/jackaudio/jack2/pull/953/commits/553ca1e649293ef87e96dd3e7621fd87e0b59986 +Signed-off-by: Fabrice Fontaine +--- + waf | 7 +- + waflib-macos-mods.patch | 18 + + waflib/Build.py | 47 +- + waflib/ConfigSet.py | 2 +- + waflib/Configure.py | 46 +- + waflib/Context.py | 24 +- + waflib/Logs.py | 9 +- + waflib/Node.py | 3 +- + waflib/Options.py | 31 +- + waflib/Runner.py | 27 +- + waflib/Scripting.py | 27 +- + waflib/Task.py | 48 ++- + waflib/TaskGen.py | 16 +- + waflib/Tools/c_aliases.py | 10 +- + waflib/Tools/c_config.py | 37 +- + waflib/Tools/c_preproc.py | 6 +- + waflib/Tools/c_tests.py | 18 +- + waflib/Tools/ccroot.py | 20 +- + waflib/Tools/compiler_c.py | 25 +- + waflib/Tools/compiler_cxx.py | 25 +- + waflib/Tools/irixcc.py | 14 +- + waflib/Tools/msvc.py | 45 +- + waflib/Tools/waf_unit_test.py | 14 +- + waflib/Utils.py | 60 ++- + waflib/ansiterm.py | 2 +- + waflib/extras/clang_cross.py | 92 ++++ + waflib/extras/clang_cross_common.py | 113 +++++ + waflib/extras/clangxx_cross.py | 106 +++++ + waflib/extras/classic_runner.py | 68 +++ + waflib/extras/color_msvc.py | 59 +++ + waflib/extras/fc_fujitsu.py | 52 +++ + waflib/extras/fc_nfort.py | 52 +++ + waflib/extras/genpybind.py | 194 +++++++++ + waflib/extras/haxe.py | 154 +++++++ + waflib/extras/msvc_pdb.py | 46 ++ + waflib/extras/sphinx.py | 120 ++++++ + waflib/extras/wafcache.py | 648 ++++++++++++++++++++++++++++ + waflib/extras/xcode6.py | 18 +- + waflib/fixpy2.py | 2 +- + waflib/processor.py | 4 + + 40 files changed, 2114 insertions(+), 195 deletions(-) + create mode 100644 waflib-macos-mods.patch + create mode 100644 waflib/extras/clang_cross.py + create mode 100644 waflib/extras/clang_cross_common.py + create mode 100644 waflib/extras/clangxx_cross.py + create mode 100644 waflib/extras/classic_runner.py + create mode 100644 waflib/extras/color_msvc.py + create mode 100644 waflib/extras/fc_fujitsu.py + create mode 100644 waflib/extras/fc_nfort.py + create mode 100644 waflib/extras/genpybind.py + create mode 100644 waflib/extras/haxe.py + create mode 100644 waflib/extras/msvc_pdb.py + create mode 100644 waflib/extras/sphinx.py + create mode 100644 waflib/extras/wafcache.py + +diff --git a/waf b/waf +index 845fba5e9..38b2c9106 100755 +--- a/waf ++++ b/waf +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python + # encoding: latin-1 + # Thomas Nagy, 2005-2018 + # +@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. + + import os, sys, inspect + +-VERSION="2.0.12" ++VERSION="2.0.26" + REVISION="x" + GIT="x" + INSTALL="x" +@@ -142,6 +142,9 @@ def find_lib(): + if name.endswith('waf-light'): + w = test(base) + if w: return w ++ for dir in sys.path: ++ if test(dir): ++ return dir + err('waf-light requires waflib -> export WAFDIR=/folder') + + dirname = '%s-%s-%s' % (WAF, VERSION, REVISION) +diff --git a/waflib-macos-mods.patch b/waflib-macos-mods.patch +new file mode 100644 +index 000000000..9e2c8a3de +--- /dev/null ++++ b/waflib-macos-mods.patch +@@ -0,0 +1,18 @@ ++diff --git a/waflib/Tools/ccroot.py b/waflib/Tools/ccroot.py ++index cfef8bf5..484846f5 100644 ++--- a/waflib/Tools/ccroot.py +++++ b/waflib/Tools/ccroot.py ++@@ -575,12 +575,10 @@ def apply_vnum(self): ++ ++ cnum = getattr(self, 'cnum', str(nums[0])) ++ cnums = cnum.split('.') ++- if len(cnums)>len(nums) or nums[0:len(cnums)] != cnums: ++- raise Errors.WafError('invalid compatibility version %s' % cnum) ++ ++ libname = node.name ++ if libname.endswith('.dylib'): ++- name3 = libname.replace('.dylib', '.%s.dylib' % self.vnum) +++ name3 = libname.replace('.dylib', '.%s.dylib' % cnums[0]) ++ name2 = libname.replace('.dylib', '.%s.dylib' % cnum) ++ else: ++ name3 = libname + '.' + self.vnum +diff --git a/waflib/Build.py b/waflib/Build.py +index c9661df15..b49dd8302 100644 +--- a/waflib/Build.py ++++ b/waflib/Build.py +@@ -104,7 +104,7 @@ def __init__(self, **kw): + """Amount of jobs to run in parallel""" + + self.targets = Options.options.targets +- """List of targets to build (default: \*)""" ++ """List of targets to build (default: \\*)""" + + self.keep = Options.options.keep + """Whether the build should continue past errors""" +@@ -753,10 +753,12 @@ def tgpost(tg): + else: + ln = self.launch_node() + if ln.is_child_of(self.bldnode): +- Logs.warn('Building from the build directory, forcing --targets=*') ++ if Logs.verbose > 1: ++ Logs.warn('Building from the build directory, forcing --targets=*') + ln = self.srcnode + elif not ln.is_child_of(self.srcnode): +- Logs.warn('CWD %s is not under %s, forcing --targets=* (run distclean?)', ln.abspath(), self.srcnode.abspath()) ++ if Logs.verbose > 1: ++ Logs.warn('CWD %s is not under %s, forcing --targets=* (run distclean?)', ln.abspath(), self.srcnode.abspath()) + ln = self.srcnode + + def is_post(tg, ln): +@@ -1054,7 +1056,7 @@ def post_run(self): + def get_install_path(self, destdir=True): + """ + Returns the destination path where files will be installed, pre-pending `destdir`. +- ++ + Relative paths will be interpreted relative to `PREFIX` if no `destdir` is given. + + :rtype: string +@@ -1062,11 +1064,11 @@ def get_install_path(self, destdir=True): + if isinstance(self.install_to, Node.Node): + dest = self.install_to.abspath() + else: +- dest = Utils.subst_vars(self.install_to, self.env) ++ dest = os.path.normpath(Utils.subst_vars(self.install_to, self.env)) + if not os.path.isabs(dest): +- dest = os.path.join(self.env.PREFIX, dest) ++ dest = os.path.join(self.env.PREFIX, dest) + if destdir and Options.options.destdir: +- dest = os.path.join(Options.options.destdir, os.path.splitdrive(dest)[1].lstrip(os.sep)) ++ dest = Options.options.destdir.rstrip(os.sep) + os.sep + os.path.splitdrive(dest)[1].lstrip(os.sep) + return dest + + def copy_fun(self, src, tgt): +@@ -1160,11 +1162,19 @@ def do_install(self, src, tgt, lbl, **kw): + # same size and identical timestamps -> make no copy + if st1.st_mtime + 2 >= st2.st_mtime and st1.st_size == st2.st_size: + if not self.generator.bld.progress_bar: +- Logs.info('- install %s (from %s)', tgt, lbl) ++ ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ ++ Logs.info('%s- install %s%s%s (from %s)', c1, c2, tgt, c1, lbl) + return False + + if not self.generator.bld.progress_bar: +- Logs.info('+ install %s (from %s)', tgt, lbl) ++ ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ ++ Logs.info('%s+ install %s%s%s (from %s)', c1, c2, tgt, c1, lbl) + + # Give best attempt at making destination overwritable, + # like the 'install' utility used by 'make install' does. +@@ -1221,14 +1231,18 @@ def do_link(self, src, tgt, **kw): + """ + if os.path.islink(tgt) and os.readlink(tgt) == src: + if not self.generator.bld.progress_bar: +- Logs.info('- symlink %s (to %s)', tgt, src) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s- symlink %s%s%s (to %s)', c1, c2, tgt, c1, src) + else: + try: + os.remove(tgt) + except OSError: + pass + if not self.generator.bld.progress_bar: +- Logs.info('+ symlink %s (to %s)', tgt, src) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s+ symlink %s%s%s (to %s)', c1, c2, tgt, c1, src) + os.symlink(src, tgt) + self.fix_perms(tgt) + +@@ -1237,7 +1251,9 @@ def do_uninstall(self, src, tgt, lbl, **kw): + See :py:meth:`waflib.Build.inst.do_install` + """ + if not self.generator.bld.progress_bar: +- Logs.info('- remove %s', tgt) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s- remove %s%s%s', c1, c2, tgt, c1) + + #self.uninstall.append(tgt) + try: +@@ -1257,7 +1273,9 @@ def do_unlink(self, src, tgt, **kw): + """ + try: + if not self.generator.bld.progress_bar: +- Logs.info('- remove %s', tgt) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s- remove %s%s%s', c1, c2, tgt, c1) + os.remove(tgt) + except OSError: + pass +@@ -1318,7 +1336,8 @@ def build(bld): + lst = [] + for env in self.all_envs.values(): + lst.extend(self.root.find_or_declare(f) for f in env[CFG_FILES]) +- for n in self.bldnode.ant_glob('**/*', excl='.lock* *conf_check_*/** config.log c4che/*', quiet=True): ++ excluded_dirs = '.lock* *conf_check_*/** config.log %s/*' % CACHE_DIR ++ for n in self.bldnode.ant_glob('**/*', excl=excluded_dirs, quiet=True): + if n in lst: + continue + n.delete() +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index 84736c9c8..901fba6c0 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -11,7 +11,7 @@ + + import copy, re, os + from waflib import Logs, Utils +-re_imp = re.compile('^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) ++re_imp = re.compile(r'^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) + + class ConfigSet(object): + """ +diff --git a/waflib/Configure.py b/waflib/Configure.py +index d0a4793a8..f6fdc4e94 100644 +--- a/waflib/Configure.py ++++ b/waflib/Configure.py +@@ -125,7 +125,7 @@ def init_dirs(self): + self.bldnode.mkdir() + + if not os.path.isdir(self.bldnode.abspath()): +- conf.fatal('Could not create the build directory %s' % self.bldnode.abspath()) ++ self.fatal('Could not create the build directory %s' % self.bldnode.abspath()) + + def execute(self): + """ +@@ -180,6 +180,7 @@ def execute(self): + env.hash = self.hash + env.files = self.files + env.environ = dict(self.environ) ++ env.launch_dir = Context.launch_dir + + if not (self.env.NO_LOCK_IN_RUN or env.environ.get('NO_LOCK_IN_RUN') or getattr(Options.options, 'no_lock_in_run')): + env.store(os.path.join(Context.run_dir, Options.lockfile)) +@@ -438,7 +439,7 @@ def find_program(self, filename, **kw): + + var = kw.get('var', '') + if not var: +- var = re.sub(r'[-.]', '_', filename[0].upper()) ++ var = re.sub(r'\W', '_', filename[0].upper()) + + path_list = kw.get('path_list', '') + if path_list: +@@ -507,23 +508,27 @@ def find_binary(self, filenames, exts, paths): + @conf + def run_build(self, *k, **kw): + """ +- Create a temporary build context to execute a build. A reference to that build +- context is kept on self.test_bld for debugging purposes, and you should not rely +- on it too much (read the note on the cache below). +- The parameters given in the arguments to this function are passed as arguments for +- a single task generator created in the build. Only three parameters are obligatory: ++ Create a temporary build context to execute a build. A temporary reference to that build ++ context is kept on self.test_bld for debugging purposes. ++ The arguments to this function are passed to a single task generator for that build. ++ Only three parameters are mandatory: + + :param features: features to pass to a task generator created in the build + :type features: list of string + :param compile_filename: file to create for the compilation (default: *test.c*) + :type compile_filename: string +- :param code: code to write in the filename to compile ++ :param code: input file contents + :type code: string + +- Though this function returns *0* by default, the build may set an attribute named *retval* on the ++ Though this function returns *0* by default, the build may bind attribute named *retval* on the + build context object to return a particular value. See :py:func:`waflib.Tools.c_config.test_exec_fun` for example. + +- This function also provides a limited cache. To use it, provide the following option:: ++ The temporary builds creates a temporary folder; the name of that folder is calculated ++ by hashing input arguments to this function, with the exception of :py:class:`waflib.ConfigSet.ConfigSet` ++ objects which are used for both reading and writing values. ++ ++ This function also features a cache which is disabled by default; that cache relies ++ on the hash value calculated as indicated above:: + + def options(opt): + opt.add_option('--confcache', dest='confcache', default=0, +@@ -534,10 +539,24 @@ def options(opt): + $ waf configure --confcache + + """ +- lst = [str(v) for (p, v) in kw.items() if p != 'env'] +- h = Utils.h_list(lst) ++ buf = [] ++ for key in sorted(kw.keys()): ++ v = kw[key] ++ if isinstance(v, ConfigSet.ConfigSet): ++ # values are being written to, so they are excluded from contributing to the hash ++ continue ++ elif hasattr(v, '__call__'): ++ buf.append(Utils.h_fun(v)) ++ else: ++ buf.append(str(v)) ++ h = Utils.h_list(buf) + dir = self.bldnode.abspath() + os.sep + (not Utils.is_win32 and '.' or '') + 'conf_check_' + Utils.to_hex(h) + ++ cachemode = kw.get('confcache', getattr(Options.options, 'confcache', None)) ++ ++ if not cachemode and os.path.exists(dir): ++ shutil.rmtree(dir) ++ + try: + os.makedirs(dir) + except OSError: +@@ -548,7 +567,6 @@ def options(opt): + except OSError: + self.fatal('cannot use the configuration test folder %r' % dir) + +- cachemode = getattr(Options.options, 'confcache', None) + if cachemode == 1: + try: + proj = ConfigSet.ConfigSet(os.path.join(dir, 'cache_run_build')) +@@ -588,7 +606,7 @@ def options(opt): + else: + ret = getattr(bld, 'retval', 0) + finally: +- if cachemode == 1: ++ if cachemode: + # cache the results each time + proj = ConfigSet.ConfigSet() + proj['cache_run_build'] = ret +diff --git a/waflib/Context.py b/waflib/Context.py +index 761b521f5..369664819 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -6,20 +6,30 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, sys + from waflib import Utils, Errors, Logs + import waflib.Node + ++if sys.hexversion > 0x3040000: ++ import types ++ class imp(object): ++ new_module = lambda x: types.ModuleType(x) ++else: ++ import imp ++ + # the following 3 constants are updated on each new release (do not touch) +-HEXVERSION=0x2000c00 ++HEXVERSION=0x2001a00 + """Constant updated on new releases""" + +-WAFVERSION="2.0.12" ++WAFVERSION="2.0.26" + """Constant updated on new releases""" + +-WAFREVISION="54841218840ffa34fddf834680a5a17db69caa12" ++WAFREVISION="0fb985ce1932c6f3e7533f435e4ee209d673776e" + """Git revision when the waf version is updated""" + ++WAFNAME="waf" ++"""Application name displayed on --help""" ++ + ABI = 20 + """Version of the build data cache file format (used in :py:const:`waflib.Context.DBFILE`)""" + +@@ -134,7 +144,7 @@ def foo(ctx): + :type fun: string + + .. inheritance-diagram:: waflib.Context.Context waflib.Build.BuildContext waflib.Build.InstallContext waflib.Build.UninstallContext waflib.Build.StepContext waflib.Build.ListContext waflib.Configure.ConfigurationContext waflib.Scripting.Dist waflib.Scripting.DistCheck waflib.Build.CleanContext +- ++ :top-classes: waflib.Context.Context + """ + + errors = Errors +@@ -613,7 +623,7 @@ def load_special_tools(self, var, ban=[]): + is typically called once for a programming language group, see for + example :py:mod:`waflib.Tools.compiler_c` + +- :param var: glob expression, for example 'cxx\_\*.py' ++ :param var: glob expression, for example 'cxx\\_\\*.py' + :type var: string + :param ban: list of exact file names to exclude + :type ban: list of string +@@ -678,7 +688,7 @@ def load_module(path, encoding=None): + + def load_tool(tool, tooldir=None, ctx=None, with_sys_path=True): + """ +- Importx a Waf tool as a python module, and stores it in the dict :py:const:`waflib.Context.Context.tools` ++ Imports a Waf tool as a python module, and stores it in the dict :py:const:`waflib.Context.Context.tools` + + :type tool: string + :param tool: Name of the tool +diff --git a/waflib/Logs.py b/waflib/Logs.py +index 2a475169b..298411db5 100644 +--- a/waflib/Logs.py ++++ b/waflib/Logs.py +@@ -237,7 +237,10 @@ def format(self, rec): + if rec.levelno >= logging.INFO: + # the goal of this is to format without the leading "Logs, hour" prefix + if rec.args: +- return msg % rec.args ++ try: ++ return msg % rec.args ++ except UnicodeDecodeError: ++ return msg.encode('utf-8') % rec.args + return msg + + rec.msg = msg +@@ -276,9 +279,9 @@ def error(*k, **kw): + + def warn(*k, **kw): + """ +- Wraps logging.warn ++ Wraps logging.warning + """ +- log.warn(*k, **kw) ++ log.warning(*k, **kw) + + def info(*k, **kw): + """ +diff --git a/waflib/Node.py b/waflib/Node.py +index 4ac1ea8a0..2ad184669 100644 +--- a/waflib/Node.py ++++ b/waflib/Node.py +@@ -73,7 +73,7 @@ def ant_matcher(s, ignorecase): + if k == '**': + accu.append(k) + else: +- k = k.replace('.', '[.]').replace('*','.*').replace('?', '.').replace('+', '\\+') ++ k = k.replace('.', '[.]').replace('*', '.*').replace('?', '.').replace('+', '\\+') + k = '^%s$' % k + try: + exp = re.compile(k, flags=reflags) +@@ -595,7 +595,6 @@ def ant_iter(self, accept=None, maxdepth=25, pats=[], dir=False, src=True, remov + :rtype: iterator + """ + dircont = self.listdir() +- dircont.sort() + + try: + lst = set(self.children.keys()) +diff --git a/waflib/Options.py b/waflib/Options.py +index ad802d4b9..d4104917c 100644 +--- a/waflib/Options.py ++++ b/waflib/Options.py +@@ -44,7 +44,7 @@ class opt_parser(optparse.OptionParser): + """ + def __init__(self, ctx, allow_unknown=False): + optparse.OptionParser.__init__(self, conflict_handler='resolve', add_help_option=False, +- version='waf %s (%s)' % (Context.WAFVERSION, Context.WAFREVISION)) ++ version='%s %s (%s)' % (Context.WAFNAME, Context.WAFVERSION, Context.WAFREVISION)) + self.formatter.width = Logs.get_term_cols() + self.ctx = ctx + self.allow_unknown = allow_unknown +@@ -62,6 +62,21 @@ def _process_args(self, largs, rargs, values): + else: + self.error(str(e)) + ++ def _process_long_opt(self, rargs, values): ++ # --custom-option=-ftxyz is interpreted as -f -t... see #2280 ++ if self.allow_unknown: ++ back = [] + rargs ++ try: ++ optparse.OptionParser._process_long_opt(self, rargs, values) ++ except optparse.BadOptionError: ++ while rargs: ++ rargs.pop() ++ rargs.extend(back) ++ rargs.pop(0) ++ raise ++ else: ++ optparse.OptionParser._process_long_opt(self, rargs, values) ++ + def print_usage(self, file=None): + return self.print_help(file) + +@@ -96,11 +111,11 @@ def get_usage(self): + lst.sort() + ret = '\n'.join(lst) + +- return '''waf [commands] [options] ++ return '''%s [commands] [options] + +-Main commands (example: ./waf build -j4) ++Main commands (example: ./%s build -j4) + %s +-''' % ret ++''' % (Context.WAFNAME, Context.WAFNAME, ret) + + + class OptionsContext(Context.Context): +@@ -141,9 +156,9 @@ def __init__(self, **kw): + gr.add_option('-o', '--out', action='store', default='', help='build dir for the project', dest='out') + gr.add_option('-t', '--top', action='store', default='', help='src dir for the project', dest='top') + +- gr.add_option('--no-lock-in-run', action='store_true', default='', help=optparse.SUPPRESS_HELP, dest='no_lock_in_run') +- gr.add_option('--no-lock-in-out', action='store_true', default='', help=optparse.SUPPRESS_HELP, dest='no_lock_in_out') +- gr.add_option('--no-lock-in-top', action='store_true', default='', help=optparse.SUPPRESS_HELP, dest='no_lock_in_top') ++ gr.add_option('--no-lock-in-run', action='store_true', default=os.environ.get('NO_LOCK_IN_RUN', ''), help=optparse.SUPPRESS_HELP, dest='no_lock_in_run') ++ gr.add_option('--no-lock-in-out', action='store_true', default=os.environ.get('NO_LOCK_IN_OUT', ''), help=optparse.SUPPRESS_HELP, dest='no_lock_in_out') ++ gr.add_option('--no-lock-in-top', action='store_true', default=os.environ.get('NO_LOCK_IN_TOP', ''), help=optparse.SUPPRESS_HELP, dest='no_lock_in_top') + + default_prefix = getattr(Context.g_module, 'default_prefix', os.environ.get('PREFIX')) + if not default_prefix: +@@ -282,6 +297,8 @@ def parse_cmd_args(self, _args=None, cwd=None, allow_unknown=False): + elif arg != 'options': + commands.append(arg) + ++ if options.jobs < 1: ++ options.jobs = 1 + for name in 'top out destdir prefix bindir libdir'.split(): + # those paths are usually expanded from Context.launch_dir + if getattr(options, name, None): +diff --git a/waflib/Runner.py b/waflib/Runner.py +index 261084d27..350c86a22 100644 +--- a/waflib/Runner.py ++++ b/waflib/Runner.py +@@ -37,6 +37,8 @@ def __len__(self): + return len(self.lst) + def __iter__(self): + return iter(self.lst) ++ def __str__(self): ++ return 'PriorityTasks: [%s]' % '\n '.join(str(x) for x in self.lst) + def clear(self): + self.lst = [] + def append(self, task): +@@ -69,7 +71,7 @@ def __init__(self, spawner, task): + """Task to execute""" + self.spawner = spawner + """Coordinator object""" +- self.setDaemon(1) ++ self.daemon = True + self.start() + def run(self): + """ +@@ -96,7 +98,7 @@ def __init__(self, master): + """:py:class:`waflib.Runner.Parallel` producer instance""" + self.sem = Utils.threading.Semaphore(master.numjobs) + """Bounded semaphore that prevents spawning more than *n* concurrent consumers""" +- self.setDaemon(1) ++ self.daemon = True + self.start() + def run(self): + """ +@@ -181,10 +183,12 @@ def __init__(self, bld, j=2): + The reverse dependency graph of dependencies obtained from Task.run_after + """ + +- self.spawner = Spawner(self) ++ self.spawner = None + """ + Coordinating daemon thread that spawns thread consumers + """ ++ if self.numjobs > 1: ++ self.spawner = Spawner(self) + + def get_next_task(self): + """ +@@ -254,6 +258,8 @@ def refill_task_list(self): + self.outstanding.append(x) + break + else: ++ if self.stop or self.error: ++ break + raise Errors.WafError('Broken revdeps detected on %r' % self.incomplete) + else: + tasks = next(self.biter) +@@ -331,11 +337,16 @@ def try_unfreeze(x): + + if hasattr(tsk, 'semaphore'): + sem = tsk.semaphore +- sem.release(tsk) +- while sem.waiting and not sem.is_locked(): +- # take a frozen task, make it ready to run +- x = sem.waiting.pop() +- self._add_task(x) ++ try: ++ sem.release(tsk) ++ except KeyError: ++ # TODO ++ pass ++ else: ++ while sem.waiting and not sem.is_locked(): ++ # take a frozen task, make it ready to run ++ x = sem.waiting.pop() ++ self._add_task(x) + + def get_out(self): + """ +diff --git a/waflib/Scripting.py b/waflib/Scripting.py +index 749d4f2e6..a80cb3678 100644 +--- a/waflib/Scripting.py ++++ b/waflib/Scripting.py +@@ -216,7 +216,10 @@ def parse_options(): + ctx = Context.create_context('options') + ctx.execute() + if not Options.commands: +- Options.commands.append(default_cmd) ++ if isinstance(default_cmd, list): ++ Options.commands.extend(default_cmd) ++ else: ++ Options.commands.append(default_cmd) + if Options.options.whelp: + ctx.parser.print_help() + sys.exit(0) +@@ -280,7 +283,7 @@ def distclean_dir(dirname): + pass + + try: +- shutil.rmtree('c4che') ++ shutil.rmtree(Build.CACHE_DIR) + except OSError: + pass + +@@ -303,7 +306,7 @@ def remove_and_log(k, fun): + + # remove a build folder, if any + cur = '.' +- if ctx.options.no_lock_in_top: ++ if os.environ.get('NO_LOCK_IN_TOP') or ctx.options.no_lock_in_top: + cur = ctx.options.out + + try: +@@ -329,7 +332,12 @@ def remove_and_log(k, fun): + else: + remove_and_log(env.out_dir, shutil.rmtree) + +- for k in (env.out_dir, env.top_dir, env.run_dir): ++ env_dirs = [env.out_dir] ++ if not (os.environ.get('NO_LOCK_IN_TOP') or ctx.options.no_lock_in_top): ++ env_dirs.append(env.top_dir) ++ if not (os.environ.get('NO_LOCK_IN_RUN') or ctx.options.no_lock_in_run): ++ env_dirs.append(env.run_dir) ++ for k in env_dirs: + p = os.path.join(k, Options.lockfile) + remove_and_log(p, os.remove) + +@@ -380,7 +388,11 @@ def archive(self): + + for x in files: + archive_name = self.get_base_name() + '/' + x.path_from(self.base_path) +- zip.write(x.abspath(), archive_name, zipfile.ZIP_DEFLATED) ++ if os.environ.get('SOURCE_DATE_EPOCH'): ++ # TODO: parse that timestamp ++ zip.writestr(zipfile.ZipInfo(archive_name), x.read(), zipfile.ZIP_DEFLATED) ++ else: ++ zip.write(x.abspath(), archive_name, zipfile.ZIP_DEFLATED) + zip.close() + else: + self.fatal('Valid algo types are tar.bz2, tar.gz, tar.xz or zip') +@@ -417,6 +429,8 @@ def add_tar_file(self, x, tar): + tinfo.gid = 0 + tinfo.uname = 'root' + tinfo.gname = 'root' ++ if os.environ.get('SOURCE_DATE_EPOCH'): ++ tinfo.mtime = int(os.environ.get('SOURCE_DATE_EPOCH')) + + if os.path.isfile(p): + with open(p, 'rb') as f: +@@ -598,12 +612,15 @@ def execute(self): + cmd = env.config_cmd or 'configure' + if Configure.autoconfig == 'clobber': + tmp = Options.options.__dict__ ++ launch_dir_tmp = Context.launch_dir + if env.options: + Options.options.__dict__ = env.options ++ Context.launch_dir = env.launch_dir + try: + run_command(cmd) + finally: + Options.options.__dict__ = tmp ++ Context.launch_dir = launch_dir_tmp + else: + run_command(cmd) + run_command(self.cmd) +diff --git a/waflib/Task.py b/waflib/Task.py +index 6aebc6074..cb49a7394 100644 +--- a/waflib/Task.py ++++ b/waflib/Task.py +@@ -163,10 +163,10 @@ class Task(evil): + """File extensions that objects of this task class may create""" + + before = [] +- """List of task class names to execute before instances of this class""" ++ """The instances of this class are executed before the instances of classes whose names are in this list""" + + after = [] +- """List of task class names to execute after instances of this class""" ++ """The instances of this class are executed after the instances of classes whose names are in this list""" + + hcode = Utils.SIG_NIL + """String representing an additional hash for the class representation""" +@@ -306,25 +306,31 @@ def exec_command(self, cmd, **kw): + if hasattr(self, 'stderr'): + kw['stderr'] = self.stderr + +- # workaround for command line length limit: +- # http://support.microsoft.com/kb/830473 +- if not isinstance(cmd, str) and (len(repr(cmd)) >= 8192 if Utils.is_win32 else len(cmd) > 200000): +- cmd, args = self.split_argfile(cmd) +- try: +- (fd, tmp) = tempfile.mkstemp() +- os.write(fd, '\r\n'.join(args).encode()) +- os.close(fd) +- if Logs.verbose: +- Logs.debug('argfile: @%r -> %r', tmp, args) +- return self.generator.bld.exec_command(cmd + ['@' + tmp], **kw) +- finally: ++ if not isinstance(cmd, str): ++ if Utils.is_win32: ++ # win32 compares the resulting length http://support.microsoft.com/kb/830473 ++ too_long = sum([len(arg) for arg in cmd]) + len(cmd) > 8192 ++ else: ++ # non-win32 counts the amount of arguments (200k) ++ too_long = len(cmd) > 200000 ++ ++ if too_long and getattr(self, 'allow_argsfile', True): ++ # Shunt arguments to a temporary file if the command is too long. ++ cmd, args = self.split_argfile(cmd) + try: +- os.remove(tmp) +- except OSError: +- # anti-virus and indexers can keep files open -_- +- pass +- else: +- return self.generator.bld.exec_command(cmd, **kw) ++ (fd, tmp) = tempfile.mkstemp() ++ os.write(fd, '\r\n'.join(args).encode()) ++ os.close(fd) ++ if Logs.verbose: ++ Logs.debug('argfile: @%r -> %r', tmp, args) ++ return self.generator.bld.exec_command(cmd + ['@' + tmp], **kw) ++ finally: ++ try: ++ os.remove(tmp) ++ except OSError: ++ # anti-virus and indexers can keep files open -_- ++ pass ++ return self.generator.bld.exec_command(cmd, **kw) + + def process(self): + """ +@@ -1044,7 +1050,7 @@ def funex(c): + exec(c, dc) + return dc['f'] + +-re_cond = re.compile('(?P\w+)|(?P\|)|(?P&)') ++re_cond = re.compile(r'(?P\w+)|(?P\|)|(?P&)') + re_novar = re.compile(r'^(SRC|TGT)\W+.*?$') + reg_act = re.compile(r'(?P\\)|(?P\$\$)|(?P\$\{(?P\w+)(?P.*?)\})', re.M) + def compile_fun_shell(line): +diff --git a/waflib/TaskGen.py b/waflib/TaskGen.py +index a74e6431d..32468f03d 100644 +--- a/waflib/TaskGen.py ++++ b/waflib/TaskGen.py +@@ -74,7 +74,7 @@ def __init__(self, *k, **kw): + else: + self.bld = kw['bld'] + self.env = self.bld.env.derive() +- self.path = self.bld.path # emulate chdir when reading scripts ++ self.path = kw.get('path', self.bld.path) # by default, emulate chdir when reading scripts + + # Provide a unique index per folder + # This is part of a measure to prevent output file name collisions +@@ -400,7 +400,7 @@ def feature(*k): + Decorator that registers a task generator method that will be executed when the + object attribute ``feature`` contains the corresponding key(s):: + +- from waflib.Task import feature ++ from waflib.TaskGen import feature + @feature('myfeature') + def myfunction(self): + print('that is my feature!') +@@ -631,12 +631,8 @@ def chmod_fun(tsk): + cls.scan = self.scan + elif has_deps: + def scan(self): +- nodes = [] +- for x in self.generator.to_list(getattr(self.generator, 'deps', None)): +- node = self.generator.path.find_resource(x) +- if not node: +- self.generator.bld.fatal('Could not find %r (was it declared?)' % x) +- nodes.append(node) ++ deps = getattr(self.generator, 'deps', None) ++ nodes = self.generator.to_nodes(deps) + return [nodes, []] + cls.scan = scan + +@@ -727,7 +723,7 @@ def sequence_order(self): + self.bld.prev = self + + +-re_m4 = re.compile('@(\w+)@', re.M) ++re_m4 = re.compile(r'@(\w+)@', re.M) + + class subst_pc(Task.Task): + """ +@@ -905,7 +901,7 @@ def build(bld): + # paranoid safety measure for the general case foo.in->foo.h with ambiguous dependencies + for xt in HEADER_EXTS: + if b.name.endswith(xt): +- tsk.ext_in = tsk.ext_in + ['.h'] ++ tsk.ext_out = tsk.ext_out + ['.h'] + break + + inst_to = getattr(self, 'install_path', None) +diff --git a/waflib/Tools/c_aliases.py b/waflib/Tools/c_aliases.py +index c9d53692e..928cfe29c 100644 +--- a/waflib/Tools/c_aliases.py ++++ b/waflib/Tools/c_aliases.py +@@ -38,7 +38,7 @@ def sniff_features(**kw): + :return: the list of features for a task generator processing the source files + :rtype: list of string + """ +- exts = get_extensions(kw['source']) ++ exts = get_extensions(kw.get('source', [])) + typ = kw['typ'] + feats = [] + +@@ -47,10 +47,12 @@ def sniff_features(**kw): + if x in exts: + feats.append('cxx') + break +- + if 'c' in exts or 'vala' in exts or 'gs' in exts: + feats.append('c') + ++ if 's' in exts or 'S' in exts: ++ feats.append('asm') ++ + for x in 'f f90 F F90 for FOR'.split(): + if x in exts: + feats.append('fc') +@@ -66,11 +68,11 @@ def sniff_features(**kw): + if typ in ('program', 'shlib', 'stlib'): + will_link = False + for x in feats: +- if x in ('cxx', 'd', 'fc', 'c'): ++ if x in ('cxx', 'd', 'fc', 'c', 'asm'): + feats.append(x + typ) + will_link = True + if not will_link and not kw.get('features', []): +- raise Errors.WafError('Cannot link from %r, try passing eg: features="c cprogram"?' % kw) ++ raise Errors.WafError('Unable to determine how to link %r, try adding eg: features="c cshlib"?' % kw) + return feats + + def set_features(kw, typ): +diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py +index d2b3c0d8f..f5ab19bf6 100644 +--- a/waflib/Tools/c_config.py ++++ b/waflib/Tools/c_config.py +@@ -68,6 +68,8 @@ + '__s390__' : 's390', + '__sh__' : 'sh', + '__xtensa__' : 'xtensa', ++'__e2k__' : 'e2k', ++'__riscv' : 'riscv', + } + + @conf +@@ -86,6 +88,10 @@ def configure(conf): + :type uselib_store: string + :param env: config set or conf.env by default + :type env: :py:class:`waflib.ConfigSet.ConfigSet` ++ :param force_static: force usage of static libraries ++ :type force_static: bool default False ++ :param posix: usage of POSIX mode for shlex lexical analiysis library ++ :type posix: bool default True + """ + + assert(isinstance(line, str)) +@@ -103,6 +109,8 @@ def configure(conf): + lex.commenters = '' + lst = list(lex) + ++ so_re = re.compile(r"\.so(?:\.[0-9]+)*$") ++ + # append_unique is not always possible + # for example, apple flags may require both -arch i386 and -arch ppc + uselib = uselib_store +@@ -144,7 +152,7 @@ def appu(var, val): + elif x.startswith('-std='): + prefix = 'CXXFLAGS' if '++' in x else 'CFLAGS' + app(prefix, x) +- elif x.startswith('+') or x in ('-pthread', '-fPIC', '-fpic', '-fPIE', '-fpie'): ++ elif x.startswith('+') or x in ('-pthread', '-fPIC', '-fpic', '-fPIE', '-fpie', '-flto', '-fno-lto'): + app('CFLAGS', x) + app('CXXFLAGS', x) + app('LINKFLAGS', x) +@@ -180,7 +188,7 @@ def appu(var, val): + app('CFLAGS', tmp) + app('CXXFLAGS', tmp) + app('LINKFLAGS', tmp) +- elif x.endswith(('.a', '.so', '.dylib', '.lib')): ++ elif x.endswith(('.a', '.dylib', '.lib')) or so_re.search(x): + appu('LINKFLAGS', x) # not cool, #762 + else: + self.to_log('Unhandled flag %r' % x) +@@ -246,13 +254,15 @@ def exec_cfg(self, kw): + * if modversion is given, then return the module version + * else, execute the *-config* program with the *args* and *variables* given, and set the flags on the *conf.env.FLAGS_name* variable + ++ :param path: the **-config program to use** ++ :type path: list of string + :param atleast_pkgconfig_version: minimum pkg-config version to use (disable other tests) + :type atleast_pkgconfig_version: string + :param package: package name, for example *gtk+-2.0* + :type package: string +- :param uselib_store: if the test is successful, define HAVE\_*name*. It is also used to define *conf.env.FLAGS_name* variables. ++ :param uselib_store: if the test is successful, define HAVE\\_*name*. It is also used to define *conf.env.FLAGS_name* variables. + :type uselib_store: string +- :param modversion: if provided, return the version of the given module and define *name*\_VERSION ++ :param modversion: if provided, return the version of the given module and define *name*\\_VERSION + :type modversion: string + :param args: arguments to give to *package* when retrieving flags + :type args: list of string +@@ -260,6 +270,12 @@ def exec_cfg(self, kw): + :type variables: list of string + :param define_variable: additional variables to define (also in conf.env.PKG_CONFIG_DEFINES) + :type define_variable: dict(string: string) ++ :param pkg_config_path: paths where pkg-config should search for .pc config files (overrides env.PKG_CONFIG_PATH if exists) ++ :type pkg_config_path: string, list of directories separated by colon ++ :param force_static: force usage of static libraries ++ :type force_static: bool default False ++ :param posix: usage of POSIX mode for shlex lexical analiysis library ++ :type posix: bool default True + """ + + path = Utils.to_list(kw['path']) +@@ -334,6 +350,7 @@ def check_cfg(self, *k, **kw): + """ + Checks for configuration flags using a **-config**-like program (pkg-config, sdl-config, etc). + This wraps internal calls to :py:func:`waflib.Tools.c_config.validate_cfg` and :py:func:`waflib.Tools.c_config.exec_cfg` ++ so check exec_cfg parameters descriptions for more details on kw passed + + A few examples:: + +@@ -659,20 +676,21 @@ class test_exec(Task.Task): + """ + color = 'PINK' + def run(self): ++ cmd = [self.inputs[0].abspath()] + getattr(self.generator, 'test_args', []) + if getattr(self.generator, 'rpath', None): + if getattr(self.generator, 'define_ret', False): +- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) ++ self.generator.bld.retval = self.generator.bld.cmd_and_log(cmd) + else: +- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) ++ self.generator.bld.retval = self.generator.bld.exec_command(cmd) + else: + env = self.env.env or {} + env.update(dict(os.environ)) + for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): + env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') + if getattr(self.generator, 'define_ret', False): +- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) ++ self.generator.bld.retval = self.generator.bld.cmd_and_log(cmd, env=env) + else: +- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) ++ self.generator.bld.retval = self.generator.bld.exec_command(cmd, env=env) + + @feature('test_exec') + @after_method('apply_link') +@@ -1266,10 +1284,11 @@ def to_log(self, *k, **kw): + tasks = [] + + id_to_task = {} +- for dct in k: ++ for counter, dct in enumerate(k): + x = Task.classes['cfgtask'](bld=bld, env=None) + tasks.append(x) + x.args = dct ++ x.args['multicheck_counter'] = counter + x.bld = bld + x.conf = self + x.args = dct +diff --git a/waflib/Tools/c_preproc.py b/waflib/Tools/c_preproc.py +index 7e04b4a7c..68e5f5aea 100644 +--- a/waflib/Tools/c_preproc.py ++++ b/waflib/Tools/c_preproc.py +@@ -75,13 +75,13 @@ class PreprocError(Errors.WafError): + re.IGNORECASE | re.MULTILINE) + """Match #include lines""" + +-re_mac = re.compile("^[a-zA-Z_]\w*") ++re_mac = re.compile(r"^[a-zA-Z_]\w*") + """Match macro definitions""" + + re_fun = re.compile('^[a-zA-Z_][a-zA-Z0-9_]*[(]') + """Match macro functions""" + +-re_pragma_once = re.compile('^\s*once\s*', re.IGNORECASE) ++re_pragma_once = re.compile(r'^\s*once\s*', re.IGNORECASE) + """Match #pragma once statements""" + + re_nl = re.compile('\\\\\r*\n', re.MULTILINE) +@@ -660,7 +660,7 @@ def extract_macro(txt): + # empty define, assign an empty token + return (v, [[], [('T','')]]) + +-re_include = re.compile('^\s*(<(?:.*)>|"(?:.*)")') ++re_include = re.compile(r'^\s*(<(?:.*)>|"(?:.*)")') + def extract_include(txt, defs): + """ + Process a line in the form:: +diff --git a/waflib/Tools/c_tests.py b/waflib/Tools/c_tests.py +index f858df576..bdd186c6b 100644 +--- a/waflib/Tools/c_tests.py ++++ b/waflib/Tools/c_tests.py +@@ -180,9 +180,15 @@ def check_large_file(self, **kw): + ######################################################################################## + + ENDIAN_FRAGMENT = ''' ++#ifdef _MSC_VER ++#define testshlib_EXPORT __declspec(dllexport) ++#else ++#define testshlib_EXPORT ++#endif ++ + short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +-int use_ascii (int i) { ++int testshlib_EXPORT use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +@@ -208,12 +214,12 @@ def run(self): + return -1 + + @feature('grep_for_endianness') +- at after_method('process_source') ++ at after_method('apply_link') + def grep_for_endianness_fun(self): + """ + Used by the endianness configuration test + """ +- self.create_task('grep_for_endianness', self.compiled_tasks[0].outputs[0]) ++ self.create_task('grep_for_endianness', self.link_task.outputs[0]) + + @conf + def check_endianness(self): +@@ -223,7 +229,9 @@ def check_endianness(self): + tmp = [] + def check_msg(self): + return tmp[0] +- self.check(fragment=ENDIAN_FRAGMENT, features='c grep_for_endianness', +- msg='Checking for endianness', define='ENDIANNESS', tmp=tmp, okmsg=check_msg) ++ ++ self.check(fragment=ENDIAN_FRAGMENT, features='c cshlib grep_for_endianness', ++ msg='Checking for endianness', define='ENDIANNESS', tmp=tmp, ++ okmsg=check_msg, confcache=None) + return tmp[0] + +diff --git a/waflib/Tools/ccroot.py b/waflib/Tools/ccroot.py +index 484846f5f..533992903 100644 +--- a/waflib/Tools/ccroot.py ++++ b/waflib/Tools/ccroot.py +@@ -111,7 +111,7 @@ def apply_incpaths(self): + tg = bld(features='includes', includes='.') + + The folders only need to be relative to the current directory, the equivalent build directory is +- added automatically (for headers created in the build directory). This enable using a build directory ++ added automatically (for headers created in the build directory). This enables using a build directory + or not (``top == out``). + + This method will add a list of nodes read by :py:func:`waflib.Tools.ccroot.to_incnodes` in ``tg.env.INCPATHS``, +@@ -128,6 +128,7 @@ class link_task(Task.Task): + Base class for all link tasks. A task generator is supposed to have at most one link task bound in the attribute *link_task*. See :py:func:`waflib.Tools.ccroot.apply_link`. + + .. inheritance-diagram:: waflib.Tools.ccroot.stlink_task waflib.Tools.c.cprogram waflib.Tools.c.cshlib waflib.Tools.cxx.cxxstlib waflib.Tools.cxx.cxxprogram waflib.Tools.cxx.cxxshlib waflib.Tools.d.dprogram waflib.Tools.d.dshlib waflib.Tools.d.dstlib waflib.Tools.ccroot.fake_shlib waflib.Tools.ccroot.fake_stlib waflib.Tools.asm.asmprogram waflib.Tools.asm.asmshlib waflib.Tools.asm.asmstlib ++ :top-classes: waflib.Tools.ccroot.link_task + """ + color = 'YELLOW' + +@@ -238,6 +239,17 @@ def wrap(self): + setattr(cls, 'run', wrap) + rm_tgt(stlink_task) + ++ at feature('skip_stlib_link_deps') ++ at before_method('process_use') ++def apply_skip_stlib_link_deps(self): ++ """ ++ This enables an optimization in the :py:func:wafilb.Tools.ccroot.processes_use: method that skips dependency and ++ link flag optimizations for targets that generate static libraries (via the :py:class:Tools.ccroot.stlink_task task). ++ The actual behavior is implemented in :py:func:wafilb.Tools.ccroot.processes_use: method so this feature only tells waf ++ to enable the new behavior. ++ """ ++ self.env.SKIP_STLIB_LINK_DEPS = True ++ + @feature('c', 'cxx', 'd', 'fc', 'asm') + @after_method('process_source') + def apply_link(self): +@@ -386,7 +398,11 @@ def build(bld): + y = self.bld.get_tgen_by_name(x) + var = y.tmp_use_var + if var and link_task: +- if var == 'LIB' or y.tmp_use_stlib or x in names: ++ if self.env.SKIP_STLIB_LINK_DEPS and isinstance(link_task, stlink_task): ++ # If the skip_stlib_link_deps feature is enabled then we should ++ # avoid adding lib deps to the stlink_task instance. ++ pass ++ elif var == 'LIB' or y.tmp_use_stlib or x in names: + self.env.append_value(var, [y.target[y.target.rfind(os.sep) + 1:]]) + self.link_task.dep_nodes.extend(y.link_task.outputs) + tmp_path = y.link_task.outputs[0].parent.path_from(self.get_cwd()) +diff --git a/waflib/Tools/compiler_c.py b/waflib/Tools/compiler_c.py +index 2dba3f827..e033ce6c5 100644 +--- a/waflib/Tools/compiler_c.py ++++ b/waflib/Tools/compiler_c.py +@@ -36,18 +36,19 @@ def build(bld): + from waflib.Logs import debug + + c_compiler = { +-'win32': ['msvc', 'gcc', 'clang'], +-'cygwin': ['gcc'], +-'darwin': ['clang', 'gcc'], +-'aix': ['xlc', 'gcc', 'clang'], +-'linux': ['gcc', 'clang', 'icc'], +-'sunos': ['suncc', 'gcc'], +-'irix': ['gcc', 'irixcc'], +-'hpux': ['gcc'], +-'osf1V': ['gcc'], +-'gnu': ['gcc', 'clang'], +-'java': ['gcc', 'msvc', 'clang', 'icc'], +-'default':['clang', 'gcc'], ++'win32': ['msvc', 'gcc', 'clang'], ++'cygwin': ['gcc', 'clang'], ++'darwin': ['clang', 'gcc'], ++'aix': ['xlc', 'gcc', 'clang'], ++'linux': ['gcc', 'clang', 'icc'], ++'sunos': ['suncc', 'gcc'], ++'irix': ['gcc', 'irixcc'], ++'hpux': ['gcc'], ++'osf1V': ['gcc'], ++'gnu': ['gcc', 'clang'], ++'java': ['gcc', 'msvc', 'clang', 'icc'], ++'gnukfreebsd': ['gcc', 'clang'], ++'default': ['clang', 'gcc'], + } + """ + Dict mapping platform names to Waf tools finding specific C compilers:: +diff --git a/waflib/Tools/compiler_cxx.py b/waflib/Tools/compiler_cxx.py +index 1af65a226..42658c584 100644 +--- a/waflib/Tools/compiler_cxx.py ++++ b/waflib/Tools/compiler_cxx.py +@@ -37,18 +37,19 @@ def build(bld): + from waflib.Logs import debug + + cxx_compiler = { +-'win32': ['msvc', 'g++', 'clang++'], +-'cygwin': ['g++'], +-'darwin': ['clang++', 'g++'], +-'aix': ['xlc++', 'g++', 'clang++'], +-'linux': ['g++', 'clang++', 'icpc'], +-'sunos': ['sunc++', 'g++'], +-'irix': ['g++'], +-'hpux': ['g++'], +-'osf1V': ['g++'], +-'gnu': ['g++', 'clang++'], +-'java': ['g++', 'msvc', 'clang++', 'icpc'], +-'default': ['clang++', 'g++'] ++'win32': ['msvc', 'g++', 'clang++'], ++'cygwin': ['g++', 'clang++'], ++'darwin': ['clang++', 'g++'], ++'aix': ['xlc++', 'g++', 'clang++'], ++'linux': ['g++', 'clang++', 'icpc'], ++'sunos': ['sunc++', 'g++'], ++'irix': ['g++'], ++'hpux': ['g++'], ++'osf1V': ['g++'], ++'gnu': ['g++', 'clang++'], ++'java': ['g++', 'msvc', 'clang++', 'icpc'], ++'gnukfreebsd': ['g++', 'clang++'], ++'default': ['clang++', 'g++'] + } + """ + Dict mapping the platform names to Waf tools finding specific C++ compilers:: +diff --git a/waflib/Tools/irixcc.py b/waflib/Tools/irixcc.py +index c3ae1ac91..0335c13cb 100644 +--- a/waflib/Tools/irixcc.py ++++ b/waflib/Tools/irixcc.py +@@ -13,22 +13,11 @@ + @conf + def find_irixcc(conf): + v = conf.env +- cc = None +- if v.CC: +- cc = v.CC +- elif 'CC' in conf.environ: +- cc = conf.environ['CC'] +- if not cc: +- cc = conf.find_program('cc', var='CC') +- if not cc: +- conf.fatal('irixcc was not found') +- ++ cc = conf.find_program('cc', var='CC') + try: + conf.cmd_and_log(cc + ['-version']) + except Errors.WafError: + conf.fatal('%r -version could not be executed' % cc) +- +- v.CC = cc + v.CC_NAME = 'irix' + + @conf +@@ -57,7 +46,6 @@ def irixcc_common_flags(conf): + + def configure(conf): + conf.find_irixcc() +- conf.find_cpp() + conf.find_ar() + conf.irixcc_common_flags() + conf.cc_load_tools() +diff --git a/waflib/Tools/msvc.py b/waflib/Tools/msvc.py +index 17b347d45..d60f67026 100644 +--- a/waflib/Tools/msvc.py ++++ b/waflib/Tools/msvc.py +@@ -99,10 +99,31 @@ def build(bld): + """List of icl platforms""" + + def options(opt): +- opt.add_option('--msvc_version', type='string', help = 'msvc version, eg: "msvc 10.0,msvc 9.0"', default='') ++ default_ver = '' ++ vsver = os.getenv('VSCMD_VER') ++ if vsver: ++ m = re.match(r'(^\d+\.\d+).*', vsver) ++ if m: ++ default_ver = 'msvc %s' % m.group(1) ++ opt.add_option('--msvc_version', type='string', help = 'msvc version, eg: "msvc 10.0,msvc 9.0"', default=default_ver) + opt.add_option('--msvc_targets', type='string', help = 'msvc targets, eg: "x64,arm"', default='') + opt.add_option('--no-msvc-lazy', action='store_false', help = 'lazily check msvc target environments', default=True, dest='msvc_lazy') + ++class MSVCVersion(object): ++ def __init__(self, ver): ++ m = re.search(r'^(.*)\s+(\d+[.]\d+)', ver) ++ if m: ++ self.name = m.group(1) ++ self.number = float(m.group(2)) ++ else: ++ self.name = ver ++ self.number = 0. ++ ++ def __lt__(self, other): ++ if self.number == other.number: ++ return self.name < other.name ++ return self.number < other.number ++ + @conf + def setup_msvc(conf, versiondict): + """ +@@ -119,7 +140,7 @@ def setup_msvc(conf, versiondict): + platforms=Utils.to_list(conf.env.MSVC_TARGETS) or [i for i,j in all_msvc_platforms+all_icl_platforms+all_wince_platforms] + desired_versions = getattr(Options.options, 'msvc_version', '').split(',') + if desired_versions == ['']: +- desired_versions = conf.env.MSVC_VERSIONS or list(reversed(sorted(versiondict.keys()))) ++ desired_versions = conf.env.MSVC_VERSIONS or list(sorted(versiondict.keys(), key=MSVCVersion, reverse=True)) + + # Override lazy detection by evaluating after the fact. + lazy_detect = getattr(Options.options, 'msvc_lazy', True) +@@ -187,7 +208,7 @@ def get_msvc_version(conf, compiler, version, target, vcvars): + echo INCLUDE=%%INCLUDE%% + echo LIB=%%LIB%%;%%LIBPATH%% + """ % (vcvars,target)) +- sout = conf.cmd_and_log(['cmd.exe', '/E:on', '/V:on', '/C', batfile.abspath()]) ++ sout = conf.cmd_and_log(['cmd.exe', '/E:on', '/V:on', '/C', batfile.abspath()], stdin=getattr(Utils.subprocess, 'DEVNULL', None)) + lines = sout.splitlines() + + if not lines[0]: +@@ -281,7 +302,7 @@ def gather_wince_supported_platforms(): + + def gather_msvc_detected_versions(): + #Detected MSVC versions! +- version_pattern = re.compile('^(\d\d?\.\d\d?)(Exp)?$') ++ version_pattern = re.compile(r'^(\d\d?\.\d\d?)(Exp)?$') + detected_versions = [] + for vcver,vcvar in (('VCExpress','Exp'), ('VisualStudio','')): + prefix = 'SOFTWARE\\Wow6432node\\Microsoft\\' + vcver +@@ -367,7 +388,7 @@ def gather_wsdk_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^v..?.?\...?.?') ++ version_pattern = re.compile(r'^v..?.?\...?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Microsoft\\Microsoft SDKs\\Windows') + except OSError: +@@ -525,7 +546,7 @@ def gather_icl_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\....?.?') ++ version_pattern = re.compile(r'^...?.?\....?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Compilers\\C++') + except OSError: +@@ -579,7 +600,7 @@ def gather_intel_composer_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\...?.?.?') ++ version_pattern = re.compile(r'^...?.?\...?.?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Suites') + except OSError: +@@ -683,7 +704,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + if not is_static and ltdict.get('library_names', ''): + dllnames=ltdict['library_names'].split() + dll=dllnames[0].lower() +- dll=re.sub('\.dll$', '', dll) ++ dll=re.sub(r'\.dll$', '', dll) + return (lt_libdir, dll, False) + elif ltdict.get('old_library', ''): + olib=ltdict['old_library'] +@@ -700,7 +721,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + @conf + def libname_msvc(self, libname, is_static=False): + lib = libname.lower() +- lib = re.sub('\.lib$','',lib) ++ lib = re.sub(r'\.lib$','',lib) + + if lib in g_msvc_systemlibs: + return lib +@@ -747,11 +768,11 @@ def libname_msvc(self, libname, is_static=False): + for libn in libnames: + if os.path.exists(os.path.join(path, libn)): + Logs.debug('msvc: lib found: %s', os.path.join(path,libn)) +- return re.sub('\.lib$', '',libn) ++ return re.sub(r'\.lib$', '',libn) + + #if no lib can be found, just return the libname as msvc expects it + self.fatal('The library %r could not be found' % libname) +- return re.sub('\.lib$', '', libname) ++ return re.sub(r'\.lib$', '', libname) + + @conf + def check_lib_msvc(self, libname, is_static=False, uselib_store=None): +@@ -969,7 +990,7 @@ def build(bld): + if not is_static: + for f in self.env.LINKFLAGS: + d = f.lower() +- if d[1:] == 'debug': ++ if d[1:] in ('debug', 'debug:full', 'debug:fastlink'): + pdbnode = self.link_task.outputs[0].change_ext('.pdb') + self.link_task.outputs.append(pdbnode) + +diff --git a/waflib/Tools/waf_unit_test.py b/waflib/Tools/waf_unit_test.py +index 74d6c0561..8cff89bde 100644 +--- a/waflib/Tools/waf_unit_test.py ++++ b/waflib/Tools/waf_unit_test.py +@@ -97,6 +97,7 @@ def make_interpreted_test(self): + if isinstance(v, str): + v = v.split(os.pathsep) + self.ut_env[k] = os.pathsep.join(p + v) ++ self.env.append_value('UT_DEPS', ['%r%r' % (key, self.ut_env[key]) for key in self.ut_env]) + + @feature('test') + @after_method('apply_link', 'process_use') +@@ -108,7 +109,8 @@ def make_test(self): + tsk = self.create_task('utest', self.link_task.outputs) + if getattr(self, 'ut_str', None): + self.ut_run, lst = Task.compile_fun(self.ut_str, shell=getattr(self, 'ut_shell', False)) +- tsk.vars = lst + tsk.vars ++ tsk.vars = tsk.vars + lst ++ self.env.append_value('UT_DEPS', self.ut_str) + + self.handle_ut_cwd('ut_cwd') + +@@ -139,6 +141,10 @@ def add_path(var): + if not hasattr(self, 'ut_cmd'): + self.ut_cmd = getattr(Options.options, 'testcmd', False) + ++ self.env.append_value('UT_DEPS', str(self.ut_cmd)) ++ self.env.append_value('UT_DEPS', self.ut_paths) ++ self.env.append_value('UT_DEPS', ['%r%r' % (key, self.ut_env[key]) for key in self.ut_env]) ++ + @taskgen_method + def add_test_results(self, tup): + """Override and return tup[1] to interrupt the build immediately if a test does not run""" +@@ -159,7 +165,7 @@ class utest(Task.Task): + """ + color = 'PINK' + after = ['vnum', 'inst'] +- vars = [] ++ vars = ['UT_DEPS'] + + def runnable_status(self): + """ +@@ -200,7 +206,7 @@ def run(self): + self.ut_exec = getattr(self.generator, 'ut_exec', [self.inputs[0].abspath()]) + ut_cmd = getattr(self.generator, 'ut_cmd', False) + if ut_cmd: +- self.ut_exec = shlex.split(ut_cmd % ' '.join(self.ut_exec)) ++ self.ut_exec = shlex.split(ut_cmd % Utils.shell_escape(self.ut_exec)) + + return self.exec_command(self.ut_exec) + +@@ -214,7 +220,7 @@ def exec_command(self, cmd, **kw): + 'cmd': cmd + } + script_file = self.inputs[0].abspath() + '_run.py' +- Utils.writef(script_file, script_code) ++ Utils.writef(script_file, script_code, encoding='utf-8') + os.chmod(script_file, Utils.O755) + if Logs.verbose > 1: + Logs.info('Test debug file written as %r' % script_file) +diff --git a/waflib/Utils.py b/waflib/Utils.py +index a0cc2a09d..ea0f7a9db 100644 +--- a/waflib/Utils.py ++++ b/waflib/Utils.py +@@ -11,7 +11,7 @@ + + from __future__ import with_statement + +-import atexit, os, sys, errno, inspect, re, datetime, platform, base64, signal, functools, time ++import atexit, os, sys, errno, inspect, re, datetime, platform, base64, signal, functools, time, shlex + + try: + import cPickle +@@ -49,10 +49,16 @@ class TimeoutExpired(Exception): + from hashlib import md5 + except ImportError: + try: +- from md5 import md5 ++ from hashlib import sha1 as md5 + except ImportError: +- # never fail to enable fixes from another module ++ # never fail to enable potential fixes from another module + pass ++else: ++ try: ++ md5().digest() ++ except ValueError: ++ # Fips? #2213 ++ from hashlib import sha1 as md5 + + try: + import threading +@@ -202,7 +208,7 @@ def __next__(self): + + next = __next__ + +-is_win32 = os.sep == '\\' or sys.platform == 'win32' # msys2 ++is_win32 = os.sep == '\\' or sys.platform == 'win32' or os.name == 'nt' # msys2 + """ + Whether this system is a Windows series + """ +@@ -446,6 +452,8 @@ def console_encoding(): + pass + else: + if codepage: ++ if 65001 == codepage and sys.version_info < (3, 3): ++ return 'utf-8' + return 'cp%d' % codepage + return sys.stdout.encoding or ('cp1252' if is_win32 else 'latin-1') + +@@ -484,7 +492,9 @@ def split_path_msys(path): + if sys.platform == 'cygwin': + split_path = split_path_cygwin + elif is_win32: +- if os.environ.get('MSYSTEM'): ++ # Consider this an MSYSTEM environment if $MSYSTEM is set and python ++ # reports is executable from a unix like path on a windows host. ++ if os.environ.get('MSYSTEM') and sys.executable.startswith('/'): + split_path = split_path_msys + else: + split_path = split_path_win32 +@@ -569,10 +579,13 @@ def quote_define_name(s): + fu = fu.upper() + return fu + +-re_sh = re.compile('\\s|\'|"') +-""" +-Regexp used for shell_escape below +-""" ++# shlex.quote didn't exist until python 3.3. Prior to that it was a non-documented ++# function in pipes. ++try: ++ shell_quote = shlex.quote ++except AttributeError: ++ import pipes ++ shell_quote = pipes.quote + + def shell_escape(cmd): + """ +@@ -581,7 +594,7 @@ def shell_escape(cmd): + """ + if isinstance(cmd, str): + return cmd +- return ' '.join(repr(x) if re_sh.search(x) else x for x in cmd) ++ return ' '.join(shell_quote(x) for x in cmd) + + def h_list(lst): + """ +@@ -596,6 +609,12 @@ def h_list(lst): + """ + return md5(repr(lst).encode()).digest() + ++if sys.hexversion < 0x3000000: ++ def h_list_python2(lst): ++ return md5(repr(lst)).digest() ++ h_list_python2.__doc__ = h_list.__doc__ ++ h_list = h_list_python2 ++ + def h_fun(fun): + """ + Hash functions +@@ -615,7 +634,7 @@ def h_fun(fun): + # + # The sorting result outcome will be consistent because: + # 1. tuples are compared in order of their elements +- # 2. optional argument names are unique ++ # 2. optional argument namess are unique + code.extend(sorted(fun.keywords.items())) + code.append(h_fun(fun.func)) + fun.code = h_list(code) +@@ -730,7 +749,7 @@ def unversioned_sys_platform(): + if s == 'cli' and os.name == 'nt': + # ironpython is only on windows as far as we know + return 'win32' +- return re.split('\d+$', s)[0] ++ return re.split(r'\d+$', s)[0] + + def nada(*k, **kw): + """ +@@ -851,6 +870,19 @@ def lib64(): + return '64' + return '' + ++def loose_version(ver_str): ++ # private for the time being! ++ # see #2402 ++ lst = re.split(r'([.]|\\d+|[a-zA-Z])', ver_str) ++ ver = [] ++ for i, val in enumerate(lst): ++ try: ++ ver.append(int(val)) ++ except ValueError: ++ if val != '.': ++ ver.append(val) ++ return ver ++ + def sane_path(p): + # private function for the time being! + return os.path.abspath(os.path.expanduser(p)) +@@ -871,13 +903,13 @@ def get_process(): + except IndexError: + filepath = os.path.dirname(os.path.abspath(__file__)) + os.sep + 'processor.py' + cmd = [sys.executable, '-c', readf(filepath)] +- return subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, bufsize=0) ++ return subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, bufsize=0, close_fds=not is_win32) + + def run_prefork_process(cmd, kwargs, cargs): + """ + Delegates process execution to a pre-forked process instance. + """ +- if not 'env' in kwargs: ++ if not kwargs.get('env'): + kwargs['env'] = dict(os.environ) + try: + obj = base64.b64encode(cPickle.dumps([cmd, kwargs, cargs])) +diff --git a/waflib/ansiterm.py b/waflib/ansiterm.py +index 0d20c6374..027f0ad68 100644 +--- a/waflib/ansiterm.py ++++ b/waflib/ansiterm.py +@@ -264,7 +264,7 @@ def hide_cursor(self,param): + 'u': pop_cursor, + } + # Match either the escape sequence or text not containing escape sequence +- ansi_tokens = re.compile('(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') ++ ansi_tokens = re.compile(r'(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') + def write(self, text): + try: + wlock.acquire() +diff --git a/waflib/extras/clang_cross.py b/waflib/extras/clang_cross.py +new file mode 100644 +index 000000000..1b51e2886 +--- /dev/null ++++ b/waflib/extras/clang_cross.py +@@ -0,0 +1,92 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Krzysztof Kosi?ski 2014 ++# DragoonX6 2018 ++ ++""" ++Detect the Clang C compiler ++This version is an attempt at supporting the -target and -sysroot flag of Clang. ++""" ++ ++from waflib.Tools import ccroot, ar, gcc ++from waflib.Configure import conf ++import waflib.Context ++import waflib.extras.clang_cross_common ++ ++def options(opt): ++ """ ++ Target triplet for clang:: ++ $ waf configure --clang-target-triple=x86_64-pc-linux-gnu ++ """ ++ cc_compiler_opts = opt.add_option_group('Configuration options') ++ cc_compiler_opts.add_option('--clang-target-triple', default=None, ++ help='Target triple for clang', ++ dest='clang_target_triple') ++ cc_compiler_opts.add_option('--clang-sysroot', default=None, ++ help='Sysroot for clang', ++ dest='clang_sysroot') ++ ++ at conf ++def find_clang(conf): ++ """ ++ Finds the program clang and executes it to ensure it really is clang ++ """ ++ ++ import os ++ ++ cc = conf.find_program('clang', var='CC') ++ ++ if conf.options.clang_target_triple != None: ++ conf.env.append_value('CC', ['-target', conf.options.clang_target_triple]) ++ ++ if conf.options.clang_sysroot != None: ++ sysroot = str() ++ ++ if os.path.isabs(conf.options.clang_sysroot): ++ sysroot = conf.options.clang_sysroot ++ else: ++ sysroot = os.path.normpath(os.path.join(os.getcwd(), conf.options.clang_sysroot)) ++ ++ conf.env.append_value('CC', ['--sysroot', sysroot]) ++ ++ conf.get_cc_version(cc, clang=True) ++ conf.env.CC_NAME = 'clang' ++ ++ at conf ++def clang_modifier_x86_64_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++ at conf ++def clang_modifier_i386_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++ at conf ++def clang_modifier_x86_64_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clang_modifier_x86_64_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++ at conf ++def clang_modifier_i386_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clang_modifier_i386_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++def configure(conf): ++ conf.find_clang() ++ conf.find_program(['llvm-ar', 'ar'], var='AR') ++ conf.find_ar() ++ conf.gcc_common_flags() ++ # Allow the user to provide flags for the target platform. ++ conf.gcc_modifier_platform() ++ # And allow more fine grained control based on the compiler's triplet. ++ conf.clang_modifier_target_triple() ++ conf.cc_load_tools() ++ conf.cc_add_flags() ++ conf.link_add_flags() +diff --git a/waflib/extras/clang_cross_common.py b/waflib/extras/clang_cross_common.py +new file mode 100644 +index 000000000..b76a07006 +--- /dev/null ++++ b/waflib/extras/clang_cross_common.py +@@ -0,0 +1,113 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# DragoonX6 2018 ++ ++""" ++Common routines for cross_clang.py and cross_clangxx.py ++""" ++ ++from waflib.Configure import conf ++import waflib.Context ++ ++def normalize_target_triple(target_triple): ++ target_triple = target_triple[:-1] ++ normalized_triple = target_triple.replace('--', '-unknown-') ++ ++ if normalized_triple.startswith('-'): ++ normalized_triple = 'unknown' + normalized_triple ++ ++ if normalized_triple.endswith('-'): ++ normalized_triple += 'unknown' ++ ++ # Normalize MinGW builds to *arch*-w64-mingw32 ++ if normalized_triple.endswith('windows-gnu'): ++ normalized_triple = normalized_triple[:normalized_triple.index('-')] + '-w64-mingw32' ++ ++ # Strip the vendor when doing msvc builds, since it's unused anyway. ++ if normalized_triple.endswith('windows-msvc'): ++ normalized_triple = normalized_triple[:normalized_triple.index('-')] + '-windows-msvc' ++ ++ return normalized_triple.replace('-', '_') ++ ++ at conf ++def clang_modifier_msvc(conf): ++ import os ++ ++ """ ++ Really basic setup to use clang in msvc mode. ++ We actually don't really want to do a lot, even though clang is msvc compatible ++ in this mode, that doesn't mean we're actually using msvc. ++ It's probably the best to leave it to the user, we can assume msvc mode if the user ++ uses the clang-cl frontend, but this module only concerns itself with the gcc-like frontend. ++ """ ++ v = conf.env ++ v.cprogram_PATTERN = '%s.exe' ++ ++ v.cshlib_PATTERN = '%s.dll' ++ v.implib_PATTERN = '%s.lib' ++ v.IMPLIB_ST = '-Wl,-IMPLIB:%s' ++ v.SHLIB_MARKER = [] ++ ++ v.CFLAGS_cshlib = [] ++ v.LINKFLAGS_cshlib = ['-Wl,-DLL'] ++ v.cstlib_PATTERN = '%s.lib' ++ v.STLIB_MARKER = [] ++ ++ del(v.AR) ++ conf.find_program(['llvm-lib', 'lib'], var='AR') ++ v.ARFLAGS = ['-nologo'] ++ v.AR_TGT_F = ['-out:'] ++ ++ # Default to the linker supplied with llvm instead of link.exe or ld ++ v.LINK_CC = v.CC + ['-fuse-ld=lld', '-nostdlib'] ++ v.CCLNK_TGT_F = ['-o'] ++ v.def_PATTERN = '-Wl,-def:%s' ++ ++ v.LINKFLAGS = [] ++ ++ v.LIB_ST = '-l%s' ++ v.LIBPATH_ST = '-Wl,-LIBPATH:%s' ++ v.STLIB_ST = '-l%s' ++ v.STLIBPATH_ST = '-Wl,-LIBPATH:%s' ++ ++ CFLAGS_CRT_COMMON = [ ++ '-Xclang', '--dependent-lib=oldnames', ++ '-Xclang', '-fno-rtti-data', ++ '-D_MT' ++ ] ++ ++ v.CFLAGS_CRT_MULTITHREADED = CFLAGS_CRT_COMMON + [ ++ '-Xclang', '-flto-visibility-public-std', ++ '-Xclang', '--dependent-lib=libcmt', ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED = v.CFLAGS_CRT_MULTITHREADED ++ ++ v.CFLAGS_CRT_MULTITHREADED_DBG = CFLAGS_CRT_COMMON + [ ++ '-D_DEBUG', ++ '-Xclang', '-flto-visibility-public-std', ++ '-Xclang', '--dependent-lib=libcmtd', ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED_DBG = v.CFLAGS_CRT_MULTITHREADED_DBG ++ ++ v.CFLAGS_CRT_MULTITHREADED_DLL = CFLAGS_CRT_COMMON + [ ++ '-D_DLL', ++ '-Xclang', '--dependent-lib=msvcrt' ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED_DLL = v.CFLAGS_CRT_MULTITHREADED_DLL ++ ++ v.CFLAGS_CRT_MULTITHREADED_DLL_DBG = CFLAGS_CRT_COMMON + [ ++ '-D_DLL', ++ '-D_DEBUG', ++ '-Xclang', '--dependent-lib=msvcrtd', ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED_DLL_DBG = v.CFLAGS_CRT_MULTITHREADED_DLL_DBG ++ ++ at conf ++def clang_modifier_target_triple(conf, cpp=False): ++ compiler = conf.env.CXX if cpp else conf.env.CC ++ output = conf.cmd_and_log(compiler + ['-dumpmachine'], output=waflib.Context.STDOUT) ++ ++ modifier = ('clangxx' if cpp else 'clang') + '_modifier_' ++ clang_modifier_func = getattr(conf, modifier + normalize_target_triple(output), None) ++ if clang_modifier_func: ++ clang_modifier_func() +diff --git a/waflib/extras/clangxx_cross.py b/waflib/extras/clangxx_cross.py +new file mode 100644 +index 000000000..0ad38ad46 +--- /dev/null ++++ b/waflib/extras/clangxx_cross.py +@@ -0,0 +1,106 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Thomas Nagy 2009-2018 (ita) ++# DragoonX6 2018 ++ ++""" ++Detect the Clang++ C++ compiler ++This version is an attempt at supporting the -target and -sysroot flag of Clang++. ++""" ++ ++from waflib.Tools import ccroot, ar, gxx ++from waflib.Configure import conf ++import waflib.extras.clang_cross_common ++ ++def options(opt): ++ """ ++ Target triplet for clang++:: ++ $ waf configure --clangxx-target-triple=x86_64-pc-linux-gnu ++ """ ++ cxx_compiler_opts = opt.add_option_group('Configuration options') ++ cxx_compiler_opts.add_option('--clangxx-target-triple', default=None, ++ help='Target triple for clang++', ++ dest='clangxx_target_triple') ++ cxx_compiler_opts.add_option('--clangxx-sysroot', default=None, ++ help='Sysroot for clang++', ++ dest='clangxx_sysroot') ++ ++ at conf ++def find_clangxx(conf): ++ """ ++ Finds the program clang++, and executes it to ensure it really is clang++ ++ """ ++ ++ import os ++ ++ cxx = conf.find_program('clang++', var='CXX') ++ ++ if conf.options.clangxx_target_triple != None: ++ conf.env.append_value('CXX', ['-target', conf.options.clangxx_target_triple]) ++ ++ if conf.options.clangxx_sysroot != None: ++ sysroot = str() ++ ++ if os.path.isabs(conf.options.clangxx_sysroot): ++ sysroot = conf.options.clangxx_sysroot ++ else: ++ sysroot = os.path.normpath(os.path.join(os.getcwd(), conf.options.clangxx_sysroot)) ++ ++ conf.env.append_value('CXX', ['--sysroot', sysroot]) ++ ++ conf.get_cc_version(cxx, clang=True) ++ conf.env.CXX_NAME = 'clang' ++ ++ at conf ++def clangxx_modifier_x86_64_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++ at conf ++def clangxx_modifier_i386_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++ at conf ++def clangxx_modifier_msvc(conf): ++ v = conf.env ++ v.cxxprogram_PATTERN = v.cprogram_PATTERN ++ v.cxxshlib_PATTERN = v.cshlib_PATTERN ++ ++ v.CXXFLAGS_cxxshlib = [] ++ v.LINKFLAGS_cxxshlib = v.LINKFLAGS_cshlib ++ v.cxxstlib_PATTERN = v.cstlib_PATTERN ++ ++ v.LINK_CXX = v.CXX + ['-fuse-ld=lld', '-nostdlib'] ++ v.CXXLNK_TGT_F = v.CCLNK_TGT_F ++ ++ at conf ++def clangxx_modifier_x86_64_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ conf.clangxx_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clangxx_modifier_x86_64_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++ at conf ++def clangxx_modifier_i386_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ conf.clangxx_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clangxx_modifier_i386_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++def configure(conf): ++ conf.find_clangxx() ++ conf.find_program(['llvm-ar', 'ar'], var='AR') ++ conf.find_ar() ++ conf.gxx_common_flags() ++ # Allow the user to provide flags for the target platform. ++ conf.gxx_modifier_platform() ++ # And allow more fine grained control based on the compiler's triplet. ++ conf.clang_modifier_target_triple(cpp=True) ++ conf.cxx_load_tools() ++ conf.cxx_add_flags() ++ conf.link_add_flags() +diff --git a/waflib/extras/classic_runner.py b/waflib/extras/classic_runner.py +new file mode 100644 +index 000000000..b08c794e8 +--- /dev/null ++++ b/waflib/extras/classic_runner.py +@@ -0,0 +1,68 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Thomas Nagy, 2021 (ita) ++ ++from waflib import Utils, Runner ++ ++""" ++Re-enable the classic threading system from waf 1.x ++ ++def configure(conf): ++ conf.load('classic_runner') ++""" ++ ++class TaskConsumer(Utils.threading.Thread): ++ """ ++ Task consumers belong to a pool of workers ++ ++ They wait for tasks in the queue and then use ``task.process(...)`` ++ """ ++ def __init__(self, spawner): ++ Utils.threading.Thread.__init__(self) ++ """ ++ Obtain :py:class:`waflib.Task.TaskBase` instances from this queue. ++ """ ++ self.spawner = spawner ++ self.daemon = True ++ self.start() ++ ++ def run(self): ++ """ ++ Loop over the tasks to execute ++ """ ++ try: ++ self.loop() ++ except Exception: ++ pass ++ ++ def loop(self): ++ """ ++ Obtain tasks from :py:attr:`waflib.Runner.TaskConsumer.ready` and call ++ :py:meth:`waflib.Task.TaskBase.process`. If the object is a function, execute it. ++ """ ++ master = self.spawner.master ++ while 1: ++ if not master.stop: ++ try: ++ tsk = master.ready.get() ++ if tsk: ++ tsk.log_display(tsk.generator.bld) ++ master.process_task(tsk) ++ else: ++ break ++ finally: ++ master.out.put(tsk) ++ ++class Spawner(object): ++ """ ++ Daemon thread that consumes tasks from :py:class:`waflib.Runner.Parallel` producer and ++ spawns a consuming thread :py:class:`waflib.Runner.Consumer` for each ++ :py:class:`waflib.Task.Task` instance. ++ """ ++ def __init__(self, master): ++ self.master = master ++ """:py:class:`waflib.Runner.Parallel` producer instance""" ++ ++ self.pool = [TaskConsumer(self) for i in range(master.numjobs)] ++ ++Runner.Spawner = Spawner +diff --git a/waflib/extras/color_msvc.py b/waflib/extras/color_msvc.py +new file mode 100644 +index 000000000..60bacb7b2 +--- /dev/null ++++ b/waflib/extras/color_msvc.py +@@ -0,0 +1,59 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++ ++# Replaces the default formatter by one which understands MSVC output and colorizes it. ++# Modified from color_gcc.py ++ ++__author__ = __maintainer__ = "Alibek Omarov " ++__copyright__ = "Alibek Omarov, 2019" ++ ++import sys ++from waflib import Logs ++ ++class ColorMSVCFormatter(Logs.formatter): ++ def __init__(self, colors): ++ self.colors = colors ++ Logs.formatter.__init__(self) ++ ++ def parseMessage(self, line, color): ++ # Split messaage from 'disk:filepath: type: message' ++ arr = line.split(':', 3) ++ if len(arr) < 4: ++ return line ++ ++ colored = self.colors.BOLD + arr[0] + ':' + arr[1] + ':' + self.colors.NORMAL ++ colored += color + arr[2] + ':' + self.colors.NORMAL ++ colored += arr[3] ++ return colored ++ ++ def format(self, rec): ++ frame = sys._getframe() ++ while frame: ++ func = frame.f_code.co_name ++ if func == 'exec_command': ++ cmd = frame.f_locals.get('cmd') ++ if isinstance(cmd, list): ++ # Fix file case, it may be CL.EXE or cl.exe ++ argv0 = cmd[0].lower() ++ if 'cl.exe' in argv0: ++ lines = [] ++ # This will not work with "localized" versions ++ # of MSVC ++ for line in rec.msg.splitlines(): ++ if ': warning ' in line: ++ lines.append(self.parseMessage(line, self.colors.YELLOW)) ++ elif ': error ' in line: ++ lines.append(self.parseMessage(line, self.colors.RED)) ++ elif ': fatal error ' in line: ++ lines.append(self.parseMessage(line, self.colors.RED + self.colors.BOLD)) ++ elif ': note: ' in line: ++ lines.append(self.parseMessage(line, self.colors.CYAN)) ++ else: ++ lines.append(line) ++ rec.msg = "\n".join(lines) ++ frame = frame.f_back ++ return Logs.formatter.format(self, rec) ++ ++def options(opt): ++ Logs.log.handlers[0].setFormatter(ColorMSVCFormatter(Logs.colors)) ++ +diff --git a/waflib/extras/fc_fujitsu.py b/waflib/extras/fc_fujitsu.py +new file mode 100644 +index 000000000..cae676c20 +--- /dev/null ++++ b/waflib/extras/fc_fujitsu.py +@@ -0,0 +1,52 @@ ++#! /usr/bin/env python ++# encoding: utf-8 ++# Detection of the Fujitsu Fortran compiler for ARM64FX ++ ++import re ++from waflib.Tools import fc,fc_config,fc_scan ++from waflib.Configure import conf ++from waflib.Tools.compiler_fc import fc_compiler ++fc_compiler['linux'].append('fc_fujitsu') ++ ++ at conf ++def find_fujitsu(conf): ++ fc=conf.find_program(['frtpx'],var='FC') ++ conf.get_fujitsu_version(fc) ++ conf.env.FC_NAME='FUJITSU' ++ conf.env.FC_MOD_CAPITALIZATION='lower' ++ ++ at conf ++def fujitsu_flags(conf): ++ v=conf.env ++ v['_FCMODOUTFLAGS']=[] ++ v['FCFLAGS_DEBUG']=[] ++ v['FCFLAGS_fcshlib']=[] ++ v['LINKFLAGS_fcshlib']=[] ++ v['FCSTLIB_MARKER']='' ++ v['FCSHLIB_MARKER']='' ++ ++ at conf ++def get_fujitsu_version(conf,fc): ++ version_re=re.compile(r"frtpx\s*\(FRT\)\s*(?P\d+)\.(?P\d+)\.",re.I).search ++ cmd=fc+['--version'] ++ out,err=fc_config.getoutput(conf,cmd,stdin=False) ++ if out: ++ match=version_re(out) ++ else: ++ match=version_re(err) ++ if not match: ++ return(False) ++ conf.fatal('Could not determine the Fujitsu FRT Fortran compiler version.') ++ else: ++ k=match.groupdict() ++ conf.env['FC_VERSION']=(k['major'],k['minor']) ++ ++def configure(conf): ++ conf.find_fujitsu() ++ conf.find_program('ar',var='AR') ++ conf.add_os_flags('ARFLAGS') ++ if not conf.env.ARFLAGS: ++ conf.env.ARFLAGS=['rcs'] ++ conf.fc_flags() ++ conf.fc_add_flags() ++ conf.fujitsu_flags() +diff --git a/waflib/extras/fc_nfort.py b/waflib/extras/fc_nfort.py +new file mode 100644 +index 000000000..c25886b8e +--- /dev/null ++++ b/waflib/extras/fc_nfort.py +@@ -0,0 +1,52 @@ ++#! /usr/bin/env python ++# encoding: utf-8 ++# Detection of the NEC Fortran compiler for Aurora Tsubasa ++ ++import re ++from waflib.Tools import fc,fc_config,fc_scan ++from waflib.Configure import conf ++from waflib.Tools.compiler_fc import fc_compiler ++fc_compiler['linux'].append('fc_nfort') ++ ++ at conf ++def find_nfort(conf): ++ fc=conf.find_program(['nfort'],var='FC') ++ conf.get_nfort_version(fc) ++ conf.env.FC_NAME='NFORT' ++ conf.env.FC_MOD_CAPITALIZATION='lower' ++ ++ at conf ++def nfort_flags(conf): ++ v=conf.env ++ v['_FCMODOUTFLAGS']=[] ++ v['FCFLAGS_DEBUG']=[] ++ v['FCFLAGS_fcshlib']=[] ++ v['LINKFLAGS_fcshlib']=[] ++ v['FCSTLIB_MARKER']='' ++ v['FCSHLIB_MARKER']='' ++ ++ at conf ++def get_nfort_version(conf,fc): ++ version_re=re.compile(r"nfort\s*\(NFORT\)\s*(?P\d+)\.(?P\d+)\.",re.I).search ++ cmd=fc+['--version'] ++ out,err=fc_config.getoutput(conf,cmd,stdin=False) ++ if out: ++ match=version_re(out) ++ else: ++ match=version_re(err) ++ if not match: ++ return(False) ++ conf.fatal('Could not determine the NEC NFORT Fortran compiler version.') ++ else: ++ k=match.groupdict() ++ conf.env['FC_VERSION']=(k['major'],k['minor']) ++ ++def configure(conf): ++ conf.find_nfort() ++ conf.find_program('nar',var='AR') ++ conf.add_os_flags('ARFLAGS') ++ if not conf.env.ARFLAGS: ++ conf.env.ARFLAGS=['rcs'] ++ conf.fc_flags() ++ conf.fc_add_flags() ++ conf.nfort_flags() +diff --git a/waflib/extras/genpybind.py b/waflib/extras/genpybind.py +new file mode 100644 +index 000000000..ac206ee8a +--- /dev/null ++++ b/waflib/extras/genpybind.py +@@ -0,0 +1,194 @@ ++import os ++import pipes ++import subprocess ++import sys ++ ++from waflib import Logs, Task, Context ++from waflib.Tools.c_preproc import scan as scan_impl ++# ^-- Note: waflib.extras.gccdeps.scan does not work for us, ++# due to its current implementation: ++# The -MD flag is injected into the {C,CXX}FLAGS environment variable and ++# dependencies are read out in a separate step after compiling by reading ++# the .d file saved alongside the object file. ++# As the genpybind task refers to a header file that is never compiled itself, ++# gccdeps will not be able to extract the list of dependencies. ++ ++from waflib.TaskGen import feature, before_method ++ ++ ++def join_args(args): ++ return " ".join(pipes.quote(arg) for arg in args) ++ ++ ++def configure(cfg): ++ cfg.load("compiler_cxx") ++ cfg.load("python") ++ cfg.check_python_version(minver=(2, 7)) ++ if not cfg.env.LLVM_CONFIG: ++ cfg.find_program("llvm-config", var="LLVM_CONFIG") ++ if not cfg.env.GENPYBIND: ++ cfg.find_program("genpybind", var="GENPYBIND") ++ ++ # find clang reasource dir for builtin headers ++ cfg.env.GENPYBIND_RESOURCE_DIR = os.path.join( ++ cfg.cmd_and_log(cfg.env.LLVM_CONFIG + ["--libdir"]).strip(), ++ "clang", ++ cfg.cmd_and_log(cfg.env.LLVM_CONFIG + ["--version"]).strip()) ++ if os.path.exists(cfg.env.GENPYBIND_RESOURCE_DIR): ++ cfg.msg("Checking clang resource dir", cfg.env.GENPYBIND_RESOURCE_DIR) ++ else: ++ cfg.fatal("Clang resource dir not found") ++ ++ ++ at feature("genpybind") ++ at before_method("process_source") ++def generate_genpybind_source(self): ++ """ ++ Run genpybind on the headers provided in `source` and compile/link the ++ generated code instead. This works by generating the code on the fly and ++ swapping the source node before `process_source` is run. ++ """ ++ # name of module defaults to name of target ++ module = getattr(self, "module", self.target) ++ ++ # create temporary source file in build directory to hold generated code ++ out = "genpybind-%s.%d.cpp" % (module, self.idx) ++ out = self.path.get_bld().find_or_declare(out) ++ ++ task = self.create_task("genpybind", self.to_nodes(self.source), out) ++ # used to detect whether CFLAGS or CXXFLAGS should be passed to genpybind ++ task.features = self.features ++ task.module = module ++ # can be used to select definitions to include in the current module ++ # (when header files are shared by more than one module) ++ task.genpybind_tags = self.to_list(getattr(self, "genpybind_tags", [])) ++ # additional include directories ++ task.includes = self.to_list(getattr(self, "includes", [])) ++ task.genpybind = self.env.GENPYBIND ++ ++ # Tell waf to compile/link the generated code instead of the headers ++ # originally passed-in via the `source` parameter. (see `process_source`) ++ self.source = [out] ++ ++ ++class genpybind(Task.Task): # pylint: disable=invalid-name ++ """ ++ Runs genpybind on headers provided as input to this task. ++ Generated code will be written to the first (and only) output node. ++ """ ++ quiet = True ++ color = "PINK" ++ scan = scan_impl ++ ++ @staticmethod ++ def keyword(): ++ return "Analyzing" ++ ++ def run(self): ++ if not self.inputs: ++ return ++ ++ args = self.find_genpybind() + self._arguments( ++ resource_dir=self.env.GENPYBIND_RESOURCE_DIR) ++ ++ output = self.run_genpybind(args) ++ ++ # For debugging / log output ++ pasteable_command = join_args(args) ++ ++ # write generated code to file in build directory ++ # (will be compiled during process_source stage) ++ (output_node,) = self.outputs ++ output_node.write("// {}\n{}\n".format( ++ pasteable_command.replace("\n", "\n// "), output)) ++ ++ def find_genpybind(self): ++ return self.genpybind ++ ++ def run_genpybind(self, args): ++ bld = self.generator.bld ++ ++ kwargs = dict(cwd=bld.variant_dir) ++ if hasattr(bld, "log_command"): ++ bld.log_command(args, kwargs) ++ else: ++ Logs.debug("runner: {!r}".format(args)) ++ proc = subprocess.Popen( ++ args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs) ++ stdout, stderr = proc.communicate() ++ ++ if not isinstance(stdout, str): ++ stdout = stdout.decode(sys.stdout.encoding, errors="replace") ++ if not isinstance(stderr, str): ++ stderr = stderr.decode(sys.stderr.encoding, errors="replace") ++ ++ if proc.returncode != 0: ++ bld.fatal( ++ "genpybind returned {code} during the following call:" ++ "\n{command}\n\n{stdout}\n\n{stderr}".format( ++ code=proc.returncode, ++ command=join_args(args), ++ stdout=stdout, ++ stderr=stderr, ++ )) ++ ++ if stderr.strip(): ++ Logs.debug("non-fatal warnings during genpybind run:\n{}".format(stderr)) ++ ++ return stdout ++ ++ def _include_paths(self): ++ return self.generator.to_incnodes(self.includes + self.env.INCLUDES) ++ ++ def _inputs_as_relative_includes(self): ++ include_paths = self._include_paths() ++ relative_includes = [] ++ for node in self.inputs: ++ for inc in include_paths: ++ if node.is_child_of(inc): ++ relative_includes.append(node.path_from(inc)) ++ break ++ else: ++ self.generator.bld.fatal("could not resolve {}".format(node)) ++ return relative_includes ++ ++ def _arguments(self, genpybind_parse=None, resource_dir=None): ++ args = [] ++ relative_includes = self._inputs_as_relative_includes() ++ is_cxx = "cxx" in self.features ++ ++ # options for genpybind ++ args.extend(["--genpybind-module", self.module]) ++ if self.genpybind_tags: ++ args.extend(["--genpybind-tag"] + self.genpybind_tags) ++ if relative_includes: ++ args.extend(["--genpybind-include"] + relative_includes) ++ if genpybind_parse: ++ args.extend(["--genpybind-parse", genpybind_parse]) ++ ++ args.append("--") ++ ++ # headers to be processed by genpybind ++ args.extend(node.abspath() for node in self.inputs) ++ ++ args.append("--") ++ ++ # options for clang/genpybind-parse ++ args.append("-D__GENPYBIND__") ++ args.append("-xc++" if is_cxx else "-xc") ++ has_std_argument = False ++ for flag in self.env["CXXFLAGS" if is_cxx else "CFLAGS"]: ++ flag = flag.replace("-std=gnu", "-std=c") ++ if flag.startswith("-std=c"): ++ has_std_argument = True ++ args.append(flag) ++ if not has_std_argument: ++ args.append("-std=c++14") ++ args.extend("-I{}".format(n.abspath()) for n in self._include_paths()) ++ args.extend("-D{}".format(p) for p in self.env.DEFINES) ++ ++ # point to clang resource dir, if specified ++ if resource_dir: ++ args.append("-resource-dir={}".format(resource_dir)) ++ ++ return args +diff --git a/waflib/extras/haxe.py b/waflib/extras/haxe.py +new file mode 100644 +index 000000000..4ff374579 +--- /dev/null ++++ b/waflib/extras/haxe.py +@@ -0,0 +1,154 @@ ++import re ++ ++from waflib import Utils, Task, Errors, Logs ++from waflib.Configure import conf ++from waflib.TaskGen import extension, taskgen_method ++ ++HAXE_COMPILERS = { ++ 'JS': {'tgt': '--js', 'ext_out': ['.js']}, ++ 'LUA': {'tgt': '--lua', 'ext_out': ['.lua']}, ++ 'SWF': {'tgt': '--swf', 'ext_out': ['.swf']}, ++ 'NEKO': {'tgt': '--neko', 'ext_out': ['.n']}, ++ 'PHP': {'tgt': '--php', 'ext_out': ['.php']}, ++ 'CPP': {'tgt': '--cpp', 'ext_out': ['.h', '.cpp']}, ++ 'CPPIA': {'tgt': '--cppia', 'ext_out': ['.cppia']}, ++ 'CS': {'tgt': '--cs', 'ext_out': ['.cs']}, ++ 'JAVA': {'tgt': '--java', 'ext_out': ['.java']}, ++ 'JVM': {'tgt': '--jvm', 'ext_out': ['.jar']}, ++ 'PYTHON': {'tgt': '--python', 'ext_out': ['.py']}, ++ 'HL': {'tgt': '--hl', 'ext_out': ['.hl']}, ++ 'HLC': {'tgt': '--hl', 'ext_out': ['.h', '.c']}, ++} ++ ++ at conf ++def check_haxe_pkg(self, **kw): ++ self.find_program('haxelib') ++ libs = kw.get('libs') ++ if not libs or not (type(libs) == str or (type(libs) == list and all(isinstance(s, str) for s in libs))): ++ self.fatal('Specify correct libs value in ensure call') ++ return ++ fetch = kw.get('fetch') ++ if not fetch is None and not type(fetch) == bool: ++ self.fatal('Specify correct fetch value in ensure call') ++ ++ libs = [libs] if type(libs) == str else libs ++ halt = False ++ for lib in libs: ++ try: ++ self.start_msg('Checking for library %s' % lib) ++ output = self.cmd_and_log(self.env.HAXELIB + ['list', lib]) ++ except Errors.WafError: ++ self.end_msg(False) ++ self.fatal('Can\'t run haxelib list, ensuring halted') ++ return ++ ++ if lib in output: ++ self.end_msg(lib in output) ++ else: ++ if not fetch: ++ self.end_msg(False) ++ halt = True ++ continue ++ try: ++ status = self.exec_command(self.env.HAXELIB + ['install', lib]) ++ if status: ++ self.end_msg(False) ++ self.fatal('Can\'t get %s with haxelib, ensuring halted' % lib) ++ return ++ else: ++ self.end_msg('downloaded', color='YELLOW') ++ except Errors.WafError: ++ self.end_msg(False) ++ self.fatal('Can\'t run haxelib install, ensuring halted') ++ return ++ postfix = kw.get('uselib_store') or lib.upper() ++ self.env.append_unique('LIB_' + postfix, lib) ++ ++ if halt: ++ self.fatal('Can\'t find libraries in haxelib list, ensuring halted') ++ return ++ ++class haxe(Task.Task): ++ vars = ['HAXE_VERSION', 'HAXE_FLAGS'] ++ ext_in = ['.hx'] ++ ++ def run(self): ++ cmd = self.env.HAXE + self.env.HAXE_FLAGS_DEFAULT + self.env.HAXE_FLAGS ++ return self.exec_command(cmd) ++ ++for COMP in HAXE_COMPILERS: ++ # create runners for each compile target ++ type("haxe_" + COMP, (haxe,), {'ext_out': HAXE_COMPILERS[COMP]['ext_out']}) ++ ++ at taskgen_method ++def init_haxe(self): ++ errmsg = '%s not found, specify correct value' ++ try: ++ compiler = HAXE_COMPILERS[self.compiler] ++ comp_tgt = compiler['tgt'] ++ comp_mod = '/main.c' if self.compiler == 'HLC' else '' ++ except (AttributeError, KeyError): ++ self.bld.fatal(errmsg % 'COMPILER' + ': ' + ', '.join(HAXE_COMPILERS.keys())) ++ return ++ ++ self.env.append_value( ++ 'HAXE_FLAGS', ++ [comp_tgt, self.path.get_bld().make_node(self.target + comp_mod).abspath()]) ++ if hasattr(self, 'use'): ++ if not (type(self.use) == str or type(self.use) == list): ++ self.bld.fatal(errmsg % 'USE') ++ return ++ self.use = [self.use] if type(self.use) == str else self.use ++ ++ for dep in self.use: ++ if self.env['LIB_' + dep]: ++ for lib in self.env['LIB_' + dep]: ++ self.env.append_value('HAXE_FLAGS', ['-lib', lib]) ++ ++ if hasattr(self, 'res'): ++ if not type(self.res) == str: ++ self.bld.fatal(errmsg % 'RES') ++ return ++ self.env.append_value('HAXE_FLAGS', ['-D', 'resourcesPath=%s' % self.res]) ++ ++ at extension('.hx') ++def haxe_hook(self, node): ++ if len(self.source) > 1: ++ self.bld.fatal('Use separate task generators for multiple files') ++ return ++ ++ src = node ++ tgt = self.path.get_bld().find_or_declare(self.target) ++ ++ self.init_haxe() ++ self.create_task('haxe_' + self.compiler, src, tgt) ++ ++ at conf ++def check_haxe(self, mini=None, maxi=None): ++ self.start_msg('Checking for haxe version') ++ try: ++ curr = re.search( ++ r'(\d+.?)+', ++ self.cmd_and_log(self.env.HAXE + ['-version'])).group() ++ except Errors.WafError: ++ self.end_msg(False) ++ self.fatal('Can\'t get haxe version') ++ return ++ ++ if mini and Utils.num2ver(curr) < Utils.num2ver(mini): ++ self.end_msg('wrong', color='RED') ++ self.fatal('%s is too old, need >= %s' % (curr, mini)) ++ return ++ if maxi and Utils.num2ver(curr) > Utils.num2ver(maxi): ++ self.end_msg('wrong', color='RED') ++ self.fatal('%s is too new, need <= %s' % (curr, maxi)) ++ return ++ self.end_msg(curr, color='GREEN') ++ self.env.HAXE_VERSION = curr ++ ++def configure(self): ++ self.env.append_value( ++ 'HAXE_FLAGS_DEFAULT', ++ ['-D', 'no-compilation', '-cp', self.path.abspath()]) ++ Logs.warn('Default flags: %s' % ' '.join(self.env.HAXE_FLAGS_DEFAULT)) ++ self.find_program('haxe') +diff --git a/waflib/extras/msvc_pdb.py b/waflib/extras/msvc_pdb.py +new file mode 100644 +index 000000000..077656b4f +--- /dev/null ++++ b/waflib/extras/msvc_pdb.py +@@ -0,0 +1,46 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Rafa?l Kooi 2019 ++ ++from waflib import TaskGen ++ ++ at TaskGen.feature('c', 'cxx', 'fc') ++ at TaskGen.after_method('propagate_uselib_vars') ++def add_pdb_per_object(self): ++ """For msvc/fortran, specify a unique compile pdb per object, to work ++ around LNK4099. Flags are updated with a unique /Fd flag based on the ++ task output name. This is separate from the link pdb. ++ """ ++ if not hasattr(self, 'compiled_tasks'): ++ return ++ ++ link_task = getattr(self, 'link_task', None) ++ ++ for task in self.compiled_tasks: ++ if task.inputs and task.inputs[0].name.lower().endswith('.rc'): ++ continue ++ ++ add_pdb = False ++ for flagname in ('CFLAGS', 'CXXFLAGS', 'FCFLAGS'): ++ # several languages may be used at once ++ for flag in task.env[flagname]: ++ if flag[1:].lower() == 'zi': ++ add_pdb = True ++ break ++ ++ if add_pdb: ++ node = task.outputs[0].change_ext('.pdb') ++ pdb_flag = '/Fd:' + node.abspath() ++ ++ for flagname in ('CFLAGS', 'CXXFLAGS', 'FCFLAGS'): ++ buf = [pdb_flag] ++ for flag in task.env[flagname]: ++ if flag[1:3] == 'Fd' or flag[1:].lower() == 'fs' or flag[1:].lower() == 'mp': ++ continue ++ buf.append(flag) ++ task.env[flagname] = buf ++ ++ if link_task and not node in link_task.dep_nodes: ++ link_task.dep_nodes.append(node) ++ if not node in task.outputs: ++ task.outputs.append(node) +diff --git a/waflib/extras/sphinx.py b/waflib/extras/sphinx.py +new file mode 100644 +index 000000000..08f3cfd8a +--- /dev/null ++++ b/waflib/extras/sphinx.py +@@ -0,0 +1,120 @@ ++"""Support for Sphinx documentation ++ ++This is a wrapper for sphinx-build program. Please note that sphinx-build supports only ++one output format at a time, but the tool can create multiple tasks to handle more. ++The output formats can be passed via the sphinx_output_format, which is an array of ++strings. For backwards compatibility if only one output is needed, it can be passed ++as a single string. ++The default output format is html. ++ ++Specific formats can be installed in different directories by specifying the ++install_path_ attribute. If not defined, the standard install_path ++will be used instead. ++ ++Example wscript: ++ ++def configure(cnf): ++ conf.load('sphinx') ++ ++def build(bld): ++ bld( ++ features='sphinx', ++ sphinx_source='sources', # path to source directory ++ sphinx_options='-a -v', # sphinx-build program additional options ++ sphinx_output_format=['html', 'man'], # output format of sphinx documentation ++ install_path_man='${DOCDIR}/man' # put man pages in a specific directory ++ ) ++ ++""" ++ ++from waflib.Node import Node ++from waflib import Utils ++from waflib import Task ++from waflib.TaskGen import feature, after_method ++ ++ ++def configure(cnf): ++ """Check if sphinx-build program is available and loads gnu_dirs tool.""" ++ cnf.find_program('sphinx-build', var='SPHINX_BUILD', mandatory=False) ++ cnf.load('gnu_dirs') ++ ++ ++ at feature('sphinx') ++def build_sphinx(self): ++ """Builds sphinx sources. ++ """ ++ if not self.env.SPHINX_BUILD: ++ self.bld.fatal('Program SPHINX_BUILD not defined.') ++ if not getattr(self, 'sphinx_source', None): ++ self.bld.fatal('Attribute sphinx_source not defined.') ++ if not isinstance(self.sphinx_source, Node): ++ self.sphinx_source = self.path.find_node(self.sphinx_source) ++ if not self.sphinx_source: ++ self.bld.fatal('Can\'t find sphinx_source: %r' % self.sphinx_source) ++ ++ # In the taskgen we have the complete list of formats ++ Utils.def_attrs(self, sphinx_output_format='html') ++ self.sphinx_output_format = Utils.to_list(self.sphinx_output_format) ++ ++ self.env.SPHINX_OPTIONS = getattr(self, 'sphinx_options', []) ++ ++ for source_file in self.sphinx_source.ant_glob('**/*'): ++ self.bld.add_manual_dependency(self.sphinx_source, source_file) ++ ++ for cfmt in self.sphinx_output_format: ++ sphinx_build_task = self.create_task('SphinxBuildingTask') ++ sphinx_build_task.set_inputs(self.sphinx_source) ++ # In task we keep the specific format this task is generating ++ sphinx_build_task.env.SPHINX_OUTPUT_FORMAT = cfmt ++ ++ # the sphinx-build results are in directory ++ sphinx_build_task.sphinx_output_directory = self.path.get_bld().make_node(cfmt) ++ sphinx_build_task.set_outputs(sphinx_build_task.sphinx_output_directory) ++ sphinx_build_task.sphinx_output_directory.mkdir() ++ ++ Utils.def_attrs(sphinx_build_task, install_path=getattr(self, 'install_path_' + cfmt, getattr(self, 'install_path', get_install_path(sphinx_build_task)))) ++ ++ ++def get_install_path(object): ++ if object.env.SPHINX_OUTPUT_FORMAT == 'man': ++ return object.env.MANDIR ++ elif object.env.SPHINX_OUTPUT_FORMAT == 'info': ++ return object.env.INFODIR ++ else: ++ return object.env.DOCDIR ++ ++ ++class SphinxBuildingTask(Task.Task): ++ color = 'BOLD' ++ run_str = '${SPHINX_BUILD} -M ${SPHINX_OUTPUT_FORMAT} ${SRC} ${TGT} -d ${TGT[0].bld_dir()}/doctrees-${SPHINX_OUTPUT_FORMAT} ${SPHINX_OPTIONS}' ++ ++ def keyword(self): ++ return 'Compiling (%s)' % self.env.SPHINX_OUTPUT_FORMAT ++ ++ def runnable_status(self): ++ ++ for x in self.run_after: ++ if not x.hasrun: ++ return Task.ASK_LATER ++ ++ self.signature() ++ ret = Task.Task.runnable_status(self) ++ if ret == Task.SKIP_ME: ++ # in case the files were removed ++ self.add_install() ++ return ret ++ ++ ++ def post_run(self): ++ self.add_install() ++ return Task.Task.post_run(self) ++ ++ ++ def add_install(self): ++ nodes = self.sphinx_output_directory.ant_glob('**/*', quiet=True) ++ self.outputs += nodes ++ self.generator.add_install_files(install_to=self.install_path, ++ install_from=nodes, ++ postpone=False, ++ cwd=self.sphinx_output_directory.make_node(self.env.SPHINX_OUTPUT_FORMAT), ++ relative_trick=True) +diff --git a/waflib/extras/wafcache.py b/waflib/extras/wafcache.py +new file mode 100644 +index 000000000..30ac3ef51 +--- /dev/null ++++ b/waflib/extras/wafcache.py +@@ -0,0 +1,648 @@ ++#! /usr/bin/env python ++# encoding: utf-8 ++# Thomas Nagy, 2019 (ita) ++ ++""" ++Filesystem-based cache system to share and re-use build artifacts ++ ++Cache access operations (copy to and from) are delegated to ++independent pre-forked worker subprocesses. ++ ++The following environment variables may be set: ++* WAFCACHE: several possibilities: ++ - File cache: ++ absolute path of the waf cache (~/.cache/wafcache_user, ++ where `user` represents the currently logged-in user) ++ - URL to a cache server, for example: ++ export WAFCACHE=http://localhost:8080/files/ ++ in that case, GET/POST requests are made to urls of the form ++ http://localhost:8080/files/000000000/0 (cache management is delegated to the server) ++ - GCS, S3 or MINIO bucket ++ gs://my-bucket/ (uses gsutil command line tool or WAFCACHE_CMD) ++ s3://my-bucket/ (uses aws command line tool or WAFCACHE_CMD) ++ minio://my-bucket/ (uses mc command line tool or WAFCACHE_CMD) ++* WAFCACHE_CMD: bucket upload/download command, for example: ++ WAFCACHE_CMD="gsutil cp %{SRC} %{TGT}" ++ Note that the WAFCACHE bucket value is used for the source or destination ++ depending on the operation (upload or download). For example, with: ++ WAFCACHE="gs://mybucket/" ++ the following commands may be run: ++ gsutil cp build/myprogram gs://mybucket/aa/aaaaa/1 ++ gsutil cp gs://mybucket/bb/bbbbb/2 build/somefile ++* WAFCACHE_NO_PUSH: if set, disables pushing to the cache ++* WAFCACHE_VERBOSITY: if set, displays more detailed cache operations ++* WAFCACHE_STATS: if set, displays cache usage statistics on exit ++ ++File cache specific options: ++ Files are copied using hard links by default; if the cache is located ++ onto another partition, the system switches to file copies instead. ++* WAFCACHE_TRIM_MAX_FOLDER: maximum amount of tasks to cache (1M) ++* WAFCACHE_EVICT_MAX_BYTES: maximum amount of cache size in bytes (10GB) ++* WAFCACHE_EVICT_INTERVAL_MINUTES: minimum time interval to try ++ and trim the cache (3 minutes) ++ ++Upload specific options: ++* WAFCACHE_ASYNC_WORKERS: define a number of workers to upload results asynchronously ++ this may improve build performance with many/long file uploads ++ the default is unset (synchronous uploads) ++* WAFCACHE_ASYNC_NOWAIT: do not wait for uploads to complete (default: False) ++ this requires asynchonous uploads to have an effect ++ ++Usage:: ++ ++ def build(bld): ++ bld.load('wafcache') ++ ... ++ ++To troubleshoot:: ++ ++ waf clean build --zone=wafcache ++""" ++ ++import atexit, base64, errno, fcntl, getpass, os, re, shutil, sys, time, threading, traceback, urllib3, shlex ++try: ++ import subprocess32 as subprocess ++except ImportError: ++ import subprocess ++ ++base_cache = os.path.expanduser('~/.cache/') ++if not os.path.isdir(base_cache): ++ base_cache = '/tmp/' ++default_wafcache_dir = os.path.join(base_cache, 'wafcache_' + getpass.getuser()) ++ ++CACHE_DIR = os.environ.get('WAFCACHE', default_wafcache_dir) ++WAFCACHE_CMD = os.environ.get('WAFCACHE_CMD') ++TRIM_MAX_FOLDERS = int(os.environ.get('WAFCACHE_TRIM_MAX_FOLDER', 1000000)) ++EVICT_INTERVAL_MINUTES = int(os.environ.get('WAFCACHE_EVICT_INTERVAL_MINUTES', 3)) ++EVICT_MAX_BYTES = int(os.environ.get('WAFCACHE_EVICT_MAX_BYTES', 10**10)) ++WAFCACHE_NO_PUSH = 1 if os.environ.get('WAFCACHE_NO_PUSH') else 0 ++WAFCACHE_VERBOSITY = 1 if os.environ.get('WAFCACHE_VERBOSITY') else 0 ++WAFCACHE_STATS = 1 if os.environ.get('WAFCACHE_STATS') else 0 ++WAFCACHE_ASYNC_WORKERS = os.environ.get('WAFCACHE_ASYNC_WORKERS') ++WAFCACHE_ASYNC_NOWAIT = os.environ.get('WAFCACHE_ASYNC_NOWAIT') ++OK = "ok" ++ ++re_waf_cmd = re.compile('(?P%{SRC})|(?P%{TGT})') ++ ++try: ++ import cPickle ++except ImportError: ++ import pickle as cPickle ++ ++if __name__ != '__main__': ++ from waflib import Task, Logs, Utils, Build ++ ++def can_retrieve_cache(self): ++ """ ++ New method for waf Task classes ++ """ ++ if not self.outputs: ++ return False ++ ++ self.cached = False ++ ++ sig = self.signature() ++ ssig = Utils.to_hex(self.uid() + sig) ++ ++ if WAFCACHE_STATS: ++ self.generator.bld.cache_reqs += 1 ++ ++ files_to = [node.abspath() for node in self.outputs] ++ proc = get_process() ++ err = cache_command(proc, ssig, [], files_to) ++ process_pool.append(proc) ++ if err.startswith(OK): ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('CYAN', ' Fetched %r from cache' % files_to) ++ else: ++ Logs.debug('wafcache: fetched %r from cache', files_to) ++ if WAFCACHE_STATS: ++ self.generator.bld.cache_hits += 1 ++ else: ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('YELLOW', ' No cache entry %s' % files_to) ++ else: ++ Logs.debug('wafcache: No cache entry %s: %s', files_to, err) ++ return False ++ ++ self.cached = True ++ return True ++ ++def put_files_cache(self): ++ """ ++ New method for waf Task classes ++ """ ++ if WAFCACHE_NO_PUSH or getattr(self, 'cached', None) or not self.outputs: ++ return ++ ++ files_from = [] ++ for node in self.outputs: ++ path = node.abspath() ++ if not os.path.isfile(path): ++ return ++ files_from.append(path) ++ ++ bld = self.generator.bld ++ old_sig = self.signature() ++ ++ for node in self.inputs: ++ try: ++ del node.ctx.cache_sig[node] ++ except KeyError: ++ pass ++ ++ delattr(self, 'cache_sig') ++ sig = self.signature() ++ ++ def _async_put_files_cache(bld, ssig, files_from): ++ proc = get_process() ++ if WAFCACHE_ASYNC_WORKERS: ++ with bld.wafcache_lock: ++ if bld.wafcache_stop: ++ process_pool.append(proc) ++ return ++ bld.wafcache_procs.add(proc) ++ ++ err = cache_command(proc, ssig, files_from, []) ++ process_pool.append(proc) ++ if err.startswith(OK): ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('CYAN', ' Successfully uploaded %s to cache' % files_from) ++ else: ++ Logs.debug('wafcache: Successfully uploaded %r to cache', files_from) ++ if WAFCACHE_STATS: ++ bld.cache_puts += 1 ++ else: ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('RED', ' Error caching step results %s: %s' % (files_from, err)) ++ else: ++ Logs.debug('wafcache: Error caching results %s: %s', files_from, err) ++ ++ if old_sig == sig: ++ ssig = Utils.to_hex(self.uid() + sig) ++ if WAFCACHE_ASYNC_WORKERS: ++ fut = bld.wafcache_executor.submit(_async_put_files_cache, bld, ssig, files_from) ++ bld.wafcache_uploads.append(fut) ++ else: ++ _async_put_files_cache(bld, ssig, files_from) ++ else: ++ Logs.debug('wafcache: skipped %r upload due to late input modifications %r', self.outputs, self.inputs) ++ ++ bld.task_sigs[self.uid()] = self.cache_sig ++ ++def hash_env_vars(self, env, vars_lst): ++ """ ++ Reimplement BuildContext.hash_env_vars so that the resulting hash does not depend on local paths ++ """ ++ if not env.table: ++ env = env.parent ++ if not env: ++ return Utils.SIG_NIL ++ ++ idx = str(id(env)) + str(vars_lst) ++ try: ++ cache = self.cache_env ++ except AttributeError: ++ cache = self.cache_env = {} ++ else: ++ try: ++ return self.cache_env[idx] ++ except KeyError: ++ pass ++ ++ v = str([env[a] for a in vars_lst]) ++ v = v.replace(self.srcnode.abspath().__repr__()[:-1], '') ++ m = Utils.md5() ++ m.update(v.encode()) ++ ret = m.digest() ++ ++ Logs.debug('envhash: %r %r', ret, v) ++ ++ cache[idx] = ret ++ ++ return ret ++ ++def uid(self): ++ """ ++ Reimplement Task.uid() so that the signature does not depend on local paths ++ """ ++ try: ++ return self.uid_ ++ except AttributeError: ++ m = Utils.md5() ++ src = self.generator.bld.srcnode ++ up = m.update ++ up(self.__class__.__name__.encode()) ++ for x in self.inputs + self.outputs: ++ up(x.path_from(src).encode()) ++ self.uid_ = m.digest() ++ return self.uid_ ++ ++ ++def make_cached(cls): ++ """ ++ Enable the waf cache for a given task class ++ """ ++ if getattr(cls, 'nocache', None) or getattr(cls, 'has_cache', False): ++ return ++ ++ full_name = "%s.%s" % (cls.__module__, cls.__name__) ++ if full_name in ('waflib.Tools.ccroot.vnum', 'waflib.Build.inst'): ++ return ++ ++ m1 = getattr(cls, 'run', None) ++ def run(self): ++ if getattr(self, 'nocache', False): ++ return m1(self) ++ if self.can_retrieve_cache(): ++ return 0 ++ return m1(self) ++ cls.run = run ++ ++ m2 = getattr(cls, 'post_run', None) ++ def post_run(self): ++ if getattr(self, 'nocache', False): ++ return m2(self) ++ ret = m2(self) ++ self.put_files_cache() ++ return ret ++ cls.post_run = post_run ++ cls.has_cache = True ++ ++process_pool = [] ++def get_process(): ++ """ ++ Returns a worker process that can process waf cache commands ++ The worker process is assumed to be returned to the process pool when unused ++ """ ++ try: ++ return process_pool.pop() ++ except IndexError: ++ filepath = os.path.dirname(os.path.abspath(__file__)) + os.sep + 'wafcache.py' ++ cmd = [sys.executable, '-c', Utils.readf(filepath)] ++ return subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, bufsize=0) ++ ++def atexit_pool(): ++ for proc in process_pool: ++ proc.kill() ++atexit.register(atexit_pool) ++ ++def build(bld): ++ """ ++ Called during the build process to enable file caching ++ """ ++ ++ if WAFCACHE_ASYNC_WORKERS: ++ try: ++ num_workers = int(WAFCACHE_ASYNC_WORKERS) ++ except ValueError: ++ Logs.warn('Invalid WAFCACHE_ASYNC_WORKERS specified: %r' % WAFCACHE_ASYNC_WORKERS) ++ else: ++ from concurrent.futures import ThreadPoolExecutor ++ bld.wafcache_executor = ThreadPoolExecutor(max_workers=num_workers) ++ bld.wafcache_uploads = [] ++ bld.wafcache_procs = set([]) ++ bld.wafcache_stop = False ++ bld.wafcache_lock = threading.Lock() ++ ++ def finalize_upload_async(bld): ++ if WAFCACHE_ASYNC_NOWAIT: ++ with bld.wafcache_lock: ++ bld.wafcache_stop = True ++ ++ for fut in reversed(bld.wafcache_uploads): ++ fut.cancel() ++ ++ for proc in bld.wafcache_procs: ++ proc.kill() ++ ++ bld.wafcache_procs.clear() ++ else: ++ Logs.pprint('CYAN', '... waiting for wafcache uploads to complete (%s uploads)' % len(bld.wafcache_uploads)) ++ bld.wafcache_executor.shutdown(wait=True) ++ bld.add_post_fun(finalize_upload_async) ++ ++ if WAFCACHE_STATS: ++ # Init counter for statistics and hook to print results at the end ++ bld.cache_reqs = bld.cache_hits = bld.cache_puts = 0 ++ ++ def printstats(bld): ++ hit_ratio = 0 ++ if bld.cache_reqs > 0: ++ hit_ratio = (bld.cache_hits / bld.cache_reqs) * 100 ++ Logs.pprint('CYAN', ' wafcache stats: %s requests, %s hits (ratio: %.2f%%), %s writes' % ++ (bld.cache_reqs, bld.cache_hits, hit_ratio, bld.cache_puts) ) ++ bld.add_post_fun(printstats) ++ ++ if process_pool: ++ # already called once ++ return ++ ++ # pre-allocation ++ processes = [get_process() for x in range(bld.jobs)] ++ process_pool.extend(processes) ++ ++ Task.Task.can_retrieve_cache = can_retrieve_cache ++ Task.Task.put_files_cache = put_files_cache ++ Task.Task.uid = uid ++ Build.BuildContext.hash_env_vars = hash_env_vars ++ for x in reversed(list(Task.classes.values())): ++ make_cached(x) ++ ++def cache_command(proc, sig, files_from, files_to): ++ """ ++ Create a command for cache worker processes, returns a pickled ++ base64-encoded tuple containing the task signature, a list of files to ++ cache and a list of files files to get from cache (one of the lists ++ is assumed to be empty) ++ """ ++ obj = base64.b64encode(cPickle.dumps([sig, files_from, files_to])) ++ proc.stdin.write(obj) ++ proc.stdin.write('\n'.encode()) ++ proc.stdin.flush() ++ obj = proc.stdout.readline() ++ if not obj: ++ raise OSError('Preforked sub-process %r died' % proc.pid) ++ return cPickle.loads(base64.b64decode(obj)) ++ ++try: ++ copyfun = os.link ++except NameError: ++ copyfun = shutil.copy2 ++ ++def atomic_copy(orig, dest): ++ """ ++ Copy files to the cache, the operation is atomic for a given file ++ """ ++ global copyfun ++ tmp = dest + '.tmp' ++ up = os.path.dirname(dest) ++ try: ++ os.makedirs(up) ++ except OSError: ++ pass ++ ++ try: ++ copyfun(orig, tmp) ++ except OSError as e: ++ if e.errno == errno.EXDEV: ++ copyfun = shutil.copy2 ++ copyfun(orig, tmp) ++ else: ++ raise ++ os.rename(tmp, dest) ++ ++def lru_trim(): ++ """ ++ the cache folders take the form: ++ `CACHE_DIR/0b/0b180f82246d726ece37c8ccd0fb1cde2650d7bfcf122ec1f169079a3bfc0ab9` ++ they are listed in order of last access, and then removed ++ until the amount of folders is within TRIM_MAX_FOLDERS and the total space ++ taken by files is less than EVICT_MAX_BYTES ++ """ ++ lst = [] ++ for up in os.listdir(CACHE_DIR): ++ if len(up) == 2: ++ sub = os.path.join(CACHE_DIR, up) ++ for hval in os.listdir(sub): ++ path = os.path.join(sub, hval) ++ ++ size = 0 ++ for fname in os.listdir(path): ++ try: ++ size += os.lstat(os.path.join(path, fname)).st_size ++ except OSError: ++ pass ++ lst.append((os.stat(path).st_mtime, size, path)) ++ ++ lst.sort(key=lambda x: x[0]) ++ lst.reverse() ++ ++ tot = sum(x[1] for x in lst) ++ while tot > EVICT_MAX_BYTES or len(lst) > TRIM_MAX_FOLDERS: ++ _, tmp_size, path = lst.pop() ++ tot -= tmp_size ++ ++ tmp = path + '.remove' ++ try: ++ shutil.rmtree(tmp) ++ except OSError: ++ pass ++ try: ++ os.rename(path, tmp) ++ except OSError: ++ sys.stderr.write('Could not rename %r to %r\n' % (path, tmp)) ++ else: ++ try: ++ shutil.rmtree(tmp) ++ except OSError: ++ sys.stderr.write('Could not remove %r\n' % tmp) ++ sys.stderr.write("Cache trimmed: %r bytes in %r folders left\n" % (tot, len(lst))) ++ ++ ++def lru_evict(): ++ """ ++ Reduce the cache size ++ """ ++ lockfile = os.path.join(CACHE_DIR, 'all.lock') ++ try: ++ st = os.stat(lockfile) ++ except EnvironmentError as e: ++ if e.errno == errno.ENOENT: ++ with open(lockfile, 'w') as f: ++ f.write('') ++ return ++ else: ++ raise ++ ++ if st.st_mtime < time.time() - EVICT_INTERVAL_MINUTES * 60: ++ # check every EVICT_INTERVAL_MINUTES minutes if the cache is too big ++ # OCLOEXEC is unnecessary because no processes are spawned ++ fd = os.open(lockfile, os.O_RDWR | os.O_CREAT, 0o755) ++ try: ++ try: ++ fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB) ++ except EnvironmentError: ++ if WAFCACHE_VERBOSITY: ++ sys.stderr.write('wafcache: another cleaning process is running\n') ++ else: ++ # now dow the actual cleanup ++ lru_trim() ++ os.utime(lockfile, None) ++ finally: ++ os.close(fd) ++ ++class netcache(object): ++ def __init__(self): ++ self.http = urllib3.PoolManager() ++ ++ def url_of(self, sig, i): ++ return "%s/%s/%s" % (CACHE_DIR, sig, i) ++ ++ def upload(self, file_path, sig, i): ++ url = self.url_of(sig, i) ++ with open(file_path, 'rb') as f: ++ file_data = f.read() ++ r = self.http.request('POST', url, timeout=60, ++ fields={ 'file': ('%s/%s' % (sig, i), file_data), }) ++ if r.status >= 400: ++ raise OSError("Invalid status %r %r" % (url, r.status)) ++ ++ def download(self, file_path, sig, i): ++ url = self.url_of(sig, i) ++ with self.http.request('GET', url, preload_content=False, timeout=60) as inf: ++ if inf.status >= 400: ++ raise OSError("Invalid status %r %r" % (url, inf.status)) ++ with open(file_path, 'wb') as out: ++ shutil.copyfileobj(inf, out) ++ ++ def copy_to_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_from): ++ if not os.path.islink(x): ++ self.upload(x, sig, i) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++ def copy_from_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_to): ++ self.download(x, sig, i) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++class fcache(object): ++ def __init__(self): ++ if not os.path.exists(CACHE_DIR): ++ try: ++ os.makedirs(CACHE_DIR) ++ except OSError: ++ pass ++ if not os.path.exists(CACHE_DIR): ++ raise ValueError('Could not initialize the cache directory') ++ ++ def copy_to_cache(self, sig, files_from, files_to): ++ """ ++ Copy files to the cache, existing files are overwritten, ++ and the copy is atomic only for a given file, not for all files ++ that belong to a given task object ++ """ ++ try: ++ for i, x in enumerate(files_from): ++ dest = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ atomic_copy(x, dest) ++ except Exception: ++ return traceback.format_exc() ++ else: ++ # attempt trimming if caching was successful: ++ # we may have things to trim! ++ try: ++ lru_evict() ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++ def copy_from_cache(self, sig, files_from, files_to): ++ """ ++ Copy files from the cache ++ """ ++ try: ++ for i, x in enumerate(files_to): ++ orig = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ atomic_copy(orig, x) ++ ++ # success! update the cache time ++ os.utime(os.path.join(CACHE_DIR, sig[:2], sig), None) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++class bucket_cache(object): ++ def bucket_copy(self, source, target): ++ if WAFCACHE_CMD: ++ def replacer(match): ++ if match.group('src'): ++ return source ++ elif match.group('tgt'): ++ return target ++ cmd = [re_waf_cmd.sub(replacer, x) for x in shlex.split(WAFCACHE_CMD)] ++ elif CACHE_DIR.startswith('s3://'): ++ cmd = ['aws', 's3', 'cp', source, target] ++ elif CACHE_DIR.startswith('gs://'): ++ cmd = ['gsutil', 'cp', source, target] ++ else: ++ cmd = ['mc', 'cp', source, target] ++ ++ proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ++ out, err = proc.communicate() ++ if proc.returncode: ++ raise OSError('Error copy %r to %r using: %r (exit %r):\n out:%s\n err:%s' % ( ++ source, target, cmd, proc.returncode, out.decode(errors='replace'), err.decode(errors='replace'))) ++ ++ def copy_to_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_from): ++ dest = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ self.bucket_copy(x, dest) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++ def copy_from_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_to): ++ orig = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ self.bucket_copy(orig, x) ++ except EnvironmentError: ++ return traceback.format_exc() ++ return OK ++ ++def loop(service): ++ """ ++ This function is run when this file is run as a standalone python script, ++ it assumes a parent process that will communicate the commands to it ++ as pickled-encoded tuples (one line per command) ++ ++ The commands are to copy files to the cache or copy files from the ++ cache to a target destination ++ """ ++ # one operation is performed at a single time by a single process ++ # therefore stdin never has more than one line ++ txt = sys.stdin.readline().strip() ++ if not txt: ++ # parent process probably ended ++ sys.exit(1) ++ ret = OK ++ ++ [sig, files_from, files_to] = cPickle.loads(base64.b64decode(txt)) ++ if files_from: ++ # TODO return early when pushing files upstream ++ ret = service.copy_to_cache(sig, files_from, files_to) ++ elif files_to: ++ # the build process waits for workers to (possibly) obtain files from the cache ++ ret = service.copy_from_cache(sig, files_from, files_to) ++ else: ++ ret = "Invalid command" ++ ++ obj = base64.b64encode(cPickle.dumps(ret)) ++ sys.stdout.write(obj.decode()) ++ sys.stdout.write('\n') ++ sys.stdout.flush() ++ ++if __name__ == '__main__': ++ if CACHE_DIR.startswith('s3://') or CACHE_DIR.startswith('gs://') or CACHE_DIR.startswith('minio://'): ++ if CACHE_DIR.startswith('minio://'): ++ CACHE_DIR = CACHE_DIR[8:] # minio doesn't need the protocol part, uses config aliases ++ service = bucket_cache() ++ elif CACHE_DIR.startswith('http'): ++ service = netcache() ++ else: ++ service = fcache() ++ while 1: ++ try: ++ loop(service) ++ except KeyboardInterrupt: ++ break ++ +diff --git a/waflib/extras/xcode6.py b/waflib/extras/xcode6.py +index 91bbff181..c5b309120 100644 +--- a/waflib/extras/xcode6.py ++++ b/waflib/extras/xcode6.py +@@ -99,7 +99,7 @@ def delete_invalid_values(dct): + ... + } + 'Release': { +- 'ARCHS' x86_64' ++ 'ARCHS': x86_64' + ... + } + } +@@ -163,12 +163,12 @@ def tostring(self, value): + result = result + "\t\t}" + return result + elif isinstance(value, str): +- return "\"%s\"" % value ++ return '"%s"' % value.replace('"', '\\\\\\"') + elif isinstance(value, list): + result = "(\n" + for i in value: +- result = result + "\t\t\t%s,\n" % self.tostring(i) +- result = result + "\t\t)" ++ result = result + "\t\t\t\t%s,\n" % self.tostring(i) ++ result = result + "\t\t\t)" + return result + elif isinstance(value, XCodeNode): + return value._id +@@ -565,13 +565,13 @@ def process_xcode(self): + # Override target specific build settings + bldsettings = { + 'HEADER_SEARCH_PATHS': ['$(inherited)'] + self.env['INCPATHS'], +- 'LIBRARY_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.LIBPATH) + Utils.to_list(self.env.STLIBPATH) + Utils.to_list(self.env.LIBDIR) , ++ 'LIBRARY_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.LIBPATH) + Utils.to_list(self.env.STLIBPATH) + Utils.to_list(self.env.LIBDIR), + 'FRAMEWORK_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.FRAMEWORKPATH), +- 'OTHER_LDFLAGS': libs + ' ' + frameworks, +- 'OTHER_LIBTOOLFLAGS': bld.env['LINKFLAGS'], ++ 'OTHER_LDFLAGS': libs + ' ' + frameworks + ' ' + ' '.join(bld.env['LINKFLAGS']), + 'OTHER_CPLUSPLUSFLAGS': Utils.to_list(self.env['CXXFLAGS']), + 'OTHER_CFLAGS': Utils.to_list(self.env['CFLAGS']), +- 'INSTALL_PATH': [] ++ 'INSTALL_PATH': [], ++ 'GCC_PREPROCESSOR_DEFINITIONS': self.env['DEFINES'] + } + + # Install path +@@ -591,7 +591,7 @@ def process_xcode(self): + + # The keys represents different build configuration, e.g. Debug, Release and so on.. + # Insert our generated build settings to all configuration names +- keys = set(settings.keys() + bld.env.PROJ_CONFIGURATION.keys()) ++ keys = set(settings.keys()) | set(bld.env.PROJ_CONFIGURATION.keys()) + for k in keys: + if k in settings: + settings[k].update(bldsettings) +diff --git a/waflib/fixpy2.py b/waflib/fixpy2.py +index 24176e066..c99bff4b9 100644 +--- a/waflib/fixpy2.py ++++ b/waflib/fixpy2.py +@@ -56,7 +56,7 @@ def r1(code): + @subst('Runner.py') + def r4(code): + "generator syntax" +- return code.replace('next(self.biter)', 'self.biter.next()') ++ return code.replace('next(self.biter)', 'self.biter.next()').replace('self.daemon = True', 'self.setDaemon(1)') + + @subst('Context.py') + def r5(code): +diff --git a/waflib/processor.py b/waflib/processor.py +index 2eecf3bd9..eff2e69ad 100755 +--- a/waflib/processor.py ++++ b/waflib/processor.py +@@ -27,6 +27,10 @@ def run(): + [cmd, kwargs, cargs] = cPickle.loads(base64.b64decode(txt)) + cargs = cargs or {} + ++ if not 'close_fds' in kwargs: ++ # workers have no fds ++ kwargs['close_fds'] = False ++ + ret = 1 + out, err, ex, trace = (None, None, None, None) + try: -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 11 22:04:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 23:04:35 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/python-cython: bump to version 3.0.8 In-Reply-To: <20240211214904.89575-2-james.hilliard1@gmail.com> References: <20240211214904.89575-1-james.hilliard1@gmail.com> <20240211214904.89575-2-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-11 14:49 -0700, James Hilliard spake thusly: > License hash changed due to changing links from http to https: > https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 > > Signed-off-by: James Hilliard Err... I haven't seen my comments on your v1 addressed in this v2? Regards, Yann E. MORIN. > --- > package/python-cython/python-cython.hash | 6 +++--- > package/python-cython/python-cython.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash > index 08ad8f6d84..55e4a6f203 100644 > --- a/package/python-cython/python-cython.hash > +++ b/package/python-cython/python-cython.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/cython/json > -md5 a4d0f9fbc9c137f1a88937cd40e8c5ee Cython-0.29.36.tar.gz > -sha256 41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f Cython-0.29.36.tar.gz > +md5 9f7baaa983e1bd06eaeb4fa0adfc77e5 Cython-3.0.8.tar.gz > +sha256 8333423d8fd5765e7cceea3a9985dd1e0a5dfeb2734629e1a2ed2d6233d39de6 Cython-3.0.8.tar.gz > # Locally computed sha256 checksums > -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt > +sha256 9568a2b155e66ac3e0ba1fd80b52b827b9460e6cf6f233125e7cbca8e206ddc3 LICENSE.txt > sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt > diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk > index 47e105c065..d76bfb766d 100644 > --- a/package/python-cython/python-cython.mk > +++ b/package/python-cython/python-cython.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_CYTHON_VERSION = 0.29.36 > +PYTHON_CYTHON_VERSION = 3.0.8 > PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz > -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 > +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 > PYTHON_CYTHON_SETUP_TYPE = setuptools > PYTHON_CYTHON_LICENSE = Apache-2.0 > PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 22:08:07 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:08:07 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/imx6ulz_bsh_smm_m2_defconfig: new defconfig In-Reply-To: <20231214161855.1738492-1-dario.binacchi@amarulasolutions.com> References: <20231214161855.1738492-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240211230807.6007763d@windsurf> Hello Dario, On Thu, 14 Dec 2023 17:18:54 +0100 Dario Binacchi wrote: > From: Michael Trimarchi > > BSH SMM M2 (SystemMaster M2) Board is an add-on board which provides > input and output interfaces to a dedicated carrier board. It is designed > mainly to provide graphical/video and connectivity interfaces to the > appliance. > > Board support package includes the following components: > - mainline Linux kernel 6.1.68 > - mainline U-Boot 2023.10 > > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi I am sorry to provide this feedback so late, but there is one thing to improve in this submission: > board/bsh/imx6ulz-bsh-smm-m2/linux.config | 415 +++++++++++++++++++++ This defconfig is too long and clearly contains stuff that is useless. Could you review it and clean it up? > +CONFIG_WL12XX=m > +CONFIG_WL18XX=m Need both of these? > +CONFIG_WLCORE_SDIO=m > +# CONFIG_WILINK_PLATFORM_DATA is not set > +CONFIG_INPUT_EVDEV=y > +CONFIG_INPUT_EVBUG=m > +CONFIG_KEYBOARD_GPIO=y > +CONFIG_KEYBOARD_SNVS_PWRKEY=y > +CONFIG_KEYBOARD_IMX=y > +CONFIG_MOUSE_PS2=m > +CONFIG_MOUSE_PS2_ELANTECH=y > +CONFIG_INPUT_TOUCHSCREEN=y > +CONFIG_TOUCHSCREEN_ADS7846=y > +CONFIG_TOUCHSCREEN_AD7879=y > +CONFIG_TOUCHSCREEN_AD7879_I2C=y > +CONFIG_TOUCHSCREEN_ATMEL_MXT=y > +CONFIG_TOUCHSCREEN_DA9052=y > +CONFIG_TOUCHSCREEN_EGALAX=y > +CONFIG_TOUCHSCREEN_GOODIX=y > +CONFIG_TOUCHSCREEN_ILI210X=y > +CONFIG_TOUCHSCREEN_MAX11801=y > +CONFIG_TOUCHSCREEN_IMX6UL_TSC=y > +CONFIG_TOUCHSCREEN_MC13783=y > +CONFIG_TOUCHSCREEN_TSC2004=y > +CONFIG_TOUCHSCREEN_TSC2007=y > +CONFIG_TOUCHSCREEN_STMPE=y > +CONFIG_TOUCHSCREEN_SX8654=y So many touchscreen drivers? > +CONFIG_SPI=y > +CONFIG_SPI_FSL_QUADSPI=y > +CONFIG_SPI_GPIO=y > +CONFIG_SPI_IMX=y > +CONFIG_SPI_SPIDEV=y > +CONFIG_SPI_SLAVE=y You're using slave SPI? > +CONFIG_SPI_SLAVE_TIME=y > +CONFIG_SPI_SLAVE_SYSTEM_CONTROL=y > +CONFIG_PTP_1588_CLOCK=y > +CONFIG_GPIO_SYSFS=y > +CONFIG_GPIO_MXC=y > +CONFIG_GPIO_MAX732X=y > +CONFIG_GPIO_PCA953X=y > +CONFIG_GPIO_PCF857X=y > +CONFIG_GPIO_STMPE=y > +CONFIG_GPIO_74X164=y All those GPIO drivers are needed? > +CONFIG_POWER_RESET=y > +CONFIG_POWER_RESET_BRCMSTB=y A reset driver for broadcom platform? > +CONFIG_MFD_DA9052_I2C=y > +CONFIG_MFD_DA9062=y > +CONFIG_MFD_DA9063=y > +CONFIG_MFD_MC13XXX_SPI=y > +CONFIG_MFD_MC13XXX_I2C=y > +CONFIG_MFD_RN5T618=y > +CONFIG_MFD_STMPE=y > +CONFIG_MFD_WM8994=y All those MFD devices? > +CONFIG_REGULATOR=y > +CONFIG_REGULATOR_FIXED_VOLTAGE=y > +CONFIG_REGULATOR_ANATOP=y > +CONFIG_REGULATOR_DA9052=y > +CONFIG_REGULATOR_DA9062=y > +CONFIG_REGULATOR_DA9063=y > +CONFIG_REGULATOR_GPIO=y > +CONFIG_REGULATOR_LTC3676=y > +CONFIG_REGULATOR_MC13783=y > +CONFIG_REGULATOR_MC13892=y > +CONFIG_REGULATOR_PFUZE100=y > +CONFIG_REGULATOR_RN5T618=y All those regulators? etc. Please review globally :-) > diff --git a/configs/imx6ulz_bsh_smm_m2_defconfig b/configs/imx6ulz_bsh_smm_m2_defconfig > new file mode 100644 > index 000000000000..b12f36b84e65 > --- /dev/null > +++ b/configs/imx6ulz_bsh_smm_m2_defconfig > @@ -0,0 +1,42 @@ > +BR2_arm=y > +BR2_cortex_a7=y > +BR2_ARM_FPU_VFPV3=y > +BR2_KERNEL_HEADERS_6_1=y > +BR2_TOOLCHAIN_BUILDROOT_CXX=y Why is C++ enabled? > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx6ulz-bsh-smm-m2/post-build.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.68" > +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/bsh/imx6ulz-bsh-smm-m2/linux.config" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ulz-bsh-smm-m2" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y Why is this option enabled? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:54:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:54:58 +0100 Subject: [Buildroot] [git commit] package/elfutils: drop lfs tweak Message-ID: <20240211220824.9088F87807@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7593aea519dee34cb25715296c1b03f471123ee2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When the elfutils package was first introduced, it filtered out LFS-related compiler flags due to issues with the package's implementation. This package has since evolved over the years to support LFS (e.g. using `AC_SYS_LARGEFILE` [1]). Filtering out `-D_FILE_OFFSET_BITS=64` can lead to a configuration error when `BR2_TIME_BITS_64` is enabled: checking whether gcc supports -Wl,-z,relro... yes checking for __thread support... no configure: error: __thread support required ... With the configuration log providing the specific reason: configure:7175: .../output-1/host/bin/m68k-buildroot-linux-gnu-gcc -o conftest -fPIC -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -shared -Wl,-z,defs -Wl,-z,relro -latomic -Wl,--build-id conftest.c >&5 In file included from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/stdlib.h:26, from conftest.c:13: .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ configure:7175: $? = 1 ... Fixes: - http://autobuild.buildroot.org/results/fbfe131673ed78999a07dbc879436e0ef6a8a1c0 [1]: https://sourceware.org/git/?p=elfutils.git;a=commit;h=3425454a10d307fae891fb667cf7969e945cde79 Signed-off-by: James Knight Signed-off-by: Thomas Petazzoni --- package/elfutils/elfutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 521c37a776..cb4293b0c3 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -29,10 +29,6 @@ HOST_ELFUTILS_CONF_OPTS = \ --without-zstd \ --disable-progs -# elfutils gets confused when lfs mode is forced, so don't -ELFUTILS_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) -ELFUTILS_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) - ELFUTILS_CONF_ENV += \ CFLAGS="$(ELFUTILS_CFLAGS)" \ CPPFLAGS="$(ELFUTILS_CPPFLAGS)" From thomas.petazzoni at bootlin.com Sun Feb 11 22:08:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:08:27 +0100 Subject: [Buildroot] [PATCH 1/1] elfutils: drop lfs tweak In-Reply-To: References: Message-ID: <20240211230827.3d820fe5@windsurf> On Thu, 8 Feb 2024 11:55:30 -0500 James Knight wrote: > When the elfutils package was first introduced, it filtered out > LFS-related compiler flags due to issues with the package's > implementation. This package has since evolved over the years to support > LFS (e.g. using `AC_SYS_LARGEFILE` [1]). > > Filtering out `-D_FILE_OFFSET_BITS=64` can lead to a configuration error > when `BR2_TIME_BITS_64` is enabled: > > checking whether gcc supports -Wl,-z,relro... yes > checking for __thread support... no > configure: error: __thread support required > ... > > With the configuration log providing the specific reason: > > configure:7175: .../output-1/host/bin/m68k-buildroot-linux-gnu-gcc -o conftest -fPIC -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -shared -Wl,-z,defs -Wl,-z,relro -latomic -Wl,--build-id conftest.c >&5 > In file included from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features.h:394, > from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, > from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/stdlib.h:26, > from conftest.c:13: > .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > | ^~~~~ > configure:7175: $? = 1 > ... > > Fixes: > - http://autobuild.buildroot.org/results/fbfe131673ed78999a07dbc879436e0ef6a8a1c0 > > [1]: https://sourceware.org/git/?p=elfutils.git;a=commit;h=3425454a10d307fae891fb667cf7969e945cde79 > > Signed-off-by: James Knight > --- > package/elfutils/elfutils.mk | 4 ---- > 1 file changed, 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 22:08:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:08:34 +0100 Subject: [Buildroot] [git commit] package/python-uvicorn: bump to 0.27.0.post1 Message-ID: <20240211221044.3B6F48780D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4abcf5872cd14cd2b1633142ffed3794b838ac1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://github.com/encode/uvicorn/blob/master/CHANGELOG.md#0270post1---2024-01-29 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index cfa999e210..c7feaf3bfe 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 a1af843e7e305d551030abfa09dd3b15 uvicorn-0.24.0.post1.tar.gz -sha256 09c8e5a79dc466bdf28dead50093957db184de356fcdc48697bad3bde4c2588e uvicorn-0.24.0.post1.tar.gz +md5 a98f96c2578d9e6d454e271d0eae3ba3 uvicorn-0.27.0.post1.tar.gz +sha256 54898fcd80c13ff1cd28bf77b04ec9dbd8ff60c5259b499b4b12bb0917f22907 uvicorn-0.27.0.post1.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 04e6dd66a7..502cc06ad8 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.24.0.post1 +PYTHON_UVICORN_VERSION = 0.27.0.post1 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/e5/84/d43ce8fe6b31a316ef0ed04ea0d58cab981bdf7f17f8423491fa8b4f50b6 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/38/56/7bc5cf1d693d0c8e5d9dd66c29808691c17260b31346e4ddfbee26ba9bc2 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Sun Feb 11 22:10:46 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:10:46 +0100 Subject: [Buildroot] [PATCH] package/python-uvicorn: bump to 0.27.0.post1 In-Reply-To: <20240208140802.984184-1-buildroot@bubu1.eu> References: <20240208140802.984184-1-buildroot@bubu1.eu> Message-ID: <20240211231046.27b4371b@windsurf> On Thu, 8 Feb 2024 15:08:01 +0100 Marcus Hoffmann via buildroot wrote: > Changelog: > > https://github.com/encode/uvicorn/blob/master/CHANGELOG.md#0270post1---2024-01-29 > > Signed-off-by: Marcus Hoffmann > --- > package/python-uvicorn/python-uvicorn.hash | 4 ++-- > package/python-uvicorn/python-uvicorn.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 22:11:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:11:56 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install In-Reply-To: <20240208095615.2397148-1-roy.kollen.svendsen@akersolutions.com> References: <20240208095615.2397148-1-roy.kollen.svendsen@akersolutions.com> Message-ID: <20240211231156.68fa41ab@windsurf> On Thu, 8 Feb 2024 10:56:14 +0100 Roy Kollen Svendsen wrote: > Fixes the following failure in the install step of host-python3: > ... > /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h > [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo > The following modules are *disabled* in configure script: > _ctypes_test _testbuffer _testcapi > _testclinic _testimportmultiple _testinternalcapi > _testmultiphase _xxtestfuzz xxsubtype > > Following modules built successfully but were removed because they could not be imported: > _tkinter > > Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) > ... > /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 > /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory > /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 > make[3]: *** [Makefile:2068: sharedinstall] Error 1 > ... > > Signed-off-by: Roy Kollen Svendsen > --- > Changes v1 -> v2: > Make the --disable-tk option automatically set py_cv_module__tkinter=n/a (suggested by Thomas Petazzoni) > --- > .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied to master after improving the commit title, and extending the commit log to indicate which commit this is fixing. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 22:10:57 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:10:57 +0100 Subject: [Buildroot] [git commit] package/python3: fix install when tk is disabled Message-ID: <20240211221213.A68FF8781B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=687b96db4d3518eadd16f74f7defdc05b1cfb736 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 ("package/python3: bump version to 3.12.1") Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 7fafbedddb..08617241a6 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,6 +70,8 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) From thomas.petazzoni at bootlin.com Sun Feb 11 22:12:03 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:12:03 +0100 Subject: [Buildroot] [git commit] support/testing: remove hardcoded sleep from python-flask test Message-ID: <20240211221213.B0A888781C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbe0f4de67aef0f4695073c2047ba65cc420c83a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Similar to the new fastapi test, instead of waiting for a hard coded amount of time we can retry every second until the server is available and abort if after the timeout we still didn't manage to connect. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_flask.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/support/testing/tests/package/test_python_flask.py b/support/testing/tests/package/test_python_flask.py index 9d8587e918..32d9da34a5 100644 --- a/support/testing/tests/package/test_python_flask.py +++ b/support/testing/tests/package/test_python_flask.py @@ -21,9 +21,13 @@ class TestPythonPy3Flask(TestPythonPackageBase): _, exit_code = self.emulator.run(cmd, timeout=self.timeout) # Give enough time for the flask server to start up - time.sleep(30) + for attempt in range(30): + time.sleep(1) - cmd = "wget -q -O - http://127.0.0.1:5000/" - output, exit_code = self.emulator.run(cmd, timeout=self.timeout) - self.assertEqual(exit_code, 0) - self.assertEqual(output[0], "Hello, World!") + cmd = "wget -q -O - http://127.0.0.1:5000/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + if exit_code == 0: + self.assertEqual(output[0], 'Hello, World!') + break + else: + self.assertTrue(False, "Timeout while waiting for flask server") From thomas.petazzoni at bootlin.com Sun Feb 11 22:12:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:12:19 +0100 Subject: [Buildroot] [PATCH] support/testing: remove hardcoded sleep from python-flask test In-Reply-To: <20240207171513.2673706-1-buildroot@bubu1.eu> References: <20240207171513.2673706-1-buildroot@bubu1.eu> Message-ID: <20240211231219.39c02e88@windsurf> On Wed, 7 Feb 2024 18:15:12 +0100 Marcus Hoffmann via buildroot wrote: > Similar to the new fastapi test, instead of waiting for a hard coded > amount of time we can retry every second until the server is available > and abort if after the timeout we still didn't manage to connect. > > Signed-off-by: Marcus Hoffmann > --- > support/testing/tests/package/test_python_flask.py | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 22:13:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:13:12 +0100 Subject: [Buildroot] [git commit] configs/mangopi_mq1rdw1_defconfig: new defconfig Message-ID: <20240211221335.62A188783E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe8f95a61ec9c4d2a1416d3f1dd327ad063beb4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add support for MangoPi MQ1RDW2: https://mangopi.org/mqr An Allwinner T113-S3(2xCortex-A7+128MB DDR3-1600 embedded) based SBC with: * USB-OTG Type-C socket * USB-HOST Type-C socket * 2x 18 pin GPIO headers * TF card slot * RTL8723DS WiFi module with ext. antenna connector * 40 pin RGB FPC connector * 6 pin CTP FPC connector * 24 pin DVP FPC connector * onboard mic * onboard audio amplifier * FEL,reset button Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + board/mangopi/mq1rdw2/genimage.cfg | 16 ++++++++ board/mangopi/mq1rdw2/readme.txt | 46 ++++++++++++++++++++++ .../rootfs_overlay/boot/extlinux/extlinux.conf | 4 ++ .../mq1rdw2/rootfs_overlay/etc/network/interfaces | 6 +++ .../mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf | 8 ++++ configs/mangopi_mq1rdw2_defconfig | 40 +++++++++++++++++++ 7 files changed, 122 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 26868f74fe..0d12c3abcb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1211,6 +1211,7 @@ N: Giulio Benetti F: board/bananapi/bananapi-m2-ultra/ F: board/freescale/imx6ullevk/ F: board/freescale/imxrt1050evk/ +F: board/mangopi/mq1rdw2/ F: board/olimex/a* F: board/pine64/rockpro64 F: configs/amarula_vyasa_rk3288_defconfig @@ -1220,6 +1221,7 @@ F: configs/bananapi_m2_ultra_defconfig F: configs/freescale_imx6ullevk_defconfig F: configs/imx6ullevk_defconfig F: configs/imxrt1050-evk_defconfig +F: configs/mangopi_mq1rdw2_defconfig F: configs/olimex_a* F: configs/rockpro64_defconfig F: package/at/ diff --git a/board/mangopi/mq1rdw2/genimage.cfg b/board/mangopi/mq1rdw2/genimage.cfg new file mode 100644 index 0000000000..92c8677545 --- /dev/null +++ b/board/mangopi/mq1rdw2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/mangopi/mq1rdw2/readme.txt b/board/mangopi/mq1rdw2/readme.txt new file mode 100644 index 0000000000..fd37f63154 --- /dev/null +++ b/board/mangopi/mq1rdw2/readme.txt @@ -0,0 +1,46 @@ +MangoPi MQ1RDW2 +=============== + +MangoPi MQ1RDW2 is a tiny ARM Cortex-A7 based single board computer. +It's built around Allwinner T113-S3 dual core 1GHz CPU with integrated +128MB DDR3-1600 RAM. +Board features: +- USB-OTG Type-C socket +- USB-HOST Type-C socket +- 2x 18 pin GPIO headers +- TF card slot +- RTL8723DS WiFi module with ext. antenna connector +- 40 pin RGB FPC connector +- 6 pin CTP FPC connector +- 24 pin DVP FPC connector +- onboard mic +- onboard audio amplifier +- FEL,reset button + +How to build +============ + +$ make mangopi_mq1rdw2_defconfig +$ make + +Wifi +========== + +Edit board/mangopi/mq1rdw2/overlay/etc/wpa_supplicant.conf or +/etc/wpa_supplicant.conf once connected to the board: + +* Replace YOURSSID with your AP ssid +* Replace YOURPASSWD with your AP password + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Connect a TTL UART to the UART3 on P8 header (unpopulated), insert the microSD card and +plug in a USB-C cable to the OTG or HOST connector to boot the system. diff --git a/board/mangopi/mq1rdw2/rootfs_overlay/boot/extlinux/extlinux.conf b/board/mangopi/mq1rdw2/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..c190ff7659 --- /dev/null +++ b/board/mangopi/mq1rdw2/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label MANGOPI-MQ1RDW2 + kernel /boot/zImage + devicetree /boot/sun8i-t113s-mangopi-mq-r-t113.dtb + append console=ttyS3,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} diff --git a/board/mangopi/mq1rdw2/rootfs_overlay/etc/network/interfaces b/board/mangopi/mq1rdw2/rootfs_overlay/etc/network/interfaces new file mode 100644 index 0000000000..89e7d74aff --- /dev/null +++ b/board/mangopi/mq1rdw2/rootfs_overlay/etc/network/interfaces @@ -0,0 +1,6 @@ +auto lo +iface lo inet loopback + +auto wlan0 +iface wlan0 inet dhcp +wpa-conf /etc/wpa_supplicant.conf diff --git a/board/mangopi/mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf b/board/mangopi/mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf new file mode 100644 index 0000000000..b43292b0a7 --- /dev/null +++ b/board/mangopi/mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf @@ -0,0 +1,8 @@ +ap_scan=1 + +network={ + ssid="YOURSSID" + scan_ssid=1 + key_mgmt=WPA-PSK + psk="YOURPASSWD" +} diff --git a/configs/mangopi_mq1rdw2_defconfig b/configs/mangopi_mq1rdw2_defconfig new file mode 100644 index 0000000000..a2f8a1299b --- /dev/null +++ b/configs/mangopi_mq1rdw2_defconfig @@ -0,0 +1,40 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y +BR2_TARGET_GENERIC_HOSTNAME="mangopi-mq1rdw2" +BR2_TARGET_GENERIC_ISSUE="Welcome to MangoPI MQ1RDW2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS3" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/mangopi/mq1rdw2/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/mangopi/mq1rdw2/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.5" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-t113s-mangopi-mq-r-t113" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_RTL8723DS=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01-rc4" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mangopi_mq_r" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y From thomas.petazzoni at bootlin.com Sun Feb 11 22:14:28 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:14:28 +0100 Subject: [Buildroot] [PATCH] configs/mangopi_mq1rdw1_defconfig: new defconfig In-Reply-To: <20231215213019.32352-1-giulio.benetti@benettiengineering.com> References: <20231215213019.32352-1-giulio.benetti@benettiengineering.com> Message-ID: <20240211231428.5d9049c1@windsurf> On Fri, 15 Dec 2023 22:30:19 +0100 Giulio Benetti wrote: > Add support for MangoPi MQ1RDW2: > https://mangopi.org/mqr > > An Allwinner T113-S3(2xCortex-A7+128MB DDR3-1600 embedded) based SBC > with: > * USB-OTG Type-C socket > * USB-HOST Type-C socket > * 2x 18 pin GPIO headers > * TF card slot > * RTL8723DS WiFi module with ext. antenna connector > * 40 pin RGB FPC connector > * 6 pin CTP FPC connector > * 24 pin DVP FPC connector > * onboard mic > * onboard audio amplifier > * FEL,reset button > > Signed-off-by: Giulio Benetti Applied, with minor changes. > diff --git a/DEVELOPERS b/DEVELOPERS > index 83b970b591..12dd1fdcc9 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1213,6 +1213,7 @@ N: Giulio Benetti > F: board/bananapi/bananapi-m2-ultra/ > F: board/freescale/imx6ullevk/ > F: board/freescale/imxrt1050evk/ > +F: board/mangopi/mq1rdw2 ^^^ missing final slash > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 512M The size is not needed: the partition will automatically take the size of the rootfs.ext4 image. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 22:23:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:23:17 +0100 Subject: [Buildroot] [git commit] package/util-linux: fix build with -O0 Message-ID: <20240211222336.7400B87844@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8740387457f4dfccbd211ffaef1cae91db9f232d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with -O0 raised since bump to version 2.39 in commit ad276d94a392fb13244e042851a44269e6254d61 and https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant THREAD_LOCAL int cache_size = cs_min; ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/7c9b8508345ffaba167c08521fb865d76555be1d - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...uid-src-gen_uuid.c-fix-cs_min-declaration.patch | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch new file mode 100644 index 0000000000..bba4d54619 --- /dev/null +++ b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch @@ -0,0 +1,80 @@ +From bcd11dece7d278bb0b76b138d08dedea80fa8262 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 7 Nov 2023 18:43:57 +0100 +Subject: [PATCH] libuuid/src/gen_uuid.c: fix cs_min declaration + +Define cs_min through a define and not a const int to avoid the +following build failure with -O0 raised since version 2.39 and +https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: + +libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': +libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant + THREAD_LOCAL int cache_size = cs_min; + ^~~~~~ + +For consistency, also use define for cs_max and cs_factor + +Fixes: + - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/util-linux/util-linux/commit/07e5c29d501c19e7af84fecb5915e0f9f94cb49f +--- + libuuid/src/gen_uuid.c | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c +index 619ef0131..db793c374 100644 +--- a/libuuid/src/gen_uuid.c ++++ b/libuuid/src/gen_uuid.c +@@ -518,6 +518,10 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) + return __uuid_generate_time_internal(out, num, cont_offset); + } + ++#define CS_MIN (1<<6) ++#define CS_MAX (1<<18) ++#define CS_FACTOR 2 ++ + /* + * Generate time-based UUID and store it to @out + * +@@ -529,11 +533,8 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) + static int uuid_generate_time_generic(uuid_t out) { + #ifdef HAVE_TLS + /* thread local cache for uuidd based requests */ +- const int cs_min = (1<<6); +- const int cs_max = (1<<18); +- const int cs_factor = 2; + THREAD_LOCAL int num = 0; +- THREAD_LOCAL int cache_size = cs_min; ++ THREAD_LOCAL int cache_size = CS_MIN; + THREAD_LOCAL int last_used = 0; + THREAD_LOCAL struct uuid uu; + THREAD_LOCAL time_t last_time = 0; +@@ -552,10 +553,10 @@ static int uuid_generate_time_generic(uuid_t out) { + * Start with a small cache size to cover short running applications + * and adjust the cache size over the runntime. + */ +- if ((last_used == cache_size) && (cache_size < cs_max)) +- cache_size *= cs_factor; +- else if ((last_used < (cache_size / cs_factor)) && (cache_size > cs_min)) +- cache_size /= cs_factor; ++ if ((last_used == cache_size) && (cache_size < CS_MAX)) ++ cache_size *= CS_FACTOR; ++ else if ((last_used < (cache_size / CS_FACTOR)) && (cache_size > CS_MIN)) ++ cache_size /= CS_FACTOR; + + num = cache_size; + +@@ -568,7 +569,7 @@ static int uuid_generate_time_generic(uuid_t out) { + } + /* request to daemon failed, reset cache */ + num = 0; +- cache_size = cs_min; ++ cache_size = CS_MIN; + } + if (num > 0) { /* serve uuid from cache */ + uu.time_low++; +-- +2.43.0 + From thomas.petazzoni at bootlin.com Sun Feb 11 22:27:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:27:05 +0100 Subject: [Buildroot] [PATCH] package/util-linux: bump to version 2.39.3 Message-ID: <20240211222706.2959549-1-thomas.petazzoni@bootlin.com> Changes between 2.39.2 and 2.39.3: 2da5c904e18fdcffd2b252d641e6f76374c7b406 build-sys: release++ (v2.39.3) 03c939edda81c5a4d6e5f5c1cb896e79c1e82e16 docs: update v2.39.3-ReleaseNotes dafb120ef79c878cfd1b65c1d1c46497f17a7f7e docs: update AUTHORS file bfc9691ce5d964b87f6c02cc236361b4772456d0 po-man: merge changes d2232b60963a6e4e43fd359d1a4b552c4291b327 po: merge changes 4ab356c1c02c34cd3935e1bb0aa47ed6e27cfe3c po: add ro.po (from translationproject.org) 7e147d16c06f14b3f760b620d4f359cef12fe4ad po: update es.po (from translationproject.org) e8cb61f07430d5f1d624245a219c2e21694c5f52 lsfd: fix memory leak in append_filter_expr() 192d8aaa07e088e44fcb78736a53baae1ead7ccd lsfd: avoid undefined behavior 756588f8c8b2ed93c124ca15cfb3f0efc4a0f9f6 lsfd: (man) fix the form for the optional argument of --inet option 8d78c1306d1a9d5ebf9ec058344685da0360b87b Add Phytium FTC310 & FTC664 support b75322cdb13c6c0b3789ff8fc19dcd017c069784 Add Phytium FTC862 cpu model. fix:#2486 ec1b0eb36bd6c5a5079293ab03241163f61a8bf4 libmount: accept '\' as escape for options separator 2e5f5c8d85338811595d321a77647a40e12321c9 tests: add ts_skip_docker 0b3254cac3a275bbe32af57c6037cd29c21324d7 Merge branch 'stable-2.39/bcachefs-fixes' of https://github.com/t-8ch/util-linux into PR/stable-v2.39.3 6498439340a16e6acee54987df016c6b7928b17a tests: skip broken tests on docker fa9b5365861934faab9ba73bd405095f56f02e45 libblkid: (bcachefs) add support for sub-device labels 3c5d991b0323b33816e661e52da5d6f5402f47b5 libblkid: (bcachefs) adapt to major.minor version ece194082fb318d0fa3fec31193ce6f61b97c67a libuuid: avoid truncate clocks.txt to improve performance 84a62c1a5a614bde2530544bf2558c73f0179d42 libuuid/src/gen_uuid.c: fix cs_min declaration 93239aa7869ddd236db8e5a28b4e6873ce6e0f22 libmount: fix possible NULL dereference [coverity scan] a6def815e21d50db7a99ec74080c3fd7eb64e934 meson: install wall executable with group 'tty' c6c1c69c3e83606eced938d841af03c1acef03a0 meson: install write executable with group 'tty' bf2cd1d5a6eb273fbb11931b86ae165e7da5a397 libmount: improve mnt_table_next_child_fs() c14f5bf37adf681c378fc004f0996e0bcfd30ce0 docs: add SPDX to boilerplate.c fdd9f11f5e38b044617d3bc5f6c00789096b233f disk-utils: add SPDX and Copyright notices e7dbe9c788da98b86f8cf87bc20ec74e32206451 include/audit-arch: add missing SPDX 5ec7b14a72d9893d2a8d8c7f40cd45b44c9575c9 setterm: avoid restoring flags from uninitialized memory 64d2300e6443c311219f187433046751a86ed18e Fix man page for col to correct documentation error 7cc2c962567fe40daa9b12481224e5a0e6f96c47 Update col.c to fix option mistake 122d7e7afb44d8a823e362673b0d2d1e31f7d478 umount: handle bindmounts during --recursive da18b31ff1cb504e3d288f77d1f1d1179c39e4d8 lscpu: fix caches separator for --parse= 3a5c9c1dd6935fb16f15f210b80ce9c5228e6a19 Use empty libuser config file. 7058d793def09c3d4645e9efd1d8a5d212e839b0 libblkid: exfat: fix fail to find volume label d065ff00a36b7244842f743372099837bc61328b blkpr: store return value of getopt_long in int 9ca6f1712a5803e32e26e065e32e99837ba8b5d2 lib/path: Set errno in case of fgets failure e2f0aa5c25c0295ef6187d3c53c2801fe17385e5 autotools: fix AC_DEFINE_UNQUOTED() use cefd05c479e5456af8db2a86fabad165d247176b autotools: fix librtas check f27fbafb24bdcefaa2463d47abc18491c3497451 lib/path: fix typos f8ab70477e2ca7ac050fd4e2337b76a1972c8aa3 lib/path: set errno in case of error 5ec30a362a5dd91c018c04a64fd1a481029dc4c6 lib/path: fix possible out of boundary access edc723cd3341ff3d3e660051525dca40a2af6b3b libblkid: reset errno before calling probefuncs 8de89778b945d552796f09576925310810ce798b setpriv: fix group argument completion 41599054c7248f12c8a54d02f7161d0aff4275a9 libfdisk: reset errno before calling read() cce4e44059405f3170b166fbf1774bf4b89c11c4 blkid: fix call to err_exclusive_options b718f985cb6cc3bc65618649e9f231ecafcf81fb docs: use HTTPS for GitHub clone URLs 2bddfa6928af328675b2ffbfc9b6546e9ee81722 libblkid: (probe) handle probe without chain gracefully 3d31216787d6725fed361d27f0f01aff6ef46981 lib/idcache: always gracefully handle null cache 368521e45e1c9cb44145fc72c04d1cc903a883e8 script-playutils: close filestream in case ignore_line() fails 087b0d2383b8ab1ee4564d692d5f797ac781896f libblkid: (vxfs) report endianness 7e5056f33bdfd867ce6f1a642f560fdf0b402c1e libblkid: (ntfs) validate that sector_size is a power of two f368ccc759f9684338da723a93449764d0a8e312 libsmartcols: handle nameless tables in export format f5cace8da07291c94b76b5cf80da1f921be67419 ldattach: don't call exit() from signal handler 03c12a34c58d2550c6c718275950866d387d33f5 lslogins: fix realloc() loop allocation size 83ba179b12d3c6c5f400bf78f2f742b1cc7ce256 lib/env: avoid underflow of read_all_alloc() return value 813851fba28cb3ecde6a7f0c90a7e343920cd8c7 libblkid: avoid memory leak of cachefile path 4459623cde42a5d021a6d71e38fcdfd4fff3e171 libmount: gracefully handle NULL path in mnt_resolve_target() dbde7a537f27b23d64a8d3f583af472357de7192 more: avoid out-of-bound access c26badd5d4295d52e987c75e69113edfb407fb27 libfdisk: handle allocation failure in fdisk_new_partition 5c250aa6425fc3e35c07bce019eb4b7fa34bf722 login: Use pid_t for child_pid be3f1712ee2e1e43d9b82b7cf4987c8a609a81ef login: move comment 98be90b5bafa66d98655f8639efb3ffa984fc530 build-sys: fix libmount/src/hooks.c use a711af02d32c0a0a31f1bbb943ffff2e94203e86 lscpu: Use 4K buffer size instead of BUFSIZ 45c6136cba5f7607cca08c5aaab8e9b22ef87c25 autotools: fix typos aa98c4ecc938a3459ffb759a444a8a585a9d0a3a libmount: make.stx_mnt_id use more robust c697c2bb69f55aa24b6c0e2e752548f823c53796 libmount: report statx in features list 13711f3ab79dfa92e8815eb9b752ec2bf4832d80 libmount: fix statx() includes e9ed5a2b80bf8a76924caf8cd93b4cfff4d210a7 libblkid: (vfat) avoid modifying shared buffer d2cadf0992cce589bfffeb603325c3c2fe54a991 libblkid: (jmicron_raid) use checksum APIs c54c99efd0c3fc7f1e8db8b7191a6e1e3b295f1f libblkid: (jmicron_raid) avoid modifying shared buffer 64418c52bc594abf01fc4ae8148e7aa93e4b3f22 libblkid: (zonefs) avoid modifying shared buffer b66da7ce4a04d6c960817a56fe82498c4e7dea44 losetup: fix JSON MAJ:MIN 44d7bf2c8d1c6d34a40416807d16db6c07ac4916 lslogins: (man) fix -y option formatting 7d6c71e51ed3c5f8505c67962b6d03490738a879 include: add DragonFlyBSD GPT partition types 6b9fda87c4e5d0c6f945d7565197f157b9fa3d5f libblkid: (bcachefs) fix size validation acbf17ae8f8ee0f941fe98ed12f115f2b349bba8 libblkid: (bcachefs) fix compiler warning [-Werror=sign-compare] 1ec71634aa4ef5ddca23d65c8a296f3614231e8a libblkid: (bcachefs) fix not detecting large superblocks 68564ebb50f8afab5a9527c534417e247cca0b27 libmount: Fix regression when mounting with atime We can drop 0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch as it was backported by upstream to the 2.39.x branch, and included in 2.39.3. Signed-off-by: Thomas Petazzoni --- ...rc-gen_uuid.c-fix-cs_min-declaration.patch | 80 ------------------- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 3 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch diff --git a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch deleted file mode 100644 index bba4d54619..0000000000 --- a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch +++ /dev/null @@ -1,80 +0,0 @@ -From bcd11dece7d278bb0b76b138d08dedea80fa8262 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Nov 2023 18:43:57 +0100 -Subject: [PATCH] libuuid/src/gen_uuid.c: fix cs_min declaration - -Define cs_min through a define and not a const int to avoid the -following build failure with -O0 raised since version 2.39 and -https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: - -libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': -libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant - THREAD_LOCAL int cache_size = cs_min; - ^~~~~~ - -For consistency, also use define for cs_max and cs_factor - -Fixes: - - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/util-linux/util-linux/commit/07e5c29d501c19e7af84fecb5915e0f9f94cb49f ---- - libuuid/src/gen_uuid.c | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c -index 619ef0131..db793c374 100644 ---- a/libuuid/src/gen_uuid.c -+++ b/libuuid/src/gen_uuid.c -@@ -518,6 +518,10 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - return __uuid_generate_time_internal(out, num, cont_offset); - } - -+#define CS_MIN (1<<6) -+#define CS_MAX (1<<18) -+#define CS_FACTOR 2 -+ - /* - * Generate time-based UUID and store it to @out - * -@@ -529,11 +533,8 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - static int uuid_generate_time_generic(uuid_t out) { - #ifdef HAVE_TLS - /* thread local cache for uuidd based requests */ -- const int cs_min = (1<<6); -- const int cs_max = (1<<18); -- const int cs_factor = 2; - THREAD_LOCAL int num = 0; -- THREAD_LOCAL int cache_size = cs_min; -+ THREAD_LOCAL int cache_size = CS_MIN; - THREAD_LOCAL int last_used = 0; - THREAD_LOCAL struct uuid uu; - THREAD_LOCAL time_t last_time = 0; -@@ -552,10 +553,10 @@ static int uuid_generate_time_generic(uuid_t out) { - * Start with a small cache size to cover short running applications - * and adjust the cache size over the runntime. - */ -- if ((last_used == cache_size) && (cache_size < cs_max)) -- cache_size *= cs_factor; -- else if ((last_used < (cache_size / cs_factor)) && (cache_size > cs_min)) -- cache_size /= cs_factor; -+ if ((last_used == cache_size) && (cache_size < CS_MAX)) -+ cache_size *= CS_FACTOR; -+ else if ((last_used < (cache_size / CS_FACTOR)) && (cache_size > CS_MIN)) -+ cache_size /= CS_FACTOR; - - num = cache_size; - -@@ -568,7 +569,7 @@ static int uuid_generate_time_generic(uuid_t out) { - } - /* request to daemon failed, reset cache */ - num = 0; -- cache_size = cs_min; -+ cache_size = CS_MIN; - } - if (num > 0) { /* serve uuid from cache */ - uu.time_low++; --- -2.43.0 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 1638cd9967..480f82d751 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc -sha256 87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f util-linux-2.39.2.tar.xz +sha256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f util-linux-2.39.3.tar.xz # License files, locally calculated sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 72126adb00..a9e5b0bf68 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.39 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) -- 2.43.0 From thomas.petazzoni at bootlin.com Sun Feb 11 22:27:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:27:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/util-linux: fix build with -O0 In-Reply-To: <20231107174651.5995-1-fontaine.fabrice@gmail.com> References: <20231107174651.5995-1-fontaine.fabrice@gmail.com> Message-ID: <20240211232733.77d59395@windsurf> On Tue, 7 Nov 2023 18:46:51 +0100 Fabrice Fontaine wrote: > Fix the following build failure with -O0 raised since bump to version > 2.39 in commit ad276d94a392fb13244e042851a44269e6254d61 and > https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: > > libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': > libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant > THREAD_LOCAL int cache_size = cs_min; > ^~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/7c9b8508345ffaba167c08521fb865d76555be1d > - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 > > Signed-off-by: Fabrice Fontaine > --- > ...rc-gen_uuid.c-fix-cs_min-declaration.patch | 70 +++++++++++++++++++ > 1 file changed, 70 insertions(+) > create mode 100644 package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From ju.o at free.fr Sun Feb 11 22:30:46 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 11 Feb 2024 23:30:46 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: mdadm: improve test robustness on slow runners Message-ID: <20240211223046.1768519-1-ju.o@free.fr> As expected by Peter in [1], the hardcoded 3 seconds for waiting the RAID array to rebuild are not enough on slow test host runners. This test already failed at least once for that reason, in [2]. In order to fix those failures, this commit adds extra logic to allow several attempts, before failing. The timeout is currently set at 10 attempts, waiting 3 seconds between each attempts. To help even more, those 3 seconds are also scaled with the timeout_multiplier. Fixes: [2] [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685034.html [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/6137469690 Signed-off-by: Julien Olivain --- support/testing/tests/package/test_mdadm.py | 22 ++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_mdadm.py b/support/testing/tests/package/test_mdadm.py index 75385309a6..d5abdb0706 100644 --- a/support/testing/tests/package/test_mdadm.py +++ b/support/testing/tests/package/test_mdadm.py @@ -122,13 +122,21 @@ class TestMdadm(infra.basetest.BRTest): # We add back this blank drive to the array. self.assertRunOk(f"mdadm {md_dev} --add {failing_dev}") - # We wait few seconds to let the device rebuild. - time.sleep(3) - - # The array should no longer be marked as degraded. - out, ret = self.emulator.run(monitor_cmd) - self.assertEqual(ret, 0) - self.assertNotIn("DegradedArray", "\n".join(out)) + # Device rebuild can take a variable amount of time, depending + # on the load of the test controller host. So we will allow + # several attempts, before failing. + for attempt in range(10): + # We wait few seconds to let the device rebuild. + time.sleep(3 * self.timeout_multiplier) + + # Once rebuilt, the array should no longer be marked as + # degraded. + out, ret = self.emulator.run(monitor_cmd) + self.assertEqual(ret, 0) + if "DegradedArray" not in "\n".join(out): + break + else: + self.fail("Timeout while waiting for the array to rebuild.") # With all those array manipulations, the data file should not # be corrupted. We should be able to recompute the same hash -- 2.43.0 From aperez at igalia.com Sun Feb 11 22:52:26 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 12 Feb 2024 00:52:26 +0200 Subject: [Buildroot] [git commit] package/python3: bump version to 3.12.1 In-Reply-To: References: <20240206222231.8950D87481@busybox.osuosl.org> Message-ID: <20240212005226.GB2106578@igalia.com> Hi, On Sun, 11 Feb 2024 14:20:31 -0700 James Hilliard wrote: > On Fri, Feb 9, 2024 at 9:11?AM Bernd Kuhls wrote: > > > > Am Thu, 8 Feb 2024 21:14:52 -0500 schrieb James Knight: > > > > > import math > > > ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' > > > not found (required by > > > /builds/buildroot/output/build/python3-3.12.1/build/lib.linux- > > x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) > > > > Hi James, > > > > same here on Debian 12.4/bookworm, try this patch: > > https://github.com/bkuhls/buildroot/commit/ > > dca8b5bee7742ffedf81a027affadd4b7e18fc3f > > Yeah, this fixes the issue for me as well. Same here on Arch, I needed to apply the commit to get host-python3 built. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From buildroot at bubu1.eu Mon Feb 12 00:00:57 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 01:00:57 +0100 Subject: [Buildroot] [PATCH] support/testing: add python-msgpack runtime test Message-ID: <20240212000058.3000442-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- .../testing/tests/package/sample_python_msgpack.py | 5 +++++ support/testing/tests/package/test_python_msgpack.py | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 support/testing/tests/package/sample_python_msgpack.py create mode 100644 support/testing/tests/package/test_python_msgpack.py diff --git a/support/testing/tests/package/sample_python_msgpack.py b/support/testing/tests/package/sample_python_msgpack.py new file mode 100644 index 0000000000..1940f70821 --- /dev/null +++ b/support/testing/tests/package/sample_python_msgpack.py @@ -0,0 +1,5 @@ +import msgpack + +packaed = msgpack.packb([1, 2, 3], use_bin_type=True) + +assert msgpack.unpackb(packaed, raw=False) == [1, 2, 3] diff --git a/support/testing/tests/package/test_python_msgpack.py b/support/testing/tests/package/test_python_msgpack.py new file mode 100644 index 0000000000..e5876e400d --- /dev/null +++ b/support/testing/tests/package/test_python_msgpack.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3MsgPack(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MSGPACK=y + """ + sample_scripts = ["tests/package/sample_python_msgpack.py"] + timeout = 40 -- 2.43.0 From buildroot at bubu1.eu Mon Feb 12 00:10:00 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 01:10:00 +0100 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <20231126180840.2081945-3-james.hilliard1@gmail.com> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> Message-ID: <46469c10-9987-41fe-997e-e05e0f814319@bubu1.eu> Hi James, I hopefully found an acceptable solution to the cython problem. On 26.11.23 19:08, James Hilliard wrote: > We need host-python-cython for python-msgpack to build correctly. > This is a hard error when using a pep517 frontend. I did some more tests and actually this error comes just from Cython now being mentioned in the pyproject.toml build-system requires section.[1] In practice it is no more or less required than when using the old setup.py method. If the cython generated files are already there (they are usually present in the sdist, and indeed they are for msgpack here), then cython will never be invoked. So something simple like running sed -i -e '/Cython~=3.0.0/d' $(@D)/pyproject.toml inside some pre-build hook (or a patch to similar effect) works around this problem. I think, given the whole mess that the different cython version dependencies are currently causing, relying on the upstream generated files (as we have done before) sounds like the best option. (similarly for uvloop, which behaves just the same regarding the cython dependency). [1] https://github.com/msgpack/msgpack-python/blob/main/pyproject.toml#L5 > > Fixes: > * Getting build dependencies for wheel... > running egg_info > writing msgpack.egg-info/PKG-INFO > writing dependency_links to msgpack.egg-info/dependency_links.txt > writing top-level names to msgpack.egg-info/top_level.txt > reading manifest file 'msgpack.egg-info/SOURCES.txt' > reading manifest template 'MANIFEST.in' > warning: no files found matching '*.c' under directory 'msgpack' > adding license file 'COPYING' > writing manifest file 'msgpack.egg-info/SOURCES.txt' > > ERROR Missing dependencies: > Cython~=0.29.30 > > Signed-off-by: James Hilliard > --- > package/python-msgpack/python-msgpack.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk > index 061ff5a761..c915b23bf4 100644 > --- a/package/python-msgpack/python-msgpack.mk > +++ b/package/python-msgpack/python-msgpack.mk > @@ -10,5 +10,6 @@ PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/c2/d5/5662032db157 > PYTHON_MSGPACK_LICENSE = Apache-2.0 > PYTHON_MSGPACK_LICENSE_FILES = COPYING > PYTHON_MSGPACK_SETUP_TYPE = setuptools > +PYTHON_MSGPACK_DEPENDENCIES = host-python-cython > > $(eval $(python-package)) Marcus From buildroot at bubu1.eu Mon Feb 12 00:13:20 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 01:13:20 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> Message-ID: <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Hi Yann, James, On 11.02.24 22:57, Yann E. MORIN wrote: > James, All, > > On 2024-02-11 14:39 -0700, James Hilliard spake thusly: >> On Sun, Feb 11, 2024 at 2:24?PM Yann E. MORIN wrote: >>> On 2024-02-09 10:56 -0700, James Hilliard spake thusly: >>>> Add patches from pending upstream pull request which add cython3 >>>> compatibility. >>> We are a little bit cautious at applying random patches that have not >>> yet been at least reviewd by upstream. In this case, there has not been >>> any upstream activity since the last release, and not muc before that >>> either... >> Well these patches are being used by gentoo so they are not entirely >> untested in the real world. > > It's not that they are tested or not. It is about whether they'll have a > chance to be accepted upstream, or whether we'll have to carry and > maintain them forever in Buildroot. > > Maybe it's time that someone pings upstream about that PR? > >>> We have no in-tree user of uvloop, so I wonder whether it makes snse to >>> keep it, espcially since it mau be blocking the bumps of other packages >>> (like cython 3.x being required by whats-its-name). >> That's not entirely true, it's a common optional dependency for packages >> like python-uvicorn for example. > > $ git grep -i -E python.uvloop > > would turn only python-uvloop itself, and its runtime test. If it > is only optional, and prevents us from updating unless we apply > non-upstreamable patches, then I'd argue we should drop it. It's an optional dependency, but a recommended one, see the install instructions for uvivorn: https://github.com/encode/uvicorn?tab=readme-ov-file#quickstart It's a faster drop-in replacement for the python async event loop, but only compatible with CPython, not i.e. pypy, so usually projects don't declare a hard dependency on it. I found a hopefully better solution to our cython problems though: see the python-msgpack thread. In short: if we continue to use the sdists from pypi, cython is not a real build dependency and we can just remove it from pyptoject.toml instead of trying to provide the correct version that's never going to be invoked. > > [--SNIP--] >> I'll fix and resend. > > Thanks. > > Regards, > Yann E. MORIN. > From buildroot at bubu1.eu Mon Feb 12 00:21:26 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 01:21:26 +0100 Subject: [Buildroot] [PATCH] Revert "docs/website/support.html: document irc channel permission changes" Message-ID: <20240212002128.3002289-1-buildroot@bubu1.eu> This didn't work out as planned, neither the restriction of muting unregistered users, nor the exception for matrix users worked as planned. The channel mode has been reverted to +R (meaning only registered users are allowed to join) and an exception for *that* has been introduced for matrix users via +e. The channel modes are documented in [1]. [1] https://www.oftc.net/ChannelModes/ This reverts commit d1e6d7845b0f3b450709b84a6e4fc4527f12b196. Signed-off-by: Marcus Hoffmann --- docs/website/support.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/support.html b/docs/website/support.html index 28873c6d76..13d63b13a9 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -27,8 +27,8 @@ When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

-

Note that due to excessive spamming on IRC, you can only talk in the - channel if you are a registered user with +

Note that due to excessive spamming on IRC, the channel can only be + joined if you are a registered user with OFTC NickServ service. Follow the instructions to register as a user with a password, and then join the #buildroot channel.

-- 2.43.0 From kadambini.nema at gmail.com Mon Feb 12 00:26:07 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sun, 11 Feb 2024 16:26:07 -0800 Subject: [Buildroot] [PATCH v2] package/ustreamer: new package Message-ID: <20240212002607.12158-1-kadambini.nema@gmail.com> Lightweight and fast MJPEG-HTTP streamer (https://github.com/pikvm/ustreamer/tree/master#%C2%B5streamer) Signed-off-by: Kadambini Nema --- Changes v1 -> v2: - Fix 'make legal-info' with ustreamer package enabled. --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/ustreamer/Config.in | 17 +++++++++++++++++ package/ustreamer/ustreamer.hash | 3 +++ package/ustreamer/ustreamer.mk | 23 +++++++++++++++++++++++ 5 files changed, 47 insertions(+) create mode 100644 package/ustreamer/Config.in create mode 100644 package/ustreamer/ustreamer.hash create mode 100644 package/ustreamer/ustreamer.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..a6182777c0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1875,6 +1875,9 @@ F: package/easy-rsa/ N: Justin Maggard F: package/dtach/ +N: Kadambini Nema +F: package/ustreamer/ + N: Kamel Bouhara F: package/libodb-boost/ F: package/libodb-mysql/ diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..479c8b6657 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2595,6 +2595,7 @@ endif source "package/uredir/Config.in" source "package/ushare/Config.in" source "package/ussp-push/Config.in" + source "package/ustreamer/Config.in" source "package/vde2/Config.in" source "package/vdr/Config.in" source "package/vdr-plugin-vnsiserver/Config.in" diff --git a/package/ustreamer/Config.in b/package/ustreamer/Config.in new file mode 100644 index 0000000000..52c511e22d --- /dev/null +++ b/package/ustreamer/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_USTREAMER + bool "ustreamer" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 # V4L2_EVENT_SOURCE_CHANGE + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_ATOMIC + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBBSD + select BR2_PACKAGE_LIBGPIOD + help + Lightweight and fast MJPEG-HTTP streamer + + https://github.com/pikvm/ustreamer + +comment "ustreamer needs a toolchain w/ threads, headers >= 3.16, dynamic library" diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash new file mode 100644 index 0000000000..b7a85ca2d5 --- /dev/null +++ b/package/ustreamer/ustreamer.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 198283aaea5e7aa51da54426eb79ea436641ffb9b431e9ebace8fe5a76dfb105 ustreamer-b2ebcf99c8c51f97c44eccb6c768f5e824ecf952.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk new file mode 100644 index 0000000000..fbc30527bc --- /dev/null +++ b/package/ustreamer/ustreamer.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# ustreamer +# +################################################################################ + +USTREAMER_VERSION = b2ebcf99c8c51f97c44eccb6c768f5e824ecf952 +USTREAMER_SITE = $(call github,pikvm,ustreamer,$(USTREAMER_VERSION)) +USTREAMER_LICENSE = GPL-3.0-or-later +USTREAMER_LICENSE_FILES = LICENSE +USTREAMER_DEPENDENCIES = jpeg libevent libbsd libgpiod +USTREAMER_CONF_ENV = "CFLAGS=$(TARGET_CFLAGS)" + +define USTREAMER_BUILD_CMDS + $(MAKE) $(if $(BR2_PACKAGE_SYSTEMD),WITH_SYSTEMD=1, ) WITH_PTHREAD_NP=1 WITH_SETPROCTITLE=1 HAS_PDEATHSIG=1 $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define USTREAMER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/ustreamer $(TARGET_DIR)/usr/bin/ustreamer + $(INSTALL) -D -m 0755 $(@D)/ustreamer-dump $(TARGET_DIR)/usr/bin/ustreamer-dump +endef + +$(eval $(generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Feb 12 00:40:58 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:40:58 -0700 Subject: [Buildroot] [PATCH v3 2/5] package/python-pyyaml: disable cython build In-Reply-To: <20240212004101.614670-1-james.hilliard1@gmail.com> References: <20240212004101.614670-1-james.hilliard1@gmail.com> Message-ID: <20240212004101.614670-2-james.hilliard1@gmail.com> Currently pyyaml does not support cython 3, as this is only an optional build dependency lets just disable cython for now as it will otherwise prevent us from updating cython. Signed-off-by: James Hilliard --- package/python-pyyaml/python-pyyaml.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 846c57df4f..2e4696a504 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -12,8 +12,7 @@ PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml -PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml -PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 +PYTHON_PYYAML_DEPENDENCIES = libyaml HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 00:40:57 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:40:57 -0700 Subject: [Buildroot] [PATCH v3 1/5] package/python-uvloop: add support for cython3 Message-ID: <20240212004101.614670-1-james.hilliard1@gmail.com> Add patches from pending upstream pull request which add cython3 compatibility. These patches have been in use by gentoo so they should be have a decent amount of real world testing/usage. See: https://github.com/gentoo/gentoo/commit/cd37f8eb287497af5a30b3c68beafc82412cd88d Signed-off-by: James Hilliard --- Changes v1 -> v2: - fix header for check-package --- .../0001-Updates-for-Cython3.patch | 630 ++++++++++++++++++ ...ebug-has-args-difference-in-python-3.patch | 29 + .../0003-fix-tests-on-python-3.8.patch | 30 + .../0004-fix-arg-count-for-wrap.patch | 51 ++ 4 files changed, 740 insertions(+) create mode 100644 package/python-uvloop/0001-Updates-for-Cython3.patch create mode 100644 package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch create mode 100644 package/python-uvloop/0003-fix-tests-on-python-3.8.patch create mode 100644 package/python-uvloop/0004-fix-arg-count-for-wrap.patch diff --git a/package/python-uvloop/0001-Updates-for-Cython3.patch b/package/python-uvloop/0001-Updates-for-Cython3.patch new file mode 100644 index 0000000000..5ed1c7536f --- /dev/null +++ b/package/python-uvloop/0001-Updates-for-Cython3.patch @@ -0,0 +1,630 @@ +From 087a2983c8022598232cb7ed0a49da334d7af9ff Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 12:18:15 +0000 +Subject: [PATCH] Updates for Cython3 Remove SSL depreciation warnings buillt + on debian 12.6 python-3.22 Cython-3.0.7 libuv-1.46.0 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + Makefile | 2 +- + setup.py | 6 ++++-- + tests/test_process.py | 4 ++-- + tests/test_tcp.py | 19 ++++++++++++------- + uvloop/_testbase.py | 4 +++- + uvloop/cbhandles.pyx | 4 ++-- + uvloop/dns.pyx | 4 ++-- + uvloop/handles/basetransport.pxd | 4 ++-- + uvloop/handles/basetransport.pyx | 4 ++-- + uvloop/handles/handle.pyx | 2 +- + uvloop/handles/pipe.pyx | 2 +- + uvloop/handles/poll.pxd | 2 +- + uvloop/handles/poll.pyx | 2 +- + uvloop/handles/stream.pyx | 16 ++++++++++------ + uvloop/handles/udp.pyx | 4 ++-- + uvloop/includes/consts.pxi | 25 ------------------------- + uvloop/includes/fork_handler.h | 6 +++++- + uvloop/includes/system.h | 16 ++++++++++++++++ + uvloop/includes/system.pxd | 12 ++++-------- + uvloop/includes/uv.pxd | 6 +++--- + uvloop/loop.pxd | 28 ++++++++++++++++++++++++---- + uvloop/loop.pyx | 10 +++++----- + uvloop/sslproto.pxd | 4 ++-- + uvloop/sslproto.pyx | 4 ++-- + 24 files changed, 107 insertions(+), 83 deletions(-) + delete mode 100644 uvloop/includes/consts.pxi + create mode 100755 uvloop/includes/system.h + +diff --git a/Makefile b/Makefile +index 4375e5d..6a0475a 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,7 @@ _default: compile + + + clean: +- rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd ++ rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd + rm -fr uvloop/*.c uvloop/*.html uvloop/*.so + rm -fr uvloop/handles/*.html uvloop/includes/*.html + find . -name '__pycache__' | xargs rm -rf +diff --git a/setup.py b/setup.py +index ba15af5..8fdf0e5 100644 +--- a/setup.py ++++ b/setup.py +@@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext + from setuptools.command.sdist import sdist + + +-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)' ++CYTHON_DEPENDENCY = 'Cython(>=0.29.36)' + MACHINE = platform.machine() + MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')] + _ROOT = pathlib.Path(__file__).parent +@@ -144,7 +144,9 @@ class uvloop_build_ext(build_ext): + self.distribution.ext_modules[:] = cythonize( + self.distribution.ext_modules, + compiler_directives=directives, +- annotate=self.cython_annotate) ++ annotate=self.cython_annotate, ++ compile_time_env=dict(DEFAULT_FREELIST_SIZE=250, SSL_READ_MAX_SIZE=256 * 1024), ++ emit_linenums=True) + + super().finalize_options() + +diff --git a/tests/test_process.py b/tests/test_process.py +index bfcbba1..95e1c9e 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -912,7 +912,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +@@ -931,7 +931,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +diff --git a/tests/test_tcp.py b/tests/test_tcp.py +index 812e62b..213e2d9 100644 +--- a/tests/test_tcp.py ++++ b/tests/test_tcp.py +@@ -1630,17 +1630,22 @@ class _TestSSL(tb.SSLTestCase): + self.fail("unexpected call to connection_made()") + + def test_ssl_connect_accepted_socket(self): +- if hasattr(ssl, 'PROTOCOL_TLS'): +- proto = ssl.PROTOCOL_TLS ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ server_proto = ssl.PROTOCOL_TLS_SERVER ++ client_proto = ssl.PROTOCOL_TLS_CLIENT + else: +- proto = ssl.PROTOCOL_SSLv23 +- server_context = ssl.SSLContext(proto) ++ if hasattr(ssl, 'PROTOCOL_TLS'): ++ client_proto = server_proto = ssl.PROTOCOL_TLS ++ else: ++ client_proto = server_proto = ssl.PROTOCOL_SSLv23 ++ ++ server_context = ssl.SSLContext(server_proto) + server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY) + if hasattr(server_context, 'check_hostname'): + server_context.check_hostname = False + server_context.verify_mode = ssl.CERT_NONE + +- client_context = ssl.SSLContext(proto) ++ client_context = ssl.SSLContext(client_proto) + if hasattr(server_context, 'check_hostname'): + client_context.check_hostname = False + client_context.verify_mode = ssl.CERT_NONE +@@ -2233,7 +2238,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx.use_privatekey_file(self.ONLYKEY) + sslctx.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + def server(sock): +@@ -2592,7 +2597,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx_openssl.use_privatekey_file(self.ONLYKEY) + sslctx_openssl.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + future = None +diff --git a/uvloop/_testbase.py b/uvloop/_testbase.py +index c4a7595..e620e15 100644 +--- a/uvloop/_testbase.py ++++ b/uvloop/_testbase.py +@@ -269,7 +269,9 @@ def find_free_port(start_from=50000): + class SSLTestCase: + + def _create_server_ssl_context(self, certfile, keyfile=None): +- if hasattr(ssl, 'PROTOCOL_TLS'): ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) ++ elif hasattr(ssl, 'PROTOCOL_TLS'): + sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS) + else: + sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) +diff --git a/uvloop/cbhandles.pyx b/uvloop/cbhandles.pyx +index 2914b42..8bcc5aa 100644 +--- a/uvloop/cbhandles.pyx ++++ b/uvloop/cbhandles.pyx +@@ -76,8 +76,8 @@ cdef class Handle: + self.arg1, self.arg2, self.arg3, self.arg4) + + else: +- raise RuntimeError('invalid Handle.cb_type: {}'.format( +- cb_type)) ++ raise RuntimeError('invalid Handle.cb_type: {} {!r}/{!r}'.format( ++ cb_type, self.args1, self.args2)) + + except (KeyboardInterrupt, SystemExit): + raise +diff --git a/uvloop/dns.pyx b/uvloop/dns.pyx +index 7aad631..09b9282 100644 +--- a/uvloop/dns.pyx ++++ b/uvloop/dns.pyx +@@ -298,7 +298,7 @@ cdef class AddrInfo: + uv.uv_freeaddrinfo(self.data) # returns void + self.data = NULL + +- cdef void set_data(self, system.addrinfo *data): ++ cdef void set_data(self, system.addrinfo *data) noexcept: + self.data = data + + cdef unpack(self): +@@ -326,7 +326,7 @@ cdef class AddrInfo: + return result + + @staticmethod +- cdef int isinstance(object other): ++ cdef int isinstance(object other) noexcept: + return type(other) is AddrInfo + + +diff --git a/uvloop/handles/basetransport.pxd b/uvloop/handles/basetransport.pxd +index ba356a7..8112622 100644 +--- a/uvloop/handles/basetransport.pxd ++++ b/uvloop/handles/basetransport.pxd +@@ -47,8 +47,8 @@ cdef class UVBaseTransport(UVSocketHandle): + # === overloads === + + cdef _new_socket(self) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + +- cdef bint _is_reading(self) ++ cdef bint _is_reading(self) noexcept + cdef _start_reading(self) + cdef _stop_reading(self) +diff --git a/uvloop/handles/basetransport.pyx b/uvloop/handles/basetransport.pyx +index 28b3079..a8592f2 100644 +--- a/uvloop/handles/basetransport.pyx ++++ b/uvloop/handles/basetransport.pyx +@@ -18,7 +18,7 @@ cdef class UVBaseTransport(UVSocketHandle): + + self._closing = 0 + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return 0 + + cdef inline _schedule_call_connection_made(self): +@@ -211,7 +211,7 @@ cdef class UVBaseTransport(UVSocketHandle): + self._extra_info = {} + self._extra_info[name] = obj + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + raise NotImplementedError + + cdef _start_reading(self): +diff --git a/uvloop/handles/handle.pyx b/uvloop/handles/handle.pyx +index 6efe375..2c96458 100644 +--- a/uvloop/handles/handle.pyx ++++ b/uvloop/handles/handle.pyx +@@ -363,7 +363,7 @@ cdef void __uv_close_handle_cb(uv.uv_handle_t* handle) noexcept with gil: + Py_DECREF(h) # Was INCREFed in UVHandle._close + + +-cdef void __close_all_handles(Loop loop): ++cdef void __close_all_handles(Loop loop) noexcept: + uv.uv_walk(loop.uvloop, + __uv_walk_close_all_handles_cb, + loop) # void +diff --git a/uvloop/handles/pipe.pyx b/uvloop/handles/pipe.pyx +index 195576c..d30a736 100644 +--- a/uvloop/handles/pipe.pyx ++++ b/uvloop/handles/pipe.pyx +@@ -25,7 +25,7 @@ cdef __pipe_init_uv_handle(UVStream handle, Loop loop): + cdef __pipe_open(UVStream handle, int fd): + cdef int err + err = uv.uv_pipe_open(handle._handle, +- fd) ++ fd) + if err < 0: + exc = convert_error(err) + raise exc +diff --git a/uvloop/handles/poll.pxd b/uvloop/handles/poll.pxd +index d07030b..c220540 100644 +--- a/uvloop/handles/poll.pxd ++++ b/uvloop/handles/poll.pxd +@@ -10,7 +10,7 @@ cdef class UVPoll(UVHandle): + cdef inline _poll_start(self, int flags) + cdef inline _poll_stop(self) + +- cdef int is_active(self) ++ cdef int is_active(self) noexcept + + cdef is_reading(self) + cdef is_writing(self) +diff --git a/uvloop/handles/poll.pyx b/uvloop/handles/poll.pyx +index fca5981..c905e9b 100644 +--- a/uvloop/handles/poll.pyx ++++ b/uvloop/handles/poll.pyx +@@ -29,7 +29,7 @@ cdef class UVPoll(UVHandle): + handle._init(loop, fd) + return handle + +- cdef int is_active(self): ++ cdef int is_active(self) noexcept: + return (self.reading_handle is not None or + self.writing_handle is not None) + +diff --git a/uvloop/handles/stream.pyx b/uvloop/handles/stream.pyx +index d4e02e3..09df887 100644 +--- a/uvloop/handles/stream.pyx ++++ b/uvloop/handles/stream.pyx +@@ -1,4 +1,8 @@ +-DEF __PREALLOCED_BUFS = 4 ++cdef extern from *: ++ ''' ++ enum {__PREALLOCED_BUFS = 4}; ++ ''' ++ const bint __PREALLOCED_BUFS + + + @cython.no_gc_clear +@@ -279,7 +283,7 @@ cdef class UVStream(UVBaseTransport): + cdef inline _close_on_read_error(self): + self.__read_error_close = 1 + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__reading + + cdef _start_reading(self): +@@ -578,7 +582,7 @@ cdef class UVStream(UVBaseTransport): + + self._maybe_resume_protocol() + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return ((self._handle).write_queue_size + +@@ -755,7 +759,7 @@ cdef inline bint __uv_stream_on_read_common( + UVStream sc, + Loop loop, + ssize_t nread, +-): ++) noexcept: + if sc._closed: + # The stream was closed, there is no reason to + # do any work now. +@@ -818,7 +822,7 @@ cdef inline void __uv_stream_on_read_impl( + uv.uv_stream_t* stream, + ssize_t nread, + const uv.uv_buf_t* buf, +-): ++) noexcept: + cdef: + UVStream sc = stream.data + Loop loop = sc._loop +@@ -849,7 +853,7 @@ cdef inline void __uv_stream_on_read_impl( + cdef inline void __uv_stream_on_write_impl( + uv.uv_write_t* req, + int status, +-): ++) noexcept: + cdef: + _StreamWriteContext ctx = <_StreamWriteContext> req.data + UVStream stream = ctx.stream +diff --git a/uvloop/handles/udp.pyx b/uvloop/handles/udp.pyx +index bbe60d5..fdd1d8b 100644 +--- a/uvloop/handles/udp.pyx ++++ b/uvloop/handles/udp.pyx +@@ -127,12 +127,12 @@ cdef class UDPTransport(UVBaseTransport): + exc = convert_error(err) + raise exc + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return (self._handle).send_queue_size + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__receiving + + cdef _start_reading(self): +diff --git a/uvloop/includes/consts.pxi b/uvloop/includes/consts.pxi +deleted file mode 100644 +index f765053..0000000 +--- a/uvloop/includes/consts.pxi ++++ /dev/null +@@ -1,25 +0,0 @@ +-DEF UV_STREAM_RECV_BUF_SIZE = 256000 # 250kb +- +-DEF FLOW_CONTROL_HIGH_WATER = 64 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB +- +-DEF DEFAULT_FREELIST_SIZE = 250 +-DEF DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 +- +-DEF DEBUG_STACK_DEPTH = 10 +- +- +-DEF __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 +- +- +-DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 +- +- +-# Number of seconds to wait for SSL handshake to complete +-# The default timeout matches that of Nginx. +-DEF SSL_HANDSHAKE_TIMEOUT = 60.0 +-# Number of seconds to wait for SSL shutdown to complete +-# The default timeout mimics lingering_time +-DEF SSL_SHUTDOWN_TIMEOUT = 30.0 +-DEF SSL_READ_MAX_SIZE = 256 * 1024 +diff --git a/uvloop/includes/fork_handler.h b/uvloop/includes/fork_handler.h +index 47bbe03..9d3573a 100644 +--- a/uvloop/includes/fork_handler.h ++++ b/uvloop/includes/fork_handler.h +@@ -1,7 +1,10 @@ ++#ifndef UVLOOP_FORK_HANDLER_H_ ++#define UVLOOP_FORK_HANDLER_H_ ++ + volatile uint64_t MAIN_THREAD_ID = 0; + volatile int8_t MAIN_THREAD_ID_SET = 0; + +-typedef void (*OnForkHandler)(); ++typedef void (*OnForkHandler)(void); + + OnForkHandler __forkHandler = NULL; + +@@ -36,3 +39,4 @@ void setMainThreadID(uint64_t id) { + MAIN_THREAD_ID = id; + MAIN_THREAD_ID_SET = 1; + } ++#endif +diff --git a/uvloop/includes/system.h b/uvloop/includes/system.h +new file mode 100755 +index 0000000..e143bb5 +--- /dev/null ++++ b/uvloop/includes/system.h +@@ -0,0 +1,16 @@ ++#ifndef UVLOOP_SYSTEM_H_ ++#define UVLOOP_SYSTEM_H_ ++#if defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER) ++#include "Winsock2.h" ++#include "ws2def.h" ++#include "includes/fork_handler.h" ++#else ++#include "arpa/inet.h" ++#include "sys/socket.h" ++#include "sys/un.h" ++#include "unistd.h" ++#include "pthread.h" ++#endif ++#endif ++ ++ +diff --git a/uvloop/includes/system.pxd b/uvloop/includes/system.pxd +index 367fedd..d1da74e 100644 +--- a/uvloop/includes/system.pxd ++++ b/uvloop/includes/system.pxd +@@ -1,13 +1,9 @@ + from libc.stdint cimport int8_t, uint64_t + +-cdef extern from "arpa/inet.h" nogil: +- +- int ntohl(int) +- int htonl(int) +- int ntohs(int) +- +- +-cdef extern from "sys/socket.h" nogil: ++cdef extern from "includes/system.h": ++ int ntohl(int) nogil ++ int htonl(int) nogil ++ int ntohs(int) nogil + + struct sockaddr: + unsigned short sa_family +diff --git a/uvloop/includes/uv.pxd b/uvloop/includes/uv.pxd +index 8765130..ddd9738 100644 +--- a/uvloop/includes/uv.pxd ++++ b/uvloop/includes/uv.pxd +@@ -220,7 +220,7 @@ cdef extern from "uv.h" nogil: + UV_LEAVE_GROUP = 0, + UV_JOIN_GROUP + +- cpdef enum uv_fs_event: ++ cdef enum uv_fs_event: + UV_RENAME = 1, + UV_CHANGE = 2 + +@@ -282,7 +282,7 @@ cdef extern from "uv.h" nogil: + int uv_loop_close(uv_loop_t* loop) + int uv_loop_alive(uv_loop_t* loop) + int uv_loop_fork(uv_loop_t* loop) +- int uv_backend_fd(uv_loop_t* loop) ++ uv_os_fd_t uv_backend_fd(uv_loop_t* loop) + + void uv_update_time(uv_loop_t* loop) + uint64_t uv_now(const uv_loop_t*) +@@ -378,7 +378,7 @@ cdef extern from "uv.h" nogil: + # Pipes + + int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) +- int uv_pipe_open(uv_pipe_t* handle, uv_file file) ++ int uv_pipe_open(uv_pipe_t* handle, uv_os_fd_t file) + int uv_pipe_bind(uv_pipe_t* handle, const char* name) + + void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index 5613473..f90c704 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -1,15 +1,35 @@ + # cython: language_level=3 + ++cdef extern from *: ++ ''' ++ enum { UV_STREAM_RECV_BUF_SIZE = 256000, ++ SSL_READ_MAX_SIZE = 256 * 1024, // 250kb ++ }; ++ const float SSL_HANDSHAKE_TIMEOUT = 60.0; // Number of seconds to wait for SSL handshake to complete The default timeout matches that of Nginx. ++ const float SSL_SHUTDOWN_TIMEOUT = 30.0; // Number of seconds to wait for SSL shutdown to complete The default timeout mimics lingering_time ++ ''' ++ const bint UV_STREAM_RECV_BUF_SIZE ++ const bint SSL_READ_MAX_SIZE ++ ++ const float SSL_HANDSHAKE_TIMEOUT ++ const float SSL_SHUTDOWN_TIMEOUT ++ ++cdef enum: ++ FLOW_CONTROL_HIGH_WATER = 64 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB ++ ++ DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 ++ DEBUG_STACK_DEPTH = 10 ++ __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 ++ LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 ++ + + from .includes cimport uv + from .includes cimport system + + from libc.stdint cimport uint64_t, uint32_t, int64_t + +- +-include "includes/consts.pxi" +- +- + cdef extern from *: + ctypedef int vint "volatile int" + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 334d8d5..53e1160 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -43,7 +43,7 @@ from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer + from . import _noop + + +-include "includes/consts.pxi" ++ + include "includes/stdlib.pxi" + + include "errors.pyx" +@@ -1118,7 +1118,7 @@ cdef class Loop: + + cdef _sock_set_reuseport(self, int fd): + cdef: +- int err ++ int err = 0 + int reuseport_flag = 1 + + err = system.setsockopt( +@@ -1397,7 +1397,7 @@ cdef class Loop: + self._debug = bool(enabled) + if self.is_running(): + self.call_soon_threadsafe( +- self._set_coroutine_debug, self, self._debug) ++ self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +@@ -2750,7 +2750,7 @@ cdef class Loop: + executable=None, + pass_fds=(), + # For tests only! Do not use in your code. Ever. +- __uvloop_sleep_after_fork=False): ++ uvloop_sleep_after_fork=False): + + # TODO: Implement close_fds (might not be very important in + # Python 3.5, since all FDs aren't inheritable by default.) +@@ -2770,7 +2770,7 @@ cdef class Loop: + if executable is not None: + args[0] = executable + +- if __uvloop_sleep_after_fork: ++ if uvloop_sleep_after_fork: + debug_flags |= __PROCESS_DEBUG_SLEEP_AFTER_FORK + + waiter = self._new_future() +diff --git a/uvloop/sslproto.pxd b/uvloop/sslproto.pxd +index 3da10f0..68e4d57 100644 +--- a/uvloop/sslproto.pxd ++++ b/uvloop/sslproto.pxd +@@ -122,7 +122,7 @@ cdef class SSLProtocol: + # Flow control for writes from APP socket + + cdef _control_app_writing(self, object context=*) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + cdef _set_write_buffer_limits(self, high=*, low=*) + + # Flow control for reads to APP socket +@@ -134,5 +134,5 @@ cdef class SSLProtocol: + + cdef _control_ssl_reading(self) + cdef _set_read_buffer_limits(self, high=*, low=*) +- cdef size_t _get_read_buffer_size(self) ++ cdef size_t _get_read_buffer_size(self) noexcept + cdef _fatal_error(self, exc, message=*) +diff --git a/uvloop/sslproto.pyx b/uvloop/sslproto.pyx +index 42bb764..0a43746 100644 +--- a/uvloop/sslproto.pyx ++++ b/uvloop/sslproto.pyx +@@ -861,7 +861,7 @@ cdef class SSLProtocol: + 'protocol': self, + }) + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return self._outgoing.pending + self._write_buffer_size + + cdef _set_write_buffer_limits(self, high=None, low=None): +@@ -903,7 +903,7 @@ cdef class SSLProtocol: + self._incoming_high_water = high + self._incoming_low_water = low + +- cdef size_t _get_read_buffer_size(self): ++ cdef size_t _get_read_buffer_size(self) noexcept: + return self._incoming.pending + + # Flow control for writes to SSL socket +-- +2.34.1 + diff --git a/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch new file mode 100644 index 0000000000..0567eebe82 --- /dev/null +++ b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch @@ -0,0 +1,29 @@ +From 8b63801bfdb1f0cf7fde4f58e96f8628a587b186 Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 16:17:49 +0000 +Subject: [PATCH] _set_coroutine_debug has args difference in python 3.11 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pyx | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 53e1160..5ca718e 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,8 +1396,9 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): ++ args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) + self.call_soon_threadsafe( +- self._set_coroutine_debug, self._debug) ++ self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0003-fix-tests-on-python-3.8.patch b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch new file mode 100644 index 0000000000..e9bed5e877 --- /dev/null +++ b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch @@ -0,0 +1,30 @@ +From ef5c3e5c6f331692ebcbea9e4c6aead8b2187038 Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 19:58:11 +0000 +Subject: [PATCH] fix tests on python 3.8 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pyx | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 5ca718e..75b915a 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,9 +1396,8 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe( +- self._set_coroutine_debug, *args) ++ args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) ++ self.call_soon_threadsafe(self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0004-fix-arg-count-for-wrap.patch b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch new file mode 100644 index 0000000000..d19923a5bc --- /dev/null +++ b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch @@ -0,0 +1,51 @@ +From afef6364c2c3100ab23c2bb2de82d2da330b258c Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Fri, 29 Dec 2023 11:24:19 +0000 +Subject: [PATCH] fix arg count for wrap() + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pxd | 2 +- + uvloop/loop.pyx | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index f90c704..d34ffeb 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -220,7 +220,7 @@ cdef class Loop: + cdef inline _ceval_process_signals(self) + cdef _invoke_signals(self, bytes data) + +- cdef _set_coroutine_debug(self, bint enabled) ++ cpdef _set_coroutine_debug(self, bint enabled) + + cdef _print_debug_info(self) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 75b915a..a3eeb60 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1131,7 +1131,7 @@ cdef class Loop: + if err < 0: + raise convert_error(-errno.errno) + +- cdef _set_coroutine_debug(self, bint enabled): ++ cpdef _set_coroutine_debug(self, bint enabled): + enabled = bool(enabled) + if self._coroutine_debug_set == enabled: + return +@@ -1396,8 +1396,7 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe(self._set_coroutine_debug, *args) ++ self.call_soon_threadsafe(self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 00:40:59 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:40:59 -0700 Subject: [Buildroot] [PATCH v3 3/5] package/python-numpy: bump to version 1.26.4 In-Reply-To: <20240212004101.614670-1-james.hilliard1@gmail.com> References: <20240212004101.614670-1-james.hilliard1@gmail.com> Message-ID: <20240212004101.614670-3-james.hilliard1@gmail.com> License hash changed due to date update: https://github.com/numpy/numpy/commit/c1ffdbc0c29d48ece717acb5bfbf811c935b41f6 We need to build python-numpy with its vendored version of meson as it currently relies on features that are not yet upstream. To do this we can simply set the PYTHONPATH with the vendored meson path before the normal PYTHON3_PATH so that the vendored version will have precedence. We need to set this for both host and target numpy. We also need to set the architecture specific longdouble_format property as numpy is unable to determine the value for this without being able to execute target binaries. See: https://github.com/numpy/numpy/blob/3e7e5c3cabb8f1a0d940dc6f2058fed4a8c3e284/doc/source/building/cross_compilation.rst Signed-off-by: James Hilliard --- package/python-numpy/python-numpy.hash | 7 ++-- package/python-numpy/python-numpy.mk | 44 ++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index 6629cebbce..34426e7557 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,7 +1,8 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.25.0 -sha256 f1accae9a28dc3cda46a91de86acf69de0d1b5f4edd44a9b0c3ceb8036dfff19 numpy-1.25.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/numpy/json +md5 19550cbe7bedd96a928da9d4ad69509d numpy-1.26.4.tar.gz +sha256 2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010 numpy-1.26.4.tar.gz # License files, locally calculated -sha256 1034d3bd61783f3b5e7ec3e7ca818f4da4135132323a0ef99f4c0edb3c7f6bd2 LICENSE.txt +sha256 263223390c43a9d4a0841e0209265fd927a198f8e89c8eee809b7437d7e5e8c2 LICENSE.txt sha256 c27d0a8026bdb8876562b720ab24d1688e3827a89f6083cd6e7e8caa9584aba3 numpy/core/src/multiarray/dragon4.c sha256 fbc539f47d0cf83bc61378080fb873d5c14630126cacbfe754035c3926daa5ec numpy/core/include/numpy/libdivide/LICENSE.txt sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 200fac20a1..36ae278ff1 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.25.0 +PYTHON_NUMPY_VERSION = 1.26.4 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz -PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) +PYTHON_NUMPY_SITE = https://files.pythonhosted.org/packages/65/6e/09db70a523a96d25e115e71cc56a6f9031e7b8cd166c1ac8438307c14058 PYTHON_NUMPY_LICENSE = BSD-3-Clause, MIT, Zlib PYTHON_NUMPY_LICENSE_FILES = \ LICENSE.txt \ @@ -22,7 +22,10 @@ HOST_PYTHON_NUMPY_DEPENDENCIES = host-python-cython PYTHON_NUMPY_CONF_ENV += \ _PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \ - PYTHONPATH=$(PYTHON3_PATH) + PYTHONPATH="$(@D)/vendored-meson/meson:$(PYTHON3_PATH)" + +PYTHON_NUMPY_NINJA_ENV += \ + PYTHONPATH="$(@D)/vendored-meson/meson:$(PYTHON3_PATH)" ifeq ($(BR2_PACKAGE_LAPACK),y) PYTHON_NUMPY_DEPENDENCIES += lapack @@ -38,6 +41,41 @@ else PYTHON_NUMPY_CONF_OPTS += -Dblas="" endif +ifeq ($(BR2_arcle),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_DOUBLE_LE +else ifeq ($(BR2_arceb),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_DOUBLE_BE +else ifeq ($(BR2_aarch64),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_QUAD_LE +else ifeq ($(BR2_arm),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = INTEL_EXTENDED_12_BYTES_LE +else ifeq ($(BR2_armeb),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = MOTOROLA_EXTENDED_12_BYTES_BE +else ifeq ($(BR2_i386),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = INTEL_EXTENDED_12_BYTES_LE +else ifeq ($(BR2_mips),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_DOUBLE_BE +else ifeq ($(BR2_mipsel),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = INTEL_EXTENDED_12_BYTES_LE +else ifeq ($(BR2_powerpc),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_QUAD_BE +else ifeq ($(BR2_powerpc64),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_QUAD_BE +else ifeq ($(BR2_sh),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_DOUBLE_LE +else ifeq ($(BR2_x86_64),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_QUAD_LE +endif + +PYTHON_NUMPY_MESON_EXTRA_PROPERTIES = \ + longdouble_format='$(PYTHON_NUMPY_LONGDOUBLE_FORMAT)' + +HOST_PYTHON_NUMPY_CONF_ENV += \ + PYTHONPATH="$(@D)/vendored-meson/meson:$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)" + +HOST_PYTHON_NUMPY_NINJA_ENV += \ + PYTHONPATH="$(@D)/vendored-meson/meson:$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)" + # Rather than add a host-blas or host-lapack dependencies, just use unoptimized, # in-tree code. HOST_PYTHON_NUMPY_CONF_OPTS = -Dblas="" -Dlapack="" -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 00:41:00 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:41:00 -0700 Subject: [Buildroot] [PATCH v3 4/5] package/python-scipy: bump to version 1.12.0 In-Reply-To: <20240212004101.614670-1-james.hilliard1@gmail.com> References: <20240212004101.614670-1-james.hilliard1@gmail.com> Message-ID: <20240212004101.614670-4-james.hilliard1@gmail.com> License hash changed due to date update: https://github.com/scipy/scipy/commit/0ace7295322148d74932bee32b0647e29c38fc8a Signed-off-by: James Hilliard --- package/python-scipy/python-scipy.hash | 6 +++--- package/python-scipy/python-scipy.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash index bee5d698a0..5b8cac8055 100644 --- a/package/python-scipy/python-scipy.hash +++ b/package/python-scipy/python-scipy.hash @@ -1,8 +1,8 @@ # md5, sha256 from https://pypi.org/pypi/scipy/json -md5 0e8eea0f7c4fe7d8102366230c96d66d scipy-1.11.4.tar.gz -sha256 90a2b78e7f5733b9de748f589f09225013685f9b218275257f8a8168ededaeaa scipy-1.11.4.tar.gz +md5 22683fcf9a411f0a5254b7509bea0a6b scipy-1.12.0.tar.gz +sha256 4bf5abab8a36d20193c698b0f1fc282c1d083c94723902c447e5d2f1780936a3 scipy-1.12.0.tar.gz # Locally computed sha256 checksums -sha256 5517022426a56179540ee6eace15fd723ef8fdb83b2900fed2152dd2e2f972a2 LICENSE.txt +sha256 c29fb8e5936f33237a8b15256b4c6e93037f05bbf58c3d7b5755aede4c200173 LICENSE.txt sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/_dsolve/SuperLU/License.txt diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk index 6626826e33..9110a5b847 100644 --- a/package/python-scipy/python-scipy.mk +++ b/package/python-scipy/python-scipy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCIPY_VERSION = 1.11.4 +PYTHON_SCIPY_VERSION = 1.12.0 PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.gz -PYTHON_SCIPY_SITE = https://files.pythonhosted.org/packages/6e/1f/91144ba78dccea567a6466262922786ffc97be1e9b06ed9574ef0edc11e1 +PYTHON_SCIPY_SITE = https://files.pythonhosted.org/packages/30/85/cdbf2c3c460fe5aae812917866392068a88d02f07de0fe31ce738734c477 PYTHON_SCIPY_LICENSE = \ BSD-3-Clause, \ BSD-2-Clause, \ -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 00:41:01 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:41:01 -0700 Subject: [Buildroot] [PATCH v3 5/5] package/python-cython: bump to version 3.0.8 In-Reply-To: <20240212004101.614670-1-james.hilliard1@gmail.com> References: <20240212004101.614670-1-james.hilliard1@gmail.com> Message-ID: <20240212004101.614670-5-james.hilliard1@gmail.com> Tested by ensuring all packages with a host-python-cython dependency build succesfully. Note that due to namespace conflicts supporting both cython 0.29 and cython 3.0 variants at the same time would be difficult as both can not be installed at the same time. License hash changed due to changing links from http to https: https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 Signed-off-by: James Hilliard --- Changes v2 -> v3: - add more details to commit message --- package/python-cython/python-cython.hash | 6 +++--- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 08ad8f6d84..55e4a6f203 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 a4d0f9fbc9c137f1a88937cd40e8c5ee Cython-0.29.36.tar.gz -sha256 41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f Cython-0.29.36.tar.gz +md5 9f7baaa983e1bd06eaeb4fa0adfc77e5 Cython-3.0.8.tar.gz +sha256 8333423d8fd5765e7cceea3a9985dd1e0a5dfeb2734629e1a2ed2d6233d39de6 Cython-3.0.8.tar.gz # Locally computed sha256 checksums -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt +sha256 9568a2b155e66ac3e0ba1fd80b52b827b9460e6cf6f233125e7cbca8e206ddc3 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 47e105c065..d76bfb766d 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.36 +PYTHON_CYTHON_VERSION = 3.0.8 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 00:46:18 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:46:18 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-cython: bump to version 3.0.8 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <20240209175631.1337370-2-james.hilliard1@gmail.com> Message-ID: On Sun, Feb 11, 2024 at 2:30?PM Yann E. MORIN wrote: > > James, All, > > On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > > License hash changed due to changing links from http to https: > > https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 > > Thanks for the simple and sufficient explanation. ? > > > Signed-off-by: James Hilliard > > --- > [--SNIP--] > > diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk > > index 47e105c065..d76bfb766d 100644 > > --- a/package/python-cython/python-cython.mk > > +++ b/package/python-cython/python-cython.mk > > @@ -4,9 +4,9 @@ > > # > > ################################################################################ > > > > -PYTHON_CYTHON_VERSION = 0.29.36 > > +PYTHON_CYTHON_VERSION = 3.0.8 > > Given there was an earlier discussion about how the cython bump was > causing some issues with various packages, I would have expected at > least a post-commit summarising what tests were done to ensure the bump > was OK. Yeah, there was some more breakage that needed fixing, I had to bump some packages(numpy/scipy) and tweak a few things to get everything building with cython 3. > > Also, as those same discussions hinted at, cython 0.29 seems to still be > in active development (or at least active maintenance), so the commit > log should have also explained why it was decided to go with a full bump > to 3.0.x rather than intriducing a cython3 package and installing both > in parallel. Or that it was not possiblr to do so becaus they can't be > installed in parallel. I'm not aware of any way to install both at the same time since they share the same namespace essentially. > > Could you respin this series, fixing the check-package issues in patch > 1, and extending the commit log pqtch 2 to better assess the situation, > please? Added more details in v3: https://patchwork.ozlabs.org/project/buildroot/patch/20240212004101.614670-5-james.hilliard1 at gmail.com/ > > Regards, > Yann E. MORIN. > > > PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz > > -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 > > +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 > > PYTHON_CYTHON_SETUP_TYPE = setuptools > > PYTHON_CYTHON_LICENSE = Apache-2.0 > > PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Mon Feb 12 00:51:30 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:51:30 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Message-ID: On Sun, Feb 11, 2024 at 5:13?PM Marcus Hoffmann wrote: > > Hi Yann, James, > > On 11.02.24 22:57, Yann E. MORIN wrote: > > James, All, > > > > On 2024-02-11 14:39 -0700, James Hilliard spake thusly: > >> On Sun, Feb 11, 2024 at 2:24?PM Yann E. MORIN wrote: > >>> On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > >>>> Add patches from pending upstream pull request which add cython3 > >>>> compatibility. > >>> We are a little bit cautious at applying random patches that have not > >>> yet been at least reviewd by upstream. In this case, there has not been > >>> any upstream activity since the last release, and not muc before that > >>> either... > >> Well these patches are being used by gentoo so they are not entirely > >> untested in the real world. > > > > It's not that they are tested or not. It is about whether they'll have a > > chance to be accepted upstream, or whether we'll have to carry and > > maintain them forever in Buildroot. > > > > Maybe it's time that someone pings upstream about that PR? Ok, I pinged one of the maintainers: https://github.com/MagicStack/uvloop/pull/587#issuecomment-1937896616 > > > >>> We have no in-tree user of uvloop, so I wonder whether it makes snse to > >>> keep it, espcially since it mau be blocking the bumps of other packages > >>> (like cython 3.x being required by whats-its-name). > >> That's not entirely true, it's a common optional dependency for packages > >> like python-uvicorn for example. > > > > $ git grep -i -E python.uvloop > > > > would turn only python-uvloop itself, and its runtime test. If it > > is only optional, and prevents us from updating unless we apply > > non-upstreamable patches, then I'd argue we should drop it. > > It's an optional dependency, but a recommended one, see the install > instructions for uvivorn: > https://github.com/encode/uvicorn?tab=readme-ov-file#quickstart > > It's a faster drop-in replacement for the python async event loop, but > only compatible with CPython, not i.e. pypy, so usually projects don't > declare a hard dependency on it. > > I found a hopefully better solution to our cython problems though: see > the python-msgpack thread. > > In short: if we continue to use the sdists from pypi, cython is not a > real build dependency and we can just remove it from pyptoject.toml > instead of trying to provide the correct version that's never going to > be invoked. We can probably just pass --skip-dependency-check as a build arg or something like that I suppose. > > > > > [--SNIP--] > >> I'll fix and resend. > > > > Thanks. > > > > Regards, > > Yann E. MORIN. > > From james.hilliard1 at gmail.com Mon Feb 12 01:35:11 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 18:35:11 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cryptography: bump to version 42.0.2 Message-ID: <20240212013511.1146354-1-james.hilliard1@gmail.com> License hash changed due to dropping PSF license: https://github.com/pyca/cryptography/commit/5e6476a4c6e094926a983dcf5cbe9488c30aeb53 We now need to enable chacha support when building with libopenssl. Signed-off-by: James Hilliard --- package/python-cryptography/Config.in | 1 + package/python-cryptography/python-cryptography.hash | 4 ++-- package/python-cryptography/python-cryptography.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index 213aa24fa8..d12f040656 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY bool "python-cryptography" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_PYTHON_CFFI # runtime help cryptography is a package designed to expose cryptographic diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index e083014750..43c458e274 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,6 +1,6 @@ # Locally calculated after vendoring -sha256 405c9a6271e1a088ea0b432bc2094e2e8baadb2241e192ce9c73a7cc9793b127 cryptography-39.0.2.tar.gz +sha256 44b00c8a646aeb0d2de5a385364115d1bd170880964c4844a7b568523f82bb61 cryptography-42.0.2.tar.gz # Locally computed sha256 checksums -sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE +sha256 3e0c7c091a948b82533ba98fd7cbb40432d6f1a9acbf85f5922d2f99a93ae6bb LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE sha256 602c4c7482de6479dd2e9793cda275e5e63d773dacd1eca689232ab7008fb4fb LICENSE.BSD diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 07c88ec3da..9e052f6376 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.2 +PYTHON_CRYPTOGRAPHY_VERSION = 42.0.2 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/fa/f3/f4b8c175ea9a1de650b0085858059050b7953a93d66c97ed89b93b232996 +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/0f/6f/40f1b5c6bafc809dd21a9e577458ecc1d8062a7e10148d140f402b535eaa PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools-rust PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -- 2.34.1 From abiliojr at gmail.com Mon Feb 12 02:12:53 2024 From: abiliojr at gmail.com (Abilio Marques) Date: Sun, 11 Feb 2024 18:12:53 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/micropython: add support for manifest.py in the configuration Message-ID: <20240212021255.246556-1-abiliojr@gmail.com> Micropython can embed packages an modules as frozen bytecode. What code gets built this way can be defined by means of a "manifest.py" file. This commit exposes the variable FROZEN_MANIFEST to Buildroot users through a new variable called BR2_PACKAGE_MICROPYTHON_MANIFEST. Please check Micropython's documentation for more information: https://docs.micropython.org/en/latest/reference/manifest.html We only support freezing of modules from micropython-lib. Freezing arbitrary modules would require some handling of absoulte paths, and a guarantee that the files be available before micropython is built, which is considered a bit too complex; an interested party can provide such support in the future. Signed-off-by: Abilio Marques --- package/micropython/Config.in | 17 +++++++++++++++++ package/micropython/micropython.mk | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 26a00baab0..6b99cfd2ff 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -17,6 +17,23 @@ config BR2_PACKAGE_MICROPYTHON_LIB help Core Python libraries ported to MicroPython. +config BR2_PACKAGE_MICROPYTHON_MANIFEST + string "Path to a manifest.py file" + help + MicroPython allows Python code to be ?frozen? as bytecode + into its binary, as an alternative to loading code from + the filesystem. + + A list of "frozen" modules can be provided using a "manifest.py" + file. You can set the path to such file using this variable. + + See MicroPython's documentation for more information on how to + use the file. + + Note: in Buildroot, only modules provided with micropython-lib + can be frozen with a manifest; freezing arbitrary files is + currently not supported. + endif # BR2_PACKAGE_MICROPYTHON comment "micropython needs a toolchain w/ threads, dynamic library" diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 125a0edcfb..5a2c136547 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -43,6 +43,11 @@ else MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 endif +ifneq ($(BR2_PACKAGE_MICROPYTHON_MANIFEST),"") +MICROPYTHON_MAKE_OPTS += \ + FROZEN_MANIFEST=$(BR2_PACKAGE_MICROPYTHON_MANIFEST) +endif + define MICROPYTHON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ -- 2.43.0 From kadambini.nema at gmail.com Mon Feb 12 03:47:57 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sun, 11 Feb 2024 19:47:57 -0800 Subject: [Buildroot] [PATCH 1/1] package/atop: bump to version 2.10.0 - Added a new dependency - libglib2 - Remove 0001-atop.h-include-time.h.patch. It was applied upstream (https://github.com/Atoptool/atop/commit/03c5c4dd29bc7590baccb55a36d61e7f4b39c1fe). Message-ID: <20240212034757.99951-1-kadambini.nema@gmail.com> Signed-off-by: Kadambini Nema --- package/atop/0001-atop.h-include-time.h.patch | 41 ------------------- package/atop/Config.in | 1 + package/atop/atop.hash | 2 +- package/atop/atop.mk | 10 +++-- 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 package/atop/0001-atop.h-include-time.h.patch diff --git a/package/atop/0001-atop.h-include-time.h.patch b/package/atop/0001-atop.h-include-time.h.patch deleted file mode 100644 index 2b8a390e71..0000000000 --- a/package/atop/0001-atop.h-include-time.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 03c5c4dd29bc7590baccb55a36d61e7f4b39c1fe Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 29 Oct 2023 18:56:35 +0100 -Subject: [PATCH] atop.h: include time.h - -Include time.h to avoid the following build failure with musl: - -atop.h:157:1: error: unknown type name 'time_t' - 157 | time_t normalize_epoch(time_t, long); - | ^~~~~~ -atop.h:157:1: note: 'time_t' is defined in header ''; did you forget to '#include '? -atop.h:157:40: error: expected ')' before 'long' - 157 | time_t normalize_epoch(time_t, long); - | ^~~~~ - | ) - -Fixes: - - http://autobuild.buildroot.org/results/e7ec8d16f2299320f374a0198c8e9b18a102b037 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/Atoptool/atop/pull/280 ---- - atop.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/atop.h b/atop.h -index 9274fc5..3d5fea4 100644 ---- a/atop.h -+++ b/atop.h -@@ -24,6 +24,8 @@ - #ifndef __ATOP__ - #define __ATOP__ - -+#include -+ - #define EQ 0 - #define SECONDSINDAY 86400 - #define RAWNAMESZ 256 --- -2.42.0 - diff --git a/package/atop/Config.in b/package/atop/Config.in index b8ee30c306..c00281fc47 100644 --- a/package/atop/Config.in +++ b/package/atop/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_ATOP select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES_WCHAR select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBGLIB2 help Atop is an ASCII full-screen performance monitor for Linux that is capable of reporting the activity of all processes diff --git a/package/atop/atop.hash b/package/atop/atop.hash index 0b7ee061dd..a6539e6211 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 8d82f211b712a227000ef254c0a2b53bcb71235bf40d93316acce80b04bff926 atop-2.9.0.tar.gz +sha256 e7a673cf2c82578e7dd82ecb0dec83fd9ecb30828b2561c28a9fa5aaf75d5f93 atop-2.10.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 27cd537f64..6c40805eb7 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,21 +4,23 @@ # ################################################################################ -ATOP_VERSION = 2.9.0 +ATOP_VERSION = 2.10.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING ATOP_CPE_ID_VALID = YES -ATOP_DEPENDENCIES = ncurses zlib +ATOP_DEPENDENCIES = ncurses zlib libglib2 -ATOP_CFLAGS = $(TARGET_CFLAGS) +ATOP_CFLAGS = $(TARGET_CFLAGS) -O2 -I. -Wall $(shell $(HOST_DIR)/bin/pkg-config --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security + +ATOP_LDFLAGS = $(TARGET_LDFLAGS) $(shell $(HOST_DIR)/bin/pkg-config --libs glib-2.0) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) ATOP_CFLAGS += -O0 endif define ATOP_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" LDFLAGS="$(ATOP_LDFLAGS)" \ -C $(@D) endef -- 2.25.1 From abiliojr at gmail.com Mon Feb 12 05:16:17 2024 From: abiliojr at gmail.com (Abilio Marques) Date: Sun, 11 Feb 2024 21:16:17 -0800 Subject: [Buildroot] [PATCH] package/micropython: add support for manifest.py in the configuration In-Reply-To: References: <20240204062645.3616072-1-abiliojr@gmail.com> Message-ID: On Sun, Feb 11, 2024 at 9:54?AM Yann E. MORIN wrote: > > Abilio, All, > > [Please, don't top-post, but reply in-line] > > On 2024-02-11 09:15 -0800, Abilio Marques spake thusly: > > One of the uses of manifest.py is to specify which modules of > > micropython-lib should be frozen within the binary. For those modules you > > don't need to include the path. e.g., > > package('os') > > > > That's the application I'm going for. I know it seems limited but it's > > really useful, > > OK, so maybe this can be explained in the help text of the new option, > like: > > Note: in Buildroot, only modules provided with micropython-lib > can be frozen with a manifest; freezing arbitrary files is not > supported. > > along with a little blurb in the commit log, statng something like; > > We only support freezing of modules from micropython-lib. Freezing > arbitrary modules would require some handling of absoulte paths, and > a guarantee that the files be available before micropython is built, > which is considered a bit too complex; an interested party can > provide such support in the future. > > And thus, would it be possible to sanity-check the manifest to ensure > that it indeed only references modules from icropython-lib, so that > people do not get the impression it works when in fact it does not? > > Like, grep that only require(...) are used? Not sure how to do it correctly. The manifest is a regular python file, and I'm not sure how to do it in a way that does the correct the thing. e.g., the user might want to add comment lines or an include to a second part of the manifest. > > (Note: you mentioned package(...) but that is not limited to files from > micropython-lib; require(...) however is.) > > > and probably welcomed by other people using Micropython in > > the next release of Buildroot. > > One question I was wondering about: if a module is frozen in the binary, > then it is no longer needed in the filesystem, right? If so, should we > have a way to remove them? Good idea. Do you mind if I add this in a separate patch? > > > I have ideas on how to solve the path and dependency order problem while > > still using the "official" manifest.py concept. The biggest challenge is > > that currently there are no other 3rd party Micropython modules available > > for Buildroot, so that makes it all very theoretical. All solutions require > > a bigger amount of work than the one needed for this patch. Also, I would > > like to discuss them before actually presenting a patch that allows 3rd > > party modules to be frozen. > > Indeed, without a few actual examples, it's going to be difficult to see > a common pattern and abstract that away. Are there any pulicly > available? > > > I always try to go for an incremental approach, where I get the bigger bang > > for the buck. I believe that allowing people to freeze the official > > Micropython modules is already a big step forward. But at the same time, > > I'm new to the Buildroot project, so please advice on the approach. > > The incremental path is totally OK; I even prefer it. Of course, any > limitation (such as those we are discussing) should be explained in the > commit log. > > Given all the feedback in this thread, can you respin a v2 taking the > comments into account? I did, but just found out that I submitted a patch with a whitespace problem, in this line "can be frozen with a manifest; freezing arbitrary files is" Could you please correct it? > > As for your ideas for lifting those limitations, you can just explain > them in a reply in this thread. Usually, a patchset doing the job is > also a good first step to start the dicsussion. Will try a few things and submit one. > > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From yegorslists at googlemail.com Mon Feb 12 09:00:20 2024 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Mon, 12 Feb 2024 10:00:20 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: <67502ba4-3f73-428e-802e-6ee9cbc1fe6a@mind.be> References: <20240206132051.2838897-1-yegorslists@googlemail.com> <67502ba4-3f73-428e-802e-6ee9cbc1fe6a@mind.be> Message-ID: Hi Yann, On Tue, Feb 6, 2024 at 2:37?PM Arnout Vandecappelle wrote: > > > > On 06/02/2024 14:30, Yann E. MORIN wrote: > > Yegor, All, > > > > On 2024-02-06 14:20 +0100, yegorslists--- via buildroot spake thusly: > >> From: Yegor Yefremov > >> > >> This .gitignore file ignores all files in an output directory and > >> hence doesn't change the git status. > >> > >> Remove "/output" entry from the main .gitignore file as it is already > >> handled by this general approach. > > > > What are you trying to achieve with this that does not work currently? > > I you do `make O=output-test-mypkg` (which I do quite a lot), that output > directory doesn't get ignored by git. We could ignore output* but maybe you name > the output directory o-foo or something. > > Putting a .gitignore in a generated directory is a very elegant solution for > that. It is used by e.g. virtualenv, pytest, and a load of other applications > that generate output in a directory. > > Since the .gitignore is created in the output directory, it is no longer > necessary to put output/ in the .gitignore file. > > > All of the above could be put in the commit message, of course, but for me > Yegor's commit message was sufficiently clear :-) Were we able to convince you? Regards, Yegor > Regards, > Arnout > > > > > > Regards, > > Yann E. MORIN. > > > >> Signed-off-by: Yegor Yefremov > >> --- > >> .gitignore | 1 - > >> Makefile | 3 +++ > >> 2 files changed, 3 insertions(+), 1 deletion(-) > >> > >> diff --git a/.gitignore b/.gitignore > >> index bb02d9f572..14b7ca5040 100644 > >> --- a/.gitignore > >> +++ b/.gitignore > >> @@ -1,4 +1,3 @@ > >> -/output > >> /dl > >> /.auto.deps > >> /.config.cmd > >> diff --git a/Makefile b/Makefile > >> index ac625152c6..86d4444745 100644 > >> --- a/Makefile > >> +++ b/Makefile > >> @@ -63,6 +63,9 @@ ifneq ($(findstring @,$(CANONICAL_O)),) > >> $(error The build directory can not contain a '@') > >> endif > >> > >> +# Create a default .gitignore file that ignores everything > >> +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") > >> + > >> CANONICAL_CURDIR = $(realpath $(CURDIR)) > >> > >> REQ_UMASK = 0022 > >> -- > >> 2.34.1 > >> > >> _______________________________________________ > >> buildroot mailing list > >> buildroot at buildroot.org > >> https://lists.buildroot.org/mailman/listinfo/buildroot > > From buildroot at uclibc.org Mon Feb 12 09:44:14 2024 From: buildroot at uclibc.org (Email Support) Date: 12 Feb 2024 01:44:14 -0800 Subject: [Buildroot] uclibc.org Support Team Message-ID: <20240212014414.BF282FCB54983959@uclibc.org> An HTML attachment was scrubbed... URL: From buildroot at bubu1.eu Mon Feb 12 09:55:14 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 10:55:14 +0100 Subject: [Buildroot] [PATCH] package/python3: security bump to 3.12.2 Message-ID: <20240212095514.11656-1-buildroot@bubu1.eu> Fixes the following security issue: * Skip .pth files with names starting with a dot or hidden file attribute. [1] [1] https://docs.python.org/release/3.12.2/whatsnew/changelog.html#security --- package/python3/python3.hash | 6 +++--- package/python3/python3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 725c854050..611b8d0432 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3121/ -md5 50f827c800483776c8ef86e6a53831fa Python-3.12.1.tar.xz +# From https://www.python.org/downloads/release/python-3122/ +md5 e7c178b97bf8f7ccd677b94d614f7b3c Python-3.12.2.tar.xz # Locally computed -sha256 8dfb8f426fcd226657f9e2bd5f1e96e53264965176fa17d32658e873591aeb21 Python-3.12.1.tar.xz +sha256 be28112dac813d2053545c14bf13a16401a21877f1a69eb6ea5d84c4a0f3d870 Python-3.12.2.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 42765abcf4..e500155c80 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.12 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others -- 2.34.1 From buildroot at bubu1.eu Mon Feb 12 09:58:03 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 10:58:03 +0100 Subject: [Buildroot] [PATCH] package/uvicorn: bump to 0.27.1 Message-ID: <20240212095804.12454-1-buildroot@bubu1.eu> Changelog: https://github.com/encode/uvicorn/blob/master/CHANGELOG.md#0271---2024-02-10 --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index c7feaf3bfe..773995ab9d 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 a98f96c2578d9e6d454e271d0eae3ba3 uvicorn-0.27.0.post1.tar.gz -sha256 54898fcd80c13ff1cd28bf77b04ec9dbd8ff60c5259b499b4b12bb0917f22907 uvicorn-0.27.0.post1.tar.gz +md5 98f40515e34fb49e9d2842b6a147acec uvicorn-0.27.1.tar.gz +sha256 3d9a267296243532db80c83a959a3400502165ade2c1338dea4e67915fd4745a uvicorn-0.27.1.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 502cc06ad8..899b9660f6 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.27.0.post1 +PYTHON_UVICORN_VERSION = 0.27.1 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/38/56/7bc5cf1d693d0c8e5d9dd66c29808691c17260b31346e4ddfbee26ba9bc2 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/09/d8/8aa69c76585035ca81851d99c3b00fd6be050aefd478a5376ff9fc5feb69 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md -- 2.34.1 From buildroot at uclibc.org Mon Feb 12 10:06:06 2024 From: buildroot at uclibc.org (Email Support) Date: 12 Feb 2024 11:06:06 +0100 Subject: [Buildroot] uclibc.org Support Team Message-ID: <20240212110606.784C3BDAC2EA8B6E@uclibc.org> An HTML attachment was scrubbed... URL: From buildroot at bubu1.eu Mon Feb 12 12:47:59 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 13:47:59 +0100 Subject: [Buildroot] [PATCH] support/testing: add python-asn1crypto runtime test Message-ID: <20240212124759.209203-1-buildroot@bubu1.eu> --- .../tests/package/sample_python_asn1crypto.py | 11 +++++++++++ .../testing/tests/package/test_python_asn1crypto.py | 13 +++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 support/testing/tests/package/sample_python_asn1crypto.py create mode 100644 support/testing/tests/package/test_python_asn1crypto.py diff --git a/support/testing/tests/package/sample_python_asn1crypto.py b/support/testing/tests/package/sample_python_asn1crypto.py new file mode 100644 index 0000000000..0b10487572 --- /dev/null +++ b/support/testing/tests/package/sample_python_asn1crypto.py @@ -0,0 +1,11 @@ +from asn1crypto import pem, x509 + + +with open('/etc/ssl/certs/ISRG_Root_X2.pem', 'rb') as f: + der_bytes = f.read() + if pem.detect(der_bytes): + type_name, headers, der_bytes = pem.unarmor(der_bytes) + +cert = x509.Certificate.load(der_bytes) + +assert cert.subject.native["common_name"] == "ISRG Root X2" diff --git a/support/testing/tests/package/test_python_asn1crypto.py b/support/testing/tests/package/test_python_asn1crypto.py new file mode 100644 index 0000000000..97df3d3ac8 --- /dev/null +++ b/support/testing/tests/package/test_python_asn1crypto.py @@ -0,0 +1,13 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Asn1Crypto(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_ASN1CRYPTO=y + """ + sample_scripts = ["tests/package/sample_python_asn1crypto.py"] + timeout = 40 -- 2.34.1 From buildroot at bubu1.eu Mon Feb 12 12:56:49 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 13:56:49 +0100 Subject: [Buildroot] [PATCH] support/testing: add python-asn1crypto runtime test Message-ID: <20240212125649.210272-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- .../tests/package/sample_python_asn1crypto.py | 11 +++++++++++ .../testing/tests/package/test_python_asn1crypto.py | 13 +++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 support/testing/tests/package/sample_python_asn1crypto.py create mode 100644 support/testing/tests/package/test_python_asn1crypto.py diff --git a/support/testing/tests/package/sample_python_asn1crypto.py b/support/testing/tests/package/sample_python_asn1crypto.py new file mode 100644 index 0000000000..0b10487572 --- /dev/null +++ b/support/testing/tests/package/sample_python_asn1crypto.py @@ -0,0 +1,11 @@ +from asn1crypto import pem, x509 + + +with open('/etc/ssl/certs/ISRG_Root_X2.pem', 'rb') as f: + der_bytes = f.read() + if pem.detect(der_bytes): + type_name, headers, der_bytes = pem.unarmor(der_bytes) + +cert = x509.Certificate.load(der_bytes) + +assert cert.subject.native["common_name"] == "ISRG Root X2" diff --git a/support/testing/tests/package/test_python_asn1crypto.py b/support/testing/tests/package/test_python_asn1crypto.py new file mode 100644 index 0000000000..97df3d3ac8 --- /dev/null +++ b/support/testing/tests/package/test_python_asn1crypto.py @@ -0,0 +1,13 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Asn1Crypto(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_ASN1CRYPTO=y + """ + sample_scripts = ["tests/package/sample_python_asn1crypto.py"] + timeout = 40 -- 2.34.1 From antoine.coutant at smile.fr Mon Feb 12 13:44:25 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 12 Feb 2024 14:44:25 +0100 Subject: [Buildroot] [PATCH v4 4/7] package/opencl-headers: new package In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-5-antoine.coutant@smile.fr> Message-ID: Yann, All, On 07/02/2024 16:58, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >> From: Sebastian Weyer >> >> These headers provide the C language API bindings. It is a complement to >> the C++ bindings already available in opencl-clhpp. This package is >> required to build opencl-icd-loader: >> >> https://github.com/KhronosGroup/OpenCL-ICD-Loader#dependencies >> >> Signed-off-by: Sebastian Weyer >> Signed-off-by: Antoine Coutant >> --- > [--SNIP--] >> diff --git a/package/opencl-headers/Config.in b/package/opencl-headers/Config.in >> new file mode 100644 >> index 0000000000..092d8a2a4d >> --- /dev/null >> +++ b/package/opencl-headers/Config.in >> @@ -0,0 +1,7 @@ >> +config BR2_PACKAGE_OPENCL_HEADERS >> + bool "opencl-headers" >> + depends on BR2_PACKAGE_HAS_LIBOPENCL > BR2_PACKAGE_HAS_LIBOPENCL can be set by mesa3d when BR2_PACKAGE_MESA3D_OPENCL > is enabled. In this case, will mesa3d install its own headers? If so, > that will generate a conflict. BR2_PACKAGE_HAS_LIBOPENCL doesn't guarantee that CL headers will be installed. Mesa3d install headers if Clover is enabled and opencl-icd is disabled [1]. So you are right, it will generate conflict in case OpenCL-Headers and Clover are built without icd mode. > Furthermore, this will also conflict with mesa3d-headers, and it also > installs CL headers. Yes, this will generate the same conflict here... > > So, why do we need opencl-headers and can't rely on the existing > mesa3d-headers package? The problem is that the headers installed by mesa differ from those in the OpenCL-Headers package. $ diff -q OpenCL-Headers/CL/cl_icd.h mesa/include/CL/cl_icd.h Files OpenCL-Headers/CL/cl_icd.h and mesa/include/CL/cl_icd.h differ This diff was performed using OpenCL-Headers v2023.12.14 and mesa-23.3.4. Moreover, cl_layer.h, cl_half.h and cl_function_types.h files are missing from mesa headers. These differences causes errors when building opencl-icd-loader: ... ./build/opencl-icd-loader-2023.12.14/loader/icd.c:23:10: fatal error: CL/cl_layer.h: No such file or directory ???23 | #include | ^~~~~~~~~~~~~~~ compilation terminated. ./build/opencl-icd-loader-2023.12.14/loader/icd_dispatch.c:26:8: error: unknown type name ?clGetICDLoaderInfoOCLICD_t? ???26 | static clGetICDLoaderInfoOCLICD_t clGetICDLoaderInfoOCLICD; | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ... This is why we cannot rely on mesa3d headers and why OpenCL-Headers package is required. > Regards, > Yann E. MORIN. I will add guards to prevent conflicts in the v5. And add some lines in the commit log to explain why mesa3d headers can't be used to build OpenCL-ICD-Loader. Thanks for your feedback ! [1]: https://gitlab.freedesktop.org/mesa/mesa/-/blob/23.3/include/meson.build?ref_type=heads#L135 Regards, Antoine Coutant > >> + help >> + C language headers for the OpenCL API >> + >> + https://github.com/KhronosGroup/OpenCL-Headers >> diff --git a/package/opencl-headers/opencl-headers.hash b/package/opencl-headers/opencl-headers.hash >> new file mode 100644 >> index 0000000000..802ed05450 >> --- /dev/null >> +++ b/package/opencl-headers/opencl-headers.hash >> @@ -0,0 +1,3 @@ >> +#Locally generated >> +sha256 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d OpenCL-Headers-2023.12.14.tar.gz >> +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE >> diff --git a/package/opencl-headers/opencl-headers.mk b/package/opencl-headers/opencl-headers.mk >> new file mode 100644 >> index 0000000000..7aa0e0d168 >> --- /dev/null >> +++ b/package/opencl-headers/opencl-headers.mk >> @@ -0,0 +1,22 @@ >> +################################################################################ >> +# >> +# opencl-headers >> +# >> +################################################################################ >> + >> +OPENCL_HEADERS_VERSION = 2023.12.14 >> +OPENCL_HEADERS_SOURCE = OpenCL-Headers-$(OPENCL_HEADERS_VERSION).tar.gz >> +OPENCL_HEADERS_SITE = $(call github,KhronosGroup,OpenCL-Headers,v$(OPENCL_HEADERS_VERSION)) >> +OPENCL_HEADERS_LICENSE = Apache-2.0 >> +OPENCL_HEADERS_LICENSE_FILES = LICENSE >> +OPENCL_HEADERS_INSTALL_STAGING = YES >> + >> +OPENCL_HEADERS_INSTALL_TARGET = NO >> + >> +define OPENCL_HEADERS_INSTALL_STAGING_CMDS >> + mkdir -p $(STAGING_DIR)/usr/include/CL >> + $(INSTALL) -D -m 0644 $(@D)/CL/* \ >> + $(STAGING_DIR)/usr/include/CL >> +endef >> + >> +$(eval $(generic-package)) >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From vfazio at xes-inc.com Mon Feb 12 13:45:36 2024 From: vfazio at xes-inc.com (Vincent Fazio) Date: Mon, 12 Feb 2024 13:45:36 +0000 Subject: [Buildroot] [External] - Re: [git commit] package/python3: bump version to 3.12.1 In-Reply-To: <20240212005226.GB2106578@igalia.com> References: <20240206222231.8950D87481@busybox.osuosl.org> <20240212005226.GB2106578@igalia.com> Message-ID: All > -----Original Message----- > From: buildroot On Behalf Of Adrian > Perez de Castro > Sent: Sunday, February 11, 2024 4:52 PM > To: James Hilliard > Cc: Bernd Kuhls ; buildroot at uclibc.org > Subject: [External] - Re: [Buildroot] [git commit] package/python3: bump > version to 3.12.1 > > Hi, > > On Sun, 11 Feb 2024 14:20:31 -0700 James Hilliard > wrote: > > On Fri, Feb 9, 2024 at 9:11?AM Bernd Kuhls wrote: > > > > > > Am Thu, 8 Feb 2024 21:14:52 -0500 schrieb James Knight: > > > > > > > import math > > > > ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' > > > > not found (required by > > > > /builds/buildroot/output/build/python3-3.12.1/build/lib.linux- > > > x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) > > > > > > Hi James, > > > > > > same here on Debian 12.4/bookworm, try this patch: > > > https://github.com/bkuhls/buildroot/commit/ > > > dca8b5bee7742ffedf81a027affadd4b7e18fc3f This certainly avoids the issue by not running the problematic check. I am a little concerned about the root cause. I haven't had a chance to test 3.11, but from the debugging I did on Friday, I know that when the host python is executed to check the built modules for the foreign python, because PYTHONPATH includes the path to the foreign "builtin" libraries and because they are the same architecture, those libraries get used instead of the ones from the host's build. So the host python attempts to load and execute libraries that may have been built for a different libc. I found simply dropping the foreign python's path from PYTHONPATH caused the script to execute fine, but I don't know the full ramifications for dropping that path as part of PYTHON_FOR_BUILD which is used in the body of this problematic make target and a few others. > > > > Yeah, this fixes the issue for me as well. > > Same here on Arch, I needed to apply the commit to get host-python3 built. > > Cheers, > ?Adri?n > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. From antoine.coutant at smile.fr Mon Feb 12 14:19:20 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 12 Feb 2024 15:19:20 +0100 Subject: [Buildroot] [PATCH v4 5/7] package/opencl-icd-loader: new package In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-6-antoine.coutant@smile.fr> Message-ID: <8e198a6f-ccb7-4438-9a0d-e983a6fcc29a@smile.fr> Yann, All, On 07/02/2024 17:01, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >> From: Sebastian Weyer >> >> With this package it is possible to have multiple implementations of >> OpenCL at the same time. This package provides a libOpenCL.so file that >> captures the OpenCL API calls and forwards them to the correct >> implementation of OpenCL. OpenCL implementations can be manually >> registered by creating a file containing its full file path in >> /etc/OpenCL/vendors/.icd[1] >> >> This package is required by certain OpenCL implementations, for example >> Mesa3D's Clover implementation if it is not built in standalone mode. >> >> [1] https://github.com/KhronosGroup/OpenCL-ICD-Loader#registering-icds >> >> Signed-off-by: Sebastian Weyer >> Signed-off-by: Antoine Coutant >> --- > [--SNIP--] >> diff --git a/package/opencl-icd-loader/Config.in b/package/opencl-icd-loader/Config.in >> new file mode 100644 >> index 0000000000..405dc5401a >> --- /dev/null >> +++ b/package/opencl-icd-loader/Config.in >> @@ -0,0 +1,12 @@ >> +config BR2_PACKAGE_OPENCL_ICD_LOADER >> + bool "OpenCL-ICD-Loader" >> + depends on BR2_INSTALL_LIBSTDCPP >> + depends on BR2_PACKAGE_HAS_LIBOPENCL >> + select BR2_PACKAGE_OPENCL_HEADERS > Following on the review of the previous patch: maybe that could rely on > mesa3d-headers, and if so, we'ds not need to introduce a new > opencl-headers package. As I answered to the previous patch review, the headers installed by mesa differ from those installed by OpenCL-Headers. Indeed, mesa headers are fetched from OpenCL-Headers by [1] but nothing guarantees that their version will match OpenCL-ICD-Loader version. Therefore, the OpenCL-ICD-Loader build fails with mesa headers. That's why we need OpenCL-Headers here. I'll explain it in the v5 commit message. [1}: https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/bin/khronos-update.py Regards, Antoine Coutant > > Regards, > Yann E. MORIN. > >> + help >> + OpenCL defines an Installable Client Driver (ICD) mechanism to >> + allow developers to build applications against an Installable >> + Client Driver loader (ICD loader) rather than linking their >> + applications against a specific OpenCL implementation. >> + >> + https://github.com/KhronosGroup/OpenCL-ICD-Loader >> diff --git a/package/opencl-icd-loader/opencl-icd-loader.hash b/package/opencl-icd-loader/opencl-icd-loader.hash >> new file mode 100644 >> index 0000000000..1c894f1293 >> --- /dev/null >> +++ b/package/opencl-icd-loader/opencl-icd-loader.hash >> @@ -0,0 +1,3 @@ >> +# locally generated >> +sha256 af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917 OpenCL-ICD-Loader-2023.12.14.tar.gz >> +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE >> diff --git a/package/opencl-icd-loader/opencl-icd-loader.mk b/package/opencl-icd-loader/opencl-icd-loader.mk >> new file mode 100644 >> index 0000000000..04f6fb4b85 >> --- /dev/null >> +++ b/package/opencl-icd-loader/opencl-icd-loader.mk >> @@ -0,0 +1,19 @@ >> +################################################################################ >> +# >> +# opencl-icd-loader >> +# >> +################################################################################ >> + >> +OPENCL_ICD_LOADER_VERSION = 2023.12.14 >> +OPENCL_ICD_LOADER_SOURCE = OpenCL-ICD-Loader-$(OPENCL_ICD_LOADER_VERSION).tar.gz >> +OPENCL_ICD_LOADER_SITE = $(call github,KhronosGroup,OpenCL-ICD-Loader,v$(OPENCL_ICD_LOADER_VERSION)) >> +OPENCL_ICD_LOADER_LICENSE = Apache-2.0 >> +OPENCL_ICD_LOADER_LICENSE_FILES = LICENSE >> +OPENCL_ICD_LOADER_INSTALL_STAGING = YES >> + >> +OPENCL_ICD_LOADER_DEPENDENCIES = opencl-headers >> + >> +OPENCL_ICD_LOADER_CONF_OPTS += -DOPENCL_ICD_LOADER_HEADERS_DIR=$(STAGING_DIR)/usr/include >> + >> +$(eval $(cmake-package)) >> +$(eval $(host-cmake-package)) >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From aperez at igalia.com Mon Feb 12 14:32:19 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 12 Feb 2024 16:32:19 +0200 Subject: [Buildroot] [PATCH 2/2] package/wpewebkit: update ARM NEON patch for 2.42.x In-Reply-To: <20240212143222.1555220-1-aperez@igalia.com> References: <20240212143222.1555220-1-aperez@igalia.com> Message-ID: <20240212143222.1555220-3-aperez@igalia.com> Update patch to compile correctly with newer versions of GCC, which has gotten stricter about the placement of the alignas() attribute. Signed-off-by: Adrian Perez de Castro --- ...cpp-fails-to-build-NEON-fast-path-se.patch | 105 ++++++++++-------- 1 file changed, 57 insertions(+), 48 deletions(-) diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch index ea1676abb6..17d4957657 100644 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -1,4 +1,4 @@ -From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 +From 5ba2d275457c4fdf1efdcca8351792400bda5679 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -33,38 +33,47 @@ left for a follow-up fix. * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: Signed-off-by: Adrian Perez de Castro -[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] +Upstream: https://bugs.webkit.org/show_bug.cgi?id=241182 --- Source/WebCore/Sources.txt | 1 + - .../cpu/arm/filters/FELightingNEON.cpp | 4 +- + .../cpu/arm/filters/FELightingNEON.cpp | 6 +-- .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 8 files changed, 58 insertions(+), 36 deletions(-) + 8 files changed, 59 insertions(+), 37 deletions(-) diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt -index 8ce3510fe1a8..efd56bcb8746 100644 +index 9ca28a7b2bc0..ed2c7f9f41ee 100644 --- a/Source/WebCore/Sources.txt +++ b/Source/WebCore/Sources.txt -@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp - platform/graphics/WOFFFileFormat.cpp - platform/graphics/WidthIterator.cpp +@@ -2303,6 +2303,7 @@ platform/graphics/controls/MeterPart.cpp + platform/graphics/controls/ProgressBarPart.cpp + platform/graphics/controls/SliderTrackPart.cpp platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp +platform/graphics/cpu/arm/filters/FELightingNEON.cpp platform/graphics/displaylists/DisplayList.cpp platform/graphics/displaylists/DisplayListDrawingContext.cpp platform/graphics/displaylists/DisplayListItems.cpp diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp -index f6ff8c20a5a8..42a97ffc5372 100644 +index f6ff8c20a5a8..dced3d55eb4e 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +@@ -35,7 +35,7 @@ namespace WebCore { + // ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D + + +-static alignas(16) short s_FELightingConstantsForNeon[] = { ++alignas(16) static short s_FELightingConstantsForNeon[] = { + // Alpha coefficients. + -2, 1, 0, -1, 2, 1, 0, -1, + 0, -1, -2, -1, 0, 1, 2, 1, @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() return s_FELightingConstantsForNeon; } - + -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) { @@ -73,26 +82,26 @@ index f6ff8c20a5a8..42a97ffc5372 100644 @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL "b .lightStrengthCalculated" NL ); // NOLINT - + -int FELighting::getPowerCoefficients(float exponent) +int FELightingSoftwareApplier::getPowerCoefficients(float exponent) { // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..c6d17f573eca 100644 +index b17c603d40d3..fd23e31cce29 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + -#ifndef FELightingNEON_h -#define FELightingNEON_h +#pragma once - + #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - + -#include "FELighting.h" +#include "FELightingSoftwareApplier.h" +#include "ImageBuffer.h" @@ -100,19 +109,19 @@ index b17c603d40d3..c6d17f573eca 100644 #include "SpotLightSource.h" +#include #include - + namespace WebCore { @@ -93,14 +94,14 @@ extern "C" { void neonDrawLighting(FELightingPaintingDataForNeon*); } - + -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { - data.pixels->data(), -+ WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; ++ alignas(16) WebCore::FELightingFloatArgumentsForNeon floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { + data.pixels->bytes(), 1, @@ -126,15 +135,15 @@ index b17c603d40d3..c6d17f573eca 100644 @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set light source arguments. floatArguments.constOne = 1; - + - auto color = m_lightingColor.toColorTypeLossy>().resolved(); + auto color = data.lightingColor.toColorTypeLossy>().resolved(); - + floatArguments.colorRed = color.red; floatArguments.colorGreen = color.green; floatArguments.colorBlue = color.blue; floatArguments.padding4 = 0; - + - if (m_lightSource->type() == LS_POINT) { + if (data.lightSource->type() == LS_POINT) { neonData.flags |= FLAG_POINT_LIGHT; @@ -181,7 +190,7 @@ index b17c603d40d3..c6d17f573eca 100644 } if (floatArguments.diffuseConstant == 1) neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; - + - int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; + static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs + int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; @@ -189,7 +198,7 @@ index b17c603d40d3..c6d17f573eca 100644 // Initialize parallel jobs - ParallelJobs parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); + ParallelJobs parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); - + // Fill the parameter array int job = parallelJobs.numberOfJobs(); if (job > 1) { @@ -213,42 +222,42 @@ index b17c603d40d3..c6d17f573eca 100644 return; @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS } // namespace WebCore - + #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) - -#endif // FELightingNEON_h diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -index 0660143fc1cf..2b1e86d99fa4 100644 +index 70f583b36e2c..7d5d27e5ccf8 100644 --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -@@ -25,6 +25,10 @@ - #include "LightSource.h" +@@ -26,6 +26,10 @@ + #include #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class DistantLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h -index 0c073bc13f8c..e0db00545c17 100644 +index 179edf6dba24..694d712d56fd 100644 --- a/Source/WebCore/platform/graphics/filters/FELighting.h +++ b/Source/WebCore/platform/graphics/filters/FELighting.h @@ -35,8 +35,6 @@ - + namespace WebCore { - + -struct FELightingPaintingDataForNeon; - class FELighting : public FilterEffect { public: - const Color& lightingColor() const { return m_lightingColor; } -@@ -67,11 +65,6 @@ protected: - + bool operator==(const FELighting&) const; +@@ -68,11 +66,6 @@ protected: + std::unique_ptr createSoftwareApplier() const override; - + -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - static int getPowerCoefficients(float exponent); - inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); @@ -258,34 +267,34 @@ index 0c073bc13f8c..e0db00545c17 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 126b3b2350f6..d906db21aa9c 100644 +index a8cfdab895a9..34f867bba237 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 641b205f986d..64380d9b6eb8 100644 +index 6404467a5b6f..5cac38f22362 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h index c974d92115ff..e2896660cfbd 100644 @@ -293,14 +302,14 @@ index c974d92115ff..e2896660cfbd 100644 +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ namespace WebCore { - + class FELighting; +struct FELightingPaintingDataForNeon; - + class FELightingSoftwareApplier final : public FilterEffectConcreteApplier { WTF_MAKE_FAST_ALLOCATED; @@ -132,8 +133,23 @@ private: - + static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); static void applyPlatformGenericWorker(ApplyParameters*); + @@ -319,10 +328,10 @@ index c974d92115ff..e2896660cfbd 100644 + static void applyPlatform(const LightingData&); }; - + } // namespace WebCore + +#include "FELightingNEON.h" --- -2.37.3 +-- +2.43.1 -- 2.43.1 From aperez at igalia.com Mon Feb 12 14:32:17 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 12 Feb 2024 16:32:17 +0200 Subject: [Buildroot] [PATCH 0/2] Update wpewebkit to 2.42.5 and update patch Message-ID: <20240212143222.1555220-1-aperez@igalia.com> Hello, These two patches don't neccessarily need to be applied together, but it wouldn't hurt to do so. Cheers, Adrian Perez de Castro (2): package/wpewebkit: security bump to version 2.42.5 package/wpewebkit: update ARM NEON patch for 2.42.x ...cpp-fails-to-build-NEON-fast-path-se.patch | 105 ++++++++++-------- ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++ package/wpewebkit/wpewebkit.hash | 6 +- package/wpewebkit/wpewebkit.mk | 3 +- 4 files changed, 101 insertions(+), 52 deletions(-) create mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch -- 2.43.1 From aperez at igalia.com Mon Feb 12 14:32:18 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 12 Feb 2024 16:32:18 +0200 Subject: [Buildroot] [PATCH 1/2] package/wpewebkit: security bump to version 2.42.5 In-Reply-To: <20240212143222.1555220-1-aperez@igalia.com> References: <20240212143222.1555220-1-aperez@igalia.com> Message-ID: <20240212143222.1555220-2-aperez@igalia.com> Fixes the following security issues: https://wpewebkit.org/security/WSA-2024-0001.html - CVE-2024-23222: Processing maliciously crafted web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been exploited. Description: A type confusion issue was addressed with improved checks. - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint the user. Description: An access issue was addressed with improved access restrictions. - CVE-2024-23213: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. Add an upstream post-2.42.5 patch to fix an issue with an invalid backport causing a build issue. Signed-off-by: Adrian Perez de Castro --- ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++ package/wpewebkit/wpewebkit.hash | 6 +-- package/wpewebkit/wpewebkit.mk | 3 +- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 0000000000..a15d9e647f --- /dev/null +++ b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Adrian Perez de Castro +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.43.1 + diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 322e494c36..71e41bb1dd 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,6 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums -sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz -sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums +sha1 50a18f43452520e9f34f84c04bc0166af655ffff wpewebkit-2.42.5.tar.xz +sha256 4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532 wpewebkit-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index e54ec2952f..60a45b13b1 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,8 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.42.4 +# The middle number is even for stable releases, odd for development ones. +WPEWEBKIT_VERSION = 2.42.5 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.43.1 From antoine.coutant at smile.fr Mon Feb 12 14:54:52 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 12 Feb 2024 15:54:52 +0100 Subject: [Buildroot] [PATCH v4 6/7] package/llvm-project: add opencl-c-base.h on target In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-7-antoine.coutant@smile.fr> Message-ID: <7e506d41-f4ff-4c9f-b407-2d39eccc559c@smile.fr> Yann, All, On 07/02/2024 20:07, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >> rusticl depends on the mesa clc_compile_to_llvm_module function. >> This function requires opencl-c-base.h when LLVM version >= 15. >> >> The header is deleted automatically by CLANG_FILES_TO_REMOVE >> post install target hook in llvm-project/clang package. >> When rusticl is enabled, after the whole clang directory has >> been removed, the header is copied back to >> /usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/ >> >> By default, the mesa3d variable used to retrieve the header >> is set to the staging directory on the host machine. A merge >> request on mesa's gitlab solved this problem. See: >> >> https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25568 >> >> The patches have been backported to mesa 23.3.4. >> >> Signed-off-by: Antoine Coutant >> --- >> Changes v3 -> v4: >> - Add patches merged by mesa upstream. > Adding those patches has nothing to do in this commit, but should in the > next one, that adds rusticl support in mesa3d, right? I added them here because they are necessary when using the missing header. However, you are right, their place is not in this patch as they are not useful to add the missing header on the target. I will move them into the patch that adds rusticl support. Thanks, for this feedback ! Regards, Antoine Coutant > > Regards, > Yann E. MORIN. > >> --- >> Running an app that uses rusticl leads to an error. >> Example: >> >> RUSTICL_ENABLE=panfrost clpeak >> >> Platform: rusticl >> Device: Mali-G52 (Panfrost) >> Driver version : 23.3.4 (Linux ARM64) >> Compute units : 2 >> Clock frequency : 800 MHz >> Build Log: :1:10: fatal error: 'opencl-c-base.h' file not found >> Error executing LLVM compilation action. >> >> Signed-off-by: Antoine Coutant >> --- >> package/llvm-project/clang/clang.mk | 9 ++ >> ...ncl-external-clang-headers-option-an.patch | 72 ++++++++++++++++ >> ...or-every-user-when-using-shared-LLVM.patch | 40 +++++++++ >> ...lc-retrieve-libclang-path-at-runtime.patch | 86 +++++++++++++++++++ >> 4 files changed, 207 insertions(+) >> create mode 100644 package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch >> create mode 100644 package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch >> create mode 100644 package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch >> >> diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk >> index 0bafd6461b..09aac7f0ec 100644 >> --- a/package/llvm-project/clang/clang.mk >> +++ b/package/llvm-project/clang/clang.mk >> @@ -90,6 +90,15 @@ define HOST_CLANG_INSTALL_CLANG_TBLGEN >> endef >> HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN >> >> +# Rusticl needs opencl-c-base.h to be present on the target. >> +define CLANG_OPENCL_C_BASE_HEADER_TO_TARGET >> + mkdir -p $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include >> + $(INSTALL) -D -m 0644 $(@D)/lib/Headers/opencl-c-base.h $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/opencl-c-base.h >> +endef >> +ifeq ($(BR2_PACKAGE_MESA3D_RUSTICL),y) >> +CLANG_POST_INSTALL_TARGET_HOOKS += CLANG_OPENCL_C_BASE_HEADER_TO_TARGET >> +endif >> + >> # This option must be enabled to link libclang dynamically against libLLVM.so >> HOST_CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON >> CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON >> diff --git a/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch >> new file mode 100644 >> index 0000000000..ebe3542627 >> --- /dev/null >> +++ b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch >> @@ -0,0 +1,72 @@ >> +From b7f2ada31d85dfd2e9906a7343d14a3b0b85cf14 Mon Sep 17 00:00:00 2001 >> +From: Karol Herbst >> +Date: Tue, 2 Jan 2024 22:58:39 +0100 >> +Subject: [PATCH 1/3] meson: remove opencl-external-clang-headers option and >> + rely on shared-llvm >> + >> +Setting opencl-external-clang-headers to enabled while using shared LLVM >> +was broken and this option was mostly used for windows to force static >> +inclusion of opencl base headers. >> + >> +Simply relying on the shared-llvm option here is enough to get what we >> +want. >> + >> +Signed-off-by: Karol Herbst >> +Reviewed-by: Jesse Natalie >> +Part-of: >> +[antoine.coutant at smile.fr: backported to mesa-23.3.4] >> +Signed-off-by: Antoine Coutant >> +--- >> + .gitlab-ci/windows/mesa_build.ps1 | 1 - >> + meson_options.txt | 7 ------- >> + src/compiler/clc/meson.build | 4 +--- >> + 3 files changed, 1 insertion(+), 11 deletions(-) >> + >> +diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 >> +index a4f87c4eadb..e79eb6b6587 100644 >> +--- a/.gitlab-ci/windows/mesa_build.ps1 >> ++++ b/.gitlab-ci/windows/mesa_build.ps1 >> +@@ -59,7 +59,6 @@ meson setup ` >> + -Dopencl-spirv=true ` >> + -Dmicrosoft-clc=enabled ` >> + -Dstatic-libclc=all ` >> +--Dopencl-external-clang-headers=disabled ` >> + -Dspirv-to-dxil=true ` >> + -Dbuild-tests=true ` >> + -Dwerror=true ` >> +diff --git a/meson_options.txt b/meson_options.txt >> +index e885ba61a8a..537ba797407 100644 >> +--- a/meson_options.txt >> ++++ b/meson_options.txt >> +@@ -191,13 +191,6 @@ option( >> + description : 'Link libclc SPIR-V statically.', >> + ) >> + >> +-option( >> +- 'opencl-external-clang-headers', >> +- type : 'feature', >> +- description : 'Use system Clang headers at runtime for OpenCL kernel ' + >> +- 'compilation.', >> +-) >> +- >> + option( >> + 'd3d-drivers-path', >> + type : 'string', >> +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build >> +index 3e4f1a7f441..81345225768 100644 >> +--- a/src/compiler/clc/meson.build >> ++++ b/src/compiler/clc/meson.build >> +@@ -30,9 +30,7 @@ _libmesaclc_c_args = [] >> + _libmesaclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)] >> + _libmesaclc_sources = [] >> + >> +-if get_option('opencl-external-clang-headers') \ >> +- .disable_auto_if(host_machine.system() == 'windows') \ >> +- .disabled() >> ++if not _shared_llvm >> + # LLVM 16 moved clang header path from using full version to only major version >> + if dep_llvm.version().version_compare('< 16') >> + # Prior to LLVM 16, this path used a full version >> +-- >> +2.25.1 >> + >> diff --git a/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch >> new file mode 100644 >> index 0000000000..3560f6805f >> --- /dev/null >> +++ b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch >> @@ -0,0 +1,40 @@ >> +From 56c85c4c7a757a9ba3d8ac08e6c4c4c7f19e6cab Mon Sep 17 00:00:00 2001 >> +From: Karol Herbst >> +Date: Thu, 11 Jan 2024 14:55:46 +0100 >> +Subject: [PATCH 2/3] clc: force fPIC for every user when using shared LLVM >> + >> +As we want to start using `dladdr`, this is needed to prevent `dladdr` >> +returning information of the wrong file. >> + >> +Fixes tag as it's required by the actual fix. >> + >> +Signed-off-by: Karol Herbst >> +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") >> +Part-of: >> +[antoine.coutant at smile.fr: backported to mesa-23.3.4] >> +Signed-off-by: Antoine Coutant >> +--- >> + src/compiler/clc/meson.build | 6 ++++++ >> + 1 file changed, 6 insertions(+) >> + >> +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build >> +index 81345225768..442a583065b 100644 >> +--- a/src/compiler/clc/meson.build >> ++++ b/src/compiler/clc/meson.build >> +@@ -123,7 +123,13 @@ _libmesaclc = static_library( >> + idep_mesautil, dep_spirv_tools] >> + ) >> + >> ++_idep_mesaclc_link_args = [] >> ++if _shared_llvm >> ++ _idep_mesaclc_link_args += cc.get_supported_link_arguments('-fPIC') >> ++endif >> ++ >> + idep_mesaclc = declare_dependency( >> + link_with : _libmesaclc, >> + include_directories : include_directories('.'), >> ++ link_args : _idep_mesaclc_link_args, >> + ) >> +-- >> +2.25.1 >> + >> diff --git a/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch >> new file mode 100644 >> index 0000000000..c19ba7d2b7 >> --- /dev/null >> +++ b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch >> @@ -0,0 +1,86 @@ >> +From fa2c045e04370beb454951c32bccc087638e04c7 Mon Sep 17 00:00:00 2001 >> +From: Antoine Coutant >> +Date: Thu, 30 Nov 2023 11:10:20 +0100 >> +Subject: [PATCH 3/3] clc: retrieve libclang path at runtime. >> + >> +LLVM_LIB_DIR is a variable used for runtime compilations. >> +When cross compiling, LLVM_LIB_DIR must be set to the >> +libclang path on the target. So, this path should not >> +be retrieved during compilation but at runtime. >> + >> +dladdr uses an address to search for a loaded library. >> +If a library is found, it returns information about it. >> +The path to the libclang library can therefore be >> +retrieved using one of its functions. This is useful >> +because we don't know the name of the libclang library >> +(libclang.so.X or libclang-cpp.so.X) >> + >> +v2 (Karol): use clang::CompilerInvocation::CreateFromArgs for dladdr >> +v3 (Karol): follow symlinks to fix errors on debian >> + >> +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") >> +Signed-off-by: Antoine Coutant >> +Reviewed-by: Karol Herbst >> +Reviewed-by (v1): Jesse Natalie >> +[antoine.coutant at smile.fr: backported to mesa-23.3.4] >> + >> +Part-of: >> +--- >> + src/compiler/clc/clc_helpers.cpp | 24 +++++++++++++++++++++--- >> + 1 file changed, 21 insertions(+), 3 deletions(-) >> + >> +diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp >> +index 55287f22683..22eb3495be9 100644 >> +--- a/src/compiler/clc/clc_helpers.cpp >> ++++ b/src/compiler/clc/clc_helpers.cpp >> +@@ -23,6 +23,7 @@ >> + // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR >> + // OTHER DEALINGS IN THE SOFTWARE. >> + >> ++#include >> + #include >> + #include >> + #include >> +@@ -57,6 +58,10 @@ >> + >> + #include "spirv.h" >> + >> ++#if DETECT_OS_UNIX >> ++#include >> ++#endif >> ++ >> + #ifdef USE_STATIC_OPENCL_C_H >> + #if LLVM_VERSION_MAJOR < 15 >> + #include "opencl-c.h.h" >> +@@ -876,12 +881,25 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx, >> + #endif >> + } >> + #else >> ++ >> ++ Dl_info info; >> ++ if (dladdr((void *)clang::CompilerInvocation::CreateFromArgs, &info) == 0) { >> ++ clc_error(logger, "Couldn't find libclang path.\n"); >> ++ return {}; >> ++ } >> ++ >> ++ char *clang_path = realpath(info.dli_fname, NULL); >> ++ if (clang_path == nullptr) { >> ++ clc_error(logger, "Couldn't find libclang path.\n"); >> ++ return {}; >> ++ } >> ++ >> + // GetResourcePath is a way to retrive the actual libclang resource dir based on a given binary >> +- // or library. The path doesn't even need to exist, we just have to put something in there, >> +- // because we might have linked clang statically. >> ++ // or library. >> + auto libclang_path = fs::path(LLVM_LIB_DIR) / "libclang.so"; >> + auto clang_res_path = >> +- fs::path(Driver::GetResourcesPath(libclang_path.string(), CLANG_RESOURCE_DIR)) / "include"; >> ++ fs::path(Driver::GetResourcesPath(std::string(clang_path), CLANG_RESOURCE_DIR)) / "include"; >> ++ free(clang_path); >> + >> + c->getHeaderSearchOpts().UseBuiltinIncludes = true; >> + c->getHeaderSearchOpts().UseStandardSystemIncludes = true; >> +-- >> +2.25.1 >> + >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From fperrad at gmail.com Mon Feb 12 17:26:19 2024 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 12 Feb 2024 18:26:19 +0100 Subject: [Buildroot] [PATCH v2] package/lua-http: fix CVE-2023-4540 Message-ID: <20240212172619.13550-1-francois.perrad@gadz.org> see https://nvd.nist.gov/vuln/detail/CVE-2023-4540 & https://cert.pl/en/posts/2023/09/CVE-2023-4540 Signed-off-by: Francois Perrad --- ...andle-EOF-when-body_read_type-length.patch | 71 +++++++++++++++++++ package/lua-http/lua-http.mk | 3 + 2 files changed, 74 insertions(+) create mode 100644 package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch diff --git a/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch new file mode 100644 index 000000000..fdbf5243f --- /dev/null +++ b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch @@ -0,0 +1,71 @@ +From ddab2835c583d45dec62680ca8d3cbde55e0bae6 Mon Sep 17 00:00:00 2001 +From: daurnimator +Date: Tue, 22 Aug 2023 23:30:20 +1000 +Subject: [PATCH] http/h1_stream: handle EOF when `body_read_type==length` + +If a client closes the connection before sending the expected number of bytes +then return `EPIPE`. +This fixes a potential infinite draining loop when trying to trying to +`:shutdown()` a stream. + +Upstream: https://github.com/daurnimator/lua-http/commit/ddab2835c583d45dec62680ca8d3cbde55e0bae6 +Signed-off-by: Francois Perrad +--- + http/h1_stream.lua | 2 ++ + spec/h1_stream_spec.lua | 27 +++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/lua-http-0.4/http/h1_stream.lua b/lua-http-0.4/http/h1_stream.lua +index b2469a1..b0ca821 100644 +--- a/lua-http-0.4/http/h1_stream.lua ++++ b/lua-http-0.4/http/h1_stream.lua +@@ -861,6 +861,8 @@ function stream_methods:read_next_chunk(timeout) + if chunk ~= nil then + self.body_read_left = length_n - #chunk + end_stream = (self.body_read_left == 0) ++ elseif err == nil then ++ return nil, ce.strerror(ce.EPIPE), ce.EPIPE + end + elseif length_n == 0 then + chunk = "" +diff --git a/lua-http-0.4/spec/h1_stream_spec.lua b/lua-http-0.4/spec/h1_stream_spec.lua +index f9cfea9..1303f94 100644 +--- a/lua-http-0.4/spec/h1_stream_spec.lua ++++ b/lua-http-0.4/spec/h1_stream_spec.lua +@@ -295,6 +295,33 @@ describe("http1 stream", function() + server:close() + client:close() + end) ++ it("Doesn't hang when a content-length delimited stream is closed", function() ++ local server, client = new_pair(1.1) ++ local cq = cqueues.new() ++ cq:wrap(function() ++ local stream = client:new_stream() ++ local headers = new_headers() ++ headers:append(":method", "GET") ++ headers:append(":scheme", "http") ++ headers:append(":authority", "myauthority") ++ headers:append(":path", "/a") ++ assert(stream:write_headers(headers, true)) ++ end) ++ cq:wrap(function() ++ local stream = server:get_next_incoming_stream() ++ assert(stream:get_headers()) ++ local res_headers = new_headers() ++ res_headers:append(":status", "200") ++ res_headers:append("content-length", "100") ++ assert(stream:write_headers(res_headers, false)) ++ assert(stream:write_chunk("foo", false)) ++ assert(stream:shutdown()) ++ end) ++ assert_loop(cq, TEST_TIMEOUT) ++ assert.truthy(cq:empty()) ++ server:close() ++ client:close() ++ end) + it("allows pipelining", function() + local server, client = new_pair(1.1) + local cq = cqueues.new() +-- +2.40.1 + diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index df3e2c005..34387c12e 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -13,4 +13,7 @@ LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_CPE_ID_VENDOR = daurnimator +# 0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch +LUA_HTTP_IGNORE_CVES += CVE-2023-4540 + $(eval $(luarocks-package)) -- 2.40.1 From fontaine.fabrice at gmail.com Mon Feb 12 17:52:51 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 12 Feb 2024 18:52:51 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/cracklib: python needs autoreconf Message-ID: <20240212175251.721803-1-fontaine.fabrice@gmail.com> Set CRACKLIB_AUTORECONF when building python to regenerate py-compile and avoid the following build failure with python 3.12 (which removed imp module) raised since commit 36e635d2d5c0166476858aa239ccbe78e8f2af14: Traceback (most recent call last): File "", line 2, in ModuleNotFoundError: No module named 'imp' make[3]: *** [Makefile:485: install-pythonPYTHON] Error 1 Indeed, after autoreconf, py-compile will contain: if test "$python_major" -le 2; then import_lib=imp import_test="hasattr(imp, 'get_tag')" import_call=imp.cache_from_source import_arg2=', False' # needed in one call and not the other else import_lib=importlib import_test="hasattr(sys.implementation, 'cache_tag')" import_call=importlib.util.cache_from_source import_arg2= fi $PYTHON -c " import sys, os, py_compile, $import_lib instead of: import sys, os, py_compile, imp Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 - http://autobuild.buildroot.org/results/aec4c19fdf8087c76c1d5f472e855e0f84fcf7fd Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni): - Give more details in commit message package/cracklib/cracklib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index c5226b3326..9f5f32c87a 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -22,6 +22,8 @@ CRACKLIB_CONF_OPTS += --without-zlib endif ifeq ($(BR2_PACKAGE_PYTHON3),y) +# py-compile must be rebuilt because python 3.12 removed imp module +CRACKLIB_AUTORECONF = YES CRACKLIB_CONF_OPTS += --with-python CRACKLIB_CONF_ENV += \ ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 \ -- 2.43.0 From paul at crapouillou.net Mon Feb 12 18:13:48 2024 From: paul at crapouillou.net (Paul Cercueil) Date: Mon, 12 Feb 2024 19:13:48 +0100 Subject: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status In-Reply-To: <20240205222949.2805f50f@windsurf> References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> <20240121204252.152952-2-adam.duskett@amarulasolutions.com> <20240205222949.2805f50f@windsurf> Message-ID: <80b6517820300e318ea9b5c89572115f5d4c3a44.camel@crapouillou.net> Patches were merged upstream, both in wlroots and uClibc: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4540 https://mailman.openadk.org/mailman3/hyperkitty/list/devel at uclibc-ng.org/thread/OMMGSP7PDXQDOQNUXTKRG5DWELAD2CII/ Cheers, -Paul Le lundi 05 f?vrier 2024 ? 22:29 +0100, Thomas Petazzoni a ?crit?: > Hello Adam, > > +Paul Cercueil in Cc, see below. > > On Sun, 21 Jan 2024 13:42:52 -0700 > Adam Duskett wrote: > > > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has > > been > > rejected upstream, and the initial pull request was moved to the > > freedesktop gitlab. Update the patch to reflect these changes. > > > > Signed-off-by: Adam Duskett > > Thanks, applied! > > Paul: could you follow-up with upstream (either wlroots, or uclibc, > or > both) to try to find an acceptable solution so that some day we can > drop this patch? > > Thanks a lot! > > Thomas From arnout at mind.be Mon Feb 12 19:50:44 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 20:50:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Message-ID: On 12/02/2024 01:51, James Hilliard wrote: > On Sun, Feb 11, 2024 at 5:13?PM Marcus Hoffmann wrote: [snip]>> In short: if we continue to use the sdists from pypi, cython is not a >> real build dependency and we can just remove it from pyptoject.toml >> instead of trying to provide the correct version that's never going to >> be invoked. > > We can probably just pass --skip-dependency-check as a build arg or > something like that I suppose. That skips _all_ dependency checks, and we usually want to check dependencies. Unless the dependency check will require host packages for runtime dependencies? But if that were the case we'd already have a lot of useless host-python-foo packages I expect... Regards, Arnout From fontaine.fabrice at gmail.com Mon Feb 12 20:04:42 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 12 Feb 2024 21:04:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/elfutils: drop ELFUTILS_{C, CPP}FLAGS Message-ID: <20240212200442.848248-1-fontaine.fabrice@gmail.com> ELFUTILS_CFLAGS and ELFUTILS_CPPFLAGS are empty since commit 7593aea519dee34cb25715296c1b03f471123ee2 so drop them to avoid setting incorrect flags Fixes: 7593aea519dee34cb25715296c1b03f471123ee2 Signed-off-by: Fabrice Fontaine --- package/elfutils/elfutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index eb1b1794c3..6ba8db1370 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -29,10 +29,6 @@ HOST_ELFUTILS_CONF_OPTS = \ --without-zstd \ --disable-progs -ELFUTILS_CONF_ENV += \ - CFLAGS="$(ELFUTILS_CFLAGS)" \ - CPPFLAGS="$(ELFUTILS_CPPFLAGS)" - ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) \ $(TARGET_NLS_LIBS) -- 2.43.0 From yann.morin.1998 at free.fr Mon Feb 12 20:07:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 12 Feb 2024 21:07:12 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: References: <20240206132051.2838897-1-yegorslists@googlemail.com> <67502ba4-3f73-428e-802e-6ee9cbc1fe6a@mind.be> Message-ID: Yegor, All, On 2024-02-12 10:00 +0100, Yegor Yefremov via buildroot spake thusly: > On Tue, Feb 6, 2024 at 2:37?PM Arnout Vandecappelle wrote: > > On 06/02/2024 14:30, Yann E. MORIN wrote: > > > On 2024-02-06 14:20 +0100, yegorslists--- via buildroot spake thusly: > > >> From: Yegor Yefremov > > >> This .gitignore file ignores all files in an output directory and > > >> hence doesn't change the git status. > > > What are you trying to achieve with this that does not work currently? > > I you do `make O=output-test-mypkg` (which I do quite a lot), that output > > directory doesn't get ignored by git. We could ignore output* but maybe you name > > the output directory o-foo or something. > > > > Putting a .gitignore in a generated directory is a very elegant solution for > > that. It is used by e.g. virtualenv, pytest, and a load of other applications > > that generate output in a directory. > > > > Since the .gitignore is created in the output directory, it is no longer > > necessary to put output/ in the .gitignore file. > > All of the above could be put in the commit message, of course, but for me > > Yegor's commit message was sufficiently clear :-) > Were we able to convince you? I now understand the purpose. Saying I'm convinced is another stride. In my case, I have all my output directories outside of the buildroot tree. Having a .gitignore in there would be totally useless and spurious, and would get caught by my (superficial) tests that no unknown files gets created outside the build/ target/ and such dirs for example. So there are pros and cons either ways... Maybe just create .gitignore only if $(O) a sub-dir of $(TOPDIR) ? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Feb 12 20:27:08 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 12 Feb 2024 21:27:08 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: bump to version 2024-02-09 on branch 5.11.2.1 Message-ID: <20240212202708.3514522-1-giulio.benetti@benettiengineering.com> It supports up to Linux 6.8. Signed-off-by: Giulio Benetti --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index e27acba124..a08ed04010 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 2326902c27aee022bd1f6e49e8dbf789b08613e660385c23ded8038074d7929b rtl8192eu-a928f08c1dd4f9a1e84d85811a543e974551bc4f.tar.gz +sha256 b5d3b8de0b4f05aa2b452dd01f4386e9b671e03c2bbf8e032f1c593befc5a153 rtl8192eu-e90a6043be141bde8847e84223e106eff38ecdfd.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index a2fde6fef0..3d24b0caf8 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = a928f08c1dd4f9a1e84d85811a543e974551bc4f +RTL8192EU_VERSION = e90a6043be141bde8847e84223e106eff38ecdfd RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 21:09:20 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 14:09:20 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Message-ID: On Mon, Feb 12, 2024 at 12:50?PM Arnout Vandecappelle wrote: > > > > On 12/02/2024 01:51, James Hilliard wrote: > > On Sun, Feb 11, 2024 at 5:13?PM Marcus Hoffmann wrote: > [snip]>> In short: if we continue to use the sdists from pypi, cython is not a > >> real build dependency and we can just remove it from pyptoject.toml > >> instead of trying to provide the correct version that's never going to > >> be invoked. > > > > We can probably just pass --skip-dependency-check as a build arg or > > something like that I suppose. > > That skips _all_ dependency checks, and we usually want to check dependencies. > Unless the dependency check will require host packages for runtime dependencies? > But if that were the case we'd already have a lot of useless host-python-foo > packages I expect... Yeah, so runtime dependencies are basically not checked at all since we don't generally have buildroot target python packages which depend on other buildroot target python packages, they merely select their dependencies which allows for their dependencies to be built parallel but prevents any sort of target package dependency validation. I think that --skip-dependency-check flag just disables pep517 build dependency checks which would be those host-python-foo build dependencies that some have. > > Regards, > Arnout > From arnout at mind.be Mon Feb 12 20:49:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 21:49:15 +0100 Subject: [Buildroot] [git commit] package/freescale-imx: add i.MX91 and i.MX93 SoC support Message-ID: <20240212214540.E61F7878BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1cdd48e13b2842669f0ab30e817d8064663beec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit adds i.MX91 and i.MX93 support to Buildroot. https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors:IMX9-PROCESSORS There is no i.MX95 software provided by NXP at the moment that's why i.MX95 is left behind. Adapt package firmware-imx for the LPPDR4 firmware binaries. The i.MX91 and i.MX93 only support LPDDR4 and LPDDR4x, but using different binaries than i.MX8. For simplicity, use a completely separate code path for i.MX91 and i.MX93, using the symbol BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9. There is only one type of firmware supported, so there's no need for a choice or for selecting the version (at least for now). Reviewed-by: Gary Bisson Signed-off-by: S??bastien Szymanski [Arnout: - Remove BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 option. - Re-wrap help text. - Introduce BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 instead of reusing BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW. - Create completely separate instance of FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW for BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9. - Drop the training binaries choice for IMX9. - Drop the firmware version option for IMX9. - Keep options for IMEM and DMEM padding. ] Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/Config.in | 26 +++++++++++++++++++++ package/freescale-imx/firmware-imx/Config.in | 11 ++++++++- package/freescale-imx/firmware-imx/firmware-imx.mk | 27 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 1c26b3cc6f..3221f06e43 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -61,6 +61,30 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL bool "imx8dxl" +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + bool "imx91" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + bool "imx93" + +endchoice + +choice + prompt "i.MX Silicon Revision" + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + help + Some packages related to the selected i.MX platform need to + know the silicon revision of the platform they will run on. + + Note - mismatches may result in a failure to boot! + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 + bool "imx93a0" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + bool "imx93a1" + endchoice config BR2_PACKAGE_FREESCALE_IMX_PLATFORM @@ -80,6 +104,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM default "IMX8MN" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN default "IMX8MP" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default "IMX91" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + default "IMX93" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU bool diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 087ddef877..63990947c8 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -56,6 +56,11 @@ config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW choice @@ -93,6 +98,10 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION Use a specific version of the imx ddr binaries. Leaving this field empty will select the default version. +endif # BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW + +if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW || BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 + config BR2_PACKAGE_FIRMWARE_IMX_IMEM_LEN hex "(LP)DDR IMEM padding length" default 0x8000 @@ -105,6 +114,6 @@ config BR2_PACKAGE_FIRMWARE_IMX_DMEM_LEN help The DMEM firmware will be padded to this length -endif # BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW +endif # BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW || BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 endif # BR2_PACKAGE_FIRMWARE_IMX diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 66ef8c3930..2a74f58aa6 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -45,6 +45,33 @@ ifneq ($(FIRMWARE_IMX_DDR_VERSION),) FIRMWARE_IMX_DDR_VERSION_SUFFIX = _$(FIRMWARE_IMX_DDR_VERSION) endif +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9),y) +FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys + +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW + # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate lpddr4_fw.bin. + # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin + # which is done in post-image script. + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_imem_1d_v202201, + lpddr4_dmem_1d_v202201, + lpddr4_1d_fw) + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_imem_2d_v202201, + lpddr4_dmem_2d_v202201, + lpddr4_2d_fw) + cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ + $(BINARIES_DIR)/lpddr4_fw.bin + ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin + + # U-Boot supports creation of the combined flash.bin image. To make + # sure that U-Boot can access all available files copy them to + # the binary dir. + cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ +endef +endif + ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys From arnout at mind.be Mon Feb 12 21:01:57 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:01:57 +0100 Subject: [Buildroot] [git commit] package/freescale-imx/firmware-ele-imx: new package Message-ID: <20240212214541.024AF8353C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69d127fe29dc8ca0321588ed19f14f644ff7e910 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package provides firmware blobs for the Edgelock Secure Enclave (ELE) [1] present on i.MX8ULP and i.MX9 Socs. This version comes from the 6.1.55-2.2.0 release. Since i.MX8ULP is not added to Buildroot yet, only support i.MX9. [1] https://www.nxp.com/products/nxp-product-information/nxp-product-programs/edgelock-secure-enclave:EDGELOCK-SECURE-ENCLAVE Reviewed-by: Gary Bisson Signed-off-by: S??bastien Szymanski [Arnout: - Introduce BR2_PACKAGE_FREESCALE_IMX_HAS_ELE instead of specific dependencies. - Drop BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1, use BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 instead. - Don't use SCR.txt as license file (it's just an index file); instead, use EULA. ] Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/Config.in | 6 +++++ package/freescale-imx/firmware-ele-imx/Config.in | 23 ++++++++++++++++++ .../firmware-ele-imx/firmware-ele-imx.hash | 4 ++++ .../firmware-ele-imx/firmware-ele-imx.mk | 27 ++++++++++++++++++++++ 4 files changed, 60 insertions(+) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 3221f06e43..3211592468 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -133,6 +133,11 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL +config BR2_PACKAGE_FREESCALE_IMX_HAS_ELE + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + source "package/freescale-imx/imx-alsa-plugins/Config.in" source "package/freescale-imx/imx-codec/Config.in" source "package/freescale-imx/imx-kobs/Config.in" @@ -143,6 +148,7 @@ source "package/freescale-imx/imx-uuc/Config.in" source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/imx-vpu-hantro/Config.in" source "package/freescale-imx/imx-vpuwrap/Config.in" +source "package/freescale-imx/firmware-ele-imx/Config.in" source "package/freescale-imx/firmware-imx/Config.in" source "package/freescale-imx/imx-sc-firmware/Config.in" source "package/freescale-imx/imx-seco/Config.in" diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in new file mode 100644 index 0000000000..241ad3942d --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/Config.in @@ -0,0 +1,23 @@ +comment "firmware-ele-imx needs an i.MX platform with EdgeLock Secure Enclave" + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + +config BR2_PACKAGE_FIRMWARE_ELE_IMX + bool "firmware-ele-imx" + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_ELE + help + Firmware blobs for the EdgeLock Secure Enclave (ELE) + present on i.MX8ULP and i.MX9 SoCs. + + This library is provided by NXP as-is and doesn't have an + upstream. + +if BR2_PACKAGE_FIRMWARE_ELE_IMX + +config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE + string + default "mx93a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 + default "mx93a1-ahab-container.img" if \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + +endif # BR2_PACKAGE_FIRMWARE_ELE_IMX diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash new file mode 100644 index 0000000000..0923e546b0 --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca firmware-ele-imx-0.1.0.bin +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING +sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk new file mode 100644 index 0000000000..d493fe4a96 --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# firmware-ele-imx +# +################################################################################ + +FIRMWARE_ELE_IMX_VERSION = 0.1.0 +FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) +FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin + +FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING EULA +FIRMWARE_ELE_IMX_REDISTRIBUTE = NO + +FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES + +define FIRMWARE_ELE_IMX_EXTRACT_CMDS + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_ELE_IMX_DL_DIR)/$(FIRMWARE_ELE_IMX_SOURCE)) +endef + +FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE)) + +define FIRMWARE_ELE_IMX_INSTALL_IMAGES_CMDS + cp $(@D)/$(FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE) $(BINARIES_DIR)/ahab-container.img +endef + +$(eval $(generic-package)) From arnout at mind.be Mon Feb 12 21:11:50 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:11:50 +0100 Subject: [Buildroot] [git commit] board/freescale/common/imx/post-image.sh: fix shellcheck errors Message-ID: <20240212214541.08756878BF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=202e35e4b68a6bb8e891b3ec068ca09f67963c59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This file has many shellcheck errors. Fix them as reported by shellcheck. Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - board/freescale/common/imx/post-image.sh | 61 +++++++++++++++++--------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index c2e107ce96..05a9241962 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -31,7 +31,6 @@ board/chromebook/snow/sign.sh Shellcheck board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch Upstream board/cubietech/cubieboard2/post-image.sh Shellcheck board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck -board/freescale/common/imx/post-image.sh Shellcheck board/freescale/common/mxs/post-image.sh Shellcheck board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch Upstream board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index c359ef6032..638da4b86c 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -7,10 +7,12 @@ # dtb_list() { - local DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" + local DTB_LIST + + DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' "${BR2_CONFIG}")" for dt in $DTB_LIST; do - echo -n "\"`basename $dt`.dtb\", " + echo -n "\"$(basename "${dt}").dtb\", " done } @@ -21,11 +23,11 @@ dtb_list() # linux_image() { - if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" "${BR2_CONFIG}"; then echo "\"uImage\"" - elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" "${BR2_CONFIG}"; then echo "\"Image\"" - elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" "${BR2_CONFIG}"; then echo "\"Image.gz\"" else echo "\"zImage\"" @@ -34,27 +36,27 @@ linux_image() genimage_type() { - if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then - if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" "${BR2_CONFIG}"; then + if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_no_boot_part_spl" else echo "genimage.cfg.template_no_boot_part" fi - elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_spl" else echo "genimage.cfg.template" @@ -63,9 +65,9 @@ genimage_type() imx_offset() { - if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" "${BR2_CONFIG}"; then echo "33K" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" "${BR2_CONFIG}"; then echo "33K" else echo "32K" @@ -74,29 +76,30 @@ imx_offset() uboot_image() { - if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" "${BR2_CONFIG}"; then echo "u-boot-dtb.imx" - elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" "${BR2_CONFIG}"; then echo "u-boot.imx" - elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" "${BR2_CONFIG}"; then echo "u-boot-dtb.img" - elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" "${BR2_CONFIG}"; then echo "u-boot.img" fi } main() { - local FILES="$(dtb_list) $(linux_image)" - local IMXOFFSET="$(imx_offset)" - local UBOOTBIN="$(uboot_image)" - local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" - local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + local FILES IMXOFFSET UBOOTBIN GENIMAGE_CFG GENIMAGE_TMP + FILES="$(dtb_list) $(linux_image)" + IMXOFFSET="$(imx_offset)" + UBOOTBIN="$(uboot_image)" + GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" + GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" sed -e "s/%FILES%/${FILES}/" \ -e "s/%IMXOFFSET%/${IMXOFFSET}/" \ -e "s/%UBOOTBIN%/${UBOOTBIN}/" \ - board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG} + "board/freescale/common/imx/$(genimage_type)" > "${GENIMAGE_CFG}" rm -rf "${GENIMAGE_TMP}" @@ -107,9 +110,9 @@ main() --outputpath "${BINARIES_DIR}" \ --config "${GENIMAGE_CFG}" - rm -f ${GENIMAGE_CFG} + rm -f "${GENIMAGE_CFG}" exit $? } -main $@ +main "$@" From arnout at mind.be Mon Feb 12 21:44:37 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:44:37 +0100 Subject: [Buildroot] [git commit] configs/freescale_imx93evk: new defconfig Message-ID: <20240212214541.157CC878C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c05f27c8ae46cc6d9236a30d51f854f221d55ff6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds support for the NXP i.MX 93 11x11 EVK board [1]. [1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-93-evaluation-kit:i.MX93EVK Reviewed-by: Julien Olivain Tested-by: Julien Olivain [Julien: tested on NXP board i.MX93EVK, cpu rev A1, board rev B] Reviewed-by: Gary Bisson Reviewed-by: Giulio Benetti Signed-off-by: S??bastien Szymanski [Arnout: - Fix shellcheck errors. - Add hash files for ATF, linux, U-Boot. ] Signed-off-by: Arnout Vandecappelle --- .../common/imx/genimage.cfg.template_imx9 | 42 ++++++++++++ .../common/imx/imx9-bootloader-prepare.sh | 43 ++++++++++++ board/freescale/common/imx/post-image.sh | 4 ++ .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 + .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx93evk/patches/linux/linux.hash | 3 + board/freescale/imx93evk/patches/uboot/uboot.hash | 2 + board/freescale/imx93evk/readme.txt | 77 ++++++++++++++++++++++ configs/freescale_imx93evk_defconfig | 40 +++++++++++ 9 files changed, 214 insertions(+) diff --git a/board/freescale/common/imx/genimage.cfg.template_imx9 b/board/freescale/common/imx/genimage.cfg.template_imx9 new file mode 100644 index 0000000000..df7ddc25b7 --- /dev/null +++ b/board/freescale/common/imx/genimage.cfg.template_imx9 @@ -0,0 +1,42 @@ +# Minimal SD card image for the NXP i.MX9 boards +# +# We mimic the .sdcard NXP's image format: +# * the SD card must have 32 kB free space at the beginning, +# * U-Boot is integrated into imx9-boot-sd.bin and is dumped as is, +# * a FAT partition at offset 8MB is containing Image and DTB files +# * a single root filesystem partition is required (ext2, ext3 or ext4) +# + +image boot.vfat { + vfat { + label = "boot" + files = { + %FILES% + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition imx-boot { + in-partition-table = "no" + image = "imx9-boot-sd.bin" + offset = %IMXOFFSET% + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh new file mode 100755 index 0000000000..a9611a81bd --- /dev/null +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +main () +{ + SPL_LOAD_ADDR=0x2049A000 + ATF_LOAD_ADDR=0x204E0000 + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" "${BR2_CONFIG}"; then + SPL_LOAD_ADDR=0x204A0000 + ATF_LOAD_ADDR=0x204C0000 + fi + + dd if="${BINARIES_DIR}/u-boot-spl.bin" of="${BINARIES_DIR}/u-boot-spl-padded.bin" bs=4 conv=sync + cat "${BINARIES_DIR}/u-boot-spl-padded.bin" "${BINARIES_DIR}/ddr_fw.bin" > "${BINARIES_DIR}/u-boot-spl-ddr.bin" + + "${HOST_DIR}/bin/mkimage_imx8" -commit > "${BINARIES_DIR}/mkimg.commit" + cat "${BINARIES_DIR}/u-boot.bin" "${BINARIES_DIR}/mkimg.commit" > "${BINARIES_DIR}/u-boot-hash.bin" + rm -f "${BINARIES_DIR}/mkimg.commit" + + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" "${BR2_CONFIG}"; then + "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ + -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ + -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ + -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ + -out "${BINARIES_DIR}/u-boot-atf-container.img" \ + else + "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ + -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ + -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ + -out "${BINARIES_DIR}/u-boot-atf-container.img" + fi + + "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -append "${BINARIES_DIR}/ahab-container.img" -c \ + -ap "${BINARIES_DIR}/u-boot-spl-ddr.bin" a35 ${SPL_LOAD_ADDR} \ + -out "${BINARIES_DIR}/imx9-boot-sd.bin" + + flashbin_size="$(wc -c "${BINARIES_DIR}/imx9-boot-sd.bin" | awk '{print $1}')" + pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400)) + dd if="${BINARIES_DIR}/u-boot-atf-container.img" of="${BINARIES_DIR}/imx9-boot-sd.bin" bs=1K seek=${pad_cnt} + + exit $? +} + +main "$@" diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index 638da4b86c..a440bfb75c 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -50,6 +50,10 @@ genimage_type() echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" "${BR2_CONFIG}"; then + echo "genimage.cfg.template_imx9" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y$" "${BR2_CONFIG}"; then + echo "genimage.cfg.template_imx9" elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" "${BR2_CONFIG}"; then if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_no_boot_part_spl" 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 new file mode 100644 index 0000000000..98f425a89e --- /dev/null +++ b/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cfb927722272897f850681c78d5f129b0883a8efaba9c52d30e029086524f7ff imx-atf-lf-6.1.55-2.2.0.tar.gz diff --git a/board/freescale/imx93evk/patches/linux-headers/linux-headers.hash b/board/freescale/imx93evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx93evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash new file mode 100644 index 0000000000..5687ec7343 --- /dev/null +++ b/board/freescale/imx93evk/patches/linux/linux.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 eb94414f952444289c0af8ad82afa0dc2d07e08f9000ccd2cc39f11da5b494ea linux-imx-lf-6.1.55-2.2.0.tar.gz + diff --git a/board/freescale/imx93evk/patches/uboot/uboot.hash b/board/freescale/imx93evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..9bc17c3f6f --- /dev/null +++ b/board/freescale/imx93evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 64441ee5bf3d5011e7853c028d06211b6f0439d21e147a8f36972c95a07ae9ac uboot-imx-lf-6.1.55-2.2.0.tar.gz diff --git a/board/freescale/imx93evk/readme.txt b/board/freescale/imx93evk/readme.txt new file mode 100644 index 0000000000..1173de39db --- /dev/null +++ b/board/freescale/imx93evk/readme.txt @@ -0,0 +1,77 @@ +********************* +NXP i.MX93 EVK board +********************* + +This file documents the Buildroot support for the i.MX 93 EVK board. + +Build +===== + +First, configure Buildroot for the i.MX 93 EVK board: + + make freescale_imx93evk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - ddr_fw.bin + - Image + - imx93-11x11-evk.dtb + - imx9-boot-sd.bin + - lpddr4_pmu_train_fw.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf-container.img + - u-boot.bin + - u-boot-hash.bin + - u-boot-spl.bin + - u-boot-spl-ddr.bin + - u-boot-spl-padded.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx9. + +Boot the i.MX 93 EVK board +=============================== + +To boot your newly created system (refer to the i.MX 93 EVK Documentation +[1] for guidance): +- insert the SD card in the SD slot of the board; +- Configure the switches as follows: +SW1301: 0100 SW1301[1-4] +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Note: the debug USB connector presents 4 UARTs (for example /dev/ttyUSB[0-3]), +the Cortex-A55 UART should be the 3rd one (in the previous example, /dev/ttyUSB2). +Refer to the documentation [1] for more details. + +Enjoy! + +References +========== +[1] https://www.nxp.com/document/guide/getting-started-with-the-i-mx93-evk:GS-IMX93EVK diff --git a/configs/freescale_imx93evk_defconfig b/configs/freescale_imx93evk_defconfig new file mode 100644 index 0000000000..fa16967884 --- /dev/null +++ b/configs/freescale_imx93evk_defconfig @@ -0,0 +1,40 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_ARM_FPU_VFPV4D16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx93evk/patches" +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.1.55-2.2.0)/linux-imx-lf-6.1.55-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" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y +BR2_PACKAGE_FIRMWARE_ELE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +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.1.55-2.2.0)/imx-atf-lf-6.1.55-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.1.55-2.2.0)/uboot-imx-lf-6.1.55-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 +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From arnout at mind.be Mon Feb 12 21:46:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:46:13 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> Message-ID: <2191e9a1-eae3-4ca7-8280-300a66cf5a70@mind.be> On 08/02/2024 13:54, S?bastien Szymanski wrote: > This commit adds i.MX91 and i.MX93 support to Buildroot. > https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors:IMX9-PROCESSORS > > There is no i.MX95 software provided by NXP at the moment that's why > i.MX95 is left behind. > > Adapt package firmware-imx for the LPPDR4 firwmares binaries. > > Reviewed-by: Gary Bisson > Signed-off-by: S?bastien Szymanski Applied to master, with changes as already mentioned in my review: - Remove BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 option. - Re-wrap help text. - Introduce BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 instead of reusing BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW. - Create completely separate instance of FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW for BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9. - Drop the training binaries choice for IMX9. - Drop the firmware version option for IMX9. - Keep options for IMEM and DMEM padding. Regards, Arnout > --- > Changes for v5: > - none > > Changes for v4 > - move i.MX Silicon Revision changes into this patch (Gary Bisson) > - BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION default to "v202201" instead of > just "202201" (Gary Bisson) > - Copy all DDR files to $(BINARIES_DIR) as U-Boot can now create a > bootable image: > https://source.denx.de/u-boot/u-boot/-/commit/f637dfe8c468229c9fb313d13c46d51cdbb88824 > - remove "pmu_train" from generated _pad binary file names > > Changes for v3: > - none > > Changes for v2: > - none > --- > package/freescale-imx/Config.in | 37 ++++++++++++++++++++++ > package/freescale-imx/firmware-imx/Config.in | 9 ++++++ > package/freescale-imx/firmware-imx/firmware-imx.mk | 25 +++++++++++++++ > 3 files changed, 71 insertions(+) > > diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in > index 1c26b3cc6f4c..ba169ead18cb 100644 > --- a/package/freescale-imx/Config.in > +++ b/package/freescale-imx/Config.in > @@ -61,6 +61,41 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X > config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL > bool "imx8dxl" > > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + bool "imx91" > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + bool "imx93" > + > +endchoice > + > +choice > + prompt "i.MX Silicon Revision" > + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 \ > + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 \ > + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + help > + Some packages related to the selected i.MX platform need to know the > + silicon revision of the platform they will run on. > + If you don't know, leave the default value. > + > + Note - mismatches may result in a failure to boot! > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 > + bool "imx91a1" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 > + bool "imx93a0" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 > + bool "imx93a1" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + > endchoice > > config BR2_PACKAGE_FREESCALE_IMX_PLATFORM > @@ -80,6 +115,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM > default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM > default "IMX8MN" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN > default "IMX8MP" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP > + default "IMX91" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + default "IMX93" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > > config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU > bool > diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in > index 087ddef8771b..d83b5e129a9f 100644 > --- a/package/freescale-imx/firmware-imx/Config.in > +++ b/package/freescale-imx/firmware-imx/Config.in > @@ -55,6 +55,8 @@ config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW > default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM > default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN > default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP > + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > > if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW > > @@ -73,11 +75,15 @@ config BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 > > config BR2_PACKAGE_FIRMWARE_IMX_DDR4 > bool "DDR4" > + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > help > Use DDR4 binaries (i.e.: ddr4_*_201810.bin). > > config BR2_PACKAGE_FIRMWARE_IMX_DDR3 > bool "DDR3" > + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > help > Use DDR3 binaries (i.e.: ddr3_*_201810.bin). > > @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION > # unconditionally use HW version 201810 when DDR3/DDR4 was > # selected > default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || BR2_PACKAGE_FIRMWARE_IMX_DDR4 > + default "v202201" if \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > help > Use a specific version of the imx ddr binaries. Leaving this > field empty will select the default version. > diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk > index 66ef8c3930be..1f36f917cdc8 100644 > --- a/package/freescale-imx/firmware-imx/firmware-imx.mk > +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk > @@ -48,6 +48,30 @@ endif > ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) > FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys > > +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) > +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > + # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate lpddr4_fw.bin. > + # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin > + # which is done in post-image script. > + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ > + lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_1d_fw) > + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ > + lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_2d_fw) > + cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ > + $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ > + $(BINARIES_DIR)/lpddr4_fw.bin > + ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin > + > + # U-Boot supports creation of the combined flash.bin image. To make > + # sure that U-Boot can access all available files copy them to > + # the binary dir. > + cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ > +endef > +else > define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > # Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin. > # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin > @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ > endef > endif > +endif > > ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) > FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys > From arnout at mind.be Mon Feb 12 21:46:43 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:46:43 +0100 Subject: [Buildroot] [PATCH v5 2/3] package/freescale-imx/firmware-ele-imx: new package In-Reply-To: <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> Message-ID: On 08/02/2024 13:54, S?bastien Szymanski wrote: > This package provides firmware blobs for the Edgelock Secure > Enclave (ELE) [1] present on i.MX8ULP and i.MX9 Socs. > This version comes from the 6.1.55-2.2.0 release. > > [1] https://www.nxp.com/products/nxp-product-information/nxp-product-programs/edgelock-secure-enclave:EDGELOCK-SECURE-ENCLAVE > > Reviewed-by: Gary Bisson > Signed-off-by: S?bastien Szymanski Applied to master, thanks, with some changes: - Introduce BR2_PACKAGE_FREESCALE_IMX_HAS_ELE instead of specific dependencies. - Drop BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1, use BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 instead. - Don't use SCR.txt as license file (it's just an index file); instead, use EULA. Regards, Arnout > --- > Changes for v5: > - none > > Changes for v4: > - move i.MX Silicon Revision changes into first patch (Gary Bisson) > > Changes for v3: > - rename package from firmware-sentinel to package firmware-ele-imx > > Changes for v2: > - none > --- > package/freescale-imx/Config.in | 1 + > package/freescale-imx/firmware-ele-imx/Config.in | 21 +++++++++++++++++ > .../firmware-ele-imx/firmware-ele-imx.hash | 4 ++++ > .../firmware-ele-imx/firmware-ele-imx.mk | 27 ++++++++++++++++++++++ > 4 files changed, 53 insertions(+) > > diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in > index ba169ead18cb..f12acc3bd024 100644 > --- a/package/freescale-imx/Config.in > +++ b/package/freescale-imx/Config.in > @@ -154,6 +154,7 @@ source "package/freescale-imx/imx-uuc/Config.in" > source "package/freescale-imx/imx-vpu/Config.in" > source "package/freescale-imx/imx-vpu-hantro/Config.in" > source "package/freescale-imx/imx-vpuwrap/Config.in" > +source "package/freescale-imx/firmware-ele-imx/Config.in" > source "package/freescale-imx/firmware-imx/Config.in" > source "package/freescale-imx/imx-sc-firmware/Config.in" > source "package/freescale-imx/imx-seco/Config.in" > diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in > new file mode 100644 > index 000000000000..7867c3712c9c > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_FIRMWARE_ELE_IMX > + bool "firmware-ele-imx" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + help > + Firmware blobs for the Edgelock Secure Enclave (ELE) > + present on i.MX8ULP and i.MX9 SoCs. > + > + This library is provided by NXP as-is and doesn't have an > + upstream. > + > +if BR2_PACKAGE_FIRMWARE_ELE_IMX > + > +config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE > + string > + default "mx93a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 > + default "mx93a1-ahab-container.img" if \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 > + > +endif # BR2_PACKAGE_FIRMWARE_ELE_IMX > diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash > new file mode 100644 > index 000000000000..58565cef43e9 > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash > @@ -0,0 +1,4 @@ > +# Locally calculated > +sha256 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca firmware-ele-imx-0.1.0.bin > +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING > +sha256 c800aaca3a7e9f470d99d7cde0a48c95982ed601d4c306f7b8f43f3710054f28 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 > new file mode 100644 > index 000000000000..600b50c5b456 > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk > @@ -0,0 +1,27 @@ > +################################################################################ > +# > +# firmware-ele-imx > +# > +################################################################################ > + > +FIRMWARE_ELE_IMX_VERSION = 0.1.0 > +FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) > +FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin > + > +FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement > +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING SCR.txt > +FIRMWARE_ELE_IMX_REDISTRIBUTE = NO > + > +FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES > + > +define FIRMWARE_ELE_IMX_EXTRACT_CMDS > + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_ELE_IMX_DL_DIR)/$(FIRMWARE_ELE_IMX_SOURCE)) > +endef > + > +FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE)) > + > +define FIRMWARE_ELE_IMX_INSTALL_IMAGES_CMDS > + cp $(@D)/$(FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE) $(BINARIES_DIR)/ahab-container.img > +endef > + > +$(eval $(generic-package)) > From arnout at mind.be Mon Feb 12 21:49:27 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:49:27 +0100 Subject: [Buildroot] [PATCH v5 3/3] configs/freescale_imx93evk: new defconfig In-Reply-To: <20240115-imx93-support-v5-3-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-3-c2c950104c58@armadeus.com> Message-ID: <48843560-82c9-49c7-972f-e3032a4502b0@mind.be> On 08/02/2024 13:54, S?bastien Szymanski wrote: > This patch adds support for the NXP i.MX 93 11x11 EVK board [1]. > > [1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-93-evaluation-kit:i.MX93EVK > > Reviewed-by: Julien Olivain > Tested-by: Julien Olivain > [Julien: tested on NXP board i.MX93EVK, cpu rev A1, board rev B] > Reviewed-by: Gary Bisson > Reviewed-by: Giulio Benetti > Signed-off-by: S?bastien Szymanski > --- > Changes for v5: > - follow BR coding style for the genimage.cfg.template_imx9 file > (Giulio Benetti) > > Changes for v4: > - None > > Changes for v3: > - BR2_PACKAGE_FIRMWARE_SENTINEL=y -> BR2_PACKAGE_FIRMWARE_ELE_IMX=y > - add a note about the debug UART in the readme.txt file (Julien Olivain) > - add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y and > BR2_TARGET_UBOOT_NEEDS_GNUTLS=y to the defconfig file (Julien Olivain) > - bump ATF, U-Boot and Linux to latest NXP release lf-6.1.55-2.2.0 > (Julien Olivain) > > Changes for v2: > - none > --- > .../common/imx/genimage.cfg.template_imx9 | 42 ++++++++++++ > .../common/imx/imx9-bootloader-prepare.sh | 34 ++++++++++ This new script had some shellcheck errors. > board/freescale/common/imx/post-image.sh | 4 ++ This one introduced some new shellcheck errors. I pushed an extra commit that fixes all the shellcheck errors before this patch. > board/freescale/imx93evk/readme.txt | 77 ++++++++++++++++++++++ > configs/freescale_imx93evk_defconfig | 39 +++++++++++ > 5 files changed, 196 insertions(+) We now support hash files for the custom kernel etc. - they are only used if BR2_DOWNLOAD_FORCE_CHECK_HASHES=y, but it's still good to have them. So I added those. Applied to master with those changes, thanks. Could you re-test the series just to be sure that I didn't do anything stupid? Regards, Arnout [snip] From arnout at mind.be Mon Feb 12 21:51:45 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:51:45 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: References: <20240206132051.2838897-1-yegorslists@googlemail.com> <67502ba4-3f73-428e-802e-6ee9cbc1fe6a@mind.be> Message-ID: <17870736-446d-43bb-a453-80e9efbd2274@mind.be> On 12/02/2024 21:07, Yann E. MORIN wrote: > Yegor, All, > > On 2024-02-12 10:00 +0100, Yegor Yefremov via buildroot spake thusly: >> On Tue, Feb 6, 2024 at 2:37?PM Arnout Vandecappelle wrote: >>> On 06/02/2024 14:30, Yann E. MORIN wrote: >>>> On 2024-02-06 14:20 +0100, yegorslists--- via buildroot spake thusly: >>>>> From: Yegor Yefremov >>>>> This .gitignore file ignores all files in an output directory and >>>>> hence doesn't change the git status. >>>> What are you trying to achieve with this that does not work currently? >>> I you do `make O=output-test-mypkg` (which I do quite a lot), that output >>> directory doesn't get ignored by git. We could ignore output* but maybe you name >>> the output directory o-foo or something. >>> >>> Putting a .gitignore in a generated directory is a very elegant solution for >>> that. It is used by e.g. virtualenv, pytest, and a load of other applications >>> that generate output in a directory. >>> >>> Since the .gitignore is created in the output directory, it is no longer >>> necessary to put output/ in the .gitignore file. >>> All of the above could be put in the commit message, of course, but for me >>> Yegor's commit message was sufficiently clear :-) >> Were we able to convince you? > > I now understand the purpose. Saying I'm convinced is another stride. > > In my case, I have all my output directories outside of the buildroot > tree. Having a .gitignore in there would be totally useless and > spurious, and would get caught by my (superficial) tests that no unknown > files gets created outside the build/ target/ and such dirs for example. That sounds like something you should update regularly, because we regularly add new stuff in the output directory. > So there are pros and cons either ways... > > Maybe just create .gitignore only if $(O) a sub-dir of $(TOPDIR) ? That would be quite complicated, while this patch is pretty simple. Regards, Arnout > > Regards, > Yann E. MORIN. > From thomas.petazzoni at bootlin.com Mon Feb 12 21:52:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:52:40 +0100 Subject: [Buildroot] [git commit] package/rtl8192eu: bump to version 2024-02-09 on branch 5.11.2.1 Message-ID: <20240212215333.AC640878C6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=835c647375182da571bfb0170b7cd7750cad38e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It supports up to Linux 6.8. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index e27acba124..a08ed04010 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 2326902c27aee022bd1f6e49e8dbf789b08613e660385c23ded8038074d7929b rtl8192eu-a928f08c1dd4f9a1e84d85811a543e974551bc4f.tar.gz +sha256 b5d3b8de0b4f05aa2b452dd01f4386e9b671e03c2bbf8e032f1c593befc5a153 rtl8192eu-e90a6043be141bde8847e84223e106eff38ecdfd.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index a2fde6fef0..3d24b0caf8 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = a928f08c1dd4f9a1e84d85811a543e974551bc4f +RTL8192EU_VERSION = e90a6043be141bde8847e84223e106eff38ecdfd RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From arnout at mind.be Mon Feb 12 21:53:46 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:53:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Message-ID: On 12/02/2024 22:09, James Hilliard wrote: > On Mon, Feb 12, 2024 at 12:50?PM Arnout Vandecappelle wrote: >> >> >> >> On 12/02/2024 01:51, James Hilliard wrote: >>> On Sun, Feb 11, 2024 at 5:13?PM Marcus Hoffmann wrote: >> [snip]>> In short: if we continue to use the sdists from pypi, cython is not a >>>> real build dependency and we can just remove it from pyptoject.toml >>>> instead of trying to provide the correct version that's never going to >>>> be invoked. >>> >>> We can probably just pass --skip-dependency-check as a build arg or >>> something like that I suppose. >> >> That skips _all_ dependency checks, and we usually want to check dependencies. >> Unless the dependency check will require host packages for runtime dependencies? >> But if that were the case we'd already have a lot of useless host-python-foo >> packages I expect... > > Yeah, so runtime dependencies are basically not checked at all since we don't > generally have buildroot target python packages which depend on other buildroot > target python packages, they merely select their dependencies which allows for > their dependencies to be built parallel but prevents any sort of target package > dependency validation. > > I think that --skip-dependency-check flag just disables pep517 build dependency > checks which would be those host-python-foo build dependencies that some have. Oh, and a missing build dependency (that is actually used) would actually trigger a build error, so indeed it sounds like the pep517 build dependency check is quite redundant. Regards, Arnout From thomas.petazzoni at bootlin.com Mon Feb 12 21:54:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:54:26 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: bump to version 2024-02-09 on branch 5.11.2.1 In-Reply-To: <20240212202708.3514522-1-giulio.benetti@benettiengineering.com> References: <20240212202708.3514522-1-giulio.benetti@benettiengineering.com> Message-ID: <20240212225426.25d80a95@windsurf> On Mon, 12 Feb 2024 21:27:08 +0100 Giulio Benetti wrote: > It supports up to Linux 6.8. > > Signed-off-by: Giulio Benetti > --- > package/rtl8192eu/rtl8192eu.hash | 2 +- > package/rtl8192eu/rtl8192eu.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 21:55:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:55:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: bump to version 3.0.17 In-Reply-To: <20240211214935.1603160-1-ju.o@free.fr> References: <20240211214935.1603160-1-ju.o@free.fr> Message-ID: <20240212225521.70d80a7c@windsurf> On Sun, 11 Feb 2024 22:49:35 +0100 Julien Olivain wrote: > For commit logs, see: > https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ > > Signed-off-by: Julien Olivain > --- > package/gnu-efi/gnu-efi.hash | 6 +++--- > package/gnu-efi/gnu-efi.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 21:55:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:55:54 +0100 Subject: [Buildroot] [git commit] package/elfutils: drop ELFUTILS_{C, CPP}FLAGS Message-ID: <20240212215607.AD88C878D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed804a9f0c09a151f32be36f63ae4c924b9dc360 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ELFUTILS_CFLAGS and ELFUTILS_CPPFLAGS are empty since commit 7593aea519dee34cb25715296c1b03f471123ee2 so drop them to avoid setting incorrect flags Fixes: 7593aea519dee34cb25715296c1b03f471123ee2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/elfutils/elfutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index cb4293b0c3..87b51aa5b5 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -29,10 +29,6 @@ HOST_ELFUTILS_CONF_OPTS = \ --without-zstd \ --disable-progs -ELFUTILS_CONF_ENV += \ - CFLAGS="$(ELFUTILS_CFLAGS)" \ - CPPFLAGS="$(ELFUTILS_CPPFLAGS)" - ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) \ $(TARGET_NLS_LIBS) From thomas.petazzoni at bootlin.com Mon Feb 12 21:54:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:54:22 +0100 Subject: [Buildroot] [git commit] package/gnu-efi: bump to version 3.0.17 Message-ID: <20240212215607.A299C878D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa9893ad8fb94278d7e8b80cd3e795469223faf0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For commit logs, see: https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnu-efi/gnu-efi.hash | 6 +++--- package/gnu-efi/gnu-efi.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gnu-efi/gnu-efi.hash b/package/gnu-efi/gnu-efi.hash index 251a99e5d7..7d98650991 100644 --- a/package/gnu-efi/gnu-efi.hash +++ b/package/gnu-efi/gnu-efi.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/gnu-efi/files -md5 192d94e995ddd4ebdce4903adfd06039 gnu-efi-3.0.15.tar.bz2 -sha1 40c8a4715cf8c409a093c8d2ca9f5d5b24d73058 gnu-efi-3.0.15.tar.bz2 +md5 832496719182e7d6a4b12bc7c0b534d2 gnu-efi-3.0.17.tar.bz2 +sha1 9715285022124b231520d58b26709f5ab338e981 gnu-efi-3.0.17.tar.bz2 # Locally computed -sha256 931a257b9c5c1ba65ff519f18373c438a26825f2db7866b163e96d1b168f20ea gnu-efi-3.0.15.tar.bz2 +sha256 7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4 gnu-efi-3.0.17.tar.bz2 sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 686a14be01..8b9a6aa4c6 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNU_EFI_VERSION = 3.0.15 +GNU_EFI_VERSION = 3.0.17 GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2 GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi GNU_EFI_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 12 21:56:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:56:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/elfutils: drop ELFUTILS_{C, CPP}FLAGS In-Reply-To: <20240212200442.848248-1-fontaine.fabrice@gmail.com> References: <20240212200442.848248-1-fontaine.fabrice@gmail.com> Message-ID: <20240212225608.4b41250b@windsurf> On Mon, 12 Feb 2024 21:04:42 +0100 Fabrice Fontaine wrote: > ELFUTILS_CFLAGS and ELFUTILS_CPPFLAGS are empty since commit > 7593aea519dee34cb25715296c1b03f471123ee2 so drop them to avoid setting > incorrect flags > > Fixes: 7593aea519dee34cb25715296c1b03f471123ee2 > > Signed-off-by: Fabrice Fontaine > --- > package/elfutils/elfutils.mk | 4 ---- > 1 file changed, 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 21:56:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:56:33 +0100 Subject: [Buildroot] [PATCH v2] package/lua-http: fix CVE-2023-4540 In-Reply-To: <20240212172619.13550-1-francois.perrad@gadz.org> References: <20240212172619.13550-1-francois.perrad@gadz.org> Message-ID: <20240212225633.483a6ff1@windsurf> On Mon, 12 Feb 2024 18:26:19 +0100 Francois Perrad wrote: > see https://nvd.nist.gov/vuln/detail/CVE-2023-4540 > & https://cert.pl/en/posts/2023/09/CVE-2023-4540 > > Signed-off-by: Francois Perrad > --- > ...andle-EOF-when-body_read_type-length.patch | 71 +++++++++++++++++++ > package/lua-http/lua-http.mk | 3 + > 2 files changed, 74 insertions(+) > create mode 100644 package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 21:56:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:56:15 +0100 Subject: [Buildroot] [git commit] package/lua-http: fix CVE-2023-4540 Message-ID: <20240212215749.208B7878D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=431c02174078e359b6379b8021e6aeb06b2dbb9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master see https://nvd.nist.gov/vuln/detail/CVE-2023-4540 & https://cert.pl/en/posts/2023/09/CVE-2023-4540 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- ...eam-handle-EOF-when-body_read_type-length.patch | 71 ++++++++++++++++++++++ package/lua-http/lua-http.mk | 3 + 2 files changed, 74 insertions(+) diff --git a/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch new file mode 100644 index 0000000000..fdbf5243f5 --- /dev/null +++ b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch @@ -0,0 +1,71 @@ +From ddab2835c583d45dec62680ca8d3cbde55e0bae6 Mon Sep 17 00:00:00 2001 +From: daurnimator +Date: Tue, 22 Aug 2023 23:30:20 +1000 +Subject: [PATCH] http/h1_stream: handle EOF when `body_read_type==length` + +If a client closes the connection before sending the expected number of bytes +then return `EPIPE`. +This fixes a potential infinite draining loop when trying to trying to +`:shutdown()` a stream. + +Upstream: https://github.com/daurnimator/lua-http/commit/ddab2835c583d45dec62680ca8d3cbde55e0bae6 +Signed-off-by: Francois Perrad +--- + http/h1_stream.lua | 2 ++ + spec/h1_stream_spec.lua | 27 +++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/lua-http-0.4/http/h1_stream.lua b/lua-http-0.4/http/h1_stream.lua +index b2469a1..b0ca821 100644 +--- a/lua-http-0.4/http/h1_stream.lua ++++ b/lua-http-0.4/http/h1_stream.lua +@@ -861,6 +861,8 @@ function stream_methods:read_next_chunk(timeout) + if chunk ~= nil then + self.body_read_left = length_n - #chunk + end_stream = (self.body_read_left == 0) ++ elseif err == nil then ++ return nil, ce.strerror(ce.EPIPE), ce.EPIPE + end + elseif length_n == 0 then + chunk = "" +diff --git a/lua-http-0.4/spec/h1_stream_spec.lua b/lua-http-0.4/spec/h1_stream_spec.lua +index f9cfea9..1303f94 100644 +--- a/lua-http-0.4/spec/h1_stream_spec.lua ++++ b/lua-http-0.4/spec/h1_stream_spec.lua +@@ -295,6 +295,33 @@ describe("http1 stream", function() + server:close() + client:close() + end) ++ it("Doesn't hang when a content-length delimited stream is closed", function() ++ local server, client = new_pair(1.1) ++ local cq = cqueues.new() ++ cq:wrap(function() ++ local stream = client:new_stream() ++ local headers = new_headers() ++ headers:append(":method", "GET") ++ headers:append(":scheme", "http") ++ headers:append(":authority", "myauthority") ++ headers:append(":path", "/a") ++ assert(stream:write_headers(headers, true)) ++ end) ++ cq:wrap(function() ++ local stream = server:get_next_incoming_stream() ++ assert(stream:get_headers()) ++ local res_headers = new_headers() ++ res_headers:append(":status", "200") ++ res_headers:append("content-length", "100") ++ assert(stream:write_headers(res_headers, false)) ++ assert(stream:write_chunk("foo", false)) ++ assert(stream:shutdown()) ++ end) ++ assert_loop(cq, TEST_TIMEOUT) ++ assert.truthy(cq:empty()) ++ server:close() ++ client:close() ++ end) + it("allows pipelining", function() + local server, client = new_pair(1.1) + local cq = cqueues.new() +-- +2.40.1 + diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index df3e2c0059..34387c12e5 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -13,4 +13,7 @@ LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_CPE_ID_VENDOR = daurnimator +# 0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch +LUA_HTTP_IGNORE_CVES += CVE-2023-4540 + $(eval $(luarocks-package)) From thomas.petazzoni at bootlin.com Mon Feb 12 21:59:53 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:59:53 +0100 Subject: [Buildroot] [PATCH v2] package/environment-setup: add variable KERNEL_DIR alongside KERNELDIR In-Reply-To: <20240131-kernel_dir-v2-1-555eeeee1722@microchip.com> References: <20240131-kernel_dir-v2-1-555eeeee1722@microchip.com> Message-ID: <20240212225953.79488771@windsurf> Hello Nayab, On Wed, 31 Jan 2024 23:48:28 +0530 Nayab Sayed via buildroot wrote: > Update host environment setup helper script to incorporate the variable > KENREL_DIR alongside the existing KERNELDIR. This adjustment ensures > consistency, as some projects utilize KERNELDIR while others use KERNEL_DIR. > > Signed-off-by: Nayab Sayed Thanks for this new iteration, but on my side, I'm tempted to reject this patch, and actually to remove the support for KERNELDIR as well. Indeed, even Angelo, who added the environment-setup script was not able to provide a solid reason for exporting KERNELDIR in the first place. I don't think there is any standard, or somewhat standard variable to point to the Linux kernel source directory. I'm fine with environment-setup exposing CC, LD, CFLAGS, LDFLAGS, or even CROSS_COMPILE as these are reasonably standardized by various build systems. But KERNELDIR or KERNEL_DIR are not, and the simple fact that both would be needed/useful is a clear hint of that. The whole thing I didn't like in the first place with environment-setup is the fact that it exports a mixed bag of somewhat random environment variables, and exposing both KERNELDIR and KERNEL_DIR clearly goes further into this direction in my opinion. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 22:00:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:00:27 +0100 Subject: [Buildroot] [PATCH] configs/wandboard: Update U-Boot and kernel In-Reply-To: <20240119170651.641923-1-festevam@gmail.com> References: <20240119170651.641923-1-festevam@gmail.com> Message-ID: <20240212230027.227104e1@windsurf> On Fri, 19 Jan 2024 14:06:51 -0300 Fabio Estevam wrote: > Update U-Boot to version 2024.01 and kernel to 6.6.12. > > In kernel 6.6 the arm32 i.MX device trees were placed into the > nxp/imx kernel directory, so adapt accordingly. > > Signed-off-by: Fabio Estevam > --- > configs/wandboard_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 22:00:13 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:00:13 +0100 Subject: [Buildroot] [git commit] configs/wandboard: update U-Boot and kernel Message-ID: <20240212220035.E5F33878DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3404e90e7303a20e5d96a3fa2a29b197ea74847 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update U-Boot to version 2024.01 and kernel to 6.6.12. In kernel 6.6 the arm32 i.MX device trees were placed into the nxp/imx kernel directory, so adapt accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/wandboard_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 0966719d48..522173b8ed 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -5,8 +5,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -23,7 +23,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="wandboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y @@ -32,10 +32,10 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1 imx6qp-wandboard-revd1" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-wandboard nxp/imx/imx6dl-wandboard nxp/imx/imx6q-wandboard-revb1 nxp/imx/imx6dl-wandboard-revb1 nxp/imx/imx6q-wandboard-revd1 nxp/imx/imx6dl-wandboard-revd1 nxp/imx/imx6qp-wandboard-revd1" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From thomas.petazzoni at bootlin.com Mon Feb 12 22:02:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:02:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/botan: disable neon with arm soft float In-Reply-To: <20240106132608.1264366-1-fontaine.fabrice@gmail.com> References: <20240106132608.1264366-1-fontaine.fabrice@gmail.com> Message-ID: <20240212230250.47533eb3@windsurf> On Sat, 6 Jan 2024 14:26:08 +0100 Fabrice Fontaine wrote: > Disable neon with soft float to fix the following build failure raised > at least since version 2.19.1: > > In file included from build/include/botan/internal/simd_32.h:27, > from src/lib/block/aes/aes_vperm/aes_vperm.cpp:15: > /home/thomas/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/10.4.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" > 31 | #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" > | ^~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/6b311e97484db2b0f8adbda140320d696713b1e0 > - http://autobuild.buildroot.org/results/c309940ea6db0845d8221fb51611d0254222c644 > > Signed-off-by: Fabrice Fontaine > --- > package/botan/botan.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 22:02:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:02:42 +0100 Subject: [Buildroot] [git commit] package/botan: disable neon with arm soft float Message-ID: <20240212220300.80EB4878E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48c5053576334d9349180349e58240ea02753188 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable neon with soft float to fix the following build failure raised at least since version 2.19.1: In file included from build/include/botan/internal/simd_32.h:27, from src/lib/block/aes/aes_vperm/aes_vperm.cpp:15: /home/thomas/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/10.4.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" 31 | #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/6b311e97484db2b0f8adbda140320d696713b1e0 - http://autobuild.buildroot.org/results/c309940ea6db0845d8221fb51611d0254222c644 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/botan/botan.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index b933e99785..7c290f04ad 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -90,6 +90,10 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),) BOTAN_CONF_OPTS += --disable-neon endif +ifeq ($(BR2_SOFT_FLOAT),y) +BOTAN_CONF_OPTS += --disable-neon +endif + define BOTAN_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure.py $(BOTAN_CONF_OPTS)) endef From thomas.petazzoni at bootlin.com Mon Feb 12 22:04:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:04:10 +0100 Subject: [Buildroot] [git commit] package/rsync: fix openssl static build Message-ID: <20240212220420.98376878ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e889a1c9e983753dd0fa5062d3b9475a8cba6072 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following openssl static build raised since commit 80fa5672da85a110e60be0d2143e85f9e08a0f4a: /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/aarch64_be-buildroot-linux-uclibc/12.3.0/../../../../aarch64_be-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/aarch64_be-buildroot-linux-uclibc/sysroot/lib/../lib64/libcrypto.a(libcrypto-lib-c_zlib.o): in function `zlib_oneshot_expand_block': c_zlib.c:(.text+0xaec): undefined reference to `uncompress' Commit b9a062b354953f3fbfee702bb5b5007598299925 can also be reverted as pkg-config will also retrieve -latomic to avoid the following build failure: /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-1/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(threads_pthread.o): in function `CRYPTO_atomic_add': threads_pthread.c:(.text+0x208): undefined reference to `__atomic_is_lock_free' RSYNC_POST_CONFIGURE_HOOKS must be added to call reconfigure and avoid the following build failure after autoreconf: autoconf -o configure.sh autoheader && touch config.h.in configure.sh has CHANGED. config.h.in is unchanged. You may need to run: make reconfigure Fixes: - http://autobuild.buildroot.org/results/6c1636f7556e7370a4c9f6d02c63cf3e20dc985c - http://autobuild.buildroot.org/results/49abbaa1eab94b248bff434b40728065d687e278 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...TX_copy-in-crypto-lib-instead-of-MD5_Init.patch | 28 +++++++++++++ ...c-use-pkg-config-to-retrieve-openssl-depe.patch | 48 ++++++++++++++++++++++ package/rsync/rsync.mk | 12 ++++-- 3 files changed, 84 insertions(+), 4 deletions(-) diff --git a/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch b/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch new file mode 100644 index 0000000000..5381159968 --- /dev/null +++ b/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch @@ -0,0 +1,28 @@ +From 556a2c5bc2f6244f140a96302d4df92cfc25af8b Mon Sep 17 00:00:00 2001 +From: Wayne Davison +Date: Tue, 25 Oct 2022 21:55:53 -0700 +Subject: [PATCH] Check for EVP_MD_CTX_copy in crypto lib instead of MD5_Init. + +Upstream: https://github.com/WayneD/rsync/commit/556a2c5bc2f6244f140a96302d4df92cfc25af8b +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a2c99558..ccad7f13 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -432,10 +432,10 @@ AH_TEMPLATE([USE_OPENSSL], + if test x"$enable_openssl" != x"no"; then + if test x"$ac_cv_header_openssl_md4_h" = x"yes" && test x"$ac_cv_header_openssl_md5_h" = x"yes"; then + AC_MSG_RESULT(yes) +- AC_SEARCH_LIBS(MD5_Init, crypto, ++ AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, + [AC_DEFINE(USE_OPENSSL) + enable_openssl=yes], +- [err_msg="$err_msg$nl- Failed to find MD5_Init function in openssl crypto lib."; ++ [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; + no_lib="$no_lib openssl"]) + else + AC_MSG_RESULT(no) diff --git a/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch b/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch new file mode 100644 index 0000000000..61fe4b0269 --- /dev/null +++ b/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch @@ -0,0 +1,48 @@ +From 93865bad4c00e7d3c867965663fdb9a1a0448db8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 1 Jan 2023 16:53:23 +0100 +Subject: [PATCH] configure.ac: use pkg-config to retrieve openssl dependencies + +Use pkg-config to retrieve openssl dependencies such as -latomic and +avoids the following build failure when building statically on +architectures such as sparc: + +/home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-1/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(threads_pthread.o): in function `CRYPTO_atomic_add': +threads_pthread.c:(.text+0x208): undefined reference to `__atomic_is_lock_free' + +Fixes: + - http://autobuild.buildroot.org/results/49abbaa1eab94b248bff434b40728065d687e278 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/WayneD/rsync/pull/426 +--- + configure.ac | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ccad7f13..b9591866 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -432,11 +432,15 @@ AH_TEMPLATE([USE_OPENSSL], + if test x"$enable_openssl" != x"no"; then + if test x"$ac_cv_header_openssl_md4_h" = x"yes" && test x"$ac_cv_header_openssl_md5_h" = x"yes"; then + AC_MSG_RESULT(yes) +- AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, ++ PKG_CHECK_MODULES(LIBCRYPTO, libcrypto, + [AC_DEFINE(USE_OPENSSL) +- enable_openssl=yes], +- [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; +- no_lib="$no_lib openssl"]) ++ enable_openssl=yes ++ LIBS="$LIBS $LIBCRYPTO_LIBS"], ++ [AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, ++ [AC_DEFINE(USE_OPENSSL) ++ enable_openssl=yes], ++ [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; ++ no_lib="$no_lib openssl"])]) + else + AC_MSG_RESULT(no) + err_msg="$err_msg$nl- Failed to find openssl/md4.h and openssl/md5.h for openssl crypto lib support." +-- +2.35.1 + diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 3fd2ef257e..b9d392c8cb 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -10,7 +10,9 @@ RSYNC_LICENSE = GPL-3.0+ with exceptions RSYNC_LICENSE_FILES = COPYING RSYNC_CPE_ID_VENDOR = samba RSYNC_SELINUX_MODULES = rsync -RSYNC_DEPENDENCIES = zlib popt +# We're patching configure.ac +RSYNC_AUTORECONF = YES +RSYNC_DEPENDENCIES = host-pkgconf zlib popt # We know that our C library is modern enough for C99 vsnprintf(). Since # configure can't detect this, we tell configure that vsnprintf() is safe. RSYNC_CONF_ENV = rsync_cv_HAVE_C99_VSNPRINTF=yes @@ -20,9 +22,11 @@ RSYNC_CONF_OPTS = \ --disable-roll-simd \ --disable-md5-asm -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -RSYNC_CONF_ENV += LIBS=-latomic -endif +# reconfigure must be run after autoreconf +define RSYNC_RUN_RECONFIGURE + cd $(@D) && PATH=$(BR_PATH) make reconfigure +endef +RSYNC_POST_CONFIGURE_HOOKS += RSYNC_RUN_RECONFIGURE ifeq ($(BR2_PACKAGE_ACL),y) RSYNC_DEPENDENCIES += acl From thomas.petazzoni at bootlin.com Mon Feb 12 22:04:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:04:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/rsync: fix openssl static build In-Reply-To: <20231229214418.9331-1-fontaine.fabrice@gmail.com> References: <20231229214418.9331-1-fontaine.fabrice@gmail.com> Message-ID: <20240212230422.5e1aff0b@windsurf> On Fri, 29 Dec 2023 22:44:18 +0100 Fabrice Fontaine wrote: > Fix the following openssl static build raised since commit > 80fa5672da85a110e60be0d2143e85f9e08a0f4a: > > /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/aarch64_be-buildroot-linux-uclibc/12.3.0/../../../../aarch64_be-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/aarch64_be-buildroot-linux-uclibc/sysroot/lib/../lib64/libcrypto.a(libcrypto-lib-c_zlib.o): in function `zlib_oneshot_expand_block': > c_zlib.c:(.text+0xaec): undefined reference to `uncompress' > > Commit b9a062b354953f3fbfee702bb5b5007598299925 can also be reverted as > pkg-config will also retrieve -latomic to avoid the following build > failure: > > /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-1/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(threads_pthread.o): in function `CRYPTO_atomic_add': > threads_pthread.c:(.text+0x208): undefined reference to `__atomic_is_lock_free' > > RSYNC_POST_CONFIGURE_HOOKS must be added to call reconfigure and avoid > the following build failure after autoreconf: > > autoconf -o configure.sh > autoheader && touch config.h.in > configure.sh has CHANGED. > config.h.in is unchanged. > You may need to run: > make reconfigure > > Fixes: > - http://autobuild.buildroot.org/results/6c1636f7556e7370a4c9f6d02c63cf3e20dc985c > - http://autobuild.buildroot.org/results/49abbaa1eab94b248bff434b40728065d687e278 > > Signed-off-by: Fabrice Fontaine > --- > ...py-in-crypto-lib-instead-of-MD5_Init.patch | 28 +++++++++++ > ...-pkg-config-to-retrieve-openssl-depe.patch | 48 +++++++++++++++++++ > package/rsync/rsync.mk | 12 +++-- > 3 files changed, 84 insertions(+), 4 deletions(-) > create mode 100644 package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch > create mode 100644 package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 22:07:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:07:21 +0100 Subject: [Buildroot] [PATCH 3/3] packages/libcamera-apps: Fix build to use meson In-Reply-To: <20231227182429.1215185-3-mail@sebastianbauer.info> References: <20231227182429.1215185-1-mail@sebastianbauer.info> <20231227182429.1215185-3-mail@sebastianbauer.info> Message-ID: <20240212230721.4f97dae3@windsurf> Hello Sebastian, On Wed, 27 Dec 2023 19:24:29 +0100 Sebastian Bauer wrote: > Upstream uses meson instead of cmake since a while. > > Signed-off-by: Sebastian Bauer Thanks for your patch, and sorry for the slow feedback. Could you clarify why this you say "Fix build" in your commit title? Is there some build failure, or is this an improvement patch? > -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > -LIBCAMERA_APPS_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > -endif You're removing this chunk, but it was important. Do you have some evidence that it is no longer needed? It was added in f41d47f15b63a4bbe026834478e63acba85d33fe, as otherwise libcamera-apps would fail to build on the SPARC CPU architecture. See the commit log for a reference to an autobuilder failure. Thanks in advance for your feedback! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From james.hilliard1 at gmail.com Mon Feb 12 22:11:02 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 15:11:02 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Message-ID: On Mon, Feb 12, 2024 at 2:53?PM Arnout Vandecappelle wrote: > > > > On 12/02/2024 22:09, James Hilliard wrote: > > On Mon, Feb 12, 2024 at 12:50?PM Arnout Vandecappelle wrote: > >> > >> > >> > >> On 12/02/2024 01:51, James Hilliard wrote: > >>> On Sun, Feb 11, 2024 at 5:13?PM Marcus Hoffmann wrote: > >> [snip]>> In short: if we continue to use the sdists from pypi, cython is not a > >>>> real build dependency and we can just remove it from pyptoject.toml > >>>> instead of trying to provide the correct version that's never going to > >>>> be invoked. > >>> > >>> We can probably just pass --skip-dependency-check as a build arg or > >>> something like that I suppose. > >> > >> That skips _all_ dependency checks, and we usually want to check dependencies. > >> Unless the dependency check will require host packages for runtime dependencies? > >> But if that were the case we'd already have a lot of useless host-python-foo > >> packages I expect... > > > > Yeah, so runtime dependencies are basically not checked at all since we don't > > generally have buildroot target python packages which depend on other buildroot > > target python packages, they merely select their dependencies which allows for > > their dependencies to be built parallel but prevents any sort of target package > > dependency validation. > > > > I think that --skip-dependency-check flag just disables pep517 build dependency > > checks which would be those host-python-foo build dependencies that some have. > > Oh, and a missing build dependency (that is actually used) would actually > trigger a build error, so indeed it sounds like the pep517 build dependency > check is quite redundant. Probably a good idea to only use that flag for packages where we want to bypass a build dependency. > > Regards, > Arnout From ju.o at free.fr Mon Feb 12 22:17:30 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 12 Feb 2024 23:17:30 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add git runtime test Message-ID: <20240212221730.66390-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_git.py | 57 +++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 support/testing/tests/package/test_git.py diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..5a6fc11191 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1786,6 +1786,7 @@ F: support/testing/tests/package/test_fping.py F: support/testing/tests/package/test_gawk.py F: support/testing/tests/package/test_ghostscript.py F: support/testing/tests/package/test_ghostscript/ +F: support/testing/tests/package/test_git.py F: support/testing/tests/package/test_glslsandbox_player.py F: support/testing/tests/package/test_glslsandbox_player/ F: support/testing/tests/package/test_gnupg2.py diff --git a/support/testing/tests/package/test_git.py b/support/testing/tests/package/test_git.py new file mode 100644 index 0000000000..878c4c8092 --- /dev/null +++ b/support/testing/tests/package/test_git.py @@ -0,0 +1,57 @@ +import os + +import infra.basetest + + +class TestGit(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_GIT=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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("git --version") + + # Initialize some git global configuration. + git_cfg = [ + ("user.name", "Build Root"), + ("user.email", "build.root at localhost.localdomain"), + ("color.ui", "false"), + ("init.defaultBranch", "master"), + ("core.pager", "") + ] + for cfg_name, cfg_value in git_cfg: + cmd = f"git config --global {cfg_name} '{cfg_value}'" + self.assertRunOk(cmd) + + # Run a sequence of few git commands. + commands = [ + "mkdir workdir", + "cd workdir", + "git init", + "echo 'Hello World' > file.txt", + "git add file.txt", + "git commit -as -m 'Initial commit'", + "git checkout -b my_branch", + "sed -i 's/World/Buildroot/g' file.txt", + "git status", + "git commit -as -m 'Replace World by Buildroot'", + "git format-patch -M -n -s -o patches master", + "ls -al patches/*.patch", + "git checkout -b another_branch master", + "git am patches/*.patch", + "git diff --exit-code my_branch another_branch", + "git tag -a -m 'Tagged v1.0' v1.0", + "git log" + ] + for cmd in commands: + self.assertRunOk(cmd) -- 2.43.0 From james.hilliard1 at gmail.com Mon Feb 12 22:35:46 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 15:35:46 -0700 Subject: [Buildroot] [PATCH v7 1/4] package/python-poetry-core: new host package Message-ID: <20240212223549.3665464-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - update to 1.7.0 - drop patch which is now upstream --- package/python-poetry-core/python-poetry-core.hash | 5 +++++ package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-poetry-core/python-poetry-core.hash create mode 100644 package/python-poetry-core/python-poetry-core.mk diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash new file mode 100644 index 0000000000..c6b180c852 --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/poetry-core/json +md5 7461547cac0e0e9c8cd7463aa87e7470 poetry_core-1.7.0.tar.gz +sha256 8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74 poetry_core-1.7.0.tar.gz +# Locally computed sha256 checksums +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk new file mode 100644 index 0000000000..4ca587b11d --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-poetry-core +# +################################################################################ + +PYTHON_POETRY_CORE_VERSION = 1.7.0 +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/cb/1c/af7f886e723b2dfbaea9b8a739153f227b386dd856cf956f9fd0ed0a502b +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 +PYTHON_POETRY_CORE_LICENSE = MIT +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 22:35:47 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 15:35:47 -0700 Subject: [Buildroot] [PATCH v7 2/4] package/python-terminaltables: use correct pep517 build backend In-Reply-To: <20240212223549.3665464-1-james.hilliard1@gmail.com> References: <20240212223549.3665464-1-james.hilliard1@gmail.com> Message-ID: <20240212223549.3665464-2-james.hilliard1@gmail.com> We need to migrate python-terminaltables to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Upstream has merged a patch replacing poetry with poetry-core, however we can not backport this using a patch file due to CRLF line ending issues so we will have to apply the change in the patch using sed instead. See upstream commit: https://github.com/matthewdeanmartin/terminaltables/commit/9e3dda0efb54fee6934c744a13a7336d24c6e9e9 Signed-off-by: James Hilliard --- Changes v1 -> v2: - add more details regarding pep517 frontend compatibility --- package/python-terminaltables/python-terminaltables.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index b31ed332b6..385c71ae2d 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -7,8 +7,16 @@ PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 -PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools +PYTHON_TERMINALTABLES_SETUP_TYPE = pep517 PYTHON_TERMINALTABLES_LICENSE = MIT PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE +PYTHON_TERMINALTABLES_DEPENDENCIES = host-python-poetry-core + +# we can't use a normal patch file due to different line endings +define PYTHON_TERMINALTABLES_USE_POETRY_CORE + $(SED) 's/requires = \["poetry>=0.12"\]/requires = \["poetry-core>=1.0.0"\]/' $(@D)/pyproject.toml + $(SED) 's/build-backend = "poetry.masonry.api"/build-backend = "poetry.core.masonry.api"/' $(@D)/pyproject.toml +endef +PYTHON_TERMINALTABLES_POST_PATCH_HOOKS += PYTHON_TERMINALTABLES_USE_POETRY_CORE $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 22:35:48 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 15:35:48 -0700 Subject: [Buildroot] [PATCH v7 3/4] package/python-setuptools-rust: add host setuptools-scm dependency In-Reply-To: <20240212223549.3665464-1-james.hilliard1@gmail.com> References: <20240212223549.3665464-1-james.hilliard1@gmail.com> Message-ID: <20240212223549.3665464-3-james.hilliard1@gmail.com> We need host-python-setuptools-scm for python-setuptools-rust to build correctly when using a pep517 frontend. Fixes: * Getting build dependencies for wheel... running egg_info writing setuptools_rust.egg-info/PKG-INFO writing dependency_links to setuptools_rust.egg-info/dependency_links.txt writing entry points to setuptools_rust.egg-info/entry_points.txt writing requirements to setuptools_rust.egg-info/requires.txt writing top-level names to setuptools_rust.egg-info/top_level.txt reading manifest file 'setuptools_rust.egg-info/SOURCES.txt' reading manifest template 'MANIFEST.in' adding license file 'LICENSE' writing manifest file 'setuptools_rust.egg-info/SOURCES.txt' ERROR Missing dependencies: setuptools_scm Signed-off-by: James Hilliard --- package/python-setuptools-rust/python-setuptools-rust.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index f07263becf..e664a5604f 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -10,6 +10,9 @@ PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/f2/40/f1e9 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-semantic-version +HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + host-rustc \ + host-python-semantic-version \ + host-python-setuptools-scm $(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 22:35:49 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 15:35:49 -0700 Subject: [Buildroot] [PATCH v7 4/4] package/pkg-python.mk: migrate setuptools to pep517 In-Reply-To: <20240212223549.3665464-1-james.hilliard1@gmail.com> References: <20240212223549.3665464-1-james.hilliard1@gmail.com> Message-ID: <20240212223549.3665464-4-james.hilliard1@gmail.com> Now that setuptools and its dependencies are using pep517 we can migrate the setuptools infrastructure itself to use the pep517 build frontend. As part of this we need to migrate the all python packages using _BUILD_OPTS to the new config settings format used by the pep517 build frontend. Use new setup type variables to define setup type specific dependencies instead of using the conditional block. We also need to set --skip-dependency-check for msgpack as it enforces cython3 as a requirement while not actually being required. Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov --- Changes v6 -> v7: - just disable dependency enforcement for msgpack - rebase Changes v5 -> v6: - use setup type variables for dependencies Changes v4 -> v5: - rebase on next Changes v1 -> v3: - rebase on master - combine setuptools-rust and maturin env variables - drop patch which is now upstream --- package/pkg-python.mk | 160 ++++++++++----------- package/python-evdev/python-evdev.mk | 4 +- package/python-lxml/python-lxml.mk | 8 +- package/python-m2crypto/python-m2crypto.mk | 4 +- package/python-msgpack/python-msgpack.mk | 1 + package/python-pillow/python-pillow.mk | 35 +++-- package/python-psycopg2/python-psycopg2.mk | 5 +- package/python-pyzmq/python-pyzmq.mk | 4 +- package/python-uvloop/python-uvloop.mk | 6 +- 9 files changed, 114 insertions(+), 113 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 94f28ff841..839f728e2f 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -52,15 +52,62 @@ HOST_PKG_PYTHON_ENV = \ PYTHONNOUSERSITE=1 \ $(HOST_CONFIGURE_OPTS) -# Target setuptools-based packages -PKG_PYTHON_SETUPTOOLS_ENV = \ +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ $(PKG_PYTHON_ENV) -PKG_PYTHON_SETUPTOOLS_CMD = \ - $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') +PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + +PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix + +PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +PKG_PYTHON_PEP517_DEPENDENCIES = \ + host-python-pypa-build \ + host-python-installer + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + $(HOST_PKG_PYTHON_ENV) + +HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + +HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + --interpreter=$(HOST_DIR)/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ + --data=$(HOST_DIR) + +# Target setuptools-based packages +PKG_PYTHON_SETUPTOOLS_ENV = \ + $(PKG_PYTHON_PEP517_ENV) PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) build + $(PKG_PYTHON_PEP517_BUILD_CMD) PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ @@ -69,30 +116,24 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --single-version-externally-managed PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install --no-compile \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(TARGET_DIR) + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(STAGING_DIR) + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + +PKG_PYTHON_SETUPTOOLS_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-setuptools # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - $(HOST_PKG_PYTHON_ENV) + $(HOST_PKG_PYTHON_PEP517_ENV) HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) build + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install \ - --prefix=$(HOST_DIR) \ - --root=/ \ - --single-version-externally-managed + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) # Target setuptools-rust-based packages PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ @@ -109,6 +150,10 @@ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_TARGET_CMD = \ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD) +PKG_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + $(PKG_PYTHON_SETUPTOOLS_DEPENDENCIES) \ + host-python-setuptools-rust + # Host setuptools-rust-based packages HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ @@ -121,52 +166,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ HOST_PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_CMD = \ $(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD) -# Target pep517-based packages -PKG_PYTHON_PEP517_ENV = \ - $(PKG_PYTHON_ENV) - -PKG_PYTHON_PEP517_BUILD_CMD = \ - -m build -n -w - -PKG_PYTHON_PEP517_INSTALL_OPTS = \ - --interpreter=/usr/bin/python \ - --script-kind=posix - -PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ - --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(TARGET_DIR)/usr/bin \ - --data=$(TARGET_DIR)/usr - -PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ - --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(STAGING_DIR)/usr/bin \ - --data=$(STAGING_DIR)/usr - -# Host pep517-based packages -HOST_PKG_PYTHON_PEP517_ENV = \ - $(HOST_PKG_PYTHON_ENV) - -HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ - -m build -n -w - -HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - --interpreter=$(HOST_DIR)/bin/python \ - --script-kind=posix \ - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/bin \ - --data=$(HOST_DIR) - # Target flit packages PKG_PYTHON_FLIT_ENV = \ $(PKG_PYTHON_PEP517_ENV) @@ -180,6 +179,10 @@ PKG_PYTHON_FLIT_INSTALL_TARGET_CMD = \ PKG_PYTHON_FLIT_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) +PKG_PYTHON_FLIT_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-flit-core + # Host flit packages HOST_PKG_PYTHON_FLIT_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) @@ -215,6 +218,10 @@ PKG_PYTHON_MATURIN_INSTALL_TARGET_CMD = \ PKG_PYTHON_MATURIN_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) +PKG_PYTHON_MATURIN_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-maturin + # Host maturin packages HOST_PKG_PYTHON_MATURIN_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) \ @@ -293,28 +300,17 @@ else $(2)_DEPENDENCIES += host-python3 endif # ($(4),target) -# Setuptools based packages will need setuptools for the host Python -# interpreter (both host and target). +# Setup type specific dependencies are the same whether we are +# building for the host or the target. # -ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-setuptools -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) -$(2)_DEPENDENCIES += host-python-setuptools-rust -endif -else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer -ifeq ($$($(2)_SETUP_TYPE),flit) -$(2)_DEPENDENCIES += host-python-flit-core -endif -ifeq ($$($(2)_SETUP_TYPE),maturin) -$(2)_DEPENDENCIES += host-python-maturin -endif -else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) # Don't add dependency on host-python-installer for # host-python-installer itself, and its dependencies. ifeq ($$(filter host-python-flit-core host-python-installer,$(1)),) $(2)_DEPENDENCIES += host-python-installer endif +else +$(2)_DEPENDENCIES += $$(PKG_PYTHON_$$($(2)_SETUP_TYPE_UPPER)_DEPENDENCIES) endif # Pyo3 based packages(setuptools-rust and maturin) will need rust diff --git a/package/python-evdev/python-evdev.mk b/package/python-evdev/python-evdev.mk index 5cf62b5160..b509b43e8a 100644 --- a/package/python-evdev/python-evdev.mk +++ b/package/python-evdev/python-evdev.mk @@ -12,7 +12,7 @@ PYTHON_EVDEV_LICENSE = Revised BSD License PYTHON_EVDEV_LICENSE_FILES = LICENSE PYTHON_EVDEV_BUILD_OPTS = \ - build_ecodes \ - --evdev-headers $(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h + -C--build-option=build_ecodes \ + -C--build-option=--evdev-headers=$(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h $(eval $(python-package)) diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 519a9a77ac..3222234780 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -28,11 +28,11 @@ HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib # python-lxml needs these scripts in order to properly detect libxml2 and # libxslt compiler and linker flags PYTHON_LXML_BUILD_OPTS = \ - --xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ - --xml2-config=$(STAGING_DIR)/usr/bin/xml2-config + -C--build-option=--xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ + -C--build-option=--xml2-config=$(STAGING_DIR)/usr/bin/xml2-config HOST_PYTHON_LXML_BUILD_OPTS = \ - --xslt-config=$(HOST_DIR)/bin/xslt-config \ - --xml2-config=$(HOST_DIR)/bin/xml2-config + -C--build-option=--xslt-config=$(HOST_DIR)/bin/xslt-config \ + -C--build-option=--xml2-config=$(HOST_DIR)/bin/xml2-config $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 69a0c28df5..6c07f42d06 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -13,6 +13,8 @@ PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE PYTHON_M2CRYPTO_CPE_ID_VENDOR = m2crypto_project PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig -PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +PYTHON_M2CRYPTO_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--openssl=$(STAGING_DIR)/usr $(eval $(python-package)) diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index 3ee7c54ce1..9cdf5263de 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -10,6 +10,7 @@ PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/c2/d5/5662032db157 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools +PYTHON_MSGPACK_BUILD_OPTS = --skip-dependency-check # When set in the environment, whatever the value, MSGPACK_PUREPYTHON drives # using the pure python implementation rather than rely on the C++ native code. diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 10939d8467..7f5b4dd0f9 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -14,61 +14,60 @@ PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools PYTHON_PILLOW_DEPENDENCIES = host-pkgconf -PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing -PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) +PYTHON_PILLOW_BUILD_OPTS = -C--build-option=build_ext -C--build-option=--disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype -PYTHON_PILLOW_BUILD_OPTS += --enable-freetype +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-freetype else -PYTHON_PILLOW_BUILD_OPTS += --disable-freetype +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-freetype endif ifeq ($(BR2_PACKAGE_JPEG),y) PYTHON_PILLOW_DEPENDENCIES += jpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg endif ifeq ($(BR2_PACKAGE_LCMS2),y) PYTHON_PILLOW_DEPENDENCIES += lcms2 -PYTHON_PILLOW_BUILD_OPTS += --enable-lcms +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-lcms else -PYTHON_PILLOW_BUILD_OPTS += --disable-lcms +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-lcms endif ifeq ($(BR2_PACKAGE_LIBXCB),y) PYTHON_PILLOW_DEPENDENCIES += libxcb -PYTHON_PILLOW_BUILD_OPTS += --enable-xcb +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-xcb else -PYTHON_PILLOW_BUILD_OPTS += --disable-xcb +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-xcb endif ifeq ($(BR2_PACKAGE_OPENJPEG),y) PYTHON_PILLOW_DEPENDENCIES += openjpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg2000 else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg2000 endif ifeq ($(BR2_PACKAGE_TIFF),y) PYTHON_PILLOW_DEPENDENCIES += tiff -PYTHON_PILLOW_BUILD_OPTS += --enable-tiff +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-tiff else -PYTHON_PILLOW_BUILD_OPTS += --disable-tiff +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-tiff endif ifeq ($(BR2_PACKAGE_WEBP),y) PYTHON_PILLOW_DEPENDENCIES += webp -PYTHON_PILLOW_BUILD_OPTS += --enable-webp +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webp ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) -PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webpmux else -PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webpmux endif else -PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webp -C--build-option=--disable-webpmux endif $(eval $(python-package)) diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk index 0149b8d185..1b33b7505d 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -13,7 +13,8 @@ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE PYTHON_PSYCOPG2_DEPENDENCIES = postgresql # Force psycopg2 to use the Buildroot provided postgresql version # instead of the one from the host machine -PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config -PYTHON_PSYCOPG2_INSTALL_TARGET_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config +PYTHON_PSYCOPG2_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--pg-config=$(STAGING_DIR)/usr/bin/pg_config $(eval $(python-package)) diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index 1d9a7d01cb..db3370f9a1 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -11,7 +11,7 @@ PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD PYTHON_PYZMQ_SETUP_TYPE = setuptools -PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr +PYTHON_PYZMQ_BUILD_OPTS = -C--build-option=--zmq=$(STAGING_DIR)/usr PYTHON_PYZMQ_DEPENDENCIES = \ host-python-packaging \ host-python-setuptools-scm \ @@ -26,7 +26,7 @@ endef PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y) -PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts +PYTHON_PYZMQ_BUILD_OPTS += -C--build-option=--enable-drafts endif $(eval $(python-package)) diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk index 285884a2bb..70508fb6de 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -10,8 +10,10 @@ PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/9c/16/728cc5dde368e PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace --use-system-libuv PYTHON_UVLOOP_DEPENDENCIES = libuv +PYTHON_UVLOOP_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--inplace \ + -C--build-option=--use-system-libuv $(eval $(python-package)) -- 2.34.1 From vfazio at xes-inc.com Mon Feb 12 23:50:27 2024 From: vfazio at xes-inc.com (Vincent Fazio) Date: Mon, 12 Feb 2024 23:50:27 +0000 Subject: [Buildroot] [External] - Re: [git commit] package/python3: bump version to 3.12.1 In-Reply-To: References: <20240206222231.8950D87481@busybox.osuosl.org> <20240212005226.GB2106578@igalia.com> Message-ID: All, > -----Original Message----- > From: buildroot On Behalf Of Vincent > Fazio > Sent: Monday, February 12, 2024 7:46 AM > To: Adrian Perez de Castro ; James Hilliard > > Cc: Bernd Kuhls ; buildroot at uclibc.org > Subject: Re: [Buildroot] [External] - Re: [git commit] package/python3: bump > version to 3.12.1 > > All > > > -----Original Message----- > > From: buildroot On Behalf Of Adrian > > Perez de Castro > > Sent: Sunday, February 11, 2024 4:52 PM > > To: James Hilliard > > Cc: Bernd Kuhls ; buildroot at uclibc.org > > Subject: [External] - Re: [Buildroot] [git commit] package/python3: > > bump version to 3.12.1 > > > > Hi, > > > > On Sun, 11 Feb 2024 14:20:31 -0700 James Hilliard > > wrote: > > > On Fri, Feb 9, 2024 at 9:11?AM Bernd Kuhls wrote: > > > > > > > > Am Thu, 8 Feb 2024 21:14:52 -0500 schrieb James Knight: > > > > > > > > > import math > > > > > ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' > > > > > not found (required by > > > > > /builds/buildroot/output/build/python3-3.12.1/build/lib.linux- > > > > x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) > > > > > > > > Hi James, > > > > > > > > same here on Debian 12.4/bookworm, try this patch: > > > > https://github.com/bkuhls/buildroot/commit/ > > > > dca8b5bee7742ffedf81a027affadd4b7e18fc3f > > This certainly avoids the issue by not running the problematic check. I am a > little concerned about the root cause. > > I haven't had a chance to test 3.11, but from the debugging I did on Friday, I > know that when the host python is executed to check the built modules for > the foreign python, because PYTHONPATH includes the path to the foreign > "builtin" libraries and because they are the same architecture, those libraries > get used instead of the ones from the host's build. So the host python > attempts to load and execute libraries that may have been built for a > different libc. I found simply dropping the foreign python's path from > PYTHONPATH caused the script to execute fine, but I don't know the full > ramifications for dropping that path as part of PYTHON_FOR_BUILD which is > used in the body of this problematic make target and a few others. > I ended up writing an issue in CPython https://github.com/python/cpython/issues/115382 Dropping this make target is probably fine in the interim or we can try dropping the PYTHONPATH for the target directory but without feedback from maintainers I'm not sure what all that would impact. Tangentially related as I was digging into this, 3.13 looks slated to disable uClibc so something to keep on our radar https://github.com/python/cpython/blame/main/Misc/platform_triplet.c#L24 > > > > > > Yeah, this fixes the issue for me as well. > > > > Same here on Arch, I needed to apply the commit to get host-python3 > built. > > > > Cheers, > > ?Adri?n > > CAUTION: This email originated from outside of the organization. Do > > not click links or open attachments unless you recognize the sender > > and know the content is safe. > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From kadambini.nema at gmail.com Tue Feb 13 02:04:20 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 12 Feb 2024 18:04:20 -0800 Subject: [Buildroot] [PATCH 1/1] package/xz: bump version to 5.4.6 Message-ID: <20240213020420.1339668-1-kadambini.nema@gmail.com> Change Log - https://github.com/tukaani-project/xz/commit/0ef8192e8d5af4e6200d5d4aee22d1f177f7a2df Updated hash of the COPYING. Signed-off-by: Kadambini Nema --- package/xz/xz.hash | 6 +++--- package/xz/xz.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3d93ad6b5e..e8025a8065 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,9 +1,9 @@ # Locally calculated after checking pgp signature -# https://tukaani.org/xz/xz-5.4.5.tar.bz2.sig -sha256 8ccf5fff868c006f29522e386fb4c6a1b66463fbca65a4cfc3c4bd596e895e79 xz-5.4.5.tar.bz2 +# https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.bz2.sig +sha256 913851b274e8e1d31781ec949f1c23e8dbcf0ecf6e73a2436dc21769dd3e6f49 xz-5.4.6.tar.bz2 # Hash for license files -sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING +sha256 29a1e305b2e34eefe5d4602d00cde1d528b71c5d9f2eec5106972cf6ddb6f73f COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING.GPLv3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 547959c743..40fa59ca7c 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,9 +4,9 @@ # ################################################################################ -XZ_VERSION = 5.4.5 +XZ_VERSION = 5.4.6 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 -XZ_SITE = https://tukaani.org/xz +XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ -- 2.25.1 From kadambini.nema at gmail.com Tue Feb 13 02:17:44 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 12 Feb 2024 18:17:44 -0800 Subject: [Buildroot] [PATCH 1/1] package/zlib-ng: bump version to 2.1.6 Message-ID: <20240213021745.1350798-1-kadambini.nema@gmail.com> Signed-off-by: Kadambini Nema --- package/zlib-ng/zlib-ng.hash | 2 +- package/zlib-ng/zlib-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index a2fe98435c..908164aa60 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d20e55f89d71991c59f1c5ad1ef944815e5850526c0d9cd8e504eaed5b24491a zlib-ng-2.1.3.tar.gz +sha256 a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2 zlib-ng-2.1.6.tar.gz sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index fbb906503a..2fb6ea763f 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLIB_NG_VERSION = 2.1.3 +ZLIB_NG_VERSION = 2.1.6 ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md -- 2.25.1 From kadambini.nema at gmail.com Tue Feb 13 04:42:19 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 12 Feb 2024 20:42:19 -0800 Subject: [Buildroot] [PATCH 1/1] package/hwdata: bump version to 0.379 Message-ID: <20240213044219.1368954-1-kadambini.nema@gmail.com> Signed-off-by: Kadambini Nema --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 6915e04e46..92b7eaab6d 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0db28dc635d5059ad23d068d2e56ef5dc540f95bc813ea5a3c0f5d63b03d20d6 hwdata-0.373.tar.gz +sha256 b98ef646d530d5fd3afa3180efbf7c8e22d3da0088f5836f41ee25380d87b092 hwdata-0.379.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 025f5b4969..555fb58f14 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.373 +HWDATA_VERSION = 0.379 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE -- 2.25.1 From kadambini.nema at gmail.com Tue Feb 13 05:01:06 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 12 Feb 2024 21:01:06 -0800 Subject: [Buildroot] [PATCH 1/1] board/freescale: Fix check-package warning Message-ID: <20240213050106.1371689-1-kadambini.nema@gmail.com> $ utils/docker-run make check-package board/freescale/imx93evk/patches/linux-headers/linux-headers.hash:3: empty line at end of file board/freescale/imx93evk/patches/linux/linux.hash:3: empty line at end of file 402624 lines processed 2 warnings generated make: *** [Makefile:1248: check-package] Error 1 Signed-off-by: Kadambini Nema --- board/freescale/imx93evk/patches/linux/linux.hash | 1 - 1 file changed, 1 deletion(-) diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash index 5687ec7343..715a590825 100644 --- a/board/freescale/imx93evk/patches/linux/linux.hash +++ b/board/freescale/imx93evk/patches/linux/linux.hash @@ -1,3 +1,2 @@ # Locally calculated sha256 eb94414f952444289c0af8ad82afa0dc2d07e08f9000ccd2cc39f11da5b494ea linux-imx-lf-6.1.55-2.2.0.tar.gz - -- 2.25.1 From arnout at mind.be Tue Feb 13 08:23:17 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 13 Feb 2024 09:23:17 +0100 Subject: [Buildroot] [PATCH v2] package/environment-setup: add variable KERNEL_DIR alongside KERNELDIR In-Reply-To: <20240212225953.79488771@windsurf> References: <20240131-kernel_dir-v2-1-555eeeee1722@microchip.com> <20240212225953.79488771@windsurf> Message-ID: On 12/02/2024 22:59, Thomas Petazzoni wrote: > Hello Nayab, > > On Wed, 31 Jan 2024 23:48:28 +0530 > Nayab Sayed via buildroot wrote: > >> Update host environment setup helper script to incorporate the variable >> KENREL_DIR alongside the existing KERNELDIR. This adjustment ensures >> consistency, as some projects utilize KERNELDIR while others use KERNEL_DIR. >> >> Signed-off-by: Nayab Sayed > > Thanks for this new iteration, but on my side, I'm tempted to reject > this patch, and actually to remove the support for KERNELDIR as well. > > Indeed, even Angelo, who added the environment-setup script was not > able to provide a solid reason for exporting KERNELDIR in the first > place. I don't think there is any standard, or somewhat standard > variable to point to the Linux kernel source directory. > > I'm fine with environment-setup exposing CC, LD, CFLAGS, LDFLAGS, or > even CROSS_COMPILE as these are reasonably standardized by various > build systems. But KERNELDIR or KERNEL_DIR are not, and the simple fact > that both would be needed/useful is a clear hint of that. The whole > thing I didn't like in the first place with environment-setup is the > fact that it exports a mixed bag of somewhat random environment > variables, and exposing both KERNELDIR and KERNEL_DIR clearly goes > further into this direction in my opinion. Well, without an exported KERNELDIR, it will be very hard to build kernel modules outside of buildroot (and the whole point of this environment-setup thing is to make it easier to build stuff outside of buildroot). Indeed, output/build/linux-* will match stuff like linux-pam as well. That said, I agree that exporting both KERNELDIR and KERNEL_DIR sounds a bit over the top. Regards, Arnout From buildroot at bubu1.eu Tue Feb 13 09:40:15 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 10:40:15 +0100 Subject: [Buildroot] [PATCH v2] package/python-jc: new package Message-ID: <20240213094015.2203982-1-buildroot@bubu1.eu> All dependencies are optional, and thus only mentioned in the package help text. Signed-off-by: Marcus Hoffmann --- Changes v1 -> v2: - update to 1.25.1 - xmltodict and python xml module are now optional dependencies - rename test class to conform to naming scheme --- package/Config.in | 1 + package/python-jc/Config.in | 12 ++++++++++ package/python-jc/python-jc.hash | 5 +++++ package/python-jc/python-jc.mk | 14 ++++++++++++ .../testing/tests/package/test_python_jc.py | 22 +++++++++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 package/python-jc/Config.in create mode 100644 package/python-jc/python-jc.hash create mode 100644 package/python-jc/python-jc.mk create mode 100644 support/testing/tests/package/test_python_jc.py diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..7f4d0740ac 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1151,6 +1151,7 @@ menu "External python modules" source "package/python-janus/Config.in" source "package/python-jaraco-classes/Config.in" source "package/python-jaraco-functools/Config.in" + source "package/python-jc/Config.in" source "package/python-jedi/Config.in" source "package/python-jeepney/Config.in" source "package/python-jinja2/Config.in" diff --git a/package/python-jc/Config.in b/package/python-jc/Config.in new file mode 100644 index 0000000000..b88150e069 --- /dev/null +++ b/package/python-jc/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_JC + bool "python-jc" + help + Converts the output of popular command-line tools and file- + types to JSON. + + Optionally requires python-pygments for syntax highlighting, + python-ruamel-yaml for yaml parsing and output and + python-xmltodict for xml parsing. PYTHON3_PYEXPAT is required + for xml and plist parsers. + + https://github.com/kellyjonbrazil/jc diff --git a/package/python-jc/python-jc.hash b/package/python-jc/python-jc.hash new file mode 100644 index 0000000000..f54e69eaeb --- /dev/null +++ b/package/python-jc/python-jc.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jc/json +md5 80e4c7d46ec856255577c6b364e7f931 jc-1.25.1.tar.gz +sha256 683352e903ece9a86eae0c3232188e40178139e710c740a466ef91ed87c4cc7e jc-1.25.1.tar.gz +# Locally computed sha256 checksums +sha256 6493f2db400f4166ca0956cf192a41aa092bd1396ff463e7fdaf51f257c10497 LICENSE.md diff --git a/package/python-jc/python-jc.mk b/package/python-jc/python-jc.mk new file mode 100644 index 0000000000..bb5bd426ec --- /dev/null +++ b/package/python-jc/python-jc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jc +# +################################################################################ + +PYTHON_JC_VERSION = 1.25.1 +PYTHON_JC_SOURCE = jc-$(PYTHON_JC_VERSION).tar.gz +PYTHON_JC_SITE = https://files.pythonhosted.org/packages/53/a6/065f0796a0a21bc040bc88c8a33410c12729a2a6f4c269d0349f685796da +PYTHON_JC_SETUP_TYPE = setuptools +PYTHON_JC_LICENSE = MIT +PYTHON_JC_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_jc.py b/support/testing/tests/package/test_python_jc.py new file mode 100644 index 0000000000..974ce0c4b0 --- /dev/null +++ b/support/testing/tests/package/test_python_jc.py @@ -0,0 +1,22 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Jc(TestPythonPackageBase): + __test__ = True + # We deliberately run the test without the optional dependencies, + # as this configuration is less tested upstream. + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_JC=y + """ + timeout = 60 + + def test_run(self): + self.login() + cmd = "jc -h > /dev/null 2>&1" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc id | grep -q root" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc env | grep -q PATH" + self.assertRunOk(cmd, self.timeout) -- 2.34.1 From sebastien.szymanski at armadeus.com Tue Feb 13 10:09:48 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Tue, 13 Feb 2024 11:09:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/freescale-imx/firmware-ele-imx: fix dependency comment condition Message-ID: <20240213100948.5264-1-sebastien.szymanski@armadeus.com> The dependency comment must be shown when the platform has no ELE and not when the platform has no VPU. Fixes: 69d127fe29dc ("package/freescale-imx/firmware-ele-imx: new package") Signed-off-by: S?bastien Szymanski --- package/freescale-imx/firmware-ele-imx/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in index 241ad3942d65..a99cbc3392c2 100644 --- a/package/freescale-imx/firmware-ele-imx/Config.in +++ b/package/freescale-imx/firmware-ele-imx/Config.in @@ -1,5 +1,5 @@ comment "firmware-ele-imx needs an i.MX platform with EdgeLock Secure Enclave" - depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_ELE config BR2_PACKAGE_FIRMWARE_ELE_IMX bool "firmware-ele-imx" -- 2.43.0 From buildroot at bubu1.eu Tue Feb 13 10:58:40 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 11:58:40 +0100 Subject: [Buildroot] [PATCH] package/rauc: bump to 1.11.1 Message-ID: <20240213105841.2410425-1-buildroot@bubu1.eu> This fixes an incompatibility with openssl 3.2 when using codesign certificate purpose [1]. [1] https://github.com/rauc/rauc/releases/tag/v1.11.1 Signed-off-by: Marcus Hoffmann --- package/rauc/rauc.hash | 2 +- package/rauc/rauc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 8de309f8c7..63aa4715e0 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a28f415c580390dd9e65016a5d90a63ee1cfd7e1b3e864cbb13cb3ac3513391f rauc-1.11.tar.xz +sha256 391d13d709abb630c459e79e62e474e68224c5d07c816355784bba75a86a2507 rauc-1.11.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index aff5ead281..fbdea4e235 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.11 +RAUC_VERSION = 1.11.1 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 -- 2.34.1 From buildroot at bubu1.eu Tue Feb 13 11:49:31 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 12:49:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/tio: install bash-completions Message-ID: <20240213114933.2444440-1-buildroot@bubu1.eu> See meson_options.txt file [1]. [1] https://github.com/tio/tio/blob/master/meson_options.txt Signed-off-by: Marcus Hoffmann --- package/tio/tio.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/tio/tio.mk b/package/tio/tio.mk index d7b554ee84..a7d3537850 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -10,5 +10,10 @@ TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ TIO_LICENSE_FILES = LICENSE TIO_DEPENDENCIES = inih +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +TIO_CONF_OPTS +=-Dbashcompletiondir=/usr/share/bash-completion/completions/ +else +TIO_CONF_OPTS +=-Dbashcompletiondir=no +endif $(eval $(meson-package)) -- 2.34.1 From buildroot at bubu1.eu Tue Feb 13 11:49:32 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 12:49:32 +0100 Subject: [Buildroot] [PATCH 2/2] package/tio: disable installing man page In-Reply-To: <20240213114933.2444440-1-buildroot@bubu1.eu> References: <20240213114933.2444440-1-buildroot@bubu1.eu> Message-ID: <20240213114933.2444440-2-buildroot@bubu1.eu> Remove the man subdir from inclusion in the main meson.build file. Reported upstream to get an option to disable this properly: https://github.com/tio/tio/issues/222 Signed-off-by: Marcus Hoffmann --- package/tio/tio.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tio/tio.mk b/package/tio/tio.mk index a7d3537850..66ce69db2f 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -16,4 +16,10 @@ else TIO_CONF_OPTS +=-Dbashcompletiondir=no endif +define TIO_DISABLE_BUILDING_MAN_PAGE + sed -i -e "/subdir('man')/d" $(@D)/meson.build +endef + +TIO_POST_PATCH_HOOKS += TIO_DISABLE_BUILDING_MAN_PAGE + $(eval $(meson-package)) -- 2.34.1 From buildroot at bubu1.eu Tue Feb 13 12:04:51 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 13:04:51 +0100 Subject: [Buildroot] [PATCH] package/nethogs: new package Message-ID: <20240213120452.2465425-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/nethogs/Config.in | 10 ++++++++++ package/nethogs/nethogs.hash | 3 +++ package/nethogs/nethogs.mk | 21 +++++++++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 package/nethogs/Config.in create mode 100644 package/nethogs/nethogs.hash create mode 100644 package/nethogs/nethogs.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..2d352dd8cc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2476,6 +2476,7 @@ endif source "package/ndisc6/Config.in" source "package/net-tools/Config.in" source "package/netatalk/Config.in" + source "package/nethogs/Config.in" source "package/netcalc/Config.in" source "package/netcat/Config.in" source "package/netcat-openbsd/Config.in" diff --git a/package/nethogs/Config.in b/package/nethogs/Config.in new file mode 100644 index 0000000000..2d6b44739c --- /dev/null +++ b/package/nethogs/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_NETHOGS + bool "nethogs" + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_NCURSES + help + NetHogs is a small 'net top' tool. Instead of breaking the + traffic down per protocol or per subnet, like most tools + do, it groups bandwidth by process. + + https://github.com/raboof/nethogs diff --git a/package/nethogs/nethogs.hash b/package/nethogs/nethogs.hash new file mode 100644 index 0000000000..fd1f236250 --- /dev/null +++ b/package/nethogs/nethogs.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 957d6afcc220dfbba44c819162f44818051c5b4fb793c47ba98294393986617d nethogs-0.8.7.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nethogs/nethogs.mk b/package/nethogs/nethogs.mk new file mode 100644 index 0000000000..69dabda191 --- /dev/null +++ b/package/nethogs/nethogs.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# nethogs +# +################################################################################ + +NETHOGS_VERSION = 0.8.7 +NETHOGS_SITE = $(call github,raboof,nethogs,v$(NETHOGS_VERSION)) +NETHOGS_LICENSE = GPL-2.0 +NETHOGS_LICENSE_FILES = COPYING +NETHOGS_DEPENDENCIES = libpcap ncurses + +define NETHOGS_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) nethogs +endef + +define NETHOGS_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/src/nethogs $(TARGET_DIR)/usr/sbin +endef + +$(eval $(generic-package)) -- 2.34.1 From sen at hastings.org Tue Feb 13 12:07:14 2024 From: sen at hastings.org (Sen Hastings) Date: Tue, 13 Feb 2024 12:07:14 +0000 Subject: [Buildroot] [PATCH 1/1] support/scripts/pkg-stats: make current version cell scrollable Message-ID: <20240213120714.393026-1-sen@hastings.org> *Resubmitted to mailing list because I messed up the subject line.* I realized that instead of truncating the version number, we could simply make the cell horizontally scrollable. This of course allows us to have a fixed cell width, while preserving the full version number. A demo is available here: https://sen-h.codeberg.page/pkg-stats-demos/@pages/make-current-version-cell-scrollable.html Signed-off-by: Sen Hastings --- support/scripts/pkg-stats | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7835cb3d62..9307992d29 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -845,6 +845,13 @@ function expandField(fieldId){ .centered { text-align: center; } + + .current_version { + overflow: scroll; + width: 21ch; + padding: 10px 2px 10px 2px; + } + .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { background: #d2ffc4; } @@ -964,10 +971,7 @@ def dump_html_pkg(f, pkg): # Current version data_field_id = f'current_version__{pkg_css_class}' - if len(pkg.current_version) > 20: - current_version = pkg.current_version[:20] + "..." - else: - current_version = pkg.current_version + current_version = pkg.current_version f.write(f'
{current_version}
\n') -- 2.25.1 From buildroot at bubu1.eu Tue Feb 13 12:09:59 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 13:09:59 +0100 Subject: [Buildroot] [PATCH] package/nethogs: new package In-Reply-To: <20240213120452.2465425-1-buildroot@bubu1.eu> References: <20240213120452.2465425-1-buildroot@bubu1.eu> Message-ID: <5b2f5482-d1e5-481f-80a1-ddce036c84d4@bubu1.eu> On 13.02.24 13:04, Marcus Hoffmann via buildroot wrote: > Signed-off-by: Marcus Hoffmann > --- > package/Config.in | 1 + > package/nethogs/Config.in | 10 ++++++++++ > package/nethogs/nethogs.hash | 3 +++ > package/nethogs/nethogs.mk | 21 +++++++++++++++++++++ > 4 files changed, 35 insertions(+) > create mode 100644 package/nethogs/Config.in > create mode 100644 package/nethogs/nethogs.hash > create mode 100644 package/nethogs/nethogs.mk > > diff --git a/package/Config.in b/package/Config.in > index bf0fe078b9..2d352dd8cc 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2476,6 +2476,7 @@ endif > source "package/ndisc6/Config.in" > source "package/net-tools/Config.in" > source "package/netatalk/Config.in" > + source "package/nethogs/Config.in" Oops, that is not quite alphabetically sorted here... > source "package/netcalc/Config.in" > source "package/netcat/Config.in" > source "package/netcat-openbsd/Config.in" > diff --git a/package/nethogs/Config.in b/package/nethogs/Config.in > new file mode 100644 > index 0000000000..2d6b44739c > --- /dev/null > +++ b/package/nethogs/Config.in > @@ -0,0 +1,10 @@ > +config BR2_PACKAGE_NETHOGS > + bool "nethogs" > + select BR2_PACKAGE_LIBPCAP > + select BR2_PACKAGE_NCURSES > + help > + NetHogs is a small 'net top' tool. Instead of breaking the > + traffic down per protocol or per subnet, like most tools > + do, it groups bandwidth by process. > + > + https://github.com/raboof/nethogs > diff --git a/package/nethogs/nethogs.hash b/package/nethogs/nethogs.hash > new file mode 100644 > index 0000000000..fd1f236250 > --- /dev/null > +++ b/package/nethogs/nethogs.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 957d6afcc220dfbba44c819162f44818051c5b4fb793c47ba98294393986617d nethogs-0.8.7.tar.gz > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/nethogs/nethogs.mk b/package/nethogs/nethogs.mk > new file mode 100644 > index 0000000000..69dabda191 > --- /dev/null > +++ b/package/nethogs/nethogs.mk > @@ -0,0 +1,21 @@ > +################################################################################ > +# > +# nethogs > +# > +################################################################################ > + > +NETHOGS_VERSION = 0.8.7 > +NETHOGS_SITE = $(call github,raboof,nethogs,v$(NETHOGS_VERSION)) > +NETHOGS_LICENSE = GPL-2.0 > +NETHOGS_LICENSE_FILES = COPYING > +NETHOGS_DEPENDENCIES = libpcap ncurses > + > +define NETHOGS_BUILD_CMDS > + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) nethogs > +endef > + > +define NETHOGS_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/src/nethogs $(TARGET_DIR)/usr/sbin > +endef > + > +$(eval $(generic-package)) From sen at hastings.org Tue Feb 13 11:59:14 2024 From: sen at hastings.org (Sen Hastings) Date: Tue, 13 Feb 2024 11:59:14 +0000 Subject: [Buildroot] [PATCH 1/1] make current version cell scrollable Message-ID: <20240213115914.392552-1-sen@hastings.org> I realized that instead of truncating the version number, we could simply make the cell horizontally scrollable. This of course allows us to have a fixed cell width, while preserving the full version number. A demo is available here: https://sen-h.codeberg.page/pkg-stats-demos/@pages/make-current-version-cell-scrollable.html Signed-off-by: Sen Hastings --- support/scripts/pkg-stats | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7835cb3d62..9307992d29 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -845,6 +845,13 @@ function expandField(fieldId){ .centered { text-align: center; } + + .current_version { + overflow: scroll; + width: 21ch; + padding: 10px 2px 10px 2px; + } + .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { background: #d2ffc4; } @@ -964,10 +971,7 @@ def dump_html_pkg(f, pkg): # Current version data_field_id = f'current_version__{pkg_css_class}' - if len(pkg.current_version) > 20: - current_version = pkg.current_version[:20] + "..." - else: - current_version = pkg.current_version + current_version = pkg.current_version f.write(f'
{current_version}
\n') -- 2.25.1 From buildroot at bubu1.eu Tue Feb 13 12:37:52 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 13:37:52 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-can/Config.in: sort selects Message-ID: <20240213123753.2471309-1-buildroot@bubu1.eu> Sort python builtin modules before external python libs. Signed-off-by: Marcus Hoffmann --- package/python-can/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index a00c9263cf..61955a2b00 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" select BR2_PACKAGE_PYTHON3_SQLITE # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime - select BR2_PACKAGE_PYTHON3_ZLIB help This module provides controller area network support for Python. -- 2.34.1 From buildroot at bubu1.eu Tue Feb 13 12:37:53 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 13:37:53 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-can: needs PYTHON3_CURSES In-Reply-To: <20240213123753.2471309-1-buildroot@bubu1.eu> References: <20240213123753.2471309-1-buildroot@bubu1.eu> Message-ID: <20240213123753.2471309-2-buildroot@bubu1.eu> The can.viewer tool requires curses support. [1] [1] https://github.com/hardbyte/python-can/blob/v4.3.1/can/viewer.py#L44-L53 Signed-off-by: Marcus Hoffmann --- package/python-can/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 61955a2b00..106da4560c 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" + select BR2_PACKAGE_PYTHON3_CURSES # runtime for can.viewer tool select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime -- 2.34.1 From ju.o at free.fr Tue Feb 13 13:04:44 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 13 Feb 2024 14:04:44 +0100 Subject: [Buildroot] [PATCH 1/1] board/freescale: imx9-bootloader-prepare.sh: fix script Message-ID: <20240213130444.12586-1-ju.o@free.fr> Commit c05f27c "configs/freescale_imx93evk: new defconfig", when applied, added few ShellCheck fixups on top of the orginial submission. During those changes, one extra backslash was added, making the imx9-bootloader-prepare.sh fail. This commit fixes the issue by removing this extra backslash. Fixes: dd: failed to open '/buildroot/output/images/u-boot-atf-container.img': No such file or directory make: *** [Makefile:820: target-post-image] Error 1 Signed-off-by: Julien Olivain --- board/freescale/common/imx/imx9-bootloader-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh index a9611a81bd..8ab5a241b0 100755 --- a/board/freescale/common/imx/imx9-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh @@ -21,7 +21,7 @@ main () -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ - -out "${BINARIES_DIR}/u-boot-atf-container.img" \ + -out "${BINARIES_DIR}/u-boot-atf-container.img" else "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ -- 2.43.0 From buildroot at bubu1.eu Tue Feb 13 13:13:26 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 14:13:26 +0100 Subject: [Buildroot] [PATCH] package/nodejs: bump to version v20.11.0 Message-ID: <20240213131327.2823205-1-buildroot@bubu1.eu> LICENSE hash changed due to two things: * c-ares vendored dependency license got updated [1]. This is unused by buildroot though anyway * base64 vendored library license updated copyright years and sorted contributor names [2], [3] [1] https://github.com/c-ares/c-ares/pull/556 [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b Signed-off-by: Marcus Hoffmann --- package/nodejs/nodejs.hash | 12 ++++++------ package/nodejs/nodejs.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2d60437a7c..86bc86e73a 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ # From https://nodejs.org/dist/v20.9.0/SHASUMS256.txt.asc -sha256 ced3ecece4b7c3a664bca3d9e34a0e3b9a31078525283a6fdb7ea2de8ca5683b node-v20.9.0-linux-arm64.tar.xz -sha256 64099d7e62bdbb8efd52c216a6759b3cdd77c38aa993096fdee9f875d95b2d8e node-v20.9.0-linux-armv7l.tar.xz -sha256 3c6cea5d614cfbb95d92de43fbc2f8ecd66e431502fe5efc4f3c02637897bd45 node-v20.9.0-linux-ppc64le.tar.xz -sha256 9033989810bf86220ae46b1381bdcdc6c83a0294869ba2ad39e1061f1e69217a node-v20.9.0-linux-x64.tar.xz -sha256 a23d96810abf0455426b349d47ce5310f33095b7bc0571b9cc510f481c3a4519 node-v20.9.0.tar.xz +sha256 f6df68c6793244071f69023a9b43a0cf0b13d65cbe86d55925c28e4134d9aafb node-v20.11.0-linux-arm64.tar.xz +sha256 f943abd348d2b8ff8754ca912c118a20301eb6a0014cc4cdea86cff021fde8e6 node-v20.11.0-linux-armv7l.tar.xz +sha256 6a0e1fa23d7bc707711bbc36159b4220eca123e13435d266d690c6b6c443dc67 node-v20.11.0-linux-ppc64le.tar.xz +sha256 822780369d0ea309e7d218e41debbd1a03f8cdf354ebf8a4420e89f39cc2e612 node-v20.11.0-linux-x64.tar.xz +sha256 31807ebeeeb049c53f1765e4a95aed69476a4b696dd100cb539ab668d7950b40 node-v20.11.0.tar.xz # Locally calculated -sha256 93ac846282ce6c5255e00fada2fd2e7e292255239fe58d5502b0a554859e6a3e LICENSE +sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9806a64d38..e70c39f803 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.9.0 +NODEJS_COMMON_VERSION = 20.11.0 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) -- 2.34.1 From sebastien.szymanski at armadeus.com Tue Feb 13 14:02:57 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Tue, 13 Feb 2024 15:02:57 +0100 Subject: [Buildroot] [PATCH 1/1] board/freescale: imx9-bootloader-prepare.sh: fix script In-Reply-To: <20240213130444.12586-1-ju.o@free.fr> References: <20240213130444.12586-1-ju.o@free.fr> Message-ID: Hi Julien, all, On 2/13/24 14:04, Julien Olivain wrote: > Commit c05f27c "configs/freescale_imx93evk: new defconfig", when > applied, added few ShellCheck fixups on top of the orginial > submission. During those changes, one extra backslash was added, > making the imx9-bootloader-prepare.sh fail. > > This commit fixes the issue by removing this extra backslash. > > Fixes: > > dd: failed to open '/buildroot/output/images/u-boot-atf-container.img': No such file or directory > make: *** [Makefile:820: target-post-image] Error 1 > > Signed-off-by: Julien Olivain > --- Reviewed-by: S?bastien Szymanski Tested-By: S?bastien Szymanski Regards, > board/freescale/common/imx/imx9-bootloader-prepare.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh > index a9611a81bd..8ab5a241b0 100755 > --- a/board/freescale/common/imx/imx9-bootloader-prepare.sh > +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh > @@ -21,7 +21,7 @@ main () > -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ > -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ > -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ > - -out "${BINARIES_DIR}/u-boot-atf-container.img" \ > + -out "${BINARIES_DIR}/u-boot-atf-container.img" > else > "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ > -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ -- S?bastien Szymanski, Armadeus Systems Software engineer From yegorslists at googlemail.com Tue Feb 13 14:30:25 2024 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Tue, 13 Feb 2024 15:30:25 +0100 Subject: [Buildroot] [PATCH v2] Create a .gitignore file in the CANONICAL_O directory Message-ID: <20240213143025.274988-1-yegorslists@googlemail.com> From: Yegor Yefremov This .gitignore file ignores all files in an output directory and hence doesn't change the git status. The .gitignore file will be only created if $(O) is a subfolder of $(TOPDIR). Remove "/output" entry from the main .gitignore file as it is already handled by this general approach. Signed-off-by: Yegor Yefremov --- Changes v1 -> v2: - create .gitignore only if $(O) is a subfolder of $(TOPDIR) (Yann E. MORIN) .gitignore | 1 - Makefile | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bb02d9f572..14b7ca5040 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/output /dl /.auto.deps /.config.cmd diff --git a/Makefile b/Makefile index ac625152c6..71764ce1fa 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,13 @@ endif CANONICAL_CURDIR = $(realpath $(CURDIR)) +# Create a default .gitignore file that ignores everything and doesn't make git +# repository "dirty". Perform this action only if $(O) is a subfolder of +# $(TOPDIR). +ifeq ($(realpath $(dir $(CANONICAL_O))),$(CANONICAL_CURDIR)) +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") +endif + REQ_UMASK = 0022 # Make sure O= is passed (with its absolute canonical path) everywhere the -- 2.34.1 From arbab at linux.ibm.com Tue Feb 13 15:20:05 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Tue, 13 Feb 2024 09:20:05 -0600 Subject: [Buildroot] [PATCH] package/petitboot: bump to version 1.15 Message-ID: <20240213152005.83369-1-arbab@linux.ibm.com> This fixes an issue where the pb-console helper was not properly silencing kernel log messages printed to the console. https://github.com/open-power/petitboot/releases/tag/v1.15 Signed-off-by: Reza Arbab --- package/petitboot/petitboot.hash | 2 +- package/petitboot/petitboot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash index a9a21f2c1b69..3a90bc529672 100644 --- a/package/petitboot/petitboot.hash +++ b/package/petitboot/petitboot.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fa2367370d3ce5dd9910ab08a0832071e2508c8bf75cfec6d3b9807fbefc507a petitboot-v1.14.tar.gz +sha256 eed29ec841c2bcd5ecc65347f5b95a0087a541bd9c04ca3c17c55d1f7357d189 petitboot-v1.15.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 2f1e459dd3fa..a74992377131 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -4,7 +4,7 @@ # ################################################################################ -PETITBOOT_VERSION = 1.14 +PETITBOOT_VERSION = 1.15 PETITBOOT_SOURCE = petitboot-v$(PETITBOOT_VERSION).tar.gz PETITBOOT_SITE = https://github.com/open-power/petitboot/releases/download/v$(PETITBOOT_VERSION) PETITBOOT_DEPENDENCIES = \ -- 2.39.3 From michael at walle.cc Tue Feb 13 15:48:47 2024 From: michael at walle.cc (Michael Walle) Date: Tue, 13 Feb 2024 16:48:47 +0100 Subject: [Buildroot] [PATCH] linux: add support for device tree overlays Message-ID: <20240213154847.914068-1-michael@walle.cc> The linux kernel can build device tree overlays (.dtbo) itself. Add support to build and copy them along with the actual device trees. These can either be in-tree device tree overlays (BR2_LINUX_KERNEL_INTREE_DTBOS) or they can be provided outside of the kernel (BR2_LINUX_KERNEL_CUSTOM_DTS_PATH). In the latter case, the overlay source files will be copied into the kernel tree first. Signed-off-by: Michael Walle --- Alternatively, one could make BR2_LINUX_KERNEL_INTREE_DTS_NAME similar to BR2_LINUX_KERNEL_CUSTOM_DTS_PATH and provide a list of dts and dtso files. But that would mean deprecating BR2_LINUX_KERNEL_INTREE_DTS_NAME and touch all defconfigs to rename that option and append the ".dts" suffix. I'm not sure what's better here. --- linux/Config.in | 14 +++++++++++--- linux/linux.mk | 8 ++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 773cb4fbb5..486a2144e3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -411,12 +411,20 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME the trailing .dts. You can provide a list of dts files to build, separated by spaces. +config BR2_LINUX_KERNEL_INTREE_DTBOS + string "In-tree Device Tree Overlay file names" + help + Names of in-tree device tree overlay files (.dtbo) which + should be built and installed into the target system, + separated by spaces. + config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH string "Out-of-tree Device Tree Source file paths" help - Paths to out-of-tree Device Tree Source (.dts) and Device Tree - Source Include (.dtsi) files, separated by spaces. These files - will be copied to the kernel sources and the .dts files will + Paths to out-of-tree Device Tree Source (.dts), Device Tree + Source Include (.dtsi) and Device Tree Overlay Source (.dtso) + files, separated by spaces. These files will be copied to the + kernel sources and the .dts files will be compiled from there. config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME diff --git a/linux/linux.mk b/linux/linux.mk index 53e2ad6d48..de6c5bd602 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -190,14 +190,18 @@ endif LINUX_VERSION_PROBED = `MAKEFLAGS='$(filter-out w,$(MAKEFLAGS))' $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) +LINUX_DTBOS += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTBOS)) # We keep only the .dts files, so that the user can specify both .dts # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be # copied to arch//boot/dts, but only the .dts files will # actually be generated as .dtb. -LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) +LINUX_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) +LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(LINUX_CUSTOM_DTS_PATH)))) +LINUX_DTBOS += $(addsuffix .dtbo,$(basename $(filter %.dtso,$(notdir $(LINUX_CUSTOM_DTS_PATH))))) +$(error $(LINUX_CUSTOM_DTS_PATH)) -LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME)) +LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME)) $(LINUX_DTBOS) ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y) LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME)) -- 2.39.2 From romain.naour at smile.fr Tue Feb 13 16:43:30 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 17:43:30 +0100 Subject: [Buildroot] [PATCH v3 02/11] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-3-dario.binacchi@amarulasolutions.com> <3d674bd1-a53f-4f82-93c1-58cbe14ab1db@smile.fr> Message-ID: <626bdd42-18ae-4d6a-90d8-b7c9b84bf966@smile.fr> Hello Dario, Le 09/02/2024 ? 14:58, Dario Binacchi a ?crit?: > Hi Romain, All > > On Wed, Feb 7, 2024 at 11:04?AM Romain Naour wrote: >> >> Hello Dario, All, >> >> Le 06/02/2024 ? 18:50, Romain Naour a ?crit : >>> Hello Dario, >>> >>> Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit : >>>> The patch sets the configurations required by TI HS systems. Some of these >>>> configurations (i. e. HS SYSFW image signing key, HS Software Revision) >>>> are provided by the ti-k3-core-secdev package in the binaries directory. >>> >>> AFAIK the ti-k3-image-gen tool is deprecated and must be replaced by binman tool >>> provided by upstream u-boot. >>> >>> Is all k3 SoC migrated to binman in the latest u-boot release 2024.01? >>> >>> See the FOSDEM talk: >>> >>> https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/21919/FOSDEM24_Speaker_Slides_y7FsIKM.pdf >>> >>> Best regards, >>> Romain >>> >>> >>>> >>>> Signed-off-by: Dario Binacchi >>>> --- >>>> boot/ti-k3-image-gen/Config.in | 1 + >>>> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- >>>> 2 files changed, 15 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in >>>> index d76cef82e911..38d1598d9fc0 100644 >>>> --- a/boot/ti-k3-image-gen/Config.in >>>> +++ b/boot/ti-k3-image-gen/Config.in >>>> @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >>>> bool "ti-k3-image-gen" >>>> depends on BR2_TARGET_TI_K3_R5_LOADER >>>> select BR2_TARGET_TI_K3_BOOT_FIRMWARE >>>> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >> >> Does it means that currently TI HS configuration are missing the >> ti-k3-core-secdev tool to build properly? > > Yes, you are right. Currently, the compilation with > BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS enabled is broken: > > ./tools/k3_gen_x509_cert.sh -c 16 -b spl/u-boot-spl.bin \ > -o tiboot3.bin -l 0x43c00000 -r 1 -k "" > SWRV = 1 >>>> ti-k3-r5-loader 2022.10 Installing to target >>>> ti-k3-r5-loader 2022.10 Installing to images directory > cp /home/dario/projects/buildroot/output/build/ti-k3-r5-loader-2022.10/spl/u-boot-spl.bin > /home/dario/projects/buildroot/output/images/r5-u-boot-spl.bin > k3-image-gen-08.06.00.007.tar.gz: OK (sha256: > f89ea4b1f5c992455b1a682fde48359221b53f3294135df4bf20feea6aea90e4) >>>> ti-k3-image-gen 08.06.00.007 Extracting > gzip -d -c /home/dario/projects/buildroot/dl/ti-k3-image-gen/k3-image-gen-08.06.00.007.tar.gz > | tar --strip-components=1 -C > /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007 > -xf - >>>> ti-k3-image-gen 08.06.00.007 Patching >>>> ti-k3-image-gen 08.06.00.007 Configuring > cp /home/dario/projects/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin > /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007 > cp: cannot stat > '/home/dario/projects/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin': > No such file or directory > make[1]: *** [package/pkg-generic.mk:273: > /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007/.stamp_configured] > Error 1 > make: *** [Makefile:82: _all] Error 2 > > What do you think if, for this series, I fix the compilation issue for > HS configurations by continuing to use the `ti-k3-image-gen` package, > and then > once the series is merged, I try and test the the bump of u-boot to > version 2024.01 to see if it is indeed possible to do without > `ti-k3-image-gen`? > Meanwhile, let's at least fix this problem immediately. I'm working on the SK-TDA4VM (j721e) and I'm able to boot this board with uboot 2024.01 without ti-k3-image-gen. I'll post a v4 including binman support with some improvement regarding host-python modules dependencies. About existing am62 and am64 defconfigs, are you sure that optee-os platform is correct ? BR2_TARGET_OPTEE_OS_PLATFORM="k3" meta-ti define OPTEEMACHINE = "k3-am62x" instead (not "k3) I had a crash on the SK-TDA4VM due to the wrong platform and it worked as soone as I use OPTEEMACHINE = "k3-j721e". It would be great if you can do a runtime test on am62 and/or am64. Thanks to binman, I don't think core-secdev-k3 tool is required for HS devices. Best regards, Romain > > Thanks and regards, > Dario > >> >> It seems this patch should fixes them. >> >> Best regards, >> Romain >> >>>> # We need FIT support in uboot-tools, which is why we select a >>>> # host package >>>> select BR2_PACKAGE_HOST_UBOOT_TOOLS >>>> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >>>> index 64be9a18f2c4..91aed63bab84 100644 >>>> --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk >>>> +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >>>> @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) >>>> TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) >>>> TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) >>>> >>>> -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >>>> +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) >>>> +TI_K3_IMAGE_GEN_SYSFW = \ >>>> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >>>> +else >>>> +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev >>>> + >>>> +TI_K3_IMAGE_GEN_SYSFW = \ >>>> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ >>>> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin >>>> +endif >>>> >>>> define TI_K3_IMAGE_GEN_CONFIGURE_CMDS >>>> - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) >>>> + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ >>>> + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ >>>> + ) >>>> endef >>>> >>>> define TI_K3_IMAGE_GEN_BUILD_CMDS >>>> @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS >>>> $(BR2_MAKE) -C $(@D) \ >>>> SOC=$(TI_K3_IMAGE_GEN_SOC) \ >>>> SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ >>>> + TI_SECURE_DEV_PKG=$(BINARIES_DIR) \ >>>> CONFIG=evm \ >>>> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ >>>> SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ >>> >> > > From yann.morin.1998 at free.fr Tue Feb 13 17:00:40 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 13 Feb 2024 18:00:40 +0100 Subject: [Buildroot] [PATCH v2] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: <20240213143025.274988-1-yegorslists@googlemail.com> References: <20240213143025.274988-1-yegorslists@googlemail.com> Message-ID: Yegor, All, On 2024-02-13 15:30 +0100, yegorslists at googlemail.com spake thusly: > From: Yegor Yefremov > This .gitignore file ignores all files in an output directory and > hence doesn't change the git status. > > The .gitignore file will be only created if $(O) is a subfolder of > $(TOPDIR). > > Remove "/output" entry from the main .gitignore file as it is already > handled by this general approach. > > Signed-off-by: Yegor Yefremov > --- [--SNIP--] > +# Create a default .gitignore file that ignores everything and doesn't make git > +# repository "dirty". Perform this action only if $(O) is a subfolder of s/subfolder/subdirectory/ > +# $(TOPDIR). > +ifeq ($(realpath $(dir $(CANONICAL_O))),$(CANONICAL_CURDIR)) This only accounts for direct sub-directory, i.e. $(TOPDIR)/foo, not $(TOPDIR)/project-42/board-27/debug which is arguably more interesting. What about: diff --git a/Makefile b/Makefile index ac625152c6..ba76949e6d 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,13 @@ endif CANONICAL_CURDIR = $(realpath $(CURDIR)) +# Create a default .gitignore file that ignores everything and doesn't make git +# repository "dirty". Perform this action only if $(O) is a subdirectory of +# $(CANONICAL_CURDIR) (aka TOPDIR, but it's only defined later). +ifeq ($(filter-out $(CANONICAL_CURDIR)/%,$(CANONICAL_O)),) +$(file >$(CANONICAL_O)/.gitignore,*) +endif + REQ_UMASK = 0022 # Make sure O= is passed (with its absolute canonical path) everywhere the This is quite simple, and accounts for arbitrarily-deep sub-directories. Note: since we work with the CANONICAL_* variants, we know they do not end with a '/' so even if the user calls O=/path/to/buildroot/ , we'd find that it is _not_ a subdirectory, and thuis we wil lnot overwrite our own .gitignore file. Regards, Yann E. MORIN. > +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") > +endif > + > REQ_UMASK = 0022 > > # Make sure O= is passed (with its absolute canonical path) everywhere the > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From david.picard at clermont.in2p3.fr Tue Feb 13 16:31:47 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Tue, 13 Feb 2024 17:31:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package Message-ID: <20240213163147.493265-1-david.picard@clermont.in2p3.fr> Add a package for the Intel/Altera SoC FPGA hardware library. It is used to let the HPS and the FPGA fabric communicate with each other. Signed-off-by: David Picard --- package/Config.in | 1 + package/intel-socfpga-hwlib/Config.in | 12 ++++++ .../intel-socfpga-hwlib.hash | 2 + .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/intel-socfpga-hwlib/Config.in create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..cd6c6bcaba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1736,6 +1736,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/intel-socfpga-hwlib/Config.in" source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/intel-socfpga-hwlib/Config.in b/package/intel-socfpga-hwlib/Config.in new file mode 100644 index 0000000000..ced6483a59 --- /dev/null +++ b/package/intel-socfpga-hwlib/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB + bool "intel-socfpga-hwlib" + depends on BR2_arm + help + This package provides the Intel SoC FPGA HWLIB for + Intel/Altera SoC FPGA chips. + This library allows to communicate with the FPGA fabric from + Linux, running on the HPS device. + The source code is not compiled. Instead, a symlink is added + to $(STAGING_DIR)/lib. + + https://github.com/altera-opensource/intel-socfpga-hwlib diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash new file mode 100644 index 0000000000..60efe9013e --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash @@ -0,0 +1,2 @@ +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 intel-socfpga-hwlib-23.12.02.tar.gz +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 License.txt diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk new file mode 100644 index 0000000000..bf18c23560 --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# intel-socfpga-hwlib +# +################################################################################ + +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 +INTEL_SOCFPGA_HWLIB_SITE = $(call github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES + +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) $(STAGING_DIR)/lib/intel-socfpga-hwlib +endef + +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS +# mkdir -p $(BINARIES_DIR)/intel-ucode +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# else +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO +# endif + +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +# endef + +$(eval $(generic-package)) -- 2.40.1 From romain.naour at smile.fr Tue Feb 13 17:27:57 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:27:57 +0100 Subject: [Buildroot] [PATCH 01/21] DEVELOPERS: add Romain Naour for am574x_idk_defconfig In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-2-romain.naour@smile.fr> The DEVELOPERS entry was missing. Fixes: 35eb74c634 ("configs/am574x_idk_defconfig: new defconfig") Signed-off-by: Romain Naour --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..ff44741f9f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2667,7 +2667,9 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ +F: board/ti/am574x-idk/ F: configs/qemu_* +F: configs/am574x_idk_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:27:58 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:27:58 +0100 Subject: [Buildroot] [PATCH 02/21] configs/ti_am62x_sk_defconfig: fix optee-os plateform In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-3-romain.naour@smile.fr> According to meta-ti, the optee-os plateform must be "k3-am62x" not "k3". meta-ti uses the OPTEEMACHINE to set optee-os platform [1]. meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Signed-off-by: Romain Naour --- On SK-TDA4VM, such error leads to a runtime boot crash. --- configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c..c3ad555a81 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:27:56 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:27:56 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig Message-ID: <20240213172817.2872849-1-romain.naour@smile.fr> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. This series start by adding U-boot binman support already submitted in the preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi [1], with small improvements. See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] With binman support, we can add the TI K3 j721e SoC support by providing all required firmware generated by the build. Add the new ti_j721e_sk_defconfig file to build a basic SD card image to boot the board (serial debug and ethernet working). Thanks to binman support, we can remove the ti-k3-image-gen tool from Buildroot. To do that, we have to update existing defconfig (am62, am64). Followup commits can improve TI K3 HS-FS devices based on binman instead of legacy core-secdev-k3 tool. [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf Best regards, Romain Dario Binacchi (5): package/python-attrs: add host variant package/python-rpds-py: add host variant package/python-referencing: add host variant package/python-jsonschema-specifications: add host variant package/python-jsonschema: add host variant Romain Naour (16): DEVELOPERS: add Romain Naour for am574x_idk_defconfig configs/ti_am62x_sk_defconfig: fix optee-os plateform configs/ti_am64x_sk_defconfig: fix optee-os plateform boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR boot/ti-k3-boot-firmware: introduce BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} boot/uboot: use DM firmware name defined by ti-k3-boot-firmware package boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options boot/uboot: enable TI K3 Device Manager (DM) for j721e boot/ti-k3-boot-firmware: bump to version 09.02.00.004 configs/ti_j721e_sk_defconfig: new defconfig configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman tool configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman tool boot/ti-k3-image-gen: remove package Config.in.legacy | 7 ++ DEVELOPERS | 6 +- board/ti/j721e-sk/genimage.cfg | 28 +++++++ board/ti/j721e-sk/post-build.sh | 16 ++++ board/ti/j721e-sk/readme.txt | 34 ++++++++ boot/Config.in | 1 - boot/ti-k3-boot-firmware/Config.in | 39 ++++++++++ .../ti-k3-boot-firmware.hash | 2 +- .../ti-k3-boot-firmware.mk | 16 ++-- boot/ti-k3-image-gen/Config.in | 77 ------------------- boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ------------- boot/ti-k3-r5-loader/Config.in | 8 ++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 23 ++++++ boot/uboot/Config.in | 27 ++++--- boot/uboot/uboot.mk | 10 ++- configs/ti_am62x_sk_defconfig | 14 ++-- configs/ti_am64x_sk_defconfig | 14 ++-- ...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- package/python-attrs/python-attrs.mk | 6 ++ .../python-jsonschema-specifications.mk | 10 +++ .../python-jsonschema/python-jsonschema.mk | 14 ++++ .../python-referencing/python-referencing.mk | 11 +++ package/python-rpds-py/python-rpds-py.mk | 1 + 24 files changed, 275 insertions(+), 180 deletions(-) create mode 100644 board/ti/j721e-sk/genimage.cfg create mode 100755 board/ti/j721e-sk/post-build.sh create mode 100644 board/ti/j721e-sk/readme.txt delete mode 100644 boot/ti-k3-image-gen/Config.in delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:00 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:00 +0100 Subject: [Buildroot] [PATCH 04/21] package/python-attrs: add host variant In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-5-romain.naour@smile.fr> From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. On some plateforms (curently TI K3 SoC familly) binman uses python-jsonschema [1] on the host that requires host-python-attrs. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi [Romain: extend commit log] Signed-off-by: Romain Naour --- Changes in v4: - extend commit log Changes in v3: - Drop Config.in.host --- package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc44..fb1729e62f 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:27:59 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:27:59 +0100 Subject: [Buildroot] [PATCH 03/21] configs/ti_am64x_sk_defconfig: fix optee-os plateform In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-4-romain.naour@smile.fr> According to meta-ti, the optee-os plateform must be "k3-am64x" not "k3". meta-ti uses the OPTEEMACHINE to set optee-os platform [1]. meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Signed-off-by: Romain Naour --- On SK-TDA4VM, such error leads to a runtime boot crash. --- configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8..097175bd8f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:01 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:01 +0100 Subject: [Buildroot] [PATCH 05/21] package/python-rpds-py: add host variant In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-6-romain.naour@smile.fr> From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman On some plateforms (curently TI K3 SoC familly) binman uses python-jsonschema [1] on the host that requires host-python-rpds-py. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi [Romain: extend commit log] Signed-off-by: Romain Naour --- Changes in v4: - extend commit log Changes in v3: - Drop Config.in.host --- package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4f..cee2ff290a 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:02 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:02 +0100 Subject: [Buildroot] [PATCH 06/21] package/python-referencing: add host variant In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-7-romain.naour@smile.fr> From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. On some plateforms (curently TI K3 SoC familly) binman uses python-jsonschema [1] on the host that requires host-python-referencing. We don't have the concept of runtime dependencies for host packages, so we must add them as build dependencies of the host variant. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi [Romain: - extend commit log - remove host-python-attrs from target variant dependency - add missing host runtime dependencies] Signed-off-by: Romain Naour --- Changes in v4: - extend commit log - remove host-python-attrs from target variant dependency - add missing host runtime dependencies Changes in v3: - Drop Config.in.host --- package/python-referencing/python-referencing.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e91..66d59ed809 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_REFERENCING_DEPENDENCIES += \ + host-python-attrs \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:03 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:03 +0100 Subject: [Buildroot] [PATCH 07/21] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-8-romain.naour@smile.fr> From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. On some plateforms (curently TI K3 SoC familly) binman uses python-jsonschema [1] on the host that requires host-python-jsonschema-specifications. We don't have the concept of runtime dependencies for host packages, so we must add them as build dependencies of the host variant. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi [Romain: - extend commit log - add missing host runtime dependencies] Signed-off-by: Romain Naour --- Changes in v4: - extend commit log - add missing host runtime dependencies Changes in v3: - Drop Config.in.host --- .../python-jsonschema-specifications.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9..653c839bb4 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,14 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES += \ + host-python-referencing + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:04 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:04 +0100 Subject: [Buildroot] [PATCH 08/21] package/python-jsonschema: add host variant In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-9-romain.naour@smile.fr> From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. On some plateforms (curently TI K3 SoC familly) binman uses python-jsonschema [1] add all missing runtime rependencies for the host variant. We don't have the concept of runtime dependencies for host packages, so we must add them as build dependencies of the host variant. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi [Romain: - extend commit log - add missing host runtime dependencies] Signed-off-by: Romain Naour --- Changes in v4: - extend commit log - add missing host runtime dependencies Changes in v3: - Drop Config.in.host --- package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa77..9e8b6e18b8 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \ + host-python-attrs \ + host-python-jsonschema-specifications \ + host-python-referencing \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:06 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:06 +0100 Subject: [Buildroot] [PATCH 10/21] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-11-romain.naour@smile.fr> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. As for U-boot package, this tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. The binman requirement is directly included in buildman dependency (tools/buildman/requirements.txt) since within U-Boot, binman is invoked by the build system, here buildman [1]. Make sure that all binman requirements are build before ti-k3-r5-loader. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot Signed-off-by: Romain Naour --- Note: binman is bundled in U-Boot source code. Use "USE_BINMAN" instead of "NEEDS_BINMAN" since it's not an external U-Boot dependency. --- boot/ti-k3-r5-loader/Config.in | 8 ++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5..d678bd17c2 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -93,4 +93,12 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE help Path to the TI K3 R5 Loader configuration file. +config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN + bool "ti-k3-r5-loader use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + endif diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f..8f86e0fb07 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -60,6 +60,20 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +TI_K3_R5_LOADER_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml +# Make sure that all binman requirements are build before ti-k3-r5-loader. +TI_K3_R5_LOADER_DEPENDENCIES += \ + host-python3 \ + host-python-setuptools \ + host-python-pylibfdt \ + host-python-pyelftools +TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:05 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:05 +0100 Subject: [Buildroot] [PATCH 09/21] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-10-romain.naour@smile.fr> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. The binman requirement is directly included in buildman dependency (tools/buildman/requirements.txt) since within U-Boot, binman is invoked by the build system, here buildman [1]. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot Signed-off-by: Romain Naour --- Note: binman is bundled in U-Boot source code. Use "USE_BINMAN" instead of "NEEDS_BINMAN" since it's not an external U-Boot dependency. --- boot/uboot/Config.in | 11 +++++++++++ boot/uboot/uboot.mk | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930..e6e7956adc 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -290,6 +290,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN This option makes sure that the needed binary blobs are copied into the U-Boot source directory. +config BR2_TARGET_UBOOT_USE_BINMAN + bool "U-Boot use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a880..0714522550 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -269,6 +269,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) UBOOT_DEPENDENCIES += host-vim endif +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +UBOOT_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:09 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:09 +0100 Subject: [Buildroot] [PATCH 13/21] boot/uboot: use DM firmware name defined by ti-k3-boot-firmware package In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-14-romain.naour@smile.fr> The DM firmware name is now defined by ti-k3-boot-frimware package by BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM, so BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME can be removed to avoid duplication in Kconfig. Signed-off-by: Romain Naour --- boot/uboot/Config.in | 9 --------- boot/uboot/uboot.mk | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index e6e7956adc..63359266c6 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -250,15 +250,6 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM - -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME - string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - -endif - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 0714522550..aa2ca99bdd 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -187,7 +187,7 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:08 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:08 +0100 Subject: [Buildroot] [PATCH 12/21] boot/ti-k3-boot-firmware: introduce BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX, AM62X, AM64X, AM65X} In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-13-romain.naour@smile.fr> ti-k3-image-gen tool is deprecated an replaced by binman [1]. But BR2_TARGET_TI_K3_IMAGE_GEN_SOC_{AM62AX,AM62X} is used by u-boot package to select which Device Manager (DM) firmware to use for the U-Boot build. In order to remove ti-k3-image-gen package, introduce BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} to replace BR2_TARGET_TI_K3_IMAGE_GEN_SOC_{AM62AX,AM62X,AM64X,AM65X}. In order to avoid breaking existing defconfig still using ti-k3-image-gen tool (ti_am62x_sk_defconfig, ti_am64x_sk_defconfig) select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC symbol from ti-k3-image-gen package. While at it, only install required firmware to BINARIES_DIR based on the selected TI K3 SoC variant. This requires two intall step: - ti-sysfw installation based on the SoC variant. - ti-dm installation only for SoC using split firmware boot flow (eg: am62, j721e) [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 Signed-off-by: Romain Naour --- boot/ti-k3-boot-firmware/Config.in | 34 +++++++++++++++++++ .../ti-k3-boot-firmware.mk | 12 +++++-- boot/ti-k3-image-gen/Config.in | 4 +++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3-boot-firmware/Config.in index d80bb4bdb3..8393699998 100644 --- a/boot/ti-k3-boot-firmware/Config.in +++ b/boot/ti-k3-boot-firmware/Config.in @@ -5,3 +5,37 @@ config BR2_TARGET_TI_K3_BOOT_FIRMWARE This package downloads and installs the TI-specific ti-sysfw and ti-dm firmware needed to boot TI K3 platforms (which include AM62x, AM64x, AM65x and more). + +if BR2_TARGET_TI_K3_BOOT_FIRMWARE +choice + prompt "SoC family" + +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX + bool "am62ax" + +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X + bool "am62x" + +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X + bool "am64x" + +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X + bool "am65x" + +endchoice + +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC + string + default "am62ax" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX + default "am62x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X + default "am64x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X + default "am65x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X + +# Only devices with a split firmware boot flow requires a DM firmware (eg: am62, j721e) +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM + string + default "am62axx" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX + default "am62xx" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X + default "" + +endif diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk index 1f8ade207c..c7c5eb0818 100644 --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk @@ -13,9 +13,17 @@ TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES = YES TI_K3_BOOT_FIRMWARE_LICENSE = TI Proprietary TI_K3_BOOT_FIRMWARE_LICENSE_FILES = LICENSE.ti +ifneq ($(BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM),) +define TI_K3_BOOT_FIRMWARE_INSTALL_DM_FILES + mkdir -p $(BINARIES_DIR)/ti-dm + cp -dpfr $(@D)/ti-dm/$(BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM) $(BINARIES_DIR)/ti-dm +endef +endif + define TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES_CMDS - cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ - cp -dpfr $(@D)/ti-dm $(BINARIES_DIR)/ + mkdir -p $(BINARIES_DIR)/ti-sysfw + cp -dpfr $(@D)/ti-sysfw/*$(BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC)* $(BINARIES_DIR)/ti-sysfw + $(TI_K3_BOOT_FIRMWARE_INSTALL_DM_FILES) endef $(eval $(generic-package)) diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e9..e54f5ec992 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -18,15 +18,19 @@ choice config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX bool "am62ax" + select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X bool "am62x" + select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X bool "am64x" + select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X bool "am65x" + select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X endchoice -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:07 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:07 +0100 Subject: [Buildroot] [PATCH 11/21] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-12-romain.naour@smile.fr> U-boot for k3 r5 core (ti-k3-r5-loader) can install different target image (tiboot3*.bin) depending on the k3 SoC variant using different boot flow [1]: - Split binary with a combined firmware: (eg: AM65) - Combined binary with a combined firmware: (eg: AM64) - Split binary with a split firmware: (eg: J721E) - Combined binary with a split firmware: (eg: AM62) K3 SoC using Split Binary Boot Flow also requires sysfw-*.itb file to boot (eg: am65, j721e). Only tiboot3*.bin is needed for other boot flow. >From [1]: "It's important to rename the generated tiboot3.bin and sysfw.itb to match exactly tiboot3.bin and sysfw.itb as ROM and the wakeup UBoot SPL will only look for and load the files with these names." So boards using HS (High Secure) K3 SoC variant must update the tiboot3.bin (and sysfw.itb) in their post-build script. ti-k3-r5-loader must install any tiboot3*.bin (and sysfw*.itb) to BINARIES_DIR let the user which one should be used in a post-build script. See the list of all tiboot3*.bin and sysfw*.itb file variant found in meta-ti: meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" meta-ti-bsp/conf/machine/include/am62pxx.inc:IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j722s.inc:IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/k3r5.inc:SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw.itb" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst Signed-off-by: Romain Naour --- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 8f86e0fb07..b3c756dc47 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -78,8 +78,17 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e) define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + for f in $(@D)/tiboot3*.bin ; do \ + $(INSTALL) -D -m 0644 $$f $(BINARIES_DIR)/`basename $$f` || exit 1; \ + done + for f in $(@D)/sysfw*.itb ; do \ + if test -e $$f ; then \ + $(INSTALL) -D -m 0644 $$f $(BINARIES_DIR)/`basename $$f` || exit 1; \ + fi ; \ + done endef $(eval $(kconfig-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:11 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:11 +0100 Subject: [Buildroot] [PATCH 15/21] boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-16-romain.naour@smile.fr> ti-k3-image-gen tool is deprecated an replaced by binman [1]. Use the newly introduced BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X}. [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 Signed-off-by: Romain Naour --- boot/uboot/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 63359266c6..7586f24c90 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -242,10 +242,10 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" - # We use the SoC selection defined for the ti-k3-image-gen + # We use the SoC selection defined for the ti-k3-boot-firmware # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:10 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:10 +0100 Subject: [Buildroot] [PATCH 14/21] boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-15-romain.naour@smile.fr> The k3 J721E support is needed to build for DRA829/TDA4VM SoC. https://www.ti.com/product/TDA4VM (SoC) https://www.ti.com/tool/PROCESSOR-SDK-J721E (TI SDK) https://www.ti.com/tool/SK-TDA4VM (TDA4VM processor starter kit) https://beagleboard.org/ai-64 (BeagleBone AI-64 SBC) Signed-off-by: Romain Naour --- boot/ti-k3-boot-firmware/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3-boot-firmware/Config.in index 8393699998..c9a09d8b19 100644 --- a/boot/ti-k3-boot-firmware/Config.in +++ b/boot/ti-k3-boot-firmware/Config.in @@ -22,6 +22,9 @@ config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X bool "am65x" +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E + bool "j721e" + endchoice config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC @@ -30,12 +33,14 @@ config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC default "am62x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X default "am64x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X default "am65x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X + default "j721e" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E # Only devices with a split firmware boot flow requires a DM firmware (eg: am62, j721e) config BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM string default "am62axx" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX default "am62xx" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X + default "j721e" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E default "" endif -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:12 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:12 +0100 Subject: [Buildroot] [PATCH 16/21] boot/uboot: enable TI K3 Device Manager (DM) for j721e In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-17-romain.naour@smile.fr> The TI K3 Device Manager (DM) support for J721E is needed to boot DRA829/TDA4VM SoC. https://www.ti.com/product/TDA4VM (SoC) https://www.ti.com/tool/PROCESSOR-SDK-J721E (TI SDK) https://www.ti.com/tool/SK-TDA4VM (TDA4VM processor starter kit) https://beagleboard.org/ai-64 (BeagleBone AI-64 SBC) Signed-off-by: Romain Naour --- boot/uboot/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 7586f24c90..837f1605b7 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -245,7 +245,8 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM # We use the SoC selection defined for the ti-k3-boot-firmware # package depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE - depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X \ + || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:15 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:15 +0100 Subject: [Buildroot] [PATCH 19/21] configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman tool In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-20-romain.naour@smile.fr> Update u-boot for a53 and r5 core to 2024.01 and enable binman support in order to remove BR2_TARGET_TI_K3_IMAGE_GEN. Signed-off-by: Romain Naour --- configs/ti_am62x_sk_defconfig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a81..f725734551 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -16,25 +16,29 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" -BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:13 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:13 +0100 Subject: [Buildroot] [PATCH 17/21] boot/ti-k3-boot-firmware: bump to version 09.02.00.004 In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-18-romain.naour@smile.fr> Remove the comment about ti-k3-image-gen since this tool is deprecated an replaced by binman. ti-k3-image-gen has been removed from meta-ti [1]. [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 Signed-off-by: Romain Naour --- boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 2 +- boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash index 95131180ef..939bd0794a 100644 --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 ab20ffbe7bba7e94be246b3417d33a914b3f07c16c47ef5a7f7602349a666a61 LICENSE.ti -sha256 6032a258ce731d987576115f5de44c677a6b0cf8bddcd61a9a2852928bdfff92 ti-linux-firmware-08.06.00.006.tar.xz +sha256 701d400ac33b2885ec35d73f0d66e5186e3c2f71ef28679508b58ef986804d35 ti-linux-firmware-09.02.00.004.tar.xz diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk index c7c5eb0818..fb28d8ac41 100644 --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk @@ -4,9 +4,7 @@ # ################################################################################ -# The hash 340194800a581baf976360386dfc7b5acab8d948 defined in the -# Makefile of ti-k3-image-gen corresponds to the tag 08.06.00.006. -TI_K3_BOOT_FIRMWARE_VERSION = 08.06.00.006 +TI_K3_BOOT_FIRMWARE_VERSION = 09.02.00.004 TI_K3_BOOT_FIRMWARE_SITE = https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/snapshot TI_K3_BOOT_FIRMWARE_SOURCE = ti-linux-firmware-$(TI_K3_BOOT_FIRMWARE_VERSION).tar.xz TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES = YES -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:14 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:14 +0100 Subject: [Buildroot] [PATCH 18/21] configs/ti_j721e_sk_defconfig: new defconfig In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-19-romain.naour@smile.fr> Adds support for TI's SK-TDA4VM board by introducing the ti_j721e_sk_defconfig file and related support files. Retrieve BSP settings from meta-ti (may be useful for other TI boards): - Don't set BR2_TARGET_TI_K3_IMAGE_GEN since this tool is deprecated [1] and must be replaced by u-boot binman (upstream). See FOSDEM 2024 talk by TI folks about Binman and how it simplify the overall boot-loader build flow [2]. - Set BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD = "generic" meta-ti]$ git grep TFA_BOARD meta-ti-bsp/conf/machine/beagleplay.conf:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/am62axx.inc:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/am62pxx.inc:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/am62xx.inc:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/am64xx.inc:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/am65xx.inc:TFA_BOARD = "generic" meta-ti-bsp/conf/machine/include/j7200.inc:TFA_BOARD = "generic" meta-ti-bsp/conf/machine/include/j721e.inc:TFA_BOARD = "generic" meta-ti-bsp/conf/machine/include/j721s2.inc:TFA_BOARD = "generic" meta-ti-bsp/conf/machine/include/j722s.inc:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/j784s4.inc:TFA_BOARD = "j784s4" - Set BR2_TARGET_UBOOT_NEEDS_ATF_BL31 to provide BL31 variable pointing to ATF bl31.bin to the U-Boot build process [3]. - Set BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE to OP-TEE as BL32 secure payload. meta-ti set "SPD=opteed" to build ATF [4]. - Set BR2_TARGET_OPTEE_OS_PLATFORM to "k3-j721e". meta-ti uses the OPTEEMACHINE to set optee-os platform [5]. meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" - Set BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME since u-boot is looking at /boot/dtb/ti for devicetree. (Yocto uses KERNEL_DTBDEST) Create a symlink to make sure /boot/dtb/ti exist. (We want to keep the u-boot environment provided by upstream as is). [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 [2] https://fosdem.org/2024/schedule/event/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/ [3] https://git.yoctoproject.org/meta-ti/commit/?id=e74b9a1746d4d04757c87c1920a0f743e55ff096 [4] https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc?h=09.02.00.004#n7 [5] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 More information about the board can be found at: https://www.ti.com/tool/SK-TDA4VM Signed-off-by: Romain Naour --- DEVELOPERS | 2 ++ board/ti/j721e-sk/genimage.cfg | 28 ++++++++++++++++++ board/ti/j721e-sk/post-build.sh | 16 +++++++++++ board/ti/j721e-sk/readme.txt | 34 ++++++++++++++++++++++ configs/ti_j721e_sk_defconfig | 51 +++++++++++++++++++++++++++++++++ 5 files changed, 131 insertions(+) create mode 100644 board/ti/j721e-sk/genimage.cfg create mode 100755 board/ti/j721e-sk/post-build.sh create mode 100644 board/ti/j721e-sk/readme.txt create mode 100644 configs/ti_j721e_sk_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index ff44741f9f..e5f2dd2327 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2668,8 +2668,10 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ F: board/ti/am574x-idk/ +F: board/ti/j721e-sk/ F: configs/qemu_* F: configs/am574x_idk_defconfig +F: configs/ti_j721e_sk_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ diff --git a/board/ti/j721e-sk/genimage.cfg b/board/ti/j721e-sk/genimage.cfg new file mode 100644 index 0000000000..2a991748d5 --- /dev/null +++ b/board/ti/j721e-sk/genimage.cfg @@ -0,0 +1,28 @@ +image boot.vfat { + vfat { + files = { + "sysfw.itb", + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + } + } + + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/ti/j721e-sk/post-build.sh b/board/ti/j721e-sk/post-build.sh new file mode 100755 index 0000000000..01af6ca474 --- /dev/null +++ b/board/ti/j721e-sk/post-build.sh @@ -0,0 +1,16 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +# u-boot is looking at /boot/dtb/ti for devicetree in the rootfs +# partition while Buildroot install the kernel and its devicetree +# in /boot (BR2_LINUX_KERNEL_INSTALL_TARGET enabled). +# Enabling BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME allows to keep the +# "ti" subdirectory but "dts" is still missing. +# Make sure /boot/dtb/ti exist by creating a symlink in +# ${TARGET_DIR}/boot +# https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc?h=09.02.00.004#n13 +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/include/env/ti/mmc.env?ref_type=tags#L18 +if [ -L ${TARGET_DIR}/boot/dtb ]; then + rm ${TARGET_DIR}/boot/dtb + ln -sf . ${TARGET_DIR}/boot/dtb +fi diff --git a/board/ti/j721e-sk/readme.txt b/board/ti/j721e-sk/readme.txt new file mode 100644 index 0000000000..bebed1b3f6 --- /dev/null +++ b/board/ti/j721e-sk/readme.txt @@ -0,0 +1,34 @@ +Texas Instuments SK-TDA4VM Test and Development Board + +Description +=========== + +This configuration will build a basic image for the TI SK-TDA4VM +board: https://www.ti.com/tool/SK-TDA4VM. + +How to Build +============ + +Select the default configuration for the target: + +$ make ti_j721e_sk_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the SK-TDA4VM board, and power it up through the +USB Type-C connector. The system should come up. You can use a +micro-USB cable to connect to the connector labeled DEBUG CONSOLE to +communicate with the board. diff --git a/configs/ti_j721e_sk_defconfig b/configs/ti_j721e_sk_defconfig new file mode 100644 index 0000000000..fc2d70d76f --- /dev/null +++ b/configs/ti_j721e_sk_defconfig @@ -0,0 +1,51 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/j721e-sk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/j721e-sk/genimage.cfg" +BR2_SYSTEM_DHCP="eth0" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.4" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-j721e-sk" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="generic" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="k3-j721e" +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E=y +BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="j721e_evm_r5" +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="j721e_evm_a72" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +BR2_TARGET_UBOOT_USE_BINMAN=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="tispl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:17 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:17 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-22-romain.naour@smile.fr> ti-k3-image-gen tool is deprecated an replaced by binman [1]. All defconfig that was using it have been updated to use U-boot binman tool instead. So, we can safely remove ti-k3-image-gen package. [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 Cc: Anand Gadiyar Cc: Xuanhao Shi Signed-off-by: Romain Naour --- Config.in.legacy | 7 ++ DEVELOPERS | 2 - boot/Config.in | 1 - boot/ti-k3-image-gen/Config.in | 81 ----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 --------------- 6 files changed, 7 insertions(+), 141 deletions(-) delete mode 100644 boot/ti-k3-image-gen/Config.in delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk diff --git a/Config.in.legacy b/Config.in.legacy index a869279af7..2b59a65f1c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.02" +config BR2_TARGET_TI_K3_IMAGE_GEN + bool "ti-k3-image-gen removed" + select BR2_LEGACY + help + ti-k3-image-gen tool has been removed and replaced by + U-Boot binman tool (requires U-boot >= 2024.01). + config BR2_PACKAGE_TINYMEMBENCH bool "tinymembench removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index e5f2dd2327..df6c60704c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -151,7 +151,6 @@ N: Anand Gadiyar F: board/ti/am62x-sk/ F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ -F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig @@ -3219,7 +3218,6 @@ N: Xuanhao Shi F: board/ti/am62x-sk/ F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ -F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig diff --git a/boot/Config.in b/boot/Config.in index e5fdf7ad43..87e1b7c00e 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,7 +20,6 @@ source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-boot-firmware/Config.in" -source "boot/ti-k3-image-gen/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in deleted file mode 100644 index e54f5ec992..0000000000 --- a/boot/ti-k3-image-gen/Config.in +++ /dev/null @@ -1,81 +0,0 @@ -config BR2_TARGET_TI_K3_IMAGE_GEN - bool "ti-k3-image-gen" - depends on BR2_TARGET_TI_K3_R5_LOADER - select BR2_TARGET_TI_K3_BOOT_FIRMWARE - # We need FIT support in uboot-tools, which is why we select a - # host package - select BR2_PACKAGE_HOST_UBOOT_TOOLS - select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT - help - Use TI's k3-image-gen to build a separate bare metal boot - binary from a separate SPL that is running on the R5 core. - - https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ - -if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE - string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - -endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3-image-gen/ti-k3-image-gen.hash deleted file mode 100644 index c968c5648f..0000000000 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 f89ea4b1f5c992455b1a682fde48359221b53f3294135df4bf20feea6aea90e4 k3-image-gen-08.06.00.007.tar.gz -sha256 f012e8d000d711d0539e5b4c812fc1d3a59c10fc1e3d6ea155556f5b78286845 LICENSE diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk deleted file mode 100644 index 64be9a18f2..0000000000 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# ti-k3-image-gen -# -################################################################################ - -TI_K3_IMAGE_GEN_VERSION = 08.06.00.007 -TI_K3_IMAGE_GEN_SITE = https://git.ti.com/cgit/k3-image-gen/k3-image-gen/snapshot -TI_K3_IMAGE_GEN_SOURCE = k3-image-gen-$(TI_K3_IMAGE_GEN_VERSION).tar.gz -TI_K3_IMAGE_GEN_LICENSE = BSD-3-Clause -TI_K3_IMAGE_GEN_LICENSE_FILES = LICENSE -TI_K3_IMAGE_GEN_INSTALL_IMAGES = YES - -# - ti-k3-image-gen is used to build tiboot3.bin, using the -# r5-u-boot-spl.bin file from the ti-k3-r5-loader package. Hence the -# dependency on ti-k3-r5-loader. -# - the ti-k3-image-gen makefiles seem to need some feature from Make -# v4.0, similar to u-boot. -TI_K3_IMAGE_GEN_DEPENDENCIES = \ - host-arm-gnu-toolchain \ - host-python3 \ - host-openssl \ - host-uboot-tools \ - ti-k3-r5-loader \ - ti-k3-boot-firmware \ - $(BR2_MAKE_HOST_DEPENDENCY) - -TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) - -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin - -define TI_K3_IMAGE_GEN_CONFIGURE_CMDS - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) -endef - -define TI_K3_IMAGE_GEN_BUILD_CMDS - $(TARGET_MAKE_ENV) \ - $(BR2_MAKE) -C $(@D) \ - SOC=$(TI_K3_IMAGE_GEN_SOC) \ - SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ - CONFIG=evm \ - CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ - SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ - O=$(@D)/tmp \ - BIN_DIR=$(@D) -endef - -define TI_K3_IMAGE_GEN_INSTALL_IMAGES_CMDS - cp $(@D)/tiboot3.bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:16 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:16 +0100 Subject: [Buildroot] [PATCH 20/21] configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman tool In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-21-romain.naour@smile.fr> Update u-boot for a53 and r5 core to 2024.01 and enable binman support in order to remove BR2_TARGET_TI_K3_IMAGE_GEN. Signed-off-by: Romain Naour --- configs/ti_am64x_sk_defconfig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f..bcef16777e 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -16,24 +16,28 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" -BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -- 2.43.0 From giulio.benetti at benettiengineering.com Tue Feb 13 17:44:05 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 13 Feb 2024 18:44:05 +0100 Subject: [Buildroot] [PATCH v3 0/2] Add board support for the BeagleV-Ahead In-Reply-To: <20240211120857.6622-1-kilian.zinnecker@mail.de> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> Message-ID: Hi Kilian, On 11/02/24 13:08, Kilian Zinnecker via buildroot wrote: > This patch series adds board support for the BeagleV-Ahead. > > This patch series introduces a package which fetches binaries for the > SoC, i.e., one binary blob for an on-chip FPGA and one binary blob for > audio. Currently they are not used, but are intended to be used in the > future. > > This board support generates an image suitable for SD card. The boot > command for uboot to boot the kernel could not easily be changed. It > seemed that a default boot command was persisent and any change to it > by normal means (e.g., uboot config parameters like > CONFIG_BOOT_COMMAND) did not have any effect. Hence a patch for the > custom u-boot is introduced for now, to insert the proper boot > command. > please report the patches changelogs in the patches most of all. It's useful there while reviewing, more than here where it should be a brief explanation. Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > v2 -> v3: > > - Added brief description what the xuantie bin binaries are for > - Unrolled loop in XUANTIE_BINS_INSTALL_IMAGES_CMDS of > package/xuantie-bins/xuantie-bins.mk > - Added a second product page link to board's readme.txt > - Added URL to the product page to git commit message > - Dropped "_CUSTOM" from all "BR2_RISCV_ISA_*" in the board's > defconfig > - Add description to the board's readme.txt and defconfig why GCC > v13 is chosen > - Added BR2_PACKAGE_HOST_DOSFSTOOLS to board's defconfig > > v1 -> v2: > > - Added hash file for xuantie-bins package > - Now uses uEnv.txt for actual boot commands > - Removed extlinux.conf > - Removed superflous comments inside config files > > > Kilian Zinnecker (2): > package/xuantie-bins: new package > configs/beaglev_ahead: new defconfig > > DEVELOPERS | 3 + > board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ > board/beaglev-ahead/linux.fragment | 2 + > .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ > board/beaglev-ahead/post-image.sh | 6 ++ > board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ > board/beaglev-ahead/uEnv.txt | 4 + > board/beaglev-ahead/uboot.fragment | 2 + > configs/beaglev_ahead_defconfig | 46 +++++++++++ > package/Config.in | 1 + > package/xuantie-bins/Config.in | 8 ++ > package/xuantie-bins/xuantie-bins.hash | 1 + > package/xuantie-bins/xuantie-bins.mk | 23 ++++++ > 13 files changed, 266 insertions(+) > create mode 100644 board/beaglev-ahead/genimage.cfg > create mode 100644 board/beaglev-ahead/linux.fragment > create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > create mode 100755 board/beaglev-ahead/post-image.sh > create mode 100644 board/beaglev-ahead/readme.txt > create mode 100644 board/beaglev-ahead/uEnv.txt > create mode 100644 board/beaglev-ahead/uboot.fragment > create mode 100644 configs/beaglev_ahead_defconfig > create mode 100644 package/xuantie-bins/Config.in > create mode 100644 package/xuantie-bins/xuantie-bins.hash > create mode 100644 package/xuantie-bins/xuantie-bins.mk > From giulio.benetti at benettiengineering.com Tue Feb 13 17:49:03 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 13 Feb 2024 18:49:03 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/xuantie-bins: new package In-Reply-To: <20240211120857.6622-2-kilian.zinnecker@mail.de> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> <20240211120857.6622-2-kilian.zinnecker@mail.de> Message-ID: Hi Kilian, On 11/02/24 13:08, Kilian Zinnecker via buildroot wrote: > This patch adds a package for Xuantie binary blobs. These binaries > are needed for the BeagleV-Ahead. Please report here the same description you point in Config.in > > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/xuantie-bins/Config.in | 8 ++++++++ > package/xuantie-bins/xuantie-bins.hash | 1 + > package/xuantie-bins/xuantie-bins.mk | 23 +++++++++++++++++++++++ > 5 files changed, 34 insertions(+) > create mode 100644 package/xuantie-bins/Config.in > create mode 100644 package/xuantie-bins/xuantie-bins.hash > create mode 100644 package/xuantie-bins/xuantie-bins.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 1c6c84b05b..fa0596fd6b 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1894,6 +1894,7 @@ F: board/radxa/rock5b/ > F: configs/rock5b_defconfig > F: configs/avnet_rzboard_v2l_defconfig Can you please send a patch to alphabetize the 2 lines above? > F: package/rockchip-rkbin/ > +F: package/xuantie-bins/ > > N: Klaus Heinrich Kiwi > F: package/wqy-zenhei/ > diff --git a/package/Config.in b/package/Config.in > index 91a6f1de00..5e28fb6e88 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -657,6 +657,7 @@ endmenu > source "package/wipe/Config.in" > source "package/xorriso/Config.in" > source "package/xr819-xradio/Config.in" > + source "package/xuantie-bins/Config.in" > endmenu > > menu "Interpreter languages and scripting" > diff --git a/package/xuantie-bins/Config.in b/package/xuantie-bins/Config.in > new file mode 100644 > index 0000000000..40388edd06 > --- /dev/null > +++ b/package/xuantie-bins/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_XUANTIE_BINS > + bool "xuantie-bins" > + depends on BR2_riscv > + help > + This package provides binary blobs, needed for the > + BeagleV-Ahead's SoC (TH1520). They contain an FPGA binary > + (light_aon_fpga.bin) for power management and a binary for > + the audio system (light_c906_audio.bin). the 2 lines above have 4 useless empty spaces, please remove them > diff --git a/package/xuantie-bins/xuantie-bins.hash b/package/xuantie-bins/xuantie-bins.hash > new file mode 100644 > index 0000000000..4d1ec297c9 > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.hash > @@ -0,0 +1 @@ > +sha256 608e9fec79823996004f65ba692a76d741307b0de23552d147ad1b567e7054dc xuantie-bins-0a2e02bb53758cc12448d8670e65c854528a96b4-br1.tar.gz > diff --git a/package/xuantie-bins/xuantie-bins.mk b/package/xuantie-bins/xuantie-bins.mk > new file mode 100644 > index 0000000000..6db18685bc > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.mk > @@ -0,0 +1,23 @@ > +################################################################################ > +# > +# xuantie-bins > +# > +################################################################################ > + > +XUANTIE_BINS_VERSION = 0a2e02bb53758cc12448d8670e65c854528a96b4 > +XUANTIE_BINS_SITE = https://github.com/beagleboard/xuantie-ubuntu.git > +XUANTIE_BINS_SITE_METHOD = git Here ^^^ please use github helper instead of this, like: https://gitlab.com/buildroot.org/buildroot/-/blob/master/package/openswan/openswan.mk#L8 > +XUANTIE_BINS_LICENSE = PROPRIETARY > + > +XUANTIE_BINS_INSTALL_IMAGES = YES > +XUANTIE_BINS_INSTALL_TARGET = NO > + > +XUANTIE_BINS_FPGA_BIN_FILENAME = "bins/light_aon_fpga.bin" > +XUANTIE_BINS_AUDIO_BIN_FILENAME = "bins/light_c906_audio.bin" The 2 lines above are useless now since you use them only once so please drop them > + > +define XUANTIE_BINS_INSTALL_IMAGES_CMDS > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(XUANTIE_BINS_FPGA_BIN_FILENAME) > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(XUANTIE_BINS_AUDIO_BIN_FILENAME) > +endef > + > +$(eval $(generic-package)) Can you please send a V4 with such corrections? Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 13 18:06:43 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 13 Feb 2024 19:06:43 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <20240211120857.6622-3-kilian.zinnecker@mail.de> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> <20240211120857.6622-3-kilian.zinnecker@mail.de> Message-ID: Hi Kilian, On 11/02/24 13:08, Kilian Zinnecker wrote: > This patch adds board support for the BeagleV-Ahead. It uses a > custom kernel for the board's SoC. As the SoC has an outdated and > currently not supported version of the RISC-V vector extension, the > vector extension is disabled. The used OpenSBI version for this board > support does not define the neccessary flags for GCC 12 to activate > the zicsr and zifencei extensions. Therefore this board support uses > GCC 13. > > https://www.beagleboard.org/boards/beaglev-ahead Please add newline here > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 2 + > board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ > board/beaglev-ahead/linux.fragment | 2 + > .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ > board/beaglev-ahead/post-image.sh | 6 ++ > board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ > board/beaglev-ahead/uEnv.txt | 4 + > board/beaglev-ahead/uboot.fragment | 2 + > configs/beaglev_ahead_defconfig | 46 +++++++++++ > 9 files changed, 232 insertions(+) > create mode 100644 board/beaglev-ahead/genimage.cfg > create mode 100644 board/beaglev-ahead/linux.fragment > create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > create mode 100755 board/beaglev-ahead/post-image.sh > create mode 100644 board/beaglev-ahead/readme.txt > create mode 100644 board/beaglev-ahead/uEnv.txt > create mode 100644 board/beaglev-ahead/uboot.fragment > create mode 100644 configs/beaglev_ahead_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index fa0596fd6b..3ede2a111d 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1890,9 +1890,11 @@ F: package/libcamera/ > > N: Kilian Zinnecker > F: board/avnet/rzboard_v2l/ > +F: board/beaglev-ahead/ > F: board/radxa/rock5b/ > F: configs/rock5b_defconfig > F: configs/avnet_rzboard_v2l_defconfig as told on previous patch need an "alphabetization" patch > +F: configs/beaglev_ahead_defconfig > F: package/rockchip-rkbin/ > F: package/xuantie-bins/ > > diff --git a/board/beaglev-ahead/genimage.cfg b/board/beaglev-ahead/genimage.cfg > new file mode 100644 > index 0000000000..080b169527 > --- /dev/null > +++ b/board/beaglev-ahead/genimage.cfg > @@ -0,0 +1,62 @@ > +# SD card image for BeagleV-Ahead > + > +image boot.vfat { > + vfat { > + files = { > + "fw_dynamic.bin", > + "Image", > + "light_aon_fpga.bin", > + "light-beagle.dtb", > + "light_c906_audio.bin", > + } > + > + file uEnv.txt { > + image = "uEnv.txt" > + } > + > + file overlays/BBORG_LOAD-00A2.dtbo { > + image = "overlays/BBORG_LOAD-00A2.dtbo" > + } > + > + file overlays/BBORG_RELAY-00A2.dtbo { > + image = "overlays/BBORG_RELAY-00A2.dtbo" > + } > + > + file overlays/BONE-LED_P8_03.dtbo { > + image = "overlays/BONE-LED_P8_03.dtbo" > + } > + > + file overlays/BONE-LED_P9_11.dtbo { > + image = "overlays/BONE-LED_P9_11.dtbo" > + } > + > + file overlays/BVA-MIKROBUS-0.dtbo { > + image = "overlays/BVA-MIKROBUS-0.dtbo" > + } > + } > + size = 48M > +} > + > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 2M > + } > + > + partition uboot { > + in-partition-table = "false" > + image = "u-boot-with-spl.bin" > + offset = 0 > + holes = {"(440; 1048576)"} > + } > + > + partition boot { > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + image = "rootfs.ext2" > + } > +} > + > diff --git a/board/beaglev-ahead/linux.fragment b/board/beaglev-ahead/linux.fragment > new file mode 100644 > index 0000000000..00f93f39a4 > --- /dev/null > +++ b/board/beaglev-ahead/linux.fragment > @@ -0,0 +1,2 @@ > +# CONFIG_VECTOR is not set > +# CONFIG_VECTOR_0_7 is not set > diff --git a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > new file mode 100644 > index 0000000000..bcf5b965ce > --- /dev/null > +++ b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > @@ -0,0 +1,30 @@ > +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 > +From: Kilian Zinnecker > +Date: Mon, 21 Aug 2023 23:51:59 +0200 > +Subject: [PATCH] Overwrite bootcmd by force > + > +This patch is a dirty hack: Trying to overwrite the bootcmd via the > +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted > +to some preset value and could not be changed easily. Therefore a > +hook is used to force the bootcmd to be overwritten. This is strange because if so also the bootcmd content of uEnv.txt below should be skipped, or maybe there is a bug in this u-boot that evaluates bootcmd too early without taking into account environment variables. But I'm also noticing that you have your Environment variables in Fat, but it depends how u-boot deals with environment variables. Usually you have to specificy an offset in memory where environment variables live. But I see in your "make uboot-menuconfig" that CONFIG_ENV_IS_IN_FAT is not enabled, but only CONFIG_ENV_IS_IN_MMC is and you have to specify: CONFIG_ENV_OFFSET CONFIG_ENV_SIZE So if you want to go with vfat way you need to enable CONFIG_ENV_IS_IN_FAT and specify: CONFIG_ENV_FAT_INTERFACE CONFIG_ENV_FAT_DEVICE_AND_PART and most of all: CONFIG_ENV_FAT_FILE=uEnv.txt in uboot.fragment below I would go with this last way instead of adding such dirty hack, can you work on that? > + > +Signed-off-by: Kilian Zinnecker > +--- > + board/thead/light-c910/light.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c > +index 8d5478e916..1448db974e 100644 > +--- a/board/thead/light-c910/light.c > ++++ b/board/thead/light-c910/light.c > +@@ -2282,6 +2282,7 @@ int board_late_init(void) > + light_usb_boot_check(); > + do_firmware_load(); > + ap_peri_clk_disable(); > ++ run_command("load mmc 1:1 $ramdisk_addr_r uEnv.txt; env import -t $ramdisk_addr_r $filesize; run uenvcmd", 0); > + return 0; > + } > + > +-- > +2.34.1 > + > diff --git a/board/beaglev-ahead/post-image.sh b/board/beaglev-ahead/post-image.sh > new file mode 100755 > index 0000000000..9e16eeff3f > --- /dev/null > +++ b/board/beaglev-ahead/post-image.sh > @@ -0,0 +1,6 @@ > +#!/usr/bin/env bash > +set -e > + > +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ ${BINARIES_DIR} > +cp board/beaglev-ahead/uEnv.txt ${BINARIES_DIR}/ > +support/scripts/genimage.sh -c board/beaglev-ahead/genimage.cfg > diff --git a/board/beaglev-ahead/readme.txt b/board/beaglev-ahead/readme.txt > new file mode 100644 > index 0000000000..758082a792 > --- /dev/null > +++ b/board/beaglev-ahead/readme.txt > @@ -0,0 +1,78 @@ > +BeagleV-Ahead > +============== > +https://www.beagleboard.org/boards/beaglev-ahead > +https://forum.beagleboard.org/c/beaglev/ > + > +The SoC (TH1520) of the BeagleV-Ahead implements an outdated and > +currently not supported version of the RISC-V vector extension. Hence, > +the vector extension is disabled. The used OpenSBI version for this > +board support does not define the neccessary flags for GCC 12 to > +activate the zicsr and zifencei extensions. Therefore this board > +support uses GCC 13. > + > +Build: > +====== > + $ make beaglev_ahead_defconfig > + $ make > + > +Files created in output directory > +================================= > + > +output/images > +. > +??? boot.vfat > +??? bootloader-JH7100-buildroot.bin.out > +??? ddrinit-2133-buildroot.bin.out > +??? fw_dynamic.bin > +??? fw_dynamic.elf > +??? fw_jump.bin > +??? fw_jump.elf > +??? fw_payload.bin > +??? fw_payload.elf > +??? Image > +??? light-beagle.dtb > +??? light_aon_fpga.bin > +??? light_c906_audio.bin > +??? overlays > +??? rootfs.ext2 > +??? rootfs.ext4 > +??? rootfs.tar > +??? sdcard.img > +??? u-boot-with-spl.bin > +??? u-boot.bin > +??? uEnv.txt > + > +Creating bootable SD card: > +========================== > + > +Simply invoke (as root) > + > +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync > + > +Where X is your SD card device. > + > +Booting: > +======== > + > +SD card boot button: > +-------------------- > +To let the board boot from SD card, keep the "SD button" pressed during power > +up / power cycle. The button is near the SD card slot. > + > +Serial console: > +--------------- > +The BeagleV-Ahead has a "Debug" GPIO header. Its layout can be seen here: > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/02-quick-start.html#access-uart-debug-console > + > +Note, that there are reported issues with some uart interface cables/dongles: > +https://forum.beagleboard.org/t/beaglev-ahead-debug-terminal-problems/35331 > + > +Baudrate for this board is 115200. > + > +Login: > +------ > +Enter 'root' as login user, and the prompt is ready. > + > +wiki link: > +---------- > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/index.html > diff --git a/board/beaglev-ahead/uEnv.txt b/board/beaglev-ahead/uEnv.txt > new file mode 100644 > index 0000000000..7e98ae5f81 > --- /dev/null > +++ b/board/beaglev-ahead/uEnv.txt > @@ -0,0 +1,4 @@ > +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} > +uenvcmd=fatload mmc 1:1 ${kernel_addr_r} Image; fatload mmc 1:1 ${fdt_addr_r} light-beagle.dtb > +bootargs=root=/dev/mmcblk1p2 rootfstype=ext4 rootwait ro console=ttyS0,115200 earlycon clk_ignore_unused net.ifnames=0 > + > diff --git a/board/beaglev-ahead/uboot.fragment b/board/beaglev-ahead/uboot.fragment > new file mode 100644 > index 0000000000..1f51cef106 > --- /dev/null > +++ b/board/beaglev-ahead/uboot.fragment > @@ -0,0 +1,2 @@ > +CONFIG_LEGACY_IMAGE_FORMAT=y > +CONFIG_AUTOBOOT=y > diff --git a/configs/beaglev_ahead_defconfig b/configs/beaglev_ahead_defconfig > new file mode 100644 > index 0000000000..9000b1f0ad > --- /dev/null > +++ b/configs/beaglev_ahead_defconfig > @@ -0,0 +1,46 @@ > +BR2_riscv=y > +BR2_riscv_custom=y > +BR2_RISCV_ISA_RVM=y > +BR2_RISCV_ISA_RVA=y > +BR2_RISCV_ISA_RVF=y > +BR2_RISCV_ISA_RVD=y > +BR2_RISCV_ISA_RVC=y > +# Use GCC 13 for OpenSBI zicsr zifencei issue > +BR2_GCC_VERSION_13_X=y > +BR2_GLOBAL_PATCH_DIR="board/beaglev-ahead/patches" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglev-ahead/post-image.sh" > +BR2_TARGET_GENERIC_HOSTNAME="BeagleV-Ahead" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the BeagleV-Ahead" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/linux/archive/refs/heads/beaglev-v5.10.113-1.1.2-ubuntu.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="beaglev" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/light-beagle" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/linux.fragment" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_BEAGLEV_DDRINIT=y > +BR2_TARGET_BEAGLEV_SECONDBOOT=y > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-opensbi/archive/refs/heads/0.9-1.1.2-ubuntu.tar.gz" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-u-boot/archive/refs/heads/beaglev-v2020.01-1.1.2-ubuntu.tar.gz" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="light_beagle" > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragment" > +BR2_TARGET_UBOOT_FORMAT_BIN=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_XUANTIE_BINS=y Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 13 18:17:48 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 13 Feb 2024 19:17:48 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <2172310.irdbgypaU6@laptop> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-3-kilian.zinnecker@mail.de> <8f6baf1d-3caa-4b47-aad9-a34fa0761058@benettiengineering.com> <2172310.irdbgypaU6@laptop> Message-ID: <75e279f2-ff11-4ff8-bb59-f33b352ea3f7@benettiengineering.com> Hi Kilian, On 11/02/24 13:24, kilian.zinnecker--- via buildroot wrote: > Hello Giulio, all, > >>> This patch adds board support for the BeagleV-Ahead. It uses a >>> custom kernel for the board's SoC. As the SoC has an outdated and >>> currently not supported version of the RISC-V vector extension, the >>> vector extension is disabled. >> >> can you please provide an URL to the product page? > > Yes, I added an URL into the commit message of v3. > > [--SNIP--] >>> --- /dev/null >>> +++ b/board/beaglev-ahead/post-image.sh >>> @@ -0,0 +1,6 @@ >>> +#!/usr/bin/env bash >>> +set -e >>> + >>> +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ >>> ${BINARIES_DIR} >> linux-custom should substituted with $(LINUX_DIR) > > I tried $(LINUX_DIR) and ${LINUX_DIR}, but both resulted in an empty string > and as a consequence in a wrong path and broke the build. You're right, LINUX_DIR is not exported in Makefile, that's why it can't be found in scripts. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > So in my v3 I kept it as it is for now. Should I try something else? > >>> --- /dev/null >>> +++ b/configs/beaglev_ahead_defconfig >>> @@ -0,0 +1,44 @@ >>> +BR2_riscv=y >>> +BR2_riscv_custom=y >>> +BR2_RISCV_ISA_CUSTOM_RVM=y >>> +BR2_RISCV_ISA_CUSTOM_RVA=y >>> +BR2_RISCV_ISA_CUSTOM_RVF=y >>> +BR2_RISCV_ISA_CUSTOM_RVD=y >>> +BR2_RISCV_ISA_CUSTOM_RVC=y >> >> With commit cbd91e89e43d600172c62fd1cbd33aa74d0a851a all "_CUSTOM" have >> been dropped, so can you please replace all the: >> BR2_RISCV_ISA_CUSTOM_* >> occurences with: >> BR2_RISCV_ISA_* >> ? > > I fixed it, thanks. > >>> +BR2_GCC_VERSION_13_X=y >> >> I think there is a reason you force using gcc 13, can you describe it in >> the commit log and here? > > Yes, there were problems. I am not 100% sure, but as I remember it: the > OpenSBI used has an old version and in its build, it does not define certain > flags, which are needed by GCC 12 to activate the needed zifencei and zicsr > extension. Those extension where redefined to be in some other extension pack > of RiscV (or something like that, I don't remeber this exactly). Anyway it > threw an error in GCC 12, and I thinkt to fix that, one would have to touch the > old OpenSBI version. Switching to GCC 13 (where it works out of the box) seems > then to be cleaner for me. > > [--SNIP--] >>> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragmen >>> t" +BR2_TARGET_UBOOT_FORMAT_BIN=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" >> >> Here you need to add: >> BR2_PACKAGE_HOST_DOSFSTOOLS=y >> otherwise it fails to build under buildroot/utils/docker-run > > Added dosfstools to the defconfig, thanks! > >>> +BR2_PACKAGE_HOST_MTOOLS=y >>> +BR2_PACKAGE_HOST_GENIMAGE=y >>> +BR2_PACKAGE_XUANTIE_BINS=y >> >> After enabling BR2_RISCV_ISA_ options it builds successfully using >> buildroot/utils/docker-run > > I build the image with buildroot/utils/docker-run and it boots. Thanks for the > hint, I will use buildroot/utils/docker-run in the future as well! > > Thanks for your review and best regards, > Kilian > > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Tue Feb 13 18:19:24 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 13 Feb 2024 19:19:24 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/xuantie-bins: new package In-Reply-To: <6015348.lOV4Wx5bFT@laptop> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-2-kilian.zinnecker@mail.de> <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> <6015348.lOV4Wx5bFT@laptop> Message-ID: Hi Kilian, On 11/02/24 13:15, kilian.zinnecker--- via buildroot wrote: > Hello Giulio, all, > > [--SNIP--] >> can you please provide a separate patch to alphabetize? > > I did so: https://gitlab.com/buildroot.org/buildroot/-/commit/ > 53fad3242d74b9fad11978429d6cc2879f783f4b > > However, unfortunately Thomas de-alphabetized it again when he applied my > RZBoard V2L patches: https://gitlab.com/buildroot.org/buildroot/-/commit/ > f003675119c9ca503afa19c04074e81c49538baf > > I just send a v3 of the BeagleV-Ahead patches. After we get this series > applied, I will then again send a single patch to alphabetize. Please send the alphabetize patch along with the V4 patchset, > > [--SNIP--] >>> --- /dev/null >>> +++ b/package/xuantie-bins/Config.in >>> @@ -0,0 +1,6 @@ >>> +config BR2_PACKAGE_XUANTIE_BINS >>> + bool "xuantie-bins" >>> + depends on BR2_riscv >>> + help >>> + This package provides binary blobs, needed for the >>> + BeagleV-Ahead's SoC (TH1520). >> >> Can you please describe a bit what those binaries are meant for? > > > I gave a brief description, but I don't know much about these. Maybe Robert > can give even more information, if more is needed? I see sufficient explanation in V3 > > [--SNIP--] >>> +XUANTIE_BINS_FPGA_BIN_FILENAME = "bins/light_aon_fpga.bin" >>> +XUANTIE_BINS_AUDIO_BIN_FILENAME = "bins/light_c906_audio.bin" >>> + >>> +define XUANTIE_BINS_INSTALL_IMAGES_CMDS >>> + $(foreach f, \ >>> + $(XUANTIE_BINS_FPGA_BIN_FILENAME) \ >>> + $(XUANTIE_BINS_AUDIO_BIN_FILENAME) \ >>> + , \ >>> + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(f) >>> + ) >>> +endef >> >> Being only 2 files to be installed I'd prefer to see 2 lines instead of >> foreach loop. Can you please change it accordingly? > > I unrolled the loop in my v3 of the patches. Fine, see V3 comments. Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From ju.o at free.fr Tue Feb 13 18:21:57 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 13 Feb 2024 19:21:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinycompress: bump to version 1.2.11 Message-ID: <20240213182157.916696-1-ju.o@free.fr> For commit log, see: https://github.com/alsa-project/tinycompress/commits/v1.2.11/ Signed-off-by: Julien Olivain --- Patch tested master branch at commit e889a1c with commands: utils/test-pkg -a -p tinycompress ... 45 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/tinycompress/tinycompress.hash | 2 +- package/tinycompress/tinycompress.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tinycompress/tinycompress.hash b/package/tinycompress/tinycompress.hash index 164f3a36c3..f86b75f346 100644 --- a/package/tinycompress/tinycompress.hash +++ b/package/tinycompress/tinycompress.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 2f897e5112cd3bca6790b5cecfda6e0662c8bc5ee0fbab972b247a0cc620d66c tinycompress-1.2.8.tar.bz2 +sha256 ebbe788c28328e7cca245aaf9194a5ad0dc91e9e0dc883c2cf9feb6d42c9f3fc tinycompress-1.2.11.tar.bz2 # Locally calculated sha256 912ea37a4435594a3b3c35f04efa4b5b7af2e68a05f5319c16c881711a31e4b7 COPYING diff --git a/package/tinycompress/tinycompress.mk b/package/tinycompress/tinycompress.mk index c9cfbb574b..fabd5884b2 100644 --- a/package/tinycompress/tinycompress.mk +++ b/package/tinycompress/tinycompress.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYCOMPRESS_VERSION = 1.2.8 +TINYCOMPRESS_VERSION = 1.2.11 TINYCOMPRESS_SOURCE = tinycompress-$(TINYCOMPRESS_VERSION).tar.bz2 TINYCOMPRESS_SITE = https://www.alsa-project.org/files/pub/tinycompress TINYCOMPRESS_LICENSE = BSD-3-Clause and LGPL-2.1 -- 2.43.0 From mail at sebastianbauer.info Tue Feb 13 18:30:44 2024 From: mail at sebastianbauer.info (Sebastian Bauer) Date: Tue, 13 Feb 2024 19:30:44 +0100 Subject: [Buildroot] [PATCH 3/3] packages/libcamera-apps: Fix build to use meson In-Reply-To: <20240212230721.4f97dae3@windsurf> References: <20231227182429.1215185-1-mail@sebastianbauer.info> <20231227182429.1215185-3-mail@sebastianbauer.info> <20240212230721.4f97dae3@windsurf> Message-ID: <52d43e0922ed044d0cb15d50af7d85d5@sebastianbauer.info> Hello Thomas, Am 2024-02-12 23:07, schrieb Thomas Petazzoni: > On Wed, 27 Dec 2023 19:24:29 +0100 > Sebastian Bauer wrote: > >> Upstream uses meson instead of cmake since a while. >> >> Signed-off-by: Sebastian Bauer > Thanks for your patch, and sorry for the slow feedback. Could you > clarify why this you say "Fix build" in your commit title? Is there > some build failure, or is this an improvement patch? There has been a build failure, because the libcamera-apps version pinned at that time did not come with a CMakeLists.txt file (anymore). The build is not broken currently because libcamera-apps was reverted to 1.2.1 by one previous patch. The subject is probably not correct anymore. But if libcamera-apps is bumped again, a switch to meson is mandatory. I have tried to bump libcamera and libcamera-apps to newer versions in the meantime but I haven't found a combination that works yet on the Pi (it builds but the resulting binarys do not work as they used to work). >> -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) >> -LIBCAMERA_APPS_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic >> -endif > You're removing this chunk, but it was important. Do you have some > evidence that it is no longer needed? I cannot say it for sure, but given the fact that the build was broken for all platforms before this patch series I did not bother to investigate it. However, I saw the presence of the flag in the build for the Raspberry Pi, which may indicate that this chunk is not necessary, but I'm not on SPARC to test it. I also have no idea how to inject this flag manually using meson. But I believe that, if the problem is still existent, a proper fix would be at a different place, as the propagation of the flag works on other platforms. Note that in the meantime also the project libcamera-apps was renamed to rpicam-apps suggesting that SPARC is not the original target of that toolset. Bye Sebastian From alexander.sverdlin at gmail.com Tue Feb 13 18:45:14 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Tue, 13 Feb 2024 19:45:14 +0100 Subject: [Buildroot] [PATCH 02/21] configs/ti_am62x_sk_defconfig: fix optee-os plateform In-Reply-To: <20240213172817.2872849-3-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-3-romain.naour@smile.fr> Message-ID: <08881a814bf7466c4130ff4d137415b54c007808.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: > According to meta-ti, the optee-os plateform must be > "k3-am62x" not "k3". > > ? meta-ti uses the OPTEEMACHINE to set optee-os platform [1]. > ? meta-ti]$ git grep OPTEEMACHINE > ? meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" > ? meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" > ? meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" > ? meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" > ? meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" > ? meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" > ? meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" > > [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 > > Signed-off-by: Romain Naour indeed, Reviewed-by: Alexander Sverdlin > --- > On SK-TDA4VM, such error leads to a runtime boot crash. > --- > ?configs/ti_am62x_sk_defconfig | 2 +- > ?1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index f88252a89c..c3ad555a81 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > ?BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Tue Feb 13 18:56:22 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Tue, 13 Feb 2024 19:56:22 +0100 Subject: [Buildroot] [PATCH 03/21] configs/ti_am64x_sk_defconfig: fix optee-os plateform In-Reply-To: <20240213172817.2872849-4-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-4-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: > According to meta-ti, the optee-os plateform must be > "k3-am64x" not "k3". > > ? meta-ti uses the OPTEEMACHINE to set optee-os platform [1]. > ? meta-ti]$ git grep OPTEEMACHINE > ? meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" > ? meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" > ? meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" > ? meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" > ? meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" > ? meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" > ? meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" > > [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > On SK-TDA4VM, such error leads to a runtime boot crash. > --- > ?configs/ti_am64x_sk_defconfig | 2 +- > ?1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 4bfd31f0c8..097175bd8f 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > ?BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Tue Feb 13 19:05:15 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Tue, 13 Feb 2024 20:05:15 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240213172817.2872849-22-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > ti-k3-image-gen tool is deprecated an replaced by binman [1]. > > All defconfig that was using it have been updated to use U-boot > binman tool instead. > > So, we can safely remove ti-k3-image-gen package. > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > > Cc: Anand Gadiyar > Cc: Xuanhao Shi > Signed-off-by: Romain Naour > --- > ?Config.in.legacy????????????????????????? |? 7 ++ > ?DEVELOPERS??????????????????????????????? |? 2 - > ?boot/Config.in??????????????????????????? |? 1 - > ?boot/ti-k3-image-gen/Config.in??????????? | 81 ----------------------- > ?boot/ti-k3-image-gen/ti-k3-image-gen.hash |? 3 - > ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?? | 54 --------------- > ?6 files changed, 7 insertions(+), 141 deletions(-) > ?delete mode 100644 boot/ti-k3-image-gen/Config.in > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk > > diff --git a/Config.in.legacy b/Config.in.legacy > index a869279af7..2b59a65f1c 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > ? > ?comment "Legacy options removed in 2024.02" > ? > +config BR2_TARGET_TI_K3_IMAGE_GEN > + bool "ti-k3-image-gen removed" > + select BR2_LEGACY > + help > + ? ti-k3-image-gen tool? has been removed and replaced by > + ? U-Boot binman tool (requires U-boot >= 2024.01). Is commit 6d6228ab8fe5 "am62a: dts: binman: Package tiboot3.bin, tispl.bin, u-boot.img" in U-Boot repo not what is actually required (since v2023.10)? At least that's the version which works for me. -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Tue Feb 13 20:23:10 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Tue, 13 Feb 2024 21:23:10 +0100 Subject: [Buildroot] [PATCH 14/21] boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E In-Reply-To: <20240213172817.2872849-15-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-15-romain.naour@smile.fr> Message-ID: <4f0f43f7cba1c96f5ba3ba0a4c4e7299e916c2f3.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > The k3 J721E support is needed to build for DRA829/TDA4VM SoC. > > https://www.ti.com/product/TDA4VM?(SoC) > https://www.ti.com/tool/PROCESSOR-SDK-J721E?(TI SDK) > https://www.ti.com/tool/SK-TDA4VM?(TDA4VM processor starter kit) > https://beagleboard.org/ai-64?(BeagleBone AI-64 SBC) > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/ti-k3-boot-firmware/Config.in | 5 +++++ > ?1 file changed, 5 insertions(+) > > diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3-boot-firmware/Config.in > index 8393699998..c9a09d8b19 100644 > --- a/boot/ti-k3-boot-firmware/Config.in > +++ b/boot/ti-k3-boot-firmware/Config.in > @@ -22,6 +22,9 @@ config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X > ?config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X > ? bool "am65x" > ? > +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > + bool "j721e" > + > ?endchoice > ? > ?config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC > @@ -30,12 +33,14 @@ config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC > ? default "am62x"? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X > ? default "am64x"? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X > ? default "am65x"? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X > + default "j721e"? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > ? > ?# Only devices with a split firmware boot flow requires a DM firmware (eg: am62, j721e) > ?config BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM > ? string > ? default "am62axx" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX > ? default "am62xx"? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X > + default "j721e"?? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > ? default "" > ? > ?endif -- Alexander Sverdlin. From thomas at devoogdt.com Tue Feb 13 20:40:13 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 13 Feb 2024 21:40:13 +0100 Subject: [Buildroot] [PATCH v1] package/wayland-protocols: bump to 1.33 Message-ID: <20240213204013.104794-1-thomas@devoogdt.com> [ANNOUNCE] wayland-protocols 1.32 https://lists.freedesktop.org/archives/wayland-devel/2023-July/042836.html Signed-off-by: Thomas Devoogdt --- package/wayland-protocols/wayland-protocols.hash | 6 +++--- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index d039cd6fba..58c432e365 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-July/042836.html -sha256 7459799d340c8296b695ef857c07ddef24c5a09b09ab6a74f7b92640d2b1ba11 wayland-protocols-1.32.tar.xz -sha512 90bbd52daf342b98823ddeed04e349ae242d2eaf925ab8d603cceb36c980c83b5681bb890961e0d49584cb5c2e60a33abf8821770c6ab87956383630bd5b7966 wayland-protocols-1.32.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2024-January/043400.html +sha256 94f0c50b090d6e61a03f62048467b19abbe851be4e11ae7b36f65f8b98c3963a wayland-protocols-1.33.tar.xz +sha512 4584f6ac86367655f9db5d0c0ed0681efa31e73f984e4b620fbe5317df21790927f4f5317ecbbc194ac31eaf88caebc431bcc52c23d9dc0098c71de3cb4a9fef wayland-protocols-1.33.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 2cfaa830e5..50a08d1988 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.32 +WAYLAND_PROTOCOLS_VERSION = 1.33 WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT -- 2.34.1 From thomas at devoogdt.com Tue Feb 13 20:42:40 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 13 Feb 2024 21:42:40 +0100 Subject: [Buildroot] [PATCH v2] package/wayland-protocols: bump to 1.33 Message-ID: <20240213204240.105047-1-thomas@devoogdt.com> Announce: https://lists.freedesktop.org/archives/wayland-devel/2024-January/043400.html Signed-off-by: Thomas Devoogdt --- v2: fix wrong announce version in git message --- package/wayland-protocols/wayland-protocols.hash | 6 +++--- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index d039cd6fba..58c432e365 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-July/042836.html -sha256 7459799d340c8296b695ef857c07ddef24c5a09b09ab6a74f7b92640d2b1ba11 wayland-protocols-1.32.tar.xz -sha512 90bbd52daf342b98823ddeed04e349ae242d2eaf925ab8d603cceb36c980c83b5681bb890961e0d49584cb5c2e60a33abf8821770c6ab87956383630bd5b7966 wayland-protocols-1.32.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2024-January/043400.html +sha256 94f0c50b090d6e61a03f62048467b19abbe851be4e11ae7b36f65f8b98c3963a wayland-protocols-1.33.tar.xz +sha512 4584f6ac86367655f9db5d0c0ed0681efa31e73f984e4b620fbe5317df21790927f4f5317ecbbc194ac31eaf88caebc431bcc52c23d9dc0098c71de3cb4a9fef wayland-protocols-1.33.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 2cfaa830e5..50a08d1988 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.32 +WAYLAND_PROTOCOLS_VERSION = 1.33 WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT -- 2.34.1 From ju.o at free.fr Tue Feb 13 20:49:15 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 13 Feb 2024 21:49:15 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add lvm2 runtime test Message-ID: <20240213204915.27898-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + support/testing/tests/package/test_lvm2.py | 163 ++++++++++++++++++ .../package/test_lvm2/linux-lvm2.fragment | 2 + 3 files changed, 167 insertions(+) create mode 100644 support/testing/tests/package/test_lvm2.py create mode 100644 support/testing/tests/package/test_lvm2/linux-lvm2.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..e6d79f3675 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1810,6 +1810,8 @@ F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py F: support/testing/tests/package/test_ltrace.py +F: support/testing/tests/package/test_lvm2.py +F: support/testing/tests/package/test_lvm2/ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py diff --git a/support/testing/tests/package/test_lvm2.py b/support/testing/tests/package/test_lvm2.py new file mode 100644 index 0000000000..bdbae7a4ec --- /dev/null +++ b/support/testing/tests/package/test_lvm2.py @@ -0,0 +1,163 @@ +import os +import subprocess + +import infra.basetest + + +class TestLvm2(infra.basetest.BRTest): + # This test creates a lvm2 volume. A specific Kernel need to be + # built with a config fragment enabling this support. This test + # also uses resize2fs from e2fsprogs. + kernel_fragment = \ + infra.filepath("tests/package/test_lvm2/linux-lvm2.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.77" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_E2FSPROGS=y + BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y + BR2_PACKAGE_LVM2=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def get_free_disk_space(self, path): + out, ret = self.emulator.run(f"df -k {path}") + self.assertEqual(ret, 0) + return int(out[1].split()[3]) + + def test_run(self): + # Test configuration: + storage_devs = ["/dev/vda", "/dev/vdb", "/dev/vdc"] + storage_size = 16 # Mega Bytes + lvm_vg = "br_vg" # Volume Group name + lvm_lv = "br_lv" # Logical Volume name + lv_dev = f"/dev/{lvm_vg}/{lvm_lv}" # Logical Volume dev name + mnt_pt = "/mnt/lvm2-storage" + data_file = f"{mnt_pt}/data.bin" + + qemu_storage_opts = [] + for i in range(len(storage_devs)): + disk_file = os.path.join(self.builddir, "images", f"disk{i}.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}\n") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", + "bs=1M", f"count={storage_size}"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + opts = ["-drive", f"file={disk_file},if=virtio,format=raw"] + qemu_storage_opts += opts + + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img] + qemu_storage_opts) + self.emulator.login() + + # Test the program can execute. + self.assertRunOk("lvm version") + + # We did not created any Physical Volume yet. We should NOT + # see any of our storage devices in a pvscan. + out, ret = self.emulator.run("pvscan") + self.assertEqual(ret, 0) + for dev in storage_devs: + self.assertNotIn(dev, "\n".join(out)) + + # We initialize our Physical Volumes (PVs). + pv_devs = " ".join(storage_devs) + self.assertRunOk(f"pvcreate {pv_devs}") + + # We run few diagnostic commands related to PVs. + self.assertRunOk(f"pvck {pv_devs}") + self.assertRunOk(f"pvdisplay {pv_devs}") + self.assertRunOk("pvs") + + # Now we initialized the PVs, we should see them in a pvscan. + out, ret = self.emulator.run("pvscan") + self.assertEqual(ret, 0) + for dev in storage_devs: + self.assertIn(dev, "\n".join(out)) + + # We create a Volume Group (VG) including two of our three + # PVs. + cmd = f"vgcreate {lvm_vg} {storage_devs[0]} {storage_devs[1]}" + self.assertRunOk(cmd) + + # We run few diagnostic commands related to VGs. + self.assertRunOk(f"vgck {lvm_vg}") + self.assertRunOk(f"vgdisplay {lvm_vg}") + self.assertRunOk("vgscan") + self.assertRunOk("vgs") + + # We create a Logical Volume (LV) in our VG. + self.assertRunOk(f"lvcreate -l 100%FREE -n {lvm_lv} {lvm_vg}") + + # We check LVM created the LV device. + self.assertRunOk(f"ls -al {lv_dev}") + + # We run few diagnostic commands related to LVs. + self.assertRunOk("lvscan") + self.assertRunOk("lvs") + + # We create a ext4 filesystem on our LV. + self.assertRunOk(f"mkfs.ext4 {lv_dev}") + + # We create a mount point directory and mount the device. + self.assertRunOk(f"mkdir -p {mnt_pt}") + self.assertRunOk(f"mount {lv_dev} {mnt_pt}") + + # We create a data file in our new filesystem. Note: this file + # is slightly larger than a single PV. This data file should + # span over the two PVs in the VG. + data_size = storage_size + 4 + cmd = f"dd if=/dev/urandom of={data_file} bs=1M count={data_size}" + self.assertRunOk(cmd) + + # We compute the hash of our data, and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # We compute the free space of the mount point. + fs_free_space = self.get_free_disk_space(mnt_pt) + + # We extend of VG with our third PV. + self.assertRunOk(f"vgextend {lvm_vg} {storage_devs[2]}") + + # We grow the LV to use all the space of the VG. + self.assertRunOk(f"lvresize -l +100%FREE {lvm_vg}/{lvm_lv}") + + # We resize the filesystem to use all the LV space. + self.assertRunOk(f"resize2fs {lv_dev}") + + # Now we grew the LV and resized the filesystem, we recompute + # the free space and check we have more. + fs2_free_space = self.get_free_disk_space(mnt_pt) + self.assertGreater(fs2_free_space, fs_free_space) + + # With all those on-the-fly operations on the mounted + # filesystem, the data file should be intact. We should + # recompute the same data checksum as before. + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) + + # Finally, we unmount the filesystem. It should not contain + # any error. + self.assertRunOk(f"umount {mnt_pt}") + self.assertRunOk(f"e2fsck -f -n {lv_dev}") diff --git a/support/testing/tests/package/test_lvm2/linux-lvm2.fragment b/support/testing/tests/package/test_lvm2/linux-lvm2.fragment new file mode 100644 index 0000000000..0fade167a3 --- /dev/null +++ b/support/testing/tests/package/test_lvm2/linux-lvm2.fragment @@ -0,0 +1,2 @@ +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y -- 2.43.1 From fontaine.fabrice at gmail.com Tue Feb 13 21:00:51 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 13 Feb 2024 22:00:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/botan: fix uclibc build Message-ID: <20240213210051.162913-1-fontaine.fabrice@gmail.com> getentropy is enabled by default since version 3.0 and https://github.com/randombit/botan/commit/8642f2a99deefc85cdb512ee50d9f62c5e0ae4b8 and explicit_bzero is also enabled since version 3.0 and https://github.com/randombit/botan/commit/e6819a380fb67c1be546dc618248b62d93266423 resulting in the following build failure since bump to version 3.2.0 in commit 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813: src/lib/entropy/getentropy/getentropy.cpp:26:9: error: '::getentropy' has not been declared; did you mean 'Getentropy'? 26 | if(::getentropy(buf.data(), buf.size()) == 0) { | ^~~~~~~~~~ | Getentropy Fixes: 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 - http://autobuild.buildroot.org/results/d58c4730c770467b42af426545dd917ecc5fed17 Signed-off-by: Fabrice Fontaine --- package/botan/botan.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 7c290f04ad..88dbfa5807 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -49,7 +49,7 @@ BOTAN_CONF_OPTS += --without-stack-protector endif ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -BOTAN_CONF_OPTS += --without-os-feature=getauxval +BOTAN_CONF_OPTS += --without-os-feature=explicit_bzero,getauxval,getentropy endif ifeq ($(BR2_PACKAGE_BOOST_FILESYSTEM)$(BR2_PACKAGE_BOOST_SYSTEM),yy) -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 13 21:05:23 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 13 Feb 2024 22:05:23 +0100 Subject: [Buildroot] [PATCH 1/1] Revert "package/crun: allow building with uClibc" Message-ID: <20240213210523.166319-1-fontaine.fabrice@gmail.com> This reverts commit 223596c75d73a7eb29152235d3c5d9bf53bd58f5 indeed fexecve is only available since https://github.com/wbx-github/uclibc-ng/commit/858ffad217076227089cc17eb832db0bd1497792 resulting in the following build failure with uclibc < 1.0.33: /home/thomas/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arceb-snps-linux-uclibc/9.2.1/../../../../arceb-snps-linux-uclibc/bin/ld: libcrun_testing.a(libcrun_testing_a-cloned_binary.o): in function `ensure_cloned_binary': /home/thomas/autobuild/instance-3/output-1/build/crun-1.8.4/src/libcrun/cloned_binary.c:540: undefined reference to `fexecve' Fixes: 223596c75d73a7eb29152235d3c5d9bf53bd58f5 - http://autobuild.buildroot.org/results/9c4488d5d26e575f39bcbaed8e0793ed1cdb8cd5 Signed-off-by: Fabrice Fontaine --- package/crun/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/crun/Config.in b/package/crun/Config.in index f6a1ec7c66..bbed21817e 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_CRUN bool "crun" depends on BR2_USE_MMU # fork() + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h - select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_YAJL # libocispec help crun is a fast and low-memory OCI Container Runtime in C. -- 2.43.0 From james.hilliard1 at gmail.com Tue Feb 13 21:14:47 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:47 -0700 Subject: [Buildroot] [PATCH v8 01/26] package/python-poetry-core: new host package Message-ID: <20240213211512.3918044-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - update to 1.7.0 - drop patch which is now upstream --- package/python-poetry-core/python-poetry-core.hash | 5 +++++ package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-poetry-core/python-poetry-core.hash create mode 100644 package/python-poetry-core/python-poetry-core.mk diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash new file mode 100644 index 0000000000..c6b180c852 --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/poetry-core/json +md5 7461547cac0e0e9c8cd7463aa87e7470 poetry_core-1.7.0.tar.gz +sha256 8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74 poetry_core-1.7.0.tar.gz +# Locally computed sha256 checksums +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk new file mode 100644 index 0000000000..4ca587b11d --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-poetry-core +# +################################################################################ + +PYTHON_POETRY_CORE_VERSION = 1.7.0 +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/cb/1c/af7f886e723b2dfbaea9b8a739153f227b386dd856cf956f9fd0ed0a502b +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 +PYTHON_POETRY_CORE_LICENSE = MIT +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:48 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:48 -0700 Subject: [Buildroot] [PATCH v8 02/26] package/python-terminaltables: use correct pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-2-james.hilliard1@gmail.com> We need to migrate python-terminaltables to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Upstream has merged a patch replacing poetry with poetry-core, however we can not backport this using a patch file due to CRLF line ending issues so we will have to apply the change in the patch using sed instead. See upstream commit: https://github.com/matthewdeanmartin/terminaltables/commit/9e3dda0efb54fee6934c744a13a7336d24c6e9e9 Signed-off-by: James Hilliard --- Changes v1 -> v2: - add more details regarding pep517 frontend compatibility --- package/python-terminaltables/python-terminaltables.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index b31ed332b6..385c71ae2d 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -7,8 +7,16 @@ PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 -PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools +PYTHON_TERMINALTABLES_SETUP_TYPE = pep517 PYTHON_TERMINALTABLES_LICENSE = MIT PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE +PYTHON_TERMINALTABLES_DEPENDENCIES = host-python-poetry-core + +# we can't use a normal patch file due to different line endings +define PYTHON_TERMINALTABLES_USE_POETRY_CORE + $(SED) 's/requires = \["poetry>=0.12"\]/requires = \["poetry-core>=1.0.0"\]/' $(@D)/pyproject.toml + $(SED) 's/build-backend = "poetry.masonry.api"/build-backend = "poetry.core.masonry.api"/' $(@D)/pyproject.toml +endef +PYTHON_TERMINALTABLES_POST_PATCH_HOOKS += PYTHON_TERMINALTABLES_USE_POETRY_CORE $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:49 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:49 -0700 Subject: [Buildroot] [PATCH v8 03/26] package/python-setuptools-rust: add host setuptools-scm dependency In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-3-james.hilliard1@gmail.com> We need host-python-setuptools-scm for python-setuptools-rust to build correctly when using a pep517 frontend. Fixes: * Getting build dependencies for wheel... running egg_info writing setuptools_rust.egg-info/PKG-INFO writing dependency_links to setuptools_rust.egg-info/dependency_links.txt writing entry points to setuptools_rust.egg-info/entry_points.txt writing requirements to setuptools_rust.egg-info/requires.txt writing top-level names to setuptools_rust.egg-info/top_level.txt reading manifest file 'setuptools_rust.egg-info/SOURCES.txt' reading manifest template 'MANIFEST.in' adding license file 'LICENSE' writing manifest file 'setuptools_rust.egg-info/SOURCES.txt' ERROR Missing dependencies: setuptools_scm Signed-off-by: James Hilliard --- package/python-setuptools-rust/python-setuptools-rust.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index f07263becf..e664a5604f 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -10,6 +10,9 @@ PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/f2/40/f1e9 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-semantic-version +HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + host-rustc \ + host-python-semantic-version \ + host-python-setuptools-scm $(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:50 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:50 -0700 Subject: [Buildroot] [PATCH v8 04/26] package/python-setuptools: revert to last version with functional --build-option In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-4-james.hilliard1@gmail.com> A recent change in setuptools accidentially broke the ability to pass build_ext args via the --build-option config setting. Lets downgrade to the last working version for now. Signed-off-by: James Hilliard --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 7f13ac3896..9c971eec11 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools/json -md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz -sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz +md5 d967ca2ba7f46db887daee2d5c9bd6a2 setuptools-68.2.2.tar.gz +sha256 4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 setuptools-68.2.2.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 0aea3c6cfa..f26f427ccc 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 69.0.3 +PYTHON_SETUPTOOLS_VERSION = 68.2.2 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:51 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:51 -0700 Subject: [Buildroot] [PATCH v8 05/26] package/python-pyyaml: add cython for host-python-pyyaml In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-5-james.hilliard1@gmail.com> When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for pyyaml. Signed-off-by: James Hilliard --- package/python-pyyaml/python-pyyaml.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 846c57df4f..4ab91ca5f6 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -14,7 +14,8 @@ PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 -HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml +HOST_PYTHON_PYYAML_DEPENDENCIES = host-python-cython host-libyaml +HOST_PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 $(eval $(python-package)) $(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:52 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:52 -0700 Subject: [Buildroot] [PATCH v8 06/26] package/python-aiofiles: migrate to hatching pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-6-james.hilliard1@gmail.com> When building with a pep517 frontend we need to use the specified build backend as opposed to the fallback setuptools build which only works when not building with a pep517 frontend. Fixes: ERROR Backend 'hatchling.build' is not available. Signed-off-by: James Hilliard --- package/python-aiofiles/python-aiofiles.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index 582f7908cd..954647bf76 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -7,8 +7,9 @@ PYTHON_AIOFILES_VERSION = 23.2.1 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/af/41/cfed10bc64d774f497a86e5ede9248e1d062db675504b41c320954d99641 -PYTHON_AIOFILES_SETUP_TYPE = setuptools +PYTHON_AIOFILES_SETUP_TYPE = pep517 PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE +PYTHON_AIOFILES_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:53 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:53 -0700 Subject: [Buildroot] [PATCH v8 07/26] package/python-aiologstash: migrate to flit build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-7-james.hilliard1@gmail.com> We need to add a patch which selects the correct flit build backend. As flit is configured as the pep517 build backend for aiologstash we need to migrate from setuptools to flit prior to migrating setuptools to pep517 as the frontend will not fall back to using setuptools once migrated. Signed-off-by: James Hilliard --- ...Fix-flit_core-build-requires-backend.patch | 31 +++++++++++++++++++ .../python-aiologstash/python-aiologstash.mk | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch diff --git a/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch b/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch new file mode 100644 index 0000000000..99a150a344 --- /dev/null +++ b/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch @@ -0,0 +1,31 @@ +From 3c4d1203eb9ee3dbe79b096d587c9baaf8b802ed Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 11 Mar 2022 13:26:31 -0700 +Subject: [PATCH] Fix flit_core build requires/backend. + +Only flit_core should be required by pyproject.toml, the regular flit +package is the pep517 frontend which is not what should be set for the +build system. + +Signed-off-by: James Hilliard +Upstream: https://github.com/aio-libs/aiologstash/pull/258 +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 7bdaebb..252a660 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] +-requires = ["flit"] +-build-backend = "flit.buildapi" ++requires = ["flit_core"] ++build-backend = "flit_core.buildapi" + + [tool.flit.metadata] + module = "aiologstash" +-- +2.34.1 + diff --git a/package/python-aiologstash/python-aiologstash.mk b/package/python-aiologstash/python-aiologstash.mk index de0ed820a0..bcf60a72e9 100644 --- a/package/python-aiologstash/python-aiologstash.mk +++ b/package/python-aiologstash/python-aiologstash.mk @@ -7,7 +7,7 @@ PYTHON_AIOLOGSTASH_VERSION = 2.0.0 PYTHON_AIOLOGSTASH_SOURCE = aiologstash-$(PYTHON_AIOLOGSTASH_VERSION).tar.gz PYTHON_AIOLOGSTASH_SITE = https://files.pythonhosted.org/packages/1c/dc/382861d5d25ccc976d02118922598fc4547f74f3287793e270ed614d8176 -PYTHON_AIOLOGSTASH_SETUP_TYPE = setuptools +PYTHON_AIOLOGSTASH_SETUP_TYPE = flit PYTHON_AIOLOGSTASH_LICENSE = MIT PYTHON_AIOLOGSTASH_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:54 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:54 -0700 Subject: [Buildroot] [PATCH v8 08/26] package/python-bleak: use correct pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-8-james.hilliard1@gmail.com> We need to migrate python-bleak to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-bleak/python-bleak.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index ed3c3f2f93..716b6327ed 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -7,8 +7,9 @@ PYTHON_BLEAK_VERSION = 0.21.1 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/6a/c0/3aca655fa43b8ff5340d99fac4e67061f53f42f092fc847bdd0559d67846 -PYTHON_BLEAK_SETUP_TYPE = setuptools +PYTHON_BLEAK_SETUP_TYPE = pep517 PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE +PYTHON_BLEAK_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:55 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:55 -0700 Subject: [Buildroot] [PATCH v8 09/26] package/python-canopen: add setuptools-scm build dependency In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-9-james.hilliard1@gmail.com> The host-python-setuptools-scm dependency needs to be added prior to migrating setuptools to pep517 as this dependency is listed as a build requirement in the pyproject.toml. Signed-off-by: James Hilliard --- package/python-canopen/python-canopen.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index 963c4ab801..09ec595ec6 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -10,5 +10,6 @@ PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/49/55/67e555f6f4ea PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt +PYTHON_CANOPEN_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:56 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:56 -0700 Subject: [Buildroot] [PATCH v8 10/26] package/python-dbus-fast: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-10-james.hilliard1@gmail.com> We need to migrate python-dbus-fast to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. We do need to additinally keep a dependency on host-python-setuptools as that is specified as an additional build requirement. Signed-off-by: James Hilliard --- package/python-dbus-fast/python-dbus-fast.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/python-dbus-fast/python-dbus-fast.mk b/package/python-dbus-fast/python-dbus-fast.mk index b890177c74..1456ce5e4c 100644 --- a/package/python-dbus-fast/python-dbus-fast.mk +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -7,10 +7,13 @@ PYTHON_DBUS_FAST_VERSION = 2.12.0 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/f5/8c/220fcbe4337b842d730d5752f207fc8efd3a02405c71c329e61218e947b8 -PYTHON_DBUS_FAST_SETUP_TYPE = setuptools +PYTHON_DBUS_FAST_SETUP_TYPE = pep517 PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE PYTHON_DBUS_FAST_ENV = REQUIRE_CYTHON=1 -PYTHON_DBUS_FAST_DEPENDENCIES = host-python-cython +PYTHON_DBUS_FAST_DEPENDENCIES = \ + host-python-cython \ + host-python-poetry-core \ + host-python-setuptools $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:57 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:57 -0700 Subject: [Buildroot] [PATCH v8 11/26] package/python-dnspython: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-11-james.hilliard1@gmail.com> We need to migrate python-dnspython to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-dnspython/python-dnspython.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-dnspython/python-dnspython.mk b/package/python-dnspython/python-dnspython.mk index 1459ec8881..f0df733143 100644 --- a/package/python-dnspython/python-dnspython.mk +++ b/package/python-dnspython/python-dnspython.mk @@ -9,9 +9,9 @@ PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).tar.gz PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/65/2d/372a20e52a87b2ba0160997575809806111a72e18aa92738daccceb8d2b9 PYTHON_DNSPYTHON_LICENSE = ISC PYTHON_DNSPYTHON_LICENSE_FILES = LICENSE -PYTHON_DNSPYTHON_SETUP_TYPE = setuptools -PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm -HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm +PYTHON_DNSPYTHON_SETUP_TYPE = pep517 +PYTHON_DNSPYTHON_DEPENDENCIES = host-python-poetry-core +HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) $(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:58 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:58 -0700 Subject: [Buildroot] [PATCH v8 12/26] package/python-flask-babel: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-12-james.hilliard1@gmail.com> We need to migrate python-flask-babel to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-flask-babel/python-flask-babel.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-flask-babel/python-flask-babel.mk b/package/python-flask-babel/python-flask-babel.mk index b3ecdf6cf6..3970a14db1 100644 --- a/package/python-flask-babel/python-flask-babel.mk +++ b/package/python-flask-babel/python-flask-babel.mk @@ -8,7 +8,8 @@ PYTHON_FLASK_BABEL_VERSION = 4.0.0 PYTHON_FLASK_BABEL_SOURCE = flask_babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/58/1a/4c65e3b90bda699a637bfb7fb96818b0a9bbff7636ea91aade67f6020a31 PYTHON_FLASK_BABEL_LICENSE = BSD-3-Clause -PYTHON_FLASK_BABEL_SETUP_TYPE = setuptools +PYTHON_FLASK_BABEL_SETUP_TYPE = pep517 PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE +PYTHON_FLASK_BABEL_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:59 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:59 -0700 Subject: [Buildroot] [PATCH v8 13/26] package/python-flask-wtf: migrate to hatching pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-13-james.hilliard1@gmail.com> When building with a pep517 frontend we need to use the specified build backend as opposed to the fallback setuptools build which only works when not building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is hatchling and not setuptools. Signed-off-by: James Hilliard --- package/python-flask-wtf/python-flask-wtf.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-flask-wtf/python-flask-wtf.mk b/package/python-flask-wtf/python-flask-wtf.mk index 8274585ad3..bb32d55e25 100644 --- a/package/python-flask-wtf/python-flask-wtf.mk +++ b/package/python-flask-wtf/python-flask-wtf.mk @@ -9,6 +9,7 @@ PYTHON_FLASK_WTF_SOURCE = flask_wtf-$(PYTHON_FLASK_WTF_VERSION).tar.gz PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/9b/ef/b6ec35e02f479f6e76e02ede14594c9cfa5e6dcbab6ea0e82fa413993a2a PYTHON_FLASK_WTF_LICENSE = BSD-3-Clause PYTHON_FLASK_WTF_LICENSE_FILES = LICENSE.rst -PYTHON_FLASK_WTF_SETUP_TYPE = setuptools +PYTHON_FLASK_WTF_SETUP_TYPE = pep517 +PYTHON_FLASK_WTF_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:00 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:00 -0700 Subject: [Buildroot] [PATCH v8 14/26] package/python-expandvars: new host package In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-14-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-expandvars/python-expandvars.hash | 5 +++++ package/python-expandvars/python-expandvars.mk | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/python-expandvars/python-expandvars.hash create mode 100644 package/python-expandvars/python-expandvars.mk diff --git a/package/python-expandvars/python-expandvars.hash b/package/python-expandvars/python-expandvars.hash new file mode 100644 index 0000000000..0123ed5420 --- /dev/null +++ b/package/python-expandvars/python-expandvars.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/expandvars/json +md5 8091f578a547e2b4b9df59100a179266 expandvars-0.12.0.tar.gz +sha256 7d1adfa55728cf4b5d812ece3d087703faea953e0c0a1a78415de9df5024d844 expandvars-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 b8a43c35080fc5855e4f8171e4d0d002f6ff1633d8cfc0b5dee0ac4ced2deac7 LICENSE diff --git a/package/python-expandvars/python-expandvars.mk b/package/python-expandvars/python-expandvars.mk new file mode 100644 index 0000000000..5c9a7249b3 --- /dev/null +++ b/package/python-expandvars/python-expandvars.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-expandvars +# +################################################################################ + +PYTHON_EXPANDVARS_VERSION = 0.12.0 +PYTHON_EXPANDVARS_SOURCE = expandvars-$(PYTHON_EXPANDVARS_VERSION).tar.gz +PYTHON_EXPANDVARS_SITE = https://files.pythonhosted.org/packages/2b/a5/46d1f58edcae1d632fafdfee313e378240e002ae45d26502bac938bd8751 +PYTHON_EXPANDVARS_SETUP_TYPE = pep517 +PYTHON_EXPANDVARS_LICENSE = MIT +PYTHON_EXPANDVARS_LICENSE_FILES = LICENSE +HOST_PYTHON_EXPANDVARS_DEPENDENCIES = host-python-hatchling + +$(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:01 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:01 -0700 Subject: [Buildroot] [PATCH v8 15/26] package/python-frozenlist: migrate to in-tree pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-15-james.hilliard1@gmail.com> When building with a pep517 frontend we need to use the specified build backend as opposed to the fallback setuptools build which only works when not building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is hatchling and not setuptools. The custom in tree backend depends on setuptools and expandvars, additionally it depends on cython 3 unless disabled. As we do not currently support cython 3 lets use the pure python build instead. Signed-off-by: James Hilliard --- package/python-frozenlist/python-frozenlist.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 9333598808..92670b3cbd 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -7,8 +7,12 @@ PYTHON_FROZENLIST_VERSION = 1.4.1 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/cf/3d/2102257e7acad73efc4a0c306ad3953f68c504c16982bbdfee3ad75d8085 -PYTHON_FROZENLIST_SETUP_TYPE = setuptools +PYTHON_FROZENLIST_SETUP_TYPE = pep517 PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE +PYTHON_FROZENLIST_DEPENDENCIES = \ + host-python-expandvars \ + host-python-setuptools +PYTHON_FROZENLIST_BUILD_OPTS = -C=pure-python=true $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:02 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:02 -0700 Subject: [Buildroot] [PATCH v8 16/26] package/python-humanize: add setuptools-scm build dependency In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-16-james.hilliard1@gmail.com> The host-python-setuptools-scm will be enforced once we migrate setuptools to use a pep517 build frontend. Signed-off-by: James Hilliard --- package/python-humanize/python-humanize.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-humanize/python-humanize.mk b/package/python-humanize/python-humanize.mk index 04cb0713fc..6155954b82 100644 --- a/package/python-humanize/python-humanize.mk +++ b/package/python-humanize/python-humanize.mk @@ -10,5 +10,6 @@ PYTHON_HUMANIZE_SITE = https://files.pythonhosted.org/packages/51/19/3e1adf0e7a8 PYTHON_HUMANIZE_SETUP_TYPE = setuptools PYTHON_HUMANIZE_LICENSE = MIT PYTHON_HUMANIZE_LICENSE_FILES = LICENCE +PYTHON_HUMANIZE_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:03 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:03 -0700 Subject: [Buildroot] [PATCH v8 17/26] package/python-iso8601: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-17-james.hilliard1@gmail.com> We need to migrate python-iso8601 to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-iso8601/python-iso8601.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-iso8601/python-iso8601.mk b/package/python-iso8601/python-iso8601.mk index ce25a2fb28..080daa4693 100644 --- a/package/python-iso8601/python-iso8601.mk +++ b/package/python-iso8601/python-iso8601.mk @@ -7,8 +7,9 @@ PYTHON_ISO8601_VERSION = 2.1.0 PYTHON_ISO8601_SOURCE = iso8601-$(PYTHON_ISO8601_VERSION).tar.gz PYTHON_ISO8601_SITE = https://files.pythonhosted.org/packages/b9/f3/ef59cee614d5e0accf6fd0cbba025b93b272e626ca89fb70a3e9187c5d15 -PYTHON_ISO8601_SETUP_TYPE = setuptools +PYTHON_ISO8601_SETUP_TYPE = pep517 PYTHON_ISO8601_LICENSE = MIT PYTHON_ISO8601_LICENSE_FILES = LICENSE +PYTHON_ISO8601_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:04 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:04 -0700 Subject: [Buildroot] [PATCH v8 18/26] package/python-cppy: add setuptools-scm build dependency In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-18-james.hilliard1@gmail.com> The host-python-setuptools-scm dependency needs to be added prior to migrating setuptools to pep517 as this dependency is listed as a build requirement in the pyproject.toml. Signed-off-by: James Hilliard --- package/python-cppy/python-cppy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-cppy/python-cppy.mk b/package/python-cppy/python-cppy.mk index adadc352d3..5bfd5a0f16 100644 --- a/package/python-cppy/python-cppy.mk +++ b/package/python-cppy/python-cppy.mk @@ -10,5 +10,6 @@ PYTHON_CPPY_SITE = https://files.pythonhosted.org/packages/c5/7e/6cc5acd93752ee5 PYTHON_CPPY_LICENSE = BSD-3-Clause PYTHON_CPPY_LICENSE_FILES = LICENSE PYTHON_CPPY_SETUP_TYPE = setuptools +HOST_PYTHON_CPPY_DEPENDENCIES = host-python-setuptools-scm $(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:05 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:05 -0700 Subject: [Buildroot] [PATCH v8 19/26] package/python-pylibftdi: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-19-james.hilliard1@gmail.com> We need to migrate python-pylibftdi to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-pylibftdi/python-pylibftdi.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/python-pylibftdi/python-pylibftdi.mk b/package/python-pylibftdi/python-pylibftdi.mk index 7dca37e416..7607c90d4a 100644 --- a/package/python-pylibftdi/python-pylibftdi.mk +++ b/package/python-pylibftdi/python-pylibftdi.mk @@ -9,7 +9,9 @@ PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/d2/ce/ff3e83f3a14eb5b7950ff3657f07cdc3033dd0ded5c8ed093db515e1de33 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt -PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi -PYTHON_PYLIBFTDI_SETUP_TYPE = setuptools +PYTHON_PYLIBFTDI_SETUP_TYPE = pep517 +PYTHON_PYLIBFTDI_DEPENDENCIES = \ + host-python-poetry-core \ + libftdi $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:06 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:06 -0700 Subject: [Buildroot] [PATCH v8 20/26] package/python-sip: add missing setuptools dependency In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-20-james.hilliard1@gmail.com> The python-sip package requires distutils which is no longer included with python but is now part of setuptools. Signed-off-by: James Hilliard --- package/python-sip/python-sip.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 3e015fa16c..392928f01e 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -9,8 +9,8 @@ PYTHON_SIP_SOURCE = sip-$(PYTHON_SIP_VERSION).tar.gz PYTHON_SIP_SITE = https://www.riverbankcomputing.com/static/Downloads/sip/$(PYTHON_SIP_VERSION) PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 -PYTHON_SIP_DEPENDENCIES = python3 qt5base -HOST_PYTHON_SIP_DEPENDENCIES = host-python3 +PYTHON_SIP_DEPENDENCIES = host-python-setuptools python3 qt5base +HOST_PYTHON_SIP_DEPENDENCIES = host-python3 host-python-setuptools define HOST_PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:07 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:07 -0700 Subject: [Buildroot] [PATCH v8 21/26] package/python-rsa: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-21-james.hilliard1@gmail.com> We need to migrate python-rsa to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-rsa/python-rsa.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk index d84ba8b431..69a6309b19 100644 --- a/package/python-rsa/python-rsa.mk +++ b/package/python-rsa/python-rsa.mk @@ -7,9 +7,10 @@ PYTHON_RSA_VERSION = 4.9 PYTHON_RSA_SOURCE = rsa-$(PYTHON_RSA_VERSION).tar.gz PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/aa/65/7d973b89c4d2351d7fb232c2e452547ddfa243e93131e7cfa766da627b52 -PYTHON_RSA_SETUP_TYPE = setuptools +PYTHON_RSA_SETUP_TYPE = pep517 PYTHON_RSA_LICENSE = Apache-2.0 PYTHON_RSA_LICENSE_FILES = LICENSE PYTHON_RSA_CPE_ID_VALID = YES +PYTHON_RSA_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:08 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:08 -0700 Subject: [Buildroot] [PATCH v8 22/26] package/python-sh: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-22-james.hilliard1@gmail.com> We need to migrate python-sh to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-sh/python-sh.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk index af4da3f6c9..29843d645b 100644 --- a/package/python-sh/python-sh.mk +++ b/package/python-sh/python-sh.mk @@ -7,8 +7,9 @@ PYTHON_SH_VERSION = 2.0.6 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz PYTHON_SH_SITE = https://files.pythonhosted.org/packages/cd/51/7355831d8e1cee8348157d769ccda8a31ca9fa0548e7f93d87837d83866d -PYTHON_SH_SETUP_TYPE = setuptools +PYTHON_SH_SETUP_TYPE = pep517 PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt +PYTHON_SH_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:10 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:10 -0700 Subject: [Buildroot] [PATCH v8 24/26] package/python-sqlalchemy: add cython for python-sqlalchemy In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-24-james.hilliard1@gmail.com> When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for python-sqlalchemy. Signed-off-by: James Hilliard --- package/python-sqlalchemy/python-sqlalchemy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 400ad92f63..167c3a4498 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -12,5 +12,6 @@ PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE PYTHON_SQLALCHEMY_CPE_ID_VENDOR = sqlalchemy PYTHON_SQLALCHEMY_CPE_ID_PRODUCT = sqlalchemy +PYTHON_SQLALCHEMY_DEPENDENCIES = host-python-cython $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:09 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:09 -0700 Subject: [Buildroot] [PATCH v8 23/26] package/python-simplelogging: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-23-james.hilliard1@gmail.com> We need to migrate package/python-simplelogging to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. We also need to add a patch which switches from poetry to poetry core as we do not support the full poetry package. Signed-off-by: James Hilliard --- ...-Switch-build-backend-to-poetry-core.patch | 31 +++++++++++++++++++ .../python-simplelogging.mk | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch diff --git a/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch b/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch new file mode 100644 index 0000000000..2c345fe268 --- /dev/null +++ b/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch @@ -0,0 +1,31 @@ +From 76c1c545bad28f592405ca1e5bcf6081051c946a Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 13 Feb 2024 13:37:00 -0700 +Subject: [PATCH] Switch build-backend to poetry-core + +poetry-core is the lightweight counterpart of poetry that is intended +to be used as a build-backend. Unlike poetry, it does not require +installing all the dependencies of the package manager, making +the builds much faster. The generated artifacts are the same. + +Signed-off-by: James Hilliard +Upstream: https://github.com/vpoulailleau/simplelogging/pull/230 +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index a89ab64..79403cb 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -55,5 +55,5 @@ commands = + """ + + [build-system] +-requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++requires = ["poetry-core>=1.0.0"] ++build-backend = "poetry.core.masonry.api" +-- +2.34.1 + diff --git a/package/python-simplelogging/python-simplelogging.mk b/package/python-simplelogging/python-simplelogging.mk index 556628613b..dbd9ce3ae3 100644 --- a/package/python-simplelogging/python-simplelogging.mk +++ b/package/python-simplelogging/python-simplelogging.mk @@ -7,8 +7,9 @@ PYTHON_SIMPLELOGGING_VERSION = 0.11.0 PYTHON_SIMPLELOGGING_SOURCE = simplelogging-$(PYTHON_SIMPLELOGGING_VERSION).tar.gz PYTHON_SIMPLELOGGING_SITE = https://files.pythonhosted.org/packages/73/d6/4c06aa7f2c3b9fc09429a1196fd357357cc555de5e16c09b2d12e9db1ebb -PYTHON_SIMPLELOGGING_SETUP_TYPE = setuptools +PYTHON_SIMPLELOGGING_SETUP_TYPE = pep517 PYTHON_SIMPLELOGGING_LICENSE = BSD-3-Clause PYTHON_SIMPLELOGGING_LICENSE_FILES = LICENSE +PYTHON_SIMPLELOGGING_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:11 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:11 -0700 Subject: [Buildroot] [PATCH v8 25/26] package/python-pyzmq: add cython for python-pyzmq In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-25-james.hilliard1@gmail.com> When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for python-pyzmq. Signed-off-by: James Hilliard --- package/python-pyzmq/python-pyzmq.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index 1d9a7d01cb..f1444b9124 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -13,6 +13,7 @@ PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD PYTHON_PYZMQ_SETUP_TYPE = setuptools PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr PYTHON_PYZMQ_DEPENDENCIES = \ + host-python-cython \ host-python-packaging \ host-python-setuptools-scm \ zeromq -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:12 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:12 -0700 Subject: [Buildroot] [PATCH v8 26/26] package/pkg-python.mk: migrate setuptools to pep517 In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-26-james.hilliard1@gmail.com> Now that setuptools and its dependencies are using pep517 we can migrate the setuptools infrastructure itself to use the pep517 build frontend. As part of this we need to migrate the all python packages using _BUILD_OPTS to the new config settings format used by the pep517 build frontend. Use new setup type variables to define setup type specific dependencies instead of using the conditional block. We also need to set --skip-dependency-check for the following packages which specify build dependencies that are not actually required: - python-lxml - python-matplotlib - python-msgpack - python-pymupdf - python-setuptools-scm-git-archive - python-uvloop - python-wsaccel Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov --- Changes v7 -> v8: - disable dependency enforcement for more packages Changes v6 -> v7: - just disable dependency enforcement for msgpack - rebase Changes v5 -> v6: - use setup type variables for dependencies Changes v4 -> v5: - rebase on next Changes v1 -> v3: - rebase on master - combine setuptools-rust and maturin env variables - drop patch which is now upstream --- package/pkg-python.mk | 160 +++++++++--------- package/python-evdev/python-evdev.mk | 4 +- package/python-lxml/python-lxml.mk | 10 +- package/python-m2crypto/python-m2crypto.mk | 4 +- .../python-matplotlib/python-matplotlib.mk | 1 + package/python-msgpack/python-msgpack.mk | 1 + package/python-pillow/python-pillow.mk | 35 ++-- package/python-psycopg2/python-psycopg2.mk | 5 +- package/python-pymupdf/python-pymupdf.mk | 1 + package/python-pyzmq/python-pyzmq.mk | 4 +- .../python-setuptools-scm-git-archive.mk | 1 + package/python-uvloop/python-uvloop.mk | 7 +- package/python-wsaccel/python-wsaccel.mk | 1 + 13 files changed, 121 insertions(+), 113 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 94f28ff841..839f728e2f 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -52,15 +52,62 @@ HOST_PKG_PYTHON_ENV = \ PYTHONNOUSERSITE=1 \ $(HOST_CONFIGURE_OPTS) -# Target setuptools-based packages -PKG_PYTHON_SETUPTOOLS_ENV = \ +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ $(PKG_PYTHON_ENV) -PKG_PYTHON_SETUPTOOLS_CMD = \ - $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') +PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + +PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix + +PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +PKG_PYTHON_PEP517_DEPENDENCIES = \ + host-python-pypa-build \ + host-python-installer + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + $(HOST_PKG_PYTHON_ENV) + +HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + +HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + --interpreter=$(HOST_DIR)/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ + --data=$(HOST_DIR) + +# Target setuptools-based packages +PKG_PYTHON_SETUPTOOLS_ENV = \ + $(PKG_PYTHON_PEP517_ENV) PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) build + $(PKG_PYTHON_PEP517_BUILD_CMD) PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ @@ -69,30 +116,24 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --single-version-externally-managed PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install --no-compile \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(TARGET_DIR) + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(STAGING_DIR) + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + +PKG_PYTHON_SETUPTOOLS_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-setuptools # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - $(HOST_PKG_PYTHON_ENV) + $(HOST_PKG_PYTHON_PEP517_ENV) HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) build + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install \ - --prefix=$(HOST_DIR) \ - --root=/ \ - --single-version-externally-managed + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) # Target setuptools-rust-based packages PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ @@ -109,6 +150,10 @@ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_TARGET_CMD = \ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD) +PKG_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + $(PKG_PYTHON_SETUPTOOLS_DEPENDENCIES) \ + host-python-setuptools-rust + # Host setuptools-rust-based packages HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ @@ -121,52 +166,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ HOST_PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_CMD = \ $(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD) -# Target pep517-based packages -PKG_PYTHON_PEP517_ENV = \ - $(PKG_PYTHON_ENV) - -PKG_PYTHON_PEP517_BUILD_CMD = \ - -m build -n -w - -PKG_PYTHON_PEP517_INSTALL_OPTS = \ - --interpreter=/usr/bin/python \ - --script-kind=posix - -PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ - --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(TARGET_DIR)/usr/bin \ - --data=$(TARGET_DIR)/usr - -PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ - --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(STAGING_DIR)/usr/bin \ - --data=$(STAGING_DIR)/usr - -# Host pep517-based packages -HOST_PKG_PYTHON_PEP517_ENV = \ - $(HOST_PKG_PYTHON_ENV) - -HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ - -m build -n -w - -HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - --interpreter=$(HOST_DIR)/bin/python \ - --script-kind=posix \ - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/bin \ - --data=$(HOST_DIR) - # Target flit packages PKG_PYTHON_FLIT_ENV = \ $(PKG_PYTHON_PEP517_ENV) @@ -180,6 +179,10 @@ PKG_PYTHON_FLIT_INSTALL_TARGET_CMD = \ PKG_PYTHON_FLIT_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) +PKG_PYTHON_FLIT_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-flit-core + # Host flit packages HOST_PKG_PYTHON_FLIT_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) @@ -215,6 +218,10 @@ PKG_PYTHON_MATURIN_INSTALL_TARGET_CMD = \ PKG_PYTHON_MATURIN_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) +PKG_PYTHON_MATURIN_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-maturin + # Host maturin packages HOST_PKG_PYTHON_MATURIN_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) \ @@ -293,28 +300,17 @@ else $(2)_DEPENDENCIES += host-python3 endif # ($(4),target) -# Setuptools based packages will need setuptools for the host Python -# interpreter (both host and target). +# Setup type specific dependencies are the same whether we are +# building for the host or the target. # -ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-setuptools -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) -$(2)_DEPENDENCIES += host-python-setuptools-rust -endif -else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer -ifeq ($$($(2)_SETUP_TYPE),flit) -$(2)_DEPENDENCIES += host-python-flit-core -endif -ifeq ($$($(2)_SETUP_TYPE),maturin) -$(2)_DEPENDENCIES += host-python-maturin -endif -else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) # Don't add dependency on host-python-installer for # host-python-installer itself, and its dependencies. ifeq ($$(filter host-python-flit-core host-python-installer,$(1)),) $(2)_DEPENDENCIES += host-python-installer endif +else +$(2)_DEPENDENCIES += $$(PKG_PYTHON_$$($(2)_SETUP_TYPE_UPPER)_DEPENDENCIES) endif # Pyo3 based packages(setuptools-rust and maturin) will need rust diff --git a/package/python-evdev/python-evdev.mk b/package/python-evdev/python-evdev.mk index 5cf62b5160..b509b43e8a 100644 --- a/package/python-evdev/python-evdev.mk +++ b/package/python-evdev/python-evdev.mk @@ -12,7 +12,7 @@ PYTHON_EVDEV_LICENSE = Revised BSD License PYTHON_EVDEV_LICENSE_FILES = LICENSE PYTHON_EVDEV_BUILD_OPTS = \ - build_ecodes \ - --evdev-headers $(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h + -C--build-option=build_ecodes \ + -C--build-option=--evdev-headers=$(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h $(eval $(python-package)) diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 519a9a77ac..336f954775 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -28,11 +28,13 @@ HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib # python-lxml needs these scripts in order to properly detect libxml2 and # libxslt compiler and linker flags PYTHON_LXML_BUILD_OPTS = \ - --xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ - --xml2-config=$(STAGING_DIR)/usr/bin/xml2-config + --skip-dependency-check + -C--build-option=--xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ + -C--build-option=--xml2-config=$(STAGING_DIR)/usr/bin/xml2-config HOST_PYTHON_LXML_BUILD_OPTS = \ - --xslt-config=$(HOST_DIR)/bin/xslt-config \ - --xml2-config=$(HOST_DIR)/bin/xml2-config + --skip-dependency-check + -C--build-option=--xslt-config=$(HOST_DIR)/bin/xslt-config \ + -C--build-option=--xml2-config=$(HOST_DIR)/bin/xml2-config $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 69a0c28df5..6c07f42d06 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -13,6 +13,8 @@ PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE PYTHON_M2CRYPTO_CPE_ID_VENDOR = m2crypto_project PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig -PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +PYTHON_M2CRYPTO_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--openssl=$(STAGING_DIR)/usr $(eval $(python-package)) diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 4fd2b5f432..5f5d53172e 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -20,6 +20,7 @@ PYTHON_MATPLOTLIB_DEPENDENCIES = \ python-pybind \ qhull PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools +PYTHON_MATPLOTLIB_BUILD_OPTS = --skip-dependency-check ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y) PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index 3ee7c54ce1..9cdf5263de 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -10,6 +10,7 @@ PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/c2/d5/5662032db157 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools +PYTHON_MSGPACK_BUILD_OPTS = --skip-dependency-check # When set in the environment, whatever the value, MSGPACK_PUREPYTHON drives # using the pure python implementation rather than rely on the C++ native code. diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 10939d8467..7f5b4dd0f9 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -14,61 +14,60 @@ PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools PYTHON_PILLOW_DEPENDENCIES = host-pkgconf -PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing -PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) +PYTHON_PILLOW_BUILD_OPTS = -C--build-option=build_ext -C--build-option=--disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype -PYTHON_PILLOW_BUILD_OPTS += --enable-freetype +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-freetype else -PYTHON_PILLOW_BUILD_OPTS += --disable-freetype +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-freetype endif ifeq ($(BR2_PACKAGE_JPEG),y) PYTHON_PILLOW_DEPENDENCIES += jpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg endif ifeq ($(BR2_PACKAGE_LCMS2),y) PYTHON_PILLOW_DEPENDENCIES += lcms2 -PYTHON_PILLOW_BUILD_OPTS += --enable-lcms +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-lcms else -PYTHON_PILLOW_BUILD_OPTS += --disable-lcms +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-lcms endif ifeq ($(BR2_PACKAGE_LIBXCB),y) PYTHON_PILLOW_DEPENDENCIES += libxcb -PYTHON_PILLOW_BUILD_OPTS += --enable-xcb +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-xcb else -PYTHON_PILLOW_BUILD_OPTS += --disable-xcb +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-xcb endif ifeq ($(BR2_PACKAGE_OPENJPEG),y) PYTHON_PILLOW_DEPENDENCIES += openjpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg2000 else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg2000 endif ifeq ($(BR2_PACKAGE_TIFF),y) PYTHON_PILLOW_DEPENDENCIES += tiff -PYTHON_PILLOW_BUILD_OPTS += --enable-tiff +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-tiff else -PYTHON_PILLOW_BUILD_OPTS += --disable-tiff +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-tiff endif ifeq ($(BR2_PACKAGE_WEBP),y) PYTHON_PILLOW_DEPENDENCIES += webp -PYTHON_PILLOW_BUILD_OPTS += --enable-webp +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webp ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) -PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webpmux else -PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webpmux endif else -PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webp -C--build-option=--disable-webpmux endif $(eval $(python-package)) diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk index 0149b8d185..1b33b7505d 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -13,7 +13,8 @@ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE PYTHON_PSYCOPG2_DEPENDENCIES = postgresql # Force psycopg2 to use the Buildroot provided postgresql version # instead of the one from the host machine -PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config -PYTHON_PSYCOPG2_INSTALL_TARGET_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config +PYTHON_PSYCOPG2_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--pg-config=$(STAGING_DIR)/usr/bin/pg_config $(eval $(python-package)) diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 639ce0e00e..8825868fb5 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -13,6 +13,7 @@ PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING # No license file included in pip, but it's present on github PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib +PYTHON_PYMUPDF_BUILD_OPTS = --skip-dependency-check PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index f1444b9124..48a298b221 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -11,7 +11,7 @@ PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD PYTHON_PYZMQ_SETUP_TYPE = setuptools -PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr +PYTHON_PYZMQ_BUILD_OPTS = -C--build-option=--zmq=$(STAGING_DIR)/usr PYTHON_PYZMQ_DEPENDENCIES = \ host-python-cython \ host-python-packaging \ @@ -27,7 +27,7 @@ endef PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y) -PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts +PYTHON_PYZMQ_BUILD_OPTS += -C--build-option=--enable-drafts endif $(eval $(python-package)) diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 153343788b..95cfa025b3 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_BUILD_OPTS = --skip-dependency-check $(eval $(host-python-package)) diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk index 285884a2bb..aaeab2805f 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -10,8 +10,11 @@ PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/9c/16/728cc5dde368e PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace --use-system-libuv PYTHON_UVLOOP_DEPENDENCIES = libuv +PYTHON_UVLOOP_BUILD_OPTS = \ + --skip-dependency-check \ + -C--build-option=build_ext \ + -C--build-option=--inplace \ + -C--build-option=--use-system-libuv $(eval $(python-package)) diff --git a/package/python-wsaccel/python-wsaccel.mk b/package/python-wsaccel/python-wsaccel.mk index 1f63aa5c40..7ccb033256 100644 --- a/package/python-wsaccel/python-wsaccel.mk +++ b/package/python-wsaccel/python-wsaccel.mk @@ -10,5 +10,6 @@ PYTHON_WSACCEL_SITE = https://files.pythonhosted.org/packages/94/28/41c0e711b538 PYTHON_WSACCEL_LICENSE = Apache-2.0 PYTHON_WSACCEL_LICENSE_FILES = LICENSE PYTHON_WSACCEL_SETUP_TYPE = setuptools +PYTHON_WSACCEL_BUILD_OPTS = --skip-dependency-check $(eval $(python-package)) -- 2.34.1 From romain.naour at smile.fr Tue Feb 13 21:35:23 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 22:35:23 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> Message-ID: <7e3c7380-a550-4e54-b395-eb568e834a42@smile.fr> Hi Alexander, Le 13/02/2024 ? 20:05, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >> ti-k3-image-gen tool is deprecated an replaced by binman [1]. >> >> All defconfig that was using it have been updated to use U-boot >> binman tool instead. >> >> So, we can safely remove ti-k3-image-gen package. >> >> [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 >> >> Cc: Anand Gadiyar >> Cc: Xuanhao Shi >> Signed-off-by: Romain Naour >> --- >> ?Config.in.legacy????????????????????????? |? 7 ++ >> ?DEVELOPERS??????????????????????????????? |? 2 - >> ?boot/Config.in??????????????????????????? |? 1 - >> ?boot/ti-k3-image-gen/Config.in??????????? | 81 ----------------------- >> ?boot/ti-k3-image-gen/ti-k3-image-gen.hash |? 3 - >> ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?? | 54 --------------- >> ?6 files changed, 7 insertions(+), 141 deletions(-) >> ?delete mode 100644 boot/ti-k3-image-gen/Config.in >> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash >> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk >> >> diff --git a/Config.in.legacy b/Config.in.legacy >> index a869279af7..2b59a65f1c 100644 >> --- a/Config.in.legacy >> +++ b/Config.in.legacy >> @@ -146,6 +146,13 @@ endif >> ? >> ?comment "Legacy options removed in 2024.02" >> ? >> +config BR2_TARGET_TI_K3_IMAGE_GEN >> + bool "ti-k3-image-gen removed" >> + select BR2_LEGACY >> + help >> + ? ti-k3-image-gen tool? has been removed and replaced by >> + ? U-Boot binman tool (requires U-boot >= 2024.01). > > Is commit 6d6228ab8fe5 "am62a: dts: binman: Package tiboot3.bin, tispl.bin, u-boot.img" > in U-Boot repo not what is actually required (since v2023.10)? > At least that's the version which works for me. > Thank you for the info, indeed v2023.10 should be good-enough. I was looking at meta-ti history [1] and I thought that v2024.01 was the minimum u-boot release for complete binman support for all TI K3 SoC variant. I'll fix! [1] https://git.yoctoproject.org/meta-ti/commit/?id=5b5b8b932561d76c5ed50a4210a726df86c649bf Best regards, Romain From ju.o at free.fr Tue Feb 13 21:45:10 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 13 Feb 2024 22:45:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: bump to version 2.03.23 Message-ID: <20240213214510.545574-1-ju.o@free.fr> For release notes since 2.03.14, see: https://gitlab.com/lvmteam/lvm2/-/blob/22e482d9655e8d041703af984b81d9b742027a78/WHATS_NEW#L4 This commit removes the package patches 1 and 2 which are now included in the new release. Patches 3 and 4 are kept and renumbered. Signed-off-by: Julien Olivain --- ...sible-better-compilation-with-musl-c.patch | 30 ---------------- ...-freopen-to-reopen-standard-streams.patch} | 0 ...-freopen-to-reopen-standard-streams.patch} | 0 ...m-preallocate-memory-only-with-glibc.patch | 34 ------------------- package/lvm2/lvm2.hash | 2 +- package/lvm2/lvm2.mk | 2 +- 6 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch rename package/lvm2/{0003-cmdline-use-freopen-to-reopen-standard-streams.patch => 0001-cmdline-use-freopen-to-reopen-standard-streams.patch} (100%) rename package/lvm2/{0004-log-use-freopen-to-reopen-standard-streams.patch => 0002-log-use-freopen-to-reopen-standard-streams.patch} (100%) delete mode 100644 package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch diff --git a/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch b/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch deleted file mode 100644 index f537331a2c..0000000000 --- a/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bac596b3685520acaa404dc3ebd2131e6de96d47 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac -Date: Wed, 16 Feb 2022 00:48:49 +0100 -Subject: [PATCH] clang: possible better compilation with musl c - -Try to help resolving reported compilation problem with -clang & musl C. -https://github.com/lvmteam/lvm2/issues/61 - -Backported from: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4fd76de4b69f8e5e6d5afa03d54cb4b8986c4bcc -Signed-off-by: Simon Rowe ---- - libdaemon/server/daemon-server.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c -index 88905a7dd..96cfc392e 100644 ---- a/libdaemon/server/daemon-server.c -+++ b/libdaemon/server/daemon-server.c -@@ -18,6 +18,7 @@ - - #include - #include -+#include /* help musl C */ - #include - #include - #include --- -2.22.3 - diff --git a/package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch b/package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch similarity index 100% rename from package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch rename to package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch diff --git a/package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch b/package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch similarity index 100% rename from package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch rename to package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch diff --git a/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch b/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch deleted file mode 100644 index db16d60ace..0000000000 --- a/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b668022f9b8aecf52109c9e0b7e5847054231361 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac -Date: Fri, 19 Aug 2022 16:15:17 +0200 -Subject: [PATCH] mm: preallocate memory only with glibc - -Use mallinfo() only with glibc. - -Backported from: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8370d117d7ef8a472c95315a3cd085696c90b3be -Signed-off-by: Simon Rowe ---- - lib/mm/memlock.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c -index 3d1a3927c..efcc6d91f 100644 ---- a/lib/mm/memlock.c -+++ b/lib/mm/memlock.c -@@ -160,7 +160,12 @@ static void _touch_memory(void *mem, size_t size) - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if defined(__GLIBC__) && !defined(VALGRIND_POOL) -+ /* Memory allocation is currently only tested with glibc -+ * for different C libraries, some other mechanisms might be needed -+ * meanwhile let users use lvm2 code without memory preallocation. -+ * Compilation for VALGRIND tracing also goes without preallocation. -+ */ - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; --- -2.22.3 - diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 126748d339..74c5f4f1bc 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,5 @@ # From https://sourceware.org/ftp/lvm2/sha512.sum -sha512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d LVM2.2.03.14.tgz +sha512 293430a80c7f599d14e77610456d0f44cac8164e6159cd0e2e287462278a89787e289fdb4d481eb8fd6b5eea07a6535c41cb7fdc3deee83df7fea9bf77dcbdaa LVM2.2.03.23.tgz # Locally computed sha256 checksums sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 810d668ec2..bda1648955 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.03.14 +LVM2_VERSION = 2.03.23 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES -- 2.43.1 From buildroot at bubu1.eu Tue Feb 13 23:13:47 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 14 Feb 2024 00:13:47 +0100 Subject: [Buildroot] [PATCH v8 04/26] package/python-setuptools: revert to last version with functional --build-option In-Reply-To: <20240213211512.3918044-4-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> <20240213211512.3918044-4-james.hilliard1@gmail.com> Message-ID: <7384cb6e-1b5b-4fca-ba0c-2c4d0fcd05a3@bubu1.eu> Hi James, On 13.02.24 22:14, James Hilliard wrote: > A recent change in setuptools accidentially broke the ability to > pass build_ext args via the --build-option config setting. > > Lets downgrade to the last working version for now. Do you have a link to a issue here? Is thing acknowledged by upstream, is this planned to be fixed? > > Signed-off-by: James Hilliard > --- > package/python-setuptools/python-setuptools.hash | 4 ++-- > package/python-setuptools/python-setuptools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash > index 7f13ac3896..9c971eec11 100644 > --- a/package/python-setuptools/python-setuptools.hash > +++ b/package/python-setuptools/python-setuptools.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/setuptools/json > -md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz > -sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz > +md5 d967ca2ba7f46db887daee2d5c9bd6a2 setuptools-68.2.2.tar.gz > +sha256 4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 setuptools-68.2.2.tar.gz > # Locally computed sha256 checksums > sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE > diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk > index 0aea3c6cfa..f26f427ccc 100644 > --- a/package/python-setuptools/python-setuptools.mk > +++ b/package/python-setuptools/python-setuptools.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SETUPTOOLS_VERSION = 69.0.3 > +PYTHON_SETUPTOOLS_VERSION = 68.2.2 > PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz > -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 > +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9 > PYTHON_SETUPTOOLS_LICENSE = MIT > PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE > PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From james.hilliard1 at gmail.com Tue Feb 13 23:43:16 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 16:43:16 -0700 Subject: [Buildroot] [PATCH v8 04/26] package/python-setuptools: revert to last version with functional --build-option In-Reply-To: <7384cb6e-1b5b-4fca-ba0c-2c4d0fcd05a3@bubu1.eu> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> <20240213211512.3918044-4-james.hilliard1@gmail.com> <7384cb6e-1b5b-4fca-ba0c-2c4d0fcd05a3@bubu1.eu> Message-ID: On Tue, Feb 13, 2024 at 4:14?PM Marcus Hoffmann wrote: > > Hi James, > > On 13.02.24 22:14, James Hilliard wrote: > > A recent change in setuptools accidentially broke the ability to > > pass build_ext args via the --build-option config setting. > > > > Lets downgrade to the last working version for now. > > Do you have a link to a issue here? Is thing acknowledged by upstream, > is this planned to be fixed? Yeah, I have a pull request reverting the change that caused this to break: https://github.com/pypa/setuptools/pull/4218 There's some links/threads there with more info. > > > > > Signed-off-by: James Hilliard > > --- > > package/python-setuptools/python-setuptools.hash | 4 ++-- > > package/python-setuptools/python-setuptools.mk | 4 ++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash > > index 7f13ac3896..9c971eec11 100644 > > --- a/package/python-setuptools/python-setuptools.hash > > +++ b/package/python-setuptools/python-setuptools.hash > > @@ -1,5 +1,5 @@ > > # md5, sha256 from https://pypi.org/pypi/setuptools/json > > -md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz > > -sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz > > +md5 d967ca2ba7f46db887daee2d5c9bd6a2 setuptools-68.2.2.tar.gz > > +sha256 4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 setuptools-68.2.2.tar.gz > > # Locally computed sha256 checksums > > sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE > > diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk > > index 0aea3c6cfa..f26f427ccc 100644 > > --- a/package/python-setuptools/python-setuptools.mk > > +++ b/package/python-setuptools/python-setuptools.mk > > @@ -4,9 +4,9 @@ > > # > > ################################################################################ > > > > -PYTHON_SETUPTOOLS_VERSION = 69.0.3 > > +PYTHON_SETUPTOOLS_VERSION = 68.2.2 > > PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz > > -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 > > +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9 > > PYTHON_SETUPTOOLS_LICENSE = MIT > > PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE > > PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From yegorslists at googlemail.com Wed Feb 14 07:19:08 2024 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Wed, 14 Feb 2024 08:19:08 +0100 Subject: [Buildroot] [PATCH v3] Create a .gitignore file in the CANONICAL_O directory Message-ID: <20240214071908.297656-1-yegorslists@googlemail.com> From: Yegor Yefremov This .gitignore file ignores all files in an output directory and hence doesn't change the git status. The .gitignore file will be only created if $(O) is a subdirectory of $(CANONICAL_CURDIR) (aka TOPDIR, but it's only defined later). Remove "/output" entry from the main .gitignore file as it is already handled by this general approach. Signed-off-by: Yegor Yefremov --- Changes v1 -> v2: - create .gitignore only if $(O) is a subfolder of $(TOPDIR) (Yann E. MORIN) Changes v2 -> v3: - also support nested subdirectories (Yann E. MORIN) .gitignore | 1 - Makefile | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bb02d9f572..14b7ca5040 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/output /dl /.auto.deps /.config.cmd diff --git a/Makefile b/Makefile index ac625152c6..aea6abb4d3 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,13 @@ endif CANONICAL_CURDIR = $(realpath $(CURDIR)) +# Create a default .gitignore file that ignores everything and doesn't make git +# repository "dirty". Perform this action only if $(O) is a subdirectory of +# $(CANONICAL_CURDIR) (aka TOPDIR, but it's only defined later). +ifeq ($(filter-out $(CANONICAL_CURDIR)/%,$(CANONICAL_O)),) +$(file >$(CANONICAL_O)/.gitignore,*) +endif + REQ_UMASK = 0022 # Make sure O= is passed (with its absolute canonical path) everywhere the -- 2.34.1 From laurent at vivier.eu Wed Feb 14 07:25:17 2024 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 14 Feb 2024 08:25:17 +0100 Subject: [Buildroot] [PATCH] package/petitboot: bump to version 1.15 In-Reply-To: <20240213152005.83369-1-arbab@linux.ibm.com> References: <20240213152005.83369-1-arbab@linux.ibm.com> Message-ID: Le 13/02/2024 ? 16:20, Reza Arbab a ?crit?: > This fixes an issue where the pb-console helper was not properly > silencing kernel log messages printed to the console. > > https://github.com/open-power/petitboot/releases/tag/v1.15 > > Signed-off-by: Reza Arbab > --- > package/petitboot/petitboot.hash | 2 +- > package/petitboot/petitboot.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash > index a9a21f2c1b69..3a90bc529672 100644 > --- a/package/petitboot/petitboot.hash > +++ b/package/petitboot/petitboot.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 fa2367370d3ce5dd9910ab08a0832071e2508c8bf75cfec6d3b9807fbefc507a petitboot-v1.14.tar.gz > +sha256 eed29ec841c2bcd5ecc65347f5b95a0087a541bd9c04ca3c17c55d1f7357d189 petitboot-v1.15.tar.gz > sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING > diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk > index 2f1e459dd3fa..a74992377131 100644 > --- a/package/petitboot/petitboot.mk > +++ b/package/petitboot/petitboot.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PETITBOOT_VERSION = 1.14 > +PETITBOOT_VERSION = 1.15 > PETITBOOT_SOURCE = petitboot-v$(PETITBOOT_VERSION).tar.gz > PETITBOOT_SITE = https://github.com/open-power/petitboot/releases/download/v$(PETITBOOT_VERSION) > PETITBOOT_DEPENDENCIES = \ Reviewed-by: Laurent Vivier From thomas at devoogdt.com Wed Feb 14 07:54:45 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 14 Feb 2024 08:54:45 +0100 Subject: [Buildroot] [PATCH v1] package/weston: bump to 13.0.0 Message-ID: <20240214075445.1011185-1-thomas.devoogdt@barco.com> Announce: https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html Drop -Dlauncher-libseat=true, as it has been dropped upstream: https://gitlab.freedesktop.org/wayland/weston/-/commit/e3b6ed50f1c3c259c51274c78d08b58ccea8a0df Signed-off-by: Thomas Devoogdt --- package/weston/weston.hash | 6 +++--- package/weston/weston.mk | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 0ecbaa4168..ded5d35275 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-May/042725.html -sha256 b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535 weston-12.0.1.tar.xz -sha512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688 weston-12.0.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html +sha256 52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a weston-13.0.0.tar.xz +sha512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc weston-13.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index b07e798765..5ae9c22973 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 12.0.1 +WESTON_VERSION = 13.0.0 WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -19,7 +19,6 @@ WESTON_CONF_OPTS = \ -Ddoc=false \ -Dremoting=false \ -Dbackend-vnc=false \ - -Dlauncher-libseat=true \ -Dtools=calibrator,debug,info,terminal,touch-calibrator ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) -- 2.43.0 From david.picard at clermont.in2p3.fr Wed Feb 14 08:19:21 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 14 Feb 2024 09:19:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package Message-ID: <20240214081921.4663-1-david.picard@clermont.in2p3.fr> Add a package for the Intel/Altera SoC FPGA hardware library. It is used to let the HPS and the FPGA fabric communicate with each other. Signed-off-by: David Picard --- package/Config.in | 1 + package/intel-socfpga-hwlib/Config.in | 12 ++++++ .../intel-socfpga-hwlib.hash | 2 + .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/intel-socfpga-hwlib/Config.in create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..cd6c6bcaba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1736,6 +1736,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/intel-socfpga-hwlib/Config.in" source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/intel-socfpga-hwlib/Config.in b/package/intel-socfpga-hwlib/Config.in new file mode 100644 index 0000000000..ced6483a59 --- /dev/null +++ b/package/intel-socfpga-hwlib/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB + bool "intel-socfpga-hwlib" + depends on BR2_arm + help + This package provides the Intel SoC FPGA HWLIB for + Intel/Altera SoC FPGA chips. + This library allows to communicate with the FPGA fabric from + Linux, running on the HPS device. + The source code is not compiled. Instead, a symlink is added + to $(STAGING_DIR)/lib. + + https://github.com/altera-opensource/intel-socfpga-hwlib diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash new file mode 100644 index 0000000000..60efe9013e --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash @@ -0,0 +1,2 @@ +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 intel-socfpga-hwlib-23.12.02.tar.gz +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 License.txt diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk new file mode 100644 index 0000000000..bf18c23560 --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# intel-socfpga-hwlib +# +################################################################################ + +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 +INTEL_SOCFPGA_HWLIB_SITE = $(call github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES + +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) $(STAGING_DIR)/lib/intel-socfpga-hwlib +endef + +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS +# mkdir -p $(BINARIES_DIR)/intel-ucode +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# else +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO +# endif + +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +# endef + +$(eval $(generic-package)) -- 2.40.1 From arnout at mind.be Wed Feb 14 08:19:55 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 09:19:55 +0100 Subject: [Buildroot] [PATCH v3] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: <20240214071908.297656-1-yegorslists@googlemail.com> References: <20240214071908.297656-1-yegorslists@googlemail.com> Message-ID: On 14/02/2024 08:19, yegorslists at googlemail.com wrote: > From: Yegor Yefremov > > This .gitignore file ignores all files in an output directory and > hence doesn't change the git status. > > The .gitignore file will be only created if $(O) is a subdirectory > of $(CANONICAL_CURDIR) (aka TOPDIR, but it's only defined later). > > Remove "/output" entry from the main .gitignore file as it is already > handled by this general approach. > > Signed-off-by: Yegor Yefremov > --- > Changes v1 -> v2: > - create .gitignore only if $(O) is a subfolder of $(TOPDIR) (Yann > E. MORIN) I like to create my output directories as subfolders of my BR2_EXTERNAL. Currently I have them in the .gitignore of the BR2_EXTERNAL itself, of course, but it would be convenient if they got ignored automatically. In other words, I'd like to go back to v1 of this patch. There's no reason, ever, to not want an output directory to be gitignored. Since two maintainers are disagreeing about this, I guess it's up to the other maintainers to pipe up and take a decision? Regards, Arnout > Changes v2 -> v3: > - also support nested subdirectories (Yann E. MORIN) > > .gitignore | 1 - > Makefile | 7 +++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/.gitignore b/.gitignore > index bb02d9f572..14b7ca5040 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -1,4 +1,3 @@ > -/output > /dl > /.auto.deps > /.config.cmd > diff --git a/Makefile b/Makefile > index ac625152c6..aea6abb4d3 100644 > --- a/Makefile > +++ b/Makefile > @@ -65,6 +65,13 @@ endif > > CANONICAL_CURDIR = $(realpath $(CURDIR)) > > +# Create a default .gitignore file that ignores everything and doesn't make git > +# repository "dirty". Perform this action only if $(O) is a subdirectory of > +# $(CANONICAL_CURDIR) (aka TOPDIR, but it's only defined later). > +ifeq ($(filter-out $(CANONICAL_CURDIR)/%,$(CANONICAL_O)),) > +$(file >$(CANONICAL_O)/.gitignore,*) > +endif > + > REQ_UMASK = 0022 > > # Make sure O= is passed (with its absolute canonical path) everywhere the > -- > 2.34.1 > From arnout at mind.be Wed Feb 14 09:05:43 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:05:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/freescale-imx/firmware-ele-imx: fix dependency comment condition In-Reply-To: <20240213100948.5264-1-sebastien.szymanski@armadeus.com> References: <20240213100948.5264-1-sebastien.szymanski@armadeus.com> Message-ID: On 13/02/2024 11:09, S?bastien Szymanski wrote: > The dependency comment must be shown when the platform has no ELE and > not when the platform has no VPU. > > Fixes: 69d127fe29dc ("package/freescale-imx/firmware-ele-imx: new package") > Signed-off-by: S?bastien Szymanski Applied to master, thanks. Thank you for fixing my mistkes! Regards, Arnout > --- > package/freescale-imx/firmware-ele-imx/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in > index 241ad3942d65..a99cbc3392c2 100644 > --- a/package/freescale-imx/firmware-ele-imx/Config.in > +++ b/package/freescale-imx/firmware-ele-imx/Config.in > @@ -1,5 +1,5 @@ > comment "firmware-ele-imx needs an i.MX platform with EdgeLock Secure Enclave" > - depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU > + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_ELE > > config BR2_PACKAGE_FIRMWARE_ELE_IMX > bool "firmware-ele-imx" From arnout at mind.be Wed Feb 14 09:05:57 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:05:57 +0100 Subject: [Buildroot] [PATCH 1/1] board/freescale: imx9-bootloader-prepare.sh: fix script In-Reply-To: <20240213130444.12586-1-ju.o@free.fr> References: <20240213130444.12586-1-ju.o@free.fr> Message-ID: On 13/02/2024 14:04, Julien Olivain wrote: > Commit c05f27c "configs/freescale_imx93evk: new defconfig", when > applied, added few ShellCheck fixups on top of the orginial > submission. During those changes, one extra backslash was added, > making the imx9-bootloader-prepare.sh fail. > > This commit fixes the issue by removing this extra backslash. > > Fixes: > > dd: failed to open '/buildroot/output/images/u-boot-atf-container.img': No such file or directory > make: *** [Makefile:820: target-post-image] Error 1 > > Signed-off-by: Julien Olivain Applied to master, thanks. Thank you for fixing my mistakes! Regards, Arnout > --- > board/freescale/common/imx/imx9-bootloader-prepare.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh > index a9611a81bd..8ab5a241b0 100755 > --- a/board/freescale/common/imx/imx9-bootloader-prepare.sh > +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh > @@ -21,7 +21,7 @@ main () > -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ > -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ > -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ > - -out "${BINARIES_DIR}/u-boot-atf-container.img" \ > + -out "${BINARIES_DIR}/u-boot-atf-container.img" > else > "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ > -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ From arnout at mind.be Wed Feb 14 09:07:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:07:22 +0100 Subject: [Buildroot] [PATCH 1/1] board/freescale: Fix check-package warning In-Reply-To: <20240213050106.1371689-1-kadambini.nema@gmail.com> References: <20240213050106.1371689-1-kadambini.nema@gmail.com> Message-ID: <897ad4ff-78af-412f-aa74-ef20d6eb2a1b@mind.be> On 13/02/2024 06:01, Kadambini Nema wrote: > $ utils/docker-run make check-package > board/freescale/imx93evk/patches/linux-headers/linux-headers.hash:3: empty line at end of file > board/freescale/imx93evk/patches/linux/linux.hash:3: empty line at end of file > 402624 lines processed > 2 warnings generated > make: *** [Makefile:1248: check-package] Error 1 > > Signed-off-by: Kadambini Nema Applied to master, thanks. Thank you for fixing my mistakes! Regards, Arnout > --- > board/freescale/imx93evk/patches/linux/linux.hash | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash > index 5687ec7343..715a590825 100644 > --- a/board/freescale/imx93evk/patches/linux/linux.hash > +++ b/board/freescale/imx93evk/patches/linux/linux.hash > @@ -1,3 +1,2 @@ > # Locally calculated > sha256 eb94414f952444289c0af8ad82afa0dc2d07e08f9000ccd2cc39f11da5b494ea linux-imx-lf-6.1.55-2.2.0.tar.gz > - From arnout at mind.be Wed Feb 14 09:02:25 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:02:25 +0100 Subject: [Buildroot] [git commit] package/freescale-imx/firmware-ele-imx: fix dependency comment condition Message-ID: <20240214091150.730CC8794A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bcce65f634dfce8e6ee1961ed68df3e778cd945 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The dependency comment must be shown when the platform has no ELE and not when the platform has no VPU. Fixes: 69d127fe29dc ("package/freescale-imx/firmware-ele-imx: new package") Signed-off-by: S??bastien Szymanski Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/firmware-ele-imx/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in index 241ad3942d..a99cbc3392 100644 --- a/package/freescale-imx/firmware-ele-imx/Config.in +++ b/package/freescale-imx/firmware-ele-imx/Config.in @@ -1,5 +1,5 @@ comment "firmware-ele-imx needs an i.MX platform with EdgeLock Secure Enclave" - depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_ELE config BR2_PACKAGE_FIRMWARE_ELE_IMX bool "firmware-ele-imx" From arnout at mind.be Wed Feb 14 09:03:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:03:08 +0100 Subject: [Buildroot] [git commit] board/freescale: Fix check-package warning Message-ID: <20240214091150.8228A878EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf9c8fa2c844748145d83ffc279a9548cf3792ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master $ utils/docker-run make check-package board/freescale/imx93evk/patches/linux-headers/linux-headers.hash:3: empty line at end of file board/freescale/imx93evk/patches/linux/linux.hash:3: empty line at end of file 402624 lines processed 2 warnings generated make: *** [Makefile:1248: check-package] Error 1 Signed-off-by: Kadambini Nema Signed-off-by: Arnout Vandecappelle --- board/freescale/imx93evk/patches/linux/linux.hash | 1 - 1 file changed, 1 deletion(-) diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash index 5687ec7343..715a590825 100644 --- a/board/freescale/imx93evk/patches/linux/linux.hash +++ b/board/freescale/imx93evk/patches/linux/linux.hash @@ -1,3 +1,2 @@ # Locally calculated sha256 eb94414f952444289c0af8ad82afa0dc2d07e08f9000ccd2cc39f11da5b494ea linux-imx-lf-6.1.55-2.2.0.tar.gz - From arnout at mind.be Wed Feb 14 09:03:55 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:03:55 +0100 Subject: [Buildroot] [git commit] board/freescale: imx9-bootloader-prepare.sh: fix script Message-ID: <20240214091150.99D908794C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c455505eb5ed8ed5bbf090f2bfb6241c9f153a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c05f27c "configs/freescale_imx93evk: new defconfig", when applied, added few ShellCheck fixups on top of the orginial submission. During those changes, one extra backslash was added, making the imx9-bootloader-prepare.sh fail. This commit fixes the issue by removing this extra backslash. Fixes: dd: failed to open '/buildroot/output/images/u-boot-atf-container.img': No such file or directory make: *** [Makefile:820: target-post-image] Error 1 Signed-off-by: Julien Olivain Reviewed-by: S??bastien Szymanski Tested-By: S??bastien Szymanski Signed-off-by: Arnout Vandecappelle --- board/freescale/common/imx/imx9-bootloader-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh index a9611a81bd..8ab5a241b0 100755 --- a/board/freescale/common/imx/imx9-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh @@ -21,7 +21,7 @@ main () -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ - -out "${BINARIES_DIR}/u-boot-atf-container.img" \ + -out "${BINARIES_DIR}/u-boot-atf-container.img" else "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ From david.picard at clermont.in2p3.fr Wed Feb 14 09:29:21 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 14 Feb 2024 10:29:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package Message-ID: <2770b2ac-4cec-4d56-81e9-89dfd33f786a@clermont.in2p3.fr> Add a package for the Intel/Altera SoC FPGA hardware library. It is used to let the HPS and the FPGA fabric communicate with each other. Signed-off-by: David Picard --- package/Config.in | 1 + package/intel-socfpga-hwlib/Config.in | 12 ++++++ .../intel-socfpga-hwlib.hash | 2 + .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/intel-socfpga-hwlib/Config.in create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..cd6c6bcaba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1736,6 +1736,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/intel-socfpga-hwlib/Config.in" source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/intel-socfpga-hwlib/Config.in b/package/intel-socfpga-hwlib/Config.in new file mode 100644 index 0000000000..ced6483a59 --- /dev/null +++ b/package/intel-socfpga-hwlib/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB + bool "intel-socfpga-hwlib" + depends on BR2_arm + help + This package provides the Intel SoC FPGA HWLIB for + Intel/Altera SoC FPGA chips. + This library allows to communicate with the FPGA fabric from + Linux, running on the HPS device. + The source code is not compiled. Instead, a symlink is added + to $(STAGING_DIR)/lib. + + https://github.com/altera-opensource/intel-socfpga-hwlib diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash new file mode 100644 index 0000000000..60efe9013e --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash @@ -0,0 +1,2 @@ +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 intel-socfpga-hwlib-23.12.02.tar.gz +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 License.txt diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk new file mode 100644 index 0000000000..bf18c23560 --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# intel-socfpga-hwlib +# +################################################################################ + +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 +INTEL_SOCFPGA_HWLIB_SITE = $(call github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES + +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) $(STAGING_DIR)/lib/intel-socfpga-hwlib +endef + +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS +# mkdir -p $(BINARIES_DIR)/intel-ucode +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# else +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO +# endif + +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +# endef + +$(eval $(generic-package)) -- 2.40.1 From buildroot at bubu1.eu Wed Feb 14 09:31:41 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 14 Feb 2024 10:31:41 +0100 Subject: [Buildroot] [PATCH] package/python-pytz: bump to 2024.1 Message-ID: <20240214093142.3423721-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- package/python-pytz/python-pytz.hash | 4 ++-- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index be6f0e976b..a8bfe67817 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 84e6569fcc917b096cca1063819c4ab0 pytz-2023.3.post1.tar.gz -sha256 7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b pytz-2023.3.post1.tar.gz +md5 b26bb090d1fe96064019bf7068eeb801 pytz-2024.1.tar.gz +sha256 2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812 pytz-2024.1.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 182d8156fc..300e26befe 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2023.3.post1 +PYTHON_PYTZ_VERSION = 2024.1 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/69/4f/7bf883f12ad496ecc9514cd9e267b29a68b3e9629661a2bbc24f80eff168 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/90/26/9f1f00a5d021fff16dee3de13d43e5e978f3d58928e129c3a62cf7eb9738 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt -- 2.34.1 From david.picard at clermont.in2p3.fr Wed Feb 14 09:32:20 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 14 Feb 2024 10:32:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package Message-ID: Add a package for the Intel/Altera SoC FPGA hardware library. It is used to let the HPS and the FPGA fabric communicate with each other. Signed-off-by: David Picard --- package/Config.in | 1 + package/intel-socfpga-hwlib/Config.in | 12 ++++++ .../intel-socfpga-hwlib.hash | 2 + .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/intel-socfpga-hwlib/Config.in create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..cd6c6bcaba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1736,6 +1736,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/intel-socfpga-hwlib/Config.in" source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/intel-socfpga-hwlib/Config.in b/package/intel-socfpga-hwlib/Config.in new file mode 100644 index 0000000000..ced6483a59 --- /dev/null +++ b/package/intel-socfpga-hwlib/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB + bool "intel-socfpga-hwlib" + depends on BR2_arm + help + This package provides the Intel SoC FPGA HWLIB for + Intel/Altera SoC FPGA chips. + This library allows to communicate with the FPGA fabric from + Linux, running on the HPS device. + The source code is not compiled. Instead, a symlink is added + to $(STAGING_DIR)/lib. + + https://github.com/altera-opensource/intel-socfpga-hwlib diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash new file mode 100644 index 0000000000..60efe9013e --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash @@ -0,0 +1,2 @@ +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 intel-socfpga-hwlib-23.12.02.tar.gz +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 License.txt diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk new file mode 100644 index 0000000000..bf18c23560 --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# intel-socfpga-hwlib +# +################################################################################ + +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 +INTEL_SOCFPGA_HWLIB_SITE = $(call github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES + +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) $(STAGING_DIR)/lib/intel-socfpga-hwlib +endef + +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS +# mkdir -p $(BINARIES_DIR)/intel-ucode +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# else +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO +# endif + +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +# endef + +$(eval $(generic-package)) -- 2.40.1 From david.picard at clermont.in2p3.fr Wed Feb 14 09:34:48 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 14 Feb 2024 10:34:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package Message-ID: Add a package for the Intel/Altera SoC FPGA hardware library. It is used to let the HPS and the FPGA fabric communicate with each other. Signed-off-by: David Picard --- package/Config.in | 1 + package/intel-socfpga-hwlib/Config.in | 12 ++++++ .../intel-socfpga-hwlib.hash | 2 + .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/intel-socfpga-hwlib/Config.in create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..cd6c6bcaba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1736,6 +1736,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/intel-socfpga-hwlib/Config.in" source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/intel-socfpga-hwlib/Config.in b/package/intel-socfpga-hwlib/Config.in new file mode 100644 index 0000000000..ced6483a59 --- /dev/null +++ b/package/intel-socfpga-hwlib/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB + bool "intel-socfpga-hwlib" + depends on BR2_arm + help + This package provides the Intel SoC FPGA HWLIB for + Intel/Altera SoC FPGA chips. + This library allows to communicate with the FPGA fabric from + Linux, running on the HPS device. + The source code is not compiled. Instead, a symlink is added + to $(STAGING_DIR)/lib. + + https://github.com/altera-opensource/intel-socfpga-hwlib diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash new file mode 100644 index 0000000000..60efe9013e --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash @@ -0,0 +1,2 @@ +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 intel-socfpga-hwlib-23.12.02.tar.gz +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 License.txt diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk new file mode 100644 index 0000000000..bf18c23560 --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# intel-socfpga-hwlib +# +################################################################################ + +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 +INTEL_SOCFPGA_HWLIB_SITE = $(call github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES + +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) $(STAGING_DIR)/lib/intel-socfpga-hwlib +endef + +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS +# mkdir -p $(BINARIES_DIR)/intel-ucode +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# else +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO +# endif + +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +# endef + +$(eval $(generic-package)) -- 2.40.1 From alexander.sverdlin at gmail.com Wed Feb 14 10:58:32 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:58:32 +0100 Subject: [Buildroot] [PATCH 09/21] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option In-Reply-To: <20240213172817.2872849-10-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-10-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > This tool uses additional host python modules that must be provided by > Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to > add additional host packages in U-Boot build dependency to use binman. > > The binman requirement is directly included in buildman dependency > (tools/buildman/requirements.txt) since within U-Boot, binman is > invoked by the build system, here buildman [1]. > > [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > Note: > ? binman is bundled in U-Boot source code. Use "USE_BINMAN" instead of > ? "NEEDS_BINMAN" since it's not an external U-Boot dependency. > --- > ?boot/uboot/Config.in | 11 +++++++++++ > ?boot/uboot/uboot.mk? |? 8 ++++++++ > ?2 files changed, 19 insertions(+) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index beafb38930..e6e7956adc 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -290,6 +290,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN > ? ? This option makes sure that the needed binary blobs are copied > ? ? into the U-Boot source directory. > ? > +config BR2_TARGET_UBOOT_USE_BINMAN > + bool "U-Boot use binman" > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema > + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 > + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS > + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT > + help > + ? Use binman tool for generation and signing of boot images. > + > + ? https://docs.u-boot.org/en/v2024.01/develop/package/binman.html > + > ?menu "U-Boot binary format" > ? > ?config BR2_TARGET_UBOOT_FORMAT_AIS > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dda606a880..0714522550 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -269,6 +269,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) > ?UBOOT_DEPENDENCIES += host-vim > ?endif > ? > +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt > +UBOOT_DEPENDENCIES += \ > + host-python-jsonschema \ > + host-python-pyyaml > +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) > +endif > + > ?# prior to u-boot 2013.10 the license info was in COPYING. Copy it so > ?# legal-info finds it > ?define UBOOT_COPY_OLD_LICENSE_FILE -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 10:58:38 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:58:38 +0100 Subject: [Buildroot] [PATCH 10/21] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option In-Reply-To: <20240213172817.2872849-11-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-11-romain.naour@smile.fr> Message-ID: <450e202a12ad55dd348d72840bbaaa3619a3c9ae.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > As for U-boot package, this tool uses additional host python modules > that must be provided by Buildroot. So introduce a new option > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN to add additional host packages > in U-Boot build dependency to use binman. > > The binman requirement is directly included in buildman dependency > (tools/buildman/requirements.txt) since within U-Boot, binman is > invoked by the build system, here buildman [1]. > > Make sure that all binman requirements are build before > ti-k3-r5-loader. > > [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > Note: > ? binman is bundled in U-Boot source code. Use "USE_BINMAN" instead of > ? "NEEDS_BINMAN" since it's not an external U-Boot dependency. > --- > ?boot/ti-k3-r5-loader/Config.in????????? |? 8 ++++++++ > ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 14 ++++++++++++++ > ?2 files changed, 22 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in > index 8c8368a1a5..d678bd17c2 100644 > --- a/boot/ti-k3-r5-loader/Config.in > +++ b/boot/ti-k3-r5-loader/Config.in > @@ -93,4 +93,12 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE > ? help > ? ? Path to the TI K3 R5 Loader configuration file. > ? > +config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN > + bool "ti-k3-r5-loader use binman" > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema > + help > + ? Use binman tool for generation and signing of boot images. > + > + ? https://docs.u-boot.org/en/v2024.01/develop/package/binman.html > + > ?endif > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0ffcb8235f..8f86e0fb07 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -60,6 +60,20 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > ? HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > ? HOSTLDFLAGS="$(HOST_LDFLAGS)" > ? > +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt > +TI_K3_R5_LOADER_DEPENDENCIES += \ > + host-python-jsonschema \ > + host-python-pyyaml > +# Make sure that all binman requirements are build before ti-k3-r5-loader. > +TI_K3_R5_LOADER_DEPENDENCIES += \ > + host-python3 \ > + host-python-setuptools \ > + host-python-pylibfdt \ > + host-python-pyelftools > +TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) > +endif > + > ?define TI_K3_R5_LOADER_BUILD_CMDS > ? $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > ?endef -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 10:58:44 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:58:44 +0100 Subject: [Buildroot] [PATCH 11/21] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR In-Reply-To: <20240213172817.2872849-12-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-12-romain.naour@smile.fr> Message-ID: <05c23828b1121bf48fe3af89459da706b04cd9c9.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > U-boot for k3 r5 core (ti-k3-r5-loader) can install different target > image (tiboot3*.bin) depending on the k3 SoC variant using different > boot flow [1]: > > - Split binary with a combined firmware: (eg: AM65) > - Combined binary with a combined firmware: (eg: AM64) > - Split binary with a split firmware: (eg: J721E) > - Combined binary with a split firmware: (eg: AM62) > > K3 SoC using Split Binary Boot Flow also requires sysfw-*.itb file > to boot (eg: am65, j721e). Only tiboot3*.bin is needed for other > boot flow. > > From [1]: > "It's important to rename the generated tiboot3.bin and sysfw.itb > to match exactly tiboot3.bin and sysfw.itb as ROM and the wakeup > UBoot SPL will only look for and load the files with these names." > > So boards using HS (High Secure) K3 SoC variant must update the > tiboot3.bin (and sysfw.itb) in their post-build script. > > ti-k3-r5-loader must install any tiboot3*.bin (and sysfw*.itb) > to BINARIES_DIR let the user which one should be used in a > post-build script. > > See the list of all tiboot3*.bin and sysfw*.itb file variant found in meta-ti: [] > [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 9 +++++++++ > ?1 file changed, 9 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 8f86e0fb07..b3c756dc47 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -78,8 +78,17 @@ define TI_K3_R5_LOADER_BUILD_CMDS > ? $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > ?endef > ? > +# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e) > ?define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > ? cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + for f in $(@D)/tiboot3*.bin ; do \ > + $(INSTALL) -D -m 0644 $$f $(BINARIES_DIR)/`basename $$f` || exit 1; \ > + done > + for f in $(@D)/sysfw*.itb ; do \ > + if test -e $$f ; then \ > + $(INSTALL) -D -m 0644 $$f $(BINARIES_DIR)/`basename $$f` || exit 1; \ > + fi ; \ > + done > ?endef > ? > ?$(eval $(kconfig-package)) -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 10:58:50 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:58:50 +0100 Subject: [Buildroot] [PATCH 16/21] boot/uboot: enable TI K3 Device Manager (DM) for j721e In-Reply-To: <20240213172817.2872849-17-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-17-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > The TI K3 Device Manager (DM) support for J721E is needed to boot > DRA829/TDA4VM SoC. > > https://www.ti.com/product/TDA4VM?(SoC) > https://www.ti.com/tool/PROCESSOR-SDK-J721E?(TI SDK) > https://www.ti.com/tool/SK-TDA4VM?(TDA4VM processor starter kit) > https://beagleboard.org/ai-64?(BeagleBone AI-64 SBC) > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/uboot/Config.in | 3 ++- > ?1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index 7586f24c90..837f1605b7 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -245,7 +245,8 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > ? # We use the SoC selection defined for the ti-k3-boot-firmware > ? # package > ? depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE > - depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X > + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X \ > + || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > ? help > ? ? Some TI K3 devices need the Device Manager (DM) firmware to > ? ? be available for the U-Boot build. -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 10:58:56 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:58:56 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240213172817.2872849-22-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > ti-k3-image-gen tool is deprecated an replaced by binman [1]. > > All defconfig that was using it have been updated to use U-boot > binman tool instead. > > So, we can safely remove ti-k3-image-gen package. > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > > Cc: Anand Gadiyar > Cc: Xuanhao Shi > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?Config.in.legacy????????????????????????? |? 7 ++ > ?DEVELOPERS??????????????????????????????? |? 2 - > ?boot/Config.in??????????????????????????? |? 1 - > ?boot/ti-k3-image-gen/Config.in??????????? | 81 ----------------------- > ?boot/ti-k3-image-gen/ti-k3-image-gen.hash |? 3 - > ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?? | 54 --------------- > ?6 files changed, 7 insertions(+), 141 deletions(-) > ?delete mode 100644 boot/ti-k3-image-gen/Config.in > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 10:59:01 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:59:01 +0100 Subject: [Buildroot] [PATCH 19/21] configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman tool In-Reply-To: <20240213172817.2872849-20-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-20-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Update u-boot for a53 and r5 core to 2024.01 and enable binman support > in order to remove BR2_TARGET_TI_K3_IMAGE_GEN. > > Signed-off-by: Romain Naour Looks good to me in principle, so Reviewed-by: Alexander Sverdlin But maybe you could add a word into commit message about updated ATF if you'll re-spin. > --- > ?configs/ti_am62x_sk_defconfig | 12 ++++++++---- > ?1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index c3ad555a81..f725734551 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -16,25 +16,29 @@ BR2_TARGET_ROOTFS_EXT2_4=y > ?BR2_TARGET_ROOTFS_EXT2_SIZE="256M" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > ?BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > -BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > ?BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" > +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y > ?BR2_TARGET_UBOOT=y > ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > ?BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > ?BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" > ?BR2_TARGET_UBOOT_NEEDS_DTC=y > ?BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > ?BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > ?BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y > +BR2_TARGET_UBOOT_USE_BINMAN=y > ?# BR2_TARGET_UBOOT_FORMAT_BIN is not set > ?BR2_TARGET_UBOOT_FORMAT_IMG=y > ?BR2_TARGET_UBOOT_SPL=y -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 11:05:01 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 12:05:01 +0100 Subject: [Buildroot] [PATCH 20/21] configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman tool In-Reply-To: <20240213172817.2872849-21-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-21-romain.naour@smile.fr> Message-ID: Hi Romain, looks good to me, maybe ATF update is worth a word in the commit message in case you'll re-spin. On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Update u-boot for a53 and r5 core to 2024.01 and enable binman support > in order to remove BR2_TARGET_TI_K3_IMAGE_GEN. > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?configs/ti_am64x_sk_defconfig | 12 ++++++++---- > ?1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 097175bd8f..bcef16777e 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -16,24 +16,28 @@ BR2_TARGET_ROOTFS_EXT2_4=y > ?BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > ?BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > -BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > ?BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" > +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y > ?BR2_TARGET_UBOOT=y > ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > ?BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > ?BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" > ?BR2_TARGET_UBOOT_NEEDS_DTC=y > ?BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > ?BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_USE_BINMAN=y > ?# BR2_TARGET_UBOOT_FORMAT_BIN is not set > ?BR2_TARGET_UBOOT_FORMAT_IMG=y > ?BR2_TARGET_UBOOT_SPL=y -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 11:20:25 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 12:20:25 +0100 Subject: [Buildroot] [PATCH 12/21] boot/ti-k3-boot-firmware: introduce BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX, AM62X, AM64X, AM65X} In-Reply-To: <20240213172817.2872849-13-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-13-romain.naour@smile.fr> Message-ID: <766f0b7f72ef1fd10596bc84d23269fe969134e4.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > ti-k3-image-gen tool is deprecated an replaced by binman [1]. > > But BR2_TARGET_TI_K3_IMAGE_GEN_SOC_{AM62AX,AM62X} is used by u-boot > package to select which Device Manager (DM) firmware to use for the > U-Boot build. > > In order to remove ti-k3-image-gen package, introduce > BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} to > replace BR2_TARGET_TI_K3_IMAGE_GEN_SOC_{AM62AX,AM62X,AM64X,AM65X}. > > In order to avoid breaking existing defconfig still using > ti-k3-image-gen tool (ti_am62x_sk_defconfig, ti_am64x_sk_defconfig) > select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC symbol from ti-k3-image-gen > package. > > While at it, only install required firmware to BINARIES_DIR based > on the selected TI K3 SoC variant. > > This requires two intall step: > ? - ti-sysfw installation based on the SoC variant. > ? - ti-dm installation only for SoC using split firmware boot flow > ??? (eg: am62, j721e) > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/ti-k3-boot-firmware/Config.in??????????? | 34 +++++++++++++++++++ > ?.../ti-k3-boot-firmware.mk??????????????????? | 12 +++++-- > ?boot/ti-k3-image-gen/Config.in??????????????? |? 4 +++ > ?3 files changed, 48 insertions(+), 2 deletions(-) -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 11:25:58 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 12:25:58 +0100 Subject: [Buildroot] [PATCH 17/21] boot/ti-k3-boot-firmware: bump to version 09.02.00.004 In-Reply-To: <20240213172817.2872849-18-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-18-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Remove the comment about ti-k3-image-gen since this tool is > deprecated an replaced by binman. > > ti-k3-image-gen has been removed from meta-ti [1]. > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 2 +- > ?boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk?? | 4 +--- > ?2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > index 95131180ef..939bd0794a 100644 > --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > @@ -1,3 +1,3 @@ > ?# Locally calculated > ?sha256? ab20ffbe7bba7e94be246b3417d33a914b3f07c16c47ef5a7f7602349a666a61? LICENSE.ti > -sha256? 6032a258ce731d987576115f5de44c677a6b0cf8bddcd61a9a2852928bdfff92? ti-linux-firmware-08.06.00.006.tar.xz > +sha256? 701d400ac33b2885ec35d73f0d66e5186e3c2f71ef28679508b58ef986804d35? ti-linux-firmware-09.02.00.004.tar.xz > diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > index c7c5eb0818..fb28d8ac41 100644 > --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > @@ -4,9 +4,7 @@ > ?# > ?################################################################################ > ? > -# The hash 340194800a581baf976360386dfc7b5acab8d948 defined in the > -# Makefile of ti-k3-image-gen corresponds to the tag 08.06.00.006. > -TI_K3_BOOT_FIRMWARE_VERSION = 08.06.00.006 > +TI_K3_BOOT_FIRMWARE_VERSION = 09.02.00.004 > ?TI_K3_BOOT_FIRMWARE_SITE = https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/snapshot > ?TI_K3_BOOT_FIRMWARE_SOURCE = ti-linux-firmware-$(TI_K3_BOOT_FIRMWARE_VERSION).tar.xz > ?TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES = YES -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 11:29:48 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 12:29:48 +0100 Subject: [Buildroot] [PATCH 13/21] boot/uboot: use DM firmware name defined by ti-k3-boot-firmware package In-Reply-To: <20240213172817.2872849-14-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-14-romain.naour@smile.fr> Message-ID: <9be87fcdf09a2c130766d9b9e08d6af971e3b322.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > The DM firmware name is now defined by ti-k3-boot-frimware package by > BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM, so BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > can be removed to avoid duplication in Kconfig. > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/uboot/Config.in | 9 --------- > ?boot/uboot/uboot.mk? | 2 +- > ?2 files changed, 1 insertion(+), 10 deletions(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index e6e7956adc..63359266c6 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -250,15 +250,6 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > ? ? Some TI K3 devices need the Device Manager (DM) firmware to > ? ? be available for the U-Boot build. > ? > -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > - > -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > - string > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62xx"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - > -endif > - > ?config BR2_TARGET_UBOOT_NEEDS_OPENSBI > ? bool "U-Boot needs OpenSBI" > ? depends on BR2_TARGET_OPENSBI > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 0714522550..aa2ca99bdd 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -187,7 +187,7 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > ?endif > ? > ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM)) > ?UBOOT_DEPENDENCIES += ti-k3-boot-firmware > ?UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > ?endif -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 11:37:23 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 12:37:23 +0100 Subject: [Buildroot] [PATCH 15/21] boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options In-Reply-To: <20240213172817.2872849-16-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-16-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > ti-k3-image-gen tool is deprecated an replaced by binman [1]. > > Use the newly introduced BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X}. > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/uboot/Config.in | 6 +++--- > ?1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index 63359266c6..7586f24c90 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -242,10 +242,10 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > ? > ?config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > ? bool "U-Boot needs TI K3 Device Manager (DM)" > - # We use the SoC selection defined for the ti-k3-image-gen > + # We use the SoC selection defined for the ti-k3-boot-firmware > ? # package > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE > + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X > ? help > ? ? Some TI K3 devices need the Device Manager (DM) firmware to > ? ? be available for the U-Boot build. -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 12:06:45 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 13:06:45 +0100 Subject: [Buildroot] [PATCH 18/21] configs/ti_j721e_sk_defconfig: new defconfig In-Reply-To: <20240213172817.2872849-19-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-19-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Adds support for TI's SK-TDA4VM board by introducing the > ti_j721e_sk_defconfig file and related support files. > > Retrieve BSP settings from meta-ti (may be useful for other TI boards): > > - Don't set BR2_TARGET_TI_K3_IMAGE_GEN since this tool is deprecated > ? [1] and must be replaced by u-boot binman (upstream). > ? See FOSDEM 2024 talk by TI folks about Binman and how it simplify the > ? overall boot-loader build flow [2]. > > - Set BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD = "generic" > > ? meta-ti]$ git grep TFA_BOARD > ? meta-ti-bsp/conf/machine/beagleplay.conf:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/am62axx.inc:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/am62pxx.inc:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/am62xx.inc:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/am64xx.inc:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/am65xx.inc:TFA_BOARD = "generic" > ? meta-ti-bsp/conf/machine/include/j7200.inc:TFA_BOARD = "generic" > ? meta-ti-bsp/conf/machine/include/j721e.inc:TFA_BOARD = "generic" > ? meta-ti-bsp/conf/machine/include/j721s2.inc:TFA_BOARD = "generic" > ? meta-ti-bsp/conf/machine/include/j722s.inc:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/j784s4.inc:TFA_BOARD = "j784s4" > > - Set BR2_TARGET_UBOOT_NEEDS_ATF_BL31 to provide BL31 variable pointing > ? to ATF bl31.bin to the U-Boot build process [3]. > > - Set BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE to OP-TEE as BL32 > ? secure payload. meta-ti set "SPD=opteed" to build ATF [4]. > > - Set BR2_TARGET_OPTEE_OS_PLATFORM to "k3-j721e". > ? meta-ti uses the OPTEEMACHINE to set optee-os platform [5]. > ? meta-ti]$ git grep OPTEEMACHINE > ? meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" > ? meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" > ? meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" > ? meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" > ? meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" > ? meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" > ? meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" > > - Set BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME since u-boot is looking at /boot/dtb/ti > ? for devicetree. (Yocto uses KERNEL_DTBDEST) > ? Create a symlink to make sure /boot/dtb/ti exist. > ? (We want to keep the u-boot environment provided by upstream as is). > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > [2] https://fosdem.org/2024/schedule/event/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/ > [3] https://git.yoctoproject.org/meta-ti/commit/?id=e74b9a1746d4d04757c87c1920a0f743e55ff096 > [4] https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc?h=09.02.00.004#n7 > [5] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 > > More information about the board can be found at: > https://www.ti.com/tool/SK-TDA4VM > > Signed-off-by: Romain Naour looks good to me, Reviewed-by: Alexander Sverdlin > --- > ?DEVELOPERS????????????????????? |? 2 ++ > ?board/ti/j721e-sk/genimage.cfg? | 28 ++++++++++++++++++ > ?board/ti/j721e-sk/post-build.sh | 16 +++++++++++ > ?board/ti/j721e-sk/readme.txt??? | 34 ++++++++++++++++++++++ > ?configs/ti_j721e_sk_defconfig?? | 51 +++++++++++++++++++++++++++++++++ > ?5 files changed, 131 insertions(+) > ?create mode 100644 board/ti/j721e-sk/genimage.cfg > ?create mode 100755 board/ti/j721e-sk/post-build.sh > ?create mode 100644 board/ti/j721e-sk/readme.txt > ?create mode 100644 configs/ti_j721e_sk_defconfig > -- Alexander Sverdlin. From romain.naour at smile.fr Wed Feb 14 15:24:05 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 14 Feb 2024 16:24:05 +0100 Subject: [Buildroot] [PATCH 19/21] configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman tool In-Reply-To: References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-20-romain.naour@smile.fr> Message-ID: Hi Alexander, Le 14/02/2024 ? 11:59, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >> Update u-boot for a53 and r5 core to 2024.01 and enable binman support >> in order to remove BR2_TARGET_TI_K3_IMAGE_GEN. >> >> Signed-off-by: Romain Naour > > Looks good to me in principle, so > Reviewed-by: Alexander Sverdlin > > But maybe you could add a word into commit message about updated ATF > if you'll re-spin. Ok. I'll wait before re-spin if someone can do a runtime test. Thanks for the review! Best regards, Romain > >> --- >> ?configs/ti_am62x_sk_defconfig | 12 ++++++++---- >> ?1 file changed, 8 insertions(+), 4 deletions(-) >> >> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >> index c3ad555a81..f725734551 100644 >> --- a/configs/ti_am62x_sk_defconfig >> +++ b/configs/ti_am62x_sk_defconfig >> @@ -16,25 +16,29 @@ BR2_TARGET_ROOTFS_EXT2_4=y >> ?BR2_TARGET_ROOTFS_EXT2_SIZE="256M" >> ?BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" >> ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" >> ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" >> ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y >> ?BR2_TARGET_OPTEE_OS=y >> ?BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" >> -BR2_TARGET_TI_K3_IMAGE_GEN=y >> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y >> +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y >> +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X=y >> ?BR2_TARGET_TI_K3_R5_LOADER=y >> +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y >> +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" >> ?BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" >> +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y >> ?BR2_TARGET_UBOOT=y >> ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> ?BR2_TARGET_UBOOT_CUSTOM_VERSION=y >> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" >> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" >> ?BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" >> ?BR2_TARGET_UBOOT_NEEDS_DTC=y >> ?BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >> ?BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >> ?BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y >> +BR2_TARGET_UBOOT_USE_BINMAN=y >> ?# BR2_TARGET_UBOOT_FORMAT_BIN is not set >> ?BR2_TARGET_UBOOT_FORMAT_IMG=y >> ?BR2_TARGET_UBOOT_SPL=y > From bugzilla at busybox.net Wed Feb 14 15:30:21 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 14 Feb 2024 15:30:21 +0000 Subject: [Buildroot] [Bug 15943] New: Reevaluate Python3 patches Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15943 Bug ID: 15943 Summary: Reevaluate Python3 patches Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: vfazio at xes-inc.com CC: buildroot at uclibc.org Target Milestone: --- Currently, we have the following patches for Python 3: 0001-Make-the-build-of-pyc-files-conditional.patch 0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch 0003-Adjust-library-header-paths-for-cross-compilation.patch 0004-Serial-ioctl-workaround.patch 0005-Misc-python-config.sh.in-ensure-sed-invocations-only.patch 0006-Add-an-option-to-disable-pydoc.patch 0007-Add-an-option-to-disable-lib2to3.patch 0008-Add-an-option-to-disable-IDLE.patch 0009-python-config.sh-don-t-reassign-prefix.patch 0010-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch 0011-Add-option-to-disable-the-sqlite3-module.patch 0012-Add-an-option-to-disable-the-tk-module.patch 0013-Add-an-option-to-disable-the-curses-module.patch 0014-Add-an-option-to-disable-expat.patch 0015-fix-building-on-older-distributions.patch 0016-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch 0017-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch This issue is just to start some discussion on removing or reworking some of these patches and to check upstream status I'm going to skip 6-8, 11-14. These would be preferable to upstream or to find an alternative disable mechanism but so far are necessary. Some seem to require these build flags, others are being disabled via py_cv_ autoconf variables. Patch 0001: * Has no upstream status * could maybe be upstreamed * we disable it because: * we don't need all levels of optimization consuming disk space * we generate the legacy variants for sourceless distributions (https://github.com/python/cpython/issues/95827) * We could, instead, remove the files post build instead of patching to disable it * this costs build time, but is one less patch to maintain since we already have a hook to remove these files in python3.mk though it is not removing opt-0.pyc Patch 0002: * no upstream status * could maybe be upstreamed as you can't reliably run cross built code to determine bugginess of a function * patch could be removed if we define ac_cv_buggy_getaddrinfo=no like we do other ac_cv values in python3.mk or if we explicitly set either --(en|dis)able-ipv6 (https://github.com/python/cpython/commit/9635013a8fb68c044ea2cae2ec344b3940c188b2) * there could be issues if there is an actually buggy IPv6 implementation Patch 0003: * has no upstream status * not likely to be upstreamed * can probably be removed because these environment variables were dropped in BR 0d327c267a57e3a75b10becde772addb7fc49297 so this patch isn't doing anything Patch 0004: * has no upstream status * original discussion: http://lists.busybox.net/pipermail/buildroot/2014-July/102202.html * may not be needed for toolchains using kernel headers newer than 3.17 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f61bf8e7d19e0a3456a7a9ed97c399e4353698dc * what's our required minimum kernel header version? If we had one defined, we can make assumptions in our packages & patches. Patch 0005: * Upstream: https://github.com/python/cpython/issues/67096 * can likely be dropped since Python 3.10 https://github.com/python/cpython/commit/14086cfc5eed8c5e78342d79e5db87a135d75fa8 Patch 0010: * no upstream status * could maybe be upstreamed if the argument was made for it... the argument for landing this is buttressed by the other disable flags we patch in Patch 15: * no upstream status * no need for one... * should be dropped, we do not use the build host's python when cross compiling python as it requires a reasonably new version for regen, so we use the BR host version which is the same as the target version to satisfy this. * As of 3.12 it requires 3.10 https://github.com/python/cpython/commit/146106a0f1cc61815fa33f0d3f808a3e3e3275be Patch 16: * no upstream status * musl and uClibc do not have official upstream support though concessions have been made for musl * I think this needs more consideration... * CPython has very specific checks for the PLATFORM_TRIPLET which got reworked for 3.13 (and actually forcibly disables uClibc) * There's a bug in 3.12 where the "build_os" gets substituted for the PLATFORM_TRIPLET instead of the "host_os", fixed in 3.13 via https://github.com/python/cpython/commit/c163d7f0b67a568e9b64eeb9c1cbbaa127818596 * this commit (c163d7f0b67a568e9b64eeb9c1cbbaa127818596) also changes the PLATFORM_TRIPLET calculation * The patch should maybe be changed to fix the build_os/host_os issue and add a line for uclibc and/or to change the platform triplet detection code to correctly identify musl/uclibc Patch 17: * no upstream status (cpython doesn't have uclibc support) * should not be necessary for uClibc versions newer than 1.0.37 (see https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/libcrypt/crypt.c?id=6993d9378224489b49325bd1fb962f0e8bb935f1) * Do we specify a minimum uClibc version requirement anywhere so we can make assumptions in our packages & patches? -- Should the option disable patches just be a single patch? If not, I think I'd argue they should be the first few patches in the series. That way as we add and remove patches there's less patch reordering. -- You are receiving this mail because: You are on the CC list for the bug. From raphael.melotte at mind.be Wed Feb 14 15:47:02 2024 From: raphael.melotte at mind.be (=?UTF-8?B?UmFwaGHDq2wgTcOpbG90dGU=?=) Date: Wed, 14 Feb 2024 16:47:02 +0100 Subject: [Buildroot] [PATCH v8 21/26] package/python-rsa: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-21-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> <20240213211512.3918044-21-james.hilliard1@gmail.com> Message-ID: <70f20edd-f97e-4bb4-925a-9c0295a80fe1@mind.be> Hi James, all On 2/13/24 22:15, James Hilliard wrote: > We need to migrate python-rsa to the pep517 poetry-core > backend as setuptools is not supported when building with a pep517 > frontend. > > This package currently builds using setuptools as we do not yet > use setuptools with a pep517 build frontend. The package contains > a setuptools fallback which only can be used when using setuptools > without a pep517 frontend as the pep517 frontend will only use the > build backend specified in the package pyproject.toml which is > poetry-core and not setuptools. > > Signed-off-by: James Hilliard I ran the associated run-tests test on my side (only for python-rsa so far), it looks good to me. Tested-by: Rapha?l M?lotte > --- > package/python-rsa/python-rsa.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk > index d84ba8b431..69a6309b19 100644 > --- a/package/python-rsa/python-rsa.mk > +++ b/package/python-rsa/python-rsa.mk > @@ -7,9 +7,10 @@ > PYTHON_RSA_VERSION = 4.9 > PYTHON_RSA_SOURCE = rsa-$(PYTHON_RSA_VERSION).tar.gz > PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/aa/65/7d973b89c4d2351d7fb232c2e452547ddfa243e93131e7cfa766da627b52 > -PYTHON_RSA_SETUP_TYPE = setuptools > +PYTHON_RSA_SETUP_TYPE = pep517 > PYTHON_RSA_LICENSE = Apache-2.0 > PYTHON_RSA_LICENSE_FILES = LICENSE > PYTHON_RSA_CPE_ID_VALID = YES > +PYTHON_RSA_DEPENDENCIES = host-python-poetry-core > > $(eval $(python-package)) From romain.naour at smile.fr Wed Feb 14 16:23:00 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 14 Feb 2024 17:23:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: Message-ID: Hello David, Le 14/02/2024 ? 10:34, David Picard a ?crit?: > Add a package for the Intel/Altera SoC FPGA hardware library. It is > used to let the HPS and the FPGA fabric communicate with each other. We received 4 thime the same patch on the mailing list: http://patchwork.ozlabs.org/project/buildroot/patch/20240214081921.4663-1-david.picard at clermont.in2p3.fr/ http://patchwork.ozlabs.org/project/buildroot/patch/2770b2ac-4cec-4d56-81e9-89dfd33f786a at clermont.in2p3.fr/ http://patchwork.ozlabs.org/project/buildroot/patch/abcd4153-41e2-45ce-a89a-e198e86ba337 at clermont.in2p3.fr/ http://patchwork.ozlabs.org/project/buildroot/patch/c90e4512-405c-40fb-b597-1a04d7449afa at clermont.in2p3.fr/ Which one should we review? Please, send patch using git send-email tool. (https://nightly.buildroot.org/manual.html#submitting-patches) Also, when you resend a patch, add the changelog info. https://nightly.buildroot.org/manual.html#_patch_revision_changelog > > Signed-off-by: David Picard > --- > package/Config.in | 1 + > package/intel-socfpga-hwlib/Config.in | 12 ++++++ > .../intel-socfpga-hwlib.hash | 2 + > .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ > 4 files changed, 54 insertions(+) > create mode 100644 package/intel-socfpga-hwlib/Config.in > create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash > create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk > > diff --git a/package/Config.in b/package/Config.in > index bf0fe078b9..cd6c6bcaba 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1736,6 +1736,7 @@ menu "Hardware handling" > source "package/gnu-efi/Config.in" > source "package/hackrf/Config.in" > source "package/hidapi/Config.in" > + source "package/intel-socfpga-hwlib/Config.in" > source "package/jitterentropy-library/Config.in" > source "package/lcdapi/Config.in" > source "package/let-me-create/Config.in" > diff --git a/package/intel-socfpga-hwlib/Config.in > b/package/intel-socfpga-hwlib/Config.in > new file mode 100644 > index 0000000000..ced6483a59 > --- /dev/null > +++ b/package/intel-socfpga-hwlib/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB > + bool "intel-socfpga-hwlib" > + depends on BR2_arm > + help > + This package provides the Intel SoC FPGA HWLIB for > + Intel/Altera SoC FPGA chips. > + This library allows to communicate with the FPGA fabric from > + Linux, running on the HPS device. > + The source code is not compiled. Instead, a symlink is added > + to $(STAGING_DIR)/lib. > + > + https://github.com/altera-opensource/intel-socfpga-hwlib Check the coding style with ./utils/check-package > diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash > b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash > new file mode 100644 > index 0000000000..60efe9013e > --- /dev/null > +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash > @@ -0,0 +1,2 @@ > +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 > intel-socfpga-hwlib-23.12.02.tar.gz > +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 > License.txt > diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk > b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk > new file mode 100644 > index 0000000000..bf18c23560 > --- /dev/null > +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk > @@ -0,0 +1,39 @@ > +################################################################################ > +# > +# intel-socfpga-hwlib > +# > +################################################################################ > + > +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 > +INTEL_SOCFPGA_HWLIB_SITE = $(call > github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) > +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY It's unexpected to find a PROPRIETARY tool in a gitbub accound with "opensource" in their name :) > +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt It look like a BSD-3-Clause license https://spdx.org/licenses/BSD-3-Clause.html > +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES > +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES > + > +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS > + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) > $(STAGING_DIR)/lib/intel-socfpga-hwlib > +endef I don't think this is what you want to do. > + > +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS > +# mkdir -p $(BINARIES_DIR)/intel-ucode > +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ > +# $(@D)/intel-ucode/* > +# endef > +# > +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) > +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS > +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode > +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ > +# $(@D)/intel-ucode/* > +# endef > +# else > +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO > +# endif > + > +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS > +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) > +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) > +# endef Please, don't add commended code. Best regards, Romain > + > +$(eval $(generic-package)) > From raphael.melotte at mind.be Wed Feb 14 17:03:33 2024 From: raphael.melotte at mind.be (=?UTF-8?B?UmFwaGHDq2wgTcOpbG90dGU=?=) Date: Wed, 14 Feb 2024 18:03:33 +0100 Subject: [Buildroot] [PATCH v8 26/26] package/pkg-python.mk: migrate setuptools to pep517 In-Reply-To: <20240213211512.3918044-26-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> <20240213211512.3918044-26-james.hilliard1@gmail.com> Message-ID: On 2/13/24 22:15, James Hilliard wrote: > diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk > index 0149b8d185..1b33b7505d 100644 > --- a/package/python-psycopg2/python-psycopg2.mk > +++ b/package/python-psycopg2/python-psycopg2.mk > @@ -13,7 +13,8 @@ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE > PYTHON_PSYCOPG2_DEPENDENCIES = postgresql > # Force psycopg2 to use the Buildroot provided postgresql version > # instead of the one from the host machine > -PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config > -PYTHON_PSYCOPG2_INSTALL_TARGET_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config > +PYTHON_PSYCOPG2_BUILD_OPTS = \ > + -C--build-option=build_ext \ > + -C--build-option=--pg-config=$(STAGING_DIR)/usr/bin/pg_config > > $(eval $(python-package)) > diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk > index 639ce0e00e..8825868fb5 100644 > --- a/package/python-pymupdf/python-pymupdf.mk > +++ b/package/python-pymupdf/python-pymupdf.mk > @@ -13,6 +13,7 @@ PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ > PYTHON_PYMUPDF_LICENSE_FILES = COPYING > # No license file included in pip, but it's present on github > PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib > +PYTHON_PYMUPDF_BUILD_OPTS = --skip-dependency-check I tested python-pymupdf (only) on my side: apart from a runtime issue completely unrelated to this series (that I'm going to fix in a new series), it runs fine. Using '--skip-dependency-check' makes sense to me, as the pyproject.toml anyway contains only host dependencies that we already installed in another way (e.g. swig). So in other words: this part looks good to me! Tested-by: Rapha?l M?lotte (please note that I haven't tested any of the other packages changed in this patch) > > PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" > > diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk > index f1444b9124..48a298b221 100644 > --- a/package/python-pyzmq/python-pyzmq.mk > +++ b/package/python-pyzmq/python-pyzmq.mk > @@ -11,7 +11,7 @@ PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 > # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 > PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD > PYTHON_PYZMQ_SETUP_TYPE = setuptools > -PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr > +PYTHON_PYZMQ_BUILD_OPTS = -C--build-option=--zmq=$(STAGING_DIR)/usr > PYTHON_PYZMQ_DEPENDENCIES = \ > host-python-cython \ > host-python-packaging \ > @@ -27,7 +27,7 @@ endef > PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION > > ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y) > -PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts > +PYTHON_PYZMQ_BUILD_OPTS += -C--build-option=--enable-drafts > endif > > $(eval $(python-package)) > diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > index 153343788b..95cfa025b3 100644 > --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE > HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm > +HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_BUILD_OPTS = --skip-dependency-check > > $(eval $(host-python-package)) > diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk > index 285884a2bb..aaeab2805f 100644 > --- a/package/python-uvloop/python-uvloop.mk > +++ b/package/python-uvloop/python-uvloop.mk > @@ -10,8 +10,11 @@ PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/9c/16/728cc5dde368e > PYTHON_UVLOOP_SETUP_TYPE = setuptools > PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT > PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT > -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv > -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace --use-system-libuv > PYTHON_UVLOOP_DEPENDENCIES = libuv > +PYTHON_UVLOOP_BUILD_OPTS = \ > + --skip-dependency-check \ > + -C--build-option=build_ext \ > + -C--build-option=--inplace \ > + -C--build-option=--use-system-libuv > > $(eval $(python-package)) > diff --git a/package/python-wsaccel/python-wsaccel.mk b/package/python-wsaccel/python-wsaccel.mk > index 1f63aa5c40..7ccb033256 100644 > --- a/package/python-wsaccel/python-wsaccel.mk > +++ b/package/python-wsaccel/python-wsaccel.mk > @@ -10,5 +10,6 @@ PYTHON_WSACCEL_SITE = https://files.pythonhosted.org/packages/94/28/41c0e711b538 > PYTHON_WSACCEL_LICENSE = Apache-2.0 > PYTHON_WSACCEL_LICENSE_FILES = LICENSE > PYTHON_WSACCEL_SETUP_TYPE = setuptools > +PYTHON_WSACCEL_BUILD_OPTS = --skip-dependency-check > > $(eval $(python-package)) From thomas at devoogdt.com Wed Feb 14 18:29:31 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 14 Feb 2024 19:29:31 +0100 Subject: [Buildroot] [PATCH v1] package/weston: fix auto seatd daemon selection Message-ID: <20240214182931.116813-1-thomas@devoogdt.com> Commit 9d6f966f9ad012879bb472896eb35eeda5baa9ab "package/weston: don't select seatd daemon if we have logind", added a fix to only select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND, but that conflicts with BR2_PACKAGE_SEATD_BUILTIN, which is selected by default in the seatd. Add the same logic here, so that it is possible again to select either the built-in or the daemon option. Signed-off-by: Thomas Devoogdt --- package/weston/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index db6a78ee8a..6bc43c73c2 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -19,7 +19,8 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_SEATD - select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND + select BR2_PACKAGE_SEATD_BUILTIN \ + if !BR2_PACKAGE_SYSTEMD_LOGIND && !BR2_PACKAGE_SEATD_DAEMON # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG select BR2_PACKAGE_WESTON_SHELL_DESKTOP if !BR2_PACKAGE_WESTON_HAS_SHELL -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 14 19:58:58 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 14 Feb 2024 20:58:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-vaapi: fix wayland build Message-ID: <20240214195858.1796266-1-fontaine.fabrice@gmail.com> wayland-protocols is a mandatory dependency with wayland since bump to version 1.22.0 in commit 33d4c226e582f6c0086431c4d9154e462cb3cf34 and https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/3c713cc16ee1d374213cb2b47a3127e14e5ff8a5: Run-time dependency wayland-protocols found: NO (tried pkgconfig and cmake) ../output-1/build/gst1-vaapi-1.22.0/meson.build:111:0: ERROR: Dependency "wayland-protocols" not found, tried pkgconfig and cmake Fixes: 33d4c226e582f6c0086431c4d9154e462cb3cf34 - http://autobuild.buildroot.org/results/b5e79d4e10fdf24c3fd43ab742d9d14a5d07824b - http://autobuild.buildroot.org/results/ad624cd11d5a1b3346974000ae2b61f4261af02c Signed-off-by: Fabrice Fontaine --- package/gstreamer1/gst1-vaapi/Config.in | 1 + package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index a1062097ed..d6a1542ad3 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_GST1_VAAPI select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 4b04d1bb72..d934bab233 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -39,6 +39,7 @@ endif ifeq ($(BR2_PACKAGE_WAYLAND),y) GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +GST1_VAAPI_DEPENDENCIES += wayland wayland-protocols else GST1_VAAPI_CONF_OPTS += -Dwayland=disabled endif -- 2.43.0 From thomas at devoogdt.com Wed Feb 14 20:38:45 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 14 Feb 2024 21:38:45 +0100 Subject: [Buildroot] [PATCH v2] package/weston: bump to 13.0.0 Message-ID: <20240214203845.121720-1-thomas@devoogdt.com> Announce: https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html Drop -Dlauncher-libseat=true, as it has been dropped upstream [1]. Also drop the BR2_PACKAGE_SEATD_DAEMON, which was added in commit 6d677931284d58ae0e8e001cfd990eafaee5cecc "package/weston: select the seatd daemon", and commit 9d6f966f9ad012879bb472896eb35eeda5baa9ab "package/weston: don't select seatd daemon if we have logind", as it is not strictly needed anymore. In package/seatd/Config.in we have: select BR2_PACKAGE_SEATD_BUILTIN \ if !BR2_PACKAGE_SYSTEMD_LOGIND && !BR2_PACKAGE_SEATD_DAEMON Here we have: select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND This makes it impossible to select BR2_PACKAGE_SEATD_BUILTIN as the -only- backend if not BR2_PACKAGE_SYSTEMD_LOGIND, so drop it altogether. This kind of logic should be selected in the device defconfigs or by packages that really need one specific backend. [1]: https://gitlab.freedesktop.org/wayland/weston/-/commit/e3b6ed50f1c3c259c51274c78d08b58> Signed-off-by: Thomas Devoogdt --- v2: Combine and rework git message these two patches: - [v1] package/weston: bump to 13.0.0 https://patchwork.ozlabs.org/project/buildroot/patch/20240214075445.1011185-1-thomas.devoogdt at barco.com/ - [v1] package/weston: fix auto seatd daemon selection https://patchwork.ozlabs.org/project/buildroot/patch/20240214182931.116813-1-thomas at devoogdt.com/ --- package/weston/Config.in | 1 - package/weston/weston.hash | 6 +++--- package/weston/weston.mk | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index db6a78ee8a..1b282fb362 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -19,7 +19,6 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_SEATD - select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG select BR2_PACKAGE_WESTON_SHELL_DESKTOP if !BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 0ecbaa4168..ded5d35275 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-May/042725.html -sha256 b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535 weston-12.0.1.tar.xz -sha512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688 weston-12.0.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html +sha256 52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a weston-13.0.0.tar.xz +sha512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc weston-13.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index b07e798765..5ae9c22973 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 12.0.1 +WESTON_VERSION = 13.0.0 WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -19,7 +19,6 @@ WESTON_CONF_OPTS = \ -Ddoc=false \ -Dremoting=false \ -Dbackend-vnc=false \ - -Dlauncher-libseat=true \ -Dtools=calibrator,debug,info,terminal,touch-calibrator ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) -- 2.34.1 From kadambini.nema at gmail.com Wed Feb 14 22:25:39 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Wed, 14 Feb 2024 14:25:39 -0800 Subject: [Buildroot] [PATCH 1/1] package/ttyd: bump version to 1.7.4 Message-ID: <20240214222539.2268283-1-kadambini.nema@gmail.com> change log - https://github.com/tsl0922/ttyd/releases/tag/1.7.4 Signed-off-by: Kadambini Nema --- package/ttyd/ttyd.hash | 2 +- package/ttyd/ttyd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ttyd/ttyd.hash b/package/ttyd/ttyd.hash index 85bd71ba2d..b11327c465 100644 --- a/package/ttyd/ttyd.hash +++ b/package/ttyd/ttyd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c9cf5eece52d27c5d728000f11315d36cb400c6948d1964a34a7eae74b454099 ttyd-1.7.3.tar.gz +sha256 300d8cef4b0b32b0ec30d7bf4d3721a5d180e22607f9467a95ab7b6d9652ca9b ttyd-1.7.4.tar.gz sha256 8b7e100f8311cb428c57609164d93099bada2599f948359045d1ac876a7a625b LICENSE diff --git a/package/ttyd/ttyd.mk b/package/ttyd/ttyd.mk index d17e21d60b..d0e144b252 100644 --- a/package/ttyd/ttyd.mk +++ b/package/ttyd/ttyd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TTYD_VERSION = 1.7.3 +TTYD_VERSION = 1.7.4 TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) TTYD_LICENSE = MIT TTYD_LICENSE_FILES = LICENSE -- 2.25.1 From vineetg at rivosinc.com Wed Feb 14 22:43:55 2024 From: vineetg at rivosinc.com (Vineet Gupta) Date: Wed, 14 Feb 2024 14:43:55 -0800 Subject: [Buildroot] [PATCH] glibc: build: honor toplevel BR2_TARGET_OPTIMIZATION Message-ID: <20240214224355.551010-1-vineetg@rivosinc.com> glibc though part of toolchain is technically target binary and thus needs to be built with BR2_TARGET_OPTIMIZATION in case users want to force a certain build toogle from top level. Signed-off-by: Vineet Gupta --- package/glibc/glibc.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d198d6f04cb2..72031907c252 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -80,6 +80,9 @@ GLIBC_INSTALL_STAGING = YES GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install +# Seed with any special toggles user may have setup in config +GLIBC_EXTRA_CFLAGS = $(BR2_TARGET_OPTIMIZATION) + # Thumb build is broken, build in ARM mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) GLIBC_EXTRA_CFLAGS += -marm -- 2.34.1 From vineetg at rivosinc.com Wed Feb 14 23:01:14 2024 From: vineetg at rivosinc.com (Vineet Gupta) Date: Wed, 14 Feb 2024 15:01:14 -0800 Subject: [Buildroot] [PATCH v2] glibc: build: honor toplevel BR2_TARGET_OPTIMIZATION In-Reply-To: <20240214224355.551010-1-vineetg@rivosinc.com> References: <20240214224355.551010-1-vineetg@rivosinc.com> Message-ID: <20240214230114.551779-1-vineetg@rivosinc.com> glibc though part of toolchain is technically target binary and thus needs to be built with BR2_TARGET_OPTIMIZATION in case users want to force a certain build toogle from top level. Signed-off-by: Vineet Gupta --- Changes since v1: - Add to exisiting GLIBC_EXTRA_CFLAGS if any --- package/glibc/glibc.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d198d6f04cb2..ebcd7b2bdb21 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -80,6 +80,9 @@ GLIBC_INSTALL_STAGING = YES GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install +# Seed with any special toggles user may have setup in config +GLIBC_EXTRA_CFLAGS += $(BR2_TARGET_OPTIMIZATION) + # Thumb build is broken, build in ARM mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) GLIBC_EXTRA_CFLAGS += -marm -- 2.34.1 From kilian.zinnecker at mail.de Wed Feb 14 23:03:08 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Thu, 15 Feb 2024 00:03:08 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: References: <20240211120857.6622-1-kilian.zinnecker@mail.de> <20240211120857.6622-3-kilian.zinnecker@mail.de> Message-ID: <4868466.GXAFRqVoOG@laptop> Hello Giulio, all, [--SNIP--] > > a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > > b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > > new file mode 100644 > > index 0000000000..bcf5b965ce > > --- /dev/null > > +++ > > b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > > @@ -0,0 +1,30 @@ > > +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 > > +From: Kilian Zinnecker > > +Date: Mon, 21 Aug 2023 23:51:59 +0200 > > +Subject: [PATCH] Overwrite bootcmd by force > > + > > +This patch is a dirty hack: Trying to overwrite the bootcmd via the > > +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted > > +to some preset value and could not be changed easily. Therefore a > > +hook is used to force the bootcmd to be overwritten. > > This is strange because if so also the bootcmd content of uEnv.txt below > should be skipped, or maybe there is a bug in this u-boot that evaluates > bootcmd too early without taking into account environment variables. > But I'm also noticing that you have your Environment variables in Fat, > but it depends how u-boot deals with environment variables. Usually > you have to specificy an offset in memory where environment variables > live. > > But I see in your "make uboot-menuconfig" that CONFIG_ENV_IS_IN_FAT is > not enabled, but only CONFIG_ENV_IS_IN_MMC is and you have to specify: > CONFIG_ENV_OFFSET > CONFIG_ENV_SIZE > > So if you want to go with vfat way you need to enable > CONFIG_ENV_IS_IN_FAT and specify: > CONFIG_ENV_FAT_INTERFACE > CONFIG_ENV_FAT_DEVICE_AND_PART > and most of all: > CONFIG_ENV_FAT_FILE=uEnv.txt > in uboot.fragment below > > I would go with this last way instead of adding such dirty hack, can you > work on that? I tried, but so far I am not successful, maybe due to my lack of experience with uboot or maybe due to the customization of this particular uboot. I removed my custom-uboot patch and added the following configs to the uboot.fragment file, but it did not work yet: # CONFIG_ENV_IS_IN_MMC is not set CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" CONFIG_ENV_FAT_FILE="uEnv.txt" I also tried to use mainline uboot v2024.01, which features the Lichee Pi 4A, which features the same SoC, but this didn't work either. I had a look at the custom uboot source and it defines a lot of configs inside this header file: https://openbeagle.org/beaglev-ahead/beaglev-ahead-u-boot/-/blob/beaglev-v2020.01-1.1.2-ubuntu/include/configs/light-c910.h?ref_type=heads#L363-388 I tried to remove the hard-coded bootcmd from this header, but that also didn't work. I don't understand the inner workings of uboot well enough yet to get it properly working, so I appreciate all hints and any help here. However, I will already send a v4 of the patches, in which I try to address all the other issues. Thanks again for reviewing and best regards, Kilian From kilian.zinnecker at mail.de Wed Feb 14 23:30:25 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Thu, 15 Feb 2024 00:30:25 +0100 Subject: [Buildroot] [PATCH v4 0/3] Add board support for the BeagleV-Ahead Message-ID: <20240214233028.1226645-1-kilian.zinnecker@mail.de> This patch series adds board support for the BeagleV-Ahead. v3 -> v4: - Improved descriptions in commit messages - Patch to alphabetize own DEVELOPERS entry - Fix in package/xuantie-bins/Config.in: Spaces -> tabs - Github helper and removal of superfluous variables in xuantie-bins.mk - Added patch to disable CLOCK_ALLOW_WRITE_DEBUGFS in custom kernel v2 -> v3: - Added brief description what the xuantie bin binaries are for - Unrolled loop in XUANTIE_BINS_INSTALL_IMAGES_CMDS of package/xuantie-bins/xuantie-bins.mk - Added a second product page link to board's readme.txt - Added URL to the product page to git commit message - Dropped "_CUSTOM" from all "BR2_RISCV_ISA_*" in the board's defconfig - Add description to the board's readme.txt and defconfig why GCC v13 is chosen - Added BR2_PACKAGE_HOST_DOSFSTOOLS to board's defconfig v1 -> v2: - Added hash file for xuantie-bins package - Now uses uEnv.txt for actual boot commands - Removed extlinux.conf - Removed superflous comments inside config files Kilian Zinnecker (3): Fix alphabetical order of DEVELOPERS file entry package/xuantie-bins: new package configs/beaglev_ahead: new defconfig DEVELOPERS | 5 +- board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ board/beaglev-ahead/linux.fragment | 2 + ...01-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch | 30 +++++++ .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ board/beaglev-ahead/post-image.sh | 6 ++ board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ board/beaglev-ahead/uEnv.txt | 4 + board/beaglev-ahead/uboot.fragment | 2 + configs/beaglev_ahead_defconfig | 46 +++++++++++ package/Config.in | 1 + package/xuantie-bins/Config.in | 8 ++ package/xuantie-bins/xuantie-bins.hash | 2 + package/xuantie-bins/xuantie-bins.mk | 19 +++++ 14 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 board/beaglev-ahead/genimage.cfg create mode 100644 board/beaglev-ahead/linux.fragment create mode 100644 board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch create mode 100755 board/beaglev-ahead/post-image.sh create mode 100644 board/beaglev-ahead/readme.txt create mode 100644 board/beaglev-ahead/uEnv.txt create mode 100644 board/beaglev-ahead/uboot.fragment create mode 100644 configs/beaglev_ahead_defconfig create mode 100644 package/xuantie-bins/Config.in create mode 100644 package/xuantie-bins/xuantie-bins.hash create mode 100644 package/xuantie-bins/xuantie-bins.mk -- 2.34.1 From kilian.zinnecker at mail.de Wed Feb 14 23:30:26 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Thu, 15 Feb 2024 00:30:26 +0100 Subject: [Buildroot] [PATCH v4 1/3] Fix alphabetical order of DEVELOPERS file entry In-Reply-To: <20240214233028.1226645-1-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> Message-ID: <20240214233028.1226645-2-kilian.zinnecker@mail.de> Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..b75a92739a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1896,8 +1896,8 @@ F: package/libcamera/ N: Kilian Zinnecker F: board/avnet/rzboard_v2l/ F: board/radxa/rock5b/ -F: configs/rock5b_defconfig F: configs/avnet_rzboard_v2l_defconfig +F: configs/rock5b_defconfig F: package/rockchip-rkbin/ N: Klaus Heinrich Kiwi -- 2.34.1 From kilian.zinnecker at mail.de Wed Feb 14 23:30:27 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Thu, 15 Feb 2024 00:30:27 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/xuantie-bins: new package In-Reply-To: <20240214233028.1226645-1-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> Message-ID: <20240214233028.1226645-3-kilian.zinnecker@mail.de> This patch adds a package for Xuantie binary blobs. The binary blobs are needed for the BeagleV-Ahead's SoC (TH1520). They contain an FPGA binary for power management and a binary for the audio system. Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 1 + package/Config.in | 1 + package/xuantie-bins/Config.in | 8 ++++++++ package/xuantie-bins/xuantie-bins.hash | 2 ++ package/xuantie-bins/xuantie-bins.mk | 19 +++++++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/xuantie-bins/Config.in create mode 100644 package/xuantie-bins/xuantie-bins.hash create mode 100644 package/xuantie-bins/xuantie-bins.mk diff --git a/DEVELOPERS b/DEVELOPERS index b75a92739a..e9a9910d69 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1899,6 +1899,7 @@ F: board/radxa/rock5b/ F: configs/avnet_rzboard_v2l_defconfig F: configs/rock5b_defconfig F: package/rockchip-rkbin/ +F: package/xuantie-bins/ N: Klaus Heinrich Kiwi F: package/wqy-zenhei/ diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..b35cbc4038 100644 --- a/package/Config.in +++ b/package/Config.in @@ -656,6 +656,7 @@ endmenu source "package/wipe/Config.in" source "package/xorriso/Config.in" source "package/xr819-xradio/Config.in" + source "package/xuantie-bins/Config.in" endmenu menu "Interpreter languages and scripting" diff --git a/package/xuantie-bins/Config.in b/package/xuantie-bins/Config.in new file mode 100644 index 0000000000..18f5df1453 --- /dev/null +++ b/package/xuantie-bins/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_XUANTIE_BINS + bool "xuantie-bins" + depends on BR2_riscv + help + This package provides binary blobs, needed for the + BeagleV-Ahead's SoC (TH1520). They contain an FPGA binary + (light_aon_fpga.bin) for power management and a binary for + the audio system (light_c906_audio.bin). diff --git a/package/xuantie-bins/xuantie-bins.hash b/package/xuantie-bins/xuantie-bins.hash new file mode 100644 index 0000000000..5531a54617 --- /dev/null +++ b/package/xuantie-bins/xuantie-bins.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 92d2fee4688dc0598329d56cf7962f344d30b70e261a4cd9939b0912f06df26a xuantie-bins-1.2.1.tar.gz diff --git a/package/xuantie-bins/xuantie-bins.mk b/package/xuantie-bins/xuantie-bins.mk new file mode 100644 index 0000000000..bccfc9587d --- /dev/null +++ b/package/xuantie-bins/xuantie-bins.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# xuantie-bins +# +################################################################################ + +XUANTIE_BINS_VERSION = 1.2.1 +XUANTIE_BINS_SITE = $(call github,beagleboard,xuantie-ubuntu,beaglev-$(XUANTIE_BINS_VERSION)) +XUANTIE_BINS_LICENSE = PROPRIETARY + +XUANTIE_BINS_INSTALL_IMAGES = YES +XUANTIE_BINS_INSTALL_TARGET = NO + +define XUANTIE_BINS_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/bins/light_aon_fpga.bin + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/bins/light_c906_audio.bin +endef + +$(eval $(generic-package)) -- 2.34.1 From kilian.zinnecker at mail.de Wed Feb 14 23:30:28 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Thu, 15 Feb 2024 00:30:28 +0100 Subject: [Buildroot] [PATCH v4 3/3] configs/beaglev_ahead: new defconfig In-Reply-To: <20240214233028.1226645-1-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> Message-ID: <20240214233028.1226645-4-kilian.zinnecker@mail.de> This patch adds board support for the BeagleV-Ahead. It uses a custom kernel for the board's SoC. As the SoC has an outdated and currently not supported version of the RISC-V vector extension, the vector extension is disabled. The used OpenSBI version for this board support does not define the neccessary flags for GCC 12 to activate the zicsr and zifencei extensions. Therefore this board support uses GCC 13. The boot command for the custom uboot to boot the kernel could not easily be changed. It seemed that a default boot command was persisent and any change to it by normal means (e.g., uboot config parameters like CONFIG_BOOT_COMMAND) did not have any effect. Hence a patch for the custom u-boot is introduced for now, to insert the proper boot command. The custom kernel has CLOCK_ALLOW_WRITE_DEBUGFS enabled by default. Therefore, this boards supports features a patch, which disables this again, as this option can be dangerous, if activated. https://www.beagleboard.org/boards/beaglev-ahead Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 2 + board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ board/beaglev-ahead/linux.fragment | 2 + ...01-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch | 30 +++++++ .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ board/beaglev-ahead/post-image.sh | 6 ++ board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ board/beaglev-ahead/uEnv.txt | 4 + board/beaglev-ahead/uboot.fragment | 2 + configs/beaglev_ahead_defconfig | 46 +++++++++++ 10 files changed, 262 insertions(+) create mode 100644 board/beaglev-ahead/genimage.cfg create mode 100644 board/beaglev-ahead/linux.fragment create mode 100644 board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch create mode 100755 board/beaglev-ahead/post-image.sh create mode 100644 board/beaglev-ahead/readme.txt create mode 100644 board/beaglev-ahead/uEnv.txt create mode 100644 board/beaglev-ahead/uboot.fragment create mode 100644 configs/beaglev_ahead_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index e9a9910d69..adc6c09a7a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1895,8 +1895,10 @@ F: package/libcamera/ N: Kilian Zinnecker F: board/avnet/rzboard_v2l/ +F: board/beaglev-ahead/ F: board/radxa/rock5b/ F: configs/avnet_rzboard_v2l_defconfig +F: configs/beaglev_ahead_defconfig F: configs/rock5b_defconfig F: package/rockchip-rkbin/ F: package/xuantie-bins/ diff --git a/board/beaglev-ahead/genimage.cfg b/board/beaglev-ahead/genimage.cfg new file mode 100644 index 0000000000..080b169527 --- /dev/null +++ b/board/beaglev-ahead/genimage.cfg @@ -0,0 +1,62 @@ +# SD card image for BeagleV-Ahead + +image boot.vfat { + vfat { + files = { + "fw_dynamic.bin", + "Image", + "light_aon_fpga.bin", + "light-beagle.dtb", + "light_c906_audio.bin", + } + + file uEnv.txt { + image = "uEnv.txt" + } + + file overlays/BBORG_LOAD-00A2.dtbo { + image = "overlays/BBORG_LOAD-00A2.dtbo" + } + + file overlays/BBORG_RELAY-00A2.dtbo { + image = "overlays/BBORG_RELAY-00A2.dtbo" + } + + file overlays/BONE-LED_P8_03.dtbo { + image = "overlays/BONE-LED_P8_03.dtbo" + } + + file overlays/BONE-LED_P9_11.dtbo { + image = "overlays/BONE-LED_P9_11.dtbo" + } + + file overlays/BVA-MIKROBUS-0.dtbo { + image = "overlays/BVA-MIKROBUS-0.dtbo" + } + } + size = 48M +} + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 2M + } + + partition uboot { + in-partition-table = "false" + image = "u-boot-with-spl.bin" + offset = 0 + holes = {"(440; 1048576)"} + } + + partition boot { + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + image = "rootfs.ext2" + } +} + diff --git a/board/beaglev-ahead/linux.fragment b/board/beaglev-ahead/linux.fragment new file mode 100644 index 0000000000..00f93f39a4 --- /dev/null +++ b/board/beaglev-ahead/linux.fragment @@ -0,0 +1,2 @@ +# CONFIG_VECTOR is not set +# CONFIG_VECTOR_0_7 is not set diff --git a/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch b/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch new file mode 100644 index 0000000000..0487e43101 --- /dev/null +++ b/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch @@ -0,0 +1,30 @@ +From c82d614da43c3c2f7cdc7580c9ee24bd2ce203cd Mon Sep 17 00:00:00 2001 +From: Kilian Zinnecker +Date: Wed, 14 Feb 2024 20:54:37 +0100 +Subject: [PATCH] Disable CLOCK_ALLOW_WRITE_DEBUGFS + +CLOCK_ALLOW_WRITE_DEBUGFS is disabled as default, as it can be +very dangerous, see: + +https://lkml.org/lkml/2022/1/24/3382 + +Signed-off-by: Kilian Zinnecker +--- + drivers/clk/clk.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c +index 77774a8c701b..a6ba04ce0237 100644 +--- a/drivers/clk/clk.c ++++ b/drivers/clk/clk.c +@@ -3131,7 +3131,6 @@ static int clk_dump_show(struct seq_file *s, void *data) + } + DEFINE_SHOW_ATTRIBUTE(clk_dump); + +-#define CLOCK_ALLOW_WRITE_DEBUGFS + #ifdef CLOCK_ALLOW_WRITE_DEBUGFS + /* + * This can be dangerous, therefore don't provide any real compile time +-- +2.34.1 + diff --git a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch new file mode 100644 index 0000000000..bcf5b965ce --- /dev/null +++ b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch @@ -0,0 +1,30 @@ +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 +From: Kilian Zinnecker +Date: Mon, 21 Aug 2023 23:51:59 +0200 +Subject: [PATCH] Overwrite bootcmd by force + +This patch is a dirty hack: Trying to overwrite the bootcmd via the +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted +to some preset value and could not be changed easily. Therefore a +hook is used to force the bootcmd to be overwritten. + +Signed-off-by: Kilian Zinnecker +--- + board/thead/light-c910/light.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c +index 8d5478e916..1448db974e 100644 +--- a/board/thead/light-c910/light.c ++++ b/board/thead/light-c910/light.c +@@ -2282,6 +2282,7 @@ int board_late_init(void) + light_usb_boot_check(); + do_firmware_load(); + ap_peri_clk_disable(); ++ run_command("load mmc 1:1 $ramdisk_addr_r uEnv.txt; env import -t $ramdisk_addr_r $filesize; run uenvcmd", 0); + return 0; + } + +-- +2.34.1 + diff --git a/board/beaglev-ahead/post-image.sh b/board/beaglev-ahead/post-image.sh new file mode 100755 index 0000000000..9e16eeff3f --- /dev/null +++ b/board/beaglev-ahead/post-image.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -e + +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ ${BINARIES_DIR} +cp board/beaglev-ahead/uEnv.txt ${BINARIES_DIR}/ +support/scripts/genimage.sh -c board/beaglev-ahead/genimage.cfg diff --git a/board/beaglev-ahead/readme.txt b/board/beaglev-ahead/readme.txt new file mode 100644 index 0000000000..758082a792 --- /dev/null +++ b/board/beaglev-ahead/readme.txt @@ -0,0 +1,78 @@ +BeagleV-Ahead +============== +https://www.beagleboard.org/boards/beaglev-ahead +https://forum.beagleboard.org/c/beaglev/ + +The SoC (TH1520) of the BeagleV-Ahead implements an outdated and +currently not supported version of the RISC-V vector extension. Hence, +the vector extension is disabled. The used OpenSBI version for this +board support does not define the neccessary flags for GCC 12 to +activate the zicsr and zifencei extensions. Therefore this board +support uses GCC 13. + +Build: +====== + $ make beaglev_ahead_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +??? boot.vfat +??? bootloader-JH7100-buildroot.bin.out +??? ddrinit-2133-buildroot.bin.out +??? fw_dynamic.bin +??? fw_dynamic.elf +??? fw_jump.bin +??? fw_jump.elf +??? fw_payload.bin +??? fw_payload.elf +??? Image +??? light-beagle.dtb +??? light_aon_fpga.bin +??? light_c906_audio.bin +??? overlays +??? rootfs.ext2 +??? rootfs.ext4 +??? rootfs.tar +??? sdcard.img +??? u-boot-with-spl.bin +??? u-boot.bin +??? uEnv.txt + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +SD card boot button: +-------------------- +To let the board boot from SD card, keep the "SD button" pressed during power +up / power cycle. The button is near the SD card slot. + +Serial console: +--------------- +The BeagleV-Ahead has a "Debug" GPIO header. Its layout can be seen here: +https://docs.beagleboard.org/latest/boards/beaglev/ahead/02-quick-start.html#access-uart-debug-console + +Note, that there are reported issues with some uart interface cables/dongles: +https://forum.beagleboard.org/t/beaglev-ahead-debug-terminal-problems/35331 + +Baudrate for this board is 115200. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +wiki link: +---------- +https://docs.beagleboard.org/latest/boards/beaglev/ahead/index.html diff --git a/board/beaglev-ahead/uEnv.txt b/board/beaglev-ahead/uEnv.txt new file mode 100644 index 0000000000..7e98ae5f81 --- /dev/null +++ b/board/beaglev-ahead/uEnv.txt @@ -0,0 +1,4 @@ +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} +uenvcmd=fatload mmc 1:1 ${kernel_addr_r} Image; fatload mmc 1:1 ${fdt_addr_r} light-beagle.dtb +bootargs=root=/dev/mmcblk1p2 rootfstype=ext4 rootwait ro console=ttyS0,115200 earlycon clk_ignore_unused net.ifnames=0 + diff --git a/board/beaglev-ahead/uboot.fragment b/board/beaglev-ahead/uboot.fragment new file mode 100644 index 0000000000..1f51cef106 --- /dev/null +++ b/board/beaglev-ahead/uboot.fragment @@ -0,0 +1,2 @@ +CONFIG_LEGACY_IMAGE_FORMAT=y +CONFIG_AUTOBOOT=y diff --git a/configs/beaglev_ahead_defconfig b/configs/beaglev_ahead_defconfig new file mode 100644 index 0000000000..9000b1f0ad --- /dev/null +++ b/configs/beaglev_ahead_defconfig @@ -0,0 +1,46 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_RVM=y +BR2_RISCV_ISA_RVA=y +BR2_RISCV_ISA_RVF=y +BR2_RISCV_ISA_RVD=y +BR2_RISCV_ISA_RVC=y +# Use GCC 13 for OpenSBI zicsr zifencei issue +BR2_GCC_VERSION_13_X=y +BR2_GLOBAL_PATCH_DIR="board/beaglev-ahead/patches" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglev-ahead/post-image.sh" +BR2_TARGET_GENERIC_HOSTNAME="BeagleV-Ahead" +BR2_TARGET_GENERIC_ISSUE="Welcome to the BeagleV-Ahead" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/linux/archive/refs/heads/beaglev-v5.10.113-1.1.2-ubuntu.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="beaglev" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/light-beagle" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/linux.fragment" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_BEAGLEV_DDRINIT=y +BR2_TARGET_BEAGLEV_SECONDBOOT=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-opensbi/archive/refs/heads/0.9-1.1.2-ubuntu.tar.gz" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-u-boot/archive/refs/heads/beaglev-v2020.01-1.1.2-ubuntu.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="light_beagle" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragment" +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_XUANTIE_BINS=y -- 2.34.1 From kadambini.nema at gmail.com Thu Feb 15 01:32:22 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Wed, 14 Feb 2024 17:32:22 -0800 Subject: [Buildroot] [PATCH 1/1] package/{tzdata, zic}: bump version to 2024a Message-ID: <20240215013222.2312466-1-kadambini.nema@gmail.com> Release notes - https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html Signed-off-by: Kadambini Nema --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 5488625ddd..d353bc4410 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html -sha512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 tzdata2023c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html +sha512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 tzdata2024a.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 33e296d7d7..e367205277 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2023c +TZDATA_VERSION = 2024a TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_SELINUX_MODULES = tzdata diff --git a/package/zic/zic.hash b/package/zic/zic.hash index a2720a27ba..80c96ed793 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html -sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html +sha512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c tzcode2024a.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index a915f6d256..95fa1eaa96 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2023c +ZIC_VERSION = 2024a ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 -- 2.25.1 From asd617140123 at gmail.com Thu Feb 15 05:57:29 2024 From: asd617140123 at gmail.com (eric) Date: Thu, 15 Feb 2024 13:57:29 +0800 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. In-Reply-To: <0e623797-b573-4604-b89e-737c7c503350@benettiengineering.com> References: <20240207030339.3910-1-asd617140123@gmail.com> <0e623797-b573-4604-b89e-737c7c503350@benettiengineering.com> Message-ID: Hi Giulio, > > Here you have to keep the previous tags when sending new version of > patches: I didn't get it, what is the previous tags? > > Reviewed-by: Giulio Benetti > [Build Tested] > Tested-by: Giulio Benetti > > > --- > > v1 -> v2 > > * Add BR2_cortex_a15_a7=y in buildroot defconfig. > > * Bump linux version to 6.6.8 > > * Using sunxi_defconfig in kernel. > > * Using "make savedefconfig" to save defconfig. > > * Remove boot.cmd. > > this patch had to be V3, but don't mind at this point. > I ask you when you send newer patches to set as superseded > the previous patch in patchwork: > https://patchwork.ozlabs.org/project/buildroot/list/ > > I just need to add v3 tag, right? or I need to add other tags, e.g., resend? > > --- > > DEVELOPERS | 4 +++ > > board/cubietech/cubieboard4/extlinux.conf | 5 +++ > > board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ > > board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ > > configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ > > 5 files changed, 104 insertions(+) > > create mode 100644 board/cubietech/cubieboard4/extlinux.conf > > create mode 100644 board/cubietech/cubieboard4/genimage.cfg > > create mode 100755 board/cubietech/cubieboard4/post-image.sh > > create mode 100644 configs/cubieboard4_defconfig > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index a03018ab2b..bffb8f2069 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -3297,3 +3297,7 @@ F: package/quazip/ > > F: package/shapelib/ > > F: package/simple-mail/ > > F: package/tinc/ > > + > > +N: Nigel Wang > > +F: board/cubietech/cubieboard4/ > > +F: configs/cubieboard4_defconfig > > diff --git a/board/cubietech/cubieboard4/extlinux.conf > b/board/cubietech/cubieboard4/extlinux.conf > > new file mode 100644 > > index 0000000000..5084e2237b > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/extlinux.conf > > @@ -0,0 +1,5 @@ > > +label linux > > + kernel /boot/zImage > > + devicetree /sun9i-a80-cubieboard4.dtb > > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > > + > > diff --git a/board/cubietech/cubieboard4/genimage.cfg > b/board/cubietech/cubieboard4/genimage.cfg > > new file mode 100644 > > index 0000000000..f1dee13923 > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/genimage.cfg > > @@ -0,0 +1,38 @@ > > +# Minimal SD card image for the Cubieboard2 > > +# Based in the Orange Pi genimage.cfg > > + > > +image boot.vfat { > > + vfat { > > + files = { > > + "zImage", > > + "sun9i-a80-cubieboard4.dtb", > > + "extlinux" > > + } > > + } > > + > > + size = 8M > > +} > > + > > +image sdcard.img { > > + hdimage { > > + } > > + > > + partition u-boot { > > + in-partition-table = "no" > > + image = "u-boot-sunxi-with-spl.bin" > > + offset = 8K > > + size = 1016K # 1MB - 8KB > > + } > > + > > + partition boot { > > + partition-type = 0xC > > + bootable = "true" > > + image = "boot.vfat" > > + } > > + > > + partition rootfs { > > + partition-type = 0x83 > > + image = "rootfs.ext4" > > + size = 512M > > + } > > +} > > diff --git a/board/cubietech/cubieboard4/post-image.sh > b/board/cubietech/cubieboard4/post-image.sh > > new file mode 100755 > > index 0000000000..e37b960a4d > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/post-image.sh > > @@ -0,0 +1,18 @@ > > +#!/bin/sh > > + > > +BOARD_DIR="$(dirname "$0")" > > +install -m 0644 -D $BOARD_DIR/extlinux.conf > $BINARIES_DIR/extlinux/extlinux.conf > > + > > +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > > + > > +rm -rf "${GENIMAGE_TMP}" > > + > > +genimage \ > > + --rootpath "${TARGET_DIR}" \ > > + --tmppath "${GENIMAGE_TMP}" \ > > + --inputpath "${BINARIES_DIR}" \ > > + --outputpath "${BINARIES_DIR}" \ > > + --config "${GENIMAGE_CFG}" > > + > > +exit $? > > diff --git a/configs/cubieboard4_defconfig > b/configs/cubieboard4_defconfig > > new file mode 100644 > > index 0000000000..0592fe4a2d > > --- /dev/null > > +++ b/configs/cubieboard4_defconfig > > @@ -0,0 +1,39 @@ > > +# Architecture > > +BR2_arm=y > > +BR2_cortex_a15_a7=y > > +BR2_ARM_FPU_NEON_VFPV4=y > > + > > +# System > > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" > > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" > > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" > > Here the option below is missing and it's needed otherwise the newest > Linux version will be picked and build will fail. > Now we don't see the problem because the latest version is exactly 6.6, > so need this: > > # Linux headers same as kernel, a 6.6 series > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > > > +# Kernel > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" > > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" > > + > > +# Filesystem > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > + > > +# Bootloader > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > +BR2_TARGET_UBOOT_SPL=y > > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > -- > > 2.34.1 > > > > This patch looks to me, except missing Linux header version. > > I've added that option and re-built successfully so I confirm my: > Reviewed-by: Giulio Benetti > [Build Tested] > Tested-by: Giulio Benetti > > Maybe a Maintainer can edit while committing, of if you can please send > a V3 with that missing line. > > Thank you! > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > -------------- next part -------------- An HTML attachment was scrubbed... URL: From kadambini.nema at gmail.com Thu Feb 15 06:08:14 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Wed, 14 Feb 2024 22:08:14 -0800 Subject: [Buildroot] [PATCH 1/1] package/bash: bump to version 5.2.21 Message-ID: <20240215060814.2618098-1-kadambini.nema@gmail.com> Build tested using the following config option: BR2_PACKAGE_BASH=y $ ./utils/test-pkg -c bash.config -p bash bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/bash/bash.hash | 4 ++-- package/bash/bash.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bash/bash.hash b/package/bash/bash.hash index e0a1ebac91..44c1c5ed50 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz.sig -sha256 13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c bash-5.2.15.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.2.21.tar.gz.sig +sha256 c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 bash-5.2.21.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 9a73ed8c36..9d173a5c7c 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.2.15 +BASH_VERSION = 5.2.21 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ -- 2.25.1 From kadambini.nema at gmail.com Thu Feb 15 07:00:11 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Wed, 14 Feb 2024 23:00:11 -0800 Subject: [Buildroot] [PATCH 1/1] package/iperf3: bump to version 3.16 Message-ID: <20240215070011.2668708-1-kadambini.nema@gmail.com> Release notes - https://github.com/esnet/iperf/releases/tag/3.16 Signed-off-by: Kadambini Nema --- package/iperf3/iperf3.hash | 4 ++-- package/iperf3/iperf3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 02ada0dcc6..a8634c4a7e 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.14.tar.gz.sha256 -sha256 723fcc430a027bc6952628fa2a3ac77584a1d0bd328275e573fc9b206c155004 iperf-3.14.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.16.tar.gz.sha256 +sha256 cc740c6bbea104398cc3e466befc515a25896ec85e44a662d5f4a767b9cf713e iperf-3.16.tar.gz # Locally computed sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index c00b16ce61..6d902c3b13 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.14 +IPERF3_VERSION = 3.16 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT -- 2.25.1 From david.picard at clermont.in2p3.fr Thu Feb 15 07:40:40 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Thu, 15 Feb 2024 08:40:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: Message-ID: <9e2b411e-276d-4e71-9e30-0f10b6ff79c5@clermont.in2p3.fr> Hi, I screwed up with the mailing list and posted the same patch 5 times. You can take any of them and discard the others. Sorry for the confusion... David Le 14/02/2024 ? 17:23, Romain Naour a ?crit?: > Hello David, > > Le 14/02/2024 ? 10:34, David Picard a ?crit?: >> Add a package for the Intel/Altera SoC FPGA hardware library. It is >> used to let the HPS and the FPGA fabric communicate with each other. > We received 4 thime the same patch on the mailing list: > > http://patchwork.ozlabs.org/project/buildroot/patch/20240214081921.4663-1-david.picard at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/2770b2ac-4cec-4d56-81e9-89dfd33f786a at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/abcd4153-41e2-45ce-a89a-e198e86ba337 at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/c90e4512-405c-40fb-b597-1a04d7449afa at clermont.in2p3.fr/ > > Which one should we review? > > Please, send patch using git send-email tool. > > (https://nightly.buildroot.org/manual.html#submitting-patches) > > Also, when you resend a patch, add the changelog info. > > https://nightly.buildroot.org/manual.html#_patch_revision_changelog > > >> Signed-off-by: David Picard >> --- >> package/Config.in | 1 + >> package/intel-socfpga-hwlib/Config.in | 12 ++++++ >> .../intel-socfpga-hwlib.hash | 2 + >> .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ >> 4 files changed, 54 insertions(+) >> create mode 100644 package/intel-socfpga-hwlib/Config.in >> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index bf0fe078b9..cd6c6bcaba 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -1736,6 +1736,7 @@ menu "Hardware handling" >> source "package/gnu-efi/Config.in" >> source "package/hackrf/Config.in" >> source "package/hidapi/Config.in" >> + source "package/intel-socfpga-hwlib/Config.in" >> source "package/jitterentropy-library/Config.in" >> source "package/lcdapi/Config.in" >> source "package/let-me-create/Config.in" >> diff --git a/package/intel-socfpga-hwlib/Config.in >> b/package/intel-socfpga-hwlib/Config.in >> new file mode 100644 >> index 0000000000..ced6483a59 >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/Config.in >> @@ -0,0 +1,12 @@ >> +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB >> + bool "intel-socfpga-hwlib" >> + depends on BR2_arm >> + help >> + This package provides the Intel SoC FPGA HWLIB for >> + Intel/Altera SoC FPGA chips. >> + This library allows to communicate with the FPGA fabric from >> + Linux, running on the HPS device. >> + The source code is not compiled. Instead, a symlink is added >> + to $(STAGING_DIR)/lib. >> + >> + https://github.com/altera-opensource/intel-socfpga-hwlib > Check the coding style with ./utils/check-package > >> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> new file mode 100644 >> index 0000000000..60efe9013e >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> @@ -0,0 +1,2 @@ >> +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 >> intel-socfpga-hwlib-23.12.02.tar.gz >> +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 >> License.txt >> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> new file mode 100644 >> index 0000000000..bf18c23560 >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> @@ -0,0 +1,39 @@ >> +################################################################################ >> +# >> +# intel-socfpga-hwlib >> +# >> +################################################################################ >> + >> +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 >> +INTEL_SOCFPGA_HWLIB_SITE = $(call >> github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) >> +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY > It's unexpected to find a PROPRIETARY tool in a gitbub accound with "opensource" > in their name :) > >> +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt > It look like a BSD-3-Clause license > > https://spdx.org/licenses/BSD-3-Clause.html > >> +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES >> +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES >> + >> +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS >> + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) >> $(STAGING_DIR)/lib/intel-socfpga-hwlib >> +endef > I don't think this is what you want to do. > >> + >> +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS >> +# mkdir -p $(BINARIES_DIR)/intel-ucode >> +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ >> +# $(@D)/intel-ucode/* >> +# endef >> +# >> +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) >> +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS >> +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode >> +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ >> +# $(@D)/intel-ucode/* >> +# endef >> +# else >> +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO >> +# endif >> + >> +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS >> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) >> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) >> +# endef > Please, don't add commended code. > > Best regards, > Romain > > >> + >> +$(eval $(generic-package)) >> From arnout at mind.be Thu Feb 15 07:53:33 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 15 Feb 2024 08:53:33 +0100 Subject: [Buildroot] [PATCH v2] glibc: build: honor toplevel BR2_TARGET_OPTIMIZATION In-Reply-To: <20240214230114.551779-1-vineetg@rivosinc.com> References: <20240214224355.551010-1-vineetg@rivosinc.com> <20240214230114.551779-1-vineetg@rivosinc.com> Message-ID: <2111ebed-d6b8-46d1-b109-9cd468be5ca0@mind.be> On 15/02/2024 00:01, Vineet Gupta wrote: > glibc though part of toolchain is technically target binary and thus > needs to be built with BR2_TARGET_OPTIMIZATION in case users want to > force a certain build toogle from top level. BR2_TARGET_OPTIMIZATION is encoded in the toolchain wrapper, and as far as I can see glibc is built with the toolchain wrapper... I haven't (re)tested it, but it should be the case... BR2_TARGET_OPTIMIZATION was added to the wrapper in commit b95e436ee0c9e4638dc79766da0d17927c6641ce in 2011. The wrapper was added to host-gcc-initial (which is used in the glibc build) in commit 919c06c28295f19ca49459b98d8954148b381360 in 2015. Regards, Arnout > > Signed-off-by: Vineet Gupta > --- > Changes since v1: > - Add to exisiting GLIBC_EXTRA_CFLAGS if any > --- > package/glibc/glibc.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index d198d6f04cb2..ebcd7b2bdb21 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -80,6 +80,9 @@ GLIBC_INSTALL_STAGING = YES > > GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install > > +# Seed with any special toggles user may have setup in config > +GLIBC_EXTRA_CFLAGS += $(BR2_TARGET_OPTIMIZATION) > + > # Thumb build is broken, build in ARM mode > ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > GLIBC_EXTRA_CFLAGS += -marm From alexander.sverdlin at gmail.com Thu Feb 15 10:13:21 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 11:13:21 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: > > This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > > > > This series start by adding U-boot binman support already submitted in the > > preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > > [1], with small improvements. > > See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > > > > With binman support, we can add the TI K3 j721e SoC support by > > providing all required firmware generated by the build. > > > > Add the new ti_j721e_sk_defconfig file to build a basic SD card image to > > boot the board (serial debug and ethernet working). > > > > Thanks to binman support, we can remove the ti-k3-image-gen tool from > > Buildroot. To do that, we have to update existing defconfig (am62, am64). > > > > Followup commits can improve TI K3 HS-FS devices based on binman instead > > of legacy core-secdev-k3 tool. > > > > [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html > > [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > > > > Best regards, > > Romain I have mixed feelings after testing the patchset on SK-AM62B... It doesn't quite boot, refer to the boot log [1]. Seems that U-Boot env is missing, maybe I'm missing some installation step, but I do not see it mentioned in the documetation (for instance of original commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig"). I'm not sure if this is a result of U-Boot update or if the current master is broken as well. I'll be retesting it today and will get back to you. Fortunately this patchset is actually about building the images differently and this part actually went smoothly, which is good. > > Dario Binacchi (5): > > ? package/python-attrs: add host variant > > ? package/python-rpds-py: add host variant > > ? package/python-referencing: add host variant > > ? package/python-jsonschema-specifications: add host variant > > ? package/python-jsonschema: add host variant > > > > Romain Naour (16): > > ? DEVELOPERS: add Romain Naour for am574x_idk_defconfig > > ? configs/ti_am62x_sk_defconfig: fix optee-os plateform > > ? configs/ti_am64x_sk_defconfig: fix optee-os plateform > > ? boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > > ? boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > ? boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to > > ??? BINARIES_DIR > > ? boot/ti-k3-boot-firmware: introduce > > ??? BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} > > ? boot/uboot: use DM firmware name defined by ti-k3-boot-firmware > > ??? package > > ? boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > > ? boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options > > ? boot/uboot: enable TI K3 Device Manager (DM) for j721e > > ? boot/ti-k3-boot-firmware: bump to version 09.02.00.004 > > ? configs/ti_j721e_sk_defconfig: new defconfig > > ? configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman > > ??? tool > > ? configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman > > ??? tool > > ? boot/ti-k3-image-gen: remove package > > > > ?Config.in.legacy????????????????????????????? |? 7 ++ > > ?DEVELOPERS??????????????????????????????????? |? 6 +- > > ?board/ti/j721e-sk/genimage.cfg??????????????? | 28 +++++++ > > ?board/ti/j721e-sk/post-build.sh?????????????? | 16 ++++ > > ?board/ti/j721e-sk/readme.txt????????????????? | 34 ++++++++ > > ?boot/Config.in??????????????????????????????? |? 1 - > > ?boot/ti-k3-boot-firmware/Config.in??????????? | 39 ++++++++++ > > ?.../ti-k3-boot-firmware.hash????????????????? |? 2 +- > > ?.../ti-k3-boot-firmware.mk??????????????????? | 16 ++-- > > ?boot/ti-k3-image-gen/Config.in??????????????? | 77 ------------------- > > ?boot/ti-k3-image-gen/ti-k3-image-gen.hash???? |? 3 - > > ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?????? | 54 ------------- > > ?boot/ti-k3-r5-loader/Config.in??????????????? |? 8 ++ > > ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk?????? | 23 ++++++ > > ?boot/uboot/Config.in????????????????????????? | 27 ++++--- > > ?boot/uboot/uboot.mk?????????????????????????? | 10 ++- > > ?configs/ti_am62x_sk_defconfig???????????????? | 14 ++-- > > ?configs/ti_am64x_sk_defconfig???????????????? | 14 ++-- > > ?...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- > > ?package/python-attrs/python-attrs.mk????????? |? 6 ++ > > ?.../python-jsonschema-specifications.mk?????? | 10 +++ > > ?.../python-jsonschema/python-jsonschema.mk??? | 14 ++++ > > ?.../python-referencing/python-referencing.mk? | 11 +++ > > ?package/python-rpds-py/python-rpds-py.mk????? |? 1 + > > ?24 files changed, 275 insertions(+), 180 deletions(-) > > ?create mode 100644 board/ti/j721e-sk/genimage.cfg > > ?create mode 100755 board/ti/j721e-sk/post-build.sh > > ?create mode 100644 board/ti/j721e-sk/readme.txt > > ?delete mode 100644 boot/ti-k3-image-gen/Config.in > > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk > > ?copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) > > > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot 1. Boot log: U-Boot SPL 2024.01 (Feb 15 2024 - 01:42:12 +0100) SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') SPL initial stack usage: 13400 bytes Trying to boot from MMC2 Authentication passed Authentication passed Authentication passed Authentication passed Authentication passed Starting ATF on ARM64 core... NOTICE: BL31: v2.10.0 (release):v2.10 NOTICE: BL31: Built : 01:28:38, Feb 15 2024 I/TC: I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1198-g18ff6d2643)) #1 Thu Feb 15 00:28:27 UTC 2024 aarch64 I/TC: WARNING: This OP-TEE configuration might be insecure! I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html I/TC: Primary CPU initializing I/TC: SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') I/TC: HUK Initialized I/TC: Activated SA2UL device I/TC: Enabled firewalls for SA2UL TRNG device I/TC: SA2UL TRNG initialized I/TC: SA2UL Drivers initialized I/TC: Primary CPU switching to normal world boot U-Boot SPL 2024.01 (Feb 15 2024 - 01:43:17 +0100) SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') SPL initial stack usage: 1872 bytes Trying to boot from MMC2 Authentication passed Authentication passed U-Boot 2024.01 (Feb 15 2024 - 01:43:17 +0100) SoC: AM62X SR1.0 HS-FS Model: Texas Instruments AM625 SK DRAM: 2 GiB Core: 56 devices, 23 uclasses, devicetree: separate MMC: mmc at fa10000: 0, mmc at fa00000: 1 Loading Environment from nowhere... OK In: serial at 2800000 Out: serial at 2800000 Err: serial at 2800000 Net: eth0: ethernet at 8000000port@1 Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc1 is current device SD/MMC found on device 1 Failed to load 'uEnv.txt' Scanning for bootflows in all bootdevs Seq Method State Uclass Part Name Filename --- ----------- ------ -------- ---- ------------------------ ---------------- Scanning global bootmeth 'efi_mgr': No EFI system partition No EFI system partition Failed to persist EFI variables Scanning bootdev 'mmc at fa00000.bootdev': Scanning bootdev 'mmc at fa10000.bootdev': Unknown uclass 'usb' in label link up on port 1, speed 100, full duplex BOOTP broadcast 1 BOOTP broadcast 2 BOOTP broadcast 3 BOOTP broadcast 4 BOOTP broadcast 5 BOOTP broadcast 6 BOOTP broadcast 7 BOOTP broadcast 8 BOOTP broadcast 9 BOOTP broadcast 10 BOOTP broadcast 11 BOOTP broadcast 12 BOOTP broadcast 13 BOOTP broadcast 14 BOOTP broadcast 15 BOOTP broadcast 16 BOOTP broadcast 17 Retry time exceeded; starting again -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Thu Feb 15 10:20:50 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 11:20:50 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240213172817.2872849-22-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> Message-ID: <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > -choice > - prompt "Security type" > - help > - ? The target SoC security type option for image gen.? Valid > - ? options are "gp" for General Purpose devices, "hs-fs" for > - ? High Security - Field Securable devices, or "hs" for High > - ? Security - Security Enforcing devices.? Note for all High > - ? Security device variants the TI_SECURE_DEV_PKG environmental > - ? variable must be defined at build time pointing to a valid > - ? core-secdev-k3 folder location, otherwise the build will > - ? fail, see > - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - bool "gp" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - bool "hs-fs" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > - bool "hs" > - > -endchoice another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y was the default, which didn't boot on my HS-FS SoC. You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the default for AM62x. I'm not sure if this is a problem, though. -- Alexander Sverdlin. From romain.naour at smile.fr Thu Feb 15 11:23:21 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 15 Feb 2024 12:23:21 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> Message-ID: <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> Hi Alexander, Le 15/02/2024 ? 11:13, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: >>> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. >>> >>> This series start by adding U-boot binman support already submitted in the >>> preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi >>> [1], with small improvements. >>> See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] >>> >>> With binman support, we can add the TI K3 j721e SoC support by >>> providing all required firmware generated by the build. >>> >>> Add the new ti_j721e_sk_defconfig file to build a basic SD card image to >>> boot the board (serial debug and ethernet working). >>> >>> Thanks to binman support, we can remove the ti-k3-image-gen tool from >>> Buildroot. To do that, we have to update existing defconfig (am62, am64). >>> >>> Followup commits can improve TI K3 HS-FS devices based on binman instead >>> of legacy core-secdev-k3 tool. >>> >>> [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html >>> [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf >>> >>> Best regards, >>> Romain > > I have mixed feelings after testing the patchset on SK-AM62B... > It doesn't quite boot, refer to the boot log [1]. > Seems that U-Boot env is missing, maybe I'm missing some installation > step, but I do not see it mentioned in the documetation (for instance > of original commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig"). > > I'm not sure if this is a result of U-Boot update or if the current > master is broken as well. I'll be retesting it today and will get back to > you. It seems you are testing on a HS-FS device "AM62X SR1.0 HS-FS" while I only runtime tested this series on a SK-TDA4VM (GP: general pupose). Also the ti_am62x_sk_defconfig is expecting a GP SoC so you may have to customize the image generated in a post-build script? Maybe you have to replace the tiboot3.bin binary included by genimage with the one for the HS-FS variant ? for j721e: 285449 13 f?vr. 17:27 tiboot3.bin 285449 13 f?vr. 17:27 tiboot3-j721e-gp-evm.bin 286224 13 f?vr. 17:27 tiboot3-j721e_sr1_1-hs-evm.bin 286224 13 f?vr. 17:27 tiboot3-j721e_sr2-hs-fs-evm.bin for am62x: tiboot3.bin << should be the gp variant by default tiboot3-am62x-gp-evm.bin tiboot3-am62x-hs-fs-evm.bin Also, did you have the ti-k3-core-secdev package locally, it seems it's required for HS-FS SoC but the package is currently missing: http://lists.busybox.net/pipermail/buildroot/2024-February/685383.html Is ti-k3-core-secdev really required fllowing the switch to binman? (binman should sign all firmware binaries itself). > > Fortunately this patchset is actually about building the images differently > and this part actually went smoothly, which is good. Thank you for testing, it help a lot! Maybe something is missing in this series to handle HS-FS device properly. > >>> Dario Binacchi (5): >>> ? package/python-attrs: add host variant >>> ? package/python-rpds-py: add host variant >>> ? package/python-referencing: add host variant >>> ? package/python-jsonschema-specifications: add host variant >>> ? package/python-jsonschema: add host variant >>> >>> Romain Naour (16): >>> ? DEVELOPERS: add Romain Naour for am574x_idk_defconfig >>> ? configs/ti_am62x_sk_defconfig: fix optee-os plateform >>> ? configs/ti_am64x_sk_defconfig: fix optee-os plateform >>> ? boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option >>> ? boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >>> ? boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to >>> ??? BINARIES_DIR >>> ? boot/ti-k3-boot-firmware: introduce >>> ??? BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} >>> ? boot/uboot: use DM firmware name defined by ti-k3-boot-firmware >>> ??? package >>> ? boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E >>> ? boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options >>> ? boot/uboot: enable TI K3 Device Manager (DM) for j721e >>> ? boot/ti-k3-boot-firmware: bump to version 09.02.00.004 >>> ? configs/ti_j721e_sk_defconfig: new defconfig >>> ? configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman >>> ??? tool >>> ? configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman >>> ??? tool >>> ? boot/ti-k3-image-gen: remove package >>> >>> ?Config.in.legacy????????????????????????????? |? 7 ++ >>> ?DEVELOPERS??????????????????????????????????? |? 6 +- >>> ?board/ti/j721e-sk/genimage.cfg??????????????? | 28 +++++++ >>> ?board/ti/j721e-sk/post-build.sh?????????????? | 16 ++++ >>> ?board/ti/j721e-sk/readme.txt????????????????? | 34 ++++++++ >>> ?boot/Config.in??????????????????????????????? |? 1 - >>> ?boot/ti-k3-boot-firmware/Config.in??????????? | 39 ++++++++++ >>> ?.../ti-k3-boot-firmware.hash????????????????? |? 2 +- >>> ?.../ti-k3-boot-firmware.mk??????????????????? | 16 ++-- >>> ?boot/ti-k3-image-gen/Config.in??????????????? | 77 ------------------- >>> ?boot/ti-k3-image-gen/ti-k3-image-gen.hash???? |? 3 - >>> ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?????? | 54 ------------- >>> ?boot/ti-k3-r5-loader/Config.in??????????????? |? 8 ++ >>> ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk?????? | 23 ++++++ >>> ?boot/uboot/Config.in????????????????????????? | 27 ++++--- >>> ?boot/uboot/uboot.mk?????????????????????????? | 10 ++- >>> ?configs/ti_am62x_sk_defconfig???????????????? | 14 ++-- >>> ?configs/ti_am64x_sk_defconfig???????????????? | 14 ++-- >>> ?...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- >>> ?package/python-attrs/python-attrs.mk????????? |? 6 ++ >>> ?.../python-jsonschema-specifications.mk?????? | 10 +++ >>> ?.../python-jsonschema/python-jsonschema.mk??? | 14 ++++ >>> ?.../python-referencing/python-referencing.mk? | 11 +++ >>> ?package/python-rpds-py/python-rpds-py.mk????? |? 1 + >>> ?24 files changed, 275 insertions(+), 180 deletions(-) >>> ?create mode 100644 board/ti/j721e-sk/genimage.cfg >>> ?create mode 100755 board/ti/j721e-sk/post-build.sh >>> ?create mode 100644 board/ti/j721e-sk/readme.txt >>> ?delete mode 100644 boot/ti-k3-image-gen/Config.in >>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash >>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk >>> ?copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) >>> >>> -- >>> 2.43.0 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot > > 1. Boot log: > > U-Boot SPL 2024.01 (Feb 15 2024 - 01:42:12 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > SPL initial stack usage: 13400 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Starting ATF on ARM64 core... > > NOTICE: BL31: v2.10.0 (release):v2.10 > NOTICE: BL31: Built : 01:28:38, Feb 15 2024 > I/TC: > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1198-g18ff6d2643)) #1 Thu Feb 15 00:28:27 UTC 2024 aarch64 > I/TC: WARNING: This OP-TEE configuration might be insecure! > I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html > I/TC: Primary CPU initializing > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > I/TC: HUK Initialized > I/TC: Activated SA2UL device > I/TC: Enabled firewalls for SA2UL TRNG device > I/TC: SA2UL TRNG initialized > I/TC: SA2UL Drivers initialized > I/TC: Primary CPU switching to normal world boot > > U-Boot SPL 2024.01 (Feb 15 2024 - 01:43:17 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > SPL initial stack usage: 1872 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > > > U-Boot 2024.01 (Feb 15 2024 - 01:43:17 +0100) > > SoC: AM62X SR1.0 HS-FS > Model: Texas Instruments AM625 SK > DRAM: 2 GiB > Core: 56 devices, 23 uclasses, devicetree: separate > MMC: mmc at fa10000: 0, mmc at fa00000: 1 > Loading Environment from nowhere... OK > In: serial at 2800000 > Out: serial at 2800000 > Err: serial at 2800000 > Net: eth0: ethernet at 8000000port@1 > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc1 is current device > SD/MMC found on device 1 > Failed to load 'uEnv.txt' Can you access to the mmc1 content manually ? I had to create a symlink due to "dtb" subdirectory expected by u-boot u-boot is looking at /boot/dtb/ti for devicetree. Best regards, Romain > Scanning for bootflows in all bootdevs > Seq Method State Uclass Part Name Filename > --- ----------- ------ -------- ---- ------------------------ ---------------- > Scanning global bootmeth 'efi_mgr': > No EFI system partition > No EFI system partition > Failed to persist EFI variables > Scanning bootdev 'mmc at fa00000.bootdev': > Scanning bootdev 'mmc at fa10000.bootdev': > Unknown uclass 'usb' in label > link up on port 1, speed 100, full duplex > BOOTP broadcast 1 > BOOTP broadcast 2 > BOOTP broadcast 3 > BOOTP broadcast 4 > BOOTP broadcast 5 > BOOTP broadcast 6 > BOOTP broadcast 7 > BOOTP broadcast 8 > BOOTP broadcast 9 > BOOTP broadcast 10 > BOOTP broadcast 11 > BOOTP broadcast 12 > BOOTP broadcast 13 > BOOTP broadcast 14 > BOOTP broadcast 15 > BOOTP broadcast 16 > BOOTP broadcast 17 > > Retry time exceeded; starting again > > > From romain.naour at smile.fr Thu Feb 15 11:26:52 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 15 Feb 2024 12:26:52 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> Message-ID: <7e253e56-25f4-494a-98d9-e0d908517acd@smile.fr> Hi Alexander, Le 15/02/2024 ? 11:20, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >> -choice >> - prompt "Security type" >> - help >> - ? The target SoC security type option for image gen.? Valid >> - ? options are "gp" for General Purpose devices, "hs-fs" for >> - ? High Security - Field Securable devices, or "hs" for High >> - ? Security - Security Enforcing devices.? Note for all High >> - ? Security device variants the TI_SECURE_DEV_PKG environmental >> - ? variable must be defined at build time pointing to a valid >> - ? core-secdev-k3 folder location, otherwise the build will >> - ? fail, see >> - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >> - >> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >> - bool "gp" >> - >> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >> - bool "hs-fs" >> - >> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >> - bool "hs" >> - >> -endchoice > > another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > was the default, which didn't boot on my HS-FS SoC. > > You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the > default for AM62x. I'm not sure if this is a problem, though. > I don't think so, the am62x defconfig should still be for GP SoC by default. Ok, maybe there is something to improve in this series but I don't have any HS/HS-FS SoC for testing... Best regards, Romain From dave.mehler at gmail.com Thu Feb 15 14:13:21 2024 From: dave.mehler at gmail.com (David Mehler) Date: Thu, 15 Feb 2024 09:13:21 -0500 Subject: [Buildroot] Headless setup, Raspberry Pi 4B and zero 2 w, Wi-Fi, Bluetooth, SSH? Message-ID: Hello, I'm using the latest buildroot and apparently I'm finding outdated information on these subjects because nothing I'm trying is working. I've got two Raspberry PIs, one a 4b the other a zero 2 w, on both I'm wanting to use them headlessly, so I'd like to do the following: 1. Get Wi-Fi going on boot and connect to a dedicated wireless network 2. Get bluetooth up and running (and set up a bluetooth serial console) 3. Enable ssh so that option is available 4. Install different custom packages for each unit, the 4 and the zero won't have the same packages aside from the Wi-Fi/bluetooth/ssh setup and in the case of the Zero 2 w: 5. Configure the camera module so it is up and running and ready to go Up to date information welcome. Thanks. Dave. From gilles.talis at gmail.com Thu Feb 15 14:24:06 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:06 -0400 Subject: [Buildroot] [PATCH] package/fdk-aac: bump to version 2.0.3 Message-ID: <20240215142413.451505-1-gilles.talis@gmail.com> Change log: https://github.com/mstorsjo/fdk-aac/blob/master/ChangeLog Signed-off-by: Gilles Talis --- package/fdk-aac/fdk-aac.hash | 5 +---- package/fdk-aac/fdk-aac.mk | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package/fdk-aac/fdk-aac.hash b/package/fdk-aac/fdk-aac.hash index b10d5f92b1..07c5561712 100644 --- a/package/fdk-aac/fdk-aac.hash +++ b/package/fdk-aac/fdk-aac.hash @@ -1,6 +1,3 @@ -# From https://sourceforge.net/projects/opencore-amr/files/fdk-aac/ -sha1 579b34e8174b4feb21a9c598695f5ff4a7ceef8c fdk-aac-2.0.2.tar.gz -md5 b41222194b31f570b3132bd622a9aef6 fdk-aac-2.0.2.tar.gz # Locally computed: -sha256 c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f fdk-aac-2.0.2.tar.gz +sha256 829b6b89eef382409cda6857fd82af84fabb63417b08ede9ea7a553f811cb79e fdk-aac-2.0.3.tar.gz sha256 95ec80da40b4af12ad4c4f3158c9cfb80f2479f3246e4260cb600827cc8c7836 NOTICE diff --git a/package/fdk-aac/fdk-aac.mk b/package/fdk-aac/fdk-aac.mk index c66f6df797..01a100fa94 100644 --- a/package/fdk-aac/fdk-aac.mk +++ b/package/fdk-aac/fdk-aac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FDK_AAC_VERSION = 2.0.2 +FDK_AAC_VERSION = 2.0.3 FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac FDK_AAC_LICENSE = fdk-aac license FDK_AAC_LICENSE_FILES = NOTICE -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:07 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:07 -0400 Subject: [Buildroot] [PATCH] package/iozone: bump to version 3.506 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-2-gilles.talis@gmail.com> Signed-off-by: Gilles Talis --- package/iozone/iozone.hash | 2 +- package/iozone/iozone.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index 9ecf1d1af8..c506b41db2 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 iozone3_493.tgz +sha256 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7 iozone3_506.tar diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 2df4a2aa84..7cce15c53d 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,8 +4,8 @@ # ################################################################################ -IOZONE_VERSION = 3.493 -IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz +IOZONE_VERSION = 3.506 +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) # IOzone license details can be found at: -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:08 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:08 -0400 Subject: [Buildroot] [PATCH] package/leptonica: bump to version 1.84.1 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-3-gilles.talis@gmail.com> Change log: http://www.leptonica.org/source/version-notes.html Signed-off-by: Gilles Talis --- package/leptonica/leptonica.hash | 2 +- package/leptonica/leptonica.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/leptonica/leptonica.hash b/package/leptonica/leptonica.hash index 6511d6b410..3416cfeb39 100644 --- a/package/leptonica/leptonica.hash +++ b/package/leptonica/leptonica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 8f18615e0743af7df7f50985c730dfcf0c93548073d1f56621e4156a8b54d3dd leptonica-1.83.1.tar.gz +sha256 2b3e1254b1cca381e77c819b59ca99774ff43530209b9aeb511e1d46588a64f6 leptonica-1.84.1.tar.gz sha256 87829abb5bbb00b55a107365da89e9a33f86c4250169e5a1e5588505be7d5806 leptonica-license.txt diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 4cb73296e8..0e902c6488 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEPTONICA_VERSION = 1.83.1 +LEPTONICA_VERSION = 1.84.1 LEPTONICA_SITE = https://github.com/DanBloomberg/leptonica/releases/download/$(LEPTONICA_VERSION) LEPTONICA_LICENSE = BSD-2-Clause LEPTONICA_LICENSE_FILES = leptonica-license.txt -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:09 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:09 -0400 Subject: [Buildroot] [PATCH] package/libolm: bump to version 3.2.16 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-4-gilles.talis@gmail.com> Change log: https://gitlab.matrix.org/matrix-org/olm/-/blob/master/CHANGELOG.rst Signed-off-by: Gilles Talis --- package/libolm/libolm.hash | 2 +- package/libolm/libolm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libolm/libolm.hash b/package/libolm/libolm.hash index 044bb24f06..a95115d2fe 100644 --- a/package/libolm/libolm.hash +++ b/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 614c0e4dc4721f57e56c3385bd8def2f71c6631f928a480efd0b4bd8e5435df9 olm-3.2.9.tar.gz +sha256 1e90f9891009965fd064be747616da46b232086fe270b77605ec9bda34272a68 olm-3.2.16.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 6f06686555..5c8bcd1f59 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.2.9 +LIBOLM_VERSION = 3.2.16 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:10 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:10 -0400 Subject: [Buildroot] [PATCH] package/ocrad: bump to version 0.29 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-5-gilles.talis@gmail.com> Signed-off-by: Gilles Talis --- package/ocrad/ocrad.hash | 2 +- package/ocrad/ocrad.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash index cd5b0039ea..736dd6ad4c 100644 --- a/package/ocrad/ocrad.hash +++ b/package/ocrad/ocrad.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e ocrad-0.28.tar.lz +sha256 11200cc6b0b7ba16884a72dccb58ef694f7aa26cd2b2041e555580f064d2d9e9 ocrad-0.29.tar.lz sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk index d62b7af351..2452070bcf 100644 --- a/package/ocrad/ocrad.mk +++ b/package/ocrad/ocrad.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCRAD_VERSION = 0.28 +OCRAD_VERSION = 0.29 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad OCRAD_LICENSE = GPL-2.0+ -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:11 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:11 -0400 Subject: [Buildroot] [PATCH] package/opencl-clhpp: bump to version 2023.12.14 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-6-gilles.talis@gmail.com> Change log: https://github.com/KhronosGroup/OpenCL-CLHPP/releases/tag/v2023.12.14 Signed-off-by: Gilles Talis --- package/opencl-clhpp/opencl-clhpp.hash | 2 +- package/opencl-clhpp/opencl-clhpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opencl-clhpp/opencl-clhpp.hash b/package/opencl-clhpp/opencl-clhpp.hash index 27b27cd80c..3f038d6340 100644 --- a/package/opencl-clhpp/opencl-clhpp.hash +++ b/package/opencl-clhpp/opencl-clhpp.hash @@ -1,3 +1,3 @@ # Locally Computed -sha256 869456032e60787eed9fceaeaf6c6cb4452bc0ff97e0f5a271510145a1c8f4d4 opencl-clhpp-2.0.16.tar.gz +sha256 9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82 opencl-clhpp-2023.12.14.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/opencl-clhpp/opencl-clhpp.mk b/package/opencl-clhpp/opencl-clhpp.mk index 933b40e3fe..93c25d0d66 100644 --- a/package/opencl-clhpp/opencl-clhpp.mk +++ b/package/opencl-clhpp/opencl-clhpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCL_CLHPP_VERSION = 2.0.16 +OPENCL_CLHPP_VERSION = 2023.12.14 OPENCL_CLHPP_SITE = $(call github,KhronosGroup,OpenCL-CLHPP,v$(OPENCL_CLHPP_VERSION)) OPENCL_CLHPP_LICENSE = Apache-2.0 OPENCL_CLHPP_LICENSE_FILES = LICENSE.txt -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:12 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:12 -0400 Subject: [Buildroot] [PATCH] package/tesseract-ocr: bump to version 5.3.4 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-7-gilles.talis@gmail.com> Changes since version 5.3.3: https://github.com/tesseract-ocr/tesseract/compare/5.3.3...5.3.4 Signed-off-by: Gilles Talis --- package/tesseract-ocr/tesseract-ocr.hash | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 45b9def27f..41c8498bec 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 dc4329f85f41191b2d813b71b528ba6047745813474e583ccce8795ff2ff5681 tesseract-ocr-5.3.3.tar.gz +sha256 141afc12b34a14bb691a939b4b122db0d51bd38feda7f41696822bacea7710c7 tesseract-ocr-5.3.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index d65111d468..0bc90f4871 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,7 +4,7 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 5.3.3 +TESSERACT_OCR_VERSION = 5.3.4 TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:13 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:13 -0400 Subject: [Buildroot] [PATCH] package/xapian: bump to version 1.4.24 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-8-gilles.talis@gmail.com> Change log: https://xapian.org/docs/xapian-core-1.4.24/NEWS Signed-off-by: Gilles Talis --- package/xapian/xapian.hash | 4 ++-- package/xapian/xapian.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index e570f7e2f2..16889b4559 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2022-January/009934.html -sha256 1fca48fca6cc3526cc4ba93dd194fe9c1326857b78edcfb37e68d086d714a9c3 xapian-core-1.4.19.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2023-November/010009.html +sha256 eda5ae6dcf6b0553a8676af64b1fd304e998cd20f779031ccaaf7ab9a373531a xapian-core-1.4.24.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 464e5478df..33c36a5a26 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.19 +XAPIAN_VERSION = 1.4.24 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ -- 2.39.2 From jubalh at iodoru.org Thu Feb 15 14:31:44 2024 From: jubalh at iodoru.org (Michael Vetter) Date: Thu, 15 Feb 2024 15:31:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/shadow: bump to version 4.14.5 Message-ID: <20240215143144.31911-1-jubalh@iodoru.org> Omit 4.14.4 since it was broken. Signed-off-by: Michael Vetter --- package/shadow/shadow.hash | 4 ++-- package/shadow/shadow.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash index 4689a994de..23c292d659 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.3/shadow-4.14.3.tar.xz.asc +# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.5/shadow-4.14.5.tar.xz.asc # with key A9348594CE31283A826FBDD8D57633D441E25BB5 -sha256 6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2 shadow-4.14.3.tar.xz +sha256 cba74bc7b05d89c015afe23131f9159ece38779d40a8af4cf162852e6e85ca23 shadow-4.14.5.tar.xz sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 03eb16a3f4..4b831908a2 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHADOW_VERSION = 4.14.3 +SHADOW_VERSION = 4.14.5 SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz SHADOW_LICENSE = BSD-3-Clause -- 2.35.3 From buildroot at bubu1.eu Thu Feb 15 14:42:41 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 15 Feb 2024 15:42:41 +0100 Subject: [Buildroot] [PATCH 1/3] package/libmbim: bump to 1.30.0 Message-ID: <20240215144243.3538255-1-buildroot@bubu1.eu> Explicitly disable newly introduced fuzzer build option. Changelog: https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/blob/mbim-1-30/NEWS Signed-off-by: Marcus Hoffmann --- package/libmbim/libmbim.hash | 2 +- package/libmbim/libmbim.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index 8e7633cb94..ebc37504c5 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 cf74682c56f4c34ca4aee86de3b8c425a89fc2c0782052815295faf6a8e0a9fb libmbim-1.28.2.tar.gz +sha256 cfc729d23b9bf699b23a7ef2f5d732d6eff96234e31fed36b778771a6e3d3ee5 libmbim-1.30.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-or-later.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 59f55a57bc..717c2396f7 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.28.2 +LIBMBIM_VERSION = 1.30.0 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) LIBMBIM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = \ @@ -13,7 +13,7 @@ LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES LIBMBIM_DEPENDENCIES = libglib2 -LIBMBIM_CONF_OPTS = -Dman=false +LIBMBIM_CONF_OPTS = -Dman=false -Dfuzzer=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBMBIM_DEPENDENCIES += gobject-introspection -- 2.34.1 From buildroot at bubu1.eu Thu Feb 15 14:42:42 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 15 Feb 2024 15:42:42 +0100 Subject: [Buildroot] [PATCH 2/3] package/libqmi: bump to version 1.34.0 In-Reply-To: <20240215144243.3538255-1-buildroot@bubu1.eu> References: <20240215144243.3538255-1-buildroot@bubu1.eu> Message-ID: <20240215144243.3538255-2-buildroot@bubu1.eu> Explicitly disable new fuzzer build option. Changelog: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/qmi-1-34/NEWS Signed-off-by: Marcus Hoffmann --- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 5036c1d3c0..7937f989a0 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 aec96bf2733a7b5ba27bb52346ce3a1ab54440800843f78001cc2a51213ce1b9 libqmi-1.32.2.tar.gz +sha256 8690d25b4d110b6df28b31da0a8bf16c7e966d31abcfeeb854f2753451e7a400 libqmi-1.34.0.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index eae41446e2..524333feba 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.32.2 +LIBQMI_VERSION = 1.34.0 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB @@ -12,7 +12,7 @@ LIBQMI_CPE_ID_VALID = YES LIBQMI_INSTALL_STAGING = YES LIBQMI_DEPENDENCIES = libglib2 -LIBQMI_CONF_OPTS = -Dman=false +LIBQMI_CONF_OPTS = -Dman=false -Dfuzzer=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBQMI_DEPENDENCIES += gobject-introspection -- 2.34.1 From buildroot at bubu1.eu Thu Feb 15 14:42:43 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 15 Feb 2024 15:42:43 +0100 Subject: [Buildroot] [PATCH 3/3] package/modem-manager: bump to 1.22.0 In-Reply-To: <20240215144243.3538255-1-buildroot@bubu1.eu> References: <20240215144243.3538255-1-buildroot@bubu1.eu> Message-ID: <20240215144243.3538255-3-buildroot@bubu1.eu> Explicitly disable newly introduced build options. Changelog: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/blob/mm-1-22/NEWS Signed-off-by: Marcus Hoffmann --- package/modem-manager/modem-manager.hash | 4 ++-- package/modem-manager/modem-manager.mk | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 4b8b795af7..fa81acd9dc 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ -#Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc -sha256 9c16b47547faac9515f2d03d1e8175de9c5e6769b1ee16b608ba6cfe6f04b03e ModemManager-1.20.4.tar.gz +#Locally calculated +sha256 6c8f8720737a3788e394c700f36236278c9de09d76069a079e6f1daaf08b2768 ModemManager-1.22.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 979a80a8e9..495dbcd258 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.20.4 +MODEM_MANAGER_VERSION = 1.22.0 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) @@ -13,6 +13,8 @@ MODEM_MANAGER_SELINUX_MODULES = modemmanager MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = \ + -Dbuiltin_plugins=false \ + -Dfuzzer=false \ -Dman=false \ -Dpowerd_suspend_resume=false \ -Dtests=false \ -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 15 17:10:56 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:10:56 +0100 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. In-Reply-To: References: <20240207030339.3910-1-asd617140123@gmail.com> <0e623797-b573-4604-b89e-737c7c503350@benettiengineering.com> Message-ID: <840786f7-f3a2-4dc1-8250-08135ac10c51@benettiengineering.com> Hi Eric, please use plan-text and not HTML e-mail, On 15/02/24 06:57, eric wrote: > Hi Giulio, > > > Here you have to keep the previous tags when sending new version of > patches: > > ? ?I didn't get it, what is the? previous tags? My Reviewed-by and Tested-by: you see below, > > > Reviewed-by: Giulio Benetti > > [Build Tested] > Tested-by: Giulio Benetti > > > > --- > > v1 -> v2 > > * Add BR2_cortex_a15_a7=y in buildroot defconfig. > > * Bump linux version to 6.6.8 > > * Using sunxi_defconfig in kernel. > > * Using "make savedefconfig" to save defconfig. > > * Remove boot.cmd. > > this patch had to be V3, but don't mind at this point. > I ask you when you send newer patches to set as superseded > the previous patch in patchwork: > https://patchwork.ozlabs.org/project/buildroot/list/ > > > I just need to add v3 tag, right? or I need to add other tags, e.g., resend? for the upcoming one yes, it must be V3, > > > --- > >? ?DEVELOPERS? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? |? 4 +++ > >? ?board/cubietech/cubieboard4/extlinux.conf |? 5 +++ > >? ?board/cubietech/cubieboard4/genimage.cfg? | 38 > ++++++++++++++++++++++ > >? ?board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ > >? ?configs/cubieboard4_defconfig? ? ? ? ? ? ?| 39 > +++++++++++++++++++++++ > >? ?5 files changed, 104 insertions(+) > >? ?create mode 100644 board/cubietech/cubieboard4/extlinux.conf > >? ?create mode 100644 board/cubietech/cubieboard4/genimage.cfg > >? ?create mode 100755 board/cubietech/cubieboard4/post-image.sh > >? ?create mode 100644 configs/cubieboard4_defconfig > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index a03018ab2b..bffb8f2069 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -3297,3 +3297,7 @@ F:? ? ? package/quazip/ > >? ?F:? package/shapelib/ > >? ?F:? package/simple-mail/ > >? ?F:? package/tinc/ > > + > > +N:? ?Nigel Wang > > > +F:? ?board/cubietech/cubieboard4/ > > +F:? ?configs/cubieboard4_defconfig > > diff --git a/board/cubietech/cubieboard4/extlinux.conf > b/board/cubietech/cubieboard4/extlinux.conf > > new file mode 100644 > > index 0000000000..5084e2237b > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/extlinux.conf > > @@ -0,0 +1,5 @@ > > +label linux > > +? ? kernel /boot/zImage > > +? ? devicetree /sun9i-a80-cubieboard4.dtb > > +? ? append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 > rootwait > > + > > diff --git a/board/cubietech/cubieboard4/genimage.cfg > b/board/cubietech/cubieboard4/genimage.cfg > > new file mode 100644 > > index 0000000000..f1dee13923 > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/genimage.cfg > > @@ -0,0 +1,38 @@ > > +# Minimal SD card image for the Cubieboard2 > > +# Based in the Orange Pi genimage.cfg > > + > > +image boot.vfat { > > +? ? ?vfat { > > +? ? ? ? ? ? ?files = { > > +? ? ? ? ? ? ? ? ? ? ?"zImage", > > +? ? ? ? ? ? ? ? ? ? ?"sun9i-a80-cubieboard4.dtb", > > +? ? ? ? ? ? ? ? ? ? ?"extlinux" > > +? ? ? ? ? ? ?} > > +? ? ?} > > + > > +? ? ?size = 8M > > +} > > + > > +image sdcard.img { > > +? ? ?hdimage { > > +? ? ?} > > + > > +? ? ?partition u-boot { > > +? ? ? ? ? ? ?in-partition-table = "no" > > +? ? ? ? ? ? ?image = "u-boot-sunxi-with-spl.bin" > > +? ? ? ? ? ? ?offset = 8K > > +? ? ? ? ? ? ?size = 1016K # 1MB - 8KB > > +? ? ?} > > + > > +? ? ?partition boot { > > +? ? ? ? ? ? ?partition-type = 0xC > > +? ? ? ? ? ? ?bootable = "true" > > +? ? ? ? ? ? ?image = "boot.vfat" > > +? ? ?} > > + > > +? ? ?partition rootfs { > > +? ? ? ? ? ? ?partition-type = 0x83 > > +? ? ? ? ? ? ?image = "rootfs.ext4" > > +? ? ? ? ? ? ?size = 512M > > +? ? ?} > > +} > > diff --git a/board/cubietech/cubieboard4/post-image.sh > b/board/cubietech/cubieboard4/post-image.sh > > new file mode 100755 > > index 0000000000..e37b960a4d > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/post-image.sh > > @@ -0,0 +1,18 @@ > > +#!/bin/sh > > + > > +BOARD_DIR="$(dirname "$0")" > > +install -m 0644 -D $BOARD_DIR/extlinux.conf > $BINARIES_DIR/extlinux/extlinux.conf > > + > > +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > > + > > +rm -rf "${GENIMAGE_TMP}" > > + > > +genimage? ? ? ? ? ? ? ? ? ? ? ? ? ?\ > > +? ? ?--rootpath "${TARGET_DIR}"? ? ?\ > > +? ? ?--tmppath "${GENIMAGE_TMP}"? ? \ > > +? ? ?--inputpath "${BINARIES_DIR}"? \ > > +? ? ?--outputpath "${BINARIES_DIR}" \ > > +? ? ?--config "${GENIMAGE_CFG}" > > + > > +exit $? > > diff --git a/configs/cubieboard4_defconfig > b/configs/cubieboard4_defconfig > > new file mode 100644 > > index 0000000000..0592fe4a2d > > --- /dev/null > > +++ b/configs/cubieboard4_defconfig > > @@ -0,0 +1,39 @@ > > +# Architecture > > +BR2_arm=y > > +BR2_cortex_a15_a7=y > > +BR2_ARM_FPU_NEON_VFPV4=y > > + > > +# System > > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" > > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" > > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" > > Here the option below is missing and it's needed otherwise the newest > Linux version will be picked and build will fail. > Now we don't see the problem because the latest version is exactly 6.6, > so need this: > > # Linux headers same as kernel, a 6.6 series > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y This ^^^ must be part of V3 patch and reported in patch changelog, > > > +# Kernel > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" > > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" > > + > > +# Filesystem > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > + > > +# Bootloader > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > +BR2_TARGET_UBOOT_SPL=y > > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > -- > > 2.34.1 > > > > This patch looks to me, except missing Linux header version. > > I've added that option and re-built successfully so I confirm my: > Reviewed-by: Giulio Benetti > > [Build Tested] > Tested-by: Giulio Benetti > > > Maybe a Maintainer can edit while committing, of if you can please send > a V3 with that missing line. > > Thank you! > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > While sending V3 with modifies listed above please add under your SoB also my: Reviewed-by: Giulio Benetti [Build Tested] Tested-by: Giulio Benetti Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From buildroot at bubu1.eu Thu Feb 15 17:13:42 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 15 Feb 2024 18:13:42 +0100 Subject: [Buildroot] [PATCH] package/python-hatchling: bump to 1.21.1 Message-ID: <20240215171343.1883561-1-buildroot@bubu1.eu> Changelog: https://hatch.pypa.io/dev/history/hatchling/#hatchling-v1.21.1 Signed-off-by: Marcus Hoffmann --- package/python-hatchling/python-hatchling.hash | 4 ++-- package/python-hatchling/python-hatchling.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index e1798e882c..df703088e4 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 21e5e7ed5fa6dd0618c5b66eb847f370 hatchling-1.21.0.tar.gz -sha256 5c086772357a50723b825fd5da5278ac7e3697cdf7797d07541a6c90b6ff754c hatchling-1.21.0.tar.gz +md5 d40aaea58a04a36a2b641f6efe99e362 hatchling-1.21.1.tar.gz +sha256 bba440453a224e7d4478457fa2e8d8c3633765bafa02975a6b53b9bf917980bc hatchling-1.21.1.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index d1ed4d23c2..550dbf0beb 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.21.0 +PYTHON_HATCHLING_VERSION = 1.21.1 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/fd/4a/8196e79c0d6e5eb10436dd2fcccc889a76af6ecf9bc35f87408159497d4d +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/d8/a1/7dd1caa87c0b15c04c6291e25112e5d082cce02ee87f221a8be1d594f857 PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 -- 2.34.1 From kazemi.ms at gmail.com Thu Feb 15 17:18:52 2024 From: kazemi.ms at gmail.com (Saeed Kazemi) Date: Thu, 15 Feb 2024 18:18:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/eza: bump to version 0.18.3 Message-ID: <20240215171852.226396-1-kazemi.ms@gmail.com> Release notes: https://github.com/eza-community/eza/releases/tag/v0.18.3 Signed-off-by: Saeed Kazemi --- package/eza/eza.hash | 2 +- package/eza/eza.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 64f46759d7..48c2fa8ffe 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11e6127a615744b52d52d66ebcdf9e5366f62746e8123b3eec00e35a057db988 eza-0.16.0.tar.gz +sha256 995a77848e75737a267b64613acaa6096ba8943f048676d5722c3ff238fb29f9 eza-0.18.3.tar.gz sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE diff --git a/package/eza/eza.mk b/package/eza/eza.mk index b11c1a1e7f..7ec3f127b4 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,7 +4,7 @@ # ################################################################################ -EZA_VERSION = 0.16.0 +EZA_VERSION = 0.18.3 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) EZA_LICENSE = MIT EZA_LICENSE_FILES = LICENCE -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 15 17:22:23 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:22:23 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <4868466.GXAFRqVoOG@laptop> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> <20240211120857.6622-3-kilian.zinnecker@mail.de> <4868466.GXAFRqVoOG@laptop> Message-ID: <2191bba4-462a-4168-bbbc-91997f1e108d@benettiengineering.com> Hi Kilian, On 15/02/24 00:03, kilian.zinnecker--- via buildroot wrote: > Hello Giulio, all, > > [--SNIP--] > >>> a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch >>> b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch >>> new file mode 100644 >>> index 0000000000..bcf5b965ce >>> --- /dev/null >>> +++ >>> b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch >>> @@ -0,0 +1,30 @@ >>> +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 >>> +From: Kilian Zinnecker >>> +Date: Mon, 21 Aug 2023 23:51:59 +0200 >>> +Subject: [PATCH] Overwrite bootcmd by force >>> + >>> +This patch is a dirty hack: Trying to overwrite the bootcmd via the >>> +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted >>> +to some preset value and could not be changed easily. Therefore a >>> +hook is used to force the bootcmd to be overwritten. >> >> This is strange because if so also the bootcmd content of uEnv.txt below >> should be skipped, or maybe there is a bug in this u-boot that evaluates >> bootcmd too early without taking into account environment variables. >> But I'm also noticing that you have your Environment variables in Fat, >> but it depends how u-boot deals with environment variables. Usually >> you have to specificy an offset in memory where environment variables >> live. >> >> But I see in your "make uboot-menuconfig" that CONFIG_ENV_IS_IN_FAT is >> not enabled, but only CONFIG_ENV_IS_IN_MMC is and you have to specify: >> CONFIG_ENV_OFFSET >> CONFIG_ENV_SIZE >> >> So if you want to go with vfat way you need to enable >> CONFIG_ENV_IS_IN_FAT and specify: >> CONFIG_ENV_FAT_INTERFACE >> CONFIG_ENV_FAT_DEVICE_AND_PART >> and most of all: >> CONFIG_ENV_FAT_FILE=uEnv.txt >> in uboot.fragment below >> >> I would go with this last way instead of adding such dirty hack, can you >> work on that? > > I tried, but so far I am not successful, maybe due to my lack of experience > with uboot or maybe due to the customization of this particular uboot. I > removed my custom-uboot patch and added the following configs to the > uboot.fragment file, but it did not work yet: > > # CONFIG_ENV_IS_IN_MMC is not set > CONFIG_ENV_IS_IN_FAT=y > CONFIG_ENV_FAT_INTERFACE="mmc" > CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" > CONFIG_ENV_FAT_FILE="uEnv.txt" First of all you have to give a try using ush(u-boot shell) to see if you can really access fat partition and read uEnv.txt file. Like: => fatload ... to a memory address If that works then you should also: => printenv and check if the variables you want to override look like expected > > I also tried to use mainline uboot v2024.01, which features the Lichee Pi 4A, > which features the same SoC, but this didn't work either. I had a look at the > custom uboot source and it defines a lot of configs inside this header file: > > https://openbeagle.org/beaglev-ahead/beaglev-ahead-u-boot/-/blob/beaglev-v2020.01-1.1.2-ubuntu/include/configs/light-c910.h?ref_type=heads#L363-388 This is a usual way for the these variables. You can dig into it or override them as you're trying to do. But you need to make sure uEnv.txt is really read from your sd-card. For example it could be a problem with CONFIG_ENV_FAT_INTERFACE name or CONFIG_ENV_FAT_DEVICE_AND_PART numbering. If you try using ush everything will be clearer. > > I tried to remove the hard-coded bootcmd from this header, but that also > didn't work. I don't understand the inner workings of uboot well enough yet to > get it properly working, so I appreciate all hints and any help here. Above there is some explanation. Anyway do all the tests without the uboot patch applied. > However, I will already send a v4 of the patches, in which I try to address > all the other issues. > Thanks again for reviewing and best regards, You're welcome, the goal is to make this patch looks the best it could. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 15 17:23:34 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:23:34 +0100 Subject: [Buildroot] [PATCH v4 0/3] Add board support for the BeagleV-Ahead In-Reply-To: <20240214233028.1226645-1-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> Message-ID: <8f65944f-3d15-4ef8-a53b-4b9c399537fc@benettiengineering.com> Hi Eric, On 15/02/24 00:30, Kilian Zinnecker wrote: > This patch series adds board support for the BeagleV-Ahead. > please report changes per patch, not in cover-letter. In cover-letter you can add like a summary but for patch-specific changelog it must be found in the patches Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > v3 -> v4: > - Improved descriptions in commit messages > - Patch to alphabetize own DEVELOPERS entry > - Fix in package/xuantie-bins/Config.in: Spaces -> tabs > - Github helper and removal of superfluous variables in xuantie-bins.mk > - Added patch to disable CLOCK_ALLOW_WRITE_DEBUGFS in custom kernel > > v2 -> v3: > > - Added brief description what the xuantie bin binaries are for > - Unrolled loop in XUANTIE_BINS_INSTALL_IMAGES_CMDS of > package/xuantie-bins/xuantie-bins.mk > - Added a second product page link to board's readme.txt > - Added URL to the product page to git commit message > - Dropped "_CUSTOM" from all "BR2_RISCV_ISA_*" in the board's > defconfig > - Add description to the board's readme.txt and defconfig why GCC > v13 is chosen > - Added BR2_PACKAGE_HOST_DOSFSTOOLS to board's defconfig > > v1 -> v2: > > - Added hash file for xuantie-bins package > - Now uses uEnv.txt for actual boot commands > - Removed extlinux.conf > - Removed superflous comments inside config files > > Kilian Zinnecker (3): > Fix alphabetical order of DEVELOPERS file entry > package/xuantie-bins: new package > configs/beaglev_ahead: new defconfig > > DEVELOPERS | 5 +- > board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ > board/beaglev-ahead/linux.fragment | 2 + > ...01-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch | 30 +++++++ > .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ > board/beaglev-ahead/post-image.sh | 6 ++ > board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ > board/beaglev-ahead/uEnv.txt | 4 + > board/beaglev-ahead/uboot.fragment | 2 + > configs/beaglev_ahead_defconfig | 46 +++++++++++ > package/Config.in | 1 + > package/xuantie-bins/Config.in | 8 ++ > package/xuantie-bins/xuantie-bins.hash | 2 + > package/xuantie-bins/xuantie-bins.mk | 19 +++++ > 14 files changed, 294 insertions(+), 1 deletion(-) > create mode 100644 board/beaglev-ahead/genimage.cfg > create mode 100644 board/beaglev-ahead/linux.fragment > create mode 100644 board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch > create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > create mode 100755 board/beaglev-ahead/post-image.sh > create mode 100644 board/beaglev-ahead/readme.txt > create mode 100644 board/beaglev-ahead/uEnv.txt > create mode 100644 board/beaglev-ahead/uboot.fragment > create mode 100644 configs/beaglev_ahead_defconfig > create mode 100644 package/xuantie-bins/Config.in > create mode 100644 package/xuantie-bins/xuantie-bins.hash > create mode 100644 package/xuantie-bins/xuantie-bins.mk > From giulio.benetti at benettiengineering.com Thu Feb 15 17:24:28 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:24:28 +0100 Subject: [Buildroot] [PATCH v4 1/3] Fix alphabetical order of DEVELOPERS file entry In-Reply-To: <20240214233028.1226645-2-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> <20240214233028.1226645-2-kilian.zinnecker@mail.de> Message-ID: On 15/02/24 00:30, Kilian Zinnecker wrote: > Signed-off-by: Kilian Zinnecker Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > --- > DEVELOPERS | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 0d12c3abcb..b75a92739a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1896,8 +1896,8 @@ F: package/libcamera/ > N: Kilian Zinnecker > F: board/avnet/rzboard_v2l/ > F: board/radxa/rock5b/ > -F: configs/rock5b_defconfig > F: configs/avnet_rzboard_v2l_defconfig > +F: configs/rock5b_defconfig > F: package/rockchip-rkbin/ > > N: Klaus Heinrich Kiwi From kazemi.ms at gmail.com Thu Feb 15 17:30:24 2024 From: kazemi.ms at gmail.com (Saeed Kazemi) Date: Thu, 15 Feb 2024 18:30:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/procs: bump to version 0.14.4 Message-ID: <20240215173024.286102-1-kazemi.ms@gmail.com> Release notes: https://github.com/dalance/procs/releases/tag/v0.14.4 Signed-off-by: Saeed Kazemi --- package/procs/procs.hash | 2 +- package/procs/procs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/procs/procs.hash b/package/procs/procs.hash index 19832e3897..a3ec5d2b75 100644 --- a/package/procs/procs.hash +++ b/package/procs/procs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2f9fdbcf7324952e22565ded58148fa40387b5a5f8723996620d6c4588925713 procs-0.14.3.tar.gz +sha256 22d9ef44bf06bbd6d0d463a40678a1560a9125fdc6e6fbb5db294e05a174ea01 procs-0.14.4.tar.gz sha256 feb87a2e0c305de3464cc44077da5393c52d8ca6362d37427157d04ec6f4510d LICENSE diff --git a/package/procs/procs.mk b/package/procs/procs.mk index 8567bf3da3..34e874a4f2 100644 --- a/package/procs/procs.mk +++ b/package/procs/procs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCS_VERSION = 0.14.3 +PROCS_VERSION = 0.14.4 PROCS_SITE = $(call github,dalance,procs,v$(PROCS_VERSION)) PROCS_LICENSE = MIT PROCS_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 15 17:57:42 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:57:42 +0100 Subject: [Buildroot] [PATCH v4 3/3] configs/beaglev_ahead: new defconfig In-Reply-To: <20240214233028.1226645-4-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> <20240214233028.1226645-4-kilian.zinnecker@mail.de> Message-ID: Hi Kilian, On 15/02/24 00:30, Kilian Zinnecker via buildroot wrote: > This patch adds board support for the BeagleV-Ahead. It uses a > custom kernel for the board's SoC. As the SoC has an outdated and > currently not supported version of the RISC-V vector extension, the > vector extension is disabled. The used OpenSBI version for this board > support does not define the neccessary flags for GCC 12 to activate > the zicsr and zifencei extensions. Therefore this board support uses > GCC 13. > > The boot command for the custom uboot to boot the kernel could not > easily be changed. It seemed that a default boot command was persisent > and any change to it by normal means (e.g., uboot config parameters > like CONFIG_BOOT_COMMAND) did not have any effect. Hence a patch for > the custom u-boot is introduced for now, to insert the proper boot > command. > > The custom kernel has CLOCK_ALLOW_WRITE_DEBUGFS enabled by default. > Therefore, this boards supports features a patch, which disables this > again, as this option can be dangerous, if activated. > > https://www.beagleboard.org/boards/beaglev-ahead > > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 2 + > board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ > board/beaglev-ahead/linux.fragment | 2 + > ...01-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch | 30 +++++++ > .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ > board/beaglev-ahead/post-image.sh | 6 ++ > board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ > board/beaglev-ahead/uEnv.txt | 4 + > board/beaglev-ahead/uboot.fragment | 2 + > configs/beaglev_ahead_defconfig | 46 +++++++++++ > 10 files changed, 262 insertions(+) > create mode 100644 board/beaglev-ahead/genimage.cfg > create mode 100644 board/beaglev-ahead/linux.fragment > create mode 100644 board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch > create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > create mode 100755 board/beaglev-ahead/post-image.sh > create mode 100644 board/beaglev-ahead/readme.txt > create mode 100644 board/beaglev-ahead/uEnv.txt > create mode 100644 board/beaglev-ahead/uboot.fragment > create mode 100644 configs/beaglev_ahead_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index e9a9910d69..adc6c09a7a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1895,8 +1895,10 @@ F: package/libcamera/ > > N: Kilian Zinnecker > F: board/avnet/rzboard_v2l/ > +F: board/beaglev-ahead/ > F: board/radxa/rock5b/ > F: configs/avnet_rzboard_v2l_defconfig > +F: configs/beaglev_ahead_defconfig > F: configs/rock5b_defconfig > F: package/rockchip-rkbin/ > F: package/xuantie-bins/ > diff --git a/board/beaglev-ahead/genimage.cfg b/board/beaglev-ahead/genimage.cfg > new file mode 100644 > index 0000000000..080b169527 > --- /dev/null > +++ b/board/beaglev-ahead/genimage.cfg > @@ -0,0 +1,62 @@ > +# SD card image for BeagleV-Ahead > + > +image boot.vfat { > + vfat { > + files = { > + "fw_dynamic.bin", > + "Image", > + "light_aon_fpga.bin", > + "light-beagle.dtb", > + "light_c906_audio.bin", > + } > + > + file uEnv.txt { > + image = "uEnv.txt" > + } file uEnv.txt can be listed in files = {} group > + > + file overlays/BBORG_LOAD-00A2.dtbo { > + image = "overlays/BBORG_LOAD-00A2.dtbo" > + } > + > + file overlays/BBORG_RELAY-00A2.dtbo { > + image = "overlays/BBORG_RELAY-00A2.dtbo" > + } > + > + file overlays/BONE-LED_P8_03.dtbo { > + image = "overlays/BONE-LED_P8_03.dtbo" > + } > + > + file overlays/BONE-LED_P9_11.dtbo { > + image = "overlays/BONE-LED_P9_11.dtbo" > + } > + > + file overlays/BVA-MIKROBUS-0.dtbo { > + image = "overlays/BVA-MIKROBUS-0.dtbo" > + } same goes for the entire overlays folder like this: image boot.vfat { vfat { files = { "fw_dynamic.bin", "Image", "light_aon_fpga.bin", "light-beagle.dtb", "light_c906_audio.bin", "uEnv.txt", "overlays" } } size = 48M } you can check it works by mounting boot.vfat in images folder like this: $ cd output/images $ mkdir mnt $ sudo mount -o loop boot.vfat mnt/ $ cd mnt $ ls $ cd overlays $ ls you will see all the needed files there > + } > + size = 48M > +} > + > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 2M > + } > + > + partition uboot { > + in-partition-table = "false" > + image = "u-boot-with-spl.bin" > + offset = 0 > + holes = {"(440; 1048576)"} > + } > + > + partition boot { > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + image = "rootfs.ext2" > + } > +} > + > diff --git a/board/beaglev-ahead/linux.fragment b/board/beaglev-ahead/linux.fragment > new file mode 100644 > index 0000000000..00f93f39a4 > --- /dev/null > +++ b/board/beaglev-ahead/linux.fragment > @@ -0,0 +1,2 @@ > +# CONFIG_VECTOR is not set > +# CONFIG_VECTOR_0_7 is not set > diff --git a/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch b/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch > new file mode 100644 > index 0000000000..0487e43101 > --- /dev/null > +++ b/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch > @@ -0,0 +1,30 @@ > +From c82d614da43c3c2f7cdc7580c9ee24bd2ce203cd Mon Sep 17 00:00:00 2001 > +From: Kilian Zinnecker > +Date: Wed, 14 Feb 2024 20:54:37 +0100 > +Subject: [PATCH] Disable CLOCK_ALLOW_WRITE_DEBUGFS > + > +CLOCK_ALLOW_WRITE_DEBUGFS is disabled as default, as it can be > +very dangerous, see: > + > +https://lkml.org/lkml/2022/1/24/3382 > + > +Signed-off-by: Kilian Zinnecker > +--- > + drivers/clk/clk.c | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > +index 77774a8c701b..a6ba04ce0237 100644 > +--- a/drivers/clk/clk.c > ++++ b/drivers/clk/clk.c > +@@ -3131,7 +3131,6 @@ static int clk_dump_show(struct seq_file *s, void *data) > + } > + DEFINE_SHOW_ATTRIBUTE(clk_dump); > + > +-#define CLOCK_ALLOW_WRITE_DEBUGFS > + #ifdef CLOCK_ALLOW_WRITE_DEBUGFS > + /* > + * This can be dangerous, therefore don't provide any real compile time > +-- > +2.34.1 > + > diff --git a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > new file mode 100644 > index 0000000000..bcf5b965ce > --- /dev/null > +++ b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > @@ -0,0 +1,30 @@ > +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 > +From: Kilian Zinnecker > +Date: Mon, 21 Aug 2023 23:51:59 +0200 > +Subject: [PATCH] Overwrite bootcmd by force > + > +This patch is a dirty hack: Trying to overwrite the bootcmd via the > +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted > +to some preset value and could not be changed easily. Therefore a > +hook is used to force the bootcmd to be overwritten. > + > +Signed-off-by: Kilian Zinnecker > +--- > + board/thead/light-c910/light.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c > +index 8d5478e916..1448db974e 100644 > +--- a/board/thead/light-c910/light.c > ++++ b/board/thead/light-c910/light.c > +@@ -2282,6 +2282,7 @@ int board_late_init(void) > + light_usb_boot_check(); > + do_firmware_load(); > + ap_peri_clk_disable(); > ++ run_command("load mmc 1:1 $ramdisk_addr_r uEnv.txt; env import -t $ramdisk_addr_r $filesize; run uenvcmd", 0); as pointed in V3 this should be solved without this patch, please keep testing u-boot variables using uEnv.txt in VFAT and once it works, and it should because you've found the same problem using custom and mainline u-boot, please drop this patch. > + return 0; > + } > + > +-- > +2.34.1 > + > diff --git a/board/beaglev-ahead/post-image.sh b/board/beaglev-ahead/post-image.sh > new file mode 100755 > index 0000000000..9e16eeff3f > --- /dev/null > +++ b/board/beaglev-ahead/post-image.sh > @@ -0,0 +1,6 @@ > +#!/usr/bin/env bash > +set -e > + > +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ ${BINARIES_DIR} > +cp board/beaglev-ahead/uEnv.txt ${BINARIES_DIR}/ > +support/scripts/genimage.sh -c board/beaglev-ahead/genimage.cfg > diff --git a/board/beaglev-ahead/readme.txt b/board/beaglev-ahead/readme.txt > new file mode 100644 > index 0000000000..758082a792 > --- /dev/null > +++ b/board/beaglev-ahead/readme.txt > @@ -0,0 +1,78 @@ > +BeagleV-Ahead > +============== > +https://www.beagleboard.org/boards/beaglev-ahead > +https://forum.beagleboard.org/c/beaglev/ > + > +The SoC (TH1520) of the BeagleV-Ahead implements an outdated and > +currently not supported version of the RISC-V vector extension. Hence, > +the vector extension is disabled. The used OpenSBI version for this > +board support does not define the neccessary flags for GCC 12 to > +activate the zicsr and zifencei extensions. Therefore this board > +support uses GCC 13. > + > +Build: > +====== > + $ make beaglev_ahead_defconfig > + $ make > + > +Files created in output directory > +================================= > + > +output/images > +. > +??? boot.vfat > +??? bootloader-JH7100-buildroot.bin.out > +??? ddrinit-2133-buildroot.bin.out > +??? fw_dynamic.bin > +??? fw_dynamic.elf > +??? fw_jump.bin > +??? fw_jump.elf > +??? fw_payload.bin > +??? fw_payload.elf > +??? Image > +??? light-beagle.dtb > +??? light_aon_fpga.bin > +??? light_c906_audio.bin > +??? overlays overlays/ > +??? rootfs.ext2 > +??? rootfs.ext4 > +??? rootfs.tar > +??? sdcard.img > +??? u-boot-with-spl.bin > +??? u-boot.bin > +??? uEnv.txt > + > +Creating bootable SD card: > +========================== > + > +Simply invoke (as root) > + > +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync > + > +Where X is your SD card device. > + > +Booting: > +======== > + > +SD card boot button: > +-------------------- > +To let the board boot from SD card, keep the "SD button" pressed during power > +up / power cycle. The button is near the SD card slot. > + > +Serial console: > +--------------- > +The BeagleV-Ahead has a "Debug" GPIO header. Its layout can be seen here: > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/02-quick-start.html#access-uart-debug-console > + > +Note, that there are reported issues with some uart interface cables/dongles: > +https://forum.beagleboard.org/t/beaglev-ahead-debug-terminal-problems/35331 > + > +Baudrate for this board is 115200. > + > +Login: > +------ > +Enter 'root' as login user, and the prompt is ready. > + > +wiki link: > +---------- > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/index.html > diff --git a/board/beaglev-ahead/uEnv.txt b/board/beaglev-ahead/uEnv.txt > new file mode 100644 > index 0000000000..7e98ae5f81 > --- /dev/null > +++ b/board/beaglev-ahead/uEnv.txt > @@ -0,0 +1,4 @@ > +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} > +uenvcmd=fatload mmc 1:1 ${kernel_addr_r} Image; fatload mmc 1:1 ${fdt_addr_r} light-beagle.dtb > +bootargs=root=/dev/mmcblk1p2 rootfstype=ext4 rootwait ro console=ttyS0,115200 earlycon clk_ignore_unused net.ifnames=0 > + > diff --git a/board/beaglev-ahead/uboot.fragment b/board/beaglev-ahead/uboot.fragment > new file mode 100644 > index 0000000000..1f51cef106 > --- /dev/null > +++ b/board/beaglev-ahead/uboot.fragment > @@ -0,0 +1,2 @@ > +CONFIG_LEGACY_IMAGE_FORMAT=y > +CONFIG_AUTOBOOT=y > diff --git a/configs/beaglev_ahead_defconfig b/configs/beaglev_ahead_defconfig > new file mode 100644 > index 0000000000..9000b1f0ad > --- /dev/null > +++ b/configs/beaglev_ahead_defconfig > @@ -0,0 +1,46 @@ > +BR2_riscv=y > +BR2_riscv_custom=y > +BR2_RISCV_ISA_RVM=y > +BR2_RISCV_ISA_RVA=y > +BR2_RISCV_ISA_RVF=y > +BR2_RISCV_ISA_RVD=y > +BR2_RISCV_ISA_RVC=y > +# Use GCC 13 for OpenSBI zicsr zifencei issue > +BR2_GCC_VERSION_13_X=y > +BR2_GLOBAL_PATCH_DIR="board/beaglev-ahead/patches" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglev-ahead/post-image.sh" > +BR2_TARGET_GENERIC_HOSTNAME="BeagleV-Ahead" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the BeagleV-Ahead" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/linux/archive/refs/heads/beaglev-v5.10.113-1.1.2-ubuntu.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="beaglev" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/light-beagle" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/linux.fragment" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_BEAGLEV_DDRINIT=y > +BR2_TARGET_BEAGLEV_SECONDBOOT=y > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-opensbi/archive/refs/heads/0.9-1.1.2-ubuntu.tar.gz" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-u-boot/archive/refs/heads/beaglev-v2020.01-1.1.2-ubuntu.tar.gz" if I've understood correctly the board works using latest stable mainline u-boot. So please use that one instead of this that looks unmaintained. > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="light_beagle" > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragment" > +BR2_TARGET_UBOOT_FORMAT_BIN=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_XUANTIE_BINS=y Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 15 17:58:50 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:58:50 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/xuantie-bins: new package In-Reply-To: <20240214233028.1226645-3-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> <20240214233028.1226645-3-kilian.zinnecker@mail.de> Message-ID: <67a04065-f77b-4846-b331-c5092f2b5afc@benettiengineering.com> Hi Kilian, On 15/02/24 00:30, Kilian Zinnecker wrote: > This patch adds a package for Xuantie binary blobs. The binary > blobs are needed for the BeagleV-Ahead's SoC (TH1520). They contain > an FPGA binary for power management and a binary for the audio > system. > > Signed-off-by: Kilian Zinnecker looks good to me: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/xuantie-bins/Config.in | 8 ++++++++ > package/xuantie-bins/xuantie-bins.hash | 2 ++ > package/xuantie-bins/xuantie-bins.mk | 19 +++++++++++++++++++ > 5 files changed, 31 insertions(+) > create mode 100644 package/xuantie-bins/Config.in > create mode 100644 package/xuantie-bins/xuantie-bins.hash > create mode 100644 package/xuantie-bins/xuantie-bins.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index b75a92739a..e9a9910d69 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1899,6 +1899,7 @@ F: board/radxa/rock5b/ > F: configs/avnet_rzboard_v2l_defconfig > F: configs/rock5b_defconfig > F: package/rockchip-rkbin/ > +F: package/xuantie-bins/ > > N: Klaus Heinrich Kiwi > F: package/wqy-zenhei/ > diff --git a/package/Config.in b/package/Config.in > index bf0fe078b9..b35cbc4038 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -656,6 +656,7 @@ endmenu > source "package/wipe/Config.in" > source "package/xorriso/Config.in" > source "package/xr819-xradio/Config.in" > + source "package/xuantie-bins/Config.in" > endmenu > > menu "Interpreter languages and scripting" > diff --git a/package/xuantie-bins/Config.in b/package/xuantie-bins/Config.in > new file mode 100644 > index 0000000000..18f5df1453 > --- /dev/null > +++ b/package/xuantie-bins/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_XUANTIE_BINS > + bool "xuantie-bins" > + depends on BR2_riscv > + help > + This package provides binary blobs, needed for the > + BeagleV-Ahead's SoC (TH1520). They contain an FPGA binary > + (light_aon_fpga.bin) for power management and a binary for > + the audio system (light_c906_audio.bin). > diff --git a/package/xuantie-bins/xuantie-bins.hash b/package/xuantie-bins/xuantie-bins.hash > new file mode 100644 > index 0000000000..5531a54617 > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.hash > @@ -0,0 +1,2 @@ > +# Locally computed > +sha256 92d2fee4688dc0598329d56cf7962f344d30b70e261a4cd9939b0912f06df26a xuantie-bins-1.2.1.tar.gz > diff --git a/package/xuantie-bins/xuantie-bins.mk b/package/xuantie-bins/xuantie-bins.mk > new file mode 100644 > index 0000000000..bccfc9587d > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.mk > @@ -0,0 +1,19 @@ > +################################################################################ > +# > +# xuantie-bins > +# > +################################################################################ > + > +XUANTIE_BINS_VERSION = 1.2.1 > +XUANTIE_BINS_SITE = $(call github,beagleboard,xuantie-ubuntu,beaglev-$(XUANTIE_BINS_VERSION)) > +XUANTIE_BINS_LICENSE = PROPRIETARY > + > +XUANTIE_BINS_INSTALL_IMAGES = YES > +XUANTIE_BINS_INSTALL_TARGET = NO > + > +define XUANTIE_BINS_INSTALL_IMAGES_CMDS > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/bins/light_aon_fpga.bin > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/bins/light_c906_audio.bin > +endef > + > +$(eval $(generic-package)) From alexander.sverdlin at gmail.com Thu Feb 15 18:50:30 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 19:50:30 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <7e253e56-25f4-494a-98d9-e0d908517acd@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <7e253e56-25f4-494a-98d9-e0d908517acd@smile.fr> Message-ID: <4f2fdb3c732480061d815f9f898da9fea9b77387.camel@gmail.com> Hi Romain, On Thu, 2024-02-15 at 12:26 +0100, Romain Naour wrote: > > On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > > > -choice > > > - prompt "Security type" > > > - help > > > - ? The target SoC security type option for image gen.? Valid > > > - ? options are "gp" for General Purpose devices, "hs-fs" for > > > - ? High Security - Field Securable devices, or "hs" for High > > > - ? Security - Security Enforcing devices.? Note for all High > > > - ? Security device variants the TI_SECURE_DEV_PKG environmental > > > - ? variable must be defined at build time pointing to a valid > > > - ? core-secdev-k3 folder location, otherwise the build will > > > - ? fail, see > > > - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > > - bool "gp" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > > - bool "hs-fs" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > > - bool "hs" > > > - > > > -endchoice > > > > another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > > was the default, which didn't boot on my HS-FS SoC. > > > > You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the > > default for AM62x. I'm not sure if this is a problem, though. > > > > I don't think so, the am62x defconfig should still be for GP SoC by default. I'm pretty sure it's HS-FS by default, because GP (as of todays "master") >>> ti-k3-image-gen 08.06.00.007 Extracting gzip -d -c /home/alex/remote/buildroot/dl/ti-k3-image-gen/k3-image-gen-08.06.00.007.tar.gz | /home/alex/remote/buildroot/output/host/bin/tar --strip-components=1 -C /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007 -xf - >>> ti-k3-image-gen 08.06.00.007 Patching >>> ti-k3-image-gen 08.06.00.007 Configuring cp /home/alex/remote/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007 cp: cannot stat '/home/alex/remote/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin': No such file or directory make: *** [package/pkg-generic.mk:273: /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007/.stamp_configured] Error 1 So overall, for HS-FS it doesn't look as a regression with you patchset, but rather as improvement, even though it doesn't boot, but it builds at least... I can try to look what could be the problem with U-Boot environment... -- Alexander Sverdlin. From kadambini.nema at gmail.com Thu Feb 15 19:32:06 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Thu, 15 Feb 2024 11:32:06 -0800 Subject: [Buildroot] [PATCH 1/1] package/iptables: bump version to 1.8.10 Message-ID: <20240215193206.2884119-1-kadambini.nema@gmail.com> Change Log : https://netfilter.org/projects/iptables/files/changes-iptables-1.8.10.txt Build test results: iptables.config BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY=y BR2_PACKAGE_IPTABLES_NFTABLES=y $ ./utils/test-pkg -c iptables.config iptables bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/iptables/iptables.hash | 2 +- package/iptables/iptables.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index a908b9cbc1..be8b0df3d6 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f iptables-1.8.9.tar.xz +sha256 5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c iptables-1.8.10.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 561c82ca0b..6712136962 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.9 +IPTABLES_VERSION = 1.8.10 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.xz IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES -- 2.25.1 From kadambini.nema at gmail.com Thu Feb 15 20:31:21 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Thu, 15 Feb 2024 12:31:21 -0800 Subject: [Buildroot] [PATCH 1/1] package/libusb: bump version to 1.0.27 Message-ID: <20240215203121.2948032-1-kadambini.nema@gmail.com> Change Log : https://github.com/libusb/libusb/blob/d52e355daa09f17ce64819122cb067b8a2ee0d4b/ChangeLog#L4 Build test results: libusb.config BR2_PACKAGE_LIBUSB=y BR2_PACKAGE_LIBUSB_EXAMPLES=y BR2_PACKAGE_LIBUSB_COMPAT=y $./utils/test-pkg -k -c libusb.config -p libusb bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: SKIPPED 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/libusb/libusb.hash | 2 +- package/libusb/libusb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index bbb0ccf5b9..8ca68f03ba 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5 libusb-1.0.26.tar.bz2 +sha256 ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575 libusb-1.0.27.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 98a4a578b2..15649a2ab1 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).26 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).27 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ -- 2.25.1 From alexander.sverdlin at gmail.com Thu Feb 15 21:14:42 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 22:14:42 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> Message-ID: <1f1cca3eae4fc651a9f02e4e64407a355cb39f2e.camel@gmail.com> Hi Romain, On Thu, 2024-02-15 at 12:23 +0100, Romain Naour wrote: > Also the ti_am62x_sk_defconfig is expecting a GP SoC so you may have to > customize the image generated in a post-build script? > > Maybe you have to replace the tiboot3.bin binary included by genimage with the > one for the HS-FS variant ? > > for j721e: > ??? 285449 13 f?vr. 17:27 tiboot3.bin > ??? 285449 13 f?vr. 17:27 tiboot3-j721e-gp-evm.bin > ??? 286224 13 f?vr. 17:27 tiboot3-j721e_sr1_1-hs-evm.bin > ??? 286224 13 f?vr. 17:27 tiboot3-j721e_sr2-hs-fs-evm.bin > > for am62x: > ??? tiboot3.bin << should be the gp variant by default > ??? tiboot3-am62x-gp-evm.bin > ??? tiboot3-am62x-hs-fs-evm.bin That's not the case any more, after make clean; make ti_am62x_sk_defconfig; make I get: images]$ ls -l ... -rw-r--r-- 1 ... 282545 Feb 15 21:24 tiboot3-am62x-gp-evm.bin -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3-am62x-hs-evm.bin -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3-am62x-hs-fs-evm.bin -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3.bin But, well, this seems to be an upstream change in U-Boot. However, there seems to be no alternative to BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE, after removal of boot/ti-k3-image-gen package. People with SK-AM62 will find their boards silently broken (GP variants). -- Alexander Sverdlin. From kilian.zinnecker at mail.de Thu Feb 15 21:43:41 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Thu, 15 Feb 2024 22:43:41 +0100 Subject: [Buildroot] [PATCH] configs/rock5b_defconfig: switch to mainline linux Message-ID: <20240215214341.6137-1-kilian.zinnecker@mail.de> This patch switches the board support of the Radxa Rock 5B from using a custom kernel to mainline linux 6.7.4. Thereby patches, which became redundant, are removed, as well as device tree modifications. As kernel 6.7.4 is not buildroot's latest kernel version (as of creation of this patch), the hash for the kernel is added. Also the needed ethernet drivers are activated via the kernel config fragment file. Signed-off-by: Kilian Zinnecker --- board/radxa/rock5b/boot.cmd | 2 +- board/radxa/rock5b/linux.fragment | 5 +- ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- ...x-building-error-on-Werror-array-com.patch | 43 ------------- board/radxa/rock5b/patches/linux/linux.hash | 4 +- board/radxa/rock5b/readme.txt | 50 ++------------- board/radxa/rock5b/rock5b.dts | 12 ---- board/radxa/rock5b/rock5b.its | 2 +- configs/rock5b_defconfig | 10 ++- 9 files changed, 14 insertions(+), 178 deletions(-) delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch delete mode 100644 board/radxa/rock5b/rock5b.dts diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd index 9a3e73e003..28dd42974c 100644 --- a/board/radxa/rock5b/boot.cmd +++ b/board/radxa/rock5b/boot.cmd @@ -1,3 +1,3 @@ -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait +setenv bootargs root=/dev/mmcblk1p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait fatload mmc 1:1 ${loadaddr} image.itb bootm ${loadaddr} diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 28bb373ef2..90f2f291ba 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1,5 +1,2 @@ CONFIG_R8169=y -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set -# Disable Rockchip specific WiFi drivers, as the kernel -# code cannot be build with GCC 12 due to several Werrors -# CONFIG_WL_ROCKCHIP is not set +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch deleted file mode 100644 index 5632c5a627..0000000000 --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 -From: Kees Cook -Date: Sat, 12 Feb 2022 09:14:49 -0800 -Subject: etherdevice: Adjust ether_addr* prototypes to silence - -Wstringop-overead -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With GCC 12, -Wstringop-overread was warning about an implicit cast from -char[6] to char[8]. However, the extra 2 bytes are always thrown away, -alignment doesn't matter, and the risk of hitting the edge of unallocated -memory has been accepted, so this prototype can just be converted to a -regular char *. Silences: - -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], - | ^~~~~~~~~~~~~~~~~~~~~~~ - -Reported-by: Marc Kleine-Budde -Tested-by: Marc Kleine-Budde -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de -Cc: Jakub Kicinski -Cc: "David S. Miller" -Cc: netdev at vger.kernel.org -Signed-off-by: Kees Cook -Signed-off-by: David S. Miller -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd -Signed-off-by: Kilian Zinnecker ---- - include/linux/etherdevice.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h -index 2ad71cc90b37d..92b10e67d5f87 100644 ---- a/include/linux/etherdevice.h -+++ b/include/linux/etherdevice.h -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) - #endif - } - --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - #ifdef __BIG_ENDIAN -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. - */ - --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], -- const u8 addr2[6+2]) -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch deleted file mode 100644 index 10de6c72d3..0000000000 --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 -From: Xiongwei Song -Date: Fri, 14 Jan 2022 14:07:24 -0800 -Subject: mm: page_alloc: fix building error on -Werror=array-compare - -Arthur Marsh reported we would hit the error below when building kernel -with gcc-12: - - CC mm/page_alloc.o - mm/page_alloc.c: In function `mem_init_print_info': - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] - 8173 | if (start <= pos && pos < end && size > adj) \ - | - -In C++20, the comparision between arrays should be warned. - -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com -Signed-off-by: Xiongwei Song -Reported-by: Arthur Marsh -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f -Signed-off-by: Kilian Zinnecker ---- - mm/page_alloc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 806f317c2e7e2..c4ef450ac4428 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) - */ - #define adj_init_size(start, end, size, pos, adj) \ - do { \ -- if (start <= pos && pos < end && size > adj) \ -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ - size -= adj; \ - } while (0) - --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash index 95ad749554..fadbe578ad 100644 --- a/board/radxa/rock5b/patches/linux/linux.hash +++ b/board/radxa/rock5b/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c08ae62f4052eb79d1c167e6e27c3e7513553d4cc687d3385fb2da1f3027e6d5 linux-6.7.4.tar.gz diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index b3eb06851a..7c1dd6bd49 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -12,22 +12,21 @@ Files created in output directory output/images . -??? Image -??? Image.gz ??? boot.scr ??? boot.vfat +??? Image +??? Image.gz ??? image.itb -??? rk3588-rock-5b.dtb ??? rk3588_bl31_v1.40.elf ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin -??? rock5b.dts +??? rk3588-rock-5b.dtb ??? rock5b.its ??? rootfs.ext2 ??? rootfs.ext4 ??? rootfs.tar ??? sdcard.img -??? u-boot-rockchip.bin -??? u-boot.bin +??? u-boot.bin +??? u-boot-rockchip.bin Creating bootable SD card: ========================== @@ -61,42 +60,3 @@ Enter 'root' as login user, and the prompt is ready. wiki link: ---------- https://forum.radxa.com/c/rock5 - -Issues: -======= - -WiFi ----- -The custom Radxa kernel provides custom code to support WiFi. However, -that code does not compile with GCC 12, which is the current default -version in buildroot. Hence, the WiFi kernel drivers are disabled, until -the issues get fixed (if ever). If they are desperately needed, one may -apply the following workaround, as long as buildroot still supports GCC -version 11: - -1. Set GCC version 11, by adding the following line to -configs/rock5b_defconfig: - -BR2_GCC_VERSION_11_X=y - -2. Re-enable custom WiFi drivers by removing the following line from -board/radxa/rock5b/linux.fragment: - -# CONFIG_WL_ROCKCHIP is not set - -Rockchip FIQ Debugger ---------------------- -The custom kernel used for this board features an FIQ debugger, which -can be activated by typing "fiq" on the serial interface. As this can be -annoying if a user wants to type these charakters and it is not needed -for most users, this board support disables the FIQ debugger by default. -To re-enable the FIQ debugger follow the steps: - -1. In board/radxa/rock5b/rock5b.dts set the status property of the -fiq_debugger node to "okay" and set the status property of the uart2 -node to "disabled" - -2. Re-enable the fiq debugger module by removing the following line -from board/radxa/rock5b/linux.fragment: - -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts deleted file mode 100644 index 71a4e42b5e..0000000000 --- a/board/radxa/rock5b/rock5b.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -#include "rockchip/rk3588-rock-5b.dts" - -&fiq_debugger { - status = "disabled"; -}; - -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; -}; diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its index 9ce235d041..d73659a56e 100644 --- a/board/radxa/rock5b/rock5b.its +++ b/board/radxa/rock5b/rock5b.its @@ -20,7 +20,7 @@ }; fdt { description = "Device Tree"; - data = /incbin/("rock5b.dtb"); + data = /incbin/("rk3588-rock-5b.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 7175aa66bf..7de1cfae88 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -9,13 +9,11 @@ BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.4.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" BR2_TARGET_ROOTFS_EXT2=y -- 2.34.1 From romain.naour at smile.fr Thu Feb 15 22:13:53 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 15 Feb 2024 23:13:53 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <1f1cca3eae4fc651a9f02e4e64407a355cb39f2e.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> <1f1cca3eae4fc651a9f02e4e64407a355cb39f2e.camel@gmail.com> Message-ID: Hello Alexander, Le 15/02/2024 ? 22:14, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Thu, 2024-02-15 at 12:23 +0100, Romain Naour wrote: >> Also the ti_am62x_sk_defconfig is expecting a GP SoC so you may have to >> customize the image generated in a post-build script? >> >> Maybe you have to replace the tiboot3.bin binary included by genimage with the >> one for the HS-FS variant ? >> >> for j721e: >> ??? 285449 13 f?vr. 17:27 tiboot3.bin >> ??? 285449 13 f?vr. 17:27 tiboot3-j721e-gp-evm.bin >> ??? 286224 13 f?vr. 17:27 tiboot3-j721e_sr1_1-hs-evm.bin >> ??? 286224 13 f?vr. 17:27 tiboot3-j721e_sr2-hs-fs-evm.bin >> >> for am62x: >> ??? tiboot3.bin << should be the gp variant by default >> ??? tiboot3-am62x-gp-evm.bin >> ??? tiboot3-am62x-hs-fs-evm.bin > > That's not the case any more, after > make clean; make ti_am62x_sk_defconfig; make > > I get: > > images]$ ls -l > ... > -rw-r--r-- 1 ... 282545 Feb 15 21:24 tiboot3-am62x-gp-evm.bin > -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3-am62x-hs-evm.bin > -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3-am62x-hs-fs-evm.bin > -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3.bin > > But, well, this seems to be an upstream change in U-Boot. Good catch! Indeed, there is an inconsistency between K3 SoC support in binman, the j721e by default is GP while other are hs-fs. It seems related to *-binman.dtsi file (notice were is placed the property symlink = "tiboot3.bin";) &binman { tiboot3-am62x-hs-fs-evm.bin { filename = "tiboot3-am62x-hs-fs-evm.bin"; symlink = "tiboot3.bin"; https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/arch/arm/dts/k3-am625-sk-binman.dtsi?ref_type=tags#L58 &binman { tiboot3-am64x_sr2-hs-fs-evm.bin { filename = "tiboot3-am64x_sr2-hs-fs-evm.bin"; symlink = "tiboot3.bin"; https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/arch/arm/dts/k3-am64x-binman.dtsi?ref_type=tags#L50 &binman { tiboot3-j721e-gp-evm.bin { filename = "tiboot3-j721e-gp-evm.bin"; symlink = "tiboot3.bin"; https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/arch/arm/dts/k3-j721e-binman.dtsi?ref_type=tags#L210 Maybe it would be a good idea to ignore the symlink created by uboot and create the symlink ourself in BINARIES_DIR. > > However, there seems to be no alternative to > > BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE, after removal of > boot/ti-k3-image-gen package. People with SK-AM62 will find > their boards silently broken (GP variants). > What about BR2_TARGET_TI_K3_R5_LOADER_SECTYPE option to select the default tiboot3.bin (and sysfw.itb if any)? Best regards, Romain From alexander.sverdlin at gmail.com Thu Feb 15 22:22:41 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 23:22:41 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> <1f1cca3eae4fc651a9f02e4e64407a355cb39f2e.camel@gmail.com> Message-ID: <8f672e0367301b1833218e71336002ffcf6eb4d9.camel@gmail.com> Hi Romain, On Thu, 2024-02-15 at 23:13 +0100, Romain Naour wrote: > Maybe it would be a good idea to ignore the symlink created by uboot and create > the symlink ourself in BINARIES_DIR. > > > > > However, there seems to be no alternative to > > > > BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE, after removal of > > boot/ti-k3-image-gen package. People with SK-AM62 will find > > their boards silently broken (GP variants). > > > > What about BR2_TARGET_TI_K3_R5_LOADER_SECTYPE option to select the default > tiboot3.bin (and sysfw.itb if any)? Makes sense to me. -- Alexander Sverdlin. From romain.naour at smile.fr Thu Feb 15 22:32:01 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 15 Feb 2024 23:32:01 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <4f2fdb3c732480061d815f9f898da9fea9b77387.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <7e253e56-25f4-494a-98d9-e0d908517acd@smile.fr> <4f2fdb3c732480061d815f9f898da9fea9b77387.camel@gmail.com> Message-ID: <4109841d-095a-471a-be39-1cf790a2b345@smile.fr> Hi Alexander, Le 15/02/2024 ? 19:50, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Thu, 2024-02-15 at 12:26 +0100, Romain Naour wrote: >>> On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >>>> -choice >>>> - prompt "Security type" >>>> - help >>>> - ? The target SoC security type option for image gen.? Valid >>>> - ? options are "gp" for General Purpose devices, "hs-fs" for >>>> - ? High Security - Field Securable devices, or "hs" for High >>>> - ? Security - Security Enforcing devices.? Note for all High >>>> - ? Security device variants the TI_SECURE_DEV_PKG environmental >>>> - ? variable must be defined at build time pointing to a valid >>>> - ? core-secdev-k3 folder location, otherwise the build will >>>> - ? fail, see >>>> - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>> - bool "gp" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>> - bool "hs-fs" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>> - bool "hs" >>>> - >>>> -endchoice >>> >>> another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y >>> was the default, which didn't boot on my HS-FS SoC. >>> >>> You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the >>> default for AM62x. I'm not sure if this is a problem, though. >>> >> >> I don't think so, the am62x defconfig should still be for GP SoC by default. > > I'm pretty sure it's HS-FS by default, because GP (as of todays "master") > >>>> ti-k3-image-gen 08.06.00.007 Extracting > gzip -d -c /home/alex/remote/buildroot/dl/ti-k3-image-gen/k3-image-gen-08.06.00.007.tar.gz | /home/alex/remote/buildroot/output/host/bin/tar --strip-components=1 -C > /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007 -xf - >>>> ti-k3-image-gen 08.06.00.007 Patching >>>> ti-k3-image-gen 08.06.00.007 Configuring > cp /home/alex/remote/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007 > cp: cannot stat '/home/alex/remote/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin': No such file or directory > make: *** [package/pkg-generic.mk:273: /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007/.stamp_configured] Error 1 Weird, the gitlab-ci build fine with : BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_IMAGE_GEN=y # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX is not set # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X is not set BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X is not set BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y # BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS is not set # BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS is not set BR2_TARGET_TI_K3_IMAGE_GEN_SOC="am64x" BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE="ti-sci" BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE="gp" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION=y AM64x: https://gitlab.com/buildroot.org/buildroot/-/jobs/6134305650 Same for AM62x: https://gitlab.com/buildroot.org/buildroot/-/jobs/6134305619 > > So overall, for HS-FS it doesn't look as a regression with you patchset, > but rather as improvement, even though it doesn't boot, but it builds > at least... > > I can try to look what could be the problem with U-Boot environment... > Yes please. Best regards, Romain From alexander.sverdlin at gmail.com Thu Feb 15 22:36:17 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 23:36:17 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <4109841d-095a-471a-be39-1cf790a2b345@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <7e253e56-25f4-494a-98d9-e0d908517acd@smile.fr> <4f2fdb3c732480061d815f9f898da9fea9b77387.camel@gmail.com> <4109841d-095a-471a-be39-1cf790a2b345@smile.fr> Message-ID: <72a60f908081c7c060b35aa1911b721d0f664edc.camel@gmail.com> Hi Romain, On Thu, 2024-02-15 at 23:32 +0100, Romain Naour wrote: > Weird, the gitlab-ci build fine with : > > BR2_TARGET_TI_K3_BOOT_FIRMWARE=y > BR2_TARGET_TI_K3_IMAGE_GEN=y > # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX is not set > # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X is not set > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X is not set > BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > # BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS is not set right, I had to change from BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP to BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS for my HW, so the latter seems to be broken in "master". -- Alexander Sverdlin. From kadambini.nema at gmail.com Thu Feb 15 22:46:14 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Thu, 15 Feb 2024 14:46:14 -0800 Subject: [Buildroot] [PATCH 1/1] package/{libuv, uvw}: bump version to libuv 1.47.0 and uvw 3.3.0 Message-ID: <20240215224614.3028380-1-kadambini.nema@gmail.com> Change Log : https://github.com/libuv/libuv/blob/v1.x/ChangeLog#L92 https://github.com/skypjack/uvw/releases/tag/v3.3.0_libuv_v1.47 Build test results: libuv.config BR2_PACKAGE_LIBUV=y BR2_PACKAGE_UVW=y $./utils/test-pkg -k -c libuv.uvw.config -p uvw -p libuv bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: SKIPPED 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- package/uvw/uvw.hash | 4 ++-- package/uvw/uvw.mk | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 1fd286d9e9..3a2904f247 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094 libuv-v1.46.0-dist.tar.gz +sha256 72a187104662b47f2a2b204da39d2acb05cf22a4fcb13ceaebe3b0ed0c0e2e43 libuv-v1.47.0-dist.tar.gz sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 76316484e4..a794ac1c8a 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.46.0 +LIBUV_VERSION = 1.47.0 LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) LIBUV_DEPENDENCIES = host-pkgconf diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 2dc6e879e1..3f237d00f2 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd5aed741765950074b1ea2507291dce81e528abdf56c406991ad4a27d8d1714 uvw-3.2.0_libuv_v1.46.tar.gz -sha256 e2a4062818ab05e2a0908737ad49b7c01202247364e900167ac81105de8713f3 LICENSE +sha256 aabb17d3d8f0b3481b44e981c889dd4a2a6a3f1a96a4d01055e669f4b7d37d0e uvw-3.3.0_libuv_v1.47.tar.gz +sha256 5e439d0ad6e1b16f2f14023872c49cb2cf1b62a172c30b864cb45a5aa6533454 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 12149d43ca..23e5060c34 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 3.2.0_libuv_v1.46 +UVW_VERSION = 3.3.0_libuv_v1.47 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 15 23:25:14 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 16 Feb 2024 00:25:14 +0100 Subject: [Buildroot] [PATCH] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <20240215214341.6137-1-kilian.zinnecker@mail.de> References: <20240215214341.6137-1-kilian.zinnecker@mail.de> Message-ID: <58E9CC6C-0DA1-42B9-AA17-3435786DCBDC@benettiengineering.com> Hi Kilian, > Il giorno 15 feb 2024, alle ore 22:44, Kilian Zinnecker via buildroot ha scritto: > > ?This patch switches the board support of the Radxa Rock 5B from > using a custom kernel to mainline linux 6.7.4. Very well! > Thereby patches, > which became redundant, are removed, as well as device tree > modifications. As kernel 6.7.4 is not buildroot's latest kernel > version (as of creation of this patch), the hash for the kernel is > added. There?s no need to add hash for specific mainline Linux version, you can drop that. Did it happen Buildroot to ask for it during building? > Also the needed ethernet drivers are activated via the > kernel config fragment file. > > Signed-off-by: Kilian Zinnecker > --- > board/radxa/rock5b/boot.cmd | 2 +- > board/radxa/rock5b/linux.fragment | 5 +- > ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- > ...x-building-error-on-Werror-array-com.patch | 43 ------------- > board/radxa/rock5b/patches/linux/linux.hash | 4 +- > board/radxa/rock5b/readme.txt | 50 ++------------- > board/radxa/rock5b/rock5b.dts | 12 ---- > board/radxa/rock5b/rock5b.its | 2 +- > configs/rock5b_defconfig | 10 ++- > 9 files changed, 14 insertions(+), 178 deletions(-) > delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > delete mode 100644 board/radxa/rock5b/rock5b.dts > > diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd > index 9a3e73e003..28dd42974c 100644 > --- a/board/radxa/rock5b/boot.cmd > +++ b/board/radxa/rock5b/boot.cmd > @@ -1,3 +1,3 @@ > -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait > +setenv bootargs root=/dev/mmcblk1p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait > fatload mmc 1:1 ${loadaddr} image.itb > bootm ${loadaddr} It would be great if you switch to extlinux that is easier for debugging and here you only override bootargs so you can add environment uboot variables file. > diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment > index 28bb373ef2..90f2f291ba 100644 > --- a/board/radxa/rock5b/linux.fragment > +++ b/board/radxa/rock5b/linux.fragment > @@ -1,5 +1,2 @@ > CONFIG_R8169=y > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > -# Disable Rockchip specific WiFi drivers, as the kernel > -# code cannot be build with GCC 12 due to several Werrors > -# CONFIG_WL_ROCKCHIP is not set > +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y > diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > deleted file mode 100644 > index 5632c5a627..0000000000 > --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 > -From: Kees Cook > -Date: Sat, 12 Feb 2022 09:14:49 -0800 > -Subject: etherdevice: Adjust ether_addr* prototypes to silence > - -Wstringop-overead > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -With GCC 12, -Wstringop-overread was warning about an implicit cast from > -char[6] to char[8]. However, the extra 2 bytes are always thrown away, > -alignment doesn't matter, and the risk of hitting the edge of unallocated > -memory has been accepted, so this prototype can just be converted to a > -regular char *. Silences: > - > -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] > - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); > - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? > - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > - | ^~~~~~~~~~~~~~~~~~~~~~~ > - > -Reported-by: Marc Kleine-Budde > -Tested-by: Marc Kleine-Budde > -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de > -Cc: Jakub Kicinski > -Cc: "David S. Miller" > -Cc: netdev at vger.kernel.org > -Signed-off-by: Kees Cook > -Signed-off-by: David S. Miller > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd > -Signed-off-by: Kilian Zinnecker > ---- > - include/linux/etherdevice.h | 5 ++--- > - 1 file changed, 2 insertions(+), 3 deletions(-) > - > -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h > -index 2ad71cc90b37d..92b10e67d5f87 100644 > ---- a/include/linux/etherdevice.h > -+++ b/include/linux/etherdevice.h > -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) > - #endif > - } > - > --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) > -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - #ifdef __BIG_ENDIAN > -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) > - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. > - */ > - > --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > -- const u8 addr2[6+2]) > -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > deleted file mode 100644 > index 10de6c72d3..0000000000 > --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 > -From: Xiongwei Song > -Date: Fri, 14 Jan 2022 14:07:24 -0800 > -Subject: mm: page_alloc: fix building error on -Werror=array-compare > - > -Arthur Marsh reported we would hit the error below when building kernel > -with gcc-12: > - > - CC mm/page_alloc.o > - mm/page_alloc.c: In function `mem_init_print_info': > - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] > - 8173 | if (start <= pos && pos < end && size > adj) \ > - | > - > -In C++20, the comparision between arrays should be warned. > - > -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com > -Signed-off-by: Xiongwei Song > -Reported-by: Arthur Marsh > -Signed-off-by: Andrew Morton > -Signed-off-by: Linus Torvalds > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f > -Signed-off-by: Kilian Zinnecker > ---- > - mm/page_alloc.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/mm/page_alloc.c b/mm/page_alloc.c > -index 806f317c2e7e2..c4ef450ac4428 100644 > ---- a/mm/page_alloc.c > -+++ b/mm/page_alloc.c > -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) > - */ > - #define adj_init_size(start, end, size, pos, adj) \ > - do { \ > -- if (start <= pos && pos < end && size > adj) \ > -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ > - size -= adj; \ > - } while (0) > - > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash > index 95ad749554..fadbe578ad 100644 > --- a/board/radxa/rock5b/patches/linux/linux.hash > +++ b/board/radxa/rock5b/patches/linux/linux.hash > @@ -1,2 +1,2 @@ > -# Locally calculated > -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz > +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc > +sha256 c08ae62f4052eb79d1c167e6e27c3e7513553d4cc687d3385fb2da1f3027e6d5 linux-6.7.4.tar.gz So you can drop this and patch folder at this point > diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt > index b3eb06851a..7c1dd6bd49 100644 > --- a/board/radxa/rock5b/readme.txt > +++ b/board/radxa/rock5b/readme.txt > @@ -12,22 +12,21 @@ Files created in output directory > > output/images > . > -??? Image > -??? Image.gz > ??? boot.scr > ??? boot.vfat > +??? Image > +??? Image.gz > ??? image.itb > -??? rk3588-rock-5b.dtb > ??? rk3588_bl31_v1.40.elf > ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin > -??? rock5b.dts > +??? rk3588-rock-5b.dtb > ??? rock5b.its > ??? rootfs.ext2 > ??? rootfs.ext4 > ??? rootfs.tar > ??? sdcard.img > -??? u-boot-rockchip.bin > -??? u-boot.bin > +??? u-boot.bin > +??? u-boot-rockchip.bin > > Creating bootable SD card: > ========================== > @@ -61,42 +60,3 @@ Enter 'root' as login user, and the prompt is ready. > wiki link: > ---------- > https://forum.radxa.com/c/rock5 > - > -Issues: > -======= > - > -WiFi > ----- > -The custom Radxa kernel provides custom code to support WiFi. However, > -that code does not compile with GCC 12, which is the current default > -version in buildroot. Hence, the WiFi kernel drivers are disabled, until > -the issues get fixed (if ever). If they are desperately needed, one may > -apply the following workaround, as long as buildroot still supports GCC > -version 11: > - > -1. Set GCC version 11, by adding the following line to > -configs/rock5b_defconfig: > - > -BR2_GCC_VERSION_11_X=y > - > -2. Re-enable custom WiFi drivers by removing the following line from > -board/radxa/rock5b/linux.fragment: > - > -# CONFIG_WL_ROCKCHIP is not set > - > -Rockchip FIQ Debugger > ---------------------- > -The custom kernel used for this board features an FIQ debugger, which > -can be activated by typing "fiq" on the serial interface. As this can be > -annoying if a user wants to type these charakters and it is not needed > -for most users, this board support disables the FIQ debugger by default. > -To re-enable the FIQ debugger follow the steps: > - > -1. In board/radxa/rock5b/rock5b.dts set the status property of the > -fiq_debugger node to "okay" and set the status property of the uart2 > -node to "disabled" > - > -2. Re-enable the fiq debugger module by removing the following line > -from board/radxa/rock5b/linux.fragment: > - > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts > deleted file mode 100644 > index 71a4e42b5e..0000000000 > --- a/board/radxa/rock5b/rock5b.dts > +++ /dev/null > @@ -1,12 +0,0 @@ > -/dts-v1/; > - > -#include "rockchip/rk3588-rock-5b.dts" > - > -&fiq_debugger { > - status = "disabled"; > -}; > - > -&uart2 { > - pinctrl-0 = <&uart2m0_xfer>; > - status = "okay"; > -}; > diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its > index 9ce235d041..d73659a56e 100644 > --- a/board/radxa/rock5b/rock5b.its > +++ b/board/radxa/rock5b/rock5b.its > @@ -20,7 +20,7 @@ > }; > fdt { > description = "Device Tree"; > - data = /incbin/("rock5b.dtb"); > + data = /incbin/("rk3588-rock-5b.dtb"); > type = "flat_dt"; > arch = "arm64"; > compression = "none"; > diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig > index 7175aa66bf..7de1cfae88 100644 > --- a/configs/rock5b_defconfig > +++ b/configs/rock5b_defconfig > @@ -9,13 +9,11 @@ BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" > BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > BR2_SYSTEM_DHCP="eth0" > BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" > -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.4.tar.gz" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y No, please use BR2_LINUX_CUSTOM_VERSION here, not tarball, that?s why it asks for hash. And above please specify the header version for Linux 6_7 Take a look to the other defconfigs with Linux custom version and mimic them, you will see everything is easier. Also remember to drop patches folder variable. I?m on mobile so I?m not that precise, but I think you should manage it. Kind regards Giulio > BR2_LINUX_KERNEL_DTS_SUPPORT=y > -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set > -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" > BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" > BR2_TARGET_ROOTFS_EXT2=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From alexander.sverdlin at gmail.com Fri Feb 16 01:19:31 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Fri, 16 Feb 2024 02:19:31 +0100 Subject: [Buildroot] [PATCH 18/21] configs/ti_j721e_sk_defconfig: new defconfig In-Reply-To: <20240213172817.2872849-19-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-19-romain.naour@smile.fr> Message-ID: <6f7f293b44ddef1809b59ff0d17ec00c816dd7ba.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > --- /dev/null > +++ b/board/ti/j721e-sk/post-build.sh > @@ -0,0 +1,16 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" Unused variable? > + > +# u-boot is looking at /boot/dtb/ti for devicetree in the rootfs > +# partition while Buildroot install the kernel and its devicetree > +# in /boot (BR2_LINUX_KERNEL_INSTALL_TARGET enabled). > +# Enabling BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME allows to keep the > +# "ti" subdirectory but "dts" is still missing. > +# Make sure /boot/dtb/ti exist by creating a symlink in > +# ${TARGET_DIR}/boot > +# https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc?h=09.02.00.004#n13 > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/include/env/ti/mmc.env?ref_type=tags#L18 > +if [ -L ${TARGET_DIR}/boot/dtb ]; then > +??? rm ${TARGET_DIR}/boot/dtb > +??? ln -sf . ${TARGET_DIR}/boot/dtb > +fi The above only re-creates a link if there was already a link, but doesn't if it's a clean build. Should "ln -sf . ${TARGET_DIR}/boot/dtb" be outside the "if"? -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Fri Feb 16 01:44:19 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Fri, 16 Feb 2024 02:44:19 +0100 Subject: [Buildroot] [PATCH 18/21] configs/ti_j721e_sk_defconfig: new defconfig In-Reply-To: <20240213172817.2872849-19-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-19-romain.naour@smile.fr> Message-ID: <9a9b1138094021975bf0ef1a22485a37efeebc95.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > --- /dev/null > +++ b/board/ti/j721e-sk/post-build.sh > @@ -0,0 +1,16 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > + > +# u-boot is looking at /boot/dtb/ti for devicetree in the rootfs > +# partition while Buildroot install the kernel and its devicetree > +# in /boot (BR2_LINUX_KERNEL_INSTALL_TARGET enabled). > +# Enabling BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME allows to keep the > +# "ti" subdirectory but "dts" is still missing. > +# Make sure /boot/dtb/ti exist by creating a symlink in > +# ${TARGET_DIR}/boot > +# https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc?h=09.02.00.004#n13 > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/include/env/ti/mmc.env?ref_type=tags#L18 > +if [ -L ${TARGET_DIR}/boot/dtb ]; then > +??? rm ${TARGET_DIR}/boot/dtb > +??? ln -sf . ${TARGET_DIR}/boot/dtb > +fi the above script (with corrections) and... > --- /dev/null > +++ b/configs/ti_j721e_sk_defconfig > @@ -0,0 +1,51 @@ > +BR2_aarch64=y > +BR2_cortex_a72=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/j721e-sk/post-build.sh" ... the hook in config and BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y seem to be necessary for all boardswhere you update U-Boot to >=v2023.10, because of U-Boot commits 014e013e784f ("environment: ti: Make get_fdt_mmc common") and d8ea68da6bf1 ("environment: ti: Prefix ARM64 DTB names with directory"), which lead to /boot/dts/ti requirement for all TI boards. But it's unfortunately still not enough and SK-AM62B still falls back to BOOTP instead of MMC boot... -- Alexander Sverdlin. From bernd at kuhls.net Fri Feb 16 05:33:55 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 16 Feb 2024 06:33:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 24.0.1 Message-ID: <20240216053355.12317-1-bernd@kuhls.net> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000749.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 1d006dbc91..f46dcac224 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 24.0.0 +MESA3D_HEADERS_VERSION = 24.0.1 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 49b42e2132..0a7692a20f 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html -sha256 dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 mesa-24.0.0.tar.xz -sha512 9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15 mesa-24.0.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000749.html +sha256 f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613 mesa-24.0.1.tar.xz +sha512 1eaff5dcff8dd314b2dfe249d25db68d530d3f0fb54e926999768d0a48aa34b67c31ec3587bb2a7d1969845b26e79a4d87aceb7a141fd2e811ae0c47c00b0963 mesa-24.0.1.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 2d13f7336f..4c3476ec3d 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 24.0.0 +MESA3D_VERSION = 24.0.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.39.2 From bernd at kuhls.net Fri Feb 16 05:43:45 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 16 Feb 2024 06:43:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 20.6.1-Nexus Message-ID: <20240216054345.17403-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index c61c391825..286cff5cc4 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb21e185d1333a8696565138bc58df3d37970c9a3615193396e9f296a56a24c4 kodi-pvr-mythtv-20.5.10-Nexus.tar.gz +sha256 4c742a31ec6f4d2a427d05f70950cfd4e347cf1c0acdb1747c39eb68124be30a kodi-pvr-mythtv-20.6.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 66f1948741..312c8619be 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.5.10-Nexus +KODI_PVR_MYTHTV_VERSION = 20.6.1-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.39.2 From bernd at kuhls.net Fri Feb 16 05:53:43 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 16 Feb 2024 06:53:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.16 Message-ID: <20240216055343.24326-1-bernd@kuhls.net> Changelog: https://www.php.net/ChangeLog-8.php#8.2.16 Release notes: https://www.php.net/releases/8_2_16.php Updated license hash due to copyright year bump: https://github.com/php/php-src/commit/2575e6b88c3d3bbd53383fb65057c9b7b029e264 Signed-off-by: Bernd Kuhls --- package/php/php.hash | 4 ++-- package/php/php.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 7c8736e41c..4ce3616de3 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 php-8.2.15.tar.xz +sha256 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php-8.2.16.tar.xz # License file -sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE +sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c69abd5f31..4daf7f633d 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.15 +PHP_VERSION = 8.2.16 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES -- 2.39.2 From james.d.knight at live.com Fri Feb 16 05:57:57 2024 From: james.d.knight at live.com (James Knight) Date: Fri, 16 Feb 2024 00:57:57 -0500 Subject: [Buildroot] [PATCH 2/2] package/util-linux: adding cfdisk enablement comment In-Reply-To: <20240216055757.1588-1-james.d.knight@live.com> References: <20240216055757.1588-1-james.d.knight@live.com> Message-ID: This commit introduces a menu comment to users to indicate whether the `cfdisk` can be built, even when the basic set binaries option is enabled. For users wishing to support `fdisks` utilities (cfdisk, fdisk and sfdisk) in Buildroot, these utilities are enabled through a `BR2_PACKAGE_UTIL_LINUX_BINARIES` option. This option configures `all-programs`, which will default enable `fdisks` (along with other program options that do not have an explicit configuration). While a user can enable "all programs", there is no guarantee that the `cfdisk` utility will be built if neither ncurses or slang is enabled. Even if an explicit Buildroot menu option is added for `cfdisk` (where we can force select ncurses, if slang is not yet enabled), there is no specific configuration option in util-linux to toggle the enablement of `cfdisk` at this time. Signed-off-by: James Knight --- package/util-linux/Config.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 73fa11380e82fb42da170045e1c03cc3a5783637..e59072f039bf780df768bfa7e0d66fbb13ab743c 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -67,6 +67,14 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES The setarch utility also installs architecture-specific symlinks like linux32, linux64, uname26, i386 and x86_64. +if BR2_PACKAGE_UTIL_LINUX_BINARIES + +comment "cfdisk needs either ncurses or slang" + depends on !BR2_PACKAGE_NCURSES + depends on !BR2_PACKAGE_SLANG + +endif + config BR2_PACKAGE_UTIL_LINUX_AGETTY bool "agetty" depends on BR2_USE_MMU # fork() -- 2.40.1.windows.1 From james.d.knight at live.com Fri Feb 16 05:57:56 2024 From: james.d.knight at live.com (James Knight) Date: Fri, 16 Feb 2024 00:57:56 -0500 Subject: [Buildroot] [PATCH 1/2] package/util-linux: explicit slang dependency fallback for cfdisk Message-ID: The cfdisk utility (under `fdisks`; defaulted by `all-programs`) provides TUI capabilities from either using ncurses or slang. This package provides explicit configuration of enabling ncurses support, but not for slang. Updating the package to explicitly enable slang support if the slang package is available and we are not already using ncurses. Signed-off-by: James Knight --- package/util-linux/util-linux.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 72126adb005f8422a19ec303897b732f86dd22d2..8a162f179cf332b9d1bab8b42a5f6e6e652b2942 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -96,6 +96,14 @@ endif UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses endif +# if ncurses is not available for cfdisk, try to fallback onto slang +ifeq ($(BR2_PACKAGE_SLANG)x$(BR2_PACKAGE_NCURSES),yx) +UTIL_LINUX_DEPENDENCIES += slang +UTIL_LINUX_CONF_OPTS += --with-slang +else +UTIL_LINUX_CONF_OPTS += --without-slang +endif + # workaround for static_assert on uclibc-ng < 1.0.42 UTIL_LINUX_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -Dstatic_assert=_Static_assert" -- 2.40.1.windows.1 From buildroot at bubu1.eu Fri Feb 16 13:18:13 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Fri, 16 Feb 2024 14:18:13 +0100 Subject: [Buildroot] [PATCH 1/2] support/testing: remove hardcoded sleep from python-django test Message-ID: <20240216131815.318315-1-buildroot@bubu1.eu> Instead of waiting for a hardcoded time of 30s we check periodically every second if the server is already up. If it isn't up after the full timeout (which is the same as before) expired the test fails. We need to redirect all output of the background started task to /dev/null now as it otherwise confuses the emulator.run() exit code parsing logic (as it gets out of order messages from the emulator). Signed-off-by: Marcus Hoffmann --- .../tests/package/test_python_django.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py index e1ca50f6d8..0973467a2a 100644 --- a/support/testing/tests/package/test_python_django.py +++ b/support/testing/tests/package/test_python_django.py @@ -1,3 +1,5 @@ +import time + from tests.package.test_python import TestPythonPackageBase @@ -16,13 +18,17 @@ class TestPythonDjango(TestPythonPackageBase): self.assertIn("Operations to perform:", output[0]) self.assertEqual(exit_code, 0) - cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " - # give some time to setup the server - cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 > /dev/null 2>&1 & " self.assertRunOk(cmd, timeout=timeout) - - cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" - self.assertRunOk(cmd) + # give some time to setup the server + for attempt in range(30 * self.emulator.timeout_multiplier): + time.sleep(1) + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" + _, exit_code = self.emulator.run(cmd) + if exit_code == 0: + break + else: + self.assertTrue(False, "Timeout while waiting for django server") class TestPythonPy3Django(TestPythonDjango): -- 2.34.1 From buildroot at bubu1.eu Fri Feb 16 13:18:14 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Fri, 16 Feb 2024 14:18:14 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-whitenoise: new package In-Reply-To: <20240216131815.318315-1-buildroot@bubu1.eu> References: <20240216131815.318315-1-buildroot@bubu1.eu> Message-ID: <20240216131815.318315-2-buildroot@bubu1.eu> The test is using the django integration of whitenoise as it's the most common setup and allows to model the test case after the django one as well. The setup we need to do is a bit more complicated though and follows the whitenoise getting started documentation [1]. We then request a .css file from the django admin app that is enabled by default in template project. Due to running django's development server with --nostatic we ensure that static file handling is taken over by whitenoise. [1] https://whitenoise.readthedocs.io/en/stable/django.html Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/python-whitenoise/Config.in | 7 ++++ .../python-whitenoise/python-whitenoise.hash | 5 +++ .../python-whitenoise/python-whitenoise.mk | 14 +++++++ .../tests/package/test_python_django.py | 1 + .../tests/package/test_python_whitenoise.py | 41 +++++++++++++++++++ 6 files changed, 69 insertions(+) create mode 100644 package/python-whitenoise/Config.in create mode 100644 package/python-whitenoise/python-whitenoise.hash create mode 100644 package/python-whitenoise/python-whitenoise.mk create mode 100644 support/testing/tests/package/test_python_whitenoise.py diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..7180aaea63 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1417,6 +1417,7 @@ menu "External python modules" source "package/python-websocket-client/Config.in" source "package/python-websockets/Config.in" source "package/python-werkzeug/Config.in" + source "package/python-whitenoise/Config.in" source "package/python-whoosh/Config.in" source "package/python-wrapt/Config.in" source "package/python-ws4py/Config.in" diff --git a/package/python-whitenoise/Config.in b/package/python-whitenoise/Config.in new file mode 100644 index 0000000000..47df3ad5bf --- /dev/null +++ b/package/python-whitenoise/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_WHITENOISE + bool "python-whitenoise" + help + Radically simplified static file serving for WSGI + applications. + + https://github.com/evansd/whitenoise diff --git a/package/python-whitenoise/python-whitenoise.hash b/package/python-whitenoise/python-whitenoise.hash new file mode 100644 index 0000000000..4e239f4ab1 --- /dev/null +++ b/package/python-whitenoise/python-whitenoise.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/whitenoise/json +md5 4926cee7317ac12533549c08043ee322 whitenoise-6.6.0.tar.gz +sha256 8998f7370973447fac1e8ef6e8ded2c5209a7b1f67c1012866dbcd09681c3251 whitenoise-6.6.0.tar.gz +# Locally computed sha256 checksums +sha256 ebfd469b4fb6b5adada547747e1e8da725ecf20595d54aced043275d4f4a3600 LICENSE diff --git a/package/python-whitenoise/python-whitenoise.mk b/package/python-whitenoise/python-whitenoise.mk new file mode 100644 index 0000000000..a601157491 --- /dev/null +++ b/package/python-whitenoise/python-whitenoise.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-whitenoise +# +################################################################################ + +PYTHON_WHITENOISE_VERSION = 6.6.0 +PYTHON_WHITENOISE_SOURCE = whitenoise-$(PYTHON_WHITENOISE_VERSION).tar.gz +PYTHON_WHITENOISE_SITE = https://files.pythonhosted.org/packages/16/e3/adddb43cf8eb924e18eca677d4e40d47348566224b724cb8d1eaf6a48d1b +PYTHON_WHITENOISE_SETUP_TYPE = setuptools +PYTHON_WHITENOISE_LICENSE = MIT +PYTHON_WHITENOISE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py index 0973467a2a..ac1dc81359 100644 --- a/support/testing/tests/package/test_python_django.py +++ b/support/testing/tests/package/test_python_django.py @@ -36,6 +36,7 @@ class TestPythonPy3Django(TestPythonDjango): config = TestPythonDjango.config + \ """ BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON3_PY_PYC=y BR2_PACKAGE_PYTHON_DJANGO=y BR2_PACKAGE_PYTHON3_SQLITE=y """ diff --git a/support/testing/tests/package/test_python_whitenoise.py b/support/testing/tests/package/test_python_whitenoise.py new file mode 100644 index 0000000000..ff9bcf5ee7 --- /dev/null +++ b/support/testing/tests/package/test_python_whitenoise.py @@ -0,0 +1,41 @@ +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Whitenoise(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DJANGO=y + BR2_PACKAGE_PYTHON_WHITENOISE=y + BR2_PACKAGE_PYTHON3_SQLITE=y + """ + + def test_run(self): + self.login() + timeout = 35 + + cmd = "cd /opt && /usr/bin/django-admin startproject testsite" + self.assertRunOk(cmd, timeout=timeout) + # STATIC_ROOT needs to be set for 'collectstatic' to work. + self.emulator.run("echo 'STATIC_ROOT = BASE_DIR / \"staticfiles\"' >> /opt/testsite/testsite/settings.py") + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py collectstatic" + self.assertRunOk(cmd, timeout=timeout) + # whitenoise docs say it needs to be added directly after SecurityMiddleware, so we do this here with sed. + cmd = """sed -i -e /django.middleware.security.SecurityMiddleware/a\ \\"whitenoise.middleware.WhiteNoiseMiddleware\\", /opt/testsite/testsite/settings.py""" + self.assertRunOk(cmd, timeout=timeout) + # --nostatic ensures the builtin django server doesn't serve the static files, + # so we can test that whitenoise serves them + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver --nostatic 0.0.0.0:1234 > /dev/null 2>&1 & " + self.assertRunOk(cmd, timeout=timeout) + # give some time to setup the server + for attempt in range(30 * self.emulator.timeout_multiplier): + time.sleep(1) + cmd = "wget http://127.0.0.1:1234/static/admin/css/base.css" + _, exit_code = self.emulator.run(cmd) + if exit_code == 0: + break + else: + self.assertTrue(False, "Timeout while waiting for django server") -- 2.34.1 From buildroot at bubu1.eu Fri Feb 16 13:23:31 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Fri, 16 Feb 2024 14:23:31 +0100 Subject: [Buildroot] [PATCH 1/2] support/testing: remove hardcoded sleep from python-django test In-Reply-To: <20240216131815.318315-1-buildroot@bubu1.eu> References: <20240216131815.318315-1-buildroot@bubu1.eu> Message-ID: <10542b7e-f7d5-4197-ae19-ba94706c6595@bubu1.eu> On 16.02.24 14:18, Marcus Hoffmann via buildroot wrote: > Instead of waiting for a hardcoded time of 30s we check periodically every > second if the server is already up. If it isn't up after the full timeout > (which is the same as before) expired the test fails. > > We need to redirect all output of the background started task to > /dev/null now as it otherwise confuses the emulator.run() exit code > parsing logic (as it gets out of order messages from the emulator). > > Signed-off-by: Marcus Hoffmann > --- > .../tests/package/test_python_django.py | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py > index e1ca50f6d8..0973467a2a 100644 > --- a/support/testing/tests/package/test_python_django.py > +++ b/support/testing/tests/package/test_python_django.py > @@ -1,3 +1,5 @@ > +import time > + > from tests.package.test_python import TestPythonPackageBase > > > @@ -16,13 +18,17 @@ class TestPythonDjango(TestPythonPackageBase): > self.assertIn("Operations to perform:", output[0]) > self.assertEqual(exit_code, 0) > > - cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " > - # give some time to setup the server > - cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) > + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 > /dev/null 2>&1 & " > self.assertRunOk(cmd, timeout=timeout) > - > - cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" > - self.assertRunOk(cmd) > + # give some time to setup the server > + for attempt in range(30 * self.emulator.timeout_multiplier): > + time.sleep(1) > + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" > + _, exit_code = self.emulator.run(cmd) > + if exit_code == 0: > + break > + else: > + self.assertTrue(False, "Timeout while waiting for django server") > > > class TestPythonPy3Django(TestPythonDjango): The django test (and the whitenoise test introduced in the next patch) actually both currently fail because of a problem with django 5.0 and .pyc only installations. [1] This now has "release blocker" priority at django and a proposed patch (that I tested locally but hasn't been officially submitted to django yet) so hopefully this will be fixed with the next django point release in a couple of weeks. [1] https://code.djangoproject.com/ticket/35187 Marcus From fontaine.fabrice at gmail.com Fri Feb 16 18:14:15 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 16 Feb 2024 19:14:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/dash: fix static build Message-ID: <20240216181415.1188314-1-fontaine.fabrice@gmail.com> Drop -Wl,--fatal-warnings with --enable-static to avoid the following static build failure: configure:4778: checking for strtod configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c >&5 /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions collect2: error: ld returned 1 exit status [...] In file included from arith_yylex.c:44: system.h:74:22: error: static declaration of 'strtod' follows non-static declaration static inline double strtod(const char *nptr, char **endptr) ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c - http://autobuild.buildroot.org/results/a4287b86186bf0a1d5370cf53123b324ae65c1da Signed-off-by: Fabrice Fontaine --- ...-configure.ac-drop-Wl-fatal-warnings.patch | 45 +++++++++++++++++++ package/dash/dash.mk | 2 + 2 files changed, 47 insertions(+) create mode 100644 package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch diff --git a/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch b/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch new file mode 100644 index 0000000000..eaa5d6cc60 --- /dev/null +++ b/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch @@ -0,0 +1,45 @@ +From 7d07f683b83ef9fbdf258ce61b022b32f06f253a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Feb 2024 17:26:28 +0100 +Subject: [PATCH] configure.ac: drop -Wl,--fatal-warnings + +Drop -Wl,--fatal-warnings with --enable-static to avoid the following +static build failure: + +configure:4778: checking for strtod +configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c >&5 +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions +collect2: error: ld returned 1 exit status + +[...] + +In file included from arith_yylex.c:44: +system.h:74:22: error: static declaration of 'strtod' follows non-static declaration + static inline double strtod(const char *nptr, char **endptr) + ^~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c + +Signed-off-by: Fabrice Fontaine +Upstream: https://lore.kernel.org/dash/20240216163319.860768-1-fontaine.fabrice at gmail.com +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5524650..6993364 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,7 +34,7 @@ fi + AC_ARG_ENABLE(static, AS_HELP_STRING(--enable-static, \ + [Build statical linked program])) + if test "$enable_static" = "yes"; then +- export LDFLAGS="-static -Wl,--fatal-warnings" ++ export LDFLAGS="-static" + fi + + AC_ARG_ENABLE(fnmatch, AS_HELP_STRING(--disable-fnmatch, \ +-- +2.43.0 + diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 6efc71e568..aebfd28be8 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -8,6 +8,8 @@ DASH_VERSION = 0.5.11.5 DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c) DASH_LICENSE_FILES = COPYING +# We're patching configure.ac +DASH_AUTORECONF = YES # dash does not build in parallel DASH_MAKE = $(MAKE1) -- 2.43.0 From fontaine.fabrice at gmail.com Fri Feb 16 19:45:20 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 16 Feb 2024 20:45:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: deflate64 needs libzlib Message-ID: <20240216194520.1806313-1-fontaine.fabrice@gmail.com> deflate64 unconditionally uses FAR since its addition with https://github.com/OSGeo/gdal/commit/d6baebcc73ffc2ede6e9635846676b275b02bab3 resulting in the following build failure with zlib-ng since bump to version 3.8.2 in commit d2e349301b79ad3a1840083714ee396f4302b68a: In file included from /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/infback9.c:6: /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/minified_zutil.h:46:17: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'uchf' 46 | typedef uch FAR uchf; | ^~~~ Fixes: d2e349301b79ad3a1840083714ee396f4302b68a - http://autobuild.buildroot.org/results/8b55108dee4faa98c234d00a1a22b62ed948e8d3 Signed-off-by: Fabrice Fontaine --- package/gdal/gdal.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 3104332db9..247e13663c 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -124,6 +124,12 @@ else GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF endif +ifeq ($(BR2_PACKAGE_LIBZLIB),y) +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=ON +else +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON -- 2.43.0 From vineetg at rivosinc.com Fri Feb 16 20:09:33 2024 From: vineetg at rivosinc.com (Vineet Gupta) Date: Fri, 16 Feb 2024 12:09:33 -0800 Subject: [Buildroot] [PATCH v2] glibc: build: honor toplevel BR2_TARGET_OPTIMIZATION In-Reply-To: <2111ebed-d6b8-46d1-b109-9cd468be5ca0@mind.be> References: <20240214224355.551010-1-vineetg@rivosinc.com> <20240214230114.551779-1-vineetg@rivosinc.com> <2111ebed-d6b8-46d1-b109-9cd468be5ca0@mind.be> Message-ID: On 2/14/24 23:53, Arnout Vandecappelle wrote: > > On 15/02/2024 00:01, Vineet Gupta wrote: >> glibc though part of toolchain is technically target binary and thus >> needs to be built with BR2_TARGET_OPTIMIZATION in case users want to >> force a certain build toogle from top level. > BR2_TARGET_OPTIMIZATION is encoded in the toolchain wrapper, and as far as I > can see glibc is built with the toolchain wrapper... I haven't (re)tested it, > but it should be the case... Indeed the toggles are effectively being used in the build, even if not visible in the build logs, which is what tripped me up in the first place. And before sending the patch I did wonder how buildroot could have such an obvious deficiency for so long. In the past I've myself sent a few patches to defconfigs to affect such build toggles in first place ;-) ?? 2021-01-16 32113c8a25c0 configs/snps_archs38_hsdk_defconfig: use hard-float ? > BR2_TARGET_OPTIMIZATION was added to the wrapper in commit > b95e436ee0c9e4638dc79766da0d17927c6641ce in 2011. > > The wrapper was added to host-gcc-initial (which is used in the glibc build) > in commit 919c06c28295f19ca49459b98d8954148b381360 in 2015. I still think that an explicit comment such as below will help a poor lost soul of future going git grep. ----------> >From 5b82e169aa21916833b62fe5122c844cec62f486 Mon Sep 17 00:00:00 2001 From: Vineet Gupta Date: Fri, 16 Feb 2024 12:07:07 -0800 Subject: [PATCH] glibc: build: add comment about BR2_TARGET_OPTIMIZATION Signed-off-by: Vineet Gupta --- ?package/glibc/glibc.mk | 3 +++ ?1 file changed, 3 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d198d6f04cb2..facad0b29958 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -80,6 +80,9 @@ GLIBC_INSTALL_STAGING = YES ? ?GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install ? +# Note that BR2_TARGET_OPTIMIZATION toggles are implicitly passed +# here via the toolchain wrapper setup + ?# Thumb build is broken, build in ARM mode ?ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) ?GLIBC_EXTRA_CFLAGS += -marm -- From dannenberg at ti.com Fri Feb 16 20:13:01 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Fri, 16 Feb 2024 14:13:01 -0600 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> Message-ID: <20240216201301.ftcjsjgepmcvd3pm@dasso> On Thu, Feb 15, 2024 at 12:23:21PM +0100, Romain Naour wrote: > Hi Alexander, > > Le 15/02/2024 ? 11:13, Alexander Sverdlin a ?crit?: > > Hi Romain, > > > > On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: > >>> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > >>> > >>> This series start by adding U-boot binman support already submitted in the > >>> preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > >>> [1], with small improvements. > >>> See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > >>> > >>> With binman support, we can add the TI K3 j721e SoC support by > >>> providing all required firmware generated by the build. > >>> > >>> Add the new ti_j721e_sk_defconfig file to build a basic SD card image to > >>> boot the board (serial debug and ethernet working). > >>> > >>> Thanks to binman support, we can remove the ti-k3-image-gen tool from > >>> Buildroot. To do that, we have to update existing defconfig (am62, am64). > >>> > >>> Followup commits can improve TI K3 HS-FS devices based on binman instead > >>> of legacy core-secdev-k3 tool. > >>> > >>> [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html > >>> [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > >>> > >>> Best regards, > >>> Romain > > > > I have mixed feelings after testing the patchset on SK-AM62B... > > It doesn't quite boot, refer to the boot log [1]. > > Seems that U-Boot env is missing, maybe I'm missing some installation > > step, but I do not see it mentioned in the documetation (for instance > > of original commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig"). > > > > I'm not sure if this is a result of U-Boot update or if the current > > master is broken as well. I'll be retesting it today and will get back to > > you. > > It seems you are testing on a HS-FS device "AM62X SR1.0 HS-FS" while I only > runtime tested this series on a SK-TDA4VM (GP: general pupose). > > Also the ti_am62x_sk_defconfig is expecting a GP SoC so you may have to > customize the image generated in a post-build script? > > Maybe you have to replace the tiboot3.bin binary included by genimage with the > one for the HS-FS variant ? > > for j721e: > 285449 13 f?vr. 17:27 tiboot3.bin > 285449 13 f?vr. 17:27 tiboot3-j721e-gp-evm.bin > 286224 13 f?vr. 17:27 tiboot3-j721e_sr1_1-hs-evm.bin > 286224 13 f?vr. 17:27 tiboot3-j721e_sr2-hs-fs-evm.bin > > for am62x: > tiboot3.bin << should be the gp variant by default > tiboot3-am62x-gp-evm.bin > tiboot3-am62x-hs-fs-evm.bin > > Also, did you have the ti-k3-core-secdev package locally, it seems it's required > for HS-FS SoC but the package is currently missing: > > http://lists.busybox.net/pipermail/buildroot/2024-February/685383.html > > Is ti-k3-core-secdev really required fllowing the switch to binman? > (binman should sign all firmware binaries itself). We should see that we can remove/obsolete the ti-k3-core-secdev package alongside the ti-k3-image-gen package, those are no longer needed since we started using binman for the building the initial boot stage. -- Andreas Dannenberg Texas Instruments Inc > > > > > Fortunately this patchset is actually about building the images differently > > and this part actually went smoothly, which is good. > > Thank you for testing, it help a lot! > > Maybe something is missing in this series to handle HS-FS device properly. > > > > >>> Dario Binacchi (5): > >>> ? package/python-attrs: add host variant > >>> ? package/python-rpds-py: add host variant > >>> ? package/python-referencing: add host variant > >>> ? package/python-jsonschema-specifications: add host variant > >>> ? package/python-jsonschema: add host variant > >>> > >>> Romain Naour (16): > >>> ? DEVELOPERS: add Romain Naour for am574x_idk_defconfig > >>> ? configs/ti_am62x_sk_defconfig: fix optee-os plateform > >>> ? configs/ti_am64x_sk_defconfig: fix optee-os plateform > >>> ? boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > >>> ? boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > >>> ? boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to > >>> ??? BINARIES_DIR > >>> ? boot/ti-k3-boot-firmware: introduce > >>> ??? BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} > >>> ? boot/uboot: use DM firmware name defined by ti-k3-boot-firmware > >>> ??? package > >>> ? boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > >>> ? boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options > >>> ? boot/uboot: enable TI K3 Device Manager (DM) for j721e > >>> ? boot/ti-k3-boot-firmware: bump to version 09.02.00.004 > >>> ? configs/ti_j721e_sk_defconfig: new defconfig > >>> ? configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman > >>> ??? tool > >>> ? configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman > >>> ??? tool > >>> ? boot/ti-k3-image-gen: remove package > >>> > >>> ?Config.in.legacy????????????????????????????? |? 7 ++ > >>> ?DEVELOPERS??????????????????????????????????? |? 6 +- > >>> ?board/ti/j721e-sk/genimage.cfg??????????????? | 28 +++++++ > >>> ?board/ti/j721e-sk/post-build.sh?????????????? | 16 ++++ > >>> ?board/ti/j721e-sk/readme.txt????????????????? | 34 ++++++++ > >>> ?boot/Config.in??????????????????????????????? |? 1 - > >>> ?boot/ti-k3-boot-firmware/Config.in??????????? | 39 ++++++++++ > >>> ?.../ti-k3-boot-firmware.hash????????????????? |? 2 +- > >>> ?.../ti-k3-boot-firmware.mk??????????????????? | 16 ++-- > >>> ?boot/ti-k3-image-gen/Config.in??????????????? | 77 ------------------- > >>> ?boot/ti-k3-image-gen/ti-k3-image-gen.hash???? |? 3 - > >>> ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?????? | 54 ------------- > >>> ?boot/ti-k3-r5-loader/Config.in??????????????? |? 8 ++ > >>> ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk?????? | 23 ++++++ > >>> ?boot/uboot/Config.in????????????????????????? | 27 ++++--- > >>> ?boot/uboot/uboot.mk?????????????????????????? | 10 ++- > >>> ?configs/ti_am62x_sk_defconfig???????????????? | 14 ++-- > >>> ?configs/ti_am64x_sk_defconfig???????????????? | 14 ++-- > >>> ?...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- > >>> ?package/python-attrs/python-attrs.mk????????? |? 6 ++ > >>> ?.../python-jsonschema-specifications.mk?????? | 10 +++ > >>> ?.../python-jsonschema/python-jsonschema.mk??? | 14 ++++ > >>> ?.../python-referencing/python-referencing.mk? | 11 +++ > >>> ?package/python-rpds-py/python-rpds-py.mk????? |? 1 + > >>> ?24 files changed, 275 insertions(+), 180 deletions(-) > >>> ?create mode 100644 board/ti/j721e-sk/genimage.cfg > >>> ?create mode 100755 board/ti/j721e-sk/post-build.sh > >>> ?create mode 100644 board/ti/j721e-sk/readme.txt > >>> ?delete mode 100644 boot/ti-k3-image-gen/Config.in > >>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > >>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk > >>> ?copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) > >>> > >>> -- > >>> 2.43.0 > >>> > >>> _______________________________________________ > >>> buildroot mailing list > >>> buildroot at buildroot.org > >>> https://lists.buildroot.org/mailman/listinfo/buildroot > > > > 1. Boot log: > > > > U-Boot SPL 2024.01 (Feb 15 2024 - 01:42:12 +0100) > > SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > > SPL initial stack usage: 13400 bytes > > Trying to boot from MMC2 > > Authentication passed > > Authentication passed > > Authentication passed > > Authentication passed > > Authentication passed > > Starting ATF on ARM64 core... > > > > NOTICE: BL31: v2.10.0 (release):v2.10 > > NOTICE: BL31: Built : 01:28:38, Feb 15 2024 > > I/TC: > > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1198-g18ff6d2643)) #1 Thu Feb 15 00:28:27 UTC 2024 aarch64 > > I/TC: WARNING: This OP-TEE configuration might be insecure! > > I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html > > I/TC: Primary CPU initializing > > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > > I/TC: HUK Initialized > > I/TC: Activated SA2UL device > > I/TC: Enabled firewalls for SA2UL TRNG device > > I/TC: SA2UL TRNG initialized > > I/TC: SA2UL Drivers initialized > > I/TC: Primary CPU switching to normal world boot > > > > U-Boot SPL 2024.01 (Feb 15 2024 - 01:43:17 +0100) > > SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > > SPL initial stack usage: 1872 bytes > > Trying to boot from MMC2 > > Authentication passed > > Authentication passed > > > > > > U-Boot 2024.01 (Feb 15 2024 - 01:43:17 +0100) > > > > SoC: AM62X SR1.0 HS-FS > > Model: Texas Instruments AM625 SK > > DRAM: 2 GiB > > Core: 56 devices, 23 uclasses, devicetree: separate > > MMC: mmc at fa10000: 0, mmc at fa00000: 1 > > Loading Environment from nowhere... OK > > In: serial at 2800000 > > Out: serial at 2800000 > > Err: serial at 2800000 > > Net: eth0: ethernet at 8000000port@1 > > Hit any key to stop autoboot: 0 > > switch to partitions #0, OK > > mmc1 is current device > > SD/MMC found on device 1 > > Failed to load 'uEnv.txt' > > Can you access to the mmc1 content manually ? > I had to create a symlink due to "dtb" subdirectory expected by u-boot > u-boot is looking at /boot/dtb/ti for devicetree. > > Best regards, > Romain > > > > Scanning for bootflows in all bootdevs > > Seq Method State Uclass Part Name Filename > > --- ----------- ------ -------- ---- ------------------------ ---------------- > > Scanning global bootmeth 'efi_mgr': > > No EFI system partition > > No EFI system partition > > Failed to persist EFI variables > > Scanning bootdev 'mmc at fa00000.bootdev': > > Scanning bootdev 'mmc at fa10000.bootdev': > > Unknown uclass 'usb' in label > > link up on port 1, speed 100, full duplex > > BOOTP broadcast 1 > > BOOTP broadcast 2 > > BOOTP broadcast 3 > > BOOTP broadcast 4 > > BOOTP broadcast 5 > > BOOTP broadcast 6 > > BOOTP broadcast 7 > > BOOTP broadcast 8 > > BOOTP broadcast 9 > > BOOTP broadcast 10 > > BOOTP broadcast 11 > > BOOTP broadcast 12 > > BOOTP broadcast 13 > > BOOTP broadcast 14 > > BOOTP broadcast 15 > > BOOTP broadcast 16 > > BOOTP broadcast 17 > > > > Retry time exceeded; starting again > > > > > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From dannenberg at ti.com Fri Feb 16 20:06:35 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Fri, 16 Feb 2024 14:06:35 -0600 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> Message-ID: <20240216200635.crek5j23p3hybg2p@dasso> On Thu, Feb 15, 2024 at 11:20:50AM +0100, Alexander Sverdlin wrote: > Hi Romain, > > On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > > -choice > > - prompt "Security type" > > - help > > - ? The target SoC security type option for image gen.? Valid > > - ? options are "gp" for General Purpose devices, "hs-fs" for > > - ? High Security - Field Securable devices, or "hs" for High > > - ? Security - Security Enforcing devices.? Note for all High > > - ? Security device variants the TI_SECURE_DEV_PKG environmental > > - ? variable must be defined at build time pointing to a valid > > - ? core-secdev-k3 folder location, otherwise the build will > > - ? fail, see > > - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > - bool "gp" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > - bool "hs-fs" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > - bool "hs" > > - > > -endchoice > > another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > was the default, which didn't boot on my HS-FS SoC. > > You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the > default for AM62x. I'm not sure if this is a problem, though. HS-FS should be the default for all TI AM6x devices. This is our "production silicon" and what's used for (almost) all projects, especially new projects. This being said having support for GP device variants still is desirable for existing boards/projects, such as the current BeaglePlay boards (amongst earlier version of TI starter kit EVMs for AM6x). -- Andreas Dannenberg Texas Instruments Inc > > -- > Alexander Sverdlin. > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Fri Feb 16 20:59:04 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 16 Feb 2024 21:59:04 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump version to 3.98 Message-ID: <20240216205904.242339-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index fdfe9773d2..51701724ed 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_97_RTM/src/SHA256SUMS -sha256 078efb8393f32e40b1fb4bf6930fff7f1aabed01287fcc5fe58aba736765fa0a nss-3.97.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_98_RTM/src/SHA256SUMS +sha256 f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce nss-3.98.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 60a33456b0..90e66ca885 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.97 +LIBNSS_VERSION = 3.98 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 -- 2.34.1 From giulio.benetti at benettiengineering.com Fri Feb 16 21:13:21 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 16 Feb 2024 22:13:21 +0100 Subject: [Buildroot] [PATCH] package/libnvme: bump to version 1.8 Message-ID: <20240216211321.470283-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libnvme/libnvme.hash | 2 +- package/libnvme/libnvme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnvme/libnvme.hash b/package/libnvme/libnvme.hash index 69963578cd..469006d632 100644 --- a/package/libnvme/libnvme.hash +++ b/package/libnvme/libnvme.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 e9c3ad59c068788faf0f0af4296f92f8ce410d12749f0f35a541d6a21e630393 libnvme-1.7.1.tar.gz +sha256 d59939a280eec41eb7a716e1681d0d0c612099385204ffb55d07134a6be08d75 libnvme-1.8.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnvme/libnvme.mk b/package/libnvme/libnvme.mk index 813f7279e8..bf131d2a38 100644 --- a/package/libnvme/libnvme.mk +++ b/package/libnvme/libnvme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNVME_VERSION = 1.7.1 +LIBNVME_VERSION = 1.8 LIBNVME_SITE = $(call github,linux-nvme,libnvme,v$(LIBNVME_VERSION)) LIBNVME_LICENSE = LGPL-2.1 LIBNVME_LICENSE_FILES = COPYING -- 2.34.1 From raphael.melotte at mind.be Fri Feb 16 21:13:38 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:38 +0100 Subject: [Buildroot] [PATCH 0/5] package/python-pymupdf: bump to version 1.23.22 Message-ID: <20240216211344.1807353-1-raphael.melotte@mind.be> Hello, This series builds on the following series from James to update python-pymupdf: https://patchwork.ozlabs.org/project/buildroot/list/?series=389751&state=* Note that patch 1 fixes an issue that was present before the version bumps, so it could be applied separately or backported. Patch 3 could potentially be backported as well, but I did not test it with any other mupdf or python-pymupdf version. Kind regards, Rapha?l James Hilliard (2): package/mupdf: bump to version 1.23.9 package/python-pymupdf: bump to version 1.23.22 Rapha?l M?lotte (3): package: python-pymupdf: add missing python-zlib dependency support/testing: add new test for python-pymupdf package/mupdf: fix building shared libraries DEVELOPERS | 2 + ...issing-limits.h-include-for-UINT_MAX.patch | 70 ---------- package/mupdf/Config.in | 4 + package/mupdf/mupdf.hash | 4 +- package/mupdf/mupdf.mk | 9 +- ...w-providing-python-config-externally.patch | 125 ++++++++++++++++++ package/python-pymupdf/Config.in | 3 +- package/python-pymupdf/python-pymupdf.hash | 4 +- package/python-pymupdf/python-pymupdf.mk | 31 ++--- .../tests/package/sample_python_pymupdf.py | 17 +++ .../tests/package/test_python_pymupdf.py | 26 ++++ 11 files changed, 203 insertions(+), 92 deletions(-) delete mode 100644 package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch create mode 100644 package/python-pymupdf/0001-pipcl.py-allow-providing-python-config-externally.patch create mode 100644 support/testing/tests/package/sample_python_pymupdf.py create mode 100644 support/testing/tests/package/test_python_pymupdf.py -- 2.37.3 From raphael.melotte at mind.be Fri Feb 16 21:13:39 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:39 +0100 Subject: [Buildroot] [PATCH 1/5] package: python-pymupdf: add missing python-zlib dependency In-Reply-To: <20240216211344.1807353-1-raphael.melotte@mind.be> References: <20240216211344.1807353-1-raphael.melotte@mind.be> Message-ID: <20240216211344.1807353-2-raphael.melotte@mind.be> It turns out that python-pymupdf doesn't require zlib directly, but it does require the zlib python module. This fixes the following runtime error: Traceback (most recent call last): File "", line 1, in File "/usr/lib/python3.11/site-packages/fitz/__init__.py", line 22, in File "/usr/lib/python3.11/site-packages/fitz/fitz.py", line 3402, in File "/usr/lib/python3.11/gzip.py", line 9, in ModuleNotFoundError: No module named 'zlib' Signed-off-by: Rapha?l M?lotte --- package/python-pymupdf/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index ecaa5496b5..3831a25451 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF select BR2_PACKAGE_HOST_SWIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF - select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Python bindings for the PDF rendering library MuPDF. -- 2.37.3 From raphael.melotte at mind.be Fri Feb 16 21:13:40 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:40 +0100 Subject: [Buildroot] [PATCH 2/5] support/testing: add new test for python-pymupdf In-Reply-To: <20240216211344.1807353-1-raphael.melotte@mind.be> References: <20240216211344.1807353-1-raphael.melotte@mind.be> Message-ID: <20240216211344.1807353-3-raphael.melotte@mind.be> To give us a chance to catch runtime issues (such as missing dependencies) more easily, add a test that writes a sample PDF file, read it back and verify the text that was read. Like similar packages that lead to a big rootfs (e.g. python-botocore), this test requires a separate ext2 rootfs to avoid filling the default amount of RAM available entirely (which would cause missing files from the root filesystem and in turn, test failures). Signed-off-by: Rapha?l M?lotte --- DEVELOPERS | 2 ++ .../tests/package/sample_python_pymupdf.py | 17 ++++++++++++ .../tests/package/test_python_pymupdf.py | 26 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 support/testing/tests/package/sample_python_pymupdf.py create mode 100644 support/testing/tests/package/test_python_pymupdf.py diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..085f2fa234 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2599,9 +2599,11 @@ F: package/python-pymupdf/ F: package/python-rsa/ F: package/python-s3transfer/ F: support/testing/tests/package/sample_python_jmespath.py +F: support/testing/tests/package/sample_python_pymupdf.py F: support/testing/tests/package/sample_python_rsa.py F: support/testing/tests/package/sample_python_s3transfer.py F: support/testing/tests/package/test_python_jmespath.py +F: support/testing/tests/package/test_python_pymupdf.py F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py diff --git a/support/testing/tests/package/sample_python_pymupdf.py b/support/testing/tests/package/sample_python_pymupdf.py new file mode 100644 index 0000000000..574bd27965 --- /dev/null +++ b/support/testing/tests/package/sample_python_pymupdf.py @@ -0,0 +1,17 @@ +import fitz + +# Write a test PDF file +outfile = "python-pymupdf.pdf" +sample_text = "This is a test page for python-pymupdf." +doc = fitz.open() +page = doc.new_page() +p = fitz.Point(50, 72) +page.insert_text(p, sample_text) +doc.save(outfile) + +# Read back the file +with fitz.open(outfile) as d: # open document + read_text = chr(12).join([page.get_text() for page in d]) + +print(read_text) +assert(read_text == sample_text + "\n") diff --git a/support/testing/tests/package/test_python_pymupdf.py b/support/testing/tests/package/test_python_pymupdf.py new file mode 100644 index 0000000000..5e9d5a6912 --- /dev/null +++ b/support/testing/tests/package/test_python_pymupdf.py @@ -0,0 +1,26 @@ +import os +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3PyMuPDF(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYMUPDF=y + BR2_PACKAGE_XORG7=y + BR2_USE_WCHAR=y + BR2_INSTALL_LIBSTDCPP=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="250M" + """ + sample_scripts = ["tests/package/sample_python_pymupdf.py"] + timeout = 30 + + def login(self): + ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], + kernel_cmdline=["rootwait", "root=/dev/sda"]) + self.emulator.login() -- 2.37.3 From raphael.melotte at mind.be Fri Feb 16 21:13:41 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:41 +0100 Subject: [Buildroot] [PATCH 3/5] package/mupdf: fix building shared libraries In-Reply-To: <20240216211344.1807353-1-raphael.melotte@mind.be> References: <20240216211344.1807353-1-raphael.melotte@mind.be> Message-ID: <20240216211344.1807353-4-raphael.melotte@mind.be> By default mupdf generates static libraries, shared libraries must be enabled explicitely. The Makefile doesn't make it possible to build both static and shared libs, so add a 'depends on' accordingly. Signed-off-by: Rapha?l M?lotte --- package/mupdf/Config.in | 4 ++++ package/mupdf/mupdf.mk | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/package/mupdf/Config.in b/package/mupdf/Config.in index cf97711160..092e1d8ac6 100644 --- a/package/mupdf/Config.in +++ b/package/mupdf/Config.in @@ -1,9 +1,13 @@ +comment "MuPDF can build static or shared libs, but not both at the same time." + depends on BR2_SHARED_STATIC_LIBS + config BR2_PACKAGE_MUPDF bool "mupdf" depends on BR2_INSTALL_LIBSTDCPP # harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz depends on BR2_PACKAGE_XORG7 + depends on !BR2_SHARED_STATIC_LIBS select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_GUMBO_PARSER select BR2_PACKAGE_HARFBUZZ diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 08894d7980..d2105497be 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -50,6 +50,11 @@ MUPDF_MAKE_OPTS = \ HAVE_OBJCOPY=no \ prefix="/usr" +# The default in MuPDF is static libs +ifeq ($(BR2_SHARED_LIBS),y) +MUPDF_MAKE_OPTS += shared=yes +endif + ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MUPDF_DEPENDENCIES += libfreeglut else -- 2.37.3 From raphael.melotte at mind.be Fri Feb 16 21:13:42 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:42 +0100 Subject: [Buildroot] [PATCH 4/5] package/mupdf: bump to version 1.23.9 In-Reply-To: <20240216211344.1807353-1-raphael.melotte@mind.be> References: <20240216211344.1807353-1-raphael.melotte@mind.be> Message-ID: <20240216211344.1807353-5-raphael.melotte@mind.be> From: James Hilliard Drop patch which is now upstream. Signed-off-by: James Hilliard [bump to 1.23.9] Signed-off-by: Rapha?l M?lotte --- ...issing-limits.h-include-for-UINT_MAX.patch | 70 ------------------- package/mupdf/mupdf.hash | 4 +- package/mupdf/mupdf.mk | 2 +- 3 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch diff --git a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch deleted file mode 100644 index 95f2f86666..0000000000 --- a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch +++ /dev/null @@ -1,70 +0,0 @@ -From ebce9f1b129ebc8f2b17afa02a4ffcb9453c11d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= -Date: Mon, 24 Apr 2023 17:27:35 +0200 -Subject: [PATCH] Add missing limits.h include for UINT_MAX -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -encode-basic.c uses 'UINT_MAX', which is available in the 'limits.h' -header. - -In some configurations that build with zlib from [1], by chance -limits.h gets indirectly included when including 'z-imp.h' (the -includes are: 'z-imp.h' -> 'zlib.h' -> 'zconf.h' -> 'limits.h'), so -the build succeeds. - -When using other zlib implementations however (for example from [2]), -limits.h is not necessarily included indirectly, which leads to the -build failing in the following way: - -source/fitz/encode-basic.c: In function 'deflate_write': -source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function) - 343 | newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n); - | ^~~~~~~~ -source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header ''; did you forget to '#include '? - -Add the missing include, so that the build succeeds no matter if zlib -indirectly includes 'limit.h' or not. - -Similarly, also add it in output-ps.c where it's also missing. - -[1]: https://zlib.net/ -[2]: https://github.com/zlib-ng/zlib-ng - -Signed-off-by: Rapha?l M?lotte -Upstream: https://bugs.ghostscript.com/show_bug.cgi?id=706667 ---- - source/fitz/encode-basic.c | 2 ++ - source/fitz/output-ps.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/source/fitz/encode-basic.c b/source/fitz/encode-basic.c -index 03a4ff76b..84f0c35e6 100644 ---- a/source/fitz/encode-basic.c -+++ b/source/fitz/encode-basic.c -@@ -24,6 +24,8 @@ - - #include "z-imp.h" - -+#include -+ - struct ahx - { - fz_output *chain; -diff --git a/source/fitz/output-ps.c b/source/fitz/output-ps.c -index ef22c3cd6..3dc8ea17d 100644 ---- a/source/fitz/output-ps.c -+++ b/source/fitz/output-ps.c -@@ -24,6 +24,8 @@ - - #include "z-imp.h" - -+#include -+ - typedef struct ps_band_writer_s - { - fz_band_writer super; --- -2.39.1 - diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash index 1f636097ed..580235eeca 100644 --- a/package/mupdf/mupdf.hash +++ b/package/mupdf/mupdf.hash @@ -1,8 +1,8 @@ # From https://mupdf.com/downloads/index.html: -sha1 b9907729d604f0bf3846b45cd5891e10d7a66e24 mupdf-1.22.0-source.tar.lz +sha1 d79600bccd70ab9d0e8ee19dae4e275f2af95ced mupdf-1.23.9-source.tar.lz # Locally computed: -sha256 bed78a0abf8496b30c523497292de979db633eca57e02f6cd0f3c7c042551c3e mupdf-1.22.0-source.tar.lz +sha256 2c2f89deb9f425ba637dac226191d547f2b40975c4d21a340965f52c001e15c5 mupdf-1.23.9-source.tar.lz # Hash for license files: sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index d2105497be..17bd4320b9 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -5,7 +5,7 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -MUPDF_VERSION = 1.22.0 +MUPDF_VERSION = 1.23.9 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive MUPDF_LICENSE = AGPL-3.0+ -- 2.37.3 From raphael.melotte at mind.be Fri Feb 16 21:13:43 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:43 +0100 Subject: [Buildroot] [PATCH 5/5] package/python-pymupdf: bump to version 1.23.22 In-Reply-To: <20240216211344.1807353-1-raphael.melotte@mind.be> References: <20240216211344.1807353-1-raphael.melotte@mind.be> Message-ID: <20240216211344.1807353-6-raphael.melotte@mind.be> From: James Hilliard The python-pymupdf and mupdf packages do not follow the exact same version numbers anymore. There is no specific mention of version compatibilities in the upstream package, so update our comment to just say that both should be "compatible" (to try to avoid one being updated without the other). Migrate to in tree pep517 based build backend. The hardcoded paths we used to remove from setup.py are no longer present, so the post-patch hook is removed. The new setup.py instead uses new environment variables which we now provide. The dependencies provided in the pyproject.toml are either not needed for us (for example, psutil is only needed to run one of the tests which we don't run), or are host dependencies already installed by buildroot (e.g. swig). Since the pep517 backend will check for them and fail, skip them all. This new python-pymupdf version fails at runtime when mupdf builds static libraries. This should not be possible as xorg anyway depends on !BR2_STATIC_LIBS, but let's be explicit and forbid python-pymupdf to be built with BR2_STATIC_LIBS as well. Note also that python-pymupdf is gradually switching to a new implementation that requires mupdf to be built with python bindings. For now, both implementations are still available but we only compile the old one. The runtime test is adapted accordingly as the legacy implementation has to be imported with "fitz_old". While at it, the dependencies are also split to one per line to make them easier to diff in the future. Signed-off-by: James Hilliard [Rapha?l: - fix cross-compilation - remove unneeded dependencies - update to 1.23.22 - update the commit message ] Signed-off-by: Rapha?l M?lotte --- package/mupdf/mupdf.mk | 2 +- ...w-providing-python-config-externally.patch | 125 ++++++++++++++++++ package/python-pymupdf/Config.in | 1 + package/python-pymupdf/python-pymupdf.hash | 4 +- package/python-pymupdf/python-pymupdf.mk | 31 ++--- .../tests/package/sample_python_pymupdf.py | 2 +- 6 files changed, 146 insertions(+), 19 deletions(-) create mode 100644 package/python-pymupdf/0001-pipcl.py-allow-providing-python-config-externally.patch diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 17bd4320b9..edc5bf7d3f 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -4,7 +4,7 @@ # ################################################################################ -# python-pymupdf's version must match mupdf's version +# python-pymupdf's version be compatible with mupdf's version MUPDF_VERSION = 1.23.9 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive diff --git a/package/python-pymupdf/0001-pipcl.py-allow-providing-python-config-externally.patch b/package/python-pymupdf/0001-pipcl.py-allow-providing-python-config-externally.patch new file mode 100644 index 0000000000..2fd72c711e --- /dev/null +++ b/package/python-pymupdf/0001-pipcl.py-allow-providing-python-config-externally.patch @@ -0,0 +1,125 @@ +From ca3417b8d605ccdb2e6c516c5e0c79180381627c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Sun, 4 Feb 2024 16:13:45 +0100 +Subject: [PATCH] pipcl.py: allow providing python-config externally +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When cross-compiling (e.g. using Buildroot), the python-config +executable that resides next to the host python executable provides +incorrect includes (the ones for the host). + +Since the correct path to python-config cannot be guessed, add an +additional environment variable to allow setting the path to the +correct python-config executable externally. + +Signed-off-by: Rapha?l M?lotte +Upstream: https://github.com/pymupdf/PyMuPDF/pull/3173 +--- + pipcl.py | 72 +++++++++++++++++++++++++++++--------------------------- + setup.py | 3 +++ + 2 files changed, 40 insertions(+), 35 deletions(-) + +diff --git a/pipcl.py b/pipcl.py +index 209f660..c154774 100644 +--- a/pipcl.py ++++ b/pipcl.py +@@ -1789,43 +1789,45 @@ class PythonFlags: + self.ldflags = f'-L {_lib_dir}' + + else: +- # We use python-config which appears to work better than pkg-config +- # because it copes with multiple installed python's, e.g. +- # manylinux_2014's /opt/python/cp*-cp*/bin/python*. +- # +- # But... on non-macos it seems that we should not attempt to specify +- # libpython on the link command. The manylinux docker containers +- # don't actually contain libpython.so, and it seems that this +- # deliberate. And the link command runs ok. +- # +- python_exe = os.path.realpath( sys.executable) +- if darwin(): +- # Basic install of dev tools with `xcode-select --install` doesn't +- # seem to provide a `python3-config` or similar, but there is a +- # `python-config.py` accessible via sysconfig. ++ python_config = os.environ.get("PYMUPDF_PYTHON_CONFIG") ++ if not python_config: ++ # We use python-config which appears to work better than pkg-config ++ # because it copes with multiple installed python's, e.g. ++ # manylinux_2014's /opt/python/cp*-cp*/bin/python*. + # +- # We try different possibilities and use the last one that +- # works. ++ # But... on non-macos it seems that we should not attempt to specify ++ # libpython on the link command. The manylinux docker containers ++ # don't actually contain libpython.so, and it seems that this ++ # deliberate. And the link command runs ok. + # +- python_config = None +- for pc in ( +- f'python3-config', +- f'{sys.executable} {sysconfig.get_config_var("srcdir")}/python-config.py', +- f'{python_exe}-config', +- ): +- e = subprocess.run( +- f'{pc} --includes', +- shell=1, +- stdout=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- check=0, +- ).returncode +- log1(f'{e=} from {pc!r}.') +- if e == 0: +- python_config = pc +- assert python_config, f'Cannot find python-config' +- else: +- python_config = f'{python_exe}-config' ++ python_exe = os.path.realpath( sys.executable) ++ if darwin(): ++ # Basic install of dev tools with `xcode-select --install` doesn't ++ # seem to provide a `python3-config` or similar, but there is a ++ # `python-config.py` accessible via sysconfig. ++ # ++ # We try different possibilities and use the last one that ++ # works. ++ # ++ python_config = None ++ for pc in ( ++ f'python3-config', ++ f'{sys.executable} {sysconfig.get_config_var("srcdir")}/python-config.py', ++ f'{python_exe}-config', ++ ): ++ e = subprocess.run( ++ f'{pc} --includes', ++ shell=1, ++ stdout=subprocess.DEVNULL, ++ stderr=subprocess.DEVNULL, ++ check=0, ++ ).returncode ++ log1(f'{e=} from {pc!r}.') ++ if e == 0: ++ python_config = pc ++ assert python_config, f'Cannot find python-config' ++ else: ++ python_config = f'{python_exe}-config' + log1(f'Using {python_config=}.') + try: + self.includes = run( f'{python_config} --includes', capture=1).strip() +diff --git a/setup.py b/setup.py +index 23a5c78..4b3b5c7 100755 +--- a/setup.py ++++ b/setup.py +@@ -36,6 +36,9 @@ Environmental variables: + PYMUPDF_MUPDF_LIB + Directory containing MuPDF libraries, (libmupdf.so, + libmupdfcpp.so). ++ ++ PYMUPDF_PYTHON_CONFIG ++ Optional path to python-config. + + PYMUPDF_SETUP_IMPLEMENTATIONS + Must be one of 'a', 'b', 'ab'. If unset we use 'ab'. +-- +2.41.0 + diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index 3831a25451..cfdd38ebe4 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz depends on BR2_PACKAGE_XORG7 + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_HOST_SWIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash index 9fd8150088..341366d46f 100644 --- a/package/python-pymupdf/python-pymupdf.hash +++ b/package/python-pymupdf/python-pymupdf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymupdf/json -md5 468fe56375a1fca99e83fe0aa0b9f8bd PyMuPDF-1.22.0.tar.gz -sha256 6e1694e5c0cd8b92d503a506ee8e4ba1bed768528de586889d3ec90e9dc4a7d3 PyMuPDF-1.22.0.tar.gz +md5 5c219a0c4cb3d57b60e39cc901ebd220 PyMuPDF-1.23.22.tar.gz +sha256 c41cd91d83696cea67a4b6c65cc1951c2019ac0a561c5a3f543318ede30d3cd0 PyMuPDF-1.23.22.tar.gz # Locally computed sha256 checksums sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 639ce0e00e..0b26c925ea 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -4,26 +4,27 @@ # ################################################################################ -# python-pymupdf's version must match mupdf's version -PYTHON_PYMUPDF_VERSION = 1.22.0 +# python-pymupdf's version be compatible with mupdf's version +PYTHON_PYMUPDF_VERSION = 1.23.22 PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/28/ba/d6bb6fd678e8396d7b944870286fb25fd6f499b8cb599b5436c8f725adbf -PYTHON_PYMUPDF_SETUP_TYPE = setuptools +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/05/20/a0d1221d8f379afcc12b4d1687a8f4adb69eef659e835d781c3fa331ff46 +PYTHON_PYMUPDF_SETUP_TYPE = pep517 PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING # No license file included in pip, but it's present on github -PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib +PYTHON_PYMUPDF_DEPENDENCIES = \ + freetype \ + host-python-setuptools \ + host-swig \ + mupdf -PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" +PYTHON_PYMUPDF_BUILD_OPTS = --skip-dependency-check -# We need to remove the original paths as we provide them in the CFLAGS: -define PYTHON_PYMUPDF_REMOVE_PATHS - sed -i "/\/usr\/include\/mupdf/d" $(@D)/setup.py - sed -i "/\/usr\/include\/freetype2/d" $(@D)/setup.py - sed -i "/\/usr\/local\/include\/mupdf/d" $(@D)/setup.py - sed -i "/mupdf\/thirdparty\/freetype\/include/d" $(@D)/setup.py -endef - -PYTHON_PYMUPDF_POST_PATCH_HOOKS = PYTHON_PYMUPDF_REMOVE_PATHS +PYTHON_PYMUPDF_ENV = \ + PYMUPDF_INCLUDES="$(STAGING_DIR)/usr/include/freetype2:$(STAGING_DIR)/usr/include" \ + PYMUPDF_MUPDF_LIB="$(STAGING_DIR)/usr/lib" \ + PYMUPDF_PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config" \ + PYMUPDF_SETUP_IMPLEMENTATIONS=a \ + PYMUPDF_SETUP_MUPDF_BUILD= $(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_pymupdf.py b/support/testing/tests/package/sample_python_pymupdf.py index 574bd27965..ffcbfa1140 100644 --- a/support/testing/tests/package/sample_python_pymupdf.py +++ b/support/testing/tests/package/sample_python_pymupdf.py @@ -1,4 +1,4 @@ -import fitz +import fitz_old as fitz # Write a test PDF file outfile = "python-pymupdf.pdf" -- 2.37.3 From romain.naour at smile.fr Fri Feb 16 21:17:19 2024 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 16 Feb 2024 22:17:19 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <20240216201301.ftcjsjgepmcvd3pm@dasso> References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> <20240216201301.ftcjsjgepmcvd3pm@dasso> Message-ID: <721fd223-5b9e-4c71-9dd5-be7d850fd3fb@smile.fr> Hello Andreas, Le 16/02/2024 ? 21:13, Andreas Dannenberg a ?crit?: > On Thu, Feb 15, 2024 at 12:23:21PM +0100, Romain Naour wrote: >> Hi Alexander, >> >> Le 15/02/2024 ? 11:13, Alexander Sverdlin a ?crit?: >>> Hi Romain, >>> >>> On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: >>>>> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. >>>>> >>>>> This series start by adding U-boot binman support already submitted in the >>>>> preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi >>>>> [1], with small improvements. >>>>> See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] >>>>> >>>>> With binman support, we can add the TI K3 j721e SoC support by >>>>> providing all required firmware generated by the build. >>>>> >>>>> Add the new ti_j721e_sk_defconfig file to build a basic SD card image to >>>>> boot the board (serial debug and ethernet working). >>>>> >>>>> Thanks to binman support, we can remove the ti-k3-image-gen tool from >>>>> Buildroot. To do that, we have to update existing defconfig (am62, am64). >>>>> >>>>> Followup commits can improve TI K3 HS-FS devices based on binman instead >>>>> of legacy core-secdev-k3 tool. >>>>> >>>>> [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html >>>>> [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf >>>>> >>>>> Best regards, >>>>> Romain >>> >>> I have mixed feelings after testing the patchset on SK-AM62B... >>> It doesn't quite boot, refer to the boot log [1]. >>> Seems that U-Boot env is missing, maybe I'm missing some installation >>> step, but I do not see it mentioned in the documetation (for instance >>> of original commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig"). >>> >>> I'm not sure if this is a result of U-Boot update or if the current >>> master is broken as well. I'll be retesting it today and will get back to >>> you. >> >> It seems you are testing on a HS-FS device "AM62X SR1.0 HS-FS" while I only >> runtime tested this series on a SK-TDA4VM (GP: general pupose). >> >> Also the ti_am62x_sk_defconfig is expecting a GP SoC so you may have to >> customize the image generated in a post-build script? >> >> Maybe you have to replace the tiboot3.bin binary included by genimage with the >> one for the HS-FS variant ? >> >> for j721e: >> 285449 13 f?vr. 17:27 tiboot3.bin >> 285449 13 f?vr. 17:27 tiboot3-j721e-gp-evm.bin >> 286224 13 f?vr. 17:27 tiboot3-j721e_sr1_1-hs-evm.bin >> 286224 13 f?vr. 17:27 tiboot3-j721e_sr2-hs-fs-evm.bin >> >> for am62x: >> tiboot3.bin << should be the gp variant by default >> tiboot3-am62x-gp-evm.bin >> tiboot3-am62x-hs-fs-evm.bin >> >> Also, did you have the ti-k3-core-secdev package locally, it seems it's required >> for HS-FS SoC but the package is currently missing: >> >> http://lists.busybox.net/pipermail/buildroot/2024-February/685383.html >> >> Is ti-k3-core-secdev really required fllowing the switch to binman? >> (binman should sign all firmware binaries itself). > > We should see that we can remove/obsolete the ti-k3-core-secdev package > alongside the ti-k3-image-gen package, those are no longer needed since > we started using binman for the building the initial boot stage. Thank you for the clarification. Best regards, Romain > > -- > Andreas Dannenberg > Texas Instruments Inc > >> >>> >>> Fortunately this patchset is actually about building the images differently >>> and this part actually went smoothly, which is good. >> >> Thank you for testing, it help a lot! >> >> Maybe something is missing in this series to handle HS-FS device properly. >> >>> >>>>> Dario Binacchi (5): >>>>> ? package/python-attrs: add host variant >>>>> ? package/python-rpds-py: add host variant >>>>> ? package/python-referencing: add host variant >>>>> ? package/python-jsonschema-specifications: add host variant >>>>> ? package/python-jsonschema: add host variant >>>>> >>>>> Romain Naour (16): >>>>> ? DEVELOPERS: add Romain Naour for am574x_idk_defconfig >>>>> ? configs/ti_am62x_sk_defconfig: fix optee-os plateform >>>>> ? configs/ti_am64x_sk_defconfig: fix optee-os plateform >>>>> ? boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option >>>>> ? boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >>>>> ? boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to >>>>> ??? BINARIES_DIR >>>>> ? boot/ti-k3-boot-firmware: introduce >>>>> ??? BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} >>>>> ? boot/uboot: use DM firmware name defined by ti-k3-boot-firmware >>>>> ??? package >>>>> ? boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E >>>>> ? boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options >>>>> ? boot/uboot: enable TI K3 Device Manager (DM) for j721e >>>>> ? boot/ti-k3-boot-firmware: bump to version 09.02.00.004 >>>>> ? configs/ti_j721e_sk_defconfig: new defconfig >>>>> ? configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman >>>>> ??? tool >>>>> ? configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman >>>>> ??? tool >>>>> ? boot/ti-k3-image-gen: remove package >>>>> >>>>> ?Config.in.legacy????????????????????????????? |? 7 ++ >>>>> ?DEVELOPERS??????????????????????????????????? |? 6 +- >>>>> ?board/ti/j721e-sk/genimage.cfg??????????????? | 28 +++++++ >>>>> ?board/ti/j721e-sk/post-build.sh?????????????? | 16 ++++ >>>>> ?board/ti/j721e-sk/readme.txt????????????????? | 34 ++++++++ >>>>> ?boot/Config.in??????????????????????????????? |? 1 - >>>>> ?boot/ti-k3-boot-firmware/Config.in??????????? | 39 ++++++++++ >>>>> ?.../ti-k3-boot-firmware.hash????????????????? |? 2 +- >>>>> ?.../ti-k3-boot-firmware.mk??????????????????? | 16 ++-- >>>>> ?boot/ti-k3-image-gen/Config.in??????????????? | 77 ------------------- >>>>> ?boot/ti-k3-image-gen/ti-k3-image-gen.hash???? |? 3 - >>>>> ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?????? | 54 ------------- >>>>> ?boot/ti-k3-r5-loader/Config.in??????????????? |? 8 ++ >>>>> ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk?????? | 23 ++++++ >>>>> ?boot/uboot/Config.in????????????????????????? | 27 ++++--- >>>>> ?boot/uboot/uboot.mk?????????????????????????? | 10 ++- >>>>> ?configs/ti_am62x_sk_defconfig???????????????? | 14 ++-- >>>>> ?configs/ti_am64x_sk_defconfig???????????????? | 14 ++-- >>>>> ?...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- >>>>> ?package/python-attrs/python-attrs.mk????????? |? 6 ++ >>>>> ?.../python-jsonschema-specifications.mk?????? | 10 +++ >>>>> ?.../python-jsonschema/python-jsonschema.mk??? | 14 ++++ >>>>> ?.../python-referencing/python-referencing.mk? | 11 +++ >>>>> ?package/python-rpds-py/python-rpds-py.mk????? |? 1 + >>>>> ?24 files changed, 275 insertions(+), 180 deletions(-) >>>>> ?create mode 100644 board/ti/j721e-sk/genimage.cfg >>>>> ?create mode 100755 board/ti/j721e-sk/post-build.sh >>>>> ?create mode 100644 board/ti/j721e-sk/readme.txt >>>>> ?delete mode 100644 boot/ti-k3-image-gen/Config.in >>>>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash >>>>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk >>>>> ?copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) >>>>> >>>>> -- >>>>> 2.43.0 >>>>> >>>>> _______________________________________________ >>>>> buildroot mailing list >>>>> buildroot at buildroot.org >>>>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> 1. Boot log: >>> >>> U-Boot SPL 2024.01 (Feb 15 2024 - 01:42:12 +0100) >>> SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') >>> SPL initial stack usage: 13400 bytes >>> Trying to boot from MMC2 >>> Authentication passed >>> Authentication passed >>> Authentication passed >>> Authentication passed >>> Authentication passed >>> Starting ATF on ARM64 core... >>> >>> NOTICE: BL31: v2.10.0 (release):v2.10 >>> NOTICE: BL31: Built : 01:28:38, Feb 15 2024 >>> I/TC: >>> I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1198-g18ff6d2643)) #1 Thu Feb 15 00:28:27 UTC 2024 aarch64 >>> I/TC: WARNING: This OP-TEE configuration might be insecure! >>> I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html >>> I/TC: Primary CPU initializing >>> I/TC: SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') >>> I/TC: HUK Initialized >>> I/TC: Activated SA2UL device >>> I/TC: Enabled firewalls for SA2UL TRNG device >>> I/TC: SA2UL TRNG initialized >>> I/TC: SA2UL Drivers initialized >>> I/TC: Primary CPU switching to normal world boot >>> >>> U-Boot SPL 2024.01 (Feb 15 2024 - 01:43:17 +0100) >>> SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') >>> SPL initial stack usage: 1872 bytes >>> Trying to boot from MMC2 >>> Authentication passed >>> Authentication passed >>> >>> >>> U-Boot 2024.01 (Feb 15 2024 - 01:43:17 +0100) >>> >>> SoC: AM62X SR1.0 HS-FS >>> Model: Texas Instruments AM625 SK >>> DRAM: 2 GiB >>> Core: 56 devices, 23 uclasses, devicetree: separate >>> MMC: mmc at fa10000: 0, mmc at fa00000: 1 >>> Loading Environment from nowhere... OK >>> In: serial at 2800000 >>> Out: serial at 2800000 >>> Err: serial at 2800000 >>> Net: eth0: ethernet at 8000000port@1 >>> Hit any key to stop autoboot: 0 >>> switch to partitions #0, OK >>> mmc1 is current device >>> SD/MMC found on device 1 >>> Failed to load 'uEnv.txt' >> >> Can you access to the mmc1 content manually ? >> I had to create a symlink due to "dtb" subdirectory expected by u-boot >> u-boot is looking at /boot/dtb/ti for devicetree. >> >> Best regards, >> Romain >> >> >>> Scanning for bootflows in all bootdevs >>> Seq Method State Uclass Part Name Filename >>> --- ----------- ------ -------- ---- ------------------------ ---------------- >>> Scanning global bootmeth 'efi_mgr': >>> No EFI system partition >>> No EFI system partition >>> Failed to persist EFI variables >>> Scanning bootdev 'mmc at fa00000.bootdev': >>> Scanning bootdev 'mmc at fa10000.bootdev': >>> Unknown uclass 'usb' in label >>> link up on port 1, speed 100, full duplex >>> BOOTP broadcast 1 >>> BOOTP broadcast 2 >>> BOOTP broadcast 3 >>> BOOTP broadcast 4 >>> BOOTP broadcast 5 >>> BOOTP broadcast 6 >>> BOOTP broadcast 7 >>> BOOTP broadcast 8 >>> BOOTP broadcast 9 >>> BOOTP broadcast 10 >>> BOOTP broadcast 11 >>> BOOTP broadcast 12 >>> BOOTP broadcast 13 >>> BOOTP broadcast 14 >>> BOOTP broadcast 15 >>> BOOTP broadcast 16 >>> BOOTP broadcast 17 >>> >>> Retry time exceeded; starting again >>> >>> >>> >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Fri Feb 16 21:18:13 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 16 Feb 2024 22:18:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburing: fix uclibc build Message-ID: <20240216211813.1846842-1-fontaine.fabrice@gmail.com> Fix the following build failure with uclibc-ng raised since bump to version 2.4 in commit 3cc1b539e7e9fd49f571441e395e7daa8597dbec and https://github.com/axboe/liburing/commit/c6bc86e2125bcd6fa10ff2b128cd86486acadff6: In file included from lib.h:12, from setup.c:4: arch/aarch64/lib.h:7:10: fatal error: sys/auxv.h: No such file or directory 7 | #include | ^~~~~~~~~~~~ Fixes: 3cc1b539e7e9fd49f571441e395e7daa8597dbec - http://autobuild.buildroot.org/results/cc44d714c9267dd7a98debeb8c81c4ee1efe4ebb Signed-off-by: Fabrice Fontaine --- ...01-src-arch-aarch64-fix-uclibc-build.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch diff --git a/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch b/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch new file mode 100644 index 0000000000..4468105e4f --- /dev/null +++ b/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch @@ -0,0 +1,39 @@ +From f03f8da34fe96ac35a916ca3058b0f41971eae3b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Feb 2024 18:59:42 +0100 +Subject: [PATCH] src/arch/aarch64: fix uclibc build + +Fix the following build failure with uclibc-ng raised since version 2.3 +and +https://github.com/axboe/liburing/commit/c6bc86e2125bcd6fa10ff2b128cd86486acadff6: + +In file included from lib.h:12, + from setup.c:4: +arch/aarch64/lib.h:7:10: fatal error: sys/auxv.h: No such file or directory + 7 | #include + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/cc44d714c9267dd7a98debeb8c81c4ee1efe4ebb + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/axboe/liburing/commit/32f9c27a76c43627f79bb77469d2da8583e4d3df +--- + src/arch/aarch64/lib.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/arch/aarch64/lib.h b/src/arch/aarch64/lib.h +index 3b701b1..41bcfc9 100644 +--- a/src/arch/aarch64/lib.h ++++ b/src/arch/aarch64/lib.h +@@ -4,7 +4,6 @@ + #define LIBURING_ARCH_AARCH64_LIB_H + + #include +-#include + #include "../../syscall.h" + + static inline long __get_page_size(void) +-- +2.43.0 + -- 2.43.0 From giulio.benetti at benettiengineering.com Fri Feb 16 21:25:43 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 16 Feb 2024 22:25:43 +0100 Subject: [Buildroot] [PATCH v2] package/attr: fix build failure on Microblaze architecture Message-ID: <20240216212543.474327-1-giulio.benetti@benettiengineering.com> On Microblaze architecture __has_attribute(__symver__) support is broken and always return true even if symver is not supported so let's add a local patch pending upstream to detect if symver is supported during autoreconf. Let's also add ATTR_AUTORECONF = YES to let patch to affect building. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Signed-off-by: Giulio Benetti --- V1->V2: * written commit log as suggested by Thomas(there was no commit log at all since this patch has been pointed during Buildroot Dev Days in IRC to me) * re-sent local patch to the correct maililng list and updated Upstream: URL --- ...dd-detection-of-symver-gcc-attribute.patch | 68 +++++++++++++++++++ package/attr/attr.mk | 3 + 2 files changed, 71 insertions(+) create mode 100644 package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch new file mode 100644 index 0000000000..ca773cf0fc --- /dev/null +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch @@ -0,0 +1,68 @@ +From 1be7c2251040f1152de9ceb5263e6e96fa5c3d75 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 15:33:15 +0100 +Subject: [PATCH] configure.ac: add detection of symver gcc attribute + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://lists.nongnu.org/archive/html/acl-devel/2024-02/msg00003.html + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Giulio Benetti +--- + configure.ac | 15 +++++++++++++++ + libattr/syscalls.c | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7e362e9..98477b5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,21 @@ AS_CASE([$host_os], + [linux*], [os_linux=yes]) + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) + ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, ++ gcc_cv_symver_attribute, ++ [cat > conftest.c </dev/null 2>&1; then \ ++ gcc_cv_symver_attribute=yes ++ fi ++ rm -f conftest.[cs] ++]) ++AS_IF([test $gcc_cv_symver_attribute = yes], ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) ++ + AC_CONFIG_COMMANDS([include/attr], + [dnl + rm -rf include/attr +diff --git a/libattr/syscalls.c b/libattr/syscalls.c +index 907560a..caa70bc 100644 +--- a/libattr/syscalls.c ++++ b/libattr/syscalls.c +@@ -32,7 +32,7 @@ + * fall back to traditional .symver asm directive otherwise. + */ + #ifdef __has_attribute +-# if __has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) + # elif __has_attribute(__no_reorder__) + /* +-- +2.43.0 + diff --git a/package/attr/attr.mk b/package/attr/attr.mk index d1397921ff..1d24144f46 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_CPE_ID_VALID = YES +# Flag added for patch dealing with symver in configure.ac +ATTR_AUTORECONF = YES + ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls -- 2.34.1 From romain.naour at smile.fr Fri Feb 16 21:38:42 2024 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 16 Feb 2024 22:38:42 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240216200635.crek5j23p3hybg2p@dasso> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <20240216200635.crek5j23p3hybg2p@dasso> Message-ID: Hello Andreas, Le 16/02/2024 ? 21:06, Andreas Dannenberg a ?crit?: > On Thu, Feb 15, 2024 at 11:20:50AM +0100, Alexander Sverdlin wrote: >> Hi Romain, >> >> On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >>> -choice >>> - prompt "Security type" >>> - help >>> - ? The target SoC security type option for image gen.? Valid >>> - ? options are "gp" for General Purpose devices, "hs-fs" for >>> - ? High Security - Field Securable devices, or "hs" for High >>> - ? Security - Security Enforcing devices.? Note for all High >>> - ? Security device variants the TI_SECURE_DEV_PKG environmental >>> - ? variable must be defined at build time pointing to a valid >>> - ? core-secdev-k3 folder location, otherwise the build will >>> - ? fail, see >>> - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >>> - >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>> - bool "gp" >>> - >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>> - bool "hs-fs" >>> - >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>> - bool "hs" >>> - >>> -endchoice >> >> another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y >> was the default, which didn't boot on my HS-FS SoC. >> >> You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the >> default for AM62x. I'm not sure if this is a problem, though. > > HS-FS should be the default for all TI AM6x devices. This is our > "production silicon" and what's used for (almost) all projects, > especially new projects. This being said having support for GP device > variants still is desirable for existing boards/projects, such as the > current BeaglePlay boards (amongst earlier version of TI starter kit > EVMs for AM6x). Thank you, I was not aware of this. I found your post in the TI forum about the recent switch from GP to HS-FS device in Yocto [1]. Currently existing am64/am62 defconfigs are still targeting GP devices but we should add additional commits to do the switch to HS-FS. What about other SoC of the K3 architecture? Is the DRA829/J721e device will also switch to HS-FS by default? >From the u-boot k3 documentation, it's not clear witch device type is used by default across all k3 SoC. By default I was expecting the GP type for all the k3 family (I was wrong). [1] https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto [2] https://source.denx.de/u-boot/u-boot/-/blob/master/doc/board/ti/k3.rst?ref_type=heads&plain=1#L108 Best regards, Romain > > -- > Andreas Dannenberg > Texas Instruments Inc > > >> >> -- >> Alexander Sverdlin. >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From romain.naour at smile.fr Fri Feb 16 21:52:21 2024 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 16 Feb 2024 22:52:21 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <20240216201903.lhhkjevrgzcp5msz@dasso> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240216201903.lhhkjevrgzcp5msz@dasso> Message-ID: <735636d6-c0f8-4226-ab8a-1576c2133189@smile.fr> Hello Andreas, Le 16/02/2024 ? 21:19, Andreas Dannenberg a ?crit?: > On Tue, Feb 13, 2024 at 06:27:56PM +0100, Romain Naour wrote: >> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. >> >> This series start by adding U-boot binman support already submitted in the >> preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi >> [1], with small improvements. >> See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > > Thanks Romain and Dario for all the work on this, and submitting this. > Will be spending some time over the next few days to see how I can help > out with this effort. I can already see many great improvements since > the last time I worked on AM62x/AM64x support last year. Your feed back on HS-FS devices is really helpful. Alexander Sverdlin also helped on AM62x. Maybe if you can also test on AM64x just to be sure the defconfig is working. For now, I need to rework AM64x/AM62x support since Alexander reported that his board doesn't boot the kernel. Best regards, Romain > > -- > Andreas Dannenberg > Texas Instruments Inc > > > >> >> With binman support, we can add the TI K3 j721e SoC support by >> providing all required firmware generated by the build. >> >> Add the new ti_j721e_sk_defconfig file to build a basic SD card image to >> boot the board (serial debug and ethernet working). >> >> Thanks to binman support, we can remove the ti-k3-image-gen tool from >> Buildroot. To do that, we have to update existing defconfig (am62, am64). >> >> Followup commits can improve TI K3 HS-FS devices based on binman instead >> of legacy core-secdev-k3 tool. >> >> [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html >> [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf >> >> Best regards, >> Romain >> >> Dario Binacchi (5): >> package/python-attrs: add host variant >> package/python-rpds-py: add host variant >> package/python-referencing: add host variant >> package/python-jsonschema-specifications: add host variant >> package/python-jsonschema: add host variant >> >> Romain Naour (16): >> DEVELOPERS: add Romain Naour for am574x_idk_defconfig >> configs/ti_am62x_sk_defconfig: fix optee-os plateform >> configs/ti_am64x_sk_defconfig: fix optee-os plateform >> boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option >> boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >> boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to >> BINARIES_DIR >> boot/ti-k3-boot-firmware: introduce >> BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} >> boot/uboot: use DM firmware name defined by ti-k3-boot-firmware >> package >> boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E >> boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options >> boot/uboot: enable TI K3 Device Manager (DM) for j721e >> boot/ti-k3-boot-firmware: bump to version 09.02.00.004 >> configs/ti_j721e_sk_defconfig: new defconfig >> configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman >> tool >> configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman >> tool >> boot/ti-k3-image-gen: remove package >> >> Config.in.legacy | 7 ++ >> DEVELOPERS | 6 +- >> board/ti/j721e-sk/genimage.cfg | 28 +++++++ >> board/ti/j721e-sk/post-build.sh | 16 ++++ >> board/ti/j721e-sk/readme.txt | 34 ++++++++ >> boot/Config.in | 1 - >> boot/ti-k3-boot-firmware/Config.in | 39 ++++++++++ >> .../ti-k3-boot-firmware.hash | 2 +- >> .../ti-k3-boot-firmware.mk | 16 ++-- >> boot/ti-k3-image-gen/Config.in | 77 ------------------- >> boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - >> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ------------- >> boot/ti-k3-r5-loader/Config.in | 8 ++ >> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 23 ++++++ >> boot/uboot/Config.in | 27 ++++--- >> boot/uboot/uboot.mk | 10 ++- >> configs/ti_am62x_sk_defconfig | 14 ++-- >> configs/ti_am64x_sk_defconfig | 14 ++-- >> ...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- >> package/python-attrs/python-attrs.mk | 6 ++ >> .../python-jsonschema-specifications.mk | 10 +++ >> .../python-jsonschema/python-jsonschema.mk | 14 ++++ >> .../python-referencing/python-referencing.mk | 11 +++ >> package/python-rpds-py/python-rpds-py.mk | 1 + >> 24 files changed, 275 insertions(+), 180 deletions(-) >> create mode 100644 board/ti/j721e-sk/genimage.cfg >> create mode 100755 board/ti/j721e-sk/post-build.sh >> create mode 100644 board/ti/j721e-sk/readme.txt >> delete mode 100644 boot/ti-k3-image-gen/Config.in >> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash >> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk >> copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) >> >> -- >> 2.43.0 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From kilian.zinnecker at mail.de Fri Feb 16 22:17:38 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Fri, 16 Feb 2024 23:17:38 +0100 Subject: [Buildroot] [PATCH v2] configs/rock5b_defconfig: switch to mainline linux Message-ID: <20240216221738.693818-1-kilian.zinnecker@mail.de> This patch switches the board support of the Radxa Rock 5B from using a custom kernel to mainline linux 6.7.4. Thereby patches, which became redundant, are removed, as well as device tree modifications and no longer needed hash files. The needed ethernet drivers are activated via the kernel config fragment file. Also the board support is switched from using a uboot script and a uEnv file to using extlinux. Signed-off-by: Kilian Zinnecker --- v1 -> v2: - removed unnecessary hash files (uboot, kernel) and removed hash enforcement (BR2_DOWNLOAD_FOCE_CHECK_HASHES) - bumped uboot from 2023.07 to latest version (currently 2024.01) - removed BR2_SYSTEM_DHCP as it is not needed for minimal config - specified kernel header version in defconfig - rearranged defconfig as in roc_pc_rk3399_defconfig - switched from uboot script + uEnv to extlinux.conf: removed fit image script, changed readme to list the correct output/image artifacts, removed post-image.sh, added post-build.sh, removed vfat partition from genimage.cfg, added extlinux.conf, removed boot.cmd board/radxa/rock5b/boot.cmd | 3 - board/radxa/rock5b/extlinux.conf | 4 ++ board/radxa/rock5b/genimage.cfg | 16 ----- board/radxa/rock5b/linux.fragment | 5 +- ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- ...x-building-error-on-Werror-array-com.patch | 43 ------------- board/radxa/rock5b/patches/linux/linux.hash | 2 - board/radxa/rock5b/patches/uboot/uboot.hash | 2 - board/radxa/rock5b/post-build.sh | 5 ++ board/radxa/rock5b/post-image.sh | 7 -- board/radxa/rock5b/readme.txt | 51 +-------------- board/radxa/rock5b/rock5b.dts | 12 ---- board/radxa/rock5b/rock5b.its | 46 ------------- configs/rock5b_defconfig | 60 ++++++++--------- 14 files changed, 44 insertions(+), 276 deletions(-) delete mode 100644 board/radxa/rock5b/boot.cmd create mode 100644 board/radxa/rock5b/extlinux.conf delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch delete mode 100644 board/radxa/rock5b/patches/linux/linux.hash delete mode 100644 board/radxa/rock5b/patches/uboot/uboot.hash create mode 100755 board/radxa/rock5b/post-build.sh delete mode 100755 board/radxa/rock5b/post-image.sh delete mode 100644 board/radxa/rock5b/rock5b.dts delete mode 100644 board/radxa/rock5b/rock5b.its diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd deleted file mode 100644 index 9a3e73e003..0000000000 --- a/board/radxa/rock5b/boot.cmd +++ /dev/null @@ -1,3 +0,0 @@ -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait -fatload mmc 1:1 ${loadaddr} image.itb -bootm ${loadaddr} diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf new file mode 100644 index 0000000000..a1a531f038 --- /dev/null +++ b/board/radxa/rock5b/extlinux.conf @@ -0,0 +1,4 @@ +label Radxa Rock 5b Linux + kernel /boot/Image + devicetree /boot/rk3588-rock-5b.dtb + append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait diff --git a/board/radxa/rock5b/genimage.cfg b/board/radxa/rock5b/genimage.cfg index 2943232fc3..138ec26e3a 100644 --- a/board/radxa/rock5b/genimage.cfg +++ b/board/radxa/rock5b/genimage.cfg @@ -1,15 +1,5 @@ # SD card image for Radxa Rock 5b -image boot.vfat { - vfat { - files = { - "image.itb", - "boot.scr" - } - } - size = 16M -} - image sdcard.img { hdimage { partition-table-type = "hybrid" @@ -21,12 +11,6 @@ image sdcard.img { offset = 32K } - partition boot { - partition-type = "0xC" - bootable = "true" - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext2" diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 28bb373ef2..90f2f291ba 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1,5 +1,2 @@ CONFIG_R8169=y -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set -# Disable Rockchip specific WiFi drivers, as the kernel -# code cannot be build with GCC 12 due to several Werrors -# CONFIG_WL_ROCKCHIP is not set +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch deleted file mode 100644 index 5632c5a627..0000000000 --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 -From: Kees Cook -Date: Sat, 12 Feb 2022 09:14:49 -0800 -Subject: etherdevice: Adjust ether_addr* prototypes to silence - -Wstringop-overead -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With GCC 12, -Wstringop-overread was warning about an implicit cast from -char[6] to char[8]. However, the extra 2 bytes are always thrown away, -alignment doesn't matter, and the risk of hitting the edge of unallocated -memory has been accepted, so this prototype can just be converted to a -regular char *. Silences: - -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], - | ^~~~~~~~~~~~~~~~~~~~~~~ - -Reported-by: Marc Kleine-Budde -Tested-by: Marc Kleine-Budde -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de -Cc: Jakub Kicinski -Cc: "David S. Miller" -Cc: netdev at vger.kernel.org -Signed-off-by: Kees Cook -Signed-off-by: David S. Miller -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd -Signed-off-by: Kilian Zinnecker ---- - include/linux/etherdevice.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h -index 2ad71cc90b37d..92b10e67d5f87 100644 ---- a/include/linux/etherdevice.h -+++ b/include/linux/etherdevice.h -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) - #endif - } - --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - #ifdef __BIG_ENDIAN -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. - */ - --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], -- const u8 addr2[6+2]) -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch deleted file mode 100644 index 10de6c72d3..0000000000 --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 -From: Xiongwei Song -Date: Fri, 14 Jan 2022 14:07:24 -0800 -Subject: mm: page_alloc: fix building error on -Werror=array-compare - -Arthur Marsh reported we would hit the error below when building kernel -with gcc-12: - - CC mm/page_alloc.o - mm/page_alloc.c: In function `mem_init_print_info': - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] - 8173 | if (start <= pos && pos < end && size > adj) \ - | - -In C++20, the comparision between arrays should be warned. - -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com -Signed-off-by: Xiongwei Song -Reported-by: Arthur Marsh -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f -Signed-off-by: Kilian Zinnecker ---- - mm/page_alloc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 806f317c2e7e2..c4ef450ac4428 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) - */ - #define adj_init_size(start, end, size, pos, adj) \ - do { \ -- if (start <= pos && pos < end && size > adj) \ -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ - size -= adj; \ - } while (0) - --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash deleted file mode 100644 index 95ad749554..0000000000 --- a/board/radxa/rock5b/patches/linux/linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash deleted file mode 100644 index efd629bd2f..0000000000 --- a/board/radxa/rock5b/patches/uboot/uboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 12e921b466ae731cdbc355e6832b7f22bc90b01aeceef9886f98aaba7b394300 u-boot-2023.07.tar.bz2 diff --git a/board/radxa/rock5b/post-build.sh b/board/radxa/rock5b/post-build.sh new file mode 100755 index 0000000000..d84a5da0b0 --- /dev/null +++ b/board/radxa/rock5b/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/board/radxa/rock5b/post-image.sh b/board/radxa/rock5b/post-image.sh deleted file mode 100755 index c706a5ee78..0000000000 --- a/board/radxa/rock5b/post-image.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -e - -gzip -fk "${BINARIES_DIR}/Image" -cp board/radxa/rock5b/rock5b.its "${BINARIES_DIR}" -(cd "${BINARIES_DIR}" && mkimage -f rock5b.its image.itb) -support/scripts/genimage.sh -c board/radxa/rock5b/genimage.cfg diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index b3eb06851a..441c28db25 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -13,21 +13,15 @@ Files created in output directory output/images . ??? Image -??? Image.gz -??? boot.scr -??? boot.vfat -??? image.itb -??? rk3588-rock-5b.dtb ??? rk3588_bl31_v1.40.elf ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin -??? rock5b.dts -??? rock5b.its +??? rk3588-rock-5b.dtb ??? rootfs.ext2 ??? rootfs.ext4 ??? rootfs.tar ??? sdcard.img -??? u-boot-rockchip.bin -??? u-boot.bin +??? u-boot.bin +??? u-boot-rockchip.bin Creating bootable SD card: ========================== @@ -61,42 +55,3 @@ Enter 'root' as login user, and the prompt is ready. wiki link: ---------- https://forum.radxa.com/c/rock5 - -Issues: -======= - -WiFi ----- -The custom Radxa kernel provides custom code to support WiFi. However, -that code does not compile with GCC 12, which is the current default -version in buildroot. Hence, the WiFi kernel drivers are disabled, until -the issues get fixed (if ever). If they are desperately needed, one may -apply the following workaround, as long as buildroot still supports GCC -version 11: - -1. Set GCC version 11, by adding the following line to -configs/rock5b_defconfig: - -BR2_GCC_VERSION_11_X=y - -2. Re-enable custom WiFi drivers by removing the following line from -board/radxa/rock5b/linux.fragment: - -# CONFIG_WL_ROCKCHIP is not set - -Rockchip FIQ Debugger ---------------------- -The custom kernel used for this board features an FIQ debugger, which -can be activated by typing "fiq" on the serial interface. As this can be -annoying if a user wants to type these charakters and it is not needed -for most users, this board support disables the FIQ debugger by default. -To re-enable the FIQ debugger follow the steps: - -1. In board/radxa/rock5b/rock5b.dts set the status property of the -fiq_debugger node to "okay" and set the status property of the uart2 -node to "disabled" - -2. Re-enable the fiq debugger module by removing the following line -from board/radxa/rock5b/linux.fragment: - -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts deleted file mode 100644 index 71a4e42b5e..0000000000 --- a/board/radxa/rock5b/rock5b.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -#include "rockchip/rk3588-rock-5b.dts" - -&fiq_debugger { - status = "disabled"; -}; - -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; -}; diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its deleted file mode 100644 index 9ce235d041..0000000000 --- a/board/radxa/rock5b/rock5b.its +++ /dev/null @@ -1,46 +0,0 @@ -/dts-v1/; - -/ { - description = "Rock 5B FIT Image"; - #address-cells = <1>; - - images { - kernel { - description = "Kernel"; - data = /incbin/("Image.gz"); - type = "kernel"; - arch = "arm64"; - os = "linux"; - compression = "gzip"; - load = <0x0a200000>; - entry = <0x0a200000>; - hash { - algo = "sha256"; - }; - }; - fdt { - description = "Device Tree"; - data = /incbin/("rock5b.dtb"); - type = "flat_dt"; - arch = "arm64"; - compression = "none"; - load = <0x0e000000>; - entry = <0x0e000000>; - hash { - algo = "sha256"; - }; - }; - }; - - configurations { - default = "standard"; - standard { - description = "Standard Boot"; - kernel = "kernel"; - fdt = "fdt"; - hash { - algo = "sha256"; - }; - }; - }; -}; diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 7175aa66bf..d4bc6cf29a 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -1,43 +1,45 @@ +# Architecture BR2_aarch64=y BR2_cortex_a76_a55=y -BR2_KERNEL_HEADERS_5_10=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="" -BR2_TARGET_GENERIC_HOSTNAME="rock5b" -BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" -BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_SYSTEM_DHCP="eth0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="250M" + +# Linux headers same as kernel, a 6.7 series +BR2_KERNEL_HEADERS_6_7=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" +BR2_TARGET_UBOOT_LATEST_VERSION=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7.4" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="rock5b" +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/radxa/rock5b/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_DTC=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_ROCKCHIP_RKBIN=y -BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" -BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock5b/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" -- 2.34.1 From dannenberg at ti.com Fri Feb 16 22:20:12 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Fri, 16 Feb 2024 16:20:12 -0600 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <735636d6-c0f8-4226-ab8a-1576c2133189@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240216201903.lhhkjevrgzcp5msz@dasso> <735636d6-c0f8-4226-ab8a-1576c2133189@smile.fr> Message-ID: <20240216222012.eaes5ktamizu6n5c@dasso> On Fri, Feb 16, 2024 at 10:52:21PM +0100, Romain Naour wrote: > Hello Andreas, > > Le 16/02/2024 ? 21:19, Andreas Dannenberg a ?crit?: > > On Tue, Feb 13, 2024 at 06:27:56PM +0100, Romain Naour wrote: > >> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > >> > >> This series start by adding U-boot binman support already submitted in the > >> preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > >> [1], with small improvements. > >> See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > > > > Thanks Romain and Dario for all the work on this, and submitting this. > > Will be spending some time over the next few days to see how I can help > > out with this effort. I can already see many great improvements since > > the last time I worked on AM62x/AM64x support last year. > > Your feed back on HS-FS devices is really helpful. Alexander Sverdlin also > helped on AM62x. > > Maybe if you can also test on AM64x just to be sure the defconfig is working. I'm planning on testing the entire series here pretty soon and will provide feedback (I have access to any and all boards:) One of the things I'm trying to assess is what's still missing vs. the previous attempt I made upstreaming this. For example, AM62x graphics isn't there yet (ti-rogue-km / ti-rogue-um). -- Andreas Dannenberg Texas Instruments Inc > > For now, I need to rework AM64x/AM62x support since Alexander reported that his > board doesn't boot the kernel. > > Best regards, > Romain > > > > > > -- > > Andreas Dannenberg > > Texas Instruments Inc > > > > > > > >> > >> With binman support, we can add the TI K3 j721e SoC support by > >> providing all required firmware generated by the build. > >> > >> Add the new ti_j721e_sk_defconfig file to build a basic SD card image to > >> boot the board (serial debug and ethernet working). > >> > >> Thanks to binman support, we can remove the ti-k3-image-gen tool from > >> Buildroot. To do that, we have to update existing defconfig (am62, am64). > >> > >> Followup commits can improve TI K3 HS-FS devices based on binman instead > >> of legacy core-secdev-k3 tool. > >> > >> [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html > >> [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > >> > >> Best regards, > >> Romain > >> > >> Dario Binacchi (5): > >> package/python-attrs: add host variant > >> package/python-rpds-py: add host variant > >> package/python-referencing: add host variant > >> package/python-jsonschema-specifications: add host variant > >> package/python-jsonschema: add host variant > >> > >> Romain Naour (16): > >> DEVELOPERS: add Romain Naour for am574x_idk_defconfig > >> configs/ti_am62x_sk_defconfig: fix optee-os plateform > >> configs/ti_am64x_sk_defconfig: fix optee-os plateform > >> boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > >> boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > >> boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to > >> BINARIES_DIR > >> boot/ti-k3-boot-firmware: introduce > >> BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} > >> boot/uboot: use DM firmware name defined by ti-k3-boot-firmware > >> package > >> boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > >> boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options > >> boot/uboot: enable TI K3 Device Manager (DM) for j721e > >> boot/ti-k3-boot-firmware: bump to version 09.02.00.004 > >> configs/ti_j721e_sk_defconfig: new defconfig > >> configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman > >> tool > >> configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman > >> tool > >> boot/ti-k3-image-gen: remove package > >> > >> Config.in.legacy | 7 ++ > >> DEVELOPERS | 6 +- > >> board/ti/j721e-sk/genimage.cfg | 28 +++++++ > >> board/ti/j721e-sk/post-build.sh | 16 ++++ > >> board/ti/j721e-sk/readme.txt | 34 ++++++++ > >> boot/Config.in | 1 - > >> boot/ti-k3-boot-firmware/Config.in | 39 ++++++++++ > >> .../ti-k3-boot-firmware.hash | 2 +- > >> .../ti-k3-boot-firmware.mk | 16 ++-- > >> boot/ti-k3-image-gen/Config.in | 77 ------------------- > >> boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - > >> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ------------- > >> boot/ti-k3-r5-loader/Config.in | 8 ++ > >> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 23 ++++++ > >> boot/uboot/Config.in | 27 ++++--- > >> boot/uboot/uboot.mk | 10 ++- > >> configs/ti_am62x_sk_defconfig | 14 ++-- > >> configs/ti_am64x_sk_defconfig | 14 ++-- > >> ...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- > >> package/python-attrs/python-attrs.mk | 6 ++ > >> .../python-jsonschema-specifications.mk | 10 +++ > >> .../python-jsonschema/python-jsonschema.mk | 14 ++++ > >> .../python-referencing/python-referencing.mk | 11 +++ > >> package/python-rpds-py/python-rpds-py.mk | 1 + > >> 24 files changed, 275 insertions(+), 180 deletions(-) > >> create mode 100644 board/ti/j721e-sk/genimage.cfg > >> create mode 100755 board/ti/j721e-sk/post-build.sh > >> create mode 100644 board/ti/j721e-sk/readme.txt > >> delete mode 100644 boot/ti-k3-image-gen/Config.in > >> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > >> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk > >> copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) > >> > >> -- > >> 2.43.0 > >> > >> _______________________________________________ > >> buildroot mailing list > >> buildroot at buildroot.org > >> https://lists.buildroot.org/mailman/listinfo/buildroot > From kilian.zinnecker at mail.de Fri Feb 16 22:30:42 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Fri, 16 Feb 2024 23:30:42 +0100 Subject: [Buildroot] [PATCH] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <58E9CC6C-0DA1-42B9-AA17-3435786DCBDC@benettiengineering.com> References: <20240215214341.6137-1-kilian.zinnecker@mail.de> <58E9CC6C-0DA1-42B9-AA17-3435786DCBDC@benettiengineering.com> Message-ID: <1881605.CQOukoFCf9@laptop> Hello Giulio, thanks for reviewing! I made changes according to your comments and sent a v2 of the patch. [--SNIP--] > It would be great if you switch to extlinux that is easier for debugging and > here you only override bootargs so you can add environment uboot variables > file. Switching to extlinux played out very nicely: A lot of files became redundant and this decluttered the board support. Thanks! I have a question though: Is it possible to specify in extlinux.conf, that uboot shall fetch the kernel image and device tree via tftp? How would an example of such an extlinux.conf look like? Best regards, Kilian From giulio.benetti at benettiengineering.com Fri Feb 16 22:37:49 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 16 Feb 2024 23:37:49 +0100 Subject: [Buildroot] [PATCH v2] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <20240216221738.693818-1-kilian.zinnecker@mail.de> References: <20240216221738.693818-1-kilian.zinnecker@mail.de> Message-ID: <05ae161a-0e1c-4cd5-92d1-4fd5b7d8c798@benettiengineering.com> Hi Kilian, almost there, 2 comments below, On 16/02/24 23:17, Kilian Zinnecker via buildroot wrote: > This patch switches the board support of the Radxa Rock 5B from > using a custom kernel to mainline linux 6.7.4. Thereby patches, > which became redundant, are removed, as well as device tree > modifications and no longer needed hash files. The needed ethernet > drivers are activated via the kernel config fragment file. Also the > board support is switched from using a uboot script and a uEnv file > to using extlinux. > > Signed-off-by: Kilian Zinnecker > > --- > > v1 -> v2: > > - removed unnecessary hash files (uboot, kernel) and removed hash > enforcement (BR2_DOWNLOAD_FOCE_CHECK_HASHES) > - bumped uboot from 2023.07 to latest version (currently 2024.01) > - removed BR2_SYSTEM_DHCP as it is not needed for minimal config > - specified kernel header version in defconfig > - rearranged defconfig as in roc_pc_rk3399_defconfig > - switched from uboot script + uEnv to extlinux.conf: removed fit > image script, changed readme to list the correct output/image > artifacts, removed post-image.sh, added post-build.sh, removed > vfat partition from genimage.cfg, added extlinux.conf, removed > boot.cmd > > board/radxa/rock5b/boot.cmd | 3 - > board/radxa/rock5b/extlinux.conf | 4 ++ > board/radxa/rock5b/genimage.cfg | 16 ----- > board/radxa/rock5b/linux.fragment | 5 +- > ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- > ...x-building-error-on-Werror-array-com.patch | 43 ------------- > board/radxa/rock5b/patches/linux/linux.hash | 2 - > board/radxa/rock5b/patches/uboot/uboot.hash | 2 - > board/radxa/rock5b/post-build.sh | 5 ++ > board/radxa/rock5b/post-image.sh | 7 -- > board/radxa/rock5b/readme.txt | 51 +-------------- > board/radxa/rock5b/rock5b.dts | 12 ---- > board/radxa/rock5b/rock5b.its | 46 ------------- > configs/rock5b_defconfig | 60 ++++++++--------- > 14 files changed, 44 insertions(+), 276 deletions(-) > delete mode 100644 board/radxa/rock5b/boot.cmd > create mode 100644 board/radxa/rock5b/extlinux.conf > delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > delete mode 100644 board/radxa/rock5b/patches/linux/linux.hash > delete mode 100644 board/radxa/rock5b/patches/uboot/uboot.hash > create mode 100755 board/radxa/rock5b/post-build.sh > delete mode 100755 board/radxa/rock5b/post-image.sh > delete mode 100644 board/radxa/rock5b/rock5b.dts > delete mode 100644 board/radxa/rock5b/rock5b.its > > diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd > deleted file mode 100644 > index 9a3e73e003..0000000000 > --- a/board/radxa/rock5b/boot.cmd > +++ /dev/null > @@ -1,3 +0,0 @@ > -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait > -fatload mmc 1:1 ${loadaddr} image.itb > -bootm ${loadaddr} > diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf > new file mode 100644 > index 0000000000..a1a531f038 > --- /dev/null > +++ b/board/radxa/rock5b/extlinux.conf > @@ -0,0 +1,4 @@ > +label Radxa Rock 5b Linux > + kernel /boot/Image > + devicetree /boot/rk3588-rock-5b.dtb > + append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait > diff --git a/board/radxa/rock5b/genimage.cfg b/board/radxa/rock5b/genimage.cfg > index 2943232fc3..138ec26e3a 100644 > --- a/board/radxa/rock5b/genimage.cfg > +++ b/board/radxa/rock5b/genimage.cfg > @@ -1,15 +1,5 @@ > # SD card image for Radxa Rock 5b > > -image boot.vfat { > - vfat { > - files = { > - "image.itb", > - "boot.scr" > - } > - } > - size = 16M > -} > - > image sdcard.img { > hdimage { > partition-table-type = "hybrid" > @@ -21,12 +11,6 @@ image sdcard.img { > offset = 32K > } > > - partition boot { > - partition-type = "0xC" > - bootable = "true" > - image = "boot.vfat" > - } > - > partition rootfs { > partition-type = 0x83 > image = "rootfs.ext2" > diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment > index 28bb373ef2..90f2f291ba 100644 > --- a/board/radxa/rock5b/linux.fragment > +++ b/board/radxa/rock5b/linux.fragment > @@ -1,5 +1,2 @@ > CONFIG_R8169=y > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > -# Disable Rockchip specific WiFi drivers, as the kernel > -# code cannot be build with GCC 12 due to several Werrors > -# CONFIG_WL_ROCKCHIP is not set > +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y > diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > deleted file mode 100644 > index 5632c5a627..0000000000 > --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 > -From: Kees Cook > -Date: Sat, 12 Feb 2022 09:14:49 -0800 > -Subject: etherdevice: Adjust ether_addr* prototypes to silence > - -Wstringop-overead > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -With GCC 12, -Wstringop-overread was warning about an implicit cast from > -char[6] to char[8]. However, the extra 2 bytes are always thrown away, > -alignment doesn't matter, and the risk of hitting the edge of unallocated > -memory has been accepted, so this prototype can just be converted to a > -regular char *. Silences: > - > -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] > - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); > - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? > - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > - | ^~~~~~~~~~~~~~~~~~~~~~~ > - > -Reported-by: Marc Kleine-Budde > -Tested-by: Marc Kleine-Budde > -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de > -Cc: Jakub Kicinski > -Cc: "David S. Miller" > -Cc: netdev at vger.kernel.org > -Signed-off-by: Kees Cook > -Signed-off-by: David S. Miller > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd > -Signed-off-by: Kilian Zinnecker > ---- > - include/linux/etherdevice.h | 5 ++--- > - 1 file changed, 2 insertions(+), 3 deletions(-) > - > -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h > -index 2ad71cc90b37d..92b10e67d5f87 100644 > ---- a/include/linux/etherdevice.h > -+++ b/include/linux/etherdevice.h > -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) > - #endif > - } > - > --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) > -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - #ifdef __BIG_ENDIAN > -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) > - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. > - */ > - > --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > -- const u8 addr2[6+2]) > -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > deleted file mode 100644 > index 10de6c72d3..0000000000 > --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 > -From: Xiongwei Song > -Date: Fri, 14 Jan 2022 14:07:24 -0800 > -Subject: mm: page_alloc: fix building error on -Werror=array-compare > - > -Arthur Marsh reported we would hit the error below when building kernel > -with gcc-12: > - > - CC mm/page_alloc.o > - mm/page_alloc.c: In function `mem_init_print_info': > - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] > - 8173 | if (start <= pos && pos < end && size > adj) \ > - | > - > -In C++20, the comparision between arrays should be warned. > - > -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com > -Signed-off-by: Xiongwei Song > -Reported-by: Arthur Marsh > -Signed-off-by: Andrew Morton > -Signed-off-by: Linus Torvalds > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f > -Signed-off-by: Kilian Zinnecker > ---- > - mm/page_alloc.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/mm/page_alloc.c b/mm/page_alloc.c > -index 806f317c2e7e2..c4ef450ac4428 100644 > ---- a/mm/page_alloc.c > -+++ b/mm/page_alloc.c > -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) > - */ > - #define adj_init_size(start, end, size, pos, adj) \ > - do { \ > -- if (start <= pos && pos < end && size > adj) \ > -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ > - size -= adj; \ > - } while (0) > - > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash > deleted file mode 100644 > index 95ad749554..0000000000 > --- a/board/radxa/rock5b/patches/linux/linux.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Locally calculated > -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz > diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash > deleted file mode 100644 > index efd629bd2f..0000000000 > --- a/board/radxa/rock5b/patches/uboot/uboot.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Locally calculated > -sha256 12e921b466ae731cdbc355e6832b7f22bc90b01aeceef9886f98aaba7b394300 u-boot-2023.07.tar.bz2 > diff --git a/board/radxa/rock5b/post-build.sh b/board/radxa/rock5b/post-build.sh > new file mode 100755 > index 0000000000..d84a5da0b0 > --- /dev/null > +++ b/board/radxa/rock5b/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf > diff --git a/board/radxa/rock5b/post-image.sh b/board/radxa/rock5b/post-image.sh > deleted file mode 100755 > index c706a5ee78..0000000000 > --- a/board/radxa/rock5b/post-image.sh > +++ /dev/null > @@ -1,7 +0,0 @@ > -#!/usr/bin/env bash > -set -e > - > -gzip -fk "${BINARIES_DIR}/Image" > -cp board/radxa/rock5b/rock5b.its "${BINARIES_DIR}" > -(cd "${BINARIES_DIR}" && mkimage -f rock5b.its image.itb) > -support/scripts/genimage.sh -c board/radxa/rock5b/genimage.cfg > diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt > index b3eb06851a..441c28db25 100644 > --- a/board/radxa/rock5b/readme.txt > +++ b/board/radxa/rock5b/readme.txt > @@ -13,21 +13,15 @@ Files created in output directory > output/images > . > ??? Image > -??? Image.gz > -??? boot.scr > -??? boot.vfat > -??? image.itb > -??? rk3588-rock-5b.dtb > ??? rk3588_bl31_v1.40.elf > ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin > -??? rock5b.dts > -??? rock5b.its > +??? rk3588-rock-5b.dtb > ??? rootfs.ext2 > ??? rootfs.ext4 > ??? rootfs.tar > ??? sdcard.img > -??? u-boot-rockchip.bin > -??? u-boot.bin > +??? u-boot.bin > +??? u-boot-rockchip.bin > > Creating bootable SD card: > ========================== > @@ -61,42 +55,3 @@ Enter 'root' as login user, and the prompt is ready. > wiki link: > ---------- > https://forum.radxa.com/c/rock5 > - > -Issues: > -======= > - > -WiFi > ----- > -The custom Radxa kernel provides custom code to support WiFi. However, > -that code does not compile with GCC 12, which is the current default > -version in buildroot. Hence, the WiFi kernel drivers are disabled, until > -the issues get fixed (if ever). If they are desperately needed, one may > -apply the following workaround, as long as buildroot still supports GCC > -version 11: > - > -1. Set GCC version 11, by adding the following line to > -configs/rock5b_defconfig: > - > -BR2_GCC_VERSION_11_X=y > - > -2. Re-enable custom WiFi drivers by removing the following line from > -board/radxa/rock5b/linux.fragment: > - > -# CONFIG_WL_ROCKCHIP is not set > - > -Rockchip FIQ Debugger > ---------------------- > -The custom kernel used for this board features an FIQ debugger, which > -can be activated by typing "fiq" on the serial interface. As this can be > -annoying if a user wants to type these charakters and it is not needed > -for most users, this board support disables the FIQ debugger by default. > -To re-enable the FIQ debugger follow the steps: > - > -1. In board/radxa/rock5b/rock5b.dts set the status property of the > -fiq_debugger node to "okay" and set the status property of the uart2 > -node to "disabled" > - > -2. Re-enable the fiq debugger module by removing the following line > -from board/radxa/rock5b/linux.fragment: > - > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts > deleted file mode 100644 > index 71a4e42b5e..0000000000 > --- a/board/radxa/rock5b/rock5b.dts > +++ /dev/null > @@ -1,12 +0,0 @@ > -/dts-v1/; > - > -#include "rockchip/rk3588-rock-5b.dts" > - > -&fiq_debugger { > - status = "disabled"; > -}; > - > -&uart2 { > - pinctrl-0 = <&uart2m0_xfer>; > - status = "okay"; > -}; > diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its > deleted file mode 100644 > index 9ce235d041..0000000000 > --- a/board/radxa/rock5b/rock5b.its > +++ /dev/null > @@ -1,46 +0,0 @@ > -/dts-v1/; > - > -/ { > - description = "Rock 5B FIT Image"; > - #address-cells = <1>; > - > - images { > - kernel { > - description = "Kernel"; > - data = /incbin/("Image.gz"); > - type = "kernel"; > - arch = "arm64"; > - os = "linux"; > - compression = "gzip"; > - load = <0x0a200000>; > - entry = <0x0a200000>; > - hash { > - algo = "sha256"; > - }; > - }; > - fdt { > - description = "Device Tree"; > - data = /incbin/("rock5b.dtb"); > - type = "flat_dt"; > - arch = "arm64"; > - compression = "none"; > - load = <0x0e000000>; > - entry = <0x0e000000>; > - hash { > - algo = "sha256"; > - }; > - }; > - }; > - > - configurations { > - default = "standard"; > - standard { > - description = "Standard Boot"; > - kernel = "kernel"; > - fdt = "fdt"; > - hash { > - algo = "sha256"; > - }; > - }; > - }; > -}; > diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig > index 7175aa66bf..d4bc6cf29a 100644 > --- a/configs/rock5b_defconfig > +++ b/configs/rock5b_defconfig > @@ -1,43 +1,45 @@ > +# Architecture > BR2_aarch64=y > BR2_cortex_a76_a55=y > -BR2_KERNEL_HEADERS_5_10=y > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="" > -BR2_TARGET_GENERIC_HOSTNAME="rock5b" > -BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" > -BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" > -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > -BR2_SYSTEM_DHCP="eth0" > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" > -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set > -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" > -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > -BR2_TARGET_ROOTFS_EXT2_SIZE="250M" > + > +# Linux headers same as kernel, a 6.7 series > +BR2_KERNEL_HEADERS_6_7=y Here you have to specify: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" > +BR2_TARGET_UBOOT_LATEST_VERSION=y Here ^^^ you have to specify: BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" Never rely on _LATEST because that changes while Buildroot advances. So today UBOOT_LATEST_VERSION means 2024.01, one day it will be 2024.04, but while providing defconfigs we need to create something reproducible, that's why we have to provide specific CUSTOM_VERSION. > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y > +BR2_PACKAGE_ROCKCHIP_RKBIN=y > +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" > +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7.4" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" > +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" > + > +# Filesystem > +BR2_TARGET_GENERIC_HOSTNAME="rock5b" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" > BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/radxa/rock5b/boot.cmd" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_DTC=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_ROCKCHIP_RKBIN=y > -BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" > -BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock5b/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" Also this ^^^ is a good practice IMHO. Good clean up! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Fri Feb 16 23:09:08 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 17 Feb 2024 00:09:08 +0100 Subject: [Buildroot] [PATCH] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <1881605.CQOukoFCf9@laptop> References: <1881605.CQOukoFCf9@laptop> Message-ID: Hi Kilian, > Il giorno 16 feb 2024, alle ore 23:30, Kilian Zinnecker ha scritto: > > ?Hello Giulio, > > thanks for reviewing! I made changes according to your comments and sent a v2 > of the patch. > > [--SNIP--] > >> It would be great if you switch to extlinux that is easier for debugging and >> here you only override bootargs so you can add environment uboot variables >> file. > > Switching to extlinux played out very nicely: A lot of files became redundant > and this decluttered the board support. Exactly :-) > Thanks! No problem > > I have a question though: Is it possible to specify in extlinux.conf, that > uboot shall fetch the kernel image and device tree via tftp? How would an > example of such an extlinux.conf look like? Here [0] they explain pretty well the difference between extlinux and boot.cmd and they also point that they can be used together, of course depending on the uboot environment variables. Another chance is to specify: BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE=?uEnv.txt? And place the resulting uEnv.bin into genimage.cfg on a known address uboot will pick environment variables from. This is another way to get what you were trying to do before using uEnv.txt, but you need to find or specify the following 2 uboot options: CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xC0000 in a uboot.fragment This ^^^ is an example and so in genimage.cfg you add something like: partition uboot-env { image = "uboot-env.bin" offset = 768K size = 8K } That way in the resulting image at 0xC0000(768K) uboot will find the environment variables including the commands to run if you specify bootcmd. [0]: https://developer.toradex.com/linux-bsp/os-development/boot/distro-boot/#boot-sequence Best regards Giulio > > Best regards, > Kilian > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From dannenberg at ti.com Fri Feb 16 20:19:03 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Fri, 16 Feb 2024 14:19:03 -0600 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240216201903.lhhkjevrgzcp5msz@dasso> On Tue, Feb 13, 2024 at 06:27:56PM +0100, Romain Naour wrote: > This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > > This series start by adding U-boot binman support already submitted in the > preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > [1], with small improvements. > See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] Thanks Romain and Dario for all the work on this, and submitting this. Will be spending some time over the next few days to see how I can help out with this effort. I can already see many great improvements since the last time I worked on AM62x/AM64x support last year. -- Andreas Dannenberg Texas Instruments Inc > > With binman support, we can add the TI K3 j721e SoC support by > providing all required firmware generated by the build. > > Add the new ti_j721e_sk_defconfig file to build a basic SD card image to > boot the board (serial debug and ethernet working). > > Thanks to binman support, we can remove the ti-k3-image-gen tool from > Buildroot. To do that, we have to update existing defconfig (am62, am64). > > Followup commits can improve TI K3 HS-FS devices based on binman instead > of legacy core-secdev-k3 tool. > > [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html > [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > > Best regards, > Romain > > Dario Binacchi (5): > package/python-attrs: add host variant > package/python-rpds-py: add host variant > package/python-referencing: add host variant > package/python-jsonschema-specifications: add host variant > package/python-jsonschema: add host variant > > Romain Naour (16): > DEVELOPERS: add Romain Naour for am574x_idk_defconfig > configs/ti_am62x_sk_defconfig: fix optee-os plateform > configs/ti_am64x_sk_defconfig: fix optee-os plateform > boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to > BINARIES_DIR > boot/ti-k3-boot-firmware: introduce > BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} > boot/uboot: use DM firmware name defined by ti-k3-boot-firmware > package > boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options > boot/uboot: enable TI K3 Device Manager (DM) for j721e > boot/ti-k3-boot-firmware: bump to version 09.02.00.004 > configs/ti_j721e_sk_defconfig: new defconfig > configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman > tool > configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman > tool > boot/ti-k3-image-gen: remove package > > Config.in.legacy | 7 ++ > DEVELOPERS | 6 +- > board/ti/j721e-sk/genimage.cfg | 28 +++++++ > board/ti/j721e-sk/post-build.sh | 16 ++++ > board/ti/j721e-sk/readme.txt | 34 ++++++++ > boot/Config.in | 1 - > boot/ti-k3-boot-firmware/Config.in | 39 ++++++++++ > .../ti-k3-boot-firmware.hash | 2 +- > .../ti-k3-boot-firmware.mk | 16 ++-- > boot/ti-k3-image-gen/Config.in | 77 ------------------- > boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ------------- > boot/ti-k3-r5-loader/Config.in | 8 ++ > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 23 ++++++ > boot/uboot/Config.in | 27 ++++--- > boot/uboot/uboot.mk | 10 ++- > configs/ti_am62x_sk_defconfig | 14 ++-- > configs/ti_am64x_sk_defconfig | 14 ++-- > ...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- > package/python-attrs/python-attrs.mk | 6 ++ > .../python-jsonschema-specifications.mk | 10 +++ > .../python-jsonschema/python-jsonschema.mk | 14 ++++ > .../python-referencing/python-referencing.mk | 11 +++ > package/python-rpds-py/python-rpds-py.mk | 1 + > 24 files changed, 275 insertions(+), 180 deletions(-) > create mode 100644 board/ti/j721e-sk/genimage.cfg > create mode 100755 board/ti/j721e-sk/post-build.sh > create mode 100644 board/ti/j721e-sk/readme.txt > delete mode 100644 boot/ti-k3-image-gen/Config.in > delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk > copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From alexander.sverdlin at gmail.com Sat Feb 17 03:13:16 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 04:13:16 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <20240216222012.eaes5ktamizu6n5c@dasso> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240216201903.lhhkjevrgzcp5msz@dasso> <735636d6-c0f8-4226-ab8a-1576c2133189@smile.fr> <20240216222012.eaes5ktamizu6n5c@dasso> Message-ID: <3570b01e6a258bbafa2d6317ba8619ecb39f66ec.camel@gmail.com> Hello Andreas, On Fri, 2024-02-16 at 16:20 -0600, Andreas Dannenberg wrote: > On Fri, Feb 16, 2024 at 10:52:21PM +0100, Romain Naour wrote: > > Hello Andreas, > > > > Le 16/02/2024 ? 21:19, Andreas Dannenberg a ?crit?: > > > On Tue, Feb 13, 2024 at 06:27:56PM +0100, Romain Naour wrote: > > > > This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > > > > > > > > This series start by adding U-boot binman support already submitted in the > > > > preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > > > > [1], with small improvements. > > > > See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > > > > > > Thanks Romain and Dario for all the work on this, and submitting this. > > > Will be spending some time over the next few days to see how I can help > > > out with this effort. I can already see many great improvements since > > > the last time I worked on AM62x/AM64x support last year. > > > > Your feed back on HS-FS devices is really helpful. Alexander Sverdlin also > > helped on AM62x. > > > > Maybe if you can also test on AM64x just to be sure the defconfig is working. > > I'm planning on testing the entire series here pretty soon and will > provide feedback (I have access to any and all boards:) > > One of the things I'm trying to assess is what's still missing vs. the > previous attempt I made upstreaming this. For example, AM62x graphics > isn't there yet (ti-rogue-km / ti-rogue-um). maybe you could shed some light onto the AM62x situation. My conclusion is that since your initial buildroot BSP U-Boot has been switched to standard boot (CONFIG_BOOTSTD), refer to (U-Boot repo): commit 355c0afcd4b7c8c442c4d03e07649c24194b8e06 Author: Nishanth Menon Date: Fri Aug 25 13:02:52 2023 -0500 configs: am62x_evm_a53_defconfig: Switch to bootstd and commit ab54d9b28d8578cc43b214d39009e7b1def797e4 Author: Roger Quadros Date: Thu Oct 5 16:06:41 2023 +0300 board: ti: am62x: am62x.env: Fix boot_targets ti_mmc is not a valid boot_target for standard boot flow so I suppose TI's BSP still uses older U-Boot and is still not affected. Do we need uEnv.txt now? Do you have an idea which distro Nishanth may have tested with BOOTSTD change? -- Alexander Sverdlin. From kilian.zinnecker at mail.de Sat Feb 17 08:35:25 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sat, 17 Feb 2024 09:35:25 +0100 Subject: [Buildroot] [PATCH v3] configs/rock5b_defconfig: switch to mainline linux Message-ID: <20240217083525.561684-1-kilian.zinnecker@mail.de> This patch switches the board support of the Radxa Rock 5B from using a custom kernel to mainline linux 6.7.4. Thereby patches, which became redundant, are removed, as well as device tree modifications and no longer needed hash files. The needed ethernet drivers are activated via the kernel config fragment file. Also the board support is switched from using a uboot script and a uEnv file to using extlinux. Signed-off-by: Kilian Zinnecker --- v2 -> v3: - rock5b_defconfig: change BR2_KERNEL_HEADERS_6_7 to BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 - rock5b_defconfig: change uboot version from "latest" to fixed 2024.01 v1 -> v2: - removed unnecessary hash files (uboot, kernel) and removed hash enforcement (BR2_DOWNLOAD_FOCE_CHECK_HASHES) - bumped uboot from 2023.07 to latest version (currently 2024.01) - removed BR2_SYSTEM_DHCP as it is not needed for minimal config - specified kernel header version in defconfig - rearranged defconfig as in roc_pc_rk3399_defconfig - switched from uboot script + uEnv to extlinux.conf: removed fit image script, changed readme to list the correct output/image artifacts, removed post-image.sh, added post-build.sh, removed vfat partition from genimage.cfg, added extlinux.conf, removed boot.cmd board/radxa/rock5b/boot.cmd | 3 - board/radxa/rock5b/extlinux.conf | 4 ++ board/radxa/rock5b/genimage.cfg | 16 ----- board/radxa/rock5b/linux.fragment | 5 +- ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- ...x-building-error-on-Werror-array-com.patch | 43 ------------- board/radxa/rock5b/patches/linux/linux.hash | 2 - board/radxa/rock5b/patches/uboot/uboot.hash | 2 - board/radxa/rock5b/post-build.sh | 5 ++ board/radxa/rock5b/post-image.sh | 7 -- board/radxa/rock5b/readme.txt | 51 +-------------- board/radxa/rock5b/rock5b.dts | 12 ---- board/radxa/rock5b/rock5b.its | 46 ------------- configs/rock5b_defconfig | 59 +++++++++-------- 14 files changed, 44 insertions(+), 275 deletions(-) delete mode 100644 board/radxa/rock5b/boot.cmd create mode 100644 board/radxa/rock5b/extlinux.conf delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch delete mode 100644 board/radxa/rock5b/patches/linux/linux.hash delete mode 100644 board/radxa/rock5b/patches/uboot/uboot.hash create mode 100755 board/radxa/rock5b/post-build.sh delete mode 100755 board/radxa/rock5b/post-image.sh delete mode 100644 board/radxa/rock5b/rock5b.dts delete mode 100644 board/radxa/rock5b/rock5b.its diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd deleted file mode 100644 index 9a3e73e003..0000000000 --- a/board/radxa/rock5b/boot.cmd +++ /dev/null @@ -1,3 +0,0 @@ -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait -fatload mmc 1:1 ${loadaddr} image.itb -bootm ${loadaddr} diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf new file mode 100644 index 0000000000..a1a531f038 --- /dev/null +++ b/board/radxa/rock5b/extlinux.conf @@ -0,0 +1,4 @@ +label Radxa Rock 5b Linux + kernel /boot/Image + devicetree /boot/rk3588-rock-5b.dtb + append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait diff --git a/board/radxa/rock5b/genimage.cfg b/board/radxa/rock5b/genimage.cfg index 2943232fc3..138ec26e3a 100644 --- a/board/radxa/rock5b/genimage.cfg +++ b/board/radxa/rock5b/genimage.cfg @@ -1,15 +1,5 @@ # SD card image for Radxa Rock 5b -image boot.vfat { - vfat { - files = { - "image.itb", - "boot.scr" - } - } - size = 16M -} - image sdcard.img { hdimage { partition-table-type = "hybrid" @@ -21,12 +11,6 @@ image sdcard.img { offset = 32K } - partition boot { - partition-type = "0xC" - bootable = "true" - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext2" diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 28bb373ef2..90f2f291ba 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1,5 +1,2 @@ CONFIG_R8169=y -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set -# Disable Rockchip specific WiFi drivers, as the kernel -# code cannot be build with GCC 12 due to several Werrors -# CONFIG_WL_ROCKCHIP is not set +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch deleted file mode 100644 index 5632c5a627..0000000000 --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 -From: Kees Cook -Date: Sat, 12 Feb 2022 09:14:49 -0800 -Subject: etherdevice: Adjust ether_addr* prototypes to silence - -Wstringop-overead -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With GCC 12, -Wstringop-overread was warning about an implicit cast from -char[6] to char[8]. However, the extra 2 bytes are always thrown away, -alignment doesn't matter, and the risk of hitting the edge of unallocated -memory has been accepted, so this prototype can just be converted to a -regular char *. Silences: - -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], - | ^~~~~~~~~~~~~~~~~~~~~~~ - -Reported-by: Marc Kleine-Budde -Tested-by: Marc Kleine-Budde -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de -Cc: Jakub Kicinski -Cc: "David S. Miller" -Cc: netdev at vger.kernel.org -Signed-off-by: Kees Cook -Signed-off-by: David S. Miller -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd -Signed-off-by: Kilian Zinnecker ---- - include/linux/etherdevice.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h -index 2ad71cc90b37d..92b10e67d5f87 100644 ---- a/include/linux/etherdevice.h -+++ b/include/linux/etherdevice.h -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) - #endif - } - --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - #ifdef __BIG_ENDIAN -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. - */ - --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], -- const u8 addr2[6+2]) -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch deleted file mode 100644 index 10de6c72d3..0000000000 --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 -From: Xiongwei Song -Date: Fri, 14 Jan 2022 14:07:24 -0800 -Subject: mm: page_alloc: fix building error on -Werror=array-compare - -Arthur Marsh reported we would hit the error below when building kernel -with gcc-12: - - CC mm/page_alloc.o - mm/page_alloc.c: In function `mem_init_print_info': - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] - 8173 | if (start <= pos && pos < end && size > adj) \ - | - -In C++20, the comparision between arrays should be warned. - -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com -Signed-off-by: Xiongwei Song -Reported-by: Arthur Marsh -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f -Signed-off-by: Kilian Zinnecker ---- - mm/page_alloc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 806f317c2e7e2..c4ef450ac4428 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) - */ - #define adj_init_size(start, end, size, pos, adj) \ - do { \ -- if (start <= pos && pos < end && size > adj) \ -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ - size -= adj; \ - } while (0) - --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash deleted file mode 100644 index 95ad749554..0000000000 --- a/board/radxa/rock5b/patches/linux/linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash deleted file mode 100644 index efd629bd2f..0000000000 --- a/board/radxa/rock5b/patches/uboot/uboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 12e921b466ae731cdbc355e6832b7f22bc90b01aeceef9886f98aaba7b394300 u-boot-2023.07.tar.bz2 diff --git a/board/radxa/rock5b/post-build.sh b/board/radxa/rock5b/post-build.sh new file mode 100755 index 0000000000..d84a5da0b0 --- /dev/null +++ b/board/radxa/rock5b/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/board/radxa/rock5b/post-image.sh b/board/radxa/rock5b/post-image.sh deleted file mode 100755 index c706a5ee78..0000000000 --- a/board/radxa/rock5b/post-image.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -e - -gzip -fk "${BINARIES_DIR}/Image" -cp board/radxa/rock5b/rock5b.its "${BINARIES_DIR}" -(cd "${BINARIES_DIR}" && mkimage -f rock5b.its image.itb) -support/scripts/genimage.sh -c board/radxa/rock5b/genimage.cfg diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index b3eb06851a..441c28db25 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -13,21 +13,15 @@ Files created in output directory output/images . ??? Image -??? Image.gz -??? boot.scr -??? boot.vfat -??? image.itb -??? rk3588-rock-5b.dtb ??? rk3588_bl31_v1.40.elf ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin -??? rock5b.dts -??? rock5b.its +??? rk3588-rock-5b.dtb ??? rootfs.ext2 ??? rootfs.ext4 ??? rootfs.tar ??? sdcard.img -??? u-boot-rockchip.bin -??? u-boot.bin +??? u-boot.bin +??? u-boot-rockchip.bin Creating bootable SD card: ========================== @@ -61,42 +55,3 @@ Enter 'root' as login user, and the prompt is ready. wiki link: ---------- https://forum.radxa.com/c/rock5 - -Issues: -======= - -WiFi ----- -The custom Radxa kernel provides custom code to support WiFi. However, -that code does not compile with GCC 12, which is the current default -version in buildroot. Hence, the WiFi kernel drivers are disabled, until -the issues get fixed (if ever). If they are desperately needed, one may -apply the following workaround, as long as buildroot still supports GCC -version 11: - -1. Set GCC version 11, by adding the following line to -configs/rock5b_defconfig: - -BR2_GCC_VERSION_11_X=y - -2. Re-enable custom WiFi drivers by removing the following line from -board/radxa/rock5b/linux.fragment: - -# CONFIG_WL_ROCKCHIP is not set - -Rockchip FIQ Debugger ---------------------- -The custom kernel used for this board features an FIQ debugger, which -can be activated by typing "fiq" on the serial interface. As this can be -annoying if a user wants to type these charakters and it is not needed -for most users, this board support disables the FIQ debugger by default. -To re-enable the FIQ debugger follow the steps: - -1. In board/radxa/rock5b/rock5b.dts set the status property of the -fiq_debugger node to "okay" and set the status property of the uart2 -node to "disabled" - -2. Re-enable the fiq debugger module by removing the following line -from board/radxa/rock5b/linux.fragment: - -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts deleted file mode 100644 index 71a4e42b5e..0000000000 --- a/board/radxa/rock5b/rock5b.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -#include "rockchip/rk3588-rock-5b.dts" - -&fiq_debugger { - status = "disabled"; -}; - -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; -}; diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its deleted file mode 100644 index 9ce235d041..0000000000 --- a/board/radxa/rock5b/rock5b.its +++ /dev/null @@ -1,46 +0,0 @@ -/dts-v1/; - -/ { - description = "Rock 5B FIT Image"; - #address-cells = <1>; - - images { - kernel { - description = "Kernel"; - data = /incbin/("Image.gz"); - type = "kernel"; - arch = "arm64"; - os = "linux"; - compression = "gzip"; - load = <0x0a200000>; - entry = <0x0a200000>; - hash { - algo = "sha256"; - }; - }; - fdt { - description = "Device Tree"; - data = /incbin/("rock5b.dtb"); - type = "flat_dt"; - arch = "arm64"; - compression = "none"; - load = <0x0e000000>; - entry = <0x0e000000>; - hash { - algo = "sha256"; - }; - }; - }; - - configurations { - default = "standard"; - standard { - description = "Standard Boot"; - kernel = "kernel"; - fdt = "fdt"; - hash { - algo = "sha256"; - }; - }; - }; -}; diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 7175aa66bf..4014311a06 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -1,43 +1,46 @@ +# Architecture BR2_aarch64=y BR2_cortex_a76_a55=y -BR2_KERNEL_HEADERS_5_10=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="" -BR2_TARGET_GENERIC_HOSTNAME="rock5b" -BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" -BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_SYSTEM_DHCP="eth0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="250M" + +# Linux headers same as kernel, a 6.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7.4" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="rock5b" +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/radxa/rock5b/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_DTC=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_ROCKCHIP_RKBIN=y -BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" -BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock5b/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" -- 2.34.1 From kilian.zinnecker at mail.de Sat Feb 17 08:37:27 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sat, 17 Feb 2024 09:37:27 +0100 Subject: [Buildroot] [PATCH v2] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <05ae161a-0e1c-4cd5-92d1-4fd5b7d8c798@benettiengineering.com> References: <20240216221738.693818-1-kilian.zinnecker@mail.de> <05ae161a-0e1c-4cd5-92d1-4fd5b7d8c798@benettiengineering.com> Message-ID: <2718217.mvXUDI8C0e@laptop> Hello Giulio, all, > Hi Kilian, > > almost there, 2 comments below, [--SNIP --] I addressed the 2 issues and send a v3. Thanks for reviewing! Best regards, Kilian From frank.vanbever at mind.be Sat Feb 17 09:24:13 2024 From: frank.vanbever at mind.be (Frank Vanbever) Date: Sat, 17 Feb 2024 10:24:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodsecurity: security bump to 3.0.12 Message-ID: <20240217092413.288309-1-frank.vanbever@mind.be> The project has been transferred from Trustwave (SpiderLabs) to OWASP, hence the change in URLs. The upstream CPE vendor ID will likely also change in the future but the upstream is still working on this [1]. - Fixes: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-1019 [1] https://github.com/owasp-modsecurity/ModSecurity/issues/3083 Signed-off-by: Frank Vanbever --- package/libmodsecurity/Config.in | 2 +- package/libmodsecurity/libmodsecurity.hash | 5 +++-- package/libmodsecurity/libmodsecurity.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index 69bb0494cc..da14b21669 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBMODSECURITY SecRules format and apply them to HTTP content provided by your application via Connectors. - https://github.com/SpiderLabs/ModSecurity + https://github.com/owasp-modsecurity/ModSecurity comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index b0a1bf33f3..2221a8a37d 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.11/modsecurity-v3.0.11.tar.gz.sha256 -sha256 070f46c779d30785b95eb1316b46e2e4e6f90fd94a96aaca4bd54cd94738b692 modsecurity-v3.0.11.tar.gz +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 +sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz + # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 548eeb8602..d8c10b98b2 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.11 +LIBMODSECURITY_VERSION = 3.0.12 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz -LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) +LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE -- 2.40.1 From christian at aperture.us Sat Feb 17 09:32:33 2024 From: christian at aperture.us (Christian Stewart) Date: Sat, 17 Feb 2024 01:32:33 -0800 Subject: [Buildroot] build failure on Ubuntu 22.04 LTS: TIME_BITS=64 is allowed only with FILE_OFFSET_BITS=64 Message-ID: On a fresh Ubuntu 22.04.4 LTS VM: git clone https://github.com/buildroot/buildroot cd buildroot # master as of this e-mail git checkout 6c455505eb5ed8ed5bbf090f2bfb6241c9f153a2 cat <> defconfig BR2_arm=y BR2_cortex_a7=y BR2_BINUTILS_VERSION_2_41_X=y BR2_GCC_VERSION_13_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_CCACHE=y BR2_PACKAGE_SUDO=y EOF make defconfig BR2_DEFCONFIG=defconfig # fails with error shown below make sudo I was able to fix it with this patch, but I'm not sure if this is the "correct" fix: >From 6dc2b9350ceffc808fe7d048ff9dbe585649c304 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 17 Feb 2024 01:16:09 -0800 Subject: [PATCH] package/Makefile.in: fix build failure on Ubuntu 22.04 LTS Add flags for 64 bit timestamps when building host packages. -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 Build failure fixed: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" Fixes: https://github.com/skiffos/SkiffOS/issues/306 Signed-off-by: Christian Stewart --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 3e276d23d6..82d3a435fd 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -246,7 +246,7 @@ UNZIP := $(shell which unzip || type -p unzip) -q APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s) -HOST_CPPFLAGS = -I$(HOST_DIR)/include +HOST_CPPFLAGS = -I$(HOST_DIR)/include -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 HOST_CFLAGS ?= -O2 HOST_CFLAGS += $(HOST_CPPFLAGS) HOST_CXXFLAGS += $(HOST_CFLAGS) -- 2.43.1 Thanks, Christian Stewart -------------- next part -------------- An HTML attachment was scrubbed... URL: From christian at aperture.us Sat Feb 17 10:28:25 2024 From: christian at aperture.us (Christian Stewart) Date: Sat, 17 Feb 2024 02:28:25 -0800 Subject: [Buildroot] build failure on Ubuntu 22.04 LTS: TIME_BITS=64 is allowed only with FILE_OFFSET_BITS=64 In-Reply-To: References: Message-ID: Hi, The fix I included in the e-mail below does not work in all cases. This works to specifically fix the sudo build failure on Ubuntu 22.04.4 LTS: On Sat, Feb 17, 2024 at 1:32?AM Christian Stewart wrote: > > On a fresh Ubuntu 22.04.4 LTS VM: > > git clone https://github.com/buildroot/buildroot > cd buildroot > > # master as of this e-mail > git checkout 6c455505eb5ed8ed5bbf090f2bfb6241c9f153a2 > > cat <> defconfig > BR2_arm=y > BR2_cortex_a7=y > BR2_BINUTILS_VERSION_2_41_X=y > BR2_GCC_VERSION_13_X=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_CCACHE=y > BR2_PACKAGE_SUDO=y > EOF > > make defconfig BR2_DEFCONFIG=defconfig > > # fails with error shown below > make sudo > Here is an alternative fix which patches Sudo specifically: >From 3e39260ea5ee16d95363f51d5684447636269096 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 17 Feb 2024 01:16:09 -0800 Subject: [PATCH] package/sudo: set FILE_OFFSET_BITS and TIME_BITS for host mksiglist Add flags for 64 bit timestamps when building host mksiglist. -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 Build failure fixed: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" Fixes: https://github.com/skiffos/SkiffOS/issues/306 Signed-off-by: Christian Stewart --- ...e.in-set-TIME_BITS-and-FILE_OFFSET_B.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/sudo/0001-lib-util-Makefile.in-set-TIME_BITS-and-FILE_OFFSET_B.patch diff --git a/package/sudo/0001-lib-util-Makefile.in-set-TIME_BITS-and-FILE_OFFSET_B.patch b/package/sudo/0001-lib-util-Makefile.in-set-TIME_BITS-and-FILE_OFFSET_B.patch new file mode 100644 index 0000000000..fb84002c24 --- /dev/null +++ b/package/sudo/0001-lib-util-Makefile.in-set-TIME_BITS-and-FILE_OFFSET_B.patch @@ -0,0 +1,28 @@ +From 7a0074a82248228062054476bd317b9a40af58dd Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Sat, 17 Feb 2024 02:22:46 -0800 +Subject: [PATCH] lib/util/Makefile.in: set TIME_BITS and FILE_OFFSET_BITS to + 64 + +Fixes a build failure building mksiglist on Ubuntu 22.04.4 LTS. + +Signed-off-by: Christian Stewart +--- + lib/util/Makefile.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in +index 05455f701..a8c84888b 100644 +--- a/lib/util/Makefile.in ++++ b/lib/util/Makefile.in +@@ -72,6 +72,7 @@ CPPDEFS = -D_PATH_SUDO_CONF=\"@sudo_conf@\" + CPPFLAGS = -I$(incdir) -I$(top_builddir) -I. -I$(srcdir) $(CPPDEFS) \ + @CPPFLAGS@ -DDEFAULT_TEXT_DOMAIN=\"@PACKAGE_NAME@\" + HOSTCPPFLAGS = -I$(incdir) -I$(top_builddir) -I. -I$(srcdir) $(CPPDEFS) \ ++ -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 \ + @CPPFLAGS_FOR_BUILD@ -DDEFAULT_TEXT_DOMAIN=\"@PACKAGE_NAME@\" + + # Usually -O and/or -g +-- +2.43.1 + -- 2.43.1 ... again I am not sure if this is the right way to fix this. Best regards, Christian Stewart From yann.morin.1998 at free.fr Sat Feb 17 11:55:41 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 12:55:41 +0100 Subject: [Buildroot] build failure on Ubuntu 22.04 LTS: TIME_BITS=64 is allowed only with FILE_OFFSET_BITS=64 In-Reply-To: References: Message-ID: Christian, All, On 2024-02-17 01:32 -0800, Christian Stewart via buildroot spake thusly: > On a fresh Ubuntu 22.04.4 LTS VM: That also happens on Fedora 39. > cat <> defconfig > BR2_arm=y > BR2_cortex_a7=y > BR2_BINUTILS_VERSION_2_41_X=y > BR2_GCC_VERSION_13_X=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_CCACHE=y > BR2_PACKAGE_SUDO=y > EOF > > make defconfig BR2_DEFCONFIG=defconfig It would have been easier to debug if the full error message and the offending command were provided, so here it is: >>> sudo 1.9.15p5 Configuring [--SNIP--] /usr/bin/make \ PATH="/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/bin:....]:/usr/bin:/usr/sbin" [--SNIP--] AR="/usr/bin/ar" \ AS="/usr/bin/as" \ LD="/usr/bin/ld" \ NM="/usr/bin/nm" CC="/usr/bin/gcc" \ GCC="/usr/bin/gcc" \ CXX="/usr/bin/g++" \ CPP="/usr/bin/cpp" \ OBJCOPY="/usr/bin/objcopy" \ RANLIB="/usr/bin/ranlib" \ CPPFLAGS="-I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include" \ CFLAGS="-O2 -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include" \ CXXFLAGS="-O2 -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include" \ LDFLAGS="-L/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/lib -Wl,-rpath,/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/lib" \ CPPFLAGS="-I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include -I../../include -I../.." \ -C /home/ymorin/dev/buildroot/O/master/build/sudo-1.9.15p5/lib/util \ mksigname mksiglist /usr/bin/cpp \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -I../../include \ -I../.. \ ./sys_signame.h \ | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h In file included from /usr/include/features.h:394, from /usr/include/sys/types.h:25, from ./sys_signame.h:4: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ /usr/bin/gcc -I../../include -I../.. -I. -I. \ -D_PATH_SUDO_CONF=\"/etc/sudo.conf\" -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -DDEFAULT_TEXT_DOMAIN=\"sudo\" \ -O2 \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ ./mksigname.c -o mksigname In file included from /usr/include/features.h:394, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdlib.h:26, from ./mksigname.c:27: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ make[2]: *** [Makefile:263: mksigname] Error 1 In fact, there are *two* issues there. The first, which is the easiest to fix, is that the call to cpp is piped into a call to sed. cpp fails, but because of the pipe, its exit status is lost. The sed succeeds, though, so the rule as a whole succeeds. Then the call to gcc fails, which is fortunate, or we'd have missed the previous failure of cpp. This is trivial to fix: use a temp file for the output of cpp, and run the sed with that temp file as input, as a separate command in the same rule: --- lib/util/Makefile.orig 2024-02-17 12:25:13.554448884 +0100 +++ lib/util/Makefile 2024-02-17 12:26:20.727968989 +0100 @@ -273,10 +273,12 @@ fi mksiglist.h: $(srcdir)/sys_siglist.h - $(CPP) $(CPPFLAGS) $(srcdir)/sys_siglist.h | $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksiglist.h + $(CPP) $(CPPFLAGS) $(srcdir)/sys_siglist.h > mksiglist.h.tmp + $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < mksiglist.h.tmp > mksiglist.h mksigname.h: $(srcdir)/sys_signame.h - $(CPP) $(CPPFLAGS) $(srcdir)/sys_signame.h | $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h + $(CPP) $(CPPFLAGS) $(srcdir)/sys_signame.h > mksigname.h.tmp + $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < mksigname.h.tmp > mksigname.h closefrom_test: $(CLOSEFROM_TEST_OBJS) libsudo_util.la $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(CLOSEFROM_TEST_OBJS) libsudo_util.la $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(HARDENING_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) The second issue is quite more involved. Indeed, those are hapenning while running the SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST post-configure hook. It has been present for quite a while now, so let's revisit this. First, what hapenns for host-sudo? Well, we don't have it, so let's try a dirty hack with: @@ -87,3 +87,22 @@ endef SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_ENABLE_SUDO_GROUP_RULE $(eval $(autotools-package)) + +HOST_SUDO_CONF_OPTS = \ + --without-lecture \ + --without-sendmail \ + --without-umask \ + --with-logging=syslog \ + --without-interfaces \ + --with-env-editor \ + --without-pam \ + --disable-zlib \ + --without-ldap \ + --disable-openssl + +HOST_SUDO_INSTALL_OPTS = \ + INSTALL_OWNER="" \ + DESTDIR="$(HOST_DIR)" \ + install + +$(eval $(host-autotools-package)) $ make host-sudo-build 2>&1 |tee host-sudo.log [ succeeds ] $ grep -E 'mksig(list|name)' host-sudo.log [ empty ] So, a host build does not need to run those tools... Let's try to get rid of them in the target build as well... @@ -65,7 +65,7 @@ define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST -C $(@D)/lib/util mksigname mksiglist endef -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST +#SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST define SUDO_PERMISSIONS /usr/bin/sudo f 4755 0 0 - - - - - $ make sudo-build [ succeeds ] OK, so is that supperfluous at all nowadays? Can you further investigate, enabling PAM et al in turn and see if any optional dependency triggers a call to those two utilities? If not, can you look sunce when that is no longer needed and why? Oh, and could you work on my proposed fix and send iut upstream? Regards, Yann E. MORIN. > # fails with error shown below > make sudo > > I was able to fix it with this patch, but I'm not sure if this is the "correct" > fix: > > From 6dc2b9350ceffc808fe7d048ff9dbe585649c304 Mon Sep 17 00:00:00 2001 > From: Christian Stewart <[2]christian at aperture.us> > Date: Sat, 17 Feb 2024 01:16:09 -0800 > Subject: [PATCH] package/Makefile.in: fix build failure on Ubuntu 22.04 LTS > > Add flags for 64 bit timestamps when building host packages. > > -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > > Build failure fixed: > > /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed > only with _FILE_OFFSET_BITS=64" > ? ?26 | # ? error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > > Fixes: [3]https://github.com/skiffos/SkiffOS/issues/306 > > Signed-off-by: Christian Stewart <[4]christian at aperture.us> > --- > ?package/Makefile.in | 2 +- > ?1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/Makefile.in b/package/Makefile.in > index 3e276d23d6..82d3a435fd 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -246,7 +246,7 @@ UNZIP := $(shell which unzip || type -p unzip) -q > ? > ?APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $ > (if $(QUIET),-s) > ? > -HOST_CPPFLAGS ?= -I$(HOST_DIR)/include > +HOST_CPPFLAGS ?= -I$(HOST_DIR)/include -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > ?HOST_CFLAGS ? ?= -O2 > ?HOST_CFLAGS ? += $(HOST_CPPFLAGS) > ?HOST_CXXFLAGS += $(HOST_CFLAGS) > -- > 2.43.1 > > Thanks, > Christian Stewart > > > References: > > [1] https://github.com/buildroot/buildroot > [2] mailto:christian at aperture.us > [3] https://github.com/skiffos/SkiffOS/issues/306 > [4] mailto:christian at aperture.us > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Sat Feb 17 14:14:24 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 17 Feb 2024 15:14:24 +0100 Subject: [Buildroot] [PATCH v3] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <20240217083525.561684-1-kilian.zinnecker@mail.de> References: <20240217083525.561684-1-kilian.zinnecker@mail.de> Message-ID: <8b75fd72-c3e4-4359-9691-2bf824904d45@benettiengineering.com> Hi Kilian, On 17/02/24 09:35, Kilian Zinnecker wrote: > This patch switches the board support of the Radxa Rock 5B from > using a custom kernel to mainline linux 6.7.4. Thereby patches, > which became redundant, are removed, as well as device tree > modifications and no longer needed hash files. The needed ethernet > drivers are activated via the kernel config fragment file. Also the > board support is switched from using a uboot script and a uEnv file > to using extlinux. > > Signed-off-by: Kilian Zinnecker it looks everything good to me now, so: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > > --- > > v2 -> v3: > > - rock5b_defconfig: change BR2_KERNEL_HEADERS_6_7 to > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 > - rock5b_defconfig: change uboot version from "latest" to fixed > 2024.01 > > v1 -> v2: > > - removed unnecessary hash files (uboot, kernel) and removed hash > enforcement (BR2_DOWNLOAD_FOCE_CHECK_HASHES) > - bumped uboot from 2023.07 to latest version (currently 2024.01) > - removed BR2_SYSTEM_DHCP as it is not needed for minimal config > - specified kernel header version in defconfig > - rearranged defconfig as in roc_pc_rk3399_defconfig > - switched from uboot script + uEnv to extlinux.conf: removed fit > image script, changed readme to list the correct output/image > artifacts, removed post-image.sh, added post-build.sh, removed > vfat partition from genimage.cfg, added extlinux.conf, removed > boot.cmd > > board/radxa/rock5b/boot.cmd | 3 - > board/radxa/rock5b/extlinux.conf | 4 ++ > board/radxa/rock5b/genimage.cfg | 16 ----- > board/radxa/rock5b/linux.fragment | 5 +- > ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- > ...x-building-error-on-Werror-array-com.patch | 43 ------------- > board/radxa/rock5b/patches/linux/linux.hash | 2 - > board/radxa/rock5b/patches/uboot/uboot.hash | 2 - > board/radxa/rock5b/post-build.sh | 5 ++ > board/radxa/rock5b/post-image.sh | 7 -- > board/radxa/rock5b/readme.txt | 51 +-------------- > board/radxa/rock5b/rock5b.dts | 12 ---- > board/radxa/rock5b/rock5b.its | 46 ------------- > configs/rock5b_defconfig | 59 +++++++++-------- > 14 files changed, 44 insertions(+), 275 deletions(-) > delete mode 100644 board/radxa/rock5b/boot.cmd > create mode 100644 board/radxa/rock5b/extlinux.conf > delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > delete mode 100644 board/radxa/rock5b/patches/linux/linux.hash > delete mode 100644 board/radxa/rock5b/patches/uboot/uboot.hash > create mode 100755 board/radxa/rock5b/post-build.sh > delete mode 100755 board/radxa/rock5b/post-image.sh > delete mode 100644 board/radxa/rock5b/rock5b.dts > delete mode 100644 board/radxa/rock5b/rock5b.its > > diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd > deleted file mode 100644 > index 9a3e73e003..0000000000 > --- a/board/radxa/rock5b/boot.cmd > +++ /dev/null > @@ -1,3 +0,0 @@ > -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait > -fatload mmc 1:1 ${loadaddr} image.itb > -bootm ${loadaddr} > diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf > new file mode 100644 > index 0000000000..a1a531f038 > --- /dev/null > +++ b/board/radxa/rock5b/extlinux.conf > @@ -0,0 +1,4 @@ > +label Radxa Rock 5b Linux > + kernel /boot/Image > + devicetree /boot/rk3588-rock-5b.dtb > + append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait > diff --git a/board/radxa/rock5b/genimage.cfg b/board/radxa/rock5b/genimage.cfg > index 2943232fc3..138ec26e3a 100644 > --- a/board/radxa/rock5b/genimage.cfg > +++ b/board/radxa/rock5b/genimage.cfg > @@ -1,15 +1,5 @@ > # SD card image for Radxa Rock 5b > > -image boot.vfat { > - vfat { > - files = { > - "image.itb", > - "boot.scr" > - } > - } > - size = 16M > -} > - > image sdcard.img { > hdimage { > partition-table-type = "hybrid" > @@ -21,12 +11,6 @@ image sdcard.img { > offset = 32K > } > > - partition boot { > - partition-type = "0xC" > - bootable = "true" > - image = "boot.vfat" > - } > - > partition rootfs { > partition-type = 0x83 > image = "rootfs.ext2" > diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment > index 28bb373ef2..90f2f291ba 100644 > --- a/board/radxa/rock5b/linux.fragment > +++ b/board/radxa/rock5b/linux.fragment > @@ -1,5 +1,2 @@ > CONFIG_R8169=y > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > -# Disable Rockchip specific WiFi drivers, as the kernel > -# code cannot be build with GCC 12 due to several Werrors > -# CONFIG_WL_ROCKCHIP is not set > +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y > diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > deleted file mode 100644 > index 5632c5a627..0000000000 > --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 > -From: Kees Cook > -Date: Sat, 12 Feb 2022 09:14:49 -0800 > -Subject: etherdevice: Adjust ether_addr* prototypes to silence > - -Wstringop-overead > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -With GCC 12, -Wstringop-overread was warning about an implicit cast from > -char[6] to char[8]. However, the extra 2 bytes are always thrown away, > -alignment doesn't matter, and the risk of hitting the edge of unallocated > -memory has been accepted, so this prototype can just be converted to a > -regular char *. Silences: > - > -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] > - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); > - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? > - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > - | ^~~~~~~~~~~~~~~~~~~~~~~ > - > -Reported-by: Marc Kleine-Budde > -Tested-by: Marc Kleine-Budde > -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de > -Cc: Jakub Kicinski > -Cc: "David S. Miller" > -Cc: netdev at vger.kernel.org > -Signed-off-by: Kees Cook > -Signed-off-by: David S. Miller > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd > -Signed-off-by: Kilian Zinnecker > ---- > - include/linux/etherdevice.h | 5 ++--- > - 1 file changed, 2 insertions(+), 3 deletions(-) > - > -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h > -index 2ad71cc90b37d..92b10e67d5f87 100644 > ---- a/include/linux/etherdevice.h > -+++ b/include/linux/etherdevice.h > -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) > - #endif > - } > - > --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) > -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - #ifdef __BIG_ENDIAN > -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) > - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. > - */ > - > --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > -- const u8 addr2[6+2]) > -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > deleted file mode 100644 > index 10de6c72d3..0000000000 > --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 > -From: Xiongwei Song > -Date: Fri, 14 Jan 2022 14:07:24 -0800 > -Subject: mm: page_alloc: fix building error on -Werror=array-compare > - > -Arthur Marsh reported we would hit the error below when building kernel > -with gcc-12: > - > - CC mm/page_alloc.o > - mm/page_alloc.c: In function `mem_init_print_info': > - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] > - 8173 | if (start <= pos && pos < end && size > adj) \ > - | > - > -In C++20, the comparision between arrays should be warned. > - > -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com > -Signed-off-by: Xiongwei Song > -Reported-by: Arthur Marsh > -Signed-off-by: Andrew Morton > -Signed-off-by: Linus Torvalds > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f > -Signed-off-by: Kilian Zinnecker > ---- > - mm/page_alloc.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/mm/page_alloc.c b/mm/page_alloc.c > -index 806f317c2e7e2..c4ef450ac4428 100644 > ---- a/mm/page_alloc.c > -+++ b/mm/page_alloc.c > -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) > - */ > - #define adj_init_size(start, end, size, pos, adj) \ > - do { \ > -- if (start <= pos && pos < end && size > adj) \ > -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ > - size -= adj; \ > - } while (0) > - > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash > deleted file mode 100644 > index 95ad749554..0000000000 > --- a/board/radxa/rock5b/patches/linux/linux.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Locally calculated > -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz > diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash > deleted file mode 100644 > index efd629bd2f..0000000000 > --- a/board/radxa/rock5b/patches/uboot/uboot.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Locally calculated > -sha256 12e921b466ae731cdbc355e6832b7f22bc90b01aeceef9886f98aaba7b394300 u-boot-2023.07.tar.bz2 > diff --git a/board/radxa/rock5b/post-build.sh b/board/radxa/rock5b/post-build.sh > new file mode 100755 > index 0000000000..d84a5da0b0 > --- /dev/null > +++ b/board/radxa/rock5b/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf > diff --git a/board/radxa/rock5b/post-image.sh b/board/radxa/rock5b/post-image.sh > deleted file mode 100755 > index c706a5ee78..0000000000 > --- a/board/radxa/rock5b/post-image.sh > +++ /dev/null > @@ -1,7 +0,0 @@ > -#!/usr/bin/env bash > -set -e > - > -gzip -fk "${BINARIES_DIR}/Image" > -cp board/radxa/rock5b/rock5b.its "${BINARIES_DIR}" > -(cd "${BINARIES_DIR}" && mkimage -f rock5b.its image.itb) > -support/scripts/genimage.sh -c board/radxa/rock5b/genimage.cfg > diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt > index b3eb06851a..441c28db25 100644 > --- a/board/radxa/rock5b/readme.txt > +++ b/board/radxa/rock5b/readme.txt > @@ -13,21 +13,15 @@ Files created in output directory > output/images > . > ??? Image > -??? Image.gz > -??? boot.scr > -??? boot.vfat > -??? image.itb > -??? rk3588-rock-5b.dtb > ??? rk3588_bl31_v1.40.elf > ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin > -??? rock5b.dts > -??? rock5b.its > +??? rk3588-rock-5b.dtb > ??? rootfs.ext2 > ??? rootfs.ext4 > ??? rootfs.tar > ??? sdcard.img > -??? u-boot-rockchip.bin > -??? u-boot.bin > +??? u-boot.bin > +??? u-boot-rockchip.bin > > Creating bootable SD card: > ========================== > @@ -61,42 +55,3 @@ Enter 'root' as login user, and the prompt is ready. > wiki link: > ---------- > https://forum.radxa.com/c/rock5 > - > -Issues: > -======= > - > -WiFi > ----- > -The custom Radxa kernel provides custom code to support WiFi. However, > -that code does not compile with GCC 12, which is the current default > -version in buildroot. Hence, the WiFi kernel drivers are disabled, until > -the issues get fixed (if ever). If they are desperately needed, one may > -apply the following workaround, as long as buildroot still supports GCC > -version 11: > - > -1. Set GCC version 11, by adding the following line to > -configs/rock5b_defconfig: > - > -BR2_GCC_VERSION_11_X=y > - > -2. Re-enable custom WiFi drivers by removing the following line from > -board/radxa/rock5b/linux.fragment: > - > -# CONFIG_WL_ROCKCHIP is not set > - > -Rockchip FIQ Debugger > ---------------------- > -The custom kernel used for this board features an FIQ debugger, which > -can be activated by typing "fiq" on the serial interface. As this can be > -annoying if a user wants to type these charakters and it is not needed > -for most users, this board support disables the FIQ debugger by default. > -To re-enable the FIQ debugger follow the steps: > - > -1. In board/radxa/rock5b/rock5b.dts set the status property of the > -fiq_debugger node to "okay" and set the status property of the uart2 > -node to "disabled" > - > -2. Re-enable the fiq debugger module by removing the following line > -from board/radxa/rock5b/linux.fragment: > - > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts > deleted file mode 100644 > index 71a4e42b5e..0000000000 > --- a/board/radxa/rock5b/rock5b.dts > +++ /dev/null > @@ -1,12 +0,0 @@ > -/dts-v1/; > - > -#include "rockchip/rk3588-rock-5b.dts" > - > -&fiq_debugger { > - status = "disabled"; > -}; > - > -&uart2 { > - pinctrl-0 = <&uart2m0_xfer>; > - status = "okay"; > -}; > diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its > deleted file mode 100644 > index 9ce235d041..0000000000 > --- a/board/radxa/rock5b/rock5b.its > +++ /dev/null > @@ -1,46 +0,0 @@ > -/dts-v1/; > - > -/ { > - description = "Rock 5B FIT Image"; > - #address-cells = <1>; > - > - images { > - kernel { > - description = "Kernel"; > - data = /incbin/("Image.gz"); > - type = "kernel"; > - arch = "arm64"; > - os = "linux"; > - compression = "gzip"; > - load = <0x0a200000>; > - entry = <0x0a200000>; > - hash { > - algo = "sha256"; > - }; > - }; > - fdt { > - description = "Device Tree"; > - data = /incbin/("rock5b.dtb"); > - type = "flat_dt"; > - arch = "arm64"; > - compression = "none"; > - load = <0x0e000000>; > - entry = <0x0e000000>; > - hash { > - algo = "sha256"; > - }; > - }; > - }; > - > - configurations { > - default = "standard"; > - standard { > - description = "Standard Boot"; > - kernel = "kernel"; > - fdt = "fdt"; > - hash { > - algo = "sha256"; > - }; > - }; > - }; > -}; > diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig > index 7175aa66bf..4014311a06 100644 > --- a/configs/rock5b_defconfig > +++ b/configs/rock5b_defconfig > @@ -1,43 +1,46 @@ > +# Architecture > BR2_aarch64=y > BR2_cortex_a76_a55=y > -BR2_KERNEL_HEADERS_5_10=y > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="" > -BR2_TARGET_GENERIC_HOSTNAME="rock5b" > -BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" > -BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" > -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > -BR2_SYSTEM_DHCP="eth0" > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" > -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set > -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" > -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > -BR2_TARGET_ROOTFS_EXT2_SIZE="250M" > + > +# Linux headers same as kernel, a 6.7 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y > +BR2_PACKAGE_ROCKCHIP_RKBIN=y > +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" > +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7.4" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" > +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" > + > +# Filesystem > +BR2_TARGET_GENERIC_HOSTNAME="rock5b" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" > BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/radxa/rock5b/boot.cmd" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_DTC=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_ROCKCHIP_RKBIN=y > -BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" > -BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock5b/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:24 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:24 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices Message-ID: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> The SK-AM62B-P1 is the newest version of SK-AM62 which includes high-security field-securable (HS-FS) silicon to optionally customize keys and encryption for security applications. This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, which, however, was buggy. This series fixes the errors and bumps the Linux kernel and U-Boot required for such a new device. This series, which in my humble opinion, should have been immediately considered to correct the compilation errors in case of HS-FS devcies, has seen an increase in patches in version 4 to remove the ti-k3-image-gen package thanks to Binman. Additionally, it shares some modifications and views on how to implement certain changes with the series https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. Therefore, I think it is necessary not to run them in parallel but to decide whether to merge one before the other or to consider a single series where the patches can be coherent with each other. I am available for both solutions. Let me know. Dario Binacchi (20): configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version boot/ti-k3-r5-loader: bump to version 2024.01 boot/ti-k3-core-secdev: new package boot/ti-k3-image-gen: manage HS hardware package/python-jsonschema: add host variant package/python-attrs: add host variant package/python-referencing: add host variant package/python-rpds-py: add host variant package/python-jsonschema-specifications: add host variant boot/ti-k3-r5-loader: set binman environment boot/uboot: set BINMAN_INDIRS for TI K3 DM configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 boot: move ti-k3-* packages to 'ti-k3' directory boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore DEVELOPERS | 1 + board/ti/am62x-sk/genimage.cfg | 7 +- board/ti/am62x-sk/post-build.sh | 49 ++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++ boot/Config.in | 4 +- boot/ti-k3-image-gen/Config.in | 77 ------------------- boot/ti-k3/Config.in | 59 ++++++++++++++ boot/ti-k3/common.mk | 1 + .../{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 .../ti-k3-boot-firmware.hash | 0 .../ti-k3-boot-firmware.mk | 0 boot/ti-k3/ti-k3-core-secdev/Config.in | 9 +++ .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 + .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 ++++++ boot/ti-k3/ti-k3-image-gen/Config.in | 25 ++++++ .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 .../ti-k3-image-gen/ti-k3-image-gen.mk | 20 ++++- boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 4 +- .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- .../ti-k3-r5-loader/ti-k3-r5-loader.mk | 16 +++- boot/uboot/Config.in | 7 +- boot/uboot/uboot.mk | 3 +- configs/ti_am62x_sk_defconfig | 23 +++--- configs/ti_am64x_sk_defconfig | 8 +- package/python-attrs/python-attrs.mk | 6 ++ .../python-jsonschema-specifications.mk | 5 ++ .../python-jsonschema/python-jsonschema.mk | 6 ++ .../python-referencing/python-referencing.mk | 5 ++ package/python-rpds-py/python-rpds-py.mk | 1 + 29 files changed, 263 insertions(+), 105 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh delete mode 100644 boot/ti-k3-image-gen/Config.in create mode 100644 boot/ti-k3/Config.in create mode 100644 boot/ti-k3/common.mk rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) create mode 100644 boot/ti-k3/ti-k3-core-secdev/Config.in create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk create mode 100644 boot/ti-k3/ti-k3-image-gen/Config.in rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (67%) rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (97%) rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (54%) rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (85%) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:25 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:25 +0100 Subject: [Buildroot] [PATCH v4 01/20] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-2-dario.binacchi@amarulasolutions.com> Checking the output of the command `git grep PLATFORM | grep k3`, we can found the proper settings for the optee-os package: .github/workflows/ci.yml: _make PLATFORM=k3-am62x .github/workflows/ci.yml: _make PLATFORM=k3-am62x CFG_ARM64_core=y ... core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- configs/ti_am62x_sk_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c68..fde6f8f5636a 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:26 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:26 +0100 Subject: [Buildroot] [PATCH v4 02/20] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-3-dario.binacchi@amarulasolutions.com> Checking the output of the command `git grep PLATFORM | grep k3`, we can found the proper settings for the optee-os package: .github/workflows/ci.yml: _make PLATFORM=k3-am64x .github/workflows/ci.yml: _make PLATFORM=k3-am64x CFG_ARM64_core=y ... core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- configs/ti_am64x_sk_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8d3..98476c88626b 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:27 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:27 +0100 Subject: [Buildroot] [PATCH v4 03/20] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-4-dario.binacchi@amarulasolutions.com> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index fde6f8f5636a..a4cffe09ce72 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -26,6 +26,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:28 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:28 +0100 Subject: [Buildroot] [PATCH v4 04/20] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-5-dario.binacchi@amarulasolutions.com> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 98476c88626b..5fd9653b5b8f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -26,6 +26,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:29 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:29 +0100 Subject: [Buildroot] [PATCH v4 05/20] boot/ti-k3-r5-loader: bump to version 2024.01 In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-6-dario.binacchi@amarulasolutions.com> All in-tree configs with the ti-k3-r5 bootloader use a custom version, so this patch is mostly for the menuconfig default version Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5a8..5f86c045c99f 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -16,7 +16,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2022.10" + bool "2024.01" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -60,7 +60,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index c5d1cb8e09f0..fbe5d215409d 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:30 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:30 +0100 Subject: [Buildroot] [PATCH v4 06/20] boot/ti-k3-core-secdev: new package In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> This is a security development package containing tools for High-Security(HS) TI K3 platform devices. Signed-off-by: Dario Binacchi --- Changes in v4: - Remove the trailing '/' at the end of the url in the help of Config.in - Fixed license issues - Use $(BINARIES_DIR)/ti-k3-core-secdev as the directory where to install files. Signed-off-by: Dario Binacchi --- DEVELOPERS | 1 + boot/Config.in | 1 + boot/ti-k3-core-secdev/Config.in | 9 ++++++++ boot/ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 +++ boot/ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 +++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 boot/ti-k3-core-secdev/Config.in create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb11..33d99ab2440f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -753,6 +753,7 @@ F: package/xinetd/ N: Dario Binacchi F: board/bsh/ F: board/stmicroelectronics/stm32f769-disco/ +F: boot/ti-k3-core-secdev/ F: configs/imx8mn_bsh_smm_s2_defconfig F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: configs/stm32f769_disco_sd_defconfig diff --git a/boot/Config.in b/boot/Config.in index e5fdf7ad439e..18a7d268f95a 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-boot-firmware/Config.in" +source "boot/ti-k3-core-secdev/Config.in" source "boot/ti-k3-image-gen/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in new file mode 100644 index 000000000000..f7b4e2962042 --- /dev/null +++ b/boot/ti-k3-core-secdev/Config.in @@ -0,0 +1,9 @@ +config BR2_TARGET_TI_K3_CORE_SECDEV + bool "ti-k3-core-secdev" + depends on BR2_aarch64 + help + This package downloads and installs development tools for + High-Security(HS) TI K3 platforms (which include AM62x, + AM64x, AM65x and more). + + https://git.ti.com/cgit/security-development-tools/core-secdev-k3 diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash new file mode 100644 index 000000000000..e3074a398d62 --- /dev/null +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06 core-secdev-k3-08.06.00.007.tar.xz +sha256 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369 manifest/k3-secdev-0.2-manifest.html diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk new file mode 100644 index 000000000000..f7655a0fefc8 --- /dev/null +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# ti-k3-core-secdev +# +################################################################################ + +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES +TI_K3_CORE_SECDEV_LICENSE = BSD-3-Clause +TI_K3_CORE_SECDEV_LICENSE_FILES = manifest/k3-secdev-0.2-manifest.html + +TI_K3_CORE_SECDEV_INSTALL_DIR = $(BINARIES_DIR)/ti-k3-core-secdev + +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS + mkdir -p $(TI_K3_CORE_SECDEV_INSTALL_DIR) + cp -dpfr $(@D)/keys $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ + cp -dpfr $(@D)/scripts $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ +endef + +$(eval $(generic-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:31 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:31 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> The patch sets the configurations required by TI HS systems. Some of these configurations (i. e. HS SYSFW image signing key, HS Software Revision) are provided by the ti-k3-core-secdev package in the binaries directory. Signed-off-by: Dario Binacchi --- no changes since v3: Signed-off-by: Dario Binacchi --- boot/ti-k3-image-gen/Config.in | 1 + boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e911..38d1598d9fc0 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN bool "ti-k3-image-gen" depends on BR2_TARGET_TI_K3_R5_LOADER select BR2_TARGET_TI_K3_BOOT_FIRMWARE + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS # We need FIT support in uboot-tools, which is why we select a # host package select BR2_PACKAGE_HOST_UBOOT_TOOLS diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk index 64be9a18f2c4..74b4fcb4bf89 100644 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) +TI_K3_IMAGE_GEN_SYSFW = \ + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin +else +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev + +TI_K3_IMAGE_GEN_SYSFW = \ + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin +endif define TI_K3_IMAGE_GEN_CONFIGURE_CMDS - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ + ) endef define TI_K3_IMAGE_GEN_BUILD_CMDS @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS $(BR2_MAKE) -C $(@D) \ SOC=$(TI_K3_IMAGE_GEN_SOC) \ SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ CONFIG=evm \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:32 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:32 +0100 Subject: [Buildroot] [PATCH v4 08/20] package/python-jsonschema: add host variant In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-9-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host Signed-off-by: Dario Binacchi --- package/python-jsonschema/python-jsonschema.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa7752..85fef7ad22ac 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,10 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:34 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:34 +0100 Subject: [Buildroot] [PATCH v4 10/20] package/python-referencing: add host variant In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-11-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- Changes in v4: - Drop host-python-attrs from PYTHON_REFERENCING_DEPENDENCIES Changes in v3: - Drop Config.in.host Signed-off-by: Dario Binacchi --- package/python-referencing/python-referencing.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e913a..f00a0efe73e8 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,9 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:33 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:33 +0100 Subject: [Buildroot] [PATCH v4 09/20] package/python-attrs: add host variant In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-10-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host Signed-off-by: Dario Binacchi --- package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc4402..fb1729e62fa2 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:35 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:35 +0100 Subject: [Buildroot] [PATCH v4 11/20] package/python-rpds-py: add host variant In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-12-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host Signed-off-by: Dario Binacchi --- package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4fde..cee2ff290a4e 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:36 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:36 +0100 Subject: [Buildroot] [PATCH v4 12/20] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-13-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host Signed-off-by: Dario Binacchi --- .../python-jsonschema-specifications.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9d4..b6e309ab2bc9 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,9 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:37 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:37 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. The patch set the BINMAN_INDIRS environment variable to provide the directory to search for binary blobs and select the packages required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- Changes in v4: - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Changes in v2: - Change commit message - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Select packages required by binman if BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled Signed-off-by: Dario Binacchi --- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f2e..2a10024aedaa 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python-attrs \ + host-python-jsonschema \ + host-python-jsonschema-specifications \ + host-python-pyyaml \ + host-python-referencing \ + host-python-rpds-py TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt +endif + ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + BINMAN_INDIRS=$(BINARIES_DIR) \ HOSTLDFLAGS="$(HOST_LDFLAGS)" define TI_K3_R5_LOADER_BUILD_CMDS -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:38 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:38 +0100 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> As explained in [1], adding support for AM62x LP SK in U-Boot, requires binman for building bootloader images. The BINMAN_INDIRS environment variable is used to provide a space-separated list of directories to search for binary blobs. [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ Signed-off-by: Dario Binacchi --- no changes since v1: Signed-off-by: Dario Binacchi --- boot/uboot/uboot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a88059..cf70f86a4132 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -189,7 +189,8 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ + BINMAN_INDIRS=$(BINARIES_DIR) endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:39 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:39 +0100 Subject: [Buildroot] [PATCH v4 15/20] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-16-dario.binacchi@amarulasolutions.com> The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - The use of binman for building images. Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v4: - bump to 204.01 instead of 2023.10 - Update the commit message - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. Changes in v2: - Update the commit message - Drop Python options required by binman. - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically selects the Python modules required by binman. Signed-off-by: Dario Binacchi --- board/ti/am62x-sk/genimage.cfg | 7 ++++- board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++++++++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++++ configs/ti_am62x_sk_defconfig | 11 ++++---- 4 files changed, 66 insertions(+), 6 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg index 26304fe98f99..398209f4d831 100644 --- a/board/ti/am62x-sk/genimage.cfg +++ b/board/ti/am62x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh new file mode 100755 index 000000000000..0f1f98ef217a --- /dev/null +++ b/board/ti/am62x-sk/post-build.sh @@ -0,0 +1,49 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:r:x:' +O='console:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing argument" +[ -n "${ROOT}" ] || die "Missing argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label am62x-sk-buildroot + kernel /Image + fdtdir / + append ${append} + __HEADER_EOF diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh new file mode 100755 index 000000000000..34f732c091ad --- /dev/null +++ b/board/ti/am62x-sk/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh -x + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a4cffe09ce72..193301c8b941 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_TARGET_ROOTFS_EXT2=y @@ -27,14 +27,15 @@ BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:40 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:40 +0100 Subject: [Buildroot] [PATCH v4 16/20] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-17-dario.binacchi@amarulasolutions.com> Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v4 - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. no changes since v1 Signed-off-by: Dario Binacchi --- configs/ti_am62x_sk_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 193301c8b941..4de39fb897fd 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.1" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:41 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:41 +0100 Subject: [Buildroot] [PATCH v4 17/20] boot: move ti-k3-* packages to 'ti-k3' directory In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-18-dario.binacchi@amarulasolutions.com> Move all TI K3 packages to the directory ti-k3. This patch is preparatory for future developments. Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- boot/Config.in | 5 +---- boot/ti-k3/Config.in | 13 +++++++++++++ boot/ti-k3/common.mk | 1 + boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 .../ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 0 .../ti-k3-boot-firmware/ti-k3-boot-firmware.mk | 0 boot/{ => ti-k3}/ti-k3-core-secdev/Config.in | 0 .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 0 .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 0 boot/{ => ti-k3}/ti-k3-image-gen/Config.in | 0 .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk | 0 boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 0 .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 0 boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk | 0 configs/ti_am62x_sk_defconfig | 1 + configs/ti_am64x_sk_defconfig | 1 + 17 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 boot/ti-k3/Config.in create mode 100644 boot/ti-k3/common.mk rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) rename boot/{ => ti-k3}/ti-k3-core-secdev/Config.in (100%) rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.hash (100%) rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.mk (100%) rename boot/{ => ti-k3}/ti-k3-image-gen/Config.in (100%) rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (100%) rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (100%) rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (100%) rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (100%) diff --git a/boot/Config.in b/boot/Config.in index 18a7d268f95a..74a64a096afc 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -19,10 +19,7 @@ source "boot/opensbi/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" -source "boot/ti-k3-boot-firmware/Config.in" -source "boot/ti-k3-core-secdev/Config.in" -source "boot/ti-k3-image-gen/Config.in" -source "boot/ti-k3-r5-loader/Config.in" +source "boot/ti-k3/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in new file mode 100644 index 000000000000..06dda2f156a9 --- /dev/null +++ b/boot/ti-k3/Config.in @@ -0,0 +1,13 @@ +config BR2_TARGET_TI_K3 + bool "TI K3" + help + The TI K3 bootloaders and tools. + +if BR2_TARGET_TI_K3 + +source "boot/ti-k3/ti-k3-boot-firmware/Config.in" +source "boot/ti-k3/ti-k3-core-secdev/Config.in" +source "boot/ti-k3/ti-k3-image-gen/Config.in" +source "boot/ti-k3/ti-k3-r5-loader/Config.in" + +endif diff --git a/boot/ti-k3/common.mk b/boot/ti-k3/common.mk new file mode 100644 index 000000000000..18a1329baa4c --- /dev/null +++ b/boot/ti-k3/common.mk @@ -0,0 +1 @@ +include $(sort $(wildcard boot/ti-k3/*/*.mk)) diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3/ti-k3-boot-firmware/Config.in similarity index 100% rename from boot/ti-k3-boot-firmware/Config.in rename to boot/ti-k3/ti-k3-boot-firmware/Config.in diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash similarity index 100% rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk similarity index 100% rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3/ti-k3-core-secdev/Config.in similarity index 100% rename from boot/ti-k3-core-secdev/Config.in rename to boot/ti-k3/ti-k3-core-secdev/Config.in diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash similarity index 100% rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.hash rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk similarity index 100% rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.mk rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in similarity index 100% rename from boot/ti-k3-image-gen/Config.in rename to boot/ti-k3/ti-k3-image-gen/Config.in diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash similarity index 100% rename from boot/ti-k3-image-gen/ti-k3-image-gen.hash rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk similarity index 100% rename from boot/ti-k3-image-gen/ti-k3-image-gen.mk rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3/ti-k3-r5-loader/Config.in similarity index 100% rename from boot/ti-k3-r5-loader/Config.in rename to boot/ti-k3/ti-k3-r5-loader/Config.in diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash similarity index 100% rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.hash rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk similarity index 100% rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.mk rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 4de39fb897fd..cd26235342e4 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" +BR2_TARGET_TI_K3=y BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 5fd9653b5b8f..1befeb4ab96c 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" +BR2_TARGET_TI_K3=y BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:42 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:42 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot can use Binman to compile and sign the generated binaries, thus making the use of custom tools like ti-k3-image-gen no longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were configured and used outside of it. This patch allows setting such options even if the package is not enabled. --- Added in v4 Signed-off-by: Dario Binacchi --- boot/ti-k3/Config.in | 46 ++++++++++++++ boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- boot/uboot/Config.in | 7 +-- configs/ti_am62x_sk_defconfig | 2 +- configs/ti_am64x_sk_defconfig | 2 +- 6 files changed, 59 insertions(+), 67 deletions(-) diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in index 06dda2f156a9..9e508326c9c8 100644 --- a/boot/ti-k3/Config.in +++ b/boot/ti-k3/Config.in @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 if BR2_TARGET_TI_K3 +choice + prompt "SoC family" + +config BR2_TARGET_TI_K3_SOC_AM62AX + bool "am62ax" + +config BR2_TARGET_TI_K3_SOC_AM62X + bool "am62x" + +config BR2_TARGET_TI_K3_SOC_AM64X + bool "am64x" + +config BR2_TARGET_TI_K3_SOC_AM65X + bool "am65x" + +endchoice + +choice + prompt "Security type" + help + The target SoC security type option. + +config BR2_TARGET_TI_K3_SECTYPE_GP + bool "gp" + +config BR2_TARGET_TI_K3_SECTYPE_HS_FS + bool "hs-fs" + +config BR2_TARGET_TI_K3_SECTYPE_HS + bool "hs" + +endchoice + +config BR2_TARGET_TI_K3_SOC + string + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X + +config BR2_TARGET_TI_K3_SECTYPE + string + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS + source "boot/ti-k3/ti-k3-boot-firmware/Config.in" source "boot/ti-k3/ti-k3-core-secdev/Config.in" source "boot/ti-k3/ti-k3-image-gen/Config.in" diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in index 38d1598d9fc0..2d53d62dd4ee 100644 --- a/boot/ti-k3/ti-k3-image-gen/Config.in +++ b/boot/ti-k3/ti-k3-image-gen/Config.in @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN bool "ti-k3-image-gen" depends on BR2_TARGET_TI_K3_R5_LOADER select BR2_TARGET_TI_K3_BOOT_FIRMWARE - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS # We need FIT support in uboot-tools, which is why we select a # host package select BR2_PACKAGE_HOST_UBOOT_TOOLS @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X endif diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk index 74b4fcb4bf89..834d8f7d5cd5 100644 --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ $(BR2_MAKE_HOST_DEPENDENCY) TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) TI_K3_IMAGE_GEN_SYSFW = \ $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin else diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930db..1a9d21e7c6d1 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" # We use the SoC selection defined for the ti-k3-image-gen # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index cd26235342e4..cfefce0a77a4 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" BR2_TARGET_TI_K3=y +BR2_TARGET_TI_K3_SOC_AM62X=y BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 1befeb4ab96c..daf78dbffff8 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" BR2_TARGET_TI_K3=y +BR2_TARGET_TI_K3_SOC_AM64X=y BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:43 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:43 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot are capable of building tiboot3.bin using Binman. In this case, let's copy it to the binaries directory. Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk index 2a10024aedaa..643298a1e70a 100644 --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) + define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; endef $(eval $(kconfig-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:44 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:44 +0100 Subject: [Buildroot] [PATCH v4 20/20] configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-21-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot are capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index cfefce0a77a4..6259dec5985d 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,7 +25,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" BR2_TARGET_TI_K3=y BR2_TARGET_TI_K3_SOC_AM62X=y -BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" -- 2.43.0 From ju.o at free.fr Sat Feb 17 16:05:15 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 17 Feb 2024 17:05:15 +0100 Subject: [Buildroot] [PATCH] package/iozone: bump to version 3.506 In-Reply-To: <20240215142413.451505-2-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> <20240215142413.451505-2-gilles.talis@gmail.com> Message-ID: Hi Gilles, All, Thanks for the patch! I have few comments: Could you add a reference in commit log to the upstream change log? For example: """ For change log, see end of file: https://www.iozone.org/src/current/Changes.txt """ This helps a lot for later analyses/debugging. Also, the upstream archive of this new version seems to include the license file. So the comment can be removed, and the license file added (see later). Finally, could you add a comment in the commit log that: The upstream archive format changed from tgz to tar. (just to record this is not an arbitrary change). On 15/02/2024 15:24, Gilles Talis wrote: > Signed-off-by: Gilles Talis > --- > package/iozone/iozone.hash | 2 +- > package/iozone/iozone.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash > index 9ecf1d1af8..c506b41db2 100644 > --- a/package/iozone/iozone.hash > +++ b/package/iozone/iozone.hash > @@ -1,2 +1,2 @@ > # Locally calculated > -sha256 > 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 > iozone3_493.tgz > +sha256 > 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7 > iozone3_506.tar The license file hash can be added here: sha256 bff7909fd698708d15613a4fb977a193cff98f44ef170c2dc1dd502974df75b2 docs/License.txt > diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk > index 2df4a2aa84..7cce15c53d 100644 > --- a/package/iozone/iozone.mk > +++ b/package/iozone/iozone.mk > @@ -4,8 +4,8 @@ > # > > ################################################################################ > > -IOZONE_VERSION = 3.493 > -IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz > +IOZONE_VERSION = 3.506 > +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar > IOZONE_SITE = http://www.iozone.org/src/current > IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) > # IOzone license details can be found at: The license comment can be removed here, and the license file added: IOZONE_LICENSE_FILES = docs/License.txt > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Best regards, Julien. From alexander.sverdlin at gmail.com Sat Feb 17 17:06:05 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 18:06:05 +0100 Subject: [Buildroot] [PATCH v4 06/20] boot/ti-k3-core-secdev: new package In-Reply-To: <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > This is a security development package containing tools for > High-Security(HS) TI K3 platform devices. > > Signed-off-by: Dario Binacchi as I understand secdev package is not required for binman-based U-Boot deployments starting from v2023.10. So what is the point of introducing the package now if you update U-Boot to v2024.01? I belive it's as legacy as ti-k3-image-gen (which you are fixing) but Romain's patchset removed the package and, quite successfully, from the perspective of building for HS variants. > --- > > Changes in v4: > - Remove the trailing '/' at the end of the url in the help of > ? Config.in > - Fixed license issues > - Use $(BINARIES_DIR)/ti-k3-core-secdev as the directory where to > ? install files. > > Signed-off-by: Dario Binacchi > --- > ?DEVELOPERS??????????????????????????????????? |? 1 + > ?boot/Config.in??????????????????????????????? |? 1 + > ?boot/ti-k3-core-secdev/Config.in????????????? |? 9 ++++++++ > ?boot/ti-k3-core-secdev/ti-k3-core-secdev.hash |? 3 +++ > ?boot/ti-k3-core-secdev/ti-k3-core-secdev.mk?? | 22 +++++++++++++++++++ > ?5 files changed, 36 insertions(+) > ?create mode 100644 boot/ti-k3-core-secdev/Config.in > ?create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > ?create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 0d12c3abcb11..33d99ab2440f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -753,6 +753,7 @@ F: package/xinetd/ > ?N: Dario Binacchi > ?F: board/bsh/ > ?F: board/stmicroelectronics/stm32f769-disco/ > +F: boot/ti-k3-core-secdev/ > ?F: configs/imx8mn_bsh_smm_s2_defconfig > ?F: configs/imx8mn_bsh_smm_s2_pro_defconfig > ?F: configs/stm32f769_disco_sd_defconfig > diff --git a/boot/Config.in b/boot/Config.in > index e5fdf7ad439e..18a7d268f95a 100644 > --- a/boot/Config.in > +++ b/boot/Config.in > @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" > ?source "boot/shim/Config.in" > ?source "boot/syslinux/Config.in" > ?source "boot/ti-k3-boot-firmware/Config.in" > +source "boot/ti-k3-core-secdev/Config.in" > ?source "boot/ti-k3-image-gen/Config.in" > ?source "boot/ti-k3-r5-loader/Config.in" > ?source "boot/uboot/Config.in" > diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in > new file mode 100644 > index 000000000000..f7b4e2962042 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/Config.in > @@ -0,0 +1,9 @@ > +config BR2_TARGET_TI_K3_CORE_SECDEV > + bool "ti-k3-core-secdev" > + depends on BR2_aarch64 > + help > + ? This package downloads and installs development tools for > + ? High-Security(HS) TI K3 platforms (which include AM62x, > + ? AM64x, AM65x and more). > + > + ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > new file mode 100644 > index 000000000000..e3074a398d62 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256? b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06? core-secdev-k3-08.06.00.007.tar.xz > +sha256? 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369? manifest/k3-secdev-0.2-manifest.html > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > new file mode 100644 > index 000000000000..f7655a0fefc8 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# ti-k3-core-secdev > +# > +################################################################################ > + > +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 > +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot > +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz > +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES > +TI_K3_CORE_SECDEV_LICENSE = BSD-3-Clause > +TI_K3_CORE_SECDEV_LICENSE_FILES = manifest/k3-secdev-0.2-manifest.html > + > +TI_K3_CORE_SECDEV_INSTALL_DIR = $(BINARIES_DIR)/ti-k3-core-secdev > + > +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS > + mkdir -p $(TI_K3_CORE_SECDEV_INSTALL_DIR) > + cp -dpfr $(@D)/keys $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > + cp -dpfr $(@D)/scripts $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > +endef > + > +$(eval $(generic-package)) -- Alexander Sverdlin. From yann.morin.1998 at free.fr Sat Feb 17 17:08:40 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 18:08:40 +0100 Subject: [Buildroot] [PATCH] package/sudo: fix build with uClibc Message-ID: <20240217170840.3623044-1-yann.morin.1998@free.fr> uClibc lacks process_vm_readv(), and sudo fails to build: ./exec_ptrace.c: In function ?ptrace_write_vec?: ./exec_ptrace.c:895:9: error: ?nwritten? undeclared (first use in this function); did you mean ?pwrite?? 895 | nwritten = ptrace_write_string(pid, strtab, vec[i]); | ^~~~~~~~ | pwrite The fix is pretty trivial, and has been submitted upstream. Signed-off-by: Yann E. MORIN --- ...e-fix-build-without-precess_vm_readv.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch diff --git a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch new file mode 100644 index 0000000000..b1b18d610c --- /dev/null +++ b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch @@ -0,0 +1,41 @@ +From 3e765b6c5975077758e7b0a2a955dc7f7b2b94e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 17 Feb 2024 17:52:45 +0100 +Subject: [PATCH] src/exec_ptrace: fix build without precess_vm_readv() + +Commit 32f4b98f6b4a (sudo frontend: silence most -Wconversion warnings.) +broke the build on C libraries that miss process_vm_readv(), like +uClibc-ng. + +Indeed, the ssize_t nwritten is declared guarded by HAVE_PROCESS_VM_READV, +but is then re-assigned and used a few lines below, outside any guard. + +Fix that by always declaring the object, as it is always needed. + +Signed-off-by: Yann E. MORIN +Upstream: https://github.com/sudo-project/sudo/pull/359 +--- + src/exec_ptrace.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c +index 9dd36c275..3d44b82e2 100644 +--- a/src/exec_ptrace.c ++++ b/src/exec_ptrace.c +@@ -878,11 +878,12 @@ ptrace_write_vec(pid_t pid, struct sudo_ptrace_regs *regs, char **vec, + unsigned long addr, unsigned long strtab) + { + const unsigned long strtab0 = strtab; ++ ssize_t nwritten; + size_t i; + debug_decl(ptrace_write_vec, SUDO_DEBUG_EXEC); + + #ifdef HAVE_PROCESS_VM_READV +- ssize_t nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); ++ nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); + if (nwritten != -1 || errno != ENOSYS) + debug_return_ssize_t(nwritten); + #endif /* HAVE_PROCESS_VM_READV */ +-- +2.43.0 + -- 2.43.0 From alexander.sverdlin at gmail.com Sat Feb 17 17:28:35 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 18:28:35 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> Message-ID: <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. In this case, let's copy it to the binaries directory. > > Signed-off-by: Dario Binacchi https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-12-romain.naour at smile.fr/ looks more complete with sysfw.itb? > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > ?boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ > ?1 file changed, 3 insertions(+) > > diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 2a10024aedaa..643298a1e70a 100644 > --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS > ? $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > ?endef > ? > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > + > ?define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > ? cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > ?endef > ? > ?$(eval $(kconfig-package)) -- Alexander Sverdlin. From yann.morin.1998 at free.fr Sat Feb 17 17:29:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 18:29:23 +0100 Subject: [Buildroot] [PATCH] package/sudo: drop legacy, useless, and broken post-configure hook Message-ID: <20240217172923.3629905-1-yann.morin.1998@free.fr> Commit b9e89b340e27 (sudo: bump version) introduced the explicit build of mksigname and mksiglist as host tools, as they were required to run on the build machine, to generate C code then used to build the target program. This is now failing to build since the bump to sudo 1.9.15p5 in commit c87746afefe7 (package/sudo: security bump to version 1.9.15p5) (lines manually wrapped and slightly elided for ease of reviewing): /usr/bin/cpp \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -I../../include \ -I../.. \ ./sys_signame.h \ | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h In file included from /usr/include/features.h:394, from /usr/include/sys/types.h:25, from ./sys_signame.h:4: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ /usr/bin/gcc -I../../include -I../.. -I. -I. \ -D_PATH_SUDO_CONF=\"/etc/sudo.conf\" -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -DDEFAULT_TEXT_DOMAIN=\"sudo\" \ -O2 \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ ./mksigname.c -o mksigname In file included from /usr/include/features.h:394, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdlib.h:26, from ./mksigname.c:27: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ make[2]: *** [Makefile:263: mksigname] Error 1 The core of the issue has not been really identifie, but it turns out that neither mksiglist nor mksignames is used during the build. This has been tested with a minimal sudo with no option, and with a sudo with all options enabled (linux-pam, zlib, opensldap, and openssl), with the three types of C libraries (glibc, musl, and uClibc-ng). Digging in the sudo buildsystem did not reveal an obvious reason when those would be needed either. Drop the hook now it seems it is no longer used and is atually breasking the build. Fixes: http://autobuild.buildroot.org/results/72f/72ff18fb9b41394a29006f881ee1fbea67a66a09/ Note that there is a second issue in there: the call to the host cpp fails, but since it is on the LHS of a pipe, the error is lost, as the RHS of the pipe (the sed call) succeeds; a fix for that will be send in a separate patch. Reported-by: Christian Stewart Signed-off-by: Yann E. MORIN Cc: Peter Korsgaard --- package/sudo/sudo.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index a4e838dd94..7961a99002 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -58,15 +58,6 @@ else SUDO_CONF_OPTS += --disable-openssl endif -# mksigname/mksiglist needs to run on build host to generate source files -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - $(MAKE) $(HOST_CONFIGURE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ - -C $(@D)/lib/util mksigname mksiglist -endef - -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - define SUDO_PERMISSIONS /usr/bin/sudo f 4755 0 0 - - - - - endef -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 17 17:31:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 18:31:18 +0100 Subject: [Buildroot] build failure on Ubuntu 22.04 LTS: TIME_BITS=64 is allowed only with FILE_OFFSET_BITS=64 In-Reply-To: References: Message-ID: Christian, All, On 2024-02-17 12:55 +0100, Yann E. MORIN spake thusly: > On 2024-02-17 01:32 -0800, Christian Stewart via buildroot spake thusly: > > On a fresh Ubuntu 22.04.4 LTS VM: > That also happens on Fedora 39. [--SNIP--] > /usr/bin/cpp \ > -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ > -I../../include \ > -I../.. \ > ./sys_signame.h \ > | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h > In file included from /usr/include/features.h:394, > from /usr/include/sys/types.h:25, > from ./sys_signame.h:4: > /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > | ^~~~~ [--SNIP--] > @@ -65,7 +65,7 @@ define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > -C $(@D)/lib/util mksigname mksiglist > endef > > -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > +#SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > > define SUDO_PERMISSIONS > /usr/bin/sudo f 4755 0 0 - - - - - > > $ make sudo-build > [ succeeds ] > > OK, so is that supperfluous at all nowadays? > > Can you further investigate, enabling PAM et al in turn and see if any > optional dependency triggers a call to those two utilities? If not, can > you look sunce when that is no longer needed and why? I've now sent a patch for that: https://patchwork.ozlabs.org/project/buildroot/patch/20240217172923.3629905-1-yann.morin.1998 at free.fr/ Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From alexander.sverdlin at gmail.com Sat Feb 17 17:40:33 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 18:40:33 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <4a8d7f2252b46118554a9e22c49901822e461f2f.camel@gmail.com> Hi Dario! On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > This series, which in my humble opinion, should have been immediately > considered to correct the compilation errors in case of HS-FS devcies, has > seen an increase in patches in version 4 to remove the ti-k3-image-gen I wasn't aware of the preceeding versions, but... > package thanks to Binman. Additionally, it shares some modifications and > views on how to implement certain changes with the series > https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > Therefore, I think it is necessary not to run them in parallel but to decide > whether to merge one before the other or to consider a single series where > the patches can be coherent with each other. I am available for both solutions. > Let me know. ... as the broken HS-FS went unnoticed, seems there is no rush to fix the build now? I'd vote for a combined series, because yours and Romains do overlap here and there, but I personally would pick different parts from different series. I'd not introduce secdev package unless absolutely necessary, and I actually build HS-FS images with yocto with custom keys and using upstream U-Boot binman alone, so maybe I miss something, but I don't see the package as required. >From my side I can offer testing on SK-AM62x variants, both GP and HS-FS. I will definitely test your v4 because in contrast to Romain's U-Boot v2024.01 bump yours may actually boot... -- Alexander Sverdlin. From yann.morin.1998 at free.fr Sat Feb 17 17:46:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 18:46:27 +0100 Subject: [Buildroot] build failure on Ubuntu 22.04 LTS: TIME_BITS=64 is allowed only with FILE_OFFSET_BITS=64 In-Reply-To: References: Message-ID: Christian, All, On 2024-02-17 12:55 +0100, Yann E. MORIN spake thusly: [--SNIP--] > The first, which is the easiest to fix, is that the call to cpp is > piped into a call to sed. cpp fails, but because of the pipe, its exit > status is lost. The sed succeeds, though, so the rule as a whole > succeeds. Then the call to gcc fails, which is fortunate, or we'd have > missed the previous failure of cpp. This is trivial to fix: use a temp > file for the output of cpp, and run the sed with that temp file as > input, as a separate command in the same rule: > > --- lib/util/Makefile.orig 2024-02-17 12:25:13.554448884 +0100 > +++ lib/util/Makefile 2024-02-17 12:26:20.727968989 +0100 > @@ -273,10 +273,12 @@ > fi > > mksiglist.h: $(srcdir)/sys_siglist.h > - $(CPP) $(CPPFLAGS) $(srcdir)/sys_siglist.h | $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksiglist.h > + $(CPP) $(CPPFLAGS) $(srcdir)/sys_siglist.h > mksiglist.h.tmp > + $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < mksiglist.h.tmp > mksiglist.h > > mksigname.h: $(srcdir)/sys_signame.h > - $(CPP) $(CPPFLAGS) $(srcdir)/sys_signame.h | $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h > + $(CPP) $(CPPFLAGS) $(srcdir)/sys_signame.h > mksigname.h.tmp > + $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < mksigname.h.tmp > mksigname.h > > closefrom_test: $(CLOSEFROM_TEST_OBJS) libsudo_util.la > $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(CLOSEFROM_TEST_OBJS) libsudo_util.la $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(HARDENING_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) I've now sent a patch for that: https://github.com/sudo-project/sudo/pull/360 Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ju.o at free.fr Sat Feb 17 18:45:20 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 17 Feb 2024 19:45:20 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add mariadb runtime test Message-ID: <20240217184521.298639-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_mariadb.py | 195 ++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 support/testing/tests/package/test_mariadb.py diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..cf6e4c51d4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1814,6 +1814,7 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_mariadb.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py diff --git a/support/testing/tests/package/test_mariadb.py b/support/testing/tests/package/test_mariadb.py new file mode 100644 index 0000000000..523f075db1 --- /dev/null +++ b/support/testing/tests/package/test_mariadb.py @@ -0,0 +1,195 @@ +import os + +import infra.basetest + + +class TestMariaDB(infra.basetest.BRTest): + # We use a specific configuration for: + # - using Aarch64, to have more than 256MB memory, + # - to have an ext4 rootfs image exposed as a virtio storage + # (rather than cpio initrd). This will save some memory, as the + # rootfs image is big. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.78" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_MYSQL=y + BR2_PACKAGE_MARIADB=y + BR2_PACKAGE_MARIADB_SERVER=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="512M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + # Configuration for the test + db_adminuser = "root" + db_admin = "mysql" + db_user = "br_user" + db_name = "br_database" + backup_file = "dump.sql" + + def run_user_db_query(self, user, database, query, opts=None): + cmd = f"mariadb --user={user} --database={database}" + cmd += f' --execute="{query}"' + if opts is not None: + cmd += " " + opts + self.assertRunOk(cmd) + + def run_admin_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_adminuser, self.db_admin, query, opts) + + def run_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_user, self.db_name, query, opts) + + def cleanup_database(self): + # This cleanup is useful when run-test -k is used. It makes + # this test idempotent. Since the drive storage is preserved + # between reboots, this cleanup will prevent errors during the + # user/db creation. + + # Drop the test database, if it exists. + sql_query = f"DROP USER IF EXISTS {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + # Drop the test user, if it exists. + sql_query = f"DROP DATABASE IF EXISTS {self.db_name};" + self.run_admin_sql_query(sql_query) + + def create_tables(self): + sql_query = "CREATE TABLE fruits (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE colors (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE fruit_colors (" + sql_query += "fruit_id integer REFERENCES fruits(id), " + sql_query += "color_id integer REFERENCES colors(id), " + sql_query += "UNIQUE (fruit_id, color_id));" + self.run_sql_query(sql_query) + + def insert_data(self): + fruits = ["Banana", "Blueberry", "Orange", "Raspberry"] + fruit_id = 1 + for fruit in fruits: + sql_query = "INSERT INTO fruits (id, name) " + sql_query += f"VALUES ({fruit_id}, '{fruit}');" + self.run_sql_query(sql_query) + fruit_id += 1 + + colors = ["Blue", "Orange", "Red", "Yellow"] + color_id = 1 + for color in colors: + sql_query = "INSERT INTO colors (id, name) " + sql_query += f"VALUES ({color_id}, '{color}');" + self.run_sql_query(sql_query) + color_id += 1 + + fruit_colors = [(1, 4), (2, 1), (3, 2), (4, 3)] + for fruit_color in fruit_colors: + fruit_id, color_id = fruit_color + sql_query = "INSERT INTO fruit_colors (fruit_id, color_id) " + sql_query += f"VALUES ({fruit_id}, {color_id});" + self.run_sql_query(sql_query) + + def query_database(self): + sql_query = "SELECT " + sql_query += "fruits.name AS fruit, colors.name AS color " + sql_query += "FROM fruits, colors, fruit_colors " + sql_query += "WHERE fruits.id = fruit_colors.fruit_id " + sql_query += "AND colors.id = fruit_colors.color_id " + sql_query += "ORDER BY fruit;" + self.run_sql_query(sql_query) + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "2G", + "-smp", "2", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Check the server binary can execute. + self.assertRunOk("mariadbd --version") + + # Check the client binary can execute. + self.assertRunOk("mariadb --version") + + # Check the server is ready. + self.assertRunOk("mariadb-admin ping") + + # Query the server version from the client. + sql_query = "SELECT version();" + self.run_admin_sql_query(sql_query, opts="-N -s") + + self.cleanup_database() + + # Create a new user. + sql_query = f"CREATE USER {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + # Create a new database. + sql_query = f"CREATE DATABASE {self.db_name}" + sql_query += " COMMENT = 'Test Database for Buildroot Test';" + self.run_admin_sql_query(sql_query) + + # Grant all permission on this new database to our test user. + sql_query = "GRANT ALL PRIVILEGES" + sql_query += f" ON {self.db_name}.*" + sql_query += f" TO {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + self.create_tables() + + self.insert_data() + + self.query_database() + + # Update a table. + sql_query = "UPDATE fruits SET name = 'Lemon' WHERE id = 1;" + self.run_sql_query(sql_query) + + # Backup the test database. + cmd = f"mariadb-dump --user={self.db_user}" + cmd += f" {self.db_name} > {self.backup_file}" + self.assertRunOk(cmd) + + # Drop all the tables. + sql_query = "DROP TABLE fruit_colors, fruits, colors;" + self.run_sql_query(sql_query) + + # Query the server status. + self.assertRunOk("mariadb-admin status") + + # Stop the server. + self.assertRunOk("/etc/init.d/S97mysqld stop") + + # Check the server is stopped. + _, exit_code = self.emulator.run("mariadb-admin ping") + self.assertNotEqual(exit_code, 0) + + # Restart the server. + self.assertRunOk("/etc/init.d/S97mysqld start") + + # Restore the backup. + cmd = f"mariadb --user={self.db_user} --database={self.db_name}" + cmd += f" < {self.backup_file}" + self.assertRunOk(cmd) + + # Query one last time our data, to check the backup + # restoration succeeded. + self.query_database() -- 2.43.2 From yann.morin.1998 at free.fr Sat Feb 17 19:17:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 20:17:51 +0100 Subject: [Buildroot] [git commit] package/sudo: fix build with uClibc Message-ID: <20240217191831.1AEE987845@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f0117ad942070717e495ac88af943a3b1f8fcec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master uClibc lacks process_vm_readv(), and sudo fails to build since commit c87746afefe7 (package/sudo: security bump to version 1.9.15p5), with errors such as: ./exec_ptrace.c: In function ???ptrace_write_vec???: ./exec_ptrace.c:895:9: error: ???nwritten??? undeclared (first use in this function); did you mean ???pwrite???? 895 | nwritten = ptrace_write_string(pid, strtab, vec[i]); | ^~~~~~~~ | pwrite Backport an upstream commit to fix the issue. Signed-off-by: Yann E. MORIN --- ...ptrace-fix-build-without-precess_vm_readv.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch new file mode 100644 index 0000000000..446f1d1797 --- /dev/null +++ b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch @@ -0,0 +1,41 @@ +From 5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 17 Feb 2024 17:52:45 +0100 +Subject: [PATCH] src/exec_ptrace: fix build without precess_vm_readv() + +Commit 32f4b98f6b4a (sudo frontend: silence most -Wconversion warnings.) +broke the build on C libraries that miss process_vm_readv(), like +uClibc-ng. + +Indeed, the ssize_t nwritten is declared guarded by HAVE_PROCESS_VM_READV, +but is then re-assigned and used a few lines below, outside any guard. + +Fix that by always declaring the object, as it is always needed. + +Signed-off-by: Yann E. MORIN +Upstream: https://github.com/sudo-project/sudo/commit/5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c +--- + src/exec_ptrace.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c +index 9dd36c275..3d44b82e2 100644 +--- a/src/exec_ptrace.c ++++ b/src/exec_ptrace.c +@@ -878,11 +878,12 @@ ptrace_write_vec(pid_t pid, struct sudo_ptrace_regs *regs, char **vec, + unsigned long addr, unsigned long strtab) + { + const unsigned long strtab0 = strtab; ++ ssize_t nwritten; + size_t i; + debug_decl(ptrace_write_vec, SUDO_DEBUG_EXEC); + + #ifdef HAVE_PROCESS_VM_READV +- ssize_t nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); ++ nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); + if (nwritten != -1 || errno != ENOSYS) + debug_return_ssize_t(nwritten); + #endif /* HAVE_PROCESS_VM_READV */ +-- +2.43.0 + From yann.morin.1998 at free.fr Sat Feb 17 19:19:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 20:19:51 +0100 Subject: [Buildroot] [PATCH] package/sudo: fix build with uClibc In-Reply-To: <20240217170840.3623044-1-yann.morin.1998@free.fr> References: <20240217170840.3623044-1-yann.morin.1998@free.fr> Message-ID: All, On 2024-02-17 18:08 +0100, Yann E. MORIN spake thusly: > uClibc lacks process_vm_readv(), and sudo fails to build: > > ./exec_ptrace.c: In function ?ptrace_write_vec?: > ./exec_ptrace.c:895:9: error: ?nwritten? undeclared (first use in this function); did you mean ?pwrite?? > 895 | nwritten = ptrace_write_string(pid, strtab, vec[i]); > | ^~~~~~~~ > | pwrite > > The fix is pretty trivial, and has been submitted upstream. The patch has been accepted upstream now. > Signed-off-by: Yann E. MORIN Applied to master, after tweaking the commit log explaining since when the issue occurs, and making the patch an actual backport, thanks. Regards, Yann E. MORIN. > --- > ...e-fix-build-without-precess_vm_readv.patch | 41 +++++++++++++++++++ > 1 file changed, 41 insertions(+) > create mode 100644 package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch > > diff --git a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch > new file mode 100644 > index 0000000000..b1b18d610c > --- /dev/null > +++ b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch > @@ -0,0 +1,41 @@ > +From 3e765b6c5975077758e7b0a2a955dc7f7b2b94e7 Mon Sep 17 00:00:00 2001 > +From: "Yann E. MORIN" > +Date: Sat, 17 Feb 2024 17:52:45 +0100 > +Subject: [PATCH] src/exec_ptrace: fix build without precess_vm_readv() > + > +Commit 32f4b98f6b4a (sudo frontend: silence most -Wconversion warnings.) > +broke the build on C libraries that miss process_vm_readv(), like > +uClibc-ng. > + > +Indeed, the ssize_t nwritten is declared guarded by HAVE_PROCESS_VM_READV, > +but is then re-assigned and used a few lines below, outside any guard. > + > +Fix that by always declaring the object, as it is always needed. > + > +Signed-off-by: Yann E. MORIN > +Upstream: https://github.com/sudo-project/sudo/pull/359 > +--- > + src/exec_ptrace.c | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c > +index 9dd36c275..3d44b82e2 100644 > +--- a/src/exec_ptrace.c > ++++ b/src/exec_ptrace.c > +@@ -878,11 +878,12 @@ ptrace_write_vec(pid_t pid, struct sudo_ptrace_regs *regs, char **vec, > + unsigned long addr, unsigned long strtab) > + { > + const unsigned long strtab0 = strtab; > ++ ssize_t nwritten; > + size_t i; > + debug_decl(ptrace_write_vec, SUDO_DEBUG_EXEC); > + > + #ifdef HAVE_PROCESS_VM_READV > +- ssize_t nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); > ++ nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); > + if (nwritten != -1 || errno != ENOSYS) > + debug_return_ssize_t(nwritten); > + #endif /* HAVE_PROCESS_VM_READV */ > +-- > +2.43.0 > + > -- > 2.43.0 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From alexander.sverdlin at gmail.com Sat Feb 17 20:06:21 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:06:21 +0100 Subject: [Buildroot] [PATCH v4 01/20] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240217160244.1320482-2-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-2-dario.binacchi@amarulasolutions.com> Message-ID: Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Checking the output of the command `git grep PLATFORM | grep k3`, we can > found the proper settings for the optee-os package: > > .github/workflows/ci.yml:????????? _make PLATFORM=k3-am62x > .github/workflows/ci.yml:????????? _make PLATFORM=k3-am62x CFG_ARM64_core=y > ... > core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) > > Suggested-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > ?configs/ti_am62x_sk_defconfig | 3 ++- > ?1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index f88252a89c68..fde6f8f5636a 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -21,7 +21,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > ?BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y this looks even more complete than https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-3-romain.naour at smile.fr/ Reviewed-by: Alexander Sverdlin -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:08:14 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:08:14 +0100 Subject: [Buildroot] [PATCH v4 02/20] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240217160244.1320482-3-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-3-dario.binacchi@amarulasolutions.com> Message-ID: <69a15ccedfcde5649a770aff60752f5ecc3ece88.camel@gmail.com> Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Checking the output of the command `git grep PLATFORM | grep k3`, we can > found the proper settings for the optee-os package: > > .github/workflows/ci.yml:????????? _make PLATFORM=k3-am64x > .github/workflows/ci.yml:????????? _make PLATFORM=k3-am64x CFG_ARM64_core=y > ... > core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) > > Suggested-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > ?configs/ti_am64x_sk_defconfig | 3 ++- > ?1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 4bfd31f0c8d3..98476c88626b 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -21,7 +21,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > ?BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y again, more complete than https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-4-romain.naour at smile.fr/ Reviewed-by: Alexander Sverdlin -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:20:22 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:20:22 +0100 Subject: [Buildroot] [PATCH v4 15/20] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240217160244.1320482-16-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-16-dario.binacchi@amarulasolutions.com> Message-ID: <73868728d467604fa82ada93e652c23eca4afaa6.camel@gmail.com> On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > The 2024.01 version of U-Boot for the am62x-sk board has introduced two > major changes: > - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in > ? /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET > ? and the use of extlinux.conf for the proper loading of the device tree. > ? Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to > ? auto-generate the extlinux.conf file so that developers can change the > ? kernel loading options by modifying the .config. > - The use of binman for building images. > > Tested on SK-AM62B-P1. > > Signed-off-by: Dario Binacchi [] > @@ -27,14 +27,15 @@ BR2_TARGET_TI_K3_IMAGE_GEN=y > ?BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y > ?BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" Is patch 3/20 really required in this case? Is custom version required if you set the same version as default in patch 5/20? -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:27:36 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:27:36 +0100 Subject: [Buildroot] [PATCH v4 16/20] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 In-Reply-To: <20240217160244.1320482-17-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-17-dario.binacchi@amarulasolutions.com> Message-ID: Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Tested on SK-AM62B-P1. > > Signed-off-by: Dario Binacchi > > --- > > Changes in v4 > - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. > > no changes since v1 > > Signed-off-by: Dario Binacchi > --- > ?configs/ti_am62x_sk_defconfig | 4 ++-- > ?1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 193301c8b941..4de39fb897fd 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,11 +1,11 @@ > ?BR2_aarch64=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > ?BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > ?BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > ?BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > ?BR2_LINUX_KERNEL=y > ?BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.1" Could be updated to v6.6.17 if you re-spin? > ?BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > ?BR2_LINUX_KERNEL_DTS_SUPPORT=y > ?BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:33:19 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:33:19 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> Message-ID: Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Recent versions of U-Boot can use Binman to compile and sign the generated > binaries, thus making the use of custom tools like ti-k3-image-gen no > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > configured and used outside of it. This patch allows setting such options > even if the package is not enabled. Missing SoB? The patch looks more complete to me than https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-13-romain.naour at smile.fr/ because of SECTYPE variables. Reviewed-by: Alexander Sverdlin > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > ?boot/ti-k3/Config.in????????????????????????? | 46 ++++++++++++++ > ?boot/ti-k3/ti-k3-image-gen/Config.in????????? | 63 ++----------------- > ?boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk |? 6 +- > ?boot/uboot/Config.in????????????????????????? |? 7 +-- > ?configs/ti_am62x_sk_defconfig???????????????? |? 2 +- > ?configs/ti_am64x_sk_defconfig???????????????? |? 2 +- > ?6 files changed, 59 insertions(+), 67 deletions(-) > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > index 06dda2f156a9..9e508326c9c8 100644 > --- a/boot/ti-k3/Config.in > +++ b/boot/ti-k3/Config.in > @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > ? > ?if BR2_TARGET_TI_K3 > ? > +choice > + prompt "SoC family" > + > +config BR2_TARGET_TI_K3_SOC_AM62AX > + bool "am62ax" > + > +config BR2_TARGET_TI_K3_SOC_AM62X > + bool "am62x" > + > +config BR2_TARGET_TI_K3_SOC_AM64X > + bool "am64x" > + > +config BR2_TARGET_TI_K3_SOC_AM65X > + bool "am65x" > + > +endchoice > + > +choice > + prompt "Security type" > + help > + ? The target SoC security type option. > + > +config BR2_TARGET_TI_K3_SECTYPE_GP > + bool "gp" > + > +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > + bool "hs-fs" > + > +config BR2_TARGET_TI_K3_SECTYPE_HS > + bool "hs" > + > +endchoice > + > +config BR2_TARGET_TI_K3_SOC > + string > + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > + default "am62x"? if BR2_TARGET_TI_K3_SOC_AM62X > + default "am64x"? if BR2_TARGET_TI_K3_SOC_AM64X > + default "am65x"? if BR2_TARGET_TI_K3_SOC_AM65X > + > +config BR2_TARGET_TI_K3_SECTYPE > + string > + default "gp"??? if BR2_TARGET_TI_K3_SECTYPE_GP > + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > + default "hs"??? if BR2_TARGET_TI_K3_SECTYPE_HS > + > ?source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > ?source "boot/ti-k3/ti-k3-core-secdev/Config.in" > ?source "boot/ti-k3/ti-k3-image-gen/Config.in" > diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > index 38d1598d9fc0..2d53d62dd4ee 100644 > --- a/boot/ti-k3/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > ? bool "ti-k3-image-gen" > ? depends on BR2_TARGET_TI_K3_R5_LOADER > ? select BR2_TARGET_TI_K3_BOOT_FIRMWARE > - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > ? # We need FIT support in uboot-tools, which is why we select a > ? # host package > ? select BR2_PACKAGE_HOST_UBOOT_TOOLS > @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > ? ? https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > ? > ?if BR2_TARGET_TI_K3_IMAGE_GEN > -choice > - prompt "SoC family" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - bool "am62ax" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - bool "am62x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - bool "am64x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - bool "am65x" > - > -endchoice > - > -choice > - prompt "Security type" > - help > - ? The target SoC security type option for image gen.? Valid > - ? options are "gp" for General Purpose devices, "hs-fs" for > - ? High Security - Field Securable devices, or "hs" for High > - ? Security - Security Enforcing devices.? Note for all High > - ? Security device variants the TI_SECURE_DEV_PKG environmental > - ? variable must be defined at build time pointing to a valid > - ? core-secdev-k3 folder location, otherwise the build will > - ? fail, see > - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - bool "gp" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - bool "hs-fs" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > - bool "hs" > - > -endchoice > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > - string > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62x"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "am64x"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "am65x"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > ? > ?config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > ? string > - default "ti-fs"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "ti-fs"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > - string > - default "gp"??? if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - default "hs"??? if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + default "ti-fs"? if BR2_TARGET_TI_K3_SOC_AM62AX > + default "ti-fs"? if BR2_TARGET_TI_K3_SOC_AM62X > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > ? > ?endif > diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > index 74b4fcb4bf89..834d8f7d5cd5 100644 > --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > ? $(BR2_MAKE_HOST_DEPENDENCY) > ? > ?TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > ? > -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > ?TI_K3_IMAGE_GEN_SYSFW = \ > ? $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > ?else > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index beafb38930db..1a9d21e7c6d1 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > ? bool "U-Boot needs TI K3 Device Manager (DM)" > ? # We use the SoC selection defined for the ti-k3-image-gen > ? # package > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > ? help > ? ? Some TI K3 devices need the Device Manager (DM) firmware to > ? ? be available for the U-Boot build. > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > ? > ?config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > ? string > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62xx"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > + default "am62xx"? if BR2_TARGET_TI_K3_SOC_AM62X > ? > ?endif > ? > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index cd26235342e4..cfefce0a77a4 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > ?BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > ?BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > ?BR2_TARGET_TI_K3=y > +BR2_TARGET_TI_K3_SOC_AM62X=y > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y > ?BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > ?BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 1befeb4ab96c..daf78dbffff8 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > ?BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > ?BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > ?BR2_TARGET_TI_K3=y > +BR2_TARGET_TI_K3_SOC_AM64X=y > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y > ?BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > ?BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:38:22 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:38:22 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Message-ID: Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > The patch set the BINMAN_INDIRS environment variable to provide the > directory to search for binary blobs and select the packages required by > binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi I personally do not see why binman usage should be configurable as in https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ your patch looks simpler, Reviewed-by: Alexander Sverdlin > --- > > Changes in v4: > - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > Changes in v2: > - Change commit message > - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > - Select packages required by binman if > ? BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > > Signed-off-by: Dario Binacchi > --- > ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- > ?1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0ffcb8235f2e..2a10024aedaa 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ > ? host-pkgconf \ > ? $(BR2_MAKE_HOST_DEPENDENCY) \ > ? host-arm-gnu-toolchain \ > - host-openssl > + host-openssl \ > + host-python-attrs \ > + host-python-jsonschema \ > + host-python-jsonschema-specifications \ > + host-python-pyyaml \ > + host-python-referencing \ > + host-python-rpds-py > ? > ?TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > ?TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ > ? $(BR2_BISON_HOST_DEPENDENCY) \ > ? $(BR2_FLEX_HOST_DEPENDENCY) > ? > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) > +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt > +endif > + > ?ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) > ?TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig > ?else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) > @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > ? CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ? ARCH=arm \ > ? HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > + BINMAN_INDIRS=$(BINARIES_DIR) \ > ? HOSTLDFLAGS="$(HOST_LDFLAGS)" > ? > ?define TI_K3_R5_LOADER_BUILD_CMDS -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:44:29 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:44:29 +0100 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> Message-ID: <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > As explained in [1], adding support for AM62x LP SK in U-Boot, requires > binman for building bootloader images. The BINMAN_INDIRS environment > variable is used to provide a space-separated list of directories to > search for binary blobs. > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > Signed-off-by: Dario Binacchi > > --- > > no changes since v1: > > Signed-off-by: Dario Binacchi > --- > ?boot/uboot/uboot.mk | 3 ++- > ?1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dda606a88059..cf70f86a4132 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -189,7 +189,8 @@ endif > ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > ?UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > ?UBOOT_DEPENDENCIES += ti-k3-boot-firmware > -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ Is the above actually still required with binman? The names are hardcoded in U-Boot in arch/arm/dts/k3-am625-sk-binman.dtsi > + BINMAN_INDIRS=$(BINARIES_DIR) This seems to be the only required part. > ?endif > ? > ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) -- Alexander Sverdlin. From francois.perrad at gadz.org Sat Feb 17 21:05:10 2024 From: francois.perrad at gadz.org (=?UTF-8?Q?Fran=C3=A7ois_Perrad?=) Date: Sat, 17 Feb 2024 22:05:10 +0100 Subject: [Buildroot] [PATCH v4 17/20] boot: move ti-k3-* packages to 'ti-k3' directory In-Reply-To: <20240217160244.1320482-18-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-18-dario.binacchi@amarulasolutions.com> Message-ID: Le sam. 17 f?vr. 2024 ? 17:03, Dario Binacchi < dario.binacchi at amarulasolutions.com> a ?crit : > Move all TI K3 packages to the directory ti-k3. > The Buildroot documentation states that "New subdirectories are discouraged". See https://buildroot.org/downloads/manual/manual.html#_package_directory Fran?ois > This patch is preparatory for future developments. > > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > boot/Config.in | 5 +---- > boot/ti-k3/Config.in | 13 +++++++++++++ > boot/ti-k3/common.mk | 1 + > boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 > .../ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 0 > .../ti-k3-boot-firmware/ti-k3-boot-firmware.mk | 0 > boot/{ => ti-k3}/ti-k3-core-secdev/Config.in | 0 > .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 0 > .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 0 > boot/{ => ti-k3}/ti-k3-image-gen/Config.in | 0 > .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 > boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk | 0 > boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 0 > .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 0 > boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk | 0 > configs/ti_am62x_sk_defconfig | 1 + > configs/ti_am64x_sk_defconfig | 1 + > 17 files changed, 17 insertions(+), 4 deletions(-) > create mode 100644 boot/ti-k3/Config.in > create mode 100644 boot/ti-k3/common.mk > rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > (100%) > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) > rename boot/{ => ti-k3}/ti-k3-core-secdev/Config.in (100%) > rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.hash (100%) > rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.mk (100%) > rename boot/{ => ti-k3}/ti-k3-image-gen/Config.in (100%) > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (100%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (100%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (100%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (100%) > > diff --git a/boot/Config.in b/boot/Config.in > index 18a7d268f95a..74a64a096afc 100644 > --- a/boot/Config.in > +++ b/boot/Config.in > @@ -19,10 +19,7 @@ source "boot/opensbi/Config.in" > source "boot/s500-bootloader/Config.in" > source "boot/shim/Config.in" > source "boot/syslinux/Config.in" > -source "boot/ti-k3-boot-firmware/Config.in" > -source "boot/ti-k3-core-secdev/Config.in" > -source "boot/ti-k3-image-gen/Config.in" > -source "boot/ti-k3-r5-loader/Config.in" > +source "boot/ti-k3/Config.in" > source "boot/uboot/Config.in" > source "boot/vexpress-firmware/Config.in" > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > new file mode 100644 > index 000000000000..06dda2f156a9 > --- /dev/null > +++ b/boot/ti-k3/Config.in > @@ -0,0 +1,13 @@ > +config BR2_TARGET_TI_K3 > + bool "TI K3" > + help > + The TI K3 bootloaders and tools. > + > +if BR2_TARGET_TI_K3 > + > +source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > +source "boot/ti-k3/ti-k3-core-secdev/Config.in" > +source "boot/ti-k3/ti-k3-image-gen/Config.in" > +source "boot/ti-k3/ti-k3-r5-loader/Config.in" > + > +endif > diff --git a/boot/ti-k3/common.mk b/boot/ti-k3/common.mk > new file mode 100644 > index 000000000000..18a1329baa4c > --- /dev/null > +++ b/boot/ti-k3/common.mk > @@ -0,0 +1 @@ > +include $(sort $(wildcard boot/ti-k3/*/*.mk)) > diff --git a/boot/ti-k3-boot-firmware/Config.in > b/boot/ti-k3/ti-k3-boot-firmware/Config.in > similarity index 100% > rename from boot/ti-k3-boot-firmware/Config.in > rename to boot/ti-k3/ti-k3-boot-firmware/Config.in > diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > similarity index 100% > rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > similarity index 100% > rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > diff --git a/boot/ti-k3-core-secdev/Config.in > b/boot/ti-k3/ti-k3-core-secdev/Config.in > similarity index 100% > rename from boot/ti-k3-core-secdev/Config.in > rename to boot/ti-k3/ti-k3-core-secdev/Config.in > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash > similarity index 100% > rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk > similarity index 100% > rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk > diff --git a/boot/ti-k3-image-gen/Config.in > b/boot/ti-k3/ti-k3-image-gen/Config.in > similarity index 100% > rename from boot/ti-k3-image-gen/Config.in > rename to boot/ti-k3/ti-k3-image-gen/Config.in > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash > b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash > similarity index 100% > rename from boot/ti-k3-image-gen/ti-k3-image-gen.hash > rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > similarity index 100% > rename from boot/ti-k3-image-gen/ti-k3-image-gen.mk > rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > diff --git a/boot/ti-k3-r5-loader/Config.in > b/boot/ti-k3/ti-k3-r5-loader/Config.in > similarity index 100% > rename from boot/ti-k3-r5-loader/Config.in > rename to boot/ti-k3/ti-k3-r5-loader/Config.in > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash > b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash > similarity index 100% > rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.hash > rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > similarity index 100% > rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 4de39fb897fd..cd26235342e4 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > +BR2_TARGET_TI_K3=y > BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 5fd9653b5b8f..1befeb4ab96c 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > +BR2_TARGET_TI_K3=y > BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > BR2_TARGET_TI_K3_R5_LOADER=y > -- > 2.43.0 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alexander.sverdlin at gmail.com Sat Feb 17 21:14:29 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 22:14:29 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <50656de7f9f23a436adeafeb47b13412904c7b17.camel@gmail.com> Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > high-security field-securable (HS-FS) silicon to optionally customize keys > and encryption for security applications. > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > which, however, was buggy. This series fixes the errors and bumps the Linux > kernel and U-Boot required for such a new device. > > This series, which in my humble opinion, should have been immediately > considered to correct the compilation errors in case of HS-FS devcies, has > seen an increase in patches in version 4 to remove the ti-k3-image-gen > package thanks to Binman. Additionally, it shares some modifications and > views on how to implement certain changes with the series > https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > Therefore, I think it is necessary not to run them in parallel but to decide > whether to merge one before the other or to consider a single series where > the patches can be coherent with each other. I am available for both solutions. > Let me know. > > Dario Binacchi (20): > ? configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > ??? setting > ? configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > ??? setting > ? configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > ??? version > ? configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > ??? version > ? boot/ti-k3-r5-loader: bump to version 2024.01 > ? boot/ti-k3-core-secdev: new package > ? boot/ti-k3-image-gen: manage HS hardware > ? package/python-jsonschema: add host variant > ? package/python-attrs: add host variant > ? package/python-referencing: add host variant > ? package/python-rpds-py: add host variant > ? package/python-jsonschema-specifications: add host variant > ? boot/ti-k3-r5-loader: set binman environment > ? boot/uboot: set BINMAN_INDIRS for TI K3 DM > ? configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > ? configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 > ? boot: move ti-k3-* packages to 'ti-k3' directory > ? boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > ? boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > ? configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore the series: - builds and starts on SK-AM62B (HS-FS) - builds for am62x GP Tested-by: Alexander Sverdlin -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 23:45:47 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sun, 18 Feb 2024 00:45:47 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> Message-ID: <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > The patch sets the configurations required by TI HS systems. Some of these > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > are provided by the ti-k3-core-secdev package in the binaries directory. > > Signed-off-by: Dario Binacchi so for test I've reverted the previous "boot/ti-k3-core-secdev: new package" commit, then... > --- > > no changes since v3: > > Signed-off-by: Dario Binacchi > --- > ?boot/ti-k3-image-gen/Config.in????????? |? 1 + > ?boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > ?2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > index d76cef82e911..38d1598d9fc0 100644 > --- a/boot/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3-image-gen/Config.in > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > ? bool "ti-k3-image-gen" > ? depends on BR2_TARGET_TI_K3_R5_LOADER > ? select BR2_TARGET_TI_K3_BOOT_FIRMWARE > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS ... removed this, ... > ? # We need FIT support in uboot-tools, which is why we select a > ? # host package > ? select BR2_PACKAGE_HOST_UBOOT_TOOLS > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > index 64be9a18f2c4..74b4fcb4bf89 100644 > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > ?TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > ?TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > ? > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +else > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev ... the above line, ... > + > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > +endif > ? > ?define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > + ) > ?endef > ? > ?define TI_K3_IMAGE_GEN_BUILD_CMDS > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > ? $(BR2_MAKE) -C $(@D) \ > ? SOC=$(TI_K3_IMAGE_GEN_SOC) \ > ? SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ ... and this line... > ? CONFIG=evm \ > ? CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ? SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ ... and everything still builds and boots fine on SK-AM62B (HS-FS): U-Boot SPL 2024.01 (Feb 18 2024 - 00:02:43 +0100) SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') SPL initial stack usage: 13400 bytes Trying to boot from MMC2 Authentication passed Authentication passed Authentication passed Authentication passed Authentication passed Starting ATF on ARM64 core... NOTICE: BL31: v2.7(release):v2.7 NOTICE: BL31: Built : 23:57:43, Feb 17 2024 I/TC: I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1199-g470b2069e4)) #1 Sat Feb 17 22:57:38 UTC 2024 aarch64 I/TC: WARNING: This OP-TEE configuration might be insecure! I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html I/TC: Primary CPU initializing I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') I/TC: HUK Initialized I/TC: Activated SA2UL device I/TC: Enabled firewalls for SA2UL TRNG device I/TC: SA2UL TRNG initialized I/TC: SA2UL Drivers initialized I/TC: Primary CPU switching to normal world boot U-Boot SPL 2024.01 (Feb 18 2024 - 00:03:30 +0100) SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') SPL initial stack usage: 1872 bytes Trying to boot from MMC2 Authentication passed Authentication passed U-Boot 2024.01 (Feb 18 2024 - 00:03:30 +0100) SoC: AM62X SR1.0 HS-FS Model: Texas Instruments AM625 SK DRAM: 2 GiB Core: 56 devices, 23 uclasses, devicetree: separate MMC: mmc at fa10000: 0, mmc at fa00000: 1 Loading Environment from nowhere... OK In: serial at 2800000 Out: serial at 2800000 Err: serial at 2800000 Net: eth0: ethernet at 8000000port@1 Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc1 is current device SD/MMC found on device 1 Failed to load 'uEnv.txt' Scanning for bootflows in all bootdevs Seq Method State Uclass Part Name Filename --- ----------- ------ -------- ---- ------------------------ ---------------- Scanning global bootmeth 'efi_mgr': No EFI system partition No EFI system partition Failed to persist EFI variables Scanning bootdev 'mmc at fa00000.bootdev': 0 extlinux ready mmc 1 mmc at fa00000.bootdev.part_ /extlinux/extlinux.conf ** Booting bootflow 'mmc at fa00000.bootdev.part_1' with extlinux 1: am62x-sk-buildroot Retrieving file: /Image append: console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 Retrieving file: /k3-am62x.dtb ## Flattened Device Tree blob at ffb14700 Booting using the fdt blob at 0xffb14700 Working FDT set to ffb14700 Loading Device Tree to 000000008ffed000, end 000000008ffff687 ... OK Working FDT set to 8ffed000 Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] [ 0.000000] Linux version 6.6.1 (...) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1199-g470b2069e4) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Sun Feb 18 00:37:47 CET 2024 -- Alexander Sverdlin. From gael.portay at rtone.fr Sun Feb 18 01:11:17 2024 From: gael.portay at rtone.fr (=?UTF-8?q?Ga=C3=ABl=20PORTAY?=) Date: Sun, 18 Feb 2024 02:11:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/musl: enable on s390x Message-ID: <20240218011118.1077002-1-gael.portay@rtone.fr> Add s390x musl supported archs. Upstream musl already supports s390x[1]. Tested with qemu_s390s_defconfig: $ output/host/bin/qemu-system-s390x -M s390-ccw-virtio -cpu max,zpci=on -m 4G -smp 2 -kernel output/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda net.ifnames=0 biosdevname=0" -display none -serial mon:stdio -net nic,model=virtio -net user (...) Welcome to Buildroot buildroot login: root # uname -a Linux buildroot 6.1.44 #2 SMP Sun Feb 18 01:33:42 CET 2024 s390x GNU/Linux # /lib/ld-musl-s390x.so.1 musl libc (s390x) Version 1.2.4 Dynamic Program Loader Usage: /lib/ld-musl-s390x.so.1 [options] [--] pathname [args] [1]: https://git.musl-libc.org/cgit/musl/commit/?id=15094943050eb9a564f409323070e50b40f78816 Signed-off-by: Ga?l PORTAY --- package/musl/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/musl/Config.in b/package/musl/Config.in index 89f41d2ff1..44654eff34 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_MUSL_ARCH_SUPPORTS default y if BR2_powerpc64 default y if BR2_powerpc64le default y if BR2_RISCV_64 + default y if BR2_s390x default y if BR2_sh default y if BR2_x86_64 depends on !BR2_POWERPC_CPU_HAS_SPE # not supported, build breaks -- 2.43.2 From kadambini.nema at gmail.com Sun Feb 18 01:16:53 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 17 Feb 2024 17:16:53 -0800 Subject: [Buildroot] [PATCH 1/1] package/google-breakpad: fix missing include error Message-ID: <20240218011653.790820-1-kadambini.nema@gmail.com> src/common/module.cc: In member function ?bool google_breakpad::Module::AddFunction(Function*)?: src/common/module.cc:194:52: error: ?find_if? is not a member of ?std?; did you mean ?find?? 194 | FunctionSet::iterator existing_function = std::find_if( | ^~~~~~~ | find Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed This error is seen on gcc-14. related links: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch Signed-off-by: Kadambini Nema --- ...ixed-missing-include-for-std-find_if.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch new file mode 100644 index 0000000000..80eab723b3 --- /dev/null +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch @@ -0,0 +1,24 @@ +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 +From: Nathan Moinvaziri +Date: Tue, 19 Dec 2023 14:35:05 -0800 +Subject: [PATCH] Fixed missing include for std::find_if. + +Throws an error when compiling on Windows. + +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 +Reviewed-by: Ivan Penkov +--- + +diff --git a/src/common/module.cc b/src/common/module.cc +index 0eb5aad..b6f5da7 100644 +--- a/src/common/module.cc ++++ b/src/common/module.cc +@@ -42,6 +42,7 @@ + #include + #include + ++#include + #include + #include + #include -- 2.25.1 From kadambini.nema at gmail.com Sun Feb 18 01:33:53 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 17 Feb 2024 17:33:53 -0800 Subject: [Buildroot] [PATCH 1/1] package dhcpdump: bump to version 1.9 Message-ID: <20240218013353.798627-1-kadambini.nema@gmail.com> - Change the site to a well maintained - https://github.com/bbonev/dhcpdump - Fix some of the reported build failures - autobuild.buildroot.org/?reason=dhcpdump-1.8 - Build test results ./utils/test-pkg -d br_test -k -c dhcpdump.config -p dhcpdump bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- ...Fix-build-with-gcc4.8-use-br-fortify.patch | 10 ++++++++ .../0001-use-non-bsd-structures.patch | 23 ------------------- package/dhcpdump/Config.in | 2 +- package/dhcpdump/dhcpdump.hash | 2 +- package/dhcpdump/dhcpdump.mk | 5 ++-- 5 files changed, 15 insertions(+), 27 deletions(-) create mode 100644 package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch diff --git a/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch new file mode 100644 index 0000000000..a5c1218c99 --- /dev/null +++ b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch @@ -0,0 +1,10 @@ +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2024-02-17 13:57:08.166161973 -0800 ++++ b/Makefile 2024-02-17 13:57:45.055153969 -0800 +@@ -1,5 +1,5 @@ + CFLAGS+=${CPPFLAGS} +-CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -g -O3 -fPIE ++CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -g -O3 -fPIE + LDFLAGS+=-g -Wl,-z,relro -Wl,-z,now -fPIE -pie + LIBS+=-lpcap + diff --git a/package/dhcpdump/0001-use-non-bsd-structures.patch b/package/dhcpdump/0001-use-non-bsd-structures.patch deleted file mode 100644 index 40115fb640..0000000000 --- a/package/dhcpdump/0001-use-non-bsd-structures.patch +++ /dev/null @@ -1,23 +0,0 @@ -The udphdr structure has uh_* fields when _FAVOR_BSD is -defined. Otherwise, the fields are just named source, dest, len and -check. See . - -Signed-off-by: Thomas Petazzoni - -Index: dhcpdump-1.8/dhcpdump.c -=================================================================== ---- dhcpdump-1.8.orig/dhcpdump.c 2011-05-17 20:20:46.506980003 +0200 -+++ dhcpdump-1.8/dhcpdump.c 2011-05-17 20:20:59.338979999 +0200 -@@ -163,10 +163,10 @@ - strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src)); - strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst)); - -- if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen))) -+ if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len))) - return; - -- printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen)); -+ printdata((u_char *)(sp + offset), ntohs(udp->len)); - } - - // check for matching CHADDR (Peter Apian-Bennewitz ) diff --git a/package/dhcpdump/Config.in b/package/dhcpdump/Config.in index e0abe040fc..30e42928e4 100644 --- a/package/dhcpdump/Config.in +++ b/package/dhcpdump/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_DHCPDUMP help A tool for monitoring dhcp requests using tcpdump. - http://www.mavetju.org/unix/general.php + https://github.com/bbonev/dhcpdump diff --git a/package/dhcpdump/dhcpdump.hash b/package/dhcpdump/dhcpdump.hash index a24db5b275..fdf3243ad1 100644 --- a/package/dhcpdump/dhcpdump.hash +++ b/package/dhcpdump/dhcpdump.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz +sha256 3658ac21cc33e79e72bed070454e49c543017991cb6c37f4253c85e9176869d1 dhcpdump-1.9.tar.xz sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk index ec9571c0af..4ce5047b2e 100644 --- a/package/dhcpdump/dhcpdump.mk +++ b/package/dhcpdump/dhcpdump.mk @@ -4,8 +4,9 @@ # ################################################################################ -DHCPDUMP_VERSION = 1.8 -DHCPDUMP_SITE = http://www.mavetju.org/download +DHCPDUMP_VERSION = 1.9 +DHCPDUMP_SITE = https://github.com/bbonev/dhcpdump/releases/download/v$(DHCPDUMP_VERSION) +DHCPDUMP_SOURCE = dhcpdump-$(DHCPDUMP_VERSION).tar.xz DHCPDUMP_DEPENDENCIES = libpcap DHCPDUMP_LICENSE = BSD-2-Clause DHCPDUMP_LICENSE_FILES = LICENSE -- 2.25.1 From kadambini.nema at gmail.com Sun Feb 18 06:16:52 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 17 Feb 2024 22:16:52 -0800 Subject: [Buildroot] [PATCH 1/1] package/dos2unix: bump version to 7.5.2 Message-ID: <20240218061652.1048008-1-kadambini.nema@gmail.com> Changelog: https://waterlan.home.xs4all.nl/dos2unix/ChangeLog.txt $ ./utils/test-pkg -d br_test -k -c dos2unix.config -p dos2unix bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/dos2unix/dos2unix.hash | 6 +++--- package/dos2unix/dos2unix.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash index 032c8ea2d2..d4d682cd0c 100644 --- a/package/dos2unix/dos2unix.hash +++ b/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 6d1e70cf26..e30fc999d4 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.5.0 +DOS2UNIX_VERSION = 7.5.2 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt -- 2.25.1 From kadambini.nema at gmail.com Sun Feb 18 06:22:39 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 17 Feb 2024 22:22:39 -0800 Subject: [Buildroot] [PATCH 1/1] package {sysrepo, libyang}: bump to version 2.2.150 (sysrepo), 2.1.148 (libyang) Message-ID: <20240218062239.1052785-1-kadambini.nema@gmail.com> Release notes: https://github.com/sysrepo/sysrepo/releases https://github.com/CESNET/libyang/releases/tag/v2.1.148 $ ./utils/test-pkg -d br_test -k -c sysrepo.config sysrepo bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index 3658b20e4e..e03278adfd 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3e52b922fcf371933ad7de1686ad83504e3358236e7817b5af795b0db52fa221 libyang-2.1.111.tar.gz +sha256 77a0aaaeb3df720aeb70d6896e32e2c2be099d48df73e3cfb52567051af3e44b libyang-2.1.148.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 5533c7c68e..fca0cd63f8 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.111 +LIBYANG_VERSION = 2.1.148 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index 6a5e98f41b..056f70787d 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz +sha256 467efed8d0f62c26a0d200602b911096eb2d67858e620937ab68f96b316fa9b7 sysrepo-2.2.150.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 6b031ae6f9..7f2570bd7d 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.2.36 +SYSREPO_VERSION = 2.2.150 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause -- 2.25.1 From kadambini.nema at gmail.com Sun Feb 18 06:27:07 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 17 Feb 2024 22:27:07 -0800 Subject: [Buildroot] [PATCH 1/1] package/sysstat: bump version to 12.7.5 Message-ID: <20240218062707.1056854-1-kadambini.nema@gmail.com> Release notes: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html ./utils/test-pkg -c sysstat.config -p sysstat bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/sysstat/sysstat.hash | 6 +++--- package/sysstat/sysstat.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index b47f000e57..31821d9e3f 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ -# From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 a730982e0c2d4964a0022c1509f3ea0a345402bc sysstat-12.6.1.tar.xz +# From: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html +sha1 f329edff36f462385a7c20d2a136b667ab8db735 sysstat-12.7.5.tar.xz # Locally calculated -sha256 18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342 sysstat-12.6.1.tar.xz +sha256 57664040a549d33bb06a1121c7124d4cadd9b8b35f815856c194393047cd4d6b sysstat-12.7.5.tar.xz sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index f77a60b1da..cfa97834c3 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 12.6.1 +SYSSTAT_VERSION = 12.7.5 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 18 08:09:16 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 09:09:16 +0100 Subject: [Buildroot] [PATCH 1/1] package {sysrepo, libyang}: bump to version 2.2.150 (sysrepo), 2.1.148 (libyang) In-Reply-To: <20240218062239.1052785-1-kadambini.nema@gmail.com> References: <20240218062239.1052785-1-kadambini.nema@gmail.com> Message-ID: Hello Nema, thank you for contributing! Can you please split this into 2 patches? If one package version requires another package minimum version then please point it in the commit log. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas On 18/02/24 07:22, Kadambini Nema wrote: > Release notes: https://github.com/sysrepo/sysrepo/releases > https://github.com/CESNET/libyang/releases/tag/v2.1.148 > > $ ./utils/test-pkg -d br_test -k -c sysrepo.config sysrepo > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: SKIPPED > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: SKIPPED > sourcery-arm [6/6]: OK > 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > Signed-off-by: Kadambini Nema > --- > package/libyang/libyang.hash | 2 +- > package/libyang/libyang.mk | 2 +- > package/sysrepo/sysrepo.hash | 2 +- > package/sysrepo/sysrepo.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash > index 3658b20e4e..e03278adfd 100644 > --- a/package/libyang/libyang.hash > +++ b/package/libyang/libyang.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 3e52b922fcf371933ad7de1686ad83504e3358236e7817b5af795b0db52fa221 libyang-2.1.111.tar.gz > +sha256 77a0aaaeb3df720aeb70d6896e32e2c2be099d48df73e3cfb52567051af3e44b libyang-2.1.148.tar.gz > sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE > diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk > index 5533c7c68e..fca0cd63f8 100644 > --- a/package/libyang/libyang.mk > +++ b/package/libyang/libyang.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBYANG_VERSION = 2.1.111 > +LIBYANG_VERSION = 2.1.148 > LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) > LIBYANG_LICENSE = BSD-3-Clause > LIBYANG_LICENSE_FILES = LICENSE > diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash > index 6a5e98f41b..056f70787d 100644 > --- a/package/sysrepo/sysrepo.hash > +++ b/package/sysrepo/sysrepo.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz > +sha256 467efed8d0f62c26a0d200602b911096eb2d67858e620937ab68f96b316fa9b7 sysrepo-2.2.150.tar.gz > sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE > diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk > index 6b031ae6f9..7f2570bd7d 100644 > --- a/package/sysrepo/sysrepo.mk > +++ b/package/sysrepo/sysrepo.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SYSREPO_VERSION = 2.2.36 > +SYSREPO_VERSION = 2.2.150 > SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) > SYSREPO_INSTALL_STAGING = YES > SYSREPO_LICENSE = BSD-3-Clause From giulio.benetti at benettiengineering.com Sun Feb 18 08:20:12 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 09:20:12 +0100 Subject: [Buildroot] [PATCH v3] package/attr: fix build failure on Microblaze architecture Message-ID: <20240218082012.3425825-1-giulio.benetti@benettiengineering.com> On Microblaze architecture __has_attribute(__symver__) support is broken and always return true even if symver is not supported so let's add an upstream patch to detect if symver is supported during autoreconf. Let's also add ATTR_AUTORECONF = YES to let patch to affect building. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Signed-off-by: Giulio Benetti --- V1->V2: * written commit log as suggested by Thomas(there was no commit log at all since this patch has been pointed during Buildroot Dev Days in IRC to me) * re-sent local patch to the correct maililng list and updated Upstream: URL V2->V3: * since patch has been upstreamed after a little rework, use it and point upstream commit URL --- ...dd-detection-of-symver-gcc-attribute.patch | 75 +++++++++++++++++++ package/attr/attr.mk | 3 + 2 files changed, 78 insertions(+) create mode 100644 package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch new file mode 100644 index 0000000000..ee029e9735 --- /dev/null +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch @@ -0,0 +1,75 @@ +From 365426c28f8bf73d34d77cc06b7d5ffeae17f13a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 15:33:15 +0100 +Subject: [PATCH] configure.ac: add detection of symver gcc attribute + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=943c776089dbb24ebbfb7432ba9841f1845bf95a + +Signed-off-by: Thomas Petazzoni +[Giulio: rework local patch for #if nesting] +Signed-off-by: Giulio Benetti +--- + configure.ac | 15 +++++++++++++++ + libattr/syscalls.c | 8 ++++---- + 2 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7e362e9..98477b5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,21 @@ AS_CASE([$host_os], + [linux*], [os_linux=yes]) + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) + ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, ++ gcc_cv_symver_attribute, ++ [cat > conftest.c </dev/null 2>&1; then \ ++ gcc_cv_symver_attribute=yes ++ fi ++ rm -f conftest.[cs] ++]) ++AS_IF([test $gcc_cv_symver_attribute = yes], ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) ++ + AC_CONFIG_COMMANDS([include/attr], + [dnl + rm -rf include/attr +diff --git a/libattr/syscalls.c b/libattr/syscalls.c +index 907560a..7ee6d39 100644 +--- a/libattr/syscalls.c ++++ b/libattr/syscalls.c +@@ -31,10 +31,10 @@ + * prefer symver attribute if available (since gcc 10), + * fall back to traditional .symver asm directive otherwise. + */ +-#ifdef __has_attribute +-# if __has_attribute(__symver__) +-# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) +-# elif __has_attribute(__no_reorder__) ++#if defined(HAVE_SYMVER_ATTRIBUTE) ++# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) ++#elif defined(__has_attribute) ++# if __has_attribute(__no_reorder__) + /* + * Avoid wrong partitioning with older gcc and LTO. May not work reliably + * with all versions; use -flto-partition=none if you encounter problems. +-- +2.34.1 + diff --git a/package/attr/attr.mk b/package/attr/attr.mk index d1397921ff..1d24144f46 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_CPE_ID_VALID = YES +# Flag added for patch dealing with symver in configure.ac +ATTR_AUTORECONF = YES + ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls -- 2.34.1 From gilles.talis at gmail.com Sun Feb 18 11:13:36 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 18 Feb 2024 07:13:36 -0400 Subject: [Buildroot] [PATCH] package/iozone: bump to version 3.506 In-Reply-To: References: <20240215142413.451505-1-gilles.talis@gmail.com> <20240215142413.451505-2-gilles.talis@gmail.com> Message-ID: Hi Julien, Thanks a lot for the review! Le sam. 17 f?vr. 2024 ? 12:05, Julien Olivain a ?crit : > > Hi Gilles, All, > > Thanks for the patch! > > I have few comments: > > Could you add a reference in commit log to the upstream change log? > For example: > """ > For change log, see end of file: > https://www.iozone.org/src/current/Changes.txt > """ > This helps a lot for later analyses/debugging. Yes, did not realize it was added. Will change that. > > Also, the upstream archive of this new version seems to include > the license file. So the comment can be removed, and the license > file added (see later). OK. Will change that too. > > Finally, could you add a comment in the commit log that: > The upstream archive format changed from tgz to tar. > (just to record this is not an arbitrary change). Well noted. Will also change that. > > On 15/02/2024 15:24, Gilles Talis wrote: > > Signed-off-by: Gilles Talis > > --- > > package/iozone/iozone.hash | 2 +- > > package/iozone/iozone.mk | 4 ++-- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash > > index 9ecf1d1af8..c506b41db2 100644 > > --- a/package/iozone/iozone.hash > > +++ b/package/iozone/iozone.hash > > @@ -1,2 +1,2 @@ > > # Locally calculated > > -sha256 > > 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 > > iozone3_493.tgz > > +sha256 > > 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7 > > iozone3_506.tar > > The license file hash can be added here: > sha256 bff7909fd698708d15613a4fb977a193cff98f44ef170c2dc1dd502974df75b2 > docs/License.txt > > > diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk > > index 2df4a2aa84..7cce15c53d 100644 > > --- a/package/iozone/iozone.mk > > +++ b/package/iozone/iozone.mk > > @@ -4,8 +4,8 @@ > > # > > > > ################################################################################ > > > > -IOZONE_VERSION = 3.493 > > -IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz > > +IOZONE_VERSION = 3.506 > > +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar > > IOZONE_SITE = http://www.iozone.org/src/current > > IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) > > # IOzone license details can be found at: > > The license comment can be removed here, and the license file added: > IOZONE_LICENSE_FILES = docs/License.txt > > > -- > > 2.39.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > Best regards, > > Julien. thanks Gilles. From dario.binacchi at amarulasolutions.com Sun Feb 18 13:20:44 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:20:44 +0100 Subject: [Buildroot] [PATCH v4 06/20] boot/ti-k3-core-secdev: new package In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> Message-ID: Hello Alexander, On Sat, Feb 17, 2024 at 6:06?PM Alexander Sverdlin wrote: > > Hello Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > This is a security development package containing tools for > > High-Security(HS) TI K3 platform devices. > > > > Signed-off-by: Dario Binacchi > > as I understand secdev package is not required for binman-based > U-Boot deployments starting from v2023.10. > > So what is the point of introducing the package now if you update > U-Boot to v2024.01? > > I belive it's as legacy as ti-k3-image-gen (which you are fixing) > but Romain's patchset removed the package and, quite successfully, > from the perspective of building for HS variants. The series is a continuation of what I submitted for the first time at the end of November when I still didn't know that Binman made it possible to do without external tools. I haven't removed it just to give a complete overview of the patches available from then until now. In the next version, I will remove them, or perhaps, in the event that a single version with Romain's patches is chosen, they will not be selected. Thanks and regards, Dario > > > --- > > > > Changes in v4: > > - Remove the trailing '/' at the end of the url in the help of > > Config.in > > - Fixed license issues > > - Use $(BINARIES_DIR)/ti-k3-core-secdev as the directory where to > > install files. > > > > Signed-off-by: Dario Binacchi > > --- > > DEVELOPERS | 1 + > > boot/Config.in | 1 + > > boot/ti-k3-core-secdev/Config.in | 9 ++++++++ > > boot/ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 +++ > > boot/ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 +++++++++++++++++++ > > 5 files changed, 36 insertions(+) > > create mode 100644 boot/ti-k3-core-secdev/Config.in > > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 0d12c3abcb11..33d99ab2440f 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -753,6 +753,7 @@ F: package/xinetd/ > > N: Dario Binacchi > > F: board/bsh/ > > F: board/stmicroelectronics/stm32f769-disco/ > > +F: boot/ti-k3-core-secdev/ > > F: configs/imx8mn_bsh_smm_s2_defconfig > > F: configs/imx8mn_bsh_smm_s2_pro_defconfig > > F: configs/stm32f769_disco_sd_defconfig > > diff --git a/boot/Config.in b/boot/Config.in > > index e5fdf7ad439e..18a7d268f95a 100644 > > --- a/boot/Config.in > > +++ b/boot/Config.in > > @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" > > source "boot/shim/Config.in" > > source "boot/syslinux/Config.in" > > source "boot/ti-k3-boot-firmware/Config.in" > > +source "boot/ti-k3-core-secdev/Config.in" > > source "boot/ti-k3-image-gen/Config.in" > > source "boot/ti-k3-r5-loader/Config.in" > > source "boot/uboot/Config.in" > > diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in > > new file mode 100644 > > index 000000000000..f7b4e2962042 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/Config.in > > @@ -0,0 +1,9 @@ > > +config BR2_TARGET_TI_K3_CORE_SECDEV > > + bool "ti-k3-core-secdev" > > + depends on BR2_aarch64 > > + help > > + This package downloads and installs development tools for > > + High-Security(HS) TI K3 platforms (which include AM62x, > > + AM64x, AM65x and more). > > + > > + https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > new file mode 100644 > > index 000000000000..e3074a398d62 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > @@ -0,0 +1,3 @@ > > +# Locally calculated > > +sha256 b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06 core-secdev-k3-08.06.00.007.tar.xz > > +sha256 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369 manifest/k3-secdev-0.2-manifest.html > > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > new file mode 100644 > > index 000000000000..f7655a0fefc8 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > @@ -0,0 +1,22 @@ > > +################################################################################ > > +# > > +# ti-k3-core-secdev > > +# > > +################################################################################ > > + > > +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 > > +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot > > +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz > > +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES > > +TI_K3_CORE_SECDEV_LICENSE = BSD-3-Clause > > +TI_K3_CORE_SECDEV_LICENSE_FILES = manifest/k3-secdev-0.2-manifest.html > > + > > +TI_K3_CORE_SECDEV_INSTALL_DIR = $(BINARIES_DIR)/ti-k3-core-secdev > > + > > +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS > > + mkdir -p $(TI_K3_CORE_SECDEV_INSTALL_DIR) > > + cp -dpfr $(@D)/keys $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > > + cp -dpfr $(@D)/scripts $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > > +endef > > + > > +$(eval $(generic-package)) > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:30:16 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:30:16 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 6:28?PM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > Signed-off-by: Dario Binacchi > > https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-12-romain.naour at smile.fr/ > > looks more complete with sysfw.itb? In my use case, there was no need as it was necessary to enable ti-k3-boot-firmware: define TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES_CMDS cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ cp -dpfr $(@D)/ti-dm $(BINARIES_DIR)/ endef > > > --- > > > > Added in v4 > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index 2a10024aedaa..643298a1e70a 100644 > > --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > > endef > > > > $(eval $(kconfig-package)) > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:38:53 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:38:53 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 6:28?PM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > Signed-off-by: Dario Binacchi > > https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-12-romain.naour at smile.fr/ > > looks more complete with sysfw.itb? In my use case, there was no need as it was necessary to enable ti-k3-boot-firmware: define TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES_CMDS cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ cp -dpfr $(@D)/ti-dm $(BINARIES_DIR)/ endef I also wonder whether it is necessary to remove the cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ to avoid conflicts. Alternatively, as happened with ti-k3-hen-image, one day we may no longer need ti-k3-boot-firmware, and therefore we could add a copy of sysfw.itb from ti-k3-r5-loader. I am awaiting suggestions. However, my patch does not require modifying the genimage.cfg file. In any case, I would try to ensure this also for sysfw.itb. Thanks and regards, Dario > > > --- > > > > Added in v4 > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index 2a10024aedaa..643298a1e70a 100644 > > --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > > endef > > > > $(eval $(kconfig-package)) > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:49:06 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:49:06 +0100 Subject: [Buildroot] [PATCH v4 15/20] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <73868728d467604fa82ada93e652c23eca4afaa6.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-16-dario.binacchi@amarulasolutions.com> <73868728d467604fa82ada93e652c23eca4afaa6.camel@gmail.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 9:20?PM Alexander Sverdlin wrote: > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > The 2024.01 version of U-Boot for the am62x-sk board has introduced two > > major changes: > > - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in > > /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET > > and the use of extlinux.conf for the proper loading of the device tree. > > Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to > > auto-generate the extlinux.conf file so that developers can change the > > kernel loading options by modifying the .config. > > - The use of binman for building images. > > > > Tested on SK-AM62B-P1. > > > > Signed-off-by: Dario Binacchi > > [] > > > @@ -27,14 +27,15 @@ BR2_TARGET_TI_K3_IMAGE_GEN=y > > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > > BR2_TARGET_TI_K3_R5_LOADER=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > > Is patch 3/20 really required in this case? > Is custom version required if you set the same version as default in patch > 5/20? > > -- > Alexander Sverdlin. > Romain asked me to update the default version for ti-k3-r5-loader to 2024.01. Therefore, I wanted this change not to improperly advance the version for the ti_am6{2,4}x_sk_defconfig configuration. Additionally, I wanted to put these patches before the ones I had already submitted in version 3, to have a more readable separation between before and after. Thanks and regards, Dario -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:50:26 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:50:26 +0100 Subject: [Buildroot] [PATCH v4 16/20] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-17-dario.binacchi@amarulasolutions.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 9:27?PM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > Tested on SK-AM62B-P1. > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v4 > > - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. > > > > no changes since v1 > > > > Signed-off-by: Dario Binacchi > > --- > > configs/ti_am62x_sk_defconfig | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > > index 193301c8b941..4de39fb897fd 100644 > > --- a/configs/ti_am62x_sk_defconfig > > +++ b/configs/ti_am62x_sk_defconfig > > @@ -1,11 +1,11 @@ > > BR2_aarch64=y > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > > BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.1" > > Could be updated to v6.6.17 if you re-spin? Of course. Thanks and regards, Dario > > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:52:45 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:52:45 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 9:33?PM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > Recent versions of U-Boot can use Binman to compile and sign the generated > > binaries, thus making the use of custom tools like ti-k3-image-gen no > > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > > configured and used outside of it. This patch allows setting such options > > even if the package is not enabled. > > Missing SoB? Good catch, Thanks and regards, Dario > > The patch looks more complete to me than https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-13-romain.naour at smile.fr/ > because of SECTYPE variables. > > Reviewed-by: Alexander Sverdlin > > > --- > > > > Added in v4 > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3/Config.in | 46 ++++++++++++++ > > boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > > boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > > boot/uboot/Config.in | 7 +-- > > configs/ti_am62x_sk_defconfig | 2 +- > > configs/ti_am64x_sk_defconfig | 2 +- > > 6 files changed, 59 insertions(+), 67 deletions(-) > > > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > > index 06dda2f156a9..9e508326c9c8 100644 > > --- a/boot/ti-k3/Config.in > > +++ b/boot/ti-k3/Config.in > > @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > > > > if BR2_TARGET_TI_K3 > > > > +choice > > + prompt "SoC family" > > + > > +config BR2_TARGET_TI_K3_SOC_AM62AX > > + bool "am62ax" > > + > > +config BR2_TARGET_TI_K3_SOC_AM62X > > + bool "am62x" > > + > > +config BR2_TARGET_TI_K3_SOC_AM64X > > + bool "am64x" > > + > > +config BR2_TARGET_TI_K3_SOC_AM65X > > + bool "am65x" > > + > > +endchoice > > + > > +choice > > + prompt "Security type" > > + help > > + The target SoC security type option. > > + > > +config BR2_TARGET_TI_K3_SECTYPE_GP > > + bool "gp" > > + > > +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > > + bool "hs-fs" > > + > > +config BR2_TARGET_TI_K3_SECTYPE_HS > > + bool "hs" > > + > > +endchoice > > + > > +config BR2_TARGET_TI_K3_SOC > > + string > > + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > > + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > > + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > > + > > +config BR2_TARGET_TI_K3_SECTYPE > > + string > > + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > > + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > > + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > > + > > source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > > source "boot/ti-k3/ti-k3-core-secdev/Config.in" > > source "boot/ti-k3/ti-k3-image-gen/Config.in" > > diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > > index 38d1598d9fc0..2d53d62dd4ee 100644 > > --- a/boot/ti-k3/ti-k3-image-gen/Config.in > > +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > > @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > bool "ti-k3-image-gen" > > depends on BR2_TARGET_TI_K3_R5_LOADER > > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > > # We need FIT support in uboot-tools, which is why we select a > > # host package > > select BR2_PACKAGE_HOST_UBOOT_TOOLS > > @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > > > if BR2_TARGET_TI_K3_IMAGE_GEN > > -choice > > - prompt "SoC family" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - bool "am62ax" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - bool "am62x" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - bool "am64x" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > - bool "am65x" > > - > > -endchoice > > - > > -choice > > - prompt "Security type" > > - help > > - The target SoC security type option for image gen. Valid > > - options are "gp" for General Purpose devices, "hs-fs" for > > - High Security - Field Securable devices, or "hs" for High > > - Security - Security Enforcing devices. Note for all High > > - Security device variants the TI_SECURE_DEV_PKG environmental > > - variable must be defined at build time pointing to a valid > > - core-secdev-k3 folder location, otherwise the build will > > - fail, see > > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > - bool "gp" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > - bool "hs-fs" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > - bool "hs" > > - > > -endchoice > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > > - string > > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > > string > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > > - string > > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > > > > endif > > diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > index 74b4fcb4bf89..834d8f7d5cd5 100644 > > --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > > $(BR2_MAKE_HOST_DEPENDENCY) > > > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > > > -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > > TI_K3_IMAGE_GEN_SYSFW = \ > > $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > else > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > > index beafb38930db..1a9d21e7c6d1 100644 > > --- a/boot/uboot/Config.in > > +++ b/boot/uboot/Config.in > > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > bool "U-Boot needs TI K3 Device Manager (DM)" > > # We use the SoC selection defined for the ti-k3-image-gen > > # package > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > > help > > Some TI K3 devices need the Device Manager (DM) firmware to > > be available for the U-Boot build. > > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > > > config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > > string > > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > > > > endif > > > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > > index cd26235342e4..cfefce0a77a4 100644 > > --- a/configs/ti_am62x_sk_defconfig > > +++ b/configs/ti_am62x_sk_defconfig > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > > BR2_TARGET_TI_K3=y > > +BR2_TARGET_TI_K3_SOC_AM62X=y > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > > BR2_TARGET_TI_K3_R5_LOADER=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > > index 1befeb4ab96c..daf78dbffff8 100644 > > --- a/configs/ti_am64x_sk_defconfig > > +++ b/configs/ti_am64x_sk_defconfig > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > > BR2_TARGET_TI_K3=y > > +BR2_TARGET_TI_K3_SOC_AM64X=y > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > > BR2_TARGET_TI_K3_R5_LOADER=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:55:39 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:55:39 +0100 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 9:44?PM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > As explained in [1], adding support for AM62x LP SK in U-Boot, requires > > binman for building bootloader images. The BINMAN_INDIRS environment > > variable is used to provide a space-separated list of directories to > > search for binary blobs. > > > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > > Signed-off-by: Dario Binacchi > > > > --- > > > > no changes since v1: > > > > Signed-off-by: Dario Binacchi > > --- > > boot/uboot/uboot.mk | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > > index dda606a88059..cf70f86a4132 100644 > > --- a/boot/uboot/uboot.mk > > +++ b/boot/uboot/uboot.mk > > @@ -189,7 +189,8 @@ endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > > UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > > UBOOT_DEPENDENCIES += ti-k3-boot-firmware > > -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > > +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ > > Is the above actually still required with binman? > The names are hardcoded in U-Boot in arch/arm/dts/k3-am625-sk-binman.dtsi I will verify with some tests, Thanks and regards Dario > > > + BINMAN_INDIRS=$(BINARIES_DIR) > > This seems to be the only required part. > > > endif > > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:59:50 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:59:50 +0100 Subject: [Buildroot] [PATCH v4 17/20] boot: move ti-k3-* packages to 'ti-k3' directory In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-18-dario.binacchi@amarulasolutions.com> Message-ID: Hi Fran?ois, On Sat, Feb 17, 2024 at 10:05?PM Fran?ois Perrad wrote: > > > > Le sam. 17 f?vr. 2024 ? 17:03, Dario Binacchi a ?crit : >> >> Move all TI K3 packages to the directory ti-k3. > > > The Buildroot documentation states that "New subdirectories are discouraged". > See https://buildroot.org/downloads/manual/manual.html#_package_directory This patch is preliminary to the next one. That is, I wanted to decouple the SECTYPE and SOC configurations from a specific package since they are general parameters for the ti-k3 platform. This seemed to me the best solution. Any alternative suggestions are welcome. Thanks and regards, Dario > > Fran?ois > >> >> This patch is preparatory for future developments. >> >> Signed-off-by: Dario Binacchi >> >> --- >> >> Added in v4 >> >> Signed-off-by: Dario Binacchi >> --- >> boot/Config.in | 5 +---- >> boot/ti-k3/Config.in | 13 +++++++++++++ >> boot/ti-k3/common.mk | 1 + >> boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 >> .../ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 0 >> .../ti-k3-boot-firmware/ti-k3-boot-firmware.mk | 0 >> boot/{ => ti-k3}/ti-k3-core-secdev/Config.in | 0 >> .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 0 >> .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 0 >> boot/{ => ti-k3}/ti-k3-image-gen/Config.in | 0 >> .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 >> boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk | 0 >> boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 0 >> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 0 >> boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk | 0 >> configs/ti_am62x_sk_defconfig | 1 + >> configs/ti_am64x_sk_defconfig | 1 + >> 17 files changed, 17 insertions(+), 4 deletions(-) >> create mode 100644 boot/ti-k3/Config.in >> create mode 100644 boot/ti-k3/common.mk >> rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) >> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) >> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) >> rename boot/{ => ti-k3}/ti-k3-core-secdev/Config.in (100%) >> rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.hash (100%) >> rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.mk (100%) >> rename boot/{ => ti-k3}/ti-k3-image-gen/Config.in (100%) >> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) >> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (100%) >> rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (100%) >> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (100%) >> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (100%) >> >> diff --git a/boot/Config.in b/boot/Config.in >> index 18a7d268f95a..74a64a096afc 100644 >> --- a/boot/Config.in >> +++ b/boot/Config.in >> @@ -19,10 +19,7 @@ source "boot/opensbi/Config.in" >> source "boot/s500-bootloader/Config.in" >> source "boot/shim/Config.in" >> source "boot/syslinux/Config.in" >> -source "boot/ti-k3-boot-firmware/Config.in" >> -source "boot/ti-k3-core-secdev/Config.in" >> -source "boot/ti-k3-image-gen/Config.in" >> -source "boot/ti-k3-r5-loader/Config.in" >> +source "boot/ti-k3/Config.in" >> source "boot/uboot/Config.in" >> source "boot/vexpress-firmware/Config.in" >> >> diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in >> new file mode 100644 >> index 000000000000..06dda2f156a9 >> --- /dev/null >> +++ b/boot/ti-k3/Config.in >> @@ -0,0 +1,13 @@ >> +config BR2_TARGET_TI_K3 >> + bool "TI K3" >> + help >> + The TI K3 bootloaders and tools. >> + >> +if BR2_TARGET_TI_K3 >> + >> +source "boot/ti-k3/ti-k3-boot-firmware/Config.in" >> +source "boot/ti-k3/ti-k3-core-secdev/Config.in" >> +source "boot/ti-k3/ti-k3-image-gen/Config.in" >> +source "boot/ti-k3/ti-k3-r5-loader/Config.in" >> + >> +endif >> diff --git a/boot/ti-k3/common.mk b/boot/ti-k3/common.mk >> new file mode 100644 >> index 000000000000..18a1329baa4c >> --- /dev/null >> +++ b/boot/ti-k3/common.mk >> @@ -0,0 +1 @@ >> +include $(sort $(wildcard boot/ti-k3/*/*.mk)) >> diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3/ti-k3-boot-firmware/Config.in >> similarity index 100% >> rename from boot/ti-k3-boot-firmware/Config.in >> rename to boot/ti-k3/ti-k3-boot-firmware/Config.in >> diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash >> similarity index 100% >> rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash >> rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash >> diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk >> similarity index 100% >> rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk >> rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk >> diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3/ti-k3-core-secdev/Config.in >> similarity index 100% >> rename from boot/ti-k3-core-secdev/Config.in >> rename to boot/ti-k3/ti-k3-core-secdev/Config.in >> diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash >> similarity index 100% >> rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.hash >> rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash >> diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk >> similarity index 100% >> rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.mk >> rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk >> diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in >> similarity index 100% >> rename from boot/ti-k3-image-gen/Config.in >> rename to boot/ti-k3/ti-k3-image-gen/Config.in >> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash >> similarity index 100% >> rename from boot/ti-k3-image-gen/ti-k3-image-gen.hash >> rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash >> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >> similarity index 100% >> rename from boot/ti-k3-image-gen/ti-k3-image-gen.mk >> rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >> diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3/ti-k3-r5-loader/Config.in >> similarity index 100% >> rename from boot/ti-k3-r5-loader/Config.in >> rename to boot/ti-k3/ti-k3-r5-loader/Config.in >> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash >> similarity index 100% >> rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.hash >> rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash >> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk >> similarity index 100% >> rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >> rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk >> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >> index 4de39fb897fd..cd26235342e4 100644 >> --- a/configs/ti_am62x_sk_defconfig >> +++ b/configs/ti_am62x_sk_defconfig >> @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y >> BR2_TARGET_OPTEE_OS=y >> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" >> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" >> +BR2_TARGET_TI_K3=y >> BR2_TARGET_TI_K3_IMAGE_GEN=y >> BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y >> BR2_TARGET_TI_K3_R5_LOADER=y >> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig >> index 5fd9653b5b8f..1befeb4ab96c 100644 >> --- a/configs/ti_am64x_sk_defconfig >> +++ b/configs/ti_am64x_sk_defconfig >> @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y >> BR2_TARGET_OPTEE_OS=y >> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" >> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" >> +BR2_TARGET_TI_K3=y >> BR2_TARGET_TI_K3_IMAGE_GEN=y >> BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y >> BR2_TARGET_TI_K3_R5_LOADER=y >> -- >> 2.43.0 >> -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 14:01:58 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 15:01:58 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> Message-ID: Hi Alexander, On Sun, Feb 18, 2024 at 12:45?AM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > The patch sets the configurations required by TI HS systems. Some of these > > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > > are provided by the ti-k3-core-secdev package in the binaries directory. > > > > Signed-off-by: Dario Binacchi > > so for test I've reverted the previous "boot/ti-k3-core-secdev: new package" > commit, then... > > > --- > > > > no changes since v3: > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3-image-gen/Config.in | 1 + > > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > > 2 files changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > > index d76cef82e911..38d1598d9fc0 100644 > > --- a/boot/ti-k3-image-gen/Config.in > > +++ b/boot/ti-k3-image-gen/Config.in > > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > bool "ti-k3-image-gen" > > depends on BR2_TARGET_TI_K3_R5_LOADER > > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > ... removed this, ... > > > # We need FIT support in uboot-tools, which is why we select a > > # host package > > select BR2_PACKAGE_HOST_UBOOT_TOOLS > > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > index 64be9a18f2c4..74b4fcb4bf89 100644 > > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > > > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +else > > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > > ... the above line, ... > > > + > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > > +endif > > > > define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > > + ) > > endef > > > > define TI_K3_IMAGE_GEN_BUILD_CMDS > > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > > $(BR2_MAKE) -C $(@D) \ > > SOC=$(TI_K3_IMAGE_GEN_SOC) \ > > SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > > + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ > > ... and this line... > > > CONFIG=evm \ > > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > > SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > > ... and everything still builds and boots fine on SK-AM62B (HS-FS): Thanks for your info, I will consider them for version 5. Thanks and regards, Dario > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:02:43 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 13400 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Starting ATF on ARM64 core... > > NOTICE: BL31: v2.7(release):v2.7 > NOTICE: BL31: Built : 23:57:43, Feb 17 2024 > I/TC: > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1199-g470b2069e4)) #1 Sat Feb 17 22:57:38 UTC 2024 aarch64 > I/TC: WARNING: This OP-TEE configuration might be insecure! > I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html > I/TC: Primary CPU initializing > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > I/TC: HUK Initialized > I/TC: Activated SA2UL device > I/TC: Enabled firewalls for SA2UL TRNG device > I/TC: SA2UL TRNG initialized > I/TC: SA2UL Drivers initialized > I/TC: Primary CPU switching to normal world boot > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:03:30 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 1872 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > > > U-Boot 2024.01 (Feb 18 2024 - 00:03:30 +0100) > > SoC: AM62X SR1.0 HS-FS > Model: Texas Instruments AM625 SK > DRAM: 2 GiB > Core: 56 devices, 23 uclasses, devicetree: separate > MMC: mmc at fa10000: 0, mmc at fa00000: 1 > Loading Environment from nowhere... OK > In: serial at 2800000 > Out: serial at 2800000 > Err: serial at 2800000 > Net: eth0: ethernet at 8000000port@1 > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc1 is current device > SD/MMC found on device 1 > Failed to load 'uEnv.txt' > Scanning for bootflows in all bootdevs > Seq Method State Uclass Part Name Filename > --- ----------- ------ -------- ---- ------------------------ ---------------- > Scanning global bootmeth 'efi_mgr': > No EFI system partition > No EFI system partition > Failed to persist EFI variables > Scanning bootdev 'mmc at fa00000.bootdev': > 0 extlinux ready mmc 1 mmc at fa00000.bootdev.part_ /extlinux/extlinux.conf > ** Booting bootflow 'mmc at fa00000.bootdev.part_1' with extlinux > 1: am62x-sk-buildroot > Retrieving file: /Image > append: console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 > Retrieving file: /k3-am62x.dtb > ## Flattened Device Tree blob at ffb14700 > Booting using the fdt blob at 0xffb14700 > Working FDT set to ffb14700 > Loading Device Tree to 000000008ffed000, end 000000008ffff687 ... OK > Working FDT set to 8ffed000 > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] > [ 0.000000] Linux version 6.6.1 (...) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1199-g470b2069e4) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Sun Feb 18 > 00:37:47 CET 2024 > > > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From ju.o at free.fr Sun Feb 18 17:25:47 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 18 Feb 2024 18:25:47 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add sox runtime test Message-ID: <20240218172547.262368-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_sox.py | 74 +++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 support/testing/tests/package/test_sox.py diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..34dc87e98f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1848,6 +1848,7 @@ F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py +F: support/testing/tests/package/test_sox.py F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py diff --git a/support/testing/tests/package/test_sox.py b/support/testing/tests/package/test_sox.py new file mode 100644 index 0000000000..74f784a36f --- /dev/null +++ b/support/testing/tests/package/test_sox.py @@ -0,0 +1,74 @@ +import math +import os + +import infra.basetest + + +class TestSox(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_AUBIO=y + BR2_PACKAGE_SOX=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def note_from_freq(self, freq): + """Return a note number from the input frequency in Hertz.""" + return round((12 * math.log(freq / 440) / math.log(2)) + 69) + + def check_audio_note(self, input_file, expected_note): + """Check the input_file include the expected_note.""" + out, ret = self.emulator.run(f"aubionotes {input_file}", timeout=20) + self.assertEqual(ret, 0) + note_found = False + for line in out: + values = line.split() + if len(values) == 3: + note = round(float(values[0])) + if note == expected_note: + note_found = True + self.assertTrue(note_found, "The expected note was not found") + + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("sox --version") + + freq = 440 # General Midi note A3 + expected_note = self.note_from_freq(freq) + wav_file = "ref.wav" + tmpwav_file = "tmp.wav" + + # Generate a sinusoidal tone. + cmd = "sox -V -r 48000 -n -b 16 -c 1" + cmd += f" {wav_file} synth 3 sin {freq} vol -10dB" + self.assertRunOk(cmd) + + # Compute statistics on the generated file. + self.assertRunOk(f"sox {wav_file} -n stat") + + # We check the generated wave file includes the expected note. + self.check_audio_note(wav_file, expected_note) + + # We resample the reference file. + cmd = f"sox -V {wav_file} -r 22050 {tmpwav_file}" + self.assertRunOk(cmd) + + # We should still detect our expected note. + self.check_audio_note(tmpwav_file, expected_note) + + # We convert the file by changing the speed by a factor. + speed_factor = 2 + cmd = f"sox -V {wav_file} {tmpwav_file} speed {speed_factor}" + self.assertRunOk(cmd) + + # We compute the new expected note from this test controller + # side, and check we detect this new note in the audio file. + new_expected_note = self.note_from_freq(freq * speed_factor) + self.check_audio_note(tmpwav_file, new_expected_note) -- 2.43.2 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:32 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:32 +0100 Subject: [Buildroot] [PATCH 4/8] package/libcamera: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-5-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/libcamera/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index ccb5281b4b..e84b8d342e 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS default y # Invalid packing size of ControlValue struct on m68k depends on !BR2_m68k - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 menuconfig BR2_PACKAGE_LIBCAMERA bool "libcamera" -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:31 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:31 +0100 Subject: [Buildroot] [PATCH 3/8] package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-4-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/kf5/kf5-kcoreaddons/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/kf5/kf5-kcoreaddons/Config.in b/package/kf5/kf5-kcoreaddons/Config.in index 02bd38e395..88fda03ee0 100644 --- a/package/kf5/kf5-kcoreaddons/Config.in +++ b/package/kf5/kf5-kcoreaddons/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KF5_KCOREADDONS bool "kf5-kcoreaddons" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES select BR2_PACKAGE_QT5TOOLS select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:28 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:28 +0100 Subject: [Buildroot] [PATCH 0/8] Patch and remove Nios2 binutils bug 27597 Message-ID: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> This patchset add backported patches for Buildroot Nios2 binutils bug 27597 and drop packages dependency on it. Doing this the external toolchain will fail building those packages, so I'm not that sure how to deal with this situation. The same happened for OpenRisc and as far as I remember the first patch of the series has been applied, then Bootlin toolchains have been patched and rebuilt/ redeployed, in the end the remaining patches have been applied. But here we also have Sourcery CodeBench Nios-II 2018.05 toolchain that contain the bug, so I don't know how to deal with this situation to avoid build failures. Any ideas? Thank you! Best regards Giulio Giulio Benetti (8): package/binutils: add local patches to fix Nios2 bug 27597 package/gdal: drop nios2 binutils bug 27597 dependency package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency package/libcamera: drop nios2 binutils bug 27597 dependency package/libgeos: drop nios2 binutils bug 27597 dependency package/pistache: drop nios2 binutils bug 27597 dependency package/postgis: drop nios2 binutils bug 27597 dependency toolchain: remove binutils bug 27597 ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ package/gdal/Config.in | 4 +- package/kf5/kf5-kcoreaddons/Config.in | 1 - package/libcamera/Config.in | 1 - package/libgeos/Config.in | 6 +- package/pistache/Config.in | 6 +- package/postgis/Config.in | 6 +- toolchain/Config.in | 6 - 10 files changed, 382 insertions(+), 23 deletions(-) create mode 100644 package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:30 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:30 +0100 Subject: [Buildroot] [PATCH 2/8] package/gdal: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-3-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/gdal/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/gdal/Config.in b/package/gdal/Config.in index 24a1f06af2..839a1bd7ea 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GDAL # configure can't find proj, when linking statically depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 depends on BR2_TOOLCHAIN_HAS_THREADS # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_GIFLIB @@ -26,9 +25,8 @@ config BR2_PACKAGE_GDAL https://gdal.org/ -comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar" +comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:33 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:33 +0100 Subject: [Buildroot] [PATCH 5/8] package/libgeos: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-6-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/libgeos/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 2a27c6f2a4..76cbb9bdcd 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the JTS Topology Suite (JTS). It aims to contain the complete @@ -14,8 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads not binutils bug 27597" +comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:29 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:29 +0100 Subject: [Buildroot] [PATCH 1/8] package/binutils: add local patches to fix Nios2 bug 27597 In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-2-giulio.benetti@benettiengineering.com> These backported patches fix Nios2 linker bug 27597 that affects packages gdal, kf5-kcoreaddons, libgeos, libcamera, pistache. Signed-off-by: Giulio Benetti --- ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ 3 files changed, 375 insertions(+) create mode 100644 package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch diff --git a/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + diff --git a/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + diff --git a/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:34 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:34 +0100 Subject: [Buildroot] [PATCH 6/8] package/pistache: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-7-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/pistache/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 3acf1f53f0..ca2d2833cd 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PISTACHE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_RAPIDJSON help Pistache is a modern and elegant HTTP and REST framework @@ -13,9 +12,8 @@ config BR2_PACKAGE_PISTACHE https://github.com/oktal/pistache -comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" +comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_USE_WCHAR -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:36 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:36 +0100 Subject: [Buildroot] [PATCH 8/8] toolchain: remove binutils bug 27597 In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-9-giulio.benetti@benettiengineering.com> Binutils bug 27597 is not present anymore in Buildroot so let's remove it. Signed-off-by: Giulio Benetti --- toolchain/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 407a03c42e..9e6cff1950 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=27597 -# Affect toolchains built with binutils 2.36.1, still not fixed. -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 - bool - default y if BR2_nios2 - # https://sourceware.org/bugzilla/show_bug.cgi?id=30730 # Affect toolchains built with binutils 2.40, still not fixed. config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:35 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:35 +0100 Subject: [Buildroot] [PATCH 7/8] package/postgis: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-8-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/postgis/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 7d42390677..78569d63be 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_POSTGIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS select BR2_PACKAGE_PROJ select BR2_PACKAGE_LIBXML2 @@ -18,7 +17,6 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9, not binutils bug 27597" +comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR -- 2.34.1 From yann.morin.1998 at free.fr Sun Feb 18 19:13:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 20:13:12 +0100 Subject: [Buildroot] [PATCH 2/8] package/gdal: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-3-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> <20240218184536.1922309-3-giulio.benetti@benettiengineering.com> Message-ID: Giulio, All, On 2024-02-18 19:45 +0100, Giulio Benetti spake thusly: > Now that binutils patch has been backported to every Buildroot binutils > version we can drop nios2 binutils bug 27597 dependency. What about external pre-built toolchains? Comment valid for all the patches in this series... Regards, Yann E. MORIN. > Signed-off-by: Giulio Benetti > --- > package/gdal/Config.in | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/package/gdal/Config.in b/package/gdal/Config.in > index 24a1f06af2..839a1bd7ea 100644 > --- a/package/gdal/Config.in > +++ b/package/gdal/Config.in > @@ -5,7 +5,6 @@ config BR2_PACKAGE_GDAL > # configure can't find proj, when linking statically > depends on !BR2_STATIC_LIBS > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj > - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 > depends on BR2_TOOLCHAIN_HAS_THREADS # proj > depends on BR2_USE_WCHAR # proj > select BR2_PACKAGE_GIFLIB > @@ -26,9 +25,8 @@ config BR2_PACKAGE_GDAL > > https://gdal.org/ > > -comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar" > +comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ > - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ > !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 19:26:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 20:26:58 +0100 Subject: [Buildroot] [PATCH 0/8] Patch and remove Nios2 binutils bug 27597 In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: Giulio, All, On 2024-02-18 19:45 +0100, Giulio Benetti spake thusly: > This patchset add backported patches for Buildroot Nios2 binutils bug 27597 and > drop packages dependency on it. Doing this the external toolchain will fail > building those packages, so I'm not that sure how to deal with this situation. > The same happened for OpenRisc and as far as I remember the first patch of the > series has been applied, then Bootlin toolchains have been patched and rebuilt/ > redeployed, in the end the remaining patches have been applied. But here we also > have Sourcery CodeBench Nios-II 2018.05 toolchain that contain the bug, so I > don't know how to deal with this situation to avoid build failures. My suggestion: - keep BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 - make the sourcery toolchain select it. For "soon" after BR 2024.02 release:: - drop the sourcery toolchain: it is going to be 6 years old when BR 2024.05, so it's going to be time to drop it. Regards, Yann E. MORIN. > Any ideas? > > Thank you! > > Best regards > Giulio > > Giulio Benetti (8): > package/binutils: add local patches to fix Nios2 bug 27597 > package/gdal: drop nios2 binutils bug 27597 dependency > package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency > package/libcamera: drop nios2 binutils bug 27597 dependency > package/libgeos: drop nios2 binutils bug 27597 dependency > package/pistache: drop nios2 binutils bug 27597 dependency > package/postgis: drop nios2 binutils bug 27597 dependency > toolchain: remove binutils bug 27597 > > ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ > ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ > ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ > package/gdal/Config.in | 4 +- > package/kf5/kf5-kcoreaddons/Config.in | 1 - > package/libcamera/Config.in | 1 - > package/libgeos/Config.in | 6 +- > package/pistache/Config.in | 6 +- > package/postgis/Config.in | 6 +- > toolchain/Config.in | 6 - > 10 files changed, 382 insertions(+), 23 deletions(-) > create mode 100644 package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch > create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch > create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From nunog at fr24.com Sun Feb 18 19:30:55 2024 From: nunog at fr24.com (=?UTF-8?q?Nuno=20Gon=C3=A7alves?=) Date: Sun, 18 Feb 2024 19:30:55 +0000 Subject: [Buildroot] [PATCH] package/google-breakpad: fix tools option identation in menuconfig Message-ID: <20240218193112.1048370-1-nunog@fr24.com> Move comment in Config.in to end of file so that BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS is properly idented. Signed-off-by: Nuno Gon?alves --- package/google-breakpad/Config.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 0d21fd2e5c..5c7f4bb7ba 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -35,14 +35,6 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD https://chromium.googlesource.com/breakpad/breakpad -comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" - depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - if BR2_PACKAGE_GOOGLE_BREAKPAD config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS @@ -52,3 +44,11 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS minidump_stackwalk and microdump_stackwalk. endif + +comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" + depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 -- 2.43.2 From yann.morin.1998 at free.fr Sun Feb 18 19:44:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 20:44:25 +0100 Subject: [Buildroot] [PATCH 8/8] toolchain: remove binutils bug 27597 In-Reply-To: <20240218184536.1922309-9-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> <20240218184536.1922309-9-giulio.benetti@benettiengineering.com> Message-ID: Giulio, all, On 2024-02-18 19:45 +0100, Giulio Benetti spake thusly: > Binutils bug 27597 is not present anymore in Buildroot so let's remove it. > > Signed-off-by: Giulio Benetti > --- > toolchain/Config.in | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/toolchain/Config.in b/toolchain/Config.in > index 407a03c42e..9e6cff1950 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" > > comment "Toolchain Generic Options" > > -# https://sourceware.org/bugzilla/show_bug.cgi?id=27597 > -# Affect toolchains built with binutils 2.36.1, still not fixed. > -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 > - bool > - default y if BR2_nios2 As I suggested in the cover letter, and that I'll duplicate here so it is recorded with Patchwork, don't remove the symbol. Instead, just drop the default, and have the sourceery niosII toolchain select it. Regards, Yann E. MORIN. > # https://sourceware.org/bugzilla/show_bug.cgi?id=30730 > # Affect toolchains built with binutils 2.40, still not fixed. > config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 19:44:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 20:44:34 +0100 Subject: [Buildroot] [git commit] package/google-breakpad: fix tools option identation in menuconfig Message-ID: <20240218194940.8574A87847@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c6dc1fed354696a706fe5ecc93c4089b8bd64bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Move comment in Config.in to end of file so that BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS is properly idented. Signed-off-by: Nuno Gon??alves Signed-off-by: Yann E. MORIN --- package/google-breakpad/Config.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 0d21fd2e5c..5c7f4bb7ba 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -35,14 +35,6 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD https://chromium.googlesource.com/breakpad/breakpad -comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" - depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - if BR2_PACKAGE_GOOGLE_BREAKPAD config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS @@ -52,3 +44,11 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS minidump_stackwalk and microdump_stackwalk. endif + +comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" + depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 From yann.morin.1998 at free.fr Sun Feb 18 19:50:29 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 20:50:29 +0100 Subject: [Buildroot] [PATCH] package/google-breakpad: fix tools option identation in menuconfig In-Reply-To: <20240218193112.1048370-1-nunog@fr24.com> References: <20240218193112.1048370-1-nunog@fr24.com> Message-ID: Nuno, All, On 2024-02-18 19:30 +0000, Nuno Gon?alves via buildroot spake thusly: > Move comment in Config.in to end of file so that > BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS is properly idented. Ah yes, it was bothering me the other day, but I did not get to it... > Signed-off-by: Nuno Gon?alves Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/google-breakpad/Config.in | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in > index 0d21fd2e5c..5c7f4bb7ba 100644 > --- a/package/google-breakpad/Config.in > +++ b/package/google-breakpad/Config.in > @@ -35,14 +35,6 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD > > https://chromium.googlesource.com/breakpad/breakpad > > -comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" > - depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS > - depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS > - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > - !BR2_TOOLCHAIN_HAS_THREADS || \ > - !BR2_TOOLCHAIN_USES_GLIBC || \ > - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > - > if BR2_PACKAGE_GOOGLE_BREAKPAD > > config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS > @@ -52,3 +44,11 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS > minidump_stackwalk and microdump_stackwalk. > > endif > + > +comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" > + depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS > + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS > + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > + !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_USES_GLIBC || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > -- > 2.43.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 20:12:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 21:12:15 +0100 Subject: [Buildroot] [git commit] package/attr: fix build failure on Microblaze architecture Message-ID: <20240218201238.B8B5A87876@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b34b8ccfa5159d643ecbac12c42c638e3b27e5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master On Microblaze architecture __has_attribute(__symver__) support is broken and always return true even if symver is not supported so let's add an upstream patch to detect if symver is supported during autoreconf. Let's also add ATTR_AUTORECONF = YES to let patch to affect building. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- ....ac-add-detection-of-symver-gcc-attribute.patch | 75 ++++++++++++++++++++++ package/attr/attr.mk | 3 + 2 files changed, 78 insertions(+) diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch new file mode 100644 index 0000000000..ee029e9735 --- /dev/null +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch @@ -0,0 +1,75 @@ +From 365426c28f8bf73d34d77cc06b7d5ffeae17f13a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 15:33:15 +0100 +Subject: [PATCH] configure.ac: add detection of symver gcc attribute + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=943c776089dbb24ebbfb7432ba9841f1845bf95a + +Signed-off-by: Thomas Petazzoni +[Giulio: rework local patch for #if nesting] +Signed-off-by: Giulio Benetti +--- + configure.ac | 15 +++++++++++++++ + libattr/syscalls.c | 8 ++++---- + 2 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7e362e9..98477b5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,21 @@ AS_CASE([$host_os], + [linux*], [os_linux=yes]) + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) + ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, ++ gcc_cv_symver_attribute, ++ [cat > conftest.c </dev/null 2>&1; then \ ++ gcc_cv_symver_attribute=yes ++ fi ++ rm -f conftest.[cs] ++]) ++AS_IF([test $gcc_cv_symver_attribute = yes], ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) ++ + AC_CONFIG_COMMANDS([include/attr], + [dnl + rm -rf include/attr +diff --git a/libattr/syscalls.c b/libattr/syscalls.c +index 907560a..7ee6d39 100644 +--- a/libattr/syscalls.c ++++ b/libattr/syscalls.c +@@ -31,10 +31,10 @@ + * prefer symver attribute if available (since gcc 10), + * fall back to traditional .symver asm directive otherwise. + */ +-#ifdef __has_attribute +-# if __has_attribute(__symver__) +-# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) +-# elif __has_attribute(__no_reorder__) ++#if defined(HAVE_SYMVER_ATTRIBUTE) ++# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) ++#elif defined(__has_attribute) ++# if __has_attribute(__no_reorder__) + /* + * Avoid wrong partitioning with older gcc and LTO. May not work reliably + * with all versions; use -flto-partition=none if you encounter problems. +-- +2.34.1 + diff --git a/package/attr/attr.mk b/package/attr/attr.mk index d1397921ff..1d24144f46 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_CPE_ID_VALID = YES +# Flag added for patch dealing with symver in configure.ac +ATTR_AUTORECONF = YES + ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls From yann.morin.1998 at free.fr Sun Feb 18 20:12:56 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 21:12:56 +0100 Subject: [Buildroot] [PATCH v3] package/attr: fix build failure on Microblaze architecture In-Reply-To: <20240218082012.3425825-1-giulio.benetti@benettiengineering.com> References: <20240218082012.3425825-1-giulio.benetti@benettiengineering.com> Message-ID: giulio, all, On 2024-02-18 09:20 +0100, Giulio Benetti spake thusly: > On Microblaze architecture __has_attribute(__symver__) support is broken > and always return true even if symver is not supported so let's add an > upstream patch to detect if symver is supported during autoreconf. Let's > also add ATTR_AUTORECONF = YES to let patch to affect building. > > Fixes: > http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Yann E. MORIN. > --- > V1->V2: > * written commit log as suggested by Thomas(there was no commit log at all > since this patch has been pointed during Buildroot Dev Days in IRC to me) > * re-sent local patch to the correct maililng list and updated Upstream: > URL > V2->V3: > * since patch has been upstreamed after a little rework, use it and point > upstream commit URL > --- > ...dd-detection-of-symver-gcc-attribute.patch | 75 +++++++++++++++++++ > package/attr/attr.mk | 3 + > 2 files changed, 78 insertions(+) > create mode 100644 package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch > > diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch > new file mode 100644 > index 0000000000..ee029e9735 > --- /dev/null > +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch > @@ -0,0 +1,75 @@ > +From 365426c28f8bf73d34d77cc06b7d5ffeae17f13a Mon Sep 17 00:00:00 2001 > +From: Thomas Petazzoni > +Date: Tue, 6 Feb 2024 15:33:15 +0100 > +Subject: [PATCH] configure.ac: add detection of symver gcc attribute > + > +On non-ELF platforms, such as microblaze, builds will fail when trying > +to add symver information because __attribute__((symver ..)) is not > +supported even though __has_attribute(__symver__) returns true. > + > +Support for symver needs to be detected via a compile test since > +__has_attribute can report false positives [0]. > + > +Add a configure compile check for __attribute__((symver ..)) to ensure > +it is supported and define a variable to advertise support. > + > +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 > + > +Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=943c776089dbb24ebbfb7432ba9841f1845bf95a > + > +Signed-off-by: Thomas Petazzoni > +[Giulio: rework local patch for #if nesting] > +Signed-off-by: Giulio Benetti > +--- > + configure.ac | 15 +++++++++++++++ > + libattr/syscalls.c | 8 ++++---- > + 2 files changed, 19 insertions(+), 4 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 7e362e9..98477b5 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -57,6 +57,21 @@ AS_CASE([$host_os], > + [linux*], [os_linux=yes]) > + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) > + > ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, > ++ gcc_cv_symver_attribute, > ++ [cat > conftest.c < ++void foo (void) {} > ++__typeof(foo) foo __attribute__ ((__symver__("foo at foo"))); > ++EOF > ++ gcc_cv_symver_attribute=no > ++ if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then \ > ++ gcc_cv_symver_attribute=yes > ++ fi > ++ rm -f conftest.[cs] > ++]) > ++AS_IF([test $gcc_cv_symver_attribute = yes], > ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) > ++ > + AC_CONFIG_COMMANDS([include/attr], > + [dnl > + rm -rf include/attr > +diff --git a/libattr/syscalls.c b/libattr/syscalls.c > +index 907560a..7ee6d39 100644 > +--- a/libattr/syscalls.c > ++++ b/libattr/syscalls.c > +@@ -31,10 +31,10 @@ > + * prefer symver attribute if available (since gcc 10), > + * fall back to traditional .symver asm directive otherwise. > + */ > +-#ifdef __has_attribute > +-# if __has_attribute(__symver__) > +-# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) > +-# elif __has_attribute(__no_reorder__) > ++#if defined(HAVE_SYMVER_ATTRIBUTE) > ++# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) > ++#elif defined(__has_attribute) > ++# if __has_attribute(__no_reorder__) > + /* > + * Avoid wrong partitioning with older gcc and LTO. May not work reliably > + * with all versions; use -flto-partition=none if you encounter problems. > +-- > +2.34.1 > + > diff --git a/package/attr/attr.mk b/package/attr/attr.mk > index d1397921ff..1d24144f46 100644 > --- a/package/attr/attr.mk > +++ b/package/attr/attr.mk > @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) > ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL > ATTR_CPE_ID_VALID = YES > > +# Flag added for patch dealing with symver in configure.ac > +ATTR_AUTORECONF = YES > + > ATTR_INSTALL_STAGING = YES > > ATTR_CONF_OPTS = --disable-nls > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 21:03:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 22:03:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/google-breakpad: fix missing include error In-Reply-To: <20240218011653.790820-1-kadambini.nema@gmail.com> References: <20240218011653.790820-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-17 17:16 -0800, Kadambini Nema spake thusly: > src/common/module.cc: In member function ?bool google_breakpad::Module::AddFunction(Function*)?: > src/common/module.cc:194:52: error: ?find_if? is not a member of ?std?; did you mean ?find?? > 194 | FunctionSet::iterator existing_function = std::find_if( > | ^~~~~~~ > | find > Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed > > This error is seen on gcc-14. > > related links: > https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 > https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch > > Signed-off-by: Kadambini Nema > --- > ...ixed-missing-include-for-std-find_if.patch | 24 +++++++++++++++++++ > 1 file changed, 24 insertions(+) > create mode 100644 package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > > diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > new file mode 100644 > index 0000000000..80eab723b3 > --- /dev/null > +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > @@ -0,0 +1,24 @@ > +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 > +From: Nathan Moinvaziri > +Date: Tue, 19 Dec 2023 14:35:05 -0800 > +Subject: [PATCH] Fixed missing include for std::find_if. > + > +Throws an error when compiling on Windows. > + > +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 > +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 > +Reviewed-by: Ivan Penkov $ ./utils/docker-run make check-package package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch:0: missing Signed-off-by in the header (https://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches) package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) Although I could have fixed the Uptream tag issue, I can't add your SoB line. Could you please respin with: - your Signed-off-by: tag - the Upstream: tag, that points to the upstream commit, i.e.: https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d Regards, Yann E. MORIN. > +--- > + > +diff --git a/src/common/module.cc b/src/common/module.cc > +index 0eb5aad..b6f5da7 100644 > +--- a/src/common/module.cc > ++++ b/src/common/module.cc > +@@ -42,6 +42,7 @@ > + #include > + #include > + > ++#include > + #include > + #include > + #include > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 18 21:07:35 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 18 Feb 2024 22:07:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/tio: needs threads Message-ID: <20240218210735.50128-1-fontaine.fabrice@gmail.com> tio needs threads since version 2.4 and https://github.com/tio/tio/commit/93e6efc00153e625e4ceb8a51e01b324247d312a resulting in the following build failure since bump to version 2.7 in commit 4b33d7a47dd41fed5364a398320c2b7d0687ba5e: In file included from /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, from ../src/tty.c:23: /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] 218 | # warning requested reentrant code, but thread support was disabled | ^~~~~~~ ../src/tty.c:43:10: fatal error: pthread.h: No such file or directory 43 | #include | ^~~~~~~~~~~ Fixes: 4b33d7a47dd41fed5364a398320c2b7d0687ba5e - http://autobuild.buildroot.org/results/9b20ff06a0ad24b7e7f4750ebe64e2077e36164a Signed-off-by: Fabrice Fontaine --- package/tio/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/tio/Config.in b/package/tio/Config.in index a84daf8a24..e4241fa5e1 100644 --- a/package/tio/Config.in +++ b/package/tio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TIO bool "tio" depends on !BR2_sparc64 && !BR2_sparc + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_INIH help "tio" is a simple TTY terminal application which features a @@ -14,3 +15,7 @@ config BR2_PACKAGE_TIO # fix or workaround for now comment "tio is disabled for sparc and sparc64 architectures" depends on BR2_sparc64 || BR2_sparc + +comment "tio needs a toolchain w/ threads" + depends on !BR2_sparc64 && !BR2_sparc + depends on !BR2_TOOLCHAIN_HAS_THREADS -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 18 21:27:04 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 22:27:04 +0100 Subject: [Buildroot] [PATCH 1/1] package dhcpdump: bump to version 1.9 In-Reply-To: <20240218013353.798627-1-kadambini.nema@gmail.com> References: <20240218013353.798627-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-17 17:33 -0800, Kadambini Nema spake thusly: > - Change the site to a well maintained - https://github.com/bbonev/dhcpdump At least Fedora 39 is using that fork, so I guess it is OK to switch ot it. Maybe then we should also update the homepage in the Config.in? > - Fix some of the reported build failures - autobuild.buildroot.org/?reason=dhcpdump-1.8 The last build failiure was in 2022-06-18, almost two years ago now... Also, we need pointers to actual failures, like: http://autobuild.buildroot.org/results/a34/a347363cbc611080d2a0f7f4882802d15f587250/ > - Build test results > ./utils/test-pkg -d br_test -k -c dhcpdump.config -p dhcpdump > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: OK > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: OK > sourcery-arm [6/6]: OK > 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > Signed-off-by: Kadambini Nema > --- > ...Fix-build-with-gcc4.8-use-br-fortify.patch | 10 ++++++++ > .../0001-use-non-bsd-structures.patch | 23 ------------------- > package/dhcpdump/Config.in | 2 +- > package/dhcpdump/dhcpdump.hash | 2 +- > package/dhcpdump/dhcpdump.mk | 5 ++-- > 5 files changed, 15 insertions(+), 27 deletions(-) > create mode 100644 package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch > delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch > > diff --git a/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch > new file mode 100644 > index 0000000000..a5c1218c99 This new patch needs to be git-formatted, with an actual commit log, your SoB line, and an upstream status. If you got that from somewhere else, then we also need that to be recorded in the patch too. Regards, Yann E. MORIN. > --- /dev/null > +++ b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch > @@ -0,0 +1,10 @@ > +diff -Naur a/Makefile b/Makefile > +--- a/Makefile 2024-02-17 13:57:08.166161973 -0800 > ++++ b/Makefile 2024-02-17 13:57:45.055153969 -0800 > +@@ -1,5 +1,5 @@ > + CFLAGS+=${CPPFLAGS} > +-CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -g -O3 -fPIE > ++CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -g -O3 -fPIE > + LDFLAGS+=-g -Wl,-z,relro -Wl,-z,now -fPIE -pie > + LIBS+=-lpcap > + > diff --git a/package/dhcpdump/0001-use-non-bsd-structures.patch b/package/dhcpdump/0001-use-non-bsd-structures.patch > deleted file mode 100644 > index 40115fb640..0000000000 > --- a/package/dhcpdump/0001-use-non-bsd-structures.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -The udphdr structure has uh_* fields when _FAVOR_BSD is > -defined. Otherwise, the fields are just named source, dest, len and > -check. See . > - > -Signed-off-by: Thomas Petazzoni > - > -Index: dhcpdump-1.8/dhcpdump.c > -=================================================================== > ---- dhcpdump-1.8.orig/dhcpdump.c 2011-05-17 20:20:46.506980003 +0200 > -+++ dhcpdump-1.8/dhcpdump.c 2011-05-17 20:20:59.338979999 +0200 > -@@ -163,10 +163,10 @@ > - strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src)); > - strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst)); > - > -- if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen))) > -+ if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len))) > - return; > - > -- printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen)); > -+ printdata((u_char *)(sp + offset), ntohs(udp->len)); > - } > - > - // check for matching CHADDR (Peter Apian-Bennewitz ) > diff --git a/package/dhcpdump/Config.in b/package/dhcpdump/Config.in > index e0abe040fc..30e42928e4 100644 > --- a/package/dhcpdump/Config.in > +++ b/package/dhcpdump/Config.in > @@ -4,4 +4,4 @@ config BR2_PACKAGE_DHCPDUMP > help > A tool for monitoring dhcp requests using tcpdump. > > - http://www.mavetju.org/unix/general.php > + https://github.com/bbonev/dhcpdump > diff --git a/package/dhcpdump/dhcpdump.hash b/package/dhcpdump/dhcpdump.hash > index a24db5b275..fdf3243ad1 100644 > --- a/package/dhcpdump/dhcpdump.hash > +++ b/package/dhcpdump/dhcpdump.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz > +sha256 3658ac21cc33e79e72bed070454e49c543017991cb6c37f4253c85e9176869d1 dhcpdump-1.9.tar.xz > sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE > diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk > index ec9571c0af..4ce5047b2e 100644 > --- a/package/dhcpdump/dhcpdump.mk > +++ b/package/dhcpdump/dhcpdump.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -DHCPDUMP_VERSION = 1.8 > -DHCPDUMP_SITE = http://www.mavetju.org/download > +DHCPDUMP_VERSION = 1.9 > +DHCPDUMP_SITE = https://github.com/bbonev/dhcpdump/releases/download/v$(DHCPDUMP_VERSION) > +DHCPDUMP_SOURCE = dhcpdump-$(DHCPDUMP_VERSION).tar.xz > DHCPDUMP_DEPENDENCIES = libpcap > DHCPDUMP_LICENSE = BSD-2-Clause > DHCPDUMP_LICENSE_FILES = LICENSE > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 21:31:44 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 22:31:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/dos2unix: bump version to 7.5.2 In-Reply-To: <20240218061652.1048008-1-kadambini.nema@gmail.com> References: <20240218061652.1048008-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-17 22:16 -0800, Kadambini Nema spake thusly: > Changelog: https://waterlan.home.xs4all.nl/dos2unix/ChangeLog.txt > > $ ./utils/test-pkg -d br_test -k -c dos2unix.config -p dos2unix > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: OK > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: OK > sourcery-arm [6/6]: OK > 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Thanks for reporting the test you run, that's good thing. However, they do not belong to the commit log, but to a post-commit note, i.e. [0] > Signed-off-by: Kadambini Nema > --- [0] here, after the --- line. > package/dos2unix/dos2unix.hash | 6 +++--- > package/dos2unix/dos2unix.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash > index 032c8ea2d2..d4d682cd0c 100644 > --- a/package/dos2unix/dos2unix.hash > +++ b/package/dos2unix/dos2unix.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc > -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz > -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt > +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc > +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz > +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt We track the hash of the license files, because we want to know when the licensing terms change. So, a change in the hash of the license files must be explained in the commit log. Sometimes, it's just about achange in years; in such a case, the commit log would just need a note like: Copyright years updated in license file. Can you check that part, and respin, please? Regards, Yann E. MORIN. > diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk > index 6d1e70cf26..e30fc999d4 100644 > --- a/package/dos2unix/dos2unix.mk > +++ b/package/dos2unix/dos2unix.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DOS2UNIX_VERSION = 7.5.0 > +DOS2UNIX_VERSION = 7.5.2 > DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix > DOS2UNIX_LICENSE = BSD-2-Clause > DOS2UNIX_LICENSE_FILES = COPYING.txt > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 21:33:09 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 22:33:09 +0100 Subject: [Buildroot] [git commit] package/sysstat: bump version to 12.7.5 Message-ID: <20240218213412.EE00A878EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df5594644ff0fa2ed9128e2a9e9daefd305b795b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html ./utils/test-pkg -c sysstat.config -p sysstat bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema Signed-off-by: Yann E. MORIN --- package/sysstat/sysstat.hash | 6 +++--- package/sysstat/sysstat.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index b47f000e57..31821d9e3f 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ -# From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 a730982e0c2d4964a0022c1509f3ea0a345402bc sysstat-12.6.1.tar.xz +# From: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html +sha1 f329edff36f462385a7c20d2a136b667ab8db735 sysstat-12.7.5.tar.xz # Locally calculated -sha256 18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342 sysstat-12.6.1.tar.xz +sha256 57664040a549d33bb06a1121c7124d4cadd9b8b35f815856c194393047cd4d6b sysstat-12.7.5.tar.xz sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index f77a60b1da..cfa97834c3 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 12.6.1 +SYSSTAT_VERSION = 12.7.5 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr From yann.morin.1998 at free.fr Sun Feb 18 21:34:43 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 22:34:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/sysstat: bump version to 12.7.5 In-Reply-To: <20240218062707.1056854-1-kadambini.nema@gmail.com> References: <20240218062707.1056854-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-17 22:27 -0800, Kadambini Nema spake thusly: > Release notes: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html > > ./utils/test-pkg -c sysstat.config -p sysstat > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: SKIPPED > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: OK > sourcery-arm [6/6]: OK > 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > Signed-off-by: Kadambini Nema Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/sysstat/sysstat.hash | 6 +++--- > package/sysstat/sysstat.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash > index b47f000e57..31821d9e3f 100644 > --- a/package/sysstat/sysstat.hash > +++ b/package/sysstat/sysstat.hash > @@ -1,5 +1,5 @@ > -# From: http://sebastien.godard.pagesperso-orange.fr/download.html > -sha1 a730982e0c2d4964a0022c1509f3ea0a345402bc sysstat-12.6.1.tar.xz > +# From: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html > +sha1 f329edff36f462385a7c20d2a136b667ab8db735 sysstat-12.7.5.tar.xz > # Locally calculated > -sha256 18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342 sysstat-12.6.1.tar.xz > +sha256 57664040a549d33bb06a1121c7124d4cadd9b8b35f815856c194393047cd4d6b sysstat-12.7.5.tar.xz > sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING > diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk > index f77a60b1da..cfa97834c3 100644 > --- a/package/sysstat/sysstat.mk > +++ b/package/sysstat/sysstat.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SYSSTAT_VERSION = 12.6.1 > +SYSSTAT_VERSION = 12.7.5 > SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz > SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages > SYSSTAT_CONF_OPTS = --disable-file-attr > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 18 22:05:24 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 18 Feb 2024 23:05:24 +0100 Subject: [Buildroot] [PATCH 0/8] Patch and remove Nios2 binutils bug 27597 In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218230524.639348e6@windsurf> Hello, On Sun, 18 Feb 2024 19:45:28 +0100 Giulio Benetti wrote: > This patchset add backported patches for Buildroot Nios2 binutils bug 27597 and > drop packages dependency on it. Doing this the external toolchain will fail > building those packages, so I'm not that sure how to deal with this situation. > The same happened for OpenRisc and as far as I remember the first patch of the > series has been applied, then Bootlin toolchains have been patched and rebuilt/ > redeployed, in the end the remaining patches have been applied. But here we also > have Sourcery CodeBench Nios-II 2018.05 toolchain that contain the bug, so I > don't know how to deal with this situation to avoid build failures. First of all, thanks for following up on this, I'm really happy to see that we are not always *adding* more GCC/binutils bug options, but sometimes *removing* some of them. Regarding the CodeBench NIOSII toolchain from 2018.05, I think we could simply delete it. It makes sense to support old toolchains to some extent, but NIOSII is a very confidential architecture, and almost 6 years old toolchain is really ancient. So I would be entirely fine with dropping this toolchain. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From giulio.benetti at benettiengineering.com Sun Feb 18 22:28:34 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 23:28:34 +0100 Subject: [Buildroot] [PATCH 0/8] Patch and remove Nios2 binutils bug 27597 In-Reply-To: <20240218230524.639348e6@windsurf> References: <20240218230524.639348e6@windsurf> Message-ID: <43992C45-375D-4FF4-9EE4-F7FD15BB8DE1@benettiengineering.com> Hi Thomas, Yann, Vincent, All, > Il giorno 18 feb 2024, alle ore 23:05, Thomas Petazzoni ha scritto: > > ?Hello, > >> On Sun, 18 Feb 2024 19:45:28 +0100 >> Giulio Benetti wrote: >> >> This patchset add backported patches for Buildroot Nios2 binutils bug 27597 and >> drop packages dependency on it. Doing this the external toolchain will fail >> building those packages, so I'm not that sure how to deal with this situation. >> The same happened for OpenRisc and as far as I remember the first patch of the >> series has been applied, then Bootlin toolchains have been patched and rebuilt/ >> redeployed, in the end the remaining patches have been applied. But here we also >> have Sourcery CodeBench Nios-II 2018.05 toolchain that contain the bug, so I >> don't know how to deal with this situation to avoid build failures. > > First of all, thanks for following up on this, I'm really happy to see > that we are not always *adding* more GCC/binutils bug options, but > sometimes *removing* some of them. It would be great if some Microblaze or Sh4 bug could be patched too. There?s a patch proposed by Vincent for a Microblaze gcc ICE. Vincent, it would be great if you provide a patchset similar to this for gcc, or I can deal with it. > > Regarding the CodeBench NIOSII toolchain from 2018.05, I think we could > simply delete it. It makes sense to support old toolchains to some > extent, but NIOSII is a very confidential architecture, and almost 6 > years old toolchain is really ancient. So I would be entirely fine with > dropping this toolchain. It sounds good to me and it?s similat suggestion of Yann. One thing is left out to deal with, Bootlin toolchains that need to be patched/rebuilt/redeployed. So I can give a respin to this series adding another patch dropping Sourcery external toolchain and you can apply it only after updating Bootlin Nios2 toolchain(this should be sufficient since the bug shows up only on Nios2). That way Buildroot will be bug 27597 free. Thanks for commenting! Best regards Giulio > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From christian at aperture.us Sun Feb 18 23:23:48 2024 From: christian at aperture.us (Christian Stewart) Date: Sun, 18 Feb 2024 15:23:48 -0800 Subject: [Buildroot] [PATCH] package/sudo: drop legacy, useless, and broken post-configure hook In-Reply-To: <20240217172923.3629905-1-yann.morin.1998@free.fr> References: <20240217172923.3629905-1-yann.morin.1998@free.fr> Message-ID: LGTM On Sat, Feb 17, 2024 at 9:29?AM Yann E. MORIN wrote: > Reported-by: Christian Stewart > Signed-off-by: Yann E. MORIN > Cc: Peter Korsgaard > --- > package/sudo/sudo.mk | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk > index a4e838dd94..7961a99002 100644 > --- a/package/sudo/sudo.mk > +++ b/package/sudo/sudo.mk > @@ -58,15 +58,6 @@ else > SUDO_CONF_OPTS += --disable-openssl > endif > > -# mksigname/mksiglist needs to run on build host to generate source files > -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > - $(MAKE) $(HOST_CONFIGURE_OPTS) \ > - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ > - -C $(@D)/lib/util mksigname mksiglist > -endef > - > -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > - > define SUDO_PERMISSIONS > /usr/bin/sudo f 4755 0 0 - - - - - > endef > -- > 2.43.0 > Reviewed-by: Christian Stewart From vfazio at gmail.com Mon Feb 19 01:20:39 2024 From: vfazio at gmail.com (Vincent Fazio) Date: Sun, 18 Feb 2024 19:20:39 -0600 Subject: [Buildroot] [PATCH 0/8] Patch and remove Nios2 binutils bug 27597 In-Reply-To: <43992C45-375D-4FF4-9EE4-F7FD15BB8DE1@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <43992C45-375D-4FF4-9EE4-F7FD15BB8DE1@benettiengineering.com> Message-ID: All, On Sun, Feb 18, 2024 at 4:28?PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Thomas, Yann, Vincent, All, > > > Il giorno 18 feb 2024, alle ore 23:05, Thomas Petazzoni < > thomas.petazzoni at bootlin.com> ha scritto: > > > > ?Hello, > > > >> On Sun, 18 Feb 2024 19:45:28 +0100 > >> Giulio Benetti wrote: > >> > >> This patchset add backported patches for Buildroot Nios2 binutils bug > 27597 and > >> drop packages dependency on it. Doing this the external toolchain will > fail > >> building those packages, so I'm not that sure how to deal with this > situation. > >> The same happened for OpenRisc and as far as I remember the first patch > of the > >> series has been applied, then Bootlin toolchains have been patched and > rebuilt/ > >> redeployed, in the end the remaining patches have been applied. But > here we also > >> have Sourcery CodeBench Nios-II 2018.05 toolchain that contain the bug, > so I > >> don't know how to deal with this situation to avoid build failures. > > > > First of all, thanks for following up on this, I'm really happy to see > > that we are not always *adding* more GCC/binutils bug options, but > > sometimes *removing* some of them. > > It would be great if some Microblaze or Sh4 bug could be patched too. > There?s a patch proposed by Vincent for a Microblaze gcc ICE. > Vincent, it would be great if you provide a patchset similar to this for > gcc, or I can deal with it. > > I can certainly post the patch for BR. I've been a bit busy recently so haven't done so and I'm a bit concerned with push back when trying to upstream it, so don't know if it's worth submitting it without an upstream submission. > > > > Regarding the CodeBench NIOSII toolchain from 2018.05, I think we could > > simply delete it. It makes sense to support old toolchains to some > > extent, but NIOSII is a very confidential architecture, and almost 6 > > years old toolchain is really ancient. So I would be entirely fine with > > dropping this toolchain. > > It sounds good to me and it?s similat suggestion of Yann. > > Any patch for the MicroBlaze stuff (and other fixes) will have to slowly bleed into BR. As may have already been brought up, there are external toolchains that we do _not_ control which make it difficult to drop these types of flags. I don't want to get too far off topic, but some of the things I brought up in https://bugs.buildroot.org/show_bug.cgi?id=15943 seem at least quasi-related. Basically, it may behoove us to be very specific about what toolchains _must_ have in order to be supported by a specific version of BR, such as: * Minimum version of kernel headers * Minimum libc + other tool versions * Prequisite patches This would largely push consumers to vetted external toolchains such as the pre-created Bootlin toolchains that meet these requirements or to use BR generated toolchains. Otherwise, we'll be "supporting" a hodge-podge of toolchains with various mixtures of software indefinitely. One thing is left out to deal with, Bootlin toolchains that need to be > patched/rebuilt/redeployed. > > So I can give a respin to this series adding another patch dropping > Sourcery external toolchain and you can apply it only after updating > Bootlin Nios2 toolchain(this should be sufficient since the bug shows up > only on Nios2). > That way Buildroot will be bug 27597 free. > > Thanks for commenting! > > Best regards > Giulio > > > > > Best regards, > > > > Thomas > > -- > > Thomas Petazzoni, co-owner and CEO, Bootlin > > Embedded Linux and Kernel engineering and training > > https://bootlin.com > > -Vincent -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Mon Feb 19 05:47:49 2024 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 19 Feb 2024 08:47:49 +0300 Subject: [Buildroot] [PATCH 2/8] package/gdal: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-3-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> <20240218184536.1922309-3-giulio.benetti@benettiengineering.com> Message-ID: On 18.02.2024 21:45, Giulio Benetti wrote: > Now that binutils patch has been backported to every Buildroot binutils > version we can drop nios2 binutils bug 27597 dependency. > > Signed-off-by: Giulio Benetti > --- Reviewed-by: Maxim Kochetkov From fido_max at inbox.ru Mon Feb 19 05:48:15 2024 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 19 Feb 2024 08:48:15 +0300 Subject: [Buildroot] [PATCH 5/8] package/libgeos: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-6-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> <20240218184536.1922309-6-giulio.benetti@benettiengineering.com> Message-ID: <93af9a25-e8d6-46d8-b68c-86cc20b81608@inbox.ru> On 18.02.2024 21:45, Giulio Benetti wrote: > Now that binutils patch has been backported to every Buildroot binutils > version we can drop nios2 binutils bug 27597 dependency. > > Signed-off-by: Giulio Benetti > --- Reviewed-by: Maxim Kochetkov From fido_max at inbox.ru Mon Feb 19 05:48:44 2024 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 19 Feb 2024 08:48:44 +0300 Subject: [Buildroot] [PATCH 7/8] package/postgis: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-8-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> <20240218184536.1922309-8-giulio.benetti@benettiengineering.com> Message-ID: <25648b48-d657-4696-96c5-28c61c41b15b@inbox.ru> On 18.02.2024 21:45, Giulio Benetti wrote: > Now that binutils patch has been backported to every Buildroot binutils > version we can drop nios2 binutils bug 27597 dependency. > > Signed-off-by: Giulio Benetti > --- Reviewed-by: Maxim Kochetkov From romain.naour at smile.fr Mon Feb 19 09:30:15 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 10:30:15 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > high-security field-securable (HS-FS) silicon to optionally customize keys > and encryption for security applications. > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > which, however, was buggy. This series fixes the errors and bumps the Linux > kernel and U-Boot required for such a new device. > > This series, which in my humble opinion, should have been immediately > considered to correct the compilation errors in case of HS-FS devcies, has > seen an increase in patches in version 4 to remove the ti-k3-image-gen > package thanks to Binman. Additionally, it shares some modifications and > views on how to implement certain changes with the series > https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > Therefore, I think it is necessary not to run them in parallel but to decide > whether to merge one before the other or to consider a single series where > the patches can be coherent with each other. I am available for both solutions. > Let me know. Thanks for this new version. I beleive both series should be merged into one since we want to follow u-boot switch to binman, add more TI K3 SoC support and keeping exising am62x ans am64x working in GP or HS/HS-FS. My main concern is to avoid adding a new package for a tool that is already deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html Best regards, Romain > > Dario Binacchi (20): > configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > setting > configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > setting > configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > version > configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > version > boot/ti-k3-r5-loader: bump to version 2024.01 > boot/ti-k3-core-secdev: new package > boot/ti-k3-image-gen: manage HS hardware > package/python-jsonschema: add host variant > package/python-attrs: add host variant > package/python-referencing: add host variant > package/python-rpds-py: add host variant > package/python-jsonschema-specifications: add host variant > boot/ti-k3-r5-loader: set binman environment > boot/uboot: set BINMAN_INDIRS for TI K3 DM > configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 > boot: move ti-k3-* packages to 'ti-k3' directory > boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore > > DEVELOPERS | 1 + > board/ti/am62x-sk/genimage.cfg | 7 +- > board/ti/am62x-sk/post-build.sh | 49 ++++++++++++ > board/ti/am62x-sk/post-image.sh | 5 ++ > boot/Config.in | 4 +- > boot/ti-k3-image-gen/Config.in | 77 ------------------- > boot/ti-k3/Config.in | 59 ++++++++++++++ > boot/ti-k3/common.mk | 1 + > .../{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 > .../ti-k3-boot-firmware.hash | 0 > .../ti-k3-boot-firmware.mk | 0 > boot/ti-k3/ti-k3-core-secdev/Config.in | 9 +++ > .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 + > .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 ++++++ > boot/ti-k3/ti-k3-image-gen/Config.in | 25 ++++++ > .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 > .../ti-k3-image-gen/ti-k3-image-gen.mk | 20 ++++- > boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 4 +- > .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- > .../ti-k3-r5-loader/ti-k3-r5-loader.mk | 16 +++- > boot/uboot/Config.in | 7 +- > boot/uboot/uboot.mk | 3 +- > configs/ti_am62x_sk_defconfig | 23 +++--- > configs/ti_am64x_sk_defconfig | 8 +- > package/python-attrs/python-attrs.mk | 6 ++ > .../python-jsonschema-specifications.mk | 5 ++ > .../python-jsonschema/python-jsonschema.mk | 6 ++ > .../python-referencing/python-referencing.mk | 5 ++ > package/python-rpds-py/python-rpds-py.mk | 1 + > 29 files changed, 263 insertions(+), 105 deletions(-) > create mode 100755 board/ti/am62x-sk/post-build.sh > create mode 100755 board/ti/am62x-sk/post-image.sh > delete mode 100644 boot/ti-k3-image-gen/Config.in > create mode 100644 boot/ti-k3/Config.in > create mode 100644 boot/ti-k3/common.mk > rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) > create mode 100644 boot/ti-k3/ti-k3-core-secdev/Config.in > create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash > create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk > create mode 100644 boot/ti-k3/ti-k3-image-gen/Config.in > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (67%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (97%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (54%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (85%) > From romain.naour at smile.fr Mon Feb 19 09:36:56 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 10:36:56 +0100 Subject: [Buildroot] [PATCH v4 01/20] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240217160244.1320482-2-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-2-dario.binacchi@amarulasolutions.com> Message-ID: <6b3561ef-a245-4bb4-baa3-c41864aa8b61@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > Checking the output of the command `git grep PLATFORM | grep k3`, we can > found the proper settings for the optee-os package: > > .github/workflows/ci.yml: _make PLATFORM=k3-am62x > .github/workflows/ci.yml: _make PLATFORM=k3-am62x CFG_ARM64_core=y > ... > core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) Setting BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR doesn't seems necessary since optee-os Makefile can extract it from BR2_TARGET_OPTEE_OS_PLATFORM [1]. [1] https://git.yoctoproject.org/meta-ti/commit/?id=912983dd562ba5f009a4db34e8abe3810c8ed7ac Best regards, Romain > > Suggested-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > configs/ti_am62x_sk_defconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index f88252a89c68..fde6f8f5636a 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -21,7 +21,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y From romain.naour at smile.fr Mon Feb 19 09:48:59 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 10:48:59 +0100 Subject: [Buildroot] [PATCH v4 06/20] boot/ti-k3-core-secdev: new package In-Reply-To: <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> Message-ID: <5f007c47-0c4c-438b-8978-4fe6e2515db1@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > This is a security development package containing tools for > High-Security(HS) TI K3 platform devices. Note: this tool can also handle TI "legacy" platform such AM57xx or AM43xx (not sure we really want do that). Can you try without this package when using binman? This tool doesn't seems "future proof". http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html Best regards, Romain > > Signed-off-by: Dario Binacchi > > --- > > Changes in v4: > - Remove the trailing '/' at the end of the url in the help of > Config.in > - Fixed license issues > - Use $(BINARIES_DIR)/ti-k3-core-secdev as the directory where to > install files. > > Signed-off-by: Dario Binacchi > --- > DEVELOPERS | 1 + > boot/Config.in | 1 + > boot/ti-k3-core-secdev/Config.in | 9 ++++++++ > boot/ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 +++ > boot/ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 +++++++++++++++++++ > 5 files changed, 36 insertions(+) > create mode 100644 boot/ti-k3-core-secdev/Config.in > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 0d12c3abcb11..33d99ab2440f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -753,6 +753,7 @@ F: package/xinetd/ > N: Dario Binacchi > F: board/bsh/ > F: board/stmicroelectronics/stm32f769-disco/ > +F: boot/ti-k3-core-secdev/ > F: configs/imx8mn_bsh_smm_s2_defconfig > F: configs/imx8mn_bsh_smm_s2_pro_defconfig > F: configs/stm32f769_disco_sd_defconfig > diff --git a/boot/Config.in b/boot/Config.in > index e5fdf7ad439e..18a7d268f95a 100644 > --- a/boot/Config.in > +++ b/boot/Config.in > @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" > source "boot/shim/Config.in" > source "boot/syslinux/Config.in" > source "boot/ti-k3-boot-firmware/Config.in" > +source "boot/ti-k3-core-secdev/Config.in" > source "boot/ti-k3-image-gen/Config.in" > source "boot/ti-k3-r5-loader/Config.in" > source "boot/uboot/Config.in" > diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in > new file mode 100644 > index 000000000000..f7b4e2962042 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/Config.in > @@ -0,0 +1,9 @@ > +config BR2_TARGET_TI_K3_CORE_SECDEV > + bool "ti-k3-core-secdev" > + depends on BR2_aarch64 > + help > + This package downloads and installs development tools for > + High-Security(HS) TI K3 platforms (which include AM62x, > + AM64x, AM65x and more). > + > + https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > new file mode 100644 > index 000000000000..e3074a398d62 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06 core-secdev-k3-08.06.00.007.tar.xz > +sha256 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369 manifest/k3-secdev-0.2-manifest.html > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > new file mode 100644 > index 000000000000..f7655a0fefc8 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# ti-k3-core-secdev > +# > +################################################################################ > + > +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 > +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot > +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz > +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES > +TI_K3_CORE_SECDEV_LICENSE = BSD-3-Clause > +TI_K3_CORE_SECDEV_LICENSE_FILES = manifest/k3-secdev-0.2-manifest.html > + > +TI_K3_CORE_SECDEV_INSTALL_DIR = $(BINARIES_DIR)/ti-k3-core-secdev > + > +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS > + mkdir -p $(TI_K3_CORE_SECDEV_INSTALL_DIR) > + cp -dpfr $(@D)/keys $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > + cp -dpfr $(@D)/scripts $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > +endef > + > +$(eval $(generic-package)) From anaumann at ultratronik.de Mon Feb 19 09:51:53 2024 From: anaumann at ultratronik.de (Andreas Naumann) Date: Mon, 19 Feb 2024 10:51:53 +0100 Subject: [Buildroot] [PATCH 0/2] Fix flutter build failure Message-ID: <20240219095155.2758428-1-anaumann@ultratronik.de> Hello Adam, all, I was motivated to give flutter a spin after your talk at FOSDEM, however the recent bump to Python 3.12.1 broke some script during the flutter-engine configure step. Fortunately now a new major stable version has been released 3.19.0, which contains a patch for this. After bumping engine and sdk they successfully build again, as does creating the flutter bundles which you provided in https://github.com/aduskett/buildroot-fosdem2024-flutter-demos I have not yet been able to run them using ivi-homescreen, but that's probably due to my target display/wayland setup. However, the flutter-gallery no longer builds with 3.19, even after bumping to the main HEAD. Their github README says "NOTE: The Flutter Gallery is now deprecated, and no longer being active maintained." I thought about including a patch for removal of the gallery package, but that would leave us with no example for how to create a flutter bundle. regards, Andreas Andreas Naumann (2): package/flutter-engine: bump to version 3.19.0 package/flutter-sdk-bin: bump to version 3.19.0 package/flutter-engine/flutter-engine.mk | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.34.1 From anaumann at ultratronik.de Mon Feb 19 09:51:54 2024 From: anaumann at ultratronik.de (Andreas Naumann) Date: Mon, 19 Feb 2024 10:51:54 +0100 Subject: [Buildroot] [PATCH 1/2] package/flutter-engine: bump to version 3.19.0 In-Reply-To: <20240219095155.2758428-1-anaumann@ultratronik.de> References: <20240219095155.2758428-1-anaumann@ultratronik.de> Message-ID: <20240219095155.2758428-2-anaumann@ultratronik.de> This also fixes an error during configure due to 3.16.8 not being compatible to Python 3.12 (which we lately bumped to) Signed-off-by: Andreas Naumann --- package/flutter-engine/flutter-engine.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index d08274f546..0d719e29eb 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -21,7 +21,7 @@ # # There is no hash provided, as the gn binary (used for configuration) relies # on the .git directories. As such, a reproducible tarball is not possible. -FLUTTER_ENGINE_VERSION = 3.16.8 +FLUTTER_ENGINE_VERSION = 3.19.0 # There is nothing for Buildroot to download. This is handled by gclient. FLUTTER_ENGINE_SITE = -- 2.34.1 From anaumann at ultratronik.de Mon Feb 19 09:51:55 2024 From: anaumann at ultratronik.de (Andreas Naumann) Date: Mon, 19 Feb 2024 10:51:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/flutter-sdk-bin: bump to version 3.19.0 In-Reply-To: <20240219095155.2758428-1-anaumann@ultratronik.de> References: <20240219095155.2758428-1-anaumann@ultratronik.de> Message-ID: <20240219095155.2758428-3-anaumann@ultratronik.de> Signed-off-by: Andreas Naumann --- package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash index 48c9c7d7e3..9200972eb9 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7cb12032cf615a92a7bc9042100f3f2af62df7df3ca3bee27f4b153fe218b239 flutter_linux_3.16.8-stable.tar.xz +sha256 4cc1706fbd6e2a5c0ee34a6f8de875aae20904c9f47e18c88d2fcb25d9ea1a79 flutter_linux_3.19.0-stable.tar.xz sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index 0d9a44596d..7215b45460 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_SDK_BIN_VERSION = 3.16.8 +FLUTTER_SDK_BIN_VERSION = 3.19.0 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause -- 2.34.1 From romain.naour at smile.fr Mon Feb 19 09:58:26 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 10:58:26 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> Message-ID: <8dca9e04-832f-4ffc-b6b0-d1deed31259b@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > The patch sets the configurations required by TI HS systems. Some of these > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > are provided by the ti-k3-core-secdev package in the binaries directory. Such keys has been added to u-boot v2023.10: https://git.ti.com/cgit/security-development-tools/core-secdev-k3/tree/keys https://source.denx.de/u-boot/u-boot/-/commit/d5b1ef30d7ffabb9f57d5c62b9f0608837af0f4f Do we need something else from ti-k3-core-secdev package that is not already provided by u-boot? Best regards, Romain > > Signed-off-by: Dario Binacchi > > --- > > no changes since v3: > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3-image-gen/Config.in | 1 + > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > index d76cef82e911..38d1598d9fc0 100644 > --- a/boot/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3-image-gen/Config.in > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > bool "ti-k3-image-gen" > depends on BR2_TARGET_TI_K3_R5_LOADER > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > # We need FIT support in uboot-tools, which is why we select a > # host package > select BR2_PACKAGE_HOST_UBOOT_TOOLS > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > index 64be9a18f2c4..74b4fcb4bf89 100644 > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +else > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > + > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > +endif > > define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > + ) > endef > > define TI_K3_IMAGE_GEN_BUILD_CMDS > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > $(BR2_MAKE) -C $(@D) \ > SOC=$(TI_K3_IMAGE_GEN_SOC) \ > SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ > CONFIG=evm \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ From romain.naour at smile.fr Mon Feb 19 10:03:35 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:03:35 +0100 Subject: [Buildroot] [PATCH v4 08/20] package/python-jsonschema: add host variant In-Reply-To: <20240217160244.1320482-9-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-9-dario.binacchi@amarulasolutions.com> Message-ID: <7bbbe31b-210f-49c4-8344-05f2f09b18de@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. This package is required by binman. I did some improvement about host-python package you need for binam. Indeed, host-python-jsonschema has some runtime dependencies, but we don't have the concept of runtime dependencies for host packages. Due to thoses runtime dependencies you can't add python-jsonschema host variant before adding host-python-attrs, host-python-jsonschema-specifications, host-python-referencing and host-python-rpds-py. Best regards, Romain > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi > > --- > > no changes since v3 > > Changes in v3: > - Drop Config.in.host > > Signed-off-by: Dario Binacchi > --- > package/python-jsonschema/python-jsonschema.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk > index 512c92aa7752..85fef7ad22ac 100644 > --- a/package/python-jsonschema/python-jsonschema.mk > +++ b/package/python-jsonschema/python-jsonschema.mk > @@ -15,4 +15,10 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ > host-python-hatch-fancy-pypi-readme \ > host-python-hatch-vcs > > +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ > + host-python-hatchling \ > + host-python-hatch-fancy-pypi-readme \ > + host-python-hatch-vcs > + > $(eval $(python-package)) > +$(eval $(host-python-package)) From romain.naour at smile.fr Mon Feb 19 10:15:30 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:15:30 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > The patch set the BINMAN_INDIRS environment variable to provide the > directory to search for binary blobs and select the packages required by > binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi > > --- > > Changes in v4: > - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > Changes in v2: > - Change commit message > - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > - Select packages required by binman if > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0ffcb8235f2e..2a10024aedaa 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ > host-pkgconf \ > $(BR2_MAKE_HOST_DEPENDENCY) \ > host-arm-gnu-toolchain \ > - host-openssl > + host-openssl \ > + host-python-attrs \ > + host-python-jsonschema \ > + host-python-jsonschema-specifications \ > + host-python-pyyaml \ > + host-python-referencing \ > + host-python-rpds-py Most of theses new dependencies are not ti-k3-r5-loader dependencies but host-python-jsonschema runtime dependencies. Note: host-python-jsonschema depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS due to its runtime dependency on host-python-rpds-py. > > TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ > $(BR2_BISON_HOST_DEPENDENCY) \ > $(BR2_FLEX_HOST_DEPENDENCY) > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) It's a u-boot package config option. just add host-python-pylibfdt the dependency. > +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt > +endif > + > ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) > TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig > else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) > @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ARCH=arm \ > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > + BINMAN_INDIRS=$(BINARIES_DIR) \ I suggested to add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN but indeed we should use binman unconditionally for ti-k3-r5-loader package. http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ Best regards, Romain > HOSTLDFLAGS="$(HOST_LDFLAGS)" > > define TI_K3_R5_LOADER_BUILD_CMDS From romain.naour at smile.fr Mon Feb 19 10:19:50 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:19:50 +0100 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> Message-ID: <345794c9-c917-4157-b614-67501e9597ab@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > As explained in [1], adding support for AM62x LP SK in U-Boot, requires > binman for building bootloader images. The BINMAN_INDIRS environment > variable is used to provide a space-separated list of directories to > search for binary blobs. Binman is not a tool specific to TI K3 SoC and may be used by any other SoC vendor. I believe we should add a new u-boot option for it (BR2_TARGET_UBOOT_USE_BINMAN) and not depend on BR2_TARGET_UBOOT_NEEDS_TI_K3_DM being enabled. http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-10-romain.naour at smile.fr/ > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > Signed-off-by: Dario Binacchi > > --- > > no changes since v1: > > Signed-off-by: Dario Binacchi > --- > boot/uboot/uboot.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dda606a88059..cf70f86a4132 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -189,7 +189,8 @@ endif > ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > UBOOT_DEPENDENCIES += ti-k3-boot-firmware > -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ > + BINMAN_INDIRS=$(BINARIES_DIR) > endif Binman dependencies are missing. Best regards, Romain > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) From romain.naour at smile.fr Mon Feb 19 10:28:59 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:28:59 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> Message-ID: <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > Recent versions of U-Boot can use Binman to compile and sign the generated > binaries, thus making the use of custom tools like ti-k3-image-gen no > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > configured and used outside of it. This patch allows setting such options > even if the package is not enabled. I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. Best regards, Romain > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3/Config.in | 46 ++++++++++++++ > boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > boot/uboot/Config.in | 7 +-- > configs/ti_am62x_sk_defconfig | 2 +- > configs/ti_am64x_sk_defconfig | 2 +- > 6 files changed, 59 insertions(+), 67 deletions(-) > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > index 06dda2f156a9..9e508326c9c8 100644 > --- a/boot/ti-k3/Config.in > +++ b/boot/ti-k3/Config.in > @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > > if BR2_TARGET_TI_K3 > > +choice > + prompt "SoC family" > + > +config BR2_TARGET_TI_K3_SOC_AM62AX > + bool "am62ax" > + > +config BR2_TARGET_TI_K3_SOC_AM62X > + bool "am62x" > + > +config BR2_TARGET_TI_K3_SOC_AM64X > + bool "am64x" > + > +config BR2_TARGET_TI_K3_SOC_AM65X > + bool "am65x" > + > +endchoice > + > +choice > + prompt "Security type" > + help > + The target SoC security type option. > + > +config BR2_TARGET_TI_K3_SECTYPE_GP > + bool "gp" > + > +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > + bool "hs-fs" > + > +config BR2_TARGET_TI_K3_SECTYPE_HS > + bool "hs" > + > +endchoice > + > +config BR2_TARGET_TI_K3_SOC > + string > + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > + > +config BR2_TARGET_TI_K3_SECTYPE > + string > + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > + > source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > source "boot/ti-k3/ti-k3-core-secdev/Config.in" > source "boot/ti-k3/ti-k3-image-gen/Config.in" > diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > index 38d1598d9fc0..2d53d62dd4ee 100644 > --- a/boot/ti-k3/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > bool "ti-k3-image-gen" > depends on BR2_TARGET_TI_K3_R5_LOADER > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > # We need FIT support in uboot-tools, which is why we select a > # host package > select BR2_PACKAGE_HOST_UBOOT_TOOLS > @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > if BR2_TARGET_TI_K3_IMAGE_GEN > -choice > - prompt "SoC family" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - bool "am62ax" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - bool "am62x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - bool "am64x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - bool "am65x" > - > -endchoice > - > -choice > - prompt "Security type" > - help > - The target SoC security type option for image gen. Valid > - options are "gp" for General Purpose devices, "hs-fs" for > - High Security - Field Securable devices, or "hs" for High > - Security - Security Enforcing devices. Note for all High > - Security device variants the TI_SECURE_DEV_PKG environmental > - variable must be defined at build time pointing to a valid > - core-secdev-k3 folder location, otherwise the build will > - fail, see > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - bool "gp" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - bool "hs-fs" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > - bool "hs" > - > -endchoice > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > - string > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > string > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > - string > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > > endif > diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > index 74b4fcb4bf89..834d8f7d5cd5 100644 > --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > $(BR2_MAKE_HOST_DEPENDENCY) > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > TI_K3_IMAGE_GEN_SYSFW = \ > $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > else > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index beafb38930db..1a9d21e7c6d1 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > bool "U-Boot needs TI K3 Device Manager (DM)" > # We use the SoC selection defined for the ti-k3-image-gen > # package > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > help > Some TI K3 devices need the Device Manager (DM) firmware to > be available for the U-Boot build. > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > string > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > > endif > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index cd26235342e4..cfefce0a77a4 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > BR2_TARGET_TI_K3=y > +BR2_TARGET_TI_K3_SOC_AM62X=y > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 1befeb4ab96c..daf78dbffff8 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > BR2_TARGET_TI_K3=y > +BR2_TARGET_TI_K3_SOC_AM64X=y > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" From romain.naour at smile.fr Mon Feb 19 10:31:18 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:31:18 +0100 Subject: [Buildroot] [PATCH v4 20/20] configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore In-Reply-To: <20240217160244.1320482-21-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-21-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. So it's no longer necessary to use custom tools like > ti-k3-image-gen. > > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > configs/ti_am62x_sk_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index cfefce0a77a4..6259dec5985d 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -25,7 +25,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > BR2_TARGET_TI_K3=y > BR2_TARGET_TI_K3_SOC_AM62X=y > -BR2_TARGET_TI_K3_IMAGE_GEN=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" The am64x defconfig should do the same, then the ti-k3-boot-firmware can be removed. Best regards, Romain From romain.naour at smile.fr Mon Feb 19 10:35:44 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:35:44 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <4a8d7f2252b46118554a9e22c49901822e461f2f.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <4a8d7f2252b46118554a9e22c49901822e461f2f.camel@gmail.com> Message-ID: Hello Alexander, Le 17/02/2024 ? 18:40, Alexander Sverdlin a ?crit?: > Hi Dario! > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: >> This series, which in my humble opinion, should have been immediately >> considered to correct the compilation errors in case of HS-FS devcies, has >> seen an increase in patches in version 4 to remove the ti-k3-image-gen > > I wasn't aware of the preceeding versions, but... > >> package thanks to Binman. Additionally, it shares some modifications and >> views on how to implement certain changes with the series >> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. >> Therefore, I think it is necessary not to run them in parallel but to decide >> whether to merge one before the other or to consider a single series where >> the patches can be coherent with each other. I am available for both solutions. >> Let me know. > > ... as the broken HS-FS went unnoticed, seems there is no rush to fix the > build now? I'd vote for a combined series, because yours and Romains do > overlap here and there, but I personally would pick different parts from > different series. I'd not introduce secdev package unless absolutely > necessary, and I actually build HS-FS images with yocto with custom keys > and using upstream U-Boot binman alone, so maybe I miss something, but > I don't see the package as required. > > From my side I can offer testing on SK-AM62x variants, both GP and HS-FS. > I will definitely test your v4 because in contrast to Romain's U-Boot > v2024.01 bump yours may actually boot... > Can you merge Dario changes (extlinux.conf and post-build.sh) and try again? Best regards, Romain From romain.naour at smile.fr Mon Feb 19 10:40:12 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:40:12 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Message-ID: <9f0b5e0e-b766-4995-a7de-32ea7d5a66bf@smile.fr> Hello Alexander, Le 17/02/2024 ? 21:38, Alexander Sverdlin a ?crit?: > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: >> Recent version of U-Boot use binman to provide a mechanism for building >> images, from simple SPL + U-Boot combinations, to more complex >> arrangements with many parts. >> >> The patch set the BINMAN_INDIRS environment variable to provide the >> directory to search for binary blobs and select the packages required by >> binman. >> >> Co-developed-by: Michael Trimarchi >> Signed-off-by: Michael Trimarchi >> Signed-off-by: Dario Binacchi > > I personally do not see why binman usage should be configurable as in > https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ > your patch looks simpler, Agree, the binman must be mandatory for ti-k3-r5-loader package. The intend was to take care of the existing am64x am62x defconfig that was working without binman. As soon as all TI K3 defconfig switched to binman, this option can be removed. Best regards, Romain > > Reviewed-by: Alexander Sverdlin > >> --- >> >> Changes in v4: >> - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >> >> Changes in v2: >> - Change commit message >> - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >> - Select packages required by binman if >> ? BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled >> >> Signed-off-by: Dario Binacchi >> --- >> ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- >> ?1 file changed, 12 insertions(+), 1 deletion(-) >> >> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >> index 0ffcb8235f2e..2a10024aedaa 100644 >> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >> @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ >> ? host-pkgconf \ >> ? $(BR2_MAKE_HOST_DEPENDENCY) \ >> ? host-arm-gnu-toolchain \ >> - host-openssl >> + host-openssl \ >> + host-python-attrs \ >> + host-python-jsonschema \ >> + host-python-jsonschema-specifications \ >> + host-python-pyyaml \ >> + host-python-referencing \ >> + host-python-rpds-py >> ? >> ?TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) >> ?TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) >> @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ >> ? $(BR2_BISON_HOST_DEPENDENCY) \ >> ? $(BR2_FLEX_HOST_DEPENDENCY) >> ? >> +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) >> +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt >> +endif >> + >> ?ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) >> ?TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig >> ?else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) >> @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ >> ? CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ >> ? ARCH=arm \ >> ? HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ >> + BINMAN_INDIRS=$(BINARIES_DIR) \ >> ? HOSTLDFLAGS="$(HOST_LDFLAGS)" >> ? >> ?define TI_K3_R5_LOADER_BUILD_CMDS > From romain.naour at smile.fr Mon Feb 19 10:42:40 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:42:40 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> Message-ID: <829fe158-b695-41d1-8261-6d20d39f7381@smile.fr> Hello Alexander, Le 18/02/2024 ? 00:45, Alexander Sverdlin a ?crit?: > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: >> The patch sets the configurations required by TI HS systems. Some of these >> configurations (i. e. HS SYSFW image signing key, HS Software Revision) >> are provided by the ti-k3-core-secdev package in the binaries directory. >> >> Signed-off-by: Dario Binacchi > > so for test I've reverted the previous "boot/ti-k3-core-secdev: new package" > commit, then... Thanks for testing! To be sure, I would recommend to do a build from scratch before testing. Best regards, Romain > >> --- >> >> no changes since v3: >> >> Signed-off-by: Dario Binacchi >> --- >> ?boot/ti-k3-image-gen/Config.in????????? |? 1 + >> ?boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- >> ?2 files changed, 15 insertions(+), 2 deletions(-) >> >> diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in >> index d76cef82e911..38d1598d9fc0 100644 >> --- a/boot/ti-k3-image-gen/Config.in >> +++ b/boot/ti-k3-image-gen/Config.in >> @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >> ? bool "ti-k3-image-gen" >> ? depends on BR2_TARGET_TI_K3_R5_LOADER >> ? select BR2_TARGET_TI_K3_BOOT_FIRMWARE >> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > ... removed this, ... > >> ? # We need FIT support in uboot-tools, which is why we select a >> ? # host package >> ? select BR2_PACKAGE_HOST_UBOOT_TOOLS >> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> index 64be9a18f2c4..74b4fcb4bf89 100644 >> --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) >> ?TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) >> ?TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) >> ? >> -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >> +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) >> +TI_K3_IMAGE_GEN_SYSFW = \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >> +else >> +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > > ... the above line, ... > >> + >> +TI_K3_IMAGE_GEN_SYSFW = \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin >> +endif >> ? >> ?define TI_K3_IMAGE_GEN_CONFIGURE_CMDS >> - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) >> + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ >> + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ >> + ) >> ?endef >> ? >> ?define TI_K3_IMAGE_GEN_BUILD_CMDS >> @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS >> ? $(BR2_MAKE) -C $(@D) \ >> ? SOC=$(TI_K3_IMAGE_GEN_SOC) \ >> ? SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ >> + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ > > ... and this line... > >> ? CONFIG=evm \ >> ? CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ >> ? SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > > ... and everything still builds and boots fine on SK-AM62B (HS-FS): > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:02:43 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 13400 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Starting ATF on ARM64 core... > > NOTICE: BL31: v2.7(release):v2.7 > NOTICE: BL31: Built : 23:57:43, Feb 17 2024 > I/TC: > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1199-g470b2069e4)) #1 Sat Feb 17 22:57:38 UTC 2024 aarch64 > I/TC: WARNING: This OP-TEE configuration might be insecure! > I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html > I/TC: Primary CPU initializing > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > I/TC: HUK Initialized > I/TC: Activated SA2UL device > I/TC: Enabled firewalls for SA2UL TRNG device > I/TC: SA2UL TRNG initialized > I/TC: SA2UL Drivers initialized > I/TC: Primary CPU switching to normal world boot > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:03:30 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 1872 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > > > U-Boot 2024.01 (Feb 18 2024 - 00:03:30 +0100) > > SoC: AM62X SR1.0 HS-FS > Model: Texas Instruments AM625 SK > DRAM: 2 GiB > Core: 56 devices, 23 uclasses, devicetree: separate > MMC: mmc at fa10000: 0, mmc at fa00000: 1 > Loading Environment from nowhere... OK > In: serial at 2800000 > Out: serial at 2800000 > Err: serial at 2800000 > Net: eth0: ethernet at 8000000port@1 > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc1 is current device > SD/MMC found on device 1 > Failed to load 'uEnv.txt' > Scanning for bootflows in all bootdevs > Seq Method State Uclass Part Name Filename > --- ----------- ------ -------- ---- ------------------------ ---------------- > Scanning global bootmeth 'efi_mgr': > No EFI system partition > No EFI system partition > Failed to persist EFI variables > Scanning bootdev 'mmc at fa00000.bootdev': > 0 extlinux ready mmc 1 mmc at fa00000.bootdev.part_ /extlinux/extlinux.conf > ** Booting bootflow 'mmc at fa00000.bootdev.part_1' with extlinux > 1: am62x-sk-buildroot > Retrieving file: /Image > append: console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 > Retrieving file: /k3-am62x.dtb > ## Flattened Device Tree blob at ffb14700 > Booting using the fdt blob at 0xffb14700 > Working FDT set to ffb14700 > Loading Device Tree to 000000008ffed000, end 000000008ffff687 ... OK > Working FDT set to 8ffed000 > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] > [ 0.000000] Linux version 6.6.1 (...) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1199-g470b2069e4) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Sun Feb 18 > 00:37:47 CET 2024 > > > From alexander.sverdlin at gmail.com Mon Feb 19 10:47:05 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Mon, 19 Feb 2024 11:47:05 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <829fe158-b695-41d1-8261-6d20d39f7381@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> <829fe158-b695-41d1-8261-6d20d39f7381@smile.fr> Message-ID: <893883be1cb49fda2c733465135b6f80f61e4f22.camel@gmail.com> Hi Romain, On Mon, 2024-02-19 at 11:42 +0100, Romain Naour wrote: > > > The patch sets the configurations required by TI HS systems. Some of these > > > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > > > are provided by the ti-k3-core-secdev package in the binaries directory. > > > > > > Signed-off-by: Dario Binacchi > > > > so for test I've reverted the previous "boot/ti-k3-core-secdev: new package" > > commit, then... > > Thanks for testing! > To be sure, I would recommend to do a build from scratch before testing. indeed it was a clean build. -- Alexander Sverdlin. From romain.naour at smile.fr Mon Feb 19 10:47:23 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:47:23 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> Message-ID: <89254b90-c849-4be3-b77b-f076b0439b4d@smile.fr> Hello Dario, Le 18/02/2024 ? 14:38, Dario Binacchi a ?crit?: > Hi Alexander, > > On Sat, Feb 17, 2024 at 6:28?PM Alexander Sverdlin > wrote: >> >> Hi Dario, >> >> On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: >>> Recent versions of U-Boot are capable of building tiboot3.bin using >>> Binman. In this case, let's copy it to the binaries directory. >>> >>> Signed-off-by: Dario Binacchi >> >> https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-12-romain.naour at smile.fr/ >> >> looks more complete with sysfw.itb? > > In my use case, there was no need as it was necessary to enable > ti-k3-boot-firmware: > > define TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES_CMDS > cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ > cp -dpfr $(@D)/ti-dm $(BINARIES_DIR)/ > endef > > I also wonder whether it is necessary to remove the > cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ > to avoid conflicts. > > Alternatively, as happened with ti-k3-hen-image, one day we may no > longer need ti-k3-boot-firmware, > and therefore we could add a copy of sysfw.itb from ti-k3-r5-loader. I > am awaiting suggestions. > However, my patch does not require modifying the genimage.cfg file. In > any case, I would try to ensure > this also for sysfw.itb. sysfw.itb is build by ti-k3-r5-loader and it's not provided by ti-k3-boot-firmware. This file depends on the TI K3 "Split binary" boot flow [1]: - Split binary with a combined firmware: (eg: AM65) - Combined binary with a combined firmware: (eg: AM64) - Split binary with a split firmware: (eg: J721E) - Combined binary with a split firmware: (eg: AM62) [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst Best regards, Romain > > Thanks and regards, > Dario > >> >>> --- >>> >>> Added in v4 >>> >>> Signed-off-by: Dario Binacchi >>> --- >>> boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ >>> 1 file changed, 3 insertions(+) >>> >>> diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> index 2a10024aedaa..643298a1e70a 100644 >>> --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS >>> $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) >>> endef >>> >>> +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) >>> + >>> define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS >>> cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin >>> + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; >>> endef >>> >>> $(eval $(kconfig-package)) >> >> -- >> Alexander Sverdlin. >> > > From michael at amarulasolutions.com Mon Feb 19 11:02:54 2024 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Mon, 19 Feb 2024 12:02:54 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> Message-ID: Hi Romain On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: > > Hello Dario, > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > > high-security field-securable (HS-FS) silicon to optionally customize keys > > and encryption for security applications. > > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > > which, however, was buggy. This series fixes the errors and bumps the Linux > > kernel and U-Boot required for such a new device. > > > > This series, which in my humble opinion, should have been immediately > > considered to correct the compilation errors in case of HS-FS devcies, has > > seen an increase in patches in version 4 to remove the ti-k3-image-gen > > package thanks to Binman. Additionally, it shares some modifications and > > views on how to implement certain changes with the series > > https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > > Therefore, I think it is necessary not to run them in parallel but to decide > > whether to merge one before the other or to consider a single series where > > the patches can be coherent with each other. I am available for both solutions. > > Let me know. > > Thanks for this new version. I beleive both series should be merged into one > since we want to follow u-boot switch to binman, add more TI K3 SoC support and > keeping exising am62x ans am64x working in GP or HS/HS-FS. > Because the Dario patchset was sent before (end of November), it's reasonable to review and adjust that one and apply your changes for ti_j721e_sk on top of it. It think that is a standard way to make people happy about their work and contribution. Michael > My main concern is to avoid adding a new package for a tool that is already > deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. > > Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". > > [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html > > Best regards, > Romain > > > > > Dario Binacchi (20): > > configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > setting > > configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > setting > > configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > > version > > configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > > version > > boot/ti-k3-r5-loader: bump to version 2024.01 > > boot/ti-k3-core-secdev: new package > > boot/ti-k3-image-gen: manage HS hardware > > package/python-jsonschema: add host variant > > package/python-attrs: add host variant > > package/python-referencing: add host variant > > package/python-rpds-py: add host variant > > package/python-jsonschema-specifications: add host variant > > boot/ti-k3-r5-loader: set binman environment > > boot/uboot: set BINMAN_INDIRS for TI K3 DM > > configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > > configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 > > boot: move ti-k3-* packages to 'ti-k3' directory > > boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > > boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > > configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore > > > > DEVELOPERS | 1 + > > board/ti/am62x-sk/genimage.cfg | 7 +- > > board/ti/am62x-sk/post-build.sh | 49 ++++++++++++ > > board/ti/am62x-sk/post-image.sh | 5 ++ > > boot/Config.in | 4 +- > > boot/ti-k3-image-gen/Config.in | 77 ------------------- > > boot/ti-k3/Config.in | 59 ++++++++++++++ > > boot/ti-k3/common.mk | 1 + > > .../{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 > > .../ti-k3-boot-firmware.hash | 0 > > .../ti-k3-boot-firmware.mk | 0 > > boot/ti-k3/ti-k3-core-secdev/Config.in | 9 +++ > > .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 + > > .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 ++++++ > > boot/ti-k3/ti-k3-image-gen/Config.in | 25 ++++++ > > .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 > > .../ti-k3-image-gen/ti-k3-image-gen.mk | 20 ++++- > > boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 4 +- > > .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- > > .../ti-k3-r5-loader/ti-k3-r5-loader.mk | 16 +++- > > boot/uboot/Config.in | 7 +- > > boot/uboot/uboot.mk | 3 +- > > configs/ti_am62x_sk_defconfig | 23 +++--- > > configs/ti_am64x_sk_defconfig | 8 +- > > package/python-attrs/python-attrs.mk | 6 ++ > > .../python-jsonschema-specifications.mk | 5 ++ > > .../python-jsonschema/python-jsonschema.mk | 6 ++ > > .../python-referencing/python-referencing.mk | 5 ++ > > package/python-rpds-py/python-rpds-py.mk | 1 + > > 29 files changed, 263 insertions(+), 105 deletions(-) > > create mode 100755 board/ti/am62x-sk/post-build.sh > > create mode 100755 board/ti/am62x-sk/post-image.sh > > delete mode 100644 boot/ti-k3-image-gen/Config.in > > create mode 100644 boot/ti-k3/Config.in > > create mode 100644 boot/ti-k3/common.mk > > rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) > > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) > > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) > > create mode 100644 boot/ti-k3/ti-k3-core-secdev/Config.in > > create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash > > create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk > > create mode 100644 boot/ti-k3/ti-k3-image-gen/Config.in > > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) > > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (67%) > > rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (97%) > > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (54%) > > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (85%) > > > From romain.naour at smile.fr Mon Feb 19 11:24:52 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 12:24:52 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> Message-ID: Hello Michael, Le 19/02/2024 ? 12:02, Michael Nazzareno Trimarchi a ?crit?: > Hi Romain > > On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: >> >> Hello Dario, >> >> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes >>> high-security field-securable (HS-FS) silicon to optionally customize keys >>> and encryption for security applications. >>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, >>> which, however, was buggy. This series fixes the errors and bumps the Linux >>> kernel and U-Boot required for such a new device. >>> >>> This series, which in my humble opinion, should have been immediately >>> considered to correct the compilation errors in case of HS-FS devcies, has >>> seen an increase in patches in version 4 to remove the ti-k3-image-gen >>> package thanks to Binman. Additionally, it shares some modifications and >>> views on how to implement certain changes with the series >>> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. >>> Therefore, I think it is necessary not to run them in parallel but to decide >>> whether to merge one before the other or to consider a single series where >>> the patches can be coherent with each other. I am available for both solutions. >>> Let me know. >> >> Thanks for this new version. I beleive both series should be merged into one >> since we want to follow u-boot switch to binman, add more TI K3 SoC support and >> keeping exising am62x ans am64x working in GP or HS/HS-FS. >> > > Because the Dario patchset was sent before (end of November), it's > reasonable to review and adjust that one > and apply your changes for ti_j721e_sk on top of it. It think that is > a standard way to make people happy about > their work and contribution. Actually, the two series are about the same topic: TI K3 SoC support (GP, HS, HS-FS) not only AM62x-SK HS-FS devices But due to the complexity of the BSP, the boot flow (4 way to boot!) and the switch from custom tool to binman... this series is really difficult to review without having a good understanding of TI K3 architecture peculiarity and having one of each TI evaluation boards ? The series (based on Dario's work) about ti_j721e_sk suggested to remove TI custom tools replaced by binman along with other improvements. I'll way for v5 and rebase the ti_j721e_sk on top of it. Best regards, Romain > > Michael > >> My main concern is to avoid adding a new package for a tool that is already >> deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. >> >> Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". >> >> [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html >> >> Best regards, >> Romain >> >>> >>> Dario Binacchi (20): >>> configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM >>> setting >>> configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM >>> setting >>> configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader >>> version >>> configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader >>> version >>> boot/ti-k3-r5-loader: bump to version 2024.01 >>> boot/ti-k3-core-secdev: new package >>> boot/ti-k3-image-gen: manage HS hardware >>> package/python-jsonschema: add host variant >>> package/python-attrs: add host variant >>> package/python-referencing: add host variant >>> package/python-rpds-py: add host variant >>> package/python-jsonschema-specifications: add host variant >>> boot/ti-k3-r5-loader: set binman environment >>> boot/uboot: set BINMAN_INDIRS for TI K3 DM >>> configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 >>> configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 >>> boot: move ti-k3-* packages to 'ti-k3' directory >>> boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope >>> boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin >>> configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore >>> >>> DEVELOPERS | 1 + >>> board/ti/am62x-sk/genimage.cfg | 7 +- >>> board/ti/am62x-sk/post-build.sh | 49 ++++++++++++ >>> board/ti/am62x-sk/post-image.sh | 5 ++ >>> boot/Config.in | 4 +- >>> boot/ti-k3-image-gen/Config.in | 77 ------------------- >>> boot/ti-k3/Config.in | 59 ++++++++++++++ >>> boot/ti-k3/common.mk | 1 + >>> .../{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 >>> .../ti-k3-boot-firmware.hash | 0 >>> .../ti-k3-boot-firmware.mk | 0 >>> boot/ti-k3/ti-k3-core-secdev/Config.in | 9 +++ >>> .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 + >>> .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 ++++++ >>> boot/ti-k3/ti-k3-image-gen/Config.in | 25 ++++++ >>> .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 >>> .../ti-k3-image-gen/ti-k3-image-gen.mk | 20 ++++- >>> boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 4 +- >>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- >>> .../ti-k3-r5-loader/ti-k3-r5-loader.mk | 16 +++- >>> boot/uboot/Config.in | 7 +- >>> boot/uboot/uboot.mk | 3 +- >>> configs/ti_am62x_sk_defconfig | 23 +++--- >>> configs/ti_am64x_sk_defconfig | 8 +- >>> package/python-attrs/python-attrs.mk | 6 ++ >>> .../python-jsonschema-specifications.mk | 5 ++ >>> .../python-jsonschema/python-jsonschema.mk | 6 ++ >>> .../python-referencing/python-referencing.mk | 5 ++ >>> package/python-rpds-py/python-rpds-py.mk | 1 + >>> 29 files changed, 263 insertions(+), 105 deletions(-) >>> create mode 100755 board/ti/am62x-sk/post-build.sh >>> create mode 100755 board/ti/am62x-sk/post-image.sh >>> delete mode 100644 boot/ti-k3-image-gen/Config.in >>> create mode 100644 boot/ti-k3/Config.in >>> create mode 100644 boot/ti-k3/common.mk >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/Config.in >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk >>> create mode 100644 boot/ti-k3/ti-k3-image-gen/Config.in >>> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) >>> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (67%) >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (97%) >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (54%) >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (85%) >>> >> From buildroot at bubu1.eu Mon Feb 19 11:30:27 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 19 Feb 2024 12:30:27 +0100 Subject: [Buildroot] [PATCH] package/python-django: add patch to fix crash with .pyc-only builds Message-ID: <20240219113028.607141-1-buildroot@bubu1.eu> Backport an upstream patch that fixes django auth and admin apps not working in .pyc only builds. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6148209453 Signed-off-by: Marcus Hoffmann --- ...d-sensitive_variables-sensitive_post.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch diff --git a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch new file mode 100644 index 0000000000..90dc9c7dd0 --- /dev/null +++ b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch @@ -0,0 +1,45 @@ +From d294b7679f2cb51c7231d6a7fb22e76eb74e49ec Mon Sep 17 00:00:00 2001 +From: Mariusz Felisiak +Date: Sat, 17 Feb 2024 08:15:59 +0100 +Subject: [PATCH] Fixed #35187 -- Fixed + @sensitive_variables/sensitive_post_parameters decorators crash with + .pyc-only builds. + +Thanks Jon Janzen for the implementation idea. + +Thanks Marcus Hoffmann for the report. + +Regression in 38e391e95fe5258bc6d2467332dc9cd44ce6ba52. +Backport of d1be05b3e9209fd0787841c71a95819d81061187 from main + +Signed-off-by: Marcus Hoffmann +Upstream: https://github.com/django/django/commit/41a4bba817f139f3cfd94f04e728e046560c9a18 +--- + django/views/decorators/debug.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py +index 7ea8a540de..6540fc0651 100644 +--- a/django/views/decorators/debug.py ++++ b/django/views/decorators/debug.py +@@ -47,7 +47,6 @@ def sensitive_variables(*variables): + + try: + file_path = inspect.getfile(wrapped_func) +- _, first_file_line = inspect.getsourcelines(wrapped_func) + except TypeError: # Raises for builtins or native functions. + raise ValueError( + f"{func.__name__} cannot safely be wrapped by " +@@ -55,7 +54,8 @@ def sensitive_variables(*variables): + "Python file (not a builtin or from a native extension)." + ) + else: +- key = hash(f"{file_path}:{first_file_line}") ++ first_line_number = wrapped_func.__code__.co_firstlineno ++ key = hash(f"{file_path}:{first_line_number}") + + if variables: + coroutine_functions_to_sensitive_variables[key] = variables +-- +2.34.1 + -- 2.34.1 From buildroot at bubu1.eu Mon Feb 19 14:52:19 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 19 Feb 2024 15:52:19 +0100 Subject: [Buildroot] [PATCH] package/util-linux: bump to version 2.39.3 In-Reply-To: <20240211222706.2959549-1-thomas.petazzoni@bootlin.com> References: <20240211222706.2959549-1-thomas.petazzoni@bootlin.com> Message-ID: <82397d49-8d5a-4349-aef5-50e83e5a9b40@bubu1.eu> Hi Thomas, On 11.02.24 23:27, Thomas Petazzoni via buildroot wrote: > Changes between 2.39.2 and 2.39.3: > > 2da5c904e18fdcffd2b252d641e6f76374c7b406 build-sys: release++ (v2.39.3) > 03c939edda81c5a4d6e5f5c1cb896e79c1e82e16 docs: update v2.39.3-ReleaseNotes > dafb120ef79c878cfd1b65c1d1c46497f17a7f7e docs: update AUTHORS file > bfc9691ce5d964b87f6c02cc236361b4772456d0 po-man: merge changes > d2232b60963a6e4e43fd359d1a4b552c4291b327 po: merge changes > 4ab356c1c02c34cd3935e1bb0aa47ed6e27cfe3c po: add ro.po (from translationproject.org) > 7e147d16c06f14b3f760b620d4f359cef12fe4ad po: update es.po (from translationproject.org) > e8cb61f07430d5f1d624245a219c2e21694c5f52 lsfd: fix memory leak in append_filter_expr() > 192d8aaa07e088e44fcb78736a53baae1ead7ccd lsfd: avoid undefined behavior > 756588f8c8b2ed93c124ca15cfb3f0efc4a0f9f6 lsfd: (man) fix the form for the optional argument of --inet option > 8d78c1306d1a9d5ebf9ec058344685da0360b87b Add Phytium FTC310 & FTC664 support > b75322cdb13c6c0b3789ff8fc19dcd017c069784 Add Phytium FTC862 cpu model. fix:#2486 > ec1b0eb36bd6c5a5079293ab03241163f61a8bf4 libmount: accept '\' as escape for options separator > 2e5f5c8d85338811595d321a77647a40e12321c9 tests: add ts_skip_docker > 0b3254cac3a275bbe32af57c6037cd29c21324d7 Merge branch 'stable-2.39/bcachefs-fixes' of https://github.com/t-8ch/util-linux into PR/stable-v2.39.3 > 6498439340a16e6acee54987df016c6b7928b17a tests: skip broken tests on docker > fa9b5365861934faab9ba73bd405095f56f02e45 libblkid: (bcachefs) add support for sub-device labels > 3c5d991b0323b33816e661e52da5d6f5402f47b5 libblkid: (bcachefs) adapt to major.minor version > ece194082fb318d0fa3fec31193ce6f61b97c67a libuuid: avoid truncate clocks.txt to improve performance > 84a62c1a5a614bde2530544bf2558c73f0179d42 libuuid/src/gen_uuid.c: fix cs_min declaration > 93239aa7869ddd236db8e5a28b4e6873ce6e0f22 libmount: fix possible NULL dereference [coverity scan] > a6def815e21d50db7a99ec74080c3fd7eb64e934 meson: install wall executable with group 'tty' > c6c1c69c3e83606eced938d841af03c1acef03a0 meson: install write executable with group 'tty' > bf2cd1d5a6eb273fbb11931b86ae165e7da5a397 libmount: improve mnt_table_next_child_fs() > c14f5bf37adf681c378fc004f0996e0bcfd30ce0 docs: add SPDX to boilerplate.c > fdd9f11f5e38b044617d3bc5f6c00789096b233f disk-utils: add SPDX and Copyright notices > e7dbe9c788da98b86f8cf87bc20ec74e32206451 include/audit-arch: add missing SPDX > 5ec7b14a72d9893d2a8d8c7f40cd45b44c9575c9 setterm: avoid restoring flags from uninitialized memory > 64d2300e6443c311219f187433046751a86ed18e Fix man page for col to correct documentation error > 7cc2c962567fe40daa9b12481224e5a0e6f96c47 Update col.c to fix option mistake > 122d7e7afb44d8a823e362673b0d2d1e31f7d478 umount: handle bindmounts during --recursive > da18b31ff1cb504e3d288f77d1f1d1179c39e4d8 lscpu: fix caches separator for --parse= > 3a5c9c1dd6935fb16f15f210b80ce9c5228e6a19 Use empty libuser config file. > 7058d793def09c3d4645e9efd1d8a5d212e839b0 libblkid: exfat: fix fail to find volume label > d065ff00a36b7244842f743372099837bc61328b blkpr: store return value of getopt_long in int > 9ca6f1712a5803e32e26e065e32e99837ba8b5d2 lib/path: Set errno in case of fgets failure > e2f0aa5c25c0295ef6187d3c53c2801fe17385e5 autotools: fix AC_DEFINE_UNQUOTED() use > cefd05c479e5456af8db2a86fabad165d247176b autotools: fix librtas check > f27fbafb24bdcefaa2463d47abc18491c3497451 lib/path: fix typos > f8ab70477e2ca7ac050fd4e2337b76a1972c8aa3 lib/path: set errno in case of error > 5ec30a362a5dd91c018c04a64fd1a481029dc4c6 lib/path: fix possible out of boundary access > edc723cd3341ff3d3e660051525dca40a2af6b3b libblkid: reset errno before calling probefuncs > 8de89778b945d552796f09576925310810ce798b setpriv: fix group argument completion > 41599054c7248f12c8a54d02f7161d0aff4275a9 libfdisk: reset errno before calling read() > cce4e44059405f3170b166fbf1774bf4b89c11c4 blkid: fix call to err_exclusive_options > b718f985cb6cc3bc65618649e9f231ecafcf81fb docs: use HTTPS for GitHub clone URLs > 2bddfa6928af328675b2ffbfc9b6546e9ee81722 libblkid: (probe) handle probe without chain gracefully > 3d31216787d6725fed361d27f0f01aff6ef46981 lib/idcache: always gracefully handle null cache > 368521e45e1c9cb44145fc72c04d1cc903a883e8 script-playutils: close filestream in case ignore_line() fails > 087b0d2383b8ab1ee4564d692d5f797ac781896f libblkid: (vxfs) report endianness > 7e5056f33bdfd867ce6f1a642f560fdf0b402c1e libblkid: (ntfs) validate that sector_size is a power of two > f368ccc759f9684338da723a93449764d0a8e312 libsmartcols: handle nameless tables in export format > f5cace8da07291c94b76b5cf80da1f921be67419 ldattach: don't call exit() from signal handler > 03c12a34c58d2550c6c718275950866d387d33f5 lslogins: fix realloc() loop allocation size > 83ba179b12d3c6c5f400bf78f2f742b1cc7ce256 lib/env: avoid underflow of read_all_alloc() return value > 813851fba28cb3ecde6a7f0c90a7e343920cd8c7 libblkid: avoid memory leak of cachefile path > 4459623cde42a5d021a6d71e38fcdfd4fff3e171 libmount: gracefully handle NULL path in mnt_resolve_target() > dbde7a537f27b23d64a8d3f583af472357de7192 more: avoid out-of-bound access > c26badd5d4295d52e987c75e69113edfb407fb27 libfdisk: handle allocation failure in fdisk_new_partition > 5c250aa6425fc3e35c07bce019eb4b7fa34bf722 login: Use pid_t for child_pid > be3f1712ee2e1e43d9b82b7cf4987c8a609a81ef login: move comment > 98be90b5bafa66d98655f8639efb3ffa984fc530 build-sys: fix libmount/src/hooks.c use > a711af02d32c0a0a31f1bbb943ffff2e94203e86 lscpu: Use 4K buffer size instead of BUFSIZ > 45c6136cba5f7607cca08c5aaab8e9b22ef87c25 autotools: fix typos > aa98c4ecc938a3459ffb759a444a8a585a9d0a3a libmount: make.stx_mnt_id use more robust > c697c2bb69f55aa24b6c0e2e752548f823c53796 libmount: report statx in features list > 13711f3ab79dfa92e8815eb9b752ec2bf4832d80 libmount: fix statx() includes > e9ed5a2b80bf8a76924caf8cd93b4cfff4d210a7 libblkid: (vfat) avoid modifying shared buffer > d2cadf0992cce589bfffeb603325c3c2fe54a991 libblkid: (jmicron_raid) use checksum APIs > c54c99efd0c3fc7f1e8db8b7191a6e1e3b295f1f libblkid: (jmicron_raid) avoid modifying shared buffer > 64418c52bc594abf01fc4ae8148e7aa93e4b3f22 libblkid: (zonefs) avoid modifying shared buffer > b66da7ce4a04d6c960817a56fe82498c4e7dea44 losetup: fix JSON MAJ:MIN > 44d7bf2c8d1c6d34a40416807d16db6c07ac4916 lslogins: (man) fix -y option formatting > 7d6c71e51ed3c5f8505c67962b6d03490738a879 include: add DragonFlyBSD GPT partition types > 6b9fda87c4e5d0c6f945d7565197f157b9fa3d5f libblkid: (bcachefs) fix size validation > acbf17ae8f8ee0f941fe98ed12f115f2b349bba8 libblkid: (bcachefs) fix compiler warning [-Werror=sign-compare] > 1ec71634aa4ef5ddca23d65c8a296f3614231e8a libblkid: (bcachefs) fix not detecting large superblocks > 68564ebb50f8afab5a9527c534417e247cca0b27 libmount: Fix regression when mounting with atime > > We can drop 0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch > as it was backported by upstream to the 2.39.x branch, and included in > 2.39.3. > > Signed-off-by: Thomas Petazzoni > --- > ...rc-gen_uuid.c-fix-cs_min-declaration.patch | 80 ------------------- > package/util-linux/util-linux.hash | 2 +- > package/util-linux/util-linux.mk | 2 +- > 3 files changed, 2 insertions(+), 82 deletions(-) > delete mode 100644 package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch > > diff --git a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch > deleted file mode 100644 > index bba4d54619..0000000000 > --- a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch > +++ /dev/null > @@ -1,80 +0,0 @@ > -From bcd11dece7d278bb0b76b138d08dedea80fa8262 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Tue, 7 Nov 2023 18:43:57 +0100 > -Subject: [PATCH] libuuid/src/gen_uuid.c: fix cs_min declaration > - > -Define cs_min through a define and not a const int to avoid the > -following build failure with -O0 raised since version 2.39 and > -https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: > - > -libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': > -libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant > - THREAD_LOCAL int cache_size = cs_min; > - ^~~~~~ > - > -For consistency, also use define for cs_max and cs_factor > - > -Fixes: > - - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 > - > -Signed-off-by: Fabrice Fontaine > -Upstream: https://github.com/util-linux/util-linux/commit/07e5c29d501c19e7af84fecb5915e0f9f94cb49f > ---- > - libuuid/src/gen_uuid.c | 19 ++++++++++--------- > - 1 file changed, 10 insertions(+), 9 deletions(-) > - > -diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c > -index 619ef0131..db793c374 100644 > ---- a/libuuid/src/gen_uuid.c > -+++ b/libuuid/src/gen_uuid.c > -@@ -518,6 +518,10 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) > - return __uuid_generate_time_internal(out, num, cont_offset); > - } > - > -+#define CS_MIN (1<<6) > -+#define CS_MAX (1<<18) > -+#define CS_FACTOR 2 > -+ > - /* > - * Generate time-based UUID and store it to @out > - * > -@@ -529,11 +533,8 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) > - static int uuid_generate_time_generic(uuid_t out) { > - #ifdef HAVE_TLS > - /* thread local cache for uuidd based requests */ > -- const int cs_min = (1<<6); > -- const int cs_max = (1<<18); > -- const int cs_factor = 2; > - THREAD_LOCAL int num = 0; > -- THREAD_LOCAL int cache_size = cs_min; > -+ THREAD_LOCAL int cache_size = CS_MIN; > - THREAD_LOCAL int last_used = 0; > - THREAD_LOCAL struct uuid uu; > - THREAD_LOCAL time_t last_time = 0; > -@@ -552,10 +553,10 @@ static int uuid_generate_time_generic(uuid_t out) { > - * Start with a small cache size to cover short running applications > - * and adjust the cache size over the runntime. > - */ > -- if ((last_used == cache_size) && (cache_size < cs_max)) > -- cache_size *= cs_factor; > -- else if ((last_used < (cache_size / cs_factor)) && (cache_size > cs_min)) > -- cache_size /= cs_factor; > -+ if ((last_used == cache_size) && (cache_size < CS_MAX)) > -+ cache_size *= CS_FACTOR; > -+ else if ((last_used < (cache_size / CS_FACTOR)) && (cache_size > CS_MIN)) > -+ cache_size /= CS_FACTOR; > - > - num = cache_size; > - > -@@ -568,7 +569,7 @@ static int uuid_generate_time_generic(uuid_t out) { > - } > - /* request to daemon failed, reset cache */ > - num = 0; > -- cache_size = cs_min; > -+ cache_size = CS_MIN; > - } > - if (num > 0) { /* serve uuid from cache */ > - uu.time_low++; > --- > -2.43.0 > - > diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash > index 1638cd9967..480f82d751 100644 > --- a/package/util-linux/util-linux.hash > +++ b/package/util-linux/util-linux.hash > @@ -1,5 +1,5 @@ > # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc > -sha256 87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f util-linux-2.39.2.tar.xz > +sha256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f util-linux-2.39.3.tar.xz > # License files, locally calculated > sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing This fails make legal-info now: >>> util-linux 2.39.3 Collecting legal info ERROR: README.licensing has wrong sha256 hash: ERROR: expected: 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 ERROR: got : 13f0ea46d12d798c095a6ad39d7ddc988e2e4d274c6494115f6b463f7bc4f702 ERROR: Incomplete download, or man-in-the-middle (MITM) attack Likely due to https://github.com/util-linux/util-linux/commit/fdd9f11f5e38b044617d3bc5f6c00789096b233f Which as far as I read it doesn't change any licensing but clarifies in the top level license readme that part of the code base (fdisk.c) is GPL-1.0-or-later licensed which wasn't mentioned before. The file in question already had correct license information before. > sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index 72126adb00..a9e5b0bf68 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -8,7 +8,7 @@ > # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. > > UTIL_LINUX_VERSION_MAJOR = 2.39 > -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 > +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 > UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz > UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) > Best, Marcus From buildroot at bubu1.eu Mon Feb 19 18:26:04 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 19 Feb 2024 19:26:04 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 254.9 Message-ID: <20240219182604.1287000-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index c0f4638803..e5588f06a2 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 1e1e42c597b4f992679aa964a0c5c23d970c58fed47aed65c11878b332dc5b23 systemd-254.6.tar.gz +sha256 3d23003ea886dbffa5bc84ad72c6edcbde62d32dbdec506e308624e1da509cb0 systemd-254.9.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 528fe60b1d..c6b006d1fb 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 254.6 +SYSTEMD_VERSION = 254.9 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ -- 2.34.1 From buildroot at bubu1.eu Mon Feb 19 18:38:27 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 19 Feb 2024 19:38:27 +0100 Subject: [Buildroot] [PATCH] package/systemd: needs sulogin for emergency target support Message-ID: <20240219183828.1289275-1-buildroot@bubu1.eu> systemd invokes util-linux' sulogin via systemd-sulogin-shell[1] via emergency.service/emergency.target[2]. [1] https://github.com/systemd/systemd/blob/main/src/sulogin-shell/sulogin-shell.c [2] https://github.com/systemd/systemd/blob/main/units/emergency.service.in#L23 Signed-off-by: Marcus Hoffmann --- package/systemd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 859332d9e4..58b4e51c6d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -34,6 +34,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_FSCK + select BR2_PACKAGE_UTIL_LINUX_SULOGIN # emergency target select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools select BR2_PACKAGE_KMOD_TOOLS -- 2.34.1 From raphael.pavlidis at gmail.com Mon Feb 19 18:48:27 2024 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Mon, 19 Feb 2024 18:48:27 +0000 Subject: [Buildroot] [PATCH v1 1/1] package/slirp4netns: bump to version 1.2.3 Message-ID: <20240219184827.790288-1-raphael.pavlidis@gmail.com> Signed-off-by: Raphael Pavlidis --- package/slirp4netns/slirp4netns.hash | 2 +- package/slirp4netns/slirp4netns.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/slirp4netns/slirp4netns.hash b/package/slirp4netns/slirp4netns.hash index e3115c1be0..e310da1af2 100644 --- a/package/slirp4netns/slirp4netns.hash +++ b/package/slirp4netns/slirp4netns.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b584edde686d3cfbac210cbdb93c4b0ba5d8cc0a6a4d92b9dfc3c5baec99c727 slirp4netns-1.2.0.tar.gz +sha256 acce648fab8fe5f113c41a8fd6d20177708519b4ddaa60f845e1998a17b22ca5 slirp4netns-1.2.3.tar.gz sha256 58db3cfabf8ec806bc060e54ab5466a31de4a3ae80fe4a8aa02fb6b1c053c93f COPYING diff --git a/package/slirp4netns/slirp4netns.mk b/package/slirp4netns/slirp4netns.mk index 7ff594cc44..7fa992af6d 100644 --- a/package/slirp4netns/slirp4netns.mk +++ b/package/slirp4netns/slirp4netns.mk @@ -4,7 +4,7 @@ # ################################################################################ -SLIRP4NETNS_VERSION = 1.2.0 +SLIRP4NETNS_VERSION = 1.2.3 SLIRP4NETNS_SITE = $(call github,rootless-containers,slirp4netns,v$(SLIRP4NETNS_VERSION)) SLIRP4NETNS_LICENSE = GPL-2.0 SLIRP4NETNS_LICENSE_FILES = COPYING -- 2.43.2 From kadambini.nema at gmail.com Mon Feb 19 19:19:34 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 11:19:34 -0800 Subject: [Buildroot] [PATCH 1/1] package/dos2unix: bump to version 7.5.2 In-Reply-To: References: Message-ID: <20240219191934.41982-1-kadambini.nema@gmail.com> - Update hash of the COPYING.txt (update in year) Signed-off-by: Kadambini Nema --- Changelog: https://waterlan.home.xs4all.nl/dos2unix/ChangeLog.txt $ ./utils/test-pkg -d br_test -k -c dos2unix.config -p dos2unix bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed package/dos2unix/dos2unix.hash | 6 +++--- package/dos2unix/dos2unix.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash index 032c8ea2d2..d4d682cd0c 100644 --- a/package/dos2unix/dos2unix.hash +++ b/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 6d1e70cf26..e30fc999d4 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.5.0 +DOS2UNIX_VERSION = 7.5.2 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt -- 2.25.1 From bernd at kuhls.net Mon Feb 19 19:25:41 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Mon, 19 Feb 2024 20:25:41 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240219192541.3773864-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 773cb4fbb5..8e889af802 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.17" 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 52fb480af2..db9b2d8a11 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz -sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz +sha256 ee7650996ba75aa29fe66f309b413097f249a03e7001f2a41128c7c95205226a linux-6.6.17.tar.xz +sha256 65206b969831236849c9906eba267e715734a93808e9909fd9b4f12eea10d689 linux-6.1.78.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 69857566e3..537de85ad8 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.77" if BR2_KERNEL_HEADERS_6_1 - default "6.6.16" if BR2_KERNEL_HEADERS_6_6 + default "6.1.78" if BR2_KERNEL_HEADERS_6_1 + default "6.6.17" if BR2_KERNEL_HEADERS_6_6 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 \ -- 2.39.2 From bernd at kuhls.net Mon Feb 19 19:27:24 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Mon, 19 Feb 2024 20:27:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 20.6.4-Nexus Message-ID: <20240219192724.3776282-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 286cff5cc4..b4e6f30685 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c742a31ec6f4d2a427d05f70950cfd4e347cf1c0acdb1747c39eb68124be30a kodi-pvr-mythtv-20.6.1-Nexus.tar.gz +sha256 da7cdc514ce48992e7c2575735c4bd9d22891ba3c12169ae42163b159517b8c9 kodi-pvr-mythtv-20.6.4-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 312c8619be..57ddf3af10 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.6.1-Nexus +KODI_PVR_MYTHTV_VERSION = 20.6.4-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.39.2 From dannenberg at ti.com Mon Feb 19 19:42:07 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 13:42:07 -0600 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <20240216200635.crek5j23p3hybg2p@dasso> Message-ID: <20240219194207.pfonekdap7jagk3d@dasso> Hi Romain, On Fri, Feb 16, 2024 at 10:38:42PM +0100, Romain Naour wrote: > Hello Andreas, > > Le 16/02/2024 ? 21:06, Andreas Dannenberg a ?crit?: > > On Thu, Feb 15, 2024 at 11:20:50AM +0100, Alexander Sverdlin wrote: > >> Hi Romain, > >> > >> On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > >>> -choice > >>> - prompt "Security type" > >>> - help > >>> - ? The target SoC security type option for image gen.? Valid > >>> - ? options are "gp" for General Purpose devices, "hs-fs" for > >>> - ? High Security - Field Securable devices, or "hs" for High > >>> - ? Security - Security Enforcing devices.? Note for all High > >>> - ? Security device variants the TI_SECURE_DEV_PKG environmental > >>> - ? variable must be defined at build time pointing to a valid > >>> - ? core-secdev-k3 folder location, otherwise the build will > >>> - ? fail, see > >>> - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > >>> - > >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > >>> - bool "gp" > >>> - > >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > >>> - bool "hs-fs" > >>> - > >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>> - bool "hs" > >>> - > >>> -endchoice > >> > >> another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > >> was the default, which didn't boot on my HS-FS SoC. > >> > >> You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the > >> default for AM62x. I'm not sure if this is a problem, though. > > > > HS-FS should be the default for all TI AM6x devices. This is our > > "production silicon" and what's used for (almost) all projects, > > especially new projects. This being said having support for GP device > > variants still is desirable for existing boards/projects, such as the > > current BeaglePlay boards (amongst earlier version of TI starter kit > > EVMs for AM6x). > > Thank you, I was not aware of this. > > I found your post in the TI forum about the recent switch from GP to HS-FS > device in Yocto [1]. > > Currently existing am64/am62 defconfigs are still targeting GP devices but we > should add additional commits to do the switch to HS-FS. > > What about other SoC of the K3 architecture? > Is the DRA829/J721e device will also switch to HS-FS by default? I needed to double-check with the team, since I'm only intimately involved with AM62/AM64/AM65 type devices. All the others are managed by a different group in TI. So based on what I found out here's the full context accross TI's K3 platform of devices and their associated TI EVMs / Starter Kits: * All "Sitara"-brand SoCs (AM62x, AM64, AM65x) are HS-FS first * All "Jacinto"-brand industrial SoCs (AM68, AM69 and AM67) are also HS-FS first * All new "Jacinto"-brand automotive/other SoCs (J7AEN onwards) are HS-FS first * All existing "Jacinto"-brand SoCs (TDA4, J721E, J7200, J721S2 and J784S4) are GP by default So while there are still boards out there with GP silicon (last bullet) those are probably not the typical target platforms for Buildroot, being very complex and high-end multi-core SoCs, mostly used in automotive applications. The one exception here that has more weight in my oppinion is the current BeaglePlay board (AM62x-based), those also have GP devices on those boards. All this being being said, I stand by my previous comment that HS-FS should be the default. As for the BeaglePlay board (which is a very nice community board) and potentially selected Jacinto-based boards this could potentially be handled with a dedicated defconfig or some other Kconfig magic to enable a seamless and easy out of box experience. -- Andreas Dannenberg Texas Instruments Inc > > From the u-boot k3 documentation, it's not clear witch device type is used by > default across all k3 SoC. By default I was expecting the GP type for all the k3 > family (I was wrong). > > [1] > https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto > > [2] > https://source.denx.de/u-boot/u-boot/-/blob/master/doc/board/ti/k3.rst?ref_type=heads&plain=1#L108 > > Best regards, > Romain > > > > > -- > > Andreas Dannenberg > > Texas Instruments Inc > > > > > >> > >> -- > >> Alexander Sverdlin. > >> > >> _______________________________________________ > >> buildroot mailing list > >> buildroot at buildroot.org > >> https://lists.buildroot.org/mailman/listinfo/buildroot > From kadambini.nema at gmail.com Mon Feb 19 19:59:10 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 11:59:10 -0800 Subject: [Buildroot] [PATCH 1/2] package/libyang: bump version to 2.1.148 In-Reply-To: References: Message-ID: <20240219195911.43452-1-kadambini.nema@gmail.com> Signed-off-by: Kadambini Nema --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index 3658b20e4e..e03278adfd 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3e52b922fcf371933ad7de1686ad83504e3358236e7817b5af795b0db52fa221 libyang-2.1.111.tar.gz +sha256 77a0aaaeb3df720aeb70d6896e32e2c2be099d48df73e3cfb52567051af3e44b libyang-2.1.148.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 5533c7c68e..fca0cd63f8 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.111 +LIBYANG_VERSION = 2.1.148 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE -- 2.25.1 From kadambini.nema at gmail.com Mon Feb 19 19:59:11 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 11:59:11 -0800 Subject: [Buildroot] [PATCH 2/2] package/sysrepo: bump version to 2.2.150 In-Reply-To: <20240219195911.43452-1-kadambini.nema@gmail.com> References: <20240219195911.43452-1-kadambini.nema@gmail.com> Message-ID: <20240219195911.43452-2-kadambini.nema@gmail.com> Note: This release depends on libyang (v2.1.148) (https://github.com/sysrepo/sysrepo/releases/tag/v2.2.150) Signed-off-by: Kadambini Nema --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index 6a5e98f41b..056f70787d 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz +sha256 467efed8d0f62c26a0d200602b911096eb2d67858e620937ab68f96b316fa9b7 sysrepo-2.2.150.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 6b031ae6f9..7f2570bd7d 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.2.36 +SYSREPO_VERSION = 2.2.150 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause -- 2.25.1 From dannenberg at ti.com Mon Feb 19 19:59:24 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 13:59:24 -0600 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <3570b01e6a258bbafa2d6317ba8619ecb39f66ec.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240216201903.lhhkjevrgzcp5msz@dasso> <735636d6-c0f8-4226-ab8a-1576c2133189@smile.fr> <20240216222012.eaes5ktamizu6n5c@dasso> <3570b01e6a258bbafa2d6317ba8619ecb39f66ec.camel@gmail.com> Message-ID: <20240219195924.smciairp2ts3655m@dasso> Hi Alexander, On Sat, Feb 17, 2024 at 04:13:16AM +0100, Alexander Sverdlin wrote: > Hello Andreas, > > On Fri, 2024-02-16 at 16:20 -0600, Andreas Dannenberg wrote: > > On Fri, Feb 16, 2024 at 10:52:21PM +0100, Romain Naour wrote: > > > Hello Andreas, > > > > > > Le 16/02/2024 ? 21:19, Andreas Dannenberg a ?crit?: > > > > On Tue, Feb 13, 2024 at 06:27:56PM +0100, Romain Naour wrote: > > > > > This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > > > > > > > > > > This series start by adding U-boot binman support already submitted in the > > > > > preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > > > > > [1], with small improvements. > > > > > See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > > > > > > > > Thanks Romain and Dario for all the work on this, and submitting this. > > > > Will be spending some time over the next few days to see how I can help > > > > out with this effort. I can already see many great improvements since > > > > the last time I worked on AM62x/AM64x support last year. > > > > > > Your feed back on HS-FS devices is really helpful. Alexander Sverdlin also > > > helped on AM62x. > > > > > > Maybe if you can also test on AM64x just to be sure the defconfig is working. > > > > I'm planning on testing the entire series here pretty soon and will > > provide feedback (I have access to any and all boards:) > > > > One of the things I'm trying to assess is what's still missing vs. the > > previous attempt I made upstreaming this. For example, AM62x graphics > > isn't there yet (ti-rogue-km / ti-rogue-um). > > maybe you could shed some light onto the AM62x situation. My conclusion > is that since your initial buildroot BSP U-Boot has been switched > to standard boot (CONFIG_BOOTSTD), refer to (U-Boot repo): > > commit 355c0afcd4b7c8c442c4d03e07649c24194b8e06 > Author: Nishanth Menon > Date: Fri Aug 25 13:02:52 2023 -0500 > > configs: am62x_evm_a53_defconfig: Switch to bootstd > > and > > commit ab54d9b28d8578cc43b214d39009e7b1def797e4 > Author: Roger Quadros > Date: Thu Oct 5 16:06:41 2023 +0300 > > board: ti: am62x: am62x.env: Fix boot_targets > > ti_mmc is not a valid boot_target for standard boot flow so > > I suppose TI's BSP still uses older U-Boot and is still not affected. > Do we need uEnv.txt now? Do you have an idea which distro Nishanth may > have tested with BOOTSTD change? I wasn't aware of those changes but I just looked at some of them. Looks like most of the effort was targeted around the BeaglePlay board. And this was tested with Debian. You can find one of Nishanth's boot logs here [1]. It was referenced in the cover letter [2] of the U-Boot series that introduced the 'Switch to bootstd' change you pointed out. If this indeed causes some widespread breakage including Buildroot we need to understand and think about how to best resolve this. Will dig into this some more as I'm trying to get back into helping with the Buildroot effort here. Thanks, Andreas [1] https://gist.github.com/nmenon/c74acb3a895053e05623e886df77c8fe [2] https://lore.kernel.org/all/20230824031101.3460411-1-nm at ti.com/ > > -- > Alexander Sverdlin. > From bernd at kuhls.net Mon Feb 19 20:04:12 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Mon, 19 Feb 2024 21:04:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: bump to version 3.0.17 References: <20240211214935.1603160-1-ju.o__4871.99223586998$1707688208$gmane$org@free.fr> Message-ID: Am Sun, 11 Feb 2024 22:49:35 +0100 schrieb Julien Olivain: > For commit logs, see: > https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ Hi Julien, this bump breaks building syslinux (not yet caught by the autobuilders): https://bugs.gentoo.org/921597 Regards, Bernd From dannenberg at ti.com Mon Feb 19 20:15:31 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 14:15:31 -0600 Subject: [Buildroot] [PATCH v4 06/20] boot/ti-k3-core-secdev: new package In-Reply-To: <5f007c47-0c4c-438b-8978-4fe6e2515db1@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> <5f007c47-0c4c-438b-8978-4fe6e2515db1@smile.fr> Message-ID: <20240219201531.bekohv6hmfkdftct@dasso> Hi Romain, All, On Mon, Feb 19, 2024 at 10:48:59AM +0100, Romain Naour wrote: > Hello Dario, > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > > This is a security development package containing tools for > > High-Security(HS) TI K3 platform devices. > > Note: this tool can also handle TI "legacy" platform such AM57xx or AM43xx (not > sure we really want do that). While there are secure variants of those older platforms, it is very much controlled/restricted and not something readily available. So not something somebody easily can obtain to test, etc. Either way the secure dev source package associated with 'ti-k3-core-secdev' here is also only for K3 generation of devices and won't compatible with AM57xx or AM43xx anyways. > > Can you try without this package when using binman? > This tool doesn't seems "future proof". > > http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html Yes we should drop the package. Thanks, Andreas > Best regards, > Romain > > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v4: > > - Remove the trailing '/' at the end of the url in the help of > > Config.in > > - Fixed license issues > > - Use $(BINARIES_DIR)/ti-k3-core-secdev as the directory where to > > install files. > > > > Signed-off-by: Dario Binacchi > > --- > > DEVELOPERS | 1 + > > boot/Config.in | 1 + > > boot/ti-k3-core-secdev/Config.in | 9 ++++++++ > > boot/ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 +++ > > boot/ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 +++++++++++++++++++ > > 5 files changed, 36 insertions(+) > > create mode 100644 boot/ti-k3-core-secdev/Config.in > > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 0d12c3abcb11..33d99ab2440f 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -753,6 +753,7 @@ F: package/xinetd/ > > N: Dario Binacchi > > F: board/bsh/ > > F: board/stmicroelectronics/stm32f769-disco/ > > +F: boot/ti-k3-core-secdev/ > > F: configs/imx8mn_bsh_smm_s2_defconfig > > F: configs/imx8mn_bsh_smm_s2_pro_defconfig > > F: configs/stm32f769_disco_sd_defconfig > > diff --git a/boot/Config.in b/boot/Config.in > > index e5fdf7ad439e..18a7d268f95a 100644 > > --- a/boot/Config.in > > +++ b/boot/Config.in > > @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" > > source "boot/shim/Config.in" > > source "boot/syslinux/Config.in" > > source "boot/ti-k3-boot-firmware/Config.in" > > +source "boot/ti-k3-core-secdev/Config.in" > > source "boot/ti-k3-image-gen/Config.in" > > source "boot/ti-k3-r5-loader/Config.in" > > source "boot/uboot/Config.in" > > diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in > > new file mode 100644 > > index 000000000000..f7b4e2962042 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/Config.in > > @@ -0,0 +1,9 @@ > > +config BR2_TARGET_TI_K3_CORE_SECDEV > > + bool "ti-k3-core-secdev" > > + depends on BR2_aarch64 > > + help > > + This package downloads and installs development tools for > > + High-Security(HS) TI K3 platforms (which include AM62x, > > + AM64x, AM65x and more). > > + > > + https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > new file mode 100644 > > index 000000000000..e3074a398d62 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > @@ -0,0 +1,3 @@ > > +# Locally calculated > > +sha256 b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06 core-secdev-k3-08.06.00.007.tar.xz > > +sha256 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369 manifest/k3-secdev-0.2-manifest.html > > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > new file mode 100644 > > index 000000000000..f7655a0fefc8 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > @@ -0,0 +1,22 @@ > > +################################################################################ > > +# > > +# ti-k3-core-secdev > > +# > > +################################################################################ > > + > > +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 > > +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot > > +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz > > +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES > > +TI_K3_CORE_SECDEV_LICENSE = BSD-3-Clause > > +TI_K3_CORE_SECDEV_LICENSE_FILES = manifest/k3-secdev-0.2-manifest.html > > + > > +TI_K3_CORE_SECDEV_INSTALL_DIR = $(BINARIES_DIR)/ti-k3-core-secdev > > + > > +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS > > + mkdir -p $(TI_K3_CORE_SECDEV_INSTALL_DIR) > > + cp -dpfr $(@D)/keys $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > > + cp -dpfr $(@D)/scripts $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > > +endef > > + > > +$(eval $(generic-package)) > From dannenberg at ti.com Mon Feb 19 20:19:08 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 14:19:08 -0600 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <8dca9e04-832f-4ffc-b6b0-d1deed31259b@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8dca9e04-832f-4ffc-b6b0-d1deed31259b@smile.fr> Message-ID: <20240219201908.zqxhfa5bewy6lohx@dasso> On Mon, Feb 19, 2024 at 10:58:26AM +0100, Romain Naour wrote: > Hello Dario, > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > > The patch sets the configurations required by TI HS systems. Some of these > > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > > are provided by the ti-k3-core-secdev package in the binaries directory. > > Such keys has been added to u-boot v2023.10: > > https://git.ti.com/cgit/security-development-tools/core-secdev-k3/tree/keys > > https://source.denx.de/u-boot/u-boot/-/commit/d5b1ef30d7ffabb9f57d5c62b9f0608837af0f4f > > Do we need something else from ti-k3-core-secdev package that is not already > provided by u-boot? No, we don't need anything from that. If you look at TI's current SDKs/Yocto builds this package is not used at all. The TI goal is to do things in a standard upstream way (in upstream) as much as possible, hence we are trying to move away from all these "vendor quirks" however possible. Regards, Andreas > > Best regards, > Romain > > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > no changes since v3: > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3-image-gen/Config.in | 1 + > > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > > 2 files changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > > index d76cef82e911..38d1598d9fc0 100644 > > --- a/boot/ti-k3-image-gen/Config.in > > +++ b/boot/ti-k3-image-gen/Config.in > > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > bool "ti-k3-image-gen" > > depends on BR2_TARGET_TI_K3_R5_LOADER > > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > # We need FIT support in uboot-tools, which is why we select a > > # host package > > select BR2_PACKAGE_HOST_UBOOT_TOOLS > > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > index 64be9a18f2c4..74b4fcb4bf89 100644 > > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > > > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +else > > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > > + > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > > +endif > > > > define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > > + ) > > endef > > > > define TI_K3_IMAGE_GEN_BUILD_CMDS > > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > > $(BR2_MAKE) -C $(@D) \ > > SOC=$(TI_K3_IMAGE_GEN_SOC) \ > > SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > > + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ > > CONFIG=evm \ > > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > > SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > From dannenberg at ti.com Mon Feb 19 20:36:56 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 14:36:56 -0600 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> Message-ID: <20240219203656.5rb7xelxunbxwkka@dasso> Hi Alexander, On Sun, Feb 18, 2024 at 12:45:47AM +0100, Alexander Sverdlin wrote: > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > The patch sets the configurations required by TI HS systems. Some of these > > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > > are provided by the ti-k3-core-secdev package in the binaries directory. > > > > Signed-off-by: Dario Binacchi > > so for test I've reverted the previous "boot/ti-k3-core-secdev: new package" > commit, then... > > > --- > > > > no changes since v3: > > > > Signed-off-by: Dario Binacchi > > --- > > ?boot/ti-k3-image-gen/Config.in????????? |? 1 + > > ?boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > > ?2 files changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > > index d76cef82e911..38d1598d9fc0 100644 > > --- a/boot/ti-k3-image-gen/Config.in > > +++ b/boot/ti-k3-image-gen/Config.in > > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > ? bool "ti-k3-image-gen" > > ? depends on BR2_TARGET_TI_K3_R5_LOADER > > ? select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > ... removed this, ... > > > ? # We need FIT support in uboot-tools, which is why we select a > > ? # host package > > ? select BR2_PACKAGE_HOST_UBOOT_TOOLS > > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > index 64be9a18f2c4..74b4fcb4bf89 100644 > > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > ?TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > ?TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > ? > > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +else > > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > > ... the above line, ... > > > + > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > > +endif > > ? > > ?define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > > + ) > > ?endef > > ? > > ?define TI_K3_IMAGE_GEN_BUILD_CMDS > > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > > ? $(BR2_MAKE) -C $(@D) \ > > ? SOC=$(TI_K3_IMAGE_GEN_SOC) \ > > ? SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > > + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ > > ... and this line... > > > ? CONFIG=evm \ > > ? CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > > ? SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > > ... and everything still builds and boots fine on SK-AM62B (HS-FS): > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:02:43 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 13400 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Starting ATF on ARM64 core... > > NOTICE: BL31: v2.7(release):v2.7 > NOTICE: BL31: Built : 23:57:43, Feb 17 2024 > I/TC: > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1199-g470b2069e4)) #1 Sat Feb 17 22:57:38 UTC 2024 aarch64 > I/TC: WARNING: This OP-TEE configuration might be insecure! > I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html > I/TC: Primary CPU initializing > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > I/TC: HUK Initialized > I/TC: Activated SA2UL device > I/TC: Enabled firewalls for SA2UL TRNG device > I/TC: SA2UL TRNG initialized > I/TC: SA2UL Drivers initialized > I/TC: Primary CPU switching to normal world boot > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:03:30 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 1872 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > > > U-Boot 2024.01 (Feb 18 2024 - 00:03:30 +0100) > > SoC: AM62X SR1.0 HS-FS > Model: Texas Instruments AM625 SK > DRAM: 2 GiB > Core: 56 devices, 23 uclasses, devicetree: separate > MMC: mmc at fa10000: 0, mmc at fa00000: 1 > Loading Environment from nowhere... OK > In: serial at 2800000 > Out: serial at 2800000 > Err: serial at 2800000 > Net: eth0: ethernet at 8000000port@1 > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc1 is current device > SD/MMC found on device 1 > Failed to load 'uEnv.txt' > Scanning for bootflows in all bootdevs > Seq Method State Uclass Part Name Filename > --- ----------- ------ -------- ---- ------------------------ ---------------- > Scanning global bootmeth 'efi_mgr': > No EFI system partition > No EFI system partition > Failed to persist EFI variables > Scanning bootdev 'mmc at fa00000.bootdev': > 0 extlinux ready mmc 1 mmc at fa00000.bootdev.part_ /extlinux/extlinux.conf > ** Booting bootflow 'mmc at fa00000.bootdev.part_1' with extlinux > 1: am62x-sk-buildroot > Retrieving file: /Image > append: console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 > Retrieving file: /k3-am62x.dtb > ## Flattened Device Tree blob at ffb14700 > Booting using the fdt blob at 0xffb14700 > Working FDT set to ffb14700 > Loading Device Tree to 000000008ffed000, end 000000008ffff687 ... OK > Working FDT set to 8ffed000 > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] Just wanting to double-check one quick detail. Did you have to make any additional modifications to boot-mode related U-Boot settings or ENV variables? Or did the "new normal" of CONFIG_BOOTSTD just work for you? -- Andreas Dannenberg Texas Instruments Inc > [ 0.000000] Linux version 6.6.1 (...) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1199-g470b2069e4) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Sun Feb 18 > 00:37:47 CET 2024 > > > > -- > Alexander Sverdlin. > From kadambini.nema at gmail.com Mon Feb 19 20:40:54 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 12:40:54 -0800 Subject: [Buildroot] [PATCH 1/1] package/google-breakpad: fix missing include error In-Reply-To: <--in-reply-to> References: <--in-reply-to> Message-ID: <20240219204054.57774-1-kadambini.nema@gmail.com> src/common/module.cc: In member function ?bool google_breakpad::Module::AddFunction(Function*)?: src/common/module.cc:194:52: error: ?find_if? is not a member of ?std?; did you mean ?find?? 194 | FunctionSet::iterator existing_function = std::find_if( | ^~~~~~~ | find Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed This error is seen on gcc-14. https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch Signed-off-by: Kadambini Nema --- ...ixed-missing-include-for-std-find_if.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch new file mode 100644 index 0000000000..141e12b613 --- /dev/null +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch @@ -0,0 +1,26 @@ +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 +From: Nathan Moinvaziri +Date: Tue, 19 Dec 2023 14:35:05 -0800 +Subject: [PATCH] Fixed missing include for std::find_if. + +Throws an error when compiling on Windows. + +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 +Reviewed-by: Ivan Penkov +Upstream: https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d +Signed-off-by: Kadambini Nema +--- + +diff --git a/src/common/module.cc b/src/common/module.cc +index 0eb5aad..b6f5da7 100644 +--- a/src/common/module.cc ++++ b/src/common/module.cc +@@ -42,6 +42,7 @@ + #include + #include + ++#include + #include + #include + #include -- 2.25.1 From alexander.sverdlin at gmail.com Mon Feb 19 20:42:44 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Mon, 19 Feb 2024 21:42:44 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <20240219203656.5rb7xelxunbxwkka@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> <20240219203656.5rb7xelxunbxwkka@dasso> Message-ID: <6948b9c91559db56060b09baa9e686761d589d62.camel@gmail.com> Hi Andreas! On Mon, 2024-02-19 at 14:36 -0600, Andreas Dannenberg wrote: > > ?? 0? extlinux???? ready?? mmc????????? 1? mmc at fa00000.bootdev.part_ /extlinux/extlinux.conf > > ** Booting bootflow 'mmc at fa00000.bootdev.part_1' with extlinux > > 1:????? am62x-sk-buildroot > > Retrieving file: /Image > > append: console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 > > Retrieving file: /k3-am62x.dtb > > ## Flattened Device Tree blob at ffb14700 > > ??? Booting using the fdt blob at 0xffb14700 > > Working FDT set to ffb14700 > > ??? Loading Device Tree to 000000008ffed000, end 000000008ffff687 ... OK > > Working FDT set to 8ffed000 > > > > Starting kernel ... > > > > [??? 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] > > Just wanting to double-check one quick detail. Did you have to make any > additional modifications to boot-mode related U-Boot settings or ENV > variables? Or did the "new normal" of CONFIG_BOOTSTD just work for you? No changes in U-Boot whatsoever, patchset from Dario works as-is, seems that the extlinux.conf visible in the log above did the trick. -- Alexander Sverdlin. From dannenberg at ti.com Mon Feb 19 20:51:57 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 14:51:57 -0600 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> Message-ID: <20240219205157.5ukm426gmzbvn33f@dasso> On Sat, Feb 17, 2024 at 09:44:29PM +0100, Alexander Sverdlin wrote: > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > As explained in [1], adding support for AM62x LP SK in U-Boot, requires > > binman for building bootloader images. The BINMAN_INDIRS environment > > variable is used to provide a space-separated list of directories to > > search for binary blobs. > > > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > > Signed-off-by: Dario Binacchi > > > > --- > > > > no changes since v1: > > > > Signed-off-by: Dario Binacchi > > --- > > ?boot/uboot/uboot.mk | 3 ++- > > ?1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > > index dda606a88059..cf70f86a4132 100644 > > --- a/boot/uboot/uboot.mk > > +++ b/boot/uboot/uboot.mk > > @@ -189,7 +189,8 @@ endif > > ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > > ?UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > > ?UBOOT_DEPENDENCIES += ti-k3-boot-firmware > > -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > > +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ > > Is the above actually still required with binman? > The names are hardcoded in U-Boot in arch/arm/dts/k3-am625-sk-binman.dtsi > > > + BINMAN_INDIRS=$(BINARIES_DIR) > > This seems to be the only required part. Correct. 'DM=' is no longer used, also see the official U-Boot build instructions for TI platforms in the SDK documentation [1] (technically speaking this documentation is for the U-Boot vendor tree, but the same principle applies to upstream U-Boot builds). Reviewed-by: Andreas Dannenberg [1] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html > > > ?endif > > ? > > ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > > -- > Alexander Sverdlin. > From yann.morin.1998 at free.fr Mon Feb 19 20:52:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 21:52:34 +0100 Subject: [Buildroot] [git commit] package/python-django: add patch to fix crash with .pyc-only builds Message-ID: <20240219205309.850AE87912@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85d1c86acabb07f7d8ace564ae68a64eb6335a62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Backport an upstream patch that fixes django auth and admin apps not working in .pyc only builds. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6148209453 Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- ...-Fixed-sensitive_variables-sensitive_post.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch new file mode 100644 index 0000000000..90dc9c7dd0 --- /dev/null +++ b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch @@ -0,0 +1,45 @@ +From d294b7679f2cb51c7231d6a7fb22e76eb74e49ec Mon Sep 17 00:00:00 2001 +From: Mariusz Felisiak +Date: Sat, 17 Feb 2024 08:15:59 +0100 +Subject: [PATCH] Fixed #35187 -- Fixed + @sensitive_variables/sensitive_post_parameters decorators crash with + .pyc-only builds. + +Thanks Jon Janzen for the implementation idea. + +Thanks Marcus Hoffmann for the report. + +Regression in 38e391e95fe5258bc6d2467332dc9cd44ce6ba52. +Backport of d1be05b3e9209fd0787841c71a95819d81061187 from main + +Signed-off-by: Marcus Hoffmann +Upstream: https://github.com/django/django/commit/41a4bba817f139f3cfd94f04e728e046560c9a18 +--- + django/views/decorators/debug.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py +index 7ea8a540de..6540fc0651 100644 +--- a/django/views/decorators/debug.py ++++ b/django/views/decorators/debug.py +@@ -47,7 +47,6 @@ def sensitive_variables(*variables): + + try: + file_path = inspect.getfile(wrapped_func) +- _, first_file_line = inspect.getsourcelines(wrapped_func) + except TypeError: # Raises for builtins or native functions. + raise ValueError( + f"{func.__name__} cannot safely be wrapped by " +@@ -55,7 +54,8 @@ def sensitive_variables(*variables): + "Python file (not a builtin or from a native extension)." + ) + else: +- key = hash(f"{file_path}:{first_file_line}") ++ first_line_number = wrapped_func.__code__.co_firstlineno ++ key = hash(f"{file_path}:{first_line_number}") + + if variables: + coroutine_functions_to_sensitive_variables[key] = variables +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 19 20:53:56 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 21:53:56 +0100 Subject: [Buildroot] [PATCH] package/python-django: add patch to fix crash with .pyc-only builds In-Reply-To: <20240219113028.607141-1-buildroot@bubu1.eu> References: <20240219113028.607141-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-19 12:30 +0100, Marcus Hoffmann via buildroot spake thusly: > Backport an upstream patch that fixes django auth and admin apps not > working in .pyc only builds. > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6148209453 > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Thanks for handling the report with upstream! ? Regards, Yann E. MORIN. > --- > ...d-sensitive_variables-sensitive_post.patch | 45 +++++++++++++++++++ > 1 file changed, 45 insertions(+) > create mode 100644 package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch > > diff --git a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch > new file mode 100644 > index 0000000000..90dc9c7dd0 > --- /dev/null > +++ b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch > @@ -0,0 +1,45 @@ > +From d294b7679f2cb51c7231d6a7fb22e76eb74e49ec Mon Sep 17 00:00:00 2001 > +From: Mariusz Felisiak > +Date: Sat, 17 Feb 2024 08:15:59 +0100 > +Subject: [PATCH] Fixed #35187 -- Fixed > + @sensitive_variables/sensitive_post_parameters decorators crash with > + .pyc-only builds. > + > +Thanks Jon Janzen for the implementation idea. > + > +Thanks Marcus Hoffmann for the report. > + > +Regression in 38e391e95fe5258bc6d2467332dc9cd44ce6ba52. > +Backport of d1be05b3e9209fd0787841c71a95819d81061187 from main > + > +Signed-off-by: Marcus Hoffmann > +Upstream: https://github.com/django/django/commit/41a4bba817f139f3cfd94f04e728e046560c9a18 > +--- > + django/views/decorators/debug.py | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py > +index 7ea8a540de..6540fc0651 100644 > +--- a/django/views/decorators/debug.py > ++++ b/django/views/decorators/debug.py > +@@ -47,7 +47,6 @@ def sensitive_variables(*variables): > + > + try: > + file_path = inspect.getfile(wrapped_func) > +- _, first_file_line = inspect.getsourcelines(wrapped_func) > + except TypeError: # Raises for builtins or native functions. > + raise ValueError( > + f"{func.__name__} cannot safely be wrapped by " > +@@ -55,7 +54,8 @@ def sensitive_variables(*variables): > + "Python file (not a builtin or from a native extension)." > + ) > + else: > +- key = hash(f"{file_path}:{first_file_line}") > ++ first_line_number = wrapped_func.__code__.co_firstlineno > ++ key = hash(f"{file_path}:{first_line_number}") > + > + if variables: > + coroutine_functions_to_sensitive_variables[key] = variables > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 19 20:55:02 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 21:55:02 +0100 Subject: [Buildroot] [git commit] package/systemd: needs sulogin for emergency target support Message-ID: <20240219210500.4CBC787950@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=613c817aefbaf5f62bf75437da61752a30348e8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master systemd invokes util-linux' sulogin via systemd-sulogin-shell[1] via emergency.service/emergency.target[2]. [1] https://github.com/systemd/systemd/blob/main/src/sulogin-shell/sulogin-shell.c [2] https://github.com/systemd/systemd/blob/main/units/emergency.service.in#L23 Signed-off-by: Marcus Hoffmann [yann.morin.1998 at free.fr: drop superfluous dependency comment] Signed-off-by: Yann E. MORIN --- package/systemd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 859332d9e4..aa5143d484 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -34,6 +34,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_FSCK + select BR2_PACKAGE_UTIL_LINUX_SULOGIN select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools select BR2_PACKAGE_KMOD_TOOLS From yann.morin.1998 at free.fr Mon Feb 19 21:06:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 22:06:19 +0100 Subject: [Buildroot] [PATCH] package/systemd: needs sulogin for emergency target support In-Reply-To: <20240219183828.1289275-1-buildroot@bubu1.eu> References: <20240219183828.1289275-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-19 19:38 +0100, Marcus Hoffmann via buildroot spake thusly: > systemd invokes util-linux' sulogin via systemd-sulogin-shell[1] via > emergency.service/emergency.target[2]. > > [1] https://github.com/systemd/systemd/blob/main/src/sulogin-shell/sulogin-shell.c > [2] https://github.com/systemd/systemd/blob/main/units/emergency.service.in#L23 I thinks that, technically, it could be content with sulogin from busybox, but since we already select a lot of util-linux' tools, adding sulogin is not goign to add much to the target size. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Marcus Hoffmann > --- > package/systemd/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 859332d9e4..58b4e51c6d 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -34,6 +34,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > select BR2_PACKAGE_UTIL_LINUX_AGETTY > select BR2_PACKAGE_UTIL_LINUX_MOUNT > select BR2_PACKAGE_UTIL_LINUX_FSCK > + select BR2_PACKAGE_UTIL_LINUX_SULOGIN # emergency target > select BR2_PACKAGE_KMOD > select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools > select BR2_PACKAGE_KMOD_TOOLS > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 19 21:06:44 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 22:06:44 +0100 Subject: [Buildroot] [git commit] package/systemd: bump to version 254.9 Message-ID: <20240219210711.8404F87956@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8ea853b8c923103a32fbc5f5b4ec5e46407cd33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index c0f4638803..e5588f06a2 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 1e1e42c597b4f992679aa964a0c5c23d970c58fed47aed65c11878b332dc5b23 systemd-254.6.tar.gz +sha256 3d23003ea886dbffa5bc84ad72c6edcbde62d32dbdec506e308624e1da509cb0 systemd-254.9.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 528fe60b1d..c6b006d1fb 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 254.6 +SYSTEMD_VERSION = 254.9 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From yann.morin.1998 at free.fr Mon Feb 19 21:14:52 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 22:14:52 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 254.9 In-Reply-To: <20240219182604.1287000-1-buildroot@bubu1.eu> References: <20240219182604.1287000-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-19 19:26 +0100, Marcus Hoffmann via buildroot spake thusly: > Signed-off-by: Marcus Hoffmann Ideally, a little blurb about what changed would be nice, to highlight critical fixes, or to just mention random fixes. I looked and there were no report of security fixes... I initially did not plan on pushing, but I forgot I had it applied localy, so it went in... I could have reverted, but that's a minor version bump with no report of security fixes, so it is good to have, I hope. Please watch the gitlab pipeline for any failure of the runtimet tests, just in case this minor version bump breaks anything. Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/systemd/systemd.hash | 2 +- > package/systemd/systemd.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash > index c0f4638803..e5588f06a2 100644 > --- a/package/systemd/systemd.hash > +++ b/package/systemd/systemd.hash > @@ -1,5 +1,5 @@ > # sha256 locally computed > -sha256 1e1e42c597b4f992679aa964a0c5c23d970c58fed47aed65c11878b332dc5b23 systemd-254.6.tar.gz > +sha256 3d23003ea886dbffa5bc84ad72c6edcbde62d32dbdec506e308624e1da509cb0 systemd-254.9.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 528fe60b1d..c6b006d1fb 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -19,7 +19,7 @@ > # - Diff sysusers.d with the previous version > # - Diff factory/etc/nsswitch.conf with the previous version > # (details are often sprinkled around in README and manpages) > -SYSTEMD_VERSION = 254.6 > +SYSTEMD_VERSION = 254.9 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ > LGPL-2.1+, \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 19 21:23:32 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 22:23:32 +0100 Subject: [Buildroot] [PATCH 0/2] Fix flutter build failure In-Reply-To: <20240219095155.2758428-1-anaumann@ultratronik.de> References: <20240219095155.2758428-1-anaumann@ultratronik.de> Message-ID: Andreas, All, On 2024-02-19 10:51 +0100, Andreas Naumann spake thusly: > Hello Adam, all, > I was motivated to give flutter a spin after your talk at FOSDEM, > however the recent bump to Python 3.12.1 broke some script during > the flutter-engine configure step. > Fortunately now a new major stable version has been released 3.19.0, > which contains a patch for this. > > After bumping engine and sdk they successfully build again, as does > creating the flutter bundles which you provided in > https://github.com/aduskett/buildroot-fosdem2024-flutter-demos > > I have not yet been able to run them using ivi-homescreen, but that's > probably due to my target display/wayland setup. > > However, the flutter-gallery no longer builds with 3.19, even after > bumping to the main HEAD. Their github README says > "NOTE: The Flutter Gallery is now deprecated, and no longer being active > maintained." > I thought about including a patch for removal of the gallery package, > but that would leave us with no example for how to create a flutter > bundle. The upstream repository has also been "archived", which means it is frozen and will never get fixed, ever. That's a bit unfortunate indeed, but we don't have much choice going forward: we'll have to drop that package in the near future, but not now: we're still considering reverting the python 3.12 version bump for 2024.02, as it still causes issues in the target==build case, which means we'd be able to keep the current flutter stack for 2024.02 LTS. Then, we can reintroduce python3, the flutter-engine bumps in this series, and drop flutter-gfallery, hopefully introducing another package as an example on how to build flutter packages... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From buildroot at bubu1.eu Mon Feb 19 21:30:36 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 19 Feb 2024 22:30:36 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 254.9 In-Reply-To: References: <20240219182604.1287000-1-buildroot@bubu1.eu> Message-ID: <04a28a98-2699-44b6-b5d5-697a1a6fe893@bubu1.eu> Hi Yann, On 19.02.24 22:14, Yann E. MORIN wrote: > Marcus, All, > > On 2024-02-19 19:26 +0100, Marcus Hoffmann via buildroot spake thusly: >> Signed-off-by: Marcus Hoffmann > > Ideally, a little blurb about what changed would be nice, to highlight > critical fixes, or to just mention random fixes. I looked and there were > no report of security fixes... I looked through the commits as well... on one hand there were too many to sensibly list them in the commit message (232 commits in total, IIRC) and on the other hand nothing really stood out besides "a random bunch of fixes", so I didn't know what to write :D. > > I initially did not plan on pushing, but I forgot I had it applied > localy, so it went in... I could have reverted, but that's a minor > version bump with no report of security fixes, so it is good to have, > I hope. > > Please watch the gitlab pipeline for any failure of the runtimet tests, > just in case this minor version bump breaks anything. So if I understood that correctly I can add myself as a maintainer of the runtime test files and I'll get an email when that test fails? Or is that not how it works? > > Applied to master, thanks. > > Regards, > Yann E. MORIN. Best, Marcus > >> --- >> package/systemd/systemd.hash | 2 +- >> package/systemd/systemd.mk | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash >> index c0f4638803..e5588f06a2 100644 >> --- a/package/systemd/systemd.hash >> +++ b/package/systemd/systemd.hash >> @@ -1,5 +1,5 @@ >> # sha256 locally computed >> -sha256 1e1e42c597b4f992679aa964a0c5c23d970c58fed47aed65c11878b332dc5b23 systemd-254.6.tar.gz >> +sha256 3d23003ea886dbffa5bc84ad72c6edcbde62d32dbdec506e308624e1da509cb0 systemd-254.9.tar.gz >> sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 >> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 >> sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt >> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >> index 528fe60b1d..c6b006d1fb 100644 >> --- a/package/systemd/systemd.mk >> +++ b/package/systemd/systemd.mk >> @@ -19,7 +19,7 @@ >> # - Diff sysusers.d with the previous version >> # - Diff factory/etc/nsswitch.conf with the previous version >> # (details are often sprinkled around in README and manpages) >> -SYSTEMD_VERSION = 254.6 >> +SYSTEMD_VERSION = 254.9 >> SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) >> SYSTEMD_LICENSE = \ >> LGPL-2.1+, \ >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From a.fatoum at pengutronix.de Mon Feb 19 21:06:28 2024 From: a.fatoum at pengutronix.de (Ahmad Fatoum) Date: Mon, 19 Feb 2024 22:06:28 +0100 Subject: [Buildroot] [PATCH] boot/barebox: install all barebox images if none were specified Message-ID: <20240219210628.407423-1-a.fatoum@pengutronix.de> When selecting barebox in menuconfig, BR2_TARGET_BAREBOX_IMAGE_FILE will be empty by default, which causes Buildroot to install whatever the barebox-flash-image symlink points at for barebox versions >= v2012.10.0. This is an outdated fallback, because barebox-flash-image is only valid when the barebox build produces a single binary. Virtually all new defconfigs added in the last couple of years are multiconfig (CONFIG_PBL_IMAGE=y) however, meaning that a single imx_v7_defconfig or multi_v8_defconfig will produce many images that support different boards or even platforms. As there is no single valid target for barebox-flash-image to point at in this case, this symlink will point at a non-existing 'multi-image-build' to alert the user to this fact. As replacement for barebox-flash-image, barebox commit 550cf79c216a ("Make list of flash images and fix link all single image cases") first released with v2015.12.0 creates a barebox-flash-images file with a list of all images built by barebox. Have buildroot use that file as a fallback before trying barebox-flash-image to have a fallback that works for any recent barebox defconfig as well. Signed-off-by: Ahmad Fatoum --- boot/barebox/barebox-aux/Config.in | 9 +++++++-- boot/barebox/barebox.mk | 2 ++ boot/barebox/barebox/Config.in | 9 +++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/boot/barebox/barebox-aux/Config.in b/boot/barebox/barebox-aux/Config.in index d39d24f763e0..4b0201ea6758 100644 --- a/boot/barebox/barebox-aux/Config.in +++ b/boot/barebox/barebox-aux/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_AUX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_AUX_CUSTOM_ENV bool "Generate an environment image" diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 4c9df8d6180b..fe366989b9d8 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -151,6 +151,8 @@ $(1)_IMAGE_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE)) define $(1)_INSTALL_IMAGES_CMDS if test -n "$$($(1)_IMAGE_FILES)"; then \ cp -L $$(foreach image,$$($(1)_IMAGE_FILES),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ + elif test -e $$(@D)/barebox-flash-images ; then \ + cp -L $$(foreach image,$$(shell cat $$(@D)/barebox-flash-images),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ elif test -h $$(@D)/barebox-flash-image ; then \ cp -L $$(@D)/barebox-flash-image $$(BINARIES_DIR)/barebox.bin ; \ else \ diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in index 958e294e40b6..2fd70a84aec3 100644 --- a/boot/barebox/barebox/Config.in +++ b/boot/barebox/barebox/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_BAREBOXENV bool "bareboxenv tool in target" -- 2.39.2 From kadambini.nema at gmail.com Mon Feb 19 21:34:02 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 13:34:02 -0800 Subject: [Buildroot] [PATCH 1/1] package/ustreamer: new package In-Reply-To: <20240212002607.12158-1-kadambini.nema@gmail.com> References: <20240212002607.12158-1-kadambini.nema@gmail.com> Message-ID: <20240219213402.186876-1-kadambini.nema@gmail.com> Lightweight and fast MJPEG-HTTP streamer (https://github.com/pikvm/ustreamer/tree/master#%C2%B5streamer) Signed-off-by: Kadambini Nema --- Changes v1 -> v2: - Fix 'make legal-info' with ustreamer package enabled. Changes v2 -> v3: - Fix a build failure with uclibc. (https://github.com/pikvm/ustreamer/commit/13af11a3a64cf9f08014e89f35e52e001fb10cad) - Upgrade to the latest version - 5.51 --- $ ./utils/test-pkg -k -c ustreamer.config -p ustreamer bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: SKIPPED 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- Signed-off-by: Kadambini Nema --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/ustreamer/Config.in | 17 +++++++++++++++++ package/ustreamer/ustreamer.hash | 3 +++ package/ustreamer/ustreamer.mk | 25 +++++++++++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 package/ustreamer/Config.in create mode 100644 package/ustreamer/ustreamer.hash create mode 100644 package/ustreamer/ustreamer.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..a6182777c0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1875,6 +1875,9 @@ F: package/easy-rsa/ N: Justin Maggard F: package/dtach/ +N: Kadambini Nema +F: package/ustreamer/ + N: Kamel Bouhara F: package/libodb-boost/ F: package/libodb-mysql/ diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..479c8b6657 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2595,6 +2595,7 @@ endif source "package/uredir/Config.in" source "package/ushare/Config.in" source "package/ussp-push/Config.in" + source "package/ustreamer/Config.in" source "package/vde2/Config.in" source "package/vdr/Config.in" source "package/vdr-plugin-vnsiserver/Config.in" diff --git a/package/ustreamer/Config.in b/package/ustreamer/Config.in new file mode 100644 index 0000000000..52c511e22d --- /dev/null +++ b/package/ustreamer/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_USTREAMER + bool "ustreamer" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 # V4L2_EVENT_SOURCE_CHANGE + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_ATOMIC + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBBSD + select BR2_PACKAGE_LIBGPIOD + help + Lightweight and fast MJPEG-HTTP streamer + + https://github.com/pikvm/ustreamer + +comment "ustreamer needs a toolchain w/ threads, headers >= 3.16, dynamic library" diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash new file mode 100644 index 0000000000..a8cb1695e5 --- /dev/null +++ b/package/ustreamer/ustreamer.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 88f107e02a0b5c6493d55ed1bce0c85f66ce83d2bc0271ff6319ad593c6584bc v5.51.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk new file mode 100644 index 0000000000..71de097a22 --- /dev/null +++ b/package/ustreamer/ustreamer.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# ustreamer +# +################################################################################ + +USTREAMER_VERSION = 5.51 +USTREAMER_SITE = $(call github,pikvm,ustreamer,refs/tags) +USTREAMER_SOURCE = v$(USTREAMER_VERSION).tar.gz +USTREAMER_SUBDIR = ustreamer +USTREAMER_LICENSE = GPL-3.0-or-later +USTREAMER_LICENSE_FILES = LICENSE +USTREAMER_DEPENDENCIES = jpeg libevent libbsd libgpiod +USTREAMER_CONF_ENV = "CFLAGS=$(TARGET_CFLAGS)" + +define USTREAMER_BUILD_CMDS + $(MAKE) $(if $(BR2_PACKAGE_SYSTEMD),WITH_SYSTEMD=1, ) WITH_PTHREAD_NP=1 WITH_SETPROCTITLE=1 HAS_PDEATHSIG=1 $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define USTREAMER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/ustreamer $(TARGET_DIR)/usr/bin/ustreamer + $(INSTALL) -D -m 0755 $(@D)/ustreamer-dump $(TARGET_DIR)/usr/bin/ustreamer-dump +endef + +$(eval $(generic-package)) -- 2.25.1 From romain.naour at smile.fr Mon Feb 19 21:34:52 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 22:34:52 +0100 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240219205157.5ukm426gmzbvn33f@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> <20240219205157.5ukm426gmzbvn33f@dasso> Message-ID: <63d28259-ff96-4450-bdc5-e1bc209d8e59@smile.fr> Hello Andreas, Le 19/02/2024 ? 21:51, Andreas Dannenberg a ?crit?: > On Sat, Feb 17, 2024 at 09:44:29PM +0100, Alexander Sverdlin wrote: >> Hi Dario, >> >> On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: >>> As explained in [1], adding support for AM62x LP SK in U-Boot, requires >>> binman for building bootloader images. The BINMAN_INDIRS environment >>> variable is used to provide a space-separated list of directories to >>> search for binary blobs. >>> >>> [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ >>> Signed-off-by: Dario Binacchi >>> >>> --- >>> >>> no changes since v1: >>> >>> Signed-off-by: Dario Binacchi >>> --- >>> ?boot/uboot/uboot.mk | 3 ++- >>> ?1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk >>> index dda606a88059..cf70f86a4132 100644 >>> --- a/boot/uboot/uboot.mk >>> +++ b/boot/uboot/uboot.mk >>> @@ -189,7 +189,8 @@ endif >>> ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) >>> ?UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) >>> ?UBOOT_DEPENDENCIES += ti-k3-boot-firmware >>> -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f >>> +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ >> >> Is the above actually still required with binman? >> The names are hardcoded in U-Boot in arch/arm/dts/k3-am625-sk-binman.dtsi >> >>> + BINMAN_INDIRS=$(BINARIES_DIR) >> >> This seems to be the only required part. > > Correct. 'DM=' is no longer used, also see the official U-Boot build > instructions for TI platforms in the SDK documentation [1] (technically > speaking this documentation is for the U-Boot vendor tree, but the same > principle applies to upstream U-Boot builds). > > Reviewed-by: Andreas Dannenberg > > [1] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html It means that we can remove BR2_TARGET_UBOOT_NEEDS_TI_K3_DM and UBOOT_TI_K3_DM_SOCNAME too. meta-ti still use DM= but probably to support u-boot-ti-staging_2023.04 that is still available [1]. The u-boot documentation also contains a similar note [2]. In the end we only need an option to select which SoC type we want to use (GP,HS,HS-FS). [1] https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc?h=cicd.master.202402130100#n52 [2] https://gitlab.com/u-boot/u-boot/-/blob/master/doc/board/ti/k3.rst?ref_type=heads&plain=1#L372 Best regards, Romain > > > >> >>> ?endif >>> ? >>> ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) >> >> -- >> Alexander Sverdlin. >> From kadambini.nema at gmail.com Mon Feb 19 21:54:58 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 13:54:58 -0800 Subject: [Buildroot] [PATCH 1/1] package dhcpdump: bump to version 1.9 In-Reply-To: References: Message-ID: <20240219215458.187716-1-kadambini.nema@gmail.com> - Change the site to a well maintained fork - https://github.com/bbonev/dhcpdump Signed-off-by: Kadambini Nema --- - Build test results ./utils/test-pkg -d br_test -k -c dhcpdump.config -p dhcpdump bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- Signed-off-by: Kadambini Nema --- ...Fix-build-with-gcc4.8-use-br-fortify.patch | 12 ++++++++++ .../0001-use-non-bsd-structures.patch | 23 ------------------- package/dhcpdump/Config.in | 2 +- package/dhcpdump/dhcpdump.hash | 2 +- package/dhcpdump/dhcpdump.mk | 5 ++-- 5 files changed, 17 insertions(+), 27 deletions(-) create mode 100644 package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch diff --git a/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch new file mode 100644 index 0000000000..c48d28c23d --- /dev/null +++ b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch @@ -0,0 +1,12 @@ +Upstream: None +Signed-off-by: Kadambini Nema +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2024-02-17 13:57:08.166161973 -0800 ++++ b/Makefile 2024-02-17 13:57:45.055153969 -0800 +@@ -1,5 +1,5 @@ + CFLAGS+=${CPPFLAGS} +-CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -g -O3 -fPIE ++CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -g -O3 -fPIE + LDFLAGS+=-g -Wl,-z,relro -Wl,-z,now -fPIE -pie + LIBS+=-lpcap + diff --git a/package/dhcpdump/0001-use-non-bsd-structures.patch b/package/dhcpdump/0001-use-non-bsd-structures.patch deleted file mode 100644 index 40115fb640..0000000000 --- a/package/dhcpdump/0001-use-non-bsd-structures.patch +++ /dev/null @@ -1,23 +0,0 @@ -The udphdr structure has uh_* fields when _FAVOR_BSD is -defined. Otherwise, the fields are just named source, dest, len and -check. See . - -Signed-off-by: Thomas Petazzoni - -Index: dhcpdump-1.8/dhcpdump.c -=================================================================== ---- dhcpdump-1.8.orig/dhcpdump.c 2011-05-17 20:20:46.506980003 +0200 -+++ dhcpdump-1.8/dhcpdump.c 2011-05-17 20:20:59.338979999 +0200 -@@ -163,10 +163,10 @@ - strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src)); - strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst)); - -- if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen))) -+ if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len))) - return; - -- printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen)); -+ printdata((u_char *)(sp + offset), ntohs(udp->len)); - } - - // check for matching CHADDR (Peter Apian-Bennewitz ) diff --git a/package/dhcpdump/Config.in b/package/dhcpdump/Config.in index e0abe040fc..30e42928e4 100644 --- a/package/dhcpdump/Config.in +++ b/package/dhcpdump/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_DHCPDUMP help A tool for monitoring dhcp requests using tcpdump. - http://www.mavetju.org/unix/general.php + https://github.com/bbonev/dhcpdump diff --git a/package/dhcpdump/dhcpdump.hash b/package/dhcpdump/dhcpdump.hash index a24db5b275..fdf3243ad1 100644 --- a/package/dhcpdump/dhcpdump.hash +++ b/package/dhcpdump/dhcpdump.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz +sha256 3658ac21cc33e79e72bed070454e49c543017991cb6c37f4253c85e9176869d1 dhcpdump-1.9.tar.xz sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk index ec9571c0af..4ce5047b2e 100644 --- a/package/dhcpdump/dhcpdump.mk +++ b/package/dhcpdump/dhcpdump.mk @@ -4,8 +4,9 @@ # ################################################################################ -DHCPDUMP_VERSION = 1.8 -DHCPDUMP_SITE = http://www.mavetju.org/download +DHCPDUMP_VERSION = 1.9 +DHCPDUMP_SITE = https://github.com/bbonev/dhcpdump/releases/download/v$(DHCPDUMP_VERSION) +DHCPDUMP_SOURCE = dhcpdump-$(DHCPDUMP_VERSION).tar.xz DHCPDUMP_DEPENDENCIES = libpcap DHCPDUMP_LICENSE = BSD-2-Clause DHCPDUMP_LICENSE_FILES = LICENSE -- 2.25.1 From ju.o at free.fr Mon Feb 19 22:14:58 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 19 Feb 2024 23:14:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/highway: bump to version 1.1.0 Message-ID: <20240219221458.831078-1-ju.o@free.fr> For release note, see [1]. This commit removes the package patch, as it is now included in this new release. LICENSE-BSD3 hash changed, due to reformatting. See [2]. [1] https://github.com/google/highway/releases/tag/1.1.0 [2] https://github.com/google/highway/commit/edc35d14c77cb24dc1163989c762d69694e0e955 Signed-off-by: Julien Olivain --- ...1-add-required-RISC-V-flags-to-CMake.patch | 42 ------------------- package/highway/highway.hash | 4 +- package/highway/highway.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/highway/0001-add-required-RISC-V-flags-to-CMake.patch diff --git a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch b/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch deleted file mode 100644 index bfcbfb055cb..00000000000 --- a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5d58d233fbcec0c6a39df8186a877329147324b3 Mon Sep 17 00:00:00 2001 -From: Mathieu Malaterre -Date: Wed, 13 Sep 2023 08:37:54 +0200 -Subject: [PATCH] Add an option to opt-out of HWY_RISCV - -Fixes #1740 - -Upstream: https://github.com/google/highway/commit/5d58d233fbcec0c6a39df8186a877329147324b3 -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c2bf57b3f5..be639c945f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,6 +61,9 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4 - # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. - set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?") - -+# Currently this will compile the entire codebase with `-march=rv64gcv1p0`: -+set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?") -+ - # Unconditionally adding -Werror risks breaking the build when new warnings - # arise due to compiler/platform changes. Enable this in CI/tests. - set(HWY_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Add -Werror flag?") -@@ -260,9 +263,11 @@ else() - # gcc(13) and recent clang both support V, but not yet runtime dispatch, so - # we add the gcv compiler flag, which then requires the CPU (now when using - # either compiler) to support V. -- list(APPEND HWY_FLAGS -march=rv64gcv1p0) -- if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -- list(APPEND HWY_FLAGS -menable-experimental-extensions) -+ if(HWY_CMAKE_RVV) -+ list(APPEND HWY_FLAGS -march=rv64gcv1p0) -+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -+ list(APPEND HWY_FLAGS -menable-experimental-extensions) -+ endif() - endif() - endif() - diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3cb497f20a7..270131134ec 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5 highway-1.0.7.tar.gz +sha256 354a8b4539b588e70b98ec70844273e3f2741302c4c377bcc4e81b3d1866f7c9 highway-1.1.0.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE -sha256 6dcc159f448e3aca73a15e355d0a6735ca3fd224abe637e0b7437dce2d24f765 LICENSE-BSD3 +sha256 d25e82e26acd42ca3ccc9993622631163425b869b9e16284226d534cff6470f2 LICENSE-BSD3 diff --git a/package/highway/highway.mk b/package/highway/highway.mk index b45fa8df74d..3eb0d7a4aa2 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.7 +HIGHWAY_VERSION = 1.1.0 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 or BSD-3-Clause HIGHWAY_LICENSE_FILES = LICENSE LICENSE-BSD3 -- 2.43.2 From romain.naour at smile.fr Mon Feb 19 22:27:41 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 23:27:41 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240219194207.pfonekdap7jagk3d@dasso> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <20240216200635.crek5j23p3hybg2p@dasso> <20240219194207.pfonekdap7jagk3d@dasso> Message-ID: <3dac4749-be3c-403a-9867-e7229f5dbf49@smile.fr> Hi Andreas, Le 19/02/2024 ? 20:42, Andreas Dannenberg a ?crit?: > Hi Romain, > > On Fri, Feb 16, 2024 at 10:38:42PM +0100, Romain Naour wrote: >> Hello Andreas, >> >> Le 16/02/2024 ? 21:06, Andreas Dannenberg a ?crit?: >>> On Thu, Feb 15, 2024 at 11:20:50AM +0100, Alexander Sverdlin wrote: >>>> Hi Romain, >>>> >>>> On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >>>>> -choice >>>>> - prompt "Security type" >>>>> - help >>>>> - ? The target SoC security type option for image gen.? Valid >>>>> - ? options are "gp" for General Purpose devices, "hs-fs" for >>>>> - ? High Security - Field Securable devices, or "hs" for High >>>>> - ? Security - Security Enforcing devices.? Note for all High >>>>> - ? Security device variants the TI_SECURE_DEV_PKG environmental >>>>> - ? variable must be defined at build time pointing to a valid >>>>> - ? core-secdev-k3 folder location, otherwise the build will >>>>> - ? fail, see >>>>> - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >>>>> - >>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>>> - bool "gp" >>>>> - >>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>>> - bool "hs-fs" >>>>> - >>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>>> - bool "hs" >>>>> - >>>>> -endchoice >>>> >>>> another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y >>>> was the default, which didn't boot on my HS-FS SoC. >>>> >>>> You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the >>>> default for AM62x. I'm not sure if this is a problem, though. >>> >>> HS-FS should be the default for all TI AM6x devices. This is our >>> "production silicon" and what's used for (almost) all projects, >>> especially new projects. This being said having support for GP device >>> variants still is desirable for existing boards/projects, such as the >>> current BeaglePlay boards (amongst earlier version of TI starter kit >>> EVMs for AM6x). >> >> Thank you, I was not aware of this. >> >> I found your post in the TI forum about the recent switch from GP to HS-FS >> device in Yocto [1]. >> >> Currently existing am64/am62 defconfigs are still targeting GP devices but we >> should add additional commits to do the switch to HS-FS. >> >> What about other SoC of the K3 architecture? >> Is the DRA829/J721e device will also switch to HS-FS by default? > > I needed to double-check with the team, since I'm only intimately > involved with AM62/AM64/AM65 type devices. All the others are managed by > a different group in TI. > > So based on what I found out here's the full context accross TI's K3 > platform of devices and their associated TI EVMs / Starter Kits: > > * All "Sitara"-brand SoCs (AM62x, AM64, AM65x) are HS-FS first > * All "Jacinto"-brand industrial SoCs (AM68, AM69 and AM67) are also HS-FS first > * All new "Jacinto"-brand automotive/other SoCs (J7AEN onwards) are HS-FS first > * All existing "Jacinto"-brand SoCs (TDA4, J721E, J7200, J721S2 and J784S4) are GP by default > > So while there are still boards out there with GP silicon (last bullet) > those are probably not the typical target platforms for Buildroot, being > very complex and high-end multi-core SoCs, mostly used in automotive > applications. The one exception here that has more weight in my oppinion > is the current BeaglePlay board (AM62x-based), those also have GP devices > on those boards. I'm curently working on a j721e SoC based custom board bringup involving IPC communication with one DSP (C66x). While it was possible to build the DSP firmware within Yocto (dunfell), it required to package the TI-PDK to provide headers and libraries for the DSP project. We endup by building the DSP firmware outside of Yocto (it would be the same with Buildroot). If the SoC is available and can run Linux, the the rootfs can be build by Buildroot. And what about the Beagleboard-AI64 (J721e) ? https://beagleboard.org/ai-64 > > All this being being said, I stand by my previous comment that HS-FS > should be the default. As for the BeaglePlay board (which is a very nice > community board) and potentially selected Jacinto-based boards this > could potentially be handled with a dedicated defconfig or some other > Kconfig magic to enable a seamless and easy out of box experience. Patch welcome then :) I don't have one but it would go hand in hand with my (old) beagleboard rev C2 (omap3530)! Best regards, Romain > > > -- > Andreas Dannenberg > Texas Instruments Inc > > > > > > > >> >> From the u-boot k3 documentation, it's not clear witch device type is used by >> default across all k3 SoC. By default I was expecting the GP type for all the k3 >> family (I was wrong). >> >> [1] >> https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto >> >> [2] >> https://source.denx.de/u-boot/u-boot/-/blob/master/doc/board/ti/k3.rst?ref_type=heads&plain=1#L108 >> >> Best regards, >> Romain >> >>> >>> -- >>> Andreas Dannenberg >>> Texas Instruments Inc >>> >>> >>>> >>>> -- >>>> Alexander Sverdlin. >>>> >>>> _______________________________________________ >>>> buildroot mailing list >>>> buildroot at buildroot.org >>>> https://lists.buildroot.org/mailman/listinfo/buildroot >> From patrick.oppenlander at gmail.com Mon Feb 19 22:42:07 2024 From: patrick.oppenlander at gmail.com (Patrick Oppenlander) Date: Tue, 20 Feb 2024 09:42:07 +1100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <4a8d7f2252b46118554a9e22c49901822e461f2f.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <4a8d7f2252b46118554a9e22c49901822e461f2f.camel@gmail.com> Message-ID: On Sun, 18 Feb 2024 at 04:40, Alexander Sverdlin wrote: > > Hi Dario! > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > This series, which in my humble opinion, should have been immediately > > considered to correct the compilation errors in case of HS-FS devcies, has > > seen an increase in patches in version 4 to remove the ti-k3-image-gen > > I wasn't aware of the preceeding versions, but... > > > package thanks to Binman. Additionally, it shares some modifications and > > views on how to implement certain changes with the series > > https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > > Therefore, I think it is necessary not to run them in parallel but to decide > > whether to merge one before the other or to consider a single series where > > the patches can be coherent with each other. I am available for both solutions. > > Let me know. > > ... as the broken HS-FS went unnoticed, seems there is no rush to fix the > build now? I noticed, and hacked in some am64x specific fixes here: https://github.com/relectrify/buildroot/commits/2023.11.1_relectrify. I was going to submit a cleaned up version of the patches, but I got distracted by fixing encrypted boot (see below) and never got back to cleaning them up. Sorry about that. Apparently TI don't support encrypted boot in their Linux SDK (yet?), only in the MCU SDK. There's a python script in the MCU SDK (rom_image_gen.py) which kinda works once you teach it how to read ascii keys as generated by the keywriter package. Except, it changes the size of the plaintext because it aligns it to 16-bytes and appends 32 random bytes, which causes a boot failure somewhere early on in U-Boot. I hacked around that by sticking the original binary size into some of those random bytes (it's not part of the X509 cert..) and teaching U-Boot to detect the encrypted image (https://github.com/relectrify/u-boot/commit/d16b4705ffebb0881633dfd5300bf4ac8490e75c) and doing a fixup. Once you do that, and change all the right places to run rom_image_gen.py it works, but it's pretty painful to get there. Hopefully this situation is a bit better in the binman version. Patrick From dannenberg at ti.com Tue Feb 20 00:41:00 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 18:41:00 -0600 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> Message-ID: <20240220004100.3yzqapeplx6olarz@dasso> On Mon, Feb 19, 2024 at 12:24:52PM +0100, Romain Naour wrote: > Hello Michael, > > Le 19/02/2024 ? 12:02, Michael Nazzareno Trimarchi a ?crit?: > > Hi Romain > > > > On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: > >> > >> Hello Dario, > >> > >> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > >>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes > >>> high-security field-securable (HS-FS) silicon to optionally customize keys > >>> and encryption for security applications. > >>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > >>> which, however, was buggy. This series fixes the errors and bumps the Linux > >>> kernel and U-Boot required for such a new device. > >>> > >>> This series, which in my humble opinion, should have been immediately > >>> considered to correct the compilation errors in case of HS-FS devcies, has > >>> seen an increase in patches in version 4 to remove the ti-k3-image-gen > >>> package thanks to Binman. Additionally, it shares some modifications and > >>> views on how to implement certain changes with the series > >>> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > >>> Therefore, I think it is necessary not to run them in parallel but to decide > >>> whether to merge one before the other or to consider a single series where > >>> the patches can be coherent with each other. I am available for both solutions. > >>> Let me know. > >> > >> Thanks for this new version. I beleive both series should be merged into one > >> since we want to follow u-boot switch to binman, add more TI K3 SoC support and > >> keeping exising am62x ans am64x working in GP or HS/HS-FS. > >> > > > > Because the Dario patchset was sent before (end of November), it's > > reasonable to review and adjust that one > > and apply your changes for ti_j721e_sk on top of it. It think that is > > a standard way to make people happy about > > their work and contribution. > > Actually, the two series are about the same topic: TI K3 SoC support (GP, HS, > HS-FS) not only AM62x-SK HS-FS devices > > But due to the complexity of the BSP, the boot flow (4 way to boot!) and the > switch from custom tool to binman... this series is really difficult to review > without having a good understanding of TI K3 architecture peculiarity and having > one of each TI evaluation boards ? Although I helped conceive some of this and the associated tooling early on, some of the what may look strange architectural decisions were driven by different use cases and requirements for the different devices (especially around automotive fast/early boot, but also security) in combination with limited on-chip SRAM... So this where we are at now. A future AM6x device variant will have yet another boot flow, but I can already say it will be very much simplified over what we have today :) > The series (based on Dario's work) about ti_j721e_sk suggested to remove TI > custom tools replaced by binman along with other improvements. > > I'll way for v5 and rebase the ti_j721e_sk on top of it. Thank you Romain for your buy-in. Let's focus on getting Dario's series in good shape and then move onto yours. I'd also like to re-introduce graphics (I had that working before) but I need to wait for all the "baseline" stuff to settle first. -- Andreas Dannenberg Texas Instruments Inc > > Best regards, > Romain > > > > > > Michael > > > >> My main concern is to avoid adding a new package for a tool that is already > >> deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. > >> > >> Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". > >> > >> [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html > >> > >> Best regards, > >> Romain > >> > >>> > >>> Dario Binacchi (20): > >>> configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > >>> setting > >>> configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > >>> setting > >>> configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > >>> version > >>> configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > >>> version > >>> boot/ti-k3-r5-loader: bump to version 2024.01 > >>> boot/ti-k3-core-secdev: new package > >>> boot/ti-k3-image-gen: manage HS hardware > >>> package/python-jsonschema: add host variant > >>> package/python-attrs: add host variant > >>> package/python-referencing: add host variant > >>> package/python-rpds-py: add host variant > >>> package/python-jsonschema-specifications: add host variant > >>> boot/ti-k3-r5-loader: set binman environment > >>> boot/uboot: set BINMAN_INDIRS for TI K3 DM > >>> configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > >>> configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 > >>> boot: move ti-k3-* packages to 'ti-k3' directory > >>> boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > >>> boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > >>> configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore > >>> > >>> DEVELOPERS | 1 + > >>> board/ti/am62x-sk/genimage.cfg | 7 +- > >>> board/ti/am62x-sk/post-build.sh | 49 ++++++++++++ > >>> board/ti/am62x-sk/post-image.sh | 5 ++ > >>> boot/Config.in | 4 +- > >>> boot/ti-k3-image-gen/Config.in | 77 ------------------- > >>> boot/ti-k3/Config.in | 59 ++++++++++++++ > >>> boot/ti-k3/common.mk | 1 + > >>> .../{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 > >>> .../ti-k3-boot-firmware.hash | 0 > >>> .../ti-k3-boot-firmware.mk | 0 > >>> boot/ti-k3/ti-k3-core-secdev/Config.in | 9 +++ > >>> .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 + > >>> .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 ++++++ > >>> boot/ti-k3/ti-k3-image-gen/Config.in | 25 ++++++ > >>> .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 > >>> .../ti-k3-image-gen/ti-k3-image-gen.mk | 20 ++++- > >>> boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 4 +- > >>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- > >>> .../ti-k3-r5-loader/ti-k3-r5-loader.mk | 16 +++- > >>> boot/uboot/Config.in | 7 +- > >>> boot/uboot/uboot.mk | 3 +- > >>> configs/ti_am62x_sk_defconfig | 23 +++--- > >>> configs/ti_am64x_sk_defconfig | 8 +- > >>> package/python-attrs/python-attrs.mk | 6 ++ > >>> .../python-jsonschema-specifications.mk | 5 ++ > >>> .../python-jsonschema/python-jsonschema.mk | 6 ++ > >>> .../python-referencing/python-referencing.mk | 5 ++ > >>> package/python-rpds-py/python-rpds-py.mk | 1 + > >>> 29 files changed, 263 insertions(+), 105 deletions(-) > >>> create mode 100755 board/ti/am62x-sk/post-build.sh > >>> create mode 100755 board/ti/am62x-sk/post-image.sh > >>> delete mode 100644 boot/ti-k3-image-gen/Config.in > >>> create mode 100644 boot/ti-k3/Config.in > >>> create mode 100644 boot/ti-k3/common.mk > >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) > >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) > >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) > >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/Config.in > >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash > >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk > >>> create mode 100644 boot/ti-k3/ti-k3-image-gen/Config.in > >>> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) > >>> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (67%) > >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (97%) > >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (54%) > >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (85%) > >>> > >> > From dannenberg at ti.com Tue Feb 20 01:28:48 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 19:28:48 -0600 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> Message-ID: <20240220012848.76amyog5pecsgld4@dasso> Romain, Dario, On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: > Hello Dario, > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > > Recent versions of U-Boot can use Binman to compile and sign the generated > > binaries, thus making the use of custom tools like ti-k3-image-gen no > > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > > configured and used outside of it. This patch allows setting such options > > even if the package is not enabled. > > I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux > kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. There were discussions/suggestions around this before by Yann E Morin [1] and Thomas Petazzoni [2]. I think the gist of it was to move the selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing all the K3 SoC specific selections. And then other packages and Kconfig menues can depend on it more cleanly. Like it's currently done with package/freescale-imx/Config.in. This would also bring some consistency in how those NXP and TI device families are managed, which will make for a better end-user experience I think. -- Andreas Dannenberg Texas Instruments Inc [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html > > Best regards, > Romain > > > > > > --- > > > > Added in v4 > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3/Config.in | 46 ++++++++++++++ > > boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > > boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > > boot/uboot/Config.in | 7 +-- > > configs/ti_am62x_sk_defconfig | 2 +- > > configs/ti_am64x_sk_defconfig | 2 +- > > 6 files changed, 59 insertions(+), 67 deletions(-) > > > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > > index 06dda2f156a9..9e508326c9c8 100644 > > --- a/boot/ti-k3/Config.in > > +++ b/boot/ti-k3/Config.in > > @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > > > > if BR2_TARGET_TI_K3 > > > > +choice > > + prompt "SoC family" > > + > > +config BR2_TARGET_TI_K3_SOC_AM62AX > > + bool "am62ax" > > + > > +config BR2_TARGET_TI_K3_SOC_AM62X > > + bool "am62x" > > + > > +config BR2_TARGET_TI_K3_SOC_AM64X > > + bool "am64x" > > + > > +config BR2_TARGET_TI_K3_SOC_AM65X > > + bool "am65x" > > + > > +endchoice > > + > > +choice > > + prompt "Security type" > > + help > > + The target SoC security type option. > > + > > +config BR2_TARGET_TI_K3_SECTYPE_GP > > + bool "gp" > > + > > +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > > + bool "hs-fs" > > + > > +config BR2_TARGET_TI_K3_SECTYPE_HS > > + bool "hs" > > + > > +endchoice > > + > > +config BR2_TARGET_TI_K3_SOC > > + string > > + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > > + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > > + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > > + > > +config BR2_TARGET_TI_K3_SECTYPE > > + string > > + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > > + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > > + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > > + > > source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > > source "boot/ti-k3/ti-k3-core-secdev/Config.in" > > source "boot/ti-k3/ti-k3-image-gen/Config.in" > > diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > > index 38d1598d9fc0..2d53d62dd4ee 100644 > > --- a/boot/ti-k3/ti-k3-image-gen/Config.in > > +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > > @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > bool "ti-k3-image-gen" > > depends on BR2_TARGET_TI_K3_R5_LOADER > > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > > # We need FIT support in uboot-tools, which is why we select a > > # host package > > select BR2_PACKAGE_HOST_UBOOT_TOOLS > > @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > > > if BR2_TARGET_TI_K3_IMAGE_GEN > > -choice > > - prompt "SoC family" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - bool "am62ax" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - bool "am62x" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - bool "am64x" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > - bool "am65x" > > - > > -endchoice > > - > > -choice > > - prompt "Security type" > > - help > > - The target SoC security type option for image gen. Valid > > - options are "gp" for General Purpose devices, "hs-fs" for > > - High Security - Field Securable devices, or "hs" for High > > - Security - Security Enforcing devices. Note for all High > > - Security device variants the TI_SECURE_DEV_PKG environmental > > - variable must be defined at build time pointing to a valid > > - core-secdev-k3 folder location, otherwise the build will > > - fail, see > > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > - bool "gp" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > - bool "hs-fs" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > - bool "hs" > > - > > -endchoice > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > > - string > > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > > string > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > > - string > > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > > > > endif > > diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > index 74b4fcb4bf89..834d8f7d5cd5 100644 > > --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > > $(BR2_MAKE_HOST_DEPENDENCY) > > > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > > > -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > > TI_K3_IMAGE_GEN_SYSFW = \ > > $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > else > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > > index beafb38930db..1a9d21e7c6d1 100644 > > --- a/boot/uboot/Config.in > > +++ b/boot/uboot/Config.in > > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > bool "U-Boot needs TI K3 Device Manager (DM)" > > # We use the SoC selection defined for the ti-k3-image-gen > > # package > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > > help > > Some TI K3 devices need the Device Manager (DM) firmware to > > be available for the U-Boot build. > > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > > > config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > > string > > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > > > > endif > > > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > > index cd26235342e4..cfefce0a77a4 100644 > > --- a/configs/ti_am62x_sk_defconfig > > +++ b/configs/ti_am62x_sk_defconfig > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > > BR2_TARGET_TI_K3=y > > +BR2_TARGET_TI_K3_SOC_AM62X=y > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > > BR2_TARGET_TI_K3_R5_LOADER=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > > index 1befeb4ab96c..daf78dbffff8 100644 > > --- a/configs/ti_am64x_sk_defconfig > > +++ b/configs/ti_am64x_sk_defconfig > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > > BR2_TARGET_TI_K3=y > > +BR2_TARGET_TI_K3_SOC_AM64X=y > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > > BR2_TARGET_TI_K3_R5_LOADER=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > From dannenberg at ti.com Tue Feb 20 02:00:11 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 20:00:11 -0600 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <63d28259-ff96-4450-bdc5-e1bc209d8e59@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> <20240219205157.5ukm426gmzbvn33f@dasso> <63d28259-ff96-4450-bdc5-e1bc209d8e59@smile.fr> Message-ID: <20240220020011.x7mfxcs5oxbr5s3d@dasso> On Mon, Feb 19, 2024 at 10:34:52PM +0100, Romain Naour wrote: > Hello Andreas, > > Le 19/02/2024 ? 21:51, Andreas Dannenberg a ?crit?: > > On Sat, Feb 17, 2024 at 09:44:29PM +0100, Alexander Sverdlin wrote: > >> Hi Dario, > >> > >> On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > >>> As explained in [1], adding support for AM62x LP SK in U-Boot, requires > >>> binman for building bootloader images. The BINMAN_INDIRS environment > >>> variable is used to provide a space-separated list of directories to > >>> search for binary blobs. > >>> > >>> [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > >>> Signed-off-by: Dario Binacchi > >>> > >>> --- > >>> > >>> no changes since v1: > >>> > >>> Signed-off-by: Dario Binacchi > >>> --- > >>> ?boot/uboot/uboot.mk | 3 ++- > >>> ?1 file changed, 2 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > >>> index dda606a88059..cf70f86a4132 100644 > >>> --- a/boot/uboot/uboot.mk > >>> +++ b/boot/uboot/uboot.mk > >>> @@ -189,7 +189,8 @@ endif > >>> ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > >>> ?UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > >>> ?UBOOT_DEPENDENCIES += ti-k3-boot-firmware > >>> -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > >>> +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ > >> > >> Is the above actually still required with binman? > >> The names are hardcoded in U-Boot in arch/arm/dts/k3-am625-sk-binman.dtsi > >> > >>> + BINMAN_INDIRS=$(BINARIES_DIR) > >> > >> This seems to be the only required part. > > > > Correct. 'DM=' is no longer used, also see the official U-Boot build > > instructions for TI platforms in the SDK documentation [1] (technically > > speaking this documentation is for the U-Boot vendor tree, but the same > > principle applies to upstream U-Boot builds). > > > > Reviewed-by: Andreas Dannenberg > > > > [1] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html > > It means that we can remove BR2_TARGET_UBOOT_NEEDS_TI_K3_DM and > UBOOT_TI_K3_DM_SOCNAME too. > > meta-ti still use DM= but probably to support u-boot-ti-staging_2023.04 that is > still available [1]. > > The u-boot documentation also contains a similar note [2]. Yes you are right, this option is still available as an override. But best will be to standardize on the new way of doing things, which is BINMAN_INDIRS. > In the end we only need an option to select which SoC type we want to use > (GP,HS,HS-FS). Yes. There's one small twist to that, technically for HS devices (a.k.a. "HS-SE" devices), which is what an HS-FS device turns into _after_ the fuses are burned with a custom key, the end user will need to provide their own key for signing the boot image, which will then be used instead of './board/ti/keys/custMpk.pem' in the U-Boot tree. Let me think about some more if there isn't a good way that can be done through Builroot, based on how actual end customers manage their private keys (which can be very elaborate, even involving HSMs in some cases). It might be helpful to expose such an override using a config option that can be used to point to an external key. Anyways just food for thought, this shouldn't gate anything on Dario's series here. -- Andreas Dannenberg Texas Instruments Inc > > [1] > https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc?h=cicd.master.202402130100#n52 > > [2] > https://gitlab.com/u-boot/u-boot/-/blob/master/doc/board/ti/k3.rst?ref_type=heads&plain=1#L372 > > Best regards, > Romain > > > > > > > > >> > >>> ?endif > >>> ? > >>> ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > >> > >> -- > >> Alexander Sverdlin. > >> > From jan.kraval at gmail.com Tue Feb 20 05:19:25 2024 From: jan.kraval at gmail.com (Jan Kraval) Date: Tue, 20 Feb 2024 06:19:25 +0100 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-lite: switch to extlinux Message-ID: <20240220051926.68559-1-jan.kraval@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Jan Kraval --- board/orangepi/orangepi-lite/boot.cmd | 8 ----- board/orangepi/orangepi-lite/genimage.cfg | 37 ----------------------- configs/orangepi_lite_defconfig | 12 +++----- 3 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 board/orangepi/orangepi-lite/boot.cmd delete mode 100644 board/orangepi/orangepi-lite/genimage.cfg diff --git a/board/orangepi/orangepi-lite/boot.cmd b/board/orangepi/orangepi-lite/boot.cmd deleted file mode 100644 index 5c29dabfe8..0000000000 --- a/board/orangepi/orangepi-lite/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-lite.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-lite/genimage.cfg b/board/orangepi/orangepi-lite/genimage.cfg deleted file mode 100644 index b422a751a8..0000000000 --- a/board/orangepi/orangepi-lite/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi Lite -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-lite.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index e834816456..eff5af938b 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -4,6 +4,9 @@ BR2_ARM_FPU_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" @@ -11,6 +14,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-lite/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-lite" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RTL8189FS=y BR2_PACKAGE_WIRELESS_TOOLS=y @@ -25,15 +29,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-lite/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite/genimage.cfg" -- 2.39.2 From jan.kraval at gmail.com Tue Feb 20 05:19:26 2024 From: jan.kraval at gmail.com (Jan Kraval) Date: Tue, 20 Feb 2024 06:19:26 +0100 Subject: [Buildroot] [PATCH 2/2] configs/orangepi_lite: bump kernel and u-boot versions In-Reply-To: <20240220051926.68559-1-jan.kraval@gmail.com> References: <20240220051926.68559-1-jan.kraval@gmail.com> Message-ID: <20240220051926.68559-2-jan.kraval@gmail.com> Bump Linux to 6.6 and U-Boot to 2024.01. Signed-off-by: Jan Kraval --- configs/orangepi_lite_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index eff5af938b..1bb1bf3ad1 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite" BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" @@ -9,11 +9,11 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.16" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-lite/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-lite" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-orangepi-lite" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RTL8189FS=y @@ -26,7 +26,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -- 2.39.2 From martink at posteo.de Tue Feb 20 07:32:51 2024 From: martink at posteo.de (Martin Kepplinger) Date: Tue, 20 Feb 2024 07:32:51 +0000 Subject: [Buildroot] [PATCH 1/1] package/tslib: bump version to 1.23 Message-ID: <20240220073251.251521-1-martink@posteo.de> Release notes from https://github.com/libts/tslib/releases : This release includes libts version 0.10.5 and the following changes: * new filter module: module crop * some build and security fixes * improved release procedure Signed-off-by: Martin Kepplinger --- package/tslib/tslib.hash | 4 ++-- package/tslib/tslib.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index 762fbebb26..6fe35633aa 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,5 +1,5 @@ -# https://github.com/libts/tslib/releases/download/1.22/tslib-1.22.tar.xz.sha256 -sha256 aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a tslib-1.22.tar.xz +# https://github.com/libts/tslib/releases/download/1.23/tslib-1.23.tar.xz.sha256 +sha256 9b489a54d48006201f2fe955a88c3f857535ac93b6cf8e5a16c7b166c8991dac tslib-1.23.tar.xz # Locally computed sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 45e29808bd..e8eb3beeaf 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.22 +TSLIB_VERSION = 1.23 TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) @@ -29,7 +29,8 @@ TSLIB_CONF_OPTS += \ --enable-skip=static \ --enable-lowpass=static \ --enable-invert=static \ - --enable-evthres=static + --enable-evthres=static \ + --enable-crop=static endif $(eval $(autotools-package)) -- 2.39.2 From arnout at mind.be Fri Feb 16 19:55:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 16 Feb 2024 20:55:22 +0100 Subject: [Buildroot] [PATCH 1/2] support/testing: remove hardcoded sleep from python-django test In-Reply-To: <10542b7e-f7d5-4197-ae19-ba94706c6595@bubu1.eu> References: <20240216131815.318315-1-buildroot@bubu1.eu> <10542b7e-f7d5-4197-ae19-ba94706c6595@bubu1.eu> Message-ID: <90a0135a-90ad-4379-8f76-8f23cc009176@mind.be> On 16/02/2024 14:23, Marcus Hoffmann via buildroot wrote: > On 16.02.24 14:18, Marcus Hoffmann via buildroot wrote: >> Instead of waiting for a hardcoded time of 30s we check periodically every >> second if the server is already up. If it isn't up after the full timeout >> (which is the same as before) expired the test fails. >> >> We need to redirect all output of the background started task to >> /dev/null now as it otherwise confuses the emulator.run() exit code >> parsing logic (as it gets out of order messages from the emulator). >> >> Signed-off-by: Marcus Hoffmann >> --- >> ? .../tests/package/test_python_django.py??????? | 18 ++++++++++++------ >> ? 1 file changed, 12 insertions(+), 6 deletions(-) >> >> diff --git a/support/testing/tests/package/test_python_django.py >> b/support/testing/tests/package/test_python_django.py >> index e1ca50f6d8..0973467a2a 100644 >> --- a/support/testing/tests/package/test_python_django.py >> +++ b/support/testing/tests/package/test_python_django.py >> @@ -1,3 +1,5 @@ >> +import time >> + >> ? from tests.package.test_python import TestPythonPackageBase >> @@ -16,13 +18,17 @@ class TestPythonDjango(TestPythonPackageBase): >> ????????? self.assertIn("Operations to perform:", output[0]) >> ????????? self.assertEqual(exit_code, 0) >> -??????? cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py >> runserver 0.0.0.0:1234 & " >> -??????? # give some time to setup the server >> -??????? cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) >> +??????? cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py >> runserver 0.0.0.0:1234 > /dev/null 2>&1 & " >> ????????? self.assertRunOk(cmd, timeout=timeout) >> - >> -??????? cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" >> -??????? self.assertRunOk(cmd) >> +??????? # give some time to setup the server >> +??????? for attempt in range(30 * self.emulator.timeout_multiplier): >> +??????????? time.sleep(1) >> +??????????? cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" >> +??????????? _, exit_code = self.emulator.run(cmd) >> +??????????? if exit_code == 0: >> +??????????????? break >> +??????? else: >> +??????????? self.assertTrue(False, "Timeout while waiting for django server") >> ? class TestPythonPy3Django(TestPythonDjango): > > The django test (and the whitenoise test introduced in the next patch) actually > both currently fail because of a problem with django 5.0 and .pyc only > installations. [1] > > This now has "release blocker" priority at django and a proposed patch (that I > tested locally but hasn't been officially submitted to django yet) so hopefully > this will be fixed with the next django point release in a couple of weeks. Ugh, and we're cutting 2024.02-rc1 right about now... I guess you can submit that patch directly to Buildroot then? Or is the point release going to be a minor one that we can still apply to the master branch in the rc period? Regards, Arnout > > [1] https://code.djangoproject.com/ticket/35187 > > Marcus > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From dario.binacchi at amarulasolutions.com Tue Feb 20 09:05:34 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 20 Feb 2024 10:05:34 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240220012848.76amyog5pecsgld4@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> <20240220012848.76amyog5pecsgld4@dasso> Message-ID: Hi Andreas, Romain, All On Tue, Feb 20, 2024 at 2:28?AM Andreas Dannenberg wrote: > > Romain, Dario, > > On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: > > Hello Dario, > > > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > > > Recent versions of U-Boot can use Binman to compile and sign the generated > > > binaries, thus making the use of custom tools like ti-k3-image-gen no > > > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > > > configured and used outside of it. This patch allows setting such options > > > even if the package is not enabled. > > > > I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux > > kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. > > There were discussions/suggestions around this before by Yann E Morin > [1] and Thomas Petazzoni [2]. I think the gist of it was to move the > selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing > all the K3 SoC specific selections. And then other packages and Kconfig > menues can depend on it more cleanly. Like it's currently done with > package/freescale-imx/Config.in. This would also bring some consistency > in how those NXP and TI device families are managed, which will make for > a better end-user experience I think. If I'm not mistaken, I think the patches: [18/20] boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope [17/20] boot: move ti-k3-* packages to 'ti-k3' directory Are heading in the direction of what we find in package/freescale-imx/, with the only difference being that in our case, we're under boot. So, can I consider these two patches correct? Thanks and regards, Dario > > > > -- > Andreas Dannenberg > Texas Instruments Inc > > [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html > [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html > > > > > > Best regards, > > Romain > > > > > > > > > > --- > > > > > > Added in v4 > > > > > > Signed-off-by: Dario Binacchi > > > --- > > > boot/ti-k3/Config.in | 46 ++++++++++++++ > > > boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > > > boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > > > boot/uboot/Config.in | 7 +-- > > > configs/ti_am62x_sk_defconfig | 2 +- > > > configs/ti_am64x_sk_defconfig | 2 +- > > > 6 files changed, 59 insertions(+), 67 deletions(-) > > > > > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > > > index 06dda2f156a9..9e508326c9c8 100644 > > > --- a/boot/ti-k3/Config.in > > > +++ b/boot/ti-k3/Config.in > > > @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > > > > > > if BR2_TARGET_TI_K3 > > > > > > +choice > > > + prompt "SoC family" > > > + > > > +config BR2_TARGET_TI_K3_SOC_AM62AX > > > + bool "am62ax" > > > + > > > +config BR2_TARGET_TI_K3_SOC_AM62X > > > + bool "am62x" > > > + > > > +config BR2_TARGET_TI_K3_SOC_AM64X > > > + bool "am64x" > > > + > > > +config BR2_TARGET_TI_K3_SOC_AM65X > > > + bool "am65x" > > > + > > > +endchoice > > > + > > > +choice > > > + prompt "Security type" > > > + help > > > + The target SoC security type option. > > > + > > > +config BR2_TARGET_TI_K3_SECTYPE_GP > > > + bool "gp" > > > + > > > +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > > > + bool "hs-fs" > > > + > > > +config BR2_TARGET_TI_K3_SECTYPE_HS > > > + bool "hs" > > > + > > > +endchoice > > > + > > > +config BR2_TARGET_TI_K3_SOC > > > + string > > > + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > > > + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > > > + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > > > + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > > > + > > > +config BR2_TARGET_TI_K3_SECTYPE > > > + string > > > + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > > > + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > > > + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > > > + > > > source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > > > source "boot/ti-k3/ti-k3-core-secdev/Config.in" > > > source "boot/ti-k3/ti-k3-image-gen/Config.in" > > > diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > > > index 38d1598d9fc0..2d53d62dd4ee 100644 > > > --- a/boot/ti-k3/ti-k3-image-gen/Config.in > > > +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > > > @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > > bool "ti-k3-image-gen" > > > depends on BR2_TARGET_TI_K3_R5_LOADER > > > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > > - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > > > # We need FIT support in uboot-tools, which is why we select a > > > # host package > > > select BR2_PACKAGE_HOST_UBOOT_TOOLS > > > @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > > > > > if BR2_TARGET_TI_K3_IMAGE_GEN > > > -choice > > > - prompt "SoC family" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > > - bool "am62ax" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > > - bool "am62x" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > > - bool "am64x" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > > - bool "am65x" > > > - > > > -endchoice > > > - > > > -choice > > > - prompt "Security type" > > > - help > > > - The target SoC security type option for image gen. Valid > > > - options are "gp" for General Purpose devices, "hs-fs" for > > > - High Security - Field Securable devices, or "hs" for High > > > - Security - Security Enforcing devices. Note for all High > > > - Security device variants the TI_SECURE_DEV_PKG environmental > > > - variable must be defined at build time pointing to a valid > > > - core-secdev-k3 folder location, otherwise the build will > > > - fail, see > > > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > > - bool "gp" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > > - bool "hs-fs" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > > - bool "hs" > > > - > > > -endchoice > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > > > - string > > > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > > > > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > > > string > > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > > > - string > > > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > > > > > > endif > > > diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > > index 74b4fcb4bf89..834d8f7d5cd5 100644 > > > --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > > +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > > @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > > > $(BR2_MAKE_HOST_DEPENDENCY) > > > > > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > > > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > > > > > -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > > +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > > > TI_K3_IMAGE_GEN_SYSFW = \ > > > $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > > else > > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > > > index beafb38930db..1a9d21e7c6d1 100644 > > > --- a/boot/uboot/Config.in > > > +++ b/boot/uboot/Config.in > > > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > > bool "U-Boot needs TI K3 Device Manager (DM)" > > > # We use the SoC selection defined for the ti-k3-image-gen > > > # package > > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > > + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > > > help > > > Some TI K3 devices need the Device Manager (DM) firmware to > > > be available for the U-Boot build. > > > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > > > > > config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > > > string > > > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > > + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > > > + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > > > > > > endif > > > > > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > > > index cd26235342e4..cfefce0a77a4 100644 > > > --- a/configs/ti_am62x_sk_defconfig > > > +++ b/configs/ti_am62x_sk_defconfig > > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > > > BR2_TARGET_TI_K3=y > > > +BR2_TARGET_TI_K3_SOC_AM62X=y > > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > > > BR2_TARGET_TI_K3_R5_LOADER=y > > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > > > index 1befeb4ab96c..daf78dbffff8 100644 > > > --- a/configs/ti_am64x_sk_defconfig > > > +++ b/configs/ti_am64x_sk_defconfig > > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > > > BR2_TARGET_TI_K3=y > > > +BR2_TARGET_TI_K3_SOC_AM64X=y > > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > > > BR2_TARGET_TI_K3_R5_LOADER=y > > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From romain.naour at smile.fr Tue Feb 20 09:32:14 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 10:32:14 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> <20240220012848.76amyog5pecsgld4@dasso> Message-ID: Hi Dario, Le 20/02/2024 ? 10:05, Dario Binacchi a ?crit?: > Hi Andreas, Romain, All > > On Tue, Feb 20, 2024 at 2:28?AM Andreas Dannenberg wrote: >> >> Romain, Dario, >> >> On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: >>> Hello Dario, >>> >>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>>> Recent versions of U-Boot can use Binman to compile and sign the generated >>>> binaries, thus making the use of custom tools like ti-k3-image-gen no >>>> longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were >>>> configured and used outside of it. This patch allows setting such options >>>> even if the package is not enabled. >>> >>> I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux >>> kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. >> >> There were discussions/suggestions around this before by Yann E Morin >> [1] and Thomas Petazzoni [2]. I think the gist of it was to move the >> selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing >> all the K3 SoC specific selections. And then other packages and Kconfig >> menues can depend on it more cleanly. Like it's currently done with >> package/freescale-imx/Config.in. This would also bring some consistency >> in how those NXP and TI device families are managed, which will make for >> a better end-user experience I think. > > If I'm not mistaken, I think the patches: > [18/20] boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > [17/20] boot: move ti-k3-* packages to 'ti-k3' directory > Are heading in the direction of what we find in > package/freescale-imx/, with the only difference being > that in our case, we're under boot. > So, can I consider these two patches correct? Yes, can you try to move ti-k3 to package directory in V5 ? It would also be used later by the GPU rogue firmwares. Please add a comment in the commit log that we make an exception to the rule "no subdirectory in package directory". Thanks! Best regards, Romain > > Thanks and regards, > Dario > >> >> >> >> -- >> Andreas Dannenberg >> Texas Instruments Inc >> >> [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html >> [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html >> >> >>> >>> Best regards, >>> Romain >>> >>> >>>> >>>> --- >>>> >>>> Added in v4 >>>> >>>> Signed-off-by: Dario Binacchi >>>> --- >>>> boot/ti-k3/Config.in | 46 ++++++++++++++ >>>> boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- >>>> boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- >>>> boot/uboot/Config.in | 7 +-- >>>> configs/ti_am62x_sk_defconfig | 2 +- >>>> configs/ti_am64x_sk_defconfig | 2 +- >>>> 6 files changed, 59 insertions(+), 67 deletions(-) >>>> >>>> diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in >>>> index 06dda2f156a9..9e508326c9c8 100644 >>>> --- a/boot/ti-k3/Config.in >>>> +++ b/boot/ti-k3/Config.in >>>> @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 >>>> >>>> if BR2_TARGET_TI_K3 >>>> >>>> +choice >>>> + prompt "SoC family" >>>> + >>>> +config BR2_TARGET_TI_K3_SOC_AM62AX >>>> + bool "am62ax" >>>> + >>>> +config BR2_TARGET_TI_K3_SOC_AM62X >>>> + bool "am62x" >>>> + >>>> +config BR2_TARGET_TI_K3_SOC_AM64X >>>> + bool "am64x" >>>> + >>>> +config BR2_TARGET_TI_K3_SOC_AM65X >>>> + bool "am65x" >>>> + >>>> +endchoice >>>> + >>>> +choice >>>> + prompt "Security type" >>>> + help >>>> + The target SoC security type option. >>>> + >>>> +config BR2_TARGET_TI_K3_SECTYPE_GP >>>> + bool "gp" >>>> + >>>> +config BR2_TARGET_TI_K3_SECTYPE_HS_FS >>>> + bool "hs-fs" >>>> + >>>> +config BR2_TARGET_TI_K3_SECTYPE_HS >>>> + bool "hs" >>>> + >>>> +endchoice >>>> + >>>> +config BR2_TARGET_TI_K3_SOC >>>> + string >>>> + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX >>>> + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X >>>> + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X >>>> + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X >>>> + >>>> +config BR2_TARGET_TI_K3_SECTYPE >>>> + string >>>> + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP >>>> + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS >>>> + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS >>>> + >>>> source "boot/ti-k3/ti-k3-boot-firmware/Config.in" >>>> source "boot/ti-k3/ti-k3-core-secdev/Config.in" >>>> source "boot/ti-k3/ti-k3-image-gen/Config.in" >>>> diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in >>>> index 38d1598d9fc0..2d53d62dd4ee 100644 >>>> --- a/boot/ti-k3/ti-k3-image-gen/Config.in >>>> +++ b/boot/ti-k3/ti-k3-image-gen/Config.in >>>> @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >>>> bool "ti-k3-image-gen" >>>> depends on BR2_TARGET_TI_K3_R5_LOADER >>>> select BR2_TARGET_TI_K3_BOOT_FIRMWARE >>>> - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS >>>> # We need FIT support in uboot-tools, which is why we select a >>>> # host package >>>> select BR2_PACKAGE_HOST_UBOOT_TOOLS >>>> @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >>>> https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ >>>> >>>> if BR2_TARGET_TI_K3_IMAGE_GEN >>>> -choice >>>> - prompt "SoC family" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>> - bool "am62ax" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>> - bool "am62x" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>> - bool "am64x" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>> - bool "am65x" >>>> - >>>> -endchoice >>>> - >>>> -choice >>>> - prompt "Security type" >>>> - help >>>> - The target SoC security type option for image gen. Valid >>>> - options are "gp" for General Purpose devices, "hs-fs" for >>>> - High Security - Field Securable devices, or "hs" for High >>>> - Security - Security Enforcing devices. Note for all High >>>> - Security device variants the TI_SECURE_DEV_PKG environmental >>>> - variable must be defined at build time pointing to a valid >>>> - core-secdev-k3 folder location, otherwise the build will >>>> - fail, see >>>> - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>> - bool "gp" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>> - bool "hs-fs" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>> - bool "hs" >>>> - >>>> -endchoice >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC >>>> - string >>>> - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>> - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>> - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>> - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>> >>>> config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE >>>> string >>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE >>>> - string >>>> - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>> - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>> - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX >>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X >>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X >>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X >>>> >>>> endif >>>> diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>> index 74b4fcb4bf89..834d8f7d5cd5 100644 >>>> --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>> +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>> @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ >>>> $(BR2_MAKE_HOST_DEPENDENCY) >>>> >>>> TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) >>>> -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) >>>> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) >>>> +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) >>>> +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) >>>> >>>> -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) >>>> +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) >>>> TI_K3_IMAGE_GEN_SYSFW = \ >>>> $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >>>> else >>>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in >>>> index beafb38930db..1a9d21e7c6d1 100644 >>>> --- a/boot/uboot/Config.in >>>> +++ b/boot/uboot/Config.in >>>> @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM >>>> bool "U-Boot needs TI K3 Device Manager (DM)" >>>> # We use the SoC selection defined for the ti-k3-image-gen >>>> # package >>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN >>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>> + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X >>>> help >>>> Some TI K3 devices need the Device Manager (DM) firmware to >>>> be available for the U-Boot build. >>>> @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM >>>> >>>> config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME >>>> string >>>> - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>> - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>> + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX >>>> + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X >>>> >>>> endif >>>> >>>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >>>> index cd26235342e4..cfefce0a77a4 100644 >>>> --- a/configs/ti_am62x_sk_defconfig >>>> +++ b/configs/ti_am62x_sk_defconfig >>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y >>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" >>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" >>>> BR2_TARGET_TI_K3=y >>>> +BR2_TARGET_TI_K3_SOC_AM62X=y >>>> BR2_TARGET_TI_K3_IMAGE_GEN=y >>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y >>>> BR2_TARGET_TI_K3_R5_LOADER=y >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" >>>> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig >>>> index 1befeb4ab96c..daf78dbffff8 100644 >>>> --- a/configs/ti_am64x_sk_defconfig >>>> +++ b/configs/ti_am64x_sk_defconfig >>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y >>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" >>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" >>>> BR2_TARGET_TI_K3=y >>>> +BR2_TARGET_TI_K3_SOC_AM64X=y >>>> BR2_TARGET_TI_K3_IMAGE_GEN=y >>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y >>>> BR2_TARGET_TI_K3_R5_LOADER=y >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" >>> > > > From romain.naour at smile.fr Tue Feb 20 10:03:54 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 11:03:54 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240220004100.3yzqapeplx6olarz@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> <20240220004100.3yzqapeplx6olarz@dasso> Message-ID: <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> Hello Andreas, Le 20/02/2024 ? 01:41, Andreas Dannenberg a ?crit?: > On Mon, Feb 19, 2024 at 12:24:52PM +0100, Romain Naour wrote: >> Hello Michael, >> >> Le 19/02/2024 ? 12:02, Michael Nazzareno Trimarchi a ?crit?: >>> Hi Romain >>> >>> On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: >>>> >>>> Hello Dario, >>>> >>>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>>>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes >>>>> high-security field-securable (HS-FS) silicon to optionally customize keys >>>>> and encryption for security applications. >>>>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, >>>>> which, however, was buggy. This series fixes the errors and bumps the Linux >>>>> kernel and U-Boot required for such a new device. >>>>> >>>>> This series, which in my humble opinion, should have been immediately >>>>> considered to correct the compilation errors in case of HS-FS devcies, has >>>>> seen an increase in patches in version 4 to remove the ti-k3-image-gen >>>>> package thanks to Binman. Additionally, it shares some modifications and >>>>> views on how to implement certain changes with the series >>>>> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. >>>>> Therefore, I think it is necessary not to run them in parallel but to decide >>>>> whether to merge one before the other or to consider a single series where >>>>> the patches can be coherent with each other. I am available for both solutions. >>>>> Let me know. >>>> >>>> Thanks for this new version. I beleive both series should be merged into one >>>> since we want to follow u-boot switch to binman, add more TI K3 SoC support and >>>> keeping exising am62x ans am64x working in GP or HS/HS-FS. >>>> >>> >>> Because the Dario patchset was sent before (end of November), it's >>> reasonable to review and adjust that one >>> and apply your changes for ti_j721e_sk on top of it. It think that is >>> a standard way to make people happy about >>> their work and contribution. >> >> Actually, the two series are about the same topic: TI K3 SoC support (GP, HS, >> HS-FS) not only AM62x-SK HS-FS devices >> >> But due to the complexity of the BSP, the boot flow (4 way to boot!) and the >> switch from custom tool to binman... this series is really difficult to review >> without having a good understanding of TI K3 architecture peculiarity and having >> one of each TI evaluation boards ? > > Although I helped conceive some of this and the associated tooling early > on, some of the what may look strange architectural decisions were driven > by different use cases and requirements for the different devices > (especially around automotive fast/early boot, but also security) in > combination with limited on-chip SRAM... So this where we are at now. A > future AM6x device variant will have yet another boot flow, but I can > already say it will be very much simplified over what we have today :) About existing boot flow, I found two recent commit in u-boot that state that the "Split binary" (that requires sysfw.itb) is already a legacy boot flow: arm: dts: k3-binman: Add support for FIT templates Add templates for FIT images used extensively across K3 boards with most of the code common. This includes the FIT portions of: - tispl.bin - u-boot.img - sysfw.itb (in case of legacy boot flow) https://gitlab.com/u-boot/u-boot/-/commit/b153bad0f14168d5fcc02ba6bf1a2cd98daba9b5 arm: dts: k3-*-binman: Move to using templated FITs Reduce redundancy in code by using templates to generate the A72 boot binaries (tispl.bin and u-boot.img) as well as R5 boot binary sysfw.itb (for legacy boot following devices J721E and AM65x). https://gitlab.com/u-boot/u-boot/-/commit/4509b9ff0b8cb26907f9e9c3571b43565c859275 Which one should be recommended or avoided for a new design? Best regards, Romain > >> The series (based on Dario's work) about ti_j721e_sk suggested to remove TI >> custom tools replaced by binman along with other improvements. >> >> I'll way for v5 and rebase the ti_j721e_sk on top of it. > > Thank you Romain for your buy-in. Let's focus on getting Dario's series > in good shape and then move onto yours. I'd also like to re-introduce > graphics (I had that working before) but I need to wait for all the > "baseline" stuff to settle first. > > > -- > Andreas Dannenberg > Texas Instruments Inc > > > >> >> Best regards, >> Romain >> >> >>> >>> Michael >>> >>>> My main concern is to avoid adding a new package for a tool that is already >>>> deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. >>>> >>>> Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". >>>> >>>> [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html >>>> >>>> Best regards, >>>> Romain >>>> >>>>> From bugzilla at busybox.net Tue Feb 20 11:33:44 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 20 Feb 2024 11:33:44 +0000 Subject: [Buildroot] [Bug 15952] New: Grub fails to load large rootfs files Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15952 Bug ID: 15952 Summary: Grub fails to load large rootfs files Product: buildroot Version: 2023.11.1 Hardware: PC OS: Linux Status: NEW Severity: critical Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: ian_ormshaw at waters.com CC: buildroot at uclibc.org Target Milestone: --- Created attachment 9715 --> https://bugs.busybox.net/attachment.cgi?id=9715&action=edit Patch file In some systems grub fails to load the rootfs.cpio as an initrd if it is too large. On the system I am currently testing a 61MB file load successfully while a 174MB file does not. With the larger file grub outputs an out of memory error. The attached patch file allows the system to boot successfully. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Feb 20 11:36:00 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 20 Feb 2024 11:36:00 +0000 Subject: [Buildroot] [Bug 15952] Grub fails to load large rootfs files In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15952 Dr I J Ormshaw changed: What |Removed |Added ---------------------------------------------------------------------------- Host| |x86_64 Target| |x86_64 -- You are receiving this mail because: You are on the CC list for the bug. From buildroot at bubu1.eu Tue Feb 20 13:20:28 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 20 Feb 2024 14:20:28 +0100 Subject: [Buildroot] [PATCH 0/2] Fix flutter build failure In-Reply-To: References: <20240219095155.2758428-1-anaumann@ultratronik.de> Message-ID: Hi Andreas, Yann, all On 19.02.24 22:23, Yann E. MORIN wrote: > Andreas, All, > > On 2024-02-19 10:51 +0100, Andreas Naumann spake thusly: >> Hello Adam, all, >> I was motivated to give flutter a spin after your talk at FOSDEM, >> however the recent bump to Python 3.12.1 broke some script during >> the flutter-engine configure step. >> Fortunately now a new major stable version has been released 3.19.0, >> which contains a patch for this. >> >> After bumping engine and sdk they successfully build again, as does >> creating the flutter bundles which you provided in >> https://github.com/aduskett/buildroot-fosdem2024-flutter-demos >> >> I have not yet been able to run them using ivi-homescreen, but that's >> probably due to my target display/wayland setup. >> >> However, the flutter-gallery no longer builds with 3.19, even after >> bumping to the main HEAD. Their github README says >> "NOTE: The Flutter Gallery is now deprecated, and no longer being active >> maintained." >> I thought about including a patch for removal of the gallery package, >> but that would leave us with no example for how to create a flutter >> bundle. > > The upstream repository has also been "archived", which means it is > frozen and will never get fixed, ever. > > That's a bit unfortunate indeed, but we don't have much choice going > forward: we'll have to drop that package in the near future, but not > now: we're still considering reverting the python 3.12 version bump for > 2024.02, as it still causes issues in the target==build case, which > means we'd be able to keep the current flutter stack for 2024.02 LTS. > > Then, we can reintroduce python3, the flutter-engine bumps in this > series, and drop flutter-gfallery, hopefully introducing another package > as an example on how to build flutter packages... The archived repo page links to https://github.com/gskinnerTeam/flutter-wonderous-app and https://github.com/flutter/samples/tree/main/material_3_demo as replacement showcases. I wonder how long these will last... :-/. Marcus From buildroot at bubu1.eu Tue Feb 20 15:19:30 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 20 Feb 2024 16:19:30 +0100 Subject: [Buildroot] [PATCH] package/c-ares: bump to version 1.26.0 Message-ID: <20240220151931.2141682-1-buildroot@bubu1.eu> Changelog: https://c-ares.org/changelog.html#1_26_0 Signed-off-by: Marcus Hoffmann --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index c2897f6e44..ee097a53c9 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 de24a314844cb157909730828560628704f4f896d167dd7da0fa2fb93ea18b10 c-ares-1.20.1.tar.gz +sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz # Hash for license file sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 586fde9afb..29da6baa4b 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.20.1 +C_ARES_VERSION = 1.26.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom -- 2.34.1 From bugzilla at busybox.net Tue Feb 20 16:27:14 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 20 Feb 2024 16:27:14 +0000 Subject: [Buildroot] [Bug 15952] Grub fails to load large rootfs files In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15952 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |INVALID CC| |yann.morin.1998 at free.fr Status|NEW |RESOLVED --- Comment #1 from Yann E. MORIN --- Dr I J Ormshaw, All, This is a grub limitation, so please work with grub upstream to lift that limitation. Once they have accepted a fix, then we can see whether we can backport it or not. Regards, Yann E. MORIN. -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Tue Feb 20 16:44:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 17:44:18 +0100 Subject: [Buildroot] [git commit] support/testing: remove hardcoded sleep from python-django test Message-ID: <20240220164504.ED86387965@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc3f1faa8b8339a72da45efeeb3085045002ca28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Instead of waiting for a hardcoded time of 30s we check periodically every second if the server is already up. If it isn't up after the full timeout (which is the same as before) expired the test fails. We need to redirect all output of the background started task to /dev/null now as it otherwise confuses the emulator.run() exit code parsing logic (as it gets out of order messages from the emulator). Signed-off-by: Marcus Hoffmann yann.morin.1998 at free.fr: simplify assert test] Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_python_django.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py index e1ca50f6d8..29e8ee0b2e 100644 --- a/support/testing/tests/package/test_python_django.py +++ b/support/testing/tests/package/test_python_django.py @@ -1,3 +1,5 @@ +import time + from tests.package.test_python import TestPythonPackageBase @@ -16,13 +18,16 @@ class TestPythonDjango(TestPythonPackageBase): self.assertIn("Operations to perform:", output[0]) self.assertEqual(exit_code, 0) - cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " - # give some time to setup the server - cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 > /dev/null 2>&1 & " self.assertRunOk(cmd, timeout=timeout) - - cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" - self.assertRunOk(cmd) + # give some time to setup the server + for attempt in range(30 * self.emulator.timeout_multiplier): + time.sleep(1) + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" + _, exit_code = self.emulator.run(cmd) + if exit_code == 0: + break + self.assertEqual(exit_code, 0, "Timeout while waiting for django server") class TestPythonPy3Django(TestPythonDjango): From yann.morin.1998 at free.fr Tue Feb 20 16:46:49 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 17:46:49 +0100 Subject: [Buildroot] [PATCH 1/2] support/testing: remove hardcoded sleep from python-django test In-Reply-To: <20240216131815.318315-1-buildroot@bubu1.eu> References: <20240216131815.318315-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-16 14:18 +0100, Marcus Hoffmann via buildroot spake thusly: > Instead of waiting for a hardcoded time of 30s we check periodically every > second if the server is already up. If it isn't up after the full timeout > (which is the same as before) expired the test fails. > > We need to redirect all output of the background started task to > /dev/null now as it otherwise confuses the emulator.run() exit code > parsing logic (as it gets out of order messages from the emulator). > > Signed-off-by: Marcus Hoffmann > --- > .../tests/package/test_python_django.py | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py > index e1ca50f6d8..0973467a2a 100644 > --- a/support/testing/tests/package/test_python_django.py > +++ b/support/testing/tests/package/test_python_django.py > @@ -1,3 +1,5 @@ > +import time > + > from tests.package.test_python import TestPythonPackageBase > > > @@ -16,13 +18,17 @@ class TestPythonDjango(TestPythonPackageBase): > self.assertIn("Operations to perform:", output[0]) > self.assertEqual(exit_code, 0) > > - cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " > - # give some time to setup the server > - cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) > + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 > /dev/null 2>&1 & " > self.assertRunOk(cmd, timeout=timeout) > - > - cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" > - self.assertRunOk(cmd) > + # give some time to setup the server > + for attempt in range(30 * self.emulator.timeout_multiplier): > + time.sleep(1) > + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" > + _, exit_code = self.emulator.run(cmd) > + if exit_code == 0: > + break > + else: > + self.assertTrue(False, "Timeout while waiting for django server") I was not very happy that we test success against a constant that we know is false; this does not look great.. Instead, I've slightly simplified the test: I dropped the else clause of the for-loop, and added an asserEqual that the exit_code is indeed 0 after the loop. Applied to master, thanks. Regards, Yann E. MORIN. > > class TestPythonPy3Django(TestPythonDjango): > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd at kuhls.net Tue Feb 20 18:02:24 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Tue, 20 Feb 2024 19:02:24 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Bernd Kuhls to dnsmasq In-Reply-To: <20240220180224.42576-1-bernd@kuhls.net> References: <20240220180224.42576-1-bernd@kuhls.net> Message-ID: <20240220180224.42576-2-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index ba18d830d2..b9ca7eb647 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -350,6 +350,7 @@ F: package/bitcoin/ F: package/clamav/ F: package/dav1d/ F: package/dht/ +F: package/dnsmasq/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ -- 2.39.2 From bernd at kuhls.net Tue Feb 20 18:02:23 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Tue, 20 Feb 2024 19:02:23 +0100 Subject: [Buildroot] [PATCH 1/2] package/dnsmasq: security bump version to 2.90 Message-ID: <20240220180224.42576-1-bernd@kuhls.net> Changelog: https://thekelleys.org.uk/dnsmasq/CHANGELOG Release notes: https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q1/017430.html Fixes CVE 2023-50387 and CVE 2023-50868. Removed patch which is included in this release. Switched _SITE to https. Signed-off-by: Bernd Kuhls --- ...default-maximum-dns-udp-package-size.patch | 64 ------------------- package/dnsmasq/dnsmasq.hash | 4 +- package/dnsmasq/dnsmasq.mk | 4 +- 3 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch deleted file mode 100644 index 4dd17ec069..0000000000 --- a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch +++ /dev/null @@ -1,64 +0,0 @@ -From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Tue, 7 Mar 2023 22:07:46 +0000 -Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. -Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 - -http://www.dnsflagday.net/2020/ refers. - -Thanks to Xiang Li for the prompt. - -[dalang at gmx.at: backport from upstream] -Signed-off-by: Daniel Lang ---- - CHANGELOG | 9 ++++++++ - man/dnsmasq.8 | 3 ++- - src/config.h | 2 +- - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 3af20cf..52d8678 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -1,3 +1,12 @@ version 2.90 -+version 2.90 -+ Set the default maximum DNS UDP packet sice to 1232. This -+ has been the recommended value since 2020 because it's the -+ largest value that avoid fragmentation, and fragmentation -+ is just not reliable on the modern internet, especially -+ for IPv6. It's still possible to override this with -+ --edns-packet-max for special circumstances. -+ -+ - version 2.89 - Fix bug introduced in 2.88 (commit fe91134b) which can result - in corruption of the DNS cache internal data structures and -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 41e2e04..5acb935 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. - .TP - .B \-P, --edns-packet-max= - Specify the largest EDNS.0 UDP packet which is supported by the DNS --forwarder. Defaults to 4096, which is the RFC5625-recommended size. -+forwarder. Defaults to 1232, which is the recommended size following the -+DNS flag day in 2020. Only increase if you know what you are doing. - .TP - .B \-Q, --query-port= - Send outbound DNS queries from, and listen for their replies on, the -diff --git a/src/config.h b/src/config.h -index 1e7b30f..37b374e 100644 ---- a/src/config.h -+++ b/src/config.h -@@ -19,7 +19,7 @@ - #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ - #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ - #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ --#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ -+#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ - #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ - #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ - #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ --- -2.20.1 diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 02ffb2656b..d11e8af590 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc -sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc +sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 9c05857f22..9f342cb049 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,9 +4,9 @@ # ################################################################################ -DNSMASQ_VERSION = 2.89 +DNSMASQ_VERSION = 2.90 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz -DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq +DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ -- 2.39.2 From bernd at kuhls.net Tue Feb 20 18:07:08 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Tue, 20 Feb 2024 19:07:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/unbound: security bump version to 1.19.1 Message-ID: <20240220180708.55442-1-bernd@kuhls.net> Release notes: https://nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ Fixes CVE-2023-50387 & CVE-2023-50868. Signed-off-by: Bernd Kuhls --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 91e1d82dd2..843026abc7 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 -sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 +sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index fa7884e937..5128d0e420 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.17.1 +UNBOUND_VERSION = 1.19.1 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl -- 2.39.2 From bernd at kuhls.net Tue Feb 20 18:50:30 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Tue, 20 Feb 2024 19:50:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/bind: security bump version to 9.16.48 Message-ID: <20240220185030.92016-1-bernd@kuhls.net> Changelog: https://ftp.isc.org/isc/bind9/9.16.48/CHANGES Version 9.16.46 fixes - CVE-2023-4408 - CVE-2023-5517 - CVE-2023-5679 - CVE-2023-6516 Version 9.16.47 fixes CVE-2023-50387. Signed-off-by: Bernd Kuhls --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index d500b61128..482b046c8d 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.44/bind-9.16.44.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 cfaa953c36d5ca42d9584fcf9653d07c85527b59687e7c4d4cb8071272db6754 bind-9.16.44.tar.xz +sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 03ffcbec42..0d81ffabd6 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.44 +BIND_VERSION = 9.16.48 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. -- 2.39.2 From fontaine.fabrice at gmail.com Tue Feb 20 19:05:53 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 20 Feb 2024 20:05:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/ltris: drop unrecognized option Message-ID: <20240220190553.3237-1-fontaine.fabrice@gmail.com> --enable-sound has been dropped since version 1.2.4 and https://sourceforge.net/p/lgames/code/432: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-static, --disable-shared, --enable-sound Fixes: 61848605cd26d29f54c16de862aedba7cf334be4 Signed-off-by: Fabrice Fontaine --- package/ltris/ltris.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index 98902de44c..b34ac142ce 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -18,12 +18,9 @@ LTRIS_CONF_ENV = \ ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y) LTRIS_DEPENDENCIES += sdl_mixer host-pkgconf -LTRIS_CONF_OPTS += --enable-sound # configure script does NOT use pkg-config to figure out how to link # with sdl_mixer, breaking static linking as sdl_mixer can use libmad LTRIS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs SDL_mixer` -else -LTRIS_CONF_OPTS += --disable-sound endif $(eval $(autotools-package)) -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 20 19:50:07 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 20 Feb 2024 20:50:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/uacme: fix build Message-ID: <20240220195007.380433-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.7.5 in commit b7ee5f3b0e3ef703bafd007cc99da10312d99b9e and https://github.com/ndilieto/uacme/commit/fe826f4b1931ae508047d8b2693b5b6ac2cb21fd: checking if mmap(MAP_ANON|MAP_SHARED) works... configure: error: in `/home/autobuild/autobuild/instance-9/output-1/build/uacme-1.7.5': configure: error: cannot run test program while cross compiling Fixes: b7ee5f3b0e3ef703bafd007cc99da10312d99b9e - http://autobuild.buildroot.org/results/9715ade98f4894c07b640d151daa41813d2bec3a Signed-off-by: Fabrice Fontaine --- .../uacme/0001-Fix-cross-compilation.patch | 29 +++++++++++++++++++ package/uacme/uacme.mk | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 package/uacme/0001-Fix-cross-compilation.patch diff --git a/package/uacme/0001-Fix-cross-compilation.patch b/package/uacme/0001-Fix-cross-compilation.patch new file mode 100644 index 0000000000..cc384f2c36 --- /dev/null +++ b/package/uacme/0001-Fix-cross-compilation.patch @@ -0,0 +1,29 @@ +From cdf63e24dc475a558400c68714e32d32904e4c57 Mon Sep 17 00:00:00 2001 +From: Nicola Di Lieto +Date: Tue, 20 Feb 2024 01:05:00 +0100 +Subject: [PATCH] Fix cross compilation + +Commit fe826f4b1931ae508047d8b2693b5b6ac2cb21fd broke cross compilation + +Closes https://github.com/ndilieto/uacme/issues/79 + +Upstream: https://github.com/ndilieto/uacme/commit/cdf63e24dc475a558400c68714e32d32904e4c57 +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 77d1230..3bec75b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -355,7 +355,8 @@ if test "x$OPT_UALPN" != "xno"; then + AC_DEFINE(HAVE_MAP_DEVZERO, 1, [if mmap("/dev/zero", MAP_SHARED) works]) + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([ualpn requires MAP_ANON or mmap("/dev/zero", MAP_SHARED)])), ++ AC_MSG_ERROR([ualpn requires MAP_ANON or mmap("/dev/zero", MAP_SHARED)])) ++ ], [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include + int main() {return mmap(0, 4096, PROT_READ|PROT_WRITE, + MAP_ANON|MAP_SHARED, -1, 0) == MAP_FAILED;}])], diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index f02e522761..cd670ee951 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -12,6 +12,8 @@ UACME_SITE = $(call github,ndilieto,uacme,upstream/$(UACME_VERSION)) UACME_LICENSE = GPL-3.0+ UACME_LICENSE_FILES = COPYING UACME_DEPENDENCIES = libcurl +# We're patching configure.ac +UACME_AUTORECONF = YES UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBS="$(UACME_LIBS)" -- 2.43.0 From dannenberg at ti.com Tue Feb 20 20:04:14 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Tue, 20 Feb 2024 14:04:14 -0600 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> <20240220004100.3yzqapeplx6olarz@dasso> <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> Message-ID: <20240220200414.2bsvqvaeltqhsulc@dasso> Hi Romain, On Tue, Feb 20, 2024 at 11:03:54AM +0100, Romain Naour wrote: > Hello Andreas, > > Le 20/02/2024 ? 01:41, Andreas Dannenberg a ?crit?: > > On Mon, Feb 19, 2024 at 12:24:52PM +0100, Romain Naour wrote: > >> Hello Michael, > >> > >> Le 19/02/2024 ? 12:02, Michael Nazzareno Trimarchi a ?crit?: > >>> Hi Romain > >>> > >>> On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: > >>>> > >>>> Hello Dario, > >>>> > >>>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > >>>>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes > >>>>> high-security field-securable (HS-FS) silicon to optionally customize keys > >>>>> and encryption for security applications. > >>>>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > >>>>> which, however, was buggy. This series fixes the errors and bumps the Linux > >>>>> kernel and U-Boot required for such a new device. > >>>>> > >>>>> This series, which in my humble opinion, should have been immediately > >>>>> considered to correct the compilation errors in case of HS-FS devcies, has > >>>>> seen an increase in patches in version 4 to remove the ti-k3-image-gen > >>>>> package thanks to Binman. Additionally, it shares some modifications and > >>>>> views on how to implement certain changes with the series > >>>>> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > >>>>> Therefore, I think it is necessary not to run them in parallel but to decide > >>>>> whether to merge one before the other or to consider a single series where > >>>>> the patches can be coherent with each other. I am available for both solutions. > >>>>> Let me know. > >>>> > >>>> Thanks for this new version. I beleive both series should be merged into one > >>>> since we want to follow u-boot switch to binman, add more TI K3 SoC support and > >>>> keeping exising am62x ans am64x working in GP or HS/HS-FS. > >>>> > >>> > >>> Because the Dario patchset was sent before (end of November), it's > >>> reasonable to review and adjust that one > >>> and apply your changes for ti_j721e_sk on top of it. It think that is > >>> a standard way to make people happy about > >>> their work and contribution. > >> > >> Actually, the two series are about the same topic: TI K3 SoC support (GP, HS, > >> HS-FS) not only AM62x-SK HS-FS devices > >> > >> But due to the complexity of the BSP, the boot flow (4 way to boot!) and the > >> switch from custom tool to binman... this series is really difficult to review > >> without having a good understanding of TI K3 architecture peculiarity and having > >> one of each TI evaluation boards ? > > > > Although I helped conceive some of this and the associated tooling early > > on, some of the what may look strange architectural decisions were driven > > by different use cases and requirements for the different devices > > (especially around automotive fast/early boot, but also security) in > > combination with limited on-chip SRAM... So this where we are at now. A > > future AM6x device variant will have yet another boot flow, but I can > > already say it will be very much simplified over what we have today :) > > About existing boot flow, I found two recent commit in u-boot that state that > the "Split binary" (that requires sysfw.itb) is already a legacy boot flow: It's called "legacy boot flow" because it was the boot flow used on the first K3 devices that were released (AM65x, J721E). This boot flow was not used on follow-on devices. The characteristics of this boot flow is that the initial FW image that gets loaded (tiboot3.bin) doesn't contain any device firmwares, but only a bootloader (such as U-Boot SPL). Then this boot loader will load the System Firmware firmware + config data blob (sysfw.itb) into the dedicated core (called "DMSC" = Device Manager and Security Controller). And then addiitonal boot stages will be loaded. These devices require this boot flow, and with this it is required to be supported by U-Boot (and any Linux distribution or build systems that build on that). TI is still making/selling those "legacy boot flow" devices, and will continue to do so for a very long time. One promiment community incarnation that you are probably aware of is the BeagleBone AI-64. > arm: dts: k3-binman: Add support for FIT templates > > Add templates for FIT images used extensively across K3 boards with most > of the code common. This includes the FIT portions of: > - tispl.bin > - u-boot.img > - sysfw.itb (in case of legacy boot flow) > > https://gitlab.com/u-boot/u-boot/-/commit/b153bad0f14168d5fcc02ba6bf1a2cd98daba9b5 > > arm: dts: k3-*-binman: Move to using templated FITs > > Reduce redundancy in code by using templates to generate the A72 boot > binaries (tispl.bin and u-boot.img) as well as R5 boot binary sysfw.itb > (for legacy boot following devices J721E and AM65x). > > https://gitlab.com/u-boot/u-boot/-/commit/4509b9ff0b8cb26907f9e9c3571b43565c859275 > > Which one should be recommended or avoided for a new design? Those commits are just a simplification to reduce duplication. As per earlier comment the "legacy boot flow" is something we continue needing to support. It isn't supposed to imply that those devices are about to disappear. Not sure if this answered your question; please let me know. -- Andreas Dannenberg Texas Instruments Inc > > Best regards, > Romain > > > > > >> The series (based on Dario's work) about ti_j721e_sk suggested to remove TI > >> custom tools replaced by binman along with other improvements. > >> > >> I'll way for v5 and rebase the ti_j721e_sk on top of it. > > > > Thank you Romain for your buy-in. Let's focus on getting Dario's series > > in good shape and then move onto yours. I'd also like to re-introduce > > graphics (I had that working before) but I need to wait for all the > > "baseline" stuff to settle first. > > > > > > -- > > Andreas Dannenberg > > Texas Instruments Inc > > > > > > > >> > >> Best regards, > >> Romain > >> > >> > >>> > >>> Michael > >>> > >>>> My main concern is to avoid adding a new package for a tool that is already > >>>> deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. > >>>> > >>>> Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". > >>>> > >>>> [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html > >>>> > >>>> Best regards, > >>>> Romain > >>>> > >>>>> > From dannenberg at ti.com Tue Feb 20 20:32:00 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Tue, 20 Feb 2024 14:32:00 -0600 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> <20240220012848.76amyog5pecsgld4@dasso> Message-ID: <20240220203200.uq2dpvky2rbv6tcw@dasso> Dear Romain, Dario, Thomas: On Tue, Feb 20, 2024 at 10:32:14AM +0100, Romain Naour wrote: > Hi Dario, > > Le 20/02/2024 ? 10:05, Dario Binacchi a ?crit?: > > Hi Andreas, Romain, All > > > > On Tue, Feb 20, 2024 at 2:28?AM Andreas Dannenberg wrote: > >> > >> Romain, Dario, > >> > >> On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: > >>> Hello Dario, > >>> > >>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > >>>> Recent versions of U-Boot can use Binman to compile and sign the generated > >>>> binaries, thus making the use of custom tools like ti-k3-image-gen no > >>>> longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > >>>> configured and used outside of it. This patch allows setting such options > >>>> even if the package is not enabled. > >>> > >>> I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux > >>> kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. > >> > >> There were discussions/suggestions around this before by Yann E Morin > >> [1] and Thomas Petazzoni [2]. I think the gist of it was to move the > >> selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing > >> all the K3 SoC specific selections. And then other packages and Kconfig > >> menues can depend on it more cleanly. Like it's currently done with > >> package/freescale-imx/Config.in. This would also bring some consistency > >> in how those NXP and TI device families are managed, which will make for > >> a better end-user experience I think. > > > > If I'm not mistaken, I think the patches: > > [18/20] boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > > [17/20] boot: move ti-k3-* packages to 'ti-k3' directory > > Are heading in the direction of what we find in > > package/freescale-imx/, with the only difference being > > that in our case, we're under boot. > > So, can I consider these two patches correct? Yes the general direction those are headed is a good... > Yes, can you try to move ti-k3 to package directory in V5 ? > It would also be used later by the GPU rogue firmwares. ...and yes, for alignment sake with IMX it would be even better to have it in package/, while also keeping some alignment with the naming of the CONFIG options (hence my comment with 'BR2_PACKAGE_TI_K3_PLATFORM'). Hi Thomas, assuming we create a new package called 'package/ti-k3' I was trying to figure out what would be the best way to name the associated CONFIG options that control device security settings and can be used to determine which device is being used (for later uses in context of GPU drivers and other device capabilities)? I see different naming conventions being used, like this: 1) BR2_PACKAGE_* 2) BR2_TARGET_* 3) BR2_BOOT_* Seems like BR2_TARGET_* what we have now would be most appropriate, but then the IMX stuff uses BR2_PACKAGE_*, which *seems* to be reserved for "userspace" (non-boot) packages as far as I can tell from my poor-man's research. While I'd like to align things, the use of the BR2_PACKAGE_* prefix may or may not be appropriate for our new additions here? Just was hoping to get some guidance here so we don't need to re-work this too many times. -- Andreas Dannenberg Texas Instruments Inc > > Please add a comment in the commit log that we make an exception to the rule "no > subdirectory in package directory". > > Thanks! > > Best regards, > Romain > > > > > > Thanks and regards, > > Dario > > > >> > >> > >> > >> -- > >> Andreas Dannenberg > >> Texas Instruments Inc > >> > >> [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html > >> [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html > >> > >> > >>> > >>> Best regards, > >>> Romain > >>> > >>> > >>>> > >>>> --- > >>>> > >>>> Added in v4 > >>>> > >>>> Signed-off-by: Dario Binacchi > >>>> --- > >>>> boot/ti-k3/Config.in | 46 ++++++++++++++ > >>>> boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > >>>> boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > >>>> boot/uboot/Config.in | 7 +-- > >>>> configs/ti_am62x_sk_defconfig | 2 +- > >>>> configs/ti_am64x_sk_defconfig | 2 +- > >>>> 6 files changed, 59 insertions(+), 67 deletions(-) > >>>> > >>>> diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > >>>> index 06dda2f156a9..9e508326c9c8 100644 > >>>> --- a/boot/ti-k3/Config.in > >>>> +++ b/boot/ti-k3/Config.in > >>>> @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > >>>> > >>>> if BR2_TARGET_TI_K3 > >>>> > >>>> +choice > >>>> + prompt "SoC family" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SOC_AM62AX > >>>> + bool "am62ax" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SOC_AM62X > >>>> + bool "am62x" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SOC_AM64X > >>>> + bool "am64x" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SOC_AM65X > >>>> + bool "am65x" > >>>> + > >>>> +endchoice > >>>> + > >>>> +choice > >>>> + prompt "Security type" > >>>> + help > >>>> + The target SoC security type option. > >>>> + > >>>> +config BR2_TARGET_TI_K3_SECTYPE_GP > >>>> + bool "gp" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > >>>> + bool "hs-fs" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SECTYPE_HS > >>>> + bool "hs" > >>>> + > >>>> +endchoice > >>>> + > >>>> +config BR2_TARGET_TI_K3_SOC > >>>> + string > >>>> + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>> + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > >>>> + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > >>>> + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > >>>> + > >>>> +config BR2_TARGET_TI_K3_SECTYPE > >>>> + string > >>>> + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > >>>> + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > >>>> + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > >>>> + > >>>> source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > >>>> source "boot/ti-k3/ti-k3-core-secdev/Config.in" > >>>> source "boot/ti-k3/ti-k3-image-gen/Config.in" > >>>> diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > >>>> index 38d1598d9fc0..2d53d62dd4ee 100644 > >>>> --- a/boot/ti-k3/ti-k3-image-gen/Config.in > >>>> +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > >>>> @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > >>>> bool "ti-k3-image-gen" > >>>> depends on BR2_TARGET_TI_K3_R5_LOADER > >>>> select BR2_TARGET_TI_K3_BOOT_FIRMWARE > >>>> - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > >>>> # We need FIT support in uboot-tools, which is why we select a > >>>> # host package > >>>> select BR2_PACKAGE_HOST_UBOOT_TOOLS > >>>> @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > >>>> https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > >>>> > >>>> if BR2_TARGET_TI_K3_IMAGE_GEN > >>>> -choice > >>>> - prompt "SoC family" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>> - bool "am62ax" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>> - bool "am62x" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>> - bool "am64x" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>> - bool "am65x" > >>>> - > >>>> -endchoice > >>>> - > >>>> -choice > >>>> - prompt "Security type" > >>>> - help > >>>> - The target SoC security type option for image gen. Valid > >>>> - options are "gp" for General Purpose devices, "hs-fs" for > >>>> - High Security - Field Securable devices, or "hs" for High > >>>> - Security - Security Enforcing devices. Note for all High > >>>> - Security device variants the TI_SECURE_DEV_PKG environmental > >>>> - variable must be defined at build time pointing to a valid > >>>> - core-secdev-k3 folder location, otherwise the build will > >>>> - fail, see > >>>> - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > >>>> - bool "gp" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > >>>> - bool "hs-fs" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>> - bool "hs" > >>>> - > >>>> -endchoice > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > >>>> - string > >>>> - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>> - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>> - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>> - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>> > >>>> config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > >>>> string > >>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > >>>> - string > >>>> - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > >>>> - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > >>>> - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > >>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > >>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > >>>> > >>>> endif > >>>> diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>> index 74b4fcb4bf89..834d8f7d5cd5 100644 > >>>> --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>> +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>> @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > >>>> $(BR2_MAKE_HOST_DEPENDENCY) > >>>> > >>>> TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > >>>> -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > >>>> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > >>>> +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > >>>> +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > >>>> > >>>> -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > >>>> +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > >>>> TI_K3_IMAGE_GEN_SYSFW = \ > >>>> $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > >>>> else > >>>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > >>>> index beafb38930db..1a9d21e7c6d1 100644 > >>>> --- a/boot/uboot/Config.in > >>>> +++ b/boot/uboot/Config.in > >>>> @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > >>>> bool "U-Boot needs TI K3 Device Manager (DM)" > >>>> # We use the SoC selection defined for the ti-k3-image-gen > >>>> # package > >>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN > >>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>> + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > >>>> help > >>>> Some TI K3 devices need the Device Manager (DM) firmware to > >>>> be available for the U-Boot build. > >>>> @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > >>>> > >>>> config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > >>>> string > >>>> - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>> - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>> + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>> + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > >>>> > >>>> endif > >>>> > >>>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > >>>> index cd26235342e4..cfefce0a77a4 100644 > >>>> --- a/configs/ti_am62x_sk_defconfig > >>>> +++ b/configs/ti_am62x_sk_defconfig > >>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > >>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > >>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > >>>> BR2_TARGET_TI_K3=y > >>>> +BR2_TARGET_TI_K3_SOC_AM62X=y > >>>> BR2_TARGET_TI_K3_IMAGE_GEN=y > >>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > >>>> BR2_TARGET_TI_K3_R5_LOADER=y > >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > >>>> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > >>>> index 1befeb4ab96c..daf78dbffff8 100644 > >>>> --- a/configs/ti_am64x_sk_defconfig > >>>> +++ b/configs/ti_am64x_sk_defconfig > >>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > >>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > >>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > >>>> BR2_TARGET_TI_K3=y > >>>> +BR2_TARGET_TI_K3_SOC_AM64X=y > >>>> BR2_TARGET_TI_K3_IMAGE_GEN=y > >>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > >>>> BR2_TARGET_TI_K3_R5_LOADER=y > >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > >>> > > > > > > > From yann.morin.1998 at free.fr Tue Feb 20 20:44:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:44:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/uacme: fix build In-Reply-To: <20240220195007.380433-1-fontaine.fabrice@gmail.com> References: <20240220195007.380433-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-20 20:50 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 1.7.5 in > commit b7ee5f3b0e3ef703bafd007cc99da10312d99b9e and > https://github.com/ndilieto/uacme/commit/fe826f4b1931ae508047d8b2693b5b6ac2cb21fd: > > checking if mmap(MAP_ANON|MAP_SHARED) works... configure: error: in `/home/autobuild/autobuild/instance-9/output-1/build/uacme-1.7.5': > configure: error: cannot run test program while cross compiling > > Fixes: b7ee5f3b0e3ef703bafd007cc99da10312d99b9e > - http://autobuild.buildroot.org/results/9715ade98f4894c07b640d151daa41813d2bec3a > > Signed-off-by: Fabrice Fontaine [--SNIP--] > diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk > index f02e522761..cd670ee951 100644 > --- a/package/uacme/uacme.mk > +++ b/package/uacme/uacme.mk > @@ -12,6 +12,8 @@ UACME_SITE = $(call github,ndilieto,uacme,upstream/$(UACME_VERSION)) > UACME_LICENSE = GPL-3.0+ > UACME_LICENSE_FILES = COPYING > UACME_DEPENDENCIES = libcurl > +# We're patching configure.ac I've slightly reworded this comment to reference the patch filename, so that's it is easier to notice when the patch is dropped that we should also drop autoreconf. Applied to master, thanks. Regards, Yann E. MORIN. > +UACME_AUTORECONF = YES > > UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBS="$(UACME_LIBS)" > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 20:43:00 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:43:00 +0100 Subject: [Buildroot] [git commit] package/uacme: fix build Message-ID: <20240220204638.7A82987981@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e48306a43ed8f21dbd2c1899e0ca02e7e460801 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 1.7.5 in commit b7ee5f3b0e3ef703bafd007cc99da10312d99b9e and https://github.com/ndilieto/uacme/commit/fe826f4b1931ae508047d8b2693b5b6ac2cb21fd: checking if mmap(MAP_ANON|MAP_SHARED) works... configure: error: in `/home/autobuild/autobuild/instance-9/output-1/build/uacme-1.7.5': configure: error: cannot run test program while cross compiling Fixes: b7ee5f3b0e3ef703bafd007cc99da10312d99b9e - http://autobuild.buildroot.org/results/9715ade98f4894c07b640d151daa41813d2bec3a Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reference patch in comment] Signed-off-by: Yann E. MORIN --- package/uacme/0001-Fix-cross-compilation.patch | 29 ++++++++++++++++++++++++++ package/uacme/uacme.mk | 3 +++ 2 files changed, 32 insertions(+) diff --git a/package/uacme/0001-Fix-cross-compilation.patch b/package/uacme/0001-Fix-cross-compilation.patch new file mode 100644 index 0000000000..cc384f2c36 --- /dev/null +++ b/package/uacme/0001-Fix-cross-compilation.patch @@ -0,0 +1,29 @@ +From cdf63e24dc475a558400c68714e32d32904e4c57 Mon Sep 17 00:00:00 2001 +From: Nicola Di Lieto +Date: Tue, 20 Feb 2024 01:05:00 +0100 +Subject: [PATCH] Fix cross compilation + +Commit fe826f4b1931ae508047d8b2693b5b6ac2cb21fd broke cross compilation + +Closes https://github.com/ndilieto/uacme/issues/79 + +Upstream: https://github.com/ndilieto/uacme/commit/cdf63e24dc475a558400c68714e32d32904e4c57 +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 77d1230..3bec75b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -355,7 +355,8 @@ if test "x$OPT_UALPN" != "xno"; then + AC_DEFINE(HAVE_MAP_DEVZERO, 1, [if mmap("/dev/zero", MAP_SHARED) works]) + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([ualpn requires MAP_ANON or mmap("/dev/zero", MAP_SHARED)])), ++ AC_MSG_ERROR([ualpn requires MAP_ANON or mmap("/dev/zero", MAP_SHARED)])) ++ ], [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include + int main() {return mmap(0, 4096, PROT_READ|PROT_WRITE, + MAP_ANON|MAP_SHARED, -1, 0) == MAP_FAILED;}])], diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index f02e522761..0fcb5c5c34 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -13,6 +13,9 @@ UACME_LICENSE = GPL-3.0+ UACME_LICENSE_FILES = COPYING UACME_DEPENDENCIES = libcurl +# 0001-Fix-cross-compilation.patch touches configure.ac +UACME_AUTORECONF = YES + UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBS="$(UACME_LIBS)" ifeq ($(BR2_PACKAGE_GNUTLS),y) From yann.morin.1998 at free.fr Tue Feb 20 20:46:44 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:46:44 +0100 Subject: [Buildroot] [git commit] package/ltris: drop unrecognized option Message-ID: <20240220204905.26ABD87989@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9af20d6e1e1139e59ed3dd9aaf015e72f1e2db8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master --enable-sound has been dropped since version 1.2.4 and https://sourceforge.net/p/lgames/code/432: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-static, --disable-shared, --enable-sound Fixes: 61848605cd26d29f54c16de862aedba7cf334be4 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ltris/ltris.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index 98902de44c..b34ac142ce 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -18,12 +18,9 @@ LTRIS_CONF_ENV = \ ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y) LTRIS_DEPENDENCIES += sdl_mixer host-pkgconf -LTRIS_CONF_OPTS += --enable-sound # configure script does NOT use pkg-config to figure out how to link # with sdl_mixer, breaking static linking as sdl_mixer can use libmad LTRIS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs SDL_mixer` -else -LTRIS_CONF_OPTS += --disable-sound endif $(eval $(autotools-package)) From yann.morin.1998 at free.fr Tue Feb 20 20:49:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:49:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/ltris: drop unrecognized option In-Reply-To: <20240220190553.3237-1-fontaine.fabrice@gmail.com> References: <20240220190553.3237-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-20 20:05 +0100, Fabrice Fontaine spake thusly: > --enable-sound has been dropped since version 1.2.4 and > https://sourceforge.net/p/lgames/code/432: > > configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-static, --disable-shared, --enable-sound > > Fixes: 61848605cd26d29f54c16de862aedba7cf334be4 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/ltris/ltris.mk | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk > index 98902de44c..b34ac142ce 100644 > --- a/package/ltris/ltris.mk > +++ b/package/ltris/ltris.mk > @@ -18,12 +18,9 @@ LTRIS_CONF_ENV = \ > > ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y) > LTRIS_DEPENDENCIES += sdl_mixer host-pkgconf > -LTRIS_CONF_OPTS += --enable-sound > # configure script does NOT use pkg-config to figure out how to link > # with sdl_mixer, breaking static linking as sdl_mixer can use libmad > LTRIS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs SDL_mixer` > -else > -LTRIS_CONF_OPTS += --disable-sound > endif > > $(eval $(autotools-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 20:59:26 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:59:26 +0100 Subject: [Buildroot] [PATCH 1/2] package/dnsmasq: security bump version to 2.90 In-Reply-To: <20240220180224.42576-1-bernd@kuhls.net> References: <20240220180224.42576-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-20 19:02 +0100, Bernd Kuhls spake thusly: > Changelog: https://thekelleys.org.uk/dnsmasq/CHANGELOG > > Release notes: > https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q1/017430.html > > Fixes CVE 2023-50387 and CVE 2023-50868. > > Removed patch which is included in this release. > Switched _SITE to https. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...default-maximum-dns-udp-package-size.patch | 64 ------------------- > package/dnsmasq/dnsmasq.hash | 4 +- > package/dnsmasq/dnsmasq.mk | 4 +- > 3 files changed, 4 insertions(+), 68 deletions(-) > delete mode 100644 package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch > > diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch > deleted file mode 100644 > index 4dd17ec069..0000000000 > --- a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 > -From: Simon Kelley > -Date: Tue, 7 Mar 2023 22:07:46 +0000 > -Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. > -Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 > - > -http://www.dnsflagday.net/2020/ refers. > - > -Thanks to Xiang Li for the prompt. > - > -[dalang at gmx.at: backport from upstream] > -Signed-off-by: Daniel Lang > ---- > - CHANGELOG | 9 ++++++++ > - man/dnsmasq.8 | 3 ++- > - src/config.h | 2 +- > - 3 files changed, 12 insertions(+), 2 deletions(-) > - > -diff --git a/CHANGELOG b/CHANGELOG > -index 3af20cf..52d8678 100644 > ---- a/CHANGELOG > -+++ b/CHANGELOG > -@@ -1,3 +1,12 @@ version 2.90 > -+version 2.90 > -+ Set the default maximum DNS UDP packet sice to 1232. This > -+ has been the recommended value since 2020 because it's the > -+ largest value that avoid fragmentation, and fragmentation > -+ is just not reliable on the modern internet, especially > -+ for IPv6. It's still possible to override this with > -+ --edns-packet-max for special circumstances. > -+ > -+ > - version 2.89 > - Fix bug introduced in 2.88 (commit fe91134b) which can result > - in corruption of the DNS cache internal data structures and > -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 > -index 41e2e04..5acb935 100644 > ---- a/man/dnsmasq.8 > -+++ b/man/dnsmasq.8 > -@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. > - .TP > - .B \-P, --edns-packet-max= > - Specify the largest EDNS.0 UDP packet which is supported by the DNS > --forwarder. Defaults to 4096, which is the RFC5625-recommended size. > -+forwarder. Defaults to 1232, which is the recommended size following the > -+DNS flag day in 2020. Only increase if you know what you are doing. > - .TP > - .B \-Q, --query-port= > - Send outbound DNS queries from, and listen for their replies on, the > -diff --git a/src/config.h b/src/config.h > -index 1e7b30f..37b374e 100644 > ---- a/src/config.h > -+++ b/src/config.h > -@@ -19,7 +19,7 @@ > - #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ > - #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ > - #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ > --#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ > -+#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ > - #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ > - #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ > - #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ > --- > -2.20.1 > diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash > index 02ffb2656b..d11e8af590 100644 > --- a/package/dnsmasq/dnsmasq.hash > +++ b/package/dnsmasq/dnsmasq.hash > @@ -1,6 +1,6 @@ > # Locally calculated after checking pgp signature > -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc > -sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz > +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc > +sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz > # Locally calculated > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 > diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk > index 9c05857f22..9f342cb049 100644 > --- a/package/dnsmasq/dnsmasq.mk > +++ b/package/dnsmasq/dnsmasq.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -DNSMASQ_VERSION = 2.89 > +DNSMASQ_VERSION = 2.90 > DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz > -DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq > +DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq > DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" > DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" > DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 20:51:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:51:14 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Bernd Kuhls to dnsmasq Message-ID: <20240220205958.6692F87988@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0dab037e14813b2f262dbde6b85b42d98b00c120 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..f0e16af162 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -350,6 +350,7 @@ F: package/bitcoin/ F: package/clamav/ F: package/dav1d/ F: package/dht/ +F: package/dnsmasq/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ From yann.morin.1998 at free.fr Tue Feb 20 20:51:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:51:18 +0100 Subject: [Buildroot] [git commit] package/unbound: security bump version to 1.19.1 Message-ID: <20240220205958.735D0879A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9175bf264909cefa942d26deea9035553246ecad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ Fixes CVE-2023-50387 & CVE-2023-50868. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 91e1d82dd2..843026abc7 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 -sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 +sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index fa7884e937..5128d0e420 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.17.1 +UNBOUND_VERSION = 1.19.1 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl From yann.morin.1998 at free.fr Tue Feb 20 20:51:22 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:51:22 +0100 Subject: [Buildroot] [git commit] package/bind: security bump version to 9.16.48 Message-ID: <20240220205958.8102D879A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ca60941b748d8d16796de22400fbe6d7e678b04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://ftp.isc.org/isc/bind9/9.16.48/CHANGES Version 9.16.46 fixes - CVE-2023-4408 - CVE-2023-5517 - CVE-2023-5679 - CVE-2023-6516 Version 9.16.47 fixes CVE-2023-50387. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index d500b61128..482b046c8d 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.44/bind-9.16.44.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 cfaa953c36d5ca42d9584fcf9653d07c85527b59687e7c4d4cb8071272db6754 bind-9.16.44.tar.xz +sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 03ffcbec42..0d81ffabd6 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.44 +BIND_VERSION = 9.16.48 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From yann.morin.1998 at free.fr Tue Feb 20 20:51:10 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:51:10 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: security bump version to 2.90 Message-ID: <20240220205958.5BECF879A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=213cfb34358d86a65deecdb9f5b11a20ad0895d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://thekelleys.org.uk/dnsmasq/CHANGELOG Release notes: https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q1/017430.html Fixes CVE 2023-50387 and CVE 2023-50868. Removed patch which is included in this release. Switched _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...-set-default-maximum-dns-udp-package-size.patch | 64 ---------------------- package/dnsmasq/dnsmasq.hash | 4 +- package/dnsmasq/dnsmasq.mk | 4 +- 3 files changed, 4 insertions(+), 68 deletions(-) diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch deleted file mode 100644 index 4dd17ec069..0000000000 --- a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch +++ /dev/null @@ -1,64 +0,0 @@ -From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Tue, 7 Mar 2023 22:07:46 +0000 -Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. -Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 - -http://www.dnsflagday.net/2020/ refers. - -Thanks to Xiang Li for the prompt. - -[dalang at gmx.at: backport from upstream] -Signed-off-by: Daniel Lang ---- - CHANGELOG | 9 ++++++++ - man/dnsmasq.8 | 3 ++- - src/config.h | 2 +- - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 3af20cf..52d8678 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -1,3 +1,12 @@ version 2.90 -+version 2.90 -+ Set the default maximum DNS UDP packet sice to 1232. This -+ has been the recommended value since 2020 because it's the -+ largest value that avoid fragmentation, and fragmentation -+ is just not reliable on the modern internet, especially -+ for IPv6. It's still possible to override this with -+ --edns-packet-max for special circumstances. -+ -+ - version 2.89 - Fix bug introduced in 2.88 (commit fe91134b) which can result - in corruption of the DNS cache internal data structures and -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 41e2e04..5acb935 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. - .TP - .B \-P, --edns-packet-max= - Specify the largest EDNS.0 UDP packet which is supported by the DNS --forwarder. Defaults to 4096, which is the RFC5625-recommended size. -+forwarder. Defaults to 1232, which is the recommended size following the -+DNS flag day in 2020. Only increase if you know what you are doing. - .TP - .B \-Q, --query-port= - Send outbound DNS queries from, and listen for their replies on, the -diff --git a/src/config.h b/src/config.h -index 1e7b30f..37b374e 100644 ---- a/src/config.h -+++ b/src/config.h -@@ -19,7 +19,7 @@ - #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ - #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ - #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ --#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ -+#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ - #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ - #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ - #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ --- -2.20.1 diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 02ffb2656b..d11e8af590 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc -sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc +sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 9c05857f22..9f342cb049 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,9 +4,9 @@ # ################################################################################ -DNSMASQ_VERSION = 2.89 +DNSMASQ_VERSION = 2.90 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz -DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq +DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ From yann.morin.1998 at free.fr Tue Feb 20 21:00:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:00:12 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Bernd Kuhls to dnsmasq In-Reply-To: <20240220180224.42576-2-bernd@kuhls.net> References: <20240220180224.42576-1-bernd@kuhls.net> <20240220180224.42576-2-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-20 19:02 +0100, Bernd Kuhls spake thusly: > Signed-off-by: Bernd Kuhls Thank you for adopting it! ? Applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index ba18d830d2..b9ca7eb647 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -350,6 +350,7 @@ F: package/bitcoin/ > F: package/clamav/ > F: package/dav1d/ > F: package/dht/ > +F: package/dnsmasq/ > F: package/dovecot/ > F: package/dovecot-pigeonhole/ > F: package/dtv-scan-tables/ > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:00:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:00:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/unbound: security bump version to 1.19.1 In-Reply-To: <20240220180708.55442-1-bernd@kuhls.net> References: <20240220180708.55442-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-20 19:07 +0100, Bernd Kuhls spake thusly: > Release notes: > https://nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ > > Fixes CVE-2023-50387 & CVE-2023-50868. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/unbound/unbound.hash | 4 ++-- > package/unbound/unbound.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash > index 91e1d82dd2..843026abc7 100644 > --- a/package/unbound/unbound.hash > +++ b/package/unbound/unbound.hash > @@ -1,5 +1,5 @@ > -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 > -sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz > +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 > +sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz > > # Locally calculated > sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE > diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk > index fa7884e937..5128d0e420 100644 > --- a/package/unbound/unbound.mk > +++ b/package/unbound/unbound.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UNBOUND_VERSION = 1.17.1 > +UNBOUND_VERSION = 1.19.1 > UNBOUND_SITE = https://www.unbound.net/downloads > UNBOUND_INSTALL_STAGING = YES > UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:00:41 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:00:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/bind: security bump version to 9.16.48 In-Reply-To: <20240220185030.92016-1-bernd@kuhls.net> References: <20240220185030.92016-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-20 19:50 +0100, Bernd Kuhls spake thusly: > Changelog: https://ftp.isc.org/isc/bind9/9.16.48/CHANGES > > Version 9.16.46 fixes > - CVE-2023-4408 > - CVE-2023-5517 > - CVE-2023-5679 > - CVE-2023-6516 > > Version 9.16.47 fixes CVE-2023-50387. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/bind/bind.hash | 4 ++-- > package/bind/bind.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/bind/bind.hash b/package/bind/bind.hash > index d500b61128..482b046c8d 100644 > --- a/package/bind/bind.hash > +++ b/package/bind/bind.hash > @@ -1,4 +1,4 @@ > -# Verified from https://ftp.isc.org/isc/bind9/9.16.44/bind-9.16.44.tar.xz.asc > +# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc > # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD > -sha256 cfaa953c36d5ca42d9584fcf9653d07c85527b59687e7c4d4cb8071272db6754 bind-9.16.44.tar.xz > +sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz > sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT > diff --git a/package/bind/bind.mk b/package/bind/bind.mk > index 03ffcbec42..0d81ffabd6 100644 > --- a/package/bind/bind.mk > +++ b/package/bind/bind.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BIND_VERSION = 9.16.44 > +BIND_VERSION = 9.16.48 > BIND_SOURCE= bind-$(BIND_VERSION).tar.xz > BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) > # bind does not support parallel builds. > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:03:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:03:58 +0100 Subject: [Buildroot] [git commit] package/tslib: bump version to 1.23 Message-ID: <20240220211035.E6DCF879B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb4f154dad9ddc054763abcacfde120d16ca201a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes from https://github.com/libts/tslib/releases : This release includes libts version 0.10.5 and the following changes: * new filter module: module crop * some build and security fixes * improved release procedure Signed-off-by: Martin Kepplinger Signed-off-by: Yann E. MORIN --- package/tslib/tslib.hash | 4 ++-- package/tslib/tslib.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index 762fbebb26..6fe35633aa 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,5 +1,5 @@ -# https://github.com/libts/tslib/releases/download/1.22/tslib-1.22.tar.xz.sha256 -sha256 aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a tslib-1.22.tar.xz +# https://github.com/libts/tslib/releases/download/1.23/tslib-1.23.tar.xz.sha256 +sha256 9b489a54d48006201f2fe955a88c3f857535ac93b6cf8e5a16c7b166c8991dac tslib-1.23.tar.xz # Locally computed sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 45e29808bd..e8eb3beeaf 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.22 +TSLIB_VERSION = 1.23 TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) @@ -29,7 +29,8 @@ TSLIB_CONF_OPTS += \ --enable-skip=static \ --enable-lowpass=static \ --enable-invert=static \ - --enable-evthres=static + --enable-evthres=static \ + --enable-crop=static endif $(eval $(autotools-package)) From yann.morin.1998 at free.fr Tue Feb 20 21:04:02 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:04:02 +0100 Subject: [Buildroot] [git commit] package/c-ares: bump to version 1.26.0 Message-ID: <20240220211036.01D92879B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43ae599c9eeba74f4c9941435d9f8137723b86ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://c-ares.org/changelog.html#1_26_0 Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index c2897f6e44..ee097a53c9 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 de24a314844cb157909730828560628704f4f896d167dd7da0fa2fb93ea18b10 c-ares-1.20.1.tar.gz +sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz # Hash for license file sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 586fde9afb..29da6baa4b 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.20.1 +C_ARES_VERSION = 1.26.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From yann.morin.1998 at free.fr Tue Feb 20 21:12:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:12:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/tslib: bump version to 1.23 In-Reply-To: <20240220073251.251521-1-martink@posteo.de> References: <20240220073251.251521-1-martink@posteo.de> Message-ID: Martin, All, On 2024-02-20 07:32 +0000, Martin Kepplinger spake thusly: > Release notes from https://github.com/libts/tslib/releases : > > This release includes libts version 0.10.5 and the following changes: > > * new filter module: module crop > * some build and security fixes > * improved release procedure > > Signed-off-by: Martin Kepplinger Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/tslib/tslib.hash | 4 ++-- > package/tslib/tslib.mk | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash > index 762fbebb26..6fe35633aa 100644 > --- a/package/tslib/tslib.hash > +++ b/package/tslib/tslib.hash > @@ -1,5 +1,5 @@ > -# https://github.com/libts/tslib/releases/download/1.22/tslib-1.22.tar.xz.sha256 > -sha256 aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a tslib-1.22.tar.xz > +# https://github.com/libts/tslib/releases/download/1.23/tslib-1.23.tar.xz.sha256 > +sha256 9b489a54d48006201f2fe955a88c3f857535ac93b6cf8e5a16c7b166c8991dac tslib-1.23.tar.xz > > # Locally computed > sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING > diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk > index 45e29808bd..e8eb3beeaf 100644 > --- a/package/tslib/tslib.mk > +++ b/package/tslib/tslib.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TSLIB_VERSION = 1.22 > +TSLIB_VERSION = 1.23 > TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) > TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz > TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) > @@ -29,7 +29,8 @@ TSLIB_CONF_OPTS += \ > --enable-skip=static \ > --enable-lowpass=static \ > --enable-invert=static \ > - --enable-evthres=static > + --enable-evthres=static \ > + --enable-crop=static > endif > > $(eval $(autotools-package)) > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:12:29 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:12:29 +0100 Subject: [Buildroot] [PATCH] package/c-ares: bump to version 1.26.0 In-Reply-To: <20240220151931.2141682-1-buildroot@bubu1.eu> References: <20240220151931.2141682-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-20 16:19 +0100, Marcus Hoffmann via buildroot spake thusly: > Changelog: https://c-ares.org/changelog.html#1_26_0 > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/c-ares/c-ares.hash | 2 +- > package/c-ares/c-ares.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash > index c2897f6e44..ee097a53c9 100644 > --- a/package/c-ares/c-ares.hash > +++ b/package/c-ares/c-ares.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -sha256 de24a314844cb157909730828560628704f4f896d167dd7da0fa2fb93ea18b10 c-ares-1.20.1.tar.gz > +sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz > > # Hash for license file > sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md > diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk > index 586fde9afb..29da6baa4b 100644 > --- a/package/c-ares/c-ares.mk > +++ b/package/c-ares/c-ares.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -C_ARES_VERSION = 1.20.1 > +C_ARES_VERSION = 1.26.0 > C_ARES_SITE = http://c-ares.haxx.se/download > C_ARES_INSTALL_STAGING = YES > C_ARES_CONF_OPTS = --with-random=/dev/urandom > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:15:24 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:15:24 +0100 Subject: [Buildroot] [git commit] package/dos2unix: bump to version 7.5.2 Message-ID: <20240220211650.E165E879B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c86121d8865d41c40ed17d0ca6b07d36a940a2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update hash of the COPYING.txt (update in year) Signed-off-by: Kadambini Nema Signed-off-by: Yann E. MORIN --- package/dos2unix/dos2unix.hash | 6 +++--- package/dos2unix/dos2unix.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash index 032c8ea2d2..d4d682cd0c 100644 --- a/package/dos2unix/dos2unix.hash +++ b/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 6d1e70cf26..e30fc999d4 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.5.0 +DOS2UNIX_VERSION = 7.5.2 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt From yann.morin.1998 at free.fr Tue Feb 20 21:17:01 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:17:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/dos2unix: bump to version 7.5.2 In-Reply-To: <20240219191934.41982-1-kadambini.nema@gmail.com> References: <20240219191934.41982-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-19 11:19 -0800, Kadambini Nema spake thusly: > - Update hash of the COPYING.txt (update in year) > > Signed-off-by: Kadambini Nema Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changelog: https://waterlan.home.xs4all.nl/dos2unix/ChangeLog.txt > > $ ./utils/test-pkg -d br_test -k -c dos2unix.config -p dos2unix > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: OK > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: OK > sourcery-arm [6/6]: OK > 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > package/dos2unix/dos2unix.hash | 6 +++--- > package/dos2unix/dos2unix.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash > index 032c8ea2d2..d4d682cd0c 100644 > --- a/package/dos2unix/dos2unix.hash > +++ b/package/dos2unix/dos2unix.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc > -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz > -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt > +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc > +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz > +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt > diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk > index 6d1e70cf26..e30fc999d4 100644 > --- a/package/dos2unix/dos2unix.mk > +++ b/package/dos2unix/dos2unix.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DOS2UNIX_VERSION = 7.5.0 > +DOS2UNIX_VERSION = 7.5.2 > DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix > DOS2UNIX_LICENSE = BSD-2-Clause > DOS2UNIX_LICENSE_FILES = COPYING.txt > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:17:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:17:39 +0100 Subject: [Buildroot] [git commit] package/google-breakpad: fix missing include error Message-ID: <20240220211811.A6495879C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59e2a8ed5ab9712c602fe64f0ae5f0ae48c0b6c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master src/common/module.cc: In member function ???bool google_breakpad::Module::AddFunction(Function*)???: src/common/module.cc:194:52: error: ???find_if??? is not a member of ???std???; did you mean ???find???? 194 | FunctionSet::iterator existing_function = std::find_if( | ^~~~~~~ | find Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed This error is seen on gcc-14. https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch Signed-off-by: Kadambini Nema Signed-off-by: Yann E. MORIN --- ...001-Fixed-missing-include-for-std-find_if.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch new file mode 100644 index 0000000000..141e12b613 --- /dev/null +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch @@ -0,0 +1,26 @@ +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 +From: Nathan Moinvaziri +Date: Tue, 19 Dec 2023 14:35:05 -0800 +Subject: [PATCH] Fixed missing include for std::find_if. + +Throws an error when compiling on Windows. + +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 +Reviewed-by: Ivan Penkov +Upstream: https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d +Signed-off-by: Kadambini Nema +--- + +diff --git a/src/common/module.cc b/src/common/module.cc +index 0eb5aad..b6f5da7 100644 +--- a/src/common/module.cc ++++ b/src/common/module.cc +@@ -42,6 +42,7 @@ + #include + #include + ++#include + #include + #include + #include From david.picard at clermont.in2p3.fr Tue Feb 20 21:18:12 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Tue, 20 Feb 2024 22:18:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: Message-ID: Hi, I checked my subscription options, but I don't receive the messages I send to the list. My comments are in the text. Le 14/02/2024 ? 17:23, Romain Naour a ?crit?: > Hello David, > > Le 14/02/2024 ? 10:34, David Picard a ?crit?: >> Add a package for the Intel/Altera SoC FPGA hardware library. It is >> used to let the HPS and the FPGA fabric communicate with each other. > We received 4 thime the same patch on the mailing list: > > http://patchwork.ozlabs.org/project/buildroot/patch/20240214081921.4663-1-david.picard at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/2770b2ac-4cec-4d56-81e9-89dfd33f786a at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/abcd4153-41e2-45ce-a89a-e198e86ba337 at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/c90e4512-405c-40fb-b597-1a04d7449afa at clermont.in2p3.fr/ > > Which one should we review? > > Please, send patch using git send-email tool. > > (https://nightly.buildroot.org/manual.html#submitting-patches) > > Also, when you resend a patch, add the changelog info. > > https://nightly.buildroot.org/manual.html#_patch_revision_changelog > > >> Signed-off-by: David Picard >> --- >> package/Config.in | 1 + >> package/intel-socfpga-hwlib/Config.in | 12 ++++++ >> .../intel-socfpga-hwlib.hash | 2 + >> .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ >> 4 files changed, 54 insertions(+) >> create mode 100644 package/intel-socfpga-hwlib/Config.in >> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index bf0fe078b9..cd6c6bcaba 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -1736,6 +1736,7 @@ menu "Hardware handling" >> source "package/gnu-efi/Config.in" >> source "package/hackrf/Config.in" >> source "package/hidapi/Config.in" >> + source "package/intel-socfpga-hwlib/Config.in" >> source "package/jitterentropy-library/Config.in" >> source "package/lcdapi/Config.in" >> source "package/let-me-create/Config.in" >> diff --git a/package/intel-socfpga-hwlib/Config.in >> b/package/intel-socfpga-hwlib/Config.in >> new file mode 100644 >> index 0000000000..ced6483a59 >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/Config.in >> @@ -0,0 +1,12 @@ >> +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB >> + bool "intel-socfpga-hwlib" >> + depends on BR2_arm >> + help >> + This package provides the Intel SoC FPGA HWLIB for >> + Intel/Altera SoC FPGA chips. >> + This library allows to communicate with the FPGA fabric from >> + Linux, running on the HPS device. >> + The source code is not compiled. Instead, a symlink is added >> + to $(STAGING_DIR)/lib. >> + >> + https://github.com/altera-opensource/intel-socfpga-hwlib > Check the coding style with ./utils/check-package > >> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> new file mode 100644 >> index 0000000000..60efe9013e >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> @@ -0,0 +1,2 @@ >> +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 >> intel-socfpga-hwlib-23.12.02.tar.gz >> +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 >> License.txt >> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> new file mode 100644 >> index 0000000000..bf18c23560 >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> @@ -0,0 +1,39 @@ >> +################################################################################ >> +# >> +# intel-socfpga-hwlib >> +# >> +################################################################################ >> + >> +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 >> +INTEL_SOCFPGA_HWLIB_SITE = $(call >> github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) >> +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY > It's unexpected to find a PROPRIETARY tool in a gitbub accound with "opensource" > in their name :) I think "Intel" is the best match : https://spdx.org/licenses/Intel.html > >> +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt > It look like a BSD-3-Clause license > > https://spdx.org/licenses/BSD-3-Clause.html > >> +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES >> +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES >> + >> +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS >> + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) >> $(STAGING_DIR)/lib/intel-socfpga-hwlib >> +endef > I don't think this is what you want to do. I did it on purpose. This package is called a library, but it really is a bunch of C files. You only use a subset, depending on your hardware. This code was made to be compiled in the application, not as a conventional library. I could copy the files to STAGING, but cleaning would be more complicated and it would waste some disk space. > >> + >> +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS >> +# mkdir -p $(BINARIES_DIR)/intel-ucode >> +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ >> +# $(@D)/intel-ucode/* >> +# endef >> +# >> +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) >> +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS >> +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode >> +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ >> +# $(@D)/intel-ucode/* >> +# endef >> +# else >> +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO >> +# endif >> + >> +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS >> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) >> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) >> +# endef > Please, don't add commended code. Of course not. I'll clean it. Thanks for reviewing, David > > Best regards, > Romain > > >> + >> +$(eval $(generic-package)) >> From yann.morin.1998 at free.fr Tue Feb 20 21:18:16 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:18:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/google-breakpad: fix missing include error In-Reply-To: <20240219204054.57774-1-kadambini.nema@gmail.com> References: <--in-reply-to> <20240219204054.57774-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-19 12:40 -0800, Kadambini Nema spake thusly: > src/common/module.cc: In member function ?bool google_breakpad::Module::AddFunction(Function*)?: > src/common/module.cc:194:52: error: ?find_if? is not a member of ?std?; did you mean ?find?? > 194 | FunctionSet::iterator existing_function = std::find_if( > | ^~~~~~~ > | find > Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed > > This error is seen on gcc-14. > > https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 > https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch > > Signed-off-by: Kadambini Nema Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ixed-missing-include-for-std-find_if.patch | 26 +++++++++++++++++++ > 1 file changed, 26 insertions(+) > create mode 100644 package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > > diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > new file mode 100644 > index 0000000000..141e12b613 > --- /dev/null > +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > @@ -0,0 +1,26 @@ > +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 > +From: Nathan Moinvaziri > +Date: Tue, 19 Dec 2023 14:35:05 -0800 > +Subject: [PATCH] Fixed missing include for std::find_if. > + > +Throws an error when compiling on Windows. > + > +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 > +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 > +Reviewed-by: Ivan Penkov > +Upstream: https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d > +Signed-off-by: Kadambini Nema > +--- > + > +diff --git a/src/common/module.cc b/src/common/module.cc > +index 0eb5aad..b6f5da7 100644 > +--- a/src/common/module.cc > ++++ b/src/common/module.cc > +@@ -42,6 +42,7 @@ > + #include > + #include > + > ++#include > + #include > + #include > + #include > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:35:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:35:33 +0100 Subject: [Buildroot] [PATCH 1/1] package dhcpdump: bump to version 1.9 In-Reply-To: <20240219215458.187716-1-kadambini.nema@gmail.com> References: <20240219215458.187716-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-19 13:54 -0800, Kadambini Nema spake thusly: > - Change the site to a well maintained fork - https://github.com/bbonev/dhcpdump You could also add a blurb that Fedora 39, at least, also uses that as an upstream. > Signed-off-by: Kadambini Nema [--SNIP--] > delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch $ ./utils/docker-run make check-package .checkpackageignore:290: ignored file package/dhcpdump/0001-use-non-bsd-structures.patch is missing Since the file is no longer present, there is no longer any need to exclude it from being checked. > diff --git a/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch > new file mode 100644 > index 0000000000..c48d28c23d > --- /dev/null > +++ b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch > @@ -0,0 +1,12 @@ > +Upstream: None Why? Ideally, we want patches to be submitted upstream, so that they get applied there, and so we can drop them in the future when we bump to a future version that carries that patch. Also, as I explained in my previous review: patches should be git-formatted (at least when the upstream is git-hosted), with a proper commit log. Having such a commit log will help make an argument for upstream to accept the patch, or to sucggest an alternative. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Tue Feb 20 21:36:51 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 22:36:51 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240220200414.2bsvqvaeltqhsulc@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> <20240220004100.3yzqapeplx6olarz@dasso> <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> <20240220200414.2bsvqvaeltqhsulc@dasso> Message-ID: <1a7ab8e6-bd43-4191-ad95-12e40f3a5c51@smile.fr> Hi Andreas, Le 20/02/2024 ? 21:04, Andreas Dannenberg a ?crit?: > Hi Romain, > > On Tue, Feb 20, 2024 at 11:03:54AM +0100, Romain Naour wrote: >> Hello Andreas, >> >> Le 20/02/2024 ? 01:41, Andreas Dannenberg a ?crit?: >>> On Mon, Feb 19, 2024 at 12:24:52PM +0100, Romain Naour wrote: >>>> Hello Michael, >>>> >>>> Le 19/02/2024 ? 12:02, Michael Nazzareno Trimarchi a ?crit?: >>>>> Hi Romain >>>>> >>>>> On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: >>>>>> >>>>>> Hello Dario, >>>>>> >>>>>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>>>>>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes >>>>>>> high-security field-securable (HS-FS) silicon to optionally customize keys >>>>>>> and encryption for security applications. >>>>>>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, >>>>>>> which, however, was buggy. This series fixes the errors and bumps the Linux >>>>>>> kernel and U-Boot required for such a new device. >>>>>>> >>>>>>> This series, which in my humble opinion, should have been immediately >>>>>>> considered to correct the compilation errors in case of HS-FS devcies, has >>>>>>> seen an increase in patches in version 4 to remove the ti-k3-image-gen >>>>>>> package thanks to Binman. Additionally, it shares some modifications and >>>>>>> views on how to implement certain changes with the series >>>>>>> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. >>>>>>> Therefore, I think it is necessary not to run them in parallel but to decide >>>>>>> whether to merge one before the other or to consider a single series where >>>>>>> the patches can be coherent with each other. I am available for both solutions. >>>>>>> Let me know. >>>>>> >>>>>> Thanks for this new version. I beleive both series should be merged into one >>>>>> since we want to follow u-boot switch to binman, add more TI K3 SoC support and >>>>>> keeping exising am62x ans am64x working in GP or HS/HS-FS. >>>>>> >>>>> >>>>> Because the Dario patchset was sent before (end of November), it's >>>>> reasonable to review and adjust that one >>>>> and apply your changes for ti_j721e_sk on top of it. It think that is >>>>> a standard way to make people happy about >>>>> their work and contribution. >>>> >>>> Actually, the two series are about the same topic: TI K3 SoC support (GP, HS, >>>> HS-FS) not only AM62x-SK HS-FS devices >>>> >>>> But due to the complexity of the BSP, the boot flow (4 way to boot!) and the >>>> switch from custom tool to binman... this series is really difficult to review >>>> without having a good understanding of TI K3 architecture peculiarity and having >>>> one of each TI evaluation boards ? >>> >>> Although I helped conceive some of this and the associated tooling early >>> on, some of the what may look strange architectural decisions were driven >>> by different use cases and requirements for the different devices >>> (especially around automotive fast/early boot, but also security) in >>> combination with limited on-chip SRAM... So this where we are at now. A >>> future AM6x device variant will have yet another boot flow, but I can >>> already say it will be very much simplified over what we have today :) >> >> About existing boot flow, I found two recent commit in u-boot that state that >> the "Split binary" (that requires sysfw.itb) is already a legacy boot flow: > > It's called "legacy boot flow" because it was the boot flow used on the > first K3 devices that were released (AM65x, J721E). This boot flow was > not used on follow-on devices. The characteristics of this boot flow is > that the initial FW image that gets loaded (tiboot3.bin) doesn't contain > any device firmwares, but only a bootloader (such as U-Boot SPL). Then > this boot loader will load the System Firmware firmware + config data > blob (sysfw.itb) into the dedicated core (called "DMSC" = Device Manager > and Security Controller). And then addiitonal boot stages will be > loaded. These devices require this boot flow, and with this it is > required to be supported by U-Boot (and any Linux distribution or build > systems that build on that). > > TI is still making/selling those "legacy boot flow" devices, and will > continue to do so for a very long time. One promiment community > incarnation that you are probably aware of is the BeagleBone AI-64. Thank you for the detailed explanation! I previouly worked on a AM57xx SoC that is nowaday legacy SoC, the latest ti-kernel 6.1 doesn't support some of the driver that where available in ti-kernel 5.10 (prueth 100M, RPMsg Sockets over virtio-rpmsg transport (use for ARM-DSP IPC3.x), TI-RTOS (the csl-common package was also removed from meta-ti)). Also the TI SDK on this plateform doesn't seems very active [1]. So, I'm worried when I read "legacy" :) [1] https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1290197/processor-sdk-am57x-legacy-processor-s-linux-update-plan > >> arm: dts: k3-binman: Add support for FIT templates >> >> Add templates for FIT images used extensively across K3 boards with most >> of the code common. This includes the FIT portions of: >> - tispl.bin >> - u-boot.img >> - sysfw.itb (in case of legacy boot flow) >> >> https://gitlab.com/u-boot/u-boot/-/commit/b153bad0f14168d5fcc02ba6bf1a2cd98daba9b5 >> >> arm: dts: k3-*-binman: Move to using templated FITs >> >> Reduce redundancy in code by using templates to generate the A72 boot >> binaries (tispl.bin and u-boot.img) as well as R5 boot binary sysfw.itb >> (for legacy boot following devices J721E and AM65x). >> >> https://gitlab.com/u-boot/u-boot/-/commit/4509b9ff0b8cb26907f9e9c3571b43565c859275 >> >> Which one should be recommended or avoided for a new design? > > Those commits are just a simplification to reduce duplication. As per > earlier comment the "legacy boot flow" is something we continue needing > to support. It isn't supposed to imply that those devices are about to > disappear. > > Not sure if this answered your question; please let me know. Yes, thank you. Best regards, Romain > > -- > Andreas Dannenberg > Texas Instruments Inc > > >> >> Best regards, >> Romain >> >> >>> >>>> The series (based on Dario's work) about ti_j721e_sk suggested to remove TI >>>> custom tools replaced by binman along with other improvements. >>>> >>>> I'll way for v5 and rebase the ti_j721e_sk on top of it. >>> >>> Thank you Romain for your buy-in. Let's focus on getting Dario's series >>> in good shape and then move onto yours. I'd also like to re-introduce >>> graphics (I had that working before) but I need to wait for all the >>> "baseline" stuff to settle first. >>> >>> >>> -- >>> Andreas Dannenberg >>> Texas Instruments Inc >>> >>> >>> >>>> >>>> Best regards, >>>> Romain >>>> >>>> >>>>> >>>>> Michael >>>>> >>>>>> My main concern is to avoid adding a new package for a tool that is already >>>>>> deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. >>>>>> >>>>>> Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". >>>>>> >>>>>> [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html >>>>>> >>>>>> Best regards, >>>>>> Romain >>>>>> >>>>>>> >> From romain.naour at smile.fr Tue Feb 20 22:06:26 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 23:06:26 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240220203200.uq2dpvky2rbv6tcw@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> <20240220012848.76amyog5pecsgld4@dasso> <20240220203200.uq2dpvky2rbv6tcw@dasso> Message-ID: Hi Andreas, Le 20/02/2024 ? 21:32, Andreas Dannenberg a ?crit?: > Dear Romain, Dario, Thomas: > > On Tue, Feb 20, 2024 at 10:32:14AM +0100, Romain Naour wrote: >> Hi Dario, >> >> Le 20/02/2024 ? 10:05, Dario Binacchi a ?crit?: >>> Hi Andreas, Romain, All >>> >>> On Tue, Feb 20, 2024 at 2:28?AM Andreas Dannenberg wrote: >>>> >>>> Romain, Dario, >>>> >>>> On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: >>>>> Hello Dario, >>>>> >>>>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>>>>> Recent versions of U-Boot can use Binman to compile and sign the generated >>>>>> binaries, thus making the use of custom tools like ti-k3-image-gen no >>>>>> longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were >>>>>> configured and used outside of it. This patch allows setting such options >>>>>> even if the package is not enabled. >>>>> >>>>> I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux >>>>> kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. >>>> >>>> There were discussions/suggestions around this before by Yann E Morin >>>> [1] and Thomas Petazzoni [2]. I think the gist of it was to move the >>>> selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing >>>> all the K3 SoC specific selections. And then other packages and Kconfig >>>> menues can depend on it more cleanly. Like it's currently done with >>>> package/freescale-imx/Config.in. This would also bring some consistency >>>> in how those NXP and TI device families are managed, which will make for >>>> a better end-user experience I think. >>> >>> If I'm not mistaken, I think the patches: >>> [18/20] boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope >>> [17/20] boot: move ti-k3-* packages to 'ti-k3' directory >>> Are heading in the direction of what we find in >>> package/freescale-imx/, with the only difference being >>> that in our case, we're under boot. >>> So, can I consider these two patches correct? > > Yes the general direction those are headed is a good... > >> Yes, can you try to move ti-k3 to package directory in V5 ? >> It would also be used later by the GPU rogue firmwares. > > ...and yes, for alignment sake with IMX it would be even better to have > it in package/, while also keeping some alignment with the naming of the > CONFIG options (hence my comment with 'BR2_PACKAGE_TI_K3_PLATFORM'). > > > Hi Thomas, > assuming we create a new package called 'package/ti-k3' I was trying to > figure out what would be the best way to name the associated CONFIG > options that control device security settings and can be used to > determine which device is being used (for later uses in context of GPU > drivers and other device capabilities)? > > I see different naming conventions being used, like this: > > 1) BR2_PACKAGE_* > 2) BR2_TARGET_* Well, it seems we use BR2_TARGET_* for package in boot/ directory instead of BR2_BOOT_* for "legacy" reason :) At some point in the history of Buildroot the target/ directory existed and was used to package bootloaders: https://gitlab.com/buildroot.org/buildroot/-/commit/d7d57699ef83cce36d87bef73c9e1fbdc765a64c But BR2_TARGET_* symbol was keep for packages (like grub) when booloaders was moved to boot/. > 3) BR2_BOOT_* So, there is no such BR2_BOOT_* option. > > Seems like BR2_TARGET_* what we have now would be most appropriate, but > then the IMX stuff uses BR2_PACKAGE_*, which *seems* to be reserved for > "userspace" (non-boot) packages as far as I can tell from my poor-man's > research. While I'd like to align things, the use of the BR2_PACKAGE_* > prefix may or may not be appropriate for our new additions here? BR2_PACKAGE_* is appropriate here. We still have BR2_TARGET_* in Buildroot since some Kconfig symbol are really old and it is not easy to replace them without breaking existing defconfig (especially the out of tree one). > > Just was hoping to get some guidance here so we don't need to re-work > this too many times. It seems ok for me, lets see the upcoming V5 from Dario. Best regards, Romain > > > -- > Andreas Dannenberg > Texas Instruments Inc > > > >> >> Please add a comment in the commit log that we make an exception to the rule "no >> subdirectory in package directory". >> >> Thanks! >> >> Best regards, >> Romain >> >> >>> >>> Thanks and regards, >>> Dario >>> >>>> >>>> >>>> >>>> -- >>>> Andreas Dannenberg >>>> Texas Instruments Inc >>>> >>>> [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html >>>> [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html >>>> >>>> >>>>> >>>>> Best regards, >>>>> Romain >>>>> >>>>> >>>>>> >>>>>> --- >>>>>> >>>>>> Added in v4 >>>>>> >>>>>> Signed-off-by: Dario Binacchi >>>>>> --- >>>>>> boot/ti-k3/Config.in | 46 ++++++++++++++ >>>>>> boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- >>>>>> boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- >>>>>> boot/uboot/Config.in | 7 +-- >>>>>> configs/ti_am62x_sk_defconfig | 2 +- >>>>>> configs/ti_am64x_sk_defconfig | 2 +- >>>>>> 6 files changed, 59 insertions(+), 67 deletions(-) >>>>>> >>>>>> diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in >>>>>> index 06dda2f156a9..9e508326c9c8 100644 >>>>>> --- a/boot/ti-k3/Config.in >>>>>> +++ b/boot/ti-k3/Config.in >>>>>> @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 >>>>>> >>>>>> if BR2_TARGET_TI_K3 >>>>>> >>>>>> +choice >>>>>> + prompt "SoC family" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SOC_AM62AX >>>>>> + bool "am62ax" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SOC_AM62X >>>>>> + bool "am62x" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SOC_AM64X >>>>>> + bool "am64x" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SOC_AM65X >>>>>> + bool "am65x" >>>>>> + >>>>>> +endchoice >>>>>> + >>>>>> +choice >>>>>> + prompt "Security type" >>>>>> + help >>>>>> + The target SoC security type option. >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_GP >>>>>> + bool "gp" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_HS_FS >>>>>> + bool "hs-fs" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_HS >>>>>> + bool "hs" >>>>>> + >>>>>> +endchoice >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SOC >>>>>> + string >>>>>> + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX >>>>>> + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X >>>>>> + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X >>>>>> + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SECTYPE >>>>>> + string >>>>>> + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP >>>>>> + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS >>>>>> + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS >>>>>> + >>>>>> source "boot/ti-k3/ti-k3-boot-firmware/Config.in" >>>>>> source "boot/ti-k3/ti-k3-core-secdev/Config.in" >>>>>> source "boot/ti-k3/ti-k3-image-gen/Config.in" >>>>>> diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in >>>>>> index 38d1598d9fc0..2d53d62dd4ee 100644 >>>>>> --- a/boot/ti-k3/ti-k3-image-gen/Config.in >>>>>> +++ b/boot/ti-k3/ti-k3-image-gen/Config.in >>>>>> @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >>>>>> bool "ti-k3-image-gen" >>>>>> depends on BR2_TARGET_TI_K3_R5_LOADER >>>>>> select BR2_TARGET_TI_K3_BOOT_FIRMWARE >>>>>> - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>>>> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS >>>>>> # We need FIT support in uboot-tools, which is why we select a >>>>>> # host package >>>>>> select BR2_PACKAGE_HOST_UBOOT_TOOLS >>>>>> @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >>>>>> https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ >>>>>> >>>>>> if BR2_TARGET_TI_K3_IMAGE_GEN >>>>>> -choice >>>>>> - prompt "SoC family" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>>>> - bool "am62ax" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>>>> - bool "am62x" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>>>> - bool "am64x" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>>>> - bool "am65x" >>>>>> - >>>>>> -endchoice >>>>>> - >>>>>> -choice >>>>>> - prompt "Security type" >>>>>> - help >>>>>> - The target SoC security type option for image gen. Valid >>>>>> - options are "gp" for General Purpose devices, "hs-fs" for >>>>>> - High Security - Field Securable devices, or "hs" for High >>>>>> - Security - Security Enforcing devices. Note for all High >>>>>> - Security device variants the TI_SECURE_DEV_PKG environmental >>>>>> - variable must be defined at build time pointing to a valid >>>>>> - core-secdev-k3 folder location, otherwise the build will >>>>>> - fail, see >>>>>> - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>>>> - bool "gp" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>>>> - bool "hs-fs" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>>>> - bool "hs" >>>>>> - >>>>>> -endchoice >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC >>>>>> - string >>>>>> - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>>>> - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>>>> - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>>>> - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>>>> >>>>>> config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE >>>>>> string >>>>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE >>>>>> - string >>>>>> - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>>>> - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>>>> - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX >>>>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X >>>>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X >>>>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X >>>>>> >>>>>> endif >>>>>> diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>>>> index 74b4fcb4bf89..834d8f7d5cd5 100644 >>>>>> --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>>>> +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>>>> @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ >>>>>> $(BR2_MAKE_HOST_DEPENDENCY) >>>>>> >>>>>> TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) >>>>>> -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) >>>>>> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) >>>>>> +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) >>>>>> +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) >>>>>> >>>>>> -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) >>>>>> +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) >>>>>> TI_K3_IMAGE_GEN_SYSFW = \ >>>>>> $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >>>>>> else >>>>>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in >>>>>> index beafb38930db..1a9d21e7c6d1 100644 >>>>>> --- a/boot/uboot/Config.in >>>>>> +++ b/boot/uboot/Config.in >>>>>> @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM >>>>>> bool "U-Boot needs TI K3 Device Manager (DM)" >>>>>> # We use the SoC selection defined for the ti-k3-image-gen >>>>>> # package >>>>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN >>>>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>>>> + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X >>>>>> help >>>>>> Some TI K3 devices need the Device Manager (DM) firmware to >>>>>> be available for the U-Boot build. >>>>>> @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM >>>>>> >>>>>> config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME >>>>>> string >>>>>> - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>>>> - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>>>> + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX >>>>>> + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X >>>>>> >>>>>> endif >>>>>> >>>>>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >>>>>> index cd26235342e4..cfefce0a77a4 100644 >>>>>> --- a/configs/ti_am62x_sk_defconfig >>>>>> +++ b/configs/ti_am62x_sk_defconfig >>>>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" >>>>>> BR2_TARGET_TI_K3=y >>>>>> +BR2_TARGET_TI_K3_SOC_AM62X=y >>>>>> BR2_TARGET_TI_K3_IMAGE_GEN=y >>>>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" >>>>>> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig >>>>>> index 1befeb4ab96c..daf78dbffff8 100644 >>>>>> --- a/configs/ti_am64x_sk_defconfig >>>>>> +++ b/configs/ti_am64x_sk_defconfig >>>>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" >>>>>> BR2_TARGET_TI_K3=y >>>>>> +BR2_TARGET_TI_K3_SOC_AM64X=y >>>>>> BR2_TARGET_TI_K3_IMAGE_GEN=y >>>>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" >>>>> >>> >>> >>> >> From ju.o at free.fr Tue Feb 20 22:07:20 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 20 Feb 2024 23:07:20 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add make runtime test Message-ID: <20240220220720.166829-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + support/testing/tests/package/test_make.py | 82 +++++++++++++++++++ .../test_make/rootfs-overlay/root/Makefile | 23 ++++++ 3 files changed, 107 insertions(+) create mode 100644 support/testing/tests/package/test_make.py create mode 100644 support/testing/tests/package/test_make/rootfs-overlay/root/Makefile diff --git a/DEVELOPERS b/DEVELOPERS index f0e16af1623..6c8d07d4761 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1815,6 +1815,8 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_make.py +F: support/testing/tests/package/test_make/ F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py diff --git a/support/testing/tests/package/test_make.py b/support/testing/tests/package/test_make.py new file mode 100644 index 00000000000..d549cca37d8 --- /dev/null +++ b/support/testing/tests/package/test_make.py @@ -0,0 +1,82 @@ +import os + +import infra.basetest + + +class TestMake(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_make/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_MAKE=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def gen_expected_str(self, count): + """Return the expected string generated by the test Makefile""" + return "".join(map(lambda x: str(x), range(1,count+1))) + + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("make --version") + + # We touch the Makefile to set its modification time to the + # current system time. This is to avoid warnings from Make + # about having files with timestamps in the future. This is + # because the minimal system running in the emulator might not + # set the clock to the real time, and the Makefile has a + # correct timestamp from the build host (which is likely at + # the correct time). + self.assertRunOk("touch Makefile") + + # We test the "message" target and check we get the expected + # string. + out, ret = self.emulator.run("make message") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello Buildroot!") + + # We redo the same test, this time by passing a new message + # with a variable. + msg = "This is Another Message..." + out, ret = self.emulator.run(f"make message MESSAGE='{msg}'") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) + + # We run a simple "make" invocation, using the defaults. + self.assertRunOk("make") + + # We check the generated output contains the expected string. + expected_str = self.gen_expected_str(10) + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_str) + + # Clean the previous invocation. + self.assertRunOk("make clean") + + # We check a output generated file is no longer present. + self.assertRunOk("test ! -e output.txt") + + # We run an invocation with a larger COUNT value. GNU Make + # version 4.4 introduced the --shuffle option, which shuffle + # rules. We use it with a constant seed, in order to have a + # stable reshuffling in all test runs. We also include in this + # execution a request for parallel jobs. + count = 50 + seed = 123456 + self.assertRunOk(f"make -j10 --shuffle={seed} COUNT={count}") + + # Despite the pseudo-randomization in the previous invocation, + # the expected output should be correctly ordered. + expected_str = self.gen_expected_str(count) + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_str) diff --git a/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile b/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile new file mode 100644 index 00000000000..7ac86945a5e --- /dev/null +++ b/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile @@ -0,0 +1,23 @@ +MESSAGE ?= "Hello Buildroot!" +COUNT ?= 10 + +LIST = $(shell seq $(COUNT)) +INPUTS = $(addsuffix .in.txt,$(LIST)) +OUTPUT = output.txt + +.PHONY: all +all: $(OUTPUT) + +.PHONY: clean +clean: + $(RM) $(OUTPUT) *.in.txt + +.PHONY: message +message: + @echo $(MESSAGE) + +%.in.txt: + echo $(subst .in.txt,,$@) > $@ + +$(OUTPUT): $(INPUTS) + (cat $? | tr -d '\n' ; echo) > $@ -- 2.43.2 From romain.naour at smile.fr Tue Feb 20 22:26:36 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 23:26:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: Message-ID: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> Hello David, Le 20/02/2024 ? 22:18, David Picard a ?crit?: > Hi, > > I checked my subscription options, but I don't receive the messages I send to > the list. > > My comments are in the text. > > Le 14/02/2024 ? 17:23, Romain Naour a ?crit?: >> Hello David, >> >> Le 14/02/2024 ? 10:34, David Picard a ?crit?: >>> Add a package for the Intel/Altera SoC FPGA hardware library. It is >>> used to let the HPS and the FPGA fabric communicate with each other. >> We received 4 thime the same patch on the mailing list: >> >> http://patchwork.ozlabs.org/project/buildroot/patch/20240214081921.4663-1-david.picard at clermont.in2p3.fr/ >> >> http://patchwork.ozlabs.org/project/buildroot/patch/2770b2ac-4cec-4d56-81e9-89dfd33f786a at clermont.in2p3.fr/ >> >> http://patchwork.ozlabs.org/project/buildroot/patch/abcd4153-41e2-45ce-a89a-e198e86ba337 at clermont.in2p3.fr/ >> >> http://patchwork.ozlabs.org/project/buildroot/patch/c90e4512-405c-40fb-b597-1a04d7449afa at clermont.in2p3.fr/ >> >> Which one should we review? >> >> Please, send patch using git send-email tool. >> >> (https://nightly.buildroot.org/manual.html#submitting-patches) >> >> Also, when you resend a patch, add the changelog info. >> >> https://nightly.buildroot.org/manual.html#_patch_revision_changelog >> >> >>> Signed-off-by: David Picard >>> --- >>> package/Config.in | 1 + >>> package/intel-socfpga-hwlib/Config.in | 12 ++++++ >>> .../intel-socfpga-hwlib.hash | 2 + >>> .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ >>> 4 files changed, 54 insertions(+) >>> create mode 100644 package/intel-socfpga-hwlib/Config.in >>> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >>> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >>> >>> diff --git a/package/Config.in b/package/Config.in >>> index bf0fe078b9..cd6c6bcaba 100644 >>> --- a/package/Config.in >>> +++ b/package/Config.in >>> @@ -1736,6 +1736,7 @@ menu "Hardware handling" >>> source "package/gnu-efi/Config.in" >>> source "package/hackrf/Config.in" >>> source "package/hidapi/Config.in" >>> + source "package/intel-socfpga-hwlib/Config.in" >>> source "package/jitterentropy-library/Config.in" >>> source "package/lcdapi/Config.in" >>> source "package/let-me-create/Config.in" >>> diff --git a/package/intel-socfpga-hwlib/Config.in >>> b/package/intel-socfpga-hwlib/Config.in >>> new file mode 100644 >>> index 0000000000..ced6483a59 >>> --- /dev/null >>> +++ b/package/intel-socfpga-hwlib/Config.in >>> @@ -0,0 +1,12 @@ >>> +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB >>> + bool "intel-socfpga-hwlib" >>> + depends on BR2_arm >>> + help >>> + This package provides the Intel SoC FPGA HWLIB for >>> + Intel/Altera SoC FPGA chips. >>> + This library allows to communicate with the FPGA fabric from >>> + Linux, running on the HPS device. >>> + The source code is not compiled. Instead, a symlink is added >>> + to $(STAGING_DIR)/lib. >>> + >>> + https://github.com/altera-opensource/intel-socfpga-hwlib >> Check the coding style with ./utils/check-package >> >>> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >>> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >>> new file mode 100644 >>> index 0000000000..60efe9013e >>> --- /dev/null >>> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >>> @@ -0,0 +1,2 @@ >>> +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 >>> intel-socfpga-hwlib-23.12.02.tar.gz >>> +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 >>> License.txt >>> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >>> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >>> new file mode 100644 >>> index 0000000000..bf18c23560 >>> --- /dev/null >>> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >>> @@ -0,0 +1,39 @@ >>> +################################################################################ >>> +# >>> +# intel-socfpga-hwlib >>> +# >>> +################################################################################ >>> + >>> +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 >>> +INTEL_SOCFPGA_HWLIB_SITE = $(call >>> github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) >>> +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY >> It's unexpected to find a PROPRIETARY tool in a gitbub accound with "opensource" >> in their name :) > I think "Intel" is the best match : https://spdx.org/licenses/Intel.html The two are really close indeed, but the Intel one contains "EXPORT LAWS" part at the end that is missing in the intel-socfpga-hwlib license file. Also, the Intel use bullet point while BSD use a number (not sure it's really significant) >> >>> +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt >> It look like a BSD-3-Clause license >> >> https://spdx.org/licenses/BSD-3-Clause.html >> >>> +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES >>> +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES >>> + >>> +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS >>> + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) >>> $(STAGING_DIR)/lib/intel-socfpga-hwlib >>> +endef >> I don't think this is what you want to do. > I did it on purpose. This package is called a library, but it really is a bunch > of C files. You only use a subset, depending on your hardware. This code was > made to be compiled in the application, not as a conventional library. > I could copy the files to STAGING, but cleaning would be more complicated and it > would waste some disk space. Ok, maybe is should not be packaged in Buildroot then. When a package is build by Buildroot, it can generate a binary, a library or provide some header files. If your application doesn't bundle intel-socfpga-hwlib sources but it requires it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra download step. > >> >>> + >>> +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS >>> +# mkdir -p $(BINARIES_DIR)/intel-ucode >>> +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ >>> +# $(@D)/intel-ucode/* >>> +# endef >>> +# >>> +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) >>> +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS >>> +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode >>> +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ >>> +# $(@D)/intel-ucode/* >>> +# endef >>> +# else >>> +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO >>> +# endif >>> + >>> +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS >>> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) >>> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) >>> +# endef >> Please, don't add commended code. > Of course not. I'll clean it. > > Thanks for reviewing, > David Best regards, Romain >> >> Best regards, >> Romain >> >> >>> + >>> +$(eval $(generic-package)) >>> > From dannenberg at ti.com Tue Feb 20 22:34:23 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Tue, 20 Feb 2024 16:34:23 -0600 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> Message-ID: <20240220223423.bnrqouwcuuxhw43f@dasso> Hi Dario, On Sat, Feb 17, 2024 at 05:02:43PM +0100, Dario Binacchi wrote: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. In this case, let's copy it to the binaries directory. > > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 2a10024aedaa..643298a1e70a 100644 > --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > endef > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > + > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > endef I like how this picks/renames the tiboot3.bin corresponding to the device security type, this way allowing to generate a tailored and readily bootable image depending on GP, HS-FS, HS device type. However the find/copy approach may not always work as intended. Consider the build output of R5 U-Boot SPL for AM64x for example: $ ll tiboot3-*.bin -rw-rw-r-- 1 a0797059 a0797059 304431 Feb 20 15:34 tiboot3-am64x-gp-evm.bin -rw-rw-r-- 1 a0797059 a0797059 532270 Feb 20 15:34 tiboot3-am64x_sr2-hs-evm.bin -rw-rw-r-- 1 a0797059 a0797059 532270 Feb 20 15:34 tiboot3-am64x_sr2-hs-fs-evm.bin Note how there's a '_sr2' (Silicon Revision 2.0) in the filename of some of the boot binaries. I did look at the different K3 devices supported in U-Boot at the moment, and it looks like currently this will not be an issue that will manifest itself as the device security type happens to be unique enough to also pick the right silicon revision. But of course this doesn't mean it'll always stay like this.... So it might be better to leverage BR2_TARGET_TI_K3_SOC to be more specific in that find/copy operation and use this to replace the asterisk in "tiboot3-*". So then somebody can use "am64x" or "am64x_sr2" for example as BR2_TARGET_TI_K3_SOC, and you would guarantee the right file gets used to populate the final tiboot3.bin. -- Andreas Dannenberg Texas Instruments Inc > > $(eval $(kconfig-package)) > -- > 2.43.0 > From romain.naour at smile.fr Tue Feb 20 22:50:24 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 23:50:24 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Romain Naour for am574x_idk_defconfig Message-ID: <20240220225025.781466-1-romain.naour@smile.fr> The DEVELOPERS entry was missing. Fixes: 35eb74c634 ("configs/am574x_idk_defconfig: new defconfig") Signed-off-by: Romain Naour --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..ff44741f9f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2667,7 +2667,9 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ +F: board/ti/am574x-idk/ F: configs/qemu_* +F: configs/am574x_idk_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ -- 2.43.0 From romain.naour at smile.fr Tue Feb 20 22:50:25 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 23:50:25 +0100 Subject: [Buildroot] [PATCH] configs/lepotato_defconfig: new defconfig In-Reply-To: <20240220225025.781466-1-romain.naour@smile.fr> References: <20240220225025.781466-1-romain.naour@smile.fr> Message-ID: <20240220225025.781466-2-romain.naour@smile.fr> Add basic support for the Libre Computer "Le Potato" SBC. https://libre.computer/products/aml-s905x-cc Signed-off-by: Romain Naour --- DEVELOPERS | 2 + board/librecomputer/lepotato/extlinux.conf | 4 ++ board/librecomputer/lepotato/genimage.cfg | 33 +++++++++ board/librecomputer/lepotato/post-build.sh | 5 ++ board/librecomputer/lepotato/post-image.sh | 23 ++++++ board/librecomputer/lepotato/readme.txt | 82 ++++++++++++++++++++++ configs/lepotato_defconfig | 50 +++++++++++++ 7 files changed, 199 insertions(+) create mode 100644 board/librecomputer/lepotato/extlinux.conf create mode 100644 board/librecomputer/lepotato/genimage.cfg create mode 100755 board/librecomputer/lepotato/post-build.sh create mode 100755 board/librecomputer/lepotato/post-image.sh create mode 100644 board/librecomputer/lepotato/readme.txt create mode 100644 configs/lepotato_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index ff44741f9f..b44246ee5c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2667,9 +2667,11 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ +F: board/librecomputer/lepotato/ F: board/ti/am574x-idk/ F: configs/qemu_* F: configs/am574x_idk_defconfig +F: configs/lepotato_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ diff --git a/board/librecomputer/lepotato/extlinux.conf b/board/librecomputer/lepotato/extlinux.conf new file mode 100644 index 0000000000..e0fea6c7aa --- /dev/null +++ b/board/librecomputer/lepotato/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /meson-gxl-s905x-libretech-cc.dtb + append console=ttyAML0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait diff --git a/board/librecomputer/lepotato/genimage.cfg b/board/librecomputer/lepotato/genimage.cfg new file mode 100644 index 0000000000..b10e5d9440 --- /dev/null +++ b/board/librecomputer/lepotato/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "Image", + "meson-gxl-s905x-libretech-cc.dtb", + "extlinux" + } + + label = "boot" + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image="boot.vfat" + size = 64M + offset = 2M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + size = 128M + offset = 0 + } +} diff --git a/board/librecomputer/lepotato/post-build.sh b/board/librecomputer/lepotato/post-build.sh new file mode 100755 index 0000000000..8dae08a47c --- /dev/null +++ b/board/librecomputer/lepotato/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf diff --git a/board/librecomputer/lepotato/post-image.sh b/board/librecomputer/lepotato/post-image.sh new file mode 100755 index 0000000000..69fb382dc1 --- /dev/null +++ b/board/librecomputer/lepotato/post-image.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" + +AMLOGIC_DIR=${BINARIES_DIR}/amlogic-boot-fip +FIP_DIR=${BINARIES_DIR}/fip + +mkdir -p "${FIP_DIR}" + +(cd "${AMLOGIC_DIR}" && \ + ./build-fip.sh lepotato \ + "${BINARIES_DIR}"/u-boot.bin \ + "${FIP_DIR}") + +dd if="${FIP_DIR}"/u-boot.bin.sd.bin \ + of="${BINARIES_DIR}"/sdcard.img \ + conv=fsync,notrunc bs=1 count=444 + +dd if="${FIP_DIR}"/u-boot.bin.sd.bin \ + of="${BINARIES_DIR}"/sdcard.img \ + conv=fsync,notrunc bs=512 skip=1 seek=1 diff --git a/board/librecomputer/lepotato/readme.txt b/board/librecomputer/lepotato/readme.txt new file mode 100644 index 0000000000..391b030e1f --- /dev/null +++ b/board/librecomputer/lepotato/readme.txt @@ -0,0 +1,82 @@ +Libre Computer Le Potato (AML-S905X-CC) + +Intro +===== + +Libre Computer "Le Potato" is a low cost SBC based around an Amlogic +s905x SoC (quad A53), 2GB DDR3, Mali-450: + +https://libre.computer/products/aml-s905x-cc/ + +How to build it +=============== + +Configure Buildroot: + + $ make lepotato_defconfig + +Then you can edit the build options using + + $ make menuconfig + +Compile everything and build rootfs image: + + $ make + +Note: you will need to have access to the network, since Buildroot +will download the packages' sources. + +Result of the build +------------------- + +After building, you should obtain this tree: + +output/images/ ++-- amlogic-boot-fip ++ +-- axg.inc ++ +-- build-fip.sh ++ +-- g12a.inc ++ +-- gxbb.inc ++ +-- gxl.inc ++ `-- lepotato ++ +-- acs.bin ++ +-- acs_tool.py ++ +-- aml_encrypt_gxl ++ +-- bl21.bin ++ +-- bl2.bin ++ +-- bl301.bin ++ +-- bl30.bin ++ +-- bl31.img ++ +-- blx_fix.sh ++ `-- Makefile ++-- boot.vfat ++-- extlinux ++ `-- extlinux.conf ++-- fip ++ +-- u-boot.bin ++ +-- u-boot.bin.sd.bin ++ +-- u-boot.bin.usb.bl2 ++ `-- u-boot.bin.usb.tpl ++-- Image ++-- meson-gxl-s905x-libretech-cc.dtb ++-- rootfs.ext2 ++-- rootfs.ext4 -> rootfs.ext2 ++-- rootfs.tar ++-- sdcard.img +`-- u-boot.bin + +The post-image script uses the files in the amlogic-boot-fip folder to sign +the bootloader image before integrating it into the sdcard image. + +How to write the SD card or eMMC +================================ + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card or eMMC with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Insert the micro SDcard into your Le Potato and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/lepotato_defconfig b/configs/lepotato_defconfig new file mode 100644 index 0000000000..e144fd5197 --- /dev/null +++ b/configs/lepotato_defconfig @@ -0,0 +1,50 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/librecomputer/lepotato/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/librecomputer/lepotato/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxl-s905x-libretech-cc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# For kernel modules autoloading +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="libretech-cc" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y + +# Required tool to sign the bootloader image +BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP=y +BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP_DEVICE="lepotato" + +# Required tools to create the SD image +BR2_PACKAGE_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y -- 2.43.0 From wilfred.mallawa at wdc.com Wed Feb 21 00:44:00 2024 From: wilfred.mallawa at wdc.com (Wilfred Mallawa) Date: Wed, 21 Feb 2024 10:44:00 +1000 Subject: [Buildroot] [PATCH 1/1] package/libspdm: bump version to 3.2.0 Message-ID: <20240221004400.27429-1-wilfred.mallawa@wdc.com> Additionally, add an upstream patch that fixes the configuration for "NONE" toolchain variant in libspdm. That is, where the build environment provides compile/link options. Signed-off-by: Wilfred Mallawa --- ...eLists-remove-fixed-options-for-NONE.patch | 51 +++++++++++++++++++ package/libspdm/libspdm.hash | 2 +- package/libspdm/libspdm.mk | 2 +- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch new file mode 100644 index 0000000000..0d1287a769 --- /dev/null +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch @@ -0,0 +1,51 @@ +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 +From: Wilfred Mallawa +Date: Mon, 19 Feb 2024 09:56:14 +1000 +Subject: [PATCH] CMakeLists: remove fixed options for NONE + +The use of the NONE toolchain option is such that we can provide at the +build project level (buildroot etc...). However, the changes introduced +in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker +option that does not comply with the definition of the options as +specified in [1]. This change removes those options. + +[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments + +Signed-off-by: Wilfred Mallawa +--- + CMakeLists.txt | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c300cc817..f6cf17d269 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(CMAKE_EXE_LINKER_FLAGS "") + + SET(CMAKE_C_LINK_EXECUTABLE "") +- +- elseif(TOOLCHAIN STREQUAL "NONE") +- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") +- ADD_COMPILE_OPTIONS(-g) +- endif() +- if(GCOV STREQUAL "ON") +- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) +- endif() +- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) +- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) +- +- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) +- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) +- if(GCOV STREQUAL "ON") +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") +- endif() +- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") +- + endif() + + if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") +-- +2.43.2 + diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash index 23faba1c4b..32415bcfce 100644 --- a/package/libspdm/libspdm.hash +++ b/package/libspdm/libspdm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183 libspdm-3.1.1.tar.gz +sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk index 34dbb457c4..2ec35be0ac 100644 --- a/package/libspdm/libspdm.mk +++ b/package/libspdm/libspdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPDM_VERSION = 3.1.1 +LIBSPDM_VERSION = 3.2.0 LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) LIBSPDM_LICENSE = BSD-3-Clause LIBSPDM_LICENSE_FILES = LICENSE.md -- 2.43.2 From alistair23 at gmail.com Wed Feb 21 01:42:03 2024 From: alistair23 at gmail.com (Alistair Francis) Date: Wed, 21 Feb 2024 11:42:03 +1000 Subject: [Buildroot] [PATCH 1/1] package/libspdm: bump version to 3.2.0 In-Reply-To: <20240221004400.27429-1-wilfred.mallawa@wdc.com> References: <20240221004400.27429-1-wilfred.mallawa@wdc.com> Message-ID: On Wed, Feb 21, 2024 at 10:52?AM Wilfred Mallawa via buildroot wrote: > > Additionally, add an upstream patch that fixes the configuration for > "NONE" toolchain variant in libspdm. That is, where the build > environment provides compile/link options. > > Signed-off-by: Wilfred Mallawa Reviewed-by: Alistair Francis Alistair > --- > ...eLists-remove-fixed-options-for-NONE.patch | 51 +++++++++++++++++++ > package/libspdm/libspdm.hash | 2 +- > package/libspdm/libspdm.mk | 2 +- > 3 files changed, 53 insertions(+), 2 deletions(-) > create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > > diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > new file mode 100644 > index 0000000000..0d1287a769 > --- /dev/null > +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > @@ -0,0 +1,51 @@ > +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 > +From: Wilfred Mallawa > +Date: Mon, 19 Feb 2024 09:56:14 +1000 > +Subject: [PATCH] CMakeLists: remove fixed options for NONE > + > +The use of the NONE toolchain option is such that we can provide at the > +build project level (buildroot etc...). However, the changes introduced > +in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker > +option that does not comply with the definition of the options as > +specified in [1]. This change removes those options. > + > +[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments > + > +Signed-off-by: Wilfred Mallawa > +--- > + CMakeLists.txt | 19 ------------------- > + 1 file changed, 19 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 9c300cc817..f6cf17d269 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") > + SET(CMAKE_EXE_LINKER_FLAGS "") > + > + SET(CMAKE_C_LINK_EXECUTABLE "") > +- > +- elseif(TOOLCHAIN STREQUAL "NONE") > +- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) > +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") > +- ADD_COMPILE_OPTIONS(-g) > +- endif() > +- if(GCOV STREQUAL "ON") > +- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) > +- endif() > +- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) > +- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) > +- > +- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) > +- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) > +- if(GCOV STREQUAL "ON") > +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") > +- endif() > +- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") > +- > + endif() > + > + if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") > +-- > +2.43.2 > + > diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash > index 23faba1c4b..32415bcfce 100644 > --- a/package/libspdm/libspdm.hash > +++ b/package/libspdm/libspdm.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183 libspdm-3.1.1.tar.gz > +sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz > sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md > diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk > index 34dbb457c4..2ec35be0ac 100644 > --- a/package/libspdm/libspdm.mk > +++ b/package/libspdm/libspdm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSPDM_VERSION = 3.1.1 > +LIBSPDM_VERSION = 3.2.0 > LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) > LIBSPDM_LICENSE = BSD-3-Clause > LIBSPDM_LICENSE_FILES = LICENSE.md > -- > 2.43.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From dave.mehler at gmail.com Wed Feb 21 03:05:34 2024 From: dave.mehler at gmail.com (David Mehler) Date: Tue, 20 Feb 2024 22:05:34 -0500 Subject: [Buildroot] iwd, buildroot, sets Wi-Fi to AutoConnect disabled Message-ID: Hello, I've created a file /var/lib/iwd/NetworkName.psk but it's AutoConnect status keeps getting set to false, I manually edit the file on the built-host and it reverts to a false setting, and a wireless connection is not made. Any ideas? Thanks. Dave. From yann.morin.1998 at free.fr Wed Feb 21 06:28:20 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 07:28:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> References: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> Message-ID: Romain, David, All, On 2024-02-20 23:26 +0100, Romain Naour spake thusly: > Le 20/02/2024 ? 22:18, David Picard a ?crit?: [--SNIP--] > >>> +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY > >> It's unexpected to find a PROPRIETARY tool in a gitbub accound with "opensource" > >> in their name :) It's not common, but we do already have a bunch of such packages: $ git grep -E 'PROPRIETARY\>' package/ boot/ |wc -l 13 [--SNIP--] > > I did it on purpose. This package is called a library, but it really is a bunch > > of C files. You only use a subset, depending on your hardware. This code was > > made to be compiled in the application, not as a conventional library. > > I could copy the files to STAGING, but cleaning would be more complicated and it > > would waste some disk space. > Ok, maybe is should not be packaged in Buildroot then. > When a package is build by Buildroot, it can generate a binary, a library or > provide some header files. > If your application doesn't bundle intel-socfpga-hwlib sources but it requires > it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra > download step. I agree with Romain. It does not make miuch sense IMHO to just drop source files like that. And the _EXTRA_DOWNLOADS mechanism is exactly tailored to such cases. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From david.picard at clermont.in2p3.fr Wed Feb 21 08:36:28 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 21 Feb 2024 09:36:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> Message-ID: So, should I submit a package, using the LIBFOO_EXTRA_DOWNLOADS feature ? What value would you recommend for LIBFOO_DL_DIR ? David Le 21/02/2024 ? 07:28, Yann E. MORIN a ?crit?: >>> I did it on purpose. This package is called a library, but it really is a bunch >>> of C files. You only use a subset, depending on your hardware. This code was >>> made to be compiled in the application, not as a conventional library. >>> I could copy the files to STAGING, but cleaning would be more complicated and it >>> would waste some disk space. >> Ok, maybe is should not be packaged in Buildroot then. >> When a package is build by Buildroot, it can generate a binary, a library or >> provide some header files. >> If your application doesn't bundle intel-socfpga-hwlib sources but it requires >> it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra >> download step. > I agree with Romain. It does not make miuch sense IMHO to just drop > source files like that. And the _EXTRA_DOWNLOADS mechanism is exactly > tailored to such cases. -------------- next part -------------- An HTML attachment was scrubbed... URL: From dario.binacchi at amarulasolutions.com Wed Feb 21 10:19:50 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 21 Feb 2024 11:19:50 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Message-ID: Hi Romain, On Mon, Feb 19, 2024 at 11:15?AM Romain Naour wrote: > > Hello Dario, > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > > Recent version of U-Boot use binman to provide a mechanism for building > > images, from simple SPL + U-Boot combinations, to more complex > > arrangements with many parts. > > > > The patch set the BINMAN_INDIRS environment variable to provide the > > directory to search for binary blobs and select the packages required by > > binman. > > > > Co-developed-by: Michael Trimarchi > > Signed-off-by: Michael Trimarchi > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v4: > > - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > > > Changes in v2: > > - Change commit message > > - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > - Select packages required by binman if > > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index 0ffcb8235f2e..2a10024aedaa 100644 > > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ > > host-pkgconf \ > > $(BR2_MAKE_HOST_DEPENDENCY) \ > > host-arm-gnu-toolchain \ > > - host-openssl > > + host-openssl \ > > + host-python-attrs \ > > + host-python-jsonschema \ > > + host-python-jsonschema-specifications \ > > + host-python-pyyaml \ > > + host-python-referencing \ > > + host-python-rpds-py > > Most of theses new dependencies are not ti-k3-r5-loader dependencies but > host-python-jsonschema runtime dependencies. I removed the runtime dependencies and tried to modify the patch based on your indications and your patch (http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/), but I'm encountering compilation errors specifically on the Python modules that you indicated as runtime dependencies. I tried to compile ti_am62x_sk_defconfig on your series (i. e. "Add ti_j721e_sk_defconfig"), but it seems like the HSFS option has disappeared. So I need to add the runtime dependencies as well to compile correctly. Thanks and regards, Dario > > Note: host-python-jsonschema depends on > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS due to its runtime dependency on > host-python-rpds-py. > > > > > TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > > TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > > @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ > > $(BR2_BISON_HOST_DEPENDENCY) \ > > $(BR2_FLEX_HOST_DEPENDENCY) > > > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) > > It's a u-boot package config option. just add host-python-pylibfdt the dependency. > > > +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt > > +endif > > + > > ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) > > TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig > > else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) > > @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > > ARCH=arm \ > > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > > + BINMAN_INDIRS=$(BINARIES_DIR) \ > > I suggested to add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN but indeed we should > use binman unconditionally for ti-k3-r5-loader package. > > http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ > > Best regards, > Romain > > > > HOSTLDFLAGS="$(HOST_LDFLAGS)" > > > > define TI_K3_R5_LOADER_BUILD_CMDS > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From david.picard at clermont.in2p3.fr Wed Feb 21 12:25:48 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 21 Feb 2024 13:25:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> Message-ID: Or should I add LIBFOO_EXTRA_DOWNLOADS to my application package ? Le 21/02/2024 ? 09:36, David Picard a ?crit?: > So, should I submit a package, using the LIBFOO_EXTRA_DOWNLOADS > feature ? What value would you recommend for LIBFOO_DL_DIR ? > > David > > Le 21/02/2024 ? 07:28, Yann E. MORIN a ?crit?: >>>> I did it on purpose. This package is called a library, but it really is a bunch >>>> of C files. You only use a subset, depending on your hardware. This code was >>>> made to be compiled in the application, not as a conventional library. >>>> I could copy the files to STAGING, but cleaning would be more complicated and it >>>> would waste some disk space. >>> Ok, maybe is should not be packaged in Buildroot then. >>> When a package is build by Buildroot, it can generate a binary, a library or >>> provide some header files. >>> If your application doesn't bundle intel-socfpga-hwlib sources but it requires >>> it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra >>> download step. >> I agree with Romain. It does not make miuch sense IMHO to just drop >> source files like that. And the _EXTRA_DOWNLOADS mechanism is exactly >> tailored to such cases. > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From antoine.coutant at smile.fr Wed Feb 21 13:26:10 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Wed, 21 Feb 2024 14:26:10 +0100 Subject: [Buildroot] [PATCH v4 4/7] package/opencl-headers: new package In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-5-antoine.coutant@smile.fr> Message-ID: Yann, All, On 12/02/2024 14:44, Antoine Coutant wrote: > > Yann, All, > > On 07/02/2024 16:58, Yann E. MORIN wrote: >> Antoine, All, >> >> On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >>> From: Sebastian Weyer >>> >>> These headers provide the C language API bindings. It is a complement to >>> the C++ bindings already available in opencl-clhpp. This package is >>> required to build opencl-icd-loader: >>> >>> https://github.com/KhronosGroup/OpenCL-ICD-Loader#dependencies >>> >>> Signed-off-by: Sebastian Weyer >>> Signed-off-by: Antoine Coutant >>> --- >> [--SNIP--] >>> diff --git a/package/opencl-headers/Config.in b/package/opencl-headers/Config.in >>> new file mode 100644 >>> index 0000000000..092d8a2a4d >>> --- /dev/null >>> +++ b/package/opencl-headers/Config.in >>> @@ -0,0 +1,7 @@ >>> +config BR2_PACKAGE_OPENCL_HEADERS >>> + bool "opencl-headers" >>> + depends on BR2_PACKAGE_HAS_LIBOPENCL >> BR2_PACKAGE_HAS_LIBOPENCL can be set by mesa3d when BR2_PACKAGE_MESA3D_OPENCL >> is enabled. In this case, will mesa3d install its own headers? If so, >> that will generate a conflict. > > BR2_PACKAGE_HAS_LIBOPENCL doesn't guarantee that CL headers > > will be installed. Mesa3d install headers if Clover is enabled and > > opencl-icd is disabled [1]. So you are right, it will generate conflict in > > case OpenCL-Headers and Clover are built without icd mode. > >> Furthermore, this will also conflict with mesa3d-headers, and it also >> installs CL headers. > Yes, this will generate the same conflict here... Besides, the Mesa build system does not install headers if icd option is enabled. I think the reason is that OpenCL-ICD-Loader explicitly depends on OpenCL-Headers [1]. Thus, mesa lets users install the headers that match opencl-icd-loader version. Mesa build system is designed to not install CL headers when they are installed by ICD Loader. However, Buildroot package mesa3d-headers does not check this condition and install CL headers as soon as libopencl is present. Thus, I think that I will add a dependency to prevent mesa3d-headers from installing headers when OpenCL-Headers package is selected. [1]: https://github.com/KhronosGroup/OpenCL-ICD-Loader?tab=readme-ov-file#dependencies >> So, why do we need opencl-headers and can't rely on the existing >> mesa3d-headers package? > > The problem is that the headers installed by mesa differ from those > > in the OpenCL-Headers package. > > $ diff -q OpenCL-Headers/CL/cl_icd.h mesa/include/CL/cl_icd.h > Files OpenCL-Headers/CL/cl_icd.h and mesa/include/CL/cl_icd.h differ > > This diff was performed using OpenCL-Headers v2023.12.14 and > > mesa-23.3.4. Moreover, cl_layer.h, cl_half.h and cl_function_types.h > files are > > missing from mesa headers. These differences causes errors when building > > opencl-icd-loader: > > ... > > ./build/opencl-icd-loader-2023.12.14/loader/icd.c:23:10: fatal error: > CL/cl_layer.h: No such file or directory > > ???23 | #include > > | ^~~~~~~~~~~~~~~ > > compilation terminated. > > ./build/opencl-icd-loader-2023.12.14/loader/icd_dispatch.c:26:8: > error: unknown type name ?clGetICDLoaderInfoOCLICD_t? > > ???26 | static clGetICDLoaderInfoOCLICD_t clGetICDLoaderInfoOCLICD; > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > ... > > This is why we cannot rely on mesa3d headers and why OpenCL-Headers > > package is required. > >> Regards, >> Yann E. MORIN. > > I will add guards to prevent conflicts in the v5. And add some lines > > in the commit log to explain why mesa3d headers can't be used to > > build OpenCL-ICD-Loader. > > > Thanks for your feedback ! > > > [1]: > https://gitlab.freedesktop.org/mesa/mesa/-/blob/23.3/include/meson.build?ref_type=heads#L135 > > > Regards, > > Antoine Coutant > -------------- next part -------------- An HTML attachment was scrubbed... URL: From jubalh at iodoru.org Wed Feb 21 14:30:01 2024 From: jubalh at iodoru.org (Michael Vetter) Date: Wed, 21 Feb 2024 15:30:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.13.1 Message-ID: <20240221143001.30174-1-jubalh@iodoru.org> Signed-off-by: Michael Vetter --- package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index e284e8cca6..ec5a55985a 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz +sha256 86c0abd348ae66feb40b6886f2c7f04525f1d5b20a48c10d4db4ed532dc63f22 libstrophe-0.13.1.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index 257593bbec..42d582fe9c 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.13.0 +LIBSTROPHE_VERSION = 0.13.1 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf -- 2.35.3 From romain.naour at smile.fr Wed Feb 21 15:29:22 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 21 Feb 2024 16:29:22 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Message-ID: <7c4ef18e-774f-4a65-8e51-7a016ed89649@smile.fr> Hello Dario, Le 21/02/2024 ? 11:19, Dario Binacchi a ?crit?: > Hi Romain, > > On Mon, Feb 19, 2024 at 11:15?AM Romain Naour wrote: >> >> Hello Dario, >> >> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>> Recent version of U-Boot use binman to provide a mechanism for building >>> images, from simple SPL + U-Boot combinations, to more complex >>> arrangements with many parts. >>> >>> The patch set the BINMAN_INDIRS environment variable to provide the >>> directory to search for binary blobs and select the packages required by >>> binman. >>> >>> Co-developed-by: Michael Trimarchi >>> Signed-off-by: Michael Trimarchi >>> Signed-off-by: Dario Binacchi >>> >>> --- >>> >>> Changes in v4: >>> - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >>> >>> Changes in v2: >>> - Change commit message >>> - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >>> - Select packages required by binman if >>> BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled >>> >>> Signed-off-by: Dario Binacchi >>> --- >>> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- >>> 1 file changed, 12 insertions(+), 1 deletion(-) >>> >>> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> index 0ffcb8235f2e..2a10024aedaa 100644 >>> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ >>> host-pkgconf \ >>> $(BR2_MAKE_HOST_DEPENDENCY) \ >>> host-arm-gnu-toolchain \ >>> - host-openssl >>> + host-openssl \ >>> + host-python-attrs \ >>> + host-python-jsonschema \ >>> + host-python-jsonschema-specifications \ >>> + host-python-pyyaml \ >>> + host-python-referencing \ >>> + host-python-rpds-py >> >> Most of theses new dependencies are not ti-k3-r5-loader dependencies but >> host-python-jsonschema runtime dependencies. > > I removed the runtime dependencies and tried to modify the patch based > on your indications and your patch > (http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/), > but I'm encountering compilation errors specifically on the Python > modules that you indicated as runtime > dependencies. What's the issue? Make sure to take host-python changes from my series, some of them was updated with their own runtime dependencies: For example: http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-7-romain.naour at smile.fr/ I tried to compile ti_am62x_sk_defconfig on your series > (i. e. "Add ti_j721e_sk_defconfig"), > but it seems like the HSFS option has disappeared. Indeed, this is something we need to improve. > So I need to add the runtime dependencies as well to compile correctly. Can you try with only patch 4/21 (package/python-attrs: add host variant) to patch 10/21 (boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option). Maybe update the last patch 10/21 since it was suggested to remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option to make binman use mandatory for ti-k3-r5-loader package. Best regards, Romain > > Thanks and regards, > Dario > >> >> Note: host-python-jsonschema depends on >> BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS due to its runtime dependency on >> host-python-rpds-py. >> >>> >>> TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) >>> TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) >>> @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ >>> $(BR2_BISON_HOST_DEPENDENCY) \ >>> $(BR2_FLEX_HOST_DEPENDENCY) >>> >>> +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) >> >> It's a u-boot package config option. just add host-python-pylibfdt the dependency. >> >>> +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt >>> +endif >>> + >>> ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) >>> TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig >>> else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) >>> @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ >>> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ >>> ARCH=arm \ >>> HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ >>> + BINMAN_INDIRS=$(BINARIES_DIR) \ >> >> I suggested to add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN but indeed we should >> use binman unconditionally for ti-k3-r5-loader package. >> >> http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ >> >> Best regards, >> Romain >> >> >>> HOSTLDFLAGS="$(HOST_LDFLAGS)" >>> >>> define TI_K3_R5_LOADER_BUILD_CMDS >> > > From romain.naour at smile.fr Wed Feb 21 15:33:05 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 21 Feb 2024 16:33:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> Message-ID: <8a008e9a-410f-406a-8e8c-0ce1724c1643@smile.fr> Hello David, Le 21/02/2024 ? 13:25, David Picard a ?crit?: > Or should I add LIBFOO_EXTRA_DOWNLOADS to my application package ? See an example how to use _EXTRA_DOWNLOADS: https://gitlab.com/buildroot.org/buildroot/-/blob/master/package/tesseract-ocr/tesseract-ocr.mk?ref_type=heads#L58 Best regards, Romain > > Le 21/02/2024 ? 09:36, David Picard a ?crit?: >> So, should I submit a package, using the LIBFOO_EXTRA_DOWNLOADS feature ? What >> value would you recommend for LIBFOO_DL_DIR ? >> >> David >> >> Le 21/02/2024 ? 07:28, Yann E. MORIN a ?crit?: >>>>> I did it on purpose. This package is called a library, but it really is a bunch >>>>> of C files. You only use a subset, depending on your hardware. This code was >>>>> made to be compiled in the application, not as a conventional library. >>>>> I could copy the files to STAGING, but cleaning would be more complicated and it >>>>> would waste some disk space. >>>> Ok, maybe is should not be packaged in Buildroot then. >>>> When a package is build by Buildroot, it can generate a binary, a library or >>>> provide some header files. >>>> If your application doesn't bundle intel-socfpga-hwlib sources but it requires >>>> it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra >>>> download step. >>> I agree with Romain. It does not make miuch sense IMHO to just drop >>> source files like that. And the _EXTRA_DOWNLOADS mechanism is exactly >>> tailored to such cases. >> >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From dannenberg at ti.com Wed Feb 21 15:48:47 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Wed, 21 Feb 2024 09:48:47 -0600 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> <20240220012848.76amyog5pecsgld4@dasso> <20240220203200.uq2dpvky2rbv6tcw@dasso> Message-ID: <20240221154847.wnv5jkzibejbh3wv@dasso> On Tue, Feb 20, 2024 at 11:06:26PM +0100, Romain Naour wrote: > Hi Andreas, > > Le 20/02/2024 ? 21:32, Andreas Dannenberg a ?crit?: > > Dear Romain, Dario, Thomas: > > > > On Tue, Feb 20, 2024 at 10:32:14AM +0100, Romain Naour wrote: > >> Hi Dario, > >> > >> Le 20/02/2024 ? 10:05, Dario Binacchi a ?crit?: > >>> Hi Andreas, Romain, All > >>> > >>> On Tue, Feb 20, 2024 at 2:28?AM Andreas Dannenberg wrote: > >>>> > >>>> Romain, Dario, > >>>> > >>>> On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: > >>>>> Hello Dario, > >>>>> > >>>>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > >>>>>> Recent versions of U-Boot can use Binman to compile and sign the generated > >>>>>> binaries, thus making the use of custom tools like ti-k3-image-gen no > >>>>>> longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > >>>>>> configured and used outside of it. This patch allows setting such options > >>>>>> even if the package is not enabled. > >>>>> > >>>>> I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux > >>>>> kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. > >>>> > >>>> There were discussions/suggestions around this before by Yann E Morin > >>>> [1] and Thomas Petazzoni [2]. I think the gist of it was to move the > >>>> selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing > >>>> all the K3 SoC specific selections. And then other packages and Kconfig > >>>> menues can depend on it more cleanly. Like it's currently done with > >>>> package/freescale-imx/Config.in. This would also bring some consistency > >>>> in how those NXP and TI device families are managed, which will make for > >>>> a better end-user experience I think. > >>> > >>> If I'm not mistaken, I think the patches: > >>> [18/20] boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > >>> [17/20] boot: move ti-k3-* packages to 'ti-k3' directory > >>> Are heading in the direction of what we find in > >>> package/freescale-imx/, with the only difference being > >>> that in our case, we're under boot. > >>> So, can I consider these two patches correct? > > > > Yes the general direction those are headed is a good... > > > >> Yes, can you try to move ti-k3 to package directory in V5 ? > >> It would also be used later by the GPU rogue firmwares. > > > > ...and yes, for alignment sake with IMX it would be even better to have > > it in package/, while also keeping some alignment with the naming of the > > CONFIG options (hence my comment with 'BR2_PACKAGE_TI_K3_PLATFORM'). > > > > > > Hi Thomas, > > assuming we create a new package called 'package/ti-k3' I was trying to > > figure out what would be the best way to name the associated CONFIG > > options that control device security settings and can be used to > > determine which device is being used (for later uses in context of GPU > > drivers and other device capabilities)? > > > > I see different naming conventions being used, like this: > > > > 1) BR2_PACKAGE_* > > 2) BR2_TARGET_* > > Well, it seems we use BR2_TARGET_* for package in boot/ directory instead of > BR2_BOOT_* for "legacy" reason :) > > At some point in the history of Buildroot the target/ directory existed and was > used to package bootloaders: > > https://gitlab.com/buildroot.org/buildroot/-/commit/d7d57699ef83cce36d87bef73c9e1fbdc765a64c > > But BR2_TARGET_* symbol was keep for packages (like grub) when booloaders was > moved to boot/. > > > 3) BR2_BOOT_* > > So, there is no such BR2_BOOT_* option. > Ok, thanks for the additional historic context. > > > > Seems like BR2_TARGET_* what we have now would be most appropriate, but > > then the IMX stuff uses BR2_PACKAGE_*, which *seems* to be reserved for > > "userspace" (non-boot) packages as far as I can tell from my poor-man's > > research. While I'd like to align things, the use of the BR2_PACKAGE_* > > prefix may or may not be appropriate for our new additions here? > > BR2_PACKAGE_* is appropriate here. > > We still have BR2_TARGET_* in Buildroot since some Kconfig symbol are really old > and it is not easy to replace them without breaking existing defconfig > (especially the out of tree one). Understood & glad we are discussing this. -- Andreas Dannenberg Texas Instruments Inc > > > > > Just was hoping to get some guidance here so we don't need to re-work > > this too many times. > > It seems ok for me, lets see the upcoming V5 from Dario. > > Best regards, > Romain > > > > > > > > -- > > Andreas Dannenberg > > Texas Instruments Inc > > > > > > > >> > >> Please add a comment in the commit log that we make an exception to the rule "no > >> subdirectory in package directory". > >> > >> Thanks! > >> > >> Best regards, > >> Romain > >> > >> > >>> > >>> Thanks and regards, > >>> Dario > >>> > >>>> > >>>> > >>>> > >>>> -- > >>>> Andreas Dannenberg > >>>> Texas Instruments Inc > >>>> > >>>> [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html > >>>> [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html > >>>> > >>>> > >>>>> > >>>>> Best regards, > >>>>> Romain > >>>>> > >>>>> > >>>>>> > >>>>>> --- > >>>>>> > >>>>>> Added in v4 > >>>>>> > >>>>>> Signed-off-by: Dario Binacchi > >>>>>> --- > >>>>>> boot/ti-k3/Config.in | 46 ++++++++++++++ > >>>>>> boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > >>>>>> boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > >>>>>> boot/uboot/Config.in | 7 +-- > >>>>>> configs/ti_am62x_sk_defconfig | 2 +- > >>>>>> configs/ti_am64x_sk_defconfig | 2 +- > >>>>>> 6 files changed, 59 insertions(+), 67 deletions(-) > >>>>>> > >>>>>> diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > >>>>>> index 06dda2f156a9..9e508326c9c8 100644 > >>>>>> --- a/boot/ti-k3/Config.in > >>>>>> +++ b/boot/ti-k3/Config.in > >>>>>> @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > >>>>>> > >>>>>> if BR2_TARGET_TI_K3 > >>>>>> > >>>>>> +choice > >>>>>> + prompt "SoC family" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SOC_AM62AX > >>>>>> + bool "am62ax" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SOC_AM62X > >>>>>> + bool "am62x" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SOC_AM64X > >>>>>> + bool "am64x" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SOC_AM65X > >>>>>> + bool "am65x" > >>>>>> + > >>>>>> +endchoice > >>>>>> + > >>>>>> +choice > >>>>>> + prompt "Security type" > >>>>>> + help > >>>>>> + The target SoC security type option. > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_GP > >>>>>> + bool "gp" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > >>>>>> + bool "hs-fs" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_HS > >>>>>> + bool "hs" > >>>>>> + > >>>>>> +endchoice > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SOC > >>>>>> + string > >>>>>> + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>>>> + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > >>>>>> + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > >>>>>> + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SECTYPE > >>>>>> + string > >>>>>> + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > >>>>>> + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > >>>>>> + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > >>>>>> + > >>>>>> source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > >>>>>> source "boot/ti-k3/ti-k3-core-secdev/Config.in" > >>>>>> source "boot/ti-k3/ti-k3-image-gen/Config.in" > >>>>>> diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > >>>>>> index 38d1598d9fc0..2d53d62dd4ee 100644 > >>>>>> --- a/boot/ti-k3/ti-k3-image-gen/Config.in > >>>>>> +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > >>>>>> @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > >>>>>> bool "ti-k3-image-gen" > >>>>>> depends on BR2_TARGET_TI_K3_R5_LOADER > >>>>>> select BR2_TARGET_TI_K3_BOOT_FIRMWARE > >>>>>> - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>>>> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > >>>>>> # We need FIT support in uboot-tools, which is why we select a > >>>>>> # host package > >>>>>> select BR2_PACKAGE_HOST_UBOOT_TOOLS > >>>>>> @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > >>>>>> https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > >>>>>> > >>>>>> if BR2_TARGET_TI_K3_IMAGE_GEN > >>>>>> -choice > >>>>>> - prompt "SoC family" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>>>> - bool "am62ax" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>>>> - bool "am62x" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>>>> - bool "am64x" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>>>> - bool "am65x" > >>>>>> - > >>>>>> -endchoice > >>>>>> - > >>>>>> -choice > >>>>>> - prompt "Security type" > >>>>>> - help > >>>>>> - The target SoC security type option for image gen. Valid > >>>>>> - options are "gp" for General Purpose devices, "hs-fs" for > >>>>>> - High Security - Field Securable devices, or "hs" for High > >>>>>> - Security - Security Enforcing devices. Note for all High > >>>>>> - Security device variants the TI_SECURE_DEV_PKG environmental > >>>>>> - variable must be defined at build time pointing to a valid > >>>>>> - core-secdev-k3 folder location, otherwise the build will > >>>>>> - fail, see > >>>>>> - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > >>>>>> - bool "gp" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > >>>>>> - bool "hs-fs" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>>>> - bool "hs" > >>>>>> - > >>>>>> -endchoice > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > >>>>>> - string > >>>>>> - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>>>> - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>>>> - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>>>> - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>>>> > >>>>>> config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > >>>>>> string > >>>>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > >>>>>> - string > >>>>>> - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > >>>>>> - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > >>>>>> - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > >>>>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > >>>>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > >>>>>> > >>>>>> endif > >>>>>> diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>>>> index 74b4fcb4bf89..834d8f7d5cd5 100644 > >>>>>> --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>>>> +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>>>> @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > >>>>>> $(BR2_MAKE_HOST_DEPENDENCY) > >>>>>> > >>>>>> TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > >>>>>> -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > >>>>>> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > >>>>>> +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > >>>>>> +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > >>>>>> > >>>>>> -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > >>>>>> +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > >>>>>> TI_K3_IMAGE_GEN_SYSFW = \ > >>>>>> $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > >>>>>> else > >>>>>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > >>>>>> index beafb38930db..1a9d21e7c6d1 100644 > >>>>>> --- a/boot/uboot/Config.in > >>>>>> +++ b/boot/uboot/Config.in > >>>>>> @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > >>>>>> bool "U-Boot needs TI K3 Device Manager (DM)" > >>>>>> # We use the SoC selection defined for the ti-k3-image-gen > >>>>>> # package > >>>>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN > >>>>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>>>> + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > >>>>>> help > >>>>>> Some TI K3 devices need the Device Manager (DM) firmware to > >>>>>> be available for the U-Boot build. > >>>>>> @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > >>>>>> > >>>>>> config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > >>>>>> string > >>>>>> - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>>>> - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>>>> + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>>>> + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > >>>>>> > >>>>>> endif > >>>>>> > >>>>>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > >>>>>> index cd26235342e4..cfefce0a77a4 100644 > >>>>>> --- a/configs/ti_am62x_sk_defconfig > >>>>>> +++ b/configs/ti_am62x_sk_defconfig > >>>>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > >>>>>> BR2_TARGET_TI_K3=y > >>>>>> +BR2_TARGET_TI_K3_SOC_AM62X=y > >>>>>> BR2_TARGET_TI_K3_IMAGE_GEN=y > >>>>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > >>>>>> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > >>>>>> index 1befeb4ab96c..daf78dbffff8 100644 > >>>>>> --- a/configs/ti_am64x_sk_defconfig > >>>>>> +++ b/configs/ti_am64x_sk_defconfig > >>>>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > >>>>>> BR2_TARGET_TI_K3=y > >>>>>> +BR2_TARGET_TI_K3_SOC_AM64X=y > >>>>>> BR2_TARGET_TI_K3_IMAGE_GEN=y > >>>>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > >>>>> > >>> > >>> > >>> > >> > From romain.naour at smile.fr Wed Feb 21 16:19:09 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 21 Feb 2024 17:19:09 +0100 Subject: [Buildroot] [PATCH] support/testing: TestCheckPackage: update expected strings Message-ID: <20240221161909.40317-1-romain.naour@smile.fr> Commit dfed5acb56 ("utils/check-package: use https for the manual URL") replaced the default url to the Buildroot manual while it was used by TestCheckPackage test. Update TestCheckPackage with https url. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243484 Cc: Yann E. MORIN Signed-off-by: Romain Naour --- support/testing/tests/utils/test_check_package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 9aa117d211..2125b34170 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -200,13 +200,13 @@ class TestCheckPackage(unittest.TestCase): self.WITH_UTILS_IN_PATH, abs_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) w, m = call_script(["check-package", "-b", abs_file], self.WITH_UTILS_IN_PATH, infra.basepath()) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) # br2-external with ignore list topdir_path = infra.filepath("tests/utils/br2-external") -- 2.43.0 From antoine.coutant at smile.fr Wed Feb 21 16:55:36 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Wed, 21 Feb 2024 17:55:36 +0100 Subject: [Buildroot] [PATCH v4 4/7] package/opencl-headers: new package In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-5-antoine.coutant@smile.fr> Message-ID: Yann, All, On 12/02/2024 14:44, Antoine Coutant wrote: > > Yann, All, > > On 07/02/2024 16:58, Yann E. MORIN wrote: >> Antoine, All, >> >> On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >>> From: Sebastian Weyer >>> >>> These headers provide the C language API bindings. It is a complement to >>> the C++ bindings already available in opencl-clhpp. This package is >>> required to build opencl-icd-loader: >>> >>> https://github.com/KhronosGroup/OpenCL-ICD-Loader#dependencies >>> >>> Signed-off-by: Sebastian Weyer >>> Signed-off-by: Antoine Coutant >>> --- [--SNIP--] >> So, why do we need opencl-headers and can't rely on the existing >> mesa3d-headers package? > > The problem is that the headers installed by mesa differ from those > > in the OpenCL-Headers package. > > $ diff -q OpenCL-Headers/CL/cl_icd.h mesa/include/CL/cl_icd.h > Files OpenCL-Headers/CL/cl_icd.h and mesa/include/CL/cl_icd.h differ > > This diff was performed using OpenCL-Headers v2023.12.14 and > > mesa-23.3.4. Moreover, cl_layer.h, cl_half.h and cl_function_types.h > files are > > missing from mesa headers. These differences causes errors when building > > opencl-icd-loader: > > ... > > ./build/opencl-icd-loader-2023.12.14/loader/icd.c:23:10: fatal error: > CL/cl_layer.h: No such file or directory > > ???23 | #include > > | ^~~~~~~~~~~~~~~ > > compilation terminated. > > ./build/opencl-icd-loader-2023.12.14/loader/icd_dispatch.c:26:8: > error: unknown type name ?clGetICDLoaderInfoOCLICD_t? > > ???26 | static clGetICDLoaderInfoOCLICD_t clGetICDLoaderInfoOCLICD; > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > ... > > This is why we cannot rely on mesa3d headers and why OpenCL-Headers > > package is required. > Besides, mesa3d CL headers regroups headers from OpenCL-Headers and OpenCL-CLHPP [1][2][3]. The opencl-clhpp package already exist. It have been added in commit 2ae78f1c794c145486baf5c39703443207fead4c [4] when adding clpeak. Indeed, clpeak was downloading opencl-clhpp during the configuration phase [5]. It appears that nothing prevent conflicts between opencl-clhpp headers and mesa3d headers (installed by mesa3d-headers and mesa3d packages). Moreover, both files are different: $ md5sum OpenCL-CLHPP/include/CL/opencl.hpp 784d2b2283d605b30ad6c663a08ff71f OpenCL-CLHPP/include/CL/opencl.hpp $ md5sum mesa/include/CL/opencl.hpp 6afa428040ec96709fc009fe514ef750? mesa/include/CL/opencl.hpp With opencl-clhpp v2.0.16 and mesa-23.3.5 (versions used in buildroot when this mail is sent). I will check if it is possible to rely on mesa3d headers. If it's possible I will remove this package (only used by clpeak) and rely on mesa3d headers. If it's not possible, i will add guards to prevent the conflict. [1]: https://gitlab.freedesktop.org/mesa/mesa/-/tree/24.0/include/CL [2]: https://github.com/KhronosGroup/OpenCL-Headers/tree/v2023.12.14/CL [3]: https://github.com/KhronosGroup/OpenCL-CLHPP/tree/v2023.12.14/include/CL [4]: http://patchwork.ozlabs.org/project/buildroot/patch/20220116175320.453041-1-gilles.talis at gmail.com/ [5]: http://patchwork.ozlabs.org/project/buildroot/patch/20211024113654.88720-1-gilles.talis at gmail.com/ >> Regards, >> Yann E. MORIN. > > I will add guards to prevent conflicts in the v5. And add some lines > > in the commit log to explain why mesa3d headers can't be used to > > build OpenCL-ICD-Loader. > > > Thanks for your feedback ! > > > [1]: > https://gitlab.freedesktop.org/mesa/mesa/-/blob/23.3/include/meson.build?ref_type=heads#L135 > > > Regards, > > Antoine Coutant > >>> + help >>> + C language headers for the OpenCL API >>> + >>> + https://github.com/KhronosGroup/OpenCL-Headers >>> diff --git a/package/opencl-headers/opencl-headers.hash b/package/opencl-headers/opencl-headers.hash >>> new file mode 100644 >>> index 0000000000..802ed05450 >>> --- /dev/null >>> +++ b/package/opencl-headers/opencl-headers.hash >>> @@ -0,0 +1,3 @@ >>> +#Locally generated >>> +sha256 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d OpenCL-Headers-2023.12.14.tar.gz >>> +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE >>> diff --git a/package/opencl-headers/opencl-headers.mk b/package/opencl-headers/opencl-headers.mk >>> new file mode 100644 >>> index 0000000000..7aa0e0d168 >>> --- /dev/null >>> +++ b/package/opencl-headers/opencl-headers.mk >>> @@ -0,0 +1,22 @@ >>> +################################################################################ >>> +# >>> +# opencl-headers >>> +# >>> +################################################################################ >>> + >>> +OPENCL_HEADERS_VERSION = 2023.12.14 >>> +OPENCL_HEADERS_SOURCE = OpenCL-Headers-$(OPENCL_HEADERS_VERSION).tar.gz >>> +OPENCL_HEADERS_SITE = $(call github,KhronosGroup,OpenCL-Headers,v$(OPENCL_HEADERS_VERSION)) >>> +OPENCL_HEADERS_LICENSE = Apache-2.0 >>> +OPENCL_HEADERS_LICENSE_FILES = LICENSE >>> +OPENCL_HEADERS_INSTALL_STAGING = YES >>> + >>> +OPENCL_HEADERS_INSTALL_TARGET = NO >>> + >>> +define OPENCL_HEADERS_INSTALL_STAGING_CMDS >>> + mkdir -p $(STAGING_DIR)/usr/include/CL >>> + $(INSTALL) -D -m 0644 $(@D)/CL/* \ >>> + $(STAGING_DIR)/usr/include/CL >>> +endef >>> + >>> +$(eval $(generic-package)) >>> -- >>> 2.25.1 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Wed Feb 21 17:04:43 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:04:43 +0100 Subject: [Buildroot] [git commit] support/testing: TestCheckPackage: update expected strings Message-ID: <20240221170456.A71E6879D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9990552eb8b88647104bbec82555b2c407aa6be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit dfed5acb56 ("utils/check-package: use https for the manual URL") replaced the default url to the Buildroot manual while it was used by TestCheckPackage test. Update TestCheckPackage with https url. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243484 Cc: Yann E. MORIN Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/testing/tests/utils/test_check_package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 9aa117d211..2125b34170 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -200,13 +200,13 @@ class TestCheckPackage(unittest.TestCase): self.WITH_UTILS_IN_PATH, abs_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) w, m = call_script(["check-package", "-b", abs_file], self.WITH_UTILS_IN_PATH, infra.basepath()) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) # br2-external with ignore list topdir_path = infra.filepath("tests/utils/br2-external") From yann.morin.1998 at free.fr Wed Feb 21 17:05:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:05:15 +0100 Subject: [Buildroot] [PATCH] support/testing: TestCheckPackage: update expected strings In-Reply-To: <20240221161909.40317-1-romain.naour@smile.fr> References: <20240221161909.40317-1-romain.naour@smile.fr> Message-ID: Romain, All, On 2024-02-21 17:19 +0100, Romain Naour spake thusly: > Commit dfed5acb56 ("utils/check-package: use https for the manual URL") > replaced the default url to the Buildroot manual while it was used > by TestCheckPackage test. > > Update TestCheckPackage with https url. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243484 > > Cc: Yann E. MORIN > Signed-off-by: Romain Naour Applied to master, thanks for fixing my mess! Regards, Yann E. MORIN. > --- > support/testing/tests/utils/test_check_package.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py > index 9aa117d211..2125b34170 100644 > --- a/support/testing/tests/utils/test_check_package.py > +++ b/support/testing/tests/utils/test_check_package.py > @@ -200,13 +200,13 @@ class TestCheckPackage(unittest.TestCase): > self.WITH_UTILS_IN_PATH, abs_path) > self.assert_file_was_processed(m) > self.assert_warnings_generated_for_file(m) > - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) > + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) > > w, m = call_script(["check-package", "-b", abs_file], > self.WITH_UTILS_IN_PATH, infra.basepath()) > self.assert_file_was_processed(m) > self.assert_warnings_generated_for_file(m) > - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) > + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) > > # br2-external with ignore list > topdir_path = infra.filepath("tests/utils/br2-external") > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:08:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:08:14 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 254.9 In-Reply-To: <04a28a98-2699-44b6-b5d5-697a1a6fe893@bubu1.eu> References: <20240219182604.1287000-1-buildroot@bubu1.eu> <04a28a98-2699-44b6-b5d5-697a1a6fe893@bubu1.eu> Message-ID: Marcus, All, +Thomas On 2024-02-19 22:30 +0100, Marcus Hoffmann via buildroot spake thusly: > On 19.02.24 22:14, Yann E. MORIN wrote: > > Please watch the gitlab pipeline for any failure of the runtimet tests, > > just in case this minor version bump breaks anything. > So if I understood that correctly I can add myself as a maintainer of the > runtime test files and I'll get an email when that test fails? Or is that > not how it works? As far as I understand, yes, this is what should happen. Thomas has some scripting (somewhere!) that sends the daily emails, so he'd have the authoritative answer. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:09:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:09:35 +0100 Subject: [Buildroot] [git commit] package/libmodsecurity: security bump to 3.0.12 Message-ID: <20240221171350.112C3879E5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4b065e35c47efa9a347abad0a8cfbf024a12e60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The project has been transferred from Trustwave (SpiderLabs) to OWASP, hence the change in URLs. The upstream CPE vendor ID will likely also change in the future but the upstream is still working on this [1]. - Fixes: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-1019 [1] https://github.com/owasp-modsecurity/ModSecurity/issues/3083 Signed-off-by: Frank Vanbever Signed-off-by: Yann E. MORIN --- package/libmodsecurity/Config.in | 2 +- package/libmodsecurity/libmodsecurity.hash | 5 +++-- package/libmodsecurity/libmodsecurity.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index 69bb0494cc..da14b21669 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBMODSECURITY SecRules format and apply them to HTTP content provided by your application via Connectors. - https://github.com/SpiderLabs/ModSecurity + https://github.com/owasp-modsecurity/ModSecurity comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index b0a1bf33f3..2221a8a37d 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.11/modsecurity-v3.0.11.tar.gz.sha256 -sha256 070f46c779d30785b95eb1316b46e2e4e6f90fd94a96aaca4bd54cd94738b692 modsecurity-v3.0.11.tar.gz +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 +sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz + # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 548eeb8602..d8c10b98b2 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.11 +LIBMODSECURITY_VERSION = 3.0.12 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz -LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) +LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Feb 21 17:14:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:14:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodsecurity: security bump to 3.0.12 In-Reply-To: <20240217092413.288309-1-frank.vanbever@mind.be> References: <20240217092413.288309-1-frank.vanbever@mind.be> Message-ID: Frank, All, On 2024-02-17 10:24 +0100, Frank Vanbever via buildroot spake thusly: > The project has been transferred from Trustwave (SpiderLabs) to OWASP, hence the > change in URLs. The upstream CPE vendor ID will likely also change in the future > but the upstream is still working on this [1]. > > - Fixes: > https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-1019 > > [1] https://github.com/owasp-modsecurity/ModSecurity/issues/3083 > > Signed-off-by: Frank Vanbever Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libmodsecurity/Config.in | 2 +- > package/libmodsecurity/libmodsecurity.hash | 5 +++-- > package/libmodsecurity/libmodsecurity.mk | 4 ++-- > 3 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in > index 69bb0494cc..da14b21669 100644 > --- a/package/libmodsecurity/Config.in > +++ b/package/libmodsecurity/Config.in > @@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBMODSECURITY > SecRules format and apply them to HTTP content > provided by your application via Connectors. > > - https://github.com/SpiderLabs/ModSecurity > + https://github.com/owasp-modsecurity/ModSecurity > > comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" > depends on !BR2_INSTALL_LIBSTDCPP || \ > diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash > index b0a1bf33f3..2221a8a37d 100644 > --- a/package/libmodsecurity/libmodsecurity.hash > +++ b/package/libmodsecurity/libmodsecurity.hash > @@ -1,4 +1,5 @@ > -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.11/modsecurity-v3.0.11.tar.gz.sha256 > -sha256 070f46c779d30785b95eb1316b46e2e4e6f90fd94a96aaca4bd54cd94738b692 modsecurity-v3.0.11.tar.gz > +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 > +sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz > + > # Localy calculated > sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE > diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk > index 548eeb8602..d8c10b98b2 100644 > --- a/package/libmodsecurity/libmodsecurity.mk > +++ b/package/libmodsecurity/libmodsecurity.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -LIBMODSECURITY_VERSION = 3.0.11 > +LIBMODSECURITY_VERSION = 3.0.12 > LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz > -LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) > +LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) > LIBMODSECURITY_INSTALL_STAGING = YES > LIBMODSECURITY_LICENSE = Apache-2.0 > LIBMODSECURITY_LICENSE_FILES = LICENSE > -- > 2.40.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:19:52 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:19:52 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: security bump to version 2.42.5 Message-ID: <20240221172050.1A94A879FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5275e141259c95b03fc288035c128224a1405646 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: https://wpewebkit.org/security/WSA-2024-0001.html - CVE-2024-23222: Processing maliciously crafted web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been exploited. Description: A type confusion issue was addressed with improved checks. - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint the user. Description: An access issue was addressed with improved access restrictions. - CVE-2024-23213: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. Add an upstream post-2.42.5 patch to fix an issue with an invalid backport causing a build issue. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- ...LowLevelInterpreter.cpp-339-21-error-t6-w.patch | 39 ++++++++++++++++++++++ package/wpewebkit/wpewebkit.hash | 6 ++-- package/wpewebkit/wpewebkit.mk | 3 +- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 0000000000..a15d9e647f --- /dev/null +++ b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Adrian Perez de Castro +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.43.1 + diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 322e494c36..71e41bb1dd 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,6 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums -sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz -sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums +sha1 50a18f43452520e9f34f84c04bc0166af655ffff wpewebkit-2.42.5.tar.xz +sha256 4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532 wpewebkit-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 13143efb38..442709848a 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,8 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.42.4 +# The middle number is even for stable releases, odd for development ones. +WPEWEBKIT_VERSION = 2.42.5 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Feb 21 17:20:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:20:07 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: update ARM NEON patch for 2.42.x Message-ID: <20240221172050.2FA51879FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a7a7f3d1392d34a14acc7739525dc7fc13920d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update patch to compile correctly with newer versions of GCC, which has gotten stricter about the placement of the alignas() attribute. Signed-off-by: Adrian Perez de Castro [yann.morin.1998 at free.fr: update .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...NEON.cpp-fails-to-build-NEON-fast-path-se.patch | 105 +++++++++++---------- 2 files changed, 57 insertions(+), 49 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 05a9241962..4967d749fa 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1376,7 +1376,6 @@ package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patc package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch Upstream package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch Upstream package/wpa_supplicant/ifupdown.sh Shellcheck -package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch Upstream package/x11r7/xapp_luit/0001-posix-openpt.patch Upstream package/x11r7/xapp_xdm/S99xdm Indent Variables package/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch Upstream diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch index ea1676abb6..17d4957657 100644 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -1,4 +1,4 @@ -From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 +From 5ba2d275457c4fdf1efdcca8351792400bda5679 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -33,38 +33,47 @@ left for a follow-up fix. * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: Signed-off-by: Adrian Perez de Castro -[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] +Upstream: https://bugs.webkit.org/show_bug.cgi?id=241182 --- Source/WebCore/Sources.txt | 1 + - .../cpu/arm/filters/FELightingNEON.cpp | 4 +- + .../cpu/arm/filters/FELightingNEON.cpp | 6 +-- .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 8 files changed, 58 insertions(+), 36 deletions(-) + 8 files changed, 59 insertions(+), 37 deletions(-) diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt -index 8ce3510fe1a8..efd56bcb8746 100644 +index 9ca28a7b2bc0..ed2c7f9f41ee 100644 --- a/Source/WebCore/Sources.txt +++ b/Source/WebCore/Sources.txt -@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp - platform/graphics/WOFFFileFormat.cpp - platform/graphics/WidthIterator.cpp +@@ -2303,6 +2303,7 @@ platform/graphics/controls/MeterPart.cpp + platform/graphics/controls/ProgressBarPart.cpp + platform/graphics/controls/SliderTrackPart.cpp platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp +platform/graphics/cpu/arm/filters/FELightingNEON.cpp platform/graphics/displaylists/DisplayList.cpp platform/graphics/displaylists/DisplayListDrawingContext.cpp platform/graphics/displaylists/DisplayListItems.cpp diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp -index f6ff8c20a5a8..42a97ffc5372 100644 +index f6ff8c20a5a8..dced3d55eb4e 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +@@ -35,7 +35,7 @@ namespace WebCore { + // ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D + + +-static alignas(16) short s_FELightingConstantsForNeon[] = { ++alignas(16) static short s_FELightingConstantsForNeon[] = { + // Alpha coefficients. + -2, 1, 0, -1, 2, 1, 0, -1, + 0, -1, -2, -1, 0, 1, 2, 1, @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() return s_FELightingConstantsForNeon; } - + -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) { @@ -73,26 +82,26 @@ index f6ff8c20a5a8..42a97ffc5372 100644 @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL "b .lightStrengthCalculated" NL ); // NOLINT - + -int FELighting::getPowerCoefficients(float exponent) +int FELightingSoftwareApplier::getPowerCoefficients(float exponent) { // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..c6d17f573eca 100644 +index b17c603d40d3..fd23e31cce29 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + -#ifndef FELightingNEON_h -#define FELightingNEON_h +#pragma once - + #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - + -#include "FELighting.h" +#include "FELightingSoftwareApplier.h" +#include "ImageBuffer.h" @@ -100,19 +109,19 @@ index b17c603d40d3..c6d17f573eca 100644 #include "SpotLightSource.h" +#include #include - + namespace WebCore { @@ -93,14 +94,14 @@ extern "C" { void neonDrawLighting(FELightingPaintingDataForNeon*); } - + -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { - data.pixels->data(), -+ WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; ++ alignas(16) WebCore::FELightingFloatArgumentsForNeon floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { + data.pixels->bytes(), 1, @@ -126,15 +135,15 @@ index b17c603d40d3..c6d17f573eca 100644 @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set light source arguments. floatArguments.constOne = 1; - + - auto color = m_lightingColor.toColorTypeLossy>().resolved(); + auto color = data.lightingColor.toColorTypeLossy>().resolved(); - + floatArguments.colorRed = color.red; floatArguments.colorGreen = color.green; floatArguments.colorBlue = color.blue; floatArguments.padding4 = 0; - + - if (m_lightSource->type() == LS_POINT) { + if (data.lightSource->type() == LS_POINT) { neonData.flags |= FLAG_POINT_LIGHT; @@ -181,7 +190,7 @@ index b17c603d40d3..c6d17f573eca 100644 } if (floatArguments.diffuseConstant == 1) neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; - + - int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; + static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs + int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; @@ -189,7 +198,7 @@ index b17c603d40d3..c6d17f573eca 100644 // Initialize parallel jobs - ParallelJobs parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); + ParallelJobs parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); - + // Fill the parameter array int job = parallelJobs.numberOfJobs(); if (job > 1) { @@ -213,42 +222,42 @@ index b17c603d40d3..c6d17f573eca 100644 return; @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS } // namespace WebCore - + #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) - -#endif // FELightingNEON_h diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -index 0660143fc1cf..2b1e86d99fa4 100644 +index 70f583b36e2c..7d5d27e5ccf8 100644 --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -@@ -25,6 +25,10 @@ - #include "LightSource.h" +@@ -26,6 +26,10 @@ + #include #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class DistantLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h -index 0c073bc13f8c..e0db00545c17 100644 +index 179edf6dba24..694d712d56fd 100644 --- a/Source/WebCore/platform/graphics/filters/FELighting.h +++ b/Source/WebCore/platform/graphics/filters/FELighting.h @@ -35,8 +35,6 @@ - + namespace WebCore { - + -struct FELightingPaintingDataForNeon; - class FELighting : public FilterEffect { public: - const Color& lightingColor() const { return m_lightingColor; } -@@ -67,11 +65,6 @@ protected: - + bool operator==(const FELighting&) const; +@@ -68,11 +66,6 @@ protected: + std::unique_ptr createSoftwareApplier() const override; - + -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - static int getPowerCoefficients(float exponent); - inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); @@ -258,34 +267,34 @@ index 0c073bc13f8c..e0db00545c17 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 126b3b2350f6..d906db21aa9c 100644 +index a8cfdab895a9..34f867bba237 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 641b205f986d..64380d9b6eb8 100644 +index 6404467a5b6f..5cac38f22362 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h index c974d92115ff..e2896660cfbd 100644 @@ -293,14 +302,14 @@ index c974d92115ff..e2896660cfbd 100644 +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ namespace WebCore { - + class FELighting; +struct FELightingPaintingDataForNeon; - + class FELightingSoftwareApplier final : public FilterEffectConcreteApplier { WTF_MAKE_FAST_ALLOCATED; @@ -132,8 +133,23 @@ private: - + static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); static void applyPlatformGenericWorker(ApplyParameters*); + @@ -319,10 +328,10 @@ index c974d92115ff..e2896660cfbd 100644 + static void applyPlatform(const LightingData&); }; - + } // namespace WebCore + +#include "FELightingNEON.h" --- -2.37.3 +-- +2.43.1 From yann.morin.1998 at free.fr Wed Feb 21 17:20:50 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:20:50 +0100 Subject: [Buildroot] [PATCH 1/2] package/wpewebkit: security bump to version 2.42.5 In-Reply-To: <20240212143222.1555220-2-aperez@igalia.com> References: <20240212143222.1555220-1-aperez@igalia.com> <20240212143222.1555220-2-aperez@igalia.com> Message-ID: Adrian, All, On 2024-02-12 16:32 +0200, Adrian Perez de Castro spake thusly: > Fixes the following security issues: > > https://wpewebkit.org/security/WSA-2024-0001.html > > - CVE-2024-23222: Processing maliciously crafted web content may lead to > arbitrary code execution. Apple is aware of a report that this issue > may have been exploited. Description: A type confusion issue was > addressed with improved checks. > > - CVE-2024-23206: A maliciously crafted webpage may be able to > fingerprint the user. Description: An access issue was addressed with > improved access restrictions. > > - CVE-2024-23213: Processing web content may lead to arbitrary code > execution. Description: The issue was addressed with improved memory > handling. > > Add an upstream post-2.42.5 patch to fix an issue with an invalid > backport causing a build issue. > > Signed-off-by: Adrian Perez de Castro Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++ > package/wpewebkit/wpewebkit.hash | 6 +-- > package/wpewebkit/wpewebkit.mk | 3 +- > 3 files changed, 44 insertions(+), 4 deletions(-) > create mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > > diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > new file mode 100644 > index 0000000000..a15d9e647f > --- /dev/null > +++ b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > @@ -0,0 +1,39 @@ > +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 > +From: Michael Catanzaro > +Date: Mon, 5 Feb 2024 11:00:49 -0600 > +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= > + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= > + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= > + =?UTF-8?q?=3D268739?= > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Unreviewed build fix. Seems a backport went badly, and we didn't notice > +because the code is architecture-specific. > + > +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: > +(JSC::CLoop::execute): > + > +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff > +Signed-off-by: Adrian Perez de Castro > +--- > + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- > + 1 file changed, 2 deletions(-) > + > +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > +index 5064ead6cd2e..9a2e2653b121 100644 > +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, > + UNUSED_VARIABLE(t2); > + UNUSED_VARIABLE(t3); > + UNUSED_VARIABLE(t5); > +- UNUSED_VARIABLE(t6); > +- UNUSED_VARIABLE(t7); > + > + struct StackPointerScope { > + StackPointerScope(CLoopStack& stack) > +-- > +2.43.1 > + > diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash > index 322e494c36..71e41bb1dd 100644 > --- a/package/wpewebkit/wpewebkit.hash > +++ b/package/wpewebkit/wpewebkit.hash > @@ -1,6 +1,6 @@ > -# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums > -sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz > -sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz > +# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums > +sha1 50a18f43452520e9f34f84c04bc0166af655ffff wpewebkit-2.42.5.tar.xz > +sha256 4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532 wpewebkit-2.42.5.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk > index e54ec2952f..60a45b13b1 100644 > --- a/package/wpewebkit/wpewebkit.mk > +++ b/package/wpewebkit/wpewebkit.mk > @@ -4,7 +4,8 @@ > # > ################################################################################ > > -WPEWEBKIT_VERSION = 2.42.4 > +# The middle number is even for stable releases, odd for development ones. > +WPEWEBKIT_VERSION = 2.42.5 > WPEWEBKIT_SITE = https://wpewebkit.org/releases > WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz > WPEWEBKIT_INSTALL_STAGING = YES > -- > 2.43.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:21:37 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:21:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/wpewebkit: update ARM NEON patch for 2.42.x In-Reply-To: <20240212143222.1555220-3-aperez@igalia.com> References: <20240212143222.1555220-1-aperez@igalia.com> <20240212143222.1555220-3-aperez@igalia.com> Message-ID: On 2024-02-12 16:32 +0200, Adrian Perez de Castro spake thusly: > Update patch to compile correctly with newer versions of GCC, which > has gotten stricter about the placement of the alignas() attribute. > > Signed-off-by: Adrian Perez de Castro > --- > ...cpp-fails-to-build-NEON-fast-path-se.patch | 105 ++++++++++-------- $ ./utils/docker-run make check-package package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch:0: Upstream was expected to fail, did you fix the file and forget to update .checkpackageignore? Applied to master, with the above fixed, thanks. Regards, Yann E. MORIN. > 1 file changed, 57 insertions(+), 48 deletions(-) > > diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch > index ea1676abb6..17d4957657 100644 > --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch > +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch > @@ -1,4 +1,4 @@ > -From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 > +From 5ba2d275457c4fdf1efdcca8351792400bda5679 Mon Sep 17 00:00:00 2001 > From: Adrian Perez de Castro > Date: Thu, 2 Jun 2022 11:19:06 +0300 > Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems > @@ -33,38 +33,47 @@ left for a follow-up fix. > * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: > > Signed-off-by: Adrian Perez de Castro > -[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] > +Upstream: https://bugs.webkit.org/show_bug.cgi?id=241182 > --- > Source/WebCore/Sources.txt | 1 + > - .../cpu/arm/filters/FELightingNEON.cpp | 4 +- > + .../cpu/arm/filters/FELightingNEON.cpp | 6 +-- > .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- > .../graphics/filters/DistantLightSource.h | 4 ++ > .../platform/graphics/filters/FELighting.h | 7 --- > .../graphics/filters/PointLightSource.h | 4 ++ > .../graphics/filters/SpotLightSource.h | 4 ++ > .../software/FELightingSoftwareApplier.h | 16 ++++++ > - 8 files changed, 58 insertions(+), 36 deletions(-) > + 8 files changed, 59 insertions(+), 37 deletions(-) > > diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt > -index 8ce3510fe1a8..efd56bcb8746 100644 > +index 9ca28a7b2bc0..ed2c7f9f41ee 100644 > --- a/Source/WebCore/Sources.txt > +++ b/Source/WebCore/Sources.txt > -@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp > - platform/graphics/WOFFFileFormat.cpp > - platform/graphics/WidthIterator.cpp > +@@ -2303,6 +2303,7 @@ platform/graphics/controls/MeterPart.cpp > + platform/graphics/controls/ProgressBarPart.cpp > + platform/graphics/controls/SliderTrackPart.cpp > platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp > +platform/graphics/cpu/arm/filters/FELightingNEON.cpp > platform/graphics/displaylists/DisplayList.cpp > platform/graphics/displaylists/DisplayListDrawingContext.cpp > platform/graphics/displaylists/DisplayListItems.cpp > diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp > -index f6ff8c20a5a8..42a97ffc5372 100644 > +index f6ff8c20a5a8..dced3d55eb4e 100644 > --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp > +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp > +@@ -35,7 +35,7 @@ namespace WebCore { > + // ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D > + > + > +-static alignas(16) short s_FELightingConstantsForNeon[] = { > ++alignas(16) static short s_FELightingConstantsForNeon[] = { > + // Alpha coefficients. > + -2, 1, 0, -1, 2, 1, 0, -1, > + 0, -1, -2, -1, 0, 1, 2, 1, > @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() > return s_FELightingConstantsForNeon; > } > - > + > -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) > +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) > { > @@ -73,26 +82,26 @@ index f6ff8c20a5a8..42a97ffc5372 100644 > @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL > "b .lightStrengthCalculated" NL > ); // NOLINT > - > + > -int FELighting::getPowerCoefficients(float exponent) > +int FELightingSoftwareApplier::getPowerCoefficients(float exponent) > { > // Calling a powf function from the assembly code would require to save > // and reload a lot of NEON registers. Since the base is in range [0..1] > diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h > -index b17c603d40d3..c6d17f573eca 100644 > +index b17c603d40d3..fd23e31cce29 100644 > --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h > +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h > @@ -24,14 +24,15 @@ > * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > - > + > -#ifndef FELightingNEON_h > -#define FELightingNEON_h > +#pragma once > - > + > #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) > - > + > -#include "FELighting.h" > +#include "FELightingSoftwareApplier.h" > +#include "ImageBuffer.h" > @@ -100,19 +109,19 @@ index b17c603d40d3..c6d17f573eca 100644 > #include "SpotLightSource.h" > +#include > #include > - > + > namespace WebCore { > @@ -93,14 +94,14 @@ extern "C" { > void neonDrawLighting(FELightingPaintingDataForNeon*); > } > - > + > -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) > +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) > { > - alignas(16) FELightingFloatArgumentsForNeon floatArguments; > - FELightingPaintingDataForNeon neonData = { > - data.pixels->data(), > -+ WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; > ++ alignas(16) WebCore::FELightingFloatArgumentsForNeon floatArguments; > + WebCore::FELightingPaintingDataForNeon neonData = { > + data.pixels->bytes(), > 1, > @@ -126,15 +135,15 @@ index b17c603d40d3..c6d17f573eca 100644 > @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS > // Set light source arguments. > floatArguments.constOne = 1; > - > + > - auto color = m_lightingColor.toColorTypeLossy>().resolved(); > + auto color = data.lightingColor.toColorTypeLossy>().resolved(); > - > + > floatArguments.colorRed = color.red; > floatArguments.colorGreen = color.green; > floatArguments.colorBlue = color.blue; > floatArguments.padding4 = 0; > - > + > - if (m_lightSource->type() == LS_POINT) { > + if (data.lightSource->type() == LS_POINT) { > neonData.flags |= FLAG_POINT_LIGHT; > @@ -181,7 +190,7 @@ index b17c603d40d3..c6d17f573eca 100644 > } > if (floatArguments.diffuseConstant == 1) > neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; > - > + > - int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; > + static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs > + int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; > @@ -189,7 +198,7 @@ index b17c603d40d3..c6d17f573eca 100644 > // Initialize parallel jobs > - ParallelJobs parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); > + ParallelJobs parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); > - > + > // Fill the parameter array > int job = parallelJobs.numberOfJobs(); > if (job > 1) { > @@ -213,42 +222,42 @@ index b17c603d40d3..c6d17f573eca 100644 > return; > @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS > } // namespace WebCore > - > + > #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) > - > -#endif // FELightingNEON_h > diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h > -index 0660143fc1cf..2b1e86d99fa4 100644 > +index 70f583b36e2c..7d5d27e5ccf8 100644 > --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h > +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h > -@@ -25,6 +25,10 @@ > - #include "LightSource.h" > +@@ -26,6 +26,10 @@ > + #include > #include > - > + > +namespace WTF { > +class TextStream; > +} // namespace WTF > + > namespace WebCore { > - > + > class DistantLightSource : public LightSource { > diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h > -index 0c073bc13f8c..e0db00545c17 100644 > +index 179edf6dba24..694d712d56fd 100644 > --- a/Source/WebCore/platform/graphics/filters/FELighting.h > +++ b/Source/WebCore/platform/graphics/filters/FELighting.h > @@ -35,8 +35,6 @@ > - > + > namespace WebCore { > - > + > -struct FELightingPaintingDataForNeon; > - > class FELighting : public FilterEffect { > public: > - const Color& lightingColor() const { return m_lightingColor; } > -@@ -67,11 +65,6 @@ protected: > - > + bool operator==(const FELighting&) const; > +@@ -68,11 +66,6 @@ protected: > + > std::unique_ptr createSoftwareApplier() const override; > - > + > -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) > - static int getPowerCoefficients(float exponent); > - inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); > @@ -258,34 +267,34 @@ index 0c073bc13f8c..e0db00545c17 100644 > float m_surfaceScale; > float m_diffuseConstant; > diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h > -index 126b3b2350f6..d906db21aa9c 100644 > +index a8cfdab895a9..34f867bba237 100644 > --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h > +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h > @@ -26,6 +26,10 @@ > #include "LightSource.h" > #include > - > + > +namespace WTF { > +class TextStream; > +} // namespace WTF > + > namespace WebCore { > - > + > class PointLightSource : public LightSource { > diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h > -index 641b205f986d..64380d9b6eb8 100644 > +index 6404467a5b6f..5cac38f22362 100644 > --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h > +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h > @@ -26,6 +26,10 @@ > #include "LightSource.h" > #include > - > + > +namespace WTF { > +class TextStream; > +} // namespace WTF > + > namespace WebCore { > - > + > class SpotLightSource : public LightSource { > diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h > index c974d92115ff..e2896660cfbd 100644 > @@ -293,14 +302,14 @@ index c974d92115ff..e2896660cfbd 100644 > +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h > @@ -36,6 +36,7 @@ > namespace WebCore { > - > + > class FELighting; > +struct FELightingPaintingDataForNeon; > - > + > class FELightingSoftwareApplier final : public FilterEffectConcreteApplier { > WTF_MAKE_FAST_ALLOCATED; > @@ -132,8 +133,23 @@ private: > - > + > static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); > static void applyPlatformGenericWorker(ApplyParameters*); > + > @@ -319,10 +328,10 @@ index c974d92115ff..e2896660cfbd 100644 > + > static void applyPlatform(const LightingData&); > }; > - > + > } // namespace WebCore > + > +#include "FELightingNEON.h" > --- > -2.37.3 > +-- > +2.43.1 > > -- > 2.43.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:22:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:22:07 +0100 Subject: [Buildroot] [git commit] boot/shim: security bump to version 15.8 Message-ID: <20240221172326.0624F87A04@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f42004a046313cf73ae707d43632109c36398dc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: CVE-2023-40546 mok: fix LogError() invocation CVE-2023-40547 - avoid incorrectly trusting HTTP headers CVE-2023-40548 Fix integer overflow on SBAT section size on 32-bit system CVE-2023-40549 Authenticode: verify that the signature header is in bounds. CVE-2023-40550 pe: Fix an out-of-bound read in verify_buffer_sbat() CVE-2023-40551: pe-relocate: Fix bounds check for MZ binaries https://github.com/rhboot/shim/tree/15.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- boot/shim/shim.hash | 2 +- boot/shim/shim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/shim/shim.hash b/boot/shim/shim.hash index c9c489fd2f..5aa4ca06e8 100644 --- a/boot/shim/shim.hash +++ b/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 eab91644a3efe91a666399f5d8eb3eed0e04d04f79d4b6c0b278ef7747a239a5 shim-15.6.tar.bz2 +sha256 a79f0a9b89f3681ab384865b1a46ab3f79d88b11b4ca59aa040ab03fffae80a9 shim-15.8.tar.bz2 sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index bbef81cfc4..19b11f4086 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHIM_VERSION = 15.6 +SHIM_VERSION = 15.8 SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION) SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2 SHIM_LICENSE = BSD-2-Clause From fontaine.fabrice at gmail.com Wed Feb 21 17:39:16 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 21 Feb 2024 18:39:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/cegui: fix build with libxml2 >= 2.12 Message-ID: <20240221173916.1095723-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of libxml2 to version 2.12.1 in commit d8ac52108c12f0fcc9641b63e7922009270f96c6: /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp: In member function 'virtual void CEGUI::LibxmlParser::parseXML(CEGUI::XMLHandler&, const CEGUI::RawDataContainer&, const CEGUI::String&, bool)': /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp:111:40: error: invalid conversion from 'const xmlError*' {aka 'const _xmlError*'} to 'xmlError*' {aka '_xmlError*'} [-fpermissive] 111 | xmlError* err = xmlGetLastError(); | ~~~~~~~~~~~~~~~^~ | | | const xmlError* {aka const _xmlError*} Fixes: d8ac52108c12f0fcc9641b63e7922009270f96c6 - http://autobuild.buildroot.org/results/b239b7b03542311e311e4612e9b811c154302a6e Signed-off-by: Fabrice Fontaine --- ...-of-xmlGetLastError-for-libxml2-2-12.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch diff --git a/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch new file mode 100644 index 0000000000..9091062e28 --- /dev/null +++ b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch @@ -0,0 +1,29 @@ +From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sun, 18 Feb 2024 14:16:21 -0800 +Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12 + +https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7 + +Upstream: https://github.com/cegui/cegui/commit/285ba5a2c0c435ed865c6e86afe314a822fd1e3f +Signed-off-by: Fabrice Fontaine +--- + cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +index 74a3dbddd..a408f9305 100644 +--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp ++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler, + + if (!doc) + { ++#if LIBXML_VERSION >= 21200 ++ const xmlError* err = xmlGetLastError(); ++#else + xmlError* err = xmlGetLastError(); ++#endif + + throw GenericException( + String("xmlParseMemory failed in file: '") + -- 2.43.0 From yann.morin.1998 at free.fr Wed Feb 21 17:41:48 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:41:48 +0100 Subject: [Buildroot] [git commit] package/cegui: fix build with libxml2 >= 2.12 Message-ID: <20240221174201.E2A8E87A0E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b2bea40abd1d6092f5fd7d201ad1580e7f629d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of libxml2 to version 2.12.1 in commit d8ac52108c12f0fcc9641b63e7922009270f96c6: /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp: In member function 'virtual void CEGUI::LibxmlParser::parseXML(CEGUI::XMLHandler&, const CEGUI::RawDataContainer&, const CEGUI::String&, bool)': /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp:111:40: error: invalid conversion from 'const xmlError*' {aka 'const _xmlError*'} to 'xmlError*' {aka '_xmlError*'} [-fpermissive] 111 | xmlError* err = xmlGetLastError(); | ~~~~~~~~~~~~~~~^~ | | | const xmlError* {aka const _xmlError*} Fixes: d8ac52108c12f0fcc9641b63e7922009270f96c6 - http://autobuild.buildroot.org/results/b239b7b03542311e311e4612e9b811c154302a6e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-type-of-xmlGetLastError-for-libxml2-2-12.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch new file mode 100644 index 0000000000..9091062e28 --- /dev/null +++ b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch @@ -0,0 +1,29 @@ +From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sun, 18 Feb 2024 14:16:21 -0800 +Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12 + +https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7 + +Upstream: https://github.com/cegui/cegui/commit/285ba5a2c0c435ed865c6e86afe314a822fd1e3f +Signed-off-by: Fabrice Fontaine +--- + cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +index 74a3dbddd..a408f9305 100644 +--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp ++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler, + + if (!doc) + { ++#if LIBXML_VERSION >= 21200 ++ const xmlError* err = xmlGetLastError(); ++#else + xmlError* err = xmlGetLastError(); ++#endif + + throw GenericException( + String("xmlParseMemory failed in file: '") + From yann.morin.1998 at free.fr Wed Feb 21 17:42:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:42:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/cegui: fix build with libxml2 >= 2.12 In-Reply-To: <20240221173916.1095723-1-fontaine.fabrice@gmail.com> References: <20240221173916.1095723-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-21 18:39 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump of libxml2 to version > 2.12.1 in commit d8ac52108c12f0fcc9641b63e7922009270f96c6: > > /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp: In member function 'virtual void CEGUI::LibxmlParser::parseXML(CEGUI::XMLHandler&, const CEGUI::RawDataContainer&, const CEGUI::String&, bool)': > /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp:111:40: error: invalid conversion from 'const xmlError*' {aka 'const _xmlError*'} to 'xmlError*' {aka '_xmlError*'} [-fpermissive] > 111 | xmlError* err = xmlGetLastError(); > | ~~~~~~~~~~~~~~~^~ > | | > | const xmlError* {aka const _xmlError*} > > Fixes: d8ac52108c12f0fcc9641b63e7922009270f96c6 > - http://autobuild.buildroot.org/results/b239b7b03542311e311e4612e9b811c154302a6e > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...-of-xmlGetLastError-for-libxml2-2-12.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch > > diff --git a/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch > new file mode 100644 > index 0000000000..9091062e28 > --- /dev/null > +++ b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch > @@ -0,0 +1,29 @@ > +From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001 > +From: oreo639 > +Date: Sun, 18 Feb 2024 14:16:21 -0800 > +Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12 > + > +https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7 > + > +Upstream: https://github.com/cegui/cegui/commit/285ba5a2c0c435ed865c6e86afe314a822fd1e3f > +Signed-off-by: Fabrice Fontaine > +--- > + cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++ > + 1 file changed, 4 insertions(+) > + > +diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp > +index 74a3dbddd..a408f9305 100644 > +--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp > ++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp > +@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler, > + > + if (!doc) > + { > ++#if LIBXML_VERSION >= 21200 > ++ const xmlError* err = xmlGetLastError(); > ++#else > + xmlError* err = xmlGetLastError(); > ++#endif > + > + throw GenericException( > + String("xmlParseMemory failed in file: '") + > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Feb 21 17:45:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 21 Feb 2024 18:45:12 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 254.9 In-Reply-To: References: <20240219182604.1287000-1-buildroot@bubu1.eu> <04a28a98-2699-44b6-b5d5-697a1a6fe893@bubu1.eu> Message-ID: <20240221184512.204b88c0@windsurf> On Wed, 21 Feb 2024 18:08:14 +0100 "Yann E. MORIN" wrote: > On 2024-02-19 22:30 +0100, Marcus Hoffmann via buildroot spake thusly: > > On 19.02.24 22:14, Yann E. MORIN wrote: > > > Please watch the gitlab pipeline for any failure of the runtimet tests, > > > just in case this minor version bump breaks anything. > > So if I understood that correctly I can add myself as a maintainer of the > > runtime test files and I'll get an email when that test fails? Or is that > > not how it works? > > As far as I understand, yes, this is what should happen. Thomas has some > scripting (somewhere!) that sends the daily emails, so he'd have the > authoritative answer. Absolutely correct. If someone is registered as a developer/maintainer for a test case in the DEVELOPERS file, this person will receive an e-mail when the test fails in our CI. Please note that runtime tests are not run every day in our CI, but only on a weekly basis. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 21 17:50:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:50:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libspdm: bump version to 3.2.0 In-Reply-To: <20240221004400.27429-1-wilfred.mallawa@wdc.com> References: <20240221004400.27429-1-wilfred.mallawa@wdc.com> Message-ID: Wilfred, All, On 2024-02-21 10:44 +1000, Wilfred Mallawa via buildroot spake thusly: > Additionally, add an upstream patch that fixes the configuration for > "NONE" toolchain variant in libspdm. That is, where the build > environment provides compile/link options. > > Signed-off-by: Wilfred Mallawa > --- > ...eLists-remove-fixed-options-for-NONE.patch | 51 +++++++++++++++++++ > package/libspdm/libspdm.hash | 2 +- > package/libspdm/libspdm.mk | 2 +- > 3 files changed, 53 insertions(+), 2 deletions(-) > create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > > diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > new file mode 100644 > index 0000000000..0d1287a769 > --- /dev/null > +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > @@ -0,0 +1,51 @@ > +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 > +From: Wilfred Mallawa > +Date: Mon, 19 Feb 2024 09:56:14 +1000 > +Subject: [PATCH] CMakeLists: remove fixed options for NONE > + > +The use of the NONE toolchain option is such that we can provide at the > +build project level (buildroot etc...). However, the changes introduced > +in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker > +option that does not comply with the definition of the options as > +specified in [1]. This change removes those options. > + > +[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments > + > +Signed-off-by: Wilfred Mallawa $ ./utils/docker-run make check-package package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) So you need to add: Upstream: https://github.com/DMTF/libspdm/commit/d4d6b138d727e484fa9d0fef476ca181681d0695 Also, as I understand it, NONE is thus no longer a valid value for -DTOOLCHAIN, so you should drop that from libspdm.mk as well, right? Regards, Yann E. MORIN. > +--- > + CMakeLists.txt | 19 ------------------- > + 1 file changed, 19 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 9c300cc817..f6cf17d269 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") > + SET(CMAKE_EXE_LINKER_FLAGS "") > + > + SET(CMAKE_C_LINK_EXECUTABLE "") > +- > +- elseif(TOOLCHAIN STREQUAL "NONE") > +- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) > +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") > +- ADD_COMPILE_OPTIONS(-g) > +- endif() > +- if(GCOV STREQUAL "ON") > +- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) > +- endif() > +- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) > +- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) > +- > +- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) > +- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) > +- if(GCOV STREQUAL "ON") > +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") > +- endif() > +- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") > +- > + endif() > + > + if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") > +-- > +2.43.2 > + > diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash > index 23faba1c4b..32415bcfce 100644 > --- a/package/libspdm/libspdm.hash > +++ b/package/libspdm/libspdm.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183 libspdm-3.1.1.tar.gz > +sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz > sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md > diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk > index 34dbb457c4..2ec35be0ac 100644 > --- a/package/libspdm/libspdm.mk > +++ b/package/libspdm/libspdm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSPDM_VERSION = 3.1.1 > +LIBSPDM_VERSION = 3.2.0 > LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) > LIBSPDM_LICENSE = BSD-3-Clause > LIBSPDM_LICENSE_FILES = LICENSE.md > -- > 2.43.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:57:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:57:14 +0100 Subject: [Buildroot] [git commit] package/libstrophe: bump to version 0.13.1 Message-ID: <20240221175758.45C8387A16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c32cdd545767337616f94d076212c6273e59f44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Vetter Signed-off-by: Yann E. MORIN --- package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index e284e8cca6..ec5a55985a 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz +sha256 86c0abd348ae66feb40b6886f2c7f04525f1d5b20a48c10d4db4ed532dc63f22 libstrophe-0.13.1.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index 257593bbec..42d582fe9c 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.13.0 +LIBSTROPHE_VERSION = 0.13.1 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf From yann.morin.1998 at free.fr Wed Feb 21 17:59:46 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:59:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.13.1 In-Reply-To: <20240221143001.30174-1-jubalh@iodoru.org> References: <20240221143001.30174-1-jubalh@iodoru.org> Message-ID: Michael, All, On 2024-02-21 15:30 +0100, Michael Vetter spake thusly: > Signed-off-by: Michael Vetter Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libstrophe/libstrophe.hash | 2 +- > package/libstrophe/libstrophe.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash > index e284e8cca6..ec5a55985a 100644 > --- a/package/libstrophe/libstrophe.hash > +++ b/package/libstrophe/libstrophe.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz > +sha256 86c0abd348ae66feb40b6886f2c7f04525f1d5b20a48c10d4db4ed532dc63f22 libstrophe-0.13.1.tar.xz > sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt > diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk > index 257593bbec..42d582fe9c 100644 > --- a/package/libstrophe/libstrophe.mk > +++ b/package/libstrophe/libstrophe.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSTROPHE_VERSION = 0.13.0 > +LIBSTROPHE_VERSION = 0.13.1 > LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz > LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) > LIBSTROPHE_DEPENDENCIES = host-pkgconf > -- > 2.35.3 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 18:00:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 19:00:58 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Romain Naour for am574x_idk_defconfig Message-ID: <20240221180112.1702487A19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec344d60134e4db8e1d54a84697ba73756bd57d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The DEVELOPERS entry was missing. Fixes: 35eb74c634 ("configs/am574x_idk_defconfig: new defconfig") Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f0e16af162..0f065bfafb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2668,7 +2668,9 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ +F: board/ti/am574x-idk/ F: configs/qemu_* +F: configs/am574x_idk_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ From yann.morin.1998 at free.fr Wed Feb 21 18:01:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 19:01:33 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Romain Naour for am574x_idk_defconfig In-Reply-To: <20240220225025.781466-1-romain.naour@smile.fr> References: <20240220225025.781466-1-romain.naour@smile.fr> Message-ID: Romain, All, On 2024-02-20 23:50 +0100, Romain Naour spake thusly: > The DEVELOPERS entry was missing. > > Fixes: 35eb74c634 ("configs/am574x_idk_defconfig: new defconfig") Tsss... ;-) > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 0d12c3abcb..ff44741f9f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2667,7 +2667,9 @@ F: package/vnstat/ > > N: Romain Naour > F: board/qemu/ > +F: board/ti/am574x-idk/ > F: configs/qemu_* > +F: configs/am574x_idk_defconfig > F: package/alure/ > F: package/aubio/ > F: package/binutils/ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 18:02:22 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 19:02:22 +0100 Subject: [Buildroot] [git commit] package/highway: bump to version 1.1.0 Message-ID: <20240221180301.B32B687A23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2e08963a2c45e6036566687788b812383e80820 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For release note, see [1]. This commit removes the package patch, as it is now included in this new release. LICENSE-BSD3 hash changed, due to reformatting. See [2]. [1] https://github.com/google/highway/releases/tag/1.1.0 [2] https://github.com/google/highway/commit/edc35d14c77cb24dc1163989c762d69694e0e955 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .../0001-add-required-RISC-V-flags-to-CMake.patch | 42 ---------------------- package/highway/highway.hash | 4 +-- package/highway/highway.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch b/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch deleted file mode 100644 index bfcbfb055c..0000000000 --- a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5d58d233fbcec0c6a39df8186a877329147324b3 Mon Sep 17 00:00:00 2001 -From: Mathieu Malaterre -Date: Wed, 13 Sep 2023 08:37:54 +0200 -Subject: [PATCH] Add an option to opt-out of HWY_RISCV - -Fixes #1740 - -Upstream: https://github.com/google/highway/commit/5d58d233fbcec0c6a39df8186a877329147324b3 -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c2bf57b3f5..be639c945f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,6 +61,9 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4 - # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. - set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?") - -+# Currently this will compile the entire codebase with `-march=rv64gcv1p0`: -+set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?") -+ - # Unconditionally adding -Werror risks breaking the build when new warnings - # arise due to compiler/platform changes. Enable this in CI/tests. - set(HWY_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Add -Werror flag?") -@@ -260,9 +263,11 @@ else() - # gcc(13) and recent clang both support V, but not yet runtime dispatch, so - # we add the gcv compiler flag, which then requires the CPU (now when using - # either compiler) to support V. -- list(APPEND HWY_FLAGS -march=rv64gcv1p0) -- if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -- list(APPEND HWY_FLAGS -menable-experimental-extensions) -+ if(HWY_CMAKE_RVV) -+ list(APPEND HWY_FLAGS -march=rv64gcv1p0) -+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -+ list(APPEND HWY_FLAGS -menable-experimental-extensions) -+ endif() - endif() - endif() - diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3cb497f20a..270131134e 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5 highway-1.0.7.tar.gz +sha256 354a8b4539b588e70b98ec70844273e3f2741302c4c377bcc4e81b3d1866f7c9 highway-1.1.0.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE -sha256 6dcc159f448e3aca73a15e355d0a6735ca3fd224abe637e0b7437dce2d24f765 LICENSE-BSD3 +sha256 d25e82e26acd42ca3ccc9993622631163425b869b9e16284226d534cff6470f2 LICENSE-BSD3 diff --git a/package/highway/highway.mk b/package/highway/highway.mk index b45fa8df74..3eb0d7a4aa 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.7 +HIGHWAY_VERSION = 1.1.0 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 or BSD-3-Clause HIGHWAY_LICENSE_FILES = LICENSE LICENSE-BSD3 From yann.morin.1998 at free.fr Wed Feb 21 18:03:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 19:03:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/highway: bump to version 1.1.0 In-Reply-To: <20240219221458.831078-1-ju.o@free.fr> References: <20240219221458.831078-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-19 23:14 +0100, Julien Olivain spake thusly: > For release note, see [1]. > > This commit removes the package patch, as it is now included in this new > release. > > LICENSE-BSD3 hash changed, due to reformatting. See [2]. > > [1] https://github.com/google/highway/releases/tag/1.1.0 > [2] https://github.com/google/highway/commit/edc35d14c77cb24dc1163989c762d69694e0e955 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...1-add-required-RISC-V-flags-to-CMake.patch | 42 ------------------- > package/highway/highway.hash | 4 +- > package/highway/highway.mk | 2 +- > 3 files changed, 3 insertions(+), 45 deletions(-) > delete mode 100644 package/highway/0001-add-required-RISC-V-flags-to-CMake.patch > > diff --git a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch b/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch > deleted file mode 100644 > index bfcbfb055cb..00000000000 > --- a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -From 5d58d233fbcec0c6a39df8186a877329147324b3 Mon Sep 17 00:00:00 2001 > -From: Mathieu Malaterre > -Date: Wed, 13 Sep 2023 08:37:54 +0200 > -Subject: [PATCH] Add an option to opt-out of HWY_RISCV > - > -Fixes #1740 > - > -Upstream: https://github.com/google/highway/commit/5d58d233fbcec0c6a39df8186a877329147324b3 > -Signed-off-by: Fabrice Fontaine > ---- > - CMakeLists.txt | 11 ++++++++--- > - 1 file changed, 8 insertions(+), 3 deletions(-) > - > -diff --git a/CMakeLists.txt b/CMakeLists.txt > -index c2bf57b3f5..be639c945f 100644 > ---- a/CMakeLists.txt > -+++ b/CMakeLists.txt > -@@ -61,6 +61,9 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4 > - # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. > - set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?") > - > -+# Currently this will compile the entire codebase with `-march=rv64gcv1p0`: > -+set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?") > -+ > - # Unconditionally adding -Werror risks breaking the build when new warnings > - # arise due to compiler/platform changes. Enable this in CI/tests. > - set(HWY_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Add -Werror flag?") > -@@ -260,9 +263,11 @@ else() > - # gcc(13) and recent clang both support V, but not yet runtime dispatch, so > - # we add the gcv compiler flag, which then requires the CPU (now when using > - # either compiler) to support V. > -- list(APPEND HWY_FLAGS -march=rv64gcv1p0) > -- if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") > -- list(APPEND HWY_FLAGS -menable-experimental-extensions) > -+ if(HWY_CMAKE_RVV) > -+ list(APPEND HWY_FLAGS -march=rv64gcv1p0) > -+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") > -+ list(APPEND HWY_FLAGS -menable-experimental-extensions) > -+ endif() > - endif() > - endif() > - > diff --git a/package/highway/highway.hash b/package/highway/highway.hash > index 3cb497f20a7..270131134ec 100644 > --- a/package/highway/highway.hash > +++ b/package/highway/highway.hash > @@ -1,4 +1,4 @@ > # Locally computed: > -sha256 5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5 highway-1.0.7.tar.gz > +sha256 354a8b4539b588e70b98ec70844273e3f2741302c4c377bcc4e81b3d1866f7c9 highway-1.1.0.tar.gz > sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE > -sha256 6dcc159f448e3aca73a15e355d0a6735ca3fd224abe637e0b7437dce2d24f765 LICENSE-BSD3 > +sha256 d25e82e26acd42ca3ccc9993622631163425b869b9e16284226d534cff6470f2 LICENSE-BSD3 > diff --git a/package/highway/highway.mk b/package/highway/highway.mk > index b45fa8df74d..3eb0d7a4aa2 100644 > --- a/package/highway/highway.mk > +++ b/package/highway/highway.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HIGHWAY_VERSION = 1.0.7 > +HIGHWAY_VERSION = 1.1.0 > HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) > HIGHWAY_LICENSE = Apache-2.0 or BSD-3-Clause > HIGHWAY_LICENSE_FILES = LICENSE LICENSE-BSD3 > -- > 2.43.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 18:05:38 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 19:05:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 20.6.4-Nexus In-Reply-To: <20240219192724.3776282-1-bernd@kuhls.net> References: <20240219192724.3776282-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-19 20:27 +0100, Bernd Kuhls spake thusly: > Signed-off-by: Bernd Kuhls > --- > package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- > package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash > index 286cff5cc4..b4e6f30685 100644 > --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash > +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4c742a31ec6f4d2a427d05f70950cfd4e347cf1c0acdb1747c39eb68124be30a kodi-pvr-mythtv-20.6.1-Nexus.tar.gz > +sha256 da7cdc514ce48992e7c2575735c4bd9d22891ba3c12169ae42163b159517b8c9 kodi-pvr-mythtv-20.6.4-Nexus.tar.gz > sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md > diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk > index 312c8619be..57ddf3af10 100644 > --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk > +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_PVR_MYTHTV_VERSION = 20.6.1-Nexus AFAICS, we only have 20.5.10-Nexus in master... Regards, Yann E. MORIN. > +KODI_PVR_MYTHTV_VERSION = 20.6.4-Nexus > KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) > KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ > KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Wed Feb 21 18:14:39 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 21 Feb 2024 19:14:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: disable cargo Message-ID: <20240221181439.1113724-1-fontaine.fabrice@gmail.com> Set HAVE_CARGO=0 to avoid the following build failures raised since bump to version 2.29.0 in commit 68df20336664d4d0b1a9d8d0285d23eba631845a and https://github.com/ibm-s390-linux/s390-tools/commit/e6add997ebbcd967734391da8a8987c7926e168f: error: could not compile `pvsecret` (bin "pvsecret") due to previous error [...] ERROR: architecture for "/usr/bin/pvsecret" is "AArch64", should be "IBM S/390" Fixes: 68df20336664d4d0b1a9d8d0285d23eba631845a - http://autobuild.buildroot.org/results/22035cb4d8e251f9930a7d529b91b128919252bb - http://autobuild.buildroot.org/results/99be6d3b2bab7c952ce02853f54924c5219aecc1 Signed-off-by: Fabrice Fontaine --- package/s390-tools/s390-tools.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index bc39a9bd19..04d193a467 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -12,7 +12,8 @@ S390_TOOLS_DEPENDENCIES = zlib S390_TOOLS_MAKE_OPTS = \ ARCH=$(BR2_ARCH) \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + HAVE_CARGO=0 ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) S390_TOOLS_DEPENDENCIES += libcurl -- 2.43.0 From fontaine.fabrice at gmail.com Wed Feb 21 18:16:50 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 21 Feb 2024 19:16:50 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/zlib-ng: fix arm build Message-ID: <20240221181650.1115046-1-fontaine.fabrice@gmail.com> zlib-ng usage uses CMAKE_C_COMPILER_TARGET which is non-standard and is not supposed to be used by the CMakeLists.txt machinery of a particular package. Indeed, [1] specifies that: Some compiler drivers are inherently cross-compilers, such as clang and QNX qcc. These compiler drivers support a command-line argument to specify the target to cross-compile for. buildroot is not using clang nor QNX qcc. [2] also refers to this variable only for clang [3] and QNX [4]. Therefore, zlib-ng's usage of this variable is a bit of a hack, and it's actually why it works when passed as an argument, because they are in fact not supposed to use this variable. So set CMAKE_C_COMPILER_TARGET to BR2_ARCH to fix the following arm build failure raised since bump to version 2.0.6 in commit d2249821d3f30202ca2a35ad24918378d9a0a0e8: -- Detecting C compile features - done -- Arch not recognized, falling back to cmake arch: 'l' -- Basearch 'l' not recognized, defaulting to 'x86'. -- Basearch of 'l' has been detected as: 'x86' [...] /home/buildroot/autobuild/instance-0/output-1/build/zlib-ng-2.1.3/arch/x86/x86_features.c:17:12: fatal error: cpuid.h: No such file or directory 17 | # include | ^~~~~~~~~ [1] https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_TARGET.html [2] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html [3] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-using-clang [4] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-qnx Fixes: d2249821d3f30202ca2a35ad24918378d9a0a0e8 - http://autobuild.buildroot.org/results/1551aa69be19239a8d8e081f033e4027d679ab8f - http://autobuild.buildroot.org/results/075d704c0f11710353bac43478e4501addcd747d Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni and Peter Korsgaard): - Update commit message package/zlib-ng/zlib-ng.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index fbb906503a..33e8754c9d 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -13,6 +13,7 @@ ZLIB_NG_PROVIDES = zlib # Build with zlib compatible API, gzFile support and optimizations on ZLIB_NG_CONF_OPTS += \ + -DCMAKE_C_COMPILER_TARGET=$(BR2_ARCH) \ -DWITH_GZFILEOP=1 \ -DWITH_OPTIM=1 \ -DZLIB_COMPAT=1 \ -- 2.43.0 From bernd at kuhls.net Wed Feb 21 18:17:47 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Wed, 21 Feb 2024 19:17:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 20.6.4-Nexus Message-ID: <20240221181747.41773-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index c61c391825..b4e6f30685 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb21e185d1333a8696565138bc58df3d37970c9a3615193396e9f296a56a24c4 kodi-pvr-mythtv-20.5.10-Nexus.tar.gz +sha256 da7cdc514ce48992e7c2575735c4bd9d22891ba3c12169ae42163b159517b8c9 kodi-pvr-mythtv-20.6.4-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 66f1948741..57ddf3af10 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.5.10-Nexus +KODI_PVR_MYTHTV_VERSION = 20.6.4-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.39.2 From james.hilliard1 at gmail.com Wed Feb 21 18:23:04 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 21 Feb 2024 11:23:04 -0700 Subject: [Buildroot] [PATCH 1/1] package/swupdate: bump to version 2023.12.1 Message-ID: <20240221182304.647302-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index c19a82304f..19ef3a2724 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ce24032300e2b6a6faa3d22e49f981fd90f04ac6f5d7e802166824b0cd5ca669 swupdate-2023.12.tar.gz +sha256 89ec8926d66627255fe689ed96ad8d30f5c539315956dacf9890e308095dee3b swupdate-2023.12.1.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index ca8c140886..3b78c160f8 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2023.12 +SWUPDATE_VERSION = 2023.12.1 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ -- 2.34.1 From bernd at kuhls.net Wed Feb 21 19:55:20 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Wed, 21 Feb 2024 20:55:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/libffi: bump version to 3.4.6 Message-ID: <20240221195520.1762497-1-bernd@kuhls.net> Removed patch 0001 and instead added new configure option --disable-multi-os-directory which was added upstream: https://github.com/libffi/libffi/commit/877ea9bf9ac2c98cb858c12f5a6aeeec13cf978f Removed patch 0003 due to various upstream fixes for mips soft-float support since its addition in 2016: https://github.com/libffi/libffi/commits/master/src/mips Renumbered remaining patch. Updated license hash due to copyright year bump: https://github.com/libffi/libffi/commit/91739a1a912476adbf1e0e4dcb091b9a2c5007d9 Signed-off-by: Bernd Kuhls --- Build-tested using this defconfig: BR2_PACKAGE_LIBFFI=y Please note that the build failure with bootlin-armv7m-uclibc is expected: http://lists.busybox.net/pipermail/buildroot/2019-October/566384.html The remaining patch 0001 is still needed, builds with sourcery-mips* toolchains failed without it. arm-aarch64 [ 1/45]: OK bootlin-aarch64-glibc [ 2/45]: OK bootlin-arcle-hs38-uclibc [ 3/45]: OK bootlin-armv5-uclibc [ 4/45]: OK bootlin-armv7-glibc [ 5/45]: OK bootlin-armv7m-uclibc [ 6/45]: FAILED bootlin-armv7-musl [ 7/45]: OK bootlin-m68k-5208-uclibc [ 8/45]: OK bootlin-m68k-68040-uclibc [ 9/45]: OK bootlin-microblazeel-uclibc [10/45]: OK bootlin-mipsel32r6-glibc [11/45]: OK bootlin-mipsel-uclibc [12/45]: OK bootlin-nios2-glibc [13/45]: OK bootlin-openrisc-uclibc [14/45]: OK bootlin-powerpc64le-power8-glibc [15/45]: OK bootlin-powerpc-e500mc-uclibc [16/45]: OK bootlin-riscv32-glibc [17/45]: OK bootlin-riscv64-glibc [18/45]: OK bootlin-riscv64-musl [19/45]: OK bootlin-s390x-z13-glibc [20/45]: OK bootlin-sh4-uclibc [21/45]: OK bootlin-sparc64-glibc [22/45]: OK bootlin-sparc-uclibc [23/45]: OK bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: OK bootlin-xtensa-uclibc [27/45]: OK br-arm-basic [28/45]: OK br-arm-full-nothread [29/45]: SKIPPED br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 1 skipped, 1 build failed, 0 legal-info failed, 0 show-info failed ...-Fix-installation-location-of-libffi.patch | 55 ------------------- ...ix-use-of-compact-eh-frames-on-MIPS.patch} | 4 +- ...-hardfloat-in-the-MIPS-assembly-code.patch | 44 --------------- package/libffi/libffi.hash | 4 +- package/libffi/libffi.mk | 7 ++- 5 files changed, 9 insertions(+), 105 deletions(-) delete mode 100644 package/libffi/0001-Fix-installation-location-of-libffi.patch rename package/libffi/{0002-Fix-use-of-compact-eh-frames-on-MIPS.patch => 0001-Fix-use-of-compact-eh-frames-on-MIPS.patch} (94%) delete mode 100644 package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch diff --git a/package/libffi/0001-Fix-installation-location-of-libffi.patch b/package/libffi/0001-Fix-installation-location-of-libffi.patch deleted file mode 100644 index 6ac9123730..0000000000 --- a/package/libffi/0001-Fix-installation-location-of-libffi.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 580f46a7bc6e9fea3a2227b5268cc3aed1d60e3b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 7 Feb 2013 22:26:56 +0100 -Subject: [PATCH] Fix installation location of libffi -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The libffi is currently declared as toolexeclib_LTLIBRARIES. In many -cases, toolexeclib libraries will be installed in /usr/lib, so it -doesn't make any difference. - -However, with multilib toolchains, they get installed in a -subdirectory of /usr/lib/. For example, with a Sourcery CodeBench -PowerPC toolchain, if the e500mc multilib variant is used, the libffi -library gets installed in /usr/lib/te500mc/. This is due to the -following code in the configure script: - - multi_os_directory=`$CC -print-multi-os-directory` - case $multi_os_directory in - .) ;; # Avoid trailing /. - *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; - esac - -Once the library is installed in /usr/lib/te500mc/, nothing works -because this installation location is inconsistent with the -installation location declared in libffi.pc. - -So, instead of using this bizarre toolexeclib_LTLIBRARIES, simply use -the more standard lib_LTLIBRARIES, which ensures that the libffi -library is always installed in /usr/lib. - -Signed-off-by: Thomas Petazzoni -[unfuzz for 3.2.1] -Signed-off-by: J?rg Krause ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 0e40451..309474c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -104,7 +104,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) - - MAKEOVERRIDES= - --toolexeclib_LTLIBRARIES = libffi.la -+lib_LTLIBRARIES = libffi.la - noinst_LTLIBRARIES = libffi_convenience.la - - libffi_la_SOURCES = src/prep_cif.c src/types.c \ --- -2.5.3 - diff --git a/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch b/package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch similarity index 94% rename from package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch rename to package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch index c19e395f90..7786b984a2 100644 --- a/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch +++ b/package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch @@ -15,6 +15,8 @@ Mips and compiler support it. Signed-off-by: J?r?me Pouiller [unfuzz for 3.2.1] Signed-off-by: J?rg Krause +[rebased for 3.4.6] +Signed-off-by: Bernd Kuhls --- configure.ac | 10 ++++++++++ 1 file changed, 10 insertions(+) @@ -23,7 +25,7 @@ diff --git a/configure.ac b/configure.ac index a7bf5ee..36cd0d4 100644 --- a/configure.ac +++ b/configure.ac -@@ -469,6 +469,16 @@ esac +@@ -238,6 +238,16 @@ esac AM_CONDITIONAL(FFI_EXEC_TRAMPOLINE_TABLE, test x$FFI_EXEC_TRAMPOLINE_TABLE = x1) AC_SUBST(FFI_EXEC_TRAMPOLINE_TABLE) diff --git a/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch b/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch deleted file mode 100644 index 168972a871..0000000000 --- a/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 48bc37fabbc685b1e3293055bd33ca66c619305e Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Wed, 13 Jan 2016 14:49:59 +0000 -Subject: [PATCH] libffi: enable hardfloat in the MIPS assembly code - -This way it will be possible to build it for soft-float. This is only a -temporary fix. The package needs to be fixed properly. - -Signed-off-by: Vicente Olivert Riera -[Update for 3.3-rc0] -Signed-off-by: Fabrice Fontaine ---- - src/mips/n32.S | 1 + - src/mips/o32.S | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/mips/n32.S b/src/mips/n32.S -index c6985d3..dc842d5 100644 ---- a/src/mips/n32.S -+++ b/src/mips/n32.S -@@ -44,6 +44,7 @@ - #endif - #if !defined(__mips_isa_rev) || (__mips_isa_rev<6) - .set mips4 - #endif -+ .set hardfloat - .text - .align 2 - .globl ffi_call_N32 -diff --git a/src/mips/o32.S b/src/mips/o32.S -index eb27981..b653daf 100644 ---- a/src/mips/o32.S -+++ b/src/mips/o32.S -@@ -42,6 +42,7 @@ - #define RA_OFF (SIZEOF_FRAME - 1 * FFI_SIZEOF_ARG) - - .abicalls -+ .set hardfloat - .text - .align 2 - .globl ffi_call_O32 --- -2.4.10 - diff --git a/package/libffi/libffi.hash b/package/libffi/libffi.hash index 8d2349ec21..c2ef588f6b 100644 --- a/package/libffi/libffi.hash +++ b/package/libffi/libffi.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676 libffi-3.4.4.tar.gz +sha256 b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e libffi-3.4.6.tar.gz # License files, locally calculated -sha256 2c9c2acb9743e6b007b91350475308aee44691d96aa20eacef8e199988c8c388 LICENSE +sha256 67894089811f93fca47a76f85e017da6f8582d4ba0905963c6e0f1ad6df7a195 LICENSE diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 6249023eae..9c47cf3973 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -4,19 +4,20 @@ # ################################################################################ -LIBFFI_VERSION = 3.4.4 +LIBFFI_VERSION = 3.4.6 LIBFFI_SITE = \ https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION) LIBFFI_LICENSE = MIT LIBFFI_LICENSE_FILES = LICENSE LIBFFI_CPE_ID_VALID = YES LIBFFI_INSTALL_STAGING = YES -# We're patching Makefile.am +# We're patching configure.ac LIBFFI_AUTORECONF = YES +LIBFFI_CONF_OPTS = --disable-multi-os-directory # The static exec trampolines is enabled by default since # libffi 3.4.2. However it doesn't work with gobject-introspection. -LIBFFI_CONF_OPTS = --disable-exec-static-tramp +LIBFFI_CONF_OPTS += --disable-exec-static-tramp $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.39.2 From dario.binacchi at amarulasolutions.com Wed Feb 21 20:09:38 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 21 Feb 2024 21:09:38 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <7c4ef18e-774f-4a65-8e51-7a016ed89649@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> <7c4ef18e-774f-4a65-8e51-7a016ed89649@smile.fr> Message-ID: Hello Romain, On Wed, Feb 21, 2024 at 4:29?PM Romain Naour wrote: > > Hello Dario, > > Le 21/02/2024 ? 11:19, Dario Binacchi a ?crit : > > Hi Romain, > > > > On Mon, Feb 19, 2024 at 11:15?AM Romain Naour wrote: > >> > >> Hello Dario, > >> > >> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > >>> Recent version of U-Boot use binman to provide a mechanism for building > >>> images, from simple SPL + U-Boot combinations, to more complex > >>> arrangements with many parts. > >>> > >>> The patch set the BINMAN_INDIRS environment variable to provide the > >>> directory to search for binary blobs and select the packages required by > >>> binman. > >>> > >>> Co-developed-by: Michael Trimarchi > >>> Signed-off-by: Michael Trimarchi > >>> Signed-off-by: Dario Binacchi > >>> > >>> --- > >>> > >>> Changes in v4: > >>> - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > >>> > >>> Changes in v2: > >>> - Change commit message > >>> - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > >>> - Select packages required by binman if > >>> BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > >>> > >>> Signed-off-by: Dario Binacchi > >>> --- > >>> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- > >>> 1 file changed, 12 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > >>> index 0ffcb8235f2e..2a10024aedaa 100644 > >>> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > >>> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > >>> @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ > >>> host-pkgconf \ > >>> $(BR2_MAKE_HOST_DEPENDENCY) \ > >>> host-arm-gnu-toolchain \ > >>> - host-openssl > >>> + host-openssl \ > >>> + host-python-attrs \ > >>> + host-python-jsonschema \ > >>> + host-python-jsonschema-specifications \ > >>> + host-python-pyyaml \ > >>> + host-python-referencing \ > >>> + host-python-rpds-py > >> > >> Most of theses new dependencies are not ti-k3-r5-loader dependencies but > >> host-python-jsonschema runtime dependencies. > > > > I removed the runtime dependencies and tried to modify the patch based > > on your indications and your patch > > (http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/), > > but I'm encountering compilation errors specifically on the Python > > modules that you indicated as runtime > > dependencies. > > What's the issue? > > Make sure to take host-python changes from my series, some of them was updated > with their own runtime dependencies: The problem was this. I hadn't noticed the changes you had applied to my patches. I'm doing the final tests, I'll submit v5 as soon as possible. Many thanks! Regards, Dario > > For example: > http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-7-romain.naour at smile.fr/ > > I tried to compile ti_am62x_sk_defconfig on your series > > (i. e. "Add ti_j721e_sk_defconfig"), > > but it seems like the HSFS option has disappeared. > > Indeed, this is something we need to improve. > > > So I need to add the runtime dependencies as well to compile correctly. > > Can you try with only patch 4/21 (package/python-attrs: add host variant) to > patch 10/21 (boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN > option). > > Maybe update the last patch 10/21 since it was suggested to remove > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option to make binman use mandatory for > ti-k3-r5-loader package. > > Best regards, > Romain > > > > > Thanks and regards, > > Dario > > > >> > >> Note: host-python-jsonschema depends on > >> BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS due to its runtime dependency on > >> host-python-rpds-py. > >> > >>> > >>> TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > >>> TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > >>> @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ > >>> $(BR2_BISON_HOST_DEPENDENCY) \ > >>> $(BR2_FLEX_HOST_DEPENDENCY) > >>> > >>> +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) > >> > >> It's a u-boot package config option. just add host-python-pylibfdt the dependency. > >> > >>> +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt > >>> +endif > >>> + > >>> ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) > >>> TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig > >>> else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) > >>> @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > >>> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > >>> ARCH=arm \ > >>> HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > >>> + BINMAN_INDIRS=$(BINARIES_DIR) \ > >> > >> I suggested to add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN but indeed we should > >> use binman unconditionally for ti-k3-r5-loader package. > >> > >> http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ > >> > >> Best regards, > >> Romain > >> > >> > >>> HOSTLDFLAGS="$(HOST_LDFLAGS)" > >>> > >>> define TI_K3_R5_LOADER_BUILD_CMDS > >> > > > > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From yann.morin.1998 at free.fr Wed Feb 21 20:08:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 21:08:23 +0100 Subject: [Buildroot] [git commit] package/sudo: drop legacy, useless, and broken post-configure hook Message-ID: <20240221201046.A9D0C87A2B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5aade5ced5edc40a4ad848cd276813d273d2d04e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit b9e89b340e27 (sudo: bump version) introduced the explicit build of mksigname and mksiglist as host tools, as they were required to run on the build machine, to generate C code then used to build the target program. This is now failing to build since the bump to sudo 1.9.15p5 in commit c87746afefe7 (package/sudo: security bump to version 1.9.15p5) (lines manually wrapped and slightly elided for ease of reviewing): /usr/bin/cpp \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -I../../include \ -I../.. \ ./sys_signame.h \ | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h In file included from /usr/include/features.h:394, from /usr/include/sys/types.h:25, from ./sys_signame.h:4: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ /usr/bin/gcc -I../../include -I../.. -I. -I. \ -D_PATH_SUDO_CONF=\"/etc/sudo.conf\" -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -DDEFAULT_TEXT_DOMAIN=\"sudo\" \ -O2 \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ ./mksigname.c -o mksigname In file included from /usr/include/features.h:394, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdlib.h:26, from ./mksigname.c:27: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ make[2]: *** [Makefile:263: mksigname] Error 1 The core of the issue has not been really identified, but it turns out that neither mksiglist nor mksignames is used during the build. This has been tested with a minimal sudo with no option, and with a sudo with all options enabled (linux-pam, zlib, opensldap, and openssl), with the three types of C libraries (glibc, musl, and uClibc-ng). Digging in the sudo buildsystem did not reveal an obvious reason when those would be needed either. Drop the hook now it seems it is no longer used and is atually breaking the build. Fixes: http://autobuild.buildroot.org/results/72f/72ff18fb9b41394a29006f881ee1fbea67a66a09/ Note that there is a second issue in there: the call to the host cpp fails, but since it is on the LHS of a pipe, the error is lost, as the RHS of the pipe (the sed call) succeeds; a fix for that will be sent in a separate patch. Reported-by: Christian Stewart Signed-off-by: Yann E. MORIN Cc: Peter Korsgaard Reviewed-by: Christian Stewart --- package/sudo/sudo.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index a4e838dd94..7961a99002 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -58,15 +58,6 @@ else SUDO_CONF_OPTS += --disable-openssl endif -# mksigname/mksiglist needs to run on build host to generate source files -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - $(MAKE) $(HOST_CONFIGURE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ - -C $(@D)/lib/util mksigname mksiglist -endef - -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - define SUDO_PERMISSIONS /usr/bin/sudo f 4755 0 0 - - - - - endef From dario.binacchi at amarulasolutions.com Wed Feb 21 20:11:04 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 21 Feb 2024 21:11:04 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240220223423.bnrqouwcuuxhw43f@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> <20240220223423.bnrqouwcuuxhw43f@dasso> Message-ID: Hi Andreas, On Tue, Feb 20, 2024 at 11:34?PM Andreas Dannenberg wrote: > > Hi Dario, > > On Sat, Feb 17, 2024 at 05:02:43PM +0100, Dario Binacchi wrote: > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Added in v4 > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index 2a10024aedaa..643298a1e70a 100644 > > --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > > endef > > I like how this picks/renames the tiboot3.bin corresponding to the > device security type, this way allowing to generate a tailored and > readily bootable image depending on GP, HS-FS, HS device type. > > However the find/copy approach may not always work as intended. Consider > the build output of R5 U-Boot SPL for AM64x for example: > > $ ll tiboot3-*.bin > -rw-rw-r-- 1 a0797059 a0797059 304431 Feb 20 15:34 tiboot3-am64x-gp-evm.bin > -rw-rw-r-- 1 a0797059 a0797059 532270 Feb 20 15:34 tiboot3-am64x_sr2-hs-evm.bin > -rw-rw-r-- 1 a0797059 a0797059 532270 Feb 20 15:34 tiboot3-am64x_sr2-hs-fs-evm.bin > > Note how there's a '_sr2' (Silicon Revision 2.0) in the filename of some > of the boot binaries. I did look at the different K3 devices supported > in U-Boot at the moment, and it looks like currently this will not be an > issue that will manifest itself as the device security type happens to > be unique enough to also pick the right silicon revision. But of course > this doesn't mean it'll always stay like this.... > > So it might be better to leverage BR2_TARGET_TI_K3_SOC to be more > specific in that find/copy operation and use this to replace the > asterisk in "tiboot3-*". So then somebody can use "am64x" or "am64x_sr2" > for example as BR2_TARGET_TI_K3_SOC, and you would guarantee the right > file gets used to populate the final tiboot3.bin. Thanks for the suggestion! I will add it to v5. Thanks and regards, Dario > > > -- > Andreas Dannenberg > Texas Instruments Inc > > > > > > > > > > $(eval $(kconfig-package)) > > -- > > 2.43.0 > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From yann.morin.1998 at free.fr Wed Feb 21 20:12:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 21:12:33 +0100 Subject: [Buildroot] [PATCH] package/sudo: drop legacy, useless, and broken post-configure hook In-Reply-To: <20240217172923.3629905-1-yann.morin.1998@free.fr> References: <20240217172923.3629905-1-yann.morin.1998@free.fr> Message-ID: All, On 2024-02-17 18:29 +0100, Yann E. MORIN spake thusly: > Commit b9e89b340e27 (sudo: bump version) introduced the explicit build > of mksigname and mksiglist as host tools, as they were required to run > on the build machine, to generate C code then used to build the target > program. > > This is now failing to build since the bump to sudo 1.9.15p5 in commit > c87746afefe7 (package/sudo: security bump to version 1.9.15p5) > (lines manually wrapped and slightly elided for ease of reviewing): > > /usr/bin/cpp \ > -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ > -I../../include \ > -I../.. \ > ./sys_signame.h \ > | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h > In file included from /usr/include/features.h:394, > from /usr/include/sys/types.h:25, > from ./sys_signame.h:4: > /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > | ^~~~~ > /usr/bin/gcc -I../../include -I../.. -I. -I. \ > -D_PATH_SUDO_CONF=\"/etc/sudo.conf\" > -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ > -DDEFAULT_TEXT_DOMAIN=\"sudo\" \ > -O2 \ > -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ > ./mksigname.c -o mksigname > In file included from /usr/include/features.h:394, > from /usr/include/bits/libc-header-start.h:33, > from /usr/include/stdlib.h:26, > from ./mksigname.c:27: > /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > | ^~~~~ > make[2]: *** [Makefile:263: mksigname] Error 1 > > The core of the issue has not been really identifie, but it turns out / Typo fixed when applying --------------------------' > that neither mksiglist nor mksignames is used during the build. This has > been tested with a minimal sudo with no option, and with a sudo with all > options enabled (linux-pam, zlib, opensldap, and openssl), with the > three types of C libraries (glibc, musl, and uClibc-ng). > > Digging in the sudo buildsystem did not reveal an obvious reason when > those would be needed either. > > Drop the hook now it seems it is no longer used and is atually breasking / Typo fixed when applying -------------------------------------------' > the build. > > Fixes: http://autobuild.buildroot.org/results/72f/72ff18fb9b41394a29006f881ee1fbea67a66a09/ > > Note that there is a second issue in there: the call to the host cpp > fails, but since it is on the LHS of a pipe, the error is lost, as the > RHS of the pipe (the sed call) succeeds; a fix for that will be send > in a separate patch. > > Reported-by: Christian Stewart > Signed-off-by: Yann E. MORIN > Cc: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/sudo/sudo.mk | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk > index a4e838dd94..7961a99002 100644 > --- a/package/sudo/sudo.mk > +++ b/package/sudo/sudo.mk > @@ -58,15 +58,6 @@ else > SUDO_CONF_OPTS += --disable-openssl > endif > > -# mksigname/mksiglist needs to run on build host to generate source files > -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > - $(MAKE) $(HOST_CONFIGURE_OPTS) \ > - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ > - -C $(@D)/lib/util mksigname mksiglist > -endef > - > -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > - > define SUDO_PERMISSIONS > /usr/bin/sudo f 4755 0 0 - - - - - > endef > -- > 2.43.0 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 20:15:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 21:15:39 +0100 Subject: [Buildroot] [git commit] package/zlib-ng: fix arm build Message-ID: <20240221201908.5D2E387A31@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=900bd80e9bfde5f1bb6c2dc746a9149a467f1f09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master zlib-ng usage uses CMAKE_C_COMPILER_TARGET which is non-standard and is not supposed to be used by the CMakeLists.txt machinery of a particular package. Indeed, [1] specifies that: Some compiler drivers are inherently cross-compilers, such as clang and QNX qcc. These compiler drivers support a command-line argument to specify the target to cross-compile for. buildroot is not using clang nor QNX qcc. [2] also refers to this variable only for clang [3] and QNX [4]. Therefore, zlib-ng's usage of this variable is a bit of a hack, and it's actually why it works when passed as an argument, because they are in fact not supposed to use this variable. So set CMAKE_C_COMPILER_TARGET to BR2_ARCH to fix the following arm build failure raised since bump to version 2.0.6 in commit d2249821d3f30202ca2a35ad24918378d9a0a0e8: -- Detecting C compile features - done -- Arch not recognized, falling back to cmake arch: 'l' -- Basearch 'l' not recognized, defaulting to 'x86'. -- Basearch of 'l' has been detected as: 'x86' [...] /home/buildroot/autobuild/instance-0/output-1/build/zlib-ng-2.1.3/arch/x86/x86_features.c:17:12: fatal error: cpuid.h: No such file or directory 17 | # include | ^~~~~~~~~ [1] https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_TARGET.html [2] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html [3] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-using-clang [4] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-qnx Fixes: d2249821d3f30202ca2a35ad24918378d9a0a0e8 - http://autobuild.buildroot.org/results/1551aa69be19239a8d8e081f033e4027d679ab8f - http://autobuild.buildroot.org/results/075d704c0f11710353bac43478e4501addcd747d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zlib-ng/zlib-ng.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index fbb906503a..33e8754c9d 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -13,6 +13,7 @@ ZLIB_NG_PROVIDES = zlib # Build with zlib compatible API, gzFile support and optimizations on ZLIB_NG_CONF_OPTS += \ + -DCMAKE_C_COMPILER_TARGET=$(BR2_ARCH) \ -DWITH_GZFILEOP=1 \ -DWITH_OPTIM=1 \ -DZLIB_COMPAT=1 \ From yann.morin.1998 at free.fr Wed Feb 21 20:19:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 21:19:19 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/zlib-ng: fix arm build In-Reply-To: <20240221181650.1115046-1-fontaine.fabrice@gmail.com> References: <20240221181650.1115046-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-21 19:16 +0100, Fabrice Fontaine spake thusly: > zlib-ng usage uses CMAKE_C_COMPILER_TARGET which is non-standard and > is not supposed to be used by the CMakeLists.txt machinery of a > particular package. > > Indeed, [1] specifies that: > > Some compiler drivers are inherently cross-compilers, such as clang > and QNX qcc. These compiler drivers support a command-line argument > to specify the target to cross-compile for. > > buildroot is not using clang nor QNX qcc. > [2] also refers to this variable only for clang [3] and QNX [4]. > > Therefore, zlib-ng's usage of this variable is a bit of a hack, and it's > actually why it works when passed as an argument, because they are in > fact not supposed to use this variable. > > So set CMAKE_C_COMPILER_TARGET to BR2_ARCH to fix the following arm > build failure raised since bump to version 2.0.6 in commit > d2249821d3f30202ca2a35ad24918378d9a0a0e8: > > -- Detecting C compile features - done > -- Arch not recognized, falling back to cmake arch: 'l' > -- Basearch 'l' not recognized, defaulting to 'x86'. > -- Basearch of 'l' has been detected as: 'x86' > > [...] > > /home/buildroot/autobuild/instance-0/output-1/build/zlib-ng-2.1.3/arch/x86/x86_features.c:17:12: fatal error: cpuid.h: No such file or directory > 17 | # include > | ^~~~~~~~~ > > [1] https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_TARGET.html > [2] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html > [3] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-using-clang > [4] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-qnx > > Fixes: d2249821d3f30202ca2a35ad24918378d9a0a0e8 > - http://autobuild.buildroot.org/results/1551aa69be19239a8d8e081f033e4027d679ab8f > - http://autobuild.buildroot.org/results/075d704c0f11710353bac43478e4501addcd747d > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2 (after review of Thomas Petazzoni and Peter Korsgaard): > - Update commit message > > package/zlib-ng/zlib-ng.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk > index fbb906503a..33e8754c9d 100644 > --- a/package/zlib-ng/zlib-ng.mk > +++ b/package/zlib-ng/zlib-ng.mk > @@ -13,6 +13,7 @@ ZLIB_NG_PROVIDES = zlib > > # Build with zlib compatible API, gzFile support and optimizations on > ZLIB_NG_CONF_OPTS += \ > + -DCMAKE_C_COMPILER_TARGET=$(BR2_ARCH) \ > -DWITH_GZFILEOP=1 \ > -DWITH_OPTIM=1 \ > -DZLIB_COMPAT=1 \ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From kilian.zinnecker at mail.de Wed Feb 21 20:27:33 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Wed, 21 Feb 2024 21:27:33 +0100 Subject: [Buildroot] [PATCH] configs/lepotato_defconfig: new defconfig In-Reply-To: <20240220225025.781466-2-romain.naour@smile.fr> References: <20240220225025.781466-1-romain.naour@smile.fr> <20240220225025.781466-2-romain.naour@smile.fr> Message-ID: <5755205.DvuYhMxLoT@laptop> Hi Romain, Am Dienstag, 20. Februar 2024, 23:50:25 CET schrieb Romain Naour: > Add basic support for the Libre Computer "Le Potato" SBC. > > https://libre.computer/products/aml-s905x-cc > > Signed-off-by: Romain Naour Tested-by: Kilian Zinnecker Build test only (as I don't have the board), with ./utils/docker-run Best regards, Kilian From bernd at kuhls.net Wed Feb 21 20:31:53 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Wed, 21 Feb 2024 21:31:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.19.5 Message-ID: <20240221203153.3428611-1-bernd@kuhls.net> Release notes: https://www.samba.org/samba/history/samba-4.19.5.html Signed-off-by: Bernd Kuhls --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 3353221959..4e74e07bd0 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc -sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.5.tar.asc +sha256 0e2405b4cec29d0459621f4340a1a74af771ec7cffedff43250cad7f1f87605e samba-4.19.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 78c5db308d..0980d03175 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.4 +SAMBA4_VERSION = 4.19.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES -- 2.39.2 From giulio.benetti at benettiengineering.com Wed Feb 21 20:43:24 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 21:43:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/swupdate: bump to version 2023.12.1 In-Reply-To: <20240221182304.647302-1-james.hilliard1@gmail.com> References: <20240221182304.647302-1-james.hilliard1@gmail.com> Message-ID: Hi James, On 21/02/24 19:23, James Hilliard wrote: > Signed-off-by: James Hilliard thank you, Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > --- > package/swupdate/swupdate.hash | 2 +- > package/swupdate/swupdate.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash > index c19a82304f..19ef3a2724 100644 > --- a/package/swupdate/swupdate.hash > +++ b/package/swupdate/swupdate.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 ce24032300e2b6a6faa3d22e49f981fd90f04ac6f5d7e802166824b0cd5ca669 swupdate-2023.12.tar.gz > +sha256 89ec8926d66627255fe689ed96ad8d30f5c539315956dacf9890e308095dee3b swupdate-2023.12.1.tar.gz > sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt > sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt > sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt > diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk > index ca8c140886..3b78c160f8 100644 > --- a/package/swupdate/swupdate.mk > +++ b/package/swupdate/swupdate.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SWUPDATE_VERSION = 2023.12 > +SWUPDATE_VERSION = 2023.12.1 > SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) > SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 > SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:02 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:02 +0100 Subject: [Buildroot] [PATCH v2 6/9] package/libgeos: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-7-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov --- package/libgeos/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 2a27c6f2a4..76cbb9bdcd 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the JTS Topology Suite (JTS). It aims to contain the complete @@ -14,8 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads not binutils bug 27597" +comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:01 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:01 +0100 Subject: [Buildroot] [PATCH v2 5/9] package/libcamera: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-6-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/libcamera/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index ccb5281b4b..e84b8d342e 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS default y # Invalid packing size of ControlValue struct on m68k depends on !BR2_m68k - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 menuconfig BR2_PACKAGE_LIBCAMERA bool "libcamera" -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:00 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:00 +0100 Subject: [Buildroot] [PATCH v2 4/9] package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-5-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/kf5/kf5-kcoreaddons/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/kf5/kf5-kcoreaddons/Config.in b/package/kf5/kf5-kcoreaddons/Config.in index 02bd38e395..88fda03ee0 100644 --- a/package/kf5/kf5-kcoreaddons/Config.in +++ b/package/kf5/kf5-kcoreaddons/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KF5_KCOREADDONS bool "kf5-kcoreaddons" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES select BR2_PACKAGE_QT5TOOLS select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:03 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:03 +0100 Subject: [Buildroot] [PATCH v2 7/9] package/pistache: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-8-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/pistache/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 3acf1f53f0..ca2d2833cd 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PISTACHE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_RAPIDJSON help Pistache is a modern and elegant HTTP and REST framework @@ -13,9 +12,8 @@ config BR2_PACKAGE_PISTACHE https://github.com/oktal/pistache -comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" +comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_USE_WCHAR -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:39:57 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:39:57 +0100 Subject: [Buildroot] [PATCH v2 1/9] toolchain/toolchain-external: drop external codesourcery niosII toolchain In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-2-giulio.benetti@benettiengineering.com> This toolchain is pretty old and unlikely used. It's also affected by binutils bug 27597, so let's remove it. Signed-off-by: Giulio Benetti --- toolchain/toolchain-external/Config.in | 6 ------ .../toolchain-external/pkg-toolchain-external.mk | 2 +- .../Config.in | 16 ---------------- .../Config.in.options | 9 --------- .../toolchain-external-codesourcery-niosII.hash | 6 ------ .../toolchain-external-codesourcery-niosII.mk | 13 ------------- 6 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index c1c159cb8e..cb678b7886 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -33,9 +33,6 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in" source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in" -# NIOSII -source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in" - # Bootlin toolchains, available for virtually all architectures source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in" @@ -137,9 +134,6 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options" -# NIOSII -source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options" - # Bootlin toolchains source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options" diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index ddf1d70ab4..aa5365b5bd 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -13,7 +13,7 @@ # * Toolchains provided by Linaro for the ARM and AArch64 # architectures # * Sourcery CodeBench toolchains (from Mentor Graphics) for the ARM, -# MIPS, PowerPC, x86_64 and NIOS 2 architectures. For the MIPS +# MIPS, PowerPC, and x86_64 architectures. For the MIPS # toolchain, the -muclibc variant isn't supported yet, only the # default glibc-based variant is. # * Synopsys DesignWare toolchains for ARC cores diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in deleted file mode 100644 index cf3ce69a68..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - bool "Sourcery CodeBench Nios-II 2018.05" - depends on BR2_nios2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_7 - help - Sourcery CodeBench toolchain for the Nios-II architecture, - from Mentor Graphics. It uses gcc 7.3, binutils 2.28, - glibc 2.27, gdb 8.0.1 and kernel headers 4.15.5. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options deleted file mode 100644 index 07cc5ede94..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "nios2-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-niosII" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash deleted file mode 100644 index 47893ab7e2..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From https://sourcery.mentor.com/GNUToolchain/release3374 -md5 4f536b3b9b4e00f483e82e304c0a27ae sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -md5 be42ab83da2e8db7b73dc890c2549570 sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 -# Locally calculated -sha256 c19afb432b5b23f8d5d639831d3a423a3ea3c9cc62e0015020d20ea2eb36dd1b sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 d73a6364106dd62352711f932d3be8e97fdaaa548995678b5d38d9f21e22437a sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk deleted file mode 100644 index cb0fe760ff..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-niosII -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2018.05-5 - -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SOURCE = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_ACTUAL_SOURCE_TARBALL = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package)) -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:39:59 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:39:59 +0100 Subject: [Buildroot] [PATCH v2 3/9] package/gdal: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-4-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov --- package/gdal/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/gdal/Config.in b/package/gdal/Config.in index 24a1f06af2..839a1bd7ea 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GDAL # configure can't find proj, when linking statically depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 depends on BR2_TOOLCHAIN_HAS_THREADS # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_GIFLIB @@ -26,9 +25,8 @@ config BR2_PACKAGE_GDAL https://gdal.org/ -comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar" +comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:04 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:04 +0100 Subject: [Buildroot] [PATCH v2 8/9] package/postgis: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-9-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov --- package/postgis/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 7d42390677..78569d63be 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_POSTGIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS select BR2_PACKAGE_PROJ select BR2_PACKAGE_LIBXML2 @@ -18,7 +17,6 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9, not binutils bug 27597" +comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:39:56 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:39:56 +0100 Subject: [Buildroot] [PATCH v2 0/9] Patch and remove Nios2 binutils bug 27597 In-Reply-To: <20240218230524.639348e6@windsurf> References: <20240218230524.639348e6@windsurf> Message-ID: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> This patchset: * add backported patches for Buildroot Nios2 binutils bug 27597 * remove Codesourcery Nios2 external toolchain that is affected from bug above (I've tried to update to latest 2023.09-5 just for testing and yes, it's still affected by that bug, maybe once they will release toolchain based on latest binutils 2.42 that has patch applied to fix bug 27597 we can add it back) * HERE we need Bootlin Nios2 Toolchain to be patched, rebuilt and updated. I've opened a PR with binutils patches for bug 27597: https://github.com/bootlin/buildroot-toolchains/pull/2 * drop all bug 27597 bug depencies * drop the bug 27597 itself Best regards Giulio Giulio Benetti (9): toolchain/toolchain-external: drop external codesourcery niosII toolchain package/binutils: add local patches to fix Nios2 bug 27597 package/gdal: drop nios2 binutils bug 27597 dependency package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency package/libcamera: drop nios2 binutils bug 27597 dependency package/libgeos: drop nios2 binutils bug 27597 dependency package/pistache: drop nios2 binutils bug 27597 dependency package/postgis: drop nios2 binutils bug 27597 dependency toolchain: remove binutils bug 27597 ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ package/gdal/Config.in | 4 +- package/kf5/kf5-kcoreaddons/Config.in | 1 - package/libcamera/Config.in | 1 - package/libgeos/Config.in | 6 +- package/pistache/Config.in | 6 +- package/postgis/Config.in | 6 +- toolchain/Config.in | 6 - toolchain/toolchain-external/Config.in | 6 - .../pkg-toolchain-external.mk | 2 +- .../Config.in | 16 --- .../Config.in.options | 9 -- ...oolchain-external-codesourcery-niosII.hash | 6 - .../toolchain-external-codesourcery-niosII.mk | 13 -- 16 files changed, 383 insertions(+), 74 deletions(-) create mode 100644 package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:05 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:05 +0100 Subject: [Buildroot] [PATCH v2 9/9] toolchain: remove binutils bug 27597 In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-10-giulio.benetti@benettiengineering.com> Binutils bug 27597 is not present anymore in Buildroot so let's remove it. Signed-off-by: Giulio Benetti --- toolchain/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 407a03c42e..9e6cff1950 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=27597 -# Affect toolchains built with binutils 2.36.1, still not fixed. -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 - bool - default y if BR2_nios2 - # https://sourceware.org/bugzilla/show_bug.cgi?id=30730 # Affect toolchains built with binutils 2.40, still not fixed. config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:39:58 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:39:58 +0100 Subject: [Buildroot] [PATCH v2 2/9] package/binutils: add local patches to fix Nios2 bug 27597 In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-3-giulio.benetti@benettiengineering.com> These backported patches fix Nios2 linker bug 27597 that affects packages gdal, kf5-kcoreaddons, libgeos, libcamera, pistache. Signed-off-by: Giulio Benetti --- ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ 3 files changed, 375 insertions(+) create mode 100644 package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch diff --git a/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + diff --git a/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + diff --git a/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 21 22:03:43 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 21 Feb 2024 23:03:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: security bump to version 20.11.1 Message-ID: <20240221220343.1228278-1-fontaine.fabrice@gmail.com> - Fix CVE-2024-21892, CVE-2024-22019, CVE-2024-21896, CVE-2024-22017, CVE-2023-46809, CVE-2024-21891, CVE-2024-21890 and CVE-2024-22025 - LICENSE hash changed due to two things: * c-ares vendored dependency license got updated [1]. This is unused by buildroot though anyway * base64 vendored library license updated copyright years and sorted contributor names [2], [3] - This bump will fix the following build failure raised since bump of python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14 thanks to https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6 https://github.com/nodejs/node/commit/6557c1c9b1206a85bb7d8e7450e8c3a4cff7c84b: Traceback (most recent call last): File "/home/autobuild/autobuild/instance-2/output-1/build/host-nodejs-src-20.9.0/configure.py", line 17, in from distutils.version import StrictVersion ModuleNotFoundError: No module named 'distutils' https://github.com/nodejs/node/blob/v20.11.1/CHANGELOG.md [1] https://github.com/c-ares/c-ares/pull/556 [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 - http://autobuild.buildroot.org/results/8b38bc4b7879a0349c1305e2fcb458a0cfd04a93 Signed-off-by: Fabrice Fontaine --- package/nodejs/nodejs.hash | 14 +++++++------- package/nodejs/nodejs.mk | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2d60437a7c..ddab345e0a 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.9.0/SHASUMS256.txt.asc -sha256 ced3ecece4b7c3a664bca3d9e34a0e3b9a31078525283a6fdb7ea2de8ca5683b node-v20.9.0-linux-arm64.tar.xz -sha256 64099d7e62bdbb8efd52c216a6759b3cdd77c38aa993096fdee9f875d95b2d8e node-v20.9.0-linux-armv7l.tar.xz -sha256 3c6cea5d614cfbb95d92de43fbc2f8ecd66e431502fe5efc4f3c02637897bd45 node-v20.9.0-linux-ppc64le.tar.xz -sha256 9033989810bf86220ae46b1381bdcdc6c83a0294869ba2ad39e1061f1e69217a node-v20.9.0-linux-x64.tar.xz -sha256 a23d96810abf0455426b349d47ce5310f33095b7bc0571b9cc510f481c3a4519 node-v20.9.0.tar.xz +# From https://nodejs.org/dist/v20.11.1/SHASUMS256.txt.asc +sha256 c957f29eb4e341903520caf362534f0acd1db7be79c502ae8e283994eed07fe1 node-v20.11.1-linux-arm64.tar.xz +sha256 28e0120d2d150a8f41717899d33167b8b32053778665583d49ff971bfd188d1b node-v20.11.1-linux-armv7l.tar.xz +sha256 51343cacf5cdf5c4b5e93e919d19dd373d6ef43d5f2c666eae299f26e31d08b5 node-v20.11.1-linux-ppc64le.tar.xz +sha256 d8dab549b09672b03356aa2257699f3de3b58c96e74eb26a8b495fbdc9cf6fbe node-v20.11.1-linux-x64.tar.xz +sha256 77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e node-v20.11.1.tar.xz # Locally calculated -sha256 93ac846282ce6c5255e00fada2fd2e7e292255239fe58d5502b0a554859e6a3e LICENSE +sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9806a64d38..858c6a86f5 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.9.0 +NODEJS_COMMON_VERSION = 20.11.1 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) -- 2.43.0 From fontaine.fabrice at gmail.com Wed Feb 21 22:46:17 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 21 Feb 2024 23:46:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/libxmlpp: bump to version 5.2.0 Message-ID: <20240221224617.1672544-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/libxmlplusplus/libxmlplusplus/blob/5.2.0/NEWS Signed-off-by: Fabrice Fontaine --- ...e-it-compatible-with-libxml2--2-12-0.patch | 145 ------------------ package/libxmlpp/libxmlpp.hash | 4 +- package/libxmlpp/libxmlpp.mk | 4 +- 3 files changed, 4 insertions(+), 149 deletions(-) delete mode 100644 package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch diff --git a/package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch b/package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch deleted file mode 100644 index b9100b4966..0000000000 --- a/package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 49471812d57adfb22dcce3cbea1a8956658731b9 Mon Sep 17 00:00:00 2001 -From: Kjell Ahlstedt -Date: Sat, 18 Nov 2023 18:34:07 +0100 -Subject: [PATCH] Make it compatible with libxml2 >= 2.12.0 - -* libxml++/document.cc: -* libxml++/dtd.cc: -* libxml++/nodes/entitydeclaration.cc: -* libxml++/nodes/entityreference.cc: -* libxml++/validators/relaxngvalidator.cc: Modify #include directives. -* libxml++/keepblanks.cc: Ignore deprecation of xmlKeepBlanksDefault(). -* tests/saxparser_chunk_parsing_inconsistent_state/main.cc: -Accept that MySaxParser::on_start_document() can be called before -MySaxParser::on_error(). - -Upstream: https://github.com/libxmlplusplus/libxmlplusplus/commit/49471812d57adfb22dcce3cbea1a8956658731b9 -Signed-off-by: Fabrice Fontaine ---- - libxml++/document.cc | 1 + - libxml++/dtd.cc | 2 +- - libxml++/keepblanks.cc | 5 ++++- - libxml++/nodes/entitydeclaration.cc | 2 +- - libxml++/nodes/entityreference.cc | 2 +- - libxml++/validators/relaxngvalidator.cc | 1 + - .../saxparser_chunk_parsing_inconsistent_state/main.cc | 10 +++++++++- - 7 files changed, 18 insertions(+), 5 deletions(-) - -diff --git a/libxml++/document.cc b/libxml++/document.cc -index da0a8f5..d5476c6 100644 ---- a/libxml++/document.cc -+++ b/libxml++/document.cc -@@ -16,6 +16,7 @@ - - #include - #include -+#include - #include // XML_PARSE_NOXINCNODE, XML_PARSE_NOBASEFIX - - #include -diff --git a/libxml++/dtd.cc b/libxml++/dtd.cc -index 238b3a0..8014c07 100644 ---- a/libxml++/dtd.cc -+++ b/libxml++/dtd.cc -@@ -8,7 +8,7 @@ - #include - #include - --#include -+#include - - #include - -diff --git a/libxml++/keepblanks.cc b/libxml++/keepblanks.cc -index 4228b8d..56b00cf 100644 ---- a/libxml++/keepblanks.cc -+++ b/libxml++/keepblanks.cc -@@ -5,8 +5,11 @@ - * included with libxml++ as the file COPYING. - */ - --#include -+// xmlKeepBlanksDefault() is deprecated since libxml2 2.12.0. -+// Ignore deprecations here. -+#define XML_DEPRECATED - -+#include - #include - - namespace xmlpp -diff --git a/libxml++/nodes/entitydeclaration.cc b/libxml++/nodes/entitydeclaration.cc -index 0a6390e..d5bfa75 100644 ---- a/libxml++/nodes/entitydeclaration.cc -+++ b/libxml++/nodes/entitydeclaration.cc -@@ -5,7 +5,7 @@ - */ - - #include --#include -+#include - - namespace xmlpp - { -diff --git a/libxml++/nodes/entityreference.cc b/libxml++/nodes/entityreference.cc -index 19b1b22..278a126 100644 ---- a/libxml++/nodes/entityreference.cc -+++ b/libxml++/nodes/entityreference.cc -@@ -6,7 +6,7 @@ - - #include - --#include -+#include - - namespace xmlpp - { -diff --git a/libxml++/validators/relaxngvalidator.cc b/libxml++/validators/relaxngvalidator.cc -index 9bb10c2..68a814c 100644 ---- a/libxml++/validators/relaxngvalidator.cc -+++ b/libxml++/validators/relaxngvalidator.cc -@@ -22,6 +22,7 @@ - #include "libxml++/parsers/domparser.h" - #include "libxml++/relaxngschema.h" - -+#include - #include - - namespace xmlpp -diff --git a/tests/saxparser_chunk_parsing_inconsistent_state/main.cc b/tests/saxparser_chunk_parsing_inconsistent_state/main.cc -index 07cc3ef..53f55b3 100644 ---- a/tests/saxparser_chunk_parsing_inconsistent_state/main.cc -+++ b/tests/saxparser_chunk_parsing_inconsistent_state/main.cc -@@ -24,10 +24,14 @@ - - class MySaxParser : public xmlpp::SaxParser - { -+public: -+ bool throw_on_start_doc = true; -+ - protected: - void on_start_document() override - { -- throw std::runtime_error("some custom runtime exception"); -+ if (throw_on_start_doc) -+ throw std::runtime_error("some custom runtime exception"); - } - void on_error(const xmlpp::ustring& /* text */) override - { -@@ -43,6 +47,9 @@ int main() - bool exceptionThrown = false; - try - { -+ // Depending on the libxml2 version, MySaxParser::on_start_document() -+ // may or may not be called before MySaxParser::on_error(). -+ parser.throw_on_start_doc = false; - parser.parse_chunk(""); - parser.parse_stream(ss); - } diff --git a/package/libxmlpp/libxmlpp.hash b/package/libxmlpp/libxmlpp.hash index 1c1342a105..84084b1e35 100644 --- a/package/libxmlpp/libxmlpp.hash +++ b/package/libxmlpp/libxmlpp.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libxml++/5.0/libxml++-5.0.2.sha256sum -sha256 7c17cc3e5a2214314dee5a1354f4b436f266ded6185232a0534f352a76240d5a libxml++-5.0.2.tar.xz +# From https://download.gnome.org/sources/libxml++/5.2/libxml++-5.2.0.sha256sum +sha256 e41b8eae55210511585ae638615f00db7f982c0edea94699865f582daf03b44f libxml++-5.2.0.tar.xz # Hash for license file sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/libxmlpp/libxmlpp.mk b/package/libxmlpp/libxmlpp.mk index dacd5c1eae..e8fbb75b61 100644 --- a/package/libxmlpp/libxmlpp.mk +++ b/package/libxmlpp/libxmlpp.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBXMLPP_VERSION_MAJOR = 5.0 -LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).2 +LIBXMLPP_VERSION_MAJOR = 5.2 +LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).0 LIBXMLPP_LICENSE = LGPL-2.1 (library), LGPL-2.0+ (examples) LIBXMLPP_LICENSE_FILES = COPYING LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz -- 2.43.0 From fontaine.fabrice at gmail.com Wed Feb 21 23:01:17 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 22 Feb 2024 00:01:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/udpxy: bump to version 1.0-25.1 Message-ID: <20240221230117.1688400-1-fontaine.fabrice@gmail.com> - Switch site to get latest release - Set ALL_CFLAGS to drop -Werror - Update hash of README (changes not related to license) Signed-off-by: Fabrice Fontaine --- package/udpxy/Config.in | 2 +- package/udpxy/udpxy.hash | 4 ++-- package/udpxy/udpxy.mk | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/udpxy/Config.in b/package/udpxy/Config.in index f442a2f2fe..84a754bed4 100644 --- a/package/udpxy/Config.in +++ b/package/udpxy/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_UDPXY forwards UDP traffic from a given multicast subscription to the requesting HTTP client. - http://www.udpxy.com/ + https://github.com/pcherenkov/udpxy/ diff --git a/package/udpxy/udpxy.hash b/package/udpxy/udpxy.hash index 8455fcdb1a..e0dbd06a35 100644 --- a/package/udpxy/udpxy.hash +++ b/package/udpxy/udpxy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6ce33b1d14a1aeab4bd2566aca112e41943df4d002a7678d9a715108e6b714bd udpxy.1.0.23-9-prod.tar.gz -sha256 60ead3913246c7cd930fe653c0053aba1af2cd9f82b266befdbbd6e0b8ecb750 README +sha256 a1a16e60895c6b2fd151321db47f5d5373843116f1b98ed9749e6c25a6c44497 udpxy-1.0-25.1.tar.gz +sha256 aac36b21c5afa931fd0e5d796814e29102a3b1f2742fb8694a26ef135aebf943 README diff --git a/package/udpxy/udpxy.mk b/package/udpxy/udpxy.mk index 22467948a5..787f6e58ed 100644 --- a/package/udpxy/udpxy.mk +++ b/package/udpxy/udpxy.mk @@ -4,19 +4,19 @@ # ################################################################################ -UDPXY_VERSION = 1.0.23-9-prod -UDPXY_SOURCE = udpxy.$(UDPXY_VERSION).tar.gz -UDPXY_SITE = http://www.udpxy.com/download/1_23 +UDPXY_VERSION = 1.0-25.1 +UDPXY_SITE = $(call github,pcherenkov,udpxy,$(UDPXY_VERSION)) UDPXY_LICENSE = GPL-3.0+ UDPXY_LICENSE_FILES = README define UDPXY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + ALL_CFLAGS="$(TARGET_CFLAGS)" -C $(@D)/chipmunk endef define UDPXY_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr \ - -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/chipmunk DESTDIR=$(TARGET_DIR) \ + PREFIX=/usr -C $(@D)/chipmunk install endef $(eval $(generic-package)) -- 2.43.0 From david.picard at clermont.in2p3.fr Thu Feb 22 10:09:12 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Thu, 22 Feb 2024 11:09:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: <8a008e9a-410f-406a-8e8c-0ce1724c1643@smile.fr> References: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> <8a008e9a-410f-406a-8e8c-0ce1724c1643@smile.fr> Message-ID: <29a0ee9e-f370-4bbd-9901-72c0206bcc4d@clermont.in2p3.fr> OK, thanks. So I guess my patch can just be discarded. Can I do it my self on Patchwork ? If so, to what status should it be changed ? Le 21/02/2024 ? 16:33, Romain Naour a ?crit?: > Hello David, > > Le 21/02/2024 ? 13:25, David Picard a ?crit?: >> Or should I add LIBFOO_EXTRA_DOWNLOADS to my application package ? > See an example how to use _EXTRA_DOWNLOADS: > > https://gitlab.com/buildroot.org/buildroot/-/blob/master/package/tesseract-ocr/tesseract-ocr.mk?ref_type=heads#L58 > > Best regards, > Romain > > >> Le 21/02/2024 ? 09:36, David Picard a ?crit?: >>> So, should I submit a package, using the LIBFOO_EXTRA_DOWNLOADS feature ? What >>> value would you recommend for LIBFOO_DL_DIR ? >>> >>> David >>> >>> Le 21/02/2024 ? 07:28, Yann E. MORIN a ?crit?: >>>>>> I did it on purpose. This package is called a library, but it really is a bunch >>>>>> of C files. You only use a subset, depending on your hardware. This code was >>>>>> made to be compiled in the application, not as a conventional library. >>>>>> I could copy the files to STAGING, but cleaning would be more complicated and it >>>>>> would waste some disk space. >>>>> Ok, maybe is should not be packaged in Buildroot then. >>>>> When a package is build by Buildroot, it can generate a binary, a library or >>>>> provide some header files. >>>>> If your application doesn't bundle intel-socfpga-hwlib sources but it requires >>>>> it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra >>>>> download step. >>>> I agree with Romain. It does not make miuch sense IMHO to just drop >>>> source files like that. And the _EXTRA_DOWNLOADS mechanism is exactly >>>> tailored to such cases. >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:01 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:01 +0100 Subject: [Buildroot] [PATCH v5 00/16] Add support for AM62x-SK HS-FS devices Message-ID: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> The SK-AM62B-P1 is the newest version of SK-AM62 which includes high-security field-securable (HS-FS) silicon to optionally customize keys and encryption for security applications. This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, which, however, was buggy. This series fixes the errors and bumps the Linux kernel and U-Boot required for such a new device. Changes in v5: - Drop patches: - [v4,06/20] boot/ti-k3-core-secdev: new package - [v4,07/20] boot/ti-k3-image-gen: manage HS hardware - Reorder the patches - [08/20] package/python-jsonschema: add host variant - [09/20] package/python-attrs: add host variant - [10/20] package/python-referencing: add host variant - [11/20] package/python-rpds-py: add host variant - [12/20] package/python-jsonschema-specifications: add host variant according to the sequence used by Romain Naour in the series "Add ti_j721e_sk_defconfig" - The other changes are found in the changelog of each individual patch. Dario Binacchi (16): configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version boot/ti-k3-r5-loader: bump to version 2024.01 package/python-attrs: add host variant package/python-rpds-py: add host variant package/python-referencing: add host variant package/python-jsonschema-specifications: add host variant package/python-jsonschema: add host variant boot/ti-k3-r5-loader: set binman environment boot/uboot: set BINMAN_INDIRS for TI K3 DM package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 board/ti/am62x-sk/genimage.cfg | 7 ++- board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++ boot/ti-k3-image-gen/Config.in | 61 ++----------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/ti-k3-r5-loader/Config.in | 5 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 12 +++- boot/uboot/Config.in | 7 +-- boot/uboot/uboot.mk | 2 +- configs/ti_am62x_sk_defconfig | 22 ++++--- configs/ti_am64x_sk_defconfig | 7 ++- package/Config.in | 1 + package/python-attrs/python-attrs.mk | 6 ++ .../python-jsonschema-specifications.mk | 5 ++ .../python-jsonschema/python-jsonschema.mk | 14 +++++ .../python-referencing/python-referencing.mk | 11 ++++ package/python-rpds-py/python-rpds-py.mk | 1 + package/ti-k3/Config.in | 54 ++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 20 files changed, 202 insertions(+), 80 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:02 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:02 +0100 Subject: [Buildroot] [PATCH v5 01/16] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-2-dario.binacchi@amarulasolutions.com> Checking the output of the command `git grep PLATFORM | grep k3`, we can found the proper settings for the optee-os package: .github/workflows/ci.yml: _make PLATFORM=k3-am62x .github/workflows/ci.yml: _make PLATFORM=k3-am62x CFG_ARM64_core=y ... core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5 - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c68..c3ad555a8184 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:03 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:03 +0100 Subject: [Buildroot] [PATCH v5 02/16] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-3-dario.binacchi@amarulasolutions.com> Checking the output of the command `git grep PLATFORM | grep k3`, we can found the proper settings for the optee-os package: .github/workflows/ci.yml: _make PLATFORM=k3-am64x .github/workflows/ci.yml: _make PLATFORM=k3-am64x CFG_ARM64_core=y ... core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5 - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8d3..097175bd8f39 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:04 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:04 +0100 Subject: [Buildroot] [PATCH v5 03/16] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-4-dario.binacchi@amarulasolutions.com> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a8184..a129e216d25b 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:05 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:05 +0100 Subject: [Buildroot] [PATCH v5 04/16] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-5-dario.binacchi@amarulasolutions.com> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f39..26195194c7d6 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:06 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:06 +0100 Subject: [Buildroot] [PATCH v5 05/16] boot/ti-k3-r5-loader: bump to version 2024.01 In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-6-dario.binacchi@amarulasolutions.com> All in-tree configs with the ti-k3-r5 bootloader use a custom version, so this patch is mostly for the menuconfig default version Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5a8..5f86c045c99f 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -16,7 +16,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2022.10" + bool "2024.01" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -60,7 +60,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index c5d1cb8e09f0..fbe5d215409d 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:07 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:07 +0100 Subject: [Buildroot] [PATCH v5 06/16] package/python-attrs: add host variant In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-7-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc4402..fb1729e62fa2 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:08 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:08 +0100 Subject: [Buildroot] [PATCH v5 07/16] package/python-rpds-py: add host variant In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-8-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4fde..cee2ff290a4e 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:09 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:09 +0100 Subject: [Buildroot] [PATCH v5 08/16] package/python-referencing: add host variant In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-9-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-referencing/python-referencing.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e913a..66d59ed8091a 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_REFERENCING_DEPENDENCIES += \ + host-python-attrs \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:10 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:10 +0100 Subject: [Buildroot] [PATCH v5 09/16] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-10-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-jsonschema-specifications.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9d4..b6e309ab2bc9 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,9 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:11 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:11 +0100 Subject: [Buildroot] [PATCH v5 10/16] package/python-jsonschema: add host variant In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-11-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa7752..9e8b6e18b876 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \ + host-python-attrs \ + host-python-jsonschema-specifications \ + host-python-referencing \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:12 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:12 +0100 Subject: [Buildroot] [PATCH v5 11/16] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-12-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. The patch set the BINMAN_INDIRS environment variable to provide the directory to search for binary blobs and select the packages required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - Drop runtime dependecies - Add host-python-pylibfdt dependency without requiring BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration - Add host-python3 and host-python-setuptools dependencies - Add SOB and COB tags of Romain Naour Changes in v4: - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Changes in v2: - Change commit message - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Select packages required by binman if BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled boot/ti-k3-r5-loader/Config.in | 1 + boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f86c045c99f..fc71337e80cc 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema help Separate U-Boot SPL build for R5 core on TI's K3 processors. Usually used to build tiboot3.bin with k3-image-gen. diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f2e..fdb058f3b72a 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python-jsonschema \ + host-python-pyyaml \ + host-python3 \ + host-python-setuptools \ + host-python-pylibfdt TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -58,6 +63,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + BINMAN_INDIRS=$(BINARIES_DIR) \ HOSTLDFLAGS="$(HOST_LDFLAGS)" define TI_K3_R5_LOADER_BUILD_CMDS -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:14 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:14 +0100 Subject: [Buildroot] [PATCH v5 13/16] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-14-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot can use Binman to compile and sign the generated binaries, thus making the use of custom tools like ti-k3-image-gen no longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were configured and used outside of it. This patch allows setting such options even if the package is not enabled. The patch makes an exception to the Buildroot rule "no subdirectory in package directory". Signed-off-by: Dario Binacchi --- Changes in v5: - Add SOB tag - Move the new ti-k3 from boot to package Added in v4 boot/ti-k3-image-gen/Config.in | 61 ++----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/uboot/Config.in | 7 ++- configs/ti_am62x_sk_defconfig | 3 +- configs/ti_am64x_sk_defconfig | 3 +- package/Config.in | 1 + package/ti-k3/Config.in | 54 ++++++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 8 files changed, 75 insertions(+), 65 deletions(-) create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e911..a57319f4be6d 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk index 64be9a18f2c4..aca29bcf1bd4 100644 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ $(BR2_MAKE_HOST_DEPENDENCY) TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930db..c7ebe2652001 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" # We use the SoC selection defined for the ti-k3-image-gen # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a129e216d25b..2835404a57df 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM62X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 26195194c7d6..566cbbe4824f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM64X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/package/Config.in b/package/Config.in index bf0fe078b955..6d3ed34e121b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -629,6 +629,7 @@ endmenu source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" + source "package/ti-k3/Config.in" source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" source "package/ti-sgx-um/Config.in" diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in new file mode 100644 index 000000000000..01d88c8e1643 --- /dev/null +++ b/package/ti-k3/Config.in @@ -0,0 +1,54 @@ +config BR2_PACKAGE_TI_K3 + bool "TI K3" + help + The TI K3 SOC specific selections. + +if BR2_PACKAGE_TI_K3 + +choice + prompt "SoC family" + +config BR2_PACKAGE_TI_K3_SOC_AM62AX + bool "am62ax" + +config BR2_PACKAGE_TI_K3_SOC_AM62X + bool "am62x" + +config BR2_PACKAGE_TI_K3_SOC_AM64X + bool "am64x" + +config BR2_PACKAGE_TI_K3_SOC_AM65X + bool "am65x" + +endchoice + +choice + prompt "Security type" + help + The target SoC security type option. + +config BR2_PACKAGE_TI_K3_SECTYPE_GP + bool "gp" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + bool "hs-fs" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS + bool "hs" + +endchoice + +config BR2_PACKAGE_TI_K3_SOC + string + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X + +config BR2_PACKAGE_TI_K3_SECTYPE + string + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS + +endif diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk new file mode 100644 index 000000000000..a2da29f5148c --- /dev/null +++ b/package/ti-k3/ti-k3.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# ti-k3 +# +################################################################################ + +include $(sort $(wildcard package/ti-k3/*/*.mk)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:13 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:13 +0100 Subject: [Buildroot] [PATCH v5 12/16] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-13-dario.binacchi@amarulasolutions.com> As explained in [1], adding support for AM62x LP SK in U-Boot, requires binman for building bootloader images. The BINMAN_INDIRS environment variable is used to provide a space-separated list of directories to search for binary blobs. In this way, the previous setting becomes unnecessary, so let's remove it. [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ Signed-off-by: Dario Binacchi --- Changes in v5: - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" from UBOOT_MAKE_OPTS. no changes since v1: boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a88059..70982a87719f 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -189,7 +189,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:15 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:15 +0100 Subject: [Buildroot] [PATCH v5 14/16] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-15-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot are capable of building tiboot3.bin using Binman. In this case, let's copy it to the binaries directory. Signed-off-by: Dario Binacchi --- Changes in v5: - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin Added in v4 boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index fdb058f3b72a..e0c4c92bd4cc 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) + define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + find $(@D) -name "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; endef $(eval $(kconfig-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:16 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:16 +0100 Subject: [Buildroot] [PATCH v5 15/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-16-dario.binacchi@amarulasolutions.com> The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v5: - Update commit message. Changes in v4: - bump to 204.01 instead of 2023.10 - Update the commit message - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. Changes in v2: - Update the commit message - Drop Python options required by binman. - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically selects the Python modules required by binman. board/ti/am62x-sk/genimage.cfg | 7 ++++- board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++++++++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++++ configs/ti_am62x_sk_defconfig | 13 +++++---- 4 files changed, 67 insertions(+), 7 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg index 26304fe98f99..398209f4d831 100644 --- a/board/ti/am62x-sk/genimage.cfg +++ b/board/ti/am62x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh new file mode 100755 index 000000000000..0f1f98ef217a --- /dev/null +++ b/board/ti/am62x-sk/post-build.sh @@ -0,0 +1,49 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:r:x:' +O='console:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing argument" +[ -n "${ROOT}" ] || die "Missing argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label am62x-sk-buildroot + kernel /Image + fdtdir / + append ${append} + __HEADER_EOF diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh new file mode 100755 index 000000000000..34f732c091ad --- /dev/null +++ b/board/ti/am62x-sk/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh -x + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 2835404a57df..be01c696b170 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_PACKAGE_TI_K3=y @@ -24,17 +24,18 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" -BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:17 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:17 +0100 Subject: [Buildroot] [PATCH v5 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-17-dario.binacchi@amarulasolutions.com> Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v5 - Bump to 6.6.17 from 6.6.1 - Update commit message Changes in v4 - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. no changes since v1 configs/ti_am62x_sk_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index be01c696b170..e0377591a349 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -- 2.43.0 From fancp2007 at gmail.com Thu Feb 22 10:47:04 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Thu, 22 Feb 2024 18:47:04 +0800 Subject: [Buildroot] [PATCH v6] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20231208003746.9505-1-fancp2007@gmail.com> References: <20231208003746.9505-1-fancp2007@gmail.com> Message-ID: <20240222104709.10503-1-fancp2007@gmail.com> Add support for the FriendlyARM NanoPi NEO2 with mainline components: - U-Boot 2024.01 - Linux 6.6.17 Board's wiki page: - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 Signed-off-by: Scott Fan --- Changes v1 -> v2: - Fix issues from 'utils/docker-run make check-package' - Add atf custom version in the defconfig - No need for sudo to run sync Changes v2 -> v3: - Update patch file, add the upstream tag Changes v3 -> v4: - Use a single integrated image file (u-boot-sunxi-with-spl.bin) - Remove patch file for uboot, switch to binman - Merge boot partition into rootfs partition - Bump kernel version to 6.1.61 Changes v4 -> v5: - Bump kernel version to 6.1.65 Changes v5 -> v6: - Bump kernel version to 6.6.17 - Bump uboot version to 2024.01 - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y Signed-off-by: Scott Fan --- board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++++ configs/friendlyarm_nanopi_neo2_defconfig | 49 +++++++++++++++++++++ 5 files changed, 108 insertions(+) create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf new file mode 100644 index 0000000000..482a069f74 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf @@ -0,0 +1,4 @@ +label friendlyarm-nanopi-buildroot + kernel /boot/Image + devicetree /boot/sun50i-h5-nanopi-neo2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg new file mode 100644 index 0000000000..67e4e5efdb --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + } +} diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh new file mode 100755 index 0000000000..c7ec875068 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt new file mode 100644 index 0000000000..c896a57525 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi NEO2. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Wiki link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_neo2_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sync + +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig new file mode 100644 index 0000000000..a60aba06d9 --- /dev/null +++ b/configs/friendlyarm_nanopi_neo2_defconfig @@ -0,0 +1,49 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 22 12:28:57 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 22 Feb 2024 13:28:57 +0100 Subject: [Buildroot] [PATCH v6] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240222104709.10503-1-fancp2007@gmail.com> References: <20240222104709.10503-1-fancp2007@gmail.com> Message-ID: Hi Scott, > Il giorno 22 feb 2024, alle ore 11:47, Scott Fan ha scritto: > > ?Add support for the FriendlyARM NanoPi NEO2 with mainline components: > - U-Boot 2024.01 > - Linux 6.6.17 > > Board's wiki page: > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > Signed-off-by: Scott Fan Reviewed-by: Giulio Benetti [Only build-tested using docker-run] Tested-by: Giulio Benetti see below, > > --- > Changes v1 -> v2: > - Fix issues from 'utils/docker-run make check-package' > - Add atf custom version in the defconfig > - No need for sudo to run sync > > Changes v2 -> v3: > - Update patch file, add the upstream tag > > Changes v3 -> v4: > - Use a single integrated image file (u-boot-sunxi-with-spl.bin) > - Remove patch file for uboot, switch to binman > - Merge boot partition into rootfs partition > - Bump kernel version to 6.1.61 > > Changes v4 -> v5: > - Bump kernel version to 6.1.65 > > Changes v5 -> v6: > - Bump kernel version to 6.6.17 > - Bump uboot version to 2024.01 > - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > Signed-off-by: Scott Fan No need your SoB here since it won?t be part of commit log. Best regards Giulio > --- > board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ > board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ > board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ > board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++++ > configs/friendlyarm_nanopi_neo2_defconfig | 49 +++++++++++++++++++++ > 5 files changed, 108 insertions(+) > create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf > create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg > create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh > create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt > create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig > > diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf > new file mode 100644 > index 0000000000..482a069f74 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf > @@ -0,0 +1,4 @@ > +label friendlyarm-nanopi-buildroot > + kernel /boot/Image > + devicetree /boot/sun50i-h5-nanopi-neo2.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg > new file mode 100644 > index 0000000000..67e4e5efdb > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot-tpl-spl-dtb { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + offset = 1M > + } > +} > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh > new file mode 100755 > index 0000000000..c7ec875068 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt > new file mode 100644 > index 0000000000..c896a57525 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/readme.txt > @@ -0,0 +1,34 @@ > +Intro > +===== > + > +This default configuration will allow you to start experimenting with the > +buildroot environment for the NanoPi NEO2. With the current configuration > +it will bring-up the board, and allow access through the serial console. > + > +Wiki link: > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > + > +This configuration uses U-Boot mainline and kernel mainline. > + > +How to build > +============ > + > + $ make friendlyarm_nanopi_neo2_defconfig > + $ make > + > +Note: you will need access to the internet to download the required > +sources. > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > + $ sync > + > +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console > +is on the serial line, 115200 8N1. > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig > new file mode 100644 > index 0000000000..a60aba06d9 > --- /dev/null > +++ b/configs/friendlyarm_nanopi_neo2_defconfig > @@ -0,0 +1,49 @@ > +BR2_aarch64=y > +BR2_cortex_a53=y > +BR2_ARM_FPU_VFPV4=y > + > +# Linux headers same as kernel, a 6.6 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > + > +# Firmware > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" > -- > 2.34.1 > From fancp2007 at gmail.com Thu Feb 22 13:07:15 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Thu, 22 Feb 2024 21:07:15 +0800 Subject: [Buildroot] [PATCH v6] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20231208003746.9505-1-fancp2007@gmail.com> References: <20231208003746.9505-1-fancp2007@gmail.com> Message-ID: <20240222130716.1311432-1-fancp2007@gmail.com> Add support for the FriendlyARM NanoPi NEO2 with mainline components: - U-Boot 2024.01 - Linux 6.6.17 Board's wiki page: - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 Signed-off-by: Scott Fan --- Changes v1 -> v2: - Fix issues from 'utils/docker-run make check-package' - Add atf custom version in the defconfig - No need for sudo to run sync Changes v2 -> v3: - Update patch file, add the upstream tag Changes v3 -> v4: - Use a single integrated image file (u-boot-sunxi-with-spl.bin) - Remove patch file for uboot, switch to binman - Merge boot partition into rootfs partition - Bump kernel version to 6.1.61 Changes v4 -> v5: - Bump kernel version to 6.1.65 Changes v5 -> v6: - Bump kernel version to 6.6.17 - Bump uboot version to 2024.01 - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y --- board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++++ configs/friendlyarm_nanopi_neo2_defconfig | 49 +++++++++++++++++++++ 5 files changed, 108 insertions(+) create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf new file mode 100644 index 0000000000..482a069f74 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf @@ -0,0 +1,4 @@ +label friendlyarm-nanopi-buildroot + kernel /boot/Image + devicetree /boot/sun50i-h5-nanopi-neo2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg new file mode 100644 index 0000000000..67e4e5efdb --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + } +} diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh new file mode 100755 index 0000000000..c7ec875068 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt new file mode 100644 index 0000000000..c896a57525 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi NEO2. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Wiki link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_neo2_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sync + +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig new file mode 100644 index 0000000000..a60aba06d9 --- /dev/null +++ b/configs/friendlyarm_nanopi_neo2_defconfig @@ -0,0 +1,49 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" -- 2.34.1 From buildroot at bubu1.eu Thu Feb 22 13:07:23 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 22 Feb 2024 14:07:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: security bump to version 20.11.1 In-Reply-To: <20240221220343.1228278-1-fontaine.fabrice@gmail.com> References: <20240221220343.1228278-1-fontaine.fabrice@gmail.com> Message-ID: <2b8930e5-63af-452a-89f2-a19f28d21c99@bubu1.eu> On 21.02.24 23:03, Fabrice Fontaine wrote: > - Fix CVE-2024-21892, CVE-2024-22019, CVE-2024-21896, CVE-2024-22017, > CVE-2023-46809, CVE-2024-21891, CVE-2024-21890 and CVE-2024-22025 > > - LICENSE hash changed due to two things: > * c-ares vendored dependency license got updated [1]. This is unused > by buildroot though anyway > * base64 vendored library license updated copyright years and sorted > contributor names [2], [3] > > - This bump will fix the following build failure raised since bump of > python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14 > thanks to > https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6 > https://github.com/nodejs/node/commit/6557c1c9b1206a85bb7d8e7450e8c3a4cff7c84b: > > Traceback (most recent call last): > File "/home/autobuild/autobuild/instance-2/output-1/build/host-nodejs-src-20.9.0/configure.py", line 17, in > from distutils.version import StrictVersion > ModuleNotFoundError: No module named 'distutils' > > https://github.com/nodejs/node/blob/v20.11.1/CHANGELOG.md > > [1] https://github.com/c-ares/c-ares/pull/556 > [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd > [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b > > Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 > - http://autobuild.buildroot.org/results/8b38bc4b7879a0349c1305e2fcb458a0cfd04a93 > > Signed-off-by: Fabrice Fontaine Thanks! Reviewed-By: Marcus Hoffmann > --- > package/nodejs/nodejs.hash | 14 +++++++------- > package/nodejs/nodejs.mk | 2 +- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash > index 2d60437a7c..ddab345e0a 100644 > --- a/package/nodejs/nodejs.hash > +++ b/package/nodejs/nodejs.hash > @@ -1,8 +1,8 @@ > -# From https://nodejs.org/dist/v20.9.0/SHASUMS256.txt.asc > -sha256 ced3ecece4b7c3a664bca3d9e34a0e3b9a31078525283a6fdb7ea2de8ca5683b node-v20.9.0-linux-arm64.tar.xz > -sha256 64099d7e62bdbb8efd52c216a6759b3cdd77c38aa993096fdee9f875d95b2d8e node-v20.9.0-linux-armv7l.tar.xz > -sha256 3c6cea5d614cfbb95d92de43fbc2f8ecd66e431502fe5efc4f3c02637897bd45 node-v20.9.0-linux-ppc64le.tar.xz > -sha256 9033989810bf86220ae46b1381bdcdc6c83a0294869ba2ad39e1061f1e69217a node-v20.9.0-linux-x64.tar.xz > -sha256 a23d96810abf0455426b349d47ce5310f33095b7bc0571b9cc510f481c3a4519 node-v20.9.0.tar.xz > +# From https://nodejs.org/dist/v20.11.1/SHASUMS256.txt.asc > +sha256 c957f29eb4e341903520caf362534f0acd1db7be79c502ae8e283994eed07fe1 node-v20.11.1-linux-arm64.tar.xz > +sha256 28e0120d2d150a8f41717899d33167b8b32053778665583d49ff971bfd188d1b node-v20.11.1-linux-armv7l.tar.xz > +sha256 51343cacf5cdf5c4b5e93e919d19dd373d6ef43d5f2c666eae299f26e31d08b5 node-v20.11.1-linux-ppc64le.tar.xz > +sha256 d8dab549b09672b03356aa2257699f3de3b58c96e74eb26a8b495fbdc9cf6fbe node-v20.11.1-linux-x64.tar.xz > +sha256 77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e node-v20.11.1.tar.xz > # Locally calculated > -sha256 93ac846282ce6c5255e00fada2fd2e7e292255239fe58d5502b0a554859e6a3e LICENSE > +sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk > index 9806a64d38..858c6a86f5 100644 > --- a/package/nodejs/nodejs.mk > +++ b/package/nodejs/nodejs.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything > -NODEJS_COMMON_VERSION = 20.9.0 > +NODEJS_COMMON_VERSION = 20.11.1 > NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz > NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) > From giulio.benetti at benettiengineering.com Thu Feb 22 13:12:31 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 22 Feb 2024 14:12:31 +0100 Subject: [Buildroot] [PATCH v6] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240222130716.1311432-1-fancp2007@gmail.com> References: <20231208003746.9505-1-fancp2007@gmail.com> <20240222130716.1311432-1-fancp2007@gmail.com> Message-ID: <9f844f84-2566-4de6-9e85-7490f3633c11@benettiengineering.com> Hi Scott, no need to resend, and... On 22/02/24 14:07, Scott Fan wrote: > Add support for the FriendlyARM NanoPi NEO2 with mainline components: > - U-Boot 2024.01 > - Linux 6.6.17 > > Board's wiki page: > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > Signed-off-by: Scott Fan ... if you resend please keep my: Reviewed-by: Giulio Benetti [Only build-tested using docker-run] Tested-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > > --- > Changes v1 -> v2: > - Fix issues from 'utils/docker-run make check-package' > - Add atf custom version in the defconfig > - No need for sudo to run sync > > Changes v2 -> v3: > - Update patch file, add the upstream tag > > Changes v3 -> v4: > - Use a single integrated image file (u-boot-sunxi-with-spl.bin) > - Remove patch file for uboot, switch to binman > - Merge boot partition into rootfs partition > - Bump kernel version to 6.1.61 > > Changes v4 -> v5: > - Bump kernel version to 6.1.65 > > Changes v5 -> v6: > - Bump kernel version to 6.6.17 > - Bump uboot version to 2024.01 > - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > --- > board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ > board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ > board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ > board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++++ > configs/friendlyarm_nanopi_neo2_defconfig | 49 +++++++++++++++++++++ > 5 files changed, 108 insertions(+) > create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf > create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg > create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh > create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt > create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig > > diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf > new file mode 100644 > index 0000000000..482a069f74 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf > @@ -0,0 +1,4 @@ > +label friendlyarm-nanopi-buildroot > + kernel /boot/Image > + devicetree /boot/sun50i-h5-nanopi-neo2.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg > new file mode 100644 > index 0000000000..67e4e5efdb > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot-tpl-spl-dtb { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + offset = 1M > + } > +} > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh > new file mode 100755 > index 0000000000..c7ec875068 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt > new file mode 100644 > index 0000000000..c896a57525 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/readme.txt > @@ -0,0 +1,34 @@ > +Intro > +===== > + > +This default configuration will allow you to start experimenting with the > +buildroot environment for the NanoPi NEO2. With the current configuration > +it will bring-up the board, and allow access through the serial console. > + > +Wiki link: > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > + > +This configuration uses U-Boot mainline and kernel mainline. > + > +How to build > +============ > + > + $ make friendlyarm_nanopi_neo2_defconfig > + $ make > + > +Note: you will need access to the internet to download the required > +sources. > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > + $ sync > + > +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console > +is on the serial line, 115200 8N1. > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig > new file mode 100644 > index 0000000000..a60aba06d9 > --- /dev/null > +++ b/configs/friendlyarm_nanopi_neo2_defconfig > @@ -0,0 +1,49 @@ > +BR2_aarch64=y > +BR2_cortex_a53=y > +BR2_ARM_FPU_VFPV4=y > + > +# Linux headers same as kernel, a 6.6 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > + > +# Firmware > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" From buildroot at bubu1.eu Thu Feb 22 13:16:27 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 22 Feb 2024 14:16:27 +0100 Subject: [Buildroot] [PATCH] package/libuv: security bump to version 1.48 Message-ID: <20240222131628.3479059-1-buildroot@bubu1.eu> Fixes: CVE-2024-24806 / GHSA-f74f-cvh7-c6q6 [1] Release Notes: https://github.com/libuv/libuv/releases/tag/v1.48.0 Full Changelog: https://github.com/libuv/libuv/blob/v1.48.0/ChangeLog [1]: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6 Signed-off-by: Marcus Hoffmann --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 1fd286d9e9..2ca8f64a80 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094 libuv-v1.46.0-dist.tar.gz +sha256 c593139feb9061699fdd2f7fde47bb6c1ca77761ae9ec04f052083f1ef46c13b libuv-v1.48.0-dist.tar.gz sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 76316484e4..5f96e98a98 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.46.0 +LIBUV_VERSION = 1.48.0 LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) LIBUV_DEPENDENCIES = host-pkgconf -- 2.34.1 From fancp2007 at gmail.com Thu Feb 22 13:17:23 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Thu, 22 Feb 2024 21:17:23 +0800 Subject: [Buildroot] [PATCH v6] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <9f844f84-2566-4de6-9e85-7490f3633c11@benettiengineering.com> References: <20231208003746.9505-1-fancp2007@gmail.com> <20240222130716.1311432-1-fancp2007@gmail.com> <9f844f84-2566-4de6-9e85-7490f3633c11@benettiengineering.com> Message-ID: Hi Giulio, I removed the unnecessary line, then resend the patch. Thanks for your reminder. Scott Fan On Thu, Feb 22, 2024 at 9:12?PM Giulio Benetti wrote: > > Hi Scott, > > no need to resend, and... > > On 22/02/24 14:07, Scott Fan wrote: > > Add support for the FriendlyARM NanoPi NEO2 with mainline components: > > - U-Boot 2024.01 > > - Linux 6.6.17 > > > > Board's wiki page: > > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > > > Signed-off-by: Scott Fan > > ... if you resend please keep my: > Reviewed-by: Giulio Benetti > [Only build-tested using docker-run] > Tested-by: Giulio Benetti > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > > > > --- > > Changes v1 -> v2: > > - Fix issues from 'utils/docker-run make check-package' > > - Add atf custom version in the defconfig > > - No need for sudo to run sync > > > > Changes v2 -> v3: > > - Update patch file, add the upstream tag > > > > Changes v3 -> v4: > > - Use a single integrated image file (u-boot-sunxi-with-spl.bin) > > - Remove patch file for uboot, switch to binman > > - Merge boot partition into rootfs partition > > - Bump kernel version to 6.1.61 > > > > Changes v4 -> v5: > > - Bump kernel version to 6.1.65 > > > > Changes v5 -> v6: > > - Bump kernel version to 6.6.17 > > - Bump uboot version to 2024.01 > > - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > --- > > board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ > > board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ > > board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ > > board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++++ > > configs/friendlyarm_nanopi_neo2_defconfig | 49 +++++++++++++++++++++ > > 5 files changed, 108 insertions(+) > > create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf > > create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg > > create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh > > create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt > > create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig > > > > diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf > > new file mode 100644 > > index 0000000000..482a069f74 > > --- /dev/null > > +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf > > @@ -0,0 +1,4 @@ > > +label friendlyarm-nanopi-buildroot > > + kernel /boot/Image > > + devicetree /boot/sun50i-h5-nanopi-neo2.dtb > > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > > diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg > > new file mode 100644 > > index 0000000000..67e4e5efdb > > --- /dev/null > > +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg > > @@ -0,0 +1,16 @@ > > +image sdcard.img { > > + hdimage { > > + } > > + > > + partition u-boot-tpl-spl-dtb { > > + in-partition-table = "no" > > + image = "u-boot-sunxi-with-spl.bin" > > + offset = 8K > > + } > > + > > + partition rootfs { > > + partition-type = 0x83 > > + image = "rootfs.ext4" > > + offset = 1M > > + } > > +} > > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh > > new file mode 100755 > > index 0000000000..c7ec875068 > > --- /dev/null > > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh > > @@ -0,0 +1,5 @@ > > +#!/bin/sh > > + > > +BOARD_DIR="$(dirname "$0")" > > + > > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt > > new file mode 100644 > > index 0000000000..c896a57525 > > --- /dev/null > > +++ b/board/friendlyarm/nanopi-neo2/readme.txt > > @@ -0,0 +1,34 @@ > > +Intro > > +===== > > + > > +This default configuration will allow you to start experimenting with the > > +buildroot environment for the NanoPi NEO2. With the current configuration > > +it will bring-up the board, and allow access through the serial console. > > + > > +Wiki link: > > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > + > > +This configuration uses U-Boot mainline and kernel mainline. > > + > > +How to build > > +============ > > + > > + $ make friendlyarm_nanopi_neo2_defconfig > > + $ make > > + > > +Note: you will need access to the internet to download the required > > +sources. > > + > > +How to write the SD card > > +======================== > > + > > +Once the build process is finished you will have an image called "sdcard.img" > > +in the output/images/ directory. > > + > > +Copy the bootable "sdcard.img" onto an SD card with "dd": > > + > > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > > + $ sync > > + > > +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console > > +is on the serial line, 115200 8N1. > > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig > > new file mode 100644 > > index 0000000000..a60aba06d9 > > --- /dev/null > > +++ b/configs/friendlyarm_nanopi_neo2_defconfig > > @@ -0,0 +1,49 @@ > > +BR2_aarch64=y > > +BR2_cortex_a53=y > > +BR2_ARM_FPU_VFPV4=y > > + > > +# Linux headers same as kernel, a 6.6 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > > + > > +# Firmware > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > > + > > +# Bootloader > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > +BR2_TARGET_UBOOT_SPL=y > > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > > + > > +# Kernel > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" > > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > + > > +# Filesystem > > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" > From buildroot at bubu1.eu Thu Feb 22 13:20:02 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 22 Feb 2024 14:20:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/{libuv, uvw}: bump version to libuv 1.47.0 and uvw 3.3.0 In-Reply-To: <20240215224614.3028380-1-kadambini.nema@gmail.com> References: <20240215224614.3028380-1-kadambini.nema@gmail.com> Message-ID: <552ccb1d-1be8-4ec0-8ea4-70d2de771cdb@bubu1.eu> Hi Kadambini, On 15.02.24 23:46, Kadambini Nema wrote: > Change Log : https://github.com/libuv/libuv/blob/v1.x/ChangeLog#L92 > https://github.com/skypjack/uvw/releases/tag/v3.3.0_libuv_v1.47 I think one patch per package update is preferred for buildroot. If one update depends on another one, these should be send in one series, but still as separate patches. I've just send another libuv update to 1.48, which contains a security fix. I didn't know what to do with the uvw as I don't know how it works with libuv compatibility, there was no explicit version for libuv 1.48. > > Build test results: > libuv.config > BR2_PACKAGE_LIBUV=y > BR2_PACKAGE_UVW=y > > $./utils/test-pkg -k -c libuv.uvw.config -p uvw -p libuv > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: SKIPPED > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: SKIPPED > sourcery-arm [6/6]: SKIPPED > 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > Signed-off-by: Kadambini Nema > --- > package/libuv/libuv.hash | 2 +- > package/libuv/libuv.mk | 2 +- > package/uvw/uvw.hash | 4 ++-- > package/uvw/uvw.mk | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash > index 1fd286d9e9..3a2904f247 100644 > --- a/package/libuv/libuv.hash > +++ b/package/libuv/libuv.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094 libuv-v1.46.0-dist.tar.gz > +sha256 72a187104662b47f2a2b204da39d2acb05cf22a4fcb13ceaebe3b0ed0c0e2e43 libuv-v1.47.0-dist.tar.gz > sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE > sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra > diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk > index 76316484e4..a794ac1c8a 100644 > --- a/package/libuv/libuv.mk > +++ b/package/libuv/libuv.mk > @@ -6,7 +6,7 @@ > > # When bumping libuv, check if a new version of uvw is available > # and bump it too. > -LIBUV_VERSION = 1.46.0 > +LIBUV_VERSION = 1.47.0 > LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz > LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) > LIBUV_DEPENDENCIES = host-pkgconf > diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash > index 2dc6e879e1..3f237d00f2 100644 > --- a/package/uvw/uvw.hash > +++ b/package/uvw/uvw.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 bd5aed741765950074b1ea2507291dce81e528abdf56c406991ad4a27d8d1714 uvw-3.2.0_libuv_v1.46.tar.gz > -sha256 e2a4062818ab05e2a0908737ad49b7c01202247364e900167ac81105de8713f3 LICENSE > +sha256 aabb17d3d8f0b3481b44e981c889dd4a2a6a3f1a96a4d01055e669f4b7d37d0e uvw-3.3.0_libuv_v1.47.tar.gz > +sha256 5e439d0ad6e1b16f2f14023872c49cb2cf1b62a172c30b864cb45a5aa6533454 LICENSE > diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk > index 12149d43ca..23e5060c34 100644 > --- a/package/uvw/uvw.mk > +++ b/package/uvw/uvw.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UVW_VERSION = 3.2.0_libuv_v1.46 > +UVW_VERSION = 3.3.0_libuv_v1.47 > UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) > UVW_INSTALL_STAGING = YES > UVW_INSTALL_TARGET = NO Best, Marcus From vfazio at gmail.com Thu Feb 22 13:55:50 2024 From: vfazio at gmail.com (Vincent Fazio) Date: Thu, 22 Feb 2024 07:55:50 -0600 Subject: [Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch Message-ID: <20240222135550.3428952-1-vfazio@gmail.com> Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was merged and introduced a patch to 10.4.0 that was not accounted for by the patch that dropped 10.4.0 support. Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x") Signed-off-by: Vincent Fazio --- ...ine-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch deleted file mode 100644 index 7e9714e9cb..0000000000 --- a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Thu, 29 Sep 2022 15:32:39 +0100 -Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS - -This was found when testing buildroot with linuxthreads enabled. In -this case, the build passes --disable-tls to the toolchain during -configuration. After building the OpenRISC toolchain it was still -generating TLS code sequences and causing linker failures such as: - - ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl - ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' - -This patch fixes this by disabling tls for the OpenRISC target when requested -via --disable-tls. - -gcc/ChangeLog: - - * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if - HAVE_AS_TLS is defined. - -Tested-by: Yann E. MORIN - -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 - -[Bernd: backported to 10.4.0] -Signed-off-by: Bernd Kuhls ---- - gcc/config/or1k/or1k.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c -index da2f59062ba..0ce7b234417 100644 ---- a/gcc/config/or1k/or1k.c -+++ b/gcc/config/or1k/or1k.c -@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, - #undef TARGET_LEGITIMATE_ADDRESS_P - #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p - -+#ifdef HAVE_AS_TLS - #undef TARGET_HAVE_TLS - #define TARGET_HAVE_TLS true -+#endif - - #undef TARGET_HAVE_SPECULATION_SAFE_VALUE - #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed --- -2.39.3 - -- 2.34.1 From romain.naour at smile.fr Thu Feb 22 14:11:31 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 15:11:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch In-Reply-To: <20240222135550.3428952-1-vfazio@gmail.com> References: <20240222135550.3428952-1-vfazio@gmail.com> Message-ID: <18c5c62e-ac9c-476a-9792-b523c2ee1470@smile.fr> Hello Vincent, Le 22/02/2024 ? 14:55, Vincent Fazio a ?crit?: > Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was > merged and introduced a patch to 10.4.0 that was not accounted for by > the patch that dropped 10.4.0 support. Well, this is unfortunate. The patch removing GCC 10.4.0 was pending in patchwork when the patch was introduced. I can't remove a file that doesn't exist yet :p Reviewed-by: Romain Naour Best regards, Romain > > Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x") > Signed-off-by: Vincent Fazio > --- > ...ine-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 ------------------- > 1 file changed, 49 deletions(-) > delete mode 100644 package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch > > diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch > deleted file mode 100644 > index 7e9714e9cb..0000000000 > --- a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 > -From: Stafford Horne > -Date: Thu, 29 Sep 2022 15:32:39 +0100 > -Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS > - > -This was found when testing buildroot with linuxthreads enabled. In > -this case, the build passes --disable-tls to the toolchain during > -configuration. After building the OpenRISC toolchain it was still > -generating TLS code sequences and causing linker failures such as: > - > - ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl > - ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' > - > -This patch fixes this by disabling tls for the OpenRISC target when requested > -via --disable-tls. > - > -gcc/ChangeLog: > - > - * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if > - HAVE_AS_TLS is defined. > - > -Tested-by: Yann E. MORIN > - > -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 > - > -[Bernd: backported to 10.4.0] > -Signed-off-by: Bernd Kuhls > ---- > - gcc/config/or1k/or1k.c | 2 ++ > - 1 file changed, 2 insertions(+) > - > -diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c > -index da2f59062ba..0ce7b234417 100644 > ---- a/gcc/config/or1k/or1k.c > -+++ b/gcc/config/or1k/or1k.c > -@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, > - #undef TARGET_LEGITIMATE_ADDRESS_P > - #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p > - > -+#ifdef HAVE_AS_TLS > - #undef TARGET_HAVE_TLS > - #define TARGET_HAVE_TLS true > -+#endif > - > - #undef TARGET_HAVE_SPECULATION_SAFE_VALUE > - #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed > --- > -2.39.3 > - From noreplysdesk at busybox.net Thu Feb 22 14:50:20 2024 From: noreplysdesk at busybox.net (Administrator) Date: 22 Feb 2024 06:50:20 -0800 Subject: [Buildroot] Server Administrator | IT Support buildroot@busybox.net Message-ID: <20240222065020.C2D2355E17DB0880@busybox.net> An HTML attachment was scrubbed... URL: From neal.frager at amd.com Thu Feb 22 16:35:21 2024 From: neal.frager at amd.com (Frager, Neal) Date: Thu, 22 Feb 2024 16:35:21 +0000 Subject: [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware In-Reply-To: References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-6-neal.frager@amd.com> Message-ID: Hello everyone, Just a friendly reminder. Any updates? > Now that the toolchain-bare-metal-buildroot has been applied, do you have any > feedback regarding the remainder of the patch set? > One open question I have is regarding the patches for zynqmp-firmware and > versal-firmware. These patches are no longer neeeded since being applied to > release version xilinx_v2023.2. I kept them with the idea that users may > still be using older versions of software, so the patches enable users to > work with versions as old as 2022.2 for zynqmp and 2023.1 for versal. > Do you agree with keeping the patches or do you think it is better not to > include them and to say that support begins starting with version > xilinx_v2023.2? What are your thoughts? > create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch > create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch Best regards, Neal Frager AMD From romain.naour at smile.fr Thu Feb 22 21:25:58 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 22:25:58 +0100 Subject: [Buildroot] [PATCH v5 01/16] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240222101617.18422-2-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-2-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > Checking the output of the command `git grep PLATFORM | grep k3`, we can > found the proper settings for the optee-os package: > > .github/workflows/ci.yml: _make PLATFORM=k3-am62x > .github/workflows/ci.yml: _make PLATFORM=k3-am62x CFG_ARM64_core=y > ... > core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) I believe the commit log needs to explain the issue with the current optee PLATFORM setting. Indeed, using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os Makefile [1] # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Best regards, Romain > > Suggested-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Changes in v5 > - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option > > Added in v4 > > configs/ti_am62x_sk_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index f88252a89c68..c3ad555a8184 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y From romain.naour at smile.fr Thu Feb 22 21:36:04 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 22:36:04 +0100 Subject: [Buildroot] [PATCH v5 09/16] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240222101617.18422-10-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-10-dario.binacchi@amarulasolutions.com> Message-ID: <2a97a88a-a173-4fc0-a13a-97dfebcbe87f@smile.fr> Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. This package is required by binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi > > --- > > no changes since v3 > > Changes in v3: > - Drop Config.in.host > > package/python-jsonschema-specifications.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk > index 40879898c9d4..b6e309ab2bc9 100644 > --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk > +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk > @@ -14,4 +14,9 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ > host-python-hatchling \ > host-python-hatch-vcs > > +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ > + host-python-hatchling \ > + host-python-hatch-vcs > + python-jsonschema-specifications depends on host-python-referencing due to a runtime dependency. Notice the "select BR2_PACKAGE_PYTHON_REFERENCING # runtime" in Config.in for the target variant. http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-8-romain.naour at smile.fr/ Best regards, Romain > $(eval $(python-package)) > +$(eval $(host-python-package)) From romain.naour at smile.fr Thu Feb 22 22:04:09 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 23:04:09 +0100 Subject: [Buildroot] [PATCH v5 11/16] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240222101617.18422-12-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-12-dario.binacchi@amarulasolutions.com> Message-ID: <8233b0af-d9be-4b36-b190-201e3095d870@smile.fr> Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > The patch set the BINMAN_INDIRS environment variable to provide the > directory to search for binary blobs and select the packages required by > binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Co-developed-by: Romain Naour > Signed-off-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Changes in v5: > - Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > - Drop runtime dependecies > - Add host-python-pylibfdt dependency without requiring > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration > - Add host-python3 and host-python-setuptools dependencies > - Add SOB and COB tags of Romain Naour > > Changes in v4: > - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > Changes in v2: > - Change commit message > - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > - Select packages required by binman if > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > > boot/ti-k3-r5-loader/Config.in | 1 + > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 8 +++++++- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in > index 5f86c045c99f..fc71337e80cc 100644 > --- a/boot/ti-k3-r5-loader/Config.in > +++ b/boot/ti-k3-r5-loader/Config.in > @@ -1,6 +1,7 @@ > config BR2_TARGET_TI_K3_R5_LOADER > bool "ti-k3-r5-loader" > depends on BR2_aarch64 > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema > help > Separate U-Boot SPL build for R5 core on TI's K3 processors. > Usually used to build tiboot3.bin with k3-image-gen. > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0ffcb8235f2e..fdb058f3b72a 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ > host-pkgconf \ > $(BR2_MAKE_HOST_DEPENDENCY) \ > host-arm-gnu-toolchain \ > - host-openssl > + host-openssl \ > + host-python-jsonschema \ > + host-python-pyyaml \ > + host-python3 \ > + host-python-setuptools \ > + host-python-pylibfdt The dependency of binman is not really easy to follow. First we have the packages list from binman.rst [1] then we have to install additional python modules [2]. I'm not sure if we also need host-lzma and host-lz4 in dependency. Maybe add a comment to retrieve this package list? [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Best regards, Romain > > TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > @@ -58,6 +63,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ARCH=arm \ > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > + BINMAN_INDIRS=$(BINARIES_DIR) \ > HOSTLDFLAGS="$(HOST_LDFLAGS)" > > define TI_K3_R5_LOADER_BUILD_CMDS From romain.naour at smile.fr Thu Feb 22 22:09:51 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 23:09:51 +0100 Subject: [Buildroot] [PATCH v5 12/16] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240222101617.18422-13-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-13-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > As explained in [1], adding support for AM62x LP SK in U-Boot, requires > binman for building bootloader images. The BINMAN_INDIRS environment > variable is used to provide a space-separated list of directories to > search for binary blobs. > > In this way, the previous setting becomes unnecessary, so let's remove > it. > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > Signed-off-by: Dario Binacchi > > --- > > Changes in v5: > - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" > from UBOOT_MAKE_OPTS. > > no changes since v1: > > boot/uboot/uboot.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dda606a88059..70982a87719f 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -189,7 +189,7 @@ endif > ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > UBOOT_DEPENDENCIES += ti-k3-boot-firmware > -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) Binman tool is not specific to TI K3 platform, see my previous comment [1] [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685949.html Best regards, Romain > endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) From romain.naour at smile.fr Thu Feb 22 22:31:57 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 23:31:57 +0100 Subject: [Buildroot] [PATCH v5 13/16] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240222101617.18422-14-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-14-dario.binacchi@amarulasolutions.com> Message-ID: <0f4a4a71-f197-4e11-9592-0d60f26d29cc@smile.fr> Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > Recent versions of U-Boot can use Binman to compile and sign the generated > binaries, thus making the use of custom tools like ti-k3-image-gen no > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > configured and used outside of it. This patch allows setting such options > even if the package is not enabled. > > The patch makes an exception to the Buildroot rule "no subdirectory in > package directory". > > Signed-off-by: Dario Binacchi > > --- > > Changes in v5: > - Add SOB tag > - Move the new ti-k3 from boot to package > > Added in v4 > > boot/ti-k3-image-gen/Config.in | 61 ++----------------------- > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- > boot/uboot/Config.in | 7 ++- > configs/ti_am62x_sk_defconfig | 3 +- > configs/ti_am64x_sk_defconfig | 3 +- > package/Config.in | 1 + > package/ti-k3/Config.in | 54 ++++++++++++++++++++++ > package/ti-k3/ti-k3.mk | 7 +++ > 8 files changed, 75 insertions(+), 65 deletions(-) > create mode 100644 package/ti-k3/Config.in > create mode 100644 package/ti-k3/ti-k3.mk > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > index d76cef82e911..a57319f4be6d 100644 > --- a/boot/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3-image-gen/Config.in > @@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > if BR2_TARGET_TI_K3_IMAGE_GEN > -choice > - prompt "SoC family" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - bool "am62ax" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - bool "am62x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - bool "am64x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - bool "am65x" > - > -endchoice > - > -choice > - prompt "Security type" > - help > - The target SoC security type option for image gen. Valid > - options are "gp" for General Purpose devices, "hs-fs" for > - High Security - Field Securable devices, or "hs" for High > - Security - Security Enforcing devices. Note for all High > - Security device variants the TI_SECURE_DEV_PKG environmental > - variable must be defined at build time pointing to a valid > - core-secdev-k3 folder location, otherwise the build will > - fail, see > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - bool "gp" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - bool "hs-fs" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > - bool "hs" > - > -endchoice > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > - string > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > string > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > - string > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X > + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X > + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X > > endif > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > index 64be9a18f2c4..aca29bcf1bd4 100644 > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > $(BR2_MAKE_HOST_DEPENDENCY) > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > > TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index beafb38930db..c7ebe2652001 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > bool "U-Boot needs TI K3 Device Manager (DM)" > # We use the SoC selection defined for the ti-k3-image-gen > # package > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X > help > Some TI K3 devices need the Device Manager (DM) firmware to > be available for the U-Boot build. > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > string > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X TI_K3_DM_SOCNAME should also move to ti-k3 package. > > endif > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index a129e216d25b..2835404a57df 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > +BR2_PACKAGE_TI_K3=y > +BR2_PACKAGE_TI_K3_SOC_AM62X=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="256M" > @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 26195194c7d6..566cbbe4824f 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > +BR2_PACKAGE_TI_K3=y > +BR2_PACKAGE_TI_K3_SOC_AM64X=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > diff --git a/package/Config.in b/package/Config.in > index bf0fe078b955..6d3ed34e121b 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -629,6 +629,7 @@ endmenu > source "package/sysstat/Config.in" > source "package/targetcli-fb/Config.in" > source "package/ti-gfx/Config.in" > + source "package/ti-k3/Config.in" > source "package/ti-sgx-demos/Config.in" > source "package/ti-sgx-km/Config.in" > source "package/ti-sgx-um/Config.in" > diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in > new file mode 100644 > index 000000000000..01d88c8e1643 > --- /dev/null > +++ b/package/ti-k3/Config.in > @@ -0,0 +1,54 @@ > +config BR2_PACKAGE_TI_K3 > + bool "TI K3" > + help > + The TI K3 SOC specific selections. > + > +if BR2_PACKAGE_TI_K3 > + > +choice > + prompt "SoC family" > + > +config BR2_PACKAGE_TI_K3_SOC_AM62AX > + bool "am62ax" > + > +config BR2_PACKAGE_TI_K3_SOC_AM62X > + bool "am62x" > + > +config BR2_PACKAGE_TI_K3_SOC_AM64X > + bool "am64x" > + > +config BR2_PACKAGE_TI_K3_SOC_AM65X > + bool "am65x" > + > +endchoice > + > +choice > + prompt "Security type" > + help > + The target SoC security type option. > + > +config BR2_PACKAGE_TI_K3_SECTYPE_GP > + bool "gp" > + > +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS > + bool "hs-fs" Not related to your serie but it seems that some TI K3 SoC variant doesn't provide all SECTYPE. For example: AM65 can by only GP or HS, there is no HS-FS (yet?) This can be checked in meta-ti: meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" So BR2_PACKAGE_TI_K3_SECTYPE_HS_FS must not be selected if BR2_PACKAGE_TI_K3_SOC_AM65X is used. > + > +config BR2_PACKAGE_TI_K3_SECTYPE_HS > + bool "hs" > + > +endchoice > + > +config BR2_PACKAGE_TI_K3_SOC > + string > + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X > + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X > + default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X > + > +config BR2_PACKAGE_TI_K3_SECTYPE > + string > + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP > + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS > + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS move BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME here (BR2_PACKAGE_TI_K3_DM). Best regards, Romain > + > +endif > diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk > new file mode 100644 > index 000000000000..a2da29f5148c > --- /dev/null > +++ b/package/ti-k3/ti-k3.mk > @@ -0,0 +1,7 @@ > +################################################################################ > +# > +# ti-k3 > +# > +################################################################################ > + > +include $(sort $(wildcard package/ti-k3/*/*.mk)) From romain.naour at smile.fr Thu Feb 22 22:35:03 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 23:35:03 +0100 Subject: [Buildroot] [PATCH v5 12/16] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-13-dario.binacchi@amarulasolutions.com> Message-ID: Le 22/02/2024 ? 23:09, Romain Naour a ?crit?: > Hello Dario, > > Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: >> As explained in [1], adding support for AM62x LP SK in U-Boot, requires >> binman for building bootloader images. The BINMAN_INDIRS environment >> variable is used to provide a space-separated list of directories to >> search for binary blobs. >> >> In this way, the previous setting becomes unnecessary, so let's remove >> it. >> >> [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ >> Signed-off-by: Dario Binacchi >> >> --- >> >> Changes in v5: >> - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" >> from UBOOT_MAKE_OPTS. >> >> no changes since v1: >> >> boot/uboot/uboot.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk >> index dda606a88059..70982a87719f 100644 >> --- a/boot/uboot/uboot.mk >> +++ b/boot/uboot/uboot.mk >> @@ -189,7 +189,7 @@ endif >> ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) >> UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_TI_K3_DM_SOCNAME is not used anymore With the ti-k3 package introduced in the followup patch, it can be simplifed to (along the separate binman uboot option) ifeq ($(BR2_PACKAGE_TI_K3),y) UBOOT_DEPENDENCIES += ti-k3-boot-firmware endif >> UBOOT_DEPENDENCIES += ti-k3-boot-firmware >> -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f >> +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) > > Binman tool is not specific to TI K3 platform, see my previous comment [1] > > [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685949.html > > Best regards, > Romain > > >> endif >> >> ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > From adam.duskett at amarulasolutions.com Thu Feb 22 22:43:15 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Thu, 22 Feb 2024 15:43:15 -0700 Subject: [Buildroot] [PATCH 0/2] Fix flutter build failure In-Reply-To: References: <20240219095155.2758428-1-anaumann@ultratronik.de> Message-ID: Hello; Sorry for the late reply, I have been quite sick the last week and didn't want to do anything but lay in the bed and sleep! :) On Tue, Feb 20, 2024 at 6:20?AM Marcus Hoffmann wrote: > > Hi Andreas, Yann, all > > On 19.02.24 22:23, Yann E. MORIN wrote: > > Andreas, All, > > > > On 2024-02-19 10:51 +0100, Andreas Naumann spake thusly: > >> Hello Adam, all, > >> I was motivated to give flutter a spin after your talk at FOSDEM, Wonderful! > >> however the recent bump to Python 3.12.1 broke some script during > >> the flutter-engine configure step. That's quite unfortunate! > >> Fortunately, now a new major stable version has been released 3.19.0, > >> which contains a patch for this. > >> > >> After bumping engine and sdk they successfully build again, as does > >> creating the flutter bundles which you provided in > >> https://github.com/aduskett/buildroot-fosdem2024-flutter-demos > >> > >> I have not yet been able to run them using ivi-homescreen, but that's > >> probably due to my target display/wayland setup. > >> The x86_64 defconfig has a wayland demo. You can run `start_sway` to run sway, hit `windows + enter` to open a terminal. > >> However, the flutter-gallery no longer builds with 3.19, even after > >> bumping to the main HEAD. Their github README says > >> "NOTE: The Flutter Gallery is now deprecated, and no longer being active > >> maintained." Yes, I think I would like to switch to the flutter-packages repository found here: https://github.com/flutter/packages I have several of them ported already found here: https://github.com/aduskett/buildroot-fosdem2024-flutter-demos/tree/2023.11.1/fosdem/package/flutter-packages Although I am not sure if the maintainers would want such a package... especially how it is laid out in the above directory. > >> I thought about including a patch for removal of the gallery package, > >> but that would leave us with no example for how to create a flutter > >> bundle. > > Yeah, see above. > > The upstream repository has also been "archived", which means it is > > frozen and will never get fixed, ever. > > > > That's a bit unfortunate indeed, but we don't have much choice going > > forward: we'll have to drop that package in the near future, but not > > now: we're still considering reverting the python 3.12 version bump for > > 2024.02, as it still causes issues in the target==build case, which > > means we'd be able to keep the current flutter stack for 2024.02 LTS. > > > > Then, we can reintroduce python3, the flutter-engine bumps in this > > series, and drop flutter-gfallery, hopefully introducing another package > > as an example on how to build flutter packages... > > The archived repo page links to > https://github.com/gskinnerTeam/flutter-wonderous-app and > https://github.com/flutter/samples/tree/main/material_3_demo as > replacement showcases. > > I wonder how long these will last... :-/. > > Marcus From romain.naour at smile.fr Thu Feb 22 22:49:12 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 23:49:12 +0100 Subject: [Buildroot] [PATCH v5 14/16] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240222101617.18422-15-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-15-dario.binacchi@amarulasolutions.com> Message-ID: <62b63f26-4e2e-4538-a422-bc7f7e131fb9@smile.fr> Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. In this case, let's copy it to the binaries directory. > > Signed-off-by: Dario Binacchi > > --- > > Changes in v5: > - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with > tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > > Added in v4 > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index fdb058f3b72a..e0c4c92bd4cc 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > endef > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > + > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + find $(@D) -name "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; I don't think "find" is needed here since we should copy only one file to $(BINARIES_DIR)/tiboot3.bin > endef > > $(eval $(kconfig-package)) From dario.binacchi at amarulasolutions.com Fri Feb 23 11:12:53 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Fri, 23 Feb 2024 12:12:53 +0100 Subject: [Buildroot] [PATCH v5 14/16] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <62b63f26-4e2e-4538-a422-bc7f7e131fb9@smile.fr> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-15-dario.binacchi@amarulasolutions.com> <62b63f26-4e2e-4538-a422-bc7f7e131fb9@smile.fr> Message-ID: Hi Romain, On Thu, Feb 22, 2024 at 11:49?PM Romain Naour wrote: > > Hello Dario, > > Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit : > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v5: > > - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with > > tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > > > > Added in v4 > > > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index fdb058f3b72a..e0c4c92bd4cc 100644 > > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + find $(@D) -name "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > > I don't think "find" is needed here since we should copy only one file to > $(BINARIES_DIR)/tiboot3.bin Can it be ok? - find $(@D) -name "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin I tested it and It works. Thanks and Regards, Dario > > > > > endef > > > > $(eval $(kconfig-package)) > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From fancp2007 at gmail.com Fri Feb 23 13:15:52 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Fri, 23 Feb 2024 21:15:52 +0800 Subject: [Buildroot] [PATCH v7] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240222130716.1311432-1-fancp2007@gmail.com> References: <20240222130716.1311432-1-fancp2007@gmail.com> Message-ID: <20240223131603.2313178-1-fancp2007@gmail.com> Add support for the FriendlyARM NanoPi NEO2 with mainline components: - U-Boot 2024.01 - Linux 6.6.18 Board's wiki page: - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 Signed-off-by: Scott Fan --- Changes v1 -> v2: - Fix issues from 'utils/docker-run make check-package' - Add atf custom version in the defconfig - No need for sudo to run sync Changes v2 -> v3: - Update patch file, add the upstream tag Changes v3 -> v4: - Use a single integrated image file (u-boot-sunxi-with-spl.bin) - Remove patch file for uboot, switch to binman - Merge boot partition into rootfs partition - Bump kernel version to 6.1.61 Changes v4 -> v5: - Bump kernel version to 6.1.65 Changes v5 -> v6: - Bump kernel version to 6.6.17 - Bump uboot version to 2024.01 - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y Changes v6 -> v7: - Bump kernel version to 6.6.18 - Add option BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - Resort sections in the defconfig --- board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ board/friendlyarm/nanopi-neo2/genimage.cfg | 16 ++++++ board/friendlyarm/nanopi-neo2/post-build.sh | 5 ++ board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++ configs/friendlyarm_nanopi_neo2_defconfig | 57 +++++++++++++++++++++ 5 files changed, 116 insertions(+) create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf new file mode 100644 index 0000000000..482a069f74 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf @@ -0,0 +1,4 @@ +label friendlyarm-nanopi-buildroot + kernel /boot/Image + devicetree /boot/sun50i-h5-nanopi-neo2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg new file mode 100644 index 0000000000..67e4e5efdb --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + } +} diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh new file mode 100755 index 0000000000..c7ec875068 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt new file mode 100644 index 0000000000..c896a57525 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi NEO2. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Wiki link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_neo2_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sync + +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig new file mode 100644 index 0000000000..3118d45625 --- /dev/null +++ b/configs/friendlyarm_nanopi_neo2_defconfig @@ -0,0 +1,57 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# System +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.34.1 From romain.naour at smile.fr Fri Feb 23 13:18:56 2024 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 23 Feb 2024 14:18:56 +0100 Subject: [Buildroot] [PATCH v5 14/16] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-15-dario.binacchi@amarulasolutions.com> <62b63f26-4e2e-4538-a422-bc7f7e131fb9@smile.fr> Message-ID: <6fbbc25d-8502-453e-9b57-1145244e29d9@smile.fr> Hi Dario, Le 23/02/2024 ? 12:12, Dario Binacchi a ?crit?: > Hi Romain, > > On Thu, Feb 22, 2024 at 11:49?PM Romain Naour wrote: >> >> Hello Dario, >> >> Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit : >>> Recent versions of U-Boot are capable of building tiboot3.bin using >>> Binman. In this case, let's copy it to the binaries directory. >>> >>> Signed-off-by: Dario Binacchi >>> >>> --- >>> >>> Changes in v5: >>> - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with >>> tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin >>> >>> Added in v4 >>> >>> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ >>> 1 file changed, 4 insertions(+) >>> >>> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> index fdb058f3b72a..e0c4c92bd4cc 100644 >>> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS >>> $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) >>> endef >>> >>> +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) >>> +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) >>> + >>> define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS >>> cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin >>> + find $(@D) -name "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; >> >> I don't think "find" is needed here since we should copy only one file to >> $(BINARIES_DIR)/tiboot3.bin > > Can it be ok? > > - find $(@D) -name > "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" > -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > $(BINARIES_DIR)/tiboot3.bin > > I tested it and It works. Looks good, thanks! Best regards, Romain > > Thanks and Regards, > Dario > >> >> >> >>> endef >>> >>> $(eval $(kconfig-package)) >> > > From giulio.benetti at benettiengineering.com Fri Feb 23 16:24:06 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 23 Feb 2024 17:24:06 +0100 Subject: [Buildroot] [PATCH v7] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240223131603.2313178-1-fancp2007@gmail.com> References: <20240222130716.1311432-1-fancp2007@gmail.com> <20240223131603.2313178-1-fancp2007@gmail.com> Message-ID: <197750aa-c25f-44d9-89ac-872053953422@benettiengineering.com> Hi Scott, On 23/02/24 14:15, Scott Fan wrote: [ SNIP ] > + > +# System > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y What do you need MDEV by default for? Is there some peripheral that needs to show up automatically otherwise the basic functionality is compromised? Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From flavio.tapajos at newtesc.com.br Fri Feb 23 16:57:47 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Fri, 23 Feb 2024 13:57:47 -0300 Subject: [Buildroot] [PATCH 1/1] configs/asus_tinker-s_rk3288_defconfig: bump kernel to 6.1.79 Message-ID: <20240223165747.1231616-1-flavio.tapajos@newtesc.com.br> latest kernel LTS (6.6.x) is facing problems with the sdcard Signed-off-by: Fl?vio Tapaj?s --- configs/asus_tinker-s_rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/asus_tinker-s_rk3288_defconfig b/configs/asus_tinker-s_rk3288_defconfig index de03336cbb..2ed2c4f712 100644 --- a/configs/asus_tinker-s_rk3288_defconfig +++ b/configs/asus_tinker-s_rk3288_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.72" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.79" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker-s" -- 2.43.2 From flavio.tapajos at newtesc.com.br Fri Feb 23 17:05:58 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Fri, 23 Feb 2024 14:05:58 -0300 Subject: [Buildroot] [PATCH 1/2] package/python-sqlalchemy: bump version to 2.0.27 Message-ID: <20240223170559.1252564-1-flavio.tapajos@newtesc.com.br> Signed-off-by: Fl?vio Tapaj?s --- package/python-sqlalchemy/python-sqlalchemy.hash | 4 ++-- package/python-sqlalchemy/python-sqlalchemy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index 7951a32978..ff83f160a4 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.hash +++ b/package/python-sqlalchemy/python-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlalchemy/json -md5 7abfc2972d7e16315c8b7492ea0e0fdb SQLAlchemy-2.0.25.tar.gz -sha256 a2c69a7664fb2d54b8682dd774c3b54f67f84fa123cf84dda2a5f40dcaa04e08 SQLAlchemy-2.0.25.tar.gz +md5 0e7a957cdd0bb80de501e763270bcdc8 SQLAlchemy-2.0.27.tar.gz +sha256 86a6ed69a71fe6b88bf9331594fa390a2adda4a49b5c06f98e47bf0d392534f8 SQLAlchemy-2.0.27.tar.gz # Locally computed sha256 checksums sha256 3c0f59ab887d041de6a4e52ffe3e9edb5d9522de909fae9a6cd7adb6e7be3293 LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 400ad92f63..177e7f8a38 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 2.0.25 +PYTHON_SQLALCHEMY_VERSION = 2.0.27 PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/7b/bb/85bd8e211f54983e927c7cd9b2ad66773fbef507957156fc72e481a62681 +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/b9/fc/327f0072d1f5231d61c715ad52cb7819ec60f0ac80dc1e507bc338919caa PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE -- 2.43.2 From flavio.tapajos at newtesc.com.br Fri Feb 23 17:05:59 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Fri, 23 Feb 2024 14:05:59 -0300 Subject: [Buildroot] [PATCH 2/2] package/python-sqlalchemy: add cython for python-sqlalchemy In-Reply-To: <20240223170559.1252564-1-flavio.tapajos@newtesc.com.br> References: <20240223170559.1252564-1-flavio.tapajos@newtesc.com.br> Message-ID: <20240223170559.1252564-2-flavio.tapajos@newtesc.com.br> From: James Hilliard When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for python-sqlalchemy. Signed-off-by: James Hilliard Tested-By: Fl?vio Tapaj?s --- package/python-sqlalchemy/python-sqlalchemy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 177e7f8a38..1fcda338d3 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -12,5 +12,6 @@ PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE PYTHON_SQLALCHEMY_CPE_ID_VENDOR = sqlalchemy PYTHON_SQLALCHEMY_CPE_ID_PRODUCT = sqlalchemy +PYTHON_SQLALCHEMY_DEPENDENCIES = host-python-cython $(eval $(python-package)) -- 2.43.2 From james.hilliard1 at gmail.com Fri Feb 23 17:10:22 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 10:10:22 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-grpclib: new package Message-ID: <20240223171023.2907242-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-grpclib/Config.in | 6 ++++++ package/python-grpclib/python-grpclib.hash | 5 +++++ package/python-grpclib/python-grpclib.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-grpclib/Config.in create mode 100644 package/python-grpclib/python-grpclib.hash create mode 100644 package/python-grpclib/python-grpclib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..2ddaadae69 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1114,6 +1114,7 @@ menu "External python modules" source "package/python-grpc-requests/Config.in" source "package/python-grpcio/Config.in" source "package/python-grpcio-reflection/Config.in" + source "package/python-grpclib/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h11/Config.in" source "package/python-h2/Config.in" diff --git a/package/python-grpclib/Config.in b/package/python-grpclib/Config.in new file mode 100644 index 0000000000..2c4a5e20be --- /dev/null +++ b/package/python-grpclib/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_GRPCLIB + bool "python-grpclib" + help + Pure-Python gRPC implementation for asyncio. + + https://github.com/vmagamedov/grpclib diff --git a/package/python-grpclib/python-grpclib.hash b/package/python-grpclib/python-grpclib.hash new file mode 100644 index 0000000000..cc65209138 --- /dev/null +++ b/package/python-grpclib/python-grpclib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/grpclib/json +md5 60ce203e5b9f95de3d7e5721dbce2bd9 grpclib-0.4.7.tar.gz +sha256 2988ef57c02b22b7a2e8e961792c41ccf97efc2ace91ae7a5b0de03c363823c3 grpclib-0.4.7.tar.gz +# Locally computed sha256 checksums +sha256 6c7fa8cf9b94ad5043a6b550a0ffb98356e66100b69dd1cb8e1f82606b436e8e LICENSE.txt diff --git a/package/python-grpclib/python-grpclib.mk b/package/python-grpclib/python-grpclib.mk new file mode 100644 index 0000000000..0bec0a1879 --- /dev/null +++ b/package/python-grpclib/python-grpclib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-grpclib +# +################################################################################ + +PYTHON_GRPCLIB_VERSION = 0.4.7 +PYTHON_GRPCLIB_SOURCE = grpclib-$(PYTHON_GRPCLIB_VERSION).tar.gz +PYTHON_GRPCLIB_SITE = https://files.pythonhosted.org/packages/79/b9/55936e462a5925190d7427e880b3033601d1effd13809b483d13a926061a +PYTHON_GRPCLIB_SETUP_TYPE = setuptools +PYTHON_GRPCLIB_LICENSE = BSD-3-Clause +PYTHON_GRPCLIB_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 23 17:10:23 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 10:10:23 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-betterproto: new package In-Reply-To: <20240223171023.2907242-1-james.hilliard1@gmail.com> References: <20240223171023.2907242-1-james.hilliard1@gmail.com> Message-ID: <20240223171023.2907242-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-betterproto/Config.in | 7 +++++++ package/python-betterproto/python-betterproto.hash | 5 +++++ package/python-betterproto/python-betterproto.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-betterproto/Config.in create mode 100644 package/python-betterproto/python-betterproto.hash create mode 100644 package/python-betterproto/python-betterproto.mk diff --git a/package/Config.in b/package/Config.in index 2ddaadae69..f49c3543b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1006,6 +1006,7 @@ menu "External python modules" source "package/python-backcall/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" + source "package/python-betterproto/Config.in" source "package/python-bidict/Config.in" source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" diff --git a/package/python-betterproto/Config.in b/package/python-betterproto/Config.in new file mode 100644 index 0000000000..9ed72dd39b --- /dev/null +++ b/package/python-betterproto/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_BETTERPROTO + bool "python-betterproto" + select BR2_PACKAGE_PYTHON_GRPCLIB # runtime + help + A better Protobuf / gRPC generator & library. + + http://github.com/danielgtaylor/python-betterproto diff --git a/package/python-betterproto/python-betterproto.hash b/package/python-betterproto/python-betterproto.hash new file mode 100644 index 0000000000..8d23d2ae56 --- /dev/null +++ b/package/python-betterproto/python-betterproto.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/betterproto/json +md5 bd4192c2997959100097479c34ff87e6 betterproto-2.0.0b6.tar.gz +sha256 720ae92697000f6fcf049c69267d957f0871654c8b0d7458906607685daee784 betterproto-2.0.0b6.tar.gz +# Locally computed sha256 checksums +sha256 a5b8df75467e4b57a308a94cce5fdae84808a83ee6cd5af7e175c6b9784a753f LICENSE.md diff --git a/package/python-betterproto/python-betterproto.mk b/package/python-betterproto/python-betterproto.mk new file mode 100644 index 0000000000..95caf0945a --- /dev/null +++ b/package/python-betterproto/python-betterproto.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-betterproto +# +################################################################################ + +PYTHON_BETTERPROTO_VERSION = 2.0.0b6 +PYTHON_BETTERPROTO_SOURCE = betterproto-$(PYTHON_BETTERPROTO_VERSION).tar.gz +PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/45/43/4c44efd75f2ef48a16b458c2fe2cff7aa74bab8fcadf2653bb5110a87f97 +PYTHON_BETTERPROTO_SETUP_TYPE = setuptools +PYTHON_BETTERPROTO_LICENSE = MIT +PYTHON_BETTERPROTO_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 23 17:28:50 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 23 Feb 2024 18:28:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/c-ares: security bump to version 1.27.0 Message-ID: <20240223172850.559363-1-fontaine.fabrice@gmail.com> Fix CVE-2024-25629: Reading malformatted /etc/resolv.conf, /etc/nsswitch.conf or the HOSTALIASES file could result in a crash. https://github.com/c-ares/c-ares/security/advisories/GHSA-mg26-v6qh-x48q https://github.com/c-ares/c-ares/releases/tag/cares-1_27_0 Signed-off-by: Fabrice Fontaine --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index ee097a53c9..9a2b69c731 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz +sha256 0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b c-ares-1.27.0.tar.gz # Hash for license file sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 29da6baa4b..c4441255a2 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.26.0 +C_ARES_VERSION = 1.27.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom -- 2.43.0 From james.hilliard1 at gmail.com Fri Feb 23 17:35:18 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 10:35:18 -0700 Subject: [Buildroot] [PATCH v2 1/2] package/python-grpclib: new package Message-ID: <20240223173519.2958847-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - add missing h2/multidict runtime dependencies --- package/Config.in | 1 + package/python-grpclib/Config.in | 8 ++++++++ package/python-grpclib/python-grpclib.hash | 5 +++++ package/python-grpclib/python-grpclib.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-grpclib/Config.in create mode 100644 package/python-grpclib/python-grpclib.hash create mode 100644 package/python-grpclib/python-grpclib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..2ddaadae69 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1114,6 +1114,7 @@ menu "External python modules" source "package/python-grpc-requests/Config.in" source "package/python-grpcio/Config.in" source "package/python-grpcio-reflection/Config.in" + source "package/python-grpclib/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h11/Config.in" source "package/python-h2/Config.in" diff --git a/package/python-grpclib/Config.in b/package/python-grpclib/Config.in new file mode 100644 index 0000000000..42cc011097 --- /dev/null +++ b/package/python-grpclib/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_GRPCLIB + bool "python-grpclib" + select BR2_PACKAGE_PYTHON_H2 # runtime + select BR2_PACKAGE_PYTHON_MULTIDICT # runtime + help + Pure-Python gRPC implementation for asyncio. + + https://github.com/vmagamedov/grpclib diff --git a/package/python-grpclib/python-grpclib.hash b/package/python-grpclib/python-grpclib.hash new file mode 100644 index 0000000000..cc65209138 --- /dev/null +++ b/package/python-grpclib/python-grpclib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/grpclib/json +md5 60ce203e5b9f95de3d7e5721dbce2bd9 grpclib-0.4.7.tar.gz +sha256 2988ef57c02b22b7a2e8e961792c41ccf97efc2ace91ae7a5b0de03c363823c3 grpclib-0.4.7.tar.gz +# Locally computed sha256 checksums +sha256 6c7fa8cf9b94ad5043a6b550a0ffb98356e66100b69dd1cb8e1f82606b436e8e LICENSE.txt diff --git a/package/python-grpclib/python-grpclib.mk b/package/python-grpclib/python-grpclib.mk new file mode 100644 index 0000000000..0bec0a1879 --- /dev/null +++ b/package/python-grpclib/python-grpclib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-grpclib +# +################################################################################ + +PYTHON_GRPCLIB_VERSION = 0.4.7 +PYTHON_GRPCLIB_SOURCE = grpclib-$(PYTHON_GRPCLIB_VERSION).tar.gz +PYTHON_GRPCLIB_SITE = https://files.pythonhosted.org/packages/79/b9/55936e462a5925190d7427e880b3033601d1effd13809b483d13a926061a +PYTHON_GRPCLIB_SETUP_TYPE = setuptools +PYTHON_GRPCLIB_LICENSE = BSD-3-Clause +PYTHON_GRPCLIB_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 23 17:35:19 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 10:35:19 -0700 Subject: [Buildroot] [PATCH v2 2/2] package/python-betterproto: new package In-Reply-To: <20240223173519.2958847-1-james.hilliard1@gmail.com> References: <20240223173519.2958847-1-james.hilliard1@gmail.com> Message-ID: <20240223173519.2958847-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-betterproto/Config.in | 7 +++++++ package/python-betterproto/python-betterproto.hash | 5 +++++ package/python-betterproto/python-betterproto.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-betterproto/Config.in create mode 100644 package/python-betterproto/python-betterproto.hash create mode 100644 package/python-betterproto/python-betterproto.mk diff --git a/package/Config.in b/package/Config.in index 2ddaadae69..f49c3543b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1006,6 +1006,7 @@ menu "External python modules" source "package/python-backcall/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" + source "package/python-betterproto/Config.in" source "package/python-bidict/Config.in" source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" diff --git a/package/python-betterproto/Config.in b/package/python-betterproto/Config.in new file mode 100644 index 0000000000..9ed72dd39b --- /dev/null +++ b/package/python-betterproto/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_BETTERPROTO + bool "python-betterproto" + select BR2_PACKAGE_PYTHON_GRPCLIB # runtime + help + A better Protobuf / gRPC generator & library. + + http://github.com/danielgtaylor/python-betterproto diff --git a/package/python-betterproto/python-betterproto.hash b/package/python-betterproto/python-betterproto.hash new file mode 100644 index 0000000000..8d23d2ae56 --- /dev/null +++ b/package/python-betterproto/python-betterproto.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/betterproto/json +md5 bd4192c2997959100097479c34ff87e6 betterproto-2.0.0b6.tar.gz +sha256 720ae92697000f6fcf049c69267d957f0871654c8b0d7458906607685daee784 betterproto-2.0.0b6.tar.gz +# Locally computed sha256 checksums +sha256 a5b8df75467e4b57a308a94cce5fdae84808a83ee6cd5af7e175c6b9784a753f LICENSE.md diff --git a/package/python-betterproto/python-betterproto.mk b/package/python-betterproto/python-betterproto.mk new file mode 100644 index 0000000000..95caf0945a --- /dev/null +++ b/package/python-betterproto/python-betterproto.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-betterproto +# +################################################################################ + +PYTHON_BETTERPROTO_VERSION = 2.0.0b6 +PYTHON_BETTERPROTO_SOURCE = betterproto-$(PYTHON_BETTERPROTO_VERSION).tar.gz +PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/45/43/4c44efd75f2ef48a16b458c2fe2cff7aa74bab8fcadf2653bb5110a87f97 +PYTHON_BETTERPROTO_SETUP_TYPE = setuptools +PYTHON_BETTERPROTO_LICENSE = MIT +PYTHON_BETTERPROTO_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 23 18:05:32 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 11:05:32 -0700 Subject: [Buildroot] [PATCH v3 1/2] package/python-grpclib: new package Message-ID: <20240223180533.3011424-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - add missing h2/multidict runtime dependencies --- package/Config.in | 1 + package/python-grpclib/Config.in | 8 ++++++++ package/python-grpclib/python-grpclib.hash | 5 +++++ package/python-grpclib/python-grpclib.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-grpclib/Config.in create mode 100644 package/python-grpclib/python-grpclib.hash create mode 100644 package/python-grpclib/python-grpclib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..2ddaadae69 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1114,6 +1114,7 @@ menu "External python modules" source "package/python-grpc-requests/Config.in" source "package/python-grpcio/Config.in" source "package/python-grpcio-reflection/Config.in" + source "package/python-grpclib/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h11/Config.in" source "package/python-h2/Config.in" diff --git a/package/python-grpclib/Config.in b/package/python-grpclib/Config.in new file mode 100644 index 0000000000..42cc011097 --- /dev/null +++ b/package/python-grpclib/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_GRPCLIB + bool "python-grpclib" + select BR2_PACKAGE_PYTHON_H2 # runtime + select BR2_PACKAGE_PYTHON_MULTIDICT # runtime + help + Pure-Python gRPC implementation for asyncio. + + https://github.com/vmagamedov/grpclib diff --git a/package/python-grpclib/python-grpclib.hash b/package/python-grpclib/python-grpclib.hash new file mode 100644 index 0000000000..cc65209138 --- /dev/null +++ b/package/python-grpclib/python-grpclib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/grpclib/json +md5 60ce203e5b9f95de3d7e5721dbce2bd9 grpclib-0.4.7.tar.gz +sha256 2988ef57c02b22b7a2e8e961792c41ccf97efc2ace91ae7a5b0de03c363823c3 grpclib-0.4.7.tar.gz +# Locally computed sha256 checksums +sha256 6c7fa8cf9b94ad5043a6b550a0ffb98356e66100b69dd1cb8e1f82606b436e8e LICENSE.txt diff --git a/package/python-grpclib/python-grpclib.mk b/package/python-grpclib/python-grpclib.mk new file mode 100644 index 0000000000..0bec0a1879 --- /dev/null +++ b/package/python-grpclib/python-grpclib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-grpclib +# +################################################################################ + +PYTHON_GRPCLIB_VERSION = 0.4.7 +PYTHON_GRPCLIB_SOURCE = grpclib-$(PYTHON_GRPCLIB_VERSION).tar.gz +PYTHON_GRPCLIB_SITE = https://files.pythonhosted.org/packages/79/b9/55936e462a5925190d7427e880b3033601d1effd13809b483d13a926061a +PYTHON_GRPCLIB_SETUP_TYPE = setuptools +PYTHON_GRPCLIB_LICENSE = BSD-3-Clause +PYTHON_GRPCLIB_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 23 18:05:33 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 11:05:33 -0700 Subject: [Buildroot] [PATCH v3 2/2] package/python-betterproto: new package In-Reply-To: <20240223180533.3011424-1-james.hilliard1@gmail.com> References: <20240223180533.3011424-1-james.hilliard1@gmail.com> Message-ID: <20240223180533.3011424-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v2 -> v3: - add missing python-datetime runtime dependency --- package/Config.in | 1 + package/python-betterproto/Config.in | 8 ++++++++ package/python-betterproto/python-betterproto.hash | 5 +++++ package/python-betterproto/python-betterproto.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-betterproto/Config.in create mode 100644 package/python-betterproto/python-betterproto.hash create mode 100644 package/python-betterproto/python-betterproto.mk diff --git a/package/Config.in b/package/Config.in index 2ddaadae69..f49c3543b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1006,6 +1006,7 @@ menu "External python modules" source "package/python-backcall/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" + source "package/python-betterproto/Config.in" source "package/python-bidict/Config.in" source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" diff --git a/package/python-betterproto/Config.in b/package/python-betterproto/Config.in new file mode 100644 index 0000000000..8548fd43ba --- /dev/null +++ b/package/python-betterproto/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_BETTERPROTO + bool "python-betterproto" + select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_GRPCLIB # runtime + help + A better Protobuf / gRPC generator & library. + + http://github.com/danielgtaylor/python-betterproto diff --git a/package/python-betterproto/python-betterproto.hash b/package/python-betterproto/python-betterproto.hash new file mode 100644 index 0000000000..8d23d2ae56 --- /dev/null +++ b/package/python-betterproto/python-betterproto.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/betterproto/json +md5 bd4192c2997959100097479c34ff87e6 betterproto-2.0.0b6.tar.gz +sha256 720ae92697000f6fcf049c69267d957f0871654c8b0d7458906607685daee784 betterproto-2.0.0b6.tar.gz +# Locally computed sha256 checksums +sha256 a5b8df75467e4b57a308a94cce5fdae84808a83ee6cd5af7e175c6b9784a753f LICENSE.md diff --git a/package/python-betterproto/python-betterproto.mk b/package/python-betterproto/python-betterproto.mk new file mode 100644 index 0000000000..95caf0945a --- /dev/null +++ b/package/python-betterproto/python-betterproto.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-betterproto +# +################################################################################ + +PYTHON_BETTERPROTO_VERSION = 2.0.0b6 +PYTHON_BETTERPROTO_SOURCE = betterproto-$(PYTHON_BETTERPROTO_VERSION).tar.gz +PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/45/43/4c44efd75f2ef48a16b458c2fe2cff7aa74bab8fcadf2653bb5110a87f97 +PYTHON_BETTERPROTO_SETUP_TYPE = setuptools +PYTHON_BETTERPROTO_LICENSE = MIT +PYTHON_BETTERPROTO_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) -- 2.34.1 From Noreply at busybox.net Fri Feb 23 18:42:57 2024 From: Noreply at busybox.net (Noreply at busybox.net) Date: 23 Feb 2024 10:42:57 -0800 Subject: [Buildroot] E-mail Account Verification For buildroot@busybox.net !!! Message-ID: <20240223104256.E69E2BCB2D2FE7FE@busybox.net> An HTML attachment was scrubbed... URL: From dannenberg at ti.com Fri Feb 23 19:31:36 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Fri, 23 Feb 2024 13:31:36 -0600 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <1a7ab8e6-bd43-4191-ad95-12e40f3a5c51@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> <20240220004100.3yzqapeplx6olarz@dasso> <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> <20240220200414.2bsvqvaeltqhsulc@dasso> <1a7ab8e6-bd43-4191-ad95-12e40f3a5c51@smile.fr> Message-ID: <20240223193136.sod3vx4t3pkqfcqd@dasso> Hi Romain, On Tue, Feb 20, 2024 at 10:36:51PM +0100, Romain Naour wrote: > >> About existing boot flow, I found two recent commit in u-boot that state that > >> the "Split binary" (that requires sysfw.itb) is already a legacy boot flow: > > > > It's called "legacy boot flow" because it was the boot flow used on the > > first K3 devices that were released (AM65x, J721E). This boot flow was > > not used on follow-on devices. The characteristics of this boot flow is > > that the initial FW image that gets loaded (tiboot3.bin) doesn't contain > > any device firmwares, but only a bootloader (such as U-Boot SPL). Then > > this boot loader will load the System Firmware firmware + config data > > blob (sysfw.itb) into the dedicated core (called "DMSC" = Device Manager > > and Security Controller). And then addiitonal boot stages will be > > loaded. These devices require this boot flow, and with this it is > > required to be supported by U-Boot (and any Linux distribution or build > > systems that build on that). > > > > TI is still making/selling those "legacy boot flow" devices, and will > > continue to do so for a very long time. One promiment community > > incarnation that you are probably aware of is the BeagleBone AI-64. > > Thank you for the detailed explanation! > > I previouly worked on a AM57xx SoC that is nowaday legacy SoC, the latest > ti-kernel 6.1 doesn't support some of the driver that where available in > ti-kernel 5.10 (prueth 100M, RPMsg Sockets over virtio-rpmsg transport (use for > ARM-DSP IPC3.x), TI-RTOS (the csl-common package was also removed from meta-ti)). > > Also the TI SDK on this plateform doesn't seems very active [1]. since you brought this up I wanted to add some additional context here. Older devices like AM57xx (AM335x and AM437x fall into the same bucket) will get what we call "LTS refresh SDKs" every year, rather than multiple drops per year as we do for the more recent devices. As for AM57xx specifically that refresh is currently targeted for e/o March 2024 and will be known as "SDK 9.2". There shouldn't be any feature regressions, and the only "new" thing (in addition to an all-refreshed SW baseline with 6.1 kernel and 2023.04 U-Boot) will be some Y2K38 issue fix on Linux. TI will be making and selling those devices for a very long time to come, and the annual refresh is seen as a good compromise between keeping things refreshed periodically and up to date while limiting the amount of repeat work/effort. -- Andreas Dannenberg Texas Instruments Inc From flavio.tapajos at newtesc.com.br Fri Feb 23 20:13:53 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Fri, 23 Feb 2024 17:13:53 -0300 Subject: [Buildroot] =?utf-8?q?=5BPATCH_1/2=5D_DEVELOPERS=3A_add_Fl=C3=A1?= =?utf-8?q?vio_Tapaj=C3=B3s_for_python-paho-mqtt?= Message-ID: <20240223201354.478070-1-flavio.tapajos@newtesc.com.br> Signed-off-by: Fl?vio Tapaj?s --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0f065bfafb..e0484c04b0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1077,6 +1077,7 @@ F: package/python-pymodbus/ N: Fl?vio Tapaj?s F: configs/asus_tinker-s_rk3288_defconfig F: board/asus/tinker-s/ +F: package/python-paho-mqtt/ F: package/python-sqlalchemy/ F: package/rsyslog/ -- 2.43.2 From flavio.tapajos at newtesc.com.br Fri Feb 23 20:13:54 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Fri, 23 Feb 2024 17:13:54 -0300 Subject: [Buildroot] [PATCH 2/2] package/python-paho-mqtt: bump version to 2.0.0 In-Reply-To: <20240223201354.478070-1-flavio.tapajos@newtesc.com.br> References: <20240223201354.478070-1-flavio.tapajos@newtesc.com.br> Message-ID: <20240223201354.478070-2-flavio.tapajos@newtesc.com.br> Signed-off-by: Fl?vio Tapaj?s --- package/python-paho-mqtt/python-paho-mqtt.hash | 2 +- package/python-paho-mqtt/python-paho-mqtt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-paho-mqtt/python-paho-mqtt.hash b/package/python-paho-mqtt/python-paho-mqtt.hash index 81b9dda81d..29d4dfc77d 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.hash +++ b/package/python-paho-mqtt/python-paho-mqtt.hash @@ -1,5 +1,5 @@ # locally computed -sha256 6e35c1be242a901fc9c00bad7d37b5cc4a497f398dfceb4ed0d8018a959be650 python-paho-mqtt-1.6.1.tar.gz +sha256 63e9f2f9f2e3a6345b2a50010ecdbbcfda6cb1f5cff73a2f39528dac8debd1d0 python-paho-mqtt-2.0.0.tar.gz sha256 66408b049249c3bdb0ba1ed285f5422ce67e371d40151bebd4d806af454ffe7c LICENSE.txt sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 sha256 8c349f80764d0648e645f41ef23772a70c995a0924b5235f735f4a3d09df127c epl-v20 diff --git a/package/python-paho-mqtt/python-paho-mqtt.mk b/package/python-paho-mqtt/python-paho-mqtt.mk index f255a7847d..b9180e3ba0 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.mk +++ b/package/python-paho-mqtt/python-paho-mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PAHO_MQTT_VERSION = 1.6.1 +PYTHON_PAHO_MQTT_VERSION = 2.0.0 PYTHON_PAHO_MQTT_SITE = $(call github,eclipse,paho.mqtt.python,v$(PYTHON_PAHO_MQTT_VERSION)) PYTHON_PAHO_MQTT_LICENSE = EPL-2.0, EDLv1.0 PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 -- 2.43.2 From kazemi.ms at gmail.com Fri Feb 23 20:30:31 2024 From: kazemi.ms at gmail.com (Saeed Kazemi) Date: Fri, 23 Feb 2024 21:30:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/fd: new package Message-ID: <20240223203031.825112-1-kazemi.ms@gmail.com> A simple, fast and user-friendly alternative to 'find' https://github.com/sharkdp/fd.git Signed-off-by: Saeed Kazemi --- DEVELOPERS | 1 + package/Config.in | 1 + package/fd/Config.in | 12 ++++++++++++ package/fd/fd.hash | 4 ++++ package/fd/fd.mk | 12 ++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/fd/Config.in create mode 100644 package/fd/fd.hash create mode 100644 package/fd/fd.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0f065bfafb..bf022512a5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2731,6 +2731,7 @@ F: package/biosdevname/ N: Saeed Kazemi F: package/eza/ +F: package/fd/ F: package/procs/ N: Sam Lancia diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..090fa80a29 100644 --- a/package/Config.in +++ b/package/Config.in @@ -182,6 +182,7 @@ menu "Development tools" source "package/diffutils/Config.in" source "package/dos2unix/Config.in" source "package/findutils/Config.in" + source "package/fd/Config.in" source "package/flex/Config.in" source "package/gawk/Config.in" source "package/gettext/Config.in" diff --git a/package/fd/Config.in b/package/fd/Config.in new file mode 100644 index 0000000000..10f295cb20 --- /dev/null +++ b/package/fd/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_FD + bool "fd" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + fd is a program to find entries in your filesystem. It is a + simple, fast and user-friendly alternative to find. While it + does not aim to support all of find's powerful functionality, + it provides sensible (opinionated) defaults for a majority of + use cases. + + https://github.com/sharkdp/fd.git diff --git a/package/fd/fd.hash b/package/fd/fd.hash new file mode 100644 index 0000000000..7950055efa --- /dev/null +++ b/package/fd/fd.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 49d57704f1a75b20a770d50538818ec003f42a5c19a39a682639b5e72e72ee7d fd-9.0.0.tar.gz +sha256 73c83c60d817e7df1943cb3f0af81e4939a8352c9a96c2fd00451b1116fa635c LICENSE-APACHE +sha256 322cfc7aa0c774d0eca3b2610f1d414de3ddbd7d8dd4b9dea941a13a6eb07455 LICENSE-MIT diff --git a/package/fd/fd.mk b/package/fd/fd.mk new file mode 100644 index 0000000000..316da418ea --- /dev/null +++ b/package/fd/fd.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# fd +# +################################################################################ + +FD_VERSION = 9.0.0 +FD_SITE = $(call github,sharkdp,fd,v$(FD_VERSION)) +FD_LICENSE = Apache-2.0 or MIT +FD_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) -- 2.34.1 From wilfred.mallawa at wdc.com Sat Feb 24 00:28:44 2024 From: wilfred.mallawa at wdc.com (Wilfred Mallawa) Date: Sat, 24 Feb 2024 10:28:44 +1000 Subject: [Buildroot] [PATCH 1/1] package/spdm-utils: new package Message-ID: <20240224002843.16382-2-wilfred.mallawa@wdc.com> Signed-off-by: Alistair Francis Signed-off-by: Wilfred Mallawa --- package/Config.in | 1 + package/spdm-utils/Config.in | 20 ++++++++++++++++++ package/spdm-utils/spdm-utils.hash | 2 ++ package/spdm-utils/spdm-utils.mk | 34 ++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 package/spdm-utils/Config.in create mode 100644 package/spdm-utils/spdm-utils.hash create mode 100644 package/spdm-utils/spdm-utils.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..11075d08c3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2697,6 +2697,7 @@ comment "Utilities" source "package/screenfetch/Config.in" source "package/sexpect/Config.in" source "package/sudo/Config.in" + source "package/spdm-utils/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" source "package/tini/Config.in" diff --git a/package/spdm-utils/Config.in b/package/spdm-utils/Config.in new file mode 100644 index 0000000000..6729cbde90 --- /dev/null +++ b/package/spdm-utils/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SPDM_UTILS + bool "spdm-utils" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_USE_WCHAR # eudev + depends on !BR2_STATIC_LIBS + depends on BR2_USE_MMU # eudev + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_EUDEV + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_LIBSPDM + help + SPDM-Utils is a Linux application designed to support, + test and develop SPDM requesters and responders. + SPDM-Utils uses libspdm as the backend to perform SPDM + communication. SPDM-Utils currently supports the + PCIe Data Object Exchange (DOE) Capability. + + https://github.com/westerndigitalcorporation/spdm-utils \ No newline at end of file diff --git a/package/spdm-utils/spdm-utils.hash b/package/spdm-utils/spdm-utils.hash new file mode 100644 index 0000000000..0b4e5d2eea --- /dev/null +++ b/package/spdm-utils/spdm-utils.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4bb5ac80ccac3928a6b6d15266e260bbc103d07c543b054664aac42a5472b7a6 spdm-utils-0.1.1.tar.gz diff --git a/package/spdm-utils/spdm-utils.mk b/package/spdm-utils/spdm-utils.mk new file mode 100644 index 0000000000..7574ea9b11 --- /dev/null +++ b/package/spdm-utils/spdm-utils.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# spdm-utils +# +################################################################################ + +SPDM_UTILS_VERSION = 0.1.1 +SPDM_UTILS_SITE = $(call github,westerndigitalcorporation,spdm-utils,v$(SPDM_UTILS_VERSION)) +SPDM_UTILS_LICENSE = Apache-2.0 or MIT +SPDM_UTILS_POST_INSTALL_TARGET_HOOKS += SPDM_UTILS_INSTALL_CERTS +SPDM_UTILS_DEPENDENCIES += pciutils libspdm openssl + +# Force PyO3 to configure as a cross-compilation +export PYO3_CROSS=1 + +define SPDM_UTILS_INSTALL_CERTS + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/certs + cp -r $(@D)/certs/generate_certs.sh $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/openssl-alias.cnf $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/openssl.cnf $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/setup_certs.sh $(TARGET_DIR)/root/certs/ + + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/immutable.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.cert.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.key $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/param.pem $(TARGET_DIR)/root/certs/slot0 + + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/manifest + cp $(@D)/manifest/manifest.out.cbor $(TARGET_DIR)/root/manifest +endef + +$(eval $(cargo-package)) -- 2.43.2 From wilfred.mallawa at wdc.com Sat Feb 24 00:39:59 2024 From: wilfred.mallawa at wdc.com (Wilfred Mallawa) Date: Sat, 24 Feb 2024 10:39:59 +1000 Subject: [Buildroot] [PATCH v2 1/1] package/spdm-utils: new package Message-ID: <20240224003958.21174-2-wilfred.mallawa@wdc.com> Signed-off-by: Alistair Francis Signed-off-by: Wilfred Mallawa --- Changes in V2: - Fixes errors found by `check-package` --- package/Config.in | 1 + package/spdm-utils/Config.in | 20 ++++++++++++++++++ package/spdm-utils/spdm-utils.hash | 2 ++ package/spdm-utils/spdm-utils.mk | 34 ++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 package/spdm-utils/Config.in create mode 100644 package/spdm-utils/spdm-utils.hash create mode 100644 package/spdm-utils/spdm-utils.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..337c68725f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2696,6 +2696,7 @@ comment "Utilities" source "package/screen/Config.in" source "package/screenfetch/Config.in" source "package/sexpect/Config.in" + source "package/spdm-utils/Config.in" source "package/sudo/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" diff --git a/package/spdm-utils/Config.in b/package/spdm-utils/Config.in new file mode 100644 index 0000000000..97dbc51c6d --- /dev/null +++ b/package/spdm-utils/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SPDM_UTILS + bool "spdm-utils" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_USE_WCHAR # eudev + depends on !BR2_STATIC_LIBS + depends on BR2_USE_MMU # eudev + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_EUDEV + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_LIBSPDM + help + SPDM-Utils is a Linux application designed to support, + test and develop SPDM requesters and responders. + SPDM-Utils uses libspdm as the backend to perform SPDM + communication. SPDM-Utils currently supports the + PCIe Data Object Exchange (DOE) Capability. + + https://github.com/westerndigitalcorporation/spdm-utils diff --git a/package/spdm-utils/spdm-utils.hash b/package/spdm-utils/spdm-utils.hash new file mode 100644 index 0000000000..0d424913f2 --- /dev/null +++ b/package/spdm-utils/spdm-utils.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4bb5ac80ccac3928a6b6d15266e260bbc103d07c543b054664aac42a5472b7a6 spdm-utils-0.1.1.tar.gz diff --git a/package/spdm-utils/spdm-utils.mk b/package/spdm-utils/spdm-utils.mk new file mode 100644 index 0000000000..7574ea9b11 --- /dev/null +++ b/package/spdm-utils/spdm-utils.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# spdm-utils +# +################################################################################ + +SPDM_UTILS_VERSION = 0.1.1 +SPDM_UTILS_SITE = $(call github,westerndigitalcorporation,spdm-utils,v$(SPDM_UTILS_VERSION)) +SPDM_UTILS_LICENSE = Apache-2.0 or MIT +SPDM_UTILS_POST_INSTALL_TARGET_HOOKS += SPDM_UTILS_INSTALL_CERTS +SPDM_UTILS_DEPENDENCIES += pciutils libspdm openssl + +# Force PyO3 to configure as a cross-compilation +export PYO3_CROSS=1 + +define SPDM_UTILS_INSTALL_CERTS + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/certs + cp -r $(@D)/certs/generate_certs.sh $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/openssl-alias.cnf $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/openssl.cnf $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/setup_certs.sh $(TARGET_DIR)/root/certs/ + + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/immutable.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.cert.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.key $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/param.pem $(TARGET_DIR)/root/certs/slot0 + + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/manifest + cp $(@D)/manifest/manifest.out.cbor $(TARGET_DIR)/root/manifest +endef + +$(eval $(cargo-package)) -- 2.43.2 From bernd at kuhls.net Sat Feb 24 08:03:00 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 09:03:00 +0100 Subject: [Buildroot] [PATCH 3/3] package/kodi-inputstream-adaptive: bump version to 20.3.18-Nexus In-Reply-To: <20240224080300.23278-1-bernd@kuhls.net> References: <20240224080300.23278-1-bernd@kuhls.net> Message-ID: <20240224080300.23278-3-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index e38191c0c4..3de6886ffd 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 f67cfef057f8842716db4521a8cd3966c37a1da8fc3fb297527f6f25be20688a kodi-inputstream-adaptive-20.3.17-Nexus.tar.gz +sha256 0755b27612d44d372bfe2b9fa32e47af616008287998d4b77ae70bcfb782cef9 kodi-inputstream-adaptive-20.3.18-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index ba4f6de61a..c721df07d1 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.17-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.18-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ -- 2.39.2 From bernd at kuhls.net Sat Feb 24 08:02:58 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 09:02:58 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi-pvr-hts: bump version to 20.7.1-Nexus Message-ID: <20240224080300.23278-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index a268940b0e..facfbecc37 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 15d68d928e0794fb42fd0f3483403fb0290c5c94aa3d3b648a8a2f8e8316dfff kodi-pvr-hts-20.7.0-Nexus.tar.gz +sha256 d4aa99a8490f6743e950f9ff60522203458f85c86f7d58f54de7144f525e45af kodi-pvr-hts-20.7.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index c56d0e0546..2415b151c3 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 20.7.0-Nexus +KODI_PVR_HTS_VERSION = 20.7.1-Nexus KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md -- 2.39.2 From bernd at kuhls.net Sat Feb 24 08:02:59 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 09:02:59 +0100 Subject: [Buildroot] [PATCH 2/3] package/kodi-pvr-mythtv: bump version to 20.6.8-Nexus In-Reply-To: <20240224080300.23278-1-bernd@kuhls.net> References: <20240224080300.23278-1-bernd@kuhls.net> Message-ID: <20240224080300.23278-2-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index c61c391825..77c4274843 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb21e185d1333a8696565138bc58df3d37970c9a3615193396e9f296a56a24c4 kodi-pvr-mythtv-20.5.10-Nexus.tar.gz +sha256 64358b8af46d44e98da4bc111eacc294e679abc96662a2c5f14728f097f31f86 kodi-pvr-mythtv-20.6.8-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 66f1948741..7598f064e8 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.5.10-Nexus +KODI_PVR_MYTHTV_VERSION = 20.6.8-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.39.2 From bernd at kuhls.net Sat Feb 24 08:23:12 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 09:23:12 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240224082312.33187-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 773cb4fbb5..07d6b2b5ec 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.18" 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 52fb480af2..15c0dc8d3d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz -sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz +sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz +sha256 faa49ca22fb55ed4d5ca2a55e07dd10e4e171cfc3b92568a631453cd2068b39b linux-6.1.79.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz -sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz -sha256 afc8aca6cb56fea489f6508bc24357df1cf8a8f3d7dcfbcccd94b7f968492620 linux-5.4.268.tar.xz +sha256 bd84809a367eb400eb04e0e70294e6ba12fc03b6bfb5a7dfaca548f8947501b0 linux-5.15.149.tar.xz +sha256 4ea63c5a90fdc3c459ab35c11ee8c93d2364a7cdbfb101100f8cab70d490ef6d linux-5.10.210.tar.xz +sha256 ff54bec6d053c7994f3bb8c45021de2858ff9f740d2ccbbcf072b87821a918cf linux-5.4.269.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 b91be40fa61ff7d42958e2154a4b7602dc071982128b9b58b6d911dec111be19 linux-4.19.306.tar.xz +sha256 83eeff613405d0045d0f717c6ac14c178678fe0a163c41d9dd8878ac0f73e352 linux-4.19.307.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 69857566e3..63e82c49df 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.306" if BR2_KERNEL_HEADERS_4_19 - default "5.4.268" if BR2_KERNEL_HEADERS_5_4 - default "5.10.209" if BR2_KERNEL_HEADERS_5_10 - default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.77" if BR2_KERNEL_HEADERS_6_1 - default "6.6.16" if BR2_KERNEL_HEADERS_6_6 + default "4.19.307" if BR2_KERNEL_HEADERS_4_19 + default "5.4.269" if BR2_KERNEL_HEADERS_5_4 + default "5.10.210" if BR2_KERNEL_HEADERS_5_10 + default "5.15.149" if BR2_KERNEL_HEADERS_5_15 + default "6.1.79" if BR2_KERNEL_HEADERS_6_1 + default "6.6.18" if BR2_KERNEL_HEADERS_6_6 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 \ -- 2.39.2 From peter at korsgaard.com Sat Feb 24 10:13:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:13:43 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series In-Reply-To: <20240224082312.33187-1-bernd@kuhls.net> (Bernd Kuhls's message of "Sat, 24 Feb 2024 09:23:12 +0100") References: <20240224082312.33187-1-bernd@kuhls.net> Message-ID: <87msrquq3s.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:13:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:13:55 +0100 Subject: [Buildroot] [PATCH] package/libuv: security bump to version 1.48 In-Reply-To: <20240222131628.3479059-1-buildroot@bubu1.eu> (Marcus Hoffmann via buildroot's message of "Thu, 22 Feb 2024 14:16:27 +0100") References: <20240222131628.3479059-1-buildroot@bubu1.eu> Message-ID: <87il2euq3g.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Fixes: CVE-2024-24806 / GHSA-f74f-cvh7-c6q6 [1] > Release Notes: https://github.com/libuv/libuv/releases/tag/v1.48.0 > Full Changelog: https://github.com/libuv/libuv/blob/v1.48.0/ChangeLog > [1]: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6 > Signed-off-by: Marcus Hoffmann Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:14:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:14:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch In-Reply-To: <20240222135550.3428952-1-vfazio@gmail.com> (Vincent Fazio's message of "Thu, 22 Feb 2024 07:55:50 -0600") References: <20240222135550.3428952-1-vfazio@gmail.com> Message-ID: <87edd2uq24.fsf@48ers.dk> >>>>> "Vincent" == Vincent Fazio writes: > Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was > merged and introduced a patch to 10.4.0 that was not accounted for by > the patch that dropped 10.4.0 support. > Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x") > Signed-off-by: Vincent Fazio Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:15:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:15:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/c-ares: security bump to version 1.27.0 In-Reply-To: <20240223172850.559363-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 23 Feb 2024 18:28:50 +0100") References: <20240223172850.559363-1-fontaine.fabrice@gmail.com> Message-ID: <87a5nquq0r.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2024-25629: Reading malformatted /etc/resolv.conf, > /etc/nsswitch.conf or the HOSTALIASES file could result in a crash. > https://github.com/c-ares/c-ares/security/advisories/GHSA-mg26-v6qh-x48q > https://github.com/c-ares/c-ares/releases/tag/cares-1_27_0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:16:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:16:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: security bump to version 20.11.1 In-Reply-To: <20240221220343.1228278-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 21 Feb 2024 23:03:43 +0100") References: <20240221220343.1228278-1-fontaine.fabrice@gmail.com> Message-ID: <875xyeupzk.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2024-21892, CVE-2024-22019, CVE-2024-21896, CVE-2024-22017, > CVE-2023-46809, CVE-2024-21891, CVE-2024-21890 and CVE-2024-22025 > - LICENSE hash changed due to two things: > * c-ares vendored dependency license got updated [1]. This is unused > by buildroot though anyway > * base64 vendored library license updated copyright years and sorted > contributor names [2], [3] > - This bump will fix the following build failure raised since bump of > python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14 > thanks to > https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6 > https://github.com/nodejs/node/commit/6557c1c9b1206a85bb7d8e7450e8c3a4cff7c84b: > Traceback (most recent call last): > File "/home/autobuild/autobuild/instance-2/output-1/build/host-nodejs-src-20.9.0/configure.py", line 17, in > from distutils.version import StrictVersion > ModuleNotFoundError: No module named 'distutils' > https://github.com/nodejs/node/blob/v20.11.1/CHANGELOG.md > [1] https://github.com/c-ares/c-ares/pull/556 > [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd > [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b > Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 > - http://autobuild.buildroot.org/results/8b38bc4b7879a0349c1305e2fcb458a0cfd04a93 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:17:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:17:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.19.5 In-Reply-To: <20240221203153.3428611-1-bernd@kuhls.net> (Bernd Kuhls's message of "Wed, 21 Feb 2024 21:31:53 +0100") References: <20240221203153.3428611-1-bernd@kuhls.net> Message-ID: <871q92upxs.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.samba.org/samba/history/samba-4.19.5.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:12:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:12:27 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240224101749.1E3DB87A11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05ca551c3b4b88c7a97cfc7a8dc3971ecd33c7de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 773cb4fbb5..07d6b2b5ec 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.18" 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 52fb480af2..15c0dc8d3d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz -sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz +sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz +sha256 faa49ca22fb55ed4d5ca2a55e07dd10e4e171cfc3b92568a631453cd2068b39b linux-6.1.79.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz -sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz -sha256 afc8aca6cb56fea489f6508bc24357df1cf8a8f3d7dcfbcccd94b7f968492620 linux-5.4.268.tar.xz +sha256 bd84809a367eb400eb04e0e70294e6ba12fc03b6bfb5a7dfaca548f8947501b0 linux-5.15.149.tar.xz +sha256 4ea63c5a90fdc3c459ab35c11ee8c93d2364a7cdbfb101100f8cab70d490ef6d linux-5.10.210.tar.xz +sha256 ff54bec6d053c7994f3bb8c45021de2858ff9f740d2ccbbcf072b87821a918cf linux-5.4.269.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 b91be40fa61ff7d42958e2154a4b7602dc071982128b9b58b6d911dec111be19 linux-4.19.306.tar.xz +sha256 83eeff613405d0045d0f717c6ac14c178678fe0a163c41d9dd8878ac0f73e352 linux-4.19.307.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 69857566e3..63e82c49df 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.306" if BR2_KERNEL_HEADERS_4_19 - default "5.4.268" if BR2_KERNEL_HEADERS_5_4 - default "5.10.209" if BR2_KERNEL_HEADERS_5_10 - default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.77" if BR2_KERNEL_HEADERS_6_1 - default "6.6.16" if BR2_KERNEL_HEADERS_6_6 + default "4.19.307" if BR2_KERNEL_HEADERS_4_19 + default "5.4.269" if BR2_KERNEL_HEADERS_5_4 + default "5.10.210" if BR2_KERNEL_HEADERS_5_10 + default "5.15.149" if BR2_KERNEL_HEADERS_5_15 + default "6.1.79" if BR2_KERNEL_HEADERS_6_1 + default "6.6.18" if BR2_KERNEL_HEADERS_6_6 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 \ From peter at korsgaard.com Sat Feb 24 10:12:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:12:53 +0100 Subject: [Buildroot] [git commit] package/libuv: security bump to version 1.48 Message-ID: <20240224101749.5485787A17@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd2f99246c253739a3d44d8345f2fbb5362b3fb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: CVE-2024-24806 / GHSA-f74f-cvh7-c6q6 [1] Release Notes: https://github.com/libuv/libuv/releases/tag/v1.48.0 Full Changelog: https://github.com/libuv/libuv/blob/v1.48.0/ChangeLog [1]: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6 Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 1fd286d9e9..2ca8f64a80 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094 libuv-v1.46.0-dist.tar.gz +sha256 c593139feb9061699fdd2f7fde47bb6c1ca77761ae9ec04f052083f1ef46c13b libuv-v1.48.0-dist.tar.gz sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 76316484e4..5f96e98a98 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.46.0 +LIBUV_VERSION = 1.48.0 LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) LIBUV_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Sat Feb 24 10:17:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:17:08 +0100 Subject: [Buildroot] [git commit] package/samba4: bump version to 4.19.5 Message-ID: <20240224101749.5590587A0C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4a0ecaceabb7982abb0ed0cae9d468c286ddd12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.samba.org/samba/history/samba-4.19.5.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 3353221959..4e74e07bd0 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc -sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.5.tar.asc +sha256 0e2405b4cec29d0459621f4340a1a74af771ec7cffedff43250cad7f1f87605e samba-4.19.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 78c5db308d..0980d03175 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.4 +SAMBA4_VERSION = 4.19.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 24 10:13:25 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:13:25 +0100 Subject: [Buildroot] [git commit] package/gcc: remove orphaned 10.4.0 patch Message-ID: <20240224101749.330A287A09@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbedcfa221bc8826536a39b01eccf0626ab89bf1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was merged and introduced a patch to 10.4.0 that was not accounted for by the patch that dropped 10.4.0 support. Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x") Signed-off-by: Vincent Fazio Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...y-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 ---------------------- 1 file changed, 49 deletions(-) diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch deleted file mode 100644 index 7e9714e9cb..0000000000 --- a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Thu, 29 Sep 2022 15:32:39 +0100 -Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS - -This was found when testing buildroot with linuxthreads enabled. In -this case, the build passes --disable-tls to the toolchain during -configuration. After building the OpenRISC toolchain it was still -generating TLS code sequences and causing linker failures such as: - - ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl - ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' - -This patch fixes this by disabling tls for the OpenRISC target when requested -via --disable-tls. - -gcc/ChangeLog: - - * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if - HAVE_AS_TLS is defined. - -Tested-by: Yann E. MORIN - -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 - -[Bernd: backported to 10.4.0] -Signed-off-by: Bernd Kuhls ---- - gcc/config/or1k/or1k.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c -index da2f59062ba..0ce7b234417 100644 ---- a/gcc/config/or1k/or1k.c -+++ b/gcc/config/or1k/or1k.c -@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, - #undef TARGET_LEGITIMATE_ADDRESS_P - #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p - -+#ifdef HAVE_AS_TLS - #undef TARGET_HAVE_TLS - #define TARGET_HAVE_TLS true -+#endif - - #undef TARGET_HAVE_SPECULATION_SAFE_VALUE - #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed --- -2.39.3 - From peter at korsgaard.com Sat Feb 24 10:15:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:15:51 +0100 Subject: [Buildroot] [git commit] package/nodejs: security bump to version 20.11.1 Message-ID: <20240224101749.43FE187A15@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02ecb096ad874a1fecfc3a87ca7d547befb16d8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fix CVE-2024-21892, CVE-2024-22019, CVE-2024-21896, CVE-2024-22017, CVE-2023-46809, CVE-2024-21891, CVE-2024-21890 and CVE-2024-22025 - LICENSE hash changed due to two things: * c-ares vendored dependency license got updated [1]. This is unused by buildroot though anyway * base64 vendored library license updated copyright years and sorted contributor names [2], [3] - This bump will fix the following build failure raised since bump of python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14 thanks to https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6 https://github.com/nodejs/node/commit/6557c1c9b1206a85bb7d8e7450e8c3a4cff7c84b: Traceback (most recent call last): File "/home/autobuild/autobuild/instance-2/output-1/build/host-nodejs-src-20.9.0/configure.py", line 17, in from distutils.version import StrictVersion ModuleNotFoundError: No module named 'distutils' https://github.com/nodejs/node/blob/v20.11.1/CHANGELOG.md [1] https://github.com/c-ares/c-ares/pull/556 [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 - http://autobuild.buildroot.org/results/8b38bc4b7879a0349c1305e2fcb458a0cfd04a93 Signed-off-by: Fabrice Fontaine Reviewed-By: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 14 +++++++------- package/nodejs/nodejs.mk | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2d60437a7c..ddab345e0a 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.9.0/SHASUMS256.txt.asc -sha256 ced3ecece4b7c3a664bca3d9e34a0e3b9a31078525283a6fdb7ea2de8ca5683b node-v20.9.0-linux-arm64.tar.xz -sha256 64099d7e62bdbb8efd52c216a6759b3cdd77c38aa993096fdee9f875d95b2d8e node-v20.9.0-linux-armv7l.tar.xz -sha256 3c6cea5d614cfbb95d92de43fbc2f8ecd66e431502fe5efc4f3c02637897bd45 node-v20.9.0-linux-ppc64le.tar.xz -sha256 9033989810bf86220ae46b1381bdcdc6c83a0294869ba2ad39e1061f1e69217a node-v20.9.0-linux-x64.tar.xz -sha256 a23d96810abf0455426b349d47ce5310f33095b7bc0571b9cc510f481c3a4519 node-v20.9.0.tar.xz +# From https://nodejs.org/dist/v20.11.1/SHASUMS256.txt.asc +sha256 c957f29eb4e341903520caf362534f0acd1db7be79c502ae8e283994eed07fe1 node-v20.11.1-linux-arm64.tar.xz +sha256 28e0120d2d150a8f41717899d33167b8b32053778665583d49ff971bfd188d1b node-v20.11.1-linux-armv7l.tar.xz +sha256 51343cacf5cdf5c4b5e93e919d19dd373d6ef43d5f2c666eae299f26e31d08b5 node-v20.11.1-linux-ppc64le.tar.xz +sha256 d8dab549b09672b03356aa2257699f3de3b58c96e74eb26a8b495fbdc9cf6fbe node-v20.11.1-linux-x64.tar.xz +sha256 77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e node-v20.11.1.tar.xz # Locally calculated -sha256 93ac846282ce6c5255e00fada2fd2e7e292255239fe58d5502b0a554859e6a3e LICENSE +sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9806a64d38..858c6a86f5 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.9.0 +NODEJS_COMMON_VERSION = 20.11.1 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) From peter at korsgaard.com Sat Feb 24 10:15:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:15:20 +0100 Subject: [Buildroot] [git commit] package/c-ares: security bump to version 1.27.0 Message-ID: <20240224101749.3448487A0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66cfd29e97a00d5210da38fe45ea2effe23bea94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2024-25629: Reading malformatted /etc/resolv.conf, /etc/nsswitch.conf or the HOSTALIASES file could result in a crash. https://github.com/c-ares/c-ares/security/advisories/GHSA-mg26-v6qh-x48q https://github.com/c-ares/c-ares/releases/tag/cares-1_27_0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index ee097a53c9..9a2b69c731 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz +sha256 0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b c-ares-1.27.0.tar.gz # Hash for license file sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 29da6baa4b..c4441255a2 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.26.0 +C_ARES_VERSION = 1.27.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From fancp2007 at gmail.com Sat Feb 24 10:31:41 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Sat, 24 Feb 2024 18:31:41 +0800 Subject: [Buildroot] [PATCH v7] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <197750aa-c25f-44d9-89ac-872053953422@benettiengineering.com> References: <20240222130716.1311432-1-fancp2007@gmail.com> <20240223131603.2313178-1-fancp2007@gmail.com> <197750aa-c25f-44d9-89ac-872053953422@benettiengineering.com> Message-ID: Hi Giulio, The BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is for the ethernet port on the board. Without the config, the eth0 interface will be not accessible. The `ifconfig eth0` command will report error: Device not found Scott Fan On Sat, Feb 24, 2024 at 12:24?AM Giulio Benetti wrote: > > Hi Scott, > > On 23/02/24 14:15, Scott Fan wrote: > > [ SNIP ] > > > + > > +# System > > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > > What do you need MDEV by default for? Is there some peripheral that > needs to show up automatically otherwise the basic functionality is > compromised? > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas From fancp2007 at gmail.com Sat Feb 24 10:33:53 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Sat, 24 Feb 2024 18:33:53 +0800 Subject: [Buildroot] [PATCH] configs/friendlyarm_nanopi_r2s: bump Linux to 6.6.18 and U-Boot to 2024.01 Message-ID: <20240224103354.7763-1-fancp2007@gmail.com> The ATF firmware also bumps to version 2.7, and the bootloader image only needs the u-boot-rockchip.bin file. This commit adds support for internal ethernet port (RTL8211E), and also adds USB 3.0 ethernet port firmware for RTL8153B chip on the board. The associated board files are also updated, notes for the NEO3 board is removed from the readme file. The .checkpackageignore file is updated accordingly (the entry for post-build.sh is removed). Tested on the NanoPi R2S board. Wiki link for the board: https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S Signed-off-by: Scott Fan --- .checkpackageignore | 1 - board/friendlyarm/nanopi-r2s/extlinux.conf | 4 +-- board/friendlyarm/nanopi-r2s/genimage.cfg | 10 ++---- board/friendlyarm/nanopi-r2s/post-build.sh | 4 +-- board/friendlyarm/nanopi-r2s/readme.txt | 20 ++++------- configs/friendlyarm_nanopi_r2s_defconfig | 39 +++++++++++++++++----- 6 files changed, 43 insertions(+), 35 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 4967d749fa..08188dc23e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -33,7 +33,6 @@ board/cubietech/cubieboard2/post-image.sh Shellcheck board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck board/freescale/common/mxs/post-image.sh Shellcheck board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch Upstream -board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck board/hardkernel/odroidc2/post-image.sh Shellcheck board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables board/hardkernel/odroidxu4/post-image.sh EmptyLastLine Shellcheck diff --git a/board/friendlyarm/nanopi-r2s/extlinux.conf b/board/friendlyarm/nanopi-r2s/extlinux.conf index 1ea0cdd8a5..b2897dea8b 100644 --- a/board/friendlyarm/nanopi-r2s/extlinux.conf +++ b/board/friendlyarm/nanopi-r2s/extlinux.conf @@ -1,4 +1,4 @@ -label NanoPi R2S linux +label friendlyarm-nanopi-buildroot kernel /boot/Image devicetree /boot/rk3328-nanopi-r2s.dtb - append root=/dev/mmcblk0p1 rw rootwait + append console=ttyS2,1500000 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/friendlyarm/nanopi-r2s/genimage.cfg b/board/friendlyarm/nanopi-r2s/genimage.cfg index a686b4f14e..98e96a7ddd 100644 --- a/board/friendlyarm/nanopi-r2s/genimage.cfg +++ b/board/friendlyarm/nanopi-r2s/genimage.cfg @@ -4,19 +4,13 @@ image sdcard.img { partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "idbloader.img" + image = "u-boot-rockchip.bin" offset = 32K } - partition u-boot-dtb { - in-partition-table = "no" - image = "u-boot.itb" - offset = 8M - } - partition rootfs { partition-type = 0x83 - offset = 16M image = "rootfs.ext4" + offset = 10M } } diff --git a/board/friendlyarm/nanopi-r2s/post-build.sh b/board/friendlyarm/nanopi-r2s/post-build.sh index 1f5ff6a611..c7ec875068 100755 --- a/board/friendlyarm/nanopi-r2s/post-build.sh +++ b/board/friendlyarm/nanopi-r2s/post-build.sh @@ -1,5 +1,5 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" diff --git a/board/friendlyarm/nanopi-r2s/readme.txt b/board/friendlyarm/nanopi-r2s/readme.txt index 6d291cdd60..d43008b620 100644 --- a/board/friendlyarm/nanopi-r2s/readme.txt +++ b/board/friendlyarm/nanopi-r2s/readme.txt @@ -2,11 +2,11 @@ Intro ===== This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi R2S. With the current configuration +buildroot environment for the NanoPi R2S. With the current configuration it will bring-up the board, and allow access through the serial console. -Nanopi R2S link: -https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 +Wiki link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S This configuration uses ATF, U-Boot mainline and kernel mainline. @@ -25,9 +25,6 @@ Files created in output directory output/images ??? bl31.elf -??? boot.vfat -??? extlinux -??? idbloader.img ??? Image ??? rk3328-nanopi-r2s.dtb ??? rootfs.ext2 @@ -35,7 +32,7 @@ output/images ??? rootfs.tar ??? sdcard.img ??? u-boot.bin -??? u-boot.itb +??? u-boot-rockchip.bin How to write the SD card ======================== @@ -46,12 +43,7 @@ in the output/images/ directory. Copy the bootable "sdcard.img" onto an SD card with "dd": $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync + $ sync -Insert the micro SDcard in your Nanopi R2S and power it up. The console +Insert the micro SDcard in your NanoPi R2S and power it up. The console is on the serial line, 1500000 8N1. - -Notes -===== - -This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board. diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index 284b28ec31..76806e76e7 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -1,42 +1,65 @@ +# Architecture BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# System BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" +BR2_TARGET_UBOOT_SPL_NAME="u-boot-rockchip.bin" + +# Ethernet firmware for RTL8153B +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.34.1 From fancp2007 at gmail.com Sat Feb 24 10:55:53 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Sat, 24 Feb 2024 18:55:53 +0800 Subject: [Buildroot] [PATCH] configs/beaglebone_defconfig: bump Linux to 6.1.69-ti-r25 and U-Boot to 2024.01 Message-ID: <20240224105554.17996-1-fancp2007@gmail.com> Tested on beaglebone black. [1] https://github.com/beagleboard/linux/releases/tag/6.1.69-ti-r25 Signed-off-by: Scott Fan --- configs/beaglebone_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index e2d67019b1..cdd6591f6d 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.46-ti-r13)/linux-6.1.46-ti-r13.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.69-ti-r25)/linux-6.1.69-ti-r25.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bb.org" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" @@ -31,7 +31,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -- 2.34.1 From bernd at kuhls.net Sat Feb 24 11:59:22 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 12:59:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/cmake: bump version to 3.28.3 Message-ID: <20240224115922.234596-1-bernd@kuhls.net> Release notes: https://www.kitware.com/cmake-3-28-3-available-for-download/ https://www.kitware.com/cmake-3-28-2-available-for-download/ Signed-off-by: Bernd Kuhls --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 51fff6c3ef..74b4a0a3a8 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.28/cmake-3.28.1-SHA-256.txt -sha256 15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad cmake-3.28.1.tar.gz +# From https://cmake.org/files/v3.28/cmake-3.28.3-SHA-256.txt +sha256 72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1 cmake-3.28.3.tar.gz # Locally calculated sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 23d00b95c5..49d1f9fea5 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -6,7 +6,7 @@ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y CMAKE_VERSION_MAJOR = 3.28 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt -- 2.39.2 From bernd at kuhls.net Sat Feb 24 12:10:07 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 13:10:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/ccache: bump version to 4.9.1 Message-ID: <20240224121007.435474-1-bernd@kuhls.net> Removed patch which is included in this release. Updated license hash due to various version and copyright year bumps: https://github.com/ccache/ccache/commits/master/LICENSE.adoc Release notes: https://ccache.dev/releasenotes.html#_ccache_4_9_1 Signed-off-by: Bernd Kuhls --- ...-fix-Work-around-GCC-12.3-bug-109241.patch | 29 ------------------- package/ccache/ccache.hash | 4 +-- package/ccache/ccache.mk | 2 +- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch diff --git a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch deleted file mode 100644 index 42872597cd..0000000000 --- a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001 -From: Joel Rosdahl -Date: Tue, 1 Aug 2023 12:30:12 +0200 -Subject: [PATCH] fix: Work around GCC 12.3 bug 109241 - -See also #1289. - -Upstream: https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5 - -Signed-off-by: Bernd Kuhls ---- - src/storage/local/LocalStorage.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp -index 3e5abe5074..d0a904e553 100644 ---- a/src/storage/local/LocalStorage.cpp -+++ b/src/storage/local/LocalStorage.cpp -@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional level, - auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index); - l2_content_lock.make_long_lived(lock_manager); - if (!l2_content_lock.acquire()) { -- LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index); -+ // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241 -+ LOG_RAW(fmt::format( -+ "Failed to acquire content lock for {}/{}", l1_index, l2_index)); - return; - } - diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 736122e0ab..a2537077b6 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49 ccache-4.8.2.tar.xz +sha256 4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25 ccache-4.9.1.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt -sha256 55ce274f2b898dad70d3695ab13f82656fd455bd8fb6d1c85d6f7c453bef0b2e LICENSE.adoc +sha256 a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84 LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index ac4bc4aba5..1ac825439b 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 4.8.2 +CCACHE_VERSION = 4.9.1 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others -- 2.39.2 From fontaine.fabrice at gmail.com Sat Feb 24 13:57:17 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 24 Feb 2024 14:57:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/prboom: fix build with autoconf >= 2.72 Message-ID: <20240224135717.635374-1-fontaine.fabrice@gmail.com> Set ac_cv_type_gid_t=yes to avoid the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: In file included from i_network.c:37: ../../config.h:207:15: error: two or more data types in declaration specifiers 207 | #define gid_t int | ^~~ Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/0d74517129130e6f26dc8c8aacae175ed8bd4b54 Signed-off-by: Fabrice Fontaine --- package/prboom/prboom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk index 36692d29a3..c1ba05ff70 100644 --- a/package/prboom/prboom.mk +++ b/package/prboom/prboom.mk @@ -6,7 +6,7 @@ PRBOOM_VERSION = 2.5.0 PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION) -PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes +PRBOOM_CONF_ENV = ac_cv_type_gid_t=yes ac_cv_type_uid_t=yes PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer PRBOOM_LICENSE = GPL-2.0+ PRBOOM_LICENSE_FILES = COPYING -- 2.43.0 From peter at korsgaard.com Sat Feb 24 13:58:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 14:58:23 +0100 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 In-Reply-To: <20240206233318.593730bd@windsurf> (Thomas Petazzoni via buildroot's message of "Tue, 6 Feb 2024 23:33:18 +0100") References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> <20240206233318.593730bd@windsurf> Message-ID: <87wmqut14w.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > Hello Adam, > On Mon, 18 Dec 2023 15:04:56 -0700 > Adam Duskett wrote: >> Python 3.12.1 has removed distutils support. As such, we remove the distutils >> option from pkg-python.mk as well. >> >> Tested on Fedora 39, and Debian 11. All 68 package tests pass. >> >> Signed-off-by: Adam Duskett >> --- >> v3 -> v4: >> - Drop distutils in pkg-python.mk >> - 3.12.0 -> 3.12.1 > I applied, but after doing a number of changes. The most important one > is that I had to reintroduce some of our --disable options: for > ncurses, sqlite and expat. Indeed, without these, you ended up with the > Python code installed, but not the correspond native library (the > py_cv_module__=n/a only disables building the native > library). > I split up the pkg-python.mk change into a separate commit, which is > made before the python 3.12 bump. Indeed, it's semantically separate. > Finally, I updated the Buildroot manual to no longer mention distutils > support. And I did a separate commit to update the Buildroot manual > with other _SETUP_TYPE values that we support. We unfortunately are still having a number of build failures because of this, E.G. for target == host or packages using the imp module and we are very late for 2024.02.x, so I have reverted this again. We can apply it again 2024.05.x after the release and work on the remaining issues. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:34:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:34:40 +0100 Subject: [Buildroot] [git commit] Revert "package/python3: bump version to 3.12.1" Message-ID: <20240224135841.4C97387A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb6274f5defc1acacd906ee6cd0b12684a866b92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 36e635d2d5c0166476858aa239ccbe78e8f2af14. Python 3.12 is still causing too many build failures, so revert for 2024.02. Signed-off-by: Peter Korsgaard --- .checkpackageignore | 44 ++++++--- ...1-Make-the-build-of-pyc-files-conditional.patch | 32 +++--- ...gy_getaddrinfo-configure-test-when-cross-.patch | 8 +- ...ructure-to-disable-the-build-of-certain-e.patch | 108 +++++++++++++++++++++ ...brary-header-paths-for-cross-compilation.patch} | 37 ++++--- ...n-t-look-in-usr-lib-termcap-for-libraries.patch | 31 ++++++ .../0006-Add-an-option-to-disable-pydoc.patch | 84 ---------------- .../python3/0006-Don-t-add-multiarch-paths.patch | 37 +++++++ .../0007-Abort-on-failed-module-build.patch | 30 ++++++ ...nd.patch => 0008-Serial-ioctl-workaround.patch} | 6 +- ...st-the-shebang-of-Python-scripts-for-cros.patch | 35 +++++++ ...config.sh.in-ensure-sed-invocations-only.patch} | 6 +- ...e.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch | 44 --------- .../0011-Add-an-option-to-disable-pydoc.patch | 100 +++++++++++++++++++ ...=> 0012-Add-an-option-to-disable-lib2to3.patch} | 94 ++++++++++-------- ...12-Add-an-option-to-disable-the-tk-module.patch | 79 --------------- ...Add-option-to-disable-the-sqlite3-module.patch} | 35 +++---- ...14-Add-an-option-to-disable-the-tk-module.patch | 77 +++++++++++++++ ...d-an-option-to-disable-the-curses-module.patch} | 39 ++++---- ...h => 0016-Add-an-option-to-disable-expat.patch} | 59 ++++++----- .../0017-Add-an-option-to-disable-CJK-codecs.patch | 30 ++++++ .../0018-Add-an-option-to-disable-NIS.patch | 33 +++++++ ...0019-Add-an-option-to-disable-unicodedata.patch | 30 ++++++ ...ch => 0020-Add-an-option-to-disable-IDLE.patch} | 63 ++++++------ .../0021-Add-an-option-to-disable-decimal.patch | 54 +++++++++++ ...-option-to-disable-the-ossaudiodev-module.patch | 30 ++++++ ...-Add-an-option-to-disable-openssl-support.patch | 30 ++++++ ...-an-option-to-disable-the-readline-module.patch | 30 ++++++ ...ions-to-disable-zlib-bzip2-and-xz-modules.patch | 42 ++++++++ ...6-python-config.sh-don-t-reassign-prefix.patch} | 6 +- ...0027-Add-an-option-to-disable-uuid-module.patch | 33 +++++++ ...0028-fix-building-on-older-distributions.patch} | 16 ++- ...-fixup-CC-print-multiarch-output-for-mus.patch} | 8 +- ...n-option-to-disable-the-berkeleydb-module.patch | 30 ++++++ ...libc-ng-doesn-t-set-errno-when-encryptio.patch} | 6 +- package/python3/python3.hash | 6 +- package/python3/python3.mk | 62 +++++------- 37 files changed, 1038 insertions(+), 456 deletions(-) Patch is too large, so refusing to show it From peter at korsgaard.com Sat Feb 24 10:33:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:33:11 +0100 Subject: [Buildroot] [git commit] Revert "package/python3: fix install when tk is disabled" Message-ID: <20240224135841.2F1D387A2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7bae4ea6eebda089eb0f7dc4a5a6dfefcea25573 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 687b96db4d3518eadd16f74f7defdc05b1cfb736. Python 3.12 is still causing too many build failures, so revert for 2024.02. Signed-off-by: Peter Korsgaard --- package/python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 08617241a6..7fafbedddb 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,8 +70,6 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) -+AS_IF([test "$TK" = "no"], -+ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) From peter at korsgaard.com Sat Feb 24 17:12:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:12:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/tio: needs threads In-Reply-To: <20240218210735.50128-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 18 Feb 2024 22:07:35 +0100") References: <20240218210735.50128-1-fontaine.fabrice@gmail.com> Message-ID: <87sf1hu6p5.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > tio needs threads since version 2.4 and > https://github.com/tio/tio/commit/93e6efc00153e625e4ceb8a51e01b324247d312a > resulting in the following build failure since bump to version 2.7 in > commit 4b33d7a47dd41fed5364a398320c2b7d0687ba5e: > In file included from /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, > from ../src/tty.c:23: > /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] > 218 | # warning requested reentrant code, but thread support was disabled > | ^~~~~~~ > ../src/tty.c:43:10: fatal error: pthread.h: No such file or directory > 43 | #include > | ^~~~~~~~~~~ > Fixes: 4b33d7a47dd41fed5364a398320c2b7d0687ba5e > - http://autobuild.buildroot.org/results/9b20ff06a0ad24b7e7f4750ebe64e2077e36164a > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 17:14:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:14:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: disable cargo In-Reply-To: <20240221181439.1113724-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 21 Feb 2024 19:14:39 +0100") References: <20240221181439.1113724-1-fontaine.fabrice@gmail.com> Message-ID: <87o7c5u6mh.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set HAVE_CARGO=0 to avoid the following build failures raised since bump > to version 2.29.0 in commit 68df20336664d4d0b1a9d8d0285d23eba631845a and > https://github.com/ibm-s390-linux/s390-tools/commit/e6add997ebbcd967734391da8a8987c7926e168f: > error: could not compile `pvsecret` (bin "pvsecret") due to previous error > [...] > ERROR: architecture for "/usr/bin/pvsecret" is "AArch64", should be "IBM S/390" > Fixes: 68df20336664d4d0b1a9d8d0285d23eba631845a > - http://autobuild.buildroot.org/results/22035cb4d8e251f9930a7d529b91b128919252bb > - http://autobuild.buildroot.org/results/99be6d3b2bab7c952ce02853f54924c5219aecc1 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 17:15:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:15:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/prboom: fix build with autoconf >= 2.72 In-Reply-To: <20240224135717.635374-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 24 Feb 2024 14:57:17 +0100") References: <20240224135717.635374-1-fontaine.fabrice@gmail.com> Message-ID: <87jzmtu6kj.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set ac_cv_type_gid_t=yes to avoid the following build failure raised > since bump of autoconf to version 2.72 in commit > 524f3536029dace3ce9aa154d3ca4685582e1955: > In file included from i_network.c:37: > ../../config.h:207:15: error: two or more data types in declaration specifiers > 207 | #define gid_t int > | ^~~ > Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 > - http://autobuild.buildroot.org/results/0d74517129130e6f26dc8c8aacae175ed8bd4b54 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 17:15:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:15:31 +0100 Subject: [Buildroot] [git commit] package/prboom: fix build with autoconf >= 2.72 Message-ID: <20240224171605.8505E87A5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd00f0072c490c49c6aadd9f0c43d210144a806e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set ac_cv_type_gid_t=yes to avoid the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: In file included from i_network.c:37: ../../config.h:207:15: error: two or more data types in declaration specifiers 207 | #define gid_t int | ^~~ Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/0d74517129130e6f26dc8c8aacae175ed8bd4b54 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/prboom/prboom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk index 36692d29a3..c1ba05ff70 100644 --- a/package/prboom/prboom.mk +++ b/package/prboom/prboom.mk @@ -6,7 +6,7 @@ PRBOOM_VERSION = 2.5.0 PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION) -PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes +PRBOOM_CONF_ENV = ac_cv_type_gid_t=yes ac_cv_type_uid_t=yes PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer PRBOOM_LICENSE = GPL-2.0+ PRBOOM_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Feb 24 17:11:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:11:10 +0100 Subject: [Buildroot] [git commit] package/tio: needs threads Message-ID: <20240224171605.760AC87A5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01f24d041d36c9d132a7888b7fefe8055b4ad321 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master tio needs threads since version 2.4 and https://github.com/tio/tio/commit/93e6efc00153e625e4ceb8a51e01b324247d312a resulting in the following build failure since bump to version 2.7 in commit 4b33d7a47dd41fed5364a398320c2b7d0687ba5e: In file included from /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, from ../src/tty.c:23: /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] 218 | # warning requested reentrant code, but thread support was disabled | ^~~~~~~ ../src/tty.c:43:10: fatal error: pthread.h: No such file or directory 43 | #include | ^~~~~~~~~~~ Fixes: 4b33d7a47dd41fed5364a398320c2b7d0687ba5e - http://autobuild.buildroot.org/results/9b20ff06a0ad24b7e7f4750ebe64e2077e36164a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tio/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/tio/Config.in b/package/tio/Config.in index a84daf8a24..e4241fa5e1 100644 --- a/package/tio/Config.in +++ b/package/tio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TIO bool "tio" depends on !BR2_sparc64 && !BR2_sparc + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_INIH help "tio" is a simple TTY terminal application which features a @@ -14,3 +15,7 @@ config BR2_PACKAGE_TIO # fix or workaround for now comment "tio is disabled for sparc and sparc64 architectures" depends on BR2_sparc64 || BR2_sparc + +comment "tio needs a toolchain w/ threads" + depends on !BR2_sparc64 && !BR2_sparc + depends on !BR2_TOOLCHAIN_HAS_THREADS From peter at korsgaard.com Sat Feb 24 17:14:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:14:09 +0100 Subject: [Buildroot] [git commit] package/s390-tools: disable cargo Message-ID: <20240224171605.7E53C87A26@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=120cb19056dc22b11d921714dc4e2ac94b84242f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set HAVE_CARGO=0 to avoid the following build failures raised since bump to version 2.29.0 in commit 68df20336664d4d0b1a9d8d0285d23eba631845a and https://github.com/ibm-s390-linux/s390-tools/commit/e6add997ebbcd967734391da8a8987c7926e168f: error: could not compile `pvsecret` (bin "pvsecret") due to previous error [...] ERROR: architecture for "/usr/bin/pvsecret" is "AArch64", should be "IBM S/390" Fixes: 68df20336664d4d0b1a9d8d0285d23eba631845a - http://autobuild.buildroot.org/results/22035cb4d8e251f9930a7d529b91b128919252bb - http://autobuild.buildroot.org/results/99be6d3b2bab7c952ce02853f54924c5219aecc1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/s390-tools/s390-tools.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index bc39a9bd19..04d193a467 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -12,7 +12,8 @@ S390_TOOLS_DEPENDENCIES = zlib S390_TOOLS_MAKE_OPTS = \ ARCH=$(BR2_ARCH) \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + HAVE_CARGO=0 ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) S390_TOOLS_DEPENDENCIES += libcurl From bernd at kuhls.net Sat Feb 24 19:01:16 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 20:01:16 +0100 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> <20240206233318.593730bd@windsurf> <87wmqut14w.fsf__36507.8827760712$1708783134$gmane$org@48ers.dk> Message-ID: Am Sat, 24 Feb 2024 14:58:23 +0100 schrieb Peter Korsgaard: > We unfortunately are still having a number of build failures because of > this, E.G. for target == host Hi, ftr, the host == target problem is solved by using a patch from here: https://github.com/python/cpython/issues/115382#issuecomment-1952936367 Regards, Bernd From ju.o at free.fr Sat Feb 24 19:27:32 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 24 Feb 2024 20:27:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: bump to version 5.6.0 Message-ID: <20240224192732.1298236-1-ju.o@free.fr> This commit changes the version branch from 5.4.x to 5.6.x. This old stable 5.4.x branch is expected to be end-of-life. The release note mention in [1]: """ There currently are no plans to maintain the 5.4.x branch, but releases could be made if there is community interest. """ For a change log since 5.4.5, see [2]. The COPYING licence file hash has changed. Most public domain files are now licensed under the Zero-Clause BSD license. This release explicitly set the XZ logo under the CC-by-SA-4.0 license. Due to those changes, the new license files COPYING.0BSD and COPYING.CC-BY-SA-4.0 are added to _LICENSE_FILES and in the hash file. The package homepage URL https://tukaani.org/xz/ now redirects to https://xz.tukaani.org/xz-utils/. This commit updates the homepage URL accordingly in Config.in. Finally, the package download URL moved to Github. This commit changes the _SITE to reflect that change. [1] https://github.com/tukaani-project/xz/releases/tag/v5.6.0 [2] https://github.com/tukaani-project/xz/blob/v5.6.0/NEWS Signed-off-by: Julien Olivain --- Patch tested on branch master at commit fb6274f with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_xz ... OK utils/test-pkg -a -p xz ... 45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/xz/Config.in | 2 +- package/xz/xz.hash | 8 +++++--- package/xz/xz.mk | 14 ++++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/package/xz/Config.in b/package/xz/Config.in index 687bd554821..7130fa5e8e4 100644 --- a/package/xz/Config.in +++ b/package/xz/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_XZ invoked via appropriate symlinks will emulate the behavior of the commands in the lzma package. - https://tukaani.org/xz/ + https://xz.tukaani.org/xz-utils/ diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3d93ad6b5ee..46edd336bc9 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,9 +1,11 @@ # Locally calculated after checking pgp signature -# https://tukaani.org/xz/xz-5.4.5.tar.bz2.sig -sha256 8ccf5fff868c006f29522e386fb4c6a1b66463fbca65a4cfc3c4bd596e895e79 xz-5.4.5.tar.bz2 +# https://github.com/tukaani-project/xz/releases/download/v5.6.0/xz-5.6.0.tar.bz2.sig +sha256 88c8631cefba91664fdc47b14bb753e1876f4964a07db650821d203992b1e1ea xz-5.6.0.tar.bz2 # Hash for license files -sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING +sha256 0864e508475f20b43a2393957fdb5a966558099ffa8fed1e3e73fe2b3eebb145 COPYING +sha256 0b01625d853911cd0e2e088dcfb743261034a091bb379246cb25a14cc4c74bf1 COPYING.0BSD +sha256 23ee78c8bae49cf08ea2f0c84945c66b987ebe4520881fb51b3dad4fb43d07c2 COPYING.CC-BY-SA-4.0 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING.GPLv3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 547959c743d..88c79254943 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,13 +4,19 @@ # ################################################################################ -XZ_VERSION = 5.4.5 +XZ_VERSION = 5.6.0 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 -XZ_SITE = https://tukaani.org/xz +XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ -XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 +XZ_LICENSE = Public Domain, 0BSD, CC-BY-SA-4.0 (logo), GPL-2.0+, GPL-3.0+, LGPL-2.1+ +XZ_LICENSE_FILES = \ + COPYING \ + COPYING.0BSD \ + COPYING.CC-BY-SA-4.0 \ + COPYING.GPLv2 \ + COPYING.GPLv3 \ + COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -- 2.43.2 From giulio.benetti at benettiengineering.com Sat Feb 24 20:02:09 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 24 Feb 2024 21:02:09 +0100 Subject: [Buildroot] [PATCH v7] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: References: <20240222130716.1311432-1-fancp2007@gmail.com> <20240223131603.2313178-1-fancp2007@gmail.com> <197750aa-c25f-44d9-89ac-872053953422@benettiengineering.com> Message-ID: Hi Scott, On 24/02/24 11:31, Scott Fan wrote: > Hi Giulio, > > The BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is for the ethernet port > on the board. > Without the config, the eth0 interface will be not accessible. > The `ifconfig eth0` command will report error: Device not found Ok, sounds good. So can you please report it in the commit log and.. > > Scott Fan > > On Sat, Feb 24, 2024 at 12:24?AM Giulio Benetti > wrote: >> >> Hi Scott, >> >> On 23/02/24 14:15, Scott Fan wrote: >> >> [ SNIP ] >> >>> + >>> +# System >>> +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" ...in a comment here? >>> +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >> >> What do you need MDEV by default for? Is there some peripheral that >> needs to show up automatically otherwise the basic functionality is >> compromised? Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:37 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:37 +0100 Subject: [Buildroot] [PATCH v6 00/16] Add support for AM62x-SK HS-FS devices Message-ID: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> The SK-AM62B-P1 is the newest version of SK-AM62 which includes high-security field-securable (HS-FS) silicon to optionally customize keys and encryption for security applications. This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, which, however, was buggy. This series fixes the errors and bumps the Linux kernel and U-Boot required for such a new device. Dario Binacchi (16): configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version boot/ti-k3-r5-loader: bump to version 2024.01 package/python-attrs: add host variant package/python-rpds-py: add host variant package/python-referencing: add host variant package/python-jsonschema-specifications: add host variant package/python-jsonschema: add host variant boot/ti-k3-r5-loader: set binman environment boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 board/ti/am62x-sk/genimage.cfg | 7 ++- board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++ boot/ti-k3-image-gen/Config.in | 61 ++----------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/ti-k3-r5-loader/Config.in | 5 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 12 +++- boot/uboot/Config.in | 23 +++---- boot/uboot/uboot.mk | 12 +++- configs/ti_am62x_sk_defconfig | 22 ++++--- configs/ti_am64x_sk_defconfig | 7 ++- package/Config.in | 1 + package/python-attrs/python-attrs.mk | 6 ++ .../python-jsonschema-specifications.mk | 10 +++ .../python-jsonschema/python-jsonschema.mk | 14 +++++ .../python-referencing/python-referencing.mk | 11 ++++ package/python-rpds-py/python-rpds-py.mk | 1 + package/ti-k3/Config.in | 60 ++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 20 files changed, 232 insertions(+), 87 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:38 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:38 +0100 Subject: [Buildroot] [PATCH v6 01/16] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-2-dario.binacchi@amarulasolutions.com> Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update commit message Changes in v5: - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c68..c3ad555a8184 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:39 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:39 +0100 Subject: [Buildroot] [PATCH v6 02/16] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-3-dario.binacchi@amarulasolutions.com> Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am64x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am64x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update commit message Changes in v5: - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8d3..097175bd8f39 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:40 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:40 +0100 Subject: [Buildroot] [PATCH v6 03/16] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-4-dario.binacchi@amarulasolutions.com> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a8184..a129e216d25b 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:41 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:41 +0100 Subject: [Buildroot] [PATCH v6 04/16] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-5-dario.binacchi@amarulasolutions.com> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f39..26195194c7d6 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:43 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:43 +0100 Subject: [Buildroot] [PATCH v6 06/16] package/python-attrs: add host variant In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-7-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc4402..fb1729e62fa2 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:42 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:42 +0100 Subject: [Buildroot] [PATCH v6 05/16] boot/ti-k3-r5-loader: bump to version 2024.01 In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-6-dario.binacchi@amarulasolutions.com> All in-tree configs with the ti-k3-r5 bootloader use a custom version, so this patch is mostly for the menuconfig default version Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5a8..5f86c045c99f 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -16,7 +16,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2022.10" + bool "2024.01" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -60,7 +60,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index c5d1cb8e09f0..fbe5d215409d 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:44 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:44 +0100 Subject: [Buildroot] [PATCH v6 07/16] package/python-rpds-py: add host variant In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-8-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4fde..cee2ff290a4e 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:45 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:45 +0100 Subject: [Buildroot] [PATCH v6 08/16] package/python-referencing: add host variant In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-9-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-referencing/python-referencing.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e913a..66d59ed8091a 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_REFERENCING_DEPENDENCIES += \ + host-python-attrs \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:46 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:46 +0100 Subject: [Buildroot] [PATCH v6 09/16] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-10-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes since v3 Changes in v3: - Drop Config.in.host package/python-jsonschema-specifications.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9d4..653c839bb450 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,14 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES += \ + host-python-referencing + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:47 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:47 +0100 Subject: [Buildroot] [PATCH v6 10/16] package/python-jsonschema: add host variant In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-11-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa7752..9e8b6e18b876 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \ + host-python-attrs \ + host-python-jsonschema-specifications \ + host-python-referencing \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:48 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:48 +0100 Subject: [Buildroot] [PATCH v6 11/16] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-12-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. The patch set the BINMAN_INDIRS environment variable to provide the directory to search for binary blobs and select the packages required by binman. The dependency of binman is not really easy to follow. First we have the packages list from binman.rst [1] then we have to install additional python modules [2]. Maybe in the future it will be necessary to add host-lzma and host-lz4 in the dependencies list. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update the commit message adding the links of requirements. Changes in v5: - Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - Drop runtime dependecies - Add host-python-pylibfdt dependency without requiring BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration - Add host-python3 and host-python-setuptools dependencies - Add SOB and COB tags of Romain Naour Changes in v4: - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Changes in v2: - Change commit message - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Select packages required by binman if BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled boot/ti-k3-r5-loader/Config.in | 1 + boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f86c045c99f..fc71337e80cc 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema help Separate U-Boot SPL build for R5 core on TI's K3 processors. Usually used to build tiboot3.bin with k3-image-gen. diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f2e..fdb058f3b72a 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python-jsonschema \ + host-python-pyyaml \ + host-python3 \ + host-python-setuptools \ + host-python-pylibfdt TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -58,6 +63,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + BINMAN_INDIRS=$(BINARIES_DIR) \ HOSTLDFLAGS="$(HOST_LDFLAGS)" define TI_K3_R5_LOADER_BUILD_CMDS -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:49 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:49 +0100 Subject: [Buildroot] [PATCH v6 12/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-13-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. The binman requirement is directly included in buildman dependency (tools/buildman/requirements.txt) since within U-Boot, binman is invoked by the build system, here buildman [1]. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - BR2_TARGET_UBOOT_USE_BINMAN - Binman tool is not specific to TI K3 platform, so add an option to specify the use of Binman in U-Boot. - Add runtime dependencies - Update commit message - Add SOB and COB tags of Romain Naour Changes in v5: - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" from UBOOT_MAKE_OPTS. no changes since v1: boot/uboot/Config.in | 11 +++++++++++ boot/uboot/uboot.mk | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930db..e6e7956adccb 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -290,6 +290,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN This option makes sure that the needed binary blobs are copied into the U-Boot source directory. +config BR2_TARGET_UBOOT_USE_BINMAN + bool "U-Boot use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a88059..9157a4b738c3 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -187,10 +187,12 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware +ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif +endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) UBOOT_DEPENDENCIES += opensbi @@ -269,6 +271,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) UBOOT_DEPENDENCIES += host-vim endif +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +UBOOT_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:50 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:50 +0100 Subject: [Buildroot] [PATCH v6 13/16] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-14-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot can use Binman to compile and sign the generated binaries, thus making the use of custom tools like ti-k3-image-gen no longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were configured and used outside of it. This patch allows setting such options even if the package is not enabled. The patch makes an exception to the Buildroot rule "no subdirectory in package directory". Signed-off-by: Dario Binacchi --- Changes in v6: - Move BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME to ti-k3 (BR2_PACKAGE_TI_K3_DM). - Disable BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X Changes in v5: - Add SOB tag - Move the new ti-k3 from boot to package Added in v4 boot/ti-k3-image-gen/Config.in | 61 ++----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/uboot/Config.in | 12 +---- boot/uboot/uboot.mk | 2 +- configs/ti_am62x_sk_defconfig | 3 +- configs/ti_am64x_sk_defconfig | 3 +- package/Config.in | 1 + package/ti-k3/Config.in | 60 ++++++++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 9 files changed, 80 insertions(+), 73 deletions(-) create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e911..a57319f4be6d 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk index 64be9a18f2c4..aca29bcf1bd4 100644 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ $(BR2_MAKE_HOST_DEPENDENCY) TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index e6e7956adccb..821854d08acc 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -244,21 +244,11 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" # We use the SoC selection defined for the ti-k3-image-gen # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM - -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME - string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - -endif - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9157a4b738c3..c21fe7c99fc1 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -189,7 +189,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) UBOOT_DEPENDENCIES += ti-k3-boot-firmware ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_PACKAGE_TI_K3_DM_SOCNAME)) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a129e216d25b..2835404a57df 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM62X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 26195194c7d6..566cbbe4824f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM64X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/package/Config.in b/package/Config.in index bf0fe078b955..6d3ed34e121b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -629,6 +629,7 @@ endmenu source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" + source "package/ti-k3/Config.in" source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" source "package/ti-sgx-um/Config.in" diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in new file mode 100644 index 000000000000..b8545b7bca62 --- /dev/null +++ b/package/ti-k3/Config.in @@ -0,0 +1,60 @@ +config BR2_PACKAGE_TI_K3 + bool "TI K3" + help + The TI K3 SOC specific selections. + +if BR2_PACKAGE_TI_K3 + +choice + prompt "SoC family" + +config BR2_PACKAGE_TI_K3_SOC_AM62AX + bool "am62ax" + +config BR2_PACKAGE_TI_K3_SOC_AM62X + bool "am62x" + +config BR2_PACKAGE_TI_K3_SOC_AM64X + bool "am64x" + +config BR2_PACKAGE_TI_K3_SOC_AM65X + bool "am65x" + +endchoice + +choice + prompt "Security type" + help + The target SoC security type option. + +config BR2_PACKAGE_TI_K3_SECTYPE_GP + bool "gp" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + bool "hs-fs" + depends on !BR2_PACKAGE_TI_K3_SOC_AM65X + +config BR2_PACKAGE_TI_K3_SECTYPE_HS + bool "hs" + +endchoice + +config BR2_PACKAGE_TI_K3_SOC + string + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X + +config BR2_PACKAGE_TI_K3_SECTYPE + string + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS + +config BR2_PACKAGE_TI_K3_DM_SOCNAME + string + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X + +endif diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk new file mode 100644 index 000000000000..a2da29f5148c --- /dev/null +++ b/package/ti-k3/ti-k3.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# ti-k3 +# +################################################################################ + +include $(sort $(wildcard package/ti-k3/*/*.mk)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:51 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:51 +0100 Subject: [Buildroot] [PATCH v6 14/16] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-15-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot are capable of building tiboot3.bin using Binman. In this case, let's copy it to the binaries directory. Signed-off-by: Dario Binacchi --- Changes in v6: - Replace `find' command with `cp' one. Changes in v5: - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin Added in v4 boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index fdb058f3b72a..cbdb653278f8 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) + define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin endef $(eval $(kconfig-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:52 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:52 +0100 Subject: [Buildroot] [PATCH v6 15/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-16-dario.binacchi@amarulasolutions.com> The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v6: - Enable BR2_TARGET_UBOOT_USE_BINMAN option Changes in v5: - Update commit message. Changes in v4: - bump to 204.01 instead of 2023.10 - Update the commit message - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. Changes in v2: - Update the commit message - Drop Python options required by binman. - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically selects the Python modules required by binman. board/ti/am62x-sk/genimage.cfg | 7 ++++- board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++++++++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++++ configs/ti_am62x_sk_defconfig | 13 +++++---- 4 files changed, 67 insertions(+), 7 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg index 26304fe98f99..398209f4d831 100644 --- a/board/ti/am62x-sk/genimage.cfg +++ b/board/ti/am62x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh new file mode 100755 index 000000000000..0f1f98ef217a --- /dev/null +++ b/board/ti/am62x-sk/post-build.sh @@ -0,0 +1,49 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:r:x:' +O='console:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing argument" +[ -n "${ROOT}" ] || die "Missing argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label am62x-sk-buildroot + kernel /Image + fdtdir / + append ${append} + __HEADER_EOF diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh new file mode 100755 index 000000000000..34f732c091ad --- /dev/null +++ b/board/ti/am62x-sk/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh -x + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 2835404a57df..484f9feb8c61 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_PACKAGE_TI_K3=y @@ -24,20 +24,21 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" -BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:53 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:53 +0100 Subject: [Buildroot] [PATCH v6 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v5: - Bump to 6.6.17 from 6.6.1 - Update commit message Changes in v4: - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. no changes since v1 configs/ti_am62x_sk_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 484f9feb8c61..8c962b4a9494 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 24 21:30:08 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 24 Feb 2024 22:30:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: fix linux-pam select Message-ID: <20240224213008.670294-1-fontaine.fabrice@gmail.com> Commit 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb forgot to handle linux-pam dependencies resulting in the following build failure: WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=y] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=y] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] [...] configure: error: in `/home/autobuild/autobuild/instance-12/output-1/build/linux-pam-1.6.0': configure: error: failed to find dlopen Fixes: 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb - http://autobuild.buildroot.org/results/c0aac8bed08850e07cb94f501d754c3c64cdfe07 Signed-off-by: Fabrice Fontaine --- package/openssh/Config.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index a3038ba01f..c108569547 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_OPENSSH bool "openssh" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION + select BR2_PACKAGE_LINUX_PAM if \ + BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION && \ + BR2_ENABLE_LOCALE && BR2_USE_WCHAR && \ + !BR2_STATIC_LIBS && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help -- 2.43.0 From giulio.benetti at benettiengineering.com Sat Feb 24 21:41:13 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 24 Feb 2024 22:41:13 +0100 Subject: [Buildroot] [PATCH] package/mongoose: bump to version 7.13 Message-ID: <20240224214113.58103-1-giulio.benetti@benettiengineering.com> https://github.com/cesanta/mongoose/releases/tag/7.13 Signed-off-by: Giulio Benetti --- package/mongoose/mongoose.hash | 2 +- package/mongoose/mongoose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index ed5db5ebf6..716833eeed 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 91e719e164816b349be3cb71293927f3f6abbe3fb02187e2d9b5e56f542c2063 mongoose-7.12.tar.gz +sha256 5c9dc8d1d1762ef483b6d2fbf5234e421ca944b722225bb533d2d0507b118a0f mongoose-7.13.tar.gz sha256 4ba646f5a7012d8b52f3a74398e446f56960dde0572f7241a2215430da5dd5a2 LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 74594ff48c..e2e3be790a 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.12 +MONGOOSE_VERSION = 7.13 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 24 21:46:01 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 24 Feb 2024 22:46:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/redis-plus-plus: needs threads Message-ID: <20240224214601.680607-1-fontaine.fabrice@gmail.com> redis-plus-plus unconditonally uses mutex and so needs threads since its addition in commit c46df9de21e718a9ed6a2df2bb945c386695d3bf and https://github.com/sewenew/redis-plus-plus/commit/1fa8f6bbfb24c8f328aa23ee1dd3c3f99c1b4caf: In file included from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.h:27, from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.cpp:17: /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/sentinel.h:95:10: error: 'mutex' in namespace 'std' does not name a type 95 | std::mutex _mutex; | ^~~~~ Fixes: c46df9de21e718a9ed6a2df2bb945c386695d3bf - http://autobuild.buildroot.org/results/cc4c54134e8a522b4c028aab4266f47cf862e2a9 Signed-off-by: Fabrice Fontaine --- package/redis-plus-plus/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/redis-plus-plus/Config.in b/package/redis-plus-plus/Config.in index 6a21aee2b3..64a84102d4 100644 --- a/package/redis-plus-plus/Config.in +++ b/package/redis-plus-plus/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_REDIS_PLUS_PLUS bool "redis-plus-plus" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_HIREDIS help Redis client written in C++ @@ -11,5 +12,5 @@ config BR2_PACKAGE_REDIS_PLUS_PLUS https://github.com/sewenew/redis-plus-plus -comment "redis-plus-plus needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "redis-plus-plus needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS -- 2.43.0 From giulio.benetti at benettiengineering.com Sat Feb 24 21:59:55 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 24 Feb 2024 22:59:55 +0100 Subject: [Buildroot] [PATCH] configs/friendlyarm_nanopi_r2s: bump Linux to 6.6.18 and U-Boot to 2024.01 In-Reply-To: <20240224103354.7763-1-fancp2007@gmail.com> References: <20240224103354.7763-1-fancp2007@gmail.com> Message-ID: <5e4c1a0f-7b41-4510-b87d-2392c832f3c1@benettiengineering.com> Hi Scott, please read all before changing, On 24/02/24 11:33, Scott Fan wrote: > The ATF firmware also bumps to version 2.7, and the bootloader image only > needs the u-boot-rockchip.bin file. > > This commit adds support for internal ethernet port (RTL8211E), and also > adds USB 3.0 ethernet port firmware for RTL8153B chip on the board. > > The associated board files are also updated, notes for the NEO3 board is > removed from the readme file. > > The .checkpackageignore file is updated accordingly (the entry for > post-build.sh is removed). > > Tested on the NanoPi R2S board. > Can you please list all the points using "*" like below? This commit: * bump u-boot version to 2024.01 * bump Linux version to 6.6.18 * update ATF version to 2.7 * switch u-boot image to u-boot-rockchip.bin since ATF 2.7 requires it * ... etc. This way everything is clearer > Wiki link for the board: > https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S > > Signed-off-by: Scott Fan > --- > .checkpackageignore | 1 - > board/friendlyarm/nanopi-r2s/extlinux.conf | 4 +-- > board/friendlyarm/nanopi-r2s/genimage.cfg | 10 ++---- > board/friendlyarm/nanopi-r2s/post-build.sh | 4 +-- > board/friendlyarm/nanopi-r2s/readme.txt | 20 ++++------- > configs/friendlyarm_nanopi_r2s_defconfig | 39 +++++++++++++++++----- > 6 files changed, 43 insertions(+), 35 deletions(-) > > diff --git a/.checkpackageignore b/.checkpackageignore > index 4967d749fa..08188dc23e 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -33,7 +33,6 @@ board/cubietech/cubieboard2/post-image.sh Shellcheck > board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck > board/freescale/common/mxs/post-image.sh Shellcheck > board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch Upstream > -board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck > board/hardkernel/odroidc2/post-image.sh Shellcheck > board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables > board/hardkernel/odroidxu4/post-image.sh EmptyLastLine Shellcheck > diff --git a/board/friendlyarm/nanopi-r2s/extlinux.conf b/board/friendlyarm/nanopi-r2s/extlinux.conf > index 1ea0cdd8a5..b2897dea8b 100644 > --- a/board/friendlyarm/nanopi-r2s/extlinux.conf > +++ b/board/friendlyarm/nanopi-r2s/extlinux.conf > @@ -1,4 +1,4 @@ > -label NanoPi R2S linux > +label friendlyarm-nanopi-buildroot Please add this change to commit log(* update extlinux.conf label name to friendlyarm-nanopi-buildroot). > kernel /boot/Image > devicetree /boot/rk3328-nanopi-r2s.dtb > - append root=/dev/mmcblk0p1 rw rootwait > + append console=ttyS2,1500000 earlyprintk root=/dev/mmcblk0p1 rootwait why is console required now? Please add it to commit log > diff --git a/board/friendlyarm/nanopi-r2s/genimage.cfg b/board/friendlyarm/nanopi-r2s/genimage.cfg > index a686b4f14e..98e96a7ddd 100644 > --- a/board/friendlyarm/nanopi-r2s/genimage.cfg > +++ b/board/friendlyarm/nanopi-r2s/genimage.cfg > @@ -4,19 +4,13 @@ image sdcard.img { > > partition u-boot-tpl-spl-dtb { > in-partition-table = "no" > - image = "idbloader.img" > + image = "u-boot-rockchip.bin" > offset = 32K > } > > - partition u-boot-dtb { > - in-partition-table = "no" > - image = "u-boot.itb" > - offset = 8M > - } > - > partition rootfs { > partition-type = 0x83 > - offset = 16M > image = "rootfs.ext4" > + offset = 10M Please keep the offset position the same and document the reason in commit log > } > } > diff --git a/board/friendlyarm/nanopi-r2s/post-build.sh b/board/friendlyarm/nanopi-r2s/post-build.sh > index 1f5ff6a611..c7ec875068 100755 > --- a/board/friendlyarm/nanopi-r2s/post-build.sh > +++ b/board/friendlyarm/nanopi-r2s/post-build.sh > @@ -1,5 +1,5 @@ > #!/bin/sh > > -BOARD_DIR="$(dirname $0)" > +BOARD_DIR="$(dirname "$0")" Is this mandatory? What changed compared to previous version? > > -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" Same here for "..." Please update commit log with it. > diff --git a/board/friendlyarm/nanopi-r2s/readme.txt b/board/friendlyarm/nanopi-r2s/readme.txt > index 6d291cdd60..d43008b620 100644 > --- a/board/friendlyarm/nanopi-r2s/readme.txt > +++ b/board/friendlyarm/nanopi-r2s/readme.txt > @@ -2,11 +2,11 @@ Intro > ===== > > This default configuration will allow you to start experimenting with the > -buildroot environment for the Nanopi R2S. With the current configuration > +buildroot environment for the NanoPi R2S. With the current configuration Here the same > it will bring-up the board, and allow access through the serial console. > > -Nanopi R2S link: > -https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 > +Wiki link: > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S This too: * update board URL in readme.txt > > This configuration uses ATF, U-Boot mainline and kernel mainline. > > @@ -25,9 +25,6 @@ Files created in output directory > output/images > > ??? bl31.elf > -??? boot.vfat > -??? extlinux > -??? idbloader.img > ??? Image > ??? rk3328-nanopi-r2s.dtb > ??? rootfs.ext2 > @@ -35,7 +32,7 @@ output/images > ??? rootfs.tar > ??? sdcard.img > ??? u-boot.bin > -??? u-boot.itb > +??? u-boot-rockchip.bin > > How to write the SD card > ======================== > @@ -46,12 +43,7 @@ in the output/images/ directory. > Copy the bootable "sdcard.img" onto an SD card with "dd": > > $ sudo dd if=output/images/sdcard.img of=/dev/sdX > - $ sudo sync > + $ sync Ditto > > -Insert the micro SDcard in your Nanopi R2S and power it up. The console > +Insert the micro SDcard in your NanoPi R2S and power it up. The console Ditto but you can group this with 2 points above without adding a dedicated one > is on the serial line, 1500000 8N1. > - > -Notes > -===== > - > -This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board. > diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig > index 284b28ec31..76806e76e7 100644 > --- a/configs/friendlyarm_nanopi_r2s_defconfig > +++ b/configs/friendlyarm_nanopi_r2s_defconfig > @@ -1,42 +1,65 @@ > +# Architecture > BR2_aarch64=y > BR2_cortex_a53=y > BR2_ARM_FPU_VFPV4=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +# Linux headers same as kernel, a 6.6 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > + > +# System > BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" > BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > + > +# Image > BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" > + > +# Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" > BR2_TARGET_UBOOT_SPL=y > -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-rockchip.bin" > + > +# Ethernet firmware for RTL8153B > +BR2_PACKAGE_LINUX_FIRMWARE=y > +BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_MTOOLS=y I think you should split this patch into 2: 1) the versions bumps 2) the beautify of the code This is because there are many changes and it's difficult to check them, for me at least. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From fontaine.fabrice at gmail.com Sat Feb 24 22:06:36 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 24 Feb 2024 23:06:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libpsl static build Message-ID: <20240224220636.742198-1-fontaine.fabrice@gmail.com> Fix the following static build failure with libpsl raised since bump to version 8.6.0 in commit 5cee6b6be6524e443012d130e09b0e6983b0ff90: configure:28830: /home/autobuild/autobuild/instance-6/output-1/host/bin/aarch64_be-buildroot-linux-musl-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -static -Werror-implicit-function-declaration -Wno-system-headers -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include -static -L/home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib -L/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/lib conftest.c -lpsl -lmbedtls -lmbedx509 -lmbedcrypto -lz -latomic >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/aarch64_be-buildroot-linux-musl/11.4.0/../../../../aarch64_be-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib/libpsl.a(psl.c.o): in function `is_public_suffix': psl.c:(.text+0x2a8): undefined reference to `idn2_lookup_u8' [...] checking for library containing psl_builtin... no configure: error: libpsl was not found Fixes: 5cee6b6be6524e443012d130e09b0e6983b0ff90 - http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 Signed-off-by: Fabrice Fontaine --- ...igure.ac-find-libpsl-with-pkg-config.patch | 109 ++++++++++++++++++ package/libcurl/libcurl.mk | 2 + 2 files changed, 111 insertions(+) create mode 100644 package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch diff --git a/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch new file mode 100644 index 0000000000..46df1e36a2 --- /dev/null +++ b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch @@ -0,0 +1,109 @@ +From 9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Feb 2024 20:59:25 +0100 +Subject: [PATCH] configure.ac: find libpsl with pkg-config + +Find libpsl with pkg-config to avoid static build failures. + +Ref: http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 + +Signed-off-by: Fabrice Fontaine +Closes #12947 + +Upstream: https://github.com/curl/curl/commit/9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 +--- + configure.ac | 79 ++++++++++++++++++++++++++++++++++++++++++++-------- + docs/TODO | 7 ----- + 2 files changed, 67 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cd0e2d07d8d164..09d5364f4de575 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2075,19 +2075,74 @@ dnl ********************************************************************** + dnl Check for libpsl + dnl ********************************************************************** + +-AC_ARG_WITH(libpsl, +- AS_HELP_STRING([--without-libpsl], +- [disable support for libpsl]), +- with_libpsl=$withval, +- with_libpsl=yes) +-curl_psl_msg="no (libpsl disabled)" +-if test $with_libpsl != "no"; then +- AC_SEARCH_LIBS(psl_builtin, psl, +- [curl_psl_msg="enabled"; +- AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled]) +- ], +- [AC_MSG_ERROR([libpsl was not found]) ] ++dnl Default to compiler & linker defaults for LIBPSL files & libraries. ++OPT_LIBPSL=off ++AC_ARG_WITH(libpsl,dnl ++AS_HELP_STRING([--with-libpsl=PATH],[Where to look for libpsl, PATH points to the LIBPSL installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]) ++AS_HELP_STRING([--without-libpsl], [disable LIBPSL]), ++ OPT_LIBPSL=$withval) ++ ++if test X"$OPT_LIBPSL" != Xno; then ++ dnl backup the pre-libpsl variables ++ CLEANLDFLAGS="$LDFLAGS" ++ CLEANCPPFLAGS="$CPPFLAGS" ++ CLEANLIBS="$LIBS" ++ ++ case "$OPT_LIBPSL" in ++ yes) ++ dnl --with-libpsl (without path) used ++ CURL_CHECK_PKGCONFIG(libpsl) ++ ++ if test "$PKGCONFIG" != "no" ; then ++ LIB_PSL=`$PKGCONFIG --libs-only-l libpsl` ++ LD_PSL=`$PKGCONFIG --libs-only-L libpsl` ++ CPP_PSL=`$PKGCONFIG --cflags-only-I libpsl` ++ else ++ dnl no libpsl pkg-config found ++ LIB_PSL="-lpsl" ++ fi ++ ++ ;; ++ off) ++ dnl no --with-libpsl option given, just check default places ++ LIB_PSL="-lpsl" ++ ;; ++ *) ++ dnl use the given --with-libpsl spot ++ LIB_PSL="-lpsl" ++ PREFIX_PSL=$OPT_LIBPSL ++ ;; ++ esac ++ ++ dnl if given with a prefix, we set -L and -I based on that ++ if test -n "$PREFIX_PSL"; then ++ LD_PSL=-L${PREFIX_PSL}/lib$libsuff ++ CPP_PSL=-I${PREFIX_PSL}/include ++ fi ++ ++ LDFLAGS="$LDFLAGS $LD_PSL" ++ CPPFLAGS="$CPPFLAGS $CPP_PSL" ++ LIBS="$LIB_PSL $LIBS" ++ ++ AC_CHECK_LIB(psl, psl_builtin, ++ [ ++ AC_CHECK_HEADERS(libpsl.h, ++ curl_psl_msg="enabled" ++ LIBPSL_ENABLED=1 ++ AC_DEFINE(USE_LIBPSL, 1, [if libpsl is in use]) ++ AC_SUBST(USE_LIBPSL, [1]) ++ ) ++ ], ++ dnl not found, revert back to clean variables ++ LDFLAGS=$CLEANLDFLAGS ++ CPPFLAGS=$CLEANCPPFLAGS ++ LIBS=$CLEANLIBS + ) ++ ++ if test X"$OPT_LIBPSL" != Xoff && ++ test "$LIBPSL_ENABLED" != "1"; then ++ AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!]) ++ fi + fi + AM_CONDITIONAL([USE_LIBPSL], [test "$curl_psl_msg" = "enabled"]) + diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 9dafe90c82..4281cfabb1 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -14,6 +14,8 @@ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_INSTALL_STAGING = YES +# 0001-configure.ac-find-libpsl-with-pkg-config.patch +LIBCURL_AUTORECONF = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') # support because it uses fork(), which doesn't work on non-MMU platforms. -- 2.43.0 From giulio.benetti at benettiengineering.com Sat Feb 24 22:21:17 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 24 Feb 2024 23:21:17 +0100 Subject: [Buildroot] [PATCH] configs/beaglebone_defconfig: bump Linux to 6.1.69-ti-r25 and U-Boot to 2024.01 In-Reply-To: <20240224105554.17996-1-fancp2007@gmail.com> References: <20240224105554.17996-1-fancp2007@gmail.com> Message-ID: <4adf0b79-816e-45cb-b363-0ed25b59b6d0@benettiengineering.com> Hi Scott, On 24/02/24 11:55, Scott Fan wrote: > Tested on beaglebone black. > > [1] https://github.com/beagleboard/linux/releases/tag/6.1.69-ti-r25 > > Signed-off-by: Scott Fan It looks good to me and I've built successfully using docker-run so: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > --- > configs/beaglebone_defconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig > index e2d67019b1..cdd6591f6d 100644 > --- a/configs/beaglebone_defconfig > +++ b/configs/beaglebone_defconfig > @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.46-ti-r13)/linux-6.1.46-ti-r13.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.69-ti-r25)/linux-6.1.69-ti-r25.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bb.org" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" > @@ -31,7 +31,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From peter at korsgaard.com Sun Feb 25 07:39:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:39:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.16 In-Reply-To: <20240216055343.24326-1-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 16 Feb 2024 06:53:43 +0100") References: <20240216055343.24326-1-bernd@kuhls.net> Message-ID: <87edd1t2kp.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.2.16 > Release notes: https://www.php.net/releases/8_2_16.php > Updated license hash due to copyright year bump: > https://github.com/php/php-src/commit/2575e6b88c3d3bbd53383fb65057c9b7b029e264 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:41:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:41:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: deflate64 needs libzlib In-Reply-To: <20240216194520.1806313-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 16 Feb 2024 20:45:20 +0100") References: <20240216194520.1806313-1-fontaine.fabrice@gmail.com> Message-ID: <87a5npt2h1.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > deflate64 unconditionally uses FAR since its addition with > https://github.com/OSGeo/gdal/commit/d6baebcc73ffc2ede6e9635846676b275b02bab3 > resulting in the following build failure with zlib-ng since bump to > version 3.8.2 in commit d2e349301b79ad3a1840083714ee396f4302b68a: > In file included from /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/infback9.c:6: > /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/minified_zutil.h:46:17: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'uchf' > 46 | typedef uch FAR uchf; > | ^~~~ > Fixes: d2e349301b79ad3a1840083714ee396f4302b68a > - http://autobuild.buildroot.org/results/8b55108dee4faa98c234d00a1a22b62ed948e8d3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:44:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:44:30 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add sox runtime test In-Reply-To: <20240218172547.262368-1-ju.o@free.fr> (Julien Olivain's message of "Sun, 18 Feb 2024 18:25:47 +0100") References: <20240218172547.262368-1-ju.o@free.fr> Message-ID: <875xydt2ch.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:48:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:48:53 +0100 Subject: [Buildroot] [PATCH] boot/barebox: install all barebox images if none were specified In-Reply-To: <20240219210628.407423-1-a.fatoum@pengutronix.de> (Ahmad Fatoum's message of "Mon, 19 Feb 2024 22:06:28 +0100") References: <20240219210628.407423-1-a.fatoum@pengutronix.de> Message-ID: <871q91t256.fsf@48ers.dk> >>>>> "Ahmad" == Ahmad Fatoum writes: > When selecting barebox in menuconfig, BR2_TARGET_BAREBOX_IMAGE_FILE will > be empty by default, which causes Buildroot to install whatever the > barebox-flash-image symlink points at for barebox versions >= v2012.10.0. > This is an outdated fallback, because barebox-flash-image is only valid > when the barebox build produces a single binary. Virtually all new > defconfigs added in the last couple of years are multiconfig > (CONFIG_PBL_IMAGE=y) however, meaning that a single imx_v7_defconfig > or multi_v8_defconfig will produce many images that support different > boards or even platforms. > As there is no single valid target for barebox-flash-image to point at > in this case, this symlink will point at a non-existing > 'multi-image-build' to alert the user to this fact. > As replacement for barebox-flash-image, barebox commit 550cf79c216a > ("Make list of flash images and fix link all single image cases") first > released with v2015.12.0 creates a barebox-flash-images file with a list > of all images built by barebox. > Have buildroot use that file as a fallback before trying > barebox-flash-image to have a fallback that works for any recent barebox > defconfig as well. > Signed-off-by: Ahmad Fatoum Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:53:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:53:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/redis-plus-plus: needs threads In-Reply-To: <20240224214601.680607-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 24 Feb 2024 22:46:01 +0100") References: <20240224214601.680607-1-fontaine.fabrice@gmail.com> Message-ID: <87wmqtrndv.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > redis-plus-plus unconditonally uses mutex and so needs threads since its > addition in commit c46df9de21e718a9ed6a2df2bb945c386695d3bf and > https://github.com/sewenew/redis-plus-plus/commit/1fa8f6bbfb24c8f328aa23ee1dd3c3f99c1b4caf: > In file included from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.h:27, > from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.cpp:17: > /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/sentinel.h:95:10: error: 'mutex' in namespace 'std' does not name a type > 95 | std::mutex _mutex; > | ^~~~~ > Fixes: c46df9de21e718a9ed6a2df2bb945c386695d3bf > - http://autobuild.buildroot.org/results/cc4c54134e8a522b4c028aab4266f47cf862e2a9 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:55:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:55:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libpsl static build In-Reply-To: <20240224220636.742198-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 24 Feb 2024 23:06:36 +0100") References: <20240224220636.742198-1-fontaine.fabrice@gmail.com> Message-ID: <87sf1hrna0.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following static build failure with libpsl raised since bump to > version 8.6.0 in commit 5cee6b6be6524e443012d130e09b0e6983b0ff90: > configure:28830: > /home/autobuild/autobuild/instance-6/output-1/host/bin/aarch64_be-buildroot-linux-musl-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -O3 -g0 -static > -Werror-implicit-function-declaration -Wno-system-headers > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -I/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include > -static > -L/home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib > -L/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/lib > conftest.c -lpsl -lmbedtls -lmbedx509 -lmbedcrypto -lz -latomic >&5 > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/aarch64_be-buildroot-linux-musl/11.4.0/../../../../aarch64_be-buildroot-linux-musl/bin/ld: > /home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib/libpsl.a(psl.c.o): > in function `is_public_suffix': > psl.c:(.text+0x2a8): undefined reference to `idn2_lookup_u8' > [...] > checking for library containing psl_builtin... no > configure: error: libpsl was not found > Fixes: 5cee6b6be6524e443012d130e09b0e6983b0ff90 > - http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 08:02:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 09:02:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: fix linux-pam select In-Reply-To: <20240224213008.670294-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 24 Feb 2024 22:30:08 +0100") References: <20240224213008.670294-1-fontaine.fabrice@gmail.com> Message-ID: <87o7c5rmyn.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb forgot to handle > linux-pam dependencies resulting in the following build failure: > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM > Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=y] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] > Selected by [y]: > - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM > Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=y] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] > Selected by [y]: > - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] > [...] > configure: error: in `/home/autobuild/autobuild/instance-12/output-1/build/linux-pam-1.6.0': > configure: error: failed to find dlopen > Fixes: 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb > - http://autobuild.buildroot.org/results/c0aac8bed08850e07cb94f501d754c3c64cdfe07 > Signed-off-by: Fabrice Fontaine > --- > package/openssh/Config.in | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > diff --git a/package/openssh/Config.in b/package/openssh/Config.in > index a3038ba01f..c108569547 100644 > --- a/package/openssh/Config.in > +++ b/package/openssh/Config.in > @@ -1,7 +1,10 @@ > config BR2_PACKAGE_OPENSSH > bool "openssh" > depends on BR2_USE_MMU # fork() > - select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION > + select BR2_PACKAGE_LINUX_PAM if \ > + BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION && \ > + BR2_ENABLE_LOCALE && BR2_USE_WCHAR && \ > + !BR2_STATIC_LIBS && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 This stops kconfig from complaining, but does a openssh + refpolicy build without (E.G. ) locale support then actually work? Judging from: commit 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb Author: Adam Duskett Date: Mon Oct 9 16:34:40 2023 +0200 package/openssh: select linux-pam if refpolicy upstream is selected linux-pam is required to login via OpenSSH if the upstream refpolicy for SELinux is enaabled, as linux-pam handles changing user contexts. If a user wants to make their own policy and use a refpolicy via git, we of course should let them do so. As such, only select linux-pam if the upstream version of refpolicy is selected. I am not sure what the proper solution is for situations where pam is not available? Adam? -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:41:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:41:34 +0100 Subject: [Buildroot] [git commit] package/gdal: deflate64 needs libzlib Message-ID: <20240225080241.5693887A59@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4350d485a441b31ebb1ccb5124f081fda9104132 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master deflate64 unconditionally uses FAR since its addition with https://github.com/OSGeo/gdal/commit/d6baebcc73ffc2ede6e9635846676b275b02bab3 resulting in the following build failure with zlib-ng since bump to version 3.8.2 in commit d2e349301b79ad3a1840083714ee396f4302b68a: In file included from /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/infback9.c:6: /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/minified_zutil.h:46:17: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'uchf' 46 | typedef uch FAR uchf; | ^~~~ Fixes: d2e349301b79ad3a1840083714ee396f4302b68a - http://autobuild.buildroot.org/results/8b55108dee4faa98c234d00a1a22b62ed948e8d3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gdal/gdal.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 3104332db9..247e13663c 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -124,6 +124,12 @@ else GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF endif +ifeq ($(BR2_PACKAGE_LIBZLIB),y) +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=ON +else +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON From peter at korsgaard.com Sun Feb 25 07:52:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:52:46 +0100 Subject: [Buildroot] [git commit] package/redis-plus-plus: needs threads Message-ID: <20240225080241.73E1287A8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=044752f5631a6fdb330ad57b8c8a5827c6b2bc86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master redis-plus-plus unconditonally uses mutex and so needs threads since its addition in commit c46df9de21e718a9ed6a2df2bb945c386695d3bf and https://github.com/sewenew/redis-plus-plus/commit/1fa8f6bbfb24c8f328aa23ee1dd3c3f99c1b4caf: In file included from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.h:27, from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.cpp:17: /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/sentinel.h:95:10: error: 'mutex' in namespace 'std' does not name a type 95 | std::mutex _mutex; | ^~~~~ Fixes: c46df9de21e718a9ed6a2df2bb945c386695d3bf - http://autobuild.buildroot.org/results/cc4c54134e8a522b4c028aab4266f47cf862e2a9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/redis-plus-plus/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/redis-plus-plus/Config.in b/package/redis-plus-plus/Config.in index 6a21aee2b3..64a84102d4 100644 --- a/package/redis-plus-plus/Config.in +++ b/package/redis-plus-plus/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_REDIS_PLUS_PLUS bool "redis-plus-plus" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_HIREDIS help Redis client written in C++ @@ -11,5 +12,5 @@ config BR2_PACKAGE_REDIS_PLUS_PLUS https://github.com/sewenew/redis-plus-plus -comment "redis-plus-plus needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "redis-plus-plus needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS From peter at korsgaard.com Sun Feb 25 07:53:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:53:34 +0100 Subject: [Buildroot] [git commit] package/libcurl: fix libpsl static build Message-ID: <20240225080241.8061187A90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bedcd1cd39c7654d1243e2cb0f4a68870f67782c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following static build failure with libpsl raised since bump to version 8.6.0 in commit 5cee6b6be6524e443012d130e09b0e6983b0ff90: configure:28830: /home/autobuild/autobuild/instance-6/output-1/host/bin/aarch64_be-buildroot-linux-musl-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -static -Werror-implicit-function-declaration -Wno-system-headers -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include -static -L/home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib -L/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/lib conftest.c -lpsl -lmbedtls -lmbedx509 -lmbedcrypto -lz -latomic >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/aarch64_be-buildroot-linux-musl/11.4.0/../../../../aarch64_be-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib/libpsl.a(psl.c.o): in function `is_public_suffix': psl.c:(.text+0x2a8): undefined reference to `idn2_lookup_u8' [...] checking for library containing psl_builtin... no configure: error: libpsl was not found Fixes: 5cee6b6be6524e443012d130e09b0e6983b0ff90 - http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-configure.ac-find-libpsl-with-pkg-config.patch | 109 +++++++++++++++++++++ package/libcurl/libcurl.mk | 2 + 2 files changed, 111 insertions(+) diff --git a/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch new file mode 100644 index 0000000000..46df1e36a2 --- /dev/null +++ b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch @@ -0,0 +1,109 @@ +From 9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Feb 2024 20:59:25 +0100 +Subject: [PATCH] configure.ac: find libpsl with pkg-config + +Find libpsl with pkg-config to avoid static build failures. + +Ref: http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 + +Signed-off-by: Fabrice Fontaine +Closes #12947 + +Upstream: https://github.com/curl/curl/commit/9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 +--- + configure.ac | 79 ++++++++++++++++++++++++++++++++++++++++++++-------- + docs/TODO | 7 ----- + 2 files changed, 67 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cd0e2d07d8d164..09d5364f4de575 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2075,19 +2075,74 @@ dnl ********************************************************************** + dnl Check for libpsl + dnl ********************************************************************** + +-AC_ARG_WITH(libpsl, +- AS_HELP_STRING([--without-libpsl], +- [disable support for libpsl]), +- with_libpsl=$withval, +- with_libpsl=yes) +-curl_psl_msg="no (libpsl disabled)" +-if test $with_libpsl != "no"; then +- AC_SEARCH_LIBS(psl_builtin, psl, +- [curl_psl_msg="enabled"; +- AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled]) +- ], +- [AC_MSG_ERROR([libpsl was not found]) ] ++dnl Default to compiler & linker defaults for LIBPSL files & libraries. ++OPT_LIBPSL=off ++AC_ARG_WITH(libpsl,dnl ++AS_HELP_STRING([--with-libpsl=PATH],[Where to look for libpsl, PATH points to the LIBPSL installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]) ++AS_HELP_STRING([--without-libpsl], [disable LIBPSL]), ++ OPT_LIBPSL=$withval) ++ ++if test X"$OPT_LIBPSL" != Xno; then ++ dnl backup the pre-libpsl variables ++ CLEANLDFLAGS="$LDFLAGS" ++ CLEANCPPFLAGS="$CPPFLAGS" ++ CLEANLIBS="$LIBS" ++ ++ case "$OPT_LIBPSL" in ++ yes) ++ dnl --with-libpsl (without path) used ++ CURL_CHECK_PKGCONFIG(libpsl) ++ ++ if test "$PKGCONFIG" != "no" ; then ++ LIB_PSL=`$PKGCONFIG --libs-only-l libpsl` ++ LD_PSL=`$PKGCONFIG --libs-only-L libpsl` ++ CPP_PSL=`$PKGCONFIG --cflags-only-I libpsl` ++ else ++ dnl no libpsl pkg-config found ++ LIB_PSL="-lpsl" ++ fi ++ ++ ;; ++ off) ++ dnl no --with-libpsl option given, just check default places ++ LIB_PSL="-lpsl" ++ ;; ++ *) ++ dnl use the given --with-libpsl spot ++ LIB_PSL="-lpsl" ++ PREFIX_PSL=$OPT_LIBPSL ++ ;; ++ esac ++ ++ dnl if given with a prefix, we set -L and -I based on that ++ if test -n "$PREFIX_PSL"; then ++ LD_PSL=-L${PREFIX_PSL}/lib$libsuff ++ CPP_PSL=-I${PREFIX_PSL}/include ++ fi ++ ++ LDFLAGS="$LDFLAGS $LD_PSL" ++ CPPFLAGS="$CPPFLAGS $CPP_PSL" ++ LIBS="$LIB_PSL $LIBS" ++ ++ AC_CHECK_LIB(psl, psl_builtin, ++ [ ++ AC_CHECK_HEADERS(libpsl.h, ++ curl_psl_msg="enabled" ++ LIBPSL_ENABLED=1 ++ AC_DEFINE(USE_LIBPSL, 1, [if libpsl is in use]) ++ AC_SUBST(USE_LIBPSL, [1]) ++ ) ++ ], ++ dnl not found, revert back to clean variables ++ LDFLAGS=$CLEANLDFLAGS ++ CPPFLAGS=$CLEANCPPFLAGS ++ LIBS=$CLEANLIBS + ) ++ ++ if test X"$OPT_LIBPSL" != Xoff && ++ test "$LIBPSL_ENABLED" != "1"; then ++ AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!]) ++ fi + fi + AM_CONDITIONAL([USE_LIBPSL], [test "$curl_psl_msg" = "enabled"]) + diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 9dafe90c82..4281cfabb1 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -14,6 +14,8 @@ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_INSTALL_STAGING = YES +# 0001-configure.ac-find-libpsl-with-pkg-config.patch +LIBCURL_AUTORECONF = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') # support because it uses fork(), which doesn't work on non-MMU platforms. From peter at korsgaard.com Sun Feb 25 07:44:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:44:22 +0100 Subject: [Buildroot] [git commit] support/testing: add sox runtime test Message-ID: <20240225080241.591B387A8C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9047058cd8addca8aedf274f2836f1f639c27eef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_sox.py | 74 +++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0f065bfafb..0bfe91f064 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1849,6 +1849,7 @@ F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py +F: support/testing/tests/package/test_sox.py F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py diff --git a/support/testing/tests/package/test_sox.py b/support/testing/tests/package/test_sox.py new file mode 100644 index 0000000000..74f784a36f --- /dev/null +++ b/support/testing/tests/package/test_sox.py @@ -0,0 +1,74 @@ +import math +import os + +import infra.basetest + + +class TestSox(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_AUBIO=y + BR2_PACKAGE_SOX=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def note_from_freq(self, freq): + """Return a note number from the input frequency in Hertz.""" + return round((12 * math.log(freq / 440) / math.log(2)) + 69) + + def check_audio_note(self, input_file, expected_note): + """Check the input_file include the expected_note.""" + out, ret = self.emulator.run(f"aubionotes {input_file}", timeout=20) + self.assertEqual(ret, 0) + note_found = False + for line in out: + values = line.split() + if len(values) == 3: + note = round(float(values[0])) + if note == expected_note: + note_found = True + self.assertTrue(note_found, "The expected note was not found") + + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("sox --version") + + freq = 440 # General Midi note A3 + expected_note = self.note_from_freq(freq) + wav_file = "ref.wav" + tmpwav_file = "tmp.wav" + + # Generate a sinusoidal tone. + cmd = "sox -V -r 48000 -n -b 16 -c 1" + cmd += f" {wav_file} synth 3 sin {freq} vol -10dB" + self.assertRunOk(cmd) + + # Compute statistics on the generated file. + self.assertRunOk(f"sox {wav_file} -n stat") + + # We check the generated wave file includes the expected note. + self.check_audio_note(wav_file, expected_note) + + # We resample the reference file. + cmd = f"sox -V {wav_file} -r 22050 {tmpwav_file}" + self.assertRunOk(cmd) + + # We should still detect our expected note. + self.check_audio_note(tmpwav_file, expected_note) + + # We convert the file by changing the speed by a factor. + speed_factor = 2 + cmd = f"sox -V {wav_file} {tmpwav_file} speed {speed_factor}" + self.assertRunOk(cmd) + + # We compute the new expected note from this test controller + # side, and check we detect this new note in the audio file. + new_expected_note = self.note_from_freq(freq * speed_factor) + self.check_audio_note(tmpwav_file, new_expected_note) From peter at korsgaard.com Sun Feb 25 07:38:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:38:17 +0100 Subject: [Buildroot] [git commit] package/php: bump version to 8.2.16 Message-ID: <20240225080241.4C92B87A8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8982b02b6e875d39ffb78a3200b266650e3addc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#8.2.16 Release notes: https://www.php.net/releases/8_2_16.php Updated license hash due to copyright year bump: https://github.com/php/php-src/commit/2575e6b88c3d3bbd53383fb65057c9b7b029e264 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/php/php.hash | 4 ++-- package/php/php.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 7c8736e41c..4ce3616de3 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 php-8.2.15.tar.xz +sha256 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php-8.2.16.tar.xz # License file -sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE +sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c69abd5f31..4daf7f633d 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.15 +PHP_VERSION = 8.2.16 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Sun Feb 25 07:47:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:47:21 +0100 Subject: [Buildroot] [git commit] boot/barebox: install all barebox images if none were specified Message-ID: <20240225080241.67A4787A8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b89648b4d0d1c3ca985d5d97015990caf04e46ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When selecting barebox in menuconfig, BR2_TARGET_BAREBOX_IMAGE_FILE will be empty by default, which causes Buildroot to install whatever the barebox-flash-image symlink points at for barebox versions >= v2012.10.0. This is an outdated fallback, because barebox-flash-image is only valid when the barebox build produces a single binary. Virtually all new defconfigs added in the last couple of years are multiconfig (CONFIG_PBL_IMAGE=y) however, meaning that a single imx_v7_defconfig or multi_v8_defconfig will produce many images that support different boards or even platforms. As there is no single valid target for barebox-flash-image to point at in this case, this symlink will point at a non-existing 'multi-image-build' to alert the user to this fact. As replacement for barebox-flash-image, barebox commit 550cf79c216a ("Make list of flash images and fix link all single image cases") first released with v2015.12.0 creates a barebox-flash-images file with a list of all images built by barebox. Have buildroot use that file as a fallback before trying barebox-flash-image to have a fallback that works for any recent barebox defconfig as well. Signed-off-by: Ahmad Fatoum Signed-off-by: Peter Korsgaard --- boot/barebox/barebox-aux/Config.in | 9 +++++++-- boot/barebox/barebox.mk | 2 ++ boot/barebox/barebox/Config.in | 9 +++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/boot/barebox/barebox-aux/Config.in b/boot/barebox/barebox-aux/Config.in index d39d24f763..4b0201ea67 100644 --- a/boot/barebox/barebox-aux/Config.in +++ b/boot/barebox/barebox-aux/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_AUX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_AUX_CUSTOM_ENV bool "Generate an environment image" diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 4c9df8d618..fe366989b9 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -151,6 +151,8 @@ $(1)_IMAGE_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE)) define $(1)_INSTALL_IMAGES_CMDS if test -n "$$($(1)_IMAGE_FILES)"; then \ cp -L $$(foreach image,$$($(1)_IMAGE_FILES),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ + elif test -e $$(@D)/barebox-flash-images ; then \ + cp -L $$(foreach image,$$(shell cat $$(@D)/barebox-flash-images),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ elif test -h $$(@D)/barebox-flash-image ; then \ cp -L $$(@D)/barebox-flash-image $$(BINARIES_DIR)/barebox.bin ; \ else \ diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in index 958e294e40..2fd70a84ae 100644 --- a/boot/barebox/barebox/Config.in +++ b/boot/barebox/barebox/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_BAREBOXENV bool "bareboxenv tool in target" From yann.morin.1998 at free.fr Sun Feb 25 09:04:59 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 10:04:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: fix linux-pam select In-Reply-To: <87o7c5rmyn.fsf@48ers.dk> References: <20240224213008.670294-1-fontaine.fabrice@gmail.com> <87o7c5rmyn.fsf@48ers.dk> Message-ID: Peter, Fabrice, All, On 2024-02-25 09:02 +0100, Peter Korsgaard spake thusly: > >>>>> "Fabrice" == Fabrice Fontaine writes: > > Commit 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb forgot to handle > > linux-pam dependencies resulting in the following build failure: [--SNIP--] > This stops kconfig from complaining, but does a openssh + refpolicy build > without (E.G. ) locale support then actually work? Judging from: > commit 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb [--SNIP--] > I am not sure what the proper solution is for situations where pam is > not available? Adam? I already sent a fix for this a while back, and we discussed it with Thomas back at the last dev-days, summarised there: https://lore.kernel.org/buildroot/20240207122726.2aa4be3c at windsurf/ I'll need to send that new iteration soon... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 25 09:24:21 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 10:24:21 +0100 Subject: [Buildroot] [PATCH] package/openssh: fix dependencies with refpolicy Message-ID: <20240225092421.1468140-1-yann.morin.1998@free.fr> Commit 2c5a82a29ceb (package/openssh: select linux-pam if refpolicy upstream is selected) did not account for the linux-pam dependencies before selecting it, causing unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0xCF227CF4 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] 2c5a82a29ceb made the choice of having openssl bear the responsibility to select linux-pam when the upstream refpolicy version was enabled. Semantically however, the responsibility really lies within refpolicy itself, since that's what imposes linux-pam to openssh. Move the select to refpolicy and drop it from openssh. Then, ensure that linux-pam is only selected when it is available. That means that one may get an openssh that is not linked against linux-pam, when the linux-pam dependencies are not met; refpolicy (by way of libsepol) also has a more stringent requirement on gcc version than linux-pam, so most probably the missing dependencies would be locale, wchar, or a static build. We consider that situation to be a corner case that we do not want to address. In the future, we may have more similar situations, whereby refpolicy would impose other packages be linked with otherwise optional dependencies. If (when) that were (will be) the case, then the proposed mechanism would quickly become ugly; we could then re-assess a nicer way to do that. Until then, this is good ebough. Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Thomas Petazzoni Cc: Fabrice Fontaine --- Changes v1 -> v2: - simplify the logic: have refpolicy bear the select --- package/openssh/Config.in | 1 - package/refpolicy/Config.in | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index a3038ba01f..08d3c7d391 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_OPENSSH bool "openssh" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 0e72b895df..8ae8f0448d 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -36,6 +36,14 @@ choice config BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION bool "Upstream version" + # Consider reworking the following when adding new entries: + # Upstream refpolicy for openssh expects linux-pam to be used + select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_OPENSSH \ + && BR2_USE_MMU \ + && BR2_ENABLE_LOCALE \ + && BR2_USE_WCHAR \ + && !BR2_STATIC_LIBS \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 help Use the refpolicy as provided by Buildroot. -- 2.43.2 From fontaine.fabrice at gmail.com Sun Feb 25 09:24:25 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 25 Feb 2024 10:24:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: add openssl optional dependency Message-ID: <20240225092425.783094-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/gdal/gdal.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 247e13663c..77ffb514c2 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -46,7 +46,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_BLOSC=OFF \ -DGDAL_USE_BRUNSLI=OFF \ -DGDAL_USE_CFITSIO=OFF \ - -DGDAL_USE_OPENSSL=OFF \ -DGDAL_USE_CRYPTOPP=OFF \ -DGDAL_USE_CRNLIB=OFF \ -DGDAL_USE_ECW=OFF \ @@ -130,6 +129,13 @@ else GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +GDAL_DEPENDENCIES += openssl +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=ON +else +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 25 11:21:45 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 12:21:45 +0100 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 In-Reply-To: References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> <20240206233318.593730bd@windsurf> <87wmqut14w.fsf__36507.8827760712$1708783134$gmane$org@48ers.dk> Message-ID: Bernd, All, On 2024-02-24 20:01 +0100, Bernd Kuhls spake thusly: > Am Sat, 24 Feb 2024 14:58:23 +0100 schrieb Peter Korsgaard: > > > We unfortunately are still having a number of build failures because of > > this, E.G. for target == host > > Hi, > > ftr, the host == target problem is solved by using a patch from here: > https://github.com/python/cpython/issues/115382#issuecomment-1952936367 The issue with that, is that none of the upstream maintainers have chimed in to express their view on whether this is the correct approach, or to suggest something else. If we go and carry that patch without upstream feedback, we risk carrying forever without the issue ever being fixed upstream. What happens in other buildsystems, like OE or openWRT? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Sun Feb 25 11:44:13 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 12:44:13 +0100 Subject: [Buildroot] [PATCH 1/2] configs/qemu_microblaze{be, el}: remove xilinx xemaclite patch needed for qemu < 2.2.0 Message-ID: <20240225114414.2556543-1-romain.naour@smile.fr> We carried a patch for xilinx xemaclite that was made initially for qemu < 2.2.0 [1]. Indeed, between Qemu 0.11.0 and 2.2.0 the devicetree binary blob petalogix-s3adsp1800.dtb (bundled in Qemu sources) used a compatible string 'xlnx,xps-ethernetlite-2.00.b' that was not supported by the Linux kernel [2]. Theses patches could have been removed since Buildroot 2015.02 when this defconfig was tested with Qemu 2.2.0 [3]. [1] https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 [2] https://gitlab.com/qemu-project/qemu/-/commit/c21fd2c79e1fcaf45582f2dd4deb491c257aa9f2 [3] https://gitlab.com/buildroot.org/buildroot/-/commit/312990555c4d7d1cccd26e0728ad0d4ec86820a7 Cc: Waldemar Brodkorb Signed-off-by: Romain Naour --- ...xilinx-xemaclite-add-2.00.b-revision.patch | 34 ------------------- ...xilinx-xemaclite-add-2.00.b-revision.patch | 34 ------------------- configs/qemu_microblazebe_mmu_defconfig | 1 - configs/qemu_microblazeel_mmu_defconfig | 1 - 4 files changed, 70 deletions(-) delete mode 100644 board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch delete mode 100644 board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch diff --git a/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f858..0000000000 --- a/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f858..0000000000 --- a/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index e02b8dae2f..a93ef3564d 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 146bbb67de..0b00b58b4e 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y -- 2.43.0 From peter at korsgaard.com Sun Feb 25 11:43:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 12:43:07 +0100 Subject: [Buildroot] [git commit] Update for 2024.02-rc1 Message-ID: <20240225114420.CBF5887A9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a9ba7a71e49f11e2c8d28a578ddef3a1ad96064 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 59 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 ++++++++--------- docs/website/news.html | 21 +++++++++++++++++ 4 files changed, 93 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index f3c38e7d03..3abd4b2281 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,62 @@ +2024.02-rc1, released February 25th, 2024 + + Fixes all over the tree and new features. + + Toolchain: + + - GDB: Add version 14.1, default to 13.2. + + - uClibc-ng updated to 1.0.45 + + - Bootlin external toolchains updated to 2023.11-1, moving the + stable toolchains to GCC 12.3 / binutils 2.40 / GDB 13.2 / + glibc 2.38 / musl 1.2.4 / uClibc-ng 1.0.45 + + - Add support for building a bare metal toolchain suitable for + building firmware for certain (co-)processors, possibly + using a different CPU architecture than the main Buildroot + configuration. + + Default optimization level changed from optimize for size + (-Os) to optimize for speed (-O2). + + Support: Use the Fraunhofer FKIE JSON files for CVE matching + now that NVD is about to deprecate its feeds. + + New defconfigs: AMD Zynqmp kria kd240 and kr260, zcu104, Avnet + RZBoard V2L, Mangopi MQ1RDW2, NXP i.MX 93 11x11 EVK, QEMU + Riscv64 virt-efi, TI AM574x Industrial Development Kit + + Removed defconfigs: Zynq qmtech + + New packages: binutils-bare-metal, dmenu-wayland, fcft, foot, + firmware-ele-imx, ivi-homescreen, libjwt, libtraceevent, + libtracefs, libutempter, lua-ansicolors, lua-argparse, + lua-conciseserialization, lua-ubjson, minisign, + newlib-bare-metal, python-aiosqlite, python-annotated-types, + python-anyio, python-asyncssh, python-bitarray, + python-cachetools, python-contourpy, python-decouple, + python-fastapi-sessions, python-fastapi, + python-google-api-core, python-google-auth, + python-googleapis-common-protos, python-grpc-requests, + python-grpcio-reflection, python-grpcio, python-httpcore, + python-httpx, python-matplotlib-inline, python-ml-dtypes, + python-multipart, python-pydantic-core, python-pypng, + python-starlette, python-tcolorpy, python-trafaret, + python-urwid-readline, python-uvicorn, rlwrap, tllist + + Removed packages: davinci-bootcount (renamed to + uboot-bootcount), flickcurl, gmpc, libmpd, micropython-lib, + python-crossbar, python-pygame, tinymembench + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpanelr2_.. + #15889: please update meson + #15898: Unable to boot syslinux.efi produced by buildroot (EFI 64-.. + #15910: USB keyboard is not working by default "raspberrypicm4io_.. + #15952: Grub fails to load large rootfs files + 2023.11.1, released January 15th, 2024 Important / security related fixes. diff --git a/Makefile b/Makefile index ac625152c6..dc1271825e 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02-git +export BR2_VERSION := 2024.02-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1701677000 +BR2_VERSION_EPOCH = 1708860000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index e13d94cc5a..ece22e409d 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -75,41 +75,41 @@

PGP signature

- + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
diff --git a/docs/website/news.html b/docs/website/news.html index e052c99803..89dc740699 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

News

    +
  • +
    +
    +
    +

    2024.02-rc1 released

    +

    25 February 2024

    +
    +
    +

    We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

    + +

    Go to the downloads page to pick up the + 2024.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
  • +
  • From romain.naour at smile.fr Sun Feb 25 11:44:14 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 12:44:14 +0100 Subject: [Buildroot] [PATCH 2/2] configs/qemu: update defconfigs to Linux 6.6.18 In-Reply-To: <20240225114414.2556543-1-romain.naour@smile.fr> References: <20240225114414.2556543-1-romain.naour@smile.fr> Message-ID: <20240225114414.2556543-2-romain.naour@smile.fr> Update all qemu defconfigs to the latest Kernel LTS version. Remove m68k kernel patches already in v6.6.x. Signed-off-by: Romain Naour --- ...001-m68k-Fix-invalid-.section-syntax.patch | 97 ------------------- ...001-m68k-Fix-invalid-.section-syntax.patch | 97 ------------------- configs/qemu_aarch64_ebbr_defconfig | 2 +- configs/qemu_aarch64_sbsa_defconfig | 4 +- configs/qemu_aarch64_virt_defconfig | 4 +- configs/qemu_arm_ebbr_defconfig | 2 +- configs/qemu_arm_versatile_defconfig | 4 +- configs/qemu_arm_vexpress_defconfig | 4 +- configs/qemu_arm_vexpress_tz_defconfig | 4 +- configs/qemu_m68k_mcf5208_defconfig | 5 +- configs/qemu_m68k_q800_defconfig | 5 +- configs/qemu_microblazebe_mmu_defconfig | 4 +- configs/qemu_microblazeel_mmu_defconfig | 4 +- configs/qemu_mips32r2_malta_defconfig | 4 +- configs/qemu_mips32r2el_malta_defconfig | 4 +- configs/qemu_mips32r6_malta_defconfig | 4 +- configs/qemu_mips32r6el_malta_defconfig | 4 +- configs/qemu_mips64_malta_defconfig | 4 +- configs/qemu_mips64el_malta_defconfig | 4 +- configs/qemu_mips64r6_malta_defconfig | 4 +- configs/qemu_mips64r6el_malta_defconfig | 4 +- configs/qemu_nios2_10m50_defconfig | 4 +- configs/qemu_or1k_defconfig | 4 +- configs/qemu_ppc64_e5500_defconfig | 4 +- configs/qemu_ppc64_pseries_defconfig | 4 +- configs/qemu_ppc64le_powernv8_defconfig | 4 +- configs/qemu_ppc64le_pseries_defconfig | 4 +- configs/qemu_ppc_bamboo_defconfig | 4 +- configs/qemu_ppc_e500mc_defconfig | 4 +- configs/qemu_ppc_g3beige_defconfig | 4 +- configs/qemu_ppc_mac99_defconfig | 4 +- configs/qemu_ppc_mpc8544ds_defconfig | 4 +- configs/qemu_riscv32_virt_defconfig | 4 +- configs/qemu_riscv64_nommu_virt_defconfig | 4 +- configs/qemu_riscv64_virt_defconfig | 4 +- configs/qemu_riscv64_virt_efi_defconfig | 4 +- configs/qemu_s390x_defconfig | 4 +- configs/qemu_sh4_r2d_defconfig | 4 +- configs/qemu_sh4eb_r2d_defconfig | 4 +- configs/qemu_sparc64_sun4u_defconfig | 4 +- configs/qemu_x86_64_defconfig | 4 +- configs/qemu_x86_defconfig | 4 +- configs/qemu_xtensa_lx60_defconfig | 4 +- configs/qemu_xtensa_lx60_nommu_defconfig | 4 +- 44 files changed, 82 insertions(+), 278 deletions(-) delete mode 100644 board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch delete mode 100644 board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch diff --git a/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch b/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch deleted file mode 100644 index 1f1ed75ae0..0000000000 --- a/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0bb6b7477f5dcfafbdd76eea9c7aa7a5f78d7613 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Fri, 16 Jun 2023 17:36:10 +0200 -Subject: [PATCH] m68k: Fix invalid .section syntax - -gas supports several different forms for .section for ELF targets, -including: - .section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]] -and: - .section "NAME"[, #FLAGS...] - -In several places we use a mix of these two forms: - .section NAME, #FLAGS... - -A current development snapshot of binutils (2.40.50.20230611) treats -this mixed syntax as an error. - -Change to consistently use: - .section NAME, "FLAGS" -as is used elsewhere in the kernel. - -Link: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=m68k&ver=6.4%7Erc6-1%7Eexp1&stamp=1686907300&raw=1 -Signed-off-by: Ben Hutchings -Tested-by: Jan-Benedict Glaw -Link: https://lore.kernel.org/r/ZIyBaueWT9jnTwRC at decadent.org.uk -Signed-off-by: Geert Uytterhoeven -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=922a9bd138101e3e5718f0f4d40dba68ef89bb43 -Signed-off-by: Thomas Petazzoni ---- - arch/m68k/fpsp040/skeleton.S | 4 ++-- - arch/m68k/ifpsp060/os.S | 4 ++-- - arch/m68k/kernel/relocate_kernel.S | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S -index 439395aa6fb4..081922c72daa 100644 ---- a/arch/m68k/fpsp040/skeleton.S -+++ b/arch/m68k/fpsp040/skeleton.S -@@ -499,13 +499,13 @@ in_ea: - dbf %d0,morein - rts - -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: - jbsr fpsp040_die - jbra .Lnotkern - -- .section __ex_table,#alloc -+ .section __ex_table,"a" - .align 4 - - .long in_ea,1b -diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S -index 7a0d6e428066..89e2ec224ab6 100644 ---- a/arch/m68k/ifpsp060/os.S -+++ b/arch/m68k/ifpsp060/os.S -@@ -379,11 +379,11 @@ _060_real_access: - - - | Execption handling for movs access to illegal memory -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: moveq #-1,%d1 - rts --.section __ex_table,#alloc -+.section __ex_table,"a" - .align 4 - .long dmrbuae,1b - .long dmrwuae,1b -diff --git a/arch/m68k/kernel/relocate_kernel.S b/arch/m68k/kernel/relocate_kernel.S -index ab0f1e7d4653..f7667079e08e 100644 ---- a/arch/m68k/kernel/relocate_kernel.S -+++ b/arch/m68k/kernel/relocate_kernel.S -@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcopy),%a4 - 2: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 2b+2 - .previous - -@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcont040),%a4 - 5: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 5b+2 - .previous - --- -2.41.0 - diff --git a/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch b/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch deleted file mode 100644 index 1f1ed75ae0..0000000000 --- a/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0bb6b7477f5dcfafbdd76eea9c7aa7a5f78d7613 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Fri, 16 Jun 2023 17:36:10 +0200 -Subject: [PATCH] m68k: Fix invalid .section syntax - -gas supports several different forms for .section for ELF targets, -including: - .section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]] -and: - .section "NAME"[, #FLAGS...] - -In several places we use a mix of these two forms: - .section NAME, #FLAGS... - -A current development snapshot of binutils (2.40.50.20230611) treats -this mixed syntax as an error. - -Change to consistently use: - .section NAME, "FLAGS" -as is used elsewhere in the kernel. - -Link: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=m68k&ver=6.4%7Erc6-1%7Eexp1&stamp=1686907300&raw=1 -Signed-off-by: Ben Hutchings -Tested-by: Jan-Benedict Glaw -Link: https://lore.kernel.org/r/ZIyBaueWT9jnTwRC at decadent.org.uk -Signed-off-by: Geert Uytterhoeven -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=922a9bd138101e3e5718f0f4d40dba68ef89bb43 -Signed-off-by: Thomas Petazzoni ---- - arch/m68k/fpsp040/skeleton.S | 4 ++-- - arch/m68k/ifpsp060/os.S | 4 ++-- - arch/m68k/kernel/relocate_kernel.S | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S -index 439395aa6fb4..081922c72daa 100644 ---- a/arch/m68k/fpsp040/skeleton.S -+++ b/arch/m68k/fpsp040/skeleton.S -@@ -499,13 +499,13 @@ in_ea: - dbf %d0,morein - rts - -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: - jbsr fpsp040_die - jbra .Lnotkern - -- .section __ex_table,#alloc -+ .section __ex_table,"a" - .align 4 - - .long in_ea,1b -diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S -index 7a0d6e428066..89e2ec224ab6 100644 ---- a/arch/m68k/ifpsp060/os.S -+++ b/arch/m68k/ifpsp060/os.S -@@ -379,11 +379,11 @@ _060_real_access: - - - | Execption handling for movs access to illegal memory -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: moveq #-1,%d1 - rts --.section __ex_table,#alloc -+.section __ex_table,"a" - .align 4 - .long dmrbuae,1b - .long dmrwuae,1b -diff --git a/arch/m68k/kernel/relocate_kernel.S b/arch/m68k/kernel/relocate_kernel.S -index ab0f1e7d4653..f7667079e08e 100644 ---- a/arch/m68k/kernel/relocate_kernel.S -+++ b/arch/m68k/kernel/relocate_kernel.S -@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcopy),%a4 - 2: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 2b+2 - .previous - -@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcont040),%a4 - 5: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 5b+2 - .previous - --- -2.41.0 - diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 75a892f798..84ab60a60b 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 5acfaea777..06cce72b6e 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/a BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 1167060308..fedefd6d79 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index a0520edcf4..ea732721ad 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 7c93ae3e7e..2c73090d5d 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index ccbcc8ea4e..12ec33ed7a 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2_SIZE="64M" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 11a5c98174..76e2431f28 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -17,12 +17,12 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 0c95756a8e..64b906b2e5 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -14,15 +14,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" -BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index a3a09ef775..83f3d03c60 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -14,15 +14,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" -BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index a93ef3564d..9266b3e4aa 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 0b00b58b4e..bef418fd51 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index 1fdc588998..29ab718748 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 35d071010d..9f963d26df 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index a57347d2a6..b3fa5f5e11 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index 9fb82a76d2..ef98362b5b 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index f314b123a8..d645f2ffdd 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index 672c416a09..b64b577abe 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 15dba14cc6..5f7bc13b84 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 39b9c73bcd..500ec39658 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 698ff68e5e..327fd99196 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 4f1030b35f..3cbe89ce5f 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -13,12 +13,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 8e68fae3c2..1f34a50b74 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 4bc9534166..8c58fec24f 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index 4975a90bc6..23ad5772c2 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 1cca03053b..207e5f5b40 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index 284982cf2c..1ebd2be5dc 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index e50484f5a3..75833000e4 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 6c14a1ca90..0234827092 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index 33b9ec0d63..b03378b34f 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -6,12 +6,12 @@ BR2_powerpc_7400=y BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index efbc5fc81d..9ae10a9577 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 74a67400ea..56341c768e 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index 9999bcf7f3..34dd1c88ba 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -4,7 +4,7 @@ BR2_RISCV_64=y # BR2_RISCV_USE_MMU is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System BR2_TARGET_GENERIC_GETTY=y @@ -19,7 +19,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 52ad87fa7c..93c65b2727 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_efi_defconfig b/configs/qemu_riscv64_virt_efi_defconfig index 79aadf78ca..0818b8f3aa 100644 --- a/configs/qemu_riscv64_virt_efi_defconfig +++ b/configs/qemu_riscv64_virt_efi_defconfig @@ -1,11 +1,11 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/riscv64-virt-efi/assemble-flash-images support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/riscv64-virt-efi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.69" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 39dae4be2a..a768ca3053 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -13,12 +13,12 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 038a9763c3..e5570dcbab 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index a8988d4446..468d6567ae 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 8a61155411..213083c142 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 9e99d9d2b2..030818199b 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 5c6bebd3e3..92764c9852 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 8dcdced01b..d315f2604d 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index d1d59b9525..16a323db94 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 25 13:38:18 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 25 Feb 2024 14:38:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpthsem: fix build with autoconf >= 2.72 Message-ID: <20240225133818.1364667-1-fontaine.fabrice@gmail.com> Move fi statement where it belongs to fix the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: checking for stack setup via makecontext... ./configure: line 15863: syntax error near unexpected token `;;' Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/013e0d3f72582ce3675f65786c014518682d703b Signed-off-by: Fabrice Fontaine --- ...lude.m4-fix-build-with-autoconf-2.72.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch diff --git a/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch b/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch new file mode 100644 index 0000000000..0c66482c3a --- /dev/null +++ b/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch @@ -0,0 +1,36 @@ +From 3ec1a1c22142c547bc7f44622291bf0abdc322f1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 25 Feb 2024 14:33:02 +0100 +Subject: [PATCH] acinclude.m4: fix build with autoconf >= 2.72 + +Move fi statement where it belongs to fix the following build failure +with autoconf >= 2.72: + +checking for stack setup via makecontext... ./configure: line 15863: syntax error near unexpected token `;;' + +Fixes: + - http://autobuild.buildroot.org/results/013e0d3f72582ce3675f65786c014518682d703b + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linknx/pthsem/pull/1 +--- + acinclude.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 03b42de..d74889f 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1426,8 +1426,8 @@ ac_cv_stacksetup_$1='guessed:(skaddr),(sksize)' + ]) + dnl # restore original compile environment + CFLAGS="$OCFLAGS" +-])dnl + fi ++])dnl + dnl # extract result ingredients of single cached result value + type=`echo $ac_cv_stacksetup_$1 | sed -e 's;:.*$;;'` + addr=`echo $ac_cv_stacksetup_$1 | sed -e 's;^.*:;;' -e 's;,.*$;;'` +-- +2.43.0 + -- 2.43.0 From fancp2007 at gmail.com Sun Feb 25 14:04:33 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Sun, 25 Feb 2024 22:04:33 +0800 Subject: [Buildroot] [PATCH v8] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240223131603.2313178-1-fancp2007@gmail.com> References: <20240223131603.2313178-1-fancp2007@gmail.com> Message-ID: <20240225140434.7310-1-fancp2007@gmail.com> Add support for the FriendlyARM NanoPi NEO2 with mainline components: - ATF v2.7 - U-Boot 2024.01 - Linux 6.6.18 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV allows the ethernet driver to be automatically loaded on boot. Otherwise, it will report the 'device not found' error while run the 'ifconfig eth0' command. Board's wiki page: - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 Signed-off-by: Scott Fan --- Changes v1 -> v2: - Fix issues from 'utils/docker-run make check-package' - Add atf custom version in the defconfig - No need for sudo to run sync Changes v2 -> v3: - Update patch file, add the upstream tag Changes v3 -> v4: - Use a single integrated image file (u-boot-sunxi-with-spl.bin) - Remove patch file for uboot, switch to binman - Merge boot partition into rootfs partition - Bump kernel version to 6.1.61 Changes v4 -> v5: - Bump kernel version to 6.1.65 Changes v5 -> v6: - Bump kernel version to 6.6.17 - Bump uboot version to 2024.01 - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y Changes v6 -> v7: - Bump kernel version to 6.6.18 - Add option BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - Resort sections in the defconfig Changes v7 -> v8: - Update commit log to add ATF version - Update commit log to add explanation for the MDEV config --- board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ board/friendlyarm/nanopi-neo2/genimage.cfg | 16 ++++++ board/friendlyarm/nanopi-neo2/post-build.sh | 5 ++ board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++ configs/friendlyarm_nanopi_neo2_defconfig | 57 +++++++++++++++++++++ 5 files changed, 116 insertions(+) create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf new file mode 100644 index 0000000000..482a069f74 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf @@ -0,0 +1,4 @@ +label friendlyarm-nanopi-buildroot + kernel /boot/Image + devicetree /boot/sun50i-h5-nanopi-neo2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg new file mode 100644 index 0000000000..67e4e5efdb --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + } +} diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh new file mode 100755 index 0000000000..c7ec875068 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt new file mode 100644 index 0000000000..c896a57525 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi NEO2. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Wiki link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_neo2_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sync + +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig new file mode 100644 index 0000000000..3118d45625 --- /dev/null +++ b/configs/friendlyarm_nanopi_neo2_defconfig @@ -0,0 +1,57 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# System +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.34.1 From fancp2007 at gmail.com Sun Feb 25 14:25:40 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Sun, 25 Feb 2024 22:25:40 +0800 Subject: [Buildroot] [PATCH] configs/friendlyarm_nanopi_r2s: bump Linux to 6.6.18 and U-Boot to 2024.01 In-Reply-To: <5e4c1a0f-7b41-4510-b87d-2392c832f3c1@benettiengineering.com> References: <20240224103354.7763-1-fancp2007@gmail.com> <5e4c1a0f-7b41-4510-b87d-2392c832f3c1@benettiengineering.com> Message-ID: Hi Giulio, I'll follow your advice in the next few days. Scott Fan On Sun, Feb 25, 2024 at 5:59?AM Giulio Benetti wrote: > > Hi Scott, > > please read all before changing, > > On 24/02/24 11:33, Scott Fan wrote: > > The ATF firmware also bumps to version 2.7, and the bootloader image only > > needs the u-boot-rockchip.bin file. > > > > This commit adds support for internal ethernet port (RTL8211E), and also > > adds USB 3.0 ethernet port firmware for RTL8153B chip on the board. > > > > The associated board files are also updated, notes for the NEO3 board is > > removed from the readme file. > > > > The .checkpackageignore file is updated accordingly (the entry for > > post-build.sh is removed). > > > > Tested on the NanoPi R2S board. > > > > Can you please list all the points using "*" like below? > > This commit: > * bump u-boot version to 2024.01 > * bump Linux version to 6.6.18 > * update ATF version to 2.7 > * switch u-boot image to u-boot-rockchip.bin since ATF 2.7 requires it > * ... > etc. > > This way everything is clearer > > > Wiki link for the board: > > https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S > > > > Signed-off-by: Scott Fan > > --- > > .checkpackageignore | 1 - > > board/friendlyarm/nanopi-r2s/extlinux.conf | 4 +-- > > board/friendlyarm/nanopi-r2s/genimage.cfg | 10 ++---- > > board/friendlyarm/nanopi-r2s/post-build.sh | 4 +-- > > board/friendlyarm/nanopi-r2s/readme.txt | 20 ++++------- > > configs/friendlyarm_nanopi_r2s_defconfig | 39 +++++++++++++++++----- > > 6 files changed, 43 insertions(+), 35 deletions(-) > > > > diff --git a/.checkpackageignore b/.checkpackageignore > > index 4967d749fa..08188dc23e 100644 > > --- a/.checkpackageignore > > +++ b/.checkpackageignore > > @@ -33,7 +33,6 @@ board/cubietech/cubieboard2/post-image.sh Shellcheck > > board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck > > board/freescale/common/mxs/post-image.sh Shellcheck > > board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch Upstream > > -board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck > > board/hardkernel/odroidc2/post-image.sh Shellcheck > > board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables > > board/hardkernel/odroidxu4/post-image.sh EmptyLastLine Shellcheck > > diff --git a/board/friendlyarm/nanopi-r2s/extlinux.conf b/board/friendlyarm/nanopi-r2s/extlinux.conf > > index 1ea0cdd8a5..b2897dea8b 100644 > > --- a/board/friendlyarm/nanopi-r2s/extlinux.conf > > +++ b/board/friendlyarm/nanopi-r2s/extlinux.conf > > @@ -1,4 +1,4 @@ > > -label NanoPi R2S linux > > +label friendlyarm-nanopi-buildroot > > Please add this change to commit log(* update extlinux.conf label name > to friendlyarm-nanopi-buildroot). > > > kernel /boot/Image > > devicetree /boot/rk3328-nanopi-r2s.dtb > > - append root=/dev/mmcblk0p1 rw rootwait > > + append console=ttyS2,1500000 earlyprintk root=/dev/mmcblk0p1 rootwait > > why is console required now? Please add it to commit log > > > diff --git a/board/friendlyarm/nanopi-r2s/genimage.cfg b/board/friendlyarm/nanopi-r2s/genimage.cfg > > index a686b4f14e..98e96a7ddd 100644 > > --- a/board/friendlyarm/nanopi-r2s/genimage.cfg > > +++ b/board/friendlyarm/nanopi-r2s/genimage.cfg > > @@ -4,19 +4,13 @@ image sdcard.img { > > > > partition u-boot-tpl-spl-dtb { > > in-partition-table = "no" > > - image = "idbloader.img" > > + image = "u-boot-rockchip.bin" > > offset = 32K > > } > > > > - partition u-boot-dtb { > > - in-partition-table = "no" > > - image = "u-boot.itb" > > - offset = 8M > > - } > > - > > partition rootfs { > > partition-type = 0x83 > > - offset = 16M > > image = "rootfs.ext4" > > + offset = 10M > > Please keep the offset position the same and document the reason in > commit log > > > } > > } > > diff --git a/board/friendlyarm/nanopi-r2s/post-build.sh b/board/friendlyarm/nanopi-r2s/post-build.sh > > index 1f5ff6a611..c7ec875068 100755 > > --- a/board/friendlyarm/nanopi-r2s/post-build.sh > > +++ b/board/friendlyarm/nanopi-r2s/post-build.sh > > @@ -1,5 +1,5 @@ > > #!/bin/sh > > > > -BOARD_DIR="$(dirname $0)" > > +BOARD_DIR="$(dirname "$0")" > > Is this mandatory? What changed compared to previous version? > > > > > -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf > > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > > Same here for "..." > > Please update commit log with it. > > > diff --git a/board/friendlyarm/nanopi-r2s/readme.txt b/board/friendlyarm/nanopi-r2s/readme.txt > > index 6d291cdd60..d43008b620 100644 > > --- a/board/friendlyarm/nanopi-r2s/readme.txt > > +++ b/board/friendlyarm/nanopi-r2s/readme.txt > > @@ -2,11 +2,11 @@ Intro > > ===== > > > > This default configuration will allow you to start experimenting with the > > -buildroot environment for the Nanopi R2S. With the current configuration > > +buildroot environment for the NanoPi R2S. With the current configuration > > Here the same > > > it will bring-up the board, and allow access through the serial console. > > > > -Nanopi R2S link: > > -https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 > > +Wiki link: > > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S > > This too: * update board URL in readme.txt > > > > > This configuration uses ATF, U-Boot mainline and kernel mainline. > > > > @@ -25,9 +25,6 @@ Files created in output directory > > output/images > > > > ??? bl31.elf > > -??? boot.vfat > > -??? extlinux > > -??? idbloader.img > > ??? Image > > ??? rk3328-nanopi-r2s.dtb > > ??? rootfs.ext2 > > @@ -35,7 +32,7 @@ output/images > > ??? rootfs.tar > > ??? sdcard.img > > ??? u-boot.bin > > -??? u-boot.itb > > +??? u-boot-rockchip.bin > > > > How to write the SD card > > ======================== > > @@ -46,12 +43,7 @@ in the output/images/ directory. > > Copy the bootable "sdcard.img" onto an SD card with "dd": > > > > $ sudo dd if=output/images/sdcard.img of=/dev/sdX > > - $ sudo sync > > + $ sync > > Ditto > > > > > -Insert the micro SDcard in your Nanopi R2S and power it up. The console > > +Insert the micro SDcard in your NanoPi R2S and power it up. The console > > Ditto but you can group this with 2 points above without adding a > dedicated one > > > is on the serial line, 1500000 8N1. > > - > > -Notes > > -===== > > - > > -This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board. > > diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig > > index 284b28ec31..76806e76e7 100644 > > --- a/configs/friendlyarm_nanopi_r2s_defconfig > > +++ b/configs/friendlyarm_nanopi_r2s_defconfig > > @@ -1,42 +1,65 @@ > > +# Architecture > > BR2_aarch64=y > > BR2_cortex_a53=y > > BR2_ARM_FPU_VFPV4=y > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > > + > > +# Linux headers same as kernel, a 6.6 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > > + > > +# System > > BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" > > BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" > > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > > + > > +# Image > > BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" > > + > > +# Kernel > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" > > BR2_LINUX_KERNEL_INSTALL_TARGET=y > > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > + > > +# Filesystem > > BR2_TARGET_ROOTFS_EXT2=y > > BR2_TARGET_ROOTFS_EXT2_4=y > > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > + > > +# Firmware > > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y > > + > > +# Bootloader > > BR2_TARGET_UBOOT=y > > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" > > BR2_TARGET_UBOOT_NEEDS_DTC=y > > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > > -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" > > BR2_TARGET_UBOOT_SPL=y > > -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" > > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-rockchip.bin" > > + > > +# Ethernet firmware for RTL8153B > > +BR2_PACKAGE_LINUX_FIRMWARE=y > > +BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y > > + > > +# Required tools to create the SD image > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > BR2_PACKAGE_HOST_GENIMAGE=y > > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > I think you should split this patch into 2: > 1) the versions bumps > 2) the beautify of the code > > This is because there are many changes and it's difficult to check them, > for me at least. > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Sun Feb 25 14:26:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 15:26:01 +0100 Subject: [Buildroot] Buildroot 2024.02-rc1 released Message-ID: <87jzmssjra.fsf@48ers.dk> Hi, Somewhat later than hoped, but: Buildroot 2024.02-rc1 is released - Go download it at: http://buildroot.net/downloads/buildroot-2024.02-rc1.tar.gz or http://buildroot.net/downloads/buildroot-2024.02-rc1.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Please give it a spin and report any problems to the mailing list or bug tracker. Againg a fairly busy development cycle, with more than 1200 changes from 104 unique contributors! Of noteworthy new features/changes we have: - Toolchain: - GDB: Add version 14.1, default to 13.2. - uClibc-ng updated to 1.0.45 - Bootlin external toolchains updated to 2023.11-1, moving the stable toolchains to GCC 12.3 / binutils 2.40 / GDB 13.2 / glibc 2.38 / musl 1.2.4 / uClibc-ng 1.0.45 - Add support for building a bare metal toolchain suitable for building firmware for certain (co-)processors, possibly using a different CPU architecture than the main Buildroot configuration. - Default optimization level changed from optimize for size (-Os) to optimize for speed (-O2). - Support: Use the Fraunhofer FKIE JSON files for CVE matching now that NVD is about to deprecate its feeds. - A large number of new runtime tests - New defconfigs: AMD Zynqmp kria kd240 and kr260, zcu104, Avnet RZBoard V2L, Mangopi MQ1RDW2, NXP i.MX 93 11x11 EVK, QEMU Riscv64 virt-efi, TI AM574x Industrial Development Kit - New packages: binutils-bare-metal, dmenu-wayland, fcft, foot, firmware-ele-imx, ivi-homescreen, libjwt, libtraceevent, libtracefs, libutempter, lua-ansicolors, lua-argparse, lua-conciseserialization, lua-ubjson, minisign, newlib-bare-metal, python-aiosqlite, python-annotated-types, python-anyio, python-asyncssh, python-bitarray, python-cachetools, python-contourpy, python-decouple, python-fastapi-sessions, python-fastapi, python-google-api-core, python-google-auth, python-googleapis-common-protos, python-grpc-requests, python-grpcio-reflection, python-grpcio, python-httpcore, python-httpx, python-matplotlib-inline, python-ml-dtypes, python-multipart, python-pydantic-core, python-pypng, python-starlette, python-tcolorpy, python-trafaret, python-urwid-readline, python-uvicorn, rlwrap, tllist And the usual package version updates and bug fixes. See the CHANGES file for details: http://git.buildroot.net/buildroot/plain/CHANGES?id=2023.11-rc1 Many thanks to the people contributing to this release: git shortlog -s -n 2023.11.. 313 Fabrice Fontaine 178 James Hilliard 90 Bernd Kuhls 79 Peter Korsgaard 69 Julien Olivain 58 Adam Duskett 38 Francois Perrad 33 Giulio Benetti 28 Yann E. MORIN 27 Thomas Petazzoni 22 Marcus Hoffmann 17 Romain Naour 14 Arnout Vandecappelle 14 Neal Frager 12 Michael Nosthoff 11 Fl?vio Tapaj?s 9 Antoine Coutant 9 Dario Binacchi 9 Petr Vorel 8 Christian Stewart 7 Adrian Perez de Castro 7 Marleen Vos 7 Maxim Kochetkov 7 Thomas Devoogdt 6 Baruch Siach 6 Christian Hitz 6 Peter Seiderer 6 S?bastien Szymanski 5 Alexey Brodkin 5 Kadambini Nema 5 Kilian Zinnecker 5 Sergey Matyukevich 4 Ga?l PORTAY 4 Jan ?erm?k 4 Maxime Chevallier 4 Waldemar Brodkorb 3 Alexander Egorenkov 3 Fabio Estevam 3 Ismael Luceno 3 Joachim Wiberg 3 Marcus Folkesson 3 Peter Macleod Thompson 3 Rafa? Mi?ecki 3 Sergio Prado 3 Xiangyu Chen 2 Andreas Naumann 2 Bram Oosterhuis 2 Frank Vanbever 2 Heiko Thiery 2 Jesse Taube 2 Marcin Niestroj 2 Michael Vetter 2 Reza Arbab 2 Saeed Kazemi 2 Sebastian Weyer 2 Woodrow Douglass 2 Yang Li 1 Abilio Marques 1 Ahmad Fatoum 1 Aleksandr Makarov 1 Atsushi Nemoto 1 Bagas Sanjaya 1 Brandon Maier 1 Charles Hardin 1 Colin Foster 1 David Barbion 1 Dimitar Tomov 1 Dmitry Rokosov 1 Edgar Bonet 1 Francis Laniel 1 Geoff Levand 1 Graeme Smecher 1 Grant Nichol 1 Hudson Ayers 1 James Knight 1 Jos? Luis Salvador Rufo 1 Juan Carrano 1 Kalpesh Panchal 1 Kevin Cui 1 Kieran Bingham 1 Kory Maincent 1 Kris Bahnsen 1 Louis Chauvet 1 Ludwig Kormann 1 Martin Kepplinger 1 Martin Kurbanov 1 Matt Silva 1 Maximilian Senftleben 1 Nicola Di Lieto 1 Nuno Gon?alves 1 Patrick Oppenlander 1 Ralf Dragon 1 Raphael Pavlidis 1 Robert Marko 1 Roy Kollen Svendsen 1 Scott Fan 1 Sebastian Bauer 1 Sen Hastings 1 Thomas Huth 1 Titouan Christophe 1 Uladzimir Bely 1 Vincent Fazio 1 Vincent Stehl? 1 Yair Ben-Avraham And a special thanks to our patch reviewers: git log 2023.11.. | grep -Ei '(reviewed|acked)-by:' | \ sed 's/.*by: //' | sort | uniq -c | sort -n -r 7 Marcus Hoffmann 7 Giulio Benetti 6 Adrian Perez de Castro 5 Antoine Coutant 4 Marcus Hoffmann 3 Maxim Kochetkov 3 Gary Bisson 3 Adam Duskett 2 Yegor Yefremov 2 Marcin Niestroj 2 Luca Ceresoli 2 Julien Olivain 1 Yann E. MORIN 1 S?bastien Szymanski 1 Romain Naour 1 Marcus Hoffmann 1 Petr Vorel 1 Michael Nosthoff 1 Laurent Vivier 1 James Hilliard 1 Fabio Estevam 1 Dario Binacchi 1 Christian Stewart 1 Adam Duskett -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 25 15:23:13 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 25 Feb 2024 16:23:13 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: fix BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH Message-ID: <20240225152313.1422787-1-fontaine.fabrice@gmail.com> Commit b7232c51dd402afb361d7c310855e0bf5666958d added default setting for bare-metal toolchain arch but unfortunately it used configlines.add instead of configlines.append resulting in the following build failure: /bin/sh: line 8: /home/autobuild/autobuild/instance-1/output-1/per-package/host-gcc-bare-metal/host/bin/-ar: No such file or directory While at it, also append /n for consistency Fixes: b7232c51dd402afb361d7c310855e0bf5666958d - http://autobuild.buildroot.org/results/95ac565653ddb5c14ec71470c32a34ad10b048cb Signed-off-by: Fabrice Fontaine --- utils/genrandconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 68cc003b70..9eeb66a595 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -315,9 +315,9 @@ def fixup_config(sysinfo, configfile): 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: return False - if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y' in configlines: - configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""') - configlines.add('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"') + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y\n' in configlines: + configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""\n') + configlines.append('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"\n') if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: -- 2.43.0 From romain.naour at smile.fr Sun Feb 25 16:06:08 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 17:06:08 +0100 Subject: [Buildroot] [PATCH v6 12/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option In-Reply-To: <20240224205654.1546744-13-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-13-dario.binacchi@amarulasolutions.com> Message-ID: <8d3bb106-cae8-4271-87e9-200c879de7f1@smile.fr> Hello Dario, Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > This tool uses additional host python modules that must be provided by > Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to > add additional host packages in U-Boot build dependency to use binman. > > The binman requirement is directly included in buildman dependency > (tools/buildman/requirements.txt) since within U-Boot, binman is > invoked by the build system, here buildman [1]. > > [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot > > Co-developed-by: Romain Naour > Signed-off-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Changes in v6: > - BR2_TARGET_UBOOT_USE_BINMAN > - Binman tool is not specific to TI K3 platform, so add an option to specify > the use of Binman in U-Boot. > - Add runtime dependencies > - Update commit message > - Add SOB and COB tags of Romain Naour > > Changes in v5: > - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" > from UBOOT_MAKE_OPTS. > > no changes since v1: > > boot/uboot/Config.in | 11 +++++++++++ > boot/uboot/uboot.mk | 12 +++++++++++- > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index beafb38930db..e6e7956adccb 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -290,6 +290,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN > This option makes sure that the needed binary blobs are copied > into the U-Boot source directory. > > +config BR2_TARGET_UBOOT_USE_BINMAN > + bool "U-Boot use binman" > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema > + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 > + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS > + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT > + help > + Use binman tool for generation and signing of boot images. > + > + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html > + > menu "U-Boot binary format" > > config BR2_TARGET_UBOOT_FORMAT_AIS > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dda606a88059..9157a4b738c3 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -187,10 +187,12 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > UBOOT_DEPENDENCIES += ti-k3-boot-firmware > +ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) Usually we prefer the "positive" logic: ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),) > +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f Looking at the commit log, It's not obvious why DM= is no needed with binman. We had the explanation from Andreas: http://lists.busybox.net/pipermail/buildroot/2024-February/685977.html "BINMAN_INDIRS is used to fetch the DM binary from /ti-dm/ and SYSFW binaries from /ti-sysfw/." Best regards, Romain > endif > +endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > UBOOT_DEPENDENCIES += opensbi > @@ -269,6 +271,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) > UBOOT_DEPENDENCIES += host-vim > endif > > +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt > +UBOOT_DEPENDENCIES += \ > + host-python-jsonschema \ > + host-python-pyyaml > +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) > +endif > + > # prior to u-boot 2013.10 the license info was in COPYING. Copy it so > # legal-info finds it > define UBOOT_COPY_OLD_LICENSE_FILE From romain.naour at smile.fr Sun Feb 25 16:14:46 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 17:14:46 +0100 Subject: [Buildroot] [PATCH v6 13/16] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240224205654.1546744-14-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-14-dario.binacchi@amarulasolutions.com> Message-ID: <1cbc66f9-8e0a-4ed3-9c13-e7154447c46d@smile.fr> Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit?: > Recent versions of U-Boot can use Binman to compile and sign the generated > binaries, thus making the use of custom tools like ti-k3-image-gen no > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > configured and used outside of it. This patch allows setting such options > even if the package is not enabled. > > The patch makes an exception to the Buildroot rule "no subdirectory in > package directory". > > Signed-off-by: Dario Binacchi > > --- > > Changes in v6: > - Move BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME to ti-k3 (BR2_PACKAGE_TI_K3_DM). > - Disable BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X > > Changes in v5: > - Add SOB tag > - Move the new ti-k3 from boot to package > > Added in v4 > > boot/ti-k3-image-gen/Config.in | 61 ++----------------------- > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- > boot/uboot/Config.in | 12 +---- > boot/uboot/uboot.mk | 2 +- > configs/ti_am62x_sk_defconfig | 3 +- > configs/ti_am64x_sk_defconfig | 3 +- > package/Config.in | 1 + > package/ti-k3/Config.in | 60 ++++++++++++++++++++++++ > package/ti-k3/ti-k3.mk | 7 +++ > 9 files changed, 80 insertions(+), 73 deletions(-) > create mode 100644 package/ti-k3/Config.in > create mode 100644 package/ti-k3/ti-k3.mk > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > index d76cef82e911..a57319f4be6d 100644 > --- a/boot/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3-image-gen/Config.in > @@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > if BR2_TARGET_TI_K3_IMAGE_GEN > -choice > - prompt "SoC family" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - bool "am62ax" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - bool "am62x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - bool "am64x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - bool "am65x" > - > -endchoice > - > -choice > - prompt "Security type" > - help > - The target SoC security type option for image gen. Valid > - options are "gp" for General Purpose devices, "hs-fs" for > - High Security - Field Securable devices, or "hs" for High > - Security - Security Enforcing devices. Note for all High > - Security device variants the TI_SECURE_DEV_PKG environmental > - variable must be defined at build time pointing to a valid > - core-secdev-k3 folder location, otherwise the build will > - fail, see > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - bool "gp" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - bool "hs-fs" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > - bool "hs" > - > -endchoice > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > - string > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > string > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > - string > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X > + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X > + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X > > endif > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > index 64be9a18f2c4..aca29bcf1bd4 100644 > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > $(BR2_MAKE_HOST_DEPENDENCY) > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > > TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index e6e7956adccb..821854d08acc 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -244,21 +244,11 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > bool "U-Boot needs TI K3 Device Manager (DM)" > # We use the SoC selection defined for the ti-k3-image-gen > # package > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X > help > Some TI K3 devices need the Device Manager (DM) firmware to > be available for the U-Boot build. > > -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > - > -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > - string > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - > -endif > - > config BR2_TARGET_UBOOT_NEEDS_OPENSBI > bool "U-Boot needs OpenSBI" > depends on BR2_TARGET_OPENSBI > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 9157a4b738c3..c21fe7c99fc1 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -189,7 +189,7 @@ endif > ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > UBOOT_DEPENDENCIES += ti-k3-boot-firmware > ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) > -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_PACKAGE_TI_K3_DM_SOCNAME)) > UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > endif > endif > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index a129e216d25b..2835404a57df 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > +BR2_PACKAGE_TI_K3=y > +BR2_PACKAGE_TI_K3_SOC_AM62X=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="256M" > @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 26195194c7d6..566cbbe4824f 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > +BR2_PACKAGE_TI_K3=y > +BR2_PACKAGE_TI_K3_SOC_AM64X=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > diff --git a/package/Config.in b/package/Config.in > index bf0fe078b955..6d3ed34e121b 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -629,6 +629,7 @@ endmenu > source "package/sysstat/Config.in" > source "package/targetcli-fb/Config.in" > source "package/ti-gfx/Config.in" > + source "package/ti-k3/Config.in" > source "package/ti-sgx-demos/Config.in" > source "package/ti-sgx-km/Config.in" > source "package/ti-sgx-um/Config.in" > diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in > new file mode 100644 > index 000000000000..b8545b7bca62 > --- /dev/null > +++ b/package/ti-k3/Config.in > @@ -0,0 +1,60 @@ > +config BR2_PACKAGE_TI_K3 > + bool "TI K3" > + help > + The TI K3 SOC specific selections. > + > +if BR2_PACKAGE_TI_K3 > + > +choice > + prompt "SoC family" > + > +config BR2_PACKAGE_TI_K3_SOC_AM62AX > + bool "am62ax" > + > +config BR2_PACKAGE_TI_K3_SOC_AM62X > + bool "am62x" > + > +config BR2_PACKAGE_TI_K3_SOC_AM64X > + bool "am64x" > + > +config BR2_PACKAGE_TI_K3_SOC_AM65X > + bool "am65x" > + > +endchoice > + > +choice > + prompt "Security type" > + help > + The target SoC security type option. > + > +config BR2_PACKAGE_TI_K3_SECTYPE_GP > + bool "gp" > + > +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS > + bool "hs-fs" > + depends on !BR2_PACKAGE_TI_K3_SOC_AM65X This was an existing issue with ti-k3-image-gen and it should go in a separate patch. Also, add in the commit log how this infomation was retrieved. http://lists.busybox.net/pipermail/buildroot/2024-February/686144.html Best regards, Romain > + > +config BR2_PACKAGE_TI_K3_SECTYPE_HS > + bool "hs" > + > +endchoice > + > +config BR2_PACKAGE_TI_K3_SOC > + string > + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X > + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X > + default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X > + > +config BR2_PACKAGE_TI_K3_SECTYPE > + string > + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP > + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS > + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS > + > +config BR2_PACKAGE_TI_K3_DM_SOCNAME > + string > + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X > + > +endif > diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk > new file mode 100644 > index 000000000000..a2da29f5148c > --- /dev/null > +++ b/package/ti-k3/ti-k3.mk > @@ -0,0 +1,7 @@ > +################################################################################ > +# > +# ti-k3 > +# > +################################################################################ > + > +include $(sort $(wildcard package/ti-k3/*/*.mk)) From romain.naour at smile.fr Sun Feb 25 16:39:30 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 17:39:30 +0100 Subject: [Buildroot] [PATCH v6 15/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240224205654.1546744-16-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-16-dario.binacchi@amarulasolutions.com> Message-ID: <4275a446-20ac-4479-97e9-6bf790fe3976@smile.fr> Hello Dario, Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit?: > The 2024.01 version of U-Boot for the am62x-sk board has introduced two > major changes: > - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in > /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET > and the use of extlinux.conf for the proper loading of the device tree. > Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to > auto-generate the extlinux.conf file so that developers can change the > kernel loading options by modifying the .config. The main issue here come from the mmc.env used on TI platform [1], indded it requires to install the dtb into a subdirectory in /boot. This is handled by meta-ti with KERNEL_DTBDEST [2] but Buildroot doesn't support such feature. # Tell the kernel class to install the DTBs in the same directory structure as # the kernel. KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb" Instead, we can create a symblink "ln -sf . ${TARGET_DIR}/boot/dtb", see [3]. But I'm fine too with the generated extlinux.conf. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/include/env/ti/mmc.env?ref_type=tags#L18 [2] https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc?h=09.02.00.004#n13 [3] http://lists.busybox.net/pipermail/buildroot/2024-February/685672.html > - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer > necessary to use custom tools like ti-k3-image-gen. > > Tested on SK-AM62B-P1. > > Signed-off-by: Dario Binacchi > > --- > > Changes in v6: > - Enable BR2_TARGET_UBOOT_USE_BINMAN option > > Changes in v5: > - Update commit message. > > Changes in v4: > - bump to 204.01 instead of 2023.10 > - Update the commit message > - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs > in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. > > Changes in v2: > - Update the commit message > - Drop Python options required by binman. > - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically > selects the Python modules required by binman. > > board/ti/am62x-sk/genimage.cfg | 7 ++++- > board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++++++++++++++++++++ > board/ti/am62x-sk/post-image.sh | 5 ++++ > configs/ti_am62x_sk_defconfig | 13 +++++---- > 4 files changed, 67 insertions(+), 7 deletions(-) > create mode 100755 board/ti/am62x-sk/post-build.sh > create mode 100755 board/ti/am62x-sk/post-image.sh > > diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg > index 26304fe98f99..398209f4d831 100644 > --- a/board/ti/am62x-sk/genimage.cfg > +++ b/board/ti/am62x-sk/genimage.cfg > @@ -4,10 +4,15 @@ image boot.vfat { > "tiboot3.bin", > "tispl.bin", > "u-boot.img", > + "k3-am625-sk.dtb", > + "Image" > + } > + file extlinux/extlinux.conf { > + image = extlinux.conf > } > } > > - size = 16M > + size = 64M > } > > image sdcard.img { > diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh > new file mode 100755 > index 000000000000..0f1f98ef217a > --- /dev/null > +++ b/board/ti/am62x-sk/post-build.sh > @@ -0,0 +1,49 @@ > +#!/bin/sh -x > + > +# genimage will need to find the extlinux.conf > +# in the binaries directory > + > +die() { > + cat <&2 > +Error: $@ > + > +Usage: ${0} -c -r [-x ] > +EOF > + exit 1 > +} > + > +o='c:r:x:' > +O='console:,root:,extra-args:' > +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" > +eval set -- "${opts}" > +while [ ${#} -gt 0 ]; do > + case "${1}" in > + (-c|--console) > + CONSOLE="${2}"; shift 2 > + ;; > + (-r|--root) > + ROOT="${2}"; shift 2 > + ;; > + (-x|--extra-args) > + EXTRA_ARGS="${2}"; shift 2 > + ;; > + (--) > + shift 1; break > + ;; > + esac > +done > + > +[ -n "${CONSOLE}" ] || die "Missing argument" > +[ -n "${ROOT}" ] || die "Missing argument" > +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" > +if [ -n "${EXTRA_ARGS}" ]; then > + append="${append} ${EXTRA_ARGS}" > +fi > + > +mkdir -p "${BINARIES_DIR}" > +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" > + label am62x-sk-buildroot > + kernel /Image devicetree entry seems missing. We had an issue on another board [1] due to this. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/d6d0f73a2eaa4904ee0842a01941b01306d97be6 Best regards, Romain > + fdtdir / > + append ${append} > + __HEADER_EOF > diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh > new file mode 100755 > index 000000000000..34f732c091ad > --- /dev/null > +++ b/board/ti/am62x-sk/post-image.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh -x > + > +BOARD_DIR="$(dirname "$0")" > + > +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 2835404a57df..484f9feb8c61 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,14 +1,14 @@ > BR2_aarch64=y > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > -BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > BR2_PACKAGE_TI_K3=y > @@ -24,20 +24,21 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > -BR2_TARGET_TI_K3_IMAGE_GEN=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y > +BR2_TARGET_UBOOT_USE_BINMAN=y > # BR2_TARGET_UBOOT_FORMAT_BIN is not set > BR2_TARGET_UBOOT_FORMAT_IMG=y > BR2_TARGET_UBOOT_SPL=y From romain.naour at smile.fr Sun Feb 25 16:43:39 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 17:43:39 +0100 Subject: [Buildroot] [PATCH v6 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> Message-ID: <383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr> Hello Dario, Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit?: > Tested on SK-AM62B-P1. You could complete your series by updating the ti_am64x_sk_defconfig too and remove ti-k3-image-gen. Except for minor improvement, this series is ok for me. Best regards, Romain > > Signed-off-by: Dario Binacchi > > --- > > Changes in v5: > - Bump to 6.6.17 from 6.6.1 > - Update commit message > > Changes in v4: > - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. > > no changes since v1 > > configs/ti_am62x_sk_defconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 484f9feb8c61..8c962b4a9494 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" From romain.naour at smile.fr Sun Feb 25 16:58:10 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 17:58:10 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240223193136.sod3vx4t3pkqfcqd@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> <20240220004100.3yzqapeplx6olarz@dasso> <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> <20240220200414.2bsvqvaeltqhsulc@dasso> <1a7ab8e6-bd43-4191-ad95-12e40f3a5c51@smile.fr> <20240223193136.sod3vx4t3pkqfcqd@dasso> Message-ID: <6de87cae-230d-4a3e-b854-0e327f651f0a@smile.fr> Hi Andreas, Le 23/02/2024 ? 20:31, Andreas Dannenberg a ?crit?: > Hi Romain, > > On Tue, Feb 20, 2024 at 10:36:51PM +0100, Romain Naour wrote: > > > >>>> About existing boot flow, I found two recent commit in u-boot that state that >>>> the "Split binary" (that requires sysfw.itb) is already a legacy boot flow: >>> >>> It's called "legacy boot flow" because it was the boot flow used on the >>> first K3 devices that were released (AM65x, J721E). This boot flow was >>> not used on follow-on devices. The characteristics of this boot flow is >>> that the initial FW image that gets loaded (tiboot3.bin) doesn't contain >>> any device firmwares, but only a bootloader (such as U-Boot SPL). Then >>> this boot loader will load the System Firmware firmware + config data >>> blob (sysfw.itb) into the dedicated core (called "DMSC" = Device Manager >>> and Security Controller). And then addiitonal boot stages will be >>> loaded. These devices require this boot flow, and with this it is >>> required to be supported by U-Boot (and any Linux distribution or build >>> systems that build on that). >>> >>> TI is still making/selling those "legacy boot flow" devices, and will >>> continue to do so for a very long time. One promiment community >>> incarnation that you are probably aware of is the BeagleBone AI-64. >> >> Thank you for the detailed explanation! >> >> I previouly worked on a AM57xx SoC that is nowaday legacy SoC, the latest >> ti-kernel 6.1 doesn't support some of the driver that where available in >> ti-kernel 5.10 (prueth 100M, RPMsg Sockets over virtio-rpmsg transport (use for >> ARM-DSP IPC3.x), TI-RTOS (the csl-common package was also removed from meta-ti)). >> >> Also the TI SDK on this plateform doesn't seems very active [1]. > > since you brought this up I wanted to add some additional context here. > Older devices like AM57xx (AM335x and AM437x fall into the same bucket) > will get what we call "LTS refresh SDKs" every year, rather than > multiple drops per year as we do for the more recent devices. As for > AM57xx specifically that refresh is currently targeted for e/o March > 2024 and will be known as "SDK 9.2". There shouldn't be any feature > regressions, and the only "new" thing (in addition to an all-refreshed > SW baseline with 6.1 kernel and 2023.04 U-Boot) will be some Y2K38 issue > fix on Linux. TI will be making and selling those devices for a very > long time to come, and the annual refresh is seen as a good compromise > between keeping things refreshed periodically and up to date while > limiting the amount of repeat work/effort. Ok, thanks for the information. I'm looking forward this new SDK release. Best regards, Romain > > -- > Andreas Dannenberg > Texas Instruments Inc > From fontaine.fabrice at gmail.com Sun Feb 25 17:11:49 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 25 Feb 2024 18:11:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: disable utest Message-ID: <20240225171149.1447606-1-fontaine.fabrice@gmail.com> Disable utest to avoid the following build failure raised since the addition of the package in commit b1dbd3f679e6660325472e3fdca72127d74e6929 if cunit is found: ../utest/tracefs-utest.c: In function 'test_uprobes_instance': ../utest/tracefs-utest.c:2492:19: error: 'PATH_MAX' undeclared (first use in this function) 2492 | char self[PATH_MAX] = { 0 }; | ^~~~~~~~ Fixes: b1dbd3f679e6660325472e3fdca72127d74e6929 - http://autobuild.buildroot.org/results/1a01883231dbc8a7688de26db9a08751165fe8fe Signed-off-by: Fabrice Fontaine --- .../0002-meson-add-utest-option.patch | 40 +++++++++++++++++++ package/libtracefs/libtracefs.mk | 3 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 package/libtracefs/0002-meson-add-utest-option.patch diff --git a/package/libtracefs/0002-meson-add-utest-option.patch b/package/libtracefs/0002-meson-add-utest-option.patch new file mode 100644 index 0000000000..90f73a7ea0 --- /dev/null +++ b/package/libtracefs/0002-meson-add-utest-option.patch @@ -0,0 +1,40 @@ +From 7a09e2d414959075e2177c50ef1d4bf606b9ccdc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Feb 2024 21:20:29 +0100 +Subject: [PATCH] meson: add utest option + +Add utest option to allow the user to disable utest + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/rostedt/libtracefs/pull/2 +--- + meson.build | 2 +- + meson_options.txt | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3156f1c..d4cfd53 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,7 +35,7 @@ incdir = include_directories(['include']) + + subdir('src') + subdir('include') +-if cunit_dep.found() ++if get_option('utest') and cunit_dep.found() + subdir('utest') + endif + if get_option('samples') +diff --git a/meson_options.txt b/meson_options.txt +index 8450992..a48efea 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -18,3 +18,5 @@ option('doc', type : 'boolean', value: true, + description : 'produce documentation') + option('samples', type : 'boolean', value: true, + description : 'build samples') ++option('utest', type : 'boolean', value: true, ++ description : 'build utest') +-- +2.43.0 + diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk index ed45fcbc50..21cb8e84e3 100644 --- a/package/libtracefs/libtracefs.mk +++ b/package/libtracefs/libtracefs.mk @@ -14,6 +14,7 @@ LIBTRACEFS_DEPENDENCIES = host-bison host-flex host-pkgconf libtraceevent LIBTRACEFS_CONF_OPTS = \ -Ddoc=false \ - -Dsamples=false + -Dsamples=false \ + -Dutest=false $(eval $(meson-package)) -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 25 17:45:32 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 18:45:32 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: make current version cell scrollable Message-ID: <20240225175139.2EA2987AB3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4533e42622e46f2b8e0ce4d1936c6534393d3aa1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, when the version string is "too long", it is arbitrarily truncated. This works well for commit hashes, because usually the truncation is long enough to provide a short hash that is still unique in the upstream VCS. However, there are non-hash-like versions strings that get truncated and wihch the discriminant part is toward the end. Yet, adapting the version cell to the widest versions string (most probably a git hash) is not very interesting; the table is already very large. Make the cell with the version string scrollable: we get to keep the best of both worlds: a narrow version cell, and a full-length version string that can be copy-pasted if needed. Signed-off-by: Sen Hastings [yann.morin.1998 at free.fr: reword commit log] Signed-off-by: Yann E. MORIN --- support/scripts/pkg-stats | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7835cb3d62..9307992d29 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -845,6 +845,13 @@ function expandField(fieldId){ .centered { text-align: center; } + + .current_version { + overflow: scroll; + width: 21ch; + padding: 10px 2px 10px 2px; + } + .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { background: #d2ffc4; } @@ -964,10 +971,7 @@ def dump_html_pkg(f, pkg): # Current version data_field_id = f'current_version__{pkg_css_class}' - if len(pkg.current_version) > 20: - current_version = pkg.current_version[:20] + "..." - else: - current_version = pkg.current_version + current_version = pkg.current_version f.write(f'
    {current_version}
    \n') From yann.morin.1998 at free.fr Sun Feb 25 17:53:00 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 18:53:00 +0100 Subject: [Buildroot] [PATCH 1/1] support/scripts/pkg-stats: make current version cell scrollable In-Reply-To: <20240213120714.393026-1-sen@hastings.org> References: <20240213120714.393026-1-sen@hastings.org> Message-ID: Sen, All, On 2024-02-13 12:07 +0000, Sen Hastings spake thusly: > *Resubmitted to mailing list because I messed up the subject line.* > > I realized that instead of truncating the version number, > we could simply make the cell horizontally scrollable. > This of course allows us to have a fixed cell width, > while preserving the full version number. > > A demo is available here: > https://sen-h.codeberg.page/pkg-stats-demos/@pages/make-current-version-cell-scrollable.html I've entirely reworded the commit log with more explanations, and a neutral tone. > Signed-off-by: Sen Hastings Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/scripts/pkg-stats | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index 7835cb3d62..9307992d29 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -845,6 +845,13 @@ function expandField(fieldId){ > .centered { > text-align: center; > } > + > + .current_version { > + overflow: scroll; > + width: 21ch; > + padding: 10px 2px 10px 2px; > + } > + > .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { > background: #d2ffc4; > } > @@ -964,10 +971,7 @@ def dump_html_pkg(f, pkg): > > # Current version > data_field_id = f'current_version__{pkg_css_class}' > - if len(pkg.current_version) > 20: > - current_version = pkg.current_version[:20] + "..." > - else: > - current_version = pkg.current_version > + current_version = pkg.current_version > f.write(f'
    class="centered current_version data _{pkg_css_class}">{current_version}
    \n') > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Sun Feb 25 19:23:52 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 25 Feb 2024 20:23:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: disable utest In-Reply-To: <20240225171149.1447606-1-fontaine.fabrice@gmail.com> References: <20240225171149.1447606-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, thanks a lot for the patch, On 25/02/24 18:11, Fabrice Fontaine wrote: > Disable utest to avoid the following build failure raised since the > addition of the package in commit > b1dbd3f679e6660325472e3fdca72127d74e6929 if cunit is found: > > ../utest/tracefs-utest.c: In function 'test_uprobes_instance': > ../utest/tracefs-utest.c:2492:19: error: 'PATH_MAX' undeclared (first use in this function) > 2492 | char self[PATH_MAX] = { 0 }; > | ^~~~~~~~ > > Fixes: b1dbd3f679e6660325472e3fdca72127d74e6929 > - http://autobuild.buildroot.org/results/1a01883231dbc8a7688de26db9a08751165fe8fe > > Signed-off-by: Fabrice Fontaine > --- > .../0002-meson-add-utest-option.patch | 40 +++++++++++++++++++ > package/libtracefs/libtracefs.mk | 3 +- > 2 files changed, 42 insertions(+), 1 deletion(-) > create mode 100644 package/libtracefs/0002-meson-add-utest-option.patch > > diff --git a/package/libtracefs/0002-meson-add-utest-option.patch b/package/libtracefs/0002-meson-add-utest-option.patch > new file mode 100644 > index 0000000000..90f73a7ea0 > --- /dev/null > +++ b/package/libtracefs/0002-meson-add-utest-option.patch > @@ -0,0 +1,40 @@ > +From 7a09e2d414959075e2177c50ef1d4bf606b9ccdc Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 15 Feb 2024 21:20:29 +0100 > +Subject: [PATCH] meson: add utest option > + > +Add utest option to allow the user to disable utest > + > +Signed-off-by: Fabrice Fontaine > +Upstream: https://github.com/rostedt/libtracefs/pull/2 For this project you have to git send-email the patch to: linux-trace-devel at vger.kernel.org as documented in: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/tree/README#n45 Can you do that? Otherwise I can send the patch. Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > +--- > + meson.build | 2 +- > + meson_options.txt | 2 ++ > + 2 files changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/meson.build b/meson.build > +index 3156f1c..d4cfd53 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -35,7 +35,7 @@ incdir = include_directories(['include']) > + > + subdir('src') > + subdir('include') > +-if cunit_dep.found() > ++if get_option('utest') and cunit_dep.found() > + subdir('utest') > + endif > + if get_option('samples') > +diff --git a/meson_options.txt b/meson_options.txt > +index 8450992..a48efea 100644 > +--- a/meson_options.txt > ++++ b/meson_options.txt > +@@ -18,3 +18,5 @@ option('doc', type : 'boolean', value: true, > + description : 'produce documentation') > + option('samples', type : 'boolean', value: true, > + description : 'build samples') > ++option('utest', type : 'boolean', value: true, > ++ description : 'build utest') > +-- > +2.43.0 > + > diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk > index ed45fcbc50..21cb8e84e3 100644 > --- a/package/libtracefs/libtracefs.mk > +++ b/package/libtracefs/libtracefs.mk > @@ -14,6 +14,7 @@ LIBTRACEFS_DEPENDENCIES = host-bison host-flex host-pkgconf libtraceevent > > LIBTRACEFS_CONF_OPTS = \ > -Ddoc=false \ > - -Dsamples=false > + -Dsamples=false \ > + -Dutest=false > > $(eval $(meson-package)) From giulio.benetti at benettiengineering.com Sun Feb 25 19:54:35 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 25 Feb 2024 20:54:35 +0100 Subject: [Buildroot] [PATCH v8] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240225140434.7310-1-fancp2007@gmail.com> References: <20240223131603.2313178-1-fancp2007@gmail.com> <20240225140434.7310-1-fancp2007@gmail.com> Message-ID: Hi Scott, On 25/02/24 15:04, Scott Fan wrote: > Add support for the FriendlyARM NanoPi NEO2 with mainline components: > - ATF v2.7 > - U-Boot 2024.01 > - Linux 6.6.18 > > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV allows the ethernet driver > to be automatically loaded on boot. Otherwise, it will report the > 'device not found' error while run the 'ifconfig eth0' command. > > Board's wiki page: > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > Signed-off-by: Scott Fan looks good to me: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > > --- > Changes v1 -> v2: > - Fix issues from 'utils/docker-run make check-package' > - Add atf custom version in the defconfig > - No need for sudo to run sync > > Changes v2 -> v3: > - Update patch file, add the upstream tag > > Changes v3 -> v4: > - Use a single integrated image file (u-boot-sunxi-with-spl.bin) > - Remove patch file for uboot, switch to binman > - Merge boot partition into rootfs partition > - Bump kernel version to 6.1.61 > > Changes v4 -> v5: > - Bump kernel version to 6.1.65 > > Changes v5 -> v6: > - Bump kernel version to 6.6.17 > - Bump uboot version to 2024.01 > - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > Changes v6 -> v7: > - Bump kernel version to 6.6.18 > - Add option BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > - Resort sections in the defconfig > > Changes v7 -> v8: > - Update commit log to add ATF version > - Update commit log to add explanation for the MDEV config > --- > board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ > board/friendlyarm/nanopi-neo2/genimage.cfg | 16 ++++++ > board/friendlyarm/nanopi-neo2/post-build.sh | 5 ++ > board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++ > configs/friendlyarm_nanopi_neo2_defconfig | 57 +++++++++++++++++++++ > 5 files changed, 116 insertions(+) > create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf > create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg > create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh > create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt > create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig > > diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf > new file mode 100644 > index 0000000000..482a069f74 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf > @@ -0,0 +1,4 @@ > +label friendlyarm-nanopi-buildroot > + kernel /boot/Image > + devicetree /boot/sun50i-h5-nanopi-neo2.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg > new file mode 100644 > index 0000000000..67e4e5efdb > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot-tpl-spl-dtb { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + offset = 1M > + } > +} > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh > new file mode 100755 > index 0000000000..c7ec875068 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt > new file mode 100644 > index 0000000000..c896a57525 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/readme.txt > @@ -0,0 +1,34 @@ > +Intro > +===== > + > +This default configuration will allow you to start experimenting with the > +buildroot environment for the NanoPi NEO2. With the current configuration > +it will bring-up the board, and allow access through the serial console. > + > +Wiki link: > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > + > +This configuration uses U-Boot mainline and kernel mainline. > + > +How to build > +============ > + > + $ make friendlyarm_nanopi_neo2_defconfig > + $ make > + > +Note: you will need access to the internet to download the required > +sources. > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > + $ sync > + > +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console > +is on the serial line, 115200 8N1. > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig > new file mode 100644 > index 0000000000..3118d45625 > --- /dev/null > +++ b/configs/friendlyarm_nanopi_neo2_defconfig > @@ -0,0 +1,57 @@ > +# Architecture > +BR2_aarch64=y > +BR2_cortex_a53=y > +BR2_ARM_FPU_VFPV4=y > + > +# Linux headers same as kernel, a 6.6 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > + > +# System > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > + > +# Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Firmware > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y From yann.morin.1998 at free.fr Sun Feb 25 22:05:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 23:05:35 +0100 Subject: [Buildroot] [PATCH 0/3] support/scripts/pkg-stats: fix CVE identification (branch yem/pkgstat-cve) Message-ID: Hello All! Since we switched to the FKIE CVE feed (as the NVD JSON feed are oing extinct soon-ish), we missed the fact that the new feeds did not have the same layout as the former ones, breaking CVE reporting. As a consequence of having no CVE reported, w emissed the fact that the CVEs were not sorted in the new feeds, while they were in the formers. This series fixes both issus, and introduces a minor fixup for a python deprecation warning. Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (3): support/scripts/pkg-stats: fix datetime deprecation warning support/scripts/pkg-stats: fkie json format support/scripts/pkg-stats: sort CVEs in HTML output support/scripts/cve.py | 26 +++++++++++++++++--------- support/scripts/pkg-stats | 6 +++--- 2 files changed, 20 insertions(+), 12 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 25 22:05:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 23:05:35 +0100 Subject: [Buildroot] [PATCH 1/3] support/scripts/pkg-stats: fix datetime deprecation warning In-Reply-To: References: Message-ID: <9b7aaaa3b968342ac2f0d6d723ecbe721dbbaa4b.1708898731.git.yann.morin.1998@free.fr> Abide by the warning reported with python 3.12: .../support/scripts/pkg-stats:1289: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC). Signed-off-by: Yann E. MORIN --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7835cb3d62..00d1eef09a 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1286,7 +1286,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.utcnow() + date = datetime.datetime.now(datetime.UTC) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() -- 2.43.2 From yann.morin.1998 at free.fr Sun Feb 25 22:05:36 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 23:05:36 +0100 Subject: [Buildroot] [PATCH 2/3] support/scripts/pkg-stats: fkie json format In-Reply-To: References: Message-ID: <002f11dfd177512376508c9b129721afde9f0011.1708898731.git.yann.morin.1998@free.fr> Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) missed the fact that the layout of the FKIE data files are different from the NVD ones. Most differences are relatively trivial fields renaming, and those are easily spotted in this patch. There is however one key difference in the layout of the configurations. Where the NVD had "configurations" as an object with a "nodes" key, the FKIE has a "configurations" as a list of objects with a single "nodes" key; i.e. it is one-level deeper. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/cve.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index f12a8048cd..747ad881c9 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -128,7 +128,7 @@ class CVE: filename = CVE.download_nvd_year(nvd_dir, year) try: uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'CVE_Items.item') + content = ijson.items(uncompressed, 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise @@ -155,11 +155,11 @@ class CVE: for parsed_node in self.parse_node(child): yield parsed_node - for cpe in node.get('cpe_match', ()): + for cpe in node.get('cpeMatch', ()): if not cpe['vulnerable']: return - product = cpe_product(cpe['cpe23Uri']) - version = cpe_version(cpe['cpe23Uri']) + product = cpe_product(cpe['criteria']) + version = cpe_version(cpe['criteria']) # ignore when product is '-', which means N/A if product == '-': return @@ -191,7 +191,7 @@ class CVE: v_end = cpe['versionEndExcluding'] yield { - 'id': cpe['cpe23Uri'], + 'id': cpe['criteria'], 'v_start': v_start, 'op_start': op_start, 'v_end': v_end, @@ -199,14 +199,15 @@ class CVE: } def each_cpe(self): - for node in self.nvd_cve['configurations']['nodes']: - for cpe in self.parse_node(node): - yield cpe + for nodes in self.nvd_cve.get('configurations', []): + for node in nodes['nodes']: + for cpe in self.parse_node(node): + yield cpe @property def identifier(self): """The CVE unique identifier""" - return self.nvd_cve['cve']['CVE_data_meta']['ID'] + return self.nvd_cve['id'] @property def affected_products(self): -- 2.43.2 From yann.morin.1998 at free.fr Sun Feb 25 22:05:37 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 23:05:37 +0100 Subject: [Buildroot] [PATCH 3/3] support/scripts/pkg-stats: sort CVEs in HTML output In-Reply-To: References: Message-ID: <23692da67b6987d5ea453d0d254628b6c2eb5582.1708898731.git.yann.morin.1998@free.fr> While the old NVD JSON feed provided data files where the CVEs were sorted by ID, the new feed from FKIE does not have sorted CVEs. Add a method to sort a list of CVE IDs (i.e. CVE ID strings, not CVE objects!), and use that when emiting the HTML output. The JSON output need not be sorted, because it is supposed to be used for post-processing, and we do not care about the ordering there; a consumer interested in sorting should sort on their side. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/cve.py | 7 +++++++ support/scripts/pkg-stats | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 747ad881c9..1a3c307e12 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -117,6 +117,13 @@ class CVE: open(path_metaf, "w").write(page_meta.text) return path_jsonf_xz + @staticmethod + def sort_id(cve_ids): + def cve_key(cve_id): + year, id_ = cve_id.split('-')[1:] + return (int(year), int(id_)) + return sorted(cve_ids, key=cve_key) + @classmethod def read_nvd_dir(cls, nvd_dir): """ diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 00d1eef09a..7eefd92a22 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1051,9 +1051,9 @@ def dump_html_pkg(f, pkg): f.write(f'
    see all ({cve_total}) ▾
    \n') if pkg.is_status_error("cve"): - for cve in pkg.cves: + for cve in cvecheck.CVE.sort_id(pkg.cves): f.write(f' {cve}
    \n') - for cve in pkg.unsure_cves: + for cve in cvecheck.CVE.sort_id(pkg.unsure_cves): f.write(f' {cve} (unsure)
    \n') elif pkg.is_status_na("cve"): f.write(f""" {pkg.status['cve'][1]}""") -- 2.43.2 From sen at hastings.org Sun Feb 25 22:05:44 2024 From: sen at hastings.org (Sen Hastings) Date: Sun, 25 Feb 2024 14:05:44 -0800 Subject: [Buildroot] [PATCH 1/1] support/scripts/pkg-stats: fix bug when sorting by hashfile Message-ID: <20240225220544.754965-1-sen@hastings.org> Because the div_class variable was not reassigned a value, cells in the latest_version column were still being assigned hash_file classes and so were being picked up as elements in the hash_file sort. This lead to execessive grid gap elements stacking up and creating huge blank spaces at the top of the page. This is very noticable on pages with a large number of packages, like the ones the autobuilder creates. original behaviour(click the "Hash file" column label twice): http://autobuild.buildroot.org/stats/master.html demo of fixed behaviour: https://sen-h.codeberg.page/pkg-stats-demos/@pages/fix-bug-when-sorting-by-hash-file.html Signed-off-by: Sen Hastings --- support/scripts/pkg-stats | 1 + 1 file changed, 1 insertion(+) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9307992d29..9ba356cb7c 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -977,6 +977,7 @@ def dump_html_pkg(f, pkg): # Latest version data_field_id = f'latest_version__{pkg_css_class}' + div_class = ["centered"] div_class.append(f'_{pkg_css_class}') div_class.append("latest_version data") if pkg.latest_version['status'] == RM_API_STATUS_ERROR: -- 2.25.1 From romain.naour at smile.fr Sun Feb 25 22:57:28 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 23:57:28 +0100 Subject: [Buildroot] [PATCH] package/dracut: fix dracut_wrapper Message-ID: <20240225225728.2949216-1-romain.naour@smile.fr> As reported by Thierry Bultel [1], dracut doesn't work since the version bump to version 059. Further investigation by Andreas Naumann [2] reported that the issue come from this commit d010fa0 refactor(dracut-install): fork() instead of popen(), sanitise line reading [3]. The issue come from our dracut_wrapper and how DRACUT_LDD is defined. Indeed dracut expect DRACUT_LDD=ldd or a single binary (without arguments) but we are using "prelink-rtld --root='${sysroot}'". With the change introduced by [3], our DRACUT_LDD is used directly by execlp() leading to an error: execlp(ldd, ldd, fullsrcpath, (char *)NULL); Use mktemp to generate a temporary dracut-ldd script using prelink-rtld --root='${sysroot}' ${1} execute dracut.real in a subshell to cleanup the temporary file at the end of the dracut wrapper script. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243423 [tests.fs.test_cpio.TestCpioDracutGlibcMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243434 [tests.fs.test_cpio.TestCpioDracutMuslMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243567 [tests.fs.test_cpio.TestCpioDracutUclibcMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243559 [tests.fs.test_cpio.TestCpioDracutGlibc] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243504 [tests.fs.test_cpio.TestCpioDracutUclibc] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243498 [tests.fs.test_cpio.TestCpioDracutMusl] [1] http://lists.busybox.net/pipermail/buildroot/2024-February/684145.html [2] http://lists.busybox.net/pipermail/buildroot/2024-February/684503.html [3] https://github.com/dracutdevs/dracut/commit/d010fa0d7f8ef42ad31729d027d2e4be6dd6e588 Fixes: 145f01ded5 ("package/dracut: bump to version 059") Reported-by: Thierry Bultel Signed-off-by: Romain Naour --- package/dracut/dracut_wrapper | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/package/dracut/dracut_wrapper b/package/dracut/dracut_wrapper index 0464db17fe..889322d1c6 100644 --- a/package/dracut/dracut_wrapper +++ b/package/dracut/dracut_wrapper @@ -31,8 +31,18 @@ if [ -z "${sysroot}" ]; then fi topdir="$(dirname "$(realpath "$(dirname "${0}")")")" -export DRACUT_LDD="${topdir}/sbin/prelink-rtld --root='${sysroot}'" +DRACUT_LDD="$(mktemp /tmp/dracut-ldd.XXXXXX)" +cat >"${DRACUT_LDD}" < References: <20240221004400.27429-1-wilfred.mallawa@wdc.com> Message-ID: On Wed, 2024-02-21 at 18:50 +0100, Yann E. MORIN wrote: > Wilfred, All, > > On 2024-02-21 10:44 +1000, Wilfred Mallawa via buildroot spake > thusly: > > Additionally, add an upstream patch that fixes the configuration > > for > > "NONE" toolchain variant in libspdm. That is, where the build > > environment provides compile/link options. > > > > Signed-off-by: Wilfred Mallawa > > --- > > ?...eLists-remove-fixed-options-for-NONE.patch | 51 > > +++++++++++++++++++ > > ?package/libspdm/libspdm.hash????????????????? |? 2 +- > > ?package/libspdm/libspdm.mk??????????????????? |? 2 +- > > ?3 files changed, 53 insertions(+), 2 deletions(-) > > ?create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed- > > options-for-NONE.patch > > > > diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options- > > for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed- > > options-for-NONE.patch > > new file mode 100644 > > index 0000000000..0d1287a769 > > --- /dev/null > > +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for- > > NONE.patch > > @@ -0,0 +1,51 @@ > > +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 > > 2001 > > +From: Wilfred Mallawa > > +Date: Mon, 19 Feb 2024 09:56:14 +1000 > > +Subject: [PATCH] CMakeLists: remove fixed options for NONE > > + > > +The use of the NONE toolchain option is such that we can provide > > at the > > +build project level (buildroot etc...). However, the changes > > introduced > > +in 811f2b596def04b3a36368cf2098546d7907767f set certain > > compiler/linker > > +option that does not comply with the definition of the options as > > +specified in [1]. This change removes those options. > > + > > +[1] > > https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments > > + > > +Signed-off-by: Wilfred Mallawa > > ??? $ ./utils/docker-run make check-package > ??? package/libspdm/0001-CMakeLists-remove-fixed-options-for- > NONE.patch:0: missing Upstream in the header > (https://nightly.buildroot.org/#_additional_patch_documentation) > > So you need to add: > ??? Upstream: > https://github.com/DMTF/libspdm/commit/d4d6b138d727e484fa9d0fef476ca181681d0695 > Ah thanks, will fix this and send a V2 > Also, as I understand it, NONE is thus no longer a valid value for > -DTOOLCHAIN, so you should drop that from libspdm.mk as well, right? > NONE is still a valid option, this commit just partially reverts options that were incorrectly up-streamed for the NONE option. Regards, Wilfred > Regards, > Yann E. MORIN. > > > +--- > > + CMakeLists.txt | 19 ------------------- > > + 1 file changed, 19 deletions(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 9c300cc817..f6cf17d269 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") > > +???????? SET(CMAKE_EXE_LINKER_FLAGS "") > > + > > +???????? SET(CMAKE_C_LINK_EXECUTABLE "") > > +- > > +-??? elseif(TOOLCHAIN STREQUAL "NONE") > > +-??????? ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing - > > Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections > > -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables - > > flto -DUSING_LTO? -Wno-maybe-uninitialized -Wno-uninitialized? - > > Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror- > > implicit-function-declaration) > > +-??????? if(CMAKE_BUILD_TYPE STREQUAL "Debug") > > +-??????????? ADD_COMPILE_OPTIONS(-g) > > +-??????? endif() > > +-??????? if(GCOV STREQUAL "ON") > > +-??????? ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest- > > coverage) > > +-??????? endif() > > +-??????? SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe- > > uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but- > > set-variable -Wno-cast-qual -Wno-error=implicit-function- > > declaration) > > +-??????? SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow - > > Wmissing-prototypes -Wcast-align -Werror=address -Wstrict- > > prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write- > > strings -Werror-implicit-function-declaration -Wpointer-arith - > > Werror=pointer-arith -Wdeclaration-after-statement - > > Werror=declaration-after-statement -Wreturn-type -Werror=return- > > type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow > > -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field- > > initializers -Wformat-security -Werror=format-security -fno-common > > -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) > > +- > > +-??????? SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) > > +-??????? SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) > > +-??????? if(GCOV STREQUAL "ON") > > +-??????? SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}? -- > > coverage -lgcov -fprofile-arcs -ftest-coverage") > > +-??????? endif() > > +-??????? SET(CMAKE_C_LINK_EXECUTABLE " > > -o -Wl,-- > > start-group -Wl,--end-group") > > +- > > +???? endif() > > + > > +???? if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") > > +-- > > +2.43.2 > > + > > diff --git a/package/libspdm/libspdm.hash > > b/package/libspdm/libspdm.hash > > index 23faba1c4b..32415bcfce 100644 > > --- a/package/libspdm/libspdm.hash > > +++ b/package/libspdm/libspdm.hash > > @@ -1,3 +1,3 @@ > > ?# Locally calculated > > -sha256? > > 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183? > > libspdm-3.1.1.tar.gz > > +sha256? > > 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95? > > libspdm-3.2.0.tar.gz > > ?sha256? > > 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779? > > LICENSE.md > > diff --git a/package/libspdm/libspdm.mk > > b/package/libspdm/libspdm.mk > > index 34dbb457c4..2ec35be0ac 100644 > > --- a/package/libspdm/libspdm.mk > > +++ b/package/libspdm/libspdm.mk > > @@ -4,7 +4,7 @@ > > ?# > > ?################################################################## > > ############## > > ? > > -LIBSPDM_VERSION = 3.1.1 > > +LIBSPDM_VERSION = 3.2.0 > > ?LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) > > ?LIBSPDM_LICENSE = BSD-3-Clause > > ?LIBSPDM_LICENSE_FILES = LICENSE.md > > -- > > 2.43.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From wilfred.mallawa at wdc.com Sun Feb 25 23:09:04 2024 From: wilfred.mallawa at wdc.com (Wilfred Mallawa) Date: Mon, 26 Feb 2024 09:09:04 +1000 Subject: [Buildroot] [PATCH v2 1/1] package/libspdm: bump version to 3.2.0 Message-ID: <20240225230903.22005-2-wilfred.mallawa@wdc.com> Additionally, add an upstream patch that fixes the configuration for "NONE" toolchain variant in libspdm. That is, where the build environment provides compile/link options. Reviewed-by: Alistair Francis Signed-off-by: Wilfred Mallawa --- Changes in V2: - Added missing "Upstream" URL to libspdm patch --- ...eLists-remove-fixed-options-for-NONE.patch | 52 +++++++++++++++++++ package/libspdm/libspdm.hash | 2 +- package/libspdm/libspdm.mk | 2 +- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch new file mode 100644 index 0000000000..0de0ad0079 --- /dev/null +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch @@ -0,0 +1,52 @@ +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 +From: Wilfred Mallawa +Date: Mon, 19 Feb 2024 09:56:14 +1000 +Subject: [PATCH] CMakeLists: remove fixed options for NONE + +The use of the NONE toolchain option is such that we can provide at the +build project level (buildroot etc...). However, the changes introduced +in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker +option that does not comply with the definition of the options as +specified in [1]. This change removes those options. + +[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments + +Upstream: https://github.com/DMTF/libspdm/commit/d4d6b138d727e484fa9d0fef476ca181681d0695 +Signed-off-by: Wilfred Mallawa +--- + CMakeLists.txt | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c300cc817..f6cf17d269 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(CMAKE_EXE_LINKER_FLAGS "") + + SET(CMAKE_C_LINK_EXECUTABLE "") +- +- elseif(TOOLCHAIN STREQUAL "NONE") +- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") +- ADD_COMPILE_OPTIONS(-g) +- endif() +- if(GCOV STREQUAL "ON") +- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) +- endif() +- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) +- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) +- +- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) +- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) +- if(GCOV STREQUAL "ON") +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") +- endif() +- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") +- + endif() + + if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") +-- +2.43.2 + diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash index 23faba1c4b..32415bcfce 100644 --- a/package/libspdm/libspdm.hash +++ b/package/libspdm/libspdm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183 libspdm-3.1.1.tar.gz +sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk index 34dbb457c4..2ec35be0ac 100644 --- a/package/libspdm/libspdm.mk +++ b/package/libspdm/libspdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPDM_VERSION = 3.1.1 +LIBSPDM_VERSION = 3.2.0 LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) LIBSPDM_LICENSE = BSD-3-Clause LIBSPDM_LICENSE_FILES = LICENSE.md -- 2.43.2 From fontaine.fabrice at gmail.com Mon Feb 26 06:52:11 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 26 Feb 2024 07:52:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: disable utest In-Reply-To: References: <20240225171149.1447606-1-fontaine.fabrice@gmail.com> Message-ID: Hello Giulio, Le dim. 25 f?vr. 2024 ? 20:23, Giulio Benetti a ?crit : > > Hi Fabrice, > > thanks a lot for the patch, > > On 25/02/24 18:11, Fabrice Fontaine wrote: > > Disable utest to avoid the following build failure raised since the > > addition of the package in commit > > b1dbd3f679e6660325472e3fdca72127d74e6929 if cunit is found: > > > > ../utest/tracefs-utest.c: In function 'test_uprobes_instance': > > ../utest/tracefs-utest.c:2492:19: error: 'PATH_MAX' undeclared (first use in this function) > > 2492 | char self[PATH_MAX] = { 0 }; > > | ^~~~~~~~ > > > > Fixes: b1dbd3f679e6660325472e3fdca72127d74e6929 > > - http://autobuild.buildroot.org/results/1a01883231dbc8a7688de26db9a08751165fe8fe > > > > Signed-off-by: Fabrice Fontaine > > --- > > .../0002-meson-add-utest-option.patch | 40 +++++++++++++++++++ > > package/libtracefs/libtracefs.mk | 3 +- > > 2 files changed, 42 insertions(+), 1 deletion(-) > > create mode 100644 package/libtracefs/0002-meson-add-utest-option.patch > > > > diff --git a/package/libtracefs/0002-meson-add-utest-option.patch b/package/libtracefs/0002-meson-add-utest-option.patch > > new file mode 100644 > > index 0000000000..90f73a7ea0 > > --- /dev/null > > +++ b/package/libtracefs/0002-meson-add-utest-option.patch > > @@ -0,0 +1,40 @@ > > +From 7a09e2d414959075e2177c50ef1d4bf606b9ccdc Mon Sep 17 00:00:00 2001 > > +From: Fabrice Fontaine > > +Date: Thu, 15 Feb 2024 21:20:29 +0100 > > +Subject: [PATCH] meson: add utest option > > + > > +Add utest option to allow the user to disable utest > > + > > +Signed-off-by: Fabrice Fontaine > > +Upstream: https://github.com/rostedt/libtracefs/pull/2 > > For this project you have to git send-email the patch to: > linux-trace-devel at vger.kernel.org > > as documented in: > https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/tree/README#n45 > > Can you do that? Otherwise I can send the patch. Done: https://lore.kernel.org/linux-trace-devel/20240225204759.3263-1-fontaine.fabrice at gmail.com/T/#u > > Thank you! > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > > > +--- > > + meson.build | 2 +- > > + meson_options.txt | 2 ++ > > + 2 files changed, 3 insertions(+), 1 deletion(-) > > + > > +diff --git a/meson.build b/meson.build > > +index 3156f1c..d4cfd53 100644 > > +--- a/meson.build > > ++++ b/meson.build > > +@@ -35,7 +35,7 @@ incdir = include_directories(['include']) > > + > > + subdir('src') > > + subdir('include') > > +-if cunit_dep.found() > > ++if get_option('utest') and cunit_dep.found() > > + subdir('utest') > > + endif > > + if get_option('samples') > > +diff --git a/meson_options.txt b/meson_options.txt > > +index 8450992..a48efea 100644 > > +--- a/meson_options.txt > > ++++ b/meson_options.txt > > +@@ -18,3 +18,5 @@ option('doc', type : 'boolean', value: true, > > + description : 'produce documentation') > > + option('samples', type : 'boolean', value: true, > > + description : 'build samples') > > ++option('utest', type : 'boolean', value: true, > > ++ description : 'build utest') > > +-- > > +2.43.0 > > + > > diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk > > index ed45fcbc50..21cb8e84e3 100644 > > --- a/package/libtracefs/libtracefs.mk > > +++ b/package/libtracefs/libtracefs.mk > > @@ -14,6 +14,7 @@ LIBTRACEFS_DEPENDENCIES = host-bison host-flex host-pkgconf libtraceevent > > > > LIBTRACEFS_CONF_OPTS = \ > > -Ddoc=false \ > > - -Dsamples=false > > + -Dsamples=false \ > > + -Dutest=false > > > > $(eval $(meson-package)) > Best Regards, Fabrice From buildroot at bubu1.eu Mon Feb 26 09:41:22 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 26 Feb 2024 10:41:22 +0100 Subject: [Buildroot] [PATCH] package/fastapi: bump to 0.110.0 Message-ID: <20240226094122.22631-1-buildroot@bubu1.eu> Changelog: https://github.com/tiangolo/fastapi/releases/tag/0.110.0 Signed-off-by: Marcus Hoffmann --- package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index c16b7d22de..224eccbccd 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 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz -sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.tar.gz +md5 5e9226e70e1553a630599cf584ed53de fastapi-0.110.0.tar.gz +sha256 266775f0dcc95af9d3ef39bad55cff525329a931d5fd51930aadd4f428bf7ff3 fastapi-0.110.0.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 a2191c73b7..c1844960b9 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.109.2 +PYTHON_FASTAPI_VERSION = 0.110.0 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/61/53/326977db62bf34bbdfc64acb9414e1881af7ea14e8a062fd1c11a8697616 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 26 11:38:01 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 26 Feb 2024 12:38:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: disable utest In-Reply-To: References: Message-ID: An HTML attachment was scrubbed... URL: From gael.portay at rtone.fr Mon Feb 26 11:43:30 2024 From: gael.portay at rtone.fr (=?utf-8?q?Ga=C3=ABl_PORTAY?=) Date: Mon, 26 Feb 2024 12:43:30 +0100 Subject: [Buildroot] [PATCH v3 1/1] configs: add raspberrypi 5 defconfig In-Reply-To: References: <20240209204545.86221-1-gael.portay@rtone.fr> Message-ID: Yann, all, Any chance to get it merged for the upcomming release? No offence :) Regards, Ga?l On Fri Feb 9, 2024 at 9:50 PM CET, Ga?l PORTAY wrote: > Sorry for that double post. > > On Fri Feb 9, 2024 at 9:45 PM CET, Ga?l PORTAY wrote: > > This configuration builds an image for the RaspberryPi 5. > > > > Cc: Adam Duskett > > Cc: Yann E. MORIN > > Signed-off-by: Ga?l PORTAY > > --- > > Dear maintainers, > > > > That change adds the raspberrypi5_defconfig for the Raspberry Pi 5 > > 64-bit. > > > > It uses the defconfig bcm2712_defconfig[2] and the device-tree source > > bcm2712-rpi-5-b.dts[3]. > > > > Note: The kernel defconfig defaults to 16k page-size; a kernel fragment > > is added to use a 4k page-size to compile and run using all toolchains. > > > > The Raspberry Pi 5 has now a dedicated debug UART connector[4] (it is > > always active and enabled; there is no more need to enable_uart=1 in the > > file config.txt). > > > > The UART device name changes to ttyAMA10 and the command line has to be > > updated in the file cmdline.txt. > > > > The Raspberry Pi 5 only supports 64-bit kernel[5]. > > > > Tested on internal toolchain: > > > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1117-g95a905918c) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Fri Feb 9 20:09:08 CET 2024 > > (...) > > # grep PageSize /proc/1/smaps | sort -u > > KernelPageSize: 4 kB > > MMUPageSize: 4 kB > > > > Tested on external Bootlin toolchain: > > > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-linux-gcc.br_real (Buildroot 2021.11-10014-g6257e8c) 13.2.0, GNU ld (GNU Binutils) 2.41) #1 SMP PREEMPT Fri Feb 9 20:54:08 CET 2024 > > (...) > > # grep PageSize /proc/1/smaps | sort -u > > KernelPageSize: 4 kB > > MMUPageSize: 4 kB > > > > Tested on external ARM toolchain: > > > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 13.2.1 20231009, GNU ld (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 2.41.0.20231009) #1 SMP PREEMPT Fri Feb 9 21:00:24 CET 2024 > > (...) > > # grep PageSize /proc/1/smaps | sort -u > > KernelPageSize: 4 kB > > MMUPageSize: 4 kB > > > > Changes since RFC: > > - Update README to add model Pi 5 B > > - Add support for 64K MMU page-size for ARM64 and Raspberry Pi 5 > > - Add Raspberry Pi 5 specific cmdline_5.txt to set its console on its > > debug uart (ttyAMA10 instead of ttyAMA0) > > - Remove 32-bit variant since Raspberry Pi 5 supports booting a 64-bit > > kernel only > > - Remove the property arm_64bit=1 from config_5_64bit.txt > > - Remove the _64bit suffix > > - Remove unecessary Pi 5 variant from package rpi-firmware > > > > Changes since v1: > > - Rebase on top of master > > - Remove the bumps for the rpi-firmware and linux packages > > - Bump the kernel to linux-17f135b742c4edb340afb365873c3a574f7e16cb > > (6.1.61, i.e. the same version as the other raspberrypi defconfigs) > > > > Changes since v2: > > - Rebase on top of master (remove applied patch) > > - Add a kernel fragment to force 4k page-size > > - Remove BR2_ARM64_PAGE_SIZE_16K from the board's defconfig > > > > [0]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#introduction > > [1]: https://www.raspberrypi.com/documentation/computers/config_txt.html#kernel > > [2]: https://github.com/raspberrypi/linux/commit/9cfb379147f803b0362b0fe249e5b145d232bea3 > > [3]: https://github.com/raspberrypi/linux/commit/1196bf1a7736ff0ab79f5012fa84082e298031a7 > > [4]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#uart-connector > > [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#arm_64bit > > > > Kind Regards, > > Ga?l PORTAY > > > > board/raspberrypi/cmdline_5.txt | 1 + > > board/raspberrypi/config_5.txt | 14 ++++++ > > board/raspberrypi/linux-4k-page-size.fragment | 1 + > > board/raspberrypi/readme.txt | 6 +++ > > board/raspberrypi5 | 1 + > > configs/raspberrypi5_defconfig | 47 +++++++++++++++++++ > > 6 files changed, 70 insertions(+) > > create mode 100644 board/raspberrypi/cmdline_5.txt > > create mode 100644 board/raspberrypi/config_5.txt > > create mode 100644 board/raspberrypi/linux-4k-page-size.fragment > > create mode 120000 board/raspberrypi5 > > create mode 100644 configs/raspberrypi5_defconfig > > > > diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt > > new file mode 100644 > > index 0000000000..ac457353e2 > > --- /dev/null > > +++ b/board/raspberrypi/cmdline_5.txt > > @@ -0,0 +1 @@ > > +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 > > diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt > > new file mode 100644 > > index 0000000000..bbed19fe46 > > --- /dev/null > > +++ b/board/raspberrypi/config_5.txt > > @@ -0,0 +1,14 @@ > > +# Please note that this is only a sample, we recommend you to change it to fit > > +# your needs. > > +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. > > +# See http://buildroot.org/manual.html#rootfs-custom > > +# and http://elinux.org/RPiconfig for a description of config.txt syntax > > + > > +kernel=Image > > + > > +# To use an external initramfs file > > +#initramfs rootfs.cpio.gz > > + > > +# Disable overscan assuming the display supports displaying the full resolution > > +# If the text shown on the screen disappears off the edge, comment this out > > +disable_overscan=1 > > diff --git a/board/raspberrypi/linux-4k-page-size.fragment b/board/raspberrypi/linux-4k-page-size.fragment > > new file mode 100644 > > index 0000000000..5df91df1aa > > --- /dev/null > > +++ b/board/raspberrypi/linux-4k-page-size.fragment > > @@ -0,0 +1 @@ > > +CONFIG_ARM64_4K_PAGES=y > > diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt > > index 9202b5ff37..aa6421ea01 100644 > > --- a/board/raspberrypi/readme.txt > > +++ b/board/raspberrypi/readme.txt > > @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: > > - the model B3 (aka Raspberry Pi 3). > > - the model B4 (aka Raspberry Pi 4). > > - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). > > + - the model B5 (aka Raspberry Pi 5). > > > > How to build it > > =============== > > @@ -64,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): > > > > $ make raspberrypicm4io_64_defconfig > > > > +For model 5 B: > > + > > + $ make raspberrypi5_defconfig > > + > > Build the rootfs > > ---------------- > > > > @@ -94,6 +99,7 @@ After building, you should obtain this tree: > > +-- bcm2710-rpi-cm3.dtb [1] > > +-- bcm2711-rpi-4-b.dtb [1] > > +-- bcm2711-rpi-cm4.dtb [1] > > + +-- bcm2712-rpi-5-b.dtb [1] > > +-- bcm2837-rpi-3-b.dtb [1] > > +-- boot.vfat > > +-- rootfs.ext4 > > diff --git a/board/raspberrypi5 b/board/raspberrypi5 > > new file mode 120000 > > index 0000000000..fcdafc81ed > > --- /dev/null > > +++ b/board/raspberrypi5 > > @@ -0,0 +1 @@ > > +raspberrypi > > \ No newline at end of file > > diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig > > new file mode 100644 > > index 0000000000..d0760824bd > > --- /dev/null > > +++ b/configs/raspberrypi5_defconfig > > @@ -0,0 +1,47 @@ > > +BR2_aarch64=y > > +BR2_cortex_a76_a55=y > > +BR2_ARM_FPU_VFPV4=y > > + > > +BR2_TOOLCHAIN_BUILDROOT_CXX=y > > + > > +BR2_SYSTEM_DHCP="eth0" > > + > > +# Linux headers same as kernel, a 6.1 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > + > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" > > +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" > > + > > +# Build the DTB from the kernel sources > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" > > + > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > + > > +BR2_PACKAGE_RPI_FIRMWARE=y > > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" > > +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" > > +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set > > + > > +# Required tools to create the SD image > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > + > > +# Filesystem / image > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > +# BR2_TARGET_ROOTFS_TAR is not set > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" > > + > > +# Enable compressed kernel module support > > +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > > +BR2_PACKAGE_KMOD_TOOLS=y > > +BR2_PACKAGE_XZ=y > > +BR2_PACKAGE_KMOD=y > > +BR2_PACKAGE_HOST_KMOD_XZ=y > > -- > > 2.43.0 From laurentbadel at eaton.com Mon Feb 26 09:19:04 2024 From: laurentbadel at eaton.com (Laurent Badel) Date: Mon, 26 Feb 2024 09:19:04 +0000 Subject: [Buildroot] [PATCH 1/1] package/micropython: update PCRE dependency to PCRE2 Message-ID: <20240226091904.14928-1-laurentbadel@eaton.com> micropython-lib/unix-ffi/re/re.py uses libpcre2-8 since commit d8e163b. Thus, update micropython package to select the PCRE2 package instead of PCRE. Signed-off-by: Laurent Badel --- package/micropython/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 26a00baa..849a5452 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -13,7 +13,7 @@ if BR2_PACKAGE_MICROPYTHON config BR2_PACKAGE_MICROPYTHON_LIB bool "micropython-lib" - select BR2_PACKAGE_PCRE # runtime + select BR2_PACKAGE_PCRE2 # runtime help Core Python libraries ported to MicroPython. -- 2.17.1 From arnout at mind.be Mon Feb 26 14:02:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 26 Feb 2024 15:02:15 +0100 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 In-Reply-To: References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> <20240206233318.593730bd@windsurf> <87wmqut14w.fsf__36507.8827760712$1708783134$gmane$org@48ers.dk> Message-ID: On 25/02/2024 12:21, Yann E. MORIN wrote: > Bernd, All, > > On 2024-02-24 20:01 +0100, Bernd Kuhls spake thusly: >> Am Sat, 24 Feb 2024 14:58:23 +0100 schrieb Peter Korsgaard: >> >>> We unfortunately are still having a number of build failures because of >>> this, E.G. for target == host >> >> Hi, >> >> ftr, the host == target problem is solved by using a patch from here: >> https://github.com/python/cpython/issues/115382#issuecomment-1952936367 > > The issue with that, is that none of the upstream maintainers have > chimed in to express their view on whether this is the correct approach, > or to suggest something else. > > If we go and carry that patch without upstream feedback, we risk > carrying forever without the issue ever being fixed upstream. > > What happens in other buildsystems, like OE or openWRT? My colleague Benoit (not on the list, but added in Cc) ran into this Python issue himself, so I asked him to investigate a little. Here are his conclusions. OpenWRT uses currently python 3.11.7 on the master branch as it can be seen here: https://github.com/openwrt/packages/blob/master/lang/python/python3-version.mk They updated from python 3.11.6 to 3.11.7 on dec 13 2023 I see no issues, PR, nor commit regarding an update to python 3.12 Regarding OpenEmbedded, here are the latest python version that are used: dunfell (3.1 LTS) 3.8.18 kirkstone (4.0 LTS) 3.10.13 nanbield (4.3) 3.11.5 Scarthgap (5.0 - Release date : April 2024): 3.12.1 python: update 3.11.5 -> 3.12.1: https://git.openembedded.org/openembedded-core/commit/?h=scarthgap&id=716d82352545d3667a658b69d65d6127678dd150 From the moment they have updated from 3.10.6 (f10cdc155e47af5627ee999c57e1d083f9382a91), I don't see any new major patch... I (Arnout) think that they don't have the problem because since 2019 they're carrying the following patch. From 5b66463c10fec1440e977d5a21a0167862d6d79c Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Date: Tue, 18 Nov 2014 03:35:33 -0500 Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for PYTHON_FOR_BUILD When building x86->x86 the system will try to execute .so and related items from the default PYTHONPATH. This will fail if the target CPU contains instructions that the host CPU does not have, add CROSSPYTHONPATH into PYTHONPATH so we can prepend the list to find correct libs. Upstream-Status: Inappropriate [OE-Core integration specific] Credits-to: Mark Hatle Credits-to: Jackie Huang Signed-off-by: Ricardo Ribalda (CROSSPYTHONPATH points to the equivalent of our host/lib/python3.X). Regards, Arnout > > Regards, > Yann E. MORIN. > From fontaine.fabrice at gmail.com Mon Feb 26 17:32:02 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 26 Feb 2024 18:32:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/poco: bump to version 1.13.2 Message-ID: <20240226173202.1032744-1-fontaine.fabrice@gmail.com> This bump will fix the following build failure raised since bump of expat to version 2.6.0 in commit 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 thanks to https://github.com/pocoproject/poco/commit/75f7042b70092e79c6b770b18d033a061c84e2c5: src/ParserEngine.cpp: In member function 'void Poco::XML::ParserEngine::init()': src/ParserEngine.cpp:510:17: error: 'XML_SetBillionLaughsAttackProtectionMaximumAmplification' was not declared in this scope; did you mean 'setBillionLaughsAttackProtectionMaximumAmplification'? 510 | XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/pocoproject/poco/blob/poco-1.13.2-release/CHANGELOG Fixes: 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 - http://autobuild.buildroot.org/results/7fad881f85d3b89abdee35388088965f05ead277 Signed-off-by: Fabrice Fontaine --- package/poco/poco.hash | 2 +- package/poco/poco.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 9a7981171a..0a1e900b3f 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 71ef96c35fced367d6da74da294510ad2c912563f12cd716ab02b6ed10a733ef poco-1.12.4.tar.gz +sha256 c01221870aa9bccedf1de39890279699207848fe61a0cfb6aeec7c5942c4627f poco-1.13.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 2d0233a8ce..f8c2a658de 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.12.4 +POCO_VERSION = 1.13.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE -- 2.43.0 From fontaine.fabrice at gmail.com Mon Feb 26 17:36:44 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 26 Feb 2024 18:36:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/erlang: fix build with autoconf 2.72 Message-ID: <20240226173644.1077579-1-fontaine.fabrice@gmail.com> Use ERLANG_FIX_AUTOCONF_VERSION to fix the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: ERROR: autoconf of version 2.72 found in path! You need to have autoconf of version 2.71 in path. Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/c9e8df3427fca9e8e75488e32bca18e81009238c Signed-off-by: Fabrice Fontaine --- package/erlang/erlang.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 1600b59381..84d2f4e898 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -17,14 +17,22 @@ ERLANG_CPE_ID_VENDOR = erlang ERLANG_CPE_ID_PRODUCT = erlang\/otp ERLANG_INSTALL_STAGING = YES +define ERLANG_FIX_AUTOCONF_VERSION + $(SED) "s/USE_AUTOCONF_VERSION=.*/USE_AUTOCONF_VERSION=$(AUTOCONF_VERSION)/" $(@D)/otp_build +endef + # Patched erts/aclocal.m4 define ERLANG_RUN_AUTOCONF cd $(@D) && PATH=$(BR_PATH) ./otp_build update_configure --no-commit endef ERLANG_DEPENDENCIES += host-autoconf -ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF HOST_ERLANG_DEPENDENCIES += host-autoconf -HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +HOST_ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF # Return the EIV (Erlang Interface Version, EI_VSN) # $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr -- 2.43.0 From ju.o at free.fr Mon Feb 26 20:35:32 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 26 Feb 2024 21:35:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/mysql: change default implementation to mariadb Message-ID: <20240226203532.12112-1-ju.o@free.fr> The mysql package is a virtual package with two implementations: oracle-mysql (the initial project), and mariadb (the fork of mysql). This virtual package was introduced in commit [1] (2016). The last version bump of oracle-mysql was in commit [2] (2014). This mysql version 5.1.73 dates from 2013 [3]. Package statistics at [4] reports 177 CVEs on this oracle-mysql version (as of Buildroot tag 2024.02-rc1). Finally, oracle-mysql has 12 package patches accumulated over the time and there is nobody registered in the DEVELOPER file for it. On the other hand, the Buildroot mariadb package seems to be in a better shape: the package version is more recent, and received frequent updates, since its introduction. There is several packages selecting BR2_PACKAGE_MYSQL, which will use the old oracle-mysql without the user knowing it (other than generating the CVE list with "make pkg-stats"). In the meantime oracle-mysql receive a major update, this commits changes the default implementation of the mysql virtual package from oracle-mysql to mariadb. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/3d707d2b4fa6362cb37754f6c5fbb06240f5faf5 [2] https://gitlab.com/buildroot.org/buildroot/-/commit/42c56751fc554503a03d4a914ce2e814eeaf5a41 [3] https://github.com/mysql/mysql-server/releases/tag/mysql-5.1.73 [4] http://autobuild.buildroot.org/stats/master.html Signed-off-by: Julien Olivain --- Patch tested on branch master at commit 7a9ba7a with commands: make check-package ... 0 warnings generated # Build packages using mysql cat > .config < Signed-off-by: Adam Duskett --- package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index c243aaae2b..1369d820e1 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 78fdaf69924db780bac78546e43d9c44074bad798c2c415d0b9bb96d065ee8a2 libsepol-3.5.tar.gz +sha256 c9dc585ea94903d784d597c861cd5dce6459168f95e22b31a0eab1cdd800975a libsepol-3.6.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index f7782542ec..6361cc66bc 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.5 +LIBSEPOL_VERSION = 3.6 LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:38 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:38 -0700 Subject: [Buildroot] [PATCH 2/9] package/libsemanage: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-2-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- package/libsemanage/libsemanage.hash | 2 +- package/libsemanage/libsemanage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 73df34bde9..862e49f52e 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 f53534e50247538280ed0d76c6ce81d8fb3939bd64cadb89da10dba42e40dd9c libsemanage-3.5.tar.gz +sha256 41138f46222439e1242f27c1587e95cf54a059259aaf1681db642cc30c4e0d60 libsemanage-3.6.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index 0fbdc5ae8d..7742e7060c 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.5 +LIBSEMANAGE_VERSION = 3.6 LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:39 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:39 -0700 Subject: [Buildroot] [PATCH 3/9] package/libselinux: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-3-adam.duskett@amarulasolutions.com> Remove upstreamed patches Signed-off-by: Adam Duskett --- package/libselinux/0001-fix-musl-build.patch | 38 -------------- ...T-and-rely-on-the-installed-file-nam.patch | 50 ------------------- ...inux-set-CFLAGS-for-pip-installation.patch | 43 ---------------- package/libselinux/libselinux.hash | 2 +- package/libselinux/libselinux.mk | 2 +- 5 files changed, 2 insertions(+), 133 deletions(-) delete mode 100644 package/libselinux/0001-fix-musl-build.patch delete mode 100644 package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch delete mode 100644 package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch diff --git a/package/libselinux/0001-fix-musl-build.patch b/package/libselinux/0001-fix-musl-build.patch deleted file mode 100644 index b8b16be26f..0000000000 --- a/package/libselinux/0001-fix-musl-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 78f7f09028fdd6a5e8e4e4b584749621eaef412f Mon Sep 17 00:00:00 2001 -From: Yann E. MORIN" -Date: Sat, 7 Dec 2019 17:24:50 -0800 -Subject: [PATCH] fix undefined macros in musl - -musl does not define glibc-specific macros, so use a simple version of -the macro when it is not defined. - -This is very inefficient, however, but copying the code from glibc is -not really possible because it is LGPL while libselinux in Public -Domain, and we want to avoid license propagation, so this macro is -completely written from scratch, and non-optimal. - -Signed-off-by: "Yann E. MORIN" -[Updated for 3.5] -Signed-off-by: Adam Duskett -diff --git a/src/booleans.c b/src/booleans.c -index ffa8d26..8569002 100644 ---- a/src/booleans.c -+++ b/src/booleans.c -@@ -64,6 +64,14 @@ int security_get_boolean_names(char ***names, int *len) - goto bad; - } - -+/* Simple (but inefficient) version of _D_ALLOC_NAMLEN when -+ * building with a C library that misses it (e.g. musl). -+ * Note: glibc does a strlen on (d)->d_name, so assume it is safe. -+ */ -+#ifndef _D_ALLOC_NAMLEN -+#define _D_ALLOC_NAMLEN(d) (strlen((d)->d_name)+1) -+#endif -+ - for (i = 0; i < *len; i++) { - n[i] = strdup(namelist[i]->d_name); - if (!n[i]) { --- -2.23.0 - diff --git a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch deleted file mode 100644 index c744ca4069..0000000000 --- a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c26495025ab1a2597e5433b67a3bf793d3ce1e08 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 25 Oct 2019 13:37:14 +0200 -Subject: [PATCH] Do not use PYCEXT, and rely on the installed file name - -PYCEXT is computed by asking the Python intrepreter what is the -file extension used for native Python modules. - -Unfortunately, when cross-compiling, the host Python doesn't give the -proper result: it gives the result matching the build machine, and not -the target machine. Due to this, the symlink has an incorrect name, -and doesn't point to the .so file that was actually built/installed. - -To address this and keep things simple, this patch just changes the ln -invocation to rely on the name of the _selinux*.so Python module that -was installed. - -Signed-off-by: Antoine Tenart -[Refreshed for 3.1] -Signed-off-by: Thomas Petazzoni -[Refreshed for 3.5] -Signed-off-by: Adam Duskett ---- - src/Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 190016e2af34..7ee22fd35da3 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include - PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) - PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX)) - PYTHONLIBDIR ?= $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '$(PREFIX)', 'base': '$(PREFIX)'}))") --PYCEXT ?= $(shell $(PYTHON) -c 'import importlib.machinery;print(importlib.machinery.EXTENSION_SUFFIXES[0])') - RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') - RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') - RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') -@@ -189,7 +188,7 @@ install: all - install-pywrap: pywrap - $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . - install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py -- ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) -+ ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/ - - install-rubywrap: rubywrap - test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) --- -2.26.2 - diff --git a/package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch b/package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch deleted file mode 100644 index c08529c44f..0000000000 --- a/package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c9b3cbb654ca1e834d47f52af9f170b9f38c857a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= -Date: Thu, 20 Apr 2023 18:27:00 +0200 -Subject: [PATCH] libselinux: set CFLAGS for pip installation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Explicitly set CFLAGS for the pip install command, similar to calling -setup.py, to ignore known compiler warnings treated as errors, e.g.: - - selinuxswig_python_wrap.c:3593:19: error: 'sidget' is deprecated [-Werror,-Wdeprecated-declarations] - result = (int)sidget(arg1); - ^ - selinuxswig_python_wrap.c:15024:1: error: no previous prototype for function 'PyInit__selinux' [-Werror,-Wmissing-prototypes] - SWIG_init(void) { - ^ - -Signed-off-by: Christian G?ttsche -Acked-by: Petr Lautrbach -Upstream: https://github.com/SELinuxProject/selinux/commit/c9b3cbb654ca1e834d47f52af9f170b9f38c857a -[yann.morin.1998 at free.fr: backport from upstream] -Signed-off-by: Yann E. MORIN ---- - libselinux/src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile -index 36d57122..f9a1e5f5 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -187,7 +187,7 @@ install: all - ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) - - install-pywrap: pywrap -- $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . -+ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . - install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py - ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) - --- -2.25.1 - diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index 14bc627a80..4e0a2ca317 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 9a3a3705ac13a2ccca2de6d652b6356fead10f36fb33115c185c5ccdf29eec19 libselinux-3.5.tar.gz +sha256 ba4e0ef34b270e7672a5e5f1b523fe2beab3a40bb33d9389f4ad3a8728f21b52 libselinux-3.6.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 601038e46f..97671f1cca 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.5 +LIBSELINUX_VERSION = 3.6 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:40 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:40 -0700 Subject: [Buildroot] [PATCH 4/9] package/policycoreutils: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-4-adam.duskett@amarulasolutions.com> setsebool/Makefile now unconditionally links against libsepol. As such, it is now a new dependency. Signed-off-by: Adam Duskett --- package/policycoreutils/Config.in | 1 + package/policycoreutils/policycoreutils.hash | 2 +- package/policycoreutils/policycoreutils.mk | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in index 3201c8fede..46a367129a 100644 --- a/package/policycoreutils/Config.in +++ b/package/policycoreutils/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_POLICYCOREUTILS depends on !BR2_STATIC_LIBS # libsemanage depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsemanage -> libselinux -> libsepol select BR2_PACKAGE_LIBSEMANAGE + select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_LIBCAP_NG help Policycoreutils is a collection of policy utilities diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index e29d192b13..ea45116912 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 78453e1529fbbf800e88860094d555e781ce1fba11a7ef77b5aabb43e1173276 policycoreutils-3.5.tar.gz +sha256 a76ac431ea40a35a83164ce9007909c1c6c12fd1056627f622144e4a705c0a2c policycoreutils-3.6.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 61d91066d4..773cd4626b 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -4,13 +4,13 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 3.5 +POLICYCOREUTILS_VERSION = 3.6 POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(POLICYCOREUTILS_VERSION) POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = LICENSE POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject -POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) +POLICYCOREUTILS_DEPENDENCIES = libsemanage libsepol libcap-ng $(TARGET_NLS_DEPENDENCIES) POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:41 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:41 -0700 Subject: [Buildroot] [PATCH 5/9] package/checkpolicy: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-5-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- package/checkpolicy/checkpolicy.hash | 2 +- package/checkpolicy/checkpolicy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index fcfd81c554..d2ecc7265a 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 7aa48ab2222a0b9881111d6d7f70c3014d3d9338827d9e02df105a68c0df5dbc checkpolicy-3.5.tar.gz +sha256 1b346b3cdd4f8a78a157627bad64a3b3479c67b6a19d15e6d5c8694620eadbc1 checkpolicy-3.6.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index 024d306233..109aaf6072 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.5 +CHECKPOLICY_VERSION = 3.6 CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:42 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:42 -0700 Subject: [Buildroot] [PATCH 6/9] package/restorecond: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-6-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- package/restorecond/restorecond.hash | 2 +- package/restorecond/restorecond.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 215c9192f4..5b86afdcc0 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 f00d8caddb6aba2793c65e69154d04671b52f3d37e081b0e96c1b443fe23c2fe restorecond-3.5.tar.gz +sha256 8f8aa2c6c66bcc6d91c6edd63913e5d738de6428928f27d1019d89c31cf347b1 restorecond-3.6.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index cd40905230..4e9a66c592 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESTORECOND_VERSION = 3.5 +RESTORECOND_VERSION = 3.6 RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:43 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:43 -0700 Subject: [Buildroot] [PATCH 7/9] package/semodule-utils: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-7-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- package/semodule-utils/semodule-utils.hash | 2 +- package/semodule-utils/semodule-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index ac3357d3fa..5e7d698f3b 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 c9a550a737051ebaf2c102f665c7ec2f85e7232870980aa0067998459b414283 semodule-utils-3.5.tar.gz +sha256 eedb88f2b2124e538f2d614be063c0d9ac3eacc0c51a4da44500ca1ed1ba16f4 semodule-utils-3.6.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index 9a0f084128..b58f7535f1 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.5 +SEMODULE_UTILS_VERSION = 3.6 SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:44 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:44 -0700 Subject: [Buildroot] [PATCH 8/9] package/selinux-python: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-8-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- package/selinux-python/selinux-python.hash | 2 +- package/selinux-python/selinux-python.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 3592540703..96be214fd3 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 8245bb4dae59333461f19ca0c79a829081f07972fa5e3ad4c2b2b917dd71d96b selinux-python-3.5.tar.gz +sha256 e2867d4cd26f9869c55216cc20ca7d10442491a0fbf256116ade99ec39426ec0 selinux-python-3.6.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 7505474aa4..84fc9cbc22 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.5 +SELINUX_PYTHON_VERSION = 3.6 SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:45 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:45 -0700 Subject: [Buildroot] [PATCH 9/9] package/setools: bump version to 4.4.4 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-9-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- ...1-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch | 2 +- package/setools/setools.hash | 2 +- package/setools/setools.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch b/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch index 36063a4e13..67c306e99c 100644 --- a/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch +++ b/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch @@ -59,7 +59,7 @@ index 5f4e764..a27b781 100755 import argparse import sys import logging -@@ -91,8 +92,8 @@ elif args.booleans is not None: +@@ -94,8 +95,8 @@ elif args.booleans is not None: try: p = setools.SELinuxPolicy(args.policy) m = setools.PermissionMap(args.map) diff --git a/package/setools/setools.hash b/package/setools/setools.hash index 6a61fc2809..bb98231de9 100644 --- a/package/setools/setools.hash +++ b/package/setools/setools.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 29f5e7d98764a6942b2e32c8aa44da6a618882818c79599ade967ece0cf1dace setools-4.4.3.tar.gz +sha256 92afeea2f2433cbb981ff47f6ce4e2485d9202b530842f7f5d95f905b2ddaea4 setools-4.4.4.tar.gz sha256 0e58d74751e394f39748c7b7b4039d6a883b5def9711160668ba962b52e69e01 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/setools/setools.mk b/package/setools/setools.mk index efb3869e5b..1ffc2852d2 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SETOOLS_VERSION = 4.4.3 +SETOOLS_VERSION = 4.4.4 SETOOLS_SITE = $(call github,SELinuxProject,setools,$(SETOOLS_VERSION)) SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-python-cython host-swig SETOOLS_INSTALL_STAGING = YES -- 2.43.2 From bobrofon at gmail.com Tue Feb 27 12:01:23 2024 From: bobrofon at gmail.com (Sergey Bobrenok) Date: Tue, 27 Feb 2024 15:01:23 +0300 Subject: [Buildroot] [PATCH 1/1] package/sdbus-cpp: bump to version 1.5.0 Message-ID: <20240227120123.405763-1-bobrofon@gmail.com> Changelog: https://github.com/Kistler-Group/sdbus-cpp/releases/tag/v1.5.0 Signed-off-by: Sergey Bobrenok --- package/sdbus-cpp/sdbus-cpp.hash | 2 +- package/sdbus-cpp/sdbus-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index f4336228af..b5ca7ecdff 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ca7405c7f0f9ae3023dcfa37bc68974c4b8a1c9ea2909b970e0aedc3e8657ee6 sdbus-cpp-1.4.0.tar.gz +sha256 577986929f911320fb9ef6a3e2badd464dc38411ebc25d2966f5cb85c39f0897 sdbus-cpp-1.5.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING sha256 a1c9e75e25d8f2ce18017c88978edab2f0dbc7814ad0697d4ff2e5e59959f657 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 9ffaeb26d2..18fc6a88a9 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDBUS_CPP_VERSION = 1.4.0 +SDBUS_CPP_VERSION = 1.5.0 SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd -- 2.43.2 From romain.naour at smile.fr Tue Feb 27 12:58:59 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 27 Feb 2024 13:58:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: bump to version 3.0.17 In-Reply-To: References: <20240211214935.1603160-1-ju.o__4871.99223586998$1707688208$gmane$org@free.fr> Message-ID: Hello Julien, Bernd, All, Le 19/02/2024 ? 21:04, Bernd Kuhls a ?crit?: > Am Sun, 11 Feb 2024 22:49:35 +0100 schrieb Julien Olivain: > >> For commit logs, see: >> https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ > > Hi Julien, > > this bump breaks building syslinux (not yet caught by the autobuilders): > https://bugs.gentoo.org/921597 Not by autobuilders but by the gitlab-ci: https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 The issue was introduced in gnu-efi 3.0.16 [1] that seems wrong/incomplete if we compare with inttypes.h header from glibc [2]. Julien, can you have a look? Thanks! [1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=stdlib/inttypes.h;h=cfda146aa9b956dc9f462bd65fb828e5929bc90b;hb=HEAD#l29 Best regards, Romain > > Regards, Bernd > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From flavio.tapajos at newtesc.com.br Tue Feb 27 15:38:15 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Tue, 27 Feb 2024 12:38:15 -0300 Subject: [Buildroot] [PATCH 1/1] package/rsyslog: bump version to 8.2402.0 Message-ID: <20240227153815.583392-1-flavio.tapajos@newtesc.com.br> Signed-off-by: Fl?vio Tapaj?s --- package/rsyslog/rsyslog.hash | 2 +- package/rsyslog/rsyslog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 9c00365355..212a1accea 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 774032006128a896437f5913e132aa27dbfb937cd8847e449522d5a12d63d03e rsyslog-8.2312.0.tar.gz +sha256 acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba rsyslog-8.2402.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 1919863f4f..ad4cfa24a7 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2312.0 +RSYSLOG_VERSION = 8.2402.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 -- 2.44.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:02 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:02 +0100 Subject: [Buildroot] [PATCH v7 00/17] Add support for AM62x-SK HS-FS devices Message-ID: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> The SK-AM62B-P1 is the newest version of SK-AM62 which includes high-security field-securable (HS-FS) silicon to optionally customize keys and encryption for security applications. This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, which, however, was buggy. This series fixes the errors and bumps the Linux kernel and U-Boot required for such a new device. Dario Binacchi (17): configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version boot/ti-k3-r5-loader: bump to version 2024.01 package/python-attrs: add host variant package/python-rpds-py: add host variant package/python-referencing: add host variant package/python-jsonschema-specifications: add host variant package/python-jsonschema: add host variant boot/ti-k3-r5-loader: set binman environment boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope package/ti-k3: disable HS-FS for AM65 SOC boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 board/ti/am62x-sk/genimage.cfg | 7 ++- board/ti/am62x-sk/post-build.sh | 54 ++++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++ boot/ti-k3-image-gen/Config.in | 61 ++----------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/ti-k3-r5-loader/Config.in | 5 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 12 +++- boot/uboot/Config.in | 23 +++---- boot/uboot/uboot.mk | 12 +++- configs/ti_am62x_sk_defconfig | 22 ++++--- configs/ti_am64x_sk_defconfig | 7 ++- package/Config.in | 1 + package/python-attrs/python-attrs.mk | 6 ++ .../python-jsonschema-specifications.mk | 10 +++ .../python-jsonschema/python-jsonschema.mk | 14 +++++ .../python-referencing/python-referencing.mk | 11 ++++ package/python-rpds-py/python-rpds-py.mk | 1 + package/ti-k3/Config.in | 60 ++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 20 files changed, 237 insertions(+), 87 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:03 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:03 +0100 Subject: [Buildroot] [PATCH v7 01/17] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-2-dario.binacchi@amarulasolutions.com> Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update commit message Changes in v5 - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c68..c3ad555a8184 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:05 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:05 +0100 Subject: [Buildroot] [PATCH v7 03/17] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-4-dario.binacchi@amarulasolutions.com> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a8184..a129e216d25b 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:04 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:04 +0100 Subject: [Buildroot] [PATCH v7 02/17] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-3-dario.binacchi@amarulasolutions.com> Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am64x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am64x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update commit message Changes in v5: - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8d3..097175bd8f39 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:06 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:06 +0100 Subject: [Buildroot] [PATCH v7 04/17] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-5-dario.binacchi@amarulasolutions.com> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f39..26195194c7d6 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:07 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:07 +0100 Subject: [Buildroot] [PATCH v7 05/17] boot/ti-k3-r5-loader: bump to version 2024.01 In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-6-dario.binacchi@amarulasolutions.com> All in-tree configs with the ti-k3-r5 bootloader use a custom version, so this patch is mostly for the menuconfig default version Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5a8..5f86c045c99f 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -16,7 +16,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2022.10" + bool "2024.01" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -60,7 +60,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index c5d1cb8e09f0..fbe5d215409d 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:08 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:08 +0100 Subject: [Buildroot] [PATCH v7 06/17] package/python-attrs: add host variant In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-7-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc4402..fb1729e62fa2 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:09 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:09 +0100 Subject: [Buildroot] [PATCH v7 07/17] package/python-rpds-py: add host variant In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-8-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4fde..cee2ff290a4e 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:10 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:10 +0100 Subject: [Buildroot] [PATCH v7 08/17] package/python-referencing: add host variant In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-9-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-referencing/python-referencing.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e913a..66d59ed8091a 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_REFERENCING_DEPENDENCIES += \ + host-python-attrs \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:11 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:11 +0100 Subject: [Buildroot] [PATCH v7 09/17] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-10-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes since v3 Changes in v3: - Drop Config.in.host package/python-jsonschema-specifications.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9d4..653c839bb450 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,14 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES += \ + host-python-referencing + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:12 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:12 +0100 Subject: [Buildroot] [PATCH v7 10/17] package/python-jsonschema: add host variant In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-11-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa7752..9e8b6e18b876 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \ + host-python-attrs \ + host-python-jsonschema-specifications \ + host-python-referencing \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:13 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:13 +0100 Subject: [Buildroot] [PATCH v7 11/17] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-12-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. The patch set the BINMAN_INDIRS environment variable to provide the directory to search for binary blobs and select the packages required by binman. The dependency of binman is not really easy to follow. First we have the packages list from binman.rst [1] then we have to install additional python modules [2]. Maybe in the future it will be necessary to add host-lzma and host-lz4 in the dependencies list. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update the commit message adding the links of requirements. Changes in v5: - Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - Drop runtime dependecies - Add host-python-pylibfdt dependency without requiring BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration - Add host-python3 and host-python-setuptools dependencies - Add SOB and COB tags of Romain Naour Changes in v4: - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Changes in v2: - Change commit message - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Select packages required by binman if BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled boot/ti-k3-r5-loader/Config.in | 1 + boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f86c045c99f..fc71337e80cc 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema help Separate U-Boot SPL build for R5 core on TI's K3 processors. Usually used to build tiboot3.bin with k3-image-gen. diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f2e..fdb058f3b72a 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python-jsonschema \ + host-python-pyyaml \ + host-python3 \ + host-python-setuptools \ + host-python-pylibfdt TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -58,6 +63,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + BINMAN_INDIRS=$(BINARIES_DIR) \ HOSTLDFLAGS="$(HOST_LDFLAGS)" define TI_K3_R5_LOADER_BUILD_CMDS -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:14 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:14 +0100 Subject: [Buildroot] [PATCH v7 12/17] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-13-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. The binman requirement is directly included in buildman dependency (tools/buildman/requirements.txt) since within U-Boot, binman is invoked by the build system, here buildman [1]. Furthermore, the use of Binman no longer makes it necessary to set `UBOOT_MAKE_OPTS += DM=...'. We had the explanation from [2]: BINMAN_INDIRS is used to fetch the DM binary from /ti-dm/ and SYSFW binaries from /ti-sysfw/. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot [2] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v7: - Replace ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) with ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),). - Update the commit message Changes in v6: - BR2_TARGET_UBOOT_USE_BINMAN - Binman tool is not specific to TI K3 platform, so add an option to specify the use of Binman in U-Boot. - Add runtime dependencies - Update commit message - Add SOB and COB tags of Romain Naour Changes in v5: - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" from UBOOT_MAKE_OPTS. no changes since v1: boot/uboot/Config.in | 11 +++++++++++ boot/uboot/uboot.mk | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930db..e6e7956adccb 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -290,6 +290,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN This option makes sure that the needed binary blobs are copied into the U-Boot source directory. +config BR2_TARGET_UBOOT_USE_BINMAN + bool "U-Boot use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a88059..35a41d96a12d 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -187,10 +187,12 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif +endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) UBOOT_DEPENDENCIES += opensbi @@ -269,6 +271,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) UBOOT_DEPENDENCIES += host-vim endif +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +UBOOT_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:15 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:15 +0100 Subject: [Buildroot] [PATCH v7 13/17] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-14-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot can use Binman to compile and sign the generated binaries, thus making the use of custom tools like ti-k3-image-gen no longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were configured and used outside of it. This patch allows setting such options even if the package is not enabled. The patch makes an exception to the Buildroot rule "no subdirectory in package directory". Signed-off-by: Dario Binacchi --- Changes in v7: - Revert change disabling BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X. The change is moved in a separate patch. Changes in v6: - Move BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME to ti-k3 (BR2_PACKAGE_TI_K3_DM). - Disable BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X Changes in v5: - Add SOB tag - Move the new ti-k3 from boot to package Added in v4 boot/ti-k3-image-gen/Config.in | 61 ++----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/uboot/Config.in | 12 +---- boot/uboot/uboot.mk | 2 +- configs/ti_am62x_sk_defconfig | 3 +- configs/ti_am64x_sk_defconfig | 3 +- package/Config.in | 1 + package/ti-k3/Config.in | 59 ++++++++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 9 files changed, 79 insertions(+), 73 deletions(-) create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e911..a57319f4be6d 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk index 64be9a18f2c4..aca29bcf1bd4 100644 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ $(BR2_MAKE_HOST_DEPENDENCY) TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index e6e7956adccb..821854d08acc 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -244,21 +244,11 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" # We use the SoC selection defined for the ti-k3-image-gen # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM - -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME - string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - -endif - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 35a41d96a12d..7cd4636aa292 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -189,7 +189,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) UBOOT_DEPENDENCIES += ti-k3-boot-firmware ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_PACKAGE_TI_K3_DM_SOCNAME)) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a129e216d25b..2835404a57df 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM62X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 26195194c7d6..566cbbe4824f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM64X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/package/Config.in b/package/Config.in index bf0fe078b955..6d3ed34e121b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -629,6 +629,7 @@ endmenu source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" + source "package/ti-k3/Config.in" source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" source "package/ti-sgx-um/Config.in" diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in new file mode 100644 index 000000000000..2a51b1531487 --- /dev/null +++ b/package/ti-k3/Config.in @@ -0,0 +1,59 @@ +config BR2_PACKAGE_TI_K3 + bool "TI K3" + help + The TI K3 SOC specific selections. + +if BR2_PACKAGE_TI_K3 + +choice + prompt "SoC family" + +config BR2_PACKAGE_TI_K3_SOC_AM62AX + bool "am62ax" + +config BR2_PACKAGE_TI_K3_SOC_AM62X + bool "am62x" + +config BR2_PACKAGE_TI_K3_SOC_AM64X + bool "am64x" + +config BR2_PACKAGE_TI_K3_SOC_AM65X + bool "am65x" + +endchoice + +choice + prompt "Security type" + help + The target SoC security type option. + +config BR2_PACKAGE_TI_K3_SECTYPE_GP + bool "gp" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + bool "hs-fs" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS + bool "hs" + +endchoice + +config BR2_PACKAGE_TI_K3_SOC + string + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X + +config BR2_PACKAGE_TI_K3_SECTYPE + string + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS + +config BR2_PACKAGE_TI_K3_DM_SOCNAME + string + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X + +endif diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk new file mode 100644 index 000000000000..a2da29f5148c --- /dev/null +++ b/package/ti-k3/ti-k3.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# ti-k3 +# +################################################################################ + +include $(sort $(wildcard package/ti-k3/*/*.mk)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:16 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:16 +0100 Subject: [Buildroot] [PATCH v7 14/17] package/ti-k3: disable HS-FS for AM65 SOC In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-15-dario.binacchi@amarulasolutions.com> It seems that some TI K3 SoC variant doesn't provide all SECTYPE. For example: AM65 provide only GP or HS, there is no HS-FS. This can be checked in meta-ti: meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" So BR2_PACKAGE_TI_K3_SECTYPE_HS_FS must not be selected if BR2_PACKAGE_TI_K3_SOC_AM65X is used. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Added in v7 package/ti-k3/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in index 2a51b1531487..b8545b7bca62 100644 --- a/package/ti-k3/Config.in +++ b/package/ti-k3/Config.in @@ -32,6 +32,7 @@ config BR2_PACKAGE_TI_K3_SECTYPE_GP config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS bool "hs-fs" + depends on !BR2_PACKAGE_TI_K3_SOC_AM65X config BR2_PACKAGE_TI_K3_SECTYPE_HS bool "hs" -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:17 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:17 +0100 Subject: [Buildroot] [PATCH v7 15/17] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-16-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot are capable of building tiboot3.bin using Binman. In this case, let's copy it to the binaries directory. Signed-off-by: Dario Binacchi --- Changes in v6: - Replace `find' command with `cp' one. Changes in v5: - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin Added in v4 boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index fdb058f3b72a..cbdb653278f8 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) + define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin endef $(eval $(kconfig-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:18 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:18 +0100 Subject: [Buildroot] [PATCH v7 16/17] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-17-dario.binacchi@amarulasolutions.com> The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v7: - Add devicetree k3-am625-sk.dtb to extlinux.conf - Improve error messages in post-build.sh script Changes in v6: - Enable BR2_TARGET_UBOOT_USE_BINMAN option Changes in v5: - Update commit message. Changes in v4: - bump to 204.01 instead of 2023.10 - Update the commit message - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. Changes in v2: - Update the commit message - Drop Python options required by binman. - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically selects the Python modules required by binman. board/ti/am62x-sk/genimage.cfg | 7 ++++- board/ti/am62x-sk/post-build.sh | 54 +++++++++++++++++++++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 +++ configs/ti_am62x_sk_defconfig | 13 ++++---- 4 files changed, 72 insertions(+), 7 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg index 26304fe98f99..398209f4d831 100644 --- a/board/ti/am62x-sk/genimage.cfg +++ b/board/ti/am62x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh new file mode 100755 index 000000000000..4f19f4d6cf91 --- /dev/null +++ b/board/ti/am62x-sk/post-build.sh @@ -0,0 +1,54 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:d:r:x:' +O='console:,devicetree:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-d|--devicetree) + DEVICETREE="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing \`console' argument" +[ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument" +[ -n "${ROOT}" ] || die "Missing \`root' argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label am62x-sk-buildroot + kernel /Image + fdtdir / + devicetree /${DEVICETREE} + append ${append} + __HEADER_EOF diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh new file mode 100755 index 000000000000..34f732c091ad --- /dev/null +++ b/board/ti/am62x-sk/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh -x + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 2835404a57df..7d9912024a16 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_PACKAGE_TI_K3=y @@ -24,20 +24,21 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" -BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:19 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:19 +0100 Subject: [Buildroot] [PATCH v7 17/17] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-18-dario.binacchi@amarulasolutions.com> Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v5 - Bump to 6.6.17 from 6.6.1 - Update commit message Changes in v4 - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. no changes since v1 configs/ti_am62x_sk_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 7d9912024a16..db30bf10e2dc 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:40:12 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:40:12 +0100 Subject: [Buildroot] [PATCH v6 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> <383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr> Message-ID: Hi Romain, On Sun, Feb 25, 2024 at 5:43?PM Romain Naour wrote: > > Hello Dario, > > Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit : > > Tested on SK-AM62B-P1. > > You could complete your series by updating the ti_am64x_sk_defconfig too and > remove ti-k3-image-gen. I preferred to submit version 7 without the patches for updating the ti_am64x_sk_defconfig and the removal of the ti-k3-image-gen package. This is because I do not have the am64x_sk board to test the changes on. However, I am available to submit a separate series for applying the changes to ti_am64x_sk_defconfig if there is someone who can test the configuration for me. Please let me know. Thanks and regards, Dario > > Except for minor improvement, this series is ok for me. > > Best regards, > Romain > > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v5: > > - Bump to 6.6.17 from 6.6.1 > > - Update commit message > > > > Changes in v4: > > - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. > > > > no changes since v1 > > > > configs/ti_am62x_sk_defconfig | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > > index 484f9feb8c61..8c962b4a9494 100644 > > --- a/configs/ti_am62x_sk_defconfig > > +++ b/configs/ti_am62x_sk_defconfig > > @@ -1,11 +1,11 @@ > > BR2_aarch64=y > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > > BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From sairon at sairon.cz Tue Feb 27 17:48:23 2024 From: sairon at sairon.cz (=?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?=) Date: Tue, 27 Feb 2024 18:48:23 +0100 Subject: [Buildroot] [PATCH] linux-firmware: add options for missing Intel b/g/n cards Message-ID: <20240227174823.3504777-1-sairon@sairon.cz> Add firmware files for missing cards from the 802.11bgn product list in the Linux Firmware Wiki [1]. So far only Wireless-N 130 and 1030 were supported, which use the 6000G2B microcode. [1] https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi#supported_devices Signed-off-by: Jan ?erm?k --- package/linux-firmware/Config.in | 36 ++++++++++++++++++++++++ package/linux-firmware/linux-firmware.mk | 30 ++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 920c0a2ef1..80e489bbe4 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -195,6 +195,42 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX help Firmware files for the Cypress cyw54xxx FullMAC. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_100 + bool "Intel iwlwifi 100" + help + Firmware files for the Intel Wifi 100 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_105 + bool "Intel iwlwifi 105" + help + Firmware files for the Intel Wifi 105 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_135 + bool "Intel iwlwifi 135" + help + Firmware files for the Intel Wifi 135 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_1000 + bool "Intel iwlwifi 135" + help + Firmware files for the Intel Wifi 1000 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2000 + bool "Intel iwlwifi 2000" + help + Firmware files for the Intel Wifi 2000 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2030 + bool "Intel iwlwifi 2030" + help + Firmware files for the Intel Wifi 2030 devices supported by + the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000 bool "Intel iwlwifi 22000" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 60e8861abe..b25c972634 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -486,6 +486,36 @@ LINUX_FIRMWARE_FILES += wil6210.* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_100),y) +LINUX_FIRMWARE_FILES += iwlwifi-100-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_105),y) +LINUX_FIRMWARE_FILES += iwlwifi-105-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_135),y) +LINUX_FIRMWARE_FILES += iwlwifi-135-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_1000),y) +LINUX_FIRMWARE_FILES += iwlwifi-1000-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2000),y) +LINUX_FIRMWARE_FILES += iwlwifi-2000-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2030),y) +LINUX_FIRMWARE_FILES += iwlwifi-2030-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode iwlwifi-Qu-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -- 2.34.1 From alexander.sverdlin at gmail.com Tue Feb 27 19:49:53 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Tue, 27 Feb 2024 20:49:53 +0100 Subject: [Buildroot] [PATCH v6 00/16] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, On Sat, 2024-02-24 at 21:56 +0100, Dario Binacchi wrote: > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > high-security field-securable (HS-FS) silicon to optionally customize keys > and encryption for security applications. > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > which, however, was buggy. This series fixes the errors and bumps the Linux > kernel and U-Boot required for such a new device. in contrast to your tests and my last tests on SK-AM62B this time I've tried on GP board (SK-AM62) and the build (for GP) didn't boot out of the box. I've briefly checked tiboo3.bin and it's the smaller one of all, so this part looks correct. Maybe we need to check if the Firmware blobs are correct in GP case... -- Alexander Sverdlin. From dario.binacchi at amarulasolutions.com Tue Feb 27 20:41:04 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 21:41:04 +0100 Subject: [Buildroot] [PATCH v6 00/16] Add support for AM62x-SK HS-FS devices In-Reply-To: References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: Hi Alexander, On Tue, Feb 27, 2024 at 8:49?PM Alexander Sverdlin wrote: > > Hello Dario, > > On Sat, 2024-02-24 at 21:56 +0100, Dario Binacchi wrote: > > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > > high-security field-securable (HS-FS) silicon to optionally customize keys > > and encryption for security applications. > > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > > which, however, was buggy. This series fixes the errors and bumps the Linux > > kernel and U-Boot required for such a new device. > > in contrast to your tests and my last tests on SK-AM62B this time I've tried > on GP board (SK-AM62) and the build (for GP) didn't boot out of the box. > > I've briefly checked tiboo3.bin and it's the smaller one of all, so this > part looks correct. Maybe we need to check if the Firmware blobs are correct > in GP case... I have tested all 7 versions on SK-AM62B successfully, but I don't have a GP board. Could it be an option for you to find out which is the latest version that also works for GP? A sort of series bisect? Thanks and regards, Dario > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From ju.o at free.fr Tue Feb 27 21:35:17 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 27 Feb 2024 22:35:17 +0100 Subject: [Buildroot] [PATCH 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 Message-ID: <20240227213517.241837-1-ju.o@free.fr> Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated gnu-efi. This update introduced syslinux build failure, as reported in [1]. This commit adds a package patch to fix this issue. For technical details of the issue, see the package patch commit log. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html Signed-off-by: Julien Olivain --- .checkpackageignore | 1 + ...stddef.h-add-wchar_t-type-definition.patch | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch diff --git a/.checkpackageignore b/.checkpackageignore index a6cc58c448c..a98a53fbf36 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -118,6 +118,7 @@ boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch Upstream boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch Upstream boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch Upstream boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch Upstream +boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch Upstream package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch Upstream package/4th/0001-avoid-regen-during-install.patch Upstream diff --git a/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch new file mode 100644 index 00000000000..ac98c47dfdc --- /dev/null +++ b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch @@ -0,0 +1,58 @@ +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Tue, 27 Feb 2024 21:09:15 +0100 +Subject: [PATCH] stddef.h: add wchar_t type definition + +Syslinux fail to build with gnu-efi >= 3.0.16 with error: + + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, + from /build/syslinux-6.03/efi/efi.h:23, + from /build/syslinux-6.03/efi/adv.h:4, + from /build/syslinux-6.03/efi/adv.c:29: + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' + typedef wchar_t CHAR16; + ^~~~~~~ + +This is because gnu-efi started to use the "wchar_t" type from the +toolchain's header, in commit [1]. Before this commit, +gnu-efi was defining the type as "short". + +Syslinux is including its own minimal stddef.h file, which masks the +one provided by the toolchain. See [2]. This file does not have a type +definition for "wchar_t". + +Finally, the POSIX header is supposed to provide this +"wchar_t" type definition. See [3]. + +This commit fixes the issue by adding the "wchar_t" type definition in +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This +also follow the previous gnu-efi < 3.0.16 behavior. + +This issue was seen in Buildroot Linux, in [5]. + +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html + +Signed-off-by: Julien Olivain +--- + com32/include/stddef.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/com32/include/stddef.h b/com32/include/stddef.h +index f52d62f3..437b11f2 100644 +--- a/com32/include/stddef.h ++++ b/com32/include/stddef.h +@@ -29,4 +29,6 @@ + */ + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) + ++typedef short wchar_t; ++ + #endif /* _STDDEF_H */ +-- +2.44.0 + -- 2.44.0 From ju.o at free.fr Tue Feb 27 21:39:14 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 27 Feb 2024 22:39:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: bump to version 3.0.17 In-Reply-To: References: <20240211214935.1603160-1-ju.o__4871.99223586998$1707688208$gmane$org@free.fr> Message-ID: <67dfa900e0a60574bc4cb3137d8b7c82@free.fr> Hi, Romain, Bernd, On 27/02/2024 13:58, Romain Naour wrote: > Hello Julien, Bernd, All, > > Le 19/02/2024 ? 21:04, Bernd Kuhls a ?crit?: >> Am Sun, 11 Feb 2024 22:49:35 +0100 schrieb Julien Olivain: >> >>> For commit logs, see: >>> https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ >> >> Hi Julien, >> >> this bump breaks building syslinux (not yet caught by the >> autobuilders): >> https://bugs.gentoo.org/921597 > > Not by autobuilders but by the gitlab-ci: > > https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 > https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 > > The issue was introduced in gnu-efi 3.0.16 [1] that seems > wrong/incomplete if we > compare with inttypes.h header from glibc [2]. > > Julien, can you have a look? > Thanks! Thanks for pointing that out. I proposed the following patch to fix the issue: https://patchwork.ozlabs.org/project/buildroot/patch/20240227213517.241837-1-ju.o at free.fr/ Best regards, Julien. > [1] > https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d > [2] > https://sourceware.org/git/?p=glibc.git;a=blob;f=stdlib/inttypes.h;h=cfda146aa9b956dc9f462bd65fb828e5929bc90b;hb=HEAD#l29 > > Best regards, > Romain > > >> >> Regards, Bernd >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bernd at kuhls.net Tue Feb 27 22:02:31 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Tue, 27 Feb 2024 23:02:31 +0100 Subject: [Buildroot] [PATCH 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 References: <20240227213517.241837-1-ju.o__3983.49413169257$1709069754$gmane$org@free.fr> Message-ID: Am Tue, 27 Feb 2024 22:35:17 +0100 schrieb Julien Olivain: > Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated > gnu-efi. This update introduced syslinux build failure, as reported in > [1]. > > This commit adds a package patch to fix this issue. For technical > details of the issue, see the package patch commit log. Tested-by: Bernd Kuhls [patch fixes the build error I saw with my usual defconfig] From romain.naour at smile.fr Tue Feb 27 22:17:28 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 27 Feb 2024 23:17:28 +0100 Subject: [Buildroot] [PATCH v6 00/16] Add support for AM62x-SK HS-FS devices In-Reply-To: References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <422f5b14-1eb5-4c20-af28-b063f9957b28@smile.fr> Hi Alexander, Dario, All, Le 27/02/2024 ? 21:41, Dario Binacchi a ?crit?: > Hi Alexander, > > On Tue, Feb 27, 2024 at 8:49?PM Alexander Sverdlin > wrote: >> >> Hello Dario, >> >> On Sat, 2024-02-24 at 21:56 +0100, Dario Binacchi wrote: >>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes >>> high-security field-securable (HS-FS) silicon to optionally customize keys >>> and encryption for security applications. >>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, >>> which, however, was buggy. This series fixes the errors and bumps the Linux >>> kernel and U-Boot required for such a new device. >> >> in contrast to your tests and my last tests on SK-AM62B this time I've tried >> on GP board (SK-AM62) and the build (for GP) didn't boot out of the box. >> >> I've briefly checked tiboo3.bin and it's the smaller one of all, so this >> part looks correct. Maybe we need to check if the Firmware blobs are correct >> in GP case... I checked the tiboot3.bin between v7 and v5 of this series: v7: -rw-r--r--. 1 romnao romnao 282545 27 f?vr. 22:23 tiboot3.bin v5 -rw-r--r--. 1 romnao romnao 282545 13 f?vr. 15:57 tiboot3-am62x-gp-evm.bin -rw-r--r--. 1 romnao romnao 285134 13 f?vr. 15:57 tiboot3-am62x-hs-evm.bin -rw-r--r--. 1 romnao romnao 285134 13 f?vr. 15:57 tiboot3-am62x-hs-fs-evm.bin Note, we copy the tiboot3 firmware using the complete file name, we don't use the tiboot3.bin symlink generated by binman tool. cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin Verify if your AM62 device is really a GP one. > > I have tested all 7 versions on SK-AM62B successfully, but I don't > have a GP board. > Could it be an option for you to find out which is the latest version > that also works for GP? > A sort of series bisect? I don't see any obvious issue. Please share your boot log and your defconfig. Best regards, Romain > > Thanks and regards, > Dario >> >> -- >> Alexander Sverdlin. >> > > From peter at korsgaard.com Tue Feb 27 22:23:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:23:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/micropython: update PCRE dependency to PCRE2 In-Reply-To: <20240226091904.14928-1-laurentbadel@eaton.com> (Laurent Badel via buildroot's message of "Mon, 26 Feb 2024 09:19:04 +0000") References: <20240226091904.14928-1-laurentbadel@eaton.com> Message-ID: <87zfvlr1h5.fsf@48ers.dk> >>>>> "Laurent" == Laurent Badel via buildroot writes: > micropython-lib/unix-ffi/re/re.py uses libpcre2-8 since commit d8e163b. > Thus, update micropython package to select the PCRE2 package instead of PCRE. > Signed-off-by: Laurent Badel Committed, thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Tue Feb 27 22:23:13 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 27 Feb 2024 23:23:13 +0100 Subject: [Buildroot] [PATCH v6 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> <383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr> Message-ID: <28040f8a-c68e-4966-9e81-804f723f2100@smile.fr> Hi Dario, Le 27/02/2024 ? 17:40, Dario Binacchi a ?crit?: > Hi Romain, > > On Sun, Feb 25, 2024 at 5:43?PM Romain Naour wrote: >> >> Hello Dario, >> >> Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit : >>> Tested on SK-AM62B-P1. >> >> You could complete your series by updating the ti_am64x_sk_defconfig too and >> remove ti-k3-image-gen. > > I preferred to submit version 7 without the patches for updating the > ti_am64x_sk_defconfig and the removal of the ti-k3-image-gen package. > This is because I do not have the am64x_sk board to test the changes > on. However, I am available to submit a separate series for applying > the changes to ti_am64x_sk_defconfig if there is someone who can test > the configuration for me. > Please let me know. Maybe you can ask to Andreas Dannenberg for the am64x_sk? > Maybe if you can also test on AM64x just to be sure the defconfig is working. I'm planning on testing the entire series here pretty soon and will provide feedback (I have access to any and all boards:) http://lists.busybox.net/pipermail/buildroot/2024-February/685836.html Best regards, Romain > > Thanks and regards, > Dario > >> >> Except for minor improvement, this series is ok for me. >> >> Best regards, >> Romain >> >>> >>> Signed-off-by: Dario Binacchi >>> >>> --- >>> >>> Changes in v5: >>> - Bump to 6.6.17 from 6.6.1 >>> - Update commit message >>> >>> Changes in v4: >>> - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. >>> >>> no changes since v1 >>> >>> configs/ti_am62x_sk_defconfig | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >>> index 484f9feb8c61..8c962b4a9494 100644 >>> --- a/configs/ti_am62x_sk_defconfig >>> +++ b/configs/ti_am62x_sk_defconfig >>> @@ -1,11 +1,11 @@ >>> BR2_aarch64=y >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y >>> BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" >>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" >>> BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" >>> BR2_LINUX_KERNEL=y >>> BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" >>> BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>> BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" >> > > From peter at korsgaard.com Tue Feb 27 22:23:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:23:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/poco: bump to version 1.13.2 In-Reply-To: <20240226173202.1032744-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 26 Feb 2024 18:32:02 +0100") References: <20240226173202.1032744-1-fontaine.fabrice@gmail.com> Message-ID: <87v869r1g3.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This bump will fix the following build failure raised since bump of > expat to version 2.6.0 in commit > 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 thanks to > https://github.com/pocoproject/poco/commit/75f7042b70092e79c6b770b18d033a061c84e2c5: > src/ParserEngine.cpp: In member function 'void Poco::XML::ParserEngine::init()': > src/ParserEngine.cpp:510:17: error: 'XML_SetBillionLaughsAttackProtectionMaximumAmplification' was not declared in this scope; did you mean 'setBillionLaughsAttackProtectionMaximumAmplification'? > 510 | XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > https://github.com/pocoproject/poco/blob/poco-1.13.2-release/CHANGELOG > Fixes: 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 > - http://autobuild.buildroot.org/results/7fad881f85d3b89abdee35388088965f05ead277 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 27 22:24:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:24:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/erlang: fix build with autoconf 2.72 In-Reply-To: <20240226173644.1077579-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 26 Feb 2024 18:36:44 +0100") References: <20240226173644.1077579-1-fontaine.fabrice@gmail.com> Message-ID: <87r0gxr1ev.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Use ERLANG_FIX_AUTOCONF_VERSION to fix the following build failure > raised since bump of autoconf to version 2.72 in commit > 524f3536029dace3ce9aa154d3ca4685582e1955: > ERROR: autoconf of version 2.72 found in path! You need to have autoconf of version 2.71 in path. > Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 > - http://autobuild.buildroot.org/results/c9e8df3427fca9e8e75488e32bca18e81009238c > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 27 22:24:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:24:05 +0100 Subject: [Buildroot] [git commit] package/erlang: fix build with autoconf 2.72 Message-ID: <20240227222447.1B7E687B3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13083cf8c0edb0ac1cae4895505720658e8dd75d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use ERLANG_FIX_AUTOCONF_VERSION to fix the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: ERROR: autoconf of version 2.72 found in path! You need to have autoconf of version 2.71 in path. Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/c9e8df3427fca9e8e75488e32bca18e81009238c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/erlang/erlang.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 1600b59381..84d2f4e898 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -17,14 +17,22 @@ ERLANG_CPE_ID_VENDOR = erlang ERLANG_CPE_ID_PRODUCT = erlang\/otp ERLANG_INSTALL_STAGING = YES +define ERLANG_FIX_AUTOCONF_VERSION + $(SED) "s/USE_AUTOCONF_VERSION=.*/USE_AUTOCONF_VERSION=$(AUTOCONF_VERSION)/" $(@D)/otp_build +endef + # Patched erts/aclocal.m4 define ERLANG_RUN_AUTOCONF cd $(@D) && PATH=$(BR_PATH) ./otp_build update_configure --no-commit endef ERLANG_DEPENDENCIES += host-autoconf -ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF HOST_ERLANG_DEPENDENCIES += host-autoconf -HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +HOST_ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF # Return the EIV (Erlang Interface Version, EI_VSN) # $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr From peter at korsgaard.com Tue Feb 27 22:23:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:23:31 +0100 Subject: [Buildroot] [git commit] package/poco: bump to version 1.13.2 Message-ID: <20240227222447.1014F87AB2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=433c4fd38b15efcf74b410e5068e2e51eeba6e46 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure raised since bump of expat to version 2.6.0 in commit 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 thanks to https://github.com/pocoproject/poco/commit/75f7042b70092e79c6b770b18d033a061c84e2c5: src/ParserEngine.cpp: In member function 'void Poco::XML::ParserEngine::init()': src/ParserEngine.cpp:510:17: error: 'XML_SetBillionLaughsAttackProtectionMaximumAmplification' was not declared in this scope; did you mean 'setBillionLaughsAttackProtectionMaximumAmplification'? 510 | XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/pocoproject/poco/blob/poco-1.13.2-release/CHANGELOG Fixes: 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 - http://autobuild.buildroot.org/results/7fad881f85d3b89abdee35388088965f05ead277 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/poco/poco.hash | 2 +- package/poco/poco.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 9a7981171a..0a1e900b3f 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 71ef96c35fced367d6da74da294510ad2c912563f12cd716ab02b6ed10a733ef poco-1.12.4.tar.gz +sha256 c01221870aa9bccedf1de39890279699207848fe61a0cfb6aeec7c5942c4627f poco-1.13.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 2d0233a8ce..f8c2a658de 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.12.4 +POCO_VERSION = 1.13.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE From peter at korsgaard.com Tue Feb 27 22:22:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:22:57 +0100 Subject: [Buildroot] [git commit] package/micropython: update PCRE dependency to PCRE2 Message-ID: <20240227222447.07AE987B3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67f6d1dad2d4dd2af64a9eae6935e75147cd7bd2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master micropython-lib/unix-ffi/re/re.py uses libpcre2-8 since commit d8e163b. Thus, update micropython package to select the PCRE2 package instead of PCRE. Signed-off-by: Laurent Badel Signed-off-by: Peter Korsgaard --- package/micropython/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 26a00baab0..849a5452f4 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -13,7 +13,7 @@ if BR2_PACKAGE_MICROPYTHON config BR2_PACKAGE_MICROPYTHON_LIB bool "micropython-lib" - select BR2_PACKAGE_PCRE # runtime + select BR2_PACKAGE_PCRE2 # runtime help Core Python libraries ported to MicroPython. From romain.naour at smile.fr Tue Feb 27 22:31:08 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 27 Feb 2024 23:31:08 +0100 Subject: [Buildroot] [PATCH 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 In-Reply-To: <20240227213517.241837-1-ju.o@free.fr> References: <20240227213517.241837-1-ju.o@free.fr> Message-ID: <90f5d326-0b04-495e-9b6d-d25ebfa59cb4@smile.fr> Hi Julien, Le 27/02/2024 ? 22:35, Julien Olivain a ?crit?: > Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated > gnu-efi. This update introduced syslinux build failure, as reported > in [1]. > > This commit adds a package patch to fix this issue. For technical > details of the issue, see the package patch commit log. > > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 > > [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html > > Signed-off-by: Julien Olivain > --- > .checkpackageignore | 1 + > ...stddef.h-add-wchar_t-type-definition.patch | 58 +++++++++++++++++++ > 2 files changed, 59 insertions(+) > create mode 100644 boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > > diff --git a/.checkpackageignore b/.checkpackageignore > index a6cc58c448c..a98a53fbf36 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -118,6 +118,7 @@ boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch Upstream > boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch Upstream > boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch Upstream > boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch Upstream > +boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch We want to remove .checkpackageignore in a not too far future, please add an upstream status tag in the patch 0019-stddef.h-add-wchar_t-type-definition.patch itself. Even if upstream is not very active (last commit is 5 years ago). > linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch Upstream > package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch Upstream > package/4th/0001-avoid-regen-during-install.patch Upstream > diff --git a/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > new file mode 100644 > index 00000000000..ac98c47dfdc > --- /dev/null > +++ b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > @@ -0,0 +1,58 @@ > +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 > +From: Julien Olivain > +Date: Tue, 27 Feb 2024 21:09:15 +0100 > +Subject: [PATCH] stddef.h: add wchar_t type definition > + > +Syslinux fail to build with gnu-efi >= 3.0.16 with error: > + > + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, > + from /build/syslinux-6.03/efi/efi.h:23, > + from /build/syslinux-6.03/efi/adv.h:4, > + from /build/syslinux-6.03/efi/adv.c:29: > + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' > + typedef wchar_t CHAR16; > + ^~~~~~~ > + > +This is because gnu-efi started to use the "wchar_t" type from the > +toolchain's header, in commit [1]. Before this commit, > +gnu-efi was defining the type as "short". > + > +Syslinux is including its own minimal stddef.h file, which masks the > +one provided by the toolchain. See [2]. This file does not have a type > +definition for "wchar_t". Nice catch, didn't noticed this stddef.h provided by syslinux. Best regards, Romain > + > +Finally, the POSIX header is supposed to provide this > +"wchar_t" type definition. See [3]. > + > +This commit fixes the issue by adding the "wchar_t" type definition in > +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" > +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This > +also follow the previous gnu-efi < 3.0.16 behavior. > + > +This issue was seen in Buildroot Linux, in [5]. > + > +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d > +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h > +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html > +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 > +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html > + > +Signed-off-by: Julien Olivain > +--- > + com32/include/stddef.h | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/com32/include/stddef.h b/com32/include/stddef.h > +index f52d62f3..437b11f2 100644 > +--- a/com32/include/stddef.h > ++++ b/com32/include/stddef.h > +@@ -29,4 +29,6 @@ > + */ > + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) > + > ++typedef short wchar_t; > ++ > + #endif /* _STDDEF_H */ > +-- > +2.44.0 > + From alexander.sverdlin at gmail.com Wed Feb 28 00:06:36 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 28 Feb 2024 01:06:36 +0100 Subject: [Buildroot] [PATCH v7 00/17] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <066a576a350d384c6547dc27b55e75c8044ed9e8.camel@gmail.com> Hello Dario, Romain! On Tue, 2024-02-27 at 17:30 +0100, Dario Binacchi wrote: > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > high-security field-securable (HS-FS) silicon to optionally customize keys > and encryption for security applications. > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > which, however, was buggy. This series fixes the errors and bumps the Linux > kernel and U-Boot required for such a new device. > > Dario Binacchi (17): > ? configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > ??? setting > ? configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > ??? setting > ? configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > ??? version > ? configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > ??? version > ? boot/ti-k3-r5-loader: bump to version 2024.01 > ? package/python-attrs: add host variant > ? package/python-rpds-py: add host variant > ? package/python-referencing: add host variant > ? package/python-jsonschema-specifications: add host variant > ? package/python-jsonschema: add host variant > ? boot/ti-k3-r5-loader: set binman environment > ? boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > ? package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > ? package/ti-k3: disable HS-FS for AM65 SOC > ? boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > ? configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > ? configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 I'm sorry for misleading you with the results with v6. I've built v7 series for GP and it runs fine on SK-AM62 (GP). Seems I've messed up either boot dip switches initially or the serial console. Thanks for your efforts! Tested-by: Alexander Sverdlin -- Alexander Sverdlin. From dario.binacchi at amarulasolutions.com Wed Feb 28 08:07:44 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 28 Feb 2024 09:07:44 +0100 Subject: [Buildroot] [PATCH v7 00/17] Add support for AM62x-SK HS-FS devices In-Reply-To: <066a576a350d384c6547dc27b55e75c8044ed9e8.camel@gmail.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> <066a576a350d384c6547dc27b55e75c8044ed9e8.camel@gmail.com> Message-ID: Hi Alexander, On Wed, Feb 28, 2024 at 1:06?AM Alexander Sverdlin wrote: > > Hello Dario, Romain! > > On Tue, 2024-02-27 at 17:30 +0100, Dario Binacchi wrote: > > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > > high-security field-securable (HS-FS) silicon to optionally customize keys > > and encryption for security applications. > > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > > which, however, was buggy. This series fixes the errors and bumps the Linux > > kernel and U-Boot required for such a new device. > > > > Dario Binacchi (17): > > configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > setting > > configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > setting > > configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > > version > > configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > > version > > boot/ti-k3-r5-loader: bump to version 2024.01 > > package/python-attrs: add host variant > > package/python-rpds-py: add host variant > > package/python-referencing: add host variant > > package/python-jsonschema-specifications: add host variant > > package/python-jsonschema: add host variant > > boot/ti-k3-r5-loader: set binman environment > > boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > > package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > > package/ti-k3: disable HS-FS for AM65 SOC > > boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > > configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > > configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 > > I'm sorry for misleading you with the results with v6. > I've built v7 series for GP and it runs fine on SK-AM62 (GP). > Seems I've messed up either boot dip switches initially or the serial > console. Thanks for your efforts! Nice! Thank you for your tests. Thanks and regards, Dario > > Tested-by: Alexander Sverdlin > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Wed Feb 28 08:28:00 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 28 Feb 2024 09:28:00 +0100 Subject: [Buildroot] [PATCH v6 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <28040f8a-c68e-4966-9e81-804f723f2100@smile.fr> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> <383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr> <28040f8a-c68e-4966-9e81-804f723f2100@smile.fr> Message-ID: Hi Romain, On Tue, Feb 27, 2024 at 11:23?PM Romain Naour wrote: > > Hi Dario, > > Le 27/02/2024 ? 17:40, Dario Binacchi a ?crit : > > Hi Romain, > > > > On Sun, Feb 25, 2024 at 5:43?PM Romain Naour wrote: > >> > >> Hello Dario, > >> > >> Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit : > >>> Tested on SK-AM62B-P1. > >> > >> You could complete your series by updating the ti_am64x_sk_defconfig too and > >> remove ti-k3-image-gen. > > > > I preferred to submit version 7 without the patches for updating the > > ti_am64x_sk_defconfig and the removal of the ti-k3-image-gen package. > > This is because I do not have the am64x_sk board to test the changes > > on. However, I am available to submit a separate series for applying > > the changes to ti_am64x_sk_defconfig if there is someone who can test > > the configuration for me. > > Please let me know. > > Maybe you can ask to Andreas Dannenberg for the am64x_sk? > > > Maybe if you can also test on AM64x just to be sure the defconfig is working. > Ok, I'll get to work and try to modify the configuration based on my experience with am62x. The idea is to submit the changes over the weekend. Thanks and regards, Dario > I'm planning on testing the entire series here pretty soon and will > provide feedback (I have access to any and all boards:) > > http://lists.busybox.net/pipermail/buildroot/2024-February/685836.html > > Best regards, > Romain > > > > > > Thanks and regards, > > Dario > > > >> > >> Except for minor improvement, this series is ok for me. > >> > >> Best regards, > >> Romain > >> > >>> > >>> Signed-off-by: Dario Binacchi > >>> > >>> --- > >>> > >>> Changes in v5: > >>> - Bump to 6.6.17 from 6.6.1 > >>> - Update commit message > >>> > >>> Changes in v4: > >>> - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. > >>> > >>> no changes since v1 > >>> > >>> configs/ti_am62x_sk_defconfig | 4 ++-- > >>> 1 file changed, 2 insertions(+), 2 deletions(-) > >>> > >>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > >>> index 484f9feb8c61..8c962b4a9494 100644 > >>> --- a/configs/ti_am62x_sk_defconfig > >>> +++ b/configs/ti_am62x_sk_defconfig > >>> @@ -1,11 +1,11 @@ > >>> BR2_aarch64=y > >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > >>> BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > >>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > >>> BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > >>> BR2_LINUX_KERNEL=y > >>> BR2_LINUX_KERNEL_CUSTOM_VERSION=y > >>> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > >>> BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > >>> BR2_LINUX_KERNEL_DTS_SUPPORT=y > >>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > >> > > > > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From peter at korsgaard.com Wed Feb 28 11:25:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:25:17 +0100 Subject: [Buildroot] [PATCH] package/openssh: fix dependencies with refpolicy In-Reply-To: <20240225092421.1468140-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Sun, 25 Feb 2024 10:24:21 +0100") References: <20240225092421.1468140-1-yann.morin.1998@free.fr> Message-ID: <87msrkrftu.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Commit 2c5a82a29ceb (package/openssh: select linux-pam if refpolicy > upstream is selected) did not account for the linux-pam dependencies > before selecting it, causing unmet dependencies warnings (unfortunately, > not errors), such as: > $ KCONFIG_SEED=0xCF227CF4 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM > Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] > Selected by [y]: > - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] > 2c5a82a29ceb made the choice of having openssl bear the responsibility > to select linux-pam when the upstream refpolicy version was enabled. > Semantically however, the responsibility really lies within refpolicy > itself, since that's what imposes linux-pam to openssh. > Move the select to refpolicy and drop it from openssh. Then, ensure that > linux-pam is only selected when it is available. > That means that one may get an openssh that is not linked against > linux-pam, when the linux-pam dependencies are not met; refpolicy (by > way of libsepol) also has a more stringent requirement on gcc version > than linux-pam, so most probably the missing dependencies would be > locale, wchar, or a static build. We consider that situation to be a > corner case that we do not want to address. > In the future, we may have more similar situations, whereby refpolicy > would impose other packages be linked with otherwise optional > dependencies. If (when) that were (will be) the case, then the proposed > mechanism would quickly become ugly; we could then re-assess a nicer way > to do that. Until then, this is good ebough. > Signed-off-by: Yann E. MORIN > Cc: Adam Duskett > Cc: Thomas Petazzoni > Cc: Fabrice Fontaine > --- > Changes v1 -> v2: > - simplify the logic: have refpolicy bear the select Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 11:23:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:23:57 +0100 Subject: [Buildroot] [git commit] package/openssh: fix dependencies with refpolicy Message-ID: <20240228112543.E82C887B49@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c20b2ae4ece10e07eeb80fcdd706a474d3be1475 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 2c5a82a29ceb (package/openssh: select linux-pam if refpolicy upstream is selected) did not account for the linux-pam dependencies before selecting it, causing unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0xCF227CF4 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] 2c5a82a29ceb made the choice of having openssl bear the responsibility to select linux-pam when the upstream refpolicy version was enabled. Semantically however, the responsibility really lies within refpolicy itself, since that's what imposes linux-pam to openssh. Move the select to refpolicy and drop it from openssh. Then, ensure that linux-pam is only selected when it is available. That means that one may get an openssh that is not linked against linux-pam, when the linux-pam dependencies are not met; refpolicy (by way of libsepol) also has a more stringent requirement on gcc version than linux-pam, so most probably the missing dependencies would be locale, wchar, or a static build. We consider that situation to be a corner case that we do not want to address. In the future, we may have more similar situations, whereby refpolicy would impose other packages be linked with otherwise optional dependencies. If (when) that were (will be) the case, then the proposed mechanism would quickly become ugly; we could then re-assess a nicer way to do that. Until then, this is good ebough. Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Thomas Petazzoni Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openssh/Config.in | 1 - package/refpolicy/Config.in | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index a3038ba01f..08d3c7d391 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_OPENSSH bool "openssh" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 0e72b895df..8ae8f0448d 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -36,6 +36,14 @@ choice config BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION bool "Upstream version" + # Consider reworking the following when adding new entries: + # Upstream refpolicy for openssh expects linux-pam to be used + select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_OPENSSH \ + && BR2_USE_MMU \ + && BR2_ENABLE_LOCALE \ + && BR2_USE_WCHAR \ + && !BR2_STATIC_LIBS \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 help Use the refpolicy as provided by Buildroot. From peter at korsgaard.com Wed Feb 28 11:45:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:45:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/xterm: bump to version 389 In-Reply-To: <20240122221934.475430-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 22 Jan 2024 23:19:34 +0100") References: <20240122221934.475430-1-fontaine.fabrice@gmail.com> Message-ID: <87il28revp.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Update hash of COPYING (update in year) > - This bump will fix the following musl build failure raised since bump > to version 384 in commit 164d635f3782522c324c710b767ef21c598228c4: > ./main.c:802:34: error: 'TAB3' undeclared here (not in a function); did you mean 'TAB0'? > 802 | { -1, XTTYMODE__tabs, TAB3 }, > | ^~~~ > | TAB0 > https://invisible-island.net/xterm/xterm.log.html#xterm_389 > Fixes: > - http://autobuild.buildroot.org/results/51f98577b851bdbb0a0ab93c9ef94977776c1b1b > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 11:45:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:45:07 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240228114602.E80CF8730B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c37a00e2d740d981d722c268805d8336d36c5b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 02692b723a0140196f40e00f47c6a307954c09dd) [Peter: drop 6.6.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 10 +++++----- package/linux-headers/Config.in.host | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index e9f5ffe9e4..a410b1395d 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.72" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.74" 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 ec86d5fe5c..a0d8a5769f 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 98dce69077c35cffca799dcdbbd32a02242aad6b0950eb931936bb2ef69f0926 linux-6.1.72.tar.xz +sha256 b7fbd1d79faed2ce3570ef79dc1223e4e19c868b86326b14a435db56ebbb2022 linux-6.1.74.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192 linux-5.15.146.tar.xz -sha256 86ace9892296bf1534d574894edd27614b68de4085c03fd3f60121751a334f1b linux-5.10.207.tar.xz -sha256 da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6 linux-5.4.266.tar.xz +sha256 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 linux-5.15.147.tar.xz +sha256 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e linux-5.10.208.tar.xz +sha256 42d28def2cc1502251edbfeaca3b25ee764ad1e471b6c703ccb2267f38471c43 linux-5.4.267.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598 linux-4.19.304.tar.xz +sha256 da82425c7410623dfb2405915347ee9617fc0e33a63ca821c33aeed160cddae8 linux-4.19.305.tar.xz sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8c30ce2e78..a3e9659d5c 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -385,11 +385,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.336" if BR2_KERNEL_HEADERS_4_14 - default "4.19.304" if BR2_KERNEL_HEADERS_4_19 - default "5.4.266" if BR2_KERNEL_HEADERS_5_4 - default "5.10.207" if BR2_KERNEL_HEADERS_5_10 - default "5.15.146" if BR2_KERNEL_HEADERS_5_15 - default "6.1.72" if BR2_KERNEL_HEADERS_6_1 + default "4.19.305" if BR2_KERNEL_HEADERS_4_19 + default "5.4.267" if BR2_KERNEL_HEADERS_5_4 + default "5.10.208" if BR2_KERNEL_HEADERS_5_10 + default "5.15.147" if BR2_KERNEL_HEADERS_5_15 + default "6.1.74" if BR2_KERNEL_HEADERS_6_1 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 \ From peter at korsgaard.com Wed Feb 28 11:39:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:39:21 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/xterm: bump to version 389 Message-ID: <20240228114602.D807087B5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33d1faaa6d27c4d1b725ed463aeaefab4aed9e3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x - Update hash of COPYING (update in year) - This bump will fix the following musl build failure raised since bump to version 384 in commit 164d635f3782522c324c710b767ef21c598228c4: ./main.c:802:34: error: 'TAB3' undeclared here (not in a function); did you mean 'TAB0'? 802 | { -1, XTTYMODE__tabs, TAB3 }, | ^~~~ | TAB0 https://invisible-island.net/xterm/xterm.log.html#xterm_389 Fixes: - http://autobuild.buildroot.org/results/51f98577b851bdbb0a0ab93c9ef94977776c1b1b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 6a49c394925da19aa933a8f60a6b5ad750710b41) Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 1a2ad8fea0..e0fdcfe66e 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 31ef870740ceae020c3c4b4a9601c7f47bfd46672c1aaf2d213a565d64cbc373 xterm-384.tgz +sha256 1cd5763d94d9370fed10d804e831a089b2ace0e7a74b6f56ef5a16a766bde7be xterm-389.tgz # Locally calculated -sha256 98d02d0b7f7b8aabb742b05e6960caaa9ae20e26d2f0d0dc57808362f2ac79bc COPYING +sha256 e38de4a0780954b5a7e69b5fa6c571daa8a1bfbacb4f2c5b2f07099e1a1d7c93 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 2fc2f734c8..c2c97dd318 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 384 +XTERM_VERSION = 389 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From peter at korsgaard.com Wed Feb 28 11:46:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:46:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.15 In-Reply-To: <20240120155008.3148748-1-bernd@kuhls.net> (Bernd Kuhls's message of "Sat, 20 Jan 2024 16:50:08 +0100") References: <20240120155008.3148748-1-bernd@kuhls.net> Message-ID: <87edcwreub.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.2.15 > Release notes: https://www.php.net/releases/8_2_15.php > Signed-off-by: Bernd Kuhls Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 11:39:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:39:54 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/xterm: bump to version 389 Message-ID: <20240228114724.0F45B87B66@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0d9bc0fd00150b0bbddb544705856c4e031b3bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x - Update hash of COPYING (update in year) - This bump will fix the following musl build failure raised since bump to version 384 in commit 164d635f3782522c324c710b767ef21c598228c4: ./main.c:802:34: error: 'TAB3' undeclared here (not in a function); did you mean 'TAB0'? 802 | { -1, XTTYMODE__tabs, TAB3 }, | ^~~~ | TAB0 https://invisible-island.net/xterm/xterm.log.html#xterm_389 Fixes: - http://autobuild.buildroot.org/results/51f98577b851bdbb0a0ab93c9ef94977776c1b1b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 6a49c394925da19aa933a8f60a6b5ad750710b41) Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 1a2ad8fea0..e0fdcfe66e 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 31ef870740ceae020c3c4b4a9601c7f47bfd46672c1aaf2d213a565d64cbc373 xterm-384.tgz +sha256 1cd5763d94d9370fed10d804e831a089b2ace0e7a74b6f56ef5a16a766bde7be xterm-389.tgz # Locally calculated -sha256 98d02d0b7f7b8aabb742b05e6960caaa9ae20e26d2f0d0dc57808362f2ac79bc COPYING +sha256 e38de4a0780954b5a7e69b5fa6c571daa8a1bfbacb4f2c5b2f07099e1a1d7c93 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 2fc2f734c8..c2c97dd318 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 384 +XTERM_VERSION = 389 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From peter at korsgaard.com Wed Feb 28 11:43:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:43:39 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240228114724.1EB0187B67@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=963d79affe3dda6243aef08119ac08a250f3728b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 02692b723a0140196f40e00f47c6a307954c09dd) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 9f9cf55d96..ed865c6f5b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.13" 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 2605e4e201..f41ed0a270 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 afe2e5a661bb886d762684ebea71607d1ee8cb9dd100279d2810ba20d9671e52 linux-6.6.11.tar.xz +sha256 88b89e7dd41ead4e3ab1e411c8bb8d592575acf815cf1df3c0dc57e2e882c0bc linux-6.6.13.tar.xz sha256 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 linux-6.5.13.tar.xz -sha256 98dce69077c35cffca799dcdbbd32a02242aad6b0950eb931936bb2ef69f0926 linux-6.1.72.tar.xz +sha256 b7fbd1d79faed2ce3570ef79dc1223e4e19c868b86326b14a435db56ebbb2022 linux-6.1.74.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192 linux-5.15.146.tar.xz -sha256 86ace9892296bf1534d574894edd27614b68de4085c03fd3f60121751a334f1b linux-5.10.207.tar.xz -sha256 da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6 linux-5.4.266.tar.xz +sha256 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 linux-5.15.147.tar.xz +sha256 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e linux-5.10.208.tar.xz +sha256 42d28def2cc1502251edbfeaca3b25ee764ad1e471b6c703ccb2267f38471c43 linux-5.4.267.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598 linux-4.19.304.tar.xz +sha256 da82425c7410623dfb2405915347ee9617fc0e33a63ca821c33aeed160cddae8 linux-4.19.305.tar.xz sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a18c954c78..1fad05b899 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -413,13 +413,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.336" if BR2_KERNEL_HEADERS_4_14 - default "4.19.304" if BR2_KERNEL_HEADERS_4_19 - default "5.4.266" if BR2_KERNEL_HEADERS_5_4 - default "5.10.207" if BR2_KERNEL_HEADERS_5_10 - default "5.15.146" if BR2_KERNEL_HEADERS_5_15 - default "6.1.72" if BR2_KERNEL_HEADERS_6_1 + default "4.19.305" if BR2_KERNEL_HEADERS_4_19 + default "5.4.267" if BR2_KERNEL_HEADERS_5_4 + default "5.10.208" if BR2_KERNEL_HEADERS_5_10 + default "5.15.147" if BR2_KERNEL_HEADERS_5_15 + default "6.1.74" if BR2_KERNEL_HEADERS_6_1 default "6.5.13" if BR2_KERNEL_HEADERS_6_5 - default "6.6.11" if BR2_KERNEL_HEADERS_6_6 + default "6.6.13" if BR2_KERNEL_HEADERS_6_6 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 \ From peter at korsgaard.com Wed Feb 28 11:47:33 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:47:33 +0100 Subject: [Buildroot] [PATCH] package/refpolicy: move patch to version subdir for custom git support In-Reply-To: <87zfws4i00.fsf@48ers.dk> (Peter Korsgaard's message of "Fri, 26 Jan 2024 09:27:11 +0100") References: <20240116085546.3624229-1-peter@korsgaard.com> <87zfws4i00.fsf@48ers.dk> Message-ID: <87a5nkresq.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Peter" == Peter Korsgaard writes: >> Commit e88823d667cf0 (package/refpolicy: fix build with smartmontools) added >> a 0001-policy-modules-services-smartmon.te-make-fstools-opt.patch patch, but >> forgot to put it in the version specific sub directory - Breaking builds >> using BR2_PACKAGE_REFPOLICY_CUSTOM_GIT as shown by the TestSELinuxCustomGit >> test: >>>>> refpolicy RELEASE_2_20200818 Extracting >> gzip -d -c >> /builds/buildroot.org/buildroot/test-dl/refpolicy/refpolicy-RELEASE_2_20200818-br1.tar.gz >> | tar --strip-components=1 -C >> /builds/buildroot.org/buildroot/test-output/TestSELinuxCustomGit/build/refpolicy-RELEASE_2_20200818 >> -xf - >>>>> refpolicy RELEASE_2_20200818 Patching >> Applying 0001-policy-modules-services-smartmon.te-make-fstools-opt.patch using patch: >> patching file policy/modules/services/smartmon.te >> Hunk #1 FAILED at 143. >> 1 out of 1 hunk FAILED -- saving rejects to file policy/modules/services/smartmon.te.rej >> make[1]: *** [package/pkg-generic.mk:241: >> /builds/buildroot.org/buildroot/test-output/TestSELinuxCustomGit/build/refpolicy-RELEASE_2_20200818/.stamp_patched] >> Error 1 >> https://gitlab.com/buildroot.org/buildroot/-/jobs/5929796183 >> Fix it by moving the patch to a versioned sub directory. >> Signed-off-by: Peter Korsgaard > Committed, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 11:46:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:46:22 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/php: bump version to 8.2.15 Message-ID: <20240228114846.4A83F87B71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3e0c97e51b2467fb803de11be9ce7ccdbb95adc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Changelog: https://www.php.net/ChangeLog-8.php#8.2.15 Release notes: https://www.php.net/releases/8_2_15.php Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ed7335d256f0327666168416b6278cfa4811faed) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 3759852a9b..7c8736e41c 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583 php-8.2.14.tar.xz +sha256 eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 php-8.2.15.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 87b8199f3b..6bb9a78065 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.14 +PHP_VERSION = 8.2.15 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 11:46:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:46:14 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/php: bump version to 8.2.15 Message-ID: <20240228114855.599CE87B71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b448305ae61ac2a447d1b1892b0c344c3b9deed7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Changelog: https://www.php.net/ChangeLog-8.php#8.2.15 Release notes: https://www.php.net/releases/8_2_15.php Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ed7335d256f0327666168416b6278cfa4811faed) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 3759852a9b..7c8736e41c 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583 php-8.2.14.tar.xz +sha256 eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 php-8.2.15.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 63fcfd8634..c69abd5f31 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.14 +PHP_VERSION = 8.2.15 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 11:47:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:47:20 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/refpolicy: move patch to version subdir for custom git support Message-ID: <20240228114855.6590087B73@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bb42e170d4247dc097df08b692a72b4410324c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit e88823d667cf0 (package/refpolicy: fix build with smartmontools) added a 0001-policy-modules-services-smartmon.te-make-fstools-opt.patch patch, but forgot to put it in the version specific sub directory - Breaking builds using BR2_PACKAGE_REFPOLICY_CUSTOM_GIT as shown by the TestSELinuxCustomGit test: >>> refpolicy RELEASE_2_20200818 Extracting gzip -d -c /builds/buildroot.org/buildroot/test-dl/refpolicy/refpolicy-RELEASE_2_20200818-br1.tar.gz | tar --strip-components=1 -C /builds/buildroot.org/buildroot/test-output/TestSELinuxCustomGit/build/refpolicy-RELEASE_2_20200818 -xf - >>> refpolicy RELEASE_2_20200818 Patching Applying 0001-policy-modules-services-smartmon.te-make-fstools-opt.patch using patch: patching file policy/modules/services/smartmon.te Hunk #1 FAILED at 143. 1 out of 1 hunk FAILED -- saving rejects to file policy/modules/services/smartmon.te.rej make[1]: *** [package/pkg-generic.mk:241: /builds/buildroot.org/buildroot/test-output/TestSELinuxCustomGit/build/refpolicy-RELEASE_2_20200818/.stamp_patched] Error 1 https://gitlab.com/buildroot.org/buildroot/-/jobs/5929796183 Fix it by moving the patch to a versioned sub directory. Signed-off-by: Peter Korsgaard (cherry picked from commit bde468127c9d131de380d0dd2849527597ecf5e0) Signed-off-by: Peter Korsgaard --- .../0001-policy-modules-services-smartmon.te-make-fstools-opt.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch b/package/refpolicy/2.20231002/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch similarity index 100% rename from package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch rename to package/refpolicy/2.20231002/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch From peter at korsgaard.com Wed Feb 28 13:36:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:36:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/xwayland: security bump to version 23.2.4 In-Reply-To: <20240125222140.1805844-1-peter@korsgaard.com> References: <20240125222140.1805844-1-peter@korsgaard.com> Message-ID: <083f7261-3cb5-4083-96bf-7b1a432d0890@korsgaard.com> On 25/01/2024 23.21, Peter Korsgaard wrote: > Fixes the following security issues: > > 1) CVE-2023-6816 can be triggered by passing an invalid array index to > DeviceFocusEvent or ProcXIQueryPointer. > > 2) CVE-2024-0229 can be triggered if a device has both a button and a > key class and zero buttons. > > 3) CVE-2024-21885 can be triggered if a device with a given ID was > removed and a new device with the same ID added both in the same > operation. > > 4) CVE-2024-21886 can be triggered by disabling a master device with > disabled slave devices. > > 5) CVE-2024-0409 can be triggered by enabling SELinux > xserver_object_manager and running a client. > > 6) CVE-2024-0408 can be triggered by enabling SELinux > xserver_object_manager and creating a GLX PBuffer. > > For details, see the advisory: > https://lists.x.org/archives/xorg-announce/2024-January/003444.html > > Signed-off-by: Peter Korsgaard Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 13:36:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:36:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/xserver_xorg-server: security bump to version 21.1.11 In-Reply-To: <20240125222140.1805844-2-peter@korsgaard.com> References: <20240125222140.1805844-1-peter@korsgaard.com> <20240125222140.1805844-2-peter@korsgaard.com> Message-ID: <49afb437-6c82-4f49-b308-2f36b0768bb0@korsgaard.com> On 25/01/2024 23.21, Peter Korsgaard wrote: > Fixes the following security issues: > > 1) CVE-2023-6816 can be triggered by passing an invalid array index to > DeviceFocusEvent or ProcXIQueryPointer. > > 2) CVE-2024-0229 can be triggered if a device has both a button and a > key class and zero buttons. > > 3) CVE-2024-21885 can be triggered if a device with a given ID was > removed and a new device with the same ID added both in the same > operation. > > 4) CVE-2024-21886 can be triggered by disabling a master device with > disabled slave devices. > > 5) CVE-2024-0409 can be triggered by enabling SELinux > xserver_object_manager and running a client. > > 6) CVE-2024-0408 can be triggered by enabling SELinux > xserver_object_manager and creating a GLX PBuffer. > > For details, see the advisory: > https://lists.x.org/archives/xorg-announce/2024-January/003444.html > > Switch to .tar.gz as the announcement mail only contained hashes for that: > https://lists.x.org/archives/xorg-announce/2024-January/003442.html > > Signed-off-by: Peter Korsgaard Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 13:38:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:38:06 +0100 Subject: [Buildroot] [PATCH] package/cog: bump to version 0.18.2 In-Reply-To: <20240116192102.4148440-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Tue, 16 Jan 2024 21:21:01 +0200") References: <20240116192102.4148440-1-aperez@igalia.com> Message-ID: <875xy8r9oh.fsf@48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This is a small bugfix release, with a fix for a crash in the DRM/KMS > module that affects i.MX6 boards and probably others. Release notes: > https://wpewebkit.org/release/cog-0.18.2.html > Signed-off-by: Adrian Perez de Castro Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 13:39:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:39:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/faad2: force arm mode instead of Thumb mode In-Reply-To: <20240126173215.1630553-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 26 Jan 2024 18:32:15 +0100") References: <20240126173215.1630553-1-fontaine.fabrice@gmail.com> Message-ID: <871q8wr9m4.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure in Thumb mode: > /tmp/ccfzn6FH.s:36: Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode > Fixes: > - http://autobuild.buildroot.org/results/838808b4751244ee01cde6b8261212b49e511a32 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 13:34:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:34:42 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/xwayland: security bump to version 23.2.4 Message-ID: <20240228133943.B52CE87B84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93385c55a7786eec975a04491033b2588babd1c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following security issues: 1) CVE-2023-6816 can be triggered by passing an invalid array index to DeviceFocusEvent or ProcXIQueryPointer. 2) CVE-2024-0229 can be triggered if a device has both a button and a key class and zero buttons. 3) CVE-2024-21885 can be triggered if a device with a given ID was removed and a new device with the same ID added both in the same operation. 4) CVE-2024-21886 can be triggered by disabling a master device with disabled slave devices. 5) CVE-2024-0409 can be triggered by enabling SELinux xserver_object_manager and running a client. 6) CVE-2024-0408 can be triggered by enabling SELinux xserver_object_manager and creating a GLX PBuffer. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2024-January/003444.html Signed-off-by: Peter Korsgaard (cherry picked from commit b8d9e75eb89898fac1a8200e78bca084635eefbc) Signed-off-by: Peter Korsgaard --- package/x11r7/xwayland/xwayland.hash | 6 +++--- package/x11r7/xwayland/xwayland.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash index 533ef9de86..5bb26bf17e 100644 --- a/package/x11r7/xwayland/xwayland.hash +++ b/package/x11r7/xwayland/xwayland.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-December/003437.html -sha256 eb9d9aa7232c47412c8835ec15a97c575f03563726c787754ff0c019bd07e302 xwayland-23.2.3.tar.xz -sha512 37198aa2f06313a0cb2add51cc78f81b26a42f2c9d55a0d3eecf958777107ea5560961c128f2d0af055f7460ba10fadb1b9050251c2c50f2251b40ab517e79cd xwayland-23.2.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003443.html +sha256 a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b xwayland-23.2.4.tar.xz +sha512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187 xwayland-23.2.4.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 8f4bcd8117..c66dd471ac 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -XWAYLAND_VERSION = 23.2.3 +XWAYLAND_VERSION = 23.2.4 XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT From peter at korsgaard.com Wed Feb 28 13:39:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:39:05 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/faad2: force arm mode instead of Thumb mode Message-ID: <20240228133943.D7DD487B86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e51bb2ced96c8826dcdce7ea46338d63a1ada2bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fix the following build failure in Thumb mode: /tmp/ccfzn6FH.s:36: Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/838808b4751244ee01cde6b8261212b49e511a32 Signed-off-by: Fabrice Fontaine [Peter: reword comment slightly] Signed-off-by: Peter Korsgaard (cherry picked from commit a33827760823b1455326e0fc8cf6089a3081e782) Signed-off-by: Peter Korsgaard --- package/faad2/faad2.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index 686e5045c0..0b249b3450 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -12,4 +12,11 @@ FAAD2_CPE_ID_VENDOR = audiocoding FAAD2_CPE_ID_PRODUCT = freeware_advanced_audio_decoder_2 FAAD2_INSTALL_STAGING = YES +# faad2 contains assembly routines using ARM instructions not present in thumb1 mode: +# Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode +# so force ARM mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FAAD2_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -marm" +endif + $(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 28 13:35:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:35:13 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/xserver_xorg-server: security bump to version 21.1.11 Message-ID: <20240228133943.C732087B70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a7b549b8c2352ed68bc9887ceac4bfe30dd9931 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following security issues: 1) CVE-2023-6816 can be triggered by passing an invalid array index to DeviceFocusEvent or ProcXIQueryPointer. 2) CVE-2024-0229 can be triggered if a device has both a button and a key class and zero buttons. 3) CVE-2024-21885 can be triggered if a device with a given ID was removed and a new device with the same ID added both in the same operation. 4) CVE-2024-21886 can be triggered by disabling a master device with disabled slave devices. 5) CVE-2024-0409 can be triggered by enabling SELinux xserver_object_manager and running a client. 6) CVE-2024-0408 can be triggered by enabling SELinux xserver_object_manager and creating a GLX PBuffer. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2024-January/003444.html Switch to .tar.gz as the announcement mail only contained hashes for that: https://lists.x.org/archives/xorg-announce/2024-January/003442.html Signed-off-by: Peter Korsgaard (cherry picked from commit 219178ef3eed5b3f4a5da0fe4af751e79d77e432) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index de93b11927..be636936e2 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-December/003436.html -sha256 ceb0b3a2efc57ac3ccf388d3dc88b97615068639fb284d469689ae3d105611d0 xorg-server-21.1.10.tar.xz -sha512 8135d9b7c0c71f427ba0a3b80741fee4f6ae195779399b73261a00858882f3516e367a08e2da1403734b04eacabae9aa231e5375eff23b57a3ff764e9caf8926 xorg-server-21.1.10.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003442.html +sha256 1aa0ee1adad0b2db7f291f3823a4ab240c7f4aea710e89f5ef4aa232b6833403 xorg-server-21.1.11.tar.gz +sha512 e41bf71955691e66084a67fc20643632087f0326d5eddc31e6edd118d05005b8ab536738c181f4c352f331ec8fc8f23ae1b45f237592fa5d7eddbffe43638b08 xorg-server-21.1.11.tar.gz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 4ac4283e4b..4a05582583 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,8 +4,8 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.10 -XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz +XSERVER_XORG_SERVER_VERSION = 21.1.11 +XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 13:34:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:34:38 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/xwayland: security bump to version 23.2.4 Message-ID: <20240228134102.AF3E587BA1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2bc7c3e8a92607d02bca0089b3f529cc155dfdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following security issues: 1) CVE-2023-6816 can be triggered by passing an invalid array index to DeviceFocusEvent or ProcXIQueryPointer. 2) CVE-2024-0229 can be triggered if a device has both a button and a key class and zero buttons. 3) CVE-2024-21885 can be triggered if a device with a given ID was removed and a new device with the same ID added both in the same operation. 4) CVE-2024-21886 can be triggered by disabling a master device with disabled slave devices. 5) CVE-2024-0409 can be triggered by enabling SELinux xserver_object_manager and running a client. 6) CVE-2024-0408 can be triggered by enabling SELinux xserver_object_manager and creating a GLX PBuffer. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2024-January/003444.html Signed-off-by: Peter Korsgaard (cherry picked from commit b8d9e75eb89898fac1a8200e78bca084635eefbc) Signed-off-by: Peter Korsgaard --- package/x11r7/xwayland/xwayland.hash | 6 +++--- package/x11r7/xwayland/xwayland.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash index 533ef9de86..5bb26bf17e 100644 --- a/package/x11r7/xwayland/xwayland.hash +++ b/package/x11r7/xwayland/xwayland.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-December/003437.html -sha256 eb9d9aa7232c47412c8835ec15a97c575f03563726c787754ff0c019bd07e302 xwayland-23.2.3.tar.xz -sha512 37198aa2f06313a0cb2add51cc78f81b26a42f2c9d55a0d3eecf958777107ea5560961c128f2d0af055f7460ba10fadb1b9050251c2c50f2251b40ab517e79cd xwayland-23.2.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003443.html +sha256 a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b xwayland-23.2.4.tar.xz +sha512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187 xwayland-23.2.4.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 8f4bcd8117..c66dd471ac 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -XWAYLAND_VERSION = 23.2.3 +XWAYLAND_VERSION = 23.2.4 XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT From peter at korsgaard.com Wed Feb 28 13:37:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:37:19 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/cog: bump to version 0.18.2 Message-ID: <20240228134102.CC40487BA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a46e9e1718f3e8ba764a6233f39bf2338609c93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x This is a small bugfix release, with a fix for a crash in the DRM/KMS module that affects i.MX6 boards and probably others. Release notes: https://wpewebkit.org/release/cog-0.18.2.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit afe633d6beef29b05514e2272414b6db6a727cb8) Signed-off-by: Peter Korsgaard --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 177113bb42..387666969a 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.18.1.tar.xz.sums -md5 204ae9353ed828e4ac39b1dd4c5c35dd cog-0.18.1.tar.xz -sha1 f0f0ebcd279170f427be0ad57fd356faff1a2732 cog-0.18.1.tar.xz -sha256 72e3a84052b459e2d53d0e8b947f20e27bf5d8049766c4c1594eb9c6b6cf7ab3 cog-0.18.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.18.2.tar.xz.sums +md5 7fbfc2e19304132be0d73f5e5512151c cog-0.18.2.tar.xz +sha1 045294f7fa878db86e4b8a617ee4ac056a71cb75 cog-0.18.2.tar.xz +sha256 3c4237cff6323b8c3eaf52c6f3f6415b898a22c0127c6c396c1eaa6eef46c279 cog-0.18.2.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index bd34f124c5..e96909f779 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.18.1 +COG_VERSION = 0.18.2 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 13:38:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:38:54 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/faad2: force arm mode instead of Thumb mode Message-ID: <20240228134102.D9AF187BA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a07d1795ff504441b4df2b390e1b4e79051618b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix the following build failure in Thumb mode: /tmp/ccfzn6FH.s:36: Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/838808b4751244ee01cde6b8261212b49e511a32 Signed-off-by: Fabrice Fontaine [Peter: reword comment slightly] Signed-off-by: Peter Korsgaard (cherry picked from commit a33827760823b1455326e0fc8cf6089a3081e782) Signed-off-by: Peter Korsgaard --- package/faad2/faad2.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index 686e5045c0..0b249b3450 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -12,4 +12,11 @@ FAAD2_CPE_ID_VENDOR = audiocoding FAAD2_CPE_ID_PRODUCT = freeware_advanced_audio_decoder_2 FAAD2_INSTALL_STAGING = YES +# faad2 contains assembly routines using ARM instructions not present in thumb1 mode: +# Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode +# so force ARM mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FAAD2_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -marm" +endif + $(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 28 13:35:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:35:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/xserver_xorg-server: security bump to version 21.1.11 Message-ID: <20240228134102.BE4C587B5A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8667430da27b9c07ab0bb78a96dc0c3957041e64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following security issues: 1) CVE-2023-6816 can be triggered by passing an invalid array index to DeviceFocusEvent or ProcXIQueryPointer. 2) CVE-2024-0229 can be triggered if a device has both a button and a key class and zero buttons. 3) CVE-2024-21885 can be triggered if a device with a given ID was removed and a new device with the same ID added both in the same operation. 4) CVE-2024-21886 can be triggered by disabling a master device with disabled slave devices. 5) CVE-2024-0409 can be triggered by enabling SELinux xserver_object_manager and running a client. 6) CVE-2024-0408 can be triggered by enabling SELinux xserver_object_manager and creating a GLX PBuffer. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2024-January/003444.html Switch to .tar.gz as the announcement mail only contained hashes for that: https://lists.x.org/archives/xorg-announce/2024-January/003442.html Signed-off-by: Peter Korsgaard (cherry picked from commit 219178ef3eed5b3f4a5da0fe4af751e79d77e432) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index de93b11927..be636936e2 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-December/003436.html -sha256 ceb0b3a2efc57ac3ccf388d3dc88b97615068639fb284d469689ae3d105611d0 xorg-server-21.1.10.tar.xz -sha512 8135d9b7c0c71f427ba0a3b80741fee4f6ae195779399b73261a00858882f3516e367a08e2da1403734b04eacabae9aa231e5375eff23b57a3ff764e9caf8926 xorg-server-21.1.10.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003442.html +sha256 1aa0ee1adad0b2db7f291f3823a4ab240c7f4aea710e89f5ef4aa232b6833403 xorg-server-21.1.11.tar.gz +sha512 e41bf71955691e66084a67fc20643632087f0326d5eddc31e6edd118d05005b8ab536738c181f4c352f331ec8fc8f23ae1b45f237592fa5d7eddbffe43638b08 xorg-server-21.1.11.tar.gz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 4ac4283e4b..4a05582583 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,8 +4,8 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.10 -XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz +XSERVER_XORG_SERVER_VERSION = 21.1.11 +XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 13:42:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:42:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/falcosecurity-libs: drop FALCOSECURITY_LIBS_CPE_ID_VENDOR In-Reply-To: <20240126173059.1629666-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 26 Jan 2024 18:30:58 +0100") References: <20240126173059.1629666-1-fontaine.fabrice@gmail.com> Message-ID: <87wmqopuwa.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > FALCOSECURITY_LIBS_CPE_ID_VENDOR is plain wrong since the addition of > the package in commit a15e35c4ebc52f29f65372c8e86cefa874aa4aaf, indeed > falco:falcosecurity-libs is not a valid CPE ID: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:falco:falcosecurity-libs > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From christian at klarinett.li Wed Feb 28 14:50:11 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:50:11 +0100 Subject: [Buildroot] [PATCH 3/3] package/googlefontdirectory: allow generating static fonts In-Reply-To: <20240228145013.411919-1-christian@klarinett.li> References: <20240228145013.411919-1-christian@klarinett.li> Message-ID: <20240228145013.411919-3-christian@klarinett.li> From: Christian Hitz Google's fontdirecty started to include variable fonts. Some components (notably Qt) do not (yet) support these variable fonts. In order to still use these fonts they can be converted to static fonts at build time. This conversion is enabled by setting BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC=y. The static font configuration is then selected by setting BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC_WEIGHTS_WIDTHS. Signed-off-by: Christian Hitz --- package/googlefontdirectory/Config.in | 17 ++++++++++ .../googlefontdirectory.mk | 31 +++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/package/googlefontdirectory/Config.in b/package/googlefontdirectory/Config.in index cf2814d88f..f2d3e18511 100644 --- a/package/googlefontdirectory/Config.in +++ b/package/googlefontdirectory/Config.in @@ -16,4 +16,21 @@ config BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS Font directory code base. For example: ufl/ubuntu, apache/kranky or ofl/gleego. +config BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC + bool "Convert variable fonts to static" + default "false" + help + Convert the selected fonts to static fonts. + +if BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC + +config BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC_WEIGHTS_WIDTHS + string "List of font variants to generate" + default "Regular:400:100 Bold:700:100" + help + Specify a space-separated list of Name:Weight:Width tuples + describing the requested static font variants. + +endif + endif diff --git a/package/googlefontdirectory/googlefontdirectory.mk b/package/googlefontdirectory/googlefontdirectory.mk index b0e5b6e532..71ccdf3fc6 100644 --- a/package/googlefontdirectory/googlefontdirectory.mk +++ b/package/googlefontdirectory/googlefontdirectory.mk @@ -27,6 +27,35 @@ endif GOOGLEFONTDIRECTORY_LICENSE = $(subst $(space),$(comma)$(space),$(GOOGLEFONTDIRECTORY_ALL_LICENSES)) +ifeq ($(BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC),y) +GOOGLEFONTDIRECTORY_DEPENDENCIES += host-python-fonttools +GOOGLEFONTDIRECTORY_FONT_VARIANTS = \ + $(call qstrip,$(BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC_WEIGHTS_WIDTHS)) + +elementFromColonTuple = $(word $2,$(subst :, ,$1)) +define GOOGLEFONTDIRECTORY_BUILD_CMDS + $(foreach f,$(GOOGLEFONTDIRECTORY_FONTS), \ + $(foreach v,$(GOOGLEFONTDIRECTORY_FONT_VARIANTS), \ + $(foreach d,$(wildcard $(@D)/$(f)/*.ttf), \ + $(HOST_DIR)/bin/fonttools varLib.mutator -q --output=$(@D)/temp.ttf $(d) wght=$(call elementFromColonTuple,$v,2) wdth=$(call elementFromColonTuple,$v,3) + $(HOST_DIR)/bin/ttx -q $(@D)/temp.ttf + $(SED) "s/Regular/$(call elementFromColonTuple,$v,1)/g" $(@D)/temp.ttx + $(HOST_DIR)/bin/ttx -q -o $(@D)/$(basename $(notdir $f))-$(call LOWERCASE,$(call elementFromColonTuple,$v,1)).ttf $(@D)/temp.ttx + $(RM) $(@D)/temp.ttf $(@D)/temp.ttx + ) + ) + ) +endef + +define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS + $(foreach d,$(GOOGLEFONTDIRECTORY_FONTS), \ + mkdir -p $(TARGET_DIR)/usr/share/fonts/$(notdir $(d)) + -$(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/share/fonts/$(notdir $(d)) $(@D)/$(basename $(notdir $d))-*.ttf + ) +endef + +else + define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS $(foreach d,$(GOOGLEFONTDIRECTORY_FONTS), \ mkdir -p $(TARGET_DIR)/usr/share/fonts/$(notdir $(d)) @@ -34,4 +63,6 @@ define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS ) endef +endif + $(eval $(generic-package)) -- 2.43.0 From christian at klarinett.li Wed Feb 28 14:50:09 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:50:09 +0100 Subject: [Buildroot] [PATCH 1/3] package/python-fonttools: enable host-package Message-ID: <20240228145013.411919-1-christian@klarinett.li> From: Christian Hitz The fonttools are used to generate static fonts from variable fonts at build time. Signed-off-by: Christian Hitz --- package/python-fonttools/Config.in.host | 6 ++++++ package/python-fonttools/python-fonttools.mk | 1 + 2 files changed, 7 insertions(+) create mode 100644 package/python-fonttools/Config.in.host diff --git a/package/python-fonttools/Config.in.host b/package/python-fonttools/Config.in.host new file mode 100644 index 0000000000..641efb1cfb --- /dev/null +++ b/package/python-fonttools/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_PYTHON_FONTTOOLS + bool "host-python-fonttools" + help + Tools to manipulate font files. + + https://github.com/fonttools/fonttools diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index e2472aa184..682a453ab4 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -14,3 +14,4 @@ PYTHON_FONTTOOLS_DEPENDENCIES = host-python-cython PYTHON_FONTTOOLS_ENV = FONTTOOLS_WITH_CYTHON=1 $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From christian at klarinett.li Wed Feb 28 14:50:10 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:50:10 +0100 Subject: [Buildroot] [PATCH 2/3] package/googlefontdirectory: bump to 2125bc9b447971543caaa132530b828e5e682819 In-Reply-To: <20240228145013.411919-1-christian@klarinett.li> References: <20240228145013.411919-1-christian@klarinett.li> Message-ID: <20240228145013.411919-2-christian@klarinett.li> From: Christian Hitz This is the current version on main branch. Signed-off-by: Christian Hitz --- .../googlefontdirectory.hash | 2551 +++++++++++------ .../googlefontdirectory.mk | 2 +- 2 files changed, 1618 insertions(+), 935 deletions(-) diff --git a/package/googlefontdirectory/googlefontdirectory.hash b/package/googlefontdirectory/googlefontdirectory.hash index 10f3bf60b1..24967b0490 100644 --- a/package/googlefontdirectory/googlefontdirectory.hash +++ b/package/googlefontdirectory/googlefontdirectory.hash @@ -1,994 +1,1677 @@ # Locally calculated -sha256 ec2ddbeee673cce1b0796e3b20fbff5fd836ce9ba6d88deed8b59154fa255f06 googlefontdirectory-94dff3eaa9301b6640cccc63c56d6ff33d82882c.tar.gz +sha256 c911d284cb6ff255f25298123f33aaf96039664dcf3de22e66ca9f2af7019a08 googlefontdirectory-2125bc9b447971543caaa132530b828e5e682819.tar.gz # Locally calculated with -# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt') ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotocondensed/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanscondensed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/walterturncoat/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/fontdinerswanky/LICENSE.txt +# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt' | sort) ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/aclonica/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/sunshiney/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/ultra/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/unkempt/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/slackey/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/satisfy/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensans/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/montez/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kranky/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/arimo/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrew/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/tinos/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrewcondensed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/justanotherhand/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotoslab/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/homemadeapple/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/calligraffitti/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cherrycreamsoda/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/chewy/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/comingsoon/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cousine/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/craftygirls/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/creepstercaps/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/crushed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotomono/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/fontdinerswanky/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/homemadeapple/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/irishgrover/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/justanotherhand/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kosugi/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kosugimaru/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kranky/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/luckiestguy/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/maidenorange/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/roboto/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rochester/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rocksalt/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/creepstercaps/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/nokora/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/montez/LICENSE.txt sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/mountainsofchristmas/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cousine/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/syncopate/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/specialelite/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/luckiestguy/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrewcondensed/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrew/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/permanentmarker/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rancho/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/smokum/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/redressed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/irishgrover/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/comingsoon/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cherrycreamsoda/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotomono/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotoslab/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rochester/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rocksalt/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/satisfy/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/schoolbell/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/slackey/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/smokum/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/specialelite/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/sunshiney/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/syncopate/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/tinos/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/ultra/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/unkempt/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/walterturncoat/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/yellowtail/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/calligraffitti/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/permanentmarker/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/chewy/LICENSE.txt -sha256 0fc8e6675568c02aac6b41dd3cccaf2264fc5969601effe68e09b26635879b2c ofl/ranchers/OFL.txt -sha256 ff72e4d89860e64ee38ccf8a5a7e9dc085d5e36115b096a6c7f8bc988e9bec61 ofl/kumarone/OFL.txt -sha256 643c63caf03855ae29be68035d8888e95eadc767a1d92f163d686da1b0a1cd3c ofl/cantarell/OFL.txt -sha256 1d242ab6fbb2dfbba2e7119b00a6328bc59cb2faf7299b844e9b92a2f12c0d8b ofl/adventpro/OFL.txt -sha256 01af2625d6247ecd2430d1d1603c579f85989d43b2d9129e08e0ac0df8909918 ofl/tienne/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaina/OFL.txt -sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustina/OFL.txt -sha256 69c34ca1873308c667ddde663cbf59c0d1cf14cbb945ad010f71d21264249e24 ofl/aubrey/OFL.txt -sha256 4febcc8d6e539db3e0c652da87bc8704f6d48e71e07f8ddb0974094a3de8da81 ofl/flavors/OFL.txt -sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktavaani/OFL.txt -sha256 ab5499b975c2dc82f533c6f13c5fca589df4d57c7c400db5f6ca8565ad9c2fd3 ofl/butchermancaps/OFL.txt -sha256 6a28d4d5d8b4d1ea89ace5a047ac6e0de182acdb8bfa22897bf7702102094f69 ofl/shadowsintolighttwo/OFL.txt -sha256 7a1d085067cd589026b256dd85af1eaa1087fa0f3d468192724c5138cc14d894 ofl/copse/OFL.txt -sha256 fd17f80dc48ff767d91d0dd9f821eebfd8b73ee82f55537a9052b6b0107622c8 ofl/voces/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowsemicondensed/OFL.txt -sha256 4aa1da66597f4c5cfde67790992ee55926ef6aaa87b9a10d529ab35e8b91070c ofl/asapcondensed/OFL.txt +sha256 f0376d04eb58fb19e9f1690a99a1eb37380ad0246f7d503f2abd8e8a74ed12be ofl/abeezee/OFL.txt +sha256 4f4bc3806a1e55789c6ef75ca5fc628297b05292f74966474dc0d40324abc609 ofl/abel/OFL.txt +sha256 fe9183a0b7c1ae626b14004cd533c89ec7c192aba017f81ab71ede910256abb2 ofl/abhayalibre/OFL.txt +sha256 da0971c73aa1773b791926b81530f3cec50c94031912f162a320263488805ef8 ofl/aboreto/OFL.txt +sha256 aba8997e16b1e3888c6e855ba883c70d96bd4375bff8cb9c7ce0f097200f74b8 ofl/abrilfatface/OFL.txt +sha256 09686a4f466a3e8e277078fa304509fca618670fc6334f7180439ef2d5ebb18f ofl/abyssinicasil/OFL.txt +sha256 e5ccbfc32e4d7fae98b467a9af310ac8d2efd5d90e684426cd24f3eb36090a2c ofl/acme/OFL.txt +sha256 c1bcd16ffc9d095822fd6b7fa1a24c7918b24815ed05711421f804293d2efa62 ofl/actor/OFL.txt +sha256 16a8be6ac4b009ba1dd1e17cea48762f4915609ea5dca1303f716cf63998739d ofl/adamina/OFL.txt +sha256 657961e80b42febe82f70a56a4ffe6bbd1dba06aec6338f002f729e637fdb902 ofl/adlamdisplay/OFL.txt +sha256 794d72ffdd25e8f7ca8e1d68db088c30ddbf2fdb369b6cc8217d4fa5fa6dc62f ofl/adobeblank/OFL.txt +sha256 c8d52b6a6c2a6c46193a48d4e6dc7368896bc7d4c069f33abca0728476957aec ofl/adventpro/OFL.txt +sha256 a65e37f173d58cab5d4f8eb6373f4e24ee79ad6c80235dbe845a117917af2d99 ofl/afacad/OFL.txt +sha256 e338828ef7e0686999d6e041d8b2020a952e537179c4bec70a43cf04000f1202 ofl/agbalumo/OFL.txt +sha256 5a5df9eeb233115038bb9bbe00d37897195864802cb889fe755697ba7736d518 ofl/agdasima/OFL.txt +sha256 520a0c239d39b379b61c4de5f8e3b02db20b0dfc137481843eac01f02c41f4a2 ofl/aguafinascript/OFL.txt +sha256 570f2e9653614183d28503a9fb25ec5d3d31cde064b617e853e71d8dba629085 ofl/akatab/OFL.txt +sha256 ca8b6e93436590a2e4efe58431345c0d5c00a43f1f4412c7cbac650215933ad9 ofl/akayakanadaka/OFL.txt +sha256 c9fe51b84ce71b4e8bd90eee48812942694c46f8b8c89207c0fc5579727d595e ofl/akayatelivigala/OFL.txt +sha256 f15a9a3a9a665c2d17655b8fedad86d9a8f30081d46bb91236beb1bc7294a589 ofl/akronim/OFL.txt +sha256 c39e284759a441660d4c4d852c537e271d0fd5c301fe46d065a972b6ee144ba8 ofl/aksarabaligalang/OFL.txt +sha256 f177d40332e5a3f1b76d1d19821102173f30aab9dc58329db20ed1ab42ac7ec1 ofl/akshar/OFL.txt +sha256 aac8f0cda6159b7251d1034651bcb42e07611495bc8cd764c89d22f3123032f8 ofl/aladin/OFL.txt +sha256 def1327fad7ddbec8a64701518aa5b8b8e3fc657559c4a6ce43a9163c3ceb6bb ofl/alata/OFL.txt +sha256 82d8db016c47218bd20ebd5db171d896d6e42d6edb7dcb59feb54523bf07495d ofl/alatsi/OFL.txt +sha256 5c856c086e8743b84932aae46ced424729a703932b601e9eb8aaeac15a617ec6 ofl/albertsans/OFL.txt +sha256 de985adf63cff6b1bcb7c5cb55f1c5850fb1d36289d20a0e26d97a281bfcf956 ofl/aldrich/OFL.txt +sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alef/OFL.txt +sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreya/OFL.txt +sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasans/OFL.txt +sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasanssc/OFL.txt +sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreyasc/OFL.txt +sha256 f13013bb1f4887b67240ec2ec5754ef968a3753ada1e538b598eae375cf74273 ofl/aleo/OFL.txt +sha256 56372aed19c2701f50e6e784110af55bf8796ed51648805324ad1adb0a3860bb ofl/alexandria/OFL.txt +sha256 0ee34ce7c99b0deb7f7332bca0a4950d3796c23c00de77ada8aa29a4b55ff2c2 ofl/alexbrush/OFL.txt +sha256 e315abc82a78710c7242e2f2e6529651fd631d4d50e6ad98ea194f9b54c3d701 ofl/alfaslabone/OFL.txt +sha256 ef643b6b82fb5c2ce056e27b6bf6908433a785bbb6ee6dc23c4739743f063e54 ofl/alice/OFL.txt +sha256 fb5d6a8310a52ccc2036f1c98db07ece3a9f167d9b3138e13452fefc4c865fd9 ofl/alikeangular/OFL.txt +sha256 9c63835765bcc42b59fab82a211b61a8cea32f2abd7e8bf288d4c84463adace0 ofl/alike/OFL.txt +sha256 ff805fd2cff5f5f7e8890323702f4cd461c179a76bb6016c93031338f49af3d4 ofl/alkalami/OFL.txt +sha256 5985658cc7672eb25b95427a485ce922402908c90d9feaca2a88930cd98e54d9 ofl/alkatra/OFL.txt +sha256 ab721b35816e470fb11619ad3705f75d08dccd0864505e3d782e94fd937f6620 ofl/allan/OFL.txt +sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allerta/OFL.txt +sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allertastencil/OFL.txt +sha256 75db6ecda0911c52cc92b7aca4b7eb33120333e664851ec2b57fc6330f9fd84e ofl/allison/OFL.txt +sha256 c8cb4c94a558b6cb82ac5dc981a73a0b8aee35a5c52c8a7832fc0280c289ad49 ofl/allura/OFL.txt +sha256 142e053c374dd465a92bd7378116b517e344dbc662361308130fc2566db30c2a ofl/almarai/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendradisplay/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendra/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendrasc/OFL.txt +sha256 2b0ed87071361caf613d6362b46d7289037f1001af3b11ab747905692f87025e ofl/alumnisanscollegiateone/OFL.txt +sha256 e7ae596600908a4ba9634d03b8096fe3a5445fe692b3f420d7490512ca0e8521 ofl/alumnisansinlineone/OFL.txt +sha256 08e1c6fa00b198f9cf90fd8c7f540ce400892063234d5a3b38dcae9f659c977f ofl/alumnisans/OFL.txt +sha256 855c8e5b459dfa20361af32b393bab0c18f67f888ee7bd69d54318cbefcaa7fe ofl/alumnisanspinstripe/OFL.txt +sha256 89bf0833b785c49b0f271273ab440bdc20c85bf0322537dc901df940bf1579da ofl/amarante/OFL.txt +sha256 5eca89cdd576df5e4b7c694e0425b126a9ca839aa067df85fab33904a8187076 ofl/amaranth/OFL.txt sha256 301f77908df2b00141b4dcea50cc1a586c3afcee78843bd811088e8263623f9d ofl/amaticsc/OFL.txt -sha256 6b6c6721a30480a323cf33acf6a7703dfce46b846827a65f8ee96230060e3c3e ofl/homenaje/OFL.txt -sha256 393d494f9ebb5db6a3552ffa03a4c6f3746c22808b40d011b391681da55ca3f6 ofl/kellyslab/OFL.txt -sha256 ca19ac21c7656f493189093eca52b4239fcc5eacc15ab2e3d67cfbfc0e6e443b ofl/sirinstencil/OFL.txt -sha256 980c2b058d331f3c5ca4a1223e549511b71630e4f4a5533879d436d583cb5665 ofl/arbutus/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsans/OFL.txt -sha256 7527e73a61f742a0dd050ab2fc7333de71ac7886023c100bca66a0a93b37498e ofl/headlandone/OFL.txt -sha256 39b26527bf9ed27b4c85b86341eceea0579f3550bcf448cf06345eaadf947ec9 ofl/rugeboogie/OFL.txt +sha256 ca424122f42a8d8442bc4cfd902f5f027ea67b5417705f5af1d1235927781720 ofl/amethysta/OFL.txt +sha256 bd8323cd1d2b6bbdfbbf99cb41ec1156d0352ced170de4aa3a96d95e6e20bf5b ofl/amiko/OFL.txt +sha256 72598f78a098644c6b4ac04665e0bad7a69841c0dc504e81a8399d963a23e50d ofl/amiri/OFL.txt +sha256 b73b7b5ef4da8d6f83c93bbcad4d2a8d13be8fb44f3eeb3305b7e6d1f0c5a0c9 ofl/amiriquran/OFL.txt +sha256 0dd8e32457e18621737b593ab0fac49905cd948a078ed0e64f4890df714a1dfb ofl/amita/OFL.txt +sha256 06c79c896894160a5810d869a822fa7d02a0e2ccffd97920b8cf3b880380f6e5 ofl/amstelvaralpha/OFL.txt sha256 2ac164969308ac200eefc516151934701044f0db5695ae2acc15df2a8d22e5cb ofl/anaheim/OFL.txt -sha256 88d3abd47414e7912d0d2eb44ca89e0b1bd7c43cc2ebe58a8a75281ad75a0f60 ofl/stardosstencil/OFL.txt -sha256 01003114b77326df223f291c48cdf12e95f6a5937437f164347919f2bbde12d4 ofl/josefinslab/OFL.txt -sha256 83aa5adca2418f091b732a19cc7c30dcb5c00c217051a58f34f5eecb19be0cd3 ofl/average/OFL.txt -sha256 585c6d2da8bcd8ffa651e0016f2e992a6891b625143a46a1dacf00699a817d9a ofl/monoton/OFL.txt -sha256 96e65d9c227a972e38035b849bba1e8b7879eecbb52f278be1e71dd481187f02 ofl/domine/OFL.txt -sha256 d1bf0acea511ad1f4de53e942cffb8ab0e67c03c6203d6f390d71105d52c33f0 ofl/missfajardose/OFL.txt -sha256 131d19126a0e7ddd25540fd6bee219cebbc8aee7e8374882998ee6c2f4ff6cf4 ofl/mergeone/OFL.txt -sha256 042a570b306ab893c6168be7e6e79bbceae46097141357ad0af7ef8bb179ed7b ofl/goblinone/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexserif/OFL.txt +sha256 34f84fc4cafb1090f253e429fcdd72e9adb059864edd5ba3ba19ff4f0586769e ofl/andadapro/OFL.txt +sha256 43ee152fcd7be0c6eb3468f3012e776cb75bf88f5dec548be0aa4619bf438f9e ofl/andika/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekbangla/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekdevanagari/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekgujarati/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekgurmukhi/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekkannada/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/aneklatin/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekmalayalam/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekodia/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anektamil/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anektelugu/OFL.txt +sha256 ffa0191e03e3d94d2269bcdcdbaa31cd5c7dc6aa189ec531de939ffd2a3a5f09 ofl/angkor/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/annieuseyourtelescope/OFL.txt +sha256 8594350034ab1cb85a1946ef8852e69290255816c311450a66fed6eeda9d6292 ofl/anonymouspro/OFL.txt +sha256 b9ced72fbc4812b7dd2a67fe4df3ecbc0a75a7f43c0ffc4f0873a198d8b8431d ofl/anta/OFL.txt +sha256 60ddc0ee6e443b78940b5f92bcbab76c98ec6965e0da9fbdaf267383ab72bba8 ofl/anticdidone/OFL.txt +sha256 c1f8e0feb0babaacf774b971bcfd791e44125b9d61ff074e4c20924e9661556e ofl/antic/OFL.txt +sha256 22d1914919d3fe08b179dc31169fc743ca7eede7827b91a5d48c23c8cdc7cb81 ofl/anticslab/OFL.txt +sha256 ae9a754b006df720bb6721e7b78c04990df734f87195c6033140fceab60bebf6 ofl/antonio/OFL.txt +sha256 ee67e6ee22790b7929f1a3769ca2801d565c64b5a9096942c1adf5596de9c9e4 ofl/anton/OFL.txt +sha256 cbc57ac0dddda1b70f246a16358fc3c2a32628a23a6d10ef64f746141d3fb159 ofl/anuphan/OFL.txt +sha256 7f0313b042b462fcae1934436cc747f9fd4433e3b08fd6459a4a5104b0bbd5db ofl/anybody/OFL.txt +sha256 c0093b62824cfa8786df613c00a316fa483bdcb7ccd11ba5faca006bb692f68d ofl/aoboshione/OFL.txt +sha256 cf6dd07485d67d20f105afb9981dffdb6b180b59af45a228839cf3fb0277c9fb ofl/arapey/OFL.txt +sha256 980c2b058d331f3c5ca4a1223e549511b71630e4f4a5533879d436d583cb5665 ofl/arbutus/OFL.txt +sha256 1c023b4aca0e441c55c45c86cdff57fa524a96778f291d9a29a4ad777b70e2e3 ofl/arbutusslab/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/architectsdaughter/OFL.txt +sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivoblack/OFL.txt +sha256 b2087ef3fb91248e346600d19021249152a9688efea72905aa1996bb16a4c8de ofl/archivonarrow/OFL.txt +sha256 108b4e57c9c796d3d38d0428ca7ee39de47ad93187302718d9b2d8864b9b716b ofl/archivo/OFL.txt +sha256 c5211cc6a0eb32a23608076d74585942dc4d9a738357cfe40b7dddcee1442f33 ofl/arefruqaaink/OFL.txt +sha256 41ac14451a624c69490e24b9aaaaa1f65dc9dc17c3f6f38172fc43d5ba654a1b ofl/arefruqaa/OFL.txt +sha256 424875d518bd5175f201a74349796121c959f9c095f960b9d57521612a77ec7a ofl/areyouserious/OFL.txt +sha256 aae6749568fe746a578b16cb6ca8ca9a22729b0c738254e17c21b23a61972bd0 ofl/arima/OFL.txt +sha256 a525f5a38671cd1a5e0071968fe39c8a135b4f42d412a92ab9cf970923332430 ofl/arizonia/OFL.txt +sha256 47a0b7e315bc56ca0326fca46302d87d48a61e3528d4196e966b62f5bf0243f2 ofl/armata/OFL.txt +sha256 c1bec22a6baf0cc6365b3f049694559f171a92ffa6eef2ddb26b0950ff6a4693 ofl/aronesans/OFL.txt +sha256 a94cfd8d1f5c33f9a7506def359b907f3313f7008bb57fc893985963cd342f8f ofl/arsenal/OFL.txt +sha256 3cb7c635ce885c1410af5cbe934d1a89b05055635a53a0a5971db5edc77a4ac1 ofl/artifika/OFL.txt +sha256 359671bf16c00cae69cb66d041296b2adc7a4becd73a463cb8c5e101d97c7986 ofl/arvo/OFL.txt +sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/arya/OFL.txt +sha256 a6f4d778db0d2a87c2c6e560f71eb018b4253505b2f23c108724dea5d4d74ed0 ofl/asapcondensed/OFL.txt +sha256 a6f4d778db0d2a87c2c6e560f71eb018b4253505b2f23c108724dea5d4d74ed0 ofl/asap/OFL.txt +sha256 223fa23e8419ee762c662e0faf912dfcf386fa7093ac9ff690e380ce1993ba55 ofl/asar/OFL.txt +sha256 14313e23f0e8f72849f29306b73e878001a77bf3a22fef14352f9800357a3827 ofl/asset/OFL.txt +sha256 7eaf6282cfab122b99ffd62a122fc27b6c3c8f2c65b56ff9b3a25badbc64887d ofl/assistant/OFL.txt +sha256 4e69611ba5017f1fde74c31d342f5c85604814b1b45387b9ab46205996dec38e ofl/astloch/OFL.txt +sha256 ea274e87939d38032b31fb741af75bff9fa3f8d4a8b652265f9e0ce1ad7e9f80 ofl/asul/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/athiti/OFL.txt +sha256 f32d22b3908fcad2c86a74000614ec22e6a7f66ea7e867e616026a27aebdc143 ofl/atkinsonhyperlegible/OFL.txt +sha256 96d82a96abc02fb457ddde0227833dbde9d1d02876c91f0a4e27845ca0d692fa ofl/atomicage/OFL.txt +sha256 071a0917e2aca3f11ebb24ec0a01b85315d3d07787b1e273033708f5faa67fd2 ofl/aubrey/OFL.txt +sha256 4fe01b13ffb41faa8f030d84843a95dab32792dfeeca7c072abbfd3f4d6896ad ofl/audiowide/OFL.txt +sha256 793891edf1f4f4f35b52fcc9706b03f779c7ea18ab8e9e441242d63ef0279488 ofl/autourone/OFL.txt +sha256 b8397dc8f7ede718fda9a553018d3dc2e90db99da53a85cb644204ce4e629844 ofl/average/OFL.txt +sha256 37d5360d8d2433689e78302a93cd88e9add8a2294046476625edada2d4328deb ofl/averagesans/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiagruesalibre/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averialibre/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiasanslibre/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiaseriflibre/OFL.txt +sha256 2a0fd31798d131b38a9fe730a260bc9a1d85452e36cdf79e5fcaf937bf4d9f86 ofl/azeretmono/OFL.txt +sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612mono/OFL.txt +sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612/OFL.txt +sha256 213ab761dccc1d47421dd9b88c38b317f8cb35452655db4cf023886b78b76418 ofl/babylonica/OFL.txt +sha256 9c44c9cf5f348a3069f350ed032a55069532d66fb0d7cf958d09012667a88fbe ofl/bacasimeantique/OFL.txt +sha256 d38acce513eccb51d7ac34ca47be279e1fcfdeca1ed088bdd2d281dc6ca939ee ofl/badscript/OFL.txt +sha256 4f40ab196ccf674056fed8b0e6d4f918eea183a149be8a67bff1239413ebada9 ofl/bagelfatone/OFL.txt +sha256 e3ed3ad6cb257e16dc1789900707c5cd1cdef2d60d155389342604991cf693f9 ofl/bahiana/OFL.txt +sha256 d33d42f346e4c706291b3373b8120bfe5fa74377c6c858b0626e5dc4f5c29245 ofl/bahianita/OFL.txt +sha256 fe5e822667a4b2e083b8fdd7a37546163f26f6481b58742236abffdcfb3e6c71 ofl/baijamjuree/OFL.txt +sha256 f2f87c78860447f0bba5f99a1ff7c7e53cc39ead09bc7f130432e58df66be8ff ofl/bakbakone/OFL.txt +sha256 f916a0e34635667d5b9828401c10d461bb29780beddd45c30c5dc25c037dffbd ofl/ballet/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloo2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloobhai2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloobhaijaan2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloobhaina2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloochettan2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/balooda2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloopaaji2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/balootamma2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/balootammudu2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloothambi2/OFL.txt +sha256 0e82859672e549fd39554e2bfa97b5511e81f4f89394f2e696666d36b5d52144 ofl/balsamiqsans/OFL.txt +sha256 876db27db250a9b9c03fc2ef30a5efe1f37c2ed2686d368c3779583bdf746912 ofl/balthazar/OFL.txt +sha256 630dd5a307c0657b094d324e069b390edf90182fe5003639e06c02a0e5769af7 ofl/bangers/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowcondensed/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlow/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowsemicondensed/OFL.txt +sha256 d90fb3bcba8c59ffd661fe1973eb4d39d9b70da666343bdd584d4b09e12e5204 ofl/barriecito/OFL.txt +sha256 e2f2dc7a667954c16a919acff5351e8ea89813d10f5a7504e1f4668fffbfa14b ofl/barrio/OFL.txt +sha256 9a51726e5f247cb1f07bb8f49c163bc3e9ddee5f367bb5a1871d09b854ed1b7c ofl/basic/OFL.txt +sha256 7cded5db7bf3c281f9364469d5f89a1f836736f61d8bd47693d7fb037b24ab6b ofl/baskervville/OFL.txt +sha256 b7e7aaa1d798762d14374256ee62450bd6585f1ec9490a95368e90a90e425d7d ofl/battambang/OFL.txt sha256 bc80ea18223ea0db2ed73ab5bfd0cd601906a2b7a163183c6c4ea333be309ce4 ofl/baumans/OFL.txt -sha256 5f5dbf452c1657370d9280b50d647212a53c80acae6d78e0b5e8c2b26dc62b09 ofl/puritan/OFL.txt -sha256 90bd333a5cf0ed09264fc3e559d44979373f6c3d983b0f65cc46e952b4eb61f0 ofl/contrailone/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/taviraj/OFL.txt -sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlock/OFL.txt -sha256 75798d56e448ba4d2aec3ef5f3c2d805d9c6fe2ba688cd3d7162b2dd31e9cf48 ofl/textmeone/OFL.txt -sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedansc/OFL.txt -sha256 466aaa3bbd245e4c91c4e82c0828efe9fcfd913f5b020d75f0918516c2540fa8 ofl/spicyrice/OFL.txt -sha256 88ac81fcd30e64f6e6b91b61b159c9b700bb3dd59012b72ec61629abcfc7fba1 ofl/medulaone/OFL.txt -sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redactedscript/OFL.txt -sha256 ce78cc8de3f6edd2738e8c02f2079db7086c9a74314baa5854675f83c33954ff ofl/kenia/OFL.txt -sha256 76af3e9e5d8768b17647813a443fcf5df3eb3ced017ee285796625e714d5ea2c ofl/ruslandisplay/OFL.txt -sha256 6e54fc004ebeb61322ecab1d86334ebf69e7051632d48eca489beee505d70762 ofl/hermeneusone/OFL.txt -sha256 8586a7e75681c7297af4cc0641eb2b29e882c5187fe189a1160eceb4e95d4163 ofl/fenix/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusunicase/OFL.txt -sha256 197c3f48cff4df3d768230e0bbdbc4305d8b8b9041ea6fb5e00872af66adc5ae ofl/novamono/OFL.txt -sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allerta/OFL.txt -sha256 af88d31020bb48a1f78f4384249814d04a44d22feeede2ff4ae79fbb4fcf74da ofl/rammettoone/OFL.txt -sha256 397e83b05703a4240be51e2c3a2be1d0d7693d7a2d8b1ff367c26a2b9afc013e ofl/singleday/OFL.txt +sha256 1fb43cb6d1df2ba95e6757c4abe9037c9736f87127aded80d41e7ba82119f488 ofl/bayon/OFL.txt +sha256 072b20402dd2e98e819b7469e9ffc0f5e3cc42224e3ccd012494a8080198f516 ofl/beaurivage/OFL.txt +sha256 72082f6cb4d04be2ecf7cc7d9e1e7d73787f0af8a5a278a47cade70c16b78341 ofl/bebasneue/OFL.txt +sha256 b2c0e5c91cc2a0e0b9594ceae858c9bf0cf41dca3c1d7d0f3c508d41db6752a9 ofl/belanosima/OFL.txt +sha256 284a5a26e6db9a04259a5690ad57d52c56a4c515ca2ece1943d950f99e709dcd ofl/belgrano/OFL.txt +sha256 2348c4852e6322105d130aa2addbe24c962e330094ad6dfbfd9fbd2281d76b0b ofl/bellefair/OFL.txt +sha256 355326d5707ff94ffe27711c7ae26217b63e93de6d5b3413292174fda5f5f9d8 ofl/belleza/OFL.txt +sha256 92938e2734b9280a9d4428c0fe4421b3e501641f78dafc7438fc19c0fc625c07 ofl/bellota/OFL.txt +sha256 92938e2734b9280a9d4428c0fe4421b3e501641f78dafc7438fc19c0fc625c07 ofl/bellotatext/OFL.txt +sha256 460966d12f306a007930575c3b8bc336fe0c32f880d622af6d3b745a06ca79a4 ofl/benchnine/OFL.txt +sha256 d4a77174d44252b564b086e4003b9e84c7a4f52859ea3b316c1242d813bbc5c4 ofl/benne/OFL.txt +sha256 4a7d2f227b91046ef7a54f8f735668d86e45f4fd4089268de292a6e9de108253 ofl/bentham/OFL.txt +sha256 d941aa56e280b4f204272c4b1add01a8ebc7af3e8e69ba8ba9118aa2a5306dde ofl/berkshireswash/OFL.txt +sha256 e8d81ba3b06080b764626d4385f319344e102ddf2c08bb4209412ac22d695f69 ofl/besley/OFL.txt +sha256 b54f3a872628c8b350ffe6b069078936cc23d9d3d020f886ea5867a000c2e2ce ofl/bethellen/OFL.txt +sha256 578f12281f17e7dd88c9e553240243b29f4240043eef22093d32c043c4ab6dc0 ofl/bevan/OFL.txt +sha256 6b7f8f73609a25ea78c891e34cf37b06f8a676b7ea986e941e43b009110f2a85 ofl/bevietnampro/OFL.txt +sha256 012b1870f81b0d97ca756edd9eea315c7fc22657ac2f1cbdfcb6772fed3e20f3 ofl/bhavuka/OFL.txt +sha256 653b14a843954678d2ebcfbbc211d59edf10ea912a953ae00704230536e702f4 ofl/bhutukaexpandedone/OFL.txt +sha256 0409c6582424508453ce41648067efaacf0c790622918493d8f1d934bc5329a0 ofl/bigelowrules/OFL.txt +sha256 0d5fa0cce86012de872273700eef4fd162459e7c24a6a314911380627391071b ofl/bigshotone/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshouldersdisplay/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshouldersinlinedisplay/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshouldersinlinetext/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshouldersstencildisplay/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshouldersstenciltext/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshoulderstext/OFL.txt +sha256 89ccbb54444cd2fa0ee25cceb2e67d3453d56250a561bd176983b169cdaf47bf ofl/bilbo/OFL.txt +sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilboswashcaps/OFL.txt +sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhymeexpanded/OFL.txt +sha256 b14f883330579c3373e41c7c0acdfde91b2e812edfe1e6c5af91bd32a5fa7d13 ofl/biorhyme/OFL.txt +sha256 8214d2621f5a4113dd0eba60863e3e88916cd639444b519c87f6b6b652543072 ofl/birthstonebounce/OFL.txt +sha256 ae70628cbdffc3f7178e05a6c5ef0f94253e72eaa9c4bf109d50187151d16b12 ofl/birthstone/OFL.txt +sha256 505bb8f3c30f2006b4e02d250fda31ed94b651a35f1124a201ca1c405ce989af ofl/biryani/OFL.txt +sha256 b49fc895c04ec3e9cd31077f2539979da8065e2747037b1bb9c6548787050db4 ofl/bitter/OFL.txt +sha256 e753d7155d53c747d037a445e584c8ecfca6dd79846db610417e282a736b28bc ofl/bizudgothic/OFL.txt +sha256 ef0ed524b3bd012f37015e986809eed6f67905456ebfc1ebd7fcc2765282ee01 ofl/bizudmincho/OFL.txt +sha256 e753d7155d53c747d037a445e584c8ecfca6dd79846db610417e282a736b28bc ofl/bizudpgothic/OFL.txt +sha256 ef0ed524b3bd012f37015e986809eed6f67905456ebfc1ebd7fcc2765282ee01 ofl/bizudpmincho/OFL.txt +sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/blackandwhitepicture/OFL.txt +sha256 a02e8715fcdf3325c474b7209399f50230897bfa828fe4eea2639ced1a1d574b ofl/blackhansans/OFL.txt +sha256 f67ca4a200424868ee8fcd5464d7b35ac1cbf7723f6bfdbd19a8524689fab9a8 ofl/blackopsone/OFL.txt +sha256 94b5d5a52420a96f2b4f427bc6f56133f6ddbdfaffa17fdd29049811fc9fd64c ofl/blakahollow/OFL.txt +sha256 94b5d5a52420a96f2b4f427bc6f56133f6ddbdfaffa17fdd29049811fc9fd64c ofl/blakaink/OFL.txt +sha256 94b5d5a52420a96f2b4f427bc6f56133f6ddbdfaffa17fdd29049811fc9fd64c ofl/blaka/OFL.txt +sha256 1d084d2a6ecdadb969f9dbff4c834a8625e4c4625acd5c64f5e95809e4a3e0c2 ofl/bodonimoda/OFL.txt +sha256 3793a376255d457c0571e009846e92b4fca702756e6f28d43b54e71bff40e380 ofl/bokor/OFL.txt +sha256 38f7dca74a98bbcc13858c9f56e9c7d86e12b4242f2a5ccbecf6e9277c9fd363 ofl/bonanova/OFL.txt +sha256 d13a278247ce39695f5ea6b721103faa668083022c5280b78c6392263e473929 ofl/bonbon/OFL.txt +sha256 c130db0ae064ae91ddfa3f73c766d6998895cf4138f37d85398fc14ff62d555e ofl/bonheurroyale/OFL.txt +sha256 4653c63a4bab99aa50de5190853fa21ea6c0a25d69d49f5a42cd51f0f67665e0 ofl/boogaloo/OFL.txt +sha256 a44737231b1272dda0ff794086a02be2967de9a83db7eeb0265007c9667cbd12 ofl/borel/OFL.txt +sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyone/OFL.txt +sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyonesc/OFL.txt +sha256 005dd8f296dfe349f4da0da2ab29fb730a1be2b16c760197740b133680c85769 ofl/braahone/OFL.txt +sha256 6bb89ebc3087ca384513615bd4faee0a636fde0934718263257a13b7eabf83ea ofl/brawler/OFL.txt +sha256 fbe0442a6b1ce162c95e241df76cab5ef2daf6a5ac84ae1a7a6749f32c051098 ofl/breeserif/OFL.txt +sha256 4b5a7d8f37f5602621c8a8d7358a6a2e71317e6c231c661e15aef0275d3e07ba ofl/bricolagegrotesque/OFL.txt +sha256 0818bff7217e2a147826e6f18f6b4c5094f7415fcc61298883dde2fded9b4411 ofl/brunoace/OFL.txt +sha256 0818bff7217e2a147826e6f18f6b4c5094f7415fcc61298883dde2fded9b4411 ofl/brunoacesc/OFL.txt +sha256 733ac89b598ee093fe094927a8e66a988423a61b745c62233a2b0d6e2a159e58 ofl/brygada1918/OFL.txt +sha256 26daffa24723bb188643085cfc5423f9d78d22a395df4a7928380e430545a201 ofl/bubblegumsans/OFL.txt +sha256 39602407e30d466bf169f46d690aaae4f5f039258e5642f91a80bb132ce6e14a ofl/bubblerone/OFL.txt +sha256 a9ef1db03f660130790beeb3b5d91b68536a44a98ec2db3097d02a1c5f91c599 ofl/buda/OFL.txt +sha256 3bbcf1617d93d3a949a10da78ae91c58be536fb04567ab4b5b9fd207126f1db5 ofl/buenard/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeecolor/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeehairline/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeinline/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungee/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeoutline/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeshade/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeespice/OFL.txt +sha256 a0369b1d5f654110f2fe101db56a02d02806f1e609ab233368bc573ec45050e5 ofl/butcherman/OFL.txt +sha256 d64c91b0306b53fabed08762068eea8b918d654fb0721c288f13cefa4aaf088c ofl/butterflykids/OFL.txt +sha256 a20db45220b6c4dc9776f24c77dc9ec7a98977d8b3c65b03aabe66b2d08e0791 ofl/cabincondensed/OFL.txt +sha256 965bf33673aec648a3b399185639e502b58e52693d004fc03f6bbdf21b1a0094 ofl/cabin/OFL.txt +sha256 f6fc9fbae062e4efc1b0306e27715d43cd64a48b8ffba81c22034b8efee4fce2 ofl/cabinsketch/OFL.txt +sha256 bcb0bda74430ccc281a616a81d0a287fed5a423815b00b222e0b7f603f85b26f ofl/caesardressing/OFL.txt +sha256 c0a8947de199b422d30c16137e4decd5362e3a1d504422880d69c02bd6046dac ofl/cagliostro/OFL.txt +sha256 a4554e1799d42e1405924b61eb0e0722ae1623b1f1f07f995348f96c496362a9 ofl/cairo/OFL.txt +sha256 a4554e1799d42e1405924b61eb0e0722ae1623b1f1f07f995348f96c496362a9 ofl/cairoplay/OFL.txt +sha256 ccdab61d371d8c8683a128a92cd7d498dbdb1d37689f7cb21f1bf6b16658d213 ofl/caladea/OFL.txt +sha256 c25166066fc22ae04c4c5076d67e2c839fa796aa6da4ba8cbc550a16ee2fff87 ofl/calistoga/OFL.txt +sha256 846e8cc6dc69bf685d2db14cfa758ff3d9d771d54c9e0d3b511f0ecb97ac0e8a ofl/cambay/OFL.txt +sha256 5454dc5cf2f46a2005f42f13ee2a998c7d0afd7f556f32fda208c72b266f7adc ofl/cambo/OFL.txt +sha256 f0be7437bbb8b91ad4a4f7a5f3d0020368e494a803d892df03e8886d51f2db3a ofl/candal/OFL.txt +sha256 3d916878ddf8e33ecddd57b8cadfb4c3cf84760cf9c1d66ed3e0654c20403d6e ofl/cantarell/OFL.txt +sha256 f8fbefb5b1004615e6d1e84b1c75e68520d91196f600cb1b07620dd2748eff64 ofl/cantataone/OFL.txt +sha256 867b506cb023eae20c1accde77b2e0abf7d8a9e2620da8dbebac9f7b1117ca0b ofl/cantoraone/OFL.txt +sha256 755d165efdbad1ad4a7840aa1f2484b0111627993e162bdcfb25fb2c277db955 ofl/caprasimo/OFL.txt +sha256 13e862ac3f67130f58bd4bebb61c588d147b5a555b1ac6959570799c4f648cd0 ofl/capriola/OFL.txt +sha256 3acada615ba300875cf2b4fada3873b8fc93ee099682059782ab25a08e29a6b3 ofl/caramel/OFL.txt +sha256 c83b38a64847eb1a4583a044f001c82c52df49e77f0a40edf4d0d2aa9c3ef9f9 ofl/carattere/OFL.txt +sha256 8e28b778b6e1a7ff9ca72f4dee2d53120aa2856dc1bfd0be44307e365b0e45bb ofl/cardo/OFL.txt +sha256 58402f82a7c332a700294988fe7554fbb0a63a8d27ccc1ee3bbc640311990a00 ofl/carlito/OFL.txt +sha256 806cb93632b8091cd36554642a96b2752bab50015da6a2b456d786c1f9aef5a5 ofl/carme/OFL.txt +sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothic/OFL.txt +sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothicsc/OFL.txt +sha256 c4afe82f49c05689c40dd4e262803b29c6e611e7b4efd3a0418f574b2be79d9a ofl/carterone/OFL.txt +sha256 336c6a25afd535f9019824e419f5b507d31360a2fb1c87c6e1a663dc74c3b248 ofl/castoro/OFL.txt +sha256 336c6a25afd535f9019824e419f5b507d31360a2fb1c87c6e1a663dc74c3b248 ofl/castorotitling/OFL.txt +sha256 c88333734ad7cd30540ec6614d12aa829a0395715de30e336d22ddfa3005db42 ofl/catamaran/OFL.txt +sha256 1e5bf8207a40678bc401e2e5456d0db1f2a183b550a30976b48dcdd6a4e4c46c ofl/caudex/OFL.txt +sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveatbrush/OFL.txt +sha256 1f9d81d094273d82f3898a1ee8b598a717d050ecbf5ff7bede105b704880157b ofl/caveat/OFL.txt sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/cedarvillecursive/OFL.txt +sha256 9a33b452a3107542c35fc5fcee80e4d8798c82aca071c2f6f58a0f8dc5ad61fe ofl/cevicheone/OFL.txt +sha256 13831d02389d917d22fcfa6c79f98f8acbf61d230add0e73a4d4dc5f3bfb9e56 ofl/chakrapetch/OFL.txt +sha256 6b12c8d417bb766fa017d1161c7ca050392817a7eecbf3110fc2a8616564b956 ofl/changa/OFL.txt +sha256 67261c7ceb3e627da5c94d6617dac6da29bf36b910bee304a7680ad62e2c8b46 ofl/changaone/OFL.txt +sha256 e98ce988fba1c138f4e7c0c5120809706ab1b24a3c29638ca83ab2ff082e08db ofl/chango/OFL.txt +sha256 0acda775b4dedaf980821f590206a692779ee495170018ee2b9caf1c50fc136a ofl/charissil/OFL.txt +sha256 41423e9e1d0ea79d0e78bd5fe9e0b27f4c23140706f5dfbfe116839c83aae91c ofl/charm/OFL.txt +sha256 23b896f4937eac954a383340c92dfcac1c6e05ec21cc08ec6de47d30ad8496a3 ofl/charmonman/OFL.txt +sha256 8c495ddd455def58a45310376a747bb61bf86e4b071cc527b3618bccd3ef00fa ofl/chauphilomeneone/OFL.txt +sha256 5d3457831b42632d958fe1a14a09706d8acb006486a5ca5b2b419cd61cb22e32 ofl/chelaone/OFL.txt +sha256 ae6de2f6fc00f76cc7eb0d97c1ae5e0b7ec734f20ad7f58cf4c74738dc822d21 ofl/chelseamarket/OFL.txt +sha256 bb8fac04b8535d39fb9851c9d886248d25bc0c82000066c92dd577c3369f512b ofl/chenla/OFL.txt +sha256 09fc82b47c15731fa66cc812d5110e00879c75209ab76d68bb813eff5ccc182d ofl/cherish/OFL.txt +sha256 0e04cbdaa14fc3e98b6ad1c9156b04d952cbdd0d31845766bae4cb543a71bcba ofl/cherrybombone/OFL.txt sha256 d416bc9437e1d7d8aba0613395ee49c95ce72d680672e910c6205b545cfcbad8 ofl/cherryswash/OFL.txt -sha256 513346ac60af1dde9d4a7bcfad3f39909d5697373a8aa1a6ee4376e6d22d3cdf ofl/niramit/OFL.txt +sha256 f27cbf1055db7b9dd80bce5cd12b462f2d9ed7313d84dd8bfef1ddd2b61bdfc5 ofl/chicle/OFL.txt +sha256 f7516c3dde20383922ee27750d432cc2b95b4ba275204d374b7305ef95ed2d14 ofl/chilanka/OFL.txt +sha256 c9b69fa18c372df2b187b49efc57b1ea643b86a938e5af32f6b5a7af1017c891 ofl/chivomono/OFL.txt +sha256 c9b69fa18c372df2b187b49efc57b1ea643b86a938e5af32f6b5a7af1017c891 ofl/chivo/OFL.txt +sha256 55270f3e221dc526d84c2833e512cc0f399bcd2b4b1746f63d532345b23fae56 ofl/chokokutai/OFL.txt +sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/chonburi/OFL.txt +sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzeldecorative/OFL.txt +sha256 f2b3029aba64c378bf0963b62945eee15e564fe4330b934c8f2eb058282b5e83 ofl/cinzel/OFL.txt +sha256 ec1d7de447a90e4b6d8f2b4f95c7f89a70e315fdb41969bc716059e4f2461fa4 ofl/clickerscript/OFL.txt +sha256 4630b4e729101fd951afba1ed560f54d446b2eaaab7e7df07ed2f4955c909b79 ofl/climatecrisis/OFL.txt sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/coda/OFL.txt -sha256 2a7b0a41ef401e4e0e955280b07c0a2698932d56aad3181089bdbbaad5760491 ofl/habibi/OFL.txt -sha256 2d62278530348951887211d79d1dba04acebd6ed3b1c413f6154702efea3ea62 ofl/iceberg/OFL.txt -sha256 a20db45220b6c4dc9776f24c77dc9ec7a98977d8b3c65b03aabe66b2d08e0791 ofl/cabincondensed/OFL.txt -sha256 fc1e501d419d84a8f1a800adae092045002d7141241f498237611dbb8ea763d7 ofl/stintultracondensed/OFL.txt -sha256 9a51726e5f247cb1f07bb8f49c163bc3e9ddee5f367bb5a1871d09b854ed1b7c ofl/basic/OFL.txt -sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomatasc/OFL.txt -sha256 e30f893523e50ebbe07acd783ae29c7d604e6208cae7646d993e8528ce13e35a ofl/federo/OFL.txt -sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/sharetechmono/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiasanslibre/OFL.txt -sha256 5951473ab31533bfe1452bbcece47f237a5546c7e7d45ff1aec0289619623294 ofl/fugazone/OFL.txt -sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltonian/OFL.txt -sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenpro/OFL.txt -sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/yrsa/OFL.txt -sha256 5bbeae56b9db61a9bf85b64d5ed9a74cfcf9ee3e9b005bc2906859ddecd5eaa1 ofl/esteban/OFL.txt -sha256 7b826efb1b74a50b1c1aef0a1ba4530925b993ceadc3016d1d787c68a61649dd ofl/tenorsans/OFL.txt -sha256 28c6d2887c3dfa42488c5418c6c16ead580d33ff0afe60c05159689201f9ec63 ofl/jollylodger/OFL.txt -sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomata/OFL.txt -sha256 8f2e5a9b52cf355023104413827e17dd7126c5a3656492d45eaa1ceb270aa4f1 ofl/yantramanav/OFL.txt -sha256 fe079cdbbad0f6520eb0a8235bce65b21596dd0c4c5a2694b3325cc87313b618 ofl/shortstack/OFL.txt -sha256 018d17b5e04c0a217a21979fa6b6d77bd5a143a5f06ea2ea102e427abd1ebfa2 ofl/tradewinds/OFL.txt -sha256 31c59bcdd538c113ef5c048f56827439facb12b7e5cfd158b04c83727edc453b ofl/salsa/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumpenscript/OFL.txt -sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserifcaption/OFL.txt -sha256 c867d1a613bebc4932cf28c060fefb3bcfba3be56ed498b873c79f4eb786af1d ofl/librebaskerville/OFL.txt -sha256 694282197de3d750a43689dc64a8116cd19578cd516e7b2490c7b5362c064dbe ofl/kameron/OFL.txt -sha256 cb30d3086a8b3ce0b9e3690bf48d6620402b61160bc658076f95180ccd9e9dae ofl/sourcecodepro/OFL.txt -sha256 a40c3a6d0c968d3a10b17a2614606de6f20178deccc2447305f31fb106a57fb0 ofl/fresca/OFL.txt -sha256 5d3457831b42632d958fe1a14a09706d8acb006486a5ca5b2b419cd61cb22e32 ofl/chelaone/OFL.txt -sha256 6b53fb03a50914cc382f4d025ee595c17c43f24ae870f840bc51969d3e316c7e ofl/limelight/OFL.txt +sha256 35dca6122235851d236bd861124f4a893d409eba021cd8c6a292a19df0f4640d ofl/codystar/OFL.txt +sha256 5c289da4a19f054ace8e31a144a6a254601898cd7faf9eaa301141afda0adbbe ofl/coiny/OFL.txt sha256 574430e571a6928624f4bdf044420f7547a26309b7ebf6962296d33294e0a1e0 ofl/combo/OFL.txt -sha256 fd20b82eb12d16ec31a58fc44f7e6c533b14b425b569d83f616a1f7a9a401e75 ofl/gochihand/OFL.txt -sha256 0e74984817cdd51dbfbd8309022aa75f733e80dff0cb1d26ad2157e90446ba97 ofl/enriqueta/OFL.txt -sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserif/OFL.txt -sha256 4e69611ba5017f1fde74c31d342f5c85604814b1b45387b9ab46205996dec38e ofl/astloch/OFL.txt -sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostarfill/OFL.txt -sha256 14b3fbd06078a869cf2ba96e6dacb852d373703c86ca7ad54a4cdd6e20fbab19 ofl/knewave/OFL.txt +sha256 bc85bae0b512b799bbfb2b916e4d0a34cfd963d09778cd783e248b479e67760a ofl/comfortaa/OFL.txt +sha256 8a4fe79803bade3a40c58d2ab69586f20b841f143e4ea60fd2bf7d98b29a8489 ofl/comforterbrush/OFL.txt +sha256 abc9cc1c5d7dc6005ebffb703055380ad7b39a159f690e16233d80f78262f82b ofl/comforter/OFL.txt +sha256 7c38a22e5878e60fe423360553e63dd7be23d29f1f60336034935dbfc96e8320 ofl/comicneue/OFL.txt +sha256 2685ed3cc823fdf9c1f91e59ede79bc8823a1b5e5d654e10072bc6d310277065 ofl/comme/OFL.txt +sha256 4a7d88c77b4bc39ff84f2e058ba8f015636c50ce33588a86d9da97defe519933 ofl/commissioner/OFL.txt +sha256 162a3b5c72cba845280a6f887c11d02984540b924510138c8b1eb473bcdafb6a ofl/concertone/OFL.txt +sha256 2492bb8645caaf622bdc3e880cdc9b069921e7341346d7b193666c866a1935d0 ofl/condiment/OFL.txt +sha256 08a12877eda24767239f26b527bfce0c515efaf623c66da6baad92a6d5315e9a ofl/content/OFL.txt +sha256 90bd333a5cf0ed09264fc3e559d44979373f6c3d983b0f65cc46e952b4eb61f0 ofl/contrailone/OFL.txt +sha256 354b4be0340cd58e381fdf58793a108897bf944a7f8faf9e877c476ed6c730d1 ofl/convergence/OFL.txt +sha256 c832a4230a713d080aa2f2544d9a298ed911f689b2c48f7f276a0196b16d2b8a ofl/cookie/OFL.txt +sha256 7a1d085067cd589026b256dd85af1eaa1087fa0f3d468192724c5138cc14d894 ofl/copse/OFL.txt +sha256 aad1e82802172d4c1d22dd015a5b8b4275e5665a49c1df54ed64716fca7ae194 ofl/corben/OFL.txt +sha256 93c4a947d0c82b6838675aeb6090b7e9e7534b9655b2aeec1874149290a58bbf ofl/corinthia/OFL.txt +sha256 60700d351cac4650c51f3f9db318d2a420f8b45052dba2715eb5fec41f0f6956 ofl/cormorantgaramond/OFL.txt +sha256 60700d351cac4650c51f3f9db318d2a420f8b45052dba2715eb5fec41f0f6956 ofl/cormorantinfant/OFL.txt +sha256 60700d351cac4650c51f3f9db318d2a420f8b45052dba2715eb5fec41f0f6956 ofl/cormorant/OFL.txt +sha256 60700d351cac4650c51f3f9db318d2a420f8b45052dba2715eb5fec41f0f6956 ofl/cormorantsc/OFL.txt +sha256 60700d351cac4650c51f3f9db318d2a420f8b45052dba2715eb5fec41f0f6956 ofl/cormorantunicase/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantupright/OFL.txt +sha256 0836fd874230b17f840efcf7d3bb529f5a7b5befbfeef94478519cfe2d8551c2 ofl/courgette/OFL.txt +sha256 9a755af092b494944c99f471be6fddd19b006a448fefdc4717e4ee0aa09a97b0 ofl/courierprime/OFL.txt +sha256 c972795e48b096b6d4e3a947b0bb21c1baf1922a6e07ff9ada587c058f228740 ofl/coustard/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/coveredbyyourgrace/OFL.txt +sha256 c09e3b81d9cfeec46bc29a3374000e8ad013d694bdf24a288088491dd4cd5c69 ofl/creepster/OFL.txt +sha256 4938e917ac54665be1dd862f54634d991b39c5d1eef69345d66a5089e401bfb4 ofl/creteround/OFL.txt +sha256 1820869bd5baa1c2d88fa87c89eea532cf9442d841008acab720654b7f82823d ofl/crimsonpro/OFL.txt +sha256 50fd67cddc097377a5c871e8452b778bc5aedfa3480a705cb27c5e3a078218df ofl/crimsontext/OFL.txt +sha256 eba176d3ae86af6b41e9b744e4d18fb56e2a6ad671381bddb61fabb86b1d39c1 ofl/croissantone/OFL.txt +sha256 af74fe3bf28777e8b7df9f7ed718b15f92e14d60448f36d7dd21ada6caeca33a ofl/cuprum/OFL.txt +sha256 1a2debd5ad8e656b26bb3b29213caa8f7e557a2f31454b11ebb6c3e3b59aa5d4 ofl/cutefont/OFL.txt +sha256 bc4c7eb365ea342b1a027fb8417fb0152f5d482a2e31c012fbfa29b668827b04 ofl/cutivemono/OFL.txt +sha256 1404cc9279d4ad713a372a5e1e1d20d7b9b000d2397c8529aeb3df5402446600 ofl/cutive/OFL.txt +sha256 58e2ecc7d7147a7c8268553c1bed2354331c2003829396fa6f9506852144e46e ofl/daibannasil/OFL.txt +sha256 a21fa252efb7a1ff84de6a36df4386959668aa046f28161b4047829f7d9cd1b5 ofl/damion/OFL.txt +sha256 6f090277c00af96651ce6dbcc38ff1591047a3bffef486e80b6a32e8276a8201 ofl/dancingscript/OFL.txt +sha256 4a89bc6c8bb9f144683714d67dd3098400f90e194176c31f429fe23a08713ec7 ofl/dangrek/OFL.txt +sha256 60eab011e210601f85e18474c5a191838c95a9acce0cc6da1c646ac9e3683cd9 ofl/darkergrotesque/OFL.txt +sha256 bd898c86fb555f060ee9e5d318d631bbdcd196b98ae8019e0077421f46da132f ofl/darumadropone/OFL.txt +sha256 b67325cbf8ec07e72162e8dc06abcf0599411483a0fc35c55c2908900a4bc585 ofl/davidlibre/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/dawningofanewday/OFL.txt +sha256 cacad5bf45bf5c81f4b6cbd114261bc8a08f6110b66a4c6fad8bbc16618a3096 ofl/daysone/OFL.txt +sha256 64ecb0c6bf5cd80c3da76035c00671272966afbd32ffbdbcad95a8b56501fb08 ofl/decovaralpha/OFL.txt +sha256 f139d6f43d2a63a8fb3ded48b8ec747d9d59a7fbb13d077d9b96ac88580bc1ad ofl/dekko/OFL.txt +sha256 3fa395232efa6d42e5af84de2503875c895b24a9299bb84aa54633c74bf8a0d2 ofl/delicioushandrawn/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/delius/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusswashcaps/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusunicase/OFL.txt +sha256 19e186a088a50835b38b59409a76b8df2d0252ce114a99e79e306231bbe253b7 ofl/dellarespira/OFL.txt +sha256 9224862f76f6ffc1a12abf2ae4310e584cfdd2a475c503f74d1e0c0e8bee5ed0 ofl/denkone/OFL.txt +sha256 bac36a7fcafc5702d9d928bb81c7de9f8739eaa820e546c3d2cc52730b652af4 ofl/devonshire/OFL.txt +sha256 9e53298e3629e00ae4c31531cca09051ddaa654a5de4f7b55e596132fff86e1f ofl/dhurjati/OFL.txt +sha256 00a6fe8dfdc48d6206bcc4f10a765515a73433dfba7255eff966963beb26facb ofl/dhyana/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/didactgothic/OFL.txt +sha256 cdf5fc4014abe91588666a9592ec86200e5a4d743b4b6e05d28d47e850bbe5fa ofl/digitalnumbers/OFL.txt +sha256 9279f4143833810493f74b4520c8b8fce2526d9df2da9564ffe897e065e1d461 ofl/diphylleia/OFL.txt +sha256 f4e8602be4b69bc44e3ce17d026622722b992a07b1aab0db23da48b0155b289e ofl/diplomata/OFL.txt +sha256 f4e8602be4b69bc44e3ce17d026622722b992a07b1aab0db23da48b0155b289e ofl/diplomatasc/OFL.txt +sha256 2bada5ea45c3c63b7f1ea1f88ce9672c9e4f0c42b2c3b7378949084fe55a3066 ofl/dmmono/OFL.txt +sha256 9af36190332437f5ecd09974de43c1f7c77a310a996cdd8ceb25628b458840e1 ofl/dmsans/OFL.txt +sha256 a3e5cdd67d4571dd0a24fcc968de0efde7ae97ef752daf0906e4767619dd7231 ofl/dmserifdisplay/OFL.txt +sha256 a3e5cdd67d4571dd0a24fcc968de0efde7ae97ef752daf0906e4767619dd7231 ofl/dmseriftext/OFL.txt +sha256 de5ff32211a4340b01477af39ee339d639438955e409f79b666d4b9207f3c92c ofl/dohyeon/OFL.txt +sha256 dcc832bd71ea62cbf97f06327a1b5442905b49ea446801421d71f7d1362db215 ofl/dokdo/OFL.txt +sha256 4931b601cf50f9e6ee749ae76778a067fb2e0df4296f08d095ef38afc526a5e4 ofl/domine/OFL.txt +sha256 8aa063e3a1299c5e1821f386f5ca8bc157ac561bd12c739ffa81c6f0821450c0 ofl/donegalone/OFL.txt +sha256 f9e59049e824264bffd626d0901cfcaac9d5ba756988b904d3e3e0e233493607 ofl/dongle/OFL.txt +sha256 4342add6f0f2261f8579f31c10a55938930559703eed18be4a33b74eb749d298 ofl/doppioone/OFL.txt +sha256 92f750829545386017c3418d890769778b76fd01dfb41c62fcbb0d42ba0303eb ofl/dorsa/OFL.txt +sha256 6dfa3951f0c829518b284608fcc1acb196cba1536b1ae1713a49deccde1ccc53 ofl/dosis/OFL.txt +sha256 b6630c61ea078cacd7fabe37d14ffe557a0b45b06683374a9aa9e24262993e33 ofl/dotgothic16/OFL.txt +sha256 3621f156cc7a26e0a9cb413332e0bb35a0e76b36dbfe0b1c885b565a7bf3051e ofl/drsugiyama/OFL.txt +sha256 9df0700fcd0ef48abd74459a8650d35f59397fbaa00c5b00527e57cc155689c0 ofl/durusans/OFL.txt +sha256 ee2c069b30f3e9a5aaf52357117ee3443ee27f17c29a2ec68861db283379905c ofl/dynalight/OFL.txt +sha256 ad0bc2ae83f6dbf6f3edde26752324260c2fbaf9cc021748d363a879dd5b749c ofl/dynapuff/OFL.txt +sha256 3184f6a99f589c78740fbff6ddaaabb43b8cc2f3852da36e60aeb024ea8d6f00 ofl/eaglelake/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/eastseadokdo/OFL.txt +sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eater/OFL.txt +sha256 6f9e3a1c51f617e7b110862426204ec7a56d8c6d2f731373b5de6b8d069099b6 ofl/ebgaramond/OFL.txt +sha256 1b3b78123c94dcbc9fd4ec174317336c8c93423da62dc946b8852553cb13ddee ofl/economica/OFL.txt +sha256 003e3a0675b0b5d38cb6a188039d33a8d747a84effec32e7f8aa6e25cf6d3e2d ofl/eczar/OFL.txt +sha256 9c50bb9d2dbfd864553688da113bf817a294f3721b7a35ac6569c63bb939a998 ofl/edunswactfoundation/OFL.txt +sha256 9c50bb9d2dbfd864553688da113bf817a294f3721b7a35ac6569c63bb939a998 ofl/eduqldbeginner/OFL.txt +sha256 9c50bb9d2dbfd864553688da113bf817a294f3721b7a35ac6569c63bb939a998 ofl/edusabeginner/OFL.txt +sha256 9c50bb9d2dbfd864553688da113bf817a294f3721b7a35ac6569c63bb939a998 ofl/edutasbeginner/OFL.txt +sha256 9c50bb9d2dbfd864553688da113bf817a294f3721b7a35ac6569c63bb939a998 ofl/eduvicwantbeginner/OFL.txt +sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/ekmukta/OFL.txt +sha256 c4955dfe15a5db10326aa58ef767460c42cd12a3acdb3e698eee2704eb373d94 ofl/electrolize/OFL.txt +sha256 b69113722df50071b68ea377ad261919f08fd0dd6672f68b8868445586a30770 ofl/elmessiri/OFL.txt +sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsie/OFL.txt +sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsieswashcaps/OFL.txt +sha256 8f94e5901c371537043e0c762c827ce33963e7bd186fbea0abafc035ef7120a7 ofl/emblemaone/OFL.txt +sha256 0623888cc2391c6c9853c04eafa7f687fef1a8328bbb848feab05d9e2a98764d ofl/emilyscandy/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanscondensed/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesansexpanded/OFL.txt +sha256 b47f4d635e8c592a37e98f751627cad0a81694c56aecc603b33819a908ea9625 ofl/encodesans/OFL.txt +sha256 b47f4d635e8c592a37e98f751627cad0a81694c56aecc603b33819a908ea9625 ofl/encodesanssc/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemicondensed/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemiexpanded/OFL.txt +sha256 ef0bdccd20de76d517fb3939161d05ecd5808382fb8fa82cde5fcdb3adcb8029 ofl/engagement/OFL.txt sha256 a8103c045a88bf9b28dcd7eb60a6662008f49afc0f3721bc46aaf761fc0409e7 ofl/englebert/OFL.txt -sha256 bd22e766af8f8e58eb520cb4fa73538826d04f7371b45e82295d22d1e32a4e58 ofl/gidugu/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/justmeagaindownhere/OFL.txt -sha256 5fba78215eb4e42aed6cb0b5c5df52e0f71246281a866cd4493dfcfcbcab9518 ofl/playball/OFL.txt -sha256 e75230ee246a04912366cd8d759d081200d80fb0756766c96dd52f73e8b40bed ofl/romanesco/OFL.txt +sha256 0e74984817cdd51dbfbd8309022aa75f733e80dff0cb1d26ad2157e90446ba97 ofl/enriqueta/OFL.txt +sha256 6160853a95e0826f3d9dd21d26b7518b86e50a3469f19a62c3f4ce1ab1ed5573 ofl/ephesis/OFL.txt +sha256 95ebd6a2e4035b8398c83928fb85297b48441f27f405398c29b59aae899fc747 ofl/epilogue/OFL.txt +sha256 d484e0dce424a9e360adabb568b6773db5f1566df71ce3e9dcd66a6cc2c38d33 ofl/ericaone/OFL.txt +sha256 5bbeae56b9db61a9bf85b64d5ed9a74cfcf9ee3e9b005bc2906859ddecd5eaa1 ofl/esteban/OFL.txt +sha256 b3a14dd814e7e5158a1869fd89094e213f1ab9abc62e1e1730b751cc93fef3a3 ofl/estonia/OFL.txt +sha256 58bbdbe5c48dd1d7cfd658425a455c29811181873d3a46a4932c29e5b0ec16e6 ofl/euphoriascript/OFL.txt +sha256 9bc1eb1c679510b32d2e3f5f4f3b47726b1657aa121494aa68ba0b124a3c3a53 ofl/ewert/OFL.txt +sha256 cecc43de8bf5449d88fb03a6d33b0b569df304545d3b57760863e833a6434d45 ofl/exo2/OFL.txt +sha256 1159ea72ed1f7e7541cea35a0dece48d2abb0317d7c70f75a482f94932382a77 ofl/exo/OFL.txt +sha256 6cc3a1a3e60a0db4f824c16d42e7db461a939abb0759a740a4135074001eaba5 ofl/expletussans/OFL.txt +sha256 b8ed61f16fe601a8d20fa9c8ea979f4a7424c324596ce3cacdebb19353e1d808 ofl/explora/OFL.txt +sha256 f2c0dfa02d6f5c444b4babd7bc0b43be77ea85706e8524342516bc41e43c2f01 ofl/fahkwang/OFL.txt +sha256 9708dd560d1f8aa1f006461aa447a31fda7b9aff662d152837654a388e0eb2ee ofl/familjengrotesk/OFL.txt +sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/fanwoodtext/OFL.txt +sha256 2f9d46ed4ff595fe040cfcd11d41f80cd6b31b72c8e1b4ac793db50382cd3154 ofl/farro/OFL.txt +sha256 afc1cda4eedcfe27c8cf30fe3e9879587cb43cc2882d4cb91dd3e3fc9eecd0bf ofl/farsan/OFL.txt +sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinateinline/OFL.txt +sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinate/OFL.txt +sha256 4da248dc81a7ea4cf5b23f9cf7a0f8cad900875b3f52a928befb5c51e82e9438 ofl/fasterone/OFL.txt +sha256 896b66a47308af2d268b0d93c59bb4c9e82870f63565b819e84f789c0825d992 ofl/fasthand/OFL.txt +sha256 69ac34f1c6fd163d5d01cea262da6cfa34fee1310283a116a0db8e14116b40d1 ofl/faunaone/OFL.txt +sha256 2d8f6a7be96a15fd2deaa8e6b5320cec6c253216b5a8f7e1becccfc51147b877 ofl/faustina/OFL.txt +sha256 17d7a7f5d9f0139535ecec516988c4c73a2ec0f225987288f3fd6ee2622d4450 ofl/federant/OFL.txt +sha256 e30f893523e50ebbe07acd783ae29c7d604e6208cae7646d993e8528ce13e35a ofl/federo/OFL.txt +sha256 75c7ccf4f537a7a3ebbedd299c1d2542e13d3b27aaf76a0a2d9fa91a2a8fcd3a ofl/felipa/OFL.txt +sha256 8586a7e75681c7297af4cc0641eb2b29e882c5187fe189a1160eceb4e95d4163 ofl/fenix/OFL.txt +sha256 9185cdf29ddad3ff97f5f07094345937c33f01ea232827a9ef9af9d88ae4b6a8 ofl/festive/OFL.txt +sha256 140d37233e7f3ce7313798befa9600893bcceaf41a55fa0fa5ad52f7f657a268 ofl/figtree/OFL.txt +sha256 d336c098ea798bf14de111cd90dff7d6bc340852405246511345d0f8564fe76e ofl/fingerpaint/OFL.txt +sha256 0a55f40011bdfbdd4a07ef363fdc054d92ca3a5f0fc66381aac82344bd9cec2c ofl/finlandica/OFL.txt +sha256 926041dac670e6922505e35ac1661a4e8d20f1ffeabbbcb5edb5544370702369 ofl/firacode/OFL.txt +sha256 d1829ff3455bbf3b9d13dfb0a57758a863107c9108aab48558f26f37f1094180 ofl/firamono/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasanscondensed/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasansextracondensed/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasans/OFL.txt +sha256 047c204476dacfeddbf93d33ab3d43ba82fb7e66e398fdacfce8e815e9a5c270 ofl/fjallaone/OFL.txt +sha256 df9fcd8f62ae79aba7fa5b0563a08dfede1fa0909d668287d70c395d88f5fe02 ofl/fjordone/OFL.txt +sha256 e3ea566dbf689a9110b2094f9f2e5d16d7ec31720147651efc1005ca20420dd4 ofl/flamenco/OFL.txt +sha256 4febcc8d6e539db3e0c652da87bc8704f6d48e71e07f8ddb0974094a3de8da81 ofl/flavors/OFL.txt +sha256 bb3ee29bfc75dc1ac4407831b665c92e9e58fb5e2e07022f6f731d8e063e37f8 ofl/fleurdeleah/OFL.txt +sha256 54665278a85e00842c5a261c2bc51c4735082f0164edcd95da27ed11e253e604 ofl/flowblock/OFL.txt +sha256 54665278a85e00842c5a261c2bc51c4735082f0164edcd95da27ed11e253e604 ofl/flowcircular/OFL.txt +sha256 54665278a85e00842c5a261c2bc51c4735082f0164edcd95da27ed11e253e604 ofl/flowrounded/OFL.txt +sha256 b0daefd86530f48f6f57e90770276e42e63b3daadc9cdcf0cfd4cb16a7499946 ofl/foldit/OFL.txt +sha256 382232d1add5623ba5b06394afa071f4eeecccb6d2b2bd02cfecff4a8a45065a ofl/fondamento/OFL.txt +sha256 1bfe7d2aca99042eabf37079152fef8abdda2c36dad454ae89b858a3cb1078c5 ofl/forum/OFL.txt +sha256 ef14426248ca0404eae1ae65e61802b1627b5ec33aab117fb36edf401a81636e ofl/fragmentmono/OFL.txt +sha256 09685e225ba9b697b2ccd2d4098cac5ecbed0679960605258a271af60749887b ofl/francoisone/OFL.txt +sha256 59b8e1b6cb49d339b729a924fb3c2d892e5729a712f7540e2337d0db3bdfcca4 ofl/frankruhllibre/OFL.txt +sha256 bdf4c22802eaf804f998195871c6b8938aac2ac14b2d78a8bd66a6f1eced833b ofl/fraunces/OFL.txt +sha256 60fea3a0da19167a3efb9c3792a3a15dc9235405d01bbec1233fdf3e79c74296 ofl/freckleface/OFL.txt +sha256 f8e2b58dd7a8c8e21e5d744b45876bce7e010a647c071c1ed42ff0e618d4ea59 ofl/frederickathegreat/OFL.txt +sha256 5c9e7eee5c6b25f4b05b8d53b2e470ea4962f9ced742d044a98f7d95d1375bab ofl/fredoka/OFL.txt +sha256 eb42d30e111024646a167f47f3e85c5c2df21ceb36a3a279a6f19e2584b00ec8 ofl/freehand/OFL.txt +sha256 a40c3a6d0c968d3a10b17a2614606de6f20178deccc2447305f31fb106a57fb0 ofl/fresca/OFL.txt +sha256 c2368518f12463a93cfed44e1460f36085dc60df06f415ee9b0319809987ccce ofl/frijole/OFL.txt +sha256 c0cd6d3807663a19c2d4a96f17b90a71a06e78bb329d45ad77c6798c89f761d9 ofl/fruktur/OFL.txt +sha256 5951473ab31533bfe1452bbcece47f237a5546c7e7d45ff1aec0289619623294 ofl/fugazone/OFL.txt +sha256 22e37052104e101981fa0ea905457948f4f01bd31c7fde0502ff25c586801fa1 ofl/fuggles/OFL.txt +sha256 373164fa83991434f3fcfb9ef3cd0d8d4ffc44407841c08d9d6a43c07ffab978 ofl/fuzzybubbles/OFL.txt +sha256 21506cc7106bbfd4aa1c40371f33f9f4296182a8e4bb46658e99af24feb4bfca ofl/gabarito/OFL.txt +sha256 c5478a76bd760eed7b741678b71d9dfe1062e7399739a3b6da8ebe00d19715d1 ofl/gabriela/OFL.txt +sha256 53a9ce47085d9fef613c7ecb3730dc80d25962510bbea231b89564f58240f251 ofl/gaegu/OFL.txt +sha256 eb6c70cb6b575ad22df022d454df7a20582915e6e8da19b579c6cbef37a26bb5 ofl/gafata/OFL.txt +sha256 4e9a7cb5e08ca48e87b31184036b705690828000e1b5e8777f9ec01dce84aba6 ofl/gajrajone/OFL.txt +sha256 6a809aeba8af2115ca4b4c3597b1fbeb836a45f0489070f330f9c2dff870da8d ofl/galada/OFL.txt +sha256 d102f22055cfa31a9659228483de3c726010f0b3b416b78e3cbefcb54816e812 ofl/galdeano/OFL.txt +sha256 117fa195cff980e3b10fd8e8e21658c6ec954b0886647970a03c9694d3553b69 ofl/galindo/OFL.txt sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/gamjaflower/OFL.txt -sha256 244ca4ef7b106d8c660e9a00cecf5d581b6a222f447d7d59a8f61711b2ad3400 ofl/uncialantiqua/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/didactgothic/OFL.txt +sha256 4d95bf0e5a54632046323a75fb31f8e2af4071119482c02978746ddcd3866248 ofl/gantari/OFL.txt +sha256 a13e353470a9abc44e015067bc353fd3ebc3ea010dea68a00d56f961ebe8f7a9 ofl/gasoekone/OFL.txt +sha256 b2cc52a7162f0c8f71924211d040de37b19894f563a0190a75c017e2dc28d08a ofl/gayathri/OFL.txt +sha256 af98a2aec12e0ff6aeee941693221ddbfdb86ae4486949e1d54cbedf2422f994 ofl/gelasio/OFL.txt +sha256 9f1dccdd6211e2bbb679318dba3717d9eb1e3edc6fcab54beed05679d83a72b5 ofl/gemunulibre/OFL.txt +sha256 c29a3fd5e7962b626fcbcf6713d47ae4656fded06335b607d14f03a4a25cb82b ofl/genos/OFL.txt +sha256 c309a440be606e283ccacc746662d714b9c5b5a7a0a10dd2514b90206b55ddfe ofl/gentiumbookplus/OFL.txt +sha256 c309a440be606e283ccacc746662d714b9c5b5a7a0a10dd2514b90206b55ddfe ofl/gentiumplus/OFL.txt +sha256 778186245840aea0e60bec6a46e7fb1442e0cd78e41afeadffcd3e8824b379e0 ofl/geologica/OFL.txt +sha256 cd059851dc2abcd2865ae318e8b949736f958794210acb90316530fd100fc904 ofl/geo/OFL.txt +sha256 e913854957b9c1aca0c81b29fca565827185ddee0f5a039319e0e45e1b7b3079 ofl/georama/OFL.txt +sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostarfill/OFL.txt +sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostar/OFL.txt +sha256 b7574cd4c76770e5e3915d16bd93f09663bd77cb041a4ec09d824c52b540529a ofl/germaniaone/OFL.txt +sha256 9e19c0d2e7e7adcbe9dfd0749e34dda41e7e356e0f2cc082d61d2fc9b6e0cef7 ofl/gfsdidot/OFL.txt +sha256 bfc205682f5454b42a732ec857b665293ab8bc6f0ee901a0967219ba7ffdb190 ofl/gfsneohellenic/OFL.txt +sha256 c72eaa495a68969eb124218d20d3a6092e8f23ac1d25b9315d1014c5438f43e1 ofl/gideonroman/OFL.txt +sha256 bd22e766af8f8e58eb520cb4fa73538826d04f7371b45e82295d22d1e32a4e58 ofl/gidugu/OFL.txt +sha256 e8d94225bdcfecfb5a6e14bc0e2bb26fe48670f28ac46a7d676d9a90d8bfbe24 ofl/gildadisplay/OFL.txt +sha256 5a8469d3fe72117eb9b630747cfd9f50a31d81b7d18c112cfc9fb368509fe739 ofl/girassol/OFL.txt sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/giveyouglory/OFL.txt +sha256 2950994bcfb8e903f0539d28a8ec4af077e0aa1fa7946c33c912d2d6969c2971 ofl/glassantiqua/OFL.txt sha256 638774cdf8233b5ddaf9ebee1821e9de1d5d59c335d8ee3ba0b47fb17833b502 ofl/glegoo/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsan/OFL.txt -sha256 a10a07aaa150c147fa3cb22e845013f38e6c2b45fe5ba32a74ed1be9d4c417ae ofl/odormeanchey/OFL.txt -sha256 a74380bba78a364ec70b3a5fb6a1161b83cb05cc3e75a0910afbd1b5aff4f9c8 ofl/jaldi/OFL.txt -sha256 9b8405bf5f503f92401fc990f372b34d469670ab60041d5298d1015d3d0b45f8 ofl/thabit/OFL.txt -sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asap/OFL.txt -sha256 ca9fe3a0e10bbb082f83ecdc07f5f04845c4bd689c46456da3e6bae23e11aae2 ofl/inder/OFL.txt -sha256 5b158abb3406e69b7408b562b7199f6ff55a41ea56e260b87176d693b0095e47 ofl/piedra/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendradisplay/OFL.txt -sha256 87b7d831a81fe8b37e7e6c672937493f710ff81883eee3adec7b5423297efd16 ofl/sharetech/OFL.txt -sha256 4ec46c3e4469afa19f0156bac6917472974f9c85c189f9220cf8735d3e810401 ofl/kristi/OFL.txt -sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilbo/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindcolombo/OFL.txt -sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothicsc/OFL.txt -sha256 930fed5b06a415736dc3b4e5f4f01585523b672717564bf677f93966bcd57636 ofl/lustria/OFL.txt -sha256 9a536e5a3b55c2605b0a553eed383cd3efa42ba48dc45cc6f0635b3c53ee791e ofl/warnes/OFL.txt -sha256 879ec56fcc9a961937fd24d542b3b7b3f2b8cb3236b7351e62d16719e25de14c ofl/griffy/OFL.txt -sha256 29cca754098468057880970c604e55c4e2bcb8479742e4130c94f2ddc0363f9c ofl/sixcaps/OFL.txt -sha256 67261c7ceb3e627da5c94d6617dac6da29bf36b910bee304a7680ad62e2c8b46 ofl/changaone/OFL.txt -sha256 327bac41d89cf9f32e0efe353228018e1661cff458a5d4905714958514df7bd5 ofl/lalezar/OFL.txt -sha256 525411e604e7a1d85a4cd42641869f94388f04a6ed77829d6c4edd7fd740ceab ofl/ramaraja/OFL.txt -sha256 3d08baba63f1f2427fd96dee8da30b1ef6c1421b3be0e1f07cc2a78abb27c91d ofl/seaweedscript/OFL.txt +sha256 321e28d45a430e017d9d1d6a47ef1fd261aad354723b014cf1933a765036c311 ofl/gloock/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/gloriahallelujah/OFL.txt +sha256 9a1f7cf2f267af05d4816ea6340087454ea1d237bd9f29a76ef3932ec4055da7 ofl/glory/OFL.txt +sha256 9bf9f51b4e1279bc28c6cf78b4d3d0a07b254435a79e6597ad244defa6df1882 ofl/gluten/OFL.txt +sha256 042a570b306ab893c6168be7e6e79bbceae46097141357ad0af7ef8bb179ed7b ofl/goblinone/OFL.txt +sha256 fd20b82eb12d16ec31a58fc44f7e6c533b14b425b569d83f616a1f7a9a401e75 ofl/gochihand/OFL.txt +sha256 bb7828b16438c97ca84b53e2fbd2c3bd9dcf2a86ccda6806ec9ae955a1814d29 ofl/goldman/OFL.txt +sha256 ff532f9e8789f09a9fdffc3c0954eedfb0a48be77b2e2eb90f5f82e4f347f50c ofl/golostext/OFL.txt +sha256 860cbfdc9dbc3f0e8d35af80c31e8f20945bff393d4f483dfc157469e01d321c ofl/gorditas/OFL.txt +sha256 ed95c33f80ccca002e3a360b683c43368f9c5eb024e5b992abb51af3c10b59bc ofl/gothica1/OFL.txt +sha256 159eb46ed0b08f8b9678d6f22f54cc614452d4ab0fb670b568f7a5f315afe511 ofl/gotu/OFL.txt +sha256 58bdc69f4c6177125c6e7cdbc78f710f5f9952f11bba7bd5b17bd7ef169d731f ofl/goudybookletter1911/OFL.txt +sha256 49a57cc769fa9affd6eefb9070a61e3d3f6b757c97cafb15848bc6d1c81acc78 ofl/gowunbatang/OFL.txt +sha256 a7c73f9521cd646bbdfb6684c99a62311bbd7bce11898dc11ef0b3c69eda1aca ofl/gowundodum/OFL.txt +sha256 742a6a4386db47a2987c7c3b4aeedfb5adedfb3356c118de450a664735686535 ofl/graduate/OFL.txt sha256 4c0a1150a363b42bd8681ff4a00315ac49510a944c4c9978237ff8b90a8920a5 ofl/grandhotel/OFL.txt -sha256 bc4c7eb365ea342b1a027fb8417fb0152f5d482a2e31c012fbfa29b668827b04 ofl/cutivemono/OFL.txt -sha256 1818771d183d203703c4b134f028527b535810e2a0666c8fe2785354ddbef686 ofl/battambang/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendra/OFL.txt -sha256 9e0d3db586ba0abf5ca398683809dacdf4c81b2960f592bd085fbf206a67ddb0 ofl/sansitaone/OFL.txt -sha256 fb1dbf3725bbdd389b2c569e0eed5091d8d10eed2833ec7efacfc3542e408615 ofl/scheherazade/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorant/OFL.txt -sha256 156ea6985861158c7dea63ecaac4c78ab0ed737d168ddffc3e34c687985a033b ofl/sansation/OFL.txt -sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/blackandwhitepicture/OFL.txt -sha256 5fe7f3c9410c29534ddd9dfaf64d3994ed4236096d0d543ae69eacc3b25632b1 ofl/bitter/OFL.txt -sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreya/OFL.txt -sha256 e88691a5e0a8a3f788f31db959701ec90a1d5e7505f1cc53c5663180a7d23c81 ofl/lohitbengali/OFL.txt -sha256 ac55580be2df22a06d29a47501e2ae11e1d399620f5a779e17a66f016ba6d5ff ofl/portersansblock/OFL.txt -sha256 27d9af34210253e7ca1251fbace86c6f65b40031d6ce1a75493a1b2093631298 ofl/vt323/OFL.txt -sha256 9452ef55386e77bd284ca466587d72802337621d7f10aa700e449753883b3397 ofl/trocchi/OFL.txt -sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/stylish/OFL.txt +sha256 4d0bb797c98a0840faec0952153a4030442f263fcf08b906e38837ea8f401808 ofl/grandifloraone/OFL.txt +sha256 c98642ce049ee94f1868c47db44dbdc69e1800e2cf3edb539f030ac4abc22ceb ofl/grandstander/OFL.txt +sha256 5818012656b5ba904c83dad6a0011bd25071d840231f83d69ba34eebd5e510e7 ofl/grapenuts/OFL.txt +sha256 9860b97028024085855e503e32c1971bfd603374641cd018c136433ebcf5a338 ofl/gravitasone/OFL.txt +sha256 54d54b13619520d57d399e3d4057563a5a4c54b69d8f7d1598aedb1aaeaab240 ofl/greatvibes/OFL.txt +sha256 350eba96ff4c979070566cd24d068784c482a65d1485dc14e3ccb56f06594972 ofl/grechenfuemen/OFL.txt +sha256 bca29af2c3c9e142d11f523f414902ab8fb9ab8ffa3c34c63b6b72aa4e7d6acc ofl/grenzegotisch/OFL.txt +sha256 5070d4334d60972881020a5453b9832a090843e904cf013f40b6ebdfe9b871ca ofl/grenze/OFL.txt +sha256 1bd29b2ddae760a1f7014c59fedefb0b110f91110d25080615bcdadad83dbb87 ofl/greyqo/OFL.txt +sha256 879ec56fcc9a961937fd24d542b3b7b3f2b8cb3236b7351e62d16719e25de14c ofl/griffy/OFL.txt +sha256 513de41f10e2a9e374fc23ac57dd0bcea4070ad7aaeaeec2e16656e025a2e19a ofl/gruppo/OFL.txt +sha256 315a576cbc7ab61c9e347b5725893bc8498fdcb8fc10831793c6864bc2cefba8 ofl/gudea/OFL.txt +sha256 391ac3126dacc95b92a8f3408467879edb3245344bc411530a30d5aada52df92 ofl/gugi/OFL.txt +sha256 42d665be2bd66ea6445e0a37cb6f80eb4ac10d56cd0503efa0c6d6d6ebe86de2 ofl/gulzar/OFL.txt +sha256 d11742efedc994c84a152639a76098e3de6c097d77c06e3c4155b8ac00ae9328 ofl/gupter/OFL.txt +sha256 2bd35914efa381c80f9fb62d6ea7d736d3c0739196a3783c3122593c3408392c ofl/gurajada/OFL.txt +sha256 469761758d333ff4ab9f69759dbb8576d23077097862654c2e4d1fc6f19d090d ofl/gwendolyn/OFL.txt +sha256 2a7b0a41ef401e4e0e955280b07c0a2698932d56aad3181089bdbbaad5760491 ofl/habibi/OFL.txt +sha256 8d3c434650e84f42ddb33e9b5929089ea51c39b231b798dacb33087d5f05d9f1 ofl/hachimarupop/OFL.txt +sha256 ddadb10d28a303e3ef3b1f7ec55d3027903b9ec566d2f87d3ee03f3c87c91711 ofl/hahmlet/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/halant/OFL.txt +sha256 b43e2530c7af69fe1800f180d210b6d2745915ed4e0e404495038c861bb6dbf7 ofl/hammersmithone/OFL.txt +sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanaleifill/OFL.txt +sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanalei/OFL.txt +sha256 934a45d3b43276e1f857301e9cb07e00b829cca3d0c13e8e6f8c6790dd6c8a2c ofl/handjet/OFL.txt +sha256 5f1f5510eff7922864bf326ffa1d4a62f01add5193e9367b542378e5a808b500 ofl/handlee/OFL.txt +sha256 e02ccb89a86839b22feff7872ff5cc355cc0f58318d29eee20e2cf83a612f16d ofl/hankengrotesk/OFL.txt +sha256 d724dea493d89a7a9681186e2fb462b7cd551674960ee4142ae6b325261b5115 ofl/hanna/OFL.txt +sha256 de2246895f0ac21fe05b095d586d36cbc9f987ebcaed1e050c61e69667caf1c6 ofl/hannari/OFL.txt +sha256 5d7825ce858a13f5ce7a5149479be33700de83925ae6f610c7e31fced67f05ce ofl/hanuman/OFL.txt +sha256 bff4e5087ece354afccd073621197bbb7dd9349943b5ee6aa12b1adf0b133081 ofl/happymonkey/OFL.txt +sha256 dac9251efc01f872318d95e90988bb9995b1c31a9f6bc70c9831b104703191d9 ofl/harmattan/OFL.txt +sha256 7527e73a61f742a0dd050ab2fc7333de71ac7886023c100bca66a0a93b37498e ofl/headlandone/OFL.txt +sha256 2a603f9fb5d68c3a67b3ab5d79e685fbc0c0585a9a478e5b89b2edab135cc1f6 ofl/hedvigletterssans/OFL.txt +sha256 2a603f9fb5d68c3a67b3ab5d79e685fbc0c0585a9a478e5b89b2edab135cc1f6 ofl/hedviglettersserif/OFL.txt +sha256 866747cbccae229433e946b90fcfc457b81c33ac89e593855770851354f9e6c3 ofl/heebo/OFL.txt +sha256 2d83a49d05906b5e23285168e72c0d019fc15e3ad110376f640feeeda34c27d1 ofl/hennypenny/OFL.txt +sha256 66f19a3655694659983eab355b8833b54e17d34f653d5ae5b86cb90c0550a4de ofl/heptaslab/OFL.txt +sha256 6e54fc004ebeb61322ecab1d86334ebf69e7051632d48eca489beee505d70762 ofl/hermeneusone/OFL.txt +sha256 50265d2b41f8ad2dd350532d2286509aa694021b4aa0490b06f0068e4ed78c27 ofl/herrvonmuellerhoff/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/himelody/OFL.txt +sha256 3e9b0ddf2dd1ed6ada1bc29977601095102505d11dae646df1f6b1d59572f4ba ofl/hinamincho/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindcolombo/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindguntur/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindjalandhar/OFL.txt sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindkochi/OFL.txt -sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivoblack/OFL.txt -sha256 c832a4230a713d080aa2f2544d9a298ed911f689b2c48f7f276a0196b16d2b8a ofl/cookie/OFL.txt -sha256 ae28423a5e63cb65e651ccf62c9091b322fff1d2d4e87ad9f98b1096c2e7abb5 ofl/metrophobic/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmadurai/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmysuru/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/hind/OFL.txt sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindsiliguri/OFL.txt -sha256 8c22fb3866eaebd77a2cb8e8ecbb095381ff32300db57758326fef35a26132f5 ofl/ranga/OFL.txt -sha256 d2875ded3e44e9ae53ea2b35e825dafffa19e82c5d14addb9f1150fcd7a3463d ofl/mina/OFL.txt -sha256 8242e7737bce317f7a7f2b887ac87f5bb21305ab96bee92aadc3febac16c35bf ofl/voltaire/OFL.txt -sha256 fca01a37b10879d7685c7d03fc5a04086b15cdb2cb4f870cb687aa5a9a0a1361 ofl/jimnightshade/OFL.txt -sha256 2492bb8645caaf622bdc3e880cdc9b069921e7341346d7b193666c866a1935d0 ofl/condiment/OFL.txt -sha256 e6ac721b16f309c89fb443680afda427ea34968bad190a80edf281d01d65fa99 ofl/andadasc/OFL.txt -sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzeldecorative/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/coveredbyyourgrace/OFL.txt sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindvadodara/OFL.txt -sha256 5c36e7ec460b285185ea23847aa1f508708d9ce15d5c055279defd022972f836 ofl/rakkas/OFL.txt -sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhyme/OFL.txt -sha256 c54957d55e7c9e66c28e474cd39de75dc044e8f69056788cae44eb78841ceef1 ofl/montserratsubrayada/OFL.txt -sha256 fccf4916b5f84ef5f88d93fec464421aaf4121d11d4be8d74ee2d032f7661d6c ofl/padauk/OFL.txt -sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/prociono/OFL.txt -sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsie/OFL.txt -sha256 0d5fa0cce86012de872273700eef4fd162459e7c24a6a314911380627391071b ofl/bigshotone/OFL.txt -sha256 ca64dee162bf239c7b92d854d388bcd30552edc3ae1ef5e31714acda34c988db ofl/jomhuria/OFL.txt -sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbookbasic/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeehairline/OFL.txt -sha256 9c56b4e2e4e922cc37e19e1a9e2e1128beaa17a812e1b67c8ac371b0fb57ae03 ofl/kopubbatang/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/tillana/OFL.txt +sha256 ac987f9cbc5b18d3239d88adb57a4e134049811d24ddda2f6383faa589fd2727 ofl/holtwoodonesc/OFL.txt +sha256 6b6c6721a30480a323cf33acf6a7703dfce46b846827a65f8ee96230060e3c3e ofl/homenaje/OFL.txt +sha256 0bc7e93bd50c78f58e981cab4d452566f70a425815b7a3a7331f8d9c85ff0e26 ofl/honk/OFL.txt +sha256 0f3199eac4dcfc512e37593730841da3da6a937ac633c3f0f61d13355d3744d3 ofl/hubballi/OFL.txt +sha256 064358800fe0bce38e0f0c75f748649b702b221dba298bd9de2e6b4026df45b8 ofl/hurricane/OFL.txt +sha256 a642565cd75e9535acc67679fdc6a8a99115fb437b764e86b4d82b03d8b17945 ofl/ibarrarealnova/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexmono/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsansarabic/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsanscondensed/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsansdevanagari/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsanshebrew/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsansjp/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsanskr/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsans/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsansthailooped/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsansthai/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexserif/OFL.txt +sha256 2d62278530348951887211d79d1dba04acebd6ed3b1c413f6154702efea3ea62 ofl/iceberg/OFL.txt +sha256 518962c41d4a5e96b0016bd8d8acc965413ea1a0102467e4955931e702b14a0d ofl/iceland/OFL.txt +sha256 6bedaf6a91cc0f23c61b1be288107e7aab97913447575c6f59f395e4e04b4588 ofl/imbue/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepica/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepicasc/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpica/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpicasc/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglish/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglishsc/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanon/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanonsc/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimer/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimersc/OFL.txt +sha256 42b758018a3f0fa429f9aaf7cafaa273ce922ea7dfba30f50cc828b8aa3e1717 ofl/imperialscript/OFL.txt +sha256 6afcd25837be87e7c564f594d20ee009b4bfa540c4eb2d274992e2b1483fa3c9 ofl/imprima/OFL.txt +sha256 0690e0819628a20c5ee68388a7bae621e5c3e53be57276169decd00111d8f2cf ofl/inclusivesans/OFL.txt +sha256 29bd0cfd0fb2a45f9b057c834a057724bae1f63b525a8ac83d3e7525706d9f80 ofl/inconsolata/OFL.txt +sha256 ca9fe3a0e10bbb082f83ecdc07f5f04845c4bd689c46456da3e6bae23e11aae2 ofl/inder/OFL.txt +sha256 d9cdb075679d15a99bab2a8541b9c4fdc71347502111fbe9affd1d462219d96b ofl/indieflower/OFL.txt +sha256 8cf345e9566428f6171371bbd5bcc7f8ebe443712b9349267dc59391b7d4aeb1 ofl/ingriddarling/OFL.txt +sha256 3169e7e0e87168908218f11d660a52c0b81b5952fd73918a596e70721d68d3e5 ofl/inika/OFL.txt +sha256 16f8621a8dda01f044b8a58489334dbaadfad44ef2fa1d5ce0864cc2f309df01 ofl/inknutantiqua/OFL.txt +sha256 2609587542b75aef638a6bcf9bb1d528595fa093f1a8b905e85f9dd77b6f3487 ofl/inriasans/OFL.txt +sha256 17ce133cf770fd000edafa607ae2a41dc6ce5a4f30fe82f777fa242929e76714 ofl/inriaserif/OFL.txt +sha256 ce7d437b6ae0e923abd1947c7a5f4d2171f60d932ec525a37c5daaa521e59683 ofl/inspiration/OFL.txt +sha256 9e27a72ed30eb49a08678f6a5d6ed98ec7ba5368f541637ee0683ec9134ef966 ofl/instrumentsans/OFL.txt +sha256 129ed7618959716959f2941fdd5b49e0ad6e6c1d78726761786a00253d865521 ofl/instrumentserif/OFL.txt +sha256 5b9321a4298cfeb6b34354164a1c3afc3db114569984c502b9b35d988fd58c57 ofl/inter/OFL.txt +sha256 50240ab035cf1b6b3307940235481d515c4b6de3ab1fa843dbe59e7892cb9d58 ofl/intertight/OFL.txt +sha256 e8697c6fe444e393a33ff5b9f929483db7a782b404f82453589782500298a22c ofl/islandmoments/OFL.txt +sha256 1e511bb01d29562932157365418c02d954d8faeef794bcd54729177fb2b03db0 ofl/istokweb/OFL.txt sha256 486c4d5b9baf0d0ba5546ef3c43fcfe22c062299ab6948045a43efffe4b0f74b ofl/italiana/OFL.txt -sha256 4539710406c656519f8ddc789056a7cd6f4fe66b44cc2f52ebca6e251bb26e13 ofl/imprima/OFL.txt -sha256 7f55affd2bce8ed9be13297ba8df1a4a7e9835c2a006126dc2a1eb4ce75a7943 ofl/muli/OFL.txt -sha256 867b506cb023eae20c1accde77b2e0abf7d8a9e2620da8dbebac9f7b1117ca0b ofl/cantoraone/OFL.txt -sha256 aa72b0185d828cb2fafa62a154e84bd3e20c88ada30326089bb20542b6363aaa ofl/manuale/OFL.txt -sha256 4664e83780a263c53dbab95d3590a5a9db914aeb9a3c78f7e7ad451f9151c998 ofl/spacemono/OFL.txt -sha256 fc59ca3cd3bcb47bd4df597519111ec130c25cabcc57a8808dd2d243cdcec6ae ofl/oldenburg/OFL.txt -sha256 43c372f43d145c22e654781860506a75cb85b086dc76028a62a28a446506d253 ofl/italianno/OFL.txt -sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinateinline/OFL.txt -sha256 d13a278247ce39695f5ea6b721103faa668083022c5280b78c6392263e473929 ofl/bonbon/OFL.txt -sha256 f0be7437bbb8b91ad4a4f7a5f3d0020368e494a803d892df03e8886d51f2db3a ofl/candal/OFL.txt -sha256 a68d8ec6bea7f277053ae93bf563d4b97c233f09f8e79f86ffe5db66f31fdddf ofl/prozalibre/OFL.txt -sha256 b00c646b7d04a6da1665a148815b8c589c1e05ed7e1febf7ccbd91758747cb03 ofl/quattrocentosans/OFL.txt -sha256 a3deaae17ab9a15dc3c2778126aa6f80d41d567741853f84b16a9e1318ed799a ofl/koulen/OFL.txt -sha256 50f7b09af5ff677f611a96cdf5eb916307c59b29f2e8144942718cb432a9bf6f ofl/margarine/OFL.txt -sha256 72a22b6dd29b6b0cdcc98de30701b46532c9f7314ee095df3063d10775dd70c3 ofl/trochut/OFL.txt -sha256 325e890b8b26fe0a683c3ba24c506d902bdd7034d9c47bd7fa2bb72b5433b9c9 ofl/shrikhand/OFL.txt -sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlocksc/OFL.txt -sha256 d941aa56e280b4f204272c4b1add01a8ebc7af3e8e69ba8ba9118aa2a5306dde ofl/berkshireswash/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantsc/OFL.txt -sha256 36c285c5472c625901d4a13da7e31c5ea6126678d31d56cf95572c49f27c8950 ofl/passionone/OFL.txt -sha256 fbc351e1b5428e4f45834647dc23a5f8aaa3e744e2f4117ca03c44f640b9a3a2 ofl/stintultraexpanded/OFL.txt -sha256 021d5f1df697848da51620394659187be77cbe382ff2f896bc84ffb89c0c2d52 ofl/portlligatsans/OFL.txt -sha256 85b700bfba1250a6f8bdf930cd7113faf3d8e9dc52cd89eb98c3ac8a038a4aa9 ofl/londrinasketch/OFL.txt -sha256 c972795e48b096b6d4e3a947b0bb21c1baf1922a6e07ff9ada587c058f228740 ofl/coustard/OFL.txt -sha256 eb4a7a082fb0e7dde0a8f975d33f02907ccbe40751c8115e790cf3679787d01c ofl/strait/OFL.txt -sha256 9b1cfccef4a7e19f90e2901f808f3aec4335d3cc81f978453ad0c8ded14447a0 ofl/novascript/OFL.txt -sha256 43c89012c2b640187aae7e0c83d5ffa8381a0368c00e8426594358d44d3811e3 ofl/nunitosans/OFL.txt -sha256 fdecdad755f4e5e95bee491c7521f31625dc08283562ea8579543c90430eb269 ofl/karlatamilinclined/OFL.txt -sha256 5e80642a11aff2ead815949a8a929aff3fb7b9b6a24391406068a1b204dcc8ba ofl/abeezee/OFL.txt -sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbasic/OFL.txt -sha256 f2fcbde4b8968400d661e7dcc23052b1885815c8e3b45323b26cbb833352f5de ofl/timmana/OFL.txt -sha256 c8af073a60e30b55ef5d0e4f80cea168e06dd65bdee7ec18c1ea8de8f7228780 ofl/strong/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeinline/OFL.txt -sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostar/OFL.txt -sha256 e55c615ed00ce0054bd356041a41e5942b4a8cadceac1e32696ba2ef5f06f748 ofl/andika/OFL.txt -sha256 4705fc9bceb299b2a951d23c321d31f3679871bb99ceadb978907704d211f4f2 ofl/pacifico/OFL.txt +sha256 bce79721f0203586872bbd7016922baf449980bdd1c44550a821112a3b547185 ofl/italianno/OFL.txt +sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/itim/OFL.txt sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancois/OFL.txt -sha256 99d67fff016522688b8f913377f8ae9f6da6ffeae42cf67c0e5e87cfb0928d33 ofl/unna/OFL.txt -sha256 bba4a13f03d0fd5b476cc148feda6895dd8d65f34b2107ba9d010ad9539d6c0a ofl/faunaone/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangang/OFL.txt -sha256 58bbdbe5c48dd1d7cfd658425a455c29811181873d3a46a4932c29e5b0ec16e6 ofl/euphoriascript/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/laila/OFL.txt -sha256 17b90cece30db64934b7299fd76b033a3774c8a990e78badc74c59a5be8e0727 ofl/cairo/OFL.txt -sha256 5f8ff4a3f951c104e99245bdb952be08c73369222048bbf19fa3bf7170d10949 ofl/sanchez/OFL.txt -sha256 8eb1c1019fe7fe6d0b6e7d7bbbba1d9cbdd969d8c5f26455708f6cfb8a77284c ofl/nanummyeongjo/OFL.txt -sha256 942d51cf079299e83e9dd7a9a37eb92260524e8d1d576b2f0b3f7ca207c53f8e ofl/newrocker/OFL.txt -sha256 117fa195cff980e3b10fd8e8e21658c6ec954b0886647970a03c9694d3553b69 ofl/galindo/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/athiti/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/annieuseyourtelescope/OFL.txt -sha256 f2ab7e5c5c750fa03a8d8f64c72a089ed86fbd3dc172440fcc704b27816d5957 ofl/noticiatext/OFL.txt -sha256 9a33b452a3107542c35fc5fcee80e4d8798c82aca071c2f6f58a0f8dc5ad61fe ofl/cevicheone/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootammudu/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasansextracondensed/OFL.txt -sha256 746b384383888d9325ed2fa9c40d2456b458aa190dd2b8c515ed4f02a1075bb7 ofl/magra/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasanscondensed/OFL.txt -sha256 fe9183a0b7c1ae626b14004cd533c89ec7c192aba017f81ab71ede910256abb2 ofl/abhayalibre/OFL.txt -sha256 876db27db250a9b9c03fc2ef30a5efe1f37c2ed2686d368c3779583bdf746912 ofl/balthazar/OFL.txt -sha256 4342add6f0f2261f8579f31c10a55938930559703eed18be4a33b74eb749d298 ofl/doppioone/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusswashcaps/OFL.txt -sha256 16a8be6ac4b009ba1dd1e17cea48762f4915609ea5dca1303f716cf63998739d ofl/adamina/OFL.txt -sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redacted/OFL.txt -sha256 866669fde730bf2785f44905ec162f05f2b8d9f6dcf366aca99360fedbfe502c ofl/dancingscript/OFL.txt -sha256 008445a4d53fbd71bff9cf733bdfd841a1b15fb58ef3473f7bab4c456e3b2930 ofl/ovo/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendrasc/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimersc/OFL.txt -sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivo/OFL.txt -sha256 3747fdcbfe4f51d6a2f101c35105bacde3715b3c32b34b6b03e5fb37983f89fc ofl/quando/OFL.txt -sha256 38a83f1f8b6efc3ab354b8b6eed22e8524dc71280844dc24811d95ae27b34952 ofl/khyay/OFL.txt -sha256 b8fb5cd1bafb52e652c733fdb75ee20c763e97acb0398f6b4bbe1d8ada0c07e5 ofl/misssaintdelafield/OFL.txt -sha256 a3b0977c5c25101d45054cf9199b9127b05fddc79d4da7dcf400821824e5a6d0 ofl/radley/OFL.txt -sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserratalternates/OFL.txt -sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asapvfbeta/OFL.txt -sha256 d3909465d5838d9d1c72b975ff1ed4f410a85dccd43801be525bf2b2bde89f92 ofl/snippet/OFL.txt -sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/mukta/OFL.txt -sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickavedisplay/OFL.txt -sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedan/OFL.txt -sha256 4281c00ab5b8f672fc8d686f48cb886ffbe900c8c9ee22473ca7e72e7cef8fbe ofl/wellfleet/OFL.txt -sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabinvfbeta/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangdon/OFL.txt -sha256 399b33eb38cdfc76b8665defa5f81d52e8193d630ad5858c893db6bc20031bc9 ofl/rye/OFL.txt -sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltoniantattoo/OFL.txt -sha256 8594350034ab1cb85a1946ef8852e69290255816c311450a66fed6eeda9d6292 ofl/anonymouspro/OFL.txt -sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzel/OFL.txt -sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillsjaffna/OFL.txt -sha256 64a73da7af818283168543e24bd214aded1bfec06f013bf9cebc20064a8560c5 ofl/elmessiri/OFL.txt -sha256 4fece81b541808b40293b0cd3f5b1990274e1100e1c20455dc2987cd96639d3f ofl/metamorphous/OFL.txt -sha256 8d325681662a30f58f57c92ab656dcbc9679deb78a493e4c0eab75321b2df6c3 ofl/worksans/OFL.txt sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancoisshadow/OFL.txt -sha256 aac8f0cda6159b7251d1034651bcb42e07611495bc8cd764c89d22f3123032f8 ofl/aladin/OFL.txt -sha256 81d0973236b5b5709a80a217a330db36eabedf57bf4031de46b4660b69901234 ofl/leaguescript/OFL.txt -sha256 5454dc5cf2f46a2005f42f13ee2a998c7d0afd7f556f32fda208c72b266f7adc ofl/cambo/OFL.txt -sha256 b2d4b0c773afce947728ab99fca43b242b7edb0da26fe29f60c7c2d5094ec23e ofl/suwannaphum/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/labelleaurore/OFL.txt +sha256 a74380bba78a364ec70b3a5fb6a1161b83cb05cc3e75a0910afbd1b5aff4f9c8 ofl/jaldi/OFL.txt +sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejugothic/OFL.txt +sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejuhallasan/OFL.txt sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejumyeongjo/OFL.txt -sha256 cbdf9d35f32a9a2f02fb23c8b89c115a5a8e45feaaa2266920c4594c83dd5ed4 ofl/tenaliramakrishna/OFL.txt -sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivovfbeta/OFL.txt -sha256 967d75b89eef1f8a0ba1f5ee7dfb13427621f9116c6e7878ca04da8c9aa8641b ofl/mrssheppards/OFL.txt -sha256 8af83da84dd4299842f871285a88049352ab301ffa1f233d2595b29506158635 ofl/blackopsone/OFL.txt -sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquin/OFL.txt +sha256 b2fe5e8987594e9ffd1d2ca52a2f5d73eb8335243893c5d6254b5ad69269591d ofl/jetbrainsmono/OFL.txt +sha256 fca01a37b10879d7685c7d03fc5a04086b15cdb2cb4f870cb687aa5a9a0a1361 ofl/jimnightshade/OFL.txt +sha256 1a7bee2a10dc98def83076f719360f7db6a7760e0f5401046877a415ffc1abfa ofl/joan/OFL.txt sha256 c4cd9f38c3246ee6a68c264f017320dc1af09677d386166d8cda806d9a12e0d2 ofl/jockeyone/OFL.txt -sha256 a36ab46c8b1a74a480a1c51d6a5af08b643e870c6d247f233bc97c97c8ad2098 ofl/tuffy/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/nothingyoucoulddo/OFL.txt -sha256 b5c776129b160163c84620b35fd45dea45edf49789cda5a94c2290c230581e0b ofl/scopeone/OFL.txt -sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/sintony/OFL.txt -sha256 8928e999ff156e35852ab41d7a906598a8285acd3bcd81dff67213a6cd98d43e ofl/mallanna/OFL.txt -sha256 473c5e3123102434d05c66a9fc8b19cf285a3bf71cd8a91a41acef44d1448e62 ofl/sevillana/OFL.txt -sha256 22d1914919d3fe08b179dc31169fc743ca7eede7827b91a5d48c23c8cdc7cb81 ofl/anticslab/OFL.txt -sha256 026610186158060ad351fb20cd1452def5d35b2531634c090ce8cd1d9e9aeaf2 ofl/michroma/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/shadowsintolight/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/architectsdaughter/OFL.txt -sha256 61056041809e0ba18bf8b9d637a375ab1c725025428533d74d668d88b2cb8b89 ofl/simonetta/OFL.txt -sha256 0a852a06f0256a6684662663ccb1d8e08d131abd1f70cf8d972a344cf31aa381 ofl/scada/OFL.txt -sha256 f46c3ea04f38ea73c0731d73dfba3d7361d4b38970feb31a3558bd1b75e0656a ofl/lobstertwo/OFL.txt -sha256 f30a7045e4e21201182b2b9fc4e4b96189aaeaceb2c8e9b68d8bd3dc4e3c5a27 ofl/greatvibes/OFL.txt -sha256 9bc1eb1c679510b32d2e3f5f4f3b47726b1657aa121494aa68ba0b124a3c3a53 ofl/ewert/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39/OFL.txt -sha256 359671bf16c00cae69cb66d041296b2adc7a4becd73a463cb8c5e101d97c7986 ofl/arvo/OFL.txt -sha256 c09e3b81d9cfeec46bc29a3374000e8ad013d694bdf24a288088491dd4cd5c69 ofl/creepster/OFL.txt -sha256 29bd0cfd0fb2a45f9b057c834a057724bae1f63b525a8ac83d3e7525706d9f80 ofl/inconsolata/OFL.txt -sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siamreap/OFL.txt -sha256 223fa23e8419ee762c662e0faf912dfcf386fa7093ac9ff690e380ce1993ba55 ofl/asar/OFL.txt -sha256 a0369b1d5f654110f2fe101db56a02d02806f1e609ab233368bc573ec45050e5 ofl/butcherman/OFL.txt -sha256 4f8b437578b20bff261adfe6c02f63bcf7dbb6a45ab37804b3547e5d5f44927b ofl/nosifercaps/OFL.txt -sha256 793891edf1f4f4f35b52fcc9706b03f779c7ea18ab8e9e441242d63ef0279488 ofl/autourone/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangangcondensed/OFL.txt -sha256 1c023b4aca0e441c55c45c86cdff57fa524a96778f291d9a29a4ad777b70e2e3 ofl/arbutusslab/OFL.txt -sha256 de61c87e08286ad3215398340e9403125ab03c91b33bdf29de6d3e8a386d2d28 ofl/dangrek/OFL.txt -sha256 53ad6a474f68ddfc3fe72449de3ede4d3f033b2f24b77833b1d56edf505486d2 ofl/sura/OFL.txt -sha256 247edbf968c0a5b8defd6a9e420080a8bbca6ea002bfb326d12a472a6f95637b ofl/cuprum/OFL.txt -sha256 0623888cc2391c6c9853c04eafa7f687fef1a8328bbb848feab05d9e2a98764d ofl/emilyscandy/OFL.txt -sha256 1c43e70c49ef7a9b35fcb3758fec8ec5969ff1274c4834b4466b9014f3b9f55f ofl/volkhov/OFL.txt -sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karlatamilupright/OFL.txt -sha256 cd354a6084383c50398fae709ebe3a5dd98b947c486c1fe9de5f89caf81f980c ofl/snowburstone/OFL.txt -sha256 8a59454b7f1cc0b1fa29805781769047e5c269aa629e3422c2d7fc04b89e5c1f ofl/rosarivo/OFL.txt -sha256 de71817dafdecfee21268b8c4f106146e1d00988c4fd6546b10445eb26b24cc0 ofl/expletussans/OFL.txt -sha256 d1829ff3455bbf3b9d13dfb0a57758a863107c9108aab48558f26f37f1094180 ofl/firamono/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rajdhani/OFL.txt -sha256 26e4c39c4905bd7f1068b0bab008f5a4a9b945e2d7fda31e52719fc5aa9655bf ofl/vibur/OFL.txt -sha256 49f2a11271968a2ce019a43bf5401d1593652a18f27ea59037ff5e39856d2df7 ofl/changa/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/maitree/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsanscaption/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmadurai/OFL.txt -sha256 f354ef1e7256644b320c5e1d9a07a819c2e2b930166003c96680894f9fba81be ofl/mrssaintdelafield/OFL.txt -sha256 5c289da4a19f054ace8e31a144a6a254601898cd7faf9eaa301141afda0adbbe ofl/coiny/OFL.txt -sha256 0886960207bb5bcf81a46ce663bab6c52a742dad80ee2cff5cbcda6f1df88568 ofl/rhodiumlibre/OFL.txt -sha256 8f94e5901c371537043e0c762c827ce33963e7bd186fbea0abafc035ef7120a7 ofl/emblemaone/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/gloriahallelujah/OFL.txt -sha256 24af1fb3ab8dfeddc83162b7f3b6c1104149b6c3022f1aa948ef4f8ff7e6bf7c ofl/poetsenone/OFL.txt -sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyone/OFL.txt -sha256 70f664de65e7bb62e1ac728f20a9bb28de7fdc18be594186137a9e15ce9dcee5 ofl/niconne/OFL.txt -sha256 e604b133509815768e6ec4738bb04844ce9a23e80099d2b61e5d75ef46acbeb0 ofl/ruluko/OFL.txt -sha256 42ad5a49e171bec80308a1c9e8e66b03e638b3ea65af7fafa6fc0e42f45e7626 ofl/suravaram/OFL.txt -sha256 4fe81901e6f84cfce1145c715e931352a9a12aa7ac75cc193eb523c0cb0e5eb5 ofl/lohitdevanagari/OFL.txt -sha256 2937c7789b0e4fdeda6eafe93164a2ab36e20386704c4cb6f87b1deb620ec0da ofl/leckerlione/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexmono/OFL.txt -sha256 fce9f9e2fb268507a89fceea0b3eccc044f39fc3492968a04fd9e04df5ae95fa ofl/sourcesanspro/OFL.txt -sha256 e12a3e737fa75c0ee072d965b6185710f35e38a4f7a0793ebc66ba14a216109b ofl/meiescript/OFL.txt -sha256 d2f9c74aba2716333b0a3d283083f9fdc93b2e060c5ae094c79e97e8cba9d7e6 ofl/squadaone/OFL.txt -sha256 5d6517d497bea6116ed35079b30374043f6d90b19c8d97fc4e5ec48520d1e08b ofl/zcoolkuaile/OFL.txt -sha256 f8a20490ee8ad3adb2205ea44b279b19099a3a1d6b62849e90b4db20a77deeb8 ofl/brunoace/OFL.txt -sha256 75b2a5f39a53b4cf9286eb3d2cc1f895a8f3442680013c77124121bc347a6448 ofl/lemonada/OFL.txt -sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellus/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128text/OFL.txt -sha256 eba176d3ae86af6b41e9b744e4d18fb56e2a6ad671381bddb61fabb86b1d39c1 ofl/croissantone/OFL.txt -sha256 12404fcefccc3cb964cb2406510ba679b30f7d7ae689db08df5b455ae24b3feb ofl/paytoneone/OFL.txt -sha256 e2a176ce310235bf281f1124454e21331390ae1b4c429a2d80ae642d333a5a7f ofl/frankruhllibre/OFL.txt -sha256 2d83a49d05906b5e23285168e72c0d019fc15e3ad110376f640feeeda34c27d1 ofl/hennypenny/OFL.txt -sha256 d7d8074c2dd46804990c184e25849947ab76c5ac7607fbf3966543455769bb73 ofl/yeonsung/OFL.txt -sha256 13831d02389d917d22fcfa6c79f98f8acbf61d230add0e73a4d4dc5f3bfb9e56 ofl/chakrapetch/OFL.txt -sha256 c39e284759a441660d4c4d852c537e271d0fd5c301fe46d065a972b6ee144ba8 ofl/aksarabaligalang/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmysuru/OFL.txt -sha256 0da6a3e5b24a9fa04085c20a2a1d3101eeb1e0bff56a2291f407187e1b2adcf2 ofl/mrdafoe/OFL.txt -sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612/OFL.txt -sha256 e2f2dc7a667954c16a919acff5351e8ea89813d10f5a7504e1f4668fffbfa14b ofl/barrio/OFL.txt -sha256 8c495ddd455def58a45310376a747bb61bf86e4b071cc527b3618bccd3ef00fa ofl/chauphilomeneone/OFL.txt -sha256 b687f920fe20fe48d8f7709421e5deeb4becea295c80ce62aadcffc54132fa1b ofl/stalinone/OFL.txt -sha256 a90a8ebe28f3c2905a44557166010a3d219ffcce1703c3c3280ea8728d5e2ebd ofl/heebo/OFL.txt -sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alefhebrew/OFL.txt -sha256 2cd51b11e821dad2fb7acc54d68bd9a139fc7a1207e17c432ba9ce49bba3d493 ofl/fasterone/OFL.txt -sha256 ca424122f42a8d8442bc4cfd902f5f027ea67b5417705f5af1d1235927781720 ofl/amethysta/OFL.txt -sha256 bb8fac04b8535d39fb9851c9d886248d25bc0c82000066c92dd577c3369f512b ofl/chenla/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/lovedbytheking/OFL.txt -sha256 53a9ce47085d9fef613c7ecb3730dc80d25962510bbea231b89564f58240f251 ofl/gaegu/OFL.txt -sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/share/OFL.txt -sha256 9465823369fbe1ae0b5a3065021d53ef8c56e113e664229455dc80b237fa6a07 ofl/nobile/OFL.txt -sha256 0dd8e32457e18621737b593ab0fac49905cd948a078ed0e64f4890df714a1dfb ofl/amita/OFL.txt -sha256 791936b10381b512512317572fb5eee91bf503344d52c37335e402fc1cf19992 ofl/reemkufi/OFL.txt -sha256 898a9cf80636e86d6b6009b96795fda29e431ee701c28c36f274a7e8a7d8246b ofl/rubik/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloothambi/OFL.txt -sha256 382232d1add5623ba5b06394afa071f4eeecccb6d2b2bd02cfecff4a8a45065a ofl/fondamento/OFL.txt -sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsieswashcaps/OFL.txt -sha256 d849309d514833fe3d7a610e10f6cd5d99b4f9552bfa304969acbf89c66e4422 ofl/smythe/OFL.txt -sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkorn/OFL.txt +sha256 28c6d2887c3dfa42488c5418c6c16ead580d33ff0afe60c05159689201f9ec63 ofl/jollylodger/OFL.txt +sha256 ca64dee162bf239c7b92d854d388bcd30552edc3ae1ef5e31714acda34c988db ofl/jomhuria/OFL.txt +sha256 49b9214f7b40024abec2fc89a32bdda380f2174ba7005d7636e6ea340157c5a6 ofl/jomolhari/OFL.txt +sha256 aee5a4081e8a52f80428b30f178b719d115f18dad3e1fa15a986163e1078a85b ofl/josefinsans/OFL.txt +sha256 40be94683ce097454926ce71af843ceebf8a5eb01dc196f58063d65951cc5dae ofl/josefinslab/OFL.txt +sha256 1af3438a4d5f0ed2bdbc5751a5a67ebf6d537334161184b7fbb68503ef0ea0c5 ofl/jost/OFL.txt +sha256 9ec5fb9facd0c46e43b4d6a309c4bc7aa6c8423c898ed9543b3c9c4133b9e01e ofl/jotione/OFL.txt +sha256 44a7c6e4c5572392ae122d3b1d8c6ba6fd640a7797e675384585d947f2773e3c ofl/jua/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/judson/OFL.txt +sha256 6b7242e4ff02ed5bc24ddd655bc1fec1ab7cd4a86335ffef1d197561264cd0e7 ofl/julee/OFL.txt +sha256 955655cafa13f187f45a79dcf451942fd1118a8426abc5a25ffc5dbb00709da6 ofl/juliussansone/OFL.txt sha256 a1077580b649c7b0e05ea0e9369d48687b4ab1c585573bf86b0dcce7dde177c0 ofl/junge/OFL.txt -sha256 a9b40759b5821a0c2ad07cbd2c2a61dca4b3e222e6370a7d5bfb6b373bf4fb10 ofl/sunflower/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindguntur/OFL.txt -sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsans/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/dawningofanewday/OFL.txt -sha256 f27cbf1055db7b9dd80bce5cd12b462f2d9ed7313d84dd8bfef1ddd2b61bdfc5 ofl/chicle/OFL.txt -sha256 aba8997e16b1e3888c6e855ba883c70d96bd4375bff8cb9c7ce0f097200f74b8 ofl/abrilfatface/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasans/OFL.txt -sha256 d484e0dce424a9e360adabb568b6773db5f1566df71ce3e9dcd66a6cc2c38d33 ofl/ericaone/OFL.txt -sha256 1b3b78123c94dcbc9fd4ec174317336c8c93423da62dc946b8852553cb13ddee ofl/economica/OFL.txt -sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/kanit/OFL.txt -sha256 a6a74417db7c37f69495da556a3eb86a22a784ffb0131e3e0a5a47ce8d7fa5fb ofl/shanti/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepicasc/OFL.txt -sha256 963f283b5410c7df62067a35cd7def0802c583a880e7cd7e326832ec3985ec87 ofl/spectral/OFL.txt -sha256 11bdf9c7abd81f46a88b0b017d78a0e51f451e9dc0c2272813aa9f456ee886ca ofl/kiteone/OFL.txt +sha256 54d85ef76f1fcf89671e196a9bca6b02683c68277caa89d89ff1b63a5fe9c421 ofl/jura/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/justmeagaindownhere/OFL.txt +sha256 869e4c29978c318b33c2e5c7c8f24d2e947f249071bb1471620036a9d1ba87ad ofl/k2d/OFL.txt +sha256 f993b906272c2c0f13f12bc8fef1367a39164853dc69fc808fd26ec343fe58e8 ofl/kablammo/OFL.txt +sha256 b01cec9e5e2035b70a6aeb61c673d1f6d5c91539845be07733bd9880fddeb9f0 ofl/kadwa/OFL.txt +sha256 6c5445d4febbf6d84025b874a85c51e7e4bfa7495279eccdb4c317a6de857b46 ofl/kaiseidecol/OFL.txt +sha256 6c5445d4febbf6d84025b874a85c51e7e4bfa7495279eccdb4c317a6de857b46 ofl/kaiseiharunoumi/OFL.txt +sha256 6c5445d4febbf6d84025b874a85c51e7e4bfa7495279eccdb4c317a6de857b46 ofl/kaiseiopti/OFL.txt +sha256 6c5445d4febbf6d84025b874a85c51e7e4bfa7495279eccdb4c317a6de857b46 ofl/kaiseitokumin/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/kalam/OFL.txt +sha256 46eec4220309d801b70628d371aeff217e5151dfaad11606a71f2af5f1396f7a ofl/kalnia/OFL.txt +sha256 3105b49207b8deaef9efa249489df8eff9d76b331d46a433e15cc4685932dff7 ofl/kameron/OFL.txt +sha256 eb998cc5a685b240cdb46a0b5747e70334c8c57bbd7b1f6b044d75719358df67 ofl/kanit/OFL.txt +sha256 7b300b8a1e2e9d7cddb68859551f1ad54a05019eff28da02e3be811c1257f0a7 ofl/kantumruypro/OFL.txt +sha256 89c5e961d4a259af9f3a187be51aa1e095a6fca13a7ad20b40a1d690be7cdc0a ofl/kapakana/OFL.txt +sha256 d2dcb5c24a68a08bc55e2416d13cd32b077c9637044dd40f3863a0aa90aa228b ofl/karantina/OFL.txt +sha256 edf2c840acb9570fe02f40721126aa0da4e4011a0030cc6dce30780569f609b6 ofl/karla/OFL.txt +sha256 fdecdad755f4e5e95bee491c7521f31625dc08283562ea8579543c90430eb269 ofl/karlatamilinclined/OFL.txt +sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karlatamilupright/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/karma/OFL.txt +sha256 251f65282ff48a7e8ef3fb661fc99254d9b3b0c368427c98b1edbfe4ca66e888 ofl/katibeh/OFL.txt +sha256 3336bf5d4e7eedba48ecb831f37bf676e901c39f2e6a422cceadd9d2ffa55be8 ofl/kaushanscript/OFL.txt +sha256 0acef93ca37cf19eeb83a1c6a29b78b08377a211c8d80cd27626e210176828da ofl/kavivanar/OFL.txt +sha256 82831e8f12ecb6deb2f4d9919a04049895b4619e0301fa6b699c861bd7311c54 ofl/kavoon/OFL.txt +sha256 1968df42d8d640e1680750aaea7e81ef3f45aaa514eff4df2ef0c9174a2e3fda ofl/kayphodu/OFL.txt +sha256 355d9d22e809d67010fc5decd3d9ea6ba201fa8ed410a0207977a329e456b1eb ofl/kdamthmorpro/OFL.txt +sha256 ca13e9cd1faaa6afb9e43dcb534a8984cec3218993fb4b436468a79a1657ee19 ofl/keaniaone/OFL.txt +sha256 393d494f9ebb5db6a3552ffa03a4c6f3746c22808b40d011b391681da55ca3f6 ofl/kellyslab/OFL.txt +sha256 ce78cc8de3f6edd2738e8c02f2079db7086c9a74314baa5854675f83c33954ff ofl/kenia/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/khand/OFL.txt sha256 6827fa45930d5847fca5b3d3898b3d87a229fba772a5b6c5bc33bf73ec83478d ofl/khmer/OFL.txt -sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedfort/OFL.txt -sha256 34b8afbcab7508bea23847288332a8c05a507364ca6f0c8756ce560d7d59d506 ofl/mada/OFL.txt -sha256 b67eed9578defb59cc4ff4b58428fb816786e499e84cdeafca54723b055c169e ofl/viga/OFL.txt -sha256 afc1cda4eedcfe27c8cf30fe3e9879587cb43cc2882d4cb91dd3e3fc9eecd0bf ofl/farsan/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanscondensed/OFL.txt +sha256 2171558d2482764644a2f793696fa2e48c361730ecc87686b9a29082d6daeb10 ofl/khula/OFL.txt +sha256 38a83f1f8b6efc3ab354b8b6eed22e8524dc71280844dc24811d95ae27b34952 ofl/khyay/OFL.txt +sha256 72fe43ef3efbc44903674b7b21a19c6e14ef5e4217bc922662320554ffcfb77a ofl/kings/OFL.txt +sha256 7e896665d0863d2a17a671001dbe2528a5f9302f1dff9222af8b0834e9088d0c ofl/kiranghaerang/OFL.txt +sha256 ea54eb4bd4d5a57ec47417d02855ba011af5d917303461617fe01a5688e0525d ofl/kiteone/OFL.txt +sha256 07ceae7a6e3294cbbd0fdf6e35226550566a1cce9fd226d0f8a57f3d34c664fe ofl/kiwimaru/OFL.txt +sha256 e376b0df8e8a2345a9533db6f0a5333a1107975569ad9d1973a7ee557161ca38 ofl/kleeone/OFL.txt +sha256 14b3fbd06078a869cf2ba96e6dacb852d373703c86ca7ad54a4cdd6e20fbab19 ofl/knewave/OFL.txt +sha256 b1958132ff727bd74409aa37ec0abbe4be13b1b379e1210e6fb77fc608c607d5 ofl/kodchasan/OFL.txt +sha256 0878e7d6e842bc3c45154059a1c2812de0d31dca343fe6bc16abc9afdee3e3de ofl/koho/OFL.txt +sha256 65f03a12dedb8d9b1d032393334c3978818966fa72251089bed66a3fe3f56dfb ofl/kohsantepheap/OFL.txt +sha256 d3711c90a7deda6210d30e41b945f16bdaa00662b30ee0b7c36abfee82525bfe ofl/kokoro/OFL.txt +sha256 8045c0c155e0da96ced6c6fd049214ef420575c047ede767d88fd02e31b9aa2f ofl/kolkerbrush/OFL.txt +sha256 d4577dd4b58d06011490a6715de2e17d6808d65fb68f4f3b95a68e9c7c929469 ofl/konkhmersleokchher/OFL.txt +sha256 9c56b4e2e4e922cc37e19e1a9e2e1128beaa17a812e1b67c8ac371b0fb57ae03 ofl/kopubbatang/OFL.txt +sha256 e39d6ec64a37ed1523a59940695a61ea5e7882d9bbe0e7eb11653fda4b04fc79 ofl/kottaone/OFL.txt +sha256 d5e231771c466695f0aea212a3c18ae4e34ea2503f1fc0751f04b0c7610c6735 ofl/koulen/OFL.txt +sha256 bec72f4e6e1f29541d7295ed2ed14fc868695673051b940352200d1ffc4095e3 ofl/kreon/OFL.txt +sha256 4ec46c3e4469afa19f0156bac6917472974f9c85c189f9220cf8735d3e810401 ofl/kristi/OFL.txt +sha256 6c181f5a0045e8f414e1c232c35972ab83ea084ac44825f517ba001628d97b21 ofl/kronaone/OFL.txt +sha256 8f187da1eb4f23e3fe7ba68b1cb2e92881a415dd34c46489698454517e273c4f ofl/krub/OFL.txt +sha256 2b79a19d4c611849e232c3471fca0355e909526a2ed8e04acab933d5168a01f1 ofl/kufam/OFL.txt +sha256 ff72e4d89860e64ee38ccf8a5a7e9dc085d5e36115b096a6c7f8bc988e9bec61 ofl/kumarone/OFL.txt +sha256 b7057fc68425720a92830bbd18b39f070d784a4551de7b0b7e1ad3cc6747d3fc ofl/kumbhsans/OFL.txt +sha256 b712dacdda5da76c0213f8478886f893b855665c1153ae438bc3e55a7dc525ef ofl/kurale/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/labelleaurore/OFL.txt +sha256 b1a62ca897c597c0a0f01be8cb50c0d8370579acd1eadc3f2cc43093d6bbd142 ofl/labrada/OFL.txt +sha256 7dcb8031db2b0f39d41c3ec93a3cd77ccc53fb4ab3f691095ca6c51a06a52cb6 ofl/lacquer/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/laila/OFL.txt +sha256 b5c3d12a3085b96011fee65555234bb9d31fa7444cf6f8d5ae6b1f5771394399 ofl/lakkireddy/OFL.txt +sha256 327bac41d89cf9f32e0efe353228018e1661cff458a5d4905714958514df7bd5 ofl/lalezar/OFL.txt +sha256 d51f3341fd7b3dfa1114d3ef0bdabbe57f60eef86a1458019e0077d676fa1fcb ofl/lancelot/OFL.txt +sha256 ade15f17ac8ff3a726d08ef8708242c78312d946dcb834a8811706d281e45cad ofl/langar/OFL.txt +sha256 911d554d974b49592d825bafefef1b52835f7f0502b5daeff5e292395ea25ad2 ofl/lateef/OFL.txt +sha256 74ba064d03f1f1c4a952da936c3eb71866c34404916734de3cae73b34357e59e ofl/lato/OFL.txt +sha256 f679d25307d193d34ed36afedde50715c97f155a3c720d90d39e7e5d468e0092 ofl/lavishlyyours/OFL.txt +sha256 44778c339892f79188c60b7471485dd5af92c59351c7f9629a00fc625c6cae5d ofl/leaguegothic/OFL.txt +sha256 81d0973236b5b5709a80a217a330db36eabedf57bf4031de46b4660b69901234 ofl/leaguescript/OFL.txt +sha256 41c9980cacc325ccd1afa6553bcae038cc6c74fa519aff60bacb99e3854292ce ofl/leaguespartan/OFL.txt +sha256 2937c7789b0e4fdeda6eafe93164a2ab36e20386704c4cb6f87b1deb620ec0da ofl/leckerlione/OFL.txt +sha256 ba01480319f922ecebbc73f1a523e7f8876e92b16553a32c494bcd3f6f5a27fa ofl/ledger/OFL.txt +sha256 3fa0ceff4b9a2d28dde43bc63cde3acfb5e6e92d13a53e484ca0e501e18c7e2e ofl/lekton/OFL.txt +sha256 d8a8801a55cbc8eeaab7dc9396c4491d60cc7e4ecb2501c6f8282754d743fc2a ofl/lemonada/OFL.txt +sha256 e317ef2e8f152eea3bd96bfad4868cc406625cc4336087fd645e10a5f2b859f3 ofl/lemon/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexenddeca/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendexa/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendgiga/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendmega/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexend/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendpeta/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendtera/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendzetta/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode128/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode128text/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode39extended/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode39extendedtext/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode39/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode39text/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcodeean13text/OFL.txt +sha256 de719ceea028324610230b3573688949768aa30c0b693fb5661691cf36f6ae89 ofl/librebaskerville/OFL.txt +sha256 7ce3bf8e8087bf7495a3e1ed2044e83439db990c778d61b128fd09b7876d0420 ofl/librebodoni/OFL.txt +sha256 9cc8cef15f5e8bcbe99a13ee8d268f6f6f6a5811cd1ed05056ef4608c9b16fd1 ofl/librecaslondisplay/OFL.txt +sha256 a294245c822c5aa9fd9a9f3189418e99415428be5fecadf797793d5d8f6a3ad3 ofl/librecaslontext/OFL.txt +sha256 556704a4cfb5af042e30284e314124779c82ba3854d9393cf3681e5f4575ff71 ofl/librefranklin/OFL.txt +sha256 5ee90951ba3cf079b5c79ec17029e073a72bea1ca08f03ee4b289773a5744ddd ofl/licorice/OFL.txt +sha256 aa36087ecd7e9085e5a1439b0a6d0ee35966e8cd2ccaa649bebe62cae5815e82 ofl/lifesavers/OFL.txt +sha256 255d5debbb80eb2ea762644311f266a279e8778f00156655a516e2b7781a63e1 ofl/lilitaone/OFL.txt +sha256 878aec7282ab41d058cedbf90e14512bcb4fbd0658496de8c2dfc592ed1f0cd0 ofl/lilyscriptone/OFL.txt +sha256 6b53fb03a50914cc382f4d025ee595c17c43f24ae870f840bc51969d3e316c7e ofl/limelight/OFL.txt sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/lindenhill/OFL.txt -sha256 a89ac8075be60f2beba79bed3fa253415a373dbdc3bb108b23f4854d0dd495b8 ofl/pathwaygothicone/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindjalandhar/OFL.txt -sha256 f22a2beea88d631a620b15683fd03e79f13ad3297ad97fa5e42283c0b1a3a038 ofl/marckscript/OFL.txt -sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/terminaldosis/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimer/OFL.txt -sha256 d2f87f90d108a947f98c030d9d8e4bf27e761ce83f222453b9a7230c5fb309e1 ofl/novaflat/OFL.txt -sha256 2da0fa5707f1fab1c802969b098fd1b92ca0b3b233a80e27fca416647c064dfc ofl/exo/OFL.txt -sha256 f9e5dfcdb2947c0db70465668706b0617cd052b6f86e582dff8741d9e5cded0a ofl/yinmar/OFL.txt -sha256 bcb0bda74430ccc281a616a81d0a287fed5a423815b00b222e0b7f603f85b26f ofl/caesardressing/OFL.txt -sha256 a94cfd8d1f5c33f9a7506def359b907f3313f7008bb57fc893985963cd342f8f ofl/arsenal/OFL.txt -sha256 52caec7d90533523fa7da64e95faf90ea32a663ce21847a39234b61e18d25044 ofl/bokor/OFL.txt -sha256 ef0bdccd20de76d517fb3939161d05ecd5808382fb8fa82cde5fcdb3adcb8029 ofl/engagement/OFL.txt -sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondo/OFL.txt -sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/matesc/OFL.txt -sha256 a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad ofl/merriweather/OFL.txt -sha256 010cb216e8f3fbb2836fa3f38787a412b749352de546797f57c03c3bcfe46b1f ofl/nunito/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsans/OFL.txt -sha256 cb8bbf7a86eefa8c146f24ae5be74fffa887ba83719ab3c87036be8e3d0191e2 ofl/montaga/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/overtherainbow/OFL.txt -sha256 3621f156cc7a26e0a9cb413332e0bb35a0e76b36dbfe0b1c885b565a7bf3051e ofl/drsugiyama/OFL.txt -sha256 fbb941b371c6348ee2572ce8c78fb66128a61885f960dec1906c4e44ca4b4d3c ofl/reeniebeanie/OFL.txt -sha256 9e19c0d2e7e7adcbe9dfd0749e34dda41e7e356e0f2cc082d61d2fc9b6e0cef7 ofl/gfsdidot/OFL.txt -sha256 812fc4af0c63d31e0e81cc153af74e397407b0630e918b8b965bcbb192bc0656 ofl/artifika/OFL.txt -sha256 e8ad3f3de5baeff6bac6e711d8c406e0a6b8a61d2944741532d8965d893a2681 ofl/pirataone/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantupright/OFL.txt +sha256 cab4ad0d72d01c3e4d539e8bd4c1b4fca51718538db77e3802550a173329e617 ofl/linefont/OFL.txt +sha256 bfa22e938e1c9844e5126461e9fcd12315007cae3d9442e940e4ab322403ce9f ofl/lisubosa/OFL.txt +sha256 8742963604cd89dc81437811a850018fc03b2bfad686d7422c8235967c87614e ofl/literata/OFL.txt +sha256 ff56684b0212481e7c3886c26d5a655de9b211c8119e5ccc756138a97b066acc ofl/liujianmaocao/OFL.txt +sha256 0d0630b8fb51f80905ba9298e69ce7f3f0c080e019158b6aca469dded731ee1e ofl/livvic/OFL.txt +sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b ofl/lobster/OFL.txt +sha256 f46c3ea04f38ea73c0731d73dfba3d7361d4b38970feb31a3558bd1b75e0656a ofl/lobstertwo/OFL.txt +sha256 e88691a5e0a8a3f788f31db959701ec90a1d5e7505f1cc53c5663180a7d23c81 ofl/lohitbengali/OFL.txt +sha256 4fe81901e6f84cfce1145c715e931352a9a12aa7ac75cc193eb523c0cb0e5eb5 ofl/lohitdevanagari/OFL.txt +sha256 c87702d8b70f714fbefb554660e8ca57a43ef62a59089d11cbf0c6bd51d56928 ofl/lohittamil/OFL.txt +sha256 9551ade371e7bcb1f6d9959273bbf1fed3bdf398efb5c57cc1fd85d6a13e9e5e ofl/londrinaoutline/OFL.txt +sha256 819e3b25f9b50f12299a3db1638be3813efc6b938f2b86693a218d20ec4e3209 ofl/londrinashadow/OFL.txt +sha256 85b700bfba1250a6f8bdf930cd7113faf3d8e9dc52cd89eb98c3ac8a038a4aa9 ofl/londrinasketch/OFL.txt +sha256 66b5c49d384cba754806a891ebd52f2ca08dd05c0eb3c56170192da466a00a20 ofl/londrinasolid/OFL.txt +sha256 603546b7219a94bb59bf8294458194a5010119486354092b66a09a3fd61aeacc ofl/longcang/OFL.txt +sha256 1d9a970809ac804b582a6ce7f0ebc4e7fefcbfd7ff6299cad35ee656a21be716 ofl/lora/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/lovedbytheking/OFL.txt +sha256 aa90c61f2e9a4e55cc6fba56a8c37dc97921010bb4d6d1cf0377fd8f8982fe59 ofl/lovelight/OFL.txt +sha256 9686eb9a16c2f004dab33197b49645d96bad806621659819e36ad6924d405568 ofl/loversquarrel/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/loveyalikeasister/OFL.txt +sha256 d028940636b0acee45c302e6de8eee8e1ec66a6c59280a5f5f2b0c06a6681428 ofl/lugrasimo/OFL.txt +sha256 a2c9113a30ba080cec4de37032f54c5fb761c0c73c7ecba96f38555b4e1037d4 ofl/lumanosimo/OFL.txt +sha256 07384f69fe8c6045a0e9f05a689a966a4e086e604987d902d5647a0802996f54 ofl/lunasima/OFL.txt sha256 65f43260cf7e66b57ddca8d148384a6602e2c06edd389a8b3cf388045127b47d ofl/lusitana/OFL.txt -sha256 518962c41d4a5e96b0016bd8d8acc965413ea1a0102467e4955931e702b14a0d ofl/iceland/OFL.txt -sha256 2171558d2482764644a2f793696fa2e48c361730ecc87686b9a29082d6daeb10 ofl/khula/OFL.txt -sha256 d336c098ea798bf14de111cd90dff7d6bc340852405246511345d0f8564fe76e ofl/fingerpaint/OFL.txt -sha256 ea274e87939d38032b31fb741af75bff9fa3f8d4a8b652265f9e0ce1ad7e9f80 ofl/asul/OFL.txt -sha256 eb1992aec1cf892ec94ffc116d79b62c7cb03dc108141b94a57a4195d210b514 ofl/meddon/OFL.txt -sha256 9b584984f9db0ee30347391a76eff9c0a6b03dc450c3c6afe3757a2cb3a4db87 ofl/tajawal/OFL.txt -sha256 1dd84b611f4bed7f9ff9089e76a96337b187e6f283a4ab33bcb987f844f2c4db ofl/parisienne/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/hind/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpica/OFL.txt -sha256 de08ff7a460541753999b1208f1254f1d31f16b421312aca4d4b8179d997de38 ofl/aleo/OFL.txt -sha256 7706a84d7e49e2273877106334a1eded8ae89fb5839fb81e0f2bb27c846f667e ofl/lora/OFL.txt -sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karla/OFL.txt -sha256 0409c6582424508453ce41648067efaacf0c790622918493d8f1d934bc5329a0 ofl/bigelowrules/OFL.txt -sha256 9e2d92fb24b4a548ab030c509ba88267e224f2523728ee9bb35cf334811106bd ofl/exo2/OFL.txt -sha256 f480fd19e7018942ecaf460f7a4ab9ccee0aec579abcb07d559dbede913864c6 ofl/alikeangular/OFL.txt -sha256 6ea7a3ef1d07feb592693f3f22c26d0b09321ff81814292b49be99888d0da9d7 ofl/ponnala/OFL.txt -sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhymeexpanded/OFL.txt -sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveat/OFL.txt -sha256 adadb8d5d34fe2218dca0f4a4919a9b6f81dfaebb289e5446ac7b3063d6965e9 ofl/tangerine/OFL.txt -sha256 16741ac498178f645283cfb45b7a487b6d361b5de5730c5ea729f056f414f6b0 ofl/ropasans/OFL.txt -sha256 1e5bf8207a40678bc401e2e5456d0db1f2a183b550a30976b48dcdd6a4e4c46c ofl/caudex/OFL.txt -sha256 6f9e3a1c51f617e7b110862426204ec7a56d8c6d2f731373b5de6b8d069099b6 ofl/ebgaramond/OFL.txt -sha256 c2368518f12463a93cfed44e1460f36085dc60df06f415ee9b0319809987ccce ofl/frijole/OFL.txt -sha256 5f247fad3e8a86b6c0779dff09277047c1ce2b0b7580a1093347a8af755352ba ofl/sawarabigothic/OFL.txt -sha256 6627b9c2c8ff8e0c6ef23f1b0125dd5b293320c10c916d402fef64916c296d0e ofl/kreon/OFL.txt -sha256 723764a50d4e6985dfcbd75fcb40dbd3abab37ba25ae626486d4a32084854487 ofl/kdamthmor/OFL.txt +sha256 930fed5b06a415736dc3b4e5f4f01585523b672717564bf677f93966bcd57636 ofl/lustria/OFL.txt +sha256 b0c6f67b9ee530515e627d9909c8de84dfd30995a8c9802279beed28c740c4e9 ofl/luxuriousroman/OFL.txt +sha256 0d53601eaba9a6f5dbf7ee43e26edbb37ea5fb7f3f170052ca5dc8d51704a5ea ofl/luxuriousscript/OFL.txt +sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondo/OFL.txt +sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondoswashcaps/OFL.txt +sha256 e15f74b13b1a30c878f162b2ce10aff4668d0e8ec8dae41dc61c1c12aa6d9eb9 ofl/mada/OFL.txt +sha256 746b384383888d9325ed2fa9c40d2456b458aa190dd2b8c515ed4f02a1075bb7 ofl/magra/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/maitree/OFL.txt +sha256 616e75d879831bedfa7725c078e09bb56f8a17f40b194e16691b12251bb42b3e ofl/majormonodisplay/OFL.txt +sha256 5e13aac27147fa739af42e7314d48c7ed92d7986cb1fe5d84f32c09377ad8a7d ofl/mako/OFL.txt +sha256 bc1175730d609233043cde47e48f69831f012e85537c5ec1a2cf4836757c1540 ofl/mali/OFL.txt +sha256 8928e999ff156e35852ab41d7a906598a8285acd3bcd81dff67213a6cd98d43e ofl/mallanna/OFL.txt +sha256 1b8eef90c567309fef17962cc969dd9ed1de69176517238e744018bb983e7c1c ofl/mandali/OFL.txt +sha256 2e144823e28b854ff5e1d41db9a2180fdb1d8e44a71c2ae4fca5c4b2a5adde4c ofl/manjari/OFL.txt +sha256 e01b637272e0cbdfb240184dd98ea5cc671556d9894dae2668d92ab2c906787c ofl/manrope/OFL.txt +sha256 14ac0a5413a923c9ad11b6f541df17207fb7a0e0725e43eb29c88eb04c3ea2aa ofl/mansalva/OFL.txt +sha256 6f5869d0892d8c06cabcccce3726cacc849bd0a96b83bef5850402ab2b9fce71 ofl/manuale/OFL.txt +sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellus/OFL.txt +sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellussc/OFL.txt +sha256 f22a2beea88d631a620b15683fd03e79f13ad3297ad97fa5e42283c0b1a3a038 ofl/marckscript/OFL.txt +sha256 50f7b09af5ff677f611a96cdf5eb916307c59b29f2e8144942718cb432a9bf6f ofl/margarine/OFL.txt +sha256 096744f008d418398e0b72ce8d4c46f195c036600a7a48df256ac95e026a79dc ofl/marhey/OFL.txt +sha256 6e7f259edf178c70b2ee36acfcc934b76d1cd56bb58d2c8f2ab8b5dded8bd430 ofl/markazitext/OFL.txt +sha256 a345b13576140008a697ac66ca8c76cd63b1dd076712bc30a0f5e97dcc53cc83 ofl/markoone/OFL.txt +sha256 b0a0977df31de3ec1e62bb819c410feda2944bcdab999a9aac2468e715cc99e1 ofl/marmelad/OFL.txt +sha256 f177d98c67b84250ec87a03ca6ad161e84cab15b435e960039b971797a065f4a ofl/martel/OFL.txt +sha256 5641212407f956b828bf632afc4bbb3344f461f82255ab56756d9e3e8604c7b1 ofl/martelsans/OFL.txt +sha256 ddafd2c3f37ef1d83ef284ca63e159befd3820850c5e9eded14ca52eee92c256 ofl/martianmono/OFL.txt +sha256 6cca1abc09d677cf00a55674ce2775e0eeb6dc5c0137b0401816680b9e500f81 ofl/marvel/OFL.txt +sha256 d7bdb1cee215b689e23c2f95672a6084c790542170648267a55114103d756a08 ofl/mashanzheng/OFL.txt +sha256 171b5e77742daf0aaa952ad9a9fc4afd78b3f3e80170a49a510ef849f4b915fb ofl/mate/OFL.txt +sha256 171b5e77742daf0aaa952ad9a9fc4afd78b3f3e80170a49a510ef849f4b915fb ofl/matesc/OFL.txt +sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenpro/OFL.txt +sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenprovfbeta/OFL.txt sha256 846ce83956a732edd57b74d9ba988d58abc8c8e6d0926859559318ce6aed139d ofl/mclaren/OFL.txt -sha256 ba01480319f922ecebbc73f1a523e7f8876e92b16553a32c494bcd3f6f5a27fa ofl/ledger/OFL.txt -sha256 c3bfad2900a83f571d5c984d490d51c56aef14806c28dde38125593e1e71daca ofl/mrdehaviland/OFL.txt -sha256 12af42b715a3901bfa7add1351e45b6ce22f3061555d52db45e963274c349360 ofl/arimamadurai/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/miriamlibre/OFL.txt -sha256 3169e7e0e87168908218f11d660a52c0b81b5952fd73918a596e70721d68d3e5 ofl/inika/OFL.txt -sha256 e711c816f7de931244976f51166baa15446fc307e5d0ea04fdca1bc2c04afb1c ofl/nixieone/OFL.txt -sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signika/OFL.txt -sha256 b01cec9e5e2035b70a6aeb61c673d1f6d5c91539845be07733bd9880fddeb9f0 ofl/kadwa/OFL.txt -sha256 d7577acbab1d70f2e6bd1b21d8f61db189d6aabe6375bc2d96564b8d94031664 ofl/stalemate/OFL.txt -sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eatercaps/OFL.txt -sha256 ae6de2f6fc00f76cc7eb0d97c1ae5e0b7ec734f20ad7f58cf4c74738dc822d21 ofl/chelseamarket/OFL.txt -sha256 860cbfdc9dbc3f0e8d35af80c31e8f20945bff393d4f483dfc157469e01d321c ofl/gorditas/OFL.txt -sha256 9a2d8c5a3de0a6e62432322115dce136139948411dba33cd86525c0a02749fb8 ofl/unicaone/OFL.txt -sha256 4fe01b13ffb41faa8f030d84843a95dab32792dfeeca7c072abbfd3f4d6896ad ofl/audiowide/OFL.txt -sha256 173ea2d0bdda981829719623c35699e8c0e4aa508e0af12817ad7ccbfa4c6137 ofl/originalsurfer/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/trirong/OFL.txt -sha256 58bdc69f4c6177125c6e7cdbc78f710f5f9952f11bba7bd5b17bd7ef169d731f ofl/goudybookletter1911/OFL.txt -sha256 2950994bcfb8e903f0539d28a8ec4af077e0aa1fa7946c33c912d2d6969c2971 ofl/glassantiqua/OFL.txt -sha256 7344b8b8c97c4f88c0ff8bb72bb024bba72f404be1c740b6596a73ed15d28df3 ofl/vampiroone/OFL.txt -sha256 cacad5bf45bf5c81f4b6cbd114261bc8a08f6110b66a4c6fad8bbc16618a3096 ofl/daysone/OFL.txt -sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasanssc/OFL.txt -sha256 c8155eb9337078a9ea9f1e576ac813a03030ca43e2694593e90cd4fee6fce937 ofl/sumana/OFL.txt -sha256 95803fae1b063e592c67b5867f1f36df1df526e5ebf33c6cd4d4afa31a9d5586 ofl/sitara/OFL.txt -sha256 c254ae01c407f4a2bd0ad163e4c1a795d57ddfa8967c21b8a28c250b44d13963 ofl/sawarabimincho/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanon/OFL.txt -sha256 25995bcf8e8ddea1aafa5449870567cbbeae7e26b27ba30aca5642f2c02e9757 ofl/quantico/OFL.txt -sha256 455755e2e7ce9dbac6beb3729c97c57d6f74a638dcb5be548ec953021fbdbfb3 ofl/ntr/OFL.txt -sha256 ad6f73fa3edb7aea340aadbc63c0d7ef7663abed82664432ae09a6b377fa313f ofl/librefranklin/OFL.txt -sha256 581f08727777cb2a1a1ec95c0f981ce64fb1ad4354f78a0ac4f3481afa605577 ofl/moulpali/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangkhong/OFL.txt -sha256 08fdc7cbd92b9bbc4d41d0945ae7f25450d91c5fc8c66c68df331af3505e4ec3 ofl/rougescript/OFL.txt -sha256 694d5c15c1dac5e26653e18b94394d911e471549ec9b7d6247ade62e486b4915 ofl/asset/OFL.txt -sha256 bddfe669338d0dbc24c15ccd31dbf5c101a213da38049c24baca9ccb7fde45a4 ofl/wallpoet/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsansnarrow/OFL.txt -sha256 3cbf579238e4eacd90ad67883d971aa346ce8990d658635f78f98d608a6830a2 ofl/zillaslabhighlight/OFL.txt -sha256 87000f71a897c8c130c7777d058c5868f84316f99a32644b3bf595cd11edeb12 ofl/sancreek/OFL.txt -sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allertastencil/OFL.txt -sha256 9608d22ae5c586628c9904e773b7c6a6520fc16e1492ebcb5ea55d9523399964 ofl/anton/OFL.txt -sha256 f3758ee70600ecd5450f01ea373204b202e048d0454c9db2d1175c5a5dd1e92f ofl/vesperlibre/OFL.txt -sha256 e43f121c788cca4a14049e58864e28021174b055710ba38e0964e816dbf905af ofl/fruktur/OFL.txt -sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserif/OFL.txt -sha256 a1580ba69a8d706bd95e1e72ee0b5cfda0a478fbbab6a4af13b4a9e1b28faac0 ofl/revalia/OFL.txt -sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickave/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanonsc/OFL.txt -sha256 0836fd874230b17f840efcf7d3bb529f5a7b5befbfeef94478519cfe2d8551c2 ofl/courgette/OFL.txt -sha256 e3ed3ad6cb257e16dc1789900707c5cd1cdef2d60d155389342604991cf693f9 ofl/bahiana/OFL.txt -sha256 391ac3126dacc95b92a8f3408467879edb3245344bc411530a30d5aada52df92 ofl/gugi/OFL.txt -sha256 88dcde7d08e509a3eec64886292a36cbd58ed9bb52f37f91f55656fb9d21ddb8 ofl/supermercadoone/OFL.txt -sha256 41423e9e1d0ea79d0e78bd5fe9e0b27f4c23140706f5dfbfe116839c83aae91c ofl/charm/OFL.txt -sha256 43186c592361336474683e302dcc988831a53857bef188c4466f6b45dc238f84 ofl/fredokaone/OFL.txt -sha256 a21fa252efb7a1ff84de6a36df4386959668aa046f28161b4047829f7d9cd1b5 ofl/damion/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsancondensed/OFL.txt -sha256 bfc205682f5454b42a732ec857b665293ab8bc6f0ee901a0967219ba7ffdb190 ofl/gfsneohellenic/OFL.txt -sha256 59b91c9912b80714852a43897cbc9414d6457e22072dc99a4cea6e2bb4f3c65c ofl/freehand/OFL.txt -sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabin/OFL.txt -sha256 b598b7fddfd578950aa1fe6e0e2607b779abfaa686b83af8ec65c860f646b2cd ofl/rumraisin/OFL.txt -sha256 2bd35914efa381c80f9fb62d6ea7d736d3c0739196a3783c3122593c3408392c ofl/gurajada/OFL.txt -sha256 5625e91bd7c2a45c8b9f59106d587bd025470b462ea901df691defe0099621e1 ofl/taprom/OFL.txt -sha256 37d5360d8d2433689e78302a93cd88e9add8a2294046476625edada2d4328deb ofl/averagesans/OFL.txt -sha256 f8e2b58dd7a8c8e21e5d744b45876bce7e010a647c071c1ed42ff0e618d4ea59 ofl/frederickathegreat/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootamma/OFL.txt -sha256 09685e225ba9b697b2ccd2d4098cac5ecbed0679960605258a271af60749887b ofl/francoisone/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/himelody/OFL.txt -sha256 08a12877eda24767239f26b527bfce0c515efaf623c66da6baad92a6d5315e9a ofl/content/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/saira/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/delius/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/pridi/OFL.txt -sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/rasa/OFL.txt -sha256 4e66943af352059c059dd658774f25fbc831f1ad478f9f0890c06ecc2dd324c7 ofl/metalmania/OFL.txt -sha256 f5b03ea0b27c7f5afb9702771ee57679ae8ba6b471b6ba9e62d985d3256f1929 ofl/playfairdisplay/OFL.txt -sha256 593f0bc55c75b673772b378eaee314f128283745c4bb1cfdb9b8012a3b6c46fe ofl/skranji/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiagruesalibre/OFL.txt -sha256 14d28541780d90f6577bb7abcc6f005bf6969614294e75c82abb8758a696ad46 ofl/quicksand/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloochettan/OFL.txt -sha256 35dca6122235851d236bd861124f4a893d409eba021cd8c6a292a19df0f4640d ofl/codystar/OFL.txt -sha256 ab721b35816e470fb11619ad3705f75d08dccd0864505e3d782e94fd937f6620 ofl/allan/OFL.txt -sha256 d9cdb075679d15a99bab2a8541b9c4fdc71347502111fbe9affd1d462219d96b ofl/indieflower/OFL.txt -sha256 1313ae342eae4e1810304b6cd32f6815dd11b8e45812a2af98e58b6960684fa0 ofl/petrona/OFL.txt -sha256 1e4015251ca58d4f349b4ac930259c6f3d6381ce68f8b4b27d54d53f8f63f972 ofl/angkor/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averialibre/OFL.txt -sha256 8e28b778b6e1a7ff9ca72f4dee2d53120aa2856dc1bfd0be44307e365b0e45bb ofl/cardo/OFL.txt -sha256 a02e8715fcdf3325c474b7209399f50230897bfa828fe4eea2639ced1a1d574b ofl/blackhansans/OFL.txt +sha256 bcc0945e23c5ea0269327a87b443443a15d2867f4bf6791f3c01c32245880849 ofl/meaculpa/OFL.txt +sha256 eb1992aec1cf892ec94ffc116d79b62c7cb03dc108141b94a57a4195d210b514 ofl/meddon/OFL.txt +sha256 45b1f44d2cb859ea4b7be2f322c57b8ff7be55075c336744e62b5550cd0a97eb ofl/medievalsharp/OFL.txt +sha256 88ac81fcd30e64f6e6b91b61b159c9b700bb3dd59012b72ec61629abcfc7fba1 ofl/medulaone/OFL.txt sha256 d530c14e9cc263c567b47742ef20df2a41374f00732ba4f290f52adad428b1a2 ofl/meerainimai/OFL.txt -sha256 2e2fe5f1d8916a5160060594a96c1a5116406d26847afdbd09618481e2abd6fc ofl/denkone/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/megrim/OFL.txt +sha256 e12a3e737fa75c0ee072d965b6185710f35e38a4f7a0793ebc66ba14a216109b ofl/meiescript/OFL.txt +sha256 712916eb364418dc1d6f916bc504ac80be4e16d5e7126822fcf483f82f9ae6f6 ofl/meowscript/OFL.txt +sha256 131d19126a0e7ddd25540fd6bee219cebbc8aee7e8374882998ee6c2f4ff6cf4 ofl/mergeone/OFL.txt +sha256 61470db03bfdf0616932a086346acf8eddaddbdffbac9c468f0d88ac72ccb151 ofl/merienda/OFL.txt +sha256 a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad ofl/merriweather/OFL.txt +sha256 e07e715e58eb63bd8d4ccf2b2e7d0a5d3ef5d93f596431f6dc3aed42ac1a2304 ofl/merriweathersans/OFL.txt +sha256 2f871c2e81de6d0c72c981615002c30bc9f1637003d6d3d4c3f0149886b70569 ofl/mervalescript/OFL.txt +sha256 4e66943af352059c059dd658774f25fbc831f1ad478f9f0890c06ecc2dd324c7 ofl/metalmania/OFL.txt +sha256 6ec397700f08afddd3f46421e1a2fe59c5e3c1480183b1ab161793f1e901f159 ofl/metal/OFL.txt +sha256 4fece81b541808b40293b0cd3f5b1990274e1100e1c20455dc2987cd96639d3f ofl/metamorphous/OFL.txt +sha256 4eaa1fae0ddbce35cfbc42ec1079f7fd78e4146b1d322630600af07a1e3212a9 ofl/metrophobic/OFL.txt +sha256 6958d8c61b6b223f81bdc2109941e5d0004996dde61e197d628e0293f4f1bc58 ofl/miama/OFL.txt +sha256 33c39ce59a45bfb0dae3280e98bdb46be59d6d68efc62d4dc5fae90a26d2f393 ofl/michroma/OFL.txt +sha256 3997621a219c7758e31dbafdd3cbd2bcb0b6144a41d1ca068d04dbcc4bafcde6 ofl/milonga/OFL.txt +sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltonian/OFL.txt +sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltoniantattoo/OFL.txt +sha256 d2875ded3e44e9ae53ea2b35e825dafffa19e82c5d14addb9f1150fcd7a3463d ofl/mina/OFL.txt +sha256 b632b20bfdec8a8b1247cc8624c4954641db3f1def485b91c91ec1590478e693 ofl/mingzat/OFL.txt sha256 56c4ff36faaaf336bc5fee659ff6fab2413d67499cc22acc29079b3892d8931b ofl/miniver/OFL.txt -sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondoswashcaps/OFL.txt -sha256 742a6a4386db47a2987c7c3b4aeedfb5adedfb3356c118de450a664735686535 ofl/graduate/OFL.txt -sha256 9e53298e3629e00ae4c31531cca09051ddaa654a5de4f7b55e596132fff86e1f ofl/dhurjati/OFL.txt -sha256 df9fcd8f62ae79aba7fa5b0563a08dfede1fa0909d668287d70c395d88f5fe02 ofl/fjordone/OFL.txt -sha256 02faa476b17db0044d0c502a3ce12fdc81eeeb9bd618e6a005407c79d6081bbb ofl/monofett/OFL.txt -sha256 1edecf3f971a11dcfd777cbda6f08c0f9a77bf57a0a2a89d8142fb933894ce16 ofl/amiri/OFL.txt -sha256 6e6efa9b0556d100cfe60690cff5d9be7144df77adabfd2c278dbfee451351ea ofl/phetsarath/OFL.txt -sha256 2348c4852e6322105d130aa2addbe24c962e330094ad6dfbfd9fbd2281d76b0b ofl/bellefair/OFL.txt -sha256 3bbcf1617d93d3a949a10da78ae91c58be536fb04567ab4b5b9fd207126f1db5 ofl/buenard/OFL.txt -sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/dosis/OFL.txt -sha256 3ac1301549523d9861fedca12871f24e575fbd26d520632fc00ba849b471d275 ofl/russoone/OFL.txt -sha256 44b51296985184d9b27fc2c8e5b317906c5d65d9dc834e81c07902d3e5e1cf1a ofl/brawler/OFL.txt -sha256 afb8c471158619593df0fb501453bd39fda42396e2cc3911e2a0a471c11b863c ofl/sarala/OFL.txt -sha256 de985adf63cff6b1bcb7c5cb55f1c5850fb1d36289d20a0e26d97a281bfcf956 ofl/aldrich/OFL.txt -sha256 194e25172d0144f29aff4b6fb2931ff0be0139448a5cd867db37863c9179330a ofl/stalinistone/OFL.txt -sha256 ae05f8781a5ef38380ef3efe8cad86783610b6a780c6c278d7472f95310fccee ofl/oswald/OFL.txt -sha256 2dab153a33dcb2101bba3f194d27d953c848a0fabf2e336650a81f84a0c33b3f ofl/pragatinarrow/OFL.txt -sha256 9d61931b909f9a738964f8fb311eb8fa40dba1ef9f1688b36039ebb15ee1805e ofl/questrial/OFL.txt -sha256 e315abc82a78710c7242e2f2e6529651fd631d4d50e6ad98ea194f9b54c3d701 ofl/alfaslabone/OFL.txt -sha256 4653c63a4bab99aa50de5190853fa21ea6c0a25d69d49f5a42cd51f0f67665e0 ofl/boogaloo/OFL.txt -sha256 bd8323cd1d2b6bbdfbbf99cb41ec1156d0352ced170de4aa3a96d95e6e20bf5b ofl/amiko/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/sueellenfrancisco/OFL.txt -sha256 ed93e9833f18acc2775380a28139fd88d3ebf82df7cb814042498467be3463bb ofl/lemon/OFL.txt -sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/itim/OFL.txt -sha256 fa28ba897eb819768d6bc00c30aa03ef560e80e5f6fb872eaea089c66992f502 ofl/notable/OFL.txt -sha256 96199bf9ff12dd471a66911dee95440737b437e7f5a6fd30e9e950c16d66e8df ofl/unifrakturmaguntia/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/judson/OFL.txt -sha256 ad4f6ede2e8a017255822a6abee8d10717f1d34c20223de80285ff59e28a1cba ofl/bangers/OFL.txt -sha256 f8779e6871bbab04e0a1ddd9997f4d8173b56792a1e7f8b9d691d967a49c7dc3 ofl/andada/OFL.txt -sha256 49b9214f7b40024abec2fc89a32bdda380f2174ba7005d7636e6ea340157c5a6 ofl/jomolhari/OFL.txt -sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612mono/OFL.txt -sha256 5eca89cdd576df5e4b7c694e0425b126a9ca839aa067df85fab33904a8187076 ofl/amaranth/OFL.txt -sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenprovfbeta/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/miriamlibre/OFL.txt +sha256 d1bf0acea511ad1f4de53e942cffb8ab0e67c03c6203d6f390d71105d52c33f0 ofl/missfajardose/OFL.txt +sha256 76be26178f13ef82866cf6a5c54272191bb583c203ad7035021c7681c9043558 ofl/mochiypopone/OFL.txt +sha256 76be26178f13ef82866cf6a5c54272191bb583c203ad7035021c7681c9043558 ofl/mochiypoppone/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/modak/OFL.txt +sha256 3e908f3a95680bdf3c8456bfbf76392605b34cb3fba109e46441056ab966cb35 ofl/modernantiqua/OFL.txt +sha256 039b820470ad522dc92e98b3aeaea5d53f7e19a1e9d0248ff5df00b426868aa0 ofl/mohave/OFL.txt +sha256 0f2daa61cee069893d44ba24f3bdddbba18ac33b011fd8944e8682dbf347c61d ofl/moiraione/OFL.txt +sha256 4dee45deee99672fbe342b2f4b7aa75b0cd12de18a68f9732c77f096bab47e0e ofl/molengo/OFL.txt +sha256 af9b97696048d509e3d70f8108b7c4381084f95c8fedd97acaa76b0b287668be ofl/molle/OFL.txt +sha256 6ccb3c94ae8f9ddf4954c8981a1a624204087e940b941c580d3738f8c09de9dd ofl/monda/OFL.txt +sha256 a6695ce9e8a5a86bfa3a55b65c3be569a0eca8dbf4c38bae323ac2433008916b ofl/monofett/OFL.txt +sha256 0e7bc933f607a0fe98e2635cef0df76dc9b6a0198a7a7ad035e8a2b8d329e137 ofl/monomaniacone/OFL.txt +sha256 585c6d2da8bcd8ffa651e0016f2e992a6891b625143a46a1dacf00699a817d9a ofl/monoton/OFL.txt +sha256 a5fc033225d145b43fd7391482ae7689825414ce29a01614d651a3012b57c81e ofl/monsieurladoulaise/OFL.txt +sha256 cb8bbf7a86eefa8c146f24ae5be74fffa887ba83719ab3c87036be8e3d0191e2 ofl/montaga/OFL.txt +sha256 3b00031e7de1fd7d8cce0a7a4638a38a8988e16a8950210ebf8e57f688b14c4d ofl/montaguslab/OFL.txt +sha256 1431e4458b02d3fba371726627ce93269fc26440cebacdf0c4965ea4a3cb5cb3 ofl/montecarlo/OFL.txt +sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserratalternates/OFL.txt +sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserrat/OFL.txt +sha256 c54957d55e7c9e66c28e474cd39de75dc044e8f69056788cae44eb78841ceef1 ofl/montserratsubrayada/OFL.txt +sha256 3cd47b38fdc04ceae502892dfa59788e57a27b73a4cd2d521d660c76298b5853 ofl/moolahlah/OFL.txt +sha256 12c5c11cf37c77a574ef3964fd27f117aa1e1dc4c1569b723cfe45c3d474306e ofl/mooli/OFL.txt +sha256 8e032df9af3acefbcf2c02d5a868ecaf2233005014bdb00caba05c14dd279be5 ofl/moondance/OFL.txt +sha256 993860a6b21dbb0eb98c7e07490f07d24c919d4ad4fed04a1b34f1663d9d53e3 ofl/moul/OFL.txt +sha256 9268f8a3b23f0ab8ad964478b4ad5e0ac534a4835b8409cd208bcc846d096bef ofl/moulpali/OFL.txt +sha256 81d6c3788a6b641cb9f543389d9d5c0cd3bf94fbb5639be19c102b9274c34291 ofl/mousememoirs/OFL.txt +sha256 04971e3fcee60b247395150d93b3616f6a0b092572332c96187b472976553abc ofl/mplus1code/OFL.txt +sha256 04971e3fcee60b247395150d93b3616f6a0b092572332c96187b472976553abc ofl/mplus1/OFL.txt +sha256 da15da6b1496d4de18f97e2ad1b722ef8a1c121149c2c93b2cf7eac6ac27b35c ofl/mplus1p/OFL.txt +sha256 04971e3fcee60b247395150d93b3616f6a0b092572332c96187b472976553abc ofl/mplus2/OFL.txt +sha256 04971e3fcee60b247395150d93b3616f6a0b092572332c96187b472976553abc ofl/mpluscodelatin/OFL.txt +sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedfort/OFL.txt +sha256 0da6a3e5b24a9fa04085c20a2a1d3101eeb1e0bff56a2291f407187e1b2adcf2 ofl/mrdafoe/OFL.txt +sha256 c3bfad2900a83f571d5c984d490d51c56aef14806c28dde38125593e1e71daca ofl/mrdehaviland/OFL.txt +sha256 f354ef1e7256644b320c5e1d9a07a819c2e2b930166003c96680894f9fba81be ofl/mrssaintdelafield/OFL.txt +sha256 967d75b89eef1f8a0ba1f5ee7dfb13427621f9116c6e7878ca04da8c9aa8641b ofl/mrssheppards/OFL.txt +sha256 1f3ddf9e7c9ac7445b046a89d9b420fb4a3861f1d62091a85357179db73ebd12 ofl/msmadi/OFL.txt +sha256 46751a31966477e3f038d1e5ff1146a33234a3a523a0e6a21be3221cba082a34 ofl/muktamahee/OFL.txt +sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktamalar/OFL.txt +sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/mukta/OFL.txt +sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktavaani/OFL.txt +sha256 097e9ac414d9251c8580c073a13f8899798c66db746de60662148789ca693f19 ofl/mulish/OFL.txt +sha256 7d9f69e9be971aaa0caf64555545b3d34d23204d53ee88085790866ee21c75f9 ofl/murecho/OFL.txt +sha256 a1da98a568fa3e62fbf76b7f4d735da7da0aa2ed055600937b15356bab5ff118 ofl/museomoderno/OFL.txt +sha256 b9d592c3bf421197d9b7e353416b8e2ec81584988824b43d38c86d997a08b868 ofl/myanmarsanspro/OFL.txt +sha256 b4f46a426751128d9415c0b36a3a652dd21a116039e5926ac1890762a223713d ofl/mynerve/OFL.txt +sha256 5d9c0715f247ead158013109a3c7a053d044ab58d74cbae50594f648189ac550 ofl/mysoul/OFL.txt +sha256 965bd2c907f7bb6f36da4f85e83f29aea8b2f720783deebd7ed7b40678e67672 ofl/mysteryquest/OFL.txt +sha256 999d3ace5ea7f04761689794a9c877b0a5fc8b22a469518ffad78b4facb2e61b ofl/nabla/OFL.txt +sha256 d3474845766e4361040178d2ddd0683efbd7117b4faf19ea99fc1574ecc51e7c ofl/namdhinggo/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumbrushscript/OFL.txt sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothiccoding/OFL.txt -sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extended/OFL.txt -sha256 3670ddaf348c62ada22a2f606158dedcd9ca5fd5422a6173d6593204a8f53d4f ofl/varta/OFL.txt -sha256 ab592d1abca19428b89d851706fa7815ec25139c6affb45d366577ca63fb91b7 ofl/yesevaone/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothic/OFL.txt +sha256 8eb1c1019fe7fe6d0b6e7d7bbbba1d9cbdd969d8c5f26455708f6cfb8a77284c ofl/nanummyeongjo/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumpenscript/OFL.txt +sha256 1bd2ca2cf8853076508e6cd1bb187541b52fc24f80fceab5074b32229dd394db ofl/narnoor/OFL.txt +sha256 c0a7efe98e77cbfcf1a5ca43e874e25cf53d9185c56295bc3b5c407f95dae638 ofl/nats/OFL.txt +sha256 1b6b1362683d5bb1f864615e723b4323a3c05de5dd020e0e448546135bab75de ofl/neonderthaw/OFL.txt +sha256 dc7c4ee52985271463f5ad27e06e87a5c5c9de1f9edd04d5a9ca7b76486fc2a6 ofl/nerkoone/OFL.txt +sha256 656a20870fbcb8f559f1c6308c1df90ac93d7cd0279aab49b43a43b5e58534e6 ofl/neucha/OFL.txt +sha256 636d62f04d7bda9fcf9354f258f6244e7e18288cae036b95122e204f1acbec80 ofl/neuton/OFL.txt +sha256 942d51cf079299e83e9dd7a9a37eb92260524e8d1d576b2f0b3f7ca207c53f8e ofl/newrocker/OFL.txt +sha256 7729f005b7a087368e2cf61fc4b65cdc85988e47d0e6e38c93a72de345e86b41 ofl/newscycle/OFL.txt +sha256 fdfad38143ec470553cae82a1e45320bdd1b9ec70415d37bd0171051d8a4ded8 ofl/newsreader/OFL.txt +sha256 448df04b698cb1101857b61c7d1b4187beb59d3a0fb5edbd834d308758cda95e ofl/newtegomin/OFL.txt +sha256 6aa923334ec515d26b1a61bb978a0bb5bd8884de7529add1625beef2f4a53f74 ofl/nicomoji/OFL.txt +sha256 70f664de65e7bb62e1ac728f20a9bb28de7fdc18be594186137a9e15ce9dcee5 ofl/niconne/OFL.txt +sha256 f9f28345ffcd6cea6e3c6699e4579cd1948053d80fe89a6a5a2ecb269afc95f8 ofl/nikukyu/OFL.txt +sha256 513346ac60af1dde9d4a7bcfad3f39909d5697373a8aa1a6ee4376e6d22d3cdf ofl/niramit/OFL.txt +sha256 e711c816f7de931244976f51166baa15446fc307e5d0ea04fdca1bc2c04afb1c ofl/nixieone/OFL.txt +sha256 9465823369fbe1ae0b5a3065021d53ef8c56e113e664229455dc80b237fa6a07 ofl/nobile/OFL.txt +sha256 3fe944228254901b015c1c39178dac2e4217eba07118294b84dca34d28d4b2ee ofl/nokora/OFL.txt +sha256 b7ac0199d926980457302e0486f9561c61c0d2f84f3ba170fcd8e0f9d3956a4c ofl/norican/OFL.txt +sha256 4f8b437578b20bff261adfe6c02f63bcf7dbb6a45ab37804b3547e5d5f44927b ofl/nosifercaps/OFL.txt +sha256 b41b99f35b507564e54f6b2f5162ad1c21f94a16837c632da6632b376a341f42 ofl/nosifer/OFL.txt +sha256 fa28ba897eb819768d6bc00c30aa03ef560e80e5f6fb872eaea089c66992f502 ofl/notable/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/nothingyoucoulddo/OFL.txt +sha256 f2ab7e5c5c750fa03a8d8f64c72a089ed86fbd3dc172440fcc704b27816d5957 ofl/noticiatext/OFL.txt +sha256 531b0954400dc0026fd55302be06c665c895d2795819d1d18a642652afee1a7a ofl/notocoloremojicompattest/OFL.txt +sha256 ac564676d10054a8445923dfc2dfb13c042d97888bd27c1b6ec6dfe89a9d8d62 ofl/notocoloremoji/OFL.txt +sha256 500bb1ccf43df7bbb522112f9133a52b16e1c35e809632f5d8609b179152de5b ofl/notoemoji/OFL.txt +sha256 2481cfe088b756d7e841ecdff6e3ec6efa9486a711b06a74a464f3fcc986e0ef ofl/notokufiarabic/OFL.txt +sha256 1679cb60544990b4c2445320c6d5298e4bb0c08ff00dbb5a526f3793fdaa1e6f ofl/notomusic/OFL.txt +sha256 07fc70bfeb985cc1a87a8587d0a0c80bab11c86c9dc3fd95b6f0cb332f983e96 ofl/notonaskharabic/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notonaskharabicui/OFL.txt +sha256 e90279e3fb2003c4d54f8685e25274bd7838b1b21c891520d71dbdb1d4a98907 ofl/notonastaliqurdu/OFL.txt +sha256 9b9fe028b5ba74d231659a1bbaf0ed09b11e759d1ca6a070999e16d151616b47 ofl/notorashihebrew/OFL.txt +sha256 0e86b3990089b054d8e6a29520589ac7ff3926738e2868e20d1b7f137d337d14 ofl/notosansadlam/OFL.txt +sha256 0e86b3990089b054d8e6a29520589ac7ff3926738e2868e20d1b7f137d337d14 ofl/notosansadlamunjoined/OFL.txt +sha256 38a991a0d87537daefe1a2332edcffdb599bf9670533badbbfc98f881b8f817c ofl/notosansanatolianhieroglyphs/OFL.txt +sha256 07fc70bfeb985cc1a87a8587d0a0c80bab11c86c9dc3fd95b6f0cb332f983e96 ofl/notosansarabic/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansarabicui/OFL.txt +sha256 0468358b316f69f405b55cadf8a8314e16e3610b8feaad96772bd5d968112d02 ofl/notosansarmenian/OFL.txt +sha256 3554a83d7ac9f12aefb36a548e6c88fe1a71711d5c57f86001305c78a5c03152 ofl/notosansavestan/OFL.txt +sha256 11bc477b31ec9e66f86bf6f64c060dde84b34ed49582d881657b472c33c4e1e9 ofl/notosansbalinese/OFL.txt +sha256 3dd4cce0a3d3405f7b690bc10bc2c78f2d2feb448c8f88b604bed2f33892d892 ofl/notosansbamum/OFL.txt +sha256 287edd17552fbfffb8b695582889adad29672599d654cf53d820aace29208256 ofl/notosansbassavah/OFL.txt +sha256 ff0723191d946fd4c7e53effb67b3b5b25b1c3f3aa85f5244230fa2580a8fc1b ofl/notosansbatak/OFL.txt +sha256 754f0e221aa7d5a915489f3bf1f20fe53ddc35ab2834a4d91656d78f9622de70 ofl/notosansbengali/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansbengaliui/OFL.txt +sha256 55acad617cc72f630484d7cef2c12074a818df03eea7d89d6d595c663fc92fc5 ofl/notosansbhaiksuki/OFL.txt +sha256 46d6caa05a24bda40dd8c1d073c3857b69738b856a8b644238104a62bf2cd6d1 ofl/notosansbrahmi/OFL.txt +sha256 1b63982dfebd74eab553a4aa303bc18811d9f136f82e20c37df7262ce3125bca ofl/notosansbuginese/OFL.txt +sha256 6c127a87daaa23faca73b3607879fe6f86799e3948d07275800b54b805610294 ofl/notosansbuhid/OFL.txt +sha256 507cc466e43d021662b9e9320a55a81798d293ed6a4a80c8d519f917bd90fdeb ofl/notosanscanadianaboriginal/OFL.txt +sha256 8d161a6467a3b032c852f311d23a8df336d2152ca9e4b236c8b6e2ed49199068 ofl/notosanscarian/OFL.txt +sha256 9fcb74e139ee491def8fd25fb9a651310594a0dd232616030fc8d304a7c9d0c0 ofl/notosanscaucasianalbanian/OFL.txt +sha256 4f95be0c30353cefed3d98051bb6762754893267ddbe123783cf92e8aa6f787f ofl/notosanschakma/OFL.txt +sha256 dcbc971844d8db052a5fe3adfb8bce4e56788986fee96f9c7bfbf56ef519b9c9 ofl/notosanscham/OFL.txt +sha256 d7f9ca0cf1b9bcb7e94697bce31b2ec7a5571c51deb8f1f2f411ddf9a67859dd ofl/notosanscherokee/OFL.txt +sha256 9154669974b25a4694c515f835bcc6a354291df78a57fa167ac8b3946a8c2ce0 ofl/notosanschorasmian/OFL.txt +sha256 322570ceef6e9935b2422470682e42481903eb444fc416455c32c2c3c888c78c ofl/notosanscoptic/OFL.txt +sha256 83e16aed35737ea80911a82938ad4bfe762fde24928010c2c80d21ece07bec14 ofl/notosanscuneiform/OFL.txt +sha256 18f3c4770aae15b8f60a8d4e5a7d7e7065fbcca195d6fa8ca23fd10374647b0a ofl/notosanscypriot/OFL.txt +sha256 d3350b235b681746db9ca902f656cadf122769738f3cef76bc999df7d52bbd77 ofl/notosanscyprominoan/OFL.txt +sha256 cdfc75eeec8b7d71279b2412798808f2b7c5d70fe672ad624c3418b58ccd1c42 ofl/notosansdeseret/OFL.txt +sha256 a216f6f8d85c7228093e0ee5e258d9d377e6671f68acb4db1930b29583d0f331 ofl/notosansdevanagari/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansdevanagariui/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansdisplay/OFL.txt +sha256 b1b12c372165b0a2cf7533c7fa8b6568b8981d2e207a15d7bf631bd1910c4fe0 ofl/notosansduployan/OFL.txt +sha256 dc8114a49f5bb53bad3d99ee52cbb245e98076438d59428a258720258494de68 ofl/notosansegyptianhieroglyphs/OFL.txt +sha256 6abb98eea47fde30d4d334fc50f1ee26048e77f1e7f66172c682df8f8fd52a94 ofl/notosanselbasan/OFL.txt +sha256 bdfb572fad1e0d80331b02e52d9f2184a4e5b2b3991427eff95c1d816fbd2a77 ofl/notosanselymaic/OFL.txt +sha256 72606b23f312cb25973958f2892d4d2c2012deabadbf0f763232624a9649fc69 ofl/notosansethiopic/OFL.txt +sha256 8c02263c5d73d40544f9ed91e30c4e947407057a3cc430d7b786189aeceff6df ofl/notosansgeorgian/OFL.txt +sha256 246cab0cc2102b5f601447ab1d48f79d2ca2b23cc72ed7968efcbaa9bf9cccfe ofl/notosansglagolitic/OFL.txt +sha256 f7107137477d250fc49410833110c25ffd8b96a78b1a25e1f1b967e876070949 ofl/notosansgothic/OFL.txt +sha256 57ddd5a347bbe5f83d47a5a63679af4a3eb7f609f5a3d5c059ad12fd1fa29e21 ofl/notosansgrantha/OFL.txt +sha256 c0b88977aa18b5e4fd05d646d560da89fde61b6581fa4507cb00dd90bd1bf7d4 ofl/notosansgujarati/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansgujaratiui/OFL.txt +sha256 08143215e0afaca5ccf91aae3f575029f918b9177d5bc18e0c49dd838a5ba5f4 ofl/notosansgunjalagondi/OFL.txt +sha256 3f7451b7e2c8381be0c5712f7b0dd5c2d75fe787ae16a99f18b7fa45627a0fde ofl/notosansgurmukhi/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansgurmukhiui/OFL.txt +sha256 addc4a900f32e670a401766f144d6a1fc1bc7dffed87350e310ef1d68ba404f8 ofl/notosanshanifirohingya/OFL.txt +sha256 1d243377ac4633a4b10bb66cc07695c8432e93a611433fb5e91a2009cbd2616f ofl/notosanshanunoo/OFL.txt +sha256 910456012f8244afa9af0d21863a0d637e62b20af4d935350b8635c9664860c0 ofl/notosanshatran/OFL.txt +sha256 9b9fe028b5ba74d231659a1bbaf0ed09b11e759d1ca6a070999e16d151616b47 ofl/notosanshebrew/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notosanshk/OFL.txt +sha256 965a8053ceb55292d06262810224e7e283015545a73bcb0e0c5931bdcc982aa7 ofl/notosansimperialaramaic/OFL.txt +sha256 5bc7346cabfde1fbca124566f67198f154d5d356e022639f2406f087def374f2 ofl/notosansindicsiyaqnumbers/OFL.txt +sha256 0e246b748c637c88e8e0c34d5c1d27fe46bf477738653e46055df5c015c24ded ofl/notosansinscriptionalpahlavi/OFL.txt +sha256 34db797c6a8f7bba182a70971aa9191af6265864ec804339f7a4d2a05afed33e ofl/notosansinscriptionalparthian/OFL.txt +sha256 8a5665bd3b16a64f953b24a71f12e298f5233be8a4ed17424129c5524a397892 ofl/notosansjavanese/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notosansjp/OFL.txt +sha256 319dab1a833d34ed8b4bedcb9076c53bc0c9e5bc48c011b93eb294d3631d6d65 ofl/notosanskaithi/OFL.txt +sha256 9d49a4e56df9b36403b139f48bf07fd87cc5e716cb3203c54b04b674adb16238 ofl/notosanskannada/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosanskannadaui/OFL.txt +sha256 13a37d6fb70d8c4c04f2b8452731029208427934ba4151dd1e8221f006950e3d ofl/notosanskawi/OFL.txt +sha256 e053c471ccf7602350e2f9f77bb479dfadc040173ce4e50309dba9ce1ae7e09a ofl/notosanskayahli/OFL.txt +sha256 b3928e46f902b1d6d7108c8e9d5c08599b1c5c3e02bdec8a2e21a184c9a19e13 ofl/notosanskharoshthi/OFL.txt +sha256 be0407f060aea48787ff9e75d8d3aedef70aef113b3ce9aca26fdaacd10b1870 ofl/notosanskhmer/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosanskhmerui/OFL.txt +sha256 82ead5cfe70167960007329171dcffe99886373b3159619e596e84f08890234c ofl/notosanskhojki/OFL.txt +sha256 fc41afc2ff35b773da629641500b5b99d8243f121571c10b54cceabe516330b3 ofl/notosanskhudawadi/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notosanskr/OFL.txt +sha256 a42993999944845fb5af693ea678a372a053db1f0981d55e911dcfa9d330f279 ofl/notosanslaolooped/OFL.txt +sha256 a42993999944845fb5af693ea678a372a053db1f0981d55e911dcfa9d330f279 ofl/notosanslao/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosanslaoui/OFL.txt +sha256 d6a4fe388105d6738b6f56eae2b43368a58e6191d5d62d9e9440b38b4d32547f ofl/notosanslepcha/OFL.txt +sha256 9745259e135d9de74a122c6498a830a1e45c59b75677821f42e11691e769deec ofl/notosanslimbu/OFL.txt +sha256 a67a01aefe12fa20a386b1dcd45b36a82b9c71c27cbef6b4b359ff9c9a816ded ofl/notosanslineara/OFL.txt +sha256 bc7112fdaa4a03fd869deca0d0454cd34fa575663a194cec9578da5489f713b3 ofl/notosanslinearb/OFL.txt +sha256 1f65bfdc26d6bd6e57249c60a86ea355761fb9150694e50206175d3fa8d3c166 ofl/notosanslisu/OFL.txt +sha256 43ade220daeb7c8f610c4ca136304710e4eb910f64627d6010ddf9fe2fe18cf8 ofl/notosanslycian/OFL.txt +sha256 3a4d46fda7223bbdc698882822b43b3650432f8895b9b62c7f01bbf889990aa0 ofl/notosanslydian/OFL.txt +sha256 3c695b36fef73588d0a192dad666b2956d15582f66289a85a3d55705e4cd454a ofl/notosansmahajani/OFL.txt +sha256 1df18163a0bf60f02131401ba1609df90051f40c4047684dda1c8a2e9586f7f2 ofl/notosansmalayalam/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansmalayalamui/OFL.txt +sha256 0a3a51e5b087d142502e86b8003f78e82ed7bbb3f232e8d45f202591b29dc119 ofl/notosansmandaic/OFL.txt +sha256 b1d3bb52a18917b0fe332721a4cd438d601fe9439d4359e36cc33d90c29c39d6 ofl/notosansmanichaean/OFL.txt +sha256 60359568c6c75e3337f971f8af1d9d025d111d001707206b1fb1c64017378ae5 ofl/notosansmarchen/OFL.txt +sha256 4fa8727beab4099775b4e6e67a636c423755679e54bc23208e323897e1f34e88 ofl/notosansmasaramgondi/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansmath/OFL.txt +sha256 4ea975c31fc83692252a4c19382bbd539e7a06afa2eaacdad4ef433132cf64bc ofl/notosansmayannumerals/OFL.txt +sha256 47755a5e817c401cdca376815aae527195d333688277cce00a542b83ed532fa7 ofl/notosansmedefaidrin/OFL.txt +sha256 5dbbaac416c9c5021f3409d1157419c0bfe5089ef39a373c49a632eefdc639d8 ofl/notosansmeeteimayek/OFL.txt +sha256 e87457c702ba140cd0c6b319e75eac02c1e74c80c2f522cbc7b9ea5315b98ecd ofl/notosansmendekikakui/OFL.txt +sha256 1dfb3d4b1c7a31bf3de390189cf46f30eef4a45f43523437d09c1339e6b3a194 ofl/notosansmeroitic/OFL.txt +sha256 8d8b751f6af44eae099f1debc858a93646e88d9d6a0a43573e9785383fcb3bdb ofl/notosansmiao/OFL.txt +sha256 fc8470520ea4c92c2430e6cb57b6d92bc1aabff954292ce8f20db2c5465d4a25 ofl/notosansmodi/OFL.txt +sha256 b0158b3c0b16c20e22ea662850503a7980111c5c704501e942cc1a7ed12dc011 ofl/notosansmongolian/OFL.txt +sha256 cee9892f9f0cc8fe882c9e9537ee6a89621d86ee7ceaf70b02e2b2b1c25c061a ofl/notosansmono/OFL.txt +sha256 4db1c3aa73647bb9ad9b0137917e3e335ed1e7286c1764db707e3f5836a766d1 ofl/notosansmro/OFL.txt +sha256 a1b3ca46173087cac8b37010a23bd72edab3fd104ea8ef6cc0ff282078df52e4 ofl/notosansmultani/OFL.txt +sha256 246a75859267af7da466823969d2e2b407ed8455ee5f74f4c8d63d8783be9b57 ofl/notosansmyanmar/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansmyanmarui/OFL.txt +sha256 d1d3fa924183e4c4f14d17fd5bdd2b1ab3e433c898bb2cb6074b5cf331c22485 ofl/notosansnabataean/OFL.txt +sha256 76011376f7892fb18a4eb84f662483b112270a1dcf0be20d4041ec19490f6fd2 ofl/notosansnagmundari/OFL.txt +sha256 1b03662d65f124e6333ccf45d389154e42028c8eee158b28ccba7ce344723b80 ofl/notosansnandinagari/OFL.txt +sha256 39b6d4531cfac5e6004bf5f34668bf1ce50ef3b1f2cbe0b2ecc432949a45c6dd ofl/notosansnewa/OFL.txt +sha256 c689158356ee339a27b56c95a802dc5980b7d654586fa44b5ccdd3d5c7230c2f ofl/notosansnewtailue/OFL.txt +sha256 ddddb5913f75b8f4af1e50386b5ecdfa909b58685994f120b116a3ae5a1c8c48 ofl/notosansnko/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansnko_todelist/OFL.txt +sha256 ddddb5913f75b8f4af1e50386b5ecdfa909b58685994f120b116a3ae5a1c8c48 ofl/notosansnkounjoined/OFL.txt +sha256 1cabb5c007be074c36e1a390b591265c31fa910d20d73af57e13093928f8cac0 ofl/notosansnushu/OFL.txt +sha256 cee9892f9f0cc8fe882c9e9537ee6a89621d86ee7ceaf70b02e2b2b1c25c061a ofl/notosans/OFL.txt +sha256 d5e3e9b305ff13448c11cb348dce7f180eb42c961a53325c1339fdeeaec4e239 ofl/notosansogham/OFL.txt +sha256 b30754bbe6bea30b666a60d513ae80435a197979c9500e8380f83acd99dc763b ofl/notosansolchiki/OFL.txt +sha256 8b78300a14978656a55fac2ee73466ece7d6e9e9d8a4ba770f81ed92f3ec8af4 ofl/notosansoldhungarian/OFL.txt +sha256 9c4cef96698c8ecda3a659bd973b4880420afd9e105731e30631d62a0a75a482 ofl/notosansolditalic/OFL.txt +sha256 5f57555b16c41ca7ff067efefdb3eadfcb601d3d96263f5ba13ac017c770dc1b ofl/notosansoldnortharabian/OFL.txt +sha256 368ec41388919a8214a906db7ab1491a8b3588b81938d2c33225e607c8b5c564 ofl/notosansoldpermic/OFL.txt +sha256 002443fcdf6acb8cf7467b678bfba924396bbd47c64522500a48ba86fdc295d3 ofl/notosansoldpersian/OFL.txt +sha256 16ed6acd7df2afc8c37ef5bc269bcd17f8ef4878ec2ca4a7fe507660b3bdeb62 ofl/notosansoldsogdian/OFL.txt +sha256 22aac2446e3aa2fb1e02eb6aecde823aa7e13e3fbd89ed3bd8595905e1d37671 ofl/notosansoldsoutharabian/OFL.txt +sha256 7a86be07750ab3c83800ca157a5fcb7fb5642fdee16c4b5e2a8d75b9d8ac622e ofl/notosansoldturkic/OFL.txt +sha256 c90ff15ade263a49148e35af34e9c177c6d56881e81260b29f10123e9e227eca ofl/notosansoriya/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansoriyaui/OFL.txt +sha256 46683544b3fae35c1716ad6deead57b7363edfc369aabcd8d159250e3fce57ae ofl/notosansosage/OFL.txt +sha256 a912228f344a47ecb6e7f00c96f70a62033e18c028304bd0b23ce77c929621f4 ofl/notosansosmanya/OFL.txt +sha256 55c7d320c0be6098bd42e7665397f2f15b46ba6b1fad2708969bf073402d012e ofl/notosanspahawhhmong/OFL.txt +sha256 387a4cccbc74240911059aad6db9ab13be0c72a8d7cd98c94a63d6c3ece8f5e0 ofl/notosanspalmyrene/OFL.txt +sha256 ab62d184e7353d161ddea97e3aa400f9251a653b055dd5b030b07fede3bb546e ofl/notosanspaucinhau/OFL.txt +sha256 36c78621f9338739cd29fc770253fbb867be8934d36d6a172afc6bd56da4c138 ofl/notosansphagspa/OFL.txt +sha256 ff3760ba038fb0498a3cbfd3454fc983babefe2a0318a660cd7e70c9bcc3eece ofl/notosansphoenician/OFL.txt +sha256 14747a4aba5fd7a925205eb6b322d05dce2c3975ea44107b182df03978906058 ofl/notosanspsalterpahlavi/OFL.txt +sha256 6f14737b51d3231847a92f992f416ed1e2017235d6ac3c6e9e46ef2f9288a160 ofl/notosansrejang/OFL.txt +sha256 b0fbcb9eaf0f5f415358bfefa5999ee75e18cde4a275b78285b2140a9e381865 ofl/notosansrunic/OFL.txt +sha256 b5077d717d6cd64f06e8e4500eb103b0cb51dd95965d562e2ba3a0684e6c966f ofl/notosanssamaritan/OFL.txt +sha256 aef66e1a5ca98031d65b2284c24de0e66158703fe84a0bf339ac600c8e355c1a ofl/notosanssaurashtra/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notosanssc/OFL.txt +sha256 110e682353242abfe1529151fda818b381cb722b4d5a46388c13f55225e21b1b ofl/notosanssharada/OFL.txt +sha256 ce9ffedf88a403a1de82c6a58869ff84e7371453d844247babe40336de5f613b ofl/notosansshavian/OFL.txt +sha256 85610e60cd4cfa1395c27ada1f15ac5ba10b7b9f1eb343a66532105682d2c830 ofl/notosanssiddham/OFL.txt +sha256 5cd389912c5b7f1d1ae7c341968109343697a7bdabf69c0dabafb5b6b8cc5477 ofl/notosanssignwriting/OFL.txt +sha256 2d6f7c43bce61f4b1919379f901bc613484f5285f520b6d29bb7c1f31b17e841 ofl/notosanssinhala/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosanssinhalaui/OFL.txt +sha256 ade8e858dd1b48cae4781855440ae9ba83358a7f4f1ac8eadfb0ad90644b1775 ofl/notosanssogdian/OFL.txt +sha256 a95dc9b1eab6e384e5f14d125074cddac6108c30a829190cfedc973d571a59cf ofl/notosanssorasompeng/OFL.txt +sha256 a5f1c842c6b33865210dda255cbbc8257ce6f05e861129af3d45b887147cdcc3 ofl/notosanssoyombo/OFL.txt +sha256 2d42ae3d7f3522cfd45fcd4daffa698a1d7b5c13b2512593d0f993633fa428fa ofl/notosanssundanese/OFL.txt +sha256 5533f0addd3fcdfc8d784db3aeec631bb04f570961831ea2c384a4dbf2fcfc13 ofl/notosanssylotinagri/OFL.txt +sha256 b118dd41337806a5d4797052c77caf3bd096aed783e5eb21b4d11154351e1ac0 ofl/notosanssymbols2/OFL.txt +sha256 b118dd41337806a5d4797052c77caf3bd096aed783e5eb21b4d11154351e1ac0 ofl/notosanssymbols/OFL.txt +sha256 6442860dad2700aabece2ac7252680b1a5bfc0987cec1ca0c3d605ab8f0b7975 ofl/notosanssyriaceastern/OFL.txt +sha256 6442860dad2700aabece2ac7252680b1a5bfc0987cec1ca0c3d605ab8f0b7975 ofl/notosanssyriac/OFL.txt +sha256 34e8361b8799f1e37b199f0260a66a38f4359f42ed0f2dcf96e3650f6bff2cd9 ofl/notosanstagalog/OFL.txt +sha256 3c2f7990d23f5f5150ea8c8eab653a197ca191934cccbf09514afdae76b559b1 ofl/notosanstagbanwa/OFL.txt +sha256 01950566b02c4f25f237a1619129650852da6f664110f7bdaccdc60ba51b1b06 ofl/notosanstaile/OFL.txt +sha256 8cf7ad1fbb6cd4a3b1596f813d6e0d57f919f612a72c2e2603506489f9dbebc6 ofl/notosanstaitham/OFL.txt +sha256 12353b96af2837abbe42f486d99c487836d8d9778b058c37d920ca2ec0cc83a3 ofl/notosanstaiviet/OFL.txt +sha256 7289a413acc7fa6ec0a40f1c92652e02178fe3a36e2fee2f98af8ceada41b0a4 ofl/notosanstakri/OFL.txt +sha256 f8ff8ce7d0a81bf8d5e121c635ef027250c531f2fd37d5988b8dd6e45f19d7f1 ofl/notosanstamil/OFL.txt +sha256 f8ff8ce7d0a81bf8d5e121c635ef027250c531f2fd37d5988b8dd6e45f19d7f1 ofl/notosanstamilsupplement/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosanstamilui/OFL.txt +sha256 b4c6eab864c1283a5c1846d7b5467e70cdc58fac872123aeac0b966a9ab3169b ofl/notosanstangsa/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notosanstc/OFL.txt +sha256 481c72a8f1b4f645a7e6b10326be41b2da2c15cb470ff48a07fab773eed00102 ofl/notosanstelugu/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansteluguui/OFL.txt +sha256 5de6fbfe9ca25509fd60e47be3fab3cc236abe20bc1b123a5c2bd12f067fd13c ofl/notosansthaana/OFL.txt +sha256 2e98fd23a52d253db8612cd5942c8f2ff4111b21d2367050fdca91d8ccc374a0 ofl/notosansthailooped/OFL.txt +sha256 2e98fd23a52d253db8612cd5942c8f2ff4111b21d2367050fdca91d8ccc374a0 ofl/notosansthai/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansthaiui/OFL.txt +sha256 030b53206585ee108e261d15e3674ea3f8969cd59bbeccbd0028027a0eb22d6a ofl/notosanstifinagh/OFL.txt +sha256 9bf9c1ab9b7837bb65fb40dd7f6b706a28199cd633b80dcebe532bddc56594cb ofl/notosanstirhuta/OFL.txt +sha256 1c95c4c9e705f165c9577063a49b5e86914e2f38d62db454143b261bfee674c1 ofl/notosansugaritic/OFL.txt +sha256 765206100bc8ad011be3a0976323394c28f335c69c49de152c3bd8bd27cdb803 ofl/notosansvai/OFL.txt +sha256 d6269b9dcf2275996a5dbf660e3d2dda3cf0d74e9b470629e474c4adfe42f969 ofl/notosansvithkuqi/OFL.txt +sha256 50f044fdaa382fa03de22849f2b31906a56139df0dad90215fa60413dbc255e8 ofl/notosanswancho/OFL.txt +sha256 a97d2d7a91aa60fe67b6c9b77ff562fd0d29e1c27f667c650bd52f322ab0be88 ofl/notosanswarangciti/OFL.txt +sha256 e231e5bdb5cea3b5a3a9055d3ddc8ea9225dd9eb46db6404a8cd8b0cb5b0c4dc ofl/notosansyi/OFL.txt +sha256 bb3dc754adff0b5baa523c96e6ecc424df94b406b1f32ac19630905230ff0739 ofl/notosanszanabazarsquare/OFL.txt +sha256 33941759eab10afc82c8a166212be569a1e0bf40aa42f9987bdcabb2907c08ee ofl/notoserifahom/OFL.txt +sha256 0468358b316f69f405b55cadf8a8314e16e3610b8feaad96772bd5d968112d02 ofl/notoserifarmenian/OFL.txt +sha256 11bc477b31ec9e66f86bf6f64c060dde84b34ed49582d881657b472c33c4e1e9 ofl/notoserifbalinese/OFL.txt +sha256 754f0e221aa7d5a915489f3bf1f20fe53ddc35ab2834a4d91656d78f9622de70 ofl/notoserifbengali/OFL.txt +sha256 a216f6f8d85c7228093e0ee5e258d9d377e6671f68acb4db1930b29583d0f331 ofl/notoserifdevanagari/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifdisplay/OFL.txt +sha256 5e67c5a885cfcfd6ce8c2807e440c07091e3ea5432b2557b13611e3ce5b0691b ofl/notoserifdogra/OFL.txt +sha256 72606b23f312cb25973958f2892d4d2c2012deabadbf0f763232624a9649fc69 ofl/notoserifethiopic/OFL.txt +sha256 8c02263c5d73d40544f9ed91e30c4e947407057a3cc430d7b786189aeceff6df ofl/notoserifgeorgian/OFL.txt +sha256 57ddd5a347bbe5f83d47a5a63679af4a3eb7f609f5a3d5c059ad12fd1fa29e21 ofl/notoserifgrantha/OFL.txt +sha256 c0b88977aa18b5e4fd05d646d560da89fde61b6581fa4507cb00dd90bd1bf7d4 ofl/notoserifgujarati/OFL.txt +sha256 3f7451b7e2c8381be0c5712f7b0dd5c2d75fe787ae16a99f18b7fa45627a0fde ofl/notoserifgurmukhi/OFL.txt +sha256 9b9fe028b5ba74d231659a1bbaf0ed09b11e759d1ca6a070999e16d151616b47 ofl/notoserifhebrew/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notoserifhk/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifjp/OFL.txt +sha256 9d49a4e56df9b36403b139f48bf07fd87cc5e716cb3203c54b04b674adb16238 ofl/notoserifkannada/OFL.txt +sha256 58068590e3e02b923b3c8b7e94d3668aeeac58e9d7ecc05f3e5243c2ae385e55 ofl/notoserifkhitansmallscript/OFL.txt +sha256 be0407f060aea48787ff9e75d8d3aedef70aef113b3ce9aca26fdaacd10b1870 ofl/notoserifkhmer/OFL.txt +sha256 82ead5cfe70167960007329171dcffe99886373b3159619e596e84f08890234c ofl/notoserifkhojki/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifkr/OFL.txt +sha256 a42993999944845fb5af693ea678a372a053db1f0981d55e911dcfa9d330f279 ofl/notoseriflao/OFL.txt +sha256 d8f80a299c629ef4b73009b9e89c7ef4eee08c2a2ae5f595d81cf5db64c4af9b ofl/notoserifmakasar/OFL.txt +sha256 1df18163a0bf60f02131401ba1609df90051f40c4047684dda1c8a2e9586f7f2 ofl/notoserifmalayalam/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifmyanmar/OFL.txt +sha256 e13fc63364c2d60d1933e3a20c74a265d949f1e2321155db2b0df103f78d539e ofl/notoserifnphmong/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifnyiakengpuachuehmong/OFL.txt +sha256 cee9892f9f0cc8fe882c9e9537ee6a89621d86ee7ceaf70b02e2b2b1c25c061a ofl/notoserif/OFL.txt +sha256 ffa5a817150c87cb62d776029ac3773ae634f61b189d5c5cc352adf006000781 ofl/notoserifolduyghur/OFL.txt +sha256 c90ff15ade263a49148e35af34e9c177c6d56881e81260b29f10123e9e227eca ofl/notoseriforiya/OFL.txt +sha256 7f6a7ae1130aa5931a54f4a2bcfa63596178353391aaeae143a29d5f7101deaf ofl/notoserifottomansiyaq/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifsc/OFL.txt +sha256 2d6f7c43bce61f4b1919379f901bc613484f5285f520b6d29bb7c1f31b17e841 ofl/notoserifsinhala/OFL.txt +sha256 f8ff8ce7d0a81bf8d5e121c635ef027250c531f2fd37d5988b8dd6e45f19d7f1 ofl/notoseriftamil/OFL.txt +sha256 bd8b32c064be2225d55f878a689063c6f169ccd9e2792d7051f0d74cf4816f1b ofl/notoseriftangut/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoseriftc/OFL.txt +sha256 481c72a8f1b4f645a7e6b10326be41b2da2c15cb470ff48a07fab773eed00102 ofl/notoseriftelugu/OFL.txt +sha256 2e98fd23a52d253db8612cd5942c8f2ff4111b21d2367050fdca91d8ccc374a0 ofl/notoserifthai/OFL.txt +sha256 0077789fc3cb20f358278ba4c6437eb14ade97d4d3e3281eaa42853efcd9dc8b ofl/notoseriftibetan/OFL.txt +sha256 96d0164554d7c701933793a594fd0616f7b1a6d492262139876f96f91de59081 ofl/notoseriftoto/OFL.txt +sha256 d6269b9dcf2275996a5dbf660e3d2dda3cf0d74e9b470629e474c4adfe42f969 ofl/notoserifvithkuqi/OFL.txt +sha256 e54b92f7047e9de3276849387c4109fe77718bf608408ac2f9826188af442dfb ofl/notoserifyezidi/OFL.txt +sha256 1cabb5c007be074c36e1a390b591265c31fa910d20d73af57e13093928f8cac0 ofl/nototraditionalnushu/OFL.txt +sha256 b1b08ef05bc4e6e9bc16bc372e2a980d437aafa4de86c33baba37ba2651e9a90 ofl/notoznamennymusicalnotation/OFL.txt +sha256 5505d1a010ee0f2eeecdf624984d2a6170480adab3091170abbcedd85361f1b9 ofl/novacut/OFL.txt +sha256 d2f87f90d108a947f98c030d9d8e4bf27e761ce83f222453b9a7230c5fb309e1 ofl/novaflat/OFL.txt +sha256 197c3f48cff4df3d768230e0bbdbc4305d8b8b9041ea6fb5e00872af66adc5ae ofl/novamono/OFL.txt +sha256 bb655534b6c7bf3e547c1368a68a5b1032d0e96fd08b5cc75f3d7a78528784ef ofl/novaoval/OFL.txt +sha256 f1ef4c3ef43322403f5c30e4fb46496969cb5c34a2a6e7247b507254b69caa6a ofl/novaround/OFL.txt +sha256 9b1cfccef4a7e19f90e2901f808f3aec4335d3cc81f978453ad0c8ded14447a0 ofl/novascript/OFL.txt +sha256 42e7b456fee0d0dc86927579b3d2626d42bb0f4cc9778f3a92ca8ada4e46348e ofl/novaslim/OFL.txt +sha256 c0bcb72e68dd416db0bb9fcec7a7fa62321b0147cde00d8c8f82748e33aefd34 ofl/novasquare/OFL.txt +sha256 455755e2e7ce9dbac6beb3729c97c57d6f74a638dcb5be548ec953021fbdbfb3 ofl/ntr/OFL.txt +sha256 760fb433c515570f6b77ebc60299c2c91d5f03848c659452a9d2458b28935768 ofl/numans/OFL.txt +sha256 580df76c95a1ec5ab878ceb25bb3d85c6a076804e9c970c8c6972aea775fdf65 ofl/nunito/OFL.txt +sha256 efbb0c9e864cef973982d9a17567e6be5c3d1759695574586f3f18c7ecca064b ofl/nunitosans/OFL.txt +sha256 4a90b22c5b61d15805fc786aa22592a4e8b52c4ff5774a4bb2c1ae0cb79b083a ofl/nuosusil/OFL.txt +sha256 c8f4a6ae0810a3ad10e484b29b6a6d4bb6c6e60d900266970789c54227713fe2 ofl/odibeesans/OFL.txt +sha256 3f747f7502101ae1e66f6e794e1a37aa2967580239dc5b9d6a28fd7c0f3495e3 ofl/odormeanchey/OFL.txt +sha256 270ab96983ada2aace07b48f216b8e229b747a2d0fc1f8b32dc4d506c1058993 ofl/offside/OFL.txt +sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/oflsortsmillgoudytt/OFL.txt +sha256 053326baf9314c746e170e100766517d85ad78f5c9311123787e7d82b0ee7341 ofl/oi/OFL.txt +sha256 fc59ca3cd3bcb47bd4df597519111ec130c25cabcc57a8808dd2d243cdcec6ae ofl/oldenburg/OFL.txt +sha256 4faa2d9e2ce0a4b5b37e62ee6fafe474a539b31578f7214ed97cc3503aeb8ebd ofl/oldstandardtt/OFL.txt +sha256 1e535087b6db508ffce476d197d5198deede7a5e5eb5f3ada8c68f864e98c7f5 ofl/ole/OFL.txt +sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscript/OFL.txt +sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscriptswashcaps/OFL.txt +sha256 071195d8806e226faeee60259c28ca67b458227af5195a73f5cfcab06e3003bc ofl/onest/OFL.txt +sha256 a768f4c2b04f8e960236f9854c8afeb3626fb34927f25aa66aa7f1cc8cea715e ofl/ooohbaby/OFL.txt +sha256 fbbbcfef55318de350562559b671360de6d597112ecc5c73881b05092db89602 ofl/opensans/OFL.txt +sha256 d941c5b788d47aa469ee54e30f4c12d6a43c45a295f10c568bdf9772f2893b7b ofl/oranienbaum/OFL.txt +sha256 00f1783a4e7a52d945c0c4de689571b2db896493362651db2706b40c6fc1c330 ofl/orbit/OFL.txt +sha256 ab609b0e110d622435ff337cdf233288556e011bbf9bd0550be98846c0630819 ofl/orbitron/OFL.txt +sha256 96b7bc175186cd0153a9682a1c9bb1da7103ab13a83abef8026bc64582ca616f ofl/oregano/OFL.txt +sha256 14c21a0a12187e4d5e83914ffb2c976cc0f616ce1e0da80cb1f5a80f6a9b8709 ofl/orelegaone/OFL.txt +sha256 781433e63668e8f766a755b3df5e1a7100850d3a2fecaf5bc6d01d87888fb354 ofl/orienta/OFL.txt +sha256 173ea2d0bdda981829719623c35699e8c0e4aa508e0af12817ad7ccbfa4c6137 ofl/originalsurfer/OFL.txt +sha256 0fd731a904b729a4e02eaf5e8ebd06783edd9abe400e8882760160230675b652 ofl/oswald/OFL.txt +sha256 906375346809a46416faa9de00683ddf70dca62d2a9798acf9f75b2578898ae2 ofl/otomanopeeone/OFL.txt +sha256 c676351bf8576b9aba743cd5eaa8c0e7ee0d51f805d720447b4df4ddb6a2e416 ofl/outfit/OFL.txt +sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlock/OFL.txt +sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlocksc/OFL.txt +sha256 86e5ff25c701ec446d20b1a85b02ee6d36de8503a7288a4c948f5459809af1f0 ofl/overpassmono/OFL.txt +sha256 86e5ff25c701ec446d20b1a85b02ee6d36de8503a7288a4c948f5459809af1f0 ofl/overpass/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/overtherainbow/OFL.txt +sha256 008445a4d53fbd71bff9cf733bdfd841a1b15fb58ef3473f7bab4c456e3b2930 ofl/ovo/OFL.txt +sha256 fe17c0f2581d71b4e1ea7e636e7f4877c29223e11bb1dd1a871e8c3f2a86336b ofl/oxanium/OFL.txt +sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygenmono/OFL.txt +sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygen/OFL.txt +sha256 a47e5daeda73568969395c656823102678f2eefb0d7d7ecb47aac4cc17e42204 ofl/pacifico/OFL.txt +sha256 95449a2d36ed919703ee09d3d802e8321b489f20efa1bb375d140f0bb45c98aa ofl/padauk/OFL.txt +sha256 34553405dce90b2a0e6c5a544e3a17a40105473456c1dd028dcce1dc511a099e ofl/padyakkeexpandedone/OFL.txt +sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquindark/OFL.txt +sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquin/OFL.txt +sha256 3c1a085f9dbd44877f73b0e1e1917ab084eb79828328fba74323c3bcd4171c6a ofl/palettemosaic/OFL.txt +sha256 b4fc1d55ce610f255c5712f8169543f9610536d002deb99bbc99bfbba9f8a560 ofl/pangolin/OFL.txt +sha256 96c9adf4335fee2c0b8028009d85d6bf59e6bde8d378fe589f188b7390eae9ce ofl/paprika/OFL.txt +sha256 1dd84b611f4bed7f9ff9089e76a96337b187e6f283a4ab33bcb987f844f2c4db ofl/parisienne/OFL.txt +sha256 5802c9e3509199c7aa9a13ea410ae27febbc0cdea184bf7d227170fac703bba8 ofl/passeroone/OFL.txt +sha256 36c285c5472c625901d4a13da7e31c5ea6126678d31d56cf95572c49f27c8950 ofl/passionone/OFL.txt +sha256 06d7dd50c2cc2a10cf2b690511b139266051c5cc96548e9c32b4ca5eab3c0e7a ofl/passionsconflict/OFL.txt +sha256 66a018bdb4174781a473d6b26c9873a8b8ed5f5c8086bc18f1532f850f61cacd ofl/pathwayextreme/OFL.txt +sha256 ad4275c6aa3ddcf5ed3f0a788732e13ba57799b1d8deb00de3fc2a928ea70ea2 ofl/pathwaygothicone/OFL.txt +sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhand/OFL.txt +sha256 b554a7f57d54db7857d4d9b8dc56ebd347dc4f857fb4f1ce1a25c332dfbf484c ofl/patrickhandsc/OFL.txt +sha256 72060253bd481a8dc18664bb9117072dc07c0f0270a40617c230654821774850 ofl/pattaya/OFL.txt +sha256 cd2dea62cd4b0c5fb335cf07ff04fd5c4bacb49b8d6c2bbbef9766c663d79b1c ofl/patuaone/OFL.txt +sha256 75a77451968e55a1ab404bd953bd8778983e21116d507b890fbcf838e58c8e8b ofl/pavanam/OFL.txt +sha256 12404fcefccc3cb964cb2406510ba679b30f7d7ae689db08df5b455ae24b3feb ofl/paytoneone/OFL.txt +sha256 9263f9488a9ed1d5f4218581b642e0f054f9a20d208f1a53c19c9f7dbd27eaf2 ofl/peddana/OFL.txt sha256 e8dd8f53b2fa502ace0636debbe7e357c4888d8d02b8b41d6a9a22d3058a63dc ofl/peralta/OFL.txt -sha256 cdf5fc4014abe91588666a9592ec86200e5a4d743b4b6e05d28d47e850bbe5fa ofl/digitalnumbers/OFL.txt -sha256 f8c2225a5fdb50e2e75f98cf6e69f198571f605f1b7f6f7eacc0947e2fcdbe8d ofl/sreekrushnadevaraya/OFL.txt -sha256 a80ee908b60f5bec9c10b135d3da93730e2194107d1f7fd3f61bd8c1a97b3e0c ofl/yesteryear/OFL.txt +sha256 e8ed3488dac3452e67746a5ebac23bf5cf72a614b606a1f80a81ade4e0e6b03f ofl/petemoss/OFL.txt +sha256 cf5c4103b0ecf3c38e7c26768b5caf05e1b3e16d4d87b32d859b3c19ce7c216c ofl/petitformalscript/OFL.txt +sha256 a889ff77b75be8bcd1456ff147eb9dac647f3eb217fad50fb4877496884f6dcb ofl/petrona/OFL.txt +sha256 6e6efa9b0556d100cfe60690cff5d9be7144df77adabfd2c278dbfee451351ea ofl/phetsarath/OFL.txt +sha256 331c71cbd8f1d8a70cd6eec3d55553b64e6261a9bb0982fa12e6e48baca827c5 ofl/philosopher/OFL.txt +sha256 907fa104d1ab720c2d698e51035593f5e6ea5283bd34a6c7cbdad5d6715e68de ofl/phudu/OFL.txt +sha256 eb54463ef24368895c812c9117e677a59bd2379f80da85515e19b473f310e4ed ofl/piazzolla/OFL.txt +sha256 5b158abb3406e69b7408b562b7199f6ff55a41ea56e260b87176d693b0095e47 ofl/piedra/OFL.txt +sha256 26a2c5433d20b9bffb8b7314d2a91eb0f55492385b66b148559affbe03b6e462 ofl/pinyonscript/OFL.txt +sha256 e8ad3f3de5baeff6bac6e711d8c406e0a6b8a61d2944741532d8965d893a2681 ofl/pirataone/OFL.txt +sha256 b66ba46f511a851ab09998b5a5a9fdbb102545a3864cb993095e1745996873a7 ofl/pixelifysans/OFL.txt +sha256 2400b30a72d2b1555255b81625576dfb552584a19a9c85ad8d43ff77bceab13b ofl/plaster/OFL.txt +sha256 271ad2688ff6199bc86135839c27a980d4cb3d2fae3a68ec01e98cb8b529d953 ofl/playball/OFL.txt +sha256 566be814f8e96e93dfa16101331557eb6b5467e9e03f627c0910fe93ca12300e ofl/playfairdisplay/OFL.txt +sha256 e414e07f7a4da16ed47ebec80d52dd79f21d3ca42bc92385a755d8078a038814 ofl/playfairdisplaysc/OFL.txt +sha256 0d93adc203a3ad4cddc53e18b8241333a92c13ca796b21ef786b9057a6b51978 ofl/playfair/OFL.txt sha256 6d216cec166b6e139adaa599053dd49720c053e1f2adb4845de3cc9c3704344d ofl/play/OFL.txt -sha256 46751a31966477e3f038d1e5ff1146a33234a3a523a0e6a21be3221cba082a34 ofl/muktamahee/OFL.txt -sha256 505bb8f3c30f2006b4e02d250fda31ed94b651a35f1124a201ca1c405ce989af ofl/biryani/OFL.txt -sha256 5641212407f956b828bf632afc4bbb3344f461f82255ab56756d9e3e8604c7b1 ofl/martelsans/OFL.txt -sha256 1ed119b01f03187dbe2f5f89c95431b9a4ca46db604fd263164d8b4055189f46 ofl/lateef/OFL.txt -sha256 4938e917ac54665be1dd862f54634d991b39c5d1eef69345d66a5089e401bfb4 ofl/creteround/OFL.txt -sha256 9263f9488a9ed1d5f4218581b642e0f054f9a20d208f1a53c19c9f7dbd27eaf2 ofl/peddana/OFL.txt -sha256 e75ed24435d1711de0bebfaa621c3eb5564798c88cc0c1d1f8d529bbaae703a9 ofl/yanonekaffeesatz/OFL.txt +sha256 fe3f3a0bf33f5c06566d2d1192b36c7e364243d7b8ecd8f8a2715760d050a563 ofl/playpensans/OFL.txt +sha256 28f224e2db47301516a1e0839d2ae5bfc0249a40761116dbf0f0b731429143a1 ofl/playwriteco/OFL.txt +sha256 28f224e2db47301516a1e0839d2ae5bfc0249a40761116dbf0f0b731429143a1 ofl/playwritefrtrad/OFL.txt +sha256 28f224e2db47301516a1e0839d2ae5bfc0249a40761116dbf0f0b731429143a1 ofl/playwritegbs/OFL.txt +sha256 995c7199cab65954f545996326755daee7b63cc6b42b06c13da1f9502ab08a99 ofl/plusjakartasans/OFL.txt +sha256 7076d4436e0908702b4dcd94974cdedb01770649b9cc4a13030ea8fb20889d0b ofl/podkova/OFL.txt +sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkovavfbeta/OFL.txt +sha256 24af1fb3ab8dfeddc83162b7f3b6c1104149b6c3022f1aa948ef4f8ff7e6bf7c ofl/poetsenone/OFL.txt sha256 708e33bed791c40638926a7577bcef8ff8748f84045f3825277540cbb8d483ba ofl/poiretone/OFL.txt -sha256 f1d1a3536fa4b9c71d04fe4c8d8bbfc0cc5c457d6883f45086b04d0bc07ed12d ofl/vastshadow/OFL.txt -sha256 f9f28345ffcd6cea6e3c6699e4579cd1948053d80fe89a6a5a2ecb269afc95f8 ofl/nikukyu/OFL.txt -sha256 c1bcd16ffc9d095822fd6b7fa1a24c7918b24815ed05711421f804293d2efa62 ofl/actor/OFL.txt -sha256 ae629d13b06d9afc5cf3c07d585f3192b89b7decaffc5c4dfcfa7ce11a2a2b11 ofl/raviprakash/OFL.txt +sha256 de318dcb99e332a746edb9f83180ee206fc3bce74ff96ad7d1cb219967ec74af ofl/pollerone/OFL.txt +sha256 21f7082f0893d6029ff6a2240e047b0f6ed8e8d54d7d1ff5dd947c9f469fbb07 ofl/poltawskinowy/OFL.txt +sha256 56edbe5fff7981dae6f6eff32f61ba04cd54324e5abfa44b1257b2a307ea561c ofl/poly/OFL.txt sha256 bdce62dd98db969b73f93f8e8e2151004c20ad871ceb15ad9bfcbdf2cf939dba ofl/pompiere/OFL.txt +sha256 6ea7a3ef1d07feb592693f3f22c26d0b09321ff81814292b49be99888d0da9d7 ofl/ponnala/OFL.txt +sha256 a247e9c11f1d488e94c40190b162ac871064dc639c0eae4ebc28013c89b599ec ofl/pontanosans/OFL.txt sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/poorstory/OFL.txt -sha256 757f49d04406c93c40d1781e7867fd85a1f9fdfbfe03a5ae332900da802fffc6 ofl/harmattan/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/khand/OFL.txt -sha256 74ba064d03f1f1c4a952da936c3eb71866c34404916734de3cae73b34357e59e ofl/lato/OFL.txt -sha256 94625b91cba99cf9c8e580febf5e738b2e3c7cde9034a16bcfb7538b672137e5 ofl/zcoolxiaowei/OFL.txt -sha256 3e908f3a95680bdf3c8456bfbf76392605b34cb3fba109e46441056ab966cb35 ofl/modernantiqua/OFL.txt -sha256 6a809aeba8af2115ca4b4c3597b1fbeb836a45f0489070f330f9c2dff870da8d ofl/galada/OFL.txt -sha256 2c3737ea83b48d48624068d1bbd1d9f8049eb7cf2e1f67435e420375c42e0686 ofl/spirax/OFL.txt -sha256 92f750829545386017c3418d890769778b76fd01dfb41c62fcbb0d42ba0303eb ofl/dorsa/OFL.txt -sha256 656a20870fbcb8f559f1c6308c1df90ac93d7cd0279aab49b43a43b5e58534e6 ofl/neucha/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/zeyada/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laosanspro/OFL.txt -sha256 33e3a83e377c6a41149044bd919f50d9a971d801052d4e0c0a98cb417b42ae38 ofl/risque/OFL.txt -sha256 b4fc1d55ce610f255c5712f8169543f9610536d002deb99bbc99bfbba9f8a560 ofl/pangolin/OFL.txt -sha256 511125dc85198375795fdbc109d088654d3b7f9dbd3ccb7bf93d844aef0b153c ofl/ptmono/OFL.txt -sha256 819e3b25f9b50f12299a3db1638be3813efc6b938f2b86693a218d20ec4e3209 ofl/londrinashadow/OFL.txt -sha256 e3ea566dbf689a9110b2094f9f2e5d16d7ec31720147651efc1005ca20420dd4 ofl/flamenco/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowcondensed/OFL.txt +sha256 6be04893d770899a015649c7aa3b582f871b272f8747a92b78b17c3e5c8b2573 ofl/poppins/OFL.txt +sha256 ac55580be2df22a06d29a47501e2ae11e1d399620f5a779e17a66f016ba6d5ff ofl/portersansblock/OFL.txt +sha256 021d5f1df697848da51620394659187be77cbe382ff2f896bc84ffb89c0c2d52 ofl/portlligatsans/OFL.txt +sha256 e37fcc467040ecd81bf4cf59c99ef56b20f57918995e82b3de1d5b4e931bc2e6 ofl/portlligatslab/OFL.txt +sha256 fe55933bcfad354914050fe0e7c879bd666a623f1e363a651198ac40c271cd26 ofl/pottaone/OFL.txt +sha256 2dab153a33dcb2101bba3f194d27d953c848a0fabf2e336650a81f84a0c33b3f ofl/pragatinarrow/OFL.txt +sha256 2988632106d61639fba8e4a6310da2c4c9376795c9c2e84ad24e23031bf40ecf ofl/praise/OFL.txt +sha256 d10e72fe42afb7abab9185139f761074897e5cfe8d1e1d503ac6cd8dc02fbddf ofl/preahvihear/OFL.txt sha256 705960c3281a5765ecc0b59bd4ed7ca59eed165748076bc2fc3e8fdbfeb944b0 ofl/pressstart2p/OFL.txt -sha256 7e896665d0863d2a17a671001dbe2528a5f9302f1dff9222af8b0834e9088d0c ofl/kiranghaerang/OFL.txt -sha256 5f1f5510eff7922864bf326ffa1d4a62f01add5193e9367b542378e5a808b500 ofl/handlee/OFL.txt -sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivonarrow/OFL.txt -sha256 82831e8f12ecb6deb2f4d9919a04049895b4619e0301fa6b699c861bd7311c54 ofl/kavoon/OFL.txt -sha256 1a5e3792a425687a523fc7c0f8ab5d01d58bf853149d57f3dec4b4fc6932fcf6 ofl/hanuman/OFL.txt -sha256 7f91d7d8854e5cb4fc630807c0f4d57c07777769dc597173fe0aef5e58f0992c ofl/qwigley/OFL.txt -sha256 354b4be0340cd58e381fdf58793a108897bf944a7f8faf9e877c476ed6c730d1 ofl/convergence/OFL.txt -sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygenmono/OFL.txt -sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinate/OFL.txt -sha256 4dbbe5c21b46f2647d227dde69b971a1b46de1435e0752a9eda1ce120725a93c ofl/norican/OFL.txt -sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanalei/OFL.txt -sha256 56edbe5fff7981dae6f6eff32f61ba04cd54324e5abfa44b1257b2a307ea561c ofl/poly/OFL.txt -sha256 59bda6b53e28d388de5eac7bbb8f3e65889dc8489be3d922f95a525354110c0e ofl/tharlon/OFL.txt -sha256 3fa0ceff4b9a2d28dde43bc63cde3acfb5e6e92d13a53e484ca0e501e18c7e2e ofl/lekton/OFL.txt -sha256 ad9ce814ff266b57d3c4698d3fadca4b41a6f942a0ddd215db5cc66abf92d668 ofl/mako/OFL.txt -sha256 c4afe82f49c05689c40dd4e262803b29c6e611e7b4efd3a0418f574b2be79d9a ofl/carterone/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/karma/OFL.txt -sha256 d38acce513eccb51d7ac34ca47be279e1fcfdeca1ed088bdd2d281dc6ca939ee ofl/badscript/OFL.txt -sha256 31eb7046f4c80e0f96944c4b40b0772de68b34783b794fc13aab3f54c2ef6d9b ofl/thasadith/OFL.txt -sha256 06c79c896894160a5810d869a822fa7d02a0e2ccffd97920b8cf3b880380f6e5 ofl/amstelvaralpha/OFL.txt -sha256 4faa2d9e2ce0a4b5b37e62ee6fafe474a539b31578f7214ed97cc3503aeb8ebd ofl/oldstandardtt/OFL.txt -sha256 1e511bb01d29562932157365418c02d954d8faeef794bcd54729177fb2b03db0 ofl/istokweb/OFL.txt -sha256 846e8cc6dc69bf685d2db14cfa758ff3d9d771d54c9e0d3b511f0ecb97ac0e8a ofl/cambay/OFL.txt -sha256 6c181f5a0045e8f414e1c232c35972ab83ea084ac44825f517ba001628d97b21 ofl/kronaone/OFL.txt -sha256 d7f96801a28ea11eaa51bc4a9c87fd91f2133bc298068e6e2847a15ddda23089 ofl/librecaslontext/OFL.txt -sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/sriracha/OFL.txt -sha256 22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276 ofl/merriweathersans/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39text/OFL.txt -sha256 5b26c88d163b1430561f53fd3d9021d6057f3c67d25534a5d8d232cfbf8ee2a4 ofl/wireone/OFL.txt -sha256 57f8d60cfe9212b971f07253e303746128edd06b21e3a0e4e188308e569f03e5 ofl/orienta/OFL.txt -sha256 c87702d8b70f714fbefb554660e8ca57a43ef62a59089d11cbf0c6bd51d56928 ofl/lohittamil/OFL.txt -sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejuhallasan/OFL.txt -sha256 9437c26410bcd543607a6775e7d0e359c1df3926d68c92dbaceb26ce79cc0fd3 ofl/bevan/OFL.txt -sha256 50265d2b41f8ad2dd350532d2286509aa694021b4aa0490b06f0068e4ed78c27 ofl/herrvonmuellerhoff/OFL.txt -sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeyemarrow/OFL.txt -sha256 1fac7a3e4e43b091c2d31aef7a375d2b969c42b2d5fce8e2d40b5f7b1233ddb7 ofl/moul/OFL.txt -sha256 331c71cbd8f1d8a70cd6eec3d55553b64e6261a9bb0982fa12e6e48baca827c5 ofl/philosopher/OFL.txt -sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygen/OFL.txt -sha256 89418a3c7b5726c3f8828a7b7c3f1cad661cf5b7a1be3d2bd9ea243f8d9890c8 ofl/sniglet/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balooda/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/pridi/OFL.txt +sha256 3f0f27931c92453994176af3b1e7954f9aac39fe145374d6d08c47c822e82e59 ofl/princesssofia/OFL.txt +sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/prociono/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/prompt/OFL.txt +sha256 7039124ec9c84f9d637637da9f80158f0d3681c82d4e6a811053467f7c33d587 ofl/prostoone/OFL.txt +sha256 6828e2435964f939c9276ba052ff55b4ccd155b5fbbae9a16c53b1691531fccf ofl/protestguerrilla/OFL.txt +sha256 6828e2435964f939c9276ba052ff55b4ccd155b5fbbae9a16c53b1691531fccf ofl/protestrevolution/OFL.txt +sha256 6828e2435964f939c9276ba052ff55b4ccd155b5fbbae9a16c53b1691531fccf ofl/protestriot/OFL.txt +sha256 6828e2435964f939c9276ba052ff55b4ccd155b5fbbae9a16c53b1691531fccf ofl/proteststrike/OFL.txt +sha256 a68d8ec6bea7f277053ae93bf563d4b97c233f09f8e79f86ffe5db66f31fdddf ofl/prozalibre/OFL.txt +sha256 511125dc85198375795fdbc109d088654d3b7f9dbd3ccb7bf93d844aef0b153c ofl/ptmono/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsanscaption/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsansnarrow/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsans/OFL.txt +sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserifcaption/OFL.txt +sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserif/OFL.txt +sha256 157a9e77f7580246e97c769490e2e977ae94399f9d30f4556015c41fe8c28bac ofl/publicsans/OFL.txt +sha256 fdc9b4ddc3c811c2ece4c4a11a2126115bc087ec0e1ffbca5f379865a9aa18c9 ofl/puppiesplay/OFL.txt +sha256 5f5dbf452c1657370d9280b50d647212a53c80acae6d78e0b5e8c2b26dc62b09 ofl/puritan/OFL.txt sha256 89d9d01291eeb91074ccf1f7ce07e7a1d9d421ec1191f8e84d440cb50830ed92 ofl/purplepurse/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloopaaji/OFL.txt -sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeye/OFL.txt -sha256 f938d4076b66a13cf984ce88d92a07ff9802e8ae5e1f4a28cdc43fad122ae611 ofl/spinnaker/OFL.txt -sha256 89bf0833b785c49b0f271273ab440bdc20c85bf0322537dc901df940bf1579da ofl/amarante/OFL.txt -sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhand/OFL.txt +sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b ofl/pushster/OFL.txt +sha256 0f1071ef57cf3ed05972b47cc979ed6bb9ce323342f4a07dfd188e49efae3190 ofl/qahiri/OFL.txt +sha256 3747fdcbfe4f51d6a2f101c35105bacde3715b3c32b34b6b03e5fb37983f89fc ofl/quando/OFL.txt +sha256 25995bcf8e8ddea1aafa5449870567cbbeae7e26b27ba30aca5642f2c02e9757 ofl/quantico/OFL.txt sha256 684ef102ca4c5ff61cf1c1e5c2c6326f3c26f848446f98b8862dcca716a87601 ofl/quattrocento/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rozhaone/OFL.txt -sha256 61be7c29f4835e2be7243db12213d75d53ff028f29f4b493212a1688b1d3a1ba ofl/titanone/OFL.txt -sha256 9df0700fcd0ef48abd74459a8650d35f59397fbaa00c5b00527e57cc155689c0 ofl/durusans/OFL.txt -sha256 b1958132ff727bd74409aa37ec0abbe4be13b1b379e1210e6fb77fc608c607d5 ofl/kodchasan/OFL.txt -sha256 f1888ed385b528866a472d02f4e06ef0873aca5b3c63ff1f6116cbb150dc9a13 ofl/metal/OFL.txt -sha256 e36d420a3b382b337c386338d8abc3635e10de5dfca7f822fc63ac659a0dcfc3 ofl/amaticasc/OFL.txt -sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscript/OFL.txt -sha256 60ddc0ee6e443b78940b5f92bcbab76c98ec6965e0da9fbdaf267383ab72bba8 ofl/anticdidone/OFL.txt -sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothic/OFL.txt -sha256 3184f6a99f589c78740fbff6ddaaabb43b8cc2f3852da36e60aeb024ea8d6f00 ofl/eaglelake/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/halant/OFL.txt -sha256 9a9f089005f389717106bb3ba427cda9bd51b8a477078644566543f2a60ca85d ofl/rambla/OFL.txt -sha256 99d2f30e282d6174af8ff68597f58bb53c0dcb2b104a4c1b8d19da49021d00d3 ofl/unifrakturcook/OFL.txt -sha256 2bb0c0200723d923f8e20d08b8bd1c7af7f5cef8bb2d63ce44bd268b54334621 ofl/fjallaone/OFL.txt -sha256 72afba97d1ac9409a9fd3bb91a02a639427ca1988977909dad273e293a508d7e ofl/staatliches/OFL.txt -sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b ofl/lobster/OFL.txt -sha256 955655cafa13f187f45a79dcf451942fd1118a8426abc5a25ffc5dbb00709da6 ofl/juliussansone/OFL.txt -sha256 9e1c955538817c3fab7160cb3110501e73ce109eeb58c4992a14e8323d900849 ofl/pecita/OFL.txt -sha256 96d82a96abc02fb457ddde0227833dbde9d1d02876c91f0a4e27845ca0d692fa ofl/atomicage/OFL.txt -sha256 7729f005b7a087368e2cf61fc4b65cdc85988e47d0e6e38c93a72de345e86b41 ofl/newscycle/OFL.txt -sha256 336fab6956d78eb34b50cd7bc6b16116c44735fbd0bf9f4def769ca4d8e218a9 ofl/sofia/OFL.txt -sha256 b26cae1321380296ba8311b632a397d5eac11b47197f9d0aa0b9310f1531ad60 ofl/sarabun/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/suezone/OFL.txt -sha256 d3711c90a7deda6210d30e41b945f16bdaa00662b30ee0b7c36abfee82525bfe ofl/kokoro/OFL.txt -sha256 513b7871a360a6eccd426bab59743fbff36764588f47381423f04ad6b3d821d9 ofl/alexbrush/OFL.txt -sha256 67f64c5509e5151796599e3ad47c3131cbe0c80c4f9430b90236a1249c2eacc9 ofl/roundedmplus1c/OFL.txt -sha256 4a7d2f227b91046ef7a54f8f735668d86e45f4fd4089268de292a6e9de108253 ofl/bentham/OFL.txt -sha256 3c187c861dc291b9f7f96f655656f9ac2d57b33da425bd5962810be728344f57 ofl/brunoacesc/OFL.txt -sha256 869e4c29978c318b33c2e5c7c8f24d2e947f249071bb1471620036a9d1ba87ad ofl/k2d/OFL.txt -sha256 6383249ddffbd87f2bbd7878ceba2dee0f1a2193cd7a4f41c00aaceb8e6d8b5b ofl/meriendaone/OFL.txt -sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/sortsmillgoudy/OFL.txt -sha256 d64c91b0306b53fabed08762068eea8b918d654fb0721c288f13cefa4aaf088c ofl/butterflykids/OFL.txt -sha256 bc1175730d609233043cde47e48f69831f012e85537c5ec1a2cf4836757c1540 ofl/mali/OFL.txt -sha256 fe5e822667a4b2e083b8fdd7a37546163f26f6481b58742236abffdcfb3e6c71 ofl/baijamjuree/OFL.txt -sha256 b0316f404a7b291e40921c605160181065791a5010a2d2d5691fc7e28cdbdff2 ofl/underdog/OFL.txt -sha256 c026db4c1a557cae47e6930876965f9cbc05758eb1f5d6f59b6b61c8f342a57f ofl/alice/OFL.txt -sha256 aad1e82802172d4c1d22dd015a5b8b4275e5665a49c1df54ed64716fca7ae194 ofl/corben/OFL.txt -sha256 878aec7282ab41d058cedbf90e14512bcb4fbd0658496de8c2dfc592ed1f0cd0 ofl/lilyscriptone/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglishsc/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/sarpanch/OFL.txt -sha256 aff3cea99bf300b4b29f4dc04867cf9b49d83de8c5ecaf991c446d506b56173e ofl/wendyone/OFL.txt -sha256 b054962de0af1397d5350fddb4d6bb20f5f2e073b543eeeb694c7c3b27144fc5 ofl/chivo/OFL.txt -sha256 19849b33c59d0cffeaad0dbdc38db767e95e03cd36fbbfe6b67a9878aa5758df ofl/fasthand/OFL.txt -sha256 a57810cbca0b4715ae8610dd7a268260cebbdd4fd76d304e371517f828150669 ofl/stoke/OFL.txt -sha256 47a0b7e315bc56ca0326fca46302d87d48a61e3528d4196e966b62f5bf0243f2 ofl/armata/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothic/OFL.txt -sha256 616e75d879831bedfa7725c078e09bb56f8a17f40b194e16691b12251bb42b3e ofl/majormonodisplay/OFL.txt -sha256 75c7ccf4f537a7a3ebbedd299c1d2542e13d3b27aaf76a0a2d9fa91a2a8fcd3a ofl/felipa/OFL.txt -sha256 ee2c069b30f3e9a5aaf52357117ee3443ee27f17c29a2ec68861db283379905c ofl/dynalight/OFL.txt -sha256 fbe0442a6b1ce162c95e241df76cab5ef2daf6a5ac84ae1a7a6749f32c051098 ofl/breeserif/OFL.txt -sha256 43d530580461a574f6dfed9e15af6a74e95f7c04d9bfa1174a63ff036e8eee07 ofl/rubikmonoone/OFL.txt -sha256 40bd3f35477284c021978816e9d3b8723ff2283fd7065fafaa5bb3004e41b237 ofl/songmyung/OFL.txt -sha256 460966d12f306a007930575c3b8bc336fe0c32f880d622af6d3b745a06ca79a4 ofl/benchnine/OFL.txt -sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreyasc/OFL.txt -sha256 0c922e2d65050677c26ae8dc501bc9ad3e0059c4b10df2fc9717d7bdacdfeb6d ofl/ramabhadra/OFL.txt -sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquindark/OFL.txt -sha256 e39d6ec64a37ed1523a59940695a61ea5e7882d9bbe0e7eb11653fda4b04fc79 ofl/kottaone/OFL.txt -sha256 1bfe7d2aca99042eabf37079152fef8abdda2c36dad454ae89b858a3cb1078c5 ofl/forum/OFL.txt -sha256 5505d1a010ee0f2eeecdf624984d2a6170480adab3091170abbcedd85361f1b9 ofl/novacut/OFL.txt -sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellussc/OFL.txt +sha256 b00c646b7d04a6da1665a148815b8c589c1e05ed7e1febf7ccbd91758747cb03 ofl/quattrocentosans/OFL.txt +sha256 c9bcf9bea97a216657d25325f418f0fe7fd0bc847b3dbb3f1b5a05b207370608 ofl/questrial/OFL.txt +sha256 14d28541780d90f6577bb7abcc6f005bf6969614294e75c82abb8758a696ad46 ofl/quicksand/OFL.txt sha256 0786594992757ea0290ae4a490ab9249728f372adb13959c0c8ae4fec83057ff ofl/quintessential/OFL.txt -sha256 ca13e9cd1faaa6afb9e43dcb534a8984cec3218993fb4b436468a79a1657ee19 ofl/keaniaone/OFL.txt -sha256 760fb433c515570f6b77ebc60299c2c91d5f03848c659452a9d2458b28935768 ofl/numans/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantunicase/OFL.txt -sha256 1d1b7f3480c8d9b65c26d205e41dcbfa85731588d6ea50bccfa78e91f242d629 ofl/loversquarrel/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/prompt/OFL.txt -sha256 eb6c70cb6b575ad22df022d454df7a20582915e6e8da19b579c6cbef37a26bb5 ofl/gafata/OFL.txt -sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilboswashcaps/OFL.txt -sha256 4579982a484a9745864de2cda666fd7b5017f9182b74dbb4cd53d84c1d1b2231 ofl/gruppo/OFL.txt -sha256 cd059851dc2abcd2865ae318e8b949736f958794210acb90316530fd100fc904 ofl/geo/OFL.txt -sha256 af9b97696048d509e3d70f8108b7c4381084f95c8fedd97acaa76b0b287668be ofl/molle/OFL.txt -sha256 6958d8c61b6b223f81bdc2109941e5d0004996dde61e197d628e0293f4f1bc58 ofl/miama/OFL.txt -sha256 7e98b49a12b51240c85b04eb0d9919a6fec7dbd491bef6cbddc22d3f851bd1f1 ofl/marmelad/OFL.txt -sha256 b9d592c3bf421197d9b7e353416b8e2ec81584988824b43d38c86d997a08b868 ofl/myanmarsanspro/OFL.txt -sha256 e414e07f7a4da16ed47ebec80d52dd79f21d3ca42bc92385a755d8078a038814 ofl/playfairdisplaysc/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairaextracondensed/OFL.txt -sha256 bc85bae0b512b799bbfb2b916e4d0a34cfd963d09778cd783e248b479e67760a ofl/comfortaa/OFL.txt -sha256 caa697668c3cf3e622753fb202c6c2e29648b94a3499dc7b869a14192e38c553 ofl/sourceserifpro/OFL.txt -sha256 81d6c3788a6b641cb9f543389d9d5c0cd3bf94fbb5639be19c102b9274c34291 ofl/mousememoirs/OFL.txt -sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/arya/OFL.txt -sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkornsc/OFL.txt -sha256 6506b2fa2a14259a8859608a6148a4591d67bbaef4d8e1948b43c4078561b0e5 ofl/tauri/OFL.txt -sha256 6cca1abc09d677cf00a55674ce2775e0eeb6dc5c0137b0401816680b9e500f81 ofl/marvel/OFL.txt -sha256 e98ce988fba1c138f4e7c0c5120809706ab1b24a3c29638ca83ab2ff082e08db ofl/chango/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairasemicondensed/OFL.txt -sha256 42e7b456fee0d0dc86927579b3d2626d42bb0f4cc9778f3a92ca8ada4e46348e ofl/novaslim/OFL.txt -sha256 1b8eef90c567309fef17962cc969dd9ed1de69176517238e744018bb983e7c1c ofl/mandali/OFL.txt -sha256 9e262d6d7fb789aab6a8ecc53fc9c78387eeb9f935dcd289282d8e751b6bf743 ofl/antonio/OFL.txt -sha256 07dbf75115edfc1fd75580aa19c4c730201a099e8f86a9869887dfbed0547266 ofl/offside/OFL.txt -sha256 f177d98c67b84250ec87a03ca6ad161e84cab15b435e960039b971797a065f4a ofl/martel/OFL.txt -sha256 bb3e8082faf86b1474a6b042125ef0f83669d28110b72f70416a7587b7b9f144 ofl/unlock/OFL.txt -sha256 c4955dfe15a5db10326aa58ef767460c42cd12a3acdb3e698eee2704eb373d94 ofl/electrolize/OFL.txt -sha256 cf6dd07485d67d20f105afb9981dffdb6b180b59af45a228839cf3fb0277c9fb ofl/arapey/OFL.txt -sha256 87e8d9aca71dbe0481ba8611fc90d7e3aebfa3e2546420c403e7078898b0c484 ofl/allura/OFL.txt -sha256 55e13d77a4457aa9c60f10c5b97baea3343d3bac30960d49554a033cb9eaff7c ofl/sail/OFL.txt +sha256 bff9838fb62b99b45b3b976fdd842f5aa43b02b5f84bd28e949834096c5fffb7 ofl/qwigley/OFL.txt +sha256 893e23589ddf2536380e3ad01f2780c726919566440915971d58faef5247161f ofl/qwitchergrypen/OFL.txt +sha256 cdcc959c42ab255b4cea4bd82f2db5c24a2da7ecabe615d02d5a5dba3716e446 ofl/racingsansone/OFL.txt +sha256 86b4932ef0e19f8fd573ec941c3e121ae80771187ad1b854ae2b52525d452544 ofl/radiocanada/OFL.txt +sha256 a3b0977c5c25101d45054cf9199b9127b05fddc79d4da7dcf400821824e5a6d0 ofl/radley/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rajdhani/OFL.txt +sha256 5c36e7ec460b285185ea23847aa1f508708d9ce15d5c055279defd022972f836 ofl/rakkas/OFL.txt +sha256 e31de7000a2a13b2e54ad01e788fd29e979fe05ea1fded44d6e71cc06e33bb2b ofl/ralewaydots/OFL.txt +sha256 7e946cf1171784d1015279e7dc35f827957a6b5d1f1f659ae0c98e5f5e37ed9b ofl/raleway/OFL.txt +sha256 0c922e2d65050677c26ae8dc501bc9ad3e0059c4b10df2fc9717d7bdacdfeb6d ofl/ramabhadra/OFL.txt +sha256 525411e604e7a1d85a4cd42641869f94388f04a6ed77829d6c4edd7fd740ceab ofl/ramaraja/OFL.txt +sha256 9a9f089005f389717106bb3ba427cda9bd51b8a477078644566543f2a60ca85d ofl/rambla/OFL.txt +sha256 af88d31020bb48a1f78f4384249814d04a44d22feeede2ff4ae79fbb4fcf74da ofl/rammettoone/OFL.txt +sha256 1286896706738557c1fb98f0f66006d4ca675e475d681ca85976fd0da9daa353 ofl/rampartone/OFL.txt +sha256 0fc8e6675568c02aac6b41dd3cccaf2264fc5969601effe68e09b26635879b2c ofl/ranchers/OFL.txt +sha256 8c22fb3866eaebd77a2cb8e8ecbb095381ff32300db57758326fef35a26132f5 ofl/ranga/OFL.txt +sha256 27d2d3c15cded787be66c6f51c4b24bea99863f4f162961b5088e4521c2e2bd5 ofl/rasa/OFL.txt +sha256 064539f87826887d2062b7823b2b97b7625d68b642f6c945c99c0b8dc8084195 ofl/rationale/OFL.txt +sha256 ae629d13b06d9afc5cf3c07d585f3192b89b7decaffc5c4dfcfa7ce11a2a2b11 ofl/raviprakash/OFL.txt +sha256 b41267a3903a45955f77b44596e080480c577fb7221df59672d0bc8cd8cd4b6f ofl/readexpro/OFL.txt +sha256 f9f539cf7549bd417159dbdb9c400943a5b60a7366c2c6fbde9f095173d82479 ofl/recursive/OFL.txt +sha256 ed836da2ff14b9b2d04001057e03c0531afdd2626bf66a612b17124589f58efa ofl/redacted/OFL.txt +sha256 ed836da2ff14b9b2d04001057e03c0531afdd2626bf66a612b17124589f58efa ofl/redactedscript/OFL.txt +sha256 e3477c603c48733e1be829b7611199427e8ec580401635011e59aa29e7277bc7 ofl/redditsans/OFL.txt +sha256 4f1417e27511207cd217656c964f1b0d8b0c4a30156a1a699cf16dc5eba0dff6 ofl/redhatdisplay/OFL.txt +sha256 4f1417e27511207cd217656c964f1b0d8b0c4a30156a1a699cf16dc5eba0dff6 ofl/redhatmono/OFL.txt +sha256 4f1417e27511207cd217656c964f1b0d8b0c4a30156a1a699cf16dc5eba0dff6 ofl/redhattext/OFL.txt +sha256 bb33f381066f9c041fa2266fb634a00b64caedd8301ce80926ba361d9a481464 ofl/redrose/OFL.txt +sha256 fedb204ccadda62524c5467136cef4968b6b67efdc6ca3e8752c1248d81e7f4e ofl/reemkufifun/OFL.txt +sha256 fedb204ccadda62524c5467136cef4968b6b67efdc6ca3e8752c1248d81e7f4e ofl/reemkufiink/OFL.txt +sha256 fedb204ccadda62524c5467136cef4968b6b67efdc6ca3e8752c1248d81e7f4e ofl/reemkufi/OFL.txt +sha256 fbb941b371c6348ee2572ce8c78fb66128a61885f960dec1906c4e44ca4b4d3c ofl/reeniebeanie/OFL.txt +sha256 2756c3dcd85ad997b742330f91332fb478afad302708d4149f7bcd4600543ce2 ofl/reggaeone/OFL.txt +sha256 2366789d24196c55c9a79058d3a56a3e659f0629cad97f47df83ace26396d7d6 ofl/rem/OFL.txt +sha256 453da5aa5ad479f38cfec84f83ea03fa89106e728e286272db8a4198d681a9db ofl/rethinksans/OFL.txt +sha256 a1580ba69a8d706bd95e1e72ee0b5cfda0a478fbbab6a4af13b4a9e1b28faac0 ofl/revalia/OFL.txt +sha256 0886960207bb5bcf81a46ce663bab6c52a742dad80ee2cff5cbcda6f1df88568 ofl/rhodiumlibre/OFL.txt +sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeyemarrow/OFL.txt +sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeye/OFL.txt sha256 1c5bc055869d5e9151ec7774082727db720ec4293c65be67f91a4bdcaeb02998 ofl/righteous/OFL.txt -sha256 de5ff32211a4340b01477af39ee339d639438955e409f79b666d4b9207f3c92c ofl/dohyeon/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/waitingforthesunrise/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglish/OFL.txt -sha256 44a7c6e4c5572392ae122d3b1d8c6ba6fd640a7797e675384585d947f2773e3c ofl/jua/OFL.txt -sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signikanegative/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantgaramond/OFL.txt -sha256 9ee6b2ec20a06c599a07412690876eb457bf192c10e886e60d8bdffb80bc21a3 ofl/sahitya/OFL.txt -sha256 dcc832bd71ea62cbf97f06327a1b5442905b49ea446801421d71f7d1362db215 ofl/dokdo/OFL.txt -sha256 8aa063e3a1299c5e1821f386f5ca8bc157ac561bd12c739ffa81c6f0821450c0 ofl/donegalone/OFL.txt -sha256 e588abf45ca2b19c340c4b27349c9b6b6e5e198316fd965128ed9f4422942cbe ofl/raleway/OFL.txt -sha256 9860b97028024085855e503e32c1971bfd603374641cd018c136433ebcf5a338 ofl/gravitasone/OFL.txt -sha256 ee9d043332991eb6bf2bd56fb04db3c558c1ee2f0cb9aa7b18366c77e34fef30 ofl/jura/OFL.txt -sha256 15b1a21c3fa37a475ba6b0c0cfe289c7952548caf6e432068ddaf98d139ce419 ofl/belleza/OFL.txt -sha256 c5a77946a56488790364d060628385d51226da62a18f30d2be0181d82ee62b00 ofl/suranna/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/megrim/OFL.txt -sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extendedtext/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/teko/OFL.txt -sha256 d324289a26909a519fb16c3d468a56ab909ad6d9070cac5742e5d59ad9bd9815 ofl/gildadisplay/OFL.txt -sha256 c0bcb72e68dd416db0bb9fcec7a7fa62321b0147cde00d8c8f82748e33aefd34 ofl/novasquare/OFL.txt -sha256 794d72ffdd25e8f7ca8e1d68db088c30ddbf2fdb369b6cc8217d4fa5fa6dc62f ofl/adobeblank/OFL.txt -sha256 806cb93632b8091cd36554642a96b2752bab50015da6a2b456d786c1f9aef5a5 ofl/carme/OFL.txt -sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasans/OFL.txt -sha256 08b6f5cceaefcf2881eb009adeb78edd0fabf9c8f0eaf8b88f07a690222227e6 ofl/varelaround/OFL.txt -sha256 3f0f27931c92453994176af3b1e7954f9aac39fe145374d6d08c47c822e82e59 ofl/princesssofia/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeoutline/OFL.txt -sha256 455397ca15d39e9178bbbf4b485a29187751d60f7ceb7829980a521d5ab6848d ofl/sofadione/OFL.txt -sha256 b7574cd4c76770e5e3915d16bd93f09663bd77cb041a4ec09d824c52b540529a ofl/germaniaone/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/eastseadokdo/OFL.txt -sha256 520a0c239d39b379b61c4de5f8e3b02db20b0dfc137481843eac01f02c41f4a2 ofl/aguafinascript/OFL.txt -sha256 ffaf7bc750bdaa0b95b09eb80e419748bfaf46268c6612860f0a5e19e17abb12 ofl/orbitron/OFL.txt -sha256 c6b9c7322fe0203d4d8a0f98541136d8d76da76b92c79d206b09991b98338cc8 ofl/gemunulibre/OFL.txt -sha256 2f871c2e81de6d0c72c981615002c30bc9f1637003d6d3d4c3f0149886b70569 ofl/mervalescript/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaijaan/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsanvertical/OFL.txt -sha256 00a6fe8dfdc48d6206bcc4f10a765515a73433dfba7255eff966963beb26facb ofl/dhyana/OFL.txt -sha256 cd2dea62cd4b0c5fb335cf07ff04fd5c4bacb49b8d6c2bbbef9766c663d79b1c ofl/patuaone/OFL.txt -sha256 c0a8947de199b422d30c16137e4decd5362e3a1d504422880d69c02bd6046dac ofl/cagliostro/OFL.txt -sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alef/OFL.txt -sha256 2cc926050c4c6ccd9a0288b7792e2fcf93e5629ee6269e35986f092275e5a1b9 ofl/sarina/OFL.txt -sha256 f1bce31b817dee01c1e4ef8bc45d8ecb95f01f4abbf0a985007cb3cd0fd8123d ofl/zcoolqingkehuangyou/OFL.txt +sha256 33e3a83e377c6a41149044bd919f50d9a971d801052d4e0c0a98cb417b42ae38 ofl/risque/OFL.txt +sha256 b926569d7ff2c695dab9d771f3d9c3ded162f7a5bbac4aaf390d89f1ce0e1a5c ofl/roadrage/OFL.txt +sha256 0e4cc6ece88573545be2ed25835363662a6182ba4a4c1b5c8feda52add30e8a6 ofl/robotocondensed/OFL.txt +sha256 9cbaed04b20c853f99840efe5dc96956f6f6120ed83a0ade35f9281a2b63e5d0 ofl/robotoflex/OFL.txt +sha256 9fb77dcb5cfef0de20f4b1ba296e3127320bcd7cc408ded5f61cd884f7bbb4dc ofl/roboto/OFL.txt +sha256 34dbfbb43e0b4fdeef445d77b9ac0b988e5ad7a9bbf16808c97b66c66d51f553 ofl/robotoserif/OFL.txt +sha256 91595b148d8e476851147257a1234aa4a1dba722424fcdbdfca8965450fb48ad ofl/rock3d/OFL.txt +sha256 b2f42a005a6a48ead81e369021e300184f0cbecb48aee6f831e46c7897f6055b ofl/rocknrollone/OFL.txt +sha256 31501a9490dce395cdb40015237d3684186b79f81dd6a31442d669eb7da81066 ofl/rokkitt/OFL.txt +sha256 e75230ee246a04912366cd8d759d081200d80fb0756766c96dd52f73e8b40bed ofl/romanesco/OFL.txt +sha256 16741ac498178f645283cfb45b7a487b6d361b5de5730c5ea729f056f414f6b0 ofl/ropasans/OFL.txt +sha256 944998f475ee63b332a19137840d9e334c94ec6300f8091a5049a647798ca33a ofl/rosario/OFL.txt +sha256 8a59454b7f1cc0b1fa29805781769047e5c269aa629e3422c2d7fc04b89e5c1f ofl/rosarivo/OFL.txt +sha256 08fdc7cbd92b9bbc4d41d0945ae7f25450d91c5fc8c66c68df331af3505e4ec3 ofl/rougescript/OFL.txt +sha256 67f64c5509e5151796599e3ad47c3131cbe0c80c4f9430b90236a1249c2eacc9 ofl/roundedmplus1c/OFL.txt +sha256 c585309492415154b9ad6401a9e0c5d9e3f9b2e92b71146d968e5bd4305ac74b ofl/rowdies/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rozhaone/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubik80sfade/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikbeastly/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikbrokenfax/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikbubbles/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikburned/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikdirt/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikdistressed/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikdoodleshadow/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikdoodletriangles/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikgemstones/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikglitch/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikglitchpop/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikiso/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubiklines/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikmaps/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikmarkerhatch/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikmaze/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikmicrobe/OFL.txt +sha256 43d530580461a574f6dfed9e15af6a74e95f7c04d9bfa1174a63ff036e8eee07 ofl/rubikmonoone/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikmoonrocks/OFL.txt +sha256 472cbe7c25441df63e9c7864b43eb3c0f4b3df950c66a76224e6cfe1eae843fb ofl/rubik/OFL.txt sha256 9788e3b3e67f22ab5846a0bb867a230e7df2468c3cd20f730a5d9c34e673d090 ofl/rubikone/OFL.txt -sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustinavfbeta/OFL.txt -sha256 ee81f11dd1970e9749afd2a572256f8eefce65532872762a4d7a3d5daa0812c8 ofl/shojumaru/OFL.txt -sha256 4f4bc3806a1e55789c6ef75ca5fc628297b05292f74966474dc0d40324abc609 ofl/abel/OFL.txt -sha256 064539f87826887d2062b7823b2b97b7625d68b642f6c945c99c0b8dc8084195 ofl/rationale/OFL.txt -sha256 a345b13576140008a697ac66ca8c76cd63b1dd076712bc30a0f5e97dcc53cc83 ofl/markoone/OFL.txt -sha256 203693528d6d2e8dc5e639c6ea42b3e825b59dd6447294e37b306fe734650091 ofl/arizonia/OFL.txt -sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/fanwoodtext/OFL.txt -sha256 3997621a219c7758e31dbafdd3cbd2bcb0b6144a41d1ca068d04dbcc4bafcde6 ofl/milonga/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeshade/OFL.txt -sha256 162a3b5c72cba845280a6f887c11d02984540b924510138c8b1eb473bcdafb6a ofl/concertone/OFL.txt -sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveatbrush/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlow/OFL.txt -sha256 9551ade371e7bcb1f6d9959273bbf1fed3bdf398efb5c57cc1fd85d6a13e9e5e ofl/londrinaoutline/OFL.txt -sha256 f15a9a3a9a665c2d17655b8fedad86d9a8f30081d46bb91236beb1bc7294a589 ofl/akronim/OFL.txt -sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo13px/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikpixels/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikpuddles/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikscribble/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikspraypaint/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikstorm/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikvinyl/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikwetpaint/OFL.txt +sha256 1ac58be64e921818878e02adb0712060d51991cc3341228748ee6055885662aa ofl/ruda/OFL.txt +sha256 ce1108854c91696a8549bb21459f1dc74e8a1ec11664d712c3868c40042f1a8a ofl/rufina/OFL.txt +sha256 028e6aff42d008b81b231919bd68a5508b4b5ba53cab9344ec6eb2cbffc1721c ofl/rugeboogie/OFL.txt +sha256 e604b133509815768e6ec4738bb04844ce9a23e80099d2b61e5d75ef46acbeb0 ofl/ruluko/OFL.txt +sha256 b598b7fddfd578950aa1fe6e0e2607b779abfaa686b83af8ec65c860f646b2cd ofl/rumraisin/OFL.txt +sha256 0dd28b488490429f3037082a331fca8a07d19f2218272f6c4260b196fbffdee1 ofl/ruslandisplay/OFL.txt +sha256 3ac1301549523d9861fedca12871f24e575fbd26d520632fc00ba849b471d275 ofl/russoone/OFL.txt +sha256 b044afdd80638da6bb25da192efe7e72e5d2c0944862d2ecd19f21fc95371199 ofl/ruthie/OFL.txt +sha256 2abc42812053bb5fd07d5f49c98311fef1471c2ff108c372abbbd44cdd4c7759 ofl/ruwudu/OFL.txt +sha256 399b33eb38cdfc76b8665defa5f81d52e8193d630ad5858c893db6bc20031bc9 ofl/rye/OFL.txt +sha256 2e2cb5a98da665f2ab82a9fd01fb18c2337f845761b0c163f690ed65f3b94677 ofl/sacramento/OFL.txt +sha256 9ee6b2ec20a06c599a07412690876eb457bf192c10e886e60d8bdffb80bc21a3 ofl/sahitya/OFL.txt +sha256 55e13d77a4457aa9c60f10c5b97baea3343d3bac30960d49554a033cb9eaff7c ofl/sail/OFL.txt sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairacondensed/OFL.txt -sha256 96b7bc175186cd0153a9682a1c9bb1da7103ab13a83abef8026bc64582ca616f ofl/oregano/OFL.txt -sha256 6fc386ac48a529b85c21f90a6c8d2111c6271b3063f9ddd78e92645db5259510 ofl/tulpenone/OFL.txt -sha256 13e862ac3f67130f58bd4bebb61c588d147b5a555b1ac6959570799c4f648cd0 ofl/capriola/OFL.txt -sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktamalar/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairaextracondensed/OFL.txt +sha256 f2665d4718b452b3818a877191355ac884a6b9b419d35408fe7ee487e9e8f30f ofl/saira/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairasemicondensed/OFL.txt +sha256 fc7c16a0d286a351a7de245a0bd661275e9d393de8955c7fa37ef3c8b85b7e3e ofl/sairastencilone/OFL.txt +sha256 31c59bcdd538c113ef5c048f56827439facb12b7e5cfd158b04c83727edc453b ofl/salsa/OFL.txt +sha256 5f8ff4a3f951c104e99245bdb952be08c73369222048bbf19fa3bf7170d10949 ofl/sanchez/OFL.txt +sha256 69f01b79c1be37a734736a94a12c55cb28d09ee93e4febc9db109cec608f9ae7 ofl/sancreek/OFL.txt +sha256 156ea6985861158c7dea63ecaac4c78ab0ed737d168ddffc3e34c687985a033b ofl/sansation/OFL.txt +sha256 0cf28cdcf1cdfd35054352816b2d8c81bd6d6f73632198b61507f26dd4dcbeea ofl/sansita/OFL.txt +sha256 9e0d3db586ba0abf5ca398683809dacdf4c81b2960f592bd085fbf206a67ddb0 ofl/sansitaone/OFL.txt +sha256 e0513f56a7710b94b459ccb7ef77bb7a464e24c777fb2f7023b78af8915dbb86 ofl/sansitaswashed/OFL.txt +sha256 b26cae1321380296ba8311b632a397d5eac11b47197f9d0aa0b9310f1531ad60 ofl/sarabun/OFL.txt +sha256 afb8c471158619593df0fb501453bd39fda42396e2cc3911e2a0a471c11b863c ofl/sarala/OFL.txt +sha256 2cc926050c4c6ccd9a0288b7792e2fcf93e5629ee6269e35986f092275e5a1b9 ofl/sarina/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/sarpanch/OFL.txt +sha256 4c28e5c8e904020d010057646481259101cc0d10a6a8e204d8d796f083ecb4c7 ofl/sassyfrass/OFL.txt +sha256 5f247fad3e8a86b6c0779dff09277047c1ce2b0b7580a1093347a8af755352ba ofl/sawarabigothic/OFL.txt +sha256 c254ae01c407f4a2bd0ad163e4c1a795d57ddfa8967c21b8a28c250b44d13963 ofl/sawarabimincho/OFL.txt +sha256 0a852a06f0256a6684662663ccb1d8e08d131abd1f70cf8d972a344cf31aa381 ofl/scada/OFL.txt +sha256 206ce51bc8843a6f95d64ea4c14f24ceaf4dfe199153debc5532b87d1d945d8b ofl/scheherazadenew/OFL.txt +sha256 3b4f3063b6ac7c1e403e2c4a5e8ef3a58190ff83ed7b15af66511858699139ce ofl/schibstedgrotesk/OFL.txt +sha256 b5c776129b160163c84620b35fd45dea45edf49789cda5a94c2290c230581e0b ofl/scopeone/OFL.txt +sha256 3d08baba63f1f2427fd96dee8da30b1ef6c1421b3be0e1f07cc2a78abb27c91d ofl/seaweedscript/OFL.txt +sha256 0b27313ffedb61d9941c5ba17c8b9ef5d2724c6e9aff41cd1ece24baed059eae ofl/secularone/OFL.txt +sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedan/OFL.txt +sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedansc/OFL.txt +sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickavedisplay/OFL.txt +sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickave/OFL.txt +sha256 a07b444918d700ed5d2e5ca153d3e55035874c24f8ed7a30ee9be026b03a719a ofl/sendflowers/OFL.txt +sha256 1d37e58d4bc1383c5141211bbd5bf123d80aa1d26d5b09dfcbac2bfc2fffb826 ofl/sen/OFL.txt +sha256 473c5e3123102434d05c66a9fc8b19cf285a3bf71cd8a91a41acef44d1448e62 ofl/sevillana/OFL.txt +sha256 444798d79ed7957dd04526095a94b3070f163fe0850e9cf2ec497c758d288bfe ofl/seymourone/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/shadowsintolight/OFL.txt +sha256 6a28d4d5d8b4d1ea89ace5a047ac6e0de182acdb8bfa22897bf7702102094f69 ofl/shadowsintolighttwo/OFL.txt +sha256 5f23f1b25bbc73e5886ee2c0863dfc4f3ecb18cb65092bab8e4e8403e3e679e5 ofl/shalimar/OFL.txt +sha256 ebfce7d104d597c385b71e9fbf8f0e2034e73320f857086105dc265b82c05caa ofl/shantellsans/OFL.txt +sha256 bab5a06fe5d0b7ef84a169bc67a6ca90f65e9a13877b84ce564a60b19142ee0c ofl/shanti/OFL.txt +sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/share/OFL.txt +sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/sharetechmono/OFL.txt +sha256 87b7d831a81fe8b37e7e6c672937493f710ff81883eee3adec7b5423297efd16 ofl/sharetech/OFL.txt +sha256 9ad629515fb62dfc2a831187b260bb53b4fcae1494dd4cb94c2b30da2466da51 ofl/shipporiantiqueb1/OFL.txt +sha256 9ad629515fb62dfc2a831187b260bb53b4fcae1494dd4cb94c2b30da2466da51 ofl/shipporiantique/OFL.txt +sha256 41fba056279be5f45ff9a99e44b7b53897b42732f5806d8e666e0ab49ac6bd38 ofl/shipporiminchob1/OFL.txt +sha256 41fba056279be5f45ff9a99e44b7b53897b42732f5806d8e666e0ab49ac6bd38 ofl/shipporimincho/OFL.txt +sha256 82e1f1ecc4c04924c6490b5a3f03c39feacb81337a45911daa30b758c69df788 ofl/shizuru/OFL.txt +sha256 ee81f11dd1970e9749afd2a572256f8eefce65532872762a4d7a3d5daa0812c8 ofl/shojumaru/OFL.txt +sha256 fe079cdbbad0f6520eb0a8235bce65b21596dd0c4c5a2694b3325cc87313b618 ofl/shortstack/OFL.txt +sha256 325e890b8b26fe0a683c3ba24c506d902bdd7034d9c47bd7fa2bb72b5433b9c9 ofl/shrikhand/OFL.txt sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siemreap/OFL.txt -sha256 f76c1013cffb3e0de0e7dad19ee5b4b7849c7ab10b67218515e39cfd87e554a7 ofl/julee/OFL.txt -sha256 c264f64bb2b91ca0dfdeab75d71719120271fa6a30035396416af235ef481c1e ofl/merienda/OFL.txt -sha256 d102f22055cfa31a9659228483de3c726010f0b3b416b78e3cbefcb54816e812 ofl/galdeano/OFL.txt +sha256 75ff072c71b85d17c237e06104b5ff6648095cd62229a321b3bb5750f18df49d ofl/sigmar/OFL.txt sha256 2db02cb5d05d5f8a003ffefce36a32a16520ad4cab9ed90635ff953b583e4e82 ofl/sigmarone/OFL.txt -sha256 cdcc959c42ab255b4cea4bd82f2db5c24a2da7ecabe615d02d5a5dba3716e446 ofl/racingsansone/OFL.txt -sha256 c88333734ad7cd30540ec6614d12aa829a0395715de30e336d22ddfa3005db42 ofl/catamaran/OFL.txt -sha256 26daffa24723bb188643085cfc5423f9d78d22a395df4a7928380e430545a201 ofl/bubblegumsans/OFL.txt -sha256 de2246895f0ac21fe05b095d586d36cbc9f987ebcaed1e050c61e69667caf1c6 ofl/hannari/OFL.txt -sha256 b54d54664cddcbf05f5b4ea3aec7e89317eb917cf465920969e7b22361e0f4a5 ofl/seymourone/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiaseriflibre/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsanscondensed/OFL.txt -sha256 5802c9e3509199c7aa9a13ea410ae27febbc0cdea184bf7d227170fac703bba8 ofl/passeroone/OFL.txt -sha256 2400b30a72d2b1555255b81625576dfb552584a19a9c85ad8d43ff77bceab13b ofl/plaster/OFL.txt -sha256 4bed7eaae70cab1bdf2bcf9b1cb562fcd9cc26d1c3533c4ade0ec70516dfb3a4 ofl/trykker/OFL.txt -sha256 45b1f44d2cb859ea4b7be2f322c57b8ff7be55075c336744e62b5550cd0a97eb ofl/medievalsharp/OFL.txt -sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpass/OFL.txt -sha256 ff1f38ac4e694a4ad5bd3d7a5146cd8bd73fd57aae794ced76a24b0d68e41206 ofl/pinyonscript/OFL.txt -sha256 6aa923334ec515d26b1a61bb978a0bb5bd8884de7529add1625beef2f4a53f74 ofl/nicomoji/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesansexpanded/OFL.txt -sha256 38fab5a643fa935a4e11edae2d7b2bbe9866b4f4828c2be2f41451b3f27cb67a ofl/paprika/OFL.txt -sha256 a5fc033225d145b43fd7391482ae7689825414ce29a01614d651a3012b57c81e ofl/monsieurladoulaise/OFL.txt -sha256 ecc91fac753ad9ba5bb7e7819a5c59ee1e3cf89032133c6b4b0318d63c35933b ofl/alike/OFL.txt -sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejugothic/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepica/OFL.txt -sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/mate/OFL.txt -sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillscolombo/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/secularone/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesans/OFL.txt -sha256 136a256d6050ed32bbf96736d70b9099c6359e83dabeb6847cdf6b8ef84319cc ofl/kantumruy/OFL.txt -sha256 72060253bd481a8dc18664bb9117072dc07c0f0270a40617c230654821774850 ofl/pattaya/OFL.txt -sha256 56d9c3529facf93873a2a1626dd038054d244b3af30a1e3ffe0e78bbda1c7622 ofl/preahvihear/OFL.txt -sha256 1a2debd5ad8e656b26bb3b29213caa8f7e557a2f31454b11ebb6c3e3b59aa5d4 ofl/cutefont/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/kalam/OFL.txt -sha256 d941c5b788d47aa469ee54e30f4c12d6a43c45a295f10c568bdf9772f2893b7b ofl/oranienbaum/OFL.txt -sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosans/OFL.txt -sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedford/OFL.txt -sha256 0acef93ca37cf19eeb83a1c6a29b78b08377a211c8d80cd27626e210176828da ofl/kavivanar/OFL.txt -sha256 c0562e066174197902a4a10606673d189f067970ef89c6013943b9cf182aadbc ofl/titilliumweb/OFL.txt -sha256 f8fbefb5b1004615e6d1e84b1c75e68520d91196f600cb1b07620dd2748eff64 ofl/cantataone/OFL.txt -sha256 2e2cb5a98da665f2ab82a9fd01fb18c2337f845761b0c163f690ed65f3b94677 ofl/sacramento/OFL.txt -sha256 251f65282ff48a7e8ef3fb661fc99254d9b3b0c368427c98b1edbfe4ca66e888 ofl/katibeh/OFL.txt -sha256 31bc966c36352bfd33717382786d0458c38ecf540628ab134e0ce35fde801d28 ofl/poppins/OFL.txt -sha256 f016385cb4b360e7698d22a48c6b58c0634b1ed5c9c17df78515d43887511df6 ofl/yaldevicolombo/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/swankyandmoomoo/OFL.txt -sha256 b712dacdda5da76c0213f8478886f893b855665c1153ae438bc3e55a7dc525ef ofl/kurale/OFL.txt -sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/chonburi/OFL.txt -sha256 8f187da1eb4f23e3fe7ba68b1cb2e92881a415dd34c46489698454517e273c4f ofl/krub/OFL.txt -sha256 3336bf5d4e7eedba48ecb831f37bf676e901c39f2e6a422cceadd9d2ffa55be8 ofl/kaushanscript/OFL.txt -sha256 bb655534b6c7bf3e547c1368a68a5b1032d0e96fd08b5cc75f3d7a78528784ef ofl/novaoval/OFL.txt -sha256 04b895d77ccec5034191e953e8e5884637269be15fe0675fc25039014eb46349 ofl/monda/OFL.txt -sha256 d724dea493d89a7a9681186e2fb462b7cd551674960ee4142ae6b325261b5115 ofl/hanna/OFL.txt -sha256 64ecb0c6bf5cd80c3da76035c00671272966afbd32ffbdbcad95a8b56501fb08 ofl/decovaralpha/OFL.txt -sha256 0cf28cdcf1cdfd35054352816b2d8c81bd6d6f73632198b61507f26dd4dcbeea ofl/sansita/OFL.txt -sha256 d69bcd35f4a121b312a64f7e8eb15bed61c9056e9e9cdaa8d513366142c8e005 ofl/rosario/OFL.txt -sha256 b4cff421cb89d1e32036e818f291f8ab0d3294ada70b5883d5bcc6470b869702 ofl/eczar/OFL.txt -sha256 ecb52bab55d8d6185712fe8fd2fd98300f5c8c07fad0d0a97b1e579462b0dd3f ofl/bayon/OFL.txt -sha256 ed95c33f80ccca002e3a360b683c43368f9c5eb024e5b992abb51af3c10b59bc ofl/gothica1/OFL.txt -sha256 66b5c49d384cba754806a891ebd52f2ca08dd05c0eb3c56170192da466a00a20 ofl/londrinasolid/OFL.txt -sha256 284a5a26e6db9a04259a5690ad57d52c56a4c515ca2ece1943d950f99e709dcd ofl/belgrano/OFL.txt +sha256 225fa26a24e27536ac01342419a0aa812469f5f2eaf0d79693a5f92904e86571 ofl/signikanegative/OFL.txt +sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signikanegativesc/OFL.txt +sha256 225fa26a24e27536ac01342419a0aa812469f5f2eaf0d79693a5f92904e86571 ofl/signika/OFL.txt +sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signikasc/OFL.txt +sha256 86c5e9c9382cdcc5948704fdfe60f2aa164a719746931219a42736ecd9cefbd3 ofl/silkscreen/OFL.txt +sha256 61056041809e0ba18bf8b9d637a375ab1c725025428533d74d668d88b2cb8b89 ofl/simonetta/OFL.txt +sha256 397e83b05703a4240be51e2c3a2be1d0d7693d7a2d8b1ff367c26a2b9afc013e ofl/singleday/OFL.txt +sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/sintony/OFL.txt +sha256 ca19ac21c7656f493189093eca52b4239fcc5eacc15ab2e3d67cfbfc0e6e443b ofl/sirinstencil/OFL.txt +sha256 95803fae1b063e592c67b5867f1f36df1df526e5ebf33c6cd4d4afa31a9d5586 ofl/sitara/OFL.txt +sha256 29cca754098468057880970c604e55c4e2bcb8479742e4130c94f2ddc0363f9c ofl/sixcaps/OFL.txt +sha256 a5ef1337c7efa6a7dfb4f23ada5dc9319653b60acb34601ed734608608fee39d ofl/sixtyfour/OFL.txt +sha256 593f0bc55c75b673772b378eaee314f128283745c4bb1cfdb9b8012a3b6c46fe ofl/skranji/OFL.txt +sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo13px/OFL.txt +sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo27px/OFL.txt +sha256 7d4c49f4c5e195125c1bbec7b8c6b884b616555cdf7c7101b98b39a766f88945 ofl/slacksideone/OFL.txt +sha256 dc894a2b7d8000fbda9998744f7d47e1fd1b2ab53609c1fb8461d5b3a7d027b8 ofl/smooch/OFL.txt +sha256 fa0b71e1cd04a0ba1b95f17b45dbb2d9072a9a1e7760935dfbde8a3fe8f0402c ofl/smoochsans/OFL.txt +sha256 d849309d514833fe3d7a610e10f6cd5d99b4f9552bfa304969acbf89c66e4422 ofl/smythe/OFL.txt +sha256 89418a3c7b5726c3f8828a7b7c3f1cad661cf5b7a1be3d2bd9ea243f8d9890c8 ofl/sniglet/OFL.txt +sha256 d3909465d5838d9d1c72b975ff1ed4f410a85dccd43801be525bf2b2bde89f92 ofl/snippet/OFL.txt +sha256 cd354a6084383c50398fae709ebe3a5dd98b947c486c1fe9de5f89caf81f980c ofl/snowburstone/OFL.txt +sha256 455397ca15d39e9178bbbf4b485a29187751d60f7ceb7829980a521d5ab6848d ofl/sofadione/OFL.txt +sha256 336fab6956d78eb34b50cd7bc6b16116c44735fbd0bf9f4def769ca4d8e218a9 ofl/sofia/OFL.txt +sha256 3e824d5099202de2c98cbd8e5ecba54da7d220c1ad851330726e65f3e60842d1 ofl/sofiasanscondensed/OFL.txt +sha256 3e824d5099202de2c98cbd8e5ecba54da7d220c1ad851330726e65f3e60842d1 ofl/sofiasansextracondensed/OFL.txt +sha256 3e824d5099202de2c98cbd8e5ecba54da7d220c1ad851330726e65f3e60842d1 ofl/sofiasans/OFL.txt +sha256 3e824d5099202de2c98cbd8e5ecba54da7d220c1ad851330726e65f3e60842d1 ofl/sofiasanssemicondensed/OFL.txt +sha256 5c1dd86fa761f43e8337de5ebe63ad75504423635de752c63a2f1fa93fcfc80c ofl/solitreo/OFL.txt +sha256 00730ae6eab82c336c89e1b9ad751540b032a54c822cc26a0268161fd200b16f ofl/solway/OFL.txt +sha256 495a16e8214dd38dec1b569224d3a740c8f646336877794c492638e3172e8e9c ofl/sometypemono/OFL.txt +sha256 40bd3f35477284c021978816e9d3b8723ff2283fd7065fafaa5bb3004e41b237 ofl/songmyung/OFL.txt +sha256 19d06d19f1720e1873105ce859318099f1a5322361007ce8f5a2b48463c33ad7 ofl/sono/OFL.txt sha256 6cbe0f55c154b5dee71ca4f2418d69e4e916448ef2ab52dc4541197b292efa24 ofl/sonsieone/OFL.txt -sha256 255d5debbb80eb2ea762644311f266a279e8778f00156655a516e2b7781a63e1 ofl/lilitaone/OFL.txt -sha256 490b8f3acbce2331adc9b9d3e75ee6fe07946fb29af429a300c7d066b1250b2d ofl/crimsontext/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumbrushscript/OFL.txt -sha256 f2c0dfa02d6f5c444b4babd7bc0b43be77ea85706e8524342516bc41e43c2f01 ofl/fahkwang/OFL.txt -sha256 4398885e6b303830d81eea03444aae6fb08a44f41b6acd193c88a2f8cd17606e ofl/srisakdi/OFL.txt -sha256 c1f8e0feb0babaacf774b971bcfd791e44125b9d61ff074e4c20924e9661556e ofl/antic/OFL.txt -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 ofl/notosanstamil/OFL.txt -sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/codacaption/OFL.txt -sha256 b41b99f35b507564e54f6b2f5162ad1c21f94a16837c632da6632b376a341f42 ofl/nosifer/OFL.txt +sha256 ba0b9729c9428ba79a0459ab8ec575791b51509dbec213e383d0316d37fec299 ofl/sora/OFL.txt +sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/sortsmillgoudy/OFL.txt sha256 e8d0118fa9d640543e7f6848d1d93f47313c7f56b64f73f37291d859cd5932bf ofl/souliyo/OFL.txt -sha256 bff4e5087ece354afccd073621197bbb7dd9349943b5ee6aa12b1adf0b133081 ofl/happymonkey/OFL.txt -sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanaleifill/OFL.txt -sha256 03082243ebc53e2090bc59987f693982ccee83b30516457b11f6a2349b78f5f8 ofl/rokkitt/OFL.txt -sha256 1152ca18eaa6159634f1eb209c60df360c1c09a52991e392f8033702036634d4 ofl/assistant/OFL.txt -sha256 012b1870f81b0d97ca756edd9eea315c7fc22657ac2f1cbdfcb6772fed3e20f3 ofl/bhavuka/OFL.txt -sha256 ce1108854c91696a8549bb21459f1dc74e8a1ec11664d712c3868c40042f1a8a ofl/rufina/OFL.txt -sha256 bac36a7fcafc5702d9d928bb81c7de9f8739eaa820e546c3d2cc52730b652af4 ofl/devonshire/OFL.txt -sha256 ac987f9cbc5b18d3239d88adb57a4e134049811d24ddda2f6383faa589fd2727 ofl/holtwoodonesc/OFL.txt -sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyonesc/OFL.txt -sha256 965bd2c907f7bb6f36da4f85e83f29aea8b2f720783deebd7ed7b40678e67672 ofl/mysteryquest/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemiexpanded/OFL.txt -sha256 19e186a088a50835b38b59409a76b8df2d0252ce114a99e79e306231bbe253b7 ofl/dellarespira/OFL.txt -sha256 aa36087ecd7e9085e5a1439b0a6d0ee35966e8cd2ccaa649bebe62cae5815e82 ofl/lifesavers/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpicasc/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/loveyalikeasister/OFL.txt -sha256 a9ef1db03f660130790beeb3b5d91b68536a44a98ec2db3097d02a1c5f91c599 ofl/buda/OFL.txt -sha256 de318dcb99e332a746edb9f83180ee206fc3bce74ff96ad7d1cb219967ec74af ofl/pollerone/OFL.txt -sha256 315a576cbc7ab61c9e347b5725893bc8498fdcb8fc10831793c6864bc2cefba8 ofl/gudea/OFL.txt -sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserrat/OFL.txt -sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkovavfbeta/OFL.txt -sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhandsc/OFL.txt -sha256 ec1d7de447a90e4b6d8f2b4f95c7f89a70e315fdb41969bc716059e4f2461fa4 ofl/clickerscript/OFL.txt -sha256 7039124ec9c84f9d637637da9f80158f0d3681c82d4e6a811053467f7c33d587 ofl/prostoone/OFL.txt -sha256 16f8621a8dda01f044b8a58489334dbaadfad44ef2fa1d5ce0864cc2f309df01 ofl/inknutantiqua/OFL.txt -sha256 ae30055f1e31d12f6235802c25a8872bb7053fca8ed4a604c530f4b2ee83e572 ofl/pontanosans/OFL.txt -sha256 f1ef4c3ef43322403f5c30e4fb46496969cb5c34a2a6e7247b507254b69caa6a ofl/novaround/OFL.txt -sha256 cf5c4103b0ecf3c38e7c26768b5caf05e1b3e16d4d87b32d859b3c19ce7c216c ofl/petitformalscript/OFL.txt -sha256 ed80dd9539708a531313f98fb081aeeaa395ab5726931a433845d667b019c855 ofl/abyssinicasil/OFL.txt -sha256 1404cc9279d4ad713a372a5e1e1d20d7b9b000d2397c8529aeb3df5402446600 ofl/cutive/OFL.txt -sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpassmono/OFL.txt -sha256 0878e7d6e842bc3c45154059a1c2812de0d31dca343fe6bc16abc9afdee3e3de ofl/koho/OFL.txt -sha256 636d62f04d7bda9fcf9354f258f6244e7e18288cae036b95122e204f1acbec80 ofl/neuton/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloo/OFL.txt -sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkova/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungee/OFL.txt -sha256 dc35123e99a857674b3e8807e9d7df82220d298423d9fc50ce084fbcdecf602d ofl/jotione/OFL.txt -sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo27px/OFL.txt -sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/oflsortsmillgoudytt/OFL.txt -sha256 d7b108fc1f23fb016a47bb40c63d6f6e04cc35a1edfb991638d7f03621bf7f33 ofl/terminaldosislight/OFL.txt -sha256 71e5222c549d85a1403b6e709b4328b81d7b51ba021b8bd20df89550da80c087 ofl/yatraone/OFL.txt -sha256 f139d6f43d2a63a8fb3ded48b8ec747d9d59a7fbb13d077d9b96ac88580bc1ad ofl/dekko/OFL.txt -sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsansstdlight/OFL.txt -sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscriptswashcaps/OFL.txt -sha256 64dc6a7e2a77aa340c49c3e0829703f540f8d64afa506f44eaa6741580716d0f ofl/gabriela/OFL.txt -sha256 17d7a7f5d9f0139535ecec516988c4c73a2ec0f225987288f3fd6ee2622d4450 ofl/federant/OFL.txt -sha256 c0a7efe98e77cbfcf1a5ca43e874e25cf53d9185c56295bc3b5c407f95dae638 ofl/nats/OFL.txt -sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/ekmukta/OFL.txt -sha256 e5ccbfc32e4d7fae98b467a9af310ac8d2efd5d90e684426cd24f3eb36090a2c ofl/acme/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/modak/OFL.txt -sha256 75a77451968e55a1ab404bd953bd8778983e21116d507b890fbcf838e58c8e8b ofl/pavanam/OFL.txt -sha256 36931b77dd81fa96fffad91b6acb54931e600845eb81f91ecf1b4459012c621a ofl/vidaloka/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhai/OFL.txt -sha256 1c45059cea5c6798c8591b0a17961a30328747d44214ff9b8f9c62a683bd6598 ofl/ruda/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/thegirlnextdoor/OFL.txt -sha256 4dee45deee99672fbe342b2f4b7aa75b0cd12de18a68f9732c77f096bab47e0e ofl/molengo/OFL.txt +sha256 cb30d3086a8b3ce0b9e3690bf48d6620402b61160bc658076f95180ccd9e9dae ofl/sourcecodepro/OFL.txt +sha256 09746787287a289323b0ec3cff4d1a4a801331b82b7207c1e186f5d26619a392 ofl/sourcesans3/OFL.txt +sha256 564ce565c371c5e5bbf286006565a7c9aa55a9f56e7ca58d56e05d649dd61a72 ofl/spacegrotesk/OFL.txt +sha256 4664e83780a263c53dbab95d3590a5a9db914aeb9a3c78f7e7ad451f9151c998 ofl/spacemono/OFL.txt +sha256 963f283b5410c7df62067a35cd7def0802c583a880e7cd7e326832ec3985ec87 ofl/spectral/OFL.txt +sha256 466aaa3bbd245e4c91c4e82c0828efe9fcfd913f5b020d75f0918516c2540fa8 ofl/spicyrice/OFL.txt +sha256 f938d4076b66a13cf984ce88d92a07ff9802e8ae5e1f4a28cdc43fad122ae611 ofl/spinnaker/OFL.txt +sha256 2c3737ea83b48d48624068d1bbd1d9f8049eb7cf2e1f67435e420375c42e0686 ofl/spirax/OFL.txt +sha256 e2740ec5a5949bf65af5771f0537bf26cc1ec3020782b0e43fd961973a730775 ofl/splash/OFL.txt +sha256 4abb88162e4c0c5f9fc6c2f15d7085f7b7e27fd89f541a13488e1bcb829bde3f ofl/splinesansmono/OFL.txt +sha256 45b2aa0796f435bd620d864b6b44ff08855dc575524f23ffb43161e69cb5dbfc ofl/splinesans/OFL.txt +sha256 d2f9c74aba2716333b0a3d283083f9fdc93b2e060c5ae094c79e97e8cba9d7e6 ofl/squadaone/OFL.txt +sha256 0dbdce2f23073469bc0047c323e259399a76cfec756aa5f0bd1a58f34f438220 ofl/squarepeg/OFL.txt +sha256 f8c2225a5fdb50e2e75f98cf6e69f198571f605f1b7f6f7eacc0947e2fcdbe8d ofl/sreekrushnadevaraya/OFL.txt +sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/sriracha/OFL.txt +sha256 4398885e6b303830d81eea03444aae6fb08a44f41b6acd193c88a2f8cd17606e ofl/srisakdi/OFL.txt +sha256 72afba97d1ac9409a9fd3bb91a02a639427ca1988977909dad273e293a508d7e ofl/staatliches/OFL.txt +sha256 d7577acbab1d70f2e6bd1b21d8f61db189d6aabe6375bc2d96564b8d94031664 ofl/stalemate/OFL.txt +sha256 194e25172d0144f29aff4b6fb2931ff0be0139448a5cd867db37863c9179330a ofl/stalinistone/OFL.txt +sha256 88d3abd47414e7912d0d2eb44ca89e0b1bd7c43cc2ebe58a8a75281ad75a0f60 ofl/stardosstencil/OFL.txt +sha256 3800c4515b765a7a1baadb91335aa56ed58d58c86e09ff27a1186902d520b964 ofl/sticknobills/OFL.txt +sha256 35187dd015d0c0006d57f99815fb3f81304c4445f04c3fa35bc533a7a4b00676 ofl/stick/OFL.txt +sha256 fc1e501d419d84a8f1a800adae092045002d7141241f498237611dbb8ea763d7 ofl/stintultracondensed/OFL.txt +sha256 fbc351e1b5428e4f45834647dc23a5f8aaa3e744e2f4117ca03c44f640b9a3a2 ofl/stintultraexpanded/OFL.txt +sha256 0c8825913b60d858aacdb33c4ca6660a7d64b0d6464702efbb19313f5765861a ofl/stixtwomath/OFL.txt +sha256 62c0967a997b9691326d35b1f90baf085a557327b711618bc4161325ce1bb1b2 ofl/stixtwotext/OFL.txt +sha256 a57810cbca0b4715ae8610dd7a268260cebbdd4fd76d304e371517f828150669 ofl/stoke/OFL.txt +sha256 a97ad9dd8228fbe25532616c7f12169501a5445ee33eaa233a5c69c595dfcc97 ofl/strait/OFL.txt +sha256 c8af073a60e30b55ef5d0e4f80cea168e06dd65bdee7ec18c1ea8de8f7228780 ofl/strong/OFL.txt +sha256 47d3c6fc003cb3231297530b79ca108aaa4e504c0008a80fa3dc2ee4a3e8c4a6 ofl/stylescript/OFL.txt +sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/stylish/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/sueellenfrancisco/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/suezone/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/sulphurpoint/OFL.txt +sha256 c8155eb9337078a9ea9f1e576ac813a03030ca43e2694593e90cd4fee6fce937 ofl/sumana/OFL.txt +sha256 a9b40759b5821a0c2ad07cbd2c2a61dca4b3e222e6370a7d5bfb6b373bf4fb10 ofl/sunflower/OFL.txt +sha256 88dcde7d08e509a3eec64886292a36cbd58ed9bb52f37f91f55656fb9d21ddb8 ofl/supermercadoone/OFL.txt +sha256 c5a77946a56488790364d060628385d51226da62a18f30d2be0181d82ee62b00 ofl/suranna/OFL.txt +sha256 53ad6a474f68ddfc3fe72449de3ede4d3f033b2f24b77833b1d56edf505486d2 ofl/sura/OFL.txt +sha256 42ad5a49e171bec80308a1c9e8e66b03e638b3ea65af7fafa6fc0e42f45e7626 ofl/suravaram/OFL.txt +sha256 f0e7cf380f1f4665979058b18a2f3d7bd4155dffc52dcecf2a6e82f5bd1f46f9 ofl/suwannaphum/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/swankyandmoomoo/OFL.txt +sha256 c80622543840e2bc72670a00daef3a6cb1af6fad522d15b9a5d9410733c878b5 ofl/synemono/OFL.txt +sha256 cc43cdce6f91c57989af8459341c276655e34224e954fa69c2ad700831a742d8 ofl/syne/OFL.txt +sha256 c80622543840e2bc72670a00daef3a6cb1af6fad522d15b9a5d9410733c878b5 ofl/synetactile/OFL.txt +sha256 268fac20d46709abff409b4be3847359f30c3ee4c4b7f7e5aa6dd29a4db29f49 ofl/taiheritagepro/OFL.txt +sha256 9b584984f9db0ee30347391a76eff9c0a6b03dc450c3c6afe3757a2cb3a4db87 ofl/tajawal/OFL.txt +sha256 adadb8d5d34fe2218dca0f4a4919a9b6f81dfaebb289e5446ac7b3063d6965e9 ofl/tangerine/OFL.txt +sha256 ade4b61436a9ec043fcb4b2ee823e05d9f6ae38b4aa0e130f62d785805b486fd ofl/tapestry/OFL.txt +sha256 0180c4c3f63f09bf7e740453bc1be09d40583f3884f2f4341facc8af2caf188e ofl/taprom/OFL.txt +sha256 6506b2fa2a14259a8859608a6148a4591d67bbaef4d8e1948b43c4078561b0e5 ofl/tauri/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/taviraj/OFL.txt +sha256 4a193c54e911c1e8194d4db657423f2527f54a1239f24cb67ecb09128dc9f065 ofl/teko/OFL.txt +sha256 ff4bb37f716836feb5038e1bf5c47e5a1946717fcfabb175086ed49f85ea47fd ofl/tektur/OFL.txt sha256 5a5cf278190adf8be3e9905c2b21460241cb376c600bdfd6eb7aceb66036c4bf ofl/telex/OFL.txt -sha256 bb49cbf811dafcb11e0de081efcdc8385e45ccc85a5bfc3231ec4861d444dc42 ofl/ruthie/OFL.txt -sha256 b5c3d12a3085b96011fee65555234bb9d31fa7444cf6f8d5ae6b1f5771394399 ofl/lakkireddy/OFL.txt -sha256 23b896f4937eac954a383340c92dfcac1c6e05ec21cc08ec6de47d30ad8496a3 ofl/charmonman/OFL.txt -sha256 39602407e30d466bf169f46d690aaae4f5f039258e5642f91a80bb132ce6e14a ofl/bubblerone/OFL.txt -sha256 e31de7000a2a13b2e54ad01e788fd29e979fe05ea1fded44d6e71cc06e33bb2b ofl/ralewaydots/OFL.txt -sha256 8218df19bcd9786311bf1126815e8d591027aaf7611ef031af5a31c3fd66e928 ofl/arefruqaa/OFL.txt -sha256 e37fcc467040ecd81bf4cf59c99ef56b20f57918995e82b3de1d5b4e931bc2e6 ofl/portlligatslab/OFL.txt -sha256 60fea3a0da19167a3efb9c3792a3a15dc9235405d01bbec1233fdf3e79c74296 ofl/freckleface/OFL.txt -sha256 da15da6b1496d4de18f97e2ad1b722ef8a1c121149c2c93b2cf7eac6ac27b35c ofl/mplus1p/OFL.txt -sha256 d51f3341fd7b3dfa1114d3ef0bdabbe57f60eef86a1458019e0077d676fa1fcb ofl/lancelot/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantinfant/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemicondensed/OFL.txt -sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eater/OFL.txt -sha256 b43e2530c7af69fe1800f180d210b6d2745915ed4e0e404495038c861bb6dbf7 ofl/hammersmithone/OFL.txt +sha256 cbdf9d35f32a9a2f02fb23c8b89c115a5a8e45feaaa2266920c4594c83dd5ed4 ofl/tenaliramakrishna/OFL.txt +sha256 7b826efb1b74a50b1c1aef0a1ba4530925b993ceadc3016d1d787c68a61649dd ofl/tenorsans/OFL.txt +sha256 75798d56e448ba4d2aec3ef5f3c2d805d9c6fe2ba688cd3d7162b2dd31e9cf48 ofl/textmeone/OFL.txt +sha256 631ba6504ec2454e472196173aea91c423295787d2128f3732e73fb07a9ea1e0 ofl/texturina/OFL.txt +sha256 9b8405bf5f503f92401fc990f372b34d469670ab60041d5298d1015d3d0b45f8 ofl/thabit/OFL.txt +sha256 59bda6b53e28d388de5eac7bbb8f3e65889dc8489be3d922f95a525354110c0e ofl/tharlon/OFL.txt +sha256 31eb7046f4c80e0f96944c4b40b0772de68b34783b794fc13aab3f54c2ef6d9b ofl/thasadith/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/thegirlnextdoor/OFL.txt +sha256 ed90d1f988ede9fa1db0ed42f25db2cf7b47d8f411832205a073c6553d44f98b ofl/thenautigal/OFL.txt +sha256 01af2625d6247ecd2430d1d1603c579f85989d43b2d9129e08e0ac0df8909918 ofl/tienne/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/tillana/OFL.txt +sha256 97941703cd5fb1d5e86a062c9463ed12a613dbfbab9961c333699bdb2d277321 ofl/tiltneon/OFL.txt +sha256 97941703cd5fb1d5e86a062c9463ed12a613dbfbab9961c333699bdb2d277321 ofl/tiltprism/OFL.txt +sha256 97941703cd5fb1d5e86a062c9463ed12a613dbfbab9961c333699bdb2d277321 ofl/tiltwarp/OFL.txt +sha256 f2fcbde4b8968400d661e7dcc23052b1885815c8e3b45323b26cbb833352f5de ofl/timmana/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirobangla/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirodevanagarihindi/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirodevanagarimarathi/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirodevanagarisanskrit/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirogurmukhi/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirokannada/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirotamil/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirotelugu/OFL.txt +sha256 61be7c29f4835e2be7243db12213d75d53ff028f29f4b493212a1688b1d3a1ba ofl/titanone/OFL.txt +sha256 c0562e066174197902a4a10606673d189f067970ef89c6013943b9cf182aadbc ofl/titilliumweb/OFL.txt +sha256 1dd4eaacd1da1bfb7e1d14dd5af0279c17d4503fde55abc628bdaccc63ae9eca ofl/tomorrow/OFL.txt +sha256 8e4050fb74972d5c2021517f5c9bb7d60af585a36e967fa61762225ed77abae1 ofl/tourney/OFL.txt +sha256 018d17b5e04c0a217a21979fa6b6d77bd5a143a5f06ea2ea102e427abd1ebfa2 ofl/tradewinds/OFL.txt +sha256 709f9689eabbab61e913ddc288187e7e3d09550339f7df894a909548f90af814 ofl/trainone/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/trirong/OFL.txt +sha256 50fc74eff3191af1c918c047600d1e7f15324eb13f7c7c1cbbe43949bb261536 ofl/trispace/OFL.txt +sha256 b5b48b6baf1a46fbe309af924841891869f4aeddda039943b20c623028b6c726 ofl/trocchi/OFL.txt +sha256 72a22b6dd29b6b0cdcc98de30701b46532c9f7314ee095df3063d10775dd70c3 ofl/trochut/OFL.txt +sha256 d4c3f10bf7997331b75c76d40535898729361c589b7301507120fa5582c827f3 ofl/truculenta/OFL.txt +sha256 4bed7eaae70cab1bdf2bcf9b1cb562fcd9cc26d1c3533c4ade0ec70516dfb3a4 ofl/trykker/OFL.txt +sha256 0d268d55bd00b6518d3f136afb63e7f01f49c922b06c4e55dd4a2841d3bd66e6 ofl/tsukimirounded/OFL.txt +sha256 a36ab46c8b1a74a480a1c51d6a5af08b643e870c6d247f233bc97c97c8ad2098 ofl/tuffy/OFL.txt +sha256 6fc386ac48a529b85c21f90a6c8d2111c6271b3063f9ddd78e92645db5259510 ofl/tulpenone/OFL.txt +sha256 b479f3aee0d64914d4d8575bb8d7b901ffbcf9badf0c4ae0cef89ff2df394115 ofl/turretroad/OFL.txt +sha256 bbb2d117979266df4a2178e2ed7d6d03df765bd3a8763733b8446350f109533f ofl/twinklestar/OFL.txt +sha256 44a89ff5fd62cee611cf9c6134ce7db219aeb90703b19db2361dcde648d73918 ofl/uchen/OFL.txt +sha256 31e5d4e83955e7103c34570dd49b0570ef490800bd65b42923c0dd02445263b3 ofl/unbounded/OFL.txt +sha256 244ca4ef7b106d8c660e9a00cecf5d581b6a222f447d7d59a8f61711b2ad3400 ofl/uncialantiqua/OFL.txt +sha256 b0316f404a7b291e40921c605160181065791a5010a2d2d5691fc7e28cdbdff2 ofl/underdog/OFL.txt +sha256 05f4462985eece49ebd278c13ac1011b546e0a9a4675c542b7239edc90df55d4 ofl/unicaone/OFL.txt +sha256 99d2f30e282d6174af8ff68597f58bb53c0dcb2b104a4c1b8d19da49021d00d3 ofl/unifrakturcook/OFL.txt +sha256 96199bf9ff12dd471a66911dee95440737b437e7f5a6fd30e9e950c16d66e8df ofl/unifrakturmaguntia/OFL.txt +sha256 c1cf7f8c4f87824f85386000ea0edd60aa7d4d1a07b87a6e9627149fc9705511 ofl/unlock/OFL.txt +sha256 99d67fff016522688b8f913377f8ae9f6da6ffeae42cf67c0e5e87cfb0928d33 ofl/unna/OFL.txt +sha256 b658a65a9462d5204aaebb6804efacbb0fced61b2d03f7a321f7173aa114b7ab ofl/updock/OFL.txt +sha256 ee1221b1c2d08920e5f9ca764eb228dafa5c8090df9cf665373c2287b9cb8f49 ofl/urbanist/OFL.txt +sha256 7344b8b8c97c4f88c0ff8bb72bb024bba72f404be1c740b6596a73ed15d28df3 ofl/vampiroone/OFL.txt sha256 5a8751bef5a4fc867ae015099267905034345260f14060fa276aac4051ddd8b4 ofl/varela/OFL.txt -sha256 f6fc9fbae062e4efc1b0306e27715d43cd64a48b8ffba81c22034b8efee4fce2 ofl/cabinsketch/OFL.txt +sha256 45446732635812510428bf1bad902a8b133f3c7348ad8593ecca90895595b278 ofl/varelaround/OFL.txt +sha256 291cdb55bc64894f58739446a46e19687574662722ab110c1a2b7e5d435171e0 ofl/varta/OFL.txt +sha256 f1d1a3536fa4b9c71d04fe4c8d8bbfc0cc5c457d6883f45086b04d0bc07ed12d ofl/vastshadow/OFL.txt +sha256 17e355067c8284f47743a1ee3b1ef7ff684ff0601eda357f9353b10b3016ab31 ofl/vazirmatn/OFL.txt +sha256 f3758ee70600ecd5450f01ea373204b202e048d0454c9db2d1175c5a5dd1e92f ofl/vesperlibre/OFL.txt +sha256 1cd4dc67e3c5a349d0121e0d91837cec083559fb94ebf70a8a31601a787f42e3 ofl/viaodalibre/OFL.txt +sha256 34ef6e0045e0798577c79d0ff774efa624e362e7154faa3a5f8ebc93299fd0ab ofl/vibes/OFL.txt +sha256 26e4c39c4905bd7f1068b0bab008f5a4a9b945e2d7fda31e52719fc5aa9655bf ofl/vibur/OFL.txt +sha256 493589852331b4ea83f1d6b0cbdc157b002ffdb995cf2429acf0c9863bc8f3df ofl/victormono/OFL.txt +sha256 36931b77dd81fa96fffad91b6acb54931e600845eb81f91ecf1b4459012c621a ofl/vidaloka/OFL.txt +sha256 b67eed9578defb59cc4ff4b58428fb816786e499e84cdeafca54723b055c169e ofl/viga/OFL.txt +sha256 dc64ddaa4fd815621dc18f538446e7a234e611817f48064dc5f6bfafefc3ed6d ofl/vinasans/OFL.txt +sha256 fd17f80dc48ff767d91d0dd9f821eebfd8b73ee82f55537a9052b6b0107622c8 ofl/voces/OFL.txt +sha256 1c43e70c49ef7a9b35fcb3758fec8ec5969ff1274c4834b4466b9014f3b9f55f ofl/volkhov/OFL.txt +sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkorn/OFL.txt +sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkornsc/OFL.txt +sha256 433e2b7a293f2a47811d032fe45d4f6e20a00bfc676d56e5a1524e4a76ab3b71 ofl/voltaire/OFL.txt +sha256 27d9af34210253e7ca1251fbace86c6f65b40031d6ce1a75493a1b2093631298 ofl/vt323/OFL.txt +sha256 e609059f5600ecaa921d782de1f5072f92c08e5b4868de63be7c98abfd9b4061 ofl/vujahdayscript/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/waitingforthesunrise/OFL.txt +sha256 bddfe669338d0dbc24c15ccd31dbf5c101a213da38049c24baca9ccb7fde45a4 ofl/wallpoet/OFL.txt +sha256 11739fc270dbd2ff3d726f5177d2402132fc1bb1455f886e4f084bc13eda665c ofl/warnes/OFL.txt +sha256 eaa2e23b59eb264d9f982126f5d6cb7594b00a6a5e3684d916ecbf0c31004610 ofl/waterbrush/OFL.txt +sha256 d842d4d8ea0c1010050a83d51ed7a5594d55a4a988e89646470454af14e9f624 ofl/waterfall/OFL.txt +sha256 739f76be0415d6176ad32a2ce489350c8e8ccc6862728d9dfacddb9b26054ccd ofl/wavefont/OFL.txt +sha256 4281c00ab5b8f672fc8d686f48cb886ffbe900c8c9ee22473ca7e72e7cef8fbe ofl/wellfleet/OFL.txt +sha256 aff3cea99bf300b4b29f4dc04867cf9b49d83de8c5ecaf991c446d506b56173e ofl/wendyone/OFL.txt +sha256 5a5681c41a0eb58eebe8ce4bad1bc8a088335a362c5d4fe02ca572dcadaae98f ofl/whisper/OFL.txt +sha256 6f375e7f24ae282137aff041b3aa4b8efd8234187f9448b91f436b958cd8edc7 ofl/windsong/OFL.txt +sha256 87b05b85d41a2de76f04dd8efd0f5781db8a498556a6c5d320478903e2329b32 ofl/wireone/OFL.txt +sha256 6ea47aed4703a072a5011bf429f998c718ff7c3ae57598f7e78c2d3fa1e25c33 ofl/wixmadefordisplay/OFL.txt +sha256 6ea47aed4703a072a5011bf429f998c718ff7c3ae57598f7e78c2d3fa1e25c33 ofl/wixmadefortext/OFL.txt +sha256 c46bda9181c8f01cf430e8b4d769a2fa8b19369f9f01b947c0d400939147e700 ofl/workbench/OFL.txt +sha256 749aca05078664ce682dce1b1b10096ac397cb088c1a6df4e1bb56f0092a9272 ofl/worksans/OFL.txt +sha256 ca75fb29ae8e2aa30b8d0a0de74842769cd204634059629521134e2baf791fab ofl/xanhmono/OFL.txt +sha256 f016385cb4b360e7698d22a48c6b58c0634b1ed5c9c17df78515d43887511df6 ofl/yaldevicolombo/OFL.txt +sha256 9d8a27215d55e25527a33cc90f0dfd32e382454cf3b5d8f815f303c9030b42d1 ofl/yaldevi/OFL.txt +sha256 9efbe6f8570e8c3d8b000914bd1da07ff4977d1325cc2d046180e05f40677f01 ofl/yanonekaffeesatz/OFL.txt +sha256 8f2e5a9b52cf355023104413827e17dd7126c5a3656492d45eaa1ceb270aa4f1 ofl/yantramanav/OFL.txt +sha256 71e5222c549d85a1403b6e709b4328b81d7b51ba021b8bd20df89550da80c087 ofl/yatraone/OFL.txt +sha256 d7d8074c2dd46804990c184e25849947ab76c5ac7607fbf3966543455769bb73 ofl/yeonsung/OFL.txt +sha256 ab592d1abca19428b89d851706fa7815ec25139c6affb45d366577ca63fb91b7 ofl/yesevaone/OFL.txt +sha256 a80ee908b60f5bec9c10b135d3da93730e2194107d1f7fd3f61bd8c1a97b3e0c ofl/yesteryear/OFL.txt +sha256 f9e5dfcdb2947c0db70465668706b0617cd052b6f86e582dff8741d9e5cded0a ofl/yinmar/OFL.txt +sha256 de2f50189ab7b6a3ff3563ce680d0984b16942a21a5cef051dd9e7701ea035e1 ofl/yomogi/OFL.txt +sha256 737d8d343b674c6894f373de71a044b6782c130f2aebf180933d63ddf7a3dc19 ofl/youngserif/OFL.txt +sha256 27d2d3c15cded787be66c6f51c4b24bea99863f4f162961b5088e4521c2e2bd5 ofl/yrsa/OFL.txt +sha256 1343b9162a2d24f685767766ea23a75a80b88ba13ba421244e65b72210578b78 ofl/ysabeauinfant/OFL.txt +sha256 1343b9162a2d24f685767766ea23a75a80b88ba13ba421244e65b72210578b78 ofl/ysabeauoffice/OFL.txt +sha256 1343b9162a2d24f685767766ea23a75a80b88ba13ba421244e65b72210578b78 ofl/ysabeau/OFL.txt +sha256 1343b9162a2d24f685767766ea23a75a80b88ba13ba421244e65b72210578b78 ofl/ysabeausc/OFL.txt +sha256 ef7c85c72ae94381c8bc4832ae4e6fbabdeafa2bb8a31313cd75dce95a690256 ofl/yujiboku/OFL.txt +sha256 ef7c85c72ae94381c8bc4832ae4e6fbabdeafa2bb8a31313cd75dce95a690256 ofl/yujihentaiganaakari/OFL.txt +sha256 ef7c85c72ae94381c8bc4832ae4e6fbabdeafa2bb8a31313cd75dce95a690256 ofl/yujihentaiganaakebono/OFL.txt +sha256 ef7c85c72ae94381c8bc4832ae4e6fbabdeafa2bb8a31313cd75dce95a690256 ofl/yujimai/OFL.txt +sha256 ef7c85c72ae94381c8bc4832ae4e6fbabdeafa2bb8a31313cd75dce95a690256 ofl/yujisyuku/OFL.txt +sha256 c74e8c47951ddd9c902f07097761cfa0457993e28d8e1e946e273c0250be77c9 ofl/yuseimagic/OFL.txt +sha256 5d6517d497bea6116ed35079b30374043f6d90b19c8d97fc4e5ec48520d1e08b ofl/zcoolkuaile/OFL.txt +sha256 f1bce31b817dee01c1e4ef8bc45d8ecb95f01f4abbf0a985007cb3cd0fd8123d ofl/zcoolqingkehuangyou/OFL.txt +sha256 a094514ca57cf8f9c5e8d8d1adab5d8cd3a377297ff016f9df2c05b3ecd77f0a ofl/zcoolxiaowei/OFL.txt +sha256 c76594cc8f4af2ea35d1e05278b1911b22cc6227bc3b0ad404f68be03fe3f107 ofl/zenantique/OFL.txt +sha256 c76594cc8f4af2ea35d1e05278b1911b22cc6227bc3b0ad404f68be03fe3f107 ofl/zenantiquesoft/OFL.txt +sha256 31b461a9de7f5b4ceb988b01d6ce4d9318180394cb5dacff5bf08c557f3cb7a0 ofl/zendots/OFL.txt +sha256 0fac78a235c98d640cb06332eb5362c211d86fa03c011df438c35005d22ad2c7 ofl/zenkakugothicantique/OFL.txt +sha256 0fac78a235c98d640cb06332eb5362c211d86fa03c011df438c35005d22ad2c7 ofl/zenkakugothicnew/OFL.txt +sha256 fdfcb596ac910b447e482f42d4d1e5df3cfcb71c681a9f10e7f2d0126b274111 ofl/zenkurenaido/OFL.txt +sha256 5f08909b75e1705f0e0d73b64654f5f1a649f523cad91f58c6777098fc46bf40 ofl/zenloop/OFL.txt +sha256 2a20cf7ce1909d8ee1e949095d340f7d7656705f7c810a2d6faf56800ad0cb3d ofl/zenmarugothic/OFL.txt +sha256 469d214f9842809659c827b7f2adaf40ec0df6efdd5fe18b7127665c32aafaec ofl/zenoldmincho/OFL.txt +sha256 0fe0292d3dc4551c19ea5774d325f5bf434e910d97c8e7eeb47fb7bac6c3a5d1 ofl/zentokyozoo/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/zeyada/OFL.txt +sha256 10947328199e369a3e6b4a67e8e5507ed99d5bbb264a1f156415aa9b665e4d15 ofl/zhimangxing/OFL.txt +sha256 3cbf579238e4eacd90ad67883d971aa346ce8990d658635f78f98d608a6830a2 ofl/zillaslabhighlight/OFL.txt +sha256 240b385d3ec8c8d5c1d4af2bbba6ac72bac0309a80c1a8ff112c168643cc6811 ofl/zillaslab/OFL.txt sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntucondensed/LICENCE.txt -sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntumono/LICENCE.txt sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntu/LICENCE.txt +sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntumono/LICENCE.txt diff --git a/package/googlefontdirectory/googlefontdirectory.mk b/package/googlefontdirectory/googlefontdirectory.mk index 8773390f0c..b0e5b6e532 100644 --- a/package/googlefontdirectory/googlefontdirectory.mk +++ b/package/googlefontdirectory/googlefontdirectory.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOOGLEFONTDIRECTORY_VERSION = 94dff3eaa9301b6640cccc63c56d6ff33d82882c +GOOGLEFONTDIRECTORY_VERSION = 2125bc9b447971543caaa132530b828e5e682819 GOOGLEFONTDIRECTORY_SITE = $(call github,google,fonts,$(GOOGLEFONTDIRECTORY_VERSION)) GOOGLEFONTDIRECTORY_FONTS = \ -- 2.43.0 From christian at klarinett.li Wed Feb 28 14:56:40 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:56:40 +0100 Subject: [Buildroot] [PATCH 1/2] package/zic: add hash for existing patch Message-ID: <20240228145642.436509-1-christian@klarinett.li> From: Christian Hitz Signed-off-by: Christian Hitz --- package/zic/zic.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zic/zic.hash b/package/zic/zic.hash index a2720a27ba..f2a48b1d2e 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -2,3 +2,4 @@ sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE +sha256 9e3c665b2cf8ad1eeb3458ec736e644e3d0c86a5e2fa8bcc4f34d72317511958 0001-remove-dependency-check-on-version-file.patch -- 2.43.0 From christian at klarinett.li Wed Feb 28 14:56:41 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:56:41 +0100 Subject: [Buildroot] [PATCH 2/2] package/zic: enable installation on target In-Reply-To: <20240228145642.436509-1-christian@klarinett.li> References: <20240228145642.436509-1-christian@klarinett.li> Message-ID: <20240228145642.436509-2-christian@klarinett.li> From: Christian Hitz Signed-off-by: Christian Hitz --- package/Config.in | 1 + package/zic/Config.in | 6 ++++++ package/zic/zic.mk | 14 ++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 package/zic/Config.in diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..909b716f16 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2237,6 +2237,7 @@ endif source "package/uvw/Config.in" source "package/volk/Config.in" source "package/xapian/Config.in" + source "package/zic/Config.in" endmenu menu "Security" diff --git a/package/zic/Config.in b/package/zic/Config.in new file mode 100644 index 0000000000..11a8c99a66 --- /dev/null +++ b/package/zic/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_ZIC + bool "zic" + help + timezone information compiler (zic) + + https://www.iana.org/time-zones diff --git a/package/zic/zic.mk b/package/zic/zic.mk index a915f6d256..12bb9e9943 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -10,6 +10,19 @@ ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 ZIC_LICENSE = Public domain ZIC_LICENSE_FILES = LICENSE +ZIC_INSTALL_STAGING = YES + +define ZIC_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) zic +endef + +define ZIC_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 644 $(@D)/tzfile.h $(TARGET_DIR)/usr/include/tzfile.h +endef + +define ZIC_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/zic $(TARGET_DIR)/usr/sbin/zic +endef define HOST_ZIC_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) zic @@ -20,6 +33,7 @@ define HOST_ZIC_INSTALL_CMDS $(INSTALL) -D -m 644 $(@D)/tzfile.h $(HOST_DIR)/include/tzfile.h endef +$(eval $(generic-package)) $(eval $(host-generic-package)) ZIC = $(HOST_DIR)/sbin/zic -- 2.43.0 From christian at klarinett.li Wed Feb 28 14:51:29 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:51:29 +0100 Subject: [Buildroot] [PATCH] package/arm-trusted-firmware: add ARM_TRUSTED_FIRMWARE_CPE_ID_* Message-ID: <20240228145129.416828-1-christian@klarinett.li> From: Christian Hitz cpe:2.3:o:arm:arm-trusted-firmware:2.4:-:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/78601535-610A-45A5-A5F0-AFC6A27A7F83 Signed-off-by: Christian Hitz --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 2d554c1da8..ebb9b8e9f6 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -24,6 +24,8 @@ ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif endif +ARM_TRUSTED_FIRMWARE_CPE_ID_VENDOR = arm +ARM_TRUSTED_FIRMWARE_CPE_ID_PREFIX = cpe:2.3:o ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE):$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y:y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) -- 2.43.0 From christian at klarinett.li Wed Feb 28 15:01:46 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 16:01:46 +0100 Subject: [Buildroot] [PATCH] package/freetype: use correct license format for dual licensed package Message-ID: <20240228150146.455494-1-christian@klarinett.li> From: Christian Hitz Signed-off-by: Christian Hitz --- package/freetype/freetype.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 1f4bcaf341..5032414d63 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -9,7 +9,7 @@ FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" -FREETYPE_LICENSE = Dual FTL/GPL-2.0+ +FREETYPE_LICENSE = FTL or GPL-2.0+ FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf -- 2.43.0 From bugzilla at busybox.net Wed Feb 28 15:46:20 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 28 Feb 2024 15:46:20 +0000 Subject: [Buildroot] [Bug 15961] New: empty file statistic on partial build Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15961 Bug ID: 15961 Summary: empty file statistic on partial build Product: buildroot Version: 2023.11 Hardware: PC OS: Linux Status: NEW Severity: minor Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: laurentbadel at eaton.com CC: buildroot at uclibc.org Target Milestone: --- There seems to be a problem with the package statistics in pkg-generic.mk. As I understand the files-lists* files are used to track which files were installed in which directories during the installations steps. I have found this quite helpful to keep track version numbers of packages in my final rootfs, for example, but it seems that this functionality is now partly broken and produces only empty files in case of a partial build. Looking at pkg-generic.mk, the logic seems to be that we collect lists of files after the configuration step, and store these lists in files-list*.before. Then, at the end of the installation step, we generate new lists of files in files-list*.after, which we compare with the .before files generated earlier, and extract the entries that are present only in the .after file. The problem is that this does not work when using -rebuild or -reinstall targets, because (i) the .before files are deleted after the first installation, and (ii) the contents of the .before file might not be up-to-date anyway since other stuff may have been installed in-between. It seems to me that moving the calls to pkg_size_before into the .stamp_*_installed targets themselves would solve the problem. In this way, the state of the directories just before, and just after, the package installation, will be compared, producing the expected results. I have tested this with the below patch, and the results were as I expected. I would gladly submit it directly, but I am unsure if my understanding of the purpose and contents of these files is correct, and I'd rather not spam the entire list with nonsense. I am using the 2023.11 tag but I don't see any recent patch indicating that this might have been fixed. Thank you very much in advance, Laurent >From 99421a92a8dce34385c4ec3d51ee4a1c54327a54 Mon Sep 17 00:00:00 2001 From: Laurent Badel Date: Wed, 28 Feb 2024 15:39:29 +0000 Subject: [PATCH] package/pkg-generic: fix file statistics for partial builds Signed-off-by: Laurent Badel --- package/pkg-generic.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 577a148c..db5cc81a 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -265,10 +265,6 @@ $(BUILD_DIR)/%/.stamp_configured: $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) - @$(call pkg_size_before,$(TARGET_DIR)) - @$(call pkg_size_before,$(STAGING_DIR),-staging) - @$(call pkg_size_before,$(BINARIES_DIR),-images) - @$(call pkg_size_before,$(HOST_DIR),-host) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) @@ -289,6 +285,7 @@ $(BUILD_DIR)/%/.stamp_built:: $(BUILD_DIR)/%/.stamp_host_installed: @$(call step_start,install-host) @$(call MESSAGE,"Installing to host directory") + @$(call pkg_size_before,$(TARGET_DIR)) $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) @@ -318,6 +315,7 @@ $(BUILD_DIR)/%/.stamp_host_installed: $(BUILD_DIR)/%/.stamp_staging_installed: @$(call step_start,install-staging) @$(call MESSAGE,"Installing to staging directory") + @$(call pkg_size_before,$(TARGET_DIR)) $(foreach hook,$($(PKG)_PRE_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_STAGING_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) @@ -360,6 +358,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed: $(BUILD_DIR)/%/.stamp_images_installed: @$(call step_start,install-image) @$(call MESSAGE,"Installing to images directory") + @$(call pkg_size_before,$(BINARIES_DIR),-images) $(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_IMAGES_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) @@ -370,6 +369,7 @@ $(BUILD_DIR)/%/.stamp_images_installed: $(BUILD_DIR)/%/.stamp_target_installed: @$(call step_start,install-target) @$(call MESSAGE,"Installing to target") + @$(call pkg_size_before,$(TARGET_DIR)) $(foreach hook,$($(PKG)_PRE_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_TARGET_CMDS) $(if $(BR2_INIT_SYSTEMD),\ -- 2.17.1 -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Wed Feb 28 16:14:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:14:31 +0100 Subject: [Buildroot] [PATCH] package/wpewebkit: security bump to version 2.42.4 In-Reply-To: <20240123085419.1761894-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Tue, 23 Jan 2024 10:54:17 +0200") References: <20240123085419.1761894-1-aperez@igalia.com> Message-ID: <87sf1cpnvc.fsf@48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > The minimum GCC version is changed to 10.x, conditionals added for > USE_JPEGXL and USE_GBM. Both are optional and will be automatically > enabled if the relevent packages have been enabled. GBM is recommended > for performance, is it avoids a buffer copy on each frame rendered by > WebKit. > Release notes: > - https://wpewebkit.org/release/wpewebkit-2.40.4.html > - https://wpewebkit.org/release/wpewebkit-2.40.5.html > - https://wpewebkit.org/release/wpewebkit-2.42.0.html > - https://wpewebkit.org/release/wpewebkit-2.42.1.html > - https://wpewebkit.org/release/wpewebkit-2.42.2.html > - https://wpewebkit.org/release/wpewebkit-2.42.3.html > - https://wpewebkit.org/release/wpewebkit-2.42.4.html > This update covers fixes for CVE-2023-37450, CVE-2023-38133, > CVE-2023-38572, CVE-2023-38592, CVE-2023-38594, CVE-2023-38595, > CVE-2023-38597, CVE-2023-38599, CVE-2023-38600, CVE-2023-38611, > CVE-2023-40397, CVE-2023-39928, CVE-2023-39434, CVE-2023-40451, > CVE-2023-41074, CVE-2023-41993, CVE-2023-32359, CVE-2023-41983, > CVE-2023-42852, CVE-2023-42916, CVE-2023-42917, CVE-2023-42883, > and CVE-2023-42890. > Relevant security advisories: > - https://wpewebkit.org/security/WSA-2023-0006.html > - https://wpewebkit.org/security/WSA-2023-0007.html > - https://wpewebkit.org/security/WSA-2023-0008.html > - https://wpewebkit.org/security/WSA-2023-0009.html > - https://wpewebkit.org/security/WSA-2023-0010.html > - https://wpewebkit.org/security/WSA-2023-0011.html > - https://wpewebkit.org/security/WSA-2023-0012.html > Signed-off-by: Adrian Perez de Castro Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:19:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:19:20 +0100 Subject: [Buildroot] [PATCH v5 2/3] package/webkitgtk: select wpebackend-fdo if wayland target is enabled In-Reply-To: <20231114150725.GD1974649@igalia.com> (Adrian Perez de Castro's message of "Tue, 14 Nov 2023 15:07:25 +0200") References: <20231001165218.1960930-3-thomas.devoogdt@barco.com> <20231110164617.569602-1-thomas@devoogdt.com> <20231110164617.569602-2-thomas@devoogdt.com> <20231114150725.GD1974649@igalia.com> Message-ID: <87o7c0pnnb.fsf@48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > On Fri, 10 Nov 2023 17:46:16 +0100 Thomas Devoogdt wrote: >> libwep & wpebackend-fdo are mandatory if ENABLE_WAYLAND_TARGET and EGL_FOUND >> https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L388-L400 >> >> egl is mandatory if ENABLE_WAYLAND_TARGET >> https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L462-L473 >> >> So wpebackend-fdo (-> libwpe) has to be selected if BR2_PACKAGE_LIBGTK3_WAYLAND. >> >> Signed-off-by: Thomas Devoogdt > Tested-By: Adrian Perez de Castro Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:19:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:19:27 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/webkitgtk: make gbm support optional In-Reply-To: <20231114150652.GB1974649@igalia.com> (Adrian Perez de Castro's message of "Tue, 14 Nov 2023 15:06:52 +0200") References: <20231001165218.1960930-3-thomas.devoogdt@barco.com> <20231110164617.569602-1-thomas@devoogdt.com> <20231114150652.GB1974649@igalia.com> Message-ID: <87jzmopnn4.fsf@48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > On Fri, 10 Nov 2023 17:46:15 +0100 Thomas Devoogdt wrote: >> This was added upstream in commit: >> >> https://github.com/WebKit/WebKit/commit/22e4c0386605d84f42f2d46fd20bdc46e3078498 >> >> The 'USE_OPENGL_OR_ES' flag is default ON, which will enable 'USE_GBM', >> so ensure that we unset 'USE_GBM' if we don't have libgbm. >> >> Signed-off-by: Thomas Devoogdt > Tested-by: Adrian Perez de Castro Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:24:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:24:41 +0100 Subject: [Buildroot] [PATCH v5 3/3] package/webkitgtk: bump to version 2.42.2 In-Reply-To: <20231110164617.569602-3-thomas@devoogdt.com> References: <20231110164617.569602-1-thomas@devoogdt.com> <20231110164617.569602-3-thomas@devoogdt.com> Message-ID: <08ec51d4-8aad-40e8-81f0-33b8ac66299d@korsgaard.com> On 10/11/2023 17.46, Thomas Devoogdt wrote: > Update to a new major release. > > Release notes: > > https://webkitgtk.org/2023/09/15/webkitgtk2.42.0-released.html > https://webkitgtk.org/2023/09/27/webkitgtk2.42.1-released.html > https://webkitgtk.org/2023/11/10/webkitgtk2.42.2-released.html > > Security notes: > > https://webkitgtk.org/security/WSA-2023-0008.html > > - USE_JPEGXL is enabled by default now [1], so add a libjxl if used. > > - ENABLE_GLES2 has been dropped, so drop it also here [2]. > Instead, enable USE_OPENGL_OR_ES if libgles is present. Beware that also > libegl is needed for USE_OPENGL_OR_ES, but that one is most of the time a > dependency for libgles, so leave it out here. > > - Also raise the minimal GCC version to 10.2, which is required since webkitgtk-2.42.x [3]. > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, > we do check on >= GCC 10, because we can't check on >= GCC 10.2. > > [1] https://github.com/WebKit/WebKit/commit/93865414f33190c57e293a80492e10edc461d7f0 > [2] https://github.com/WebKit/WebKit/commit/cfe917fec45bf72c371087ece034feee8454f1b4 > [3] https://github.com/WebKit/WebKit/commit/133498aaee8f44443d9e3b2a08be4a4b77b93fc9 > > Signed-off-by: Thomas Devoogdt > --- > v2: n/a > v3: > - replace for package/webkitgtk: add a USE_OPENGL_OR_ES config option > - 2.42.0 needs an extra bunch of patches, so bump to immediately to 2.42.1 > v4: > - fixed incomplete git massage (a ____ line splits the git message apparently) > - re-added patches with upstream cherry-pick and hash > v5: > - 2.42.1 needs an extra bunch of patches, so bump to immediately to 2.42.2 Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:29:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:29:03 +0100 Subject: [Buildroot] [PATCH] package/hiredis: do not install nuget packaging file In-Reply-To: <20240120132840.3274187-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Sat, 20 Jan 2024 14:28:40 +0100") References: <20240120132840.3274187-1-yann.morin.1998@free.fr> Message-ID: <87frxcpn74.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > The NuGet packaging description file is installed as: > $(DEST_DIR)/build/native/hiredis.targets > This is a sprurious file that has nothing to do on a Linux system, > whether that be in host/, staging/, or target/. > Signed-off-by: Yann E. MORIN > Cc: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:38:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:38:51 +0100 Subject: [Buildroot] [PATCH] boot/syslinux: carry fix for build failures with binutils 2.31+ In-Reply-To: <20231223213800.348426-1-yann.morin.1998@free.fr> References: <20231223213800.348426-1-yann.morin.1998@free.fr> Message-ID: <3da3fab9-dd42-4cd7-ad82-3ee8ea166334@korsgaard.com> On 23/12/2023 22.38, Yann E. MORIN wrote: > From a report on the syslinux mailing list [0]: > > The GNU linker now writes two segments of type PT_LOAD into the > program header. However, this is not supported by the wrapper > script that converts the shared object to an .efi executable. > As per comment in that file: > > (...) Although there may be several LOAD program headers, > only one is currently copied. > > A simple workaround I've found to work is to ask the linker to put > everything into one PT_LOAD program header. > > The issue is ackowledged in the syslinux wiki page about building > syslinux [1]. This page refers to various resources, of which a Debian > patch [2]. > > This information is also referenced in #11861. > > Fixes: #11861 > > [0] https://www.syslinux.org/archives/2018-August/026167.html > [1] https://wiki.syslinux.org/wiki/index.php?title=Building > [2] https://salsa.debian.org/images-team/syslinux/-/blob/debian/master/debian/patches/0017-single-load-segment.patch > > Reported-by: Sam Lancia > Reported-by: Meliodas > Signed-off-by: Yann E. MORIN > > --- > Sam, Meliodas: I have no test-case to validate this change, so it would > be nice if you could report on whether the above does indeed fixes the > issue you reported. Bonus point: it would be even better if we could > improve on the existing runtime test: support/testing/tests/boot/test_syslinux.py > It currently only does a test build, so it does not catch the issue; the > grub2 test we have does run, so we can catch failures. It would be nice > to also have a runtime test for syslinux... Committed to 2023.02.x and 2023.11.x, thanks -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:40:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:40:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/weston: fix build without gbm In-Reply-To: <20240122211451.3591-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 22 Jan 2024 22:14:51 +0100") References: <20240122211451.3591-1-fontaine.fabrice@gmail.com> Message-ID: <87bk80pmoo.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without gbm raised since commit > 534c22dd606e200969fce49b8d23b27902dec94e: > Message: dmabuf-feedback requires gbm which was not found. If you > rather not build this, drop "dmabuf-feedback" from simple-clients > option. > Fixes: > - http://autobuild.buildroot.org/results/ebbba1d73ceeaacee17fde0c6c853415cd316091 > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:41:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:41:36 +0100 Subject: [Buildroot] [git commit] package/environment-setup: do not export GIT_DIR In-Reply-To: <20240127200855.3B760865AE@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 27 Jan 2024 21:07:46 +0100") References: <20240127200855.3B760865AE@busybox.osuosl.org> Message-ID: <877ciopmm7.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=48874afb9d03cb02b0207fd53bf2cdf0c37c8fa0 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Commit c07aafa08792 (package/Makefile.in: set GIT_DIR=. in {HOST, > TARGET}_MAKE_ENV) added GIT_DIR=. to TARGET_MAKE_ENV (which is included in > TARGET_CONFIGURE_OPTS) to work around issues with packages getting confused > when building in a subdir of the Buildroot git repo. > This unfortunately also causes git commands to fail when > output/host/environment-setup is sourced: > git status > fatal: not a git repository: '.' > So strip GIT_DIR= from TARGET_CONFIGURE_OPTS when generating > environment-setup. > Reported-by: Mircea Gliga > Signed-off-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:42:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:42:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: security bump to version 2.28.7 In-Reply-To: (Yann E. MORIN's message of "Sat, 27 Jan 2024 21:15:34 +0100") References: <20240126222324.1790975-1-fontaine.fabrice@gmail.com> Message-ID: <8734tcpml7.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Fabrice, All, > On 2024-01-26 23:23 +0100, Fabrice Fontaine spake thusly: >> - Fix CVE-2024-23170 and CVE-2024-23775 >> - Mbed TLS is now released under a dual Apache-2.0 OR GPL-2.0-or-later >> license. Users may choose which license they take the code under: >> https://github.com/Mbed-TLS/mbedtls/commit/f429557c5900d3b90bd10a21b228f719e80f81a2 >> >> https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-1/ >> https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-2/ >> https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.6 >> https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.7 >> >> Signed-off-by: Fabrice Fontaine > Applied to master, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:43:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:43:20 +0100 Subject: [Buildroot] [PATCH] package/darkhttpd: security bump to version 1.15 In-Reply-To: <87wmrtzy9i.fsf@48ers.dk> (Peter Korsgaard's message of "Sun, 28 Jan 2024 08:56:57 +0100") References: <20240126135747.2407552-1-peter@korsgaard.com> <87wmrtzy9i.fsf@48ers.dk> Message-ID: <87y1b4o7yv.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Yann" == Yann E MORIN writes: >> Peter, All, >> On 2024-01-26 14:57 +0100, Peter Korsgaard spake thusly: >>> Fixes the following security issues: >>> >>> CVE-2024-23770: Local Leak of Authentication Parameter in Process List >>> >>> CVE-2024-23771: Basic Auth Timing Attack >>> >>> https://security.opensuse.org/2024/01/22/darkhttpd-basic-auth-issues.html >>> >>> Notice that CVE-2024-23770 is only documented as a known weakness, not >>> fixed. >>> >>> Also change the license logic to use the dedicated COPYING file available >>> since 1.14: >>> >>> https://github.com/emikulic/darkhttpd/commit/a8ae2b1de069588cad23d79a5392445ee9590fcd >>> >>> This license is ISC, not MIT - So adjust DARKHTTPD_LICENSE to match. >> This means the licensing stuff should be backported to the maintenance >> branches, and should thus have been a separate patch prior to the >> version bump. >> But since this is a security fix, I guess you'll want to backport the >> version bump too. And since the odlest stable, 2023.02, already had >> darkhttpd 1.14, it is possibe to backport the version bump to all >> maintenance branches. >> Thus, I considered splitting, got slightly cat-distracted, and pushed >> without splitting. > Hehe ;) That was indeed also the reason why I didn't do the effort to > split it in multiple patches. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 13:42:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:42:02 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/falcosecurity-libs: drop FALCOSECURITY_LIBS_CPE_ID_VENDOR Message-ID: <20240228164337.BFE0587BD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e54bc8af8b3e4bfd6f88dc7360e36180c7c68cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x FALCOSECURITY_LIBS_CPE_ID_VENDOR is plain wrong since the addition of the package in commit a15e35c4ebc52f29f65372c8e86cefa874aa4aaf, indeed falco:falcosecurity-libs is not a valid CPE ID: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:falco:falcosecurity-libs Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 9b36995c2c205fc46824c556f8c97d461c1c6bb8) Signed-off-by: Peter Korsgaard --- package/falcosecurity-libs/falcosecurity-libs.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk index 92d5c61832..4245f9581a 100644 --- a/package/falcosecurity-libs/falcosecurity-libs.mk +++ b/package/falcosecurity-libs/falcosecurity-libs.mk @@ -8,7 +8,6 @@ FALCOSECURITY_LIBS_VERSION = e5c53d648f3c4694385bbe488e7d47eaa36c229a FALCOSECURITY_LIBS_SITE = $(call github,falcosecurity,libs,$(FALCOSECURITY_LIBS_VERSION)) FALCOSECURITY_LIBS_LICENSE = Apache-2.0 (userspace), MIT or GPL-2.0 (driver) FALCOSECURITY_LIBS_LICENSE_FILES = COPYING driver/MIT.txt driver/GPL2.txt -FALCOSECURITY_LIBS_CPE_ID_VENDOR = falco FALCOSECURITY_LIBS_DEPENDENCIES = \ c-ares \ From peter at korsgaard.com Wed Feb 28 16:20:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:20:38 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/webkitgtk: make gbm support optional Message-ID: <20240228164337.F3FEC87BD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05292fbfdba2b1a8897e1ea94e8277ca6abc9a60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x This was added upstream in commit: https://github.com/WebKit/WebKit/commit/22e4c0386605d84f42f2d46fd20bdc46e3078498 The 'USE_OPENGL_OR_ES' flag is default ON, which will enable 'USE_GBM', so ensure that we unset 'USE_GBM' if we don't have libgbm. Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit c06c0197f95c3ae3408469f7e0702a00d788feb6) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 4a3f9e61c1..b14a4d16ce 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -86,6 +86,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF endif +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) +WEBKITGTK_CONF_OPTS += -DUSE_GBM=ON +WEBKITGTK_DEPENDENCIES += libgbm +else +WEBKITGTK_CONF_OPTS += -DUSE_GBM=OFF +endif + ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ From peter at korsgaard.com Wed Feb 28 16:17:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:17:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/webkitgtk: select wpebackend-fdo if wayland target is enabled Message-ID: <20240228164337.D5F9087B82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f94f04a957ae8ff247571d505741faece7ef0ae6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x libwep & wpebackend-fdo are mandatory if ENABLE_WAYLAND_TARGET and EGL_FOUND https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L388-L400 egl is mandatory if ENABLE_WAYLAND_TARGET https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L462-L473 So wpebackend-fdo (-> libwpe) has to be selected if BR2_PACKAGE_LIBGTK3_WAYLAND. Signed-off-by: Thomas Devoogdt Tested-By: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit b9c0e48f68ffb3ffa5ffc9d23edafc89c6a4d41f) Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 1 + package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index d47d6a8c1b..dee13f8ea6 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -53,6 +53,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_WOFF2 + select BR2_PACKAGE_WPEBACKEND_FDO if BR2_PACKAGE_LIBGTK3_WAYLAND select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index d5e983e403..881c2df07b 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -106,7 +106,7 @@ WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON endif endif -ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND)$(BR2_PACKAGE_WPEBACKEND_FDO),yy) +ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=ON WEBKITGTK_DEPENDENCIES += wpebackend-fdo else From peter at korsgaard.com Wed Feb 28 16:21:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:21:39 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/webkitgtk: bump to version 2.42.2 Message-ID: <20240228164338.0AF3987BD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54be12aaed13dc1e1ea7eb8c7c1173c47ba6a9cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Update to a new major release. Release notes: https://webkitgtk.org/2023/09/15/webkitgtk2.42.0-released.html https://webkitgtk.org/2023/09/27/webkitgtk2.42.1-released.html https://webkitgtk.org/2023/11/10/webkitgtk2.42.2-released.html Security notes: https://webkitgtk.org/security/WSA-2023-0008.html - USE_JPEGXL is enabled by default now [1], so add a libjxl if used. - ENABLE_GLES2 has been dropped, so drop it also here [2]. Instead, enable USE_OPENGL_OR_ES if libgles is present. Beware that also libegl is needed for USE_OPENGL_OR_ES, but that one is most of the time a dependency for libgles, so leave it out here. - Also raise the minimal GCC version to 10.2, which is required since webkitgtk-2.42.x [3]. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 10, because we can't check on >= GCC 10.2. [1] https://github.com/WebKit/WebKit/commit/93865414f33190c57e293a80492e10edc461d7f0 [2] https://github.com/WebKit/WebKit/commit/cfe917fec45bf72c371087ece034feee8454f1b4 [3] https://github.com/WebKit/WebKit/commit/133498aaee8f44443d9e3b2a08be4a4b77b93fc9 Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit c4abff80b0fc0001e5804e43d32cbeb67d3d2009) Signed-off-by: Peter Korsgaard --- ...ailure-when-gstreamer-support-is-disabled.patch | 36 ---------------------- package/webkitgtk/Config.in | 6 ++-- package/webkitgtk/webkitgtk.hash | 6 ++-- package/webkitgtk/webkitgtk.mk | 16 +++++++--- 4 files changed, 17 insertions(+), 47 deletions(-) diff --git a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch b/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch deleted file mode 100644 index 3fa23b215b..0000000000 --- a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9b31965cdf362768e86f7e592e59e68fb3351261 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Tue, 8 Aug 2023 16:51:25 -0700 -Subject: [PATCH] Fix build failure when gstreamer support is disabled - https://bugs.webkit.org/show_bug.cgi?id=259931 https://bugs.gentoo.org/911663 - -Reviewed by Carlos Alberto Lopez Perez. - -* Source/WebCore/loader/MixedContentChecker.cpp: - -Canonical link: https://commits.webkit.org/260527.429 at fix-build - -(cherry picked from commit f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732) - -Upstream: https://github.com/WebKit/WebKit/commit/f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732 -Signed-off-by: Thomas Devoogdt ---- - Source/WebCore/loader/MixedContentChecker.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/WebCore/loader/MixedContentChecker.cpp b/Source/WebCore/loader/MixedContentChecker.cpp -index 9b4c7fe62020..ac4733bc08bc 100644 ---- a/Source/WebCore/loader/MixedContentChecker.cpp -+++ b/Source/WebCore/loader/MixedContentChecker.cpp -@@ -33,6 +33,8 @@ - #include "ContentSecurityPolicy.h" - #include "Document.h" - #include "Frame.h" -+#include "FrameLoader.h" -+#include "FrameLoaderClient.h" - #include "SecurityOrigin.h" - - namespace WebCore { --- -2.42.0 - diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index dee13f8ea6..2a72cb0841 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 9, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7f50f1aa7b..59782732c3 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.40.5.tar.xz.sums -sha1 2f4d06b021115eb4106177f7d5f534f45b5d3b2e webkitgtk-2.40.5.tar.xz -sha256 7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f webkitgtk-2.40.5.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.2.tar.xz.sums +sha1 05bec6a824e46f043b865478735bc8395249510e webkitgtk-2.42.2.tar.xz +sha256 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 webkitgtk-2.42.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b14a4d16ce..ce507dc271 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.40.5 +WEBKITGTK_VERSION = 2.42.2 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -71,6 +71,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF endif +ifeq ($(BR2_PACKAGE_LIBJXL),y) +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON +WEBKITGTK_DEPENDENCIES += libjxl +else +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=OFF +endif + ifeq ($(BR2_PACKAGE_LIBMANETTE),y) WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=ON WEBKITGTK_DEPENDENCIES += libmanette @@ -78,12 +85,11 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -# Use GLES if available and desktop GL is not. -ifeq ($(BR2_PACKAGE_HAS_LIBGL):$(BR2_PACKAGE_HAS_LIBGLES),:y) -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=ON WEBKITGTK_DEPENDENCIES += libgles else -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=OFF endif ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) From peter at korsgaard.com Wed Feb 28 16:42:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:42:00 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/mbedtls: security bump to version 2.28.7 Message-ID: <20240228164338.2C2CE87BD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e057ff46e1e53e10cc533a8ade7bf4868af580e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x - Fix CVE-2024-23170 and CVE-2024-23775 - Mbed TLS is now released under a dual Apache-2.0 OR GPL-2.0-or-later license. Users may choose which license they take the code under: https://github.com/Mbed-TLS/mbedtls/commit/f429557c5900d3b90bd10a21b228f719e80f81a2 https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-1/ https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-2/ https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.6 https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 52fd4753fe64208bfc25dc8a298f067da5c4c4b4) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 6 +++--- package/mbedtls/mbedtls.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index d0cd0b2105..3ec151a859 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.4: -sha256 849e86b626e42ded6bf67197b64aa771daa54e2a7e2868dc67e1e4711959e5e3 mbedtls-2.28.5.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.7: +sha256 1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a mbedtls-2.28.7.tar.gz # Locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 1b941e04f4..cdb4aef4f4 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.5 +MBEDTLS_VERSION = 2.28.7 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ @@ -12,7 +12,7 @@ MBEDTLS_CONF_OPTS = \ -DENABLE_TESTING=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF MBEDTLS_INSTALL_STAGING = YES -MBEDTLS_LICENSE = Apache-2.0 +MBEDTLS_LICENSE = Apache-2.0 or GPL-2.0+ MBEDTLS_LICENSE_FILES = LICENSE MBEDTLS_CPE_ID_VENDOR = arm MBEDTLS_CPE_ID_PRODUCT = mbed_tls From peter at korsgaard.com Wed Feb 28 16:20:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:20:28 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/webkitgtk: allow both X11 and Wayland Message-ID: <20240228164337.E8F8E87BD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0617a0191a515edfa72fb4aaba185bd33ea2d691 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Allow enabling support for both the X11 and Wayland backends. This in turn needs reorganizing how desktop GL or OpenGL ES is chosen, as it no longer can depend on whether Wayland support is enabled: the BR2_PACKAGE_HAS_LIBGL and BR2_PACKAGE_HAS_LIBGLES variables are both checked, and ENABLE_GLES2 is set only if the package providing OpenGL claims only GLES is supported; otherwise desktop GL is preferred. This matches the existing logic. The existing comment indicating that only one of both windowing systems can be enabled was wrong: the same WebKitGTK build can target both X11 and Wayland at the same time, as long as GTK itself has been built accordingly. Enabling both is the approach taken by most Linux distributions, and has been supported for years. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Devoogdt Signed-off-by: Yann E. MORIN (cherry picked from commit a23251d3f738b44eab40375fc8822e0358d70517) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 881c2df07b..4a3f9e61c1 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -78,32 +78,32 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -# Only one target platform can be built, assume X11 > Wayland +# Use GLES if available and desktop GL is not. +ifeq ($(BR2_PACKAGE_HAS_LIBGL):$(BR2_PACKAGE_HAS_LIBGLES),:y) +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON +WEBKITGTK_DEPENDENCIES += libgles +else +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +endif -# GTK3-X11 target gives OpenGL from newer libgtk3 versions -# Consider this better than EGL + maybe GLESv2 since both can't be built -# 2D CANVAS acceleration requires OpenGL proper with cairo-gl ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=OFF \ - -DENABLE_X11_TARGET=ON +WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt -else # !X11 -# GTK3-BROADWAY/WAYLAND needs at least EGL -WEBKITGTK_DEPENDENCIES += libegl -# GLESv2 support is optional though -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON -WEBKITGTK_DEPENDENCIES += libgles else -# Disable general OpenGL (shading) if there's no GLESv2 -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=OFF endif -# We must explicitly state the wayland target + ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON +WEBKITGTK_DEPENDENCIES += libegl +else +WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=OFF endif + +# If only the GTK Broadway backend is enabled, EGL is still needed. +ifeq ($(BR2_PACKAGE_LIBGTK3_X11):$(BR2_PACKAGE_LIBGTK3_WAYLAND):$(BR2_PACKAGE_LIBGTK3_BROADWAY),::y) +WEBKITGTK_DEPENDENCIES += libegl endif ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) From peter at korsgaard.com Wed Feb 28 13:45:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:45:00 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/wpewebkit: security bump to version 2.42.4 Message-ID: <20240228164337.CB42587BD6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3c246ef728125c1d43aaabc16e534cbd494f205 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The minimum GCC version is changed to 10.x, conditionals added for USE_JPEGXL and USE_GBM. Both are optional and will be automatically enabled if the relevent packages have been enabled. GBM is recommended for performance, is it avoids a buffer copy on each frame rendered by WebKit. Release notes: - https://wpewebkit.org/release/wpewebkit-2.40.4.html - https://wpewebkit.org/release/wpewebkit-2.40.5.html - https://wpewebkit.org/release/wpewebkit-2.42.0.html - https://wpewebkit.org/release/wpewebkit-2.42.1.html - https://wpewebkit.org/release/wpewebkit-2.42.2.html - https://wpewebkit.org/release/wpewebkit-2.42.3.html - https://wpewebkit.org/release/wpewebkit-2.42.4.html This update covers fixes for CVE-2023-37450, CVE-2023-38133, CVE-2023-38572, CVE-2023-38592, CVE-2023-38594, CVE-2023-38595, CVE-2023-38597, CVE-2023-38599, CVE-2023-38600, CVE-2023-38611, CVE-2023-40397, CVE-2023-39928, CVE-2023-39434, CVE-2023-40451, CVE-2023-41074, CVE-2023-41993, CVE-2023-32359, CVE-2023-41983, CVE-2023-42852, CVE-2023-42916, CVE-2023-42917, CVE-2023-42883, and CVE-2023-42890. Relevant security advisories: - https://wpewebkit.org/security/WSA-2023-0006.html - https://wpewebkit.org/security/WSA-2023-0007.html - https://wpewebkit.org/security/WSA-2023-0008.html - https://wpewebkit.org/security/WSA-2023-0009.html - https://wpewebkit.org/security/WSA-2023-0010.html - https://wpewebkit.org/security/WSA-2023-0011.html - https://wpewebkit.org/security/WSA-2023-0012.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit 7a8c112df7a15426c602bc04eb720c762ba8bc98) Signed-off-by: Peter Korsgaard --- package/wpewebkit/Config.in | 6 +++--- package/wpewebkit/wpewebkit.hash | 6 +++--- package/wpewebkit/wpewebkit.mk | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index ea2159945d..ed2821697f 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 9, host gcc >= 4.9" +comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ || !BR2_HOST_GCC_AT_LEAST_4_9 comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" @@ -37,7 +37,7 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index aaeea2bcda..322e494c36 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,6 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.40.3.tar.xz.sums -sha1 c840bd76b2c86cb8ca0d68b56598cb0abbafc727 wpewebkit-2.40.3.tar.xz -sha256 05b6a9cb1d7d03485e0dc41b2a8e6f99a36aea23d32ba3ecb38d0d6860747ada wpewebkit-2.40.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums +sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz +sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index c13a7201e6..17775524c1 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.40.3 +WPEWEBKIT_VERSION = 2.42.4 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -83,6 +83,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF endif +ifeq ($(BR2_PACKAGE_LIBJXL),y) +WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=ON +WPEWEBKIT_DEPENDENCIES += libjxl +else +WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=OFF +endif + ifeq ($(BR2_INIT_SYSTEMD),y) WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=ON WPEWEBKIT_DEPENDENCIES += systemd @@ -90,6 +97,13 @@ else WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=OFF endif +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) +WPEWEBKIT_CONF_OPTS += -DUSE_GBM=ON +WPEWEBKIT_DEPENDENCIES += libgbm +else +WPEWEBKIT_CONF_OPTS += -DUSE_GBM=OFF +endif + # JIT is not supported for MIPS r6, but the WebKit build system does not # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. From peter at korsgaard.com Wed Feb 28 16:41:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:41:22 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/environment-setup: do not export GIT_DIR Message-ID: <20240228164338.228F387BD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c8d4ea2edec358ae68d4c463402ce81f4d8f603 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit c07aafa08792 (package/Makefile.in: set GIT_DIR=. in {HOST, TARGET}_MAKE_ENV) added GIT_DIR=. to TARGET_MAKE_ENV (which is included in TARGET_CONFIGURE_OPTS) to work around issues with packages getting confused when building in a subdir of the Buildroot git repo. This unfortunately also causes git commands to fail when output/host/environment-setup is sourced: git status fatal: not a git repository: '.' So strip GIT_DIR= from TARGET_CONFIGURE_OPTS when generating environment-setup. Reported-by: Mircea Gliga Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 48874afb9d03cb02b0207fd53bf2cdf0c37c8fa0) Signed-off-by: Peter Korsgaard --- package/environment-setup/environment-setup.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk index 29ec5a9a95..069ee25f9f 100644 --- a/package/environment-setup/environment-setup.mk +++ b/package/environment-setup/environment-setup.mk @@ -8,7 +8,7 @@ ENVIRONMENT_SETUP_FILE = $(HOST_DIR)/environment-setup define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS cp package/environment-setup/environment-setup $(ENVIRONMENT_SETUP_FILE) - for var in $(TARGET_CONFIGURE_OPTS); do \ + for var in $(filter-out GIT_DIR=%,$(TARGET_CONFIGURE_OPTS)); do \ printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ done printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) From peter at korsgaard.com Wed Feb 28 16:37:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:37:11 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] boot/syslinux: carry fix for build failures with binutils 2.31+ Message-ID: <20240228164338.1686687BD6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8f374db5c7c9df6190f3014b49e4839acb8eb09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x >From a report on the syslinux mailing list [0]: The GNU linker now writes two segments of type PT_LOAD into the program header. However, this is not supported by the wrapper script that converts the shared object to an .efi executable. As per comment in that file: (...) Although there may be several LOAD program headers, only one is currently copied. A simple workaround I've found to work is to ask the linker to put everything into one PT_LOAD program header. The issue is ackowledged in the syslinux wiki page about building syslinux [1]. This page refers to various resources, of which a Debian patch [2]. This information is also referenced in #11861. Fixes: #11861 [0] https://www.syslinux.org/archives/2018-August/026167.html [1] https://wiki.syslinux.org/wiki/index.php?title=Building [2] https://salsa.debian.org/images-team/syslinux/-/blob/debian/master/debian/patches/0017-single-load-segment.patch Reported-by: Sam Lancia Reported-by: Meliodas Signed-off-by: Yann E. MORIN (cherry picked from commit e53a8593b4edf5df1771692df6764b3bc385c6f4) Signed-off-by: Peter Korsgaard --- boot/syslinux/0018-single-load-segment.patch | 313 +++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) diff --git a/boot/syslinux/0018-single-load-segment.patch b/boot/syslinux/0018-single-load-segment.patch new file mode 100644 index 0000000000..11d73c31a4 --- /dev/null +++ b/boot/syslinux/0018-single-load-segment.patch @@ -0,0 +1,313 @@ +From: Lukas Schwaighofer +Date: Sat, 18 Aug 2018 16:56:35 +0200 +Subject: Force the linker to put all sections into a single PT_LOAD segment + +This is required when using binutils >= 2.31 which writes two PT_LOAD segments +by default. This is not supported by the wrapper.c script used to convert the +shared object into an elf binary. + +Forwarded: https://www.syslinux.org/archives/2018-August/026167.html +[yann.morin.1998 at free.fr: + - grab from the Debian package + - https://salsa.debian.org/images-team/syslinux/-/blob/fa1349f1f8e5f5d6307e589f02c0a679031d1c7f/debian/patches/0017-single-load-segment.patch +] +Signed-off-by: Yann E. MORIN +Upstream: reported https://www.syslinux.org/archives/2018-August/026167.html +Upstream: acknowledged https://wiki.syslinux.org/wiki/index.php?title=Building +--- + efi/i386/syslinux.ld | 37 +++++++++++++++++++++---------------- + efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++---------------- + 2 files changed, 42 insertions(+), 32 deletions(-) + +diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld +index bab3fc7..19c1647 100644 +--- a/efi/i386/syslinux.ld ++++ b/efi/i386/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") + OUTPUT_ARCH(i386) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + +diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld +index 450641c..a2c124f 100644 +--- a/efi/x86_64/syslinux.ld ++++ b/efi/x86_64/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") + OUTPUT_ARCH(i386:x86-64) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + From peter at korsgaard.com Wed Feb 28 16:42:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:42:57 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/darkhttpd: security bump to version 1.15 Message-ID: <20240228164338.3617787BD6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ed1ff4c43ee243fd46402aa37873f061370026f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following security issues: CVE-2024-23770: Local Leak of Authentication Parameter in Process List CVE-2024-23771: Basic Auth Timing Attack https://security.opensuse.org/2024/01/22/darkhttpd-basic-auth-issues.html Notice that CVE-2024-23770 is only documented as a known weakness, not fixed. Also change the license logic to use the dedicated COPYING file available since 1.14: https://github.com/emikulic/darkhttpd/commit/a8ae2b1de069588cad23d79a5392445ee9590fcd This license is ISC, not MIT - So adjust DARKHTTPD_LICENSE to match. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 0c7fd35947d91f84cff994bfb5c85b31b956d006) Signed-off-by: Peter Korsgaard --- package/darkhttpd/darkhttpd.hash | 4 ++-- package/darkhttpd/darkhttpd.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/darkhttpd/darkhttpd.hash b/package/darkhttpd/darkhttpd.hash index 188afff767..84a787eeba 100644 --- a/package/darkhttpd/darkhttpd.hash +++ b/package/darkhttpd/darkhttpd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 e063de9efa5635260c8def00a4d41ec6145226a492d53fa1dac436967670d195 darkhttpd-1.14.tar.gz -sha256 f002944c9a8516e3346002d39c3e13681306833358c0f3c7781dff1fdb639710 darkhttpd.c +sha256 ea48cedafbf43186f4a8d1afc99b33b671adee99519658446022e6f63bd9eda9 darkhttpd-1.15.tar.gz +sha256 1ecf63e8f84fd60ac7215e04195b9a61dcb47176ea65df26547582027f6c1dee COPYING diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index bda08899b8..e13f8f7770 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -4,10 +4,10 @@ # ################################################################################ -DARKHTTPD_VERSION = 1.14 +DARKHTTPD_VERSION = 1.15 DARKHTTPD_SITE = $(call github,emikulic,darkhttpd,v$(DARKHTTPD_VERSION)) -DARKHTTPD_LICENSE = MIT -DARKHTTPD_LICENSE_FILES = darkhttpd.c +DARKHTTPD_LICENSE = ISC +DARKHTTPD_LICENSE_FILES = COPYING DARKHTTPD_CPE_ID_VENDOR = darkhttpd_project define DARKHTTPD_BUILD_CMDS From peter at korsgaard.com Wed Feb 28 13:41:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:41:35 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/falcosecurity-libs: drop FALCOSECURITY_LIBS_CPE_ID_VENDOR Message-ID: <20240228164457.4789287BFA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=817f16ca02256d16d7218e9fbf5f64fb47bec848 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x FALCOSECURITY_LIBS_CPE_ID_VENDOR is plain wrong since the addition of the package in commit a15e35c4ebc52f29f65372c8e86cefa874aa4aaf, indeed falco:falcosecurity-libs is not a valid CPE ID: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:falco:falcosecurity-libs Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 9b36995c2c205fc46824c556f8c97d461c1c6bb8) Signed-off-by: Peter Korsgaard --- package/falcosecurity-libs/falcosecurity-libs.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk index 92d5c61832..4245f9581a 100644 --- a/package/falcosecurity-libs/falcosecurity-libs.mk +++ b/package/falcosecurity-libs/falcosecurity-libs.mk @@ -8,7 +8,6 @@ FALCOSECURITY_LIBS_VERSION = e5c53d648f3c4694385bbe488e7d47eaa36c229a FALCOSECURITY_LIBS_SITE = $(call github,falcosecurity,libs,$(FALCOSECURITY_LIBS_VERSION)) FALCOSECURITY_LIBS_LICENSE = Apache-2.0 (userspace), MIT or GPL-2.0 (driver) FALCOSECURITY_LIBS_LICENSE_FILES = COPYING driver/MIT.txt driver/GPL2.txt -FALCOSECURITY_LIBS_CPE_ID_VENDOR = falco FALCOSECURITY_LIBS_DEPENDENCIES = \ c-ares \ From peter at korsgaard.com Wed Feb 28 16:15:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:15:48 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/webkitgtk: select wpebackend-fdo if wayland target is enabled Message-ID: <20240228164457.62DC087BFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4848edca0d566482887465b7d7e1e89c3378cd89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x libwep & wpebackend-fdo are mandatory if ENABLE_WAYLAND_TARGET and EGL_FOUND https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L388-L400 egl is mandatory if ENABLE_WAYLAND_TARGET https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L462-L473 So wpebackend-fdo (-> libwpe) has to be selected if BR2_PACKAGE_LIBGTK3_WAYLAND. Signed-off-by: Thomas Devoogdt Tested-By: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit b9c0e48f68ffb3ffa5ffc9d23edafc89c6a4d41f) Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 1 + package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 927792b1e4..cb10784133 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -53,6 +53,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_WOFF2 + select BR2_PACKAGE_WPEBACKEND_FDO if BR2_PACKAGE_LIBGTK3_WAYLAND select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index bb6df3d592..cb7461ccbc 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -108,7 +108,7 @@ ifeq ($(BR2_PACKAGE_LIBGTK3_X11):$(BR2_PACKAGE_LIBGTK3_WAYLAND):$(BR2_PACKAGE_LI WEBKITGTK_DEPENDENCIES += libegl endif -ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND)$(BR2_PACKAGE_WPEBACKEND_FDO),yy) +ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=ON WEBKITGTK_DEPENDENCIES += wpebackend-fdo else From peter at korsgaard.com Wed Feb 28 13:43:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:43:22 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/wpewebkit: security bump to version 2.42.4 Message-ID: <20240228164457.5643187BFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9b7b9cf6f39f8766196dce8cfaaaef56effc206 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The minimum GCC version is changed to 10.x, conditionals added for USE_JPEGXL and USE_GBM. Both are optional and will be automatically enabled if the relevent packages have been enabled. GBM is recommended for performance, is it avoids a buffer copy on each frame rendered by WebKit. Release notes: - https://wpewebkit.org/release/wpewebkit-2.40.4.html - https://wpewebkit.org/release/wpewebkit-2.40.5.html - https://wpewebkit.org/release/wpewebkit-2.42.0.html - https://wpewebkit.org/release/wpewebkit-2.42.1.html - https://wpewebkit.org/release/wpewebkit-2.42.2.html - https://wpewebkit.org/release/wpewebkit-2.42.3.html - https://wpewebkit.org/release/wpewebkit-2.42.4.html This update covers fixes for CVE-2023-37450, CVE-2023-38133, CVE-2023-38572, CVE-2023-38592, CVE-2023-38594, CVE-2023-38595, CVE-2023-38597, CVE-2023-38599, CVE-2023-38600, CVE-2023-38611, CVE-2023-40397, CVE-2023-39928, CVE-2023-39434, CVE-2023-40451, CVE-2023-41074, CVE-2023-41993, CVE-2023-32359, CVE-2023-41983, CVE-2023-42852, CVE-2023-42916, CVE-2023-42917, CVE-2023-42883, and CVE-2023-42890. Relevant security advisories: - https://wpewebkit.org/security/WSA-2023-0006.html - https://wpewebkit.org/security/WSA-2023-0007.html - https://wpewebkit.org/security/WSA-2023-0008.html - https://wpewebkit.org/security/WSA-2023-0009.html - https://wpewebkit.org/security/WSA-2023-0010.html - https://wpewebkit.org/security/WSA-2023-0011.html - https://wpewebkit.org/security/WSA-2023-0012.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit 7a8c112df7a15426c602bc04eb720c762ba8bc98) Signed-off-by: Peter Korsgaard --- package/wpewebkit/Config.in | 6 +++--- package/wpewebkit/wpewebkit.hash | 6 +++--- package/wpewebkit/wpewebkit.mk | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 81b66f8429..432aa4c3a3 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 9, host gcc >= 4.9" +comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ || !BR2_HOST_GCC_AT_LEAST_4_9 comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" @@ -37,7 +37,7 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index aaeea2bcda..322e494c36 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,6 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.40.3.tar.xz.sums -sha1 c840bd76b2c86cb8ca0d68b56598cb0abbafc727 wpewebkit-2.40.3.tar.xz -sha256 05b6a9cb1d7d03485e0dc41b2a8e6f99a36aea23d32ba3ecb38d0d6860747ada wpewebkit-2.40.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums +sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz +sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index bf0b095372..13143efb38 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.40.3 +WPEWEBKIT_VERSION = 2.42.4 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -84,6 +84,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF endif +ifeq ($(BR2_PACKAGE_LIBJXL),y) +WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=ON +WPEWEBKIT_DEPENDENCIES += libjxl +else +WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=OFF +endif + ifeq ($(BR2_INIT_SYSTEMD),y) WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=ON WPEWEBKIT_DEPENDENCIES += systemd @@ -91,6 +98,13 @@ else WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=OFF endif +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) +WPEWEBKIT_CONF_OPTS += -DUSE_GBM=ON +WPEWEBKIT_DEPENDENCIES += libgbm +else +WPEWEBKIT_CONF_OPTS += -DUSE_GBM=OFF +endif + # JIT is not supported for MIPS r6, but the WebKit build system does not # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. From peter at korsgaard.com Wed Feb 28 16:16:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:16:04 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/webkitgtk: make gbm support optional Message-ID: <20240228164457.6F59F87BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e83664d4de09389ba48d2b2ba0618f48c36dc66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x This was added upstream in commit: https://github.com/WebKit/WebKit/commit/22e4c0386605d84f42f2d46fd20bdc46e3078498 The 'USE_OPENGL_OR_ES' flag is default ON, which will enable 'USE_GBM', so ensure that we unset 'USE_GBM' if we don't have libgbm. Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit c06c0197f95c3ae3408469f7e0702a00d788feb6) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index cb7461ccbc..9c68fe73cf 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -88,6 +88,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF endif +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) +WEBKITGTK_CONF_OPTS += -DUSE_GBM=ON +WEBKITGTK_DEPENDENCIES += libgbm +else +WEBKITGTK_CONF_OPTS += -DUSE_GBM=OFF +endif + ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ From peter at korsgaard.com Wed Feb 28 16:39:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:39:37 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/weston: fix build without gbm Message-ID: <20240228164457.A7EF487BFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90c05d1abfef4f42e7e576601b3964b8b5d2b57f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix the following build failure without gbm raised since commit 534c22dd606e200969fce49b8d23b27902dec94e: Message: dmabuf-feedback requires gbm which was not found. If you rather not build this, drop "dmabuf-feedback" from simple-clients option. Move the option assignment further down, below all the simple-clients lists; in Makefile, and because we are usign simply expanded variables, this is not necessary, but it is easier on us humans when we review the code. Also add a comment explaining why the initial list is incomplete. Fixes: - http://autobuild.buildroot.org/results/ebbba1d73ceeaacee17fde0c6c853415cd316091 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 611c0cb198041f518f2be3e0f5236d5c6ef93f58) Signed-off-by: Peter Korsgaard --- package/weston/weston.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 6a5c0e57f5..b07e798765 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -23,11 +23,9 @@ WESTON_CONF_OPTS = \ -Dtools=calibrator,debug,info,terminal,touch-calibrator ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) +# Note: some clients are conditional, see further for the others. WESTON_SIMPLE_CLIENTS = \ damage \ - dmabuf-egl \ - dmabuf-feedback \ - egl \ im \ shm \ touch @@ -38,8 +36,6 @@ WESTON_SIMPLE_CLIENTS += dmabuf-v4l endif endif # BR2_PACKAGE_WESTON_SIMPLE_CLIENTS -WESTON_CONF_OPTS += -Dsimple-clients=$(subst $(space),$(comma),$(strip $(WESTON_SIMPLE_CLIENTS))) - ifeq ($(BR2_PACKAGE_JPEG),y) WESTON_CONF_OPTS += -Dimage-jpeg=true WESTON_DEPENDENCIES += jpeg @@ -57,6 +53,9 @@ endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGBM)$(BR2_PACKAGE_HAS_LIBGLES),yyy) WESTON_CONF_OPTS += -Drenderer-gl=true WESTON_DEPENDENCIES += libegl libgbm libgles +ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) +WESTON_SIMPLE_CLIENTS += dmabuf-egl dmabuf-feedback egl +endif ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy) WESTON_CONF_OPTS += -Dpipewire=true -Dbackend-pipewire=true WESTON_DEPENDENCIES += pipewire @@ -70,6 +69,8 @@ WESTON_CONF_OPTS += \ -Dbackend-pipewire=false endif +WESTON_CONF_OPTS += -Dsimple-clients=$(subst $(space),$(comma),$(strip $(WESTON_SIMPLE_CLIENTS))) + ifeq ($(BR2_PACKAGE_WESTON_RDP),y) WESTON_DEPENDENCIES += freerdp WESTON_CONF_OPTS += -Dbackend-rdp=true From peter at korsgaard.com Wed Feb 28 16:42:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:42:03 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/mbedtls: security bump to version 2.28.7 Message-ID: <20240228164457.BEDCB87BFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72a06fb11d906f74ff3bdd48b848454d2a12519d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x - Fix CVE-2024-23170 and CVE-2024-23775 - Mbed TLS is now released under a dual Apache-2.0 OR GPL-2.0-or-later license. Users may choose which license they take the code under: https://github.com/Mbed-TLS/mbedtls/commit/f429557c5900d3b90bd10a21b228f719e80f81a2 https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-1/ https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-2/ https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.6 https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 52fd4753fe64208bfc25dc8a298f067da5c4c4b4) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 6 +++--- package/mbedtls/mbedtls.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index d0cd0b2105..3ec151a859 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.4: -sha256 849e86b626e42ded6bf67197b64aa771daa54e2a7e2868dc67e1e4711959e5e3 mbedtls-2.28.5.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.7: +sha256 1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a mbedtls-2.28.7.tar.gz # Locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 1b941e04f4..cdb4aef4f4 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.5 +MBEDTLS_VERSION = 2.28.7 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ @@ -12,7 +12,7 @@ MBEDTLS_CONF_OPTS = \ -DENABLE_TESTING=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF MBEDTLS_INSTALL_STAGING = YES -MBEDTLS_LICENSE = Apache-2.0 +MBEDTLS_LICENSE = Apache-2.0 or GPL-2.0+ MBEDTLS_LICENSE_FILES = LICENSE MBEDTLS_CPE_ID_VENDOR = arm MBEDTLS_CPE_ID_PRODUCT = mbed_tls From peter at korsgaard.com Wed Feb 28 16:25:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:25:13 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/hiredis: do not install nuget packaging file Message-ID: <20240228164457.87C4987BFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e7fb7c7a68781bb38dd09acf39eb25476e1d97a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The NuGet packaging description file is installed as: $(DEST_DIR)/build/native/hiredis.targets This is a sprurious file that has nothing to do on a Linux system, whether that be in host/, staging/, or target/. Backport an upstream patch to get rid of it. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine (cherry picked from commit 52f3793d46e4185951ce0e7254a35fba23959346) Signed-off-by: Peter Korsgaard --- ...add-option-to-not-install-NuGet-packaging.patch | 51 ++++++++++++++++++++++ package/hiredis/hiredis.mk | 4 +- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/package/hiredis/0001-CMakeList-add-option-to-not-install-NuGet-packaging.patch b/package/hiredis/0001-CMakeList-add-option-to-not-install-NuGet-packaging.patch new file mode 100644 index 0000000000..dbe8bc0ae6 --- /dev/null +++ b/package/hiredis/0001-CMakeList-add-option-to-not-install-NuGet-packaging.patch @@ -0,0 +1,51 @@ +From ff7a064490e0aacf718a5263b25b2ddaad0d245e Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 20 Jan 2024 13:53:39 +0100 +Subject: [PATCH] CMakeList: add option to not install NuGet packaging + +The NuGet hiredis.target packaging description file is of no use on +systems that are not using NuGet, like Linux systems, and the spurious +presence of that file is not "clean". + +Add a cmake option to allow users to disable installation of that file. +As some people may have relied on that file to be installed, continue to +install it by default. + +Signed-off-by: Yann E. MORIN +Upstream: https://github.com/redis/hiredis/commit/ff7a064490e0aacf718a5263b25b2ddaad0d245e +--- + CMakeLists.txt | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b7d6ee8..0fcf29b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,9 @@ OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) + OPTION(ENABLE_SSL_TESTS "Should we test SSL connections" OFF) + OPTION(ENABLE_EXAMPLES "Enable building hiredis examples" OFF) + OPTION(ENABLE_ASYNC_TESTS "Should we run all asynchronous API tests" OFF) ++# Historically, the NuGet file was always install; default ++# to ON for those who rely on that historical behaviour. ++OPTION(ENABLE_NUGET "Install NuGET packaging details" ON) + + MACRO(getVersionBit name) + SET(VERSION_REGEX "^#define ${name} (.+)$") +@@ -105,9 +108,11 @@ if (MSVC AND BUILD_SHARED_LIBS) + CONFIGURATIONS Debug RelWithDebInfo) + endif() + +-# For NuGet packages +-INSTALL(FILES hiredis.targets +- DESTINATION build/native) ++if (ENABLE_NUGET) ++ # For NuGet packages ++ INSTALL(FILES hiredis.targets ++ DESTINATION build/native) ++endif() + + INSTALL(FILES hiredis.h read.h sds.h async.h alloc.h sockcompat.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredis) +-- +2.43.0 + diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index a7a6d639e6..476b079336 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -12,8 +12,8 @@ HIREDIS_LICENSE_FILES = COPYING HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES -HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON -HOST_HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON -DENABLE_SSL=OFF +HIREDIS_CONF_OPTS = -DENABLE_NUGET=OFF -DDISABLE_TESTS=ON +HOST_HIREDIS_CONF_OPTS = -DENABLE_NUGET=OFF -DDISABLE_TESTS=ON -DENABLE_SSL=OFF # Set CMAKE_BUILD_TYPE to Release or the libraries will be suffixed with "d" # resulting in build failures when linking. From peter at korsgaard.com Wed Feb 28 16:19:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:19:57 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/webkitgtk: bump to version 2.42.2 Message-ID: <20240228164457.7CC3F87BFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd202dde79987898f3deb7cd6fbdff1217659dda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Update to a new major release. Release notes: https://webkitgtk.org/2023/09/15/webkitgtk2.42.0-released.html https://webkitgtk.org/2023/09/27/webkitgtk2.42.1-released.html https://webkitgtk.org/2023/11/10/webkitgtk2.42.2-released.html Security notes: https://webkitgtk.org/security/WSA-2023-0008.html - USE_JPEGXL is enabled by default now [1], so add a libjxl if used. - ENABLE_GLES2 has been dropped, so drop it also here [2]. Instead, enable USE_OPENGL_OR_ES if libgles is present. Beware that also libegl is needed for USE_OPENGL_OR_ES, but that one is most of the time a dependency for libgles, so leave it out here. - Also raise the minimal GCC version to 10.2, which is required since webkitgtk-2.42.x [3]. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 10, because we can't check on >= GCC 10.2. [1] https://github.com/WebKit/WebKit/commit/93865414f33190c57e293a80492e10edc461d7f0 [2] https://github.com/WebKit/WebKit/commit/cfe917fec45bf72c371087ece034feee8454f1b4 [3] https://github.com/WebKit/WebKit/commit/133498aaee8f44443d9e3b2a08be4a4b77b93fc9 Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit c4abff80b0fc0001e5804e43d32cbeb67d3d2009) Signed-off-by: Peter Korsgaard --- ...ailure-when-gstreamer-support-is-disabled.patch | 36 ---------------------- package/webkitgtk/Config.in | 6 ++-- package/webkitgtk/webkitgtk.hash | 6 ++-- package/webkitgtk/webkitgtk.mk | 16 +++++++--- 4 files changed, 17 insertions(+), 47 deletions(-) diff --git a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch b/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch deleted file mode 100644 index 3fa23b215b..0000000000 --- a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9b31965cdf362768e86f7e592e59e68fb3351261 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Tue, 8 Aug 2023 16:51:25 -0700 -Subject: [PATCH] Fix build failure when gstreamer support is disabled - https://bugs.webkit.org/show_bug.cgi?id=259931 https://bugs.gentoo.org/911663 - -Reviewed by Carlos Alberto Lopez Perez. - -* Source/WebCore/loader/MixedContentChecker.cpp: - -Canonical link: https://commits.webkit.org/260527.429 at fix-build - -(cherry picked from commit f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732) - -Upstream: https://github.com/WebKit/WebKit/commit/f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732 -Signed-off-by: Thomas Devoogdt ---- - Source/WebCore/loader/MixedContentChecker.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/WebCore/loader/MixedContentChecker.cpp b/Source/WebCore/loader/MixedContentChecker.cpp -index 9b4c7fe62020..ac4733bc08bc 100644 ---- a/Source/WebCore/loader/MixedContentChecker.cpp -+++ b/Source/WebCore/loader/MixedContentChecker.cpp -@@ -33,6 +33,8 @@ - #include "ContentSecurityPolicy.h" - #include "Document.h" - #include "Frame.h" -+#include "FrameLoader.h" -+#include "FrameLoaderClient.h" - #include "SecurityOrigin.h" - - namespace WebCore { --- -2.42.0 - diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index cb10784133..ace1b8739f 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 9, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7f50f1aa7b..59782732c3 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.40.5.tar.xz.sums -sha1 2f4d06b021115eb4106177f7d5f534f45b5d3b2e webkitgtk-2.40.5.tar.xz -sha256 7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f webkitgtk-2.40.5.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.2.tar.xz.sums +sha1 05bec6a824e46f043b865478735bc8395249510e webkitgtk-2.42.2.tar.xz +sha256 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 webkitgtk-2.42.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 9c68fe73cf..611d7f65d3 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.40.5 +WEBKITGTK_VERSION = 2.42.2 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -73,6 +73,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF endif +ifeq ($(BR2_PACKAGE_LIBJXL),y) +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON +WEBKITGTK_DEPENDENCIES += libjxl +else +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=OFF +endif + ifeq ($(BR2_PACKAGE_LIBMANETTE),y) WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=ON WEBKITGTK_DEPENDENCIES += libmanette @@ -80,12 +87,11 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -# Use GLES if available and desktop GL is not. -ifeq ($(BR2_PACKAGE_HAS_LIBGL):$(BR2_PACKAGE_HAS_LIBGLES),:y) -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=ON WEBKITGTK_DEPENDENCIES += libgles else -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=OFF endif ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) From peter at korsgaard.com Wed Feb 28 16:37:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:37:18 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] boot/syslinux: carry fix for build failures with binutils 2.31+ Message-ID: <20240228164457.9C83987BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39ae2f26f30a908fe6bb93dd3247f6afb5fc5cc9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x >From a report on the syslinux mailing list [0]: The GNU linker now writes two segments of type PT_LOAD into the program header. However, this is not supported by the wrapper script that converts the shared object to an .efi executable. As per comment in that file: (...) Although there may be several LOAD program headers, only one is currently copied. A simple workaround I've found to work is to ask the linker to put everything into one PT_LOAD program header. The issue is ackowledged in the syslinux wiki page about building syslinux [1]. This page refers to various resources, of which a Debian patch [2]. This information is also referenced in #11861. Fixes: #11861 [0] https://www.syslinux.org/archives/2018-August/026167.html [1] https://wiki.syslinux.org/wiki/index.php?title=Building [2] https://salsa.debian.org/images-team/syslinux/-/blob/debian/master/debian/patches/0017-single-load-segment.patch Reported-by: Sam Lancia Reported-by: Meliodas Signed-off-by: Yann E. MORIN (cherry picked from commit e53a8593b4edf5df1771692df6764b3bc385c6f4) Signed-off-by: Peter Korsgaard --- boot/syslinux/0018-single-load-segment.patch | 313 +++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) diff --git a/boot/syslinux/0018-single-load-segment.patch b/boot/syslinux/0018-single-load-segment.patch new file mode 100644 index 0000000000..11d73c31a4 --- /dev/null +++ b/boot/syslinux/0018-single-load-segment.patch @@ -0,0 +1,313 @@ +From: Lukas Schwaighofer +Date: Sat, 18 Aug 2018 16:56:35 +0200 +Subject: Force the linker to put all sections into a single PT_LOAD segment + +This is required when using binutils >= 2.31 which writes two PT_LOAD segments +by default. This is not supported by the wrapper.c script used to convert the +shared object into an elf binary. + +Forwarded: https://www.syslinux.org/archives/2018-August/026167.html +[yann.morin.1998 at free.fr: + - grab from the Debian package + - https://salsa.debian.org/images-team/syslinux/-/blob/fa1349f1f8e5f5d6307e589f02c0a679031d1c7f/debian/patches/0017-single-load-segment.patch +] +Signed-off-by: Yann E. MORIN +Upstream: reported https://www.syslinux.org/archives/2018-August/026167.html +Upstream: acknowledged https://wiki.syslinux.org/wiki/index.php?title=Building +--- + efi/i386/syslinux.ld | 37 +++++++++++++++++++++---------------- + efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++---------------- + 2 files changed, 42 insertions(+), 32 deletions(-) + +diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld +index bab3fc7..19c1647 100644 +--- a/efi/i386/syslinux.ld ++++ b/efi/i386/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") + OUTPUT_ARCH(i386) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + +diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld +index 450641c..a2c124f 100644 +--- a/efi/x86_64/syslinux.ld ++++ b/efi/x86_64/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") + OUTPUT_ARCH(i386:x86-64) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + From peter at korsgaard.com Wed Feb 28 16:41:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:41:14 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/environment-setup: do not export GIT_DIR Message-ID: <20240228164457.B3AB687BFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=087993b9ae0a655b567e8ecbc41c4f8fafd94229 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit c07aafa08792 (package/Makefile.in: set GIT_DIR=. in {HOST, TARGET}_MAKE_ENV) added GIT_DIR=. to TARGET_MAKE_ENV (which is included in TARGET_CONFIGURE_OPTS) to work around issues with packages getting confused when building in a subdir of the Buildroot git repo. This unfortunately also causes git commands to fail when output/host/environment-setup is sourced: git status fatal: not a git repository: '.' So strip GIT_DIR= from TARGET_CONFIGURE_OPTS when generating environment-setup. Reported-by: Mircea Gliga Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 48874afb9d03cb02b0207fd53bf2cdf0c37c8fa0) Signed-off-by: Peter Korsgaard --- package/environment-setup/environment-setup.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk index 29ec5a9a95..069ee25f9f 100644 --- a/package/environment-setup/environment-setup.mk +++ b/package/environment-setup/environment-setup.mk @@ -8,7 +8,7 @@ ENVIRONMENT_SETUP_FILE = $(HOST_DIR)/environment-setup define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS cp package/environment-setup/environment-setup $(ENVIRONMENT_SETUP_FILE) - for var in $(TARGET_CONFIGURE_OPTS); do \ + for var in $(filter-out GIT_DIR=%,$(TARGET_CONFIGURE_OPTS)); do \ printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ done printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) From peter at korsgaard.com Wed Feb 28 16:42:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:42:37 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/darkhttpd: security bump to version 1.15 Message-ID: <20240228164457.CA2E587BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6a17598588d040f84a4a7ee459f4d6f9eb1637d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following security issues: CVE-2024-23770: Local Leak of Authentication Parameter in Process List CVE-2024-23771: Basic Auth Timing Attack https://security.opensuse.org/2024/01/22/darkhttpd-basic-auth-issues.html Notice that CVE-2024-23770 is only documented as a known weakness, not fixed. Also change the license logic to use the dedicated COPYING file available since 1.14: https://github.com/emikulic/darkhttpd/commit/a8ae2b1de069588cad23d79a5392445ee9590fcd This license is ISC, not MIT - So adjust DARKHTTPD_LICENSE to match. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 0c7fd35947d91f84cff994bfb5c85b31b956d006) Signed-off-by: Peter Korsgaard --- package/darkhttpd/darkhttpd.hash | 4 ++-- package/darkhttpd/darkhttpd.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/darkhttpd/darkhttpd.hash b/package/darkhttpd/darkhttpd.hash index 188afff767..84a787eeba 100644 --- a/package/darkhttpd/darkhttpd.hash +++ b/package/darkhttpd/darkhttpd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 e063de9efa5635260c8def00a4d41ec6145226a492d53fa1dac436967670d195 darkhttpd-1.14.tar.gz -sha256 f002944c9a8516e3346002d39c3e13681306833358c0f3c7781dff1fdb639710 darkhttpd.c +sha256 ea48cedafbf43186f4a8d1afc99b33b671adee99519658446022e6f63bd9eda9 darkhttpd-1.15.tar.gz +sha256 1ecf63e8f84fd60ac7215e04195b9a61dcb47176ea65df26547582027f6c1dee COPYING diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index bda08899b8..e13f8f7770 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -4,10 +4,10 @@ # ################################################################################ -DARKHTTPD_VERSION = 1.14 +DARKHTTPD_VERSION = 1.15 DARKHTTPD_SITE = $(call github,emikulic,darkhttpd,v$(DARKHTTPD_VERSION)) -DARKHTTPD_LICENSE = MIT -DARKHTTPD_LICENSE_FILES = darkhttpd.c +DARKHTTPD_LICENSE = ISC +DARKHTTPD_LICENSE_FILES = COPYING DARKHTTPD_CPE_ID_VENDOR = darkhttpd_project define DARKHTTPD_BUILD_CMDS From vfazio at gmail.com Wed Feb 28 16:53:00 2024 From: vfazio at gmail.com (Vincent Fazio) Date: Wed, 28 Feb 2024 10:53:00 -0600 Subject: [Buildroot] [PATCH 1/1] package/gcc: add symver attribute support to MicroBlaze Message-ID: <20240228165300.4158751-1-vfazio@gmail.com> While the MicroBlaze architecture does generate ELFs, it does not leverage elfos.h to define common attributes; symver being one of them. By adding symver support, there should no longer be any need to patch packages to account for this architecture quirk. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Fixes: http://autobuild.buildroot.net/results/1e9/1e965d83d75615f35308440c5db044314a349357 Signed-off-by: Vincent Fazio --- Tested by: * revert 4b34b8ccfa5159d643ecbac12c42c638e3b27e5e * make qemu_microblazeel_mmu_defconfig * add CONFIG_TMPFS_XATTR=y to kernel config ~/development/buildroot $ ./output/host/bin/microblazeel-buildroot-linux-gnu-readelf -W --dyn-syms output/target/usr/lib/libattr.so | grep "@ATTR" 43: 0000355c 824 FUNC GLOBAL DEFAULT 12 attr_listf@@ATTR_1.2 44: 00002bf4 340 FUNC GLOBAL DEFAULT 12 attr_getf@@ATTR_1.0 45: 00002a80 372 FUNC GLOBAL DEFAULT 12 attr_get@@ATTR_1.0 46: 00001a20 1716 FUNC GLOBAL DEFAULT 12 attr_copy_fd@@ATTR_1.1 47: 00002fe8 272 FUNC GLOBAL DEFAULT 12 attr_remove@@ATTR_1.0 48: 00003894 340 FUNC GLOBAL DEFAULT 12 attr_multi@@ATTR_1.0 49: 000020d4 1708 FUNC GLOBAL DEFAULT 12 attr_copy_file@@ATTR_1.1 50: 00003cb0 72 FUNC GLOBAL DEFAULT 12 fgetxattr at ATTR_1.0 51: 00003dc4 64 FUNC GLOBAL DEFAULT 12 removexattr at ATTR_1.0 52: 00003b88 76 FUNC GLOBAL DEFAULT 12 lsetxattr at ATTR_1.0 53: 00003cf8 68 FUNC GLOBAL DEFAULT 12 listxattr at ATTR_1.0 54: 000030f8 240 FUNC GLOBAL DEFAULT 12 attr_removef@@ATTR_1.0 56: 00002ea8 320 FUNC GLOBAL DEFAULT 12 attr_setf@@ATTR_1.0 57: 00003bd4 76 FUNC GLOBAL DEFAULT 12 fsetxattr at ATTR_1.0 60: 000039e8 340 FUNC GLOBAL DEFAULT 12 attr_multif@@ATTR_1.0 61: 00003c20 72 FUNC GLOBAL DEFAULT 12 getxattr at ATTR_1.0 63: 0000195c 196 FUNC GLOBAL DEFAULT 12 attr_copy_check_permissions@@ATTR_1.1 64: 00003e04 64 FUNC GLOBAL DEFAULT 12 lremovexattr at ATTR_1.0 65: 00003d3c 68 FUNC GLOBAL DEFAULT 12 llistxattr at ATTR_1.0 66: 00002d48 352 FUNC GLOBAL DEFAULT 12 attr_set@@ATTR_1.0 67: 00003b3c 76 FUNC GLOBAL DEFAULT 12 setxattr at ATTR_1.0 68: 00001448 1300 FUNC GLOBAL DEFAULT 12 attr_copy_action@@ATTR_1.3 69: 00003c68 72 FUNC GLOBAL DEFAULT 12 lgetxattr at ATTR_1.0 70: 000031e8 884 FUNC GLOBAL DEFAULT 12 attr_list@@ATTR_1.2 71: 00003d80 68 FUNC GLOBAL DEFAULT 12 flistxattr at ATTR_1.0 72: 00003e44 64 FUNC GLOBAL DEFAULT 12 fremovexattr at ATTR_1.0 # touch /tmp/file.txt # attr -S -s "someattr" -V "value" /tmp/file.txt Attribute "someattr" set to a 5 byte value for /tmp/file.txt: value # attr -l /tmp/file.txt Attribute "someattr" has a 5 byte value for /tmp/file.txt # getfattr -dm - /tmp/file.txt getfattr: Removing leading '/' from absolute path names # file: tmp/file.txt security.someattr="value" --- ...e-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch | 57 +++++++++++++++++++ ...e-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch | 57 +++++++++++++++++++ ...e-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch | 57 +++++++++++++++++++ 3 files changed, 171 insertions(+) create mode 100644 package/gcc/11.4.0/0008-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch create mode 100644 package/gcc/12.3.0/0004-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch create mode 100644 package/gcc/13.2.0/0003-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch diff --git a/package/gcc/11.4.0/0008-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch b/package/gcc/11.4.0/0008-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch new file mode 100644 index 0000000000..ade50e512d --- /dev/null +++ b/package/gcc/11.4.0/0008-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch @@ -0,0 +1,57 @@ +From 99873bdc294aabd19861786f51c6be01ecaee59c Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 20 Feb 2024 16:49:06 -0600 +Subject: [PATCH] microblaze: define ASM_OUTPUT_SYMVER_DIRECTIVE + +The MicroBlaze target architecture generates ELF binary objects, however +it does not leverage elfos.h like other ELF generating architectures +(see gcc/config.gcc). + +Due to this quirk, the architecture does not receive "free" updates for +new features that get added for ELF objects. One such feature being +symver support [0]. + +Now, the macro necessary to emit symver directives is defined. + +Packages such as attr, xz, libkcapi, et al which use this directive +should now compile on MicroBlaze without needing a patch to account +for this lack of support. + +This patch has not been submitted upstream as discussion [1] around +the approach has leaned toward a full migration to elfos.h which is +non-trivial. + +[0]: https://github.com/gcc-mirror/gcc/commit/d7ddfbcb7 +[1]: https://gcc.gnu.org/pipermail/gcc/2023-February/240752.html +Upstream-bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766 +Upstream: Not Submitted +Signed-off-by: Vincent Fazio +--- + gcc/config/microblaze/microblaze.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 2ecec750526..e4452acddb9 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -833,6 +833,17 @@ do { \ + fputc ('\n', FILE); \ + } while (0) + ++#define ASM_OUTPUT_SYMVER_DIRECTIVE(FILE, NAME, NAME2) \ ++ do \ ++ { \ ++ fputs ("\t.symver\t", (FILE)); \ ++ assemble_name ((FILE), (NAME)); \ ++ fputs (", ", (FILE)); \ ++ assemble_name ((FILE), (NAME2)); \ ++ fputc ('\n', (FILE)); \ ++ } \ ++ while (0) ++ + #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) + #undef UNIQUE_SECTION_P + #define UNIQUE_SECTION_P(DECL) (DECL_ONE_ONLY (DECL)) +-- +2.34.1 + diff --git a/package/gcc/12.3.0/0004-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch b/package/gcc/12.3.0/0004-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch new file mode 100644 index 0000000000..ade50e512d --- /dev/null +++ b/package/gcc/12.3.0/0004-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch @@ -0,0 +1,57 @@ +From 99873bdc294aabd19861786f51c6be01ecaee59c Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 20 Feb 2024 16:49:06 -0600 +Subject: [PATCH] microblaze: define ASM_OUTPUT_SYMVER_DIRECTIVE + +The MicroBlaze target architecture generates ELF binary objects, however +it does not leverage elfos.h like other ELF generating architectures +(see gcc/config.gcc). + +Due to this quirk, the architecture does not receive "free" updates for +new features that get added for ELF objects. One such feature being +symver support [0]. + +Now, the macro necessary to emit symver directives is defined. + +Packages such as attr, xz, libkcapi, et al which use this directive +should now compile on MicroBlaze without needing a patch to account +for this lack of support. + +This patch has not been submitted upstream as discussion [1] around +the approach has leaned toward a full migration to elfos.h which is +non-trivial. + +[0]: https://github.com/gcc-mirror/gcc/commit/d7ddfbcb7 +[1]: https://gcc.gnu.org/pipermail/gcc/2023-February/240752.html +Upstream-bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766 +Upstream: Not Submitted +Signed-off-by: Vincent Fazio +--- + gcc/config/microblaze/microblaze.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 2ecec750526..e4452acddb9 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -833,6 +833,17 @@ do { \ + fputc ('\n', FILE); \ + } while (0) + ++#define ASM_OUTPUT_SYMVER_DIRECTIVE(FILE, NAME, NAME2) \ ++ do \ ++ { \ ++ fputs ("\t.symver\t", (FILE)); \ ++ assemble_name ((FILE), (NAME)); \ ++ fputs (", ", (FILE)); \ ++ assemble_name ((FILE), (NAME2)); \ ++ fputc ('\n', (FILE)); \ ++ } \ ++ while (0) ++ + #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) + #undef UNIQUE_SECTION_P + #define UNIQUE_SECTION_P(DECL) (DECL_ONE_ONLY (DECL)) +-- +2.34.1 + diff --git a/package/gcc/13.2.0/0003-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch b/package/gcc/13.2.0/0003-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch new file mode 100644 index 0000000000..ade50e512d --- /dev/null +++ b/package/gcc/13.2.0/0003-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch @@ -0,0 +1,57 @@ +From 99873bdc294aabd19861786f51c6be01ecaee59c Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 20 Feb 2024 16:49:06 -0600 +Subject: [PATCH] microblaze: define ASM_OUTPUT_SYMVER_DIRECTIVE + +The MicroBlaze target architecture generates ELF binary objects, however +it does not leverage elfos.h like other ELF generating architectures +(see gcc/config.gcc). + +Due to this quirk, the architecture does not receive "free" updates for +new features that get added for ELF objects. One such feature being +symver support [0]. + +Now, the macro necessary to emit symver directives is defined. + +Packages such as attr, xz, libkcapi, et al which use this directive +should now compile on MicroBlaze without needing a patch to account +for this lack of support. + +This patch has not been submitted upstream as discussion [1] around +the approach has leaned toward a full migration to elfos.h which is +non-trivial. + +[0]: https://github.com/gcc-mirror/gcc/commit/d7ddfbcb7 +[1]: https://gcc.gnu.org/pipermail/gcc/2023-February/240752.html +Upstream-bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766 +Upstream: Not Submitted +Signed-off-by: Vincent Fazio +--- + gcc/config/microblaze/microblaze.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 2ecec750526..e4452acddb9 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -833,6 +833,17 @@ do { \ + fputc ('\n', FILE); \ + } while (0) + ++#define ASM_OUTPUT_SYMVER_DIRECTIVE(FILE, NAME, NAME2) \ ++ do \ ++ { \ ++ fputs ("\t.symver\t", (FILE)); \ ++ assemble_name ((FILE), (NAME)); \ ++ fputs (", ", (FILE)); \ ++ assemble_name ((FILE), (NAME2)); \ ++ fputc ('\n', (FILE)); \ ++ } \ ++ while (0) ++ + #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) + #undef UNIQUE_SECTION_P + #define UNIQUE_SECTION_P(DECL) (DECL_ONE_ONLY (DECL)) +-- +2.34.1 + -- 2.34.1 From peter at korsgaard.com Wed Feb 28 17:28:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:58 +0100 Subject: [Buildroot] [PATCH 01/12] package/gstreamer1: bump to version 1.22.9 In-Reply-To: <20240126113636.2371665-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 26 Jan 2024 12:36:24 +0100") References: <20240126113636.2371665-1-peter@korsgaard.com> Message-ID: <87ttlso5ut.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Signed-off-by: Peter Korsgaard Committed series to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 17:30:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:30:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xserver_xorg-server: add CPE variables In-Reply-To: <20240128110544.2449102-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 28 Jan 2024 12:05:44 +0100") References: <20240128110544.2449102-1-fontaine.fabrice@gmail.com> Message-ID: <87plwgo5rx.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:x.org:xorg-server is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/79A86C02-31A5-4F25-8CA6-7C4A8CD92B7B > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 17:28:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-plugins-good: bump to version 1.22.9 Message-ID: <20240228173111.4F8B787C3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11a1d35fec5b35c94d24235a715f6258af950807 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 3407703f2c95f40ec8fe71862c99b730c8ce9890) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index b810115bb9..4410da6ef4 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.8.tar.xz.sha256sum -sha256 e305b9f07f52743ca481da0a4e0c76c35efd60adaf1b0694eb3bb021e2137e39 gst-plugins-good-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.9.tar.xz.sha256sum +sha256 26959fcfebfff637d4ea08ef40316baf31b61bb7729820b0684e800c3a1478b6 gst-plugins-good-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index b93978d2d1..77cb9080ec 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.22.8 +GST1_PLUGINS_GOOD_VERSION = 1.22.9 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 17:28:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:16 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-plugins-base: bump to version 1.22.9 Message-ID: <20240228173111.42B4C87BF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c20e83d0a8f09ae6b3082545a497bb70ffba05f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6b7db1bf64f50c59abe2aee387f7f7943d00a807) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index c637cf9a7f..060a871b95 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.8.tar.xz.sha256sum -sha256 eb6792e5c73c6defb9159c36ea6e4b78a2f8af6512678b4bd3b02c8d2d492acf gst-plugins-base-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.9.tar.xz.sha256sum +sha256 fac3e0dd2d8e9370388b34bf8c21b89d5f63bc3cfc12cd7fdc8fc6c1cba03334 gst-plugins-base-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 59c5e220ea..512e3fdee2 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.22.8 +GST1_PLUGINS_BASE_VERSION = 1.22.9 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:18 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-plugins-ugly: bump to version 1.22.9 Message-ID: <20240228173111.6606887BF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=956863493322d10f764ead0c69a29801bd730d76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit ca65df3da287964acf2bffd66f35f7384f4d296e) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 7b85301280..20394619b0 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.8.tar.xz.sha256sum -sha256 0761d96ba508e01c0271881b26828c2bffd7d8afd50872219f088f755b252ca7 gst-plugins-ugly-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.9.tar.xz.sha256sum +sha256 0bf685d66015a01dd3fc1671b64a1c8acb321dd9d4ab9e05a29ab19782aa6236 gst-plugins-ugly-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 90be791e0c..7bb95dd1d0 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.22.8 +GST1_PLUGINS_UGLY_VERSION = 1.22.9 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 17:28:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:19 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-devtools: bump to version 1.22.9 Message-ID: <20240228173111.73F1487C3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c40af09b5e1899066c5173d7596a0da1cd34a85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 74c32bfa5d615cea3c23d5133c7e4fc8329579aa) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 823812114b..6cf7c9597f 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.8.tar.xz.sha256sum -sha256 cd634056fcb16d035b3df5953ec85ae8bd56c68f29920b720ef920ca71ea76a7 gst-devtools-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.9.tar.xz.sha256sum +sha256 02e29400b44e9cc603aa6444dee5726b57edabef6455e6d0921ffed6f13840ee gst-devtools-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 21d7253d91..0c085b8b42 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.22.8 +GST1_DEVTOOLS_VERSION = 1.22.9 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:18 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-plugins-bad: security bump to version 1.22.9 Message-ID: <20240228173111.5B4D787C3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a47236d33e32900c1bb729bee202827c2a94feb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following security issue: CVE-2024-0444: Heap-based buffer overflow in the AV1 codec parser when handling certain malformed streams before GStreamer 1.22.9 https://gstreamer.freedesktop.org/security/sa-2024-0001.html Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 3ee1148b0009f62d6d19007778d491ac318c97d7) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index bf4abd3c2f..174c4ad572 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.8.tar.xz.sha256sum -sha256 458783f8236068991e3e296edd671c8eddb8be6fac933c1c2e1503462864ea0f gst-plugins-bad-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.9.tar.xz.sha256sum +sha256 1bc65d0fd5f53a3636564efd3fcf318c3edcdec39c4109a503c1fc8203840a1d gst-plugins-bad-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac1328b7e2..a61038376f 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.22.8 +GST1_PLUGINS_BAD_VERSION = 1.22.9 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:21 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-rtsp-server: bump to version 1.22.9 Message-ID: <20240228173111.9560087C3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7015c3cf72b57abadfc03bd628ca05478dbbf6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 88a6cfefbf1e03eb133afb0b6d957acc73a923eb) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 3ddea4e744..21f380378c 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.8.tar.xz.sha256sum -sha256 705177051c229976f171adcd7ab9762ae6bcc4bb77dc308a0bd80a63da6c337f gst-rtsp-server-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.9.tar.xz.sha256sum +sha256 808af148f89404ff74850f8ca5272bed4bfe67f9620231dc4514fd07eb26d0a4 gst-rtsp-server-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 13e5a369da..87e6413d00 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.22.8 +GST1_RTSP_SERVER_VERSION = 1.22.9 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:15 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gstreamer1: bump to version 1.22.9 Message-ID: <20240228173111.3907687C3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e79b73744ce99372119445f314cddaca77b1ef90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit e81d29d55181c73c38a80152a39955b921cdc84c) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 89cc25674e..b6ed001eb3 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.8.tar.xz.sha256sum -sha256 ad4e3db1771139b1db17b1afa7c05db083ae0100bd4da244b71f162dcce41bfc gstreamer-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.9.tar.xz.sha256sum +sha256 1e7124d347e8cdc80f08ec1d370c201be513002af1102bb20e83c5279cb48ebd gstreamer-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 88c528d4b5..5b9125e62a 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.8 +GSTREAMER1_VERSION = 1.22.9 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:23 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst-omx: bump to version 1.22.9 Message-ID: <20240228173111.B0E2987C3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ced0540e61304c59903809f1743adfd04db29a1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9f342e4a676dc687e30908c954fd066f4b5c9d1f) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 528ebb99c2..86f8c772c9 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.8.tar.xz.sha256sum -sha256 94df10e7713618f0c8a4223f6e047f2d8f0ccecba1d585618e791f13037762df gst-omx-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.9.tar.xz.sha256sum +sha256 9362d6117985d09dcf6e27bdaef377dc08efb7df01d00101d04fb644addac61e gst-omx-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 472f929189..32891bafa6 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.22.8 +GST_OMX_VERSION = 1.22.9 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Wed Feb 28 17:28:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:20 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-libav: bump to version 1.22.9 Message-ID: <20240228173111.7FE3A87C3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cf19efa53d99f29c42035b96e96e5b0557cb05a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit db9b4f3b0ca4524fcead56b46b53bff268ec1964) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 7d27929cab..b5bc84d672 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.8.tar.xz.sha256sum -sha256 be39349bc07ab4cdbd9a5fd6ea9848c601c7560ba5a0577ad5200b83bd424981 gst-libav-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.9.tar.xz.sha256sum +sha256 192f7d27d21c1e7c72c339a2647a9b0c247fedc62ea5029115f8c3e22ebb87d8 gst-libav-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 5017cda01a..1b872b7fa9 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.22.8 +GST1_LIBAV_VERSION = 1.22.9 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:22 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-vaapi: bump to version 1.22.9 Message-ID: <20240228173111.A2E4587C3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1dbda0dc13e89faf27815651af5788fd233b63b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6f28c463cf06d929789dc4c4c37cd8bdbfa0d60a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 9a7b7df520..ec23ae7c6b 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.8.tar.xz.sha256sum -sha256 1298ba347a70c42b88cdebf91b659fea02b1bb7269eabf8e29e3c0bd58278928 gstreamer-vaapi-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.9.tar.xz.sha256sum +sha256 8ba20da8c4cbf5b2953dba904672c4275d0053e1528f97fdf8e59942c7883ca8 gstreamer-vaapi-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 0a2f35c8ce..4b04d1bb72 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.22.8 +GST1_VAAPI_VERSION = 1.22.9 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:23 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gstreamer1-editing-services: bump to version 1.22.9 Message-ID: <20240228173111.BE8B987C3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=377fac9f577de30d88b08579c5db0aae1e381362 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit c55c1263ab213685a496702f56e3284db5578d96) Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 70f7e574e3..2ea29dae61 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.8.tar.xz.sha256sum -sha256 d1d5e75e190eb0be3fd49409e41a3aa8e68cfb4deaa7353488554674956cd1df gst-editing-services-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.9.tar.xz.sha256sum +sha256 3553ad3802dccde0c0ef1461881acd9b55bddf8adf751de4cb51b7f8cb50440d gst-editing-services-1.22.9.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 1d59e8ffde..e2c0f1ccf8 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.8 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.9 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 28 17:28:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:21 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-python: bump to version 1.22.9 Message-ID: <20240228173111.8A5B287C3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62909338f1941fc768580ab347c556d72f73513d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d948714037e78c54b676879aae487725988a092a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 5c42a0ca08..2f352df92e 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.8.tar.xz.sha256sum -sha256 d5cb8f144054a2a110e6672bd512e4b15d5b1b8d9879c192b9723535efb70b8f gst-python-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.9.tar.xz.sha256sum +sha256 3f9d5c6ffefda268703744b592a6b3983aa6723273b1220ecbcb62c2a5800009 gst-python-1.22.9.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index df53efaa99..f843e37052 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.22.8 +GST1_PYTHON_VERSION = 1.22.9 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:29:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:29:32 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/x11r7/xserver_xorg-server: add CPE variables Message-ID: <20240228173111.CE4EA87C3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e149a7a994e10ec503e9401b077f099a8584b214 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:x.org:xorg-server is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/79A86C02-31A5-4F25-8CA6-7C4A8CD92B7B Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit b80705800a5a4f5dfd1a1edccca001a3a0a4ef3a) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 4a05582583..1d0807ffec 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,6 +9,8 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING +XSERVER_XORG_SERVER_CPE_ID_VENDOR = x.org +XSERVER_XORG_SERVER_CPE_ID_PRODUCT = xorg-server XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:32 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-plugins-good: bump to version 1.22.9 Message-ID: <20240228173219.2EBBD87C99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8cab7e50fc1f6fc6cb7496b9741e3cd004bb19e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 3407703f2c95f40ec8fe71862c99b730c8ce9890) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index b810115bb9..4410da6ef4 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.8.tar.xz.sha256sum -sha256 e305b9f07f52743ca481da0a4e0c76c35efd60adaf1b0694eb3bb021e2137e39 gst-plugins-good-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.9.tar.xz.sha256sum +sha256 26959fcfebfff637d4ea08ef40316baf31b61bb7729820b0684e800c3a1478b6 gst-plugins-good-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index d2ba737b45..fea35c6470 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.22.8 +GST1_PLUGINS_GOOD_VERSION = 1.22.9 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 17:28:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:31 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gstreamer1: bump to version 1.22.9 Message-ID: <20240228173219.1A7C687C97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3880eba082ec97ceedc0e890e026a9834d74d709 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit e81d29d55181c73c38a80152a39955b921cdc84c) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 89cc25674e..b6ed001eb3 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.8.tar.xz.sha256sum -sha256 ad4e3db1771139b1db17b1afa7c05db083ae0100bd4da244b71f162dcce41bfc gstreamer-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.9.tar.xz.sha256sum +sha256 1e7124d347e8cdc80f08ec1d370c201be513002af1102bb20e83c5279cb48ebd gstreamer-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 88c528d4b5..5b9125e62a 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.8 +GSTREAMER1_VERSION = 1.22.9 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:33 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:33 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-plugins-ugly: bump to version 1.22.9 Message-ID: <20240228173219.43C8687C97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53c2b299f119449e0d441852103bc0d2a8f74889 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit ca65df3da287964acf2bffd66f35f7384f4d296e) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 7b85301280..20394619b0 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.8.tar.xz.sha256sum -sha256 0761d96ba508e01c0271881b26828c2bffd7d8afd50872219f088f755b252ca7 gst-plugins-ugly-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.9.tar.xz.sha256sum +sha256 0bf685d66015a01dd3fc1671b64a1c8acb321dd9d4ab9e05a29ab19782aa6236 gst-plugins-ugly-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 90be791e0c..7bb95dd1d0 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.22.8 +GST1_PLUGINS_UGLY_VERSION = 1.22.9 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 17:28:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:35 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-libav: bump to version 1.22.9 Message-ID: <20240228173219.57D0787C9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b249e43d690e27833b8b4c286a30b7965c8f7d86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit db9b4f3b0ca4524fcead56b46b53bff268ec1964) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 7d27929cab..b5bc84d672 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.8.tar.xz.sha256sum -sha256 be39349bc07ab4cdbd9a5fd6ea9848c601c7560ba5a0577ad5200b83bd424981 gst-libav-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.9.tar.xz.sha256sum +sha256 192f7d27d21c1e7c72c339a2647a9b0c247fedc62ea5029115f8c3e22ebb87d8 gst-libav-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 5017cda01a..1b872b7fa9 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.22.8 +GST1_LIBAV_VERSION = 1.22.9 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:31 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-plugins-base: bump to version 1.22.9 Message-ID: <20240228173219.24DAD87C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf4c7f70f3b441b29a8f8876bb5db7f5955a6e4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6b7db1bf64f50c59abe2aee387f7f7943d00a807) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index c637cf9a7f..060a871b95 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.8.tar.xz.sha256sum -sha256 eb6792e5c73c6defb9159c36ea6e4b78a2f8af6512678b4bd3b02c8d2d492acf gst-plugins-base-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.9.tar.xz.sha256sum +sha256 fac3e0dd2d8e9370388b34bf8c21b89d5f63bc3cfc12cd7fdc8fc6c1cba03334 gst-plugins-base-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 59c5e220ea..512e3fdee2 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.22.8 +GST1_PLUGINS_BASE_VERSION = 1.22.9 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:35 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-python: bump to version 1.22.9 Message-ID: <20240228173219.64E4587BD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5c728ad23f3b9fac07b54a052e6763c391f2b63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d948714037e78c54b676879aae487725988a092a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 5c42a0ca08..2f352df92e 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.8.tar.xz.sha256sum -sha256 d5cb8f144054a2a110e6672bd512e4b15d5b1b8d9879c192b9723535efb70b8f gst-python-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.9.tar.xz.sha256sum +sha256 3f9d5c6ffefda268703744b592a6b3983aa6723273b1220ecbcb62c2a5800009 gst-python-1.22.9.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index df53efaa99..f843e37052 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.22.8 +GST1_PYTHON_VERSION = 1.22.9 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:37 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst-omx: bump to version 1.22.9 Message-ID: <20240228173219.87AA187C9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1e0f9341688cc0c3796d63fcad0e4802bdc0d0c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9f342e4a676dc687e30908c954fd066f4b5c9d1f) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 528ebb99c2..86f8c772c9 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.8.tar.xz.sha256sum -sha256 94df10e7713618f0c8a4223f6e047f2d8f0ccecba1d585618e791f13037762df gst-omx-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.9.tar.xz.sha256sum +sha256 9362d6117985d09dcf6e27bdaef377dc08efb7df01d00101d04fb644addac61e gst-omx-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 472f929189..32891bafa6 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.22.8 +GST_OMX_VERSION = 1.22.9 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Wed Feb 28 17:28:33 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:33 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-plugins-bad: security bump to version 1.22.9 Message-ID: <20240228173219.390D387C9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b8eb25c54fd910afac58f614a1963275950e42b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following security issue: CVE-2024-0444: Heap-based buffer overflow in the AV1 codec parser when handling certain malformed streams before GStreamer 1.22.9 https://gstreamer.freedesktop.org/security/sa-2024-0001.html Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 3ee1148b0009f62d6d19007778d491ac318c97d7) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index bf4abd3c2f..174c4ad572 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.8.tar.xz.sha256sum -sha256 458783f8236068991e3e296edd671c8eddb8be6fac933c1c2e1503462864ea0f gst-plugins-bad-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.9.tar.xz.sha256sum +sha256 1bc65d0fd5f53a3636564efd3fcf318c3edcdec39c4109a503c1fc8203840a1d gst-plugins-bad-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac1328b7e2..a61038376f 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.22.8 +GST1_PLUGINS_BAD_VERSION = 1.22.9 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:34 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-devtools: bump to version 1.22.9 Message-ID: <20240228173219.4DA7687C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c88c6a132046bfba445e8c6f0f7376343a19bcc7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 74c32bfa5d615cea3c23d5133c7e4fc8329579aa) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 823812114b..6cf7c9597f 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.8.tar.xz.sha256sum -sha256 cd634056fcb16d035b3df5953ec85ae8bd56c68f29920b720ef920ca71ea76a7 gst-devtools-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.9.tar.xz.sha256sum +sha256 02e29400b44e9cc603aa6444dee5726b57edabef6455e6d0921ffed6f13840ee gst-devtools-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 21d7253d91..0c085b8b42 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.22.8 +GST1_DEVTOOLS_VERSION = 1.22.9 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:38 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gstreamer1-editing-services: bump to version 1.22.9 Message-ID: <20240228173219.938AC87BD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78fb608576ce2954b28baf267241e8751ac38092 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit c55c1263ab213685a496702f56e3284db5578d96) Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 70f7e574e3..2ea29dae61 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.8.tar.xz.sha256sum -sha256 d1d5e75e190eb0be3fd49409e41a3aa8e68cfb4deaa7353488554674956cd1df gst-editing-services-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.9.tar.xz.sha256sum +sha256 3553ad3802dccde0c0ef1461881acd9b55bddf8adf751de4cb51b7f8cb50440d gst-editing-services-1.22.9.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 1d59e8ffde..e2c0f1ccf8 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.8 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.9 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 28 17:28:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:37 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-vaapi: bump to version 1.22.9 Message-ID: <20240228173219.7E0C387C99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9fd9fa154306fceb5baaff1bf9c78e1703c40858 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6f28c463cf06d929789dc4c4c37cd8bdbfa0d60a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 9a7b7df520..ec23ae7c6b 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.8.tar.xz.sha256sum -sha256 1298ba347a70c42b88cdebf91b659fea02b1bb7269eabf8e29e3c0bd58278928 gstreamer-vaapi-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.9.tar.xz.sha256sum +sha256 8ba20da8c4cbf5b2953dba904672c4275d0053e1528f97fdf8e59942c7883ca8 gstreamer-vaapi-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 0a2f35c8ce..4b04d1bb72 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.22.8 +GST1_VAAPI_VERSION = 1.22.9 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:36 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-rtsp-server: bump to version 1.22.9 Message-ID: <20240228173219.72DC987C97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a31c7735fbce68e73e01fc3f0b18976fe9d5612b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 88a6cfefbf1e03eb133afb0b6d957acc73a923eb) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 3ddea4e744..21f380378c 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.8.tar.xz.sha256sum -sha256 705177051c229976f171adcd7ab9762ae6bcc4bb77dc308a0bd80a63da6c337f gst-rtsp-server-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.9.tar.xz.sha256sum +sha256 808af148f89404ff74850f8ca5272bed4bfe67f9620231dc4514fd07eb26d0a4 gst-rtsp-server-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 13e5a369da..87e6413d00 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.22.8 +GST1_RTSP_SERVER_VERSION = 1.22.9 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:29:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:29:28 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/x11r7/xserver_xorg-server: add CPE variables Message-ID: <20240228173219.9F12887C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb15ce67f51cd776c5fd1cd49153b1871e430fb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:x.org:xorg-server is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/79A86C02-31A5-4F25-8CA6-7C4A8CD92B7B Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit b80705800a5a4f5dfd1a1edccca001a3a0a4ef3a) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 4a05582583..1d0807ffec 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,6 +9,8 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING +XSERVER_XORG_SERVER_CPE_ID_VENDOR = x.org +XSERVER_XORG_SERVER_CPE_ID_PRODUCT = xorg-server XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:35:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:35:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/tor: Fix build with libressl >= 3.8.1 In-Reply-To: <20240128164151.283361-1-bernd@kuhls.net> (Bernd Kuhls's message of "Sun, 28 Jan 2024 17:41:51 +0100") References: <20240128164151.283361-1-bernd@kuhls.net> Message-ID: <87le74o5kp.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Fixes: > http://autobuild.buildroot.net/results/85c/85cde3bcd12fb5adafb94c85d5fa636e1b5b9068/ > Signed-off-by: Bernd Kuhls Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 17:35:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:35:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: security bump to version 8.5.4 In-Reply-To: <20240127225657.2427657-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 27 Jan 2024 23:56:57 +0100") References: <20240127225657.2427657-1-fontaine.fabrice@gmail.com> Message-ID: <87h6hso5k9.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-38802, CVE-2023-41360, CVE-2023-46752, CVE-2023-46753, > CVE-2023-47234 and CVE-2023-47235 > https://frrouting.org/security/ > https://frrouting.org/release/8.5.4/ > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 17:34:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:34:21 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/frr: security bump to version 8.5.4 Message-ID: <20240228173549.CB8AC87C9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=edfc7436427779ed7f2a2095f0d023df56950afc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix CVE-2023-38802, CVE-2023-41360, CVE-2023-46752, CVE-2023-46753, CVE-2023-47234 and CVE-2023-47235 https://frrouting.org/security/ https://frrouting.org/release/8.5.4/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c3cf06e0a8957e7ea6e6a01e4bbc3efb6f042d12) Signed-off-by: Peter Korsgaard --- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 836f130b93..4a61084bae 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8a6b0e0fa1e89493ba84cf176674e55c7a814821fd02a7188095b76c37c3935f frr-8.4.2.tar.gz +sha256 7ae9d8bafc65bb5d0f21061ac61dbc6cf93b2b05a5dae9e5eec72ed42388551e frr-8.5.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index abae784c40..19f346fd7b 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.4.2 +FRR_VERSION = 8.5.4 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 17:34:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:34:48 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/tor: Fix build with libressl >= 3.8.1 Message-ID: <20240228173549.D54B987C39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=096eec5b39e610a4ccbbbe544d34874db2efb976 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes: http://autobuild.buildroot.net/results/85c/85cde3bcd12fb5adafb94c85d5fa636e1b5b9068/ Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: fix Upstream tag] Signed-off-by: Yann E. MORIN (cherry picked from commit 2fbeacf91f985df5834968e7ce95d5c0340b7fab) Signed-off-by: Peter Korsgaard --- ...sl_mgt-define-DISABLE_ENGINES-after-OPENS.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/package/tor/0001-crypt_openssl_mgt-define-DISABLE_ENGINES-after-OPENS.patch b/package/tor/0001-crypt_openssl_mgt-define-DISABLE_ENGINES-after-OPENS.patch new file mode 100644 index 0000000000..f8ad803203 --- /dev/null +++ b/package/tor/0001-crypt_openssl_mgt-define-DISABLE_ENGINES-after-OPENS.patch @@ -0,0 +1,58 @@ +From 48f8d6918977673125d53a85d19d709136106739 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Thu, 31 Aug 2023 14:35:52 -0700 +Subject: [PATCH] crypt_openssl_mgt: define DISABLE_ENGINES after + OPENSSL_NO_ENGINE + +With LibreSSL-3.8.1 these engines are no long available causing a build +failure, but LibreSSL correctly defines OPENSSL_NO_ENGINE as part of its +opensslfeatures.h. However Tor includes crypto_openssl_mgt.h before any +of the openssl includes which would define OPENSSL_NO_ENGINE and then +fails to define DISABLE_ENGINES. + +As the define is used in only a single .c file it is best to move it +there. + +Signed-off-by: orbea +Upstream: https://gitlab.torproject.org/tpo/core/tor/-/commit/48f8d6918977673125d53a85d19d709136106739 +Signed-off-by: Bernd Kuhls +--- + src/lib/crypt_ops/crypto_openssl_mgt.c | 5 +++++ + src/lib/crypt_ops/crypto_openssl_mgt.h | 5 ----- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c +index 6c01cb6aa8..ca12a82518 100644 +--- a/src/lib/crypt_ops/crypto_openssl_mgt.c ++++ b/src/lib/crypt_ops/crypto_openssl_mgt.c +@@ -40,6 +40,11 @@ ENABLE_GCC_WARNING("-Wredundant-decls") + + #include + ++#ifdef OPENSSL_NO_ENGINE ++/* Android's OpenSSL seems to have removed all of its Engine support. */ ++#define DISABLE_ENGINES ++#endif ++ + #ifndef NEW_THREAD_API + /** A number of preallocated mutexes for use by OpenSSL. */ + static tor_mutex_t **openssl_mutexes_ = NULL; +diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.h b/src/lib/crypt_ops/crypto_openssl_mgt.h +index 96a37721dd..eac0ec1977 100644 +--- a/src/lib/crypt_ops/crypto_openssl_mgt.h ++++ b/src/lib/crypt_ops/crypto_openssl_mgt.h +@@ -49,11 +49,6 @@ + #define OPENSSL_V_SERIES(a,b,c) \ + OPENSSL_VER((a),(b),(c),0,0) + +-#ifdef OPENSSL_NO_ENGINE +-/* Android's OpenSSL seems to have removed all of its Engine support. */ +-#define DISABLE_ENGINES +-#endif +- + #if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5) + /* OpenSSL as of 1.1.0pre4 has an "new" thread API, which doesn't require + * setting up various callbacks. +-- +GitLab + From peter at korsgaard.com Wed Feb 28 17:34:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:34:16 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/frr: security bump to version 8.5.4 Message-ID: <20240228173657.9F84287CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4dee60f609cbfa5e7e44dcf0a3a8b291ca9f1fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fix CVE-2023-38802, CVE-2023-41360, CVE-2023-46752, CVE-2023-46753, CVE-2023-47234 and CVE-2023-47235 https://frrouting.org/security/ https://frrouting.org/release/8.5.4/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c3cf06e0a8957e7ea6e6a01e4bbc3efb6f042d12) Signed-off-by: Peter Korsgaard --- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 836f130b93..4a61084bae 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8a6b0e0fa1e89493ba84cf176674e55c7a814821fd02a7188095b76c37c3935f frr-8.4.2.tar.gz +sha256 7ae9d8bafc65bb5d0f21061ac61dbc6cf93b2b05a5dae9e5eec72ed42388551e frr-8.5.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index abae784c40..19f346fd7b 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.4.2 +FRR_VERSION = 8.5.4 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING From fontaine.fabrice at gmail.com Wed Feb 28 17:47:21 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 28 Feb 2024 18:47:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/libheif: fix libjpeg build Message-ID: <20240228174721.1141838-1-fontaine.fabrice@gmail.com> libheif raises the following build failure with libjpeg since bump to version 1.17.5 in commit 5714126edac88e3adc043a482b262b319a907dd3 and https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); | ^~~~~~~~~~ | | | long unsigned int* Fixes: - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 Signed-off-by: Fabrice Fontaine --- ...ns-encoder_jpeg.cc-fix-libjpeg-build.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch diff --git a/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch new file mode 100644 index 0000000000..5245327fe7 --- /dev/null +++ b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch @@ -0,0 +1,47 @@ +From 33eb948240365434c845b618854403e82a229012 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 31 Jan 2024 21:04:37 +0100 +Subject: [PATCH] libheif/plugins/encoder_jpeg.cc: fix libjpeg build + +Fix the following libjpeg build failure raised since version 1.17.0 and +https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 +because third argument of jpeg_mem_dest is defined as size_t* on libjpeg +instead of unsigned long* on jpeg-turbo: + +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] + 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); + | ^~~~~~~~~~ + | | + | long unsigned int* + +Fix #1008 and #1086 + +Fixes: + - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/strukturag/libheif/pull/1120 +--- + libheif/plugins/encoder_jpeg.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libheif/plugins/encoder_jpeg.cc b/libheif/plugins/encoder_jpeg.cc +index d6c7854..21a5541 100644 +--- a/libheif/plugins/encoder_jpeg.cc ++++ b/libheif/plugins/encoder_jpeg.cc +@@ -360,7 +360,11 @@ struct heif_error jpeg_encode_image(void* encoder_raw, const struct heif_image* + } + + uint8_t* outbuffer = nullptr; ++#ifdef LIBJPEG_TURBO_VERSION + unsigned long outlength = 0; ++#else ++ size_t outlength = 0; ++#endif + + jpeg_create_compress(&cinfo); + jpeg_mem_dest(&cinfo, &outbuffer, &outlength); +-- +2.43.0 + -- 2.43.0 From peter at korsgaard.com Wed Feb 28 18:14:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 19:14:18 +0100 Subject: [Buildroot] [PATCH] package/python3: security bump to 3.12.2 In-Reply-To: <20240212095514.11656-1-buildroot@bubu1.eu> (Marcus Hoffmann via buildroot's message of "Mon, 12 Feb 2024 10:55:14 +0100") References: <20240212095514.11656-1-buildroot@bubu1.eu> Message-ID: <87cysgo3r9.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Fixes the following security issue: > * Skip .pth files with names starting with a dot or hidden file > attribute. [1] > [1] https://docs.python.org/release/3.12.2/whatsnew/changelog.html#security I have in the man time reverted the 3.12.x bump for now because of issues, so I have instead applied a bump to 3.11.8, which contains the same security fix. -- Bye, Peter Korsgaard From ju.o at free.fr Wed Feb 28 18:14:11 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 28 Feb 2024 19:14:11 +0100 Subject: [Buildroot] [PATCH v2 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 Message-ID: <20240228181411.10174-1-ju.o@free.fr> Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated gnu-efi. This update introduced syslinux build failure, as reported in [1]. This commit adds a package patch to fix this issue. For technical details of the issue, see the package patch commit log. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html Signed-off-by: Julien Olivain --- Changes v1 -> v2: - Removed .checkpackageignore entry for the patch - Added Upstream: tag with upstream proposal URL in the patch --- ...stddef.h-add-wchar_t-type-definition.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch diff --git a/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch new file mode 100644 index 00000000000..65d9463a6f6 --- /dev/null +++ b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch @@ -0,0 +1,59 @@ +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Tue, 27 Feb 2024 21:09:15 +0100 +Subject: [PATCH] stddef.h: add wchar_t type definition + +Syslinux fail to build with gnu-efi >= 3.0.16 with error: + + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, + from /build/syslinux-6.03/efi/efi.h:23, + from /build/syslinux-6.03/efi/adv.h:4, + from /build/syslinux-6.03/efi/adv.c:29: + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' + typedef wchar_t CHAR16; + ^~~~~~~ + +This is because gnu-efi started to use the "wchar_t" type from the +toolchain's header, in commit [1]. Before this commit, +gnu-efi was defining the type as "short". + +Syslinux is including its own minimal stddef.h file, which masks the +one provided by the toolchain. See [2]. This file does not have a type +definition for "wchar_t". + +Finally, the POSIX header is supposed to provide this +"wchar_t" type definition. See [3]. + +This commit fixes the issue by adding the "wchar_t" type definition in +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This +also follow the previous gnu-efi < 3.0.16 behavior. + +This issue was seen in Buildroot Linux, in [5]. + +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html + +Upstream: Proposed: https://www.syslinux.org/archives/2024-February/026903.html +Signed-off-by: Julien Olivain +--- + com32/include/stddef.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/com32/include/stddef.h b/com32/include/stddef.h +index f52d62f3..437b11f2 100644 +--- a/com32/include/stddef.h ++++ b/com32/include/stddef.h +@@ -29,4 +29,6 @@ + */ + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) + ++typedef short wchar_t; ++ + #endif /* _STDDEF_H */ +-- +2.44.0 + -- 2.44.0 From peter at korsgaard.com Wed Feb 28 18:09:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 19:09:32 +0100 Subject: [Buildroot] [git commit] package/python3: security bump to version 3.11.8 Message-ID: <20240228181437.867B287CA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7b52c3ccf4828cd848b6a98206dbe712f84e49b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issue: gh-113659: Skip .pth files with names starting with a dot or hidden file attribute https://github.com/python/cpython/issues/113659 Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 6 +++--- package/python3/python3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 39a16c1f71..962d32b5d9 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3116/ -md5 d0c5a1a31efe879723e51addf56dd206 Python-3.11.6.tar.xz +# From https://www.python.org/downloads/release/python-3118/ +md5 b353b8433e560e1af2b130f56dfbd973 Python-3.11.8.tar.xz # Locally computed -sha256 0fab78fa7f133f4f38210c6260d90d7c0d5c7198446419ce057ec7ac2e6f5f38 Python-3.11.6.tar.xz +sha256 9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 Python-3.11.8.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 7a704d81e0..5d9d77af50 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).6 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).8 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From sairon at sairon.cz Wed Feb 28 18:14:08 2024 From: sairon at sairon.cz (=?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?=) Date: Wed, 28 Feb 2024 19:14:08 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: only install fsidd binary and unit file with enabled nfsd Message-ID: <20240228181409.3756293-1-sairon@sairon.cz> Unit file for the FSID daemon depends on the nfs-server.service, which is removed without BR2_PACKAGE_NFS_UTILS_RPC_NFSD enabled. Also don't install the fsidd service binary without nfsd enabled. Signed-off-by: Jan ?erm?k --- package/nfs-utils/nfs-utils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 4f2b41c782..b757e3e51d 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -42,7 +42,8 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \ - usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service + usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service \ + usr/sbin/fsidd usr/lib/systemd/system/fsidd.service ifeq ($(BR2_PACKAGE_NFS_UTILS_NFSV4),y) NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41 -- 2.34.1 From sairon at sairon.cz Wed Feb 28 18:23:21 2024 From: sairon at sairon.cz (=?UTF-8?B?SmFuIMSMZXJtw6Fr?=) Date: Wed, 28 Feb 2024 19:23:21 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: only install fsidd binary and unit file with enabled nfsd In-Reply-To: <20240228181409.3756293-1-sairon@sairon.cz> References: <20240228181409.3756293-1-sairon@sairon.cz> Message-ID: <5951f2b8-0ade-484a-97c0-0b59936e253d@sairon.cz> On 28. 02. 24 19:14, Jan ?erm?k wrote: > Unit file for the FSID daemon depends on the nfs-server.service, which is > removed without BR2_PACKAGE_NFS_UTILS_RPC_NFSD enabled. Also don't install > the fsidd service binary without nfsd enabled. Also, I *think* that sqlite (and libevent?) dependencies could be dropped in the case when nfsd (or nfsdcld/nfsdcltrack) is not installed. But there are no configure flags for this scenario in the upstream, nfsd is simply removed after the install in BR, so this would either need bit more elaborate patching or upstream coordination. Maybe Giulio or Petr can give some insights here. Anyway, let me know what you think and if it's worth pursuing this. Cheers, Jan From ju.o at free.fr Wed Feb 28 18:27:25 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 28 Feb 2024 19:27:25 +0100 Subject: [Buildroot] [PATCH 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 In-Reply-To: <90f5d326-0b04-495e-9b6d-d25ebfa59cb4@smile.fr> References: <20240227213517.241837-1-ju.o@free.fr> <90f5d326-0b04-495e-9b6d-d25ebfa59cb4@smile.fr> Message-ID: Hi Romain, On 27/02/2024 23:31, Romain Naour wrote: > Hi Julien, > > Le 27/02/2024 ? 22:35, Julien Olivain a ?crit?: >> Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated >> gnu-efi. This update introduced syslinux build failure, as reported >> in [1]. >> >> This commit adds a package patch to fix this issue. For technical >> details of the issue, see the package patch commit log. >> >> Fixes: >> - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 >> - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 >> >> [1] >> https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html >> >> Signed-off-by: Julien Olivain >> --- >> .checkpackageignore | 1 + >> ...stddef.h-add-wchar_t-type-definition.patch | 58 >> +++++++++++++++++++ >> 2 files changed, 59 insertions(+) >> create mode 100644 >> boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch >> >> diff --git a/.checkpackageignore b/.checkpackageignore >> index a6cc58c448c..a98a53fbf36 100644 >> --- a/.checkpackageignore >> +++ b/.checkpackageignore >> @@ -118,6 +118,7 @@ >> boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch Upstream >> >> boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch >> Upstream >> >> boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch >> Upstream >> >> boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch >> Upstream >> +boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > > We want to remove .checkpackageignore in a not too far future, please > add an > upstream status tag in the patch > 0019-stddef.h-add-wchar_t-type-definition.patch > itself. Even if upstream is not very active (last commit is 5 years > ago). I sent a v2 fixing that: https://patchwork.ozlabs.org/project/buildroot/patch/20240228181411.10174-1-ju.o at free.fr/ I initially set an exclusion because my registration to the list was slow. I also noted the somewhat slow activity of the project. What would be your recommendation for the "Upstream:" tag, in the case a patch does apply upstream, but the first time submission takes a bit longer? Something like "Upstream: Applicable (but not proposed yet)"? Best regards, Julien. From arnout at mind.be Wed Feb 28 19:16:54 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 28 Feb 2024 20:16:54 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: sort CVEs in HTML output Message-ID: <20240228193247.A4FEF87CD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75a3562324bd64d4d02edbcf840809863d4c266f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While the old NVD JSON feed provided data files where the CVEs were sorted by ID, the new feed from FKIE does not have sorted CVEs. Add a method to sort a list of CVE IDs (i.e. CVE ID strings, not CVE objects!), and use that when emiting the HTML output. The JSON output need not be sorted, because it is supposed to be used for post-processing, and we do not care about the ordering there; a consumer interested in sorting should sort on their side. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 7 +++++++ support/scripts/pkg-stats | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 747ad881c9..1a3c307e12 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -117,6 +117,13 @@ class CVE: open(path_metaf, "w").write(page_meta.text) return path_jsonf_xz + @staticmethod + def sort_id(cve_ids): + def cve_key(cve_id): + year, id_ = cve_id.split('-')[1:] + return (int(year), int(id_)) + return sorted(cve_ids, key=cve_key) + @classmethod def read_nvd_dir(cls, nvd_dir): """ diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index afb746704a..9a4a3ccad5 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1055,9 +1055,9 @@ def dump_html_pkg(f, pkg): f.write(f'
    see all ({cve_total}) ▾
    \n') if pkg.is_status_error("cve"): - for cve in pkg.cves: + for cve in cvecheck.CVE.sort_id(pkg.cves): f.write(f' {cve}
    \n') - for cve in pkg.unsure_cves: + for cve in cvecheck.CVE.sort_id(pkg.unsure_cves): f.write(f' {cve} (unsure)
    \n') elif pkg.is_status_na("cve"): f.write(f""" {pkg.status['cve'][1]}""") From arnout at mind.be Wed Feb 28 19:12:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 28 Feb 2024 20:12:08 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: adapt to NVD v2 json format Message-ID: <20240228193247.9833087CA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54f8d97c913e3c38073d6a31ed3ff02dd71cf9cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) missed the fact that the layout of the FKIE data files are different from the original NVD ones. They are formatted according to the NVD v2 API. Most differences are relatively trivial fields renaming, and those are easily spotted in this patch. There is however one key difference in the layout of the configurations. Where the NVD had "configurations" as an object with a "nodes" key, the FKIE has a "configurations" as a list of objects with a single "nodes" key; i.e. it is one-level deeper. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index f12a8048cd..747ad881c9 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -128,7 +128,7 @@ class CVE: filename = CVE.download_nvd_year(nvd_dir, year) try: uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'CVE_Items.item') + content = ijson.items(uncompressed, 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise @@ -155,11 +155,11 @@ class CVE: for parsed_node in self.parse_node(child): yield parsed_node - for cpe in node.get('cpe_match', ()): + for cpe in node.get('cpeMatch', ()): if not cpe['vulnerable']: return - product = cpe_product(cpe['cpe23Uri']) - version = cpe_version(cpe['cpe23Uri']) + product = cpe_product(cpe['criteria']) + version = cpe_version(cpe['criteria']) # ignore when product is '-', which means N/A if product == '-': return @@ -191,7 +191,7 @@ class CVE: v_end = cpe['versionEndExcluding'] yield { - 'id': cpe['cpe23Uri'], + 'id': cpe['criteria'], 'v_start': v_start, 'op_start': op_start, 'v_end': v_end, @@ -199,14 +199,15 @@ class CVE: } def each_cpe(self): - for node in self.nvd_cve['configurations']['nodes']: - for cpe in self.parse_node(node): - yield cpe + for nodes in self.nvd_cve.get('configurations', []): + for node in nodes['nodes']: + for cpe in self.parse_node(node): + yield cpe @property def identifier(self): """The CVE unique identifier""" - return self.nvd_cve['cve']['CVE_data_meta']['ID'] + return self.nvd_cve['id'] @property def affected_products(self): From arnout at mind.be Wed Feb 28 19:11:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 28 Feb 2024 20:11:13 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: fix datetime deprecation warning Message-ID: <20240228193247.8DA9587CD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f71d9f49e5466f31b53bb2cdc0201182104c86c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Abide by the warning reported with python 3.12: .../support/scripts/pkg-stats:1289: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC). Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9307992d29..afb746704a 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1290,7 +1290,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.utcnow() + date = datetime.datetime.now(datetime.UTC) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() From arnout at mind.be Wed Feb 28 19:34:45 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 28 Feb 2024 20:34:45 +0100 Subject: [Buildroot] [PATCH 0/3] support/scripts/pkg-stats: fix CVE identification (branch yem/pkgstat-cve) In-Reply-To: References: Message-ID: <65c2613d-781f-42ab-acd8-6e72fbadd5b9@mind.be> On 25/02/2024 23:05, Yann E. MORIN wrote: > Hello All! > > Since we switched to the FKIE CVE feed (as the NVD JSON feed are oing > extinct soon-ish), we missed the fact that the new feeds did not have > the same layout as the former ones, breaking CVE reporting. > > As a consequence of having no CVE reported, w emissed the fact that the > CVEs were not sorted in the new feeds, while they were in the formers. > > This series fixes both issus, and introduces a minor fixup for a python > deprecation warning. > > Regards, > Yann E. MORIN. Series applied to master, thanks! When I was working on it, I thought something needed to change in parse_node itself (because that was done in the other NVDv2 series), but apparently not. That said, we currently do make some sweeping assumptions about how a configuration is specified.... Regards, Arnout > > > ---------------------------------------------------------------- > Yann E. MORIN (3): > support/scripts/pkg-stats: fix datetime deprecation warning > support/scripts/pkg-stats: fkie json format > support/scripts/pkg-stats: sort CVEs in HTML output > > support/scripts/cve.py | 26 +++++++++++++++++--------- > support/scripts/pkg-stats | 6 +++--- > 2 files changed, 20 insertions(+), 12 deletions(-) > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From buildroot at bubu1.eu Wed Feb 28 19:53:31 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 20:53:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/pico-sdk: new package Message-ID: <20240228195333.712751-1-buildroot@bubu1.eu> Add the pi-pico sdk as a dependency for picotool. This is a bit of a weird package, because you normally clone the git repository and point the picotool (or rp2040 firmware project) build to it. For picotool specifically, only headers are used from the sdk, for building a firmware project, it is included as source files via cmake, so this pretty much has the same semantics for that as well. Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/pico-sdk/Config.in | 9 +++++++++ package/pico-sdk/pico-sdk.hash | 3 +++ package/pico-sdk/pico-sdk.mk | 20 ++++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/pico-sdk/Config.in create mode 100644 package/pico-sdk/pico-sdk.hash create mode 100644 package/pico-sdk/pico-sdk.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..b01024ae04 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1785,6 +1785,7 @@ menu "Hardware handling" source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" + source "package/pico-sdk/Config.in" source "package/rpi-rgb-led-matrix/Config.in" source "package/tslib/Config.in" source "package/uhd/Config.in" diff --git a/package/pico-sdk/Config.in b/package/pico-sdk/Config.in new file mode 100644 index 0000000000..962139925c --- /dev/null +++ b/package/pico-sdk/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PICO_SDK + bool "pico-sdk" + help + Raspberry Pi Pico SDK. Provides the headers, libraries + and build system necessary to write programs for the + RP2040-based devices such as the Raspberry Pi Pico in + C, C++ or assembly language. + + https://github.com/raspberrypi/pico-sdk diff --git a/package/pico-sdk/pico-sdk.hash b/package/pico-sdk/pico-sdk.hash new file mode 100644 index 0000000000..5db7e8bdb4 --- /dev/null +++ b/package/pico-sdk/pico-sdk.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 95f5e522be3919e36a47975ffd3b208c38880c14468bd489ac672cfe3cec803c pico-sdk-1.5.1.tar.gz +sha256 483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6 LICENSE.TXT diff --git a/package/pico-sdk/pico-sdk.mk b/package/pico-sdk/pico-sdk.mk new file mode 100644 index 0000000000..0c475d8aa1 --- /dev/null +++ b/package/pico-sdk/pico-sdk.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# pico-sdk +# +################################################################################ + +PICO_SDK_VERSION = 1.5.1 +PICO_SDK_SITE = $(call github,raspberrypi,pico-sdk,$(PICO_SDK_VERSION)) +PICO_SDK_LICENSE = BSD-3-Clause +PICO_SDK_LICENSE_FILES = LICENSE.TXT +PICO_SDK_INSTALL_STAGING = YES +# Header-only lib, as far as buildroot is concerned +PICO_SDK_INSTALL_TARGET = NO + +define PICO_SDK_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/pico-sdk + cp -r $(@D)/* $(STAGING_DIR)/usr/include/pico-sdk +endef + +$(eval $(generic-package)) -- 2.34.1 From buildroot at bubu1.eu Wed Feb 28 19:53:32 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 20:53:32 +0100 Subject: [Buildroot] [PATCH 2/2] package/picotool: new package In-Reply-To: <20240228195333.712751-1-buildroot@bubu1.eu> References: <20240228195333.712751-1-buildroot@bubu1.eu> Message-ID: <20240228195333.712751-2-buildroot@bubu1.eu> Add the raspberry pi picotool for interacting with rp2040 binaries and devices. Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/picotool/Config.in | 16 ++++++++++++++++ package/picotool/picotool.hash | 3 +++ package/picotool/picotool.mk | 15 +++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 package/picotool/Config.in create mode 100644 package/picotool/picotool.hash create mode 100644 package/picotool/picotool.mk diff --git a/package/Config.in b/package/Config.in index b01024ae04..2d4559036b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -583,6 +583,7 @@ endmenu source "package/pciutils/Config.in" source "package/pdbg/Config.in" source "package/picocom/Config.in" + source "package/picotool/Config.in" source "package/pifmrds/Config.in" source "package/pigpio/Config.in" source "package/powertop/Config.in" diff --git a/package/picotool/Config.in b/package/picotool/Config.in new file mode 100644 index 0000000000..03772bb116 --- /dev/null +++ b/package/picotool/Config.in @@ -0,0 +1,16 @@ +comment "picotool needs a toolchain w/ C++ and gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_9 + +config BR2_PACKAGE_PICOTOOL + bool "picotool" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_HOST_GCC_AT_LEAST_4_9 # libusb + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_PICO_SDK + help + picotool is a tool for inspecting rp2040 binaries and interacting + with rp2040 devices when they are in bootsel mode or devices USB + stdio support from the Raspberry Pi Pico SDK. + + https://github.com/raspberrypi/picotool + diff --git a/package/picotool/picotool.hash b/package/picotool/picotool.hash new file mode 100644 index 0000000000..b573ada09e --- /dev/null +++ b/package/picotool/picotool.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f1746ead7815c13be1152f0645db8ea3b277628eb0110d42a0a186db37d40a91 1.1.2.tar.gz +sha256 483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6 LICENSE.TXT diff --git a/package/picotool/picotool.mk b/package/picotool/picotool.mk new file mode 100644 index 0000000000..c98284c491 --- /dev/null +++ b/package/picotool/picotool.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# picotool +# +################################################################################ + +PICOTOOL_VERSION = 1.1.2 +PICOTOOL_SITE = https://github.com/raspberrypi/picotool/archive/refs/tags +PICOTOOL_SOURCE = $(PICOTOOL_VERSION).tar.gz +PICOTOOL_CONF_OPTS = -DPICO_SDK_PATH=$(STAGING_DIR)/usr/include/pico-sdk +PICOTOOL_DEPENDENCIES = libusb pico-sdk +PICOTOOL_LICENSE = BSD-3-Clause +PICOTOOL_LICENSE_FILES = LICENSE.TXT + +$(eval $(cmake-package)) -- 2.34.1 From buildroot at bubu1.eu Wed Feb 28 19:57:32 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 20:57:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/ccache: bump version to 4.9.1 In-Reply-To: <20240224121007.435474-1-bernd@kuhls.net> References: <20240224121007.435474-1-bernd@kuhls.net> Message-ID: <2637d00b-2a67-4e72-9db6-d7ecd1631b79@bubu1.eu> On 24.02.24 13:10, Bernd Kuhls wrote: > Removed patch which is included in this release. > > Updated license hash due to various version and copyright year bumps: > https://github.com/ccache/ccache/commits/master/LICENSE.adoc > > Release notes: https://ccache.dev/releasenotes.html#_ccache_4_9_1 > > Signed-off-by: Bernd Kuhls Tested-by: Marcus Hoffman > --- > ...-fix-Work-around-GCC-12.3-bug-109241.patch | 29 ------------------- > package/ccache/ccache.hash | 4 +-- > package/ccache/ccache.mk | 2 +- > 3 files changed, 3 insertions(+), 32 deletions(-) > delete mode 100644 package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch > > diff --git a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch > deleted file mode 100644 > index 42872597cd..0000000000 > --- a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001 > -From: Joel Rosdahl > -Date: Tue, 1 Aug 2023 12:30:12 +0200 > -Subject: [PATCH] fix: Work around GCC 12.3 bug 109241 > - > -See also #1289. > - > -Upstream: https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5 > - > -Signed-off-by: Bernd Kuhls > ---- > - src/storage/local/LocalStorage.cpp | 4 +++- > - 1 file changed, 3 insertions(+), 1 deletion(-) > - > -diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp > -index 3e5abe5074..d0a904e553 100644 > ---- a/src/storage/local/LocalStorage.cpp > -+++ b/src/storage/local/LocalStorage.cpp > -@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional level, > - auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index); > - l2_content_lock.make_long_lived(lock_manager); > - if (!l2_content_lock.acquire()) { > -- LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index); > -+ // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241 > -+ LOG_RAW(fmt::format( > -+ "Failed to acquire content lock for {}/{}", l1_index, l2_index)); > - return; > - } > - > diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash > index 736122e0ab..a2537077b6 100644 > --- a/package/ccache/ccache.hash > +++ b/package/ccache/ccache.hash > @@ -1,4 +1,4 @@ > # sha256 computed locally > -sha256 3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49 ccache-4.8.2.tar.xz > +sha256 4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25 ccache-4.9.1.tar.xz > sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt > -sha256 55ce274f2b898dad70d3695ab13f82656fd455bd8fb6d1c85d6f7c453bef0b2e LICENSE.adoc > +sha256 a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84 LICENSE.adoc > diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk > index ac4bc4aba5..1ac825439b 100644 > --- a/package/ccache/ccache.mk > +++ b/package/ccache/ccache.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CCACHE_VERSION = 4.8.2 > +CCACHE_VERSION = 4.9.1 > CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) > CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz > CCACHE_LICENSE = GPL-3.0+, others From buildroot at bubu1.eu Wed Feb 28 20:02:16 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 21:02:16 +0100 Subject: [Buildroot] [PATCH] package/ccache: disable building tests Message-ID: <20240228200216.715455-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- package/ccache/ccache.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index ac4bc4aba5..96b1b65c5c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -16,7 +16,8 @@ HOST_CCACHE_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER \ -DZSTD_FROM_INTERNET=OFF \ - -DHIREDIS_FROM_INTERNET=OFF + -DHIREDIS_FROM_INTERNET=OFF \ + -DENABLE_TESTING=OFF # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR -- 2.34.1 From peter at korsgaard.com Wed Feb 28 20:02:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:02:37 +0100 Subject: [Buildroot] [PATCH] package/python3: security bump to 3.12.2 In-Reply-To: <87cysgo3r9.fsf@48ers.dk> (Peter Korsgaard's message of "Wed, 28 Feb 2024 19:14:18 +0100") References: <20240212095514.11656-1-buildroot@bubu1.eu> <87cysgo3r9.fsf@48ers.dk> Message-ID: <878r34nyqq.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: >> Fixes the following security issue: >> * Skip .pth files with names starting with a dot or hidden file >> attribute. [1] >> [1] https://docs.python.org/release/3.12.2/whatsnew/changelog.html#security > I have in the man time reverted the 3.12.x bump for now because of s/man/mean/ naturally. -- Bye, Peter Korsgaard From buildroot at bubu1.eu Wed Feb 28 20:24:13 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 21:24:13 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/picotool: new package In-Reply-To: <20240228202414.719244-1-buildroot@bubu1.eu> References: <20240228202414.719244-1-buildroot@bubu1.eu> Message-ID: <20240228202414.719244-2-buildroot@bubu1.eu> Add the raspberry pi picotool for interacting with rp2040 binaries and devices. Signed-off-by: Marcus Hoffmann --- Changes v1 -> v2: - fix check-package package/Config.in | 1 + package/picotool/Config.in | 16 ++++++++++++++++ package/picotool/picotool.hash | 3 +++ package/picotool/picotool.mk | 15 +++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 package/picotool/Config.in create mode 100644 package/picotool/picotool.hash create mode 100644 package/picotool/picotool.mk diff --git a/package/Config.in b/package/Config.in index b01024ae04..2d4559036b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -583,6 +583,7 @@ endmenu source "package/pciutils/Config.in" source "package/pdbg/Config.in" source "package/picocom/Config.in" + source "package/picotool/Config.in" source "package/pifmrds/Config.in" source "package/pigpio/Config.in" source "package/powertop/Config.in" diff --git a/package/picotool/Config.in b/package/picotool/Config.in new file mode 100644 index 0000000000..0046f8ad61 --- /dev/null +++ b/package/picotool/Config.in @@ -0,0 +1,16 @@ +comment "picotool needs a toolchain w/ C++ and gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_9 + +config BR2_PACKAGE_PICOTOOL + bool "picotool" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_HOST_GCC_AT_LEAST_4_9 # libusb + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_PICO_SDK + help + picotool is a tool for inspecting rp2040 binaries and + interacting with rp2040 devices when they are in bootsel + mode or devices USBstdio support from the Raspberry Pi Pico + SDK. + + https://github.com/raspberrypi/picotool diff --git a/package/picotool/picotool.hash b/package/picotool/picotool.hash new file mode 100644 index 0000000000..b573ada09e --- /dev/null +++ b/package/picotool/picotool.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f1746ead7815c13be1152f0645db8ea3b277628eb0110d42a0a186db37d40a91 1.1.2.tar.gz +sha256 483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6 LICENSE.TXT diff --git a/package/picotool/picotool.mk b/package/picotool/picotool.mk new file mode 100644 index 0000000000..c98284c491 --- /dev/null +++ b/package/picotool/picotool.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# picotool +# +################################################################################ + +PICOTOOL_VERSION = 1.1.2 +PICOTOOL_SITE = https://github.com/raspberrypi/picotool/archive/refs/tags +PICOTOOL_SOURCE = $(PICOTOOL_VERSION).tar.gz +PICOTOOL_CONF_OPTS = -DPICO_SDK_PATH=$(STAGING_DIR)/usr/include/pico-sdk +PICOTOOL_DEPENDENCIES = libusb pico-sdk +PICOTOOL_LICENSE = BSD-3-Clause +PICOTOOL_LICENSE_FILES = LICENSE.TXT + +$(eval $(cmake-package)) -- 2.34.1 From buildroot at bubu1.eu Wed Feb 28 20:24:12 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 21:24:12 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/pico-sdk: new package Message-ID: <20240228202414.719244-1-buildroot@bubu1.eu> Add the pi-pico sdk as a dependency for picotool. This is a bit of a weird package, because you normally clone the git repository and point the picotool (or rp2040 firmware project) build to it. For picotool specifically, only headers are used from the sdk, for building a firmware project, it is included as source files via cmake, so this pretty much has the same semantics for that as well. Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/pico-sdk/Config.in | 9 +++++++++ package/pico-sdk/pico-sdk.hash | 3 +++ package/pico-sdk/pico-sdk.mk | 20 ++++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/pico-sdk/Config.in create mode 100644 package/pico-sdk/pico-sdk.hash create mode 100644 package/pico-sdk/pico-sdk.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..b01024ae04 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1785,6 +1785,7 @@ menu "Hardware handling" source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" + source "package/pico-sdk/Config.in" source "package/rpi-rgb-led-matrix/Config.in" source "package/tslib/Config.in" source "package/uhd/Config.in" diff --git a/package/pico-sdk/Config.in b/package/pico-sdk/Config.in new file mode 100644 index 0000000000..962139925c --- /dev/null +++ b/package/pico-sdk/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PICO_SDK + bool "pico-sdk" + help + Raspberry Pi Pico SDK. Provides the headers, libraries + and build system necessary to write programs for the + RP2040-based devices such as the Raspberry Pi Pico in + C, C++ or assembly language. + + https://github.com/raspberrypi/pico-sdk diff --git a/package/pico-sdk/pico-sdk.hash b/package/pico-sdk/pico-sdk.hash new file mode 100644 index 0000000000..5db7e8bdb4 --- /dev/null +++ b/package/pico-sdk/pico-sdk.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 95f5e522be3919e36a47975ffd3b208c38880c14468bd489ac672cfe3cec803c pico-sdk-1.5.1.tar.gz +sha256 483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6 LICENSE.TXT diff --git a/package/pico-sdk/pico-sdk.mk b/package/pico-sdk/pico-sdk.mk new file mode 100644 index 0000000000..0c475d8aa1 --- /dev/null +++ b/package/pico-sdk/pico-sdk.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# pico-sdk +# +################################################################################ + +PICO_SDK_VERSION = 1.5.1 +PICO_SDK_SITE = $(call github,raspberrypi,pico-sdk,$(PICO_SDK_VERSION)) +PICO_SDK_LICENSE = BSD-3-Clause +PICO_SDK_LICENSE_FILES = LICENSE.TXT +PICO_SDK_INSTALL_STAGING = YES +# Header-only lib, as far as buildroot is concerned +PICO_SDK_INSTALL_TARGET = NO + +define PICO_SDK_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/pico-sdk + cp -r $(@D)/* $(STAGING_DIR)/usr/include/pico-sdk +endef + +$(eval $(generic-package)) -- 2.34.1 From peter at korsgaard.com Wed Feb 28 20:53:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:53:21 +0100 Subject: [Buildroot] [PATCH 1/1] package: dhcpcd: bump to 10.0.5 In-Reply-To: <20240128000256.328107-1-davidb@230ruedubac.fr> (David Barbion's message of "Sun, 28 Jan 2024 01:02:56 +0100") References: <20240128000256.328107-1-davidb@230ruedubac.fr> Message-ID: <874jdsnwe6.fsf@48ers.dk> >>>>> "David" == David Barbion writes: > This version contains a fix for aarch64 based systems. > Signed-off-by: David Barbion Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 20:53:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:53:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/joe: add JOE_CPE_ID_VENDOR In-Reply-To: <20240130204239.49546-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 30 Jan 2024 21:42:39 +0100") References: <20240130204239.49546-1-fontaine.fabrice@gmail.com> Message-ID: <87zfvkmhsz.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:joseph_allen:joe is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/5F530947-2060-4842-92B9-5BC61D9C5430 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:00:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:00:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/lynx: fix openssl static build In-Reply-To: <20240121100023.316551-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 21 Jan 2024 11:00:23 +0100") References: <20240121100023.316551-1-fontaine.fabrice@gmail.com> Message-ID: <87v868mhhk.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Use LDFLAGS instead of LIBS to fix the following openssl static build > failure raised because lynx filters out duplicates (i.e. -lz) in > CF_ADD_LIBS: > configure:12958: checking for inet_ntoa > configure:12995: > /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX > -static conftest.c > -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 > -lssl > -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 > -lz -pthread -lcrypto -lz -pthread >&5 > configure:12998: $? = 0 > configure:13001: test -s conftest > configure:13004: $? = 0 > configure:13014: result: yes > configure:13095: checking for gethostbyname > configure:13151: result: yes > configure:13232: checking for strcasecmp > configure:13288: result: yes > configure:13401: checking for inet_aton function > configure:13443: > /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX > -static conftest.c > -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 > -lssl -lz -pthread -lcrypto >&5 > [...] > /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc > -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" -I. -I.. -Ichrtrans > -I./chrtrans -I.. -I../src -I.././WWW/Library/Implementation > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -D_GNU_SOURCE -DLINUX > -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include > -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/openssl > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -Ofast -g0 -static > -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 > -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib > -L/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib > -static -o lynx LYebcdic.o LYClean.o LYShowInfo.o LYEdit.o L > YStrings.o LYMail.o HTAlert.o GridText.o LYGetFile.o LYMain.o > LYMainLoop.o LYCurses.o LYBookmark.o LYmktime.o LYUtils.o LYOptions.o > LYReadCFG.o LYSearch.o LYHistory.o LYForms.o LYPrint.o LYrcFile.o > LYDownload.o LYNews.o LYKeymap.o HTML.o HTFWriter.o HTInit.o > DefaultStyle.o LYUpload.o LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o > LYTraversal.o LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o > LYCookie.o LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o parsdate.o > UCdomap.o UCAux.o UCAuto.o LYSession.o LYLocal.o > .././WWW/Library/Implementation/libwww.a -lz -static -lncurses -lssl > -lcrypto > -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 > -pthread > /home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: > /home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(libcrypto-lib-c_zlib.o): > in function `zlib_oneshot_expand_block': > c_zlib.c:(.text+0xb8b): undefined reference to `uncompress' > Patching aclocal.m4 is not possible as autoreconf fails due to missing > AC_DIVERT_HELP macro. > This build failure is only raised by autobuilders since 2024 for an > unknown reason. > Fixes: > - http://autobuild.buildroot.org/results/6d4119b54fc6b6111a03f81e131e83bae0d844d1 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:01:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:01:23 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual/contribute.txt: fix typo In-Reply-To: <20240123092226.476-1-sebastien.szymanski@armadeus.com> (=?utf-8?Q?=22S=C3=A9bastien?= Szymanski"'s message of "Tue, 23 Jan 2024 10:22:26 +0100") References: <20240123092226.476-1-sebastien.szymanski@armadeus.com> Message-ID: <87r0gwmhgc.fsf@48ers.dk> >>>>> "S?bastien" == S?bastien Szymanski writes: > "who sponsored who sponsored" -> "who sponsored" > Signed-off-by: S?bastien Szymanski Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:02:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:02:10 +0100 Subject: [Buildroot] [PATCH] package/syslog-ng: needs pcre2, not pcre In-Reply-To: <722e1fda-9abb-45af-98e5-16914325932e@korsgaard.com> (Peter Korsgaard's message of "Wed, 31 Jan 2024 21:25:07 +0100") References: <20240130164930.3909227-1-peter@korsgaard.com> <722e1fda-9abb-45af-98e5-16914325932e@korsgaard.com> Message-ID: <87msrkmhf1.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > On 30/01/2024 17.49, Peter Korsgaard wrote: >> Syslog-ng-uses pcre2 instead of pcre since 4.3.0 with: >> https://github.com/syslog-ng/syslog-ng/commit/cb6de08dc9078644d48ca536b5660e406b1a50d6 >> No autobuilder failures, as pcre2 is implicitly available through >> libglib2. >> Signed-off-by: Peter Korsgaard > Committed, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:02:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:02:50 +0100 Subject: [Buildroot] [PATCH 1/2] package/glibc: add CVE ignore for CVE-2023-4806 In-Reply-To: <93dd1849-3725-4bf1-b411-55f175e40471@korsgaard.com> (Peter Korsgaard's message of "Thu, 1 Feb 2024 12:02:36 +0100") References: <20240131081254.175261-1-peter@korsgaard.com> <93dd1849-3725-4bf1-b411-55f175e40471@korsgaard.com> Message-ID: <87il28mhdx.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > On 31/01/2024 09.12, Peter Korsgaard wrote: >> Commit 8519de517e22 (package/{glibc, localedef}: security bump to version >> glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701) correctly mentioned >> CVE-2023-4806 in the commit message, but forgot to add an ignore for it. >> Fix that. >> Signed-off-by: Peter Korsgaard > Committed, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:05:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:05:46 +0100 Subject: [Buildroot] [PATCH 2/2] package/{glibc, localedef}: security bump to version glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 In-Reply-To: <9a26b0d0-120f-4ff9-b72f-7b99edbca93c@korsgaard.com> (Peter Korsgaard's message of "Thu, 1 Feb 2024 12:02:53 +0100") References: <20240131081254.175261-1-peter@korsgaard.com> <20240131081254.175261-2-peter@korsgaard.com> <9a26b0d0-120f-4ff9-b72f-7b99edbca93c@korsgaard.com> Message-ID: <87edcwmh91.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > On 31/01/2024 09.12, Peter Korsgaard wrote: >> Fixed the following security issues: >> CVE-2023-6246: syslog: Fix heap buffer overflow in >> __vsyslog_internal >> https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD >> CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal >> https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD >> CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal >> https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD >> For details, see the Qualys advisory: >> https://www.openwall.com/lists/oss-security/2024/01/30/6 >> Signed-off-by: Peter Korsgaard > Committed, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:07:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:07:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/cpio: fix tar.bz2 hash In-Reply-To: <20240131211939.2222338-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 22:19:39 +0100") References: <20240131211939.2222338-1-fontaine.fabrice@gmail.com> Message-ID: <87a5nkmh5y.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit b0306d94b29d6f5e08735db0448019f9f4e4234b forgot to update > cpio-2.13.tar.bz2 to cpio-2.14.tar.bz2 > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:09:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:09:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.11.5 In-Reply-To: <20240131210645.2212414-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 22:06:45 +0100") References: <20240131210645.2212414-1-fontaine.fabrice@gmail.com> Message-ID: <875xy8mh39.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2024-22211 > - Update Upstream tag in patches > https://github.com/FreeRDP/FreeRDP/blob/2.11.5/ChangeLog > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:12:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:12:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/crda: drop CRDA_CPE_ID_VENDOR In-Reply-To: <20240201174641.183601-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:46:41 +0100") References: <20240201174641.183601-1-fontaine.fabrice@gmail.com> Message-ID: <871q8wmgyb.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:kernel:crda added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:12:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:12:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/depot-tools: drop DEPOT_TOOLS_CPE_ID_VENDOR In-Reply-To: <20240201174829.184788-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:48:29 +0100") References: <20240201174829.184788-1-fontaine.fabrice@gmail.com> Message-ID: <87wmqol2co.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:google:depot-tools added by commit > 48730a1a9d882a7c56146bd2955e074aed790dcb has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:google:depot-tools > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:13:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpfr: fix CPE variables In-Reply-To: <20240201175202.186929-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:52:02 +0100") References: <20240201175202.186929-1-fontaine.fabrice@gmail.com> Message-ID: <87sf1cl2c1.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:gnu:mpfr added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE > identifier for this package > cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:13:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: fix CPE variable In-Reply-To: <20240201214304.301544-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 22:43:04 +0100") References: <20240201214304.301544-1-fontaine.fabrice@gmail.com> Message-ID: <87o7c0l2ba.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set > LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:14:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:14:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/minizip: fix CPE variables In-Reply-To: <20240201221659.320957-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 23:16:59 +0100") References: <20240201221659.320957-1-fontaine.fabrice@gmail.com> Message-ID: <87jzmol2an.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:minizip_project:minizip added by commit > 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier > for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: > https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:14:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:14:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvips: update LIBVIPS_CPE_ID_VENDOR In-Reply-To: <20240201172051.165994-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:20:51 +0100") References: <20240201172051.165994-1-fontaine.fabrice@gmail.com> Message-ID: <87frxcl29i.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:libvips_project:libvips has been deprecated in favor of > cpe:2.3:a:libvips:libvips in September 2023: > > libvips Project libvips 8.10.6 - > Project > Change Log > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:15:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR In-Reply-To: <20240201174205.180556-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:42:05 +0100") References: <20240201174205.180556-1-fontaine.fabrice@gmail.com> Message-ID: <87bk80l28w.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:kernel:wireless-regdb added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:16:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:16:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/rauc-hawkbit-updater: drop RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR In-Reply-To: <20240203103501.41738-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 11:35:01 +0100") References: <20240203103501.41738-1-fontaine.fabrice@gmail.com> Message-ID: <8734tcl27e.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:pengutronix:rauc-hawkbit-updater added by commit > 928b7219cd7079864eadadc66dbff21c5cd72804 has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:pengutronix:rauc-hawkbit-updater > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:15:33 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR In-Reply-To: <20240201174432.182161-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:44:32 +0100") References: <20240201174432.182161-1-fontaine.fabrice@gmail.com> Message-ID: <877ciol28a.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:kernel:linux-firmware added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:16:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:16:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-wheel: add CPE variables In-Reply-To: <20240121213513.2636195-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 21 Jan 2024 22:35:13 +0100") References: <20240121213513.2636195-1-fontaine.fabrice@gmail.com> Message-ID: <87y1b4jnlu.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:wheel_project:wheel is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/402C4B59-237A-4399-8189-CC9FC1B4BF39 > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:17:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:17:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: update NETATALK_CPE_ID_VENDOR In-Reply-To: <20240203180247.143487-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:02:47 +0100") References: <20240203180247.143487-1-fontaine.fabrice@gmail.com> Message-ID: <87ttlsjnl6.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of > cpe:2.3:a:netatalk:netatalk in September 2023: > > Version > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:17:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:17:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xlib_libXpm: update XLIB_LIBXPM_CPE_ID_VENDOR In-Reply-To: <20240203180810.146553-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:08:10 +0100") References: <20240203180810.146553-1-fontaine.fabrice@gmail.com> Message-ID: <87plwgjnkk.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:libxpm_project:libxpm has been deprecated in favor of > cpe:2.3:a:x.org:libxpm in October 2023: > > Libxpm Project Libxpm 3.5.15 > Version > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:20:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/json-c: update JSON_C_CPE_ID_VENDOR In-Reply-To: <20240203181507.150528-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:15:07 +0100") References: <20240203181507.150528-1-fontaine.fabrice@gmail.com> Message-ID: <87le74jnfg.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:json-c_project:json-c has been deprecated in favor of > cpe:2.3:a:json-c:json-c in September 2023: > > JSON-C Project JSON-C 0.14 > Version > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:21:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/flex: update FLEX_CPE_ID_VENDOR In-Reply-To: <20240203182845.158531-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:28:45 +0100") References: <20240203182845.158531-1-fontaine.fabrice@gmail.com> Message-ID: <87h6hsjnek.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:flex_project:flex has been deprecated in favor of > cpe:2.3:a:westes:flex in October 2023: > > Flex Fast Lexical Analyser 2.6.4 > Version > Product > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:21:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: fix CPE variables In-Reply-To: <20240203183533.162251-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:35:33 +0100") References: <20240203183533.162251-1-fontaine.fabrice@gmail.com> Message-ID: <87cysgjned.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:d-bus_project:d-bus has been deprecated in favor of > cpe:2.3:a:freedesktop:dbus in December 2023: > > D-Bus Project D-Bus 1.15.6 > Version > Advisory > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:21:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/c-ares: update C_ARES_CPE_ID_VENDOR In-Reply-To: <20240203184231.166287-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:42:31 +0100") References: <20240203184231.166287-1-fontaine.fabrice@gmail.com> Message-ID: <878r34jndr.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:c-ares_project:c-ares has been deprecated in favor of > cpe:2.3:a:c-ares:c-ares in September 2023: > > C-ares Project C-ares 1.17.1 > Change Log > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:22:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:22:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: update PYTHON_AIOHTTP_CPE_ID_VENDOR In-Reply-To: <20240203184637.168548-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:46:37 +0100") References: <20240203184637.168548-1-fontaine.fabrice@gmail.com> Message-ID: <874jdsjnd1.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:aiohttp_project:aiohttp has been deprecated in favor of > cpe:2.3:a:aiohttp:aiohttp in November 2023: > > Aiohttp Project Aiohttp 3.8.0 Beta 0 > Change Log > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 20:53:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:53:39 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/joe: add JOE_CPE_ID_VENDOR Message-ID: <20240228212548.8E17187CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2cc7eb278208a39bd4086e7e6d7b89f3f540d37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:joseph_allen:joe is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/5F530947-2060-4842-92B9-5BC61D9C5430 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2953cd264489229adaef5f0a1f307900dcc3e425) Signed-off-by: Peter Korsgaard --- package/joe/joe.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/joe/joe.mk b/package/joe/joe.mk index f0cac402e1..9346ec1fd3 100644 --- a/package/joe/joe.mk +++ b/package/joe/joe.mk @@ -8,6 +8,7 @@ JOE_VERSION = 4.6 JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION) JOE_LICENSE = GPL-2.0+ JOE_LICENSE_FILES = COPYING +JOE_CPE_ID_VENDOR = joseph_allen ifeq ($(BR2_PACKAGE_NCURSES),y) JOE_DEPENDENCIES += ncurses From peter at korsgaard.com Wed Feb 28 21:11:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:11:58 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/crda: drop CRDA_CPE_ID_VENDOR Message-ID: <20240228212548.DD82787CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=535bac39d5bded456bf16d4c5239a0c824234208 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:kernel:crda added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 85d300f1021df905e60e704407b68dbed75ba430) Signed-off-by: Peter Korsgaard --- package/crda/crda.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/crda/crda.mk b/package/crda/crda.mk index a73c9aa26d..8043260cfc 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -9,7 +9,6 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE -CRDA_CPE_ID_VENDOR = kernel define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ From peter at korsgaard.com Wed Feb 28 21:08:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:08:44 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/freerdp: security bump to version 2.11.5 Message-ID: <20240228212548.C4D8587CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2f446133de49c69f87143ebbaa782d590a265be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x - Fix CVE-2024-22211 - Update Upstream tag in patches https://github.com/FreeRDP/FreeRDP/blob/2.11.5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit dbe037dc9998155373b0a96687c55982f9c1a536) Signed-off-by: Peter Korsgaard --- package/freerdp/0001-Fix-variable-declaration-in-loop.patch | 3 +-- package/freerdp/0002-Fixed-variable-declaration-in-loop.patch | 3 +-- .../freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch | 2 +- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch index a391e42ee6..799a92734b 100644 --- a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch +++ b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: Armin Novak Date: Wed, 16 Sep 2020 09:30:37 +0200 Subject: [PATCH] Fix variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 3 ++- diff --git a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch index 14e1d6c8f4..1a4e899430 100644 --- a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch +++ b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: akallabeth Date: Tue, 22 Sep 2020 07:43:56 +0200 Subject: [PATCH] Fixed variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 4 ++-- diff --git a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch index d8dfe13d1b..63434e58f7 100644 --- a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch +++ b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/31e770a330158035e24b7b952bec0030138482b7 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FreeRDP/FreeRDP/pull/7205] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/0976cce458f2281cef6e8c417daf4bbd22bcc087 --- winpr/include/winpr/file.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 02268f55ea..daf933e0af 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.0.tar.gz.sha256 -sha256 8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e freerdp-2.11.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.5.tar.gz.sha256 +sha256 70785ad9934d75aed1734f8918a05aff95788e58e53081e84651106b24303dc2 freerdp-2.11.5.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 6f71ef796f..29b33f61c3 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.0 +FREERDP_VERSION = 2.11.5 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From peter at korsgaard.com Wed Feb 28 21:00:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:00:24 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/lynx: fix openssl static build Message-ID: <20240228212548.A682C87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b348beb3585336ce601f6bec69c6d0567186153d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Use LDFLAGS instead of LIBS to fix the following openssl static build failure raised because lynx filters out duplicates (i.e. -lz) in CF_ADD_LIBS: configure:12958: checking for inet_ntoa configure:12995: /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -static conftest.c -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lssl -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lz -pthread -lcrypto -lz -pthread >&5 configure:12998: $? = 0 configure:13001: test -s conftest configure:13004: $? = 0 configure:13014: result: yes configure:13095: checking for gethostbyname configure:13151: result: yes configure:13232: checking for strcasecmp configure:13288: result: yes configure:13401: checking for inet_aton function configure:13443: /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -static conftest.c -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lssl -lz -pthread -lcrypto >&5 [...] /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" -I. -I.. -Ichrtrans -I./chrtrans -I.. -I../src -I.././WWW/Library/Implementation -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/openssl -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib -L/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib -static -o lynx LYebcdic.o LYClean.o LYShowInfo.o LYEdit.o L YStrings.o LYMail.o HTAlert.o GridText.o LYGetFile.o LYMain.o LYMainLoop.o LYCurses.o LYBookmark.o LYmktime.o LYUtils.o LYOptions.o LYReadCFG.o LYSearch.o LYHistory.o LYForms.o LYPrint.o LYrcFile.o LYDownload.o LYNews.o LYKeymap.o HTML.o HTFWriter.o HTInit.o DefaultStyle.o LYUpload.o LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o parsdate.o UCdomap.o UCAux.o UCAuto.o LYSession.o LYLocal.o .././WWW/Library/Implementation/libwww.a -lz -static -lncurses -lssl -lcrypto -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -pthread /home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(libcrypto-lib-c_zlib.o): in function `zlib_oneshot_expand_block': c_zlib.c:(.text+0xb8b): undefined reference to `uncompress' Patching aclocal.m4 is not possible as autoreconf fails due to missing AC_DIVERT_HELP macro. This build failure is only raised by autobuilders since 2024 for an unknown reason. Fixes: - http://autobuild.buildroot.org/results/6d4119b54fc6b6111a03f81e131e83bae0d844d1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ef5d3327a1f030924cb5f000d568fc69f7e7ec53) Signed-off-by: Peter Korsgaard --- package/lynx/lynx.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index 3f62f4f5b7..b441eacef7 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -53,6 +53,8 @@ LYNX_DEPENDENCIES += libidn LYNX_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libidn` endif -LYNX_CONF_ENV = LIBS="$(LYNX_LIBS)" CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" +LYNX_CONF_ENV = \ + LDFLAGS="$(TARGET_LDFLAGS) $(LYNX_LIBS)" \ + CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" $(eval $(autotools-package)) From peter at korsgaard.com Wed Feb 28 20:56:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:56:08 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240228212548.99D8587CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6767e03ba69fe7bf8e74cc2b43664b2ddf18673 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 44292dabc09bc14df033e7be9d12429353ceaac7) [Peter: drop 6.6.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 10 +++++----- package/linux-headers/Config.in.host | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index a410b1395d..ee8263ff4f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.74" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.75" 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 a0d8a5769f..cfa5437777 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b7fbd1d79faed2ce3570ef79dc1223e4e19c868b86326b14a435db56ebbb2022 linux-6.1.74.tar.xz +sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 linux-5.15.147.tar.xz -sha256 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e linux-5.10.208.tar.xz -sha256 42d28def2cc1502251edbfeaca3b25ee764ad1e471b6c703ccb2267f38471c43 linux-5.4.267.tar.xz +sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz +sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz +sha256 afc8aca6cb56fea489f6508bc24357df1cf8a8f3d7dcfbcccd94b7f968492620 linux-5.4.268.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 da82425c7410623dfb2405915347ee9617fc0e33a63ca821c33aeed160cddae8 linux-4.19.305.tar.xz +sha256 b91be40fa61ff7d42958e2154a4b7602dc071982128b9b58b6d911dec111be19 linux-4.19.306.tar.xz sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a3e9659d5c..8e63f47bcd 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -385,11 +385,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.336" if BR2_KERNEL_HEADERS_4_14 - default "4.19.305" if BR2_KERNEL_HEADERS_4_19 - default "5.4.267" if BR2_KERNEL_HEADERS_5_4 - default "5.10.208" if BR2_KERNEL_HEADERS_5_10 - default "5.15.147" if BR2_KERNEL_HEADERS_5_15 - default "6.1.74" if BR2_KERNEL_HEADERS_6_1 + default "4.19.306" if BR2_KERNEL_HEADERS_4_19 + default "5.4.268" if BR2_KERNEL_HEADERS_5_4 + default "5.10.209" if BR2_KERNEL_HEADERS_5_10 + default "5.15.148" if BR2_KERNEL_HEADERS_5_15 + default "6.1.75" if BR2_KERNEL_HEADERS_6_1 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 \ From peter at korsgaard.com Wed Feb 28 21:13:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:39 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/lvm2: fix CPE variable Message-ID: <20240228212549.063B787CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e5a8f73837e66bb1a234791eebd225812d79517 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 8c0d9795a7a75a36574a7cc89107d71cb32fd20e) Signed-off-by: Peter Korsgaard --- package/lvm2/lvm2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 474ea30bdc..810d668ec2 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB -LVM2_CPE_ID_PRODUCT = redhat +LVM2_CPE_ID_VENDOR = redhat # parallel build issues LVM2_MAKE = $(MAKE1) From peter at korsgaard.com Wed Feb 28 21:15:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:00 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR Message-ID: <20240228212549.27C3B87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac90d5aecd800cf08b81d2e0bd0cd6ef7cf72f3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:kernel:wireless-regdb added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 05617160dd0bc4aef6cc91930d7985009e854142) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index e9003ce2e6..5c8ef96398 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -9,7 +9,6 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE -WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS From peter at korsgaard.com Wed Feb 28 21:15:25 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:25 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR Message-ID: <20240228212549.327F087CE3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=caf50ae7504a3bba9d90ed9aa6096d42f2737c6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:kernel:linux-firmware added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 380d4a75f5e3c2ae52ebc1afd409713fdb6ced37) Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 9d9d12bd5f..fa4804dd2e 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel - # Intel SST DSP ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master From peter at korsgaard.com Wed Feb 28 21:20:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:15 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/json-c: update JSON_C_CPE_ID_VENDOR Message-ID: <20240228212549.53FE787CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab793d11dbff02c982f335f237adf420b676dcb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:json-c_project:json-c has been deprecated in favor of cpe:2.3:a:json-c:json-c in September 2023: JSON-C Project JSON-C 0.14 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 63118fbb55d3be3fc182470f02fcf7c221ba5ae4) Signed-off-by: Peter Korsgaard --- package/json-c/json-c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 9af7f9a83e..e4a2170f87 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VENDOR = json-c_project +JSON_C_CPE_ID_VENDOR = json-c JSON_C_CONF_OPTS = -DDISABLE_EXTRA_LIBS=ON $(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 28 21:01:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:01:02 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] docs/manual/contribute.txt: fix typo Message-ID: <20240228212548.B40B587CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a643262322436a4cb4dd63cbfceed22a0794683b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x "who sponsored who sponsored" -> "who sponsored" Signed-off-by: S??bastien Szymanski Signed-off-by: Peter Korsgaard (cherry picked from commit f24e85238f67eb65ec5dc7ebde7f0c7cfd3c396b) Signed-off-by: Peter Korsgaard --- docs/manual/contribute.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 15fe36aef0..2b90d13b41 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -259,7 +259,7 @@ separated from it by a plus `+` sign. E.g.: + `Your-Name Your-Surname ` -* for an individual who sponsored who sponsored the submitted work, use +* for an individual who sponsored the submitted work, use their name and surname: + `Your-Name Your-Surname ` From peter at korsgaard.com Wed Feb 28 21:11:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:11:22 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240228212548.D132C87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92a53b90625c0e4d76db44713527ca50d8cee418 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 52a15667b122575919bd7207a16872e8eb229bfd) [Peter: drop 6.6.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 2 +- package/linux-headers/Config.in.host | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index ee8263ff4f..52ca6bc808 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.75" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.76" 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 cfa5437777..5bf9b9401c 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz +sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8e63f47bcd..71ba85b289 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -389,7 +389,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.75" if BR2_KERNEL_HEADERS_6_1 + default "6.1.76" if BR2_KERNEL_HEADERS_6_1 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 \ From peter at korsgaard.com Wed Feb 28 21:21:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:29 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/c-ares: update C_ARES_CPE_ID_VENDOR Message-ID: <20240228212549.7598F87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=801051154b62c21b3e8014cf2544ca51dcb14ee7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:c-ares_project:c-ares has been deprecated in favor of cpe:2.3:a:c-ares:c-ares in September 2023: C-ares Project C-ares 1.17.1 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ae2baf1771cbbebae65e32397480deec6bf879e4) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 46b8acd673..d9bf583b9b 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -10,7 +10,7 @@ C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md -C_ARES_CPE_ID_VENDOR = c-ares_project +C_ARES_CPE_ID_VENDOR = c-ares $(eval $(autotools-package)) $(eval $(host-autotools-package)) From peter at korsgaard.com Wed Feb 28 21:17:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:17:19 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/x11r7/xlib_libXpm: update XLIB_LIBXPM_CPE_ID_VENDOR Message-ID: <20240228212549.4920987CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=713753e81e7523be4bbcdec819d0327cbccde554 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:libxpm_project:libxpm has been deprecated in favor of cpe:2.3:a:x.org:libxpm in October 2023: Libxpm Project Libxpm 3.5.15 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 03a9171cced41f2ee94850d6237bcc54fdda0b1a) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 0bba3ea946..1239ba0d4d 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -9,7 +9,7 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT -XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_VENDOR = x.org XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ From peter at korsgaard.com Wed Feb 28 20:59:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:59:19 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240228212551.DD3B987CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f24d68dde05e83f3baa5e56c50fcd6cfaf699caa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 44292dabc09bc14df033e7be9d12429353ceaac7) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index ed865c6f5b..662bd09162 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.14" 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 f41ed0a270..8bdead2a5e 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 88b89e7dd41ead4e3ab1e411c8bb8d592575acf815cf1df3c0dc57e2e882c0bc linux-6.6.13.tar.xz +sha256 fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584 linux-6.6.14.tar.xz sha256 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 linux-6.5.13.tar.xz -sha256 b7fbd1d79faed2ce3570ef79dc1223e4e19c868b86326b14a435db56ebbb2022 linux-6.1.74.tar.xz +sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 linux-5.15.147.tar.xz -sha256 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e linux-5.10.208.tar.xz -sha256 42d28def2cc1502251edbfeaca3b25ee764ad1e471b6c703ccb2267f38471c43 linux-5.4.267.tar.xz +sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz +sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz +sha256 afc8aca6cb56fea489f6508bc24357df1cf8a8f3d7dcfbcccd94b7f968492620 linux-5.4.268.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 da82425c7410623dfb2405915347ee9617fc0e33a63ca821c33aeed160cddae8 linux-4.19.305.tar.xz +sha256 b91be40fa61ff7d42958e2154a4b7602dc071982128b9b58b6d911dec111be19 linux-4.19.306.tar.xz sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1fad05b899..3aaff00a0f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -413,13 +413,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.336" if BR2_KERNEL_HEADERS_4_14 - default "4.19.305" if BR2_KERNEL_HEADERS_4_19 - default "5.4.267" if BR2_KERNEL_HEADERS_5_4 - default "5.10.208" if BR2_KERNEL_HEADERS_5_10 - default "5.15.147" if BR2_KERNEL_HEADERS_5_15 - default "6.1.74" if BR2_KERNEL_HEADERS_6_1 + default "4.19.306" if BR2_KERNEL_HEADERS_4_19 + default "5.4.268" if BR2_KERNEL_HEADERS_5_4 + default "5.10.209" if BR2_KERNEL_HEADERS_5_10 + default "5.15.148" if BR2_KERNEL_HEADERS_5_15 + default "6.1.75" if BR2_KERNEL_HEADERS_6_1 default "6.5.13" if BR2_KERNEL_HEADERS_6_5 - default "6.6.13" if BR2_KERNEL_HEADERS_6_6 + default "6.6.14" if BR2_KERNEL_HEADERS_6_6 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 \ From peter at korsgaard.com Wed Feb 28 21:20:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:56 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/dbus: fix CPE variables Message-ID: <20240228212549.69C9A87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d991169988f58b2548383b8675bec07cc0ba9f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:d-bus_project:d-bus has been deprecated in favor of cpe:2.3:a:freedesktop:dbus in December 2023: D-Bus Project D-Bus 1.15.6 Version Advisory Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 99d2c4301c..b4d1cdc6b6 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -10,8 +10,8 @@ DBUS_VERSION = 1.12.28 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -DBUS_CPE_ID_VENDOR = d-bus_project -DBUS_CPE_ID_PRODUCT = d-bus +DBUS_CPE_ID_VENDOR = freedesktop +DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From peter at korsgaard.com Wed Feb 28 21:01:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:01:53 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/syslog-ng: needs pcre2, not pcre Message-ID: <20240228212552.0C12087CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c93f28c12154478143e2c1757aa44e8f428c172 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Syslog-ng-uses pcre2 instead of pcre since 4.3.0 with: https://github.com/syslog-ng/syslog-ng/commit/cb6de08dc9078644d48ca536b5660e406b1a50d6 No autobuilder failures, as pcre2 is implicitly available through libglib2. Signed-off-by: Peter Korsgaard (cherry picked from commit d932f84d9fed1fca22c7bcd1eea382d7c9ea6735) Signed-off-by: Peter Korsgaard --- package/syslog-ng/Config.in | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/syslog-ng/Config.in b/package/syslog-ng/Config.in index 30ad54a4bf..aa1e71d225 100644 --- a/package/syslog-ng/Config.in +++ b/package/syslog-ng/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_SYSLOG_NG depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_OPENSSL help syslog-ng is an enhanced log daemon, supporting a wide range diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index ff5aaee429..dd02a6e3af 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -12,7 +12,7 @@ SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt SYSLOG_NG_CPE_ID_VENDOR = oneidentity SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \ - libglib2 openssl pcre + libglib2 openssl pcre2 # We're patching configure.ac SYSLOG_NG_AUTORECONF = YES SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \ From peter at korsgaard.com Wed Feb 28 21:13:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:02 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/mpfr: fix CPE variables Message-ID: <20240228212548.EDAA887CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed4b9473c35ebd615cec745a2927365ad4eb842f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:gnu:mpfr added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE identifier for this package cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 186883f497cf1c3985c9b802435ddd3b6c431167) Signed-off-by: Peter Korsgaard --- package/mpfr/mpfr.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 8d12c7502b..c0c8c04646 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -9,7 +9,8 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER -MPFR_CPE_ID_VENDOR = gnu +MPFR_CPE_ID_VENDOR = mpfr +MPFR_CPE_ID_PRODUCT = gnu_mpfr MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp From peter at korsgaard.com Wed Feb 28 21:02:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:02:40 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/glibc: add CVE ignore for CVE-2023-4806 Message-ID: <20240228212552.18D9A87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efa40febd9bb7dbbd6cd86cbdde5c3d0ffec3947 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 8519de517e22 (package/{glibc, localedef}: security bump to version glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701) correctly mentioned CVE-2023-4806 in the commit message, but forgot to add an ignore for it. Fix that. Signed-off-by: Peter Korsgaard (cherry picked from commit 62b767fd3ed27d245937066f77ec53bd0b1e9329) Signed-off-by: Peter Korsgaard --- package/glibc/glibc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 596697bb8f..d49da6457c 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -28,6 +28,10 @@ GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) # 2.38 and the version we're really using GLIBC_IGNORE_CVES += CVE-2023-4527 +# Fixed by 5ee59ca371b99984232d7584fe2b1a758b4421d3, which is between +# 2.38 and the version we're really using +GLIBC_IGNORE_CVES += CVE-2023-4806 + # Fixed by 750a45a783906a19591fb8ff6b7841470f1f5710, which is between # 2.38 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-4911 From peter at korsgaard.com Wed Feb 28 21:07:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:07:02 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/cpio: fix tar.bz2 hash Message-ID: <20240228212552.35F9187CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=563aed5287bef4f5af2661af00d476355d72fb0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit b0306d94b29d6f5e08735db0448019f9f4e4234b forgot to update cpio-2.13.tar.bz2 to cpio-2.14.tar.bz2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0694cef47b4942447fa8532f55e11e5fcae48f2b) Signed-off-by: Peter Korsgaard --- package/cpio/cpio.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cpio/cpio.hash b/package/cpio/cpio.hash index 20fd9392e7..c67fbc1f61 100644 --- a/package/cpio/cpio.hash +++ b/package/cpio/cpio.hash @@ -1,6 +1,6 @@ # From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00001.html sha1 cbac50a61079b6f3bdcf9ffe42171d9257cfe877 cpio-2.14.tar.bz2 # Locally calculated after checking pgp signature -sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.13.tar.bz2 +sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.14.tar.bz2 # Locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING From peter at korsgaard.com Wed Feb 28 20:52:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:52:49 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/dhcpcd: bump to version 10.0.5 Message-ID: <20240228212551.C486987CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dcc89720bf1a643a88b04fb4f5dcb78e6c3fcfed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x This version contains a fix for aarch64 based systems. On such systems, dhcpcd would crash without setting any IP addresses. See https://github.com/NetworkConfiguration/dhcpcd/commit/6a36f96740f8fb9f9b615b157962505f1ad8a00c and https://github.com/NetworkConfiguration/dhcpcd/issues/260 for more details. Signed-off-by: David Barbion Signed-off-by: Peter Korsgaard (cherry picked from commit 1dfa4c56fe5dd1b584791b3c0c61dcf0b623aad5) Signed-off-by: Peter Korsgaard --- package/dhcpcd/dhcpcd.hash | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash index b015dce4ac..fb4f6064bc 100644 --- a/package/dhcpcd/dhcpcd.hash +++ b/package/dhcpcd/dhcpcd.hash @@ -1,4 +1,4 @@ # sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.4 -sha256 ced5bbde8da3726eac77b9e77e4f31a89c9849d811ef8a2c749664fc5f55a718 dhcpcd-10.0.4.tar.xz +sha256 eb1f3cfef3069781ff8c896d7cea922639964afe22db28c069dc3f37f57eb428 dhcpcd-10.0.5.tar.xz # Locally calculated sha256 a7d6da3a202cdd38eaab0bcea4d25f60d002980f3785b3e896d9bf387f093ac8 LICENSE diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index ba1481e83d..ab3f98dd5a 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 10.0.4 +DHCPCD_VERSION = 10.0.5 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$(DHCPCD_VERSION) DHCPCD_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Wed Feb 28 21:16:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:16:56 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/netatalk: update NETATALK_CPE_ID_VENDOR Message-ID: <20240228212549.3E18F87CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d4262cf2a8fe5157a495e58e4098c3c57a6191a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of cpe:2.3:a:netatalk:netatalk in September 2023: Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 5ae38ec621f4821dd3eaf7ad3b0174cad21116ff) Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index a47bfa7e84..40e64dabeb 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -12,7 +12,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT -NETATALK_CPE_ID_VENDOR = netatalk_project +NETATALK_CPE_ID_VENDOR = netatalk # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ From peter at korsgaard.com Wed Feb 28 21:01:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:01:09 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] docs/manual/contribute.txt: fix typo Message-ID: <20240228212551.F3E0187CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47960afe4f47a759cb6a07a7f53e07a085890b51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x "who sponsored who sponsored" -> "who sponsored" Signed-off-by: S??bastien Szymanski Signed-off-by: Peter Korsgaard (cherry picked from commit f24e85238f67eb65ec5dc7ebde7f0c7cfd3c396b) Signed-off-by: Peter Korsgaard --- docs/manual/contribute.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 15fe36aef0..2b90d13b41 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -259,7 +259,7 @@ separated from it by a plus `+` sign. E.g.: + `Your-Name Your-Surname ` -* for an individual who sponsored who sponsored the submitted work, use +* for an individual who sponsored the submitted work, use their name and surname: + `Your-Name Your-Surname ` From peter at korsgaard.com Wed Feb 28 21:13:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:11 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/mpfr: fix CPE variables Message-ID: <20240228212552.70AB187CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5f721dca6e9682f665a5fb94801b73f37daaf7d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:gnu:mpfr added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE identifier for this package cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 186883f497cf1c3985c9b802435ddd3b6c431167) Signed-off-by: Peter Korsgaard --- package/mpfr/mpfr.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 8d12c7502b..c0c8c04646 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -9,7 +9,8 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER -MPFR_CPE_ID_VENDOR = gnu +MPFR_CPE_ID_VENDOR = mpfr +MPFR_CPE_ID_PRODUCT = gnu_mpfr MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp From peter at korsgaard.com Wed Feb 28 21:14:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:14:30 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/libvips: update LIBVIPS_CPE_ID_VENDOR Message-ID: <20240228212549.1CB1A87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=50834a50e172847ab35be918c4b92a2fb2d46f39 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:libvips_project:libvips has been deprecated in favor of cpe:2.3:a:libvips:libvips in September 2023: libvips Project libvips 8.10.6 - Project Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5e4eba64140eea6adea87234d9736ae211bd352e) Signed-off-by: Peter Korsgaard --- package/libvips/libvips.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index f7b15e8e06..328f1cfc76 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -9,7 +9,7 @@ LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -LIBVIPS_CPE_ID_VENDOR = libvips_project +LIBVIPS_CPE_ID_VENDOR = libvips # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported From peter at korsgaard.com Wed Feb 28 21:10:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:10:20 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240228212552.4EE8587CE6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8518173cd411a353958986351e2c551156ee53d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 52a15667b122575919bd7207a16872e8eb229bfd) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 662bd09162..da22b439e3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.15" 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 8bdead2a5e..416e34bc27 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584 linux-6.6.14.tar.xz +sha256 ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa linux-6.6.15.tar.xz sha256 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 linux-6.5.13.tar.xz -sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz +sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3aaff00a0f..5bd4ad8a61 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -417,9 +417,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.75" if BR2_KERNEL_HEADERS_6_1 + default "6.1.76" if BR2_KERNEL_HEADERS_6_1 default "6.5.13" if BR2_KERNEL_HEADERS_6_5 - default "6.6.14" if BR2_KERNEL_HEADERS_6_6 + default "6.6.15" if BR2_KERNEL_HEADERS_6_6 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 \ From peter at korsgaard.com Wed Feb 28 21:09:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:09:04 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/freerdp: security bump to version 2.11.5 Message-ID: <20240228212552.433D987CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4e11c319d2d8107636072bff1da3f69d6954a0d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x - Fix CVE-2024-22211 - Update Upstream tag in patches https://github.com/FreeRDP/FreeRDP/blob/2.11.5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit dbe037dc9998155373b0a96687c55982f9c1a536) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 --- package/freerdp/0001-Fix-variable-declaration-in-loop.patch | 3 +-- package/freerdp/0002-Fixed-variable-declaration-in-loop.patch | 3 +-- .../freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch | 2 +- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0554ffde5b..47074570f8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -428,9 +428,6 @@ package/flite/0001-fix-alsa-static.patch Upstream package/fltk/0001-disable-tests.patch Upstream package/fluxbox/0001-fixes-bug-1138.patch Upstream package/freeradius-client/0001-fix-for-nettle.patch Upstream -package/freerdp/0001-Fix-variable-declaration-in-loop.patch Upstream -package/freerdp/0002-Fixed-variable-declaration-in-loop.patch Upstream -package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch Upstream package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch Upstream package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch Upstream package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables diff --git a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch index a391e42ee6..799a92734b 100644 --- a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch +++ b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: Armin Novak Date: Wed, 16 Sep 2020 09:30:37 +0200 Subject: [PATCH] Fix variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 3 ++- diff --git a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch index 14e1d6c8f4..1a4e899430 100644 --- a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch +++ b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: akallabeth Date: Tue, 22 Sep 2020 07:43:56 +0200 Subject: [PATCH] Fixed variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 4 ++-- diff --git a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch index d8dfe13d1b..63434e58f7 100644 --- a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch +++ b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/31e770a330158035e24b7b952bec0030138482b7 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FreeRDP/FreeRDP/pull/7205] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/0976cce458f2281cef6e8c417daf4bbd22bcc087 --- winpr/include/winpr/file.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 02268f55ea..daf933e0af 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.0.tar.gz.sha256 -sha256 8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e freerdp-2.11.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.5.tar.gz.sha256 +sha256 70785ad9934d75aed1734f8918a05aff95788e58e53081e84651106b24303dc2 freerdp-2.11.5.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 6f71ef796f..29b33f61c3 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.0 +FREERDP_VERSION = 2.11.5 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From peter at korsgaard.com Wed Feb 28 21:20:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:50 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/flex: update FLEX_CPE_ID_VENDOR Message-ID: <20240228212549.5FBA787CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51cf6919d02043d57970a5ebe084868547550756 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:flex_project:flex has been deprecated in favor of cpe:2.3:a:westes:flex in October 2023: Flex Fast Lexical Analyser 2.6.4 Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c438422d4972f41c0c59d1b701eefd3028abee43) Signed-off-by: Peter Korsgaard --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 85da5ddae8..f2261f2da4 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VENDOR = flex_project +FLEX_CPE_ID_VENDOR = westes # bug does not cause stack overflows in the generated code and has been # noted upstream as a bug in the code generator FLEX_IGNORE_CVES = CVE-2019-6293 From peter at korsgaard.com Wed Feb 28 21:03:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:03:09 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/{glibc, localedef}: security bump to version glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 Message-ID: <20240228212552.288D387CE3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=decf0cd91bc77242426fe91cb75975a68c5b9376 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following security issues: CVE-2023-6246: syslog: Fix heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD For details, see the Qualys advisory: https://www.openwall.com/lists/oss-security/2024/01/30/6 Signed-off-by: Peter Korsgaard (cherry picked from commit 75e7c7ba8cddb2644350a7f59c943f5c4e99b3b0) Signed-off-by: Peter Korsgaard --- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 14 +++++++++++++- package/localedef/localedef.mk | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 00d9f1c985..15ae55b9e6 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 fd991e43997ff6e4994264c3cbc23fa87fa28b1b3c446eda8fc2d1d3834a2cfb glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701.tar.gz +sha256 e38f4284d6909c6b5db7d79c6e450daeaf136a67e547290eec0b063a55eaaa42 glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d49da6457c..d198d6f04c 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701 +GLIBC_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -40,6 +40,18 @@ GLIBC_IGNORE_CVES += CVE-2023-4911 # 2.38 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-5156 +# Fixed by 23514c72b780f3da097ecf33a793b7ba9c2070d2, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6246 + +# Fixed by d0338312aace5bbfef85e03055e1212dd0e49578, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6779 + +# Fixed by d37c2b20a4787463d192b32041c3406c2bd91de0, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6780 + # All these CVEs are considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index ed6d4b4968..c017c0e00e 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701 +LOCALEDEF_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From peter at korsgaard.com Wed Feb 28 21:00:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:00:08 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/lynx: fix openssl static build Message-ID: <20240228212551.E91D087CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=111c2eeef14de20a3b3b1e9ebc2247346cb5b855 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Use LDFLAGS instead of LIBS to fix the following openssl static build failure raised because lynx filters out duplicates (i.e. -lz) in CF_ADD_LIBS: configure:12958: checking for inet_ntoa configure:12995: /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -static conftest.c -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lssl -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lz -pthread -lcrypto -lz -pthread >&5 configure:12998: $? = 0 configure:13001: test -s conftest configure:13004: $? = 0 configure:13014: result: yes configure:13095: checking for gethostbyname configure:13151: result: yes configure:13232: checking for strcasecmp configure:13288: result: yes configure:13401: checking for inet_aton function configure:13443: /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -static conftest.c -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lssl -lz -pthread -lcrypto >&5 [...] /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" -I. -I.. -Ichrtrans -I./chrtrans -I.. -I../src -I.././WWW/Library/Implementation -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/openssl -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib -L/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib -static -o lynx LYebcdic.o LYClean.o LYShowInfo.o LYEdit.o L YStrings.o LYMail.o HTAlert.o GridText.o LYGetFile.o LYMain.o LYMainLoop.o LYCurses.o LYBookmark.o LYmktime.o LYUtils.o LYOptions.o LYReadCFG.o LYSearch.o LYHistory.o LYForms.o LYPrint.o LYrcFile.o LYDownload.o LYNews.o LYKeymap.o HTML.o HTFWriter.o HTInit.o DefaultStyle.o LYUpload.o LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o parsdate.o UCdomap.o UCAux.o UCAuto.o LYSession.o LYLocal.o .././WWW/Library/Implementation/libwww.a -lz -static -lncurses -lssl -lcrypto -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -pthread /home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(libcrypto-lib-c_zlib.o): in function `zlib_oneshot_expand_block': c_zlib.c:(.text+0xb8b): undefined reference to `uncompress' Patching aclocal.m4 is not possible as autoreconf fails due to missing AC_DIVERT_HELP macro. This build failure is only raised by autobuilders since 2024 for an unknown reason. Fixes: - http://autobuild.buildroot.org/results/6d4119b54fc6b6111a03f81e131e83bae0d844d1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ef5d3327a1f030924cb5f000d568fc69f7e7ec53) Signed-off-by: Peter Korsgaard --- package/lynx/lynx.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index 3f62f4f5b7..b441eacef7 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -53,6 +53,8 @@ LYNX_DEPENDENCIES += libidn LYNX_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libidn` endif -LYNX_CONF_ENV = LIBS="$(LYNX_LIBS)" CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" +LYNX_CONF_ENV = \ + LDFLAGS="$(TARGET_LDFLAGS) $(LYNX_LIBS)" \ + CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" $(eval $(autotools-package)) From peter at korsgaard.com Wed Feb 28 21:13:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:57 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/minizip: fix CPE variables Message-ID: <20240228212549.1171A87CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3203317ec6c751d51fe48ad69456316a3f6f7ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:minizip_project:minizip added by commit 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit f1e05a8199514310443777bc4dce1e2a6d2b69c0) Signed-off-by: Peter Korsgaard --- package/minizip/minizip.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index c74c0df8d1..8587508752 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -14,7 +14,8 @@ MINIZIP_CONF_OPTS = \ -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project +MINIZIP_CPE_ID_VENDOR = zlib-ng +MINIZIP_CPE_ID_PRODUCT = minizip-ng ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 From peter at korsgaard.com Wed Feb 28 21:12:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:12:03 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/crda: drop CRDA_CPE_ID_VENDOR Message-ID: <20240228212552.5A39F87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89aed0df34750153eaad2a19ae9dfb165ced441e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:kernel:crda added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 85d300f1021df905e60e704407b68dbed75ba430) Signed-off-by: Peter Korsgaard --- package/crda/crda.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/crda/crda.mk b/package/crda/crda.mk index a73c9aa26d..8043260cfc 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -9,7 +9,6 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE -CRDA_CPE_ID_VENDOR = kernel define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ From peter at korsgaard.com Wed Feb 28 21:12:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:12:40 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/depot-tools: drop DEPOT_TOOLS_CPE_ID_VENDOR Message-ID: <20240228212552.6544387CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29095831f2f4f350349d901d14685d05e069c768 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:google:depot-tools added by commit 48730a1a9d882a7c56146bd2955e074aed790dcb has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:google:depot-tools Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 27fafa94a729b2c59d5eb0aec0bedbaf9dce5abb) Signed-off-by: Peter Korsgaard --- package/depot-tools/depot-tools.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index 634258ffbb..a53afa14d6 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -9,7 +9,6 @@ DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause DEPOT_TOOLS_LICENSE_FILES = LICENSE -DEPOT_TOOLS_CPE_ID_VENDOR = google HOST_DEPOT_TOOLS_DEPENDENCIES = \ host-python3 \ From peter at korsgaard.com Wed Feb 28 21:21:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:45 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-aiohttp: update PYTHON_AIOHTTP_CPE_ID_VENDOR Message-ID: <20240228212549.8418087CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f2145c0848e9114bbd5412285cd300d802d7a0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:aiohttp_project:aiohttp has been deprecated in favor of cpe:2.3:a:aiohttp:aiohttp in November 2023: Aiohttp Project Aiohttp 3.8.0 Beta 0 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a01deb6617ff38914f649f88c71e7c0c5ee71b01) Signed-off-by: Peter Korsgaard --- package/python-aiohttp/python-aiohttp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 8b0b15f13b..8944b5f77f 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -10,7 +10,7 @@ PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/ff/4f/62d9859b7d4e PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp_project +PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp PYTHON_AIOHTTP_CPE_ID_PRODUCT = aiohttp $(eval $(python-package)) From peter at korsgaard.com Wed Feb 28 21:14:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:14:24 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/libvips: update LIBVIPS_CPE_ID_VENDOR Message-ID: <20240228212552.9203287CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=876a47e0f4b60e45d7f771771ba61795a1cc045c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:libvips_project:libvips has been deprecated in favor of cpe:2.3:a:libvips:libvips in September 2023: libvips Project libvips 8.10.6 - Project Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5e4eba64140eea6adea87234d9736ae211bd352e) Signed-off-by: Peter Korsgaard --- package/libvips/libvips.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 1a0f9d5ead..8eb1f0964e 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -9,7 +9,7 @@ LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -LIBVIPS_CPE_ID_VENDOR = libvips_project +LIBVIPS_CPE_ID_VENDOR = libvips # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported From peter at korsgaard.com Wed Feb 28 21:14:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:14:02 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/minizip: fix CPE variables Message-ID: <20240228212552.86E7387CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a307edcfcc0f40c37ae21be6d54e1ee0e0f2491 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:minizip_project:minizip added by commit 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit f1e05a8199514310443777bc4dce1e2a6d2b69c0) Signed-off-by: Peter Korsgaard --- package/minizip/minizip.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 5a4d920369..819b33b701 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -14,7 +14,8 @@ MINIZIP_CONF_OPTS = \ -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project +MINIZIP_CPE_ID_VENDOR = zlib-ng +MINIZIP_CPE_ID_PRODUCT = minizip-ng ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 From peter at korsgaard.com Wed Feb 28 21:15:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:04 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR Message-ID: <20240228212552.9CFBF87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8dedc1329fe28b59c6a8014cc81ed6e40d86b13b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:kernel:wireless-regdb added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 05617160dd0bc4aef6cc91930d7985009e854142) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index e9003ce2e6..5c8ef96398 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -9,7 +9,6 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE -WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS From peter at korsgaard.com Wed Feb 28 21:13:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:32 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/lvm2: fix CPE variable Message-ID: <20240228212552.7B11587CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=783f8284705770e082b1094a2f1413c6b2b486c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 8c0d9795a7a75a36574a7cc89107d71cb32fd20e) Signed-off-by: Peter Korsgaard --- package/lvm2/lvm2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 474ea30bdc..810d668ec2 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB -LVM2_CPE_ID_PRODUCT = redhat +LVM2_CPE_ID_VENDOR = redhat # parallel build issues LVM2_MAKE = $(MAKE1) From peter at korsgaard.com Wed Feb 28 20:53:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:53:34 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/joe: add JOE_CPE_ID_VENDOR Message-ID: <20240228212551.D0AFC87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ab2a93204968e939f3345f4c867b203afbf6a4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:joseph_allen:joe is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/5F530947-2060-4842-92B9-5BC61D9C5430 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2953cd264489229adaef5f0a1f307900dcc3e425) Signed-off-by: Peter Korsgaard --- package/joe/joe.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/joe/joe.mk b/package/joe/joe.mk index f0cac402e1..9346ec1fd3 100644 --- a/package/joe/joe.mk +++ b/package/joe/joe.mk @@ -8,6 +8,7 @@ JOE_VERSION = 4.6 JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION) JOE_LICENSE = GPL-2.0+ JOE_LICENSE_FILES = COPYING +JOE_CPE_ID_VENDOR = joseph_allen ifeq ($(BR2_PACKAGE_NCURSES),y) JOE_DEPENDENCIES += ncurses From peter at korsgaard.com Wed Feb 28 21:17:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:17:15 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/x11r7/xlib_libXpm: update XLIB_LIBXPM_CPE_ID_VENDOR Message-ID: <20240228212552.D6F9287CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cc9ab7d55c1b0b202f93d6c7d324fe353cf8d37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:libxpm_project:libxpm has been deprecated in favor of cpe:2.3:a:x.org:libxpm in October 2023: Libxpm Project Libxpm 3.5.15 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 03a9171cced41f2ee94850d6237bcc54fdda0b1a) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 0bba3ea946..1239ba0d4d 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -9,7 +9,7 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT -XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_VENDOR = x.org XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ From peter at korsgaard.com Wed Feb 28 21:15:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:19 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR Message-ID: <20240228212552.A896D87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e480566f8069a3a08863e65f8a6200aff6bf7da8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:kernel:linux-firmware added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 380d4a75f5e3c2ae52ebc1afd409713fdb6ced37) Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index c2cf0fec19..cc3624e59e 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel - # Intel SST DSP ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master From peter at korsgaard.com Wed Feb 28 21:15:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:57 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/rauc-hawkbit-updater: drop RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR Message-ID: <20240228212552.B473187CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c4cb225d3c1a1535420cbc8adaa2f8858491986 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:pengutronix:rauc-hawkbit-updater added by commit 928b7219cd7079864eadadc66dbff21c5cd72804 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:pengutronix:rauc-hawkbit-updater Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ed40db6dfba553df8571fcb96c29b8f20dc43dca) Signed-off-by: Peter Korsgaard --- package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index 10ba91abbb..a453f75a28 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -9,7 +9,6 @@ RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/release RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE -RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl $(eval $(meson-package)) From peter at korsgaard.com Wed Feb 28 21:17:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:17:00 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/netatalk: update NETATALK_CPE_ID_VENDOR Message-ID: <20240228212552.CBD8E87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f0c6bf49fa1a415c64d59e8589cc8e5a3b86fd3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of cpe:2.3:a:netatalk:netatalk in September 2023: Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 5ae38ec621f4821dd3eaf7ad3b0174cad21116ff) Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index a47bfa7e84..40e64dabeb 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -12,7 +12,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT -NETATALK_CPE_ID_VENDOR = netatalk_project +NETATALK_CPE_ID_VENDOR = netatalk # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ From peter at korsgaard.com Wed Feb 28 21:21:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:01 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/dbus: fix CPE variables Message-ID: <20240228212553.0740087CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08dfcc690d107aff06046d02dea091fe4ee5a3d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:d-bus_project:d-bus has been deprecated in favor of cpe:2.3:a:freedesktop:dbus in December 2023: D-Bus Project D-Bus 1.15.6 Version Advisory Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index c41fbcb4dd..d610846ddb 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -11,8 +11,8 @@ DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.xz DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -DBUS_CPE_ID_VENDOR = d-bus_project -DBUS_CPE_ID_PRODUCT = d-bus +DBUS_CPE_ID_VENDOR = freedesktop +DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From peter at korsgaard.com Wed Feb 28 21:20:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:23 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/json-c: update JSON_C_CPE_ID_VENDOR Message-ID: <20240228212552.E11BC87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2c908f0c7e3f74df72683121693d045d51dc6f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:json-c_project:json-c has been deprecated in favor of cpe:2.3:a:json-c:json-c in September 2023: JSON-C Project JSON-C 0.14 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 63118fbb55d3be3fc182470f02fcf7c221ba5ae4) Signed-off-by: Peter Korsgaard --- package/json-c/json-c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 517acee4db..68401433b4 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VENDOR = json-c_project +JSON_C_CPE_ID_VENDOR = json-c JSON_C_CONF_OPTS = -DBUILD_APPS=OFF -DDISABLE_EXTRA_LIBS=ON $(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 28 21:16:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:16:20 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-wheel: add CPE variables Message-ID: <20240228212552.BFC1C87CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=038845825dc7798f5f6ec2111738ea6a3a5debb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:wheel_project:wheel is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/402C4B59-237A-4399-8189-CC9FC1B4BF39 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 92f3f04146654f77add9fc14c18d054783006108) Signed-off-by: Peter Korsgaard --- package/python-wheel/python-wheel.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-wheel/python-wheel.mk b/package/python-wheel/python-wheel.mk index 159598fd1e..320995521e 100644 --- a/package/python-wheel/python-wheel.mk +++ b/package/python-wheel/python-wheel.mk @@ -10,5 +10,7 @@ PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/fc/ef/0335f7217dd1e8 PYTHON_WHEEL_SETUP_TYPE = flit PYTHON_WHEEL_LICENSE = MIT PYTHON_WHEEL_LICENSE_FILES = LICENSE.txt +PYTHON_WHEEL_CPE_ID_VENDOR = wheel_project +PYTHON_WHEEL_CPE_ID_PRODUCT = wheel $(eval $(host-python-package)) From peter at korsgaard.com Wed Feb 28 21:21:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:54 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-aiohttp: update PYTHON_AIOHTTP_CPE_ID_VENDOR Message-ID: <20240228212553.1CC1787CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67c3c1894343323aea4f6ce6e65fcfb34cefb621 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:aiohttp_project:aiohttp has been deprecated in favor of cpe:2.3:a:aiohttp:aiohttp in November 2023: Aiohttp Project Aiohttp 3.8.0 Beta 0 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a01deb6617ff38914f649f88c71e7c0c5ee71b01) Signed-off-by: Peter Korsgaard --- package/python-aiohttp/python-aiohttp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index e814fc9224..70c8fcdfe8 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -10,7 +10,7 @@ PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/fd/01/f180d3192375 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp_project +PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp PYTHON_AIOHTTP_CPE_ID_PRODUCT = aiohttp $(eval $(python-package)) From peter at korsgaard.com Wed Feb 28 21:20:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:42 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flex: update FLEX_CPE_ID_VENDOR Message-ID: <20240228212552.F04A087CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=885708480740d1a8ec71dcdfc5397c6f915f2502 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:flex_project:flex has been deprecated in favor of cpe:2.3:a:westes:flex in October 2023: Flex Fast Lexical Analyser 2.6.4 Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c438422d4972f41c0c59d1b701eefd3028abee43) Signed-off-by: Peter Korsgaard --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index f1e731ce2e..c6417fea83 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VENDOR = flex_project +FLEX_CPE_ID_VENDOR = westes # bug does not cause stack overflows in the generated code and has been # noted upstream as a bug in the code generator FLEX_IGNORE_CVES = CVE-2019-6293 From peter at korsgaard.com Wed Feb 28 21:21:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:24 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/c-ares: update C_ARES_CPE_ID_VENDOR Message-ID: <20240228212553.1164687CE3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=164e1ecd9af059a0d579046d4e7730f40fe4ef1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:c-ares_project:c-ares has been deprecated in favor of cpe:2.3:a:c-ares:c-ares in September 2023: C-ares Project C-ares 1.17.1 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ae2baf1771cbbebae65e32397480deec6bf879e4) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 7a49b2639a..586fde9afb 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -10,7 +10,7 @@ C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md -C_ARES_CPE_ID_VENDOR = c-ares_project +C_ARES_CPE_ID_VENDOR = c-ares $(eval $(autotools-package)) $(eval $(host-autotools-package)) From romain.naour at smile.fr Wed Feb 28 21:38:28 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 28 Feb 2024 22:38:28 +0100 Subject: [Buildroot] [PATCH 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 In-Reply-To: References: <20240227213517.241837-1-ju.o@free.fr> <90f5d326-0b04-495e-9b6d-d25ebfa59cb4@smile.fr> Message-ID: <7badbd15-343d-4ebb-80f7-e143ad6e5c47@smile.fr> Hello Julien, Le 28/02/2024 ? 19:27, Julien Olivain a ?crit?: > Hi Romain, > > On 27/02/2024 23:31, Romain Naour wrote: >> Hi Julien, >> >> Le 27/02/2024 ? 22:35, Julien Olivain a ?crit?: >>> Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated >>> gnu-efi. This update introduced syslinux build failure, as reported >>> in [1]. >>> >>> This commit adds a package patch to fix this issue. For technical >>> details of the issue, see the package patch commit log. >>> >>> Fixes: >>> - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 >>> - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 >>> >>> [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html >>> >>> Signed-off-by: Julien Olivain >>> --- >>> ?.checkpackageignore?????????????????????????? |? 1 + >>> ?...stddef.h-add-wchar_t-type-definition.patch | 58 +++++++++++++++++++ >>> ?2 files changed, 59 insertions(+) >>> ?create mode 100644 >>> boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch >>> >>> diff --git a/.checkpackageignore b/.checkpackageignore >>> index a6cc58c448c..a98a53fbf36 100644 >>> --- a/.checkpackageignore >>> +++ b/.checkpackageignore >>> @@ -118,6 +118,7 @@ >>> boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch Upstream >>> ? >>> boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch >>> Upstream >>> ? >>> boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch >>> Upstream >>> ? >>> boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch >>> Upstream >>> +boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch >> >> We want to remove .checkpackageignore in a not too far future, please add an >> upstream status tag in the patch 0019-stddef.h-add-wchar_t-type-definition.patch >> itself. Even if upstream is not very active (last commit is 5 years ago). > > I sent a v2 fixing that: > https://patchwork.ozlabs.org/project/buildroot/patch/20240228181411.10174-1-ju.o at free.fr/ > > I initially set an exclusion because my registration to the list was slow. I > also noted > the somewhat slow activity of the project. What would be your recommendation for > the > "Upstream:" tag, in the case a patch does apply upstream, but the first time > submission > takes a bit longer?? Something like "Upstream: Applicable (but not proposed yet)"? The text after the "Upstream:" tag is a free format it seems. Upstream: I'll send it to upstream, I promise :) Maybe just: Upstream: Best regards, Romain > > Best regards, > > Julien. From romain.naour at smile.fr Wed Feb 28 21:39:32 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 28 Feb 2024 22:39:32 +0100 Subject: [Buildroot] [PATCH v2 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 In-Reply-To: <20240228181411.10174-1-ju.o@free.fr> References: <20240228181411.10174-1-ju.o@free.fr> Message-ID: <5da91e8f-c095-4f6f-bf96-f3da4bc52162@smile.fr> Hello Julien, Le 28/02/2024 ? 19:14, Julien Olivain a ?crit?: > Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated > gnu-efi. This update introduced syslinux build failure, as reported > in [1]. > > This commit adds a package patch to fix this issue. For technical > details of the issue, see the package patch commit log. > > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 > > [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html > > Signed-off-by: Julien Olivain Reviewed-by: Romain Naour Best regards, Romain > --- > Changes v1 -> v2: > - Removed .checkpackageignore entry for the patch > - Added Upstream: tag with upstream proposal URL in the patch > --- > ...stddef.h-add-wchar_t-type-definition.patch | 59 +++++++++++++++++++ > 1 file changed, 59 insertions(+) > create mode 100644 boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > > diff --git a/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > new file mode 100644 > index 00000000000..65d9463a6f6 > --- /dev/null > +++ b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > @@ -0,0 +1,59 @@ > +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 > +From: Julien Olivain > +Date: Tue, 27 Feb 2024 21:09:15 +0100 > +Subject: [PATCH] stddef.h: add wchar_t type definition > + > +Syslinux fail to build with gnu-efi >= 3.0.16 with error: > + > + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, > + from /build/syslinux-6.03/efi/efi.h:23, > + from /build/syslinux-6.03/efi/adv.h:4, > + from /build/syslinux-6.03/efi/adv.c:29: > + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' > + typedef wchar_t CHAR16; > + ^~~~~~~ > + > +This is because gnu-efi started to use the "wchar_t" type from the > +toolchain's header, in commit [1]. Before this commit, > +gnu-efi was defining the type as "short". > + > +Syslinux is including its own minimal stddef.h file, which masks the > +one provided by the toolchain. See [2]. This file does not have a type > +definition for "wchar_t". > + > +Finally, the POSIX header is supposed to provide this > +"wchar_t" type definition. See [3]. > + > +This commit fixes the issue by adding the "wchar_t" type definition in > +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" > +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This > +also follow the previous gnu-efi < 3.0.16 behavior. > + > +This issue was seen in Buildroot Linux, in [5]. > + > +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d > +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h > +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html > +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 > +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html > + > +Upstream: Proposed: https://www.syslinux.org/archives/2024-February/026903.html > +Signed-off-by: Julien Olivain > +--- > + com32/include/stddef.h | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/com32/include/stddef.h b/com32/include/stddef.h > +index f52d62f3..437b11f2 100644 > +--- a/com32/include/stddef.h > ++++ b/com32/include/stddef.h > +@@ -29,4 +29,6 @@ > + */ > + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) > + > ++typedef short wchar_t; > ++ > + #endif /* _STDDEF_H */ > +-- > +2.44.0 > + From yann.morin.1998 at free.fr Wed Feb 28 22:37:36 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 28 Feb 2024 23:37:36 +0100 Subject: [Buildroot] [PATCH] support/scripts/cve: fix running on older ijson versions Message-ID: <20240228223736.2376826-1-yann.morin.1998@free.fr> Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) had to change the decompressor from gz to xz, as the new location is using xz compression. That commit mentioned that it was spawning an external xz process to do the decompression, on the pretence that "there is no xz decompressor in Python stdlib." ijson started to accept bytes() (and str()) only with version 3.1, and using a subprocess means we are now passing bytes() to ijson, which it is not expecting as input on such older versions, casuing build failures such as: [...] File "/usr/lib/python3/dist-packages/ijson/backends/python.py", line 25, in Lexer if type(f.read(0)) == bytetype: AttributeError: 'bytes' object has no attribute 'read' Ubuntu 20.04, on which the pkg-stats run to generate the daily report, only has ijson 2.3. More recent distros have more recent versions of ijson, like Fedora 39 that has 3.2.3, recent enough to supoprt being fed bytes(). However, the reasonining in 22b69455526f is wrong: there *is* the lzma module, at least since python 3.3, that is, aeons ago, which is able to read xz-compressed files; it also has an API similar to the gzip module, and can provide a file-like object that exposes the decompressed data. So, do just that: provide an lzma-wrapped file-like object to ijson, so that we can eventually recover our daily reports that everything is broken! :-] Note that this construct still works on recent versions! Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/cve.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 1a3c307e12..7167ecbc6a 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -21,8 +21,8 @@ import datetime import os import requests # URL checking import distutils.version +import lzma import time -import subprocess import sys import operator @@ -134,8 +134,7 @@ class CVE: for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'cve_items.item') + content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise -- 2.43.2 From yann.morin.1998 at free.fr Wed Feb 28 22:44:59 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 28 Feb 2024 23:44:59 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: fix running on older python versions Message-ID: <20240228224459.2383336-1-yann.morin.1998@free.fr> Commit f71d9f49e546 (support/scripts/pkg-stats: fix datetime deprecation warning) forgot to consider that the datetime.UTC suggested by python 3.12, was only introduced with python 3.11. However, we are still generating the daily report on a python 3.8 version, which fails at runtime: AttributeError: module 'datetime' has no attribute 'UTC' It turns out that datetime.UTC is just an alias for datetime.timezone.utc, which seems to have existed since before python3... Use datetime.timezone.utc instead of its alias. Signed-off-by: Yann E. MORIN --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9a4a3ccad5..53898a36f2 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1290,7 +1290,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.now(datetime.UTC) + date = datetime.datetime.now(datetime.timezone.utc) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() -- 2.43.2 From dannenberg at ti.com Thu Feb 29 02:22:22 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Wed, 28 Feb 2024 20:22:22 -0600 Subject: [Buildroot] [PATCH v7 15/17] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240227163019.2876942-16-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> <20240227163019.2876942-16-dario.binacchi@amarulasolutions.com> Message-ID: <20240229022222.exmx2cgijdjrtnwp@dasso> Hi Dario, On Tue, Feb 27, 2024 at 05:30:17PM +0100, Dario Binacchi wrote: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. In this case, let's copy it to the binaries directory. > > Signed-off-by: Dario Binacchi > > --- > > Changes in v6: > - Replace `find' command with `cp' one. > > Changes in v5: > - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with > tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > > Added in v4 > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index fdb058f3b72a..cbdb653278f8 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > endef > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > + > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin Have you tried doing a clean build of ti_am64x_sk_defconfig? When I do that the change above breaks the build... >>> ti-k3-r5-loader 2022.10 Installing to images directory cp /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/spl/u-boot-spl.bin /home/a0797059/git/buildroot/output/images/r5-u-boot-spl .bin cp /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/tiboot3-am64x-gp-*.bin /home/a0797059/git/buildroot/output/images/tiboot3.b in cp: cannot stat '/home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/tiboot3-am64x-gp-*.bin': No such file or directory make[1]: *** [package/pkg-generic.mk:364: /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/.stamp_images_installed] Error 1 make: *** [Makefile:82: _all] Error 2 Looks like the tiboot3.bin file is already there, and nothing needs to be copied or renamed. Not sure what is best way to manage this dependency as this is the behavior of the older U-Boot. I'd probably just migrate the am64x_sk support to binman too also using the same/newer U-Boot you are already using for AM62x, making everything equivalent of the am62x_sk support you are focused on with this series. -- Andreas Dannenberg Texas Instruments Inc > endef > > $(eval $(kconfig-package)) > -- > 2.43.0 > From dannenberg at ti.com Thu Feb 29 03:28:20 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Wed, 28 Feb 2024 21:28:20 -0600 Subject: [Buildroot] [PATCH v7 00/17] Add support for AM62x-SK HS-FS devices In-Reply-To: References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> <066a576a350d384c6547dc27b55e75c8044ed9e8.camel@gmail.com> Message-ID: <20240229032820.x275rawclrilgamn@dasso> Hi Dario, I just tested you v7 series on top of Buildroot commit... 75a3562324 ("support/scripts/pkg-stats: sort CVEs in HTML output") ...on both GP and HS-FS variants of the SK-AM62 board doing an SD Card-based boot. Everything seems to work without issues, the entire boot log looks clean as far as I can tell, and even networking works. Also thanks for all your efforts upstreaming this, I know it's a ton of work. Tested-by: Andreas Dannenberg On Wed, Feb 28, 2024 at 09:07:44AM +0100, Dario Binacchi wrote: > Hi Alexander, > > On Wed, Feb 28, 2024 at 1:06?AM Alexander Sverdlin > wrote: > > > > Hello Dario, Romain! > > > > On Tue, 2024-02-27 at 17:30 +0100, Dario Binacchi wrote: > > > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > > > high-security field-securable (HS-FS) silicon to optionally customize keys > > > and encryption for security applications. > > > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > > > which, however, was buggy. This series fixes the errors and bumps the Linux > > > kernel and U-Boot required for such a new device. > > > > > > Dario Binacchi (17): > > > configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > > setting > > > configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > > setting > > > configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > > > version > > > configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > > > version > > > boot/ti-k3-r5-loader: bump to version 2024.01 > > > package/python-attrs: add host variant > > > package/python-rpds-py: add host variant > > > package/python-referencing: add host variant > > > package/python-jsonschema-specifications: add host variant > > > package/python-jsonschema: add host variant > > > boot/ti-k3-r5-loader: set binman environment > > > boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > > > package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > > > package/ti-k3: disable HS-FS for AM65 SOC > > > boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > > > configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > > > configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 > > > > I'm sorry for misleading you with the results with v6. > > I've built v7 series for GP and it runs fine on SK-AM62 (GP). > > Seems I've messed up either boot dip switches initially or the serial > > console. Thanks for your efforts! > > Nice! > Thank you for your tests. > > Thanks and regards, > Dario > > > > > Tested-by: Alexander Sverdlin > > > > -- > > Alexander Sverdlin. > > > > > -- > > Dario Binacchi > > Senior Embedded Linux Developer > > dario.binacchi at amarulasolutions.com > > __________________________________ > > > Amarula Solutions SRL > > Via Le Canevare 30, 31100 Treviso, Veneto, IT > > T. +39 042 243 5310 > info at amarulasolutions.com > > www.amarulasolutions.com From nisargjhaveri at gmail.com Thu Feb 29 05:04:54 2024 From: nisargjhaveri at gmail.com (Nisarg Jhaveri) Date: Thu, 29 Feb 2024 10:34:54 +0530 Subject: [Buildroot] [PATCH 1/1] package/brcmfmac_sdio-firmware-rpi: bump version to 26ff205 Message-ID: The current version is more than 2 years old. Update to the latest. A lot of the files are symlinked. Instead of individually restoring the links, using `cp --remove-destination --no-dereference` and `chmod` instead of `install`. Signed-off-by: Nisarg Jhaveri --- .../brcmfmac_sdio-firmware-rpi.hash | 4 +-- .../brcmfmac_sdio-firmware-rpi.mk | 27 +++++++------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index a12e92cbac..aa1043518b 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356 brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz +sha256 ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599 LICENCE diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index 5332bf53d7..7860de3ef7 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -4,33 +4,26 @@ # ################################################################################ -BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5 BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY -BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/synaptics + cp --remove-destination --no-dereference $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/synaptics/*.hcd $(TARGET_DIR)/lib/firmware/synaptics + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/synaptics/*.hcd endef endif ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm - ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin - ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt - ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin - ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress - $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/cypress + cp --remove-destination --no-dereference $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/cypress/cyfmac* endef endif -- 2.38.1.vfs.0.0 From nisargjhaveri at gmail.com Thu Feb 29 05:14:00 2024 From: nisargjhaveri at gmail.com (Nisarg Jhaveri) Date: Thu, 29 Feb 2024 10:44:00 +0530 Subject: [Buildroot] [PATCH v2 1/1] package/brcmfmac_sdio-firmware-rpi: bump version to 26ff205 Message-ID: The current version is more than 2 years old. Update to the latest. A lot of the file are symlinked. Instead of individually restoring the links, using `cp --remove-destination --no-dereference` and `chmod` instead of `install`. Signed-off-by: Nisarg Jhaveri --- Changes v1 -> v2: - Attempt to fix patch formatting --- .../brcmfmac_sdio-firmware-rpi.hash | 4 +-- .../brcmfmac_sdio-firmware-rpi.mk | 27 +++++++------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index a12e92cbac..aa1043518b 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356 brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz +sha256 ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599 LICENCE diff --git a/package/brcmfmac_sdio-firmware-rpi/ brcmfmac_sdio-firmware-rpi.mk b/package/brcmfmac_sdio-firmware-rpi/ brcmfmac_sdio-firmware-rpi.mk index 5332bf53d7..7860de3ef7 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -4,33 +4,26 @@ # ################################################################################ -BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5 BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY -BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/synaptics + cp --remove-destination --no-dereference $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/synaptics/*.hcd $(TARGET_DIR)/lib/firmware/synaptics + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/synaptics/*.hcd endef endif ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm - ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin - ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt - ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin - ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress - $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/cypress + cp --remove-destination --no-dereference $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/cypress/cyfmac* endef endif -- 2.38.1.vfs.0.0 -------------- next part -------------- An HTML attachment was scrubbed... URL: From nisargjhaveri at gmail.com Thu Feb 29 05:22:36 2024 From: nisargjhaveri at gmail.com (Nisarg Jhaveri) Date: Thu, 29 Feb 2024 10:52:36 +0530 Subject: [Buildroot] [PATCH v3 1/1] package/brcmfmac_sdio-firmware-rpi: bump version to 26ff205 In-Reply-To: References: Message-ID: <20240229052236.50171-1-nisargjhaveri@gmail.com> The current version is more than 2 years old. Update to the latest. A lot of the files are symlinked. Instead of individually restoring the links, using `cp --remove-destination --no-dereference` and `chmod` instead of `install`. Signed-off-by: Nisarg Jhaveri --- Changes v2 -> v3: - Attempt to fix patch formatting Changes v1 -> v2: - Attempt to fix patch formatting --- .../brcmfmac_sdio-firmware-rpi.hash | 4 +-- .../brcmfmac_sdio-firmware-rpi.mk | 27 +++++++------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index a12e92cbac..aa1043518b 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356 brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz +sha256 ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599 LICENCE diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index 5332bf53d7..7860de3ef7 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -4,33 +4,26 @@ # ################################################################################ -BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5 BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY -BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/synaptics + cp --remove-destination --no-dereference $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/synaptics/*.hcd $(TARGET_DIR)/lib/firmware/synaptics + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/synaptics/*.hcd endef endif ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm - ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin - ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt - ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin - ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress - $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/cypress + cp --remove-destination --no-dereference $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/cypress/cyfmac* endef endif -- 2.38.1.vfs.0.0 From luca.ceresoli at bootlin.com Thu Feb 29 09:29:25 2024 From: luca.ceresoli at bootlin.com (Luca Ceresoli) Date: Thu, 29 Feb 2024 10:29:25 +0100 Subject: [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware In-Reply-To: References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-6-neal.frager@amd.com> Message-ID: <20240229102925.62a9ecbf@booty> Hello Neal, On Thu, 22 Feb 2024 16:35:21 +0000 "Frager, Neal" wrote: > Hello everyone, > > Just a friendly reminder. Any updates? > > > Now that the toolchain-bare-metal-buildroot has been applied, do you have any > > feedback regarding the remainder of the patch set? > > > One open question I have is regarding the patches for zynqmp-firmware and > > versal-firmware. These patches are no longer neeeded since being applied to > > release version xilinx_v2023.2. I kept them with the idea that users may > > still be using older versions of software, so the patches enable users to > > work with versions as old as 2022.2 for zynqmp and 2023.1 for versal. > > > Do you agree with keeping the patches or do you think it is better not to > > include them and to say that support begins starting with version > > xilinx_v2023.2? > > What are your thoughts? > > > create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch > > create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch Apologies for the late reply... I think we should not put any effort in encouraging the practice of using old and perhaps not-maintained-anymore software that some proprietary tools tend to enforce. We do have a mainline pmufw that works without needing any patches thank to your (very appreciated!) effort, so let's just support the latest and greatest pmufw version and be happy. Your patches are there in this series anyway, and will be, so whoever wants to use an old version can do some research and find them. So, I vote to not have these patches in Buildroot. Luca -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Thu Feb 29 10:50:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 11:50:58 +0100 Subject: [Buildroot] [PATCH] support/scripts/cve: fix running on older ijson versions In-Reply-To: <20240228223736.2376826-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 28 Feb 2024 23:37:36 +0100") References: <20240228223736.2376826-1-yann.morin.1998@free.fr> Message-ID: <87v867ilwt.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for > the JSON files) had to change the decompressor from gz to xz, as the new > location is using xz compression. > That commit mentioned that it was spawning an external xz process to do > the decompression, on the pretence that "there is no xz decompressor in > Python stdlib." > ijson started to accept bytes() (and str()) only with version 3.1, and > using a subprocess means we are now passing bytes() to ijson, which it > is not expecting as input on such older versions, casuing build failures > such as: > [...] > File "/usr/lib/python3/dist-packages/ijson/backends/python.py", line 25, in Lexer > if type(f.read(0)) == bytetype: > AttributeError: 'bytes' object has no attribute 'read' > Ubuntu 20.04, on which the pkg-stats run to generate the daily report, > only has ijson 2.3. More recent distros have more recent versions of > ijson, like Fedora 39 that has 3.2.3, recent enough to supoprt being fed > bytes(). > However, the reasonining in 22b69455526f is wrong: there *is* the lzma > module, at least since python 3.3, that is, aeons ago, which is able to > read xz-compressed files; it also has an API similar to the gzip module, > and can provide a file-like object that exposes the decompressed data. > So, do just that: provide an lzma-wrapped file-like object to ijson, so > that we can eventually recover our daily reports that everything is > broken! :-] > Note that this construct still works on recent versions! > Reported-by: Thomas Petazzoni > Signed-off-by: Yann E. MORIN > Cc: Arnout Vandecappelle (Essensium/Mind) > --- > support/scripts/cve.py | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > diff --git a/support/scripts/cve.py b/support/scripts/cve.py > index 1a3c307e12..7167ecbc6a 100755 > --- a/support/scripts/cve.py > +++ b/support/scripts/cve.py > @@ -21,8 +21,8 @@ import datetime > import os > import requests # URL checking > import distutils.version > +import lzma > import time > -import subprocess > import sys > import operator > @@ -134,8 +134,7 @@ class CVE: > for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): > filename = CVE.download_nvd_year(nvd_dir, year) > try: > - uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) > - content = ijson.items(uncompressed, 'cve_items.item') > + content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') Are you sure this provides str()? xz GPL-2.0 python3 Python 3.11.2 (main, Mar 13 2023, 12:18:29) [GCC 12.2.0] on linux Type "help", "copyright", "credits" or "license" for more information. >>> import lzma >>> lzma.LZMAFile('GPL-2.0.xz').read(100) b'Valid-License-Identifier: GPL-2.0\nValid-License-Identifier: GPL-2.0-only\nValid-License-Identifier: G' Whereas lzma.open() accepts a 'rt' mode: >>> lzma.open('GPL-2.0.xz', mode='rt').read(100) 'Valid-License-Identifier: GPL-2.0\nValid-License-Identifier: GPL-2.0-only\nValid-License-Identifier: G' -- Bye, Peter Korsgaard From dario.binacchi at amarulasolutions.com Thu Feb 29 11:37:57 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 29 Feb 2024 12:37:57 +0100 Subject: [Buildroot] [PATCH v7 15/17] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240229022222.exmx2cgijdjrtnwp@dasso> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> <20240227163019.2876942-16-dario.binacchi@amarulasolutions.com> <20240229022222.exmx2cgijdjrtnwp@dasso> Message-ID: Hi Andreas, On Thu, Feb 29, 2024 at 3:22?AM Andreas Dannenberg wrote: > > Hi Dario, > > On Tue, Feb 27, 2024 at 05:30:17PM +0100, Dario Binacchi wrote: > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v6: > > - Replace `find' command with `cp' one. > > > > Changes in v5: > > - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with > > tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > > > > Added in v4 > > > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index fdb058f3b72a..cbdb653278f8 100644 > > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin > > Have you tried doing a clean build of ti_am64x_sk_defconfig? When I do > that the change above breaks the build... > > > >>> ti-k3-r5-loader 2022.10 Installing to images directory > cp /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/spl/u-boot-spl.bin /home/a0797059/git/buildroot/output/images/r5-u-boot-spl > .bin > cp /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/tiboot3-am64x-gp-*.bin /home/a0797059/git/buildroot/output/images/tiboot3.b > in > cp: cannot stat '/home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/tiboot3-am64x-gp-*.bin': No such file or directory > make[1]: *** [package/pkg-generic.mk:364: /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/.stamp_images_installed] Error 1 > make: *** [Makefile:82: _all] Error 2 > > > Looks like the tiboot3.bin file is already there, and nothing needs to > be copied or renamed. Not sure what is best way to manage this > dependency as this is the behavior of the older U-Boot. I'd probably > just migrate the am64x_sk support to binman too also using the > same/newer U-Boot you are already using for AM62x, making everything > equivalent of the am62x_sk support you are focused on with this series. I am modifying the configuration ti_am64x_sk_defconfig so that, similarly to what was done for ti_am62x_sk_defconfig, it uses a U-Boot 2024.01 that makes use of binman: https://patchwork.ozlabs.org/project/buildroot/patch/20240224205654.1546744-17-dario.binacchi at amarulasolutions.com/ Thanks and regards, Dario > > -- > Andreas Dannenberg > Texas Instruments Inc > > > > > > > endef > > > > $(eval $(kconfig-package)) > > -- > > 2.43.0 > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From romain.naour at smile.fr Thu Feb 29 13:11:07 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 14:11:07 +0100 Subject: [Buildroot] [PATCH 1/2] package/rust: use host libraries from HOST_DIR Message-ID: <20240229131108.363533-1-romain.naour@smile.fr> host-rust package depends on several host packages to provide tools and libraries but it doesn't take into account HOST_DIR while building rustc compiler. Indeed, rustc needs zlib and fail to link if zlib is not installed on the host. error: could not compile `rustc_driver` (lib) due to previous error If zlib is installed on the host, we can notice it with ldd tool (while it should be linked with the one provided by Buildroot host-zlib). ldd [...]TestRust/host/bin/rustc libz.so.1 => /lib64/libz.so.1 Provide HOST_LDFLAGS using llvm.ldflags in config.toml. (HOST_LDFLAGS provide -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib) With that fixed, rustc_driver link with libz from HOST_DIR but the host-rust build still fail later due to another issue. error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545 http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0 Signed-off-by: Romain Naour --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index f7a5c0fcd5..c464e77f4f 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -64,6 +64,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ echo 'ninja = false'; \ + echo 'ldflags = "$(HOST_LDFLAGS)"'; \ ) > $(@D)/config.toml endef -- 2.43.2 From romain.naour at smile.fr Thu Feb 29 13:11:08 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 14:11:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/rust: provide RUSTFLAGS for cargo In-Reply-To: <20240229131108.363533-1-romain.naour@smile.fr> References: <20240229131108.363533-1-romain.naour@smile.fr> Message-ID: <20240229131108.363533-2-romain.naour@smile.fr> While building the rust toolchain, the build system endup using cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo) to build some tool like rustdoc-tool. But the host-rust package doesn't use the cargo infractructure (since it provide cargo binary) and some cargo environment varialble [1] is not set to crosscompile cargo packages in the rust toolchain. For exemple, we usually set RUSTFLAGS="-C link-arg=-Wl,-rpath,$(HOST_DIR)/lib" to force cargo using libraries provided by Buildroot in $(HOST_DIR)/lib. RUSTFLAGS is actually needed to find zlib library (host-zlib) to link rustdoc-tool when zlib is not installed on the host. Fixes: error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.02-rc1/package/pkg-cargo.mk?ref_type=tags#L167 Signed-off-by: Romain Naour --- package/rust/rust.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index c464e77f4f..cbe79cd8e3 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -69,7 +69,9 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build + cd $(@D); $(HOST_MAKE_ENV) \ + RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \ + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef HOST_RUST_INSTALL_OPTS = \ -- 2.43.2 From yann.morin at orange.com Thu Feb 29 13:35:08 2024 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 29 Feb 2024 14:35:08 +0100 Subject: [Buildroot] [PATCH 1/2] package/rust: use host libraries from HOST_DIR In-Reply-To: <20240229131108.363533-1-romain.naour@smile.fr> References: <20240229131108.363533-1-romain.naour@smile.fr> Message-ID: romain, All, On 2024-02-29 14:11 +0100, Romain Naour spake thusly: > host-rust package depends on several host packages to provide tools and > libraries but it doesn't take into account HOST_DIR while building rustc > compiler. Indeed, rustc needs zlib and fail to link if zlib is not > installed on the host. > > error: could not compile `rustc_driver` (lib) due to previous error > > If zlib is installed on the host, we can notice it with ldd tool (while > it should be linked with the one provided by Buildroot host-zlib). > > ldd [...]TestRust/host/bin/rustc > libz.so.1 => /lib64/libz.so.1 > > Provide HOST_LDFLAGS using llvm.ldflags in config.toml. > (HOST_LDFLAGS provide -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib) > > With that fixed, rustc_driver link with libz from HOST_DIR but the > host-rust build still fail later due to another issue. > > error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545 > http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0 > > Signed-off-by: Romain Naour > --- > package/rust/rust.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/rust/rust.mk b/package/rust/rust.mk > index f7a5c0fcd5..c464e77f4f 100644 > --- a/package/rust/rust.mk > +++ b/package/rust/rust.mk > @@ -64,6 +64,7 @@ define HOST_RUST_CONFIGURE_CMDS > echo 'cc = "$(TARGET_CROSS)gcc"'; \ > echo '[llvm]'; \ > echo 'ninja = false'; \ > + echo 'ldflags = "$(HOST_LDFLAGS)"'; \ But then, we would also need to add host-zlib to HOST_RUST_DEPENDENCIES, no? Regards, Yann E. MORIN. > ) > $(@D)/config.toml > endef > > -- > 2.43.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' ____________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From romain.naour at smile.fr Thu Feb 29 13:43:47 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 14:43:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/rust: use host libraries from HOST_DIR In-Reply-To: References: <20240229131108.363533-1-romain.naour@smile.fr> Message-ID: Le 29/02/2024 ? 14:35, yann.morin at orange.com a ?crit?: > romain, All, > > On 2024-02-29 14:11 +0100, Romain Naour spake thusly: >> host-rust package depends on several host packages to provide tools and >> libraries but it doesn't take into account HOST_DIR while building rustc >> compiler. Indeed, rustc needs zlib and fail to link if zlib is not >> installed on the host. >> >> error: could not compile `rustc_driver` (lib) due to previous error >> >> If zlib is installed on the host, we can notice it with ldd tool (while >> it should be linked with the one provided by Buildroot host-zlib). >> >> ldd [...]TestRust/host/bin/rustc >> libz.so.1 => /lib64/libz.so.1 >> >> Provide HOST_LDFLAGS using llvm.ldflags in config.toml. >> (HOST_LDFLAGS provide -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib) >> >> With that fixed, rustc_driver link with libz from HOST_DIR but the >> host-rust build still fail later due to another issue. >> >> error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545 >> http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0 >> >> Signed-off-by: Romain Naour >> --- >> package/rust/rust.mk | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/package/rust/rust.mk b/package/rust/rust.mk >> index f7a5c0fcd5..c464e77f4f 100644 >> --- a/package/rust/rust.mk >> +++ b/package/rust/rust.mk >> @@ -64,6 +64,7 @@ define HOST_RUST_CONFIGURE_CMDS >> echo 'cc = "$(TARGET_CROSS)gcc"'; \ >> echo '[llvm]'; \ >> echo 'ninja = false'; \ >> + echo 'ldflags = "$(HOST_LDFLAGS)"'; \ > > But then, we would also need to add host-zlib to > HOST_RUST_DEPENDENCIES, no? Indeed but in practice host-zlib is already an "indirect" dependency of host-rust due to host-openssl (host-libopenssl) dependency. HOST_LIBOPENSSL_DEPENDENCIES = host-zlib I noticed the missing dependency but forgot to add it in HOST_RUST_DEPENDENCIES. Best regards, Romain > > Regards, > Yann E. MORIN. > >> ) > $(@D)/config.toml >> endef >> >> -- >> 2.43.2 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Thu Feb 29 14:19:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:19:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: drop DBUS_CPE_ID_PRODUCT In-Reply-To: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 4 Feb 2024 11:32:04 +0100") References: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> Message-ID: <87r0gvica0.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT > to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the > package name (i.e. dbus) by default > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 14:19:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:19:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/yasm: add YASM_CPE_ID_VENDOR In-Reply-To: <20240204182514.1663508-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 4 Feb 2024 19:25:14 +0100") References: <20240204182514.1663508-1-fontaine.fabrice@gmail.com> Message-ID: <87il27ic9p.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 14:19:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:19:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/opus: set OPUS_CPE_ID_VENDOR In-Reply-To: <20240204181435.1657162-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 4 Feb 2024 19:14:35 +0100") References: <20240204181435.1657162-1-fontaine.fabrice@gmail.com> Message-ID: <87msrjic9u.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 14:21:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:21:34 +0100 Subject: [Buildroot] [PATCH v2] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' In-Reply-To: <20240204201657.33079-2-aleksandr.o.makarov@gmail.com> (Aleksandr Makarov's message of "Sun, 4 Feb 2024 22:16:57 +0200") References: <20240204201657.33079-1-aleksandr.o.makarov@gmail.com> <20240204201657.33079-2-aleksandr.o.makarov@gmail.com> Message-ID: <87edcvic5t.fsf@48ers.dk> >>>>> "Aleksandr" == Aleksandr Makarov writes: > Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS > which were internally set by the haproxy Makefile. > Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and > and then running the program results in runtime error: > $ haproxy > FATAL ERROR: invalid code detected -- cannot go further, please recompile! > ... > To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead > of CFLAGS in haproxy.mk. > --- > Changes v1 -> v2 > - Drop patch for haproxy program Makefile, make changes to haproxy.mk instead Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 14:18:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:18:18 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/yasm: add YASM_CPE_ID_VENDOR Message-ID: <20240229142228.55DD287CD6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=158395a46d36c5ec948a223905e7b3399e30410b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 17dac57e3ebfe8e2371100a632cca4fb11ed9bac) Signed-off-by: Peter Korsgaard --- package/yasm/yasm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index b294bd3aee..cdb8e15bee 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 YASM_SITE = http://www.tortall.net/projects/yasm/releases YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 +YASM_CPE_ID_VENDOR = tortall # This sed prevents it compiling 2 programs (vsyasm and ytasm) # that are only of use on Microsoft Windows. From peter at korsgaard.com Thu Feb 29 14:17:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:17:56 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/dbus: drop DBUS_CPE_ID_PRODUCT Message-ID: <20240229142228.459E687D07@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8778f7b6b6ff6b9ac992d69f09ccfc074f7bb9b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the package name (i.e. dbus) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit b878e7bbbc7041c8fd0ce2e410cc7fc9428bb93d) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index b4d1cdc6b6..7ddeb0e325 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -11,7 +11,6 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING DBUS_CPE_ID_VENDOR = freedesktop -DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From peter at korsgaard.com Thu Feb 29 14:20:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:20:56 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' Message-ID: <20240229142228.619F987D06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3657f363f662c028089c4aeaf6f78f13563c7df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS which were internally set by the haproxy Makefile. Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and and then running the program results in runtime error: $ haproxy FATAL ERROR: invalid code detected -- cannot go further, please recompile! ... To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead of CFLAGS in haproxy.mk. Signed-off-by: Yann E. MORIN (cherry picked from commit 9b90ef61784d314147ace4972f9bdc0cb4fcce77) Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 63a92090f3..61a9ebebe4 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -82,7 +82,7 @@ endif define HAPROXY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) endef define HAPROXY_INSTALL_TARGET_CMDS From peter at korsgaard.com Thu Feb 29 14:18:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:18:15 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/opus: set OPUS_CPE_ID_VENDOR Message-ID: <20240229142228.5DC7487D08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec070357149fc4c53dd3ef46e48e01aa6f5f76df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 302175353a920402d27d4f7cf23dd78c5a792428) Signed-off-by: Peter Korsgaard --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index d8e0623e15..611b0e1da0 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -8,6 +8,7 @@ OPUS_VERSION = 1.3.1 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING +OPUS_CPE_ID_VENDOR = opus-codec OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) From peter at korsgaard.com Thu Feb 29 14:17:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:17:43 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/opus: set OPUS_CPE_ID_VENDOR Message-ID: <20240229142434.91C1487D13@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d353bf971974f35f13c48add3313e33a16fb26b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 302175353a920402d27d4f7cf23dd78c5a792428) Signed-off-by: Peter Korsgaard --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 15531b521a..cbc07a091b 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -8,6 +8,7 @@ OPUS_VERSION = 1.4 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING +OPUS_CPE_ID_VENDOR = opus-codec OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) From peter at korsgaard.com Thu Feb 29 14:20:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:20:50 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' Message-ID: <20240229142434.A630287D15@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29f2034b2c6d2aa1b2060b5198644e637ae604d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS which were internally set by the haproxy Makefile. Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and and then running the program results in runtime error: $ haproxy FATAL ERROR: invalid code detected -- cannot go further, please recompile! ... To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead of CFLAGS in haproxy.mk. Signed-off-by: Yann E. MORIN (cherry picked from commit 9b90ef61784d314147ace4972f9bdc0cb4fcce77) Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 63a92090f3..61a9ebebe4 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -82,7 +82,7 @@ endif define HAPROXY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) endef define HAPROXY_INSTALL_TARGET_CMDS From peter at korsgaard.com Thu Feb 29 14:17:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:17:35 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/dbus: drop DBUS_CPE_ID_PRODUCT Message-ID: <20240229142434.8796D87D12@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bce31469d27e90e14b63ec21e5e32c9a34b91e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the package name (i.e. dbus) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit b878e7bbbc7041c8fd0ce2e410cc7fc9428bb93d) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d610846ddb..097b89205e 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -12,7 +12,6 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING DBUS_CPE_ID_VENDOR = freedesktop -DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From peter at korsgaard.com Thu Feb 29 14:17:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:17:48 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/yasm: add YASM_CPE_ID_VENDOR Message-ID: <20240229142434.9C05387D14@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=611b139e76e82e6b635a0bf77383a6508904eace branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 17dac57e3ebfe8e2371100a632cca4fb11ed9bac) Signed-off-by: Peter Korsgaard --- package/yasm/yasm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index b294bd3aee..cdb8e15bee 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 YASM_SITE = http://www.tortall.net/projects/yasm/releases YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 +YASM_CPE_ID_VENDOR = tortall # This sed prevents it compiling 2 programs (vsyasm and ytasm) # that are only of use on Microsoft Windows. From peter at korsgaard.com Thu Feb 29 15:14:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:14:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libressl: don't export arc4random In-Reply-To: <20240121202422.1598129-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 21 Jan 2024 21:24:22 +0100") References: <20240121202422.1598129-1-fontaine.fabrice@gmail.com> Message-ID: <87a5nji9q9.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Don't export arc4random to fix the following libcurl build failure > raised since bump of libcurl to version 8.5.0 in commit > aaa9438b96f88b1ecbf5eb9a1aebef8010835b8d and > https://github.com/curl/curl/commit/7925ba431b9a099daee1fa21d36c21887f787ad5: > rand.c: In function 'randit': > rand.c:146:26: error: implicit declaration of function 'arc4random'; > did you mean 'srandom'? [-Werror=implicit-function-declaration] > 146 | *rnd = (unsigned int)arc4random(); > | ^~~~~~~~~~ > | srandom > cc1: some warnings being treated as errors > Fixes: > - http://autobuild.buildroot.org/results/8b7988629f1887be15c97b8c511d25443ba110d8 > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:15:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:15:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/rdma-core: fix mips4 build In-Reply-To: <20240122212121.7805-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 22 Jan 2024 22:21:21 +0100") References: <20240122212121.7805-1-fontaine.fabrice@gmail.com> Message-ID: <875xy7i9nj.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > The 'sync' instruction for MIPS was defined in MIPS-II as taking no > operands. MIPS32 extended the define of 'sync' as taking an optional > unsigned 5 bit immediate. > As a result, replace "sync 0" by "sync" to fix the following build > failure on mips4 raised since the addition of the package in commit > ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 and > https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: > /tmp/ccrBy9fV.s: Assembler messages: > /tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' > Fixes: > - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 > - http://autobuild.buildroot.org/results/2df58f9b98aacf00960932f53510b29199393461 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:17:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:17:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: drop libnl dependency In-Reply-To: <20240128215205.3690716-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 28 Jan 2024 22:52:05 +0100") References: <20240128215205.3690716-1-fontaine.fabrice@gmail.com> Message-ID: <871q8vi9kr.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libnl is not needed to build frr since the addition of the package in > commit 26d82d006ba15777d19892b327bde343d82a9ff5 > No mention of libnl found in https://github.com/FRRouting/frr or > https://docs.frrouting.org/projects/dev-guide/en/latest/building.html > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:18:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:18:18 +0100 Subject: [Buildroot] [PATCH] package/sysstat: do not autodetect sa_lib_dir In-Reply-To: <87le7zt9qd.fsf@48ers.dk> (Peter Korsgaard's message of "Mon, 05 Feb 2024 12:46:02 +0100") References: <78273b30-5659-4cc0-91f8-23a8775fedf2@sord.co.jp> <87le7zt9qd.fsf@48ers.dk> Message-ID: <87wmqnguyt.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Atsushi" == Atsushi Nemoto writes: >> The configure script of sysstat package checks host's /usr/lib64 >> directory for default sa_lib_dir. >> Specify sa_lib_dir exclicitly to avoid host dependency. >> Signed-off-by: Atsushi Nemoto > Committed, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:20:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:20:13 +0100 Subject: [Buildroot] [git commit] package/libzenoh-pico: disable on or1k In-Reply-To: <20240205132229.6521F86C15@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Mon, 5 Feb 2024 14:22:21 +0100") References: <20240205132229.6521F86C15@busybox.osuosl.org> Message-ID: <87sf1bguvm.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=ead797bef768a7f3da7a76dd8510eef48181bb6a > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The upstream libzenoh-pico code uses asm("nop"), which is completely > bogus, and actually breaks build on or1k as the instruction does not > exist. > In upstream commit > https://github.com/eclipse-zenoh/zenoh-pico/commit/7d79a14addcea972e801709413f5c9a5226e3ad3 > they made the asm("nop") thing "configurable" with ZP_ASM_NOP, but > still that requires some special handling for or1k. The whole thing is > a complete mess, and upstream should have to use any of that. Rather > than stacking piles of bogus stuff on more bogus stuff, let's simply > disable this package for or1k for now. > Thanks a lot to Fabrice for all the investigation, and interaction > with upstream. See > https://patchwork.ozlabs.org/project/buildroot/patch/20240110215515.1263859-1-fontaine.fabrice at gmail.com/ > for example. > Fixes: > - http://autobuild.buildroot.org/results/fd0b2c666a1dc1537162d15b27743abd270243ed > Signed-off-by: Thomas Petazzoni Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:21:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:21:24 +0100 Subject: [Buildroot] [git commit] package/sysstat: update upstream location In-Reply-To: <20240205142727.38F9D86C99@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Mon, 5 Feb 2024 15:27:05 +0100") References: <20240205142727.38F9D86C99@busybox.osuosl.org> Message-ID: <87o7bzgutn.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=35a2cb02277acae94f018a0d22138dc9de005fdf > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The http://pagesperso-orange.fr service being down, > http://pagesperso-orange.fr/sebastien.godard/ is no longer > accessible (or more precisely serves some HTML junk), meaning that we > currently cannot download the tarball of sysstat from the official > upstream location, and we always fallback to sources.buildroot.net. > This commit therefore updates to use the new upstream location on > github.io. The 12.6.1 release is available there, with the same hash, > so we can just point to the new upstream location. > Fixes: > ERROR: while checking hashes from package/sysstat//sysstat.hash > ERROR: sysstat-12.6.1.tar.xz has wrong sha1 hash: > ERROR: expected: a730982e0c2d4964a0022c1509f3ea0a345402bc > ERROR: got : d64a079729f2ff5b304294d68fbc041a46c4966d > ERROR: Incomplete download, or man-in-the-middle (MITM) attack > Signed-off-by: Thomas Petazzoni Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:22:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:22:46 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package In-Reply-To: <170712853287.18164.6368517214119629150-0@git.sr.ht> (bubu@git.sr.ht's message of "Thu, 21 Sep 2023 22:39:44 +0200") References: <170712853287.18164.6368517214119629150-0@git.sr.ht> Message-ID: <87jzmngurd.fsf@48ers.dk> >>>>> "~bubu" == ~bubu writes: > From: Marcus Hoffmann > Calling `setup.py` build builds and installs an empty package > after upstream changed their packaging. Calling setuptools via > `python -m build` builds the package correctly. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:23:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:23:55 +0100 Subject: [Buildroot] [PATCH] configs/imx8mpevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20240115105827.3179346-1-festevam@gmail.com> (Fabio Estevam's message of "Mon, 15 Jan 2024 07:58:27 -0300") References: <20240115105827.3179346-1-festevam@gmail.com> Message-ID: <87frxbgupg.fsf@48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > include/image.h:1394:12: fatal error: openssl/evp.h: No such file or directory > 1394 | # include > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180070 > Signed-off-by: Fabio Estevam Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:24:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:24:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: drop fmt dependency In-Reply-To: <20240116220258.1003073-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 16 Jan 2024 23:02:58 +0100") References: <20240116220258.1003073-1-fontaine.fabrice@gmail.com> Message-ID: <87bk7zguo9.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > fmt is not a dependency since bump to version 2022.1 in commit > adca60540f4fd271dda48b9a121986492700e73a and > https://github.com/domoticz/domoticz/commit/82043c4d5c79003792379be79b931eb85ab890c8 > https://github.com/domoticz/domoticz/commit/9e02d9a79c70c36db180d3242cbd03ff9b63e3cc > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:21:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:21:03 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/sysstat: update upstream location Message-ID: <20240229153304.CFFD087D71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75faae5b6bcffa81d44a743d3ae8cea308be81b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The http://pagesperso-orange.fr service being down, http://pagesperso-orange.fr/sebastien.godard/ is no longer accessible (or more precisely serves some HTML junk), meaning that we currently cannot download the tarball of sysstat from the official upstream location, and we always fallback to sources.buildroot.net. This commit therefore updates to use the new upstream location on github.io. The 12.6.1 release is available there, with the same hash, so we can just point to the new upstream location. Fixes: ERROR: while checking hashes from package/sysstat//sysstat.hash ERROR: sysstat-12.6.1.tar.xz has wrong sha1 hash: ERROR: expected: a730982e0c2d4964a0022c1509f3ea0a345402bc ERROR: got : d64a079729f2ff5b304294d68fbc041a46c4966d ERROR: Incomplete download, or man-in-the-middle (MITM) attack Signed-off-by: Thomas Petazzoni (cherry picked from commit 35a2cb02277acae94f018a0d22138dc9de005fdf) Signed-off-by: Peter Korsgaard --- package/sysstat/Config.in | 2 +- package/sysstat/sysstat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in index 442b787684..efb640fd43 100644 --- a/package/sysstat/Config.in +++ b/package/sysstat/Config.in @@ -36,4 +36,4 @@ config BR2_PACKAGE_SYSSTAT * TTY device activity * Power management statistics - http://pagesperso-orange.fr/sebastien.godard/ + https://sysstat.github.io/ diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index ca05ec50d8..ec0c666157 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -6,7 +6,7 @@ SYSSTAT_VERSION = 12.6.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz -SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard +SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ From peter at korsgaard.com Thu Feb 29 15:27:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:27:08 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/leptonica: affected by gcc bug 101737 Message-ID: <20240229153304.EB28687D72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9bea8aa5cc6456d911cfcf9f73add4b6b5839325 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x leptonica is affected by gcc bug 101737 resulting in the following build failure since at least bump to version 1.82.0 in commit 81a961c545cc9f240841b75d6c21f13b334bc274: sh4eb-buildroot-linux-gnu-gcc.br_real: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source (by using -freport-bug). See for instructions. Fixes: - http://autobuild.buildroot.org/results/f18979454399d9c728f9e017e4cc3a1b27458f5b - http://autobuild.buildroot.org/results/f3c803892175b3bb2ce68e3140c879b4a4d4b302 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 31b488337921d57c14893c34766ac22c53e5382b) Signed-off-by: Peter Korsgaard --- package/leptonica/leptonica.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 8791b0c4c2..569d2829c3 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -14,6 +14,10 @@ LEPTONICA_DEPENDENCIES = host-pkgconf LEPTONICA_CONF_OPTS += --disable-programs +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +LEPTONICA_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -O0" +endif + ifeq ($(BR2_PACKAGE_GIFLIB),y) LEPTONICA_DEPENDENCIES += giflib LEPTONICA_CONF_OPTS += --with-giflib From peter at korsgaard.com Thu Feb 29 15:17:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:17:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/frr: drop libnl dependency Message-ID: <20240229153304.A75D287D71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02fa1029773d508a6b6ddb02d48b6477bf92136a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x libnl is not needed to build frr since the addition of the package in commit 26d82d006ba15777d19892b327bde343d82a9ff5 No mention of libnl found in https://github.com/FRRouting/frr or https://docs.frrouting.org/projects/dev-guide/en/latest/building.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit efa955ac415e2b50f63710e4fc1de8fd3e0dc099) Signed-off-by: Peter Korsgaard --- package/frr/Config.in | 1 - package/frr/frr.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/frr/Config.in b/package/frr/Config.in index c2e9577a27..f6c058e6df 100644 --- a/package/frr/Config.in +++ b/package/frr/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_FRR select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_LIBYANG - select BR2_PACKAGE_LIBNL select BR2_PACKAGE_READLINE select BR2_PACKAGE_JSON_C help diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 19f346fd7b..a4b4bccaf9 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -12,7 +12,7 @@ FRR_CPE_ID_VENDOR = linuxfoundation FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES -FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ +FRR_DEPENDENCIES = host-frr readline json-c libyang \ $(if $(BR2_PACKAGE_C_ARES),c-ares) HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 From peter at korsgaard.com Thu Feb 29 15:24:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:24:23 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/domoticz: drop fmt dependency Message-ID: <20240229153304.DD3C387D70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ccf4a64464790d211800fd17fb8bd6b392d14ea0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x fmt is not a dependency since bump to version 2022.1 in commit adca60540f4fd271dda48b9a121986492700e73a and https://github.com/domoticz/domoticz/commit/82043c4d5c79003792379be79b931eb85ab890c8 https://github.com/domoticz/domoticz/commit/9e02d9a79c70c36db180d3242cbd03ff9b63e3cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit dc3609c53f927289a9681f30ab283d190cb34e09) Signed-off-by: Peter Korsgaard --- package/domoticz/Config.in | 1 - package/domoticz/domoticz.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 85361eecf0..a0e69a7601 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -16,7 +16,6 @@ config BR2_PACKAGE_DOMOTICZ select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_CEREAL - select BR2_PACKAGE_FMT select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_MINIZIP_ZLIB diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 451021150b..4668ad8646 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -12,7 +12,6 @@ DOMOTICZ_CPE_ID_VENDOR = domoticz DOMOTICZ_DEPENDENCIES = \ boost \ cereal \ - fmt \ host-pkgconf \ jsoncpp \ libcurl \ @@ -36,7 +35,6 @@ DOMOTICZ_CONF_OPTS += \ # jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ - -DUSE_BUILTIN_LIBFMT=OFF \ -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF From peter at korsgaard.com Thu Feb 29 15:29:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:29:23 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/ngrep: fix build with libnet Message-ID: <20240229153305.0457D87D73@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=891a18201a2189c38a6e1ee12fb03680414d24bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Use pkg-config to find libnet and avoid the following build failure raised since commit 100ba8351c088fd764effdcaba848cfd92de79dd if libnet-config is found on the host: /home/autobuild/autobuild/instance-4/output-1/host/bin/mips64el-buildroot-linux-gnu-gcc -s -o ngrep ngrep.o tcpkill.o -lpcap -lnet -lpcre -L/usr/lib -lnet mips64el-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' While at it, format Upstream tag of other patches Fixes: - http://autobuild.buildroot.org/results/05c916162b9c1027cf53f1699a1f5653151098ed Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 14c0c37eaf0f91ef61a88b3085c15028f566a394) Signed-off-by: Peter Korsgaard --- ...in-configure-in-when-testing-for-use_pcre.patch | 3 +- ...002-Check-for-libnet_init-in-configure-in.patch | 3 +- package/ngrep/0003-fix-disable-tcpkill.patch | 2 +- ...onfigure.in-use-pkg-config-to-find-libnet.patch | 38 ++++++++++++++++++++++ package/ngrep/ngrep.mk | 2 +- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch index 69c5c887e8..c7f0dec360 100644 --- a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch +++ b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch @@ -4,8 +4,7 @@ Date: Mon, 1 Jan 2018 18:00:34 +0100 Subject: [PATCH] Fix typo in configure.in when testing for use_pcre Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe] +Upstream: https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch index 22b18ab7ee..7fa2e2f3bc 100644 --- a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch +++ b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch @@ -7,8 +7,7 @@ libnet_init_packet was the old libnet 1.0 function which is now long deprecated. Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5] +Upstream: https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0003-fix-disable-tcpkill.patch b/package/ngrep/0003-fix-disable-tcpkill.patch index 1264fd7e3b..894cd95b0f 100644 --- a/package/ngrep/0003-fix-disable-tcpkill.patch +++ b/package/ngrep/0003-fix-disable-tcpkill.patch @@ -9,7 +9,7 @@ found on the system. To fix this, move AC_CHECK_LIB to found libnet outside AC_ARG_ENABLE Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/jpr5/ngrep/pull/15] +Upstream: https://github.com/jpr5/ngrep/pull/15 --- configure.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch new file mode 100644 index 0000000000..71550da943 --- /dev/null +++ b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch @@ -0,0 +1,38 @@ +From 4788988827bf4c0d996d3e1e3b6ac52a23b97941 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 9 Jan 2024 21:15:47 +0100 +Subject: [PATCH] configure.in: use pkg-config to find libnet + +libnet-config is deprecated: +https://github.com/libnet/libnet/commit/1ec4a6e7d1d23811f0a14ecb51e46489a0175727 + +Signed-off-by: Fabrice Fontaine +Upstream: unsent (upstream seems dead, no commit since 5 years +--- + configure.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 7c3dd43..882ff86 100644 +--- a/configure.in ++++ b/configure.in +@@ -176,12 +176,14 @@ AC_ARG_ENABLE(tcpkill, + [ use_tcpkill="$enableval" ], + [ use_tcpkill="no" ]) + ++PKG_PROG_PKG_CONFIG + if test $use_tcpkill = yes; then + AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit) + USE_TCPKILL="1" + EXTRA_OBJS="$EXTRA_OBJS tcpkill.o" +- EXTRA_DEFINES="$EXTRA_DEFINES $(libnet-config --defines)" +- EXTRA_LIBS="$EXTRA_LIBS $(libnet-config --libs)" ++ PKG_CHECK_MODULES(LIBNET, libnet) ++ EXTRA_DEFINES="$EXTRA_DEFINES $LIBNET_CFLAGS" ++ EXTRA_LIBS="$EXTRA_LIBS $LIBNET_LIBS" + else + USE_TCPKILL="0" + fi +-- +2.43.0 + diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk index c4750f7504..dc69a34235 100644 --- a/package/ngrep/ngrep.mk +++ b/package/ngrep/ngrep.mk @@ -22,7 +22,7 @@ NGREP_CONF_OPTS = \ --disable-dropprivs \ --disable-pcap-restart -NGREP_DEPENDENCIES = libpcap pcre +NGREP_DEPENDENCIES = host-pkgconf libpcap pcre ifeq ($(BR2_PACKAGE_LIBNET),y) NGREP_DEPENDENCIES += libnet From peter at korsgaard.com Thu Feb 29 15:30:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:30:57 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/openssh: fix build error on powerpc Message-ID: <20240229153305.10E1C87D71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4a0b4f3925ccf18fa93e3e2bbca7b0f38e221d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following error message introducted by OpenSSH v9.6p1. sshkey.c: In function 'sshkey_set_filename': sshkey.c:3705:1: sorry, unimplemented: '-fzero-call-used-regs' not supported on this target 3705 | } Fixes: http://autobuild.buildroot.org/results/ec7/ec780aed5b1c4fdf9b91f6e7be99e8d4c42efa58 Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 325fe1aecfd20d2653cce6bc189824c6fdfcafec) Signed-off-by: Peter Korsgaard --- ...-detection-of-broken-fzero-call-used-regs.patch | 57 ++++++++++++++++++++++ package/openssh/openssh.mk | 3 ++ 2 files changed, 60 insertions(+) diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch new file mode 100644 index 0000000000..5c056033a9 --- /dev/null +++ b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch @@ -0,0 +1,57 @@ +From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Fri, 22 Dec 2023 17:56:26 +1100 +Subject: [PATCH] better detection of broken -fzero-call-used-regs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gcc 13.2.0 on ppc64le refuses to compile some function, including +cipher.c:compression_alg_list() with an error: + +> sorry, unimplemented: argument ???used??? is not supportedcw +> for ???-fzero-call-used-regs??? on this target + +This extends the autoconf will-it-work test with a similarly- +structured function that seems to catch this. + +Spotted/tested by Colin Watson; bz3645 + +Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch +Signed-off-by: Brandon Maier +--- + m4/openssh.m4 | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 5d4c56280fc..033df501c3d 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,18 +20,24 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++const char *f3(int s) { ++ return s ? "good" : "gooder"; ++} + int main(int argc, char **argv) { +- (void)argv; + char b[256], *cp; ++ const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ (void)argv; + f(1); +- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ s = f3(f(2)); ++ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); +- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); ++ if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ec9e6613b0..ef530cc850 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,6 +13,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE +# 0001-better-detection-of-broken-fzero-call-used-regs.patch +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From peter at korsgaard.com Thu Feb 29 15:38:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:38:06 +0100 Subject: [Buildroot] [PATCH] host-python-numpy: correct implied host-lapack/host-blas dependency. In-Reply-To: (Yann E. MORIN's message of "Mon, 5 Feb 2024 19:04:30 +0100") References: <20240129204032.1980414-1-gsmecher@threespeedlogic.com> Message-ID: <87ttlrffhd.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Graeme, All, > On 2024-01-29 12:40 -0800, gsmecher at threespeedlogic.com spake thusly: >> From: Graeme Smecher >> >> Before this patch, host-python-numpy attempted (and failed) to detect >> OpenBLAS as follows: >> >> buildroot$ make >> >>> host-python-numpy 1.25.0 Configuring >> [...] >> Run-time dependency openblas found: NO (tried pkgconfig and cmake) >> WARNING: CMake Toolchain: Failed to determine CMake compilers state >> Run-time dependency openblas found: YES 0.3.21 >> Dependency openblas found: YES 0.3.21 (cached) >> Program _build_utils/process_src_template.py found: YES >> (/path/to/buildroot/output/host/bin/python3 >> /path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/process_src_template.py) >> Program _build_utils/tempita.py found: YES >> (/path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/tempita.py) >> >> output/build/host-python-numpy-1.25.0/numpy/meson.build:201:44: >> ERROR: Could not get cmake variable and no default provided for >> >> [...] > So I dug in the Numpy git history, and before we bumped to 1.25, it was > using distutils, which would only warn and disable BLAS support if not > found, but the meson switch made the default to fail. >> Two obvious ways to correct this: >> >> - Add some kind of host-lapack / host-openblas dependency to >> host-python-numpy, or >> - Tell host-python-numpy not to look for (or rely on) external code. >> >> Because the host numpy environment shouldn't be doing any numerical >> heavy lifting, we opt for the latter here. >> >> Signed-off-by: Graeme Smecher > Applied to master, with an extended commit log about the history, > thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:40:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:40:02 +0100 Subject: [Buildroot] [PATCH 1/2] package/wlroot: vulkan renderer depends on vulkan loader In-Reply-To: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> (Adam Duskett's message of "Sun, 21 Jan 2024 13:42:51 -0700") References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> Message-ID: <87plwfffe5.fsf@48ers.dk> >>>>> "Adam" == Adam Duskett writes: > Without the vulkan-loader package present, the configure step fails with the > following error message: > ``` > Run-time dependency vulkan found: NO (tried pkgconfig and system) > Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it. > ``` > The above error is due to the lack of the vulkan.pc file provided by the > vulkan-loader package. A search of autobuild failures containing > BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build > failures. However, the failure reasons happened before wlroots could compile. > One for gerbera-1.10.0 and another for host-rust-1.64.0. > Add a dependency on the vulkan-loader package to resolve the above issue. > Signed-off-by: Adam Duskett Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:40:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:40:23 +0100 Subject: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status In-Reply-To: <20240121204252.152952-2-adam.duskett@amarulasolutions.com> (Adam Duskett's message of "Sun, 21 Jan 2024 13:42:52 -0700") References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> <20240121204252.152952-2-adam.duskett@amarulasolutions.com> Message-ID: <87le73ffdk.fsf@48ers.dk> >>>>> "Adam" == Adam Duskett writes: > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been > rejected upstream, and the initial pull request was moved to the > freedesktop gitlab. Update the patch to reflect these changes. > Signed-off-by: Adam Duskett Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:41:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:41:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/brltty: disable emacs and lua bindings In-Reply-To: <20240126172920.1628617-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 26 Jan 2024 18:29:20 +0100") References: <20240126172920.1628617-1-fontaine.fabrice@gmail.com> Message-ID: <87h6hrffbk.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable lua bindings to avoid the following build failure if host-lua > and lua are built before brltty raised since bump to version 6.5 in > commit 82c6e87d5eaaf5b32aa340ab384f88539238cbe1 and > https://github.com/brltty/brltty/commit/42bf48ca010d9163652cb0a014662fa243132736: > configure: lua package: lua > configure: lua includes: > configure: lua libs: > -L/home/autobuild/autobuild/instance-0/output-1/host/bin/../sparc64-buildroot-linux-gnu/sysroot/usr/lib > -llua -lm -ldl > checking for lua5.4... no > checking for lua... /home/autobuild/autobuild/instance-0/output-1/host/bin/lua > configure: Lua shell: /home/autobuild/autobuild/instance-0/output-1/host/bin/lua > configure: Lua library directory: /home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > [...] > /usr/bin/install -c -d > /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > /usr/bin/install -c -s --strip-program /bin/true brlapi.so > /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/brltty-6.6/Bindings/Lua' > [...] > brltty: installs files in /home/autobuild/autobuild/instance-0/output-1/target//home/autobuild/autobuild/instance-0/output-1 > While at it, disable emacs bindings which have also been added in > version 6.5 with > https://github.com/brltty/brltty/commit/64a487e29941df54796645229a872ecbe2a06bfe > Fixes: > - http://autobuild.buildroot.org/results/f424e6727bbe61ea4b7703e93aae6fcab7506898 > - http://autobuild.buildroot.org/results/bf4a161fc66fb99a24f08bea3436b13738f2e383 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:42:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:15 +0100 Subject: [Buildroot] [PATCH] package/pkg-utils: add missing licensing data to show-info In-Reply-To: <20240205223906.39e92f87@windsurf> (Thomas Petazzoni via buildroot's message of "Mon, 5 Feb 2024 22:39:06 +0100") References: <20240127163807.233065-1-yann.morin.1998@free.fr> <20240205223906.39e92f87@windsurf> Message-ID: <87cysfffag.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Sat, 27 Jan 2024 17:38:07 +0100 > "Yann E. MORIN" wrote: >> While the list of licenses is present in the show-info output, the list >> of license files and the redistributable status were missing. Add them. >> >> Signed-off-by: Yann E. MORIN >> --- >> package/pkg-utils.mk | 4 ++++ >> 1 file changed, 4 insertions(+) > Applied to master, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:43:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:43:01 +0100 Subject: [Buildroot] [PATCH 1/3] package/containerd: drop CONTAINERD_CPE_ID_VENDOR In-Reply-To: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 4 Feb 2024 14:35:55 +0100") References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> Message-ID: <878r33ff96.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 35af2bb8011ea57642777acf5613afa244d325d7 set > CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as > CONTAINERD_CPE_ID_PRODUCT will be set to the package name > (i.e. containerd) by default > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:43:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:43:05 +0100 Subject: [Buildroot] [PATCH 2/3] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT In-Reply-To: <20240204133557.1512951-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 4 Feb 2024 14:35:56 +0100") References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> <20240204133557.1512951-2-fontaine.fabrice@gmail.com> Message-ID: <874jdrff92.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set > LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as > LIBCURL_CPE_ID_PRODUCT will be set to the package name > (i.e. libcurl) by default > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:44:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:44:27 +0100 Subject: [Buildroot] [PATCH] package/sqlite: use SPDX identifier for license In-Reply-To: <87plxa8rhp.fsf@48ers.dk> (Peter Korsgaard's message of "Mon, 05 Feb 2024 23:40:18 +0100") References: <20240110165111.3937223-1-christian@klarinett.li> <87plxa8rhp.fsf@48ers.dk> Message-ID: <87zfvje0mc.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Christian" == Christian Hitz via buildroot writes: >> From: Christian Hitz >> Signed-off-by: Christian Hitz > Committed, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:45:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:45:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/lua-http: set CPE variables In-Reply-To: <20240205204146.284303-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:41:46 +0100") References: <20240205204146.284303-1-fontaine.fabrice@gmail.com> Message-ID: <87v867e0la.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:45:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:45:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR In-Reply-To: <20240205201342.2995-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:13:42 +0100") References: <20240205201342.2995-1-fontaine.fabrice@gmail.com> Message-ID: <87r0gve0kl.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:green_end:sftpserver has been deprecated in favor of > cpe:2.3:a:greenend:sftpserver in December 2022: > > Version > Product > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:27:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:27:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/leptonica: affected by gcc bug 101737 In-Reply-To: <20240115211427.4291-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 15 Jan 2024 22:14:27 +0100") References: <20240115211427.4291-1-fontaine.fabrice@gmail.com> Message-ID: <877cingujo.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > leptonica is affected by gcc bug 101737 resulting in the following build > failure since at least bump to version 1.82.0 in commit > 81a961c545cc9f240841b75d6c21f13b334bc274: > sh4eb-buildroot-linux-gnu-gcc.br_real: internal compiler error: Segmentation fault signal terminated program cc1 > Please submit a full bug report, with preprocessed source (by using -freport-bug). > See for instructions. > Fixes: > - http://autobuild.buildroot.org/results/f18979454399d9c728f9e017e4cc3a1b27458f5b > - http://autobuild.buildroot.org/results/f3c803892175b3bb2ce68e3140c879b4a4d4b302 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:29:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:29:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/ngrep: fix build with libnet In-Reply-To: <20240205184839.3f230f02@windsurf> (Thomas Petazzoni via buildroot's message of "Mon, 5 Feb 2024 18:48:39 +0100") References: <20240109211801.565524-1-fontaine.fabrice@gmail.com> <20240205184839.3f230f02@windsurf> Message-ID: <8734tbgufo.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Tue, 9 Jan 2024 22:18:01 +0100 > Fabrice Fontaine wrote: >> Use pkg-config to find libnet and avoid the following build failure >> raised since commit 100ba8351c088fd764effdcaba848cfd92de79dd if >> libnet-config is found on the host: >> >> /home/autobuild/autobuild/instance-4/output-1/host/bin/mips64el-buildroot-linux-gnu-gcc >> -s -o ngrep ngrep.o tcpkill.o -lpcap -lnet -lpcre -L/usr/lib -lnet >> mips64el-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' >> >> While at it, format Upstream tag of other patches >> >> Fixes: >> - http://autobuild.buildroot.org/results/05c916162b9c1027cf53f1699a1f5653151098ed >> >> Signed-off-by: Fabrice Fontaine >> --- >> .checkpackageignore | 3 -- >> ...nfigure-in-when-testing-for-use_pcre.patch | 3 +- >> ...heck-for-libnet_init-in-configure-in.patch | 3 +- >> package/ngrep/0003-fix-disable-tcpkill.patch | 2 +- >> ...ure.in-use-pkg-config-to-find-libnet.patch | 38 +++++++++++++++++++ >> package/ngrep/ngrep.mk | 2 +- >> 6 files changed, 42 insertions(+), 9 deletions(-) >> create mode 100644 package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch > Applied to master, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:31:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:31:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: fix build error on powerpc In-Reply-To: <20240205185616.13fb5202@windsurf> (Thomas Petazzoni via buildroot's message of "Mon, 5 Feb 2024 18:56:16 +0100") References: <20240118222310.62234-1-brandon.maier@collins.com> <20240205185616.13fb5202@windsurf> Message-ID: <87y1b3fft1.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Thu, 18 Jan 2024 22:23:01 +0000 > Brandon Maier via buildroot wrote: >> Fixes the following error message introducted by OpenSSH v9.6p1. >> >> sshkey.c: In function 'sshkey_set_filename': >> sshkey.c:3705:1: sorry, unimplemented: '-fzero-call-used-regs' not supported on this target >> 3705 | } >> >> Fixes: >> http://autobuild.buildroot.org/results/ec7/ec780aed5b1c4fdf9b91f6e7be99e8d4c42efa58 >> >> Signed-off-by: Brandon Maier >> --- >> ...ction-of-broken-fzero-call-used-regs.patch | 57 +++++++++++++++++++ >> package/openssh/openssh.mk | 3 + >> 2 files changed, 60 insertions(+) >> create mode 100644 package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch > Applied to master, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:18:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:18:10 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/sysstat: do not autodetect sa_lib_dir Message-ID: <20240229153159.C19EC87D11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5249686eb772a3db506c7540d33e1a075abb9e10 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The configure script of sysstat package checks host's /usr/lib64 directory for default sa_lib_dir. Specify sa_lib_dir exclicitly to avoid host dependency. Signed-off-by: Atsushi Nemoto Signed-off-by: Peter Korsgaard (cherry picked from commit eef5c297e765bb1414d6d6c629ce8e690c6370d4) Signed-off-by: Peter Korsgaard --- package/sysstat/sysstat.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 377396d986..ca05ec50d8 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -20,5 +20,7 @@ SYSSTAT_CONF_OPTS += --enable-sensors else SYSSTAT_CONF_OPTS += --disable-sensors endif +# do not look at host's /usr/lib64 +SYSSTAT_CONF_OPTS += sa_lib_dir=/usr/lib/sa $(eval $(autotools-package)) From peter at korsgaard.com Thu Feb 29 15:09:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:09:01 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/libressl: don't export arc4random Message-ID: <20240229153159.97B7787D42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6fc939b85cd25dedec544edc050dce75815d4eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Don't export arc4random to fix the following libcurl build failure raised since bump of libcurl to version 8.5.0 in commit aaa9438b96f88b1ecbf5eb9a1aebef8010835b8d and https://github.com/curl/curl/commit/7925ba431b9a099daee1fa21d36c21887f787ad5: rand.c: In function 'randit': rand.c:146:26: error: implicit declaration of function 'arc4random'; did you mean 'srandom'? [-Werror=implicit-function-declaration] 146 | *rnd = (unsigned int)arc4random(); | ^~~~~~~~~~ | srandom cc1: some warnings being treated as errors Fixes: - http://autobuild.buildroot.org/results/8b7988629f1887be15c97b8c511d25443ba110d8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 7f1e3841f5c2da36e1833068ba948c52a58c07ae) Signed-off-by: Peter Korsgaard --- .../0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch | 133 +++++++++++++++++++++ ...Prefix-some-compat-symbols-with-libressl_.patch | 130 ++++++++++++++++++++ 2 files changed, 263 insertions(+) diff --git a/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch new file mode 100644 index 0000000000..411132ff20 --- /dev/null +++ b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch @@ -0,0 +1,133 @@ +From c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Mon, 11 Dec 2023 17:56:33 +0100 +Subject: [PATCH] Fix a few symbols in EXTRA_EXPORT + +I thought we stopped doing this, but that's for a separate thread. + +Upstream: https://github.com/libressl/portable/commit/c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd +Signed-off-by: Fabrice Fontaine +--- + crypto/CMakeLists.txt | 37 +++++++++++++++++++------------------ + 1 file changed, 19 insertions(+), 18 deletions(-) + +diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt +index 605647151..8046efe87 100644 +--- a/crypto/CMakeLists.txt ++++ b/crypto/CMakeLists.txt +@@ -767,13 +767,13 @@ endif() + + if(NOT HAVE_ASPRINTF) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/bsd-asprintf.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} asprintf) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} vasprintf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_asprintf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_vasprintf) + endif() + + if(NOT HAVE_FREEZERO) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/freezero.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} freezero) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_freezero) + endif() + + if(NOT HAVE_GETOPT) +@@ -799,46 +799,46 @@ endif() + + if(NOT HAVE_REALLOCARRAY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_reallocarray) + endif() + + if(NOT HAVE_RECALLOCARRAY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/recallocarray.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} recallocarray) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_recallocarray) + endif() + + if(NOT HAVE_STRCASECMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strcasecmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strcasecmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strcasecmp) + endif() + + if(NOT HAVE_STRLCAT) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcat.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcat) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcat) + endif() + + if(NOT HAVE_STRLCPY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcpy.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcpy) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcpy) + endif() + + if(NOT HAVE_STRNDUP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strndup.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strndup) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strndup) + if(NOT HAVE_STRNLEN) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strnlen.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strnlen) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strnlen) + endif() + endif() + + if(NOT HAVE_STRSEP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strsep.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strsep) + endif() + + if(NOT HAVE_STRTONUM) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strtonum.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strtonum) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strtonum) + endif() + + if(NOT HAVE_SYSLOG_R) +@@ -857,15 +857,15 @@ if(NOT HAVE_EXPLICIT_BZERO) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) + set_source_files_properties(compat/explicit_bzero.c PROPERTIES COMPILE_FLAGS -O0) + endif() +- set(EXTRA_EXPORT ${EXTRA_EXPORT} explicit_bzero) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_explicit_bzero) + endif() + + if(NOT HAVE_ARC4RANDOM_BUF) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_buf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_uniform) + + if(NOT HAVE_GETENTROPY) + if(WIN32) +@@ -891,12 +891,12 @@ endif() + + if(NOT HAVE_TIMINGSAFE_BCMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_bcmp) + endif() + + if(NOT HAVE_TIMINGSAFE_MEMCMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_memcmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_memcmp) + endif() + + if(NOT ENABLE_ASM) +@@ -919,6 +919,7 @@ foreach(SYM IN LISTS CRYPTO_UNEXPORT) + string(REPLACE "${SYM}\n" "" SYMS ${SYMS}) + endforeach() + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym ${SYMS}) ++# XXX should we still be doing this? + if(EXTRA_EXPORT) + list(SORT EXTRA_EXPORT) + foreach(SYM IN LISTS EXTRA_EXPORT) diff --git a/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch new file mode 100644 index 0000000000..42fbbe9069 --- /dev/null +++ b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch @@ -0,0 +1,130 @@ +From 0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Sat, 18 Nov 2023 10:53:09 +0100 +Subject: [PATCH] Prefix some compat symbols with libressl_ + +See #928. This isn't a full fix, but should remove much of the friction +already. + +Upstream: https://github.com/libressl/portable/pull/961/commits/0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 +Signed-off-by: Fabrice Fontaine +--- + include/compat/stdio.h | 2 ++ + include/compat/stdlib.h | 10 ++++++++++ + include/compat/string.h | 11 +++++++++++ + 3 files changed, 23 insertions(+) + +diff --git a/include/compat/stdio.h b/include/compat/stdio.h +index d5725c9ac9..4ddd63aee1 100644 +--- a/include/compat/stdio.h ++++ b/include/compat/stdio.h +@@ -20,7 +20,9 @@ + + #ifndef HAVE_ASPRINTF + #include ++#define vasprintf libressl_vasprintf + int vasprintf(char **str, const char *fmt, va_list ap); ++#define asprintf libressl_asprintf + int asprintf(char **str, const char *fmt, ...); + #endif + +diff --git a/include/compat/stdlib.h b/include/compat/stdlib.h +index 2eaea244c0..76dc07c35a 100644 +--- a/include/compat/stdlib.h ++++ b/include/compat/stdlib.h +@@ -20,26 +20,36 @@ + #include + + #ifndef HAVE_ARC4RANDOM_BUF ++#define arc4random libressl_arc4random + uint32_t arc4random(void); ++#define arc4random_buf libressl_arc4random_buf + void arc4random_buf(void *_buf, size_t n); ++#define arc4random_uniform libressl_arc4random_uniform + uint32_t arc4random_uniform(uint32_t upper_bound); + #endif + + #ifndef HAVE_FREEZERO ++#define freezero libressl_freezero + void freezero(void *ptr, size_t sz); + #endif + + #ifndef HAVE_GETPROGNAME ++#define getprogname libressl_getprogname + const char * getprogname(void); + #endif + ++#ifndef HAVE_REALLOCARRAY ++#define reallocarray libressl_reallocarray + void *reallocarray(void *, size_t, size_t); ++#endif + + #ifndef HAVE_RECALLOCARRAY ++#define recallocarray libressl_recallocarray + void *recallocarray(void *, size_t, size_t, size_t); + #endif + + #ifndef HAVE_STRTONUM ++#define strtonum libressl_strtonum + long long strtonum(const char *nptr, long long minval, + long long maxval, const char **errstr); + #endif +diff --git a/include/compat/string.h b/include/compat/string.h +index 4bf7519b5b..6a82793f62 100644 +--- a/include/compat/string.h ++++ b/include/compat/string.h +@@ -27,43 +27,54 @@ + #endif + + #ifndef HAVE_STRCASECMP ++#define strcasecmp libressl_strcasecmp + int strcasecmp(const char *s1, const char *s2); ++#define strncasecmp libressl_strncasecmp + int strncasecmp(const char *s1, const char *s2, size_t len); + #endif + + #ifndef HAVE_STRLCPY ++#define strlcpy libressl_strlcpy + size_t strlcpy(char *dst, const char *src, size_t siz); + #endif + + #ifndef HAVE_STRLCAT ++#define strlcat libressl_strlcat + size_t strlcat(char *dst, const char *src, size_t siz); + #endif + + #ifndef HAVE_STRNDUP ++#define strndup libressl_strndup + char * strndup(const char *str, size_t maxlen); + /* the only user of strnlen is strndup, so only build it if needed */ + #ifndef HAVE_STRNLEN ++#define strnlen libressl_strnlen + size_t strnlen(const char *str, size_t maxlen); + #endif + #endif + + #ifndef HAVE_STRSEP ++#define strsep libressl_strsep + char *strsep(char **stringp, const char *delim); + #endif + + #ifndef HAVE_EXPLICIT_BZERO ++#define explicit_bzero libressl_explicit_bzero + void explicit_bzero(void *, size_t); + #endif + + #ifndef HAVE_TIMINGSAFE_BCMP ++#define timingsafe_bcmp libressl_timingsafe_bcmp + int timingsafe_bcmp(const void *b1, const void *b2, size_t n); + #endif + + #ifndef HAVE_TIMINGSAFE_MEMCMP ++#define timingsafe_memcmp libressl_timingsafe_memcmp + int timingsafe_memcmp(const void *b1, const void *b2, size_t len); + #endif + + #ifndef HAVE_MEMMEM ++#define memmem libressl_memmem + void * memmem(const void *big, size_t big_len, const void *little, + size_t little_len); + #endif From peter at korsgaard.com Thu Feb 29 15:14:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:14:56 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/rdma-core: fix mips4 build Message-ID: <20240229153159.A545D87D45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68b48580592bd520ed218bdab196c8ce889bcdfa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The 'sync' instruction for MIPS was defined in MIPS-II as taking no operands. MIPS32 extended the define of 'sync' as taking an optional unsigned 5 bit immediate. As a result, replace "sync 0" by "sync" to fix the following build failure on mips4 raised since the addition of the package in commit ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 and https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: /tmp/ccrBy9fV.s: Assembler messages: /tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' Fixes: - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 - http://autobuild.buildroot.org/results/2df58f9b98aacf00960932f53510b29199393461 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7e5a90f1b75e59aa5707394f3c707fbbf03204b7) Signed-off-by: Peter Korsgaard --- .../0001-util-udma_barrier.h-fix-mips4-build.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch new file mode 100644 index 0000000000..6dfb476faa --- /dev/null +++ b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch @@ -0,0 +1,56 @@ +From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jan 2024 18:55:34 +0100 +Subject: [PATCH] util/udma_barrier.h: fix mips4 build + +The 'sync' instruction for MIPS was defined in MIPS-II as taking no +operands. MIPS32 extended the define of 'sync' as taking an optional +unsigned 5 bit immediate. + +As a result, replace "sync 0" by "sync" to fix the following build +failure on mips4 raised since version 43.0 and +https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: + +/tmp/ccrBy9fV.s: Assembler messages: +/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' + +Fixes: + - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 +--- + util/udma_barrier.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/util/udma_barrier.h b/util/udma_barrier.h +index 0a1f8a45b..3793d2f18 100644 +--- a/util/udma_barrier.h ++++ b/util/udma_barrier.h +@@ -101,7 +101,7 @@ + #elif defined(__riscv) + #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") + #elif defined(__mips__) +-#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_to_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -139,7 +139,7 @@ + #elif defined(__riscv) + #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") + #elif defined(__mips__) +-#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_from_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -212,7 +212,7 @@ + #include "s390_mmio_insn.h" + #define mmio_flush_writes() s390_pciwb() + #elif defined(__mips__) +-#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") ++#define mmio_flush_writes() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif From peter at korsgaard.com Thu Feb 29 15:19:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:19:58 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/libzenoh-pico: disable on or1k Message-ID: <20240229153159.CECC987D42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=610a82f7a079bfac19cc637166b05802e00c42d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The upstream libzenoh-pico code uses asm("nop"), which is completely bogus, and actually breaks build on or1k as the instruction does not exist. In upstream commit https://github.com/eclipse-zenoh/zenoh-pico/commit/7d79a14addcea972e801709413f5c9a5226e3ad3 they made the asm("nop") thing "configurable" with ZP_ASM_NOP, but still that requires some special handling for or1k. The whole thing is a complete mess, and upstream should have to use any of that. Rather than stacking piles of bogus stuff on more bogus stuff, let's simply disable this package for or1k for now. Thanks a lot to Fabrice for all the investigation, and interaction with upstream. See https://patchwork.ozlabs.org/project/buildroot/patch/20240110215515.1263859-1-fontaine.fabrice at gmail.com/ for example. Fixes: - http://autobuild.buildroot.org/results/fd0b2c666a1dc1537162d15b27743abd270243ed Signed-off-by: Thomas Petazzoni (cherry picked from commit ead797bef768a7f3da7a76dd8510eef48181bb6a) Signed-off-by: Peter Korsgaard --- package/libzenoh-pico/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libzenoh-pico/Config.in b/package/libzenoh-pico/Config.in index 5f7e91c9f6..9dbb260c52 100644 --- a/package/libzenoh-pico/Config.in +++ b/package/libzenoh-pico/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_LIBZENOH_PICO bool "libzenoh-pico" + # upstream hardcodes using asm("nop"), which is bogus and + # doesn't work on or1k + depends on !BR2_or1k depends on BR2_TOOLCHAIN_HAS_THREADS help zenoh-pico is the Eclipse zenoh implementation that targets @@ -11,4 +14,5 @@ config BR2_PACKAGE_LIBZENOH_PICO https://github.com/eclipse-zenoh/zenoh-pico comment "libzenoh-pico needs a toolchain w/ threads" + depends on !BR2_or1k depends on !BR2_TOOLCHAIN_HAS_THREADS From peter at korsgaard.com Thu Feb 29 15:17:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:17:07 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/frr: drop libnl dependency Message-ID: <20240229153159.B57E787790@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d69475afc96f8524d9a087437fbb09a0080a9bc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x libnl is not needed to build frr since the addition of the package in commit 26d82d006ba15777d19892b327bde343d82a9ff5 No mention of libnl found in https://github.com/FRRouting/frr or https://docs.frrouting.org/projects/dev-guide/en/latest/building.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit efa955ac415e2b50f63710e4fc1de8fd3e0dc099) Signed-off-by: Peter Korsgaard --- package/frr/Config.in | 1 - package/frr/frr.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/frr/Config.in b/package/frr/Config.in index c2e9577a27..f6c058e6df 100644 --- a/package/frr/Config.in +++ b/package/frr/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_FRR select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_LIBYANG - select BR2_PACKAGE_LIBNL select BR2_PACKAGE_READLINE select BR2_PACKAGE_JSON_C help diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 19f346fd7b..a4b4bccaf9 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -12,7 +12,7 @@ FRR_CPE_ID_VENDOR = linuxfoundation FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES -FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ +FRR_DEPENDENCIES = host-frr readline json-c libyang \ $(if $(BR2_PACKAGE_C_ARES),c-ares) HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 From peter at korsgaard.com Thu Feb 29 15:21:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:21:57 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-minimalmodbus: fix empty package Message-ID: <20240229153159.E762987790@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a8a5622720899c08be4d29dccefcb1e72988e45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Calling `setup.py` build builds and installs an empty package after upstream changed their packaging. Calling setuptools via `python -m build` builds the package correctly. Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN (cherry picked from commit d7e45215a4faaef8d6eb993b38d5a70ad7d309b1) Signed-off-by: Peter Korsgaard --- package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk index 5a6e7733be..cb8a0d8cc9 100644 --- a/package/python-minimalmodbus/python-minimalmodbus.mk +++ b/package/python-minimalmodbus/python-minimalmodbus.mk @@ -7,7 +7,8 @@ PYTHON_MINIMALMODBUS_VERSION = 2.1.1 PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE From peter at korsgaard.com Thu Feb 29 15:29:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:29:36 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/ngrep: fix build with libnet Message-ID: <20240229153200.2520D87D45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63bf07c42614b085c95916d045f75a4623ad8f3e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Use pkg-config to find libnet and avoid the following build failure raised since commit 100ba8351c088fd764effdcaba848cfd92de79dd if libnet-config is found on the host: /home/autobuild/autobuild/instance-4/output-1/host/bin/mips64el-buildroot-linux-gnu-gcc -s -o ngrep ngrep.o tcpkill.o -lpcap -lnet -lpcre -L/usr/lib -lnet mips64el-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' While at it, format Upstream tag of other patches Fixes: - http://autobuild.buildroot.org/results/05c916162b9c1027cf53f1699a1f5653151098ed Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 14c0c37eaf0f91ef61a88b3085c15028f566a394) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 -- ...in-configure-in-when-testing-for-use_pcre.patch | 3 +- ...002-Check-for-libnet_init-in-configure-in.patch | 3 +- package/ngrep/0003-fix-disable-tcpkill.patch | 2 +- ...onfigure.in-use-pkg-config-to-find-libnet.patch | 38 ++++++++++++++++++++++ package/ngrep/ngrep.mk | 2 +- 6 files changed, 42 insertions(+), 9 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 47074570f8..94b24b2545 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -929,9 +929,6 @@ package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch Up package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch Upstream package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch Upstream package/nginx/S50nginx Indent Variables -package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch Upstream -package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch Upstream -package/ngrep/0003-fix-disable-tcpkill.patch Upstream package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch Upstream package/nmap/0001-libdnet-wrapper-configure.patch Upstream package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch Upstream diff --git a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch index 69c5c887e8..c7f0dec360 100644 --- a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch +++ b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch @@ -4,8 +4,7 @@ Date: Mon, 1 Jan 2018 18:00:34 +0100 Subject: [PATCH] Fix typo in configure.in when testing for use_pcre Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe] +Upstream: https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch index 22b18ab7ee..7fa2e2f3bc 100644 --- a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch +++ b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch @@ -7,8 +7,7 @@ libnet_init_packet was the old libnet 1.0 function which is now long deprecated. Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5] +Upstream: https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0003-fix-disable-tcpkill.patch b/package/ngrep/0003-fix-disable-tcpkill.patch index 1264fd7e3b..894cd95b0f 100644 --- a/package/ngrep/0003-fix-disable-tcpkill.patch +++ b/package/ngrep/0003-fix-disable-tcpkill.patch @@ -9,7 +9,7 @@ found on the system. To fix this, move AC_CHECK_LIB to found libnet outside AC_ARG_ENABLE Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/jpr5/ngrep/pull/15] +Upstream: https://github.com/jpr5/ngrep/pull/15 --- configure.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch new file mode 100644 index 0000000000..71550da943 --- /dev/null +++ b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch @@ -0,0 +1,38 @@ +From 4788988827bf4c0d996d3e1e3b6ac52a23b97941 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 9 Jan 2024 21:15:47 +0100 +Subject: [PATCH] configure.in: use pkg-config to find libnet + +libnet-config is deprecated: +https://github.com/libnet/libnet/commit/1ec4a6e7d1d23811f0a14ecb51e46489a0175727 + +Signed-off-by: Fabrice Fontaine +Upstream: unsent (upstream seems dead, no commit since 5 years +--- + configure.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 7c3dd43..882ff86 100644 +--- a/configure.in ++++ b/configure.in +@@ -176,12 +176,14 @@ AC_ARG_ENABLE(tcpkill, + [ use_tcpkill="$enableval" ], + [ use_tcpkill="no" ]) + ++PKG_PROG_PKG_CONFIG + if test $use_tcpkill = yes; then + AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit) + USE_TCPKILL="1" + EXTRA_OBJS="$EXTRA_OBJS tcpkill.o" +- EXTRA_DEFINES="$EXTRA_DEFINES $(libnet-config --defines)" +- EXTRA_LIBS="$EXTRA_LIBS $(libnet-config --libs)" ++ PKG_CHECK_MODULES(LIBNET, libnet) ++ EXTRA_DEFINES="$EXTRA_DEFINES $LIBNET_CFLAGS" ++ EXTRA_LIBS="$EXTRA_LIBS $LIBNET_LIBS" + else + USE_TCPKILL="0" + fi +-- +2.43.0 + diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk index c4750f7504..dc69a34235 100644 --- a/package/ngrep/ngrep.mk +++ b/package/ngrep/ngrep.mk @@ -22,7 +22,7 @@ NGREP_CONF_OPTS = \ --disable-dropprivs \ --disable-pcap-restart -NGREP_DEPENDENCIES = libpcap pcre +NGREP_DEPENDENCIES = host-pkgconf libpcap pcre ifeq ($(BR2_PACKAGE_LIBNET),y) NGREP_DEPENDENCIES += libnet From peter at korsgaard.com Thu Feb 29 15:21:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:21:14 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/sysstat: update upstream location Message-ID: <20240229153159.DAD6487D45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09898aeaab7276aa2317d8e416416eccc8c3080c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The http://pagesperso-orange.fr service being down, http://pagesperso-orange.fr/sebastien.godard/ is no longer accessible (or more precisely serves some HTML junk), meaning that we currently cannot download the tarball of sysstat from the official upstream location, and we always fallback to sources.buildroot.net. This commit therefore updates to use the new upstream location on github.io. The 12.6.1 release is available there, with the same hash, so we can just point to the new upstream location. Fixes: ERROR: while checking hashes from package/sysstat//sysstat.hash ERROR: sysstat-12.6.1.tar.xz has wrong sha1 hash: ERROR: expected: a730982e0c2d4964a0022c1509f3ea0a345402bc ERROR: got : d64a079729f2ff5b304294d68fbc041a46c4966d ERROR: Incomplete download, or man-in-the-middle (MITM) attack Signed-off-by: Thomas Petazzoni (cherry picked from commit 35a2cb02277acae94f018a0d22138dc9de005fdf) Signed-off-by: Peter Korsgaard --- package/sysstat/Config.in | 2 +- package/sysstat/sysstat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in index 442b787684..efb640fd43 100644 --- a/package/sysstat/Config.in +++ b/package/sysstat/Config.in @@ -36,4 +36,4 @@ config BR2_PACKAGE_SYSSTAT * TTY device activity * Power management statistics - http://pagesperso-orange.fr/sebastien.godard/ + https://sysstat.github.io/ diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index ca05ec50d8..ec0c666157 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -6,7 +6,7 @@ SYSSTAT_VERSION = 12.6.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz -SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard +SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ From peter at korsgaard.com Thu Feb 29 15:24:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:24:31 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/domoticz: drop fmt dependency Message-ID: <20240229153200.0B7D787D42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56075f2f3d9327f0d9c1530ae48ea1a4ba85dfdc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x fmt is not a dependency since bump to version 2022.1 in commit adca60540f4fd271dda48b9a121986492700e73a and https://github.com/domoticz/domoticz/commit/82043c4d5c79003792379be79b931eb85ab890c8 https://github.com/domoticz/domoticz/commit/9e02d9a79c70c36db180d3242cbd03ff9b63e3cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit dc3609c53f927289a9681f30ab283d190cb34e09) Signed-off-by: Peter Korsgaard --- package/domoticz/Config.in | 1 - package/domoticz/domoticz.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 85361eecf0..a0e69a7601 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -16,7 +16,6 @@ config BR2_PACKAGE_DOMOTICZ select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_CEREAL - select BR2_PACKAGE_FMT select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_MINIZIP_ZLIB diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 3fbff5f4d8..03776e3040 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -12,7 +12,6 @@ DOMOTICZ_CPE_ID_VENDOR = domoticz DOMOTICZ_DEPENDENCIES = \ boost \ cereal \ - fmt \ host-pkgconf \ jsoncpp \ libcurl \ @@ -36,7 +35,6 @@ DOMOTICZ_CONF_OPTS += \ # jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ - -DUSE_BUILTIN_LIBFMT=OFF \ -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF From peter at korsgaard.com Thu Feb 29 15:23:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:23:39 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] configs/imx8mpevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20240229153159.F2EDE87D11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=608bd4d0ccdac416d84927f1fb064c42b5b518f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1394:12: fatal error: openssl/evp.h: No such file or directory 1394 | # include Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180070 Signed-off-by: Fabio Estevam Tested-By: S??bastien Szymanski Signed-off-by: Yann E. MORIN (cherry picked from commit bce4fe6d1bc8a71918e3d862ebf85d342bf535b0) Signed-off-by: Peter Korsgaard --- configs/freescale_imx8mpevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 82ed68c5a9..2aed048482 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -29,6 +29,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1 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 +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From peter at korsgaard.com Thu Feb 29 15:30:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:30:44 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/openssh: fix build error on powerpc Message-ID: <20240229153200.340B980162@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5ad7256596a5459d0ce558144dff4792a06eb8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following error message introducted by OpenSSH v9.6p1. sshkey.c: In function 'sshkey_set_filename': sshkey.c:3705:1: sorry, unimplemented: '-fzero-call-used-regs' not supported on this target 3705 | } Fixes: http://autobuild.buildroot.org/results/ec7/ec780aed5b1c4fdf9b91f6e7be99e8d4c42efa58 Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 325fe1aecfd20d2653cce6bc189824c6fdfcafec) Signed-off-by: Peter Korsgaard --- ...-detection-of-broken-fzero-call-used-regs.patch | 57 ++++++++++++++++++++++ package/openssh/openssh.mk | 3 ++ 2 files changed, 60 insertions(+) diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch new file mode 100644 index 0000000000..5c056033a9 --- /dev/null +++ b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch @@ -0,0 +1,57 @@ +From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Fri, 22 Dec 2023 17:56:26 +1100 +Subject: [PATCH] better detection of broken -fzero-call-used-regs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gcc 13.2.0 on ppc64le refuses to compile some function, including +cipher.c:compression_alg_list() with an error: + +> sorry, unimplemented: argument ???used??? is not supportedcw +> for ???-fzero-call-used-regs??? on this target + +This extends the autoconf will-it-work test with a similarly- +structured function that seems to catch this. + +Spotted/tested by Colin Watson; bz3645 + +Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch +Signed-off-by: Brandon Maier +--- + m4/openssh.m4 | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 5d4c56280fc..033df501c3d 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,18 +20,24 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++const char *f3(int s) { ++ return s ? "good" : "gooder"; ++} + int main(int argc, char **argv) { +- (void)argv; + char b[256], *cp; ++ const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ (void)argv; + f(1); +- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ s = f3(f(2)); ++ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); +- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); ++ if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ec9e6613b0..ef530cc850 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,6 +13,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE +# 0001-better-detection-of-broken-fzero-call-used-regs.patch +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From peter at korsgaard.com Thu Feb 29 15:26:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:26:47 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/leptonica: affected by gcc bug 101737 Message-ID: <20240229153200.16F7B87790@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49df708cde6598602cc4a7828c2ccbbef78825f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x leptonica is affected by gcc bug 101737 resulting in the following build failure since at least bump to version 1.82.0 in commit 81a961c545cc9f240841b75d6c21f13b334bc274: sh4eb-buildroot-linux-gnu-gcc.br_real: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source (by using -freport-bug). See for instructions. Fixes: - http://autobuild.buildroot.org/results/f18979454399d9c728f9e017e4cc3a1b27458f5b - http://autobuild.buildroot.org/results/f3c803892175b3bb2ce68e3140c879b4a4d4b302 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 31b488337921d57c14893c34766ac22c53e5382b) Signed-off-by: Peter Korsgaard --- package/leptonica/leptonica.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 8791b0c4c2..569d2829c3 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -14,6 +14,10 @@ LEPTONICA_DEPENDENCIES = host-pkgconf LEPTONICA_CONF_OPTS += --disable-programs +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +LEPTONICA_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -O0" +endif + ifeq ($(BR2_PACKAGE_GIFLIB),y) LEPTONICA_DEPENDENCIES += giflib LEPTONICA_CONF_OPTS += --with-giflib From peter at korsgaard.com Thu Feb 29 15:18:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:18:04 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/sysstat: do not autodetect sa_lib_dir Message-ID: <20240229153304.BC86B87D70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f807faa33250aae48b883404d5adf52fd4bc96e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The configure script of sysstat package checks host's /usr/lib64 directory for default sa_lib_dir. Specify sa_lib_dir exclicitly to avoid host dependency. Signed-off-by: Atsushi Nemoto Signed-off-by: Peter Korsgaard (cherry picked from commit eef5c297e765bb1414d6d6c629ce8e690c6370d4) Signed-off-by: Peter Korsgaard --- package/sysstat/sysstat.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 377396d986..ca05ec50d8 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -20,5 +20,7 @@ SYSSTAT_CONF_OPTS += --enable-sensors else SYSSTAT_CONF_OPTS += --disable-sensors endif +# do not look at host's /usr/lib64 +SYSSTAT_CONF_OPTS += sa_lib_dir=/usr/lib/sa $(eval $(autotools-package)) From peter at korsgaard.com Thu Feb 29 15:15:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:15:23 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/rdma-core: fix mips4 build Message-ID: <20240229153304.93E5687D70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d06ac104a38c55426ed0a04a95d82c94cfc5a41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The 'sync' instruction for MIPS was defined in MIPS-II as taking no operands. MIPS32 extended the define of 'sync' as taking an optional unsigned 5 bit immediate. As a result, replace "sync 0" by "sync" to fix the following build failure on mips4 raised since the addition of the package in commit ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 and https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: /tmp/ccrBy9fV.s: Assembler messages: /tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' Fixes: - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 - http://autobuild.buildroot.org/results/2df58f9b98aacf00960932f53510b29199393461 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7e5a90f1b75e59aa5707394f3c707fbbf03204b7) Signed-off-by: Peter Korsgaard --- .../0001-util-udma_barrier.h-fix-mips4-build.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch new file mode 100644 index 0000000000..6dfb476faa --- /dev/null +++ b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch @@ -0,0 +1,56 @@ +From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jan 2024 18:55:34 +0100 +Subject: [PATCH] util/udma_barrier.h: fix mips4 build + +The 'sync' instruction for MIPS was defined in MIPS-II as taking no +operands. MIPS32 extended the define of 'sync' as taking an optional +unsigned 5 bit immediate. + +As a result, replace "sync 0" by "sync" to fix the following build +failure on mips4 raised since version 43.0 and +https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: + +/tmp/ccrBy9fV.s: Assembler messages: +/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' + +Fixes: + - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 +--- + util/udma_barrier.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/util/udma_barrier.h b/util/udma_barrier.h +index 0a1f8a45b..3793d2f18 100644 +--- a/util/udma_barrier.h ++++ b/util/udma_barrier.h +@@ -101,7 +101,7 @@ + #elif defined(__riscv) + #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") + #elif defined(__mips__) +-#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_to_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -139,7 +139,7 @@ + #elif defined(__riscv) + #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") + #elif defined(__mips__) +-#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_from_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -212,7 +212,7 @@ + #include "s390_mmio_insn.h" + #define mmio_flush_writes() s390_pciwb() + #elif defined(__mips__) +-#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") ++#define mmio_flush_writes() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif From peter at korsgaard.com Thu Feb 29 15:46:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:46:54 +0100 Subject: [Buildroot] [PATCH] docs/manual: extend makedev syntax section In-Reply-To: <20240206115300.0bd8b584@windsurf> (Thomas Petazzoni via buildroot's message of "Tue, 6 Feb 2024 11:53:00 +0100") References: <20240206115300.0bd8b584@windsurf> Message-ID: <87msrje0i9.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Thu, 18 Jan 2024 17:08:50 +0100 > wrote: >> From: "Yann E. MORIN" >> >> The section of the manual describing the makedev syntax is not >> up-to-date with the current features, and does not properly describe >> existing ones. >> >> - extend the list of types with the requirements on the existence of >> the target file or directory; for 'c', 'b', and 'p', the existence >> requirement is inherited from mknod(2): >> >> ERRORS >> ... >> ENOENT A directory component in pathname does not exist or is a >> dangling symbolic link. >> >> for the other types, the existence requirements are extracted from >> the source of makedev.c; >> >> - format the types fags, so they are rendered in monospace; >> >> - extend the 'mode' description, as it can be set to -1 for 'f', 'd', >> or 'r', so that only the uid and gid are set. This is most useful >> for 'r', where setting the same mode recursively for all the >> sub-directories and files alike does not really make sense; indeed >> in this case, the modes are usually set correctly when the package >> (or rootfs overlay) installs the files, and only the uid and gid are >> interesting to set; >> >> - extend and update the examples to show-case the -1 mode use-case. >> >> Signed-off-by: Yann E. MORIN >> --- >> docs/manual/makedev-syntax.adoc | 33 +++++++++++++++++++-------------- >> 1 file changed, 19 insertions(+), 14 deletions(-) > Applied to master (with the typo in the commit log fixed), thanks! Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:42:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:49 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT Message-ID: <20240229154802.9D63387DAE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e35929fd1e19692010c8fa80824c065a86cc6ac5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as LIBCURL_CPE_ID_PRODUCT will be set to the package name (i.e. libcurl) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant (cherry picked from commit 61295f5ced0749db34095bfbe8b34ed86a692828) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 3ecc587a52..83845b8e87 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') From peter at korsgaard.com Thu Feb 29 15:42:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:05 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/pkg-utils: add missing licensing data to show-info Message-ID: <20240229154802.865E587DAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ebaca432f126843eea35ea578437f179f9394851 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x While the list of licenses is present in the show-info output, the list of license files and the redistributable status were missing. Add them. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 5647d5c1900bde13cedd36efd09404ea5763c0fb) Signed-off-by: Peter Korsgaard --- package/pkg-utils.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 059e86ae0a..723bbe4e24 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -157,6 +157,10 @@ endef define _json-info-pkg-details "version": $(call mk-json-str,$($(1)_DL_VERSION)), "licenses": $(call mk-json-str,$($(1)_LICENSE)), + "license_files": [ + $(foreach f, $($(1)_LICENSE_FILES),$(call mk-json-str,$(f))$(comma)) + ], + "redistributable": $(if $(filter NO,$($(1)_REDISTRIBUTE)),false,true), "dl_dir": $(call mk-json-str,$($(1)_DL_SUBDIR)), "downloads": [ $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), From peter at korsgaard.com Thu Feb 29 15:44:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:44:55 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/lua-http: set CPE variables Message-ID: <20240229154802.BE55987DAE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13b9d086cd7e04b2382c052535cfcb42dd6ceda0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0ccf4048e43b022feba225b976e55ed3e503d424) Signed-off-by: Peter Korsgaard --- package/lua-http/lua-http.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index 7fbb09038e..df3e2c0059 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -10,5 +10,7 @@ LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_LICENSE = MIT LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md +LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) +LUA_HTTP_CPE_ID_VENDOR = daurnimator $(eval $(luarocks-package)) From peter at korsgaard.com Thu Feb 29 15:40:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:40:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/wlroots: update patch with upstream status Message-ID: <20240229154802.7142C87DAE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56a3517ba139380cd611c40ca1bd498dbae8f260 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been rejected upstream, and the initial pull request was moved to the freedesktop gitlab. Update the patch to reflect these changes. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 840849afff07f91668f88570c5055eaf6687deb2) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 94b24b2545..44ba7494d4 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1440,7 +1440,6 @@ package/wilc-driver/0005-Fix-cast-warnings.patch Upstream package/wipe/0001-musl.patch Upstream package/wireless_tools/0001-remove-bzero.patch Upstream package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch Upstream -package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch Upstream package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch Upstream package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch Upstream package/wpa_supplicant/ifupdown.sh Shellcheck diff --git a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch b/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch index 0ba078708a..0e1ae9d87a 100644 --- a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch +++ b/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch @@ -5,8 +5,10 @@ Subject: [PATCH] Add feature macros to more C files These source files use "struct timespec", which is POSIX 1993.09. -Signed-off-by: Paul Cercueil +Upstream: Rejected (Upstream does not want these workarounds) +see: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2493 +Signed-off-by: Paul Cercueil [Retrieved from: https://github.com/swaywm/wlroots/pull/2493] Signed-off-by: Fabrice Fontaine --- From peter at korsgaard.com Thu Feb 29 15:41:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:41:06 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/brltty: disable emacs and lua bindings Message-ID: <20240229154802.7AC9D87DAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e47248d3817440f3ce06265d096b7d9f4e94158 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Disable lua bindings to avoid the following build failure if host-lua and lua are built before brltty raised since bump to version 6.5 in commit 82c6e87d5eaaf5b32aa340ab384f88539238cbe1 and https://github.com/brltty/brltty/commit/42bf48ca010d9163652cb0a014662fa243132736: configure: lua package: lua configure: lua includes: configure: lua libs: -L/home/autobuild/autobuild/instance-0/output-1/host/bin/../sparc64-buildroot-linux-gnu/sysroot/usr/lib -llua -lm -ldl checking for lua5.4... no checking for lua... /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua shell: /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua library directory: /home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 [...] /usr/bin/install -c -d /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 /usr/bin/install -c -s --strip-program /bin/true brlapi.so /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/brltty-6.6/Bindings/Lua' [...] brltty: installs files in /home/autobuild/autobuild/instance-0/output-1/target//home/autobuild/autobuild/instance-0/output-1 While at it, disable emacs bindings which have also been added in version 6.5 with https://github.com/brltty/brltty/commit/64a487e29941df54796645229a872ecbe2a06bfe Fixes: - http://autobuild.buildroot.org/results/f424e6727bbe61ea4b7703e93aae6fcab7506898 - http://autobuild.buildroot.org/results/bf4a161fc66fb99a24f08bea3436b13738f2e383 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 19f06441e8b616159d45a552beac6e1fe05bc42a) Signed-off-by: Peter Korsgaard --- package/brltty/brltty.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index f00a18cc6f..22d58ebd00 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -23,8 +23,10 @@ BRLTTY_CONF_ENV = \ PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf BRLTTY_CONF_OPTS = \ + --disable-emacs-bindings \ --disable-java-bindings \ --disable-lisp-bindings \ + --disable-lua-bindings \ --disable-ocaml-bindings \ --disable-python-bindings \ --disable-tcl-bindings \ From peter at korsgaard.com Thu Feb 29 15:37:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:37:45 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] host-python-numpy: correct implied host-lapack/host-blas dependency. Message-ID: <20240229154802.5588A87DAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0412998ea51527982cc2e938f4efefcccb7d9663 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Before commit ca63464e3777 (package/python-numpy: bump to version 1.25.0), numpy was using python distuils. Then, the default for BLAS and LAPACK detection was to disable support if they were not found, even when OPENBLAS is installed on the host system. Commit ca63464e3777 switched python-numpy to use the meson-package infrastructure, where the default has changed, and now fails when the host system does have OPENBLAS installed: buildroot$ make >>> host-python-numpy 1.25.0 Configuring [...] Run-time dependency openblas found: NO (tried pkgconfig and cmake) WARNING: CMake Toolchain: Failed to determine CMake compilers state Run-time dependency openblas found: YES 0.3.21 Dependency openblas found: YES 0.3.21 (cached) Program _build_utils/process_src_template.py found: YES (/path/to/buildroot/output/host/bin/python3 /path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/process_src_template.py) Program _build_utils/tempita.py found: YES (/path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/tempita.py) output/build/host-python-numpy-1.25.0/numpy/meson.build:201:44: ERROR: Could not get cmake variable and no default provided for [...] Two obvious ways to correct this: - Add some kind of host-lapack / host-openblas dependency to host-python-numpy, or - Tell host-python-numpy not to look for (or rely on) external code. Because the host numpy environment shouldn't be doing any numerical heavy lifting, we opt for the latter here. Signed-off-by: Graeme Smecher [yann.morin.1998 at free.fr: - explain why the issue was not found before ] Signed-off-by: Yann E. MORIN (cherry picked from commit f6c33f3e89f7f26e5b7613a757c82c9efc62654a) Signed-off-by: Peter Korsgaard --- package/python-numpy/python-numpy.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 383135f9fe..200fac20a1 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -38,6 +38,10 @@ else PYTHON_NUMPY_CONF_OPTS += -Dblas="" endif +# Rather than add a host-blas or host-lapack dependencies, just use unoptimized, +# in-tree code. +HOST_PYTHON_NUMPY_CONF_OPTS = -Dblas="" -Dlapack="" + # Fixup the npymath.ini prefix path with actual target staging area where # numpy core was built. Without this, target builds using numpy distutils # extensions like python-scipy, python-numba cannot find -lnpymath since From peter at korsgaard.com Thu Feb 29 15:43:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:43:38 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/sqlite: use SPDX identifier for license Message-ID: <20240229154802.A97B187DAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5debf1ba6883d1dd931e61000ce24631d459d147 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The SPDX identifier for the sqlite license is "blessing": https://spdx.org/licenses/blessing.html Signed-off-by: Christian Hitz Signed-off-by: Peter Korsgaard (cherry picked from commit ddd257ca23e6bcf60676bcd292035fe99e6cbf62) Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index f69097f3b7..9c2070ecdc 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -8,7 +8,7 @@ SQLITE_VERSION = 3.43.1 SQLITE_TAR_VERSION = 3430100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2023 -SQLITE_LICENSE = Public domain +SQLITE_LICENSE = blessing SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite SQLITE_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 29 15:42:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:30 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/containerd: drop CONTAINERD_CPE_ID_VENDOR Message-ID: <20240229154802.9251F87DB0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a908e31303703e9fb782b7f3cd241cf02728501 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 35af2bb8011ea57642777acf5613afa244d325d7 set CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as CONTAINERD_CPE_ID_PRODUCT will be set to the package name (i.e. containerd) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant (cherry picked from commit 6ed73df9ee774e007432fbf9b6c19b22233f2bfd) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 61a8472ddd..d3ca102797 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd From peter at korsgaard.com Thu Feb 29 15:44:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:44:48 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR Message-ID: <20240229154802.B3BD387DAF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dbf74002deaad62ea5b4b3b699c27089d354c002 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:green_end:sftpserver has been deprecated in favor of cpe:2.3:a:greenend:sftpserver in December 2022: Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4adc8b3d24708f180bcbf68df1d0723dc058f68e) Signed-off-by: Peter Korsgaard --- package/gesftpserver/gesftpserver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 5a3ab0536c..5a7106d707 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -12,7 +12,7 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors -GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_VENDOR = greenend GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling From peter at korsgaard.com Thu Feb 29 15:46:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:46:44 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] docs/manual: extend makedev syntax section Message-ID: <20240229154802.C758287DAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9c5e028edb648de8a9ce355d93973dd6c95fbd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The section of the manual describing the makedev syntax is not up-to-date with the current features, and does not properly describe existing ones. - extend the list of types with the requirements on the existence of the target file or directory; for 'c', 'b', and 'p', the existence requirement is inherited from mknod(2): ERRORS ... ENOENT A directory component in pathname does not exist or is a dangling symbolic link. for the other types, the existence requirements are extracted from the source of makedev.c; - format the types flags, so they are rendered in monospace; - extend the 'mode' description, as it can be set to -1 for 'f', 'd', or 'r', so that only the uid and gid are set. This is most useful for 'r', where setting the same mode recursively for all the sub-directories and files alike does not really make sense; indeed in this case, the modes are usually set correctly when the package (or rootfs overlay) installs the files, and only the uid and gid are interesting to set; - extend and update the examples to show-case the -1 mode use-case. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 738fb6dfa48b19f39e4a8df38ac9dcc0b37e0aa4) Signed-off-by: Peter Korsgaard --- docs/manual/makedev-syntax.adoc | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/docs/manual/makedev-syntax.adoc b/docs/manual/makedev-syntax.adoc index d6efb31d42..e63c9233eb 100644 --- a/docs/manual/makedev-syntax.adoc +++ b/docs/manual/makedev-syntax.adoc @@ -22,14 +22,19 @@ There are a few non-trivial blocks: - +name+ is the path to the file you want to create/modify - +type+ is the type of the file, being one of: - * f: a regular file - * d: a directory - * r: a directory recursively - * c: a character device file - * b: a block device file - * p: a named pipe + * `f`: a regular file, which must already exist + * `F`: a regular file, which is ignored and not created if missing + * `d`: a directory, which is created, as well as its parents, if missing + * `r`: a directory recursively, which must already exist + * `c`: a character device file, which parent directory must exist + * `b`: a block device file, which parent directory must exist + * `p`: a named pipe, which parent directory must exist - +mode+ are the usual permissions settings (only numerical values - are allowed) + are allowed); + for type `d`, the mode of existing parents is not changed, but the mode + of created parents is set; + for types `f`, `F`, and `r`, +mode+ can also be set to +-1+ to not + change the mode (and only change uid and gid) - +uid+ and +gid+ are the UID and GID to set on this file; can be either numerical values or actual names - +major+ and +minor+ are here for device files, set to +-+ for other @@ -38,22 +43,22 @@ There are a few non-trivial blocks: of files, and can be reduced to a loop, beginning at +start+, incrementing its counter by +inc+ until it reaches +count+ -Let's say you want to change the permissions of a given file; using -this syntax, you will need to write: +Let's say you want to change the ownership and permissions of a given +file; using this syntax, you will need to write: ---- /usr/bin/foo f 755 0 0 - - - - - /usr/bin/bar f 755 root root - - - - - /data/buz f 644 buz-user buz-group - - - - - +/data/baz f -1 baz-user baz-group - - - - - ---- -Alternatively, if you want to change owner/permission of a directory -recursively, you can write (to set UID to foo, GID to bar and access -rights to rwxr-x--- for the directory /usr/share/myapp and all files -and directories below it): +Alternatively, if you want to change owner of a directory recursively, +you can write (to set UID to `foo` and GID to `bar` for the directory +`/usr/share/myapp` and all files and directories below it): ---- -/usr/share/myapp r 750 foo bar - - - - - +/usr/share/myapp r -1 foo bar - - - - - ---- On the other hand, if you want to create the device file +/dev/hda+ From peter at korsgaard.com Thu Feb 29 15:39:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:39:31 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/wlroots: vulkan renderer depends on vulkan loader Message-ID: <20240229154802.63BB787D41@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=489015b033db39133a82610d723a1980ba6593af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Without the vulkan-loader package present, the configure step fails with the following error message: ``` Run-time dependency vulkan found: NO (tried pkgconfig and system) Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it. ``` The above error is due to the lack of the vulkan.pc file provided by the vulkan-loader package. A search of autobuild failures containing BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build failures. However, the failure reasons happened before wlroots could compile. One for gerbera-1.10.0 and another for host-rust-1.64.0. Add a dependency on the vulkan-loader package to resolve the above issue. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit f27b0322a5019c4016d2800ccc1b586eb6af7bd5) Signed-off-by: Peter Korsgaard --- package/wlroots/wlroots.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index bb5c8f497d..fdd2fb8250 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -41,9 +41,9 @@ else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y) +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER)$(BR2_PACKAGE_VULKAN_LOADER),yy) WLROOTS_RENDERERS += vulkan -WLROOTS_DEPENDENCIES += mesa3d +WLROOTS_DEPENDENCIES += mesa3d vulkan-loader endif WLROOTS_CONF_OPTS += \ From peter at korsgaard.com Thu Feb 29 15:42:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:41 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT Message-ID: <20240229155011.3EE8187DD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=326b77d6dfb2f8dd771796a18ded886e22b40d6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as LIBCURL_CPE_ID_PRODUCT will be set to the package name (i.e. libcurl) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant (cherry picked from commit 61295f5ced0749db34095bfbe8b34ed86a692828) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 9ef8586bb2..0bac8656b8 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') From peter at korsgaard.com Thu Feb 29 15:41:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:41:23 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/brltty: disable emacs and lua bindings Message-ID: <20240229155011.05BD287DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34b7f3ab9acd18b94d9f830c785d710f728154c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Disable lua bindings to avoid the following build failure if host-lua and lua are built before brltty raised since bump to version 6.5 in commit 82c6e87d5eaaf5b32aa340ab384f88539238cbe1 and https://github.com/brltty/brltty/commit/42bf48ca010d9163652cb0a014662fa243132736: configure: lua package: lua configure: lua includes: configure: lua libs: -L/home/autobuild/autobuild/instance-0/output-1/host/bin/../sparc64-buildroot-linux-gnu/sysroot/usr/lib -llua -lm -ldl checking for lua5.4... no checking for lua... /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua shell: /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua library directory: /home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 [...] /usr/bin/install -c -d /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 /usr/bin/install -c -s --strip-program /bin/true brlapi.so /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/brltty-6.6/Bindings/Lua' [...] brltty: installs files in /home/autobuild/autobuild/instance-0/output-1/target//home/autobuild/autobuild/instance-0/output-1 While at it, disable emacs bindings which have also been added in version 6.5 with https://github.com/brltty/brltty/commit/64a487e29941df54796645229a872ecbe2a06bfe Fixes: - http://autobuild.buildroot.org/results/f424e6727bbe61ea4b7703e93aae6fcab7506898 - http://autobuild.buildroot.org/results/bf4a161fc66fb99a24f08bea3436b13738f2e383 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 19f06441e8b616159d45a552beac6e1fe05bc42a) Signed-off-by: Peter Korsgaard --- package/brltty/brltty.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index dc5a38cddb..4cab635b0c 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -23,8 +23,10 @@ BRLTTY_CONF_ENV = \ PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf BRLTTY_CONF_OPTS = \ + --disable-emacs-bindings \ --disable-java-bindings \ --disable-lisp-bindings \ + --disable-lua-bindings \ --disable-ocaml-bindings \ --disable-python-bindings \ --disable-tcl-bindings \ From peter at korsgaard.com Thu Feb 29 15:41:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:41:55 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/pkg-utils: add missing licensing data to show-info Message-ID: <20240229155011.1891A87DCF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62279f8592cfc4d67771e3df2b5e0c8e1a5b37f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x While the list of licenses is present in the show-info output, the list of license files and the redistributable status were missing. Add them. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 5647d5c1900bde13cedd36efd09404ea5763c0fb) Signed-off-by: Peter Korsgaard --- package/pkg-utils.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 059e86ae0a..723bbe4e24 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -157,6 +157,10 @@ endef define _json-info-pkg-details "version": $(call mk-json-str,$($(1)_DL_VERSION)), "licenses": $(call mk-json-str,$($(1)_LICENSE)), + "license_files": [ + $(foreach f, $($(1)_LICENSE_FILES),$(call mk-json-str,$(f))$(comma)) + ], + "redistributable": $(if $(filter NO,$($(1)_REDISTRIBUTE)),false,true), "dl_dir": $(call mk-json-str,$($(1)_DL_SUBDIR)), "downloads": [ $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), From peter at korsgaard.com Thu Feb 29 15:44:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:44:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/sqlite: use SPDX identifier for license Message-ID: <20240229155011.516BF87DCF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7081e827b213db3db9ea39c1e6714a854d02920b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The SPDX identifier for the sqlite license is "blessing": https://spdx.org/licenses/blessing.html Signed-off-by: Christian Hitz Signed-off-by: Peter Korsgaard (cherry picked from commit ddd257ca23e6bcf60676bcd292035fe99e6cbf62) Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 789eddfa0a..3e35959120 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -8,7 +8,7 @@ SQLITE_VERSION = 3.40.1 SQLITE_TAR_VERSION = 3400100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 -SQLITE_LICENSE = Public domain +SQLITE_LICENSE = blessing SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite SQLITE_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 29 15:42:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:37 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/containerd: drop CONTAINERD_CPE_ID_VENDOR Message-ID: <20240229155011.2ABC787DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98b4832b4417dd3eb3e2d20625c19fba0b34ccf9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit 35af2bb8011ea57642777acf5613afa244d325d7 set CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as CONTAINERD_CPE_ID_PRODUCT will be set to the package name (i.e. containerd) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant (cherry picked from commit 6ed73df9ee774e007432fbf9b6c19b22233f2bfd) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index c4a6d854c3..68213c60be 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd From peter at korsgaard.com Thu Feb 29 15:44:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:44:44 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR Message-ID: <20240229155011.63FA187DD3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67b29df77cd2d7f07d3e41dfba12dc12b283b556 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:green_end:sftpserver has been deprecated in favor of cpe:2.3:a:greenend:sftpserver in December 2022: Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4adc8b3d24708f180bcbf68df1d0723dc058f68e) Signed-off-by: Peter Korsgaard --- package/gesftpserver/gesftpserver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 5a3ab0536c..5a7106d707 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -12,7 +12,7 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors -GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_VENDOR = greenend GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling From peter at korsgaard.com Thu Feb 29 15:45:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:45:19 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/lua-http: set CPE variables Message-ID: <20240229155011.7942C7FD96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2426d4094ddcc1acb7c95786f0441e9b8c7fd51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0ccf4048e43b022feba225b976e55ed3e503d424) Signed-off-by: Peter Korsgaard --- package/lua-http/lua-http.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index 7fbb09038e..df3e2c0059 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -10,5 +10,7 @@ LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_LICENSE = MIT LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md +LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) +LUA_HTTP_CPE_ID_VENDOR = daurnimator $(eval $(luarocks-package)) From peter at korsgaard.com Thu Feb 29 15:46:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:46:38 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] docs/manual: extend makedev syntax section Message-ID: <20240229155011.9124587DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eada744ed0e993fc32e25823b102c684ede74464 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The section of the manual describing the makedev syntax is not up-to-date with the current features, and does not properly describe existing ones. - extend the list of types with the requirements on the existence of the target file or directory; for 'c', 'b', and 'p', the existence requirement is inherited from mknod(2): ERRORS ... ENOENT A directory component in pathname does not exist or is a dangling symbolic link. for the other types, the existence requirements are extracted from the source of makedev.c; - format the types flags, so they are rendered in monospace; - extend the 'mode' description, as it can be set to -1 for 'f', 'd', or 'r', so that only the uid and gid are set. This is most useful for 'r', where setting the same mode recursively for all the sub-directories and files alike does not really make sense; indeed in this case, the modes are usually set correctly when the package (or rootfs overlay) installs the files, and only the uid and gid are interesting to set; - extend and update the examples to show-case the -1 mode use-case. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 738fb6dfa48b19f39e4a8df38ac9dcc0b37e0aa4) Signed-off-by: Peter Korsgaard --- docs/manual/makedev-syntax.txt | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/docs/manual/makedev-syntax.txt b/docs/manual/makedev-syntax.txt index d6efb31d42..e63c9233eb 100644 --- a/docs/manual/makedev-syntax.txt +++ b/docs/manual/makedev-syntax.txt @@ -22,14 +22,19 @@ There are a few non-trivial blocks: - +name+ is the path to the file you want to create/modify - +type+ is the type of the file, being one of: - * f: a regular file - * d: a directory - * r: a directory recursively - * c: a character device file - * b: a block device file - * p: a named pipe + * `f`: a regular file, which must already exist + * `F`: a regular file, which is ignored and not created if missing + * `d`: a directory, which is created, as well as its parents, if missing + * `r`: a directory recursively, which must already exist + * `c`: a character device file, which parent directory must exist + * `b`: a block device file, which parent directory must exist + * `p`: a named pipe, which parent directory must exist - +mode+ are the usual permissions settings (only numerical values - are allowed) + are allowed); + for type `d`, the mode of existing parents is not changed, but the mode + of created parents is set; + for types `f`, `F`, and `r`, +mode+ can also be set to +-1+ to not + change the mode (and only change uid and gid) - +uid+ and +gid+ are the UID and GID to set on this file; can be either numerical values or actual names - +major+ and +minor+ are here for device files, set to +-+ for other @@ -38,22 +43,22 @@ There are a few non-trivial blocks: of files, and can be reduced to a loop, beginning at +start+, incrementing its counter by +inc+ until it reaches +count+ -Let's say you want to change the permissions of a given file; using -this syntax, you will need to write: +Let's say you want to change the ownership and permissions of a given +file; using this syntax, you will need to write: ---- /usr/bin/foo f 755 0 0 - - - - - /usr/bin/bar f 755 root root - - - - - /data/buz f 644 buz-user buz-group - - - - - +/data/baz f -1 baz-user baz-group - - - - - ---- -Alternatively, if you want to change owner/permission of a directory -recursively, you can write (to set UID to foo, GID to bar and access -rights to rwxr-x--- for the directory /usr/share/myapp and all files -and directories below it): +Alternatively, if you want to change owner of a directory recursively, +you can write (to set UID to `foo` and GID to `bar` for the directory +`/usr/share/myapp` and all files and directories below it): ---- -/usr/share/myapp r 750 foo bar - - - - - +/usr/share/myapp r -1 foo bar - - - - - ---- On the other hand, if you want to create the device file +/dev/hda+ From peter at korsgaard.com Thu Feb 29 16:05:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:05:14 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: fix running on older python versions In-Reply-To: <20240228224459.2383336-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 28 Feb 2024 23:44:59 +0100") References: <20240228224459.2383336-1-yann.morin.1998@free.fr> Message-ID: <87il27dznp.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Commit f71d9f49e546 (support/scripts/pkg-stats: fix datetime deprecation > warning) forgot to consider that the datetime.UTC suggested by python > 3.12, was only introduced with python 3.11. > However, we are still generating the daily report on a python 3.8 > version, which fails at runtime: > AttributeError: module 'datetime' has no attribute 'UTC' > It turns out that datetime.UTC is just an alias for datetime.timezone.utc, > which seems to have existed since before python3... > Use datetime.timezone.utc instead of its alias. > Signed-off-by: Yann E. MORIN Committed, thanks. > --- > support/scripts/pkg-stats | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index 9a4a3ccad5..53898a36f2 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -1290,7 +1290,7 @@ def __main__(): > package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) > else: > package_list = None > - date = datetime.datetime.now(datetime.UTC) > + date = datetime.datetime.now(datetime.timezone.utc) > commit = subprocess.check_output(['git', '-C', brpath, > 'rev-parse', > 'HEAD']).splitlines()[0].decode() > -- > 2.43.2 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 16:05:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:05:29 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: fix running on older python versions In-Reply-To: <20240228224459.2383336-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 28 Feb 2024 23:44:59 +0100") References: <20240228224459.2383336-1-yann.morin.1998@free.fr> Message-ID: <87h6hrdzna.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Commit f71d9f49e546 (support/scripts/pkg-stats: fix datetime deprecation > warning) forgot to consider that the datetime.UTC suggested by python > 3.12, was only introduced with python 3.11. > However, we are still generating the daily report on a python 3.8 > version, which fails at runtime: > AttributeError: module 'datetime' has no attribute 'UTC' > It turns out that datetime.UTC is just an alias for datetime.timezone.utc, > which seems to have existed since before python3... > Use datetime.timezone.utc instead of its alias. > Signed-off-by: Yann E. MORIN Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 16:06:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:06:08 +0100 Subject: [Buildroot] [PATCH] package/ccache: disable building tests In-Reply-To: <20240228200216.715455-1-buildroot@bubu1.eu> (Marcus Hoffmann via buildroot's message of "Wed, 28 Feb 2024 21:02:16 +0100") References: <20240228200216.715455-1-buildroot@bubu1.eu> Message-ID: <87cysfdzm7.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Signed-off-by: Marcus Hoffmann Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 16:07:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:07:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/libheif: fix libjpeg build In-Reply-To: <20240228174721.1141838-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 28 Feb 2024 18:47:21 +0100") References: <20240228174721.1141838-1-fontaine.fabrice@gmail.com> Message-ID: <878r33dzj8.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libheif raises the following build failure with libjpeg since bump to > version 1.17.5 in commit 5714126edac88e3adc043a482b262b319a907dd3 and > https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 > /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: > In function 'heif_error jpeg_encode_image(void*, const heif_image*, > heif_image_input_class)': > /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: > error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka > 'unsigned int*'} [-fpermissive] > 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); > | ^~~~~~~~~~ > | | > | long unsigned int* > Fixes: > - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 16:05:59 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:05:59 +0100 Subject: [Buildroot] [git commit] package/ccache: disable building tests Message-ID: <20240229160814.86DDC87DDF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa443e82513d6f094ecf89f97d34f877c49c8167 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/ccache/ccache.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index ac4bc4aba5..96b1b65c5c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -16,7 +16,8 @@ HOST_CCACHE_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER \ -DZSTD_FROM_INTERNET=OFF \ - -DHIREDIS_FROM_INTERNET=OFF + -DHIREDIS_FROM_INTERNET=OFF \ + -DENABLE_TESTING=OFF # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR From peter at korsgaard.com Thu Feb 29 16:04:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:04:29 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: fix running on older python versions Message-ID: <20240229160814.7BF7187DDE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4983f9e73e17c162b85fa4ed55fc5ff13d491130 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit f71d9f49e546 (support/scripts/pkg-stats: fix datetime deprecation warning) forgot to consider that the datetime.UTC suggested by python 3.12, was only introduced with python 3.11. However, we are still generating the daily report on a python 3.8 version, which fails at runtime: AttributeError: module 'datetime' has no attribute 'UTC' It turns out that datetime.UTC is just an alias for datetime.timezone.utc, which seems to have existed since before python3... Use datetime.timezone.utc instead of its alias. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9a4a3ccad5..53898a36f2 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1290,7 +1290,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.now(datetime.UTC) + date = datetime.datetime.now(datetime.timezone.utc) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() From peter at korsgaard.com Thu Feb 29 16:07:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:07:16 +0100 Subject: [Buildroot] [git commit] package/libheif: fix libjpeg build Message-ID: <20240229160814.91DB887DE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd5d1f5b6ae8d9765520728e4995897940c86b05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libheif raises the following build failure with libjpeg since bump to version 1.17.5 in commit 5714126edac88e3adc043a482b262b319a907dd3 and https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); | ^~~~~~~~~~ | | | long unsigned int* Fixes: - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...plugins-encoder_jpeg.cc-fix-libjpeg-build.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch new file mode 100644 index 0000000000..5245327fe7 --- /dev/null +++ b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch @@ -0,0 +1,47 @@ +From 33eb948240365434c845b618854403e82a229012 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 31 Jan 2024 21:04:37 +0100 +Subject: [PATCH] libheif/plugins/encoder_jpeg.cc: fix libjpeg build + +Fix the following libjpeg build failure raised since version 1.17.0 and +https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 +because third argument of jpeg_mem_dest is defined as size_t* on libjpeg +instead of unsigned long* on jpeg-turbo: + +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] + 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); + | ^~~~~~~~~~ + | | + | long unsigned int* + +Fix #1008 and #1086 + +Fixes: + - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/strukturag/libheif/pull/1120 +--- + libheif/plugins/encoder_jpeg.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libheif/plugins/encoder_jpeg.cc b/libheif/plugins/encoder_jpeg.cc +index d6c7854..21a5541 100644 +--- a/libheif/plugins/encoder_jpeg.cc ++++ b/libheif/plugins/encoder_jpeg.cc +@@ -360,7 +360,11 @@ struct heif_error jpeg_encode_image(void* encoder_raw, const struct heif_image* + } + + uint8_t* outbuffer = nullptr; ++#ifdef LIBJPEG_TURBO_VERSION + unsigned long outlength = 0; ++#else ++ size_t outlength = 0; ++#endif + + jpeg_create_compress(&cinfo); + jpeg_mem_dest(&cinfo, &outbuffer, &outlength); +-- +2.43.0 + From gsmecher at threespeedlogic.com Thu Feb 29 16:53:10 2024 From: gsmecher at threespeedlogic.com (Graeme Smecher) Date: Thu, 29 Feb 2024 08:53:10 -0800 Subject: [Buildroot] [PATCH v2] linux.mk: Allow wildcards in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH In-Reply-To: References: Message-ID: <20240229165310.1453209-1-gsmecher@threespeedlogic.com> There are a few config/ entries where wildcards are already present: $ grep -rle 'BR2_LINUX_KERNEL_CUSTOM_DTS_PATH=.*\*' configs/ configs/octavo_osd32mp1_brk_defconfig configs/octavo_osd32mp1_red_defconfig ...however, while the copy-in step of device tree compilation works correctly, these wildcards are not converted to DTC build targets in the kernel build. As a result, this configuration line alone is not enough to generate DTCs. It should be. This patch adds a $(wildcard) expansion step into generation of DTB compilation targets (the LINUX_DTB_NAME variable). As a result, wildcards behave correctly. Signed-off-by: Graeme Smecher Reviewed-by: Alexander Sverdlin --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 1db5c6046d..80881597ad 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -195,7 +195,7 @@ LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be # copied to arch//boot/dts, but only the .dts files will # actually be generated as .dtb. -LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) +LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(wildcard $(call qstrip, $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))) LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME)) -- 2.39.2 From yann.morin.1998 at free.fr Thu Feb 29 17:12:57 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 29 Feb 2024 18:12:57 +0100 Subject: [Buildroot] [PATCHv2] support/scripts/cve: fix running on older ijson versions Message-ID: <20240229171302.2565579-1-yann.morin.1998@free.fr> Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) had to change the decompressor from gz to xz, as the new location is using xz compression. That commit mentioned that it was spawning an external xz process to do the decompression, on the pretence that "there is no xz decompressor in Python stdlib." Before version 3.1, ijson.items() only accepted a file-like object as input (that file-like object could yield bytes() or str(), both were supported). Starting with version 3.1, ijson.items() also accepts that it be directly passed bytesd() or str() directly. subprocess.check_output() means we are now passing bytes() to ijson.items(), so it fails on ijson versions before 3.1, with failures such as: [...] File "/usr/lib/python3/dist-packages/ijson/backends/python.py", line 25, in Lexer if type(f.read(0)) == bytetype: AttributeError: 'bytes' object has no attribute 'read' Ubuntu 20.04, on which the pkg-stats run to generate the daily report, only has ijson 2.3. More recent distros have more recent versions of ijson, like Fedora 39 that has 3.2.3, recent enough to support being fed bytes(). Commit 22b69455526f was tested on Fedora 39, so did not catch the issue. However, the reasoning in 22b69455526f is wrong: there *is* the lzma module, at least since python 3.3 (that is, aeons ago), which is able to read xz-compressed files; it also has an API similar to the gzip module, and can provide a file-like object that exposes the decompressed data. So, do just that: provide an lzma-wrapped file-like object to ijson, so that we can eventually recover our daily reports that everything is broken! :-] Note that this construct still works on recent versions! Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) --- Changes v1 -> v2: - reword commit log to explain that bytes() and str() can be passed direclty, and that it is not about whether the file-like object returns either --- support/scripts/cve.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 1a3c307e12..7167ecbc6a 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -21,8 +21,8 @@ import datetime import os import requests # URL checking import distutils.version +import lzma import time -import subprocess import sys import operator @@ -134,8 +134,7 @@ class CVE: for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'cve_items.item') + content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise -- 2.43.2 From peter at korsgaard.com Thu Feb 29 17:48:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 18:48:30 +0100 Subject: [Buildroot] [PATCHv2] support/scripts/cve: fix running on older ijson versions In-Reply-To: <20240229171302.2565579-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Thu, 29 Feb 2024 18:12:57 +0100") References: <20240229171302.2565579-1-yann.morin.1998@free.fr> Message-ID: <874jdrduvl.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for > the JSON files) had to change the decompressor from gz to xz, as the new > location is using xz compression. > That commit mentioned that it was spawning an external xz process to do > the decompression, on the pretence that "there is no xz decompressor in > Python stdlib." > Before version 3.1, ijson.items() only accepted a file-like object as > input (that file-like object could yield bytes() or str(), both were > supported). Starting with version 3.1, ijson.items() also accepts that > it be directly passed bytesd() or str() directly. subprocess.check_output() s/bytesd/bytes/. Committed with that fixed, thanks! -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 17:47:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 18:47:16 +0100 Subject: [Buildroot] [git commit] support/scripts/cve: fix running on older ijson versions Message-ID: <20240229174906.0907B87CC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f253e3e04e57d72f470eead8591a2606f98d396 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) had to change the decompressor from gz to xz, as the new location is using xz compression. That commit mentioned that it was spawning an external xz process to do the decompression, on the pretence that "there is no xz decompressor in Python stdlib." Before version 3.1, ijson.items() only accepted a file-like object as input (that file-like object could yield bytes() or str(), both were supported). Starting with version 3.1, ijson.items() also accepts that it be directly passed bytes() or str() directly. subprocess.check_output() means we are now passing bytes() to ijson.items(), so it fails on ijson versions before 3.1, with failures such as: [...] File "/usr/lib/python3/dist-packages/ijson/backends/python.py", line 25, in Lexer if type(f.read(0)) == bytetype: AttributeError: 'bytes' object has no attribute 'read' Ubuntu 20.04, on which the pkg-stats run to generate the daily report, only has ijson 2.3. More recent distros have more recent versions of ijson, like Fedora 39 that has 3.2.3, recent enough to support being fed bytes(). Commit 22b69455526f was tested on Fedora 39, so did not catch the issue. However, the reasoning in 22b69455526f is wrong: there *is* the lzma module, at least since python 3.3 (that is, aeons ago), which is able to read xz-compressed files; it also has an API similar to the gzip module, and can provide a file-like object that exposes the decompressed data. So, do just that: provide an lzma-wrapped file-like object to ijson, so that we can eventually recover our daily reports that everything is broken! :-] Note that this construct still works on recent versions! Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- support/scripts/cve.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 1a3c307e12..7167ecbc6a 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -21,8 +21,8 @@ import datetime import os import requests # URL checking import distutils.version +import lzma import time -import subprocess import sys import operator @@ -134,8 +134,7 @@ class CVE: for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'cve_items.item') + content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise From bobrofon at gmail.com Thu Feb 29 19:21:38 2024 From: bobrofon at gmail.com (Sergey Bobrenok) Date: Thu, 29 Feb 2024 22:21:38 +0300 Subject: [Buildroot] [PATCH 1/1] package/basu: new package Message-ID: <20240229192138.21843-1-bobrofon@gmail.com> basu is the sd-bus library, extracted from systemd. Some projects rely on the sd-bus library for DBus support. However not all systems have systemd or elogind installed. This library provides just sd-bus (and the busctl utility). Signed-off-by: Sergey Bobrenok --- DEVELOPERS | 1 + package/Config.in | 1 + ...ble-stack-protection-for-Buildroot-p.patch | 39 +++++++++++++++++++ ...-F_ADD_SEALS-definition-from-missing.patch | 34 ++++++++++++++++ package/basu/Config.in | 23 +++++++++++ package/basu/basu.hash | 4 ++ package/basu/basu.mk | 28 +++++++++++++ 7 files changed, 130 insertions(+) create mode 100644 package/basu/0001-meson.build-Disable-stack-protection-for-Buildroot-p.patch create mode 100644 package/basu/0002-memfd-util.c-Use-F_ADD_SEALS-definition-from-missing.patch create mode 100644 package/basu/Config.in create mode 100644 package/basu/basu.hash create mode 100644 package/basu/basu.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0bfe91f064..a869c7b42d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2779,6 +2779,7 @@ F: package/systemd F: support/scripts/pkg-stats N: Sergey Bobrenok +F: package/basu/ F: package/sdbus-cpp/ N: Sergey Matyukevich diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..5b89d895d0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2086,6 +2086,7 @@ menu "Other" source "package/armadillo/Config.in" source "package/atf/Config.in" source "package/avro-c/Config.in" + source "package/basu/Config.in" source "package/bctoolbox/Config.in" source "package/bdwgc/Config.in" source "package/belr/Config.in" diff --git a/package/basu/0001-meson.build-Disable-stack-protection-for-Buildroot-p.patch b/package/basu/0001-meson.build-Disable-stack-protection-for-Buildroot-p.patch new file mode 100644 index 0000000000..34dd3b16b9 --- /dev/null +++ b/package/basu/0001-meson.build-Disable-stack-protection-for-Buildroot-p.patch @@ -0,0 +1,39 @@ +From 6133c87299bce32c13dcf1692842ea5f2890c5ad Mon Sep 17 00:00:00 2001 +From: Sergey Bobrenok +Date: Wed, 28 Feb 2024 16:29:17 +0300 +Subject: [PATCH] meson.build: Disable stack protection for Buildroot packaging + +In Buildroot, the SSP flags are passed via the wrapper, and only flags +supported by the toolchain will be used. So the SSP flags can be +safely removed from the build files. + +Fixes: + src/basic/libbasic.a.p/log.c.o: in function `write_to_console.isra.0': + log.c:(.text.write_to_console.isra.0+0x154): undefined reference to `__stack_chk_fail_local' + +Upstream: N/A [Buildroot specific] + +Signed-off-by: Sergey Bobrenok +--- + meson.build | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 6f79707..51fd400 100644 +--- a/meson.build ++++ b/meson.build +@@ -75,9 +75,6 @@ possible_cc_flags = [ + '-fdiagnostics-show-option', + '-fno-strict-aliasing', + '-fvisibility=hidden', +- '-fstack-protector', +- '-fstack-protector-strong', +- '--param=ssp-buffer-size=4', + ] + + # --as-needed and --no-undefined are provided by meson by default, + +base-commit: 684a41d68cfbb05e38aacb60a8548e21ddfbecdb +-- +2.43.2 + diff --git a/package/basu/0002-memfd-util.c-Use-F_ADD_SEALS-definition-from-missing.patch b/package/basu/0002-memfd-util.c-Use-F_ADD_SEALS-definition-from-missing.patch new file mode 100644 index 0000000000..69e899279f --- /dev/null +++ b/package/basu/0002-memfd-util.c-Use-F_ADD_SEALS-definition-from-missing.patch @@ -0,0 +1,34 @@ +From 8e4960e8b9d11d9be96e83b02bd3b08178ddce1b Mon Sep 17 00:00:00 2001 +From: Sergey Bobrenok +Date: Wed, 28 Feb 2024 20:42:19 +0300 +Subject: [PATCH basu] memfd-util.c: Use F_ADD_SEALS definition from missing.h + +uClibc and glibc (until version 2.27, 2018) implementations don't +support F_ADD_SEALS and other F_SEAL_xxx flags. +'missing.h' was removed from 'memfd-util.c' in 37dbb2fcb ("Remove +useless includes"). + +Upstream: https://lists.sr.ht/~emersion/public-inbox/patches/49899 + +Signed-off-by: Sergey Bobrenok +--- + src/basic/memfd-util.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c +index 89893ba..7e535c6 100644 +--- a/src/basic/memfd-util.c ++++ b/src/basic/memfd-util.c +@@ -7,6 +7,7 @@ + + #include "alloc-util.h" + #include "memfd-util.h" ++#include "missing.h" + + int memfd_set_sealed(int fd) { + #if defined(__FreeBSD__) && __FreeBSD__ < 13 + +base-commit: 684a41d68cfbb05e38aacb60a8548e21ddfbecdb +-- +2.44.0 + diff --git a/package/basu/Config.in b/package/basu/Config.in new file mode 100644 index 0000000000..5875aa7775 --- /dev/null +++ b/package/basu/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_BASU + bool "basu" + depends on BR2_USE_MMU # dbus + depends on BR2_USE_WCHAR # uchar.h + depends on BR2_ENABLE_LOCALE # locale_t + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_add_and_fetch + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # F_ADD_SEALS + select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime + help + basu is the sd-bus library, extracted from systemd. + + Some projects rely on the sd-bus library for DBus support. + However not all systems have systemd or elogind installed. + This library provides just sd-bus (and the busctl utility). + + https://git.sr.ht/~emersion/basu + +comment "basu needs a toolchain w/ wchar, locale, threads, headers >= 3.17" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 diff --git a/package/basu/basu.hash b/package/basu/basu.hash new file mode 100644 index 0000000000..f369286337 --- /dev/null +++ b/package/basu/basu.hash @@ -0,0 +1,4 @@ +# From https://git.sr.ht/~emersion/basu/refs/v0.2.1 +sha256 d9b373a9fcb5d5eb5f6c1c56355f76edb7f2f52bc744570e80604e83455a19bd basu-0.2.1.tar.gz +# Locally computed: +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/basu/basu.mk b/package/basu/basu.mk new file mode 100644 index 0000000000..7bd1923646 --- /dev/null +++ b/package/basu/basu.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# basu +# +################################################################################ + +BASU_VERSION = 0.2.1 +BASU_SITE = https://git.sr.ht/~emersion/basu/refs/download/v$(BASU_VERSION) +BASU_INSTALL_STAGING = YES +BASU_LICENSE = LGPL-2.1+ +BASU_LICENSE_FILES = LICENSE.LGPL2.1 +BASU_DEPENDENCIES = host-gperf + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +BASU_DEPENDENCIES += libcap +BASU_CONF_OPTS += -Dlibcap=enabled +else +BASU_CONF_OPTS += -Dlibcap=disabled +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +BASU_DEPENDENCIES += audit +BASU_CONF_OPTS += -Daudit=enabled +else +BASU_CONF_OPTS += -Daudit=disabled +endif + +$(eval $(meson-package)) -- 2.44.0 From yann.morin.1998 at free.fr Thu Feb 29 19:22:13 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 29 Feb 2024 20:22:13 +0100 Subject: [Buildroot] [PATCH 1/2] package/rust: use host libraries from HOST_DIR In-Reply-To: References: <20240229131108.363533-1-romain.naour@smile.fr> Message-ID: Romain, All, On 2024-02-29 14:43 +0100, Romain Naour spake thusly: > Le 29/02/2024 ? 14:35, yann.morin at orange.com a ?crit?: > > On 2024-02-29 14:11 +0100, Romain Naour spake thusly: > >> host-rust package depends on several host packages to provide tools and > >> libraries but it doesn't take into account HOST_DIR while building rustc > >> compiler. Indeed, rustc needs zlib and fail to link if zlib is not > >> installed on the host. [--SNIP--] > > But then, we would also need to add host-zlib to > > HOST_RUST_DEPENDENCIES, no? > Indeed but in practice host-zlib is already an "indirect" dependency of > host-rust due to host-openssl (host-libopenssl) dependency. When a package has a dependency on a library for itself, we must add an explicit dependency in that package, even if it is transitively brought by another, like is the case here. So we do want that host-rust depends on host-zlib explicitly. > HOST_LIBOPENSSL_DEPENDENCIES = host-zlib > > I noticed the missing dependency but forgot to add it in HOST_RUST_DEPENDENCIES. Mark this patch as Changes-requested, then! ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Thu Feb 29 21:31:15 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 29 Feb 2024 22:31:15 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: only install fsidd binary and unit file with enabled nfsd In-Reply-To: <20240228181409.3756293-1-sairon@sairon.cz> References: <20240228181409.3756293-1-sairon@sairon.cz> Message-ID: <5d375ded-707c-4d56-a5af-f7f769083014@benettiengineering.com> Hi Jan, thank you for the contribution, On 28/02/24 19:14, Jan ?erm?k wrote: > Unit file for the FSID daemon depends on the nfs-server.service, which is > removed without BR2_PACKAGE_NFS_UTILS_RPC_NFSD enabled. Also don't install > the fsidd service binary without nfsd enabled. regarding the commit log(I'm not that good at it but I give a try) what about: ``` FSID daemon and its systemd unit file both depend on BR2_PACKAGE_NFS_UTILS_RPC_NFSD at the moment they are installed in any case. So let's remove them both when BR2_PACKAGE_NFS_UTILS_RPC_NFSD is disabled. ``` > > Signed-off-by: Jan ?erm?k For the rest it looks good to me, I've build tested it and it works as expected so: Reviewed-by: Giulio Benetti Can you please send a V2 with improved commit log? Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > --- > package/nfs-utils/nfs-utils.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > index 4f2b41c782..b757e3e51d 100644 > --- a/package/nfs-utils/nfs-utils.mk > +++ b/package/nfs-utils/nfs-utils.mk > @@ -42,7 +42,8 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug > NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd > NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad > NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \ > - usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service > + usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service \ > + usr/sbin/fsidd usr/lib/systemd/system/fsidd.service > > ifeq ($(BR2_PACKAGE_NFS_UTILS_NFSV4),y) > NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41 From peter at korsgaard.com Thu Feb 29 21:56:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:56:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2: force arm mode instead of Thumb mode In-Reply-To: <20240131203739.2092971-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 21:37:39 +0100") References: <20240131203739.2092971-1-fontaine.fabrice@gmail.com> Message-ID: <87zfvjc4ui.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure in Thumb mode: > /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers > 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers > | ^~~~~ > Fixes: > - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e > - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Thu Feb 29 21:56:41 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 29 Feb 2024 22:56:41 +0100 Subject: [Buildroot] [PATCH 1/1] boot/shim: force arm mode instead of Thumb mode Message-ID: <20240229215641.330203-1-fontaine.fabrice@gmail.com> Use OPTIMIZATIONS parameter to pass -marm to fix the following build failure in Thumb mode: /tmp/ccEjPM4h.s:941: Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode CFLAGS can't be overridden as it is defined as: CFLAGS = $(FEATUREFLAGS) \ $(OPTIMIZATIONS) \ $(WARNFLAGS) \ $(if $(findstring clang,$(CC)),$(CLANG_WARNINGS)) \ $(ARCH_CFLAGS) \ $(WERRFLAGS) \ $(INCLUDES) \ $(DEFINES) Fixes: - http://autobuild.buildroot.org/results/580156f89cfd72122fef07aa2fe37b4fdd4c316b - http://autobuild.buildroot.org/results/8980c0f422516c7263d8d0c9cc6123f30c4b7ee4 Signed-off-by: Fabrice Fontaine --- boot/shim/shim.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index 19b11f4086..ae57677320 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -13,10 +13,19 @@ SHIM_CPE_ID_VENDOR = redhat SHIM_INSTALL_TARGET = NO SHIM_INSTALL_IMAGES = YES +SHIM_CFLAGS = $(TARGET_CFLAGS) SHIM_MAKE_OPTS = \ ARCH="$(GNU_EFI_PLATFORM)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - DASHJ="-j$(PARALLEL_JOBS)" + DASHJ="-j$(PARALLEL_JOBS)" \ + OPTIMIZATIONS="$(SHIM_CFLAGS)" + +# shim has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SHIM_CFLAGS += -marm +endif define SHIM_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(SHIM_MAKE_OPTS) -- 2.43.0 From peter at korsgaard.com Thu Feb 29 21:57:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:57:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.18 In-Reply-To: <20240206203031.851666-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 21:30:31 +0100") References: <20240206203031.851666-1-fontaine.fabrice@gmail.com> Message-ID: <87v867c4s7.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP > in their default configuration allows the arbitrary writing of files. By > exploiting these combination of primitives, an attacker can execute > arbitrary code. > https://netatalk.io/CVE-2022-22995 > https://netatalk.io/3.1/ReleaseNotes3.1.18 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 21:57:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:57:10 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/netatalk: security bump to version 3.1.18 Message-ID: <20240229215745.058DA87DCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=771af4d22973e4dc6d33c6ee75718ab10e94f0d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP in their default configuration allows the arbitrary writing of files. By exploiting these combination of primitives, an attacker can execute arbitrary code. https://netatalk.io/CVE-2022-22995 https://netatalk.io/3.1/ReleaseNotes3.1.18 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 1e472e0872a71395cf8a3541b5883081e929bc11) Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.hash | 8 ++++---- package/netatalk/netatalk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index a35e6bc36c..9ab5d604a8 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.17/ -md5 a6429a28948f85b69c9012fb437dd9c2 netatalk-3.1.17.tar.xz -sha1 bc6578d9fa874b3816fd4ddd60a30a8f3aadc71d netatalk-3.1.17.tar.xz +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ +md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz +sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz # Locally computed -sha256 8c208e2c94bf3047db33cdbc3ce4325d2b80db61d6cc527f18f9dbd8e95b5cff netatalk-3.1.17.tar.xz +sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 40e64dabeb..53cd53876a 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.17 +NETATALK_VERSION = 3.1.18 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config From peter at korsgaard.com Thu Feb 29 21:54:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:54:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/sdl2: force arm mode instead of Thumb mode Message-ID: <20240229215744.E93ED87DF3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff6150db0a3c7aa342c9a308942745632657798a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fix the following build failure in Thumb mode: /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ecedc4ae8c0632cdd9ba0bf63a64a51e67a1525b) Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 5f2e1e0ed1..4e7494b3d2 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -54,6 +54,10 @@ SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SDL2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) SDL2_DEPENDENCIES += udev SDL2_CONF_OPTS += --enable-libudev @@ -76,7 +80,7 @@ endif ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config +SDL2_CONF_ENV += ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config else SDL2_CONF_OPTS += --disable-video-directfb endif From peter at korsgaard.com Thu Feb 29 21:53:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:53:50 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/sdl2: force arm mode instead of Thumb mode Message-ID: <20240229215915.256EF87B4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d8292c2291e6ba2741ccc3a166b572a8db64a0c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix the following build failure in Thumb mode: /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ecedc4ae8c0632cdd9ba0bf63a64a51e67a1525b) Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 4646e7d1f8..42b4a433e8 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -54,6 +54,10 @@ SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SDL2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) SDL2_DEPENDENCIES += udev SDL2_CONF_OPTS += --enable-libudev @@ -76,7 +80,7 @@ endif ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config +SDL2_CONF_ENV += ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config else SDL2_CONF_OPTS += --disable-video-directfb endif From peter at korsgaard.com Thu Feb 29 21:56:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:56:53 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/netatalk: security bump to version 3.1.18 Message-ID: <20240229215915.2F90387DAB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ab4ea64fed369877c65532714e717eedf197a2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP in their default configuration allows the arbitrary writing of files. By exploiting these combination of primitives, an attacker can execute arbitrary code. https://netatalk.io/CVE-2022-22995 https://netatalk.io/3.1/ReleaseNotes3.1.18 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 1e472e0872a71395cf8a3541b5883081e929bc11) Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.hash | 8 ++++---- package/netatalk/netatalk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index a35e6bc36c..9ab5d604a8 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.17/ -md5 a6429a28948f85b69c9012fb437dd9c2 netatalk-3.1.17.tar.xz -sha1 bc6578d9fa874b3816fd4ddd60a30a8f3aadc71d netatalk-3.1.17.tar.xz +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ +md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz +sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz # Locally computed -sha256 8c208e2c94bf3047db33cdbc3ce4325d2b80db61d6cc527f18f9dbd8e95b5cff netatalk-3.1.17.tar.xz +sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 40e64dabeb..53cd53876a 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.17 +NETATALK_VERSION = 3.1.18 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config From peter at korsgaard.com Thu Feb 29 22:00:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 23:00:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-esptool: add CPE variables In-Reply-To: <20240206210641.878279-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 22:06:41 +0100") References: <20240206210641.878279-1-fontaine.fabrice@gmail.com> Message-ID: <87r0gvc4mn.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 22:01:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 23:01:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.6.0 In-Reply-To: <20240206204209.864622-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 21:42:08 +0100") References: <20240206204209.864622-1-fontaine.fabrice@gmail.com> Message-ID: <87msrjc4mb.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Security fixes: > - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can > cause denial of service, in partial where dealing with compressed XML > input. Applications that parsed a document in one go -- a single call > to functions XML_Parse or XML_ParseBuffer -- were not affected. The > smaller the chunks/buffers you use for parsing previously, the bigger > the problem prior to the fix. > - CVE-2023-52426: Fix billion laughs attacks for users compiling > *without* XML_DTD defined (which is not common). Users with XML_DTD > defined have been protected since Expat >=2.4.0 (and that was > CVE-2013-0340 back then). > https://blog.hartwork.org/posts/expat-2-6-0-released/ > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 22:00:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 23:00:01 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-esptool: add CPE variables Message-ID: <20240229220114.CA51287E1C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82969b61891b66ee272940000592682127748eaf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 81fab735aee5d052e02a1304fb537b001c7d69c4) Signed-off-by: Peter Korsgaard --- package/python-esptool/python-esptool.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index c0709c64b1..cefed065a4 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -10,5 +10,7 @@ PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/a3/63/c757f50b6069 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE +PYTHON_ESPTOOL_CPE_ID_VENDOR = espressif +PYTHON_ESPTOOL_CPE_ID_PRODUCT = esptool $(eval $(python-package)) From peter at korsgaard.com Thu Feb 29 21:59:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:59:12 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/expat: security bump to version 2.6.0 Message-ID: <20240229220114.B6F2A87E1B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aef9df6cacbf0e2e266d73ed49ae0c51dc569c64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Security fixes: - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can cause denial of service, in partial where dealing with compressed XML input. Applications that parsed a document in one go -- a single call to functions XML_Parse or XML_ParseBuffer -- were not affected. The smaller the chunks/buffers you use for parsing previously, the bigger the problem prior to the fix. - CVE-2023-52426: Fix billion laughs attacks for users compiling *without* XML_DTD defined (which is not common). Users with XML_DTD defined have been protected since Expat >=2.4.0 (and that was CVE-2013-0340 back then). https://blog.hartwork.org/posts/expat-2-6-0-released/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 9dad5e7d7f7bc03e648621b9be6974e7ae39a467) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index c6c25aa3e0..043501378b 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.5.0/ -md5 ac6677b6d1b95d209ab697ce8b688704 expat-2.5.0.tar.xz -sha1 5178e13c1e34f4643d5118d5758babfe0e836fe2 expat-2.5.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.0/ +md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz +sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz # Locally calculated -sha256 ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 6f22024cc0..5f4016e0d1 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.5.0 +EXPAT_VERSION = 2.6.0 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 29 21:59:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:59:32 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/expat: security bump to version 2.6.0 Message-ID: <20240229220220.9DC7987E23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=631ed7b7be884e218bc175e00bf096e4fb411c4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Security fixes: - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can cause denial of service, in partial where dealing with compressed XML input. Applications that parsed a document in one go -- a single call to functions XML_Parse or XML_ParseBuffer -- were not affected. The smaller the chunks/buffers you use for parsing previously, the bigger the problem prior to the fix. - CVE-2023-52426: Fix billion laughs attacks for users compiling *without* XML_DTD defined (which is not common). Users with XML_DTD defined have been protected since Expat >=2.4.0 (and that was CVE-2013-0340 back then). https://blog.hartwork.org/posts/expat-2-6-0-released/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 9dad5e7d7f7bc03e648621b9be6974e7ae39a467) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index c6c25aa3e0..043501378b 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.5.0/ -md5 ac6677b6d1b95d209ab697ce8b688704 expat-2.5.0.tar.xz -sha1 5178e13c1e34f4643d5118d5758babfe0e836fe2 expat-2.5.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.0/ +md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz +sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz # Locally calculated -sha256 ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 6f22024cc0..5f4016e0d1 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.5.0 +EXPAT_VERSION = 2.6.0 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 29 21:59:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:59:54 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-esptool: add CPE variables Message-ID: <20240229220220.A94EC87E24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cb7360f760a0f7d5ecfb85fe51c54c0233822c16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 81fab735aee5d052e02a1304fb537b001c7d69c4) Signed-off-by: Peter Korsgaard --- package/python-esptool/python-esptool.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index 0a71e1a78b..a8b3cbc1d6 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -10,5 +10,7 @@ PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/8b/4c/82d7fe5fa064 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE +PYTHON_ESPTOOL_CPE_ID_VENDOR = espressif +PYTHON_ESPTOOL_CPE_ID_PRODUCT = esptool $(eval $(python-package)) From romain.naour at smile.fr Thu Feb 29 22:41:20 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 23:41:20 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/rust/rust.mk: add missing host-zlib dependency Message-ID: <20240229224122.1085300-1-romain.naour@smile.fr> Several rust tool are linking against zlib, so add the depedency explicitely in HOST_RUST_DEPENDENCIES. For now, host-rust build system is not able to find provided by Buildroot in HOST_DIR due to at least two issues that will be fixed in followup commits. Signed-off-by: Romain Naour --- v2: new commit --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index f7a5c0fcd5..16a397407f 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -20,6 +20,7 @@ HOST_RUST_DEPENDENCIES = \ host-python3 \ host-rust-bin \ host-openssl \ + host-zlib \ $(BR2_CMAKE_HOST_DEPENDENCY) HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) -- 2.43.2 From romain.naour at smile.fr Thu Feb 29 22:41:21 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 23:41:21 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/rust: use host libraries from HOST_DIR In-Reply-To: <20240229224122.1085300-1-romain.naour@smile.fr> References: <20240229224122.1085300-1-romain.naour@smile.fr> Message-ID: <20240229224122.1085300-2-romain.naour@smile.fr> host-rust package depends on several host packages to provide tools and libraries but it doesn't take into account HOST_DIR while building rustc compiler. Indeed, rustc needs zlib and fail to link if zlib is not installed on the host. error: could not compile `rustc_driver` (lib) due to previous error If zlib is installed on the host, we can notice it with ldd tool (while it should be linked with the one provided by Buildroot host-zlib). ldd [...]TestRust/host/bin/rustc libz.so.1 => /lib64/libz.so.1 Provide HOST_LDFLAGS using llvm.ldflags in config.toml. (HOST_LDFLAGS provide -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib) With that fixed, rustc_driver link with libz from HOST_DIR but the host-rust build still fail later due to another issue. error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545 http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0 Signed-off-by: Romain Naour --- v2: no change --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 16a397407f..4903060368 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -65,6 +65,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ echo 'ninja = false'; \ + echo 'ldflags = "$(HOST_LDFLAGS)"'; \ ) > $(@D)/config.toml endef -- 2.43.2 From romain.naour at smile.fr Thu Feb 29 22:41:22 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 23:41:22 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/rust: provide RUSTFLAGS for cargo In-Reply-To: <20240229224122.1085300-1-romain.naour@smile.fr> References: <20240229224122.1085300-1-romain.naour@smile.fr> Message-ID: <20240229224122.1085300-3-romain.naour@smile.fr> While building the rust toolchain, the build system endup using cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo) to build some tool like rustdoc-tool. But the host-rust package doesn't use the cargo infractructure (since it provide cargo binary) and some cargo environment varialble [1] is not set to crosscompile cargo packages in the rust toolchain. For exemple, we usually set RUSTFLAGS="-C link-arg=-Wl,-rpath,$(HOST_DIR)/lib" to force cargo using libraries provided by Buildroot in $(HOST_DIR)/lib. RUSTFLAGS is actually needed to find zlib library (host-zlib) to link rustdoc-tool when zlib is not installed on the host. Fixes: error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.02-rc1/package/pkg-cargo.mk?ref_type=tags#L167 Signed-off-by: Romain Naour --- v2: no change --- package/rust/rust.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 4903060368..394fbfa4ca 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -70,7 +70,9 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build + cd $(@D); $(HOST_MAKE_ENV) \ + RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \ + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef HOST_RUST_INSTALL_OPTS = \ -- 2.43.2 From peter at korsgaard.com Thu Feb 1 11:00:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 01 Feb 2024 12:00:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpsl: fix legal info In-Reply-To: <20240131204704.2099316-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 21:47:04 +0100") References: <20240131204704.2099316-1-fontaine.fabrice@gmail.com> Message-ID: <87h6iswith.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 863131cad9fec0a54a4b4281f5fa3cd5ed8ea462 forgot to update hash of > COPYING (update in year with: > https://github.com/rockdaboot/libpsl/commit/80c17cc237861318a680ae170995d44a11029dad) > Fixes: > - http://autobuild.buildroot.org/results/2b09ca88a08fdba8ca75153688ed5dd9362c7520 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 1 11:01:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 01 Feb 2024 12:01:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/cpio: fix tar.bz2 hash In-Reply-To: <20240131211939.2222338-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 22:19:39 +0100") References: <20240131211939.2222338-1-fontaine.fabrice@gmail.com> Message-ID: <87cytgwiru.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit b0306d94b29d6f5e08735db0448019f9f4e4234b forgot to update > cpio-2.13.tar.bz2 to cpio-2.14.tar.bz2 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 1 11:01:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 01 Feb 2024 12:01:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.11.5 In-Reply-To: <20240131210645.2212414-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 22:06:45 +0100") References: <20240131210645.2212414-1-fontaine.fabrice@gmail.com> Message-ID: <878r44wir0.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2024-22211 > - Update Upstream tag in patches > https://github.com/FreeRDP/FreeRDP/blob/2.11.5/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 1 11:02:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 12:02:36 +0100 Subject: [Buildroot] [PATCH 1/2] package/glibc: add CVE ignore for CVE-2023-4806 In-Reply-To: <20240131081254.175261-1-peter@korsgaard.com> References: <20240131081254.175261-1-peter@korsgaard.com> Message-ID: <93dd1849-3725-4bf1-b411-55f175e40471@korsgaard.com> On 31/01/2024 09.12, Peter Korsgaard wrote: > Commit 8519de517e22 (package/{glibc, localedef}: security bump to version > glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701) correctly mentioned > CVE-2023-4806 in the commit message, but forgot to add an ignore for it. > > Fix that. > > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 1 11:02:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 12:02:53 +0100 Subject: [Buildroot] [PATCH 2/2] package/{glibc, localedef}: security bump to version glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 In-Reply-To: <20240131081254.175261-2-peter@korsgaard.com> References: <20240131081254.175261-1-peter@korsgaard.com> <20240131081254.175261-2-peter@korsgaard.com> Message-ID: <9a26b0d0-120f-4ff9-b72f-7b99edbca93c@korsgaard.com> On 31/01/2024 09.12, Peter Korsgaard wrote: > Fixed the following security issues: > > CVE-2023-6246: syslog: Fix heap buffer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD > > CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD > > CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD > > For details, see the Qualys advisory: > https://www.openwall.com/lists/oss-security/2024/01/30/6 > > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 1 11:00:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 12:00:58 +0100 Subject: [Buildroot] [git commit] package/cpio: fix tar.bz2 hash Message-ID: <20240201110345.11E3F866FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0694cef47b4942447fa8532f55e11e5fcae48f2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit b0306d94b29d6f5e08735db0448019f9f4e4234b forgot to update cpio-2.13.tar.bz2 to cpio-2.14.tar.bz2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cpio/cpio.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cpio/cpio.hash b/package/cpio/cpio.hash index 20fd9392e7..c67fbc1f61 100644 --- a/package/cpio/cpio.hash +++ b/package/cpio/cpio.hash @@ -1,6 +1,6 @@ # From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00001.html sha1 cbac50a61079b6f3bdcf9ffe42171d9257cfe877 cpio-2.14.tar.bz2 # Locally calculated after checking pgp signature -sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.13.tar.bz2 +sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.14.tar.bz2 # Locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING From peter at korsgaard.com Thu Feb 1 10:58:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 11:58:42 +0100 Subject: [Buildroot] [git commit] package/glibc: add CVE ignore for CVE-2023-4806 Message-ID: <20240201110344.E3D6D866F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62b767fd3ed27d245937066f77ec53bd0b1e9329 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 8519de517e22 (package/{glibc, localedef}: security bump to version glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701) correctly mentioned CVE-2023-4806 in the commit message, but forgot to add an ignore for it. Fix that. Signed-off-by: Peter Korsgaard --- package/glibc/glibc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 596697bb8f..d49da6457c 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -28,6 +28,10 @@ GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) # 2.38 and the version we're really using GLIBC_IGNORE_CVES += CVE-2023-4527 +# Fixed by 5ee59ca371b99984232d7584fe2b1a758b4421d3, which is between +# 2.38 and the version we're really using +GLIBC_IGNORE_CVES += CVE-2023-4806 + # Fixed by 750a45a783906a19591fb8ff6b7841470f1f5710, which is between # 2.38 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-4911 From peter at korsgaard.com Thu Feb 1 10:58:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 11:58:51 +0100 Subject: [Buildroot] [git commit] package/{glibc, localedef}: security bump to version glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 Message-ID: <20240201110344.EE01B864DF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75e7c7ba8cddb2644350a7f59c943f5c4e99b3b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: CVE-2023-6246: syslog: Fix heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD For details, see the Qualys advisory: https://www.openwall.com/lists/oss-security/2024/01/30/6 Signed-off-by: Peter Korsgaard --- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 14 +++++++++++++- package/localedef/localedef.mk | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 00d9f1c985..15ae55b9e6 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 fd991e43997ff6e4994264c3cbc23fa87fa28b1b3c446eda8fc2d1d3834a2cfb glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701.tar.gz +sha256 e38f4284d6909c6b5db7d79c6e450daeaf136a67e547290eec0b063a55eaaa42 glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d49da6457c..d198d6f04c 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701 +GLIBC_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -40,6 +40,18 @@ GLIBC_IGNORE_CVES += CVE-2023-4911 # 2.38 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-5156 +# Fixed by 23514c72b780f3da097ecf33a793b7ba9c2070d2, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6246 + +# Fixed by d0338312aace5bbfef85e03055e1212dd0e49578, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6779 + +# Fixed by d37c2b20a4787463d192b32041c3406c2bd91de0, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6780 + # All these CVEs are considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index ed6d4b4968..c017c0e00e 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701 +LOCALEDEF_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From peter at korsgaard.com Thu Feb 1 11:01:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 12:01:23 +0100 Subject: [Buildroot] [git commit] package/freerdp: security bump to version 2.11.5 Message-ID: <20240201110345.20F4486704@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dbe037dc9998155373b0a96687c55982f9c1a536 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fix CVE-2024-22211 - Update Upstream tag in patches https://github.com/FreeRDP/FreeRDP/blob/2.11.5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 --- package/freerdp/0001-Fix-variable-declaration-in-loop.patch | 3 +-- package/freerdp/0002-Fixed-variable-declaration-in-loop.patch | 3 +-- .../freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch | 2 +- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 55a55752a2..a95aaf262c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -415,9 +415,6 @@ package/flite/0001-fix-alsa-static.patch Upstream package/fltk/0001-disable-tests.patch Upstream package/fluxbox/0001-fixes-bug-1138.patch Upstream package/freeradius-client/0001-fix-for-nettle.patch Upstream -package/freerdp/0001-Fix-variable-declaration-in-loop.patch Upstream -package/freerdp/0002-Fixed-variable-declaration-in-loop.patch Upstream -package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch Upstream package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch Upstream package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch Upstream package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables diff --git a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch index a391e42ee6..799a92734b 100644 --- a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch +++ b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: Armin Novak Date: Wed, 16 Sep 2020 09:30:37 +0200 Subject: [PATCH] Fix variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 3 ++- diff --git a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch index 14e1d6c8f4..1a4e899430 100644 --- a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch +++ b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: akallabeth Date: Tue, 22 Sep 2020 07:43:56 +0200 Subject: [PATCH] Fixed variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 4 ++-- diff --git a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch index d8dfe13d1b..63434e58f7 100644 --- a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch +++ b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/31e770a330158035e24b7b952bec0030138482b7 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FreeRDP/FreeRDP/pull/7205] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/0976cce458f2281cef6e8c417daf4bbd22bcc087 --- winpr/include/winpr/file.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 02268f55ea..daf933e0af 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.0.tar.gz.sha256 -sha256 8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e freerdp-2.11.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.5.tar.gz.sha256 +sha256 70785ad9934d75aed1734f8918a05aff95788e58e53081e84651106b24303dc2 freerdp-2.11.5.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 6f71ef796f..29b33f61c3 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.0 +FREERDP_VERSION = 2.11.5 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From peter at korsgaard.com Thu Feb 1 10:59:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 1 Feb 2024 11:59:22 +0100 Subject: [Buildroot] [git commit] package/libpsl: fix legal info Message-ID: <20240201110345.05719866FC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ffb716da34a4c2c87fe47f6cce7b718d5217354 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 863131cad9fec0a54a4b4281f5fa3cd5ed8ea462 forgot to update hash of COPYING (update in year with: https://github.com/rockdaboot/libpsl/commit/80c17cc237861318a680ae170995d44a11029dad) Fixes: - http://autobuild.buildroot.org/results/2b09ca88a08fdba8ca75153688ed5dd9362c7520 Signed-off-by: Fabrice Fontaine Reviewed-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/libpsl/libpsl.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash index d800ba6a77..caf760c496 100644 --- a/package/libpsl/libpsl.hash +++ b/package/libpsl/libpsl.hash @@ -2,5 +2,5 @@ sha256 1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208 libpsl-0.21.5.tar.gz # Hashes for license files: -sha256 776cd11d54f0ea3e5efdd25ff1a0d952a1744215bb5858ea7aeb91808e70c9f7 COPYING +sha256 322392e6001b2b3b0fca705dc9f11f26e12441188ecde50eb1d22909980b2925 COPYING sha256 1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3 src/LICENSE.chromium From thierry.bultel at linatsea.fr Thu Feb 1 12:41:48 2024 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Thu, 1 Feb 2024 13:41:48 +0100 Subject: [Buildroot] dracut: no longer works since bump to 059 Message-ID: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> Hi, since bump to this version, invocation of 'ldd' wrapper fails in dracut-install. After analysis, this is because version uses "execlp" for launching the 'ldd' wrapper variable, which in out case consists in the executable name + the rootfs argument, leading to the fault. Version 057 used to call "popen" instead that what Ok with that. Thierry -- Re: test www.linatsea.fr -- www.linatsea.fr -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: penguin.png Type: image/png Size: 60087 bytes Desc: not available URL: From thierry.bultel at linatsea.fr Thu Feb 1 13:07:48 2024 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Thu, 1 Feb 2024 14:07:48 +0100 Subject: [Buildroot] Systemd unit complains about cgroup with 5.15.x kernel Message-ID: <9a9a9c97-156a-49e1-bdcd-43ed22580778@linatsea.fr> Hi, I am using systemd 254.5, buildroot and currently using a kernel vendor branch : git at github.com:varigit/linux-imx.git lf-5.15.y_var01 imx_v7_defconfig I have verified that every options fixed by SYSTEM_CONFIG_FIXUPS have been set accordingly ---> systemd is failing to start some units: systemd[1]: wpa_supplicant.service: Failed to create cgroup /system.slice/wpa_supplicant.service: No such file or directory and also; ?(agetty)[217]: serial-getty at ttymxc0.service: Failed to attach to cgroup /system.slice/system-serial\x2dgetty.slice/serial-getty at ttymxc0.service: No medium found ... and I do not have a serial console. I am currently digging into systemd code to find out what is possibly wrong .. but if anyone gets a clue, I would appreciate ! Thanks ! Thierry -- Re: test From qiusihao23 at mails.ucas.ac.cn Thu Feb 1 15:11:37 2024 From: qiusihao23 at mails.ucas.ac.cn (=?UTF-8?B?6YKx5oCd6LGq?=) Date: Thu, 1 Feb 2024 23:11:37 +0800 (GMT+08:00) Subject: [Buildroot] Use Clang as toolchain for buildroot Message-ID: <524bf2c.ae1d.18d6539b773.Coremail.qiusihao23@mails.ucas.ac.cn> Hi, I am new to the embedding things, and I'm looking to use buildroot to get c/c++ packages compiled with multiple parameters like compiler, architecture and optimization level, for academic purpose. E.g, in my dataset, Binutils 2.32 will be compiled in [gcc11, arm64, O0], [gcc11, arm64, O1], ... along with other variable settings. I noticed that buildroot can set most of variables in .config file, but regarding adding external toolchains, information are relatively insufficient. I would like to know if there are some ways to add compilers like clang into the phase of building target packages. -------------- next part -------------- An HTML attachment was scrubbed... URL: From qiusihao23 at mails.ucas.ac.cn Thu Feb 1 15:26:03 2024 From: qiusihao23 at mails.ucas.ac.cn (=?UTF-8?B?6YKx5oCd6LGq?=) Date: Thu, 1 Feb 2024 23:26:03 +0800 (GMT+08:00) Subject: [Buildroot] Use Clang as toolchain for buildroot Message-ID: <7b899b93.ae5f.18d6546ee9a.Coremail.qiusihao23@mails.ucas.ac.cn> Hi, I'm not sure if my original letter sent by my another mail account reached properly, I'm sorry if this is a duplicate one. I'm new to the embedding things, and I'm looking to use buildroot to get c/c++ packages compiled with multiple parameters like compiler, architecture and optimization level, for academic purpose. E.g, in my dataset, Binutils 2.32 will be compiled in [gcc11, arm64, O0], [gcc11, arm64, O1], ... along with other variable settings. I noticed that buildroot can set most of variables in .config file, but regarding adding external toolchains, information are relatively insufficient. I would like to know if there are some ways to add compilers like clang into the phase of building target packages. -------------- next part -------------- An HTML attachment was scrubbed... URL: From fontaine.fabrice at gmail.com Thu Feb 1 17:20:51 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:20:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvips: update LIBVIPS_CPE_ID_VENDOR Message-ID: <20240201172051.165994-1-fontaine.fabrice@gmail.com> cpe:2.3:a:libvips_project:libvips has been deprecated in favor of cpe:2.3:a:libvips:libvips in September 2023: libvips Project libvips 8.10.6 - Project Change Log Signed-off-by: Fabrice Fontaine --- package/libvips/libvips.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 1a0f9d5ead..8eb1f0964e 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -9,7 +9,7 @@ LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -LIBVIPS_CPE_ID_VENDOR = libvips_project +LIBVIPS_CPE_ID_VENDOR = libvips # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 17:42:05 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:42:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR Message-ID: <20240201174205.180556-1-fontaine.fabrice@gmail.com> cpe:2.3:a:kernel:wireless-regdb added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb Signed-off-by: Fabrice Fontaine --- package/wireless-regdb/wireless-regdb.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index e9003ce2e6..5c8ef96398 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -9,7 +9,6 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE -WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 17:44:32 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:44:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR Message-ID: <20240201174432.182161-1-fontaine.fabrice@gmail.com> cpe:2.3:a:kernel:linux-firmware added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware Signed-off-by: Fabrice Fontaine --- package/linux-firmware/linux-firmware.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 58fbaab1d7..60e8861abe 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel - # Intel SST DSP ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 17:46:41 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:46:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/crda: drop CRDA_CPE_ID_VENDOR Message-ID: <20240201174641.183601-1-fontaine.fabrice@gmail.com> cpe:2.3:a:kernel:crda added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda Signed-off-by: Fabrice Fontaine --- package/crda/crda.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/crda/crda.mk b/package/crda/crda.mk index a73c9aa26d..8043260cfc 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -9,7 +9,6 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE -CRDA_CPE_ID_VENDOR = kernel define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 17:48:29 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:48:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/depot-tools: drop DEPOT_TOOLS_CPE_ID_VENDOR Message-ID: <20240201174829.184788-1-fontaine.fabrice@gmail.com> cpe:2.3:a:google:depot-tools added by commit 48730a1a9d882a7c56146bd2955e074aed790dcb has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:google:depot-tools Signed-off-by: Fabrice Fontaine --- package/depot-tools/depot-tools.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index 634258ffbb..a53afa14d6 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -9,7 +9,6 @@ DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause DEPOT_TOOLS_LICENSE_FILES = LICENSE -DEPOT_TOOLS_CPE_ID_VENDOR = google HOST_DEPOT_TOOLS_DEPENDENCIES = \ host-python3 \ -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 17:52:02 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 18:52:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpfr: fix CPE variables Message-ID: <20240201175202.186929-1-fontaine.fabrice@gmail.com> cpe:2.3:a:gnu:mpfr added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE identifier for this package cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF Signed-off-by: Fabrice Fontaine --- package/mpfr/mpfr.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 8d12c7502b..c0c8c04646 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -9,7 +9,8 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER -MPFR_CPE_ID_VENDOR = gnu +MPFR_CPE_ID_VENDOR = mpfr +MPFR_CPE_ID_PRODUCT = gnu_mpfr MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp -- 2.43.0 From fontaine.fabrice at gmail.com Thu Feb 1 21:43:04 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 22:43:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: fix CPE variable Message-ID: <20240201214304.301544-1-fontaine.fabrice@gmail.com> Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR Signed-off-by: Fabrice Fontaine --- package/lvm2/lvm2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index ee43cb6c19..02ea748439 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB -LVM2_CPE_ID_PRODUCT = redhat +LVM2_CPE_ID_VENDOR = redhat LVM2_SELINUX_MODULES = lvm # Make sure that binaries and libraries are installed with write -- 2.43.0 From kris at embeddedts.com Thu Feb 1 21:59:54 2024 From: kris at embeddedts.com (Kris Bahnsen) Date: Thu, 01 Feb 2024 13:59:54 -0800 Subject: [Buildroot] [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 Message-ID: <399bbbdbc865bb5fab6fa7dbdad653f9aa240da2.camel@embeddedTS.com> >From 55e8d294997af933bb3d832b73229bebefa45044 Mon Sep 17 00:00:00 2001 From: Kris Bahnsen Date: Thu, 1 Feb 2024 20:46:39 +0000 Subject: [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 Release changelog: - Use default values for IQ calibration correction when the eFuse register has zero values. - Fix for "WILC1000 Firmware initialization issue" by updating the PMU clock switching sequence during firmware initialization. Signed-off-by: Kris Bahnsen --- package/wilc-firmware/wilc-firmware.hash | 2 +- package/wilc-firmware/wilc-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc-firmware/wilc-firmware.hash index 802cb4f9b1..8a7957a1d2 100644 --- a/package/wilc-firmware/wilc-firmware.hash +++ b/package/wilc-firmware/wilc-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0 wilc-firmware-wilc_linux_16_1.tar.gz +sha256 6cd5fc52150520bedb736f58124063041b4d9849ea33481a8b075f51aec64f8e wilc-firmware-wilc_linux_16_1_2.tar.gz sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc-firmware/wilc-firmware.mk index 12c825cf92..3381162bbd 100644 --- a/package/wilc-firmware/wilc-firmware.mk +++ b/package/wilc-firmware/wilc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -WILC_FIRMWARE_VERSION = wilc_linux_16_1 +WILC_FIRMWARE_VERSION = wilc_linux_16_1_2 WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) WILC_FIRMWARE_LICENSE = PROPRIETARY -- 2.34.1 From fontaine.fabrice at gmail.com Thu Feb 1 22:16:59 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 1 Feb 2024 23:16:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/minizip: fix CPE variables Message-ID: <20240201221659.320957-1-fontaine.fabrice@gmail.com> cpe:2.3:a:minizip_project:minizip added by commit 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 Signed-off-by: Fabrice Fontaine --- package/minizip/minizip.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 5a4d920369..819b33b701 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -14,7 +14,8 @@ MINIZIP_CONF_OPTS = \ -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project +MINIZIP_CPE_ID_VENDOR = zlib-ng +MINIZIP_CPE_ID_PRODUCT = minizip-ng ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 -- 2.43.0 From stefan at ott.net Fri Feb 2 02:02:57 2024 From: stefan at ott.net (Stefan Ott) Date: Fri, 2 Feb 2024 03:02:57 +0100 Subject: [Buildroot] [PATCH v3] package/sway: make systemd optional Message-ID: <20240202020258.600562-1-stefan@ott.net> Sway works perfectly fine without it. Signed-off-by: Stefan Ott --- Changes v2 -> v3: - Make BR2_PACKAGE_SWAY_SWAYBAR_TRAY depend on systemd and set sd-bus-provider=libsystemd if SWAY_SWAYBAR_TRAY is enabled Changes v1 -> v2: - Automatically enable systemd integration for builds with systemd support (suggested by Thomas Petazzoni) --- package/sway/Config.in | 10 ++++++---- package/sway/sway.mk | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/sway/Config.in b/package/sway/Config.in index 4f6d9fb215..f11c473fa8 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_SWAY bool "sway" - depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider depends on !BR2_STATIC_LIBS # wlroots depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wlroots depends on BR2_PACKAGE_HAS_LIBEGL # wlroots @@ -42,9 +41,13 @@ if BR2_PACKAGE_SWAY_SWAYBAR config BR2_PACKAGE_SWAY_SWAYBAR_TRAY bool "swaybar tray" + depends on BR2_PACKAGE_SYSTEMD help Enable support for swaybar tray +comment "swaybar tray needs systemd" + depends on !BR2_PACKAGE_SYSTEMD + endif # BR2_PACKAGE_SWAY_SWAYBAR config BR2_PACKAGE_SWAY_SWAYNAG @@ -54,9 +57,8 @@ config BR2_PACKAGE_SWAY_SWAYNAG endif # BR2_PACKAGE_SWAY -comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" - depends on !BR2_PACKAGE_SYSTEMD || \ - !BR2_PACKAGE_HAS_UDEV || \ +comment "sway needs udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_HAS_UDEV || \ !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ !BR2_PACKAGE_HAS_LIBGLES diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 0aad9de712..87a01002f0 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -8,13 +8,12 @@ SWAY_VERSION = 1.8.1 SWAY_SITE = https://github.com/swaywm/sway/releases/download/$(SWAY_VERSION) SWAY_LICENSE = MIT SWAY_LICENSE_FILES = LICENSE -SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango +SWAY_DEPENDENCIES = host-pkgconf wlroots json-c pcre cairo pango SWAY_CONF_OPTS = \ -Dwerror=false \ -Dzsh-completions=false \ -Dfish-completions=false \ - -Dman-pages=disabled \ - -Dsd-bus-provider=libsystemd + -Dman-pages=disabled ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) SWAY_CONF_OPTS += -Dxwayland=enabled @@ -54,7 +53,8 @@ SWAY_CONF_OPTS += -Dswaynag=false endif ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y) -SWAY_CONF_OPTS += -Dtray=enabled +SWAY_DEPENDENCIES += systemd +SWAY_CONF_OPTS += -Dtray=enabled -Dsd-bus-provider=libsystemd else SWAY_CONF_OPTS += -Dtray=disabled endif -- 2.43.0 From qiusihao23 at mails.ucas.ac.cn Fri Feb 2 06:21:18 2024 From: qiusihao23 at mails.ucas.ac.cn (=?UTF-8?B?6YKx5oCd6LGq?=) Date: Fri, 2 Feb 2024 14:21:18 +0800 (GMT+08:00) Subject: [Buildroot] Is host-clang available for compiling other packages In-Reply-To: <7b899b93.ae5f.18d6546ee9a.Coremail.qiusihao23@mails.ucas.ac.cn> References: <7b899b93.ae5f.18d6546ee9a.Coremail.qiusihao23@mails.ucas.ac.cn> Message-ID: <2a6ae556.25c81.18d687a8cb8.Coremail.qiusihao23@mails.ucas.ac.cn> I noticed that there is a 'host-clang' package. I wonder if it can be used when compiling other packages. For now, I simply add 'CC = "$(HOST_DIR)/bin/clang" in some packages' .mk file, but seem no use when compiling. The folder generated after 'make host-clang' cannot be used for sysroot either. -----????----- ???:"???" ????:2024-02-01 23:26:03 (???) ???: buildroot at buildroot.org ??: ??: Use Clang as toolchain for buildroot Hi, I'm not sure if my original letter sent by my another mail account reached properly, I'm sorry if this is a duplicate one. I'm new to the embedding things, and I'm looking to use buildroot to get c/c++ packages compiled with multiple parameters like compiler, architecture and optimization level, for academic purpose. E.g, in my dataset, Binutils 2.32 will be compiled in [gcc11, arm64, O0], [gcc11, arm64, O1], ... along with other variable settings. I noticed that buildroot can set most of variables in .config file, but regarding adding external toolchains, information are relatively insufficient. I would like to know if there are some ways to add compilers like clang into the phase of building target packages. -------------- next part -------------- An HTML attachment was scrubbed... URL: From thomas.petazzoni at bootlin.com Fri Feb 2 06:53:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 02 Feb 2024 06:53:45 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-01 Message-ID: <20240202065351.6074440AA5@smtp2.osuosl.org> Hello, Autobuild statistics for 2024-02-01 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 0 | 3 | 0 | 3 | 2023.11.x | 1 | 3 | 0 | 4 | master | 33 | 50 | 0 | 83 | Classification of failures by reason for master ----------------------------------------------- libressl-3.8.2 | 6 axel-2.17.12 | 4 stunnel-5.71 | 4 attr-2.5.2 | 3 host-rust-1.74.1 | 3 linux-5.10.162-cip24-rt10 | 2 linux-6.6.14 | 2 openssh-9.6p1 | 2 package/libpsl/libpsl.mk:33... | 2 elfutils-0.189 | 1 fs/jffs2/jffs2.mk:71: /home... | 1 glibc-2.38-27-g750a45a78390... | 1 glibc-2.38-44-gd37c2b20a478... | 1 glibmm-2.76.0 | 1 gobject-introspection-1.76.1 | 1 host-sentry-cli-2.20.3 | 1 ipmitool-1_8_19 | 1 kvmtool-f77d646ba01d04be5aa... | 1 libcamera-apps-1.2.1 | 1 libtracefs-1.8.0 | 1 linux-5.10.162-cip24 | 1 lttng-modules-2.13.10 | 1 Makefile:727: target-finalize | 1 memtest86-6.20 | 1 ngrep-1.47 | 1 rygel-0.40.2 | 1 samba4-4.19.3 | 1 tcf-agent-1.8.0 | 1 unknown | 1 wampcc-1.6 | 1 zeek-4.1.1 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/9af7e787e8077936b1a05259f729582a9614b2af | microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/790d67ae8ea9e8fbc8ed8cdd328b9532bb100607 | microblaze | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/0a77d44e6eb2f91c9d4388ddb45a04922dd51b16 | x86_64 | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/662fa6c7782f5f7a9f22de33bd5bec8c3291aa08 | arceb | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/a0aea4bbdebd5de6f76ffe6e51c6e10248fd97ba | arm | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/0a1298ef932038a7424546d7008797bf59c7d42c | or1k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/4f7e1014a63e969ed01ed48cfeb82cdb0e8830d9 | microblazeel | elfutils-0.189 | NOK | http://autobuild.buildroot.net/results/6cfbaff48595f92e9dce9f886ea0f2401e49036f | ORPH arm | fs/jffs2/jffs2.mk:71: /home... | NOK | http://autobuild.buildroot.net/results/f03996539ddf219d274039f3dc29bcbf8c008ada | powerpc | glibc-2.38-27-g750a45a78390... | NOK | http://autobuild.buildroot.net/results/d2646173c7705f617cf3825cd728d8ae5b43c5f3 | arceb | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/69af5f9dac22874aeb3970e8875b9e913e3b3bdd | i686 | glibmm-2.76.0 | NOK | http://autobuild.buildroot.net/results/1486a0bde352dc7e555810d9e4741f0e95a5e333 | m68k | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/d15742461101ecc0c57b61126a3d9d8b73a2a34a | ORPH mipsel | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/80949b0782347964226daff0cb6070a6ff08f33d | sparc64 | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/d1d3149b131d147d9483884227086649e2b01f2d | aarch64 | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/f2755733475bc6e07e257ad40519591a41947db6 | xtensa | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/b98b846918ce8ed92e1afd7c1ca2ce98eb00a8d4 | nios2 | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/41b3ea01cd6639200508f5684b02af78e5562acf | i686 | kvmtool-f77d646ba01d04be5aa... | NOK | http://autobuild.buildroot.net/results/94282249b3be51322adae66911982f833b25c192 | ORPH x86_64 | libcamera-apps-1.2.1 | NOK | http://autobuild.buildroot.net/results/e6eecef2753bcf5b925acc2f5bbd313c169d5eb0 | or1k | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/ca5e1df65fb5c571c6448efb897b182fc7266734 | ORPH mips64el | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/ed379db9c4aa6b18cb66be632b8d0ba52e5f7197 | ORPH powerpc64le | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/918e1000aac7c22bb1dd4a5f7c189f4358eede11 | ORPH arceb | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/31f3479f2cac64440635eea3d9c55f90f701ff34 | ORPH arc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/5c2eb577770ce0fdcfef670d99902c29992c36d7 | ORPH sh4a | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/15ecb7a4b257f2bb74eaebc060eeef1aa463bf22 | ORPH mips64el | libtracefs-1.8.0 | NOK | http://autobuild.buildroot.net/results/21ee0fa42aaef4220cbcc0b7fc2c72029cdefab1 | aarch64_be | linux-5.10.162-cip24 | NOK | http://autobuild.buildroot.net/results/4a2cf86b3a3b8d85125db1c436a6c65927f93073 | ORPH or1k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/5bc0c9daaa34c037a0746805ab7ecb8d9a8ed681 | ORPH m68k | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/b818ff6cbb6e69b6bd8f5187778cf641821858bc | ORPH mipsel | linux-6.6.14 | NOK | http://autobuild.buildroot.net/results/62b336d0f8cb23e276685e6322cbc42a715e9542 | ORPH powerpc | linux-6.6.14 | NOK | http://autobuild.buildroot.net/results/d4d7397ef1d858ea3fcf42945b42881938cff63b | ORPH mips64el | lttng-modules-2.13.10 | NOK | http://autobuild.buildroot.net/results/2988c4250697e33032e134abfe7dc6d29729d40e | aarch64_be | Makefile:727: target-finalize | NOK | http://autobuild.buildroot.net/results/d4d926952d5c6f1516762406b1cfa3bd00035966 | x86_64 | memtest86-6.20 | NOK | http://autobuild.buildroot.net/results/d1c29928fffd88aab08b462b045a07c0ee80651e | armeb | ngrep-1.47 | NOK | http://autobuild.buildroot.net/results/4e93773aa6d3a9659e0278769cbfe6e5dfe27513 | powerpc64 | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/48c925b17ce4b722c0706abb94cc69b2cced8292 | ORPH powerpc64 | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/77cf67c68b2e9205a2d6d0143650a6c28e6eb40b | ORPH sh4eb | package/libpsl/libpsl.mk:33... | NOK | http://autobuild.buildroot.net/results/92e260c94cd4014fb8aa0301c0f6d65797c62a36 | or1k | package/libpsl/libpsl.mk:33... | NOK | http://autobuild.buildroot.net/results/9ddf8f6c324687c3df14368f97cb8a7fab765e16 | s390x | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/42f5056c0fc18e73e8c92f257e4a05b894e8f297 | m68k | samba4-4.19.3 | NOK | http://autobuild.buildroot.net/results/1425154816d1b63aa106c98e3e365a0da502576a | aarch64_be | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/3c6f8fb2c78967a19bc1ad856fe5f8ff3535773c | powerpc64 | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/65d6dd016dbe9069cae16bca535c54d8112cee46 | mips | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/54a3df17f5131e0bd1111db0d18052fe5c5fd91b | x86_64 | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/b5a1b55bc2b0b8457cdb84412ac357c6799139fe | powerpc64 | tcf-agent-1.8.0 | NOK | http://autobuild.buildroot.net/results/363b4a241f25f21a2c4fa35f38e138ad41bf7562 | arc | unknown | NOK | http://autobuild.buildroot.net/results/a78f55a73117b484e9287f7b846a891b804688c4 | or1k | wampcc-1.6 | NOK | http://autobuild.buildroot.net/results/d1ed86ff9d984c0c17936f322552120764244f77 | ORPH aarch64 | zeek-4.1.1 | NOK | http://autobuild.buildroot.net/results/b5c744a9fc9ace759333bb5a02b1aff66c6f3f92 | Classification of failures by reason for 2023.02.x -------------------------------------------------- glibc-2.36-118-g22955ad8518... | 1 imagemagick-7.1.1-21 | 1 mariadb-10.11.6 | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arc | glibc-2.36-118-g22955ad8518... | NOK | http://autobuild.buildroot.net/results/283ca78053d7add977661777f4a4748473b3e167 | sh4 | imagemagick-7.1.1-21 | NOK | http://autobuild.buildroot.net/results/c52223d0e0265bcf821d6d63bed606c48250ce61 | ORPH microblazeel | mariadb-10.11.6 | NOK | http://autobuild.buildroot.net/results/609251bc1ef18dd4300ca7a99d614f7369741d84 | ORPH Classification of failures by reason for 2023.11.x -------------------------------------------------- linux-6.6.11 | 2 glibc-2.38-27-g750a45a78390... | 1 Detail of failures for 2023.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64 | glibc-2.38-27-g750a45a78390... | NOK | http://autobuild.buildroot.net/results/b9d5226616ab30b0f4f62bbf016416e452d09d85 | s390x | linux-6.6.11 | NOK | http://autobuild.buildroot.net/results/4080bc9c1267e5413ca52bf5e5d378d5ac578608 | ORPH riscv32 | linux-6.6.11 | NOK | http://autobuild.buildroot.net/results/b343cfb567f91cdf57c368b5a3423840bdeb5497 | ORPH -- http://autobuild.buildroot.net From antoine.coutant at smile.fr Fri Feb 2 09:36:19 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:19 +0100 Subject: [Buildroot] [PATCH v4 1/7] package/meson: bump version to 1.3.1 In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-2-antoine.coutant@smile.fr> The meson upgrade from 1.1.1 to 1.2.0 have been reverted because host-qemu (version v8.0.3) was searching libraries in the build machine instead of buildroot host directory [1]. $ grep -r LINK_ARGS * | grep "\-L/usr" build.ninja: LINK_ARGS = -L/usr/lib/gcc/x86_64-linux-gnu/10 \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../../lib -L/usr/lib \ -L/lib/x86_64-linux-gnu \ -L/lib/../lib \ -L/usr/lib/../lib \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../.. \ -L/lib \ -I/[...]/host/include \ -L/[...]/host/lib \ -I/[...]/host/include/libfdt \ ... Upgrading qemu to version v8.1.0 solves the problem: $ grep -r LINK_ARGS * | grep "\-L/usr" build.ninja: LINK_ARGS = -I/[...]/host/include \ -L/[...]/host/lib \ -I/[...]/host/include/libfdt \ ... Those two tests were done with the same buildroot version (2023.08) on the same machine were the bug appeared. Using, git bisect, in this environment, it was found that the problem was fixed in qemu by the commit [2]. Thus, it is possible that the problem was introduced by improper use of meson by qemu <= v8.0.3. Also, meson has been updated to version 1.2.1 and 1.3.0 in yocto and it doesn't seem to create any issue. [3] The original problem is no longer present and some projects require meson > 1.1.1 (e.g. rusticl requires meson 1.2.0 since mesa 23.3.0 and meson 1.3.1 since mesa 24.0.0). "pkgconfig" field is deprecated by meson 1.3.0 and replaced by "pkg-config". See: [4] The patch that adds the pkg_config_static property has been rebased. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/acfdf21f0b752e844a33c70a0fd2f82f4534a5a0 [2] https://gitlab.com/qemu-project/qemu/-/commit/Fc9a809e0d28417fa1e7f7efc19f845bda4c1be9 [3] https://github.com/yoctoproject/poky/commits/master/meta/recipes-devtools/meson [4] https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig Signed-off-by: Antoine Coutant --- Changes v3 -> v4: - cross-compilation.conf.in have been changed. - Bump version from 1.3.0 to 1.3.1. Signed-off-by: Antoine Coutant --- ...dencies-base.py-add-pkg_config_stati.patch | 29 ++++++++++--------- package/meson/meson.hash | 4 +-- package/meson/meson.mk | 2 +- support/misc/cross-compilation.conf.in | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch index 8e15d3210c..49a0ef93dc 100644 --- a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +++ b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -1,4 +1,4 @@ -From 3d6a2db2270346236dd6247e0648ea0c949ba468 Mon Sep 17 00:00:00 2001 +From 59934e2116e025ecfe23baf6febc4a0eb85f60cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static @@ -20,24 +20,25 @@ Signed-off-by: Fabrice Fontaine Signed-off-by: Romain Naour [Rebased on 0.57.1] Signed-off-by: Peter Seiderer +[rebased on 1.3.0] +Signed-off-by: Antoine Coutant --- - mesonbuild/dependencies/pkgconfig.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + mesonbuild/dependencies/pkgconfig.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py -index 1e8d9132e..d902ba215 100644 +index e86206b88..94888657d 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py -@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency): - env = None - libcmd = ['--libs'] - -- if self.static: -+ if self.static or \ -+ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): - libcmd.append('--static') - - libcmd.append(self.name) +@@ -169,7 +169,7 @@ class PkgConfigCLI(PkgConfigInterface): + env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1' + args: T.List[str] = [] + args += self._define_variable_args(define_variable) +- if static: ++ if static or (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): + args.append('--static') + args += ['--libs', name] + ret, out, err = self._call_pkgbin(args, env=env) -- 2.25.1 diff --git a/package/meson/meson.hash b/package/meson/meson.hash index cb36b674fa..150fd6d1bb 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc -sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc +sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 503aca8c25..467569d28b 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.1.1 +MESON_VERSION = 1.3.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 7053df472b..a58ab553d0 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -10,7 +10,7 @@ ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' cmake = '@BR2_CMAKE@' fortran = '@TARGET_FC@' -pkgconfig = '@PKGCONF_HOST_BINARY@' +pkg-config = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:20 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:20 +0100 Subject: [Buildroot] [PATCH v4 2/7] package/pkg-meson.mk: add rust cross-compiler support In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-3-antoine.coutant@smile.fr> From: Romain Naour This change is needed to be able to build target packages requiring rust. If a package has rust in its project or in an add_language() call in their meson.build file, meson will try to find a suitable compiler for this language[1]. If the language is classified as required but not found, it will abort the build. It is necessary to specify rust and rust_ld separately in support/misc/cross-compilation.conf.in. If you specify it in one line just as "rust", it will generate the following warning: WARNING: Please do not put -C linker= in your compiler command, set rust_ld=command in your cross file or use the RUST_LD environment variable, otherwise meson will override your selection. [1] https://mesonbuild.com/Reference-manual_functions.html#add_languages Signed-off-by: Romain Naour Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant --- package/pkg-meson.mk | 13 +++++++++++++ support/misc/cross-compilation.conf.in | 2 ++ 2 files changed, 15 insertions(+) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 65cabf23ba..25dd4f0d7f 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -82,6 +82,16 @@ else PKG_MESON_TARGET_FC = /bin/false endif +ifeq ($(BR2_PACKAGE_HOST_RUSTC),y) +PKG_MESON_TARGET_RUSTC = $(HOST_DIR)/bin/rustc +PKG_MESON_TARGET_RUSTC_LINKER = $(notdir $(TARGET_CROSS))gcc +PKG_MESON_TARGET_RUSTC_TARGET_NAME = $(RUSTC_TARGET_NAME) +else +PKG_MESON_TARGET_RUSTC = /bin/false +PKG_MESON_TARGET_RUSTC_LINKER = /bin/false +PKG_MESON_TARGET_RUSTC_TARGET_NAME = +endif + # Generates sed patterns for patching the cross-compilation.conf template, # since Flags might contain commas the arguments are passed indirectly by # variable name (stripped to deal with whitespaces). @@ -91,6 +101,7 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CXX@%$(PKG_MESON_TARGET_CXX)%g" \ -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ -e "s%@TARGET_FC@%$(PKG_MESON_TARGET_FC)%g" \ + -e "s%@TARGET_RUSTC@%$(PKG_MESON_TARGET_RUSTC)%g" \ -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ @@ -99,6 +110,8 @@ define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@TARGET_RUSTC_LINKER@%$(PKG_MESON_TARGET_RUSTC_LINKER)%g" \ + -e "s%@RUSTC_TARGET_NAME@%$(PKG_MESON_TARGET_RUSTC_TARGET_NAME)%g" \ -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index a58ab553d0..21cec10b82 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -13,6 +13,8 @@ fortran = '@TARGET_FC@' pkg-config = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' +rust = ['@TARGET_RUSTC@', '--target', '@RUSTC_TARGET_NAME@' ] +rust_ld = '@TARGET_RUSTC_LINKER@' [built-in options] c_args = [@TARGET_CFLAGS@] -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:18 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:18 +0100 Subject: [Buildroot] [PATCH v4 0/7] Adding RustiCL Message-ID: <20240202093625.1409559-1-antoine.coutant@smile.fr> RustiCL requires meson >= 1.2.1 and will soon require meson >= 1.3.1 (when mesa will be upgraded to version 24.0.x). The problems that appeared with host-qemu don't exist anymore. So, I think that meson must be upgraded. While testing RustiCL on the khadas vim3, I encountered a problem with mesa clc cross-compilation and made a merge request that just got accepted. The 3 added patches are from this MR. (https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25568.) This new version of the patch series changes the way OpenCL is selected. When an implementation is available (Clover or Rusticl), a menuconfig appears. Then, it is possible to select Clover and/or RustiCL. Both can be selected at the same time thanks to OpenCL-ICD-Loader. RusitCL have been tested on the khadas vim 3. Using ?khadas_vim3_defconfig? with bootlin toolchain ?aarch64 glibc bleeding-edge 2023.11-1?. I hope that this series will be merged during the FOSDEM buildroot meeting. Indeed, I'm not sure that I will have time to work on this after the 5th of march. Also, I wrote an article in French to explain how RustiCL works. It can allow (French speakers) to understand what it does and why it requires its dependencies. https://www.linuxembedded.fr/2024/01/introduction-a-opencl-et-rusticl Antoine Coutant (2): package/meson: bump version to 1.3.1 package/llvm-project: add opencl-c-base.h on target Romain Naour (3): package/pkg-meson.mk: add rust cross-compiler support package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib package/mesa3d: add RustiCL support Sebastian Weyer (2): package/opencl-headers: new package package/opencl-icd-loader: new package DEVELOPERS | 2 + package/Config.in | 3 + package/llvm-project/clang/clang.mk | 9 ++ ...ncl-external-clang-headers-option-an.patch | 72 ++++++++++++++++ ...or-every-user-when-using-shared-LLVM.patch | 40 +++++++++ ...lc-retrieve-libclang-path-at-runtime.patch | 86 +++++++++++++++++++ package/mesa3d/Config.in | 50 +++++++++-- package/mesa3d/mesa3d.mk | 18 +++- ...dencies-base.py-add-pkg_config_stati.patch | 29 ++++--- package/meson/meson.hash | 4 +- package/meson/meson.mk | 2 +- package/opencl-headers/Config.in | 7 ++ package/opencl-headers/opencl-headers.hash | 3 + package/opencl-headers/opencl-headers.mk | 22 +++++ package/opencl-icd-loader/Config.in | 12 +++ .../opencl-icd-loader/opencl-icd-loader.hash | 3 + .../opencl-icd-loader/opencl-icd-loader.mk | 19 ++++ package/pkg-meson.mk | 13 +++ package/spirv-llvm-translator/Config.in | 22 +++++ .../spirv-llvm-translator.mk | 12 ++- support/misc/cross-compilation.conf.in | 4 +- 21 files changed, 406 insertions(+), 26 deletions(-) create mode 100644 package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch create mode 100644 package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch create mode 100644 package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch create mode 100644 package/opencl-headers/Config.in create mode 100644 package/opencl-headers/opencl-headers.hash create mode 100644 package/opencl-headers/opencl-headers.mk create mode 100644 package/opencl-icd-loader/Config.in create mode 100644 package/opencl-icd-loader/opencl-icd-loader.hash create mode 100644 package/opencl-icd-loader/opencl-icd-loader.mk create mode 100644 package/spirv-llvm-translator/Config.in -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:21 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:21 +0100 Subject: [Buildroot] [PATCH v4 3/7] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-4-antoine.coutant@smile.fr> From: Romain Naour This target version is needed for Rusticl which is an LLVM based OpenCL framework[1]. Rusticl allow programs to compile OpenCL C/C++ code at runtime with Clang. Clang generates LLVM IR which is translated into SPIR-V by spirv-llvm-translator. Finally, mesa can use its internal tools to manage SPIR-V. [1]: https://docs.mesa3d.org/rusticl.html Signed-off-by: Romain Naour Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant --- Changes v2 -> v3: - resolution of the conflict created by adding spirv-llvm-translator to package/Config.in - resolution of the conflict created by adding spirv-headers and zlib to spirv-llvm-translator dependencies Changes v3 -> v4: - explain why the target version is needed in the commit log. Signed-off-by: Antoine Coutant --- package/Config.in | 1 + package/spirv-llvm-translator/Config.in | 22 +++++++++++++++++++ .../spirv-llvm-translator.mk | 12 +++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 package/spirv-llvm-translator/Config.in diff --git a/package/Config.in b/package/Config.in index 426bd7d090..9324d1e4c8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -334,6 +334,7 @@ comment "Graphic applications" source "package/pngquant/Config.in" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" + source "package/spirv-llvm-translator/Config.in" source "package/spirv-tools/Config.in" source "package/stellarium/Config.in" source "package/sway/Config.in" diff --git a/package/spirv-llvm-translator/Config.in b/package/spirv-llvm-translator/Config.in new file mode 100644 index 0000000000..73ca787d8a --- /dev/null +++ b/package/spirv-llvm-translator/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + bool "spirv-translator" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm + select BR2_PACKAGE_LLVM + select BR2_PACKAGE_SPIRV_HEADERS + select BR2_PACKAGE_ZLIB + help + LLVM/SPIR-V Bi-Directional Translator is a library and tool + for translation between LLVM IR and SPIR-V. + + https://github.com/khronosGroup/SPIRV-LLVM-Translator + +comment "spirv-translator needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, host gcc >= 7" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk index 523890a986..8361a74c59 100644 --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk @@ -10,7 +10,7 @@ SPIRV_LLVM_TRANSLATOR_VERSION = v15.0.0-46-ge82ecc2bd7295604fcf1824e47c95fa6a09c SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT -HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers +HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers spirv-headers zlib HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ -DLLVM_BUILD_TOOLS=ON \ -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ @@ -19,4 +19,14 @@ HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ -DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(HOST_DIR)/include +SPIRV_LLVM_TRANSLATOR_INSTALL_STAGING = YES +SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm llvm +SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${STAGING_DIR}/usr \ + -DLLVM_BUILD_TOOLS=ON \ + -DLLVM_DIR=$(STAGING_DIR)/lib/cmake/llvm \ + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ + -DLLVM_SPIRV_INCLUDE_TESTS=OFF + +$(eval $(cmake-package)) $(eval $(host-cmake-package)) -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:22 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:22 +0100 Subject: [Buildroot] [PATCH v4 4/7] package/opencl-headers: new package In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-5-antoine.coutant@smile.fr> From: Sebastian Weyer These headers provide the C language API bindings. It is a complement to the C++ bindings already available in opencl-clhpp. This package is required to build opencl-icd-loader: https://github.com/KhronosGroup/OpenCL-ICD-Loader#dependencies Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant --- Changes v2 -> v3: - resolution of the conflict created by adding opencl-headers under Sebastian Weyer in DEVELOPERS - resolution of the conflict created by adding opencl-headers to package/Config.in Changes v3 -> v4: - bump version from v2023.04.17 to v2023.12.14: add cl_function_types.h to the header files to keep this header added in commit e049b16b5f157e2f28e7b5c301e71e1ccb3fe288 - remove the list of headers to install as it is exhaustive. Instead, select all files with "*". Signed-off-by: Antoine Coutant --- DEVELOPERS | 1 + package/Config.in | 1 + package/opencl-headers/Config.in | 7 +++++++ package/opencl-headers/opencl-headers.hash | 3 +++ package/opencl-headers/opencl-headers.mk | 22 ++++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/opencl-headers/Config.in create mode 100644 package/opencl-headers/opencl-headers.hash create mode 100644 package/opencl-headers/opencl-headers.mk diff --git a/DEVELOPERS b/DEVELOPERS index cc9bc5b5cc..79c46c3539 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2693,6 +2693,7 @@ F: package/ripgrep/ N: Sebastian Weyer F: package/amlogic-boot-fip/ F: package/nushell/ +F: package/opencl-headers F: package/rust-bindgen/ F: package/spirv-headers/ F: support/testing/tests/package/sample_nu.nu diff --git a/package/Config.in b/package/Config.in index 9324d1e4c8..dfbd20e889 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1696,6 +1696,7 @@ menu "Graphics" source "package/menu-cache/Config.in" source "package/onevpl-intel-gpu/Config.in" source "package/opencl-clhpp/Config.in" + source "package/opencl-headers/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" source "package/opencv4-contrib/Config.in" diff --git a/package/opencl-headers/Config.in b/package/opencl-headers/Config.in new file mode 100644 index 0000000000..092d8a2a4d --- /dev/null +++ b/package/opencl-headers/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_OPENCL_HEADERS + bool "opencl-headers" + depends on BR2_PACKAGE_HAS_LIBOPENCL + help + C language headers for the OpenCL API + + https://github.com/KhronosGroup/OpenCL-Headers diff --git a/package/opencl-headers/opencl-headers.hash b/package/opencl-headers/opencl-headers.hash new file mode 100644 index 0000000000..802ed05450 --- /dev/null +++ b/package/opencl-headers/opencl-headers.hash @@ -0,0 +1,3 @@ +#Locally generated +sha256 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d OpenCL-Headers-2023.12.14.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencl-headers/opencl-headers.mk b/package/opencl-headers/opencl-headers.mk new file mode 100644 index 0000000000..7aa0e0d168 --- /dev/null +++ b/package/opencl-headers/opencl-headers.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# opencl-headers +# +################################################################################ + +OPENCL_HEADERS_VERSION = 2023.12.14 +OPENCL_HEADERS_SOURCE = OpenCL-Headers-$(OPENCL_HEADERS_VERSION).tar.gz +OPENCL_HEADERS_SITE = $(call github,KhronosGroup,OpenCL-Headers,v$(OPENCL_HEADERS_VERSION)) +OPENCL_HEADERS_LICENSE = Apache-2.0 +OPENCL_HEADERS_LICENSE_FILES = LICENSE +OPENCL_HEADERS_INSTALL_STAGING = YES + +OPENCL_HEADERS_INSTALL_TARGET = NO + +define OPENCL_HEADERS_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/CL + $(INSTALL) -D -m 0644 $(@D)/CL/* \ + $(STAGING_DIR)/usr/include/CL +endef + +$(eval $(generic-package)) -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:23 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:23 +0100 Subject: [Buildroot] [PATCH v4 5/7] package/opencl-icd-loader: new package In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-6-antoine.coutant@smile.fr> From: Sebastian Weyer With this package it is possible to have multiple implementations of OpenCL at the same time. This package provides a libOpenCL.so file that captures the OpenCL API calls and forwards them to the correct implementation of OpenCL. OpenCL implementations can be manually registered by creating a file containing its full file path in /etc/OpenCL/vendors/.icd[1] This package is required by certain OpenCL implementations, for example Mesa3D's Clover implementation if it is not built in standalone mode. [1] https://github.com/KhronosGroup/OpenCL-ICD-Loader#registering-icds Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant --- Changes v2 -> v3: -resolution of the conflict created by adding opencl-icd-loader under Sebastian Weyer in DEVELOPERS - resolution of the conflict created by adding opencl-icd-loader to package/Config.in Changes v3 -> v4: - bump version from v2023.04.17 to v2023.12.14 Signed-off-by: Antoine Coutant --- DEVELOPERS | 1 + package/Config.in | 1 + package/opencl-icd-loader/Config.in | 12 ++++++++++++ .../opencl-icd-loader/opencl-icd-loader.hash | 3 +++ .../opencl-icd-loader/opencl-icd-loader.mk | 19 +++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 package/opencl-icd-loader/Config.in create mode 100644 package/opencl-icd-loader/opencl-icd-loader.hash create mode 100644 package/opencl-icd-loader/opencl-icd-loader.mk diff --git a/DEVELOPERS b/DEVELOPERS index 79c46c3539..907a29f53b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2694,6 +2694,7 @@ N: Sebastian Weyer F: package/amlogic-boot-fip/ F: package/nushell/ F: package/opencl-headers +F: package/opencl-icd-loader F: package/rust-bindgen/ F: package/spirv-headers/ F: support/testing/tests/package/sample_nu.nu diff --git a/package/Config.in b/package/Config.in index dfbd20e889..7b1324306c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1697,6 +1697,7 @@ menu "Graphics" source "package/onevpl-intel-gpu/Config.in" source "package/opencl-clhpp/Config.in" source "package/opencl-headers/Config.in" + source "package/opencl-icd-loader/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" source "package/opencv4-contrib/Config.in" diff --git a/package/opencl-icd-loader/Config.in b/package/opencl-icd-loader/Config.in new file mode 100644 index 0000000000..405dc5401a --- /dev/null +++ b/package/opencl-icd-loader/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_OPENCL_ICD_LOADER + bool "OpenCL-ICD-Loader" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBOPENCL + select BR2_PACKAGE_OPENCL_HEADERS + help + OpenCL defines an Installable Client Driver (ICD) mechanism to + allow developers to build applications against an Installable + Client Driver loader (ICD loader) rather than linking their + applications against a specific OpenCL implementation. + + https://github.com/KhronosGroup/OpenCL-ICD-Loader diff --git a/package/opencl-icd-loader/opencl-icd-loader.hash b/package/opencl-icd-loader/opencl-icd-loader.hash new file mode 100644 index 0000000000..1c894f1293 --- /dev/null +++ b/package/opencl-icd-loader/opencl-icd-loader.hash @@ -0,0 +1,3 @@ +# locally generated +sha256 af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917 OpenCL-ICD-Loader-2023.12.14.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/opencl-icd-loader/opencl-icd-loader.mk b/package/opencl-icd-loader/opencl-icd-loader.mk new file mode 100644 index 0000000000..04f6fb4b85 --- /dev/null +++ b/package/opencl-icd-loader/opencl-icd-loader.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# opencl-icd-loader +# +################################################################################ + +OPENCL_ICD_LOADER_VERSION = 2023.12.14 +OPENCL_ICD_LOADER_SOURCE = OpenCL-ICD-Loader-$(OPENCL_ICD_LOADER_VERSION).tar.gz +OPENCL_ICD_LOADER_SITE = $(call github,KhronosGroup,OpenCL-ICD-Loader,v$(OPENCL_ICD_LOADER_VERSION)) +OPENCL_ICD_LOADER_LICENSE = Apache-2.0 +OPENCL_ICD_LOADER_LICENSE_FILES = LICENSE +OPENCL_ICD_LOADER_INSTALL_STAGING = YES + +OPENCL_ICD_LOADER_DEPENDENCIES = opencl-headers + +OPENCL_ICD_LOADER_CONF_OPTS += -DOPENCL_ICD_LOADER_HEADERS_DIR=$(STAGING_DIR)/usr/include + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:24 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:24 +0100 Subject: [Buildroot] [PATCH v4 6/7] package/llvm-project: add opencl-c-base.h on target In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-7-antoine.coutant@smile.fr> rusticl depends on the mesa clc_compile_to_llvm_module function. This function requires opencl-c-base.h when LLVM version >= 15. The header is deleted automatically by CLANG_FILES_TO_REMOVE post install target hook in llvm-project/clang package. When rusticl is enabled, after the whole clang directory has been removed, the header is copied back to /usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/ By default, the mesa3d variable used to retrieve the header is set to the staging directory on the host machine. A merge request on mesa's gitlab solved this problem. See: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25568 The patches have been backported to mesa 23.3.4. Signed-off-by: Antoine Coutant --- Changes v3 -> v4: - Add patches merged by mesa upstream. --- Running an app that uses rusticl leads to an error. Example: RUSTICL_ENABLE=panfrost clpeak Platform: rusticl Device: Mali-G52 (Panfrost) Driver version : 23.3.4 (Linux ARM64) Compute units : 2 Clock frequency : 800 MHz Build Log: :1:10: fatal error: 'opencl-c-base.h' file not found Error executing LLVM compilation action. Signed-off-by: Antoine Coutant --- package/llvm-project/clang/clang.mk | 9 ++ ...ncl-external-clang-headers-option-an.patch | 72 ++++++++++++++++ ...or-every-user-when-using-shared-LLVM.patch | 40 +++++++++ ...lc-retrieve-libclang-path-at-runtime.patch | 86 +++++++++++++++++++ 4 files changed, 207 insertions(+) create mode 100644 package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch create mode 100644 package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch create mode 100644 package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk index 0bafd6461b..09aac7f0ec 100644 --- a/package/llvm-project/clang/clang.mk +++ b/package/llvm-project/clang/clang.mk @@ -90,6 +90,15 @@ define HOST_CLANG_INSTALL_CLANG_TBLGEN endef HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN +# Rusticl needs opencl-c-base.h to be present on the target. +define CLANG_OPENCL_C_BASE_HEADER_TO_TARGET + mkdir -p $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include + $(INSTALL) -D -m 0644 $(@D)/lib/Headers/opencl-c-base.h $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/opencl-c-base.h +endef +ifeq ($(BR2_PACKAGE_MESA3D_RUSTICL),y) +CLANG_POST_INSTALL_TARGET_HOOKS += CLANG_OPENCL_C_BASE_HEADER_TO_TARGET +endif + # This option must be enabled to link libclang dynamically against libLLVM.so HOST_CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON diff --git a/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch new file mode 100644 index 0000000000..ebe3542627 --- /dev/null +++ b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch @@ -0,0 +1,72 @@ +From b7f2ada31d85dfd2e9906a7343d14a3b0b85cf14 Mon Sep 17 00:00:00 2001 +From: Karol Herbst +Date: Tue, 2 Jan 2024 22:58:39 +0100 +Subject: [PATCH 1/3] meson: remove opencl-external-clang-headers option and + rely on shared-llvm + +Setting opencl-external-clang-headers to enabled while using shared LLVM +was broken and this option was mostly used for windows to force static +inclusion of opencl base headers. + +Simply relying on the shared-llvm option here is enough to get what we +want. + +Signed-off-by: Karol Herbst +Reviewed-by: Jesse Natalie +Part-of: +[antoine.coutant at smile.fr: backported to mesa-23.3.4] +Signed-off-by: Antoine Coutant +--- + .gitlab-ci/windows/mesa_build.ps1 | 1 - + meson_options.txt | 7 ------- + src/compiler/clc/meson.build | 4 +--- + 3 files changed, 1 insertion(+), 11 deletions(-) + +diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 +index a4f87c4eadb..e79eb6b6587 100644 +--- a/.gitlab-ci/windows/mesa_build.ps1 ++++ b/.gitlab-ci/windows/mesa_build.ps1 +@@ -59,7 +59,6 @@ meson setup ` + -Dopencl-spirv=true ` + -Dmicrosoft-clc=enabled ` + -Dstatic-libclc=all ` +--Dopencl-external-clang-headers=disabled ` + -Dspirv-to-dxil=true ` + -Dbuild-tests=true ` + -Dwerror=true ` +diff --git a/meson_options.txt b/meson_options.txt +index e885ba61a8a..537ba797407 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -191,13 +191,6 @@ option( + description : 'Link libclc SPIR-V statically.', + ) + +-option( +- 'opencl-external-clang-headers', +- type : 'feature', +- description : 'Use system Clang headers at runtime for OpenCL kernel ' + +- 'compilation.', +-) +- + option( + 'd3d-drivers-path', + type : 'string', +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build +index 3e4f1a7f441..81345225768 100644 +--- a/src/compiler/clc/meson.build ++++ b/src/compiler/clc/meson.build +@@ -30,9 +30,7 @@ _libmesaclc_c_args = [] + _libmesaclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)] + _libmesaclc_sources = [] + +-if get_option('opencl-external-clang-headers') \ +- .disable_auto_if(host_machine.system() == 'windows') \ +- .disabled() ++if not _shared_llvm + # LLVM 16 moved clang header path from using full version to only major version + if dep_llvm.version().version_compare('< 16') + # Prior to LLVM 16, this path used a full version +-- +2.25.1 + diff --git a/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch new file mode 100644 index 0000000000..3560f6805f --- /dev/null +++ b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch @@ -0,0 +1,40 @@ +From 56c85c4c7a757a9ba3d8ac08e6c4c4c7f19e6cab Mon Sep 17 00:00:00 2001 +From: Karol Herbst +Date: Thu, 11 Jan 2024 14:55:46 +0100 +Subject: [PATCH 2/3] clc: force fPIC for every user when using shared LLVM + +As we want to start using `dladdr`, this is needed to prevent `dladdr` +returning information of the wrong file. + +Fixes tag as it's required by the actual fix. + +Signed-off-by: Karol Herbst +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") +Part-of: +[antoine.coutant at smile.fr: backported to mesa-23.3.4] +Signed-off-by: Antoine Coutant +--- + src/compiler/clc/meson.build | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build +index 81345225768..442a583065b 100644 +--- a/src/compiler/clc/meson.build ++++ b/src/compiler/clc/meson.build +@@ -123,7 +123,13 @@ _libmesaclc = static_library( + idep_mesautil, dep_spirv_tools] + ) + ++_idep_mesaclc_link_args = [] ++if _shared_llvm ++ _idep_mesaclc_link_args += cc.get_supported_link_arguments('-fPIC') ++endif ++ + idep_mesaclc = declare_dependency( + link_with : _libmesaclc, + include_directories : include_directories('.'), ++ link_args : _idep_mesaclc_link_args, + ) +-- +2.25.1 + diff --git a/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch new file mode 100644 index 0000000000..c19ba7d2b7 --- /dev/null +++ b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch @@ -0,0 +1,86 @@ +From fa2c045e04370beb454951c32bccc087638e04c7 Mon Sep 17 00:00:00 2001 +From: Antoine Coutant +Date: Thu, 30 Nov 2023 11:10:20 +0100 +Subject: [PATCH 3/3] clc: retrieve libclang path at runtime. + +LLVM_LIB_DIR is a variable used for runtime compilations. +When cross compiling, LLVM_LIB_DIR must be set to the +libclang path on the target. So, this path should not +be retrieved during compilation but at runtime. + +dladdr uses an address to search for a loaded library. +If a library is found, it returns information about it. +The path to the libclang library can therefore be +retrieved using one of its functions. This is useful +because we don't know the name of the libclang library +(libclang.so.X or libclang-cpp.so.X) + +v2 (Karol): use clang::CompilerInvocation::CreateFromArgs for dladdr +v3 (Karol): follow symlinks to fix errors on debian + +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") +Signed-off-by: Antoine Coutant +Reviewed-by: Karol Herbst +Reviewed-by (v1): Jesse Natalie +[antoine.coutant at smile.fr: backported to mesa-23.3.4] + +Part-of: +--- + src/compiler/clc/clc_helpers.cpp | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp +index 55287f22683..22eb3495be9 100644 +--- a/src/compiler/clc/clc_helpers.cpp ++++ b/src/compiler/clc/clc_helpers.cpp +@@ -23,6 +23,7 @@ + // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + // OTHER DEALINGS IN THE SOFTWARE. + ++#include + #include + #include + #include +@@ -57,6 +58,10 @@ + + #include "spirv.h" + ++#if DETECT_OS_UNIX ++#include ++#endif ++ + #ifdef USE_STATIC_OPENCL_C_H + #if LLVM_VERSION_MAJOR < 15 + #include "opencl-c.h.h" +@@ -876,12 +881,25 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx, + #endif + } + #else ++ ++ Dl_info info; ++ if (dladdr((void *)clang::CompilerInvocation::CreateFromArgs, &info) == 0) { ++ clc_error(logger, "Couldn't find libclang path.\n"); ++ return {}; ++ } ++ ++ char *clang_path = realpath(info.dli_fname, NULL); ++ if (clang_path == nullptr) { ++ clc_error(logger, "Couldn't find libclang path.\n"); ++ return {}; ++ } ++ + // GetResourcePath is a way to retrive the actual libclang resource dir based on a given binary +- // or library. The path doesn't even need to exist, we just have to put something in there, +- // because we might have linked clang statically. ++ // or library. + auto libclang_path = fs::path(LLVM_LIB_DIR) / "libclang.so"; + auto clang_res_path = +- fs::path(Driver::GetResourcesPath(libclang_path.string(), CLANG_RESOURCE_DIR)) / "include"; ++ fs::path(Driver::GetResourcesPath(std::string(clang_path), CLANG_RESOURCE_DIR)) / "include"; ++ free(clang_path); + + c->getHeaderSearchOpts().UseBuiltinIncludes = true; + c->getHeaderSearchOpts().UseStandardSystemIncludes = true; +-- +2.25.1 + -- 2.25.1 From antoine.coutant at smile.fr Fri Feb 2 09:36:25 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Fri, 2 Feb 2024 10:36:25 +0100 Subject: [Buildroot] [PATCH v4 7/7] package/mesa3d: add RustiCL support In-Reply-To: <20240202093625.1409559-1-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> Message-ID: <20240202093625.1409559-8-antoine.coutant@smile.fr> From: Romain Naour To build Rusticl you need to satisfy the following build dependencies: rustc rustfmt (highly recommended, but only required for CI builds or when authoring patches) bindgen LLVM built with libclc and -DLLVM_ENABLE_DUMP=ON. SPIRV-Tools SPIRV-LLVM-Translator for a libLLVMSPIRVLib.so matching your version of LLVM, i.e. if you?re using LLVM 15 (libLLVM.so.15), then you need a libLLVMSPIRVLib.so.15. See: https://docs.mesa3d.org/rusticl.html Since rusticl is an implementation of OpenCL, make it a provider of OpenCL. We need to use opencl-icd-loader in order to be able to capture API calls and forward them to the correct implementation of OpenCL (RustiCL in this case) opencl-icd-loader needs to be installed in the toolchain's sysroot as well to be able to compile packages depending on libopencl since otherwise there's only for example libRustiOpenCL.so and no libOpenCL.so Many Gallium drivers are compatible with rusticl. However, tests were performed with panfrost. Thus only panfrost is actived for the moment. To activate another driver, make it select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER. The list of all compatible drivers can be found here: https://docs.mesa3d.org/envvars.html#envvar-RUSTICL_ENABLE Signed-off-by: Romain Naour Signed-off-by: Sebastian Weyer Signed-off-by: Antoine Coutant --- v2: change commit header -> RustiCL support is not experimental Changes v3 -> v4: - Add a menuconfig to select OpenCL implementation between Clover and RustiCL - Add BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER. Signed-off-by: Antoine Coutant --- package/mesa3d/Config.in | 50 ++++++++++++++++++++++++++++++++++++---- package/mesa3d/mesa3d.mk | 18 +++++++++++++-- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 39a4f706e2..84d281a0a9 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -44,17 +44,56 @@ comment "llvm support needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 -# clang and libclc dependencies are satisfied by -# BR2_PACKAGE_MESA3D_LLVM -config BR2_PACKAGE_MESA3D_OPENCL +menuconfig BR2_PACKAGE_MESA3D_OPENCL bool "OpenCL support" + default n depends on BR2_PACKAGE_MESA3D_LLVM depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \ + BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS && \ + BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER select BR2_PACKAGE_LLVM_RTTI select BR2_PACKAGE_CLANG select BR2_PACKAGE_LIBCLC select BR2_PACKAGE_HAS_LIBOPENCL + help + OpenCL is a standard for parallel programming of heterogeneous + systems (CPUs, GPUs, DSPs, FPGAs, etc.) + + http://www.khronos.org/opencl/ + +if BR2_PACKAGE_MESA3D_OPENCL + +# clang and libclc dependencies are satisfied by +# BR2_PACKAGE_MESA3D_LLVM +config BR2_PACKAGE_MESA3D_CLOVER + bool "Clover" + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + +# libclc dependency is satisfied by +# BR2_PACKAGE_MESA3D_LLVM +config BR2_PACKAGE_MESA3D_RUSTICL + bool "RustiCL" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_LLVM_DUMP + select BR2_PACKAGE_OPENCL_ICD_LOADER + select BR2_PACKAGE_SPIRV_TOOLS + select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + help + RustiCL is an OpenCL implementation written in Rust. + + By default devices are disabled in RustiCL. If you want to enable a device, + you need to set the environment variable RUSTICL_ENABLE to the driver you + are using. + ref: https://docs.mesa3d.org/envvars.html#envvar-RUSTICL_ENABLE + +endif # BR2_PACKAGE_MESA3D_OPENCL + +config BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER + bool # inform the .mk file of gallium, dri, dri3 or vulkan driver selection config BR2_PACKAGE_MESA3D_DRI3 @@ -160,6 +199,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER help Mesa driver for ARM Mali Midgard and Bifrost GPUs. @@ -396,7 +436,7 @@ config BR2_PACKAGE_PROVIDES_LIBGLES default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES && !BR2_PACKAGE_LIBGLVND config BR2_PACKAGE_PROVIDES_LIBOPENCL - default "mesa3d" if BR2_PACKAGE_MESA3D_OPENCL + default "mesa3d" if BR2_PACKAGE_MESA3D_CLOVER || BR2_PACKAGE_MESA3D_RUSTICL endif # BR2_PACKAGE_MESA3D diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d8d8fb8dd6..9a86fdacd7 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -58,15 +58,29 @@ else MESA3D_CONF_OPTS += -Dllvm=disabled endif -# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of -# libMesaOpenCL and CL headers are installed ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) MESA3D_PROVIDES += libopencl MESA3D_DEPENDENCIES += clang libclc +ifeq ($(BR2_PACKAGE_MESA3D_CLOVER),y) +ifeq ($(BR2_PACKAGE_OPENCL_ICD_LOADER),y) +MESA3D_CONF_OPTS += -Dgallium-opencl=icd +MESA3D_DEPENDENCIES += opencl-icd-loader +else +# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of +# libMesaOpenCL and CL headers are installed MESA3D_CONF_OPTS += -Dgallium-opencl=standalone +endif else MESA3D_CONF_OPTS += -Dgallium-opencl=disabled endif +ifeq ($(BR2_PACKAGE_MESA3D_RUSTICL),y) +MESA3D_DEPENDENCIES += host-rustc host-rust-bindgen opencl-icd-loader spirv-tools spirv-llvm-translator +# -Drust_std=2021: known meson bug (https://github.com/mesonbuild/meson/issues/10664) +MESA3D_CONF_OPTS += -Dgallium-rusticl=true -Drust_std=2021 +else +MESA3D_CONF_OPTS += -Dgallium-rusticl=false +endif +endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) MESA3D_DEPENDENCIES += elfutils -- 2.25.1 From neal.frager at amd.com Fri Feb 2 12:11:29 2024 From: neal.frager at amd.com (Frager, Neal) Date: Fri, 2 Feb 2024 12:11:29 +0000 Subject: [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: new package In-Reply-To: <20240131112223.2175855-4-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-4-neal.frager@amd.com> Message-ID: Hi Thomas, Have you had a chance to look at v9 of the bare-metal patch set? > + > +define NEWLIB_BARE_METAL_FIXUP > + mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/include \ > + $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/include > + mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/lib \ > + $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/lib > +endef > +NEWLIB_BARE_METAL_POST_INSTALL_STAGING_HOOKS += NEWLIB_BARE_METAL_FIXUP > + > +$(eval $(generic-package)) There are two things I wish to highlight. 1. Thanks to the binutils 2.42 release, we do not need microblaze patches anymore. 2. I chose to keep the newlib fixup. Even though the --with-tooldir patch was accepted upstream, newlib requires autoconf 2.69 for this patch to be applied. So rather than including a version of the patch that works on the output configure script directly, I thought it would be better to just keep the fixup for now. We can remove the fixup with the next newlib release which will have a configurable --with-tooldir option. What are your thoughts? Do you think any more changes are needed before applying this bare-metal toolchain patch set? Thank you for your support. Best regards, Neal Frager AMD From wbx at openadk.org Fri Feb 2 15:56:14 2024 From: wbx at openadk.org (Waldemar Brodkorb) Date: Fri, 2 Feb 2024 16:56:14 +0100 Subject: [Buildroot] [PATCH 1/2 v2] package/libjwt: new package Message-ID: JSON Web Tokens are an open, industry standard RFC 7519 method for representing claims securely between two parties. This Library is used by Asterisk 20.6.0 and newer. We need to use autotools to install pkgconfig file. Signed-off-by: Waldemar Brodkorb --- package/Config.in | 1 + package/libjwt/Config.in | 9 +++++++++ package/libjwt/libjwt.hash | 3 +++ package/libjwt/libjwt.mk | 16 ++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/libjwt/Config.in create mode 100644 package/libjwt/libjwt.hash create mode 100644 package/libjwt/libjwt.mk diff --git a/package/Config.in b/package/Config.in index 426bd7d090..75a94177eb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1846,6 +1846,7 @@ menu "JSON/XML" source "package/libbson/Config.in" source "package/libfastjson/Config.in" source "package/libjson/Config.in" + source "package/libjwt/Config.in" source "package/libroxml/Config.in" source "package/libucl/Config.in" source "package/libxml2/Config.in" diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in new file mode 100644 index 0000000000..d6bca54adc --- /dev/null +++ b/package/libjwt/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBJWT + bool "libjwt" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_JANSSON + help + JSON Web Tokens are an open, industry standard RFC 7519 + method for representing claims securely between two parties. + + https://github.com/benmcollins/libjwt diff --git a/package/libjwt/libjwt.hash b/package/libjwt/libjwt.hash new file mode 100644 index 0000000000..2235fa3f99 --- /dev/null +++ b/package/libjwt/libjwt.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 cb2fd95123689e7d209a3a8c060e02f68341c9a5ded524c0cd881a8cd20d711f libjwt-1.15.3.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk new file mode 100644 index 0000000000..f7be28d206 --- /dev/null +++ b/package/libjwt/libjwt.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libjwt +# +################################################################################ + +LIBJWT_VERSION = 1.15.3 +LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) +LIBJWT_SOURCE = libjwt-$(LIBJWT_VERSION).tar.gz +LIBJWT_DEPENDENCIES = jansson openssl +LIBJWT_AUTORECONF = YES +LIBJWT_INSTALL_STAGING = YES +LIBJWT_LICENSE = MPL-2.0 +LIBJWT_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) -- 2.39.2 From wbx at openadk.org Fri Feb 2 15:58:56 2024 From: wbx at openadk.org (Waldemar Brodkorb) Date: Fri, 2 Feb 2024 16:58:56 +0100 Subject: [Buildroot] [PATCH 2/2 v2] package/asterisk: bump to 20.6.0 Message-ID: See here for changes: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md Signed-off-by: Waldemar Brodkorb --- v1->v2: - use separate libjwt package instead of bundled one, suggested by Peter Korsgaard --- package/asterisk/Config.in | 1 + package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in index c52456f8fc..662f070dac 100644 --- a/package/asterisk/Config.in +++ b/package/asterisk/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_ASTERISK select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBILBC + select BR2_PACKAGE_LIBJWT select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_SQLITE select BR2_PACKAGE_UTIL_LINUX diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index 246f4219aa..d50955dd2b 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.tar.gz +sha256 088dbc08916e21528dba364f5452b2090b066dbba4548b32ec10af138d4b442f asterisk-20.6.0.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index d1f3ea82d3..869e4128ff 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 20.5.2 +ASTERISK_VERSION = 20.6.0 # Use the github mirror: it's an official mirror maintained by Digium, and # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) @@ -27,7 +27,7 @@ ASTERISK_SELINUX_MODULES = asterisk # For patches 0002 and 0003 ASTERISK_AUTORECONF = YES -ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson +ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson -Ithird-party/libjwt ASTERISK_DEPENDENCIES = \ host-asterisk \ @@ -35,6 +35,7 @@ ASTERISK_DEPENDENCIES = \ jansson \ libcurl \ libedit \ + libjwt \ libxml2 \ sqlite \ util-linux @@ -89,6 +90,7 @@ ASTERISK_CONF_OPTS = \ --with-jansson \ --with-libcurl \ --with-ilbc \ + --with-libjwt="$(STAGING_DIR)/usr" \ --with-libxml2 \ --with-libedit="$(STAGING_DIR)/usr" \ --with-pjproject \ -- 2.39.2 From buildroot at busybox.net Fri Feb 2 18:22:19 2024 From: buildroot at busybox.net (Postmaster) Date: 2 Feb 2024 19:22:19 +0100 Subject: [Buildroot] Undeliverable: Outgoing Mail Returned to Sender Message-ID: <20240202192219.5C1FB049A2E1A5D9@busybox.net> An HTML attachment was scrubbed... URL: From bernd at kuhls.net Fri Feb 2 19:21:26 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 2 Feb 2024 20:21:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 23.3.5 Message-ID: <20240202192126.51102-1-bernd@kuhls.net> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index d04fa10342..b9b328b268 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.3.4 +MESA3D_HEADERS_VERSION = 23.3.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e99027c013..7e49119c41 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-January/000745.html -sha256 df12d765be4650fe532860b18aa18e6da1d0b07d1a21dfdfe04660e6b7bac39a mesa-23.3.4.tar.xz -sha512 026c424989a594dd840dc158ca09e0f57e604f0b1bd2a3981110b4b2b5a47c6cd9c7241c7f48957a781e2dd9f9760cc9db79b2fb7c7fe39b64eddb18dcf18412 mesa-23.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html +sha256 69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f mesa-23.3.5.tar.xz +sha512 1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea mesa-23.3.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d3bc7020b1..4e6cb3571a 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.3.4 +MESA3D_VERSION = 23.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.39.2 From bernd at kuhls.net Fri Feb 2 19:29:33 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 2 Feb 2024 20:29:33 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240202192933.53122-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 662bd09162..da22b439e3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.15" 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 d7082aa629..10edcc2ed9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584 linux-6.6.14.tar.xz -sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz +sha256 ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa linux-6.6.15.tar.xz +sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index bf55c8714a..a0e572adc0 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.75" if BR2_KERNEL_HEADERS_6_1 - default "6.6.14" if BR2_KERNEL_HEADERS_6_6 + default "6.1.76" if BR2_KERNEL_HEADERS_6_1 + default "6.6.15" if BR2_KERNEL_HEADERS_6_6 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 \ -- 2.39.2 From bernd at kuhls.net Fri Feb 2 19:35:06 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 2 Feb 2024 20:35:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-peripheral-joystick: bump version to 20.1.15-Nexus Message-ID: <20240202193506.58522-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 550da61981..d4765d2b2c 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8c3dde851e45549d13ca3fcead9c27c440dfe070d68fb473ae71c522bc54753a kodi-peripheral-joystick-20.1.14-Nexus.tar.gz +sha256 7292431b26e3ea969967a02f42ce48cae7742398b148ca041470c17934d06272 kodi-peripheral-joystick-20.1.15-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 2fe6c29c0d..d81962562c 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.14-Nexus +KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.15-Nexus KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md -- 2.39.2 From raphael.pavlidis at gmail.com Fri Feb 2 20:29:54 2024 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Fri, 2 Feb 2024 21:29:54 +0100 Subject: [Buildroot] [PATCH v3] package/sway: make systemd optional In-Reply-To: <20240202020258.600562-1-stefan@ott.net> References: <20240202020258.600562-1-stefan@ott.net> Message-ID: Hello Stefan, Thanks for the new iteration! On 2/2/24 03:02, Stefan Ott wrote: [SNIP] > > +comment "swaybar tray needs systemd" > + depends on !BR2_PACKAGE_SYSTEMD > + > endif # BR2_PACKAGE_SWAY_SWAYBAR > > config BR2_PACKAGE_SWAY_SWAYNAG > @@ -54,9 +57,8 @@ config BR2_PACKAGE_SWAY_SWAYNAG > > endif # BR2_PACKAGE_SWAY > I like it more if the tray feature is enabled automatically if systemd is present, without making it an option. Thanks, Raphael Pavlidis From bernd at kuhls.net Fri Feb 2 22:20:39 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 2 Feb 2024 23:20:39 +0100 Subject: [Buildroot] [PATCH 1/2] package/intel-mediadriver: bump version to 24.1.3 Message-ID: <20240202222040.2390770-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index feade4974c..a1b098094b 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 da90f3c38176936f6315bb4b0f04f6f83080f9a6a228294538aa6befe9ce20e0 intel-media-24.1.1.tar.gz +sha256 a024e96abd662193e4295f427a76c5894087503df46bd82c0e5bea103e44b171 intel-media-24.1.3.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index efff3d44b0..efedf407e5 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.1.1 +INTEL_MEDIADRIVER_VERSION = 24.1.3 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause -- 2.39.2 From bernd at kuhls.net Fri Feb 2 22:20:40 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 2 Feb 2024 23:20:40 +0100 Subject: [Buildroot] [PATCH 2/2] package/onevpl-intel-gpu: bump version to 24.1.3 In-Reply-To: <20240202222040.2390770-1-bernd@kuhls.net> References: <20240202222040.2390770-1-bernd@kuhls.net> Message-ID: <20240202222040.2390770-2-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index d1e671f96a..a45758a2c3 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e0bd388c04740dd9f2e8ca989bc54428c13a531ed4c097d00f06aa6e58a6d15c onevpl-intel-gpu-24.1.1.tar.gz +sha256 15d34e4304d7aeb5ea5e529b6f51171109cef42525113321f675bc14e56c697e onevpl-intel-gpu-24.1.3.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index 52fbe2ed9b..509698ce26 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 24.1.1 +ONEVPL_INTEL_GPU_VERSION = 24.1.3 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE -- 2.39.2 From kilian.zinnecker at mail.de Fri Feb 2 23:30:30 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sat, 3 Feb 2024 00:30:30 +0100 Subject: [Buildroot] [PATCH 1/1] board/radxa/rock5b: Disable FIQ debug interface Message-ID: <20240202233030.1192392-1-kilian.zinnecker@mail.de> The custom kernel used for the Rock5B features an FIQ debug interface which is enabled by default. As it is not needed, it is disabled. The documentation features instructions on how to re-enable it, if it is needed. Signed-off-by: Kilian Zinnecker --- board/radxa/rock5b/linux.fragment | 1 + board/radxa/rock5b/readme.txt | 20 ++++++++++++++++++++ board/radxa/rock5b/rock5b.dts | 12 ++++++++++++ board/radxa/rock5b/rock5b.its | 2 +- configs/rock5b_defconfig | 3 ++- 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 board/radxa/rock5b/rock5b.dts diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 6d65cb7bb8..28bb373ef2 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1,4 +1,5 @@ CONFIG_R8169=y +# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set # Disable Rockchip specific WiFi drivers, as the kernel # code cannot be build with GCC 12 due to several Werrors # CONFIG_WL_ROCKCHIP is not set diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index f02f3d380e..b3eb06851a 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -20,6 +20,7 @@ output/images ??? rk3588-rock-5b.dtb ??? rk3588_bl31_v1.40.elf ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin +??? rock5b.dts ??? rock5b.its ??? rootfs.ext2 ??? rootfs.ext4 @@ -64,6 +65,8 @@ https://forum.radxa.com/c/rock5 Issues: ======= +WiFi +---- The custom Radxa kernel provides custom code to support WiFi. However, that code does not compile with GCC 12, which is the current default version in buildroot. Hence, the WiFi kernel drivers are disabled, until @@ -80,3 +83,20 @@ BR2_GCC_VERSION_11_X=y board/radxa/rock5b/linux.fragment: # CONFIG_WL_ROCKCHIP is not set + +Rockchip FIQ Debugger +--------------------- +The custom kernel used for this board features an FIQ debugger, which +can be activated by typing "fiq" on the serial interface. As this can be +annoying if a user wants to type these charakters and it is not needed +for most users, this board support disables the FIQ debugger by default. +To re-enable the FIQ debugger follow the steps: + +1. In board/radxa/rock5b/rock5b.dts set the status property of the +fiq_debugger node to "okay" and set the status property of the uart2 +node to "disabled" + +2. Re-enable the fiq debugger module by removing the following line +from board/radxa/rock5b/linux.fragment: + +# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts new file mode 100644 index 0000000000..71a4e42b5e --- /dev/null +++ b/board/radxa/rock5b/rock5b.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "rockchip/rk3588-rock-5b.dts" + +&fiq_debugger { + status = "disabled"; +}; + +&uart2 { + pinctrl-0 = <&uart2m0_xfer>; + status = "okay"; +}; diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its index d73659a56e..9ce235d041 100644 --- a/board/radxa/rock5b/rock5b.its +++ b/board/radxa/rock5b/rock5b.its @@ -20,7 +20,7 @@ }; fdt { description = "Device Tree"; - data = /incbin/("rk3588-rock-5b.dtb"); + data = /incbin/("rock5b.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 2e72b386b1..7175aa66bf 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -14,7 +14,8 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" +# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" BR2_TARGET_ROOTFS_EXT2=y -- 2.34.1 From stefan at ott.net Sat Feb 3 03:01:37 2024 From: stefan at ott.net (Stefan Ott) Date: Sat, 3 Feb 2024 04:01:37 +0100 Subject: [Buildroot] [PATCH v4] package/sway: make systemd optional In-Reply-To: References: Message-ID: <20240203030138.1934339-1-stefan@ott.net> Sway works perfectly fine without it. Signed-off-by: Stefan Ott --- Changes v3 -> v4: - Automatically enable tray support if systemd is enabled (suggested by Raphael Pavlidis) Changes v2 -> v3: - Make BR2_PACKAGE_SWAY_SWAYBAR_TRAY depend on systemd and set sd-bus-provider=libsystemd if SWAY_SWAYBAR_TRAY is enabled Changes v1 -> v2: - Automatically enable systemd integration for builds with systemd support (suggested by Thomas Petazzoni) --- package/sway/Config.in | 15 ++------------- package/sway/sway.mk | 10 +++++----- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/package/sway/Config.in b/package/sway/Config.in index 4f6d9fb215..d2fcdc6d70 100644 --- a/package/sway/Config.in +++ b/package/sway/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_SWAY bool "sway" - depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider depends on !BR2_STATIC_LIBS # wlroots depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wlroots depends on BR2_PACKAGE_HAS_LIBEGL # wlroots @@ -38,15 +37,6 @@ config BR2_PACKAGE_SWAY_SWAYBAR help Enable support for swaybar -if BR2_PACKAGE_SWAY_SWAYBAR - -config BR2_PACKAGE_SWAY_SWAYBAR_TRAY - bool "swaybar tray" - help - Enable support for swaybar tray - -endif # BR2_PACKAGE_SWAY_SWAYBAR - config BR2_PACKAGE_SWAY_SWAYNAG bool "swaynag" help @@ -54,9 +44,8 @@ config BR2_PACKAGE_SWAY_SWAYNAG endif # BR2_PACKAGE_SWAY -comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" - depends on !BR2_PACKAGE_SYSTEMD || \ - !BR2_PACKAGE_HAS_UDEV || \ +comment "sway needs udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_HAS_UDEV || \ !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ !BR2_PACKAGE_HAS_LIBGLES diff --git a/package/sway/sway.mk b/package/sway/sway.mk index 0aad9de712..089b533baf 100644 --- a/package/sway/sway.mk +++ b/package/sway/sway.mk @@ -8,13 +8,12 @@ SWAY_VERSION = 1.8.1 SWAY_SITE = https://github.com/swaywm/sway/releases/download/$(SWAY_VERSION) SWAY_LICENSE = MIT SWAY_LICENSE_FILES = LICENSE -SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango +SWAY_DEPENDENCIES = host-pkgconf wlroots json-c pcre cairo pango SWAY_CONF_OPTS = \ -Dwerror=false \ -Dzsh-completions=false \ -Dfish-completions=false \ - -Dman-pages=disabled \ - -Dsd-bus-provider=libsystemd + -Dman-pages=disabled ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) SWAY_CONF_OPTS += -Dxwayland=enabled @@ -53,8 +52,9 @@ else SWAY_CONF_OPTS += -Dswaynag=false endif -ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y) -SWAY_CONF_OPTS += -Dtray=enabled +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +SWAY_DEPENDENCIES += systemd +SWAY_CONF_OPTS += -Dtray=enabled -Dsd-bus-provider=libsystemd else SWAY_CONF_OPTS += -Dtray=disabled endif -- 2.43.0 From thomas.petazzoni at bootlin.com Sat Feb 3 06:55:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sat, 03 Feb 2024 06:55:05 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-02 Message-ID: Hello, Autobuild statistics for 2024-02-02 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 5 | 4 | 0 | 9 | 2023.11.x | 3 | 3 | 0 | 6 | master | 48 | 46 | 0 | 94 | Classification of failures by reason for master ----------------------------------------------- axel-2.17.12 | 6 libressl-3.8.2 | 6 linux-6.6.14 | 3 attr-2.5.2 | 2 cegui-00b4e1fe174da53b7ed72... | 2 libarchive-3.7.2 | 2 libopenssl-3.2.0 | 2 openblas-0.3.25 | 2 stunnel-5.71 | 2 bluez5_utils-5.68 | 1 boost-1.83.0 | 1 check-11970a7e112dfe243a2e6... | 1 crun-1.12 | 1 dmraid-1.0.0.rc16-3 | 1 glibc-2.38-44-gd37c2b20a478... | 1 gobject-introspection-1.76.1 | 1 host-gcc-final-12.3.0 | 1 host-rust-1.74.1 | 1 host-sentry-cli-2.20.3 | 1 htop-3.3.0 | 1 ipmitool-1_8_19 | 1 libabseil-cpp-20230802.1 | 1 libcamera-apps-1.2.1 | 1 linux-tools | 1 Makefile:727: target-finalize | 1 openssh-9.6p1 | 1 php-8.2.15 | 1 tcf-agent-1.8.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/cf06fd96f7e16cff9980af6f61edff0268970d6b | microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/05ce01cd38eb843727c63b0b234784be8640d5d0 | aarch64_be | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/87cf5cca360001e3d5ed0524c0dd82daf1d958f4 | mips64 | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/185366701155050bc57c15cca7fe00d7b03212dd | powerpc64le | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/12f2a9002fcd839a5f4810c5c5f3fd990f99c878 | m68k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/33d7c66ed11c29c9e11998fa77fd01c6c01e7794 | sparc64 | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/8bbb5b681fe07a25b1697e61ebdc8ad6a12b68cd | armeb | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/fa8a01b6556e46306d1b4bff5aae1dbc0d547d7f | sh4aeb | bluez5_utils-5.68 | NOK | http://autobuild.buildroot.net/results/a3ef3041d27d13d8d12bbe4a5e38127fb910ed98 | sh4 | boost-1.83.0 | NOK | http://autobuild.buildroot.net/results/4a0c2d637964962c2e31140fb189d67b5c4c6a7c | microblazeel | cegui-00b4e1fe174da53b7ed72... | NOK | http://autobuild.buildroot.net/results/4ff32eff551335875113c7e1c19ef88ec3c80e90 | armeb | cegui-00b4e1fe174da53b7ed72... | NOK | http://autobuild.buildroot.net/results/74a1dcd1581ce3cf8816f458e4fd87a59ac0a6cc | riscv64 | check-11970a7e112dfe243a2e6... | NOK | http://autobuild.buildroot.net/results/f3b25683ab56789d2a31aa58abdd316802e6186a | ORPH arceb | crun-1.12 | NOK | http://autobuild.buildroot.net/results/536614905bc3dd80b4d8994e8d3827a506830bcf | mips64 | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/d79a98238b3dd579186f46792d27231fa062dea9 | ORPH powerpc64le | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/36614be506fed8023485fdf5fe65a97850a9b14e | i686 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/60b92173ed6e2fa921103efe59e6e657099aebc2 | ORPH arm | host-gcc-final-12.3.0 | NOK | http://autobuild.buildroot.net/results/fffd8332f4f7d684b1cd1cf40853665f23addf5c | aarch64 | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/d9dab59fd0fbee06ff3abaffa3e844144476b649 | mips64el | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/4f03ef21b6828110b0ed5d4e8cc250ea2a7f7778 | or1k | htop-3.3.0 | NOK | http://autobuild.buildroot.net/results/45bd7a30d91d82c07a7aed3a79d9e8c30b17406b | ORPH mipsel | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/3c32271c779591e23b09a5e0acd00d3255352689 | microblaze | libabseil-cpp-20230802.1 | NOK | http://autobuild.buildroot.net/results/438f0e5917703f83e392d2830b98e39644cefa6e | powerpc64 | libarchive-3.7.2 | NOK | http://autobuild.buildroot.net/results/2c9a3a308199c99a5f43b4364f8cae0543927b63 | arm | libarchive-3.7.2 | NOK | http://autobuild.buildroot.net/results/031cb8089bda862b1b5b75fb2fb2c71bbdb3c05c | armeb | libcamera-apps-1.2.1 | NOK | http://autobuild.buildroot.net/results/328b9220facf866fed1ab124dfda15cdbc2ea4ba | s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/8774b2bc44d62b5e8232c2453a3586017656d8d2 | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/457aacbdd953b5796ec4682f752014bb9f16c8b8 | ORPH m68k | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/787a284e0d253d30d3bebdc38505f91a4c901ab6 | ORPH mipsel | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/dbc5448b23a446331f30ac5aebc73049bb32da20 | ORPH microblazeel | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/c912a8a2c1f11dbb41d825f7724b2603f98f9f21 | ORPH mipsel | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/8c329dd759cc7fff00ac13c3339b2bf8309aa4bd | ORPH powerpc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/c8e4952fd9ee8befdcaf4e0ba152ddb9f1e27ef0 | ORPH mips | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/aa416a196dc71b34ee9694b9048b8ed16d551f70 | ORPH microblazeel | linux-6.6.14 | NOK | http://autobuild.buildroot.net/results/7fef4db25ef4bf1fd3793a370e924489ce58afcc | ORPH mips64 | linux-6.6.14 | NOK | http://autobuild.buildroot.net/results/018b7dfa2bfd1eaefbdb4de8883594612a0f0219 | ORPH powerpc64le | linux-6.6.14 | NOK | http://autobuild.buildroot.net/results/ad087fcb33886ff06bdeb8532b78cc14028408ee | ORPH powerpc64le | linux-tools | NOK | http://autobuild.buildroot.net/results/4f8a3950c371cf1b9a880ff04e2b3d7097f2711d | ORPH mips64 | Makefile:727: target-finalize | NOK | http://autobuild.buildroot.net/results/358eb1cbc37dc30755747c1a122af27e9cae2333 | mips64 | openblas-0.3.25 | NOK | http://autobuild.buildroot.net/results/e84a7e5c937c8ce3b3b6f5dc09000bc8b1ecd3b2 | i686 | openblas-0.3.25 | NOK | http://autobuild.buildroot.net/results/de38d38309bb5745e4559e2dd5fe140ba178aaa4 | mipsel | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/54396a537689d0063bec92f27b0b233b689355b9 | ORPH microblazeel | php-8.2.15 | NOK | http://autobuild.buildroot.net/results/d272d43046b4bb6b5f567949e0d406074c4bb32b | m68k | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/8854672c48421f99639b1f1c0e783e52a4e8441e | x86_64 | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/a321014c26715945fa3107fdd4995e1d3359499a | powerpc64le | tcf-agent-1.8.0 | NOK | http://autobuild.buildroot.net/results/882e9e0e8d719db357ba5b42b7b290fa493993c0 | Classification of failures by reason for 2023.02.x -------------------------------------------------- coreutils-9.1 | 1 elfutils-0.186 | 1 freeswitch-1.10.11 | 1 raptor-2.0.15 | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4eb | coreutils-9.1 | NOK | http://autobuild.buildroot.net/results/49ea74a69b85f3ee23e1360945afbf28cf8d329b | ORPH microblazeel | elfutils-0.186 | NOK | http://autobuild.buildroot.net/results/428b88bf8435327dff7d82cf53fa4079fada17a2 | ORPH sparc64 | freeswitch-1.10.11 | NOK | http://autobuild.buildroot.net/results/5d6d561eb00de633af582846a7d424db103bbe76 | riscv32 | raptor-2.0.15 | NOK | http://autobuild.buildroot.net/results/c09ae7aa2cd79b5c16d09aaecde10cd2e7d4feaf | ORPH Classification of failures by reason for 2023.11.x -------------------------------------------------- libressl-3.8.2 | 1 micropython-1.22.0 | 1 proj-9.3.0 | 1 Detail of failures for 2023.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64 | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/0fbf30496a563b6b7c2ec297bc28fb326659251d | ORPH i686 | micropython-1.22.0 | NOK | http://autobuild.buildroot.net/results/d0fbbb4dbd0c16c07161bc7190d42a0509ac1f68 | sparc64 | proj-9.3.0 | NOK | http://autobuild.buildroot.net/results/3549aaa5942f804ef82ce30e87a2b01555432367 | Gitlab CI results for 2024-02-02 ================================ Detail of defconfig failures for master --------------------------------------- defconfig | link to the job | orph? ----------------------------------+---------------------------------------------------------------+------ acmesystems_arietta_g25_256mb | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069399598 | arcturus_ucls1012a | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069399619 | armadeus_apf28 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069399669 | at91sam9260eknf | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069399714 | at91sam9x5ek_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400025 | atmel_sama5d3_xplained | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400173 | atmel_sama5d3_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400233 | atmel_sama5d4_xplained_mmc_dev | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400315 | bananapro | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400425 | ORPH beaglev | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400527 | broadcom_northstar | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400544 | chromebook_snow | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400560 | engicam_imx6ul_geam | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400583 | freescale_imx6qsabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400600 | freescale_imx8mmevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400636 | freescale_imx8mpevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400645 | freescale_p1025twr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400662 | ORPH grinn_chiliboard | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400693 | hifive_unleashed | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400702 | imx6-sabreauto | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400718 | imx6slevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400735 | imx6ulpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400752 | imx7dpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400759 | imx8mmpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400760 | imx8mpico | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400767 | imx8mqevk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400771 | imxrt1050-evk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400773 | kontron_bl_imx8mm | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400779 | kontron_pitx_imx8m | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400782 | ls1028ardb | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400794 | octavo_osd32mp1_brk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400867 | octavo_osd32mp1_red | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400871 | orangepi_lite2 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400906 | orangepi_one_plus | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400913 | orangepi_zero3 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069400930 | raspberrypi3_qt5we | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401106 | ORPH raspberrypizero2w | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401118 | sipeed_licheepi_nano | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401145 | snps_arc700_axs101 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401255 | snps_arc700_nsim | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401262 | ORPH socrates_cyclone5 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401284 | ti_am62x_sk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401414 | ti_am64x_sk | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401433 | toradex_apalis_imx6 | https://gitlab.com/buildroot.org/buildroot/-/jobs/6069401437 | -- http://autobuild.buildroot.net From peter at korsgaard.com Sat Feb 3 09:14:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 10:14:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 23.3.5 In-Reply-To: <20240202192126.51102-1-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 2 Feb 2024 20:21:26 +0100") References: <20240202192126.51102-1-bernd@kuhls.net> Message-ID: <8734u9x62r.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 09:14:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 10:14:54 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 6.{1, 6}.x series In-Reply-To: <20240202192933.53122-1-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 2 Feb 2024 20:29:33 +0100") References: <20240202192933.53122-1-bernd@kuhls.net> Message-ID: <87y1c1vrht.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 09:15:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 10:15:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-peripheral-joystick: bump version to 20.1.15-Nexus In-Reply-To: <20240202193506.58522-1-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 2 Feb 2024 20:35:06 +0100") References: <20240202193506.58522-1-bernd@kuhls.net> Message-ID: <87ttmpvrhj.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 09:15:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 10:15:15 +0100 Subject: [Buildroot] [PATCH 1/2] package/intel-mediadriver: bump version to 24.1.3 In-Reply-To: <20240202222040.2390770-1-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 2 Feb 2024 23:20:39 +0100") References: <20240202222040.2390770-1-bernd@kuhls.net> Message-ID: <87plxdvrh8.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 09:20:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 10:20:20 +0100 Subject: [Buildroot] [PATCH 2/2] package/onevpl-intel-gpu: bump version to 24.1.3 In-Reply-To: <20240202222040.2390770-2-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 2 Feb 2024 23:20:40 +0100") References: <20240202222040.2390770-1-bernd@kuhls.net> <20240202222040.2390770-2-bernd@kuhls.net> Message-ID: <87le81vr8r.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 09:14:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 10:14:20 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240203092054.574FE8640A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52a15667b122575919bd7207a16872e8eb229bfd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 662bd09162..da22b439e3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.15" 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 d7082aa629..10edcc2ed9 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584 linux-6.6.14.tar.xz -sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz +sha256 ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa linux-6.6.15.tar.xz +sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index bf55c8714a..a0e572adc0 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.75" if BR2_KERNEL_HEADERS_6_1 - default "6.6.14" if BR2_KERNEL_HEADERS_6_6 + default "6.1.76" if BR2_KERNEL_HEADERS_6_1 + default "6.6.15" if BR2_KERNEL_HEADERS_6_6 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 \ From peter at korsgaard.com Sat Feb 3 09:15:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 10:15:28 +0100 Subject: [Buildroot] [git commit] package/onevpl-intel-gpu: bump version to 24.1.3 Message-ID: <20240203092054.7791686418@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62a5510c219e2b45fa6bb6c21b543d7a78c4fbdf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index d1e671f96a..a45758a2c3 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e0bd388c04740dd9f2e8ca989bc54428c13a531ed4c097d00f06aa6e58a6d15c onevpl-intel-gpu-24.1.1.tar.gz +sha256 15d34e4304d7aeb5ea5e529b6f51171109cef42525113321f675bc14e56c697e onevpl-intel-gpu-24.1.3.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index 52fbe2ed9b..509698ce26 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 24.1.1 +ONEVPL_INTEL_GPU_VERSION = 24.1.3 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE From peter at korsgaard.com Sat Feb 3 09:15:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 10:15:02 +0100 Subject: [Buildroot] [git commit] package/kodi-peripheral-joystick: bump version to 20.1.15-Nexus Message-ID: <20240203092054.623EF8640B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49ee9ca5aca21abfc45034424d825bd81434221d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash | 2 +- package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash index 550da61981..d4765d2b2c 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8c3dde851e45549d13ca3fcead9c27c440dfe070d68fb473ae71c522bc54753a kodi-peripheral-joystick-20.1.14-Nexus.tar.gz +sha256 7292431b26e3ea969967a02f42ce48cae7742398b148ca041470c17934d06272 kodi-peripheral-joystick-20.1.15-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk index 2fe6c29c0d..d81962562c 100644 --- a/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk +++ b/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.14-Nexus +KODI_PERIPHERAL_JOYSTICK_VERSION = 20.1.15-Nexus KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION)) KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+ KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Sat Feb 3 09:14:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 10:14:12 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 23.3.5 Message-ID: <20240203092054.4C64986409@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=881fbdb674878a010f0ddb3d5d9447be3fc8eea2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index d04fa10342..b9b328b268 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.3.4 +MESA3D_HEADERS_VERSION = 23.3.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e99027c013..7e49119c41 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-January/000745.html -sha256 df12d765be4650fe532860b18aa18e6da1d0b07d1a21dfdfe04660e6b7bac39a mesa-23.3.4.tar.xz -sha512 026c424989a594dd840dc158ca09e0f57e604f0b1bd2a3981110b4b2b5a47c6cd9c7241c7f48957a781e2dd9f9760cc9db79b2fb7c7fe39b64eddb18dcf18412 mesa-23.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html +sha256 69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f mesa-23.3.5.tar.xz +sha512 1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea mesa-23.3.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d8d8fb8dd6..d622d513f0 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.3.4 +MESA3D_VERSION = 23.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From peter at korsgaard.com Sat Feb 3 09:15:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 10:15:12 +0100 Subject: [Buildroot] [git commit] package/intel-mediadriver: bump version to 24.1.3 Message-ID: <20240203092054.6CF5086414@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd31d973d7550f27b954d7987e4a652ff451e7d0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index feade4974c..a1b098094b 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 da90f3c38176936f6315bb4b0f04f6f83080f9a6a228294538aa6befe9ce20e0 intel-media-24.1.1.tar.gz +sha256 a024e96abd662193e4295f427a76c5894087503df46bd82c0e5bea103e44b171 intel-media-24.1.3.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index f526de193c..72a22fe5c9 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.1.1 +INTEL_MEDIADRIVER_VERSION = 24.1.3 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From peter at korsgaard.com Sat Feb 3 10:02:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:02:48 +0100 Subject: [Buildroot] [PATCH 1/2 v2] package/libjwt: new package In-Reply-To: (Waldemar Brodkorb's message of "Fri, 2 Feb 2024 16:56:14 +0100") References: Message-ID: <87h6ipvp9z.fsf@48ers.dk> >>>>> "Waldemar" == Waldemar Brodkorb writes: > JSON Web Tokens are an open, industry standard RFC 7519 > method for representing claims securely between two parties. > This Library is used by Asterisk 20.6.0 and newer. > We need to use autotools to install pkgconfig file. > Signed-off-by: Waldemar Brodkorb > --- > package/Config.in | 1 + > package/libjwt/Config.in | 9 +++++++++ > package/libjwt/libjwt.hash | 3 +++ > package/libjwt/libjwt.mk | 16 ++++++++++++++++ > 4 files changed, 29 insertions(+) > create mode 100644 package/libjwt/Config.in > create mode 100644 package/libjwt/libjwt.hash > create mode 100644 package/libjwt/libjwt.mk > diff --git a/package/Config.in b/package/Config.in > index 426bd7d090..75a94177eb 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1846,6 +1846,7 @@ menu "JSON/XML" > source "package/libbson/Config.in" > source "package/libfastjson/Config.in" > source "package/libjson/Config.in" > + source "package/libjwt/Config.in" > source "package/libroxml/Config.in" > source "package/libucl/Config.in" > source "package/libxml2/Config.in" > diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in > new file mode 100644 > index 0000000000..d6bca54adc > --- /dev/null > +++ b/package/libjwt/Config.in > @@ -0,0 +1,9 @@ > +config BR2_PACKAGE_LIBJWT > + bool "libjwt" > + select BR2_PACKAGE_OPENSSL > + select BR2_PACKAGE_JANSSON > + help > + JSON Web Tokens are an open, industry standard RFC 7519 I've dropped the trailing spaces here. > diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk > new file mode 100644 > index 0000000000..f7be28d206 > --- /dev/null > +++ b/package/libjwt/libjwt.mk > @@ -0,0 +1,16 @@ > +################################################################################ > +# > +# libjwt > +# > +################################################################################ > + > +LIBJWT_VERSION = 1.15.3 > +LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) > +LIBJWT_SOURCE = libjwt-$(LIBJWT_VERSION).tar.gz THis is the default value for _SOURCE as pointed out by ./utils/check-package, so I've dropped that. > +LIBJWT_DEPENDENCIES = jansson openssl The configure script uses pkg-config, so I've added host-pkgconf here. You also forgot to add an entry to DEVELOPERS, so I've added that. Committed with those fixes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:02:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:02:05 +0100 Subject: [Buildroot] [git commit] package/libjwt: new package Message-ID: <20240203100313.6E1CA865AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7251775773011e7da38e3a33c6817eceab6a9dfa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master JSON Web Tokens are an open, industry standard RFC 7519 method for representing claims securely between two parties. This Library is used by Asterisk 20.6.0 and newer. We need to use autotools to install pkgconfig file. Signed-off-by: Waldemar Brodkorb [Peter: drop _SOURCE, add host-pkgconf, add to DEVELOPERS] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + package/Config.in | 1 + package/libjwt/Config.in | 9 +++++++++ package/libjwt/libjwt.hash | 3 +++ package/libjwt/libjwt.mk | 15 +++++++++++++++ 5 files changed, 29 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index cc9bc5b5cc..02b7516a92 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3116,6 +3116,7 @@ F: package/ngrep/ N: Waldemar Brodkorb F: package/asterisk/ +F: package/libjwt/ F: package/mksh/ F: package/ruby/ F: package/uclibc/ diff --git a/package/Config.in b/package/Config.in index 426bd7d090..75a94177eb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1846,6 +1846,7 @@ menu "JSON/XML" source "package/libbson/Config.in" source "package/libfastjson/Config.in" source "package/libjson/Config.in" + source "package/libjwt/Config.in" source "package/libroxml/Config.in" source "package/libucl/Config.in" source "package/libxml2/Config.in" diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in new file mode 100644 index 0000000000..fa042d67ef --- /dev/null +++ b/package/libjwt/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBJWT + bool "libjwt" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_JANSSON + help + JSON Web Tokens are an open, industry standard RFC 7519 + method for representing claims securely between two parties. + + https://github.com/benmcollins/libjwt diff --git a/package/libjwt/libjwt.hash b/package/libjwt/libjwt.hash new file mode 100644 index 0000000000..47e8b2c506 --- /dev/null +++ b/package/libjwt/libjwt.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cb2fd95123689e7d209a3a8c060e02f68341c9a5ded524c0cd881a8cd20d711f libjwt-1.15.3.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk new file mode 100644 index 0000000000..6ae1717b7d --- /dev/null +++ b/package/libjwt/libjwt.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# libjwt +# +################################################################################ + +LIBJWT_VERSION = 1.15.3 +LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) +LIBJWT_DEPENDENCIES = host-pkgconf jansson openssl +LIBJWT_AUTORECONF = YES +LIBJWT_INSTALL_STAGING = YES +LIBJWT_LICENSE = MPL-2.0 +LIBJWT_LICENSE_FILES = LICENSE + +$(eval $(autotools-package)) From peter at korsgaard.com Sat Feb 3 10:05:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:05:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/crda: drop CRDA_CPE_ID_VENDOR In-Reply-To: <20240201174641.183601-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:46:41 +0100") References: <20240201174641.183601-1-fontaine.fabrice@gmail.com> Message-ID: <87cytdvp50.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:kernel:crda added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:05:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:05:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/depot-tools: drop DEPOT_TOOLS_CPE_ID_VENDOR In-Reply-To: <20240201174829.184788-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:48:29 +0100") References: <20240201174829.184788-1-fontaine.fabrice@gmail.com> Message-ID: <878r41vp4w.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:google:depot-tools added by commit > 48730a1a9d882a7c56146bd2955e074aed790dcb has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:google:depot-tools > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:06:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:06:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpfr: fix CPE variables In-Reply-To: <20240201175202.186929-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:52:02 +0100") References: <20240201175202.186929-1-fontaine.fabrice@gmail.com> Message-ID: <874jepvp4a.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:gnu:mpfr added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE > identifier for this package > cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:08:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:08:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: fix CPE variable In-Reply-To: <20240201214304.301544-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 22:43:04 +0100") References: <20240201214304.301544-1-fontaine.fabrice@gmail.com> Message-ID: <87zfwhuag1.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set > LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR > Signed-off-by: Fabrice Fontaine Committed, thanks. > --- > package/lvm2/lvm2.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk > index ee43cb6c19..02ea748439 100644 > --- a/package/lvm2/lvm2.mk > +++ b/package/lvm2/lvm2.mk > @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 > LVM2_INSTALL_STAGING = YES > LVM2_LICENSE = GPL-2.0, LGPL-2.1 > LVM2_LICENSE_FILES = COPYING COPYING.LIB > -LVM2_CPE_ID_PRODUCT = redhat > +LVM2_CPE_ID_VENDOR = redhat > LVM2_SELINUX_MODULES = lvm > # Make sure that binaries and libraries are installed with write FYI, your tree is not in sync with master, so I had to apply this manually. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:07:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:07:45 +0100 Subject: [Buildroot] [git commit] package/lvm2: fix CPE variable Message-ID: <20240203100847.D77558673C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c0d9795a7a75a36574a7cc89107d71cb32fd20e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lvm2/lvm2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 474ea30bdc..810d668ec2 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB -LVM2_CPE_ID_PRODUCT = redhat +LVM2_CPE_ID_VENDOR = redhat # parallel build issues LVM2_MAKE = $(MAKE1) From peter at korsgaard.com Sat Feb 3 10:04:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:04:49 +0100 Subject: [Buildroot] [git commit] package/crda: drop CRDA_CPE_ID_VENDOR Message-ID: <20240203100847.AFA868671F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85d300f1021df905e60e704407b68dbed75ba430 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:kernel:crda added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/crda/crda.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/crda/crda.mk b/package/crda/crda.mk index a73c9aa26d..8043260cfc 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -9,7 +9,6 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE -CRDA_CPE_ID_VENDOR = kernel define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ From peter at korsgaard.com Sat Feb 3 10:05:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:05:30 +0100 Subject: [Buildroot] [git commit] package/depot-tools: drop DEPOT_TOOLS_CPE_ID_VENDOR Message-ID: <20240203100847.C11A786737@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=27fafa94a729b2c59d5eb0aec0bedbaf9dce5abb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:google:depot-tools added by commit 48730a1a9d882a7c56146bd2955e074aed790dcb has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:google:depot-tools Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/depot-tools/depot-tools.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index 634258ffbb..a53afa14d6 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -9,7 +9,6 @@ DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause DEPOT_TOOLS_LICENSE_FILES = LICENSE -DEPOT_TOOLS_CPE_ID_VENDOR = google HOST_DEPOT_TOOLS_DEPENDENCIES = \ host-python3 \ From peter at korsgaard.com Sat Feb 3 10:06:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:06:08 +0100 Subject: [Buildroot] [git commit] package/mpfr: fix CPE variables Message-ID: <20240203100847.CDBB58673B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=186883f497cf1c3985c9b802435ddd3b6c431167 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:gnu:mpfr added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE identifier for this package cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mpfr/mpfr.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 8d12c7502b..c0c8c04646 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -9,7 +9,8 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER -MPFR_CPE_ID_VENDOR = gnu +MPFR_CPE_ID_VENDOR = mpfr +MPFR_CPE_ID_PRODUCT = gnu_mpfr MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp From peter at korsgaard.com Sat Feb 3 10:10:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:10:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/minizip: fix CPE variables In-Reply-To: <20240201221659.320957-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 23:16:59 +0100") References: <20240201221659.320957-1-fontaine.fabrice@gmail.com> Message-ID: <87v875uac8.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:minizip_project:minizip added by commit > 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier > for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: > https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:10:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:10:41 +0100 Subject: [Buildroot] [git commit] package/minizip: fix CPE variables Message-ID: <20240203101104.AA02486749@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1e05a8199514310443777bc4dce1e2a6d2b69c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:minizip_project:minizip added by commit 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/minizip/minizip.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 5a4d920369..819b33b701 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -14,7 +14,8 @@ MINIZIP_CONF_OPTS = \ -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project +MINIZIP_CPE_ID_VENDOR = zlib-ng +MINIZIP_CPE_ID_PRODUCT = minizip-ng ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 From peter at korsgaard.com Sat Feb 3 10:11:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:11:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvips: update LIBVIPS_CPE_ID_VENDOR In-Reply-To: <20240201172051.165994-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:20:51 +0100") References: <20240201172051.165994-1-fontaine.fabrice@gmail.com> Message-ID: <87r0htuaap.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:libvips_project:libvips has been deprecated in favor of > cpe:2.3:a:libvips:libvips in September 2023: > > libvips Project libvips 8.10.6 - > Project > Change Log > > > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:11:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:11:24 +0100 Subject: [Buildroot] [git commit] package/libvips: update LIBVIPS_CPE_ID_VENDOR Message-ID: <20240203101303.17CA78673D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e4eba64140eea6adea87234d9736ae211bd352e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:libvips_project:libvips has been deprecated in favor of cpe:2.3:a:libvips:libvips in September 2023: libvips Project libvips 8.10.6 - Project Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libvips/libvips.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 1a0f9d5ead..8eb1f0964e 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -9,7 +9,7 @@ LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -LIBVIPS_CPE_ID_VENDOR = libvips_project +LIBVIPS_CPE_ID_VENDOR = libvips # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported From peter at korsgaard.com Sat Feb 3 10:31:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:31:49 +0100 Subject: [Buildroot] [PATCH 2/2 v2] package/asterisk: bump to 20.6.0 In-Reply-To: (Waldemar Brodkorb's message of "Fri, 2 Feb 2024 16:58:56 +0100") References: Message-ID: <87msshu9d6.fsf@48ers.dk> >>>>> "Waldemar" == Waldemar Brodkorb writes: > See here for changes: > https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md > Signed-off-by: Waldemar Brodkorb > --- v1-> v2: > - use separate libjwt package instead of bundled one, suggested by > Peter Korsgaard > --- > package/asterisk/Config.in | 1 + > package/asterisk/asterisk.hash | 2 +- > package/asterisk/asterisk.mk | 6 ++++-- > 3 files changed, 6 insertions(+), 3 deletions(-) > diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in > index c52456f8fc..662f070dac 100644 > --- a/package/asterisk/Config.in > +++ b/package/asterisk/Config.in > @@ -10,6 +10,7 @@ config BR2_PACKAGE_ASTERISK > select BR2_PACKAGE_LIBCURL > select BR2_PACKAGE_LIBEDIT > select BR2_PACKAGE_LIBILBC > + select BR2_PACKAGE_LIBJWT > select BR2_PACKAGE_LIBXML2 > select BR2_PACKAGE_SQLITE > select BR2_PACKAGE_UTIL_LINUX > diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash > index 246f4219aa..d50955dd2b 100644 > --- a/package/asterisk/asterisk.hash > +++ b/package/asterisk/asterisk.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.tar.gz > +sha256 088dbc08916e21528dba364f5452b2090b066dbba4548b32ec10af138d4b442f asterisk-20.6.0.tar.gz > # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases > # sha256 locally computed > diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk > index d1f3ea82d3..869e4128ff 100644 > --- a/package/asterisk/asterisk.mk > +++ b/package/asterisk/asterisk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -ASTERISK_VERSION = 20.5.2 > +ASTERISK_VERSION = 20.6.0 > # Use the github mirror: it's an official mirror maintained by Digium, and > # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. > ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) > @@ -27,7 +27,7 @@ ASTERISK_SELINUX_MODULES = asterisk > # For patches 0002 and 0003 > ASTERISK_AUTORECONF = YES > -ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson > +ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson -Ithird-party/libjwt Why do we still need to point autoreconf to the bundle libjwt? Even worse, I see the following during the configure step: checking for embedded pjproject (may have to download)... configuring [pjproject] Downloading https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13.1/pjproject-2.13.1.tar.bz2 to /tmp/pjproject-2.13.1.tar.bz2 [pjproject] Verifying /tmp/pjproject-2.13.1.tar.bz2 [pjproject] Verify successful [pjproject] Verifying /tmp/pjproject-2.13.1.tar.bz2 [pjproject] Verify successful [pjproject] Unpacking /tmp/pjproject-2.13.1.tar.bz2 We don't want packages to download stuff behind our back. Can we use an external pjproject? -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sat Feb 3 10:35:01 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 11:35:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/rauc-hawkbit-updater: drop RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR Message-ID: <20240203103501.41738-1-fontaine.fabrice@gmail.com> cpe:2.3:a:pengutronix:rauc-hawkbit-updater added by commit 928b7219cd7079864eadadc66dbff21c5cd72804 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:pengutronix:rauc-hawkbit-updater Signed-off-by: Fabrice Fontaine --- package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index 10ba91abbb..a453f75a28 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -9,7 +9,6 @@ RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/release RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE -RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl $(eval $(meson-package)) -- 2.43.0 From peter at korsgaard.com Sat Feb 3 10:39:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:39:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/libuwsc: fix wolfssl build In-Reply-To: <20240114155626.1563626-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 14 Jan 2024 16:56:26 +0100") References: <20240114155626.1563626-1-fontaine.fabrice@gmail.com> Message-ID: <87il35u90d.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 1567fbd72d4b547f70a7509247bf9abb73ab58e3 didn't fully fix the > wolfssl build failure because the include on wolfssl/options.h was still > missing: > /home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' > 62 | SSL_CTX *ctx; > | ^~~~~~~ > While at it, add upstream tag to patches > Fixes: > - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:39:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:39:09 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/libuwsc: fix wolfssl build Message-ID: <20240203104253.21F748679A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56c80a2830698da2b6d80081625f39697900325f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 1567fbd72d4b547f70a7509247bf9abb73ab58e3 didn't fully fix the wolfssl build failure because the include on wolfssl/options.h was still missing: /home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' 62 | SSL_CTX *ctx; | ^~~~~~~ While at it, add upstream tag to patches Fixes: - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e874fd08e01a8d543520f867d95ae8a6a9fa242e) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 -- .../0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch | 2 +- package/libuwsc/0002-fix-bad-indentation.patch | 3 +- .../libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch | 37 ++++++++++++++++++++++ 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index dde9c6311e..0554ffde5b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -755,8 +755,6 @@ package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch Upstream package/libuio/0001-configure.ac-set-automake-strictness-to-foreign.patch Upstream package/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch Upstream package/libusbgx/0001-Add-include-of-sys-sysmacro.h.patch Upstream -package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch Upstream -package/libuwsc/0002-fix-bad-indentation.patch Upstream package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch Upstream package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch Upstream package/libwebsock/0002-fix-ssl.patch Upstream diff --git a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch index 197dd1de0f..87f343a9d9 100644 --- a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch +++ b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch @@ -6,7 +6,7 @@ Subject: [PATCH] CMakeLists.txt: add BUILD_EXAMPLE Allow the user to disable example Signed-off-by: Fabrice Fontaine -[yann.morin.1998 at free.fr: backport from upstream] +Upstream: https://github.com/zhaojh329/libuwsc/commit/bb71b21eb9407479ad729b3c858b0fc350fae335 Signed-off-by: Yann E. MORIN --- CMakeLists.txt | 6 +++++- diff --git a/package/libuwsc/0002-fix-bad-indentation.patch b/package/libuwsc/0002-fix-bad-indentation.patch index f33f944d06..77cae92cf2 100644 --- a/package/libuwsc/0002-fix-bad-indentation.patch +++ b/package/libuwsc/0002-fix-bad-indentation.patch @@ -5,8 +5,7 @@ Subject: [PATCH] fix bad indentation Fixes error with GCC11. -[Retrieved from: -https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab] +Upstream: https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab Signed-off-by: Fabrice Fontaine --- src/lua/uwsc_lua.c | 2 +- diff --git a/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch new file mode 100644 index 0000000000..4c652a63c2 --- /dev/null +++ b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch @@ -0,0 +1,37 @@ +From 1c3579e99163a13d622c3ef44088c23d5eea306d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Jan 2024 16:44:13 +0100 +Subject: [PATCH] src/ssl.c: fix wolfssl build + +wolfssl/options.h must also be included by clients to avoid the +following build failure because OPENSSL_ALL won't be defined: + +/home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' + 62 | SSL_CTX *ctx; + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 + +Signed-off-by: Fabrice Fontaine +Upstream: N/A (already fixed by +https://github.com/zhaojh329/ssl/commit/c40ebcd7b4277321acbbd4b00b4b10fd363c7a97) +--- + src/ssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ssl.c b/src/ssl.c +index 3640022..6a3d250 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -54,6 +54,7 @@ struct uwsc_ssl_ctx { + #include + #elif UWSC_HAVE_WOLFSSL + #define WC_NO_HARDEN ++#include + #include + #include + #endif +-- +2.43.0 + From peter at korsgaard.com Sat Feb 3 10:38:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:38:11 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/libuwsc: fix wolfssl build Message-ID: <20240203104359.5251B8679D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c2621bb60178904ad7914637743a63104173655 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit 1567fbd72d4b547f70a7509247bf9abb73ab58e3 didn't fully fix the wolfssl build failure because the include on wolfssl/options.h was still missing: /home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' 62 | SSL_CTX *ctx; | ^~~~~~~ While at it, add upstream tag to patches Fixes: - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit e874fd08e01a8d543520f867d95ae8a6a9fa242e) Signed-off-by: Peter Korsgaard --- .../0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch | 2 +- package/libuwsc/0002-fix-bad-indentation.patch | 3 +- .../libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch | 37 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch index 197dd1de0f..87f343a9d9 100644 --- a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch +++ b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch @@ -6,7 +6,7 @@ Subject: [PATCH] CMakeLists.txt: add BUILD_EXAMPLE Allow the user to disable example Signed-off-by: Fabrice Fontaine -[yann.morin.1998 at free.fr: backport from upstream] +Upstream: https://github.com/zhaojh329/libuwsc/commit/bb71b21eb9407479ad729b3c858b0fc350fae335 Signed-off-by: Yann E. MORIN --- CMakeLists.txt | 6 +++++- diff --git a/package/libuwsc/0002-fix-bad-indentation.patch b/package/libuwsc/0002-fix-bad-indentation.patch index f33f944d06..77cae92cf2 100644 --- a/package/libuwsc/0002-fix-bad-indentation.patch +++ b/package/libuwsc/0002-fix-bad-indentation.patch @@ -5,8 +5,7 @@ Subject: [PATCH] fix bad indentation Fixes error with GCC11. -[Retrieved from: -https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab] +Upstream: https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab Signed-off-by: Fabrice Fontaine --- src/lua/uwsc_lua.c | 2 +- diff --git a/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch new file mode 100644 index 0000000000..4c652a63c2 --- /dev/null +++ b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch @@ -0,0 +1,37 @@ +From 1c3579e99163a13d622c3ef44088c23d5eea306d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Jan 2024 16:44:13 +0100 +Subject: [PATCH] src/ssl.c: fix wolfssl build + +wolfssl/options.h must also be included by clients to avoid the +following build failure because OPENSSL_ALL won't be defined: + +/home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' + 62 | SSL_CTX *ctx; + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 + +Signed-off-by: Fabrice Fontaine +Upstream: N/A (already fixed by +https://github.com/zhaojh329/ssl/commit/c40ebcd7b4277321acbbd4b00b4b10fd363c7a97) +--- + src/ssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ssl.c b/src/ssl.c +index 3640022..6a3d250 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -54,6 +54,7 @@ struct uwsc_ssl_ctx { + #include + #elif UWSC_HAVE_WOLFSSL + #define WC_NO_HARDEN ++#include + #include + #include + #endif +-- +2.43.0 + From peter at korsgaard.com Sat Feb 3 10:56:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 11:56:24 +0100 Subject: [Buildroot] [PATCH/2023.11.x 1/1] package/onevpl: fix libdrm dependency In-Reply-To: <20240114192123.3237389-1-bernd@kuhls.net> (Bernd Kuhls's message of "Sun, 14 Jan 2024 20:21:23 +0100") References: <20240114192123.3237389-1-bernd@kuhls.net> Message-ID: <87eddtu887.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Buildroot commit c50e9c21f0444b064bc257fcc0d3073fee945623 initially > added the package onevpl and forgot to add all dependencies of > BR2_PACKAGE_LIBDRM_INTEL. > Fixes: > http://autobuild.buildroot.org/results/8fa/8fa0f2cd7a027d3d8fae56125621b0b814e132da/ > Signed-off-by: Bernd Kuhls Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 10:48:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 11:48:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/onevpl: fix libdrm dependency Message-ID: <20240203105723.29EB8867A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=710935ea5f988ed36d0184cd0eb3fcfa695a0995 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Buildroot commit c50e9c21f0444b064bc257fcc0d3073fee945623 initially added the package onevpl and forgot to add all dependencies of BR2_PACKAGE_LIBDRM_INTEL. Fixes: http://autobuild.buildroot.org/results/8fa/8fa0f2cd7a027d3d8fae56125621b0b814e132da/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/onevpl/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/onevpl/Config.in b/package/onevpl/Config.in index a750e54d52..cd5b284531 100644 --- a/package/onevpl/Config.in +++ b/package/onevpl/Config.in @@ -12,7 +12,9 @@ config BR2_PACKAGE_ONEVPL depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND # libva support needs a libdrm with intel driver - select BR2_PACKAGE_LIBDRM_INTEL if BR2_PACKAGE_LIBVA + select BR2_PACKAGE_LIBDRM_INTEL if BR2_PACKAGE_LIBVA && \ + (BR2_i386 || BR2_x86_64) && \ + BR2_PACKAGE_LIBDRM_HAS_ATOMIC select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 help From peter at korsgaard.com Sat Feb 3 11:24:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 12:24:38 +0100 Subject: [Buildroot] [PATCH v4 1/1] package/flutter-sdk-bin/Config.in.host: change flutter-pub-cache location In-Reply-To: <20240113194950.11170-1-adam.duskett@amarulasolutions.com> (Adam Duskett's message of "Sat, 13 Jan 2024 12:49:50 -0700") References: <20240113194950.11170-1-adam.duskett@amarulasolutions.com> Message-ID: <87a5ohu6x5.fsf@48ers.dk> >>>>> "Adam" == Adam Duskett writes: > When running the command "flutter pub get," the plugins are stored in the > pub-cache directory along with their sha256sum hashes. The default location of > the pub-cache directory is current $(HOST_DIR)/share/flutter/sdk/.pub-cache, > which is not an acceptable choice by default because every plugin is > re-downloaded during every build of a flutter application either during a new > build or when building with the per-package-directory option enabled. > Furthermore, keeping the pub-cache in its current location prevents users from > committing the pub-cache directory to git for faster rebuilds of a > Buildroot-based system, as users cannot store the pub-cache for later use. > To fix the above issue completely, the following two changes must occur: > - Change the hard-coded Flutter pub-cache location to > $(DL_DIR)/br-flutter-pub-cache. > - Remove the `rm -rf $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache` and the > associated comment about why the build system removes the .pub-cache > directory. After further research, the help text of the precache command > reads, "Populate the Flutter tool's cache of binary artifacts." > The current reasoning listed in the comments is not accurate for a > the following reasons: > 1. We do not want to remove their directory if users already have a pub > cache they have symlinked to. > 2. If the flutter-sdk-bin package previously set up the pub-cache, then > the pub-cache directory is set up with the options we want, and there > is no reason to remove the pub-cache directory. > Signed-off-by: Adam Duskett > --- > changes v3 -> v4: > - Hardcode the directory to $(DL_DIR)/br-flutter-pub-cache. [Yann] > - Remove the `rm -rf $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache` line. [Yann] > - Remove the associated comments about the above line. [Yann] > - Expand the commit log. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 11:27:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 12:27:10 +0100 Subject: [Buildroot] [PATCH v3 02/10] package/depot-tools: bump version to 8d14454ba4a35fd9d2483842b08815a2357ec86f In-Reply-To: (Yann E. MORIN's message of "Sat, 20 Jan 2024 22:45:19 +0100") References: <20240117225049.28443-1-adam.duskett@amarulasolutions.com> <20240117225049.28443-3-adam.duskett@amarulasolutions.com> Message-ID: <875xz5u6sx.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Adam, All, > On 2024-01-17 15:50 -0700, Adam Duskett spake thusly: > The comments you provided in the cover letter really belonged to this > commmit log, so I copied that as-is (apart for line-wrapping). >> Signed-off-by: Adam Duskett > Applied to master, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 11:28:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 12:28:10 +0100 Subject: [Buildroot] [git commit] package/flutter-engine/Config.in: Drop nptl dependency In-Reply-To: <20240120214300.5069386308@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 20 Jan 2024 21:44:12 +0100") References: <20240120214300.5069386308@busybox.osuosl.org> Message-ID: <871q9tu6r9.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=019cfcfc4a108112306f30c38c1a17fc42841e15 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > As Yann mentioned in commit 9d8497e79de3ced144877ba6ee38cc5b7181aaeb, a > dependency on a glibc toolchain implies a dependency on > BR2_TOOLCHAIN_HAS_THREADS_NPTL. As such, remove the dependency from > package/flutter-engine/Config.in. > Signed-off-by: Adam Duskett > Signed-off-by: Yann E. MORIN Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 11:23:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 12:23:28 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-sdk-bin/Config.in.host: change flutter-pub-cache location Message-ID: <20240203112820.74A43867B3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=003d02c476b9ff88416f9cc99dbb4a3c0f78664a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x When running the command "flutter pub get," the plugins are stored in the pub-cache directory along with their sha256sum hashes. The default location of the pub-cache directory is current $(HOST_DIR)/share/flutter/sdk/.pub-cache, which is not an acceptable choice by default because every plugin is re-downloaded during every build of a flutter application either during a new build or when building with the per-package-directory option enabled. Furthermore, keeping the pub-cache in its current location prevents users from committing the pub-cache directory to git for faster rebuilds of a Buildroot-based system, as users cannot store the pub-cache for later use. To fix the above issue completely, the following two changes must occur: - Change the hard-coded Flutter pub-cache location to $(DL_DIR)/br-flutter-pub-cache. - Remove the `rm -rf $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache` and the associated comment about why the build system removes the .pub-cache directory. After further research, the help text of the precache command reads, "Populate the Flutter tool's cache of binary artifacts." The current reasoning listed in the comments is not accurate for a the following reasons: 1. We do not want to remove their directory if users already have a pub cache they have symlinked to. 2. If the flutter-sdk-bin package previously set up the pub-cache, then the pub-cache directory is set up with the options we want, and there is no reason to remove the pub-cache directory. Note that upstream considers it safe to have multiple instances of readers/writers to the pub cache concurently, which is a situation that can happen when two flutter-based pacakges are going to be built in parallel. There have been reports upstream [0] [1] [2] where concurrency was an issue, and they have always been fixed [3] [4] (or considered fixed already). So we can assune that, if the conncurrent ccess to the shared pub-cache causes issues, that will be an upstream bug that will get solved. If that turns out to be an unsolvable problem, we'll still have the option to run the pub-get commands under flock. [0] https://github.com/dart-lang/pub/issues/1178 [1] https://github.com/dart-lang/pub/issues/3404 [2] https://github.com/dart-lang/pub/issues/3420 [3] https://github.com/dart-lang/pub/issues/1178#issuecomment-1006489414 [4] https://github.com/dart-lang/pub/issues/1178#issuecomment-1007273739 Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: add blurb about concurrent access] Signed-off-by: Yann E. MORIN (cherry picked from commit 37809258fc014d743f7becbc5ba256234d807bd7) Signed-off-by: Peter Korsgaard --- package/flutter-sdk-bin/flutter-sdk-bin.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index e8e71b6ab0..35bde00b9d 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -41,11 +41,8 @@ define HOST_FLUTTER_SDK_BIN_CONFIGURE_CMDS $(HOST_FLUTTER_SDK_BIN_ENV) $(@D)/bin/dart --disable-analytics endef -# Remove the cache, as we will run precache after setting up flutter and dart -# with the new config options. define HOST_FLUTTER_SDK_BIN_BUILD_CMDS mkdir -p $(HOST_FLUTTER_SDK_BIN_SDK) - rm -rf $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache cd $(@D) && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(@D)/bin/flutter precache; endef @@ -96,4 +93,4 @@ HOST_FLUTTER_SDK_BIN_DART_BIN = \ $(eval $(host-generic-package)) # For target packages to locate said pub-cache -FLUTTER_SDK_BIN_PUB_CACHE = $(HOST_FLUTTER_SDK_BIN_SDK)/.pub-cache +FLUTTER_SDK_BIN_PUB_CACHE = $(DL_DIR)/br-flutter-pub-cache From peter at korsgaard.com Sat Feb 3 11:26:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 12:26:39 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/depot-tools: bump version to 8d14454ba4a35fd9d2483842b08815a2357ec86f Message-ID: <20240203112820.842E4867B4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7207a1242ae137cabf188456f7314becca9a0401 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The current depot-tools version is from Jul 13 2023, and there is a bug where when building with PPD enabled, building a Flutter application on my laptop running Fedora 39 or even in the Debian 11 container fails due to permission issues when running rsync such as: /usr/bin/sed: couldn't open temporary file [...]/output/per-package/flutter-gallery/host/share/flutter/sdk/.vpython-root/0e1e32/lib/python3.8/sed763MrF: Permission denied make: *** [package/pkg-generic.mk:267: [...]/output/build/flutter-gallery-2.10.2/.stamp_configured] Error 123 After several hours of attempting to find the exact cause of the issue by parsing git logs of the depot_tools repository and cross-referencing bugs on https://bugs.chromium.org/p/chromium/issues I am unable to determine the exact reason why the problem occurs or the exact commit that fixes the issue. However, updating depot-tools does indeed fix the issue, and looking at the source code between 4e87f5bf and 8d14454b shows improvements to several bash scripts, such as gclient, vpython3, and spid. All of which could be culprits of this bug. As flutter-engine is the only package that uses host-depot-tools, it is safe to update. This permission bug is present on PPD and normal builds, but causes a build to crash only on PPD because of rsyncing. On non-ppd builds, the bug only causes some minor annoyance when trying to run `make clean` because permission denials crop up when trying to remove the .vpython-root directory. Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: - copy the cover-letter description as commit log ] Signed-off-by: Yann E. MORIN (cherry picked from commit 2b7b68cfe56459f24684cdc2237b35b6c240cbf8) Signed-off-by: Peter Korsgaard --- package/depot-tools/depot-tools.hash | 2 +- package/depot-tools/depot-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/depot-tools/depot-tools.hash b/package/depot-tools/depot-tools.hash index 2109096901..70218e4658 100644 --- a/package/depot-tools/depot-tools.hash +++ b/package/depot-tools/depot-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8e0bccdd6b1231f58d5453dc14a5e1d195295ac8d466dec34961e951e946b50b depot-tools-4e87f5bfe244e903f712408ea68dc3c3a6fe2d00-br1.tar.gz +sha256 5da23d7558975093c6a732f5743c7f224d16dd3f878a6a1b577b1b127a4098cc depot-tools-8d14454ba4a35fd9d2483842b08815a2357ec86f-br1.tar.gz sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d LICENSE diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index e3b840f29a..634258ffbb 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -DEPOT_TOOLS_VERSION = 4e87f5bfe244e903f712408ea68dc3c3a6fe2d00 +DEPOT_TOOLS_VERSION = 8d14454ba4a35fd9d2483842b08815a2357ec86f DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause From peter at korsgaard.com Sat Feb 3 11:27:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 12:27:41 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-engine/Config.in: Drop nptl dependency Message-ID: <20240203112820.8DC6B867B5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=196d09d95c5c0658d52ddc807ba494f0935e6111 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x As Yann mentioned in commit 9d8497e79de3ced144877ba6ee38cc5b7181aaeb, a dependency on a glibc toolchain implies a dependency on BR2_TOOLCHAIN_HAS_THREADS_NPTL. As such, remove the dependency from package/flutter-engine/Config.in. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit 019cfcfc4a108112306f30c38c1a17fc42841e15) Signed-off-by: Peter Korsgaard --- package/flutter-engine/Config.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/flutter-engine/Config.in b/package/flutter-engine/Config.in index 2ec5b90ffd..559dc0cce5 100644 --- a/package/flutter-engine/Config.in +++ b/package/flutter-engine/Config.in @@ -11,7 +11,6 @@ config BR2_PACKAGE_FLUTTER_ENGINE depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthreads depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS @@ -43,12 +42,11 @@ comment "flutter-engine needs an OpenGL or OpenGLES backend" depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES -comment "flutter-engine needs a glibc toolchain w/ wchar, C++, gcc >= 5, dynamic library, host gcc >= 5, NPTL" +comment "flutter-engine needs a glibc toolchain w/ wchar, C++, gcc >= 5, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ - || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || BR2_STATIC_LIBS \ + || !BR2_USE_WCHAR || !BR2_HOST_GCC_AT_LEAST_5 comment "flutter-engine needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS From peter at korsgaard.com Sat Feb 3 12:09:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:09:23 +0100 Subject: [Buildroot] [PATCH v3 08/10] package/flutter-gallery: add a configure step In-Reply-To: (Yann E. MORIN's message of "Sat, 20 Jan 2024 22:46:36 +0100") References: <20240117225049.28443-1-adam.duskett@amarulasolutions.com> <20240117225049.28443-9-adam.duskett@amarulasolutions.com> Message-ID: <87wmrlsqa4.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Adam, All, > On 2024-01-17 15:50 -0700, Adam Duskett spake thusly: >> To make the next patch easier to understand, add a configure step to the >> flutter-gallery.mk file. The `$(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle` >> command is placed in the configure step because it generates several files >> needed for the flutter_gen_snapshot tool to generate the target .so file. >> >> Signed-off-by: Adam Duskett >> --- >> package/flutter-gallery/flutter-gallery.mk | 11 ++++++++--- >> 1 file changed, 8 insertions(+), 3 deletions(-) >> >> diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk >> index 57a476b1ab..50ddd9ffba 100644 >> --- a/package/flutter-gallery/flutter-gallery.mk >> +++ b/package/flutter-gallery/flutter-gallery.mk >> @@ -14,12 +14,17 @@ FLUTTER_GALLERY_DEPENDENCIES = \ >> >> FLUTTER_GALLERY_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/gallery/$(FLUTTER_ENGINE_RUNTIME_MODE) >> >> -define FLUTTER_GALLERY_BUILD_CMDS >> +define FLUTTER_GALLERY_CONFIGURE_CMDS >> cd $(@D) && \ >> FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ >> $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ >> - $(HOST_FLUTTER_SDK_BIN_FLUTTER) packages get && \ >> + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ > As disucssed on IRC< that belonged to a spearate patch, so I split this > patch int two, and applied to master, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:09:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:09:40 +0100 Subject: [Buildroot] [PATCH v3 09/10] package/flutter-gallery: fix build options In-Reply-To: (Yann E. MORIN's message of "Sat, 20 Jan 2024 22:56:23 +0100") References: <20240117225049.28443-1-adam.duskett@amarulasolutions.com> <20240117225049.28443-10-adam.duskett@amarulasolutions.com> Message-ID: <87sf29sq9n.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > ADam, All, > On 2024-01-17 15:50 -0700, Adam Duskett spake thusly: >> As the flutter-gallery package is a reference package for users wishing to use >> Flutter for their UX with Buildroot, this package must have the correct build >> options. Indeed, this package currently starts and runs, but only because of >> the 0001-remove-GetStorage.patch. Through testing, flutter-gallery fails to >> run during the following scenario: >> - The xdg-user-dirs package is ported and present. >> - flutter-gallery depends on xdg-user-dirs. >> - The 0001-remove-GetStorage.patch file is removed. >> >> After extensive testing and comparing the current build arguments against what >> the meta-flutter repository for Yocto passes to all of the applications that >> inherit flutter-app, it is clear that handling the dart_plugin_registrant.dart >> file is missing from the dart arguments in the flutter-gallery build step. > [--SNIP--] > Great commit log! This is exactly the kind of commit log that gives > confidence in the patch, as it demonstrates that the topic has been > researched, and the solution is explained, and the drawbacks identified > and justified. > I did not understand all the details of it, but the commit log really > helped me just apply the commit wihtout too much thought. > Thank you! ? Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:09:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:09:50 +0100 Subject: [Buildroot] [PATCH v3 10/10] package/flutter-gallery: clean up install_target_cmds In-Reply-To: (Yann E. MORIN's message of "Sat, 20 Jan 2024 22:59:17 +0100") References: <20240117225049.28443-1-adam.duskett@amarulasolutions.com> <20240117225049.28443-11-adam.duskett@amarulasolutions.com> Message-ID: <87o7cxsq9d.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Adam, All, > On 2024-01-17 15:50 -0700, Adam Duskett spake thusly: >> Remove and create the kernel_blob.bin file in the flutter_assets directory: >> >> When Flutter compiles the source code, it creates the kernel_blob.bin file, >> a Dart Kernel Bytecode of the application. >> >> If kernel_blob.bin exists inside the flutter_assets directory, then the >> application source code can be extracted with nothing more than apktool. >> Not only is this a security risk, it's also redundant and a waste of space. >> >> Removing the kernel_blob.bin file generated for flutter-gallery saves 86M! >> Because this package is a reference package, and some applications may check >> if the kernel_blob.bin file exists, we also touch a blank kernel_blob.bin >> file. >> >> Do not use relative symlinks: >> Users may not install their applications in the >> /usr/share/flutter/${package_name} directory. Because this is a reference >> application, using exact symlinks to icudtl.dat and libflutter_engine.so >> is preferable. > It was not directly obvious to me what this section meant, so I reworded > it, and introduced a bad typo... At least I could only spot one... > Sorry... :-( Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:11:33 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:11:33 +0100 Subject: [Buildroot] [PATCH 1/2] package/qt5/qt5base: add QT5BASE_CPE_ID_VENDOR and QT5BASE_CPE_ID_PRODUCT In-Reply-To: <20240110170759.3966933-1-christian@klarinett.li> (Christian Hitz via buildroot's message of "Wed, 10 Jan 2024 18:07:57 +0100") References: <20240110170759.3966933-1-christian@klarinett.li> Message-ID: <87jznlsq6i.fsf@48ers.dk> >>>>> "Christian" == Christian Hitz via buildroot writes: > From: Christian Hitz > cpe:2.3:a:qt:qt:5.15.8:*:*:*:*:*:*:* is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/3A753A6D-0AFE-4E62-9C2F-58C8B630830C > Signed-off-by: Christian Hitz Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:11:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:11:38 +0100 Subject: [Buildroot] [PATCH 2/2] package/qt6/qt6base: add QT6BASE_CPE_ID_VENDOR and QT6BASE_CPE_ID_PRODUCT In-Reply-To: <20240110170759.3966933-2-christian@klarinett.li> (Christian Hitz via buildroot's message of "Wed, 10 Jan 2024 18:07:58 +0100") References: <20240110170759.3966933-1-christian@klarinett.li> <20240110170759.3966933-2-christian@klarinett.li> Message-ID: <87fry9sq6d.fsf@48ers.dk> >>>>> "Christian" == Christian Hitz via buildroot writes: > From: Christian Hitz > cpe:2.3:a:qt:qt:6.4.3:*:*:*:*:*:*:* is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/8397D12E-2D77-458E-B9C3-DC7B4775B1A7 > Signed-off-by: Christian Hitz Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:12:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:12:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sqlparse: add CPE variables In-Reply-To: <20240120201116.48735-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:11:16 +0100") References: <20240120201116.48735-1-fontaine.fabrice@gmail.com> Message-ID: <87bk8xsq5j.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:sqlparse_project:sqlparse is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/BB69AE3A-3268-4EDF-95AF-A05BB61B686F > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:24:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:24:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pycryptodomex: add CPE variables In-Reply-To: <20240120202616.57017-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:26:16 +0100") References: <20240120202616.57017-1-fontaine.fabrice@gmail.com> Message-ID: <877cjlspkx.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:pycryptodome:pycryptodomex is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/2A88F7B5-C414-4104-9B59-A6E28A1E119A > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:24:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:24:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-oauthlib: add CPE variables In-Reply-To: <20240120203351.61397-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:33:51 +0100") References: <20240120203351.61397-1-fontaine.fabrice@gmail.com> Message-ID: <8734u9spkr.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:oauthlib_project:oauthlib is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/204A2244-7F74-4AAE-BA8E-E9FE707EC833 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:24:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:24:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-numpy: add CPE variables In-Reply-To: <20240120203805.64729-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:38:05 +0100") References: <20240120203805.64729-1-fontaine.fabrice@gmail.com> Message-ID: <87y1c1razp.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:numpy:numpy is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/C19878E8-7FFC-4BB4-B1A8-F396CB169DF2 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:25:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:25:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-mako: add CPE variables In-Reply-To: <20240120204701.70123-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:47:01 +0100") References: <20240120204701.70123-1-fontaine.fabrice@gmail.com> Message-ID: <87ttmprayc.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:sqlalchemy:mako is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/3A26A531-FD34-4F27-ADD5-C0C88FA337B3 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:25:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:25:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-html5lib: add CPE variables In-Reply-To: <20240120205838.76973-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 21:58:38 +0100") References: <20240120205838.76973-1-fontaine.fabrice@gmail.com> Message-ID: <87plxdray7.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:html5lib:html5lib is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/97A353CC-7402-4606-93CA-111308296748 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:26:26 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:26:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-hpack: add CPE variables In-Reply-To: <20240120210152.78860-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 22:01:52 +0100") References: <20240120210152.78860-1-fontaine.fabrice@gmail.com> Message-ID: <87le81rax9.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:python:hpack is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/9DD17147-CB76-4A8F-BE82-4AE1BC7BFCD5 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:26:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 03 Feb 2024 13:26:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gunicorn: add CPE variables In-Reply-To: <20240120210851.82987-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 22:08:51 +0100") References: <20240120210851.82987-1-fontaine.fabrice@gmail.com> Message-ID: <87h6iprax5.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:gunicorn:gunicorn is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/DAF075D2-70F3-4D2A-B7C9-75A7A1C38C83 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 3 12:01:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:01:10 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-gallery: use canonical pub-get Message-ID: <20240203122851.EE5AD86807@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc60cdfe48e26e8298036a12ba03f30969effeb6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The canonical name for the 'pub' action is 'pub', while 'packages' is just an alias. Switch to using the canonical name. Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: split off to its own commit] Signed-off-by: Yann E. MORIN (cherry picked from commit 1cc2c4bb866d8dbb7e6fd7dff7b61e61fdff18af) Signed-off-by: Peter Korsgaard --- package/flutter-gallery/flutter-gallery.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk index 57a476b1ab..a7e7b76070 100644 --- a/package/flutter-gallery/flutter-gallery.mk +++ b/package/flutter-gallery/flutter-gallery.mk @@ -18,7 +18,7 @@ define FLUTTER_GALLERY_BUILD_CMDS cd $(@D) && \ FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) packages get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle && \ $(HOST_FLUTTER_SDK_BIN_DART_BIN) package:gallery/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ From peter at korsgaard.com Sat Feb 3 12:01:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:01:28 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-gallery: clean up install_target_cmds Message-ID: <20240203122852.19E938680B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=404e6cc2eb6442d75c4fba79212adf9465cbac37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Remove and create the kernel_blob.bin file in the flutter_assets directory: When Flutter compiles the source code, it creates the kernel_blob.bin file, a Dart Kernel Bytecode of the application. If kernel_blob.bin exists inside the flutter_assets directory, then the application source code can be extracted with nothing more than apktool. Not only is this a security risk, it's also redundant and a waste of space. Removing the kernel_blob.bin file generated for flutter-gallery saves 86M! Because this package is a reference package, and some applications may check if the kernel_blob.bin file exists, we also touch a blank kernel_blob.bin file. Do not use relative symlinks: Users may install their applications in any arbitaryt location, not necessarily in the /usr/share/flutter/${package_name} directory. Because flutter-gallery is a reference application, using exact symlinks to icudtl.dat and libflutter_engine.so is preferable. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit 0805b8048fc75c8b471acb492aa55ef0690fdabd) Signed-off-by: Peter Korsgaard --- package/flutter-gallery/flutter-gallery.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk index 8f7e325e5a..acad706dae 100644 --- a/package/flutter-gallery/flutter-gallery.mk +++ b/package/flutter-gallery/flutter-gallery.mk @@ -46,10 +46,12 @@ define FLUTTER_GALLERY_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/libapp.so \ $(FLUTTER_GALLERY_INSTALL_DIR)/lib/libapp.so - ln -sf ../../../$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ $(FLUTTER_GALLERY_INSTALL_DIR)/data/ - ln -sf ../../../../../lib/libflutter_engine.so $(FLUTTER_GALLERY_INSTALL_DIR)/lib/ + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_GALLERY_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_GALLERY_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_GALLERY_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin endef $(eval $(generic-package)) From peter at korsgaard.com Sat Feb 3 12:11:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:11:10 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/qt6/qt6base: add QT6BASE_CPE_ID_VENDOR and QT6BASE_CPE_ID_PRODUCT Message-ID: <20240203122852.2E66F8680D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2071d9fe3f9feb39a0b8118a2243221626410e15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:qt:qt:6.4.3:*:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/8397D12E-2D77-458E-B9C3-DC7B4775B1A7 Signed-off-by: Christian Hitz Signed-off-by: Yann E. MORIN (cherry picked from commit a1bac67ba7442b3836621cc96943dffa45ddd880) Signed-off-by: Peter Korsgaard --- package/qt6/qt6base/qt6base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index c32089f551..ba9a10ae06 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -7,6 +7,8 @@ QT6BASE_VERSION = $(QT6_VERSION) QT6BASE_SITE = $(QT6_SITE) QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz +QT6BASE_CPE_ID_VENDOR = qt +QT6BASE_CPE_ID_PRODUCT = qt QT6BASE_CMAKE_BACKEND = ninja From peter at korsgaard.com Sat Feb 3 12:01:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:01:23 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-gallery: fix build options Message-ID: <20240203122852.0F03C867B2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d134974a3ad666364a277bce8ece60a7745aa13 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x As the flutter-gallery package is a reference package for users wishing to use Flutter for their UX with Buildroot, this package must have the correct build options. Indeed, this package currently starts and runs, but only because of the 0001-remove-GetStorage.patch. Through testing, flutter-gallery fails to run during the following scenario: - The xdg-user-dirs package is ported and present. - flutter-gallery depends on xdg-user-dirs. - The 0001-remove-GetStorage.patch file is removed. After extensive testing and comparing the current build arguments against what the meta-flutter repository for Yocto passes to all of the applications that inherit flutter-app, it is clear that handling the dart_plugin_registrant.dart file is missing from the dart arguments in the flutter-gallery build step. As the documentation for the dart_plugin_registrant.dart file is nonexistent in any official documentation. However, there is a comment from an issue on the official dart-lang/sdk page on Github that explains what this file is (and refers to the Dark SDK source code instead of official documentation.) >From https://github.com/dart-lang/sdk/issues/52506#issuecomment-1562806787: ``` The dart_plugin_registrant.dart is a very special file. It's neither included in the Dart app nor any dependent packages. Rather it's an artificially created file by the flutter tools. It contains logic to run plugin registration logic. A flutter build will eventually compile the Dart application where it will add /.dart_tool/flutter_build/dart_plugin_registrant.dart as an extra source file (see here). Additionally it will also inject that uri as a constant into Dart source code via a -Dflutter.dart_plugin_registrant=. Once the app runs it will access the package:flutter/src/dart_plugin_registrant.dart:dartPluginRegistrantLibrary constant and use it to look up the library object and then invoke the plugin registration logic. ``` Now that what the dart_plugin_registrant.dart does is understood, we need to pass the following to the dart binary during the flutter-gallery build step: -Dflutter.dart_plugin_registrant=file://[...]/dart_plugin_registrant.dart: Injects a file containing the logic to run the plugin registration logic as a constant into the flutter-application source code. --source file://$(@D)/.dart_tool/flutter_build/dart_plugin_registrant.dart: Adds the dart_plugin_registrant.dart file as a source file to compile. --source package:flutter/src/dart_plugin_registrant.dart: Binds the plugin implementation to the platform interface based on the configuration of the app's pubpec.yaml, and the plugin's pubspec.yaml. The native_assets.yaml file provides the native-assets mapping for @Native external functions. The flutter-gallery package has no functions marked as @Native; however, calling "flutter build bundle" creates a blank template "native_assets.yaml" file, which is safe to include in the build. This line, while not necessary for flutter-gallery, may be helpful for other users who use @Native external functions in their applications, and this example makes porting other applications quicker and easier. Finally, there is a known issue when using the dart_plugin_registrant.dart file outlined here: https://github.com/flutter/flutter/issues/137972. To summarize: If a user fails to pass the --obfuscate flag to gen_snapshsot when using the dart_plugin_registrant.dart file, their application may fail to start. One such application is Gallery, which I have independently verified. As such, pass the --obfuscate flag to gen_snapshot to ensure that flutter-gallery properly starts when building with the additional dart_plugin_registrant.dart arguments above. However, I acknowledge that the obfuscate flag hides function and class names in compiled Dart code, and there are some cases when a user should avoid using the flag. For example, when using the runtimeType API: https://api.flutter.dev/flutter/dart-core/Object/runtimeType.html. However, this is not the case with flutter-gallery, and the --obfuscate flag is needed. Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: restore FLUTTER_RUNTIME_MODES] Signed-off-by: Yann E. MORIN (cherry picked from commit a821aee2d2203e7948415893efbcdee88af16dac) Signed-off-by: Peter Korsgaard --- package/flutter-gallery/flutter-gallery.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk index 50ddd9ffba..8f7e325e5a 100644 --- a/package/flutter-gallery/flutter-gallery.mk +++ b/package/flutter-gallery/flutter-gallery.mk @@ -25,9 +25,15 @@ endef define FLUTTER_GALLERY_BUILD_CMDS cd $(@D) && \ FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ - $(HOST_FLUTTER_SDK_BIN_DART_BIN) package:gallery/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + -Dflutter.dart_plugin_registrant=file://$(@D)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ + --source file://$(@D)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ + --source package:flutter/src/dart_plugin_registrant.dart \ + --native-assets $(@D)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:gallery/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ --deterministic \ + --obfuscate \ --snapshot_kind=app-aot-elf \ --elf=libapp.so \ .dart_tool/flutter_build/*/app.dill From peter at korsgaard.com Sat Feb 3 12:24:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:24:53 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-numpy: add CPE variables Message-ID: <20240203122852.53DE786811@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4207e5cb546e6fb1fae9a02a9a7abf9a641b7f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:numpy:numpy is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/C19878E8-7FFC-4BB4-B1A8-F396CB169DF2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 9899f06170f292bc70a57ac9b364490503c05e42) Signed-off-by: Peter Korsgaard --- package/python-numpy/python-numpy.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index b52e0da17d..383135f9fe 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -14,6 +14,8 @@ PYTHON_NUMPY_LICENSE_FILES = \ numpy/core/include/numpy/libdivide/LICENSE.txt \ numpy/linalg/lapack_lite/LICENSE.txt \ tools/npy_tempita/license.txt +PYTHON_NUMPY_CPE_ID_VENDOR = numpy +PYTHON_NUMPY_CPE_ID_PRODUCT = numpy PYTHON_NUMPY_DEPENDENCIES = host-python-cython python3 HOST_PYTHON_NUMPY_DEPENDENCIES = host-python-cython From peter at korsgaard.com Sat Feb 3 12:01:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:01:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-gallery: add a configure step Message-ID: <20240203122852.044278680A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc1d7fd0c8019b4180d210eb9ca786a767fd67f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x To make the next patch easier to understand, add a configure step to the flutter-gallery.mk file. The `$(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle` command is placed in the configure step because it generates several files needed for the flutter_gen_snapshot tool to generate the target .so file. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit 562ed3dfd4fa60ea21c5c8f0557e0201c22048d6) Signed-off-by: Peter Korsgaard --- package/flutter-gallery/flutter-gallery.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk index a7e7b76070..50ddd9ffba 100644 --- a/package/flutter-gallery/flutter-gallery.mk +++ b/package/flutter-gallery/flutter-gallery.mk @@ -14,12 +14,17 @@ FLUTTER_GALLERY_DEPENDENCIES = \ FLUTTER_GALLERY_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/gallery/$(FLUTTER_ENGINE_RUNTIME_MODE) -define FLUTTER_GALLERY_BUILD_CMDS +define FLUTTER_GALLERY_CONFIGURE_CMDS cd $(@D) && \ FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_GALLERY_BUILD_CMDS + cd $(@D) && \ + FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ $(HOST_FLUTTER_SDK_BIN_DART_BIN) package:gallery/main.dart && \ $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ --deterministic \ From peter at korsgaard.com Sat Feb 3 12:11:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:11:57 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-sqlparse: add CPE variables Message-ID: <20240203122852.38CD58680E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4e237535e056661a7f18c31d8a9a63496da99de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:sqlparse_project:sqlparse is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/BB69AE3A-3268-4EDF-95AF-A05BB61B686F Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 8ed1bb3628511cb2b408186cb260dc15ef1eb43e) Signed-off-by: Peter Korsgaard --- package/python-sqlparse/python-sqlparse.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 23b1338e49..48b1a24822 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -10,5 +10,7 @@ PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/ba/fa/5b7662b04b6 PYTHON_SQLPARSE_SETUP_TYPE = setuptools PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE +PYTHON_SQLPARSE_CPE_ID_VENDOR = sqlparse_project +PYTHON_SQLPARSE_CPE_ID_PRODUCT = sqlparse $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:10:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:10:40 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/qt5/qt5base: add QT5BASE_CPE_ID_VENDOR and QT5BASE_CPE_ID_PRODUCT Message-ID: <20240203122852.2446C8680C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c1d4ada3b65e0dd00e5d4bfe892e7eef8a91ea8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:qt:qt:5.15.8:*:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/3A753A6D-0AFE-4E62-9C2F-58C8B630830C Signed-off-by: Christian Hitz Signed-off-by: Yann E. MORIN (cherry picked from commit 107d39c1a7e77b3668f923f2f84f961acfaefa53) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index cc29f5523f..91891a2ec2 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -7,6 +7,8 @@ QT5BASE_VERSION = e44097b63d17ba3178a637df7fac51ddc51cb48b QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 +QT5BASE_CPE_ID_VENDOR = qt +QT5BASE_CPE_ID_PRODUCT = qt QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 3 12:24:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:24:07 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-oauthlib: add CPE variables Message-ID: <20240203122852.4B4DE86810@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19322a339e43b260508453698489ebd40648c764 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:oauthlib_project:oauthlib is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/204A2244-7F74-4AAE-BA8E-E9FE707EC833 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 5f905f06bdf212520ab1f37179b5b6d5a2dee132) Signed-off-by: Peter Korsgaard --- package/python-oauthlib/python-oauthlib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk index 1e49487d6a..eb0ccbf46f 100644 --- a/package/python-oauthlib/python-oauthlib.mk +++ b/package/python-oauthlib/python-oauthlib.mk @@ -10,5 +10,7 @@ PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/6d/fa/fbf40010379 PYTHON_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE +PYTHON_OAUTHLIB_CPE_ID_VENDOR = oauthlib_project +PYTHON_OAUTHLIB_CPE_ID_PRODUCT = oauthlib $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:25:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:25:20 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-mako: add CPE variables Message-ID: <20240203122852.5E03186813@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd361dd6c4cebdaeadee9eea34fcbf575e18cd00 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:sqlalchemy:mako is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/3A26A531-FD34-4F27-ADD5-C0C88FA337B3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d5a20c7f245313ead143b0c30060e49e1f90d40a) Signed-off-by: Peter Korsgaard --- package/python-mako/python-mako.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 313fbfcab2..7764f32f62 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -10,6 +10,8 @@ PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6 PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE +PYTHON_MAKO_CPE_ID_VENDOR = sqlalchemy +PYTHON_MAKO_CPE_ID_PRODUCT = mako # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe From peter at korsgaard.com Sat Feb 3 12:25:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:25:39 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-html5lib: add CPE variables Message-ID: <20240203122852.6836A80287@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a8e1b35f4ba780b082d1f539e2a3e93c2b6991b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:html5lib:html5lib is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/97A353CC-7402-4606-93CA-111308296748 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 4d361c3d32eb368e479eb65ac6df625804fa805b) Signed-off-by: Peter Korsgaard --- package/python-html5lib/python-html5lib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-html5lib/python-html5lib.mk b/package/python-html5lib/python-html5lib.mk index 84229eabd0..320ef01c7a 100644 --- a/package/python-html5lib/python-html5lib.mk +++ b/package/python-html5lib/python-html5lib.mk @@ -10,5 +10,7 @@ PYTHON_HTML5LIB_SITE = https://files.pythonhosted.org/packages/ac/b6/b55c3f49042 PYTHON_HTML5LIB_LICENSE = MIT PYTHON_HTML5LIB_LICENSE_FILES = LICENSE PYTHON_HTML5LIB_SETUP_TYPE = setuptools +PYTHON_HTML5LIB_CPE_ID_VENDOR = html5lib +PYTHON_HTML5LIB_CPE_ID_PRODUCT = html5lib $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:26:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:26:02 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-hpack: add CPE variables Message-ID: <20240203122852.712F286814@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=637849d11dee2e5d96695e2341881edd16973688 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:python:hpack is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/9DD17147-CB76-4A8F-BE82-4AE1BC7BFCD5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d00b3f17f663368733c035194874965e52f64ad6) Signed-off-by: Peter Korsgaard --- package/python-hpack/python-hpack.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-hpack/python-hpack.mk b/package/python-hpack/python-hpack.mk index 3cf534d055..4b581c1001 100644 --- a/package/python-hpack/python-hpack.mk +++ b/package/python-hpack/python-hpack.mk @@ -10,5 +10,7 @@ PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/3e/9b/fda93fb4d957db PYTHON_HPACK_SETUP_TYPE = setuptools PYTHON_HPACK_LICENSE = MIT PYTHON_HPACK_LICENSE_FILES = LICENSE +PYTHON_HPACK_CPE_ID_VENDOR = python +PYTHON_HPACK_CPE_ID_PRODUCT = hpack $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:26:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:26:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-gunicorn: add CPE variables Message-ID: <20240203122852.79BF486815@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7750b558a8c8795c8d41f28b9541cc57fa9e0335 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:gunicorn:gunicorn is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/DAF075D2-70F3-4D2A-B7C9-75A7A1C38C83 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 8c0bfcede9f03cf8277e4cfc9cd33befa28b22bb) Signed-off-by: Peter Korsgaard --- package/python-gunicorn/python-gunicorn.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-gunicorn/python-gunicorn.mk b/package/python-gunicorn/python-gunicorn.mk index 03ff5a49df..effa93e5ef 100644 --- a/package/python-gunicorn/python-gunicorn.mk +++ b/package/python-gunicorn/python-gunicorn.mk @@ -10,5 +10,7 @@ PYTHON_GUNICORN_SITE = https://files.pythonhosted.org/packages/06/89/acd9879fa6a PYTHON_GUNICORN_SETUP_TYPE = setuptools PYTHON_GUNICORN_LICENSE = MIT PYTHON_GUNICORN_LICENSE_FILES = LICENSE +PYTHON_GUNICORN_CPE_ID_VENDOR = gunicorn +PYTHON_GUNICORN_CPE_ID_PRODUCT = gunicorn $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:23:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:23:46 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-pycryptodomex: add CPE variables Message-ID: <20240203122852.42D818680F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b47de9692e837bcf181210648d2a9ffff97cbe11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:pycryptodome:pycryptodomex is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2A88F7B5-C414-4104-9B59-A6E28A1E119A Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 71ff1bd8a4f945ce405a941f806c54b73cf551d5) Signed-off-by: Peter Korsgaard --- package/python-pycryptodomex/python-pycryptodomex.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index d6eb2a9513..a7d5f7883a 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -12,6 +12,8 @@ PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ Public Domain (pycrypto original code) PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto +PYTHON_PYCRYPTODOMEX_CPE_ID_VENDOR = pycryptodome +PYTHON_PYCRYPTODOMEX_CPE_ID_PRODUCT = pycryptodomex PYTHON_PYCRYPTODOMEX_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99" HOST_PYTHON_PYCRYPTODOMEX_ENV = CFLAGS="$(HOST_CFLAGS) -std=c99" From peter at korsgaard.com Sat Feb 3 12:10:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:10:46 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/qt5/qt5base: add QT5BASE_CPE_ID_VENDOR and QT5BASE_CPE_ID_PRODUCT Message-ID: <20240203122958.CE4A08687D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=91fffdac2eef6d12ea5aa5f987cb3053f721ab41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:qt:qt:5.15.8:*:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/3A753A6D-0AFE-4E62-9C2F-58C8B630830C Signed-off-by: Christian Hitz Signed-off-by: Yann E. MORIN (cherry picked from commit 107d39c1a7e77b3668f923f2f84f961acfaefa53) Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index efa0e16e9a..a3161d62bb 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -7,6 +7,8 @@ QT5BASE_VERSION = 2ffb7ad8a1079a0444b9c72affe3d19b089b60de QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 +QT5BASE_CPE_ID_VENDOR = qt +QT5BASE_CPE_ID_PRODUCT = qt QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 3 12:24:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:24:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-oauthlib: add CPE variables Message-ID: <20240203122959.0EC6386882@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67fa11afccc08f6ca9143a0feba63d0e7680e40e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:oauthlib_project:oauthlib is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/204A2244-7F74-4AAE-BA8E-E9FE707EC833 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 5f905f06bdf212520ab1f37179b5b6d5a2dee132) Signed-off-by: Peter Korsgaard --- package/python-oauthlib/python-oauthlib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk index 1e49487d6a..eb0ccbf46f 100644 --- a/package/python-oauthlib/python-oauthlib.mk +++ b/package/python-oauthlib/python-oauthlib.mk @@ -10,5 +10,7 @@ PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/6d/fa/fbf40010379 PYTHON_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE +PYTHON_OAUTHLIB_CPE_ID_VENDOR = oauthlib_project +PYTHON_OAUTHLIB_CPE_ID_PRODUCT = oauthlib $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:25:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:25:30 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-html5lib: add CPE variables Message-ID: <20240203122959.3E54586885@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0dd00d5ea659efdee6554c81ee6b9a6be214859 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:html5lib:html5lib is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/97A353CC-7402-4606-93CA-111308296748 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 4d361c3d32eb368e479eb65ac6df625804fa805b) Signed-off-by: Peter Korsgaard --- package/python-html5lib/python-html5lib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-html5lib/python-html5lib.mk b/package/python-html5lib/python-html5lib.mk index 84229eabd0..320ef01c7a 100644 --- a/package/python-html5lib/python-html5lib.mk +++ b/package/python-html5lib/python-html5lib.mk @@ -10,5 +10,7 @@ PYTHON_HTML5LIB_SITE = https://files.pythonhosted.org/packages/ac/b6/b55c3f49042 PYTHON_HTML5LIB_LICENSE = MIT PYTHON_HTML5LIB_LICENSE_FILES = LICENSE PYTHON_HTML5LIB_SETUP_TYPE = setuptools +PYTHON_HTML5LIB_CPE_ID_VENDOR = html5lib +PYTHON_HTML5LIB_CPE_ID_PRODUCT = html5lib $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:24:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:24:48 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-numpy: add CPE variables Message-ID: <20240203122959.1FD4086883@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab4fb4493e633c1e6946991646b92130c5c8d946 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:numpy:numpy is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/C19878E8-7FFC-4BB4-B1A8-F396CB169DF2 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 9899f06170f292bc70a57ac9b364490503c05e42) Signed-off-by: Peter Korsgaard --- package/python-numpy/python-numpy.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 812bfdae4a..fda42e7d9d 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -14,6 +14,8 @@ PYTHON_NUMPY_LICENSE_FILES = \ numpy/core/include/numpy/libdivide/LICENSE.txt \ numpy/linalg/lapack_lite/LICENSE.txt \ tools/npy_tempita/license.txt +PYTHON_NUMPY_CPE_ID_VENDOR = numpy +PYTHON_NUMPY_CPE_ID_PRODUCT = numpy PYTHON_NUMPY_SETUP_TYPE = setuptools PYTHON_NUMPY_DEPENDENCIES = host-python-cython From peter at korsgaard.com Sat Feb 3 12:23:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:23:40 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-pycryptodomex: add CPE variables Message-ID: <20240203122958.F2CB986881@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51ec22b9b0685c9ba4ba584aa58da34ca56dbc64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:pycryptodome:pycryptodomex is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2A88F7B5-C414-4104-9B59-A6E28A1E119A Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 71ff1bd8a4f945ce405a941f806c54b73cf551d5) Signed-off-by: Peter Korsgaard --- package/python-pycryptodomex/python-pycryptodomex.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index b566bdd066..1c927357fe 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -12,6 +12,8 @@ PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ Public Domain (pycrypto original code) PYTHON_PYCRYPTODOMEX_LICENSE_FILES = LICENSE.rst Doc/LEGAL/COPYRIGHT.pycrypto +PYTHON_PYCRYPTODOMEX_CPE_ID_VENDOR = pycryptodome +PYTHON_PYCRYPTODOMEX_CPE_ID_PRODUCT = pycryptodomex $(eval $(python-package)) $(eval $(host-python-package)) From peter at korsgaard.com Sat Feb 3 12:26:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:26:06 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-hpack: add CPE variables Message-ID: <20240203122959.4E42F8688B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=28454fa55706cd73001377cf6f55284e5ded7315 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:python:hpack is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/9DD17147-CB76-4A8F-BE82-4AE1BC7BFCD5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d00b3f17f663368733c035194874965e52f64ad6) Signed-off-by: Peter Korsgaard --- package/python-hpack/python-hpack.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-hpack/python-hpack.mk b/package/python-hpack/python-hpack.mk index 3cf534d055..4b581c1001 100644 --- a/package/python-hpack/python-hpack.mk +++ b/package/python-hpack/python-hpack.mk @@ -10,5 +10,7 @@ PYTHON_HPACK_SITE = https://files.pythonhosted.org/packages/3e/9b/fda93fb4d957db PYTHON_HPACK_SETUP_TYPE = setuptools PYTHON_HPACK_LICENSE = MIT PYTHON_HPACK_LICENSE_FILES = LICENSE +PYTHON_HPACK_CPE_ID_VENDOR = python +PYTHON_HPACK_CPE_ID_PRODUCT = hpack $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:25:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:25:24 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-mako: add CPE variables Message-ID: <20240203122959.2E84686884@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4694fc7b09e9cf6cb2416e6a8b080930656fe0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:sqlalchemy:mako is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/3A26A531-FD34-4F27-ADD5-C0C88FA337B3 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit d5a20c7f245313ead143b0c30060e49e1f90d40a) Signed-off-by: Peter Korsgaard --- package/python-mako/python-mako.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 313fbfcab2..7764f32f62 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -10,6 +10,8 @@ PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6 PYTHON_MAKO_SETUP_TYPE = setuptools PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE_FILES = LICENSE +PYTHON_MAKO_CPE_ID_VENDOR = sqlalchemy +PYTHON_MAKO_CPE_ID_PRODUCT = mako # In host build, setup.py tries to download markupsafe if it is not installed HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe From peter at korsgaard.com Sat Feb 3 12:26:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:26:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-gunicorn: add CPE variables Message-ID: <20240203122959.5D6898367C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=343aa7d5a0ddfef8a7ab763db253e05b099b0f2b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:gunicorn:gunicorn is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/DAF075D2-70F3-4D2A-B7C9-75A7A1C38C83 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 8c0bfcede9f03cf8277e4cfc9cd33befa28b22bb) Signed-off-by: Peter Korsgaard --- package/python-gunicorn/python-gunicorn.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-gunicorn/python-gunicorn.mk b/package/python-gunicorn/python-gunicorn.mk index fb747bc00e..1e419348b9 100644 --- a/package/python-gunicorn/python-gunicorn.mk +++ b/package/python-gunicorn/python-gunicorn.mk @@ -10,5 +10,7 @@ PYTHON_GUNICORN_SITE = https://files.pythonhosted.org/packages/28/5b/0d1f0296485 PYTHON_GUNICORN_SETUP_TYPE = setuptools PYTHON_GUNICORN_LICENSE = MIT PYTHON_GUNICORN_LICENSE_FILES = LICENSE +PYTHON_GUNICORN_CPE_ID_VENDOR = gunicorn +PYTHON_GUNICORN_CPE_ID_PRODUCT = gunicorn $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:12:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:12:01 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-sqlparse: add CPE variables Message-ID: <20240203122958.E368E8679C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3561064b8eb679fc75ea4e9cd20bc961308c28a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:sqlparse_project:sqlparse is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/BB69AE3A-3268-4EDF-95AF-A05BB61B686F Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 8ed1bb3628511cb2b408186cb260dc15ef1eb43e) Signed-off-by: Peter Korsgaard --- package/python-sqlparse/python-sqlparse.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 23b1338e49..48b1a24822 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -10,5 +10,7 @@ PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/ba/fa/5b7662b04b6 PYTHON_SQLPARSE_SETUP_TYPE = setuptools PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE +PYTHON_SQLPARSE_CPE_ID_VENDOR = sqlparse_project +PYTHON_SQLPARSE_CPE_ID_PRODUCT = sqlparse $(eval $(python-package)) From peter at korsgaard.com Sat Feb 3 12:11:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 3 Feb 2024 13:11:05 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/qt6/qt6base: add QT6BASE_CPE_ID_VENDOR and QT6BASE_CPE_ID_PRODUCT Message-ID: <20240203122958.D92828687F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=64ea5524cc20af551beadd5043bd95fd2d71f81d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:qt:qt:6.4.3:*:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/8397D12E-2D77-458E-B9C3-DC7B4775B1A7 Signed-off-by: Christian Hitz Signed-off-by: Yann E. MORIN (cherry picked from commit a1bac67ba7442b3836621cc96943dffa45ddd880) Signed-off-by: Peter Korsgaard --- package/qt6/qt6base/qt6base.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index e6cf4f14bb..1018bce441 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -7,6 +7,8 @@ QT6BASE_VERSION = $(QT6_VERSION) QT6BASE_SITE = $(QT6_SITE) QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz +QT6BASE_CPE_ID_VENDOR = qt +QT6BASE_CPE_ID_PRODUCT = qt QT6BASE_LICENSE = \ GPL-2.0+ or LGPL-3.0, \ From adam.duskett at amarulasolutions.com Sat Feb 3 12:55:47 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Sat, 3 Feb 2024 13:55:47 +0100 Subject: [Buildroot] dracut: no longer works since bump to 059 In-Reply-To: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> References: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> Message-ID: Hello Thierry; I am going to top-post to bother Yann. ;) Dracut support in Buildroot is very broken and must be patched to work properly. I don't have time currently to submit patches, but I do have a working Buildroot with a working Dracut that you can find here: https://gitlab.com/aduskett/buildroot/-/tree/dracut-fixups?ref_type=heads It's only a few months old, but I have tested it, and it works quite well. If you would like to port what I have done to master, and then submit patches based on my work; by all means, please do! Changes include: fs/ - Remove all dracut references from fs/cpio/ - Add fs/dracut/ - Dracut needs to be it's own option in fs/ - Add a dracut option to fs/initramfs/Config.in - Add separate dracut and cpio options to fs/initramfs/initramfs.mk - Add `source "fs/dracut/Config.in"` to fs/Config.in package/dracut: - Add it as a target package, as there are several systemd files it installs on the target. This is a huge problem with the current dracut package in buildroot. - Add linux kernel kconfig fixups - Add options for bash - Add systemd options - Add a cross-ldd script (probably wouldn't be accepted into mainline, but you can try!) - dracut-install is broken and requires a wrapper, so I added one, because of the ldd issue. - Add 0002-ignore-ldd-127.patch - Add 0003-force-symlink-making.patch package/linux/linux.mk: - Add ifeq clauses for rootfs-cpio and rootfs-dracut I have made a diff for you to try here based on commit 5e4eba64 https://pastebin.com/WShjbdYi However, be aware that the patch loses the functionality of defining a dracut.conf file! Thanks so much! Adam On Thu, Feb 1, 2024 at 1:43?PM Thierry Bultel wrote: > Hi, since bump to this version, > > invocation of 'ldd' wrapper fails in dracut-install. > > After analysis, this is because version uses "execlp" for launching the > 'ldd' wrapper variable, > which in out case consists in the executable name + the rootfs argument, > leading to the fault. > > Version 057 used to call "popen" instead that what Ok with that. > > Thierry > > -- > > [image: www.linatsea.fr] > -- > www.linatsea.fr > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: penguin.png Type: image/png Size: 60087 bytes Desc: not available URL: From adam.duskett at amarulasolutions.com Sat Feb 3 13:01:50 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Sat, 3 Feb 2024 14:01:50 +0100 Subject: [Buildroot] [PATCH 02/10] package/ivi-homescreen: fix dependencies for gstreamer plugin In-Reply-To: References: Message-ID: Yann; On Sun, Jan 28, 2024 at 2:21?PM Yann E. MORIN wrote: > > The gstreamer plugin select the EGL backend of gst1-plugins-base, but > forgot to propagate all of its dependencies, notably the _HAS_API > condition, causing unmet dependencies warnings (unfortunately, not > errors), such as; > > $ KCONFIG_SEED=0x597D22A8 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL > Depends on [n]: BR2_PACKAGE_GSTREAMER1 [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API [=n] && BR2_PACKAGE_HAS_LIBEGL [=y] > Selected by [y]: > - BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN [=y] && BR2_PACKAGE_IVI_HOMESCREEN [=y] && BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS [=y] && BR2_PACKAGE_HAS_LIBEGL [=y] > > We can't select _HAS_API, because it is a symbol that represents a > capability provided by other features of gst1-plugins-base; it's > semantically like a virtual package: we can't select it, we can only > depend on it. > > Add this dependency to fix this situation. > > This however causes circular (recursive) dependencies errors: > > package/gstreamer1/gst1-plugins-base/Config.in:135:error: recursive dependency detected! > package/gstreamer1/gst1-plugins-base/Config.in:135: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL is selected by BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN > package/ivi-homescreen/Config.in:221: symbol BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API > package/gstreamer1/gst1-plugins-base/Config.in:149: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API is selected by BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL > package/gstreamer1/gst1-plugins-base/Config.in:152: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL > > Indeed, _HAS_API is only even set when gstreamer1, gst1-plugins-base, > and the gst1-plugins-base's lib-opengl support, are all already enabled. > As such, the dependency on _HAS_API already implies those, and there is > no need to select them. > Thank you so much for the patch. I didn't even notice this! I'm so sorry! Reviewed-by: Adam Duskett Tested-by: Adam Duskett > Signed-off-by: Yann E. MORIN > Cc: Adam Duskett > --- > package/ivi-homescreen/Config.in | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/ivi-homescreen/Config.in b/package/ivi-homescreen/Config.in > index de7509320f..c24df05b6d 100644 > --- a/package/ivi-homescreen/Config.in > +++ b/package/ivi-homescreen/Config.in > @@ -222,10 +222,8 @@ config BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN > bool "GStreamer EGL" > depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS > depends on BR2_PACKAGE_HAS_LIBEGL > + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API # GST1_PLUGINS_BASE_LIB_OPENGL_EGL > select BR2_PACKAGE_FFMPEG > - select BR2_PACKAGE_GSTREAMER1 > - select BR2_PACKAGE_GST1_PLUGINS_BASE > - select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL > select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL > help > A GStreamer-powered alternative to Flutter's video_player that > @@ -233,9 +231,10 @@ config BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN > > https://pub.dev/packages/flutter_gstreamer_player > > -comment "GStreamer plugin needs an EGL backend" > +comment "GStreamer plugin needs gst1-plugins-base with an EGL backend" > depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS > - depends on !BR2_PACKAGE_HAS_LIBEGL > + depends on !BR2_PACKAGE_HAS_LIBEGL \ > + || !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API > > config BR2_PACKAGE_IVI_HOMESCREEN_OPENGL_TEXTURE_PLUGIN > bool "OpenGL Texture" > -- > 2.43.0 > From raphael.pavlidis at gmail.com Sat Feb 3 17:22:50 2024 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Sat, 3 Feb 2024 18:22:50 +0100 Subject: [Buildroot] [PATCH v4] package/sway: make systemd optional In-Reply-To: <20240203030138.1934339-1-stefan@ott.net> References: <20240203030138.1934339-1-stefan@ott.net> Message-ID: <3e7ed18c-9a37-46f2-a85e-f7f9ba35767e@gmail.com> Hi Stefan, looks good to me. Unfortunately, I do not have permission to do that. Thanks, Raphael Pavlidis From fontaine.fabrice at gmail.com Sat Feb 3 17:58:40 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 18:58:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjwt: add gnutls support Message-ID: <20240203175840.141039-1-fontaine.fabrice@gmail.com> gnutls can be used if openssl is not available since the addition of the package in commit 7251775773011e7da38e3a33c6817eceab6a9dfa Signed-off-by: Fabrice Fontaine --- package/libjwt/Config.in | 2 +- package/libjwt/libjwt.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in index fa042d67ef..39d1665e0e 100644 --- a/package/libjwt/Config.in +++ b/package/libjwt/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBJWT bool "libjwt" - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS select BR2_PACKAGE_JANSSON help JSON Web Tokens are an open, industry standard RFC 7519 diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 6ae1717b7d..7e2ea03b09 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -6,10 +6,18 @@ LIBJWT_VERSION = 1.15.3 LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) -LIBJWT_DEPENDENCIES = host-pkgconf jansson openssl +LIBJWT_DEPENDENCIES = host-pkgconf jansson LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBJWT_CONF_OPTS += --with-openssl +LIBJWT_DEPENDENCIES += openssl +else +LIBJWT_CONF_OPTS += --without-openssl +LIBJWT_DEPENDENCIES += gnutls +endif + $(eval $(autotools-package)) -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:02:47 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:02:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: update NETATALK_CPE_ID_VENDOR Message-ID: <20240203180247.143487-1-fontaine.fabrice@gmail.com> cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of cpe:2.3:a:netatalk:netatalk in September 2023: Version Signed-off-by: Fabrice Fontaine --- package/netatalk/netatalk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index a47bfa7e84..40e64dabeb 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -12,7 +12,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT -NETATALK_CPE_ID_VENDOR = netatalk_project +NETATALK_CPE_ID_VENDOR = netatalk # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:08:10 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:08:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xlib_libXpm: update XLIB_LIBXPM_CPE_ID_VENDOR Message-ID: <20240203180810.146553-1-fontaine.fabrice@gmail.com> cpe:2.3:a:libxpm_project:libxpm has been deprecated in favor of cpe:2.3:a:x.org:libxpm in October 2023: Libxpm Project Libxpm 3.5.15 Version Signed-off-by: Fabrice Fontaine --- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 0bba3ea946..1239ba0d4d 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -9,7 +9,7 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT -XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_VENDOR = x.org XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:15:07 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:15:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/json-c: update JSON_C_CPE_ID_VENDOR Message-ID: <20240203181507.150528-1-fontaine.fabrice@gmail.com> cpe:2.3:a:json-c_project:json-c has been deprecated in favor of cpe:2.3:a:json-c:json-c in September 2023: JSON-C Project JSON-C 0.14 Version Signed-off-by: Fabrice Fontaine --- package/json-c/json-c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 517acee4db..68401433b4 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VENDOR = json-c_project +JSON_C_CPE_ID_VENDOR = json-c JSON_C_CONF_OPTS = -DBUILD_APPS=OFF -DDISABLE_EXTRA_LIBS=ON $(eval $(cmake-package)) -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:28:45 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:28:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/flex: update FLEX_CPE_ID_VENDOR Message-ID: <20240203182845.158531-1-fontaine.fabrice@gmail.com> cpe:2.3:a:flex_project:flex has been deprecated in favor of cpe:2.3:a:westes:flex in October 2023: Flex Fast Lexical Analyser 2.6.4 Version Product Signed-off-by: Fabrice Fontaine --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index f1e731ce2e..c6417fea83 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VENDOR = flex_project +FLEX_CPE_ID_VENDOR = westes # bug does not cause stack overflows in the generated code and has been # noted upstream as a bug in the code generator FLEX_IGNORE_CVES = CVE-2019-6293 -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:35:33 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:35:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: fix CPE variables Message-ID: <20240203183533.162251-1-fontaine.fabrice@gmail.com> cpe:2.3:a:d-bus_project:d-bus has been deprecated in favor of cpe:2.3:a:freedesktop:dbus in December 2023: D-Bus Project D-Bus 1.15.6 Version Advisory Signed-off-by: Fabrice Fontaine --- package/dbus/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index c41fbcb4dd..d610846ddb 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -11,8 +11,8 @@ DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.xz DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -DBUS_CPE_ID_VENDOR = d-bus_project -DBUS_CPE_ID_PRODUCT = d-bus +DBUS_CPE_ID_VENDOR = freedesktop +DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:42:31 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:42:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/c-ares: update C_ARES_CPE_ID_VENDOR Message-ID: <20240203184231.166287-1-fontaine.fabrice@gmail.com> cpe:2.3:a:c-ares_project:c-ares has been deprecated in favor of cpe:2.3:a:c-ares:c-ares in September 2023: C-ares Project C-ares 1.17.1 Change Log Signed-off-by: Fabrice Fontaine --- package/c-ares/c-ares.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 7a49b2639a..586fde9afb 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -10,7 +10,7 @@ C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md -C_ARES_CPE_ID_VENDOR = c-ares_project +C_ARES_CPE_ID_VENDOR = c-ares $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 3 18:46:37 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 3 Feb 2024 19:46:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: update PYTHON_AIOHTTP_CPE_ID_VENDOR Message-ID: <20240203184637.168548-1-fontaine.fabrice@gmail.com> cpe:2.3:a:aiohttp_project:aiohttp has been deprecated in favor of cpe:2.3:a:aiohttp:aiohttp in November 2023: Aiohttp Project Aiohttp 3.8.0 Beta 0 Change Log Signed-off-by: Fabrice Fontaine --- package/python-aiohttp/python-aiohttp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 2cb9058b97..3dc822e832 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -10,7 +10,7 @@ PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/54/07/9467d3f8dae2 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp_project +PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp PYTHON_AIOHTTP_CPE_ID_PRODUCT = aiohttp $(eval $(python-package)) -- 2.43.0 From abiliojr at gmail.com Sun Feb 4 06:26:41 2024 From: abiliojr at gmail.com (Abilio Marques) Date: Sat, 3 Feb 2024 22:26:41 -0800 Subject: [Buildroot] [PATCH] package/micropython: add support for manifest.py in the configuration Message-ID: <20240204062645.3616072-1-abiliojr@gmail.com> Micropython can embed packages an modules as frozen bytecode. What code gets built this way can be defined by means of a "manifest.py" file. This commit exposes the variable FROZEN_MANIFEST to Buildroot users through a new variable called BR2_PACKAGE_MICROPYTHON_MANIFEST. Please check Micropython's documentation for more information: https://docs.micropython.org/en/latest/reference/manifest.html Signed-off-by: Abilio Marques --- package/micropython/Config.in | 8 ++++++++ package/micropython/micropython.mk | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 26a00baab0..52717d815a 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -17,6 +17,14 @@ config BR2_PACKAGE_MICROPYTHON_LIB help Core Python libraries ported to MicroPython. +config BR2_PACKAGE_MICROPYTHON_MANIFEST + string "Path to a manifest.py file" + help + MicroPython allows Python code to be ?frozen? as bytecode + into its binary, as an alternative to loading code from + the filesystem. See MicroPython's documentation for more + information. + endif # BR2_PACKAGE_MICROPYTHON comment "micropython needs a toolchain w/ threads, dynamic library" diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 125a0edcfb..5a2c136547 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -43,6 +43,11 @@ else MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 endif +ifneq ($(BR2_PACKAGE_MICROPYTHON_MANIFEST),"") +MICROPYTHON_MAKE_OPTS += \ + FROZEN_MANIFEST=$(BR2_PACKAGE_MICROPYTHON_MANIFEST) +endif + define MICROPYTHON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ -- 2.43.0 From thomas.petazzoni at bootlin.com Sun Feb 4 06:45:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 04 Feb 2024 06:45:06 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-03 Message-ID: <20240204064511.C967A40461@smtp2.osuosl.org> Hello, Autobuild statistics for 2024-02-03 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 2 | 1 | 0 | 3 | 2023.11.x | 1 | 0 | 0 | 1 | master | 56 | 49 | 1 | 106 | Classification of failures by reason for master ----------------------------------------------- stunnel-5.71 | 6 axel-2.17.12 | 4 libressl-3.8.2 | 3 dmraid-1.0.0.rc16-3 | 2 foot-1.16.2 | 2 gobject-introspection-1.76.1 | 2 host-rust-1.74.1 | 2 libopenssl-3.2.0 | 2 openssh-9.6p1 | 2 proj-9.3.0 | 2 quickjs-2023-12-09 | 2 attr-2.5.2 | 1 binutils-arc-2023.09-release | 1 bird-2.0.12 | 1 check-11970a7e112dfe243a2e6... | 1 dhcpcd-10.0.5 | 1 exim-4.97.1 | 1 freeradius-server-3.2.3 | 1 fs/jffs2/jffs2.mk:71: /home... | 1 glibc-2.38-44-gd37c2b20a478... | 1 gobject-introspection | 1 kexec-2.0.28 | 1 libabseil-cpp-20230802.1 | 1 libarchive-3.7.2 | 1 libglvnd-1.4.0 | 1 libselinux-3.5 | 1 linux-fusion-9.0.3 | 1 linux-tools | 1 ngrep-1.47 | 1 owl-linux-1.0.7 | 1 rtl8189fs-5d523593f41c0b8d7... | 1 rygel-0.40.2 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/54fa4ecbd75cffc953eca39e925904a76918a187 | or1k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/1bec54a60cd882c12f647e927f2881d31f283fc6 | or1k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/e3c75cf272d4e1c9147f0682478ad555b020d888 | m68k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/c0c3e2b15e5c7c98640f30c36f05819d4bd8fd56 | mips64el | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/ab64fea7797d2253cf5eeaeb7b3c68404f3339f4 | arc | binutils-arc-2023.09-release | NOK | http://autobuild.buildroot.net/results/c5b3928c5bf43c9b92235eff79286e14cbae5e32 | powerpc | bird-2.0.12 | NOK | http://autobuild.buildroot.net/results/b7dc99fff8775f82dda3b8dbc3ddcfc1f440cc7e | or1k | check-11970a7e112dfe243a2e6... | NOK | http://autobuild.buildroot.net/results/249512ef82d05f3ee4c3a84dc369a7e43cf4cb0e | ORPH mips64 | dhcpcd-10.0.5 | NOK | http://autobuild.buildroot.net/results/f6f69c648d5ddfa3b86893308aa77658b4335559 | mipsel | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/3bb7bb3c08ee6040f4ebd474772d2258fb6ed7d8 | ORPH powerpc | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/35517c36d1e57859d91d1b83eac02e33b97be6fd | ORPH aarch64_be | exim-4.97.1 | NOK | http://autobuild.buildroot.net/results/1632b4446f85c69c0f4fea39880b9826f8e3454d | nios2 | foot-1.16.2 | NOK | http://autobuild.buildroot.net/results/9be95c713de60039a28374323a193befac5439b8 | microblazeel | foot-1.16.2 | NOK | http://autobuild.buildroot.net/results/46c068efc6aba2579a922b4b7be34f8601c20dc2 | aarch64 | freeradius-server-3.2.3 | NOK | http://autobuild.buildroot.net/results/7944277e8c7805fe6a47ccc4ac676963d92c0b48 | mips64el | fs/jffs2/jffs2.mk:71: /home... | NOK | http://autobuild.buildroot.net/results/98af37b6b0e5f0f636f3ccdc38c937b5b68800c9 | powerpc64 | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/47f3ed9a449e2f7371d9d2565b50e987bacd2a06 | microblaze | gobject-introspection | TIM | http://autobuild.buildroot.net/results/03086e91623ecd9b047f4d3439bebf32e8f30a73 | mips | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/b7036f1b7b098521164c9bb0f2f4f325dd5b858b | ORPH sparc64 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/364612e7d7c9e844a3b3433b6055c402df8649d9 | ORPH powerpc64le | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/e7fd50183d758113e768269807c46c5d93fdd996 | powerpc64 | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/89ca4aa002368a7afc9a7c8bdd13b23fb3696293 | armeb | kexec-2.0.28 | NOK | http://autobuild.buildroot.net/results/d509b0f7ff32fe86cecc1d7c17ce91b6959c4cd5 | mips64 | libabseil-cpp-20230802.1 | NOK | http://autobuild.buildroot.net/results/d270d687d41981586b9d4ca4d96cb97eae95cb1a | microblazeel | libarchive-3.7.2 | NOK | http://autobuild.buildroot.net/results/23cf6d163b7ba2dd0e56fad43641ef2815b97f8a | armeb | libglvnd-1.4.0 | NOK | http://autobuild.buildroot.net/results/8d3b780a4b820190109809d1445ba26dc601461b | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/8d7adbedd2c66cfac1ede0d160d5b6dbefcf9add | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/5ab84155b946b54fc371515343bac20b8755f30f | ORPH arc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/0eadd0da3a816163dbe01fdd5e7e61dafb84f9f1 | ORPH powerpc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/cbafdb8b0ce79348df7097dc739679bb27bd46ab | ORPH arc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/674f58d1fb5d8bb2e902aab4e34f2f08fa6be59a | ORPH mipsel | libselinux-3.5 | NOK | http://autobuild.buildroot.net/results/63a214194d4c5a65bf24677980f1a2f0eb2d72c4 | mips64 | linux-fusion-9.0.3 | NOK | http://autobuild.buildroot.net/results/cae538ef3a9edab4d91402a6503e586000d51957 | ORPH arc | linux-tools | NOK | http://autobuild.buildroot.net/results/a183b583f962fddf0c4d8f4fba6fd1ce65fab61f | ORPH s390x | ngrep-1.47 | NOK | http://autobuild.buildroot.net/results/fe77dc606b1c3e9932a83d2be9549d159671432e | mips64 | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/f3f2ad35d46eecdef3695bf747a72fe20deaa3a8 | ORPH powerpc64 | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/7e390e56efbba932767ca22204ff85ed4809f95c | ORPH armeb | owl-linux-1.0.7 | NOK | http://autobuild.buildroot.net/results/58a6289afd968ef066a0ab8e57773761820a7563 | aarch64_be | proj-9.3.0 | NOK | http://autobuild.buildroot.net/results/ff8af3147cf33f8aa0643b35b84e186dcdd3971a | sparc64 | proj-9.3.0 | NOK | http://autobuild.buildroot.net/results/cf988f1f70bc105a7d8358d368ff2af14ccdc1f8 | arm | quickjs-2023-12-09 | NOK | http://autobuild.buildroot.net/results/373ae864d98e2ce09f883a0a7c6037526865d4db | mips | quickjs-2023-12-09 | NOK | http://autobuild.buildroot.net/results/e3931354ad77e501340d72c1890110293e67e536 | powerpc64le | rtl8189fs-5d523593f41c0b8d7... | NOK | http://autobuild.buildroot.net/results/90efb55454f51dea56654fb6931eebdc381b23cc | mipsel | rygel-0.40.2 | NOK | http://autobuild.buildroot.net/results/df16e1bf0ca6ecd4ae8d08b0e30724e99e69221f | mips | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/2f69a938c594dc616202549b399e56c1508473d2 | nios2 | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/84af3c35cab4101bcfd6a4b543699fb01c2be9a8 | powerpc64 | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/2e3eb561ea70ae7edd48382a846f8305605eec32 | mipsel | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/ff9fe9126509d062b48c12f2d34fbfe77d6a2bea | powerpc64le | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/f2a438e16f27575ac9786e1e945994d66a3788b6 | microblazeel | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/7dec0b934fc6a647d6d6d344f1c75d1f350a5e38 | Classification of failures by reason for 2023.02.x -------------------------------------------------- kmod-30 | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- x86_64 | kmod-30 | NOK | http://autobuild.buildroot.net/results/5eb496e3a342d6e13a777512fb0e710895283ef5 | -- http://autobuild.buildroot.net From wbx at openadk.org Sun Feb 4 07:40:27 2024 From: wbx at openadk.org (Waldemar Brodkorb) Date: Sun, 4 Feb 2024 08:40:27 +0100 Subject: [Buildroot] [PATCH 2/2 v2] package/asterisk: bump to 20.6.0 In-Reply-To: <87msshu9d6.fsf@48ers.dk> References: <87msshu9d6.fsf@48ers.dk> Message-ID: Hi Peter, Peter Korsgaard wrote, > >>>>> "Waldemar" == Waldemar Brodkorb writes: > > > See here for changes: > > https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md > > > Signed-off-by: Waldemar Brodkorb > > --- > v1-> v2: > > - use separate libjwt package instead of bundled one, suggested by > > Peter Korsgaard > > --- > > package/asterisk/Config.in | 1 + > > package/asterisk/asterisk.hash | 2 +- > > package/asterisk/asterisk.mk | 6 ++++-- > > 3 files changed, 6 insertions(+), 3 deletions(-) > > > diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in > > index c52456f8fc..662f070dac 100644 > > --- a/package/asterisk/Config.in > > +++ b/package/asterisk/Config.in > > @@ -10,6 +10,7 @@ config BR2_PACKAGE_ASTERISK > > select BR2_PACKAGE_LIBCURL > > select BR2_PACKAGE_LIBEDIT > > select BR2_PACKAGE_LIBILBC > > + select BR2_PACKAGE_LIBJWT > > select BR2_PACKAGE_LIBXML2 > > select BR2_PACKAGE_SQLITE > > select BR2_PACKAGE_UTIL_LINUX > > diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash > > index 246f4219aa..d50955dd2b 100644 > > --- a/package/asterisk/asterisk.hash > > +++ b/package/asterisk/asterisk.hash > > @@ -1,5 +1,5 @@ > > # Locally computed > > -sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.tar.gz > > +sha256 088dbc08916e21528dba364f5452b2090b066dbba4548b32ec10af138d4b442f asterisk-20.6.0.tar.gz > > > # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases > > # sha256 locally computed > > diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk > > index d1f3ea82d3..869e4128ff 100644 > > --- a/package/asterisk/asterisk.mk > > +++ b/package/asterisk/asterisk.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > > -ASTERISK_VERSION = 20.5.2 > > +ASTERISK_VERSION = 20.6.0 > > # Use the github mirror: it's an official mirror maintained by Digium, and > > # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not. > > ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION)) > > @@ -27,7 +27,7 @@ ASTERISK_SELINUX_MODULES = asterisk > > > # For patches 0002 and 0003 > > ASTERISK_AUTORECONF = YES > > -ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson > > +ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson -Ithird-party/libjwt > > Why do we still need to point autoreconf to the bundle libjwt? Otherwise the generated configure does not work. > Even worse, I see the following during the configure step: > > checking for embedded pjproject (may have to download)... configuring > [pjproject] Downloading https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.13.1/pjproject-2.13.1.tar.bz2 to /tmp/pjproject-2.13.1.tar.bz2 > [pjproject] Verifying /tmp/pjproject-2.13.1.tar.bz2 > [pjproject] Verify successful > [pjproject] Verifying /tmp/pjproject-2.13.1.tar.bz2 > [pjproject] Verify successful > [pjproject] Unpacking /tmp/pjproject-2.13.1.tar.bz2 > > We don't want packages to download stuff behind our back. Can we use an > external pjproject? I tried with the existing libpjsip in the tree, but asterisk is segfauting with my config: Asterisk Ready. asterisk: ../src/pjsip/sip_transport.c:296: get_tpname: Assertion `!"Invalid transport type!"' failed. Thread 28 "asterisk" received signal SIGABRT, Aborted. Unfortunately the external libpjsip 2.14 does not work well with Asterisk. What can we do about it? best regards Waldemar From wiselord1983 at gmail.com Sun Feb 4 08:51:28 2024 From: wiselord1983 at gmail.com (WiseLord) Date: Sun, 4 Feb 2024 11:51:28 +0300 Subject: [Buildroot] [PATCH 1/1] package/python-mpd2: bump to version 3.1.1 Message-ID: <20240204085128.5059-1-wiselord1983@gmail.com> Signed-off-by: WiseLord --- package/python-mpd2/python-mpd2.hash | 4 ++-- package/python-mpd2/python-mpd2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash index cfe5a7c0c0..0e5d9206a1 100644 --- a/package/python-mpd2/python-mpd2.hash +++ b/package/python-mpd2/python-mpd2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-mpd2/json -md5 f083c107b28525bb4c2580140861d86e python-mpd2-3.1.0.tar.gz -sha256 f33c2cdb0d6baa74a36724f38c1c4a099a7ce2c8ec4a2bb7192150a5855df476 python-mpd2-3.1.0.tar.gz +md5 b218d6f233c23da0bc82c372308bbf8d python-mpd2-3.1.1.tar.gz +sha256 4baec3584cc43ed9948d5559079fafc2679b06b2ade273e909b3582654b2b3f5 python-mpd2-3.1.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk index 124ff57db0..2d2784e89d 100644 --- a/package/python-mpd2/python-mpd2.mk +++ b/package/python-mpd2/python-mpd2.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_MPD2_VERSION = 3.1.0 -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/59/32/e57725251ce3117d2ed2a7b76d9722ea9bea26f54b2cc8981d03350e4103 +PYTHON_MPD2_VERSION = 3.1.1 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/53/be/e77206eb35eb37ccd3506fba237e1431431d04c482707730ce2a6802e95c PYTHON_MPD2_SETUP_TYPE = setuptools PYTHON_MPD2_LICENSE = LGPL-3.0+ PYTHON_MPD2_LICENSE_FILES = LICENSE.txt -- 2.43.0 From peter at korsgaard.com Sun Feb 4 09:04:26 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 10:04:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/petitboot: fix NLS build In-Reply-To: <20240120172839.763337-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 20 Jan 2024 18:28:39 +0100") References: <20240120172839.763337-1-fontaine.fabrice@gmail.com> Message-ID: <878r40r46d.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following NLS build failure on musl raised commit > bf9583a50276f52edbc37d9f85df5f2cc7fdb5dc: > /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/mips64el-buildroot-linux-musl/13.2.0/../../../../mips64el-buildroot-linux-musl/bin/ld: > discover/pb_discover-pb-discover.o: undefined reference to symbol > 'libintl_textdomain' > Fixes: > - http://autobuild.buildroot.org/results/6d440d96e811674041b5a1fdae96d4c377824c2a > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 09:06:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 10:06:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix service runtime In-Reply-To: (Yann E. MORIN's message of "Sun, 21 Jan 2024 10:14:31 +0100") References: <20240117210756.265708-1-ju.o@free.fr> Message-ID: <871q9sr42s.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Julien, All, > On 2024-01-17 22:07 +0100, Julien Olivain spake thusly: >> Since commit 2a8065e "package/postgresql: bump version to 16.1", the >> postgresql service fail to start at runtime with an error: >> >> FATAL: could not load library >> "/usr/lib/postgresql/dict_snowball.so": >> /usr/lib/postgresql/dict_snowball.so: undefined symbol: >> CurrentMemoryContext >> >> This is due to the Posgresql autotool configure script trying to >> detect whether the toolchain linker needs --export-dynamic or not. >> This test is done with a runtime execution of a test program, and >> therefore cannot run in cross-compilation. In that case, the >> configure script assumes it is not needed. See commit [1], included >> in PostgreSQL v16.0. >> >> This commit fixes the issue by forcing the value in _CONF_ENV. The >> package has already a Kconfig dependency on !BR2_STATIC_LIBS, so the >> value can be unconditionally set. >> >> [1] >> https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=9db49fc5bfdc0126be03f4b8986013e59d93b91d > I've added references to the ML thread upstream, with their position > that cross-compiling is not really a supoprted thing. >> Signed-off-by: Julien Olivain > Applied to master, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 09:03:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 10:03:18 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/petitboot: fix NLS build Message-ID: <20240204090648.1FA6C867B7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70ab59e19895eb94083bd43fef32ee0bba31156b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix the following NLS build failure on musl raised commit bf9583a50276f52edbc37d9f85df5f2cc7fdb5dc: /home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/mips64el-buildroot-linux-musl/13.2.0/../../../../mips64el-buildroot-linux-musl/bin/ld: discover/pb_discover-pb-discover.o: undefined reference to symbol 'libintl_textdomain' Fixes: - http://autobuild.buildroot.org/results/6d440d96e811674041b5a1fdae96d4c377824c2a Signed-off-by: Fabrice Fontaine Reviewed-by: Laurent Vivier Signed-off-by: Yann E. MORIN (cherry picked from commit 5159c5c730dc490aced7bc17477f951786f4c405) Signed-off-by: Peter Korsgaard --- package/petitboot/petitboot.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index c4eb20b44d..2087f01b09 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -7,10 +7,18 @@ PETITBOOT_VERSION = 1.14 PETITBOOT_SOURCE = petitboot-v$(PETITBOOT_VERSION).tar.gz PETITBOOT_SITE = https://github.com/open-power/petitboot/releases/download/v$(PETITBOOT_VERSION) -PETITBOOT_DEPENDENCIES = elfutils ncurses udev host-bison host-flex lvm2 +PETITBOOT_DEPENDENCIES = \ + elfutils \ + ncurses \ + udev \ + host-bison \ + host-flex \ + lvm2 \ + $(TARGET_NLS_DEPENDENCIES) PETITBOOT_LICENSE = GPL-2.0 PETITBOOT_LICENSE_FILES = COPYING +PETITBOOT_CONF_ENV = LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" PETITBOOT_CONF_OPTS = \ --enable-crypt \ --enable-platform-auto \ From thierry.bultel at linatsea.fr Sun Feb 4 09:12:45 2024 From: thierry.bultel at linatsea.fr (Thierry Bultel) Date: Sun, 4 Feb 2024 10:12:45 +0100 Subject: [Buildroot] dracut: no longer works since bump to 059 In-Reply-To: References: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> Message-ID: <977bc5e8-28c7-44b4-8651-9522d205aa59@linatsea.fr> Dear Adam, please see my comments below Le 03/02/2024 ? 13:55, Adam Duskett a ?crit?: > Hello Thierry; > > I am going to top-post to bother Yann. ;) > > Dracut support in Buildroot is very broken and must be patched to work > properly. Not so broken, before the dump to 059 ! I am pretty happy with it. Bu I admit that the ramdisk I need does not have systemd at all, so that in my case, dracut.conf basically consists in removing all systemd modules. I have no idea of how the current integration works with a aimed systemd ramdisk. > I don't have time currently to submit patches, but I do have a working > Buildroot with a working Dracut > that you can find here: > https://gitlab.com/aduskett/buildroot/-/tree/dracut-fixups?ref_type=heads > I have read your patches and there are a couple of things that puzzle me. In the very first patch series I submitted about 2 years ago, it worked this way: - new fs target, not just cpio variant - usage of cross-ldd as recommended by dracut documentation But this was reviewed appropriately, and finally integrated as the version we currently have (only the replacement of cross-ldd by rtls-prelink, IMHO, buy I did not notice any issues from one to the other). So I am afraid (despite of being rather agnostic) that your patches would not be accepted as such either, for the same reasons. I notice some pieces in your patches, that we do need, indeed, for instance the kernel config fixups, and the forced symlinks. > It's only a few months old, but I have tested it, and it works quite > well. If you would like to port what I have > done to master, and then submit patches based on my work; by all > means, please do! > > Changes include: > > fs/ > ? - Remove all dracut references from fs/cpio/ > ? - Add fs/dracut/ > ? - Dracut needs to be it's own option in fs/ > ? - Add a dracut option to fs/initramfs/Config.in > ? - Add separate dracut and cpio options to fs/initramfs/initramfs.mk > > ? - Add `source "fs/dracut/Config.in"` to fs/Config.in > > package/dracut: > ? - Add it as a target package, as there are several systemd files it > installs on the target. > ? ? This is a huge problem with the current dracut package in buildroot. > ? - Add linux kernel kconfig fixups > ? - Add options for bash > ? - Add systemd options > ? - Add a cross-ldd script (probably wouldn't be accepted into > mainline, but you can try!) > ? - dracut-install is broken and requires a wrapper, so I added one, > because of the ldd issue. > ? - Add 0002-ignore-ldd-127.patch > ? - Add 0003-force-symlink-making.patch > > package/linux/linux.mk : > ? - Add ifeq clauses for rootfs-cpio and rootfs-dracut > > I have made a diff?for?you to?try here based on commit 5e4eba64 > https://pastebin.com/WShjbdYi > > However, be aware that the patch loses the functionality of defining a > dracut.conf file! As long as producing a busybox-init based ramdisk still works ... > > > Thanks so much! Best regards Thierry > Adam > > On Thu, Feb 1, 2024 at 1:43?PM Thierry Bultel > wrote: > > Hi, since bump to this version, > > invocation of 'ldd' wrapper fails in dracut-install. > > After analysis, this is because version uses "execlp" for > launching the 'ldd' wrapper variable, > which in out case consists in the executable name + the rootfs > argument, leading to the fault. > > Version 057 used to call "popen" instead that what Ok with that. > > Thierry > > -- > > www.linatsea.fr > -- > www.linatsea.fr > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > -- Re: test -- www.linatsea.fr -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: penguin.png Type: image/png Size: 60087 bytes Desc: not available URL: From ju.o at free.fr Sun Feb 4 09:31:48 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 4 Feb 2024 10:31:48 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: micropython: add micropython-lib test Message-ID: <20240204093148.11282-1-ju.o@free.fr> Commit 8f403f0 "package/micropython-lib: merge with, and install as part of micropython" brought micropython library within the package. This commit improves the micropython runtime test by enabling the micropython-lib and by also adding a runtime test using one of its module. Signed-off-by: Julien Olivain --- support/testing/tests/package/test_micropython.py | 13 ++++++++++++- .../test_micropython/rootfs-overlay/root/zcat.py | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100755 support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py diff --git a/support/testing/tests/package/test_micropython.py b/support/testing/tests/package/test_micropython.py index 0ecd4790bd..371deb2978 100644 --- a/support/testing/tests/package/test_micropython.py +++ b/support/testing/tests/package/test_micropython.py @@ -7,6 +7,7 @@ class TestMicroPython(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ f""" BR2_PACKAGE_MICROPYTHON=y + BR2_PACKAGE_MICROPYTHON_LIB=y BR2_ROOTFS_OVERLAY="{infra.filepath("tests/package/test_micropython/rootfs-overlay")}" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set @@ -64,5 +65,15 @@ class TestMicroPython(infra.basetest.BRTest): output = self.run_upy_code(py_code) self.assertEqual(output[0], expected_output) - # Finally, Check a small script can execute. + # Check a small script can execute. self.assertRunOk("/root/mandel.py", timeout=10) + + # Check we can use a micropython-lib module. + msg = "Hello Buildroot!" + filename = "file.txt" + gz_filename = f"{filename}.gz" + self.assertRunOk(f"echo '{msg}' > {filename}") + self.assertRunOk(f"gzip {filename}") + out, ret = self.emulator.run(f"/root/zcat.py {gz_filename}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) diff --git a/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py new file mode 100755 index 0000000000..3b8c60bdd1 --- /dev/null +++ b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py @@ -0,0 +1,15 @@ +#! /usr/bin/env micropython + +import gzip +import sys + + +def main(fname): + with open(fname, "rb") as f: + with gzip.GzipFile(fileobj=f) as g: + s = g.read() + print(s.decode("UTF-8"), end="") + + +if __name__ == "__main__": + main(sys.argv[1]) -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 10:06:13 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:06:13 +0100 Subject: [Buildroot] [git commit] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR Message-ID: <20240204100707.2674C86891@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=380d4a75f5e3c2ae52ebc1afd409713fdb6ced37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:kernel:linux-firmware added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/linux-firmware/linux-firmware.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 58fbaab1d7..60e8861abe 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel - # Intel SST DSP ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master From yann.morin.1998 at free.fr Sun Feb 4 10:06:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:06:06 +0100 Subject: [Buildroot] [git commit] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR Message-ID: <20240204100707.1B8C386890@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05617160dd0bc4aef6cc91930d7985009e854142 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:kernel:wireless-regdb added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/wireless-regdb/wireless-regdb.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index e9003ce2e6..5c8ef96398 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -9,7 +9,6 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE -WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS From yann.morin.1998 at free.fr Sun Feb 4 10:06:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:06:18 +0100 Subject: [Buildroot] [git commit] package/rauc-hawkbit-updater: drop RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR Message-ID: <20240204100707.3170C86892@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed40db6dfba553df8571fcb96c29b8f20dc43dca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:pengutronix:rauc-hawkbit-updater added by commit 928b7219cd7079864eadadc66dbff21c5cd72804 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:pengutronix:rauc-hawkbit-updater Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index 10ba91abbb..a453f75a28 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -9,7 +9,6 @@ RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/release RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE -RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl $(eval $(meson-package)) From yann.morin.1998 at free.fr Sun Feb 4 10:07:20 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:07:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR In-Reply-To: <20240201174205.180556-1-fontaine.fabrice@gmail.com> References: <20240201174205.180556-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-01 18:42 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:kernel:wireless-regdb added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > > https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/wireless-regdb/wireless-regdb.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk > index e9003ce2e6..5c8ef96398 100644 > --- a/package/wireless-regdb/wireless-regdb.mk > +++ b/package/wireless-regdb/wireless-regdb.mk > @@ -9,7 +9,6 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz > WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb > WIRELESS_REGDB_LICENSE = ISC > WIRELESS_REGDB_LICENSE_FILES = LICENSE > -WIRELESS_REGDB_CPE_ID_VENDOR = kernel > > ifeq ($(BR2_PACKAGE_CRDA),y) > define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 4 10:07:42 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:07:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR In-Reply-To: <20240201174432.182161-1-fontaine.fabrice@gmail.com> References: <20240201174432.182161-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-01 18:44 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:kernel:linux-firmware added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/linux-firmware/linux-firmware.mk | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk > index 58fbaab1d7..60e8861abe 100644 > --- a/package/linux-firmware/linux-firmware.mk > +++ b/package/linux-firmware/linux-firmware.mk > @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz > LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware > LINUX_FIRMWARE_INSTALL_IMAGES = YES > > -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel > - > # Intel SST DSP > ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) > LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 4 10:08:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:08:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/rauc-hawkbit-updater: drop RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR In-Reply-To: <20240203103501.41738-1-fontaine.fabrice@gmail.com> References: <20240203103501.41738-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-03 11:35 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:pengutronix:rauc-hawkbit-updater added by commit > 928b7219cd7079864eadadc66dbff21c5cd72804 has never been a valid CPE ID > for this package: > > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:pengutronix:rauc-hawkbit-updater > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > index 10ba91abbb..a453f75a28 100644 > --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk > @@ -9,7 +9,6 @@ RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/release > RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz > RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 > RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE > -RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix > RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl > > $(eval $(meson-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 4 10:11:40 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 11:11:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/htop: fix BR2_SHARED_STATIC_LIBS build Message-ID: <20240204101140.1403357-1-fontaine.fabrice@gmail.com> With BR2_SHARED_STATIC_LIBS=y, the generic infrastructure adds a --enable-static flags causing htop to be built as a static binary. Adding a --disable-static reverts this. This will fix the following build failure with hwloc raised since bump to version 3.3.0 in commit 09243186df3168022f0b23b8a9677c6313033769 and https://github.com/htop-dev/htop/commit/c8a61850dd31ab64eb8ad83929ce86d2adbeb96c: /home/autobuild/autobuild/instance-3/output-1/host/bin/mipsel-buildroot-linux-gnu-gcc -std=c99 -pedantic -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -I/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include -I/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/include/libxml2 -Wall -Wcast-align -Wcast-qual -Wextra -Wfloat-equal -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wpointer-arith -Wshadow -Wstrict-prototypes -Wundef -Wunused -Wwrite-strings -Wnull-dereference -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR="\"/etc\"" -I"./linux" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=2 -static -rdynamic -static -o htop htop.o Action.o Affinity.o AffinityPanel.o AvailableColumnsPanel.o AvailableMetersPanel.o BatteryMeter.o CategoriesPanel.o ClockMeter.o ColorsPanel.o ColumnsPanel.o CommandLine.o CommandScreen.o Compat.o CPUMeter.o CRT.o DateMeter.o DateTimeMeter.o DiskIOMeter.o DisplayOptionsPanel.o DynamicColumn.o DynamicMeter.o DynamicScreen.o EnvScreen.o FileDescriptorMeter.o FunctionBar.o Hashtable.o Header.o HeaderOptionsPanel.o HostnameMeter.o IncSet.o InfoScreen.o ListItem.o LoadAverageMeter.o Machine.o MainPanel.o MemoryMeter.o MemorySwapMeter.o Meter.o MetersPanel.o NetworkIOMeter.o Object.o OpenFilesScreen.o OptionItem.o Panel.o Process.o ProcessLocksScreen.o ProcessTable.o Row.o RichString.o Scheduling.o ScreenManager.o ScreensPanel.o ScreenTabsPanel.o Settings.o SignalsPanel.o SwapMeter.o SysArchMeter.o Table.o TasksMeter.o TraceScreen.o UptimeMeter.o UsersTable.o Vector.o XUtils.o generic/gettime.o generic/hostname.o generic/uname.o linux/CGroupUtils.o linux/HugePageMeter.o linux/IOPriorityPanel.o linux/LibSensors.o linux/LinuxMachine.o linux/LinuxProcess.o linux/LinuxProcessTable.o linux/Platform.o linux/PressureStallMeter.o linux/SELinuxMeter.o linux/SystemdMeter.o linux/ZramMeter.o zfs/ZfsArcMeter.o zfs/ZfsCompressedArcMeter.o -lcap -llzma -L/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib -lncurses -lm -L/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/lib -lhwloc /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Action.o: in function `Action_setUserOnly': Action.c:(.text+0x2490): warning: Using 'getpwnam' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Settings.o: in function `Settings_new': Settings.c:(.text+0x2dd0): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/libhwloc.a(topology-xml-libxml.o): in function `hwloc_libxml_free_buffer': topology-xml-libxml.c:(.text+0x2c): undefined reference to `xmlFree' Fixes: - http://autobuild.buildroot.org/results/04bd5633750ff5cef048ea78c9de043d3ffcfa32 Signed-off-by: Fabrice Fontaine --- package/htop/htop.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 6dbaae3796..af8eff4860 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -17,6 +17,13 @@ HTOP_LICENSE_FILES = COPYING # provided by autoconf relies on wchar_t. HTOP_CONF_ENV += ac_cv_prog_cc_c99=-std=gnu99 +# With BR2_SHARED_STATIC_LIBS=y, the generic infrastructure adds a +# --enable-static flags causing htop to be built as a static binary. +# Adding a --disable-static reverts this +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +HTOP_CONF_OPTS += --disable-static +endif + ifeq ($(BR2_PACKAGE_HWLOC),y) HTOP_CONF_OPTS += --enable-hwloc HTOP_DEPENDENCIES += hwloc -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 10:16:13 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:13 +0100 Subject: [Buildroot] [git commit] package/netatalk: update NETATALK_CPE_ID_VENDOR Message-ID: <20240204101728.C5469868D9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5ae38ec621f4821dd3eaf7ad3b0174cad21116ff branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of cpe:2.3:a:netatalk:netatalk in September 2023: Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/netatalk/netatalk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index a47bfa7e84..40e64dabeb 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -12,7 +12,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT -NETATALK_CPE_ID_VENDOR = netatalk_project +NETATALK_CPE_ID_VENDOR = netatalk # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ From yann.morin.1998 at free.fr Sun Feb 4 10:16:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:34 +0100 Subject: [Buildroot] [git commit] package/dbus: fix CPE variables Message-ID: <20240204101728.F1778868D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=363b4ebf1aaf4821c0c49713eba71937bd5639ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:d-bus_project:d-bus has been deprecated in favor of cpe:2.3:a:freedesktop:dbus in December 2023: D-Bus Project D-Bus 1.15.6 Version Advisory Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/dbus/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index c41fbcb4dd..d610846ddb 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -11,8 +11,8 @@ DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.xz DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -DBUS_CPE_ID_VENDOR = d-bus_project -DBUS_CPE_ID_PRODUCT = d-bus +DBUS_CPE_ID_VENDOR = freedesktop +DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From yann.morin.1998 at free.fr Sun Feb 4 10:16:46 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:46 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp: update PYTHON_AIOHTTP_CPE_ID_VENDOR Message-ID: <20240204101729.11F40868DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a01deb6617ff38914f649f88c71e7c0c5ee71b01 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:aiohttp_project:aiohttp has been deprecated in favor of cpe:2.3:a:aiohttp:aiohttp in November 2023: Aiohttp Project Aiohttp 3.8.0 Beta 0 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-aiohttp/python-aiohttp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 2cb9058b97..3dc822e832 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -10,7 +10,7 @@ PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/54/07/9467d3f8dae2 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp_project +PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp PYTHON_AIOHTTP_CPE_ID_PRODUCT = aiohttp $(eval $(python-package)) From yann.morin.1998 at free.fr Sun Feb 4 10:16:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:07 +0100 Subject: [Buildroot] [git commit] package/python-wheel: add CPE variables Message-ID: <20240204101728.BB1BC868D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92f3f04146654f77add9fc14c18d054783006108 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:wheel_project:wheel is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/402C4B59-237A-4399-8189-CC9FC1B4BF39 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/python-wheel/python-wheel.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-wheel/python-wheel.mk b/package/python-wheel/python-wheel.mk index 159598fd1e..320995521e 100644 --- a/package/python-wheel/python-wheel.mk +++ b/package/python-wheel/python-wheel.mk @@ -10,5 +10,7 @@ PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/fc/ef/0335f7217dd1e8 PYTHON_WHEEL_SETUP_TYPE = flit PYTHON_WHEEL_LICENSE = MIT PYTHON_WHEEL_LICENSE_FILES = LICENSE.txt +PYTHON_WHEEL_CPE_ID_VENDOR = wheel_project +PYTHON_WHEEL_CPE_ID_PRODUCT = wheel $(eval $(host-python-package)) From yann.morin.1998 at free.fr Sun Feb 4 10:16:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:23 +0100 Subject: [Buildroot] [git commit] package/json-c: update JSON_C_CPE_ID_VENDOR Message-ID: <20240204101728.DB00F868DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63118fbb55d3be3fc182470f02fcf7c221ba5ae4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:json-c_project:json-c has been deprecated in favor of cpe:2.3:a:json-c:json-c in September 2023: JSON-C Project JSON-C 0.14 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/json-c/json-c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 517acee4db..68401433b4 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VENDOR = json-c_project +JSON_C_CPE_ID_VENDOR = json-c JSON_C_CONF_OPTS = -DBUILD_APPS=OFF -DDISABLE_EXTRA_LIBS=ON $(eval $(cmake-package)) From yann.morin.1998 at free.fr Sun Feb 4 10:16:29 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:29 +0100 Subject: [Buildroot] [git commit] package/flex: update FLEX_CPE_ID_VENDOR Message-ID: <20240204101728.E5D89868DD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c438422d4972f41c0c59d1b701eefd3028abee43 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:flex_project:flex has been deprecated in favor of cpe:2.3:a:westes:flex in October 2023: Flex Fast Lexical Analyser 2.6.4 Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index f1e731ce2e..c6417fea83 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VENDOR = flex_project +FLEX_CPE_ID_VENDOR = westes # bug does not cause stack overflows in the generated code and has been # noted upstream as a bug in the code generator FLEX_IGNORE_CVES = CVE-2019-6293 From yann.morin.1998 at free.fr Sun Feb 4 10:16:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:18 +0100 Subject: [Buildroot] [git commit] package/x11r7/xlib_libXpm: update XLIB_LIBXPM_CPE_ID_VENDOR Message-ID: <20240204101728.D07F6868DB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03a9171cced41f2ee94850d6237bcc54fdda0b1a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:libxpm_project:libxpm has been deprecated in favor of cpe:2.3:a:x.org:libxpm in October 2023: Libxpm Project Libxpm 3.5.15 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 0bba3ea946..1239ba0d4d 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -9,7 +9,7 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT -XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_VENDOR = x.org XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ From yann.morin.1998 at free.fr Sun Feb 4 10:16:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:16:39 +0100 Subject: [Buildroot] [git commit] package/c-ares: update C_ARES_CPE_ID_VENDOR Message-ID: <20240204101729.079EB868D9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae2baf1771cbbebae65e32397480deec6bf879e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:c-ares_project:c-ares has been deprecated in favor of cpe:2.3:a:c-ares:c-ares in September 2023: C-ares Project C-ares 1.17.1 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/c-ares/c-ares.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 7a49b2639a..586fde9afb 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -10,7 +10,7 @@ C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md -C_ARES_CPE_ID_VENDOR = c-ares_project +C_ARES_CPE_ID_VENDOR = c-ares $(eval $(autotools-package)) $(eval $(host-autotools-package)) From yann.morin.1998 at free.fr Sun Feb 4 10:17:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:17:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-wheel: add CPE variables In-Reply-To: <20240121213513.2636195-1-fontaine.fabrice@gmail.com> References: <20240121213513.2636195-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-01-21 22:35 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:wheel_project:wheel is a valid CPE identifier for this > package: > > https://nvd.nist.gov/products/cpe/detail/402C4B59-237A-4399-8189-CC9FC1B4BF39 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-wheel/python-wheel.mk | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/python-wheel/python-wheel.mk b/package/python-wheel/python-wheel.mk > index 159598fd1e..320995521e 100644 > --- a/package/python-wheel/python-wheel.mk > +++ b/package/python-wheel/python-wheel.mk > @@ -10,5 +10,7 @@ PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/fc/ef/0335f7217dd1e8 > PYTHON_WHEEL_SETUP_TYPE = flit > PYTHON_WHEEL_LICENSE = MIT > PYTHON_WHEEL_LICENSE_FILES = LICENSE.txt > +PYTHON_WHEEL_CPE_ID_VENDOR = wheel_project > +PYTHON_WHEEL_CPE_ID_PRODUCT = wheel > > $(eval $(host-python-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 4 10:19:01 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:19:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: update NETATALK_CPE_ID_VENDOR In-Reply-To: <20240203180247.143487-1-fontaine.fabrice@gmail.com> References: <20240203180247.143487-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-03 19:02 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of > cpe:2.3:a:netatalk:netatalk in September 2023: > > > Version > > > > Signed-off-by: Fabrice Fontaine Applied to master, along with the few following CPE updates, thanks! Regards, Yann E. MORIN. > --- > package/netatalk/netatalk.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk > index a47bfa7e84..40e64dabeb 100644 > --- a/package/netatalk/netatalk.mk > +++ b/package/netatalk/netatalk.mk > @@ -12,7 +12,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ > libevent > NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like > NETATALK_LICENSE_FILES = COPYING COPYRIGHT > -NETATALK_CPE_ID_VENDOR = netatalk_project > +NETATALK_CPE_ID_VENDOR = netatalk > > # Don't run ldconfig! > NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 4 10:20:56 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 11:20:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: drop NFS_UTILS_AUTORECONF Message-ID: <20240204102056.1409453-1-fontaine.fabrice@gmail.com> Commit 63332c33aa0771532807fd2684d4eee4eb952435 wrongly set NFS_UTILS_AUTORECONF Signed-off-by: Fabrice Fontaine --- package/nfs-utils/nfs-utils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index a11ba154ad..4f2b41c782 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -11,7 +11,6 @@ NFS_UTILS_LICENSE = GPL-2.0+ NFS_UTILS_LICENSE_FILES = COPYING NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libevent libtirpc sqlite util-linux NFS_UTILS_CPE_ID_VENDOR = linux-nfs -NFS_UTILS_AUTORECONF = YES NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 4 10:32:04 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 11:32:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: drop DBUS_CPE_ID_PRODUCT Message-ID: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the package name (i.e. dbus) by default Signed-off-by: Fabrice Fontaine --- package/dbus/dbus.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d610846ddb..097b89205e 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -12,7 +12,6 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING DBUS_CPE_ID_VENDOR = freedesktop -DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 10:29:49 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:29:49 +0100 Subject: [Buildroot] [git commit] package/nfs-utils: drop NFS_UTILS_AUTORECONF Message-ID: <20240204103513.88AD9868E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6460074bbfef7663d5ed0ec9f9fa96a6fcc6973c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 63332c33aa0771532807fd2684d4eee4eb952435 wrongly set NFS_UTILS_AUTORECONF Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/nfs-utils/nfs-utils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index a11ba154ad..4f2b41c782 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -11,7 +11,6 @@ NFS_UTILS_LICENSE = GPL-2.0+ NFS_UTILS_LICENSE_FILES = COPYING NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libevent libtirpc sqlite util-linux NFS_UTILS_CPE_ID_VENDOR = linux-nfs -NFS_UTILS_AUTORECONF = YES NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no From yann.morin.1998 at free.fr Sun Feb 4 10:36:00 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 11:36:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: drop NFS_UTILS_AUTORECONF In-Reply-To: <20240204102056.1409453-1-fontaine.fabrice@gmail.com> References: <20240204102056.1409453-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-04 11:20 +0100, Fabrice Fontaine spake thusly: > Commit 63332c33aa0771532807fd2684d4eee4eb952435 wrongly set > NFS_UTILS_AUTORECONF > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/nfs-utils/nfs-utils.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > index a11ba154ad..4f2b41c782 100644 > --- a/package/nfs-utils/nfs-utils.mk > +++ b/package/nfs-utils/nfs-utils.mk > @@ -11,7 +11,6 @@ NFS_UTILS_LICENSE = GPL-2.0+ > NFS_UTILS_LICENSE_FILES = COPYING > NFS_UTILS_DEPENDENCIES = host-nfs-utils host-pkgconf libevent libtirpc sqlite util-linux > NFS_UTILS_CPE_ID_VENDOR = linux-nfs > -NFS_UTILS_AUTORECONF = YES > > NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd at kuhls.net Sun Feb 4 11:18:42 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 4 Feb 2024 12:18:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-inputstream-adaptive: bump version to 20.3.17-Nexus Message-ID: <20240204111842.513296-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index b608c29fba..e38191c0c4 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 4651c022395f92906be40e8c923c9f90c3e9190d9dafee9e229ca1846605c5c5 kodi-inputstream-adaptive-20.3.16-Nexus.tar.gz +sha256 f67cfef057f8842716db4521a8cd3966c37a1da8fc3fb297527f6f25be20688a kodi-inputstream-adaptive-20.3.17-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 514a1a5f2d..ba4f6de61a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.16-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.17-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ -- 2.39.2 From bernd at kuhls.net Sun Feb 4 11:20:31 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 4 Feb 2024 12:20:31 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/kodi-inputstream-adaptive: bump version to 20.3.17-Nexus Message-ID: <20240204112031.514780-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- v2: squashed with previous bump to 20.3.16-Nexus .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index ebcf32fd4a..e38191c0c4 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 1d7c933d05534e591e11fd204e836a3498fffc6a0717d5427c89acfd16fb9d40 kodi-inputstream-adaptive-20.3.15-Nexus.tar.gz +sha256 f67cfef057f8842716db4521a8cd3966c37a1da8fc3fb297527f6f25be20688a kodi-inputstream-adaptive-20.3.17-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 267541ace9..ba4f6de61a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.15-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.17-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ -- 2.39.2 From yann.morin.1998 at free.fr Sun Feb 4 12:32:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 13:32:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: drop DBUS_CPE_ID_PRODUCT In-Reply-To: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> References: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-04 11:32 +0100, Fabrice Fontaine spake thusly: > Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT > to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the > package name (i.e. dbus) by default Ah, right. Applied to master, thanks. Maybe it would be good to add that check to utils/checkpackagelib/, so that it detects and reports the "FOO_CPE_ID_PRODUCT = foo" case. Regards, Yann E. MORIN. > Signed-off-by: Fabrice Fontaine > --- > package/dbus/dbus.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk > index d610846ddb..097b89205e 100644 > --- a/package/dbus/dbus.mk > +++ b/package/dbus/dbus.mk > @@ -12,7 +12,6 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus > DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) > DBUS_LICENSE_FILES = COPYING > DBUS_CPE_ID_VENDOR = freedesktop > -DBUS_CPE_ID_PRODUCT = dbus > DBUS_INSTALL_STAGING = YES > > define DBUS_PERMISSIONS > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 4 12:27:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 13:27:30 +0100 Subject: [Buildroot] [git commit] package/dbus: drop DBUS_CPE_ID_PRODUCT Message-ID: <20240204123306.031A3868E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b878e7bbbc7041c8fd0ce2e410cc7fc9428bb93d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the package name (i.e. dbus) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/dbus/dbus.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d610846ddb..097b89205e 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -12,7 +12,6 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING DBUS_CPE_ID_VENDOR = freedesktop -DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From yann.morin.1998 at free.fr Sun Feb 4 13:25:54 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 14:25:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: drop DBUS_CPE_ID_PRODUCT In-Reply-To: References: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-04 13:32 +0100, Yann E. MORIN spake thusly: > Maybe it would be good to add that check to utils/checkpackagelib/, so > that it detects and reports the "FOO_CPE_ID_PRODUCT = foo" case. It got me thinking that it'd be a good itch to scratch, so I'm working on it. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 4 13:35:55 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 14:35:55 +0100 Subject: [Buildroot] [PATCH 1/3] package/containerd: drop CONTAINERD_CPE_ID_VENDOR Message-ID: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> Commit 35af2bb8011ea57642777acf5613afa244d325d7 set CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as CONTAINERD_CPE_ID_PRODUCT will be set to the package name (i.e. containerd) by default Signed-off-by: Fabrice Fontaine --- package/containerd/containerd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 61a8472ddd..d3ca102797 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 4 13:35:56 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 14:35:56 +0100 Subject: [Buildroot] [PATCH 2/3] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT In-Reply-To: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> Message-ID: <20240204133557.1512951-2-fontaine.fabrice@gmail.com> Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as LIBCURL_CPE_ID_PRODUCT will be set to the package name (i.e. libcurl) by default Signed-off-by: Fabrice Fontaine --- package/libcurl/libcurl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 3ecc587a52..83845b8e87 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 4 13:35:57 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 14:35:57 +0100 Subject: [Buildroot] [PATCH 3/3] utils/checkpackagelib: add RemoveDefaultPackageCpeIdProductVariable In-Reply-To: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> Message-ID: <20240204133557.1512951-3-fontaine.fabrice@gmail.com> As advised by Yann E. Morin [1], add RemoveDefaultPackageCpeIdProductVariable [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240204103204.1415592-1-fontaine.fabrice at gmail.com Signed-off-by: Fabrice Fontaine --- utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index 551c87168f..b5cfdd7f41 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -227,6 +227,24 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction): text] +class RemoveDefaultPackageCpeIdProductVariable(_CheckFunction): + def before(self): + package, _ = os.path.splitext(os.path.basename(self.filename)) + package_upper = package.replace("-", "_").upper() + self.package = package + self.FIND_CPE_ID_PRODUCT = re.compile( + r"^{}_CPE_ID_PRODUCT\s*=\s*{}$" + .format(package_upper, package, package_upper)) + + def check_line(self, lineno, text): + if self.FIND_CPE_ID_PRODUCT.search(text): + + return ["{}:{}: remove default value of _CPE_ID_PRODUCT variable " + "({}#generic-package-reference)" + .format(self.filename, lineno, self.url_to_manual), + text] + + class SpaceBeforeBackslash(_CheckFunction): TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*( |\t ?)\\$") -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 13:58:00 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 14:58:00 +0100 Subject: [Buildroot] [PATCH 3/3] utils/checkpackagelib: add RemoveDefaultPackageCpeIdProductVariable In-Reply-To: <20240204133557.1512951-3-fontaine.fabrice@gmail.com> References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> <20240204133557.1512951-3-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, Thanks for working on my suggestion! Sorry, I was not quick enough that I was tackling it on my side... See below for some comments... On 2024-02-04 14:35 +0100, Fabrice Fontaine spake thusly: > As advised by Yann E. Morin [1], add > RemoveDefaultPackageCpeIdProductVariable > > [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240204103204.1415592-1-fontaine.fabrice at gmail.com > > Signed-off-by: Fabrice Fontaine > --- > utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py > index 551c87168f..b5cfdd7f41 100644 > --- a/utils/checkpackagelib/lib_mk.py > +++ b/utils/checkpackagelib/lib_mk.py > @@ -227,6 +227,24 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction): > text] > > > +class RemoveDefaultPackageCpeIdProductVariable(_CheckFunction): > + def before(self): > + package, _ = os.path.splitext(os.path.basename(self.filename)) > + package_upper = package.replace("-", "_").upper() > + self.package = package > + self.FIND_CPE_ID_PRODUCT = re.compile( > + r"^{}_CPE_ID_PRODUCT\s*=\s*{}$" > + .format(package_upper, package, package_upper)) > + > + def check_line(self, lineno, text): > + if self.FIND_CPE_ID_PRODUCT.search(text): > + > + return ["{}:{}: remove default value of _CPE_ID_PRODUCT variable " > + "({}#generic-package-reference)" > + .format(self.filename, lineno, self.url_to_manual), > + text] This is actually a little bit more complex than that. Indeed, if there is no CPE variable set, we do not consider FOO_CPE_ID to be valid, but if the user does provide one CPE variable, then we connsider FOO_CPE_ID to be valid. Of course, in that case, we want to allow for the CPE variable to be the default, if that's the actual value it needs to have. But this is only valid *if* there is only one CPE variable set. So, I am almost done on my side, but if you want to continue on your side, I'm totally fine with letting you do the job! Just tell me. Regards, Yann E. MORIN. > + > class SpaceBeforeBackslash(_CheckFunction): > TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*( |\t ?)\\$") > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 4 14:06:53 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 15:06:53 +0100 Subject: [Buildroot] [PATCH 3/3] utils/checkpackagelib: add RemoveDefaultPackageCpeIdProductVariable In-Reply-To: References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> <20240204133557.1512951-3-fontaine.fabrice@gmail.com> Message-ID: Hello Yann, Le dim. 4 f?vr. 2024 ? 14:58, Yann E. MORIN a ?crit : > > Fabrice, All, > > Thanks for working on my suggestion! Sorry, I was not quick enough that > I was tackling it on my side... See below for some comments... > > On 2024-02-04 14:35 +0100, Fabrice Fontaine spake thusly: > > As advised by Yann E. Morin [1], add > > RemoveDefaultPackageCpeIdProductVariable > > > > [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240204103204.1415592-1-fontaine.fabrice at gmail.com > > > > Signed-off-by: Fabrice Fontaine > > --- > > utils/checkpackagelib/lib_mk.py | 18 ++++++++++++++++++ > > 1 file changed, 18 insertions(+) > > > > diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py > > index 551c87168f..b5cfdd7f41 100644 > > --- a/utils/checkpackagelib/lib_mk.py > > +++ b/utils/checkpackagelib/lib_mk.py > > @@ -227,6 +227,24 @@ class RemoveDefaultPackageSourceVariable(_CheckFunction): > > text] > > > > > > +class RemoveDefaultPackageCpeIdProductVariable(_CheckFunction): > > + def before(self): > > + package, _ = os.path.splitext(os.path.basename(self.filename)) > > + package_upper = package.replace("-", "_").upper() > > + self.package = package > > + self.FIND_CPE_ID_PRODUCT = re.compile( > > + r"^{}_CPE_ID_PRODUCT\s*=\s*{}$" > > + .format(package_upper, package, package_upper)) > > + > > + def check_line(self, lineno, text): > > + if self.FIND_CPE_ID_PRODUCT.search(text): > > + > > + return ["{}:{}: remove default value of _CPE_ID_PRODUCT variable " > > + "({}#generic-package-reference)" > > + .format(self.filename, lineno, self.url_to_manual), > > + text] > > This is actually a little bit more complex than that. Indeed, if there > is no CPE variable set, we do not consider FOO_CPE_ID to be valid, but > if the user does provide one CPE variable, then we connsider FOO_CPE_ID > to be valid. > > Of course, in that case, we want to allow for the CPE variable to be the > default, if that's the actual value it needs to have. But this is only > valid *if* there is only one CPE variable set. > > So, I am almost done on my side, but if you want to continue on your > side, I'm totally fine with letting you do the job! Just tell me. Indeed, I didn't manage all the corner cases. I'll let you handle the rest. > > Regards, > Yann E. MORIN. > > > + > > class SpaceBeforeBackslash(_CheckFunction): > > TAB_OR_MULTIPLE_SPACES_BEFORE_BACKSLASH = re.compile(r"^.*( |\t ?)\\$") > > > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' Best Regards, Fabrice From peter at korsgaard.com Sun Feb 4 14:50:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 15:50:18 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/redis: security bump to v7.0.15 Message-ID: <20240204145122.E62A9868F2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fcef868c6088a628eef2a82eac48af2fffe832aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x ================================================================================ Redis 7.0.15 Released Tue 09 Jan 2024 10:45:52 IST ================================================================================ Upgrade urgency SECURITY: See security fixes below. Security fixes ============== * (CVE-2023-41056) In some cases, Redis may incorrectly handle resizing of memory buffers which can result in incorrect accounting of buffer sizes and lead to heap overflow and potential remote code execution. Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index cbbb29ca13..61ae276de9 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 7e1cdf347f4970ea39d5b7fdb19aedec4c21942e202de65bdeb782d38d2f299f redis-7.0.14.tar.gz +sha256 98066f5363504b26c34dd20fbcc3c957990d764cdf42576c836fc021073f4341 redis-7.0.15.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 5bf15821ba..2c5702d10d 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.0.14 +REDIS_VERSION = 7.0.15 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 4 14:37:26 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 15:37:26 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/redis: security bump to v7.2.4 Message-ID: <20240204145230.E8BDC868F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7964cf52a0f3137ca3359deef46bcd3e9472f504 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x See release notes (https://github.com/redis/redis/blob/7.2.4/00-RELEASENOTES): ================================================================================ Redis 7.2.4 Released Tue 09 Jan 2024 10:45:52 IST ================================================================================ Upgrade urgency SECURITY: See security fixes below. Security fixes ============== * (CVE-2023-41056) In some cases, Redis may incorrectly handle resizing of memory buffers which can result in incorrect accounting of buffer sizes and lead to heap overflow and potential remote code execution. Bug fixes ========= * Fix crashes of cluster commands clusters with mixed versions of 7.0 and 7.2 (#12805, #12832) * Fix slot ownership not being properly handled when deleting a slot from a node (#12564) * Fix atomicity issues with the RedisModuleEvent_Key module API event (#12733) Signed-off-by: Titouan Christophe Signed-off-by: Peter Korsgaard (cherry picked from commit 5f59c175a484fcc47c6875db49ad03eb83b90523) Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 365fbf4063..378b930374 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 3e2b196d6eb4ddb9e743088bfc2915ccbb42d40f5a8a3edd8cb69c716ec34be7 redis-7.2.3.tar.gz +sha256 8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59 redis-7.2.4.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 77cfb1e0b1..09a3b9448b 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.2.3 +REDIS_VERSION = 7.2.4 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From peter at korsgaard.com Sun Feb 4 14:52:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 15:52:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/redis: security bump to v7.2.4 In-Reply-To: <877ck3hvez.fsf@48ers.dk> (Peter Korsgaard's message of "Sun, 21 Jan 2024 10:45:24 +0100") References: <20240118193717.915022-1-titouanchristophe@gmail.com> <877ck3hvez.fsf@48ers.dk> Message-ID: <87wmrkp9hr.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Titouan" == Titouan Christophe writes: >> See release notes (https://github.com/redis/redis/blob/7.2.4/00-RELEASENOTES): >> ================================================================================ >> Redis 7.2.4 Released Tue 09 Jan 2024 10:45:52 IST >> ================================================================================ >> Upgrade urgency SECURITY: See security fixes below. >> Security fixes >> ============== >> * (CVE-2023-41056) In some cases, Redis may incorrectly handle resizing of memory >> buffers which can result in incorrect accounting of buffer sizes and lead to >> heap overflow and potential remote code execution. >> Bug fixes >> ========= >> * Fix crashes of cluster commands clusters with mixed versions of 7.0 and 7.2 (#12805, #12832) >> * Fix slot ownership not being properly handled when deleting a slot from a node (#12564) >> * Fix atomicity issues with the RedisModuleEvent_Key module API event (#12733) >> Signed-off-by: Titouan Christophe > Committed, thanks. Committed to 2023.11.x, thanks. For 2023.02.x I have instead bumped to 7.0.15. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 15:07:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 16:07:55 +0100 Subject: [Buildroot] [git commit] package/micropython: fix building after dropping GIT_DIR=. workaround In-Reply-To: <20240121131614.3ADE3863A1@busybox.osuosl.org> (Yann E. MORIN's message of "Sun, 21 Jan 2024 14:12:16 +0100") References: <20240121131614.3ADE3863A1@busybox.osuosl.org> Message-ID: <87sf28p8s4.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=6c9be611a8b7b4caac746920c08035761a9b9d9c > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The MICROPYTHON_MAKE_ENV variable contained two things; > - the comon target environment variables CC, CFLAGS et al. defined in > TARGET_MAKE_ENV, > - the GIT_DIR workaround > Commit 9024e1866523 (package/micropython: drop GIT_DIR=. workaround) > totally dropped the assignment to MICROPYTHON_MAKE_ENV, but did not > replace its expansin with TARGET_MAKE_ENV. > This yields build error like: > LINK build-standard/micropython > arm-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib64/../lib64' > Fix this by expanding TARGET_MAKE_ENV in lieu of MICROPYTHON_MAKE_ENV. > Signed-off-by: Yann E. MORIN Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 15:07:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 16:07:35 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/micropython: fix building after dropping GIT_DIR=. workaround Message-ID: <20240204150804.D457F868F8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1297bfb5ad0d42535fb5049e6cd0b813caa6957 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The MICROPYTHON_MAKE_ENV variable contained two things; - the comon target environment variables CC, CFLAGS et al. defined in TARGET_MAKE_ENV, - the GIT_DIR workaround Commit 9024e1866523 (package/micropython: drop GIT_DIR=. workaround) totally dropped the assignment to MICROPYTHON_MAKE_ENV, but did not replace its expansin with TARGET_MAKE_ENV. This yields build error like: LINK build-standard/micropython arm-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib64/../lib64' Fix this by expanding TARGET_MAKE_ENV in lieu of MICROPYTHON_MAKE_ENV. Signed-off-by: Yann E. MORIN (cherry picked from commit 6c9be611a8b7b4caac746920c08035761a9b9d9c) Signed-off-by: Peter Korsgaard --- package/micropython/micropython.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 6e0af59f06..41bd32099b 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -37,13 +37,13 @@ MICROPYTHON_MAKE_OPTS += \ CWARN= define MICROPYTHON_BUILD_CMDS - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) endef define MICROPYTHON_INSTALL_TARGET_CMDS - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) \ PREFIX=/usr \ From peter at korsgaard.com Sun Feb 4 15:07:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 16:07:16 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/micropython: fix building after dropping GIT_DIR=. workaround Message-ID: <20240204150917.65B3C868FB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d35d445a1ae2f9fe1682540159c2c32cb2114c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The MICROPYTHON_MAKE_ENV variable contained two things; - the comon target environment variables CC, CFLAGS et al. defined in TARGET_MAKE_ENV, - the GIT_DIR workaround Commit 9024e1866523 (package/micropython: drop GIT_DIR=. workaround) totally dropped the assignment to MICROPYTHON_MAKE_ENV, but did not replace its expansin with TARGET_MAKE_ENV. This yields build error like: LINK build-standard/micropython arm-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib64/../lib64' Fix this by expanding TARGET_MAKE_ENV in lieu of MICROPYTHON_MAKE_ENV. Signed-off-by: Yann E. MORIN (cherry picked from commit 6c9be611a8b7b4caac746920c08035761a9b9d9c) Signed-off-by: Peter Korsgaard --- package/micropython/micropython.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 6e0af59f06..41bd32099b 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -37,13 +37,13 @@ MICROPYTHON_MAKE_OPTS += \ CWARN= define MICROPYTHON_BUILD_CMDS - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) endef define MICROPYTHON_INSTALL_TARGET_CMDS - $(MICROPYTHON_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ $(MICROPYTHON_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) \ PREFIX=/usr \ From yann.morin.1998 at free.fr Sun Feb 4 15:22:49 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 16:22:49 +0100 Subject: [Buildroot] [PATCH 0/4] utils/checkpackagelib: check CPE variables (branch yem/checkpkg-cpe) Message-ID: Hello All! This series removes superfluous CPE variables that are set to their default values, and eventually adds a check-package test that ensures none crop in back in the future. The first two patches are from Fabrice, from his initial attempt at such a check. Thanks! Regards, Yann E. MORIN. ---------------------------------------------------------------- Fabrice Fontaine (2): package/containerd: drop CONTAINERD_CPE_ID_VENDOR package/libcurl: drop LIBCURL_CPE_ID_PRODUCT Yann E. MORIN (2): package/v4l2loopback: drop _CPE_ID_VENDOR utils/checkpackagelib: add check for CPE variables set to defautl values package/containerd/containerd.mk | 1 - package/libcurl/libcurl.mk | 1 - package/v4l2loopback/v4l2loopback.mk | 1 - utils/checkpackagelib/lib_mk.py | 59 ++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 3 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 4 15:22:48 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 16:22:48 +0100 Subject: [Buildroot] [PATCH 1/4] package/containerd: drop CONTAINERD_CPE_ID_VENDOR In-Reply-To: References: Message-ID: From: Fabrice Fontaine Commit 35af2bb8011ea57642777acf5613afa244d325d7 set CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as CONTAINERD_CPE_ID_PRODUCT will be set to the package name (i.e. containerd) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/containerd/containerd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 61a8472ddd..d3ca102797 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 15:22:49 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 16:22:49 +0100 Subject: [Buildroot] [PATCH 2/4] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT In-Reply-To: References: Message-ID: From: Fabrice Fontaine Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as LIBCURL_CPE_ID_PRODUCT will be set to the package name (i.e. libcurl) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libcurl/libcurl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 3ecc587a52..83845b8e87 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 15:22:50 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 16:22:50 +0100 Subject: [Buildroot] [PATCH 3/4] package/v4l2loopback: drop _CPE_ID_VENDOR In-Reply-To: References: Message-ID: <1bfeb8d9649b7bb7fcd44cab8b5bd811bf389c0f.1707060159.git.yann.morin.1998@free.fr> Commit 1edb9d691dec (package/v4l2loopback: add V4L2LOOPBACK_CPE_ID_VENDOR) added that variable, but set to its default value. This is however not required to define a valid CPE ID, as it also defines a non-default CPE_ID_PREFIX. Drop V4L2LOOPBACK_CPE_ID_VENDOR now. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- package/v4l2loopback/v4l2loopback.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/v4l2loopback/v4l2loopback.mk b/package/v4l2loopback/v4l2loopback.mk index 84e1927ce3..50a168fcab 100644 --- a/package/v4l2loopback/v4l2loopback.mk +++ b/package/v4l2loopback/v4l2loopback.mk @@ -8,7 +8,6 @@ V4L2LOOPBACK_VERSION = 0.12.7 V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,v$(V4L2LOOPBACK_VERSION)) V4L2LOOPBACK_LICENSE = GPL-2.0+ V4L2LOOPBACK_LICENSE_FILES = COPYING -V4L2LOOPBACK_CPE_ID_VENDOR = v4l2loopback_project V4L2LOOPBACK_CPE_ID_PREFIX = cpe:2.3:o ifeq ($(BR2_PACKAGE_V4L2LOOPBACK_UTILS),y) -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 4 15:22:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 16:22:51 +0100 Subject: [Buildroot] [PATCH 4/4] utils/checkpackagelib: add check for CPE variables set to defautl values In-Reply-To: References: Message-ID: The way we handle CPE variable is unsual compared to the other variables: we mostly compute defaults for all of them, and eventually aggregate the various CPE variables to form the CPE ID name. However, we do not consider that CPE ID to valid, unless there is one (or more) CPE variables actually set by thje package. This shows that the CPE ID has been checked to be valid against the NVD CPE database. However, it is totally possible (and very often the case) that the default value we set to those variables are appropriate, and do defne a valid CPE ID. In this case, the package will define any arbitrary cPE variable to tis default value, usually by setting either the VENDOR or PRODUCT field, though there is no rule or requirement that be the case. But since we only need one variable to be set, if they all are set to their default value, or one is set to a non-default value, there is no need to define the others to their default value. So, the rules are really: * no valid CPE ID known: define no CPE variable; * valid CPE ID known, using all defaults fields: set a single CPE variable; * valid CPE ID known, at least one CPE field id non default: only set those CPE variables that are not default. So, we add a new check to checkpakcagelib, that ensures the above rules are met: if a CPE variable is set to its default, then it should be the only CPE variable set at all. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Cc: Ricardo Martincoski --- utils/checkpackagelib/lib_mk.py | 59 +++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index d340882971..1eb20fc04a 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -366,3 +366,62 @@ class VariableWithBraces(_CheckFunction): return ["{}:{}: use $() to delimit variables, not ${{}}" .format(self.filename, lineno), text] + + +class CPEProduct(_CheckFunction): + """ + Check that the values for the CPE variables are not the default. + However, if there is only one such variable set, the default + is acceptable, because that is used to set whether the CPE info + is valid or not. + """ + def before(self): + pkg, _ = os.path.splitext(os.path.basename(self.filename)) + self.CPE_fields = { + "PREFIX": "cpe:2.3:a", + "VENDOR": f"{pkg}_project", + "PRODUCT": pkg, + "VERSION": None, + "UPDATE": "*", + } + self.VAR_SPLIT_RE = re.compile( + r"^.+_CPE_ID_({})\s*=\s*(.+)$" + .format("|".join(self.CPE_fields)), + ) + self.nb_CPE_fields = 0 + self.CPE_info = dict() + self.VERSION_RE = re.compile( + r"^.*_VERSION\s*=\*(.+)$", + ) + + def check_line(self, lineno, text): + match = self.VERSION_RE.match(text) + if match: + self.CPE_fields["VERSION"] = match.groups()[0] + + match = self.VAR_SPLIT_RE.match(text) + if match: + self.nb_CPE_fields += 1 + CPE_f, CPE_v = match.groups() + self.CPE_info[CPE_f] = { + "lineno": lineno, + "text": text, + "val": CPE_v, + } + + def after(self): + if self.nb_CPE_fields <= 1: + return + defaults = list() + for f in self.CPE_fields: + if f not in self.CPE_info: + continue + lineno = self.CPE_info[f]["lineno"] + text = self.CPE_info[f]["text"] + val = self.CPE_info[f]["val"] + if val == self.CPE_fields[f]: + defaults.append( + f"{self.filename}:{lineno}: {val} is the default value: {text}" + ) + + return defaults or None -- 2.43.0 From baruch at tkos.co.il Sun Feb 4 15:40:14 2024 From: baruch at tkos.co.il (Baruch Siach) Date: Sun, 04 Feb 2024 17:40:14 +0200 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix service runtime In-Reply-To: <871q9sr42s.fsf@48ers.dk> References: <20240117210756.265708-1-ju.o@free.fr> <871q9sr42s.fsf@48ers.dk> Message-ID: <87il345jah.fsf@tarshish> Hi Peter, On Sun, Feb 04 2024, Peter Korsgaard wrote: >>>>>> "Yann" == Yann E MORIN writes: > > > Julien, All, > > On 2024-01-17 22:07 +0100, Julien Olivain spake thusly: > >> Since commit 2a8065e "package/postgresql: bump version to 16.1", the > >> postgresql service fail to start at runtime with an error: > >> > >> FATAL: could not load library > >> "/usr/lib/postgresql/dict_snowball.so": > >> /usr/lib/postgresql/dict_snowball.so: undefined symbol: > >> CurrentMemoryContext > >> > >> This is due to the Posgresql autotool configure script trying to > >> detect whether the toolchain linker needs --export-dynamic or not. > >> This test is done with a runtime execution of a test program, and > >> therefore cannot run in cross-compilation. In that case, the > >> configure script assumes it is not needed. See commit [1], included > >> in PostgreSQL v16.0. > >> > >> This commit fixes the issue by forcing the value in _CONF_ENV. The > >> package has already a Kconfig dependency on !BR2_STATIC_LIBS, so the > >> value can be unconditionally set. > >> > >> [1] > >> https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=9db49fc5bfdc0126be03f4b8986013e59d93b91d > > > I've added references to the ML thread upstream, with their position > > that cross-compiling is not really a supoprted thing. > > >> Signed-off-by: Julien Olivain > > > Applied to master, thanks. > > Committed to 2023.11.x, thanks. Not in 2023.11.x as of commit 7d35d445a1ae ("package/micropython: fix building after dropping GIT_DIR=. workaround"). baruch -- ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - From yann.morin.1998 at free.fr Sun Feb 4 16:09:48 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 17:09:48 +0100 Subject: [Buildroot] [PATCH v4] package/sway: make systemd optional In-Reply-To: <20240203030138.1934339-1-stefan@ott.net> References: <20240203030138.1934339-1-stefan@ott.net> Message-ID: Stefan, All, On 2024-02-03 04:01 +0100, Stefan Ott via buildroot spake thusly: > Sway works perfectly fine without it. Thanks for this new iteration. However, there are a few issues with it yet. First, your commit log is way too short to explain the changes: - why is it OK to drop the swaybar option altogether? - why is there no value set for -Dsd-bus-provider when systemd is not enabled? You provided answers to the second, and you did the first because it was suggested, but the explanations really belong to the commit log. Indeed, when we look at the git tree in the future, we need to have that information available right there, rather than buried and lost in a few threads in the mailing list. Also, even though it may make sense to always enable the waybar with systemd, this is semantically a separate change, and should be done in a separate commit (possibly coming before the one making systemd optional). If that were not possible, then this should be dully motivated in the commit log. So, could you please rework this change, so that: - the first patch makes building waybar non-optional once systemd is enabled; note in the commit log that there is no need for legacy handling (I'll let you dig why! ;-)) - the second patch removes the systemd dependency on sway oitself, and explains why the non-systemd case has no otpion set for -Dsd-bus-provider Thanks! Regards, Yann E. MORIN. > Signed-off-by: Stefan Ott > > --- > Changes v3 -> v4: > - Automatically enable tray support if systemd is enabled (suggested > by Raphael Pavlidis) > Changes v2 -> v3: > - Make BR2_PACKAGE_SWAY_SWAYBAR_TRAY depend on systemd and set > sd-bus-provider=libsystemd if SWAY_SWAYBAR_TRAY is enabled > Changes v1 -> v2: > - Automatically enable systemd integration for builds with systemd > support (suggested by Thomas Petazzoni) > --- > package/sway/Config.in | 15 ++------------- > package/sway/sway.mk | 10 +++++----- > 2 files changed, 7 insertions(+), 18 deletions(-) > > diff --git a/package/sway/Config.in b/package/sway/Config.in > index 4f6d9fb215..d2fcdc6d70 100644 > --- a/package/sway/Config.in > +++ b/package/sway/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_SWAY > bool "sway" > - depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider > depends on !BR2_STATIC_LIBS # wlroots > depends on BR2_TOOLCHAIN_HAS_THREADS # pango, wlroots > depends on BR2_PACKAGE_HAS_LIBEGL # wlroots > @@ -38,15 +37,6 @@ config BR2_PACKAGE_SWAY_SWAYBAR > help > Enable support for swaybar > > -if BR2_PACKAGE_SWAY_SWAYBAR > - > -config BR2_PACKAGE_SWAY_SWAYBAR_TRAY > - bool "swaybar tray" > - help > - Enable support for swaybar tray > - > -endif # BR2_PACKAGE_SWAY_SWAYBAR > - > config BR2_PACKAGE_SWAY_SWAYNAG > bool "swaynag" > help > @@ -54,9 +44,8 @@ config BR2_PACKAGE_SWAY_SWAYNAG > > endif # BR2_PACKAGE_SWAY > > -comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" > - depends on !BR2_PACKAGE_SYSTEMD || \ > - !BR2_PACKAGE_HAS_UDEV || \ > +comment "sway needs udev, EGL w/ Wayland backend and OpenGL ES support" > + depends on !BR2_PACKAGE_HAS_UDEV || \ > !BR2_PACKAGE_HAS_LIBEGL || \ > !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ > !BR2_PACKAGE_HAS_LIBGLES > diff --git a/package/sway/sway.mk b/package/sway/sway.mk > index 0aad9de712..089b533baf 100644 > --- a/package/sway/sway.mk > +++ b/package/sway/sway.mk > @@ -8,13 +8,12 @@ SWAY_VERSION = 1.8.1 > SWAY_SITE = https://github.com/swaywm/sway/releases/download/$(SWAY_VERSION) > SWAY_LICENSE = MIT > SWAY_LICENSE_FILES = LICENSE > -SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango > +SWAY_DEPENDENCIES = host-pkgconf wlroots json-c pcre cairo pango > SWAY_CONF_OPTS = \ > -Dwerror=false \ > -Dzsh-completions=false \ > -Dfish-completions=false \ > - -Dman-pages=disabled \ > - -Dsd-bus-provider=libsystemd > + -Dman-pages=disabled > > ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) > SWAY_CONF_OPTS += -Dxwayland=enabled > @@ -53,8 +52,9 @@ else > SWAY_CONF_OPTS += -Dswaynag=false > endif > > -ifeq ($(BR2_PACKAGE_SWAY_SWAYBAR_TRAY),y) > -SWAY_CONF_OPTS += -Dtray=enabled > +ifeq ($(BR2_PACKAGE_SYSTEMD),y) > +SWAY_DEPENDENCIES += systemd > +SWAY_CONF_OPTS += -Dtray=enabled -Dsd-bus-provider=libsystemd > else > SWAY_CONF_OPTS += -Dtray=disabled > endif > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 4 18:14:35 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 19:14:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/opus: set OPUS_CPE_ID_VENDOR Message-ID: <20240204181435.1657162-1-fontaine.fabrice@gmail.com> cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B Signed-off-by: Fabrice Fontaine --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 15531b521a..cbc07a091b 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -8,6 +8,7 @@ OPUS_VERSION = 1.4 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING +OPUS_CPE_ID_VENDOR = opus-codec OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 4 18:25:14 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 4 Feb 2024 19:25:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/yasm: add YASM_CPE_ID_VENDOR Message-ID: <20240204182514.1663508-1-fontaine.fabrice@gmail.com> cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E Signed-off-by: Fabrice Fontaine --- package/yasm/yasm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index b294bd3aee..cdb8e15bee 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 YASM_SITE = http://www.tortall.net/projects/yasm/releases YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 +YASM_CPE_ID_VENDOR = tortall # This sed prevents it compiling 2 programs (vsyasm and ytasm) # that are only of use on Microsoft Windows. -- 2.43.0 From ju.o at free.fr Sun Feb 4 19:19:22 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 4 Feb 2024 20:19:22 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add libcamera runtime test Message-ID: <20240204191922.366955-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + .../testing/tests/package/test_libcamera.py | 79 +++++++++++++++++++ .../test_libcamera/linux-vimc.fragment | 4 + 3 files changed, 85 insertions(+) create mode 100644 support/testing/tests/package/test_libcamera.py create mode 100644 support/testing/tests/package/test_libcamera/linux-vimc.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 02b7516a92..0acf49296d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1783,6 +1783,8 @@ F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_kmscube.py F: support/testing/tests/package/test_kmscube/ F: support/testing/tests/package/test_less.py +F: support/testing/tests/package/test_libcamera.py +F: support/testing/tests/package/test_libcamera/ F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py diff --git a/support/testing/tests/package/test_libcamera.py b/support/testing/tests/package/test_libcamera.py new file mode 100644 index 0000000000..8953021b82 --- /dev/null +++ b/support/testing/tests/package/test_libcamera.py @@ -0,0 +1,79 @@ +import os + +import infra.basetest + + +class TestLibCamera(infra.basetest.BRTest): + # A specific configuration is needed for testing libcamera: + # a kernel config fragment enables v4l2 vimc driver. + # The libevent package is also enabled to have the libcamera "cam" + # test application. + kernel_fragment = \ + infra.filepath("tests/package/test_libcamera/linux-vimc.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.76" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_LIBCAMERA=y + BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC=y + BR2_PACKAGE_LIBEVENT=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # The Kernel config of this test has only one v4l2 vimc + # driver. The camera index is expected to be #1. + cam_idx = 1 + + # We test libcamera with its simple "cam" application, by + # requesting a list of available cameras. + cmd = "cam --list" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + # libcamera generates info messages. We filter only the + # line(s) starting with our camera index. + cam_line = [ln for ln in out if ln.startswith(f"{cam_idx}:")] + # We should have the vimc camera in this line. + self.assertIn("platform/vimc.0", cam_line[0]) + + # List the camera information. + cmd = f"cam --camera {cam_idx} --info" + self.assertRunOk(cmd) + + # List the camera controls and check we have a brightness + # control. + cmd = f"cam --camera {cam_idx} --list-controls" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn("Control: Brightness:", "\n".join(out)) + + # List the camera properties and check we have a camera + # "Model" property. + cmd = f"cam --camera {cam_idx} --list-properties" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn("Property: Model = ", "\n".join(out)) + + # Capture few frames. + cmd = f"cam --camera {cam_idx} --capture=5" + cmd += " --stream width=160,height=120,role=video,pixelformat=RGB888" + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_libcamera/linux-vimc.fragment b/support/testing/tests/package/test_libcamera/linux-vimc.fragment new file mode 100644 index 0000000000..04436e7518 --- /dev/null +++ b/support/testing/tests/package/test_libcamera/linux-vimc.fragment @@ -0,0 +1,4 @@ +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_TEST_SUPPORT=y +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIMC=y -- 2.43.0 From aleksandr.o.makarov at gmail.com Sun Feb 4 20:16:56 2024 From: aleksandr.o.makarov at gmail.com (Aleksandr Makarov) Date: Sun, 4 Feb 2024 22:16:56 +0200 Subject: [Buildroot] [PATCH v2] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further Message-ID: <20240204201657.33079-1-aleksandr.o.makarov@gmail.com> This is a re-spin of v1 that was modifying haproxy's Makefile and was rejected by upstream [1]. I made a v2 that makes changes to haproxy.mk recipe instead and dropped the .patch to program source. [1] https://www.mail-archive.com/haproxy at formilux.org/msg44499.html Aleksandr Makarov (1): package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.39.2 From aleksandr.o.makarov at gmail.com Sun Feb 4 20:16:57 2024 From: aleksandr.o.makarov at gmail.com (Aleksandr Makarov) Date: Sun, 4 Feb 2024 22:16:57 +0200 Subject: [Buildroot] [PATCH v2] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' In-Reply-To: <20240204201657.33079-1-aleksandr.o.makarov@gmail.com> References: <20240204201657.33079-1-aleksandr.o.makarov@gmail.com> Message-ID: <20240204201657.33079-2-aleksandr.o.makarov@gmail.com> Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS which were internally set by the haproxy Makefile. Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and and then running the program results in runtime error: $ haproxy FATAL ERROR: invalid code detected -- cannot go further, please recompile! ... To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead of CFLAGS in haproxy.mk. --- Changes v1 -> v2 - Drop patch for haproxy program Makefile, make changes to haproxy.mk instead --- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 63a92090f3..61a9ebebe4 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -82,7 +82,7 @@ endif define HAPROXY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) endef define HAPROXY_INSTALL_TARGET_CMDS -- 2.39.2 From fido_max at inbox.ru Sun Feb 4 20:51:02 2024 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Sun, 4 Feb 2024 23:51:02 +0300 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix service runtime In-Reply-To: <871q9sr42s.fsf@48ers.dk> References: <20240117210756.265708-1-ju.o@free.fr> <871q9sr42s.fsf@48ers.dk> Message-ID: On 04.02.2024 12:06, Peter Korsgaard wrote: >>>>>> "Yann" == Yann E MORIN writes: > > > Julien, All, > > On 2024-01-17 22:07 +0100, Julien Olivain spake thusly: > >> Since commit 2a8065e "package/postgresql: bump version to 16.1", the > >> postgresql service fail to start at runtime with an error: > >> > >> FATAL: could not load library > >> "/usr/lib/postgresql/dict_snowball.so": > >> /usr/lib/postgresql/dict_snowball.so: undefined symbol: > >> CurrentMemoryContext > >> > >> This is due to the Posgresql autotool configure script trying to > >> detect whether the toolchain linker needs --export-dynamic or not. > >> This test is done with a runtime execution of a test program, and > >> therefore cannot run in cross-compilation. In that case, the > >> configure script assumes it is not needed. See commit [1], included > >> in PostgreSQL v16.0. > >> > >> This commit fixes the issue by forcing the value in _CONF_ENV. The > >> package has already a Kconfig dependency on !BR2_STATIC_LIBS, so the > >> value can be unconditionally set. > >> > >> [1] > >> https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=9db49fc5bfdc0126be03f4b8986013e59d93b91d > > > I've added references to the ML thread upstream, with their position > > that cross-compiling is not really a supoprted thing. > > >> Signed-off-by: Julien Olivain > > > Applied to master, thanks. > > Committed to 2023.11.x, thanks. > Not needed for 2023.11. Because it is still on 15.5 Posgresql version From peter at korsgaard.com Sun Feb 4 20:59:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 21:59:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/postgresql: fix service runtime In-Reply-To: <87il345jah.fsf@tarshish> (Baruch Siach's message of "Sun, 04 Feb 2024 17:40:14 +0200") References: <20240117210756.265708-1-ju.o@free.fr> <871q9sr42s.fsf@48ers.dk> <87il345jah.fsf@tarshish> Message-ID: <87o7cwoshu.fsf@48ers.dk> >>>>> "Baruch" == Baruch Siach writes: > Hi Peter, > On Sun, Feb 04 2024, Peter Korsgaard wrote: >> > Applied to master, thanks. >> >> Committed to 2023.11.x, thanks. > Not in 2023.11.x as of commit 7d35d445a1ae ("package/micropython: fix > building after dropping GIT_DIR=. workaround"). Ehh, I made a mistake - 2023.11.x doesn't have postgresql 16.x, so this is not backported. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:11:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:11:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/micropython: libffi is optional, not mandatory In-Reply-To: <20240116183629.365115-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 16 Jan 2024 19:36:29 +0100") References: <20240116183629.365115-1-fontaine.fabrice@gmail.com> Message-ID: <87jznkoryk.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libffi is optional, not mandatory since bump to version 1.22.0 in commit > 1e12b7dd49d1c64a5195f226e9e4da21e84f5d0c and > https://github.com/micropython/micropython/commit/89b320737652829edbab921e86d7ad3962d86d9e > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sun Feb 4 21:13:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:13:19 +0100 Subject: [Buildroot] [git commit] package/yasm: add YASM_CPE_ID_VENDOR Message-ID: <20240204211424.08D4E8690E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17dac57e3ebfe8e2371100a632cca4fb11ed9bac branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/yasm/yasm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index b294bd3aee..cdb8e15bee 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 YASM_SITE = http://www.tortall.net/projects/yasm/releases YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 +YASM_CPE_ID_VENDOR = tortall # This sed prevents it compiling 2 programs (vsyasm and ytasm) # that are only of use on Microsoft Windows. From yann.morin.1998 at free.fr Sun Feb 4 21:13:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:13:06 +0100 Subject: [Buildroot] [git commit] package/opus: set OPUS_CPE_ID_VENDOR Message-ID: <20240204211423.EFE028690D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=302175353a920402d27d4f7cf23dd78c5a792428 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 15531b521a..cbc07a091b 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -8,6 +8,7 @@ OPUS_VERSION = 1.4 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING +OPUS_CPE_ID_VENDOR = opus-codec OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) From peter at korsgaard.com Sun Feb 4 21:10:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:10:52 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/micropython: libffi is optional, not mandatory Message-ID: <20240204211636.9F76A86918@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4fa5ebff17d899c3c0ef349b4eeb5af7b2aeb81 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x libffi is optional, not mandatory since bump to version 1.22.0 in commit 1e12b7dd49d1c64a5195f226e9e4da21e84f5d0c and https://github.com/micropython/micropython/commit/89b320737652829edbab921e86d7ad3962d86d9e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2c1cac10d8935f66260b8beeea776d3d49633ca4) Signed-off-by: Peter Korsgaard --- package/micropython/Config.in | 1 - package/micropython/micropython.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index b5dc47279d..30161c8b70 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_MICROPYTHON bool "micropython" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI help Micro Python is a lean and fast implementation of the Python 3 programming language that is optimised to run on a diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 41bd32099b..37c148da94 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -12,7 +12,7 @@ MICROPYTHON_SOURCE = micropython-$(MICROPYTHON_VERSION).tar.xz # and most of the copied code is not used in the unix build. MICROPYTHON_LICENSE = MIT, BSD-1-Clause, BSD-3-Clause, Zlib MICROPYTHON_LICENSE_FILES = LICENSE -MICROPYTHON_DEPENDENCIES = host-pkgconf libffi host-python3 +MICROPYTHON_DEPENDENCIES = host-python3 MICROPYTHON_CPE_ID_VENDOR = micropython # Use fallback implementation for exception handling on architectures that don't @@ -36,6 +36,13 @@ MICROPYTHON_MAKE_OPTS += \ LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ CWARN= +ifeq ($(BR2_PACKAGE_LIBFFI),y) +MICROPYTHON_DEPENDENCIES += host-pkgconf libffi +MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=1 +else +MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 +endif + define MICROPYTHON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ From peter at korsgaard.com Sun Feb 4 21:10:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:10:41 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/micropython: libffi is optional, not mandatory Message-ID: <20240204211746.809C88691B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=42a271c32e4584c5b73561315825b5416cdf1819 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x libffi is optional, not mandatory since bump to version 1.22.0 in commit 1e12b7dd49d1c64a5195f226e9e4da21e84f5d0c and https://github.com/micropython/micropython/commit/89b320737652829edbab921e86d7ad3962d86d9e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 2c1cac10d8935f66260b8beeea776d3d49633ca4) Signed-off-by: Peter Korsgaard --- package/micropython/Config.in | 1 - package/micropython/micropython.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index b5dc47279d..30161c8b70 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_MICROPYTHON bool "micropython" depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI help Micro Python is a lean and fast implementation of the Python 3 programming language that is optimised to run on a diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 41bd32099b..37c148da94 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -12,7 +12,7 @@ MICROPYTHON_SOURCE = micropython-$(MICROPYTHON_VERSION).tar.xz # and most of the copied code is not used in the unix build. MICROPYTHON_LICENSE = MIT, BSD-1-Clause, BSD-3-Clause, Zlib MICROPYTHON_LICENSE_FILES = LICENSE -MICROPYTHON_DEPENDENCIES = host-pkgconf libffi host-python3 +MICROPYTHON_DEPENDENCIES = host-python3 MICROPYTHON_CPE_ID_VENDOR = micropython # Use fallback implementation for exception handling on architectures that don't @@ -36,6 +36,13 @@ MICROPYTHON_MAKE_OPTS += \ LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ CWARN= +ifeq ($(BR2_PACKAGE_LIBFFI),y) +MICROPYTHON_DEPENDENCIES += host-pkgconf libffi +MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=1 +else +MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 +endif + define MICROPYTHON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ From yann.morin.1998 at free.fr Sun Feb 4 21:18:50 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:18:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/opus: set OPUS_CPE_ID_VENDOR In-Reply-To: <20240204181435.1657162-1-fontaine.fabrice@gmail.com> References: <20240204181435.1657162-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-04 19:14 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/opus/opus.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/opus/opus.mk b/package/opus/opus.mk > index 15531b521a..cbc07a091b 100644 > --- a/package/opus/opus.mk > +++ b/package/opus/opus.mk > @@ -8,6 +8,7 @@ OPUS_VERSION = 1.4 > OPUS_SITE = https://downloads.xiph.org/releases/opus > OPUS_LICENSE = BSD-3-Clause > OPUS_LICENSE_FILES = COPYING > +OPUS_CPE_ID_VENDOR = opus-codec > OPUS_INSTALL_STAGING = YES > > OPUS_CFLAGS = $(TARGET_CFLAGS) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Sun Feb 4 21:16:02 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 4 Feb 2024 22:16:02 +0100 Subject: [Buildroot] [git commit] support/testing: TestPythonPy3SciPy: increase rootfs size to 250M Message-ID: <20240204211909.AEE6186924@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=393f5494187072533a1c69b82a26cf1f6d203a26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The rootfs generated TestPythonPy3SciPy by doesn't fit anymore in 120M. Increase the rootfs size to 250M and checking the amount of space available on the file system. Filesystem Size Used Available Use% Mounted on /dev/root 232.3M 134.5M 85.3M 61% / Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5880448601 Signed-off-by: Romain Naour Reviewed-by: Antoine Coutant Signed-off-by: Romain Naour --- support/testing/tests/package/test_python_scipy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_python_scipy.py b/support/testing/tests/package/test_python_scipy.py index 06297763c3..fb51f25d79 100644 --- a/support/testing/tests/package/test_python_scipy.py +++ b/support/testing/tests/package/test_python_scipy.py @@ -10,7 +10,7 @@ class TestPythonPy3SciPy(TestPythonPackageBase): BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_SCIPY=y BR2_TARGET_ROOTFS_EXT2=y - BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + BR2_TARGET_ROOTFS_EXT2_SIZE="250M" # BR2_TARGET_ROOTFS_TAR is not set """ sample_scripts = ["tests/package/sample_python_scipy.py"] From yann.morin.1998 at free.fr Sun Feb 4 21:19:09 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:19:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/yasm: add YASM_CPE_ID_VENDOR In-Reply-To: <20240204182514.1663508-1-fontaine.fabrice@gmail.com> References: <20240204182514.1663508-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-04 19:25 +0100, Fabrice Fontaine spake thusly: > cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: > > https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E > > Signed-off-by: Fabrice Fontaine Regards, Yann E. MORIN. > --- > package/yasm/yasm.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk > index b294bd3aee..cdb8e15bee 100644 > --- a/package/yasm/yasm.mk > +++ b/package/yasm/yasm.mk > @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 > YASM_SITE = http://www.tortall.net/projects/yasm/releases > YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 > YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 > +YASM_CPE_ID_VENDOR = tortall > > # This sed prevents it compiling 2 programs (vsyasm and ytasm) > # that are only of use on Microsoft Windows. > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Feb 4 21:21:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:21:05 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/criu: disable on aarch64_be In-Reply-To: <20240114123845.810225-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 14 Jan 2024 13:38:45 +0100") References: <20240114123845.810225-1-fontaine.fabrice@gmail.com> Message-ID: <87il34vsce.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > armv8a aarch64_be raises the following build failure since the addition > of the package in commit 3e4b479f39c15ffdf307ec8395d856680c727204: > Error (compel/arch/aarch64/src/lib/handle-elf-host.c:30): Unsupported Elf format detected > Fixes: > - http://autobuild.buildroot.org/results/8eaa881a926d138a0bfd3f1076246088994e883f > - http://autobuild.buildroot.org/results/8de9b4d6b26e06f6b4457a31366bdc0d8a8c34ae > Signed-off-by: Fabrice Fontaine > --- > Changes v1 -> v2 (after review of Yann E. Morin): > - Fix condition to only exclude aarch64_be, not armeb Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:23:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:23:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv4-contrib: fix INSTALL_TARGET value In-Reply-To: <20240123140211.105695-1-maximilian.senftleben@frogblue-tec.com> (Maximilian Senftleben's message of "Tue, 23 Jan 2024 15:02:11 +0100") References: <20240123140211.105695-1-maximilian.senftleben@frogblue-tec.com> Message-ID: <87eddrx6sa.fsf@48ers.dk> >>>>> "Maximilian" == Maximilian Senftleben writes: > The variable should be a YES/NO value, FALSE is not a valid value. > E.g. the yesno-to-bool cmd does not translate a FALSE value and > therefore returns invalid JSON. > Signed-off-by: Maximilian Senftleben Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:25:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:25:13 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/vulkan-loader: fix x11 handling In-Reply-To: (Yann E. MORIN's message of "Tue, 23 Jan 2024 17:04:44 +0100") References: <20230921164809.102741-1-fontaine.fabrice@gmail.com> Message-ID: <87a5ofx6py.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Fabrice, All, > On 2023-09-21 18:48 +0200, Fabrice Fontaine spake thusly: >> Fix the following build failure raised since the addition of the package >> in commit 6aa1bc31678ff9f8013084fda34b9f941cc63fc3: >> >> In file included from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.h:24, >> from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.c:23: >> /home/buildroot/autobuild/run/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/vulkan/vulkan.h:71:10: fatal error: X11/extensions/Xrandr.h: No such file or directory >> 71 | #include >> | ^~~~~~~~~~~~~~~~~~~~~~~~~ >> >> Fixes: >> - http://autobuild.buildroot.org/results/55ddfd44393e3bcc2f25bad2f9ecb7e1b142a985 >> >> Signed-off-by: Fabrice Fontaine > Applied to master, thanks. > Your commits always contain the description of the failure (which is > mildly interesting), but often lacks the actual reason for the change. > In this case, it would have been interesting to state that xcb and xlib > support are orthogonal, but that for xlib, xrandr is also required, as > Adam noticed in his commit log [0]. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:18:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:18:58 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/criu: disable on aarch64_be Message-ID: <20240204212555.938AC86931@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=44faf672f3005b41b18318dce25a131177462936 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x armv8a aarch64_be raises the following build failure since the addition of the package in commit 3e4b479f39c15ffdf307ec8395d856680c727204: Error (compel/arch/aarch64/src/lib/handle-elf-host.c:30): Unsupported Elf format detected Fixes: - http://autobuild.buildroot.org/results/8eaa881a926d138a0bfd3f1076246088994e883f - http://autobuild.buildroot.org/results/8de9b4d6b26e06f6b4457a31366bdc0d8a8c34ae Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 3825cc8a38d8cb5cf1d27557b890db099e81b39c) Signed-off-by: Peter Korsgaard --- package/criu/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/criu/Config.in b/package/criu/Config.in index 4c295acf4f..a5adc0cedd 100644 --- a/package/criu/Config.in +++ b/package/criu/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CRIU_ARCH_SUPPORTS default y if BR2_ARM_CPU_ARMV6 default y if BR2_ARM_CPU_ARMV7A default y if BR2_ARM_CPU_ARMV7M - default y if BR2_ARM_CPU_ARMV8A + default y if BR2_ARM_CPU_ARMV8A && !BR2_aarch64_be default y if BR2_aarch64 default y if BR2_x86_64 default y if BR2_powerpc64le # Only support powerpc64 with LE From peter at korsgaard.com Sun Feb 4 21:23:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:23:19 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/opencv4-contrib: fix INSTALL_TARGET value Message-ID: <20240204212555.9C27086932@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93a4ad81741b3b2ce2ae31fa5120ca83510cfcb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The variable should be a YES/NO value, FALSE is not a valid value. E.g. the yesno-to-bool cmd does not translate a FALSE value and therefore returns invalid JSON. Signed-off-by: Maximilian Senftleben Signed-off-by: Yann E. MORIN (cherry picked from commit 9fa01e309781faec1395507405a128deb8f55c56) Signed-off-by: Peter Korsgaard --- package/opencv4-contrib/opencv4-contrib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk index 52d2682b26..f8c8cfd94c 100644 --- a/package/opencv4-contrib/opencv4-contrib.mk +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -6,7 +6,7 @@ OPENCV4_CONTRIB_VERSION = 4.8.1 OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) -OPENCV4_CONTRIB_INSTALL_TARGET = FALSE +OPENCV4_CONTRIB_INSTALL_TARGET = NO OPENCV4_CONTRIB_LICENSE = Apache-2.0 OPENCV4_CONTRIB_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 4 21:24:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:24:32 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/vulkan-loader: fix x11 handling Message-ID: <20240204212555.A5FF686934@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eefe041de30eacce5c0b6e0dcf977b4594819d19 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix the following build failure raised since the addition of the package in commit 6aa1bc31678ff9f8013084fda34b9f941cc63fc3: In file included from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.h:24, from /home/buildroot/autobuild/run/instance-3/output-1/build/vulkan-loader-1.3.262/loader/extension_manual.c:23: /home/buildroot/autobuild/run/instance-3/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/vulkan/vulkan.h:71:10: fatal error: X11/extensions/Xrandr.h: No such file or directory 71 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/55ddfd44393e3bcc2f25bad2f9ecb7e1b142a985 Signed-off-by: Fabrice Fontaine Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit 3b8b1125adcdb3563a8392e802f0fb5266142e93) Signed-off-by: Peter Korsgaard --- package/vulkan-loader/vulkan-loader.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk index f6dd9d0ac3..b1545a4972 100644 --- a/package/vulkan-loader/vulkan-loader.mk +++ b/package/vulkan-loader/vulkan-loader.mk @@ -26,13 +26,16 @@ endif ifeq ($(BR2_PACKAGE_LIBXCB),y) VULKAN_LOADER_DEPENDENCIES += libxcb -VULKAN_LOADER_CONF_OPTS += \ - -DBUILD_WSI_XCB_SUPPORT=ON \ - -DBUILD_WSI_XLIB_SUPPORT=ON +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON else -VULKAN_LOADER_CONF_OPTS += \ - -DBUILD_WSI_XCB_SUPPORT=OFF \ - -DBUILD_WSI_XLIB_SUPPORT=OFF +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=OFF +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) +VULKAN_LOADER_DEPENDENCIES += xlib_libX11 xlib_libXrandr +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XLIB_SUPPORT=ON +else +VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XLIB_SUPPORT=OFF endif ifeq ($(BR2_PACKAGE_WAYLAND),y) From peter at korsgaard.com Sun Feb 4 21:23:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:23:35 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/opencv4-contrib: fix INSTALL_TARGET value Message-ID: <20240204212703.9BDC18693A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=892d471112cc8eef69fcd62653fbe51c775ee390 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The variable should be a YES/NO value, FALSE is not a valid value. E.g. the yesno-to-bool cmd does not translate a FALSE value and therefore returns invalid JSON. Signed-off-by: Maximilian Senftleben Signed-off-by: Yann E. MORIN (cherry picked from commit 9fa01e309781faec1395507405a128deb8f55c56) Signed-off-by: Peter Korsgaard --- package/opencv4-contrib/opencv4-contrib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk index 52d2682b26..f8c8cfd94c 100644 --- a/package/opencv4-contrib/opencv4-contrib.mk +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -6,7 +6,7 @@ OPENCV4_CONTRIB_VERSION = 4.8.1 OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) -OPENCV4_CONTRIB_INSTALL_TARGET = FALSE +OPENCV4_CONTRIB_INSTALL_TARGET = NO OPENCV4_CONTRIB_LICENSE = Apache-2.0 OPENCV4_CONTRIB_LICENSE_FILES = LICENSE From peter at korsgaard.com Sun Feb 4 21:32:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:32:29 +0100 Subject: [Buildroot] [PATCH 1/3] package/flutter-pi: remove libgles requirement for gstreamer audio plugin In-Reply-To: <20240123190035.904936-2-adam.duskett@amarulasolutions.com> (Adam Duskett's message of "Tue, 23 Jan 2024 12:00:33 -0700") References: <20240123190035.904936-1-adam.duskett@amarulasolutions.com> <20240123190035.904936-2-adam.duskett@amarulasolutions.com> Message-ID: <875xz3x6du.fsf@48ers.dk> >>>>> "Adam" == Adam Duskett writes: > package/flutter-pi: remove libgles requirement for gstreamer audio plugin > I erroneously added the dependency BR2_PACKAGE_HAS_LIBGLES for the gstreamer > audio player plugin, and the CMakeLists.txt file does not check for gles2 when > the plugin is selected. This error was likely due to a copy/paste mistake. > Remove the requirement. > Signed-off-by: Adam Duskett Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:32:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:32:39 +0100 Subject: [Buildroot] [PATCH 2/3] package/flutter-pi: Fix help text for gstreamer audio player In-Reply-To: <20240123190035.904936-3-adam.duskett@amarulasolutions.com> (Adam Duskett's message of "Tue, 23 Jan 2024 12:00:34 -0700") References: <20240123190035.904936-1-adam.duskett@amarulasolutions.com> <20240123190035.904936-3-adam.duskett@amarulasolutions.com> Message-ID: <871q9rx6dk.fsf@48ers.dk> >>>>> "Adam" == Adam Duskett writes: > The help text is currently copy and pasted from the gstreamer video > player plugin help text. Change it to reflect the text from the > CMakeLists.txt file. > Signed-off-by: Adam Duskett Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Sun Feb 4 21:35:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:35:06 +0100 Subject: [Buildroot] [git commit] package/axel: fix openssl build Message-ID: <20240204213721.E67AD86940@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d26991f76b0f6b57282c71a045e5f5fecb8f0374 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace --with-ssl by --with-ssl=openssl to avoid the following build failure raised since bump to version 2.17.12 in commit 50ba0b0a40187b695740a2fce2d2f3ed7cbf58c5 and https://github.com/axel-download-accelerator/axel/commit/21ccacd0c3bb415c550d590cd64aaa9bf08997a8: configure: error: Invalid argument: --with-ssl=yes While at it, also add wolfssl support available since https://github.com/axel-download-accelerator/axel/commit/0759374239acaeac4105f4851cfabc28433f3bcd Fixes: - http://autobuild.buildroot.org/results/a8c00442bc296353c75e393896abe9883b093a57 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/axel/axel.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/axel/axel.mk b/package/axel/axel.mk index b3896e86e3..d3a2f4d42c 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -19,8 +19,11 @@ AXEL_CONF_OPTS = \ CFLAGS="$(TARGET_CFLAGS)" ifeq ($(BR2_PACKAGE_OPENSSL),y) -AXEL_CONF_OPTS += --with-ssl +AXEL_CONF_OPTS += --with-ssl=openssl AXEL_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) +AXEL_CONF_OPTS += --with-ssl=wolfssl +AXEL_DEPENDENCIES += wolfssl else AXEL_CONF_OPTS += --without-ssl endif From yann.morin.1998 at free.fr Sun Feb 4 21:37:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 4 Feb 2024 22:37:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/axel: fix openssl build In-Reply-To: <20240130222138.136539-1-fontaine.fabrice@gmail.com> References: <20240130222138.136539-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-01-30 23:21 +0100, Fabrice Fontaine spake thusly: > Replace --with-ssl by --with-ssl=openssl to avoid the following build > failure raised since bump to version 2.17.12 in commit > 50ba0b0a40187b695740a2fce2d2f3ed7cbf58c5 and > https://github.com/axel-download-accelerator/axel/commit/21ccacd0c3bb415c550d590cd64aaa9bf08997a8: > > configure: error: Invalid argument: --with-ssl=yes > > While at it, also add wolfssl support available since > https://github.com/axel-download-accelerator/axel/commit/0759374239acaeac4105f4851cfabc28433f3bcd > > Fixes: > - http://autobuild.buildroot.org/results/a8c00442bc296353c75e393896abe9883b093a57 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/axel/axel.mk | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/axel/axel.mk b/package/axel/axel.mk > index b3896e86e3..d3a2f4d42c 100644 > --- a/package/axel/axel.mk > +++ b/package/axel/axel.mk > @@ -19,8 +19,11 @@ AXEL_CONF_OPTS = \ > CFLAGS="$(TARGET_CFLAGS)" > > ifeq ($(BR2_PACKAGE_OPENSSL),y) > -AXEL_CONF_OPTS += --with-ssl > +AXEL_CONF_OPTS += --with-ssl=openssl > AXEL_DEPENDENCIES += openssl > +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) > +AXEL_CONF_OPTS += --with-ssl=wolfssl > +AXEL_DEPENDENCIES += wolfssl > else > AXEL_CONF_OPTS += --without-ssl > endif > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Sun Feb 4 21:40:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 22:40:54 +0100 Subject: [Buildroot] [PATCH] package/uuu: fix build failure with host gcc 13.x In-Reply-To: (Yann E. MORIN's message of "Tue, 23 Jan 2024 22:28:03 +0100") References: <20240122223037.889955-1-giulio.benetti@benettiengineering.com> Message-ID: <87wmrjvrfd.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Giulio, All, > On 2024-01-22 23:30 +0100, Giulio Benetti spake thusly: >> From: Giulio Benetti >> >> With gcc version >= 13.x stdint.h must be explicitly included according to >> [0] so add local patch to explicitly include stdint.h. > When I read "local patch", it is not immediately obvious that this is a > backport, or that the patch has been upstreamd, and I am wary of such > situations. > But here, this is an actual backport, so a better phrasing would have > been "so backport a commit that...", which I have done when applying. >> [0]: https://gcc.gnu.org/gcc-13/porting_to.html >> >> Fixes: >> still not happened >> >> Signed-off-by: Giulio Benetti >> Signed-off-by: Giulio Benetti > Applied to master, thanks. Committed to 2023.02.x (where it does apply), thanks. -- Bye, Peter Korsgaard From ju.o at free.fr Sun Feb 4 22:19:15 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 4 Feb 2024 23:19:15 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: new jq runtime test Message-ID: <20240204221915.460639-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + support/testing/tests/package/test_jq.py | 62 +++++++++++++++++++ .../test_jq/rootfs-overlay/root/broken.json | 1 + .../test_jq/rootfs-overlay/root/ex13-1.json | 14 +++++ .../test_jq/rootfs-overlay/root/ex13-2.json | 22 +++++++ .../test_jq/rootfs-overlay/root/ex13-3.json | 1 + .../test_jq/rootfs-overlay/root/ex13-4.json | 1 + .../test_jq/rootfs-overlay/root/ex13-5.json | 1 + 8 files changed, 104 insertions(+) create mode 100644 support/testing/tests/package/test_jq.py create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json create mode 100644 support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json diff --git a/DEVELOPERS b/DEVELOPERS index 02b7516a92..91d2c6d869 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1778,6 +1778,8 @@ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_jq.py +F: support/testing/tests/package/test_jq/ F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_kmscube.py diff --git a/support/testing/tests/package/test_jq.py b/support/testing/tests/package/test_jq.py new file mode 100644 index 0000000000..67420abb6b --- /dev/null +++ b/support/testing/tests/package/test_jq.py @@ -0,0 +1,62 @@ +import json +import os + +import infra.basetest + + +class TestJq(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_jq/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_JQ=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("jq --version") + + # Run jq on examples extracted from JSON RFC: + # https://www.rfc-editor.org/rfc/rfc8259.txt + for i in range(1, 6): + fname = f"ex13-{i}.json" + cmd = f"jq -M '.' {fname}" + self.assertRunOk(cmd) + + # Check the execution fails on a non JSON file. + cmd = "jq -M '.' broken.json" + _, ret = self.emulator.run(cmd) + self.assertNotEqual(ret, 0) + + # Check an execution of a simple query. Note that output is a + # JSON (quoted) string. + cmd = "jq -M '.[1].City' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], '"SUNNYVALE"') + + # Run the same query with the -r option, to output raw text + # (i.e. strings without quotes). + cmd = "jq -r -M '.[1].City' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], "SUNNYVALE") + + # Print the ex13-2.json file as compact JSON (with option -c). + cmd = "jq -c -M '.' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + # We reload this compact string using the Python json parser, + # to test interoperability. We check the same element as in + # previous queries in the Python object. + json_data = json.loads(out[0]) + self.assertEqual(json_data[1]["City"], "SUNNYVALE") diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json new file mode 100644 index 0000000000..fc2bf94565 --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json @@ -0,0 +1 @@ +[ This is is NOT a JSON file! } diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json new file mode 100644 index 0000000000..52b7b6493f --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json @@ -0,0 +1,14 @@ +{ + "Image": { + "Width": 800, + "Height": 600, + "Title": "View from 15th Floor", + "Thumbnail": { + "Url": "http://www.example.com/image/481989943", + "Height": 125, + "Width": 100 + }, + "Animated" : false, + "IDs": [116, 943, 234, 38793] + } +} diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json new file mode 100644 index 0000000000..b4545b28c8 --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json @@ -0,0 +1,22 @@ +[ + { + "precision": "zip", + "Latitude": 37.7668, + "Longitude": -122.3959, + "Address": "", + "City": "SAN FRANCISCO", + "State": "CA", + "Zip": "94107", + "Country": "US" + }, + { + "precision": "zip", + "Latitude": 37.371991, + "Longitude": -122.026020, + "Address": "", + "City": "SUNNYVALE", + "State": "CA", + "Zip": "94085", + "Country": "US" + } +] diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json new file mode 100644 index 0000000000..6ccebb9abe --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json @@ -0,0 +1 @@ +"Hello world!" diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json @@ -0,0 +1 @@ +42 diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json new file mode 100644 index 0000000000..27ba77ddaf --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json @@ -0,0 +1 @@ +true -- 2.43.0 From peter at korsgaard.com Sun Feb 4 22:33:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 04 Feb 2024 23:33:09 +0100 Subject: [Buildroot] [git commit] package/gnutls: security bump to 3.8.3 In-Reply-To: <20240125212237.46E4C864CC@busybox.osuosl.org> (Peter Korsgaard's message of "Thu, 25 Jan 2024 22:13:07 +0100") References: <20240125212237.46E4C864CC@busybox.osuosl.org> Message-ID: <87sf27vp0a.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > commit: > https://git.buildroot.net/buildroot/commit/?id=b136bed2fd703548610e2ac3e0d54b33128db716 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > see CVE-2024-0553: Fix more timing side-channel inside RSA-PSK key exchange > see CVE-2024-0567: Fix assertion failure when verifying a certificate > chain with a cycle of cross signatures > Signed-off-by: Francois Perrad > Signed-off-by: Peter Korsgaard Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 4 21:51:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:51:52 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gnutls: bump version to 3.8.1 Message-ID: <20240204223330.B0CD68695C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4fc43a34d4159a788c9f693dd5293e56c4e66ce7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 05f4c2fd102c0ca0a4e5947ce55e0a09660b6282) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 2f6dba9d3c..a6ba6b22c6 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz.sig -sha256 0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 gnutls-3.8.0.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.1.tar.xz.sig +sha256 ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c gnutls-3.8.1.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index d6b8b229bd..d9b9831fd6 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).0 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).1 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Sun Feb 4 21:52:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:52:09 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gnutls: security bump to 3.8.3 Message-ID: <20240204223330.D86C586935@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=95cbe9cc60c460291fbe6a3a680816c75bb6f35f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x see CVE-2024-0553: Fix more timing side-channel inside RSA-PSK key exchange see CVE-2024-0567: Fix assertion failure when verifying a certificate chain with a cycle of cross signatures Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit b136bed2fd703548610e2ac3e0d54b33128db716) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 6ad363f01d..47fb34ea7c 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.2.tar.xz.sig -sha256 e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 gnutls-3.8.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.3.tar.xz.sig +sha256 f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e gnutls-3.8.3.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 3e9987cdce..8a4f3345aa 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Sun Feb 4 21:35:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:35:35 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/uuu: fix build failure with host gcc 13.x Message-ID: <20240204223330.8E9D18695A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c423dd4a45b4a9d2b4d8c9a186fcdb1961ddf5cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x With gcc version >= 13.x stdint.h must be explicitly included according to [0] so backport a commit to explicitly include stdint.h. [0]: https://gcc.gnu.org/gcc-13/porting_to.html Fixes: still not happened Signed-off-by: Giulio Benetti Signed-off-by: Giulio Benetti Reviewed-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit 04dfeff6242516a1061973fc7af2cc9c5e3dd4e2) Signed-off-by: Peter Korsgaard --- package/uuu/0001-Fix-missing-references.patch | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/package/uuu/0001-Fix-missing-references.patch b/package/uuu/0001-Fix-missing-references.patch new file mode 100644 index 0000000000..140c9755c7 --- /dev/null +++ b/package/uuu/0001-Fix-missing-references.patch @@ -0,0 +1,40 @@ +From 24fd043225903247f71ac10666d820277c0b10b1 Mon Sep 17 00:00:00 2001 +From: nixgnauhcuy +Date: Tue, 9 May 2023 14:32:33 +0800 +Subject: [PATCH] Fix missing references + +Upstream: https://github.com/nxp-imx/mfgtools/commit/24fd043225903247f71ac10666d820277c0b10b1 + +Signed-off-by: Giulio Benetti +--- + libuuu/libcomm.h | 1 + + uuu/buildincmd.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libuuu/libcomm.h b/libuuu/libcomm.h +index 0afdfa3..38d622d 100644 +--- a/libuuu/libcomm.h ++++ b/libuuu/libcomm.h +@@ -28,6 +28,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + * + */ ++#include + #include + #include + #include +diff --git a/uuu/buildincmd.h b/uuu/buildincmd.h +index 9415117..46286cc 100644 +--- a/uuu/buildincmd.h ++++ b/uuu/buildincmd.h +@@ -31,6 +31,7 @@ + + #pragma once + ++#include + #include + #include + #include +-- +2.34.1 + From peter at korsgaard.com Sun Feb 4 21:51:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:51:45 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gnutls: bump version to 3.8.0 Message-ID: <20240204223330.A15C78695B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79dc02abeeae25fcfd8d85c612bb51261e845277 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Updated license hashes due to upstream commit: "Sync GPL/LGPL license files from Gnulib" https://github.com/gnutls/gnutls/commit/a39e528897184c6f6a33d245b82891a8dc8090ce Removed configure options related to guile which were removed upstream: https://github.com/gnutls/gnutls/commit/100cc2a706b8e097cbeb63d08c7ea59717c906ca Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 4528d5093c9a0002be6787024a342979666ce9af) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 8 ++++---- package/gnutls/gnutls.mk | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 303f1351e0..2f6dba9d3c 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.8.tar.xz.sig -sha256 c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114 gnutls-3.7.8.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.0.tar.xz.sig +sha256 0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 gnutls-3.8.0.tar.xz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 6e2cc501ef..d6b8b229bd 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -5,8 +5,8 @@ ################################################################################ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS -GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 +GNUTLS_VERSION_MAJOR = 3.8 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).0 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) @@ -16,7 +16,6 @@ GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 libunistring nettle GNUTLS_CPE_ID_VENDOR = gnu GNUTLS_CONF_OPTS = \ --disable-doc \ - --disable-guile \ --disable-libdane \ --disable-rpath \ --disable-tests \ @@ -44,7 +43,6 @@ GNUTLS_INSTALL_STAGING = YES HOST_GNUTLS_DEPENDENCIES = host-pkgconf host-libtasn1 host-libunistring host-nettle HOST_GNUTLS_CONF_OPTS = \ --disable-doc \ - --disable-guile \ --disable-libdane \ --disable-rpath \ --disable-tests \ From peter at korsgaard.com Sun Feb 4 21:52:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:52:01 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gnutls: bump version to 3.8.2 Message-ID: <20240204223330.C60368695A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3ab50b7e5914a6d9825b461aeb04201aa85d18fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit a91ad89fe3e4a28ca5ae2ce6e9bada243aa55456) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index a6ba6b22c6..6ad363f01d 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.1.tar.xz.sig -sha256 ba8b9e15ae20aba88f44661978f5b5863494316fe7e722ede9d069fe6294829c gnutls-3.8.1.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.2.tar.xz.sig +sha256 e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 gnutls-3.8.2.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index d9b9831fd6..3e9987cdce 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).1 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Sun Feb 4 21:32:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:32:00 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-pi: Fix help text for gstreamer audio player Message-ID: <20240204223444.2BDE68696E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84d9bf5b1863fe5fbd0f9303fe12fed46185fed6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The help text is currently copy and pasted from the gstreamer video player plugin help text. Change it to reflect the text from the CMakeLists.txt file. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit 7437cad0183fbdc0c419547a0cf2cbe006e23814) Signed-off-by: Peter Korsgaard --- package/flutter-pi/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/flutter-pi/Config.in b/package/flutter-pi/Config.in index 72db3f400f..26ce75fa30 100644 --- a/package/flutter-pi/Config.in +++ b/package/flutter-pi/Config.in @@ -32,9 +32,8 @@ config BR2_PACKAGE_FLUTTER_PI_GSTREAMER_AUDIO_PLAYER_PLUGIN select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME help - Include the gstreamer based video plugins in the finished - binary. Allows for more stable, hardware accelerated - video playback in flutter using gstreamer. + Include the gstreamer based audio plugins in the finished + binary. config BR2_PACKAGE_FLUTTER_PI_GSTREAMER_VIDEO_PLAYER_PLUGIN bool "gstreamer video player" From peter at korsgaard.com Sun Feb 4 21:41:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:41:52 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gnutls: security bump to 3.8.3 Message-ID: <20240204223444.352CA8696F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=278aa1eb4265992d1134152928ec1658a7c46544 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x see CVE-2024-0553: Fix more timing side-channel inside RSA-PSK key exchange see CVE-2024-0567: Fix assertion failure when verifying a certificate chain with a cycle of cross signatures Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit b136bed2fd703548610e2ac3e0d54b33128db716) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 6ad363f01d..47fb34ea7c 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.2.tar.xz.sig -sha256 e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 gnutls-3.8.2.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.3.tar.xz.sig +sha256 f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e gnutls-3.8.3.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 3e9987cdce..8a4f3345aa 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).2 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From peter at korsgaard.com Sun Feb 4 21:31:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 4 Feb 2024 22:31:45 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flutter-pi: remove libgles requirement for gstreamer audio plugin Message-ID: <20240204223444.1FAA78696D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6a23af23dff20d858af4e8bc27588127b80e302a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 99a50a8c9804 (package/flutter-pi: new package) erroneously made the gstreamer-based audio plugin depend on GLES, although there is no such requirement defined in the CMakeLists. This error was likely due to a copy/paste mistake. Remove the requirement. Signed-off-by: Adam Duskett [yann.morin.1998 at free.fr: reword commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 07c1329814baea1057355525394d51c290acc4c3) Signed-off-by: Peter Korsgaard --- package/flutter-pi/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/flutter-pi/Config.in b/package/flutter-pi/Config.in index ecebfad89b..72db3f400f 100644 --- a/package/flutter-pi/Config.in +++ b/package/flutter-pi/Config.in @@ -25,7 +25,6 @@ comment "plugins" config BR2_PACKAGE_FLUTTER_PI_GSTREAMER_AUDIO_PLAYER_PLUGIN bool "gstreamer audio player" - depends on BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA From petr.vorel at gmail.com Mon Feb 5 00:03:37 2024 From: petr.vorel at gmail.com (Petr Vorel) Date: Mon, 5 Feb 2024 01:03:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/nfs-utils: drop NFS_UTILS_AUTORECONF In-Reply-To: <20240204102056.1409453-1-fontaine.fabrice@gmail.com> References: <20240204102056.1409453-1-fontaine.fabrice@gmail.com> Message-ID: <20240205000337.GA166229@pevik> > Commit 63332c33aa0771532807fd2684d4eee4eb952435 wrongly set > NFS_UTILS_AUTORECONF Hi Fabrice, thanks! (too late to review - merged). Kind regards, Petr From jubalh at iodoru.org Mon Feb 5 06:53:35 2024 From: jubalh at iodoru.org (Michael Vetter) Date: Mon, 5 Feb 2024 07:53:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.13.0 Message-ID: <20240205065335.22493-1-jubalh@iodoru.org> Signed-off-by: Michael Vetter --- package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index a6a529eb6c..e284e8cca6 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d82e9e8585b8fc68fb91791377fbfb0051b98259a0ec64cf31c8a09bb7e2621e libstrophe-0.12.3.tar.xz +sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index ad0860ad30..257593bbec 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.12.3 +LIBSTROPHE_VERSION = 0.13.0 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf -- 2.35.3 From thomas.petazzoni at bootlin.com Mon Feb 5 06:48:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 05 Feb 2024 06:48:49 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-04 Message-ID: <20240205064857.3C30560D7B@smtp3.osuosl.org> Hello, Autobuild statistics for 2024-02-04 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 2 | 2 | 0 | 4 | 2023.11.x | 0 | 2 | 0 | 2 | master | 48 | 51 | 0 | 99 | Classification of failures by reason for master ----------------------------------------------- axel-2.17.12 | 7 host-sentry-cli-2.20.3 | 3 libressl-3.8.2 | 3 linux-6.6.15 | 3 sudo-1.9.15p5 | 3 attr-2.5.2 | 2 dc3dd-7.2.641 | 2 elfutils-0.189 | 2 libopenssl-3.2.0 | 2 libselinux-3.5 | 2 unknown | 2 bat-0.24.0 | 1 botan-3.2.0 | 1 brltty-6.6 | 1 cegui-00b4e1fe174da53b7ed72... | 1 check-11970a7e112dfe243a2e6... | 1 dmraid-1.0.0.rc16-3 | 1 dvdauthor-0.7.2 | 1 glibc-2.38-44-gd37c2b20a478... | 1 gobject-introspection-1.76.1 | 1 host-rust-1.74.1 | 1 htop-3.3.0 | 1 ipmitool-1_8_19 | 1 libzenoh-pico-0.10.1-rc | 1 ngrep-1.47 | 1 proj-9.3.0 | 1 python-numpy-1.25.0 | 1 python-rpds-py-0.12.0 | 1 strongswan-5.9.13 | 1 stunnel-5.71 | 1 volk-3.0.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/e4913b74465f4af9329d47a17698f1af8a691b15 | microblaze | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/901c0ef0c7497a83c169b080fe371c27e945f99c | sparc64 | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/78793c01d540b6401db19cb69d9fd6e9c41598fa | sh4aeb | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/dca4a16e2ac78548e8cfb9b810b7c55eacd72be4 | powerpc64le | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/0ede68b4552556fb0be3bd0d7b75c49539ccaeac | microblazeel | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/95d3229021caef736468785ab1baa8fc52df4b62 | mips | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/368d7756a91a867bc02f53b027f1082f96f22ac9 | sparc64 | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/5306d879299cbeb01aa545a62547ac215a7e4213 | or1k | axel-2.17.12 | NOK | http://autobuild.buildroot.net/results/7168028ff383583e54884082ae2a870ecd077886 | armeb | bat-0.24.0 | NOK | http://autobuild.buildroot.net/results/0c377de66fa3de86ddcffdfd6a3191cef621a13a | sh4eb | botan-3.2.0 | NOK | http://autobuild.buildroot.net/results/3b3a1503a370e470910587dd8f3600228b146584 | ORPH microblazeel | brltty-6.6 | NOK | http://autobuild.buildroot.net/results/fa1a04790b8e9190b50eb6497a526b97c67c32d8 | nios2 | cegui-00b4e1fe174da53b7ed72... | NOK | http://autobuild.buildroot.net/results/d14a1dd87cf72ba0652264b65cb60bf3e569510f | arceb | check-11970a7e112dfe243a2e6... | NOK | http://autobuild.buildroot.net/results/9eef526088b1caae92b99f97fdd318dff7d89e5d | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/6261af2bb60de4bb36795e481e28250573727012 | ORPH or1k | dc3dd-7.2.641 | NOK | http://autobuild.buildroot.net/results/186dd70d61c71e524d6f3c7d9302d3637b36448c | ORPH mips64el | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/573a1171bcec2e11f28592dd1a6805aec287b8c3 | ORPH or1k | dvdauthor-0.7.2 | NOK | http://autobuild.buildroot.net/results/ed5ab6dc804414d8bdfc63da70ce56dee10bf6a1 | microblazeel | elfutils-0.189 | NOK | http://autobuild.buildroot.net/results/e47d32863976576abe21b25d4ffa8459aef15613 | ORPH sh4 | elfutils-0.189 | NOK | http://autobuild.buildroot.net/results/fbfe131673ed78999a07dbc879436e0ef6a8a1c0 | ORPH powerpc64le | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/e869ac8bf8f8c9779688318fbc18915380fb69d7 | i686 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/c94ac8bd95429eae7c71b6dddbc7cf2c88748fcb | ORPH armeb | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/85a50ff377f952987abadf3dd43ce2b1bcdcb16e | i686 | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/fdbd0910e4227deafd273e40475b80f3151eac06 | x86_64 | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/6f908a52ce468e50cf12320ac38c783b775f566c | x86_64 | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/2988e5fc91fc0c4863fe27c099cce9ddc4f863ec | mipsel | htop-3.3.0 | NOK | http://autobuild.buildroot.net/results/04bd5633750ff5cef048ea78c9de043d3ffcfa32 | ORPH aarch64_be | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/694c8fbc3cc92031c1e9b04c85672e51b46ad6c6 | s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/1ca1f88441122eb68462e3f21bb2df4dc2c9d47e | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/d23fcf436c67828cdfde00deaaec3ef5607562dd | ORPH sh4 | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/97dd0ea04087caf649ad0c9b78889dfe589b343e | ORPH arceb | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/f992037ebce5219b2890c936f6ce83c3bb2fe87e | ORPH arc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/e3a137cf81fac2884e0ea4db813846370cdbd451 | ORPH microblazeel | libselinux-3.5 | NOK | http://autobuild.buildroot.net/results/55dd7fdd8539444c0feb5f63f072a92f658d04ad | m68k | libselinux-3.5 | NOK | http://autobuild.buildroot.net/results/7bcc8379e4c1eed9140756147e9ccf3e8393b8d9 | or1k | libzenoh-pico-0.10.1-rc | NOK | http://autobuild.buildroot.net/results/f6628dd3ea15ed27d97880a5b0d58d521d445d50 | arm | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/4122870d414370488bd5462d46ee532d57ffbcb6 | ORPH sparc | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/3e1c64e106d1a220fc5896e0f5d97de7803734be | ORPH aarch64_be | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/22c1aefb0dc00764f12ac5faa6b47c9abbc619e9 | ORPH s390x | ngrep-1.47 | NOK | http://autobuild.buildroot.net/results/c63c89a13712b53b8ef4ed8de7fd1f09820a6ac9 | aarch64_be | proj-9.3.0 | NOK | http://autobuild.buildroot.net/results/2caed684e6ac39f6dee759c6e30964c1534dc8a5 | sh4 | python-numpy-1.25.0 | NOK | http://autobuild.buildroot.net/results/af87fe8708fc259b0c6c93f76764ab3ac3a4c32a | powerpc | python-rpds-py-0.12.0 | NOK | http://autobuild.buildroot.net/results/fe214f18e13a8b423424153247922501572d4846 | riscv32 | strongswan-5.9.13 | NOK | http://autobuild.buildroot.net/results/423b498a87dfa60fff52ce3a9a79d84ac5340009 | mips | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/cdbf43b5e315839c4e90e00bfe5a8ca05c6f1f57 | m68k | sudo-1.9.15p5 | NOK | http://autobuild.buildroot.net/results/2995184777debf8a3e2001bc49e4ac312cc252b2 | ORPH microblazeel | sudo-1.9.15p5 | NOK | http://autobuild.buildroot.net/results/51842c12f3dacf7342d4ada6745042524c88531f | ORPH armeb | sudo-1.9.15p5 | NOK | http://autobuild.buildroot.net/results/7a3f4e279bc7defc44561f1a36416f50378663cc | ORPH aarch64 | unknown | NOK | http://autobuild.buildroot.net/results/241a60f8ecb6fec5dc122d64dd438dd4249f8c3e | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/29b15a88020c41a2c0555b6e4550cfe531821400 | powerpc | volk-3.0.0 | NOK | http://autobuild.buildroot.net/results/92aa8324545dec018d7ca1df3380f32e5706e318 | Classification of failures by reason for 2023.02.x -------------------------------------------------- proj-8.1.1 | 1 unknown | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- arceb | proj-8.1.1 | NOK | http://autobuild.buildroot.net/results/8fd46fcc197353abfd7e624131855a4e169fbfc6 | powerpc | unknown | NOK | http://autobuild.buildroot.net/results/993e87ad54195899b2707fedfdf872190ecd37b8 | Classification of failures by reason for 2023.11.x -------------------------------------------------- dmraid-1.0.0.rc16-3 | 1 linux-6.6.11 | 1 Detail of failures for 2023.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- aarch64_be | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/54d0a6c15850938a1df57cb077953c7f42a787ac | ORPH powerpc | linux-6.6.11 | NOK | http://autobuild.buildroot.net/results/a89ada3b69652a311fb389bf2e388170ee4ef72f | ORPH Packages having a newer version =============================== name | found by | link to release-monitoring.org | version | upstream | orph? -------------------------------+----------+----------------------------------------------+--------------+--------------+------- ace | DISTRO | https://release-monitoring.org/project/242395 | 7.1.1 | 7.1.3 | ORPH acl | DISTRO | https://release-monitoring.org/project/00016 | 2.3.1 | 2.3.2 | adwaita-icon-theme | DISTRO | https://release-monitoring.org/project/13117 | 3.37.2 | 45.0 | agentpp | DISTRO | https://release-monitoring.org/project/21316 | 4.6.0 | 4.6.1 | alfred | DISTRO | https://release-monitoring.org/project/241870 | 2022.1 | 2024.0 | ORPH alsa-lib | DISTRO | https://release-monitoring.org/project/00038 | 1.2.10 | 1.2.11 | alsa-utils | DISTRO | https://release-monitoring.org/project/00037 | 1.2.10 | 1.2.11 | android-tools | GUESS | https://release-monitoring.org/project/13989 | 4.2.2+git... | 14.0.0_r21 | angularjs | DISTRO | https://release-monitoring.org/project/21321 | 1.8.2 | 1.8.3 | apitrace | DISTRO | https://release-monitoring.org/project/06170 | 10.0 | 11.1 | apparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.1.2 | 3.1.6 | apr | DISTRO | https://release-monitoring.org/project/00095 | 1.7.2 | 1.7.4 | armadillo | DISTRO | https://release-monitoring.org/project/07006 | 9.900.2 | 12.6.7 | asterisk | DISTRO | https://release-monitoring.org/project/09838 | 20.5.2 | 21.1.0 | at-spi2-core | DISTRO | https://release-monitoring.org/project/07841 | 2.50.0 | 2.51.0 | atkmm | DISTRO | https://release-monitoring.org/project/07962 | 2.36.2 | 2.36.3 | atop | DISTRO | https://release-monitoring.org/project/00135 | 2.9.0 | 2.10.0 | audit | DISTRO | https://release-monitoring.org/project/15225 | 3.1.2 | 4.0 | autoconf | DISTRO | https://release-monitoring.org/project/00141 | 2.71 | 2.72 | ORPH avocado | DISTRO | https://release-monitoring.org/project/13385 | 98.0 | 103.0 | ORPH azure-iot-sdk-c | DISTRO | https://release-monitoring.org/project/21322 | LTS_01_20... | 3033-01-05 | babeld | DISTRO | https://release-monitoring.org/project/00154 | 1.9.2 | 1.13.1 | ORPH babeltrace2 | DISTRO | https://release-monitoring.org/project/07137 | 2.0.4 | 2.0.5 | balena-engine | DISTRO | https://release-monitoring.org/project/141616 | 20.10.26 | 20.10.42 | bash | DISTRO | https://release-monitoring.org/project/00166 | 5.2.15 | 5.2.21 | ORPH batctl | DISTRO | https://release-monitoring.org/project/14740 | 2021.0 | 2024.0 | batman-adv | DISTRO | https://release-monitoring.org/project/19529 | 2023.1 | 2024.0 | bats-core | DISTRO | https://release-monitoring.org/project/10587 | 1.8.2 | 1.10.0 | bctoolbox | DISTRO | https://release-monitoring.org/project/14746 | 4.4.8 | 5.3.15 | ORPH bdwgc | DISTRO | https://release-monitoring.org/project/17108 | 8.2.4 | 8.2.6 | belle-sip | DISTRO | https://release-monitoring.org/project/14378 | 4.4.8 | 5.3.15 | belr | DISTRO | https://release-monitoring.org/project/80042 | 4.4.8 | 5.3.15 | bento4 | DISTRO | https://release-monitoring.org/project/241638 | 1.6.0-639... | 1.6.0-641 | berkeleydb | GUESS | https://release-monitoring.org/project/138386 | 5.3.28 | 18.1.8 | ORPH binutils | DISTRO | https://release-monitoring.org/project/07981 | 2.40 | 2.42 | bird | DISTRO | https://release-monitoring.org/project/00192 | 2.0.12 | 2.14 | bitcoin | DISTRO | https://release-monitoring.org/project/13618 | 0.21.2 | 26.0 | bluez5_utils | DISTRO | https://release-monitoring.org/project/10029 | 5.68 | 5.72 | bluez5_utils-headers | DISTRO | https://release-monitoring.org/project/10029 | 5.68 | 5.72 | bmap-tools | DISTRO | https://release-monitoring.org/project/77099 | 3.6 | 3.7 | bonnie | DISTRO | https://release-monitoring.org/project/00212 | 1.03e | 2.00a | ORPH boost | DISTRO | https://release-monitoring.org/project/06845 | 1.83.0 | 1.84.0 | bootstrap | DISTRO | https://release-monitoring.org/project/21578 | 4.3.1 | 5.3.2 | bpftool | DISTRO | https://release-monitoring.org/project/328454 | v7.1.0 | 7.3.0 | btrfs-progs | DISTRO | https://release-monitoring.org/project/00227 | 5.16.2 | 6.7 | ORPH c-ares | DISTRO | https://release-monitoring.org/project/05840 | 1.20.1 | 1.26.0 | ORPH c-icap | DISTRO | https://release-monitoring.org/project/21325 | 0.5.10 | 0.6.2 | ORPH c-icap-modules | DISTRO | https://release-monitoring.org/project/21326 | 0.5.5 | 0.5.7 | ORPH ca-certificates | DISTRO | https://release-monitoring.org/project/09026 | 20230311 | 20240203 | cairo | DISTRO | https://release-monitoring.org/project/00247 | 1.16.0 | 1.18.0 | cairomm | DISTRO | https://release-monitoring.org/project/07959 | 1.16.2 | 1.18.0 | cairomm1_14 | DISTRO | https://release-monitoring.org/project/369459 | 1.14.4 | 1.14.5 | cannelloni | DISTRO | https://release-monitoring.org/project/21403 | 1.0.0 | 1.1.0 | cantarell | DISTRO | https://release-monitoring.org/project/10888 | 0.0.25 | 0.303.1 | ORPH capnproto | DISTRO | https://release-monitoring.org/project/11515 | 0.10.4 | 1.0.2 | ccache | DISTRO | https://release-monitoring.org/project/00257 | 4.8.2 | 4.9 | ORPH ccid | DISTRO | https://release-monitoring.org/project/02612 | 1.5.2 | 1.5.5 | ORPH chartjs | DISTRO | https://release-monitoring.org/project/85785 | 3.9.1 | 4.4.1 | checkpolicy | DISTRO | https://release-monitoring.org/project/00276 | 3.5 | 20200710 | chrony | DISTRO | https://release-monitoring.org/project/08810 | 4.4 | 4.5 | ORPH cifs-utils | DISTRO | https://release-monitoring.org/project/00287 | 6.15 | 7.0 | circus | DISTRO | https://release-monitoring.org/project/21726 | 0.16.1 | 0.18.0 | clamav | DISTRO | https://release-monitoring.org/project/00291 | 1.0.4 | 1.2.1 | clang | DISTRO | https://release-monitoring.org/project/11811 | 15.0.3 | 17.0.6 | clinfo | DISTRO | https://release-monitoring.org/project/10503 | 3.0.21.02.21 | 3.0.23.01.25 | cloop | DISTRO | https://release-monitoring.org/project/21332 | 3.14.1.3 | 3.14.1.3+... | cmake | DISTRO | https://release-monitoring.org/project/00306 | 3.28.1 | 3.28.2 | cni-plugins | DISTRO | https://release-monitoring.org/project/96794 | 1.3.0 | 1.4.0 | collectl | DISTRO | https://release-monitoring.org/project/00330 | 4.3.2 | 4.3.8 | compiler-rt | DISTRO | https://release-monitoring.org/project/17705 | 15.0.3 | 17.0.6 | composer | DISTRO | https://release-monitoring.org/project/09710 | 2.5.8 | 2.6.6 | conmon | DISTRO | https://release-monitoring.org/project/96793 | 2.1.8 | 2.1.10 | conntrack-tools | DISTRO | https://release-monitoring.org/project/00338 | 1.4.7 | 1.4.8 | ORPH containerd | DISTRO | https://release-monitoring.org/project/16460 | 1.7.8 | 1.7.13 | coreutils | DISTRO | https://release-monitoring.org/project/00343 | 9.3 | 9.4 | ORPH cpio | DISTRO | https://release-monitoring.org/project/00353 | 2.14 | 2.15 | crudini | DISTRO | https://release-monitoring.org/project/21669 | 0.9.3 | 0.9.5 | crun | DISTRO | https://release-monitoring.org/project/96792 | 1.12 | 1.14 | cryptsetup | DISTRO | https://release-monitoring.org/project/13709 | 2.6.1 | 2.7.0 | cukinia | DISTRO | https://release-monitoring.org/project/138119 | 0.6.0 | 0.6.2 | ORPH cups-filters | DISTRO | https://release-monitoring.org/project/05541 | 1.28.17 | 2.0.0 | cutelyst | DISTRO | https://release-monitoring.org/project/21335 | 2.11.0 | 4.0.0 | dacapo | DISTRO | https://release-monitoring.org/project/20546 | 9.12-MR1-... | 2006-10-MR2 | dado | DISTRO | https://release-monitoring.org/project/58442 | 1.8.3-1 | 2.1.0-1 | daq3 | DISTRO | https://release-monitoring.org/project/212345 | 3.0.9 | 3.0.14 | dash | DISTRO | https://release-monitoring.org/project/00394 | 0.5.11.5 | 0.5.12 | ORPH datatables | DISTRO | https://release-monitoring.org/project/141588 | 1.10.20 | 1.13.4 | datatables-buttons | DISTRO | https://release-monitoring.org/project/141589 | 1.6.1 | 2.3.6 | datatables-fixedcolumns | DISTRO | https://release-monitoring.org/project/141590 | 3.3.0 | 4.2.2 | datatables-responsive | DISTRO | https://release-monitoring.org/project/141591 | 2.2.3 | 2.4.1 | dbus-broker | DISTRO | https://release-monitoring.org/project/271475 | 33 | 35 | dbus-cxx | DISTRO | https://release-monitoring.org/project/242464 | 2.4.0 | 2.5.1 | dbus-python | DISTRO | https://release-monitoring.org/project/00402 | 1.2.18 | 1.3.2 | ORPH dc3dd | DISTRO | https://release-monitoring.org/project/15086 | 7.2.641 | 7.3.1 | ORPH ddrescue | DISTRO | https://release-monitoring.org/project/00410 | 1.27 | 1.28 | ORPH debianutils | DISTRO | https://release-monitoring.org/project/21341 | 4.11 | 5.16 | ORPH delve | DISTRO | https://release-monitoring.org/project/40149 | 1.20.2 | 1.22.0 | desktop-file-utils | DISTRO | https://release-monitoring.org/project/00421 | 0.26 | 0.27 | ORPH dhcpcd | DISTRO | https://release-monitoring.org/project/11429 | 10.0.5 | 10.0.6 | dialog | DISTRO | https://release-monitoring.org/project/00431 | 1.3-20220117 | 1.3-20230209 | ORPH docker-cli | DISTRO | https://release-monitoring.org/project/21076 | 24.0.7 | 25.0.2 | docker-compose | DISTRO | https://release-monitoring.org/project/06185 | 2.23.0 | 2.24.5 | docker-engine | DISTRO | https://release-monitoring.org/project/00447 | 24.0.7 | 25.0.2 | domoticz | DISTRO | https://release-monitoring.org/project/21342 | 2024.1 | 2024.4 | dos2unix | DISTRO | https://release-monitoring.org/project/00453 | 7.5.0 | 7.5.2 | double-conversion | DISTRO | https://release-monitoring.org/project/07454 | 3.2.1 | 3.3.0 | drbd-utils | DISTRO | https://release-monitoring.org/project/00462 | 9.21.4 | 9.27.0 | dt | DISTRO | https://release-monitoring.org/project/21844 | 18.32 | 21.27 | ORPH dt-utils | DISTRO | https://release-monitoring.org/project/21419 | 2023.08.0 | 2023.11.0 | ed | DISTRO | https://release-monitoring.org/project/00659 | 1.19 | 1.20 | ORPH edk2 | DISTRO | https://release-monitoring.org/project/125953 | edk2-stab... | 202311 | efivar | DISTRO | https://release-monitoring.org/project/00664 | 38 | 39 | efl | DISTRO | https://release-monitoring.org/project/06128 | 1.26.3 | 1.27.0 | ejabberd | DISTRO | https://release-monitoring.org/project/00667 | 23.04 | 23.10 | elfutils | DISTRO | https://release-monitoring.org/project/05679 | 0.189 | 0.190 | ORPH enchant | DISTRO | https://release-monitoring.org/project/06601 | 2.3.3 | 2.6.6 | enlightenment | DISTRO | https://release-monitoring.org/project/00698 | 0.25.4 | 0.26.0 | erlang | DISTRO | https://release-monitoring.org/project/00707 | 26.0.2 | 26.2.1 | erlang-jose | DISTRO | https://release-monitoring.org/project/16913 | 1.11.5 | 1.11.6 | erlang-p1-oauth2 | DISTRO | https://release-monitoring.org/project/09302 | 0.6.11 | 0.8.0 | erlang-p1-sip | DISTRO | https://release-monitoring.org/project/10576 | 1.0.49 | 1.0.51 | erlang-p1-stun | DISTRO | https://release-monitoring.org/project/09151 | 1.2.7 | 1.2.11 | erlang-p1-tls | DISTRO | https://release-monitoring.org/project/10455 | 1.1.16 | 1.1.18 | erlang-p1-xml | DISTRO | https://release-monitoring.org/project/10464 | 1.1.49 | 1.1.51 | erlang-p1-xmpp | DISTRO | https://release-monitoring.org/project/12752 | 1.6.2 | 1.8.0 | erofs-utils | DISTRO | https://release-monitoring.org/project/63188 | 1.5 | 1.7.1 | ethtool | DISTRO | https://release-monitoring.org/project/00763 | 6.6 | 6.7 | execline | DISTRO | https://release-monitoring.org/project/05482 | 2.9.0.1 | 2.9.4.0 | exempi | DISTRO | https://release-monitoring.org/project/00767 | 2.6.3 | 2.6.5 | exiv2 | DISTRO | https://release-monitoring.org/project/00769 | 0.27.6 | 0.28.1 | eza | DISTRO | https://release-monitoring.org/project/369474 | 0.16.0 | 0.18.0 | fakeroot | DISTRO | https://release-monitoring.org/project/12048 | 1.32.1 | 1.33 | ORPH fcft | DISTRO | https://release-monitoring.org/project/143240 | 3.1.6 | 3.1.7 | fdk-aac | DISTRO | https://release-monitoring.org/project/16208 | 2.0.2 | 2.0.3 | feh | DISTRO | https://release-monitoring.org/project/00790 | 3.7.1 | 3.10.2 | fetchmail | DISTRO | https://release-monitoring.org/project/00801 | 6.4.37 | 6.4.38 | ffmpeg | DISTRO | https://release-monitoring.org/project/05405 | 4.4.4 | 6.1.1 | fio | DISTRO | https://release-monitoring.org/project/00806 | 3.34 | 3.36 | firewalld | DISTRO | https://release-monitoring.org/project/09989 | 2.0.2 | 2.1.1 | ORPH flannel | DISTRO | https://release-monitoring.org/project/07421 | 0.14.0 | 0.24.2 | flot | DISTRO | https://release-monitoring.org/project/07184 | 0.8.3 | 4.2.6 | ORPH fltk | DISTRO | https://release-monitoring.org/project/00823 | 1.3.7 | 1.3.9 | ORPH fluent-bit | DISTRO | https://release-monitoring.org/project/267335 | 2.1.7 | 2.2.2 | fmc | GUESS | https://release-monitoring.org/project/145761 | LSDK-21.08 | 0.2.0 | ORPH font-awesome | DISTRO | https://release-monitoring.org/project/00826 | 4.7.0 | 6.5.1 | ORPH fontconfig | DISTRO | https://release-monitoring.org/project/00827 | 2.14.2 | 2.15.0 | ORPH freeipmi | DISTRO | https://release-monitoring.org/project/00848 | 1.6.11 | 1.6.14 | freerdp | DISTRO | https://release-monitoring.org/project/10442 | 2.11.5 | 3.2.0 | frr | DISTRO | https://release-monitoring.org/project/18555 | 8.5.4 | 9.1 | fscryptctl | DISTRO | https://release-monitoring.org/project/270981 | 1.0.0 | 1.1.0 | fuse-overlayfs | DISTRO | https://release-monitoring.org/project/101220 | 1.11 | 1.13 | fwts | DISTRO | https://release-monitoring.org/project/17383 | 23.07.00 | 24.01.00 | fwup | DISTRO | https://release-monitoring.org/project/21438 | 1.9.1 | 1.10.1 | gcr | DISTRO | https://release-monitoring.org/project/11801 | 3.40.0 | 4.2.0 | ORPH gdal | DISTRO | https://release-monitoring.org/project/00881 | 3.8.2 | 3.8.3 | gensio | DISTRO | https://release-monitoring.org/project/67634 | 2.5.5 | 2.8.3 | gerbera | DISTRO | https://release-monitoring.org/project/18420 | 1.12.1 | 2.0.0 | ghostscript | DISTRO | https://release-monitoring.org/project/01157 | 10.02.0 | 10.02.1 | gitlab-runner | DISTRO | https://release-monitoring.org/project/11337 | 15.5.0 | 16.8.0 | glib-networking | DISTRO | https://release-monitoring.org/project/21353 | 2.76.0 | 2.78.0 | ORPH glibmm | DISTRO | https://release-monitoring.org/project/07960 | 2.76.0 | 2.78.1 | glm | DISTRO | https://release-monitoring.org/project/01181 | 0.9.9.8 | 1.0.0 | ORPH gnu-efi | DISTRO | https://release-monitoring.org/project/01202 | 3.0.15 | 3.0.17 | gnupg2 | DISTRO | https://release-monitoring.org/project/01215 | 2.4.3 | 2.4.4 | gnuplot | DISTRO | https://release-monitoring.org/project/01216 | 5.4.10 | 6.0.0 | gnuradio | DISTRO | https://release-monitoring.org/project/01217 | 3.10.7.0 | 3.10.9.2 | gobject-introspection | DISTRO | https://release-monitoring.org/project/01223 | 1.76.1 | 1.79.1 | ORPH gocryptfs | DISTRO | https://release-monitoring.org/project/21085 | 2.3.2 | 2.4.0 | gqrx | DISTRO | https://release-monitoring.org/project/09771 | 2.15.9 | 2.17.3 | gr-osmosdr | DISTRO | https://release-monitoring.org/project/21447 | 0.2.4 | 0.2.5 | granite | DISTRO | https://release-monitoring.org/project/05410 | 6.2.0 | 7.4.0 | ORPH grantlee | DISTRO | https://release-monitoring.org/project/21448 | 5.2.0 | 5.3.1 | graphicsmagick | DISTRO | https://release-monitoring.org/project/01248 | 1.3.40 | 1.3.42 | grpc | DISTRO | https://release-monitoring.org/project/19117 | 1.51.1 | 1.61.0 | gst1-imx | DISTRO | https://release-monitoring.org/project/21846 | 0.13.1 | 2.2.0 | gtksourceview | DISTRO | https://release-monitoring.org/project/07724 | 3.24.7 | 5.10.0 | gutenprint | DISTRO | https://release-monitoring.org/project/01285 | 5.2.14 | 5.3.4 | ORPH gvfs | DISTRO | https://release-monitoring.org/project/05496 | 1.48.1 | 1.53.1 | ORPH haproxy | DISTRO | https://release-monitoring.org/project/01298 | 2.6.15 | 2.9.4 | hiawatha | DISTRO | https://release-monitoring.org/project/13375 | 11.2 | 11.5 | hplip | DISTRO | https://release-monitoring.org/project/01327 | 3.17.10 | 3.23.12 | ORPH hwdata | DISTRO | https://release-monitoring.org/project/05387 | 0.373 | 0.378 | ORPH hwloc | DISTRO | https://release-monitoring.org/project/13501 | 2.9.3 | 2.10.0 | i2pd | DISTRO | https://release-monitoring.org/project/21355 | 2.43.0 | 2.50.2 | icu | DISTRO | https://release-monitoring.org/project/16134 | 73-2 | 74-2 | ORPH ifenslave | DISTRO | https://release-monitoring.org/project/21670 | 2.9 | 2.14 | ORPH imagemagick | DISTRO | https://release-monitoring.org/project/01372 | 7.1.1-21 | 7.1.1-27 | ORPH imlib2 | DISTRO | https://release-monitoring.org/project/21676 | 1.7.3 | 1.12.2 | inih | DISTRO | https://release-monitoring.org/project/11600 | 57 | 58 | ORPH inotify-tools | DISTRO | https://release-monitoring.org/project/08864 | 3.20.2.2 | 4.23.9.0 | ORPH iozone | DISTRO | https://release-monitoring.org/project/21679 | 3.493 | 3.506 | iperf3 | DISTRO | https://release-monitoring.org/project/01389 | 3.14 | 3.16 | ORPH ipset | DISTRO | https://release-monitoring.org/project/01393 | 7.16 | 7.20 | iptables | DISTRO | https://release-monitoring.org/project/01394 | 1.8.9 | 1.8.10 | ORPH iputils | DISTRO | https://release-monitoring.org/project/01395 | 20231222 | 20240117 | irssi | DISTRO | https://release-monitoring.org/project/01404 | 1.4.4 | 1.4.5 | iw | DISTRO | https://release-monitoring.org/project/01410 | 5.19 | 6.7 | ORPH iwd | DISTRO | https://release-monitoring.org/project/18380 | 2.6 | 2.13 | ORPH janus-gateway | DISTRO | https://release-monitoring.org/project/15715 | 1.1.2 | 1.2.1 | jasper | DISTRO | https://release-monitoring.org/project/01421 | 2.0.33 | 4.1.2 | jbig2dec | DISTRO | https://release-monitoring.org/project/01431 | 0.19 | 0.20 | jimtcl | DISTRO | https://release-monitoring.org/project/01459 | 0.81 | 0.82 | jo | DISTRO | https://release-monitoring.org/project/18855 | 1.6 | 1.9 | jose | DISTRO | https://release-monitoring.org/project/11761 | 11 | 12 | jpeg-turbo | DISTRO | https://release-monitoring.org/project/01648 | 2.1.5 | 3.0.2 | jquery-datetimepicker | DISTRO | https://release-monitoring.org/project/13910 | 2.4.5 | 2.5.20 | jquery-keyboard | DISTRO | https://release-monitoring.org/project/21681 | 1.18.12 | 1.30.4 | ORPH jquery-mobile | DISTRO | https://release-monitoring.org/project/59395 | 1.4.3 | 1.4.5 | ORPH jquery-ui | DISTRO | https://release-monitoring.org/project/21815 | 1.13.1 | 1.13.2 | jquery-ui-themes | DISTRO | https://release-monitoring.org/project/21816 | 1.10.4 | 1.13.2 | jquery-validation | DISTRO | https://release-monitoring.org/project/21817 | 1.19.5 | 1.20.0 | ORPH kbd | DISTRO | https://release-monitoring.org/project/01492 | 2.5.1 | 2.6.4 | ORPH kf5-extra-cmake-modules | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.114.0 | kf5-kcoreaddons | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.114.0 | kf5-modemmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.114.0 | kf5-networkmanager-qt | DISTRO | https://release-monitoring.org/project/08762 | 5.91.0 | 5.114.0 | kodi | DISTRO | https://release-monitoring.org/project/05511 | 20.3-Nexus | 20.3 | kodi-inputstream-adaptive | DISTRO | https://release-monitoring.org/project/21795 | 20.3.15-N... | 21.4.2-Omega | kodi-inputstream-ffmpegdirect | DISTRO | https://release-monitoring.org/project/177174 | 20.5.0-Nexus | 21.3.2-Omega | kodi-inputstream-rtmp | DISTRO | https://release-monitoring.org/project/21794 | 20.3.0-Nexus | 21.1.0-Omega | kodi-jsonschemabuilder | DISTRO | https://release-monitoring.org/project/05511 | 20.3-Nexus | 20.3 | kodi-peripheral-joystick | DISTRO | https://release-monitoring.org/project/21793 | 20.1.15-N... | 21.1.11-O... | kodi-peripheral-xarcade | DISTRO | https://release-monitoring.org/project/21791 | 20.1.3-Nexus | 21.0.0-Omega | kodi-pvr-argustv | DISTRO | https://release-monitoring.org/project/21788 | 20.5.0-Nexus | 21.0.0-Omega | kodi-pvr-dvblink | DISTRO | https://release-monitoring.org/project/21787 | 20.3.0-Nexus | 21.1.0-Omega | kodi-pvr-dvbviewer | DISTRO | https://release-monitoring.org/project/21786 | 20.4.0-Nexus | 21.1.0-Omega | kodi-pvr-filmon | DISTRO | https://release-monitoring.org/project/21785 | 20.3.0-Nexus | 21.0.0-Omega | kodi-pvr-hdhomerun | DISTRO | https://release-monitoring.org/project/21784 | 20.4.0-Nexus | 21.0.0-Omega | kodi-pvr-hts | DISTRO | https://release-monitoring.org/project/21783 | 20.7.0-Nexus | 21.2.0-Omega | kodi-pvr-iptvsimple | DISTRO | https://release-monitoring.org/project/21782 | 20.13.0-N... | 21.7.2-Omega | kodi-pvr-mediaportal-tvserver | DISTRO | https://release-monitoring.org/project/21781 | 20.3.0-Nexus | 21.0.0-Omega | kodi-pvr-mythtv | DISTRO | https://release-monitoring.org/project/21780 | 20.5.10-N... | 21.0.4-Omega | kodi-pvr-nextpvr | DISTRO | https://release-monitoring.org/project/21779 | 20.4.3-Nexus | 21.0.2-Omega | kodi-pvr-njoy | DISTRO | https://release-monitoring.org/project/21778 | 20.3.0-Nexus | 21.0.0-Omega | kodi-pvr-pctv | DISTRO | https://release-monitoring.org/project/21777 | 20.4.0-Nexus | 21.0.0-Omega | kodi-pvr-plutotv | DISTRO | https://release-monitoring.org/project/241527 | 20.3.1a-N... | 21.0.1-Omega | kodi-pvr-stalker | DISTRO | https://release-monitoring.org/project/21776 | 20.3.1-Nexus | 21.0.0-Omega | kodi-pvr-vbox | DISTRO | https://release-monitoring.org/project/21775 | 20.4.2-Nexus | 21.1.2-Omega | kodi-pvr-vdr-vnsi | DISTRO | https://release-monitoring.org/project/21774 | 20.4.1-Nexus | 21.1.0-Omega | kodi-pvr-vuplus | DISTRO | https://release-monitoring.org/project/21773 | 20.5.1-Nexus | 21.1.1-Omega | kodi-pvr-waipu | DISTRO | https://release-monitoring.org/project/241529 | 20.11.0-N... | 21.5.0-Omega | kodi-pvr-wmc | DISTRO | https://release-monitoring.org/project/21772 | 20.3.0-Nexus | 21.0.0-Omega | kodi-pvr-zattoo | DISTRO | https://release-monitoring.org/project/100438 | 20.3.14-N... | 21.0.1-Omega | kodi-texturepacker | DISTRO | https://release-monitoring.org/project/05511 | 20.3-Nexus | 20.3 | kvazaar | DISTRO | https://release-monitoring.org/project/12418 | 2.2.0 | 2.3.0 | kvm-unit-tests | DISTRO | https://release-monitoring.org/project/242797 | 2023-01-05 | 2024-01-08 | lapack | DISTRO | https://release-monitoring.org/project/01534 | 3.10.1 | 3.12.0 | lensfun | DISTRO | https://release-monitoring.org/project/01548 | 0.3.4 | 0.3.95 | leptonica | DISTRO | https://release-monitoring.org/project/01549 | 1.83.1 | 1.84.1 | libabseil-cpp | DISTRO | https://release-monitoring.org/project/115295 | 20230802.1 | 20240116.0 | libao | DISTRO | https://release-monitoring.org/project/07629 | 1.2.0 | 1.2.2 | ORPH libapparmor | DISTRO | https://release-monitoring.org/project/94819 | 3.1.2 | 3.1.6 | libblockdev | DISTRO | https://release-monitoring.org/project/09397 | 3.0.4 | 3.1.0 | libbpf | DISTRO | https://release-monitoring.org/project/141355 | 1.1.0 | 1.3.0 | libbsd | DISTRO | https://release-monitoring.org/project/01567 | 0.11.7 | 0.11.8 | libbytesize | DISTRO | https://release-monitoring.org/project/07869 | 2.7 | 2.10 | ORPH libcamera-apps | DISTRO | https://release-monitoring.org/project/328456 | 1.2.1 | 1.4.2 | libcgroup | DISTRO | https://release-monitoring.org/project/01575 | 2.0.3 | 3.1.0 | libcpprestsdk | DISTRO | https://release-monitoring.org/project/15531 | 2.10.18 | 2.10.19 | ORPH libcurl | DISTRO | https://release-monitoring.org/project/00381 | 8.5.0 | 8.6.0 | libdecor | DISTRO | https://release-monitoring.org/project/312806 | 0.1.1 | 0.2.2 | libdnet | DISTRO | https://release-monitoring.org/project/06308 | 1.16.4 | 1.17.0 | ORPH libedit | DISTRO | https://release-monitoring.org/project/01599 | 20221030-3.1 | 20230828-3.1 | libevdev | DISTRO | https://release-monitoring.org/project/20540 | 1.12.1 | 1.13.1 | libfastjson | DISTRO | https://release-monitoring.org/project/12043 | 0.99.9.1 | 1.2304.0 | libglade | DISTRO | https://release-monitoring.org/project/01174 | 2.6.4 | 3.40.0 | ORPH libglfw | DISTRO | https://release-monitoring.org/project/01180 | 3.3.8 | 3.3.9 | libglib2 | DISTRO | https://release-monitoring.org/project/10024 | 2.76.1 | 2.79.1 | libglvnd | DISTRO | https://release-monitoring.org/project/12098 | 1.4.0 | 1.7.0 | ORPH libgpgme | DISTRO | https://release-monitoring.org/project/01239 | 1.22.0 | 1.23.2 | ORPH libgphoto2 | DISTRO | https://release-monitoring.org/project/12558 | 2.5.27 | 2.5.31 | ORPH libgpiod | DISTRO | https://release-monitoring.org/project/20640 | 1.6.4 | 2.1 | ORPH libgsasl | DISTRO | https://release-monitoring.org/project/01563 | 1.10.0 | 2.2.1 | ORPH libgudev | DISTRO | https://release-monitoring.org/project/07735 | 237 | 238 | libiberty | DISTRO | https://release-monitoring.org/project/07981 | 2.41 | 2.42 | libical | DISTRO | https://release-monitoring.org/project/01637 | 1.0.1 | 3.0.17 | libiconv | DISTRO | https://release-monitoring.org/project/10656 | 1.15 | 1.17 | ORPH libidn | DISTRO | https://release-monitoring.org/project/01639 | 1.41 | 1.42 | libidn2 | DISTRO | https://release-monitoring.org/project/05597 | 2.3.4 | 2.3.7 | libimxvpuapi | DISTRO | https://release-monitoring.org/project/21479 | 0.10.3 | 2.3.0 | libinput | DISTRO | https://release-monitoring.org/project/05781 | 1.23.0 | 1.25.0 | libjpeg | DISTRO | https://release-monitoring.org/project/21362 | 9e | 9f | libjwt | DISTRO | https://release-monitoring.org/project/242868 | 1.15.3 | 1.16.0 | libjxl | DISTRO | https://release-monitoring.org/project/232764 | 0.9.0 | 0.9.1 | libks | DISTRO | https://release-monitoring.org/project/241898 | 2.0.2 | 2.0.3 | liblinear | DISTRO | https://release-monitoring.org/project/21363 | 2.45 | 2.47 | libmaxminddb | DISTRO | https://release-monitoring.org/project/07470 | 1.8.0 | 1.9.1 | libmbim | DISTRO | https://release-monitoring.org/project/07308 | 1.28.2 | 1.30.0 | libmdbx | DISTRO | https://release-monitoring.org/project/141559 | 0.12.8 | 0.12.9 | libmicrohttpd | DISTRO | https://release-monitoring.org/project/01658 | 0.9.77 | 1.0.0 | libmodsecurity | DISTRO | https://release-monitoring.org/project/68638 | 3.0.11 | 3.0.12 | libmspack | DISTRO | https://release-monitoring.org/project/16827 | 0.10.1alpha | 1.11 | libnetconf2 | DISTRO | https://release-monitoring.org/project/31639 | 2.1.28 | 3.0.8 | libnpupnp | DISTRO | https://release-monitoring.org/project/75209 | 4.2.2 | 6.1.0 | libolm | DISTRO | https://release-monitoring.org/project/29706 | 3.2.9 | 3.2.16 | libopenh264 | DISTRO | https://release-monitoring.org/project/21365 | 2.4.0 | 2.4.1 | libopenssl | DISTRO | https://release-monitoring.org/project/02566 | 3.2.0 | 3.2.1 | ORPH libostree | DISTRO | https://release-monitoring.org/project/10899 | 2023.8 | 2024.1 | libpciaccess | DISTRO | https://release-monitoring.org/project/01703 | 0.17 | 0.18 | libpeas | DISTRO | https://release-monitoring.org/project/06871 | 1.32.0 | 2.0.1 | ORPH libpng | DISTRO | https://release-monitoring.org/project/01705 | 1.6.40 | 1.6.42 | libpqxx | DISTRO | https://release-monitoring.org/project/21367 | 7.7.5 | 7.8.1 | libpri | DISTRO | https://release-monitoring.org/project/11042 | 1.6.0 | 1.6.1 | libqmi | DISTRO | https://release-monitoring.org/project/07307 | 1.32.2 | 1.34.0 | libqrtr-glib | DISTRO | https://release-monitoring.org/project/192056 | 1.0.0 | 1.2.2 | librsvg | DISTRO | https://release-monitoring.org/project/05420 | 2.50.9 | 2.57.90 | libsecret | DISTRO | https://release-monitoring.org/project/13150 | 0.20.5 | 0.21.3 | ORPH libselinux | DISTRO | https://release-monitoring.org/project/01717 | 3.5 | 3.6 | libsemanage | DISTRO | https://release-monitoring.org/project/01718 | 3.5 | 20200710 | libsepol | DISTRO | https://release-monitoring.org/project/01719 | 3.5 | 20200710 | libsigc | DISTRO | https://release-monitoring.org/project/07961 | 3.4.0 | 3.6.0 | libsigc2 | DISTRO | https://release-monitoring.org/project/311642 | 2.12.0 | 2.12.1 | libsodium | DISTRO | https://release-monitoring.org/project/01728 | 1.0.18 | 1.0.19 | libsolv | DISTRO | https://release-monitoring.org/project/07908 | 0.7.25 | 0.7.28 | libspdm | DISTRO | https://release-monitoring.org/project/369161 | 3.1.1 | 3.2.0 | libstrophe | DISTRO | https://release-monitoring.org/project/15633 | 0.12.3 | 0.13.0 | libtalloc | DISTRO | https://release-monitoring.org/project/01733 | 2.3.4 | 2.4.2 | libtirpc | DISTRO | https://release-monitoring.org/project/01740 | 1.3.3 | 1.3.4 | libtool | DISTRO | https://release-monitoring.org/project/01741 | 2.4.6 | 2.4.7 | ORPH libtorrent-rasterbar | DISTRO | https://release-monitoring.org/project/04166 | 1.2.15 | 2.0.9 | libucl | DISTRO | https://release-monitoring.org/project/21371 | 0.8.2 | 0.9.0 | libunwind | DISTRO | https://release-monitoring.org/project/01748 | 1.6.2 | 1.8.0 | ORPH libupnpp | DISTRO | https://release-monitoring.org/project/15849 | 0.21.0 | 0.26.2 | ORPH libusb | DISTRO | https://release-monitoring.org/project/01749 | 1.0.26 | 1.0.27 | libuv | DISTRO | https://release-monitoring.org/project/10784 | 1.46.0 | 1.47.0 | libv4l | DISTRO | https://release-monitoring.org/project/09998 | 1.24.1 | 1.26.1 | libvips | DISTRO | https://release-monitoring.org/project/05097 | 8.10.6 | 8.15.1 | libvirt | DISTRO | https://release-monitoring.org/project/13830 | 7.10.0 | 10.0.0 | libvpl | DISTRO | https://release-monitoring.org/project/242664 | 2.10.1 | 2023.4.0 | libvpx | DISTRO | https://release-monitoring.org/project/11083 | 1.13.1 | 1.14.0 | libwebsockets | DISTRO | https://release-monitoring.org/project/11181 | 4.3.2 | 4.3.3 | libxcb | DISTRO | https://release-monitoring.org/project/01767 | 1.15 | 1.16 | ORPH libxkbcommon | DISTRO | https://release-monitoring.org/project/01780 | 1.4.0 | 1.6.0 | libxml-parser-perl | DISTRO | https://release-monitoring.org/project/03531 | 2.46 | 2.47 | libxml2 | DISTRO | https://release-monitoring.org/project/01783 | 2.12.3 | 2.12.5 | libxmlpp | DISTRO | https://release-monitoring.org/project/11129 | 5.0.2 | 5.2.0 | ORPH libxmlrpc | DISTRO | https://release-monitoring.org/project/09024 | r3176 | 1.59.02 | libyang | DISTRO | https://release-monitoring.org/project/18554 | 2.1.111 | 2.1.148 | libzlib | DISTRO | https://release-monitoring.org/project/05303 | 1.3 | 1.3.1 | ORPH lilv | DISTRO | https://release-monitoring.org/project/01818 | 0.24.12 | 0.24.24 | links | DISTRO | https://release-monitoring.org/project/01822 | 2.26 | 2.29 | ORPH linphone | DISTRO | https://release-monitoring.org/project/01823 | 4.4.8 | 5.2.1 | ORPH linux-pam | DISTRO | https://release-monitoring.org/project/12244 | 1.5.3 | 1.6.0 | ORPH live555 | DISTRO | https://release-monitoring.org/project/12414 | 2021.05.03 | 2023.11.30 | ORPH lld | DISTRO | https://release-monitoring.org/project/01830 | 15.0.3 | 17.0.6 | lldpd | DISTRO | https://release-monitoring.org/project/14019 | 1.0.17 | 1.0.18 | ORPH llvm | DISTRO | https://release-monitoring.org/project/01830 | 15.0.3 | 17.0.6 | log4cplus | DISTRO | https://release-monitoring.org/project/01835 | 2.1.0 | 2.1.1 | ORPH log4cxx | DISTRO | https://release-monitoring.org/project/15330 | 0.13.0 | 1.2.0 | lpty | DISTRO | https://release-monitoring.org/project/11671 | 1.0.1-1 | 1.2.2 | ltp-testsuite | DISTRO | https://release-monitoring.org/project/21502 | 20230929 | 20240129 | lttng-babeltrace | DISTRO | https://release-monitoring.org/project/00155 | 1.5.7 | 1.5.11 | lttng-libust | DISTRO | https://release-monitoring.org/project/07135 | 2.13.1 | 2.13.7 | lttng-modules | DISTRO | https://release-monitoring.org/project/07141 | 2.13.10 | 2.13.11 | lttng-tools | DISTRO | https://release-monitoring.org/project/07136 | 2.13.8 | 2.13.11 | lua | DISTRO | https://release-monitoring.org/project/01847 | 5.1.5 | 5.4.6 | lua-iconv | DISTRO | https://release-monitoring.org/project/11668 | 7-1 | 7.1.0 | lua-resty-http | DISTRO | https://release-monitoring.org/project/13887 | 0.15-0 | 0.17.1 | luarocks | DISTRO | https://release-monitoring.org/project/01856 | 3.9.1 | 3.9.2 | luv | DISTRO | https://release-monitoring.org/project/21510 | 1.43.0-0 | 1.47.0-0 | ORPH lvm2 | DISTRO | https://release-monitoring.org/project/05354 | 2.03.14 | 2.03.23 | ORPH lynx | DISTRO | https://release-monitoring.org/project/01863 | 2.8.9rel.1 | 2.9.0 | lzip | DISTRO | https://release-monitoring.org/project/01866 | 1.23 | 1.24 | ORPH lzma-alone | DISTRO | https://release-monitoring.org/project/242840 | 9.22 | 2301 | ORPH mariadb | DISTRO | https://release-monitoring.org/project/01887 | 10.11.6 | 11.3.1 | ORPH mawk | DISTRO | https://release-monitoring.org/project/01953 | 1.3.4-202... | 1.3.4-202... | mbedtls | DISTRO | https://release-monitoring.org/project/13824 | 2.28.7 | 3.5.2 | mbuffer | DISTRO | https://release-monitoring.org/project/15518 | 20220418 | 20240107 | mc | DISTRO | https://release-monitoring.org/project/01954 | 4.8.30 | 4.8.31 | mcelog | DISTRO | https://release-monitoring.org/project/08093 | 194 | 196 | mdevd | DISTRO | https://release-monitoring.org/project/16553 | 0.1.6.0 | 0.1.6.3 | mediastreamer | DISTRO | https://release-monitoring.org/project/21746 | 4.4.8 | 5.3.15 | ORPH memcached | DISTRO | https://release-monitoring.org/project/01965 | 1.6.22 | 1.6.23 | ORPH memtest86 | DISTRO | https://release-monitoring.org/project/01966 | 6.20 | 7.00 | mesa3d | DISTRO | https://release-monitoring.org/project/01970 | 23.3.5 | 24.0.0 | mesa3d-headers | DISTRO | https://release-monitoring.org/project/01970 | 23.3.5 | 24.0.0 | meson | DISTRO | https://release-monitoring.org/project/06472 | 1.1.1 | 1.3.1 | metacity | DISTRO | https://release-monitoring.org/project/15392 | 2.25.1 | 3.46.0 | ORPH mfgtools | DISTRO | https://release-monitoring.org/project/21519 | 0.02 | 2.8.0 | micropython | DISTRO | https://release-monitoring.org/project/10539 | 1.22.0 | 1.22.1 | mimic | DISTRO | https://release-monitoring.org/project/21521 | 1.1.0 | 1.3.0.1 | minetest | DISTRO | https://release-monitoring.org/project/01978 | 5.6.1 | 5.8.0 | minetest-game | DISTRO | https://release-monitoring.org/project/21522 | 5.6.1 | 5.8.0 | minizip | DISTRO | https://release-monitoring.org/project/301509 | 4.0.3 | 4.0.4 | minizip-zlib | DISTRO | https://release-monitoring.org/project/05303 | 1.3 | 1.3.1 | moarvm | DISTRO | https://release-monitoring.org/project/21100 | 2023.12 | 2024.01 | mobile-broadband-provider-info | DISTRO | https://release-monitoring.org/project/10267 | 20221107 | 20230416 | ORPH moby-buildkit | DISTRO | https://release-monitoring.org/project/20836 | 0.11.6 | 0.12.5 | modem-manager | DISTRO | https://release-monitoring.org/project/07306 | 1.20.4 | 1.22.0 | modsecurity2 | DISTRO | https://release-monitoring.org/project/68638 | 2.9.7 | 3.0.12 | mongodb | DISTRO | https://release-monitoring.org/project/02008 | 4.2.18 | 7.2.0 | mono | DISTRO | https://release-monitoring.org/project/06360 | 6.12.0.182 | 6.12.0.205 | mpc | DISTRO | https://release-monitoring.org/project/01667 | 1.2.1 | 1.3.1 | ORPH mpd | DISTRO | https://release-monitoring.org/project/14864 | 0.23.14 | 0.23.15 | mpdecimal | DISTRO | https://release-monitoring.org/project/11578 | 2.5.1 | 4.0.0 | mpfr | DISTRO | https://release-monitoring.org/project/02019 | 4.1.1 | 4.2.1 | ORPH mpg123 | DISTRO | https://release-monitoring.org/project/12413 | 1.32.3 | 1.32.4 | mpv | DISTRO | https://release-monitoring.org/project/05348 | 0.35.1 | 0.37.0 | msgpack | DISTRO | https://release-monitoring.org/project/12278 | 3.3.0 | 6.1.0 | msmtp | DISTRO | https://release-monitoring.org/project/02024 | 1.8.24 | 1.8.25 | mupdf | DISTRO | https://release-monitoring.org/project/02034 | 1.22.0 | 1.23.9 | nanomsg | DISTRO | https://release-monitoring.org/project/14540 | 1.2 | 1.2.1 | ncdu | DISTRO | https://release-monitoring.org/project/06045 | 1.19 | 2.3 | ndisc6 | DISTRO | https://release-monitoring.org/project/21531 | 1.0.7 | 1.0.8 | ORPH neofetch | DISTRO | https://release-monitoring.org/project/16261 | 7.1.0 | 7.3.11 | ORPH neon | DISTRO | https://release-monitoring.org/project/07604 | 0.32.4 | 0.33.0 | ORPH nerdctl | DISTRO | https://release-monitoring.org/project/242901 | 1.3.1 | 1.7.3 | netatalk | DISTRO | https://release-monitoring.org/project/02063 | 3.1.17 | 3.1.18 | ORPH netcat-openbsd | DISTRO | https://release-monitoring.org/project/21534 | 1.218 | 1.226 | ORPH netdata | DISTRO | https://release-monitoring.org/project/11046 | 1.33.1 | 1.44.1 | netifrc | DISTRO | https://release-monitoring.org/project/21917 | 0.7.3 | 0.7.8 | netopeer2 | DISTRO | https://release-monitoring.org/project/114978 | 2.1.49 | 2.2.13 | netsnmp | DISTRO | https://release-monitoring.org/project/02062 | 5.9.3 | 5.9.4 | ORPH netsurf | DISTRO | https://release-monitoring.org/project/05386 | 3.10 | 3.11 | newt | DISTRO | https://release-monitoring.org/project/15129 | 0.52.23 | 0.52.24 | ORPH nftables | DISTRO | https://release-monitoring.org/project/02082 | 1.0.8 | 1.0.9 | nftables-python | DISTRO | https://release-monitoring.org/project/02082 | 1.0.8 | 1.0.9 | nghttp2 | DISTRO | https://release-monitoring.org/project/08651 | 1.57.0 | 1.59.0 | nginx | DISTRO | https://release-monitoring.org/project/05413 | 1.24.0 | 1.25.3 | ninja | DISTRO | https://release-monitoring.org/project/02089 | 1.11.1.g9... | 1.11.1 | nodejs-bin | DISTRO | https://release-monitoring.org/project/08251 | 20.9.0 | 21.6.1 | nodejs-src | DISTRO | https://release-monitoring.org/project/08251 | 20.9.0 | 21.6.1 | noip | DISTRO | https://release-monitoring.org/project/21539 | 2.1.9 | 3.0.0 | ORPH numactl | DISTRO | https://release-monitoring.org/project/02507 | 2.0.16 | 2.0.17 | nushell | DISTRO | https://release-monitoring.org/project/31106 | 0.85.0 | 0.89.0 | nuttcp | DISTRO | https://release-monitoring.org/project/02511 | 6.1.2 | 8.2.2 | nvidia-driver | DISTRO | https://release-monitoring.org/project/21843 | 390.151 | 390.157 | nvidia-modprobe | DISTRO | https://release-monitoring.org/project/141657 | 450.57 | 550.40.07 | ORPH nvidia-persistenced | DISTRO | https://release-monitoring.org/project/369496 | 515.48.07 | 550.40.07 | nvme | DISTRO | https://release-monitoring.org/project/09074 | 1.12 | 2.7.1 | ORPH ocrad | DISTRO | https://release-monitoring.org/project/02526 | 0.28 | 0.29 | ofono | DISTRO | https://release-monitoring.org/project/16859 | 2.2 | 2.3 | ogre | DISTRO | https://release-monitoring.org/project/33334 | v1.12.12 | 14.1.2 | omniorb | DISTRO | https://release-monitoring.org/project/21545 | 4.3.1 | 4.3.2 | ORPH openal | DISTRO | https://release-monitoring.org/project/08172 | 1.22.0 | 1.23.1 | ORPH openblas | DISTRO | https://release-monitoring.org/project/02540 | 0.3.25 | 0.3.26 | opencl-clhpp | DISTRO | https://release-monitoring.org/project/271141 | 2.0.16 | 2023.12.14 | opencore-amr | DISTRO | https://release-monitoring.org/project/21548 | 0.1.5 | 0.1.6 | ORPH opencv3 | DISTRO | https://release-monitoring.org/project/06615 | 3.4.19 | 4.9.0 | opencv4 | DISTRO | https://release-monitoring.org/project/06615 | 4.8.1 | 4.9.0 | openjdk | GUESS | https://release-monitoring.org/project/176098 | 17.0.9+9 | 23+8 | openlayers | DISTRO | https://release-monitoring.org/project/06847 | 8.1.0 | 8.2.0 | openmpi | DISTRO | https://release-monitoring.org/project/02554 | 4.1.5 | 5.0.1 | openrc | DISTRO | https://release-monitoring.org/project/11687 | 0.52.1 | 0.53 | openvmtools | DISTRO | https://release-monitoring.org/project/10998 | 11.3.5-18... | 12.3.5 | opkg | DISTRO | https://release-monitoring.org/project/59397 | 0.6.2 | 0.6.3 | ORPH opkg-utils | DISTRO | https://release-monitoring.org/project/59396 | 0.6.2 | 0.6.3 | optee-client | DISTRO | https://release-monitoring.org/project/21556 | 4.0.0 | 4.1.0 | optee-examples | DISTRO | https://release-monitoring.org/project/21557 | 4.0.0 | 4.1.0 | optee-test | DISTRO | https://release-monitoring.org/project/21558 | 4.0.0 | 4.1.0 | oracle-mysql | DISTRO | https://release-monitoring.org/project/00334 | 5.1.73 | 8.3.0 | ORPH orc | DISTRO | https://release-monitoring.org/project/02573 | 0.4.34 | 0.4.36 | ORPH ortp | DISTRO | https://release-monitoring.org/project/21691 | 4.4.8 | 5.3.15 | ORPH paho-mqtt-cpp | DISTRO | https://release-monitoring.org/project/21376 | 1.2.0 | 1.3.2 | pango | DISTRO | https://release-monitoring.org/project/11783 | 1.50.14 | 1.51.1 | ORPH pangomm | DISTRO | https://release-monitoring.org/project/07958 | 2.50.1 | 2.50.2 | pangomm2_46 | DISTRO | https://release-monitoring.org/project/369412 | 2.46.3 | 2.46.4 | parprouted | DISTRO | https://release-monitoring.org/project/10309 | 0.7 | 0.65 | ORPH patchelf | DISTRO | https://release-monitoring.org/project/02598 | 0.13 | 0.18.0 | ORPH pcsc-lite | DISTRO | https://release-monitoring.org/project/02611 | 2.0.0 | 2.0.1 | ORPH pdbg | DISTRO | https://release-monitoring.org/project/21378 | 3.5 | 3.6 | perl-crypt-cbc | DISTRO | https://release-monitoring.org/project/11930 | 2.33 | 3.04 | perl-crypt-openssl-aes | DISTRO | https://release-monitoring.org/project/02743 | 0.02 | 0.19 | perl-dbd-mysql | DISTRO | https://release-monitoring.org/project/02807 | 4.046 | 5.003 | perl-gd | DISTRO | https://release-monitoring.org/project/12660 | 2.77 | 2.78 | perl-gdgraph | DISTRO | https://release-monitoring.org/project/09187 | 1.54 | 1.56 | perl-http-cookies | DISTRO | https://release-monitoring.org/project/02974 | 6.10 | 6.11 | perl-image-exiftool | DISTRO | https://release-monitoring.org/project/06175 | 12.50 | 12.76 | perl-io-socket-ssl | DISTRO | https://release-monitoring.org/project/06569 | 2.080 | 2.085 | perl-libwww-perl | DISTRO | https://release-monitoring.org/project/03024 | 6.67 | 6.76 | perl-mail-dkim | DISTRO | https://release-monitoring.org/project/11868 | 1.20230630 | 1.20240124 | perl-mime-tools | DISTRO | https://release-monitoring.org/project/11809 | 5.509 | 5.513 | perl-net-dns | DISTRO | https://release-monitoring.org/project/03147 | 1.42 | 1.43 | perl-net-ssh2 | DISTRO | https://release-monitoring.org/project/03163 | 0.72 | 0.73 | perl-net-ssleay | DISTRO | https://release-monitoring.org/project/06575 | 1.93_01 | 1.94 | perl-sys-cpu | DISTRO | https://release-monitoring.org/project/14338 | 0.52 | 0.61 | perl-uri | DISTRO | https://release-monitoring.org/project/03485 | 5.21 | 5.26 | perl-xml-libxml | DISTRO | https://release-monitoring.org/project/03527 | 2.0134 | 2.0210 | php | DISTRO | https://release-monitoring.org/project/03627 | 8.2.15 | 8.3.2 | php-amqp | DISTRO | https://release-monitoring.org/project/15603 | 2.0.0 | 2.1.2 | php-apcu | DISTRO | https://release-monitoring.org/project/11010 | 5.1.22 | 5.1.23 | php-pam | DISTRO | https://release-monitoring.org/project/241707 | 2.2.4 | 2.2.5 | php-xdebug | DISTRO | https://release-monitoring.org/project/13302 | 3.2.2 | 3.3.1 | pipewire | DISTRO | https://release-monitoring.org/project/57357 | 0.3.81 | 1.0.3 | pixman | DISTRO | https://release-monitoring.org/project/03648 | 0.42.2 | 0.43.2 | ORPH pkgconf | DISTRO | https://release-monitoring.org/project/12753 | 1.6.3 | 2.1.1 | ORPH pngquant | DISTRO | https://release-monitoring.org/project/03674 | 2.18.0 | 3.0.3 | poco | DISTRO | https://release-monitoring.org/project/05418 | 1.12.4 | 1.13.0 | poke | DISTRO | https://release-monitoring.org/project/179926 | 3.0 | 3.3 | ORPH policycoreutils | DISTRO | https://release-monitoring.org/project/334932 | 3.5 | 3.6 | polkit | DISTRO | https://release-monitoring.org/project/03682 | 123 | 124 | poppler | DISTRO | https://release-monitoring.org/project/03686 | 22.12.0 | 24.02.0 | pound | DISTRO | https://release-monitoring.org/project/05436 | 4.8 | 4.11 | ORPH procps-ng | DISTRO | https://release-monitoring.org/project/03708 | 3.3.17 | 4.0.4 | ORPH procs | DISTRO | https://release-monitoring.org/project/76458 | 0.14.3 | 0.14.4 | proj | DISTRO | https://release-monitoring.org/project/21570 | 9.3.0 | 9.3.1 | prosody | DISTRO | https://release-monitoring.org/project/03709 | 0.11.14 | 0.12.4 | protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 25.2 | protobuf-c | DISTRO | https://release-monitoring.org/project/03716 | 1.4.1 | 1.5.0 | ORPH proxychains-ng | DISTRO | https://release-monitoring.org/project/06499 | 4.16 | 4.17 | ORPH pru-software-support | DISTRO | https://release-monitoring.org/project/21825 | 6.0.1 | 6.3.0 | psmisc | DISTRO | https://release-monitoring.org/project/03721 | 23.5 | 23.6 | ORPH ptpd | GUESS | https://release-monitoring.org/project/03726 | 1.1.0 | 2.3.1 | ORPH pulseaudio | DISTRO | https://release-monitoring.org/project/03729 | 16.1 | 17.0 | ORPH python-aiocoap | DISTRO | https://release-monitoring.org/project/21243 | 0.4.5 | 0.4.7 | python-aioconsole | DISTRO | https://release-monitoring.org/project/21244 | 0.6.2 | 0.7.0 | python-aiohttp | DISTRO | https://release-monitoring.org/project/06713 | 3.9.1 | 3.9.3 | python-aiohttp-debugtoolbar | DISTRO | https://release-monitoring.org/project/56563 | 0.6.0 | 0.6.1 | python-aiohttp-jinja2 | DISTRO | https://release-monitoring.org/project/21247 | 1.5.1 | 1.6 | python-aiohttp-security | DISTRO | https://release-monitoring.org/project/21249 | 0.4.0 | 0.5.0 | python-aiorwlock | DISTRO | https://release-monitoring.org/project/21254 | 1.3.0 | 1.4.0 | python-alembic | DISTRO | https://release-monitoring.org/project/03766 | 1.12.1 | 1.13.1 | python-anyio | DISTRO | https://release-monitoring.org/project/49275 | 3.7.1 | 4.2.0 | python-apispec | DISTRO | https://release-monitoring.org/project/37849 | 6.3.1 | 6.4.0 | python-argh | DISTRO | https://release-monitoring.org/project/09299 | 0.30.4 | 0.31.2 | python-attrs | DISTRO | https://release-monitoring.org/project/15099 | 23.1.0 | 23.2.0 | python-babel | DISTRO | https://release-monitoring.org/project/11984 | 2.13.1 | 2.14.0 | python-bcrypt | DISTRO | https://release-monitoring.org/project/09047 | 4.0.1 | 4.1.2 | python-beautifulsoup4 | DISTRO | https://release-monitoring.org/project/03779 | 4.12.2 | 4.12.3 | python-bitstring | DISTRO | https://release-monitoring.org/project/14665 | 4.1.2 | 4.1.4 | python-boto3 | DISTRO | https://release-monitoring.org/project/29737 | 1.28.78 | 1.34.34 | python-botocore | DISTRO | https://release-monitoring.org/project/08748 | 1.31.78 | 1.34.34 | python-can | DISTRO | https://release-monitoring.org/project/17873 | 4.2.2 | 4.3.1 | python-cbor2 | DISTRO | https://release-monitoring.org/project/64102 | 5.5.1 | 5.6.1 | python-certifi | DISTRO | https://release-monitoring.org/project/07995 | 2023.11.17 | 2024.2.2 | python-channels-redis | DISTRO | https://release-monitoring.org/project/21936 | 4.1.0 | 4.2.0 | python-cherrypy | DISTRO | https://release-monitoring.org/project/03799 | 18.8.0 | 18.9.0 | python-colorlog | DISTRO | https://release-monitoring.org/project/12509 | 6.7.0 | 6.8.2 | python-configshell-fb | DISTRO | https://release-monitoring.org/project/19734 | 1.1.29 | 1.5 | python-construct | DISTRO | https://release-monitoring.org/project/16220 | 2.10.69 | 2.10.70 | python-contourpy | DISTRO | https://release-monitoring.org/project/244705 | 1.1.0 | 1.2.0 | python-crossbar | DISTRO | https://release-monitoring.org/project/21696 | 21.3.1 | 22.6.1 | python-cryptography | DISTRO | https://release-monitoring.org/project/05532 | 39.0.2 | 42.0.2 | python-cython | DISTRO | https://release-monitoring.org/project/12679 | 0.29.36 | 3.0.8 | python-dbus-fast | DISTRO | https://release-monitoring.org/project/287975 | 2.12.0 | 2.21.1 | python-distlib | DISTRO | https://release-monitoring.org/project/34504 | 0.3.7 | 0.3.8 | python-distro | DISTRO | https://release-monitoring.org/project/12202 | 1.8.0 | 1.9.0 | python-django | DISTRO | https://release-monitoring.org/project/03828 | 4.2.7 | 5.0.1 | python-dnspython | DISTRO | https://release-monitoring.org/project/13190 | 2.4.2 | 2.5.0 | python-docker | DISTRO | https://release-monitoring.org/project/03847 | 6.1.3 | 7.0.0b3 | python-dominate | DISTRO | https://release-monitoring.org/project/19648 | 2.8.0 | 2.9.1 | python-dtschema | DISTRO | https://release-monitoring.org/project/100908 | 2023.9 | 2023.11 | python-engineio | DISTRO | https://release-monitoring.org/project/15064 | 4.8.0 | 4.8.2 | python-esptool | DISTRO | https://release-monitoring.org/project/11619 | 4.6.2 | 4.7.0 | python-falcon | DISTRO | https://release-monitoring.org/project/03860 | 3.1.1 | 3.1.3 | python-fastapi | DISTRO | https://release-monitoring.org/project/47977 | 0.105.0 | 0.109.2 | python-flask | DISTRO | https://release-monitoring.org/project/03867 | 3.0.0 | 3.0.2 | python-flask-jsonrpc | DISTRO | https://release-monitoring.org/project/21698 | 2.2.2 | 3.0.0 | python-flask-smorest | DISTRO | https://release-monitoring.org/project/25028 | 0.42.1 | 0.42.3 | python-flatbuffers | DISTRO | https://release-monitoring.org/project/85010 | 2.0.7 | 23.5.26 | python-fonttools | DISTRO | https://release-monitoring.org/project/07388 | 4.44.0 | 4.47.2 | python-frozenlist | DISTRO | https://release-monitoring.org/project/41138 | 1.4.0 | 1.4.1 | python-git | DISTRO | https://release-monitoring.org/project/06459 | 3.1.40 | 3.1.41 | python-glslang | DISTRO | https://release-monitoring.org/project/205796 | 11.13.0 | 14.0.0 | python-gnupg | DISTRO | https://release-monitoring.org/project/15157 | 0.5.1 | 0.5.2 | python-gobject | DISTRO | https://release-monitoring.org/project/13158 | 3.42.2 | 3.46.0 | python-google-api-core | DISTRO | https://release-monitoring.org/project/25386 | 2.15.0 | 2.16.2 | python-google-auth | DISTRO | https://release-monitoring.org/project/38039 | 2.25.2 | 2.27.0 | python-greenlet | DISTRO | https://release-monitoring.org/project/06870 | 3.0.1 | 3.0.3 | python-grpc-requests | DISTRO | https://release-monitoring.org/project/132701 | 0.1.13 | 0.1.14 | python-grpcio | DISTRO | https://release-monitoring.org/project/18429 | 1.60.0 | 1.60.1 | python-grpcio-reflection | DISTRO | https://release-monitoring.org/project/30542 | 1.60.0 | 1.60.1 | python-hatch-fancy-pypi-readme | DISTRO | https://release-monitoring.org/project/274452 | 23.1.0 | 24.1.0 | python-hatch-vcs | DISTRO | https://release-monitoring.org/project/301800 | 0.3.0 | 0.4.0 | python-hatchling | DISTRO | https://release-monitoring.org/project/185085 | 1.18.0 | 1.21.1 | python-hiredis | DISTRO | https://release-monitoring.org/project/12002 | 2.2.3 | 2.3.2 | python-httpx | DISTRO | https://release-monitoring.org/project/27210 | 0.25.2 | 0.26.0 | python-hwdata | DISTRO | https://release-monitoring.org/project/11771 | 2.3.7 | 2.4.1-1 | python-idna | DISTRO | https://release-monitoring.org/project/05487 | 3.4 | 3.6 | python-ipython | DISTRO | https://release-monitoring.org/project/01399 | 8.17.2 | 8.21.0 | python-iwlib | DISTRO | https://release-monitoring.org/project/51611 | 1.5 | 1.7.0 | python-jinja2 | DISTRO | https://release-monitoring.org/project/03894 | 3.1.2 | 3.1.3 | python-jsonschema | DISTRO | https://release-monitoring.org/project/03898 | 4.19.2 | 4.21.1 | python-jsonschema-specifica... | DISTRO | https://release-monitoring.org/project/316377 | 2023.7.1 | 2023.12.1 | python-keyring | DISTRO | https://release-monitoring.org/project/03901 | 24.2.0 | 24.3.0 | python-lark | DISTRO | https://release-monitoring.org/project/140595 | 1.1.8 | 1.1.9 | python-lxml | DISTRO | https://release-monitoring.org/project/03914 | 4.9.3 | 5.1.0 | python-mako | DISTRO | https://release-monitoring.org/project/03915 | 1.3.0 | 1.3.2 | python-markdown | DISTRO | https://release-monitoring.org/project/03916 | 3.5.1 | 3.5.2 | python-markdown2 | DISTRO | https://release-monitoring.org/project/03917 | 2.4.10 | 2.4.12 | python-markupsafe | DISTRO | https://release-monitoring.org/project/03918 | 2.1.3 | 2.1.5 | python-marshmallow | DISTRO | https://release-monitoring.org/project/08079 | 3.20.1 | 3.20.2 | python-marshmallow-sqlalchemy | DISTRO | https://release-monitoring.org/project/50566 | 0.29.0 | 1.0.0 | python-maturin | DISTRO | https://release-monitoring.org/project/42653 | 1.3.1 | 1.4.0 | python-ml-dtypes | DISTRO | https://release-monitoring.org/project/330555 | 0.3.1 | 0.3.2 | python-more-itertools | DISTRO | https://release-monitoring.org/project/12201 | 10.1.0 | 10.2.0 | python-mpd2 | DISTRO | https://release-monitoring.org/project/19721 | 3.1.0 | 3.1.1 | python-multidict | DISTRO | https://release-monitoring.org/project/11132 | 6.0.4 | 6.0.5 | python-multipart | DISTRO | https://release-monitoring.org/project/18463 | 0.0.6 | 0.0.7 | python-netaddr | DISTRO | https://release-monitoring.org/project/05586 | 0.9.0 | 0.10.1 | python-numpy | DISTRO | https://release-monitoring.org/project/02509 | 1.25.0 | 1.26.3 | python-opcua-asyncio | DISTRO | https://release-monitoring.org/project/131612 | 1.0.1 | 1.05a1 | python-orjson | DISTRO | https://release-monitoring.org/project/31737 | 3.9.10 | 3.9.13 | python-pathspec | DISTRO | https://release-monitoring.org/project/15607 | 0.11.2 | 0.12.1 | python-pexpect | DISTRO | https://release-monitoring.org/project/07654 | 4.8.0 | 4.9.0 | python-pillow | DISTRO | https://release-monitoring.org/project/07974 | 10.1.0 | 10.2.0 | python-pip | DISTRO | https://release-monitoring.org/project/06529 | 23.3.1 | 24.0 | python-pluggy | DISTRO | https://release-monitoring.org/project/07500 | 1.3.0 | 1.4.0 | python-prompt-toolkit | DISTRO | https://release-monitoring.org/project/08742 | 3.0.41 | 3.0.43 | python-protobuf | DISTRO | https://release-monitoring.org/project/03715 | 21.12 | 25.2 | python-psutil | DISTRO | https://release-monitoring.org/project/03978 | 5.9.7 | 5.9.8 | python-pudb | DISTRO | https://release-monitoring.org/project/03980 | 2023.1 | 2024.1 | python-pycryptodomex | DISTRO | https://release-monitoring.org/project/36851 | 3.19.0 | 3.20.0 | python-pydantic | DISTRO | https://release-monitoring.org/project/29768 | 2.5.2 | 2.6.0 | python-pydantic-core | DISTRO | https://release-monitoring.org/project/273695 | 2.14.5 | 2.16.2 | python-pyftpdlib | DISTRO | https://release-monitoring.org/project/17026 | 1.5.7 | 1.5.9 | python-pygame | DISTRO | https://release-monitoring.org/project/17480 | d61ea8eabd56 | 2.5.2 | python-pygments | DISTRO | https://release-monitoring.org/project/03986 | 2.15.1 | 2.17.2 | python-pyhamcrest | DISTRO | https://release-monitoring.org/project/11633 | 2.0.4 | 2.1.0 | python-pyicu | DISTRO | https://release-monitoring.org/project/12004 | 2.11 | 2.12 | python-pyjwt | DISTRO | https://release-monitoring.org/project/05653 | 2.7.0 | 2.8.0 | python-pylibftdi | DISTRO | https://release-monitoring.org/project/21583 | 0.20.0 | 0.21.0 | python-pymodbus | DISTRO | https://release-monitoring.org/project/15600 | 3.0.2 | 3.6.3 | python-pymupdf | DISTRO | https://release-monitoring.org/project/17320 | 1.22.0 | 1.23.21 | python-pymysql | DISTRO | https://release-monitoring.org/project/07284 | 1.0.2 | 1.1.0 | python-pyopenssl | DISTRO | https://release-monitoring.org/project/05535 | 23.0.0 | 24.0.0 | python-pyparted | DISTRO | https://release-monitoring.org/project/15558 | 3.12.0 | 3.13.0 | python-pyqt5 | DISTRO | https://release-monitoring.org/project/20104 | 5.15.6 | 5.15.10 | python-pyroute2 | DISTRO | https://release-monitoring.org/project/20081 | 0.7.10 | 0.7.11 | python-pyrsistent | DISTRO | https://release-monitoring.org/project/19676 | 0.19.3 | 0.20.0 | python-pysmb | DISTRO | https://release-monitoring.org/project/21589 | 1.2.9 | 1.2.9.1 | python-pyspnego | DISTRO | https://release-monitoring.org/project/107092 | 0.7.0 | 0.10.2 | python-pytablereader | DISTRO | https://release-monitoring.org/project/21592 | 0.31.3 | 0.31.4 | python-pytablewriter | DISTRO | https://release-monitoring.org/project/21593 | 0.64.2 | 1.2.0 | python-pytest | DISTRO | https://release-monitoring.org/project/03765 | 7.4.2 | 8.0.0 | python-pytest-asyncio | DISTRO | https://release-monitoring.org/project/07273 | 0.21.1 | 0.23.4a2 | python-pythran | DISTRO | https://release-monitoring.org/project/21140 | 0.13.1 | 0.15.0 | python-pytz | DISTRO | https://release-monitoring.org/project/06537 | 2023.3 | 2024.1 | python-pyudev | DISTRO | https://release-monitoring.org/project/08485 | 0.24.0 | 0.24.1 | python-pyzmq | DISTRO | https://release-monitoring.org/project/04104 | 24.0.1 | 25.1.2 | python-qrcode | DISTRO | https://release-monitoring.org/project/20011 | 7.3.1 | 7.4.2 | python-redis | DISTRO | https://release-monitoring.org/project/03992 | 4.5.5 | 5.1.0b3 | python-reedsolo | DISTRO | https://release-monitoring.org/project/81160 | 1.6.0 | 2.0.13 | python-referencing | DISTRO | https://release-monitoring.org/project/304263 | 0.30.2 | 0.33.0 | python-regex | DISTRO | https://release-monitoring.org/project/05548 | 2022.10.31 | 2023.12.25 | python-requests-toolbelt | DISTRO | https://release-monitoring.org/project/05665 | 0.10.1 | 1.0.0 | python-rpds-py | DISTRO | https://release-monitoring.org/project/368622 | 0.12.0 | 0.17.1 | python-rtoml | DISTRO | https://release-monitoring.org/project/62048 | 0.8.0 | 0.10.0 | python-rtslib-fb | DISTRO | https://release-monitoring.org/project/19641 | 2.1.74 | 2.2 | python-ruamel-yaml | DISTRO | https://release-monitoring.org/project/66067 | 0.17.21 | 0.18.5 | python-s3transfer | DISTRO | https://release-monitoring.org/project/10428 | 0.6.0 | 0.10.0 | python-schedule | DISTRO | https://release-monitoring.org/project/21600 | 1.1.0 | 1.2.1 | python-scipy | DISTRO | https://release-monitoring.org/project/04768 | 1.11.0 | 1.12.0 | python-segno | DISTRO | https://release-monitoring.org/project/59641 | 1.5.2 | 1.6.0 | python-selenium | DISTRO | https://release-monitoring.org/project/05645 | 4.9.1 | 4.17.2 | python-semver | DISTRO | https://release-monitoring.org/project/12989 | 2.13.0 | 3.0.2 | python-sentry-sdk | DISTRO | https://release-monitoring.org/project/21603 | 1.12.1 | 1.40.0 | python-service-identity | DISTRO | https://release-monitoring.org/project/07917 | 21.1.0 | 24.1.0 | python-setproctitle | DISTRO | https://release-monitoring.org/project/11699 | 1.3.2 | 1.3.3 | python-setuptools | DISTRO | https://release-monitoring.org/project/04021 | 68.2.2 | 69.0.3 | python-setuptools-scm | DISTRO | https://release-monitoring.org/project/07874 | 7.1.0 | 8.0.4 | python-setuptools-scm-git-a... | DISTRO | https://release-monitoring.org/project/28329 | 1.4 | 1.4.1 | python-sh | DISTRO | https://release-monitoring.org/project/10429 | 1.14.3 | 2.0.6 | python-simplejson | DISTRO | https://release-monitoring.org/project/04026 | 3.18.1 | 3.19.2 | python-simplesqlite | DISTRO | https://release-monitoring.org/project/21608 | 1.3.0 | 1.5.2 | python-sip | DISTRO | https://release-monitoring.org/project/13626 | 4.19.25 | 6.8.2 | python-smbprotocol | DISTRO | https://release-monitoring.org/project/47981 | 1.10.1 | 1.12.0 | python-smmap2 | DISTRO | https://release-monitoring.org/project/12729 | 5.0.0 | 6.0.0 | python-socketio | DISTRO | https://release-monitoring.org/project/21611 | 5.7.2 | 5.11.0 | python-soupsieve | DISTRO | https://release-monitoring.org/project/27570 | 2.3.2.post1 | 2.5 | python-sqliteschema | DISTRO | https://release-monitoring.org/project/29718 | 1.3.0 | 2.0.0 | python-sqlparse | DISTRO | https://release-monitoring.org/project/04038 | 0.4.3 | 0.4.4 | python-stack-data | DISTRO | https://release-monitoring.org/project/90020 | 0.6.2 | 0.6.3 | python-starlette | DISTRO | https://release-monitoring.org/project/36570 | 0.27.0 | 0.36.2 | python-tabledata | DISTRO | https://release-monitoring.org/project/21613 | 1.3.0 | 1.3.3 | python-tempora | DISTRO | https://release-monitoring.org/project/21225 | 5.2.0 | 5.5.0 | python-termcolor | DISTRO | https://release-monitoring.org/project/10198 | 2.2.0 | 2.4.0 | python-texttable | DISTRO | https://release-monitoring.org/project/11635 | 1.6.7 | 1.7.0 | python-tinyrpc | DISTRO | https://release-monitoring.org/project/12824 | 1.1.4 | 1.1.7 | python-tornado | DISTRO | https://release-monitoring.org/project/07498 | 6.2 | 6.4 | python-tqdm | DISTRO | https://release-monitoring.org/project/11524 | 4.64.1 | 4.66.1 | python-traitlets | DISTRO | https://release-monitoring.org/project/12211 | 5.8.0 | 5.14.1 | python-treq | DISTRO | https://release-monitoring.org/project/19614 | 22.2.0 | 23.11.0 | python-trio | DISTRO | https://release-monitoring.org/project/17451 | 0.22.0 | 0.24.0 | python-trio-websocket | DISTRO | https://release-monitoring.org/project/136283 | 0.9.2 | 0.11.1 | python-trove-classifiers | DISTRO | https://release-monitoring.org/project/88298 | 2023.10.18 | 2024.1.31 | python-twisted | DISTRO | https://release-monitoring.org/project/04071 | 22.10.0 | 23.10.0 | python-txtorcon | DISTRO | https://release-monitoring.org/project/19661 | 22.0.0 | 23.11.0 | python-typeguard | DISTRO | https://release-monitoring.org/project/38819 | 2.13.3 | 4.1.5 | python-typepy | DISTRO | https://release-monitoring.org/project/21617 | 1.3.0 | 1.3.2 | python-types-python-dateutil | DISTRO | https://release-monitoring.org/project/147859 | 2.8.19.14 | 2.8.19.20... | python-typing-inspect | DISTRO | https://release-monitoring.org/project/209826 | 0.8.0 | 0.9.0 | python-u-msgpack | DISTRO | https://release-monitoring.org/project/19764 | 2.7.2 | 2.8.0 | python-ujson | DISTRO | https://release-monitoring.org/project/04076 | 5.7.0 | 5.9.0 | python-urllib3 | DISTRO | https://release-monitoring.org/project/04078 | 2.0.7 | 2.2.0 | python-urwid | DISTRO | https://release-monitoring.org/project/04079 | 2.1.2 | 2.5.1 | python-uvicorn | DISTRO | https://release-monitoring.org/project/28526 | 0.24.0.post1 | 0.27.0.post1 | python-watchdog | DISTRO | https://release-monitoring.org/project/05341 | 2.2.1 | 3.0.0 | python-wcwidth | DISTRO | https://release-monitoring.org/project/08743 | 0.2.5 | 0.2.13 | python-weasyprint | DISTRO | https://release-monitoring.org/project/11057 | 59.0 | 60.2 | python-web2py | DISTRO | https://release-monitoring.org/project/20617 | 2.26.1 | 2.27.1 | python-webargs | DISTRO | https://release-monitoring.org/project/24711 | 8.2.0 | 8.4.0 | python-websocket-client | DISTRO | https://release-monitoring.org/project/07288 | 1.4.2 | 1.7.0 | python-websockets | DISTRO | https://release-monitoring.org/project/08100 | 10.4 | 12.0 | python-werkzeug | DISTRO | https://release-monitoring.org/project/04092 | 2.3.8 | 3.0.1 | python-wheel | DISTRO | https://release-monitoring.org/project/11428 | 0.40.0 | 0.42.0 | python-wrapt | DISTRO | https://release-monitoring.org/project/06108 | 1.14.1 | 1.16.0 | python-wtforms | DISTRO | https://release-monitoring.org/project/11805 | 3.0.1 | 3.1.2 | python-xlib | DISTRO | https://release-monitoring.org/project/12180 | 0.32 | 0.33 | python-xlsxwriter | DISTRO | https://release-monitoring.org/project/12031 | 3.0.6 | 3.1.9 | python-yarl | DISTRO | https://release-monitoring.org/project/12895 | 1.9.2 | 1.9.4 | python-yatl | DISTRO | https://release-monitoring.org/project/50636 | 20220907.1 | 20230507.3 | python-zc-lockfile | DISTRO | https://release-monitoring.org/project/04100 | 2.0 | 3.0.post1 | python-zeroconf | DISTRO | https://release-monitoring.org/project/12681 | 0.39.4 | 0.131.0 | python-zlmdb | DISTRO | https://release-monitoring.org/project/66674 | 22.6.1 | 23.1.1 | python-zope-interface | DISTRO | https://release-monitoring.org/project/04112 | 5.5.2 | 6.1a2 | python-zopfli | DISTRO | https://release-monitoring.org/project/50016 | 0.2.2 | 0.2.3 | python3 | DISTRO | https://release-monitoring.org/project/13254 | 3.11.6 | 3.12.1 | qcom-db410c-firmware | DISTRO | https://release-monitoring.org/project/235382 | 1034.2.1 | 1036.1 | qemu | DISTRO | https://release-monitoring.org/project/13607 | 8.1.1 | 8.2.1 | qlibc | DISTRO | https://release-monitoring.org/project/21737 | 2.4.7 | 2.5.0 | ORPH qpdf | DISTRO | https://release-monitoring.org/project/05542 | 10.5.0 | 11.8.0 | qpid-proton | DISTRO | https://release-monitoring.org/project/15198 | 0.35.0 | 0.39.0 | qt5coap | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.6.1 | qt5knx | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.6.1 | qt5mqtt | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.6.1 | qt5opcua | DISTRO | https://release-monitoring.org/project/07927 | 5.15.2 | 6.6.1 | qt5webengine | DISTRO | https://release-monitoring.org/project/07927 | 5.15.10 | 6.6.1 | qt6base | DISTRO | https://release-monitoring.org/project/07927 | 6.4.3 | 6.6.1 | qt6core5compat | DISTRO | https://release-monitoring.org/project/07927 | 6.4.3 | 6.6.1 | qt6serialbus | DISTRO | https://release-monitoring.org/project/07927 | 6.4.3 | 6.6.1 | qt6serialport | DISTRO | https://release-monitoring.org/project/07927 | 6.4.3 | 6.6.1 | qt6svg | DISTRO | https://release-monitoring.org/project/07927 | 6.4.3 | 6.6.1 | quickjs | DISTRO | https://release-monitoring.org/project/138263 | 2023-12-09 | 2024-01-13 | qwt | DISTRO | https://release-monitoring.org/project/04147 | 6.1.6 | 6.2.0 | ORPH ragel | DISTRO | https://release-monitoring.org/project/12105 | 6.10 | 7.0.4 | ORPH raspberrypi-usbboot | DISTRO | https://release-monitoring.org/project/115700 | 2021.07.01 | 20221215-... | ORPH rauc | DISTRO | https://release-monitoring.org/project/20626 | 1.11 | 1.11.1 | rdma-core | DISTRO | https://release-monitoring.org/project/12907 | 49.0 | 50.0 | re2 | DISTRO | https://release-monitoring.org/project/10500 | 2023-11-01 | 2024-02-01 | redis-plus-plus | DISTRO | https://release-monitoring.org/project/368624 | 1.3.10 | 1.3.12 | restorecond | DISTRO | https://release-monitoring.org/project/16520 | 3.5 | 20200710 | ORPH riemann-c-client | DISTRO | https://release-monitoring.org/project/21389 | 1.10.5 | 2.0.1 | ORPH rocksdb | DISTRO | https://release-monitoring.org/project/15560 | 6.20.3 | 8.10.0 | rp-pppoe | DISTRO | https://release-monitoring.org/project/04209 | 3.15 | 4.0 | ORPH rt-tests | DISTRO | https://release-monitoring.org/project/59450 | 2.5 | 2.6 | ruby | DISTRO | https://release-monitoring.org/project/04223 | 3.1.3 | 3.3.0 | runc | DISTRO | https://release-monitoring.org/project/07462 | 1.1.9 | 1.1.12 | rust | DISTRO | https://release-monitoring.org/project/07635 | 1.74.1 | 1.75.0 | rust-bin | DISTRO | https://release-monitoring.org/project/07635 | 1.74.1 | 1.75.0 | rust-bindgen | DISTRO | https://release-monitoring.org/project/17910 | 0.65.1 | 0.69.4 | rygel | DISTRO | https://release-monitoring.org/project/04751 | 0.40.2 | 0.42.5 | s390-tools | DISTRO | https://release-monitoring.org/project/10714 | 2.29.0 | 2.31.0 | s6 | DISTRO | https://release-monitoring.org/project/05485 | 2.11.1.2 | 2.12.0.3 | s6-dns | DISTRO | https://release-monitoring.org/project/16547 | 2.3.5.4 | 2.3.7.1 | s6-linux-init | DISTRO | https://release-monitoring.org/project/16552 | 1.0.8.0 | 1.1.2.0 | s6-linux-utils | DISTRO | https://release-monitoring.org/project/16551 | 2.6.0.0 | 2.6.2.0 | s6-networking | DISTRO | https://release-monitoring.org/project/16550 | 2.5.1.1 | 2.7.0.2 | s6-portable-utils | DISTRO | https://release-monitoring.org/project/16549 | 2.2.5.0 | 2.3.0.3 | s6-rc | DISTRO | https://release-monitoring.org/project/16548 | 0.5.3.2 | 0.5.4.2 | safeclib | DISTRO | https://release-monitoring.org/project/21385 | 3.7.1 | 01022022 | samba4 | DISTRO | https://release-monitoring.org/project/04758 | 4.19.3 | 4.19.4 | sane-backends | DISTRO | https://release-monitoring.org/project/04760 | 1.1.1 | 1.2.1 | scons | DISTRO | https://release-monitoring.org/project/04770 | 4.5.2 | 4.6.0 | sdl2 | DISTRO | https://release-monitoring.org/project/04779 | 2.28.5 | 2.30.0 | sdl2_mixer | DISTRO | https://release-monitoring.org/project/04782 | 2.6.3 | 2.8.0 | ORPH sdl2_ttf | DISTRO | https://release-monitoring.org/project/04784 | 2.20.2 | 2.22.0 | sdl_gfx | DISTRO | https://release-monitoring.org/project/04778 | 2.0.23 | 2.0.27 | ORPH sdl_sound | DISTRO | https://release-monitoring.org/project/10262 | 1.0.3 | 2.0.2 | ORPH sdparm | DISTRO | https://release-monitoring.org/project/04787 | 1.10 | 1.12 | selinux-python | DISTRO | https://release-monitoring.org/project/01717 | 3.5 | 3.6 | semodule-utils | DISTRO | https://release-monitoring.org/project/01717 | 3.5 | 3.6 | ORPH sentry-cli | DISTRO | https://release-monitoring.org/project/135642 | 2.20.3 | 2.27.0 | sentry-native | DISTRO | https://release-monitoring.org/project/135639 | 0.4.1 | 0.7.0 | ser2net | DISTRO | https://release-monitoring.org/project/21655 | 4.3.8 | 4.6.1 | serd | DISTRO | https://release-monitoring.org/project/230531 | 0.30.14 | 0.32.2 | setools | DISTRO | https://release-monitoring.org/project/08951 | 4.4.3 | 4.4.4 | ORPH shadow | DISTRO | https://release-monitoring.org/project/04802 | 4.13 | 4.14.3 | shairport-sync | DISTRO | https://release-monitoring.org/project/21384 | 3.3.9 | 4.3.2 | ORPH shared-mime-info | DISTRO | https://release-monitoring.org/project/05524 | 1.12 | 2.4 | ORPH shim | DISTRO | https://release-monitoring.org/project/10719 | 15.6 | 15.8 | signal-estimator | DISTRO | https://release-monitoring.org/project/284559 | v0.0.4 | 0.0.9 | ORPH sispmctl | DISTRO | https://release-monitoring.org/project/21653 | 4.9 | 4.11 | skalibs | DISTRO | https://release-monitoring.org/project/05486 | 2.12.0.1 | 2.14.1.1 | slirp4netns | DISTRO | https://release-monitoring.org/project/96795 | 1.2.0 | 1.2.2 | smartmontools | DISTRO | https://release-monitoring.org/project/04835 | 7.3 | 7.4 | ORPH sngrep | DISTRO | https://release-monitoring.org/project/17075 | 1.7.0 | 1.8.0 | ORPH snmppp | DISTRO | https://release-monitoring.org/project/21318 | 3.5.0 | 3.5.1 | snort3 | DISTRO | https://release-monitoring.org/project/13263 | 3.1.40.0 | 3.1.78.0 | softether | DISTRO | https://release-monitoring.org/project/21383 | 4.30-9700... | 4.42-9798... | ORPH sord | DISTRO | https://release-monitoring.org/project/230536 | 0.16.12 | 0.16.16 | sound-theme-freedesktop | DISTRO | https://release-monitoring.org/project/10152 | 0.7 | 0.8 | spandsp | DISTRO | https://release-monitoring.org/project/12600 | 3.0.0-6ec... | 3.0.0 | spawn-fcgi | DISTRO | https://release-monitoring.org/project/05388 | 1.6.4 | 1.6.5 | ORPH sphinxbase | DISTRO | https://release-monitoring.org/project/20548 | 5prealpha | 0.8 | spice | DISTRO | https://release-monitoring.org/project/04871 | 0.15.0 | 0.15.2 | sqlcipher | DISTRO | https://release-monitoring.org/project/11213 | 4.5.1 | 4.5.6 | sqlite | DISTRO | https://release-monitoring.org/project/04877 | 3.44.2 | 3.45.1 | squid | DISTRO | https://release-monitoring.org/project/04880 | 6.6 | 6.7 | ORPH sratom | DISTRO | https://release-monitoring.org/project/14903 | 0.6.14 | 0.6.16 | start-stop-daemon | DISTRO | https://release-monitoring.org/project/08127 | 1.20.7.1 | 1.22.4 | ORPH stella | DISTRO | https://release-monitoring.org/project/06861 | 6.7 | 6.7.1 | stellarium | DISTRO | https://release-monitoring.org/project/04891 | 23.3 | 23.4 | strace | DISTRO | https://release-monitoring.org/project/04897 | 6.6 | 6.7 | stress-ng | DISTRO | https://release-monitoring.org/project/12538 | 0.15.07 | 0.17.05 | suricata | DISTRO | https://release-monitoring.org/project/10925 | 6.0.15 | 7.0.2 | swig | DISTRO | https://release-monitoring.org/project/04919 | 4.1.1 | 4.2.0 | synergy | DISTRO | https://release-monitoring.org/project/05718 | 2.0.12-beta | 2.3.2 | sysdig | DISTRO | https://release-monitoring.org/project/16898 | 0.29.3 | 0.35.1 | syslog-ng | DISTRO | https://release-monitoring.org/project/04930 | 4.3.1 | 4.6.0 | sysprof | DISTRO | https://release-monitoring.org/project/21649 | 1.2.0 | 45.1 | sysrepo | DISTRO | https://release-monitoring.org/project/34820 | 2.2.36 | 2.2.150 | sysstat | DISTRO | https://release-monitoring.org/project/04931 | 12.6.1 | 12.7.5 | ORPH systemd | DISTRO | https://release-monitoring.org/project/05440 | 254.6 | 255.3 | systemd-bootchart | DISTRO | https://release-monitoring.org/project/11774 | 233 | 235 | taglib | DISTRO | https://release-monitoring.org/project/01982 | 1.13.1 | 2.0 | tar | DISTRO | https://release-monitoring.org/project/04939 | 1.34 | 1.35 | ORPH targetcli-fb | DISTRO | https://release-monitoring.org/project/09174 | 2.1.54 | 2.1.58 | tclap | DISTRO | https://release-monitoring.org/project/04942 | 1.2.4 | 1.2.5 | ORPH terminology | DISTRO | https://release-monitoring.org/project/04951 | 1.12.1 | 1.13.0 | tesseract-ocr | DISTRO | https://release-monitoring.org/project/04954 | 5.3.3 | 5.3.4 | thermald | DISTRO | https://release-monitoring.org/project/14500 | 2.5.1 | 2.5.6 | thrift | DISTRO | https://release-monitoring.org/project/05581 | 0.14.1 | 0.19.0 | ORPH timescaledb | DISTRO | https://release-monitoring.org/project/17545 | 2.13.0 | 2.13.1 | tinifier | DISTRO | https://release-monitoring.org/project/241900 | 3.4.0 | 4.1.0 | tinycompress | DISTRO | https://release-monitoring.org/project/09556 | 1.2.8 | 1.2.11 | tinyxml | DISTRO | https://release-monitoring.org/project/10162 | 2.6.2_2 | 2.6.2 | ORPH tio | DISTRO | https://release-monitoring.org/project/20587 | 1.47 | 2.7 | tl-expected | DISTRO | https://release-monitoring.org/project/112689 | v1.0.0 | 1.1.0 | tpm-tools | DISTRO | https://release-monitoring.org/project/21640 | 1.3.9.1 | 1.3.9.2 | tpm2-abrmd | DISTRO | https://release-monitoring.org/project/16819 | 2.3.3 | 3.0.0 | ORPH tpm2-tools | DISTRO | https://release-monitoring.org/project/12841 | 5.2 | 5.6 | ORPH tpm2-totp | DISTRO | https://release-monitoring.org/project/18790 | 0.2.1 | 0.3.0 | tpm2-tss | DISTRO | https://release-monitoring.org/project/12683 | 3.2.2 | 4.0.1 | ORPH traceroute | DISTRO | https://release-monitoring.org/project/14877 | 2.1.3 | 2.1.5 | ttyd | DISTRO | https://release-monitoring.org/project/13890 | 1.7.3 | 1.7.4 | tzdata | DISTRO | https://release-monitoring.org/project/05021 | 2023c | 2024a | uacme | DISTRO | https://release-monitoring.org/project/22795 | 1.7.4 | 1.7.5 | uboot-tools | DISTRO | https://release-monitoring.org/project/05022 | 2021.07 | 2024.01 | ORPH uftrace | DISTRO | https://release-monitoring.org/project/195039 | 0.14 | 0.15.2 | uhd | DISTRO | https://release-monitoring.org/project/12572 | 4.3.0.0 | 4.6.0.0 | unbound | DISTRO | https://release-monitoring.org/project/05042 | 1.17.1 | 1.19.0 | unionfs | DISTRO | https://release-monitoring.org/project/17617 | 2.1 | 3.4 | ORPH upmpdcli | DISTRO | https://release-monitoring.org/project/15848 | 1.5.12 | 1.8.7 | ORPH upower | DISTRO | https://release-monitoring.org/project/05056 | 0.99.19 | 1.90.2 | upx | DISTRO | https://release-monitoring.org/project/13737 | 4.2.1 | 4.2.2 | util-linux | DISTRO | https://release-monitoring.org/project/08179 | 2.39.2 | 2.39.3 | ORPH util-linux-libs | DISTRO | https://release-monitoring.org/project/08179 | 2.39.2 | 2.39.3 | ORPH uuu | DISTRO | https://release-monitoring.org/project/259328 | 1.5.141 | 1.5.165 | vdr | DISTRO | https://release-monitoring.org/project/05069 | 2.6.3 | 2.6.6 | ORPH vdr-plugin-vnsiserver | DISTRO | https://release-monitoring.org/project/05080 | 1.8.0 | 1.8.3 | ORPH vim | DISTRO | https://release-monitoring.org/project/05092 | 9.0.2136 | 9.1.0076 | ORPH vis-network | DISTRO | https://release-monitoring.org/project/270536 | 9.1.0 | 9.1.9 | vnstat | DISTRO | https://release-monitoring.org/project/07283 | 2.11 | 2.12 | volk | DISTRO | https://release-monitoring.org/project/147733 | 3.0.0 | 3.1.1 | vpnc | DISTRO | https://release-monitoring.org/project/15955 | 0.5.3r550... | 0.5.3 | ORPH vte | DISTRO | https://release-monitoring.org/project/10895 | 0.66.2 | 0.75.0 | ORPH vuejs | DISTRO | https://release-monitoring.org/project/89353 | 3.3.4 | 3.4.15 | vulkan-headers | DISTRO | https://release-monitoring.org/project/88835 | 1.3.262 | 1.3.277 | ORPH vulkan-loader | DISTRO | https://release-monitoring.org/project/230557 | 1.3.262 | 1.3.277 | ORPH vulkan-tools | DISTRO | https://release-monitoring.org/project/242111 | 1.3.262 | 1.3.277 | ORPH waffle | DISTRO | https://release-monitoring.org/project/21633 | 1.7.0 | 1.8.0 | watchdogd | DISTRO | https://release-monitoring.org/project/236252 | 3.5 | 4.0 | wayland-protocols | DISTRO | https://release-monitoring.org/project/13997 | 1.32 | 1.33 | ORPH webkitgtk | DISTRO | https://release-monitoring.org/project/05355 | 2.42.2 | 2.43.4 | weston | DISTRO | https://release-monitoring.org/project/13745 | 12.0.1 | 13.0.0 | whois | DISTRO | https://release-monitoring.org/project/05128 | 5.5.14 | 5.5.20 | wine | DISTRO | https://release-monitoring.org/project/05134 | 8.0.2 | 9.1 | wireless-regdb | DISTRO | https://release-monitoring.org/project/15257 | 2023.09.01 | 2024.01.23 | wireplumber | DISTRO | https://release-monitoring.org/project/235056 | 0.4.8 | 0.4.81 | ORPH wireshark | DISTRO | https://release-monitoring.org/project/05137 | 4.0.12 | 4.2.2 | ORPH wlroots | DISTRO | https://release-monitoring.org/project/18357 | 0.16.2 | 0.17.1 | wolftpm | DISTRO | https://release-monitoring.org/project/256219 | 2.7.0 | 3.1.0 | wtfutil | DISTRO | https://release-monitoring.org/project/243189 | 0.41.0 | 0.43.0 | xapian | DISTRO | https://release-monitoring.org/project/15919 | 1.4.19 | 1.4.24 | xapp_bitmap | DISTRO | https://release-monitoring.org/project/00191 | 1.1.0 | 1.1.1 | ORPH xapp_fonttosfnt | DISTRO | https://release-monitoring.org/project/21723 | 1.2.2 | 1.2.3 | ORPH xapp_luit | DISTRO | https://release-monitoring.org/project/15047 | 1.1.1 | 20240102 | ORPH xapp_xbiff | DISTRO | https://release-monitoring.org/project/15034 | 1.0.4 | 1.0.5 | ORPH xapp_xeyes | DISTRO | https://release-monitoring.org/project/15025 | 1.2.0 | 1.3.0 | ORPH xapp_xkbcomp | DISTRO | https://release-monitoring.org/project/15018 | 1.4.6 | 1.4.7 | ORPH xapp_xmore | DISTRO | https://release-monitoring.org/project/18845 | 1.0.3 | 1.0.4 | ORPH xapp_xprop | DISTRO | https://release-monitoring.org/project/14958 | 1.2.6 | 1.2.7 | ORPH xcb-proto | DISTRO | https://release-monitoring.org/project/13646 | 1.15.2 | 1.16.0 | ORPH xdriver_xf86-input-libinput | DISTRO | https://release-monitoring.org/project/05782 | 1.3.0 | 1.4.0 | ORPH xdriver_xf86-video-siliconm... | DISTRO | https://release-monitoring.org/project/05236 | 1.7.9 | 1.7.10 | ORPH xen | DISTRO | https://release-monitoring.org/project/05181 | 4.14.6 | 4.18.0 | xerces | DISTRO | https://release-monitoring.org/project/05182 | 3.2.4 | 3.2.5 | ORPH xfont_font-adobe-utopia-75dpi | DISTRO | https://release-monitoring.org/project/17200 | 1.0.4 | 1.0.5 | ORPH xfont_font-util | DISTRO | https://release-monitoring.org/project/15055 | 1.4.0 | 1.4.1 | ORPH xfsprogs | DISTRO | https://release-monitoring.org/project/05188 | 6.4.0 | 6.5.0 | ORPH xinetd | DISTRO | https://release-monitoring.org/project/06382 | 2.3.15 | 2.3.15.4 | xkeyboard-config | DISTRO | https://release-monitoring.org/project/05191 | 2.38 | 2.41 | ORPH xlib_libXext | DISTRO | https://release-monitoring.org/project/01774 | 1.3.5 | 1.3.6 | ORPH xlib_libXrandr | DISTRO | https://release-monitoring.org/project/01788 | 1.5.3 | 1.5.4 | ORPH xlib_libXvMC | DISTRO | https://release-monitoring.org/project/01796 | 1.0.13 | 1.0.14 | ORPH xlib_libxkbfile | DISTRO | https://release-monitoring.org/project/01781 | 1.1.2 | 1.1.3 | ORPH xorriso | DISTRO | https://release-monitoring.org/project/13270 | 1.5.4.pl02 | 1.5.6.pl02 | xscreensaver | DISTRO | https://release-monitoring.org/project/05269 | 6.03 | 6.08 | xtables-addons | DISTRO | https://release-monitoring.org/project/07736 | 3.24 | 3.25 | ORPH xutil_makedepend | DISTRO | https://release-monitoring.org/project/13528 | 1.0.8 | 1.0.9 | ORPH xz | DISTRO | https://release-monitoring.org/project/05277 | 5.4.5 | 5.4.6 | ORPH yad | DISTRO | https://release-monitoring.org/project/05280 | 0.40.0 | 13.0 | ytree | DISTRO | https://release-monitoring.org/project/05296 | 2.05 | 2.06 | zabbix | DISTRO | https://release-monitoring.org/project/05492 | 6.2.7 | 6.4.11 | zchunk | DISTRO | https://release-monitoring.org/project/178035 | 1.3.2 | 1.4.0 | zeek | DISTRO | https://release-monitoring.org/project/267106 | 4.1.1 | 6.1.1 | zlib-ng | DISTRO | https://release-monitoring.org/project/115592 | 2.1.3 | 2.1.6 | ORPH zxing-cpp | DISTRO | https://release-monitoring.org/project/101246 | 2.1.0 | 2.2.1 | Packages having CVEs ==================== CVEs for the 'master' branch ---------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 asn1c | CVE-2020-23910 | https://security-tracker.debian.org/tracker/CVE-2020-23910 asn1c | CVE-2020-23911 | https://security-tracker.debian.org/tracker/CVE-2020-23911 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 avahi | CVE-2023-38469 | https://security-tracker.debian.org/tracker/CVE-2023-38469 avahi | CVE-2023-38470 | https://security-tracker.debian.org/tracker/CVE-2023-38470 avahi | CVE-2023-38471 | https://security-tracker.debian.org/tracker/CVE-2023-38471 avahi | CVE-2023-38472 | https://security-tracker.debian.org/tracker/CVE-2023-38472 avahi | CVE-2023-38473 | https://security-tracker.debian.org/tracker/CVE-2023-38473 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2023-1972 | https://security-tracker.debian.org/tracker/CVE-2023-1972 binutils | CVE-2023-25584 | https://security-tracker.debian.org/tracker/CVE-2023-25584 binutils | CVE-2023-25585 | https://security-tracker.debian.org/tracker/CVE-2023-25585 binutils | CVE-2023-25586 | https://security-tracker.debian.org/tracker/CVE-2023-25586 binutils | CVE-2023-25588 | https://security-tracker.debian.org/tracker/CVE-2023-25588 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bitcoin | CVE-2023-33297 | https://security-tracker.debian.org/tracker/CVE-2023-33297 bitcoin | CVE-2023-50428 | https://security-tracker.debian.org/tracker/CVE-2023-50428 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2023-42363 | https://security-tracker.debian.org/tracker/CVE-2023-42363 busybox | CVE-2023-42364 | https://security-tracker.debian.org/tracker/CVE-2023-42364 busybox | CVE-2023-42365 | https://security-tracker.debian.org/tracker/CVE-2023-42365 busybox | CVE-2023-42366 | https://security-tracker.debian.org/tracker/CVE-2023-42366 bwm-ng | CVE-2023-26129 | https://security-tracker.debian.org/tracker/CVE-2023-26129 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 composer | CVE-2023-43655 | https://security-tracker.debian.org/tracker/CVE-2023-43655 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2023-50979 | https://security-tracker.debian.org/tracker/CVE-2023-50979 cryptopp | CVE-2023-50980 | https://security-tracker.debian.org/tracker/CVE-2023-50980 cryptopp | CVE-2023-50981 | https://security-tracker.debian.org/tracker/CVE-2023-50981 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 emlog | CVE-2023-43291 | https://security-tracker.debian.org/tracker/CVE-2023-43291 erlang | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-48434 | https://security-tracker.debian.org/tracker/CVE-2022-48434 ffmpeg | CVE-2023-46407 | https://security-tracker.debian.org/tracker/CVE-2023-46407 ffmpeg | CVE-2023-47470 | https://security-tracker.debian.org/tracker/CVE-2023-47470 ffmpeg | CVE-2024-22860 | https://security-tracker.debian.org/tracker/CVE-2024-22860 ffmpeg | CVE-2024-22861 | https://security-tracker.debian.org/tracker/CVE-2024-22861 ffmpeg | CVE-2024-22862 | https://security-tracker.debian.org/tracker/CVE-2024-22862 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 ghostscript | CVE-2023-38559 | https://security-tracker.debian.org/tracker/CVE-2023-38559 ghostscript | CVE-2023-38560 | https://security-tracker.debian.org/tracker/CVE-2023-38560 ghostscript | CVE-2023-46751 | https://security-tracker.debian.org/tracker/CVE-2023-46751 giflib | CVE-2023-48161 | https://security-tracker.debian.org/tracker/CVE-2023-48161 glibc | CVE-2023-0687 | https://security-tracker.debian.org/tracker/CVE-2023-0687 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grpc | CVE-2023-1428 | https://security-tracker.debian.org/tracker/CVE-2023-1428 grpc | CVE-2023-32732 | https://security-tracker.debian.org/tracker/CVE-2023-32732 grpc | CVE-2023-33953 | https://security-tracker.debian.org/tracker/CVE-2023-33953 grpc | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 grpc | CVE-2023-4785 | https://security-tracker.debian.org/tracker/CVE-2023-4785 grub2 | CVE-2023-4001 | https://security-tracker.debian.org/tracker/CVE-2023-4001 grub2 | CVE-2023-4692 | https://security-tracker.debian.org/tracker/CVE-2023-4692 grub2 | CVE-2023-4693 | https://security-tracker.debian.org/tracker/CVE-2023-4693 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-0056 | https://security-tracker.debian.org/tracker/CVE-2023-0056 haproxy | CVE-2023-45539 | https://security-tracker.debian.org/tracker/CVE-2023-45539 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-5118 | https://security-tracker.debian.org/tracker/CVE-2016-5118 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 imagemagick | CVE-2023-5341 | https://security-tracker.debian.org/tracker/CVE-2023-5341 jasper | CVE-2023-51257 | https://security-tracker.debian.org/tracker/CVE-2023-51257 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kvmtool | CVE-2021-45464 | https://security-tracker.debian.org/tracker/CVE-2021-45464 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libcoap | CVE-2024-0962 | https://security-tracker.debian.org/tracker/CVE-2024-0962 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libfreeimage | CVE-2020-21426 | https://security-tracker.debian.org/tracker/CVE-2020-21426 libfreeimage | CVE-2020-21427 | https://security-tracker.debian.org/tracker/CVE-2020-21427 libfreeimage | CVE-2020-21428 | https://security-tracker.debian.org/tracker/CVE-2020-21428 libfreeimage | CVE-2021-33367 | https://security-tracker.debian.org/tracker/CVE-2021-33367 libfreeimage | CVE-2023-47992 | https://security-tracker.debian.org/tracker/CVE-2023-47992 libfreeimage | CVE-2023-47993 | https://security-tracker.debian.org/tracker/CVE-2023-47993 libfreeimage | CVE-2023-47994 | https://security-tracker.debian.org/tracker/CVE-2023-47994 libfreeimage | CVE-2023-47995 | https://security-tracker.debian.org/tracker/CVE-2023-47995 libfreeimage | CVE-2023-47996 | https://security-tracker.debian.org/tracker/CVE-2023-47996 libfreeimage | CVE-2023-47997 | https://security-tracker.debian.org/tracker/CVE-2023-47997 libgtk2 | CVE-2014-1949 | https://security-tracker.debian.org/tracker/CVE-2014-1949 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libkrb5 | CVE-2023-36054 | https://security-tracker.debian.org/tracker/CVE-2023-36054 libkrb5 | CVE-2023-39975 | https://security-tracker.debian.org/tracker/CVE-2023-39975 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2023-6129 | https://security-tracker.debian.org/tracker/CVE-2023-6129 libopenssl | CVE-2024-0727 | https://security-tracker.debian.org/tracker/CVE-2024-0727 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-22628 | https://security-tracker.debian.org/tracker/CVE-2020-22628 libraw | CVE-2023-1729 | https://security-tracker.debian.org/tracker/CVE-2023-1729 libsndfile | CVE-2022-33065 | https://security-tracker.debian.org/tracker/CVE-2022-33065 libtommath | CVE-2023-36328 | https://security-tracker.debian.org/tracker/CVE-2023-36328 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libvirt | CVE-2023-3750 | https://security-tracker.debian.org/tracker/CVE-2023-3750 libzlib | CVE-2023-45853 | https://security-tracker.debian.org/tracker/CVE-2023-45853 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzip | CVE-2023-39741 | https://security-tracker.debian.org/tracker/CVE-2023-39741 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-43666 | https://security-tracker.debian.org/tracker/CVE-2021-43666 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mbedtls | CVE-2023-52353 | https://security-tracker.debian.org/tracker/CVE-2023-52353 mbedtls | CVE-2024-23744 | https://security-tracker.debian.org/tracker/CVE-2024-23744 mdadm | CVE-2023-28736 | https://security-tracker.debian.org/tracker/CVE-2023-28736 mdadm | CVE-2023-28938 | https://security-tracker.debian.org/tracker/CVE-2023-28938 micropython | CVE-2023-7152 | https://security-tracker.debian.org/tracker/CVE-2023-7152 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mp4v2 | CVE-2023-33716 | https://security-tracker.debian.org/tracker/CVE-2023-33716 mp4v2 | CVE-2023-33717 | https://security-tracker.debian.org/tracker/CVE-2023-33717 mp4v2 | CVE-2023-33718 | https://security-tracker.debian.org/tracker/CVE-2023-33718 mp4v2 | CVE-2023-33719 | https://security-tracker.debian.org/tracker/CVE-2023-33719 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netatalk | CVE-2022-22995 | https://security-tracker.debian.org/tracker/CVE-2022-22995 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 nginx | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 ninja | CVE-2021-4336 | https://security-tracker.debian.org/tracker/CVE-2021-4336 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 opencv3 | CVE-2023-2618 | https://security-tracker.debian.org/tracker/CVE-2023-2618 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 openvmtools | CVE-2022-31693 | https://security-tracker.debian.org/tracker/CVE-2022-31693 openvmtools | CVE-2023-20867 | https://security-tracker.debian.org/tracker/CVE-2023-20867 openvmtools | CVE-2023-20900 | https://security-tracker.debian.org/tracker/CVE-2023-20900 openvmtools | CVE-2023-34057 | https://security-tracker.debian.org/tracker/CVE-2023-34057 openvmtools | CVE-2023-34058 | https://security-tracker.debian.org/tracker/CVE-2023-34058 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 oracle-mysql | CVE-2023-21977 | https://security-tracker.debian.org/tracker/CVE-2023-21977 oracle-mysql | CVE-2023-21980 | https://security-tracker.debian.org/tracker/CVE-2023-21980 oracle-mysql | CVE-2023-22007 | https://security-tracker.debian.org/tracker/CVE-2023-22007 oracle-mysql | CVE-2023-22015 | https://security-tracker.debian.org/tracker/CVE-2023-22015 oracle-mysql | CVE-2023-22026 | https://security-tracker.debian.org/tracker/CVE-2023-22026 oracle-mysql | CVE-2023-22028 | https://security-tracker.debian.org/tracker/CVE-2023-22028 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 perl-lwp-protocol-https | CVE-2014-3230 | https://security-tracker.debian.org/tracker/CVE-2014-3230 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php | CVE-2022-4900 | https://security-tracker.debian.org/tracker/CVE-2022-4900 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 proftpd | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 python-cryptography | CVE-2023-49083 | https://security-tracker.debian.org/tracker/CVE-2023-49083 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-pillow | CVE-2023-50447 | https://security-tracker.debian.org/tracker/CVE-2023-50447 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pycryptodomex | CVE-2023-52323 | https://security-tracker.debian.org/tracker/CVE-2023-52323 python-sqlparse | CVE-2023-30608 | https://security-tracker.debian.org/tracker/CVE-2023-30608 python-uvicorn | CVE-2020-7694 | https://security-tracker.debian.org/tracker/CVE-2020-7694 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2023-1386 | https://security-tracker.debian.org/tracker/CVE-2023-1386 qemu | CVE-2023-2680 | https://security-tracker.debian.org/tracker/CVE-2023-2680 qemu | CVE-2023-3019 | https://security-tracker.debian.org/tracker/CVE-2023-3019 qemu | CVE-2023-5088 | https://security-tracker.debian.org/tracker/CVE-2023-5088 qemu | CVE-2023-6683 | https://security-tracker.debian.org/tracker/CVE-2023-6683 qemu | CVE-2023-6693 | https://security-tracker.debian.org/tracker/CVE-2023-6693 qt6base | CVE-2023-32573 | https://security-tracker.debian.org/tracker/CVE-2023-32573 qt6base | CVE-2023-32762 | https://security-tracker.debian.org/tracker/CVE-2023-32762 qt6base | CVE-2023-32763 | https://security-tracker.debian.org/tracker/CVE-2023-32763 qt6base | CVE-2023-33285 | https://security-tracker.debian.org/tracker/CVE-2023-33285 qt6base | CVE-2023-34410 | https://security-tracker.debian.org/tracker/CVE-2023-34410 qt6base | CVE-2023-37369 | https://security-tracker.debian.org/tracker/CVE-2023-37369 qt6base | CVE-2023-38197 | https://security-tracker.debian.org/tracker/CVE-2023-38197 qt6base | CVE-2023-51714 | https://security-tracker.debian.org/tracker/CVE-2023-51714 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 samba4 | CVE-2022-37966 | https://security-tracker.debian.org/tracker/CVE-2022-37966 samba4 | CVE-2022-37967 | https://security-tracker.debian.org/tracker/CVE-2022-37967 samba4 | CVE-2022-38023 | https://security-tracker.debian.org/tracker/CVE-2022-38023 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 shadow | CVE-2013-4235 | https://security-tracker.debian.org/tracker/CVE-2013-4235 shim | CVE-2023-40547 | https://security-tracker.debian.org/tracker/CVE-2023-40547 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 snort | CVE-2023-20246 | https://security-tracker.debian.org/tracker/CVE-2023-20246 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 sysstat | CVE-2023-33204 | https://security-tracker.debian.org/tracker/CVE-2023-33204 tcpreplay | CVE-2023-4256 | https://security-tracker.debian.org/tracker/CVE-2023-4256 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2023-3164 | https://security-tracker.debian.org/tracker/CVE-2023-3164 tiff | CVE-2023-52355 | https://security-tracker.debian.org/tracker/CVE-2023-52355 tiff | CVE-2023-52356 | https://security-tracker.debian.org/tracker/CVE-2023-52356 tiff | CVE-2023-6228 | https://security-tracker.debian.org/tracker/CVE-2023-6228 tiff | CVE-2023-6277 | https://security-tracker.debian.org/tracker/CVE-2023-6277 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 vorbis-tools | CVE-2023-43361 | https://security-tracker.debian.org/tracker/CVE-2023-43361 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-40982 | https://security-tracker.debian.org/tracker/CVE-2022-40982 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xen | CVE-2022-42331 | https://security-tracker.debian.org/tracker/CVE-2022-42331 xen | CVE-2022-42332 | https://security-tracker.debian.org/tracker/CVE-2022-42332 xen | CVE-2022-42333 | https://security-tracker.debian.org/tracker/CVE-2022-42333 xen | CVE-2022-42334 | https://security-tracker.debian.org/tracker/CVE-2022-42334 xen | CVE-2022-4949 | https://security-tracker.debian.org/tracker/CVE-2022-4949 xen | CVE-2023-20588 | https://security-tracker.debian.org/tracker/CVE-2023-20588 xen | CVE-2023-34319 | https://security-tracker.debian.org/tracker/CVE-2023-34319 xen | CVE-2023-34320 | https://security-tracker.debian.org/tracker/CVE-2023-34320 xen | CVE-2023-34321 | https://security-tracker.debian.org/tracker/CVE-2023-34321 xen | CVE-2023-34322 | https://security-tracker.debian.org/tracker/CVE-2023-34322 xen | CVE-2023-34323 | https://security-tracker.debian.org/tracker/CVE-2023-34323 xen | CVE-2023-34324 | https://security-tracker.debian.org/tracker/CVE-2023-34324 xen | CVE-2023-34325 | https://security-tracker.debian.org/tracker/CVE-2023-34325 xen | CVE-2023-34326 | https://security-tracker.debian.org/tracker/CVE-2023-34326 xen | CVE-2023-34327 | https://security-tracker.debian.org/tracker/CVE-2023-34327 xen | CVE-2023-46835 | https://security-tracker.debian.org/tracker/CVE-2023-46835 xen | CVE-2023-46836 | https://security-tracker.debian.org/tracker/CVE-2023-46836 xen | CVE-2023-46837 | https://security-tracker.debian.org/tracker/CVE-2023-46837 xen | CVE-2023-4949 | https://security-tracker.debian.org/tracker/CVE-2023-4949 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 yajl | CVE-2023-33460 | https://security-tracker.debian.org/tracker/CVE-2023-33460 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 yasm | CVE-2023-31972 | https://security-tracker.debian.org/tracker/CVE-2023-31972 yasm | CVE-2023-31973 | https://security-tracker.debian.org/tracker/CVE-2023-31973 yasm | CVE-2023-31974 | https://security-tracker.debian.org/tracker/CVE-2023-31974 yasm | CVE-2023-51258 | https://security-tracker.debian.org/tracker/CVE-2023-51258 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2023.02.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 asn1c | CVE-2020-23910 | https://security-tracker.debian.org/tracker/CVE-2020-23910 asn1c | CVE-2020-23911 | https://security-tracker.debian.org/tracker/CVE-2020-23911 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 avahi | CVE-2023-38469 | https://security-tracker.debian.org/tracker/CVE-2023-38469 avahi | CVE-2023-38470 | https://security-tracker.debian.org/tracker/CVE-2023-38470 avahi | CVE-2023-38471 | https://security-tracker.debian.org/tracker/CVE-2023-38471 avahi | CVE-2023-38472 | https://security-tracker.debian.org/tracker/CVE-2023-38472 avahi | CVE-2023-38473 | https://security-tracker.debian.org/tracker/CVE-2023-38473 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-27607 | https://security-tracker.debian.org/tracker/CVE-2022-27607 bento4 | CVE-2022-35165 | https://security-tracker.debian.org/tracker/CVE-2022-35165 bento4 | CVE-2022-3662 | https://security-tracker.debian.org/tracker/CVE-2022-3662 bento4 | CVE-2022-3663 | https://security-tracker.debian.org/tracker/CVE-2022-3663 bento4 | CVE-2022-3664 | https://security-tracker.debian.org/tracker/CVE-2022-3664 bento4 | CVE-2022-3665 | https://security-tracker.debian.org/tracker/CVE-2022-3665 bento4 | CVE-2022-3666 | https://security-tracker.debian.org/tracker/CVE-2022-3666 bento4 | CVE-2022-3667 | https://security-tracker.debian.org/tracker/CVE-2022-3667 bento4 | CVE-2022-3668 | https://security-tracker.debian.org/tracker/CVE-2022-3668 bento4 | CVE-2022-3669 | https://security-tracker.debian.org/tracker/CVE-2022-3669 bento4 | CVE-2022-3670 | https://security-tracker.debian.org/tracker/CVE-2022-3670 bento4 | CVE-2022-3784 | https://security-tracker.debian.org/tracker/CVE-2022-3784 bento4 | CVE-2022-3785 | https://security-tracker.debian.org/tracker/CVE-2022-3785 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 bento4 | CVE-2022-3809 | https://security-tracker.debian.org/tracker/CVE-2022-3809 bento4 | CVE-2022-3810 | https://security-tracker.debian.org/tracker/CVE-2022-3810 bento4 | CVE-2022-3812 | https://security-tracker.debian.org/tracker/CVE-2022-3812 bento4 | CVE-2022-3813 | https://security-tracker.debian.org/tracker/CVE-2022-3813 bento4 | CVE-2022-3814 | https://security-tracker.debian.org/tracker/CVE-2022-3814 bento4 | CVE-2022-3815 | https://security-tracker.debian.org/tracker/CVE-2022-3815 bento4 | CVE-2022-3816 | https://security-tracker.debian.org/tracker/CVE-2022-3816 bento4 | CVE-2022-3817 | https://security-tracker.debian.org/tracker/CVE-2022-3817 bento4 | CVE-2022-40438 | https://security-tracker.debian.org/tracker/CVE-2022-40438 bento4 | CVE-2022-40439 | https://security-tracker.debian.org/tracker/CVE-2022-40439 bento4 | CVE-2022-40736 | https://security-tracker.debian.org/tracker/CVE-2022-40736 bento4 | CVE-2022-40737 | https://security-tracker.debian.org/tracker/CVE-2022-40737 bento4 | CVE-2022-40738 | https://security-tracker.debian.org/tracker/CVE-2022-40738 bento4 | CVE-2022-40774 | https://security-tracker.debian.org/tracker/CVE-2022-40774 bento4 | CVE-2022-40775 | https://security-tracker.debian.org/tracker/CVE-2022-40775 bento4 | CVE-2022-40885 | https://security-tracker.debian.org/tracker/CVE-2022-40885 bento4 | CVE-2022-41419 | https://security-tracker.debian.org/tracker/CVE-2022-41419 bento4 | CVE-2022-41423 | https://security-tracker.debian.org/tracker/CVE-2022-41423 bento4 | CVE-2022-41424 | https://security-tracker.debian.org/tracker/CVE-2022-41424 bento4 | CVE-2022-41425 | https://security-tracker.debian.org/tracker/CVE-2022-41425 bento4 | CVE-2022-41426 | https://security-tracker.debian.org/tracker/CVE-2022-41426 bento4 | CVE-2022-41427 | https://security-tracker.debian.org/tracker/CVE-2022-41427 bento4 | CVE-2022-41428 | https://security-tracker.debian.org/tracker/CVE-2022-41428 bento4 | CVE-2022-41429 | https://security-tracker.debian.org/tracker/CVE-2022-41429 bento4 | CVE-2022-41430 | https://security-tracker.debian.org/tracker/CVE-2022-41430 bento4 | CVE-2022-41841 | https://security-tracker.debian.org/tracker/CVE-2022-41841 bento4 | CVE-2022-41845 | https://security-tracker.debian.org/tracker/CVE-2022-41845 bento4 | CVE-2022-41846 | https://security-tracker.debian.org/tracker/CVE-2022-41846 bento4 | CVE-2022-41847 | https://security-tracker.debian.org/tracker/CVE-2022-41847 bento4 | CVE-2022-43032 | https://security-tracker.debian.org/tracker/CVE-2022-43032 bento4 | CVE-2022-43033 | https://security-tracker.debian.org/tracker/CVE-2022-43033 bento4 | CVE-2022-43034 | https://security-tracker.debian.org/tracker/CVE-2022-43034 bento4 | CVE-2022-43035 | https://security-tracker.debian.org/tracker/CVE-2022-43035 bento4 | CVE-2022-43037 | https://security-tracker.debian.org/tracker/CVE-2022-43037 bento4 | CVE-2022-43038 | https://security-tracker.debian.org/tracker/CVE-2022-43038 bento4 | CVE-2022-4584 | https://security-tracker.debian.org/tracker/CVE-2022-4584 bento4 | CVE-2023-29573 | https://security-tracker.debian.org/tracker/CVE-2023-29573 bento4 | CVE-2023-29574 | https://security-tracker.debian.org/tracker/CVE-2023-29574 bento4 | CVE-2023-29575 | https://security-tracker.debian.org/tracker/CVE-2023-29575 bento4 | CVE-2023-29576 | https://security-tracker.debian.org/tracker/CVE-2023-29576 bento4 | CVE-2023-38666 | https://security-tracker.debian.org/tracker/CVE-2023-38666 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2022-38533 | https://security-tracker.debian.org/tracker/CVE-2022-38533 binutils | CVE-2022-4285 | https://security-tracker.debian.org/tracker/CVE-2022-4285 binutils | CVE-2022-44840 | https://security-tracker.debian.org/tracker/CVE-2022-44840 binutils | CVE-2022-45703 | https://security-tracker.debian.org/tracker/CVE-2022-45703 binutils | CVE-2022-47007 | https://security-tracker.debian.org/tracker/CVE-2022-47007 binutils | CVE-2022-47008 | https://security-tracker.debian.org/tracker/CVE-2022-47008 binutils | CVE-2022-47010 | https://security-tracker.debian.org/tracker/CVE-2022-47010 binutils | CVE-2022-47011 | https://security-tracker.debian.org/tracker/CVE-2022-47011 binutils | CVE-2022-47673 | https://security-tracker.debian.org/tracker/CVE-2022-47673 binutils | CVE-2022-47695 | https://security-tracker.debian.org/tracker/CVE-2022-47695 binutils | CVE-2022-47696 | https://security-tracker.debian.org/tracker/CVE-2022-47696 binutils | CVE-2022-48063 | https://security-tracker.debian.org/tracker/CVE-2022-48063 binutils | CVE-2022-48064 | https://security-tracker.debian.org/tracker/CVE-2022-48064 binutils | CVE-2022-48065 | https://security-tracker.debian.org/tracker/CVE-2022-48065 binutils | CVE-2023-1972 | https://security-tracker.debian.org/tracker/CVE-2023-1972 binutils | CVE-2023-25584 | https://security-tracker.debian.org/tracker/CVE-2023-25584 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bitcoin | CVE-2023-33297 | https://security-tracker.debian.org/tracker/CVE-2023-33297 bitcoin | CVE-2023-50428 | https://security-tracker.debian.org/tracker/CVE-2023-50428 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2023-42363 | https://security-tracker.debian.org/tracker/CVE-2023-42363 busybox | CVE-2023-42364 | https://security-tracker.debian.org/tracker/CVE-2023-42364 busybox | CVE-2023-42365 | https://security-tracker.debian.org/tracker/CVE-2023-42365 busybox | CVE-2023-42366 | https://security-tracker.debian.org/tracker/CVE-2023-42366 bwm-ng | CVE-2023-26129 | https://security-tracker.debian.org/tracker/CVE-2023-26129 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2021-43398 | https://security-tracker.debian.org/tracker/CVE-2021-43398 cryptopp | CVE-2023-50979 | https://security-tracker.debian.org/tracker/CVE-2023-50979 cryptopp | CVE-2023-50980 | https://security-tracker.debian.org/tracker/CVE-2023-50980 cryptopp | CVE-2023-50981 | https://security-tracker.debian.org/tracker/CVE-2023-50981 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 emlog | CVE-2023-43291 | https://security-tracker.debian.org/tracker/CVE-2023-43291 erlang | CVE-2020-35733 | https://security-tracker.debian.org/tracker/CVE-2020-35733 erlang | CVE-2022-37026 | https://security-tracker.debian.org/tracker/CVE-2022-37026 erlang | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-48434 | https://security-tracker.debian.org/tracker/CVE-2022-48434 ffmpeg | CVE-2023-46407 | https://security-tracker.debian.org/tracker/CVE-2023-46407 ffmpeg | CVE-2023-47470 | https://security-tracker.debian.org/tracker/CVE-2023-47470 ffmpeg | CVE-2024-22860 | https://security-tracker.debian.org/tracker/CVE-2024-22860 ffmpeg | CVE-2024-22861 | https://security-tracker.debian.org/tracker/CVE-2024-22861 ffmpeg | CVE-2024-22862 | https://security-tracker.debian.org/tracker/CVE-2024-22862 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 freerdp | CVE-2024-22211 | https://security-tracker.debian.org/tracker/CVE-2024-22211 ghostscript | CVE-2023-38559 | https://security-tracker.debian.org/tracker/CVE-2023-38559 ghostscript | CVE-2023-38560 | https://security-tracker.debian.org/tracker/CVE-2023-38560 ghostscript | CVE-2023-46751 | https://security-tracker.debian.org/tracker/CVE-2023-46751 giflib | CVE-2023-48161 | https://security-tracker.debian.org/tracker/CVE-2023-48161 glibc | CVE-2023-6246 | https://security-tracker.debian.org/tracker/CVE-2023-6246 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grpc | CVE-2023-1428 | https://security-tracker.debian.org/tracker/CVE-2023-1428 grpc | CVE-2023-32732 | https://security-tracker.debian.org/tracker/CVE-2023-32732 grpc | CVE-2023-33953 | https://security-tracker.debian.org/tracker/CVE-2023-33953 grpc | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 grpc | CVE-2023-4785 | https://security-tracker.debian.org/tracker/CVE-2023-4785 grub2 | CVE-2023-4001 | https://security-tracker.debian.org/tracker/CVE-2023-4001 grub2 | CVE-2023-4692 | https://security-tracker.debian.org/tracker/CVE-2023-4692 grub2 | CVE-2023-4693 | https://security-tracker.debian.org/tracker/CVE-2023-4693 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-0056 | https://security-tracker.debian.org/tracker/CVE-2023-0056 haproxy | CVE-2023-45539 | https://security-tracker.debian.org/tracker/CVE-2023-45539 harfbuzz | CVE-2023-25193 | https://security-tracker.debian.org/tracker/CVE-2023-25193 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-5118 | https://security-tracker.debian.org/tracker/CVE-2016-5118 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 imagemagick | CVE-2023-5341 | https://security-tracker.debian.org/tracker/CVE-2023-5341 jasper | CVE-2023-51257 | https://security-tracker.debian.org/tracker/CVE-2023-51257 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kodi | CVE-2023-23082 | https://security-tracker.debian.org/tracker/CVE-2023-23082 kodi | CVE-2023-30207 | https://security-tracker.debian.org/tracker/CVE-2023-30207 kvmtool | CVE-2021-45464 | https://security-tracker.debian.org/tracker/CVE-2021-45464 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libarchive | CVE-2023-30571 | https://security-tracker.debian.org/tracker/CVE-2023-30571 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libfreeimage | CVE-2020-21426 | https://security-tracker.debian.org/tracker/CVE-2020-21426 libfreeimage | CVE-2020-21427 | https://security-tracker.debian.org/tracker/CVE-2020-21427 libfreeimage | CVE-2020-21428 | https://security-tracker.debian.org/tracker/CVE-2020-21428 libfreeimage | CVE-2021-33367 | https://security-tracker.debian.org/tracker/CVE-2021-33367 libfreeimage | CVE-2023-47992 | https://security-tracker.debian.org/tracker/CVE-2023-47992 libfreeimage | CVE-2023-47993 | https://security-tracker.debian.org/tracker/CVE-2023-47993 libfreeimage | CVE-2023-47994 | https://security-tracker.debian.org/tracker/CVE-2023-47994 libfreeimage | CVE-2023-47995 | https://security-tracker.debian.org/tracker/CVE-2023-47995 libfreeimage | CVE-2023-47996 | https://security-tracker.debian.org/tracker/CVE-2023-47996 libfreeimage | CVE-2023-47997 | https://security-tracker.debian.org/tracker/CVE-2023-47997 libglib2 | CVE-2023-29499 | https://security-tracker.debian.org/tracker/CVE-2023-29499 libglib2 | CVE-2023-32611 | https://security-tracker.debian.org/tracker/CVE-2023-32611 libglib2 | CVE-2023-32636 | https://security-tracker.debian.org/tracker/CVE-2023-32636 libglib2 | CVE-2023-32643 | https://security-tracker.debian.org/tracker/CVE-2023-32643 libglib2 | CVE-2023-32665 | https://security-tracker.debian.org/tracker/CVE-2023-32665 libgtk2 | CVE-2014-1949 | https://security-tracker.debian.org/tracker/CVE-2014-1949 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libkrb5 | CVE-2023-36054 | https://security-tracker.debian.org/tracker/CVE-2023-36054 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmemcached | CVE-2023-27478 | https://security-tracker.debian.org/tracker/CVE-2023-27478 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2023-5678 | https://security-tracker.debian.org/tracker/CVE-2023-5678 libopenssl | CVE-2024-0727 | https://security-tracker.debian.org/tracker/CVE-2024-0727 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-22628 | https://security-tracker.debian.org/tracker/CVE-2020-22628 libraw | CVE-2023-1729 | https://security-tracker.debian.org/tracker/CVE-2023-1729 libsndfile | CVE-2022-33065 | https://security-tracker.debian.org/tracker/CVE-2022-33065 libtommath | CVE-2023-36328 | https://security-tracker.debian.org/tracker/CVE-2023-36328 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libvirt | CVE-2023-3750 | https://security-tracker.debian.org/tracker/CVE-2023-3750 libvpx | CVE-2023-44488 | https://security-tracker.debian.org/tracker/CVE-2023-44488 libzlib | CVE-2023-45853 | https://security-tracker.debian.org/tracker/CVE-2023-45853 linux-pam | CVE-2022-28321 | https://security-tracker.debian.org/tracker/CVE-2022-28321 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzip | CVE-2023-39741 | https://security-tracker.debian.org/tracker/CVE-2023-39741 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-43666 | https://security-tracker.debian.org/tracker/CVE-2021-43666 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mbedtls | CVE-2023-52353 | https://security-tracker.debian.org/tracker/CVE-2023-52353 mbedtls | CVE-2024-23744 | https://security-tracker.debian.org/tracker/CVE-2024-23744 mdadm | CVE-2023-28736 | https://security-tracker.debian.org/tracker/CVE-2023-28736 mdadm | CVE-2023-28938 | https://security-tracker.debian.org/tracker/CVE-2023-28938 micropython | CVE-2023-7152 | https://security-tracker.debian.org/tracker/CVE-2023-7152 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mp4v2 | CVE-2023-33716 | https://security-tracker.debian.org/tracker/CVE-2023-33716 mp4v2 | CVE-2023-33717 | https://security-tracker.debian.org/tracker/CVE-2023-33717 mp4v2 | CVE-2023-33718 | https://security-tracker.debian.org/tracker/CVE-2023-33718 mp4v2 | CVE-2023-33719 | https://security-tracker.debian.org/tracker/CVE-2023-33719 mupdf | CVE-2023-31794 | https://security-tracker.debian.org/tracker/CVE-2023-31794 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 nginx | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 ninja | CVE-2021-4336 | https://security-tracker.debian.org/tracker/CVE-2021-4336 nodejs | CVE-2023-30581 | https://security-tracker.debian.org/tracker/CVE-2023-30581 nodejs | CVE-2023-30585 | https://security-tracker.debian.org/tracker/CVE-2023-30585 nodejs | CVE-2023-30588 | https://security-tracker.debian.org/tracker/CVE-2023-30588 nodejs | CVE-2023-30589 | https://security-tracker.debian.org/tracker/CVE-2023-30589 nodejs | CVE-2023-30590 | https://security-tracker.debian.org/tracker/CVE-2023-30590 nodejs | CVE-2023-32002 | https://security-tracker.debian.org/tracker/CVE-2023-32002 nodejs | CVE-2023-32006 | https://security-tracker.debian.org/tracker/CVE-2023-32006 nodejs | CVE-2023-32559 | https://security-tracker.debian.org/tracker/CVE-2023-32559 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 ntp | CVE-2023-26551 | https://security-tracker.debian.org/tracker/CVE-2023-26551 ntp | CVE-2023-26552 | https://security-tracker.debian.org/tracker/CVE-2023-26552 ntp | CVE-2023-26553 | https://security-tracker.debian.org/tracker/CVE-2023-26553 ntp | CVE-2023-26554 | https://security-tracker.debian.org/tracker/CVE-2023-26554 ntp | CVE-2023-26555 | https://security-tracker.debian.org/tracker/CVE-2023-26555 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 opencv3 | CVE-2023-2618 | https://security-tracker.debian.org/tracker/CVE-2023-2618 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openldap | CVE-2015-3276 | https://security-tracker.debian.org/tracker/CVE-2015-3276 openldap | CVE-2022-29155 | https://security-tracker.debian.org/tracker/CVE-2022-29155 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 openvmtools | CVE-2022-31693 | https://security-tracker.debian.org/tracker/CVE-2022-31693 openvmtools | CVE-2023-20867 | https://security-tracker.debian.org/tracker/CVE-2023-20867 openvmtools | CVE-2023-20900 | https://security-tracker.debian.org/tracker/CVE-2023-20900 openvmtools | CVE-2023-34057 | https://security-tracker.debian.org/tracker/CVE-2023-34057 openvmtools | CVE-2023-34058 | https://security-tracker.debian.org/tracker/CVE-2023-34058 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 oracle-mysql | CVE-2023-21977 | https://security-tracker.debian.org/tracker/CVE-2023-21977 oracle-mysql | CVE-2023-21980 | https://security-tracker.debian.org/tracker/CVE-2023-21980 oracle-mysql | CVE-2023-22007 | https://security-tracker.debian.org/tracker/CVE-2023-22007 oracle-mysql | CVE-2023-22015 | https://security-tracker.debian.org/tracker/CVE-2023-22015 oracle-mysql | CVE-2023-22026 | https://security-tracker.debian.org/tracker/CVE-2023-22026 oracle-mysql | CVE-2023-22028 | https://security-tracker.debian.org/tracker/CVE-2023-22028 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 perl | CVE-2023-31484 | https://security-tracker.debian.org/tracker/CVE-2023-31484 perl | CVE-2023-31486 | https://security-tracker.debian.org/tracker/CVE-2023-31486 perl | CVE-2023-47100 | https://security-tracker.debian.org/tracker/CVE-2023-47100 perl-lwp-protocol-https | CVE-2014-3230 | https://security-tracker.debian.org/tracker/CVE-2014-3230 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php | CVE-2022-4900 | https://security-tracker.debian.org/tracker/CVE-2022-4900 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 proftpd | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 python-cryptography | CVE-2023-49083 | https://security-tracker.debian.org/tracker/CVE-2023-49083 python-flask | CVE-2023-30861 | https://security-tracker.debian.org/tracker/CVE-2023-30861 python-paramiko | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 python-pillow | CVE-2023-44271 | https://security-tracker.debian.org/tracker/CVE-2023-44271 python-pillow | CVE-2023-50447 | https://security-tracker.debian.org/tracker/CVE-2023-50447 python-pip | CVE-2023-5752 | https://security-tracker.debian.org/tracker/CVE-2023-5752 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pycryptodomex | CVE-2023-52323 | https://security-tracker.debian.org/tracker/CVE-2023-52323 python-pygments | CVE-2022-40896 | https://security-tracker.debian.org/tracker/CVE-2022-40896 python-scipy | CVE-2023-25399 | https://security-tracker.debian.org/tracker/CVE-2023-25399 python-sqlparse | CVE-2023-30608 | https://security-tracker.debian.org/tracker/CVE-2023-30608 python-validators | CVE-2023-45813 | https://security-tracker.debian.org/tracker/CVE-2023-45813 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2023-0330 | https://security-tracker.debian.org/tracker/CVE-2023-0330 qemu | CVE-2023-0664 | https://security-tracker.debian.org/tracker/CVE-2023-0664 qemu | CVE-2023-1386 | https://security-tracker.debian.org/tracker/CVE-2023-1386 qemu | CVE-2023-2680 | https://security-tracker.debian.org/tracker/CVE-2023-2680 qemu | CVE-2023-2861 | https://security-tracker.debian.org/tracker/CVE-2023-2861 qemu | CVE-2023-3019 | https://security-tracker.debian.org/tracker/CVE-2023-3019 qemu | CVE-2023-3180 | https://security-tracker.debian.org/tracker/CVE-2023-3180 qemu | CVE-2023-3255 | https://security-tracker.debian.org/tracker/CVE-2023-3255 qemu | CVE-2023-3301 | https://security-tracker.debian.org/tracker/CVE-2023-3301 qemu | CVE-2023-3354 | https://security-tracker.debian.org/tracker/CVE-2023-3354 qemu | CVE-2023-42467 | https://security-tracker.debian.org/tracker/CVE-2023-42467 qemu | CVE-2023-5088 | https://security-tracker.debian.org/tracker/CVE-2023-5088 qemu | CVE-2023-6683 | https://security-tracker.debian.org/tracker/CVE-2023-6683 qemu | CVE-2023-6693 | https://security-tracker.debian.org/tracker/CVE-2023-6693 qt5base | CVE-2011-3193 | https://security-tracker.debian.org/tracker/CVE-2011-3193 qt5base | CVE-2012-6093 | https://security-tracker.debian.org/tracker/CVE-2012-6093 qt5base | CVE-2014-0190 | https://security-tracker.debian.org/tracker/CVE-2014-0190 qt5base | CVE-2015-1290 | https://security-tracker.debian.org/tracker/CVE-2015-1290 qt5base | CVE-2017-10904 | https://security-tracker.debian.org/tracker/CVE-2017-10904 qt5base | CVE-2017-10905 | https://security-tracker.debian.org/tracker/CVE-2017-10905 qt5base | CVE-2018-19869 | https://security-tracker.debian.org/tracker/CVE-2018-19869 qt5base | CVE-2018-19870 | https://security-tracker.debian.org/tracker/CVE-2018-19870 qt5base | CVE-2018-19871 | https://security-tracker.debian.org/tracker/CVE-2018-19871 qt5base | CVE-2018-19873 | https://security-tracker.debian.org/tracker/CVE-2018-19873 qt5base | CVE-2018-21035 | https://security-tracker.debian.org/tracker/CVE-2018-21035 qt5base | CVE-2020-0570 | https://security-tracker.debian.org/tracker/CVE-2020-0570 qt5base | CVE-2020-17507 | https://security-tracker.debian.org/tracker/CVE-2020-17507 qt5base | CVE-2023-32573 | https://security-tracker.debian.org/tracker/CVE-2023-32573 qt5base | CVE-2023-32762 | https://security-tracker.debian.org/tracker/CVE-2023-32762 qt5base | CVE-2023-32763 | https://security-tracker.debian.org/tracker/CVE-2023-32763 qt5base | CVE-2023-34410 | https://security-tracker.debian.org/tracker/CVE-2023-34410 qt5base | CVE-2023-37369 | https://security-tracker.debian.org/tracker/CVE-2023-37369 qt5base | CVE-2023-38197 | https://security-tracker.debian.org/tracker/CVE-2023-38197 qt5base | CVE-2023-43114 | https://security-tracker.debian.org/tracker/CVE-2023-43114 qt5base | CVE-2023-51714 | https://security-tracker.debian.org/tracker/CVE-2023-51714 qt6base | CVE-2023-32573 | https://security-tracker.debian.org/tracker/CVE-2023-32573 qt6base | CVE-2023-32762 | https://security-tracker.debian.org/tracker/CVE-2023-32762 qt6base | CVE-2023-32763 | https://security-tracker.debian.org/tracker/CVE-2023-32763 qt6base | CVE-2023-33285 | https://security-tracker.debian.org/tracker/CVE-2023-33285 qt6base | CVE-2023-34410 | https://security-tracker.debian.org/tracker/CVE-2023-34410 qt6base | CVE-2023-37369 | https://security-tracker.debian.org/tracker/CVE-2023-37369 qt6base | CVE-2023-38197 | https://security-tracker.debian.org/tracker/CVE-2023-38197 qt6base | CVE-2023-51714 | https://security-tracker.debian.org/tracker/CVE-2023-51714 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rust | CVE-2023-40030 | https://security-tracker.debian.org/tracker/CVE-2023-40030 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 samba4 | CVE-2022-37966 | https://security-tracker.debian.org/tracker/CVE-2022-37966 samba4 | CVE-2022-37967 | https://security-tracker.debian.org/tracker/CVE-2022-37967 samba4 | CVE-2022-38023 | https://security-tracker.debian.org/tracker/CVE-2022-38023 samba4 | CVE-2023-5568 | https://security-tracker.debian.org/tracker/CVE-2023-5568 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 shim | CVE-2023-40547 | https://security-tracker.debian.org/tracker/CVE-2023-40547 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 snort | CVE-2023-20246 | https://security-tracker.debian.org/tracker/CVE-2023-20246 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2023-7104 | https://security-tracker.debian.org/tracker/CVE-2023-7104 sqlite | CVE-2024-0232 | https://security-tracker.debian.org/tracker/CVE-2024-0232 stellarium | CVE-2023-28371 | https://security-tracker.debian.org/tracker/CVE-2023-28371 sudo | CVE-2023-27320 | https://security-tracker.debian.org/tracker/CVE-2023-27320 sudo | CVE-2023-42465 | https://security-tracker.debian.org/tracker/CVE-2023-42465 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 sysstat | CVE-2023-33204 | https://security-tracker.debian.org/tracker/CVE-2023-33204 systemd | CVE-2022-4415 | https://security-tracker.debian.org/tracker/CVE-2022-4415 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2023-3164 | https://security-tracker.debian.org/tracker/CVE-2023-3164 tiff | CVE-2023-52355 | https://security-tracker.debian.org/tracker/CVE-2023-52355 tiff | CVE-2023-52356 | https://security-tracker.debian.org/tracker/CVE-2023-52356 tiff | CVE-2023-6228 | https://security-tracker.debian.org/tracker/CVE-2023-6228 tiff | CVE-2023-6277 | https://security-tracker.debian.org/tracker/CVE-2023-6277 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unrar | CVE-2022-48579 | https://security-tracker.debian.org/tracker/CVE-2022-48579 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 vorbis-tools | CVE-2023-43361 | https://security-tracker.debian.org/tracker/CVE-2023-43361 webkitgtk | CVE-2023-39928 | https://security-tracker.debian.org/tracker/CVE-2023-39928 wpewebkit | CVE-2023-40397 | https://security-tracker.debian.org/tracker/CVE-2023-40397 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-40982 | https://security-tracker.debian.org/tracker/CVE-2022-40982 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xen | CVE-2022-42331 | https://security-tracker.debian.org/tracker/CVE-2022-42331 xen | CVE-2022-42332 | https://security-tracker.debian.org/tracker/CVE-2022-42332 xen | CVE-2022-42333 | https://security-tracker.debian.org/tracker/CVE-2022-42333 xen | CVE-2022-42334 | https://security-tracker.debian.org/tracker/CVE-2022-42334 xen | CVE-2022-4949 | https://security-tracker.debian.org/tracker/CVE-2022-4949 xen | CVE-2023-20588 | https://security-tracker.debian.org/tracker/CVE-2023-20588 xen | CVE-2023-34319 | https://security-tracker.debian.org/tracker/CVE-2023-34319 xen | CVE-2023-34320 | https://security-tracker.debian.org/tracker/CVE-2023-34320 xen | CVE-2023-34321 | https://security-tracker.debian.org/tracker/CVE-2023-34321 xen | CVE-2023-34322 | https://security-tracker.debian.org/tracker/CVE-2023-34322 xen | CVE-2023-34323 | https://security-tracker.debian.org/tracker/CVE-2023-34323 xen | CVE-2023-34324 | https://security-tracker.debian.org/tracker/CVE-2023-34324 xen | CVE-2023-34325 | https://security-tracker.debian.org/tracker/CVE-2023-34325 xen | CVE-2023-34326 | https://security-tracker.debian.org/tracker/CVE-2023-34326 xen | CVE-2023-34327 | https://security-tracker.debian.org/tracker/CVE-2023-34327 xen | CVE-2023-46835 | https://security-tracker.debian.org/tracker/CVE-2023-46835 xen | CVE-2023-46836 | https://security-tracker.debian.org/tracker/CVE-2023-46836 xen | CVE-2023-46837 | https://security-tracker.debian.org/tracker/CVE-2023-46837 xen | CVE-2023-4949 | https://security-tracker.debian.org/tracker/CVE-2023-4949 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xwayland | CVE-2023-6816 | https://security-tracker.debian.org/tracker/CVE-2023-6816 xwayland | CVE-2024-0408 | https://security-tracker.debian.org/tracker/CVE-2024-0408 xwayland | CVE-2024-0409 | https://security-tracker.debian.org/tracker/CVE-2024-0409 yajl | CVE-2023-33460 | https://security-tracker.debian.org/tracker/CVE-2023-33460 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 yasm | CVE-2023-30402 | https://security-tracker.debian.org/tracker/CVE-2023-30402 yasm | CVE-2023-31972 | https://security-tracker.debian.org/tracker/CVE-2023-31972 yasm | CVE-2023-31973 | https://security-tracker.debian.org/tracker/CVE-2023-31973 yasm | CVE-2023-31974 | https://security-tracker.debian.org/tracker/CVE-2023-31974 yasm | CVE-2023-31975 | https://security-tracker.debian.org/tracker/CVE-2023-31975 yasm | CVE-2023-51258 | https://security-tracker.debian.org/tracker/CVE-2023-51258 zbar | CVE-2023-40889 | https://security-tracker.debian.org/tracker/CVE-2023-40889 zbar | CVE-2023-40890 | https://security-tracker.debian.org/tracker/CVE-2023-40890 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 CVEs for the '2023.11.x' branch ------------------------------- name | CVE | link -------------------------------+------------------+-------------------------------------------------------------- apache | CVE-1999-0236 | https://security-tracker.debian.org/tracker/CVE-1999-0236 apache | CVE-1999-0289 | https://security-tracker.debian.org/tracker/CVE-1999-0289 apache | CVE-1999-0678 | https://security-tracker.debian.org/tracker/CVE-1999-0678 apache | CVE-1999-1237 | https://security-tracker.debian.org/tracker/CVE-1999-1237 apache | CVE-1999-1412 | https://security-tracker.debian.org/tracker/CVE-1999-1412 apache | CVE-2007-0086 | https://security-tracker.debian.org/tracker/CVE-2007-0086 apache | CVE-2007-0450 | https://security-tracker.debian.org/tracker/CVE-2007-0450 apache | CVE-2007-6420 | https://security-tracker.debian.org/tracker/CVE-2007-6420 apache | CVE-2007-6421 | https://security-tracker.debian.org/tracker/CVE-2007-6421 apache | CVE-2007-6422 | https://security-tracker.debian.org/tracker/CVE-2007-6422 apache | CVE-2007-6423 | https://security-tracker.debian.org/tracker/CVE-2007-6423 apache | CVE-2008-2168 | https://security-tracker.debian.org/tracker/CVE-2008-2168 apache | CVE-2009-1195 | https://security-tracker.debian.org/tracker/CVE-2009-1195 apache | CVE-2010-0425 | https://security-tracker.debian.org/tracker/CVE-2010-0425 apparmor | CVE-2016-1585 | https://security-tracker.debian.org/tracker/CVE-2016-1585 argus | CVE-2011-3332 | https://security-tracker.debian.org/tracker/CVE-2011-3332 asn1c | CVE-2017-12966 | https://security-tracker.debian.org/tracker/CVE-2017-12966 asn1c | CVE-2020-23910 | https://security-tracker.debian.org/tracker/CVE-2020-23910 asn1c | CVE-2020-23911 | https://security-tracker.debian.org/tracker/CVE-2020-23911 assimp | CVE-2022-38528 | https://security-tracker.debian.org/tracker/CVE-2022-38528 atop | CVE-2011-3618 | https://security-tracker.debian.org/tracker/CVE-2011-3618 avahi | CVE-2021-3468 | https://security-tracker.debian.org/tracker/CVE-2021-3468 avahi | CVE-2023-38469 | https://security-tracker.debian.org/tracker/CVE-2023-38469 avahi | CVE-2023-38470 | https://security-tracker.debian.org/tracker/CVE-2023-38470 avahi | CVE-2023-38471 | https://security-tracker.debian.org/tracker/CVE-2023-38471 avahi | CVE-2023-38472 | https://security-tracker.debian.org/tracker/CVE-2023-38472 avahi | CVE-2023-38473 | https://security-tracker.debian.org/tracker/CVE-2023-38473 belle-sip | CVE-2021-33056 | https://security-tracker.debian.org/tracker/CVE-2021-33056 belle-sip | CVE-2021-43610 | https://security-tracker.debian.org/tracker/CVE-2021-43610 belle-sip | CVE-2021-43611 | https://security-tracker.debian.org/tracker/CVE-2021-43611 bento4 | CVE-2020-23331 | https://security-tracker.debian.org/tracker/CVE-2020-23331 bento4 | CVE-2020-23332 | https://security-tracker.debian.org/tracker/CVE-2020-23332 bento4 | CVE-2022-3807 | https://security-tracker.debian.org/tracker/CVE-2022-3807 berkeleydb | CVE-2017-3604 | https://security-tracker.debian.org/tracker/CVE-2017-3604 berkeleydb | CVE-2017-3605 | https://security-tracker.debian.org/tracker/CVE-2017-3605 berkeleydb | CVE-2017-3606 | https://security-tracker.debian.org/tracker/CVE-2017-3606 berkeleydb | CVE-2017-3607 | https://security-tracker.debian.org/tracker/CVE-2017-3607 berkeleydb | CVE-2017-3608 | https://security-tracker.debian.org/tracker/CVE-2017-3608 berkeleydb | CVE-2017-3609 | https://security-tracker.debian.org/tracker/CVE-2017-3609 berkeleydb | CVE-2017-3610 | https://security-tracker.debian.org/tracker/CVE-2017-3610 berkeleydb | CVE-2017-3611 | https://security-tracker.debian.org/tracker/CVE-2017-3611 berkeleydb | CVE-2017-3612 | https://security-tracker.debian.org/tracker/CVE-2017-3612 berkeleydb | CVE-2017-3613 | https://security-tracker.debian.org/tracker/CVE-2017-3613 berkeleydb | CVE-2017-3614 | https://security-tracker.debian.org/tracker/CVE-2017-3614 berkeleydb | CVE-2017-3615 | https://security-tracker.debian.org/tracker/CVE-2017-3615 berkeleydb | CVE-2017-3616 | https://security-tracker.debian.org/tracker/CVE-2017-3616 berkeleydb | CVE-2017-3617 | https://security-tracker.debian.org/tracker/CVE-2017-3617 berkeleydb | CVE-2019-2708 | https://security-tracker.debian.org/tracker/CVE-2019-2708 berkeleydb | CVE-2020-2981 | https://security-tracker.debian.org/tracker/CVE-2020-2981 binutils | CVE-2023-1972 | https://security-tracker.debian.org/tracker/CVE-2023-1972 binutils | CVE-2023-25584 | https://security-tracker.debian.org/tracker/CVE-2023-25584 binutils | CVE-2023-25585 | https://security-tracker.debian.org/tracker/CVE-2023-25585 binutils | CVE-2023-25586 | https://security-tracker.debian.org/tracker/CVE-2023-25586 binutils | CVE-2023-25588 | https://security-tracker.debian.org/tracker/CVE-2023-25588 bitcoin | CVE-2012-1909 | https://security-tracker.debian.org/tracker/CVE-2012-1909 bitcoin | CVE-2012-4682 | https://security-tracker.debian.org/tracker/CVE-2012-4682 bitcoin | CVE-2012-4683 | https://security-tracker.debian.org/tracker/CVE-2012-4683 bitcoin | CVE-2013-2272 | https://security-tracker.debian.org/tracker/CVE-2013-2272 bitcoin | CVE-2013-2273 | https://security-tracker.debian.org/tracker/CVE-2013-2273 bitcoin | CVE-2013-2292 | https://security-tracker.debian.org/tracker/CVE-2013-2292 bitcoin | CVE-2013-2293 | https://security-tracker.debian.org/tracker/CVE-2013-2293 bitcoin | CVE-2013-3220 | https://security-tracker.debian.org/tracker/CVE-2013-3220 bitcoin | CVE-2023-33297 | https://security-tracker.debian.org/tracker/CVE-2023-33297 bitcoin | CVE-2023-50428 | https://security-tracker.debian.org/tracker/CVE-2023-50428 bluez5_utils | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bluez5_utils-headers | CVE-2020-24490 | https://security-tracker.debian.org/tracker/CVE-2020-24490 bsdiff | CVE-2020-14315 | https://security-tracker.debian.org/tracker/CVE-2020-14315 busybox | CVE-2023-42363 | https://security-tracker.debian.org/tracker/CVE-2023-42363 busybox | CVE-2023-42364 | https://security-tracker.debian.org/tracker/CVE-2023-42364 busybox | CVE-2023-42365 | https://security-tracker.debian.org/tracker/CVE-2023-42365 busybox | CVE-2023-42366 | https://security-tracker.debian.org/tracker/CVE-2023-42366 bwm-ng | CVE-2023-26129 | https://security-tracker.debian.org/tracker/CVE-2023-26129 cairo | CVE-2019-6461 | https://security-tracker.debian.org/tracker/CVE-2019-6461 composer | CVE-2023-43655 | https://security-tracker.debian.org/tracker/CVE-2023-43655 coreutils | CVE-2016-2781 | https://security-tracker.debian.org/tracker/CVE-2016-2781 cpio | CVE-2010-4226 | https://security-tracker.debian.org/tracker/CVE-2010-4226 cryptopp | CVE-2023-50979 | https://security-tracker.debian.org/tracker/CVE-2023-50979 cryptopp | CVE-2023-50980 | https://security-tracker.debian.org/tracker/CVE-2023-50980 cryptopp | CVE-2023-50981 | https://security-tracker.debian.org/tracker/CVE-2023-50981 cvs | CVE-2017-12836 | https://security-tracker.debian.org/tracker/CVE-2017-12836 dht | CVE-2020-36562 | https://security-tracker.debian.org/tracker/CVE-2020-36562 docker | CVE-2014-0048 | https://security-tracker.debian.org/tracker/CVE-2014-0048 docker | CVE-2014-8178 | https://security-tracker.debian.org/tracker/CVE-2014-8178 docker | CVE-2014-8179 | https://security-tracker.debian.org/tracker/CVE-2014-8179 docker | CVE-2015-1843 | https://security-tracker.debian.org/tracker/CVE-2015-1843 docker | CVE-2015-3627 | https://security-tracker.debian.org/tracker/CVE-2015-3627 docker | CVE-2015-3630 | https://security-tracker.debian.org/tracker/CVE-2015-3630 docker | CVE-2015-3631 | https://security-tracker.debian.org/tracker/CVE-2015-3631 docker | CVE-2016-3697 | https://security-tracker.debian.org/tracker/CVE-2016-3697 docker | CVE-2017-14992 | https://security-tracker.debian.org/tracker/CVE-2017-14992 docker | CVE-2019-13139 | https://security-tracker.debian.org/tracker/CVE-2019-13139 docker | CVE-2019-13509 | https://security-tracker.debian.org/tracker/CVE-2019-13509 docker | CVE-2019-15752 | https://security-tracker.debian.org/tracker/CVE-2019-15752 docker | CVE-2019-16884 | https://security-tracker.debian.org/tracker/CVE-2019-16884 docker | CVE-2019-5736 | https://security-tracker.debian.org/tracker/CVE-2019-5736 docker | CVE-2020-27534 | https://security-tracker.debian.org/tracker/CVE-2020-27534 docker | CVE-2021-21284 | https://security-tracker.debian.org/tracker/CVE-2021-21284 docker | CVE-2021-21285 | https://security-tracker.debian.org/tracker/CVE-2021-21285 docker | CVE-2021-3162 | https://security-tracker.debian.org/tracker/CVE-2021-3162 docker | CVE-2021-33183 | https://security-tracker.debian.org/tracker/CVE-2021-33183 docker | CVE-2022-25365 | https://security-tracker.debian.org/tracker/CVE-2022-25365 dracut | CVE-2010-4176 | https://security-tracker.debian.org/tracker/CVE-2010-4176 edk2 | CVE-2014-4859 | https://security-tracker.debian.org/tracker/CVE-2014-4859 edk2 | CVE-2014-4860 | https://security-tracker.debian.org/tracker/CVE-2014-4860 edk2 | CVE-2014-8271 | https://security-tracker.debian.org/tracker/CVE-2014-8271 edk2 | CVE-2019-14553 | https://security-tracker.debian.org/tracker/CVE-2019-14553 edk2 | CVE-2019-14559 | https://security-tracker.debian.org/tracker/CVE-2019-14559 edk2 | CVE-2019-14562 | https://security-tracker.debian.org/tracker/CVE-2019-14562 edk2 | CVE-2019-14563 | https://security-tracker.debian.org/tracker/CVE-2019-14563 edk2 | CVE-2019-14575 | https://security-tracker.debian.org/tracker/CVE-2019-14575 edk2 | CVE-2019-14586 | https://security-tracker.debian.org/tracker/CVE-2019-14586 edk2 | CVE-2019-14587 | https://security-tracker.debian.org/tracker/CVE-2019-14587 emlog | CVE-2021-44584 | https://security-tracker.debian.org/tracker/CVE-2021-44584 emlog | CVE-2022-1526 | https://security-tracker.debian.org/tracker/CVE-2022-1526 emlog | CVE-2022-3968 | https://security-tracker.debian.org/tracker/CVE-2022-3968 emlog | CVE-2023-43291 | https://security-tracker.debian.org/tracker/CVE-2023-43291 erlang | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 exiv2 | CVE-2007-6353 | https://security-tracker.debian.org/tracker/CVE-2007-6353 ffmpeg | CVE-2022-3109 | https://security-tracker.debian.org/tracker/CVE-2022-3109 ffmpeg | CVE-2022-3341 | https://security-tracker.debian.org/tracker/CVE-2022-3341 ffmpeg | CVE-2022-48434 | https://security-tracker.debian.org/tracker/CVE-2022-48434 ffmpeg | CVE-2023-46407 | https://security-tracker.debian.org/tracker/CVE-2023-46407 ffmpeg | CVE-2023-47470 | https://security-tracker.debian.org/tracker/CVE-2023-47470 ffmpeg | CVE-2024-22860 | https://security-tracker.debian.org/tracker/CVE-2024-22860 ffmpeg | CVE-2024-22861 | https://security-tracker.debian.org/tracker/CVE-2024-22861 ffmpeg | CVE-2024-22862 | https://security-tracker.debian.org/tracker/CVE-2024-22862 freeradius-server | CVE-2002-0318 | https://security-tracker.debian.org/tracker/CVE-2002-0318 freeradius-server | CVE-2011-4966 | https://security-tracker.debian.org/tracker/CVE-2011-4966 freerdp | CVE-2024-22211 | https://security-tracker.debian.org/tracker/CVE-2024-22211 ghostscript | CVE-2023-38559 | https://security-tracker.debian.org/tracker/CVE-2023-38559 ghostscript | CVE-2023-38560 | https://security-tracker.debian.org/tracker/CVE-2023-38560 ghostscript | CVE-2023-46751 | https://security-tracker.debian.org/tracker/CVE-2023-46751 giflib | CVE-2023-48161 | https://security-tracker.debian.org/tracker/CVE-2023-48161 glibc | CVE-2023-0687 | https://security-tracker.debian.org/tracker/CVE-2023-0687 glibc | CVE-2023-6246 | https://security-tracker.debian.org/tracker/CVE-2023-6246 gnupg | CVE-2006-3082 | https://security-tracker.debian.org/tracker/CVE-2006-3082 gnupg | CVE-2011-2207 | https://security-tracker.debian.org/tracker/CVE-2011-2207 gnupg | CVE-2015-1606 | https://security-tracker.debian.org/tracker/CVE-2015-1606 gnupg | CVE-2018-12020 | https://security-tracker.debian.org/tracker/CVE-2018-12020 gnupg | CVE-2019-13050 | https://security-tracker.debian.org/tracker/CVE-2019-13050 gnupg | CVE-2019-14855 | https://security-tracker.debian.org/tracker/CVE-2019-14855 gnupg | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 gnupg | CVE-2022-34903 | https://security-tracker.debian.org/tracker/CVE-2022-34903 gnupg2 | CVE-2022-3219 | https://security-tracker.debian.org/tracker/CVE-2022-3219 graphicsmagick | CVE-2007-0770 | https://security-tracker.debian.org/tracker/CVE-2007-0770 graphicsmagick | CVE-2008-6621 | https://security-tracker.debian.org/tracker/CVE-2008-6621 graphite2 | CVE-2017-5436 | https://security-tracker.debian.org/tracker/CVE-2017-5436 grpc | CVE-2023-1428 | https://security-tracker.debian.org/tracker/CVE-2023-1428 grpc | CVE-2023-32732 | https://security-tracker.debian.org/tracker/CVE-2023-32732 grpc | CVE-2023-33953 | https://security-tracker.debian.org/tracker/CVE-2023-33953 grpc | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 grpc | CVE-2023-4785 | https://security-tracker.debian.org/tracker/CVE-2023-4785 grub2 | CVE-2023-4001 | https://security-tracker.debian.org/tracker/CVE-2023-4001 grub2 | CVE-2023-4692 | https://security-tracker.debian.org/tracker/CVE-2023-4692 grub2 | CVE-2023-4693 | https://security-tracker.debian.org/tracker/CVE-2023-4693 haproxy | CVE-2016-2102 | https://security-tracker.debian.org/tracker/CVE-2016-2102 haproxy | CVE-2023-0056 | https://security-tracker.debian.org/tracker/CVE-2023-0056 haproxy | CVE-2023-45539 | https://security-tracker.debian.org/tracker/CVE-2023-45539 imagemagick | CVE-2007-1667 | https://security-tracker.debian.org/tracker/CVE-2007-1667 imagemagick | CVE-2014-9804 | https://security-tracker.debian.org/tracker/CVE-2014-9804 imagemagick | CVE-2014-9805 | https://security-tracker.debian.org/tracker/CVE-2014-9805 imagemagick | CVE-2014-9806 | https://security-tracker.debian.org/tracker/CVE-2014-9806 imagemagick | CVE-2014-9807 | https://security-tracker.debian.org/tracker/CVE-2014-9807 imagemagick | CVE-2014-9808 | https://security-tracker.debian.org/tracker/CVE-2014-9808 imagemagick | CVE-2014-9809 | https://security-tracker.debian.org/tracker/CVE-2014-9809 imagemagick | CVE-2014-9810 | https://security-tracker.debian.org/tracker/CVE-2014-9810 imagemagick | CVE-2014-9811 | https://security-tracker.debian.org/tracker/CVE-2014-9811 imagemagick | CVE-2014-9812 | https://security-tracker.debian.org/tracker/CVE-2014-9812 imagemagick | CVE-2014-9813 | https://security-tracker.debian.org/tracker/CVE-2014-9813 imagemagick | CVE-2014-9814 | https://security-tracker.debian.org/tracker/CVE-2014-9814 imagemagick | CVE-2014-9815 | https://security-tracker.debian.org/tracker/CVE-2014-9815 imagemagick | CVE-2014-9816 | https://security-tracker.debian.org/tracker/CVE-2014-9816 imagemagick | CVE-2014-9817 | https://security-tracker.debian.org/tracker/CVE-2014-9817 imagemagick | CVE-2014-9818 | https://security-tracker.debian.org/tracker/CVE-2014-9818 imagemagick | CVE-2014-9819 | https://security-tracker.debian.org/tracker/CVE-2014-9819 imagemagick | CVE-2014-9820 | https://security-tracker.debian.org/tracker/CVE-2014-9820 imagemagick | CVE-2014-9821 | https://security-tracker.debian.org/tracker/CVE-2014-9821 imagemagick | CVE-2014-9822 | https://security-tracker.debian.org/tracker/CVE-2014-9822 imagemagick | CVE-2014-9823 | https://security-tracker.debian.org/tracker/CVE-2014-9823 imagemagick | CVE-2014-9824 | https://security-tracker.debian.org/tracker/CVE-2014-9824 imagemagick | CVE-2014-9825 | https://security-tracker.debian.org/tracker/CVE-2014-9825 imagemagick | CVE-2014-9826 | https://security-tracker.debian.org/tracker/CVE-2014-9826 imagemagick | CVE-2014-9827 | https://security-tracker.debian.org/tracker/CVE-2014-9827 imagemagick | CVE-2014-9828 | https://security-tracker.debian.org/tracker/CVE-2014-9828 imagemagick | CVE-2014-9829 | https://security-tracker.debian.org/tracker/CVE-2014-9829 imagemagick | CVE-2014-9830 | https://security-tracker.debian.org/tracker/CVE-2014-9830 imagemagick | CVE-2014-9831 | https://security-tracker.debian.org/tracker/CVE-2014-9831 imagemagick | CVE-2014-9848 | https://security-tracker.debian.org/tracker/CVE-2014-9848 imagemagick | CVE-2014-9852 | https://security-tracker.debian.org/tracker/CVE-2014-9852 imagemagick | CVE-2014-9853 | https://security-tracker.debian.org/tracker/CVE-2014-9853 imagemagick | CVE-2014-9854 | https://security-tracker.debian.org/tracker/CVE-2014-9854 imagemagick | CVE-2014-9907 | https://security-tracker.debian.org/tracker/CVE-2014-9907 imagemagick | CVE-2016-10062 | https://security-tracker.debian.org/tracker/CVE-2016-10062 imagemagick | CVE-2016-10144 | https://security-tracker.debian.org/tracker/CVE-2016-10144 imagemagick | CVE-2016-10145 | https://security-tracker.debian.org/tracker/CVE-2016-10145 imagemagick | CVE-2016-10146 | https://security-tracker.debian.org/tracker/CVE-2016-10146 imagemagick | CVE-2016-5118 | https://security-tracker.debian.org/tracker/CVE-2016-5118 imagemagick | CVE-2016-7513 | https://security-tracker.debian.org/tracker/CVE-2016-7513 imagemagick | CVE-2016-7514 | https://security-tracker.debian.org/tracker/CVE-2016-7514 imagemagick | CVE-2016-7515 | https://security-tracker.debian.org/tracker/CVE-2016-7515 imagemagick | CVE-2016-7516 | https://security-tracker.debian.org/tracker/CVE-2016-7516 imagemagick | CVE-2016-7517 | https://security-tracker.debian.org/tracker/CVE-2016-7517 imagemagick | CVE-2016-7518 | https://security-tracker.debian.org/tracker/CVE-2016-7518 imagemagick | CVE-2016-7519 | https://security-tracker.debian.org/tracker/CVE-2016-7519 imagemagick | CVE-2016-7520 | https://security-tracker.debian.org/tracker/CVE-2016-7520 imagemagick | CVE-2016-7521 | https://security-tracker.debian.org/tracker/CVE-2016-7521 imagemagick | CVE-2016-7522 | https://security-tracker.debian.org/tracker/CVE-2016-7522 imagemagick | CVE-2016-7523 | https://security-tracker.debian.org/tracker/CVE-2016-7523 imagemagick | CVE-2016-7524 | https://security-tracker.debian.org/tracker/CVE-2016-7524 imagemagick | CVE-2016-7525 | https://security-tracker.debian.org/tracker/CVE-2016-7525 imagemagick | CVE-2016-7526 | https://security-tracker.debian.org/tracker/CVE-2016-7526 imagemagick | CVE-2016-7527 | https://security-tracker.debian.org/tracker/CVE-2016-7527 imagemagick | CVE-2016-7528 | https://security-tracker.debian.org/tracker/CVE-2016-7528 imagemagick | CVE-2016-7529 | https://security-tracker.debian.org/tracker/CVE-2016-7529 imagemagick | CVE-2016-7530 | https://security-tracker.debian.org/tracker/CVE-2016-7530 imagemagick | CVE-2016-7531 | https://security-tracker.debian.org/tracker/CVE-2016-7531 imagemagick | CVE-2016-7532 | https://security-tracker.debian.org/tracker/CVE-2016-7532 imagemagick | CVE-2016-7533 | https://security-tracker.debian.org/tracker/CVE-2016-7533 imagemagick | CVE-2016-7534 | https://security-tracker.debian.org/tracker/CVE-2016-7534 imagemagick | CVE-2016-7535 | https://security-tracker.debian.org/tracker/CVE-2016-7535 imagemagick | CVE-2016-7536 | https://security-tracker.debian.org/tracker/CVE-2016-7536 imagemagick | CVE-2016-7537 | https://security-tracker.debian.org/tracker/CVE-2016-7537 imagemagick | CVE-2016-7538 | https://security-tracker.debian.org/tracker/CVE-2016-7538 imagemagick | CVE-2017-5506 | https://security-tracker.debian.org/tracker/CVE-2017-5506 imagemagick | CVE-2017-5509 | https://security-tracker.debian.org/tracker/CVE-2017-5509 imagemagick | CVE-2017-5510 | https://security-tracker.debian.org/tracker/CVE-2017-5510 imagemagick | CVE-2017-5511 | https://security-tracker.debian.org/tracker/CVE-2017-5511 imagemagick | CVE-2023-5341 | https://security-tracker.debian.org/tracker/CVE-2023-5341 jasper | CVE-2023-51257 | https://security-tracker.debian.org/tracker/CVE-2023-51257 jquery | CVE-2007-2379 | https://security-tracker.debian.org/tracker/CVE-2007-2379 kvmtool | CVE-2021-45464 | https://security-tracker.debian.org/tracker/CVE-2021-45464 libao | CVE-2017-11548 | https://security-tracker.debian.org/tracker/CVE-2017-11548 libcoap | CVE-2024-0962 | https://security-tracker.debian.org/tracker/CVE-2024-0962 libfreeimage | CVE-2019-12211 | https://security-tracker.debian.org/tracker/CVE-2019-12211 libfreeimage | CVE-2019-12212 | https://security-tracker.debian.org/tracker/CVE-2019-12212 libfreeimage | CVE-2019-12213 | https://security-tracker.debian.org/tracker/CVE-2019-12213 libfreeimage | CVE-2019-12214 | https://security-tracker.debian.org/tracker/CVE-2019-12214 libfreeimage | CVE-2020-21426 | https://security-tracker.debian.org/tracker/CVE-2020-21426 libfreeimage | CVE-2020-21427 | https://security-tracker.debian.org/tracker/CVE-2020-21427 libfreeimage | CVE-2020-21428 | https://security-tracker.debian.org/tracker/CVE-2020-21428 libfreeimage | CVE-2021-33367 | https://security-tracker.debian.org/tracker/CVE-2021-33367 libfreeimage | CVE-2023-47992 | https://security-tracker.debian.org/tracker/CVE-2023-47992 libfreeimage | CVE-2023-47993 | https://security-tracker.debian.org/tracker/CVE-2023-47993 libfreeimage | CVE-2023-47994 | https://security-tracker.debian.org/tracker/CVE-2023-47994 libfreeimage | CVE-2023-47995 | https://security-tracker.debian.org/tracker/CVE-2023-47995 libfreeimage | CVE-2023-47996 | https://security-tracker.debian.org/tracker/CVE-2023-47996 libfreeimage | CVE-2023-47997 | https://security-tracker.debian.org/tracker/CVE-2023-47997 libgtk2 | CVE-2014-1949 | https://security-tracker.debian.org/tracker/CVE-2014-1949 libiberty | CVE-2012-3509 | https://security-tracker.debian.org/tracker/CVE-2012-3509 libiberty | CVE-2016-2226 | https://security-tracker.debian.org/tracker/CVE-2016-2226 libiberty | CVE-2016-4487 | https://security-tracker.debian.org/tracker/CVE-2016-4487 libiberty | CVE-2016-4488 | https://security-tracker.debian.org/tracker/CVE-2016-4488 libiberty | CVE-2016-4489 | https://security-tracker.debian.org/tracker/CVE-2016-4489 libiberty | CVE-2016-4490 | https://security-tracker.debian.org/tracker/CVE-2016-4490 libiberty | CVE-2016-4491 | https://security-tracker.debian.org/tracker/CVE-2016-4491 libiberty | CVE-2016-4492 | https://security-tracker.debian.org/tracker/CVE-2016-4492 libiberty | CVE-2016-4493 | https://security-tracker.debian.org/tracker/CVE-2016-4493 libiberty | CVE-2016-6131 | https://security-tracker.debian.org/tracker/CVE-2016-6131 libkrb5 | CVE-1999-0143 | https://security-tracker.debian.org/tracker/CVE-1999-0143 libkrb5 | CVE-1999-0713 | https://security-tracker.debian.org/tracker/CVE-1999-0713 libkrb5 | CVE-2007-3149 | https://security-tracker.debian.org/tracker/CVE-2007-3149 libkrb5 | CVE-2007-5894 | https://security-tracker.debian.org/tracker/CVE-2007-5894 libkrb5 | CVE-2007-5902 | https://security-tracker.debian.org/tracker/CVE-2007-5902 libkrb5 | CVE-2009-0844 | https://security-tracker.debian.org/tracker/CVE-2009-0844 libkrb5 | CVE-2009-0846 | https://security-tracker.debian.org/tracker/CVE-2009-0846 libkrb5 | CVE-2023-36054 | https://security-tracker.debian.org/tracker/CVE-2023-36054 libkrb5 | CVE-2023-39975 | https://security-tracker.debian.org/tracker/CVE-2023-39975 libmad | CVE-2018-7263 | https://security-tracker.debian.org/tracker/CVE-2018-7263 libmpeg2 | CVE-2022-37416 | https://security-tracker.debian.org/tracker/CVE-2022-37416 libopenssl | CVE-2023-5678 | https://security-tracker.debian.org/tracker/CVE-2023-5678 libopenssl | CVE-2023-6129 | https://security-tracker.debian.org/tracker/CVE-2023-6129 libopenssl | CVE-2024-0727 | https://security-tracker.debian.org/tracker/CVE-2024-0727 libplist | CVE-2017-5834 | https://security-tracker.debian.org/tracker/CVE-2017-5834 libplist | CVE-2017-5835 | https://security-tracker.debian.org/tracker/CVE-2017-5835 libplist | CVE-2017-5836 | https://security-tracker.debian.org/tracker/CVE-2017-5836 libraw | CVE-2020-22628 | https://security-tracker.debian.org/tracker/CVE-2020-22628 libraw | CVE-2023-1729 | https://security-tracker.debian.org/tracker/CVE-2023-1729 libsndfile | CVE-2022-33065 | https://security-tracker.debian.org/tracker/CVE-2022-33065 libtommath | CVE-2023-36328 | https://security-tracker.debian.org/tracker/CVE-2023-36328 libtorrent | CVE-2009-1760 | https://security-tracker.debian.org/tracker/CVE-2009-1760 libtorrent | CVE-2016-5301 | https://security-tracker.debian.org/tracker/CVE-2016-5301 libvirt | CVE-2014-8135 | https://security-tracker.debian.org/tracker/CVE-2014-8135 libvirt | CVE-2014-8136 | https://security-tracker.debian.org/tracker/CVE-2014-8136 libvirt | CVE-2015-5313 | https://security-tracker.debian.org/tracker/CVE-2015-5313 libvirt | CVE-2018-5748 | https://security-tracker.debian.org/tracker/CVE-2018-5748 libvirt | CVE-2018-6764 | https://security-tracker.debian.org/tracker/CVE-2018-6764 libvirt | CVE-2023-3750 | https://security-tracker.debian.org/tracker/CVE-2023-3750 libzlib | CVE-2023-45853 | https://security-tracker.debian.org/tracker/CVE-2023-45853 lrzip | CVE-2022-33067 | https://security-tracker.debian.org/tracker/CVE-2022-33067 lrzip | CVE-2023-39741 | https://security-tracker.debian.org/tracker/CVE-2023-39741 lrzsz | CVE-2018-10195 | https://security-tracker.debian.org/tracker/CVE-2018-10195 lua | CVE-2014-5461 | https://security-tracker.debian.org/tracker/CVE-2014-5461 lua | CVE-2021-43519 | https://security-tracker.debian.org/tracker/CVE-2021-43519 mbedtls | CVE-2021-36647 | https://security-tracker.debian.org/tracker/CVE-2021-36647 mbedtls | CVE-2021-43666 | https://security-tracker.debian.org/tracker/CVE-2021-43666 mbedtls | CVE-2021-45451 | https://security-tracker.debian.org/tracker/CVE-2021-45451 mbedtls | CVE-2023-52353 | https://security-tracker.debian.org/tracker/CVE-2023-52353 mbedtls | CVE-2024-23744 | https://security-tracker.debian.org/tracker/CVE-2024-23744 mdadm | CVE-2023-28736 | https://security-tracker.debian.org/tracker/CVE-2023-28736 mdadm | CVE-2023-28938 | https://security-tracker.debian.org/tracker/CVE-2023-28938 micropython | CVE-2023-7152 | https://security-tracker.debian.org/tracker/CVE-2023-7152 mongodb | CVE-2014-8180 | https://security-tracker.debian.org/tracker/CVE-2014-8180 mongodb | CVE-2017-2665 | https://security-tracker.debian.org/tracker/CVE-2017-2665 mp4v2 | CVE-2023-33716 | https://security-tracker.debian.org/tracker/CVE-2023-33716 mp4v2 | CVE-2023-33717 | https://security-tracker.debian.org/tracker/CVE-2023-33717 mp4v2 | CVE-2023-33718 | https://security-tracker.debian.org/tracker/CVE-2023-33718 mp4v2 | CVE-2023-33719 | https://security-tracker.debian.org/tracker/CVE-2023-33719 mutt | CVE-2011-1429 | https://security-tracker.debian.org/tracker/CVE-2011-1429 nasm | CVE-2022-46456 | https://security-tracker.debian.org/tracker/CVE-2022-46456 netdata | CVE-2023-22496 | https://security-tracker.debian.org/tracker/CVE-2023-22496 netdata | CVE-2023-22497 | https://security-tracker.debian.org/tracker/CVE-2023-22497 nginx | CVE-2023-44487 | https://security-tracker.debian.org/tracker/CVE-2023-44487 ninja | CVE-2021-4336 | https://security-tracker.debian.org/tracker/CVE-2021-4336 ntp | CVE-2014-9750 | https://security-tracker.debian.org/tracker/CVE-2014-9750 ntp | CVE-2014-9751 | https://security-tracker.debian.org/tracker/CVE-2014-9751 ntp | CVE-2015-7691 | https://security-tracker.debian.org/tracker/CVE-2015-7691 ntp | CVE-2015-7692 | https://security-tracker.debian.org/tracker/CVE-2015-7692 ntp | CVE-2015-7701 | https://security-tracker.debian.org/tracker/CVE-2015-7701 ntp | CVE-2015-7702 | https://security-tracker.debian.org/tracker/CVE-2015-7702 ntp | CVE-2015-7703 | https://security-tracker.debian.org/tracker/CVE-2015-7703 ntp | CVE-2015-7704 | https://security-tracker.debian.org/tracker/CVE-2015-7704 ntp | CVE-2015-7705 | https://security-tracker.debian.org/tracker/CVE-2015-7705 ntp | CVE-2015-7849 | https://security-tracker.debian.org/tracker/CVE-2015-7849 ntp | CVE-2015-7850 | https://security-tracker.debian.org/tracker/CVE-2015-7850 ntp | CVE-2015-7852 | https://security-tracker.debian.org/tracker/CVE-2015-7852 ntp | CVE-2015-7853 | https://security-tracker.debian.org/tracker/CVE-2015-7853 ntp | CVE-2015-7854 | https://security-tracker.debian.org/tracker/CVE-2015-7854 ntp | CVE-2015-7855 | https://security-tracker.debian.org/tracker/CVE-2015-7855 ntp | CVE-2015-7973 | https://security-tracker.debian.org/tracker/CVE-2015-7973 ntp | CVE-2015-7974 | https://security-tracker.debian.org/tracker/CVE-2015-7974 ntp | CVE-2015-7977 | https://security-tracker.debian.org/tracker/CVE-2015-7977 ntp | CVE-2016-2518 | https://security-tracker.debian.org/tracker/CVE-2016-2518 ntp | CVE-2016-4953 | https://security-tracker.debian.org/tracker/CVE-2016-4953 ntp | CVE-2016-4954 | https://security-tracker.debian.org/tracker/CVE-2016-4954 ntp | CVE-2016-4955 | https://security-tracker.debian.org/tracker/CVE-2016-4955 ntp | CVE-2016-4956 | https://security-tracker.debian.org/tracker/CVE-2016-4956 ntp | CVE-2016-7426 | https://security-tracker.debian.org/tracker/CVE-2016-7426 ntp | CVE-2016-7434 | https://security-tracker.debian.org/tracker/CVE-2016-7434 ntp | CVE-2017-6458 | https://security-tracker.debian.org/tracker/CVE-2017-6458 ntp | CVE-2018-7170 | https://security-tracker.debian.org/tracker/CVE-2018-7170 ntp | CVE-2018-7185 | https://security-tracker.debian.org/tracker/CVE-2018-7185 ntp | CVE-2019-11331 | https://security-tracker.debian.org/tracker/CVE-2019-11331 ntp | CVE-2019-8936 | https://security-tracker.debian.org/tracker/CVE-2019-8936 ntp | CVE-2020-11868 | https://security-tracker.debian.org/tracker/CVE-2020-11868 ntp | CVE-2020-13817 | https://security-tracker.debian.org/tracker/CVE-2020-13817 open-iscsi | CVE-2020-13987 | https://security-tracker.debian.org/tracker/CVE-2020-13987 opencv3 | CVE-2019-14493 | https://security-tracker.debian.org/tracker/CVE-2019-14493 opencv3 | CVE-2019-15939 | https://security-tracker.debian.org/tracker/CVE-2019-15939 opencv3 | CVE-2019-19624 | https://security-tracker.debian.org/tracker/CVE-2019-19624 opencv3 | CVE-2023-2618 | https://security-tracker.debian.org/tracker/CVE-2023-2618 openjdk | CVE-2009-2475 | https://security-tracker.debian.org/tracker/CVE-2009-2475 openjdk | CVE-2009-2476 | https://security-tracker.debian.org/tracker/CVE-2009-2476 openjdk | CVE-2009-2689 | https://security-tracker.debian.org/tracker/CVE-2009-2689 openjdk | CVE-2009-2690 | https://security-tracker.debian.org/tracker/CVE-2009-2690 openjdk | CVE-2009-3728 | https://security-tracker.debian.org/tracker/CVE-2009-3728 openjdk | CVE-2009-3879 | https://security-tracker.debian.org/tracker/CVE-2009-3879 openjdk | CVE-2009-3880 | https://security-tracker.debian.org/tracker/CVE-2009-3880 openjdk | CVE-2009-3881 | https://security-tracker.debian.org/tracker/CVE-2009-3881 openjdk | CVE-2009-3882 | https://security-tracker.debian.org/tracker/CVE-2009-3882 openjdk | CVE-2009-3883 | https://security-tracker.debian.org/tracker/CVE-2009-3883 openjdk | CVE-2009-3884 | https://security-tracker.debian.org/tracker/CVE-2009-3884 openssh | CVE-2007-2768 | https://security-tracker.debian.org/tracker/CVE-2007-2768 openssh | CVE-2008-3844 | https://security-tracker.debian.org/tracker/CVE-2008-3844 openssh | CVE-2014-9278 | https://security-tracker.debian.org/tracker/CVE-2014-9278 openswan | CVE-2019-10155 | https://security-tracker.debian.org/tracker/CVE-2019-10155 openvmtools | CVE-2014-4199 | https://security-tracker.debian.org/tracker/CVE-2014-4199 openvmtools | CVE-2014-4200 | https://security-tracker.debian.org/tracker/CVE-2014-4200 openvmtools | CVE-2021-31693 | https://security-tracker.debian.org/tracker/CVE-2021-31693 openvmtools | CVE-2022-22943 | https://security-tracker.debian.org/tracker/CVE-2022-22943 openvmtools | CVE-2022-31693 | https://security-tracker.debian.org/tracker/CVE-2022-31693 openvmtools | CVE-2023-20867 | https://security-tracker.debian.org/tracker/CVE-2023-20867 openvmtools | CVE-2023-20900 | https://security-tracker.debian.org/tracker/CVE-2023-20900 openvmtools | CVE-2023-34057 | https://security-tracker.debian.org/tracker/CVE-2023-34057 openvmtools | CVE-2023-34058 | https://security-tracker.debian.org/tracker/CVE-2023-34058 opus | CVE-2022-25345 | https://security-tracker.debian.org/tracker/CVE-2022-25345 oracle-mysql | CVE-2012-0583 | https://security-tracker.debian.org/tracker/CVE-2012-0583 oracle-mysql | CVE-2012-1696 | https://security-tracker.debian.org/tracker/CVE-2012-1696 oracle-mysql | CVE-2012-3144 | https://security-tracker.debian.org/tracker/CVE-2012-3144 oracle-mysql | CVE-2012-3147 | https://security-tracker.debian.org/tracker/CVE-2012-3147 oracle-mysql | CVE-2012-3149 | https://security-tracker.debian.org/tracker/CVE-2012-3149 oracle-mysql | CVE-2012-3156 | https://security-tracker.debian.org/tracker/CVE-2012-3156 oracle-mysql | CVE-2012-4414 | https://security-tracker.debian.org/tracker/CVE-2012-4414 oracle-mysql | CVE-2013-1566 | https://security-tracker.debian.org/tracker/CVE-2013-1566 oracle-mysql | CVE-2013-1567 | https://security-tracker.debian.org/tracker/CVE-2013-1567 oracle-mysql | CVE-2013-1570 | https://security-tracker.debian.org/tracker/CVE-2013-1570 oracle-mysql | CVE-2013-2381 | https://security-tracker.debian.org/tracker/CVE-2013-2381 oracle-mysql | CVE-2013-2395 | https://security-tracker.debian.org/tracker/CVE-2013-2395 oracle-mysql | CVE-2013-3795 | https://security-tracker.debian.org/tracker/CVE-2013-3795 oracle-mysql | CVE-2013-3796 | https://security-tracker.debian.org/tracker/CVE-2013-3796 oracle-mysql | CVE-2013-3798 | https://security-tracker.debian.org/tracker/CVE-2013-3798 oracle-mysql | CVE-2013-3806 | https://security-tracker.debian.org/tracker/CVE-2013-3806 oracle-mysql | CVE-2013-3807 | https://security-tracker.debian.org/tracker/CVE-2013-3807 oracle-mysql | CVE-2013-3810 | https://security-tracker.debian.org/tracker/CVE-2013-3810 oracle-mysql | CVE-2013-3811 | https://security-tracker.debian.org/tracker/CVE-2013-3811 oracle-mysql | CVE-2013-5767 | https://security-tracker.debian.org/tracker/CVE-2013-5767 oracle-mysql | CVE-2013-5770 | https://security-tracker.debian.org/tracker/CVE-2013-5770 oracle-mysql | CVE-2013-5786 | https://security-tracker.debian.org/tracker/CVE-2013-5786 oracle-mysql | CVE-2013-5793 | https://security-tracker.debian.org/tracker/CVE-2013-5793 oracle-mysql | CVE-2013-5860 | https://security-tracker.debian.org/tracker/CVE-2013-5860 oracle-mysql | CVE-2013-5881 | https://security-tracker.debian.org/tracker/CVE-2013-5881 oracle-mysql | CVE-2013-5882 | https://security-tracker.debian.org/tracker/CVE-2013-5882 oracle-mysql | CVE-2013-5894 | https://security-tracker.debian.org/tracker/CVE-2013-5894 oracle-mysql | CVE-2014-0427 | https://security-tracker.debian.org/tracker/CVE-2014-0427 oracle-mysql | CVE-2014-0430 | https://security-tracker.debian.org/tracker/CVE-2014-0430 oracle-mysql | CVE-2014-0431 | https://security-tracker.debian.org/tracker/CVE-2014-0431 oracle-mysql | CVE-2014-0433 | https://security-tracker.debian.org/tracker/CVE-2014-0433 oracle-mysql | CVE-2014-2434 | https://security-tracker.debian.org/tracker/CVE-2014-2434 oracle-mysql | CVE-2014-2435 | https://security-tracker.debian.org/tracker/CVE-2014-2435 oracle-mysql | CVE-2014-2442 | https://security-tracker.debian.org/tracker/CVE-2014-2442 oracle-mysql | CVE-2014-2444 | https://security-tracker.debian.org/tracker/CVE-2014-2444 oracle-mysql | CVE-2014-2450 | https://security-tracker.debian.org/tracker/CVE-2014-2450 oracle-mysql | CVE-2014-2451 | https://security-tracker.debian.org/tracker/CVE-2014-2451 oracle-mysql | CVE-2014-2484 | https://security-tracker.debian.org/tracker/CVE-2014-2484 oracle-mysql | CVE-2014-4214 | https://security-tracker.debian.org/tracker/CVE-2014-4214 oracle-mysql | CVE-2014-4233 | https://security-tracker.debian.org/tracker/CVE-2014-4233 oracle-mysql | CVE-2014-4238 | https://security-tracker.debian.org/tracker/CVE-2014-4238 oracle-mysql | CVE-2014-4240 | https://security-tracker.debian.org/tracker/CVE-2014-4240 oracle-mysql | CVE-2015-0385 | https://security-tracker.debian.org/tracker/CVE-2015-0385 oracle-mysql | CVE-2015-0405 | https://security-tracker.debian.org/tracker/CVE-2015-0405 oracle-mysql | CVE-2015-0409 | https://security-tracker.debian.org/tracker/CVE-2015-0409 oracle-mysql | CVE-2015-0423 | https://security-tracker.debian.org/tracker/CVE-2015-0423 oracle-mysql | CVE-2015-0438 | https://security-tracker.debian.org/tracker/CVE-2015-0438 oracle-mysql | CVE-2015-0439 | https://security-tracker.debian.org/tracker/CVE-2015-0439 oracle-mysql | CVE-2015-0498 | https://security-tracker.debian.org/tracker/CVE-2015-0498 oracle-mysql | CVE-2015-0500 | https://security-tracker.debian.org/tracker/CVE-2015-0500 oracle-mysql | CVE-2015-0503 | https://security-tracker.debian.org/tracker/CVE-2015-0503 oracle-mysql | CVE-2015-0506 | https://security-tracker.debian.org/tracker/CVE-2015-0506 oracle-mysql | CVE-2015-0507 | https://security-tracker.debian.org/tracker/CVE-2015-0507 oracle-mysql | CVE-2015-0508 | https://security-tracker.debian.org/tracker/CVE-2015-0508 oracle-mysql | CVE-2015-0511 | https://security-tracker.debian.org/tracker/CVE-2015-0511 oracle-mysql | CVE-2015-2566 | https://security-tracker.debian.org/tracker/CVE-2015-2566 oracle-mysql | CVE-2015-2567 | https://security-tracker.debian.org/tracker/CVE-2015-2567 oracle-mysql | CVE-2015-2611 | https://security-tracker.debian.org/tracker/CVE-2015-2611 oracle-mysql | CVE-2015-2617 | https://security-tracker.debian.org/tracker/CVE-2015-2617 oracle-mysql | CVE-2015-2639 | https://security-tracker.debian.org/tracker/CVE-2015-2639 oracle-mysql | CVE-2015-2641 | https://security-tracker.debian.org/tracker/CVE-2015-2641 oracle-mysql | CVE-2015-2661 | https://security-tracker.debian.org/tracker/CVE-2015-2661 oracle-mysql | CVE-2015-3152 | https://security-tracker.debian.org/tracker/CVE-2015-3152 oracle-mysql | CVE-2015-4730 | https://security-tracker.debian.org/tracker/CVE-2015-4730 oracle-mysql | CVE-2015-4756 | https://security-tracker.debian.org/tracker/CVE-2015-4756 oracle-mysql | CVE-2015-4761 | https://security-tracker.debian.org/tracker/CVE-2015-4761 oracle-mysql | CVE-2015-4766 | https://security-tracker.debian.org/tracker/CVE-2015-4766 oracle-mysql | CVE-2015-4767 | https://security-tracker.debian.org/tracker/CVE-2015-4767 oracle-mysql | CVE-2015-4769 | https://security-tracker.debian.org/tracker/CVE-2015-4769 oracle-mysql | CVE-2015-4771 | https://security-tracker.debian.org/tracker/CVE-2015-4771 oracle-mysql | CVE-2015-4772 | https://security-tracker.debian.org/tracker/CVE-2015-4772 oracle-mysql | CVE-2015-4791 | https://security-tracker.debian.org/tracker/CVE-2015-4791 oracle-mysql | CVE-2015-4800 | https://security-tracker.debian.org/tracker/CVE-2015-4800 oracle-mysql | CVE-2015-4833 | https://security-tracker.debian.org/tracker/CVE-2015-4833 oracle-mysql | CVE-2015-4862 | https://security-tracker.debian.org/tracker/CVE-2015-4862 oracle-mysql | CVE-2015-4890 | https://security-tracker.debian.org/tracker/CVE-2015-4890 oracle-mysql | CVE-2015-4904 | https://security-tracker.debian.org/tracker/CVE-2015-4904 oracle-mysql | CVE-2015-4905 | https://security-tracker.debian.org/tracker/CVE-2015-4905 oracle-mysql | CVE-2015-4910 | https://security-tracker.debian.org/tracker/CVE-2015-4910 oracle-mysql | CVE-2016-0503 | https://security-tracker.debian.org/tracker/CVE-2016-0503 oracle-mysql | CVE-2016-0504 | https://security-tracker.debian.org/tracker/CVE-2016-0504 oracle-mysql | CVE-2016-0594 | https://security-tracker.debian.org/tracker/CVE-2016-0594 oracle-mysql | CVE-2016-0595 | https://security-tracker.debian.org/tracker/CVE-2016-0595 oracle-mysql | CVE-2016-0607 | https://security-tracker.debian.org/tracker/CVE-2016-0607 oracle-mysql | CVE-2016-0610 | https://security-tracker.debian.org/tracker/CVE-2016-0610 oracle-mysql | CVE-2016-0611 | https://security-tracker.debian.org/tracker/CVE-2016-0611 oracle-mysql | CVE-2016-0616 | https://security-tracker.debian.org/tracker/CVE-2016-0616 oracle-mysql | CVE-2016-0652 | https://security-tracker.debian.org/tracker/CVE-2016-0652 oracle-mysql | CVE-2016-0653 | https://security-tracker.debian.org/tracker/CVE-2016-0653 oracle-mysql | CVE-2016-0654 | https://security-tracker.debian.org/tracker/CVE-2016-0654 oracle-mysql | CVE-2016-0656 | https://security-tracker.debian.org/tracker/CVE-2016-0656 oracle-mysql | CVE-2016-0657 | https://security-tracker.debian.org/tracker/CVE-2016-0657 oracle-mysql | CVE-2016-0658 | https://security-tracker.debian.org/tracker/CVE-2016-0658 oracle-mysql | CVE-2016-0659 | https://security-tracker.debian.org/tracker/CVE-2016-0659 oracle-mysql | CVE-2016-0662 | https://security-tracker.debian.org/tracker/CVE-2016-0662 oracle-mysql | CVE-2016-0663 | https://security-tracker.debian.org/tracker/CVE-2016-0663 oracle-mysql | CVE-2016-0667 | https://security-tracker.debian.org/tracker/CVE-2016-0667 oracle-mysql | CVE-2016-3424 | https://security-tracker.debian.org/tracker/CVE-2016-3424 oracle-mysql | CVE-2016-3440 | https://security-tracker.debian.org/tracker/CVE-2016-3440 oracle-mysql | CVE-2016-3518 | https://security-tracker.debian.org/tracker/CVE-2016-3518 oracle-mysql | CVE-2016-3588 | https://security-tracker.debian.org/tracker/CVE-2016-3588 oracle-mysql | CVE-2016-5436 | https://security-tracker.debian.org/tracker/CVE-2016-5436 oracle-mysql | CVE-2016-5437 | https://security-tracker.debian.org/tracker/CVE-2016-5437 oracle-mysql | CVE-2016-5441 | https://security-tracker.debian.org/tracker/CVE-2016-5441 oracle-mysql | CVE-2016-5442 | https://security-tracker.debian.org/tracker/CVE-2016-5442 oracle-mysql | CVE-2016-5443 | https://security-tracker.debian.org/tracker/CVE-2016-5443 oracle-mysql | CVE-2016-5628 | https://security-tracker.debian.org/tracker/CVE-2016-5628 oracle-mysql | CVE-2016-5631 | https://security-tracker.debian.org/tracker/CVE-2016-5631 oracle-mysql | CVE-2016-5632 | https://security-tracker.debian.org/tracker/CVE-2016-5632 oracle-mysql | CVE-2016-5633 | https://security-tracker.debian.org/tracker/CVE-2016-5633 oracle-mysql | CVE-2016-5634 | https://security-tracker.debian.org/tracker/CVE-2016-5634 oracle-mysql | CVE-2016-5635 | https://security-tracker.debian.org/tracker/CVE-2016-5635 oracle-mysql | CVE-2016-8286 | https://security-tracker.debian.org/tracker/CVE-2016-8286 oracle-mysql | CVE-2016-8287 | https://security-tracker.debian.org/tracker/CVE-2016-8287 oracle-mysql | CVE-2016-8289 | https://security-tracker.debian.org/tracker/CVE-2016-8289 oracle-mysql | CVE-2016-8290 | https://security-tracker.debian.org/tracker/CVE-2016-8290 oracle-mysql | CVE-2017-10165 | https://security-tracker.debian.org/tracker/CVE-2017-10165 oracle-mysql | CVE-2017-10167 | https://security-tracker.debian.org/tracker/CVE-2017-10167 oracle-mysql | CVE-2017-10284 | https://security-tracker.debian.org/tracker/CVE-2017-10284 oracle-mysql | CVE-2017-10296 | https://security-tracker.debian.org/tracker/CVE-2017-10296 oracle-mysql | CVE-2017-10311 | https://security-tracker.debian.org/tracker/CVE-2017-10311 oracle-mysql | CVE-2017-10313 | https://security-tracker.debian.org/tracker/CVE-2017-10313 oracle-mysql | CVE-2017-3251 | https://security-tracker.debian.org/tracker/CVE-2017-3251 oracle-mysql | CVE-2017-3256 | https://security-tracker.debian.org/tracker/CVE-2017-3256 oracle-mysql | CVE-2017-3319 | https://security-tracker.debian.org/tracker/CVE-2017-3319 oracle-mysql | CVE-2017-3320 | https://security-tracker.debian.org/tracker/CVE-2017-3320 oracle-mysql | CVE-2017-3452 | https://security-tracker.debian.org/tracker/CVE-2017-3452 oracle-mysql | CVE-2017-3454 | https://security-tracker.debian.org/tracker/CVE-2017-3454 oracle-mysql | CVE-2017-3455 | https://security-tracker.debian.org/tracker/CVE-2017-3455 oracle-mysql | CVE-2017-3457 | https://security-tracker.debian.org/tracker/CVE-2017-3457 oracle-mysql | CVE-2017-3458 | https://security-tracker.debian.org/tracker/CVE-2017-3458 oracle-mysql | CVE-2017-3459 | https://security-tracker.debian.org/tracker/CVE-2017-3459 oracle-mysql | CVE-2017-3460 | https://security-tracker.debian.org/tracker/CVE-2017-3460 oracle-mysql | CVE-2017-3465 | https://security-tracker.debian.org/tracker/CVE-2017-3465 oracle-mysql | CVE-2017-3467 | https://security-tracker.debian.org/tracker/CVE-2017-3467 oracle-mysql | CVE-2017-3468 | https://security-tracker.debian.org/tracker/CVE-2017-3468 oracle-mysql | CVE-2017-3529 | https://security-tracker.debian.org/tracker/CVE-2017-3529 oracle-mysql | CVE-2017-3637 | https://security-tracker.debian.org/tracker/CVE-2017-3637 oracle-mysql | CVE-2017-3638 | https://security-tracker.debian.org/tracker/CVE-2017-3638 oracle-mysql | CVE-2017-3639 | https://security-tracker.debian.org/tracker/CVE-2017-3639 oracle-mysql | CVE-2017-3640 | https://security-tracker.debian.org/tracker/CVE-2017-3640 oracle-mysql | CVE-2017-3642 | https://security-tracker.debian.org/tracker/CVE-2017-3642 oracle-mysql | CVE-2017-3643 | https://security-tracker.debian.org/tracker/CVE-2017-3643 oracle-mysql | CVE-2017-3644 | https://security-tracker.debian.org/tracker/CVE-2017-3644 oracle-mysql | CVE-2017-3645 | https://security-tracker.debian.org/tracker/CVE-2017-3645 oracle-mysql | CVE-2017-3646 | https://security-tracker.debian.org/tracker/CVE-2017-3646 oracle-mysql | CVE-2017-3650 | https://security-tracker.debian.org/tracker/CVE-2017-3650 oracle-mysql | CVE-2018-0735 | https://security-tracker.debian.org/tracker/CVE-2018-0735 oracle-mysql | CVE-2018-3061 | https://security-tracker.debian.org/tracker/CVE-2018-3061 oracle-mysql | CVE-2018-3071 | https://security-tracker.debian.org/tracker/CVE-2018-3071 oracle-mysql | CVE-2019-2731 | https://security-tracker.debian.org/tracker/CVE-2019-2731 oracle-mysql | CVE-2019-2741 | https://security-tracker.debian.org/tracker/CVE-2019-2741 oracle-mysql | CVE-2019-2755 | https://security-tracker.debian.org/tracker/CVE-2019-2755 oracle-mysql | CVE-2019-2757 | https://security-tracker.debian.org/tracker/CVE-2019-2757 oracle-mysql | CVE-2019-7317 | https://security-tracker.debian.org/tracker/CVE-2019-7317 oracle-mysql | CVE-2020-14760 | https://security-tracker.debian.org/tracker/CVE-2020-14760 oracle-mysql | CVE-2020-14814 | https://security-tracker.debian.org/tracker/CVE-2020-14814 oracle-mysql | CVE-2020-14830 | https://security-tracker.debian.org/tracker/CVE-2020-14830 oracle-mysql | CVE-2020-14837 | https://security-tracker.debian.org/tracker/CVE-2020-14837 oracle-mysql | CVE-2020-14839 | https://security-tracker.debian.org/tracker/CVE-2020-14839 oracle-mysql | CVE-2020-14845 | https://security-tracker.debian.org/tracker/CVE-2020-14845 oracle-mysql | CVE-2020-14846 | https://security-tracker.debian.org/tracker/CVE-2020-14846 oracle-mysql | CVE-2020-14852 | https://security-tracker.debian.org/tracker/CVE-2020-14852 oracle-mysql | CVE-2020-15358 | https://security-tracker.debian.org/tracker/CVE-2020-15358 oracle-mysql | CVE-2020-1967 | https://security-tracker.debian.org/tracker/CVE-2020-1967 oracle-mysql | CVE-2020-1971 | https://security-tracker.debian.org/tracker/CVE-2020-1971 oracle-mysql | CVE-2021-22570 | https://security-tracker.debian.org/tracker/CVE-2021-22570 oracle-mysql | CVE-2021-2356 | https://security-tracker.debian.org/tracker/CVE-2021-2356 oracle-mysql | CVE-2022-21417 | https://security-tracker.debian.org/tracker/CVE-2022-21417 oracle-mysql | CVE-2022-21444 | https://security-tracker.debian.org/tracker/CVE-2022-21444 oracle-mysql | CVE-2023-21977 | https://security-tracker.debian.org/tracker/CVE-2023-21977 oracle-mysql | CVE-2023-21980 | https://security-tracker.debian.org/tracker/CVE-2023-21980 oracle-mysql | CVE-2023-22007 | https://security-tracker.debian.org/tracker/CVE-2023-22007 oracle-mysql | CVE-2023-22015 | https://security-tracker.debian.org/tracker/CVE-2023-22015 oracle-mysql | CVE-2023-22026 | https://security-tracker.debian.org/tracker/CVE-2023-22026 oracle-mysql | CVE-2023-22028 | https://security-tracker.debian.org/tracker/CVE-2023-22028 p7zip | CVE-2017-17969 | https://security-tracker.debian.org/tracker/CVE-2017-17969 p7zip | CVE-2018-5996 | https://security-tracker.debian.org/tracker/CVE-2018-5996 patch | CVE-2018-6952 | https://security-tracker.debian.org/tracker/CVE-2018-6952 patch | CVE-2019-20633 | https://security-tracker.debian.org/tracker/CVE-2019-20633 perl | CVE-2023-31484 | https://security-tracker.debian.org/tracker/CVE-2023-31484 perl | CVE-2023-31486 | https://security-tracker.debian.org/tracker/CVE-2023-31486 perl | CVE-2023-47100 | https://security-tracker.debian.org/tracker/CVE-2023-47100 perl-lwp-protocol-https | CVE-2014-3230 | https://security-tracker.debian.org/tracker/CVE-2014-3230 php | CVE-2007-2728 | https://security-tracker.debian.org/tracker/CVE-2007-2728 php | CVE-2007-3205 | https://security-tracker.debian.org/tracker/CVE-2007-3205 php | CVE-2007-4596 | https://security-tracker.debian.org/tracker/CVE-2007-4596 php | CVE-2022-4900 | https://security-tracker.debian.org/tracker/CVE-2022-4900 pkgconf | CVE-2023-24056 | https://security-tracker.debian.org/tracker/CVE-2023-24056 powerpc-utils | CVE-2014-8165 | https://security-tracker.debian.org/tracker/CVE-2014-8165 proftpd | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 python-cryptography | CVE-2023-49083 | https://security-tracker.debian.org/tracker/CVE-2023-49083 python-m2crypto | CVE-2020-25657 | https://security-tracker.debian.org/tracker/CVE-2020-25657 python-paramiko | CVE-2023-48795 | https://security-tracker.debian.org/tracker/CVE-2023-48795 python-pillow | CVE-2023-50447 | https://security-tracker.debian.org/tracker/CVE-2023-50447 python-pip | CVE-2023-5752 | https://security-tracker.debian.org/tracker/CVE-2023-5752 python-py | CVE-2022-42969 | https://security-tracker.debian.org/tracker/CVE-2022-42969 python-pycryptodomex | CVE-2023-52323 | https://security-tracker.debian.org/tracker/CVE-2023-52323 python-sqlparse | CVE-2023-30608 | https://security-tracker.debian.org/tracker/CVE-2023-30608 python-validators | CVE-2023-45813 | https://security-tracker.debian.org/tracker/CVE-2023-45813 qemu | CVE-2018-18438 | https://security-tracker.debian.org/tracker/CVE-2018-18438 qemu | CVE-2019-12067 | https://security-tracker.debian.org/tracker/CVE-2019-12067 qemu | CVE-2021-20255 | https://security-tracker.debian.org/tracker/CVE-2021-20255 qemu | CVE-2023-1386 | https://security-tracker.debian.org/tracker/CVE-2023-1386 qemu | CVE-2023-2680 | https://security-tracker.debian.org/tracker/CVE-2023-2680 qemu | CVE-2023-3019 | https://security-tracker.debian.org/tracker/CVE-2023-3019 qemu | CVE-2023-5088 | https://security-tracker.debian.org/tracker/CVE-2023-5088 qemu | CVE-2023-6683 | https://security-tracker.debian.org/tracker/CVE-2023-6683 qemu | CVE-2023-6693 | https://security-tracker.debian.org/tracker/CVE-2023-6693 qt6base | CVE-2023-32573 | https://security-tracker.debian.org/tracker/CVE-2023-32573 qt6base | CVE-2023-32762 | https://security-tracker.debian.org/tracker/CVE-2023-32762 qt6base | CVE-2023-32763 | https://security-tracker.debian.org/tracker/CVE-2023-32763 qt6base | CVE-2023-33285 | https://security-tracker.debian.org/tracker/CVE-2023-33285 qt6base | CVE-2023-34410 | https://security-tracker.debian.org/tracker/CVE-2023-34410 qt6base | CVE-2023-37369 | https://security-tracker.debian.org/tracker/CVE-2023-37369 qt6base | CVE-2023-38197 | https://security-tracker.debian.org/tracker/CVE-2023-38197 qt6base | CVE-2023-51714 | https://security-tracker.debian.org/tracker/CVE-2023-51714 quagga | CVE-2016-4049 | https://security-tracker.debian.org/tracker/CVE-2016-4049 quagga | CVE-2017-3224 | https://security-tracker.debian.org/tracker/CVE-2017-3224 quagga | CVE-2021-44038 | https://security-tracker.debian.org/tracker/CVE-2021-44038 resiprocate | CVE-2017-9454 | https://security-tracker.debian.org/tracker/CVE-2017-9454 rust | CVE-2023-40030 | https://security-tracker.debian.org/tracker/CVE-2023-40030 samba4 | CVE-2011-2411 | https://security-tracker.debian.org/tracker/CVE-2011-2411 samba4 | CVE-2018-14628 | https://security-tracker.debian.org/tracker/CVE-2018-14628 samba4 | CVE-2021-3670 | https://security-tracker.debian.org/tracker/CVE-2021-3670 samba4 | CVE-2022-1615 | https://security-tracker.debian.org/tracker/CVE-2022-1615 samba4 | CVE-2022-32743 | https://security-tracker.debian.org/tracker/CVE-2022-32743 samba4 | CVE-2022-37966 | https://security-tracker.debian.org/tracker/CVE-2022-37966 samba4 | CVE-2022-37967 | https://security-tracker.debian.org/tracker/CVE-2022-37967 samba4 | CVE-2022-38023 | https://security-tracker.debian.org/tracker/CVE-2022-38023 sdl | CVE-2019-13616 | https://security-tracker.debian.org/tracker/CVE-2019-13616 sdl | CVE-2019-14906 | https://security-tracker.debian.org/tracker/CVE-2019-14906 sdl | CVE-2019-7572 | https://security-tracker.debian.org/tracker/CVE-2019-7572 sdl | CVE-2019-7573 | https://security-tracker.debian.org/tracker/CVE-2019-7573 sdl | CVE-2019-7574 | https://security-tracker.debian.org/tracker/CVE-2019-7574 sdl | CVE-2019-7575 | https://security-tracker.debian.org/tracker/CVE-2019-7575 sdl | CVE-2019-7576 | https://security-tracker.debian.org/tracker/CVE-2019-7576 sdl | CVE-2019-7577 | https://security-tracker.debian.org/tracker/CVE-2019-7577 sdl | CVE-2019-7578 | https://security-tracker.debian.org/tracker/CVE-2019-7578 sdl | CVE-2019-7635 | https://security-tracker.debian.org/tracker/CVE-2019-7635 sdl | CVE-2019-7636 | https://security-tracker.debian.org/tracker/CVE-2019-7636 sdl | CVE-2019-7637 | https://security-tracker.debian.org/tracker/CVE-2019-7637 sdl | CVE-2019-7638 | https://security-tracker.debian.org/tracker/CVE-2019-7638 sdl | CVE-2020-14409 | https://security-tracker.debian.org/tracker/CVE-2020-14409 sdl | CVE-2020-14410 | https://security-tracker.debian.org/tracker/CVE-2020-14410 shadow | CVE-2013-4235 | https://security-tracker.debian.org/tracker/CVE-2013-4235 shim | CVE-2023-40547 | https://security-tracker.debian.org/tracker/CVE-2023-40547 smack | CVE-2014-0363 | https://security-tracker.debian.org/tracker/CVE-2014-0363 smack | CVE-2014-0364 | https://security-tracker.debian.org/tracker/CVE-2014-0364 smack | CVE-2016-10027 | https://security-tracker.debian.org/tracker/CVE-2016-10027 snort | CVE-2023-20246 | https://security-tracker.debian.org/tracker/CVE-2023-20246 speechd | CVE-2001-0956 | https://security-tracker.debian.org/tracker/CVE-2001-0956 spice | CVE-2016-0749 | https://security-tracker.debian.org/tracker/CVE-2016-0749 spice | CVE-2016-2150 | https://security-tracker.debian.org/tracker/CVE-2016-2150 spice | CVE-2018-10893 | https://security-tracker.debian.org/tracker/CVE-2018-10893 sqlite | CVE-2024-0232 | https://security-tracker.debian.org/tracker/CVE-2024-0232 sudo | CVE-2023-27320 | https://security-tracker.debian.org/tracker/CVE-2023-27320 sudo | CVE-2023-42465 | https://security-tracker.debian.org/tracker/CVE-2023-42465 syslog-ng | CVE-2022-38725 | https://security-tracker.debian.org/tracker/CVE-2022-38725 sysstat | CVE-2023-33204 | https://security-tracker.debian.org/tracker/CVE-2023-33204 thttpd | CVE-2012-5640 | https://security-tracker.debian.org/tracker/CVE-2012-5640 tiff | CVE-2015-7313 | https://security-tracker.debian.org/tracker/CVE-2015-7313 tiff | CVE-2023-3164 | https://security-tracker.debian.org/tracker/CVE-2023-3164 tiff | CVE-2023-52355 | https://security-tracker.debian.org/tracker/CVE-2023-52355 tiff | CVE-2023-52356 | https://security-tracker.debian.org/tracker/CVE-2023-52356 tiff | CVE-2023-6228 | https://security-tracker.debian.org/tracker/CVE-2023-6228 tiff | CVE-2023-6277 | https://security-tracker.debian.org/tracker/CVE-2023-6277 tinc | CVE-2013-1428 | https://security-tracker.debian.org/tracker/CVE-2013-1428 tor | CVE-2016-9079 | https://security-tracker.debian.org/tracker/CVE-2016-9079 tor | CVE-2017-16541 | https://security-tracker.debian.org/tracker/CVE-2017-16541 tpm2-tss | CVE-2023-22745 | https://security-tracker.debian.org/tracker/CVE-2023-22745 uboot-tools | CVE-2022-2347 | https://security-tracker.debian.org/tracker/CVE-2022-2347 uboot-tools | CVE-2022-30767 | https://security-tracker.debian.org/tracker/CVE-2022-30767 uboot-tools | CVE-2022-33103 | https://security-tracker.debian.org/tracker/CVE-2022-33103 uboot-tools | CVE-2022-34835 | https://security-tracker.debian.org/tracker/CVE-2022-34835 unrar | CVE-2022-30333 | https://security-tracker.debian.org/tracker/CVE-2022-30333 unzip | CVE-2021-4217 | https://security-tracker.debian.org/tracker/CVE-2021-4217 upx | CVE-2023-23456 | https://security-tracker.debian.org/tracker/CVE-2023-23456 upx | CVE-2023-23457 | https://security-tracker.debian.org/tracker/CVE-2023-23457 vorbis-tools | CVE-2023-43361 | https://security-tracker.debian.org/tracker/CVE-2023-43361 webkitgtk | CVE-2023-39928 | https://security-tracker.debian.org/tracker/CVE-2023-39928 wpewebkit | CVE-2023-40397 | https://security-tracker.debian.org/tracker/CVE-2023-40397 xen | CVE-2011-1936 | https://security-tracker.debian.org/tracker/CVE-2011-1936 xen | CVE-2011-3346 | https://security-tracker.debian.org/tracker/CVE-2011-3346 xen | CVE-2014-2580 | https://security-tracker.debian.org/tracker/CVE-2014-2580 xen | CVE-2014-3672 | https://security-tracker.debian.org/tracker/CVE-2014-3672 xen | CVE-2015-7504 | https://security-tracker.debian.org/tracker/CVE-2015-7504 xen | CVE-2015-8550 | https://security-tracker.debian.org/tracker/CVE-2015-8550 xen | CVE-2015-8553 | https://security-tracker.debian.org/tracker/CVE-2015-8553 xen | CVE-2016-3960 | https://security-tracker.debian.org/tracker/CVE-2016-3960 xen | CVE-2016-7092 | https://security-tracker.debian.org/tracker/CVE-2016-7092 xen | CVE-2016-9379 | https://security-tracker.debian.org/tracker/CVE-2016-9379 xen | CVE-2016-9380 | https://security-tracker.debian.org/tracker/CVE-2016-9380 xen | CVE-2016-9383 | https://security-tracker.debian.org/tracker/CVE-2016-9383 xen | CVE-2016-9386 | https://security-tracker.debian.org/tracker/CVE-2016-9386 xen | CVE-2017-12134 | https://security-tracker.debian.org/tracker/CVE-2017-12134 xen | CVE-2017-12135 | https://security-tracker.debian.org/tracker/CVE-2017-12135 xen | CVE-2017-12137 | https://security-tracker.debian.org/tracker/CVE-2017-12137 xen | CVE-2017-7228 | https://security-tracker.debian.org/tracker/CVE-2017-7228 xen | CVE-2018-5244 | https://security-tracker.debian.org/tracker/CVE-2018-5244 xen | CVE-2018-8897 | https://security-tracker.debian.org/tracker/CVE-2018-8897 xen | CVE-2021-26313 | https://security-tracker.debian.org/tracker/CVE-2021-26313 xen | CVE-2021-26314 | https://security-tracker.debian.org/tracker/CVE-2021-26314 xen | CVE-2021-28039 | https://security-tracker.debian.org/tracker/CVE-2021-28039 xen | CVE-2021-28687 | https://security-tracker.debian.org/tracker/CVE-2021-28687 xen | CVE-2021-28690 | https://security-tracker.debian.org/tracker/CVE-2021-28690 xen | CVE-2021-28692 | https://security-tracker.debian.org/tracker/CVE-2021-28692 xen | CVE-2021-28693 | https://security-tracker.debian.org/tracker/CVE-2021-28693 xen | CVE-2021-28694 | https://security-tracker.debian.org/tracker/CVE-2021-28694 xen | CVE-2021-28695 | https://security-tracker.debian.org/tracker/CVE-2021-28695 xen | CVE-2021-28696 | https://security-tracker.debian.org/tracker/CVE-2021-28696 xen | CVE-2021-28697 | https://security-tracker.debian.org/tracker/CVE-2021-28697 xen | CVE-2021-28698 | https://security-tracker.debian.org/tracker/CVE-2021-28698 xen | CVE-2021-28699 | https://security-tracker.debian.org/tracker/CVE-2021-28699 xen | CVE-2021-28700 | https://security-tracker.debian.org/tracker/CVE-2021-28700 xen | CVE-2021-28701 | https://security-tracker.debian.org/tracker/CVE-2021-28701 xen | CVE-2021-28702 | https://security-tracker.debian.org/tracker/CVE-2021-28702 xen | CVE-2021-28703 | https://security-tracker.debian.org/tracker/CVE-2021-28703 xen | CVE-2021-28704 | https://security-tracker.debian.org/tracker/CVE-2021-28704 xen | CVE-2021-28707 | https://security-tracker.debian.org/tracker/CVE-2021-28707 xen | CVE-2021-28708 | https://security-tracker.debian.org/tracker/CVE-2021-28708 xen | CVE-2021-28711 | https://security-tracker.debian.org/tracker/CVE-2021-28711 xen | CVE-2021-28712 | https://security-tracker.debian.org/tracker/CVE-2021-28712 xen | CVE-2021-28713 | https://security-tracker.debian.org/tracker/CVE-2021-28713 xen | CVE-2022-21123 | https://security-tracker.debian.org/tracker/CVE-2022-21123 xen | CVE-2022-21125 | https://security-tracker.debian.org/tracker/CVE-2022-21125 xen | CVE-2022-21127 | https://security-tracker.debian.org/tracker/CVE-2022-21127 xen | CVE-2022-21166 | https://security-tracker.debian.org/tracker/CVE-2022-21166 xen | CVE-2022-23033 | https://security-tracker.debian.org/tracker/CVE-2022-23033 xen | CVE-2022-23035 | https://security-tracker.debian.org/tracker/CVE-2022-23035 xen | CVE-2022-23036 | https://security-tracker.debian.org/tracker/CVE-2022-23036 xen | CVE-2022-23037 | https://security-tracker.debian.org/tracker/CVE-2022-23037 xen | CVE-2022-23038 | https://security-tracker.debian.org/tracker/CVE-2022-23038 xen | CVE-2022-23039 | https://security-tracker.debian.org/tracker/CVE-2022-23039 xen | CVE-2022-23040 | https://security-tracker.debian.org/tracker/CVE-2022-23040 xen | CVE-2022-23041 | https://security-tracker.debian.org/tracker/CVE-2022-23041 xen | CVE-2022-23042 | https://security-tracker.debian.org/tracker/CVE-2022-23042 xen | CVE-2022-23824 | https://security-tracker.debian.org/tracker/CVE-2022-23824 xen | CVE-2022-23960 | https://security-tracker.debian.org/tracker/CVE-2022-23960 xen | CVE-2022-26357 | https://security-tracker.debian.org/tracker/CVE-2022-26357 xen | CVE-2022-26358 | https://security-tracker.debian.org/tracker/CVE-2022-26358 xen | CVE-2022-26359 | https://security-tracker.debian.org/tracker/CVE-2022-26359 xen | CVE-2022-26360 | https://security-tracker.debian.org/tracker/CVE-2022-26360 xen | CVE-2022-26361 | https://security-tracker.debian.org/tracker/CVE-2022-26361 xen | CVE-2022-26362 | https://security-tracker.debian.org/tracker/CVE-2022-26362 xen | CVE-2022-26363 | https://security-tracker.debian.org/tracker/CVE-2022-26363 xen | CVE-2022-26364 | https://security-tracker.debian.org/tracker/CVE-2022-26364 xen | CVE-2022-26365 | https://security-tracker.debian.org/tracker/CVE-2022-26365 xen | CVE-2022-29900 | https://security-tracker.debian.org/tracker/CVE-2022-29900 xen | CVE-2022-29901 | https://security-tracker.debian.org/tracker/CVE-2022-29901 xen | CVE-2022-33740 | https://security-tracker.debian.org/tracker/CVE-2022-33740 xen | CVE-2022-33741 | https://security-tracker.debian.org/tracker/CVE-2022-33741 xen | CVE-2022-33742 | https://security-tracker.debian.org/tracker/CVE-2022-33742 xen | CVE-2022-33743 | https://security-tracker.debian.org/tracker/CVE-2022-33743 xen | CVE-2022-33745 | https://security-tracker.debian.org/tracker/CVE-2022-33745 xen | CVE-2022-33746 | https://security-tracker.debian.org/tracker/CVE-2022-33746 xen | CVE-2022-33747 | https://security-tracker.debian.org/tracker/CVE-2022-33747 xen | CVE-2022-33748 | https://security-tracker.debian.org/tracker/CVE-2022-33748 xen | CVE-2022-40982 | https://security-tracker.debian.org/tracker/CVE-2022-40982 xen | CVE-2022-42309 | https://security-tracker.debian.org/tracker/CVE-2022-42309 xen | CVE-2022-42311 | https://security-tracker.debian.org/tracker/CVE-2022-42311 xen | CVE-2022-42312 | https://security-tracker.debian.org/tracker/CVE-2022-42312 xen | CVE-2022-42313 | https://security-tracker.debian.org/tracker/CVE-2022-42313 xen | CVE-2022-42314 | https://security-tracker.debian.org/tracker/CVE-2022-42314 xen | CVE-2022-42315 | https://security-tracker.debian.org/tracker/CVE-2022-42315 xen | CVE-2022-42316 | https://security-tracker.debian.org/tracker/CVE-2022-42316 xen | CVE-2022-42317 | https://security-tracker.debian.org/tracker/CVE-2022-42317 xen | CVE-2022-42318 | https://security-tracker.debian.org/tracker/CVE-2022-42318 xen | CVE-2022-42319 | https://security-tracker.debian.org/tracker/CVE-2022-42319 xen | CVE-2022-42320 | https://security-tracker.debian.org/tracker/CVE-2022-42320 xen | CVE-2022-42321 | https://security-tracker.debian.org/tracker/CVE-2022-42321 xen | CVE-2022-42322 | https://security-tracker.debian.org/tracker/CVE-2022-42322 xen | CVE-2022-42323 | https://security-tracker.debian.org/tracker/CVE-2022-42323 xen | CVE-2022-42324 | https://security-tracker.debian.org/tracker/CVE-2022-42324 xen | CVE-2022-42325 | https://security-tracker.debian.org/tracker/CVE-2022-42325 xen | CVE-2022-42326 | https://security-tracker.debian.org/tracker/CVE-2022-42326 xen | CVE-2022-42331 | https://security-tracker.debian.org/tracker/CVE-2022-42331 xen | CVE-2022-42332 | https://security-tracker.debian.org/tracker/CVE-2022-42332 xen | CVE-2022-42333 | https://security-tracker.debian.org/tracker/CVE-2022-42333 xen | CVE-2022-42334 | https://security-tracker.debian.org/tracker/CVE-2022-42334 xen | CVE-2022-4949 | https://security-tracker.debian.org/tracker/CVE-2022-4949 xen | CVE-2023-20588 | https://security-tracker.debian.org/tracker/CVE-2023-20588 xen | CVE-2023-34319 | https://security-tracker.debian.org/tracker/CVE-2023-34319 xen | CVE-2023-34320 | https://security-tracker.debian.org/tracker/CVE-2023-34320 xen | CVE-2023-34321 | https://security-tracker.debian.org/tracker/CVE-2023-34321 xen | CVE-2023-34322 | https://security-tracker.debian.org/tracker/CVE-2023-34322 xen | CVE-2023-34323 | https://security-tracker.debian.org/tracker/CVE-2023-34323 xen | CVE-2023-34324 | https://security-tracker.debian.org/tracker/CVE-2023-34324 xen | CVE-2023-34325 | https://security-tracker.debian.org/tracker/CVE-2023-34325 xen | CVE-2023-34326 | https://security-tracker.debian.org/tracker/CVE-2023-34326 xen | CVE-2023-34327 | https://security-tracker.debian.org/tracker/CVE-2023-34327 xen | CVE-2023-46835 | https://security-tracker.debian.org/tracker/CVE-2023-46835 xen | CVE-2023-46836 | https://security-tracker.debian.org/tracker/CVE-2023-46836 xen | CVE-2023-46837 | https://security-tracker.debian.org/tracker/CVE-2023-46837 xen | CVE-2023-4949 | https://security-tracker.debian.org/tracker/CVE-2023-4949 xerces | CVE-2012-0880 | https://security-tracker.debian.org/tracker/CVE-2012-0880 xwayland | CVE-2023-6816 | https://security-tracker.debian.org/tracker/CVE-2023-6816 xwayland | CVE-2024-0408 | https://security-tracker.debian.org/tracker/CVE-2024-0408 xwayland | CVE-2024-0409 | https://security-tracker.debian.org/tracker/CVE-2024-0409 yajl | CVE-2023-33460 | https://security-tracker.debian.org/tracker/CVE-2023-33460 yasm | CVE-2021-33454 | https://security-tracker.debian.org/tracker/CVE-2021-33454 yasm | CVE-2021-33455 | https://security-tracker.debian.org/tracker/CVE-2021-33455 yasm | CVE-2021-33456 | https://security-tracker.debian.org/tracker/CVE-2021-33456 yasm | CVE-2021-33457 | https://security-tracker.debian.org/tracker/CVE-2021-33457 yasm | CVE-2021-33458 | https://security-tracker.debian.org/tracker/CVE-2021-33458 yasm | CVE-2021-33459 | https://security-tracker.debian.org/tracker/CVE-2021-33459 yasm | CVE-2021-33460 | https://security-tracker.debian.org/tracker/CVE-2021-33460 yasm | CVE-2021-33461 | https://security-tracker.debian.org/tracker/CVE-2021-33461 yasm | CVE-2021-33462 | https://security-tracker.debian.org/tracker/CVE-2021-33462 yasm | CVE-2021-33463 | https://security-tracker.debian.org/tracker/CVE-2021-33463 yasm | CVE-2021-33464 | https://security-tracker.debian.org/tracker/CVE-2021-33464 yasm | CVE-2021-33465 | https://security-tracker.debian.org/tracker/CVE-2021-33465 yasm | CVE-2021-33466 | https://security-tracker.debian.org/tracker/CVE-2021-33466 yasm | CVE-2021-33467 | https://security-tracker.debian.org/tracker/CVE-2021-33467 yasm | CVE-2021-33468 | https://security-tracker.debian.org/tracker/CVE-2021-33468 yasm | CVE-2023-30402 | https://security-tracker.debian.org/tracker/CVE-2023-30402 yasm | CVE-2023-31972 | https://security-tracker.debian.org/tracker/CVE-2023-31972 yasm | CVE-2023-31973 | https://security-tracker.debian.org/tracker/CVE-2023-31973 yasm | CVE-2023-31974 | https://security-tracker.debian.org/tracker/CVE-2023-31974 yasm | CVE-2023-31975 | https://security-tracker.debian.org/tracker/CVE-2023-31975 yasm | CVE-2023-51258 | https://security-tracker.debian.org/tracker/CVE-2023-51258 zbar | CVE-2023-40889 | https://security-tracker.debian.org/tracker/CVE-2023-40889 zbar | CVE-2023-40890 | https://security-tracker.debian.org/tracker/CVE-2023-40890 zip | CVE-2018-13410 | https://security-tracker.debian.org/tracker/CVE-2018-13410 -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Mon Feb 5 09:13:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 10:13:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-mpd2: bump to version 3.1.1 In-Reply-To: <20240204085128.5059-1-wiselord1983@gmail.com> References: <20240204085128.5059-1-wiselord1983@gmail.com> Message-ID: <20240205101344.7725e2ea@windsurf> Hello, On Sun, 4 Feb 2024 11:51:28 +0300 WiseLord wrote: > Signed-off-by: WiseLord Thanks a lot for your contribution! Could you clarify whether "WiseLord" is your real name? Indeed, we unfortunately cannot accept contributions submitted under pseudonyms. Thanks a lot in advance for your clarification, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 09:16:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 10:16:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjpeg: bump to version 9f In-Reply-To: <20240131204524.2098188-1-fontaine.fabrice@gmail.com> References: <20240131204524.2098188-1-fontaine.fabrice@gmail.com> Message-ID: <20240205101644.6bfbb1b4@windsurf> On Wed, 31 Jan 2024 21:45:24 +0100 Fabrice Fontaine wrote: > Update hash of README (changes not related to license) > > https://jpegclub.org/reference/reference-sources/ > > Signed-off-by: Fabrice Fontaine > --- > package/libjpeg/libjpeg.hash | 4 ++-- > package/libjpeg/libjpeg.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 09:15:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 10:15:08 +0100 Subject: [Buildroot] [git commit] package/libjpeg: bump to version 9f Message-ID: <20240205091649.4E6E286990@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c7e6a5d57b83f71f21821cd56c21e0514128a7e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of README (changes not related to license) https://jpegclub.org/reference/reference-sources/ Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libjpeg/libjpeg.hash | 4 ++-- package/libjpeg/libjpeg.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libjpeg/libjpeg.hash b/package/libjpeg/libjpeg.hash index 1a2e82caef..5c223b4e3c 100644 --- a/package/libjpeg/libjpeg.hash +++ b/package/libjpeg/libjpeg.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d jpegsrc.v9e.tar.gz -sha256 50c1c5978d490c7f13062d91c4b89affc83774f87bc4568a714f748b62a5b216 README +sha256 04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b jpegsrc.v9f.tar.gz +sha256 7c25493a9f64fed34d01445467341bda77bc1cdbeccbe33558659ef173fb9ff2 README diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk index caf7f05f44..2eb64e83e7 100644 --- a/package/libjpeg/libjpeg.mk +++ b/package/libjpeg/libjpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBJPEG_VERSION = 9e +LIBJPEG_VERSION = 9f LIBJPEG_SITE = http://www.ijg.org/files LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz LIBJPEG_LICENSE = IJG From yann.morin.1998 at free.fr Mon Feb 5 09:21:54 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 10:21:54 +0100 Subject: [Buildroot] [git commit] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' Message-ID: <20240205092216.D710086995@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9b90ef61784d314147ace4972f9bdc0cb4fcce77 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS which were internally set by the haproxy Makefile. Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and and then running the program results in runtime error: $ haproxy FATAL ERROR: invalid code detected -- cannot go further, please recompile! ... To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead of CFLAGS in haproxy.mk. Signed-off-by: Yann E. MORIN --- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 63a92090f3..61a9ebebe4 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -82,7 +82,7 @@ endif define HAPROXY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) endef define HAPROXY_INSTALL_TARGET_CMDS From yann.morin.1998 at free.fr Mon Feb 5 09:25:10 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 10:25:10 +0100 Subject: [Buildroot] [PATCH v2] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' In-Reply-To: <20240204201657.33079-2-aleksandr.o.makarov@gmail.com> References: <20240204201657.33079-1-aleksandr.o.makarov@gmail.com> <20240204201657.33079-2-aleksandr.o.makarov@gmail.com> Message-ID: Aleksandr, All, On 2024-02-04 22:16 +0200, Aleksandr Makarov spake thusly: > Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS > which were internally set by the haproxy Makefile. > > Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and > and then running the program results in runtime error: > > $ haproxy > FATAL ERROR: invalid code detected -- cannot go further, please recompile! > ... > > To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead > of CFLAGS in haproxy.mk. You forgot to add your Signed-off-by line here, but I messed up and applied and pushed. /me goes fumble with his git hooks to understand why that was not caught... Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2 > - Drop patch for haproxy program Makefile, make changes to haproxy.mk instead > --- > package/haproxy/haproxy.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk > index 63a92090f3..61a9ebebe4 100644 > --- a/package/haproxy/haproxy.mk > +++ b/package/haproxy/haproxy.mk > @@ -82,7 +82,7 @@ endif > > define HAPROXY_BUILD_CMDS > $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ > - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) > + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) > endef > > define HAPROXY_INSTALL_TARGET_CMDS > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From wiselord1983 at gmail.com Mon Feb 5 09:27:55 2024 From: wiselord1983 at gmail.com (Uladzimir Bely) Date: Mon, 05 Feb 2024 12:27:55 +0300 Subject: [Buildroot] [PATCH 1/1] package/python-mpd2: bump to version 3.1.1 In-Reply-To: <20240205101344.7725e2ea@windsurf> References: <20240204085128.5059-1-wiselord1983@gmail.com> <20240205101344.7725e2ea@windsurf> Message-ID: <10609434cc80f8c547228c26bf16a04ce1f14b72.camel@gmail.com> ? ??, 05/02/2024 ? 10:13 +0100, Thomas Petazzoni ?????: > Hello, > > On Sun,? 4 Feb 2024 11:51:28 +0300 > WiseLord wrote: > > > Signed-off-by: WiseLord > > Thanks a lot for your contribution! Could you clarify whether > "WiseLord" is your real name? Indeed, we unfortunately cannot accept > contributions submitted under pseudonyms. > > Thanks a lot in advance for your clarification, > > Thomas Hello, Thomas. Sorry, the nickname was set in my .gitconfig file. I could either resend the patch with a proper username (e.g., "Uladzimir Bely "), or you are free to edit the patch on your own. Regards, Uladzimir Bely. From antoine.coutant at smile.fr Mon Feb 5 09:36:11 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 5 Feb 2024 10:36:11 +0100 Subject: [Buildroot] [PATCH 1/4] package/containerd: drop CONTAINERD_CPE_ID_VENDOR In-Reply-To: References: Message-ID: <54778c37-172e-414c-a4f2-a15f691145d3@smile.fr> On 04/02/2024 16:22, Yann E. MORIN wrote: > From: Fabrice Fontaine > > Commit 35af2bb8011ea57642777acf5613afa244d325d7 set > CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as > CONTAINERD_CPE_ID_PRODUCT will be set to the package name > (i.e. containerd) by default > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN > --- > package/containerd/containerd.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk > index 61a8472ddd..d3ca102797 100644 > --- a/package/containerd/containerd.mk > +++ b/package/containerd/containerd.mk > @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) > CONTAINERD_LICENSE = Apache-2.0 > CONTAINERD_LICENSE_FILES = LICENSE > CONTAINERD_CPE_ID_VENDOR = linuxfoundation > -CONTAINERD_CPE_ID_PRODUCT = containerd > > CONTAINERD_GOMOD = github.com/containerd/containerd > Looks good to me. Reviewed-by: Antoine Coutant Regards, Antoine Coutant. -------------- next part -------------- An HTML attachment was scrubbed... URL: From antoine.coutant at smile.fr Mon Feb 5 09:36:46 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 5 Feb 2024 10:36:46 +0100 Subject: [Buildroot] [PATCH 2/4] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT In-Reply-To: References: Message-ID: <73fc1bce-0fd8-4799-994f-6299dda87f70@smile.fr> On 04/02/2024 16:22, Yann E. MORIN wrote: > From: Fabrice Fontaine > > Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set > LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as > LIBCURL_CPE_ID_PRODUCT will be set to the package name > (i.e. libcurl) by default > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN > --- > package/libcurl/libcurl.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 3ecc587a52..83845b8e87 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ > LIBCURL_LICENSE = curl > LIBCURL_LICENSE_FILES = COPYING > LIBCURL_CPE_ID_VENDOR = haxx > -LIBCURL_CPE_ID_PRODUCT = libcurl > LIBCURL_INSTALL_STAGING = YES > > # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') Looks good to me. Reviewed-by: Antoine Coutant Regards, Antoine Coutant. -------------- next part -------------- An HTML attachment was scrubbed... URL: From giulio.benetti at benettiengineering.com Mon Feb 5 09:44:55 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 10:44:55 +0100 Subject: [Buildroot] [PATCH v2] configs/cubieboard1: new defconfig In-Reply-To: <20230810204844.803954-1-gero@schwaericke.email> References: <20221105194712.541286-1-gero@schwaericke.email> <20230810204844.803954-1-gero@schwaericke.email> Message-ID: <0c46f788-ff09-4506-a1dd-bde02986c438@benettiengineering.com> Hi Gero, sorry for the late reply, On 10/08/23 22:48, Gero Schw?ricke wrote: > Support for Cubieboard 1 from Cubietech. commit log lacks product URL. I'd go with: " This patch adds support for Cubietech Cubieboard1. Cubieboard1 features can be found here: http://www.cubietech.com/product-detail/cubieboard1/ " > Signed-off-by: Gero Schw?ricke > --- > Changes v1 -> v2: > - fix commit subject format > - add myself to DEVELOPERS > - add board/cubieboard1/readme.txt > - use extlinux.conf instead of boot.cmd > > DEVELOPERS | 4 +++ > board/cubietech/cubieboard1/genimage.cfg | 16 +++++++++ > board/cubietech/cubieboard1/readme.txt | 29 ++++++++++++++++ > .../boot/extlinux/extlinux.conf | 5 +++ > configs/cubieboard1_defconfig | 34 +++++++++++++++++++ > 5 files changed, 88 insertions(+) > create mode 100644 board/cubietech/cubieboard1/genimage.cfg > create mode 100644 board/cubietech/cubieboard1/readme.txt > create mode 100644 board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf > create mode 100644 configs/cubieboard1_defconfig > > -- > 2.25.1 > > diff --git a/DEVELOPERS b/DEVELOPERS > index 6ffa3ee693..82f2f8c8cd 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1137,6 +1137,10 @@ F: package/flannel/ > N: Geoffrey Ragot > F: package/python-pyyaml/ > > +N: Gero Schwaericke > +F: board/cubietech/cubieboard1/ > +F: configs/cubieboard1_defconfig > + > N: Gilles Talis > F: board/freescale/imx8mmevk/ > F: board/friendlyarm/nanopi-r2s/ > diff --git a/board/cubietech/cubieboard1/genimage.cfg b/board/cubietech/cubieboard1/genimage.cfg > new file mode 100644 > index 0000000000..92c8677545 > --- /dev/null > +++ b/board/cubietech/cubieboard1/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1016K # 1MB - 8KB > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + } > +} > diff --git a/board/cubietech/cubieboard1/readme.txt b/board/cubietech/cubieboard1/readme.txt > new file mode 100644 > index 0000000000..294b4e5eec > --- /dev/null > +++ b/board/cubietech/cubieboard1/readme.txt > @@ -0,0 +1,29 @@ > +Cubietech Cubieboard1 > +===================== > + > +Minimal configuration for the Cubietech Cubieboard1. It includes just what is > +needed to boot a bare Linux and login via serial console. > + > + > +Building > +======== > + > +Configure and build with > + > + make cubieboard1_defconfig > + make > + > + > +Flashing > +======== > + > +Flash the sdcard image onto a micro sdcard with > + > + dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync > + > + > +Running > +======= > + > +Connect a 3V3 serial interface to the serial header on the top side of the board > +(between the USB jacks and the A10 chip). Then provide power to the board. > diff --git a/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf b/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf > new file mode 100644 > index 0000000000..2fde683f38 > --- /dev/null > +++ b/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf > @@ -0,0 +1,5 @@ > +DEFAULT linux > +LABEL linux > + KERNEL /boot/zImage > + DEVICETREE /boot/sun4i-a10-cubieboard.dtb > + APPEND console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > diff --git a/configs/cubieboard1_defconfig b/configs/cubieboard1_defconfig > new file mode 100644 > index 0000000000..7ef20db669 > --- /dev/null > +++ b/configs/cubieboard1_defconfig > @@ -0,0 +1,34 @@ > +# Architecture > +BR2_arm=y > +BR2_cortex_a8=y > + > +# Toolchain options > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard" > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.9" > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-cubieboard" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_ROOTFS_OVERLAY="board/cubietech/cubieboard1/rootfs_overlay" > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard1/genimage.cfg" I've build tested successfully using utils/docker-run and the rest looks good to me so: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Mon Feb 5 09:46:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 10:46:40 +0100 Subject: [Buildroot] [git commit] packge/linux-pam: bump to version 1.6.0 Message-ID: <20240205094651.29EFA8699D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7794fa4c4e1d19a245bb0367cde94560432a2bc5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patches (already in version) https://github.com/linux-pam/linux-pam/releases/tag/v1.6.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-examples-tty_conv-fix-build-on-musl.patch | 40 ---------------------- ...0002-Fix-build-if-crypt_r-isn-t-available.patch | 37 -------------------- package/linux-pam/linux-pam.hash | 4 +-- package/linux-pam/linux-pam.mk | 2 +- 4 files changed, 3 insertions(+), 80 deletions(-) diff --git a/package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch b/package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch deleted file mode 100644 index c1257d64da..0000000000 --- a/package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5374f677e4cae669eb9accf2449178b602e8a40a Mon Sep 17 00:00:00 2001 -From: Violet Purcell -Date: Thu, 11 May 2023 12:50:34 -0400 -Subject: [PATCH] examples/tty_conv: fix build on musl - -termio.h is the old System V version of the interface header, and is -only provided in glibc and dietlibc as far as I can tell. -This fixes it to use the POSIX termios.h instead. - -Upstream: https://github.com/linux-pam/linux-pam/commit/5374f677e4cae669eb9accf2449178b602e8a40a - -Signed-off-by: Bernd Kuhls ---- - examples/tty_conv.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/examples/tty_conv.c b/examples/tty_conv.c -index 23f0684cc..9a0e1ad99 100644 ---- a/examples/tty_conv.c -+++ b/examples/tty_conv.c -@@ -6,8 +6,9 @@ - #include - #include - #include --#include -+#include - #include -+#include - - /*************************************** - * @brief echo off/on -@@ -16,7 +17,7 @@ - ***************************************/ - static void echoOff(int fd, int off) - { -- struct termio tty; -+ struct termios tty; - if (ioctl(fd, TCGETA, &tty) < 0) - { - fprintf(stderr, "TCGETA failed: %s\n", strerror(errno)); diff --git a/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch b/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch deleted file mode 100644 index c7fdd8be36..0000000000 --- a/package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b82acc21f1e2f76d4cb0c75bb4958751562039ab Mon Sep 17 00:00:00 2001 -From: Bernhard Rosenkr??nzer -Date: Wed, 7 Jun 2023 19:49:01 +0200 -Subject: [PATCH] Fix build if crypt_r isn't available -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -retval was being defined only in #ifdef HAVE_CRYPT_R, but used -unconditionally. - -Signed-off-by: Bernhard Rosenkr??nzer -Fixes: bcba17939e1b ("modules: make use of secure memory erasure") -Signed-off-by: Waldemar Brodkorb -Upstream: https://github.com/linux-pam/linux-pam/commit/b82acc21f1e2f76d4cb0c75bb4958751562039ab ---- - modules/pam_pwhistory/opasswd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c -index 479e3fc4..fc610e2f 100644 ---- a/modules/pam_pwhistory/opasswd.c -+++ b/modules/pam_pwhistory/opasswd.c -@@ -128,9 +128,9 @@ static int - compare_password(const char *newpass, const char *oldpass) - { - char *outval; -+ int retval; - #ifdef HAVE_CRYPT_R - struct crypt_data output; -- int retval; - - output.initialized = 0; - --- -2.39.2 - diff --git a/package/linux-pam/linux-pam.hash b/package/linux-pam/linux-pam.hash index 97acbd7adc..cd882715cb 100644 --- a/package/linux-pam/linux-pam.hash +++ b/package/linux-pam/linux-pam.hash @@ -1,6 +1,6 @@ # Locally computed hashes after checking signature at -# https://github.com/linux-pam/linux-pam/releases/download/v1.5.3/Linux-PAM-1.5.3.tar.xz.asc +# https://github.com/linux-pam/linux-pam/releases/download/v1.6.0/Linux-PAM-1.6.0.tar.xz.asc # signed with the key 8C6BFD92EE0F42EDF91A6A736D1A7F052E5924BB -sha256 7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283 Linux-PAM-1.5.3.tar.xz +sha256 fff4a34e5bbee77e2e8f1992f27631e2329bcbf8a0563ddeb5c3389b4e3169ad Linux-PAM-1.6.0.tar.xz # Locally computed sha256 133d98e7a2ab3ffd330b4debb0bfc10fea21e4b2b5a5b09de2e924293be5ff08 Copyright diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index 92d8c952ac..89a46e81df 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_PAM_VERSION = 1.5.3 +LINUX_PAM_VERSION = 1.6.0 LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.xz LINUX_PAM_SITE = https://github.com/linux-pam/linux-pam/releases/download/v$(LINUX_PAM_VERSION) LINUX_PAM_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 5 09:49:24 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 10:49:24 +0100 Subject: [Buildroot] [PATCH 1/1] packge/linux-pam: bump to version 1.6.0 In-Reply-To: <20240131212724.2227850-1-fontaine.fabrice@gmail.com> References: <20240131212724.2227850-1-fontaine.fabrice@gmail.com> Message-ID: <20240205104924.7b831670@windsurf> On Wed, 31 Jan 2024 22:27:23 +0100 Fabrice Fontaine wrote: > Drop patches (already in version) > > https://github.com/linux-pam/linux-pam/releases/tag/v1.6.0 > > Signed-off-by: Fabrice Fontaine > --- > ...-examples-tty_conv-fix-build-on-musl.patch | 40 ------------------- > ...Fix-build-if-crypt_r-isn-t-available.patch | 37 ----------------- > package/linux-pam/linux-pam.hash | 4 +- > package/linux-pam/linux-pam.mk | 2 +- > 4 files changed, 3 insertions(+), 80 deletions(-) > delete mode 100644 package/linux-pam/0001-examples-tty_conv-fix-build-on-musl.patch > delete mode 100644 package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 09:49:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 10:49:18 +0100 Subject: [Buildroot] [git commit] package/fluent-bit: bump to v2.2.2 Message-ID: <20240205094953.45D55869B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00599be13ed5022bab7e49fee8db07e20af8a4ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A bunch of release notes: https://fluentbit.io/announcements/v2.1.8 https://fluentbit.io/announcements/v2.1.9 https://fluentbit.io/announcements/v2.1.10 https://fluentbit.io/announcements/v2.2.0 https://fluentbit.io/announcements/v2.2.1 https://fluentbit.io/announcements/v2.2.2 In addition: - Dropped -fcommon fix for monkey (multiple definitions of `mk_tls_*'), as this is fixed upstream [1]. - Added WAMR related patches. - Rebased the patches for v2.2.2. [1] https://github.com/monkey/monkey/commit/627422b901af5c3c5b770d02c4a4567a0a8a61e6. Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- ...d-use-the-system-provided-LuaJIT-if-found.patch | 12 +-- ...fka-CMakeLists.txt-allow-compilation-with.patch | 25 +++--- ...txt-disable-cxx-support-for-librdkafka-77.patch | 8 +- ...asm-restore-support-for-some-targets-8401.patch | 43 ++++++++++ ...ting-write-gs-base-with-cmake-variable-30.patch | 99 ++++++++++++++++++++++ package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 6 +- 7 files changed, 167 insertions(+), 28 deletions(-) diff --git a/package/fluent-bit/0001-build-use-the-system-provided-LuaJIT-if-found.patch b/package/fluent-bit/0001-build-use-the-system-provided-LuaJIT-if-found.patch index 9f6f4d0ebb..aca6401ac8 100644 --- a/package/fluent-bit/0001-build-use-the-system-provided-LuaJIT-if-found.patch +++ b/package/fluent-bit/0001-build-use-the-system-provided-LuaJIT-if-found.patch @@ -1,4 +1,4 @@ -From 4f8eb7bb5a39d83374806928b7a5b622136ef055 Mon Sep 17 00:00:00 2001 +From 8d6f6cfb07a8fe32dc0b9577e1b2f1ee1b67b736 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 28 Apr 2023 10:25:16 +0200 Subject: [PATCH] build: use the system provided LuaJIT if found @@ -15,10 +15,10 @@ Signed-off-by: Thomas Devoogdt 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9af783c79..0601b7c18 100644 +index 2da792d53..3229420c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -123,6 +123,7 @@ option(FLB_TESTS_INTERNAL_FUZZ "Enable internal fuzz tests" No) +@@ -128,6 +128,7 @@ option(FLB_TESTS_INTERNAL_FUZZ "Enable internal fuzz tests" No) option(FLB_TESTS_OSSFUZZ "Enable OSS-Fuzz build" No) option(FLB_MTRACE "Enable mtrace support" No) option(FLB_POSIX_TLS "Force POSIX thread storage" No) @@ -26,7 +26,7 @@ index 9af783c79..0601b7c18 100644 option(FLB_INOTIFY "Enable inotify support" Yes) option(FLB_SQLDB "Enable SQL embedded DB" Yes) option(FLB_HTTP_SERVER "Enable HTTP Server" Yes) -@@ -1003,7 +1004,16 @@ endif() +@@ -1023,7 +1024,16 @@ endif() # LuaJIT (Scripting Support) # ========================== if(FLB_LUAJIT) @@ -45,10 +45,10 @@ index 9af783c79..0601b7c18 100644 endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 06a206dd4..8b66ddd22 100644 +index b6233d9f7..67baec456 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -220,7 +220,7 @@ endif() +@@ -221,7 +221,7 @@ endif() if(FLB_LUAJIT) set(extra_libs ${extra_libs} diff --git a/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch b/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch index a315fbf7ef..bcfe3ea859 100644 --- a/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch +++ b/package/fluent-bit/0002-lib-librdkafka-CMakeLists.txt-allow-compilation-with.patch @@ -1,4 +1,4 @@ -From d5492ae7a0fa4e2c19b1d091ad28133fed53d8e2 Mon Sep 17 00:00:00 2001 +From 29be5275f6f7e15aca768e9b235998abc5a604e2 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 25 Jul 2023 09:10:41 +0200 Subject: [PATCH] lib: librdkafka: CMakeLists.txt: allow compilation without @@ -10,14 +10,14 @@ Upstream: https://github.com/confluentinc/librdkafka/pull/4366 Upstream: https://github.com/fluent/fluent-bit/pull/7765 Signed-off-by: Thomas Devoogdt --- - lib/librdkafka-2.1.0/CMakeLists.txt | 18 ++++++++++-- - lib/librdkafka-2.1.0/examples/CMakeLists.txt | 30 +++++++++++++------- - 2 files changed, 35 insertions(+), 13 deletions(-) + lib/librdkafka-2.3.0/CMakeLists.txt | 18 ++++++++++-- + lib/librdkafka-2.3.0/examples/CMakeLists.txt | 31 +++++++++++++------- + 2 files changed, 35 insertions(+), 14 deletions(-) -diff --git a/lib/librdkafka-2.1.0/CMakeLists.txt b/lib/librdkafka-2.1.0/CMakeLists.txt +diff --git a/lib/librdkafka-2.3.0/CMakeLists.txt b/lib/librdkafka-2.3.0/CMakeLists.txt index 7f3dd0fc6..c1ee93062 100644 ---- a/lib/librdkafka-2.1.0/CMakeLists.txt -+++ b/lib/librdkafka-2.1.0/CMakeLists.txt +--- a/lib/librdkafka-2.3.0/CMakeLists.txt ++++ b/lib/librdkafka-2.3.0/CMakeLists.txt @@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 3.2) include("packaging/cmake/parseversion.cmake") parseversion("src/rdkafka.h") @@ -57,10 +57,10 @@ index 7f3dd0fc6..c1ee93062 100644 if(RDKAFKA_BUILD_EXAMPLES) add_subdirectory(examples) -diff --git a/lib/librdkafka-2.1.0/examples/CMakeLists.txt b/lib/librdkafka-2.1.0/examples/CMakeLists.txt -index bbbb89ad9..51b8b04be 100644 ---- a/lib/librdkafka-2.1.0/examples/CMakeLists.txt -+++ b/lib/librdkafka-2.1.0/examples/CMakeLists.txt +diff --git a/lib/librdkafka-2.3.0/examples/CMakeLists.txt b/lib/librdkafka-2.3.0/examples/CMakeLists.txt +index 8c0079abe..c9336b729 100644 +--- a/lib/librdkafka-2.3.0/examples/CMakeLists.txt ++++ b/lib/librdkafka-2.3.0/examples/CMakeLists.txt @@ -5,8 +5,10 @@ endif(WIN32) add_executable(producer producer.c ${win32_sources}) target_link_libraries(producer PUBLIC rdkafka) @@ -101,12 +101,13 @@ index bbbb89ad9..51b8b04be 100644 add_executable(misc misc.c ${win32_sources}) target_link_libraries(misc PUBLIC rdkafka) -@@ -35,6 +43,8 @@ if(NOT WIN32) +@@ -70,7 +78,8 @@ if(NOT WIN32) add_executable(rdkafka_complex_consumer_example rdkafka_complex_consumer_example.c) target_link_libraries(rdkafka_complex_consumer_example PUBLIC rdkafka) - add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp) - target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++) +- + if(RDKAFKA_BUILD_CXX) + add_executable(kafkatest_verifiable_client kafkatest_verifiable_client.cpp) + target_link_libraries(kafkatest_verifiable_client PUBLIC rdkafka++) diff --git a/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch b/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch index 0022d5929c..c96a7bdaa0 100644 --- a/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch +++ b/package/fluent-bit/0003-CMakeLists.txt-disable-cxx-support-for-librdkafka-77.patch @@ -1,4 +1,4 @@ -From f5303533fb64bf038dbd8203ac52d94819346239 Mon Sep 17 00:00:00 2001 +From 7f3fc55b734db2d28af63c393b52bc238af9f20a Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 25 Jul 2023 10:00:36 +0200 Subject: [PATCH] CMakeLists.txt: disable cxx support for librdkafka #7741 @@ -6,17 +6,17 @@ Subject: [PATCH] CMakeLists.txt: disable cxx support for librdkafka #7741 Fluent-bit is c only, so no need to compile cxx. This fixes also a compile error in buildroot. -Upstream: https://github.com/fluent/fluent-bit/pull/7765/commits +Upstream: https://github.com/fluent/fluent-bit/pull/7765 Signed-off-by: Thomas Devoogdt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index df6b283cf..10e6071f3 100644 +index 3229420c6..2694f189f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -967,6 +967,7 @@ if(FLB_BACKTRACE) +@@ -979,6 +979,7 @@ if(FLB_BACKTRACE) endif() if(FLB_IN_KAFKA OR FLB_OUT_KAFKA) diff --git a/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch b/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch new file mode 100644 index 0000000000..ed6206268f --- /dev/null +++ b/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch @@ -0,0 +1,43 @@ +From 4a6c5f56cd1a979b91c168fb8e245587c2927aca Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 22 Jan 2024 19:27:56 +0100 +Subject: [PATCH] wasm: restore support for some targets (#8401) + +Somehow, support for ARC, MIPS, and XTENSA got dropped by bumping to v1.3.0, +so restore it now. Remark that those targets are mentioned in the section above. + +See commit fa6a248746f9f481b5f6aef49716141fa0222650. + +Upstream: https://github.com/fluent/fluent-bit/pull/8401 +Signed-off-by: Thomas Devoogdt +--- + src/wasm/CMakeLists.txt | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/wasm/CMakeLists.txt b/src/wasm/CMakeLists.txt +index a258dc063..4ea7eba65 100644 +--- a/src/wasm/CMakeLists.txt ++++ b/src/wasm/CMakeLists.txt +@@ -51,6 +51,10 @@ elseif (WAMR_BUILD_TARGET MATCHES "AARCH64.*") + elseif (WAMR_BUILD_TARGET MATCHES "ARM.*") + add_definitions(-DBUILD_TARGET_ARM) + add_definitions(-DBUILD_TARGET="${WAMR_BUILD_TARGET}") ++elseif (WAMR_BUILD_TARGET STREQUAL "MIPS") ++ add_definitions(-DBUILD_TARGET_MIPS) ++elseif (WAMR_BUILD_TARGET STREQUAL "XTENSA") ++ add_definitions(-DBUILD_TARGET_XTENSA) + elseif (WAMR_BUILD_TARGET STREQUAL "RISCV64" OR WAMR_BUILD_TARGET STREQUAL "RISCV64_LP64D") + add_definitions(-DBUILD_TARGET_RISCV64_LP64D) + elseif (WAMR_BUILD_TARGET STREQUAL "RISCV64_LP64") +@@ -59,6 +63,8 @@ elseif (WAMR_BUILD_TARGET STREQUAL "RISCV32" OR WAMR_BUILD_TARGET STREQUAL "RISC + add_definitions(-DBUILD_TARGET_RISCV32_ILP32D) + elseif (WAMR_BUILD_TARGET STREQUAL "RISCV32_ILP32") + add_definitions(-DBUILD_TARGET_RISCV32_ILP32) ++elseif (WAMR_BUILD_TARGET STREQUAL "ARC") ++ add_definitions(-DBUILD_TARGET_ARC) + else () + message (FATAL_ERROR "-- Build target isn't set") + endif () +-- +2.34.1 + diff --git a/package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch b/package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch new file mode 100644 index 0000000000..9cdab4c47a --- /dev/null +++ b/package/fluent-bit/0005-Enhance-setting-write-gs-base-with-cmake-variable-30.patch @@ -0,0 +1,99 @@ +From 7eacb2ab839e74cb07038398def5e3cc198448d4 Mon Sep 17 00:00:00 2001 +From: Wenyong Huang +Date: Tue, 23 Jan 2024 12:21:20 +0800 +Subject: [PATCH] Enhance setting write gs base with cmake variable (#3066) + +In linux x86-64, developer can use cmake variable to configure whether +to enable writing linear memory base address to x86 GS register or not: +- `cmake -DWAMR_DISABLE_WRITE_GS_BASE=1`: disabled it +- `cmake -DWAMR_DISABLE_WRITE_GS_BASE=0`: enabled it +- `cmake` without `-DWAMR_DISABLE_WRITE_GS_BASE=1/0`: + auto-detected by the compiler + +Upstream: https://github.com/bytecodealliance/wasm-micro-runtime/pull/3066 +Signed-off-by: Thomas Devoogdt +--- + .../build-scripts/config_common.cmake | 65 ++++++++++++------- + 1 file changed, 41 insertions(+), 24 deletions(-) + +diff --git a/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake b/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake +index e73ebc85f..a61a522f3 100644 +--- a/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake ++++ b/lib/wasm-micro-runtime-WAMR-1.3.0/build-scripts/config_common.cmake +@@ -408,32 +408,49 @@ if (WAMR_BUILD_STATIC_PGO EQUAL 1) + add_definitions (-DWASM_ENABLE_STATIC_PGO=1) + message (" AOT static PGO enabled") + endif () +-if (WAMR_DISABLE_WRITE_GS_BASE EQUAL 1) +- add_definitions (-DWASM_DISABLE_WRITE_GS_BASE=1) +- message (" Write linear memory base addr to x86 GS register disabled") +-elseif (WAMR_BUILD_TARGET STREQUAL "X86_64" +- AND WAMR_BUILD_PLATFORM STREQUAL "linux") +- set (TEST_WRGSBASE_SOURCE "${CMAKE_BINARY_DIR}/test_wrgsbase.c") +- file (WRITE "${TEST_WRGSBASE_SOURCE}" " +- #include +- #include +- int main() { +- uint64_t value; +- asm volatile (\"wrgsbase %0\" : : \"r\"(value)); +- printf(\"WRGSBASE instruction is available.\\n\"); +- return 0; +- }") +- # Try to compile and run the test program +- try_run (TEST_WRGSBASE_RESULT +- TEST_WRGSBASE_COMPILED +- ${CMAKE_BINARY_DIR}/test_wrgsbase +- SOURCES ${TEST_WRGSBASE_SOURCE} +- CMAKE_FLAGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} +- ) +- #message("${TEST_WRGSBASE_COMPILED}, ${TEST_WRGSBASE_RESULT}") +- if (NOT TEST_WRGSBASE_RESULT EQUAL 0) ++if (WAMR_BUILD_TARGET STREQUAL "X86_64" ++ AND WAMR_BUILD_PLATFORM STREQUAL "linux") ++ if (WAMR_DISABLE_WRITE_GS_BASE EQUAL 1) ++ # disabled by user ++ set (DISABLE_WRITE_GS_BASE 1) ++ elseif (WAMR_DISABLE_WRITE_GS_BASE EQUAL 0) ++ # enabled by user ++ set (DISABLE_WRITE_GS_BASE 0) ++ elseif (CMAKE_CROSSCOMPILING) ++ # disabled in cross compilation environment ++ set (DISABLE_WRITE_GS_BASE 1) ++ else () ++ # auto-detected by the compiler ++ set (TEST_WRGSBASE_SOURCE "${CMAKE_BINARY_DIR}/test_wrgsbase.c") ++ file (WRITE "${TEST_WRGSBASE_SOURCE}" " ++ #include ++ #include ++ int main() { ++ uint64_t value; ++ asm volatile (\"wrgsbase %0\" : : \"r\"(value)); ++ printf(\"WRGSBASE instruction is available.\\n\"); ++ return 0; ++ }") ++ # Try to compile and run the test program ++ try_run (TEST_WRGSBASE_RESULT ++ TEST_WRGSBASE_COMPILED ++ ${CMAKE_BINARY_DIR}/test_wrgsbase ++ SOURCES ${TEST_WRGSBASE_SOURCE} ++ CMAKE_FLAGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} ++ ) ++ #message("${TEST_WRGSBASE_COMPILED}, ${TEST_WRGSBASE_RESULT}") ++ if (TEST_WRGSBASE_RESULT EQUAL 0) ++ set (DISABLE_WRITE_GS_BASE 0) ++ else () ++ set (DISABLE_WRITE_GS_BASE 1) ++ endif () ++ endif () ++ if (DISABLE_WRITE_GS_BASE EQUAL 1) + add_definitions (-DWASM_DISABLE_WRITE_GS_BASE=1) + message (" Write linear memory base addr to x86 GS register disabled") ++ else () ++ add_definitions (-DWASM_DISABLE_WRITE_GS_BASE=0) ++ message (" Write linear memory base addr to x86 GS register enabled") + endif () + endif () + if (WAMR_CONFIGUABLE_BOUNDS_CHECKS EQUAL 1) +-- +2.34.1 + diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index 7e2059109a..2c34583f7a 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed80291d660be19f8458d81796c7d3f7e8735eb48ec393467a0c9deca2e9abc3 fluent-bit-2.1.7.tar.gz +sha256 8e7e951b2907e9d29508699c71c8949a4a22d750d54ffa5ee5b96537e59371dd fluent-bit-2.2.2.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 1185860661..e51322aad6 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.1.7 +FLUENT_BIT_VERSION = 2.2.2 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE @@ -55,10 +55,6 @@ FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_INSTALL_SYSCONFDIR="/etc/" -# Fix multiple definition of `mk_tls_*'. -# https://github.com/fluent/fluent-bit/issues/5537 -FLUENT_BIT_CFLAGS += -fcommon - # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h # large file support. # https://bugzilla.redhat.com/show_bug.cgi?id=574992 From peter at korsgaard.com Mon Feb 5 09:50:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 10:50:54 +0100 Subject: [Buildroot] [PATCH v1] package/fluent-bit: bump to v2.2.2 In-Reply-To: <20240123091317.293492-1-thomas@devoogdt.com> (Thomas Devoogdt's message of "Tue, 23 Jan 2024 10:13:17 +0100") References: <20240123091317.293492-1-thomas@devoogdt.com> Message-ID: <877cjjw875.fsf@48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > A bunch of release notes: > https://fluentbit.io/announcements/v2.1.8 > https://fluentbit.io/announcements/v2.1.9 > https://fluentbit.io/announcements/v2.1.10 > https://fluentbit.io/announcements/v2.2.0 > https://fluentbit.io/announcements/v2.2.1 > https://fluentbit.io/announcements/v2.2.2 > In addition: > - Dropped -fcommon fix for monkey (multiple definitions of `mk_tls_*'), > as this is fixed upstream [1]. > - Added WAMR related patches. > - Rebased the patches for v2.2.2. > [1] https://github.com/monkey/monkey/commit/627422b901af5c3c5b770d02c4a4567a0a8a61e6. > Signed-off-by: Thomas Devoogdt Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 5 09:52:31 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 10:52:31 +0100 Subject: [Buildroot] [git commit] package/libblockdev: bump to version 3.1.0 Message-ID: <20240205095256.ED2AA869CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6410ac6918add0070716dbcf61327457a676e4fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master * Rework strerror_l() patch by declaring it only in utils.h as a macro * select BR2_PACKAGE_UTIL_LINUX_LIBUUID since it's now mandatory Signed-off-by: Giulio Benetti [Arnout: - Preserve author of patch 0001. - Update .checkpackageignore. ] Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - ...ovide-replacement-function-for-strerror_l.patch | 158 ++++----------------- package/libblockdev/Config.in | 5 +- package/libblockdev/libblockdev.hash | 2 +- package/libblockdev/libblockdev.mk | 2 +- 5 files changed, 34 insertions(+), 134 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index a95aaf262c..15ceb65fd8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -594,7 +594,6 @@ package/libatasmart/0001-strpool-cross-flags.patch Upstream package/libavl/0001-fix-makefile.patch Upstream package/libb64/0001-Integer-overflows.patch Upstream package/libb64/0002-Initialize-C++-objects.patch Upstream -package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch Upstream package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch Upstream package/libcec/0001-cecloader-h-fix-null-return.patch Upstream package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch Upstream diff --git a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch index 987d28f82e..f7f75c9c14 100644 --- a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch +++ b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch @@ -1,29 +1,25 @@ -From 2acf5a8d4858035396ee45d96c824e0481644d36 Mon Sep 17 00:00:00 2001 +From 01883cc14904e55d90955ad7cd9fc55bc18364ac Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni -Date: Sat, 29 Aug 2020 16:04:15 +0200 +Date: Sat, 20 Jan 2024 13:29:28 +0100 Subject: [PATCH] Provide replacement function for strerror_l() strerror_l() is not implemented in some C libraries, such as uClibc, -so let's provide a simple replacement function that falls back on -strerror(). +so let's provide a simple replacement define that falls back on +strerror() in utils.h header and include it where missing. -Upstream status: Not Applicable since it's due uclibc only +Upstream: N/A since it's due uclibc only Signed-off-by: Thomas Petazzoni Signed-off-by: Giulio Benetti -[Giulio: ported to version 3.0+] +[Giulio: ported to version 3.0 and 3.1] --- - configure.ac | 2 ++ - src/plugins/crypto.c | 7 +++++++ - src/plugins/nvme/nvme-error.c | 8 ++++++++ - src/plugins/nvme/nvme-fabrics.c | 8 ++++++++ - src/plugins/nvme/nvme-op.c | 8 ++++++++ - src/plugins/part.c | 9 +++++++++ - src/utils/module.c | 8 +++++++- - 7 files changed, 49 insertions(+), 1 deletion(-) + configure.ac | 2 ++ + src/utils/module.c | 1 + + src/utils/utils.h | 4 ++++ + 3 files changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac -index 0a8ce4a7..dfbddb39 100644 +index 02b26e3e..67341134 100644 --- a/configure.ac +++ b/configure.ac @@ -120,6 +120,8 @@ AC_CHECK_HEADERS([dlfcn.h string.h unistd.h sys/fcntl.h sys/ioctl.h linux/random @@ -35,127 +31,33 @@ index 0a8ce4a7..dfbddb39 100644 AC_ARG_WITH([escrow], AS_HELP_STRING([--with-escrow], [support escrow @<:@default=yes@:>@]), [], -diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c -index c5f719ca..b2ae3f56 100644 ---- a/src/plugins/crypto.c -+++ b/src/plugins/crypto.c -@@ -62,6 +62,13 @@ - - #define UNUSED __attribute__((unused)) - -+#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} -+#endif -+ - /** - * SECTION: crypto - * @short_description: plugin for operations with encrypted devices -diff --git a/src/plugins/nvme/nvme-error.c b/src/plugins/nvme/nvme-error.c -index 4bd4d771..618b6aef 100644 ---- a/src/plugins/nvme/nvme-error.c -+++ b/src/plugins/nvme/nvme-error.c -@@ -34,6 +34,14 @@ - #include "nvme.h" - #include "nvme-private.h" - -+#define UNUSED __attribute__((unused)) -+ -+#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} -+#endif - - /** - * bd_nvme_error_quark: (skip) -diff --git a/src/plugins/nvme/nvme-fabrics.c b/src/plugins/nvme/nvme-fabrics.c -index 1877845f..5fcbeddc 100644 ---- a/src/plugins/nvme/nvme-fabrics.c -+++ b/src/plugins/nvme/nvme-fabrics.c -@@ -36,6 +36,14 @@ - #include "nvme.h" - #include "nvme-private.h" - -+#define UNUSED __attribute__((unused)) -+ -+#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} -+#endif - - /* nvme-cli defaults */ - #define PATH_NVMF_CONFIG "/etc/nvme/config.json" -diff --git a/src/plugins/nvme/nvme-op.c b/src/plugins/nvme/nvme-op.c -index dbef4f3a..7bafd7a3 100644 ---- a/src/plugins/nvme/nvme-op.c -+++ b/src/plugins/nvme/nvme-op.c -@@ -35,6 +35,14 @@ - #include "nvme.h" - #include "nvme-private.h" - -+#define UNUSED __attribute__((unused)) -+ -+#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} -+#endif - - /** - * bd_nvme_device_self_test: -diff --git a/src/plugins/part.c b/src/plugins/part.c -index 46d31137..6234e013 100644 ---- a/src/plugins/part.c -+++ b/src/plugins/part.c -@@ -26,6 +26,15 @@ - - #include "part.h" - -+#define UNUSED __attribute__((unused)) -+ -+#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} -+#endif -+ - /** - * SECTION: part - * @short_description: plugin for operations with partition tables diff --git a/src/utils/module.c b/src/utils/module.c -index 6557c3ab..69dd4731 100644 +index 6557c3ab..5893f0ac 100644 --- a/src/utils/module.c +++ b/src/utils/module.c -@@ -74,6 +74,13 @@ static void set_kmod_logging (struct kmod_ctx *ctx) { - kmod_set_log_fn (ctx, utils_kmod_log_redirect, NULL); - } +@@ -28,6 +28,7 @@ + #include "module.h" + #include "exec.h" + #include "logging.h" ++#include "utils.h" + + #define UNUSED __attribute__((unused)) + +diff --git a/src/utils/utils.h b/src/utils/utils.h +index 801a8b6e..b2bdf0d0 100644 +--- a/src/utils/utils.h ++++ b/src/utils/utils.h +@@ -9,6 +9,10 @@ + #include "dbus.h" + #include "logging.h" +#if !defined(HAVE_STRERROR_L) -+static char *strerror_l(int errnum, locale_t locale UNUSED) -+{ -+ return strerror(errnum); -+} ++#define strerror_l(errnum, locale) strerror(errnum) +#endif + /** - * bd_utils_have_kernel_module: - * @module_name: name of the kernel module to check -@@ -259,7 +266,6 @@ gboolean bd_utils_unload_kernel_module (const gchar *module_name, GError **error - return TRUE; - } - -- - static BDUtilsLinuxVersion detected_linux_ver; - static gboolean have_linux_ver = FALSE; - + * SECTION: utils + * @short_description: library providing utility functions used by the blockdev library and its plugins -- 2.34.1 diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 527ba79e4e..e0449628b4 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_LIBBLOCKDEV depends on BR2_ENABLE_LOCALE select BR2_PACKAGE_KMOD select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help libblockdev is a C library supporting GObject introspection for manipulation of block devices. It has a plugin-based @@ -30,7 +32,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO config BR2_PACKAGE_LIBBLOCKDEV_FS bool "filesystem" depends on BR2_ENABLE_LOCALE # parted - select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_PARTED select BR2_PACKAGE_E2FSPROGS @@ -62,7 +63,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_PART bool "part" depends on BR2_ENABLE_LOCALE # parted select BR2_PACKAGE_PARTED - select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBFDISK comment "part plugin needs a toolchain w/ locale" @@ -70,7 +70,6 @@ comment "part plugin needs a toolchain w/ locale" config BR2_PACKAGE_LIBBLOCKDEV_SWAP bool "swap" - select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBBLKID endif diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash index 5f9a8a7e6c..79700a4996 100644 --- a/package/libblockdev/libblockdev.hash +++ b/package/libblockdev/libblockdev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 49841ff92db0ab032931e6f2b5eab63e5969b0ddc14b067b60e46a6eb6c60e47 libblockdev-3.0.4.tar.gz +sha256 41e4af66c9d78e795302d37825dfd88a4970f82da7b4ebe6487feba2afae44fb libblockdev-3.1.0.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk index e0fca2b95c..ebf01acfb5 100644 --- a/package/libblockdev/libblockdev.mk +++ b/package/libblockdev/libblockdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLOCKDEV_VERSION = 3.0.4 +LIBBLOCKDEV_VERSION = 3.1.0 LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 LIBBLOCKDEV_LICENSE = LGPL-2.1 LIBBLOCKDEV_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 09:54:29 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 10:54:29 +0100 Subject: [Buildroot] [PATCH v2] package/libblockdev: bump to version 3.1.0 In-Reply-To: <20240122160949.4052959-1-giulio.benetti@benettiengineering.com> References: <20240122160949.4052959-1-giulio.benetti@benettiengineering.com> Message-ID: On 22/01/2024 17:09, Giulio Benetti wrote: > * Rework strerror_l() patch by declaring it only in utils.h as a macro > * select BR2_PACKAGE_UTIL_LINUX_LIBUUID since it's now mandatory > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * reworked local strerror_l() patch as a macro to avoid adding a second patch > * selected BR2_PACKAGE_UTIL_LINUX_LIBUUID by default > --- > ...-replacement-function-for-strerror_l.patch | 160 ++++-------------- > package/libblockdev/Config.in | 5 +- > package/libblockdev/libblockdev.hash | 2 +- > package/libblockdev/libblockdev.mk | 2 +- > 4 files changed, 35 insertions(+), 134 deletions(-) > > diff --git a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch > index 987d28f82e..e5819a4e9c 100644 > --- a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch > +++ b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch > @@ -1,29 +1,25 @@ > -From 2acf5a8d4858035396ee45d96c824e0481644d36 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Sat, 29 Aug 2020 16:04:15 +0200 > +From 01883cc14904e55d90955ad7cd9fc55bc18364ac Mon Sep 17 00:00:00 2001 > +From: Giulio Benetti You really should have kept Thomas as the author. > +Date: Sat, 20 Jan 2024 13:29:28 +0100 > Subject: [PATCH] Provide replacement function for strerror_l() > > strerror_l() is not implemented in some C libraries, such as uClibc, > -so let's provide a simple replacement function that falls back on > -strerror(). > +so let's provide a simple replacement define that falls back on > +strerror() in utils.h header and include it where missing. > > -Upstream status: Not Applicable since it's due uclibc only > +Upstream: N/A since it's due uclibc only This fixes check-package, so it must be removed from .checkpackageignore. Applied to master with those two fixed, thanks. Regards, Arnout > > Signed-off-by: Thomas Petazzoni > Signed-off-by: Giulio Benetti > -[Giulio: ported to version 3.0+] > +[Giulio: ported to version 3.0 and 3.1] > --- > - configure.ac | 2 ++ > - src/plugins/crypto.c | 7 +++++++ > - src/plugins/nvme/nvme-error.c | 8 ++++++++ > - src/plugins/nvme/nvme-fabrics.c | 8 ++++++++ > - src/plugins/nvme/nvme-op.c | 8 ++++++++ > - src/plugins/part.c | 9 +++++++++ > - src/utils/module.c | 8 +++++++- > - 7 files changed, 49 insertions(+), 1 deletion(-) > + configure.ac | 2 ++ > + src/utils/module.c | 1 + > + src/utils/utils.h | 4 ++++ > + 3 files changed, 7 insertions(+) > > diff --git a/configure.ac b/configure.ac > -index 0a8ce4a7..dfbddb39 100644 > +index 02b26e3e..67341134 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -120,6 +120,8 @@ AC_CHECK_HEADERS([dlfcn.h string.h unistd.h sys/fcntl.h sys/ioctl.h linux/random > @@ -35,127 +31,33 @@ index 0a8ce4a7..dfbddb39 100644 > AC_ARG_WITH([escrow], > AS_HELP_STRING([--with-escrow], [support escrow @<:@default=yes@:>@]), > [], > -diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c > -index c5f719ca..b2ae3f56 100644 > ---- a/src/plugins/crypto.c > -+++ b/src/plugins/crypto.c > -@@ -62,6 +62,13 @@ > - > - #define UNUSED __attribute__((unused)) > - > -+#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > -+#endif > -+ > - /** > - * SECTION: crypto > - * @short_description: plugin for operations with encrypted devices > -diff --git a/src/plugins/nvme/nvme-error.c b/src/plugins/nvme/nvme-error.c > -index 4bd4d771..618b6aef 100644 > ---- a/src/plugins/nvme/nvme-error.c > -+++ b/src/plugins/nvme/nvme-error.c > -@@ -34,6 +34,14 @@ > - #include "nvme.h" > - #include "nvme-private.h" > - > -+#define UNUSED __attribute__((unused)) > -+ > -+#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > -+#endif > - > - /** > - * bd_nvme_error_quark: (skip) > -diff --git a/src/plugins/nvme/nvme-fabrics.c b/src/plugins/nvme/nvme-fabrics.c > -index 1877845f..5fcbeddc 100644 > ---- a/src/plugins/nvme/nvme-fabrics.c > -+++ b/src/plugins/nvme/nvme-fabrics.c > -@@ -36,6 +36,14 @@ > - #include "nvme.h" > - #include "nvme-private.h" > - > -+#define UNUSED __attribute__((unused)) > -+ > -+#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > -+#endif > - > - /* nvme-cli defaults */ > - #define PATH_NVMF_CONFIG "/etc/nvme/config.json" > -diff --git a/src/plugins/nvme/nvme-op.c b/src/plugins/nvme/nvme-op.c > -index dbef4f3a..7bafd7a3 100644 > ---- a/src/plugins/nvme/nvme-op.c > -+++ b/src/plugins/nvme/nvme-op.c > -@@ -35,6 +35,14 @@ > - #include "nvme.h" > - #include "nvme-private.h" > - > -+#define UNUSED __attribute__((unused)) > -+ > -+#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > -+#endif > - > - /** > - * bd_nvme_device_self_test: > -diff --git a/src/plugins/part.c b/src/plugins/part.c > -index 46d31137..6234e013 100644 > ---- a/src/plugins/part.c > -+++ b/src/plugins/part.c > -@@ -26,6 +26,15 @@ > - > - #include "part.h" > - > -+#define UNUSED __attribute__((unused)) > -+ > -+#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > -+#endif > -+ > - /** > - * SECTION: part > - * @short_description: plugin for operations with partition tables > diff --git a/src/utils/module.c b/src/utils/module.c > -index 6557c3ab..69dd4731 100644 > +index 6557c3ab..5893f0ac 100644 > --- a/src/utils/module.c > +++ b/src/utils/module.c > -@@ -74,6 +74,13 @@ static void set_kmod_logging (struct kmod_ctx *ctx) { > - kmod_set_log_fn (ctx, utils_kmod_log_redirect, NULL); > - } > +@@ -28,6 +28,7 @@ > + #include "module.h" > + #include "exec.h" > + #include "logging.h" > ++#include "utils.h" > + > + #define UNUSED __attribute__((unused)) > + > +diff --git a/src/utils/utils.h b/src/utils/utils.h > +index 801a8b6e..b2bdf0d0 100644 > +--- a/src/utils/utils.h > ++++ b/src/utils/utils.h > +@@ -9,6 +9,10 @@ > + #include "dbus.h" > + #include "logging.h" > > +#if !defined(HAVE_STRERROR_L) > -+static char *strerror_l(int errnum, locale_t locale UNUSED) > -+{ > -+ return strerror(errnum); > -+} > ++#define strerror_l(errnum, locale) strerror(errnum) > +#endif > + > /** > - * bd_utils_have_kernel_module: > - * @module_name: name of the kernel module to check > -@@ -259,7 +266,6 @@ gboolean bd_utils_unload_kernel_module (const gchar *module_name, GError **error > - return TRUE; > - } > - > -- > - static BDUtilsLinuxVersion detected_linux_ver; > - static gboolean have_linux_ver = FALSE; > - > + * SECTION: utils > + * @short_description: library providing utility functions used by the blockdev library and its plugins > -- > 2.34.1 > > diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in > index 527ba79e4e..e0449628b4 100644 > --- a/package/libblockdev/Config.in > +++ b/package/libblockdev/Config.in > @@ -8,6 +8,8 @@ config BR2_PACKAGE_LIBBLOCKDEV > depends on BR2_ENABLE_LOCALE > select BR2_PACKAGE_KMOD > select BR2_PACKAGE_LIBGLIB2 > + select BR2_PACKAGE_UTIL_LINUX > + select BR2_PACKAGE_UTIL_LINUX_LIBUUID > help > libblockdev is a C library supporting GObject introspection > for manipulation of block devices. It has a plugin-based > @@ -30,7 +32,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO > config BR2_PACKAGE_LIBBLOCKDEV_FS > bool "filesystem" > depends on BR2_ENABLE_LOCALE # parted > - select BR2_PACKAGE_UTIL_LINUX > select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT > select BR2_PACKAGE_PARTED > select BR2_PACKAGE_E2FSPROGS > @@ -62,7 +63,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_PART > bool "part" > depends on BR2_ENABLE_LOCALE # parted > select BR2_PACKAGE_PARTED > - select BR2_PACKAGE_UTIL_LINUX > select BR2_PACKAGE_UTIL_LINUX_LIBFDISK > > comment "part plugin needs a toolchain w/ locale" > @@ -70,7 +70,6 @@ comment "part plugin needs a toolchain w/ locale" > > config BR2_PACKAGE_LIBBLOCKDEV_SWAP > bool "swap" > - select BR2_PACKAGE_UTIL_LINUX > select BR2_PACKAGE_UTIL_LINUX_LIBBLKID > > endif > diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash > index 5f9a8a7e6c..79700a4996 100644 > --- a/package/libblockdev/libblockdev.hash > +++ b/package/libblockdev/libblockdev.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 49841ff92db0ab032931e6f2b5eab63e5969b0ddc14b067b60e46a6eb6c60e47 libblockdev-3.0.4.tar.gz > +sha256 41e4af66c9d78e795302d37825dfd88a4970f82da7b4ebe6487feba2afae44fb libblockdev-3.1.0.tar.gz > sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE > diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk > index e0fca2b95c..ebf01acfb5 100644 > --- a/package/libblockdev/libblockdev.mk > +++ b/package/libblockdev/libblockdev.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBBLOCKDEV_VERSION = 3.0.4 > +LIBBLOCKDEV_VERSION = 3.1.0 > LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 > LIBBLOCKDEV_LICENSE = LGPL-2.1 > LIBBLOCKDEV_LICENSE_FILES = LICENSE From giulio.benetti at benettiengineering.com Mon Feb 5 10:00:55 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 11:00:55 +0100 Subject: [Buildroot] [PATCH v4 1/1] configs/mangopi_mangopi_mq_d1s: new defconfig In-Reply-To: <20230907200013.11620-1-indrek.kruusa@gmail.com> References: <20230907200013.11620-1-indrek.kruusa@gmail.com> Message-ID: <57cacd5b-aa2c-4199-b1d0-1de38b5ffd27@benettiengineering.com> Hi Indrek, sorry for the late reply, On 07/09/23 22:00, Indrek Kruusa wrote: Here we need a commit log, something like: " Add support for MangoPi MQ1RW: https://mangopi.org/mqr An Allwinner D1S(1xRISCV C906 R1S0 + 64MB DDR2-1066 embedded) based SBC with: * USB-OTG Type-C socket * USB-HOST Type-C socket * 2x 18 pin GPIO headers * TF card slot * RTL8723DS WiFi module with ext. antenna connector * 40 pin RGB FPC connector * 6 pin CTP FPC connector * 24 pin DVP FPC connector * onboard mic * onboard audio amplifier * FEL,reset button " > Signed-off-by: Indrek Kruusa > --- > Changes v3 -> v4: > - fixed whitespace errors in readme.txt > - linux kernel bump to 6.4.14 > > Changes v2 -> v3: > - resend without line wrapping > > Changes v1 -> v2: > - using "mangopi" as a vendor string, so creating the boards/mangopi/ folder > - renaming board's config accordingly > - updating DEVELOPERS' entry > - updating readme.txt > - using custom defconfig for linux kernel instead of linux.fragment > - linux kernel version bump to 6.4.11 > - renaming custom uboot config file to uboot.config > - custom uboot version points to a certain commit now > > board/mangopi/mangopi-mq-d1s/genimage.cfg | 20 ++ > board/mangopi/mangopi-mq-d1s/linux.config | 226 ++++++++++++++++++ > .../overlay/boot/extlinux/extlinux.conf | 4 + > .../overlay/etc/network/interfaces | 6 + > .../overlay/etc/wpa_supplicant.conf | 8 + > board/mangopi/mangopi-mq-d1s/readme.txt | 48 ++++ > board/mangopi/mangopi-mq-d1s/uboot.config | 10 + > configs/mangopi_mangopi_mq_d1s_defconfig | 47 ++++ > 8 files changed, 369 insertions(+) > create mode 100644 board/mangopi/mangopi-mq-d1s/genimage.cfg > create mode 100644 board/mangopi/mangopi-mq-d1s/linux.config > create mode 100644 board/mangopi/mangopi-mq-d1s/overlay/boot/extlinux/extlinux.conf > create mode 100644 board/mangopi/mangopi-mq-d1s/overlay/etc/network/interfaces > create mode 100644 board/mangopi/mangopi-mq-d1s/overlay/etc/wpa_supplicant.conf > create mode 100644 board/mangopi/mangopi-mq-d1s/readme.txt > create mode 100644 board/mangopi/mangopi-mq-d1s/uboot.config > create mode 100644 configs/mangopi_mangopi_mq_d1s_defconfig > > diff --git a/board/mangopi/mangopi-mq-d1s/genimage.cfg b/board/mangopi/mangopi-mq-d1s/genimage.cfg > new file mode 100644 > index 0000000000..3acf78a3ab > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/genimage.cfg > @@ -0,0 +1,20 @@ > +# Minimal SD card image for the MangoPi MQ F133 D1s > +# https://mangopi.org/mangopi_mq > + > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + in-partition-table = false > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + bootable = "true" > + offset = 1M > + } > +} > diff --git a/board/mangopi/mangopi-mq-d1s/linux.config b/board/mangopi/mangopi-mq-d1s/linux.config > new file mode 100644 > index 0000000000..8bdf6134e4 > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/linux.config > @@ -0,0 +1,226 @@ > +CONFIG_SYSVIPC=y > +CONFIG_POSIX_MQUEUE=y > +CONFIG_NO_HZ_IDLE=y > +CONFIG_HIGH_RES_TIMERS=y > +CONFIG_BPF_SYSCALL=y > +CONFIG_PREEMPT=y > +CONFIG_IKCONFIG=y > +CONFIG_IKCONFIG_PROC=y > +CONFIG_CGROUPS=y > +CONFIG_MEMCG=y > +CONFIG_CGROUP_SCHED=y > +CONFIG_CFS_BANDWIDTH=y > +CONFIG_RT_GROUP_SCHED=y > +CONFIG_CGROUP_PIDS=y > +CONFIG_CGROUP_FREEZER=y > +CONFIG_CGROUP_DEVICE=y > +CONFIG_CGROUP_CPUACCT=y > +CONFIG_CGROUP_BPF=y > +CONFIG_NAMESPACES=y > +CONFIG_USER_NS=y > +CONFIG_EXPERT=y > +# CONFIG_SYSFS_SYSCALL is not set > +CONFIG_PERF_EVENTS=y > +CONFIG_ARCH_SUNXI=y > +CONFIG_NONPORTABLE=y > +# CONFIG_EFI is not set > +CONFIG_PM=y > +CONFIG_CPU_IDLE=y > +CONFIG_RISCV_SBI_CPUIDLE=y > +CONFIG_JUMP_LABEL=y > +# CONFIG_STACKPROTECTOR is not set > +# CONFIG_GCC_PLUGINS is not set > +CONFIG_MODULES=y > +CONFIG_MODULE_UNLOAD=y > +# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set > +# CONFIG_BLK_DEBUG_FS is not set > +# CONFIG_MQ_IOSCHED_DEADLINE is not set > +# CONFIG_MQ_IOSCHED_KYBER is not set > +# CONFIG_IOSCHED_BFQ is not set > +# CONFIG_SWAP is not set > +CONFIG_PAGE_REPORTING=y > +CONFIG_NET=y > +CONFIG_PACKET=y > +CONFIG_UNIX=y > +CONFIG_XFRM_USER=m > +CONFIG_INET=y > +CONFIG_IP_MULTICAST=y > +CONFIG_IP_ADVANCED_ROUTER=y > +CONFIG_IP_PNP=y > +CONFIG_IP_PNP_DHCP=y > +CONFIG_IP_PNP_BOOTP=y > +CONFIG_IP_PNP_RARP=y > +CONFIG_INET_ESP=m > +CONFIG_NETFILTER=y > +CONFIG_BRIDGE_NETFILTER=m > +CONFIG_NF_CONNTRACK=m > +CONFIG_NF_CONNTRACK_FTP=m > +CONFIG_NF_CONNTRACK_TFTP=m > +CONFIG_NETFILTER_XT_MARK=m > +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m > +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m > +CONFIG_NETFILTER_XT_MATCH_IPVS=m > +CONFIG_IP_VS=m > +CONFIG_IP_VS_PROTO_TCP=y > +CONFIG_IP_VS_PROTO_UDP=y > +CONFIG_IP_VS_RR=m > +CONFIG_IP_VS_NFCT=y > +CONFIG_NF_LOG_ARP=m > +CONFIG_NF_LOG_IPV4=m > +CONFIG_IP_NF_IPTABLES=m > +CONFIG_IP_NF_FILTER=m > +CONFIG_IP_NF_TARGET_REJECT=m > +CONFIG_IP_NF_NAT=m > +CONFIG_IP_NF_TARGET_MASQUERADE=m > +CONFIG_IP_NF_TARGET_REDIRECT=m > +CONFIG_IP_NF_MANGLE=m > +CONFIG_NF_LOG_IPV6=m > +CONFIG_IP6_NF_IPTABLES=m > +CONFIG_IP6_NF_MATCH_IPV6HEADER=m > +CONFIG_IP6_NF_FILTER=m > +CONFIG_IP6_NF_TARGET_REJECT=m > +CONFIG_IP6_NF_MANGLE=m > +CONFIG_BRIDGE=m > +CONFIG_BRIDGE_VLAN_FILTERING=y > +CONFIG_VLAN_8021Q=m > +CONFIG_NET_SCHED=y > +CONFIG_NET_CLS_CGROUP=m > +CONFIG_NETLINK_DIAG=y > +CONFIG_CGROUP_NET_PRIO=y > +CONFIG_CFG80211=y > +CONFIG_MAC80211=y > +CONFIG_PCI=y > +CONFIG_PCIEPORTBUS=y > +CONFIG_PCI_HOST_GENERIC=y > +CONFIG_PCIE_XILINX=y > +CONFIG_DEVTMPFS=y > +CONFIG_DEVTMPFS_MOUNT=y > +CONFIG_SUN50I_DE2_BUS=y > +CONFIG_SUNXI_RSB=y > +CONFIG_BLK_DEV_LOOP=y > +CONFIG_NETDEVICES=y > +CONFIG_DUMMY=m > +CONFIG_MACVLAN=m > +CONFIG_IPVLAN=m > +CONFIG_VXLAN=m > +CONFIG_VETH=m > +CONFIG_VIRTIO_NET=y > +# CONFIG_ETHERNET is not set > +CONFIG_MDIO_DEVICE=y > +# CONFIG_USB_NET_DRIVERS is not set > +# CONFIG_WLAN is not set > +CONFIG_INPUT_MOUSEDEV=y > +CONFIG_KEYBOARD_SUN4I_LRADC=m > +# CONFIG_LEGACY_PTYS is not set > +# CONFIG_LEGACY_TIOCSTI is not set > +CONFIG_SERIAL_8250=y > +CONFIG_SERIAL_8250_CONSOLE=y > +# CONFIG_SERIAL_8250_PCI is not set > +CONFIG_SERIAL_8250_DW=y > +CONFIG_SERIAL_OF_PLATFORM=y > +CONFIG_VIRTIO_CONSOLE=y > +CONFIG_HW_RANDOM=y > +CONFIG_HW_RANDOM_VIRTIO=y > +CONFIG_I2C_MV64XXX=m > +CONFIG_PINCTRL=y > +CONFIG_GPIO_GENERIC_PLATFORM=y > +CONFIG_POWER_RESET=y > +CONFIG_POWER_RESET_SYSCON=y > +CONFIG_POWER_RESET_SYSCON_POWEROFF=y > +CONFIG_POWER_SUPPLY=y > +CONFIG_WATCHDOG=y > +CONFIG_SUNXI_WATCHDOG=y > +CONFIG_REGULATOR=y > +CONFIG_REGULATOR_FIXED_VOLTAGE=y > +CONFIG_DRM=m > +CONFIG_DRM_I2C_CH7006=m > +CONFIG_DRM_I2C_SIL164=m > +CONFIG_DRM_SUN4I=m > +CONFIG_FB=y > +CONFIG_BACKLIGHT_CLASS_DEVICE=m > +CONFIG_FRAMEBUFFER_CONSOLE=y > +CONFIG_USB=y > +CONFIG_USB_XHCI_HCD=y > +CONFIG_USB_XHCI_PLATFORM=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_EHCI_HCD_PLATFORM=y > +CONFIG_USB_OHCI_HCD=y > +CONFIG_USB_OHCI_HCD_PLATFORM=y > +CONFIG_USB_MUSB_HDRC=m > +CONFIG_USB_MUSB_SUNXI=m > +CONFIG_NOP_USB_XCEIV=m > +CONFIG_MMC=y > +CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_PLTFM=y > +CONFIG_MMC_SDHCI_CADENCE=y > +CONFIG_MMC_SUNXI=y > +CONFIG_RTC_CLASS=y > +CONFIG_RTC_DRV_SUN6I=y > +CONFIG_RTC_DRV_GOLDFISH=y > +CONFIG_DMADEVICES=y > +CONFIG_DMA_SUN6I=m > +# CONFIG_VIRTIO_MENU is not set > +# CONFIG_VHOST_MENU is not set > +CONFIG_SUN8I_DE2_CCU=m > +CONFIG_SUN50I_IOMMU=y > +CONFIG_RPMSG_CHAR=y > +CONFIG_RPMSG_CTRL=y > +CONFIG_RPMSG_VIRTIO=y > +CONFIG_PHY_SUN4I_USB=m > +CONFIG_NVMEM_SUNXI_SID=y > +CONFIG_EXT4_FS=y > +CONFIG_EXT4_FS_POSIX_ACL=y > +CONFIG_EXT4_FS_SECURITY=y > +CONFIG_BTRFS_FS=m > +CONFIG_BTRFS_FS_POSIX_ACL=y > +CONFIG_AUTOFS4_FS=y > +CONFIG_OVERLAY_FS=m > +CONFIG_ISO9660_FS=y > +CONFIG_JOLIET=y > +CONFIG_ZISOFS=y > +CONFIG_MSDOS_FS=y > +CONFIG_VFAT_FS=y > +CONFIG_PROC_CHILDREN=y > +CONFIG_TMPFS=y > +CONFIG_TMPFS_POSIX_ACL=y > +CONFIG_HUGETLBFS=y > +CONFIG_NFS_FS=y > +CONFIG_NFS_V4=y > +CONFIG_NFS_V4_1=y > +CONFIG_NFS_V4_2=y > +CONFIG_ROOT_NFS=y > +CONFIG_NLS_CODEPAGE_437=y > +CONFIG_NLS_ISO8859_1=m > +CONFIG_SECURITY=y > +CONFIG_SECURITY_SELINUX=y > +CONFIG_SECURITY_APPARMOR=y > +CONFIG_DEFAULT_SECURITY_DAC=y > +CONFIG_CRYPTO_USER_API_HASH=y > +CONFIG_CRYPTO_DEV_VIRTIO=y > +# CONFIG_RAID6_PQ_BENCHMARK is not set > +CONFIG_CRC_ITU_T=y > +CONFIG_CRC7=y > +CONFIG_XZ_DEC=y > +CONFIG_PRINTK_TIME=y > +CONFIG_DEBUG_FS=y > +CONFIG_DEBUG_PAGEALLOC=y > +CONFIG_SCHED_STACK_END_CHECK=y > +CONFIG_DEBUG_VM=y > +CONFIG_DEBUG_VM_PGFLAGS=y > +CONFIG_DEBUG_MEMORY_INIT=y > +CONFIG_SOFTLOCKUP_DETECTOR=y > +CONFIG_WQ_WATCHDOG=y > +CONFIG_DEBUG_TIMEKEEPING=y > +CONFIG_DEBUG_RT_MUTEXES=y > +CONFIG_DEBUG_SPINLOCK=y > +CONFIG_DEBUG_MUTEXES=y > +CONFIG_DEBUG_RWSEMS=y > +CONFIG_DEBUG_ATOMIC_SLEEP=y > +CONFIG_DEBUG_LIST=y > +CONFIG_DEBUG_PLIST=y > +CONFIG_DEBUG_SG=y > +# CONFIG_RCU_TRACE is not set > +CONFIG_RCU_EQS_DEBUG=y > +# CONFIG_FTRACE is not set > +# CONFIG_RUNTIME_TESTING_MENU is not set > +CONFIG_MEMTEST=y > diff --git a/board/mangopi/mangopi-mq-d1s/overlay/boot/extlinux/extlinux.conf b/board/mangopi/mangopi-mq-d1s/overlay/boot/extlinux/extlinux.conf > new file mode 100644 > index 0000000000..c825ad4667 > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/overlay/boot/extlinux/extlinux.conf > @@ -0,0 +1,4 @@ > +label linux > + kernel /boot/Image > + # use devicetree from u-boot > + append console=ttyS3,115200 root=/dev/mmcblk0p1 ro rootwait > diff --git a/board/mangopi/mangopi-mq-d1s/overlay/etc/network/interfaces b/board/mangopi/mangopi-mq-d1s/overlay/etc/network/interfaces > new file mode 100644 > index 0000000000..89e7d74aff > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/overlay/etc/network/interfaces > @@ -0,0 +1,6 @@ > +auto lo > +iface lo inet loopback > + > +auto wlan0 > +iface wlan0 inet dhcp > +wpa-conf /etc/wpa_supplicant.conf > diff --git a/board/mangopi/mangopi-mq-d1s/overlay/etc/wpa_supplicant.conf b/board/mangopi/mangopi-mq-d1s/overlay/etc/wpa_supplicant.conf > new file mode 100644 > index 0000000000..b43292b0a7 > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/overlay/etc/wpa_supplicant.conf > @@ -0,0 +1,8 @@ > +ap_scan=1 > + > +network={ > + ssid="YOURSSID" > + scan_ssid=1 > + key_mgmt=WPA-PSK > + psk="YOURPASSWD" > +} > diff --git a/board/mangopi/mangopi-mq-d1s/readme.txt b/board/mangopi/mangopi-mq-d1s/readme.txt > new file mode 100644 > index 0000000000..0f8114f46a > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/readme.txt > @@ -0,0 +1,48 @@ > +MangoPi MQ D1s (RISC-V) > +======================= > + > +MangoPi MQ D1s (board model MQ1W) is a tiny (4x4cm) RISC-V based single board computer. It's built around > +Allwinner D1s (also referred as F133) single core 1GHz CPU with integrated 64MB DDR2 RAM. > +Board features: > +- USB-OTG Type-C socket > +- USB-HOST Type-C socket > +- 2x 22 pin GPIO headers > +- TF card slot > +- RTL8189FTV WiFi module with ext. antenna connector > +- 15 pin DSI FPC connector > +- 40 pin RGB FPC connector > +- 6 pin CTP FPC connector > +- 24 pin DVP FPC connector > +- onboard mic > +- onboard audio amplifier > +- FEL,reset button > + > +There is no HDMI connector. > + > +How to build > +============ > + > +$ make mangopi_mangopi_mq_d1s_defconfig > +$ make > + > +Wifi > +========== > + > +Edit board/mangopi/mangopi-mq-d1s/overlay/etc/wpa_supplicant.conf or > +/etc/wpa_supplicant.conf once connected to the board: > + > +* Replace YOURSSID with your AP ssid > +* Replace YOURPASSWD with your AP password > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > + > +Connect a TTL UART to the UART3 on P8 header (unpopulated), insert the microSD card and > +plug in a USB-C cable to the OTG or HOST connector to boot the system. > diff --git a/board/mangopi/mangopi-mq-d1s/uboot.config b/board/mangopi/mangopi-mq-d1s/uboot.config > new file mode 100644 > index 0000000000..0a3d8ded01 > --- /dev/null > +++ b/board/mangopi/mangopi-mq-d1s/uboot.config > @@ -0,0 +1,10 @@ > +CONFIG_RISCV=y > +CONFIG_DEFAULT_DEVICE_TREE="sun20i-d1s-mangopi-mq" > +CONFIG_TARGET_SUN20I_D1=y > +CONFIG_ARCH_RV64I=y > +CONFIG_RISCV_SMODE=y > +# CONFIG_SPL_SMP is not set > +CONFIG_SYS_SPL_MALLOC=y > +CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 > +# CONFIG_SYS_I2C_MVTWSI is not set > +CONFIG_DM_REGULATOR_FIXED=y > diff --git a/configs/mangopi_mangopi_mq_d1s_defconfig b/configs/mangopi_mangopi_mq_d1s_defconfig > new file mode 100644 > index 0000000000..11f1e94bd7 > --- /dev/null > +++ b/configs/mangopi_mangopi_mq_d1s_defconfig > @@ -0,0 +1,47 @@ > +BR2_riscv=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > +BR2_ROOTFS_OVERLAY="board/mangopi/mangopi-mq-d1s/overlay" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/mangopi/mangopi-mq-d1s/genimage.cfg" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.14" > +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/mangopi/mangopi-mq-d1s/linux.config" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1s-mangopi-mq" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y Here we need: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_RTL8189FS=y > +BR2_PACKAGE_WIRELESS_TOOLS=y > +BR2_PACKAGE_WPA_SUPPLICANT=y > +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y > +BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y > +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y > +BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y > +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y > +BR2_PACKAGE_WPA_SUPPLICANT_CTRL_IFACE=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_PLAT="generic" > +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set > +BR2_TARGET_OPENSBI_LATEST_VERSION=y > +# BR2_TARGET_OPENSBI_CUSTOM_VERSION is not set > +BR2_TARGET_OPENSBI_VERSION="1.3" > +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,smaeul,u-boot,3f3b76b3749e796edd4b8cac9081c55574be49c7)/uboot-3f3b76b3749e796edd4b8cac9081c55574be49c7.tar.gz" > +# BR2_TARGET_UBOOT_USE_DEFCONFIG is not set > +BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/mangopi/mangopi-mq-d1s/uboot.config" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" > +BR2_PACKAGE_HOST_GENIMAGE=y I've build tested successfully with the change above using utils/docker run and the rest looks good to me so with the commit log reworded and the missing "BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y" added: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Feb 5 10:03:24 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 11:03:24 +0100 Subject: [Buildroot] [PATCH v2] package/libblockdev: bump to version 3.1.0 In-Reply-To: References: <20240122160949.4052959-1-giulio.benetti@benettiengineering.com> Message-ID: On 05/02/24 10:54, Arnout Vandecappelle via buildroot wrote: > > > On 22/01/2024 17:09, Giulio Benetti wrote: >> * Rework strerror_l() patch by declaring it only in utils.h as a macro >> * select BR2_PACKAGE_UTIL_LINUX_LIBUUID since it's now mandatory >> >> Signed-off-by: Giulio Benetti >> --- >> V1->V2: >> * reworked local strerror_l() patch as a macro to avoid adding a >> second patch >> * selected BR2_PACKAGE_UTIL_LINUX_LIBUUID by default >> --- >> ? ...-replacement-function-for-strerror_l.patch | 160 ++++-------------- >> ? package/libblockdev/Config.in???????????????? |?? 5 +- >> ? package/libblockdev/libblockdev.hash????????? |?? 2 +- >> ? package/libblockdev/libblockdev.mk??????????? |?? 2 +- >> ? 4 files changed, 35 insertions(+), 134 deletions(-) >> >> diff --git >> a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch >> index 987d28f82e..e5819a4e9c 100644 >> --- >> a/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch >> +++ >> b/package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch >> @@ -1,29 +1,25 @@ >> -From 2acf5a8d4858035396ee45d96c824e0481644d36 Mon Sep 17 00:00:00 2001 >> -From: Thomas Petazzoni >> -Date: Sat, 29 Aug 2020 16:04:15 +0200 >> +From 01883cc14904e55d90955ad7cd9fc55bc18364ac Mon Sep 17 00:00:00 2001 >> +From: Giulio Benetti > > ?You really should have kept Thomas as the author. Ah yes, I've messed up a bit, > >> +Date: Sat, 20 Jan 2024 13:29:28 +0100 >> ? Subject: [PATCH] Provide replacement function for strerror_l() >> ? strerror_l() is not implemented in some C libraries, such as uClibc, >> -so let's provide a simple replacement function that falls back on >> -strerror(). >> +so let's provide a simple replacement define that falls back on >> +strerror() in utils.h header and include it where missing. >> -Upstream status: Not Applicable since it's due uclibc only >> +Upstream: N/A since it's due uclibc only > > ?This fixes check-package, so it must be removed from .checkpackageignore. Thank you, this is new to me. I'll take care on next patches. Thank you for reviewing! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > > > ?Applied to master with those two fixed, thanks. > > ?Regards, > ?Arnout > >> ? Signed-off-by: Thomas Petazzoni >> ? Signed-off-by: Giulio Benetti >> -[Giulio: ported to version 3.0+] >> +[Giulio: ported to version 3.0 and 3.1] >> ? --- >> - configure.ac??????????????????? | 2 ++ >> - src/plugins/crypto.c??????????? | 7 +++++++ >> - src/plugins/nvme/nvme-error.c?? | 8 ++++++++ >> - src/plugins/nvme/nvme-fabrics.c | 8 ++++++++ >> - src/plugins/nvme/nvme-op.c????? | 8 ++++++++ >> - src/plugins/part.c????????????? | 9 +++++++++ >> - src/utils/module.c????????????? | 8 +++++++- >> - 7 files changed, 49 insertions(+), 1 deletion(-) >> + configure.ac?????? | 2 ++ >> + src/utils/module.c | 1 + >> + src/utils/utils.h? | 4 ++++ >> + 3 files changed, 7 insertions(+) >> ? diff --git a/configure.ac b/configure.ac >> -index 0a8ce4a7..dfbddb39 100644 >> +index 02b26e3e..67341134 100644 >> ? --- a/configure.ac >> ? +++ b/configure.ac >> ? @@ -120,6 +120,8 @@ AC_CHECK_HEADERS([dlfcn.h string.h unistd.h >> sys/fcntl.h sys/ioctl.h linux/random >> @@ -35,127 +31,33 @@ index 0a8ce4a7..dfbddb39 100644 >> ?? AC_ARG_WITH([escrow], >> ?????? AS_HELP_STRING([--with-escrow], [support escrow >> @<:@default=yes@:>@]), >> ?????? [], >> -diff --git a/src/plugins/crypto.c b/src/plugins/crypto.c >> -index c5f719ca..b2ae3f56 100644 >> ---- a/src/plugins/crypto.c >> -+++ b/src/plugins/crypto.c >> -@@ -62,6 +62,13 @@ >> - >> - #define UNUSED __attribute__((unused)) >> - >> -+#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> -+#endif >> -+ >> - /** >> -? * SECTION: crypto >> -? * @short_description: plugin for operations with encrypted devices >> -diff --git a/src/plugins/nvme/nvme-error.c >> b/src/plugins/nvme/nvme-error.c >> -index 4bd4d771..618b6aef 100644 >> ---- a/src/plugins/nvme/nvme-error.c >> -+++ b/src/plugins/nvme/nvme-error.c >> -@@ -34,6 +34,14 @@ >> - #include "nvme.h" >> - #include "nvme-private.h" >> - >> -+#define UNUSED __attribute__((unused)) >> -+ >> -+#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> -+#endif >> - >> - /** >> -? * bd_nvme_error_quark: (skip) >> -diff --git a/src/plugins/nvme/nvme-fabrics.c >> b/src/plugins/nvme/nvme-fabrics.c >> -index 1877845f..5fcbeddc 100644 >> ---- a/src/plugins/nvme/nvme-fabrics.c >> -+++ b/src/plugins/nvme/nvme-fabrics.c >> -@@ -36,6 +36,14 @@ >> - #include "nvme.h" >> - #include "nvme-private.h" >> - >> -+#define UNUSED __attribute__((unused)) >> -+ >> -+#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> -+#endif >> - >> - /* nvme-cli defaults */ >> - #define PATH_NVMF_CONFIG? "/etc/nvme/config.json" >> -diff --git a/src/plugins/nvme/nvme-op.c b/src/plugins/nvme/nvme-op.c >> -index dbef4f3a..7bafd7a3 100644 >> ---- a/src/plugins/nvme/nvme-op.c >> -+++ b/src/plugins/nvme/nvme-op.c >> -@@ -35,6 +35,14 @@ >> - #include "nvme.h" >> - #include "nvme-private.h" >> - >> -+#define UNUSED __attribute__((unused)) >> -+ >> -+#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> -+#endif >> - >> - /** >> -? * bd_nvme_device_self_test: >> -diff --git a/src/plugins/part.c b/src/plugins/part.c >> -index 46d31137..6234e013 100644 >> ---- a/src/plugins/part.c >> -+++ b/src/plugins/part.c >> -@@ -26,6 +26,15 @@ >> - >> - #include "part.h" >> - >> -+#define UNUSED __attribute__((unused)) >> -+ >> -+#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> -+#endif >> -+ >> - /** >> -? * SECTION: part >> -? * @short_description: plugin for operations with partition tables >> ? diff --git a/src/utils/module.c b/src/utils/module.c >> -index 6557c3ab..69dd4731 100644 >> +index 6557c3ab..5893f0ac 100644 >> ? --- a/src/utils/module.c >> ? +++ b/src/utils/module.c >> -@@ -74,6 +74,13 @@ static void set_kmod_logging (struct kmod_ctx *ctx) { >> -???? kmod_set_log_fn (ctx, utils_kmod_log_redirect, NULL); >> - } >> +@@ -28,6 +28,7 @@ >> + #include "module.h" >> + #include "exec.h" >> + #include "logging.h" >> ++#include "utils.h" >> + >> + #define UNUSED __attribute__((unused)) >> + >> +diff --git a/src/utils/utils.h b/src/utils/utils.h >> +index 801a8b6e..b2bdf0d0 100644 >> +--- a/src/utils/utils.h >> ++++ b/src/utils/utils.h >> +@@ -9,6 +9,10 @@ >> + #include "dbus.h" >> + #include "logging.h" >> ? +#if !defined(HAVE_STRERROR_L) >> -+static char *strerror_l(int errnum, locale_t locale UNUSED) >> -+{ >> -+??? return strerror(errnum); >> -+} >> ++#define strerror_l(errnum, locale)????? strerror(errnum) >> ? +#endif >> ? + >> ?? /** >> -? * bd_utils_have_kernel_module: >> -? * @module_name: name of the kernel module to check >> -@@ -259,7 +266,6 @@ gboolean bd_utils_unload_kernel_module (const >> gchar *module_name, GError **error >> -???? return TRUE; >> - } >> - >> -- >> - static BDUtilsLinuxVersion detected_linux_ver; >> - static gboolean have_linux_ver = FALSE; >> - >> +? * SECTION: utils >> +? * @short_description: library providing utility functions used by >> the blockdev library and its plugins >> ? -- >> ? 2.34.1 >> diff --git a/package/libblockdev/Config.in >> b/package/libblockdev/Config.in >> index 527ba79e4e..e0449628b4 100644 >> --- a/package/libblockdev/Config.in >> +++ b/package/libblockdev/Config.in >> @@ -8,6 +8,8 @@ config BR2_PACKAGE_LIBBLOCKDEV >> ????? depends on BR2_ENABLE_LOCALE >> ????? select BR2_PACKAGE_KMOD >> ????? select BR2_PACKAGE_LIBGLIB2 >> +??? select BR2_PACKAGE_UTIL_LINUX >> +??? select BR2_PACKAGE_UTIL_LINUX_LIBUUID >> ????? help >> ??????? libblockdev is a C library supporting GObject introspection >> ??????? for manipulation of block devices. It has a plugin-based >> @@ -30,7 +32,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO >> ? config BR2_PACKAGE_LIBBLOCKDEV_FS >> ????? bool "filesystem" >> ????? depends on BR2_ENABLE_LOCALE # parted >> -??? select BR2_PACKAGE_UTIL_LINUX >> ????? select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT >> ????? select BR2_PACKAGE_PARTED >> ????? select BR2_PACKAGE_E2FSPROGS >> @@ -62,7 +63,6 @@ config BR2_PACKAGE_LIBBLOCKDEV_PART >> ????? bool "part" >> ????? depends on BR2_ENABLE_LOCALE # parted >> ????? select BR2_PACKAGE_PARTED >> -??? select BR2_PACKAGE_UTIL_LINUX >> ????? select BR2_PACKAGE_UTIL_LINUX_LIBFDISK >> ? comment "part plugin needs a toolchain w/ locale" >> @@ -70,7 +70,6 @@ comment "part plugin needs a toolchain w/ locale" >> ? config BR2_PACKAGE_LIBBLOCKDEV_SWAP >> ????? bool "swap" >> -??? select BR2_PACKAGE_UTIL_LINUX >> ????? select BR2_PACKAGE_UTIL_LINUX_LIBBLKID >> ? endif >> diff --git a/package/libblockdev/libblockdev.hash >> b/package/libblockdev/libblockdev.hash >> index 5f9a8a7e6c..79700a4996 100644 >> --- a/package/libblockdev/libblockdev.hash >> +++ b/package/libblockdev/libblockdev.hash >> @@ -1,3 +1,3 @@ >> ? # Locally calculated >> -sha256 >> 49841ff92db0ab032931e6f2b5eab63e5969b0ddc14b067b60e46a6eb6c60e47 >> libblockdev-3.0.4.tar.gz >> +sha256 >> 41e4af66c9d78e795302d37825dfd88a4970f82da7b4ebe6487feba2afae44fb >> libblockdev-3.1.0.tar.gz >> ? sha256 >> 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946? LICENSE >> diff --git a/package/libblockdev/libblockdev.mk >> b/package/libblockdev/libblockdev.mk >> index e0fca2b95c..ebf01acfb5 100644 >> --- a/package/libblockdev/libblockdev.mk >> +++ b/package/libblockdev/libblockdev.mk >> @@ -4,7 +4,7 @@ >> ? # >> >> ################################################################################ >> -LIBBLOCKDEV_VERSION = 3.0.4 >> +LIBBLOCKDEV_VERSION = 3.1.0 >> ? LIBBLOCKDEV_SITE = >> https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1 >> ? LIBBLOCKDEV_LICENSE = LGPL-2.1 >> ? LIBBLOCKDEV_LICENSE_FILES = LICENSE > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Mon Feb 5 10:01:38 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:01:38 +0100 Subject: [Buildroot] [git commit] package/python-mpd2: bump to version 3.1.1 Message-ID: <20240205100427.52003869DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2d461d134d27a3c27abc0efd9c429e08b2beb26 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Uladzimir Bely Signed-off-by: Thomas Petazzoni --- package/python-mpd2/python-mpd2.hash | 4 ++-- package/python-mpd2/python-mpd2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-mpd2/python-mpd2.hash b/package/python-mpd2/python-mpd2.hash index cfe5a7c0c0..0e5d9206a1 100644 --- a/package/python-mpd2/python-mpd2.hash +++ b/package/python-mpd2/python-mpd2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-mpd2/json -md5 f083c107b28525bb4c2580140861d86e python-mpd2-3.1.0.tar.gz -sha256 f33c2cdb0d6baa74a36724f38c1c4a099a7ce2c8ec4a2bb7192150a5855df476 python-mpd2-3.1.0.tar.gz +md5 b218d6f233c23da0bc82c372308bbf8d python-mpd2-3.1.1.tar.gz +sha256 4baec3584cc43ed9948d5559079fafc2679b06b2ade273e909b3582654b2b3f5 python-mpd2-3.1.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-mpd2/python-mpd2.mk b/package/python-mpd2/python-mpd2.mk index 124ff57db0..2d2784e89d 100644 --- a/package/python-mpd2/python-mpd2.mk +++ b/package/python-mpd2/python-mpd2.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_MPD2_VERSION = 3.1.0 -PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/59/32/e57725251ce3117d2ed2a7b76d9722ea9bea26f54b2cc8981d03350e4103 +PYTHON_MPD2_VERSION = 3.1.1 +PYTHON_MPD2_SITE = https://files.pythonhosted.org/packages/53/be/e77206eb35eb37ccd3506fba237e1431431d04c482707730ce2a6802e95c PYTHON_MPD2_SETUP_TYPE = setuptools PYTHON_MPD2_LICENSE = LGPL-3.0+ PYTHON_MPD2_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Mon Feb 5 10:07:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:07:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-mpd2: bump to version 3.1.1 In-Reply-To: <10609434cc80f8c547228c26bf16a04ce1f14b72.camel@gmail.com> References: <20240204085128.5059-1-wiselord1983@gmail.com> <20240205101344.7725e2ea@windsurf> <10609434cc80f8c547228c26bf16a04ce1f14b72.camel@gmail.com> Message-ID: <20240205110744.17924bc0@windsurf> On Mon, 05 Feb 2024 12:27:55 +0300 Uladzimir Bely wrote: > I could either resend the patch with a proper username (e.g., > "Uladzimir Bely "), or you are free to edit the > patch on your own. Thanks, I have amended your patch when applying. It's now pushed to master. Thanks for your contribution! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Mon Feb 5 10:08:02 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:08:02 +0100 Subject: [Buildroot] [git commit] package/libressl: don't export arc4random Message-ID: <20240205101102.E7437869E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f1e3841f5c2da36e1833068ba948c52a58c07ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Don't export arc4random to fix the following libcurl build failure raised since bump of libcurl to version 8.5.0 in commit aaa9438b96f88b1ecbf5eb9a1aebef8010835b8d and https://github.com/curl/curl/commit/7925ba431b9a099daee1fa21d36c21887f787ad5: rand.c: In function 'randit': rand.c:146:26: error: implicit declaration of function 'arc4random'; did you mean 'srandom'? [-Werror=implicit-function-declaration] 146 | *rnd = (unsigned int)arc4random(); | ^~~~~~~~~~ | srandom cc1: some warnings being treated as errors Fixes: - http://autobuild.buildroot.org/results/8b7988629f1887be15c97b8c511d25443ba110d8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .../0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch | 133 +++++++++++++++++++++ ...Prefix-some-compat-symbols-with-libressl_.patch | 130 ++++++++++++++++++++ 2 files changed, 263 insertions(+) diff --git a/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch new file mode 100644 index 0000000000..411132ff20 --- /dev/null +++ b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch @@ -0,0 +1,133 @@ +From c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Mon, 11 Dec 2023 17:56:33 +0100 +Subject: [PATCH] Fix a few symbols in EXTRA_EXPORT + +I thought we stopped doing this, but that's for a separate thread. + +Upstream: https://github.com/libressl/portable/commit/c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd +Signed-off-by: Fabrice Fontaine +--- + crypto/CMakeLists.txt | 37 +++++++++++++++++++------------------ + 1 file changed, 19 insertions(+), 18 deletions(-) + +diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt +index 605647151..8046efe87 100644 +--- a/crypto/CMakeLists.txt ++++ b/crypto/CMakeLists.txt +@@ -767,13 +767,13 @@ endif() + + if(NOT HAVE_ASPRINTF) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/bsd-asprintf.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} asprintf) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} vasprintf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_asprintf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_vasprintf) + endif() + + if(NOT HAVE_FREEZERO) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/freezero.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} freezero) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_freezero) + endif() + + if(NOT HAVE_GETOPT) +@@ -799,46 +799,46 @@ endif() + + if(NOT HAVE_REALLOCARRAY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_reallocarray) + endif() + + if(NOT HAVE_RECALLOCARRAY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/recallocarray.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} recallocarray) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_recallocarray) + endif() + + if(NOT HAVE_STRCASECMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strcasecmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strcasecmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strcasecmp) + endif() + + if(NOT HAVE_STRLCAT) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcat.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcat) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcat) + endif() + + if(NOT HAVE_STRLCPY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcpy.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcpy) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcpy) + endif() + + if(NOT HAVE_STRNDUP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strndup.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strndup) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strndup) + if(NOT HAVE_STRNLEN) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strnlen.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strnlen) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strnlen) + endif() + endif() + + if(NOT HAVE_STRSEP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strsep.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strsep) + endif() + + if(NOT HAVE_STRTONUM) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strtonum.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strtonum) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strtonum) + endif() + + if(NOT HAVE_SYSLOG_R) +@@ -857,15 +857,15 @@ if(NOT HAVE_EXPLICIT_BZERO) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) + set_source_files_properties(compat/explicit_bzero.c PROPERTIES COMPILE_FLAGS -O0) + endif() +- set(EXTRA_EXPORT ${EXTRA_EXPORT} explicit_bzero) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_explicit_bzero) + endif() + + if(NOT HAVE_ARC4RANDOM_BUF) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_buf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_uniform) + + if(NOT HAVE_GETENTROPY) + if(WIN32) +@@ -891,12 +891,12 @@ endif() + + if(NOT HAVE_TIMINGSAFE_BCMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_bcmp) + endif() + + if(NOT HAVE_TIMINGSAFE_MEMCMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_memcmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_memcmp) + endif() + + if(NOT ENABLE_ASM) +@@ -919,6 +919,7 @@ foreach(SYM IN LISTS CRYPTO_UNEXPORT) + string(REPLACE "${SYM}\n" "" SYMS ${SYMS}) + endforeach() + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym ${SYMS}) ++# XXX should we still be doing this? + if(EXTRA_EXPORT) + list(SORT EXTRA_EXPORT) + foreach(SYM IN LISTS EXTRA_EXPORT) diff --git a/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch new file mode 100644 index 0000000000..42fbbe9069 --- /dev/null +++ b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch @@ -0,0 +1,130 @@ +From 0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Sat, 18 Nov 2023 10:53:09 +0100 +Subject: [PATCH] Prefix some compat symbols with libressl_ + +See #928. This isn't a full fix, but should remove much of the friction +already. + +Upstream: https://github.com/libressl/portable/pull/961/commits/0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 +Signed-off-by: Fabrice Fontaine +--- + include/compat/stdio.h | 2 ++ + include/compat/stdlib.h | 10 ++++++++++ + include/compat/string.h | 11 +++++++++++ + 3 files changed, 23 insertions(+) + +diff --git a/include/compat/stdio.h b/include/compat/stdio.h +index d5725c9ac9..4ddd63aee1 100644 +--- a/include/compat/stdio.h ++++ b/include/compat/stdio.h +@@ -20,7 +20,9 @@ + + #ifndef HAVE_ASPRINTF + #include ++#define vasprintf libressl_vasprintf + int vasprintf(char **str, const char *fmt, va_list ap); ++#define asprintf libressl_asprintf + int asprintf(char **str, const char *fmt, ...); + #endif + +diff --git a/include/compat/stdlib.h b/include/compat/stdlib.h +index 2eaea244c0..76dc07c35a 100644 +--- a/include/compat/stdlib.h ++++ b/include/compat/stdlib.h +@@ -20,26 +20,36 @@ + #include + + #ifndef HAVE_ARC4RANDOM_BUF ++#define arc4random libressl_arc4random + uint32_t arc4random(void); ++#define arc4random_buf libressl_arc4random_buf + void arc4random_buf(void *_buf, size_t n); ++#define arc4random_uniform libressl_arc4random_uniform + uint32_t arc4random_uniform(uint32_t upper_bound); + #endif + + #ifndef HAVE_FREEZERO ++#define freezero libressl_freezero + void freezero(void *ptr, size_t sz); + #endif + + #ifndef HAVE_GETPROGNAME ++#define getprogname libressl_getprogname + const char * getprogname(void); + #endif + ++#ifndef HAVE_REALLOCARRAY ++#define reallocarray libressl_reallocarray + void *reallocarray(void *, size_t, size_t); ++#endif + + #ifndef HAVE_RECALLOCARRAY ++#define recallocarray libressl_recallocarray + void *recallocarray(void *, size_t, size_t, size_t); + #endif + + #ifndef HAVE_STRTONUM ++#define strtonum libressl_strtonum + long long strtonum(const char *nptr, long long minval, + long long maxval, const char **errstr); + #endif +diff --git a/include/compat/string.h b/include/compat/string.h +index 4bf7519b5b..6a82793f62 100644 +--- a/include/compat/string.h ++++ b/include/compat/string.h +@@ -27,43 +27,54 @@ + #endif + + #ifndef HAVE_STRCASECMP ++#define strcasecmp libressl_strcasecmp + int strcasecmp(const char *s1, const char *s2); ++#define strncasecmp libressl_strncasecmp + int strncasecmp(const char *s1, const char *s2, size_t len); + #endif + + #ifndef HAVE_STRLCPY ++#define strlcpy libressl_strlcpy + size_t strlcpy(char *dst, const char *src, size_t siz); + #endif + + #ifndef HAVE_STRLCAT ++#define strlcat libressl_strlcat + size_t strlcat(char *dst, const char *src, size_t siz); + #endif + + #ifndef HAVE_STRNDUP ++#define strndup libressl_strndup + char * strndup(const char *str, size_t maxlen); + /* the only user of strnlen is strndup, so only build it if needed */ + #ifndef HAVE_STRNLEN ++#define strnlen libressl_strnlen + size_t strnlen(const char *str, size_t maxlen); + #endif + #endif + + #ifndef HAVE_STRSEP ++#define strsep libressl_strsep + char *strsep(char **stringp, const char *delim); + #endif + + #ifndef HAVE_EXPLICIT_BZERO ++#define explicit_bzero libressl_explicit_bzero + void explicit_bzero(void *, size_t); + #endif + + #ifndef HAVE_TIMINGSAFE_BCMP ++#define timingsafe_bcmp libressl_timingsafe_bcmp + int timingsafe_bcmp(const void *b1, const void *b2, size_t n); + #endif + + #ifndef HAVE_TIMINGSAFE_MEMCMP ++#define timingsafe_memcmp libressl_timingsafe_memcmp + int timingsafe_memcmp(const void *b1, const void *b2, size_t len); + #endif + + #ifndef HAVE_MEMMEM ++#define memmem libressl_memmem + void * memmem(const void *big, size_t big_len, const void *little, + size_t little_len); + #endif From arnout at mind.be Mon Feb 5 10:11:01 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:11:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/libressl: don't export arc4random In-Reply-To: <20240121202422.1598129-1-fontaine.fabrice@gmail.com> References: <20240121202422.1598129-1-fontaine.fabrice@gmail.com> Message-ID: On 21/01/2024 21:24, Fabrice Fontaine wrote: > Don't export arc4random to fix the following libcurl build failure > raised since bump of libcurl to version 8.5.0 in commit > aaa9438b96f88b1ecbf5eb9a1aebef8010835b8d and > https://github.com/curl/curl/commit/7925ba431b9a099daee1fa21d36c21887f787ad5: > > rand.c: In function 'randit': > rand.c:146:26: error: implicit declaration of function 'arc4random'; did you mean 'srandom'? [-Werror=implicit-function-declaration] > 146 | *rnd = (unsigned int)arc4random(); > | ^~~~~~~~~~ > | srandom > cc1: some warnings being treated as errors > > Fixes: > - http://autobuild.buildroot.org/results/8b7988629f1887be15c97b8c511d25443ba110d8 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > ...02-Fix-a-few-symbols-in-EXTRA_EXPORT.patch | 133 ++++++++++++++++++ > ...x-some-compat-symbols-with-libressl_.patch | 130 +++++++++++++++++ > 2 files changed, 263 insertions(+) > create mode 100644 package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch > create mode 100644 package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch > > diff --git a/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch > new file mode 100644 > index 0000000000..411132ff20 > --- /dev/null > +++ b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch > @@ -0,0 +1,133 @@ > +From c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd Mon Sep 17 00:00:00 2001 > +From: Theo Buehler > +Date: Mon, 11 Dec 2023 17:56:33 +0100 > +Subject: [PATCH] Fix a few symbols in EXTRA_EXPORT > + > +I thought we stopped doing this, but that's for a separate thread. > + > +Upstream: https://github.com/libressl/portable/commit/c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd > +Signed-off-by: Fabrice Fontaine > +--- > + crypto/CMakeLists.txt | 37 +++++++++++++++++++------------------ > + 1 file changed, 19 insertions(+), 18 deletions(-) > + > +diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt > +index 605647151..8046efe87 100644 > +--- a/crypto/CMakeLists.txt > ++++ b/crypto/CMakeLists.txt > +@@ -767,13 +767,13 @@ endif() > + > + if(NOT HAVE_ASPRINTF) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/bsd-asprintf.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} asprintf) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} vasprintf) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_asprintf) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_vasprintf) > + endif() > + > + if(NOT HAVE_FREEZERO) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/freezero.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} freezero) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_freezero) > + endif() > + > + if(NOT HAVE_GETOPT) > +@@ -799,46 +799,46 @@ endif() > + > + if(NOT HAVE_REALLOCARRAY) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_reallocarray) > + endif() > + > + if(NOT HAVE_RECALLOCARRAY) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/recallocarray.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} recallocarray) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_recallocarray) > + endif() > + > + if(NOT HAVE_STRCASECMP) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strcasecmp.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strcasecmp) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strcasecmp) > + endif() > + > + if(NOT HAVE_STRLCAT) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcat.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcat) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcat) > + endif() > + > + if(NOT HAVE_STRLCPY) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcpy.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcpy) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcpy) > + endif() > + > + if(NOT HAVE_STRNDUP) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strndup.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strndup) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strndup) > + if(NOT HAVE_STRNLEN) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strnlen.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strnlen) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strnlen) > + endif() > + endif() > + > + if(NOT HAVE_STRSEP) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strsep.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strsep) > + endif() > + > + if(NOT HAVE_STRTONUM) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strtonum.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strtonum) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strtonum) > + endif() > + > + if(NOT HAVE_SYSLOG_R) > +@@ -857,15 +857,15 @@ if(NOT HAVE_EXPLICIT_BZERO) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) > + set_source_files_properties(compat/explicit_bzero.c PROPERTIES COMPILE_FLAGS -O0) > + endif() > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} explicit_bzero) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_explicit_bzero) > + endif() > + > + if(NOT HAVE_ARC4RANDOM_BUF) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_buf) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_uniform) > + > + if(NOT HAVE_GETENTROPY) > + if(WIN32) > +@@ -891,12 +891,12 @@ endif() > + > + if(NOT HAVE_TIMINGSAFE_BCMP) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_bcmp) > + endif() > + > + if(NOT HAVE_TIMINGSAFE_MEMCMP) > + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c) > +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_memcmp) > ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_memcmp) > + endif() > + > + if(NOT ENABLE_ASM) > +@@ -919,6 +919,7 @@ foreach(SYM IN LISTS CRYPTO_UNEXPORT) > + string(REPLACE "${SYM}\n" "" SYMS ${SYMS}) > + endforeach() > + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym ${SYMS}) > ++# XXX should we still be doing this? > + if(EXTRA_EXPORT) > + list(SORT EXTRA_EXPORT) > + foreach(SYM IN LISTS EXTRA_EXPORT) > diff --git a/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch > new file mode 100644 > index 0000000000..42fbbe9069 > --- /dev/null > +++ b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch > @@ -0,0 +1,130 @@ > +From 0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 Mon Sep 17 00:00:00 2001 > +From: Theo Buehler > +Date: Sat, 18 Nov 2023 10:53:09 +0100 > +Subject: [PATCH] Prefix some compat symbols with libressl_ > + > +See #928. This isn't a full fix, but should remove much of the friction > +already. > + > +Upstream: https://github.com/libressl/portable/pull/961/commits/0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 > +Signed-off-by: Fabrice Fontaine > +--- > + include/compat/stdio.h | 2 ++ > + include/compat/stdlib.h | 10 ++++++++++ > + include/compat/string.h | 11 +++++++++++ > + 3 files changed, 23 insertions(+) > + > +diff --git a/include/compat/stdio.h b/include/compat/stdio.h > +index d5725c9ac9..4ddd63aee1 100644 > +--- a/include/compat/stdio.h > ++++ b/include/compat/stdio.h > +@@ -20,7 +20,9 @@ > + > + #ifndef HAVE_ASPRINTF > + #include > ++#define vasprintf libressl_vasprintf > + int vasprintf(char **str, const char *fmt, va_list ap); > ++#define asprintf libressl_asprintf > + int asprintf(char **str, const char *fmt, ...); > + #endif > + > +diff --git a/include/compat/stdlib.h b/include/compat/stdlib.h > +index 2eaea244c0..76dc07c35a 100644 > +--- a/include/compat/stdlib.h > ++++ b/include/compat/stdlib.h > +@@ -20,26 +20,36 @@ > + #include > + > + #ifndef HAVE_ARC4RANDOM_BUF > ++#define arc4random libressl_arc4random > + uint32_t arc4random(void); > ++#define arc4random_buf libressl_arc4random_buf > + void arc4random_buf(void *_buf, size_t n); > ++#define arc4random_uniform libressl_arc4random_uniform > + uint32_t arc4random_uniform(uint32_t upper_bound); > + #endif > + > + #ifndef HAVE_FREEZERO > ++#define freezero libressl_freezero > + void freezero(void *ptr, size_t sz); > + #endif > + > + #ifndef HAVE_GETPROGNAME > ++#define getprogname libressl_getprogname > + const char * getprogname(void); > + #endif > + > ++#ifndef HAVE_REALLOCARRAY > ++#define reallocarray libressl_reallocarray > + void *reallocarray(void *, size_t, size_t); > ++#endif > + > + #ifndef HAVE_RECALLOCARRAY > ++#define recallocarray libressl_recallocarray > + void *recallocarray(void *, size_t, size_t, size_t); > + #endif > + > + #ifndef HAVE_STRTONUM > ++#define strtonum libressl_strtonum > + long long strtonum(const char *nptr, long long minval, > + long long maxval, const char **errstr); > + #endif > +diff --git a/include/compat/string.h b/include/compat/string.h > +index 4bf7519b5b..6a82793f62 100644 > +--- a/include/compat/string.h > ++++ b/include/compat/string.h > +@@ -27,43 +27,54 @@ > + #endif > + > + #ifndef HAVE_STRCASECMP > ++#define strcasecmp libressl_strcasecmp > + int strcasecmp(const char *s1, const char *s2); > ++#define strncasecmp libressl_strncasecmp > + int strncasecmp(const char *s1, const char *s2, size_t len); > + #endif > + > + #ifndef HAVE_STRLCPY > ++#define strlcpy libressl_strlcpy > + size_t strlcpy(char *dst, const char *src, size_t siz); > + #endif > + > + #ifndef HAVE_STRLCAT > ++#define strlcat libressl_strlcat > + size_t strlcat(char *dst, const char *src, size_t siz); > + #endif > + > + #ifndef HAVE_STRNDUP > ++#define strndup libressl_strndup > + char * strndup(const char *str, size_t maxlen); > + /* the only user of strnlen is strndup, so only build it if needed */ > + #ifndef HAVE_STRNLEN > ++#define strnlen libressl_strnlen > + size_t strnlen(const char *str, size_t maxlen); > + #endif > + #endif > + > + #ifndef HAVE_STRSEP > ++#define strsep libressl_strsep > + char *strsep(char **stringp, const char *delim); > + #endif > + > + #ifndef HAVE_EXPLICIT_BZERO > ++#define explicit_bzero libressl_explicit_bzero > + void explicit_bzero(void *, size_t); > + #endif > + > + #ifndef HAVE_TIMINGSAFE_BCMP > ++#define timingsafe_bcmp libressl_timingsafe_bcmp > + int timingsafe_bcmp(const void *b1, const void *b2, size_t n); > + #endif > + > + #ifndef HAVE_TIMINGSAFE_MEMCMP > ++#define timingsafe_memcmp libressl_timingsafe_memcmp > + int timingsafe_memcmp(const void *b1, const void *b2, size_t len); > + #endif > + > + #ifndef HAVE_MEMMEM > ++#define memmem libressl_memmem > + void * memmem(const void *big, size_t big_len, const void *little, > + size_t little_len); > + #endif From arnout at mind.be Mon Feb 5 10:13:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:13:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pymysql: bump to version 1.1.0 In-Reply-To: <20240111014940.2567842-1-james.hilliard1@gmail.com> References: <20240111014940.2567842-1-james.hilliard1@gmail.com> Message-ID: <3500c600-833a-46d9-a6e6-83ed46554f8c@mind.be> On 11/01/2024 02:49, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pymysql/python-pymysql.hash | 4 ++-- > package/python-pymysql/python-pymysql.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pymysql/python-pymysql.hash b/package/python-pymysql/python-pymysql.hash > index dd81bdab7e..641d5dba97 100644 > --- a/package/python-pymysql/python-pymysql.hash > +++ b/package/python-pymysql/python-pymysql.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pymysql/json > -md5 3fe6ff2eefb58af5c54d335c6e0216de PyMySQL-1.0.2.tar.gz > -sha256 816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36 PyMySQL-1.0.2.tar.gz > +md5 81d559c87414017075de030d8ce93257 PyMySQL-1.1.0.tar.gz > +sha256 4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96 PyMySQL-1.1.0.tar.gz > # Locally computed sha256 checksums > sha256 314120dc65f0800f738a4b31400c76ee14decd1fbe77ce9c3540a421b86ea7b6 LICENSE > diff --git a/package/python-pymysql/python-pymysql.mk b/package/python-pymysql/python-pymysql.mk > index 3703572f35..c600fe515c 100644 > --- a/package/python-pymysql/python-pymysql.mk > +++ b/package/python-pymysql/python-pymysql.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYMYSQL_VERSION = 1.0.2 > +PYTHON_PYMYSQL_VERSION = 1.1.0 > PYTHON_PYMYSQL_SOURCE = PyMySQL-$(PYTHON_PYMYSQL_VERSION).tar.gz > -PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/60/ea/33b8430115d9b617b713959b21dfd5db1df77425e38efea08d121e83b712 > +PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/41/9d/ee68dee1c8821c839bb31e6e5f40e61035a5278f7c1307dde758f0c90452 > PYTHON_PYMYSQL_LICENSE = MIT > PYTHON_PYMYSQL_LICENSE_FILES = LICENSE > PYTHON_PYMYSQL_SETUP_TYPE = setuptools From arnout at mind.be Mon Feb 5 10:12:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:12:22 +0100 Subject: [Buildroot] [git commit] package/python-pymysql: bump to version 1.1.0 Message-ID: <20240205101326.37C90869EA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8120f29935c0070c2c7ebdcfeceb37d2c3dc0d7d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pymysql/python-pymysql.hash | 4 ++-- package/python-pymysql/python-pymysql.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pymysql/python-pymysql.hash b/package/python-pymysql/python-pymysql.hash index dd81bdab7e..641d5dba97 100644 --- a/package/python-pymysql/python-pymysql.hash +++ b/package/python-pymysql/python-pymysql.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymysql/json -md5 3fe6ff2eefb58af5c54d335c6e0216de PyMySQL-1.0.2.tar.gz -sha256 816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36 PyMySQL-1.0.2.tar.gz +md5 81d559c87414017075de030d8ce93257 PyMySQL-1.1.0.tar.gz +sha256 4f13a7df8bf36a51e81dd9f3605fede45a4878fe02f9236349fd82a3f0612f96 PyMySQL-1.1.0.tar.gz # Locally computed sha256 checksums sha256 314120dc65f0800f738a4b31400c76ee14decd1fbe77ce9c3540a421b86ea7b6 LICENSE diff --git a/package/python-pymysql/python-pymysql.mk b/package/python-pymysql/python-pymysql.mk index 3703572f35..c600fe515c 100644 --- a/package/python-pymysql/python-pymysql.mk +++ b/package/python-pymysql/python-pymysql.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMYSQL_VERSION = 1.0.2 +PYTHON_PYMYSQL_VERSION = 1.1.0 PYTHON_PYMYSQL_SOURCE = PyMySQL-$(PYTHON_PYMYSQL_VERSION).tar.gz -PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/60/ea/33b8430115d9b617b713959b21dfd5db1df77425e38efea08d121e83b712 +PYTHON_PYMYSQL_SITE = https://files.pythonhosted.org/packages/41/9d/ee68dee1c8821c839bb31e6e5f40e61035a5278f7c1307dde758f0c90452 PYTHON_PYMYSQL_LICENSE = MIT PYTHON_PYMYSQL_LICENSE_FILES = LICENSE PYTHON_PYMYSQL_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Mon Feb 5 10:14:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:14:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libwebsockets: bump to version 4.3.3 In-Reply-To: <20240131213512.2261698-1-fontaine.fabrice@gmail.com> References: <20240131213512.2261698-1-fontaine.fabrice@gmail.com> Message-ID: <20240205111433.1a82d7e2@windsurf> On Wed, 31 Jan 2024 22:35:12 +0100 Fabrice Fontaine wrote: > Drop first patch (already in version) > > https://github.com/warmcat/libwebsockets/compare/v4.3.2...v4.3.3 > > Signed-off-by: Fabrice Fontaine > --- > .checkpackageignore | 1 - > ...Lists.txt-fix-build-with-pkg-config.patch} | 0 > ...eLists.txt-fix-build-without-threads.patch | 47 ------------------- > package/libwebsockets/libwebsockets.hash | 2 +- > package/libwebsockets/libwebsockets.mk | 2 +- > 5 files changed, 2 insertions(+), 50 deletions(-) > rename package/libwebsockets/{0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch => 0001-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch} (100%) > delete mode 100644 package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 10:14:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 11:14:30 +0100 Subject: [Buildroot] [git commit] package/wilc_firmware: bump to 16.1.2 Message-ID: <20240205101443.8305A869F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c5981d1a119bc9779a9c1d507899f835559f7b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release changelog: - Use default values for IQ calibration correction when the eFuse register has zero values. - Fix for "WILC1000 Firmware initialization issue" by updating the PMU clock switching sequence during firmware initialization. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN --- package/wilc-firmware/wilc-firmware.hash | 2 +- package/wilc-firmware/wilc-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc-firmware/wilc-firmware.hash index 802cb4f9b1..8a7957a1d2 100644 --- a/package/wilc-firmware/wilc-firmware.hash +++ b/package/wilc-firmware/wilc-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0 wilc-firmware-wilc_linux_16_1.tar.gz +sha256 6cd5fc52150520bedb736f58124063041b4d9849ea33481a8b075f51aec64f8e wilc-firmware-wilc_linux_16_1_2.tar.gz sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc-firmware/wilc-firmware.mk index 12c825cf92..3381162bbd 100644 --- a/package/wilc-firmware/wilc-firmware.mk +++ b/package/wilc-firmware/wilc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -WILC_FIRMWARE_VERSION = wilc_linux_16_1 +WILC_FIRMWARE_VERSION = wilc_linux_16_1_2 WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) WILC_FIRMWARE_LICENSE = PROPRIETARY From arnout at mind.be Mon Feb 5 10:15:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:15:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyopenssl: bump to version 23.3.0 In-Reply-To: <20240111015855.2645577-1-james.hilliard1@gmail.com> References: <20240111015855.2645577-1-james.hilliard1@gmail.com> Message-ID: <3a627241-c297-44bf-bf25-8006c2498451@mind.be> On 11/01/2024 02:58, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyopenssl/python-pyopenssl.hash | 4 ++-- > package/python-pyopenssl/python-pyopenssl.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash > index f9b1e4a86b..fb5f75db96 100644 > --- a/package/python-pyopenssl/python-pyopenssl.hash > +++ b/package/python-pyopenssl/python-pyopenssl.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyopenssl/json > -md5 1be2c02bf3c0c4e5e7c51b9ac90ebd72 pyOpenSSL-23.0.0.tar.gz > -sha256 c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f pyOpenSSL-23.0.0.tar.gz > +md5 4c4f6f9e1c731b8ee7adcd9fbeccec62 pyOpenSSL-23.3.0.tar.gz > +sha256 6b2cba5cc46e822750ec3e5a81ee12819850b11303630d575e98108a079c2b12 pyOpenSSL-23.3.0.tar.gz > # Locally computed sha256 checksums > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk > index 1d89f5b696..9865f2bb00 100644 > --- a/package/python-pyopenssl/python-pyopenssl.mk > +++ b/package/python-pyopenssl/python-pyopenssl.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYOPENSSL_VERSION = 23.0.0 > +PYTHON_PYOPENSSL_VERSION = 23.3.0 > PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz > -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/af/6e/0706d5e0eac08fcff586366f5198c9bf0a8b46f0f45b1858324e0d94c295 > +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/bf/a0/e667c3c43b65a188cc3041fa00c50655315b93be45182b2c94d185a2610e > PYTHON_PYOPENSSL_LICENSE = Apache-2.0 > PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE > PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl From thomas.petazzoni at bootlin.com Mon Feb 5 10:14:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:14:43 +0100 Subject: [Buildroot] [git commit] package/libwebsockets: bump to version 4.3.3 Message-ID: <20240205101559.6157186A0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0d6e5ca41f174b8cc18d668445ebd4d9578dd013 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop first patch (already in version) https://github.com/warmcat/libwebsockets/compare/v4.3.2...v4.3.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...CMakeLists.txt-fix-build-with-pkg-config.patch} | 0 ...-CMakeLists.txt-fix-build-without-threads.patch | 47 ---------------------- package/libwebsockets/libwebsockets.hash | 2 +- package/libwebsockets/libwebsockets.mk | 2 +- 5 files changed, 2 insertions(+), 50 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 15ceb65fd8..bcb6aff6ce 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -727,7 +727,6 @@ package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch Upstream package/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch Upstream package/libwebsock/0002-fix-ssl.patch Upstream package/libwebsock/0003-fix-incorrect-inline.patch Upstream -package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch Upstream package/libyuv/0001-i386-sse2.patch Upstream package/lighttpd/0001-Modify-the-default-lighttpd-configuration-file-to-ha.patch Upstream package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables diff --git a/package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch b/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch similarity index 100% rename from package/libwebsockets/0002-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch rename to package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-with-pkg-config.patch diff --git a/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch b/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch deleted file mode 100644 index ae46602a53..0000000000 --- a/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c83cf48b9095a6914a0844bec4439763bb0c9138 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 28 May 2022 23:15:40 +0200 -Subject: [PATCH] lib/tls/CMakeLists.txt: fix build without threads - -openssl can be built without threads resulting in the following build -failure: - --- Looking for HMAC_CTX_new --- Looking for HMAC_CTX_new - not found - -[...] - -In file included from /home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/include/libwebsockets.h:661, - from /home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/lib/core/./private-lib-core.h:140, - from /home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/lib/plat/unix/unix-misc.c:28: -/home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/include/libwebsockets/lws-genhash.h:85:18: error: field 'ctx' has incomplete type - 85 | HMAC_CTX ctx; - | ^~~ - -To fix this build failure, don't unconditionally add pthread if openssl -has been found through pkg-config as openssl.pc will contain the -appropriate dependencies (i.e. -lpthread but also -lz or -latomic) - -Fixes: - - http://autobuild.buildroot.org/results/2ae9e3249b6fcc9e6c30e7783e264fc6599e61df - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/warmcat/libwebsockets/commit/c83cf48b9095a6914a0844bec4439763bb0c9138] ---- - lib/tls/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt -index 559be9abb..a2b78c252 100644 ---- a/lib/tls/CMakeLists.txt -+++ b/lib/tls/CMakeLists.txt -@@ -311,7 +311,7 @@ endif() - if (UNIX AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX")) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_DL_LIBS}) - endif() --if ((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX")) -+if ((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT ((${CMAKE_SYSTEM_NAME} MATCHES "QNX") OR PC_OPENSSL_FOUND)) - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} pthread) - endif() - diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index 4bff068241..01e7c7bfd1 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1 libwebsockets-4.3.2.tar.gz +sha256 6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90 libwebsockets-4.3.3.tar.gz sha256 2b5dd8030691f3d1870a040f085c37e45d9ab9c684a7f1284f5f379c1e829b28 LICENSE diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index daf481b3bc..c00c44cac3 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = 4.3.2 +LIBWEBSOCKETS_VERSION = 4.3.3 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = MIT with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:15:06 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:15:06 +0100 Subject: [Buildroot] [git commit] package/python-pyopenssl: bump to version 23.3.0 Message-ID: <20240205101559.6B43E86A0F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0c80a1b9f19b8cb7c40aa0f9b34a2b9214d2451d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyopenssl/python-pyopenssl.hash | 4 ++-- package/python-pyopenssl/python-pyopenssl.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index f9b1e4a86b..fb5f75db96 100644 --- a/package/python-pyopenssl/python-pyopenssl.hash +++ b/package/python-pyopenssl/python-pyopenssl.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyopenssl/json -md5 1be2c02bf3c0c4e5e7c51b9ac90ebd72 pyOpenSSL-23.0.0.tar.gz -sha256 c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f pyOpenSSL-23.0.0.tar.gz +md5 4c4f6f9e1c731b8ee7adcd9fbeccec62 pyOpenSSL-23.3.0.tar.gz +sha256 6b2cba5cc46e822750ec3e5a81ee12819850b11303630d575e98108a079c2b12 pyOpenSSL-23.3.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyopenssl/python-pyopenssl.mk b/package/python-pyopenssl/python-pyopenssl.mk index 1d89f5b696..9865f2bb00 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 23.0.0 +PYTHON_PYOPENSSL_VERSION = 23.3.0 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/af/6e/0706d5e0eac08fcff586366f5198c9bf0a8b46f0f45b1858324e0d94c295 +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/bf/a0/e667c3c43b65a188cc3041fa00c50655315b93be45182b2c94d185a2610e PYTHON_PYOPENSSL_LICENSE = Apache-2.0 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE PYTHON_PYOPENSSL_CPE_ID_VENDOR = pyopenssl From antoine.coutant at smile.fr Mon Feb 5 10:16:50 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 5 Feb 2024 11:16:50 +0100 Subject: [Buildroot] [PATCH v2] package/environment-setup: add variable KERNEL_DIR alongside KERNELDIR In-Reply-To: <20240131-kernel_dir-v2-1-555eeeee1722@microchip.com> References: <20240131-kernel_dir-v2-1-555eeeee1722@microchip.com> Message-ID: On 31/01/2024 19:18, Nayab Sayed via buildroot wrote: > Update host environment setup helper script to incorporate the variable > KENREL_DIR alongside the existing KERNELDIR. This adjustment ensures > consistency, as some projects utilize KERNELDIR while others use KERNEL_DIR. > > Signed-off-by: Nayab Sayed > --- > Changes in v2: > - Keep both KERNEL_DIR and KERNELDIR. > - Update commit message > - Link to v1:https://lore.kernel.org/r/20240124-kernel_dir-v1-1-4125408cf65d at microchip.com > --- > package/environment-setup/environment-setup | 3 ++- > package/environment-setup/environment-setup.mk | 2 ++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/environment-setup/environment-setup b/package/environment-setup/environment-setup > index 84a9843c24..0bae813e1a 100644 > --- a/package/environment-setup/environment-setup > +++ b/package/environment-setup/environment-setup > @@ -10,7 +10,8 @@ cat <<'EOF' > Some tips: > * PATH now contains the SDK utilities > * Standard autotools variables (CC, LD, CFLAGS) are exported > -* Kernel compilation variables (ARCH, CROSS_COMPILE, KERNELDIR) are exported > +* Kernel compilation variables (ARCH, CROSS_COMPILE, KERNELDIR or KERNEL_DIR) > + are exported > * To configure do "./configure $CONFIGURE_FLAGS" or use > the "configure" alias > * To build CMake-based projects, use the "cmake" alias > diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk > index 29ec5a9a95..4a71f18f3a 100644 > --- a/package/environment-setup/environment-setup.mk > +++ b/package/environment-setup/environment-setup.mk > @@ -35,6 +35,8 @@ define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS > > $(if $(BR2_LINUX_KERNEL),\ > printf "export \"KERNELDIR=$(LINUX_BUILDDIR)\"\n" \ > + >> $(ENVIRONMENT_SETUP_FILE) > + printf "export \"KERNEL_DIR=$(LINUX_BUILDDIR)\"\n" \ > >> $(ENVIRONMENT_SETUP_FILE),) > endef > > > --- > base-commit: 04dfeff6242516a1061973fc7af2cc9c5e3dd4e2 > change-id: 20240124-kernel_dir-41a48fd97b75 > > Best regards, Looks good to me. Reviewed-by: Antoine Coutant Regards, Antoine Coutant. -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Mon Feb 5 10:15:30 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:15:30 +0100 Subject: [Buildroot] [git commit] package/python-pyrsistent: bump to version 0.20.0 Message-ID: <20240205101722.2390F86A14@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6925d696c1fdd89e2e86fca5ae70dc36c3b11d0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/tobgu/pyrsistent/commit/acdffe6967a821165155ac16bee48054fd61385a Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyrsistent/python-pyrsistent.hash | 6 +++--- package/python-pyrsistent/python-pyrsistent.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyrsistent/python-pyrsistent.hash b/package/python-pyrsistent/python-pyrsistent.hash index d5c9a22656..780a7f09d9 100644 --- a/package/python-pyrsistent/python-pyrsistent.hash +++ b/package/python-pyrsistent/python-pyrsistent.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyrsistent/json -md5 761266eab1f9dc9280cdb0a6d2dedb08 pyrsistent-0.19.3.tar.gz -sha256 1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 pyrsistent-0.19.3.tar.gz +md5 dce0f9a13668dbf8bb76f74954b4a42a pyrsistent-0.20.0.tar.gz +sha256 4c48f78f62ab596c679086084d0dd13254ae4f3d6c72a83ffdf5ebdef8f265a4 pyrsistent-0.20.0.tar.gz # Locally computed sha256 checksums -sha256 3ea56753cbd0cc897d3f4414a902f5694991db7c1b3abb8230216381185f9112 LICENSE.mit +sha256 3fd3d3d1ab9c733ee453fbf3bbbaa845440d0d8c20d7b5a039d2e46a2ed7fc01 LICENSE.mit diff --git a/package/python-pyrsistent/python-pyrsistent.mk b/package/python-pyrsistent/python-pyrsistent.mk index f3457feebe..6c52d7dbc8 100644 --- a/package/python-pyrsistent/python-pyrsistent.mk +++ b/package/python-pyrsistent/python-pyrsistent.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYRSISTENT_VERSION = 0.19.3 +PYTHON_PYRSISTENT_VERSION = 0.20.0 PYTHON_PYRSISTENT_SOURCE = pyrsistent-$(PYTHON_PYRSISTENT_VERSION).tar.gz -PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/bf/90/445a7dbd275c654c268f47fa9452152709134f61f09605cf776407055a89 +PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/ce/3a/5031723c09068e9c8c2f0bc25c3a9245f2b1d1aea8396c787a408f2b95ca PYTHON_PYRSISTENT_SETUP_TYPE = setuptools PYTHON_PYRSISTENT_LICENSE = MIT PYTHON_PYRSISTENT_LICENSE_FILES = LICENSE.mit From thomas.petazzoni at bootlin.com Mon Feb 5 10:18:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:18:30 +0100 Subject: [Buildroot] [PATCH] package/autoconf: bump to version 2.72 In-Reply-To: <20240118182808.551258-1-francois.perrad@gadz.org> References: <20240118182808.551258-1-francois.perrad@gadz.org> Message-ID: <20240205111830.14a6a456@windsurf> Hello Fran?ois, On Thu, 18 Jan 2024 19:28:08 +0100 Francois Perrad wrote: > https://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS?h=v2.72 > Signed-off-by: Francois Perrad > --- > package/autoconf/0001-dont-add-dirty-to-version.patch | 2 +- > package/autoconf/autoconf.hash | 2 +- > package/autoconf/autoconf.mk | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Following your feedback, I applied and pushed your patch to master. Let's watch and see how things go in the autobuilders in the next few days. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 10:17:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:17:52 +0100 Subject: [Buildroot] [git commit] package/autoconf: bump to version 2.72 Message-ID: <20240205101903.C345286A1D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=524f3536029dace3ce9aa154d3ca4685582e1955 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS?h=v2.72 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/autoconf/0001-dont-add-dirty-to-version.patch | 2 +- package/autoconf/autoconf.hash | 2 +- package/autoconf/autoconf.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/autoconf/0001-dont-add-dirty-to-version.patch b/package/autoconf/0001-dont-add-dirty-to-version.patch index e8d9f6a29d..8df2276865 100644 --- a/package/autoconf/0001-dont-add-dirty-to-version.patch +++ b/package/autoconf/0001-dont-add-dirty-to-version.patch @@ -17,7 +17,7 @@ Signed-off-by: Gustavo Zacarias diff -Nura autoconf-2.69.orig/build-aux/git-version-gen autoconf-2.69/build-aux/git-version-gen --- autoconf-2.69.orig/build-aux/git-version-gen 2013-06-27 11:31:02.340200154 -0300 +++ autoconf-2.69/build-aux/git-version-gen 2013-06-27 11:31:13.734577033 -0300 -@@ -203,7 +203,7 @@ +@@ -210,7 +210,7 @@ *) # Append the suffix only if there isn't one already. case $v in *-dirty) ;; diff --git a/package/autoconf/autoconf.hash b/package/autoconf/autoconf.hash index de0840dd84..f94b2d9de5 100644 --- a/package/autoconf/autoconf.hash +++ b/package/autoconf/autoconf.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 autoconf-2.71.tar.xz +sha256 ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a autoconf-2.72.tar.xz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYINGv3 sha256 1f1cde9fb68b9b3cff18c420894bec5bd4defacd700b7d13df54a887301e5350 COPYING.EXCEPTION diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index 15ce9d5927..48bfc80e7f 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_VERSION = 2.71 +AUTOCONF_VERSION = 2.72 AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.xz AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf From yann.morin.1998 at free.fr Mon Feb 5 10:19:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 11:19:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 In-Reply-To: <399bbbdbc865bb5fab6fa7dbdad653f9aa240da2.camel@embeddedTS.com> References: <399bbbdbc865bb5fab6fa7dbdad653f9aa240da2.camel@embeddedTS.com> Message-ID: Kris, All, On 2024-02-01 13:59 -0800, Kris Bahnsen via buildroot spake thusly: > From 55e8d294997af933bb3d832b73229bebefa45044 Mon Sep 17 00:00:00 2001 > From: Kris Bahnsen > Date: Thu, 1 Feb 2024 20:46:39 +0000 > Subject: [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 > > Release changelog: > - Use default values for IQ calibration correction when the eFuse > register has zero values. > - Fix for "WILC1000 Firmware initialization issue" by updating > the PMU clock switching sequence during firmware initialization. > > Signed-off-by: Kris Bahnsen It seems your patch got badly mangled, and I had issues applying it (git-am whined the patch was empty). And I notice that the mail headers are included in the patch. Not sure what happen. Using "git send-email" is known to send correctly formatted patches, so maybe check if you can do that next time. Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/wilc-firmware/wilc-firmware.hash | 2 +- > package/wilc-firmware/wilc-firmware.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc-firmware/wilc-firmware.hash > index 802cb4f9b1..8a7957a1d2 100644 > --- a/package/wilc-firmware/wilc-firmware.hash > +++ b/package/wilc-firmware/wilc-firmware.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0 wilc-firmware-wilc_linux_16_1.tar.gz > +sha256 6cd5fc52150520bedb736f58124063041b4d9849ea33481a8b075f51aec64f8e wilc-firmware-wilc_linux_16_1_2.tar.gz > sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw > diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc-firmware/wilc-firmware.mk > index 12c825cf92..3381162bbd 100644 > --- a/package/wilc-firmware/wilc-firmware.mk > +++ b/package/wilc-firmware/wilc-firmware.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WILC_FIRMWARE_VERSION = wilc_linux_16_1 > +WILC_FIRMWARE_VERSION = wilc_linux_16_1_2 > WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) > > WILC_FIRMWARE_LICENSE = PROPRIETARY > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Mon Feb 5 10:19:17 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:19:17 +0100 Subject: [Buildroot] [git commit] package/python-pyspnego: bump to version 0.10.2 Message-ID: <20240205102047.E5E8286A22@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66310c8ccb3b2022bcb2a938147040bf589b8636 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyspnego/python-pyspnego.hash | 7 +++---- package/python-pyspnego/python-pyspnego.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash index 0ae6cf1d4e..dc808d4204 100644 --- a/package/python-pyspnego/python-pyspnego.hash +++ b/package/python-pyspnego/python-pyspnego.hash @@ -1,6 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyspnego/json -md5 93ab1a088d65e6a7c97efdb567ba37b0 pyspnego-0.7.0.tar.gz -sha256 da78096fd7c9f40e716f6fbe3e30d913103d75fd676f839f98fc3a6fee92fbe3 pyspnego-0.7.0.tar.gz - -# Locally computed +md5 b633cab73a1481c5dbc2d6f6857569d0 pyspnego-0.10.2.tar.gz +sha256 9a22c23aeae7b4424fdb2482450d3f8302ac012e2644e1cfe735cf468fcd12ed pyspnego-0.10.2.tar.gz +# Locally computed sha256 checksums sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk index 2fbb779d98..740e6eec15 100644 --- a/package/python-pyspnego/python-pyspnego.mk +++ b/package/python-pyspnego/python-pyspnego.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYSPNEGO_VERSION = 0.7.0 +PYTHON_PYSPNEGO_VERSION = 0.10.2 PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz -PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/97/f3/bdf3cd5f4c5a1bf9e1d4bb771c133850ee08241c18cafd90a6d872937a9f +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/3a/c3/401a5ae889b51f80e91474b6acda7dae8d704c6fe8424fd40e0ff0702812 PYTHON_PYSPNEGO_SETUP_TYPE = setuptools PYTHON_PYSPNEGO_LICENSE = MIT PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 10:21:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:21:50 +0100 Subject: [Buildroot] [PATCH] package/flannel: Bump to version 0.24.2 In-Reply-To: References: Message-ID: <7c076341-a91b-461c-86e2-27e0bca1a5ed@korsgaard.com> On 20/01/2024 12.00, Geoff Levand wrote: > Signed-off-by: Geoff Levand > > --- > package/flannel/flannel.hash | 2 +- > package/flannel/flannel.mk | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash > index bafc453097..c1ceeed9e8 100644 > --- a/package/flannel/flannel.hash > +++ b/package/flannel/flannel.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz > +sha256 f9e68bc9c5b41ee7f721a754c9fa4eddf3da775faa9e638581a564e33b3fabcf flannel-0.24.2.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk > index b4e2b2f777..515ecfca86 100644 > --- a/package/flannel/flannel.mk > +++ b/package/flannel/flannel.mk > @@ -4,7 +4,8 @@ > # > ################################################################################ > > -FLANNEL_VERSION = 0.14.0 > +FLANNEL_VERSION = 0.24.2 > +FLANNEL_SOURCE = flannel-$(FLANNEL_VERSION).tar.gz I am not sure why you are adding this, as that is already the default value as pointed out by utils/check-package: package/flannel/flannel.mk:8: remove default value of _SOURCE variable (http://nightly.buildroot.org/#generic-package-reference) Committed with that fixed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 10:22:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:22:01 +0100 Subject: [Buildroot] [git commit] package/flannel: Bump to version 0.24.2 Message-ID: <20240205102214.94AEC86A3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2aec6008e861ccaec6ce473d7b911ce41ad253e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Geoff Levand [Peter: drop _SOURCE] Signed-off-by: Peter Korsgaard --- package/flannel/flannel.hash | 2 +- package/flannel/flannel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index bafc453097..c1ceeed9e8 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz +sha256 f9e68bc9c5b41ee7f721a754c9fa4eddf3da775faa9e638581a564e33b3fabcf flannel-0.24.2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index b4e2b2f777..02e62256cf 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLANNEL_VERSION = 0.14.0 +FLANNEL_VERSION = 0.24.2 FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 From arnout at mind.be Mon Feb 5 10:16:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:16:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyrsistent: bump to version 0.20.0 In-Reply-To: <20240111021434.2655120-1-james.hilliard1@gmail.com> References: <20240111021434.2655120-1-james.hilliard1@gmail.com> Message-ID: <7636c39e-89a7-43a9-a758-c08c11d04735@mind.be> On 11/01/2024 03:14, James Hilliard wrote: > License hash changed due to year update: > https://github.com/tobgu/pyrsistent/commit/acdffe6967a821165155ac16bee48054fd61385a > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyrsistent/python-pyrsistent.hash | 6 +++--- > package/python-pyrsistent/python-pyrsistent.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-pyrsistent/python-pyrsistent.hash b/package/python-pyrsistent/python-pyrsistent.hash > index d5c9a22656..780a7f09d9 100644 > --- a/package/python-pyrsistent/python-pyrsistent.hash > +++ b/package/python-pyrsistent/python-pyrsistent.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyrsistent/json > -md5 761266eab1f9dc9280cdb0a6d2dedb08 pyrsistent-0.19.3.tar.gz > -sha256 1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 pyrsistent-0.19.3.tar.gz > +md5 dce0f9a13668dbf8bb76f74954b4a42a pyrsistent-0.20.0.tar.gz > +sha256 4c48f78f62ab596c679086084d0dd13254ae4f3d6c72a83ffdf5ebdef8f265a4 pyrsistent-0.20.0.tar.gz > # Locally computed sha256 checksums > -sha256 3ea56753cbd0cc897d3f4414a902f5694991db7c1b3abb8230216381185f9112 LICENSE.mit > +sha256 3fd3d3d1ab9c733ee453fbf3bbbaa845440d0d8c20d7b5a039d2e46a2ed7fc01 LICENSE.mit > diff --git a/package/python-pyrsistent/python-pyrsistent.mk b/package/python-pyrsistent/python-pyrsistent.mk > index f3457feebe..6c52d7dbc8 100644 > --- a/package/python-pyrsistent/python-pyrsistent.mk > +++ b/package/python-pyrsistent/python-pyrsistent.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYRSISTENT_VERSION = 0.19.3 > +PYTHON_PYRSISTENT_VERSION = 0.20.0 > PYTHON_PYRSISTENT_SOURCE = pyrsistent-$(PYTHON_PYRSISTENT_VERSION).tar.gz > -PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/bf/90/445a7dbd275c654c268f47fa9452152709134f61f09605cf776407055a89 > +PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/ce/3a/5031723c09068e9c8c2f0bc25c3a9245f2b1d1aea8396c787a408f2b95ca > PYTHON_PYRSISTENT_SETUP_TYPE = setuptools > PYTHON_PYRSISTENT_LICENSE = MIT > PYTHON_PYRSISTENT_LICENSE_FILES = LICENSE.mit From arnout at mind.be Mon Feb 5 10:19:09 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:19:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyspnego: bump to version 0.10.2 In-Reply-To: <20240111023429.2663712-1-james.hilliard1@gmail.com> References: <20240111023429.2663712-1-james.hilliard1@gmail.com> Message-ID: <600a04b9-5378-47b8-9483-17d65718ac75@mind.be> On 11/01/2024 03:34, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyspnego/python-pyspnego.hash | 7 +++---- > package/python-pyspnego/python-pyspnego.mk | 4 ++-- > 2 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash > index 0ae6cf1d4e..dc808d4204 100644 > --- a/package/python-pyspnego/python-pyspnego.hash > +++ b/package/python-pyspnego/python-pyspnego.hash > @@ -1,6 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyspnego/json > -md5 93ab1a088d65e6a7c97efdb567ba37b0 pyspnego-0.7.0.tar.gz > -sha256 da78096fd7c9f40e716f6fbe3e30d913103d75fd676f839f98fc3a6fee92fbe3 pyspnego-0.7.0.tar.gz > - > -# Locally computed > +md5 b633cab73a1481c5dbc2d6f6857569d0 pyspnego-0.10.2.tar.gz > +sha256 9a22c23aeae7b4424fdb2482450d3f8302ac012e2644e1cfe735cf468fcd12ed pyspnego-0.10.2.tar.gz > +# Locally computed sha256 checksums > sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE > diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk > index 2fbb779d98..740e6eec15 100644 > --- a/package/python-pyspnego/python-pyspnego.mk > +++ b/package/python-pyspnego/python-pyspnego.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYSPNEGO_VERSION = 0.7.0 > +PYTHON_PYSPNEGO_VERSION = 0.10.2 > PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz > -PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/97/f3/bdf3cd5f4c5a1bf9e1d4bb771c133850ee08241c18cafd90a6d872937a9f > +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/3a/c3/401a5ae889b51f80e91474b6acda7dae8d704c6fe8424fd40e0ff0702812 > PYTHON_PYSPNEGO_SETUP_TYPE = setuptools > PYTHON_PYSPNEGO_LICENSE = MIT > PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:25:41 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:25:41 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-path: new package In-Reply-To: <20240111025127.2671669-1-james.hilliard1@gmail.com> References: <20240111025127.2671669-1-james.hilliard1@gmail.com> Message-ID: <55897da4-f07d-4456-b3e5-8f5210e4e5b4@mind.be> On 11/01/2024 03:51, James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/Config.in | 1 + > package/python-path/Config.in | 6 ++++++ > package/python-path/python-path.hash | 5 +++++ > package/python-path/python-path.mk | 15 +++++++++++++++ > 4 files changed, 27 insertions(+) > create mode 100644 package/python-path/Config.in > create mode 100644 package/python-path/python-path.hash > create mode 100644 package/python-path/python-path.mk > > diff --git a/package/Config.in b/package/Config.in > index 5b8b15fa54..5ef72e15e2 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1217,6 +1217,7 @@ menu "External python modules" > source "package/python-paramiko/Config.in" > source "package/python-parso/Config.in" > source "package/python-passlib/Config.in" > + source "package/python-path/Config.in" > source "package/python-pathpy/Config.in" > source "package/python-pathtools/Config.in" > source "package/python-pathvalidate/Config.in" > diff --git a/package/python-path/Config.in b/package/python-path/Config.in > new file mode 100644 > index 0000000000..df1eb81a59 > --- /dev/null > +++ b/package/python-path/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_PYTHON_PATH > + bool "python-path" > + help > + A module wrapper for os.path. > + > + https://github.com/jaraco/path This is actually python-pathpy, so why create a new package? Regards, Arnout > diff --git a/package/python-path/python-path.hash b/package/python-path/python-path.hash > new file mode 100644 > index 0000000000..73723302f3 > --- /dev/null > +++ b/package/python-path/python-path.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/path/json > +md5 e4fe8dac2ad5d6e7ea539bdb26d47329 path-16.9.0.tar.gz > +sha256 dfd31c2af60e8889a13538bef302ade7adacdb5351836be22638e2349ddd5d7b path-16.9.0.tar.gz > +# Locally computed sha256 checksums > +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE > diff --git a/package/python-path/python-path.mk b/package/python-path/python-path.mk > new file mode 100644 > index 0000000000..620fc88e53 > --- /dev/null > +++ b/package/python-path/python-path.mk > @@ -0,0 +1,15 @@ > +################################################################################ > +# > +# python-path > +# > +################################################################################ > + > +PYTHON_PATH_VERSION = 16.9.0 > +PYTHON_PATH_SOURCE = path-$(PYTHON_PATH_VERSION).tar.gz > +PYTHON_PATH_SITE = https://files.pythonhosted.org/packages/8d/50/2a1a3287715c87d135dd1dcbd9f7bca4200302cfcc8c28ced1a8035d7894 > +PYTHON_PATH_SETUP_TYPE = setuptools > +PYTHON_PATH_LICENSE = MIT > +PYTHON_PATH_LICENSE_FILES = LICENSE > +PYTHON_PATH_DEPENDENCIES = host-python-setuptools-scm > + > +$(eval $(python-package)) From peter at korsgaard.com Mon Feb 5 10:26:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:26:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/wolftpm: bump version to v3.1.0 In-Reply-To: <20240119165659.155158-1-dimi@tpm.dev> References: <20240119165659.155158-1-dimi@tpm.dev> Message-ID: On 19/01/2024 17.56, Dimi Tomov wrote: > From: Dimitar Tomov > > Signed-off-by: Dimitar Tomov > --- > package/wolftpm/wolftpm.hash | 2 +- > package/wolftpm/wolftpm.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/wolftpm/wolftpm.hash b/package/wolftpm/wolftpm.hash > index 3329528095..33d0aa2414 100644 > --- a/package/wolftpm/wolftpm.hash > +++ b/package/wolftpm/wolftpm.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 d8e06e77893f104be7eb9421cac50518552ad9c5fc7fe8a9c1cdfaf4f11b92df wolftpm-2.7.0.tar.gz > +sha256 b4f6c090cad7fdbd4fd976f1bd8f271694669459b240fa14bec60a89b749dc1b wolftpm-3.1.0.tar.gz > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE > diff --git a/package/wolftpm/wolftpm.mk b/package/wolftpm/wolftpm.mk > index db332712f5..4d1d459801 100644 > --- a/package/wolftpm/wolftpm.mk > +++ b/package/wolftpm/wolftpm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WOLFTPM_VERSION = 2.7.0 > +WOLFTPM_VERSION = 3.1.0 > WOLFTPM_SITE = $(call github,wolfSSL,wolfTPM,v$(WOLFTPM_VERSION)) > WOLFTPM_INSTALL_STAGING = YES > WOLFTPM_LICENSE = GPL-2.0+ Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 10:23:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:23:37 +0100 Subject: [Buildroot] [git commit] package/wolftpm: bump version to v3.1.0 Message-ID: <20240205102653.D8FE586A35@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4585259743e0ff3977c05c864dc752c040023738 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Dimitar Tomov Signed-off-by: Peter Korsgaard --- package/wolftpm/wolftpm.hash | 2 +- package/wolftpm/wolftpm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wolftpm/wolftpm.hash b/package/wolftpm/wolftpm.hash index 3329528095..33d0aa2414 100644 --- a/package/wolftpm/wolftpm.hash +++ b/package/wolftpm/wolftpm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d8e06e77893f104be7eb9421cac50518552ad9c5fc7fe8a9c1cdfaf4f11b92df wolftpm-2.7.0.tar.gz +sha256 b4f6c090cad7fdbd4fd976f1bd8f271694669459b240fa14bec60a89b749dc1b wolftpm-3.1.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/wolftpm/wolftpm.mk b/package/wolftpm/wolftpm.mk index db332712f5..4d1d459801 100644 --- a/package/wolftpm/wolftpm.mk +++ b/package/wolftpm/wolftpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -WOLFTPM_VERSION = 2.7.0 +WOLFTPM_VERSION = 3.1.0 WOLFTPM_SITE = $(call github,wolfSSL,wolfTPM,v$(WOLFTPM_VERSION)) WOLFTPM_INSTALL_STAGING = YES WOLFTPM_LICENSE = GPL-2.0+ From arnout at mind.be Mon Feb 5 10:31:10 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:31:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pytest: bump to version 7.4.4 In-Reply-To: <20240111031649.2684726-1-james.hilliard1@gmail.com> References: <20240111031649.2684726-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 04:16, James Hilliard wrote: > Drop no longer required python-py runtime dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Thank you Marcin for reviewing. Regards, Arnout > --- > package/python-pytest/Config.in | 1 - > package/python-pytest/python-pytest.hash | 4 ++-- > package/python-pytest/python-pytest.mk | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in > index c8f9a6eb5b..b42457e67d 100644 > --- a/package/python-pytest/Config.in > +++ b/package/python-pytest/Config.in > @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_PYTEST > select BR2_PACKAGE_PYTHON_INICONFIG # runtime > select BR2_PACKAGE_PYTHON_PACKAGING # runtime > select BR2_PACKAGE_PYTHON_PLUGGY # runtime > - select BR2_PACKAGE_PYTHON_PY # runtime > select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > help > diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash > index 7f79b94d8d..e710003535 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 8620558e8971b11207b2d6b083906cf9 pytest-7.4.2.tar.gz > -sha256 a766259cfab564a2ad52cb1aae1b881a75c3eb7e34ca3779697c23ed47c47069 pytest-7.4.2.tar.gz > +md5 e2ac4c70861f26d735b64e5687bb218e pytest-7.4.4.tar.gz > +sha256 2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280 pytest-7.4.4.tar.gz > # Locally computer sha256 > sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE > diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk > index 326d951a32..3170a1a9db 100644 > --- a/package/python-pytest/python-pytest.mk > +++ b/package/python-pytest/python-pytest.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYTEST_VERSION = 7.4.2 > +PYTHON_PYTEST_VERSION = 7.4.4 > PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz > -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/e5/d0/18209bb95db8ee693a9a04fe056ab0663c6d6b1baf67dd50819dd9cd4bd7 > +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/80/1f/9d8e98e4133ffb16c90f3b405c43e38d3abb715bb5d7a63a5a684f7e46a3 > PYTHON_PYTEST_SETUP_TYPE = setuptools > PYTHON_PYTEST_LICENSE = MIT > PYTHON_PYTEST_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:31:01 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:31:01 +0100 Subject: [Buildroot] [git commit] package/python-pytest: bump to version 7.4.4 Message-ID: <20240205103117.DF6B386A88@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0149b50166e11d90c90f603dc488c2b964c019a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required python-py runtime dependency. Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-pytest/Config.in | 1 - package/python-pytest/python-pytest.hash | 4 ++-- package/python-pytest/python-pytest.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-pytest/Config.in b/package/python-pytest/Config.in index c8f9a6eb5b..b42457e67d 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PYTHON_PYTEST select BR2_PACKAGE_PYTHON_INICONFIG # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PLUGGY # runtime - select BR2_PACKAGE_PYTHON_PY # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime help diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash index 7f79b94d8d..e710003535 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 8620558e8971b11207b2d6b083906cf9 pytest-7.4.2.tar.gz -sha256 a766259cfab564a2ad52cb1aae1b881a75c3eb7e34ca3779697c23ed47c47069 pytest-7.4.2.tar.gz +md5 e2ac4c70861f26d735b64e5687bb218e pytest-7.4.4.tar.gz +sha256 2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280 pytest-7.4.4.tar.gz # Locally computer sha256 sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk index 326d951a32..3170a1a9db 100644 --- a/package/python-pytest/python-pytest.mk +++ b/package/python-pytest/python-pytest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_VERSION = 7.4.2 +PYTHON_PYTEST_VERSION = 7.4.4 PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/e5/d0/18209bb95db8ee693a9a04fe056ab0663c6d6b1baf67dd50819dd9cd4bd7 +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/80/1f/9d8e98e4133ffb16c90f3b405c43e38d3abb715bb5d7a63a5a684f7e46a3 PYTHON_PYTEST_SETUP_TYPE = setuptools PYTHON_PYTEST_LICENSE = MIT PYTHON_PYTEST_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:30:59 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:30:59 +0100 Subject: [Buildroot] [git commit] package/python-pytest-asyncio: bump to version 0.23.3 Message-ID: <20240205103117.D430C86A81@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4a7afebe03803484261a82b5ca3fa59813e9b324 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new host-python-setuptools-scm build dependency. Signed-off-by: James Hilliard Reviewed-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle --- package/python-pytest-asyncio/python-pytest-asyncio.hash | 4 ++-- package/python-pytest-asyncio/python-pytest-asyncio.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index f6cc1d2413..29a38c7dc7 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json -md5 1d10f607444a375c1425a2a90960006e pytest-asyncio-0.21.1.tar.gz -sha256 40a7eae6dded22c7b604986855ea48400ab15b069ae38116e8c01238e9eeb64d pytest-asyncio-0.21.1.tar.gz +md5 0c81f6de855e546180de424c0db05c20 pytest-asyncio-0.23.3.tar.gz +sha256 af313ce900a62fbe2b1aed18e37ad757f1ef9940c6b6a88e2954de38d6b1fb9f pytest-asyncio-0.23.3.tar.gz # Locally computed sha256 checksums sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index 5c5efd819c..8464c70f5f 100644 --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PYTEST_ASYNCIO_VERSION = 0.21.1 +PYTHON_PYTEST_ASYNCIO_VERSION = 0.23.3 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/5a/85/d39ef5f69d5597a206f213ce387bcdfa47922423875829f7a98a87d33281 +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/1d/27/f036ec4bcbfd056c54572d7169ba3dbb54e7181f02f21caadd3aecb9cf5b PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE +PYTHON_PYTEST_ASYNCIO_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From arnout at mind.be Mon Feb 5 10:31:20 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:31:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pytest-asyncio: bump to version 0.23.3 In-Reply-To: <20240111030356.2678848-1-james.hilliard1@gmail.com> References: <20240111030356.2678848-1-james.hilliard1@gmail.com> Message-ID: <8a7596c5-c74a-477c-994a-30f2f779a0f6@mind.be> On 11/01/2024 04:03, James Hilliard wrote: > Add new host-python-setuptools-scm build dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Thank you Marcin for reviewing. Regards, Arnout > --- > package/python-pytest-asyncio/python-pytest-asyncio.hash | 4 ++-- > package/python-pytest-asyncio/python-pytest-asyncio.mk | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash > index f6cc1d2413..29a38c7dc7 100644 > --- a/package/python-pytest-asyncio/python-pytest-asyncio.hash > +++ b/package/python-pytest-asyncio/python-pytest-asyncio.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pytest-asyncio/json > -md5 1d10f607444a375c1425a2a90960006e pytest-asyncio-0.21.1.tar.gz > -sha256 40a7eae6dded22c7b604986855ea48400ab15b069ae38116e8c01238e9eeb64d pytest-asyncio-0.21.1.tar.gz > +md5 0c81f6de855e546180de424c0db05c20 pytest-asyncio-0.23.3.tar.gz > +sha256 af313ce900a62fbe2b1aed18e37ad757f1ef9940c6b6a88e2954de38d6b1fb9f pytest-asyncio-0.23.3.tar.gz > # Locally computed sha256 checksums > sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE > diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk > index 5c5efd819c..8464c70f5f 100644 > --- a/package/python-pytest-asyncio/python-pytest-asyncio.mk > +++ b/package/python-pytest-asyncio/python-pytest-asyncio.mk > @@ -4,11 +4,12 @@ > # > ################################################################################ > > -PYTHON_PYTEST_ASYNCIO_VERSION = 0.21.1 > +PYTHON_PYTEST_ASYNCIO_VERSION = 0.23.3 > PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz > -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/5a/85/d39ef5f69d5597a206f213ce387bcdfa47922423875829f7a98a87d33281 > +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/1d/27/f036ec4bcbfd056c54572d7169ba3dbb54e7181f02f21caadd3aecb9cf5b > PYTHON_PYTEST_ASYNCIO_SETUP_TYPE = setuptools > PYTHON_PYTEST_ASYNCIO_LICENSE = Apache-2.0 > PYTHON_PYTEST_ASYNCIO_LICENSE_FILES = LICENSE > +PYTHON_PYTEST_ASYNCIO_DEPENDENCIES = host-python-setuptools-scm > > $(eval $(python-package)) From bubu at git.sr.ht Mon Feb 5 10:32:15 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 10:32:15 -0000 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package Message-ID: <170712853287.18164.6368517214119629150-0@git.sr.ht> From: Marcus Hoffmann Calling `setup.py` build builds and installs an empty package after upstream changed their packaging. Calling setuptools via `python -m build` builds the package correctly. --- package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk index 5a6e7733be..cb8a0d8cc9 100644 --- a/package/python-minimalmodbus/python-minimalmodbus.mk +++ b/package/python-minimalmodbus/python-minimalmodbus.mk @@ -7,7 +7,8 @@ PYTHON_MINIMALMODBUS_VERSION = 2.1.1 PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE -- 2.38.5 From peter at korsgaard.com Mon Feb 5 10:32:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:32:12 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add strace runtime test In-Reply-To: <20240118211148.70993-1-ju.o@free.fr> References: <20240118211148.70993-1-ju.o@free.fr> Message-ID: <74a89cd6-f4b6-4661-b744-cf6eebc566d7@korsgaard.com> On 18/01/2024 22.11, Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit b200632 with commands: > > make check-package > ... > 0 warnings generated > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_strace > ... > OK Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 5 10:32:33 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:32:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pythran: bump to version 0.15.0 In-Reply-To: <20240111040835.2702608-1-james.hilliard1@gmail.com> References: <20240111040835.2702608-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 05:08, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pythran/python-pythran.hash | 4 ++-- > package/python-pythran/python-pythran.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pythran/python-pythran.hash b/package/python-pythran/python-pythran.hash > index 2dfc445b2f..a46825c933 100644 > --- a/package/python-pythran/python-pythran.hash > +++ b/package/python-pythran/python-pythran.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/pythran/json > -md5 3090288af50566af75cb058d1878aaad pythran-0.13.1.tar.gz > -sha256 8aad08162f010e5425a7b254dd68d83311b430bb29f9252dce2eff3ba39497dd pythran-0.13.1.tar.gz > +md5 cc6fa05e583733182d06d2e41e03cc10 pythran-0.15.0.tar.gz > +sha256 f9bc61bcb96df2cd4b578abc5a62dfb3fbb0b0ef02c264513dfb615c5f87871c pythran-0.15.0.tar.gz > # Locally computed sha256 checksums > sha256 0be9f14c66a9a3cb66d5263a6495437862ce0c9cdf60d4a6c36d1e51b1244c6e LICENSE > sha256 e1c0ed0a99e4462016d79d835f1f479b78c4d4a07fe66598e97f449503ffd178 docs/LICENSE.rst > diff --git a/package/python-pythran/python-pythran.mk b/package/python-pythran/python-pythran.mk > index 25735ad95a..43853a514d 100644 > --- a/package/python-pythran/python-pythran.mk > +++ b/package/python-pythran/python-pythran.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYTHRAN_VERSION = 0.13.1 > +PYTHON_PYTHRAN_VERSION = 0.15.0 > PYTHON_PYTHRAN_SOURCE = pythran-$(PYTHON_PYTHRAN_VERSION).tar.gz > -PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/8d/d8/b27e8dc3f3a03dcd317d40d9df0ae07ebbd85444585973ceba07716934d0 > +PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/82/31/cc6fd7a2b91efc6cdb03e7c42df895b4a65a8f049b074579d45d1def746f > PYTHON_PYTHRAN_SETUP_TYPE = setuptools > PYTHON_PYTHRAN_LICENSE = BSD-3-Clause > PYTHON_PYTHRAN_LICENSE_FILES = LICENSE docs/LICENSE.rst From peter at korsgaard.com Mon Feb 5 10:31:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:31:27 +0100 Subject: [Buildroot] [git commit] support/testing: add strace runtime test Message-ID: <20240205103244.2E20E86A8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=988a2115c2fe65c8a2f5cfa049aa8f4e38c149dc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_strace.py | 37 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 02b7516a92..8d280eff47 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1818,6 +1818,7 @@ F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py +F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ diff --git a/support/testing/tests/package/test_strace.py b/support/testing/tests/package/test_strace.py new file mode 100644 index 0000000000..c1cba2173f --- /dev/null +++ b/support/testing/tests/package/test_strace.py @@ -0,0 +1,37 @@ +import os + +import infra.basetest + + +class TestStrace(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_STRACE=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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("strace --version") + + test_file = "buildroot-strace-test.txt" + test_file_mode = "0600" + strace_log = "strace.log" + + # Create a test file. + self.assertRunOk(f"touch {test_file}") + + # Run strace on a chmod + cmd = f"strace -o {strace_log} chmod {test_file_mode} {test_file}" + self.assertRunOk(cmd) + + # Check the strace log contain a call to chmod() + expected_str = f"chmod(\"{test_file}\", {test_file_mode}) = 0" + self.assertRunOk(f"grep -F '{expected_str}' {strace_log}") From arnout at mind.be Mon Feb 5 10:33:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:33:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pytz: bump to version 2023.3.post1 In-Reply-To: <20240111041150.2704233-1-james.hilliard1@gmail.com> References: <20240111041150.2704233-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 05:11, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pytz/python-pytz.hash | 4 ++-- > package/python-pytz/python-pytz.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash > index 861f9d6f35..be6f0e976b 100644 > --- a/package/python-pytz/python-pytz.hash > +++ b/package/python-pytz/python-pytz.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pytz/json > -md5 fe54c8f8a1544b4e78b523b264ab071b pytz-2023.3.tar.gz > -sha256 1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588 pytz-2023.3.tar.gz > +md5 84e6569fcc917b096cca1063819c4ab0 pytz-2023.3.post1.tar.gz > +sha256 7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b pytz-2023.3.post1.tar.gz > # Locally computed sha256 checksums > sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt > diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk > index 4754efe41a..182d8156fc 100644 > --- a/package/python-pytz/python-pytz.mk > +++ b/package/python-pytz/python-pytz.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYTZ_VERSION = 2023.3 > +PYTHON_PYTZ_VERSION = 2023.3.post1 > PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz > -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/5e/32/12032aa8c673ee16707a9b6cdda2b09c0089131f35af55d443b6a9c69c1d > +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/69/4f/7bf883f12ad496ecc9514cd9e267b29a68b3e9629661a2bbc24f80eff168 > PYTHON_PYTZ_SETUP_TYPE = setuptools > PYTHON_PYTZ_LICENSE = MIT > PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From giulio.benetti at benettiengineering.com Mon Feb 5 10:33:26 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 11:33:26 +0100 Subject: [Buildroot] [PATCH v3 3/3] board/d-link/dns320l: new board In-Reply-To: <20231006140511.3840643-4-enki@fsck.pl> References: <20231004131256.2113233-2-enki@fsck.pl> <20231006140511.3840643-4-enki@fsck.pl> Message-ID: <4551a4fa-db14-41dd-8bc0-c384d552e3c5@benettiengineering.com> Hi Maciej, sorry for the late reply, On 06/10/23 16:05, Maciej Grela wrote: > Add support for the D-Link DNS-320L using: > > - U-Boot 1.1.4 (in device flash) > - Linux kernel 6.5.5 > > This is a 2-Bay 3.5'' SATA NAS with the following specs: > > - Marvell 88F6702 (1 GHz) CPU > - 256 MiB DDR2 RAM > - 128 MiB NAND Flash > - 2 x SATA > - 1 x 1000 Mbit/s Ethernet port > - 1 x USB 2.0 > > The builtin bootloader banner is: > U-Boot 1.1.4 (Aug 22 2012 - 17:06:54) Marvell version: 3.6.0.DNS-320L.01 > > Manufacturer product page: http://sharecenter.dlink.com/products/DNS-320 > Device wiki: https://wikidevi.wi-cat.ru/D-Link_DNS-320L_rev_A1 > > Signed-off-by: Maciej Grela > --- > DEVELOPERS | 6 + > board/d-link/dns320l/dts/kirkwood-dns320l.dts | 218 ++++++++++++++++++ > configs/dns320l_defconfig | 16 ++ > 3 files changed, 240 insertions(+) > create mode 100644 board/d-link/dns320l/dts/kirkwood-dns320l.dts > create mode 100644 configs/dns320l_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index c45e7315da..76e8644073 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1950,6 +1950,12 @@ N: Ludwig Kormann > F: board/in-circuit/ > F: configs/icnova* > > +N: Maciej Grela > +F: board/d-link/dns320l/ > +F: configs/dns320l_defconfig > +F: package/dns320l-daemon > +F: package/iniparser The 2 lines above should be part of the respective patches and not of this one, > + > N: Maeva Manuel > F: board/freescale/imx8qmmek/ > F: configs/freescale_imx8qmmek_defconfig > diff --git a/board/d-link/dns320l/dts/kirkwood-dns320l.dts b/board/d-link/dns320l/dts/kirkwood-dns320l.dts > new file mode 100644 > index 0000000000..660508a51a > --- /dev/null > +++ b/board/d-link/dns320l/dts/kirkwood-dns320l.dts > @@ -0,0 +1,218 @@ > +/dts-v1/; > + > +/* > + * Device Tree file for DLINK DNS-320L > + * > + * Copyright (C) 2015, Sunke Schl?ters > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version > + * 2 of the License, or (at your option) any later version. > + * > + * > + * This file is based on the work of Andreas B?hler : > + * - http://www.aboehler.at/doku/doku.php/projects:dns320l > + * - http://www.aboehler.at/hg/linux-dns320l/file/ba7a60ad7687/linux-3.12/kirkwood-dns320l.dts > + */ > + > +#include "marvell/kirkwood.dtsi" > +#include "marvell/kirkwood-6281.dtsi" > + > +/ { > + model = "D-Link DNS-320L"; > + compatible = "dlink,dns-320l", "marvell,kirkwood-88f6702", "marvell,kirkwood"; > + > + memory { > + device_type = "memory"; > + reg = <0x00000000 0x10000000>; > + }; > + > + chosen { > + bootargs = "console=ttyS0,115200n8 earlyprintk"; > + stdout-path = &uart0; > + }; > + > + gpio-keys { > + compatible = "gpio-keys"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>; > + pinctrl-names = "default"; > + > + button at 1 { > + label = "Reset push button"; > + linux,code = ; > + gpios = <&gpio0 28 1>; > + }; > + button at 2 { > + label = "USB unmount button"; > + linux,code = ; > + gpios = <&gpio0 27 1>; > + }; > + }; > + > + gpio-leds { > + compatible = "gpio-leds"; > + pinctrl-0 = <&pmx_led_usb_blue &pmx_led_red_right_hdd > + &pmx_led_red_left_hdd &pmx_led_usb_orange>; > + pinctrl-names = "default"; > + > + blue-usb { > + label = "usb_blue"; > + gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; > + }; > + orange-usb { > + label = "usb_orange"; > + gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; > + }; > + orange-l_hdd { > + label = "hdd1_orange"; > + gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; > + }; > + orange-r_hdd { > + label = "hdd2_orange"; > + gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; > + }; > + }; > + > + ocp at f1000000 { > + pinctrl: pin-controller at 10000 { > + > + pinctrl-0 = <&pmx_button_power>; > + pinctrl-names = "default"; > + > + pmx_sata0: pmx-sata0 { > + marvell,pins = "mpp20"; > + marvell,function = "sata0"; > + }; > + pmx_sata1: pmx-sata1 { > + marvell,pins = "mpp21"; > + marvell,function = "sata1"; > + }; > + pmx_led_red_right_hdd: pmx-led-red-right-hdd { > + marvell,pins = "mpp22"; > + marvell,function = "gpio"; > + }; > + pmx_led_red_left_hdd: pmx-led-red-left-hdd { > + marvell,pins = "mpp23"; > + marvell,function = "gpio"; > + }; > + pmx_power_sata: pmx-power-sata { > + marvell,pins = "mpp24"; > + marvell,function = "gpio"; > + }; > + pmx_led_usb_blue: pmx-led-usb-blue { > + marvell,pins = "mpp25"; > + marvell,function = "gpio"; > + }; > + pmx_led_usb_orange: pmx-led-usb-orange { > + marvell,pins = "mpp26"; > + marvell,function = "gpio"; > + }; > + pmx_button_usb_copy: pmx-button-usb-copy { > + marvell,pins = "mpp27"; > + marvell,function = "gpio"; > + }; > + pmx_button_reset: pmx-button-reset { > + marvell,pins = "mpp28"; > + marvell,function = "gpio"; > + }; > + pmx_button_power: pmx-button-power { // I can't get this one to trigger a button press... > + marvell,pins = "mpp29"; > + marvell,function = "gpio"; > + }; > + }; > + sata at 80000 { > + status = "okay"; > + nr-ports = <2>; > + }; > + serial at 12000 { > + status = "okay"; > + }; > + > + serial at 12100 { > + pinctrl-0 = <&pmx_uart1>; > + pinctrl-names = "default"; > + status = "okay"; > + }; > + }; > + > + regulators { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-0 = <&pmx_power_sata>; > + pinctrl-names = "default"; > + > + sata_power: regulator at 1 { > + compatible = "regulator-fixed"; > + reg = <1>; > + regulator-name = "SATA Power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + gpio = <&gpio1 24 0>; > + }; > + }; > +}; > + > +&nand { > + pinctrl-0 = <&pmx_nand>; > + pinctrl-names = "default"; > + status = "okay"; > + chip-delay = <35>; > + > + partition at 0 { > + label = "u-boot"; > + reg = <0x0000000 0x100000>; > + read-only; > + }; > + > + partition at 100000 { > + label = "uImage"; > + reg = <0x0100000 0x500000>; > + }; > + > + partition at 600000 { > + label = "ramdisk"; > + reg = <0x0600000 0x500000>; > + }; > + > + partition at b00000 { > + label = "image"; > + reg = <0x0b00000 0x6400000>; > + }; > + > + partition at 6f00000 { > + label = "mini firmware"; > + reg = <0x6f00000 0xa00000>; > + }; > + > + partition at 7900000 { > + label = "config"; > + reg = <0x7900000 0x500000>; > + }; > + > + partition at 7e00000 { > + label = "my-dlink"; > + reg = <0x7e00000 0x200000>; > + }; > +}; > + > +&mdio { > + status = "okay"; > + > + ethphy0: ethernet-phy at 0 { > + reg = <0>; > + }; > +}; > + > +ð0 { > + status = "okay"; > + ethernet0-port at 0 { > + phy-handle = <ðphy0>; > + }; > +}; Is this ^^^ dts pending upstream? > diff --git a/configs/dns320l_defconfig b/configs/dns320l_defconfig > new file mode 100644 > index 0000000000..f281984267 > --- /dev/null > +++ b/configs/dns320l_defconfig > @@ -0,0 +1,16 @@ > +BR2_arm=y Here you haven't specified any particular Arm architecture but MV78260 is specified as a: " ARMv7-compliant CPU cores with the latest Marvell micro-architecture enhancements, with a double precision IEEE-compliant Floating Point Unit (FPU) per core " Maybe you could give a try to enable VFP3-16 since the SoC supports it: https://datasheet.datasheetarchive.com/originals/crawler/marvell.com/1657ba38481c63b54928f3c1d60858fd.pdf Here instead you need: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y because if not set if changes while Buildroot increase Latest Linux Version resulting in build failure: " Incorrect selection of kernel headers: expected 6.6.x, got 6.5.x " > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_SYSTEM_DHCP="eth0" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.5" > +BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" > +BR2_LINUX_KERNEL_APPENDED_UIMAGE=y > +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" > +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/d-link/dns320l/dts/kirkwood-dns320l.dts" > +BR2_TARGET_ROOTFS_CPIO=y > +BR2_TARGET_ROOTFS_CPIO_GZIP=y > +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y > + > +# The package is required for proper power management > +BR2_PACKAGE_DNS320L_DAEMON=y I've built tested successfully with utils/docker-run so with the changes above: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Mon Feb 5 10:34:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:34:11 +0100 Subject: [Buildroot] [git commit] support/testing: add tcpdump runtime test Message-ID: <20240205103443.E4AA186A99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=035b4ee8a9ccacfa20c483595acaa65a1af4ad8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_tcpdump.py | 46 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8d280eff47..a03018ab2b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1822,6 +1822,7 @@ F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ +F: support/testing/tests/package/test_tcpdump.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_tcpdump.py b/support/testing/tests/package/test_tcpdump.py new file mode 100644 index 0000000000..42bfc96082 --- /dev/null +++ b/support/testing/tests/package/test_tcpdump.py @@ -0,0 +1,46 @@ +import os +import time + +import infra.basetest + + +class TestTcpdump(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_TCPDUMP=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]) + self.emulator.login() + + capture_file = "capture.pcap" + decode_log = "decode.log" + + # Check the program can execute. + self.assertRunOk("tcpdump --version") + + # Run ping in background. + cmd = "ping localhost >/dev/null &" + self.assertRunOk(cmd) + + time.sleep(1) + + # Capture 3 packets with the message. + cmd = f"tcpdump -c 3 -w {capture_file} icmp" + self.assertRunOk(cmd) + + # Decode the capture file. + cmd = f"tcpdump -r {capture_file} > {decode_log}" + self.assertRunOk(cmd) + + # Check we have ICMP echo requests/replies in the + # decoded capture. + cmd = f"grep -E 'ICMP echo (request|reply)' {decode_log}" + self.assertRunOk(cmd) From peter at korsgaard.com Mon Feb 5 10:35:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:35:12 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add tcpdump runtime test In-Reply-To: <20240118214938.160908-1-ju.o@free.fr> References: <20240118214938.160908-1-ju.o@free.fr> Message-ID: <147a1c36-4289-452a-bc78-a9e2a476a38f@korsgaard.com> On 18/01/2024 22.49, Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit b200632 with commands: > > make check-package > ... > 0 warnings generated > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_tcpdump > ... > OK Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 5 10:36:30 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:36:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyudev: bump to version 0.24.1 In-Reply-To: <20240111041757.2707481-1-james.hilliard1@gmail.com> References: <20240111041757.2707481-1-james.hilliard1@gmail.com> Message-ID: <354c59e5-1320-476d-a18a-5f8ca6991d74@mind.be> On 11/01/2024 05:17, James Hilliard wrote: > Drop no longer required python-six runtime dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyudev/Config.in | 1 - > package/python-pyudev/python-pyudev.hash | 4 ++-- > package/python-pyudev/python-pyudev.mk | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in > index e0da067cc2..aa98c2cc61 100644 > --- a/package/python-pyudev/Config.in > +++ b/package/python-pyudev/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PYUDEV > bool "python-pyudev" > depends on BR2_PACKAGE_HAS_UDEV > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > help > pyudev is a LGPL licenced, pure Python 2/3 binding to > libudev, the device and hardware management and information > diff --git a/package/python-pyudev/python-pyudev.hash b/package/python-pyudev/python-pyudev.hash > index 014bf20933..72eb323e1f 100644 > --- a/package/python-pyudev/python-pyudev.hash > +++ b/package/python-pyudev/python-pyudev.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyudev/json > -md5 17c0a41f0e4dfc016350806a0a60f630 pyudev-0.24.0.tar.gz > -sha256 b2a3afe1c99ea751f8296652557eac559874da2a1b1ec0625178706ec5a345f3 pyudev-0.24.0.tar.gz > +md5 fecaabe9eaa890d2173c7b49ab63a412 pyudev-0.24.1.tar.gz > +sha256 75e54d37218f5ac45b0da1f0fd9cc5e526a3cac3ef1cfad410cf7ab338b01471 pyudev-0.24.1.tar.gz > # Locally computed sha256 checksums > sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING > diff --git a/package/python-pyudev/python-pyudev.mk b/package/python-pyudev/python-pyudev.mk > index 5d48cd4f7c..53d60572a8 100644 > --- a/package/python-pyudev/python-pyudev.mk > +++ b/package/python-pyudev/python-pyudev.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYUDEV_VERSION = 0.24.0 > +PYTHON_PYUDEV_VERSION = 0.24.1 > PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz > -PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/00/8d/810750cb2fc64d7e0dbefc106a9137b157616a95be3f0ea51ca3cf6c762a > +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/20/b6/16961ac3575575260c72928f17df9c99c2a696871e486965ec6e2fa2aff4 > PYTHON_PYUDEV_LICENSE = LGPL-2.1+ > PYTHON_PYUDEV_LICENSE_FILES = COPYING > PYTHON_PYUDEV_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Mon Feb 5 10:37:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:37:01 +0100 Subject: [Buildroot] [git commit] package/esp-hosted: bump version to 2024-01-30 Message-ID: <20240205103709.96BE186ABF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40e36cadf7e17a33408c35f078824109b34f7677 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master * support Linux 6.8 * support ESP32 and ESP32C6 Targets Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/esp-hosted/Config.in | 14 ++++++++++++++ package/esp-hosted/esp-hosted.hash | 2 +- package/esp-hosted/esp-hosted.mk | 8 +++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/package/esp-hosted/Config.in b/package/esp-hosted/Config.in index 42e1afa8c5..5abab73b57 100644 --- a/package/esp-hosted/Config.in +++ b/package/esp-hosted/Config.in @@ -28,4 +28,18 @@ config BR2_PACKAGE_ESP_HOSTED_SPI endchoice +choice + prompt "Target" + default BR2_PACKAGE_ESP_HOSTED_TARGET_ESP32 + help + Select which SoC Target driver is used for + +config BR2_PACKAGE_ESP_HOSTED_TARGET_ESP32 + bool "ESP32" + +config BR2_PACKAGE_ESP_HOSTED_TARGET_ESP32C6 + bool "ESP32C6" + +endchoice + endif diff --git a/package/esp-hosted/esp-hosted.hash b/package/esp-hosted/esp-hosted.hash index b129bb42f9..ff0839076e 100644 --- a/package/esp-hosted/esp-hosted.hash +++ b/package/esp-hosted/esp-hosted.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6e023c26355643f2aaf6d79d5910f64c49ea638063235d519075629643518a71 esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404.tar.gz +sha256 1c4df08132d5204a01adc2797e8f6f6d7ff945609b288cfe2dc2ea50789e8af4 esp-hosted-6a25417fc880fd744b3b0d93c11659c3e7d86384.tar.gz sha256 ed57d96d27be775b22f9571d3724ef84e0d0b8f24b805ec7f87a32189de19a9c LICENSE diff --git a/package/esp-hosted/esp-hosted.mk b/package/esp-hosted/esp-hosted.mk index 578108c91d..cc61e39b36 100644 --- a/package/esp-hosted/esp-hosted.mk +++ b/package/esp-hosted/esp-hosted.mk @@ -4,7 +4,7 @@ # ################################################################################ -ESP_HOSTED_VERSION = ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404 +ESP_HOSTED_VERSION = 6a25417fc880fd744b3b0d93c11659c3e7d86384 ESP_HOSTED_SITE = $(call github,espressif,esp-hosted,$(ESP_HOSTED_VERSION)) ESP_HOSTED_DEPENDENCIES = linux ESP_HOSTED_LICENSE = GPL-2.0 @@ -28,5 +28,11 @@ else ESP_HOSTED_MODULE_MAKE_OPTS = target=sdio endif +ifeq ($(BR2_PACKAGE_ESP_HOSTED_TARGET_ESP32),y) +ESP_HOSTED_MODULE_MAKE_OPTS += ESP_SLAVE=CONFIG_TARGET_ESP32=y +else +ESP_HOSTED_MODULE_MAKE_OPTS += ESP_SLAVE=CONFIG_TARGET_ESP32C6=y +endif + $(eval $(kernel-module)) $(eval $(generic-package)) From thomas.petazzoni at bootlin.com Mon Feb 5 10:37:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:37:36 +0100 Subject: [Buildroot] [PATCH v2] package/esp-hosted: bump version to 2024-01-30 In-Reply-To: <20240130110504.559989-1-giulio.benetti@benettiengineering.com> References: <20240130110504.559989-1-giulio.benetti@benettiengineering.com> Message-ID: <20240205113736.249927a6@windsurf> On Tue, 30 Jan 2024 12:05:04 +0100 Giulio Benetti wrote: > * support Linux 6.8 > * support ESP32 and ESP32C6 Targets > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * drop local patches since they have been upstreamed > * update commit log since Linux 6.8 is supported > --- > package/esp-hosted/Config.in | 14 ++++++++++++++ > package/esp-hosted/esp-hosted.hash | 2 +- > package/esp-hosted/esp-hosted.mk | 8 +++++++- > 3 files changed, 22 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 10:37:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 11:37:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/rdma-core: fix mips4 build In-Reply-To: <20240122212121.7805-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 22 Jan 2024 22:21:21 +0100") References: <20240122212121.7805-1-fontaine.fabrice@gmail.com> Message-ID: <871q9rw60v.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > The 'sync' instruction for MIPS was defined in MIPS-II as taking no > operands. MIPS32 extended the define of 'sync' as taking an optional > unsigned 5 bit immediate. > As a result, replace "sync 0" by "sync" to fix the following build > failure on mips4 raised since the addition of the package in commit > ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 and > https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: > /tmp/ccrBy9fV.s: Assembler messages: > /tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' > Fixes: > - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 > - http://autobuild.buildroot.org/results/2df58f9b98aacf00960932f53510b29199393461 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 5 10:38:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:38:10 +0100 Subject: [Buildroot] [git commit] configs/icnova-a20-adb4006: bump Linux and U-Boot version Message-ID: <20240205103820.2C96586ACD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c39bf6823ae947b215ac870d2b5f54b7e7b65073 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump version of Linux to 6.6.14 and U-Boot to 2024.01 and also use upstream configs and dts. Signed-off-by: Ludwig Kormann Signed-off-by: Thomas Petazzoni --- .../sun7i-a20-icnova-a20-adb4006.dts | 137 --------------------- .../sun7i-a20-icnova-a20-adb4006_uboot_defconfig | 20 --- .../icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi | 62 ---------- configs/icnova-a20-adb4006_defconfig | 14 +-- 4 files changed, 6 insertions(+), 227 deletions(-) diff --git a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts b/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts deleted file mode 100644 index 577ead1d02..0000000000 --- a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts +++ /dev/null @@ -1,137 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -// Copyright (C) 2023 In-Circuit GmbH - -/dts-v1/; - -#include "sun7i-a20-icnova-a20.dtsi" - -#include -#include - -/ { - model = "In-Circuit ICnova A20 ADB4006"; - compatible = "incircuit,icnova-a20-adb4006", "incircuit,icnova-a20", - "allwinner,sun7i-a20"; - - aliases { - serial0 = &uart0; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - hdmi-connector { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi_con_in: endpoint { - remote-endpoint = <&hdmi_out_con>; - }; - }; - }; - - leds { - compatible = "gpio-leds"; - - led-0 { - function = LED_FUNCTION_POWER; - color = ; - gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; /* PH21 */ - default-state = "on"; - }; - - led-1 { - function = LED_FUNCTION_HEARTBEAT; - color = ; - gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; /* PH20 */ - linux,default-trigger = "heartbeat"; - }; - }; -}; - -&ahci { - target-supply = <®_ahci_5v>; - status = "okay"; -}; - -&codec { - status = "okay"; -}; - -&de { - status = "okay"; -}; - -&ehci0 { - status = "okay"; -}; - -&ehci1 { - status = "okay"; -}; - -&hdmi { - status = "okay"; -}; - -&hdmi_out { - hdmi_out_con: endpoint { - remote-endpoint = <&hdmi_con_in>; - }; -}; - -&mmc0 { - vmmc-supply = <®_vcc3v3>; - bus-width = <4>; - cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ - status = "okay"; -}; - -&ohci0 { - status = "okay"; -}; - -&ohci1 { - status = "okay"; -}; - -&otg_sram { - status = "okay"; -}; - -®_ahci_5v { - status = "okay"; -}; - -&ac_power_supply { - status = "okay"; -}; - -®_usb1_vbus { - status = "okay"; -}; - -®_usb2_vbus { - status = "okay"; -}; - -&uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pb_pins>; - status = "okay"; -}; - -&usb_otg { - dr_mode = "otg"; - status = "okay"; -}; - -&usbphy { - usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ - usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ - usb1_vbus-supply = <®_usb1_vbus>; - usb2_vbus-supply = <®_usb2_vbus>; - status = "okay"; -}; diff --git a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006_uboot_defconfig b/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006_uboot_defconfig deleted file mode 100644 index f70ffe45ab..0000000000 --- a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006_uboot_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_SUNXI=y -CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-a20-adb4006" -CONFIG_SPL=y -CONFIG_MACH_SUN7I=y -CONFIG_DRAM_CLK=384 -CONFIG_AHCI=y -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SPL_I2C=y -CONFIG_SCSI_AHCI=y -CONFIG_SYS_I2C_MVTWSI=y -CONFIG_SYS_I2C_SLAVE=0x7f -CONFIG_SYS_I2C_SPEED=400000 -CONFIG_ETH_DESIGNWARE=y -CONFIG_MII=y -CONFIG_SUN7I_GMAC=y -CONFIG_AXP_ALDO4_VOLT=2800 -CONFIG_SCSI=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_OHCI_HCD=y diff --git a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi b/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi deleted file mode 100644 index 46616c6bc8..0000000000 --- a/board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi +++ /dev/null @@ -1,62 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -// Copyright (C) 2023 In-Circuit GmbH - -#include "sun7i-a20.dtsi" -#include "sunxi-common-regulators.dtsi" - -#include - -&cpu0 { - cpu-supply = <®_dcdc2>; -}; - -&gmac { - pinctrl-names = "default"; - pinctrl-0 = <&gmac_mii_pins>; - phy-handle = <&phy1>; - phy-mode = "mii"; - status = "okay"; -}; - -&i2c0 { - status = "okay"; - - axp209: pmic at 34 { - reg = <0x34>; - interrupt-parent = <&nmi_intc>; - interrupts = <0 IRQ_TYPE_LEVEL_LOW>; - }; -}; - -&gmac_mdio { - phy1: ethernet-phy at 1 { - reg = <1>; - }; -}; - -#include "axp209.dtsi" - -®_dcdc2 { - regulator-always-on; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1400000>; - regulator-name = "vdd-cpu"; -}; - -®_dcdc3 { - regulator-always-on; - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1400000>; - regulator-name = "vdd-int-dll"; -}; - -®_ldo1 { - regulator-name = "vdd-rtc"; -}; - -®_ldo2 { - regulator-always-on; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - regulator-name = "avcc"; -}; diff --git a/configs/icnova-a20-adb4006_defconfig b/configs/icnova-a20-adb4006_defconfig index d572bbd0b5..ba529c8db5 100644 --- a/configs/icnova-a20-adb4006_defconfig +++ b/configs/icnova-a20-adb4006_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 6.1 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System BR2_TARGET_GENERIC_HOSTNAME="ICnova A20 ADB4006" @@ -20,11 +20,11 @@ BR2_PACKAGE_HOST_MTOOLS=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.35" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/in-circuit/icnova-a20-adb4006/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-icnova-a20-adb4006" BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem @@ -36,15 +36,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="128M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" -BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006_uboot_defconfig" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="icnova-a20-adb4006" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/in-circuit/icnova-a20-adb4006/boot.cmd" From peter at korsgaard.com Mon Feb 5 10:37:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:37:38 +0100 Subject: [Buildroot] [git commit] package/rdma-core: fix mips4 build Message-ID: <20240205103820.2231B86ACC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7e5a90f1b75e59aa5707394f3c707fbbf03204b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The 'sync' instruction for MIPS was defined in MIPS-II as taking no operands. MIPS32 extended the define of 'sync' as taking an optional unsigned 5 bit immediate. As a result, replace "sync 0" by "sync" to fix the following build failure on mips4 raised since the addition of the package in commit ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 and https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: /tmp/ccrBy9fV.s: Assembler messages: /tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' Fixes: - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 - http://autobuild.buildroot.org/results/2df58f9b98aacf00960932f53510b29199393461 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../0001-util-udma_barrier.h-fix-mips4-build.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch new file mode 100644 index 0000000000..6dfb476faa --- /dev/null +++ b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch @@ -0,0 +1,56 @@ +From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jan 2024 18:55:34 +0100 +Subject: [PATCH] util/udma_barrier.h: fix mips4 build + +The 'sync' instruction for MIPS was defined in MIPS-II as taking no +operands. MIPS32 extended the define of 'sync' as taking an optional +unsigned 5 bit immediate. + +As a result, replace "sync 0" by "sync" to fix the following build +failure on mips4 raised since version 43.0 and +https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: + +/tmp/ccrBy9fV.s: Assembler messages: +/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' + +Fixes: + - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 +--- + util/udma_barrier.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/util/udma_barrier.h b/util/udma_barrier.h +index 0a1f8a45b..3793d2f18 100644 +--- a/util/udma_barrier.h ++++ b/util/udma_barrier.h +@@ -101,7 +101,7 @@ + #elif defined(__riscv) + #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") + #elif defined(__mips__) +-#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_to_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -139,7 +139,7 @@ + #elif defined(__riscv) + #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") + #elif defined(__mips__) +-#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_from_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -212,7 +212,7 @@ + #include "s390_mmio_insn.h" + #define mmio_flush_writes() s390_pciwb() + #elif defined(__mips__) +-#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") ++#define mmio_flush_writes() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif From thomas.petazzoni at bootlin.com Mon Feb 5 10:38:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:38:22 +0100 Subject: [Buildroot] [PATCH 1/1] configs/icnova-a20-adb4006: Bump Linux and U-Boot version In-Reply-To: <20240130131750.3802767-1-ludwig.kormann@ict42.de> References: <20240130131750.3802767-1-ludwig.kormann@ict42.de> Message-ID: <20240205113822.3e017b35@windsurf> On Tue, 30 Jan 2024 14:17:50 +0100 Ludwig Kormann wrote: > Bump version of Linux to 6.6.14 and U-Boot to 2024.01 > and also use upstream configs and dts. > > Signed-off-by: Ludwig Kormann > --- > .../sun7i-a20-icnova-a20-adb4006.dts | 137 ------------------ > ...n7i-a20-icnova-a20-adb4006_uboot_defconfig | 20 --- > .../sun7i-a20-icnova-a20.dtsi | 62 -------- > configs/icnova-a20-adb4006_defconfig | 14 +- > 4 files changed, 6 insertions(+), 227 deletions(-) > delete mode 100644 board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006.dts > delete mode 100644 board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20-adb4006_uboot_defconfig > delete mode 100644 board/in-circuit/icnova-a20-adb4006/sun7i-a20-icnova-a20.dtsi Applied to master, thanks for your contribution! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Mon Feb 5 10:39:06 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:39:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyzmq: bump to version 25.1.2 In-Reply-To: <20240111043052.2880841-1-james.hilliard1@gmail.com> References: <20240111043052.2880841-1-james.hilliard1@gmail.com> Message-ID: <1be43d03-99b9-47ff-b63b-b418c9cf5981@mind.be> On 11/01/2024 05:30, James Hilliard wrote: > License hashes/names changed due to rename/reformat: > https://github.com/zeromq/pyzmq/pull/1837 > > Add new host-python-setuptools-scm build dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyzmq/python-pyzmq.hash | 8 ++++---- > package/python-pyzmq/python-pyzmq.mk | 11 +++++++---- > 2 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash > index efbc91d83c..3c91d25995 100644 > --- a/package/python-pyzmq/python-pyzmq.hash > +++ b/package/python-pyzmq/python-pyzmq.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/pyzmq/json > -md5 f10b7c3dee2c03557e2c5d00b73dfc7f pyzmq-24.0.1.tar.gz > -sha256 216f5d7dbb67166759e59b0479bca82b8acf9bed6015b526b8eb10143fb08e77 pyzmq-24.0.1.tar.gz > +md5 280afc0992b0a9f109dafc1e672d2f26 pyzmq-25.1.2.tar.gz > +sha256 93f1aa311e8bb912e34f004cf186407a4e90eec4f0ecc0efd26056bf7eda0226 pyzmq-25.1.2.tar.gz > # Locally computed sha256 checksums > -sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD > -sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER > +sha256 c0cf5f5c03f8d6772f7a271df1cb671054578bd3d79527c72fc1f28f8cc72a7a LICENSE.BSD > +sha256 5f1dac83d6c25674004810ec9e54b304ccbb8303ac5961813b09235966abfd48 LICENSE.LESSER > diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk > index 5792957eaf..1d9a7d01cb 100644 > --- a/package/python-pyzmq/python-pyzmq.mk > +++ b/package/python-pyzmq/python-pyzmq.mk > @@ -4,15 +4,18 @@ > # > ################################################################################ > > -PYTHON_PYZMQ_VERSION = 24.0.1 > +PYTHON_PYZMQ_VERSION = 25.1.2 > PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz > -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/46/0d/b06cf99a64d4187632f4ac9ddf6be99cd35de06fe72d75140496a8e0eef5 > +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/3a/33/1a3683fc9a4bd64d8ccc0290da75c8f042184a1a49c146d28398414d3341 > PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 > # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 > -PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD > -PYTHON_PYZMQ_DEPENDENCIES = host-python-packaging zeromq > +PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD > PYTHON_PYZMQ_SETUP_TYPE = setuptools > PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr > +PYTHON_PYZMQ_DEPENDENCIES = \ > + host-python-packaging \ > + host-python-setuptools-scm \ > + zeromq > > # Due to issues with cross-compiling, hardcode to the zeromq in BR > define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION From arnout at mind.be Mon Feb 5 10:39:11 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:39:11 +0100 Subject: [Buildroot] [git commit] package/python-pytz: bump to version 2023.3.post1 Message-ID: <20240205103946.DE2D286AF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=db3aa2d36ded61436674e6e248f9988e1e59a750 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pytz/python-pytz.hash | 4 ++-- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index 861f9d6f35..be6f0e976b 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 fe54c8f8a1544b4e78b523b264ab071b pytz-2023.3.tar.gz -sha256 1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588 pytz-2023.3.tar.gz +md5 84e6569fcc917b096cca1063819c4ab0 pytz-2023.3.post1.tar.gz +sha256 7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b pytz-2023.3.post1.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 4754efe41a..182d8156fc 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2023.3 +PYTHON_PYTZ_VERSION = 2023.3.post1 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/5e/32/12032aa8c673ee16707a9b6cdda2b09c0089131f35af55d443b6a9c69c1d +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/69/4f/7bf883f12ad496ecc9514cd9e267b29a68b3e9629661a2bbc24f80eff168 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt From arnout at mind.be Mon Feb 5 10:39:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:39:13 +0100 Subject: [Buildroot] [git commit] package/python-pyudev: bump to version 0.24.1 Message-ID: <20240205103946.EC31C86B02@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8129c3c2c5985d2e4eeae6cb05948601d0b59772 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required python-six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyudev/Config.in | 1 - package/python-pyudev/python-pyudev.hash | 4 ++-- package/python-pyudev/python-pyudev.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in index e0da067cc2..aa98c2cc61 100644 --- a/package/python-pyudev/Config.in +++ b/package/python-pyudev/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PYUDEV bool "python-pyudev" depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_PYTHON3_ZLIB # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help pyudev is a LGPL licenced, pure Python 2/3 binding to libudev, the device and hardware management and information diff --git a/package/python-pyudev/python-pyudev.hash b/package/python-pyudev/python-pyudev.hash index 014bf20933..72eb323e1f 100644 --- a/package/python-pyudev/python-pyudev.hash +++ b/package/python-pyudev/python-pyudev.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyudev/json -md5 17c0a41f0e4dfc016350806a0a60f630 pyudev-0.24.0.tar.gz -sha256 b2a3afe1c99ea751f8296652557eac559874da2a1b1ec0625178706ec5a345f3 pyudev-0.24.0.tar.gz +md5 fecaabe9eaa890d2173c7b49ab63a412 pyudev-0.24.1.tar.gz +sha256 75e54d37218f5ac45b0da1f0fd9cc5e526a3cac3ef1cfad410cf7ab338b01471 pyudev-0.24.1.tar.gz # Locally computed sha256 checksums sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/python-pyudev/python-pyudev.mk b/package/python-pyudev/python-pyudev.mk index 5d48cd4f7c..53d60572a8 100644 --- a/package/python-pyudev/python-pyudev.mk +++ b/package/python-pyudev/python-pyudev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUDEV_VERSION = 0.24.0 +PYTHON_PYUDEV_VERSION = 0.24.1 PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz -PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/00/8d/810750cb2fc64d7e0dbefc106a9137b157616a95be3f0ea51ca3cf6c762a +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/20/b6/16961ac3575575260c72928f17df9c99c2a696871e486965ec6e2fa2aff4 PYTHON_PYUDEV_LICENSE = LGPL-2.1+ PYTHON_PYUDEV_LICENSE_FILES = COPYING PYTHON_PYUDEV_SETUP_TYPE = setuptools From arnout at mind.be Mon Feb 5 10:39:14 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:39:14 +0100 Subject: [Buildroot] [git commit] package/python-pyzmq: bump to version 25.1.2 Message-ID: <20240205103947.093F686AF7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67b1eb8a6de5378b041cff9a0289a42a6760cbca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hashes/names changed due to rename/reformat: https://github.com/zeromq/pyzmq/pull/1837 Add new host-python-setuptools-scm build dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pyzmq/python-pyzmq.hash | 8 ++++---- package/python-pyzmq/python-pyzmq.mk | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash index efbc91d83c..3c91d25995 100644 --- a/package/python-pyzmq/python-pyzmq.hash +++ b/package/python-pyzmq/python-pyzmq.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pyzmq/json -md5 f10b7c3dee2c03557e2c5d00b73dfc7f pyzmq-24.0.1.tar.gz -sha256 216f5d7dbb67166759e59b0479bca82b8acf9bed6015b526b8eb10143fb08e77 pyzmq-24.0.1.tar.gz +md5 280afc0992b0a9f109dafc1e672d2f26 pyzmq-25.1.2.tar.gz +sha256 93f1aa311e8bb912e34f004cf186407a4e90eec4f0ecc0efd26056bf7eda0226 pyzmq-25.1.2.tar.gz # Locally computed sha256 checksums -sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD -sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER +sha256 c0cf5f5c03f8d6772f7a271df1cb671054578bd3d79527c72fc1f28f8cc72a7a LICENSE.BSD +sha256 5f1dac83d6c25674004810ec9e54b304ccbb8303ac5961813b09235966abfd48 LICENSE.LESSER diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index 5792957eaf..1d9a7d01cb 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -4,15 +4,18 @@ # ################################################################################ -PYTHON_PYZMQ_VERSION = 24.0.1 +PYTHON_PYZMQ_VERSION = 25.1.2 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/46/0d/b06cf99a64d4187632f4ac9ddf6be99cd35de06fe72d75140496a8e0eef5 +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/3a/33/1a3683fc9a4bd64d8ccc0290da75c8f042184a1a49c146d28398414d3341 PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 -PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD -PYTHON_PYZMQ_DEPENDENCIES = host-python-packaging zeromq +PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD PYTHON_PYZMQ_SETUP_TYPE = setuptools PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr +PYTHON_PYZMQ_DEPENDENCIES = \ + host-python-packaging \ + host-python-setuptools-scm \ + zeromq # Due to issues with cross-compiling, hardcode to the zeromq in BR define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION From arnout at mind.be Mon Feb 5 10:39:10 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:39:10 +0100 Subject: [Buildroot] [git commit] package/python-pythran: bump to version 0.15.0 Message-ID: <20240205103946.D229F86AF7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4265ac62b84091c231f318fb950800926036426f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-pythran/python-pythran.hash | 4 ++-- package/python-pythran/python-pythran.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pythran/python-pythran.hash b/package/python-pythran/python-pythran.hash index 2dfc445b2f..a46825c933 100644 --- a/package/python-pythran/python-pythran.hash +++ b/package/python-pythran/python-pythran.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pythran/json -md5 3090288af50566af75cb058d1878aaad pythran-0.13.1.tar.gz -sha256 8aad08162f010e5425a7b254dd68d83311b430bb29f9252dce2eff3ba39497dd pythran-0.13.1.tar.gz +md5 cc6fa05e583733182d06d2e41e03cc10 pythran-0.15.0.tar.gz +sha256 f9bc61bcb96df2cd4b578abc5a62dfb3fbb0b0ef02c264513dfb615c5f87871c pythran-0.15.0.tar.gz # Locally computed sha256 checksums sha256 0be9f14c66a9a3cb66d5263a6495437862ce0c9cdf60d4a6c36d1e51b1244c6e LICENSE sha256 e1c0ed0a99e4462016d79d835f1f479b78c4d4a07fe66598e97f449503ffd178 docs/LICENSE.rst diff --git a/package/python-pythran/python-pythran.mk b/package/python-pythran/python-pythran.mk index 25735ad95a..43853a514d 100644 --- a/package/python-pythran/python-pythran.mk +++ b/package/python-pythran/python-pythran.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTHRAN_VERSION = 0.13.1 +PYTHON_PYTHRAN_VERSION = 0.15.0 PYTHON_PYTHRAN_SOURCE = pythran-$(PYTHON_PYTHRAN_VERSION).tar.gz -PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/8d/d8/b27e8dc3f3a03dcd317d40d9df0ae07ebbd85444585973ceba07716934d0 +PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/82/31/cc6fd7a2b91efc6cdb03e7c42df895b4a65a8f049b074579d45d1def746f PYTHON_PYTHRAN_SETUP_TYPE = setuptools PYTHON_PYTHRAN_LICENSE = BSD-3-Clause PYTHON_PYTHRAN_LICENSE_FILES = LICENSE docs/LICENSE.rst From peter at korsgaard.com Mon Feb 5 10:42:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:42:01 +0100 Subject: [Buildroot] [PATCH v2] package/ruby: bump to 3.3.0 In-Reply-To: References: Message-ID: <84311d05-8dd7-4d0b-85d4-2a5a947ef2ee@korsgaard.com> On 27/01/2024 03.20, Waldemar Brodkorb wrote: > See here for changes: > https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ > > Patch applied upstream. > > License file LEGAL changed. > [ext/psych/yaml] got removed. > [lib/bundler/vendor/molinillo] got removed. > [lib/bundler/vendor/pub_grub] added with MIT License. > > Signed-off-by: Waldemar Brodkorb Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 10:42:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:42:16 +0100 Subject: [Buildroot] [git commit] package/ruby: bump to 3.3.0 Message-ID: <20240205104226.834CD86B0B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a01c278df7892c8a6736334aa008b2d7c09e9258 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See here for changes: https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ Patch applied upstream. License file LEGAL changed. [ext/psych/yaml] got removed. [lib/bundler/vendor/molinillo] got removed. [lib/bundler/vendor/pub_grub] added with MIT License. Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../ruby/0001-Fix-build-with-LibreSSL-3-5.patch | 25 ---------------------- package/ruby/ruby.hash | 6 +++--- package/ruby/ruby.mk | 6 +++--- 4 files changed, 6 insertions(+), 32 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index bcb6aff6ce..095fa5b283 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1182,7 +1182,6 @@ package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch Upstream package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch Upstream package/rubix/0001-dont-use-legacy-functions.patch Upstream package/rubix/0002-misc-fixes.patch Sob Upstream -package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch Upstream package/rygel/0001-build-Add-man_pages-build-options.patch Upstream package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch Upstream package/rygel/S99rygel Indent Shellcheck Variables diff --git a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch b/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch deleted file mode 100644 index 805dfd2f89..0000000000 --- a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d Mon Sep 17 00:00:00 2001 -From: Jeremy Evans -Date: Fri, 25 Mar 2022 13:11:31 -0700 -Subject: [PATCH] Fix build with LibreSSL 3.5 - -[Retrieved from: -https://github.com/ruby/openssl/commit/e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d] -Signed-off-by: Fabrice Fontaine ---- - ext/openssl/ossl_pkey.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c -index 2a4835a2..24d0da46 100644 ---- a/ext/openssl/ossl_pkey.c -+++ b/ext/openssl/ossl_pkey.c -@@ -710,7 +710,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der) - } - } - else { --#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) -+#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0) - if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0, - ossl_pem_passwd_cb, - (void *)pass)) { diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 42d8a2497f..c729c59453 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,7 +1,7 @@ -# https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/ -sha512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69 ruby-3.1.3.tar.xz +# https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ +sha512 7959c5753bfa0bfc4d6d74060869aabbe9815c1c97930659da11b917ee0803ddbbd80e869e00c48b8694b4ba48709c3b6493fd045568e36e902616c35ababf01 ruby-3.3.0.tar.xz # License files, Locally calculated -sha256 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc LEGAL +sha256 e849b28d324423e636a3e6bc5d583cdaf4bd046c2b20872c53886b612d01a4a1 LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING sha256 36a9a6e7347214bbba599a412617204e65bff065dcbe5c46f5cb454c80de9eb0 BSDL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 28b1ec13ef..b2396010c5 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -4,9 +4,9 @@ # ################################################################################ -RUBY_VERSION_MAJOR = 3.1 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 -RUBY_VERSION_EXT = 3.1.0 +RUBY_VERSION_MAJOR = 3.3 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 +RUBY_VERSION_EXT = 3.3.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From peter at korsgaard.com Mon Feb 5 10:46:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:46:22 +0100 Subject: [Buildroot] [PATCH v1] package/nghttp2: bump version to 1.58.0 In-Reply-To: <20240117211424.22038-1-ps.report@gmx.net> References: <20240117211424.22038-1-ps.report@gmx.net> Message-ID: <08873d3f-1b71-4a37-8477-e1346111156c@korsgaard.com> On 17/01/2024 22.14, Peter Seiderer via buildroot wrote: > For details see [1]. > > [1] https://github.com/nghttp2/nghttp2/releases/tag/v1.58.0 > > Signed-off-by: Peter Seiderer Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 10:45:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 11:45:03 +0100 Subject: [Buildroot] [git commit] package/nghttp2: bump version to 1.58.0 Message-ID: <20240205104644.2E1EA86B12@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f08fa1bd2fe1af13cca867cd522c4f23be0d770f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details see [1]. [1] https://github.com/nghttp2/nghttp2/releases/tag/v1.58.0 Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard --- package/nghttp2/nghttp2.hash | 2 +- package/nghttp2/nghttp2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nghttp2/nghttp2.hash b/package/nghttp2/nghttp2.hash index 18774d01d4..dddf6fe1bd 100644 --- a/package/nghttp2/nghttp2.hash +++ b/package/nghttp2/nghttp2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9210b0113109f43be526ac5835d58a701411821a4d39e155c40d67c40f47a958 nghttp2-1.57.0.tar.xz +sha256 4a68a3040da92fd9872c056d0f6b0cd60de8410de10b578f8ade9ecc14d297e0 nghttp2-1.58.0.tar.xz sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING diff --git a/package/nghttp2/nghttp2.mk b/package/nghttp2/nghttp2.mk index 70a25d409c..7a05e38fa9 100644 --- a/package/nghttp2/nghttp2.mk +++ b/package/nghttp2/nghttp2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGHTTP2_VERSION = 1.57.0 +NGHTTP2_VERSION = 1.58.0 NGHTTP2_SOURCE = nghttp2-$(NGHTTP2_VERSION).tar.xz NGHTTP2_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(NGHTTP2_VERSION) NGHTTP2_LICENSE = MIT From arnout at mind.be Mon Feb 5 10:48:17 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:48:17 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-pypng: new package In-Reply-To: <20240111044530.2889558-1-james.hilliard1@gmail.com> References: <20240111044530.2889558-1-james.hilliard1@gmail.com> Message-ID: <2b4b608b-1525-42ef-961f-a73354327ff8@mind.be> On 11/01/2024 05:45, James Hilliard wrote: > Signed-off-by: James Hilliard Applied both to master, thanks. Regards, Arnout > --- > package/Config.in | 1 + > package/python-pypng/Config.in | 6 ++++++ > package/python-pypng/python-pypng.hash | 5 +++++ > package/python-pypng/python-pypng.mk | 14 ++++++++++++++ > 4 files changed, 26 insertions(+) > create mode 100644 package/python-pypng/Config.in > create mode 100644 package/python-pypng/python-pypng.hash > create mode 100644 package/python-pypng/python-pypng.mk > > diff --git a/package/Config.in b/package/Config.in > index 5b8b15fa54..1375d28116 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1276,6 +1276,7 @@ menu "External python modules" > source "package/python-pyparsing/Config.in" > source "package/python-pyparted/Config.in" > source "package/python-pyphen/Config.in" > + source "package/python-pypng/Config.in" > source "package/python-pyqrcode/Config.in" > source "package/python-pyqt5/Config.in" > source "package/python-pyratemp/Config.in" > diff --git a/package/python-pypng/Config.in b/package/python-pypng/Config.in > new file mode 100644 > index 0000000000..c1ed405615 > --- /dev/null > +++ b/package/python-pypng/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_PYTHON_PYPNG > + bool "python-pypng" > + help > + Pure Python library for saving and loading PNG images. > + > + https://gitlab.com/drj11/pypng > diff --git a/package/python-pypng/python-pypng.hash b/package/python-pypng/python-pypng.hash > new file mode 100644 > index 0000000000..0f55eef702 > --- /dev/null > +++ b/package/python-pypng/python-pypng.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/pypng/json > +md5 7d9cce86ceb19524784ade86fb13a063 pypng-0.20220715.0.tar.gz > +sha256 739c433ba96f078315de54c0db975aee537cbc3e1d0ae4ed9aab0ca1e427e2c1 pypng-0.20220715.0.tar.gz > +# Locally computed sha256 checksums > +sha256 8dd127d87bb901ab9c8f584e98b7c7aa8539db27fe62ff01b1ee4be93b6a513a LICENCE > diff --git a/package/python-pypng/python-pypng.mk b/package/python-pypng/python-pypng.mk > new file mode 100644 > index 0000000000..07ad16b67b > --- /dev/null > +++ b/package/python-pypng/python-pypng.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-pypng > +# > +################################################################################ > + > +PYTHON_PYPNG_VERSION = 0.20220715.0 > +PYTHON_PYPNG_SOURCE = pypng-$(PYTHON_PYPNG_VERSION).tar.gz > +PYTHON_PYPNG_SITE = https://files.pythonhosted.org/packages/93/cd/112f092ec27cca83e0516de0a3368dbd9128c187fb6b52aaaa7cde39c96d > +PYTHON_PYPNG_SETUP_TYPE = setuptools > +PYTHON_PYPNG_LICENSE = MIT > +PYTHON_PYPNG_LICENSE_FILES = LICENCE > + > +$(eval $(python-package)) From arnout at mind.be Mon Feb 5 10:49:16 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:49:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-redis: bump to version 5.0.1 In-Reply-To: <20240111045405.2894223-1-james.hilliard1@gmail.com> References: <20240111045405.2894223-1-james.hilliard1@gmail.com> Message-ID: <3f39f2e2-e773-408f-8dfc-0877e6a9b115@mind.be> On 11/01/2024 05:54, James Hilliard wrote: > License hash changed due to year update: > https://github.com/redis/redis-py/commit/28cc65c18cc4fb37ef14497c963eb181dba8d25d > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-redis/Config.in | 4 ++-- > package/python-redis/python-redis.hash | 6 +++--- > package/python-redis/python-redis.mk | 4 ++-- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/package/python-redis/Config.in b/package/python-redis/Config.in > index 4143e1f1c1..e22959cf7b 100644 > --- a/package/python-redis/Config.in > +++ b/package/python-redis/Config.in > @@ -1,6 +1,6 @@ > config BR2_PACKAGE_PYTHON_REDIS > bool "python-redis" > help > - Python client for Redis key-value store. > + Python client for Redis database and key-value store. > > - https://github.com/andymccurdy/redis-py > + https://github.com/redis/redis-py > diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash > index e27f87bd50..2d9df87a10 100644 > --- a/package/python-redis/python-redis.hash > +++ b/package/python-redis/python-redis.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/redis/json > -md5 ad365234df634680d15294ddc87c42de redis-4.5.5.tar.gz > -sha256 dc87a0bdef6c8bfe1ef1e1c40be7034390c2ae02d92dcd0c7ca1729443899880 redis-4.5.5.tar.gz > +md5 f4bff9e3819ec832bb789b8b58363d6b redis-5.0.1.tar.gz > +sha256 0dab495cd5753069d3bc650a0dde8a8f9edde16fc5691b689a566eda58100d0f redis-5.0.1.tar.gz > # Locally computed sha256 checksums > -sha256 7801a39e3a1aec58a7ea7c9f4dc1238cf0922c36a1fc8eff0bb7d684ff6dd354 LICENSE > +sha256 a57b250a5bf03d7afe55b74063313f2adb7b00d546c0ab149a89398333fe3cc8 LICENSE > diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk > index 186702dc83..067a754352 100644 > --- a/package/python-redis/python-redis.mk > +++ b/package/python-redis/python-redis.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_REDIS_VERSION = 4.5.5 > +PYTHON_REDIS_VERSION = 5.0.1 > PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz > -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/53/30/128c5599bc3fa61488866be0228326b3e486be34480126f70e572043adf8 > +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/4a/4c/3c3b766f4ecbb3f0bec91ef342ee98d179e040c25b6ecc99e510c2570f2a > PYTHON_REDIS_SETUP_TYPE = setuptools > PYTHON_REDIS_LICENSE = MIT > PYTHON_REDIS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:50:25 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:50:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-reedsolo: bump to version 1.7.0 In-Reply-To: <20240111050053.2897660-1-james.hilliard1@gmail.com> References: <20240111050053.2897660-1-james.hilliard1@gmail.com> Message-ID: <08b99de6-e8ec-4692-a7f9-f0b4ce986cf7@mind.be> On 11/01/2024 06:00, James Hilliard wrote: > License changed to Unlicense/MIT-0: > https://github.com/tomerfiliba-org/reedsolomon/commit/7b97461684701cf19451db1fd348d831dc526dc2 > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-reedsolo/python-reedsolo.hash | 6 +++--- > package/python-reedsolo/python-reedsolo.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-reedsolo/python-reedsolo.hash b/package/python-reedsolo/python-reedsolo.hash > index fdafc89f49..c1729f0aeb 100644 > --- a/package/python-reedsolo/python-reedsolo.hash > +++ b/package/python-reedsolo/python-reedsolo.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/reedsolo/json > -md5 b67a04027a1825c63a63b6793ec660a3 reedsolo-1.6.0.tar.gz > -sha256 4e290d3b0a7207ac7aac186790766c752b5fcdf5e0b04dfd260349579052bbac reedsolo-1.6.0.tar.gz > +md5 5bbd7741f915ad67b6d425f93ab9d103 reedsolo-1.7.0.tar.gz > +sha256 c1359f02742751afe0f1c0de9f0772cc113835aa2855d2db420ea24393c87732 reedsolo-1.7.0.tar.gz > # Locally computed sha256 checksums > -sha256 0babd7b573efc3dcf5bb3c28b583150726f775d3dd8d54d6cd062834735b3d73 LICENSE > +sha256 2da9536c23b72bac15603bb1f8dbf269dc68ecfbc35a75f8d0aa9cb209ba0934 LICENSE > diff --git a/package/python-reedsolo/python-reedsolo.mk b/package/python-reedsolo/python-reedsolo.mk > index 2a7fd42a05..66e85fb40a 100644 > --- a/package/python-reedsolo/python-reedsolo.mk > +++ b/package/python-reedsolo/python-reedsolo.mk > @@ -4,11 +4,11 @@ > # > ################################################################################ > > -PYTHON_REEDSOLO_VERSION = 1.6.0 > +PYTHON_REEDSOLO_VERSION = 1.7.0 > PYTHON_REEDSOLO_SOURCE = reedsolo-$(PYTHON_REEDSOLO_VERSION).tar.gz > -PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/9b/10/28d1492cc82a103bc06f18cb9a9dbb3a9168ab2e4068801fa0aa0c76b231 > +PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/f7/61/a67338cbecf370d464e71b10e9a31355f909d6937c3a8d6b17dd5d5beb5e > PYTHON_REEDSOLO_SETUP_TYPE = setuptools > -PYTHON_REEDSOLO_LICENSE = Public Domain > +PYTHON_REEDSOLO_LICENSE = MIT-0, Unlicense > PYTHON_REEDSOLO_LICENSE_FILES = LICENSE > > $(eval $(python-package)) From arnout at mind.be Mon Feb 5 10:51:02 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:51:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-referencing: bump to version 0.32.1 In-Reply-To: <20240111050439.2900236-1-james.hilliard1@gmail.com> References: <20240111050439.2900236-1-james.hilliard1@gmail.com> Message-ID: <99937e20-13a9-449c-9b57-ecaf061f5feb@mind.be> On 11/01/2024 06:04, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-referencing/python-referencing.hash | 4 ++-- > package/python-referencing/python-referencing.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-referencing/python-referencing.hash b/package/python-referencing/python-referencing.hash > index d4f3dce5a4..2880a47477 100644 > --- a/package/python-referencing/python-referencing.hash > +++ b/package/python-referencing/python-referencing.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/referencing/json > -md5 617d973b9ce86b6f74b2216c6f3af5c9 referencing-0.30.2.tar.gz > -sha256 794ad8003c65938edcdbc027f1933215e0d0ccc0291e3ce20a4d87432b59efc0 referencing-0.30.2.tar.gz > +md5 d1a0a4ae03ebba4b86b22bfb825f150b referencing-0.32.1.tar.gz > +sha256 3c57da0513e9563eb7e203ebe9bb3a1b509b042016433bd1e45a2853466c3dd3 referencing-0.32.1.tar.gz > # Locally computed sha256 checksums > sha256 42dcd63495f87b4eb7c7757afa379bb55a53f94afd7a5f657d9adf57236e515c COPYING > diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk > index 4d11c99deb..27d1452e91 100644 > --- a/package/python-referencing/python-referencing.mk > +++ b/package/python-referencing/python-referencing.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_REFERENCING_VERSION = 0.30.2 > +PYTHON_REFERENCING_VERSION = 0.32.1 > PYTHON_REFERENCING_SOURCE = referencing-$(PYTHON_REFERENCING_VERSION).tar.gz > -PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/e1/43/d3f6cf3e1ec9003520c5fb31dc363ee488c517f09402abd2a1c90df63bbb > +PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/81/ce/910573eca7b1a1c6358b0dc0774ce1eeb81f4c98d4ee371f1c85f22040a1 > PYTHON_REFERENCING_SETUP_TYPE = pep517 > PYTHON_REFERENCING_LICENSE = MIT > PYTHON_REFERENCING_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 5 10:51:42 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:51:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-regex: bump to version 2023.12.25 In-Reply-To: <20240111050729.2902435-1-james.hilliard1@gmail.com> References: <20240111050729.2902435-1-james.hilliard1@gmail.com> Message-ID: <69cfc932-d7dc-4ee8-ab41-609e0900db99@mind.be> On 11/01/2024 06:07, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-regex/Config.in | 2 +- > package/python-regex/python-regex.hash | 4 ++-- > package/python-regex/python-regex.mk | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-regex/Config.in b/package/python-regex/Config.in > index 5f582d085a..89ead69c04 100644 > --- a/package/python-regex/Config.in > +++ b/package/python-regex/Config.in > @@ -3,4 +3,4 @@ config BR2_PACKAGE_PYTHON_REGEX > help > Alternative regular expression module, to replace re. > > - https://bitbucket.org/mrabarnett/mrab-regex > + https://github.com/mrabarnett/mrab-regex > diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash > index 11a5765e41..7454db99bb 100644 > --- a/package/python-regex/python-regex.hash > +++ b/package/python-regex/python-regex.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/regex/json > -md5 a85ced10be8bfe76fed4f30c42d32d5c regex-2022.10.31.tar.gz > -sha256 a3a98921da9a1bf8457aeee6a551948a83601689e5ecdd736894ea9bbec77e83 regex-2022.10.31.tar.gz > +md5 3f97f0aef9bf334fe50ae5980b183e68 regex-2023.12.25.tar.gz > +sha256 29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5 regex-2023.12.25.tar.gz > # Locally computed sha256 checksums > sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt > diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk > index 81bd460ecc..6b1938bc0c 100644 > --- a/package/python-regex/python-regex.mk > +++ b/package/python-regex/python-regex.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_REGEX_VERSION = 2022.10.31 > +PYTHON_REGEX_VERSION = 2023.12.25 > PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz > -PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/27/b5/92d404279fd5f4f0a17235211bb0f5ae7a0d9afb7f439086ec247441ed28 > +PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/b5/39/31626e7e75b187fae7f121af3c538a991e725c744ac893cc2cfd70ce2853 > PYTHON_REGEX_SETUP_TYPE = setuptools > PYTHON_REGEX_LICENSE = Apache-2.0 > PYTHON_REGEX_LICENSE_FILES = LICENSE.txt From arnout at mind.be Mon Feb 5 10:53:20 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:53:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-requests-toolbelt: bump to version 1.0.0 In-Reply-To: <20240111051107.2905870-1-james.hilliard1@gmail.com> References: <20240111051107.2905870-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 06:11, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-requests-toolbelt/Config.in | 2 +- > .../python-requests-toolbelt/python-requests-toolbelt.hash | 4 ++-- > package/python-requests-toolbelt/python-requests-toolbelt.mk | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in > index ba2b95152e..7d5b4b65c2 100644 > --- a/package/python-requests-toolbelt/Config.in > +++ b/package/python-requests-toolbelt/Config.in > @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT > help > A utility belt for advanced users of python-requests. > > - https://toolbelt.readthedocs.org > + https://toolbelt.readthedocs.io/ > diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.hash b/package/python-requests-toolbelt/python-requests-toolbelt.hash > index 28abf2c628..12bc58131d 100644 > --- a/package/python-requests-toolbelt/python-requests-toolbelt.hash > +++ b/package/python-requests-toolbelt/python-requests-toolbelt.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/requests-toolbelt/json > -md5 636d226d03632d013269aebbc85f4f4b requests-toolbelt-0.10.1.tar.gz > -sha256 62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d requests-toolbelt-0.10.1.tar.gz > +md5 6a8348cfc9991b44e499345db1c6f925 requests-toolbelt-1.0.0.tar.gz > +sha256 7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6 requests-toolbelt-1.0.0.tar.gz > # Locally computed sha256 checksums > sha256 1f8cf8bdacd98ed6d36d0fec0c07f7765acebd6e81205962ab5146023b3c858d LICENSE > diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.mk b/package/python-requests-toolbelt/python-requests-toolbelt.mk > index 8c141e3aa9..d0bcb1bb21 100644 > --- a/package/python-requests-toolbelt/python-requests-toolbelt.mk > +++ b/package/python-requests-toolbelt/python-requests-toolbelt.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_REQUESTS_TOOLBELT_VERSION = 0.10.1 > +PYTHON_REQUESTS_TOOLBELT_VERSION = 1.0.0 > PYTHON_REQUESTS_TOOLBELT_SOURCE = requests-toolbelt-$(PYTHON_REQUESTS_TOOLBELT_VERSION).tar.gz > -PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/0c/4c/07f01c6ac44f7784fa399137fbc8d0cdc1b5d35304e8c0f278ad82105b58 > +PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/f3/61/d7545dafb7ac2230c70d38d31cbfe4cc64f7144dc41f6e4e4b78ecd9f5bb > PYTHON_REQUESTS_TOOLBELT_SETUP_TYPE = setuptools > PYTHON_REQUESTS_TOOLBELT_LICENSE = Apache-2.0 > PYTHON_REQUESTS_TOOLBELT_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:53:42 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:53:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: <20240111051726.2918732-1-james.hilliard1@gmail.com> References: <20240111051726.2918732-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 06:17, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-rpds-py/python-rpds-py.hash | 2 +- > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > index b04aa210d3..8c4b6181d0 100644 > --- a/package/python-rpds-py/python-rpds-py.hash > +++ b/package/python-rpds-py/python-rpds-py.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz > # Locally computed sha256 checksums > sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE > diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk > index 6f71d02047..5f0d30d002 100644 > --- a/package/python-rpds-py/python-rpds-py.mk > +++ b/package/python-rpds-py/python-rpds-py.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > +PYTHON_RPDS_PY_VERSION = 0.16.2 > PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz > -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 > +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 > PYTHON_RPDS_PY_SETUP_TYPE = maturin > PYTHON_RPDS_PY_LICENSE = MIT > PYTHON_RPDS_PY_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 10:55:58 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:55:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyzmq: bump to version 25.1.2 In-Reply-To: <20240111043052.2880841-1-james.hilliard1@gmail.com> References: <20240111043052.2880841-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 05:30, James Hilliard wrote: > License hashes/names changed due to rename/reformat: > https://github.com/zeromq/pyzmq/pull/1837 > > Add new host-python-setuptools-scm build dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyzmq/python-pyzmq.hash | 8 ++++---- > package/python-pyzmq/python-pyzmq.mk | 11 +++++++---- > 2 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash > index efbc91d83c..3c91d25995 100644 > --- a/package/python-pyzmq/python-pyzmq.hash > +++ b/package/python-pyzmq/python-pyzmq.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/pyzmq/json > -md5 f10b7c3dee2c03557e2c5d00b73dfc7f pyzmq-24.0.1.tar.gz > -sha256 216f5d7dbb67166759e59b0479bca82b8acf9bed6015b526b8eb10143fb08e77 pyzmq-24.0.1.tar.gz > +md5 280afc0992b0a9f109dafc1e672d2f26 pyzmq-25.1.2.tar.gz > +sha256 93f1aa311e8bb912e34f004cf186407a4e90eec4f0ecc0efd26056bf7eda0226 pyzmq-25.1.2.tar.gz > # Locally computed sha256 checksums > -sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD > -sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER > +sha256 c0cf5f5c03f8d6772f7a271df1cb671054578bd3d79527c72fc1f28f8cc72a7a LICENSE.BSD > +sha256 5f1dac83d6c25674004810ec9e54b304ccbb8303ac5961813b09235966abfd48 LICENSE.LESSER > diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk > index 5792957eaf..1d9a7d01cb 100644 > --- a/package/python-pyzmq/python-pyzmq.mk > +++ b/package/python-pyzmq/python-pyzmq.mk > @@ -4,15 +4,18 @@ > # > ################################################################################ > > -PYTHON_PYZMQ_VERSION = 24.0.1 > +PYTHON_PYZMQ_VERSION = 25.1.2 > PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz > -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/46/0d/b06cf99a64d4187632f4ac9ddf6be99cd35de06fe72d75140496a8e0eef5 > +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/3a/33/1a3683fc9a4bd64d8ccc0290da75c8f042184a1a49c146d28398414d3341 > PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 > # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 > -PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD > -PYTHON_PYZMQ_DEPENDENCIES = host-python-packaging zeromq > +PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD > PYTHON_PYZMQ_SETUP_TYPE = setuptools > PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr > +PYTHON_PYZMQ_DEPENDENCIES = \ > + host-python-packaging \ > + host-python-setuptools-scm \ > + zeromq > > # Due to issues with cross-compiling, hardcode to the zeromq in BR > define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION From arnout at mind.be Mon Feb 5 10:56:02 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 11:56:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyudev: bump to version 0.24.1 In-Reply-To: <20240111041757.2707481-1-james.hilliard1@gmail.com> References: <20240111041757.2707481-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 05:17, James Hilliard wrote: > Drop no longer required python-six runtime dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-pyudev/Config.in | 1 - > package/python-pyudev/python-pyudev.hash | 4 ++-- > package/python-pyudev/python-pyudev.mk | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/python-pyudev/Config.in b/package/python-pyudev/Config.in > index e0da067cc2..aa98c2cc61 100644 > --- a/package/python-pyudev/Config.in > +++ b/package/python-pyudev/Config.in > @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PYUDEV > bool "python-pyudev" > depends on BR2_PACKAGE_HAS_UDEV > select BR2_PACKAGE_PYTHON3_ZLIB # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > help > pyudev is a LGPL licenced, pure Python 2/3 binding to > libudev, the device and hardware management and information > diff --git a/package/python-pyudev/python-pyudev.hash b/package/python-pyudev/python-pyudev.hash > index 014bf20933..72eb323e1f 100644 > --- a/package/python-pyudev/python-pyudev.hash > +++ b/package/python-pyudev/python-pyudev.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pyudev/json > -md5 17c0a41f0e4dfc016350806a0a60f630 pyudev-0.24.0.tar.gz > -sha256 b2a3afe1c99ea751f8296652557eac559874da2a1b1ec0625178706ec5a345f3 pyudev-0.24.0.tar.gz > +md5 fecaabe9eaa890d2173c7b49ab63a412 pyudev-0.24.1.tar.gz > +sha256 75e54d37218f5ac45b0da1f0fd9cc5e526a3cac3ef1cfad410cf7ab338b01471 pyudev-0.24.1.tar.gz > # Locally computed sha256 checksums > sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING > diff --git a/package/python-pyudev/python-pyudev.mk b/package/python-pyudev/python-pyudev.mk > index 5d48cd4f7c..53d60572a8 100644 > --- a/package/python-pyudev/python-pyudev.mk > +++ b/package/python-pyudev/python-pyudev.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_PYUDEV_VERSION = 0.24.0 > +PYTHON_PYUDEV_VERSION = 0.24.1 > PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz > -PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/00/8d/810750cb2fc64d7e0dbefc106a9137b157616a95be3f0ea51ca3cf6c762a > +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/20/b6/16961ac3575575260c72928f17df9c99c2a696871e486965ec6e2fa2aff4 > PYTHON_PYUDEV_LICENSE = LGPL-2.1+ > PYTHON_PYUDEV_LICENSE_FILES = COPYING > PYTHON_PYUDEV_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Mon Feb 5 10:56:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:56:36 +0100 Subject: [Buildroot] [git commit] package/gst1-plugins-bad: fix webrtcdsp plugin build Message-ID: <20240205105644.D955C86B1C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d0c65ba09063adf8bc29a4f3fc82f654f3196a36 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The webrtc-audio-processing package was bumped from version 0.3.1 to version 1.3 in commit ef0fa986eb7ff25c0a5db70ec0b62032e2d71538 which broke compatibility with the gst1-plugins-bad webrtcdsp plugin. To fix this backport a commit from upstream adding support for webrtc-audio-processing version 1.3 to gst1-plugins-bad. Fixes: output/build/gst1-plugins-bad-1.22.9/ext/webrtcdsp/meson.build:7:13: ERROR: Dependency "webrtc-audio-processing" not found, tried pkgconfig and cmake Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...Update-code-for-webrtc-audio-processing-1.patch | 883 +++++++++++++++++++++ 1 file changed, 883 insertions(+) diff --git a/package/gstreamer1/gst1-plugins-bad/0001-webrtcdsp-Update-code-for-webrtc-audio-processing-1.patch b/package/gstreamer1/gst1-plugins-bad/0001-webrtcdsp-Update-code-for-webrtc-audio-processing-1.patch new file mode 100644 index 0000000000..a2ab0ef6d8 --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/0001-webrtcdsp-Update-code-for-webrtc-audio-processing-1.patch @@ -0,0 +1,883 @@ +From d5755744c3e2b70e9f04704ae9d18b928d9fa456 Mon Sep 17 00:00:00 2001 +From: Arun Raghavan +Date: Wed, 2 Dec 2020 18:31:44 -0500 +Subject: [PATCH] webrtcdsp: Update code for webrtc-audio-processing-1 + +Updated API usage appropriately, and now we have a versioned package to +track breaking vs. non-breaking updates. + +Deprecates a number of properties (and we have to plug in our own values +for related enums which are now gone): + + * echo-suprression-level + * experimental-agc + * extended-filter + * delay-agnostic + * voice-detection-frame-size-ms + * voice-detection-likelihood + +Part-of: +Signed-off-by: James Hilliard +Upstream: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/d5755744c3e2b70e9f04704ae9d18b928d9fa456 +--- + .../ext/webrtcdsp/gstwebrtcdsp.cpp | 271 +++++++----------- + .../ext/webrtcdsp/gstwebrtcechoprobe.cpp | 87 +++--- + .../ext/webrtcdsp/gstwebrtcechoprobe.h | 9 +- + .../gst-plugins-bad/ext/webrtcdsp/meson.build | 4 +- + 4 files changed, 164 insertions(+), 207 deletions(-) + +diff --git a/ext/webrtcdsp/gstwebrtcdsp.cpp b/ext/webrtcdsp/gstwebrtcdsp.cpp +index 7ee09488fb..c9a7cdae2f 100644 +--- a/ext/webrtcdsp/gstwebrtcdsp.cpp ++++ b/ext/webrtcdsp/gstwebrtcdsp.cpp +@@ -71,9 +71,7 @@ + #include "gstwebrtcdsp.h" + #include "gstwebrtcechoprobe.h" + +-#include +-#include +-#include ++#include + + GST_DEBUG_CATEGORY (webrtc_dsp_debug); + #define GST_CAT_DEFAULT (webrtc_dsp_debug) +@@ -82,10 +80,9 @@ GST_DEBUG_CATEGORY (webrtc_dsp_debug); + #define DEFAULT_COMPRESSION_GAIN_DB 9 + #define DEFAULT_STARTUP_MIN_VOLUME 12 + #define DEFAULT_LIMITER TRUE +-#define DEFAULT_GAIN_CONTROL_MODE webrtc::GainControl::kAdaptiveDigital ++#define DEFAULT_GAIN_CONTROL_MODE webrtc::AudioProcessing::Config::GainController1::Mode::kAdaptiveDigital + #define DEFAULT_VOICE_DETECTION FALSE + #define DEFAULT_VOICE_DETECTION_FRAME_SIZE_MS 10 +-#define DEFAULT_VOICE_DETECTION_LIKELIHOOD webrtc::VoiceDetection::kLowLikelihood + + static GstStaticPadTemplate gst_webrtc_dsp_sink_template = + GST_STATIC_PAD_TEMPLATE ("sink", +@@ -119,7 +116,7 @@ GST_STATIC_PAD_TEMPLATE ("src", + "channels = (int) [1, MAX]") + ); + +-typedef webrtc::EchoCancellation::SuppressionLevel GstWebrtcEchoSuppressionLevel; ++typedef int GstWebrtcEchoSuppressionLevel; + #define GST_TYPE_WEBRTC_ECHO_SUPPRESSION_LEVEL \ + (gst_webrtc_echo_suppression_level_get_type ()) + static GType +@@ -127,10 +124,9 @@ gst_webrtc_echo_suppression_level_get_type (void) + { + static GType suppression_level_type = 0; + static const GEnumValue level_types[] = { +- {webrtc::EchoCancellation::kLowSuppression, "Low Suppression", "low"}, +- {webrtc::EchoCancellation::kModerateSuppression, +- "Moderate Suppression", "moderate"}, +- {webrtc::EchoCancellation::kHighSuppression, "high Suppression", "high"}, ++ {1, "Low Suppression", "low"}, ++ {2, "Moderate Suppression", "moderate"}, ++ {3, "high Suppression", "high"}, + {0, NULL, NULL} + }; + +@@ -141,7 +137,7 @@ gst_webrtc_echo_suppression_level_get_type (void) + return suppression_level_type; + } + +-typedef webrtc::NoiseSuppression::Level GstWebrtcNoiseSuppressionLevel; ++typedef webrtc::AudioProcessing::Config::NoiseSuppression::Level GstWebrtcNoiseSuppressionLevel; + #define GST_TYPE_WEBRTC_NOISE_SUPPRESSION_LEVEL \ + (gst_webrtc_noise_suppression_level_get_type ()) + static GType +@@ -149,10 +145,10 @@ gst_webrtc_noise_suppression_level_get_type (void) + { + static GType suppression_level_type = 0; + static const GEnumValue level_types[] = { +- {webrtc::NoiseSuppression::kLow, "Low Suppression", "low"}, +- {webrtc::NoiseSuppression::kModerate, "Moderate Suppression", "moderate"}, +- {webrtc::NoiseSuppression::kHigh, "High Suppression", "high"}, +- {webrtc::NoiseSuppression::kVeryHigh, "Very High Suppression", ++ {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kLow, "Low Suppression", "low"}, ++ {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kModerate, "Moderate Suppression", "moderate"}, ++ {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kHigh, "High Suppression", "high"}, ++ {webrtc::AudioProcessing::Config::NoiseSuppression::Level::kVeryHigh, "Very High Suppression", + "very-high"}, + {0, NULL, NULL} + }; +@@ -164,7 +160,7 @@ gst_webrtc_noise_suppression_level_get_type (void) + return suppression_level_type; + } + +-typedef webrtc::GainControl::Mode GstWebrtcGainControlMode; ++typedef webrtc::AudioProcessing::Config::GainController1::Mode GstWebrtcGainControlMode; + #define GST_TYPE_WEBRTC_GAIN_CONTROL_MODE \ + (gst_webrtc_gain_control_mode_get_type ()) + static GType +@@ -172,8 +168,9 @@ gst_webrtc_gain_control_mode_get_type (void) + { + static GType gain_control_mode_type = 0; + static const GEnumValue mode_types[] = { +- {webrtc::GainControl::kAdaptiveDigital, "Adaptive Digital", "adaptive-digital"}, +- {webrtc::GainControl::kFixedDigital, "Fixed Digital", "fixed-digital"}, ++ {webrtc::AudioProcessing::Config::GainController1::kAdaptiveDigital, "Adaptive Digital", "adaptive-digital"}, ++ {webrtc::AudioProcessing::Config::GainController1::kFixedDigital, "Fixed Digital", "fixed-digital"}, ++ {webrtc::AudioProcessing::Config::GainController1::kAdaptiveAnalog, "Adaptive Analog", "adaptive-analog"}, + {0, NULL, NULL} + }; + +@@ -184,7 +181,7 @@ gst_webrtc_gain_control_mode_get_type (void) + return gain_control_mode_type; + } + +-typedef webrtc::VoiceDetection::Likelihood GstWebrtcVoiceDetectionLikelihood; ++typedef int GstWebrtcVoiceDetectionLikelihood; + #define GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD \ + (gst_webrtc_voice_detection_likelihood_get_type ()) + static GType +@@ -192,10 +189,10 @@ gst_webrtc_voice_detection_likelihood_get_type (void) + { + static GType likelihood_type = 0; + static const GEnumValue likelihood_types[] = { +- {webrtc::VoiceDetection::kVeryLowLikelihood, "Very Low Likelihood", "very-low"}, +- {webrtc::VoiceDetection::kLowLikelihood, "Low Likelihood", "low"}, +- {webrtc::VoiceDetection::kModerateLikelihood, "Moderate Likelihood", "moderate"}, +- {webrtc::VoiceDetection::kHighLikelihood, "High Likelihood", "high"}, ++ {1, "Very Low Likelihood", "very-low"}, ++ {2, "Low Likelihood", "low"}, ++ {3, "Moderate Likelihood", "moderate"}, ++ {4, "High Likelihood", "high"}, + {0, NULL, NULL} + }; + +@@ -227,6 +224,7 @@ enum + PROP_VOICE_DETECTION, + PROP_VOICE_DETECTION_FRAME_SIZE_MS, + PROP_VOICE_DETECTION_LIKELIHOOD, ++ PROP_EXTRA_DELAY_MS, + }; + + /** +@@ -248,7 +246,7 @@ struct _GstWebrtcDsp + /* Protected by the stream lock */ + GstAdapter *adapter; + GstPlanarAudioAdapter *padapter; +- webrtc::AudioProcessing * apm; ++ webrtc::AudioProcessing *apm; + + /* Protected by the object lock */ + gchar *probe_name; +@@ -257,21 +255,15 @@ struct _GstWebrtcDsp + /* Properties */ + gboolean high_pass_filter; + gboolean echo_cancel; +- webrtc::EchoCancellation::SuppressionLevel echo_suppression_level; + gboolean noise_suppression; +- webrtc::NoiseSuppression::Level noise_suppression_level; ++ webrtc::AudioProcessing::Config::NoiseSuppression::Level noise_suppression_level; + gboolean gain_control; +- gboolean experimental_agc; +- gboolean extended_filter; +- gboolean delay_agnostic; + gint target_level_dbfs; + gint compression_gain_db; + gint startup_min_volume; + gboolean limiter; +- webrtc::GainControl::Mode gain_control_mode; ++ webrtc::AudioProcessing::Config::GainController1::Mode gain_control_mode; + gboolean voice_detection; +- gint voice_detection_frame_size_ms; +- webrtc::VoiceDetection::Likelihood voice_detection_likelihood; + }; + + G_DEFINE_TYPE_WITH_CODE (GstWebrtcDsp, gst_webrtc_dsp, GST_TYPE_AUDIO_FILTER, +@@ -376,9 +368,9 @@ gst_webrtc_dsp_analyze_reverse_stream (GstWebrtcDsp * self, + GstClockTime rec_time) + { + GstWebrtcEchoProbe *probe = NULL; +- webrtc::AudioProcessing * apm; +- webrtc::AudioFrame frame; ++ webrtc::AudioProcessing *apm; + GstBuffer *buf = NULL; ++ GstAudioBuffer abuf; + GstFlowReturn ret = GST_FLOW_OK; + gint err, delay; + +@@ -391,48 +383,44 @@ gst_webrtc_dsp_analyze_reverse_stream (GstWebrtcDsp * self, + if (!probe) + return GST_FLOW_OK; + ++ webrtc::StreamConfig config (probe->info.rate, probe->info.channels, ++ false); + apm = self->apm; + +- if (self->delay_agnostic) +- rec_time = GST_CLOCK_TIME_NONE; +- +-again: +- delay = gst_webrtc_echo_probe_read (probe, rec_time, (gpointer) &frame, &buf); ++ delay = gst_webrtc_echo_probe_read (probe, rec_time, &buf); + apm->set_stream_delay_ms (delay); + ++ g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR); ++ + if (delay < 0) + goto done; + +- if (frame.sample_rate_hz_ != self->info.rate) { ++ if (probe->info.rate != self->info.rate) { + GST_ELEMENT_ERROR (self, STREAM, FORMAT, + ("Echo Probe has rate %i , while the DSP is running at rate %i," + " use a caps filter to ensure those are the same.", +- frame.sample_rate_hz_, self->info.rate), (NULL)); ++ probe->info.rate, self->info.rate), (NULL)); + ret = GST_FLOW_ERROR; + goto done; + } + +- if (buf) { +- webrtc::StreamConfig config (frame.sample_rate_hz_, frame.num_channels_, +- false); +- GstAudioBuffer abuf; +- float * const * data; ++ gst_audio_buffer_map (&abuf, &self->info, buf, GST_MAP_READWRITE); ++ ++ if (probe->interleaved) { ++ int16_t * const data = (int16_t * const) abuf.planes[0]; + +- gst_audio_buffer_map (&abuf, &self->info, buf, GST_MAP_READWRITE); +- data = (float * const *) abuf.planes; + if ((err = apm->ProcessReverseStream (data, config, config, data)) < 0) + GST_WARNING_OBJECT (self, "Reverse stream analyses failed: %s.", + webrtc_error_to_string (err)); +- gst_audio_buffer_unmap (&abuf); +- gst_buffer_replace (&buf, NULL); + } else { +- if ((err = apm->AnalyzeReverseStream (&frame)) < 0) ++ float * const * data = (float * const *) abuf.planes; ++ ++ if ((err = apm->ProcessReverseStream (data, config, config, data)) < 0) + GST_WARNING_OBJECT (self, "Reverse stream analyses failed: %s.", + webrtc_error_to_string (err)); + } + +- if (self->delay_agnostic) +- goto again; ++ gst_audio_buffer_unmap (&abuf); + + done: + gst_object_unref (probe); +@@ -443,16 +431,14 @@ done: + + static void + gst_webrtc_vad_post_activity (GstWebrtcDsp *self, GstBuffer *buffer, +- gboolean stream_has_voice) ++ gboolean stream_has_voice, guint8 level) + { + GstClockTime timestamp = GST_BUFFER_PTS (buffer); + GstBaseTransform *trans = GST_BASE_TRANSFORM_CAST (self); + GstStructure *s; + GstClockTime stream_time; + GstAudioLevelMeta *meta; +- guint8 level; + +- level = self->apm->level_estimator ()->RMS (); + meta = gst_buffer_get_audio_level_meta (buffer); + if (meta) { + meta->voice_activity = stream_has_voice; +@@ -481,6 +467,7 @@ gst_webrtc_dsp_process_stream (GstWebrtcDsp * self, + { + GstAudioBuffer abuf; + webrtc::AudioProcessing * apm = self->apm; ++ webrtc::StreamConfig config (self->info.rate, self->info.channels, false); + gint err; + + if (!gst_audio_buffer_map (&abuf, &self->info, buffer, +@@ -490,19 +477,10 @@ gst_webrtc_dsp_process_stream (GstWebrtcDsp * self, + } + + if (self->interleaved) { +- webrtc::AudioFrame frame; +- frame.num_channels_ = self->info.channels; +- frame.sample_rate_hz_ = self->info.rate; +- frame.samples_per_channel_ = self->period_samples; +- +- memcpy (frame.data_, abuf.planes[0], self->period_size); +- err = apm->ProcessStream (&frame); +- if (err >= 0) +- memcpy (abuf.planes[0], frame.data_, self->period_size); ++ int16_t * const data = (int16_t * const) abuf.planes[0]; ++ err = apm->ProcessStream (data, config, config, data); + } else { + float * const * data = (float * const *) abuf.planes; +- webrtc::StreamConfig config (self->info.rate, self->info.channels, false); +- + err = apm->ProcessStream (data, config, config, data); + } + +@@ -511,10 +489,13 @@ gst_webrtc_dsp_process_stream (GstWebrtcDsp * self, + webrtc_error_to_string (err)); + } else { + if (self->voice_detection) { +- gboolean stream_has_voice = apm->voice_detection ()->stream_has_voice (); ++ webrtc::AudioProcessingStats stats = apm->GetStatistics (); ++ gboolean stream_has_voice = stats.voice_detected && *stats.voice_detected; ++ // The meta takes the value as -dbov, so we negate ++ guint8 level = stats.output_rms_dbfs ? (guint8) -(*stats.output_rms_dbfs) : 127; + + if (stream_has_voice != self->stream_has_voice) +- gst_webrtc_vad_post_activity (self, buffer, stream_has_voice); ++ gst_webrtc_vad_post_activity (self, buffer, stream_has_voice, level); + + self->stream_has_voice = stream_has_voice; + } +@@ -583,21 +564,9 @@ static gboolean + gst_webrtc_dsp_start (GstBaseTransform * btrans) + { + GstWebrtcDsp *self = GST_WEBRTC_DSP (btrans); +- webrtc::Config config; + + GST_OBJECT_LOCK (self); + +- config.Set < webrtc::ExtendedFilter > +- (new webrtc::ExtendedFilter (self->extended_filter)); +- config.Set < webrtc::ExperimentalAgc > +- (new webrtc::ExperimentalAgc (self->experimental_agc, self->startup_min_volume)); +- config.Set < webrtc::DelayAgnostic > +- (new webrtc::DelayAgnostic (self->delay_agnostic)); +- +- /* TODO Intelligibility enhancer, Beamforming, etc. */ +- +- self->apm = webrtc::AudioProcessing::Create (config); +- + if (self->echo_cancel) { + self->probe = gst_webrtc_acquire_echo_probe (self->probe_name); + +@@ -618,10 +587,8 @@ static gboolean + gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + { + GstWebrtcDsp *self = GST_WEBRTC_DSP (filter); +- webrtc::AudioProcessing * apm; +- webrtc::ProcessingConfig pconfig; ++ webrtc::AudioProcessing::Config config; + GstAudioInfo probe_info = *info; +- gint err = 0; + + GST_LOG_OBJECT (self, "setting format to %s with %i Hz and %i channels", + info->finfo->description, info->rate, info->channels); +@@ -633,7 +600,7 @@ gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + + self->info = *info; + self->interleaved = (info->layout == GST_AUDIO_LAYOUT_INTERLEAVED); +- apm = self->apm; ++ self->apm = webrtc::AudioProcessingBuilder().Create(); + + if (!self->interleaved) + gst_planar_audio_adapter_configure (self->padapter, info); +@@ -642,8 +609,7 @@ gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + self->period_samples = info->rate / 100; + self->period_size = self->period_samples * info->bpf; + +- if (self->interleaved && +- (webrtc::AudioFrame::kMaxDataSizeSamples * 2) < self->period_size) ++ if (self->interleaved && (self->period_size > MAX_DATA_SIZE_SAMPLES * 2)) + goto period_too_big; + + if (self->probe) { +@@ -658,40 +624,31 @@ gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + GST_WEBRTC_ECHO_PROBE_UNLOCK (self->probe); + } + +- /* input stream */ +- pconfig.streams[webrtc::ProcessingConfig::kInputStream] = +- webrtc::StreamConfig (info->rate, info->channels, false); +- /* output stream */ +- pconfig.streams[webrtc::ProcessingConfig::kOutputStream] = +- webrtc::StreamConfig (info->rate, info->channels, false); +- /* reverse input stream */ +- pconfig.streams[webrtc::ProcessingConfig::kReverseInputStream] = +- webrtc::StreamConfig (probe_info.rate, probe_info.channels, false); +- /* reverse output stream */ +- pconfig.streams[webrtc::ProcessingConfig::kReverseOutputStream] = +- webrtc::StreamConfig (probe_info.rate, probe_info.channels, false); +- +- if ((err = apm->Initialize (pconfig)) < 0) +- goto initialize_failed; +- + /* Setup Filters */ ++ // TODO: expose pre_amplifier ++ + if (self->high_pass_filter) { + GST_DEBUG_OBJECT (self, "Enabling High Pass filter"); +- apm->high_pass_filter ()->Enable (true); ++ config.high_pass_filter.enabled = true; + } + + if (self->echo_cancel) { + GST_DEBUG_OBJECT (self, "Enabling Echo Cancellation"); +- apm->echo_cancellation ()->enable_drift_compensation (false); +- apm->echo_cancellation () +- ->set_suppression_level (self->echo_suppression_level); +- apm->echo_cancellation ()->Enable (true); ++ config.echo_canceller.enabled = true; + } + + if (self->noise_suppression) { + GST_DEBUG_OBJECT (self, "Enabling Noise Suppression"); +- apm->noise_suppression ()->set_level (self->noise_suppression_level); +- apm->noise_suppression ()->Enable (true); ++ config.noise_suppression.enabled = true; ++ config.noise_suppression.level = self->noise_suppression_level; ++ } ++ ++ // TODO: expose transient suppression ++ ++ if (self->voice_detection) { ++ GST_DEBUG_OBJECT (self, "Enabling Voice Activity Detection"); ++ config.voice_detection.enabled = true; ++ self->stream_has_voice = FALSE; + } + + if (self->gain_control) { +@@ -706,30 +663,17 @@ gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + + g_type_class_unref (mode_class); + +- apm->gain_control ()->set_mode (self->gain_control_mode); +- apm->gain_control ()->set_target_level_dbfs (self->target_level_dbfs); +- apm->gain_control ()->set_compression_gain_db (self->compression_gain_db); +- apm->gain_control ()->enable_limiter (self->limiter); +- apm->gain_control ()->Enable (true); ++ config.gain_controller1.enabled = true; ++ config.gain_controller1.target_level_dbfs = self->target_level_dbfs; ++ config.gain_controller1.compression_gain_db = self->compression_gain_db; ++ config.gain_controller1.enable_limiter = self->limiter; ++ config.level_estimation.enabled = true; + } + +- if (self->voice_detection) { +- GEnumClass *likelihood_class = (GEnumClass *) +- g_type_class_ref (GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD); +- GST_DEBUG_OBJECT (self, "Enabling Voice Activity Detection, frame size " +- "%d milliseconds, likelihood: %s", self->voice_detection_frame_size_ms, +- g_enum_get_value (likelihood_class, +- self->voice_detection_likelihood)->value_name); +- g_type_class_unref (likelihood_class); ++ // TODO: expose gain controller 2 ++ // TODO: expose residual echo detector + +- self->stream_has_voice = FALSE; +- +- apm->voice_detection ()->Enable (true); +- apm->voice_detection ()->set_likelihood (self->voice_detection_likelihood); +- apm->voice_detection ()->set_frame_size_ms ( +- self->voice_detection_frame_size_ms); +- apm->level_estimator ()->Enable (true); +- } ++ self->apm->ApplyConfig (config); + + GST_OBJECT_UNLOCK (self); + +@@ -738,9 +682,9 @@ gst_webrtc_dsp_setup (GstAudioFilter * filter, const GstAudioInfo * info) + period_too_big: + GST_OBJECT_UNLOCK (self); + GST_WARNING_OBJECT (self, "webrtcdsp format produce too big period " +- "(maximum is %" G_GSIZE_FORMAT " samples and we have %u samples), " ++ "(maximum is %d samples and we have %u samples), " + "reduce the number of channels or the rate.", +- webrtc::AudioFrame::kMaxDataSizeSamples, self->period_size / 2); ++ MAX_DATA_SIZE_SAMPLES, self->period_size / 2); + return FALSE; + + probe_has_wrong_rate: +@@ -751,14 +695,6 @@ probe_has_wrong_rate: + " use a caps filter to ensure those are the same.", + probe_info.rate, info->rate), (NULL)); + return FALSE; +- +-initialize_failed: +- GST_OBJECT_UNLOCK (self); +- GST_ELEMENT_ERROR (self, LIBRARY, INIT, +- ("Failed to initialize WebRTC Audio Processing library"), +- ("webrtc::AudioProcessing::Initialize() failed: %s", +- webrtc_error_to_string (err))); +- return FALSE; + } + + static gboolean +@@ -803,8 +739,6 @@ gst_webrtc_dsp_set_property (GObject * object, + self->echo_cancel = g_value_get_boolean (value); + break; + case PROP_ECHO_SUPPRESSION_LEVEL: +- self->echo_suppression_level = +- (GstWebrtcEchoSuppressionLevel) g_value_get_enum (value); + break; + case PROP_NOISE_SUPPRESSION: + self->noise_suppression = g_value_get_boolean (value); +@@ -817,13 +751,10 @@ gst_webrtc_dsp_set_property (GObject * object, + self->gain_control = g_value_get_boolean (value); + break; + case PROP_EXPERIMENTAL_AGC: +- self->experimental_agc = g_value_get_boolean (value); + break; + case PROP_EXTENDED_FILTER: +- self->extended_filter = g_value_get_boolean (value); + break; + case PROP_DELAY_AGNOSTIC: +- self->delay_agnostic = g_value_get_boolean (value); + break; + case PROP_TARGET_LEVEL_DBFS: + self->target_level_dbfs = g_value_get_int (value); +@@ -845,11 +776,8 @@ gst_webrtc_dsp_set_property (GObject * object, + self->voice_detection = g_value_get_boolean (value); + break; + case PROP_VOICE_DETECTION_FRAME_SIZE_MS: +- self->voice_detection_frame_size_ms = g_value_get_int (value); + break; + case PROP_VOICE_DETECTION_LIKELIHOOD: +- self->voice_detection_likelihood = +- (GstWebrtcVoiceDetectionLikelihood) g_value_get_enum (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +@@ -876,7 +804,7 @@ gst_webrtc_dsp_get_property (GObject * object, + g_value_set_boolean (value, self->echo_cancel); + break; + case PROP_ECHO_SUPPRESSION_LEVEL: +- g_value_set_enum (value, self->echo_suppression_level); ++ g_value_set_enum (value, (GstWebrtcEchoSuppressionLevel) 2); + break; + case PROP_NOISE_SUPPRESSION: + g_value_set_boolean (value, self->noise_suppression); +@@ -888,13 +816,13 @@ gst_webrtc_dsp_get_property (GObject * object, + g_value_set_boolean (value, self->gain_control); + break; + case PROP_EXPERIMENTAL_AGC: +- g_value_set_boolean (value, self->experimental_agc); ++ g_value_set_boolean (value, false); + break; + case PROP_EXTENDED_FILTER: +- g_value_set_boolean (value, self->extended_filter); ++ g_value_set_boolean (value, false); + break; + case PROP_DELAY_AGNOSTIC: +- g_value_set_boolean (value, self->delay_agnostic); ++ g_value_set_boolean (value, false); + break; + case PROP_TARGET_LEVEL_DBFS: + g_value_set_int (value, self->target_level_dbfs); +@@ -915,10 +843,10 @@ gst_webrtc_dsp_get_property (GObject * object, + g_value_set_boolean (value, self->voice_detection); + break; + case PROP_VOICE_DETECTION_FRAME_SIZE_MS: +- g_value_set_int (value, self->voice_detection_frame_size_ms); ++ g_value_set_int (value, 0); + break; + case PROP_VOICE_DETECTION_LIKELIHOOD: +- g_value_set_enum (value, self->voice_detection_likelihood); ++ g_value_set_enum (value, 2); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +@@ -1005,13 +933,13 @@ gst_webrtc_dsp_class_init (GstWebrtcDspClass * klass) + + g_object_class_install_property (gobject_class, + PROP_ECHO_SUPPRESSION_LEVEL, +- g_param_spec_enum ("echo-suppression-level", "Echo Suppression Level", ++ g_param_spec_enum ("echo-suppression-level", ++ "Echo Suppression Level (does nothing)", + "Controls the aggressiveness of the suppressor. A higher level " + "trades off double-talk performance for increased echo suppression.", +- GST_TYPE_WEBRTC_ECHO_SUPPRESSION_LEVEL, +- webrtc::EchoCancellation::kModerateSuppression, ++ GST_TYPE_WEBRTC_ECHO_SUPPRESSION_LEVEL, 2, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + g_object_class_install_property (gobject_class, + PROP_NOISE_SUPPRESSION, +@@ -1026,7 +954,7 @@ gst_webrtc_dsp_class_init (GstWebrtcDspClass * klass) + "Controls the aggressiveness of the suppression. Increasing the " + "level will reduce the noise level at the expense of a higher " + "speech distortion.", GST_TYPE_WEBRTC_NOISE_SUPPRESSION_LEVEL, +- webrtc::EchoCancellation::kModerateSuppression, ++ webrtc::AudioProcessing::Config::NoiseSuppression::Level::kModerate, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | + G_PARAM_CONSTRUCT))); + +@@ -1039,24 +967,26 @@ gst_webrtc_dsp_class_init (GstWebrtcDspClass * klass) + + g_object_class_install_property (gobject_class, + PROP_EXPERIMENTAL_AGC, +- g_param_spec_boolean ("experimental-agc", "Experimental AGC", ++ g_param_spec_boolean ("experimental-agc", ++ "Experimental AGC (does nothing)", + "Enable or disable experimental automatic gain control.", + FALSE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + g_object_class_install_property (gobject_class, + PROP_EXTENDED_FILTER, + g_param_spec_boolean ("extended-filter", "Extended Filter", + "Enable or disable the extended filter.", + TRUE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + g_object_class_install_property (gobject_class, + PROP_DELAY_AGNOSTIC, +- g_param_spec_boolean ("delay-agnostic", "Delay Agnostic", ++ g_param_spec_boolean ("delay-agnostic", ++ "Delay agnostic mode (does nothing)", + "Enable or disable the delay agnostic mode.", + FALSE, (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + g_object_class_install_property (gobject_class, + PROP_TARGET_LEVEL_DBFS, +@@ -1111,24 +1041,23 @@ gst_webrtc_dsp_class_init (GstWebrtcDspClass * klass) + g_object_class_install_property (gobject_class, + PROP_VOICE_DETECTION_FRAME_SIZE_MS, + g_param_spec_int ("voice-detection-frame-size-ms", +- "Voice Detection Frame Size Milliseconds", ++ "Voice detection frame size in milliseconds (does nothing)", + "Sets the |size| of the frames in ms on which the VAD will operate. " + "Larger frames will improve detection accuracy, but reduce the " + "frequency of updates", + 10, 30, DEFAULT_VOICE_DETECTION_FRAME_SIZE_MS, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + g_object_class_install_property (gobject_class, + PROP_VOICE_DETECTION_LIKELIHOOD, + g_param_spec_enum ("voice-detection-likelihood", +- "Voice Detection Likelihood", ++ "Voice detection likelihood (does nothing)", + "Specifies the likelihood that a frame will be declared to contain " + "voice.", +- GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD, +- DEFAULT_VOICE_DETECTION_LIKELIHOOD, ++ GST_TYPE_WEBRTC_VOICE_DETECTION_LIKELIHOOD, 2, + (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | +- G_PARAM_CONSTRUCT))); ++ G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED))); + + gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_GAIN_CONTROL_MODE, (GstPluginAPIFlags) 0); + gst_type_mark_as_plugin_api (GST_TYPE_WEBRTC_NOISE_SUPPRESSION_LEVEL, (GstPluginAPIFlags) 0); +diff --git a/ext/webrtcdsp/gstwebrtcechoprobe.cpp b/ext/webrtcdsp/gstwebrtcechoprobe.cpp +index acdb3d8a7d..8e8ca064c4 100644 +--- a/ext/webrtcdsp/gstwebrtcechoprobe.cpp ++++ b/ext/webrtcdsp/gstwebrtcechoprobe.cpp +@@ -33,7 +33,8 @@ + + #include "gstwebrtcechoprobe.h" + +-#include ++#include ++ + #include + + GST_DEBUG_CATEGORY_EXTERN (webrtc_dsp_debug); +@@ -102,7 +103,7 @@ gst_webrtc_echo_probe_setup (GstAudioFilter * filter, const GstAudioInfo * info) + self->period_size = self->period_samples * info->bpf; + + if (self->interleaved && +- (webrtc::AudioFrame::kMaxDataSizeSamples * 2) < self->period_size) ++ (MAX_DATA_SIZE_SAMPLES * 2) < self->period_size) + goto period_too_big; + + GST_WEBRTC_ECHO_PROBE_UNLOCK (self); +@@ -112,9 +113,9 @@ gst_webrtc_echo_probe_setup (GstAudioFilter * filter, const GstAudioInfo * info) + period_too_big: + GST_WEBRTC_ECHO_PROBE_UNLOCK (self); + GST_WARNING_OBJECT (self, "webrtcdsp format produce too big period " +- "(maximum is %" G_GSIZE_FORMAT " samples and we have %u samples), " ++ "(maximum is %d samples and we have %u samples), " + "reduce the number of channels or the rate.", +- webrtc::AudioFrame::kMaxDataSizeSamples, self->period_size / 2); ++ MAX_DATA_SIZE_SAMPLES, self->period_size / 2); + return FALSE; + } + +@@ -303,18 +304,20 @@ gst_webrtc_release_echo_probe (GstWebrtcEchoProbe * probe) + + gint + gst_webrtc_echo_probe_read (GstWebrtcEchoProbe * self, GstClockTime rec_time, +- gpointer _frame, GstBuffer ** buf) ++ GstBuffer ** buf) + { +- webrtc::AudioFrame * frame = (webrtc::AudioFrame *) _frame; + GstClockTimeDiff diff; +- gsize avail, skip, offset, size; ++ gsize avail, skip, offset, size = 0; + gint delay = -1; + + GST_WEBRTC_ECHO_PROBE_LOCK (self); + ++ /* We always return a buffer -- if don't have data (size == 0), we generate a ++ * silence buffer */ ++ + if (!GST_CLOCK_TIME_IS_VALID (self->latency) || + !GST_AUDIO_INFO_IS_VALID (&self->info)) +- goto done; ++ goto copy; + + if (self->interleaved) + avail = gst_adapter_available (self->adapter) / self->info.bpf; +@@ -324,7 +327,7 @@ gst_webrtc_echo_probe_read (GstWebrtcEchoProbe * self, GstClockTime rec_time, + /* In delay agnostic mode, just return 10ms of data */ + if (!GST_CLOCK_TIME_IS_VALID (rec_time)) { + if (avail < self->period_samples) +- goto done; ++ goto copy; + + size = self->period_samples; + skip = 0; +@@ -371,23 +374,51 @@ gst_webrtc_echo_probe_read (GstWebrtcEchoProbe * self, GstClockTime rec_time, + size = MIN (avail - offset, self->period_samples - skip); + + copy: +- if (self->interleaved) { +- skip *= self->info.bpf; +- offset *= self->info.bpf; +- size *= self->info.bpf; +- +- if (size < self->period_size) +- memset (frame->data_, 0, self->period_size); +- +- if (size) { +- gst_adapter_copy (self->adapter, (guint8 *) frame->data_ + skip, +- offset, size); +- gst_adapter_flush (self->adapter, offset + size); +- } ++ if (!size) { ++ /* No data, provide a period's worth of silence */ ++ *buf = gst_buffer_new_allocate (NULL, self->period_size, NULL); ++ gst_buffer_memset (*buf, 0, 0, self->period_size); ++ gst_buffer_add_audio_meta (*buf, &self->info, self->period_samples, ++ NULL); + } else { ++ /* We have some actual data, pop period_samples' worth if have it, else pad ++ * with silence and provide what we do have */ + GstBuffer *ret, *taken, *tmp; + +- if (size) { ++ if (self->interleaved) { ++ skip *= self->info.bpf; ++ offset *= self->info.bpf; ++ size *= self->info.bpf; ++ ++ gst_adapter_flush (self->adapter, offset); ++ ++ /* we need to fill silence at the beginning and/or the end of the ++ * buffer in order to have period_samples in the buffer */ ++ if (size < self->period_size) { ++ gsize padding = self->period_size - (skip + size); ++ ++ taken = gst_adapter_take_buffer (self->adapter, size); ++ ret = gst_buffer_new (); ++ ++ /* need some silence at the beginning */ ++ if (skip) { ++ tmp = gst_buffer_new_allocate (NULL, skip, NULL); ++ gst_buffer_memset (tmp, 0, 0, skip); ++ ret = gst_buffer_append (ret, tmp); ++ } ++ ++ ret = gst_buffer_append (ret, taken); ++ ++ /* need some silence at the end */ ++ if (padding) { ++ tmp = gst_buffer_new_allocate (NULL, padding, NULL); ++ gst_buffer_memset (tmp, 0, 0, padding); ++ ret = gst_buffer_append (ret, tmp); ++ } ++ } else { ++ ret = gst_adapter_take_buffer (self->adapter, size); ++ } ++ } else { + gst_planar_audio_adapter_flush (self->padapter, offset); + + /* we need to fill silence at the beginning and/or the end of each +@@ -430,23 +461,13 @@ copy: + ret = gst_planar_audio_adapter_take_buffer (self->padapter, size, + GST_MAP_READWRITE); + } +- } else { +- ret = gst_buffer_new_allocate (NULL, self->period_size, NULL); +- gst_buffer_memset (ret, 0, 0, self->period_size); +- gst_buffer_add_audio_meta (ret, &self->info, self->period_samples, +- NULL); + } + + *buf = ret; + } + +- frame->num_channels_ = self->info.channels; +- frame->sample_rate_hz_ = self->info.rate; +- frame->samples_per_channel_ = self->period_samples; +- + delay = self->delay; + +-done: + GST_WEBRTC_ECHO_PROBE_UNLOCK (self); + + return delay; +diff --git a/ext/webrtcdsp/gstwebrtcechoprobe.h b/ext/webrtcdsp/gstwebrtcechoprobe.h +index 36fd34f179..488c0e958f 100644 +--- a/ext/webrtcdsp/gstwebrtcechoprobe.h ++++ b/ext/webrtcdsp/gstwebrtcechoprobe.h +@@ -45,6 +45,12 @@ G_BEGIN_DECLS + #define GST_WEBRTC_ECHO_PROBE_LOCK(obj) g_mutex_lock (&GST_WEBRTC_ECHO_PROBE (obj)->lock) + #define GST_WEBRTC_ECHO_PROBE_UNLOCK(obj) g_mutex_unlock (&GST_WEBRTC_ECHO_PROBE (obj)->lock) + ++/* From the webrtc audio_frame.h definition of kMaxDataSizeSamples: ++ * Stereo, 32 kHz, 120 ms (2 * 32 * 120) ++ * Stereo, 192 kHz, 20 ms (2 * 192 * 20) ++ */ ++#define MAX_DATA_SIZE_SAMPLES 7680 ++ + typedef struct _GstWebrtcEchoProbe GstWebrtcEchoProbe; + typedef struct _GstWebrtcEchoProbeClass GstWebrtcEchoProbeClass; + +@@ -71,6 +77,7 @@ struct _GstWebrtcEchoProbe + GstClockTime latency; + gint delay; + gboolean interleaved; ++ gint extra_delay; + + GstSegment segment; + GstAdapter *adapter; +@@ -92,7 +99,7 @@ GST_ELEMENT_REGISTER_DECLARE (webrtcechoprobe); + GstWebrtcEchoProbe *gst_webrtc_acquire_echo_probe (const gchar * name); + void gst_webrtc_release_echo_probe (GstWebrtcEchoProbe * probe); + gint gst_webrtc_echo_probe_read (GstWebrtcEchoProbe * self, +- GstClockTime rec_time, gpointer frame, GstBuffer ** buf); ++ GstClockTime rec_time, GstBuffer ** buf); + + G_END_DECLS + #endif /* __GST_WEBRTC_ECHO_PROBE_H__ */ +diff --git a/ext/webrtcdsp/meson.build b/ext/webrtcdsp/meson.build +index 5aeae69a44..09565e27c7 100644 +--- a/ext/webrtcdsp/meson.build ++++ b/ext/webrtcdsp/meson.build +@@ -4,7 +4,7 @@ webrtc_sources = [ + 'gstwebrtcdspplugin.cpp' + ] + +-webrtc_dep = dependency('webrtc-audio-processing', version : ['>= 0.2', '< 0.4'], ++webrtc_dep = dependency('webrtc-audio-processing-1', version : ['>= 1.0'], + required : get_option('webrtcdsp')) + + if not gnustl_dep.found() and get_option('webrtcdsp').enabled() +@@ -20,7 +20,7 @@ if webrtc_dep.found() and gnustl_dep.found() + dependencies : [gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep, gnustl_dep], + install : true, + install_dir : plugins_install_dir, +- override_options : ['cpp_std=c++11'], ++ override_options : ['cpp_std=c++17'], + ) + plugins += [gstwebrtcdsp] + endif +-- +2.34.1 + From thomas.petazzoni at bootlin.com Mon Feb 5 10:57:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 11:57:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/gst1-plugins-bad: fix webrtcdsp plugin build In-Reply-To: <20240130192932.888169-1-james.hilliard1@gmail.com> References: <20240130192932.888169-1-james.hilliard1@gmail.com> Message-ID: <20240205115737.74590ae9@windsurf> On Tue, 30 Jan 2024 12:29:32 -0700 James Hilliard wrote: > The webrtc-audio-processing package was bumped from version 0.3.1 to > version 1.3 in commit ef0fa986eb7ff25c0a5db70ec0b62032e2d71538 which > broke compatibility with the gst1-plugins-bad webrtcdsp plugin. > > To fix this backport a commit from upstream adding support for > webrtc-audio-processing version 1.3 to gst1-plugins-bad. > > Fixes: > output/build/gst1-plugins-bad-1.22.9/ext/webrtcdsp/meson.build:7:13: ERROR: Dependency "webrtc-audio-processing" not found, tried pkgconfig and cmake > > Signed-off-by: James Hilliard > --- > ...e-code-for-webrtc-audio-processing-1.patch | 884 ++++++++++++++++++ > 1 file changed, 884 insertions(+) > create mode 100644 package/gstreamer1/gst1-plugins-bad/0001-webrtcdsp-Update-code-for-webrtc-audio-processing-1.patch Thanks for the investigation and fixing! The patch added was missing an "Upstream:" tag, so I added that by slightly updating the reference to the commit being backported. It's now applied to master. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From sergio.prado at e-labworks.com Mon Feb 5 11:00:00 2024 From: sergio.prado at e-labworks.com (sergio.prado at e-labworks.com) Date: Mon, 5 Feb 2024 08:00:00 -0300 Subject: [Buildroot] [PATCH] package/stella: bump to version 6.7.1 Message-ID: <20240205110000.1869845-1-sergio.prado@e-labworks.com> From: Sergio Prado Signed-off-by: Sergio Prado --- package/stella/stella.hash | 2 +- package/stella/stella.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/stella/stella.hash b/package/stella/stella.hash index 17d059226cfd..59c68064590b 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 babfcbb39abbd1a992cb1e6d3b2f508df7ed19cb9d0b5b5d624828bb98f97267 stella-6.7-src.tar.xz +sha256 9ef880df87f2d3ffebfbad915247d1fd5a3aca41dfd6a754dcf7a142ac826752 stella-6.7.1-src.tar.xz sha256 e82dd017fea2c70a16726aa1d7c05c5b7597e10f7229511c1b110bf84cb507c0 Copyright.txt sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index aa5da1996e1f..c48bb593a42a 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.7 +STELLA_VERSION = 6.7.1 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 5 11:01:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:01:18 +0100 Subject: [Buildroot] [git commit] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.72 Message-ID: <20240205110150.6961186B27@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c8f092e59b70adf41418a743f09fcccabbb865e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog Removed patch which is included in this release. Signed-off-by: Yang Li Signed-off-by: Thomas Petazzoni --- .../bluez5_utils-headers/bluez5_utils-headers.mk | 2 +- .../0001-configure-Check-ell-path.patch | 35 ---------------------- package/bluez5_utils/bluez5_utils.hash | 2 +- package/bluez5_utils/bluez5_utils.mk | 4 +-- 4 files changed, 3 insertions(+), 40 deletions(-) diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 0790dd7e0e..74b385e110 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.68 +BLUEZ5_UTILS_HEADERS_VERSION = 5.72 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/0001-configure-Check-ell-path.patch b/package/bluez5_utils/0001-configure-Check-ell-path.patch deleted file mode 100644 index 3e5f7c6516..0000000000 --- a/package/bluez5_utils/0001-configure-Check-ell-path.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 124187ef9abed60a7c40f751153e9c4516cd1f91 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Sat, 1 Jul 2023 01:31:20 +0000 -Subject: [PATCH] configure: Check ell path - -Use of AC_CHECK_FILE prevents cross compilation. -Instead use test to support cross compiling. - -Signed-off-by: Rudi Heitbaum - -Upstream: https://github.com/bluez/bluez/pull/546 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index eff297960..bc7edfcd3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -298,9 +298,10 @@ if (test "${enable_external_ell}" = "yes"); then - AC_SUBST(ELL_LIBS) - fi - if (test "${enable_external_ell}" != "yes"); then -- AC_CHECK_FILE(${srcdir}/ell/ell.h, dummy=yes, -- AC_CHECK_FILE(${srcdir}/../ell/ell/ell.h, dummy=yes, -- AC_MSG_ERROR(ELL source is required or use --enable-external-ell))) -+ if (test ! -f ${srcdir}/ell/ell.h) && -+ (test ! -f ${srcdir}/../ell/ell/ell.h); then -+ AC_MSG_ERROR(ELL source is required or use --enable-external-ell) -+ fi - fi - AM_CONDITIONAL(EXTERNAL_ELL, test "${enable_external_ell}" = "yes" || - (test "${enable_btpclient}" != "yes" && diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 45952e60f1..46680cf3c9 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 fc505e6445cb579a55cacee6821fe70d633921522043d322b696de0a175ff933 bluez-5.68.tar.xz +sha256 499d7fa345a996c1bb650f5c6749e1d929111fa6ece0be0e98687fee6124536e bluez-5.72.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 82800c0430..3ccb63948c 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,12 +5,10 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.68 +BLUEZ5_UTILS_VERSION = 5.72 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES -# 0001-configure-Check-ell-path.patch -BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez From thomas.petazzoni at bootlin.com Mon Feb 5 11:02:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:02:20 +0100 Subject: [Buildroot] [PATCH] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.72 In-Reply-To: <20240124082835.1995939-1-yang.li@amlogic.com> References: <20240124082835.1995939-1-yang.li@amlogic.com> Message-ID: <20240205120220.590fe561@windsurf> On Wed, 24 Jan 2024 16:28:34 +0800 Yang Li wrote: > Changelog: > https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog > > Removed patch which is included in this release. > > Signed-off-by: Yang Li > --- > .../bluez5_utils-headers.mk | 2 +- > .../0001-configure-Check-ell-path.patch | 35 ------------------- > package/bluez5_utils/bluez5_utils.hash | 2 +- > package/bluez5_utils/bluez5_utils.mk | 4 +-- > 4 files changed, 3 insertions(+), 40 deletions(-) > delete mode 100644 package/bluez5_utils/0001-configure-Check-ell-path.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 11:03:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:03:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/uboot-tools: install fit_check_sign if available In-Reply-To: <20240117212634.1334907-1-wdouglass@carnegierobotics.com> References: <20240117212634.1334907-1-wdouglass@carnegierobotics.com> Message-ID: <5614e73d-4356-4e36-ba10-2ad7d3cef8fb@korsgaard.com> On 17/01/2024 22.26, Woodrow Douglass via buildroot wrote: > fit_check_sign is a tool for verifying fit image signatures. > it gets built by host-uboot-tools, but not installed in the path. > > Signed-off-by: Woodrow Douglass Committed after rewording the commit message a bit, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 5 11:02:29 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:02:29 +0100 Subject: [Buildroot] [git commit] package/cryptsetup: bump version to 2.7.0 Message-ID: <20240205110457.ED32B86B31@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=101f5f276cfc74c906a2a66181b5b0f3ab29e3d7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/cryptsetup/cryptsetup.hash | 4 ++-- package/cryptsetup/cryptsetup.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index 87cdf840c3..df92ff36b8 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc -sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc +sha256 94003a00cd5a81944f45e8dc529e0cfd2a6ff629bd2cd21cf5e574e465daf795 cryptsetup-2.7.0.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 3f3034475f..1b181e1b75 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.6 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 +CRYPTSETUP_VERSION_MAJOR = 2.7 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From arnout at mind.be Mon Feb 5 11:05:30 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: <20240111051726.2918732-1-james.hilliard1@gmail.com> References: <20240111051726.2918732-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 06:17, James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-rpds-py/python-rpds-py.hash | 2 +- > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > index b04aa210d3..8c4b6181d0 100644 > --- a/package/python-rpds-py/python-rpds-py.hash > +++ b/package/python-rpds-py/python-rpds-py.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz ERROR: while checking hashes from package/python-rpds-py//python-rpds-py.hash ERROR: rpds_py-0.16.2.tar.gz has wrong sha256 hash: ERROR: expected: 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb ERROR: got : bc62a37913de53569414f6eb4a16a005b1dd04afb473c3c27561b11614f92034 ERROR: Incomplete download, or man-in-the-middle (MITM) attack This might be the gitattributes issue that Yann has a patch series for. I'm marking this patch as Changes Requested, you can try to re-submit after Yann's series is merged. Regards, Arnout > # Locally computed sha256 checksums > sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE > diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk > index 6f71d02047..5f0d30d002 100644 > --- a/package/python-rpds-py/python-rpds-py.mk > +++ b/package/python-rpds-py/python-rpds-py.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > +PYTHON_RPDS_PY_VERSION = 0.16.2 > PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz > -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 > +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 > PYTHON_RPDS_PY_SETUP_TYPE = maturin > PYTHON_RPDS_PY_LICENSE = MIT > PYTHON_RPDS_PY_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 11:05:54 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:54 +0100 Subject: [Buildroot] [git commit] package/python-redis: bump to version 5.0.1 Message-ID: <20240205110640.5858086B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ebe576da4e79dc5c71502385f9c080cee024f08 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/redis/redis-py/commit/28cc65c18cc4fb37ef14497c963eb181dba8d25d Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-redis/Config.in | 4 ++-- package/python-redis/python-redis.hash | 6 +++--- package/python-redis/python-redis.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/python-redis/Config.in b/package/python-redis/Config.in index 4143e1f1c1..e22959cf7b 100644 --- a/package/python-redis/Config.in +++ b/package/python-redis/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_REDIS bool "python-redis" help - Python client for Redis key-value store. + Python client for Redis database and key-value store. - https://github.com/andymccurdy/redis-py + https://github.com/redis/redis-py diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index e27f87bd50..2d9df87a10 100644 --- a/package/python-redis/python-redis.hash +++ b/package/python-redis/python-redis.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/redis/json -md5 ad365234df634680d15294ddc87c42de redis-4.5.5.tar.gz -sha256 dc87a0bdef6c8bfe1ef1e1c40be7034390c2ae02d92dcd0c7ca1729443899880 redis-4.5.5.tar.gz +md5 f4bff9e3819ec832bb789b8b58363d6b redis-5.0.1.tar.gz +sha256 0dab495cd5753069d3bc650a0dde8a8f9edde16fc5691b689a566eda58100d0f redis-5.0.1.tar.gz # Locally computed sha256 checksums -sha256 7801a39e3a1aec58a7ea7c9f4dc1238cf0922c36a1fc8eff0bb7d684ff6dd354 LICENSE +sha256 a57b250a5bf03d7afe55b74063313f2adb7b00d546c0ab149a89398333fe3cc8 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index 186702dc83..067a754352 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 4.5.5 +PYTHON_REDIS_VERSION = 5.0.1 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/53/30/128c5599bc3fa61488866be0228326b3e486be34480126f70e572043adf8 +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/4a/4c/3c3b766f4ecbb3f0bec91ef342ee98d179e040c25b6ecc99e510c2570f2a PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 11:05:53 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:53 +0100 Subject: [Buildroot] [git commit] package/python-qrcode: bump to version 7.4.2 Message-ID: <20240205110640.4C1A486B6E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cfd08bd302e7d2e3585ef4d25e448abec3c8453 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new python-pypng runtime dependency. Add new python-typing-extensions runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-qrcode/Config.in | 2 ++ package/python-qrcode/python-qrcode.hash | 8 ++++---- package/python-qrcode/python-qrcode.mk | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/python-qrcode/Config.in b/package/python-qrcode/Config.in index 9a17cc1f08..6e63d83e41 100644 --- a/package/python-qrcode/Config.in +++ b/package/python-qrcode/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_QRCODE bool "python-qrcode" + select BR2_PACKAGE_PYTHON_PYPNG # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Pure python QR Code generator diff --git a/package/python-qrcode/python-qrcode.hash b/package/python-qrcode/python-qrcode.hash index 1ab84dd355..48b2d7b2b0 100644 --- a/package/python-qrcode/python-qrcode.hash +++ b/package/python-qrcode/python-qrcode.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/qrcode/json -md5 124103c685e96ba3b7a1616760f31c11 qrcode-7.3.1.tar.gz -sha256 375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578 qrcode-7.3.1.tar.gz -# Locally computed +# md5, sha256 from https://pypi.org/pypi/qrcode/json +md5 a4c47fe5ff966b105098998cfb2294de qrcode-7.4.2.tar.gz +sha256 9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b30f5845 qrcode-7.4.2.tar.gz +# Locally computed sha256 checksums sha256 40dfb903c94ee3f789500131311186548ecba5cefd3557623d7700e2522ab994 LICENSE diff --git a/package/python-qrcode/python-qrcode.mk b/package/python-qrcode/python-qrcode.mk index 23e7dd3b88..97b181a1e1 100644 --- a/package/python-qrcode/python-qrcode.mk +++ b/package/python-qrcode/python-qrcode.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_QRCODE_VERSION = 7.3.1 +PYTHON_QRCODE_VERSION = 7.4.2 PYTHON_QRCODE_SOURCE = qrcode-$(PYTHON_QRCODE_VERSION).tar.gz -PYTHON_QRCODE_SITE = https://files.pythonhosted.org/packages/94/9f/31f33cdf3cf8f98e64c42582fb82f39ca718264df61957f28b0bbb09b134 +PYTHON_QRCODE_SITE = https://files.pythonhosted.org/packages/30/35/ad6d4c5a547fe9a5baf85a9edbafff93fc6394b014fab30595877305fa59 PYTHON_QRCODE_SETUP_TYPE = setuptools PYTHON_QRCODE_LICENSE = BSD-3-Clause PYTHON_QRCODE_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 11:05:59 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:59 +0100 Subject: [Buildroot] [git commit] package/python-requests-toolbelt: bump to version 1.0.0 Message-ID: <20240205110640.85DD886B6F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f996ed3a8e8274d4acc604097909550b0a09087 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-requests-toolbelt/Config.in | 2 +- package/python-requests-toolbelt/python-requests-toolbelt.hash | 4 ++-- package/python-requests-toolbelt/python-requests-toolbelt.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-requests-toolbelt/Config.in b/package/python-requests-toolbelt/Config.in index ba2b95152e..7d5b4b65c2 100644 --- a/package/python-requests-toolbelt/Config.in +++ b/package/python-requests-toolbelt/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT help A utility belt for advanced users of python-requests. - https://toolbelt.readthedocs.org + https://toolbelt.readthedocs.io/ diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.hash b/package/python-requests-toolbelt/python-requests-toolbelt.hash index 28abf2c628..12bc58131d 100644 --- a/package/python-requests-toolbelt/python-requests-toolbelt.hash +++ b/package/python-requests-toolbelt/python-requests-toolbelt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests-toolbelt/json -md5 636d226d03632d013269aebbc85f4f4b requests-toolbelt-0.10.1.tar.gz -sha256 62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d requests-toolbelt-0.10.1.tar.gz +md5 6a8348cfc9991b44e499345db1c6f925 requests-toolbelt-1.0.0.tar.gz +sha256 7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6 requests-toolbelt-1.0.0.tar.gz # Locally computed sha256 checksums sha256 1f8cf8bdacd98ed6d36d0fec0c07f7765acebd6e81205962ab5146023b3c858d LICENSE diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.mk b/package/python-requests-toolbelt/python-requests-toolbelt.mk index 8c141e3aa9..d0bcb1bb21 100644 --- a/package/python-requests-toolbelt/python-requests-toolbelt.mk +++ b/package/python-requests-toolbelt/python-requests-toolbelt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_TOOLBELT_VERSION = 0.10.1 +PYTHON_REQUESTS_TOOLBELT_VERSION = 1.0.0 PYTHON_REQUESTS_TOOLBELT_SOURCE = requests-toolbelt-$(PYTHON_REQUESTS_TOOLBELT_VERSION).tar.gz -PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/0c/4c/07f01c6ac44f7784fa399137fbc8d0cdc1b5d35304e8c0f278ad82105b58 +PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/f3/61/d7545dafb7ac2230c70d38d31cbfe4cc64f7144dc41f6e4e4b78ecd9f5bb PYTHON_REQUESTS_TOOLBELT_SETUP_TYPE = setuptools PYTHON_REQUESTS_TOOLBELT_LICENSE = Apache-2.0 PYTHON_REQUESTS_TOOLBELT_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 11:05:56 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:56 +0100 Subject: [Buildroot] [git commit] package/python-reedsolo: bump to version 1.7.0 Message-ID: <20240205110640.631F986B70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a114e72a4716d3a19480317894d5ac46e318a5f6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License changed to Unlicense/MIT-0: https://github.com/tomerfiliba-org/reedsolomon/commit/7b97461684701cf19451db1fd348d831dc526dc2 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-reedsolo/python-reedsolo.hash | 6 +++--- package/python-reedsolo/python-reedsolo.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-reedsolo/python-reedsolo.hash b/package/python-reedsolo/python-reedsolo.hash index fdafc89f49..c1729f0aeb 100644 --- a/package/python-reedsolo/python-reedsolo.hash +++ b/package/python-reedsolo/python-reedsolo.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/reedsolo/json -md5 b67a04027a1825c63a63b6793ec660a3 reedsolo-1.6.0.tar.gz -sha256 4e290d3b0a7207ac7aac186790766c752b5fcdf5e0b04dfd260349579052bbac reedsolo-1.6.0.tar.gz +md5 5bbd7741f915ad67b6d425f93ab9d103 reedsolo-1.7.0.tar.gz +sha256 c1359f02742751afe0f1c0de9f0772cc113835aa2855d2db420ea24393c87732 reedsolo-1.7.0.tar.gz # Locally computed sha256 checksums -sha256 0babd7b573efc3dcf5bb3c28b583150726f775d3dd8d54d6cd062834735b3d73 LICENSE +sha256 2da9536c23b72bac15603bb1f8dbf269dc68ecfbc35a75f8d0aa9cb209ba0934 LICENSE diff --git a/package/python-reedsolo/python-reedsolo.mk b/package/python-reedsolo/python-reedsolo.mk index 2a7fd42a05..66e85fb40a 100644 --- a/package/python-reedsolo/python-reedsolo.mk +++ b/package/python-reedsolo/python-reedsolo.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_REEDSOLO_VERSION = 1.6.0 +PYTHON_REEDSOLO_VERSION = 1.7.0 PYTHON_REEDSOLO_SOURCE = reedsolo-$(PYTHON_REEDSOLO_VERSION).tar.gz -PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/9b/10/28d1492cc82a103bc06f18cb9a9dbb3a9168ab2e4068801fa0aa0c76b231 +PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/f7/61/a67338cbecf370d464e71b10e9a31355f909d6937c3a8d6b17dd5d5beb5e PYTHON_REEDSOLO_SETUP_TYPE = setuptools -PYTHON_REEDSOLO_LICENSE = Public Domain +PYTHON_REEDSOLO_LICENSE = MIT-0, Unlicense PYTHON_REEDSOLO_LICENSE_FILES = LICENSE $(eval $(python-package)) From arnout at mind.be Mon Feb 5 11:05:57 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:57 +0100 Subject: [Buildroot] [git commit] package/python-referencing: bump to version 0.32.1 Message-ID: <20240205110640.6E09D86B6D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=585b0bab9e263f57b0aef60502eb34b73214e8c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-referencing/python-referencing.hash | 4 ++-- package/python-referencing/python-referencing.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-referencing/python-referencing.hash b/package/python-referencing/python-referencing.hash index d4f3dce5a4..2880a47477 100644 --- a/package/python-referencing/python-referencing.hash +++ b/package/python-referencing/python-referencing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/referencing/json -md5 617d973b9ce86b6f74b2216c6f3af5c9 referencing-0.30.2.tar.gz -sha256 794ad8003c65938edcdbc027f1933215e0d0ccc0291e3ce20a4d87432b59efc0 referencing-0.30.2.tar.gz +md5 d1a0a4ae03ebba4b86b22bfb825f150b referencing-0.32.1.tar.gz +sha256 3c57da0513e9563eb7e203ebe9bb3a1b509b042016433bd1e45a2853466c3dd3 referencing-0.32.1.tar.gz # Locally computed sha256 checksums sha256 42dcd63495f87b4eb7c7757afa379bb55a53f94afd7a5f657d9adf57236e515c COPYING diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 4d11c99deb..27d1452e91 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REFERENCING_VERSION = 0.30.2 +PYTHON_REFERENCING_VERSION = 0.32.1 PYTHON_REFERENCING_SOURCE = referencing-$(PYTHON_REFERENCING_VERSION).tar.gz -PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/e1/43/d3f6cf3e1ec9003520c5fb31dc363ee488c517f09402abd2a1c90df63bbb +PYTHON_REFERENCING_SITE = https://files.pythonhosted.org/packages/81/ce/910573eca7b1a1c6358b0dc0774ce1eeb81f4c98d4ee371f1c85f22040a1 PYTHON_REFERENCING_SETUP_TYPE = pep517 PYTHON_REFERENCING_LICENSE = MIT PYTHON_REFERENCING_LICENSE_FILES = COPYING From arnout at mind.be Mon Feb 5 11:05:58 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:58 +0100 Subject: [Buildroot] [git commit] package/python-regex: bump to version 2023.12.25 Message-ID: <20240205110640.7A27C86B6E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d1fc26f04698517afa225968cdfcd4c615870fa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-regex/Config.in | 2 +- package/python-regex/python-regex.hash | 4 ++-- package/python-regex/python-regex.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-regex/Config.in b/package/python-regex/Config.in index 5f582d085a..89ead69c04 100644 --- a/package/python-regex/Config.in +++ b/package/python-regex/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PYTHON_REGEX help Alternative regular expression module, to replace re. - https://bitbucket.org/mrabarnett/mrab-regex + https://github.com/mrabarnett/mrab-regex diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index 11a5765e41..7454db99bb 100644 --- a/package/python-regex/python-regex.hash +++ b/package/python-regex/python-regex.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/regex/json -md5 a85ced10be8bfe76fed4f30c42d32d5c regex-2022.10.31.tar.gz -sha256 a3a98921da9a1bf8457aeee6a551948a83601689e5ecdd736894ea9bbec77e83 regex-2022.10.31.tar.gz +md5 3f97f0aef9bf334fe50ae5980b183e68 regex-2023.12.25.tar.gz +sha256 29171aa128da69afdf4bde412d5bedc335f2ca8fcfe4489038577d05f16181e5 regex-2023.12.25.tar.gz # Locally computed sha256 checksums sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index 81bd460ecc..6b1938bc0c 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REGEX_VERSION = 2022.10.31 +PYTHON_REGEX_VERSION = 2023.12.25 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz -PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/27/b5/92d404279fd5f4f0a17235211bb0f5ae7a0d9afb7f439086ec247441ed28 +PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/b5/39/31626e7e75b187fae7f121af3c538a991e725c744ac893cc2cfd70ce2853 PYTHON_REGEX_SETUP_TYPE = setuptools PYTHON_REGEX_LICENSE = Apache-2.0 PYTHON_REGEX_LICENSE_FILES = LICENSE.txt From arnout at mind.be Mon Feb 5 11:05:52 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:05:52 +0100 Subject: [Buildroot] [git commit] package/python-pypng: new package Message-ID: <20240205110640.42D0C86B6D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fff23fd15d6b22e5099304b7e914ee2f81c930f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + package/python-pypng/Config.in | 6 ++++++ package/python-pypng/python-pypng.hash | 5 +++++ package/python-pypng/python-pypng.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/package/Config.in b/package/Config.in index 75a94177eb..ca1368124f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1275,6 +1275,7 @@ menu "External python modules" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" source "package/python-pyphen/Config.in" + source "package/python-pypng/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" source "package/python-pyratemp/Config.in" diff --git a/package/python-pypng/Config.in b/package/python-pypng/Config.in new file mode 100644 index 0000000000..c1ed405615 --- /dev/null +++ b/package/python-pypng/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYPNG + bool "python-pypng" + help + Pure Python library for saving and loading PNG images. + + https://gitlab.com/drj11/pypng diff --git a/package/python-pypng/python-pypng.hash b/package/python-pypng/python-pypng.hash new file mode 100644 index 0000000000..0f55eef702 --- /dev/null +++ b/package/python-pypng/python-pypng.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pypng/json +md5 7d9cce86ceb19524784ade86fb13a063 pypng-0.20220715.0.tar.gz +sha256 739c433ba96f078315de54c0db975aee537cbc3e1d0ae4ed9aab0ca1e427e2c1 pypng-0.20220715.0.tar.gz +# Locally computed sha256 checksums +sha256 8dd127d87bb901ab9c8f584e98b7c7aa8539db27fe62ff01b1ee4be93b6a513a LICENCE diff --git a/package/python-pypng/python-pypng.mk b/package/python-pypng/python-pypng.mk new file mode 100644 index 0000000000..07ad16b67b --- /dev/null +++ b/package/python-pypng/python-pypng.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pypng +# +################################################################################ + +PYTHON_PYPNG_VERSION = 0.20220715.0 +PYTHON_PYPNG_SOURCE = pypng-$(PYTHON_PYPNG_VERSION).tar.gz +PYTHON_PYPNG_SITE = https://files.pythonhosted.org/packages/93/cd/112f092ec27cca83e0516de0a3368dbd9128c187fb6b52aaaa7cde39c96d +PYTHON_PYPNG_SETUP_TYPE = setuptools +PYTHON_PYPNG_LICENSE = MIT +PYTHON_PYPNG_LICENSE_FILES = LICENCE + +$(eval $(python-package)) From peter at korsgaard.com Mon Feb 5 11:06:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:06:49 +0100 Subject: [Buildroot] [git commit] package/uboot-tools: install host-fit_check_sign Message-ID: <20240205110801.3DC8E86B74@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4c8ba31a722affbbfade9e5c9411ef0bc7b461bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master fit_check_sign is a tool for verifying fit image signatures, which gets built if host-uboot-tools is built with fit signature support. Install it if so. Signed-off-by: Woodrow Douglass [Peter: reword commit message] Signed-off-by: Peter Korsgaard --- package/uboot-tools/uboot-tools.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index d884a010fb..12e10dea91 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -130,6 +130,9 @@ endif ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y) HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000 HOST_UBOOT_TOOLS_DEPENDENCIES += host-openssl +define HOST_UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN + $(INSTALL) -m 0755 -D $(@D)/tools/fit_check_sign $(HOST_DIR)/bin/fit_check_sign +endef endif ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE),y) @@ -215,6 +218,7 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkeficapsule $(HOST_DIR)/bin/mkeficapsule $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage + $(HOST_UBOOT_TOOLS_INSTALL_FIT_CHECK_SIGN) $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(HOST_DIR)/bin/fw_printenv ln -sf $(HOST_DIR)/bin/fw_printenv $(HOST_DIR)/bin/fw_setenv $(HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE) From yann.morin.1998 at free.fr Mon Feb 5 11:10:03 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 12:10:03 +0100 Subject: [Buildroot] [git commit] support/testing: micropython: add micropython-lib test Message-ID: <20240205111025.246EB86B8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=094fb84320ab99ab508879b4f1230ea81bf00da8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 8f403f0 "package/micropython-lib: merge with, and install as part of micropython" brought micropython library within the package. This commit improves the micropython runtime test by enabling the micropython-lib and by also adding a runtime test using one of its module. We choose to use the gzip module, and check whther decodign q simple gziped file works; the micropython-lib gzip can only decompress, so we need to prepare it from the shell. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_micropython.py | 13 ++++++++++++- .../package/test_micropython/rootfs-overlay/root/zcat.py | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_micropython.py b/support/testing/tests/package/test_micropython.py index 0ecd4790bd..371deb2978 100644 --- a/support/testing/tests/package/test_micropython.py +++ b/support/testing/tests/package/test_micropython.py @@ -7,6 +7,7 @@ class TestMicroPython(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ f""" BR2_PACKAGE_MICROPYTHON=y + BR2_PACKAGE_MICROPYTHON_LIB=y BR2_ROOTFS_OVERLAY="{infra.filepath("tests/package/test_micropython/rootfs-overlay")}" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set @@ -64,5 +65,15 @@ class TestMicroPython(infra.basetest.BRTest): output = self.run_upy_code(py_code) self.assertEqual(output[0], expected_output) - # Finally, Check a small script can execute. + # Check a small script can execute. self.assertRunOk("/root/mandel.py", timeout=10) + + # Check we can use a micropython-lib module. + msg = "Hello Buildroot!" + filename = "file.txt" + gz_filename = f"{filename}.gz" + self.assertRunOk(f"echo '{msg}' > {filename}") + self.assertRunOk(f"gzip {filename}") + out, ret = self.emulator.run(f"/root/zcat.py {gz_filename}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) diff --git a/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py new file mode 100755 index 0000000000..3b8c60bdd1 --- /dev/null +++ b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py @@ -0,0 +1,15 @@ +#! /usr/bin/env micropython + +import gzip +import sys + + +def main(fname): + with open(fname, "rb") as f: + with gzip.GzipFile(fileobj=f) as g: + s = g.read() + print(s.decode("UTF-8"), end="") + + +if __name__ == "__main__": + main(sys.argv[1]) From thomas.petazzoni at bootlin.com Mon Feb 5 11:13:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:13:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: drop libnl dependency In-Reply-To: <20240128215205.3690716-1-fontaine.fabrice@gmail.com> References: <20240128215205.3690716-1-fontaine.fabrice@gmail.com> Message-ID: <20240205121309.20362244@windsurf> On Sun, 28 Jan 2024 22:52:05 +0100 Fabrice Fontaine wrote: > libnl is not needed to build frr since the addition of the package in > commit 26d82d006ba15777d19892b327bde343d82a9ff5 > > No mention of libnl found in https://github.com/FRRouting/frr or > https://docs.frrouting.org/projects/dev-guide/en/latest/building.html > > Signed-off-by: Fabrice Fontaine > --- > package/frr/Config.in | 1 - > package/frr/frr.mk | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 11:13:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:13:17 +0100 Subject: [Buildroot] [git commit] package/frr: drop libnl dependency Message-ID: <20240205111326.9FAA27F98A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efa955ac415e2b50f63710e4fc1de8fd3e0dc099 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libnl is not needed to build frr since the addition of the package in commit 26d82d006ba15777d19892b327bde343d82a9ff5 No mention of libnl found in https://github.com/FRRouting/frr or https://docs.frrouting.org/projects/dev-guide/en/latest/building.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/frr/Config.in | 1 - package/frr/frr.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/frr/Config.in b/package/frr/Config.in index c2e9577a27..f6c058e6df 100644 --- a/package/frr/Config.in +++ b/package/frr/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_FRR select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_LIBYANG - select BR2_PACKAGE_LIBNL select BR2_PACKAGE_READLINE select BR2_PACKAGE_JSON_C help diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 19f346fd7b..a4b4bccaf9 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -12,7 +12,7 @@ FRR_CPE_ID_VENDOR = linuxfoundation FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES -FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ +FRR_DEPENDENCIES = host-frr readline json-c libyang \ $(if $(BR2_PACKAGE_C_ARES),c-ares) HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 From peter at korsgaard.com Mon Feb 5 11:14:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:14:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-tabledata: bump to version 1.3.3 In-Reply-To: <20240111073226.3084555-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:32:26 -0700") References: <20240111073226.3084555-1-james.hilliard1@gmail.com> Message-ID: <87wmrjupqr.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:15:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:15:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-starlette: bump to version 0.34.0 In-Reply-To: <20240111072922.3082638-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:29:22 -0700") References: <20240111072922.3082638-1-james.hilliard1@gmail.com> Message-ID: <87sf27upph.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:16:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:16:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-stack-data: bump to version 0.6.3 In-Reply-To: <20240111072601.3080032-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:26:01 -0700") References: <20240111072601.3080032-1-james.hilliard1@gmail.com> Message-ID: <87o7cvupnt.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:17:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:17:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-socketio: bump to version 5.11.0 In-Reply-To: <20240111070910.3068587-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:09:10 -0700") References: <20240111070910.3068587-1-james.hilliard1@gmail.com> Message-ID: <87jznjupmu.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:17:25 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:17:25 +0100 Subject: [Buildroot] [git commit] package/python-socketio: bump to version 5.11.0 Message-ID: <20240205111738.2FC7786BB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85c5071bfea948fabbac6c3e81103c7979fa6646 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-socketio/python-socketio.hash | 4 ++-- package/python-socketio/python-socketio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-socketio/python-socketio.hash b/package/python-socketio/python-socketio.hash index abdcc3a5b7..a7756eb39d 100644 --- a/package/python-socketio/python-socketio.hash +++ b/package/python-socketio/python-socketio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-socketio/json -md5 e63369252a9d383cbfc503337b864733 python-socketio-5.7.2.tar.gz -sha256 92395062d9db3c13d30e7cdedaa0e1330bba78505645db695415f9a3c628d097 python-socketio-5.7.2.tar.gz +md5 207c7452bf6f1f444d8b70cac8801647 python-socketio-5.11.0.tar.gz +sha256 b03186e04b942088781f6286c13604a853e5e35ed59158c51ff7af22fa032e6f python-socketio-5.11.0.tar.gz # Locally computed sha256 checksums sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/package/python-socketio/python-socketio.mk b/package/python-socketio/python-socketio.mk index aecff55ef4..dc0c24fef5 100644 --- a/package/python-socketio/python-socketio.mk +++ b/package/python-socketio/python-socketio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_SOCKETIO_VERSION = 5.7.2 -PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/ee/56/294629986bf6cea96e0edb3933a7f2fac7a079d12909e893903a2effc670 +PYTHON_SOCKETIO_VERSION = 5.11.0 +PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/7a/e1/2817819a5635a099fda9fc758c51dc2f07996d6928d744639afcf5c5ddbb PYTHON_SOCKETIO_SETUP_TYPE = setuptools PYTHON_SOCKETIO_LICENSE = MIT PYTHON_SOCKETIO_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 11:17:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:17:24 +0100 Subject: [Buildroot] [git commit] package/python-stack-data: bump to version 0.6.3 Message-ID: <20240205111738.1F14586BBB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9eb7860257442d7ab98ec7a417a7fb8d99fe797a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-stack-data/python-stack-data.hash | 4 ++-- package/python-stack-data/python-stack-data.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-stack-data/python-stack-data.hash b/package/python-stack-data/python-stack-data.hash index 6decd3ca8e..b155a77c81 100644 --- a/package/python-stack-data/python-stack-data.hash +++ b/package/python-stack-data/python-stack-data.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/stack_data/json -md5 bf86c3c81a0158e1e7f3979da5a0033b stack_data-0.6.2.tar.gz -sha256 32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815 stack_data-0.6.2.tar.gz +md5 d04f7cda6589138e90691aec1edbf0d5 stack_data-0.6.3.tar.gz +sha256 836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9 stack_data-0.6.3.tar.gz # Locally computed sha256 checksums sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-stack-data/python-stack-data.mk b/package/python-stack-data/python-stack-data.mk index 1a85938311..7c38d2c4eb 100644 --- a/package/python-stack-data/python-stack-data.mk +++ b/package/python-stack-data/python-stack-data.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_STACK_DATA_VERSION = 0.6.2 +PYTHON_STACK_DATA_VERSION = 0.6.3 PYTHON_STACK_DATA_SOURCE = stack_data-$(PYTHON_STACK_DATA_VERSION).tar.gz -PYTHON_STACK_DATA_SITE = https://files.pythonhosted.org/packages/db/18/aa7f2b111aeba2cd83503254d9133a912d7f61f459a0c8561858f0d72a56 +PYTHON_STACK_DATA_SITE = https://files.pythonhosted.org/packages/28/e3/55dcc2cfbc3ca9c29519eb6884dd1415ecb53b0e934862d3559ddcb7e20b PYTHON_STACK_DATA_SETUP_TYPE = pep517 PYTHON_STACK_DATA_LICENSE = MIT PYTHON_STACK_DATA_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 5 11:17:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:17:23 +0100 Subject: [Buildroot] [git commit] package/python-starlette: bump to version 0.34.0 Message-ID: <20240205111738.0FC3D86BBA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8928608c19048ac140cfc5e5f0e84d50d5d590d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-starlette/python-starlette.hash | 4 ++-- package/python-starlette/python-starlette.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash index a7f1f66446..820026b70b 100644 --- a/package/python-starlette/python-starlette.hash +++ b/package/python-starlette/python-starlette.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/starlette/json -md5 5193c4b7d2ea4c93635c340a7ba9b54f starlette-0.27.0.tar.gz -sha256 6a6b0d042acb8d469a01eba54e9cda6cbd24ac602c4cd016723117d6a7e73b75 starlette-0.27.0.tar.gz +md5 2ef2fc635691fd4a1823564218292dce starlette-0.34.0.tar.gz +sha256 ed050aaf3896945bfaae93bdf337e53ef3f29115a9d9c153e402985115cd9c8e starlette-0.34.0.tar.gz # Locally computed sha256 checksums sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk index b04b95a797..07f9d6be5e 100644 --- a/package/python-starlette/python-starlette.mk +++ b/package/python-starlette/python-starlette.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_STARLETTE_VERSION = 0.27.0 +PYTHON_STARLETTE_VERSION = 0.34.0 PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/06/68/559bed5484e746f1ab2ebbe22312f2c25ec62e4b534916d41a8c21147bf8 +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/4f/36/168ba6d56a28382f3b081b23b0cc431de35786e120b94c1f372708ed3059 PYTHON_STARLETTE_SETUP_TYPE = pep517 PYTHON_STARLETTE_LICENSE = BSD-3-Clause PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md From peter at korsgaard.com Mon Feb 5 11:17:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:17:23 +0100 Subject: [Buildroot] [git commit] package/python-tabledata: bump to version 1.3.3 Message-ID: <20240205111737.F0D9986BB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=83763e58de2393eac2db52af3f5ea825bf77f88f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-tabledata/Config.in | 2 -- package/python-tabledata/python-tabledata.hash | 4 ++-- package/python-tabledata/python-tabledata.mk | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/python-tabledata/Config.in b/package/python-tabledata/Config.in index 9947f41af6..3ee3057a39 100644 --- a/package/python-tabledata/Config.in +++ b/package/python-tabledata/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_TABLEDATA bool "python-tabledata" select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help A Python library to represent tabular data for diff --git a/package/python-tabledata/python-tabledata.hash b/package/python-tabledata/python-tabledata.hash index 3613589ae0..19fd4ea9c5 100644 --- a/package/python-tabledata/python-tabledata.hash +++ b/package/python-tabledata/python-tabledata.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tabledata/json -md5 1874cb0bf69cbc824a7bec67431023a9 tabledata-1.3.0.tar.gz -sha256 54541b0c9e58f8fa38251ea0a60965dbaf95737027fa80e6ab56f98d7e4d61e9 tabledata-1.3.0.tar.gz +md5 579c4e7454a837d252d4977b73556aae tabledata-1.3.3.tar.gz +sha256 c90daaba9a408e4397934b3ff2f6c06797d5289676420bf520c741ad43e6ff91 tabledata-1.3.3.tar.gz # Locally computed sha256 checksums sha256 bebbdf0524a147f89a615fff53d79bdc90cbc7631550fb4b725cd3f3bdcd24f6 LICENSE diff --git a/package/python-tabledata/python-tabledata.mk b/package/python-tabledata/python-tabledata.mk index 48f544b115..43e22d45d1 100644 --- a/package/python-tabledata/python-tabledata.mk +++ b/package/python-tabledata/python-tabledata.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TABLEDATA_VERSION = 1.3.0 +PYTHON_TABLEDATA_VERSION = 1.3.3 PYTHON_TABLEDATA_SOURCE = tabledata-$(PYTHON_TABLEDATA_VERSION).tar.gz -PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/ed/ed/dd0d6975963967492ac2c230107587593c7bd94acfa802b0c60a5395125c +PYTHON_TABLEDATA_SITE = https://files.pythonhosted.org/packages/48/6a/7f78fbf883f325b70ba9ce5c10d97652f5c371e224940097c2cea9d0f456 PYTHON_TABLEDATA_SETUP_TYPE = setuptools PYTHON_TABLEDATA_LICENSE = MIT PYTHON_TABLEDATA_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 5 11:18:26 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 12:18:26 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: micropython: add micropython-lib test In-Reply-To: <20240204093148.11282-1-ju.o@free.fr> References: <20240204093148.11282-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-04 10:31 +0100, Julien Olivain spake thusly: > Commit 8f403f0 "package/micropython-lib: merge with, and install > as part of micropython" brought micropython library within the > package. > > This commit improves the micropython runtime test by enabling the > micropython-lib and by also adding a runtime test using one of its > module. I added a little blurb explaining why we can't use the gzip module itself to generate the compressed file. > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/testing/tests/package/test_micropython.py | 13 ++++++++++++- > .../test_micropython/rootfs-overlay/root/zcat.py | 15 +++++++++++++++ > 2 files changed, 27 insertions(+), 1 deletion(-) > create mode 100755 support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py > > diff --git a/support/testing/tests/package/test_micropython.py b/support/testing/tests/package/test_micropython.py > index 0ecd4790bd..371deb2978 100644 > --- a/support/testing/tests/package/test_micropython.py > +++ b/support/testing/tests/package/test_micropython.py > @@ -7,6 +7,7 @@ class TestMicroPython(infra.basetest.BRTest): > config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > f""" > BR2_PACKAGE_MICROPYTHON=y > + BR2_PACKAGE_MICROPYTHON_LIB=y > BR2_ROOTFS_OVERLAY="{infra.filepath("tests/package/test_micropython/rootfs-overlay")}" > BR2_TARGET_ROOTFS_CPIO=y > # BR2_TARGET_ROOTFS_TAR is not set > @@ -64,5 +65,15 @@ class TestMicroPython(infra.basetest.BRTest): > output = self.run_upy_code(py_code) > self.assertEqual(output[0], expected_output) > > - # Finally, Check a small script can execute. > + # Check a small script can execute. > self.assertRunOk("/root/mandel.py", timeout=10) > + > + # Check we can use a micropython-lib module. > + msg = "Hello Buildroot!" > + filename = "file.txt" > + gz_filename = f"{filename}.gz" > + self.assertRunOk(f"echo '{msg}' > {filename}") > + self.assertRunOk(f"gzip {filename}") > + out, ret = self.emulator.run(f"/root/zcat.py {gz_filename}") > + self.assertEqual(ret, 0) > + self.assertEqual(out[0], msg) > diff --git a/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py > new file mode 100755 > index 0000000000..3b8c60bdd1 > --- /dev/null > +++ b/support/testing/tests/package/test_micropython/rootfs-overlay/root/zcat.py > @@ -0,0 +1,15 @@ > +#! /usr/bin/env micropython > + > +import gzip > +import sys > + > + > +def main(fname): > + with open(fname, "rb") as f: > + with gzip.GzipFile(fileobj=f) as g: > + s = g.read() > + print(s.decode("UTF-8"), end="") > + > + > +if __name__ == "__main__": > + main(sys.argv[1]) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Mon Feb 5 11:25:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:25:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-simplesqlite: bump to version 1.5.2 In-Reply-To: <20240111065524.3060233-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 23:55:24 -0700") References: <20240111065524.3060233-1-james.hilliard1@gmail.com> Message-ID: <87fry7up8x.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Drop no longer required python-setuptools runtime dependency. > Drop no longer required python-six runtime dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:17:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:17:36 +0100 Subject: [Buildroot] [git commit] package/python-simplesqlite: bump to version 1.5.2 Message-ID: <20240205112551.B026B86BC0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0a4e392daccac896f3bf07b971377fde56ec484 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required python-setuptools runtime dependency. Drop no longer required python-six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-simplesqlite/Config.in | 2 -- package/python-simplesqlite/python-simplesqlite.hash | 4 ++-- package/python-simplesqlite/python-simplesqlite.mk | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/python-simplesqlite/Config.in b/package/python-simplesqlite/Config.in index 81501c9e83..d650439dce 100644 --- a/package/python-simplesqlite/Config.in +++ b/package/python-simplesqlite/Config.in @@ -3,8 +3,6 @@ config BR2_PACKAGE_PYTHON_SIMPLESQLITE select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_SQLITESCHEMA # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime diff --git a/package/python-simplesqlite/python-simplesqlite.hash b/package/python-simplesqlite/python-simplesqlite.hash index 06edbfab3d..8060437718 100644 --- a/package/python-simplesqlite/python-simplesqlite.hash +++ b/package/python-simplesqlite/python-simplesqlite.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplesqlite/json -md5 11f2ef73243fb0d677ed00d22f1441b2 SimpleSQLite-1.3.0.tar.gz -sha256 f7e862bec5982059e665cc73b6fdb4c8340a1f565ba3497387c3c48f10d43bf8 SimpleSQLite-1.3.0.tar.gz +md5 a907352592539345bf8145c3e39015cb SimpleSQLite-1.5.2.tar.gz +sha256 f9a25b9e43d7aa28f551d170a42cfae10139c5c81a1bcb8776f857816ef5ae0f SimpleSQLite-1.5.2.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-simplesqlite/python-simplesqlite.mk b/package/python-simplesqlite/python-simplesqlite.mk index ea60cefc16..d8efe23a6c 100644 --- a/package/python-simplesqlite/python-simplesqlite.mk +++ b/package/python-simplesqlite/python-simplesqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLESQLITE_VERSION = 1.3.0 +PYTHON_SIMPLESQLITE_VERSION = 1.5.2 PYTHON_SIMPLESQLITE_SOURCE = SimpleSQLite-$(PYTHON_SIMPLESQLITE_VERSION).tar.gz -PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/a0/2c/39a9e7dc4af46d101f48753086c686982790ecc2bdf5e9fa88f85f027e7a +PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/c8/07/92e3291fda6f1bbf6e7ff4721d87566e1615572d9c205ef64398c5d22efe PYTHON_SIMPLESQLITE_SETUP_TYPE = setuptools PYTHON_SIMPLESQLITE_LICENSE = MIT PYTHON_SIMPLESQLITE_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 11:28:59 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 12:28:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rtoml: bump to version 0.10.0 In-Reply-To: <20240111052225.2922249-1-james.hilliard1@gmail.com> References: <20240111052225.2922249-1-james.hilliard1@gmail.com> Message-ID: <687fa6af-4d6f-4890-bd3a-c420ede9cdfd@mind.be> On 11/01/2024 06:22, James Hilliard wrote: > Migrate from setuptools-rust to maturin infrastructure. > > Signed-off-by: James Hilliard > --- > package/python-rtoml/python-rtoml.hash | 2 +- > package/python-rtoml/python-rtoml.mk | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash > index 04d22ed1a4..59f17d9d62 100644 > --- a/package/python-rtoml/python-rtoml.hash > +++ b/package/python-rtoml/python-rtoml.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz > +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz Same problem: ERROR: while checking hashes from package/python-rtoml//python-rtoml.hash ERROR: rtoml-0.10.0.tar.gz has wrong sha256 hash: ERROR: expected: 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 ERROR: got : 624cc1ff2b3fdea42aeee3a4d1537d37431ec001870dfee1e04a12bd3076a2d3 Regards, Arnout > # Locally computed sha256 checksums > sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE > diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk > index 819dcf3288..16f9dea573 100644 > --- a/package/python-rtoml/python-rtoml.mk > +++ b/package/python-rtoml/python-rtoml.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PYTHON_RTOML_VERSION = 0.8.0 > +PYTHON_RTOML_VERSION = 0.10.0 > PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz > -PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 > -PYTHON_RTOML_SETUP_TYPE = setuptools-rust > +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/ca/b2/0e77a00e75ed582ec1c4c3a9e1eeed886a15c195bcce87b7daf1171c4115 > +PYTHON_RTOML_SETUP_TYPE = maturin > PYTHON_RTOML_LICENSE = MIT > PYTHON_RTOML_LICENSE_FILES = LICENSE > From peter at korsgaard.com Mon Feb 5 11:33:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:33:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-segno: bump to version 1.6.0 In-Reply-To: <20240111055229.3019251-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:52:29 -0700") References: <20240111055229.3019251-1-james.hilliard1@gmail.com> Message-ID: <87bk8vuov0.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > License hash changed due to formatting change: > https://github.com/heuer/segno/commit/5f61bc42535b836c30015a0cef5db1e52ef8ac67 > Drop no longer required python-setuptools runtime dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:32:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:32:03 +0100 Subject: [Buildroot] [git commit] package/python-segno: bump to version 1.6.0 Message-ID: <20240205113409.5472186BE3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=081162580f99d1a68133f7f513bf2cd6d1b8b6b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to formatting change: https://github.com/heuer/segno/commit/5f61bc42535b836c30015a0cef5db1e52ef8ac67 Drop no longer required python-setuptools runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-segno/Config.in | 3 +-- package/python-segno/python-segno.hash | 6 +++--- package/python-segno/python-segno.mk | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/python-segno/Config.in b/package/python-segno/Config.in index 3957cd79bf..7107e67443 100644 --- a/package/python-segno/Config.in +++ b/package/python-segno/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_SEGNO bool "python-segno" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help - QR Code and Micro QR Code generator for Python 2 and Python 3 + QR Code and Micro QR Code generator for Python. https://github.com/heuer/segno/ diff --git a/package/python-segno/python-segno.hash b/package/python-segno/python-segno.hash index 286bdf3615..58142c184f 100644 --- a/package/python-segno/python-segno.hash +++ b/package/python-segno/python-segno.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/segno/json -md5 6d7c852f951501cd3af85ef061d6bee4 segno-1.5.2.tar.gz -sha256 983424b296e62189d70fc73460cd946cf56dcbe82b9bda18c066fc1b24371cdc segno-1.5.2.tar.gz +md5 b80c19075a7a07cce50b054e9e221cf7 segno-1.6.0.tar.gz +sha256 8d3b11098ac6dd93161499544dedbfb187d4459088109b8855ff0bbe98105047 segno-1.6.0.tar.gz # Locally computed sha256 checksums -sha256 98b0a86ca0cbf68c95051741bc983425a43fdece775fe0e2712e66be459cc9d1 LICENSE +sha256 3af9b2f15c736a571978760b2d60598502c205eb6daebe2ec36f0272c380ed28 LICENSE diff --git a/package/python-segno/python-segno.mk b/package/python-segno/python-segno.mk index c832f38f4b..2c230ee26b 100644 --- a/package/python-segno/python-segno.mk +++ b/package/python-segno/python-segno.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SEGNO_VERSION = 1.5.2 +PYTHON_SEGNO_VERSION = 1.6.0 PYTHON_SEGNO_SOURCE = segno-$(PYTHON_SEGNO_VERSION).tar.gz -PYTHON_SEGNO_SITE = https://files.pythonhosted.org/packages/90/2a/2fedf1023f9273d8326362df7936748ebadef92ba53ab7970d9b8df1a6c2 +PYTHON_SEGNO_SITE = https://files.pythonhosted.org/packages/51/a8/960844fec8d853a4e8e91f64bdde323ea5a2a44357eca799e7f7f7bf2f1e PYTHON_SEGNO_SETUP_TYPE = setuptools PYTHON_SEGNO_LICENSE = BSD-3-Clause PYTHON_SEGNO_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 11:34:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:34:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-segno: bump to version 1.6.0 In-Reply-To: <20240111055229.3019251-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:52:29 -0700") References: <20240111055229.3019251-1-james.hilliard1@gmail.com> Message-ID: <877cjjuotl.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > License hash changed due to formatting change: > https://github.com/heuer/segno/commit/5f61bc42535b836c30015a0cef5db1e52ef8ac67 > Drop no longer required python-setuptools runtime dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:34:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:34:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-scipy: bump to version 1.11.4 In-Reply-To: <20240111054740.3015662-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:47:40 -0700") References: <20240111054740.3015662-1-james.hilliard1@gmail.com> Message-ID: <8734u7uotc.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:35:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:35:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-schedule: bump to version 1.2.1 In-Reply-To: <20240111053716.2931403-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:37:16 -0700") References: <20240111053716.2931403-1-james.hilliard1@gmail.com> Message-ID: <87y1bzta85.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 5 11:35:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:35:21 +0100 Subject: [Buildroot] [git commit] package/libxml-parser-perl: bump to version 2.47 Message-ID: <20240205113531.8882886BEA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7fd6473a2b8c4ca274bd8a3b53e55d6af5242f9a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The license file 'README' has changed due to the following diff: - $p3->parse($foo, ProtocolEncoding => 'ISO-8859-1'); - close($foo); + $p3->parse($fh, ProtocolEncoding => 'ISO-8859-1'); + close($fh); This does not affect the licensing terms. A 'LICENSE' file was added in 2.47, but it contains the terms of the wrong license (Artistic 2.0), while this package is under Artistic or GPL-1.0+. This has been reported upstream at https://github.com/cpan-authors/XML-Parser/pull/99. Signed-off-by: Kevin Cui Signed-off-by: Thomas Petazzoni --- package/libxml-parser-perl/libxml-parser-perl.hash | 4 ++-- package/libxml-parser-perl/libxml-parser-perl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml-parser-perl/libxml-parser-perl.hash b/package/libxml-parser-perl/libxml-parser-perl.hash index c3ef1016e8..4b91386573 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.hash +++ b/package/libxml-parser-perl/libxml-parser-perl.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d XML-Parser-2.46.tar.gz -sha256 6a2e768443ed00f09d3d4bc4dd14451035eac13c6864d68d8e2f76edf5a044f2 README +sha256 ad4aae643ec784f489b956abe952432871a622d4e2b5c619e8855accbfc4d1d8 XML-Parser-2.47.tar.gz +sha256 3bedfe79fbad08a2b50e1b2b6123e40c68b58b1988d53763b63b6fd295bb0f90 README diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk index 37cef2e418..06bbd3b1ad 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.mk +++ b/package/libxml-parser-perl/libxml-parser-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXML_PARSER_PERL_VERSION = 2.46 +LIBXML_PARSER_PERL_VERSION = 2.47 LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz LIBXML_PARSER_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat From peter at korsgaard.com Mon Feb 5 11:35:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:35:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-s3transfer: bump to version 0.10.0 In-Reply-To: <20240111053548.2930141-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:35:48 -0700") References: <20240111053548.2930141-1-james.hilliard1@gmail.com> Message-ID: <87ttmnta76.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 5 11:36:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 12:36:50 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/libxml-parser-perl: bump to version 2.47 In-Reply-To: <20240129034403.10232-2-bh@bugs.cc> References: <87ede3236l.fsf@48ers.dk> <20240129034403.10232-2-bh@bugs.cc> Message-ID: <20240205123650.23b78a48@windsurf> On Mon, 29 Jan 2024 11:44:04 +0800 Kevin Cui wrote: > Signed-off-by: Kevin Cui > > --- > Changes for v2: > - use real name in "From" and "Signed-off-by" > --- > package/libxml-parser-perl/libxml-parser-perl.hash | 4 ++-- > package/libxml-parser-perl/libxml-parser-perl.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Thanks for your patch! You forgot to explain in the commit log why the README file hash changed. It's important to look into this and provide explanation in the commit log, as it's the very reason why we have those hashes in the first place: to detect license changes and account for them. And it turns out that a separate LICENSE file got added in 2.47. But (!) this new license file is wrong: it doesn't contain the right license text. This was already seen by Debian, and reported upstream: https://github.com/cpan-authors/XML-Parser/pull/99. So I expanded significantly the commit log to explain all of this. See the final commit at https://gitlab.com/buildroot.org/buildroot/-/commit/7fd6473a2b8c4ca274bd8a3b53e55d6af5242f9a. Thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 11:36:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:36:04 +0100 Subject: [Buildroot] [git commit] package/python-scipy: bump to version 1.11.4 Message-ID: <20240205113720.BBE6F86C04@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac774255e87a934f43f8048f7dd9a9d82de79cd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-scipy/python-scipy.hash | 6 ++++-- package/python-scipy/python-scipy.mk | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash index 9634771139..bee5d698a0 100644 --- a/package/python-scipy/python-scipy.hash +++ b/package/python-scipy/python-scipy.hash @@ -1,5 +1,7 @@ -# Locally generated -sha256 f9b0248cb9d08eead44cde47cbf6339f1e9aa0dfde28f5fb27950743e317bd5d scipy-1.11.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/scipy/json +md5 0e8eea0f7c4fe7d8102366230c96d66d scipy-1.11.4.tar.gz +sha256 90a2b78e7f5733b9de748f589f09225013685f9b218275257f8a8168ededaeaa scipy-1.11.4.tar.gz +# Locally computed sha256 checksums sha256 5517022426a56179540ee6eace15fd723ef8fdb83b2900fed2152dd2e2f972a2 LICENSE.txt sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk index 3010cfbd54..6626826e33 100644 --- a/package/python-scipy/python-scipy.mk +++ b/package/python-scipy/python-scipy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCIPY_VERSION = 1.11.0 +PYTHON_SCIPY_VERSION = 1.11.4 PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.gz -PYTHON_SCIPY_SITE = https://files.pythonhosted.org/packages/fa/d0/724c8204f87b6f807e3e67de32b8b4922d579154a448ce94e89129064bf1 +PYTHON_SCIPY_SITE = https://files.pythonhosted.org/packages/6e/1f/91144ba78dccea567a6466262922786ffc97be1e9b06ed9574ef0edc11e1 PYTHON_SCIPY_LICENSE = \ BSD-3-Clause, \ BSD-2-Clause, \ From peter at korsgaard.com Mon Feb 5 11:36:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:36:05 +0100 Subject: [Buildroot] [git commit] package/python-schedule: bump to version 1.2.1 Message-ID: <20240205113720.C550E86C05@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=435f71ad2ef340b0e89a77702c1e273bb4dad1a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-schedule/python-schedule.hash | 4 ++-- package/python-schedule/python-schedule.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-schedule/python-schedule.hash b/package/python-schedule/python-schedule.hash index 3d67be0f5e..59c84c2002 100644 --- a/package/python-schedule/python-schedule.hash +++ b/package/python-schedule/python-schedule.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/schedule/json -md5 9bf7544e37824e450457187633a17b17 schedule-1.1.0.tar.gz -sha256 e6ca13585e62c810e13a08682e0a6a8ad245372e376ba2b8679294f377dfc8e4 schedule-1.1.0.tar.gz +md5 ecb436a797e1a149bac4643330b268ca schedule-1.2.1.tar.gz +sha256 843bc0538b99c93f02b8b50e3e39886c06f2d003b24f48e1aa4cadfa3f341279 schedule-1.2.1.tar.gz # Locally computed sha256 checksums sha256 30a8352c318ce1b645acde0299697342d4380ed2637d7ca18a8ad25661e3b41b LICENSE.txt diff --git a/package/python-schedule/python-schedule.mk b/package/python-schedule/python-schedule.mk index fc6081cf22..11be2e49d4 100644 --- a/package/python-schedule/python-schedule.mk +++ b/package/python-schedule/python-schedule.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCHEDULE_VERSION = 1.1.0 +PYTHON_SCHEDULE_VERSION = 1.2.1 PYTHON_SCHEDULE_SOURCE = schedule-$(PYTHON_SCHEDULE_VERSION).tar.gz -PYTHON_SCHEDULE_SITE = https://files.pythonhosted.org/packages/a8/b5/a291a4c0faa491fd5baefa6d89011ece581cff47b23c0a39b42a63383358 +PYTHON_SCHEDULE_SITE = https://files.pythonhosted.org/packages/29/22/9dd374cbf76a42ece1f1f41cc8f4957f0ad512577372527cd3dd52758241 PYTHON_SCHEDULE_SETUP_TYPE = setuptools PYTHON_SCHEDULE_LICENSE = MIT PYTHON_SCHEDULE_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 5 11:36:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:36:05 +0100 Subject: [Buildroot] [git commit] package/python-s3transfer: bump to version 0.10.0 Message-ID: <20240205113720.D032886C06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63c571096ffbf484ead8d0fc7d8c3b222853e8c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-s3transfer/python-s3transfer.hash | 5 +++-- package/python-s3transfer/python-s3transfer.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-s3transfer/python-s3transfer.hash b/package/python-s3transfer/python-s3transfer.hash index 16f0face72..48be6b3a8b 100644 --- a/package/python-s3transfer/python-s3transfer.hash +++ b/package/python-s3transfer/python-s3transfer.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/s3transfer/json -sha256 2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947 s3transfer-0.6.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/s3transfer/json +md5 ba84e7c06bc1dcd3151c3d2132621cfc s3transfer-0.10.0.tar.gz +sha256 d0c8bbf672d5eebbe4e57945e23b972d963f07d82f661cabf678a5c88831595b s3transfer-0.10.0.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/python-s3transfer/python-s3transfer.mk b/package/python-s3transfer/python-s3transfer.mk index 60a72da729..6fae824862 100644 --- a/package/python-s3transfer/python-s3transfer.mk +++ b/package/python-s3transfer/python-s3transfer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_S3TRANSFER_VERSION = 0.6.0 +PYTHON_S3TRANSFER_VERSION = 0.10.0 PYTHON_S3TRANSFER_SOURCE = s3transfer-$(PYTHON_S3TRANSFER_VERSION).tar.gz -PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/e1/eb/e57c93d5cd5edf8c1d124c831ef916601540db70acd96fa21fe60cef1365 +PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/a0/b5/4c570b08cb85fdcc65037b5229e00412583bb38d974efecb7ec3495f40ba PYTHON_S3TRANSFER_SETUP_TYPE = setuptools PYTHON_S3TRANSFER_LICENSE = Apache-2.0 PYTHON_S3TRANSFER_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 5 11:39:26 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:39:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <20240111053157.2928259-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:31:57 -0700") References: <20240111053157.2928259-1-james.hilliard1@gmail.com> Message-ID: <87plxbta1d.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > License hash changed due to year update: > https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ > Signed-off-by: James Hilliard > --- > package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- > package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash > index 29852a51ed..7b5dc1e29a 100644 > --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/rfc3987/json > -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz > -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz > +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz > +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 ruamel.yaml-0.18.5.tar.gz Hmm, I get a different hash: ruamel.yaml-0.18.5.tar.gz: OK (md5: 24fac3544a3c7bd7eeaf6e4f704a056e) ERROR: while checking hashes from package/python-ruamel-yaml//python-ruamel-yaml.hash ERROR: ruamel.yaml-0.18.5.tar.gz has wrong sha256 hash: ERROR: expected: ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 ERROR: got : 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ERROR: Incomplete download, or man-in-the-middle (MITM) attack Any ideas? -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Mon Feb 5 11:41:50 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 12:41:50 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/iniparser: new package In-Reply-To: <20231006140511.3840643-2-enki@fsck.pl> References: <20231004131256.2113233-2-enki@fsck.pl> <20231006140511.3840643-2-enki@fsck.pl> Message-ID: <9525ca43-ac12-46bb-b2da-9e1e1d8d6e02@benettiengineering.com> Hi Maciej, On 06/10/23 16:05, Maciej Grela wrote: > iniparser is a required dependency of dns320l-daemon This is a package itself and also a required dependency of dns320l-daemon, but you shouldn't specify it here. Here you have to describe what is iniparser package, for example as written in project github: " Iniparser is a modules that offers parsing of .ini files from C. " > Signed-off-by: Maciej Grela > --- > package/Config.in | 1 + > package/iniparser/Config.in | 6 ++++ > package/iniparser/iniparser.hash | 2 ++ > package/iniparser/iniparser.mk | 56 ++++++++++++++++++++++++++++++++ > 4 files changed, 65 insertions(+) > create mode 100644 package/iniparser/Config.in > create mode 100644 package/iniparser/iniparser.hash > create mode 100644 package/iniparser/iniparser.mk > > diff --git a/package/Config.in b/package/Config.in > index 009f7ba186..228e9eb1e3 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2085,6 +2085,7 @@ menu "Other" > source "package/gtest/Config.in" > source "package/gumbo-parser/Config.in" > source "package/highway/Config.in" > + source "package/iniparser/Config.in" > source "package/jemalloc/Config.in" > source "package/lapack/Config.in" > source "package/libabseil-cpp/Config.in" > diff --git a/package/iniparser/Config.in b/package/iniparser/Config.in > new file mode 100644 > index 0000000000..4932869943 > --- /dev/null > +++ b/package/iniparser/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_INIPARSER > + bool "iniparser" > + help > + ini file parser Here ^^^ you can repeat more or less what I've suggested for commit log > + > + https://github.com/ndevilla/iniparser > diff --git a/package/iniparser/iniparser.hash b/package/iniparser/iniparser.hash > new file mode 100644 > index 0000000000..a745062fcd > --- /dev/null > +++ b/package/iniparser/iniparser.hash > @@ -0,0 +1,2 @@ > +# From https://github.com/ndevilla/iniparser/releases > +sha256 960daa800dd31d70ba1bacf3ea2d22e8ddfc2906534bf328319495966443f3ae iniparser-4.1.tar.gz > diff --git a/package/iniparser/iniparser.mk b/package/iniparser/iniparser.mk > new file mode 100644 > index 0000000000..f3f74601f3 > --- /dev/null > +++ b/package/iniparser/iniparser.mk > @@ -0,0 +1,56 @@ > +################################################################################ > +# > +# iniparser > +# > +################################################################################ > + > +INIPARSER_VERSION = 4.1 > +INIPARSER_SITE = $(call github,ndevilla,iniparser,v$(INIPARSER_VERSION)) > +INIPARSER_INSTALL_STAGING = YES > +INIPARSER_LICENSE = MIT > +INIPARSER_LICENSE_FILES = LICENSE > +INIPARSER_SO_TARGET = libiniparser.so.1 > +INIPARSER_A_TARGET = libiniparser.a > +INIPARSER_BUILD_TARGETS = > +INIPARSER_STAGING_INSTALL_TGTS = > +INIPARSER_TARGET_INSTALL_TGTS = > + > +INIPARSER_CONFIGURE_OPTS = $(TARGET_CONFIGURE_OPTS) > + > +ifeq ($(BR2_STATIC_LIBS),y) > +INIPARSER_BUILD_TARGETS = $(INIPARSER_A_TARGET) > +INIPARSER_STAGING_INSTALL_TGTS = $(INIPARSER_A_TARGET) > +INIPARSER_TARGET_INSTALL_TGTS = $(INIPARSER_A_TARGET) > +else ifeq ($(BR2_SHARED_LIBS),y) > +INIPARSER_LINK_SO = y > + > +INIPARSER_BUILD_TARGETS = $(INIPARSER_SO_TARGET) > +INIPARSER_STAGING_INSTALL_TGTS = $(INIPARSER_SO_TARGET) > + > +INIPARSER_TARGET_INSTALL_TGTS = $(INIPARSER_SO_TARGET) > +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) > +INIPARSER_LINK_SO = y > + > +INIPARSER_BUILD_TARGETS = $(INIPARSER_A_TARGET) $(INIPARSER_SO_TARGET) > +INIPARSER_STAGING_INSTALL_TGTS = $(INIPARSER_A_TARGET) $(INIPARSER_SO_TARGET) > + > +# Don't install static libs on target > +INIPARSER_TARGET_INSTALL_TGTS = $(INIPARSER_SO_TARGET) > +endif > + > +define INIPARSER_BUILD_CMDS > + $(INIPARSER_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(INIPARSER_BUILD_TARGETS) > +endef > + > +define INIPARSER_INSTALL_STAGING_CMDS > + $(INSTALL) -D -m 0644 $(@D)/src/iniparser.h $(@D)/src/dictionary.h $(STAGING_DIR)/usr/include/ > + $(foreach target,$(INIPARSER_STAGING_INSTALL_TGTS),$(INSTALL) -D -m 0755 $(@D)/$(target) $(STAGING_DIR)/usr/lib/) > + $(if $(INIPARSER_LINK_SO),ln -s -r $(STAGING_DIR)/usr/lib/$(INIPARSER_SO_TARGET) $(STAGING_DIR)/usr/lib/libiniparser.so) > +endef > + > +define INIPARSER_INSTALL_TARGET_CMDS > + $(foreach target,$(INIPARSER_TARGET_INSTALL_TGTS),$(INSTALL) -D -m 0755 $(@D)/$(target) $(TARGET_DIR)/usr/lib/) > + $(if $(INIPARSER_LINK_SO),ln -s -r $(TARGET_DIR)/usr/lib/$(INIPARSER_SO_TARGET) $(TARGET_DIR)/usr/lib/libiniparser.so) > +endef > + > +$(eval $(generic-package)) -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Feb 5 11:44:00 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 12:44:00 +0100 Subject: [Buildroot] [PATCH v3 3/3] board/d-link/dns320l: new board In-Reply-To: <4551a4fa-db14-41dd-8bc0-c384d552e3c5@benettiengineering.com> References: <20231004131256.2113233-2-enki@fsck.pl> <20231006140511.3840643-4-enki@fsck.pl> <4551a4fa-db14-41dd-8bc0-c384d552e3c5@benettiengineering.com> Message-ID: Hi Maciej, On 05/02/24 11:33, Giulio Benetti wrote: > Hi Maciej, > > sorry for the late reply, > > On 06/10/23 16:05, Maciej Grela wrote: >> Add support for the D-Link DNS-320L using: >> >> - U-Boot 1.1.4 (in device flash) >> - Linux kernel 6.5.5 >> >> This is a 2-Bay 3.5'' SATA NAS with the following specs: >> >> - Marvell 88F6702 (1 GHz) CPU >> - 256 MiB DDR2 RAM >> - 128 MiB NAND Flash >> - 2 x SATA >> - 1 x 1000 Mbit/s Ethernet port >> - 1 x USB 2.0 >> >> The builtin bootloader banner is: >> U-Boot 1.1.4 (Aug 22 2012 - 17:06:54) Marvell version: 3.6.0.DNS-320L.01 >> >> Manufacturer product page: http://sharecenter.dlink.com/products/DNS-320 >> Device wiki: https://wikidevi.wi-cat.ru/D-Link_DNS-320L_rev_A1 >> >> Signed-off-by: Maciej Grela >> --- >> ? DEVELOPERS??????????????????????????????????? |?? 6 + >> ? board/d-link/dns320l/dts/kirkwood-dns320l.dts | 218 ++++++++++++++++++ >> ? configs/dns320l_defconfig???????????????????? |? 16 ++ >> ? 3 files changed, 240 insertions(+) >> ? create mode 100644 board/d-link/dns320l/dts/kirkwood-dns320l.dts >> ? create mode 100644 configs/dns320l_defconfig >> >> diff --git a/DEVELOPERS b/DEVELOPERS >> index c45e7315da..76e8644073 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -1950,6 +1950,12 @@ N:??? Ludwig Kormann >> ? F:??? board/in-circuit/ >> ? F:??? configs/icnova* >> +N:??? Maciej Grela >> +F:??? board/d-link/dns320l/ >> +F:??? configs/dns320l_defconfig >> +F:??? package/dns320l-daemon >> +F:??? package/iniparser > > The 2 lines above should be part of the respective patches and not of > this one, > >> + >> ? N:??? Maeva Manuel >> ? F:??? board/freescale/imx8qmmek/ >> ? F:??? configs/freescale_imx8qmmek_defconfig >> diff --git a/board/d-link/dns320l/dts/kirkwood-dns320l.dts >> b/board/d-link/dns320l/dts/kirkwood-dns320l.dts >> new file mode 100644 >> index 0000000000..660508a51a >> --- /dev/null >> +++ b/board/d-link/dns320l/dts/kirkwood-dns320l.dts >> @@ -0,0 +1,218 @@ >> +/dts-v1/; >> + >> +/* >> + * Device Tree file for DLINK DNS-320L >> + * >> + * Copyright (C) 2015, Sunke Schl?ters >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU General Public License >> + * as published by the Free Software Foundation; either version >> + * 2 of the License, or (at your option) any later version. >> + * >> + * >> + * This file is based on the work of Andreas B?hler : >> + *?? - http://www.aboehler.at/doku/doku.php/projects:dns320l >> + *?? - >> http://www.aboehler.at/hg/linux-dns320l/file/ba7a60ad7687/linux-3.12/kirkwood-dns320l.dts >> + */ >> + >> +#include "marvell/kirkwood.dtsi" >> +#include "marvell/kirkwood-6281.dtsi" >> + >> +/ { >> +??? model = "D-Link DNS-320L"; >> +??? compatible = "dlink,dns-320l", "marvell,kirkwood-88f6702", >> "marvell,kirkwood"; >> + >> +??? memory { >> +??????? device_type = "memory"; >> +??????? reg = <0x00000000 0x10000000>; >> +??? }; >> + >> +??? chosen { >> +??????? bootargs = "console=ttyS0,115200n8 earlyprintk"; >> +??????? stdout-path = &uart0; >> +??? }; >> + >> +??? gpio-keys { >> +??????? compatible = "gpio-keys"; >> +??????? #address-cells = <1>; >> +??????? #size-cells = <0>; >> +??????? pinctrl-0 = <&pmx_button_reset &pmx_button_usb_copy>; >> +??????? pinctrl-names = "default"; >> + >> +??????? button at 1 { >> +??????????? label = "Reset push button"; >> +??????????? linux,code = ; >> +??????????? gpios = <&gpio0 28 1>; >> +??????? }; >> +??????? button at 2 { >> +??????????? label = "USB unmount button"; >> +??????????? linux,code = ; >> +??????????? gpios = <&gpio0 27 1>; >> +??????? }; >> +??? }; >> + >> +??? gpio-leds { >> +??????? compatible = "gpio-leds"; >> +??????? pinctrl-0 = <&pmx_led_usb_blue &pmx_led_red_right_hdd >> +???????????????? &pmx_led_red_left_hdd? &pmx_led_usb_orange>; >> +??????? pinctrl-names = "default"; >> + >> +??????? blue-usb { >> +??????????? label = "usb_blue"; >> +??????????? gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; >> +??????? }; >> +??????? orange-usb { >> +??????????? label = "usb_orange"; >> +??????????? gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; >> +??????? }; >> +??????? orange-l_hdd { >> +??????????? label = "hdd1_orange"; >> +??????????? gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; >> +??????? }; >> +??????? orange-r_hdd { >> +??????????? label = "hdd2_orange"; >> +??????????? gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; >> +??????? }; >> +??? }; >> + >> +???? ocp at f1000000 { >> +??????? pinctrl: pin-controller at 10000 { >> + >> +??????????? pinctrl-0 = <&pmx_button_power>; >> +??????????? pinctrl-names = "default"; >> + >> +??????????? pmx_sata0: pmx-sata0 { >> +??????????????? marvell,pins = "mpp20"; >> +??????????????? marvell,function = "sata0"; >> +??????????? }; >> +??????????? pmx_sata1: pmx-sata1 { >> +??????????????? marvell,pins = "mpp21"; >> +??????????????? marvell,function = "sata1"; >> +??????????? }; >> +??????????? pmx_led_red_right_hdd: pmx-led-red-right-hdd { >> +??????????????? marvell,pins = "mpp22"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_led_red_left_hdd: pmx-led-red-left-hdd { >> +??????????????? marvell,pins = "mpp23"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_power_sata: pmx-power-sata { >> +??????????????? marvell,pins = "mpp24"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_led_usb_blue: pmx-led-usb-blue { >> +??????????????? marvell,pins = "mpp25"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_led_usb_orange: pmx-led-usb-orange { >> +??????????????? marvell,pins = "mpp26"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_button_usb_copy: pmx-button-usb-copy { >> +??????????????? marvell,pins = "mpp27"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_button_reset: pmx-button-reset { >> +??????????????? marvell,pins = "mpp28"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????????? pmx_button_power: pmx-button-power { // I can't get this >> one to trigger a button press... >> +??????????????? marvell,pins = "mpp29"; >> +??????????????? marvell,function = "gpio"; >> +??????????? }; >> +??????? }; >> +??????? sata at 80000 { >> +??????????? status = "okay"; >> +??????????? nr-ports = <2>; >> +??????? }; >> +??????? serial at 12000 { >> +??????????? status = "okay"; >> +??????? }; >> + >> +??????? serial at 12100 { >> +??????????? pinctrl-0 = <&pmx_uart1>; >> +??????????? pinctrl-names = "default"; >> +??????????? status = "okay"; >> +??????? }; >> +??? }; >> + >> +??? regulators { >> +??????? compatible = "simple-bus"; >> +??????? #address-cells = <1>; >> +??????? #size-cells = <0>; >> +??????? pinctrl-0 = <&pmx_power_sata>; >> +??????? pinctrl-names = "default"; >> + >> +??????? sata_power: regulator at 1 { >> +??????????? compatible = "regulator-fixed"; >> +??????????? reg = <1>; >> +??????????? regulator-name = "SATA Power"; >> +??????????? regulator-min-microvolt = <5000000>; >> +??????????? regulator-max-microvolt = <5000000>; >> +??????????? enable-active-high; >> +??????????? regulator-always-on; >> +??????????? regulator-boot-on; >> +??????????? gpio = <&gpio1 24 0>; >> +??????? }; >> +??? }; >> +}; >> + >> +&nand { >> +??? pinctrl-0 = <&pmx_nand>; >> +??? pinctrl-names = "default"; >> +??? status = "okay"; >> +??? chip-delay = <35>; >> + >> +??? partition at 0 { >> +??????? label = "u-boot"; >> +??????? reg = <0x0000000 0x100000>; >> +??????? read-only; >> +??? }; >> + >> +??? partition at 100000 { >> +??????? label = "uImage"; >> +??????? reg = <0x0100000 0x500000>; >> +??? }; >> + >> +??? partition at 600000 { >> +??????? label = "ramdisk"; >> +??????? reg = <0x0600000 0x500000>; >> +??? }; >> + >> +??? partition at b00000 { >> +??????? label = "image"; >> +??????? reg = <0x0b00000 0x6400000>; >> +??? }; >> + >> +??? partition at 6f00000 { >> +??????? label = "mini firmware"; >> +??????? reg = <0x6f00000 0xa00000>; >> +??? }; >> + >> +??? partition at 7900000 { >> +??????? label = "config"; >> +??????? reg = <0x7900000 0x500000>; >> +??? }; >> + >> +??? partition at 7e00000 { >> +??????? label = "my-dlink"; >> +??????? reg = <0x7e00000 0x200000>; >> +??? }; >> +}; >> + >> +&mdio { >> +??? status = "okay"; >> + >> +??? ethphy0: ethernet-phy at 0 { >> +??????? reg = <0>; >> +??? }; >> +}; >> + >> +ð0 { >> +??? status = "okay"; >> +??? ethernet0-port at 0 { >> +??????? phy-handle = <ðphy0>; >> +??? }; >> +}; > > Is this ^^^ dts pending upstream? > >> diff --git a/configs/dns320l_defconfig b/configs/dns320l_defconfig >> new file mode 100644 >> index 0000000000..f281984267 >> --- /dev/null >> +++ b/configs/dns320l_defconfig >> @@ -0,0 +1,16 @@ >> +BR2_arm=y > > Here you haven't specified any particular Arm architecture but MV78260 > is specified as a: > " > ARMv7-compliant CPU cores with the latest Marvell > micro-architecture enhancements, with a double > precision IEEE-compliant Floating Point Unit (FPU) > per core > " > > Maybe you could give a try to enable VFP3-16 since the SoC supports it: > https://datasheet.datasheetarchive.com/originals/crawler/marvell.com/1657ba38481c63b54928f3c1d60858fd.pdf > > Here instead you need: > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y > because if not set if changes while Buildroot increase Latest Linux > Version resulting in build failure: > " > Incorrect selection of kernel headers: expected 6.6.x, got 6.5.x > " > >> +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" >> +BR2_SYSTEM_DHCP="eth0" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.5" >> +BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5" >> +BR2_LINUX_KERNEL_APPENDED_UIMAGE=y >> +BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" >> +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/d-link/dns320l/dts/kirkwood-dns320l.dts" forgotten to mention you also need: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> +BR2_TARGET_ROOTFS_CPIO=y >> +BR2_TARGET_ROOTFS_CPIO_GZIP=y >> +BR2_TARGET_ROOTFS_CPIO_UIMAGE=y >> + >> +# The package is required for proper power management >> +BR2_PACKAGE_DNS320L_DAEMON=y > > I've built tested successfully with utils/docker-run so with the changes > above: > Reviewed-by: Giulio Benetti > > Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Mon Feb 5 11:46:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 12:46:02 +0100 Subject: [Buildroot] [PATCH] package/sysstat: do not autodetect sa_lib_dir In-Reply-To: <78273b30-5659-4cc0-91f8-23a8775fedf2@sord.co.jp> (Atsushi Nemoto's message of "Thu, 11 Jan 2024 14:47:48 +0900") References: <78273b30-5659-4cc0-91f8-23a8775fedf2@sord.co.jp> Message-ID: <87le7zt9qd.fsf@48ers.dk> >>>>> "Atsushi" == Atsushi Nemoto writes: > The configure script of sysstat package checks host's /usr/lib64 > directory for default sa_lib_dir. > Specify sa_lib_dir exclicitly to avoid host dependency. > Signed-off-by: Atsushi Nemoto Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 11:45:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 12:45:09 +0100 Subject: [Buildroot] [git commit] package/sysstat: do not autodetect sa_lib_dir Message-ID: <20240205114617.A334E86C09@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eef5c297e765bb1414d6d6c629ce8e690c6370d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The configure script of sysstat package checks host's /usr/lib64 directory for default sa_lib_dir. Specify sa_lib_dir exclicitly to avoid host dependency. Signed-off-by: Atsushi Nemoto Signed-off-by: Peter Korsgaard --- package/sysstat/sysstat.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 377396d986..ca05ec50d8 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -20,5 +20,7 @@ SYSSTAT_CONF_OPTS += --enable-sensors else SYSSTAT_CONF_OPTS += --disable-sensors endif +# do not look at host's /usr/lib64 +SYSSTAT_CONF_OPTS += sa_lib_dir=/usr/lib/sa $(eval $(autotools-package)) From giulio.benetti at benettiengineering.com Mon Feb 5 11:47:20 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 12:47:20 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/dns320l-daemon: new package In-Reply-To: <20231006140511.3840643-3-enki@fsck.pl> References: <20231004131256.2113233-2-enki@fsck.pl> <20231006140511.3840643-3-enki@fsck.pl> Message-ID: <8d3fbd57-3100-46f5-8740-0998ead5b029@benettiengineering.com> Hi Maciej, On 06/10/23 16:05, Maciej Grela wrote: > dns320l-daemon is a simple system management daemon for the D-Link DNS-320L > NAS. It handles power, Wake-on-LAN, temperature, fan speed and some LEDs. > > Signed-off-by: Maciej Grela > --- > package/Config.in | 1 + > .../0001-listen-on-localhost.patch | 21 ++++++++++ > package/dns320l-daemon/Config.in | 8 ++++ > package/dns320l-daemon/S50dns320l-daemon | 42 +++++++++++++++++++ > package/dns320l-daemon/dns320l-daemon.hash | 1 + > package/dns320l-daemon/dns320l-daemon.mk | 32 ++++++++++++++ > 6 files changed, 105 insertions(+) > create mode 100644 package/dns320l-daemon/0001-listen-on-localhost.patch > create mode 100644 package/dns320l-daemon/Config.in > create mode 100644 package/dns320l-daemon/S50dns320l-daemon > create mode 100644 package/dns320l-daemon/dns320l-daemon.hash > create mode 100644 package/dns320l-daemon/dns320l-daemon.mk > > diff --git a/package/Config.in b/package/Config.in > index 228e9eb1e3..f1c451890f 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2684,6 +2684,7 @@ menu "System tools" > source "package/dcron/Config.in" > source "package/ddrescue/Config.in" > source "package/debianutils/Config.in" > + source "package/dns320l-daemon/Config.in" > source "package/docker-cli/Config.in" > source "package/docker-compose/Config.in" > source "package/docker-engine/Config.in" > diff --git a/package/dns320l-daemon/0001-listen-on-localhost.patch b/package/dns320l-daemon/0001-listen-on-localhost.patch > new file mode 100644 > index 0000000000..50da024024 > --- /dev/null > +++ b/package/dns320l-daemon/0001-listen-on-localhost.patch > @@ -0,0 +1,21 @@ > +# HG changeset patch > +# User Maciej Grela > +# Date 1696540279 -7200 > +# Thu Oct 05 23:11:19 2023 +0200 > +# Node ID eca5ed65582402e64c36145290c214aee84b012b > +# Parent 1f945ce22321a876143b38aaf5610c8915172b90 > +Subject: [PATCH] Listen on localhost by default > +Signed-off-by: Maciej Grela > + > +diff -r 1f945ce22321 -r eca5ed655824 dns320l-daemon.ini > +--- a/dns320l-daemon.ini Tue Dec 09 12:24:29 2014 +0100 > ++++ b/dns320l-daemon.ini Thu Oct 05 23:11:19 2023 +0200 > +@@ -4,7 +4,7 @@ > + > + [Daemon] > + ServerPort = 57367 > +-ServerAddr = 0.0.0.0 > ++ServerAddr = 127.0.0.1 > + SyncTimeOnStartup = 0 > + SyncTimeOnShutdown = 0 > + DeviceShutdownDelay = 30 > diff --git a/package/dns320l-daemon/Config.in b/package/dns320l-daemon/Config.in > new file mode 100644 > index 0000000000..35bd30a9e5 > --- /dev/null > +++ b/package/dns320l-daemon/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_DNS320L_DAEMON > + bool "dns320l-daemon" > + depends on BR2_USE_MMU # fork() > + select BR2_PACKAGE_INIPARSER > + help > + MCU Daemon for the D-Link DNS-320L > + > + https://www.aboehler.at/hg/dns320l-daemon > diff --git a/package/dns320l-daemon/S50dns320l-daemon b/package/dns320l-daemon/S50dns320l-daemon > new file mode 100644 > index 0000000000..3bc2a60d0b > --- /dev/null > +++ b/package/dns320l-daemon/S50dns320l-daemon > @@ -0,0 +1,42 @@ > +#!/bin/sh > + > +DAEMON="dns320l-daemon" > + > +start() { > + printf 'Starting %s: ' "$DAEMON" > + start-stop-daemon -S -x "/usr/bin/$DAEMON" > + status="$?" > + if [ "$status" -eq 0 ]; then > + echo "OK" > + else > + echo "FAIL" > + fi > + return "$status" > +} > + > +stop() { > + printf 'Stopping %s: ' "$DAEMON" > + start-stop-daemon -s INT -K -x "/usr/bin/$DAEMON" > +} > + > +poweroff() { > + printf 'Stopping %s: ' "$DAEMON" > + start-stop-daemon -s TERM -K -x "/usr/bin/$DAEMON" > +} > + > +restart() { > + stop > + sleep 1 > + start > +} > + > +case "$1" in > + start|stop|restart) > + "$1";; > + reload) > + restart;; > + *) > + echo "Usage: $0 {start|stop|restart|poweroff}" > + exit 1 > + ;; > +esac > diff --git a/package/dns320l-daemon/dns320l-daemon.hash b/package/dns320l-daemon/dns320l-daemon.hash > new file mode 100644 > index 0000000000..4396eb8f5d > --- /dev/null > +++ b/package/dns320l-daemon/dns320l-daemon.hash > @@ -0,0 +1 @@ > +sha256 eac74a64f0d4127748e629b8a5f723eab58ac83064a3f249f97b85bcd7faf061 tip.tar.bz2 > diff --git a/package/dns320l-daemon/dns320l-daemon.mk b/package/dns320l-daemon/dns320l-daemon.mk > new file mode 100644 > index 0000000000..bc24a553c2 > --- /dev/null > +++ b/package/dns320l-daemon/dns320l-daemon.mk > @@ -0,0 +1,32 @@ > +################################################################################ > +# > +# dns320l-daemon > +# > +################################################################################ > + > +DNS320L_DAEMON_VERSION = 1.0 > +DNS320L_DAEMON_SOURCE = tip.tar.bz2 > +DNS320L_DAEMON_SITE = https://www.aboehler.at/hg/dns320l-daemon/archive URL has moved to: https://gitlab.aboehler.at/andreas/dns320l-daemon and there are no Releases or git tags, so can you use as VERSION the latest git SHA1? Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > +DNS320L_DAEMON_LICENSE = GPL-3 > +DNS320L_DAEMON_DEPENDENCIES = iniparser > +DNS320l_DAEMON_PATCH = 0001-listen-on-localhost.patch > + > +define DNS320L_DAEMON_BUILD_CMDS > + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ > + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" > +endef > + > +define DNS320L_DAEMON_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/dns320l-daemon $(TARGET_DIR)/usr/bin/ > + $(INSTALL) -D -m 0600 $(@D)/dns320l-daemon.ini $(TARGET_DIR)/etc/ > +endef > + > +define DNS320L_DAEMON_INSTALL_INIT_SYSTEMD > + $(INSTALL) -D -m 0644 $(@D)/dns320l-daemon.service $(TARGET_DIR)/lib/systemd/system/ > +endef > + > +define DNS320L_DAEMON_INSTALL_INIT_SYSV > + $(INSTALL) -D -m 0755 package/dns320l-daemon/S50dns320l-daemon $(TARGET_DIR)/etc/init.d/S50dns320l-daemon > +endef > + > +$(eval $(generic-package)) From giulio.benetti at benettiengineering.com Mon Feb 5 12:03:08 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 13:03:08 +0100 Subject: [Buildroot] [v1 3/4] configs/raspberrypi*: bump kernel version to feb4ea5 (6.1.55) In-Reply-To: <20231121193448.1151936-4-gael.portay@rtone.fr> References: <20231121193448.1151936-1-gael.portay@rtone.fr> <20231121193448.1151936-4-gael.portay@rtone.fr> Message-ID: Hi Ga?l, unfortunately this patch has been superseded by the following one that's been committed: https://gitlab.com/buildroot.org/buildroot/-/commit/13ba668a2da3a0dcb386578ce15b00a444101dbe So it can be dropped from Patchwork. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas On 21/11/23 20:34, Ga?l PORTAY wrote: > Now based on 6.1.55 (from 5.10.92). > > Signed-off-by: Ga?l PORTAY > --- > configs/raspberrypi0_defconfig | 2 +- > configs/raspberrypi0w_defconfig | 2 +- > configs/raspberrypi2_defconfig | 2 +- > configs/raspberrypi3_64_defconfig | 2 +- > configs/raspberrypi3_defconfig | 2 +- > configs/raspberrypi3_qt5we_defconfig | 2 +- > configs/raspberrypi4_64_defconfig | 2 +- > configs/raspberrypi4_defconfig | 2 +- > configs/raspberrypi_defconfig | 2 +- > configs/raspberrypicm4io_64_defconfig | 2 +- > configs/raspberrypicm4io_defconfig | 2 +- > configs/raspberrypizero2w_defconfig | 2 +- > 12 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/configs/raspberrypi0_defconfig b/configs/raspberrypi0_defconfig > index 4506e94bce..6beb69d3c3 100644 > --- a/configs/raspberrypi0_defconfig > +++ b/configs/raspberrypi0_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > > # Build the DTBs for A/B from the kernel sources: the zero is the same > diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig > index 7a35794c2d..4db244e719 100644 > --- a/configs/raspberrypi0w_defconfig > +++ b/configs/raspberrypi0w_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w" > diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig > index 9b484c5588..8f2ed3a21f 100644 > --- a/configs/raspberrypi2_defconfig > +++ b/configs/raspberrypi2_defconfig > @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_64_defconfig b/configs/raspberrypi3_64_defconfig > index 4d838ae0e8..0946bb9f9a 100644 > --- a/configs/raspberrypi3_64_defconfig > +++ b/configs/raspberrypi3_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig > index 0a59ab42a9..26a118f2f1 100644 > --- a/configs/raspberrypi3_defconfig > +++ b/configs/raspberrypi3_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig > index 40d0c0f888..501f12435f 100644 > --- a/configs/raspberrypi3_qt5we_defconfig > +++ b/configs/raspberrypi3_qt5we_defconfig > @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi4_64_defconfig b/configs/raspberrypi4_64_defconfig > index 5942f7c4e1..17a2f8cbb2 100644 > --- a/configs/raspberrypi4_64_defconfig > +++ b/configs/raspberrypi4_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig > index 4e5580c140..194af0a1b8 100644 > --- a/configs/raspberrypi4_defconfig > +++ b/configs/raspberrypi4_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig > index cca53f9b37..3d50f81278 100644 > --- a/configs/raspberrypi_defconfig > +++ b/configs/raspberrypi_defconfig > @@ -11,7 +11,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" > > # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources > diff --git a/configs/raspberrypicm4io_64_defconfig b/configs/raspberrypicm4io_64_defconfig > index 29cb0472d7..f8f0d6c23a 100644 > --- a/configs/raspberrypicm4io_64_defconfig > +++ b/configs/raspberrypicm4io_64_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypicm4io_defconfig b/configs/raspberrypicm4io_defconfig > index 017aecc0dd..1f0703493b 100644 > --- a/configs/raspberrypicm4io_defconfig > +++ b/configs/raspberrypicm4io_defconfig > @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" > > # Build the DTB from the kernel sources > diff --git a/configs/raspberrypizero2w_defconfig b/configs/raspberrypizero2w_defconfig > index 2ea503ca24..09082dbc4d 100644 > --- a/configs/raspberrypizero2w_defconfig > +++ b/configs/raspberrypizero2w_defconfig > @@ -9,7 +9,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,0b54dbda3cca2beb51e236a25738784e90853b64)/linux-0b54dbda3cca2beb51e236a25738784e90853b64.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" > > # Build the DTB from the kernel sources From antoine.coutant at smile.fr Mon Feb 5 12:47:26 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 5 Feb 2024 13:47:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/libheif: add jpeg-turbo support In-Reply-To: <20240131200754.1784621-1-fontaine.fabrice@gmail.com> References: <20240131200754.1784621-1-fontaine.fabrice@gmail.com> Message-ID: On 31/01/2024 21:07, Fabrice Fontaine wrote: > jpeg support is not limited to libjpeg > > Signed-off-by: Fabrice Fontaine > --- > package/libheif/libheif.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk > index bd307deb7b..908e2ce068 100644 > --- a/package/libheif/libheif.mk > +++ b/package/libheif/libheif.mk > @@ -51,9 +51,9 @@ else > LIBHEIF_CONF_OPTS += -DWITH_LIBDE265=OFF > endif > > -ifeq ($(BR2_PACKAGE_LIBJPEG),y) > +ifeq ($(BR2_PACKAGE_JPEG),y) > LIBHEIF_CONF_OPTS += -DWITH_JPEG_DECODER=ON -DWITH_JPEG_ENCODER=ON > -LIBHEIF_DEPENDENCIES += libjpeg > +LIBHEIF_DEPENDENCIES += jpeg > else > LIBHEIF_CONF_OPTS += -DWITH_JPEG_DECODER=OFF -DWITH_JPEG_ENCODER=OFF > endif Looks good to me. Reviewed-by: Antoine Coutant Regards, Antoine Coutant. -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Mon Feb 5 13:09:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 14:09:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-termcolor: bump to version 2.4.0 In-Reply-To: <20240111074057.3089507-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:40:57 -0700") References: <20240111074057.3089507-1-james.hilliard1@gmail.com> Message-ID: <87h6int5ui.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 13:10:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 14:10:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-tempora: bump to version 5.5.0 In-Reply-To: <20240111073724.3087490-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:37:24 -0700") References: <20240111073724.3087490-1-james.hilliard1@gmail.com> Message-ID: <87cytbt5ta.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > License hash changed due to copyright notice removal: > https://github.com/jaraco/tempora/commit/5957d58266e479f124b31f30e4322e798fdf386b > Drop no longer required python-six runtime dependency. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 5 13:14:10 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:14:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/openblas: bump to version v0.3.26 In-Reply-To: <20240108205150.783168-1-ju.o@free.fr> References: <20240108205150.783168-1-ju.o@free.fr> Message-ID: On 08/01/2024 21:51, Julien Olivain wrote: > For change log since v0.3.25, see: > https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.26 > > This commit also update _SITE url to follow download url published on > the homepage https://www.openblas.net/ > > Also https://github.com/xianyi/OpenBLAS is now redirecting to > https://github.com/OpenMathLib/OpenBLAS > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Arnout > --- > Patch tested on branch master at commit 1d97f8c with commands: > > make check-package > ... > 0 warnings generated > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_openblas > ... > OK > > utils/test-pkg -a -p openblas > ... > 45 builds, 23 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > --- > package/openblas/openblas.hash | 6 +++--- > package/openblas/openblas.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash > index d946ae7296..a0f054dab7 100644 > --- a/package/openblas/openblas.hash > +++ b/package/openblas/openblas.hash > @@ -1,5 +1,5 @@ > -# From https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.25 > -md5 48384e324cd1cdcfbdb0d2e16ca55327 openblas-0.3.25.tar.gz > +# From https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.26 > +md5 bd496a1c81769ed19a161c1f8f904ccd openblas-0.3.26.tar.gz > # Locally calculated > -sha256 4c25cb30c4bb23eddca05d7d0a85997b8db6144f5464ba7f8c09ce91e2f35543 openblas-0.3.25.tar.gz > +sha256 4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68 openblas-0.3.26.tar.gz > sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE > diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk > index 76833121a9..2d6cdaa7bb 100644 > --- a/package/openblas/openblas.mk > +++ b/package/openblas/openblas.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -OPENBLAS_VERSION = 0.3.25 > -OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) > +OPENBLAS_VERSION = 0.3.26 > +OPENBLAS_SITE = https://github.com/OpenMathLib/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) > OPENBLAS_LICENSE = BSD-3-Clause > OPENBLAS_LICENSE_FILES = LICENSE > OPENBLAS_INSTALL_STAGING = YES From buildroot at bubu1.eu Mon Feb 5 13:18:38 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 14:18:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <87plxbta1d.fsf@48ers.dk> References: <20240111053157.2928259-1-james.hilliard1@gmail.com> <87plxbta1d.fsf@48ers.dk> Message-ID: <32c71490-c8f7-43e5-b7c8-091935636340@bubu1.eu> Hi Peter, James On 05.02.24 12:39, Peter Korsgaard wrote: >>>>>> "James" == James Hilliard writes: > > > License hash changed due to year update: > > https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ > > > Signed-off-by: James Hilliard > > --- > > package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- > > package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- > > 2 files changed, 5 insertions(+), 5 deletions(-) > > > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash > > index 29852a51ed..7b5dc1e29a 100644 > > --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash > > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash > > @@ -1,5 +1,5 @@ > > # md5, sha256 from https://pypi.org/pypi/rfc3987/json I think this comment is pointing to the wrong package, maybe some automation went wrong because of that? > > -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz > > -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz > > +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz > > +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 ruamel.yaml-0.18.5.tar.gz > > > Hmm, I get a different hash: > > ruamel.yaml-0.18.5.tar.gz: OK (md5: 24fac3544a3c7bd7eeaf6e4f704a056e) > ERROR: while checking hashes from package/python-ruamel-yaml//python-ruamel-yaml.hash > ERROR: ruamel.yaml-0.18.5.tar.gz has wrong sha256 hash: > ERROR: expected: ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 > ERROR: got : 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e This is the correct one according to https://pypi.org/project/ruamel.yaml/ > ERROR: Incomplete download, or man-in-the-middle (MITM) attack > > Any ideas? > Marcus From arnout at mind.be Mon Feb 5 13:18:57 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:18:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-alembic: bump to version 1.13.1 In-Reply-To: <20240108063845.3446790-1-james.hilliard1@gmail.com> References: <20240108063845.3446790-1-james.hilliard1@gmail.com> Message-ID: <9e5137b9-b1e8-41d9-a8f2-6d1f3a5c3ece@mind.be> On 08/01/2024 07:38, James Hilliard wrote: > Add new runtime dependencies: > - python-sqlalchemy > - python-mako > - python-typing-extensions > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-alembic/Config.in | 3 +++ > package/python-alembic/python-alembic.hash | 4 ++-- > package/python-alembic/python-alembic.mk | 4 ++-- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/package/python-alembic/Config.in b/package/python-alembic/Config.in > index a53dde7f7f..33fe3c3682 100644 > --- a/package/python-alembic/Config.in > +++ b/package/python-alembic/Config.in > @@ -1,5 +1,8 @@ > config BR2_PACKAGE_PYTHON_ALEMBIC > bool "python-alembic" > + select BR2_PACKAGE_PYTHON_MAKO # runtime > + select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime > + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > help > Alembic is a database migrations tool written by the author > of SQLAlchemy. > diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash > index df1f4fba02..1f752ebc7e 100644 > --- a/package/python-alembic/python-alembic.hash > +++ b/package/python-alembic/python-alembic.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/alembic/json > -md5 642d563af853b317f018026f3edd5dba alembic-1.12.1.tar.gz > -sha256 bca5877e9678b454706347bc10b97cb7d67f300320fa5c3a94423e8266e2823f alembic-1.12.1.tar.gz > +md5 29579d34ea694627280b52a3d3116664 alembic-1.13.1.tar.gz > +sha256 4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595 alembic-1.13.1.tar.gz > # Locally computed sha256 checksums > sha256 b285268a86f4416eaf4d05b2ae3880c156f7c59a8f935a402bc056eafb33af08 LICENSE > diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk > index fd41e0df66..52e30e39ba 100644 > --- a/package/python-alembic/python-alembic.mk > +++ b/package/python-alembic/python-alembic.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_ALEMBIC_VERSION = 1.12.1 > +PYTHON_ALEMBIC_VERSION = 1.13.1 > PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz > -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/44/b4/253fe31261d9f5d603d89bd9e6fba1625494a6d761d319902dfe4db59016 > +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/7b/24/ddce068e2ac9b5581bd58602edb2a1be1b0752e1ff2963c696ecdbe0470d > PYTHON_ALEMBIC_SETUP_TYPE = setuptools > PYTHON_ALEMBIC_LICENSE = MIT > PYTHON_ALEMBIC_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:20:32 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:20:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-argh: bump to version 0.31.0 In-Reply-To: <20240108065521.3455564-1-james.hilliard1@gmail.com> References: <20240108065521.3455564-1-james.hilliard1@gmail.com> Message-ID: <240867fc-32ff-45ca-b975-3543ad1946d2@mind.be> On 08/01/2024 07:55, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-argh/python-argh.hash | 8 ++++---- > package/python-argh/python-argh.mk | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-argh/python-argh.hash b/package/python-argh/python-argh.hash > index 8bfb45d1c3..bac9df42d6 100644 > --- a/package/python-argh/python-argh.hash > +++ b/package/python-argh/python-argh.hash > @@ -1,6 +1,6 @@ > -# md5 from https://pypi.python.org/pypi/argh/json > -md5 7001dd9ff619cf1422ddf8bf813bd08a argh-0.30.4.tar.gz > -sha256 9fca8e69c4dad4f8d2a7bdfbdd80b0754462b53510a03e1b5cf2b43a87e6e960 argh-0.30.4.tar.gz > -# Locally computed > +# md5, sha256 from https://pypi.org/pypi/argh/json > +md5 2659a6353589156e6aa65a99797f8913 argh-0.31.0.tar.gz > +sha256 b93093544309ddbfe6c73dc9bfd60dbc4acecef39f3f464774b3084a1ec5d7b0 argh-0.31.0.tar.gz > +# Locally computed sha256 checksums > sha256 2594f46b9b23a5fddeca090faeb270c7ceee8116675fe35082be859aa7466e89 COPYING > sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER > diff --git a/package/python-argh/python-argh.mk b/package/python-argh/python-argh.mk > index ccb9f61d48..0da3281d49 100644 > --- a/package/python-argh/python-argh.mk > +++ b/package/python-argh/python-argh.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_ARGH_VERSION = 0.30.4 > +PYTHON_ARGH_VERSION = 0.31.0 > PYTHON_ARGH_SOURCE = argh-$(PYTHON_ARGH_VERSION).tar.gz > -PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/37/3a/175f4a2c47e8c20e59cf25fe69546f76cf1196251a377b182e8f4542b4c4 > +PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/7c/3c/1b7f3fab380c96d61119178040c0183161fe0f182c4da3933bcb3284538f > PYTHON_ARGH_SETUP_TYPE = flit > PYTHON_ARGH_LICENSE = LGPL-3.0+ > PYTHON_ARGH_LICENSE_FILES = COPYING COPYING.LESSER From arnout at mind.be Mon Feb 5 13:21:33 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:21:33 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-hatch-fancy-pypi-readme: bump to version 24.1.0 In-Reply-To: <20240108070310.3462577-1-james.hilliard1@gmail.com> References: <20240108070310.3462577-1-james.hilliard1@gmail.com> Message-ID: On 08/01/2024 08:03, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > .../python-hatch-fancy-pypi-readme.hash | 6 +++--- > .../python-hatch-fancy-pypi-readme.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash > index d9fdb88e1f..e3a6363eb7 100644 > --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash > +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash > @@ -1,5 +1,5 @@ > -# md5, sha256 from https://pypi.org/pypi/hatch_fancy_pypi_readme/json > -md5 8755cce1a4a4d5e5d84992089801acbf hatch_fancy_pypi_readme-23.1.0.tar.gz > -sha256 b1df44063094af1e8248ceacd47a92c9cf313d6b9823bf66af8a927c3960287d hatch_fancy_pypi_readme-23.1.0.tar.gz > +# md5, sha256 from https://pypi.org/pypi/hatch-fancy-pypi-readme/json > +md5 f5f9e639f066c91f8e623ec6231beae9 hatch_fancy_pypi_readme-24.1.0.tar.gz > +sha256 44dd239f1a779b9dcf8ebc9401a611fd7f7e3e14578dcf22c265dfaf7c1514b8 hatch_fancy_pypi_readme-24.1.0.tar.gz > # Locally computed sha256 checksums > sha256 e69ea57f96e599e617f61af3e85bf326b87e833994709fb5e5908a81197730a2 LICENSE.txt > diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk > index 6195a30436..2a26892388 100644 > --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk > +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_HATCH_FANCY_PYPI_README_VERSION = 23.1.0 > +PYTHON_HATCH_FANCY_PYPI_README_VERSION = 24.1.0 > PYTHON_HATCH_FANCY_PYPI_README_SOURCE = hatch_fancy_pypi_readme-$(PYTHON_HATCH_FANCY_PYPI_README_VERSION).tar.gz > -PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/85/a6/58d585eba4321bf2e7a4d1ed2af141c99d88c1afa4b751926be160f09325 > +PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/b4/c2/c9094283a07dd96c5a8f7a5f1910259d40d2e29223b95dd875a6ca13b58f > PYTHON_HATCH_FANCY_PYPI_README_LICENSE = MIT > PYTHON_HATCH_FANCY_PYPI_README_LICENSE_FILES = LICENSE.txt > PYTHON_HATCH_FANCY_PYPI_README_SETUP_TYPE = pep517 From arnout at mind.be Mon Feb 5 13:22:01 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:22:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aioconsole: bump to version 0.7.0 In-Reply-To: <20240107203517.3310719-1-james.hilliard1@gmail.com> References: <20240107203517.3310719-1-james.hilliard1@gmail.com> Message-ID: On 07/01/2024 21:35, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-aioconsole/python-aioconsole.hash | 4 ++-- > package/python-aioconsole/python-aioconsole.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash > index b8237ed76c..b52140cca5 100644 > --- a/package/python-aioconsole/python-aioconsole.hash > +++ b/package/python-aioconsole/python-aioconsole.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aioconsole/json > -md5 0f7e4db85113d1ffdc5f0fa1dc0a37de aioconsole-0.6.2.tar.gz > -sha256 bac11286f1062613d2523ceee1ba81c676cd269812b865b66b907448a7b5f63e aioconsole-0.6.2.tar.gz > +md5 e8cb2e4dc434e20a3e75acb54d89bdf3 aioconsole-0.7.0.tar.gz > +sha256 c702d24406378d37d9873f91e03ce71520bac503d5ab03f81d8b563ff010bd54 aioconsole-0.7.0.tar.gz > # Locally computed sha256 checksums > sha256 e1c0ad728983d8a57335e52cf1064f1affd1d454173d8cebd3ed8b4a72b48704 LICENSE > diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk > index 602564c290..b109d8e358 100644 > --- a/package/python-aioconsole/python-aioconsole.mk > +++ b/package/python-aioconsole/python-aioconsole.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIOCONSOLE_VERSION = 0.6.2 > +PYTHON_AIOCONSOLE_VERSION = 0.7.0 > PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz > -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/5f/14/e5c634fad6a95ffd602fbbd1aa107f05a8ffb79d33ec0d0477f3b137f8a9 > +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/85/da/6a238a72274fa338b2ff20007f026944a6721245fa65d3bd4adeb83be419 > PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools > PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 > PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 5 13:22:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 14:22:21 +0100 Subject: [Buildroot] [git commit] package/libzenoh-pico: disable on or1k Message-ID: <20240205132229.6521F86C15@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ead797bef768a7f3da7a76dd8510eef48181bb6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The upstream libzenoh-pico code uses asm("nop"), which is completely bogus, and actually breaks build on or1k as the instruction does not exist. In upstream commit https://github.com/eclipse-zenoh/zenoh-pico/commit/7d79a14addcea972e801709413f5c9a5226e3ad3 they made the asm("nop") thing "configurable" with ZP_ASM_NOP, but still that requires some special handling for or1k. The whole thing is a complete mess, and upstream should have to use any of that. Rather than stacking piles of bogus stuff on more bogus stuff, let's simply disable this package for or1k for now. Thanks a lot to Fabrice for all the investigation, and interaction with upstream. See https://patchwork.ozlabs.org/project/buildroot/patch/20240110215515.1263859-1-fontaine.fabrice at gmail.com/ for example. Fixes: - http://autobuild.buildroot.org/results/fd0b2c666a1dc1537162d15b27743abd270243ed Signed-off-by: Thomas Petazzoni --- package/libzenoh-pico/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libzenoh-pico/Config.in b/package/libzenoh-pico/Config.in index 5f7e91c9f6..9dbb260c52 100644 --- a/package/libzenoh-pico/Config.in +++ b/package/libzenoh-pico/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_LIBZENOH_PICO bool "libzenoh-pico" + # upstream hardcodes using asm("nop"), which is bogus and + # doesn't work on or1k + depends on !BR2_or1k depends on BR2_TOOLCHAIN_HAS_THREADS help zenoh-pico is the Eclipse zenoh implementation that targets @@ -11,4 +14,5 @@ config BR2_PACKAGE_LIBZENOH_PICO https://github.com/eclipse-zenoh/zenoh-pico comment "libzenoh-pico needs a toolchain w/ threads" + depends on !BR2_or1k depends on !BR2_TOOLCHAIN_HAS_THREADS From arnout at mind.be Mon Feb 5 13:22:31 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:22:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-security: bump to version 0.5.0 In-Reply-To: <20240107210846.3319912-1-james.hilliard1@gmail.com> References: <20240107210846.3319912-1-james.hilliard1@gmail.com> Message-ID: <7c162b4a-2bf2-4503-ab96-4d28d3cebc01@mind.be> On 07/01/2024 22:08, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-aiohttp-security/python-aiohttp-security.hash | 4 ++-- > package/python-aiohttp-security/python-aiohttp-security.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-aiohttp-security/python-aiohttp-security.hash b/package/python-aiohttp-security/python-aiohttp-security.hash > index 2c23df14d6..6a76070298 100644 > --- a/package/python-aiohttp-security/python-aiohttp-security.hash > +++ b/package/python-aiohttp-security/python-aiohttp-security.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/aiohttp-security/json > -md5 1624f982d7a779e6ed396ef2ed20acc7 aiohttp-security-0.4.0.tar.gz > -sha256 40d4bb150454e392c2dfa3620f6eab28e140e94cf0c2d3b4bf43aef653ec9405 aiohttp-security-0.4.0.tar.gz > +md5 b34fb62c6f4dd130f3c94f74c3bdc150 aiohttp-security-0.5.0.tar.gz > +sha256 50cb724d310e1d0289798bb98ae852c3b75b77e8f51ce5159c57b7261d0638bd aiohttp-security-0.5.0.tar.gz > # Locally computed sha256 checksums > sha256 a1cc8ff7210897d55d2552fa0792340f8e59720e0160b6918699d40f9a782b1c LICENSE > diff --git a/package/python-aiohttp-security/python-aiohttp-security.mk b/package/python-aiohttp-security/python-aiohttp-security.mk > index 9ab3b16b30..274f60423f 100644 > --- a/package/python-aiohttp-security/python-aiohttp-security.mk > +++ b/package/python-aiohttp-security/python-aiohttp-security.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_AIOHTTP_SECURITY_VERSION = 0.4.0 > +PYTHON_AIOHTTP_SECURITY_VERSION = 0.5.0 > PYTHON_AIOHTTP_SECURITY_SOURCE = aiohttp-security-$(PYTHON_AIOHTTP_SECURITY_VERSION).tar.gz > -PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/36/01/d85be376b7c1773b3cb7849cd56dc7d38165664df7de2d3e20af507ef5bb > +PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/31/49/56c131fe3dead875ab5907b154dac7fb6ee727662de80b7da0ff045030d4 > PYTHON_AIOHTTP_SECURITY_SETUP_TYPE = setuptools > PYTHON_AIOHTTP_SECURITY_LICENSE = Apache-2.0 > PYTHON_AIOHTTP_SECURITY_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:22:58 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:22:58 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-attrs: bump to version 23.2.0 In-Reply-To: <20240108070310.3462577-2-james.hilliard1@gmail.com> References: <20240108070310.3462577-1-james.hilliard1@gmail.com> <20240108070310.3462577-2-james.hilliard1@gmail.com> Message-ID: <92589d57-9db6-45d2-a7d0-47db210d1146@mind.be> On 08/01/2024 08:03, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-attrs/python-attrs.hash | 4 ++-- > package/python-attrs/python-attrs.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash > index 0e94c7cef4..d8c6d147d5 100644 > --- a/package/python-attrs/python-attrs.hash > +++ b/package/python-attrs/python-attrs.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/attrs/json > -md5 6623fed7ffa22261ba25fccaf4d99539 attrs-23.1.0.tar.gz > -sha256 6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015 attrs-23.1.0.tar.gz > +md5 60588a146fb413a997c7519d77198a5e attrs-23.2.0.tar.gz > +sha256 935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 attrs-23.2.0.tar.gz > # Locally computed sha256 checksums > sha256 882115c95dfc2af1eeb6714f8ec6d5cbcabf667caff8729f42420da63f714e9f LICENSE > diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk > index 0d704ea111..8a1236cc44 100644 > --- a/package/python-attrs/python-attrs.mk > +++ b/package/python-attrs/python-attrs.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_ATTRS_VERSION = 23.1.0 > +PYTHON_ATTRS_VERSION = 23.2.0 > PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz > -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/97/90/81f95d5f705be17872843536b1868f351805acf6971251ff07c1b8334dbb > +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/e3/fc/f800d51204003fa8ae392c4e8278f256206e7a919b708eef054f5f4b650d > PYTHON_ATTRS_SETUP_TYPE = pep517 > PYTHON_ATTRS_LICENSE = MIT > PYTHON_ATTRS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:23:12 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:23:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-babel: bump to version 2.14.0 In-Reply-To: <20240108070725.3469629-1-james.hilliard1@gmail.com> References: <20240108070725.3469629-1-james.hilliard1@gmail.com> Message-ID: On 08/01/2024 08:07, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-babel/python-babel.hash | 4 ++-- > package/python-babel/python-babel.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-babel/python-babel.hash b/package/python-babel/python-babel.hash > index dc48831c44..ab4e022564 100644 > --- a/package/python-babel/python-babel.hash > +++ b/package/python-babel/python-babel.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/babel/json > -md5 3162229c2daa7c32674ed26f87b63127 Babel-2.13.1.tar.gz > -sha256 33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900 Babel-2.13.1.tar.gz > +md5 3bec3f4c842144c15d839bdde41a44d4 Babel-2.14.0.tar.gz > +sha256 6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363 Babel-2.14.0.tar.gz > # Locally computed sha256 checksums > sha256 908e0ad72053ae27c1d17e3340bd14cff9bf935992ed56526d17c983ab6e7af7 LICENSE > diff --git a/package/python-babel/python-babel.mk b/package/python-babel/python-babel.mk > index f8d2ccd258..eb39b9aef7 100644 > --- a/package/python-babel/python-babel.mk > +++ b/package/python-babel/python-babel.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_BABEL_VERSION = 2.13.1 > +PYTHON_BABEL_VERSION = 2.14.0 > PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz > -PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/aa/6c/737d2345d86741eeb594381394016b9c74c1253b4cbe274bb1e7b5e2138e > +PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/e2/80/cfbe44a9085d112e983282ee7ca4c00429bc4d1ce86ee5f4e60259ddff7f > PYTHON_BABEL_SETUP_TYPE = setuptools > PYTHON_BABEL_LICENSE = BSD-3-Clause > PYTHON_BABEL_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:23:37 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:23:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: bump version to 2.30.0 In-Reply-To: <20240108071410.118585-1-egorenar@linux.ibm.com> References: <20240108071410.118585-1-egorenar@linux.ibm.com> Message-ID: On 08/01/2024 08:14, Alexander Egorenkov wrote: > Signed-off-by: Alexander Egorenkov Applied to master, thanks. Regards, Arnout > --- > package/s390-tools/s390-tools.hash | 2 +- > package/s390-tools/s390-tools.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash > index a00e95437b96..c70bf69f008c 100644 > --- a/package/s390-tools/s390-tools.hash > +++ b/package/s390-tools/s390-tools.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 849ff400dc6c1eb7eebe4aa3e7a4871721c25bcee6cfdd0535a056a038fd3ab0 s390-tools-2.29.0.tar.gz > +sha256 9e565701cc6df4808243027706ee0a76c5fc0c7f9aae0afce1479fd4ff68bcdf s390-tools-2.30.0.tar.gz > sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE > diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk > index c3155a13ff5a..bc39a9bd1970 100644 > --- a/package/s390-tools/s390-tools.mk > +++ b/package/s390-tools/s390-tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -S390_TOOLS_VERSION = 2.29.0 > +S390_TOOLS_VERSION = 2.30.0 > S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) > S390_TOOLS_LICENSE = MIT > S390_TOOLS_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 5 13:24:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 14:24:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/libzenoh-pico: fix or1k build In-Reply-To: <20240110215515.1263859-1-fontaine.fabrice@gmail.com> References: <20240110215515.1263859-1-fontaine.fabrice@gmail.com> Message-ID: <20240205142414.07741505@windsurf> On Wed, 10 Jan 2024 22:55:15 +0100 Fabrice Fontaine wrote: > Fix the following build failure with or1k raises since the addition of > the package in commit a96361901dcc7b962a0c43f163e97a2de65687f3: > > /home/autobuild/autobuild/instance-1/output-1/build/libzenoh-pico-0.10.0-rc/src/link/endpoint.c: Assembler messages: > /home/autobuild/autobuild/instance-1/output-1/build/libzenoh-pico-0.10.0-rc/src/link/endpoint.c:358: Error: unrecognized instruction `nop' > > Fixes: > - http://autobuild.buildroot.org/results/fd0b2c666a1dc1537162d15b27743abd270243ed > > Signed-off-by: Fabrice Fontaine > --- > ...001-Remove-nop-or-replace-with-macro.patch | 131 ++++++++++++++++++ > package/libzenoh-pico/libzenoh-pico.mk | 6 + > 2 files changed, 137 insertions(+) > create mode 100644 package/libzenoh-pico/0001-Remove-nop-or-replace-with-macro.patch Thanks a lot for this new patch. We discussed it with Arnout, and even with this upstream patch the whole thing is still very messy. There seems to be absolutely no reason for upstream to need this ZP_ASM_NOP macro. So rather than piling bogus things on top of more bogus things, I went ahead and applied a fix that just disables this package on or1k. Ideally, we should explain to upstream that these asm("nop") are useless. Thanks for your work! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 13:24:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 14:24:34 +0100 Subject: [Buildroot] [PATCH] package/micropython: add support for manifest.py in the configuration In-Reply-To: <20240204062645.3616072-1-abiliojr@gmail.com> References: <20240204062645.3616072-1-abiliojr@gmail.com> Message-ID: Abilio, All, On 2024-02-03 22:26 -0800, Abilio Marques spake thusly: > Micropython can embed packages an modules as frozen bytecode. What code > gets built this way can be defined by means of a "manifest.py" file. > > This commit exposes the variable FROZEN_MANIFEST to Buildroot users > through a new variable called BR2_PACKAGE_MICROPYTHON_MANIFEST. > > Please check Micropython's documentation for more information: > https://docs.micropython.org/en/latest/reference/manifest.html Minor nit: this blurb should have been in the help text of the new option, and I could have done that when applying, but I have a much more involved question, see below. > Signed-off-by: Abilio Marques > --- > package/micropython/Config.in | 8 ++++++++ > package/micropython/micropython.mk | 5 +++++ > 2 files changed, 13 insertions(+) > > diff --git a/package/micropython/Config.in b/package/micropython/Config.in > index 26a00baab0..52717d815a 100644 > --- a/package/micropython/Config.in > +++ b/package/micropython/Config.in > @@ -17,6 +17,14 @@ config BR2_PACKAGE_MICROPYTHON_LIB > help > Core Python libraries ported to MicroPython. > > +config BR2_PACKAGE_MICROPYTHON_MANIFEST > + string "Path to a manifest.py file" > + help > + MicroPython allows Python code to be ?frozen? as bytecode > + into its binary, as an alternative to loading code from > + the filesystem. See MicroPython's documentation for more > + information. > + > endif # BR2_PACKAGE_MICROPYTHON > > comment "micropython needs a toolchain w/ threads, dynamic library" > diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk > index 125a0edcfb..5a2c136547 100644 > --- a/package/micropython/micropython.mk > +++ b/package/micropython/micropython.mk > @@ -43,6 +43,11 @@ else > MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 > endif > > +ifneq ($(BR2_PACKAGE_MICROPYTHON_MANIFEST),"") > +MICROPYTHON_MAKE_OPTS += \ > + FROZEN_MANIFEST=$(BR2_PACKAGE_MICROPYTHON_MANIFEST) > +endif So, as I understand this, micropython will grab the files (from modules, files, etc...) listed from the manifest and bundle them in the micropython executable. It seems the paths in the manifest can be either absolute, or relative; in the latter case, it not documented what they would be relative to; additionally there are placeholders (see below) that can be used but are absolute paths. So this has a few implications: - the files must be available before micropython is built, so some dependency order is needed to ensure that: if files are provided in a package, then we need a dependency and it is going to be a little bit difficult to do and we need a way to address that; - the paths can't be hard-coded to absolute paths in the manifest file itself, because we don't know beforehand where the buildroot build directory will be, so we need a way to shoehorn $(TOPDIR) or some such variable in the manifest; - absolute paths must be fixed to accommodate the per-package option, because those paths change for eaach package. From the micropython doc, that you pointed above, there are a few placeholders that will be replaced in the manifest, but I don't think we can reuse those: Any paths used in manifest files can include the following variables. These all resolve to absolute paths. * $(MPY_DIR) ? path to the micropython repo. * $(MPY_LIB_DIR) ? path to the micropython-lib submodule. Prefer to use require(). * $(PORT_DIR) ? path to the current port (e.g. ports/stm32) * $(BOARD_DIR) ? path to the current board (e.g. ports/stm32/boards/PYBV11) So we need a bit more information how this feature is to be used, and an example (or a few) would probably help a lot in this respect. We also have a runtime test for micropython, in: support/testing/tests/package/test_micropython.py It would be nice to extend that runtime test as well. Regards, Yann E. MORIN. > define MICROPYTHON_BUILD_CMDS > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From dev at andin.de Mon Feb 5 13:25:43 2024 From: dev at andin.de (Andreas Naumann) Date: Mon, 5 Feb 2024 14:25:43 +0100 Subject: [Buildroot] dracut: no longer works since bump to 059 In-Reply-To: <977bc5e8-28c7-44b4-8651-9522d205aa59@linatsea.fr> References: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> <977bc5e8-28c7-44b4-8651-9522d205aa59@linatsea.fr> Message-ID: Hi, On 04.02.24 10:12, Thierry Bultel wrote: > Dear Adam, > > please see my comments below > > Le 03/02/2024 ? 13:55, Adam Duskett a ?crit?: >> Hello Thierry; >> >> I am going to top-post to bother Yann. ;) >> >> Dracut support in Buildroot is very broken and must be patched to work >> properly. I tried pinpointing the problem, which actually is that the test fails because usr/lib/libz.so is no longer in the produced cpio. Bisecting upstream dracut I arrived at d010fa0 refactor(dracut-install): fork() instead of popen(), sanitise line reading This commit is already contained in tag 058, so bumping to that wouldnt help. Unfortunately the content of the change is something I dont understand right now. It has however the effect that none of /usr/lib/* is landing in the cpio anymore. regards, Andreas > > As long as producing a busybox-init based ramdisk still works ... > >> >> >> Thanks so much! > > Best regards > Thierry > >> Adam >> >> On Thu, Feb 1, 2024 at 1:43?PM Thierry Bultel >> wrote: >> >> ??? Hi, since bump to this version, >> >> ??? invocation of 'ldd' wrapper fails in dracut-install. >> >> ??? After analysis, this is because version uses "execlp" for >> ??? launching the 'ldd' wrapper variable, >> ??? which in out case consists in the executable name + the rootfs >> ??? argument, leading to the fault. >> >> ??? Version 057 used to call "popen" instead that what Ok with that. >> >> ??? Thierry >> >> ??? -- >> ??? www.linatsea.fr >> ??? -- ??? www.linatsea.fr >> ??? _______________________________________________ >> ??? buildroot mailing list >> ??? buildroot at buildroot.org >> ??? https://lists.buildroot.org/mailman/listinfo/buildroot >> > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From peter at korsgaard.com Mon Feb 5 13:26:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 14:26:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sqlparse: bump to version 0.4.4 In-Reply-To: <20240111072146.3076561-1-james.hilliard1@gmail.com> (James Hilliard's message of "Thu, 11 Jan 2024 00:21:46 -0700") References: <20240111072146.3076561-1-james.hilliard1@gmail.com> Message-ID: <878r3zt52d.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Migrate from setuptools to flit build backend. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Mon Feb 5 13:26:48 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:26:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-bitstring: bump to version 4.1.4 In-Reply-To: <20240107114345.2795252-1-fontaine.fabrice@gmail.com> References: <20240107114345.2795252-1-fontaine.fabrice@gmail.com> Message-ID: <275220a4-24b2-4f21-b8bb-fae239a56d37@mind.be> On 07/01/2024 12:43, Fabrice Fontaine wrote: > This bump will fix the following build failure raised since bump to > version 4.1.2 in commit ce2bf7b96b9dba57bb31aca583283736af27afcc: > > *** Error compiling '/home/buildroot/autobuild/instance-0/output-1/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... > Sorry: IndentationError: expected an indented block after function definition on line 6 (plugin_test.py, line 8) > > https://github.com/scott-griffiths/bitstring/blob/bitstring-4.1.4/release_notes.txt > > Fixes: > - http://autobuild.buildroot.org/results/e6fac4cac16de94862e3b4697dd88e856bc9a398 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Arnout > --- > package/python-bitstring/python-bitstring.hash | 4 ++-- > package/python-bitstring/python-bitstring.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash > index c2ff9a69d5..1889983f47 100644 > --- a/package/python-bitstring/python-bitstring.hash > +++ b/package/python-bitstring/python-bitstring.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/bitstring/json > -md5 1750c35e8e45f597725037d35eed9ba1 bitstring-4.1.2.tar.gz > -sha256 c22283d60fd3e1a8f386ccd4f1915d7fe13481d6349db39711421e24d4a9cccf bitstring-4.1.2.tar.gz > +md5 3909415d89586edabd577b62b0d0c1be bitstring-4.1.4.tar.gz > +sha256 94f3f1c45383ebe8fd4a359424ffeb75c2f290760ae8fcac421b44f89ac85213 bitstring-4.1.4.tar.gz > # Locally computed sha256 checksums > sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE > diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk > index 9a5d8dfe84..983491303d 100644 > --- a/package/python-bitstring/python-bitstring.mk > +++ b/package/python-bitstring/python-bitstring.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_BITSTRING_VERSION = 4.1.2 > +PYTHON_BITSTRING_VERSION = 4.1.4 > PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz > -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/23/fc/b5ace4f51fea5bcc7f8cca8859748ea5eb941680b82a5b3687c980d9589b > +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/7f/07/0fd502a29127b968bada3d1824a8af997546d2b9ff73f00e800b3d9888cb > PYTHON_BITSTRING_SETUP_TYPE = setuptools > PYTHON_BITSTRING_LICENSE = MIT > PYTHON_BITSTRING_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 13:26:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 14:26:56 +0100 Subject: [Buildroot] [git commit] package/python-sqlparse: bump to version 0.4.4 Message-ID: <20240205132708.5A48486C33@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e29d91d6ee7513b2a0e4bb49009420c255b9ca5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools to flit build backend. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-sqlparse/python-sqlparse.hash | 4 ++-- package/python-sqlparse/python-sqlparse.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-sqlparse/python-sqlparse.hash b/package/python-sqlparse/python-sqlparse.hash index c78fd2edc3..0b7c14d9ae 100644 --- a/package/python-sqlparse/python-sqlparse.hash +++ b/package/python-sqlparse/python-sqlparse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlparse/json -md5 180fb4e11a3f79b119868d7c102d7816 sqlparse-0.4.3.tar.gz -sha256 69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268 sqlparse-0.4.3.tar.gz +md5 67798c7a0dae90f263d20e9ecf62c8cd sqlparse-0.4.4.tar.gz +sha256 d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c sqlparse-0.4.4.tar.gz # Locally computed sha256 checksums sha256 c1938235b80d39e93138eae89edc3af67e18ecbc40d266529fa57b2dce426310 LICENSE diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 48b1a24822..3f99eb6476 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_SQLPARSE_VERSION = 0.4.3 +PYTHON_SQLPARSE_VERSION = 0.4.4 PYTHON_SQLPARSE_SOURCE = sqlparse-$(PYTHON_SQLPARSE_VERSION).tar.gz -PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/ba/fa/5b7662b04b69f3a34b8867877e4dbf2a37b7f2a5c0bbb5a9eed64efd1ad1 -PYTHON_SQLPARSE_SETUP_TYPE = setuptools +PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/65/16/10f170ec641ed852611b6c9441b23d10b5702ab5288371feab3d36de2574 +PYTHON_SQLPARSE_SETUP_TYPE = flit PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE PYTHON_SQLPARSE_CPE_ID_VENDOR = sqlparse_project From peter at korsgaard.com Mon Feb 5 13:26:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 14:26:55 +0100 Subject: [Buildroot] [git commit] package/python-tempora: bump to version 5.5.0 Message-ID: <20240205132708.4FF7286C31@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d91366dac08f26ce023c757631ccb6cd9e2f2ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to copyright notice removal: https://github.com/jaraco/tempora/commit/5957d58266e479f124b31f30e4322e798fdf386b Drop no longer required python-six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-tempora/Config.in | 1 - package/python-tempora/python-tempora.hash | 6 +++--- package/python-tempora/python-tempora.mk | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-tempora/Config.in b/package/python-tempora/Config.in index 508cbae3f3..3f4481422a 100644 --- a/package/python-tempora/Config.in +++ b/package/python-tempora/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_TEMPORA bool "python-tempora" select BR2_PACKAGE_PYTHON_JARACO_FUNCTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime help Objects and routines pertaining to date and time. diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index ac6483b77f..ff7093394f 100644 --- a/package/python-tempora/python-tempora.hash +++ b/package/python-tempora/python-tempora.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tempora/json -md5 87fc0d99edd557323e61a16017707a8b tempora-5.2.0.tar.gz -sha256 af82eb016decda8daf566d1e4836f94f7f8ba8c7153637460156e081aadc64df tempora-5.2.0.tar.gz +md5 39314c5843bc3f40f8ce4f5cc340c479 tempora-5.5.0.tar.gz +sha256 13e4fcc997d0509c3306d6841f03e9381b7e5e46b2bebfae9151af90085f0c26 tempora-5.5.0.tar.gz # Locally computed sha256 checksums -sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE +sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index 3074ad0de2..d1b333ec0a 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 5.2.0 +PYTHON_TEMPORA_VERSION = 5.5.0 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/97/70/5cf5031a83ca6d0431a53459b2a98aa387ba23d06710a5e48d681ff3956f +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/c9/dc/97d90b9f64dbe4f599023e19602b33a2cced68462db67a3d4805a77cf784 PYTHON_TEMPORA_LICENSE = MIT PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools From peter at korsgaard.com Mon Feb 5 13:26:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 14:26:55 +0100 Subject: [Buildroot] [git commit] package/python-termcolor: bump to version 2.4.0 Message-ID: <20240205132708.464FE86C2F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11bc1d76bafd858b9178c22c8e0d7e60dde1ebbf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-termcolor/python-termcolor.hash | 4 ++-- package/python-termcolor/python-termcolor.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-termcolor/python-termcolor.hash b/package/python-termcolor/python-termcolor.hash index 9be0ad00c8..ed69ab06d1 100644 --- a/package/python-termcolor/python-termcolor.hash +++ b/package/python-termcolor/python-termcolor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/termcolor/json -md5 ba0af4ee713cd0030c2d436091af4241 termcolor-2.2.0.tar.gz -sha256 dfc8ac3f350788f23b2947b3e6cfa5a53b630b612e6cd8965a015a776020b99a termcolor-2.2.0.tar.gz +md5 1d567737d43835549d2fd1bc87ec6c7d termcolor-2.4.0.tar.gz +sha256 aab9e56047c8ac41ed798fa36d892a37aca6b3e9159f3e0c24bc64a9b3ac7b7a termcolor-2.4.0.tar.gz # Locally computed sha256 checksums sha256 e79b6bd82962c1330caaa7c42278567b08667777673f8e2371a624d5715d4c0e COPYING.txt diff --git a/package/python-termcolor/python-termcolor.mk b/package/python-termcolor/python-termcolor.mk index 5cbedfb396..c242cfa474 100644 --- a/package/python-termcolor/python-termcolor.mk +++ b/package/python-termcolor/python-termcolor.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TERMCOLOR_VERSION = 2.2.0 +PYTHON_TERMCOLOR_VERSION = 2.4.0 PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz -PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/e5/4e/b2a54a21092ad2d5d70b0140e4080811bee06a39cc8481651579fe865c89 +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/10/56/d7d66a84f96d804155f6ff2873d065368b25a07222a6fd51c4f24ef6d764 PYTHON_TERMCOLOR_SETUP_TYPE = pep517 PYTHON_TERMCOLOR_LICENSE = MIT PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt From arnout at mind.be Mon Feb 5 13:27:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:27:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-bitstring: bump to version 4.1.4 In-Reply-To: <20240108072233.3485954-1-james.hilliard1@gmail.com> References: <20240108072233.3485954-1-james.hilliard1@gmail.com> Message-ID: On 08/01/2024 08:22, James Hilliard wrote: > Signed-off-by: James Hilliard Fabrice sent a version of this patch that also has an autobuilder reference, so I applied that one. Regards, Arnout > --- > package/python-bitstring/python-bitstring.hash | 4 ++-- > package/python-bitstring/python-bitstring.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash > index c2ff9a69d5..1889983f47 100644 > --- a/package/python-bitstring/python-bitstring.hash > +++ b/package/python-bitstring/python-bitstring.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/bitstring/json > -md5 1750c35e8e45f597725037d35eed9ba1 bitstring-4.1.2.tar.gz > -sha256 c22283d60fd3e1a8f386ccd4f1915d7fe13481d6349db39711421e24d4a9cccf bitstring-4.1.2.tar.gz > +md5 3909415d89586edabd577b62b0d0c1be bitstring-4.1.4.tar.gz > +sha256 94f3f1c45383ebe8fd4a359424ffeb75c2f290760ae8fcac421b44f89ac85213 bitstring-4.1.4.tar.gz > # Locally computed sha256 checksums > sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE > diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk > index 9a5d8dfe84..983491303d 100644 > --- a/package/python-bitstring/python-bitstring.mk > +++ b/package/python-bitstring/python-bitstring.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_BITSTRING_VERSION = 4.1.2 > +PYTHON_BITSTRING_VERSION = 4.1.4 > PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz > -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/23/fc/b5ace4f51fea5bcc7f8cca8859748ea5eb941680b82a5b3687c980d9589b > +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/7f/07/0fd502a29127b968bada3d1824a8af997546d2b9ff73f00e800b3d9888cb > PYTHON_BITSTRING_SETUP_TYPE = setuptools > PYTHON_BITSTRING_LICENSE = MIT > PYTHON_BITSTRING_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:14 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:14 +0100 Subject: [Buildroot] [git commit] package/python-hatch-fancy-pypi-readme: bump to version 24.1.0 Message-ID: <20240205132914.F0FE486C7A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06cdc02ef2d0124972448c4b0ffda3da2530bb23 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- .../python-hatch-fancy-pypi-readme.hash | 6 +++--- .../python-hatch-fancy-pypi-readme.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash index d9fdb88e1f..e3a6363eb7 100644 --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/hatch_fancy_pypi_readme/json -md5 8755cce1a4a4d5e5d84992089801acbf hatch_fancy_pypi_readme-23.1.0.tar.gz -sha256 b1df44063094af1e8248ceacd47a92c9cf313d6b9823bf66af8a927c3960287d hatch_fancy_pypi_readme-23.1.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/hatch-fancy-pypi-readme/json +md5 f5f9e639f066c91f8e623ec6231beae9 hatch_fancy_pypi_readme-24.1.0.tar.gz +sha256 44dd239f1a779b9dcf8ebc9401a611fd7f7e3e14578dcf22c265dfaf7c1514b8 hatch_fancy_pypi_readme-24.1.0.tar.gz # Locally computed sha256 checksums sha256 e69ea57f96e599e617f61af3e85bf326b87e833994709fb5e5908a81197730a2 LICENSE.txt diff --git a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk index 6195a30436..2a26892388 100644 --- a/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCH_FANCY_PYPI_README_VERSION = 23.1.0 +PYTHON_HATCH_FANCY_PYPI_README_VERSION = 24.1.0 PYTHON_HATCH_FANCY_PYPI_README_SOURCE = hatch_fancy_pypi_readme-$(PYTHON_HATCH_FANCY_PYPI_README_VERSION).tar.gz -PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/85/a6/58d585eba4321bf2e7a4d1ed2af141c99d88c1afa4b751926be160f09325 +PYTHON_HATCH_FANCY_PYPI_README_SITE = https://files.pythonhosted.org/packages/b4/c2/c9094283a07dd96c5a8f7a5f1910259d40d2e29223b95dd875a6ca13b58f PYTHON_HATCH_FANCY_PYPI_README_LICENSE = MIT PYTHON_HATCH_FANCY_PYPI_README_LICENSE_FILES = LICENSE.txt PYTHON_HATCH_FANCY_PYPI_README_SETUP_TYPE = pep517 From arnout at mind.be Mon Feb 5 13:28:16 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:16 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-security: bump to version 0.5.0 Message-ID: <20240205132915.114DC86C7F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd5546c0465e1abe3f83b6540e09e4d568409537 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-aiohttp-security/python-aiohttp-security.hash | 4 ++-- package/python-aiohttp-security/python-aiohttp-security.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp-security/python-aiohttp-security.hash b/package/python-aiohttp-security/python-aiohttp-security.hash index 2c23df14d6..6a76070298 100644 --- a/package/python-aiohttp-security/python-aiohttp-security.hash +++ b/package/python-aiohttp-security/python-aiohttp-security.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-security/json -md5 1624f982d7a779e6ed396ef2ed20acc7 aiohttp-security-0.4.0.tar.gz -sha256 40d4bb150454e392c2dfa3620f6eab28e140e94cf0c2d3b4bf43aef653ec9405 aiohttp-security-0.4.0.tar.gz +md5 b34fb62c6f4dd130f3c94f74c3bdc150 aiohttp-security-0.5.0.tar.gz +sha256 50cb724d310e1d0289798bb98ae852c3b75b77e8f51ce5159c57b7261d0638bd aiohttp-security-0.5.0.tar.gz # Locally computed sha256 checksums sha256 a1cc8ff7210897d55d2552fa0792340f8e59720e0160b6918699d40f9a782b1c LICENSE diff --git a/package/python-aiohttp-security/python-aiohttp-security.mk b/package/python-aiohttp-security/python-aiohttp-security.mk index 9ab3b16b30..274f60423f 100644 --- a/package/python-aiohttp-security/python-aiohttp-security.mk +++ b/package/python-aiohttp-security/python-aiohttp-security.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SECURITY_VERSION = 0.4.0 +PYTHON_AIOHTTP_SECURITY_VERSION = 0.5.0 PYTHON_AIOHTTP_SECURITY_SOURCE = aiohttp-security-$(PYTHON_AIOHTTP_SECURITY_VERSION).tar.gz -PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/36/01/d85be376b7c1773b3cb7849cd56dc7d38165664df7de2d3e20af507ef5bb +PYTHON_AIOHTTP_SECURITY_SITE = https://files.pythonhosted.org/packages/31/49/56c131fe3dead875ab5907b154dac7fb6ee727662de80b7da0ff045030d4 PYTHON_AIOHTTP_SECURITY_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SECURITY_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SECURITY_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:11 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:11 +0100 Subject: [Buildroot] [git commit] package/openblas: bump to version v0.3.26 Message-ID: <20240205132914.C6DA386C7A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd3ec6b977a84a324639682f16f82b459382f8e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For change log since v0.3.25, see: https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.26 This commit also update _SITE url to follow download url published on the homepage https://www.openblas.net/ Also https://github.com/xianyi/OpenBLAS is now redirecting to https://github.com/OpenMathLib/OpenBLAS Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/openblas/openblas.hash | 6 +++--- package/openblas/openblas.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index d946ae7296..a0f054dab7 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,5 +1,5 @@ -# From https://github.com/xianyi/OpenBLAS/releases/tag/v0.3.25 -md5 48384e324cd1cdcfbdb0d2e16ca55327 openblas-0.3.25.tar.gz +# From https://github.com/OpenMathLib/OpenBLAS/releases/tag/v0.3.26 +md5 bd496a1c81769ed19a161c1f8f904ccd openblas-0.3.26.tar.gz # Locally calculated -sha256 4c25cb30c4bb23eddca05d7d0a85997b8db6144f5464ba7f8c09ce91e2f35543 openblas-0.3.25.tar.gz +sha256 4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68 openblas-0.3.26.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 76833121a9..2d6cdaa7bb 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.25 -OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) +OPENBLAS_VERSION = 0.3.26 +OPENBLAS_SITE = https://github.com/OpenMathLib/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES From arnout at mind.be Mon Feb 5 13:28:18 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:18 +0100 Subject: [Buildroot] [git commit] package/python-babel: bump to version 2.14.0 Message-ID: <20240205132915.2604186C7A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2af4afbda22b974b8c75abb6ba96b2e3e122e972 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-babel/python-babel.hash | 4 ++-- package/python-babel/python-babel.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-babel/python-babel.hash b/package/python-babel/python-babel.hash index dc48831c44..ab4e022564 100644 --- a/package/python-babel/python-babel.hash +++ b/package/python-babel/python-babel.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/babel/json -md5 3162229c2daa7c32674ed26f87b63127 Babel-2.13.1.tar.gz -sha256 33e0952d7dd6374af8dbf6768cc4ddf3ccfefc244f9986d4074704f2fbd18900 Babel-2.13.1.tar.gz +md5 3bec3f4c842144c15d839bdde41a44d4 Babel-2.14.0.tar.gz +sha256 6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363 Babel-2.14.0.tar.gz # Locally computed sha256 checksums sha256 908e0ad72053ae27c1d17e3340bd14cff9bf935992ed56526d17c983ab6e7af7 LICENSE diff --git a/package/python-babel/python-babel.mk b/package/python-babel/python-babel.mk index f8d2ccd258..eb39b9aef7 100644 --- a/package/python-babel/python-babel.mk +++ b/package/python-babel/python-babel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BABEL_VERSION = 2.13.1 +PYTHON_BABEL_VERSION = 2.14.0 PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz -PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/aa/6c/737d2345d86741eeb594381394016b9c74c1253b4cbe274bb1e7b5e2138e +PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/e2/80/cfbe44a9085d112e983282ee7ca4c00429bc4d1ce86ee5f4e60259ddff7f PYTHON_BABEL_SETUP_TYPE = setuptools PYTHON_BABEL_LICENSE = BSD-3-Clause PYTHON_BABEL_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:13 +0100 Subject: [Buildroot] [git commit] package/python-argh: bump to version 0.31.0 Message-ID: <20240205132914.E6A2F86C2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=362e5cee6237b2f3a341edad11e435773a0d491a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-argh/python-argh.hash | 8 ++++---- package/python-argh/python-argh.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-argh/python-argh.hash b/package/python-argh/python-argh.hash index 8bfb45d1c3..bac9df42d6 100644 --- a/package/python-argh/python-argh.hash +++ b/package/python-argh/python-argh.hash @@ -1,6 +1,6 @@ -# md5 from https://pypi.python.org/pypi/argh/json -md5 7001dd9ff619cf1422ddf8bf813bd08a argh-0.30.4.tar.gz -sha256 9fca8e69c4dad4f8d2a7bdfbdd80b0754462b53510a03e1b5cf2b43a87e6e960 argh-0.30.4.tar.gz -# Locally computed +# md5, sha256 from https://pypi.org/pypi/argh/json +md5 2659a6353589156e6aa65a99797f8913 argh-0.31.0.tar.gz +sha256 b93093544309ddbfe6c73dc9bfd60dbc4acecef39f3f464774b3084a1ec5d7b0 argh-0.31.0.tar.gz +# Locally computed sha256 checksums sha256 2594f46b9b23a5fddeca090faeb270c7ceee8116675fe35082be859aa7466e89 COPYING sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER diff --git a/package/python-argh/python-argh.mk b/package/python-argh/python-argh.mk index ccb9f61d48..0da3281d49 100644 --- a/package/python-argh/python-argh.mk +++ b/package/python-argh/python-argh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ARGH_VERSION = 0.30.4 +PYTHON_ARGH_VERSION = 0.31.0 PYTHON_ARGH_SOURCE = argh-$(PYTHON_ARGH_VERSION).tar.gz -PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/37/3a/175f4a2c47e8c20e59cf25fe69546f76cf1196251a377b182e8f4542b4c4 +PYTHON_ARGH_SITE = https://files.pythonhosted.org/packages/7c/3c/1b7f3fab380c96d61119178040c0183161fe0f182c4da3933bcb3284538f PYTHON_ARGH_SETUP_TYPE = flit PYTHON_ARGH_LICENSE = LGPL-3.0+ PYTHON_ARGH_LICENSE_FILES = COPYING COPYING.LESSER From arnout at mind.be Mon Feb 5 13:28:19 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:19 +0100 Subject: [Buildroot] [git commit] package/s390-tools: bump version to 2.30.0 Message-ID: <20240205132915.2F17086C7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc14e44e63ce84daa338dd85b727b1b263931e0b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Alexander Egorenkov Signed-off-by: Arnout Vandecappelle --- package/s390-tools/s390-tools.hash | 2 +- package/s390-tools/s390-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index a00e95437b..c70bf69f00 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 849ff400dc6c1eb7eebe4aa3e7a4871721c25bcee6cfdd0535a056a038fd3ab0 s390-tools-2.29.0.tar.gz +sha256 9e565701cc6df4808243027706ee0a76c5fc0c7f9aae0afce1479fd4ff68bcdf s390-tools-2.30.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index c3155a13ff..bc39a9bd19 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.29.0 +S390_TOOLS_VERSION = 2.30.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:17 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:17 +0100 Subject: [Buildroot] [git commit] package/python-attrs: bump to version 23.2.0 Message-ID: <20240205132915.1B72086C81@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7dd37e75386d40e837619189ff2799643dbc21ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-attrs/python-attrs.hash | 4 ++-- package/python-attrs/python-attrs.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index 0e94c7cef4..d8c6d147d5 100644 --- a/package/python-attrs/python-attrs.hash +++ b/package/python-attrs/python-attrs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/attrs/json -md5 6623fed7ffa22261ba25fccaf4d99539 attrs-23.1.0.tar.gz -sha256 6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015 attrs-23.1.0.tar.gz +md5 60588a146fb413a997c7519d77198a5e attrs-23.2.0.tar.gz +sha256 935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30 attrs-23.2.0.tar.gz # Locally computed sha256 checksums sha256 882115c95dfc2af1eeb6714f8ec6d5cbcabf667caff8729f42420da63f714e9f LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 0d704ea111..8a1236cc44 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 23.1.0 +PYTHON_ATTRS_VERSION = 23.2.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/97/90/81f95d5f705be17872843536b1868f351805acf6971251ff07c1b8334dbb +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/e3/fc/f800d51204003fa8ae392c4e8278f256206e7a919b708eef054f5f4b650d PYTHON_ATTRS_SETUP_TYPE = pep517 PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:48 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:48 +0100 Subject: [Buildroot] [git commit] package/python-bitstring: bump to version 4.1.4 Message-ID: <20240205132915.380F186C7D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae20955be340cbf9133c6a13a7695759aa4f464b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure raised since bump to version 4.1.2 in commit ce2bf7b96b9dba57bb31aca583283736af27afcc: *** Error compiling '/home/buildroot/autobuild/instance-0/output-1/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... Sorry: IndentationError: expected an indented block after function definition on line 6 (plugin_test.py, line 8) https://github.com/scott-griffiths/bitstring/blob/bitstring-4.1.4/release_notes.txt Fixes: - http://autobuild.buildroot.org/results/e6fac4cac16de94862e3b4697dd88e856bc9a398 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/python-bitstring/python-bitstring.hash | 4 ++-- package/python-bitstring/python-bitstring.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash index c2ff9a69d5..1889983f47 100644 --- a/package/python-bitstring/python-bitstring.hash +++ b/package/python-bitstring/python-bitstring.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bitstring/json -md5 1750c35e8e45f597725037d35eed9ba1 bitstring-4.1.2.tar.gz -sha256 c22283d60fd3e1a8f386ccd4f1915d7fe13481d6349db39711421e24d4a9cccf bitstring-4.1.2.tar.gz +md5 3909415d89586edabd577b62b0d0c1be bitstring-4.1.4.tar.gz +sha256 94f3f1c45383ebe8fd4a359424ffeb75c2f290760ae8fcac421b44f89ac85213 bitstring-4.1.4.tar.gz # Locally computed sha256 checksums sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk index 9a5d8dfe84..983491303d 100644 --- a/package/python-bitstring/python-bitstring.mk +++ b/package/python-bitstring/python-bitstring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BITSTRING_VERSION = 4.1.2 +PYTHON_BITSTRING_VERSION = 4.1.4 PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/23/fc/b5ace4f51fea5bcc7f8cca8859748ea5eb941680b82a5b3687c980d9589b +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/7f/07/0fd502a29127b968bada3d1824a8af997546d2b9ff73f00e800b3d9888cb PYTHON_BITSTRING_SETUP_TYPE = setuptools PYTHON_BITSTRING_LICENSE = MIT PYTHON_BITSTRING_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:15 +0100 Subject: [Buildroot] [git commit] package/python-aioconsole: bump to version 0.7.0 Message-ID: <20240205132915.06EC986C7E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d8d458ec6f9a5b8aba2fa3f2252965f59c66caf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-aioconsole/python-aioconsole.hash | 4 ++-- package/python-aioconsole/python-aioconsole.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index b8237ed76c..b52140cca5 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 0f7e4db85113d1ffdc5f0fa1dc0a37de aioconsole-0.6.2.tar.gz -sha256 bac11286f1062613d2523ceee1ba81c676cd269812b865b66b907448a7b5f63e aioconsole-0.6.2.tar.gz +md5 e8cb2e4dc434e20a3e75acb54d89bdf3 aioconsole-0.7.0.tar.gz +sha256 c702d24406378d37d9873f91e03ce71520bac503d5ab03f81d8b563ff010bd54 aioconsole-0.7.0.tar.gz # Locally computed sha256 checksums sha256 e1c0ad728983d8a57335e52cf1064f1affd1d454173d8cebd3ed8b4a72b48704 LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 602564c290..b109d8e358 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.6.2 +PYTHON_AIOCONSOLE_VERSION = 0.7.0 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/5f/14/e5c634fad6a95ffd602fbbd1aa107f05a8ffb79d33ec0d0477f3b137f8a9 +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/85/da/6a238a72274fa338b2ff20007f026944a6721245fa65d3bd4adeb83be419 PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE From arnout at mind.be Mon Feb 5 13:28:12 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 5 Feb 2024 14:28:12 +0100 Subject: [Buildroot] [git commit] package/python-alembic: bump to version 1.13.1 Message-ID: <20240205132914.DA41A86C7B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa51f4ac41327eb8277938f2e8f5c11c59113cb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new runtime dependencies: - python-sqlalchemy - python-mako - python-typing-extensions Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-alembic/Config.in | 3 +++ package/python-alembic/python-alembic.hash | 4 ++-- package/python-alembic/python-alembic.mk | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/python-alembic/Config.in b/package/python-alembic/Config.in index a53dde7f7f..33fe3c3682 100644 --- a/package/python-alembic/Config.in +++ b/package/python-alembic/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_PYTHON_ALEMBIC bool "python-alembic" + select BR2_PACKAGE_PYTHON_MAKO # runtime + select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime help Alembic is a database migrations tool written by the author of SQLAlchemy. diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash index df1f4fba02..1f752ebc7e 100644 --- a/package/python-alembic/python-alembic.hash +++ b/package/python-alembic/python-alembic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/alembic/json -md5 642d563af853b317f018026f3edd5dba alembic-1.12.1.tar.gz -sha256 bca5877e9678b454706347bc10b97cb7d67f300320fa5c3a94423e8266e2823f alembic-1.12.1.tar.gz +md5 29579d34ea694627280b52a3d3116664 alembic-1.13.1.tar.gz +sha256 4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595 alembic-1.13.1.tar.gz # Locally computed sha256 checksums sha256 b285268a86f4416eaf4d05b2ae3880c156f7c59a8f935a402bc056eafb33af08 LICENSE diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk index fd41e0df66..52e30e39ba 100644 --- a/package/python-alembic/python-alembic.mk +++ b/package/python-alembic/python-alembic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALEMBIC_VERSION = 1.12.1 +PYTHON_ALEMBIC_VERSION = 1.13.1 PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz -PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/44/b4/253fe31261d9f5d603d89bd9e6fba1625494a6d761d319902dfe4db59016 +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/7b/24/ddce068e2ac9b5581bd58602edb2a1be1b0752e1ff2963c696ecdbe0470d PYTHON_ALEMBIC_SETUP_TYPE = setuptools PYTHON_ALEMBIC_LICENSE = MIT PYTHON_ALEMBIC_LICENSE_FILES = LICENSE From bubu at git.sr.ht Mon Feb 5 13:08:32 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 14:08:32 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: add minimalmodbus runtime test Message-ID: <170713978507.21324.6362507954144029814-0@git.sr.ht> From: Marcus Hoffmann Signed-off-by: Marcus Hoffmann --- .../tests/package/sample_python_minimalmodbus.py | 7 +++++++ .../tests/package/test_python_minimalmodbus.py | 11 +++++++++++ 2 files changed, 18 insertions(+) create mode 100644 support/testing/tests/package/sample_python_minimalmodbus.py create mode 100644 support/testing/tests/package/test_python_minimalmodbus.py diff --git a/support/testing/tests/package/sample_python_minimalmodbus.py b/support/testing/tests/package/sample_python_minimalmodbus.py new file mode 100644 index 0000000000..a75145f900 --- /dev/null +++ b/support/testing/tests/package/sample_python_minimalmodbus.py @@ -0,0 +1,7 @@ +import minimalmodbus +from serial.serialutil import SerialException + +try: + instrument = minimalmodbus.Instrument('/dev/ttyUSB99', 1) +except SerialException: + pass diff --git a/support/testing/tests/package/test_python_minimalmodbus.py b/support/testing/tests/package/test_python_minimalmodbus.py new file mode 100644 index 0000000000..53813406de --- /dev/null +++ b/support/testing/tests/package/test_python_minimalmodbus.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Minimalmodbus(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MINIMALMODBUS=y + """ + sample_scripts = ["tests/package/sample_python_minimalmodbus.py"] -- 2.38.5 From thomas.petazzoni at bootlin.com Mon Feb 5 13:32:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 14:32:26 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-tcolorpy: new package In-Reply-To: <20240111030022.2676853-1-james.hilliard1@gmail.com> References: <20240111030022.2676853-1-james.hilliard1@gmail.com> Message-ID: <20240205143226.1aefed76@windsurf> On Wed, 10 Jan 2024 20:00:21 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/Config.in | 1 + > package/python-tcolorpy/Config.in | 7 +++++++ > package/python-tcolorpy/python-tcolorpy.hash | 5 +++++ > package/python-tcolorpy/python-tcolorpy.mk | 14 ++++++++++++++ > 4 files changed, 27 insertions(+) > create mode 100644 package/python-tcolorpy/Config.in > create mode 100644 package/python-tcolorpy/python-tcolorpy.hash > create mode 100644 package/python-tcolorpy/python-tcolorpy.mk Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 13:33:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 14:33:50 +0100 Subject: [Buildroot] [git commit] package/python-pytablewriter: bump to version 1.2.0 Message-ID: <20240205133402.A37FF86C90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f62d1ad32a2d1903840be8416b7d5b5f419fa86e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required python-msgfy runtime dependency. Drop no longer required python-six runtime dependency. Add new python-tcolorpy runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pytablewriter/Config.in | 11 ++++++----- package/python-pytablewriter/python-pytablewriter.hash | 4 ++-- package/python-pytablewriter/python-pytablewriter.mk | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/package/python-pytablewriter/Config.in b/package/python-pytablewriter/Config.in index 041c30eb6c..e0252625cd 100644 --- a/package/python-pytablewriter/Config.in +++ b/package/python-pytablewriter/Config.in @@ -2,14 +2,15 @@ config BR2_PACKAGE_PYTHON_PYTABLEWRITER bool "python-pytablewriter" select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime - select BR2_PACKAGE_PYTHON_MSGFY # runtime select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime + select BR2_PACKAGE_PYTHON_TCOLORPY # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime help - pytablewriter is a python library to write a table in various - formats: CSV, HTML, JavaScript, JSON, Markdown, Excel, Pandas, - Python, reStructuredText. + pytablewriter is a Python library to write a table in + various formats: AsciiDoc / CSV / Elasticsearch / HTML / + JavaScript / JSON / LaTeX / LDJSON / LTSV / Markdown / + MediaWiki / NumPy / Excel / Pandas / Python / + reStructuredText / SQLite / TOML / TSV / YAML. https://github.com/thombashi/pytablewriter diff --git a/package/python-pytablewriter/python-pytablewriter.hash b/package/python-pytablewriter/python-pytablewriter.hash index f082542dfb..d4432ee121 100644 --- a/package/python-pytablewriter/python-pytablewriter.hash +++ b/package/python-pytablewriter/python-pytablewriter.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytablewriter/json -md5 0eaa4a2429d22389b5e4b8c5f5135bbb pytablewriter-0.64.2.tar.gz -sha256 99409d401d6ef5f06d1bc40f265a8e3053afe4cbfbaf709f71124076afb40dbb pytablewriter-0.64.2.tar.gz +md5 4e3d421d026f30fadec4ac1670e524ee pytablewriter-1.2.0.tar.gz +sha256 0204a4bb684a22140d640f2599f09e137bcdc18b3dd49426f4a555016e246b46 pytablewriter-1.2.0.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-pytablewriter/python-pytablewriter.mk b/package/python-pytablewriter/python-pytablewriter.mk index d865a89330..d8bc3615dd 100644 --- a/package/python-pytablewriter/python-pytablewriter.mk +++ b/package/python-pytablewriter/python-pytablewriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEWRITER_VERSION = 0.64.2 +PYTHON_PYTABLEWRITER_VERSION = 1.2.0 PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz -PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/a6/e1/50c1cd9734a9edc1386913b178f9e4757c1bc37665c1855a6596c25957d6 +PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/cc/a9/76aa4430d32ae10b23e4347006dc4c67a3e2a00621e4bb38a60c1a77f15e PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools PYTHON_PYTABLEWRITER_LICENSE = MIT PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Mon Feb 5 13:33:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 14:33:49 +0100 Subject: [Buildroot] [git commit] package/python-tcolorpy: new package Message-ID: <20240205133402.99DAC86C8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5351578b9698021704df06e840047b0b0c7b372b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-tcolorpy/Config.in | 7 +++++++ package/python-tcolorpy/python-tcolorpy.hash | 5 +++++ package/python-tcolorpy/python-tcolorpy.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) diff --git a/package/Config.in b/package/Config.in index ca1368124f..7fc383da83 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1365,6 +1365,7 @@ menu "External python modules" source "package/python-starlette/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" + source "package/python-tcolorpy/Config.in" source "package/python-tempora/Config.in" source "package/python-termcolor/Config.in" source "package/python-terminaltables/Config.in" diff --git a/package/python-tcolorpy/Config.in b/package/python-tcolorpy/Config.in new file mode 100644 index 0000000000..e3e9058483 --- /dev/null +++ b/package/python-tcolorpy/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TCOLORPY + bool "python-tcolorpy" + help + Tcolopy is a Python library to apply true color for + terminal text. + + https://github.com/thombashi/tcolorpy diff --git a/package/python-tcolorpy/python-tcolorpy.hash b/package/python-tcolorpy/python-tcolorpy.hash new file mode 100644 index 0000000000..cf5ca0e5f3 --- /dev/null +++ b/package/python-tcolorpy/python-tcolorpy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tcolorpy/json +md5 ca571cccff812ecdc0c73968c9d24ebf tcolorpy-0.1.4.tar.gz +sha256 f0dceb1cb95e554cee63024b3cd2fd8d4628c568773de2d1e6b4f0478461901c tcolorpy-0.1.4.tar.gz +# Locally computed sha256 checksums +sha256 f41a0456d5f2bba25fd4d7e50b51a95de304770ff1db5a79515d03397a914d8d LICENSE diff --git a/package/python-tcolorpy/python-tcolorpy.mk b/package/python-tcolorpy/python-tcolorpy.mk new file mode 100644 index 0000000000..5c42320c17 --- /dev/null +++ b/package/python-tcolorpy/python-tcolorpy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-tcolorpy +# +################################################################################ + +PYTHON_TCOLORPY_VERSION = 0.1.4 +PYTHON_TCOLORPY_SOURCE = tcolorpy-$(PYTHON_TCOLORPY_VERSION).tar.gz +PYTHON_TCOLORPY_SITE = https://files.pythonhosted.org/packages/ba/e0/20b99847e76bb89784b68634399261d770b01054bca16cd19a06ac9c2e67 +PYTHON_TCOLORPY_SETUP_TYPE = setuptools +PYTHON_TCOLORPY_LICENSE = MIT +PYTHON_TCOLORPY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From buildroot at bubu1.eu Mon Feb 5 13:34:05 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 14:34:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-starlette: bump to version 0.34.0 In-Reply-To: <87sf27upph.fsf@48ers.dk> References: <20240111072922.3082638-1-james.hilliard1@gmail.com> <87sf27upph.fsf@48ers.dk> Message-ID: <42594955-dcd4-4161-9a84-879f096d49f7@bubu1.eu> Hi Peter, On 05.02.24 12:15, Peter Korsgaard wrote: >>>>>> "James" == James Hilliard writes: > > > Signed-off-by: James Hilliard > > Committed, thanks. > We currently have fastapi 0.105.0 in buildroot which depends on starlette < 0.28.0. There's a pending patch by James that bumps it to 0.108.0, which unfortunately is also not compatible with starlette 0.34.0 [1] :-/ In fact there's no fastapi release that is compatible with starlette 0.34.0 (newer fastapi releases require even newer starlette versions...) I guess I'll send a series that bumps *both* again to compatible versions? Marcus [1] https://github.com/tiangolo/fastapi/blob/0.108.0/pyproject.toml#L43C27-L43C29 From romain.naour at smile.fr Mon Feb 5 13:35:30 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 14:35:30 +0100 Subject: [Buildroot] [PATCH] support/testing: TestGrubX8664EFI: use Nehalem cpu emulation Message-ID: <20240205133530.1188319-1-romain.naour@smile.fr> Following the Bootlin toolchain bump to 2023.11-1 [1], the TestGrubX8664EFI failed with this error: # efivar -l traps: efivar[86] trap invalid opcode ip:7fc187f4c7f4 sp:7fff9bbaa930 error:0 in libefivar.so.1.38[7fc187f4c000+16000] Illegal instruction Actually this error can be reproduced by installing other packages like "file" because the qemu emulation doesn't provide all assembler instruction emulation required by x86-64-core-i7 target used by TestGrubX8664EFI. A similar issue has been fixed in toolchain-builder by adding Nehalem cpu emulation on the qemu command line [2]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 [1] 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 [2] https://gitlab.com/buildroot.org/toolchains-builder/-/commit/f2b253732b4d1fc5b87badba7c2d48f12a197f76 Signed-off-by: Romain Naour --- support/testing/tests/boot/test_grub.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py index 9f3a6a8495..5315fa23ba 100644 --- a/support/testing/tests/boot/test_grub.py +++ b/support/testing/tests/boot/test_grub.py @@ -120,7 +120,7 @@ class TestGrubX8664EFI(infra.basetest.BRTest): # https://github.com/tianocore/edk2/commit/bf5678b5802685e07583e3c7ec56d883cbdd5da3 # http://lists.busybox.net/pipermail/buildroot/2023-July/670825.html qemu_fw_cfg = "name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes" - self.emulator.boot(arch="x86_64", options=["-bios", bios, "-hda", hda, "-fw_cfg", qemu_fw_cfg]) + self.emulator.boot(arch="x86_64", options=["-bios", bios, "-cpu", "Nehalem", "-hda", hda, "-fw_cfg", qemu_fw_cfg]) self.emulator.login() cmd = "modprobe efivarfs" -- 2.43.0 From buildroot at bubu1.eu Mon Feb 5 13:38:12 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 14:38:12 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package In-Reply-To: <170712853287.18164.6368517214119629150-0@git.sr.ht> References: <170712853287.18164.6368517214119629150-0@git.sr.ht> Message-ID: <02f46330-bc2b-4dec-a933-0e086db94f2c@bubu1.eu> Forgot my SoB On 21.09.23 22:39, ~bubu wrote: > From: Marcus Hoffmann > > Calling `setup.py` build builds and installs an empty package > after upstream changed their packaging. Calling setuptools via > `python -m build` builds the package correctly. Signed-off-by: Marcus Hoffmann > --- > package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk > index 5a6e7733be..cb8a0d8cc9 100644 > --- a/package/python-minimalmodbus/python-minimalmodbus.mk > +++ b/package/python-minimalmodbus/python-minimalmodbus.mk > @@ -7,7 +7,8 @@ > PYTHON_MINIMALMODBUS_VERSION = 2.1.1 > PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz > PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 > -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools > +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools > +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 > PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 > PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE > From yann.morin.1998 at free.fr Mon Feb 5 13:47:40 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 14:47:40 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package In-Reply-To: <02f46330-bc2b-4dec-a933-0e086db94f2c@bubu1.eu> References: <170712853287.18164.6368517214119629150-0@git.sr.ht> <02f46330-bc2b-4dec-a933-0e086db94f2c@bubu1.eu> Message-ID: Marcus, All, On 2024-02-05 14:38 +0100, Marcus Hoffmann via buildroot spake thusly: > Forgot my SoB > On 21.09.23 22:39, ~bubu wrote: > > From: Marcus Hoffmann > > Calling `setup.py` build builds and installs an empty package > > after upstream changed their packaging. Calling setuptools via > > `python -m build` builds the package correctly. > Signed-off-by: Marcus Hoffmann Thanks. However, the SoB line needs to match the author of the commit, and that does not match: Author: Marcus Hoffmann Signed-off-by: Marcus Hoffmann Regards, Yann E. MORIN. > > --- > > package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk > > index 5a6e7733be..cb8a0d8cc9 100644 > > --- a/package/python-minimalmodbus/python-minimalmodbus.mk > > +++ b/package/python-minimalmodbus/python-minimalmodbus.mk > > @@ -7,7 +7,8 @@ > > PYTHON_MINIMALMODBUS_VERSION = 2.1.1 > > PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz > > PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 > > -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools > > +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools > > +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 > > PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 > > PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From asd617140123 at gmail.com Mon Feb 5 13:58:31 2024 From: asd617140123 at gmail.com (Nigel Wang) Date: Mon, 5 Feb 2024 21:58:31 +0800 Subject: [Buildroot] [PATCH 1/1] board/cubietech/cubieboard4 : Add config file for cubieboard4. Message-ID: <20240205135831.34656-1-asd617140123@gmail.com> From: nigel_wang This is a new defconfig for cubieboard4. The following is board's detail. - SOC: sunxiA80. - DRAM: 2GiB DDR3 @ 672MHZ. - NAND: 8GBeMMC - Power: DC 5V. - Network: Wifi 80211 b/g/n. - Ethernet: RTL8211E reference: https://linux-sunxi.org/Cubietech_Cubieboard4 Board support package includes the following components: - mainline Linux Kernel 6.6.8 - mainline U-boot 2021.10. Signed-off-by: Nigel Wang --- v3 -> v4 * squash all commit, make the commit log is clear. v2 -> v3 * Add BR2_cortex_a15_a7=y in buildroot defconfig. * Bump linux version to 6.6.8 * Using sunxi_defconfig in kernel. * Using "make savedefconfig" to save defconfig, it can only save the changed config in buildroot. * Change kernel's path in extlinux. Make it can boot up successfully. --- board/cubietech/cubieboard4/boot.cmd | 5 +++ board/cubietech/cubieboard4/extlinux.conf | 5 +++ board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 board/cubietech/cubieboard4/boot.cmd create mode 100644 board/cubietech/cubieboard4/extlinux.conf create mode 100644 board/cubietech/cubieboard4/genimage.cfg create mode 100755 board/cubietech/cubieboard4/post-image.sh create mode 100644 configs/cubieboard4_defconfig diff --git a/board/cubietech/cubieboard4/boot.cmd b/board/cubietech/cubieboard4/boot.cmd new file mode 100644 index 0000000000..6521243696 --- /dev/null +++ b/board/cubietech/cubieboard4/boot.cmd @@ -0,0 +1,5 @@ +setenv fdt_high ffffffff +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait +fatload mmc 0 $kernel_addr_r zImage +fatload mmc 0 $fdt_addr_r sun9i-a80-cubieboard4.dtb +bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf new file mode 100644 index 0000000000..5084e2237b --- /dev/null +++ b/board/cubietech/cubieboard4/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /boot/zImage + devicetree /sun9i-a80-cubieboard4.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg new file mode 100644 index 0000000000..f1dee13923 --- /dev/null +++ b/board/cubietech/cubieboard4/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the Cubieboard2 +# Based in the Orange Pi genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun9i-a80-cubieboard4.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh new file mode 100755 index 0000000000..e37b960a4d --- /dev/null +++ b/board/cubietech/cubieboard4/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig new file mode 100644 index 0000000000..0592fe4a2d --- /dev/null +++ b/configs/cubieboard4_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 5 14:10:27 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 15:10:27 +0100 Subject: [Buildroot] [v1 4/4] configs: add raspberrypi 5 defconfig In-Reply-To: <20231121193448.1151936-5-gael.portay@rtone.fr> References: <20231121193448.1151936-1-gael.portay@rtone.fr> <20231121193448.1151936-5-gael.portay@rtone.fr> Message-ID: Hi Ga?l, On 21/11/23 20:34, Ga?l PORTAY wrote: > This configuration builds an image for the RaspberryPi 5. can you please point an URL to the product page and briefly description of the board? > Signed-off-by: Ga?l PORTAY > --- > board/raspberrypi/cmdline_5.txt | 1 + > board/raspberrypi/config_5.txt | 24 ++++++++++++++++++++ > board/raspberrypi/readme.txt | 8 ++++++- > board/raspberrypi5 | 1 + > configs/raspberrypi5_defconfig | 39 +++++++++++++++++++++++++++++++++ > 5 files changed, 72 insertions(+), 1 deletion(-) > create mode 100644 board/raspberrypi/cmdline_5.txt > create mode 100644 board/raspberrypi/config_5.txt > create mode 120000 board/raspberrypi5 > create mode 100644 configs/raspberrypi5_defconfig > > diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt > new file mode 100644 > index 0000000000..ac457353e2 > --- /dev/null > +++ b/board/raspberrypi/cmdline_5.txt > @@ -0,0 +1 @@ > +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 > diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt > new file mode 100644 > index 0000000000..d25c29558d > --- /dev/null > +++ b/board/raspberrypi/config_5.txt > @@ -0,0 +1,24 @@ > +# Please note that this is only a sample, we recommend you to change it to fit > +# your needs. > +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. > +# See http://buildroot.org/manual.html#rootfs-custom > +# and http://elinux.org/RPiconfig for a description of config.txt syntax > + > +kernel=Image > + > +# To use an external initramfs file > +#initramfs rootfs.cpio.gz > + > +# Disable overscan assuming the display supports displaying the full resolution > +# If the text shown on the screen disappears off the edge, comment this out > +disable_overscan=1 > + > +# How much memory in MB to assign to the GPU on Pi models having > +# 256, 512 or 1024 MB total memory > +gpu_mem_256=100 > +gpu_mem_512=100 > +gpu_mem_1024=100 > + > +dtoverlay=vc4-kms-v3d-pi5 > +dtoverlay=imx219 > +#dtoverlay=ov5647 please drop this last line ^^^ > diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt > index c81fd801ae..4bdd7b3e8c 100644 > --- a/board/raspberrypi/readme.txt > +++ b/board/raspberrypi/readme.txt > @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: > - the model B3 (aka Raspberry Pi 3). > - the model B4 (aka Raspberry Pi 4). > - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). > + - the model B5 (aka Raspberry Pi 5). > > How to build it > =============== > @@ -17,7 +18,7 @@ How to build it > Configure Buildroot > ------------------- > > -There are two RaspberryPi defconfig files in Buildroot, one for each > +There are serveral RaspberryPi defconfig files in Buildroot, one for each > major variant, which you should base your work on: > > For models A, B, A+ or B+: > @@ -60,6 +61,10 @@ or for CM4 (on IO Board - 64 bit): > > $ make raspberrypicm4io_64_defconfig > > +For model 5 B (64 bit): > + > + $ make raspberrypi5_64_defconfig > + > Build the rootfs > ---------------- > > @@ -90,6 +95,7 @@ After building, you should obtain this tree: > +-- bcm2710-rpi-cm3.dtb [1] > +-- bcm2711-rpi-4-b.dtb [1] > +-- bcm2711-rpi-cm4.dtb [1] > + +-- bcm2712-rpi-5-b.dtb [1] > +-- bcm2837-rpi-3-b.dtb [1] > +-- boot.vfat > +-- rootfs.ext4 > diff --git a/board/raspberrypi5 b/board/raspberrypi5 > new file mode 120000 > index 0000000000..fcdafc81ed > --- /dev/null > +++ b/board/raspberrypi5 > @@ -0,0 +1 @@ > +raspberrypi > \ No newline at end of file Please add newline > diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig > new file mode 100644 > index 0000000000..391df9696a > --- /dev/null > +++ b/configs/raspberrypi5_defconfig > @@ -0,0 +1,39 @@ > +BR2_aarch64=y > +BR2_cortex_a76_a55=y I've found that BCM2712 is a quad-cortex A76 and not A76+A55, so if I'm correct with BCM2712 on Raspberry 5 SoC model you should enable: BR2_cortex_a76=y > +BR2_ARM_FPU_VFPV4=y I can't find informations on which type of FPU implementation BCM2712 has but here: https://en.wikipedia.org/wiki/Raspberry_Pi I see: that all Raspberry up to version 4 support VFPV4 so it makes sense to enable VFPV4. Have you tested some package that uses FPU extensively? > +BR2_ARM64_PAGE_SIZE_16K=y > + > +BR2_TOOLCHAIN_BUILDROOT_CXX=y Is there a reason for CXX to be added? > + > +BR2_SYSTEM_DHCP="eth0" > + > +# Linux headers same as kernel, a 6.1 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > + > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,feb4ea51e77af09c1a4c7c3e5dd33237750f95cd)/linux-feb4ea51e77af09c1a4c7c3e5dd33237750f95cd.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" > + > +# Build the DTB from the kernel sources > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" > + > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_RPI_FIRMWARE=y > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Mon Feb 5 14:20:21 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 15:20:21 +0100 Subject: [Buildroot] [PATCH 1/1] board/cubietech/cubieboard4 : Add config file for cubieboard4. In-Reply-To: <20240205135831.34656-1-asd617140123@gmail.com> References: <20240205135831.34656-1-asd617140123@gmail.com> Message-ID: Hi Nigel, On 05/02/24 14:58, Nigel Wang wrote: > From: nigel_wang > > This is a new defconfig for cubieboard4. The following is board's > detail. > - SOC: sunxiA80. > - DRAM: 2GiB DDR3 @ 672MHZ. > - NAND: 8GBeMMC > - Power: DC 5V. > - Network: Wifi 80211 b/g/n. > - Ethernet: RTL8211E > reference: > https://linux-sunxi.org/Cubietech_Cubieboard4 > > Board support package includes the following components: > - mainline Linux Kernel 6.6.8 > - mainline U-boot 2021.10. > > Signed-off-by: Nigel Wang > --- > v3 -> v4 > * squash all commit, make the commit log is clear. > > v2 -> v3 > * Add BR2_cortex_a15_a7=y in buildroot defconfig. > * Bump linux version to 6.6.8 > * Using sunxi_defconfig in kernel. > * Using "make savedefconfig" to save defconfig, it can only save the > changed config in buildroot. > * Change kernel's path in extlinux. Make it can boot up successfully. > > --- > board/cubietech/cubieboard4/boot.cmd | 5 +++ > board/cubietech/cubieboard4/extlinux.conf | 5 +++ > board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ > board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ > configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ > 5 files changed, 105 insertions(+) > create mode 100644 board/cubietech/cubieboard4/boot.cmd > create mode 100644 board/cubietech/cubieboard4/extlinux.conf > create mode 100644 board/cubietech/cubieboard4/genimage.cfg > create mode 100755 board/cubietech/cubieboard4/post-image.sh > create mode 100644 configs/cubieboard4_defconfig > > diff --git a/board/cubietech/cubieboard4/boot.cmd b/board/cubietech/cubieboard4/boot.cmd > new file mode 100644 > index 0000000000..6521243696 > --- /dev/null > +++ b/board/cubietech/cubieboard4/boot.cmd > @@ -0,0 +1,5 @@ > +setenv fdt_high ffffffff > +setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > +fatload mmc 0 $kernel_addr_r zImage > +fatload mmc 0 $fdt_addr_r sun9i-a80-cubieboard4.dtb > +bootz $kernel_addr_r - $fdt_addr_r since now you've added extlinux.conf you can drop boot.cmd file above ^^^ > diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf > new file mode 100644 > index 0000000000..5084e2237b > --- /dev/null > +++ b/board/cubietech/cubieboard4/extlinux.conf > @@ -0,0 +1,5 @@ > +label linux > + kernel /boot/zImage > + devicetree /sun9i-a80-cubieboard4.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > + > diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg > new file mode 100644 > index 0000000000..f1dee13923 > --- /dev/null > +++ b/board/cubietech/cubieboard4/genimage.cfg > @@ -0,0 +1,38 @@ > +# Minimal SD card image for the Cubieboard2 > +# Based in the Orange Pi genimage.cfg > + > +image boot.vfat { > + vfat { > + files = { > + "zImage", > + "sun9i-a80-cubieboard4.dtb", > + "extlinux" > + } > + } > + > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1016K # 1MB - 8KB > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 512M > + } > +} > diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh > new file mode 100755 > index 0000000000..e37b960a4d > --- /dev/null > +++ b/board/cubietech/cubieboard4/post-image.sh > @@ -0,0 +1,18 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf > + > +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > + > +rm -rf "${GENIMAGE_TMP}" > + > +genimage \ > + --rootpath "${TARGET_DIR}" \ > + --tmppath "${GENIMAGE_TMP}" \ > + --inputpath "${BINARIES_DIR}" \ > + --outputpath "${BINARIES_DIR}" \ > + --config "${GENIMAGE_CFG}" > + > +exit $? > diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig > new file mode 100644 > index 0000000000..0592fe4a2d > --- /dev/null > +++ b/configs/cubieboard4_defconfig > @@ -0,0 +1,39 @@ > +# Architecture > +BR2_arm=y > +BR2_cortex_a15_a7=y > +BR2_ARM_FPU_NEON_VFPV4=y > + > +# System > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y You need to add your entry in DEVELOPERS file as this board maintainer. When sending next patch please tag it as V2 with: $ git format-patch -s -M -o . -1 -v2 Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Mon Feb 5 14:27:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:27:05 +0100 Subject: [Buildroot] [git commit] package/sysstat: update upstream location Message-ID: <20240205142727.38F9D86C99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35a2cb02277acae94f018a0d22138dc9de005fdf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The http://pagesperso-orange.fr service being down, http://pagesperso-orange.fr/sebastien.godard/ is no longer accessible (or more precisely serves some HTML junk), meaning that we currently cannot download the tarball of sysstat from the official upstream location, and we always fallback to sources.buildroot.net. This commit therefore updates to use the new upstream location on github.io. The 12.6.1 release is available there, with the same hash, so we can just point to the new upstream location. Fixes: ERROR: while checking hashes from package/sysstat//sysstat.hash ERROR: sysstat-12.6.1.tar.xz has wrong sha1 hash: ERROR: expected: a730982e0c2d4964a0022c1509f3ea0a345402bc ERROR: got : d64a079729f2ff5b304294d68fbc041a46c4966d ERROR: Incomplete download, or man-in-the-middle (MITM) attack Signed-off-by: Thomas Petazzoni --- package/sysstat/Config.in | 2 +- package/sysstat/sysstat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in index 442b787684..efb640fd43 100644 --- a/package/sysstat/Config.in +++ b/package/sysstat/Config.in @@ -36,4 +36,4 @@ config BR2_PACKAGE_SYSSTAT * TTY device activity * Power management statistics - http://pagesperso-orange.fr/sebastien.godard/ + https://sysstat.github.io/ diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index ca05ec50d8..ec0c666157 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -6,7 +6,7 @@ SYSSTAT_VERSION = 12.6.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz -SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard +SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ From sebastien.szymanski at armadeus.com Mon Feb 5 14:20:06 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Mon, 5 Feb 2024 15:20:06 +0100 Subject: [Buildroot] [PATCH] configs/imx8mpevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20240115105827.3179346-1-festevam@gmail.com> References: <20240115105827.3179346-1-festevam@gmail.com> Message-ID: <397f4464-2f02-4b7f-b71f-ca38f950fa7f@armadeus.com> Hi Fabio, All, On 1/15/24 11:58, Fabio Estevam wrote: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > > include/image.h:1394:12: fatal error: openssl/evp.h: No such file or directory > 1394 | # include > > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180070 > Signed-off-by: Fabio Estevam > --- > configs/freescale_imx8mpevk_defconfig | 1 + > 1 file changed, 1 insertion(+) > I confirmed this patch fixes the build error mentioned: Tested-By: S?bastien Szymanski Regards, > diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig > index 82ed68c5a9f1..2aed04848265 100644 > --- a/configs/freescale_imx8mpevk_defconfig > +++ b/configs/freescale_imx8mpevk_defconfig > @@ -29,6 +29,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1 > 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 > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y > BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -- S?bastien Szymanski, Armadeus Systems Software engineer From thomas.petazzoni at bootlin.com Mon Feb 5 14:34:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:34:09 +0100 Subject: [Buildroot] [PATCH 2/3] {linux, linux-headers}: bump 5.{10, 15}.x / 6.{1, 6}.x series In-Reply-To: <20240115214137.2350453-3-petr.vorel@gmail.com> References: <20240115214137.2350453-1-petr.vorel@gmail.com> <20240115214137.2350453-3-petr.vorel@gmail.com> Message-ID: <20240205153409.042e2be1@windsurf> Hello Petr, On Mon, 15 Jan 2024 22:41:36 +0100 Petr Vorel wrote: > # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc > -sha256 afe2e5a661bb886d762684ebea71607d1ee8cb9dd100279d2810ba20d9671e52 linux-6.6.11.tar.xz > -sha256 98dce69077c35cffca799dcdbbd32a02242aad6b0950eb931936bb2ef69f0926 linux-6.1.72.tar.xz > +sha256 1fd7ec8c3d9c4e4b3a41d11e2c6d151e5fbf875dd08b3577f73afd6ee6674605 linux-6.6.12.tar.xz > +sha256 6cad48706bf1cde342613dca2a2cd6dd4f79f88f9e4d356263564e4b2a5d7e87 linux-6.1.73.tar.xz > # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc > -sha256 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192 linux-5.15.146.tar.xz > -sha256 86ace9892296bf1534d574894edd27614b68de4085c03fd3f60121751a334f1b linux-5.10.207.tar.xz > -sha256 da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6 linux-5.4.266.tar.xz > +sha256 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 linux-5.15.147.tar.xz > +sha256 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e linux-5.10.208.tar.xz > +sha256 42d28def2cc1502251edbfeaca3b25ee764ad1e471b6c703ccb2267f38471c43 linux-5.4.267.tar.xz > # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc > -sha256 cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598 linux-4.19.304.tar.xz > +sha256 da82425c7410623dfb2405915347ee9617fc0e33a63ca821c33aeed160cddae8 linux-4.19.305.tar.xz Many of these bumps already took place (because we were too slow to apply your patch), but some did not (like the 5.15.x bump). Could you resubmit on top of master? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 14:37:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 15:37:34 +0100 Subject: [Buildroot] [git commit] package/python-minimalmodbus: fix empty package Message-ID: <20240205143757.E6FC386CA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d7e45215a4faaef8d6eb993b38d5a70ad7d309b1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Calling `setup.py` build builds and installs an empty package after upstream changed their packaging. Calling setuptools via `python -m build` builds the package correctly. Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk index 5a6e7733be..cb8a0d8cc9 100644 --- a/package/python-minimalmodbus/python-minimalmodbus.mk +++ b/package/python-minimalmodbus/python-minimalmodbus.mk @@ -7,7 +7,8 @@ PYTHON_MINIMALMODBUS_VERSION = 2.1.1 PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 14:38:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:38:05 +0100 Subject: [Buildroot] [PATCH v6 1/3] package/cairo: bump to 1.17.4 In-Reply-To: <20240107105539.1214363-1-thomas@devoogdt.com> (Thomas Devoogdt's message of "Sun, 7 Jan 2024 11:55:37 +0100") References: <20240105101105.6a181dcd@windsurf> <20240107105539.1214363-1-thomas@devoogdt.com> Message-ID: <874jent1rm.fsf@48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > News: > - https://www.cairographics.org/news/cairo-1.17.2/ > - https://www.cairographics.org/news/cairo-1.17.4/ > !! This is a bump to a snapshot release: 1.17.4. > But it is the first version that supports meson, > and the only version that supports both meson and autotools. > This is just an intermediate bump in order to > switch over to meson in a later commit. > Patches: > - drop 0001-fix-nofork-build.patch, upstream: [1] > - drop > 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch, > upstream: [2] > - add 0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch, upstream: [3] > [1]: > https://gitlab.freedesktop.org/cairo/cairo/-/commit/cb2357f481396820ec954dc4b69eafc01a8d162a > [2]: > https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645 > [3]: https://gitlab.freedesktop.org/cairo/cairo/-/issues/792 > Signed-off-by: Thomas Devoogdt > --- > v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ > --- > ...r_tolerance_normalized-fix-infinite.patch} | 0 > package/cairo/0001-fix-nofork-build.patch | 29 ---------------- > ...-Fix-mask-usage-in-image-compositor.patch} | 0 > ...vailable-in-cairo_ft_apply_variation.patch | 33 ------------------- > ...private.h-fix-missing-FT_Color-error.patch | 32 ++++++++++++++++++ > package/cairo/cairo.hash | 6 ++-- > package/cairo/cairo.mk | 10 +++--- You forgot to update the .checkpackageignore file. Committed with that fixed, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Mon Feb 5 14:39:20 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 15:39:20 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package In-Reply-To: <170712853287.18164.6368517214119629150-0@git.sr.ht> References: <170712853287.18164.6368517214119629150-0@git.sr.ht> Message-ID: Marcus, All, On 2023-09-21 22:39 +0200, ~bubu spake thusly: > From: Marcus Hoffmann > > Calling `setup.py` build builds and installs an empty package > after upstream changed their packaging. Calling setuptools via > `python -m build` builds the package correctly. Applied to master, after fixing the authroship and Sob as we discussed IRL, thanks. Regards, Yann E. MORIN. > --- > package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk > index 5a6e7733be..cb8a0d8cc9 100644 > --- a/package/python-minimalmodbus/python-minimalmodbus.mk > +++ b/package/python-minimalmodbus/python-minimalmodbus.mk > @@ -7,7 +7,8 @@ > PYTHON_MINIMALMODBUS_VERSION = 2.1.1 > PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz > PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 > -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools > +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools > +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 > PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 > PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE > > -- > 2.38.5 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Feb 5 14:41:53 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 15:41:53 +0100 Subject: [Buildroot] [PATCH 1/1] configs/rzboard_v2L_defconfig: new defconfig In-Reply-To: <20231130223101.132221-1-kilian.zinnecker@mail.de> References: <20231130223101.132221-1-kilian.zinnecker@mail.de> Message-ID: <40167f4d-5e01-4801-a735-e797c725f82c@benettiengineering.com> Hi Kilian, On 30/11/23 23:31, Frager, Neal via buildroot wrote: > From: Kilian Zinnecker > > This patch adds support for the AVNET RZBoard V2L. > > The board support creates a bootable sd card image. The board is > shipped with a u-boot inside its eMMC. The board support uses this > u-boot and does not build and deploy a u-boot onto the sd card. > Instead the sd card only contains a uEnv.txt, a kernel image and > the rootfs. Can you please add the board's URL like: https://embedded.avnet.com/product/rzboard-v2l/ ? > > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 2 + > board/avnet/rzboard_v2l/genimage.cfg | 30 ++++++++++++ > board/avnet/rzboard_v2l/post-image.sh | 5 ++ > board/avnet/rzboard_v2l/readme.txt | 69 +++++++++++++++++++++++++++ > board/avnet/rzboard_v2l/uEnv.txt | 3 ++ > configs/rzboard_v2l_defconfig | 19 ++++++++ > 6 files changed, 128 insertions(+) > create mode 100644 board/avnet/rzboard_v2l/genimage.cfg > create mode 100755 board/avnet/rzboard_v2l/post-image.sh > create mode 100644 board/avnet/rzboard_v2l/readme.txt > create mode 100644 board/avnet/rzboard_v2l/uEnv.txt > create mode 100644 configs/rzboard_v2l_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index 1f26e9bc81..794e0a5d91 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1842,7 +1842,9 @@ F: package/libcamera/ > N: Kilian Zinnecker > F: package/rockchip-rkbin/ > F: configs/rock5b_defconfig > +F: configs/rzboard_v2l_defconfig > F: board/radxa/rock5b/ > +F: board/avnet/rzboard_v2l/ Here ^^^ please swap the 2 lines above for alphabetic order, > > N: Klaus Heinrich Kiwi > F: package/wqy-zenhei/ > diff --git a/board/avnet/rzboard_v2l/genimage.cfg b/board/avnet/rzboard_v2l/genimage.cfg > new file mode 100644 > index 0000000000..af4ee7cd86 > --- /dev/null > +++ b/board/avnet/rzboard_v2l/genimage.cfg > @@ -0,0 +1,30 @@ > +# SD card image for RZBoard V2L > + > +image boot.vfat { > + vfat { > + files = { > + "Image", > + "rzboard.dtb", > + "uEnv.txt" > + } > + } > + size = 24M > +} > + > +image sdcard.img { > + hdimage { > + partition-table-type = "hybrid" > + } > + > + partition boot { > + partition-type = "0xC" > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext2" > + size = 64M You can remove the size if it's not strictly necessary, it will be 64M anyway because rootfs.ext2 is defined in board's defconfig, > + } > +} > diff --git a/board/avnet/rzboard_v2l/post-image.sh b/board/avnet/rzboard_v2l/post-image.sh > new file mode 100755 > index 0000000000..25bef8f793 > --- /dev/null > +++ b/board/avnet/rzboard_v2l/post-image.sh > @@ -0,0 +1,5 @@ > +#!/usr/bin/env bash > +set -e > + > +cp board/avnet/rzboard_v2l/uEnv.txt "${BINARIES_DIR}" > +support/scripts/genimage.sh -c board/avnet/rzboard_v2l/genimage.cfg > diff --git a/board/avnet/rzboard_v2l/readme.txt b/board/avnet/rzboard_v2l/readme.txt > new file mode 100644 > index 0000000000..0f1efd2812 > --- /dev/null > +++ b/board/avnet/rzboard_v2l/readme.txt > @@ -0,0 +1,69 @@ > +RZBoard V2L > +=========== > +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ This ^^^ is the URL to be added to commit log > + > +This board support creates a bootable sd card image for the AVNET RZBoard V2L. > +This board is shipped with a u-boot inside its eMMC. This board support uses > +that u-boot and only puts uEnv.txt, kernel image and rootfs onto the sd card. > + > +Build: > +====== > + $ make rzboard_v2l_defconfig > + $ make > + > +Files created in output directory > +================================= > + > +output/images > +. > +??? Image > +??? boot.vfat > +??? rootfs.ext2 > +??? rootfs.ext4 > +??? rootfs.tar > +??? rzboard.dtb > +??? sdcard.img > +??? uEnv.txt > + > +Creating bootable SD card: > +========================== > + > +Simply invoke (as root) > + > +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync > + > +Where X is your SD card device. > + > +Booting: > +======== > + > +Configure board for sd card boot: > +--------------------------------- > +Set the 'BOOT1' switch (next to the audio jack) to '1' (away from 'ON') in > +order to let the board boot kernel and rootfs from SD card. > + > +Serial console: > +--------------- > +The RZBoard V2L has a 4-pin header "J19" right next to the micro USB. Its > +layout can be seen in the Quick-Start Guide, or the Hardware User Guide, > +obtainable from: > +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ > + > +The uart pins are as follows (from left to right - orientation according to the > +board's labeling): > + > +pin 1: n/a (most away from the board's corner) > +pin 2: tx > +pin 3: rx > +pin 4: gnd (nearest to the board's corner) > + > +Baudrate for this board is 115200. > + > +Power-Up: > +--------- > +Plug in a suitable USB-C power supply and press the button 'S1' (next to the > +USB-C port) for 2 seconds until the LED goes on. > + > +Login: > +------ > +Enter 'root' as login user, and the prompt is ready. > diff --git a/board/avnet/rzboard_v2l/uEnv.txt b/board/avnet/rzboard_v2l/uEnv.txt > new file mode 100644 > index 0000000000..28b8acb8c6 > --- /dev/null > +++ b/board/avnet/rzboard_v2l/uEnv.txt > @@ -0,0 +1,3 @@ > +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} > +uenvcmd=fatload mmc 0:1 ${kernel_addr_r} Image; fatload mmc 0:1 ${fdt_addr_r} rzboard.dtb > +bootargs=root=/dev/mmcblk0p2 rw rootfstype=ext4 earlyprintk console=ttyS0,115200 rootwait earlycon clk_ignore_unused debug > diff --git a/configs/rzboard_v2l_defconfig b/configs/rzboard_v2l_defconfig > new file mode 100644 > index 0000000000..29f38cb2aa > --- /dev/null > +++ b/configs/rzboard_v2l_defconfig > @@ -0,0 +1,19 @@ > +BR2_aarch64=y > +BR2_cortex_a55=y > +BR2_KERNEL_HEADERS_5_10=y > +BR2_TARGET_GENERIC_HOSTNAME="rzboard_v2l" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the AVNET RZBoard V2L" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/avnet/rzboard_v2l/post-image.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Avnet/renesas-linux-cip.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c197622df526c82ae9e3674e06b4092dac33eafa" > +BR2_LINUX_KERNEL_DEFCONFIG="rzboard" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="renesas/rzboard" > +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y Do we actually need DTB_OVERLAY_SUPPORT in this defconfig? I mean, are there any overlay dtbo files that are dynamically applied? If not please drop the line above Here you also need: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y Wait for V2 patch then. Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From yann.morin.1998 at free.fr Mon Feb 5 14:43:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 15:43:30 +0100 Subject: [Buildroot] [git commit] configs/imx8mpevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20240205144352.6193686CA8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bce4fe6d1bc8a71918e3d862ebf85d342bf535b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1394:12: fatal error: openssl/evp.h: No such file or directory 1394 | # include Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180070 Signed-off-by: Fabio Estevam Tested-By: S??bastien Szymanski Signed-off-by: Yann E. MORIN --- configs/freescale_imx8mpevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 82ed68c5a9..2aed048482 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -29,6 +29,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1 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 +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From yann.morin.1998 at free.fr Mon Feb 5 14:44:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 15:44:06 +0100 Subject: [Buildroot] [PATCH] configs/imx8mpevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20240115105827.3179346-1-festevam@gmail.com> References: <20240115105827.3179346-1-festevam@gmail.com> Message-ID: Fabio, All, On 2024-01-15 07:58 -0300, Fabio Estevam spake thusly: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > > include/image.h:1394:12: fatal error: openssl/evp.h: No such file or directory > 1394 | # include > > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180070 > Signed-off-by: Fabio Estevam Applied to master, thanks. Regards, Yann E. MORIN. > --- > configs/freescale_imx8mpevk_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig > index 82ed68c5a9f1..2aed04848265 100644 > --- a/configs/freescale_imx8mpevk_defconfig > +++ b/configs/freescale_imx8mpevk_defconfig > @@ -29,6 +29,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1 > 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 > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y > BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Feb 5 14:45:32 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 15:45:32 +0100 Subject: [Buildroot] [PATCH 1/1] configs/rzboard_v2L_defconfig: new defconfig In-Reply-To: <40167f4d-5e01-4801-a735-e797c725f82c@benettiengineering.com> References: <20231130223101.132221-1-kilian.zinnecker@mail.de> <40167f4d-5e01-4801-a735-e797c725f82c@benettiengineering.com> Message-ID: <370ba5b2-0b0b-42a5-90c7-d38044d805d9@benettiengineering.com> Forgotten to mention, see below, On 05/02/24 15:41, Giulio Benetti wrote: > Hi Kilian, > > On 30/11/23 23:31, Frager, Neal via buildroot wrote: >> From: Kilian Zinnecker >> >> This patch adds support for the AVNET RZBoard V2L. >> >> The board support creates a bootable sd card image. The board is >> shipped with a u-boot inside its eMMC. The board support uses this >> u-boot and does not build and deploy a u-boot onto the sd card. >> Instead the sd card only contains a uEnv.txt, a kernel image and >> the rootfs. > > Can you please add the board's URL like: > https://embedded.avnet.com/product/rzboard-v2l/ > ? > >> >> Signed-off-by: Kilian Zinnecker >> --- >> ? DEVELOPERS??????????????????????????? |? 2 + >> ? board/avnet/rzboard_v2l/genimage.cfg? | 30 ++++++++++++ >> ? board/avnet/rzboard_v2l/post-image.sh |? 5 ++ >> ? board/avnet/rzboard_v2l/readme.txt??? | 69 +++++++++++++++++++++++++++ >> ? board/avnet/rzboard_v2l/uEnv.txt????? |? 3 ++ >> ? configs/rzboard_v2l_defconfig???????? | 19 ++++++++ >> ? 6 files changed, 128 insertions(+) >> ? create mode 100644 board/avnet/rzboard_v2l/genimage.cfg >> ? create mode 100755 board/avnet/rzboard_v2l/post-image.sh >> ? create mode 100644 board/avnet/rzboard_v2l/readme.txt >> ? create mode 100644 board/avnet/rzboard_v2l/uEnv.txt >> ? create mode 100644 configs/rzboard_v2l_defconfig >> >> diff --git a/DEVELOPERS b/DEVELOPERS >> index 1f26e9bc81..794e0a5d91 100644 >> --- a/DEVELOPERS >> +++ b/DEVELOPERS >> @@ -1842,7 +1842,9 @@ F:??? package/libcamera/ >> ? N:??? Kilian Zinnecker >> ? F:??? package/rockchip-rkbin/ >> ? F:??? configs/rock5b_defconfig >> +F:??? configs/rzboard_v2l_defconfig >> ? F:??? board/radxa/rock5b/ >> +F:??? board/avnet/rzboard_v2l/ > > Here ^^^ please swap the 2 lines above for alphabetic order, > >> ? N:??? Klaus Heinrich Kiwi >> ? F:??? package/wqy-zenhei/ >> diff --git a/board/avnet/rzboard_v2l/genimage.cfg >> b/board/avnet/rzboard_v2l/genimage.cfg >> new file mode 100644 >> index 0000000000..af4ee7cd86 >> --- /dev/null >> +++ b/board/avnet/rzboard_v2l/genimage.cfg >> @@ -0,0 +1,30 @@ >> +# SD card image for RZBoard V2L >> + >> +image boot.vfat { >> +??? vfat { >> +??????? files = { >> +??????????? "Image", >> +??????????? "rzboard.dtb", >> +??????????? "uEnv.txt" >> +??????? } >> +??? } >> +??? size = 24M >> +} >> + >> +image sdcard.img { >> +??? hdimage { >> +??????? partition-table-type = "hybrid" >> +??? } >> + >> +??? partition boot { >> +??????? partition-type = "0xC" >> +??????? bootable = "true" >> +??????? image = "boot.vfat" >> +??? } >> + >> +??? partition rootfs { >> +??????? partition-type = 0x83 >> +??????? image = "rootfs.ext2" >> +??????? size = 64M > > You can remove the size if it's not strictly necessary, it will be > 64M anyway because rootfs.ext2 is defined in board's defconfig, > >> +??? } >> +} >> diff --git a/board/avnet/rzboard_v2l/post-image.sh >> b/board/avnet/rzboard_v2l/post-image.sh >> new file mode 100755 >> index 0000000000..25bef8f793 >> --- /dev/null >> +++ b/board/avnet/rzboard_v2l/post-image.sh >> @@ -0,0 +1,5 @@ >> +#!/usr/bin/env bash >> +set -e >> + >> +cp board/avnet/rzboard_v2l/uEnv.txt "${BINARIES_DIR}" >> +support/scripts/genimage.sh -c board/avnet/rzboard_v2l/genimage.cfg >> diff --git a/board/avnet/rzboard_v2l/readme.txt >> b/board/avnet/rzboard_v2l/readme.txt >> new file mode 100644 >> index 0000000000..0f1efd2812 >> --- /dev/null >> +++ b/board/avnet/rzboard_v2l/readme.txt >> @@ -0,0 +1,69 @@ >> +RZBoard V2L >> +=========== >> +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ > > This ^^^ is the URL to be added to commit log > >> + >> +This board support creates a bootable sd card image for the AVNET >> RZBoard V2L. >> +This board is shipped with a u-boot inside its eMMC. This board >> support uses >> +that u-boot and only puts uEnv.txt, kernel image and rootfs onto the >> sd card. >> + >> +Build: >> +====== >> +? $ make rzboard_v2l_defconfig >> +? $ make >> + >> +Files created in output directory >> +================================= >> + >> +output/images >> +. >> +??? Image >> +??? boot.vfat >> +??? rootfs.ext2 >> +??? rootfs.ext4 >> +??? rootfs.tar >> +??? rzboard.dtb >> +??? sdcard.img >> +??? uEnv.txt >> + >> +Creating bootable SD card: >> +========================== >> + >> +Simply invoke (as root) >> + >> +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync >> + >> +Where X is your SD card device. >> + >> +Booting: >> +======== >> + >> +Configure board for sd card boot: >> +--------------------------------- >> +Set the 'BOOT1' switch (next to the audio jack) to '1' (away from >> 'ON') in >> +order to let the board boot kernel and rootfs from SD card. >> + >> +Serial console: >> +--------------- >> +The RZBoard V2L has a 4-pin header "J19" right next to the micro USB. >> Its >> +layout can be seen in the Quick-Start Guide, or the Hardware User Guide, >> +obtainable from: >> +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ >> + >> +The uart pins are as follows (from left to right - orientation >> according to the >> +board's labeling): >> + >> +pin 1: n/a? (most away from the board's corner) >> +pin 2: tx >> +pin 3: rx >> +pin 4: gnd? (nearest to the board's corner) >> + >> +Baudrate for this board is 115200. >> + >> +Power-Up: >> +--------- >> +Plug in a suitable USB-C power supply and press the button 'S1' (next >> to the >> +USB-C port) for 2 seconds until the LED goes on. >> + >> +Login: >> +------ >> +Enter 'root' as login user, and the prompt is ready. >> diff --git a/board/avnet/rzboard_v2l/uEnv.txt >> b/board/avnet/rzboard_v2l/uEnv.txt >> new file mode 100644 >> index 0000000000..28b8acb8c6 >> --- /dev/null >> +++ b/board/avnet/rzboard_v2l/uEnv.txt >> @@ -0,0 +1,3 @@ >> +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} >> +uenvcmd=fatload mmc 0:1 ${kernel_addr_r} Image; fatload mmc 0:1 >> ${fdt_addr_r} rzboard.dtb >> +bootargs=root=/dev/mmcblk0p2 rw rootfstype=ext4 earlyprintk >> console=ttyS0,115200 rootwait earlycon clk_ignore_unused debug >> diff --git a/configs/rzboard_v2l_defconfig >> b/configs/rzboard_v2l_defconfig >> new file mode 100644 >> index 0000000000..29f38cb2aa >> --- /dev/null >> +++ b/configs/rzboard_v2l_defconfig >> @@ -0,0 +1,19 @@ >> +BR2_aarch64=y >> +BR2_cortex_a55=y >> +BR2_KERNEL_HEADERS_5_10=y >> +BR2_TARGET_GENERIC_HOSTNAME="rzboard_v2l" >> +BR2_TARGET_GENERIC_ISSUE="Welcome to the AVNET RZBoard V2L" >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/avnet/rzboard_v2l/post-image.sh" >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_GIT=y >> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Avnet/renesas-linux-cip.git" >> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c197622df526c82ae9e3674e06b4092dac33eafa" >> +BR2_LINUX_KERNEL_DEFCONFIG="rzboard" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="renesas/rzboard" >> +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > > Do we actually need DTB_OVERLAY_SUPPORT in this defconfig? I mean, are > there any overlay dtbo files that are dynamically applied? > If not please drop the line above > > Here you also need: > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" >> +BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_DOSFSTOOLS=y >> +BR2_PACKAGE_HOST_GENIMAGE=y Please always test build using buildroot/utils/docker-run Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Mon Feb 5 14:49:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:49:21 +0100 Subject: [Buildroot] [PATCH v6 2/3] package/cairo: move to the meson build system In-Reply-To: <20240107105539.1214363-2-thomas@devoogdt.com> (Thomas Devoogdt's message of "Sun, 7 Jan 2024 11:55:38 +0100") References: <20240105101105.6a181dcd@windsurf> <20240107105539.1214363-1-thomas@devoogdt.com> <20240107105539.1214363-2-thomas@devoogdt.com> Message-ID: <87zfwfrmoe.fsf@48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > Signed-off-by: Thomas Devoogdt > --- > v2: added -std=gnu11 (allow inline int declaration in if loop, 99 > caused some directives problems) > v3: enabled host-zlib, needed for librsvg > v4: also added gnu11 for host-cairo compiling (fixes my compilation on > a gcc 4.9.2 based system) > v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ > v6: fix host-zlib option (again) > --- > package/cairo/Config.in | 34 ++++---- > package/cairo/cairo.mk | 168 ++++++++++++---------------------------- > 2 files changed, 66 insertions(+), 136 deletions(-) > diff --git a/package/cairo/Config.in b/package/cairo/Config.in > index 0c87a2904b..caa6c37195 100644 > --- a/package/cairo/Config.in > +++ b/package/cairo/Config.in > @@ -4,6 +4,7 @@ config BR2_PACKAGE_CAIRO > select BR2_PACKAGE_FONTCONFIG > select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 > select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 How come the change of build system adds libxrandr? This needs to be described in the commit message. > help > Cairo is a 2D graphics library with support for multiple > output devices. Currently supported output targets include > @@ -15,34 +16,35 @@ config BR2_PACKAGE_CAIRO > if BR2_PACKAGE_CAIRO > -config BR2_PACKAGE_CAIRO_PS > - bool "postscript support" > - select BR2_PACKAGE_ZLIB > - select BR2_PACKAGE_CAIRO_PDF > - > -config BR2_PACKAGE_CAIRO_PDF > - bool "pdf support" > - select BR2_PACKAGE_ZLIB Please don't move options around. They were indeed not alphabetically sorted, but after your move it is even worse. You are also changing a number of dependencies without any clear (to me) reason? -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 14:49:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 15:49:40 +0100 Subject: [Buildroot] [git commit] package/cairo: bump to 1.17.4 Message-ID: <20240205144949.E11BD86CB1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b392d656c7f3ecb1e36945615c543e5ee230315b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master News: - https://www.cairographics.org/news/cairo-1.17.2/ - https://www.cairographics.org/news/cairo-1.17.4/ !! This is a bump to a snapshot release: 1.17.4. But it is the first version that supports meson, and the only version that supports both meson and autotools. This is just an intermediate bump in order to switch over to meson in a later commit. Patches: - drop 0001-fix-nofork-build.patch, upstream: [1] - drop 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch, upstream: [2] - add 0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch, upstream: [3] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/cb2357f481396820ec954dc4b69eafc01a8d162a [2]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/issues/792 Signed-off-by: Thomas Devoogdt Reviewed-by: Adrian Perez de Castro Tested-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- .checkpackageignore | 6 ++-- ...le_for_tolerance_normalized-fix-infinite.patch} | 0 package/cairo/0001-fix-nofork-build.patch | 29 ------------------- ... 0002-Fix-mask-usage-in-image-compositor.patch} | 0 ...hen-available-in-cairo_ft_apply_variation.patch | 33 ---------------------- ...o-ft-private.h-fix-missing-FT_Color-error.patch | 32 +++++++++++++++++++++ package/cairo/cairo.hash | 6 ++-- package/cairo/cairo.mk | 10 +++---- 8 files changed, 41 insertions(+), 75 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 095fa5b283..348cf3d289 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -227,10 +227,8 @@ package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch Upstrea package/c-icap/S96cicap Indent Shellcheck Variables package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch Upstream package/cache-calibrator/0001-Fix-conflicting-round-function.patch Upstream -package/cairo/0001-fix-nofork-build.patch Upstream -package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch Upstream -package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream -package/cairo/0004-Fix-mask-usage-in-image-compositor.patch Upstream +package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream +package/cairo/0002-Fix-mask-usage-in-image-compositor.patch Upstream package/caps/0001-Fix-stdint-types-with-musl.patch Upstream package/cdrkit/0001-no-rcmd.patch Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch Upstream diff --git a/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch similarity index 100% rename from package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch rename to package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch diff --git a/package/cairo/0001-fix-nofork-build.patch b/package/cairo/0001-fix-nofork-build.patch deleted file mode 100644 index 702e9910a5..0000000000 --- a/package/cairo/0001-fix-nofork-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -test: fix build when SHOULD_FORK is false - -The code in test/cairo-test-runner.c properly takes into account -platforms that do have fork() support, and uses the SHOULD_FORK define -to know whether fork is available or not. - -However, this SHOULD_FORK macro is used to guard the inclusion of -, which is needed to get the prototype of other functions -(namely readlink and getppid), that are used in portions of this file -not guarded by SHOULD_FORK. - -Signed-off-by: Thomas Petazzoni - -Index: b/test/cairo-test-runner.c -=================================================================== ---- a/test/cairo-test-runner.c -+++ b/test/cairo-test-runner.c -@@ -36,10 +36,10 @@ - #include /* for version information */ - - #define SHOULD_FORK HAVE_FORK && HAVE_WAITPID --#if SHOULD_FORK - #if HAVE_UNISTD_H - #include - #endif -+#if SHOULD_FORK - #if HAVE_SIGNAL_H - #include - #endif diff --git a/package/cairo/0004-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch similarity index 100% rename from package/cairo/0004-Fix-mask-usage-in-image-compositor.patch rename to package/cairo/0002-Fix-mask-usage-in-image-compositor.patch diff --git a/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch b/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch deleted file mode 100644 index 10e000d16f..0000000000 --- a/package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >= 2.9 -[Retrieved from: -https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645] -Signed-off-by: Fabrice Fontaine ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..981973f78 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } - --- -2.24.1 - diff --git a/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch b/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch new file mode 100644 index 0000000000..3b18d8077b --- /dev/null +++ b/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch @@ -0,0 +1,32 @@ +From da698db0c20507f0e07492cbe40dbaf1c9053f71 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Sun, 12 Nov 2023 09:58:05 +0100 +Subject: [PATCH] cairo-ft-private.h: fix missing FT_Color error + +In file included from ../src/cairo-colr-glyph-render.c:37: +../src/cairo-ft-private.h:87:30: error: unknown type name 'FT_Color' + 87 | FT_Color *palette, + | ^~~~~~~~ + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/issues/792 +Signed-off-by: Thomas Devoogdt +--- + src/cairo-ft-private.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/cairo-ft-private.h b/src/cairo-ft-private.h +index 836f7e523..6b0e30223 100644 +--- a/src/cairo-ft-private.h ++++ b/src/cairo-ft-private.h +@@ -43,6 +43,8 @@ + + #if CAIRO_HAS_FT_FONT + ++#include FT_COLOR_H ++ + CAIRO_BEGIN_DECLS + + typedef struct _cairo_ft_unscaled_font cairo_ft_unscaled_font_t; +-- +2.34.1 + diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index 3b93e24a22..fca9ff678c 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,7 +1,7 @@ -# From https://www.cairographics.org/releases/cairo-1.16.0.tar.xz.sha1 -sha1 00e81842ae5e81bb0343108884eb5205be0eac14 cairo-1.16.0.tar.xz +# From https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz.sha1 +sha1 68712ae1039b114347be3b7200bc1c901d47a636 cairo-1.17.4.tar.xz # Calculated based on the hash above -sha256 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 cairo-1.16.0.tar.xz +sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 cairo-1.17.4.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 7bc8f92deb..4515b76075 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,19 +4,17 @@ # ################################################################################ -CAIRO_VERSION = 1.16.0 +CAIRO_VERSION = 1.17.4 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics -CAIRO_SITE = http://cairographics.org/releases +CAIRO_SITE = http://cairographics.org/snapshots CAIRO_INSTALL_STAGING = YES -# 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch -CAIRO_IGNORE_CVES += CVE-2018-19876 -# 0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +# 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch CAIRO_IGNORE_CVES += CVE-2019-6462 -# 0004-Fix-mask-usage-in-image-compositor.patch +# 0002-Fix-mask-usage-in-image-compositor.patch CAIRO_IGNORE_CVES += CVE-2020-35492 CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" From thomas.petazzoni at bootlin.com Mon Feb 5 14:51:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:51:09 +0100 Subject: [Buildroot] [git commit] package/domoticz: drop fmt dependency Message-ID: <20240205145119.04B3486CB9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc3609c53f927289a9681f30ab283d190cb34e09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master fmt is not a dependency since bump to version 2022.1 in commit adca60540f4fd271dda48b9a121986492700e73a and https://github.com/domoticz/domoticz/commit/82043c4d5c79003792379be79b931eb85ab890c8 https://github.com/domoticz/domoticz/commit/9e02d9a79c70c36db180d3242cbd03ff9b63e3cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/domoticz/Config.in | 1 - package/domoticz/domoticz.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 85361eecf0..a0e69a7601 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -16,7 +16,6 @@ config BR2_PACKAGE_DOMOTICZ select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_CEREAL - select BR2_PACKAGE_FMT select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_MINIZIP_ZLIB diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index d0856b71af..88bad15427 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -12,7 +12,6 @@ DOMOTICZ_CPE_ID_VENDOR = domoticz DOMOTICZ_DEPENDENCIES = \ boost \ cereal \ - fmt \ host-pkgconf \ jsoncpp \ libcurl \ @@ -36,7 +35,6 @@ DOMOTICZ_CONF_OPTS += \ # jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ - -DUSE_BUILTIN_LIBFMT=OFF \ -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF From thomas.petazzoni at bootlin.com Mon Feb 5 14:51:46 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:51:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: drop fmt dependency In-Reply-To: <20240116220258.1003073-1-fontaine.fabrice@gmail.com> References: <20240116220258.1003073-1-fontaine.fabrice@gmail.com> Message-ID: <20240205155146.128e4d41@windsurf> On Tue, 16 Jan 2024 23:02:58 +0100 Fabrice Fontaine wrote: > fmt is not a dependency since bump to version 2022.1 in commit > adca60540f4fd271dda48b9a121986492700e73a and > https://github.com/domoticz/domoticz/commit/82043c4d5c79003792379be79b931eb85ab890c8 > https://github.com/domoticz/domoticz/commit/9e02d9a79c70c36db180d3242cbd03ff9b63e3cc > > Signed-off-by: Fabrice Fontaine > --- > package/domoticz/Config.in | 1 - > package/domoticz/domoticz.mk | 2 -- > 2 files changed, 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 14:54:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:54:01 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add tesseract-ocr test In-Reply-To: <20240107120902.136457-1-ju.o@free.fr> (Julien Olivain's message of "Sun, 7 Jan 2024 13:09:02 +0100") References: <20240107120902.136457-1-ju.o@free.fr> Message-ID: <87v873rmgm.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Cc: Gilles Talis > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit b372495 with commands: > make check-package > ... > 0 warnings generated > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_tesseract_ocr > ... > OK Committed, thanks. -- Bye, Peter Korsgaard From thomas.petazzoni at bootlin.com Mon Feb 5 14:51:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:51:54 +0100 Subject: [Buildroot] [git commit] package/libevdev: bump to version 1.13.1 Message-ID: <20240205145446.B325986CCC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a917500442b62441c88ff3f7ab84e6a230d6bc69 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Andreas Naumann Signed-off-by: Thomas Petazzoni --- package/libevdev/libevdev.hash | 6 +++--- package/libevdev/libevdev.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash index dd76e158ef..acaedfad56 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/input-tools/2022-March/001574.html -sha256 1dbba41bc516d3ca7abc0da5b862efe3ea8a7018fa6e9b97ce9d39401b22426c libevdev-1.12.1.tar.xz -sha512 eefce287a665e4f89eb2e0437dfefd45ecf8925c7dac35a1bdd46158541f77f2032c6146900a30a01321751d55a9b537bd1d61777cca9cfa02c39a6e31c97be4 libevdev-1.12.1.tar.xz +# From https://lists.freedesktop.org/archives/input-tools/2023-May/001585.html +sha256 06a77bf2ac5c993305882bc1641017f5bec1592d6d1b64787bad492ab34f2f36 libevdev-1.13.1.tar.xz +sha512 9b75bad4bc13948854c8dff7a7a46aca6c06d1410ccb000f881bf76055ccac040595c3b24fb1a574be875b5c262eb86820b9ec3383752641bc2047135e5a412f libevdev-1.13.1.tar.xz # Hash for license files: sha256 6f13de7ce28e4948ba95170e0723ee1254c1978ce1f127af82aeca597b567cb9 COPYING diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index 726a5afcee..b0cf6c9ba8 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.12.1 +LIBEVDEV_VERSION = 1.13.1 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = MIT From peter at korsgaard.com Mon Feb 5 14:54:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:54:49 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add coremark test In-Reply-To: <20240107125621.248063-1-ju.o@free.fr> (Julien Olivain's message of "Sun, 7 Jan 2024 13:56:21 +0100") References: <20240107125621.248063-1-ju.o@free.fr> Message-ID: <87r0hrrmfa.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 14:55:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:55:48 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/kodi-inputstream-adaptive: bump version to 20.3.17-Nexus In-Reply-To: <20240204112031.514780-1-bernd@kuhls.net> (Bernd Kuhls's message of "Sun, 4 Feb 2024 12:20:31 +0100") References: <20240204112031.514780-1-bernd@kuhls.net> Message-ID: <87mssfrmdn.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls > --- > v2: squashed with previous bump to 20.3.16-Nexus Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 14:55:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 15:55:53 +0100 Subject: [Buildroot] [git commit] support/testing: add tesseract-ocr test Message-ID: <20240205145609.1095486CF0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b89435db602e3ce39e73562cfd8b01fcc637368c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Cc: Gilles Talis Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + .../testing/tests/package/test_tesseract_ocr.py | 43 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a03018ab2b..b1178150ed 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1823,6 +1823,7 @@ F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_tcpdump.py +F: support/testing/tests/package/test_tesseract_ocr.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_tesseract_ocr.py b/support/testing/tests/package/test_tesseract_ocr.py new file mode 100644 index 0000000000..232025bad2 --- /dev/null +++ b/support/testing/tests/package/test_tesseract_ocr.py @@ -0,0 +1,43 @@ +import os + +import infra.basetest + + +class TestTesseractOcr(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_FREETYPE=y + BR2_PACKAGE_GHOSTSCRIPT_FONTS=y + BR2_PACKAGE_GRAPHICSMAGICK=y + BR2_PACKAGE_TESSERACT_OCR=y + BR2_PACKAGE_TESSERACT_OCR_LANG_ENG=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]) + self.emulator.login() + + msg = "Hello from Buildroot runtime test." + img_file = "image.pgm" + txt_basename = "text" + txt_file = f"{txt_basename}.txt" + + # Check the program execute. + self.assertRunOk("tesseract --version") + + # Generate an image file including a text message. + cmd = f"gm convert -pointsize 16 label:'{msg}' {img_file}" + self.assertRunOk(cmd) + + # Perform the character recognition. + cmd = f"tesseract {img_file} {txt_basename}" + self.assertRunOk(cmd, timeout=30) + + # Check the decoded text matches the original message. + cmd = f"grep -F '{msg}' {txt_file}" + self.assertRunOk(cmd) From peter at korsgaard.com Mon Feb 5 14:55:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 15:55:54 +0100 Subject: [Buildroot] [git commit] support/testing: add coremark test Message-ID: <20240205145609.1A41486CF1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c47da268be75a64fe264f4833538be7bae1320c7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_coremark.py | 33 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index b1178150ed..ebc1af84cb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1763,6 +1763,7 @@ F: support/testing/tests/package/test_bc.py F: support/testing/tests/package/test_brotli.py F: support/testing/tests/package/test_bzip2.py F: support/testing/tests/package/test_compressor_base.py +F: support/testing/tests/package/test_coremark.py F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py diff --git a/support/testing/tests/package/test_coremark.py b/support/testing/tests/package/test_coremark.py new file mode 100644 index 0000000000..8bd2f32143 --- /dev/null +++ b/support/testing/tests/package/test_coremark.py @@ -0,0 +1,33 @@ +import os + +import infra.basetest + + +class TestCoreMark(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_COREMARK=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]) + self.emulator.login() + + log_file = "run1.log" + + # Run a CoreMark benchmark. + self.assertRunOk(f"coremark > {log_file}", timeout=60) + + # Print the log file on console, for debugging. + self.assertRunOk(f"cat {log_file}") + + # The "coremark" program return code is always 0 (success). + # So the correct execution is validated from the run log. + valid_msg = "Correct operation validated." + cmd = f"grep -F '{valid_msg}' {log_file}" + self.assertRunOk(cmd) From peter at korsgaard.com Mon Feb 5 14:55:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 15:55:54 +0100 Subject: [Buildroot] [git commit] package/kodi-inputstream-adaptive: bump version to 20.3.17-Nexus Message-ID: <20240205145609.2427F86CF3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8366622fc8eba8187240a0141147326e99a4f932 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index ebcf32fd4a..e38191c0c4 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 1d7c933d05534e591e11fd204e836a3498fffc6a0717d5427c89acfd16fb9d40 kodi-inputstream-adaptive-20.3.15-Nexus.tar.gz +sha256 f67cfef057f8842716db4521a8cd3966c37a1da8fc3fb297527f6f25be20688a kodi-inputstream-adaptive-20.3.17-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 267541ace9..ba4f6de61a 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.15-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.17-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ From thomas.petazzoni at bootlin.com Mon Feb 5 14:57:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 15:57:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/libevdev: bump to version 1.13.1 In-Reply-To: <20240117130522.628211-1-anaumann@ultratronik.de> References: <20240117130522.628211-1-anaumann@ultratronik.de> Message-ID: <20240205155715.77215856@windsurf> On Wed, 17 Jan 2024 14:05:22 +0100 Andreas Naumann wrote: > Signed-off-by: Andreas Naumann > --- > package/libevdev/libevdev.hash | 6 +++--- > package/libevdev/libevdev.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 14:58:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 15:58:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-starlette: bump to version 0.34.0 In-Reply-To: <42594955-dcd4-4161-9a84-879f096d49f7@bubu1.eu> (Marcus Hoffmann via buildroot's message of "Mon, 5 Feb 2024 14:34:05 +0100") References: <20240111072922.3082638-1-james.hilliard1@gmail.com> <87sf27upph.fsf@48ers.dk> <42594955-dcd4-4161-9a84-879f096d49f7@bubu1.eu> Message-ID: <87il33rm9s.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Hi Peter, > On 05.02.24 12:15, Peter Korsgaard wrote: >>>>>>> "James" == James Hilliard writes: >> > Signed-off-by: James Hilliard >> Committed, thanks. >> > We currently have fastapi 0.105.0 in buildroot which depends on > starlette < 0.28.0. > There's a pending patch by James that bumps it to 0.108.0, which > unfortunately is also not compatible with starlette 0.34.0 [1] :-/ > In fact there's no fastapi release that is compatible with starlette > 0.34.0 (newer fastapi releases require even newer starlette > versions...) Argh :( > I guess I'll send a series that bumps *both* again to compatible versions? Yes please! -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Mon Feb 5 15:02:40 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 16:02:40 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: add minimalmodbus runtime test In-Reply-To: <170713978507.21324.6362507954144029814-0@git.sr.ht> References: <170713978507.21324.6362507954144029814-0@git.sr.ht> Message-ID: Marcus, All, On 2024-02-05 14:08 +0100, ~bubu spake thusly: > From: Marcus Hoffmann Thanks for this new test. This commit log needs however to be a little bit more detailed; see below... > Signed-off-by: Marcus Hoffmann > --- > .../tests/package/sample_python_minimalmodbus.py | 7 +++++++ > .../tests/package/test_python_minimalmodbus.py | 11 +++++++++++ > 2 files changed, 18 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_minimalmodbus.py > create mode 100644 support/testing/tests/package/test_python_minimalmodbus.py > > diff --git a/support/testing/tests/package/sample_python_minimalmodbus.py b/support/testing/tests/package/sample_python_minimalmodbus.py > new file mode 100644 > index 0000000000..a75145f900 > --- /dev/null > +++ b/support/testing/tests/package/sample_python_minimalmodbus.py > @@ -0,0 +1,7 @@ > +import minimalmodbus > +from serial.serialutil import SerialException > + > +try: > + instrument = minimalmodbus.Instrument('/dev/ttyUSB99', 1) > +except SerialException: > + pass So, it took me a little while to understand how this test works, because it uses the default kernel, which is probably lacking the appropriate modbus driver. So the test just checks that the initialisation fails, and we assume that if the failure happens as we expect, we consider the module to be working correctly. Which is a weird situation: failure means success! I've added a bit of comments to explain that. Applied to master, thanks. Regards, Yann E. MORIN. > diff --git a/support/testing/tests/package/test_python_minimalmodbus.py b/support/testing/tests/package/test_python_minimalmodbus.py > new file mode 100644 > index 0000000000..53813406de > --- /dev/null > +++ b/support/testing/tests/package/test_python_minimalmodbus.py > @@ -0,0 +1,11 @@ > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy3Minimalmodbus(TestPythonPackageBase): > + __test__ = True > + config = TestPythonPackageBase.config + \ > + """ > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_MINIMALMODBUS=y > + """ > + sample_scripts = ["tests/package/sample_python_minimalmodbus.py"] > -- > 2.38.5 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Feb 5 15:05:35 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 16:05:35 +0100 Subject: [Buildroot] [PATCH v5] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20231208003746.9505-1-fancp2007@gmail.com> References: <20231104192335.2920640-1-fancp2007@gmail.com> <20231208003746.9505-1-fancp2007@gmail.com> Message-ID: Hi Scott, On 08/12/23 01:37, Scott Fan wrote: > Add support for the FriendlyARM NanoPi NEO2 with mainline components: > - U-Boot 2023.10 > - Linux 6.1.65 > > Board's wiki page: > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > Signed-off-by: Scott Fan > --- > Changes v1 -> v2: > - Fix issues from 'utils/docker-run make check-package' > - Add atf custom version in the defconfig > - No need for sudo to run sync > > Changes v2 -> v3: > - Update patch file, add the upstream tag > > Changes v3 -> v4: > - Use a single integrated image file (u-boot-sunxi-with-spl.bin) > - Remove patch file for uboot, switch to binman > - Merge boot partition into rootfs partition > - Bump kernel version to 6.1.61 > > Changes v4 -> v5: > - Bump kernel version to 6.1.65 > > Signed-off-by: Scott Fan > --- > board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ > board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ > board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ > board/friendlyarm/nanopi-neo2/readme.txt | 34 +++++++++++++++ > configs/friendlyarm_nanopi_neo2_defconfig | 48 +++++++++++++++++++++ > 5 files changed, 107 insertions(+) > create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf > create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg > create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh > create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt > create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig > > diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf > new file mode 100644 > index 0000000000..482a069f74 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf > @@ -0,0 +1,4 @@ > +label friendlyarm-nanopi-buildroot > + kernel /boot/Image > + devicetree /boot/sun50i-h5-nanopi-neo2.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg > new file mode 100644 > index 0000000000..67e4e5efdb > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot-tpl-spl-dtb { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + offset = 1M > + } > +} > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh > new file mode 100755 > index 0000000000..c7ec875068 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt > new file mode 100644 > index 0000000000..c896a57525 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/readme.txt > @@ -0,0 +1,34 @@ > +Intro > +===== > + > +This default configuration will allow you to start experimenting with the > +buildroot environment for the NanoPi NEO2. With the current configuration > +it will bring-up the board, and allow access through the serial console. > + > +Wiki link: > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > + > +This configuration uses U-Boot mainline and kernel mainline. > + > +How to build > +============ > + > + $ make friendlyarm_nanopi_neo2_defconfig > + $ make > + > +Note: you will need access to the internet to download the required > +sources. > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > + $ sync > + > +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console > +is on the serial line, 115200 8N1. > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig > new file mode 100644 > index 0000000000..a955ec323a > --- /dev/null > +++ b/configs/friendlyarm_nanopi_neo2_defconfig > @@ -0,0 +1,48 @@ > +BR2_aarch64=y > +BR2_cortex_a53=y > +BR2_ARM_FPU_VFPV4=y > + > +# Linux headers same as kernel, a 6.1 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > + > +# Firmware > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.65" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" It looks good to me except you miss: BR2_TARGET_UBOOT_NEEDS_OPENSSL=y So adding that line: Reviewed-by: Giulio Benetti [Only build-tested using docker-run] Tested-by: Giulio Benetti Please use buildroot/utils/docker-run to check defconfigs and packages so we're sure that all host dependencies are met. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From yann.morin.1998 at free.fr Mon Feb 5 15:06:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 16:06:19 +0100 Subject: [Buildroot] [git commit] support/testing: add minimalmodbus runtime test Message-ID: <20240205150659.657C086CFF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f7e112ab20265e9005b9b97c6a129d6bec66f12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann [yann.morin.1998 at free.fr: add the comment to explain failure is success] Signed-off-by: Yann E. MORIN --- support/testing/tests/package/sample_python_minimalmodbus.py | 11 +++++++++++ support/testing/tests/package/test_python_minimalmodbus.py | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/support/testing/tests/package/sample_python_minimalmodbus.py b/support/testing/tests/package/sample_python_minimalmodbus.py new file mode 100644 index 0000000000..dc5db8d9e2 --- /dev/null +++ b/support/testing/tests/package/sample_python_minimalmodbus.py @@ -0,0 +1,11 @@ +import minimalmodbus +from serial.serialutil import SerialException + +# We can't test proper behaviour in emulation, because there is +# actually no emulated modbus hardware, so we rely on the module +# to fail in an expected way to consider it is working correctly. +# Failure (of the script) is success (of the test)! +try: + instrument = minimalmodbus.Instrument('/dev/ttyUSB99', 1) +except SerialException: + pass diff --git a/support/testing/tests/package/test_python_minimalmodbus.py b/support/testing/tests/package/test_python_minimalmodbus.py new file mode 100644 index 0000000000..53813406de --- /dev/null +++ b/support/testing/tests/package/test_python_minimalmodbus.py @@ -0,0 +1,11 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Minimalmodbus(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MINIMALMODBUS=y + """ + sample_scripts = ["tests/package/sample_python_minimalmodbus.py"] From thomas.petazzoni at bootlin.com Mon Feb 5 15:07:51 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:07:51 +0100 Subject: [Buildroot] [git commit] package/opencv4: bump to version 4.9.0 Message-ID: <20240205150800.3273A86D08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1b2dc9add3f84196f3dd326c26f64abaf84642c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/opencv/opencv/wiki/ChangeLog#version490 Signed-off-by: Woodrow Douglass Signed-off-by: Thomas Petazzoni --- package/opencv4-contrib/opencv4-contrib.hash | 2 +- package/opencv4-contrib/opencv4-contrib.mk | 2 +- package/opencv4/opencv4.hash | 2 +- package/opencv4/opencv4.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/opencv4-contrib/opencv4-contrib.hash b/package/opencv4-contrib/opencv4-contrib.hash index 954a0c2beb..2e20717c76 100644 --- a/package/opencv4-contrib/opencv4-contrib.hash +++ b/package/opencv4-contrib/opencv4-contrib.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0c082a0b29b3118f2a0a1856b403bb098643af7b994a0080f402a12159a99c6e opencv4-contrib-4.8.1.tar.gz +sha256 8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae opencv4-contrib-4.9.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk index f8c8cfd94c..a4d0179472 100644 --- a/package/opencv4-contrib/opencv4-contrib.mk +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV4_CONTRIB_VERSION = 4.8.1 +OPENCV4_CONTRIB_VERSION = 4.9.0 OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) OPENCV4_CONTRIB_INSTALL_TARGET = NO OPENCV4_CONTRIB_LICENSE = Apache-2.0 diff --git a/package/opencv4/opencv4.hash b/package/opencv4/opencv4.hash index 2736752633..15f5e37278 100644 --- a/package/opencv4/opencv4.hash +++ b/package/opencv4/opencv4.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 62f650467a60a38794d681ae7e66e3e8cfba38f445e0bf87867e2f2cdc8be9d5 opencv4-4.8.1.tar.gz +sha256 ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c opencv4-4.9.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index 74cec511a9..b535761cb2 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV4_VERSION = 4.8.1 +OPENCV4_VERSION = 4.9.0 OPENCV4_SITE = $(call github,opencv,opencv,$(OPENCV4_VERSION)) OPENCV4_INSTALL_STAGING = YES OPENCV4_LICENSE = Apache-2.0 From thomas.petazzoni at bootlin.com Mon Feb 5 15:09:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:09:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv4: bump to version 4.9.0 In-Reply-To: <20240117135713.36729-1-wdouglass@carnegierobotics.com> References: <20240117135713.36729-1-wdouglass@carnegierobotics.com> Message-ID: <20240205160930.0c2fb755@windsurf> On Wed, 17 Jan 2024 08:57:13 -0500 Woodrow Douglass via buildroot wrote: > https://github.com/opencv/opencv/wiki/ChangeLog#version490 > > Signed-off-by: Woodrow Douglass > --- > package/opencv4-contrib/opencv4-contrib.hash | 2 +- > package/opencv4-contrib/opencv4-contrib.mk | 2 +- > package/opencv4/opencv4.hash | 2 +- > package/opencv4/opencv4.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:11:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:11:37 +0100 Subject: [Buildroot] [PATCH] package/iputils: bump release to 20240117 In-Reply-To: <20240117234630.2728809-1-petr.vorel@gmail.com> References: <20240117234630.2728809-1-petr.vorel@gmail.com> Message-ID: <20240205161137.5a56b402@windsurf> On Thu, 18 Jan 2024 00:46:30 +0100 Petr Vorel wrote: > Signed-off-by: Petr Vorel > --- > package/iputils/iputils.hash | 4 ++-- > package/iputils/iputils.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:10:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:10:18 +0100 Subject: [Buildroot] [git commit] package/iputils: bump release to 20240117 Message-ID: <20240205151304.8299E86D19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20b622fd05785906cd8bf6bfd8348cc52830cfb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/iputils/iputils.hash | 4 ++-- package/iputils/iputils.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index c2f6a40797..a3e48d60a9 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,5 +1,5 @@ -# https://github.com/iputils/iputils/releases/download/20231222/sha256sums.asc -sha256 e3ce5e1a1f795c2d520985463b90e20f9388b7060796d54ad64509aa8e4af775 iputils-20231222.tar.gz +# https://github.com/iputils/iputils/releases/download/20240117/sha256sums.asc +sha256 7ed46e876e4157e1d20c40ec945e1ce0f3af3b10b5f6373e423135c6f22cd116 iputils-20240117.tar.gz # Locally computed sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index bcf440ec93..58e44d673a 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPUTILS_VERSION = 20231222 +IPUTILS_VERSION = 20240117 IPUTILS_SITE = https://github.com/iputils/iputils/releases/download/$(IPUTILS_VERSION) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 From thomas.petazzoni at bootlin.com Mon Feb 5 15:12:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:12:36 +0100 Subject: [Buildroot] [git commit] support/testing: add pciutils runtime test Message-ID: <20240205151304.97F5286D07@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f50c4cd2b72b8a04600e525e9d848df0ad42e14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_pciutils.py | 83 ++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ebc1af84cb..31496cbcc6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1804,6 +1804,7 @@ F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ F: support/testing/tests/package/test_openblas.py +F: support/testing/tests/package/test_pciutils.py F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_pigz.py F: support/testing/tests/package/test_python_distro.py diff --git a/support/testing/tests/package/test_pciutils.py b/support/testing/tests/package/test_pciutils.py new file mode 100644 index 0000000000..3221b0cfd1 --- /dev/null +++ b/support/testing/tests/package/test_pciutils.py @@ -0,0 +1,83 @@ +import os + +import infra.basetest + + +class TestPCIUtils(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_PCIUTILS=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") + + # Note: we add a qemu pci-testdev in order to have a stable + # device ID, and for writing in configuration space without + # interfering with the rest of the emulation. See: + # https://www.qemu.org/docs/master/specs/pci-testdev.html + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file, + "-device", "pci-testdev"]) + self.emulator.login() + + # Check the program executes. This test also check that we + # have "lspci" from the pciutils package, rather than the + # busybox applet (which does not recognize the --version + # option)" + self.assertRunOk("lspci --version") + + # Check few program invocations. + self.assertRunOk("lspci") + for lspci_opt in ["-t", "-n", "-v", "-vv", "-x"]: + self.assertRunOk(f"lspci {lspci_opt}") + + # Check we can see the qemu pci-testdev. + # Vendor: 1b36: Red Hat, Inc. + # Device: 0005: QEMU PCI Test Device + pci_vendor_id = "1b36" + pci_device_id = "0005" + pci_dev = f"{pci_vendor_id}:{pci_device_id}" + cmd = f"lspci -d {pci_dev}" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn("Red Hat, Inc.", output[0]) + self.assertIn("QEMU PCI Test Device", output[0]) + + # We disable INTx emulation by setting bit 10 of the COMMAND + # register in the configuration space. See: + # https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/tree/lib/header.h?h=v3.10.0#n26 + dis_int_x = 0x400 + data_mask = f"{hex(dis_int_x)}:{hex(dis_int_x)}" + cmd = f"setpci -d {pci_dev} COMMAND.w={data_mask}" + self.assertRunOk(cmd) + + # We read back and check the value. + cmd = f"setpci -d {pci_dev} COMMAND.w" + output, exit_code = self.emulator.run(cmd) + read_value = int(output[0], 16) + self.assertEqual(exit_code, 0) + self.assertTrue((read_value & dis_int_x) == dis_int_x) + + # We check lspci now see the disabled INTx emulation. + cmd = f"lspci -vv -d {pci_dev} | grep -F 'DisINTx+'" + self.assertRunOk(cmd) + + # We re-enable the INTx emulation by clearing the bit 10. + data_mask = f"0x0:{hex(dis_int_x)}" + cmd = f"setpci -d {pci_dev} COMMAND.w={data_mask}" + self.assertRunOk(cmd) + + # We read back and check the value, again. + cmd = f"setpci -d {pci_dev} COMMAND.w" + output, exit_code = self.emulator.run(cmd) + read_value = int(output[0], 16) + self.assertEqual(exit_code, 0) + self.assertTrue((read_value & dis_int_x) == 0) + + # We check lspci now see the enabled INTx emulation. + cmd = f"lspci -vv -d {pci_dev} | grep -F 'DisINTx-'" + self.assertRunOk(cmd) From thomas.petazzoni at bootlin.com Mon Feb 5 15:13:07 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:13:07 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add pciutils runtime test In-Reply-To: <20240117201157.51827-1-ju.o@free.fr> References: <20240117201157.51827-1-ju.o@free.fr> Message-ID: <20240205161307.0e653997@windsurf> On Wed, 17 Jan 2024 21:11:57 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit b200632 with commands: Applied to master, thanks a lot! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:13:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:13:40 +0100 Subject: [Buildroot] [PATCH 1/1] configs/acmesystems_acqua_a5_*: bump to Linux 6.6.12 In-Reply-To: References: Message-ID: <20240205161340.4d3befb2@windsurf> On Tue, 16 Jan 2024 12:49:01 +0100 Edgar Bonet wrote: > Also adjust the include path for the device tree. Since Linux 6.5-rc1 > (724ba67515 "ARM: dts: Move .dts files to vendor sub-directories"), > sama5d31.dtsi lives in the microchip subdirectory. > > Signed-off-by: Edgar Bonet > --- > board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts | 2 +- > configs/acmesystems_acqua_a5_256mb_defconfig | 4 ++-- > configs/acmesystems_acqua_a5_512mb_defconfig | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Mon Feb 5 15:13:48 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 16:13:48 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am62x_sk_defconfig: explicitly set the kernel version In-Reply-To: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> References: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> Message-ID: <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> Hi Dario, On 23/11/23 14:40, Dario Binacchi wrote: > Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig) forgot to > specify the Linux kernel version, so do that now. > > When the defconfig was added, the default version was 6.4.x, so use > version 6.4.16. > > Signed-off-by: Dario Binacchi > --- > configs/ti_am62x_sk_defconfig | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index b98a68ff153f..6610e6fcf890 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,7 +1,10 @@ > BR2_aarch64=y > +BR2_KERNEL_HEADERS_6_4=y here ^^^ you need to specify BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 and not the line above, > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" > BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" Can you please correct and send V2? Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Mon Feb 5 15:13:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:13:21 +0100 Subject: [Buildroot] [git commit] configs/acmesystems_acqua_a5_*: bump to Linux 6.6.12 Message-ID: <20240205151436.9C91086D24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8fb52098859fa5cf7ecf4db30ff8e0276687832f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Also adjust the include path for the device tree. Since Linux 6.5-rc1 (724ba67515 "ARM: dts: Move .dts files to vendor sub-directories"), sama5d31.dtsi lives in the microchip subdirectory. Signed-off-by: Edgar Bonet Signed-off-by: Thomas Petazzoni --- board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts | 2 +- configs/acmesystems_acqua_a5_256mb_defconfig | 4 ++-- configs/acmesystems_acqua_a5_512mb_defconfig | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts index 39fa4df1b1..a7a4a20352 100644 --- a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts +++ b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts @@ -9,7 +9,7 @@ * Licensed under GPLv2 or later. */ /dts-v1/; -#include "sama5d31.dtsi" +#include "microchip/sama5d31.dtsi" / { model = "Acme Systems Acqua SOM"; diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index 5b32234294..ef57734194 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.27" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index 69294cbec0..a69e2a2251 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/acmesystems/acqua-a5/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.27" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" BR2_LINUX_KERNEL_DEFCONFIG="sama5" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts" From giulio.benetti at benettiengineering.com Mon Feb 5 15:16:19 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 16:16:19 +0100 Subject: [Buildroot] [PATCH 2/2] configs/ti_am62x_sk_defconfig: drop redundant defconfig choice In-Reply-To: <20231123134052.239690-2-dario.binacchi@amarulasolutions.com> References: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> <20231123134052.239690-2-dario.binacchi@amarulasolutions.com> Message-ID: <0f0ddd79-6aee-4fa7-8b60-dce12339e94b@benettiengineering.com> Hi Dario, On 23/11/23 14:40, Dario Binacchi wrote: > The defconfig choice is the default one, so it is redundant and can be > removed without effect. > > Signed-off-by: Dario Binacchi > --- > configs/ti_am62x_sk_defconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 6610e6fcf890..130d092e304f 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -24,7 +24,6 @@ BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3" > BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" > BR2_TARGET_UBOOT=y From thomas.petazzoni at bootlin.com Mon Feb 5 15:26:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:26:31 +0100 Subject: [Buildroot] [git commit] package/libtracefs: needs threads Message-ID: <20240205152743.B295586D2E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d5524c00656c314626862e54b2cd38865486cf55 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libtracefs needs threads resulting in the following build failure since its addition in commit b1dbd3f679e6660325472e3fdca72127d74e6929: In file included from /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, from ../src/tracefs-instance.c:10: /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] 218 | # warning requested reentrant code, but thread support was disabled | ^~~~~~~ ../src/tracefs-instance.c:20:10: fatal error: pthread.h: No such file or directory 20 | #include | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/e0a8dd0781a1d1824a4cb78f47dcff4055083959 Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/libtracefs/Config.in | 5 +++-- package/linux-tools/Config.in | 5 +++-- package/trace-cmd/Config.in | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package/libtracefs/Config.in b/package/libtracefs/Config.in index bb0777b16c..a46bbe0bb1 100644 --- a/package/libtracefs/Config.in +++ b/package/libtracefs/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBTRACEFS bool "libtracefs" + depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS # libtraceevent select BR2_PACKAGE_LIBTRACEEVENT help @@ -8,5 +9,5 @@ config BR2_PACKAGE_LIBTRACEFS https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/ -comment "libtracefs needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "libtracefs needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index ce744663f1..fb158f84d4 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -104,6 +104,7 @@ endif config BR2_PACKAGE_LINUX_TOOLS_RTLA bool "rtla" + depends on BR2_TOOLCHAIN_HAS_THREADS # libtracefs depends on !BR2_STATIC_LIBS # libtracefs select BR2_PACKAGE_LINUX_TOOLS select BR2_PACKAGE_LIBTRACEFS @@ -124,8 +125,8 @@ config BR2_PACKAGE_LINUX_TOOLS_RTLA not available in Buildroot, so only rtla in kernels 5.19 onwards is actually supported in Buildroot. -comment "rtla needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "rtla needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS bool"selftests" diff --git a/package/trace-cmd/Config.in b/package/trace-cmd/Config.in index 00b9ebbd9a..c47b1f57ca 100644 --- a/package/trace-cmd/Config.in +++ b/package/trace-cmd/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_TRACE_CMD depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS # libtracefs select BR2_PACKAGE_LIBTRACEEVENT select BR2_PACKAGE_LIBTRACEFS help @@ -16,6 +17,7 @@ config BR2_PACKAGE_TRACE_CMD http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git -comment "trace-cmd needs a toolchain w/ NPTL, dynamic library" +comment "trace-cmd needs a toolchain w/ threads, NPTL, dynamic library" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS From thomas.petazzoni at bootlin.com Mon Feb 5 15:33:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:33:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: needs threads In-Reply-To: <20240116214427.945514-1-fontaine.fabrice@gmail.com> References: <20240116214427.945514-1-fontaine.fabrice@gmail.com> Message-ID: <20240205163358.7752aec0@windsurf> On Tue, 16 Jan 2024 22:44:27 +0100 Fabrice Fontaine wrote: > libtracefs needs threads resulting in the following build failure since > its addition in commit b1dbd3f679e6660325472e3fdca72127d74e6929: > > In file included from /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, > from ../src/tracefs-instance.c:10: > /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] > 218 | # warning requested reentrant code, but thread support was disabled > | ^~~~~~~ > ../src/tracefs-instance.c:20:10: fatal error: pthread.h: No such file or directory > 20 | #include > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/e0a8dd0781a1d1824a4cb78f47dcff4055083959 > > Signed-off-by: Fabrice Fontaine > --- > package/libtracefs/Config.in | 5 +++-- > package/linux-tools/Config.in | 5 +++-- > 2 files changed, 6 insertions(+), 4 deletions(-) Thanks a lot! It looks like you missed trace-cmd package, which also selects libtracefs, so I fixed that up when applying. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Mon Feb 5 15:34:43 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 16:34:43 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am62x_sk_defconfig: explicitly set the kernel version In-Reply-To: <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> References: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> Message-ID: <53ee955f-0870-456f-8c46-67fafb8bfff8@benettiengineering.com> Dario, I've also tried to build this defconfig and it fails while building ti-k3-r5-loader with: ``` COPY spl/u-boot-spl.bin ./tools/k3_gen_x509_cert.sh -c 16 -b spl/u-boot-spl.bin \ -o tiboot3.bin -l 0x43c00000 -r 1 -k "" SWRV = 1 Could not open file or uri for loading private key from eckey.pem: No such file or directory cat: certificate.bin: No such file or directory rm: cannot remove 'certificate.bin': No such file or directory rm: cannot remove 'eckey.pem': No such file or directory make[3]: *** [arch/arm/mach-k3//config.mk:55: tiboot3.bin] Error 1 make[3]: *** Deleting file 'tiboot3.bin' ``` Can you please take a look into it? Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas On 05/02/24 16:13, Giulio Benetti wrote: > Hi Dario, > > On 23/11/23 14:40, Dario Binacchi wrote: >> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig) forgot to >> specify the Linux kernel version, so do that now. >> >> When the defconfig was added, the default version was 6.4.x, so use >> version 6.4.16. >> >> Signed-off-by: Dario Binacchi > --- >> ? configs/ti_am62x_sk_defconfig | 3 +++ >> ? 1 file changed, 3 insertions(+) >> >> diff --git a/configs/ti_am62x_sk_defconfig >> b/configs/ti_am62x_sk_defconfig >> index b98a68ff153f..6610e6fcf890 100644 >> --- a/configs/ti_am62x_sk_defconfig >> +++ b/configs/ti_am62x_sk_defconfig >> @@ -1,7 +1,10 @@ >> ? BR2_aarch64=y >> +BR2_KERNEL_HEADERS_6_4=y > > here ^^^ you need to specify BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 > and not the line above, > >> ? BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> ? BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" >> ? BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" >> ? BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >> ? BR2_LINUX_KERNEL_DTS_SUPPORT=y >> ? BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > > Can you please correct and send V2? > > Thank you! > > Best regards From giulio.benetti at benettiengineering.com Mon Feb 5 15:36:21 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 16:36:21 +0100 Subject: [Buildroot] [PATCH] configs/am574x_idk_defconfig: new defconfig In-Reply-To: <20240131173827.1281120-1-romain.naour@smile.fr> References: <20240131173827.1281120-1-romain.naour@smile.fr> Message-ID: Hi Romain, On 31/01/24 18:38, Romain Naour wrote: > This patch adds a basic support for AM574x Industrial Development Kit > [1]. > > Use multi_v7_defconfig as kernel configuration file instead of > the deprecated omap2plus_defconfig [2]. > > The main differences between upstream kernels and the TI vendor tree > (5.10.x based) are: > > - pru based 100M ethernet ports will not work with upstream kernels > since the prueth driver for AM57 is not upstream yet (as of 6.8-rc2) > [3]. > > - The ARM/DSP examples provided by TI [4] will not work either since > they requires an experimental patch [5] adding "remote-processor > messaging sockets". > > - There is no support for the POWERVR GPU SGX544 that requires > additional userpace vendor (closed source) libraries. > > [1] https://www.ti.com/tool/TMDSIDK574 > [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cca9f6838bac3441a42fa906314bf5e3bff50ac5 > [3] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=792b57aac224416f66175c15d60379a4cf581d0f > [4] https://git.ti.com/cgit/processor-sdk/big-data-ipc-examples > [5] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=f4b978a978c38149f712ddd137f12ed5fb914161 > > Signed-off-by: Romain Naour > --- > board/ti/am574x-idk/extlinux.conf | 4 +++ > board/ti/am574x-idk/genimage.cfg | 30 +++++++++++++++++++++ > board/ti/am574x-idk/post-build.sh | 4 +++ > board/ti/am574x-idk/readme.txt | 28 +++++++++++++++++++ > configs/am574x_idk_defconfig | 45 +++++++++++++++++++++++++++++++ > 5 files changed, 111 insertions(+) > create mode 100644 board/ti/am574x-idk/extlinux.conf > create mode 100644 board/ti/am574x-idk/genimage.cfg > create mode 100755 board/ti/am574x-idk/post-build.sh > create mode 100644 board/ti/am574x-idk/readme.txt > create mode 100644 configs/am574x_idk_defconfig > > diff --git a/board/ti/am574x-idk/extlinux.conf b/board/ti/am574x-idk/extlinux.conf > new file mode 100644 > index 0000000000..29e0ecfa14 > --- /dev/null > +++ b/board/ti/am574x-idk/extlinux.conf > @@ -0,0 +1,4 @@ > +label am5749-idk-buildroot > + kernel /zImage > + fdtdir / > + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait > diff --git a/board/ti/am574x-idk/genimage.cfg b/board/ti/am574x-idk/genimage.cfg > new file mode 100644 > index 0000000000..02a9ffe013 > --- /dev/null > +++ b/board/ti/am574x-idk/genimage.cfg > @@ -0,0 +1,30 @@ > +image boot.vfat { > + vfat { > + files = { > + "MLO", > + "u-boot.img", > + "zImage", > + "am574x-idk.dtb", > + "extlinux" > + } > + } > + > + size = 16M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 1G > + } > +} > diff --git a/board/ti/am574x-idk/post-build.sh b/board/ti/am574x-idk/post-build.sh > new file mode 100755 > index 0000000000..5dcdb352eb > --- /dev/null > +++ b/board/ti/am574x-idk/post-build.sh > @@ -0,0 +1,4 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${BINARIES_DIR}"/extlinux/extlinux.conf > diff --git a/board/ti/am574x-idk/readme.txt b/board/ti/am574x-idk/readme.txt > new file mode 100644 > index 0000000000..4869984cf1 > --- /dev/null > +++ b/board/ti/am574x-idk/readme.txt > @@ -0,0 +1,28 @@ > +Texas Instuments AM574x IDK Test and Development Board > + > +Description > +=========== > + > +This configuration will build a basic image for the TI AM574x IDK > +board: https://www.ti.com/tool/TMDSIDK574 > + > +How to build it > +=============== > + > +Configure Buildroot: > + > + $ make am574x_idk_defconfig > + > +Compile everything and build the USB flash drive image: > + > + $ make > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > diff --git a/configs/am574x_idk_defconfig b/configs/am574x_idk_defconfig > new file mode 100644 > index 0000000000..bbae73dff4 > --- /dev/null > +++ b/configs/am574x_idk_defconfig > @@ -0,0 +1,45 @@ > +# Architecture > +BR2_arm=y > +BR2_cortex_a15=y > + > +# System > +BR2_SYSTEM_DHCP="eth0" > + > +# Linux headers same as kernel, a 6.6 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" > +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am574x-idk" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am574x-idk/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am574x-idk/genimage.cfg" > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +# BR2_TARGET_UBOOT_FORMAT_BIN is not set > +BR2_TARGET_UBOOT_FORMAT_IMG=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="MLO" > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y It looks good to me and I've build tested it using docker-run. Reviewed-by: Giulio Benetti [Build Tested] Tested-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From fontaine.fabrice at gmail.com Mon Feb 5 15:36:45 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 5 Feb 2024 16:36:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: needs threads In-Reply-To: <20240205163358.7752aec0@windsurf> References: <20240116214427.945514-1-fontaine.fabrice@gmail.com> <20240205163358.7752aec0@windsurf> Message-ID: Hi Thomas, Le lun. 5 f?vr. 2024 ? 16:34, Thomas Petazzoni a ?crit : > > On Tue, 16 Jan 2024 22:44:27 +0100 > Fabrice Fontaine wrote: > > > libtracefs needs threads resulting in the following build failure since > > its addition in commit b1dbd3f679e6660325472e3fdca72127d74e6929: > > > > In file included from /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, > > from ../src/tracefs-instance.c:10: > > /home/autobuild/autobuild/instance-2/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] > > 218 | # warning requested reentrant code, but thread support was disabled > > | ^~~~~~~ > > ../src/tracefs-instance.c:20:10: fatal error: pthread.h: No such file or directory > > 20 | #include > > | ^~~~~~~~~~~ > > > > Fixes: > > - http://autobuild.buildroot.org/results/e0a8dd0781a1d1824a4cb78f47dcff4055083959 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/libtracefs/Config.in | 5 +++-- > > package/linux-tools/Config.in | 5 +++-- > > 2 files changed, 6 insertions(+), 4 deletions(-) > > Thanks a lot! It looks like you missed trace-cmd package, which also > selects libtracefs, so I fixed that up when applying. Thanks! I didn't miss trace-cmd, it already has a dependency on BR2_TOOLCHAIN_HAS_THREADS_NPTL. > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com Best Regards, Fabrice From thomas.petazzoni at bootlin.com Mon Feb 5 15:37:24 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:37:24 +0100 Subject: [Buildroot] [git commit] package/libtirpc: bump version to 1.3.4 Message-ID: <20240205153822.80E4486D44@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26890624ef64d06982d952335603ee8a9cd3c73a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/libtirpc/libtirpc.hash | 4 ++-- package/libtirpc/libtirpc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libtirpc/libtirpc.hash b/package/libtirpc/libtirpc.hash index 1efc3e47e2..40e59f9bcb 100644 --- a/package/libtirpc/libtirpc.hash +++ b/package/libtirpc/libtirpc.hash @@ -1,5 +1,5 @@ # From sourceforge's info on download page: -sha1 6e52c39148494e4836e2d5d4f28b11ddfa65394b libtirpc-1.3.3.tar.bz2 +sha1 63c800f81f823254d2706637bab551dec176b99b libtirpc-1.3.4.tar.bz2 # Locally computed -sha256 6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3 libtirpc-1.3.3.tar.bz2 +sha256 1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860 libtirpc-1.3.4.tar.bz2 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 179adc97d0..298b3c36bd 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.3.3 +LIBTIRPC_VERSION = 1.3.4 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause From thomas.petazzoni at bootlin.com Mon Feb 5 15:36:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:36:54 +0100 Subject: [Buildroot] [git commit] package/libqrtr-glib: bump version to 1.2.2 Message-ID: <20240205153822.75F3F86D43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b50bb982208011841fe0a9a7e4309808085cf493 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Project switched to meson. Use gitlab.freedesktop.org for download (previous URL did not work for meson), thus moving to tar.gz archive. Disable gtkdocize (not only to follow Buildroot approach, but also to avoid build failure: ERROR: Program 'gtkdoc-scan' not found or not executable). License file got renamed: https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/commit/974e4231eaf4a3bf087c1df54e77df8cac935e15 Signed-off-by: Petr Vorel Reviewed-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni --- package/libqrtr-glib/libqrtr-glib.hash | 4 ++-- package/libqrtr-glib/libqrtr-glib.mk | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/libqrtr-glib/libqrtr-glib.hash b/package/libqrtr-glib/libqrtr-glib.hash index e00dd0cb94..38543f7de9 100644 --- a/package/libqrtr-glib/libqrtr-glib.hash +++ b/package/libqrtr-glib/libqrtr-glib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee libqrtr-glib-1.0.0.tar.xz +sha256 c5cdf5ea91cbd2cf2758b2896064c7b1dfe7156063267df905f957ac69b6b763 libqrtr-glib-1.2.2.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt diff --git a/package/libqrtr-glib/libqrtr-glib.mk b/package/libqrtr-glib/libqrtr-glib.mk index 6ab8335417..c3df76dc84 100644 --- a/package/libqrtr-glib/libqrtr-glib.mk +++ b/package/libqrtr-glib/libqrtr-glib.mk @@ -4,19 +4,21 @@ # ################################################################################ -LIBQRTR_GLIB_VERSION = 1.0.0 -LIBQRTR_GLIB_SITE = http://www.freedesktop.org/software/libqmi -LIBQRTR_GLIB_SOURCE = libqrtr-glib-$(LIBQRTR_GLIB_VERSION).tar.xz +LIBQRTR_GLIB_VERSION = 1.2.2 +LIBQRTR_GLIB_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/archive/$(LIBQRTR_GLIB_VERSION) LIBQRTR_GLIB_LICENSE = LGPL-2.1+ -LIBQRTR_GLIB_LICENSE_FILES = COPYING.LIB +LIBQRTR_GLIB_LICENSE_FILES = LICENSES/LGPL-2.1-or-later.txt LIBQRTR_GLIB_INSTALL_STAGING = YES LIBQRTR_GLIB_DEPENDENCIES = libglib2 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBQRTR_GLIB_CONF_OPTS += --enable-introspection +LIBQRTR_GLIB_CONF_OPTS += -Dintrospection=true LIBQRTR_GLIB_DEPENDENCIES += gobject-introspection else -LIBQRTR_GLIB_CONF_OPTS += --disable-introspection +LIBQRTR_GLIB_CONF_OPTS += -Dintrospection=false endif -$(eval $(autotools-package)) +# disable gtkdocize +LIBQRTR_GLIB_CONF_OPTS += -Dgtk_doc=false + +$(eval $(meson-package)) From thomas.petazzoni at bootlin.com Mon Feb 5 15:38:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:38:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqrtr-glib: bump version to 1.2.2 In-Reply-To: <20240115223952.2532111-1-petr.vorel@gmail.com> References: <20240115223952.2532111-1-petr.vorel@gmail.com> Message-ID: <20240205163834.4f365ce7@windsurf> On Mon, 15 Jan 2024 23:39:52 +0100 Petr Vorel wrote: > Project switched to meson. > Use gitlab.freedesktop.org for download (previous URL did not work for > meson), thus moving to tar.gz archive. > > Disable gtkdocize (not only to follow Buildroot approach, but also to avoid > build failure: ERROR: Program 'gtkdoc-scan' not found or not executable). > > License file got renamed: > https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/commit/974e4231eaf4a3bf087c1df54e77df8cac935e15 > > Signed-off-by: Petr Vorel > --- > Hi, Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:38:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:38:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtirpc: bump version to 1.3.4 In-Reply-To: <20240115214809.2352232-1-petr.vorel@gmail.com> References: <20240115214809.2352232-1-petr.vorel@gmail.com> Message-ID: <20240205163845.74b6cd72@windsurf> On Mon, 15 Jan 2024 22:48:09 +0100 Petr Vorel wrote: > Signed-off-by: Petr Vorel > --- > package/libtirpc/libtirpc.hash | 4 ++-- > package/libtirpc/libtirpc.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:39:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:39:52 +0100 Subject: [Buildroot] [git commit] package/kvm-unit-tests: bump to version 2024-01-08 Message-ID: <20240205154129.E9A2C86D4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f4ac946347cc0792956aca4d3ab2252aa9fbe2e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master A new kvm-unit-tests version has recently been tagged, so we can use this version now for buildroot. It ships now with a full version of the GPL v2 license in the LICENSE file, thus we add a hash for that file, too. Signed-off-by: Thomas Huth Signed-off-by: Thomas Petazzoni --- package/kvm-unit-tests/kvm-unit-tests.hash | 5 +++-- package/kvm-unit-tests/kvm-unit-tests.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index 3b6d02dd8e..d4db9f2b75 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,4 @@ # Locally computed -sha256 9c9b093ffe3fa33145a53102de9c3e2d55cd0cdc8a20cf172b726296ffe22f4f kvm-unit-tests-v2023-01-05.tar.bz2 -sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT +sha256 8636994e10240705f10a9150ef688ae6832d0ea0dcc8860c826c645ecfc1169f kvm-unit-tests-v2024-01-08.tar.bz2 +sha256 b3c9ca9e257f2eaae070cf0ccdf8770764f05a947a39a835e633413750a5777b COPYRIGHT +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 956f07b304..73d20d6b2e 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,11 +4,11 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = 2023-01-05 +KVM_UNIT_TESTS_VERSION = 2024-01-08 KVM_UNIT_TESTS_SOURCE = kvm-unit-tests-v$(KVM_UNIT_TESTS_VERSION).tar.bz2 KVM_UNIT_TESTS_SITE = https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/archive/v$(KVM_UNIT_TESTS_VERSION) KVM_UNIT_TESTS_LICENSE = GPL-2.0, LGPL-2.0 -KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT +KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT LICENSE ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) KVM_UNIT_TESTS_ARCH = aarch64 From thomas.petazzoni at bootlin.com Mon Feb 5 15:41:32 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:41:32 +0100 Subject: [Buildroot] [PATCH] package/kvm-unit-tests: bump to version 2024-01-08 In-Reply-To: <20240116084826.917058-1-huth@tuxfamily.org> References: <20240116084826.917058-1-huth@tuxfamily.org> Message-ID: <20240205164132.41ef9664@windsurf> On Tue, 16 Jan 2024 09:48:26 +0100 Thomas Huth wrote: > A new kvm-unit-tests version has recently been tagged, so we can use this > version now for buildroot. It ships now with a full version of the GPL v2 > license in the LICENSE file, thus we add a hash for that file, too. > > Signed-off-by: Thomas Huth > --- > package/kvm-unit-tests/kvm-unit-tests.hash | 5 +++-- > package/kvm-unit-tests/kvm-unit-tests.mk | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:42:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:42:05 +0100 Subject: [Buildroot] [PATCH 1/1] configs/asus_tinker-s_rk3288: bump Linux to 6.1.72 In-Reply-To: <20240115180946.1646186-1-flavio.tapajos@newtesc.com.br> References: <20240115180946.1646186-1-flavio.tapajos@newtesc.com.br> Message-ID: <20240205164205.33c28a05@windsurf> On Mon, 15 Jan 2024 15:09:46 -0300 Fl?vio Tapaj?s wrote: > Signed-off-by: Fl?vio Tapaj?s > --- > configs/asus_tinker-s_rk3288_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 15:41:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:41:56 +0100 Subject: [Buildroot] [git commit] configs/asus_tinker-s_rk3288: bump Linux to 6.1.72 Message-ID: <20240205154307.6421086D51@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ff00badaa23549f6a339a43f8ce19b4115a0796 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Fl??vio Tapaj??s Signed-off-by: Thomas Petazzoni --- configs/asus_tinker-s_rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/asus_tinker-s_rk3288_defconfig b/configs/asus_tinker-s_rk3288_defconfig index fc1b3b3505..de03336cbb 100644 --- a/configs/asus_tinker-s_rk3288_defconfig +++ b/configs/asus_tinker-s_rk3288_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.70" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.72" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker-s" From thomas.petazzoni at bootlin.com Mon Feb 5 15:46:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 16:46:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: needs threads In-Reply-To: References: <20240116214427.945514-1-fontaine.fabrice@gmail.com> <20240205163358.7752aec0@windsurf> Message-ID: <20240205164652.535887b4@windsurf> On Mon, 5 Feb 2024 16:36:45 +0100 Fabrice Fontaine wrote: > > Thanks a lot! It looks like you missed trace-cmd package, which also > > selects libtracefs, so I fixed that up when applying. Thanks! > > I didn't miss trace-cmd, it already has a dependency on > BR2_TOOLCHAIN_HAS_THREADS_NPTL. It is totally true, but in general we try to propagate the dependencies anyway so that we keep track of why we have those dependencies. I agree it's not a 100% accurate rule in the way we apply it. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 16:02:24 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 17:02:24 +0100 Subject: [Buildroot] [git commit] support/testing: use Nehalem cpu emulation for TestGrubX8664EFI Message-ID: <20240205160313.0224086D5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f565b52225785bfa268ea19c4c347917d38ade4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master In commit 7e0e6e3b8618 (toolchain/toolchain-external/toolchain-external-bootlin: update to 2023.11-1) the TestGrubX8664EFI fails with this error: # efivar -l traps: efivar[86] trap invalid opcode ip:7fc187f4c7f4 sp:7fff9bbaa930 error:0 in libefivar.so.1.38[7fc187f4c000+16000] Illegal instruction This error can be reproduced by installing other packages like "file". The 2023.11-1 Bootlin toolchains are built for a corei7 CPU [0], which is in fact a Nehalem CPU; we switched to the new names in commit 653fa001f304 (arch/Config.in.x86: add "newer" names for several Intel x86 CPU variants). This means that the Bootlin toolchains may use Nehalem-specific instructions. The TestGrubX8664EFI test is also setup for BR2_x86_corei7, so our executables will also contain Nehalem instructions. However, the default Qemu x86_64 is not guaranteed to emulate all the instructions specific to Nehalem, causing runtime issues as reported above. A similar issue has been fixed in toolchain-builder by adding Nehalem cpu emulation on the qemu command line [0]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 [0] https://gitlab.com/buildroot.org/toolchains-builder/-/commit/f2b253732b4d1fc5b87badba7c2d48f12a197f76 Signed-off-by: Romain Naour [yann.morin.1998 at free.fr: - reword the commit log to explain corei7 -> Nehalem equivalence - note that the toolchain-builder *and* our test target corei7, thus Nehalem ] Signed-off-by: Yann E. MORIN --- support/testing/tests/boot/test_grub.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py index 9f3a6a8495..5315fa23ba 100644 --- a/support/testing/tests/boot/test_grub.py +++ b/support/testing/tests/boot/test_grub.py @@ -120,7 +120,7 @@ class TestGrubX8664EFI(infra.basetest.BRTest): # https://github.com/tianocore/edk2/commit/bf5678b5802685e07583e3c7ec56d883cbdd5da3 # http://lists.busybox.net/pipermail/buildroot/2023-July/670825.html qemu_fw_cfg = "name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes" - self.emulator.boot(arch="x86_64", options=["-bios", bios, "-hda", hda, "-fw_cfg", qemu_fw_cfg]) + self.emulator.boot(arch="x86_64", options=["-bios", bios, "-cpu", "Nehalem", "-hda", hda, "-fw_cfg", qemu_fw_cfg]) self.emulator.login() cmd = "modprobe efivarfs" From yann.morin.1998 at free.fr Mon Feb 5 16:04:40 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 17:04:40 +0100 Subject: [Buildroot] [PATCH] support/testing: TestGrubX8664EFI: use Nehalem cpu emulation In-Reply-To: <20240205133530.1188319-1-romain.naour@smile.fr> References: <20240205133530.1188319-1-romain.naour@smile.fr> Message-ID: Romain, All, On 2024-02-05 14:35 +0100, Romain Naour spake thusly: > Following the Bootlin toolchain bump to 2023.11-1 [1], the > TestGrubX8664EFI failed with this error: As we discussed IRL, I've reworded the commit log with your input. > # efivar -l > traps: efivar[86] trap invalid opcode ip:7fc187f4c7f4 sp:7fff9bbaa930 error:0 in libefivar.so.1.38[7fc187f4c000+16000] > Illegal instruction > > Actually this error can be reproduced by installing other packages like > "file" because the qemu emulation doesn't provide all assembler > instruction emulation required by x86-64-core-i7 target used by > TestGrubX8664EFI. > > A similar issue has been fixed in toolchain-builder by adding Nehalem > cpu emulation on the qemu command line [2]. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 > > [1] 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 > [2] https://gitlab.com/buildroot.org/toolchains-builder/-/commit/f2b253732b4d1fc5b87badba7c2d48f12a197f76 > > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/testing/tests/boot/test_grub.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py > index 9f3a6a8495..5315fa23ba 100644 > --- a/support/testing/tests/boot/test_grub.py > +++ b/support/testing/tests/boot/test_grub.py > @@ -120,7 +120,7 @@ class TestGrubX8664EFI(infra.basetest.BRTest): > # https://github.com/tianocore/edk2/commit/bf5678b5802685e07583e3c7ec56d883cbdd5da3 > # http://lists.busybox.net/pipermail/buildroot/2023-July/670825.html > qemu_fw_cfg = "name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes" > - self.emulator.boot(arch="x86_64", options=["-bios", bios, "-hda", hda, "-fw_cfg", qemu_fw_cfg]) > + self.emulator.boot(arch="x86_64", options=["-bios", bios, "-cpu", "Nehalem", "-hda", hda, "-fw_cfg", qemu_fw_cfg]) > self.emulator.login() > > cmd = "modprobe efivarfs" > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ismael at iodev.co.uk Mon Feb 5 16:18:44 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Mon, 5 Feb 2024 17:18:44 +0100 Subject: [Buildroot] [PATCH] package/mawk: bump version to 1.3.4-20240123 Message-ID: <20240205161846.30230-1-ismael@iodev.co.uk> Signed-off-by: Ismael Luceno --- package/mawk/mawk.hash | 2 +- package/mawk/mawk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mawk/mawk.hash b/package/mawk/mawk.hash index 0a31675ac8e9..31a74cab606e 100644 --- a/package/mawk/mawk.hash +++ b/package/mawk/mawk.hash @@ -1,2 +1,2 @@ -sha256 88f55a632e2736ff5c5f69944abc151734d89d8298d5005921180f39ab7ba6d0 mawk-1.3.4-20230808.tgz +sha256 a8e319a83744b1f1fb6988dfa189d61887f866e9140cc9a49eb003b2b0655e88 mawk-1.3.4-20240123.tgz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mawk/mawk.mk b/package/mawk/mawk.mk index d747f887ce39..9aadf6d9727e 100644 --- a/package/mawk/mawk.mk +++ b/package/mawk/mawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAWK_VERSION = 1.3.4-20230808 +MAWK_VERSION = 1.3.4-20240123 MAWK_SITE = https://invisible-mirror.net/archives/mawk MAWK_SOURCE = mawk-$(MAWK_VERSION).tgz MAWK_LICENSE = GPL-2.0 -- 2.43.0 From thomas.petazzoni at bootlin.com Mon Feb 5 16:23:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 17:23:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/leptonica: affected by gcc bug 101737 In-Reply-To: <20240115211427.4291-1-fontaine.fabrice@gmail.com> References: <20240115211427.4291-1-fontaine.fabrice@gmail.com> Message-ID: <20240205172321.6c7602e4@windsurf> On Mon, 15 Jan 2024 22:14:27 +0100 Fabrice Fontaine wrote: > leptonica is affected by gcc bug 101737 resulting in the following build > failure since at least bump to version 1.82.0 in commit > 81a961c545cc9f240841b75d6c21f13b334bc274: > > sh4eb-buildroot-linux-gnu-gcc.br_real: internal compiler error: Segmentation fault signal terminated program cc1 > Please submit a full bug report, with preprocessed source (by using -freport-bug). > See for instructions. > > Fixes: > - http://autobuild.buildroot.org/results/f18979454399d9c728f9e017e4cc3a1b27458f5b > - http://autobuild.buildroot.org/results/f3c803892175b3bb2ce68e3140c879b4a4d4b302 > > Signed-off-by: Fabrice Fontaine > --- > package/leptonica/leptonica.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 16:26:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 17:26:26 +0100 Subject: [Buildroot] [git commit] package/leptonica: affected by gcc bug 101737 Message-ID: <20240205162635.A70D886D62@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=31b488337921d57c14893c34766ac22c53e5382b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master leptonica is affected by gcc bug 101737 resulting in the following build failure since at least bump to version 1.82.0 in commit 81a961c545cc9f240841b75d6c21f13b334bc274: sh4eb-buildroot-linux-gnu-gcc.br_real: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source (by using -freport-bug). See for instructions. Fixes: - http://autobuild.buildroot.org/results/f18979454399d9c728f9e017e4cc3a1b27458f5b - http://autobuild.buildroot.org/results/f3c803892175b3bb2ce68e3140c879b4a4d4b302 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/leptonica/leptonica.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 8eedf2fda9..4cb73296e8 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -14,6 +14,10 @@ LEPTONICA_DEPENDENCIES = host-pkgconf LEPTONICA_CONF_OPTS += --disable-programs +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +LEPTONICA_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -O0" +endif + ifeq ($(BR2_PACKAGE_GIFLIB),y) LEPTONICA_DEPENDENCIES += giflib LEPTONICA_CONF_OPTS += --with-giflib From james.hilliard1 at gmail.com Mon Feb 5 16:30:24 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:30:24 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/python-ruamel-yaml: bump to version 0.18.5 Message-ID: <20240205163024.500599-1-james.hilliard1@gmail.com> License hash changed due to year update: https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ Signed-off-by: James Hilliard --- Changes v1 -> v2: - fix package hash typo --- package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index 29852a51ed..b614c01d79 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/rfc3987/json -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz +sha256 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ruamel.yaml-0.18.5.tar.gz # Locally computed sha256 checksums -sha256 ab837b032c5aae84503fc0c733a116a26fd272e90dc4402fa68d3c9e51aed3b0 LICENSE +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 LICENSE diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk index a6fed3bc2c..bbdac591ca 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RUAMEL_YAML_VERSION = 0.17.21 +PYTHON_RUAMEL_YAML_VERSION = 0.18.5 PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/82/43/fa976e03a4a9ae406904489119cd7dd4509752ca692b2e0a19491ca1782c PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools PYTHON_RUAMEL_YAML_LICENSE = MIT PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 5 16:32:18 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:32:18 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <87plxbta1d.fsf@48ers.dk> References: <20240111053157.2928259-1-james.hilliard1@gmail.com> <87plxbta1d.fsf@48ers.dk> Message-ID: On Mon, Feb 5, 2024 at 4:39?AM Peter Korsgaard wrote: > > >>>>> "James" == James Hilliard writes: > > > License hash changed due to year update: > > https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ > > > Signed-off-by: James Hilliard > > --- > > package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- > > package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- > > 2 files changed, 5 insertions(+), 5 deletions(-) > > > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash > > index 29852a51ed..7b5dc1e29a 100644 > > --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash > > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash > > @@ -1,5 +1,5 @@ > > # md5, sha256 from https://pypi.org/pypi/rfc3987/json > > -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz > > -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz > > +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz > > +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 ruamel.yaml-0.18.5.tar.gz > > > Hmm, I get a different hash: > > ruamel.yaml-0.18.5.tar.gz: OK (md5: 24fac3544a3c7bd7eeaf6e4f704a056e) > ERROR: while checking hashes from package/python-ruamel-yaml//python-ruamel-yaml.hash > ERROR: ruamel.yaml-0.18.5.tar.gz has wrong sha256 hash: > ERROR: expected: ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 > ERROR: got : 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e > ERROR: Incomplete download, or man-in-the-middle (MITM) attack Looks like I typo'd the package hash(copy pasted license hash to package hash), fixed in v2: https://patchwork.ozlabs.org/project/buildroot/patch/20240205163024.500599-1-james.hilliard1 at gmail.com/ > > Any ideas? > > -- > Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 5 16:46:15 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:46:15 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-fastapi: bump to version 0.109.2 In-Reply-To: <20240205164615.510688-1-james.hilliard1@gmail.com> References: <20240205164615.510688-1-james.hilliard1@gmail.com> Message-ID: <20240205164615.510688-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.105.0 +PYTHON_FASTAPI_VERSION = 0.109.2 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 5 16:46:14 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:46:14 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-starlette: bump to version 0.36.3 Message-ID: <20240205164615.510688-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-starlette/python-starlette.hash | 4 ++-- package/python-starlette/python-starlette.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash index 820026b70b..03d77cf5be 100644 --- a/package/python-starlette/python-starlette.hash +++ b/package/python-starlette/python-starlette.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/starlette/json -md5 2ef2fc635691fd4a1823564218292dce starlette-0.34.0.tar.gz -sha256 ed050aaf3896945bfaae93bdf337e53ef3f29115a9d9c153e402985115cd9c8e starlette-0.34.0.tar.gz +md5 0a1e026d653dc448ae07f47eefe1dc8b starlette-0.36.3.tar.gz +sha256 90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080 starlette-0.36.3.tar.gz # Locally computed sha256 checksums sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk index 07f9d6be5e..9d137f5f5a 100644 --- a/package/python-starlette/python-starlette.mk +++ b/package/python-starlette/python-starlette.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_STARLETTE_VERSION = 0.34.0 +PYTHON_STARLETTE_VERSION = 0.36.3 PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/4f/36/168ba6d56a28382f3b081b23b0cc431de35786e120b94c1f372708ed3059 +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/be/47/1bba49d42d63f4453f0a64a20acbf2d0bd2f5a8cde6a166ee66c074a08f8 PYTHON_STARLETTE_SETUP_TYPE = pep517 PYTHON_STARLETTE_LICENSE = BSD-3-Clause PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 5 16:47:33 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:47:33 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-starlette: bump to version 0.34.0 In-Reply-To: <87il33rm9s.fsf@48ers.dk> References: <20240111072922.3082638-1-james.hilliard1@gmail.com> <87sf27upph.fsf@48ers.dk> <42594955-dcd4-4161-9a84-879f096d49f7@bubu1.eu> <87il33rm9s.fsf@48ers.dk> Message-ID: On Mon, Feb 5, 2024 at 7:58?AM Peter Korsgaard wrote: > > >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > > > Hi Peter, > > On 05.02.24 12:15, Peter Korsgaard wrote: > >>>>>>> "James" == James Hilliard writes: > >> > Signed-off-by: James Hilliard > >> Committed, thanks. > >> > > > We currently have fastapi 0.105.0 in buildroot which depends on > > starlette < 0.28.0. > > > There's a pending patch by James that bumps it to 0.108.0, which > > unfortunately is also not compatible with starlette 0.34.0 [1] :-/ > > > In fact there's no fastapi release that is compatible with starlette > > 0.34.0 (newer fastapi releases require even newer starlette > > versions...) > > Argh :( > > > I guess I'll send a series that bumps *both* again to compatible versions? > > Yes please! Updated both to compatible versions here: https://patchwork.ozlabs.org/project/buildroot/list/?series=393659 > > -- > Bye, Peter Korsgaard From james.hilliard1 at gmail.com Mon Feb 5 16:53:53 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:53:53 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.17.1 Message-ID: <20240205165353.515894-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-rpds-py/python-rpds-py.hash | 2 +- package/python-rpds-py/python-rpds-py.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash index b04aa210d3..4650d9c385 100644 --- a/package/python-rpds-py/python-rpds-py.hash +++ b/package/python-rpds-py/python-rpds-py.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz +sha256 760b05720269195d86071ac7cf627b3a4ab9366680d8d449a6a63b84d96a5bc0 rpds_py-0.17.1.tar.gz # Locally computed sha256 checksums sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 6f71d02047..80670f2e4f 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPDS_PY_VERSION = 0.12.0 +PYTHON_RPDS_PY_VERSION = 0.17.1 PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/b7/0a/e3bdcc977e6db3bf32a3f42172f583adfa7c3604091a03d512333e0161fe PYTHON_RPDS_PY_SETUP_TYPE = maturin PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 5 16:58:48 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 09:58:48 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-pymodbus: bump to version 3.6.4 Message-ID: <20240205165848.519437-1-james.hilliard1@gmail.com> License hash changed due to year range update: https://github.com/pymodbus-dev/pymodbus/commit/131d30391efd9c64f1fec857ae0372746374e6d2 Drop no longer required python-six runtime dependency. Drop no longer required python-serial runtime dependency. Signed-off-by: James Hilliard --- package/python-pymodbus/Config.in | 6 ++---- package/python-pymodbus/python-pymodbus.hash | 6 +++--- package/python-pymodbus/python-pymodbus.mk | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/python-pymodbus/Config.in b/package/python-pymodbus/Config.in index 0ba6fb88f0..dac6716b87 100644 --- a/package/python-pymodbus/Config.in +++ b/package/python-pymodbus/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_PYMODBUS bool "python-pymodbus" - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_SERIAL # runtime help - Pymodbus is a full Modbus protocol implementation. + A fully featured modbus protocol stack in python. - https://github.com/riptideio/pymodbus + https://github.com/pymodbus-dev/pymodbus/ diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index d9337ffe84..2e9e87148a 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 89da6585b27b8c4b3887eb9f7d1e950b pymodbus-3.0.2.tar.gz -sha256 704cb7fb90631c45f9c3a70b89d0c990fe0e208ac56f14a5c449e21bebd1e201 pymodbus-3.0.2.tar.gz +md5 977e0f1fa05dc5b07fd151544c508675 pymodbus-3.6.4.tar.gz +sha256 6eee2c7eedb794317784c967096fa1fe42200357e9b5a349d838ee9159624fe2 pymodbus-3.6.4.tar.gz # Locally computed sha256 checksums -sha256 796a47993313691ea404d8af7e4c0f9daf1d2760e3900938985b59c9008eee2f LICENSE +sha256 47f904249172e795a6b32de91f471073297befffd74e17cafc288d348a55972e LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index 54879d38e9..c1c17ae799 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 3.0.2 +PYTHON_PYMODBUS_VERSION = 3.6.4 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/94/f7/6149a1b107fa54378a7adec83db7cd3679bf02216a6f5c83b37f55335897 +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/5b/7f/51eb8704092417ef8ab1d883ad793c27f7f34d67468efe36ca03c6c7863d PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause PYTHON_PYMODBUS_LICENSE_FILES = LICENSE -- 2.34.1 From sebastien.szymanski at armadeus.com Mon Feb 5 16:53:00 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Mon, 5 Feb 2024 17:53:00 +0100 Subject: [Buildroot] [PATCH 1/1] board/freescale/common/imx: imx8-bootloader-prepare: enable error checking In-Reply-To: <20230914165046.3687491-1-wojciech.nizinski@grinn-global.com> References: <20230914165046.3687491-1-wojciech.nizinski@grinn-global.com> Message-ID: <506452af-5722-41d3-a5f2-2a9eed0d4263@armadeus.com> Hi Wojciech, All, I tested your patch and it does work. I have some comments though, see below... On 9/14/23 18:50, Wojciech Nizinski wrote: > Run script with 'errexit' bash option to detect any errors from > subcommands. > > It will fix situation where 'ddr_fw.bin' was missing but successfull > build created broken boot image. Post image script report this by: > > cat: /home/user/buildroot/output/images/ddr_fw.bin: No such file or > directory > > and build finish with success. > > Signed-off-by: Wojciech Nizinski > --- > board/freescale/common/imx/imx8-bootloader-prepare.sh | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh > index 7ebf15b6ff..8d44e588c5 100755 > --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh > +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh > @@ -73,4 +73,5 @@ main () > exit $? > } > > +set -o errexit For consistency, maybe you should use 'set -e' here. (utils/docker-run is the only script that uses '+set -o errexit') Also, the only way (I am thinking of) to not have the ddr_fw.bin file is if the user didn't select the firmware-imx package. Maybe, the script should produces an hint to the user about how to get that ddr_fw bin file? "ddr_fw file not found: did you select firmware-imx package?" Regards, > main $@ -- S?bastien Szymanski, Armadeus Systems Software engineer From thomas.petazzoni at bootlin.com Mon Feb 5 17:09:59 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 18:09:59 +0100 Subject: [Buildroot] [PATCH] package/ifplugd: add option to override sysconfdir In-Reply-To: <20240115142744.70711-1-aolvolk@salutedevices.com> References: <20240115142744.70711-1-aolvolk@salutedevices.com> Message-ID: <20240205180959.5c662ae1@windsurf> Hello Alisa, On Mon, 15 Jan 2024 17:27:44 +0300 Alisa Volk via buildroot wrote: > Add BR2_PACKAGE_IFPLUGD_SYSCONFDIR option to pass custom --sysconfdir argument. > > Ifplugd init script is auto-generated with sysconfdir="etc/" by default. > As a result path to ifplugd configuration file is hardcoded > to /etc/ifplugd/ifplugd.conf. Thanks a lot for your patch! However, looking at it, the --sysconfdir option has no impact on the path to the ifplugd.conf file. This file is sourced by the init script before starting ifplugd, as explained in the ifplugd man page: FILES /etc/ifplugd/ifplugd.conf: this file is sourced by the init script /etc/init.d/ifplugd and contains the interface to be monitored and the options to be used. Looking at the code, the only file affected by the --sysconfdir option is ifplugd.action, and the path to this file can be overridden at runtime using: -r | --run= EXEC Specify program to execute when link status changes (default: /etc/ifplugd/ifplugd.action) So, in the end, it looks like your patch is not needed, as the location of both ifplugd.conf and ifplugd.action is runtime configurable. BTW, the ifplugd package does not have a Buildroot init script, it would be nice to add one, if you have some time of course :-) Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From james.hilliard1 at gmail.com Mon Feb 5 17:20:35 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 10:20:35 -0700 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package In-Reply-To: References: <170712853287.18164.6368517214119629150-0@git.sr.ht> Message-ID: On Mon, Feb 5, 2024 at 7:39?AM Yann E. MORIN wrote: > > Marcus, All, > > On 2023-09-21 22:39 +0200, ~bubu spake thusly: > > From: Marcus Hoffmann > > > > Calling `setup.py` build builds and installs an empty package > > after upstream changed their packaging. Calling setuptools via > > `python -m build` builds the package correctly. > > Applied to master, after fixing the authroship and Sob as we discussed > IRL, thanks. FYI we should be able to revert this once we migrate setuptools infrastructure to pep517: https://patchwork.ozlabs.org/project/buildroot/patch/20231126180840.2081945-5-james.hilliard1 at gmail.com/ > > Regards, > Yann E. MORIN. > > > --- > > package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk > > index 5a6e7733be..cb8a0d8cc9 100644 > > --- a/package/python-minimalmodbus/python-minimalmodbus.mk > > +++ b/package/python-minimalmodbus/python-minimalmodbus.mk > > @@ -7,7 +7,8 @@ > > PYTHON_MINIMALMODBUS_VERSION = 2.1.1 > > PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz > > PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 > > -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools > > +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools > > +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 > > PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 > > PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE > > > > -- > > 2.38.5 > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Mon Feb 5 17:21:13 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 10:21:13 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-rtoml: bump to version 0.10.0 In-Reply-To: <687fa6af-4d6f-4890-bd3a-c420ede9cdfd@mind.be> References: <20240111052225.2922249-1-james.hilliard1@gmail.com> <687fa6af-4d6f-4890-bd3a-c420ede9cdfd@mind.be> Message-ID: On Mon, Feb 5, 2024 at 4:29?AM Arnout Vandecappelle wrote: > > > > On 11/01/2024 06:22, James Hilliard wrote: > > Migrate from setuptools-rust to maturin infrastructure. > > > > Signed-off-by: James Hilliard > > --- > > package/python-rtoml/python-rtoml.hash | 2 +- > > package/python-rtoml/python-rtoml.mk | 6 +++--- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash > > index 04d22ed1a4..59f17d9d62 100644 > > --- a/package/python-rtoml/python-rtoml.hash > > +++ b/package/python-rtoml/python-rtoml.hash > > @@ -1,4 +1,4 @@ > > # Locally calculated after vendoring > > -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz > > +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz > > Same problem: > > ERROR: while checking hashes from package/python-rtoml//python-rtoml.hash > ERROR: rtoml-0.10.0.tar.gz has wrong sha256 hash: > ERROR: expected: 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 > ERROR: got : 624cc1ff2b3fdea42aeee3a4d1537d37431ec001870dfee1e04a12bd3076a2d3 Hmm, I'm unable to reproduce this issue. > > > Regards, > Arnout > > > # Locally computed sha256 checksums > > sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE > > diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk > > index 819dcf3288..16f9dea573 100644 > > --- a/package/python-rtoml/python-rtoml.mk > > +++ b/package/python-rtoml/python-rtoml.mk > > @@ -4,10 +4,10 @@ > > # > > ################################################################################ > > > > -PYTHON_RTOML_VERSION = 0.8.0 > > +PYTHON_RTOML_VERSION = 0.10.0 > > PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz > > -PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 > > -PYTHON_RTOML_SETUP_TYPE = setuptools-rust > > +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/ca/b2/0e77a00e75ed582ec1c4c3a9e1eeed886a15c195bcce87b7daf1171c4115 > > +PYTHON_RTOML_SETUP_TYPE = maturin > > PYTHON_RTOML_LICENSE = MIT > > PYTHON_RTOML_LICENSE_FILES = LICENSE > > From peter at korsgaard.com Mon Feb 5 17:21:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:21:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjwt: add gnutls support In-Reply-To: <20240203175840.141039-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 18:58:40 +0100") References: <20240203175840.141039-1-fontaine.fabrice@gmail.com> Message-ID: <87eddqsu7a.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > gnutls can be used if openssl is not available since the addition of the > package in commit 7251775773011e7da38e3a33c6817eceab6a9dfa > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 17:22:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:22:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/sqlciper: bump to version 4.5.5 In-Reply-To: <20240110173916.1113864-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 10 Jan 2024 18:39:16 +0100") References: <20240110173916.1113864-1-fontaine.fabrice@gmail.com> Message-ID: <87a5oesu58.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Update hash of LICENSE file (update in year: > https://github.com/sqlcipher/sqlcipher/commit/b942636547ad68b1c38053099e7e877b2495d4cc) > https://github.com/sqlcipher/sqlcipher/blob/v4.5.5/CHANGELOG.md > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 17:23:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:23:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/sispmctl: bump to version 4.11 In-Reply-To: <20240110174742.1130350-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 10 Jan 2024 18:47:42 +0100") References: <20240110174742.1130350-1-fontaine.fabrice@gmail.com> Message-ID: <875xz2su4f.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Switch to https to avoid a redirection because of HSTS > https://sourceforge.net/p/sispmctl/git/ci/release-4.11/tree/ChangeLog > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From giulio.benetti at benettiengineering.com Mon Feb 5 17:23:27 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 18:23:27 +0100 Subject: [Buildroot] [PATCH 2/2] package/htop: fix build failure due to gcc bug 109809 In-Reply-To: <20240205172327.2537523-1-giulio.benetti@benettiengineering.com> References: <20240205172327.2537523-1-giulio.benetti@benettiengineering.com> Message-ID: <20240205172327.2537523-2-giulio.benetti@benettiengineering.com> The htop package exhibits gcc bug 109809 when built for the RISCV64 architecture with optimization enabled, which causes a build failure. As done for other packages in Buildroot work around this gcc bug by setting optimization to -O0 if BR2_TOOLCHAIN_HAS_GCC_BUG_109809=y. Fixes: still not happened. It shows up while building under docker-run this pending patch-set: https://patchwork.ozlabs.org/project/buildroot/list/?series=384841 Signed-off-by: Giulio Benetti --- package/htop/htop.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 6dbaae3796..853620dfe8 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -13,10 +13,18 @@ HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONF HTOP_LICENSE = GPL-2.0+ HTOP_LICENSE_FILES = COPYING +HTOP_CFLAGS = $(TARGET_CFLAGS) + # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test # provided by autoconf relies on wchar_t. HTOP_CONF_ENV += ac_cv_prog_cc_c99=-std=gnu99 +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_109809),y) +HTOP_CFLAGS += -O0 +endif + +HTOP_CONF_ENV += CFLAGS="$(HTOP_CFLAGS)" + ifeq ($(BR2_PACKAGE_HWLOC),y) HTOP_CONF_OPTS += --enable-hwloc HTOP_DEPENDENCIES += hwloc -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 5 17:23:26 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 18:23:26 +0100 Subject: [Buildroot] [PATCH 1/2] toolchain: introduce BR2_TOOLCHAIN_HAS_GCC_BUG_109809 Message-ID: <20240205172327.2537523-1-giulio.benetti@benettiengineering.com> htop package fails to build for the RISCV64 architecture with optimization enabled with gcc = 13.2.0 and it's still present in gcc = 14.x as reported upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109809 So let's introduce BR2_TOOLCHAIN_HAS_GCC_BUG_109809 to handle packages affected by it like htop. Signed-off-by: Giulio Benetti --- toolchain/Config.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/toolchain/Config.in b/toolchain/Config.in index 34e0ae2c5f..64084dffe3 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -250,6 +250,14 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_107728 depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_OPTIMIZE_0 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109809 +# ICE: in dwarf2out_frame_debug_cfa_offset +# Shows up starting from Gcc 13.2.0 and still has to be fixed +config BR2_TOOLCHAIN_HAS_GCC_BUG_109809 + bool + default y if BR2_RISCV_64 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_13 + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934 # ICE: on M68K: in change_address_1, at emit-rtl.cc:2287 # This bug exists in gcc = 12.3.0 and gcc = 13.2.0 -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 5 17:25:45 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 5 Feb 2024 18:25:45 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/milkv_duo: new defconfig In-Reply-To: References: Message-ID: Hi Hanyuan, thank for contributing, one important note is to swap Patch 1/2 and 2/2. This is because they are bisectable this way since on Patch 1/2 you enable packages appearing in Patch 2/2, also, On 02/12/23 03:57, hanyuan wrote: > Milk-V Duo is an ultra-compact embedded development platform based on the CV1800B chip. > It can run Linux and RTOS, providing a reliable, low-cost, and high-performance platform > for professionals, industrial ODMs, AIoT enthusiasts, DIY hobbyists, and creators. can you please provide the board product webpage URL here? And also some ION indications too? > Co-authored-by: Emil S > Co-authored-by: GP Orcullo > Signed-off-by: Hanyuan Zhao > --- > board/milkv/duo/genimage.cfg | 25 ++++++++ > board/milkv/duo/post-image.sh | 58 ++++++++++++++++++ > board/milkv/duo/readme.txt | 49 +++++++++++++++ > configs/milkv_duo_musl_riscv64_defconfig | 63 ++++++++++++++++++++ > configs/milkv_duo_musl_riscv64_ion_defconfig | 63 ++++++++++++++++++++ > 5 files changed, 258 insertions(+) > create mode 100644 board/milkv/duo/genimage.cfg > create mode 100755 board/milkv/duo/post-image.sh > create mode 100644 board/milkv/duo/readme.txt > create mode 100644 configs/milkv_duo_musl_riscv64_defconfig > create mode 100644 configs/milkv_duo_musl_riscv64_ion_defconfig > > diff --git a/board/milkv/duo/genimage.cfg b/board/milkv/duo/genimage.cfg > new file mode 100644 > index 0000000000..1fd74f845a > --- /dev/null > +++ b/board/milkv/duo/genimage.cfg > @@ -0,0 +1,25 @@ > +image boot.vfat { > + vfat { > + files = { > + "fip.bin", > + "boot.sd", > + } > + } > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + } > +} > diff --git a/board/milkv/duo/post-image.sh b/board/milkv/duo/post-image.sh > new file mode 100755 > index 0000000000..6dc6d7853b > --- /dev/null > +++ b/board/milkv/duo/post-image.sh > @@ -0,0 +1,58 @@ > +#!/bin/sh > + > +########################################################### > +# File: post-image.sh > +# Author: GP Orcullo > +# Hanyuan Zhao > +# Description: this sh will make the fip.bin and boot.sd, > +# then pack everything to an image file. > +########################################################### > + > +if [ -f ${BINARIES_DIR}/cvirtos.bin ]; then > + ${BINARIES_DIR}/fiptool.py genfip ${BINARIES_DIR}/fip.bin \ > + --MONITOR_RUNADDR=0x80000000 \ > + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ > + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ > + --NAND_INFO=00000000 \ > + --BL2=${BINARIES_DIR}/bl2.bin \ > + --BLCP_IMG_RUNADDR=0x05200200 \ > + --BLCP_PARAM_LOADADDR=0 \ > + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ > + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ > + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin \ All this if statement is redundant with the else part. Can you add a variable like: FIPTOOL_ARGUMENTS = genfip ${BINARIES_DIR}/fip.bin \ --MONITOR_RUNADDR=0x80000000 \ --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ --NAND_INFO=00000000 \ --BL2=${BINARIES_DIR}/bl2.bin \ --BLCP_IMG_RUNADDR=0x05200200 \ --BLCP_PARAM_LOADADDR=0 \ --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ --LOADER_2ND=${BINARIES_DIR}/u-boot.bin \ and then you add or not the remaining BLCP* variables below and execute ${BINARIES_DIR}/fiptool.py ${FIPTOOL_ARGUMENTS} > + --BLCP=${BINARIES_DIR}/empty.bin \ > + --BLCP_2ND=${BINARIES_DIR}/cvirtos.bin \ > + --BLCP_2ND_RUNADDR=0x83f40000 \ > + > ${BINARIES_DIR}/fip.log 2>&1 > + if [ -f ${BINARIES_DIR}/fip.bin ]; then > + echo "[Duo Post-Image fiptool.py] FreeRTOS integrated" > + fi Then this nested if statement and.. > +else > + ${BINARIES_DIR}/fiptool.py genfip ${BINARIES_DIR}/fip.bin \ > + --MONITOR_RUNADDR=0x80000000 \ > + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ > + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ > + --NAND_INFO=00000000 \ > + --BL2=${BINARIES_DIR}/bl2.bin \ > + --BLCP_IMG_RUNADDR=0x05200200 \ > + --BLCP_PARAM_LOADADDR=0 \ > + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ > + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ > + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin \ > + > ${BINARIES_DIR}/fip.log 2>&1 > + if [ -f ${BINARIES_DIR}/fip.bin ]; then > + echo "[Duo Post-Image fiptool.py] No FreeRTOS integrated" > + fi ..this are redundant too. Can you provide a single if-else-fi statement outside the main if statement... > +fi ... here? > + > +cp ${BINARIES_DIR}/u-boot.dtb ${BINARIES_DIR}/cv1800b_milkv_duo_sd.dtb > +lzma -fk ${BINARIES_DIR}/Image > +mkimage -f ${BINARIES_DIR}/multi.its ${BINARIES_DIR}/boot.sd > +if [ -f ${BINARIES_DIR}/boot.sd ]; then > + echo "[Duo Post-Image] > boot.sd generated!" > +fi > +support/scripts/genimage.sh -c $(pwd)/board/milkv/duo/genimage.cfg > +gzip -fk ${BINARIES_DIR}/sdcard.img > +if [ -f ${BINARIES_DIR}/sdcard.img ]; then > + echo "[Duo Post-Image] > sdcard.img generated!" > +fi > diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt > new file mode 100644 > index 0000000000..a483a73a19 > --- /dev/null > +++ b/board/milkv/duo/readme.txt > @@ -0,0 +1,49 @@ > +Milk-V Duo (https://milkv.io/docs/duo/overview) > + > +Intro > +===== > + > +Milk-V Duo is an ultra-compact embedded development platform > +based on the rv64 CV1800B chip. It can run Linux and RTOS, > +providing a reliable, cost-effective, and high-performance > +platform for professionals, industrial ODMs, AIoT enthusiasts, > +DIY enthusiasts, and creators. > + > +How to build it > +=============== > + > +Configure Buildroot: > + > + $ make milkv_duo_musl_riscv64_defconfig > + > +The milkv_duo_musl_riscv64_defconfig will by default provide > +the full 64MiB free RAM. If you want to build with memory > +reserved for ION, please try: > + > + $ make milkv_duo_musl_riscv64_ion_defconfig Can you please provide more informations about ION here? Or a link to it? > + > +Modify configuration if needed, e.g. add more packages to target: > + > + $ make menuconfig > + > +Compile everything and build the SD card image: > + > + $ make > + > +To configure the linux kernel or u-boot: > + > + $ make linux-menuconfig > + > +To rebuild something (e.g. linux): > + > + $ make linux-rebuild > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image > +called "sdcard.img" in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_musl_riscv64_defconfig > new file mode 100644 > index 0000000000..4f5180891f > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_defconfig > @@ -0,0 +1,63 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Using gcc13 and musl to have t-head's optimization and features > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_CXX=y Is CXX needed by any package selected here? > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_64mb" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y here you need: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > diff --git a/configs/milkv_duo_musl_riscv64_ion_defconfig b/configs/milkv_duo_musl_riscv64_ion_defconfig > new file mode 100644 > index 0000000000..7875853711 > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_ion_defconfig > @@ -0,0 +1,63 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Using gcc13 and musl to have t-head's optimization and features > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_CXX=y > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_ion" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y here you need: BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y For the rest the patch looks good and builds fine using utils/docker-run except package htop that fails to build due to gcc ICE 109809 for which I've sent a patch: https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 So this patchset depends on patchset above for htop gcc ICE. Anyway a V2 must be sent with BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y fix. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Mon Feb 5 17:26:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:26:09 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/imx8mmpico: uboot needs openssl In-Reply-To: <20240110205100.147660-1-ju.o@free.fr> (Julien Olivain's message of "Wed, 10 Jan 2024 21:51:00 +0100") References: <20240110205100.147660-1-ju.o@free.fr> Message-ID: <871q9qstzi.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Commit 78e8f383 "configs/imx8mmpico: bump bsp components to version > tn-kirkstone_5.15.71-2.2.0" bumped components, but forgot to add > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y. > This commit adds it to the defconfig to fix the build. > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180248 > In file included from tools/imagetool.h:24, > from tools/aisimage.c:7: > include/image.h:1166:12: fatal error: openssl/evp.h: No such file or directory > 1166 | # include > | ^~~~~~~~~~~~~~~ > Signed-off-by: Julien Olivain > --- > Change v1 -> v2: > - Regenerated the patch, to fix a corrupted patch context. Committed, thanks. -- Bye, Peter Korsgaard From bubu at git.sr.ht Mon Feb 5 17:09:43 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 18:09:43 +0100 Subject: [Buildroot] [PATCH buildroot 1/2] package/python-uvicorn: requires PYTHON3_SSL Message-ID: <170715438947.30890.14026766289772625544-0@git.sr.ht> From: Marcus Hoffmann Uvicorn has a hard requirement on the python ssl module. Without it even running uvicorn --help fails. --- package/python-uvicorn/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-uvicorn/Config.in b/package/python-uvicorn/Config.in index 3e769392f9..c84f54781f 100644 --- a/package/python-uvicorn/Config.in +++ b/package/python-uvicorn/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_UVICORN bool "python-uvicorn" select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_H11 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help The lightning-fast ASGI server. -- 2.38.5 From bubu at git.sr.ht Mon Feb 5 17:25:10 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 18:25:10 +0100 Subject: [Buildroot] [PATCH buildroot 2/2] support/testing: add fastapi runtime test In-Reply-To: <170715438947.30890.14026766289772625544-0@git.sr.ht> Message-ID: <170715438947.30890.14026766289772625544-1@git.sr.ht> From: Marcus Hoffmann Add a runtime test for fastapi. Use uvicorn as the asgi server application as does the fastapi hello world example [1]. Fastapi depends on PydanticV2 now which is written in rust so we need to run the test on armv7. [1] https://fastapi.tiangolo.com/tutorial/first-steps/ --- .../tests/package/sample_python_fastapi.py | 8 ++++ .../tests/package/test_python_fastapi.py | 47 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 support/testing/tests/package/sample_python_fastapi.py create mode 100644 support/testing/tests/package/test_python_fastapi.py diff --git a/support/testing/tests/package/sample_python_fastapi.py b/support/testing/tests/package/sample_python_fastapi.py new file mode 100644 index 0000000000..3116df3a93 --- /dev/null +++ b/support/testing/tests/package/sample_python_fastapi.py @@ -0,0 +1,8 @@ +from fastapi import FastAPI + +app = FastAPI() + + at app.get("/") +async def root(): + return {"message": "Hello World"} + diff --git a/support/testing/tests/package/test_python_fastapi.py b/support/testing/tests/package/test_python_fastapi.py new file mode 100644 index 0000000000..1a78fa6c58 --- /dev/null +++ b/support/testing/tests/package/test_python_fastapi.py @@ -0,0 +1,47 @@ +import os +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Fastapi(TestPythonPackageBase): + __test__ = True + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_FASTAPI=y + BR2_PACKAGE_PYTHON_UVICORN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_CCACHE=y + BR2_CCACHE_DIR="/home/bubu/.buildroot-ccache" + """ + sample_scripts = ["tests/package/sample_python_fastapi.py"] + timeout = 60 + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + cmd = "uvicorn sample_python_fastapi:app > /dev/null 2>&1 &" + + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) + + # Give enough time for the uvicorn server to start up + time.sleep(30) + + cmd = "wget -q -O - http://127.0.0.1:8000/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], '{"message":"Hello World"}') + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() -- 2.38.5 From bubu at git.sr.ht Mon Feb 5 17:09:43 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 18:09:43 +0100 Subject: [Buildroot] [PATCH buildroot v2 1/2] package/python-uvicorn: requires PYTHON3_SSL Message-ID: <170715461915.13905.5968173515742280918-0@git.sr.ht> From: Marcus Hoffmann Uvicorn has a hard requirement on the python ssl module. Without it even running uvicorn --help fails. Signed-off-by: Marcus Hoffmann --- package/python-uvicorn/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-uvicorn/Config.in b/package/python-uvicorn/Config.in index 3e769392f9..c84f54781f 100644 --- a/package/python-uvicorn/Config.in +++ b/package/python-uvicorn/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_UVICORN bool "python-uvicorn" select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_H11 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help The lightning-fast ASGI server. -- 2.38.5 From bubu at git.sr.ht Mon Feb 5 17:25:10 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 18:25:10 +0100 Subject: [Buildroot] [PATCH buildroot v2 2/2] support/testing: add fastapi runtime test In-Reply-To: <170715461915.13905.5968173515742280918-0@git.sr.ht> Message-ID: <170715461915.13905.5968173515742280918-1@git.sr.ht> From: Marcus Hoffmann Add a runtime test for fastapi. Use uvicorn as the asgi server application as does the fastapi hello world example [1]. Fastapi depends on PydanticV2 now which is written in rust so we need to run the test on armv7. [1] https://fastapi.tiangolo.com/tutorial/first-steps/ Signed-off-by: Marcus Hoffmann --- .../tests/package/sample_python_fastapi.py | 8 ++++ .../tests/package/test_python_fastapi.py | 47 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 support/testing/tests/package/sample_python_fastapi.py create mode 100644 support/testing/tests/package/test_python_fastapi.py diff --git a/support/testing/tests/package/sample_python_fastapi.py b/support/testing/tests/package/sample_python_fastapi.py new file mode 100644 index 0000000000..3116df3a93 --- /dev/null +++ b/support/testing/tests/package/sample_python_fastapi.py @@ -0,0 +1,8 @@ +from fastapi import FastAPI + +app = FastAPI() + + at app.get("/") +async def root(): + return {"message": "Hello World"} + diff --git a/support/testing/tests/package/test_python_fastapi.py b/support/testing/tests/package/test_python_fastapi.py new file mode 100644 index 0000000000..1a78fa6c58 --- /dev/null +++ b/support/testing/tests/package/test_python_fastapi.py @@ -0,0 +1,47 @@ +import os +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Fastapi(TestPythonPackageBase): + __test__ = True + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_FASTAPI=y + BR2_PACKAGE_PYTHON_UVICORN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_CCACHE=y + BR2_CCACHE_DIR="/home/bubu/.buildroot-ccache" + """ + sample_scripts = ["tests/package/sample_python_fastapi.py"] + timeout = 60 + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + cmd = "uvicorn sample_python_fastapi:app > /dev/null 2>&1 &" + + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) + + # Give enough time for the uvicorn server to start up + time.sleep(30) + + cmd = "wget -q -O - http://127.0.0.1:8000/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], '{"message":"Hello World"}') + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() -- 2.38.5 From romain.naour at smile.fr Mon Feb 5 17:37:38 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 18:37:38 +0100 Subject: [Buildroot] [PATCH] support/testing: TestGrubX8664EFI: use Nehalem cpu emulation In-Reply-To: References: <20240205133530.1188319-1-romain.naour@smile.fr> Message-ID: <3f004ed2-3c15-4717-a071-eddebe0e6c10@smile.fr> Hello Yann, All, Le 05/02/2024 ? 17:04, Yann E. MORIN a ?crit?: > Romain, All, > > On 2024-02-05 14:35 +0100, Romain Naour spake thusly: >> Following the Bootlin toolchain bump to 2023.11-1 [1], the >> TestGrubX8664EFI failed with this error: > > As we discussed IRL, I've reworded the commit log with your input. Thanks for improving the commit log with additional important informations about the root cause of the issue. I really appreciate and I'll try to do even better next time :) Best regards, Romain > >> # efivar -l >> traps: efivar[86] trap invalid opcode ip:7fc187f4c7f4 sp:7fff9bbaa930 error:0 in libefivar.so.1.38[7fc187f4c000+16000] >> Illegal instruction >> >> Actually this error can be reproduced by installing other packages like >> "file" because the qemu emulation doesn't provide all assembler >> instruction emulation required by x86-64-core-i7 target used by >> TestGrubX8664EFI. >> >> A similar issue has been fixed in toolchain-builder by adding Nehalem >> cpu emulation on the qemu command line [2]. >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 >> >> [1] 7e0e6e3b8618ab942f25b11ee72fbc5a4deefdf1 >> [2] https://gitlab.com/buildroot.org/toolchains-builder/-/commit/f2b253732b4d1fc5b87badba7c2d48f12a197f76 >> >> Signed-off-by: Romain Naour > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > >> --- >> support/testing/tests/boot/test_grub.py | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py >> index 9f3a6a8495..5315fa23ba 100644 >> --- a/support/testing/tests/boot/test_grub.py >> +++ b/support/testing/tests/boot/test_grub.py >> @@ -120,7 +120,7 @@ class TestGrubX8664EFI(infra.basetest.BRTest): >> # https://github.com/tianocore/edk2/commit/bf5678b5802685e07583e3c7ec56d883cbdd5da3 >> # http://lists.busybox.net/pipermail/buildroot/2023-July/670825.html >> qemu_fw_cfg = "name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes" >> - self.emulator.boot(arch="x86_64", options=["-bios", bios, "-hda", hda, "-fw_cfg", qemu_fw_cfg]) >> + self.emulator.boot(arch="x86_64", options=["-bios", bios, "-cpu", "Nehalem", "-hda", hda, "-fw_cfg", qemu_fw_cfg]) >> self.emulator.login() >> >> cmd = "modprobe efivarfs" >> -- >> 2.43.0 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Mon Feb 5 17:40:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:40:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-can: bump to version 4.3.1 In-Reply-To: (Marcus Hoffmann via buildroot's message of "Tue, 9 Jan 2024 18:49:24 +0100") References: <20240109045635.3951040-1-james.hilliard1@gmail.com> Message-ID: <87ttmmrequ.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Hi James, > On 09.01.24 05:56, James Hilliard wrote: >> Drop no longer used python-aenum runtime dependency. >> Signed-off-by: James Hilliard >> --- >> package/python-can/Config.in | 1 - >> package/python-can/python-can.hash | 4 ++-- >> package/python-can/python-can.mk | 4 ++-- >> 3 files changed, 4 insertions(+), 5 deletions(-) >> diff --git a/package/python-can/Config.in >> b/package/python-can/Config.in >> index 68a9ffca71..27dc16fa33 100644 >> --- a/package/python-can/Config.in >> +++ b/package/python-can/Config.in >> @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_CAN >> bool "python-can" >> select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > setuptools is no longer required as well: > https://github.com/hardbyte/python-can/commit/1a3f5e3769aa565ada8c27177a94f7db43d019dc Committed after dropping the setuptools dependency, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 17:41:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:41:29 +0100 Subject: [Buildroot] [PATCH] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot In-Reply-To: <20240108192533.2720-1-francois.perrad@gadz.org> (Francois Perrad's message of "Mon, 8 Jan 2024 20:25:33 +0100") References: <20240108192533.2720-1-francois.perrad@gadz.org> Message-ID: <87plxarepi.fsf@48ers.dk> >>>>> "Francois" == Francois Perrad writes: > Signed-off-by: Francois Perrad Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 17:26:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:26:14 +0100 Subject: [Buildroot] [git commit] package/libjwt: add gnutls support Message-ID: <20240205174221.B291286D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a860f330a4ecd2fa442ea2a35e16c0f87611306 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gnutls can be used if openssl is not available since the addition of the package in commit 7251775773011e7da38e3a33c6817eceab6a9dfa Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libjwt/Config.in | 2 +- package/libjwt/libjwt.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/libjwt/Config.in b/package/libjwt/Config.in index fa042d67ef..39d1665e0e 100644 --- a/package/libjwt/Config.in +++ b/package/libjwt/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBJWT bool "libjwt" - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS select BR2_PACKAGE_JANSSON help JSON Web Tokens are an open, industry standard RFC 7519 diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 6ae1717b7d..7e2ea03b09 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -6,10 +6,18 @@ LIBJWT_VERSION = 1.15.3 LIBJWT_SITE = $(call github,benmcollins,libjwt,v$(LIBJWT_VERSION)) -LIBJWT_DEPENDENCIES = host-pkgconf jansson openssl +LIBJWT_DEPENDENCIES = host-pkgconf jansson LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBJWT_CONF_OPTS += --with-openssl +LIBJWT_DEPENDENCIES += openssl +else +LIBJWT_CONF_OPTS += --without-openssl +LIBJWT_DEPENDENCIES += gnutls +endif + $(eval $(autotools-package)) From peter at korsgaard.com Mon Feb 5 17:26:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:26:17 +0100 Subject: [Buildroot] [git commit] package/sispmctl: bump to version 4.11 Message-ID: <20240205174221.C5F6086D95@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14fa799c576f1dbd1027fb85d1bf39fd449299e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch to https to avoid a redirection because of HSTS https://sourceforge.net/p/sispmctl/git/ci/release-4.11/tree/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/sispmctl/sispmctl.hash | 2 +- package/sispmctl/sispmctl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sispmctl/sispmctl.hash b/package/sispmctl/sispmctl.hash index e22efcfbed..f6cff1910b 100644 --- a/package/sispmctl/sispmctl.hash +++ b/package/sispmctl/sispmctl.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6a9ec7125e8c01bb45d4a3b56f07fb41fc437020c8dcd8c0f29ebb98dc55a647 sispmctl-4.9.tar.gz +sha256 74b94a3710046b15070c7311f0cacb81554c86b4227719cc2733cb96c7052578 sispmctl-4.11.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sispmctl/sispmctl.mk b/package/sispmctl/sispmctl.mk index b6e156c66a..df39793845 100644 --- a/package/sispmctl/sispmctl.mk +++ b/package/sispmctl/sispmctl.mk @@ -4,8 +4,8 @@ # ################################################################################ -SISPMCTL_VERSION = 4.9 -SISPMCTL_SITE = http://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION) +SISPMCTL_VERSION = 4.11 +SISPMCTL_SITE = https://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION) SISPMCTL_LICENSE = GPL-2.0+ SISPMCTL_LICENSE_FILES = COPYING SISPMCTL_DEPENDENCIES = libusb-compat From peter at korsgaard.com Mon Feb 5 17:26:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:26:16 +0100 Subject: [Buildroot] [git commit] package/sqlciper: bump to version 4.5.5 Message-ID: <20240205174221.BBBC386D94@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19370420baa3d98f9e6fa041822d1fccf375f862 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update hash of LICENSE file (update in year: https://github.com/sqlcipher/sqlcipher/commit/b942636547ad68b1c38053099e7e877b2495d4cc) https://github.com/sqlcipher/sqlcipher/blob/v4.5.5/CHANGELOG.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/sqlcipher/sqlcipher.hash | 4 ++-- package/sqlcipher/sqlcipher.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlcipher/sqlcipher.hash b/package/sqlcipher/sqlcipher.hash index c655165172..7632c1c887 100644 --- a/package/sqlcipher/sqlcipher.hash +++ b/package/sqlcipher/sqlcipher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 023499516ef2ade14fbcdbe93fb81cc69458ae6cb3544614df8dbef34835b406 sqlcipher-4.5.1.tar.gz -sha256 3eee3c7964a9becc94d747bd36703d31fc86eb994680b06a61bfd4f2661eaac8 LICENSE +sha256 014ef9d4f5b5f4e7af4d93ad399667947bb55e31860e671f0def1b8ae6f05de0 sqlcipher-4.5.5.tar.gz +sha256 09e4af560ce2e3c9c2aa6b564e35947b03db7d1ae345f22a32793ed46542cc14 LICENSE diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk index c0c53acdd2..8d062ccf81 100644 --- a/package/sqlcipher/sqlcipher.mk +++ b/package/sqlcipher/sqlcipher.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLCIPHER_VERSION = 4.5.1 +SQLCIPHER_VERSION = 4.5.5 SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,v$(SQLCIPHER_VERSION)) SQLCIPHER_LICENSE = BSD-3-Clause SQLCIPHER_LICENSE_FILES = LICENSE From peter at korsgaard.com Mon Feb 5 17:26:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:26:18 +0100 Subject: [Buildroot] [git commit] configs/imx8mmpico: uboot needs openssl Message-ID: <20240205174221.CF0B786D96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=88d3e8ca112cc932b39da21cdf4268b580a35f8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 78e8f383 "configs/imx8mmpico: bump bsp components to version tn-kirkstone_5.15.71-2.2.0" bumped components, but forgot to add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y. This commit adds it to the defconfig to fix the build. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180248 In file included from tools/imagetool.h:24, from tools/aisimage.c:7: include/image.h:1166:12: fatal error: openssl/evp.h: No such file or directory 1166 | # include | ^~~~~~~~~~~~~~~ Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- configs/imx8mmpico_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx8mmpico_defconfig b/configs/imx8mmpico_defconfig index c402ea675d..711cdeb390 100644 --- a/configs/imx8mmpico_defconfig +++ b/configs/imx8mmpico_defconfig @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-tn-imx,tn-kirkstone_5.15.71-2.2.0_20230512)/u-boot-tn-imx-tn-kirkstone_5.15.71-2.2.0_20230512.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mm" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_SPL=y From peter at korsgaard.com Mon Feb 5 17:41:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:41:01 +0100 Subject: [Buildroot] [git commit] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot Message-ID: <20240205174221.E35A786D93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=999c0fbc9f951536f6a1fda42fb7bf406da5f3a0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime2_defconfig | 10 +++++----- configs/olimex_a20_olinuxino_lime_defconfig | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 3294748b14..bf44207393 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 6.1 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -23,12 +23,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.55" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.10" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-olinuxino-lime2" BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages @@ -45,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 6b46794df3..5e26eaf857 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -# Linux headers same as kernel, a 6.1 LTS series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -23,12 +23,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.55" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.10" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-olinuxino-lime" BR2_LINUX_KERNEL_INSTALL_TARGET=y # sunxi packages @@ -45,7 +45,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From peter at korsgaard.com Mon Feb 5 17:39:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:39:51 +0100 Subject: [Buildroot] [git commit] package/python-can: bump to version 4.3.1 Message-ID: <20240205174221.D96FE86D97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cec6ed4e5ef8c5438c05691c109efd1cf2b8208e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer used python-aenum runtime dependency. Signed-off-by: James Hilliard [Peter: drop python-setuptools as pointed out by Marcus Hoffmann] Signed-off-by: Peter Korsgaard --- package/python-can/Config.in | 2 -- package/python-can/python-can.hash | 4 ++-- package/python-can/python-can.mk | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 68a9ffca71..a00c9263cf 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SQLITE # runtime - select BR2_PACKAGE_PYTHON_AENUM # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 35e752ea54..4e706519be 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-can/json -md5 26d799fe952cb590fba03f3d26ee66a4 python-can-4.2.2.tar.gz -sha256 6ad50f4613289f3c4d276b6d2ac8901d776dcb929994cce93f55a69e858c595f python-can-4.2.2.tar.gz +md5 a84ace55fdeca8efd50986deacfba584 python-can-4.3.1.tar.gz +sha256 008bea1c12e31586e1aa76971126b831bf01056a900e91862a11360e011ab933 python-can-4.3.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index 012c82682c..c7100e3dda 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 4.2.2 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/dd/f1/327caaf05b6bca594250053058a2adac537a88dfb5c41bb5498cfda9de78 +PYTHON_CAN_VERSION = 4.3.1 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/02/fc/d5fd33ee93f17a4eb0dcd75aebf522396e3f511bf474058e99e86ae4e33f PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt From peter at korsgaard.com Mon Feb 5 17:45:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 18:45:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-gnupg: bump to version 0.5.2 In-Reply-To: <20240109075228.4051839-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 9 Jan 2024 00:52:28 -0700") References: <20240109075228.4051839-1-james.hilliard1@gmail.com> Message-ID: <87le7yrejb.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 17:44:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 18:44:36 +0100 Subject: [Buildroot] [git commit] package/python-gnupg: bump to version 0.5.2 Message-ID: <20240205174526.2459186D9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb6163cf96de64ac6df271f3080fce4dacaa7a71 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-gnupg/python-gnupg.hash | 7 ++----- package/python-gnupg/python-gnupg.mk | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/python-gnupg/python-gnupg.hash b/package/python-gnupg/python-gnupg.hash index d52b634b8d..4a194ad41e 100644 --- a/package/python-gnupg/python-gnupg.hash +++ b/package/python-gnupg/python-gnupg.hash @@ -1,8 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-gnupg/json -# also checked PGP signature from: -# https://bitbucket.org/vinay.sajip/python-gnupg/downloads/python-gnupg-0.5.1.tar.gz.asc -# with key: 9147B477339A9B86 -md5 c5d99c5f0456f8cbf69324ec5e6acaff python-gnupg-0.5.1.tar.gz -sha256 5674bad4e93876c0b0d3197e314d7f942d39018bf31e2b833f6788a6813c3fb8 python-gnupg-0.5.1.tar.gz +md5 b263ea268692cfe687d29d52daab4770 python-gnupg-0.5.2.tar.gz +sha256 01d8013931c9fa3f45824bbea7054c03d6e11f258a72e7e086e168dbcb91854c python-gnupg-0.5.2.tar.gz # Locally computed sha256 checksums sha256 4104ca980dbca7603fc553078378eb14566a76f819d033d7bff89fd6a97e181b LICENSE.txt diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk index f582f4cdb7..ddf2287f9b 100644 --- a/package/python-gnupg/python-gnupg.mk +++ b/package/python-gnupg/python-gnupg.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_GNUPG_VERSION = 0.5.1 -PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/98/62/7737485f44bd4d7d904f4094372f4119195865b29f119fa51a98e121a13a +PYTHON_GNUPG_VERSION = 0.5.2 +PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/5d/4425390ad81d22b330a1b0df204c4d39fb3cb7c39e081d51e9f7426ce716 PYTHON_GNUPG_LICENSE = BSD-3-Clause PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt PYTHON_GNUPG_CPE_ID_VENDOR = python From thomas.petazzoni at bootlin.com Mon Feb 5 17:48:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 18:48:08 +0100 Subject: [Buildroot] [git commit] package/ngrep: fix build with libnet Message-ID: <20240205174820.101FF86DA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=14c0c37eaf0f91ef61a88b3085c15028f566a394 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use pkg-config to find libnet and avoid the following build failure raised since commit 100ba8351c088fd764effdcaba848cfd92de79dd if libnet-config is found on the host: /home/autobuild/autobuild/instance-4/output-1/host/bin/mips64el-buildroot-linux-gnu-gcc -s -o ngrep ngrep.o tcpkill.o -lpcap -lnet -lpcre -L/usr/lib -lnet mips64el-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' While at it, format Upstream tag of other patches Fixes: - http://autobuild.buildroot.org/results/05c916162b9c1027cf53f1699a1f5653151098ed Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 3 -- ...in-configure-in-when-testing-for-use_pcre.patch | 3 +- ...002-Check-for-libnet_init-in-configure-in.patch | 3 +- package/ngrep/0003-fix-disable-tcpkill.patch | 2 +- ...onfigure.in-use-pkg-config-to-find-libnet.patch | 38 ++++++++++++++++++++++ package/ngrep/ngrep.mk | 2 +- 6 files changed, 42 insertions(+), 9 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 348cf3d289..2fc974e2f2 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -897,9 +897,6 @@ package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch Up package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch Upstream package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch Upstream package/nginx/S50nginx Indent Variables -package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch Upstream -package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch Upstream -package/ngrep/0003-fix-disable-tcpkill.patch Upstream package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch Upstream package/nmap/0001-libdnet-wrapper-configure.patch Upstream package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch Upstream diff --git a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch index 69c5c887e8..c7f0dec360 100644 --- a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch +++ b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch @@ -4,8 +4,7 @@ Date: Mon, 1 Jan 2018 18:00:34 +0100 Subject: [PATCH] Fix typo in configure.in when testing for use_pcre Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe] +Upstream: https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch index 22b18ab7ee..7fa2e2f3bc 100644 --- a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch +++ b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch @@ -7,8 +7,7 @@ libnet_init_packet was the old libnet 1.0 function which is now long deprecated. Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5] +Upstream: https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0003-fix-disable-tcpkill.patch b/package/ngrep/0003-fix-disable-tcpkill.patch index 1264fd7e3b..894cd95b0f 100644 --- a/package/ngrep/0003-fix-disable-tcpkill.patch +++ b/package/ngrep/0003-fix-disable-tcpkill.patch @@ -9,7 +9,7 @@ found on the system. To fix this, move AC_CHECK_LIB to found libnet outside AC_ARG_ENABLE Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/jpr5/ngrep/pull/15] +Upstream: https://github.com/jpr5/ngrep/pull/15 --- configure.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch new file mode 100644 index 0000000000..71550da943 --- /dev/null +++ b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch @@ -0,0 +1,38 @@ +From 4788988827bf4c0d996d3e1e3b6ac52a23b97941 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 9 Jan 2024 21:15:47 +0100 +Subject: [PATCH] configure.in: use pkg-config to find libnet + +libnet-config is deprecated: +https://github.com/libnet/libnet/commit/1ec4a6e7d1d23811f0a14ecb51e46489a0175727 + +Signed-off-by: Fabrice Fontaine +Upstream: unsent (upstream seems dead, no commit since 5 years +--- + configure.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 7c3dd43..882ff86 100644 +--- a/configure.in ++++ b/configure.in +@@ -176,12 +176,14 @@ AC_ARG_ENABLE(tcpkill, + [ use_tcpkill="$enableval" ], + [ use_tcpkill="no" ]) + ++PKG_PROG_PKG_CONFIG + if test $use_tcpkill = yes; then + AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit) + USE_TCPKILL="1" + EXTRA_OBJS="$EXTRA_OBJS tcpkill.o" +- EXTRA_DEFINES="$EXTRA_DEFINES $(libnet-config --defines)" +- EXTRA_LIBS="$EXTRA_LIBS $(libnet-config --libs)" ++ PKG_CHECK_MODULES(LIBNET, libnet) ++ EXTRA_DEFINES="$EXTRA_DEFINES $LIBNET_CFLAGS" ++ EXTRA_LIBS="$EXTRA_LIBS $LIBNET_LIBS" + else + USE_TCPKILL="0" + fi +-- +2.43.0 + diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk index c4750f7504..dc69a34235 100644 --- a/package/ngrep/ngrep.mk +++ b/package/ngrep/ngrep.mk @@ -22,7 +22,7 @@ NGREP_CONF_OPTS = \ --disable-dropprivs \ --disable-pcap-restart -NGREP_DEPENDENCIES = libpcap pcre +NGREP_DEPENDENCIES = host-pkgconf libpcap pcre ifeq ($(BR2_PACKAGE_LIBNET),y) NGREP_DEPENDENCIES += libnet From thomas.petazzoni at bootlin.com Mon Feb 5 17:48:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 18:48:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/ngrep: fix build with libnet In-Reply-To: <20240109211801.565524-1-fontaine.fabrice@gmail.com> References: <20240109211801.565524-1-fontaine.fabrice@gmail.com> Message-ID: <20240205184839.3f230f02@windsurf> On Tue, 9 Jan 2024 22:18:01 +0100 Fabrice Fontaine wrote: > Use pkg-config to find libnet and avoid the following build failure > raised since commit 100ba8351c088fd764effdcaba848cfd92de79dd if > libnet-config is found on the host: > > /home/autobuild/autobuild/instance-4/output-1/host/bin/mips64el-buildroot-linux-gnu-gcc -s -o ngrep ngrep.o tcpkill.o -lpcap -lnet -lpcre -L/usr/lib -lnet > mips64el-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' > > While at it, format Upstream tag of other patches > > Fixes: > - http://autobuild.buildroot.org/results/05c916162b9c1027cf53f1699a1f5653151098ed > > Signed-off-by: Fabrice Fontaine > --- > .checkpackageignore | 3 -- > ...nfigure-in-when-testing-for-use_pcre.patch | 3 +- > ...heck-for-libnet_init-in-configure-in.patch | 3 +- > package/ngrep/0003-fix-disable-tcpkill.patch | 2 +- > ...ure.in-use-pkg-config-to-find-libnet.patch | 38 +++++++++++++++++++ > package/ngrep/ngrep.mk | 2 +- > 6 files changed, 42 insertions(+), 9 deletions(-) > create mode 100644 package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Mon Feb 5 17:49:32 2024 From: romain.naour at smile.fr (Romain NAOUR) Date: Mon, 5 Feb 2024 18:49:32 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add netcat runtime test In-Reply-To: References: <20240113201532.121274-1-ju.o@free.fr> Message-ID: Hello Julien, All, On Sun, Jan 21, 2024 at 11:20?AM Yann E. MORIN wrote: > > Julien, All, > > On 2024-01-13 21:15 +0100, Julien Olivain spake thusly: > > Signed-off-by: Julien Olivain > > Applied to master, thanks. It seems this test is failing in gitlab-ci for some reason: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854664 can you have a look? Best regards, Romain > > Regards, > Yann E. MORIN. > > > --- > > DEVELOPERS | 1 + > > support/testing/tests/package/test_netcat.py | 41 ++++++++++++++++++++ > > 2 files changed, 42 insertions(+) > > create mode 100644 support/testing/tests/package/test_netcat.py > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 94a89c63d5..d25f31f0ff 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -1791,6 +1791,7 @@ F: support/testing/tests/package/test_lz4.py > > F: support/testing/tests/package/test_lzop.py > > F: support/testing/tests/package/test_mtools.py > > F: support/testing/tests/package/test_ncdu.py > > +F: support/testing/tests/package/test_netcat.py > > F: support/testing/tests/package/test_nftables.py > > F: support/testing/tests/package/test_nftables/ > > F: support/testing/tests/package/test_octave.py > > diff --git a/support/testing/tests/package/test_netcat.py b/support/testing/tests/package/test_netcat.py > > new file mode 100644 > > index 0000000000..b3efa4c40b > > --- /dev/null > > +++ b/support/testing/tests/package/test_netcat.py > > @@ -0,0 +1,41 @@ > > +import os > > +import time > > + > > +import infra.basetest > > + > > + > > +class TestNetCat(infra.basetest.BRTest): > > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > > + """ > > + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > > + BR2_PACKAGE_NETCAT=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]) > > + self.emulator.login() > > + > > + self.assertRunOk("nc --version") > > + > > + in_file = "input.bin" > > + out_file = "output.bin" > > + port = 12345 > > + > > + cmd = f"dd if=/dev/urandom of={in_file} bs=1k count=1k" > > + self.assertRunOk(cmd) > > + > > + cmd = f"nc -l -p {port} > {out_file} &" > > + self.assertRunOk(cmd) > > + > > + time.sleep(1) > > + > > + cmd = f"cat {in_file} | nc -c 127.0.0.1 {port}" > > + self.assertRunOk(cmd) > > + > > + cmd = f"cmp {in_file} {out_file}" > > + self.assertRunOk(cmd) > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From buildroot at bubu1.eu Mon Feb 5 17:52:48 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 18:52:48 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-starlette: bump to version 0.36.3 In-Reply-To: <20240205164615.510688-1-james.hilliard1@gmail.com> References: <20240205164615.510688-1-james.hilliard1@gmail.com> Message-ID: On 05.02.24 17:46, James Hilliard wrote: > Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann > --- > package/python-starlette/python-starlette.hash | 4 ++-- > package/python-starlette/python-starlette.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash > index 820026b70b..03d77cf5be 100644 > --- a/package/python-starlette/python-starlette.hash > +++ b/package/python-starlette/python-starlette.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/starlette/json > -md5 2ef2fc635691fd4a1823564218292dce starlette-0.34.0.tar.gz > -sha256 ed050aaf3896945bfaae93bdf337e53ef3f29115a9d9c153e402985115cd9c8e starlette-0.34.0.tar.gz > +md5 0a1e026d653dc448ae07f47eefe1dc8b starlette-0.36.3.tar.gz > +sha256 90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080 starlette-0.36.3.tar.gz > # Locally computed sha256 checksums > sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md > diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk > index 07f9d6be5e..9d137f5f5a 100644 > --- a/package/python-starlette/python-starlette.mk > +++ b/package/python-starlette/python-starlette.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_STARLETTE_VERSION = 0.34.0 > +PYTHON_STARLETTE_VERSION = 0.36.3 > PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz > -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/4f/36/168ba6d56a28382f3b081b23b0cc431de35786e120b94c1f372708ed3059 > +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/be/47/1bba49d42d63f4453f0a64a20acbf2d0bd2f5a8cde6a166ee66c074a08f8 > PYTHON_STARLETTE_SETUP_TYPE = pep517 > PYTHON_STARLETTE_LICENSE = BSD-3-Clause > PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Mon Feb 5 17:51:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 18:51:35 +0100 Subject: [Buildroot] [git commit] package/openssh: fix build error on powerpc Message-ID: <20240205175616.58D5086DAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=325fe1aecfd20d2653cce6bc189824c6fdfcafec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following error message introducted by OpenSSH v9.6p1. sshkey.c: In function 'sshkey_set_filename': sshkey.c:3705:1: sorry, unimplemented: '-fzero-call-used-regs' not supported on this target 3705 | } Fixes: http://autobuild.buildroot.org/results/ec7/ec780aed5b1c4fdf9b91f6e7be99e8d4c42efa58 Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni --- ...-detection-of-broken-fzero-call-used-regs.patch | 57 ++++++++++++++++++++++ package/openssh/openssh.mk | 3 ++ 2 files changed, 60 insertions(+) diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch new file mode 100644 index 0000000000..5c056033a9 --- /dev/null +++ b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch @@ -0,0 +1,57 @@ +From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Fri, 22 Dec 2023 17:56:26 +1100 +Subject: [PATCH] better detection of broken -fzero-call-used-regs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gcc 13.2.0 on ppc64le refuses to compile some function, including +cipher.c:compression_alg_list() with an error: + +> sorry, unimplemented: argument ???used??? is not supportedcw +> for ???-fzero-call-used-regs??? on this target + +This extends the autoconf will-it-work test with a similarly- +structured function that seems to catch this. + +Spotted/tested by Colin Watson; bz3645 + +Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch +Signed-off-by: Brandon Maier +--- + m4/openssh.m4 | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 5d4c56280fc..033df501c3d 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,18 +20,24 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++const char *f3(int s) { ++ return s ? "good" : "gooder"; ++} + int main(int argc, char **argv) { +- (void)argv; + char b[256], *cp; ++ const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ (void)argv; + f(1); +- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ s = f3(f(2)); ++ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); +- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); ++ if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ec9e6613b0..ef530cc850 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,6 +13,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE +# 0001-better-detection-of-broken-fzero-call-used-regs.patch +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From thomas.petazzoni at bootlin.com Mon Feb 5 17:56:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 18:56:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: fix build error on powerpc In-Reply-To: <20240118222310.62234-1-brandon.maier@collins.com> References: <20240118222310.62234-1-brandon.maier@collins.com> Message-ID: <20240205185616.13fb5202@windsurf> On Thu, 18 Jan 2024 22:23:01 +0000 Brandon Maier via buildroot wrote: > Fixes the following error message introducted by OpenSSH v9.6p1. > > sshkey.c: In function 'sshkey_set_filename': > sshkey.c:3705:1: sorry, unimplemented: '-fzero-call-used-regs' not supported on this target > 3705 | } > > Fixes: > http://autobuild.buildroot.org/results/ec7/ec780aed5b1c4fdf9b91f6e7be99e8d4c42efa58 > > Signed-off-by: Brandon Maier > --- > ...ction-of-broken-fzero-call-used-regs.patch | 57 +++++++++++++++++++ > package/openssh/openssh.mk | 3 + > 2 files changed, 60 insertions(+) > create mode 100644 package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From bubu at git.sr.ht Mon Feb 5 14:12:02 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 15:12:02 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-fastapi: bump to 0.109.2 Message-ID: <170715586410.13905.2351857620201846100-0@git.sr.ht> From: Marcus Hoffmann Drop no longer required dependency on python-anyio. Signed-off-by: Marcus Hoffmann --- package/python-fastapi/Config.in | 1 - package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-fastapi/Config.in b/package/python-fastapi/Config.in index 7d376d3dd7..d4a527c601 100644 --- a/package/python-fastapi/Config.in +++ b/package/python-fastapi/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_FASTAPI bool "python-fastapi" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core - select BR2_PACKAGE_PYTHON_ANYIO # runtime select BR2_PACKAGE_PYTHON_PYDANTIC # runtime select BR2_PACKAGE_PYTHON_STARLETTE # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.105.0 +PYTHON_FASTAPI_VERSION = 0.109.2 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE -- 2.38.5 From romain.naour at smile.fr Mon Feb 5 17:57:49 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 18:57:49 +0100 Subject: [Buildroot] [git commit] package/rustc: rust >= 1.73.0 needs cmake >= 3.20 Message-ID: <20240205175814.9F6C786DB2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c43f12293d3a6668a79f5cfece402d46a87a473e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The bump to rust 1.74.1 [1] introduced a regression on host using cmake < 3.20 since the llvm libraries used in rust compiler was bumpted to llvm 17 [2] and now requires cmake >= 3.20 [3]. Select BR2_HOST_CMAKE_AT_LEAST_3_20 to build host-cmake when needed. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/05392a5eae61c2855bc8d94f5bf9677ebbc5462a [2] https://github.com/rust-lang/rust/commit/8c1c7d37b29d72bad1f218798d121074918e9616 [3] https://github.com/llvm/llvm-project/commit/cbaa3597aaf6273e66b3f445ed36a6458143fe6a Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5880448635 Signed-off-by: Romain Naour Cc: Antoine Coutant Reviewed-by: Antoine Coutant Signed-off-by: Romain Naour --- package/rustc/Config.in.host | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 6beaad0425..baa68994e6 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -149,6 +149,8 @@ config BR2_PACKAGE_HOST_RUST depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # triggers ICE on trunc_int_for_mode, at explow.c:56 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_aarch64 + # rust uses llvm >= 17 since 1.73.0 + select BR2_HOST_CMAKE_AT_LEAST_3_20 help This package will build the compiler for the host as well as two flavors of the standard library: one for the host, another From buildroot at bubu1.eu Mon Feb 5 17:59:46 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 18:59:46 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-fastapi: bump to version 0.109.2 In-Reply-To: <20240205164615.510688-2-james.hilliard1@gmail.com> References: <20240205164615.510688-1-james.hilliard1@gmail.com> <20240205164615.510688-2-james.hilliard1@gmail.com> Message-ID: <193a6600-b432-4f26-a265-fbeea0b72a34@bubu1.eu> Hi James, On 05.02.24 17:46, James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-fastapi/python-fastapi.hash | 4 ++-- > package/python-fastapi/python-fastapi.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash > index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz > -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz > +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz > +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 > --- a/package/python-fastapi/python-fastapi.mk > +++ b/package/python-fastapi/python-fastapi.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_FASTAPI_VERSION = 0.105.0 > +PYTHON_FASTAPI_VERSION = 0.109.2 This misses dropping the anyio dependency, I send a patch that includes this: https://patchwork.ozlabs.org/project/buildroot/patch/170715586410.13905.2351857620201846100-0 at git.sr.ht/ > PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz > -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 > +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 > PYTHON_FASTAPI_SETUP_TYPE = pep517 > PYTHON_FASTAPI_LICENSE = MIT > PYTHON_FASTAPI_LICENSE_FILES = LICENSE From sebastien.szymanski at armadeus.com Mon Feb 5 15:29:58 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Mon, 5 Feb 2024 16:29:58 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/imx8mmpico: uboot needs openssl In-Reply-To: <20240110205100.147660-1-ju.o@free.fr> References: <20240110205100.147660-1-ju.o@free.fr> Message-ID: Hi Julien, All, On 1/10/24 21:51, Julien Olivain wrote: > Commit 78e8f383 "configs/imx8mmpico: bump bsp components to version > tn-kirkstone_5.15.71-2.2.0" bumped components, but forgot to add > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y. > > This commit adds it to the defconfig to fix the build. > > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180248 > > In file included from tools/imagetool.h:24, > from tools/aisimage.c:7: > include/image.h:1166:12: fatal error: openssl/evp.h: No such file or directory > 1166 | # include > | ^~~~~~~~~~~~~~~ > > Signed-off-by: Julien Olivain > --- > Change v1 -> v2: > - Regenerated the patch, to fix a corrupted patch context. > --- > configs/imx8mmpico_defconfig | 1 + > 1 file changed, 1 insertion(+) I confirm that this patch fixes the build error mentioned: Tested-By: S?bastien Szymanski Regards, > > diff --git a/configs/imx8mmpico_defconfig b/configs/imx8mmpico_defconfig > index c402ea675d..711cdeb390 100644 > --- a/configs/imx8mmpico_defconfig > +++ b/configs/imx8mmpico_defconfig > @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-tn-imx,tn-kirkstone_5.15.71-2.2.0_20230512)/u-boot-tn-imx-tn-kirkstone_5.15.71-2.2.0_20230512.tar.gz" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mm" > BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" > BR2_TARGET_UBOOT_SPL=y -- S?bastien Szymanski, Armadeus Systems Software engineer From yann.morin.1998 at free.fr Mon Feb 5 18:00:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 19:00:12 +0100 Subject: [Buildroot] [git commit] host-python-numpy: correct implied host-lapack/host-blas dependency. Message-ID: <20240205180105.7594986DB7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f6c33f3e89f7f26e5b7613a757c82c9efc62654a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Before commit ca63464e3777 (package/python-numpy: bump to version 1.25.0), numpy was using python distuils. Then, the default for BLAS and LAPACK detection was to disable support if they were not found, even when OPENBLAS is installed on the host system. Commit ca63464e3777 switched python-numpy to use the meson-package infrastructure, where the default has changed, and now fails when the host system does have OPENBLAS installed: buildroot$ make >>> host-python-numpy 1.25.0 Configuring [...] Run-time dependency openblas found: NO (tried pkgconfig and cmake) WARNING: CMake Toolchain: Failed to determine CMake compilers state Run-time dependency openblas found: YES 0.3.21 Dependency openblas found: YES 0.3.21 (cached) Program _build_utils/process_src_template.py found: YES (/path/to/buildroot/output/host/bin/python3 /path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/process_src_template.py) Program _build_utils/tempita.py found: YES (/path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/tempita.py) output/build/host-python-numpy-1.25.0/numpy/meson.build:201:44: ERROR: Could not get cmake variable and no default provided for [...] Two obvious ways to correct this: - Add some kind of host-lapack / host-openblas dependency to host-python-numpy, or - Tell host-python-numpy not to look for (or rely on) external code. Because the host numpy environment shouldn't be doing any numerical heavy lifting, we opt for the latter here. Signed-off-by: Graeme Smecher [yann.morin.1998 at free.fr: - explain why the issue was not found before ] Signed-off-by: Yann E. MORIN --- package/python-numpy/python-numpy.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 383135f9fe..200fac20a1 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -38,6 +38,10 @@ else PYTHON_NUMPY_CONF_OPTS += -Dblas="" endif +# Rather than add a host-blas or host-lapack dependencies, just use unoptimized, +# in-tree code. +HOST_PYTHON_NUMPY_CONF_OPTS = -Dblas="" -Dlapack="" + # Fixup the npymath.ini prefix path with actual target staging area where # numpy core was built. Without this, target builds using numpy distutils # extensions like python-scipy, python-numba cannot find -lnpymath since From yann.morin.1998 at free.fr Mon Feb 5 18:04:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 19:04:30 +0100 Subject: [Buildroot] [PATCH] host-python-numpy: correct implied host-lapack/host-blas dependency. In-Reply-To: <20240129204032.1980414-1-gsmecher@threespeedlogic.com> References: <20240129204032.1980414-1-gsmecher@threespeedlogic.com> Message-ID: Graeme, All, On 2024-01-29 12:40 -0800, gsmecher at threespeedlogic.com spake thusly: > From: Graeme Smecher > > Before this patch, host-python-numpy attempted (and failed) to detect > OpenBLAS as follows: > > buildroot$ make > >>> host-python-numpy 1.25.0 Configuring > [...] > Run-time dependency openblas found: NO (tried pkgconfig and cmake) > WARNING: CMake Toolchain: Failed to determine CMake compilers state > Run-time dependency openblas found: YES 0.3.21 > Dependency openblas found: YES 0.3.21 (cached) > Program _build_utils/process_src_template.py found: YES (/path/to/buildroot/output/host/bin/python3 /path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/process_src_template.py) > Program _build_utils/tempita.py found: YES (/path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/tempita.py) > > output/build/host-python-numpy-1.25.0/numpy/meson.build:201:44: ERROR: Could not get cmake variable and no default provided for > [...] So I dug in the Numpy git history, and before we bumped to 1.25, it was using distutils, which would only warn and disable BLAS support if not found, but the meson switch made the default to fail. > Two obvious ways to correct this: > > - Add some kind of host-lapack / host-openblas dependency to > host-python-numpy, or > - Tell host-python-numpy not to look for (or rely on) external code. > > Because the host numpy environment shouldn't be doing any numerical > heavy lifting, we opt for the latter here. > > Signed-off-by: Graeme Smecher Applied to master, with an extended commit log about the history, thanks. Regards, Yann E. MORIN. > --- > package/python-numpy/python-numpy.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk > index b52e0da17d..cc5dfc9224 100644 > --- a/package/python-numpy/python-numpy.mk > +++ b/package/python-numpy/python-numpy.mk > @@ -36,6 +36,10 @@ else > PYTHON_NUMPY_CONF_OPTS += -Dblas="" > endif > > +# Rather than add a host-blas or host-lapack dependencies, just use unoptimized, > +# in-tree code. > +HOST_PYTHON_NUMPY_CONF_OPTS = -Dblas="" -Dlapack="" > + > # Fixup the npymath.ini prefix path with actual target staging area where > # numpy core was built. Without this, target builds using numpy distutils > # extensions like python-scipy, python-numba cannot find -lnpymath since > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Mon Feb 5 18:09:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 19:09:04 +0100 Subject: [Buildroot] [git commit] package/protobuf-c: bump to version 1.5.0 Message-ID: <20240205180912.D25CA86DC7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e97fc89e7ba75f5f664161916b44e727820a04a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - drops support for proto2 - fixes compatibility with protobuf >= 22.0 (which we did not yet bump) - to be compatible with new protobuf versions c++17 is now required when building with protoc (which we only do for the host package) [0] hence require host gcc >= 7 for c++17 support, propagate to depending packages - the license file has changed with a change of the copyright years, nothing else [0] https://github.com/protobuf-c/protobuf-c/pull/673 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/collectd/Config.in | 10 ++++++++-- package/criu/Config.in | 6 ++++-- package/kismet/Config.in | 6 ++++-- package/protobuf-c/Config.in | 5 +++-- package/protobuf-c/protobuf-c.hash | 4 ++-- package/protobuf-c/protobuf-c.mk | 6 +++--- package/riemann-c-client/Config.in | 6 ++++-- 7 files changed, 28 insertions(+), 15 deletions(-) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index d3b686771d..a0c367c78d 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -738,12 +738,17 @@ config BR2_PACKAGE_COLLECTD_RIEMANN # riemann-c-client -> protobuf-c depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c select BR2_PACKAGE_RIEMANN_C_CLIENT select BR2_PACKAGE_LIBTOOL help Sends data to Riemann, a stream processing and monitoring system. +comment "riemann needs a toolchain w/ C++, host gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_7 + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + config BR2_PACKAGE_COLLECTD_UNIXSOCK bool "unixsock" help @@ -772,14 +777,15 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS bool "write_prometheus" depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c select BR2_PACKAGE_LIBMICROHTTPD select BR2_PACKAGE_PROTOBUF_C help Publishes values using an embedded HTTP server, in a format compatible with Prometheus' collectd_exporter. -comment "write_prometheus needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "write_prometheus needs a toolchain w/ C++, host gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_7 depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_COLLECTD_WRITEREDIS diff --git a/package/criu/Config.in b/package/criu/Config.in index a5adc0cedd..30b131cd30 100644 --- a/package/criu/Config.in +++ b/package/criu/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_CRIU_ARCH_SUPPORTS config BR2_PACKAGE_CRIU bool "criu" depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # -march=armv7-a+fp depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 # rseq.h depends on !BR2_TOOLCHAIN_USES_UCLIBC # no aio.h @@ -43,9 +44,10 @@ config BR2_PACKAGE_CRIU https://criu.org/Main_Page -comment "criu needs a glibc or musl toolchain w/ threads, gcc >= 8, headers >= 4.18, C++, dynamic library, wchar" +comment "criu needs a glibc or musl toolchain w/ threads, host gcc >= 7, gcc >= 8, headers >= 4.18, C++, dynamic library, wchar" depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 \ || BR2_TOOLCHAIN_USES_UCLIBC || !BR2_INSTALL_LIBSTDCPP \ - || BR2_STATIC_LIBS || !BR2_USE_WCHAR + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ + || BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/kismet/Config.in b/package/kismet/Config.in index 80e68743a5..2e1e0cfbd0 100644 --- a/package/kismet/Config.in +++ b/package/kismet/Config.in @@ -1,8 +1,9 @@ -comment "kismet needs a toolchain w/ threads, C++, gcc >= 5" +comment "kismet needs a toolchain w/ threads, C++, gcc >= 5, host gcc >= 7" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ + !BR2_HOST_GCC_AT_LEAST_7 depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_KISMET @@ -11,6 +12,7 @@ config BR2_PACKAGE_KISMET depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_PROTOBUF_C diff --git a/package/protobuf-c/Config.in b/package/protobuf-c/Config.in index d96cd7b382..a438b32221 100644 --- a/package/protobuf-c/Config.in +++ b/package/protobuf-c/Config.in @@ -4,12 +4,13 @@ config BR2_PACKAGE_PROTOBUF_C depends on BR2_TOOLCHAIN_HAS_THREADS # host-protobuf only builds on certain architectures depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_7 # c++17 for host variant help Code generator and runtime libraries to use Protocol Buffers from pure C (not C++). https://github.com/protobuf-c/protobuf-c -comment "protobuf-c needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "protobuf-c needs a toolchain w/ C++, threads, host gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_HOST_GCC_AT_LEAST_7 depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS diff --git a/package/protobuf-c/protobuf-c.hash b/package/protobuf-c/protobuf-c.hash index ec00442277..aafd98416a 100644 --- a/package/protobuf-c/protobuf-c.hash +++ b/package/protobuf-c/protobuf-c.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4cc4facd508172f3e0a4d3a8736225d472418aee35b4ad053384b137b220339f protobuf-c-1.4.1.tar.gz -sha256 b8999cb392cc5bbe8cd679de59584ad8d2f26033123e76f1d662fa14b9d4f287 LICENSE +sha256 7b404c63361ed35b3667aec75cc37b54298d56dd2bcf369de3373212cc06fd98 protobuf-c-1.5.0.tar.gz +sha256 ad28bbf89340b86d15aad1ff62c4f4590025d836415307dc66cf0338235cc2f4 LICENSE diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk index 0742a33db2..ccabd4723f 100644 --- a/package/protobuf-c/protobuf-c.mk +++ b/package/protobuf-c/protobuf-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROTOBUF_C_VERSION = 1.4.1 +PROTOBUF_C_VERSION = 1.5.0 PROTOBUF_C_SITE = https://github.com/protobuf-c/protobuf-c/releases/download/v$(PROTOBUF_C_VERSION) PROTOBUF_C_DEPENDENCIES = host-protobuf-c HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf @@ -15,8 +15,8 @@ PROTOBUF_C_LICENSE = BSD-2-Clause PROTOBUF_C_LICENSE_FILES = LICENSE PROTOBUF_C_CPE_ID_VENDOR = protobuf-c_project -# host-protobuf needs c++11 (since 3.6.0) -HOST_PROTOBUF_C_CONF_ENV += CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" +# when building with protoc (from host-protobuf) c++17 is now required +HOST_PROTOBUF_C_CONF_ENV += CXXFLAGS="$(HOST_CXXFLAGS) -std=c++17" $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/riemann-c-client/Config.in b/package/riemann-c-client/Config.in index 6c3c35caf8..0985972a8b 100644 --- a/package/riemann-c-client/Config.in +++ b/package/riemann-c-client/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c select BR2_PACKAGE_PROTOBUF_C help Riemann-c-client is a C client library for the Riemann @@ -12,6 +13,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT https://github.com/algernon/riemann-c-client -comment "riemann-c-client needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "riemann-c-client needs a toolchain w/ C++, threads, host gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_HOST_GCC_AT_LEAST_7 depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS From kris at embeddedts.com Mon Feb 5 18:11:12 2024 From: kris at embeddedts.com (Kris Bahnsen) Date: Mon, 05 Feb 2024 10:11:12 -0800 Subject: [Buildroot] [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 In-Reply-To: References: <399bbbdbc865bb5fab6fa7dbdad653f9aa240da2.camel@embeddedTS.com> Message-ID: Hello, Kris, All, On 2024-02-01 13:59 -0800, Kris Bahnsen via buildroot spake thusly: > From 55e8d294997af933bb3d832b73229bebefa45044 Mon Sep 17 00:00:00 > 2001 > From: Kris Bahnsen > Date: Thu, 1 Feb 2024 20:46:39 +0000 > Subject: [PATCH 1/1] package/wilc_firmware: bump to 16.1.2 > > Release changelog: > - Use default values for IQ calibration correction when the eFuse > register has zero values. > - Fix for "WILC1000 Firmware initialization issue" by updating > the PMU clock switching sequence during firmware initialization. > > Signed-off-by: Kris Bahnsen It seems your patch got badly mangled, and I had issues applying it (git-am whined the patch was empty). And I notice that the mail headers are included in the patch. Not sure what happen. Using "git send-email" is known to send correctly formatted patches, so maybe check if you can do that next time. My apologies, I usually use `git send-email`, but had to use an email client to send this patch (and obviously did it incorrectly). Future patches will all come in on `git send-email`. Thanks! Applied to master, thanks. Regards, Yann E. MORIN. > --- > ?package/wilc-firmware/wilc-firmware.hash | 2 +- > ?package/wilc-firmware/wilc-firmware.mk?? | 2 +- > ?2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc- > firmware/wilc-firmware.hash > index 802cb4f9b1..8a7957a1d2 100644 > --- a/package/wilc-firmware/wilc-firmware.hash > +++ b/package/wilc-firmware/wilc-firmware.hash > @@ -1,3 +1,3 @@ > ?# Locally calculated > -sha256? > a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0? > wilc-firmware-wilc_linux_16_1.tar.gz > +sha256? > 6cd5fc52150520bedb736f58124063041b4d9849ea33481a8b075f51aec64f8e? > wilc-firmware-wilc_linux_16_1_2.tar.gz > ?sha256? > 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb? > LICENSE.wilc_fw > diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc- > firmware/wilc-firmware.mk > index 12c825cf92..3381162bbd 100644 > --- a/package/wilc-firmware/wilc-firmware.mk > +++ b/package/wilc-firmware/wilc-firmware.mk > @@ -4,7 +4,7 @@ > ?# > ?#################################################################### > ############ > ? > -WILC_FIRMWARE_VERSION = wilc_linux_16_1 > +WILC_FIRMWARE_VERSION = wilc_linux_16_1_2 > ?WILC_FIRMWARE_SITE = $(call > github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) > ? > ?WILC_FIRMWARE_LICENSE = PROPRIETARY > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Mon Feb 5 18:14:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 19:14:25 +0100 Subject: [Buildroot] [PATCH v2] package/protobuf-c: bump to version 1.5.0 In-Reply-To: <20240119072933.25453-1-buildroot@heine.tech> References: <20240119072933.25453-1-buildroot@heine.tech> Message-ID: <20240205191425.311409b0@windsurf> Hello Michael, On Fri, 19 Jan 2024 08:29:27 +0100 Michael Nosthoff via buildroot wrote: > - drops support for proto2 > - fixes compatibility with protobuf >= 22.0 (which we did not yet bump) > - to be compatible with new protobuf versions c++17 is now required > when building with protoc (which we only do for the host package) [0] > hence require host gcc >= 7 for c++17 support, propagate to depending packets > > [0] https://github.com/protobuf-c/protobuf-c/pull/673 > > Signed-off-by: Michael Nosthoff Thanks, I've applied your patch, but after doing a few more changes. See below. First, you changed the hash of the license file, and that needs to be explained in the commit log so that we have the visibility that you did check why the license file has changed. Indeed, the sole reason for having hashes for the license file is to detect changes in the licensing terms. If we 'blindly' update the hash, we miss the point :-) > diff --git a/package/collectd/Config.in b/package/collectd/Config.in > index d3b686771d..145b9a2a3a 100644 > --- a/package/collectd/Config.in > +++ b/package/collectd/Config.in > @@ -738,6 +738,7 @@ config BR2_PACKAGE_COLLECTD_RIEMANN > # riemann-c-client -> protobuf-c > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS > + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c > select BR2_PACKAGE_RIEMANN_C_CLIENT > select BR2_PACKAGE_LIBTOOL Needed a Config.in comment (which indeed didn't exist until now for existing dependencies). > help > @@ -772,6 +773,7 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS > bool "write_prometheus" > depends on BR2_INSTALL_LIBSTDCPP # protobuf-c > depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c > + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c Needed an update to the existing Config.in comment. > diff --git a/package/criu/Config.in b/package/criu/Config.in > index 4c295acf4f..d223524eee 100644 > --- a/package/criu/Config.in > +++ b/package/criu/Config.in > @@ -12,6 +12,7 @@ config BR2_PACKAGE_CRIU_ARCH_SUPPORTS > # BE/LE endian issues. > depends on BR2_USE_MMU # libcap > depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c > + depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c This shouldn't be in BR2_PACKAGE_CRIU_ARCH_SUPPORTS, because it's not an architecture dependency. It should be on BR2_PACKAGE_CRIU, with the appropriate Config.in comment update. > diff --git a/package/kismet/Config.in b/package/kismet/Config.in > index 7bde6c92af..ea2b33fca7 100644 > --- a/package/kismet/Config.in > +++ b/package/kismet/Config.in > @@ -1,8 +1,9 @@ > -comment "kismet needs a toolchain w/ threads, C++, gcc >= 5" > +comment "kismet needs a toolchain w/ threads, C++, gcc >= 5, host-gcc >= 7" ^^^^^ we use "host gcc" everywhere, without the dash > diff --git a/package/protobuf-c/Config.in b/package/protobuf-c/Config.in > index d96cd7b382..56b58afe99 100644 > --- a/package/protobuf-c/Config.in > +++ b/package/protobuf-c/Config.in > @@ -4,12 +4,13 @@ config BR2_PACKAGE_PROTOBUF_C > depends on BR2_TOOLCHAIN_HAS_THREADS > # host-protobuf only builds on certain architectures > depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS > + depends on BR2_HOST_GCC_AT_LEAST_7 # c++17 I've extended the comment to indicate that it is for the host package. Otherwise, the next person coming will wonder why for C++17 we depends on host gcc >= 7, and not target gcc >= 7. Applied with those fixes. Thanks a lot for your contribution! Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 18:22:11 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 19:22:11 +0100 Subject: [Buildroot] [git commit] package/mawk: bump version to 1.3.4-20240123 Message-ID: <20240205182240.3E12680E43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c5c3153c6a4c5bd8c4e84624addacc353d1f5724 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Ismael Luceno Signed-off-by: Yann E. MORIN --- package/mawk/mawk.hash | 2 +- package/mawk/mawk.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mawk/mawk.hash b/package/mawk/mawk.hash index 0a31675ac8..31a74cab60 100644 --- a/package/mawk/mawk.hash +++ b/package/mawk/mawk.hash @@ -1,2 +1,2 @@ -sha256 88f55a632e2736ff5c5f69944abc151734d89d8298d5005921180f39ab7ba6d0 mawk-1.3.4-20230808.tgz +sha256 a8e319a83744b1f1fb6988dfa189d61887f866e9140cc9a49eb003b2b0655e88 mawk-1.3.4-20240123.tgz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mawk/mawk.mk b/package/mawk/mawk.mk index d747f887ce..9aadf6d972 100644 --- a/package/mawk/mawk.mk +++ b/package/mawk/mawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -MAWK_VERSION = 1.3.4-20230808 +MAWK_VERSION = 1.3.4-20240123 MAWK_SITE = https://invisible-mirror.net/archives/mawk MAWK_SOURCE = mawk-$(MAWK_VERSION).tgz MAWK_LICENSE = GPL-2.0 From yann.morin.1998 at free.fr Mon Feb 5 18:22:10 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 19:22:10 +0100 Subject: [Buildroot] [git commit] package/stella: bump to version 6.7.1 Message-ID: <20240205182240.2DBB886DC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b64906f88880167cae7513b29b1608f5ca9fe6c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Sergio Prado Signed-off-by: Yann E. MORIN --- package/stella/stella.hash | 2 +- package/stella/stella.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/stella/stella.hash b/package/stella/stella.hash index 17d059226c..59c6806459 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 babfcbb39abbd1a992cb1e6d3b2f508df7ed19cb9d0b5b5d624828bb98f97267 stella-6.7-src.tar.xz +sha256 9ef880df87f2d3ffebfbad915247d1fd5a3aca41dfd6a754dcf7a142ac826752 stella-6.7.1-src.tar.xz sha256 e82dd017fea2c70a16726aa1d7c05c5b7597e10f7229511c1b110bf84cb507c0 Copyright.txt sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index aa5da1996e..c48bb593a4 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.7 +STELLA_VERSION = 6.7.1 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ From james.hilliard1 at gmail.com Mon Feb 5 18:33:08 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 11:33:08 -0700 Subject: [Buildroot] [PATCH 1/1] package/ruby: disable unsupported yjit Message-ID: <20240205183308.2120022-1-james.hilliard1@gmail.com> The yjit feature requires rust toolchain support, since we don't currently handle setting up the rust toolchain for ruby lets disable this feature for now. This broke when ruby was bumped to version 3.3.0 in buildroot commit a01c278df7892c8a6736334aa008b2d7c09e9258. Fixes: linking static-library libruby-static.a LLVM ERROR: Invalid encoding make[2]: *** [Makefile:318: libruby-static.a] Aborted Signed-off-by: James Hilliard --- package/ruby/ruby.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index b2396010c5..4b9ce80e67 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -22,9 +22,14 @@ RUBY_CPE_ID_VENDOR = ruby-lang RUBY_DEPENDENCIES = host-pkgconf host-ruby HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) -RUBY_CONF_OPTS = --disable-install-doc --disable-rpath --disable-rubygems +RUBY_CONF_OPTS = \ + --disable-install-doc \ + --disable-rpath \ + --disable-rubygems \ + --disable-yjit HOST_RUBY_CONF_OPTS = \ --disable-install-doc \ + --disable-yjit \ --with-out-ext=curses,readline \ --without-gmp -- 2.34.1 From buildroot at bubu1.eu Mon Feb 5 18:34:15 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 19:34:15 +0100 Subject: [Buildroot] [PATCH buildroot v2 2/2] support/testing: add fastapi runtime test In-Reply-To: <170715461915.13905.5968173515742280918-1@git.sr.ht> References: <170715461915.13905.5968173515742280918-1@git.sr.ht> Message-ID: <87adf1da-ab34-4ef2-9bd5-0e3e3a8bae33@bubu1.eu> On 05.02.24 18:25, ~bubu wrote: > From: Marcus Hoffmann > > Add a runtime test for fastapi. Use uvicorn as the asgi server > application as does the fastapi hello world example [1]. > > Fastapi depends on PydanticV2 now which is written in rust so we need to > run the test on armv7. > > [1] https://fastapi.tiangolo.com/tutorial/first-steps/ > > Signed-off-by: Marcus Hoffmann > --- > .../tests/package/sample_python_fastapi.py | 8 ++++ > .../tests/package/test_python_fastapi.py | 47 +++++++++++++++++++ > 2 files changed, 55 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_fastapi.py > create mode 100644 support/testing/tests/package/test_python_fastapi.py > > diff --git a/support/testing/tests/package/sample_python_fastapi.py b/support/testing/tests/package/sample_python_fastapi.py > new file mode 100644 > index 0000000000..3116df3a93 > --- /dev/null > +++ b/support/testing/tests/package/sample_python_fastapi.py > @@ -0,0 +1,8 @@ > +from fastapi import FastAPI > + > +app = FastAPI() > + > + at app.get("/") > +async def root(): > + return {"message": "Hello World"} > + > diff --git a/support/testing/tests/package/test_python_fastapi.py b/support/testing/tests/package/test_python_fastapi.py > new file mode 100644 > index 0000000000..1a78fa6c58 > --- /dev/null > +++ b/support/testing/tests/package/test_python_fastapi.py > @@ -0,0 +1,47 @@ > +import os > +import time > + > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy3Fastapi(TestPythonPackageBase): > + __test__ = True > + config = \ > + """ > + BR2_arm=y > + BR2_cortex_a9=y > + BR2_ARM_ENABLE_NEON=y > + BR2_ARM_ENABLE_VFP=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_FASTAPI=y > + BR2_PACKAGE_PYTHON_UVICORN=y > + BR2_TARGET_ROOTFS_CPIO=y > + # BR2_TARGET_ROOTFS_TAR is not set > + BR2_CCACHE=y > + BR2_CCACHE_DIR="/home/bubu/.buildroot-ccache" Oops, I forgot to remove the 2 CCACHE lines before submitting. Don't forget to remove these when applying. :-) > + """ > + sample_scripts = ["tests/package/sample_python_fastapi.py"] > + timeout = 60 > + > + def test_run(self): > + self.login() > + self.check_sample_scripts_exist() > + cmd = "uvicorn sample_python_fastapi:app > /dev/null 2>&1 &" > + > + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) > + > + # Give enough time for the uvicorn server to start up > + time.sleep(30) > + > + cmd = "wget -q -O - http://127.0.0.1:8000/" > + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output[0], '{"message":"Hello World"}') > + > + def login(self): > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > + self.emulator.boot(arch="armv7", > + kernel="builtin", > + options=["-initrd", cpio_file]) > + self.emulator.login() From ju.o at free.fr Mon Feb 5 18:47:57 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 5 Feb 2024 19:47:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/rdma-core: bump to version v50.0 Message-ID: <20240205184757.3404601-1-ju.o@free.fr> For change log, see: https://github.com/linux-rdma/rdma-core/releases/tag/v50.0 This commit drops the package patch, which is now included in the release. Signed-off-by: Julien Olivain --- ...-util-udma_barrier.h-fix-mips4-build.patch | 56 ------------------- package/rdma-core/rdma-core.hash | 2 +- package/rdma-core/rdma-core.mk | 2 +- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch deleted file mode 100644 index 6dfb476faa..0000000000 --- a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 21 Jan 2024 18:55:34 +0100 -Subject: [PATCH] util/udma_barrier.h: fix mips4 build - -The 'sync' instruction for MIPS was defined in MIPS-II as taking no -operands. MIPS32 extended the define of 'sync' as taking an optional -unsigned 5 bit immediate. - -As a result, replace "sync 0" by "sync" to fix the following build -failure on mips4 raised since version 43.0 and -https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: - -/tmp/ccrBy9fV.s: Assembler messages: -/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' - -Fixes: - - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 ---- - util/udma_barrier.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/util/udma_barrier.h b/util/udma_barrier.h -index 0a1f8a45b..3793d2f18 100644 ---- a/util/udma_barrier.h -+++ b/util/udma_barrier.h -@@ -101,7 +101,7 @@ - #elif defined(__riscv) - #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") - #elif defined(__mips__) --#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") -+#define udma_to_device_barrier() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif -@@ -139,7 +139,7 @@ - #elif defined(__riscv) - #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") - #elif defined(__mips__) --#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") -+#define udma_from_device_barrier() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif -@@ -212,7 +212,7 @@ - #include "s390_mmio_insn.h" - #define mmio_flush_writes() s390_pciwb() - #elif defined(__mips__) --#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") -+#define mmio_flush_writes() asm volatile("sync" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash index fc1d319123..27fe7e208d 100644 --- a/package/rdma-core/rdma-core.hash +++ b/package/rdma-core/rdma-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1ea2c2678d48be0b179871e9ae8c58ceab11a0c5b69315a332ff51dd607180b7 rdma-core-49.0.tar.gz +sha256 ecb866caaec7ce13f40074c769860f9c36c3a37a70913c5218217e3293d7cb11 rdma-core-50.0.tar.gz sha256 99e0df1d009a21d0dfb031600c550fd8f4efc0c6b2a4ef8b34a995aa6f79c9f4 COPYING.BSD_MIT sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL2 sha256 c46a557f25b8ef9bec76526c4e593fc13e6cba27e7ba30d73b6497a689cf06f6 COPYING.md diff --git a/package/rdma-core/rdma-core.mk b/package/rdma-core/rdma-core.mk index 5f8989b3bd..7818b396a4 100644 --- a/package/rdma-core/rdma-core.mk +++ b/package/rdma-core/rdma-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -RDMA_CORE_VERSION = 49.0 +RDMA_CORE_VERSION = 50.0 RDMA_CORE_SITE = $(call github,linux-rdma,rdma-core,v$(RDMA_CORE_VERSION)) RDMA_CORE_LICENSE = GPL-2.0 or BSD-2-Clause RDMA_CORE_LICENSE_FILES = COPYING.GPL2 COPYING.BSD_MIT COPYING.md -- 2.43.0 From james.hilliard1 at gmail.com Mon Feb 5 19:31:30 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 12:31:30 -0700 Subject: [Buildroot] [PATCH 1/1] package/{rust, rust-bin}: bump to version 1.75.0 Message-ID: <20240205193130.112131-1-james.hilliard1@gmail.com> Link to Rust 1.71.1 announcement: https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html Drop all mips platforms from target tier 2 platforms due to upstream dropping them to tier 3. See: https://github.com/rust-lang/compiler-team/issues/648 Signed-off-by: James Hilliard --- package/rust-bin/rust-bin.hash | 204 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- package/rustc/Config.in.host | 8 -- 5 files changed, 101 insertions(+), 121 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d44cb2cb67..b6fc7806f2 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,111 +1,99 @@ -# From https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 88d0cd0407ca5bb73b5d72956d85e31e057657c7ec09a58ca634cf36bd5cf626 rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 f58cdf15717e7f6506088e753ffef3ec655a4ccd932eae280d6cb68b0ee3feca rust-1.74.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 d272cec30f3461647861d120af53946142fa2f969f43040c2685425cb67c7d79 rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 17df1fa64083fa508576062a651577e0741d02f4ae5771518a72fd4ea483b00f rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 054a98e8e85e94c187ff8bc16bac8011747839c9ad73584fdd87b904f137eb23 rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 4abc1499e91cfadf7610a08271d1f5ff9284a54ba4a0ba60f105bb9b2413169e rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 3196fd6e4453cd2191e5f8c4f63eaffd045cc1884cf4b64d94990aa81232f85f rust-1.74.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 5483e32fe962e9123cf49c9cf169e60640d4c9d0aad1a054dd4bf232f0f012be rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a776e7b41991ef7a50706d1f9b7752a8d963e67297bfc22471d6e68d544349cc rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.asc -sha256 d712e44d57f3732c294affb26c07d8fb79f25c716b16a4bde910390f34cc9959 rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 38ccd7eeb30e481a27533ec1450c1eb4f3c3fee284f702ee64676b3831bde425 rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 5f1b890faa083afd97ed53c67d859f4de89abe9a059b48c98217d8ee015bedeb rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.asc -sha256 9b57973a9d23e713799169c3b39282655b742c9182e21270f53a3bb46af516f3 rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 26bad270c96de6ca0abbad4a2be63f994fede26b19cfab3362479668f3d1d5c5 rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 c567bf8e062daead8a256ee3097e724e1f70a4be5f69a74c3722719fb338af27 rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 96c81d327c4cd5cd35541dae3db4ed6eef6a943c78b0595396e88264a692b5e2 rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 339b4bf274ba569245a3e7bc1c9e238ce64c1942c5510fb19a4cacae37aa8aa9 rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 915c3648772d1b00b491a204239362aac33b213e95ac7e818b2001a40aae800a rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 e0a61bd2f33e5929a47654dccc5387c56aa847ab028ff2f1992b4dc82da677f0 rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 7402c633f1a765053ca9bd4c03d65ece67651af9ce3698781a8d2a271e76cbaa rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.asc -sha256 7c01117e7db5b77880d2ed5f3874ae10cdf9a3d2d042fc06011a8f5f8346b66c rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.asc -sha256 b2781008ab93083970d5bf18782f6611f80d5b2a0aa1eaf6e6a44e8b0c146d9b rust-std-1.74.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 de7bfa755339d81d0f375c04a6b5432fba8452fdc72154fbe5cd5e1147902b90 rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.asc -sha256 1d0a2aa7fc04896bb73d08ec6b7247d9f8e2db46532c31adff3d7944d66dfb4b rust-std-1.74.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.asc -sha256 c1721bb1f47941b1e6acc2f91b326d9172bf401dd88e92abacbb8084ecbc568f rust-std-1.74.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 d2680c31aabfa896301689a0a03206aad31a59111a3c041c357ba5508f56dcfc rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 7a8b6f7cc454efb57f575ba50956f2530e192ab50c622acf38b29a42a5bb31e0 rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.asc -sha256 733995dec75a90d4039bc3a6e11c44e256bfc4cb074e46a67e2aebfe1ec69a26 rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 7fb458560bccae13f6558df43d5e17f177a084fdcb605d500eda63bc1ac3eb58 rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 931f975a4a4c8dc17552d965b276c7211e25f8c5deec1f41f5db5c181fa15320 rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 40781d07bb9a23d57c2440d70fee6385d8d40553b739d835c38fd0abe96d7ec5 rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 2c4de6689f5008289b791ad15b8cdc2d69947985b81b77d4dbe5d31632532e1d rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 781403a12fef605250869aeb843be6b7f98ed6c0a62f0349fda53ee4d9d8e296 rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 e19c0d79b385454a8e8c9f27c3ca9779ffac778d8b7cd8de701ce413f492d9f1 rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 df435e3254c03ccbfc9e733ae33b399f5f99bd488974bc07d8b1db91a12ee95b rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 98f190039c7e7922838f9716443b7ddfec2aa3dc229f5b1813a26591c557997e rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 990845fa017f4dc55b866ffbfba3670e88b5b3465f420a212a372169fdf98d30 rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 90e51bf23bf94614ddb685211bd6df7c5a8c77065c715f89793e1465f408e8c2 rust-1.75.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 0b85f973c2a3c54b97edd7195069af4de5b5365c50c251a44e934d447ef5253b rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0b69f2c6b8dc010348b65ebb37d14429c858a42af50f45ce21359f65494d8b95 rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 05f8a6b80afd307201c0888a5e4c664412c32596f77bdc03196a93b7bbaf6dc4 rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 fa5a6911cccad0aee8d00a4657ee577122f4d3014672c0cd31583c362029d4c0 rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 da1848e70b781dabb5c397f456be797beedcda075505a96e7bdadc1c6c7a196f rust-1.75.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 6bf166ddcad545aa26aa2d12a186454d7697133b52b7fbbd271ce3ee1ecfedc6 rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 2ea0dc380ac1fced245bafadafd0da50167a4a416b6011e3d73ba3e657a71d15 rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 30faa30402c4d3455efc4e3a510668784908223306bd766289766e6b10a5cb26 rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 e23074ba9e2882a349b8af79a5c6efe8ffe9e644b702e802f2def12310c8adc9 rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 c42114c9fb2ba1426c9dd648b6dc991217f95b8997cc7f5cbcf677068647827e rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 586486d1aae50055ad09cec2a2239c176f66cc9138a5588a200fda5f3de498c3 rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 fdec58e71ada2344be89e6a2c5a84f5ccedda4e3c9d04f2dbd945b6716681706 rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 5a3286edef55ef48ebc65c60f8727c9ab667db54935ac7a962bacad261a1e577 rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 907ce65a7bd3d4c4dbda48a0af8f1d0d68de21fc94148450eb8fafab7449c797 rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 6092b31dd6de399f4d323c743d383e1854dc4e4c2150d44dff756ce416aaebdc rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 218fb7b652d1ae654df5d16ab60748a08285d1e5ea5897d20dc12abe6c7ba096 rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 1674e8b8a57817e338ee3778852a8e089c5c99e38c0a9a2910b9cd1611b43bcf rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 65c1c23c48a537fed5348be109ded1d2456e6952a99cdb6eaf92de1713185727 rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 7bdc6cd915a47e116ca78e07fe8d5d8acb6217e2aa6187806f782d81853a39b3 rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-musl.tar.xz.asc +sha256 f8b90d0de38695a17c71dd06f5dd08afc58d767754f7d2302b5329890c7ee447 rust-std-1.75.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 42c0aba08ddcad191c84adcb5b6479b4599b9e4656e4e2b6d3ed5b46fa4a04fb rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-musl.tar.xz.asc +sha256 235f7787d3fa3b3155c32fc8d638dbecd220f2f2dfb26677c01a10295d78e35f rust-std-1.75.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 eb56d591650773c7ce00f32fde1adcb878b4010167f348ea167d492fba8628d0 rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 776ea8d200f65cacdb619eecae319511ec2ab398321c8d976c846b9dc44b87d5 rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 22286818e4f0f13f712082e7a740aceb32e28ab3f568d6ed0e9e06b4972b30f5 rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 35db7870fbe27308c2a9bad0371cd05af2fd2975e00b7f5a5bb305798960a9cb rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 810be45b498c4ce1ba9181702a2534c5a35e52fbab547d94b62f70e28388748d rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 6943fda4f3958f28883cc5fb9f455611cc42f4d228841984b8a2a0123e7b65a7 rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 136b132199f7bbda2aa0bbff6d1e6ae7d5fca2994a2f2a432a5e99de224b6314 rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 3728f2d2266b5c87fe2a7ae9c46fc43d06f8c855d7d0f141de6bcd24b43ae919 rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index ca35d27d1c..6cee57ece9 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.74.1 +RUST_BIN_VERSION = 1.75.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 175fa71baf..12f91211d0 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.asc -sha256 b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e rustc-1.74.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.xz.asc +sha256 4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340 rustc-1.75.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index f7a5c0fcd5..793544df1b 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.74.1 +RUST_VERSION = 1.75.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index baa68994e6..3ac1a1797e 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -88,14 +88,6 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL # i686-unknown-linux-musl default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL - # mips-unknown-linux-musl - default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 - # mips64-unknown-linux-muslabi64 - default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mips64el-unknown-linux-muslabi64 - default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mipsel-unknown-linux-musl - default y if BR2_mipsel && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # sparc64-unknown-linux-gnu default y if BR2_sparc64 && BR2_TOOLCHAIN_USES_GLIBC -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 5 19:33:23 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 5 Feb 2024 12:33:23 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/{rust, rust-bin}: bump to version 1.75.0 Message-ID: <20240205193323.115009-1-james.hilliard1@gmail.com> Link to Rust 1.75.0 announcement: https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html Drop all mips platforms from target tier 2 platforms due to upstream dropping them to tier 3. See: https://github.com/rust-lang/compiler-team/issues/648 Signed-off-by: James Hilliard --- Changes v1 -> v2: - fix typo --- package/rust-bin/rust-bin.hash | 204 ++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- package/rustc/Config.in.host | 8 -- 5 files changed, 101 insertions(+), 121 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d44cb2cb67..b6fc7806f2 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,111 +1,99 @@ -# From https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 88d0cd0407ca5bb73b5d72956d85e31e057657c7ec09a58ca634cf36bd5cf626 rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 f58cdf15717e7f6506088e753ffef3ec655a4ccd932eae280d6cb68b0ee3feca rust-1.74.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 d272cec30f3461647861d120af53946142fa2f969f43040c2685425cb67c7d79 rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 17df1fa64083fa508576062a651577e0741d02f4ae5771518a72fd4ea483b00f rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 054a98e8e85e94c187ff8bc16bac8011747839c9ad73584fdd87b904f137eb23 rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 4abc1499e91cfadf7610a08271d1f5ff9284a54ba4a0ba60f105bb9b2413169e rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 3196fd6e4453cd2191e5f8c4f63eaffd045cc1884cf4b64d94990aa81232f85f rust-1.74.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 5483e32fe962e9123cf49c9cf169e60640d4c9d0aad1a054dd4bf232f0f012be rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 a776e7b41991ef7a50706d1f9b7752a8d963e67297bfc22471d6e68d544349cc rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.asc -sha256 d712e44d57f3732c294affb26c07d8fb79f25c716b16a4bde910390f34cc9959 rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 38ccd7eeb30e481a27533ec1450c1eb4f3c3fee284f702ee64676b3831bde425 rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 5f1b890faa083afd97ed53c67d859f4de89abe9a059b48c98217d8ee015bedeb rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.asc -sha256 9b57973a9d23e713799169c3b39282655b742c9182e21270f53a3bb46af516f3 rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 26bad270c96de6ca0abbad4a2be63f994fede26b19cfab3362479668f3d1d5c5 rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 c567bf8e062daead8a256ee3097e724e1f70a4be5f69a74c3722719fb338af27 rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 96c81d327c4cd5cd35541dae3db4ed6eef6a943c78b0595396e88264a692b5e2 rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 339b4bf274ba569245a3e7bc1c9e238ce64c1942c5510fb19a4cacae37aa8aa9 rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 915c3648772d1b00b491a204239362aac33b213e95ac7e818b2001a40aae800a rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 e0a61bd2f33e5929a47654dccc5387c56aa847ab028ff2f1992b4dc82da677f0 rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 7402c633f1a765053ca9bd4c03d65ece67651af9ce3698781a8d2a271e76cbaa rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.asc -sha256 7c01117e7db5b77880d2ed5f3874ae10cdf9a3d2d042fc06011a8f5f8346b66c rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.asc -sha256 b2781008ab93083970d5bf18782f6611f80d5b2a0aa1eaf6e6a44e8b0c146d9b rust-std-1.74.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 de7bfa755339d81d0f375c04a6b5432fba8452fdc72154fbe5cd5e1147902b90 rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.asc -sha256 1d0a2aa7fc04896bb73d08ec6b7247d9f8e2db46532c31adff3d7944d66dfb4b rust-std-1.74.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.asc -sha256 c1721bb1f47941b1e6acc2f91b326d9172bf401dd88e92abacbb8084ecbc568f rust-std-1.74.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 d2680c31aabfa896301689a0a03206aad31a59111a3c041c357ba5508f56dcfc rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 7a8b6f7cc454efb57f575ba50956f2530e192ab50c622acf38b29a42a5bb31e0 rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.asc -sha256 733995dec75a90d4039bc3a6e11c44e256bfc4cb074e46a67e2aebfe1ec69a26 rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 7fb458560bccae13f6558df43d5e17f177a084fdcb605d500eda63bc1ac3eb58 rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 931f975a4a4c8dc17552d965b276c7211e25f8c5deec1f41f5db5c181fa15320 rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 40781d07bb9a23d57c2440d70fee6385d8d40553b739d835c38fd0abe96d7ec5 rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 2c4de6689f5008289b791ad15b8cdc2d69947985b81b77d4dbe5d31632532e1d rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc -sha256 781403a12fef605250869aeb843be6b7f98ed6c0a62f0349fda53ee4d9d8e296 rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 e19c0d79b385454a8e8c9f27c3ca9779ffac778d8b7cd8de701ce413f492d9f1 rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 df435e3254c03ccbfc9e733ae33b399f5f99bd488974bc07d8b1db91a12ee95b rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 98f190039c7e7922838f9716443b7ddfec2aa3dc229f5b1813a26591c557997e rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 990845fa017f4dc55b866ffbfba3670e88b5b3465f420a212a372169fdf98d30 rust-1.75.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 90e51bf23bf94614ddb685211bd6df7c5a8c77065c715f89793e1465f408e8c2 rust-1.75.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 0b85f973c2a3c54b97edd7195069af4de5b5365c50c251a44e934d447ef5253b rust-1.75.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0b69f2c6b8dc010348b65ebb37d14429c858a42af50f45ce21359f65494d8b95 rust-1.75.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 05f8a6b80afd307201c0888a5e4c664412c32596f77bdc03196a93b7bbaf6dc4 rust-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 fa5a6911cccad0aee8d00a4657ee577122f4d3014672c0cd31583c362029d4c0 rust-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 da1848e70b781dabb5c397f456be797beedcda075505a96e7bdadc1c6c7a196f rust-1.75.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 6bf166ddcad545aa26aa2d12a186454d7697133b52b7fbbd271ce3ee1ecfedc6 rust-1.75.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 2ea0dc380ac1fced245bafadafd0da50167a4a416b6011e3d73ba3e657a71d15 rust-std-1.75.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz.asc +sha256 30faa30402c4d3455efc4e3a510668784908223306bd766289766e6b10a5cb26 rust-std-1.75.0-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 e23074ba9e2882a349b8af79a5c6efe8ffe9e644b702e802f2def12310c8adc9 rust-std-1.75.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 c42114c9fb2ba1426c9dd648b6dc991217f95b8997cc7f5cbcf677068647827e rust-std-1.75.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz.asc +sha256 586486d1aae50055ad09cec2a2239c176f66cc9138a5588a200fda5f3de498c3 rust-std-1.75.0-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 fdec58e71ada2344be89e6a2c5a84f5ccedda4e3c9d04f2dbd945b6716681706 rust-std-1.75.0-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 5a3286edef55ef48ebc65c60f8727c9ab667db54935ac7a962bacad261a1e577 rust-std-1.75.0-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 907ce65a7bd3d4c4dbda48a0af8f1d0d68de21fc94148450eb8fafab7449c797 rust-std-1.75.0-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 6092b31dd6de399f4d323c743d383e1854dc4e4c2150d44dff756ce416aaebdc rust-std-1.75.0-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 218fb7b652d1ae654df5d16ab60748a08285d1e5ea5897d20dc12abe6c7ba096 rust-std-1.75.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 1674e8b8a57817e338ee3778852a8e089c5c99e38c0a9a2910b9cd1611b43bcf rust-std-1.75.0-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 65c1c23c48a537fed5348be109ded1d2456e6952a99cdb6eaf92de1713185727 rust-std-1.75.0-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz.asc +sha256 7bdc6cd915a47e116ca78e07fe8d5d8acb6217e2aa6187806f782d81853a39b3 rust-std-1.75.0-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i586-unknown-linux-musl.tar.xz.asc +sha256 f8b90d0de38695a17c71dd06f5dd08afc58d767754f7d2302b5329890c7ee447 rust-std-1.75.0-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 42c0aba08ddcad191c84adcb5b6479b4599b9e4656e4e2b6d3ed5b46fa4a04fb rust-std-1.75.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-i686-unknown-linux-musl.tar.xz.asc +sha256 235f7787d3fa3b3155c32fc8d638dbecd220f2f2dfb26677c01a10295d78e35f rust-std-1.75.0-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 eb56d591650773c7ce00f32fde1adcb878b4010167f348ea167d492fba8628d0 rust-std-1.75.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 776ea8d200f65cacdb619eecae319511ec2ab398321c8d976c846b9dc44b87d5 rust-std-1.75.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 22286818e4f0f13f712082e7a740aceb32e28ab3f568d6ed0e9e06b4972b30f5 rust-std-1.75.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 35db7870fbe27308c2a9bad0371cd05af2fd2975e00b7f5a5bb305798960a9cb rust-std-1.75.0-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz.asc +sha256 810be45b498c4ce1ba9181702a2534c5a35e52fbab547d94b62f70e28388748d rust-std-1.75.0-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 6943fda4f3958f28883cc5fb9f455611cc42f4d228841984b8a2a0123e7b65a7 rust-std-1.75.0-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 136b132199f7bbda2aa0bbff6d1e6ae7d5fca2994a2f2a432a5e99de224b6314 rust-std-1.75.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz.asc +sha256 3728f2d2266b5c87fe2a7ae9c46fc43d06f8c855d7d0f141de6bcd24b43ae919 rust-std-1.75.0-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index ca35d27d1c..6cee57ece9 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.74.1 +RUST_BIN_VERSION = 1.75.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 175fa71baf..12f91211d0 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.asc -sha256 b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e rustc-1.74.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.75.0-src.tar.xz.asc +sha256 4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340 rustc-1.75.0-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index f7a5c0fcd5..793544df1b 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.74.1 +RUST_VERSION = 1.75.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index baa68994e6..3ac1a1797e 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -88,14 +88,6 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL # i686-unknown-linux-musl default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL - # mips-unknown-linux-musl - default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 - # mips64-unknown-linux-muslabi64 - default y if BR2_mips64 && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mips64el-unknown-linux-muslabi64 - default y if BR2_mips64el && BR2_TOOLCHAIN_USES_MUSL && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6 - # mipsel-unknown-linux-musl - default y if BR2_mipsel && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # sparc64-unknown-linux-gnu default y if BR2_sparc64 && BR2_TOOLCHAIN_USES_GLIBC -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 5 20:13:42 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 5 Feb 2024 21:13:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR Message-ID: <20240205201342.2995-1-fontaine.fabrice@gmail.com> cpe:2.3:a:green_end:sftpserver has been deprecated in favor of cpe:2.3:a:greenend:sftpserver in December 2022: Version Product Signed-off-by: Fabrice Fontaine --- package/gesftpserver/gesftpserver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 5a3ab0536c..5a7106d707 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -12,7 +12,7 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors -GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_VENDOR = greenend GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling -- 2.43.0 From fontaine.fabrice at gmail.com Mon Feb 5 20:16:25 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 5 Feb 2024 21:16:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjwt: disable examples Message-ID: <20240205201625.5203-1-fontaine.fabrice@gmail.com> Examples are enabled by default since the addition of the package in commit 7251775773011e7da38e3a33c6817eceab6a9dfa Signed-off-by: Fabrice Fontaine --- package/libjwt/libjwt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 7e2ea03b09..1643aa7b7a 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -11,6 +11,7 @@ LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE +LIBJWT_CONF_OPTS = --without-examples ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBJWT_CONF_OPTS += --with-openssl -- 2.43.0 From buildroot at heine.tech Mon Feb 5 20:35:20 2024 From: buildroot at heine.tech (Michael Nosthoff) Date: Mon, 5 Feb 2024 21:35:20 +0100 Subject: [Buildroot] [PATCH] package/re2: bump to version 2024-02-01 Message-ID: <20240205203521.201702-1-buildroot@heine.tech> Signed-off-by: Michael Nosthoff --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 5f590aba6e..543c416087 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a re2-2023-11-01.tar.gz +sha256 cd191a311b84fcf37310e5cd876845b4bf5aee76fdd755008eef3b6478ce07bb re2-2024-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b81a64f2e9..b962b53e3f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2023-11-01 +RE2_VERSION = 2024-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Mon Feb 5 20:41:46 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 5 Feb 2024 21:41:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/lua-http: set CPE variables Message-ID: <20240205204146.284303-1-fontaine.fabrice@gmail.com> cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E Signed-off-by: Fabrice Fontaine --- package/lua-http/lua-http.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index 7fbb09038e..df3e2c0059 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -10,5 +10,7 @@ LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_LICENSE = MIT LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md +LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) +LUA_HTTP_CPE_ID_VENDOR = daurnimator $(eval $(luarocks-package)) -- 2.43.0 From nicola.dilieto at gmail.com Mon Feb 5 20:47:06 2024 From: nicola.dilieto at gmail.com (Nicola Di Lieto) Date: Mon, 5 Feb 2024 21:47:06 +0100 Subject: [Buildroot] [PATCH] package/uacme: bump version to 1.7.5 Message-ID: Signed-off-by: Nicola Di Lieto --- package/uacme/uacme.hash | 2 +- package/uacme/uacme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash index 063b0b57ac..9a274bf394 100644 --- a/package/uacme/uacme.hash +++ b/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a638fe0878dba8fdda62f89e7a284243edbcd31b92c11b5cfdc7d3efd9547bca uacme-1.7.4.tar.gz +sha256 596b2fba75fedc7a410dd71583c828642ecd486dfdcfde109dfebb82a374abbe uacme-1.7.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index b260bd85ee..f02e522761 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.7.4 +UACME_VERSION = 1.7.5 # Released versions are on branch upstream/latest, tagged as # upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not # include .tarball-version -- 2.20.1 From fontaine.fabrice at gmail.com Mon Feb 5 20:49:54 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 5 Feb 2024 21:49:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/cpio: bump to version 2.15 Message-ID: <20240205204954.297515-1-fontaine.fabrice@gmail.com> https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00006.html Signed-off-by: Fabrice Fontaine --- package/cpio/cpio.hash | 6 +++--- package/cpio/cpio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cpio/cpio.hash b/package/cpio/cpio.hash index c67fbc1f61..e300a5f084 100644 --- a/package/cpio/cpio.hash +++ b/package/cpio/cpio.hash @@ -1,6 +1,6 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00001.html -sha1 cbac50a61079b6f3bdcf9ffe42171d9257cfe877 cpio-2.14.tar.bz2 +# From https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00006.html +sha1 db5e3845eb5475ddcb7e8915c3a1458a0c13d787 cpio-2.15.tar.bz2 # Locally calculated after checking pgp signature -sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.14.tar.bz2 +sha256 937610b97c329a1ec9268553fb780037bcfff0dcffe9725ebc4fd9c1aa9075db cpio-2.15.tar.bz2 # Locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk index 911d16822b..452271c8f1 100644 --- a/package/cpio/cpio.mk +++ b/package/cpio/cpio.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPIO_VERSION = 2.14 +CPIO_VERSION = 2.15 CPIO_SOURCE = cpio-$(CPIO_VERSION).tar.bz2 CPIO_SITE = $(BR2_GNU_MIRROR)/cpio CPIO_CONF_OPTS = --bindir=/bin -- 2.43.0 From thomas at devoogdt.com Mon Feb 5 21:22:59 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 5 Feb 2024 22:22:59 +0100 Subject: [Buildroot] [PATCH v7 1/2] package/cairo: move to the meson build system In-Reply-To: <87zfwfrmoe.fsf@48ers.dk> References: <87zfwfrmoe.fsf@48ers.dk> Message-ID: <20240205212300.3178519-1-thomas@devoogdt.com> - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy since they are not selectable anymore in the meson-build options. BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG option already selects that one. This is now in sync with the meson build options. - Note that the dependencies for the various options are slightly changed, but there is not much mentioned about that, the meson introduction is done in one big commit: [1]. - Added xlib_libXrender dependency, which was already required before meson, it just came to my attention since it's a hard error now. - Added two patches to fix cross compiling, upstream: [2]. [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/596a82f2d185b101bd74645492821fe2f9e0daa0 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 Signed-off-by: Thomas Devoogdt --- v2: added -std=gnu11 (allow inline int declaration in if loop, 99 caused some directives problems) v3: enabled host-zlib, needed for librsvg v4: also added gnu11 for host-cairo compiling (fixes my compilation on a gcc 4.9.2 based system) v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v6: fix host-zlib option (again) v7: reworked patch by moving the old config options to legacy and by restoring their original order --- Config.in.legacy | 35 ++++ ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 +++++++ ...p-IPC_RMID_DEFERRED_RELEASE-check-wh.patch | 41 +++++ package/cairo/Config.in | 28 +-- package/cairo/cairo.mk | 160 +++++------------- package/libgtk2/Config.in | 5 +- package/libgtk3/Config.in | 5 +- package/librsvg/Config.in | 2 +- package/libsvg-cairo/Config.in | 2 +- package/rrdtool/Config.in | 4 +- 10 files changed, 194 insertions(+), 150 deletions(-) create mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch create mode 100644 package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/Config.in.legacy b/Config.in.legacy index 82387338d9..431552afe7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,41 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_CAIRO_SVG + bool "cairo svg support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_PNG + help + Cairo SVG is compiled together with PNG, so no need to have this config. + +config BR2_PACKAGE_CAIRO_SCRIPT + bool "cairo script support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo script got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PS + bool "cairo postscript support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PS got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PDF + bool "cairo pdf support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PDF got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_XML + bool "cairo xml support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo XML got merged in to cairo zlib with the introduction of meson. + config BR2_KERNEL_HEADERS_4_14 bool "kernel headers version 4.14.x are no longer supported" select BR2_LEGACY diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch new file mode 100644 index 0000000000..193a210391 --- /dev/null +++ b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch @@ -0,0 +1,62 @@ +From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +Date: Thu, 25 Feb 2021 10:52:45 +0000 +Subject: [PATCH] meson: allow skipping of run check for + IPC_RMID_DEFERRED_RELEASE + +The run check is particularly annoying in cross-compile scenarios, +so allow bypassing the check by having the user provide the value +via a cross file or native file: + + [properties] + ipc_rmid_deferred_release = true + +Closes #408 + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index b159b4071..5f593e54d 100644 +--- a/meson.build ++++ b/meson.build +@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() + ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], + ] + deps += [x11_dep, xext_dep] +- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), +- dependencies: [x11_dep, xext_dep], +- name: 'shmctl IPC_RMID allowes subsequent attaches') + +- if res.returncode() == 0 +- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) ++ # Can skip the run check by providing the result in a cross file or ++ # native file as bool property value. ++ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ # We don't know the type of prop (bool, string) but need to differentiate ++ # between a set value (bool) or the fallback value (string), so convert to ++ # a string and chec the string value. ++ prop_str = '@0@'.format(prop) ++ if prop_str in ['true', 'false'] ++ ipc_rmid_deferred_release = (prop_str == 'true') ++ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) ++ elif prop_str == 'auto' ++ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), ++ dependencies: [x11_dep, xext_dep], ++ name: 'shmctl IPC_RMID allowes subsequent attaches') ++ ++ ipc_rmid_deferred_release = (res.returncode() == 0) ++ else ++ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) + endif ++ ++ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) + endif + + if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 +-- +2.34.1 + diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch new file mode 100644 index 0000000000..b57379fced --- /dev/null +++ b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch @@ -0,0 +1,41 @@ +From d628c24e757e35e53e6e19fea5f23c93611c9cda Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 5 Feb 2024 17:47:07 +0100 +Subject: [PATCH] meson: always skip IPC_RMID_DEFERRED_RELEASE check when cross + compiling + +../../br-test-pkg/bootlin-armv5-uclibc/build/cairo-1.17.4/meson.build:279:13: +ERROR: Can not run test applications in this cross environment. + +Commit 1bec56ea8a931e1ae1c74cc740134497ec365267 added support to define +ipc_rmid_deferred_release in a cross-compile config, but still kept +the default to auto, which anyhow results in an error when cross-compiling. + +Fix that by always assuming 'true', the compilation might fail if IPC_RMID, +is not defined, but that is perhaps desirable. + +See https://www.man7.org/linux/man-pages/man2/shmctl.2.html for more info +about the call defined in meson-cc-tests/ipc_rmid_deferred_release.c + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9100152ee..1de0fac0d 100644 +--- a/meson.build ++++ b/meson.build +@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found() + + # Can skip the run check by providing the result in a cross file or + # native file as bool property value. +- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'true' : 'auto') + # We don't know the type of prop (bool, string) but need to differentiate + # between a set value (bool) or the fallback value (string), so convert to + # a string and check the string value. +-- +2.34.1 + diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 0c87a2904b..c41a12fe81 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_CAIRO select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7 help Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include @@ -15,34 +16,15 @@ config BR2_PACKAGE_CAIRO if BR2_PACKAGE_CAIRO -config BR2_PACKAGE_CAIRO_PS - bool "postscript support" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_CAIRO_PDF - -config BR2_PACKAGE_CAIRO_PDF - bool "pdf support" - select BR2_PACKAGE_ZLIB - config BR2_PACKAGE_CAIRO_PNG - bool "png support" + bool "png support (png and svg surfaces)" select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_ZLIB - -config BR2_PACKAGE_CAIRO_SCRIPT - bool "script support" - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_CAIRO_SVG - bool "svg support" - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PDF config BR2_PACKAGE_CAIRO_TEE bool "tee support" -config BR2_PACKAGE_CAIRO_XML - bool "xml support" - select BR2_PACKAGE_CAIRO_PNG +config BR2_PACKAGE_CAIRO_ZLIB + bool "zlib support (script, ps, pdf, and xml surfaces)" + select BR2_PACKAGE_ZLIB endif diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 4515b76075..3d2a67a6c5 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -17,168 +17,96 @@ CAIRO_IGNORE_CVES += CVE-2019-6462 # 0002-Fix-mask-usage-in-image-compositor.patch CAIRO_IGNORE_CVES += CVE-2020-35492 -CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" +CAIRO_CFLAGS = $(TARGET_CFLAGS) +CAIRO_LDFLAGS = $(TARGET_LDFLAGS) # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) -CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" +CAIRO_CFLAGS += -mxgot endif # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CAIRO_LIBS += -latomic +CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no - -CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman + -Dfontconfig=enabled \ + -Dtests=disabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 +CAIRO_DEPENDENCIES = \ + host-pkgconf \ + fontconfig \ + pixman # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no \ - --disable-directfb \ - --enable-ft \ - --enable-gobject \ - --disable-glesv2 \ - --disable-vg \ - --disable-xlib \ - --disable-xcb \ - --without-x \ - --disable-xlib-xrender \ - --disable-ps \ - --disable-pdf \ - --enable-png \ - --enable-script \ - --disable-svg \ - --disable-tee \ - --disable-xml + -Dfontconfig=enabled \ + -Dfreetype=enabled \ + -Dpng=enabled \ + -Dtee=disabled \ + -Dxcb=disabled \ + -Dxlib=disabled \ + -Dzlib=enabled \ + -Dtests=disabled \ + -Dglib=enabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ host-fontconfig \ host-libglib2 \ host-libpng \ host-pixman \ - host-pkgconf + host-pkgconf \ + host-zlib -# DirectFB svg support rely on Cairo and Cairo DirectFB support depends on -# DirectFB. Break circular dependency by disabling DirectFB support in Cairo -# (which is experimental) -ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx) -CAIRO_CONF_OPTS += --enable-directfb -CAIRO_DEPENDENCIES += directfb -else -CAIRO_CONF_OPTS += --disable-directfb +ifeq ($(BR2_PACKAGE_LZO),y) +CAIRO_DEPENDENCIES += lzo endif ifeq ($(BR2_PACKAGE_FREETYPE),y) -CAIRO_CONF_OPTS += --enable-ft +CAIRO_CONF_OPTS += -Dfreetype=enabled CAIRO_DEPENDENCIES += freetype else -CAIRO_CONF_OPTS += --disable-ft -endif - -ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) -CAIRO_DEPENDENCIES += libexecinfo -CAIRO_LIBS += -lexecinfo +CAIRO_CONF_OPTS += -Dfreetype=disabled endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -CAIRO_CONF_OPTS += --enable-gobject +CAIRO_CONF_OPTS += -Dglib=enabled CAIRO_DEPENDENCIES += libglib2 else -CAIRO_CONF_OPTS += --disable-gobject -endif - -# Can use GL or GLESv2 but not both -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -CAIRO_CONF_OPTS += --enable-gl --disable-glesv2 -CAIRO_DEPENDENCIES += libgl -else -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -CAIRO_CONF_OPTS += --disable-gl --enable-glesv2 -CAIRO_DEPENDENCIES += libgles -else -CAIRO_CONF_OPTS += --disable-gl --disable-glesv2 -endif -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -CAIRO_CONF_OPTS += --enable-vg -CAIRO_DEPENDENCIES += libopenvg -else -CAIRO_CONF_OPTS += --disable-vg -endif - -ifeq ($(BR2_PACKAGE_LZO),y) -CAIRO_DEPENDENCIES += lzo +CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x -CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext -else -CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -CAIRO_CONF_OPTS += --enable-xlib-xrender -CAIRO_DEPENDENCIES += xlib_libXrender -else -CAIRO_CONF_OPTS += --disable-xlib-xrender -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PS),y) -CAIRO_CONF_OPTS += --enable-ps -CAIRO_DEPENDENCIES += zlib +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += --disable-ps -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PDF),y) -CAIRO_CONF_OPTS += --enable-pdf -CAIRO_DEPENDENCIES += zlib -else -CAIRO_CONF_OPTS += --disable-pdf +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -CAIRO_CONF_OPTS += --enable-png +CAIRO_CONF_OPTS += -Dpng=enabled CAIRO_DEPENDENCIES += libpng else -CAIRO_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y) -CAIRO_CONF_OPTS += --enable-script -else -CAIRO_CONF_OPTS += --disable-script -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SVG),y) -CAIRO_CONF_OPTS += --enable-svg -else -CAIRO_CONF_OPTS += --disable-svg +CAIRO_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_TEE),y) -CAIRO_CONF_OPTS += --enable-tee +CAIRO_CONF_OPTS += -Dtee=enabled else -CAIRO_CONF_OPTS += --disable-tee +CAIRO_CONF_OPTS += -Dtee=disabled endif -ifeq ($(BR2_PACKAGE_CAIRO_XML),y) -CAIRO_CONF_OPTS += --enable-xml +ifeq ($(BR2_PACKAGE_CAIRO_ZLIB),y) +CAIRO_CONF_OPTS += -Dzlib=enabled +CAIRO_DEPENDENCIES += zlib else -CAIRO_CONF_OPTS += --disable-xml +CAIRO_CONF_OPTS += -Dzlib=disabled endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index f2888b2f51..f8821ba246 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -9,9 +9,8 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO select BR2_PACKAGE_GDK_PIXBUF diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 34b8d49eb3..9f9a081ecb 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -25,9 +25,8 @@ config BR2_PACKAGE_LIBGTK3 BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 270b524b37..d74359dfc9 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_SCRIPT + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_HOST_RUSTC select BR2_PACKAGE_LIBGLIB2 diff --git a/package/libsvg-cairo/Config.in b/package/libsvg-cairo/Config.in index 9577c69bf0..4602e93c2a 100644 --- a/package/libsvg-cairo/Config.in +++ b/package/libsvg-cairo/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBSVG_CAIRO bool "libsvg-cairo" select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBSVG help Libsvg-cairo provides the ability to render SVG content from diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in index 5ffdc92618..d954fd1214 100644 --- a/package/rrdtool/Config.in +++ b/package/rrdtool/Config.in @@ -19,10 +19,8 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PDF select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_PANGO help This enables the graphing capabilities ('rrdgraph'). -- 2.34.1 From thomas at devoogdt.com Mon Feb 5 21:23:00 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 5 Feb 2024 22:23:00 +0100 Subject: [Buildroot] [PATCH v7 2/2] package/cairo: bump to 1.18.0 In-Reply-To: <20240205212300.3178519-1-thomas@devoogdt.com> References: <87zfwfrmoe.fsf@48ers.dk> <20240205212300.3178519-1-thomas@devoogdt.com> Message-ID: <20240205212300.3178519-2-thomas@devoogdt.com> News: - https://www.cairographics.org/news/cairo-1.17.8/ - https://www.cairographics.org/news/cairo-1.18.0/ Some options are renamed/dropped so fix that along. - GL and GLES drawing has been dropped in 1.17.8. - The XML surface has been removed in 1.18.0. - xlib-xcb was added [1] Patches: - drop 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch, upstream: [2] - drop 0002-Fix-mask-usage-in-image-compositor.patch, upstream: [3] - drop 0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch, upstream: [4] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/3468c67fe91f0c37e0ec5d335082653a6fa609b6 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be [4]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 Signed-off-by: Thomas Devoogdt --- v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v7: rebased on v7-0001-package-cairo-move-to-the-meson-build-system --- ...or_tolerance_normalized-fix-infinite.patch | 39 ------------ ...rivate.h-fix-missing-FT_Color-error.patch} | 0 ...2-Fix-mask-usage-in-image-compositor.patch | 56 ----------------- ...-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} | 0 ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 ------------------- package/cairo/cairo.hash | 6 +- package/cairo/cairo.mk | 21 ++++--- 7 files changed, 14 insertions(+), 170 deletions(-) delete mode 100644 package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch rename package/cairo/{0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch => 0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch} (100%) delete mode 100644 package/cairo/0002-Fix-mask-usage-in-image-compositor.patch rename package/cairo/{0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch => 0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} (100%) delete mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch diff --git a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch deleted file mode 100644 index 078e90fa42..0000000000 --- a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Sun, 1 Aug 2021 11:16:03 +0000 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - -[Retrieved from: -https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] -Signed-off-by: Quentin Schulz ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -2.38.1 - diff --git a/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch b/package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch similarity index 100% rename from package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch rename to package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch diff --git a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch deleted file mode 100644 index 54a95593c5..0000000000 --- a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - -[Retrieved from -https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be] -[Removed changes in test/ directory to remove binary diff so that the -patch can be applied by `patch` tool] -Signed-off-by: Quentin Schulz ---- - src/cairo-image-compositor.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index bbf4cf228..2352c478e 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - unsigned num_spans) - { - cairo_image_span_renderer_t *r = abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); - int x0; - - if (num_spans == 0) - return CAIRO_STATUS_SUCCESS; - - x0 = spans[0].x; -- m = r->_buf; -+ m = base; - do { - int len = spans[1].x - spans[0].x; - if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { -@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - spans[0].x, y, - spans[1].x - spans[0].x, h); - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else if (spans[0].coverage == 0x0) { - if (spans[0].x != x0) { -@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - #endif - } - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else { - *m++ = spans[0].coverage; --- -2.38.1 - diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch similarity index 100% rename from package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch rename to package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch deleted file mode 100644 index 193a210391..0000000000 --- a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Thu, 25 Feb 2021 10:52:45 +0000 -Subject: [PATCH] meson: allow skipping of run check for - IPC_RMID_DEFERRED_RELEASE - -The run check is particularly annoying in cross-compile scenarios, -so allow bypassing the check by having the user provide the value -via a cross file or native file: - - [properties] - ipc_rmid_deferred_release = true - -Closes #408 - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index b159b4071..5f593e54d 100644 ---- a/meson.build -+++ b/meson.build -@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() - ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], - ] - deps += [x11_dep, xext_dep] -- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -- dependencies: [x11_dep, xext_dep], -- name: 'shmctl IPC_RMID allowes subsequent attaches') - -- if res.returncode() == 0 -- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) -+ # Can skip the run check by providing the result in a cross file or -+ # native file as bool property value. -+ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') -+ # We don't know the type of prop (bool, string) but need to differentiate -+ # between a set value (bool) or the fallback value (string), so convert to -+ # a string and chec the string value. -+ prop_str = '@0@'.format(prop) -+ if prop_str in ['true', 'false'] -+ ipc_rmid_deferred_release = (prop_str == 'true') -+ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) -+ elif prop_str == 'auto' -+ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -+ dependencies: [x11_dep, xext_dep], -+ name: 'shmctl IPC_RMID allowes subsequent attaches') -+ -+ ipc_rmid_deferred_release = (res.returncode() == 0) -+ else -+ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) - endif -+ -+ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) - endif - - if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 --- -2.34.1 - diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index fca9ff678c..df9c693bad 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,7 +1,5 @@ -# From https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz.sha1 -sha1 68712ae1039b114347be3b7200bc1c901d47a636 cairo-1.17.4.tar.xz -# Calculated based on the hash above -sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 cairo-1.17.4.tar.xz +# From https://www.cairographics.org/releases/cairo-1.18.0.tar.xz.sha256sum +sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 cairo-1.18.0.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 3d2a67a6c5..4ace04ebbe 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,19 +4,14 @@ # ################################################################################ -CAIRO_VERSION = 1.17.4 +CAIRO_VERSION = 1.18.0 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics -CAIRO_SITE = http://cairographics.org/snapshots +CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES -# 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch -CAIRO_IGNORE_CVES += CVE-2019-6462 -# 0002-Fix-mask-usage-in-image-compositor.patch -CAIRO_IGNORE_CVES += CVE-2020-35492 - CAIRO_CFLAGS = $(TARGET_CFLAGS) CAIRO_LDFLAGS = $(TARGET_LDFLAGS) @@ -32,9 +27,13 @@ CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ + -Dquartz=disabled \ -Dtests=disabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 CAIRO_DEPENDENCIES = \ host-pkgconf \ @@ -43,9 +42,11 @@ CAIRO_DEPENDENCIES = \ # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ -Dfreetype=enabled \ -Dpng=enabled \ + -Dquartz=disabled \ -Dtee=disabled \ -Dxcb=disabled \ -Dxlib=disabled \ @@ -53,6 +54,8 @@ HOST_CAIRO_CONF_OPTS = \ -Dtests=disabled \ -Dglib=enabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ @@ -82,10 +85,10 @@ CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled -Dxlib-xcb=enabled CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled -Dxlib-xcb=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 5 21:23:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:23:15 +0100 Subject: [Buildroot] [git commit] package/shadow: bump to version 4.14.3 Message-ID: <20240205212324.27EE086DE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a01774d9897310c00a0945865f5a6d5167dfca3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Also, the new version has an optional dependency on libbsd. Signed-off-by: Raphael Pavlidis Signed-off-by: Thomas Petazzoni --- package/shadow/0001-Fix-yescrypt-support.patch | 38 -------------------------- package/shadow/shadow.hash | 5 ++-- package/shadow/shadow.mk | 9 +++++- 3 files changed, 11 insertions(+), 41 deletions(-) diff --git a/package/shadow/0001-Fix-yescrypt-support.patch b/package/shadow/0001-Fix-yescrypt-support.patch deleted file mode 100644 index 19427676ca..0000000000 --- a/package/shadow/0001-Fix-yescrypt-support.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7a63017b3c873a59e3482322b7824160a8c8ca67 Mon Sep 17 00:00:00 2001 -11;rgb:f6f6/f5f5/f4f4From: Bernd Kuhls -Date: Sun, 9 Jul 2023 10:55:03 +0200 -Subject: [PATCH] Fix yescrypt support - -Fixes build error: -newusers.c: In function 'update_passwd': -newusers.c:433:21: error: 'sflg' undeclared (first use in this function); did you mean 'rflg'? - -introduced by -https://github.com/shadow-maint/shadow/commit/5cd04d03f94622c12220d4a6352824af081b8531 -which forgot to define sflg for these configure options: - ---without-sha-crypt --without-bcrypt --with-yescrypt - -Upstream: https://github.com/shadow-maint/shadow/commit/29da702491eea314b915ea9c7a83c9af80cf5797 - -Signed-off-by: Bernd Kuhls ---- - src/newusers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/newusers.c b/src/newusers.c -index 7cb8434b..08f79798 100644 ---- a/src/newusers.c -+++ b/src/newusers.c -@@ -60,7 +60,7 @@ static bool rflg = false; /* create a system account */ - #ifndef USE_PAM - static /*@null@*//*@observer@*/char *crypt_method = NULL; - #define cflg (NULL != crypt_method) --#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) -+#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT) - static bool sflg = false; - #endif - #ifdef USE_SHA_CRYPT --- -2.39.2 - diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash index 2e5c4a8168..4689a994de 100644 --- a/package/shadow/shadow.hash +++ b/package/shadow/shadow.hash @@ -1,3 +1,4 @@ -# Locally computed -sha256 9afe245d79a2e7caac5f1ed62519b17416b057ec89df316df1c3935502f9dd2c shadow-4.13.tar.xz +# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.3/shadow-4.14.3.tar.xz.asc +# with key A9348594CE31283A826FBDD8D57633D441E25BB5 +sha256 6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2 shadow-4.14.3.tar.xz sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 4bc3cce037..03eb16a3f4 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHADOW_VERSION = 4.13 +SHADOW_VERSION = 4.14.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 @@ -120,6 +120,13 @@ else SHADOW_CONF_OPTS += --without-yescrypt endif +ifeq ($(BR2_PACKAGE_LIBBSD),y) +SHADOW_CONF_OPTS += --with-libbsd +SHADOW_DEPENDENCIES += libbsd +else +SHADOW_CONF_OPTS += --without-libbsd +endif + define SHADOW_PERMISSIONS /usr/bin/chage f 4755 0 0 - - - - - /usr/bin/chfn f 4755 0 0 - - - - - From thomas.petazzoni at bootlin.com Mon Feb 5 21:24:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:24:27 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/shadow: bump to version 4.14.3 In-Reply-To: <20240117192342.2633-1-raphael.pavlidis@gmail.com> References: <20240117192342.2633-1-raphael.pavlidis@gmail.com> Message-ID: <20240205222427.748f3859@windsurf> On Wed, 17 Jan 2024 19:23:42 +0000 Raphael Pavlidis wrote: > Also, the new version has an optional dependency on libbsd. > > Signed-off-by: Raphael Pavlidis > --- > .../shadow/0001-Fix-yescrypt-support.patch | 38 ------------------- > package/shadow/shadow.hash | 5 ++- > package/shadow/shadow.mk | 9 ++++- > 3 files changed, 11 insertions(+), 41 deletions(-) > delete mode 100644 package/shadow/0001-Fix-yescrypt-support.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:24:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:24:21 +0100 Subject: [Buildroot] [git commit] package/collectd: fix grpc build Message-ID: <20240205212520.0204A86DE6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=282b951ed3315c6e2a37725f0bc033bfab4c72cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following grpc build failure raised since bump of libabseil-cpp to version 20230802.1 in commit aea790392af5358568a4f1c5d2dd9f1adfb29109: configure:25127: checking grpc++/grpc++.h usability configure:25127: /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc64-linux-g++ -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O1 -g0 -D_FORTIFY_SOURCE=2 -std=c++11 -DNOMINMAX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.cpp >&5 In file included from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/config.h:86, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/const_init.h:25, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/synchronization/mutex.h:67, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/impl/codegen/sync.h:32, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/completion_queue.h:41, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/channel.h:25, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/grpcpp.h:52, from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpc++/grpc++.h:26, from conftest.cpp:167: /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than C++14 are not supported." 79 | #error "C++ versions less than C++14 are not supported." | ^~~~~ [...] grpc . . . . . . . . no (libgrpc++ not found) (dependency error) [...] configure: error: "Some plugins are missing dependencies - see the summary above for details" Fixes: - http://autobuild.buildroot.org/results/e2cf909ab3c356f1881fd18cfa039e87faa10d7d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0002-configure.ac-fix-grpc-build.patch | 96 ++++++++++++++++++++++ package/collectd/collectd.mk | 2 + 2 files changed, 98 insertions(+) diff --git a/package/collectd/0002-configure.ac-fix-grpc-build.patch b/package/collectd/0002-configure.ac-fix-grpc-build.patch new file mode 100644 index 0000000000..00de673e89 --- /dev/null +++ b/package/collectd/0002-configure.ac-fix-grpc-build.patch @@ -0,0 +1,96 @@ +From d355618813bb8180e460ba45a0ebd3ce5183e267 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 22 Jan 2024 22:15:21 +0100 +Subject: [PATCH] configure.ac: fix grpc build + +abseil and other google tools are now subject to +"Google's Foundational C++ Support Policy" [0][1]. This currently +mandates gcc 7.3.1 and C++14 as minimum versions. So replace -std=c++11 +by -std=c++14 to fix following build failure: + +checking whether /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc64-linux-g++ accepts -std=c++11 +configure:25105: result: yes +configure:25127: checking grpc++/grpc++.h usability +configure:25127: /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc64-linux-g++ -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O1 -g0 -D_FORTIFY_SOURCE=2 -std=c++11 -DNOMINMAX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.cpp >&5 +In file included from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/config.h:86, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/const_init.h:25, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/synchronization/mutex.h:67, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/impl/codegen/sync.h:32, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/completion_queue.h:41, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/channel.h:25, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/grpcpp.h:52, + from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpc++/grpc++.h:26, + from conftest.cpp:167: +/home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than C++14 are not supported." + 79 | #error "C++ versions less than C++14 are not supported." + | ^~~~~ + +[0] https://github.com/abseil/abseil-cpp/releases/tag/20230125.0 +[1] https://github.com/google/oss-policies-info/blob/b842c39db88e6569dfe2cf98be434b03507cb503/foundational-cxx-support-matrix.md + +Fixes: + - http://autobuild.buildroot.org/results/e2cf909ab3c356f1881fd18cfa039e87faa10d7d + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/collectd/collectd/commit/d355618813bb8180e460ba45a0ebd3ce5183e267 +--- + configure.ac | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c816d3dbbc..dad27f53b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2853,20 +2853,20 @@ PKG_CHECK_MODULES([GRPCPP], [grpc++], + fi + + if test "x$withval" != "xno"; then +- AC_MSG_CHECKING([whether $CXX accepts -std=c++11]) +- if test_cxx_flags -std=c++11; then ++ AC_MSG_CHECKING([whether $CXX accepts -std=c++14]) ++ if test_cxx_flags -std=c++14; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- with_libgrpcpp="no (requires C++11 support)" +- with_libprotobuf="no ( requires C++11 support)" ++ with_libgrpcpp="no (requires C++14 support)" ++ with_libprotobuf="no ( requires C++14 support)" + fi + fi + + if test "x$with_libgrpcpp" = "xyes"; then + AC_LANG_PUSH(C++) + SAVE_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="-std=c++11 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS" ++ CPPFLAGS="-std=c++14 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS" + AC_CHECK_HEADERS([grpc++/grpc++.h], + [with_libgrpcpp="yes"], + [with_libgrpcpp="no ( not found)"] +@@ -2880,7 +2880,7 @@ if test "x$with_libgrpcpp" = "xyes"; then + SAVE_CPPFLAGS="$CPPFLAGS" + SAVE_LDFLAGS="$LDFLAGS" + SAVE_LIBS="$LIBS" +- CPPFLAGS="-std=c++11 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS" ++ CPPFLAGS="-std=c++14 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS $CPPFLAGS" + LDFLAGS="$with_libgrpcpp_ldflags" + if test "x$GRPCPP_LIBS" = "x"; then + LIBS="-lgrpc++" +@@ -2908,7 +2908,7 @@ if test "x$with_libgrpcpp" = "xyes"; then + AC_LANG_POP(C++) + fi + +-BUILD_WITH_LIBGRPCPP_CPPFLAGS="-std=c++11 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS" ++BUILD_WITH_LIBGRPCPP_CPPFLAGS="-std=c++14 $with_libgrpcpp_cppflags $GRPCPP_CFLAGS" + BUILD_WITH_LIBGRPCPP_LDFLAGS="$with_libgrpcpp_ldflags" + BUILD_WITH_LIBGRPCPP_LIBS="$GRPCPP_LIBS" + AC_SUBST([BUILD_WITH_LIBGRPCPP_CPPFLAGS]) +@@ -4852,7 +4852,7 @@ if test "x$withval" != "xno"; then + AC_CHECK_LIB([protobuf], [main], + [ + SAVE_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="-std=c++11 $with_libprotobuf_cppflags $PROTOBUF_CFLAGS" ++ CPPFLAGS="-std=c++14 $with_libprotobuf_cppflags $PROTOBUF_CFLAGS" + if test "x$PROTOBUF_LIBS" = "x" + then + PROTOBUF_LIBS="-lprotobuf" diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 6c993827c4..76f622b8db 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -14,6 +14,8 @@ COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins) COLLECTD_LICENSE_FILES = COPYING COLLECTD_CPE_ID_VENDOR = collectd COLLECTD_SELINUX_MODULES = apache collectd +# We're patching configure.ac +COLLECTD_AUTORECONF = YES # These require unmet dependencies, are fringe, pointless or deprecated COLLECTD_PLUGINS_DISABLE = \ From thomas.petazzoni at bootlin.com Mon Feb 5 21:25:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:25:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/collectd: fix grpc build In-Reply-To: <20240122222351.477993-1-fontaine.fabrice@gmail.com> References: <20240122222351.477993-1-fontaine.fabrice@gmail.com> Message-ID: <20240205222517.2b876f18@windsurf> On Mon, 22 Jan 2024 23:23:51 +0100 Fabrice Fontaine wrote: > Fix the following grpc build failure raised since bump of libabseil-cpp > to version 20230802.1 in commit > aea790392af5358568a4f1c5d2dd9f1adfb29109: > > configure:25127: checking grpc++/grpc++.h usability > configure:25127: /home/buildroot/autobuild/instance-0/output-1/host/bin/sparc64-linux-g++ -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O1 -g0 -D_FORTIFY_SOURCE=2 -std=c++11 -DNOMINMAX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.cpp >&5 > In file included from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/config.h:86, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/const_init.h:25, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/synchronization/mutex.h:67, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/impl/codegen/sync.h:32, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/completion_queue.h:41, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/channel.h:25, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpcpp/grpcpp.h:52, > from /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/grpc++/grpc++.h:26, > from conftest.cpp:167: > /home/buildroot/autobuild/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/absl/base/policy_checks.h:79:2: error: #error "C++ versions less than C++14 are not supported." > 79 | #error "C++ versions less than C++14 are not supported." > | ^~~~~ > > [...] > > grpc . . . . . . . . no (libgrpc++ not found) (dependency error) > > [...] > > configure: error: "Some plugins are missing dependencies - see the summary above for details" > > Fixes: > - http://autobuild.buildroot.org/results/e2cf909ab3c356f1881fd18cfa039e87faa10d7d > > Signed-off-by: Fabrice Fontaine > --- > .../0002-configure.ac-fix-grpc-build.patch | 96 +++++++++++++++++++ > package/collectd/collectd.mk | 2 + > 2 files changed, 98 insertions(+) > create mode 100644 package/collectd/0002-configure.ac-fix-grpc-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:25:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:25:30 +0100 Subject: [Buildroot] [git commit] package/flutter-pi: enable vulkan if possible Message-ID: <20240205212811.BE6C286DF8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a627753d35d2ba97d5bddfc2491ca8b5577eba49 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Enable the flutter-pi vulkan option if a suitable driver is enabled. Currently, only Mesa provides Vulkan drivers. As such, gating the feature behind the BR2_PACKAGE_MESA3D_VULKAN_DRIVER option is reasonable at the moment and is done by three other packages already: flutter-engine, ivi-home screen, and wlroots. Furthermore, a dependency on BR2_PACKAGE_VULKAN_LOADER is needed as the vulkan-loader package provides the vulkan.pc file, which the configure step relies upon. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/flutter-pi/flutter-pi.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk index f1812b154e..9edc62e7ac 100644 --- a/package/flutter-pi/flutter-pi.mk +++ b/package/flutter-pi/flutter-pi.mk @@ -24,7 +24,6 @@ FLUTTER_PI_CONF_OPTS = \ -DENABLE_TESTS=OFF \ -DENABLE_TSAN=OFF \ -DENABLE_UBSAN=OFF \ - -DENABLE_VULKAN=OFF \ -DFILESYSTEM_LAYOUT=meta-flutter \ -DLINT_EGL_HEADERS=OFF \ -DTRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN=OFF \ @@ -75,6 +74,13 @@ else FLUTTER_PI_CONF_OPTS += -DBUILD_TEXT_INPUT_PLUGIN=OFF endif +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER)$(BR2_PACKAGE_VULKAN_LOADER),yy) +FLUTTER_PI_DEPENDENCIES += mesa3d vulkan-loader +FLUTTER_PI_CONF_OPTS += -DENABLE_VULKAN=ON +else +FLUTTER_PI_CONF_OPTS += -DENABLE_VULKAN=OFF +endif + ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) FLUTTER_PI_CONF_OPTS += -DENABLE_OPENGL=ON else From thomas.petazzoni at bootlin.com Mon Feb 5 21:26:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:26:04 +0100 Subject: [Buildroot] [git commit] package/wlroots: update patch with upstream status Message-ID: <20240205212811.D248F86DFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=840849afff07f91668f88570c5055eaf6687deb2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been rejected upstream, and the initial pull request was moved to the freedesktop gitlab. Update the patch to reflect these changes. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 2fc974e2f2..31ed5bb5cc 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1395,7 +1395,6 @@ package/wilc-driver/0005-Fix-cast-warnings.patch Upstream package/wipe/0001-musl.patch Upstream package/wireless_tools/0001-remove-bzero.patch Upstream package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch Upstream -package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch Upstream package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch Upstream package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch Upstream package/wpa_supplicant/ifupdown.sh Shellcheck diff --git a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch b/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch index 0ba078708a..0e1ae9d87a 100644 --- a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch +++ b/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch @@ -5,8 +5,10 @@ Subject: [PATCH] Add feature macros to more C files These source files use "struct timespec", which is POSIX 1993.09. -Signed-off-by: Paul Cercueil +Upstream: Rejected (Upstream does not want these workarounds) +see: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2493 +Signed-off-by: Paul Cercueil [Retrieved from: https://github.com/swaywm/wlroots/pull/2493] Signed-off-by: Fabrice Fontaine --- From thomas.petazzoni at bootlin.com Mon Feb 5 21:25:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:25:50 +0100 Subject: [Buildroot] [git commit] package/wlroots: vulkan renderer depends on vulkan loader Message-ID: <20240205212811.C762386DF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f27b0322a5019c4016d2800ccc1b586eb6af7bd5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Without the vulkan-loader package present, the configure step fails with the following error message: ``` Run-time dependency vulkan found: NO (tried pkgconfig and system) Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it. ``` The above error is due to the lack of the vulkan.pc file provided by the vulkan-loader package. A search of autobuild failures containing BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build failures. However, the failure reasons happened before wlroots could compile. One for gerbera-1.10.0 and another for host-rust-1.64.0. Add a dependency on the vulkan-loader package to resolve the above issue. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/wlroots/wlroots.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index bb5c8f497d..fdd2fb8250 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -41,9 +41,9 @@ else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y) +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER)$(BR2_PACKAGE_VULKAN_LOADER),yy) WLROOTS_RENDERERS += vulkan -WLROOTS_DEPENDENCIES += mesa3d +WLROOTS_DEPENDENCIES += mesa3d vulkan-loader endif WLROOTS_CONF_OPTS += \ From thomas.petazzoni at bootlin.com Mon Feb 5 21:28:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:28:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/flutter-pi: enable vulkan if possible In-Reply-To: <20240121205718.155549-1-adam.duskett@amarulasolutions.com> References: <20240121205718.155549-1-adam.duskett@amarulasolutions.com> Message-ID: <20240205222836.3b363b8c@windsurf> Hello Adam, On Sun, 21 Jan 2024 13:57:18 -0700 Adam Duskett wrote: > Enable the flutter-pi vulkan option if a suitable driver is enabled. > Currently, only Mesa provides Vulkan drivers. As such, gating the feature > behind the BR2_PACKAGE_MESA3D_VULKAN_DRIVER option is reasonable at the moment > and is done by three other packages already: > flutter-engine, ivi-home screen, and wlroots. > > Furthermore, a dependency on BR2_PACKAGE_VULKAN_LOADER is needed as the > vulkan-loader package provides the vulkan.pc file, which the configure step > relies upon. > > Signed-off-by: Adam Duskett > --- > package/flutter-pi/flutter-pi.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) Applied to master, thanks. Of course, at some point it would be nice to a vulkan virtual package, but let's do that when we have two supported Vulkan implementations. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:28:47 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:28:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/wlroot: vulkan renderer depends on vulkan loader In-Reply-To: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> Message-ID: <20240205222847.4a492f2f@windsurf> On Sun, 21 Jan 2024 13:42:51 -0700 Adam Duskett wrote: > Without the vulkan-loader package present, the configure step fails with the > following error message: > ``` > Run-time dependency vulkan found: NO (tried pkgconfig and system) > Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it. > ``` > > The above error is due to the lack of the vulkan.pc file provided by the > vulkan-loader package. A search of autobuild failures containing > BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build > failures. However, the failure reasons happened before wlroots could compile. > One for gerbera-1.10.0 and another for host-rust-1.64.0. > > Add a dependency on the vulkan-loader package to resolve the above issue. > > Signed-off-by: Adam Duskett > --- > package/wlroots/wlroots.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:29:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:29:49 +0100 Subject: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status In-Reply-To: <20240121204252.152952-2-adam.duskett@amarulasolutions.com> References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> <20240121204252.152952-2-adam.duskett@amarulasolutions.com> Message-ID: <20240205222949.2805f50f@windsurf> Hello Adam, +Paul Cercueil in Cc, see below. On Sun, 21 Jan 2024 13:42:52 -0700 Adam Duskett wrote: > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been > rejected upstream, and the initial pull request was moved to the > freedesktop gitlab. Update the patch to reflect these changes. > > Signed-off-by: Adam Duskett Thanks, applied! Paul: could you follow-up with upstream (either wlroots, or uclibc, or both) to try to find an acceptable solution so that some day we can drop this patch? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas at devoogdt.com Mon Feb 5 21:30:34 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 5 Feb 2024 22:30:34 +0100 Subject: [Buildroot] [PATCH v8 1/2] package/cairo: move to the meson build system In-Reply-To: <20240205212300.3178519-2-thomas@devoogdt.com> References: <20240205212300.3178519-2-thomas@devoogdt.com> Message-ID: <20240205213035.3180167-1-thomas@devoogdt.com> - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy since they are not selectable anymore in the meson-build options. BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG option already selects that one. This is now in sync with the meson build options. - Note that the dependencies for the various options are slightly changed, but there is not much mentioned about that, the meson introduction is done in one big commit: [1]. - Added xlib_libXrender dependency, which was already required before meson, it just came to my attention since it's a hard error now. - Added two patches to fix cross compiling, upstream: [2]. [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/596a82f2d185b101bd74645492821fe2f9e0daa0 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 Signed-off-by: Thomas Devoogdt --- v2: added -std=gnu11 (allow inline int declaration in if loop, 99 caused some directives problems) v3: enabled host-zlib, needed for librsvg v4: also added gnu11 for host-cairo compiling (fixes my compilation on a gcc 4.9.2 based system) v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v6: fix host-zlib option (again) v7: reworked patch by moving the old config options to legacy and by restoring their original order --- Config.in.legacy | 35 ++++ ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 +++++++ ...p-IPC_RMID_DEFERRED_RELEASE-check-wh.patch | 41 +++++ package/cairo/Config.in | 28 +-- package/cairo/cairo.mk | 160 +++++------------- package/libgtk2/Config.in | 5 +- package/libgtk3/Config.in | 5 +- package/librsvg/Config.in | 2 +- package/libsvg-cairo/Config.in | 2 +- package/rrdtool/Config.in | 4 +- 10 files changed, 194 insertions(+), 150 deletions(-) create mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch create mode 100644 package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/Config.in.legacy b/Config.in.legacy index 82387338d9..431552afe7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,41 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_CAIRO_SVG + bool "cairo svg support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_PNG + help + Cairo SVG is compiled together with PNG, so no need to have this config. + +config BR2_PACKAGE_CAIRO_SCRIPT + bool "cairo script support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo script got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PS + bool "cairo postscript support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PS got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PDF + bool "cairo pdf support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PDF got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_XML + bool "cairo xml support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo XML got merged in to cairo zlib with the introduction of meson. + config BR2_KERNEL_HEADERS_4_14 bool "kernel headers version 4.14.x are no longer supported" select BR2_LEGACY diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch new file mode 100644 index 0000000000..193a210391 --- /dev/null +++ b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch @@ -0,0 +1,62 @@ +From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +Date: Thu, 25 Feb 2021 10:52:45 +0000 +Subject: [PATCH] meson: allow skipping of run check for + IPC_RMID_DEFERRED_RELEASE + +The run check is particularly annoying in cross-compile scenarios, +so allow bypassing the check by having the user provide the value +via a cross file or native file: + + [properties] + ipc_rmid_deferred_release = true + +Closes #408 + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index b159b4071..5f593e54d 100644 +--- a/meson.build ++++ b/meson.build +@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() + ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], + ] + deps += [x11_dep, xext_dep] +- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), +- dependencies: [x11_dep, xext_dep], +- name: 'shmctl IPC_RMID allowes subsequent attaches') + +- if res.returncode() == 0 +- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) ++ # Can skip the run check by providing the result in a cross file or ++ # native file as bool property value. ++ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ # We don't know the type of prop (bool, string) but need to differentiate ++ # between a set value (bool) or the fallback value (string), so convert to ++ # a string and chec the string value. ++ prop_str = '@0@'.format(prop) ++ if prop_str in ['true', 'false'] ++ ipc_rmid_deferred_release = (prop_str == 'true') ++ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) ++ elif prop_str == 'auto' ++ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), ++ dependencies: [x11_dep, xext_dep], ++ name: 'shmctl IPC_RMID allowes subsequent attaches') ++ ++ ipc_rmid_deferred_release = (res.returncode() == 0) ++ else ++ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) + endif ++ ++ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) + endif + + if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 +-- +2.34.1 + diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch new file mode 100644 index 0000000000..b57379fced --- /dev/null +++ b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch @@ -0,0 +1,41 @@ +From d628c24e757e35e53e6e19fea5f23c93611c9cda Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 5 Feb 2024 17:47:07 +0100 +Subject: [PATCH] meson: always skip IPC_RMID_DEFERRED_RELEASE check when cross + compiling + +../../br-test-pkg/bootlin-armv5-uclibc/build/cairo-1.17.4/meson.build:279:13: +ERROR: Can not run test applications in this cross environment. + +Commit 1bec56ea8a931e1ae1c74cc740134497ec365267 added support to define +ipc_rmid_deferred_release in a cross-compile config, but still kept +the default to auto, which anyhow results in an error when cross-compiling. + +Fix that by always assuming 'true', the compilation might fail if IPC_RMID, +is not defined, but that is perhaps desirable. + +See https://www.man7.org/linux/man-pages/man2/shmctl.2.html for more info +about the call defined in meson-cc-tests/ipc_rmid_deferred_release.c + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9100152ee..1de0fac0d 100644 +--- a/meson.build ++++ b/meson.build +@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found() + + # Can skip the run check by providing the result in a cross file or + # native file as bool property value. +- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'true' : 'auto') + # We don't know the type of prop (bool, string) but need to differentiate + # between a set value (bool) or the fallback value (string), so convert to + # a string and check the string value. +-- +2.34.1 + diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 0c87a2904b..c41a12fe81 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_CAIRO select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7 help Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include @@ -15,34 +16,15 @@ config BR2_PACKAGE_CAIRO if BR2_PACKAGE_CAIRO -config BR2_PACKAGE_CAIRO_PS - bool "postscript support" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_CAIRO_PDF - -config BR2_PACKAGE_CAIRO_PDF - bool "pdf support" - select BR2_PACKAGE_ZLIB - config BR2_PACKAGE_CAIRO_PNG - bool "png support" + bool "png support (png and svg surfaces)" select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_ZLIB - -config BR2_PACKAGE_CAIRO_SCRIPT - bool "script support" - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_CAIRO_SVG - bool "svg support" - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PDF config BR2_PACKAGE_CAIRO_TEE bool "tee support" -config BR2_PACKAGE_CAIRO_XML - bool "xml support" - select BR2_PACKAGE_CAIRO_PNG +config BR2_PACKAGE_CAIRO_ZLIB + bool "zlib support (script, ps, pdf, and xml surfaces)" + select BR2_PACKAGE_ZLIB endif diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 4515b76075..3d2a67a6c5 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -17,168 +17,96 @@ CAIRO_IGNORE_CVES += CVE-2019-6462 # 0002-Fix-mask-usage-in-image-compositor.patch CAIRO_IGNORE_CVES += CVE-2020-35492 -CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" +CAIRO_CFLAGS = $(TARGET_CFLAGS) +CAIRO_LDFLAGS = $(TARGET_LDFLAGS) # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) -CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" +CAIRO_CFLAGS += -mxgot endif # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CAIRO_LIBS += -latomic +CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no - -CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman + -Dfontconfig=enabled \ + -Dtests=disabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 +CAIRO_DEPENDENCIES = \ + host-pkgconf \ + fontconfig \ + pixman # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no \ - --disable-directfb \ - --enable-ft \ - --enable-gobject \ - --disable-glesv2 \ - --disable-vg \ - --disable-xlib \ - --disable-xcb \ - --without-x \ - --disable-xlib-xrender \ - --disable-ps \ - --disable-pdf \ - --enable-png \ - --enable-script \ - --disable-svg \ - --disable-tee \ - --disable-xml + -Dfontconfig=enabled \ + -Dfreetype=enabled \ + -Dpng=enabled \ + -Dtee=disabled \ + -Dxcb=disabled \ + -Dxlib=disabled \ + -Dzlib=enabled \ + -Dtests=disabled \ + -Dglib=enabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ host-fontconfig \ host-libglib2 \ host-libpng \ host-pixman \ - host-pkgconf + host-pkgconf \ + host-zlib -# DirectFB svg support rely on Cairo and Cairo DirectFB support depends on -# DirectFB. Break circular dependency by disabling DirectFB support in Cairo -# (which is experimental) -ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx) -CAIRO_CONF_OPTS += --enable-directfb -CAIRO_DEPENDENCIES += directfb -else -CAIRO_CONF_OPTS += --disable-directfb +ifeq ($(BR2_PACKAGE_LZO),y) +CAIRO_DEPENDENCIES += lzo endif ifeq ($(BR2_PACKAGE_FREETYPE),y) -CAIRO_CONF_OPTS += --enable-ft +CAIRO_CONF_OPTS += -Dfreetype=enabled CAIRO_DEPENDENCIES += freetype else -CAIRO_CONF_OPTS += --disable-ft -endif - -ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) -CAIRO_DEPENDENCIES += libexecinfo -CAIRO_LIBS += -lexecinfo +CAIRO_CONF_OPTS += -Dfreetype=disabled endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -CAIRO_CONF_OPTS += --enable-gobject +CAIRO_CONF_OPTS += -Dglib=enabled CAIRO_DEPENDENCIES += libglib2 else -CAIRO_CONF_OPTS += --disable-gobject -endif - -# Can use GL or GLESv2 but not both -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -CAIRO_CONF_OPTS += --enable-gl --disable-glesv2 -CAIRO_DEPENDENCIES += libgl -else -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -CAIRO_CONF_OPTS += --disable-gl --enable-glesv2 -CAIRO_DEPENDENCIES += libgles -else -CAIRO_CONF_OPTS += --disable-gl --disable-glesv2 -endif -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -CAIRO_CONF_OPTS += --enable-vg -CAIRO_DEPENDENCIES += libopenvg -else -CAIRO_CONF_OPTS += --disable-vg -endif - -ifeq ($(BR2_PACKAGE_LZO),y) -CAIRO_DEPENDENCIES += lzo +CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x -CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext -else -CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -CAIRO_CONF_OPTS += --enable-xlib-xrender -CAIRO_DEPENDENCIES += xlib_libXrender -else -CAIRO_CONF_OPTS += --disable-xlib-xrender -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PS),y) -CAIRO_CONF_OPTS += --enable-ps -CAIRO_DEPENDENCIES += zlib +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += --disable-ps -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PDF),y) -CAIRO_CONF_OPTS += --enable-pdf -CAIRO_DEPENDENCIES += zlib -else -CAIRO_CONF_OPTS += --disable-pdf +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -CAIRO_CONF_OPTS += --enable-png +CAIRO_CONF_OPTS += -Dpng=enabled CAIRO_DEPENDENCIES += libpng else -CAIRO_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y) -CAIRO_CONF_OPTS += --enable-script -else -CAIRO_CONF_OPTS += --disable-script -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SVG),y) -CAIRO_CONF_OPTS += --enable-svg -else -CAIRO_CONF_OPTS += --disable-svg +CAIRO_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_TEE),y) -CAIRO_CONF_OPTS += --enable-tee +CAIRO_CONF_OPTS += -Dtee=enabled else -CAIRO_CONF_OPTS += --disable-tee +CAIRO_CONF_OPTS += -Dtee=disabled endif -ifeq ($(BR2_PACKAGE_CAIRO_XML),y) -CAIRO_CONF_OPTS += --enable-xml +ifeq ($(BR2_PACKAGE_CAIRO_ZLIB),y) +CAIRO_CONF_OPTS += -Dzlib=enabled +CAIRO_DEPENDENCIES += zlib else -CAIRO_CONF_OPTS += --disable-xml +CAIRO_CONF_OPTS += -Dzlib=disabled endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index f2888b2f51..f8821ba246 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -9,9 +9,8 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO select BR2_PACKAGE_GDK_PIXBUF diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 34b8d49eb3..9f9a081ecb 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -25,9 +25,8 @@ config BR2_PACKAGE_LIBGTK3 BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 270b524b37..d74359dfc9 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_SCRIPT + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_HOST_RUSTC select BR2_PACKAGE_LIBGLIB2 diff --git a/package/libsvg-cairo/Config.in b/package/libsvg-cairo/Config.in index 9577c69bf0..4602e93c2a 100644 --- a/package/libsvg-cairo/Config.in +++ b/package/libsvg-cairo/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBSVG_CAIRO bool "libsvg-cairo" select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBSVG help Libsvg-cairo provides the ability to render SVG content from diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in index 5ffdc92618..d954fd1214 100644 --- a/package/rrdtool/Config.in +++ b/package/rrdtool/Config.in @@ -19,10 +19,8 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PDF select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_PANGO help This enables the graphing capabilities ('rrdgraph'). -- 2.34.1 From thomas at devoogdt.com Mon Feb 5 21:30:35 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Mon, 5 Feb 2024 22:30:35 +0100 Subject: [Buildroot] [PATCH v8 2/2] package/cairo: bump to 1.18.0 In-Reply-To: <20240205213035.3180167-1-thomas@devoogdt.com> References: <20240205212300.3178519-2-thomas@devoogdt.com> <20240205213035.3180167-1-thomas@devoogdt.com> Message-ID: <20240205213035.3180167-2-thomas@devoogdt.com> News: - https://www.cairographics.org/news/cairo-1.17.8/ - https://www.cairographics.org/news/cairo-1.18.0/ Some options are renamed/dropped so fix that along. - GL and GLES drawing has been dropped in 1.17.8. - The XML surface has been removed in 1.18.0. - xlib-xcb was added [1] Patches: - drop 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch, upstream: [2] - drop 0002-Fix-mask-usage-in-image-compositor.patch, upstream: [3] - drop 0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch, upstream: [4] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/3468c67fe91f0c37e0ec5d335082653a6fa609b6 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be [4]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 Signed-off-by: Thomas Devoogdt --- v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v7: rebased on v7-0001-package-cairo-move-to-the-meson-build-system v8: forgot .checkpackageignore --- .checkpackageignore | 2 - ...or_tolerance_normalized-fix-infinite.patch | 39 ------------ ...rivate.h-fix-missing-FT_Color-error.patch} | 0 ...2-Fix-mask-usage-in-image-compositor.patch | 56 ----------------- ...-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} | 0 ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 ------------------- package/cairo/cairo.hash | 6 +- package/cairo/cairo.mk | 21 ++++--- 8 files changed, 14 insertions(+), 172 deletions(-) delete mode 100644 package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch rename package/cairo/{0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch => 0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch} (100%) delete mode 100644 package/cairo/0002-Fix-mask-usage-in-image-compositor.patch rename package/cairo/{0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch => 0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} (100%) delete mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch diff --git a/.checkpackageignore b/.checkpackageignore index 348cf3d289..86a774139a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -227,8 +227,6 @@ package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch Upstrea package/c-icap/S96cicap Indent Shellcheck Variables package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch Upstream package/cache-calibrator/0001-Fix-conflicting-round-function.patch Upstream -package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream -package/cairo/0002-Fix-mask-usage-in-image-compositor.patch Upstream package/caps/0001-Fix-stdint-types-with-musl.patch Upstream package/cdrkit/0001-no-rcmd.patch Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch Upstream diff --git a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch deleted file mode 100644 index 078e90fa42..0000000000 --- a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Sun, 1 Aug 2021 11:16:03 +0000 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - -[Retrieved from: -https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] -Signed-off-by: Quentin Schulz ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -2.38.1 - diff --git a/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch b/package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch similarity index 100% rename from package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch rename to package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch diff --git a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch deleted file mode 100644 index 54a95593c5..0000000000 --- a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - -[Retrieved from -https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be] -[Removed changes in test/ directory to remove binary diff so that the -patch can be applied by `patch` tool] -Signed-off-by: Quentin Schulz ---- - src/cairo-image-compositor.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index bbf4cf228..2352c478e 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - unsigned num_spans) - { - cairo_image_span_renderer_t *r = abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); - int x0; - - if (num_spans == 0) - return CAIRO_STATUS_SUCCESS; - - x0 = spans[0].x; -- m = r->_buf; -+ m = base; - do { - int len = spans[1].x - spans[0].x; - if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { -@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - spans[0].x, y, - spans[1].x - spans[0].x, h); - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else if (spans[0].coverage == 0x0) { - if (spans[0].x != x0) { -@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - #endif - } - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else { - *m++ = spans[0].coverage; --- -2.38.1 - diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch similarity index 100% rename from package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch rename to package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch deleted file mode 100644 index 193a210391..0000000000 --- a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Thu, 25 Feb 2021 10:52:45 +0000 -Subject: [PATCH] meson: allow skipping of run check for - IPC_RMID_DEFERRED_RELEASE - -The run check is particularly annoying in cross-compile scenarios, -so allow bypassing the check by having the user provide the value -via a cross file or native file: - - [properties] - ipc_rmid_deferred_release = true - -Closes #408 - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index b159b4071..5f593e54d 100644 ---- a/meson.build -+++ b/meson.build -@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() - ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], - ] - deps += [x11_dep, xext_dep] -- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -- dependencies: [x11_dep, xext_dep], -- name: 'shmctl IPC_RMID allowes subsequent attaches') - -- if res.returncode() == 0 -- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) -+ # Can skip the run check by providing the result in a cross file or -+ # native file as bool property value. -+ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') -+ # We don't know the type of prop (bool, string) but need to differentiate -+ # between a set value (bool) or the fallback value (string), so convert to -+ # a string and chec the string value. -+ prop_str = '@0@'.format(prop) -+ if prop_str in ['true', 'false'] -+ ipc_rmid_deferred_release = (prop_str == 'true') -+ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) -+ elif prop_str == 'auto' -+ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -+ dependencies: [x11_dep, xext_dep], -+ name: 'shmctl IPC_RMID allowes subsequent attaches') -+ -+ ipc_rmid_deferred_release = (res.returncode() == 0) -+ else -+ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) - endif -+ -+ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) - endif - - if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 --- -2.34.1 - diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index fca9ff678c..df9c693bad 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,7 +1,5 @@ -# From https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz.sha1 -sha1 68712ae1039b114347be3b7200bc1c901d47a636 cairo-1.17.4.tar.xz -# Calculated based on the hash above -sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 cairo-1.17.4.tar.xz +# From https://www.cairographics.org/releases/cairo-1.18.0.tar.xz.sha256sum +sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 cairo-1.18.0.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 3d2a67a6c5..4ace04ebbe 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,19 +4,14 @@ # ################################################################################ -CAIRO_VERSION = 1.17.4 +CAIRO_VERSION = 1.18.0 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics -CAIRO_SITE = http://cairographics.org/snapshots +CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES -# 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch -CAIRO_IGNORE_CVES += CVE-2019-6462 -# 0002-Fix-mask-usage-in-image-compositor.patch -CAIRO_IGNORE_CVES += CVE-2020-35492 - CAIRO_CFLAGS = $(TARGET_CFLAGS) CAIRO_LDFLAGS = $(TARGET_LDFLAGS) @@ -32,9 +27,13 @@ CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ + -Dquartz=disabled \ -Dtests=disabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 CAIRO_DEPENDENCIES = \ host-pkgconf \ @@ -43,9 +42,11 @@ CAIRO_DEPENDENCIES = \ # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ -Dfreetype=enabled \ -Dpng=enabled \ + -Dquartz=disabled \ -Dtee=disabled \ -Dxcb=disabled \ -Dxlib=disabled \ @@ -53,6 +54,8 @@ HOST_CAIRO_CONF_OPTS = \ -Dtests=disabled \ -Dglib=enabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ @@ -82,10 +85,10 @@ CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled -Dxlib-xcb=enabled CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled -Dxlib-xcb=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -- 2.34.1 From thomas.petazzoni at bootlin.com Mon Feb 5 21:31:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:31:12 +0100 Subject: [Buildroot] [git commit] package/brltty: disable emacs and lua bindings Message-ID: <20240205213122.DD12D86E01@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=19f06441e8b616159d45a552beac6e1fe05bc42a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable lua bindings to avoid the following build failure if host-lua and lua are built before brltty raised since bump to version 6.5 in commit 82c6e87d5eaaf5b32aa340ab384f88539238cbe1 and https://github.com/brltty/brltty/commit/42bf48ca010d9163652cb0a014662fa243132736: configure: lua package: lua configure: lua includes: configure: lua libs: -L/home/autobuild/autobuild/instance-0/output-1/host/bin/../sparc64-buildroot-linux-gnu/sysroot/usr/lib -llua -lm -ldl checking for lua5.4... no checking for lua... /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua shell: /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua library directory: /home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 [...] /usr/bin/install -c -d /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 /usr/bin/install -c -s --strip-program /bin/true brlapi.so /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/brltty-6.6/Bindings/Lua' [...] brltty: installs files in /home/autobuild/autobuild/instance-0/output-1/target//home/autobuild/autobuild/instance-0/output-1 While at it, disable emacs bindings which have also been added in version 6.5 with https://github.com/brltty/brltty/commit/64a487e29941df54796645229a872ecbe2a06bfe Fixes: - http://autobuild.buildroot.org/results/f424e6727bbe61ea4b7703e93aae6fcab7506898 - http://autobuild.buildroot.org/results/bf4a161fc66fb99a24f08bea3436b13738f2e383 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/brltty/brltty.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index f00a18cc6f..22d58ebd00 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -23,8 +23,10 @@ BRLTTY_CONF_ENV = \ PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf BRLTTY_CONF_OPTS = \ + --disable-emacs-bindings \ --disable-java-bindings \ --disable-lisp-bindings \ + --disable-lua-bindings \ --disable-ocaml-bindings \ --disable-python-bindings \ --disable-tcl-bindings \ From thomas.petazzoni at bootlin.com Mon Feb 5 21:31:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:31:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/brltty: disable emacs and lua bindings In-Reply-To: <20240126172920.1628617-1-fontaine.fabrice@gmail.com> References: <20240126172920.1628617-1-fontaine.fabrice@gmail.com> Message-ID: <20240205223122.32116c63@windsurf> On Fri, 26 Jan 2024 18:29:20 +0100 Fabrice Fontaine wrote: > Disable lua bindings to avoid the following build failure if host-lua > and lua are built before brltty raised since bump to version 6.5 in > commit 82c6e87d5eaaf5b32aa340ab384f88539238cbe1 and > https://github.com/brltty/brltty/commit/42bf48ca010d9163652cb0a014662fa243132736: > > configure: lua package: lua > configure: lua includes: > configure: lua libs: -L/home/autobuild/autobuild/instance-0/output-1/host/bin/../sparc64-buildroot-linux-gnu/sysroot/usr/lib -llua -lm -ldl > checking for lua5.4... no > checking for lua... /home/autobuild/autobuild/instance-0/output-1/host/bin/lua > configure: Lua shell: /home/autobuild/autobuild/instance-0/output-1/host/bin/lua > configure: Lua library directory: /home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > > [...] > > /usr/bin/install -c -d /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > /usr/bin/install -c -s --strip-program /bin/true brlapi.so /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/brltty-6.6/Bindings/Lua' > > [...] > > brltty: installs files in /home/autobuild/autobuild/instance-0/output-1/target//home/autobuild/autobuild/instance-0/output-1 > > While at it, disable emacs bindings which have also been added in > version 6.5 with > https://github.com/brltty/brltty/commit/64a487e29941df54796645229a872ecbe2a06bfe > > Fixes: > - http://autobuild.buildroot.org/results/f424e6727bbe61ea4b7703e93aae6fcab7506898 > - http://autobuild.buildroot.org/results/bf4a161fc66fb99a24f08bea3436b13738f2e383 > > Signed-off-by: Fabrice Fontaine > --- > package/brltty/brltty.mk | 2 ++ > 1 file changed, 2 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:32:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:32:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/libzlib: bump to version 1.3.1 In-Reply-To: <20240126221237.1780047-1-fontaine.fabrice@gmail.com> References: <20240126221237.1780047-1-fontaine.fabrice@gmail.com> Message-ID: <20240205223231.7c6f5f5a@windsurf> On Fri, 26 Jan 2024 23:12:37 +0100 Fabrice Fontaine wrote: > https://github.com/madler/zlib/releases/tag/v1.3.1 > > Signed-off-by: Fabrice Fontaine > --- > package/libzlib/libzlib.hash | 2 +- > package/libzlib/libzlib.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:32:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:32:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/minizip-zlib: bump to version 1.3.1 In-Reply-To: <20240126221323.1780561-1-fontaine.fabrice@gmail.com> References: <20240126221323.1780561-1-fontaine.fabrice@gmail.com> Message-ID: <20240205223237.6bed1124@windsurf> On Fri, 26 Jan 2024 23:13:23 +0100 Fabrice Fontaine wrote: > Drop patch (already in version) > > https://github.com/madler/zlib/releases/tag/v1.3.1 > > Signed-off-by: Fabrice Fontaine > --- > ...lows-of-zip-header-fields-in-minizip.patch | 39 ------------------- > package/minizip-zlib/minizip-zlib.hash | 2 +- > package/minizip-zlib/minizip-zlib.mk | 4 +- > 3 files changed, 2 insertions(+), 43 deletions(-) > delete mode 100644 package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:31:55 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:31:55 +0100 Subject: [Buildroot] [git commit] package/libzlib: bump to version 1.3.1 Message-ID: <20240205213240.7A11286E0C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=467eb0c337cac8447181c5a126032976a26c13f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/madler/zlib/releases/tag/v1.3.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libzlib/libzlib.hash | 2 +- package/libzlib/libzlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash index 23bfda8474..cbd9313870 100644 --- a/package/libzlib/libzlib.hash +++ b/package/libzlib/libzlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7 zlib-1.3.tar.xz +sha256 38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32 zlib-1.3.1.tar.xz # License files, locally calculated sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index e0a4e454e1..bc5092d9a9 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZLIB_VERSION = 1.3 +LIBZLIB_VERSION = 1.3.1 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz LIBZLIB_SITE = https://www.zlib.net LIBZLIB_LICENSE = Zlib From thomas.petazzoni at bootlin.com Mon Feb 5 21:32:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:32:05 +0100 Subject: [Buildroot] [git commit] package/minizip-zlib: bump to version 1.3.1 Message-ID: <20240205213240.855CE86E0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc125743d4e984ac4d0b1c07bafc99d075fc9686 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) https://github.com/madler/zlib/releases/tag/v1.3.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...overflows-of-zip-header-fields-in-minizip.patch | 39 ---------------------- package/minizip-zlib/minizip-zlib.hash | 2 +- package/minizip-zlib/minizip-zlib.mk | 4 +-- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch b/package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch deleted file mode 100644 index f4eacc7fdc..0000000000 --- a/package/minizip-zlib/0001-Reject-overflows-of-zip-header-fields-in-minizip.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 73331a6a0481067628f065ffe87bb1d8f787d10c Mon Sep 17 00:00:00 2001 -From: Hans Wennborg -Date: Fri, 18 Aug 2023 11:05:33 +0200 -Subject: [PATCH] Reject overflows of zip header fields in minizip. - -This checks the lengths of the file name, extra field, and comment -that would be put in the zip headers, and rejects them if they are -too long. They are each limited to 65535 bytes in length by the zip -format. This also avoids possible buffer overflows if the provided -fields are too long. - -Upstream: https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c -Signed-off-by: Fabrice Fontaine ---- - contrib/minizip/zip.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c -index 3d3d4cadd..0446109b2 100644 ---- a/contrib/minizip/zip.c -+++ b/contrib/minizip/zip.c -@@ -1043,6 +1043,17 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c - return ZIP_PARAMERROR; - #endif - -+ // The filename and comment length must fit in 16 bits. -+ if ((filename!=NULL) && (strlen(filename)>0xffff)) -+ return ZIP_PARAMERROR; -+ if ((comment!=NULL) && (strlen(comment)>0xffff)) -+ return ZIP_PARAMERROR; -+ // The extra field length must fit in 16 bits. If the member also requires -+ // a Zip64 extra block, that will also need to fit within that 16-bit -+ // length, but that will be checked for later. -+ if ((size_extrafield_local>0xffff) || (size_extrafield_global>0xffff)) -+ return ZIP_PARAMERROR; -+ - zi = (zip64_internal*)file; - - if (zi->in_opened_file_inzip == 1) diff --git a/package/minizip-zlib/minizip-zlib.hash b/package/minizip-zlib/minizip-zlib.hash index 23bfda8474..cbd9313870 100644 --- a/package/minizip-zlib/minizip-zlib.hash +++ b/package/minizip-zlib/minizip-zlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7 zlib-1.3.tar.xz +sha256 38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32 zlib-1.3.1.tar.xz # License files, locally calculated sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE diff --git a/package/minizip-zlib/minizip-zlib.mk b/package/minizip-zlib/minizip-zlib.mk index 81fee3c687..6d4a2d2e20 100644 --- a/package/minizip-zlib/minizip-zlib.mk +++ b/package/minizip-zlib/minizip-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIZIP_ZLIB_VERSION = 1.3 +MINIZIP_ZLIB_VERSION = 1.3.1 MINIZIP_ZLIB_SOURCE = zlib-$(MINIZIP_ZLIB_VERSION).tar.xz MINIZIP_ZLIB_SITE = http://www.zlib.net MINIZIP_ZLIB_LICENSE = Zlib @@ -16,7 +16,5 @@ MINIZIP_ZLIB_AUTORECONF = YES MINIZIP_ZLIB_DEPENDENCIES = zlib # demos must be disabled to avoid a conflict with BR2_PACKAGE_MINIZIP_DEMOS MINIZIP_ZLIB_CONF_OPTS = --disable-demos -# 0001-Reject-overflows-of-zip-header-fields-in-minizip.patch -MINIZIP_ZLIB_IGNORE_CVES += CVE-2023-45853 $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Mon Feb 5 21:36:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:36:42 +0100 Subject: [Buildroot] [git commit] support/testing: add cryptsetup runtime test Message-ID: <20240205213718.F24DD86E17@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1dd39dcf12d97637c4b343d49fcddae2ba29774b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_cryptsetup.py | 137 +++++++++++++++++++++ .../test_cryptsetup/linux-cryptsetup.fragment | 5 + 3 files changed, 144 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 31496cbcc6..f8737621b3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1764,6 +1764,8 @@ F: support/testing/tests/package/test_brotli.py F: support/testing/tests/package/test_bzip2.py F: support/testing/tests/package/test_compressor_base.py F: support/testing/tests/package/test_coremark.py +F: support/testing/tests/package/test_cryptsetup.py +F: support/testing/tests/package/test_cryptsetup/ F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py diff --git a/support/testing/tests/package/test_cryptsetup.py b/support/testing/tests/package/test_cryptsetup.py new file mode 100644 index 0000000000..759dfd7c5f --- /dev/null +++ b/support/testing/tests/package/test_cryptsetup.py @@ -0,0 +1,137 @@ +import os +import subprocess + +import infra.basetest + + +class TestCryptSetup(infra.basetest.BRTest): + # A specific configuration is needed for using cryptsetup: + # - A kernel config fragment enables all the parts needed for + # mounting a LUKS2 volume, + # - Enable OpenSSL for cryptsetup crypto backend library, + # - Enable e2fsprog for formatting a ext4 filesystem. + kern_frag = \ + infra.filepath("tests/package/test_cryptsetup/linux-cryptsetup.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.75" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_CRYPTSETUP=y + BR2_PACKAGE_E2FSPROGS=y + BR2_PACKAGE_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + disk_file = os.path.join(self.builddir, "images", "disk.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}") + subprocess.check_call( + ["dd", "if=/dev/urandom", f"of={disk_file}", "bs=1M", "count=20"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + + bootargs = ["console=ttyAMA0"] + qemu_opts = ["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img, + "-drive", f"file={disk_file},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("cryptsetup --version") + + passkey = "ThisIsAPassKey." + dev = "/dev/vda" + dm_name = "luks-vol" + dm_dev = f"/dev/mapper/{dm_name}" + mnt_pt = "/mnt/secure-volume" + + # Check the device is NOT detected as a LUKS volume, because + # it is not formatted yet. + is_luks_cmd = f"cryptsetup isLuks {dev}" + _, ret = self.emulator.run(is_luks_cmd) + self.assertNotEqual(ret, 0) + + # Format the LUKS volume. + cmd = f"echo {passkey} | cryptsetup luksFormat {dev}" + self.assertRunOk(cmd, timeout=30) + + # Check the device is now detected as a LUKS device. + self.assertRunOk(is_luks_cmd) + + # Dump LUKS device header information. + self.assertRunOk(f"cryptsetup luksDump {dev}") + + # Open the LUKS device + luks_open_cmd = f"echo {passkey} | " + luks_open_cmd += f"cryptsetup open --type luks {dev} {dm_name}" + self.assertRunOk(luks_open_cmd, timeout=10) + + # Create an ext4 filesystem. + self.assertRunOk(f"mke2fs -T ext4 {dm_dev}", timeout=10) + + # Create the mount point directory. + self.assertRunOk(f"mkdir {mnt_pt}") + + # Mount the LUKS device. + mount_cmd = f"mount {dm_dev} {mnt_pt}" + self.assertRunOk(mount_cmd) + + # Create a plain text file in the mounted filesystem. + msg = "This is a plain text message" + plain_file = f"{mnt_pt}/file.txt" + self.assertRunOk(f"echo '{msg}' > {plain_file}") + + # Unmount. + self.assertRunOk(f"umount {mnt_pt}") + + # We are supposed to see our plain text message on the + # dm-crypt device. + self.assertRunOk(f"grep -Fq '{msg}' {dm_dev}", timeout=10) + + # Close the LUKS device + self.assertRunOk(f"cryptsetup close {dm_name}") + + # We are NOT supposed to find our plain text message on the + # crypted storage device. + _, ret = self.emulator.run(f"grep -Fq '{msg}' {dev}", timeout=10) + self.assertNotEqual(ret, 0) + + # Try to open LUKS volume with a wrong password. This is + # expected to fail. + cmd = f"echo 'Wrong{passkey}' | " + cmd += f"cryptsetup open --type luks {dev} {dm_name}" + _, ret = self.emulator.run(cmd, timeout=10) + self.assertNotEqual(ret, 0) + + # Check the device-mapper device was NOT created (since we + # tried to open it with a wrong password). + self.assertRunOk(f"test ! -e {dm_dev}") + + # Reopen the LUKS device, with the good passkey this time... + self.assertRunOk(luks_open_cmd, timeout=10) + + # ...remount... + self.assertRunOk(mount_cmd) + + # ...and read back our plain text file. We check we get back + # our original message. + out, ret = self.emulator.run(f"cat {plain_file}") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) diff --git a/support/testing/tests/package/test_cryptsetup/linux-cryptsetup.fragment b/support/testing/tests/package/test_cryptsetup/linux-cryptsetup.fragment new file mode 100644 index 0000000000..37d5494fc2 --- /dev/null +++ b/support/testing/tests/package/test_cryptsetup/linux-cryptsetup.fragment @@ -0,0 +1,5 @@ +CONFIG_BLK_DEV_DM=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_XTS=y +CONFIG_DM_CRYPT=y +CONFIG_MD=y From thomas.petazzoni at bootlin.com Mon Feb 5 21:37:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:37:18 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add cryptsetup runtime test In-Reply-To: <20240126230520.427817-1-ju.o@free.fr> References: <20240126230520.427817-1-ju.o@free.fr> Message-ID: <20240205223718.5039e114@windsurf> On Sat, 27 Jan 2024 00:05:20 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 2 + > .../testing/tests/package/test_cryptsetup.py | 137 ++++++++++++++++++ > .../test_cryptsetup/linux-cryptsetup.fragment | 5 + > 3 files changed, 144 insertions(+) > create mode 100644 support/testing/tests/package/test_cryptsetup.py > create mode 100644 support/testing/tests/package/test_cryptsetup/linux-cryptsetup.fragment Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 5 21:38:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:38:26 +0100 Subject: [Buildroot] [git commit] package/pkg-utils: add missing licensing data to show-info Message-ID: <20240205213900.1615286E1B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5647d5c1900bde13cedd36efd09404ea5763c0fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While the list of licenses is present in the show-info output, the list of license files and the redistributable status were missing. Add them. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/pkg-utils.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 059e86ae0a..723bbe4e24 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -157,6 +157,10 @@ endef define _json-info-pkg-details "version": $(call mk-json-str,$($(1)_DL_VERSION)), "licenses": $(call mk-json-str,$($(1)_LICENSE)), + "license_files": [ + $(foreach f, $($(1)_LICENSE_FILES),$(call mk-json-str,$(f))$(comma)) + ], + "redistributable": $(if $(filter NO,$($(1)_REDISTRIBUTE)),false,true), "dl_dir": $(call mk-json-str,$($(1)_DL_SUBDIR)), "downloads": [ $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), From thomas.petazzoni at bootlin.com Mon Feb 5 21:39:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:39:06 +0100 Subject: [Buildroot] [PATCH] package/pkg-utils: add missing licensing data to show-info In-Reply-To: <20240127163807.233065-1-yann.morin.1998@free.fr> References: <20240127163807.233065-1-yann.morin.1998@free.fr> Message-ID: <20240205223906.39e92f87@windsurf> On Sat, 27 Jan 2024 17:38:07 +0100 "Yann E. MORIN" wrote: > While the list of licenses is present in the show-info output, the list > of license files and the redistributable status were missing. Add them. > > Signed-off-by: Yann E. MORIN > --- > package/pkg-utils.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Mon Feb 5 21:41:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 22:41:47 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add fping runtime test In-Reply-To: <20240123215454.81191-1-ju.o@free.fr> (Julien Olivain's message of "Tue, 23 Jan 2024 22:54:54 +0100") References: <20240123215454.81191-1-ju.o@free.fr> Message-ID: <87fry6a8ro.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 1 + > support/testing/tests/package/test_fping.py | 45 +++++++++++++++++++++ > 2 files changed, 46 insertions(+) > create mode 100644 support/testing/tests/package/test_fping.py > diff --git a/DEVELOPERS b/DEVELOPERS > index 9528837dd0..fa760cb3ed 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1769,6 +1769,7 @@ F: support/testing/tests/package/test_ddrescue/ > F: support/testing/tests/package/test_dos2unix.py > F: support/testing/tests/package/test_fluidsynth.py > F: support/testing/tests/package/test_fluidsynth/ > +F: support/testing/tests/package/test_fping.py > F: support/testing/tests/package/test_gawk.py > F: support/testing/tests/package/test_glslsandbox_player.py > F: support/testing/tests/package/test_glslsandbox_player/ > diff --git a/support/testing/tests/package/test_fping.py b/support/testing/tests/package/test_fping.py > new file mode 100644 > index 0000000000..58a1c92c0b > --- /dev/null > +++ b/support/testing/tests/package/test_fping.py > @@ -0,0 +1,45 @@ > +import os > +import time > + > +import infra.basetest > + > + > +class TestFping(infra.basetest.BRTest): > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + """ > + BR2_PACKAGE_FPING=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]) > + self.emulator.login() > + > + # Check the program can execute. > + self.assertRunOk("fping --version") > + > + # Fping v5.1 need to wait few seconds after a kernel booted > + # before starting. This sleep time can be removed when the > + # issue will be closed and the package updated. See: > + # https://github.com/schweikert/fping/issues/288 > + time.sleep(5) That's annoying, but indeed not much we can do about it. From the looks of it, the fping code initializes the timestamp to zero (using calloc) and then complains when (the delta from) CLOCK_REALTIME is less than 10s. The only thing we could do better is to take timeout_multiplier into consideration, so I multiplied with that and applied, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 21:42:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 22:42:11 +0100 Subject: [Buildroot] [git commit] support/testing: add fping runtime test Message-ID: <20240205214224.4D3B786E2C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc2ff8a38e72487f3fd6c7a2700ca664f7828545 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain [Peter: scale delay with timout_multiplier] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_fping.py | 45 +++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f8737621b3..187c8eeca7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1771,6 +1771,7 @@ F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py F: support/testing/tests/package/test_fluidsynth.py F: support/testing/tests/package/test_fluidsynth/ +F: support/testing/tests/package/test_fping.py F: support/testing/tests/package/test_gawk.py F: support/testing/tests/package/test_glslsandbox_player.py F: support/testing/tests/package/test_glslsandbox_player/ diff --git a/support/testing/tests/package/test_fping.py b/support/testing/tests/package/test_fping.py new file mode 100644 index 0000000000..507c4ce73b --- /dev/null +++ b/support/testing/tests/package/test_fping.py @@ -0,0 +1,45 @@ +import os +import time + +import infra.basetest + + +class TestFping(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_FPING=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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("fping --version") + + # Fping v5.1 need to wait few seconds after a kernel booted + # before starting. This sleep time can be removed when the + # issue will be closed and the package updated. See: + # https://github.com/schweikert/fping/issues/288 + time.sleep(5 * self.timeout_multiplier) + + # Run 3 pings on localhost. + self.assertRunOk("fping -e -c 3 localhost") + + # Run pings on a local subnet and print statistics. + self.assertRunOk("fping -s -g 127.0.0.0/28") + + # Test an IPv6 ping. + self.assertRunOk("fping -6 ::1") + + # Create a prohibited route to make fping fail. + self.assertRunOk("ip route add to prohibit 192.168.12.0/24") + + # We expect fping to fail when pinging the prohibited network. + _, ret = self.emulator.run("fping 192.168.12.34") + self.assertNotEqual(ret, 0) From thomas.petazzoni at bootlin.com Mon Feb 5 21:45:47 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:45:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2_mixer: force arm mode instead of Thumb mode In-Reply-To: <20240109214953.724112-1-fontaine.fabrice@gmail.com> References: <20240109214953.724112-1-fontaine.fabrice@gmail.com> Message-ID: <20240205224547.5435732c@windsurf> Hello Fabrice, On Tue, 9 Jan 2024 22:49:53 +0100 Fabrice Fontaine wrote: > +# sdl2_mixer has some assembly function that is not present in Thumb mode: > +# Error: selected processor does not support `clz r2,r3' in Thumb mode > +# so, we desactivate Thumb mode > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > +SDL2_MIXER_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" > +endif Thanks a lot for working on this! However, I think this is not the best fix. Indeed, instead we should patch the sdl2_mixer code so that it only uses the optimized ARM implementation when it makes sense. The code goes like this: #if defined(__GNUC__) || defined(__clang__) #if defined(DRFLAC_X64) /* OPTIMIZED x86-64 code here */ #elif defined(DRFLAC_X86) /* OPTIMIZED i386 code here */ /* This condition is the one that should be changed to exclude using this code on Thumb */ #elif defined(DRFLAC_ARM) && (defined(__ARM_ARCH) && __ARM_ARCH >= 5) && !defined(DRFLAC_64BIT) /* <-- I haven't tested 64-bit inline assembly, so only enabling this for the 32-bit build for now. */ { unsigned int r; __asm__ __volatile__ ( #if defined(DRFLAC_64BIT) "clz %w[out], %w[in]" : [out]"=r"(r) : [in]"r"(x) /* <-- This is untested. If someone in the community could test this, that would be appreciated! */ #else "clz %[out], %[in]" : [out]"=r"(r) : [in]"r"(x) #endif ); return r; } #else /* And so we will fallback here, the "unoptimized" implementation */ if (x == 0) { return sizeof(x)*8; } #ifdef DRFLAC_64BIT return (drflac_uint32)__builtin_clzll((drflac_uint64)x); #else return (drflac_uint32)__builtin_clzl((drflac_uint32)x); #endif #endif You can use some gcc internal macro to detect if we're building for Thumb or not. Could you have a look in this direction? Thanks a lot in advance! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From ju.o at free.fr Mon Feb 5 21:48:37 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 5 Feb 2024 22:48:37 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: netcat: improve test robustness Message-ID: <20240205214837.3497535-1-ju.o@free.fr> Under some conditions (mostly slow execution due to test host load), the netcat runtime test can randomly fail. This is due to several facts: - the sleep time between the server and client is too short, - the use of netcat option -c could close the connection before the server could receive all the data. This commit improves the test robustness by increasing the sleep time, and by reducing the amount of transferred data (from 1MB of random data, to a simpler string of few bytes). Also, to make sure netcat cannot wait on DNS resolution, this commit also adds the -n option. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854664 Signed-off-by: Julien Olivain --- support/testing/tests/package/test_netcat.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/support/testing/tests/package/test_netcat.py b/support/testing/tests/package/test_netcat.py index b3efa4c40b..88d58a72f3 100644 --- a/support/testing/tests/package/test_netcat.py +++ b/support/testing/tests/package/test_netcat.py @@ -22,20 +22,19 @@ class TestNetCat(infra.basetest.BRTest): self.assertRunOk("nc --version") - in_file = "input.bin" - out_file = "output.bin" + msg = "Hello Buildroot!" + out_file = "output.txt" port = 12345 - cmd = f"dd if=/dev/urandom of={in_file} bs=1k count=1k" + cmd = f"nc -n -l -p {port} > {out_file} 2> /dev/null &" self.assertRunOk(cmd) - cmd = f"nc -l -p {port} > {out_file} &" - self.assertRunOk(cmd) - - time.sleep(1) + time.sleep(5) - cmd = f"cat {in_file} | nc -c 127.0.0.1 {port}" + cmd = f"echo '{msg}' | nc -n -c 127.0.0.1 {port}" self.assertRunOk(cmd) - cmd = f"cmp {in_file} {out_file}" - self.assertRunOk(cmd) + cmd = f"cat {out_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) -- 2.43.0 From ju.o at free.fr Mon Feb 5 21:51:45 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 05 Feb 2024 22:51:45 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add netcat runtime test In-Reply-To: References: <20240113201532.121274-1-ju.o@free.fr> Message-ID: <219e4983def7472087fdaae868a9ee59@free.fr> Hi Romain, All, On 05/02/2024 18:49, Romain NAOUR wrote: > Hello Julien, All, > > On Sun, Jan 21, 2024 at 11:20?AM Yann E. MORIN > wrote: >> >> Julien, All, >> >> On 2024-01-13 21:15 +0100, Julien Olivain spake thusly: >> > Signed-off-by: Julien Olivain >> >> Applied to master, thanks. > > It seems this test is failing in gitlab-ci for some reason: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854664 > > can you have a look? I was able to reproduce the issue with a very slow execution. I proposed a fix in: https://patchwork.ozlabs.org/project/buildroot/patch/20240205214837.3497535-1-ju.o at free.fr/ > > Best regards, > Romain Best regards, Julien. From yann.morin.1998 at free.fr Mon Feb 5 21:52:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 22:52:34 +0100 Subject: [Buildroot] [git commit] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT Message-ID: <20240205215302.D05ED86E2B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=61295f5ced0749db34095bfbe8b34ed86a692828 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as LIBCURL_CPE_ID_PRODUCT will be set to the package name (i.e. libcurl) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant --- package/libcurl/libcurl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 3ecc587a52..83845b8e87 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') From yann.morin.1998 at free.fr Mon Feb 5 21:52:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 22:52:33 +0100 Subject: [Buildroot] [git commit] package/containerd: drop CONTAINERD_CPE_ID_VENDOR Message-ID: <20240205215302.C1ED386E3C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6ed73df9ee774e007432fbf9b6c19b22233f2bfd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 35af2bb8011ea57642777acf5613afa244d325d7 set CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as CONTAINERD_CPE_ID_PRODUCT will be set to the package name (i.e. containerd) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant --- package/containerd/containerd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 61a8472ddd..d3ca102797 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd From thomas.petazzoni at bootlin.com Mon Feb 5 21:54:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 5 Feb 2024 22:54:10 +0100 Subject: [Buildroot] [PATCH 1/1] board/visionfive2: enable u-boot In-Reply-To: <20240129211248.541383-1-tekieli.lukasz@gmail.com> References: <20240129211248.541383-1-tekieli.lukasz@gmail.com> Message-ID: <20240205225410.0f1c7e14@windsurf> Hello Lukasz, Thanks for the contribution! I have some comments below. On Mon, 29 Jan 2024 22:12:48 +0100 Lukasz Tekieli wrote: > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg" I think this should technically go into a separate commit, it looks like a "bug" in the original visionfive2_defconfig. Of course, today it doesn't cause any harm because the genimage.cfg files for visionfive and visionfive2 are the same, but this modification really isn't related to enabling U-Boot. > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,05533e9c31d6f0da20efc2d436a3b0f6d516ed4b)/linux-05533e9c31d6f0da20efc2d436a3b0f6d516ed4b.tar.gz" > @@ -15,4 +15,18 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > # BR2_TARGET_ROOTFS_TAR is not set > +BR2_TARGET_OPENSBI=y You need to set an explicit version for OpenSBI. Indeed, we want our defconfigs to use a fixed version of bootloader/firmware/Linux kernel code. > +BR2_TARGET_OPENSBI_PLAT="generic" > +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set > +BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES="FW_TEXT_START=0x40000000 FW_OPTIONS=0" > +BR2_TARGET_UBOOT=y Same comment for U-Boot: it should use a fixed version. Could you look into these small improvements, and send an updated version? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Mon Feb 5 21:54:45 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 22:54:45 +0100 Subject: [Buildroot] [PATCH 1/4] package/containerd: drop CONTAINERD_CPE_ID_VENDOR In-Reply-To: References: Message-ID: Fabrice, All, On 2024-02-04 16:22 +0100, Yann E. MORIN spake thusly: > From: Fabrice Fontaine > > Commit 35af2bb8011ea57642777acf5613afa244d325d7 set > CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as > CONTAINERD_CPE_ID_PRODUCT will be set to the package name > (i.e. containerd) by default > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/containerd/containerd.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk > index 61a8472ddd..d3ca102797 100644 > --- a/package/containerd/containerd.mk > +++ b/package/containerd/containerd.mk > @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) > CONTAINERD_LICENSE = Apache-2.0 > CONTAINERD_LICENSE_FILES = LICENSE > CONTAINERD_CPE_ID_VENDOR = linuxfoundation > -CONTAINERD_CPE_ID_PRODUCT = containerd > > CONTAINERD_GOMOD = github.com/containerd/containerd > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 5 21:55:02 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 22:55:02 +0100 Subject: [Buildroot] [PATCH 2/4] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT In-Reply-To: References: Message-ID: Fabrice, All, On 2024-02-04 16:22 +0100, Yann E. MORIN spake thusly: > From: Fabrice Fontaine > > Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set > LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as > LIBCURL_CPE_ID_PRODUCT will be set to the package name > (i.e. libcurl) by default > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Yann E. MORIN Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libcurl/libcurl.mk | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk > index 3ecc587a52..83845b8e87 100644 > --- a/package/libcurl/libcurl.mk > +++ b/package/libcurl/libcurl.mk > @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ > LIBCURL_LICENSE = curl > LIBCURL_LICENSE_FILES = COPYING > LIBCURL_CPE_ID_VENDOR = haxx > -LIBCURL_CPE_ID_PRODUCT = libcurl > LIBCURL_INSTALL_STAGING = YES > > # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Mon Feb 5 21:56:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 22:56:28 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add ltrace runtime test In-Reply-To: <20240124222236.15954-1-ju.o@free.fr> (Julien Olivain's message of "Wed, 24 Jan 2024 23:22:36 +0100") References: <20240124222236.15954-1-ju.o@free.fr> Message-ID: <87bk8ua837.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 22:04:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:04:27 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add trace-cmd runtime test In-Reply-To: <20240124222403.16360-1-ju.o@free.fr> (Julien Olivain's message of "Wed, 24 Jan 2024 23:24:03 +0100") References: <20240124222403.16360-1-ju.o@free.fr> Message-ID: <877cjia7pw.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit bc680b5 with commands: > make check-package > ... > 0 warnings generated > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_trace_cmd > ... > OK Committed, thanks. -- Bye, Peter Korsgaard From bubu at git.sr.ht Mon Feb 5 21:47:17 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 22:47:17 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: add python-uvloop runtime test Message-ID: <170717110256.12359.16509380444438086733-0@git.sr.ht> From: Marcus Hoffmann --- .../tests/package/sample_python_uvloop.py | 6 +++++ .../tests/package/test_python_uvloop.py | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 support/testing/tests/package/sample_python_uvloop.py create mode 100644 support/testing/tests/package/test_python_uvloop.py diff --git a/support/testing/tests/package/sample_python_uvloop.py b/support/testing/tests/package/sample_python_uvloop.py new file mode 100644 index 0000000000..dc85d3e04e --- /dev/null +++ b/support/testing/tests/package/sample_python_uvloop.py @@ -0,0 +1,6 @@ +import uvloop + +async def main(): + print("Hello world!") + +uvloop.run(main()) diff --git a/support/testing/tests/package/test_python_uvloop.py b/support/testing/tests/package/test_python_uvloop.py new file mode 100644 index 0000000000..c5079ba59c --- /dev/null +++ b/support/testing/tests/package/test_python_uvloop.py @@ -0,0 +1,22 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Uvloop(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_UVLOOP=y + """ + sample_scripts = ["tests/package/sample_python_uvloop.py"] + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + + cmd = "%s %s" % (self.interpreter, os.path.basename(self.sample_scripts[0])) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "Hello world!") -- 2.38.5 From yann.morin.1998 at free.fr Mon Feb 5 22:12:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:12:25 +0100 Subject: [Buildroot] [git commit] package/watchdogd: add menuconfig support for new system monitors Message-ID: <20240205221745.4539986E4B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3aecae1802f28d1662e29b31167f7959bfe6a7ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Joachim Wiberg Signed-off-by: Yann E. MORIN --- package/watchdogd/Config.in | 10 ++++++++++ package/watchdogd/watchdogd.mk | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/package/watchdogd/Config.in b/package/watchdogd/Config.in index 0b0480ea27..0aeaad165f 100644 --- a/package/watchdogd/Config.in +++ b/package/watchdogd/Config.in @@ -51,4 +51,14 @@ config BR2_PACKAGE_WATCHDOGD_MEMINFO help Enable memory leak monitor. +config BR2_PACKAGE_WATCHDOGD_FSMON + bool "File system monitor" + help + Enable file system monitor. + +config BR2_PACKAGE_WATCHDOGD_TEMPMON + bool "Temperature monitor" + help + Enable temperature monitor. + endif diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk index 56816de94f..189efc81d4 100644 --- a/package/watchdogd/watchdogd.mk +++ b/package/watchdogd/watchdogd.mk @@ -16,9 +16,7 @@ WATCHDOGD_SELINUX_MODULES = watchdog WATCHDOGD_CONF_OPTS = \ --disable-compat \ --disable-examples \ - --disable-test-mode \ - --without-fsmon \ - --without-tempmon + --disable-test-mode ifneq ($(BR2_PACKAGE_WATCHDOGD_TEST_SUITE),y) WATCHDOGD_CONF_OPTS += --disable-builtin-tests @@ -49,6 +47,17 @@ WATCHDOGD_CONF_OPTS += --without-meminfo else WATCHDOGD_CONF_OPTS += --with-meminfo endif + +ifneq ($(BR2_PACKAGE_WATCHDOGD_FSMON),y) +WATCHDOGD_CONF_OPTS += --without-fsmon +else +WATCHDOGD_CONF_OPTS += --with-fsmon +endif + +ifneq ($(BR2_PACKAGE_WATCHDOGD_TEMPMON),y) +WATCHDOGD_CONF_OPTS += --without-tempmon +else +WATCHDOGD_CONF_OPTS += --with-tempmon endif define WATCHDOGD_INSTALL_INIT_SYSV From yann.morin.1998 at free.fr Mon Feb 5 22:10:54 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:10:54 +0100 Subject: [Buildroot] [git commit] package/watchdogd: bump to version 4.0 Message-ID: <20240205221745.3AAD786E4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7371cb294df4792147fcf1da51139aafb759784a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For details, see https://github.com/troglobit/watchdogd/releases/tag/4.0 - Major feature upgrade, command line and .conf files compatible - LICENSE hash update due to update in copyright years - Enabling system monitor plugins have changed syntax upstream. The `--with-foo=SECONDS` is now just `--with-foo` This last upstream change require converting affected Config.in options from int -> bool. Legacy _WRAP:ers have been added to Config.legacy.in, modeled on BR2_TARGET_ROOTFS_EXT2_BLOCKS. Forcibly disable new monitors; they'll be enabled in a followup commit. Signed-off-by: Joachim Wiberg [yann.morin.1998 at free.fr: - forcibly disable new monitors - minor tweaks in Config.in.legacy ] Signed-off-by: Yann E. MORIN --- Config.in.legacy | 60 ++++++++++++++++++++++++++++++++++++++++ package/watchdogd/Config.in | 36 +++++++++++------------- package/watchdogd/watchdogd.hash | 4 +-- package/watchdogd/watchdogd.mk | 27 +++++++++++------- 4 files changed, 95 insertions(+), 32 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 82387338d9..9421d07aa1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -202,6 +202,66 @@ config BR2_KERNEL_HEADERS_6_5 Version 6.5.x of the Linux kernel headers are no longer maintained upstream and are now removed. +config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL + int "watchdogd generic poll has been replaced" + default 0 + help + The generic script poll interval has been replaced upstream + with a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_GENERIC_POLL != 0 + select BR2_LEGACY + +config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL + int "watchdogd loadavg poll has been replaced" + default 0 + help + The CPU load average poll interval has been replaced upstream + with a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL != 0 + select BR2_LEGACY + +config BR2_PACKAGE_WATCHDOGD_FILENR_POLL + int "watchdogd filenr poll has been replaced" + default 0 + help + The file descriptor leak poll has been replaced upstream with + a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_FILENR_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_FILENR_POLL != 0 + select BR2_LEGACY + +config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL + int "watchdogd meminfo poll has been replaced" + default 0 + help + The memleak detector poll interval has been replaced upstream + with a boolean on/off. Your configuration has been migrated. + + Set this legacy option to 0 here to remove the warning. + +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL_WRAP referenced in package/watchdogd/Config.in +config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL_WRAP + bool + default y if BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL != 0 + select BR2_LEGACY + comment "Legacy options removed in 2023.11" config BR2_PACKAGE_PYTHON_PYXB diff --git a/package/watchdogd/Config.in b/package/watchdogd/Config.in index ca5933848d..0b0480ea27 100644 --- a/package/watchdogd/Config.in +++ b/package/watchdogd/Config.in @@ -27,32 +27,28 @@ config BR2_PACKAGE_WATCHDOGD_TEST_SUITE They can be used to verify correct operation of watchdogd and the kernel watchdog driver. -config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL - int "Generic script monitor poll interval (sec)" - default "300" +config BR2_PACKAGE_WATCHDOGD_GENERIC + bool "Generic script monitor" + default y if BR2_PACKAGE_WATCHDOGD_GENERIC_POLL_WRAP # legacy 2024.02 help - Poll interval for generic script monitor, in seconds. A value - of zero (0) disables the monitor. + Enable generic script monitor. -config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL - int "CPU load average monitor poll interval (sec)" - default "300" +config BR2_PACKAGE_WATCHDOGD_LOADAVG + bool "CPU load average monitor" + default y if BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL_WRAP # legacy 2024.02 help - Poll interval for CPU load average monitor, in seconds. A - value of zero (0) disables the monitor. + Enable CPU load average monitor. -config BR2_PACKAGE_WATCHDOGD_FILENR_POLL - int "File descriptor leak monitor poll interval (sec)" - default "300" +config BR2_PACKAGE_WATCHDOGD_FILENR + bool "File descriptor leak monitor" + default y if BR2_PACKAGE_WATCHDOGD_FILENR_POLL_WRAP # legacy 2024.02 help - Poll interval for file descriptor leak monitor, in seconds. A - value of zero (0) disables the monitor. + Enable file descriptor leak monitor. -config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL - int "Memory leak monitor poll interval (sec)" - default "300" +config BR2_PACKAGE_WATCHDOGD_MEMINFO + bool "Memory leak monitor" + default y if BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL_WRAP # legacy 2024.02 help - Poll interval for memory leak monitor, in seconds. A value of - zero (0) disables the monitor. + Enable memory leak monitor. endif diff --git a/package/watchdogd/watchdogd.hash b/package/watchdogd/watchdogd.hash index 4ff1a3485b..0c228666bd 100644 --- a/package/watchdogd/watchdogd.hash +++ b/package/watchdogd/watchdogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 33ec4edc8cb4ada7a4d8324a27d897d33aae5e83257ed64d3d37508825c11237 watchdogd-3.5.tar.gz +sha256 7f38bc691353a51fc6feb2ccab60417c0284dd3f4d55c50d8b1781fda70d8101 watchdogd-4.0.tar.gz # Locally calculated -sha256 fd685e20931174308c45a26418a7ce34d66704c4e4b92ab1d8299deb255cd676 LICENSE +sha256 e233c56d807c74c67f2eff47ad03c216144cdd374d8d7578b996c28c260eadda LICENSE diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk index ea033b4e71..56816de94f 100644 --- a/package/watchdogd/watchdogd.mk +++ b/package/watchdogd/watchdogd.mk @@ -4,44 +4,51 @@ # ################################################################################ -WATCHDOGD_VERSION = 3.5 +WATCHDOGD_VERSION = 4.0 WATCHDOGD_SITE = https://github.com/troglobit/watchdogd/releases/download/$(WATCHDOGD_VERSION) WATCHDOGD_LICENSE = ISC WATCHDOGD_LICENSE_FILES = LICENSE WATCHDOGD_CPE_ID_VENDOR = troglobit WATCHDOGD_INSTALL_STAGING = YES WATCHDOGD_DEPENDENCIES = host-pkgconf libconfuse libite libuev -WATCHDOGD_CONF_OPTS = --disable-compat --disable-examples --disable-test-mode WATCHDOGD_SELINUX_MODULES = watchdog +WATCHDOGD_CONF_OPTS = \ + --disable-compat \ + --disable-examples \ + --disable-test-mode \ + --without-fsmon \ + --without-tempmon + ifneq ($(BR2_PACKAGE_WATCHDOGD_TEST_SUITE),y) WATCHDOGD_CONF_OPTS += --disable-builtin-tests else WATCHDOGD_CONF_OPTS += --enable-builtin-tests endif -ifeq ($(BR2_PACKAGE_WATCHDOGD_GENERIC_POLL),0) +ifneq ($(BR2_PACKAGE_WATCHDOGD_GENERIC),y) WATCHDOGD_CONF_OPTS += --without-generic else -WATCHDOGD_CONF_OPTS += --with-generic=$(BR2_PACKAGE_WATCHDOGD_GENERIC_POLL) +WATCHDOGD_CONF_OPTS += --with-generic endif -ifeq ($(BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL),0) +ifneq ($(BR2_PACKAGE_WATCHDOGD_LOADAVG),y) WATCHDOGD_CONF_OPTS += --without-loadavg else -WATCHDOGD_CONF_OPTS += --with-loadavg=$(BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL) +WATCHDOGD_CONF_OPTS += --with-loadavg endif -ifeq ($(BR2_PACKAGE_WATCHDOGD_FILENR_POLL),0) +ifneq ($(BR2_PACKAGE_WATCHDOGD_FILENR),y) WATCHDOGD_CONF_OPTS += --without-filenr else -WATCHDOGD_CONF_OPTS += --with-filenr=$(BR2_PACKAGE_WATCHDOGD_FILENR_POLL) +WATCHDOGD_CONF_OPTS += --with-filenr endif -ifeq ($(BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL),0) +ifneq ($(BR2_PACKAGE_WATCHDOGD_MEMINFO),y) WATCHDOGD_CONF_OPTS += --without-meminfo else -WATCHDOGD_CONF_OPTS += --with-meminfo=$(BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL) +WATCHDOGD_CONF_OPTS += --with-meminfo +endif endif define WATCHDOGD_INSTALL_INIT_SYSV From buildroot at bubu1.eu Mon Feb 5 22:17:38 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 5 Feb 2024 23:17:38 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: add python-uvloop runtime test In-Reply-To: <170717110256.12359.16509380444438086733-0@git.sr.ht> References: <170717110256.12359.16509380444438086733-0@git.sr.ht> Message-ID: <7e311fd3-0eac-4cff-a87e-da53f01abdf8@bubu1.eu> Eventually I'll manage to sign-off my commits ... On 05.02.24 22:47, ~bubu wrote: > From: Marcus Hoffmann Signed-off-by: Marcus Hoffmann > > --- > .../tests/package/sample_python_uvloop.py | 6 +++++ > .../tests/package/test_python_uvloop.py | 22 +++++++++++++++++++ > 2 files changed, 28 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_uvloop.py > create mode 100644 support/testing/tests/package/test_python_uvloop.py > > diff --git a/support/testing/tests/package/sample_python_uvloop.py b/support/testing/tests/package/sample_python_uvloop.py > new file mode 100644 > index 0000000000..dc85d3e04e > --- /dev/null > +++ b/support/testing/tests/package/sample_python_uvloop.py > @@ -0,0 +1,6 @@ > +import uvloop > + > +async def main(): > + print("Hello world!") > + > +uvloop.run(main()) > diff --git a/support/testing/tests/package/test_python_uvloop.py b/support/testing/tests/package/test_python_uvloop.py > new file mode 100644 > index 0000000000..c5079ba59c > --- /dev/null > +++ b/support/testing/tests/package/test_python_uvloop.py > @@ -0,0 +1,22 @@ > +import os > + > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy3Uvloop(TestPythonPackageBase): > + __test__ = True > + config = TestPythonPackageBase.config + \ > + """ > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_UVLOOP=y > + """ > + sample_scripts = ["tests/package/sample_python_uvloop.py"] > + > + def test_run(self): > + self.login() > + self.check_sample_scripts_exist() > + > + cmd = "%s %s" % (self.interpreter, os.path.basename(self.sample_scripts[0])) > + output, exit_code = self.emulator.run(cmd) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output[0], "Hello world!") From peter at korsgaard.com Mon Feb 5 22:19:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:19:54 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add usbutils runtime test In-Reply-To: <20240124222523.16703-1-ju.o@free.fr> (Julien Olivain's message of "Wed, 24 Jan 2024 23:25:23 +0100") References: <20240124222523.16703-1-ju.o@free.fr> Message-ID: <8734u6a705.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit 7a59c3a with commands: > make check-package > ... > 0 warnings generated > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_usbutils > ... > OK > --- > DEVELOPERS | 2 + > .../testing/tests/package/test_usbutils.py | 60 +++++++++++++++++++ > .../test_usbutils/linux-usbutils.fragment | 2 + > 3 files changed, 64 insertions(+) > create mode 100644 support/testing/tests/package/test_usbutils.py > create mode 100644 support/testing/tests/package/test_usbutils/linux-usbutils.fragment > diff --git a/DEVELOPERS b/DEVELOPERS > index f5b04937b6..5a5ce47d73 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1814,6 +1814,8 @@ F: support/testing/tests/package/test_screen.py > F: support/testing/tests/package/test_stress_ng.py > F: support/testing/tests/package/test_tcl.py > F: support/testing/tests/package/test_tcl/ > +F: support/testing/tests/package/test_usbutils.py > +F: support/testing/tests/package/test_usbutils/ > F: support/testing/tests/package/test_weston.py > F: support/testing/tests/package/test_weston/ > F: support/testing/tests/package/test_xz.py > diff --git a/support/testing/tests/package/test_usbutils.py b/support/testing/tests/package/test_usbutils.py > new file mode 100644 > index 0000000000..9a5484d5e6 > --- /dev/null > +++ b/support/testing/tests/package/test_usbutils.py > @@ -0,0 +1,60 @@ > +import os > + > +import infra.basetest > + > + > +class TestUsbUtils(infra.basetest.BRTest): > + # A specific configuration is needed for testing usbutils, to > + # enable USB 2.0 support in the Kernel. > + linux_fragment = \ > + infra.filepath("tests/package/test_usbutils/linux-usbutils.fragment") > + config = \ > + f""" > + BR2_aarch64=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" > + BR2_LINUX_KERNEL=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION=y > + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.73" > + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" > + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{linux_fragment}" > + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + BR2_PACKAGE_EUDEV=y > + BR2_PACKAGE_USBUTILS=y > + BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > + BR2_TARGET_ROOTFS_CPIO=y > + BR2_TARGET_ROOTFS_CPIO_GZIP=y > + # BR2_TARGET_ROOTFS_TAR is not set > + """ > + > + def test_run(self): > + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") > + kern = os.path.join(self.builddir, "images", "Image") > + # We add a USB keyboard and mouse devices for the test. > + self.emulator.boot(arch="aarch64", > + kernel=kern, > + kernel_cmdline=["console=ttyAMA0"], > + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", > + "-initrd", img, > + "-device", "usb-ehci,id=ehci", > + "-device", "usb-kbd,bus=ehci.0", > + "-device", "usb-mouse,bus=ehci.0"]) > + self.emulator.login() > + > + # Check the program can execute. We also check the version > + # string to make sure we have the usbutils version. The > + # BusyBox lsusb ignores arguments. > + output, exit_code = self.emulator.run("lsusb --version") > + self.assertEqual(exit_code, 0) > + self.assertTrue(output[0].startswith("lsusb (usbutils)")) > + > + # Test few simple and common invocations > + self.assertRunOk("lsusb") > + self.assertRunOk("lsusb --tree") > + self.assertRunOk("lsusb --verbose") > + # 1d6b:0002 is Linux Foundation 2.0 root hub > + # it should be present. lsusb return an error if no device > + # is found. > + self.assertRunOk("lsusb -d 1d6b:0002") > + self.assertRunOk("usbhid-dump") It was not directly obvious why this would not fail until I noticed that you configure qemu to emulate a USB keyboard and a mouse, so I added a comment about this and applied - Thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Mon Feb 5 22:19:26 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 23:19:26 +0100 Subject: [Buildroot] [git commit] support/testing: netcat: improve test robustness Message-ID: <20240205222012.F025586E52@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f72ba67d081a728a13f76cb8d18e2b5b781d2a46 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Under some conditions (mostly slow execution due to test host load), the netcat runtime test can randomly fail. This is due to several facts: - the sleep time between the server and client is too short, - the use of netcat option -c could close the connection before the server could receive all the data. This commit improves the test robustness by increasing the sleep time, and by reducing the amount of transferred data (from 1MB of random data, to a simpler string of few bytes). Also, to make sure netcat cannot wait on DNS resolution, this commit also adds the -n option. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854664 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- support/testing/tests/package/test_netcat.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/support/testing/tests/package/test_netcat.py b/support/testing/tests/package/test_netcat.py index b3efa4c40b..88d58a72f3 100644 --- a/support/testing/tests/package/test_netcat.py +++ b/support/testing/tests/package/test_netcat.py @@ -22,20 +22,19 @@ class TestNetCat(infra.basetest.BRTest): self.assertRunOk("nc --version") - in_file = "input.bin" - out_file = "output.bin" + msg = "Hello Buildroot!" + out_file = "output.txt" port = 12345 - cmd = f"dd if=/dev/urandom of={in_file} bs=1k count=1k" + cmd = f"nc -n -l -p {port} > {out_file} 2> /dev/null &" self.assertRunOk(cmd) - cmd = f"nc -l -p {port} > {out_file} &" - self.assertRunOk(cmd) - - time.sleep(1) + time.sleep(5) - cmd = f"cat {in_file} | nc -c 127.0.0.1 {port}" + cmd = f"echo '{msg}' | nc -n -c 127.0.0.1 {port}" self.assertRunOk(cmd) - cmd = f"cmp {in_file} {out_file}" - self.assertRunOk(cmd) + cmd = f"cat {out_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) From yann.morin.1998 at free.fr Mon Feb 5 22:20:46 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:20:46 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/watchdogd: bump to version 4.0 In-Reply-To: <20240130215628.884512-2-troglobit@gmail.com> References: <20240130215628.884512-1-troglobit@gmail.com> <20240130215628.884512-2-troglobit@gmail.com> Message-ID: Joachim, All, On 2024-01-30 22:56 +0100, Joachim Wiberg spake thusly: > For details, see https://github.com/troglobit/watchdogd/releases/tag/4.0 > > - Major feature upgrade, command line and .conf files compatible > - LICENSE hash update due to update in copyright years > - Enabling system monitor plugins have changed syntax upstream. The > `--with-foo=SECONDS` is now just `--with-foo` > > This last upstream change require converting affected Config.in options > from int -> bool. Legacy _WRAP:ers have been added to Config.legacy.in, > modeled on BR2_TARGET_ROOTFS_EXT2_BLOCKS. > > Signed-off-by: Joachim Wiberg > --- [--SNIP--] > diff --git a/Config.in.legacy b/Config.in.legacy > index 82387338d9..b6e72d0f24 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -202,6 +202,64 @@ config BR2_KERNEL_HEADERS_6_5 > Version 6.5.x of the Linux kernel headers are no longer > maintained upstream and are now removed. > > +config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL > + int "watchdogd generic poll has been replaced" > + default 0 > + help > + The generic script poll interval has been replaced upstream > + with a boolean on/off. Your configuration has been migrated. > + > + Set this legacy option to 0 here to remove the warning. [--SNIP--] > +# Note: BR2_PACKAGE_WATCHDOGD_*_POLL still referenced in package/watchdogd/Config.in This comment is wrong: it's the _WRAP options that are referenced. So I changed it. I also duplicated right above each such option so it's easier to spot rather than a lone comment way below (I know you did like the existing ext legacy, but that does not prevent improving! ;-) ). Applied to master, thanks. Regards, Yann E. MORIN. > comment "Legacy options removed in 2023.11" > > config BR2_PACKAGE_PYTHON_PYXB > diff --git a/package/watchdogd/Config.in b/package/watchdogd/Config.in > index ca5933848d..0b0480ea27 100644 > --- a/package/watchdogd/Config.in > +++ b/package/watchdogd/Config.in > @@ -27,32 +27,28 @@ config BR2_PACKAGE_WATCHDOGD_TEST_SUITE > They can be used to verify correct operation of watchdogd and > the kernel watchdog driver. > > -config BR2_PACKAGE_WATCHDOGD_GENERIC_POLL > - int "Generic script monitor poll interval (sec)" > - default "300" > +config BR2_PACKAGE_WATCHDOGD_GENERIC > + bool "Generic script monitor" > + default y if BR2_PACKAGE_WATCHDOGD_GENERIC_POLL_WRAP # legacy 2024.02 > help > - Poll interval for generic script monitor, in seconds. A value > - of zero (0) disables the monitor. > + Enable generic script monitor. > > -config BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL > - int "CPU load average monitor poll interval (sec)" > - default "300" > +config BR2_PACKAGE_WATCHDOGD_LOADAVG > + bool "CPU load average monitor" > + default y if BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL_WRAP # legacy 2024.02 > help > - Poll interval for CPU load average monitor, in seconds. A > - value of zero (0) disables the monitor. > + Enable CPU load average monitor. > > -config BR2_PACKAGE_WATCHDOGD_FILENR_POLL > - int "File descriptor leak monitor poll interval (sec)" > - default "300" > +config BR2_PACKAGE_WATCHDOGD_FILENR > + bool "File descriptor leak monitor" > + default y if BR2_PACKAGE_WATCHDOGD_FILENR_POLL_WRAP # legacy 2024.02 > help > - Poll interval for file descriptor leak monitor, in seconds. A > - value of zero (0) disables the monitor. > + Enable file descriptor leak monitor. > > -config BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL > - int "Memory leak monitor poll interval (sec)" > - default "300" > +config BR2_PACKAGE_WATCHDOGD_MEMINFO > + bool "Memory leak monitor" > + default y if BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL_WRAP # legacy 2024.02 > help > - Poll interval for memory leak monitor, in seconds. A value of > - zero (0) disables the monitor. > + Enable memory leak monitor. > > endif > diff --git a/package/watchdogd/watchdogd.hash b/package/watchdogd/watchdogd.hash > index 4ff1a3485b..0c228666bd 100644 > --- a/package/watchdogd/watchdogd.hash > +++ b/package/watchdogd/watchdogd.hash > @@ -1,5 +1,5 @@ > # Upstream .sha256 from GitHub > -sha256 33ec4edc8cb4ada7a4d8324a27d897d33aae5e83257ed64d3d37508825c11237 watchdogd-3.5.tar.gz > +sha256 7f38bc691353a51fc6feb2ccab60417c0284dd3f4d55c50d8b1781fda70d8101 watchdogd-4.0.tar.gz > > # Locally calculated > -sha256 fd685e20931174308c45a26418a7ce34d66704c4e4b92ab1d8299deb255cd676 LICENSE > +sha256 e233c56d807c74c67f2eff47ad03c216144cdd374d8d7578b996c28c260eadda LICENSE > diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk > index ea033b4e71..2e67c2847e 100644 > --- a/package/watchdogd/watchdogd.mk > +++ b/package/watchdogd/watchdogd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WATCHDOGD_VERSION = 3.5 > +WATCHDOGD_VERSION = 4.0 > WATCHDOGD_SITE = https://github.com/troglobit/watchdogd/releases/download/$(WATCHDOGD_VERSION) > WATCHDOGD_LICENSE = ISC > WATCHDOGD_LICENSE_FILES = LICENSE > @@ -20,28 +20,29 @@ else > WATCHDOGD_CONF_OPTS += --enable-builtin-tests > endif > > -ifeq ($(BR2_PACKAGE_WATCHDOGD_GENERIC_POLL),0) > +ifneq ($(BR2_PACKAGE_WATCHDOGD_GENERIC),y) > WATCHDOGD_CONF_OPTS += --without-generic > else > -WATCHDOGD_CONF_OPTS += --with-generic=$(BR2_PACKAGE_WATCHDOGD_GENERIC_POLL) > +WATCHDOGD_CONF_OPTS += --with-generic > endif > > -ifeq ($(BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL),0) > +ifneq ($(BR2_PACKAGE_WATCHDOGD_LOADAVG),y) > WATCHDOGD_CONF_OPTS += --without-loadavg > else > -WATCHDOGD_CONF_OPTS += --with-loadavg=$(BR2_PACKAGE_WATCHDOGD_LOADAVG_POLL) > +WATCHDOGD_CONF_OPTS += --with-loadavg > endif > > -ifeq ($(BR2_PACKAGE_WATCHDOGD_FILENR_POLL),0) > +ifneq ($(BR2_PACKAGE_WATCHDOGD_FILENR),y) > WATCHDOGD_CONF_OPTS += --without-filenr > else > -WATCHDOGD_CONF_OPTS += --with-filenr=$(BR2_PACKAGE_WATCHDOGD_FILENR_POLL) > +WATCHDOGD_CONF_OPTS += --with-filenr > endif > > -ifeq ($(BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL),0) > +ifneq ($(BR2_PACKAGE_WATCHDOGD_MEMINFO),y) > WATCHDOGD_CONF_OPTS += --without-meminfo > else > -WATCHDOGD_CONF_OPTS += --with-meminfo=$(BR2_PACKAGE_WATCHDOGD_MEMINFO_POLL) > +WATCHDOGD_CONF_OPTS += --with-meminfo > +endif > endif > > define WATCHDOGD_INSTALL_INIT_SYSV > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Mon Feb 5 22:20:50 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 23:20:50 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: netcat: improve test robustness In-Reply-To: <20240205214837.3497535-1-ju.o@free.fr> References: <20240205214837.3497535-1-ju.o@free.fr> Message-ID: <3d4fe1c8-8d8f-4740-9185-2a6ff43405fc@smile.fr> Hello Julien, Le 05/02/2024 ? 22:48, Julien Olivain a ?crit?: > Under some conditions (mostly slow execution due to test host load), > the netcat runtime test can randomly fail. This is due to several > facts: > > - the sleep time between the server and client is too short, > - the use of netcat option -c could close the connection before the > server could receive all the data. > > This commit improves the test robustness by increasing the sleep time, > and by reducing the amount of transferred data (from 1MB of random data, > to a simpler string of few bytes). Also, to make sure netcat cannot wait > on DNS resolution, this commit also adds the -n option. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854664 Applied to master, thanks. Best regards, Romain > > Signed-off-by: Julien Olivain > --- > support/testing/tests/package/test_netcat.py | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/support/testing/tests/package/test_netcat.py b/support/testing/tests/package/test_netcat.py > index b3efa4c40b..88d58a72f3 100644 > --- a/support/testing/tests/package/test_netcat.py > +++ b/support/testing/tests/package/test_netcat.py > @@ -22,20 +22,19 @@ class TestNetCat(infra.basetest.BRTest): > > self.assertRunOk("nc --version") > > - in_file = "input.bin" > - out_file = "output.bin" > + msg = "Hello Buildroot!" > + out_file = "output.txt" > port = 12345 > > - cmd = f"dd if=/dev/urandom of={in_file} bs=1k count=1k" > + cmd = f"nc -n -l -p {port} > {out_file} 2> /dev/null &" > self.assertRunOk(cmd) > > - cmd = f"nc -l -p {port} > {out_file} &" > - self.assertRunOk(cmd) > - > - time.sleep(1) > + time.sleep(5) > > - cmd = f"cat {in_file} | nc -c 127.0.0.1 {port}" > + cmd = f"echo '{msg}' | nc -n -c 127.0.0.1 {port}" > self.assertRunOk(cmd) > > - cmd = f"cmp {in_file} {out_file}" > - self.assertRunOk(cmd) > + cmd = f"cat {out_file}" > + out, ret = self.emulator.run(cmd) > + self.assertEqual(ret, 0) > + self.assertEqual(out[0], msg) From peter at korsgaard.com Mon Feb 5 22:20:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:20:22 +0100 Subject: [Buildroot] [git commit] support/testing: add ltrace runtime test Message-ID: <20240205222152.39D0886E70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d64b36ba1577d6c0169787a14101b2f43ddac206 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_ltrace.py | 32 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 187c8eeca7..a8e1ac9a27 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1790,6 +1790,7 @@ F: support/testing/tests/package/test_less.py F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py +F: support/testing/tests/package/test_ltrace.py F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py diff --git a/support/testing/tests/package/test_ltrace.py b/support/testing/tests/package/test_ltrace.py new file mode 100644 index 0000000000..9ef64ba5dd --- /dev/null +++ b/support/testing/tests/package/test_ltrace.py @@ -0,0 +1,32 @@ +import os + +import infra.basetest + + +class TestLtrace(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_LTRACE=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]) + self.emulator.login() + + # Check the program can execute + self.assertRunOk("ltrace --version") + + # Run ltrace on a ls + cmd = "ltrace -a 0 -o ltrace.log ls /" + self.assertRunOk(cmd) + + # Check the ltrace log contains occurrences of libc malloc() + cmd = "grep -Ec 'malloc\\([0-9]+\\)' ltrace.log" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertGreater(int(out[0]), 0) From peter at korsgaard.com Mon Feb 5 22:20:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:20:23 +0100 Subject: [Buildroot] [git commit] support/testing: add trace-cmd runtime test Message-ID: <20240205222152.4675386E71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b342b77938622d89fbe6eca20ed5d251a884569 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_trace_cmd.py | 54 ++++++++++++++++++++++ .../package/test_trace_cmd/linux-ftrace.fragment | 1 + 3 files changed, 57 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index a8e1ac9a27..12df3bef13 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1830,6 +1830,8 @@ F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_tcpdump.py F: support/testing/tests/package/test_tesseract_ocr.py +F: support/testing/tests/package/test_trace_cmd.py +F: support/testing/tests/package/test_trace_cmd/ F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_trace_cmd.py b/support/testing/tests/package/test_trace_cmd.py new file mode 100644 index 0000000000..e7d5e13bce --- /dev/null +++ b/support/testing/tests/package/test_trace_cmd.py @@ -0,0 +1,54 @@ +import os + +import infra.basetest + + +class TestTraceCmd(infra.basetest.BRTest): + # A specific configuration is needed for testing trace-cmd. + # The function tracer need to be enabled in the Kernel. + kern_fragment = \ + infra.filepath("tests/package/test_trace_cmd/linux-ftrace.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.74" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_TRACE_CMD=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # Record calls to kmalloc() from a simple command. + self.assertRunOk("trace-cmd record -e kmalloc ls -l /") + + # Show information about the trace.dat file. + self.assertRunOk("trace-cmd dump") + + # Generate a text report of the trace. + self.assertRunOk("trace-cmd report > trace.txt") + + # Check we have occurrences of "kmalloc:" in the trace report. + cmd = "grep -Fc kmalloc: trace.txt" + output, exit_code = self.emulator.run(cmd) + self.assertEquals(exit_code, 0) + self.assertTrue(int(output[0]) > 0) diff --git a/support/testing/tests/package/test_trace_cmd/linux-ftrace.fragment b/support/testing/tests/package/test_trace_cmd/linux-ftrace.fragment new file mode 100644 index 0000000000..ef82146616 --- /dev/null +++ b/support/testing/tests/package/test_trace_cmd/linux-ftrace.fragment @@ -0,0 +1 @@ +CONFIG_FTRACE=y From peter at korsgaard.com Mon Feb 5 22:20:25 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:20:25 +0100 Subject: [Buildroot] [git commit] support/testing: add usbutils runtime test Message-ID: <20240205222152.5383186E72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ce02d84ada4fdf6fbf45a60a7934a5edae05c8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain [Peter: add comment about USB keyboard/mouse] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_usbutils.py | 61 ++++++++++++++++++++++ .../package/test_usbutils/linux-usbutils.fragment | 2 + 3 files changed, 65 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 12df3bef13..f7a10c364d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1832,6 +1832,8 @@ F: support/testing/tests/package/test_tcpdump.py F: support/testing/tests/package/test_tesseract_ocr.py F: support/testing/tests/package/test_trace_cmd.py F: support/testing/tests/package/test_trace_cmd/ +F: support/testing/tests/package/test_usbutils.py +F: support/testing/tests/package/test_usbutils/ F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_usbutils.py b/support/testing/tests/package/test_usbutils.py new file mode 100644 index 0000000000..83c3f7f920 --- /dev/null +++ b/support/testing/tests/package/test_usbutils.py @@ -0,0 +1,61 @@ +import os + +import infra.basetest + + +class TestUsbUtils(infra.basetest.BRTest): + # A specific configuration is needed for testing usbutils, to + # enable USB 2.0 support in the Kernel. + linux_fragment = \ + infra.filepath("tests/package/test_usbutils/linux-usbutils.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.73" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{linux_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_EUDEV=y + BR2_PACKAGE_USBUTILS=y + BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + # We add a USB keyboard and mouse devices for the test. + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img, + "-device", "usb-ehci,id=ehci", + "-device", "usb-kbd,bus=ehci.0", + "-device", "usb-mouse,bus=ehci.0"]) + self.emulator.login() + + # Check the program can execute. We also check the version + # string to make sure we have the usbutils version. The + # BusyBox lsusb ignores arguments. + output, exit_code = self.emulator.run("lsusb --version") + self.assertEqual(exit_code, 0) + self.assertTrue(output[0].startswith("lsusb (usbutils)")) + + # Test few simple and common invocations + self.assertRunOk("lsusb") + self.assertRunOk("lsusb --tree") + self.assertRunOk("lsusb --verbose") + # 1d6b:0002 is Linux Foundation 2.0 root hub + # it should be present. lsusb return an error if no device + # is found. + self.assertRunOk("lsusb -d 1d6b:0002") + # we emulate a USB keyboard and mouse, so usbhid-dump should find them + self.assertRunOk("usbhid-dump") diff --git a/support/testing/tests/package/test_usbutils/linux-usbutils.fragment b/support/testing/tests/package/test_usbutils/linux-usbutils.fragment new file mode 100644 index 0000000000..d9abd2821e --- /dev/null +++ b/support/testing/tests/package/test_usbutils/linux-usbutils.fragment @@ -0,0 +1,2 @@ +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y From yann.morin.1998 at free.fr Mon Feb 5 22:22:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:22:15 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/watchdogd: bump to version 4.0 In-Reply-To: <20240130215628.884512-2-troglobit@gmail.com> References: <20240130215628.884512-1-troglobit@gmail.com> <20240130215628.884512-2-troglobit@gmail.com> Message-ID: Joachim, All, On 2024-01-30 22:56 +0100, Joachim Wiberg spake thusly: > For details, see https://github.com/troglobit/watchdogd/releases/tag/4.0 > > - Major feature upgrade, command line and .conf files compatible > - LICENSE hash update due to update in copyright years > - Enabling system monitor plugins have changed syntax upstream. The > `--with-foo=SECONDS` is now just `--with-foo` > > This last upstream change require converting affected Config.in options > from int -> bool. Legacy _WRAP:ers have been added to Config.legacy.in, > modeled on BR2_TARGET_ROOTFS_EXT2_BLOCKS. > > Signed-off-by: Joachim Wiberg > --- [--SNIP--] > diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk > index ea033b4e71..2e67c2847e 100644 > --- a/package/watchdogd/watchdogd.mk > +++ b/package/watchdogd/watchdogd.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WATCHDOGD_VERSION = 3.5 > +WATCHDOGD_VERSION = 4.0 > WATCHDOGD_SITE = https://github.com/troglobit/watchdogd/releases/download/$(WATCHDOGD_VERSION) > WATCHDOGD_LICENSE = ISC > WATCHDOGD_LICENSE_FILES = LICENSE > @@ -20,28 +20,29 @@ else > WATCHDOGD_CONF_OPTS += --enable-builtin-tests > endif I also added explicit --without-XXX options for the new monitors, by the way. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 5 22:23:55 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:23:55 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/watchdogd: add menuconfig support for new system monitors In-Reply-To: <20240130215628.884512-3-troglobit@gmail.com> References: <20240130215628.884512-1-troglobit@gmail.com> <20240130215628.884512-3-troglobit@gmail.com> Message-ID: Joachim, All, On 2024-01-30 22:56 +0100, Joachim Wiberg spake thusly: > Signed-off-by: Joachim Wiberg Applied to master after dropping the explicit --without-XX I introduced in the previous patch, thanks. (please check I did not bork anything!) Regards, Yann E. MORIN. > --- > package/watchdogd/Config.in | 10 ++++++++++ > package/watchdogd/watchdogd.mk | 11 +++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/package/watchdogd/Config.in b/package/watchdogd/Config.in > index 0b0480ea27..0aeaad165f 100644 > --- a/package/watchdogd/Config.in > +++ b/package/watchdogd/Config.in > @@ -51,4 +51,14 @@ config BR2_PACKAGE_WATCHDOGD_MEMINFO > help > Enable memory leak monitor. > > +config BR2_PACKAGE_WATCHDOGD_FSMON > + bool "File system monitor" > + help > + Enable file system monitor. > + > +config BR2_PACKAGE_WATCHDOGD_TEMPMON > + bool "Temperature monitor" > + help > + Enable temperature monitor. > + > endif > diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk > index 2e67c2847e..9d06b04bd3 100644 > --- a/package/watchdogd/watchdogd.mk > +++ b/package/watchdogd/watchdogd.mk > @@ -43,6 +43,17 @@ WATCHDOGD_CONF_OPTS += --without-meminfo > else > WATCHDOGD_CONF_OPTS += --with-meminfo > endif > + > +ifneq ($(BR2_PACKAGE_WATCHDOGD_FSMON),y) > +WATCHDOGD_CONF_OPTS += --without-fsmon > +else > +WATCHDOGD_CONF_OPTS += --with-fsmon > +endif > + > +ifneq ($(BR2_PACKAGE_WATCHDOGD_TEMPMON),y) > +WATCHDOGD_CONF_OPTS += --without-tempmon > +else > +WATCHDOGD_CONF_OPTS += --with-tempmon > endif > > define WATCHDOGD_INSTALL_INIT_SYSV > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Mon Feb 5 22:28:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:28:56 +0100 Subject: [Buildroot] [PATCH v2 1/1] support/testing: add a "file" package runtime test In-Reply-To: <20240124221950.14714-1-ju.o@free.fr> (Julien Olivain's message of "Wed, 24 Jan 2024 23:19:50 +0100") References: <20240124221950.14714-1-ju.o@free.fr> Message-ID: <87y1by8s0n.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > Changes v1 -> v2: > Included Yann's comments: > - Moved test data in rootfs-overlay, > - Merged all test cases in a single loop, > - Do the output pattern check in Python, > Other change: > - Added 2 cases (C and shellscript MIME) > Patch tested on branch master at commit fb007c9 with commands: Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 22:27:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:27:35 +0100 Subject: [Buildroot] [git commit] support/testing: add a "file" package runtime test Message-ID: <20240205222916.7B3E786E83@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e03513c773a4b58b87abbe906d9ca29b0c50ae5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_file.py | 48 +++++++++++++++++++++ .../package/test_file/rootfs-overlay/root/code.c | 9 ++++ .../test_file/rootfs-overlay/root/plain-text.txt | 1 + .../rootfs-overlay/root/plain-text.txt.gz | Bin 0 -> 62 bytes .../test_file/rootfs-overlay/root/random-data.bin | Bin 0 -> 512 bytes .../test_file/rootfs-overlay/root/script.py | 3 ++ .../test_file/rootfs-overlay/root/script.sh | 3 ++ .../rootfs-overlay/root/symlink-to-plain-text.txt | 1 + 9 files changed, 67 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f7a10c364d..5467e465d6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1769,6 +1769,8 @@ F: support/testing/tests/package/test_cryptsetup/ F: support/testing/tests/package/test_ddrescue.py F: support/testing/tests/package/test_ddrescue/ F: support/testing/tests/package/test_dos2unix.py +F: support/testing/tests/package/test_file.py +F: support/testing/tests/package/test_file/ F: support/testing/tests/package/test_fluidsynth.py F: support/testing/tests/package/test_fluidsynth/ F: support/testing/tests/package/test_fping.py diff --git a/support/testing/tests/package/test_file.py b/support/testing/tests/package/test_file.py new file mode 100644 index 0000000000..84eadc5ead --- /dev/null +++ b/support/testing/tests/package/test_file.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestFile(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_FILE=y + BR2_ROOTFS_OVERLAY="{infra.filepath("tests/package/test_file/rootfs-overlay")}" + 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]) + self.emulator.login() + + self.assertRunOk("file --version") + + tests = [ + ("", "plain-text.txt", "ASCII text"), + ("-i", "plain-text.txt", "text/plain"), + ("", "plain-text.txt.gz", "gzip compressed data"), + ("-i", "plain-text.txt.gz", "application/gzip"), + ("-z", "plain-text.txt.gz", "ASCII text"), + ("", "random-data.bin", "data"), + ("-i", "random-data.bin", "application/octet-stream"), + ("", "code.c", "C source"), + ("-i", "code.c", "text/x-c"), + ("", "script.sh", "POSIX shell script"), + ("-i", "script.sh", "text/x-shellscript"), + ("", "script.py", "Python script"), + ("", "/usr/share/misc/magic.mgc", "magic binary file for file"), + ("", "/usr/bin/file", "ELF"), + ("", "/dev/zero", "character special"), + ("", "/", "directory"), + ("-h", "symlink-to-plain-text.txt", "symbolic link"), + ("-L", "symlink-to-plain-text.txt", "ASCII text") + ] + for opt_str, path, pattern in tests: + cmd = f"file {opt_str} '{path}'" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0, f"Failed to run '{cmd}'") + self.assertIn(pattern, "\n".join(out)) diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/code.c b/support/testing/tests/package/test_file/rootfs-overlay/root/code.c new file mode 100644 index 0000000000..7095eaca31 --- /dev/null +++ b/support/testing/tests/package/test_file/rootfs-overlay/root/code.c @@ -0,0 +1,9 @@ +#include +#include + +int +main(void) +{ + printf("Hello Buildroot!\n"); + exit(EXIT_SUCCESS); +} diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt b/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt new file mode 100644 index 0000000000..1c5aa36037 --- /dev/null +++ b/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt @@ -0,0 +1 @@ +This is a plain text file... diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt.gz b/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt.gz new file mode 100644 index 0000000000..95d398f8d1 Binary files /dev/null and b/support/testing/tests/package/test_file/rootfs-overlay/root/plain-text.txt.gz differ diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/random-data.bin b/support/testing/tests/package/test_file/rootfs-overlay/root/random-data.bin new file mode 100644 index 0000000000..eea0ae8b76 Binary files /dev/null and b/support/testing/tests/package/test_file/rootfs-overlay/root/random-data.bin differ diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/script.py b/support/testing/tests/package/test_file/rootfs-overlay/root/script.py new file mode 100755 index 0000000000..79191b3048 --- /dev/null +++ b/support/testing/tests/package/test_file/rootfs-overlay/root/script.py @@ -0,0 +1,3 @@ +#! /usr/bin/env python3 + +print("Hello Buildroot!") diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/script.sh b/support/testing/tests/package/test_file/rootfs-overlay/root/script.sh new file mode 100755 index 0000000000..75b2d5e017 --- /dev/null +++ b/support/testing/tests/package/test_file/rootfs-overlay/root/script.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +echo "Hello Buildroot!" diff --git a/support/testing/tests/package/test_file/rootfs-overlay/root/symlink-to-plain-text.txt b/support/testing/tests/package/test_file/rootfs-overlay/root/symlink-to-plain-text.txt new file mode 120000 index 0000000000..a3ae3c0058 --- /dev/null +++ b/support/testing/tests/package/test_file/rootfs-overlay/root/symlink-to-plain-text.txt @@ -0,0 +1 @@ +plain-text.txt \ No newline at end of file From bubu at git.sr.ht Mon Feb 5 22:28:12 2024 From: bubu at git.sr.ht (~bubu) Date: Mon, 05 Feb 2024 23:28:12 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: remove unused import from sample_python_crossbar Message-ID: <170717267442.23753.14671176069067053494-0@git.sr.ht> From: Marcus Hoffmann Signed-off-by: Marcus Hoffmann --- support/testing/tests/package/sample_python_crossbar.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/sample_python_crossbar.py b/support/testing/tests/package/sample_python_crossbar.py index 8160a37219..3695fe92c0 100644 --- a/support/testing/tests/package/sample_python_crossbar.py +++ b/support/testing/tests/package/sample_python_crossbar.py @@ -1,4 +1,3 @@ -import os import crossbar crossbar.run(["version"]) -- 2.38.5 From peter at korsgaard.com Mon Feb 5 22:38:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:38:02 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: new sqlite runtime test In-Reply-To: <20240112195610.151822-1-ju.o@free.fr> (Julien Olivain's message of "Fri, 12 Jan 2024 20:56:10 +0100") References: <20240112195610.151822-1-ju.o@free.fr> Message-ID: <87ttmm8rlh.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 22:40:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:40:18 +0100 Subject: [Buildroot] [PATCH] package/sqlite: use SPDX identifier for license In-Reply-To: <20240110165111.3937223-1-christian@klarinett.li> (Christian Hitz via buildroot's message of "Wed, 10 Jan 2024 17:51:11 +0100") References: <20240110165111.3937223-1-christian@klarinett.li> Message-ID: <87plxa8rhp.fsf@48ers.dk> >>>>> "Christian" == Christian Hitz via buildroot writes: > From: Christian Hitz > Signed-off-by: Christian Hitz Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 22:39:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:39:47 +0100 Subject: [Buildroot] [git commit] package/sqlite: use SPDX identifier for license Message-ID: <20240205224101.73F5A86E93@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ddd257ca23e6bcf60676bcd292035fe99e6cbf62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The SPDX identifier for the sqlite license is "blessing": https://spdx.org/licenses/blessing.html Signed-off-by: Christian Hitz Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 99b1c4aa71..b54bd9580c 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -8,7 +8,7 @@ SQLITE_VERSION = 3.44.2 SQLITE_TAR_VERSION = 3440200 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2023 -SQLITE_LICENSE = Public domain +SQLITE_LICENSE = blessing SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite SQLITE_INSTALL_STAGING = YES From peter at korsgaard.com Mon Feb 5 22:38:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:38:20 +0100 Subject: [Buildroot] [git commit] support/testing: new sqlite runtime test Message-ID: <20240205224101.696E386E92@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b63c21379491461b5a910a171dcd7f4a6c06e9a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_sqlite.py | 101 +++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5467e465d6..2d3d2cdda8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1826,6 +1826,7 @@ F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py +F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_tcl.py diff --git a/support/testing/tests/package/test_sqlite.py b/support/testing/tests/package/test_sqlite.py new file mode 100644 index 0000000000..215703d7f2 --- /dev/null +++ b/support/testing/tests/package/test_sqlite.py @@ -0,0 +1,101 @@ +import os + +import infra.basetest + + +class TestSQLite(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_SQLITE=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + db_file = "buildroot.db" + db_backup = "db_dump.sql" + + def run_sql_query(self, query): + cmd = f'sqlite3 "{self.db_file}" "{query}"' + self.assertRunOk(cmd) + + def create_tables(self): + sql_query = "CREATE TABLE fruits (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE colors (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE fruit_colors (" + sql_query += "fruit_id integer REFERENCES fruits(id), " + sql_query += "color_id integer REFERENCES colors(id), " + sql_query += "UNIQUE (fruit_id, color_id));" + self.run_sql_query(sql_query) + + def insert_data(self): + fruits = ["Banana", "Blueberry", "Orange", "Raspberry"] + fruit_id = 1 + for fruit in fruits: + sql_query = "INSERT INTO fruits (id, name) " + sql_query += f"VALUES ({fruit_id}, '{fruit}');" + self.run_sql_query(sql_query) + fruit_id += 1 + + colors = ["Blue", "Orange", "Red", "Yellow"] + color_id = 1 + for color in colors: + sql_query = "INSERT INTO colors (id, name) " + sql_query += f"VALUES ({color_id}, '{color}');" + self.run_sql_query(sql_query) + color_id += 1 + + fruit_colors = [(1, 4), (2, 1), (3, 2), (4, 3)] + for fruit_color in fruit_colors: + fruit_id, color_id = fruit_color + sql_query = "INSERT INTO fruit_colors (fruit_id, color_id) " + sql_query += f"VALUES ({fruit_id}, {color_id});" + self.run_sql_query(sql_query) + + def query_database(self): + sql_query = "SELECT " + sql_query += "fruits.name AS fruit, colors.name AS color " + sql_query += "FROM fruits, colors, fruit_colors " + sql_query += "WHERE fruits.id = fruit_colors.fruit_id " + sql_query += "AND colors.id = fruit_colors.color_id " + sql_query += "ORDER BY fruit;" + self.run_sql_query(sql_query) + + 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]) + self.emulator.login() + + # The sqlite3 binary can execute. + self.assertRunOk("sqlite3 --version") + + self.create_tables() + self.insert_data() + self.query_database() + + sql_query = "UPDATE fruits SET name = 'Lemon' WHERE id = 1;" + self.run_sql_query(sql_query) + + # Dump the test database for a backup. + cmd = f'echo .dump | sqlite3 "{self.db_file}" > "{self.db_backup}"' + self.assertRunOk(cmd) + + # Drop all the tables. + tables = ["fruit_colors", "fruits", "colors"] + for table in tables: + sql_query = f"DROP TABLE {table};" + self.run_sql_query(sql_query) + + # Restore the backup. + cmd = f'sqlite3 "{self.db_file}" < "{self.db_backup}"' + self.assertRunOk(cmd) + + # Query on last time our data, to check the backup restoration + # succeeded. + self.query_database() From peter at korsgaard.com Mon Feb 5 22:46:26 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:46:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-hwdata: bump to version 2.4.1 In-Reply-To: <20240109081917.4070744-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 9 Jan 2024 01:19:17 -0700") References: <20240109081917.4070744-1-james.hilliard1@gmail.com> Message-ID: <87le7y8r7h.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Drop no longer required license file download. > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Mon Feb 5 22:41:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:41:33 +0100 Subject: [Buildroot] [git commit] package/re2: bump to version 2024-02-01 Message-ID: <20240205224648.58A9586E98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bb803fbd91e0b6c0d74a90a15858d18743ed68bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Nosthoff Signed-off-by: Yann E. MORIN --- package/re2/re2.hash | 2 +- package/re2/re2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 5f590aba6e..543c416087 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a re2-2023-11-01.tar.gz +sha256 cd191a311b84fcf37310e5cd876845b4bf5aee76fdd755008eef3b6478ce07bb re2-2024-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index b81a64f2e9..b962b53e3f 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2023-11-01 +RE2_VERSION = 2024-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Mon Feb 5 22:47:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:47:23 +0100 Subject: [Buildroot] [PATCH] package/re2: bump to version 2024-02-01 In-Reply-To: <20240205203521.201702-1-buildroot@heine.tech> References: <20240205203521.201702-1-buildroot@heine.tech> Message-ID: Michael, All, On 2024-02-05 21:35 +0100, Michael Nosthoff via buildroot spake thusly: > Signed-off-by: Michael Nosthoff Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/re2/re2.hash | 2 +- > package/re2/re2.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/re2/re2.hash b/package/re2/re2.hash > index 5f590aba6e..543c416087 100644 > --- a/package/re2/re2.hash > +++ b/package/re2/re2.hash > @@ -1,3 +1,3 @@ > # locally calculated > -sha256 4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a re2-2023-11-01.tar.gz > +sha256 cd191a311b84fcf37310e5cd876845b4bf5aee76fdd755008eef3b6478ce07bb re2-2024-02-01.tar.gz > sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE > diff --git a/package/re2/re2.mk b/package/re2/re2.mk > index b81a64f2e9..b962b53e3f 100644 > --- a/package/re2/re2.mk > +++ b/package/re2/re2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -RE2_VERSION = 2023-11-01 > +RE2_VERSION = 2024-02-01 > RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) > RE2_LICENSE = BSD-3-Clause > RE2_LICENSE_FILES = LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Mon Feb 5 22:48:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 05 Feb 2024 23:48:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-idna: bump to version 3.6 In-Reply-To: <20240109082244.4072761-1-james.hilliard1@gmail.com> (James Hilliard's message of "Tue, 9 Jan 2024 01:22:44 -0700") References: <20240109082244.4072761-1-james.hilliard1@gmail.com> Message-ID: <87h6im8r4g.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > License file hash changed due to year update: > https://github.com/kjd/idna/commit/89cd0612146a50a720e5aef8f040ca8ed4c6274b > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Mon Feb 5 22:48:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:48:20 +0100 Subject: [Buildroot] [git commit] package/python-hwdata: bump to version 2.4.1 Message-ID: <20240205224845.1D9F086EAB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=beef64d5ea34577f7539d4323d05a0c59bd612c9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required license file download. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-hwdata/python-hwdata.hash | 6 +++--- package/python-hwdata/python-hwdata.mk | 13 ++----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/package/python-hwdata/python-hwdata.hash b/package/python-hwdata/python-hwdata.hash index 0c7ca31476..57c2dd0003 100644 --- a/package/python-hwdata/python-hwdata.hash +++ b/package/python-hwdata/python-hwdata.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hwdata/json -md5 dccf3b28d06fb9c6f56875e148356c24 hwdata-2.3.7.tar.gz -sha256 9e5c96be38d9218ffde40834d4ca03344b8dfaed29c8c5afe0030125ea03db03 hwdata-2.3.7.tar.gz -# Locally computed +md5 0344fe7a3e21041c2ef0ed36ee2bef18 hwdata-2.4.1.tar.gz +sha256 9bad80237c81cc091615179d665a3ef1213acca4caa378ff037c81f34538cde9 hwdata-2.4.1.tar.gz +# Locally computed sha256 checksums sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/python-hwdata/python-hwdata.mk b/package/python-hwdata/python-hwdata.mk index 5e968ce847..c277eebccc 100644 --- a/package/python-hwdata/python-hwdata.mk +++ b/package/python-hwdata/python-hwdata.mk @@ -4,20 +4,11 @@ # ################################################################################ -PYTHON_HWDATA_VERSION = 2.3.7 +PYTHON_HWDATA_VERSION = 2.4.1 PYTHON_HWDATA_SOURCE = hwdata-$(PYTHON_HWDATA_VERSION).tar.gz -PYTHON_HWDATA_SITE = https://files.pythonhosted.org/packages/15/26/f5bc1b42129fbcbd1c99c29714af1685fc89e2cf37680a9930d4fcac1808 +PYTHON_HWDATA_SITE = https://files.pythonhosted.org/packages/ff/ec/4a6e57d765a63f7e9a8c5348f0bf3f7d39243dc5bc695fa1e887ca5856c8 PYTHON_HWDATA_SETUP_TYPE = setuptools PYTHON_HWDATA_LICENSE = GPL-2.0+ PYTHON_HWDATA_LICENSE_FILES = LICENSE -# There is no LICENSE file in the PyPi tarball, but it is available in -# upstream git repository: -PYTHON_HWDATA_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/xsuchy/python-hwdata/python-hwdata-$(PYTHON_HWDATA_VERSION)-1/LICENSE - -define PYTHON_HWDATA_ADD_LICENSE_FILE - cp $(PYTHON_HWDATA_DL_DIR)/LICENSE $(@D) -endef -PYTHON_HWDATA_POST_EXTRACT_HOOKS += PYTHON_HWDATA_ADD_LICENSE_FILE - $(eval $(python-package)) From peter at korsgaard.com Mon Feb 5 22:48:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Mon, 5 Feb 2024 23:48:21 +0100 Subject: [Buildroot] [git commit] package/python-idna: bump to version 3.6 Message-ID: <20240205224845.289B386EAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=70601ca41c2bb67d056a4c6e5710647385acda29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License file hash changed due to year update: https://github.com/kjd/idna/commit/89cd0612146a50a720e5aef8f040ca8ed4c6274b Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-idna/python-idna.hash | 6 +++--- package/python-idna/python-idna.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index 3a758a6eac..5e6ac716a2 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 13ea24e076212b6baae1135a116d1e0e idna-3.4.tar.gz -sha256 814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 idna-3.4.tar.gz +md5 70f4beef4feb196ac64b75a93271f53c idna-3.6.tar.gz +sha256 9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca idna-3.6.tar.gz # Locally computed sha256 checksums -sha256 a2d6e4d940bd24dbe7b9645cde19a9792cc51db7ae0d5acd301ac860caa3e836 LICENSE.md +sha256 cb2faf0ca18c6d387ec7cb66f321939fba6e67e9dac09d31477cb9d8d3fe6899 LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 3976cb1518..eb92432bd3 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 3.4 +PYTHON_IDNA_VERSION = 3.6 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/8b/e1/43beb3d38dba6cb420cefa297822eac205a277ab43e5ba5d5c46faf96438 +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/bf/3f/ea4b9117521a1e9c50344b909be7886dd00a519552724809bb1f486986c2 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md PYTHON_IDNA_SETUP_TYPE = flit From romain.naour at smile.fr Mon Feb 5 22:49:22 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 5 Feb 2024 23:49:22 +0100 Subject: [Buildroot] [autobuild.buildroot.net] runtime issues analyses In-Reply-To: <20240130064740.9A544417EA@smtp4.osuosl.org> References: <20240130064740.9A544417EA@smtp4.osuosl.org> Message-ID: <28f127e3-b8f8-4ed2-8fa8-d92b50d4884a@smile.fr> Hello, Le 30/01/2024 ? 07:47, Thomas Petazzoni via buildroot a ?crit?: > Hello, > [...] > > Gitlab CI results for 2024-01-29 > ================================ > > Detail of runtime-test failures for master > ------------------------------------------ > > runtime-test | link to the job | orph? > --------------------------+---------------------------------------------------------------+------ > TestCpioDracutGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162462 | ORPH > ...ioDracutGlibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162463 | ORPH > TestCpioDracutMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162465 | ORPH > ...pioDracutMuslMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162468 | ORPH > TestCpioDracutUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162470 | ORPH > ...oDracutUclibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162471 | ORPH Dracut issue under discussion: http://lists.busybox.net/pipermail/buildroot/2024-February/684145.html > TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162761 | ORPH The drisw_glx driver is broken in Mesa 23.x due to dri3 header added unconditionally while the driver can be built without dri3 [1] Surprisingly, the glxinfo test log shows that mesa tried to load zink gallium driver while it was not enabled at build time. Indeed there is no such option in Buildroot. MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so [1] https://gitlab.freedesktop.org/mesa/mesa/-/commit/1887368df4166ae854245c0306d43661ef120e42 > TestGrubX8664EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040162292 | ORPH Fixed by: https://gitlab.com/buildroot.org/buildroot/-/commit/4f565b52225785bfa268ea19c4c347917d38ade4 > TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163014 | ORPH > TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163031 | ORPH weird python error: Sorry: IndentationError: expected an indented block after function definition on line 6 (plugin_test.py, line 8) > TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163045 | ORPH > ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163051 | ORPH error[E0432]: unresolved import `std::sync::atomic::AtomicI64` > ...PythonPy3MagicWormhole | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163069 | ORPH Not sure why the test failed... > TestPythonPy3SciPy | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163109 | ORPH Fixed by: https://gitlab.com/buildroot.org/buildroot/-/commit/393f5494187072533a1c69b82a26cf1f6d203a26 > TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/6040163138 | ORPH Fixed by: https://gitlab.com/buildroot.org/buildroot/-/commit/c43f12293d3a6668a79f5cfece402d46a87a473e From yann.morin.1998 at free.fr Mon Feb 5 22:49:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:49:15 +0100 Subject: [Buildroot] [git commit] support/testing: remove unused import from sample_python_crossbar Message-ID: <20240205225539.C4B1486EB1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=420d34a8ad20bc1aefb7ca0c50e7d2beae1d85ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- support/testing/tests/package/sample_python_crossbar.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/sample_python_crossbar.py b/support/testing/tests/package/sample_python_crossbar.py index 8160a37219..3695fe92c0 100644 --- a/support/testing/tests/package/sample_python_crossbar.py +++ b/support/testing/tests/package/sample_python_crossbar.py @@ -1,4 +1,3 @@ -import os import crossbar crossbar.run(["version"]) From yann.morin.1998 at free.fr Mon Feb 5 22:55:44 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 5 Feb 2024 23:55:44 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: remove unused import from sample_python_crossbar In-Reply-To: <170717267442.23753.14671176069067053494-0@git.sr.ht> References: <170717267442.23753.14671176069067053494-0@git.sr.ht> Message-ID: Marcus, All, On 2024-02-05 23:28 +0100, ~bubu spake thusly: > From: Marcus Hoffmann > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/testing/tests/package/sample_python_crossbar.py | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/support/testing/tests/package/sample_python_crossbar.py b/support/testing/tests/package/sample_python_crossbar.py > index 8160a37219..3695fe92c0 100644 > --- a/support/testing/tests/package/sample_python_crossbar.py > +++ b/support/testing/tests/package/sample_python_crossbar.py > @@ -1,4 +1,3 @@ > -import os > import crossbar > > crossbar.run(["version"]) > -- > 2.38.5 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From hanyuan-z at qq.com Tue Feb 6 02:40:58 2024 From: hanyuan-z at qq.com (hanyuan) Date: Tue, 6 Feb 2024 10:40:58 +0800 Subject: [Buildroot] [PATCH v2 1/2] configs/milkv_duo: new defconfig In-Reply-To: References: Message-ID: Hello Giulio, Thanks! It?s nice to get your reviews. Let me explain some of them. > 2024?2?6? 01:25?Giulio Benetti ??? > > Hi Hanyuan, > > thank for contributing, > one important note is to swap Patch 1/2 and 2/2. This is because they > are bisectable this way since on Patch 1/2 you enable packages appearing > in Patch 2/2, also, Got it. Should I later sent the Patch V3 and make them look like: [v3,1/2] package/milkv-duo: add packages for milkv-duo [v3,2/2] configs/milkv_duo: new defconfig > can you please provide the board product webpage URL here? > And also some ION indications too? Got it. I would append more info to the readme.txt about what the ION means. > All this if statement is redundant with the else part. > Can you add a variable like: > FIPTOOL_ARGUMENTS = genfip ${BINARIES_DIR}/fip.bin \ > --MONITOR_RUNADDR=0x80000000 \ > --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ > --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ > --NAND_INFO=00000000 \ > --BL2=${BINARIES_DIR}/bl2.bin \ > --BLCP_IMG_RUNADDR=0x05200200 \ > --BLCP_PARAM_LOADADDR=0 \ > --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ > --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ > --LOADER_2ND=${BINARIES_DIR}/u-boot.bin \ > > and then you add or not the remaining BLCP* variables below and execute > ${BINARIES_DIR}/fiptool.py ${FIPTOOL_ARGUMENTS} > Then this nested if statement and.. > ..this are redundant too. Can you provide a single if-else-fi statement > outside the main if statement... > ... here? > Sorry for that. OK, I would make these lines look better. > Is CXX needed by any package selected here? At that time I submitted the patch I haven?t understand the buildroot?s minimal philosophy too much. Sorry for that. I would remove this line. > here you need: > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > here you need: > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y OK. I will add them. > For the rest the patch looks good and builds fine using utils/docker-run except package htop that fails to build due to gcc ICE 109809 for which > I've sent a patch: > https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 > > So this patchset depends on patchset above for htop gcc ICE. I think I should tell you this. In fact I encountered another gcc bug when using all the t-head?s optimizations with the glibc. The gcc reported internal errors when we +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" So we have to use musl and find this bug is not reported anymore. Maybe the htop compiling bug comes from these optimizations. I would have a try what would happen if we disable all the t-head features and then compile the htop. If it is really the t-head?s problem, maybe we can let the t-head?s optimizations go. Thanks again for your careful review! Best regards, Hanyuan From asd617140123 at gmail.com Tue Feb 6 03:33:03 2024 From: asd617140123 at gmail.com (Nigel Wang) Date: Tue, 6 Feb 2024 11:33:03 +0800 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. Message-ID: <20240206033303.38280-1-asd617140123@gmail.com> From: nigel_wang configs/cubieboard4_defconfig : add defconfig for cubieboard4. board/cubietech/cubieboard4/extlinux.conf: using the config to make device can boot uboot/kernel correctly. board/cubietech/cubieboard4/genimage.cfg: Adjust boot dtb/sdcard memory layout. board/cubietech/cubieboard4/post-image.sh: using extlinux.conf in the file, it can use "genimage" to generate sdcard image. modified: configs/cubieboard4_defconfig: remove unnecessary option. Replaced boot.cmd by extlinux.conf. Append name in DEVELOPERS file. Signed-off-by: Nigel Wang --- DEVELOPERS | 4 +++ board/cubietech/cubieboard4/extlinux.conf | 5 +++ board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ 5 files changed, 104 insertions(+) create mode 100644 board/cubietech/cubieboard4/extlinux.conf create mode 100644 board/cubietech/cubieboard4/genimage.cfg create mode 100755 board/cubietech/cubieboard4/post-image.sh create mode 100644 configs/cubieboard4_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a03018ab2b..bffb8f2069 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3297,3 +3297,7 @@ F: package/quazip/ F: package/shapelib/ F: package/simple-mail/ F: package/tinc/ + +N: Nigel Wang +F: board/cubietech/cubieboard4/ +F: configs/cubieboard4_defconfig diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf new file mode 100644 index 0000000000..5084e2237b --- /dev/null +++ b/board/cubietech/cubieboard4/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /boot/zImage + devicetree /sun9i-a80-cubieboard4.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg new file mode 100644 index 0000000000..f1dee13923 --- /dev/null +++ b/board/cubietech/cubieboard4/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the Cubieboard2 +# Based in the Orange Pi genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun9i-a80-cubieboard4.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh new file mode 100755 index 0000000000..e37b960a4d --- /dev/null +++ b/board/cubietech/cubieboard4/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig new file mode 100644 index 0000000000..0592fe4a2d --- /dev/null +++ b/configs/cubieboard4_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From asd617140123 at gmail.com Tue Feb 6 03:34:36 2024 From: asd617140123 at gmail.com (Nigel Wang) Date: Tue, 6 Feb 2024 11:34:36 +0800 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. Message-ID: <20240206033436.38436-1-asd617140123@gmail.com> From: nigel_wang This is a new defconfig for cubieboard4. The following is board's detail. - SOC: sunxiA80. - DRAM: 2GiB DDR3 @ 672MHZ. - NAND: 8GBeMMC - Power: DC 5V. - Network: Wifi 80211 b/g/n. - Ethernet: RTL8211E reference: https://linux-sunxi.org/Cubietech_Cubieboard4 Board support package includes the following components: - mainline Linux Kernel 6.6.8 - mainline U-boot 2021.10. Signed-off-by: Nigel Wang --- DEVELOPERS | 4 +++ board/cubietech/cubieboard4/extlinux.conf | 5 +++ board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ 5 files changed, 104 insertions(+) create mode 100644 board/cubietech/cubieboard4/extlinux.conf create mode 100644 board/cubietech/cubieboard4/genimage.cfg create mode 100755 board/cubietech/cubieboard4/post-image.sh create mode 100644 configs/cubieboard4_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a03018ab2b..bffb8f2069 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3297,3 +3297,7 @@ F: package/quazip/ F: package/shapelib/ F: package/simple-mail/ F: package/tinc/ + +N: Nigel Wang +F: board/cubietech/cubieboard4/ +F: configs/cubieboard4_defconfig diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf new file mode 100644 index 0000000000..5084e2237b --- /dev/null +++ b/board/cubietech/cubieboard4/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /boot/zImage + devicetree /sun9i-a80-cubieboard4.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg new file mode 100644 index 0000000000..f1dee13923 --- /dev/null +++ b/board/cubietech/cubieboard4/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the Cubieboard2 +# Based in the Orange Pi genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun9i-a80-cubieboard4.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh new file mode 100755 index 0000000000..e37b960a4d --- /dev/null +++ b/board/cubietech/cubieboard4/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig new file mode 100644 index 0000000000..0592fe4a2d --- /dev/null +++ b/configs/cubieboard4_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From fran.millocs at live.com.ar Tue Feb 6 04:14:50 2024 From: fran.millocs at live.com.ar (franco ariel) Date: Tue, 6 Feb 2024 04:14:50 +0000 Subject: [Buildroot] Best board to fast boot Message-ID: Hello guys! I few weeks ago I started working with buildroot on rpi4, and it's look amazing, thanks to the community I was able to run a flutter app on my rpi4. But now, I want to keep going forward with my project, so ?Witch one are the best board to achieve te best boot time to a Qt application? I was looking for the Rockpro64 from pine but I'm not sure, since there is not so much information about this board. What do you think it will be good for my project? On rpi4 I was able to get 10sec boot time until the qt app shows up. And I want to achieve less than 7s. Thank you so much to all. Franco -------------- next part -------------- An HTML attachment was scrubbed... URL: From asd617140123 at gmail.com Tue Feb 6 05:04:13 2024 From: asd617140123 at gmail.com (Nigel Wang) Date: Tue, 6 Feb 2024 13:04:13 +0800 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. Message-ID: <20240206050413.38810-1-asd617140123@gmail.com> From: nigel_wang add Cubieboard4 board support. - SOC: Allwinner A80. - DRAM: 2GiB DDR3 @ 672MHZ. - NAND: 8GBeMMC - Power: DC 5V. - Wifi: 80211 b/g/n. (module is AP6330) Reference: https://hirokun.jp/AP6330.pdf - Ethernet: RTL8211E Reference: https://linux-sunxi.org/Cubietech_Cubieboard4 Board support package includes the following components: - mainline Linux Kernel 6.6.8 - mainline U-boot 2021.10. Signed-off-by: Nigel Wang --- DEVELOPERS | 4 +++ board/cubietech/cubieboard4/extlinux.conf | 5 +++ board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ 5 files changed, 104 insertions(+) create mode 100644 board/cubietech/cubieboard4/extlinux.conf create mode 100644 board/cubietech/cubieboard4/genimage.cfg create mode 100755 board/cubietech/cubieboard4/post-image.sh create mode 100644 configs/cubieboard4_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a03018ab2b..bffb8f2069 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3297,3 +3297,7 @@ F: package/quazip/ F: package/shapelib/ F: package/simple-mail/ F: package/tinc/ + +N: Nigel Wang +F: board/cubietech/cubieboard4/ +F: configs/cubieboard4_defconfig diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf new file mode 100644 index 0000000000..5084e2237b --- /dev/null +++ b/board/cubietech/cubieboard4/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /boot/zImage + devicetree /sun9i-a80-cubieboard4.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg new file mode 100644 index 0000000000..f1dee13923 --- /dev/null +++ b/board/cubietech/cubieboard4/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the Cubieboard2 +# Based in the Orange Pi genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun9i-a80-cubieboard4.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh new file mode 100755 index 0000000000..e37b960a4d --- /dev/null +++ b/board/cubietech/cubieboard4/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig new file mode 100644 index 0000000000..0592fe4a2d --- /dev/null +++ b/configs/cubieboard4_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From kilian.zinnecker at mail.de Tue Feb 6 06:41:13 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Tue, 06 Feb 2024 07:41:13 +0100 Subject: [Buildroot] [help] configs/rock5b_defconfig: Switch to mainline kernel Message-ID: <2716329.mvXUDI8C0e@laptop> Hello, The board support for the Rock5b uses a custom kernel. However, there already exists some mainline support for its SoC, the Rockchip RK3588 [1]. Some of it seems to already be present in kernel 6.6, which is the current latest version in buildroot. I would like to change the kernel used for the Rock5b from custom to mainline. Unfortunately I face a challenge. In order to get kernel log output on the serial interface, I changed the consosole from ttyS2,1500000n8 to serial2,1500000n8 in the kernel bootargs (as seen in Sebastian Reichel's Kernel Recipes 2023 talk). After that, it shows the kernel messages, but it never reaches a shell: [ 0.321600] mmc_host mmc1: Bus speed (slot 0) = 400000Hz (slot req 400000Hz, actual 400000HZ div = 0) [ 0.370827] hub 4-0:1.0: USB hub found [ 0.371218] hub 4-0:1.0: 1 port detected [ 0.372291] Waiting for root device /dev/mmcblk0p2... [ 0.382457] mmc_host mmc1: Bus speed (slot 0) = 198000000Hz (slot req 200000000Hz, actual 198000000HZ div = 0) [ 0.497629] usb 1-1: new high-speed USB device number 2 using ehci-platform [ 0.655570] hub 1-1:1.0: USB hub found [ 0.656181] hub 1-1:1.0: 4 ports detected [ 0.794063] dwmmc_rockchip fe2c0000.mmc: Successfully tuned phase to 118 [ 0.794672] mmc1: new ultra high speed SDR104 SDHC card at address 5048 [ 0.796162] mmcblk1: mmc1:5048 SD32G 29.7 GiB [ 0.802500] GPT:Primary header thinks Alt. header is not at the end of the disk. [ 0.803155] GPT:563351 != 62357503 [ 0.803459] GPT:Alternate GPT header not at the end of the disk. [ 0.803985] GPT:563351 != 62357503 [ 0.804287] GPT: Use GNU Parted to correct GPT errors. [ 0.804761] mmcblk1: p1 p2 [ 31.717905] vdd_gpu_s0: disabling [ 115.285576] random: crng init done Of course it could be, that it is just not configured anymore to put a shell on the serial interface, but I already tried to address that with: BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="serial2" However, that did not seem to help. Could it be, that there is something wrong with the SD card formatting? It at least complains about it, but I am too unfamiliar with that, so I don't know whether it is a problem. I also tried to change the rootfs partition in the bootargs mmcblk0p2 to mmcblk1p2, but then the boot got stuck at some other place. As kernel defconfig I use the default arm64 defconfig (BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y). Could that also be an issue, i.e., that I should provide a tailored one, e.g., by starting from the one used by the custom kernel? I appreciate any help or suggestions, thanks and best regards, Kilian [1] https://gitlab.collabora.com/hardware-enablement/rockchip-3588/notes-for-rockchip-3588/-/blob/main/mainline-status.md From thomas.petazzoni at bootlin.com Tue Feb 6 06:55:11 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 06 Feb 2024 06:55:11 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-05 Message-ID: Hello, Autobuild statistics for 2024-02-05 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 5 | 3 | 0 | 8 | 2023.11.x | 0 | 5 | 0 | 5 | master | 45 | 44 | 0 | 89 | Classification of failures by reason for master ----------------------------------------------- libpthsem-2.0.8 | 5 unknown | 5 host-sentry-cli-2.20.3 | 3 attr-2.5.2 | 2 glibc-2.38-44-gd37c2b20a478... | 2 gobject-introspection-1.76.1 | 2 libnss-3.97 | 2 libressl-3.8.2 | 2 linux-6.6.15 | 2 Makefile:727: target-finalize | 2 cegui-00b4e1fe174da53b7ed72... | 1 elfutils-0.189 | 1 eza-0.16.0 | 1 fs/jffs2/jffs2.mk:71: /home... | 1 host-rust-1.74.1 | 1 libabseil-cpp-20230802.1 | 1 libarchive-3.7.2 | 1 linux-5.10.162-cip24-rt10 | 1 linux-pam-1.6.0 | 1 linux-tools | 1 memtest86-6.20 | 1 openssh-9.6p1 | 1 rsync-3.2.7 | 1 stunnel-5.71 | 1 util-linux-2.39.2 | 1 v4l2loopback-0.12.7 | 1 valgrind-3.22.0 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/dff81bf3ca25bd0fab6085ad6f1bd19d3f8db2ce | microblaze | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/a381bb39e8422bb8ddf118a576ea2c705844637f | mips | cegui-00b4e1fe174da53b7ed72... | NOK | http://autobuild.buildroot.net/results/44890d6ee506c7428f7a1898a0f73222efc5b426 | m68k | elfutils-0.189 | NOK | http://autobuild.buildroot.net/results/7c863e736ad4896f26dcc895c8ffba3e95e360ae | ORPH armeb | eza-0.16.0 | NOK | http://autobuild.buildroot.net/results/b61bda2df58ef0a866f747d8a05e49986d043aa4 | powerpc64 | fs/jffs2/jffs2.mk:71: /home... | NOK | http://autobuild.buildroot.net/results/386e725437b9d4bf4000cd8aafae9080dfe8bc8d | powerpc | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/54f1a4303530f18a140577e575c7084a20468aef | riscv64 | glibc-2.38-44-gd37c2b20a478... | NOK | http://autobuild.buildroot.net/results/d9c6a4db7fd02c45cebb5a9687b636cd0fc99a0c | sh4aeb | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/51289ee681e3971e65dd24eaa8c025fbc2888529 | ORPH nios2 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/c253a6bce2ee6afad5c36bf84d0d00a4714d024c | ORPH aarch64 | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/4613ff68965114990566a923c306682bd8c80a82 | riscv64 | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/fc1f5f93d2425d923e2fce51eda6bd11886485b5 | riscv32 | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/5db3fcc34cb47d0d948aadbf37f6449ed34e918c | xtensa | host-sentry-cli-2.20.3 | NOK | http://autobuild.buildroot.net/results/9709362a679a1a8b302eb51bebec363a62fabe25 | mips64el | libabseil-cpp-20230802.1 | NOK | http://autobuild.buildroot.net/results/e2a44832f3965e4586de399672827e35524ebc0f | s390x | libarchive-3.7.2 | NOK | http://autobuild.buildroot.net/results/bb88b8c73112af3383625b3cc06134e3eaeaf41e | mips64el | libnss-3.97 | NOK | http://autobuild.buildroot.net/results/2dd0dfb535c8fe9079be4c9e743e342344c89e9a | powerpc64le | libnss-3.97 | NOK | http://autobuild.buildroot.net/results/765a13e3d9377a8042415b0e83b5fe22eda84e8a | arc | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/34e7ce3144b9aa253440e5621fce14990e266afc | arm | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/9c7d636d3532805ef14d6cfb7fa62900c065ab60 | aarch64 | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/ed9e1a47a668cdeec71a40f13cbb37dbf608d0ce | or1k | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/17794a49cdb4748f6282a1b8602e323a7b18d296 | microblaze | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/ef75e960a3cbccb38c14631762937e183f4827b3 | arceb | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/c18ec22b16d7ce0857d228ae8dc51c876ce0e928 | ORPH or1k | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/aeb55fceceeb5938db68411be446e9c462c78bcd | ORPH arc | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/9d9471934f55f45cbd5d6658a73e7cb33e247b14 | ORPH mips64 | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/49f8d5e73465cec539c067382c515be73656816b | ORPH sh4a | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/797a0bde20d4a257ffdc66c38577fc139a6e5bea | ORPH mips64el | linux-pam-1.6.0 | NOK | http://autobuild.buildroot.net/results/f07360f33010a2cf19aace266faae14a834bd9a4 | ORPH x86_64 | linux-tools | NOK | http://autobuild.buildroot.net/results/80abb2e78ad63e28b5717ec4a54aa3fbc2b2251a | ORPH armeb | Makefile:727: target-finalize | NOK | http://autobuild.buildroot.net/results/668800cc90bcd69aca63a20ca19ddbe53c8571ec | mips64 | Makefile:727: target-finalize | NOK | http://autobuild.buildroot.net/results/de0be520e60019becd07523f08448a66070a9f7e | i686 | memtest86-6.20 | NOK | http://autobuild.buildroot.net/results/5a37403206d1af3317c05ee63d92d4fa0488c53c | powerpc64 | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/75e39ca694f09e5ef8bc7f31bf63dff7f0876816 | ORPH microblazeel | rsync-3.2.7 | NOK | http://autobuild.buildroot.net/results/b8589e42e14dbf54809284d577593896cf99fa69 | aarch64_be | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/5d6fcf716f41ab0b7ad465ed7ed2a7e5465bbefd | mips64 | unknown | NOK | http://autobuild.buildroot.net/results/addebf4d3d3f837f03ee80ea8161a75da9a703e4 | armeb | unknown | NOK | http://autobuild.buildroot.net/results/a385e8d7f3441b3867105a75dccd49c8ccc47386 | microblaze | unknown | NOK | http://autobuild.buildroot.net/results/7f398fbfe488d8701ca3a04c02d704a72771d5cd | mips | unknown | NOK | http://autobuild.buildroot.net/results/1cc45b9e1516a1ab08120765f6b2a304e9c18208 | s390x | unknown | NOK | http://autobuild.buildroot.net/results/098c036f661b1793df31c0bdc7420252eb1bfdf6 | sh4 | util-linux-2.39.2 | NOK | http://autobuild.buildroot.net/results/1b214c4c2bd524ac2a47b80da2e0252c628be6d0 | ORPH mips64 | v4l2loopback-0.12.7 | NOK | http://autobuild.buildroot.net/results/af5adb61ea068c3be571c34f49ef8d493a3f99ed | powerpc | valgrind-3.22.0 | NOK | http://autobuild.buildroot.net/results/1a2562d8d8a31312b3e2d84ba3e7ec21b05315a7 | ORPH Classification of failures by reason for 2023.02.x -------------------------------------------------- linux-6.1.72 | 1 mosquitto-2.0.18 | 1 raptor-2.0.15 | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- m68k | linux-6.1.72 | NOK | http://autobuild.buildroot.net/results/bbea1197de634560cdce29ef3277724bf3253443 | ORPH or1k | mosquitto-2.0.18 | NOK | http://autobuild.buildroot.net/results/ac2575c5aba9531acb6bcd08753237d0f7d1bbe3 | arceb | raptor-2.0.15 | NOK | http://autobuild.buildroot.net/results/b7b62e544182f31a8de1ccb3850a23497b69d17d | ORPH Classification of failures by reason for 2023.11.x -------------------------------------------------- e2fsprogs-1.47.0 | 1 gobject-introspection-1.76.1 | 1 libressl-3.8.2 | 1 spice-0.15.0 | 1 unknown | 1 Detail of failures for 2023.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- sh4aeb | e2fsprogs-1.47.0 | NOK | http://autobuild.buildroot.net/results/45f21ce9dbeec86eae8df45022b4fb408c1ada88 | ORPH powerpc | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/d5c69580e4948da4145de172c4357b9859e605e8 | ORPH arm | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/44faea13cdcfe54f6ec2b49aa49cd778a2b8f059 | ORPH x86_64 | spice-0.15.0 | NOK | http://autobuild.buildroot.net/results/c1ab7fbc5c62671238a07ef91feccea573008329 | mipsel | unknown | NOK | http://autobuild.buildroot.net/results/0bbbb0e8264369cd552b58a6941c63bfaf72ecc0 | Gitlab CI results for 2024-02-05 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestCpioDracutGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853966 | ORPH ...ioDracutGlibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853979 | ORPH TestCpioDracutMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854009 | ORPH ...pioDracutMuslMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854017 | ORPH TestCpioDracutUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854027 | ORPH ...oDracutUclibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854034 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854423 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854455 | ORPH TestGrubX8664EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854785 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854810 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854842 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854855 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854998 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093855074 | ORPH -- http://autobuild.buildroot.net From hanyuan-z at qq.com Tue Feb 6 08:06:03 2024 From: hanyuan-z at qq.com (Hanyuan Zhao) Date: Tue, 6 Feb 2024 16:06:03 +0800 Subject: [Buildroot] [PATCH v3 2/2] configs/milkv_duo: new defconfig In-Reply-To: <20240206080603.28916-1-hanyuan-z@qq.com> References: <20240206080603.28916-1-hanyuan-z@qq.com> Message-ID: Milk-V Duo is an ultra-compact embedded RISC-V development platform based on the CV1800B chip. It can run Linux and RTOS, providing a reliable, low-cost, and high-performance platform for professionals, industrial ODMs, AIoT enthusiasts, DIY hobbyists, and creators. https://milkv.io/duo Co-authored-by: Emil S Co-authored-by: GP Orcullo Signed-off-by: Hanyuan Zhao --- board/milkv/duo/genimage.cfg | 25 ++++++++ board/milkv/duo/post-image.sh | 47 +++++++++++++++ board/milkv/duo/readme.txt | 54 +++++++++++++++++ configs/milkv_duo_musl_riscv64_defconfig | 63 ++++++++++++++++++++ configs/milkv_duo_musl_riscv64_ion_defconfig | 63 ++++++++++++++++++++ 5 files changed, 252 insertions(+) create mode 100644 board/milkv/duo/genimage.cfg create mode 100755 board/milkv/duo/post-image.sh create mode 100644 board/milkv/duo/readme.txt create mode 100644 configs/milkv_duo_musl_riscv64_defconfig create mode 100644 configs/milkv_duo_musl_riscv64_ion_defconfig diff --git a/board/milkv/duo/genimage.cfg b/board/milkv/duo/genimage.cfg new file mode 100644 index 0000000000..1fd74f845a --- /dev/null +++ b/board/milkv/duo/genimage.cfg @@ -0,0 +1,25 @@ +image boot.vfat { + vfat { + files = { + "fip.bin", + "boot.sd", + } + } + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/milkv/duo/post-image.sh b/board/milkv/duo/post-image.sh new file mode 100755 index 0000000000..c58233003e --- /dev/null +++ b/board/milkv/duo/post-image.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +########################################################### +# File: post-image.sh +# Author: GP Orcullo +# Hanyuan Zhao +# Description: this sh will make the fip.bin and boot.sd, +# then pack everything to an image file. +########################################################### + +FIPTOOL_OPTS="genfip ${BINARIES_DIR}/fip.bin \ + --MONITOR_RUNADDR=0x80000000 \ + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ + --NAND_INFO=00000000 \ + --BL2=${BINARIES_DIR}/bl2.bin \ + --BLCP_IMG_RUNADDR=0x05200200 \ + --BLCP_PARAM_LOADADDR=0 \ + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin" + +if [ -f ${BINARIES_DIR}/cvirtos.bin ]; then + FIPTOOL_OPTS="${FIPTOOL_OPTS} \ + --BLCP=${BINARIES_DIR}/empty.bin \ + --BLCP_2ND=${BINARIES_DIR}/cvirtos.bin \ + --BLCP_2ND_RUNADDR=0x83f40000" + echo "[Duo Post-Image fiptool.py] Integrating FreeRTOS" +fi + +${BINARIES_DIR}/fiptool.py ${FIPTOOL_OPTS}\ +> ${BINARIES_DIR}/fip.log 2>&1 +if [ -f ${BINARIES_DIR}/fip.bin ]; then + echo "[Duo Post-Image fiptool.py] > fip.bin generated!" +fi + +cp ${BINARIES_DIR}/u-boot.dtb ${BINARIES_DIR}/cv1800b_milkv_duo_sd.dtb +lzma -fk ${BINARIES_DIR}/Image +mkimage -f ${BINARIES_DIR}/multi.its ${BINARIES_DIR}/boot.sd +if [ -f ${BINARIES_DIR}/boot.sd ]; then + echo "[Duo Post-Image] > boot.sd generated!" +fi +support/scripts/genimage.sh -c $(pwd)/board/milkv/duo/genimage.cfg +gzip -fk ${BINARIES_DIR}/sdcard.img +if [ -f ${BINARIES_DIR}/sdcard.img ]; then + echo "[Duo Post-Image] > sdcard.img generated!" +fi diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt new file mode 100644 index 0000000000..1623fa97c5 --- /dev/null +++ b/board/milkv/duo/readme.txt @@ -0,0 +1,54 @@ +Milk-V Duo (https://milkv.io/docs/duo/overview) + +Intro +===== + +Milk-V Duo is an ultra-compact embedded development platform +based on the rv64 CV1800B chip. It can run Linux and RTOS, +providing a reliable, cost-effective, and high-performance +platform for professionals, industrial ODMs, AIoT enthusiasts, +DIY enthusiasts, and creators. + +How to build it +=============== + +Configure Buildroot: + + $ make milkv_duo_musl_riscv64_defconfig + +The milkv_duo_musl_riscv64_defconfig will by default provide +the full 64MiB free RAM. If you want to build with memory +reserved for ION (generalized memory manager in linux, i.e. +some memory will be reserved for the camera algorithms), please try: + + $ make milkv_duo_musl_riscv64_ion_defconfig + +For more information about the ION, please refer to + +https://github.com/milkv-duo/duo-buildroot-sdk/blob/develop/README.md?plain=1#L436 + +Modify configuration if needed, e.g. add more packages to target: + + $ make menuconfig + +Compile everything and build the SD card image: + + $ make + +To configure the linux kernel or u-boot: + + $ make linux-menuconfig + +To rebuild something (e.g. linux): + + $ make linux-rebuild + +How to write the SD card +======================== + +Once the build process is finished you will have an image +called "sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_musl_riscv64_defconfig new file mode 100644 index 0000000000..4155ad1f57 --- /dev/null +++ b/configs/milkv_duo_musl_riscv64_defconfig @@ -0,0 +1,63 @@ +# Architecture +BR2_riscv=y +BR2_riscv_g=y +BR2_RISCV_ISA_RVC=y + +# Linux headers same as kernel 5.10 series +BR2_KERNEL_HEADERS_5_10=y + +# Using gcc13 and musl to have t-head's optimization and features +BR2_GCC_VERSION_13_X=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" + +# opensbi +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_GIT=y +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_OPENSBI_FW_FDT_PATH=y + +# u-boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_64mb" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_LINUX_KERNEL_LZMA=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# SD card image generating script +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" + +# rootfs +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Packages for the sdcard image generating +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB=y +BR2_PACKAGE_MILKV_DUO_PINMUX=y +BR2_PACKAGE_MILKV_DUO_FEATURES=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y + +# Host packages for the sdcard image generating +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_LZMA_ALONE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/milkv_duo_musl_riscv64_ion_defconfig b/configs/milkv_duo_musl_riscv64_ion_defconfig new file mode 100644 index 0000000000..7af0d9a44d --- /dev/null +++ b/configs/milkv_duo_musl_riscv64_ion_defconfig @@ -0,0 +1,63 @@ +# Architecture +BR2_riscv=y +BR2_riscv_g=y +BR2_RISCV_ISA_RVC=y + +# Linux headers same as kernel 5.10 series +BR2_KERNEL_HEADERS_5_10=y + +# Using gcc13 and musl to have t-head's optimization and features +BR2_GCC_VERSION_13_X=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" + +# opensbi +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_GIT=y +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_OPENSBI_FW_FDT_PATH=y + +# u-boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_ion" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_LINUX_KERNEL_LZMA=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# SD card image generating script +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" + +# rootfs +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Packages for the sdcard image generating +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y +BR2_PACKAGE_MILKV_DUO_PINMUX=y +BR2_PACKAGE_MILKV_DUO_FEATURES=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y + +# Host packages for the sdcard image generating +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_LZMA_ALONE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -- 2.34.1 From hanyuan-z at qq.com Tue Feb 6 08:06:02 2024 From: hanyuan-z at qq.com (Hanyuan Zhao) Date: Tue, 6 Feb 2024 16:06:02 +0800 Subject: [Buildroot] [PATCH v3 1/2] package/milkv-duo: add packages for milkv-duo Message-ID: This commit adds the packages that are necessary for milkv-duo image's generating and configurations. https://github.com/milkv-duo/duo-buildroot-sdk/ Co-authored-by: Emil S Signed-off-by: Hanyuan Zhao --- package/Config.in | 2 + package/milkv-duo-libraries/Config.in | 63 ++++++++++ .../milkv-duo-libraries.mk | 51 +++++++++ .../milkv-duo-smallcore-freertos/Config.in | 21 ++++ .../milkv-duo-smallcore-freertos.mk | 108 ++++++++++++++++++ 5 files changed, 245 insertions(+) create mode 100644 package/milkv-duo-libraries/Config.in create mode 100644 package/milkv-duo-libraries/milkv-duo-libraries.mk create mode 100644 package/milkv-duo-smallcore-freertos/Config.in create mode 100644 package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk diff --git a/package/Config.in b/package/Config.in index 7fc383da83..2c560377b4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -564,6 +564,8 @@ endmenu source "package/memtester/Config.in" source "package/memtool/Config.in" source "package/mhz/Config.in" + source "package/milkv-duo-libraries/Config.in" + source "package/milkv-duo-smallcore-freertos/Config.in" source "package/minicom/Config.in" source "package/msr-tools/Config.in" source "package/nanocom/Config.in" diff --git a/package/milkv-duo-libraries/Config.in b/package/milkv-duo-libraries/Config.in new file mode 100644 index 0000000000..ea4d0aadac --- /dev/null +++ b/package/milkv-duo-libraries/Config.in @@ -0,0 +1,63 @@ +config BR2_PACKAGE_MILKV_DUO_LIBRARIES + bool "milk-v duo libraries" + depends on BR2_riscv + help + Those packages provide board-specific firmware and + hardware tools for the Milk-V Duo platform. + + https://github.com/milkv-duo/milkv-duo-buildroot-libraries + +if BR2_PACKAGE_MILKV_DUO_LIBRARIES + +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + bool "milkv-duo-firmware-fsbl" + select BR2_PACKAGE_HOST_MTOOLS + help + This package is obtained from + https://github.com/milkv-duo/duo-buildroot-sdk, + from which we download the first stage bootloader source and + compile it, generating the ATF bl2.bin. At the mean time, we + will use the fiptool.py in this package to create the binary + file fip.bin to pack the opensbi, u-boot and so on. + + If you intend to generate the whole sdcard image or the + fip.bin for milk-v duo, you must say Y to this package! + +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB + bool "64 MiB free ram" + default n + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + help + Say Y to this will disable the ION in order to + have the all 64MiB Free memory. + +config BR2_PACKAGE_MILKV_DUO_PINMUX + bool "duo-pinmux tool" + default n + help + Say Y to this will compile the duo-pinmux, which can + get or set function of any Milk-V Duo GPIO Pin. More info at + + https://milkv.io/docs/duo/application-development/pinmux + +config BR2_PACKAGE_MILKV_DUO_FEATURES + bool "duo usb features" + default n + select BR2_PACKAGE_DHCPCD + select BR2_PACKAGE_DNSMASQ + select BR2_PACKAGE_DROPBEAR + select BR2_PACKAGE_LRZSZ + select BR2_PACKAGE_HTOP + help + Say Y to this will copy the cvitek usb shell scripts to have + the USB features. The role could be configured at + + /etc/milkv-duo.conf + + Supported usb functions are rndis, host and mass-storage. + By default Duo has the LED blinking. It could be configured + in that conf file as well. Say Y to this will also select + some packages automatically, to have the same experience + with the official release. + +endif diff --git a/package/milkv-duo-libraries/milkv-duo-libraries.mk b/package/milkv-duo-libraries/milkv-duo-libraries.mk new file mode 100644 index 0000000000..a5cf40a764 --- /dev/null +++ b/package/milkv-duo-libraries/milkv-duo-libraries.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# milkv-duo-libraries +# +################################################################################ + +MILKV_DUO_LIBRARIES_VERSION = f359994bd497f942bb67734280d81f6640c7c168 +MILKV_DUO_LIBRARIES_SITE = $(call github,milkv-duo,milkv-duo-buildroot-libraries,$(MILKV_DUO_LIBRARIES_VERSION)) +MILKV_DUO_LIBRARIES_INSTALL_STAGING = YES +MILKV_DUO_LIBRARIES_DEPENDENCIES = host-python3 host-mtools +MILKV_DUO_LIBRARIES_FSBL_64MB = ION + +ifeq ($(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB),y) +MILKV_DUO_LIBRARIES_FSBL_64MB = 64MB +endif + +define MILKV_DUO_LIBRARIES_BUILD_CMDS + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ + $(MAKE) -C $(@D)/firmware \ + ARCH=riscv BOOT_CPU=riscv CHIP_ARCH=cv180x \ + PROJECT_FULLNAME=cv1800b_milkv_duo_sd \ + CROSS_COMPILE=$(TARGET_CROSS) \ + FREE_RAM_SIZE=$(MILKV_DUO_LIBRARIES_FSBL_64MB) \ + bl2; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + -I $(@D)/pinmux/include $(@D)/pinmux/src/*.c -o $(@D)/pinmux/duo-pinmux; \ + fi +endef + +define MILKV_DUO_LIBRARIES_INSTALL_STAGING_CMDS + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ + $(INSTALL) -D -m 0755 $(@D)/firmware/build/cv180x/bl2.bin $(BINARIES_DIR)/bl2.bin; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/chip_conf.bin $(BINARIES_DIR)/chip_conf.bin; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/fiptool.py $(BINARIES_DIR)/fiptool.py; \ + $(INSTALL) -D -m 0644 $(@D)/firmware/plat/cv180x/multi.its $(BINARIES_DIR)/multi.its; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/test/cv181x/ddr_param.bin $(BINARIES_DIR)/ddr_param.bin; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ + $(INSTALL) -D -m 0755 $(@D)/pinmux/duo-pinmux $(TARGET_DIR)/usr/bin/; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_FEATURES) = y ]; then \ + cp $(@D)/overlay/* -r $(TARGET_DIR); \ + fi +endef + +$(eval $(generic-package)) diff --git a/package/milkv-duo-smallcore-freertos/Config.in b/package/milkv-duo-smallcore-freertos/Config.in new file mode 100644 index 0000000000..8503932461 --- /dev/null +++ b/package/milkv-duo-smallcore-freertos/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS + bool "milkv-duo-smallcore-freertos" + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + select BR2_PACKAGE_HOST_CMAKE + help + This package is obtained from + https://github.com/milkv-duo/duo-buildroot-sdk, + from which we download the FreeRTOS ported to Milk-V Duo + into the Buildroot. This FreeRTOS will run in the small core + and will not do anything because it is simply a template + with some basic UART demos. You can realize your own ideas + by adding code to + + output/build/milkv-duo-smallcore-freertos-hash/cvitek/task + /comm/src/riscv64/comm_main.c + + If you say Y, then every time you make Buildroot, it will + automatically compile and include the FreeRTOS into the + fip.bin, which will then be packed into sdcard.img + + https://github.com/milkv-duo/milkv-duo-smallcore-freertos diff --git a/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk new file mode 100644 index 0000000000..52028f3c90 --- /dev/null +++ b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk @@ -0,0 +1,108 @@ +################################################################################ +# +# milkv-duo-smallcore-freertos +# +################################################################################ + +MILKV_DUO_SMALLCORE_FREERTOS_VERSION = 1dac21ade58b0f9a0a531cfe93ee319337a88d80 +MILKV_DUO_SMALLCORE_FREERTOS_SITE = $(call github,milkv-duo,milkv-duo-smallcore-freertos,$(MILKV_DUO_SMALLCORE_FREERTOS_VERSION)) +MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING = YES +MILKV_DUO_SMALLCORE_FREERTOS_DEPENDENCIES = host-cmake host-ninja +MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV = CROSS_COMPILE=$(TARGET_CROSS) + +define MILKV_DUO_SMALLCORE_FREERTOS_BUILD_CMDS + if [ ! -d $(@D)/cvitek/build/arch ]; then \ + mkdir -p $(@D)/cvitek/build/arch; \ + fi + + cd $(@D)/cvitek/build/arch && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DTOP_DIR=$(@D)/cvitek \ + -DRUN_TYPE=CVIRTOS \ + -DRUN_ARCH=riscv64 \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + $(@D)/cvitek/arch + cd $(@D)/cvitek/build/arch && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + + if [ ! -d $(@D)/cvitek/build/kernel ]; then \ + mkdir -p $(@D)/cvitek/build/kernel; \ + fi + + cd $(@D)/cvitek/build/kernel && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DRUN_ARCH=riscv64 \ + -DTOP_DIR=$(@D)/cvitek \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + $(@D)/cvitek/kernel + cd $(@D)/cvitek/build/kernel && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + + if [ ! -d $(@D)/cvitek/build/common ]; then \ + mkdir -p $(@D)/cvitek/build/common; \ + fi + + cd $(@D)/cvitek/build/common && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DRUN_ARCH=riscv64 \ + -DTOP_DIR=$(@D)/cvitek \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + $(@D)/cvitek/common + cd $(@D)/cvitek/build/common && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + + if [ ! -d $(@D)/cvitek/build/hal ]; then \ + mkdir -p $(@D)/cvitek/build/hal; \ + fi + + cd $(@D)/cvitek/build/hal && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DRUN_ARCH=riscv64 \ + -DTOP_DIR=$(@D)/cvitek \ + -DRUN_TYPE=CVIRTOS \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + -DBOARD_FPGA=n \ + $(@D)/cvitek/hal/cv180x + cd $(@D)/cvitek/build/hal && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + + if [ ! -d $(@D)/cvitek/build/driver ]; then \ + mkdir -p $(@D)/cvitek/build/driver; \ + fi + + cd $(@D)/cvitek/build/driver && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DRUN_ARCH=riscv64 \ + -DTOP_DIR=$(@D)/cvitek \ + -DRUN_TYPE=CVIRTOS \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DBOARD_FPGA=n \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + $(@D)/cvitek/driver + cd $(@D)/cvitek/build/driver && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + + if [ ! -d $(@D)/cvitek/build/task ]; then \ + mkdir -p $(@D)/cvitek/build/task; \ + fi + + cd $(@D)/cvitek/build/task && \ + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ + -DRUN_ARCH=riscv64 \ + -DRUN_TYPE=CVIRTOS \ + -DTOP_DIR=$(@D)/cvitek \ + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ + -DBOARD_FPGA=n \ + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ + $(@D)/cvitek/task + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target cvirtos.bin -- -v +endef + +define MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0755 $(@D)/cvitek/install/bin/cvirtos.bin $(BINARIES_DIR)/cvirtos.bin + if [ ! -e $(BINARIES_DIR)/empty.bin ]; then \ + touch $(BINARIES_DIR)/empty.bin; \ + fi +endef + +$(eval $(generic-package)) -- 2.34.1 From peter at korsgaard.com Tue Feb 6 08:15:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 09:15:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR In-Reply-To: <20240205201342.2995-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:13:42 +0100") References: <20240205201342.2995-1-fontaine.fabrice@gmail.com> Message-ID: <87cyta80vn.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:green_end:sftpserver has been deprecated in favor of > cpe:2.3:a:greenend:sftpserver in December 2022: > > Version > Product > > > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 08:15:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 09:15:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/libjwt: disable examples In-Reply-To: <20240205201625.5203-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:16:25 +0100") References: <20240205201625.5203-1-fontaine.fabrice@gmail.com> Message-ID: <878r3y80vi.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Examples are enabled by default since the addition of the package in > commit 7251775773011e7da38e3a33c6817eceab6a9dfa > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 08:15:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 09:15:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/lua-http: set CPE variables In-Reply-To: <20240205204146.284303-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:41:46 +0100") References: <20240205204146.284303-1-fontaine.fabrice@gmail.com> Message-ID: <874jem80v7.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 08:12:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 09:12:31 +0100 Subject: [Buildroot] [git commit] package/libjwt: disable examples Message-ID: <20240206081556.8D41B86ED4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c413d16037e412f81f6cf735f6b4fd0b9723bf2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Examples are enabled by default since the addition of the package in commit 7251775773011e7da38e3a33c6817eceab6a9dfa Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libjwt/libjwt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libjwt/libjwt.mk b/package/libjwt/libjwt.mk index 7e2ea03b09..1643aa7b7a 100644 --- a/package/libjwt/libjwt.mk +++ b/package/libjwt/libjwt.mk @@ -11,6 +11,7 @@ LIBJWT_AUTORECONF = YES LIBJWT_INSTALL_STAGING = YES LIBJWT_LICENSE = MPL-2.0 LIBJWT_LICENSE_FILES = LICENSE +LIBJWT_CONF_OPTS = --without-examples ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBJWT_CONF_OPTS += --with-openssl From peter at korsgaard.com Tue Feb 6 08:12:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 09:12:47 +0100 Subject: [Buildroot] [git commit] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR Message-ID: <20240206081556.99DBD86ED6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4adc8b3d24708f180bcbf68df1d0723dc058f68e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:green_end:sftpserver has been deprecated in favor of cpe:2.3:a:greenend:sftpserver in December 2022: Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gesftpserver/gesftpserver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 5a3ab0536c..5a7106d707 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -12,7 +12,7 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors -GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_VENDOR = greenend GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling From peter at korsgaard.com Tue Feb 6 08:13:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 09:13:09 +0100 Subject: [Buildroot] [git commit] package/lua-http: set CPE variables Message-ID: <20240206081556.A810886ED7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ccf4048e43b022feba225b976e55ed3e503d424 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/lua-http/lua-http.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index 7fbb09038e..df3e2c0059 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -10,5 +10,7 @@ LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_LICENSE = MIT LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md +LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) +LUA_HTTP_CPE_ID_VENDOR = daurnimator $(eval $(luarocks-package)) From peter at korsgaard.com Tue Feb 6 08:16:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 09:16:27 +0100 Subject: [Buildroot] [PATCH] package/uacme: bump version to 1.7.5 In-Reply-To: (Nicola Di Lieto's message of "Mon, 5 Feb 2024 21:47:06 +0100") References: Message-ID: <87zfwe6m90.fsf@48ers.dk> >>>>> "Nicola" == Nicola Di Lieto writes: > Signed-off-by: Nicola Di Lieto Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 08:16:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 09:16:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/cpio: bump to version 2.15 In-Reply-To: <20240205204954.297515-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:49:54 +0100") References: <20240205204954.297515-1-fontaine.fabrice@gmail.com> Message-ID: <87v8726m8d.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00006.html > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 08:15:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 09:15:57 +0100 Subject: [Buildroot] [git commit] package/uacme: bump version to 1.7.5 Message-ID: <20240206081733.04F8686EE3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7ee5f3b0e3ef703bafd007cc99da10312d99b9e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Nicola Di Lieto Signed-off-by: Peter Korsgaard --- package/uacme/uacme.hash | 2 +- package/uacme/uacme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash index 063b0b57ac..9a274bf394 100644 --- a/package/uacme/uacme.hash +++ b/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a638fe0878dba8fdda62f89e7a284243edbcd31b92c11b5cfdc7d3efd9547bca uacme-1.7.4.tar.gz +sha256 596b2fba75fedc7a410dd71583c828642ecd486dfdcfde109dfebb82a374abbe uacme-1.7.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index b260bd85ee..f02e522761 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.7.4 +UACME_VERSION = 1.7.5 # Released versions are on branch upstream/latest, tagged as # upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not # include .tarball-version From peter at korsgaard.com Tue Feb 6 08:16:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 09:16:41 +0100 Subject: [Buildroot] [git commit] package/cpio: bump to version 2.15 Message-ID: <20240206081733.0F9B086EE4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=71d971fa3bba0528011b4c6419ebbdcd420cf493 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00006.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/cpio/cpio.hash | 6 +++--- package/cpio/cpio.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/cpio/cpio.hash b/package/cpio/cpio.hash index c67fbc1f61..e300a5f084 100644 --- a/package/cpio/cpio.hash +++ b/package/cpio/cpio.hash @@ -1,6 +1,6 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00001.html -sha1 cbac50a61079b6f3bdcf9ffe42171d9257cfe877 cpio-2.14.tar.bz2 +# From https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00006.html +sha1 db5e3845eb5475ddcb7e8915c3a1458a0c13d787 cpio-2.15.tar.bz2 # Locally calculated after checking pgp signature -sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.14.tar.bz2 +sha256 937610b97c329a1ec9268553fb780037bcfff0dcffe9725ebc4fd9c1aa9075db cpio-2.15.tar.bz2 # Locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk index 911d16822b..452271c8f1 100644 --- a/package/cpio/cpio.mk +++ b/package/cpio/cpio.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPIO_VERSION = 2.14 +CPIO_VERSION = 2.15 CPIO_SOURCE = cpio-$(CPIO_VERSION).tar.bz2 CPIO_SITE = $(BR2_GNU_MIRROR)/cpio CPIO_CONF_OPTS = --bindir=/bin From bugzilla at busybox.net Tue Feb 6 08:48:32 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 06 Feb 2024 08:48:32 +0000 Subject: [Buildroot] [Bug 15850] Nodejs failes to build In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15850 --- Comment #2 from Dr I J Ormshaw --- The problem only seems to occur with Target Architecture Variant of x86-64-v4. With Target Architecture Variant x86-64 and skylake nodejs compiles successfully -- You are receiving this mail because: You are on the CC list for the bug. From arnout at mind.be Tue Feb 6 08:49:29 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 09:49:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rtoml: bump to version 0.10.0 In-Reply-To: References: <20240111052225.2922249-1-james.hilliard1@gmail.com> <687fa6af-4d6f-4890-bd3a-c420ede9cdfd@mind.be> Message-ID: On 05/02/2024 18:21, James Hilliard wrote: > On Mon, Feb 5, 2024 at 4:29?AM Arnout Vandecappelle wrote: >> >> >> >> On 11/01/2024 06:22, James Hilliard wrote: >>> Migrate from setuptools-rust to maturin infrastructure. >>> >>> Signed-off-by: James Hilliard >>> --- >>> package/python-rtoml/python-rtoml.hash | 2 +- >>> package/python-rtoml/python-rtoml.mk | 6 +++--- >>> 2 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash >>> index 04d22ed1a4..59f17d9d62 100644 >>> --- a/package/python-rtoml/python-rtoml.hash >>> +++ b/package/python-rtoml/python-rtoml.hash >>> @@ -1,4 +1,4 @@ >>> # Locally calculated after vendoring >>> -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz >>> +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz >> >> Same problem: >> >> ERROR: while checking hashes from package/python-rtoml//python-rtoml.hash >> ERROR: rtoml-0.10.0.tar.gz has wrong sha256 hash: >> ERROR: expected: 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 >> ERROR: got : 624cc1ff2b3fdea42aeee3a4d1537d37431ec001870dfee1e04a12bd3076a2d3 > > Hmm, I'm unable to reproduce this issue. I suppose that if you already have the vendored dependencies in your cargo cache (BR2_DL_DIR/br-cargo-home) you have the same timestamps on them. But if those are the ones that cause the issue, Yann's series is not going to help, because it only affects the repositories we pull from git ourselves, not the ones that are done by cargo... Perhaps we should do a diffoscope to be sure where the difference is exactly. Could you take my copy from https://ftp.essensium.com/owncloud/index.php/s/WW2jtp5ozW61rMV and do the diffoscope? Regards, Arnout >>> # Locally computed sha256 checksums >>> sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE >>> diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk >>> index 819dcf3288..16f9dea573 100644 >>> --- a/package/python-rtoml/python-rtoml.mk >>> +++ b/package/python-rtoml/python-rtoml.mk >>> @@ -4,10 +4,10 @@ >>> # >>> ################################################################################ >>> >>> -PYTHON_RTOML_VERSION = 0.8.0 >>> +PYTHON_RTOML_VERSION = 0.10.0 >>> PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz >>> -PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 >>> -PYTHON_RTOML_SETUP_TYPE = setuptools-rust >>> +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/ca/b2/0e77a00e75ed582ec1c4c3a9e1eeed886a15c195bcce87b7daf1171c4115 >>> +PYTHON_RTOML_SETUP_TYPE = maturin >>> PYTHON_RTOML_LICENSE = MIT >>> PYTHON_RTOML_LICENSE_FILES = LICENSE >>> From marcus.folkesson at gmail.com Tue Feb 6 09:00:48 2024 From: marcus.folkesson at gmail.com (Marcus Folkesson) Date: Tue, 6 Feb 2024 10:00:48 +0100 Subject: [Buildroot] [PATCH] package/makedevs: describe the recursive type in the README Message-ID: <20240206090048.2214719-1-marcus.folkesson@gmail.com> The recursive type is described everywhere else, so add it to the README as well. Signed-off-by: Marcus Folkesson --- package/makedevs/README | 1 + 1 file changed, 1 insertion(+) diff --git a/package/makedevs/README b/package/makedevs/README index 70844bf802..6c583609a5 100644 --- a/package/makedevs/README +++ b/package/makedevs/README @@ -26,6 +26,7 @@ where name is the file name, type can be one of: f: A regular file d: Directory + r: Directory recursively c: Character special device file b: Block special device file p: Fifo (named pipe) -- 2.43.0 From thomas.petazzoni at bootlin.com Tue Feb 6 08:56:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 09:56:21 +0100 Subject: [Buildroot] [git commit] package/rlwrap: new package Message-ID: <20240206085701.F3E0586EEF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a1f2fce0494388080af0a4130e62522c26fe4a9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Matt Silva Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/rlwrap/Config.in | 42 ++++++++++++++++++++++++++++++++++++++++++ package/rlwrap/rlwrap.hash | 6 ++++++ package/rlwrap/rlwrap.mk | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2d3d2cdda8..c18ae46054 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2122,6 +2122,9 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ +N: Matt Silva +F: package/rlwrap/ + N: Mauro Condarelli F: package/mc/ F: package/python-autobahn/ diff --git a/package/Config.in b/package/Config.in index 7fc383da83..97f590e2b7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2690,6 +2690,7 @@ comment "Utilities" source "package/pinentry/Config.in" source "package/qprint/Config.in" source "package/ranger/Config.in" + source "package/rlwrap/Config.in" source "package/rtty/Config.in" source "package/screen/Config.in" source "package/screenfetch/Config.in" diff --git a/package/rlwrap/Config.in b/package/rlwrap/Config.in new file mode 100644 index 0000000000..0cb3e33fa7 --- /dev/null +++ b/package/rlwrap/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_RLWRAP + bool "rlwrap" + select BR2_PACKAGE_READLINE + help + rlwrap is a 'readline wrapper', a small utility that uses the + GNU Readline library to allow the editing of keyboard input + for any command. + + https://github.com/hanslub42/rlwrap + +if BR2_PACKAGE_RLWRAP + +config BR2_PACKAGE_RLWRAP_SPY_ON_READLINE + bool "spy on readline" + default y + help + If we want to keep the display tidy when re-sizing the + terminal window or printing multi-line prompts, we have to + know whether or not readline is in horizontal-scroll-mode + (i.e. wheter long lines are scrolled or wrapped). At present, + this involves a look at a private readline variable - if you + feel guilty about that, disable this option + +config BR2_PACKAGE_RLWRAP_HOMEGROWN_REDISPLAY + bool "homegrown redisplay" + help + Some people report double echoing of user input. Enabling this + option will cure the problem - though the display will then + flicker over slow connections (cf. BUGS) + +config BR2_PACKAGE_RLWRAP_MULTIBYTE_AWARE + bool "multibyte awareness" + default y + depends on BR2_USE_WCHAR + help + Prevent rlwrap from seeing multibyte characters as multiple + characters + +comment "rlwrap multibyte awareness needs a toolchain w/ wchar" + depends on !BR2_USE_WCHAR + +endif diff --git a/package/rlwrap/rlwrap.hash b/package/rlwrap/rlwrap.hash new file mode 100644 index 0000000000..b7005e860e --- /dev/null +++ b/package/rlwrap/rlwrap.hash @@ -0,0 +1,6 @@ +# from https://github.com/hanslub42/rlwrap/releases/tag/0.46.1 +sha256 2711986a1248f6ac59e2aecf5586205835970040d300a42b4bf8014397e73e37 rlwrap-0.46.1.tar.gz + +# license files, locally calculated +sha256 656d25fab58016ac6ac11bb126709e4f860ea063d11795232eb55987172f78ff AUTHORS +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/rlwrap/rlwrap.mk b/package/rlwrap/rlwrap.mk new file mode 100644 index 0000000000..e3973e841b --- /dev/null +++ b/package/rlwrap/rlwrap.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# rlwrap +# +################################################################################ + +RLWRAP_VERSION = 0.46.1 +RLWRAP_SITE = https://github.com/hanslub42/rlwrap/releases/download/$(RLWRAP_VERSION) +RLWRAP_LICENSE = GPL-2.0+ +RLWRAP_LICENSE_FILES = AUTHORS COPYING + +RLWRAP_DEPENDENCIES = readline + +ifeq ($(BR2_PACKAGE_RLWRAP_SPY_ON_READLINE),y) +RLWRAP_CONF_OPTS += --enable-spy-on-readline +else +RLWRAP_CONF_OPTS += --disable-spy-on-readline +endif + +ifeq ($(BR2_PACKAGE_RLWRAP_HOMEGROWN_REDISPLAY),y) +RLWRAP_CONF_OPTS += --enable-homegrown-redisplay +else +RLWRAP_CONF_OPTS += --disable-homegrown-redisplay +endif + +ifeq ($(BR2_PACKAGE_RLWRAP_MULTIBYTE_AWARE),y) +RLWRAP_CONF_OPTS += --enable-multibyte-aware +else +RLWRAP_CONF_OPTS += --disable-multibyte-aware +endif + +define RLWRAP_REMOVE_FILTERS + $(RM) -rf $(TARGET_DIR)/usr/share/rlwrap/filters +endef +RLWRAP_POST_INSTALL_TARGET_HOOKS += RLWRAP_REMOVE_FILTERS + +$(eval $(autotools-package)) From romain.naour at smile.fr Tue Feb 6 09:22:00 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 10:22:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-bitstring: bump to version 4.1.4 In-Reply-To: <275220a4-24b2-4f21-b8bb-fae239a56d37@mind.be> References: <20240107114345.2795252-1-fontaine.fabrice@gmail.com> <275220a4-24b2-4f21-b8bb-fae239a56d37@mind.be> Message-ID: <49b59119-b7f6-4d60-b35f-5e353f82c829@smile.fr> Hello Fabrice, All, Le 05/02/2024 ? 14:26, Arnout Vandecappelle via buildroot a ?crit?: > > > On 07/01/2024 12:43, Fabrice Fontaine wrote: >> This bump will fix the following build failure raised since bump to >> version 4.1.2 in commit ce2bf7b96b9dba57bb31aca583283736af27afcc: >> >> *** Error compiling >> '/home/buildroot/autobuild/instance-0/output-1/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... >> Sorry: IndentationError: expected an indented block after function definition >> on line 6 (plugin_test.py, line 8) >> >> https://github.com/scott-griffiths/bitstring/blob/bitstring-4.1.4/release_notes.txt >> >> Fixes: >> ? - >> http://autobuild.buildroot.org/results/e6fac4cac16de94862e3b4697dd88e856bc9a398 >> >> Signed-off-by: Fabrice Fontaine > > ?Applied to master, thanks. I was looking at this issue before noticing this version bump but now the runtime test fail with: # python sample_python_bitstring.py Traceback (most recent call last): File "/root/sample_python_bitstring.py", line 1, in import bitstring File "/usr/lib/python3.11/site-packages/bitstring/__init__.py", line 64, in File "/usr/lib/python3.11/site-packages/bitstring/bits.py", line 15, in ModuleNotFoundError: No module named 'bitarray' Best regards, Romain > > ?Regards, > ?Arnout > >> --- >> ? package/python-bitstring/python-bitstring.hash | 4 ++-- >> ? package/python-bitstring/python-bitstring.mk?? | 4 ++-- >> ? 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/package/python-bitstring/python-bitstring.hash >> b/package/python-bitstring/python-bitstring.hash >> index c2ff9a69d5..1889983f47 100644 >> --- a/package/python-bitstring/python-bitstring.hash >> +++ b/package/python-bitstring/python-bitstring.hash >> @@ -1,5 +1,5 @@ >> ? # md5, sha256 from https://pypi.org/pypi/bitstring/json >> -md5? 1750c35e8e45f597725037d35eed9ba1? bitstring-4.1.2.tar.gz >> -sha256? c22283d60fd3e1a8f386ccd4f1915d7fe13481d6349db39711421e24d4a9cccf? >> bitstring-4.1.2.tar.gz >> +md5? 3909415d89586edabd577b62b0d0c1be? bitstring-4.1.4.tar.gz >> +sha256? 94f3f1c45383ebe8fd4a359424ffeb75c2f290760ae8fcac421b44f89ac85213? >> bitstring-4.1.4.tar.gz >> ? # Locally computed sha256 checksums >> ? sha256? 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea? >> LICENSE >> diff --git a/package/python-bitstring/python-bitstring.mk >> b/package/python-bitstring/python-bitstring.mk >> index 9a5d8dfe84..983491303d 100644 >> --- a/package/python-bitstring/python-bitstring.mk >> +++ b/package/python-bitstring/python-bitstring.mk >> @@ -4,9 +4,9 @@ >> ? # >> ? >> ################################################################################ >> ? -PYTHON_BITSTRING_VERSION = 4.1.2 >> +PYTHON_BITSTRING_VERSION = 4.1.4 >> ? PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz >> -PYTHON_BITSTRING_SITE = >> https://files.pythonhosted.org/packages/23/fc/b5ace4f51fea5bcc7f8cca8859748ea5eb941680b82a5b3687c980d9589b >> +PYTHON_BITSTRING_SITE = >> https://files.pythonhosted.org/packages/7f/07/0fd502a29127b968bada3d1824a8af997546d2b9ff73f00e800b3d9888cb >> ? PYTHON_BITSTRING_SETUP_TYPE = setuptools >> ? PYTHON_BITSTRING_LICENSE = MIT >> ? PYTHON_BITSTRING_LICENSE_FILES = LICENSE > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Tue Feb 6 09:25:45 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 10:25:45 +0100 Subject: [Buildroot] [help] configs/rock5b_defconfig: Switch to mainline kernel In-Reply-To: <2716329.mvXUDI8C0e@laptop> References: <2716329.mvXUDI8C0e@laptop> Message-ID: Hi Kilian, On 06/02/2024 07:41, kilian.zinnecker--- via buildroot wrote: > Hello, > > The board support for the Rock5b uses a custom kernel. However, there already > exists some mainline support for its SoC, the Rockchip RK3588 [1]. Some of it > seems to already be present in kernel 6.6, which is the current latest version > in buildroot. I would like to change the kernel used for the Rock5b from > custom to mainline. Unfortunately I face a challenge. > > In order to get kernel log output on the serial interface, I changed the > consosole from ttyS2,1500000n8 to serial2,1500000n8 in the kernel bootargs (as > seen in Sebastian Reichel's Kernel Recipes 2023 talk). After that, it shows > the kernel messages, but it never reaches a shell: > > [ 0.321600] mmc_host mmc1: Bus speed (slot 0) = 400000Hz (slot req > 400000Hz, actual 400000HZ div = 0) > [ 0.370827] hub 4-0:1.0: USB hub found > [ 0.371218] hub 4-0:1.0: 1 port detected > [ 0.372291] Waiting for root device /dev/mmcblk0p2... > [ 0.382457] mmc_host mmc1: Bus speed (slot 0) = 198000000Hz (slot req > 200000000Hz, actual 198000000HZ div = 0) > [ 0.497629] usb 1-1: new high-speed USB device number 2 using ehci-platform > [ 0.655570] hub 1-1:1.0: USB hub found > [ 0.656181] hub 1-1:1.0: 4 ports detected > [ 0.794063] dwmmc_rockchip fe2c0000.mmc: Successfully tuned phase to 118 > [ 0.794672] mmc1: new ultra high speed SDR104 SDHC card at address 5048 > [ 0.796162] mmcblk1: mmc1:5048 SD32G 29.7 GiB > [ 0.802500] GPT:Primary header thinks Alt. header is not at the end of the > disk. > [ 0.803155] GPT:563351 != 62357503 > [ 0.803459] GPT:Alternate GPT header not at the end of the disk. > [ 0.803985] GPT:563351 != 62357503 > [ 0.804287] GPT: Use GNU Parted to correct GPT errors. > [ 0.804761] mmcblk1: p1 p2 Clearly, the rootfs is on mmcblk1p2, not mmcblk0p2. So if you have mmcblk0p2 on your command line, and rootwait, it will just wait indefinitely for the rootfs to appear. > [ 31.717905] vdd_gpu_s0: disabling > [ 115.285576] random: crng init done That's pretty late for the RNG to be initialized, you'll need the RNG seeder from userspace - but this is enabled by default in Buildroot I think. > Of course it could be, that it is just not configured anymore to put a shell on > the serial interface, but I already tried to address that with: > > BR2_TARGET_GENERIC_GETTY=y > BR2_TARGET_GENERIC_GETTY_PORT="serial2" > > However, that did not seem to help. Could it be, that there is something wrong > with the SD card formatting? It at least complains about it, but I am too > unfamiliar with that, so I don't know whether it is a problem. That's normal. It's because the generated image is not the exact size of your SD card, so the backup GPT partition table is somewhere in the middle instead of at the end. You can run parted on your laptop after writing the SD card and before booting it to fix the issue. But it shouldn't make any difference at all for booting. > I also tried to > change the rootfs partition in the bootargs mmcblk0p2 to mmcblk1p2, but then > the boot got stuck at some other place. That other place is the interesting one, with mmcblk0p2 I would indeed expect it to stop where you've shown it above. > > As kernel defconfig I use the default arm64 defconfig > (BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y). Could that also be an issue, > i.e., that I should provide a tailored one, e.g., by starting from the one > used by the custom kernel? It's indeed possible that the arm64 defconfig misses some things that are needed by the RK3588, hard to say from here. But if it already gets to MMC enumeration, it looks like it's mostly working. Regards, Arnout > I appreciate any help or suggestions, thanks and best regards, > Kilian > > [1] https://gitlab.collabora.com/hardware-enablement/rockchip-3588/notes-for-rockchip-3588/-/blob/main/mainline-status.md > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Tue Feb 6 09:28:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 10:28:22 +0100 Subject: [Buildroot] [help] configs/rock5b_defconfig: Switch to mainline kernel In-Reply-To: References: <2716329.mvXUDI8C0e@laptop> Message-ID: <3a235bc3-897e-4dc0-b2a1-3573467e31e4@mind.be> On 06/02/2024 10:25, Arnout Vandecappelle wrote: > ?Hi Kilian, > > On 06/02/2024 07:41, kilian.zinnecker--- via buildroot wrote: > >> Of course it could be, that it is just not configured anymore to put a shell on >> the serial interface, but I already tried to address that with: >> >> BR2_TARGET_GENERIC_GETTY=y >> BR2_TARGET_GENERIC_GETTY_PORT="serial2" ?Oh, and it's safer to keep this at the default "console" - if you get kernel output on console, the getty on the same location should work fine. With "serial2" you have to be sure that that is really correct and that you're not confusing with the name in device tree or in U-Boot, both of which may be different. Actually, "serial2" is almost certainly wrong, serial ports almost always start with tty. ?Regards, ?Arnout From thomas.petazzoni at bootlin.com Tue Feb 6 09:44:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 10:44:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/rlwrap: new package In-Reply-To: <20240126024914.13825-1-dev@matt-silva.com> References: <20240126024914.13825-1-dev@matt-silva.com> Message-ID: <20240206104450.23163730@windsurf> Hello Matt, On Thu, 25 Jan 2024 21:49:14 -0500 Matt Silva wrote: > Signed-off-by: Matt Silva Thanks a lot for your contribution! I applied your patch to our master branch, after doing a number of changes, see below for the details. > package/Config.in | 1 + > package/rlwrap/Config.in | 58 ++++++++++++++++++++++++++++++++++++++ > package/rlwrap/rlwrap.hash | 6 ++++ > package/rlwrap/rlwrap.mk | 48 +++++++++++++++++++++++++++++++ > 4 files changed, 113 insertions(+) For all new packages, we require to have an entry in the DEVELOPERS file, so that you get notified if there are build failures for this package, or if the package needs to be update for security issues, or when there's a new release upstream. > +config BR2_PACKAGE_RLWRAP_DEBUG > + bool "enable debug" This option is not needed, it should be controlled by BR2_ENABLE_RUNTIME_DEBUG. Actually, I thought BR2_ENABLE_RUNTIME_DEBUG was automatically passing --enable-debug to all packages, but it's not the case. So if you care about debugging, we would need a follow-up patch that passes --enable-debug when BR2_ENABLE_RUNTIME_DEBUG is set. > +config BR2_PACKAGE_RLWRAP_PROC_MOUNTPOINT > + string "proc mountpoint" > + default "/proc" This option is not needed: Buildroot will always mount proc in /proc, and things will anyway break in all sorts of ways if proc is mounted elsewhere. > diff --git a/package/rlwrap/rlwrap.mk b/package/rlwrap/rlwrap.mk > new file mode 100644 > index 0000000000..6f9de8281c > --- /dev/null > +++ b/package/rlwrap/rlwrap.mk > @@ -0,0 +1,48 @@ > +################################################################################ > +# > +# rlwrap > +# > +################################################################################ > + > +# https://github.com/hanslub42/rlwrap/releases/download/0.46.1/rlwrap-0.46.1.tar.gz This comment is not needed. > + > +RLWRAP_VERSION = 0.46.1 > +RLWRAP_SOURCE = rlwrap-$(RLWRAP_VERSION).tar.gz This line is not needed, and actually triggers a "make check-package" warning. > +RLWRAP_SITE = https://github.com/hanslub42/rlwrap/releases/download/$(RLWRAP_VERSION) > +RLWRAP_LICENSE = GPL-2.0 The license really is GPL-2.0+. > +RLWRAP_LICENSE_FILES = AUTHORS COPYING > + > +RLWRAP_DEPENDENCIES = readline > + > +# --enable-spy-on-readline > +ifeq ($(BR2_PACKAGE_RLWRAP_SPY_ON_READLINE),y) > +RLWRAP_CONF_OPTS += --enable-spy-on-readline > +else > +RLWRAP_CONF_OPTS += --disable-spy-on-readline > +endif > + > +# --enable-homegrown-redisplay > +ifeq ($(BR2_PACKAGE_RLWRAP_HOMEGROWN_REDISPLAY),y) > +RLWRAP_CONF_OPTS += --enable-homegrown-redisplay > +else > +RLWRAP_CONF_OPTS += --disable-homegrown-redisplay > +endif > + > +# --enable-debug > +ifeq ($(BR2_PACKAGE_RLWRAP_DEBUG),y) > +RLWRAP_CONF_OPTS += --enable-debug > +else > +RLWRAP_CONF_OPTS += --disable-debug > +endif I dropped this part. > +# --enable-proc-mountpoint > +RLWRAP_CONF_OPTS += --enable-proc-mountpoint=$(BR2_PACKAGE_RLWRAP_PROC_MOUNTPOINT) And this part. Also, I added this: +define RLWRAP_REMOVE_FILTERS + $(RM) -rf $(TARGET_DIR)/usr/share/rlwrap/filters +endef +RLWRAP_POST_INSTALL_TARGET_HOOKS += RLWRAP_REMOVE_FILTERS Indeed, those filters are written in Python or Perl, and your package does not depend on them. In addition, the documentation says: Filters are `perl` or `python` plugins that enable complete (albeit somewhat fragile) control over `rlwrap`'s input and output, echo, prompt, history and completion. They aren't used a lot, and remain therefore somewhat untested. `rlwrap -z listing` lists the installed filters, `rlwrap -z ` displays a short help text for `` "They aren't used a lot". So for now, we drop them unconditionally. We can always revisit if someone needs them later. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 09:47:51 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 10:47:51 +0100 Subject: [Buildroot] [git commit] package/ruby: disable unsupported yjit Message-ID: <20240206094813.C617B86EF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3613cc9b3fe7d60e46ec7ddf5fe50a895797665 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The yjit feature requires rust toolchain support, since we don't currently handle setting up the rust toolchain for ruby lets disable this feature for now. This broke when ruby was bumped to version 3.3.0 in buildroot commit a01c278df7892c8a6736334aa008b2d7c09e9258. Fixes: linking static-library libruby-static.a LLVM ERROR: Invalid encoding make[2]: *** [Makefile:318: libruby-static.a] Aborted Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ruby/ruby.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index b2396010c5..4b9ce80e67 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -22,9 +22,14 @@ RUBY_CPE_ID_VENDOR = ruby-lang RUBY_DEPENDENCIES = host-pkgconf host-ruby HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) -RUBY_CONF_OPTS = --disable-install-doc --disable-rpath --disable-rubygems +RUBY_CONF_OPTS = \ + --disable-install-doc \ + --disable-rpath \ + --disable-rubygems \ + --disable-yjit HOST_RUBY_CONF_OPTS = \ --disable-install-doc \ + --disable-yjit \ --with-out-ext=curses,readline \ --without-gmp From thomas.petazzoni at bootlin.com Tue Feb 6 09:48:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 10:48:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/ruby: disable unsupported yjit In-Reply-To: <20240205183308.2120022-1-james.hilliard1@gmail.com> References: <20240205183308.2120022-1-james.hilliard1@gmail.com> Message-ID: <20240206104810.1e14c852@windsurf> On Mon, 5 Feb 2024 11:33:08 -0700 James Hilliard wrote: > The yjit feature requires rust toolchain support, since we don't > currently handle setting up the rust toolchain for ruby lets disable > this feature for now. > > This broke when ruby was bumped to version 3.3.0 in buildroot commit > a01c278df7892c8a6736334aa008b2d7c09e9258. > > Fixes: > linking static-library libruby-static.a > LLVM ERROR: Invalid encoding > make[2]: *** [Makefile:318: libruby-static.a] Aborted > > Signed-off-by: James Hilliard > --- > package/ruby/ruby.mk | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From giulio.benetti at benettiengineering.com Tue Feb 6 09:52:30 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 10:52:30 +0100 Subject: [Buildroot] Best board to fast boot In-Reply-To: References: Message-ID: <71301602-56ac-46b4-a853-bd71ed74da27@benettiengineering.com> Hi Franco, On 06/02/24 05:14, franco ariel wrote: > Hello guys! > I few weeks ago I started working with buildroot on rpi4, and it's look > amazing, thanks to the community I was able to run a flutter app on my > rpi4. But now, I want to keep going forward with my project, so ?Witch > one are the best board to achieve te best boot time to a Qt application? > I was looking for the Rockpro64 from pine but I'm not sure, since there > is not so much information about this board. > > What do you think it will be good for my project? On rpi4 I was able to > get 10sec boot time until the qt app shows up. And I want to achieve > less than 7s. This depends a lot on optimization you do on bootloader, linux and init script. I suggest you to take a look at these slides: https://bootlin.com/doc/training/boot-time/boot-time-slides.pdf Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From paul at crapouillou.net Tue Feb 6 09:52:30 2024 From: paul at crapouillou.net (Paul Cercueil) Date: Tue, 06 Feb 2024 10:52:30 +0100 Subject: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status In-Reply-To: <20240205222949.2805f50f@windsurf> References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> <20240121204252.152952-2-adam.duskett@amarulasolutions.com> <20240205222949.2805f50f@windsurf> Message-ID: <15a450739bf459a11093a6182dbdb1d2b2cb1b53.camel@crapouillou.net> I honestly forgot about this. I'll send a new patch upstream. -Paul Le lundi 05 f?vrier 2024 ? 22:29 +0100, Thomas Petazzoni a ?crit?: > Hello Adam, > > +Paul Cercueil in Cc, see below. > > On Sun, 21 Jan 2024 13:42:52 -0700 > Adam Duskett wrote: > > > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has > > been > > rejected upstream, and the initial pull request was moved to the > > freedesktop gitlab. Update the patch to reflect these changes. > > > > Signed-off-by: Adam Duskett > > Thanks, applied! > > Paul: could you follow-up with upstream (either wlroots, or uclibc, > or > both) to try to find an acceptable solution so that some day we can > drop this patch? > > Thanks a lot! > > Thomas From thomas.petazzoni at bootlin.com Tue Feb 6 09:51:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 10:51:10 +0100 Subject: [Buildroot] [git commit] package/rygel: bump to version 0.42.5 Message-ID: <20240206101345.E01EB86F05@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02734c0c22b5567194f187b5650470f90c6db681 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Drop first patch (already in version) - Refresh second patch - x11 is mandatory since https://gitlab.gnome.org/GNOME/rygel/-/commit/18cd2cff6f64b7a54156ac97e5c4f50eb8fd8d67 and upstream doesn't want to make it optional: https://gitlab.gnome.org/GNOME/rygel/-/issues/221 - This bump will also fix the following build failure raised since bump of gupnp to version 1.6.6 in commit b7938d2ae78ace5bffcf523f06304b27cd4edc0b: ../output-1/build/rygel-0.40.2/meson.build:79:8: ERROR: Dependency "gupnp-1.2" not found, tried pkgconfig and cmake https://gitlab.gnome.org/GNOME/rygel/-/blob/rygel-0.42.5/NEWS Fixes: - http://autobuild.buildroot.org/results/bdf87468199504384f79e4ab59971776d517296b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 3 +- .../0001-build-Add-man_pages-build-options.patch | 150 --------------------- ...0001-meson.build-fix-g_ir_compiler-calls.patch} | 16 +-- package/rygel/Config.in | 3 + package/rygel/rygel.hash | 4 +- package/rygel/rygel.mk | 5 +- 6 files changed, 17 insertions(+), 164 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 31ed5bb5cc..1f85ff2e07 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1177,8 +1177,7 @@ package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch Upstream package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch Upstream package/rubix/0001-dont-use-legacy-functions.patch Upstream package/rubix/0002-misc-fixes.patch Sob Upstream -package/rygel/0001-build-Add-man_pages-build-options.patch Upstream -package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch Upstream +package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch Upstream package/rygel/S99rygel Indent Shellcheck Variables package/s6-linux-init/0001-configure-add-D_GNU_SOURCE.patch Upstream package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch Upstream diff --git a/package/rygel/0001-build-Add-man_pages-build-options.patch b/package/rygel/0001-build-Add-man_pages-build-options.patch deleted file mode 100644 index cdd7cc7721..0000000000 --- a/package/rygel/0001-build-Add-man_pages-build-options.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 5a54c5bb1c9609b7bffe6b3e05f934030e4e990e Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sat, 26 Dec 2020 18:40:51 +0100 -Subject: [PATCH] build: Add man_pages build options - -Check if xsltproc runs succesfully and fail otherwise - -Fixes #192 - -[Retrieved from: -https://gitlab.gnome.org/GNOME/rygel/-/commit/5a54c5bb1c9609b7bffe6b3e05f934030e4e990e] -Signed-off-by: Fabrice Fontaine ---- - doc/man/meson.build | 98 +++++++++++++++++++++++++++------------------ - doc/meson.build | 5 ++- - meson_options.txt | 1 + - 3 files changed, 64 insertions(+), 40 deletions(-) - -diff --git a/doc/man/meson.build b/doc/man/meson.build -index ef3fcfbf5..4c92eab2b 100644 ---- a/doc/man/meson.build -+++ b/doc/man/meson.build -@@ -1,43 +1,63 @@ - xsltproc = find_program('xsltproc', required: false) - - if xsltproc.found() -- xlstproc_flags = [ -- '--nonet', -- '--stringparam', 'man.output.quietly', '1', -- '--stringparam', 'funcsynopsis.style', 'ansi', -- '--stringparam', 'man.authors.section.enabled', '1', -- '--stringparam', 'man.copyright.section.enabled', '1', -- ] -- -- xsltproc_args = [ -- xsltproc, -- xlstproc_flags, -- '-o', '@OUTPUT@', -- 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl', -- '@INPUT@', -- ] -- -- man_input_files = [ -- 'rygel.xml', -- 'rygel.conf.xml' -- ] -- -- man_output_files = [ -- 'rygel.1', -- 'rygel.conf.5' -- ] -- -- custom_target('man 1 pages', -- input: 'rygel.xml', -- output: 'rygel.1', -- command: xsltproc_args, -- install: true, -- install_dir: join_paths(get_option('mandir'), 'man1')) -- -- custom_target('man 5 pages', -- input: 'rygel.conf.xml', -- output: 'rygel.conf.5', -- command: xsltproc_args, -- install: true, -- install_dir: join_paths(get_option('mandir'), 'man5')) -+ stylesheet = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' -+ -+ xlstproc_flags = [ -+ '--nonet', -+ '--stringparam', 'man.output.quietly', '1', -+ '--stringparam', 'funcsynopsis.style', 'ansi', -+ '--stringparam', 'man.authors.section.enabled', '1', -+ '--stringparam', 'man.copyright.section.enabled', '1', -+ ] -+ -+ xsltproc_args = [ -+ xsltproc, -+ xlstproc_flags, -+ '-o', '@OUTPUT@', -+ stylesheet, -+ '@INPUT@', -+ ] -+ -+ man_input_files = [ -+ 'rygel.xml', -+ 'rygel.conf.xml' -+ ] -+ -+ man_output_files = [ -+ 'rygel.1', -+ 'rygel.conf.5' -+ ] -+ -+ r = run_command( -+ [ -+ xsltproc, -+ xlstproc_flags, -+ '-o', '/dev/null', -+ stylesheet, -+ 'rygel.xml' -+ ] -+ ) -+ -+ if (r.returncode() == 0) -+ custom_target( -+ 'man 1 pages', -+ input: 'rygel.xml', -+ output: 'rygel.1', -+ command: xsltproc_args, -+ install: true, -+ install_dir: join_paths(get_option('mandir'), 'man1') -+ ) -+ -+ custom_target( -+ 'man 5 pages', -+ input: 'rygel.conf.xml', -+ output: 'rygel.conf.5', -+ command: xsltproc_args, -+ install: true, -+ install_dir: join_paths(get_option('mandir'), 'man5') -+ ) -+ else -+ error('Cannot bulid man pages, failed to run xsltproc') -+ endif - endif -diff --git a/doc/meson.build b/doc/meson.build -index 41c733e50..91c08fae5 100644 ---- a/doc/meson.build -+++ b/doc/meson.build -@@ -1,2 +1,5 @@ --subdir('man') -+if get_option('man_pages') -+ subdir('man') -+endif -+ - subdir('reference') -diff --git a/meson_options.txt b/meson_options.txt -index cb604c4e9..c60ff1a9a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,5 +1,6 @@ - option('uninstalled', type: 'boolean', value: 'false', description: 'Run Rygel from build directory only') - option('api-docs', type: 'boolean', value: 'false', description: 'Build the API documentation') -+option('man_pages', type: 'boolean', value: 'true', description: 'Build the man pages') - option('systemd-user-units-dir', type : 'string', value : 'auto', description : 'Where to install the systemd user unit (use special values "auto" or "none", or pass a path') - option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'media-export', 'mpris', 'playbin', 'ruih', 'tracker', 'tracker3']) - option('engines', type : 'array', choices : ['simple', 'gstreamer']) --- -GitLab - diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch similarity index 93% rename from package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch rename to package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch index 3961ad0564..1d8f4599f4 100644 --- a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch +++ b/package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch @@ -35,12 +35,12 @@ index fd43bebe..e6be2b5e 100644 @@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', # so we depend on the custom_target from that step and pass the input through # commandline. - custom_target('RygelCore-2.6.typelib', -- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], + custom_target('RygelCore-2.8.typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.8.gir')], + command: [g_ir_compiler, '--output', '@OUTPUT@', + '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, -+ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], - output: 'RygelCore-2.6.typelib', ++ join_paths(meson.current_build_dir(), 'RygelCore-2.8.gir')], + output: 'RygelCore-2.8.typelib', depends: [ core_lib, core_gir ], install: true, diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build @@ -52,8 +52,8 @@ index ad98a3a7..e8baefe1 100644 '--includedir', core_girdir, '--includedir', renderer_girdir, + '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, - join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], - output: 'RygelRendererGst-2.6.typelib', + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.8.gir')], + output: 'RygelRendererGst-2.8.typelib', depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build index 5f401527..821273ff 100644 @@ -64,7 +64,7 @@ index 5f401527..821273ff 100644 '--output', '@OUTPUT@', '--includedir', core_girdir, + '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, - join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], + join_paths(meson.current_build_dir(), 'RygelRenderer-2.8.gir')], output: 'RygelRenderer-2.6.typelib', depends: [ renderer_lib, renderer_gir, core_gir ], diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build @@ -76,7 +76,7 @@ index a3bd77d9..6b084eb6 100644 '--output', '@OUTPUT@', '--includedir', core_girdir, + '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, - join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], + join_paths(meson.current_build_dir(), 'RygelServer-2.8.gir')], output: 'RygelServer-2.6.typelib', depends: [ server_lib, server_gir, core_gir ], -- diff --git a/package/rygel/Config.in b/package/rygel/Config.in index e160068a55..a3c2bd29da 100644 --- a/package/rygel/Config.in +++ b/package/rygel/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RYGEL bool "rygel" + depends on BR2_PACKAGE_XORG7 depends on BR2_USE_WCHAR # gupnp-av depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av depends on BR2_USE_MMU # gupnp-av, gobject-introspection @@ -15,6 +16,7 @@ config BR2_PACKAGE_RYGEL select BR2_PACKAGE_LIBGEE select BR2_PACKAGE_LIBMEDIAART select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_XLIB_LIBX11 help Rygel is a home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other @@ -57,6 +59,7 @@ endif # BR2_PACKAGE_RYGEL comment "rygel needs python3 and a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on BR2_PACKAGE_XORG7 depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ diff --git a/package/rygel/rygel.hash b/package/rygel/rygel.hash index 8bda1c2af7..77db59cf40 100644 --- a/package/rygel/rygel.hash +++ b/package/rygel/rygel.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.gnome.org/sources/rygel/0.40/rygel-0.40.2.sha256sum: -sha256 c9e8c736296d22c4defe959727a29d31437bbd2b7aa0c6470d6be24011050697 rygel-0.40.2.tar.xz +# Hash from: https://ftp.gnome.org/pub/gnome/sources/rygel/0.42/rygel-0.42.5.sha256sum: +sha256 1133602d2e6710aade6b22aa98d93384c8d56396f344763413e96e0110b7d89f rygel-0.42.5.tar.xz # Locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index 81d35be833..5c155f8e13 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -4,8 +4,8 @@ # ################################################################################ -RYGEL_VERSION_MAJOR = 0.40 -RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).2 +RYGEL_VERSION_MAJOR = 0.42 +RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).5 RYGEL_SOURCE = rygel-$(RYGEL_VERSION).tar.xz RYGEL_SITE = https://download.gnome.org/sources/rygel/$(RYGEL_VERSION_MAJOR) RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) @@ -18,6 +18,7 @@ RYGEL_DEPENDENCIES = \ libgee \ libmediaart \ sqlite \ + xlib_libX11 \ $(TARGET_NLS_DEPENDENCIES) RYGEL_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Tue Feb 6 10:13:48 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:13:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/rygel: bump to version 0.42.5 In-Reply-To: <20240107164400.359352-1-fontaine.fabrice@gmail.com> References: <20240107164400.359352-1-fontaine.fabrice@gmail.com> Message-ID: <20240206111348.025e3c12@windsurf> On Sun, 7 Jan 2024 17:44:00 +0100 Fabrice Fontaine wrote: > - Drop first patch (already in version) > - Refresh second patch > - x11 is mandatory since > https://gitlab.gnome.org/GNOME/rygel/-/commit/18cd2cff6f64b7a54156ac97e5c4f50eb8fd8d67 > and upstream doesn't want to make it optional: > https://gitlab.gnome.org/GNOME/rygel/-/issues/221 > - This bump will also fix the following build failure raised since bump > of gupnp to version 1.6.6 in commit > b7938d2ae78ace5bffcf523f06304b27cd4edc0b: > > ../output-1/build/rygel-0.40.2/meson.build:79:8: ERROR: Dependency "gupnp-1.2" not found, tried pkgconfig and cmake > > https://gitlab.gnome.org/GNOME/rygel/-/blob/rygel-0.42.5/NEWS > > Fixes: > - http://autobuild.buildroot.org/results/bdf87468199504384f79e4ab59971776d517296b > > Signed-off-by: Fabrice Fontaine > --- > .checkpackageignore | 3 +- > ...01-build-Add-man_pages-build-options.patch | 150 ------------------ > ...meson.build-fix-g_ir_compiler-calls.patch} | 16 +- > package/rygel/Config.in | 3 + > package/rygel/rygel.hash | 4 +- > package/rygel/rygel.mk | 5 +- > 6 files changed, 17 insertions(+), 164 deletions(-) > delete mode 100644 package/rygel/0001-build-Add-man_pages-build-options.patch > rename package/rygel/{0002-meson.build-fix-g_ir_compiler-calls.patch => 0001-meson.build-fix-g_ir_compiler-calls.patch} (93%) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:14:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:14:25 +0100 Subject: [Buildroot] [git commit] package/python-aiohttp-debugtoolbar: bump to version 0.6.1 Message-ID: <20240206101543.04F6686F0A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf2b8d890ec1b9e001e7671f79d7144780f1c815 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to new line removal: https://github.com/aio-libs/aiohttp-debugtoolbar/commit/449550e9c70f17be7b679b90cc3dda2cc90c61e1 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash | 6 +++--- package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash b/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash index 3cd9462d72..441574bbe2 100644 --- a/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash +++ b/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp_debugtoolbar/json -md5 496734057cb413d7a49a52a817802dbb aiohttp-debugtoolbar-0.6.0.tar.gz -sha256 ec231661133b40136608d39dfb688e7ea0c3d47b6ae6dee52d5bf24ceb9e4d45 aiohttp-debugtoolbar-0.6.0.tar.gz +md5 3be0e457798dbd301f4cfe8da43166d4 aiohttp-debugtoolbar-0.6.1.tar.gz +sha256 cd7ae54c600db7ae7d9dc3404b81f95209a6367df1d59e13ea20f9926e36e001 aiohttp-debugtoolbar-0.6.1.tar.gz # Locally computed sha256 checksums -sha256 94d638be2cb4f186cc62bb567455837757547c15f1b350863aaf05a38843b542 LICENSE +sha256 dd064918c2da830f543f6b34b699efd423c2ad82fdbda15c25214410fcd3f84b LICENSE diff --git a/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk b/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk index 319d20ffc5..8eb38e86cc 100644 --- a/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk +++ b/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_DEBUGTOOLBAR_VERSION = 0.6.0 +PYTHON_AIOHTTP_DEBUGTOOLBAR_VERSION = 0.6.1 PYTHON_AIOHTTP_DEBUGTOOLBAR_SOURCE = aiohttp-debugtoolbar-$(PYTHON_AIOHTTP_DEBUGTOOLBAR_VERSION).tar.gz -PYTHON_AIOHTTP_DEBUGTOOLBAR_SITE = https://files.pythonhosted.org/packages/3f/dd/5121417dfbeb4661673afa5c8708f1539889d0e54b1509a6fdf66705efc5 +PYTHON_AIOHTTP_DEBUGTOOLBAR_SITE = https://files.pythonhosted.org/packages/bd/72/cd80c0d1d425d5ef50e5b23553040e8d9fa5de5714208d3d18ae8806b6de PYTHON_AIOHTTP_DEBUGTOOLBAR_SETUP_TYPE = setuptools PYTHON_AIOHTTP_DEBUGTOOLBAR_LICENSE = Apache-2.0 PYTHON_AIOHTTP_DEBUGTOOLBAR_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:15:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:15:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp-debugtoolbar: bump to version 0.6.1 In-Reply-To: <20240107210645.3318474-1-james.hilliard1@gmail.com> References: <20240107210645.3318474-1-james.hilliard1@gmail.com> Message-ID: <20240206111543.3d636875@windsurf> On Sun, 7 Jan 2024 14:06:45 -0700 James Hilliard wrote: > License hash changed due to new line removal: > https://github.com/aio-libs/aiohttp-debugtoolbar/commit/449550e9c70f17be7b679b90cc3dda2cc90c61e1 > > Signed-off-by: James Hilliard > --- > .../python-aiohttp-debugtoolbar.hash | 6 +++--- > .../python-aiohttp-debugtoolbar.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:15:57 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:15:57 +0100 Subject: [Buildroot] [git commit] package/python-botocore: bump to version 1.34.14 Message-ID: <20240206101720.EB10C86F11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e1aa3be0534bcde65d7ab3af9980c9bdd511317 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-botocore/python-botocore.hash | 4 ++-- package/python-botocore/python-botocore.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-botocore/python-botocore.hash b/package/python-botocore/python-botocore.hash index adf6232b24..47fb30f960 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/botocore/json -md5 ee4f82382518e3af25b4ccfab38587d1 botocore-1.31.78.tar.gz -sha256 320c70bc412157813c2cf60217a592b4b345f8e97e4bf3b1ce49b6be69ed8965 botocore-1.31.78.tar.gz +md5 6c8ba4112df2c114c71522330deb0f9a botocore-1.34.14.tar.gz +sha256 041bed0852649cab7e4dcd4d87f9d1cc084467fb846e5b60015e014761d96414 botocore-1.34.14.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 tests/unit/auth/aws4_testsuite/LICENSE diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index 850fb79aa1..485e973135 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.31.78 +PYTHON_BOTOCORE_VERSION = 1.34.14 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/84/a9/9c2752aa24c050323c37a9d2af6dec348889825b51db07fb7f1bb792e307 +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/35/6d/a5aaf38f980060d17905398301033e9eb45c2552bf281fa7fd4c8e23ebdd PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt tests/unit/auth/aws4_testsuite/LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:17:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:17:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-botocore: bump to version 1.34.14 In-Reply-To: <20240108072652.3496708-1-james.hilliard1@gmail.com> References: <20240108072652.3496708-1-james.hilliard1@gmail.com> Message-ID: <20240206111718.413fb415@windsurf> On Mon, 8 Jan 2024 00:26:52 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-botocore/python-botocore.hash | 4 ++-- > package/python-botocore/python-botocore.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:17:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:17:44 +0100 Subject: [Buildroot] [git commit] package/python-colorlog: bump to version 6.8.0 Message-ID: <20240206102053.95A0D86F40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3c2f84e70f592bb3986b5696d9a3e8c8d5268822 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-colorlog/python-colorlog.hash | 4 ++-- package/python-colorlog/python-colorlog.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-colorlog/python-colorlog.hash b/package/python-colorlog/python-colorlog.hash index f4d0dd4c0e..9df94b19ba 100644 --- a/package/python-colorlog/python-colorlog.hash +++ b/package/python-colorlog/python-colorlog.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/colorlog/json -md5 80b79f7824d39d4f3b11c75d1cba094e colorlog-6.7.0.tar.gz -sha256 bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 colorlog-6.7.0.tar.gz +md5 805e982037ba071d3d42c3d53cf73fd8 colorlog-6.8.0.tar.gz +sha256 fbb6fdf9d5685f2517f388fb29bb27d54e8654dd31f58bc2a3b217e967a95ca6 colorlog-6.8.0.tar.gz # Locally computed sha256 checksums sha256 b1d9082bc483623fd59fc7279b457f0e40d942a76426cde257239e04dfe4125a LICENSE diff --git a/package/python-colorlog/python-colorlog.mk b/package/python-colorlog/python-colorlog.mk index 12a1c8ec77..f96318ce5a 100644 --- a/package/python-colorlog/python-colorlog.mk +++ b/package/python-colorlog/python-colorlog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COLORLOG_VERSION = 6.7.0 +PYTHON_COLORLOG_VERSION = 6.8.0 PYTHON_COLORLOG_SOURCE = colorlog-$(PYTHON_COLORLOG_VERSION).tar.gz -PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/78/6b/4e5481ddcdb9c255b2715f54c863629f1543e97bc8c309d1c5c131ad14f2 +PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/1f/b0/e4e3850d43f5429f9e53404056d705117fbb8a4d9e755425e762a9f68317 PYTHON_COLORLOG_SETUP_TYPE = setuptools PYTHON_COLORLOG_LICENSE = MIT PYTHON_COLORLOG_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:18:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:18:09 +0100 Subject: [Buildroot] [git commit] package/python-dominate: bump to version 2.9.1 Message-ID: <20240206102053.E45A086F43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bc7bab307a77561e5d297312990e7af89ada0730 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-dominate/python-dominate.hash | 4 ++-- package/python-dominate/python-dominate.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dominate/python-dominate.hash b/package/python-dominate/python-dominate.hash index 9993dbe95f..26840e5f0c 100644 --- a/package/python-dominate/python-dominate.hash +++ b/package/python-dominate/python-dominate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dominate/json -md5 df2d30e7c2e7f1e5b085a58820e4cc94 dominate-2.8.0.tar.gz -sha256 4c90c3befaf88e612b71f4b39af7bcbef8977acfa855cec957225a8fbf504007 dominate-2.8.0.tar.gz +md5 4dc4bbb39297999624e2312b6fe2b46f dominate-2.9.1.tar.gz +sha256 558284687d9b8aae1904e3d6051ad132dd4a8c0cf551b37ea4e7e42a31d19dc4 dominate-2.9.1.tar.gz # Locally computed sha256 checksums sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 LICENSE.txt diff --git a/package/python-dominate/python-dominate.mk b/package/python-dominate/python-dominate.mk index 39e2edb82e..d6301af9db 100644 --- a/package/python-dominate/python-dominate.mk +++ b/package/python-dominate/python-dominate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOMINATE_VERSION = 2.8.0 +PYTHON_DOMINATE_VERSION = 2.9.1 PYTHON_DOMINATE_SOURCE = dominate-$(PYTHON_DOMINATE_VERSION).tar.gz -PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/13/3d/8d22916c12184f0c4930b9cdfb136a130e8d8eacf5942fc9883f2a189f6a +PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/fb/f3/1c8088ff19a0fcd9c3234802a0ee47006ea64bd8852f1019194f0e3583ff PYTHON_DOMINATE_SETUP_TYPE = setuptools PYTHON_DOMINATE_LICENSE = LGPL-3.0+ PYTHON_DOMINATE_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Tue Feb 6 10:17:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:17:54 +0100 Subject: [Buildroot] [git commit] package/python-distlib: bump to version 0.3.8 Message-ID: <20240206102053.B756686F43@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bea49c2cd3168e11ecf6e858b7e0004f963b4069 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-distlib/python-distlib.hash | 4 ++-- package/python-distlib/python-distlib.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-distlib/python-distlib.hash b/package/python-distlib/python-distlib.hash index 506d10824c..1a14e6ba77 100644 --- a/package/python-distlib/python-distlib.hash +++ b/package/python-distlib/python-distlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/distlib/json -md5 44e4357e35bbd77fdf1b81e174e34f20 distlib-0.3.7.tar.gz -sha256 9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8 distlib-0.3.7.tar.gz +md5 c4df5794463d3710bae3d162bf953ba6 distlib-0.3.8.tar.gz +sha256 1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64 distlib-0.3.8.tar.gz # Locally computed sha256 checksums sha256 808e10c8a6ab8deb149ff9b3fb19f447a808094606d712a9ca57fead3552599d LICENSE.txt diff --git a/package/python-distlib/python-distlib.mk b/package/python-distlib/python-distlib.mk index cae025dbdb..2eba3ae64f 100644 --- a/package/python-distlib/python-distlib.mk +++ b/package/python-distlib/python-distlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DISTLIB_VERSION = 0.3.7 +PYTHON_DISTLIB_VERSION = 0.3.8 PYTHON_DISTLIB_SOURCE = distlib-$(PYTHON_DISTLIB_VERSION).tar.gz -PYTHON_DISTLIB_SITE = https://files.pythonhosted.org/packages/29/34/63be59bdf57b3a8a8dcc252ef45c40f3c018777dc8843d45dd9b869868f0 +PYTHON_DISTLIB_SITE = https://files.pythonhosted.org/packages/c4/91/e2df406fb4efacdf46871c25cde65d3c6ee5e173b7e5a4547a47bae91920 PYTHON_DISTLIB_SETUP_TYPE = setuptools PYTHON_DISTLIB_LICENSE = PSF-2.0 PYTHON_DISTLIB_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Tue Feb 6 10:17:51 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:17:51 +0100 Subject: [Buildroot] [git commit] package/python-construct: bump to version 2.10.70 Message-ID: <20240206102053.A5C9E86F41@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9eb47ddad84fe099d2a57ffd428602b06e3bc5c3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-construct/python-construct.hash | 4 ++-- package/python-construct/python-construct.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-construct/python-construct.hash b/package/python-construct/python-construct.hash index a72a79a5b3..395de7a18b 100644 --- a/package/python-construct/python-construct.hash +++ b/package/python-construct/python-construct.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/construct/json -md5 d881ab2198ec6597e603a2d985307353 construct-2.10.69.tar.gz -sha256 08573d1573827a6fe6b846756d54270650e221a6cec6a72e06b582cde775599e construct-2.10.69.tar.gz +md5 e880b97796c16ae362600b7e32339a7e construct-2.10.70.tar.gz +sha256 4d2472f9684731e58cc9c56c463be63baa1447d674e0d66aeb5627b22f512c29 construct-2.10.70.tar.gz # Locally computed sha256 checksums sha256 1552d70acfd0d3fe464ce13d30113ddc6fe4bac21e52212acc98509e3cc1a8f4 LICENSE diff --git a/package/python-construct/python-construct.mk b/package/python-construct/python-construct.mk index 1e30651129..46cae959ea 100644 --- a/package/python-construct/python-construct.mk +++ b/package/python-construct/python-construct.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CONSTRUCT_VERSION = 2.10.69 +PYTHON_CONSTRUCT_VERSION = 2.10.70 PYTHON_CONSTRUCT_SOURCE = construct-$(PYTHON_CONSTRUCT_VERSION).tar.gz -PYTHON_CONSTRUCT_SITE = https://files.pythonhosted.org/packages/02/88/e34d7265863f3c96077aea24041b067d4646d77d596d979110eb94758b03 +PYTHON_CONSTRUCT_SITE = https://files.pythonhosted.org/packages/02/77/8c84b98eca70d245a2a956452f21d57930d22ab88cbeed9290ca630cf03f PYTHON_CONSTRUCT_SETUP_TYPE = setuptools PYTHON_CONSTRUCT_LICENSE = MIT PYTHON_CONSTRUCT_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:17:59 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:17:59 +0100 Subject: [Buildroot] [git commit] package/python-distro: bump to version 1.9.0 Message-ID: <20240206102053.C7B6A86F40@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7c83d1e930c23d0e62de4eedb99716bc5c0f6a29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-distro/python-distro.hash | 8 ++++---- package/python-distro/python-distro.mk | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash index 3d3e4258de..7f8277896d 100644 --- a/package/python-distro/python-distro.hash +++ b/package/python-distro/python-distro.hash @@ -1,5 +1,5 @@ -# From https://pypi.org/pypi/distro/json -md5 a1e81972bbcfc0dc77dd0cde590c22a6 distro-1.8.0.tar.gz -sha256 02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 distro-1.8.0.tar.gz -# Locally computed +# md5, sha256 from https://pypi.org/pypi/distro/json +md5 c4eee99e1d05691230f223c37b895027 distro-1.9.0.tar.gz +sha256 2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed distro-1.9.0.tar.gz +# Locally computed sha256 checksums sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk index e079d8e265..05faab3888 100644 --- a/package/python-distro/python-distro.mk +++ b/package/python-distro/python-distro.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DISTRO_VERSION = 1.8.0 -PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/4b/89/eaa3a3587ebf8bed93e45aa79be8c2af77d50790d15b53f6dfc85b57f398 +PYTHON_DISTRO_VERSION = 1.9.0 PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/fc/f8/98eea607f65de6527f8a2e8885fc8015d3e6f5775df186e443e0964a11c3 PYTHON_DISTRO_LICENSE = Apache-2.0 PYTHON_DISTRO_LICENSE_FILES = LICENSE PYTHON_DISTRO_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Tue Feb 6 10:18:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:18:04 +0100 Subject: [Buildroot] [git commit] package/python-django: bump to version 5.0.1 Message-ID: <20240206102053.D7C9286F41@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dba7e8abaadae87a2e96de92f9f4f59dc590a77c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 98c338f9d4..39fd9afdae 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 d7afe6a68b631725a1dac116a7832b10 Django-4.2.7.tar.gz -sha256 8e0f1c2c2786b5c0e39fe1afce24c926040fad47c8ea8ad30aaf1188df29fc41 Django-4.2.7.tar.gz +md5 5ff3c69d7e6b4f5ed378ec5713af8df7 Django-5.0.1.tar.gz +sha256 8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854 Django-5.0.1.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 9b710412fa..ed4f4bcdf1 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.2.7 +PYTHON_DJANGO_VERSION = 5.0.1 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/5c/62/0c6ab2f3ac9a242b4562b6be1c418685fa7d1ccb8ca302cdb97e0b23cf4b +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From anaumann at ultratronik.de Tue Feb 6 10:21:44 2024 From: anaumann at ultratronik.de (Andreas Naumann) Date: Tue, 6 Feb 2024 11:21:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/glm: Bump to 1.0.0 Message-ID: <20240206102144.1831146-1-anaumann@ultratronik.de> glm did not install headers since [1], at least in a per-package build. Bumping to 1.0.0 fixes that. The cmake option to avoid building the lib has changed Partially fixes [2], where cegui failed to configure because of the missing glm headers. [1] 01ad113 package/glm: bump to version 0.9.9.8 [2] http://autobuild.buildroot.org/results/241/241a60f8ecb6fec5dc122d64dd438dd4249f8c3e/ Signed-off-by: Andreas Naumann --- note: 0.9.9.8 from 2020 was the latest tag until a 1.0.0 was cut about two weeks ago (24th january 2024). I've seen commit 3a4b550 which might have been responsible but didnt check since 1.0.0 was available. package/glm/glm.hash | 2 +- package/glm/glm.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/glm/glm.hash b/package/glm/glm.hash index c4e21016047..0084bd0930c 100644 --- a/package/glm/glm.hash +++ b/package/glm/glm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz +sha256 e51f6c89ff33b7cfb19daafb215f293d106cd900f8d681b9b1295312ccadbd23 glm-1.0.0.tar.gz sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt diff --git a/package/glm/glm.mk b/package/glm/glm.mk index ef549931f6a..ce8efc11a78 100644 --- a/package/glm/glm.mk +++ b/package/glm/glm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLM_VERSION = 0.9.9.8 +GLM_VERSION = 1.0.0 GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) GLM_LICENSE = MIT GLM_LICENSE_FILES = copying.txt @@ -17,7 +17,6 @@ GLM_INSTALL_TARGET = NO # Don't build libraries as GLM is header-only GLM_CONF_OPTS = \ -DGLM_TEST_ENABLE=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_STATIC_LIBS=OFF + -DGLM_BUILD_LIBRARY=OFF $(eval $(cmake-package)) -- 2.34.1 From yegorslists at googlemail.com Tue Feb 6 10:22:06 2024 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Tue, 6 Feb 2024 11:22:06 +0100 Subject: [Buildroot] Ignore build directories created via make O=dir or the default one Message-ID: Hi all, what about adding a .gitignore file with an "*" everytime we create an output directory? Does anything speak against such an approach? Regards, Yegor From giulio.benetti at benettiengineering.com Tue Feb 6 10:26:40 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 11:26:40 +0100 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. In-Reply-To: <20240206033436.38436-1-asd617140123@gmail.com> References: <20240206033436.38436-1-asd617140123@gmail.com> Message-ID: <07295f28-5618-4e8d-b330-d035f4c053c1@benettiengineering.com> Hi Nigel, please don't resend too many times the same patch slightly changed. If you need to please add RESEND tag in Subject prefix. On 06/02/24 04:34, Nigel Wang wrote: > From: nigel_wang > > This is a new defconfig for cubieboard4. The following is board's > detail. > - SOC: sunxiA80. > - DRAM: 2GiB DDR3 @ 672MHZ. > - NAND: 8GBeMMC > - Power: DC 5V. > - Network: Wifi 80211 b/g/n. > - Ethernet: RTL8211E > reference: > https://linux-sunxi.org/Cubietech_Cubieboard4 > > Board support package includes the following components: > - mainline Linux Kernel 6.6.8 > - mainline U-boot 2021.10. > > Signed-off-by: Nigel Wang > > --- under these ^^^ 3 dashes you should report the changes between patch versions like: V1->V2: * changed this * changed that In this case: * dropped boot.cmd as suggested by Giulio > DEVELOPERS | 4 +++ > board/cubietech/cubieboard4/extlinux.conf | 5 +++ > board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ > board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ > configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ > 5 files changed, 104 insertions(+) > create mode 100644 board/cubietech/cubieboard4/extlinux.conf > create mode 100644 board/cubietech/cubieboard4/genimage.cfg > create mode 100755 board/cubietech/cubieboard4/post-image.sh > create mode 100644 configs/cubieboard4_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index a03018ab2b..bffb8f2069 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -3297,3 +3297,7 @@ F: package/quazip/ > F: package/shapelib/ > F: package/simple-mail/ > F: package/tinc/ > + > +N: Nigel Wang > +F: board/cubietech/cubieboard4/ > +F: configs/cubieboard4_defconfig > diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf > new file mode 100644 > index 0000000000..5084e2237b > --- /dev/null > +++ b/board/cubietech/cubieboard4/extlinux.conf > @@ -0,0 +1,5 @@ > +label linux > + kernel /boot/zImage > + devicetree /sun9i-a80-cubieboard4.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > + > diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg > new file mode 100644 > index 0000000000..f1dee13923 > --- /dev/null > +++ b/board/cubietech/cubieboard4/genimage.cfg > @@ -0,0 +1,38 @@ > +# Minimal SD card image for the Cubieboard2 > +# Based in the Orange Pi genimage.cfg > + > +image boot.vfat { > + vfat { > + files = { > + "zImage", > + "sun9i-a80-cubieboard4.dtb", > + "extlinux" > + } > + } > + > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1016K # 1MB - 8KB > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 512M > + } > +} > diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh > new file mode 100755 > index 0000000000..e37b960a4d > --- /dev/null > +++ b/board/cubietech/cubieboard4/post-image.sh > @@ -0,0 +1,18 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf > + > +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > + > +rm -rf "${GENIMAGE_TMP}" > + > +genimage \ > + --rootpath "${TARGET_DIR}" \ > + --tmppath "${GENIMAGE_TMP}" \ > + --inputpath "${BINARIES_DIR}" \ > + --outputpath "${BINARIES_DIR}" \ > + --config "${GENIMAGE_CFG}" > + > +exit $? > diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig > new file mode 100644 > index 0000000000..0592fe4a2d > --- /dev/null > +++ b/configs/cubieboard4_defconfig > @@ -0,0 +1,39 @@ > +# Architecture > +BR2_arm=y > +BR2_cortex_a15_a7=y > +BR2_ARM_FPU_NEON_VFPV4=y > + > +# System > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -- > 2.34.1 > I've built successfully the defconfig using buildroot/utils/docker-run so: Reviewed-by: Giulio Benetti [Build Tested] Tested-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Tue Feb 6 10:26:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:26:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-colorlog: bump to version 6.8.0 In-Reply-To: <20240109060406.3976484-1-james.hilliard1@gmail.com> References: <20240109060406.3976484-1-james.hilliard1@gmail.com> Message-ID: <20240206112652.52a41aab@windsurf> On Mon, 8 Jan 2024 23:04:06 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-colorlog/python-colorlog.hash | 4 ++-- > package/python-colorlog/python-colorlog.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:26:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:26:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-construct: bump to version 2.10.70 In-Reply-To: <20240109063850.3985537-1-james.hilliard1@gmail.com> References: <20240109063850.3985537-1-james.hilliard1@gmail.com> Message-ID: <20240206112658.16e16815@windsurf> On Mon, 8 Jan 2024 23:38:50 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-construct/python-construct.hash | 4 ++-- > package/python-construct/python-construct.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:27:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:27:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distlib: bump to version 0.3.8 In-Reply-To: <20240109065801.3999176-1-james.hilliard1@gmail.com> References: <20240109065801.3999176-1-james.hilliard1@gmail.com> Message-ID: <20240206112704.26a5f9b3@windsurf> On Mon, 8 Jan 2024 23:58:01 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-distlib/python-distlib.hash | 4 ++-- > package/python-distlib/python-distlib.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:27:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:27:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-distro: bump to version 1.9.0 In-Reply-To: <20240109070135.4001715-1-james.hilliard1@gmail.com> References: <20240109070135.4001715-1-james.hilliard1@gmail.com> Message-ID: <20240206112708.0253821d@windsurf> On Tue, 9 Jan 2024 00:01:35 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-distro/python-distro.hash | 8 ++++---- > package/python-distro/python-distro.mk | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:27:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:27:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: bump to version 5.0.1 In-Reply-To: <20240109070626.4019996-1-james.hilliard1@gmail.com> References: <20240109070626.4019996-1-james.hilliard1@gmail.com> Message-ID: <20240206112714.7beb00e5@windsurf> On Tue, 9 Jan 2024 00:06:26 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-django/python-django.hash | 4 ++-- > package/python-django/python-django.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:27:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:27:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-dominate: bump to version 2.9.1 In-Reply-To: <20240109071001.4022321-1-james.hilliard1@gmail.com> References: <20240109071001.4022321-1-james.hilliard1@gmail.com> Message-ID: <20240206112721.7ba51303@windsurf> On Tue, 9 Jan 2024 00:10:01 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-dominate/python-dominate.hash | 4 ++-- > package/python-dominate/python-dominate.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:10 +0100 Subject: [Buildroot] [git commit] package/python-engineio: bump to version 4.8.2 Message-ID: <20240206103428.C45B886F9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff17367e73119a26a0b763cb5484938ed7bbca05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-engineio/python-engineio.hash | 4 ++-- package/python-engineio/python-engineio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-engineio/python-engineio.hash b/package/python-engineio/python-engineio.hash index 98fe647f68..c1b02350bc 100644 --- a/package/python-engineio/python-engineio.hash +++ b/package/python-engineio/python-engineio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-engineio/json -md5 45870fb7b12e6e5dca3cb6a828f70928 python-engineio-4.8.0.tar.gz -sha256 2a32585d8fecd0118264fe0c39788670456ca9aa466d7c026d995cfff68af164 python-engineio-4.8.0.tar.gz +md5 619e7fce0257a8219187f50aa94844a3 python-engineio-4.8.2.tar.gz +sha256 f8609e3afdda318fdc336b4ba2de8dd397bb8f9b8a1b43e56c27330e32c2e34c python-engineio-4.8.2.tar.gz # Locally computed sha256 checksums sha256 c9e97d3dbc1fbbcdb4f7808b282cd646db887aff4f5313fe6bbe8d4c31405a9c LICENSE diff --git a/package/python-engineio/python-engineio.mk b/package/python-engineio/python-engineio.mk index e84acee88f..7702b5f294 100644 --- a/package/python-engineio/python-engineio.mk +++ b/package/python-engineio/python-engineio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_ENGINEIO_VERSION = 4.8.0 -PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/c4/5c/4fa0bf79eb1a433d1e9b69430b3ac818837283c642640658f12949620813 +PYTHON_ENGINEIO_VERSION = 4.8.2 +PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/e2/24/4a69dd119d10e31c4439f910a2a0f71b540b9f835ab60efa1f0f7bcae0c7 PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:25 +0100 Subject: [Buildroot] [git commit] package/python-falcon: bump to version 3.1.3 Message-ID: <20240206103428.EAF8386F9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b2ec7d40f8ac385f29f9ef740dfa5d92e68f318 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-falcon/python-falcon.hash | 4 ++-- package/python-falcon/python-falcon.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash index 497b5d2b57..2d54d27837 100644 --- a/package/python-falcon/python-falcon.hash +++ b/package/python-falcon/python-falcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/falcon/json -md5 383673fc6378428d0db5861a416cad0d falcon-3.1.1.tar.gz -sha256 5dd393dbf01cbaf99493893de4832121bd495dc49a46c571915b79c59aad7ef4 falcon-3.1.1.tar.gz +md5 22a5c32f3d9dd96d498febe8e16ddffe falcon-3.1.3.tar.gz +sha256 23335dbccd44f29e85ec55f2f35d5a0bc12bd7a509f641ab81f5c64b65626263 falcon-3.1.3.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-falcon/python-falcon.mk b/package/python-falcon/python-falcon.mk index b5ebc399dc..6c96bf16eb 100644 --- a/package/python-falcon/python-falcon.mk +++ b/package/python-falcon/python-falcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FALCON_VERSION = 3.1.1 +PYTHON_FALCON_VERSION = 3.1.3 PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz -PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/29/bc/c11c9a14bb5b4d18a024ee51da15b793d1c869d151bb4101e324e0d055a8 +PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/3b/30/a7bc770025b6a7a36d0508e3d735dca239df7c27b862856e54d661f24632 PYTHON_FALCON_SETUP_TYPE = setuptools PYTHON_FALCON_LICENSE = Apache-2.0 PYTHON_FALCON_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:06 +0100 Subject: [Buildroot] [git commit] package/python-dtschema: bump to version 2023.11 Message-ID: <20240206103428.B3A7D86F9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4771d62dd0576c6eb5880aadced514c3c4d15d74 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-dtschema/python-dtschema.hash | 4 ++-- package/python-dtschema/python-dtschema.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-dtschema/python-dtschema.hash b/package/python-dtschema/python-dtschema.hash index a391e4ab21..3e1dd22133 100644 --- a/package/python-dtschema/python-dtschema.hash +++ b/package/python-dtschema/python-dtschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dtschema/json -md5 bb0ecd8b8680b76f7cb55da002f58d62 dtschema-2023.9.tar.gz -sha256 52c6d271065155ca134d8a0bcf7e0ebed67b3991acbbd7a98b74eb8642f67d87 dtschema-2023.9.tar.gz +md5 cc4be8cfc01804cc31a123b56f68aeb1 dtschema-2023.11.tar.gz +sha256 cf9a449ea743c0a955cf6034ef246668fa5ea177684977c61fef7604af5f273b dtschema-2023.11.tar.gz # Locally computed sha256 checksums sha256 ca0d66263406dc684fe9db60577b234f65ffdf620d7e041c708e969447b69111 LICENSE.txt diff --git a/package/python-dtschema/python-dtschema.mk b/package/python-dtschema/python-dtschema.mk index 0fc13073f8..e1dd5009fd 100644 --- a/package/python-dtschema/python-dtschema.mk +++ b/package/python-dtschema/python-dtschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DTSCHEMA_VERSION = 2023.9 +PYTHON_DTSCHEMA_VERSION = 2023.11 PYTHON_DTSCHEMA_SOURCE = dtschema-$(PYTHON_DTSCHEMA_VERSION).tar.gz -PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/24/97/daa9109a854727cd4e1a715e4123198e5abd47db10c131de5bc0cef0acc3 +PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/5a/94/7890ef663fba1cca84cf0ab64c7f68685343c921ab883f0356cd9978b605 PYTHON_DTSCHEMA_SETUP_TYPE = setuptools PYTHON_DTSCHEMA_LICENSE = BSD-2-Clause PYTHON_DTSCHEMA_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:31 +0100 Subject: [Buildroot] [git commit] package/python-flask-smorest: bump to version 0.42.3 Message-ID: <20240206103429.0A1E386F9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d02aa4dd447ab51c531f52f3c9e7a6057416585e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-flask-smorest/python-flask-smorest.hash | 4 ++-- package/python-flask-smorest/python-flask-smorest.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash index baeddb0e6b..b468c48fd8 100644 --- a/package/python-flask-smorest/python-flask-smorest.hash +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-smorest/json -md5 3d8c01cfe9ec4ba16636d6a3078edc87 flask-smorest-0.42.1.tar.gz -sha256 7fde3f349d464c408c73b7cbbdb1884c1c36cc8c23b2562aba28d9bdfdd14cdc flask-smorest-0.42.1.tar.gz +md5 b10a7a0bdee4505dec3cc7652560bc9e flask-smorest-0.42.3.tar.gz +sha256 736ef072bd5522de750a5a9d9f1bfb6d750d05c66e1b3702bc7a20e4277af9bf flask-smorest-0.42.3.tar.gz # Locally computed sha256 checksums sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE diff --git a/package/python-flask-smorest/python-flask-smorest.mk b/package/python-flask-smorest/python-flask-smorest.mk index 8a11e96d01..6eb1abc6fa 100644 --- a/package/python-flask-smorest/python-flask-smorest.mk +++ b/package/python-flask-smorest/python-flask-smorest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_SMOREST_VERSION = 0.42.1 +PYTHON_FLASK_SMOREST_VERSION = 0.42.3 PYTHON_FLASK_SMOREST_SOURCE = flask-smorest-$(PYTHON_FLASK_SMOREST_VERSION).tar.gz -PYTHON_FLASK_SMOREST_SITE = https://files.pythonhosted.org/packages/be/6e/8e3d0287bfa2da6ca7cf94cd9c053ed209764538dd5fb1d96f535e4d43bb +PYTHON_FLASK_SMOREST_SITE = https://files.pythonhosted.org/packages/25/91/da55ec1288e821069ab61b6db4acfa171fa268c426523bb4f3a8a91210db PYTHON_FLASK_SMOREST_SETUP_TYPE = setuptools PYTHON_FLASK_SMOREST_LICENSE = MIT PYTHON_FLASK_SMOREST_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:20 +0100 Subject: [Buildroot] [git commit] package/python-esptool: bump to version 4.7.0 Message-ID: <20240206103428.D6E6B86F9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=40af3cb08a26b797370fd99c51954831edd6a966 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new python-intelhex runtime dependency. Add new python-pyyaml runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-esptool/Config.in | 2 ++ package/python-esptool/python-esptool.hash | 4 ++-- package/python-esptool/python-esptool.mk | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index 36243fa89e..4099957971 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_PYTHON_ESPTOOL select BR2_PACKAGE_PYTHON_BITSTRING # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_ECDSA # runtime + select BR2_PACKAGE_PYTHON_INTELHEX # runtime + select BR2_PACKAGE_PYTHON_PYYAML # runtime select BR2_PACKAGE_PYTHON_REEDSOLO # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime select BR2_PACKAGE_PYTHON3_ZLIB diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index 25fea229b0..490b4e7e9c 100644 --- a/package/python-esptool/python-esptool.hash +++ b/package/python-esptool/python-esptool.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/esptool/json -md5 17853949fd582550a7c270f08d7691d4 esptool-4.6.2.tar.gz -sha256 549ef93eef42ee7e9462ce5a53c16df7a0c71d91b3f77e19ec15749804cdf300 esptool-4.6.2.tar.gz +md5 e7f2012cf31cd23f60049b179fb3b53a esptool-4.7.0.tar.gz +sha256 01454e69e1ef3601215db83ff2cb1fc79ece67d24b0e5d43d451b410447c4893 esptool-4.7.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index c0709c64b1..f5aaface74 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 4.6.2 +PYTHON_ESPTOOL_VERSION = 4.7.0 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/a3/63/c757f50b606996a7e676f000b40626f65be63b3a10030563929c968e431c +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/1b/8b/f0d1e75879dee053874a4f955ed1e9ad97275485f51cb4bc2cb4e9b24479 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:36 +0100 Subject: [Buildroot] [git commit] package/python-fonttools: bump to version 4.47.0 Message-ID: <20240206103429.1A3DE86F9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c89465332292dcf41ed28fc86ae181d65989c6a4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-fonttools/python-fonttools.hash | 4 ++-- package/python-fonttools/python-fonttools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash index 8bcabb0c45..7476656410 100644 --- a/package/python-fonttools/python-fonttools.hash +++ b/package/python-fonttools/python-fonttools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/fonttools/json -md5 717f907e93dd6be3dd46fbdcdc33bbd7 fonttools-4.44.0.tar.gz -sha256 4e90dd81b6e0d97ebfe52c0d12a17a9ef7f305d6bfbb93081265057d6092f252 fonttools-4.44.0.tar.gz +md5 767059d1d373ade070d38295feaa3f92 fonttools-4.47.0.tar.gz +sha256 ec13a10715eef0e031858c1c23bfaee6cba02b97558e4a7bfa089dba4a8c2ebf fonttools-4.47.0.tar.gz # Locally computed sha256 checksums sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index 2f8a738600..e2472aa184 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.44.0 +PYTHON_FONTTOOLS_VERSION = 4.47.0 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).tar.gz -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/6d/f8/d3116b436553856df4ed9094584ac55c5e99ee9d9f3369f2912bbb8d0b90 +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/dd/e5/9adc30ebca9009d5ad36c7e74462ee5fc51985ca9a845fd26f9f5c99b3df PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:28:59 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:28:59 +0100 Subject: [Buildroot] [git commit] package/python-frozenlist: bump to version 1.4.1 Message-ID: <20240206103429.2E42686F9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2fc447def738722318fe73fe00da4c10166d012d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-frozenlist/python-frozenlist.hash | 4 ++-- package/python-frozenlist/python-frozenlist.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-frozenlist/python-frozenlist.hash b/package/python-frozenlist/python-frozenlist.hash index 466dd6931b..40a87d2ec0 100644 --- a/package/python-frozenlist/python-frozenlist.hash +++ b/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 4a14df2fe30853d9e18f73002493a860 frozenlist-1.4.0.tar.gz -sha256 09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251 frozenlist-1.4.0.tar.gz +md5 e64b421e8e571623695cd414515f0081 frozenlist-1.4.1.tar.gz +sha256 c037a86e8513059a2613aaba4d817bb90b9d9b6b69aace3ce9c877e8c8ed402b frozenlist-1.4.1.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 10c6bc6314..9333598808 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.4.0 +PYTHON_FROZENLIST_VERSION = 1.4.1 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/8c/1f/49c96ccc87127682ba900b092863ef7c20302a2144b3185412a08480ca22 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/cf/3d/2102257e7acad73efc4a0c306ad3953f68c504c16982bbdfee3ad75d8085 PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:30:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:30:56 +0100 Subject: [Buildroot] [git commit] package/python-greenlet: bump to version 3.0.3 Message-ID: <20240206103429.58CAE86F9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7d45f45fb74a2c60e7bc4fed7abe209cd63eee5c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-greenlet/python-greenlet.hash | 4 ++-- package/python-greenlet/python-greenlet.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-greenlet/python-greenlet.hash b/package/python-greenlet/python-greenlet.hash index 2de253e1b5..61e7f05346 100644 --- a/package/python-greenlet/python-greenlet.hash +++ b/package/python-greenlet/python-greenlet.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/greenlet/json -md5 3905122960191e81410714f7db4835e4 greenlet-3.0.1.tar.gz -sha256 816bd9488a94cba78d93e1abb58000e8266fa9cc2aa9ccdd6eb0696acb24005b greenlet-3.0.1.tar.gz +md5 170495b0af3b63ca40ca637dd6e5c6ef greenlet-3.0.3.tar.gz +sha256 43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491 greenlet-3.0.3.tar.gz # Locally computed sha256 checksums sha256 769831d6e5dfaf2c20802faccff1fafb4c2025dd8f6253dfa47fcad59d4d0979 LICENSE sha256 e5ff3c23c110e494cd7d736c10fd96d462457bafeca310840db6527298c7d46b LICENSE.PSF diff --git a/package/python-greenlet/python-greenlet.mk b/package/python-greenlet/python-greenlet.mk index 7ca1ac1674..1af104519b 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GREENLET_VERSION = 3.0.1 +PYTHON_GREENLET_VERSION = 3.0.3 PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz -PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/54/df/718c9b3e90edba70fa919bb3aaa5c3c8dabf3a8252ad1e93d33c348e5ca4 +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/17/14/3bddb1298b9a6786539ac609ba4b7c9c0842e12aa73aaa4d8d73ec8f8185 PYTHON_GREENLET_SETUP_TYPE = setuptools PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF From thomas.petazzoni at bootlin.com Tue Feb 6 10:31:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:31:01 +0100 Subject: [Buildroot] [git commit] package/python-hatch-vcs: bump to version 0.4.0 Message-ID: <20240206103429.6848286F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9e7dc1f213c417f0d9de1d92bd9721e679dee1bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-hatch-vcs/python-hatch-vcs.hash | 4 ++-- package/python-hatch-vcs/python-hatch-vcs.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatch-vcs/python-hatch-vcs.hash b/package/python-hatch-vcs/python-hatch-vcs.hash index 6e5fe1de13..55cd3b3e5a 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.hash +++ b/package/python-hatch-vcs/python-hatch-vcs.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatch_vcs/json -md5 c2f2cbe6851b7b2969cb4aa24c4b9b2f hatch_vcs-0.3.0.tar.gz -sha256 cec5107cfce482c67f8bc96f18bbc320c9aa0d068180e14ad317bbee5a153fee hatch_vcs-0.3.0.tar.gz +md5 d801fe7c3e5955307748f2790bbb3488 hatch_vcs-0.4.0.tar.gz +sha256 093810748fe01db0d451fabcf2c1ac2688caefd232d4ede967090b1c1b07d9f7 hatch_vcs-0.4.0.tar.gz # Locally computed sha256 checksums sha256 117aa5006d8475562f04442ab06dd2a4c501af3a77255eae0deef1f0c2499a1a LICENSE.txt diff --git a/package/python-hatch-vcs/python-hatch-vcs.mk b/package/python-hatch-vcs/python-hatch-vcs.mk index ef5f6541cd..46e59f8aa0 100644 --- a/package/python-hatch-vcs/python-hatch-vcs.mk +++ b/package/python-hatch-vcs/python-hatch-vcs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCH_VCS_VERSION = 0.3.0 +PYTHON_HATCH_VCS_VERSION = 0.4.0 PYTHON_HATCH_VCS_SOURCE = hatch_vcs-$(PYTHON_HATCH_VCS_VERSION).tar.gz -PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/04/33/b68d68e532392d938472d16a03e4ce0ccd749ea31b42d18f8baa6547cbfd +PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/f5/c9/54bb4fa27b4e4a014ef3bb17710cdf692b3aa2cbc7953da885f1bf7e06ea PYTHON_HATCH_VCS_LICENSE = MIT PYTHON_HATCH_VCS_LICENSE_FILES = LICENSE.txt PYTHON_HATCH_VCS_SETUP_TYPE = pep517 From thomas.petazzoni at bootlin.com Tue Feb 6 10:31:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:31:05 +0100 Subject: [Buildroot] [git commit] package/python-hatchling: bump to version 1.21.0 Message-ID: <20240206103429.793BC86F9C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a1c77f08ac4dd3f963f65da608bb3043011e47a1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-hatchling/python-hatchling.hash | 4 ++-- package/python-hatchling/python-hatchling.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index ebb412d197..e1798e882c 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 43f7203cacb6c3c178b93149b8a8151d hatchling-1.18.0.tar.gz -sha256 50e99c3110ce0afc3f7bdbadff1c71c17758e476731c27607940cfa6686489ca hatchling-1.18.0.tar.gz +md5 21e5e7ed5fa6dd0618c5b66eb847f370 hatchling-1.21.0.tar.gz +sha256 5c086772357a50723b825fd5da5278ac7e3697cdf7797d07541a6c90b6ff754c hatchling-1.21.0.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index f13e6d3e28..d1ed4d23c2 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.18.0 +PYTHON_HATCHLING_VERSION = 1.21.0 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/e3/57/87da2c5adc173950ebe9f1acce4d5f2cd0a960783992fd4879a899a0b637 +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/fd/4a/8196e79c0d6e5eb10436dd2fcccc889a76af6ecf9bc35f87408159497d4d PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 From thomas.petazzoni at bootlin.com Tue Feb 6 10:29:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:29:06 +0100 Subject: [Buildroot] [git commit] package/python-google-auth: bump to version 2.26.1 Message-ID: <20240206103429.3DCFF86F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f5005df17602305dd8de74264521f3d6e1398b38 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-google-auth/python-google-auth.hash | 4 ++-- package/python-google-auth/python-google-auth.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-google-auth/python-google-auth.hash b/package/python-google-auth/python-google-auth.hash index 2f965edc91..9c201391f4 100644 --- a/package/python-google-auth/python-google-auth.hash +++ b/package/python-google-auth/python-google-auth.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/google-auth/json -md5 40413bc699c6e02d7732e7e09e8cec0c google-auth-2.25.2.tar.gz -sha256 42f707937feb4f5e5a39e6c4f343a17300a459aaf03141457ba505812841cc40 google-auth-2.25.2.tar.gz +md5 718e1a2c55baf3b019e9a42524812113 google-auth-2.26.1.tar.gz +sha256 54385acca5c0fbdda510cd8585ba6f3fcb06eeecf8a6ecca39d3ee148b092590 google-auth-2.26.1.tar.gz # Locally computed sha256 checksums sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-google-auth/python-google-auth.mk b/package/python-google-auth/python-google-auth.mk index 8638a2ca46..02c8c1164f 100644 --- a/package/python-google-auth/python-google-auth.mk +++ b/package/python-google-auth/python-google-auth.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_GOOGLE_AUTH_VERSION = 2.25.2 +PYTHON_GOOGLE_AUTH_VERSION = 2.26.1 PYTHON_GOOGLE_AUTH_SOURCE = google-auth-$(PYTHON_GOOGLE_AUTH_VERSION).tar.gz -PYTHON_GOOGLE_AUTH_SITE = https://files.pythonhosted.org/packages/05/77/84608894384e02f3b0b2621b09ecb0b85e57ba368f13eecbbc43cd1b8719 +PYTHON_GOOGLE_AUTH_SITE = https://files.pythonhosted.org/packages/bc/c0/b5119831db4888e703b2adaa912709931181678ae3a50ca08d51a3904765 PYTHON_GOOGLE_AUTH_SETUP_TYPE = setuptools PYTHON_GOOGLE_AUTH_LICENSE = Apache-2.0 PYTHON_GOOGLE_AUTH_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 10:33:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:33:10 +0100 Subject: [Buildroot] [git commit] package/python-httpx: bump to version 0.26.0 Message-ID: <20240206103429.962F686F9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd181c4de18d7049fa99ba977288dfe19474e121 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-httpx/python-httpx.hash | 4 ++-- package/python-httpx/python-httpx.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-httpx/python-httpx.hash b/package/python-httpx/python-httpx.hash index fc4a68cf51..26e39fcc6d 100644 --- a/package/python-httpx/python-httpx.hash +++ b/package/python-httpx/python-httpx.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/httpx/json -md5 f4dcf1002b2116c634a53534ce9d6776 httpx-0.25.2.tar.gz -sha256 8b8fcaa0c8ea7b05edd69a094e63a2094c4efcb48129fb757361bc423c0ad9e8 httpx-0.25.2.tar.gz +md5 3785c8a8930a7c7280206f79c170658f httpx-0.26.0.tar.gz +sha256 451b55c30d5185ea6b23c2c793abf9bb237d2a7dfb901ced6ff69ad37ec1dfaf httpx-0.26.0.tar.gz # Locally computed sha256 checksums sha256 4ec59d544f12b5f539a3a716fd321ac58ccd8030b465221f2c880200cdf28d8d LICENSE.md diff --git a/package/python-httpx/python-httpx.mk b/package/python-httpx/python-httpx.mk index 88166ad242..cbc9c9298b 100644 --- a/package/python-httpx/python-httpx.mk +++ b/package/python-httpx/python-httpx.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPX_VERSION = 0.25.2 +PYTHON_HTTPX_VERSION = 0.26.0 PYTHON_HTTPX_SOURCE = httpx-$(PYTHON_HTTPX_VERSION).tar.gz -PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/8c/23/911d93a022979d3ea295f659fbe7edb07b3f4561a477e83b3a6d0e0c914e +PYTHON_HTTPX_SITE = https://files.pythonhosted.org/packages/bd/26/2dc654950920f499bd062a211071925533f821ccdca04fa0c2fd914d5d06 PYTHON_HTTPX_SETUP_TYPE = pep517 PYTHON_HTTPX_LICENSE = BSD-3-Clause PYTHON_HTTPX_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Tue Feb 6 10:33:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:33:04 +0100 Subject: [Buildroot] [git commit] package/python-hiredis: bump to version 2.3.2 Message-ID: <20240206103429.873BA86F3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a211f917d2f93504f9b78547d7594f46b77a4b5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Hash for LICENSE file changed due to license change to MIT: https://github.com/redis/hiredis-py/commit/1e29dd4719a44092e8317d6cddb8075a4a143e0e The vendor/hiredis/COPYING file remains BSD-3-Clause. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-hiredis/python-hiredis.hash | 6 +++--- package/python-hiredis/python-hiredis.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-hiredis/python-hiredis.hash b/package/python-hiredis/python-hiredis.hash index 372f2f50ae..ad33295ad7 100644 --- a/package/python-hiredis/python-hiredis.hash +++ b/package/python-hiredis/python-hiredis.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/hiredis/json -md5 670a932c2972cbd88f910c2b29f85c3c hiredis-2.2.3.tar.gz -sha256 e75163773a309e56a9b58165cf5a50e0f84b755f6ff863b2c01a38918fe92daa hiredis-2.2.3.tar.gz +md5 8823961dc3ba19a6e63ab6329b3b852f hiredis-2.3.2.tar.gz +sha256 733e2456b68f3f126ddaf2cd500a33b25146c3676b97ea843665717bda0c5d43 hiredis-2.3.2.tar.gz # Locally computed sha256 checksums -sha256 65d467915fa36249f60e6942c9d44dfe54d75882e6b66e94fc6c3971fcde1722 LICENSE +sha256 3256b5b77e98aa34ff31a4d2c2c10f7f177b0f3058753a6044430a168987353b LICENSE sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb vendor/hiredis/COPYING diff --git a/package/python-hiredis/python-hiredis.mk b/package/python-hiredis/python-hiredis.mk index 5aceb15ae1..d86fb109dc 100644 --- a/package/python-hiredis/python-hiredis.mk +++ b/package/python-hiredis/python-hiredis.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_HIREDIS_VERSION = 2.2.3 +PYTHON_HIREDIS_VERSION = 2.3.2 PYTHON_HIREDIS_SOURCE = hiredis-$(PYTHON_HIREDIS_VERSION).tar.gz -PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/b0/04/dab6792584fc548803ffa50b5bb2b99f01d3ab04d7c7f64e85f1a22fb847 +PYTHON_HIREDIS_SITE = https://files.pythonhosted.org/packages/fe/2d/a5ae61da1157644f7e52e088fa158ac6f5d09775112d14b1c9b9a5156bf1 PYTHON_HIREDIS_SETUP_TYPE = setuptools -PYTHON_HIREDIS_LICENSE = BSD-3-Clause +PYTHON_HIREDIS_LICENSE = MIT, BSD-3-Clause PYTHON_HIREDIS_LICENSE_FILES = LICENSE vendor/hiredis/COPYING $(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 10:34:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:34:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-dtschema: bump to version 2023.11 In-Reply-To: <20240109071343.4025060-1-james.hilliard1@gmail.com> References: <20240109071343.4025060-1-james.hilliard1@gmail.com> Message-ID: <20240206113440.3bb84626@windsurf> On Tue, 9 Jan 2024 00:13:43 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-dtschema/python-dtschema.hash | 4 ++-- > package/python-dtschema/python-dtschema.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:34:47 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:34:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-engineio: bump to version 4.8.2 In-Reply-To: <20240109071647.4027355-1-james.hilliard1@gmail.com> References: <20240109071647.4027355-1-james.hilliard1@gmail.com> Message-ID: <20240206113447.279e114d@windsurf> On Tue, 9 Jan 2024 00:16:47 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-engineio/python-engineio.hash | 4 ++-- > package/python-engineio/python-engineio.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:34:55 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:34:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-esptool: bump to version 4.7.0 In-Reply-To: <20240109072423.4031745-1-james.hilliard1@gmail.com> References: <20240109072423.4031745-1-james.hilliard1@gmail.com> Message-ID: <20240206113455.797a6d25@windsurf> On Tue, 9 Jan 2024 00:24:23 -0700 James Hilliard wrote: > Add new python-intelhex runtime dependency. > > Add new python-pyyaml runtime dependency. > > Signed-off-by: James Hilliard > --- > package/python-esptool/Config.in | 2 ++ > package/python-esptool/python-esptool.hash | 4 ++-- > package/python-esptool/python-esptool.mk | 4 ++-- > 3 files changed, 6 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-falcon: bump to version 3.1.3 In-Reply-To: <20240109072834.4036277-1-james.hilliard1@gmail.com> References: <20240109072834.4036277-1-james.hilliard1@gmail.com> Message-ID: <20240206113502.0a0332e5@windsurf> On Tue, 9 Jan 2024 00:28:34 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-falcon/python-falcon.hash | 4 ++-- > package/python-falcon/python-falcon.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-flask-smorest: bump to version 0.42.3 In-Reply-To: <20240109073709.4042044-1-james.hilliard1@gmail.com> References: <20240109073709.4042044-1-james.hilliard1@gmail.com> Message-ID: <20240206113508.0b8ed0f5@windsurf> On Tue, 9 Jan 2024 00:37:09 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-flask-smorest/python-flask-smorest.hash | 4 ++-- > package/python-flask-smorest/python-flask-smorest.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-fonttools: bump to version 4.47.0 In-Reply-To: <20240109074024.4045632-1-james.hilliard1@gmail.com> References: <20240109074024.4045632-1-james.hilliard1@gmail.com> Message-ID: <20240206113514.0d220c19@windsurf> On Tue, 9 Jan 2024 00:40:24 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-fonttools/python-fonttools.hash | 4 ++-- > package/python-fonttools/python-fonttools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-frozenlist: bump to version 1.4.1 In-Reply-To: <20240109074803.4049179-1-james.hilliard1@gmail.com> References: <20240109074803.4049179-1-james.hilliard1@gmail.com> Message-ID: <20240206113521.3871c5af@windsurf> On Tue, 9 Jan 2024 00:48:03 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-frozenlist/python-frozenlist.hash | 4 ++-- > package/python-frozenlist/python-frozenlist.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-google-auth: bump to version 2.26.1 In-Reply-To: <20240109075433.4054341-1-james.hilliard1@gmail.com> References: <20240109075433.4054341-1-james.hilliard1@gmail.com> Message-ID: <20240206113531.5d2aae93@windsurf> On Tue, 9 Jan 2024 00:54:33 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-google-auth/python-google-auth.hash | 4 ++-- > package/python-google-auth/python-google-auth.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-greenlet: bump to version 3.0.3 In-Reply-To: <20240109075836.4057394-1-james.hilliard1@gmail.com> References: <20240109075836.4057394-1-james.hilliard1@gmail.com> Message-ID: <20240206113536.11f06c7e@windsurf> On Tue, 9 Jan 2024 00:58:36 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-greenlet/python-greenlet.hash | 4 ++-- > package/python-greenlet/python-greenlet.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-hatch-vcs: bump to version 0.4.0 In-Reply-To: <20240109080239.4060095-1-james.hilliard1@gmail.com> References: <20240109080239.4060095-1-james.hilliard1@gmail.com> Message-ID: <20240206113541.1e26c600@windsurf> On Tue, 9 Jan 2024 01:02:39 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-hatch-vcs/python-hatch-vcs.hash | 4 ++-- > package/python-hatch-vcs/python-hatch-vcs.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-hatchling: bump to version 1.21.0 In-Reply-To: <20240109080546.4062850-1-james.hilliard1@gmail.com> References: <20240109080546.4062850-1-james.hilliard1@gmail.com> Message-ID: <20240206113545.230a4c6a@windsurf> On Tue, 9 Jan 2024 01:05:46 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-hatchling/python-hatchling.hash | 4 ++-- > package/python-hatchling/python-hatchling.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:48 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-hiredis: bump to version 2.3.2 In-Reply-To: <20240109081115.4065619-1-james.hilliard1@gmail.com> References: <20240109081115.4065619-1-james.hilliard1@gmail.com> Message-ID: <20240206113548.2b602528@windsurf> On Tue, 9 Jan 2024 01:11:15 -0700 James Hilliard wrote: > Hash for LICENSE file changed due to license change to MIT: > https://github.com/redis/hiredis-py/commit/1e29dd4719a44092e8317d6cddb8075a4a143e0e > > The vendor/hiredis/COPYING file remains BSD-3-Clause. > > Signed-off-by: James Hilliard > --- > package/python-hiredis/python-hiredis.hash | 6 +++--- > package/python-hiredis/python-hiredis.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:35:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:35:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-httpx: bump to version 0.26.0 In-Reply-To: <20240109081438.4068105-1-james.hilliard1@gmail.com> References: <20240109081438.4068105-1-james.hilliard1@gmail.com> Message-ID: <20240206113552.410a7350@windsurf> On Tue, 9 Jan 2024 01:14:38 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-httpx/python-httpx.hash | 4 ++-- > package/python-httpx/python-httpx.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 10:39:46 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:39:46 +0100 Subject: [Buildroot] [git commit] configs/qemu_{arm, aarch64}_ebbr: bump Linux, U-Boot and TF-A Message-ID: <20240206104004.BC4C486FA5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=73813c56c8bb3e781376f333125a13048be690b9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump qemu_arm_ebbr_defconfig and qemu_aarch64_ebbr_defconfig in sync: - Bump Linux to v6.6.11 - Bump U-Boot to 2024.01 - Bump TF-A to v2.10 While at it, adapt Qemu command line arguments to avoid a warning when disabling ACPI. Signed-off-by: Vincent Stehl?? Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/aarch64-ebbr/readme.txt | 6 ++---- board/qemu/arm-ebbr/readme.txt | 3 +-- configs/qemu_aarch64_ebbr_defconfig | 8 ++++---- configs/qemu_arm_ebbr_defconfig | 8 ++++---- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/board/qemu/aarch64-ebbr/readme.txt b/board/qemu/aarch64-ebbr/readme.txt index 76d566045d..15353a8f68 100644 --- a/board/qemu/aarch64-ebbr/readme.txt +++ b/board/qemu/aarch64-ebbr/readme.txt @@ -26,7 +26,7 @@ Running under Qemu Run the emulation with: qemu-system-aarch64 \ - -M virt,secure=on \ + -M virt,secure=on,acpi=off \ -bios output/images/flash.bin \ -cpu cortex-a53 \ -device virtio-blk-device,drive=hd0 \ @@ -35,7 +35,6 @@ Run the emulation with: -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ -m 2048 \ -netdev user,id=eth0 \ - -no-acpi \ -nographic \ -object rng-random,filename=/dev/urandom,id=rng0 \ -rtc base=utc,clock=host \ @@ -63,7 +62,7 @@ image first with: Then run the OS installer iso image on emulation with: qemu-system-aarch64 \ - -M virt,secure=on \ + -M virt,secure=on,acpi=off \ -bios output/images/flash.bin \ -cpu cortex-a53 \ -device virtio-blk-device,drive=hd1 \ @@ -74,7 +73,6 @@ Then run the OS installer iso image on emulation with: -drive file=disk.qcow2,if=none,id=hd1 \ -m 2048 \ -netdev user,id=eth0 \ - -no-acpi \ -nographic \ -object rng-random,filename=/dev/urandom,id=rng0 \ -rtc base=utc,clock=host \ diff --git a/board/qemu/arm-ebbr/readme.txt b/board/qemu/arm-ebbr/readme.txt index dc2b0647a2..19e114579f 100644 --- a/board/qemu/arm-ebbr/readme.txt +++ b/board/qemu/arm-ebbr/readme.txt @@ -26,7 +26,7 @@ Running under Qemu Run the emulation with: qemu-system-arm \ - -M virt,secure=on \ + -M virt,secure=on,acpi=off \ -bios output/images/flash.bin \ -cpu cortex-a15 \ -device virtio-blk-device,drive=hd0 \ @@ -35,7 +35,6 @@ Run the emulation with: -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ -m 1024 \ -netdev user,id=eth0 \ - -no-acpi \ -nographic \ -object rng-random,filename=/dev/urandom,id=rng0 \ -rtc base=utc,clock=host \ diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 7807814aff..75a892f798 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -27,7 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # Firmware and bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -39,7 +39,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index cfeea623ff..a0520edcf4 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="200M" # Firmware and bootloader BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -42,7 +42,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From thomas.petazzoni at bootlin.com Tue Feb 6 10:40:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:40:02 +0100 Subject: [Buildroot] [PATCH] configs/qemu_{arm, aarch64}_ebbr: bump Linux, U-Boot and TF-A In-Reply-To: <20240111135749.1681557-1-vincent.stehle@arm.com> References: <20240111135749.1681557-1-vincent.stehle@arm.com> Message-ID: <20240206114002.317ff5b6@windsurf> On Thu, 11 Jan 2024 14:57:04 +0100 Vincent Stehl? wrote: > Bump qemu_arm_ebbr_defconfig and qemu_aarch64_ebbr_defconfig in sync: > > - Bump Linux to v6.6.11 > - Bump U-Boot to 2024.01 > - Bump TF-A to v2.10 > > While at it, adapt Qemu command line arguments to avoid a warning when > disabling ACPI. > > Signed-off-by: Vincent Stehl? > Cc: Romain Naour > --- Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Tue Feb 6 10:47:28 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 11:47:28 +0100 Subject: [Buildroot] Ignore build directories created via make O=dir or the default one In-Reply-To: References: Message-ID: On 06/02/2024 11:22, Yegor Yefremov via buildroot wrote: > Hi all, > > what about adding a .gitignore file with an "*" everytime we create an > output directory? Does anything speak against such an approach? I like that idea! And then we can remove output/ from .gitignore as well. I always found that a bit annoying. Regards, Arnout > > Regards, > Yegor > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Tue Feb 6 10:52:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:52:09 +0100 Subject: [Buildroot] [git commit] docs/manual: extend makedev syntax section Message-ID: <20240206105232.28F4C86FAA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=738fb6dfa48b19f39e4a8df38ac9dcc0b37e0aa4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The section of the manual describing the makedev syntax is not up-to-date with the current features, and does not properly describe existing ones. - extend the list of types with the requirements on the existence of the target file or directory; for 'c', 'b', and 'p', the existence requirement is inherited from mknod(2): ERRORS ... ENOENT A directory component in pathname does not exist or is a dangling symbolic link. for the other types, the existence requirements are extracted from the source of makedev.c; - format the types flags, so they are rendered in monospace; - extend the 'mode' description, as it can be set to -1 for 'f', 'd', or 'r', so that only the uid and gid are set. This is most useful for 'r', where setting the same mode recursively for all the sub-directories and files alike does not really make sense; indeed in this case, the modes are usually set correctly when the package (or rootfs overlay) installs the files, and only the uid and gid are interesting to set; - extend and update the examples to show-case the -1 mode use-case. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- docs/manual/makedev-syntax.adoc | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/docs/manual/makedev-syntax.adoc b/docs/manual/makedev-syntax.adoc index d6efb31d42..e63c9233eb 100644 --- a/docs/manual/makedev-syntax.adoc +++ b/docs/manual/makedev-syntax.adoc @@ -22,14 +22,19 @@ There are a few non-trivial blocks: - +name+ is the path to the file you want to create/modify - +type+ is the type of the file, being one of: - * f: a regular file - * d: a directory - * r: a directory recursively - * c: a character device file - * b: a block device file - * p: a named pipe + * `f`: a regular file, which must already exist + * `F`: a regular file, which is ignored and not created if missing + * `d`: a directory, which is created, as well as its parents, if missing + * `r`: a directory recursively, which must already exist + * `c`: a character device file, which parent directory must exist + * `b`: a block device file, which parent directory must exist + * `p`: a named pipe, which parent directory must exist - +mode+ are the usual permissions settings (only numerical values - are allowed) + are allowed); + for type `d`, the mode of existing parents is not changed, but the mode + of created parents is set; + for types `f`, `F`, and `r`, +mode+ can also be set to +-1+ to not + change the mode (and only change uid and gid) - +uid+ and +gid+ are the UID and GID to set on this file; can be either numerical values or actual names - +major+ and +minor+ are here for device files, set to +-+ for other @@ -38,22 +43,22 @@ There are a few non-trivial blocks: of files, and can be reduced to a loop, beginning at +start+, incrementing its counter by +inc+ until it reaches +count+ -Let's say you want to change the permissions of a given file; using -this syntax, you will need to write: +Let's say you want to change the ownership and permissions of a given +file; using this syntax, you will need to write: ---- /usr/bin/foo f 755 0 0 - - - - - /usr/bin/bar f 755 root root - - - - - /data/buz f 644 buz-user buz-group - - - - - +/data/baz f -1 baz-user baz-group - - - - - ---- -Alternatively, if you want to change owner/permission of a directory -recursively, you can write (to set UID to foo, GID to bar and access -rights to rwxr-x--- for the directory /usr/share/myapp and all files -and directories below it): +Alternatively, if you want to change owner of a directory recursively, +you can write (to set UID to `foo` and GID to `bar` for the directory +`/usr/share/myapp` and all files and directories below it): ---- -/usr/share/myapp r 750 foo bar - - - - - +/usr/share/myapp r -1 foo bar - - - - - ---- On the other hand, if you want to create the device file +/dev/hda+ From thomas.petazzoni at bootlin.com Tue Feb 6 10:53:00 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 11:53:00 +0100 Subject: [Buildroot] [PATCH] docs/manual: extend makedev syntax section In-Reply-To: References: Message-ID: <20240206115300.0bd8b584@windsurf> On Thu, 18 Jan 2024 17:08:50 +0100 wrote: > From: "Yann E. MORIN" > > The section of the manual describing the makedev syntax is not > up-to-date with the current features, and does not properly describe > existing ones. > > - extend the list of types with the requirements on the existence of > the target file or directory; for 'c', 'b', and 'p', the existence > requirement is inherited from mknod(2): > > ERRORS > ... > ENOENT A directory component in pathname does not exist or is a > dangling symbolic link. > > for the other types, the existence requirements are extracted from > the source of makedev.c; > > - format the types fags, so they are rendered in monospace; > > - extend the 'mode' description, as it can be set to -1 for 'f', 'd', > or 'r', so that only the uid and gid are set. This is most useful > for 'r', where setting the same mode recursively for all the > sub-directories and files alike does not really make sense; indeed > in this case, the modes are usually set correctly when the package > (or rootfs overlay) installs the files, and only the uid and gid are > interesting to set; > > - extend and update the examples to show-case the -1 mode use-case. > > Signed-off-by: Yann E. MORIN > --- > docs/manual/makedev-syntax.adoc | 33 +++++++++++++++++++-------------- > 1 file changed, 19 insertions(+), 14 deletions(-) Applied to master (with the typo in the commit log fixed), thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From buildroot at bubu1.eu Tue Feb 6 10:52:37 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:37 +0100 Subject: [Buildroot] [PATCH 1/6] utils/readme.txt: expand check-package description Message-ID: <20240206105246.1220945-1-buildroot@bubu1.eu> check-package does a lot more by now than checking .mk and Config.in files. Add this to the description. Signed-off-by: Marcus Hoffmann --- utils/readme.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/readme.txt b/utils/readme.txt index 3e8833c4ea..d5cda70bfc 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -12,8 +12,11 @@ brmake nothing. check-package - a script that checks the coding style of a package's Config.in and - .mk files, and also tests them for various types of typoes. + a script that checks the coding style across the buildroot tree. It + checks package's Config.in and .mk files, runs shellcheck for all shell + scripts, flake8 for python files, checks for typoes, etc. + It checks the .checkpackageignore file if errors should be ignored and + errors if there's a file listed that doesn't produce an error. genrandconfig a script that generates a random configuration, used by the autobuilders -- 2.43.0 From buildroot at bubu1.eu Tue Feb 6 10:52:38 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:38 +0100 Subject: [Buildroot] [PATCH 2/6] utils/readme.txt: document docker-run script In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: <20240206105246.1220945-2-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- utils/readme.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/readme.txt b/utils/readme.txt index d5cda70bfc..2cb6b0af9b 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -18,6 +18,10 @@ check-package It checks the .checkpackageignore file if errors should be ignored and errors if there's a file listed that doesn't produce an error. +docker-run + a script that runs a command (like make check-package) inside the buildroot + ci docker container. + genrandconfig a script that generates a random configuration, used by the autobuilders (http://autobuild.buildroot.org). It selects a random toolchain from -- 2.43.0 From buildroot at bubu1.eu Tue Feb 6 10:52:39 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:39 +0100 Subject: [Buildroot] [PATCH 3/6] docs/website/support.html: document how to join irc channel from matrix In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: <20240206105246.1220945-3-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- docs/website/support.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/website/support.html b/docs/website/support.html index 9be816f836..13d63b13a9 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -21,7 +21,9 @@

    The Buildroot IRC channel is #buildroot, hosted on OFTC. If you do not have an IRC client, you can - use the OFTC web interface. + use the OFTC web interface. The + channel is also bridged to matrix as + #_oftc_#buildroot:matrix.org. When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

    -- 2.43.0 From buildroot at bubu1.eu Tue Feb 6 10:52:40 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:40 +0100 Subject: [Buildroot] [PATCH 4/6] docs/website/support.html: document irc channel permission changes In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: <20240206105246.1220945-4-buildroot@bubu1.eu> The #buildroot IRC channel recently changed from only allowing registered users to join to allowing anyone to join but only allowing registered users to talk in the channel. This still avoids the spam problem on IRC while allowing an exception for users bridged from matrix.org. These already have a username registered on the matrix side and thus similar properties as a registered IRC user/nick. The commands to set these options were: * Set +q on all unregistered nicks: ~/mode #buildroot +q $~a~ this lets people join but they can't talk * Set exempt on matrix hosts: ~/mode #buildroot +e $x:matrix.org~ Signed-off-by: Marcus Hoffmann --- docs/website/support.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/support.html b/docs/website/support.html index 13d63b13a9..28873c6d76 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -27,8 +27,8 @@ When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

    -

    Note that due to excessive spamming on IRC, the channel can only be - joined if you are a registered user with +

    Note that due to excessive spamming on IRC, you can only talk in the + channel if you are a registered user with OFTC NickServ service. Follow the instructions to register as a user with a password, and then join the #buildroot channel.

    -- 2.43.0 From buildroot at bubu1.eu Tue Feb 6 10:52:41 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:41 +0100 Subject: [Buildroot] [PATCH 5/6] docs/manual/contribute.adoc: link to git-send-email.io In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: <20240206105246.1220945-5-buildroot@bubu1.eu> https://git-send-email.io/ is a page maintained by sourcehut which explains how to setup git send-email on many OS's for many popular email providers. Signed-off-by: Marcus Hoffmann --- docs/manual/contribute.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 2b90d13b41..684e9f4809 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -369,7 +369,7 @@ $ git send-email origin/master --------------------- Note that +git+ should be configured to use your mail account. -To configure +git+, see +man git-send-email+ or google it. +To configure +git+, see +man git-send-email+ or https://git-send-email.io/. If you do not use +git send-email+, make sure posted *patches are not line-wrapped*, otherwise they cannot easily be applied. In such a case, -- 2.43.0 From buildroot at bubu1.eu Tue Feb 6 10:52:42 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 11:52:42 +0100 Subject: [Buildroot] [PATCH 6/6] docs/manual/contribute.adoc: mention sr.ht as an alternative for sending patches In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: <20240206105246.1220945-6-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- docs/manual/contribute.adoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 684e9f4809..7d0611be28 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -375,6 +375,14 @@ If you do not use +git send-email+, make sure posted *patches are not line-wrapped*, otherwise they cannot easily be applied. In such a case, fix your e-mail client, or better yet, learn to use +git send-email+. +https://sr.ht also has a light-weight UI for +https://man.sr.ht/git.sr.ht/#sending-patches-upstream[preparing patchseries] +and can also send out the patches for you. There are a few drawbacks to +this, as you cannot edit your patches' status in Patchwork and you +currently can't edit your display name with which the match emails are +sent out but it is an option if you cannot get git send-email to work +with your mail provider (i.e. O365). + ==== Cover letter If you want to present the whole patch set in a separate mail, add -- 2.43.0 From giulio.benetti at benettiengineering.com Tue Feb 6 11:02:57 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 12:02:57 +0100 Subject: [Buildroot] [PATCH v2 1/2] configs/milkv_duo: new defconfig In-Reply-To: References: Message-ID: <9e961c64-a539-4c3d-9324-dfe23315bea1@benettiengineering.com> Hi Hanyuan, On 06/02/24 03:40, hanyuan via buildroot wrote: > Hello Giulio, > > Thanks! It?s nice to get your reviews. Let me explain some of them. > >> 2024?2?6? 01:25?Giulio Benetti ??? >> >> Hi Hanyuan, >> >> thank for contributing, >> one important note is to swap Patch 1/2 and 2/2. This is because they >> are bisectable this way since on Patch 1/2 you enable packages appearing >> in Patch 2/2, also, > > Got it. Should I later sent the Patch V3 and make them look like: > > [v3,1/2] package/milkv-duo: add packages for milkv-duo > [v3,2/2] configs/milkv_duo: new defconfig Yes > >> can you please provide the board product webpage URL here? >> And also some ION indications too? > > Got it. I would append more info to the readme.txt about what the ION means. > >> All this if statement is redundant with the else part. >> Can you add a variable like: >> FIPTOOL_ARGUMENTS = genfip ${BINARIES_DIR}/fip.bin \ >> --MONITOR_RUNADDR=0x80000000 \ >> --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ >> --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ >> --NAND_INFO=00000000 \ >> --BL2=${BINARIES_DIR}/bl2.bin \ >> --BLCP_IMG_RUNADDR=0x05200200 \ >> --BLCP_PARAM_LOADADDR=0 \ >> --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ >> --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ >> --LOADER_2ND=${BINARIES_DIR}/u-boot.bin \ >> >> and then you add or not the remaining BLCP* variables below and execute >> ${BINARIES_DIR}/fiptool.py ${FIPTOOL_ARGUMENTS} >> Then this nested if statement and.. >> ..this are redundant too. Can you provide a single if-else-fi statement >> outside the main if statement... >> ... here? >> > > Sorry for that. OK, I would make these lines look better. > >> Is CXX needed by any package selected here? > > At that time I submitted the patch I haven?t understand the buildroot?s minimal > philosophy too much. Sorry for that. I would remove this line. > >> here you need: >> BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> here you need: >> BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > OK. I will add them. > >> For the rest the patch looks good and builds fine using utils/docker-run except package htop that fails to build due to gcc ICE 109809 for which >> I've sent a patch: >> https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 >> >> So this patchset depends on patchset above for htop gcc ICE. > > I think I should tell you this. In fact I encountered another gcc bug > when using all the t-head?s optimizations with the glibc. The gcc reported > internal errors when we > > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > > So we have to use musl and find this bug is not reported anymore. I was wondering why you were using exactly musl and I suspected something like that. > Maybe the htop compiling bug comes from these optimizations. > I would have a try what would happen if we disable all the t-head > features and then compile the htop. If it is really the t-head?s problem, > maybe we can let the t-head?s optimizations go. I've worked it around with this[0], so no need to remove optimizations. [0]: https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > Thanks again for your careful review! > > Best regards, > Hanyuan > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From sergio.prado at e-labworks.com Tue Feb 6 11:21:09 2024 From: sergio.prado at e-labworks.com (sergio.prado at e-labworks.com) Date: Tue, 6 Feb 2024 08:21:09 -0300 Subject: [Buildroot] [PATCH] package/azure-iot-sdk-c: bump to version LTS_08_2023 Message-ID: <20240206112109.2175948-1-sergio.prado@e-labworks.com> From: Sergio Prado Release notes: https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_08_2023 Signed-off-by: Sergio Prado --- package/azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash index b960c0e571d0..d51dcc60aab2 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7b52b9886a3aff20a55a0d5bc5e140c212f85fd06af18c31291c15d363743a77 azure-iot-sdk-c-LTS_01_2023_Ref02-br1.tar.gz +sha256 b853d5ab04f3c6863fe78e3936f0d0840012d5260ae4a3b23f03e157395dc15b azure-iot-sdk-c-LTS_08_2023-br1.tar.gz # Hash for license files: sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index e07cdf986e4f..4d0ecb077f8b 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = LTS_01_2023_Ref02 +AZURE_IOT_SDK_C_VERSION = LTS_08_2023 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES -- 2.34.1 From arnout at mind.be Tue Feb 6 12:33:06 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 13:33:06 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-fastapi: bump to version 0.109.2 In-Reply-To: <20240205164615.510688-2-james.hilliard1@gmail.com> References: <20240205164615.510688-1-james.hilliard1@gmail.com> <20240205164615.510688-2-james.hilliard1@gmail.com> Message-ID: <931454f1-052c-4146-9c91-706cd65770ba@mind.be> On 05/02/2024 17:46, James Hilliard wrote: > Signed-off-by: James Hilliard Instead of this one, I applied Marcus's one. Regards, Arnout > --- > package/python-fastapi/python-fastapi.hash | 4 ++-- > package/python-fastapi/python-fastapi.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash > index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz > -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz > +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz > +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 > --- a/package/python-fastapi/python-fastapi.mk > +++ b/package/python-fastapi/python-fastapi.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_FASTAPI_VERSION = 0.105.0 > +PYTHON_FASTAPI_VERSION = 0.109.2 > PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz > -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 > +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 > PYTHON_FASTAPI_SETUP_TYPE = pep517 > PYTHON_FASTAPI_LICENSE = MIT > PYTHON_FASTAPI_LICENSE_FILES = LICENSE From arnout at mind.be Tue Feb 6 12:33:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 13:33:22 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-starlette: bump to version 0.36.3 In-Reply-To: <20240205164615.510688-1-james.hilliard1@gmail.com> References: <20240205164615.510688-1-james.hilliard1@gmail.com> Message-ID: On 05/02/2024 17:46, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-starlette/python-starlette.hash | 4 ++-- > package/python-starlette/python-starlette.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash > index 820026b70b..03d77cf5be 100644 > --- a/package/python-starlette/python-starlette.hash > +++ b/package/python-starlette/python-starlette.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/starlette/json > -md5 2ef2fc635691fd4a1823564218292dce starlette-0.34.0.tar.gz > -sha256 ed050aaf3896945bfaae93bdf337e53ef3f29115a9d9c153e402985115cd9c8e starlette-0.34.0.tar.gz > +md5 0a1e026d653dc448ae07f47eefe1dc8b starlette-0.36.3.tar.gz > +sha256 90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080 starlette-0.36.3.tar.gz > # Locally computed sha256 checksums > sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md > diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk > index 07f9d6be5e..9d137f5f5a 100644 > --- a/package/python-starlette/python-starlette.mk > +++ b/package/python-starlette/python-starlette.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_STARLETTE_VERSION = 0.34.0 > +PYTHON_STARLETTE_VERSION = 0.36.3 > PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz > -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/4f/36/168ba6d56a28382f3b081b23b0cc431de35786e120b94c1f372708ed3059 > +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/be/47/1bba49d42d63f4453f0a64a20acbf2d0bd2f5a8cde6a166ee66c074a08f8 > PYTHON_STARLETTE_SETUP_TYPE = pep517 > PYTHON_STARLETTE_LICENSE = BSD-3-Clause > PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md From arnout at mind.be Tue Feb 6 12:38:34 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 13:38:34 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-fastapi: bump to 0.109.2 In-Reply-To: <170715586410.13905.2351857620201846100-0@git.sr.ht> References: <170715586410.13905.2351857620201846100-0@git.sr.ht> Message-ID: <20938ad1-04e4-4536-8f2c-b85af0c650ca@mind.be> On 05/02/2024 15:12, ~bubu wrote: > From: Marcus Hoffmann > > Drop no longer required dependency on python-anyio. > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Arnout > --- > package/python-fastapi/Config.in | 1 - > package/python-fastapi/python-fastapi.hash | 4 ++-- > package/python-fastapi/python-fastapi.mk | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/python-fastapi/Config.in b/package/python-fastapi/Config.in > index 7d376d3dd7..d4a527c601 100644 > --- a/package/python-fastapi/Config.in > +++ b/package/python-fastapi/Config.in > @@ -1,7 +1,6 @@ > config BR2_PACKAGE_PYTHON_FASTAPI > bool "python-fastapi" > depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core > - select BR2_PACKAGE_PYTHON_ANYIO # runtime > select BR2_PACKAGE_PYTHON_PYDANTIC # runtime > select BR2_PACKAGE_PYTHON_STARLETTE # runtime > select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime > diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash > index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz > -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz > +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz > +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 > --- a/package/python-fastapi/python-fastapi.mk > +++ b/package/python-fastapi/python-fastapi.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_FASTAPI_VERSION = 0.105.0 > +PYTHON_FASTAPI_VERSION = 0.109.2 > PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz > -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 > +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 > PYTHON_FASTAPI_SETUP_TYPE = pep517 > PYTHON_FASTAPI_LICENSE = MIT > PYTHON_FASTAPI_LICENSE_FILES = LICENSE From arnout at mind.be Tue Feb 6 12:39:55 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 13:39:55 +0100 Subject: [Buildroot] [PATCH buildroot v2 2/2] support/testing: add fastapi runtime test In-Reply-To: <170715461915.13905.5968173515742280918-1@git.sr.ht> References: <170715461915.13905.5968173515742280918-1@git.sr.ht> Message-ID: <300bce9b-5a17-49aa-a946-4bfbac6a7fba@mind.be> On 05/02/2024 18:25, ~bubu wrote: > From: Marcus Hoffmann > > Add a runtime test for fastapi. Use uvicorn as the asgi server > application as does the fastapi hello world example [1]. > > Fastapi depends on PydanticV2 now which is written in rust so we need to > run the test on armv7. > > [1] https://fastapi.tiangolo.com/tutorial/first-steps/ > > Signed-off-by: Marcus Hoffmann Both applied to master, but this one with a bunch of modifications: - fix flake8 errors support/testing/tests/package/sample_python_fastapi.py:5:1: E302 expected 2 blank lines, found 1 support/testing/tests/package/sample_python_fastapi.py:8:1: W391 blank line at end of file - Remove BR2_CCACHE (as requested by Marcus). - Add a comment explaining that this also tests uvicorn and pydantic. - Re-try wget in a loop instead of a fixed timeout of 30 seconds. - Add a DEVELOPERS entry. Regards, Arnout > --- > .../tests/package/sample_python_fastapi.py | 8 ++++ > .../tests/package/test_python_fastapi.py | 47 +++++++++++++++++++ > 2 files changed, 55 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_fastapi.py > create mode 100644 support/testing/tests/package/test_python_fastapi.py > > diff --git a/support/testing/tests/package/sample_python_fastapi.py b/support/testing/tests/package/sample_python_fastapi.py > new file mode 100644 > index 0000000000..3116df3a93 > --- /dev/null > +++ b/support/testing/tests/package/sample_python_fastapi.py > @@ -0,0 +1,8 @@ > +from fastapi import FastAPI > + > +app = FastAPI() > + > + at app.get("/") > +async def root(): > + return {"message": "Hello World"} > + > diff --git a/support/testing/tests/package/test_python_fastapi.py b/support/testing/tests/package/test_python_fastapi.py > new file mode 100644 > index 0000000000..1a78fa6c58 > --- /dev/null > +++ b/support/testing/tests/package/test_python_fastapi.py > @@ -0,0 +1,47 @@ > +import os > +import time > + > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy3Fastapi(TestPythonPackageBase): > + __test__ = True > + config = \ > + """ > + BR2_arm=y > + BR2_cortex_a9=y > + BR2_ARM_ENABLE_NEON=y > + BR2_ARM_ENABLE_VFP=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_FASTAPI=y > + BR2_PACKAGE_PYTHON_UVICORN=y > + BR2_TARGET_ROOTFS_CPIO=y > + # BR2_TARGET_ROOTFS_TAR is not set > + BR2_CCACHE=y > + BR2_CCACHE_DIR="/home/bubu/.buildroot-ccache" > + """ > + sample_scripts = ["tests/package/sample_python_fastapi.py"] > + timeout = 60 > + > + def test_run(self): > + self.login() > + self.check_sample_scripts_exist() > + cmd = "uvicorn sample_python_fastapi:app > /dev/null 2>&1 &" > + > + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) > + > + # Give enough time for the uvicorn server to start up > + time.sleep(30) > + > + cmd = "wget -q -O - http://127.0.0.1:8000/" > + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output[0], '{"message":"Hello World"}') > + > + def login(self): > + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") > + self.emulator.boot(arch="armv7", > + kernel="builtin", > + options=["-initrd", cpio_file]) > + self.emulator.login() From arnout at mind.be Tue Feb 6 11:04:23 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 12:04:23 +0100 Subject: [Buildroot] [git commit] package/python-uvicorn: requires PYTHON3_SSL Message-ID: <20240206124011.36A3F86FD1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9ab334817a1b7ccbc139f0d64ac04c6d7b0ba48a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Uvicorn has a hard requirement on the python ssl module. Without it even running uvicorn --help fails. Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- package/python-uvicorn/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-uvicorn/Config.in b/package/python-uvicorn/Config.in index 3e769392f9..c84f54781f 100644 --- a/package/python-uvicorn/Config.in +++ b/package/python-uvicorn/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_UVICORN bool "python-uvicorn" select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_H11 # runtime + select BR2_PACKAGE_PYTHON3_SSL # runtime help The lightning-fast ASGI server. From arnout at mind.be Tue Feb 6 11:04:11 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 12:04:11 +0100 Subject: [Buildroot] [git commit] package/python-fastapi: bump to 0.109.2 Message-ID: <20240206124011.2C06B86FD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=683c81a04cef804c3590861351d97277cf84d639 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required dependency on python-anyio. Note that python-starlette still depends on anyio, but there's no direct dependency from fastapi any more. Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- package/python-fastapi/Config.in | 1 - package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-fastapi/Config.in b/package/python-fastapi/Config.in index 7d376d3dd7..d4a527c601 100644 --- a/package/python-fastapi/Config.in +++ b/package/python-fastapi/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_FASTAPI bool "python-fastapi" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pydantic -> python-pydantic-core - select BR2_PACKAGE_PYTHON_ANYIO # runtime select BR2_PACKAGE_PYTHON_PYDANTIC # runtime select BR2_PACKAGE_PYTHON_STARLETTE # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index 3dc1578cb7..c16b7d22de 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 06bfa7c610fc9e81d05b0319eb70cae7 fastapi-0.105.0.tar.gz -sha256 4d12838819aa52af244580675825e750ad67c9df4614f557a769606af902cf22 fastapi-0.105.0.tar.gz +md5 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz +sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.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 dc6d919926..a2191c73b7 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.105.0 +PYTHON_FASTAPI_VERSION = 0.109.2 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/77/bb/5941e6e2ce3020f64b539a49d39f49be05de17d0c47fea95012589f812a5 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE From arnout at mind.be Tue Feb 6 12:31:48 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 13:31:48 +0100 Subject: [Buildroot] [git commit] support/testing: add fastapi runtime test Message-ID: <20240206124011.440A986FD2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4e5a25a1120bd0caa28d5faa48017c96546cfc78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add a runtime test for fastapi. Use uvicorn as the asgi server application as does the fastapi hello world example [1]. Fastapi depends on PydanticV2 now which is written in rust so we need to run the test on armv7. [1] https://fastapi.tiangolo.com/tutorial/first-steps/ Signed-off-by: Marcus Hoffmann [Arnout: - fix flake8 errors support/testing/tests/package/sample_python_fastapi.py:5:1: E302 expected 2 blank lines, found 1 support/testing/tests/package/sample_python_fastapi.py:8:1: W391 blank line at end of file - Remove BR2_CCACHE (as requested by Marcus). - Add a comment explaining that this also tests uvicorn and pydantic. - Re-try wget in a loop instead of a fixed timeout of 30 seconds. - Add a DEVELOPERS entry. ] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 4 ++ .../testing/tests/package/sample_python_fastapi.py | 8 +++ .../testing/tests/package/test_python_fastapi.py | 57 ++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c18ae46054..7a943d1762 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2064,6 +2064,10 @@ F: package/selinux-python/ F: utils/config F: utils/diffconfig +N: Marcus Hoffmann +F: support/testing/tests/package/test_python_fastapi.py +F: support/testing/tests/package/sample_python_fastapi.py + N: Marek Belisko F: package/libatasmart/ F: package/polkit/ diff --git a/support/testing/tests/package/sample_python_fastapi.py b/support/testing/tests/package/sample_python_fastapi.py new file mode 100644 index 0000000000..ee60be1f96 --- /dev/null +++ b/support/testing/tests/package/sample_python_fastapi.py @@ -0,0 +1,8 @@ +from fastapi import FastAPI + +app = FastAPI() + + + at app.get("/") +async def root(): + return {"message": "Hello World"} diff --git a/support/testing/tests/package/test_python_fastapi.py b/support/testing/tests/package/test_python_fastapi.py new file mode 100644 index 0000000000..85cdd0b65a --- /dev/null +++ b/support/testing/tests/package/test_python_fastapi.py @@ -0,0 +1,57 @@ +import os +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Fastapi(TestPythonPackageBase): + """Test fastapi, uvicorn and pydantic2. + + fastapi needs an asgi server to run. Since we select uvicorn as + asgi server here, uvicorn is tested as well. + + pydantic is an major dependency of fastapi so it is implicitly + tested here as well. + """ + __test__ = True + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_NEON=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_FASTAPI=y + BR2_PACKAGE_PYTHON_UVICORN=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + sample_scripts = ["tests/package/sample_python_fastapi.py"] + timeout = 60 + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + cmd = "uvicorn sample_python_fastapi:app > /dev/null 2>&1 &" + + _, exit_code = self.emulator.run(cmd, timeout=self.timeout) + + # Give enough time for the uvicorn server to start up + for attempt in range(30): + time.sleep(1) + + cmd = "wget -q -O - http://127.0.0.1:8000/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + if exit_code == 0: + self.assertEqual(output[0], '{"message":"Hello World"}') + break + else: + self.assertTrue(False, "Timeout while waiting for fastapi server") + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() From arnout at mind.be Tue Feb 6 11:04:09 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 12:04:09 +0100 Subject: [Buildroot] [git commit] package/python-starlette: bump to version 0.36.3 Message-ID: <20240206124011.1FE1E86FCF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=24d25ac683c8691126635f77c0b2c066f1799a11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- package/python-starlette/python-starlette.hash | 4 ++-- package/python-starlette/python-starlette.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-starlette/python-starlette.hash b/package/python-starlette/python-starlette.hash index 820026b70b..03d77cf5be 100644 --- a/package/python-starlette/python-starlette.hash +++ b/package/python-starlette/python-starlette.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/starlette/json -md5 2ef2fc635691fd4a1823564218292dce starlette-0.34.0.tar.gz -sha256 ed050aaf3896945bfaae93bdf337e53ef3f29115a9d9c153e402985115cd9c8e starlette-0.34.0.tar.gz +md5 0a1e026d653dc448ae07f47eefe1dc8b starlette-0.36.3.tar.gz +sha256 90a671733cfb35771d8cc605e0b679d23b992f8dcfad48cc60b38cb29aeb7080 starlette-0.36.3.tar.gz # Locally computed sha256 checksums sha256 dcb95677a02240243187e964f941847d19b17821cf99e5afae684fab328c19bf LICENSE.md diff --git a/package/python-starlette/python-starlette.mk b/package/python-starlette/python-starlette.mk index 07f9d6be5e..9d137f5f5a 100644 --- a/package/python-starlette/python-starlette.mk +++ b/package/python-starlette/python-starlette.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_STARLETTE_VERSION = 0.34.0 +PYTHON_STARLETTE_VERSION = 0.36.3 PYTHON_STARLETTE_SOURCE = starlette-$(PYTHON_STARLETTE_VERSION).tar.gz -PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/4f/36/168ba6d56a28382f3b081b23b0cc431de35786e120b94c1f372708ed3059 +PYTHON_STARLETTE_SITE = https://files.pythonhosted.org/packages/be/47/1bba49d42d63f4453f0a64a20acbf2d0bd2f5a8cde6a166ee66c074a08f8 PYTHON_STARLETTE_SETUP_TYPE = pep517 PYTHON_STARLETTE_LICENSE = BSD-3-Clause PYTHON_STARLETTE_LICENSE_FILES = LICENSE.md From buildroot at bubu1.eu Tue Feb 6 12:42:02 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 13:42:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-anyio: bump to version 4.2.0 In-Reply-To: <0eb549da-1140-4071-8e58-376d9dd5f434@bubu1.eu> References: <20240108064820.3450359-1-james.hilliard1@gmail.com> <0eb549da-1140-4071-8e58-376d9dd5f434@bubu1.eu> Message-ID: Hi, On 08.01.24 14:03, Marcus Hoffmann via buildroot wrote: > Hi James, > > On 08.01.24 07:48, James Hilliard wrote: >> Signed-off-by: James Hilliard >> --- >> ? package/python-anyio/python-anyio.hash | 4 ++-- >> ? package/python-anyio/python-anyio.mk?? | 4 ++-- >> ? 2 files changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/package/python-anyio/python-anyio.hash >> b/package/python-anyio/python-anyio.hash >> index 1cea549bc1..e77d30249c 100644 >> --- a/package/python-anyio/python-anyio.hash >> +++ b/package/python-anyio/python-anyio.hash >> @@ -1,5 +1,5 @@ >> ? # md5, sha256 from https://pypi.org/pypi/anyio/json >> -md5? 58d288dd84e28e2507ff9ce7e4620010? anyio-3.7.1.tar.gz >> -sha256 >> 44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780 >> anyio-3.7.1.tar.gz >> +md5? 22e660fff1a584e72281f0d6a083e4e0? anyio-4.2.0.tar.gz >> +sha256 >> e1875bb4b4e2de1669f4bc7869b6d3f54231cdced71605e6e64c9be77e3be50f >> anyio-4.2.0.tar.gz > > This was introduced in this version because fastapi didn't support a > newer version. > > Fastapi 0.108.0 supports starlette 0.32 now, which supports anyio 4.2.0. > So I think these should be bumped together/in the same series? Now that more recent fastapi and starlette versions are available this can be applied. > > >> ? # Locally computed sha256 checksums >> ? sha256 >> 5361ac9dc58f2ef5fd2e9b09c68297c17f04950909bbc8023bdb82eacf22c2b0? LICENSE >> diff --git a/package/python-anyio/python-anyio.mk >> b/package/python-anyio/python-anyio.mk >> index 80404ac660..32c2286157 100644 >> --- a/package/python-anyio/python-anyio.mk >> +++ b/package/python-anyio/python-anyio.mk >> @@ -4,9 +4,9 @@ >> ? # >> >> ################################################################################ >> -PYTHON_ANYIO_VERSION = 3.7.1 >> +PYTHON_ANYIO_VERSION = 4.2.0 >> ? PYTHON_ANYIO_SOURCE = anyio-$(PYTHON_ANYIO_VERSION).tar.gz >> -PYTHON_ANYIO_SITE = >> https://files.pythonhosted.org/packages/28/99/2dfd53fd55ce9838e6ff2d4dac20ce58263798bd1a0dbe18b3a9af3fcfce >> +PYTHON_ANYIO_SITE = >> https://files.pythonhosted.org/packages/2d/b8/7333d87d5f03247215d86a86362fd3e324111788c6cdd8d2e6196a6ba833 >> ? PYTHON_ANYIO_SETUP_TYPE = setuptools >> ? PYTHON_ANYIO_LICENSE = MIT >> ? PYTHON_ANYIO_LICENSE_FILES = LICENSE > > Marcus > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From romain.naour at smile.fr Tue Feb 6 12:49:45 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 13:49:45 +0100 Subject: [Buildroot] [PATCH 0/2] TestGlxinfo fixes Message-ID: <20240206124947.1617078-1-romain.naour@smile.fr> I initially started looking at TestGlxinfo some weeks ago fixing two issues at that time but patches requires some improvement before submitting them upstream. In the mean time a new runtime issue appear due to x86 optimization. Romain Naour (2): package/mesa3d: fix drisw build without dri3 support/testing: use core2duo cpu emulation for TestGlxinfo .../0006-drisw-fix-build-without-dri3.patch | 58 +++++++++++++++++++ ...on-t-try-zink-if-not-enabled-in-mesa.patch | 42 ++++++++++++++ support/testing/tests/package/test_glxinfo.py | 3 +- 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 package/mesa3d/0006-drisw-fix-build-without-dri3.patch create mode 100644 package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch -- 2.43.0 From romain.naour at smile.fr Tue Feb 6 12:49:47 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 13:49:47 +0100 Subject: [Buildroot] [PATCH 2/2] support/testing: use core2duo cpu emulation for TestGlxinfo In-Reply-To: <20240206124947.1617078-1-romain.naour@smile.fr> References: <20240206124947.1617078-1-romain.naour@smile.fr> Message-ID: <20240206124947.1617078-3-romain.naour@smile.fr> TestGlxinfo fail with a new runtime error: # glxinfo -B -display :0 name of display: :0 traps: glxinfo[84] trap invalid opcode ip:b73c7027 sp:bf8433c0 error:0 in swrast_dri.so[b6e4c000+64f000] Illegal instruction The x86-core2 Bootlin toolchains are built for a core2 CPU [0], this means that the Bootlin toolchains may use core2-specific instructions. The TestGlxinfo test is setup for BR2_x86_core2, so our executables will also contain core2 instructions. However, the default Qemu x86 is not guaranteed to emulate all the instructions specific to core2, causing runtime issues as reported above. A similar issue has been fixed by adding Nehalem cpu emulation on the qemu command line. See 4f565b5222 ("support/testing: use Nehalem cpu emulation for TestGrubX8664EFI"). Set core2duo cpu emulation for TestGlxinfo on the qemu command line. [0] https://gitlab.com/buildroot.org/toolchains-builder/-/blob/kubu/toolchain-builder-2023.08/configs/arch/x86-core2.config?ref_type=heads Signed-off-by: Romain Naour --- support/testing/tests/package/test_glxinfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py index 6bedee5298..3ccbdca8d9 100644 --- a/support/testing/tests/package/test_glxinfo.py +++ b/support/testing/tests/package/test_glxinfo.py @@ -42,7 +42,8 @@ class TestGlxinfo(infra.basetest.BRTest): self.emulator.boot(arch="i386", kernel=kern, kernel_cmdline=["root=/dev/vda console=ttyS0"], - options=["-M", "pc", "-m", "512", "-drive", "file={},if=virtio,format=raw".format(img)]) + options=["-M", "pc", "-cpu", "core2duo", "-m", "512", + "-drive", "file={},if=virtio,format=raw".format(img)]) self.emulator.login() def test_run(self): -- 2.43.0 From romain.naour at smile.fr Tue Feb 6 12:49:46 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 13:49:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/mesa3d: fix drisw build without dri3 In-Reply-To: <20240206124947.1617078-1-romain.naour@smile.fr> References: <20240206124947.1617078-1-romain.naour@smile.fr> Message-ID: <20240206124947.1617078-2-romain.naour@smile.fr> mesa3d 23.3 added dri3_priv.h header and dri3_check_multibuffer() function in drisw (part of swrast gallium driver) that can be build without dri3. i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' collect2: error: ld returned 1 exit status Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using dri3_check_multibuffer(). While testing again the TestGlxinfo runtime test, a new unexpected error line appeared in the glxinfo log: MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so mesa3d try to load zink gallium driver even if it was not enabled at build time, indeed there is no such option in Buildroot. Apply patches sent upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854455 Signed-off-by: Romain Naour --- .../0006-drisw-fix-build-without-dri3.patch | 58 +++++++++++++++++++ ...on-t-try-zink-if-not-enabled-in-mesa.patch | 42 ++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 package/mesa3d/0006-drisw-fix-build-without-dri3.patch create mode 100644 package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch diff --git a/package/mesa3d/0006-drisw-fix-build-without-dri3.patch b/package/mesa3d/0006-drisw-fix-build-without-dri3.patch new file mode 100644 index 0000000000..ab27d384cf --- /dev/null +++ b/package/mesa3d/0006-drisw-fix-build-without-dri3.patch @@ -0,0 +1,58 @@ +From 3ab46dcfda9edf5c9bc27c8f5031146d9d9d8ade Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 18 Jan 2024 22:50:16 +0100 +Subject: [PATCH] drisw: fix build without dri3 + +commit 1887368df41 ("glx/sw: check for modifier support in the kopper path") +added dri3_priv.h header and dri3_check_multibuffer() function in drisw that +can be build without dri3. + + i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': + drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' + collect2: error: ld returned 1 exit status + +Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using +dri3_check_multibuffer(). + +Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path") + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 + +Signed-off-by: Romain Naour +--- + src/glx/drisw_glx.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c +index 3d3f75259bc..4b19e2d7707 100644 +--- a/src/glx/drisw_glx.c ++++ b/src/glx/drisw_glx.c +@@ -32,7 +32,9 @@ + #include + #include "dri_common.h" + #include "drisw_priv.h" ++#ifdef HAVE_DRI3 + #include "dri3_priv.h" ++#endif + #include + #include + #include +@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, + goto handle_error; + } + ++#ifdef HAVE_DRI3 + if (pdpyp->zink) { + bool err; + psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err); +@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, + goto handle_error; + } + } ++#endif + + glx_config_destroy_list(psc->base.configs); + psc->base.configs = configs; +-- +2.43.0 + diff --git a/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch b/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch new file mode 100644 index 0000000000..f9e4d50fd7 --- /dev/null +++ b/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch @@ -0,0 +1,42 @@ +From 83b4ff6616708bd7ba5981d22cd5211ca6787d58 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 24 Jan 2024 14:28:32 +0100 +Subject: [PATCH] glxext: don't try zink if not enabled in mesa + +Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") +added an automatic zink fallback even when the zink gallium is not +enabled at build time. + +It leads to unexpected error log while loading drisw driver and +zink is not installed on the rootfs: + + MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so + +Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 + +Signed-off-by: Romain Naour +--- + src/glx/glxext.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/glx/glxext.c b/src/glx/glxext.c +index 39d5f08bdcf..e106eb40046 100644 +--- a/src/glx/glxext.c ++++ b/src/glx/glxext.c +@@ -904,9 +904,11 @@ __glXInitialize(Display * dpy) + #endif /* HAVE_DRI3 */ + if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false)) + dpyPriv->dri2Display = dri2CreateDisplay(dpy); ++#if defined(HAVE_ZINK) + if (!dpyPriv->dri3Display && !dpyPriv->dri2Display) + try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) && + !getenv("GALLIUM_DRIVER"); ++#endif /* HAVE_ZINK */ + } + #endif /* GLX_USE_DRM */ + if (glx_direct) +-- +2.43.0 + -- 2.43.0 From thomas.petazzoni at bootlin.com Tue Feb 6 12:53:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:53:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ml-dtypes: bump to version 0.3.2 In-Reply-To: <29b23c5438f3123feeb6af3a1e4f1d16@free.fr> References: <20240110035911.1020944-1-james.hilliard1@gmail.com> <29b23c5438f3123feeb6af3a1e4f1d16@free.fr> Message-ID: <20240206135352.3722471f@windsurf> Hello Julien, James, On Wed, 10 Jan 2024 20:06:09 +0100 Julien Olivain wrote: > The python-ml_dtypes v0.3.2 changelog says that the pybind11 build > requirement was removed. See: > https://github.com/jax-ml/ml_dtypes/blob/v0.3.2/CHANGELOG.md#032---2024-01-03 > > This patch does not remove it is the _DEPENDENCIES. Did you try to build > the package without it? Thanks for the feedback. There's been no feedback from James, so I'll mark this patch as Changes Requested for now. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From buildroot at bubu1.eu Tue Feb 6 12:57:01 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 13:57:01 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <20240205163024.500599-1-james.hilliard1@gmail.com> References: <20240205163024.500599-1-james.hilliard1@gmail.com> Message-ID: <902c02f6-4b7d-48c6-9e77-685033b71812@bubu1.eu> Hi, On 05.02.24 17:30, James Hilliard wrote: > License hash changed due to year update: > https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - fix package hash typo > --- > package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- > package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash > index 29852a51ed..b614c01d79 100644 > --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/rfc3987/json This should still point to https://pypi.org/pypi/ruamel.yaml/json, maybe this can be changed while applying. > -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz > -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz > +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz > +sha256 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ruamel.yaml-0.18.5.tar.gz > # Locally computed sha256 checksums > -sha256 ab837b032c5aae84503fc0c733a116a26fd272e90dc4402fa68d3c9e51aed3b0 LICENSE > +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 LICENSE > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk > index a6fed3bc2c..bbdac591ca 100644 > --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RUAMEL_YAML_VERSION = 0.17.21 > +PYTHON_RUAMEL_YAML_VERSION = 0.18.5 > PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz > -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c > +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/82/43/fa976e03a4a9ae406904489119cd7dd4509752ca692b2e0a19491ca1782c > PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools > PYTHON_RUAMEL_YAML_LICENSE = MIT > PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-markdown2: bump to version 2.4.12 In-Reply-To: <20240110034052.931500-1-james.hilliard1@gmail.com> References: <20240110034052.931500-1-james.hilliard1@gmail.com> Message-ID: <20240206135705.797a5c7f@windsurf> On Tue, 9 Jan 2024 20:40:52 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-markdown2/python-markdown2.hash | 4 ++-- > package/python-markdown2/python-markdown2.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-marshmallow-sqlalchemy: bump to version 0.30.0 In-Reply-To: <20240110034411.933840-1-james.hilliard1@gmail.com> References: <20240110034411.933840-1-james.hilliard1@gmail.com> Message-ID: <20240206135710.01c79406@windsurf> On Tue, 9 Jan 2024 20:44:11 -0700 James Hilliard wrote: > License hash changed due to date update: > https://github.com/marshmallow-code/marshmallow-sqlalchemy/commit/767a8f965f8c2723b6d98cc45442df536dc8fa0a > > Signed-off-by: James Hilliard > --- > .../python-marshmallow-sqlalchemy.hash | 6 +++--- > .../python-marshmallow-sqlalchemy.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-maturin: bump to version 1.4.0 In-Reply-To: <20240110035054.946683-1-james.hilliard1@gmail.com> References: <20240110035054.946683-1-james.hilliard1@gmail.com> Message-ID: <20240206135714.764315e0@windsurf> On Tue, 9 Jan 2024 20:50:54 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-maturin/python-maturin.hash | 2 +- > package/python-maturin/python-maturin.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-more-itertools: bump to version 10.2.0 In-Reply-To: <20240110040343.1025210-1-james.hilliard1@gmail.com> References: <20240110040343.1025210-1-james.hilliard1@gmail.com> Message-ID: <20240206135722.4bc82ab3@windsurf> On Tue, 9 Jan 2024 21:03:43 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-more-itertools/python-more-itertools.hash | 4 ++-- > package/python-more-itertools/python-more-itertools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-netaddr: bump to version 0.10.1 In-Reply-To: <20240110040751.1028591-1-james.hilliard1@gmail.com> References: <20240110040751.1028591-1-james.hilliard1@gmail.com> Message-ID: <20240206135725.01f393d5@windsurf> On Tue, 9 Jan 2024 21:07:51 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-netaddr/python-netaddr.hash | 4 ++-- > package/python-netaddr/python-netaddr.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pathspec: bump to version 0.12.1 In-Reply-To: <20240110041930.1037925-1-james.hilliard1@gmail.com> References: <20240110041930.1037925-1-james.hilliard1@gmail.com> Message-ID: <20240206135731.27175a79@windsurf> On Tue, 9 Jan 2024 21:19:30 -0700 James Hilliard wrote: > Migrate from setuptools to flit build backend. > > Signed-off-by: James Hilliard > --- > package/python-pathspec/python-pathspec.hash | 4 ++-- > package/python-pathspec/python-pathspec.mk | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pexpect: bump to version 4.9.0 In-Reply-To: <20240110042454.1040891-1-james.hilliard1@gmail.com> References: <20240110042454.1040891-1-james.hilliard1@gmail.com> Message-ID: <20240206135735.60c628e8@windsurf> On Tue, 9 Jan 2024 21:24:54 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pexpect/python-pexpect.hash | 4 ++-- > package/python-pexpect/python-pexpect.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pillow: bump to version 10.2.0 In-Reply-To: <20240110043249.1070442-1-james.hilliard1@gmail.com> References: <20240110043249.1070442-1-james.hilliard1@gmail.com> Message-ID: <20240206135742.28a98a37@windsurf> On Tue, 9 Jan 2024 21:32:49 -0700 James Hilliard wrote: > License hash changed due to year update: > https://github.com/python-pillow/Pillow/commit/ee6e12a8032a8255b2f7a60a40c50377c17a03fe > > Signed-off-by: James Hilliard > --- > package/python-pillow/python-pillow.hash | 6 +++--- > package/python-pillow/python-pillow.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:48 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pip: bump to version 23.3.2 In-Reply-To: <20240110043611.1074941-1-james.hilliard1@gmail.com> References: <20240110043611.1074941-1-james.hilliard1@gmail.com> Message-ID: <20240206135748.791e2f12@windsurf> On Tue, 9 Jan 2024 21:36:11 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pip/python-pip.hash | 4 ++-- > package/python-pip/python-pip.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:57:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:57:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-prompt-toolkit: bump to version 3.0.43 In-Reply-To: <20240110043921.1077310-1-james.hilliard1@gmail.com> References: <20240110043921.1077310-1-james.hilliard1@gmail.com> Message-ID: <20240206135754.2ab265ba@windsurf> On Tue, 9 Jan 2024 21:39:21 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-prompt-toolkit/python-prompt-toolkit.hash | 4 ++-- > package/python-prompt-toolkit/python-prompt-toolkit.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:15 +0100 Subject: [Buildroot] [git commit] package/python-marshmallow-sqlalchemy: bump to version 0.30.0 Message-ID: <20240206125833.9F26A8702C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c419714117fce61e7fdcbba7fe8872a40551a63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to date update: https://github.com/marshmallow-code/marshmallow-sqlalchemy/commit/767a8f965f8c2723b6d98cc45442df536dc8fa0a Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-marshmallow-sqlalchemy.hash | 6 +++--- .../python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash index d3d1b3876f..3194513dfc 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/marshmallow-sqlalchemy/json -md5 e1b2858be2f0ce6dead48e67080631c4 marshmallow-sqlalchemy-0.29.0.tar.gz -sha256 3523a774390ef0c1c0f7c708a7519809c5396cf608720f14f55c36f74ff5bbec marshmallow-sqlalchemy-0.29.0.tar.gz +md5 61e46e0ad5fabd0e9e11f895e1243bc3 marshmallow-sqlalchemy-0.30.0.tar.gz +sha256 29ad0a4fd1b4a1e52dcb07f9673d284a6b0795141916cc2169d4ee9a5d007347 marshmallow-sqlalchemy-0.30.0.tar.gz # Locally computed sha256 checksums -sha256 625df8e2758a271b4bc90525c0b6161814e0f72cb3504b03ab5206b7abf50072 LICENSE +sha256 5f6cd082e01dda8a7c157687e196be98d68224cf41c0cee1968eb5c08e0c076a LICENSE diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk index 8f176feb4d..a95e53022b 100644 --- a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.29.0 +PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.30.0 PYTHON_MARSHMALLOW_SQLALCHEMY_SOURCE = marshmallow-sqlalchemy-$(PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION).tar.gz -PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/fa/0d/4dd275732213cefb4e49a86c60443cb1e3e0d0bd605625aed3fa7bb22fdd +PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/5d/3f/21aa202f3df31d2d20d4ae8dfe9c7f1ce0a1eecba7003915a986a7599778 PYTHON_MARSHMALLOW_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE = MIT PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:14 +0100 Subject: [Buildroot] [git commit] package/python-markdown2: bump to version 2.4.12 Message-ID: <20240206125833.88C458702A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92de0fe754c2072780b9c33fc42a0f3467e96397 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-markdown2/python-markdown2.hash | 4 ++-- package/python-markdown2/python-markdown2.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-markdown2/python-markdown2.hash b/package/python-markdown2/python-markdown2.hash index 0e14f23261..0a76499185 100644 --- a/package/python-markdown2/python-markdown2.hash +++ b/package/python-markdown2/python-markdown2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markdown2/json -md5 a338c5be41a822914af8211b080659fd markdown2-2.4.10.tar.gz -sha256 cdba126d90dc3aef6f4070ac342f974d63f415678959329cc7909f96cc235d72 markdown2-2.4.10.tar.gz +md5 69cdd2c9ee1f6837cb173a44d6a0622d markdown2-2.4.12.tar.gz +sha256 1bc8692696954d597778e0e25713c14ca56d87992070dedd95c17eddaf709204 markdown2-2.4.12.tar.gz # Locally computed sha256 checksums sha256 f8c7c4d554409cf621b8d653dbfffb719745fd36f5c49b8305258649b403ef9c LICENSE.txt diff --git a/package/python-markdown2/python-markdown2.mk b/package/python-markdown2/python-markdown2.mk index b4719562fc..4c21eb98e8 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN2_VERSION = 2.4.10 +PYTHON_MARKDOWN2_VERSION = 2.4.12 PYTHON_MARKDOWN2_SOURCE = markdown2-$(PYTHON_MARKDOWN2_VERSION).tar.gz -PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/8e/b3/64c459af88ea8c2eeb020d0edf3e36c62176e988c47e412133c37c5da5e7 +PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/3c/e4/87a454674ac303e2ca6c25713845d2ae1b59c1a88576054cbec25aaebad1 PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:17 +0100 Subject: [Buildroot] [git commit] package/python-netaddr: bump to version 0.10.1 Message-ID: <20240206125833.C735186FCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f300e2021eccfaff5588b535cee774ed7a7df47f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-netaddr/python-netaddr.hash | 4 ++-- package/python-netaddr/python-netaddr.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-netaddr/python-netaddr.hash b/package/python-netaddr/python-netaddr.hash index 04dc9797f6..f969aeecfc 100644 --- a/package/python-netaddr/python-netaddr.hash +++ b/package/python-netaddr/python-netaddr.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/netaddr/json -md5 0c89e96501370d2538ecadca372e55a9 netaddr-0.9.0.tar.gz -sha256 7b46fa9b1a2d71fd5de9e4a3784ef339700a53a08c8040f08baf5f1194da0128 netaddr-0.9.0.tar.gz +md5 c0d7b080da18c851ea436389813d7652 netaddr-0.10.1.tar.gz +sha256 f4da4222ca8c3f43c8e18a8263e5426c750a3a837fdfeccf74c68d0408eaa3bf netaddr-0.10.1.tar.gz # Locally computed sha256 checksums sha256 0e53de62547787462f41eefb5cee31a14f7ea767ba0362c6f9304f1742486d47 LICENSE diff --git a/package/python-netaddr/python-netaddr.mk b/package/python-netaddr/python-netaddr.mk index 1f78f04210..79e55a739f 100644 --- a/package/python-netaddr/python-netaddr.mk +++ b/package/python-netaddr/python-netaddr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_NETADDR_VERSION = 0.9.0 +PYTHON_NETADDR_VERSION = 0.10.1 PYTHON_NETADDR_SOURCE = netaddr-$(PYTHON_NETADDR_VERSION).tar.gz -PYTHON_NETADDR_SITE = https://files.pythonhosted.org/packages/48/4c/2491bfdb868c3f40d985037fa64a3903c125f45d7d3025640e05715db7a3 +PYTHON_NETADDR_SITE = https://files.pythonhosted.org/packages/af/96/f4878091248450bbdebfbd01bf1d95821bd47eb38e756815a0431baa6b07 PYTHON_NETADDR_LICENSE = BSD-3-Clause PYTHON_NETADDR_LICENSE_FILES = LICENSE PYTHON_NETADDR_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:20 +0100 Subject: [Buildroot] [git commit] package/python-pip: bump to version 23.3.2 Message-ID: <20240206125834.3BDE6818E5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5fe80ca7d55bbffedf49ac3be979f9c3baeb978c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pip/python-pip.hash | 4 ++-- package/python-pip/python-pip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index 9518c9d8b8..d2cc649b01 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 f0c9fba61e9d9badcc9921062e993d84 pip-23.3.1.tar.gz -sha256 1fcaa041308d01f14575f6d0d2ea4b75a3e2871fe4f9c694976f908768e14174 pip-23.3.1.tar.gz +md5 38dd5f7ab301167df063405c7fc16c84 pip-23.3.2.tar.gz +sha256 7fd9972f96db22c8077a1ee2691b172c8089b17a5652a44494a9ecb0d78f9149 pip-23.3.2.tar.gz # Locally computed sha256 checksums sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 83a1631a2f..552b47eb7d 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 23.3.1 +PYTHON_PIP_VERSION = 23.3.2 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/1f/7f/4da15e07ccd11c84c1ccc8f6e24288d5e76c99441bf80e315b33542db951 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/b7/06/6b1ad0ae8f97d7a0d6f6ad640db10780578999e647a9593512ceb6f06469 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:16 +0100 Subject: [Buildroot] [git commit] package/python-more-itertools: bump to version 10.2.0 Message-ID: <20240206125833.B944E8702A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cb372f2820a5234d1eb0ccdea72b8d41c0e42420 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-more-itertools/python-more-itertools.hash | 4 ++-- package/python-more-itertools/python-more-itertools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-more-itertools/python-more-itertools.hash b/package/python-more-itertools/python-more-itertools.hash index 6f659ab468..4d119cb203 100644 --- a/package/python-more-itertools/python-more-itertools.hash +++ b/package/python-more-itertools/python-more-itertools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/more-itertools/json -md5 3651461253e7d206073affb491b5c6e0 more-itertools-10.1.0.tar.gz -sha256 626c369fa0eb37bac0291bce8259b332fd59ac792fa5497b59837309cd5b114a more-itertools-10.1.0.tar.gz +md5 1737bb4d9d09501f75f498538efe3cf4 more-itertools-10.2.0.tar.gz +sha256 8fccb480c43d3e99a00087634c06dd02b0d50fbf088b380de5a41a015ec239e1 more-itertools-10.2.0.tar.gz # Locally computed sha256 checksums sha256 09f1c8c9e941af3e584d59641ea9b87d83c0cb0fd007eb5ef391a7e2643c1a46 LICENSE diff --git a/package/python-more-itertools/python-more-itertools.mk b/package/python-more-itertools/python-more-itertools.mk index 71c33bfdf1..98b499c3c0 100644 --- a/package/python-more-itertools/python-more-itertools.mk +++ b/package/python-more-itertools/python-more-itertools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MORE_ITERTOOLS_VERSION = 10.1.0 +PYTHON_MORE_ITERTOOLS_VERSION = 10.2.0 PYTHON_MORE_ITERTOOLS_SOURCE = more-itertools-$(PYTHON_MORE_ITERTOOLS_VERSION).tar.gz -PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/2d/73/3557e45746fcaded71125c0a1c0f87616e8258c78391f0c365bf97bbfc99 +PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/df/ad/7905a7fd46ffb61d976133a4f47799388209e73cbc8c1253593335da88b4 PYTHON_MORE_ITERTOOLS_SETUP_TYPE = flit PYTHON_MORE_ITERTOOLS_LICENSE = MIT PYTHON_MORE_ITERTOOLS_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:15 +0100 Subject: [Buildroot] [git commit] package/python-maturin: bump to version 1.4.0 Message-ID: <20240206125833.ABF278702D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bab27b5c47cc442fe7785168d2822faa79f535e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index fcc6a25713..be6167afea 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 7e2fdc083ae253c0f68f6313a2ad2de423219f09e7fa65ef55189d42128e4cff maturin-1.3.1.tar.gz +sha256 3757ed29fbaa87a7dde95dade795ea80f099a867343e920ccc471f75d141a6fa maturin-1.4.0.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 170dee7649..91507468a2 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 1.3.1 +PYTHON_MATURIN_VERSION = 1.4.0 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/d6/a3/42ff26b2b3011ada67c73db32a9ccf9fa18d459cbef8ed6eefc3b283ee60 +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/20/90/43a3aa35f037e91582ec7516a92084a71f84e89e39ef580813bed072b154 PYTHON_MATURIN_SETUP_TYPE = setuptools-rust PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:18 +0100 Subject: [Buildroot] [git commit] package/python-pexpect: bump to version 4.9.0 Message-ID: <20240206125834.0287B8702A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=94dd060c8f8a00e1bf9dc8072c3c4c543866c946 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pexpect/python-pexpect.hash | 4 ++-- package/python-pexpect/python-pexpect.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pexpect/python-pexpect.hash b/package/python-pexpect/python-pexpect.hash index a38c8d5a03..617428feb1 100644 --- a/package/python-pexpect/python-pexpect.hash +++ b/package/python-pexpect/python-pexpect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pexpect/json -md5 153eb25184249d6a85fde9acf4804085 pexpect-4.8.0.tar.gz -sha256 fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c pexpect-4.8.0.tar.gz +md5 f48d48325ee7f1221add0396ea9e2f14 pexpect-4.9.0.tar.gz +sha256 ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f pexpect-4.9.0.tar.gz # Locally computed sha256 checksums sha256 4a483ae1c4dc738a6c8b73feb49074e1835da02ab5aa686f2675029906fa364d LICENSE diff --git a/package/python-pexpect/python-pexpect.mk b/package/python-pexpect/python-pexpect.mk index d230b11338..469144aa60 100644 --- a/package/python-pexpect/python-pexpect.mk +++ b/package/python-pexpect/python-pexpect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PEXPECT_VERSION = 4.8.0 +PYTHON_PEXPECT_VERSION = 4.9.0 PYTHON_PEXPECT_SOURCE = pexpect-$(PYTHON_PEXPECT_VERSION).tar.gz -PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/e5/9b/ff402e0e930e70467a7178abb7c128709a30dfb22d8777c043e501bc1b10 +PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d PYTHON_PEXPECT_LICENSE = ISC PYTHON_PEXPECT_LICENSE_FILES = LICENSE PYTHON_PEXPECT_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:19 +0100 Subject: [Buildroot] [git commit] package/python-pillow: bump to version 10.2.0 Message-ID: <20240206125834.23DBD8702A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=914040cb73a7b3d2082b70e05fba4a2c1268732e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/python-pillow/Pillow/commit/ee6e12a8032a8255b2f7a60a40c50377c17a03fe Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pillow/python-pillow.hash | 6 +++--- package/python-pillow/python-pillow.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index 92258a6712..001fb62676 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 a55618c5d2fd64048dd3ea41bc39f7cd Pillow-10.1.0.tar.gz -sha256 e6bf8de6c36ed96c86ea3b6e1d5273c53f46ef518a062464cd7ef5dd2cf92e38 Pillow-10.1.0.tar.gz +md5 13de96f9f98bc1c26439d64576a48ac6 pillow-10.2.0.tar.gz +sha256 e87f0b2c78157e12d7686b27d63c070fd65d994e8ddae6f328e0dcf4a0cd007e pillow-10.2.0.tar.gz # Locally computed sha256 checksums -sha256 0fdb68ffb39062553be40be4e6eaea9700b4f5e870a720ae86b8925d67613ddd LICENSE +sha256 e706384c6f299d1b6fa782ae657740b372b4bd7938a1a318bf94ac249114758a LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index bc94062da8..10939d8467 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 10.1.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/80/d7/c4b258c9098b469c4a4e77b0a99b5f4fd21e359c2e486c977d231f52fc71 -PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz +PYTHON_PILLOW_VERSION = 10.2.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/f8/3e/32cbd0129a28686621434cbf17bb64bf1458bfb838f1f668262fefce145c +PYTHON_PILLOW_SOURCE = pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:21 +0100 Subject: [Buildroot] [git commit] package/python-prompt-toolkit: bump to version 3.0.43 Message-ID: <20240206125834.538707FCE7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f9ce75df41e9ae4caee9231b9052edb57b25cfe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-prompt-toolkit/python-prompt-toolkit.hash | 4 ++-- package/python-prompt-toolkit/python-prompt-toolkit.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index 54130f3ae0..1821d4d65c 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.hash +++ b/package/python-prompt-toolkit/python-prompt-toolkit.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/prompt-toolkit/json -md5 252a5d200e41d46b65a3076d2bc0a4bd prompt_toolkit-3.0.41.tar.gz -sha256 941367d97fc815548822aa26c2a269fdc4eb21e9ec05fc5d447cf09bad5d75f0 prompt_toolkit-3.0.41.tar.gz +md5 f33c0f4ae8d11addababf6d90c98f8bc prompt_toolkit-3.0.43.tar.gz +sha256 3527b7af26106cbc65a040bcc84839a3566ec1b051bb0bfe953631e704b0ff7d prompt_toolkit-3.0.43.tar.gz # Locally computed sha256 checksums sha256 303574d9bdd85c757d6025017942bf17baeedf2778f62bd7f425d07d880f4c4a LICENSE diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.mk b/package/python-prompt-toolkit/python-prompt-toolkit.mk index db40f6c7eb..31c0d9783f 100644 --- a/package/python-prompt-toolkit/python-prompt-toolkit.mk +++ b/package/python-prompt-toolkit/python-prompt-toolkit.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.41 +PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.43 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/d9/7b/7d88d94427e1e179e0a62818e68335cf969af5ca38033c0ca02237ab6ee7 +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/cc/c6/25b6a3d5cd295304de1e32c9edbcf319a52e965b339629d37d42bb7126ca PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 12:58:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:58:18 +0100 Subject: [Buildroot] [git commit] package/python-pathspec: bump to version 0.12.1 Message-ID: <20240206125833.DEA458702D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3045d747369fd8b29be6733b5e85c286ff100552 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools to flit build backend. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pathspec/python-pathspec.hash | 4 ++-- package/python-pathspec/python-pathspec.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pathspec/python-pathspec.hash b/package/python-pathspec/python-pathspec.hash index 01177b7428..15283e3ac2 100644 --- a/package/python-pathspec/python-pathspec.hash +++ b/package/python-pathspec/python-pathspec.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pathspec/json -md5 92ebd6d735d261952ff99d64083eeff4 pathspec-0.11.2.tar.gz -sha256 e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3 pathspec-0.11.2.tar.gz +md5 2b26ad1981bfa23748e115f00085624c pathspec-0.12.1.tar.gz +sha256 a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712 pathspec-0.12.1.tar.gz # Locally computed sha256 checksums sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/python-pathspec/python-pathspec.mk b/package/python-pathspec/python-pathspec.mk index d32b6a56e1..c4cb34b4c3 100644 --- a/package/python-pathspec/python-pathspec.mk +++ b/package/python-pathspec/python-pathspec.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_PATHSPEC_VERSION = 0.11.2 +PYTHON_PATHSPEC_VERSION = 0.12.1 PYTHON_PATHSPEC_SOURCE = pathspec-$(PYTHON_PATHSPEC_VERSION).tar.gz -PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/a0/2a/bd167cdf116d4f3539caaa4c332752aac0b3a0cc0174cdb302ee68933e81 +PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/ca/bc/f35b8446f4531a7cb215605d100cd88b7ac6f44ab3fc94870c120ab3adbf PYTHON_PATHSPEC_LICENSE = MPL-2.0 PYTHON_PATHSPEC_LICENSE_FILES = LICENSE -PYTHON_PATHSPEC_SETUP_TYPE = setuptools +PYTHON_PATHSPEC_SETUP_TYPE = flit $(eval $(host-python-package)) From laurentbadel at eaton.com Tue Feb 6 12:58:33 2024 From: laurentbadel at eaton.com (Laurent Badel) Date: Tue, 6 Feb 2024 12:58:33 +0000 Subject: [Buildroot] [PATCH V2] boot/mxs-bootlets: add support for zImage with appended DTB Message-ID: <20240206125833.10103-1-laurentbadel@eaton.com> When building a zImage with appended DTBs, buildroot creates copies of the zImage named zImage.$(LINUX_DTS_NAME). mxs-bootlets.mk does not take this into consideration and passes only the original zImage (without DTB appended) to elftosb to generate the SB file. Thus, make sure that the correct zImage files are used in this process. Signed-off-by: Laurent Badel --- boot/mxs-bootlets/mxs-bootlets.mk | 36 +++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/boot/mxs-bootlets/mxs-bootlets.mk b/boot/mxs-bootlets/mxs-bootlets.mk index adc22767..efcee16a 100644 --- a/boot/mxs-bootlets/mxs-bootlets.mk +++ b/boot/mxs-bootlets/mxs-bootlets.mk @@ -38,20 +38,21 @@ endif MXS_BOOTLETS_DEPENDENCIES = host-elftosb MXS_BOOTLETS_LICENSE = GPL-2.0+ +MXS_BOOTLETS_BOOTSTREAM_EXTS = .sb ifeq ($(BR2_TARGET_MXS_BOOTLETS_BAREBOX),y) MXS_BOOTLETS_DEPENDENCIES += barebox MXS_BOOTLETS_BOOTDESC = barebox$(MXS_BOOTLETS_IVT_SUFFIX).bd -MXS_BOOTLETS_BOOTSTREAM = $(MXS_BOOTLETS_BOARD)_barebox$(MXS_BOOTLETS_IVT_SUFFIX).sb +MXS_BOOTLETS_BOOTSTREAM_BASENAME = $(MXS_BOOTLETS_BOARD)_barebox$(MXS_BOOTLETS_IVT_SUFFIX) else ifeq ($(BR2_TARGET_MXS_BOOTLETS_LINUX),y) MXS_BOOTLETS_DEPENDENCIES += linux MXS_BOOTLETS_BOOTDESC = linux$(MXS_BOOTLETS_IVT_SUFFIX).bd -MXS_BOOTLETS_BOOTSTREAM = $(MXS_BOOTLETS_BOARD)_linux$(MXS_BOOTLETS_IVT_SUFFIX).sb +MXS_BOOTLETS_BOOTSTREAM_BASENAME = $(MXS_BOOTLETS_BOARD)_linux$(MXS_BOOTLETS_IVT_SUFFIX) else ifeq ($(BR2_TARGET_MXS_BOOTLETS_UBOOT),y) MXS_BOOTLETS_DEPENDENCIES += uboot MXS_BOOTLETS_BOOTDESC = uboot$(MXS_BOOTLETS_IVT_SUFFIX).bd -MXS_BOOTLETS_BOOTSTREAM = $(MXS_BOOTLETS_BOARD)_uboot$(MXS_BOOTLETS_IVT_SUFFIX).sb +MXS_BOOTLETS_BOOTSTREAM_BASENAME = $(MXS_BOOTLETS_BOARD)_uboot$(MXS_BOOTLETS_IVT_SUFFIX) endif ifeq ($(BR2_TARGET_MXS_BOOTLETS_BAREBOX),y) @@ -65,10 +66,18 @@ define MXS_BOOTLETS_BUILD_LINUX_PREP BOARD=$(MXS_BOOTLETS_BOARD) CROSS_COMPILE="$(TARGET_CROSS)" \ $(MAKE1) -C $(@D) linux_prep endef + define MXS_BOOTLETS_SED_LINUX sed -i 's,[^ *]linux_prep.*;,\tlinux_prep="$(@D)/linux_prep/output-target/linux_prep";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC) - sed -i 's,[^ *]zImage.*;,\tzImage="$(LINUX_DIR)/arch/arm/boot/zImage";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC) endef + +define MXS_BOOTLETS_SED_ZIMAGE + sed -i 's,[^ *]zImage.*;,\tzImage="$(LINUX_DIR)/arch/arm/boot/zImage$(1)";,' $(@D)/$(MXS_BOOTLETS_BOOTDESC) +endef + +ifeq ($(BR2_LINUX_KERNEL_APPENDED_DTB), y) + MXS_BOOTLETS_BOOTSTREAM_EXTS = $(foreach dts_name,$(LINUX_DTS_NAME),.$(strip $(dts_name)).sb) +endif endif ifeq ($(BR2_TARGET_MXS_BOOTLETS_UBOOT),y) @@ -83,7 +92,13 @@ endef MXS_BOOTLETS_POST_EXTRACT_HOOKS += MXS_BOOTLETS_INSTALL_BAREBOX_BOOTDESC -define MXS_BOOTLETS_BUILD_CMDS +define MXS_BOOTLETS_ELFTOSB_CMD + $(HOST_DIR)/bin/elftosb $(MXS_BOOTLETS_ELFTOSB_OPTIONS) \ + -z -c $(@D)/$(MXS_BOOTLETS_BOOTDESC) \ + -o $(@D)/$(MXS_BOOTLETS_BOOTSTREAM_BASENAME)$(1) +endef + +define MXS_BOOTLETS_BUILD_CMDS BOARD=$(MXS_BOOTLETS_BOARD) CROSS_COMPILE="$(TARGET_CROSS)" \ $(MAKE1) -C $(@D) power_prep BOARD=$(MXS_BOOTLETS_BOARD) CROSS_COMPILE="$(TARGET_CROSS)" \ @@ -94,13 +109,16 @@ define MXS_BOOTLETS_BUILD_CMDS $(MXS_BOOTLETS_SED_BAREBOX) $(MXS_BOOTLETS_SED_LINUX) $(MXS_BOOTLETS_SED_UBOOT) - $(HOST_DIR)/bin/elftosb $(MXS_BOOTLETS_ELFTOSB_OPTIONS) \ - -z -c $(@D)/$(MXS_BOOTLETS_BOOTDESC) \ - -o $(@D)/$(MXS_BOOTLETS_BOOTSTREAM) + $(foreach ext, $(MXS_BOOTLETS_BOOTSTREAM_EXTS), + $(call MXS_BOOTLETS_SED_ZIMAGE,$(subst .sb,,$(ext))) + $(call MXS_BOOTLETS_ELFTOSB_CMD,$(ext)) + ) endef define MXS_BOOTLETS_INSTALL_TARGET_CMDS - cp $(@D)/$(MXS_BOOTLETS_BOOTSTREAM) $(BINARIES_DIR)/ + $(foreach ext, $(MXS_BOOTLETS_BOOTSTREAM_EXTS), + cp $(@D)/$(MXS_BOOTLETS_BOOTSTREAM_BASENAME)$(ext) $(BINARIES_DIR)/ + ) endef $(eval $(generic-package)) -- 2.17.1 From thomas.petazzoni at bootlin.com Tue Feb 6 12:59:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 13:59:30 +0100 Subject: [Buildroot] [git commit] package/python-boto3: bump to version 1.34.14 Message-ID: <20240206130048.C157387033@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=606b56c0f0510c15f006bc82243d65ca2cd1a30d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-boto3/python-boto3.hash | 4 ++-- package/python-boto3/python-boto3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-boto3/python-boto3.hash b/package/python-boto3/python-boto3.hash index 253a9de85e..02440a2960 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/boto3/json -md5 12a1c0bb1e9ab692a1e33204a0da7f12 boto3-1.28.78.tar.gz -sha256 aa970b1571321846543a6e615848352fe7621f1cb96b4454e919421924af95f7 boto3-1.28.78.tar.gz +md5 7cc00aa828c5d3a5c09e3af284e6d23e boto3-1.34.14.tar.gz +sha256 5c1bb487c68120aae236354d81b8a1a55d0aa3395d30748a01825ef90891921e boto3-1.34.14.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/python-boto3/python-boto3.mk b/package/python-boto3/python-boto3.mk index f60f3467d4..52bb5bc3b1 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.28.78 +PYTHON_BOTO3_VERSION = 1.34.14 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/70/f7/da69e173dd5663775f114fad3827dcc49537e232e36266463ff70529f1a4 +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/5f/b6/1e45c3a145304c3feaf48959c6a46efe9a256eec4d417a445b0d9827d20c PYTHON_BOTO3_SETUP_TYPE = setuptools PYTHON_BOTO3_LICENSE = Apache-2.0 PYTHON_BOTO3_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 13:00:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:00:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-boto3: bump to version 1.34.14 In-Reply-To: <20240108072436.3487976-1-james.hilliard1@gmail.com> References: <20240108072436.3487976-1-james.hilliard1@gmail.com> Message-ID: <20240206140049.07bac969@windsurf> On Mon, 8 Jan 2024 00:24:36 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-boto3/python-boto3.hash | 4 ++-- > package/python-boto3/python-boto3.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 13:04:53 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:04:53 +0100 Subject: [Buildroot] [git commit] package/python-matplotlib-inline: new package Message-ID: <20240206130733.09785825C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1229b824ad97efd49747770a35d24b9f4218c6be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-matplotlib-inline/Config.in | 7 +++++++ .../python-matplotlib-inline/python-matplotlib-inline.hash | 5 +++++ .../python-matplotlib-inline/python-matplotlib-inline.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) diff --git a/package/Config.in b/package/Config.in index 97f590e2b7..728bd03b80 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1181,6 +1181,7 @@ menu "External python modules" source "package/python-marshmallow/Config.in" source "package/python-marshmallow-sqlalchemy/Config.in" source "package/python-matplotlib/Config.in" + source "package/python-matplotlib-inline/Config.in" source "package/python-mbstrdecoder/Config.in" source "package/python-memory-profiler/Config.in" source "package/python-midiutil/Config.in" diff --git a/package/python-matplotlib-inline/Config.in b/package/python-matplotlib-inline/Config.in new file mode 100644 index 0000000000..2ea9f4d966 --- /dev/null +++ b/package/python-matplotlib-inline/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MATPLOTLIB_INLINE + bool "python-matplotlib-inline" + select BR2_PACKAGE_PYTHON_TRAITLETS # runtime + help + Inline Matplotlib backend for Jupyter. + + https://github.com/ipython/matplotlib-inline diff --git a/package/python-matplotlib-inline/python-matplotlib-inline.hash b/package/python-matplotlib-inline/python-matplotlib-inline.hash new file mode 100644 index 0000000000..7382fc3406 --- /dev/null +++ b/package/python-matplotlib-inline/python-matplotlib-inline.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/matplotlib-inline/json +md5 aded9a57e2f526f76b3a4851d5528d4f matplotlib-inline-0.1.6.tar.gz +sha256 f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304 matplotlib-inline-0.1.6.tar.gz +# Locally computed sha256 checksums +sha256 8521b036c6448e0e0aa7213d4713b6fdee0f4c64c9f320450f77346bf5c0e8e4 LICENSE diff --git a/package/python-matplotlib-inline/python-matplotlib-inline.mk b/package/python-matplotlib-inline/python-matplotlib-inline.mk new file mode 100644 index 0000000000..c9c22605ca --- /dev/null +++ b/package/python-matplotlib-inline/python-matplotlib-inline.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-matplotlib-inline +# +################################################################################ + +PYTHON_MATPLOTLIB_INLINE_VERSION = 0.1.6 +PYTHON_MATPLOTLIB_INLINE_SOURCE = matplotlib-inline-$(PYTHON_MATPLOTLIB_INLINE_VERSION).tar.gz +PYTHON_MATPLOTLIB_INLINE_SITE = https://files.pythonhosted.org/packages/d9/50/3af8c0362f26108e54d58c7f38784a3bdae6b9a450bab48ee8482d737f44 +PYTHON_MATPLOTLIB_INLINE_SETUP_TYPE = setuptools +PYTHON_MATPLOTLIB_INLINE_LICENSE = BSD-3-Clause +PYTHON_MATPLOTLIB_INLINE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 13:06:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:06:35 +0100 Subject: [Buildroot] [git commit] package/python-ipython: bump to version 8.20.0 Message-ID: <20240206130733.143C887044@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b95111c2d47bfdb42ee20396f4722491fa27ffdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new python-matplotlib-inline runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-ipython/Config.in | 1 + package/python-ipython/python-ipython.hash | 4 ++-- package/python-ipython/python-ipython.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index c217efcfd1..87cc3969b0 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_IPYTHON select BR2_PACKAGE_PYTHON_BACKCALL # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime + select BR2_PACKAGE_PYTHON_MATPLOTLIB_INLINE # runtime select BR2_PACKAGE_PYTHON_PICKLESHARE # runtime select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index f68b3ba78c..33f70885b3 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 ac2ff5bad97aa09befdf7f0f27323699 ipython-8.17.2.tar.gz -sha256 126bb57e1895594bb0d91ea3090bbd39384f6fe87c3d57fd558d0670f50339bb ipython-8.17.2.tar.gz +md5 eee726e4cef5fd680110a899b4e5e2cb ipython-8.20.0.tar.gz +sha256 2f21bd3fc1d51550c89ee3944ae04bbc7bc79e129ea0937da6e6c68bfdbf117a ipython-8.20.0.tar.gz # Locally computed sha256 checksums sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index 1335121688..d3c2c05a05 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 8.17.2 +PYTHON_IPYTHON_VERSION = 8.20.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/a9/e9/c83d1a5756bf44f1802045a54dacc910d3d254c5ec56040993978d8c1b8d +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/c5/d1/187474d64bdefcb6804c1a3a1597d9e94f287e71c06f50f7784d56833fb7 PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython From thomas.petazzoni at bootlin.com Tue Feb 6 13:19:03 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:19:03 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: added marleen.vos@mind.be for boards/configs based on stm32mp15 Message-ID: <20240206132021.962628705A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3b99c79d9dc5325f33353d3f66e7b0fb2c1cc15 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The buildroot manual says this kind of commit should be done together with the actual changes made to a config/board. But since a number of changes will follow for some boards and configs, it seemed more logical to make a separate commit for this. Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7a943d1762..94952f72a8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2089,6 +2089,12 @@ F: board/qemu/riscv64-virt/ F: configs/qemu_riscv32_virt_defconfig F: configs/qemu_riscv64_virt_defconfig +N: Marleen Vos +F: board/stmicroelectronics/common/stm32mp157/ +F: configs/avenger96_defconfig +F: configs/stm32mp157a_dk1_defconfig +F: configs/stm32mp157c_dk2_defconfig + N: Martin Bark F: board/raspberrypi/ F: configs/raspberrypi3_defconfig From thomas.petazzoni at bootlin.com Tue Feb 6 13:19:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:19:42 +0100 Subject: [Buildroot] [git commit] configs/stm32mp157*: bump ATF to v2.6 Message-ID: <20240206132021.B547A8705C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=404a0b6a2a3e8a2ec31f448d0f397361da4e8be2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - v2.6 changes to FIP instead of SSBL boot. - This requires switching to u-boot.bin in U-Boot, and using that instead of .stm32 in ATF. - fiptool expects dtb to be split off from u-boot.bin, so need custom u-boot-nodtb.bin in addition to u-boot.dtb. Caveat: this is perhaps not really obligatory, but the ATF documentation explains it like that. - The partition must be named fip (while it must be named ssbl for SSBL boot). - Since the partition name is set in the common template, all defconfigs using that template must be bumped in a single commit - ATF now produces both fip.bin and .stm32, so fip.bin has been added to the configs - While we're at it, add the structuring comments to avenger96_defconfig similar like the other defconfigs Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- .../common/stm32mp157/genimage.cfg.template | 4 ++-- configs/avenger96_defconfig | 28 ++++++++++++++++++---- configs/stm32mp157a_dk1_defconfig | 14 +++++++---- configs/stm32mp157c_dk2_defconfig | 14 +++++++---- 4 files changed, 45 insertions(+), 15 deletions(-) diff --git a/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template b/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template index ff4aeceeed..c2affd98ea 100644 --- a/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template +++ b/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template @@ -11,8 +11,8 @@ image sdcard.img { image = "%ATFBIN%" } - partition ssbl { - image = "u-boot.stm32" + partition fip { + image = "fip.bin" size = 2M } diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 142f6dd8c9..536899583c 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -1,9 +1,16 @@ +# Architecture BR2_arm=y BR2_cortex_a7=y + +# Linux headers same as kernel, a 5.8 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y + +# System configuration BR2_GLOBAL_PATCH_DIR="board/arrow/avenger96/patches" BR2_ROOTFS_OVERLAY="board/arrow/avenger96/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" @@ -12,16 +19,24 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dhcor-avenger96" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set + +# Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y @@ -29,7 +44,10 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_STM32=y -BR2_TARGET_UBOOT_BUILD_FORMAT_STM32_LEGACY=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp15xx-dhcor-avenger96" + +# Additional tools BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index e764a1558d..3122c9647a 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -28,10 +28,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dk1.dtb E=0" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dk1.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y @@ -39,9 +43,11 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157a-dk1" # Additional tools diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index aa0fcfa843..7472be38bb 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -28,10 +28,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb E=0" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-dk2.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y @@ -39,9 +43,11 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set -BR2_TARGET_UBOOT_FORMAT_STM32=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=stm32mp157c-dk2" # Additional tools From thomas.petazzoni at bootlin.com Tue Feb 6 13:19:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:19:10 +0100 Subject: [Buildroot] [git commit] board/stmicroelectronics: generalise BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES regex Message-ID: <20240206132021.A58A98705B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e3debd90836ffa7f30175587e79bbcb13c7b30f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The regex was a bit too strict in which characters it allowed. Thus, if e.g. a file name appears in the BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES string, it no longer matches, and we end up with an empty ATF_VARIABLES. This makes the subsequent grep fail, and the post-image.sh script fails without any error message (thanks to the -e option). Simplify the regex to match everything except the closing quotation mark. Note that Kconfig doesn't allow quotation marks at all inside a string (even escaped ones), so this regular expression is always OK. Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- board/stmicroelectronics/common/stm32mp157/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/stmicroelectronics/common/stm32mp157/post-image.sh b/board/stmicroelectronics/common/stm32mp157/post-image.sh index 65809e46a4..0cf52f4564 100755 --- a/board/stmicroelectronics/common/stm32mp157/post-image.sh +++ b/board/stmicroelectronics/common/stm32mp157/post-image.sh @@ -8,7 +8,7 @@ # atf_image() { - ATF_VARIABLES="$(sed -n 's/^BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="\([\/a-zA-Z0-9_=. \-]*\)"$/\1/p' ${BR2_CONFIG})" + ATF_VARIABLES="$(sed -n 's/^BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="\([^\"]*\)"$/\1/p' ${BR2_CONFIG})" # make sure DTB_FILE_NAME is set printf '%s\n' "${ATF_VARIABLES}" | grep -Eq 'DTB_FILE_NAME=[0-9A-Za-z_\-]*' # extract the value From yegorslists at googlemail.com Tue Feb 6 13:20:51 2024 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Tue, 6 Feb 2024 14:20:51 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory Message-ID: <20240206132051.2838897-1-yegorslists@googlemail.com> From: Yegor Yefremov This .gitignore file ignores all files in an output directory and hence doesn't change the git status. Remove "/output" entry from the main .gitignore file as it is already handled by this general approach. Signed-off-by: Yegor Yefremov --- .gitignore | 1 - Makefile | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bb02d9f572..14b7ca5040 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/output /dl /.auto.deps /.config.cmd diff --git a/Makefile b/Makefile index ac625152c6..86d4444745 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,9 @@ ifneq ($(findstring @,$(CANONICAL_O)),) $(error The build directory can not contain a '@') endif +# Create a default .gitignore file that ignores everything +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") + CANONICAL_CURDIR = $(realpath $(CURDIR)) REQ_UMASK = 0022 -- 2.34.1 From thomas.petazzoni at bootlin.com Tue Feb 6 13:23:38 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:23:38 +0100 Subject: [Buildroot] [PATCH 1/7] DEVELOPERS: added marleen.vos@mind.be for boards/configs based on stm32mp15 In-Reply-To: <20231219121508.1695768-2-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-2-marleen.vos@mind.be> Message-ID: <20240206142338.59a0a577@windsurf> On Tue, 19 Dec 2023 13:15:02 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > The buildroot manual says this kind of commit should be done together > with the actual changes made to a config/board. But since a number of > changes will follow for some boards and configs, it seemed more > logical to make a separate commit for this. > > Signed-off-by: Marleen Vos > --- > DEVELOPERS | 6 ++++++ > 1 file changed, 6 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 13:23:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:23:41 +0100 Subject: [Buildroot] [PATCH 2/7] board/stmicroelectronics: generalise BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES regex In-Reply-To: <20231219121508.1695768-3-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-3-marleen.vos@mind.be> Message-ID: <20240206142341.691cf57c@windsurf> On Tue, 19 Dec 2023 13:15:03 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > The regex was a bit too strict in which characters it allowed. Thus, > if e.g. a file name appears in the > BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES string, it no > longer matches, and we end up with an empty ATF_VARIABLES. This makes > the subsequent grep fail, and the post-image.sh script fails without > any error message (thanks to the -e option). > > Simplify the regex to match everything except the closing quotation > mark. Note that Kconfig doesn't allow quotation marks at all inside a > string (even escaped ones), so this regular expression is always OK. > > Signed-off-by: Marleen Vos > --- > board/stmicroelectronics/common/stm32mp157/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 13:23:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:23:45 +0100 Subject: [Buildroot] [PATCH 3/7] configs/stm32mp157*: bump ATF to v2.6 In-Reply-To: <20231219121508.1695768-4-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-4-marleen.vos@mind.be> Message-ID: <20240206142345.0f064063@windsurf> On Tue, 19 Dec 2023 13:15:04 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > - v2.6 changes to FIP instead of SSBL boot. > - This requires switching to u-boot.bin in U-Boot, and using that > instead of .stm32 in ATF. > - fiptool expects dtb to be split off from u-boot.bin, so need custom > u-boot-nodtb.bin in addition to u-boot.dtb. > Caveat: this is perhaps not really obligatory, but the ATF > documentation explains it like that. > - The partition must be named fip (while it must be named ssbl for > SSBL boot). > - Since the partition name is set in the common template, all > defconfigs using that template must be bumped in a single commit > - ATF now produces both fip.bin and .stm32, so fip.bin has > been added to the configs > - While we're at it, add the structuring comments to > avenger96_defconfig similar like the other defconfigs > > Signed-off-by: Marleen Vos > --- > .../common/stm32mp157/genimage.cfg.template | 4 +-- > configs/avenger96_defconfig | 28 +++++++++++++++---- > configs/stm32mp157a_dk1_defconfig | 14 +++++++--- > configs/stm32mp157c_dk2_defconfig | 14 +++++++--- > 4 files changed, 45 insertions(+), 15 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 13:25:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:25:49 +0100 Subject: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 In-Reply-To: <20231219121508.1695768-5-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-5-marleen.vos@mind.be> Message-ID: <20240206142549.2ad91f3b@windsurf> Hello Marleen, On Tue, 19 Dec 2023 13:15:05 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as > found in v2.8 patch dir has already been applied in lts-v2.8.13 > Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has > been included as 0001-build-tools-avoid-unnecessary-link.patch for > lts-v2.8.13 > > Signed-off-by: Marleen Vos > --- > boot/arm-trusted-firmware/Config.in | 6 ++ > .../arm-trusted-firmware.hash | 1 + > ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++ > 3 files changed, 84 insertions(+) > create mode 100644 boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch Thanks a lot for this patch. However, I don't think we want to add explicit choice options for all "random" versions of TF-A. Instead, if you want to use this lts-v2.8.13 version for STM32MP1 defconfigs, you should simply set BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE to lts-v2.8.13, and have a BR2_GLOBAL_PATCH_DIR with the patch that you need to apply on top of it. Due to this, I will mark your patches 4, 5 and 6 in this series as Changes Requested. If you have the chance to do this update and send a new iteration, it would be nice! Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Tue Feb 6 13:30:21 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:30:21 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: <20240206132051.2838897-1-yegorslists@googlemail.com> References: <20240206132051.2838897-1-yegorslists@googlemail.com> Message-ID: Yegor, All, On 2024-02-06 14:20 +0100, yegorslists--- via buildroot spake thusly: > From: Yegor Yefremov > > This .gitignore file ignores all files in an output directory and > hence doesn't change the git status. > > Remove "/output" entry from the main .gitignore file as it is already > handled by this general approach. What are you trying to achieve with this that does not work currently? Regards, Yann E. MORIN. > Signed-off-by: Yegor Yefremov > --- > .gitignore | 1 - > Makefile | 3 +++ > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/.gitignore b/.gitignore > index bb02d9f572..14b7ca5040 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -1,4 +1,3 @@ > -/output > /dl > /.auto.deps > /.config.cmd > diff --git a/Makefile b/Makefile > index ac625152c6..86d4444745 100644 > --- a/Makefile > +++ b/Makefile > @@ -63,6 +63,9 @@ ifneq ($(findstring @,$(CANONICAL_O)),) > $(error The build directory can not contain a '@') > endif > > +# Create a default .gitignore file that ignores everything > +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") > + > CANONICAL_CURDIR = $(realpath $(CURDIR)) > > REQ_UMASK = 0022 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Tue Feb 6 13:37:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 14:37:13 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: References: <20240206132051.2838897-1-yegorslists@googlemail.com> Message-ID: <67502ba4-3f73-428e-802e-6ee9cbc1fe6a@mind.be> On 06/02/2024 14:30, Yann E. MORIN wrote: > Yegor, All, > > On 2024-02-06 14:20 +0100, yegorslists--- via buildroot spake thusly: >> From: Yegor Yefremov >> >> This .gitignore file ignores all files in an output directory and >> hence doesn't change the git status. >> >> Remove "/output" entry from the main .gitignore file as it is already >> handled by this general approach. > > What are you trying to achieve with this that does not work currently? I you do `make O=output-test-mypkg` (which I do quite a lot), that output directory doesn't get ignored by git. We could ignore output* but maybe you name the output directory o-foo or something. Putting a .gitignore in a generated directory is a very elegant solution for that. It is used by e.g. virtualenv, pytest, and a load of other applications that generate output in a directory. Since the .gitignore is created in the output directory, it is no longer necessary to put output/ in the .gitignore file. All of the above could be put in the commit message, of course, but for me Yegor's commit message was sufficiently clear :-) Regards, Arnout > > Regards, > Yann E. MORIN. > >> Signed-off-by: Yegor Yefremov >> --- >> .gitignore | 1 - >> Makefile | 3 +++ >> 2 files changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/.gitignore b/.gitignore >> index bb02d9f572..14b7ca5040 100644 >> --- a/.gitignore >> +++ b/.gitignore >> @@ -1,4 +1,3 @@ >> -/output >> /dl >> /.auto.deps >> /.config.cmd >> diff --git a/Makefile b/Makefile >> index ac625152c6..86d4444745 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -63,6 +63,9 @@ ifneq ($(findstring @,$(CANONICAL_O)),) >> $(error The build directory can not contain a '@') >> endif >> >> +# Create a default .gitignore file that ignores everything >> +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") >> + >> CANONICAL_CURDIR = $(realpath $(CURDIR)) >> >> REQ_UMASK = 0022 >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From arnout at mind.be Tue Feb 6 13:38:31 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 14:38:31 +0100 Subject: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 In-Reply-To: <20240206142549.2ad91f3b@windsurf> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-5-marleen.vos@mind.be> <20240206142549.2ad91f3b@windsurf> Message-ID: <018bc3f7-2ae5-4d36-8c6b-485f41b4f319@mind.be> On 06/02/2024 14:25, Thomas Petazzoni via buildroot wrote: > Hello Marleen, > > On Tue, 19 Dec 2023 13:15:05 +0100 > Marleen Vos via buildroot wrote: > >> From: Marleen Vos >> >> Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as >> found in v2.8 patch dir has already been applied in lts-v2.8.13 >> Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has >> been included as 0001-build-tools-avoid-unnecessary-link.patch for >> lts-v2.8.13 >> >> Signed-off-by: Marleen Vos >> --- >> boot/arm-trusted-firmware/Config.in | 6 ++ >> .../arm-trusted-firmware.hash | 1 + >> ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++ >> 3 files changed, 84 insertions(+) >> create mode 100644 boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch > > Thanks a lot for this patch. However, I don't think we want to add > explicit choice options for all "random" versions of TF-A. This is the current situation however: $ ls -R boot/arm-trusted-firmware/ boot/arm-trusted-firmware/: Config.in arm-trusted-firmware.hash arm-trusted-firmware.mk v2.2/ v2.3/ v2.4/ v2.5/ v2.6/ v2.7/ v2.8/ v2.9/ boot/arm-trusted-firmware/v2.2: 0001-PATCH-feat-build-add-support-for-new-binutils-versio.patch boot/arm-trusted-firmware/v2.3: 0001-feat-build-add-support-for-new-binutils-versions.patch boot/arm-trusted-firmware/v2.4: 0001-feat-build-add-support-for-new-binutils-versions.patch boot/arm-trusted-firmware/v2.5: 0001-feat-build-add-support-for-new-binutils-versions.patch boot/arm-trusted-firmware/v2.6: 0001-feat-build-add-support-for-new-binutils-versions.patch boot/arm-trusted-firmware/v2.7: 0001-feat-build-add-support-for-new-binutils-versions.patch boot/arm-trusted-firmware/v2.8: 0001-feat-build-add-support-for-new-binutils-versions.patch 0002-build-tools-avoid-unnecessary-link.patch boot/arm-trusted-firmware/v2.9: 0001-build-tools-avoid-unnecessary-link.patch Regards, Arnout > Instead, if > you want to use this lts-v2.8.13 version for STM32MP1 defconfigs, you > should simply set BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE > to lts-v2.8.13, and have a BR2_GLOBAL_PATCH_DIR with the patch that you > need to apply on top of it. > > Due to this, I will mark your patches 4, 5 and 6 in this series as > Changes Requested. If you have the chance to do this update and send a > new iteration, it would be nice! > > Best regards, > > Thomas From thomas.petazzoni at bootlin.com Tue Feb 6 13:39:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:39:25 +0100 Subject: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 In-Reply-To: <018bc3f7-2ae5-4d36-8c6b-485f41b4f319@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-5-marleen.vos@mind.be> <20240206142549.2ad91f3b@windsurf> <018bc3f7-2ae5-4d36-8c6b-485f41b4f319@mind.be> Message-ID: <20240206143925.24537bba@windsurf> On Tue, 6 Feb 2024 14:38:31 +0100 Arnout Vandecappelle wrote: > > Thanks a lot for this patch. However, I don't think we want to add > > explicit choice options for all "random" versions of TF-A. > > This is the current situation however: Yes, but there is no explicit choice options for all those versions. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 13:28:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:28:02 +0100 Subject: [Buildroot] [git commit] boot/arm-trusted-firmware: bump latest version to v2.10 Message-ID: <20240206133952.3813187064@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47647814f57482568683190a399745543cb029aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Patch 0001-build-tools-avoid-unnecessary-link.patch that was applied to v2.9 is already in v2.10, so no new patch dir for v2.10 is added Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 4 ++-- boot/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index a5ac987172..c65f4aaba2 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -14,7 +14,7 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v2.7" + bool "v2.10" config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION bool "Custom version" @@ -42,7 +42,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v2.7" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "v2.10" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index d931610dc4..c63e9d30b0 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz +sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst From thomas.petazzoni at bootlin.com Tue Feb 6 13:39:57 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 14:39:57 +0100 Subject: [Buildroot] [PATCH 7/7] boot/arm-trusted-firmware: bump latest version to v2.10 In-Reply-To: <20231219121508.1695768-8-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-8-marleen.vos@mind.be> Message-ID: <20240206143957.6bf13eec@windsurf> On Tue, 19 Dec 2023 13:15:08 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > Patch 0001-build-tools-avoid-unnecessary-link.patch that was applied to > v2.9 is already in v2.10, so no new patch dir for v2.10 is added > > Signed-off-by: Marleen Vos > --- > boot/arm-trusted-firmware/Config.in | 4 ++-- > boot/arm-trusted-firmware/arm-trusted-firmware.hash | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Tue Feb 6 13:43:17 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:43:17 +0100 Subject: [Buildroot] [git commit] package/python-rtoml: bump to version 0.10.0 Message-ID: <20240206134334.9062987063@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=00702e3ffde1ebce9e2a2cfb63af7992a627c149 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools-rust to maturin infrastructure. Signed-off-by: James Hilliard --- package/python-rtoml/python-rtoml.hash | 2 +- package/python-rtoml/python-rtoml.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash index 04d22ed1a4..59f17d9d62 100644 --- a/package/python-rtoml/python-rtoml.hash +++ b/package/python-rtoml/python-rtoml.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz # Locally computed sha256 checksums sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk index 819dcf3288..16f9dea573 100644 --- a/package/python-rtoml/python-rtoml.mk +++ b/package/python-rtoml/python-rtoml.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_RTOML_VERSION = 0.8.0 +PYTHON_RTOML_VERSION = 0.10.0 PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz -PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 -PYTHON_RTOML_SETUP_TYPE = setuptools-rust +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/ca/b2/0e77a00e75ed582ec1c4c3a9e1eeed886a15c195bcce87b7daf1171c4115 +PYTHON_RTOML_SETUP_TYPE = maturin PYTHON_RTOML_LICENSE = MIT PYTHON_RTOML_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Feb 6 13:43:16 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:43:16 +0100 Subject: [Buildroot] [git commit] package/python-rpds-py: bump to version 0.16.2 Message-ID: <20240206134334.80DFB87070@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dd5f808be1057434575322711b0e4775403e4d38 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard --- package/python-rpds-py/python-rpds-py.hash | 2 +- package/python-rpds-py/python-rpds-py.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash index b04aa210d3..8c4b6181d0 100644 --- a/package/python-rpds-py/python-rpds-py.hash +++ b/package/python-rpds-py/python-rpds-py.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz # Locally computed sha256 checksums sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 6f71d02047..5f0d30d002 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPDS_PY_VERSION = 0.12.0 +PYTHON_RPDS_PY_VERSION = 0.16.2 PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 PYTHON_RPDS_PY_SETUP_TYPE = maturin PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Tue Feb 6 13:43:41 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:43:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: <20240111051726.2918732-1-james.hilliard1@gmail.com> References: <20240111051726.2918732-1-james.hilliard1@gmail.com> Message-ID: James, all, On 2024-01-10 22:17 -0700, James Hilliard spake thusly: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-rpds-py/python-rpds-py.hash | 2 +- > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > index b04aa210d3..8c4b6181d0 100644 > --- a/package/python-rpds-py/python-rpds-py.hash > +++ b/package/python-rpds-py/python-rpds-py.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz > # Locally computed sha256 checksums > sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE > diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk > index 6f71d02047..5f0d30d002 100644 > --- a/package/python-rpds-py/python-rpds-py.mk > +++ b/package/python-rpds-py/python-rpds-py.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > +PYTHON_RPDS_PY_VERSION = 0.16.2 > PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz > -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 > +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 > PYTHON_RPDS_PY_SETUP_TYPE = maturin > PYTHON_RPDS_PY_LICENSE = MIT > PYTHON_RPDS_PY_LICENSE_FILES = LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 13:44:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:44:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: References: <20240111051726.2918732-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-05 12:05 +0100, Arnout Vandecappelle via buildroot spake thusly: > On 11/01/2024 06:17, James Hilliard wrote: > > Signed-off-by: James Hilliard > > --- > > package/python-rpds-py/python-rpds-py.hash | 2 +- > > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > > index b04aa210d3..8c4b6181d0 100644 > > --- a/package/python-rpds-py/python-rpds-py.hash > > +++ b/package/python-rpds-py/python-rpds-py.hash > > @@ -1,4 +1,4 @@ > > # Locally calculated after vendoring > > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > > +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz > > ERROR: while checking hashes from package/python-rpds-py//python-rpds-py.hash > ERROR: rpds_py-0.16.2.tar.gz has wrong sha256 hash: > ERROR: expected: 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb > ERROR: got : bc62a37913de53569414f6eb4a16a005b1dd04afb473c3c27561b11614f92034 > ERROR: Incomplete download, or man-in-the-middle (MITM) attack > > This might be the gitattributes issue that Yann has a patch series for. I'm > marking this patch as Changes Requested, you can try to re-submit after > Yann's series is merged. It turned out that Arnout had a broken setup, and the archives were made with tar 1.35 rather than the expexted 1.34. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 13:44:42 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:44:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rtoml: bump to version 0.10.0 In-Reply-To: <20240111052225.2922249-1-james.hilliard1@gmail.com> References: <20240111052225.2922249-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-01-10 22:22 -0700, James Hilliard spake thusly: > Migrate from setuptools-rust to maturin infrastructure. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/python-rtoml/python-rtoml.hash | 2 +- > package/python-rtoml/python-rtoml.mk | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash > index 04d22ed1a4..59f17d9d62 100644 > --- a/package/python-rtoml/python-rtoml.hash > +++ b/package/python-rtoml/python-rtoml.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz > +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz > # Locally computed sha256 checksums > sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE > diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk > index 819dcf3288..16f9dea573 100644 > --- a/package/python-rtoml/python-rtoml.mk > +++ b/package/python-rtoml/python-rtoml.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PYTHON_RTOML_VERSION = 0.8.0 > +PYTHON_RTOML_VERSION = 0.10.0 > PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz > -PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 > -PYTHON_RTOML_SETUP_TYPE = setuptools-rust > +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/ca/b2/0e77a00e75ed582ec1c4c3a9e1eeed886a15c195bcce87b7daf1171c4115 > +PYTHON_RTOML_SETUP_TYPE = maturin > PYTHON_RTOML_LICENSE = MIT > PYTHON_RTOML_LICENSE_FILES = LICENSE > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 13:45:57 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:45:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rtoml: bump to version 0.10.0 In-Reply-To: References: <20240111052225.2922249-1-james.hilliard1@gmail.com> <687fa6af-4d6f-4890-bd3a-c420ede9cdfd@mind.be> Message-ID: Arnout, All, On 2024-02-06 09:49 +0100, Arnout Vandecappelle via buildroot spake thusly: > On 05/02/2024 18:21, James Hilliard wrote: > > On Mon, Feb 5, 2024 at 4:29?AM Arnout Vandecappelle wrote: > > > On 11/01/2024 06:22, James Hilliard wrote: > > > > Migrate from setuptools-rust to maturin infrastructure. > > > > > > > > Signed-off-by: James Hilliard > > > > --- > > > > package/python-rtoml/python-rtoml.hash | 2 +- > > > > package/python-rtoml/python-rtoml.mk | 6 +++--- > > > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > > > > > diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash > > > > index 04d22ed1a4..59f17d9d62 100644 > > > > --- a/package/python-rtoml/python-rtoml.hash > > > > +++ b/package/python-rtoml/python-rtoml.hash > > > > @@ -1,4 +1,4 @@ > > > > # Locally calculated after vendoring > > > > -sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz > > > > +sha256 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 rtoml-0.10.0.tar.gz > > > > > > Same problem: > > > > > > ERROR: while checking hashes from package/python-rtoml//python-rtoml.hash > > > ERROR: rtoml-0.10.0.tar.gz has wrong sha256 hash: > > > ERROR: expected: 987d3d9e9d56761b17c3e4e172937cbcc793bf24b0ebb2730647a9a2cf86c789 > > > ERROR: got : 624cc1ff2b3fdea42aeee3a4d1537d37431ec001870dfee1e04a12bd3076a2d3 > > Hmm, I'm unable to reproduce this issue. Turned out that Arnout's setup was slightly borked, and he was using a 1.35 tar to create the archvies... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From dev at andin.de Tue Feb 6 13:58:19 2024 From: dev at andin.de (Andreas Naumann) Date: Tue, 6 Feb 2024 14:58:19 +0100 Subject: [Buildroot] [PATCH 2/2] package/glm: bump version In-Reply-To: <20240114174823.2732695-2-bernd@kuhls.net> References: <20240114174823.2732695-1-bernd@kuhls.net> <20240114174823.2732695-2-bernd@kuhls.net> Message-ID: Hi, Am 14.01.24 um 18:48 schrieb Bernd Kuhls: > Fixes build error with packages depending on glm, like kodi-screensaver* > and kodi-visualisation*: > > CMake Error at /home/buildroot/br2/output/per-package/kodi-screensaver-asteroids/host/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:230 (message): > Could NOT find glm (missing: GLM_INCLUDE_DIR) > > Since glm release 0.9.9.8 (bumped in buildroot with commit > 01ad11343172ea698e4dcc1c64cb02ce26671e49) many fixes were added for its > cmake support: https://github.com/g-truc/glm/pull/1054 > > Instead of backporting all of them we bump to latest git HEAD. > Preparations for glm 1.0.0 are underway: > https://github.com/g-truc/glm/pull/1180 I just now find this patch, after having sent one bumping glm to tag 1.0.0 (which is only about 2 weeks old). However, since it's a tag, I suggest my patch supersedes this one. regards, Andreas > > Fixes build error with this defconfig: > > BR2_x86_64=y > BR2_x86_x86_64_v4=y > BR2_BINUTILS_VERSION_2_41_X=y > BR2_GCC_VERSION_13_X=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_PER_PACKAGE_DIRECTORIES=y > BR2_INIT_NONE=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > BR2_PACKAGE_KODI=y > BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS=y > BR2_PACKAGE_MESA3D=y > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > BR2_PACKAGE_MESA3D_OPENGL_ES=y > BR2_PACKAGE_PYTHON3=y > BR2_PACKAGE_PYTHON3_PY_ONLY=y > > Signed-off-by: Bernd Kuhls > --- > package/glm/glm.hash | 2 +- > package/glm/glm.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/glm/glm.hash b/package/glm/glm.hash > index c4e2101604..6bc88739b3 100644 > --- a/package/glm/glm.hash > +++ b/package/glm/glm.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz > +sha256 9dc8c27c2b00d44a0b9d4a619b13848f1092914e7ec60447ac3db528a8e9ba8a glm-b06b775c1c80af51a1183c0e167f9de3b2351a79.tar.gz > sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt > diff --git a/package/glm/glm.mk b/package/glm/glm.mk > index ef549931f6..92357b4fe2 100644 > --- a/package/glm/glm.mk > +++ b/package/glm/glm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GLM_VERSION = 0.9.9.8 > +GLM_VERSION = b06b775c1c80af51a1183c0e167f9de3b2351a79 > GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) > GLM_LICENSE = MIT > GLM_LICENSE_FILES = copying.txt From arnout at mind.be Tue Feb 6 13:59:23 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 14:59:23 +0100 Subject: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 In-Reply-To: <018bc3f7-2ae5-4d36-8c6b-485f41b4f319@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-5-marleen.vos@mind.be> <20240206142549.2ad91f3b@windsurf> <018bc3f7-2ae5-4d36-8c6b-485f41b4f319@mind.be> Message-ID: <11005254-f77b-46ed-8b65-7e23bd97f37d@mind.be> On 06/02/2024 14:38, Arnout Vandecappelle wrote: > > > On 06/02/2024 14:25, Thomas Petazzoni via buildroot wrote: >> Hello Marleen, >> >> On Tue, 19 Dec 2023 13:15:05 +0100 >> Marleen Vos via buildroot wrote: >> >>> From: Marleen Vos >>> >>> Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as >>> found in v2.8 patch dir has already been applied in lts-v2.8.13 >>> Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has >>> been included as 0001-build-tools-avoid-unnecessary-link.patch for >>> lts-v2.8.13 >>> >>> Signed-off-by: Marleen Vos >>> --- >>> ? boot/arm-trusted-firmware/Config.in?????????? |? 6 ++ >>> ? .../arm-trusted-firmware.hash???????????????? |? 1 + >>> ? ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++ >>> ? 3 files changed, 84 insertions(+) >>> ? create mode 100644 >>> boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch >> >> Thanks a lot for this patch. However, I don't think we want to add >> explicit choice options for all "random" versions of TF-A. > > ?This is the current situation however: ?Sorry, I misread your comment. ?The idea is not to create version options for all "random" versions of TF-A. Instead, the idea is to have 3 options: latest, lts, and custom. ?The idea is also that board configs should be able to use the lts version, since the assumption is that lts is not going to break things. I've taken a look at the TF-A LTS branch and the commits in there look relatively safe. From a user perspective, I think it makes sense that you can update Buildroot and get an automatic update of TF-A on the lts branch as well (which is not possible if you specify a custom version). I.e. from a practical point of view, I think this lts version is the one that people should use. It should probably even be the default... ?We could also have removed the "latest" option entirely. Perhaps we should, really, I don't have a really good use case for it. Maybe for "hobby" users who want bleeding edge when they follow Buildroot master. ?So that's the background for adding the LTS option, and using it in the defconfig. That leaves the question why it is called BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION instead of BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_VERSION. The reason behind that is that when we move to a new LTS, we want this to be explicit, with legacy handling and everything - you really _don't_ want a silent update from 2.8 to 2.12 (or whatever) when you update Buildroot. So by giving a different name to the config symbol when the LTS branch is updated, we can make sure that there is legacy handling and things break loudly instead of silently. ?Is this sufficient explanation? ?Regards, ?Arnout > >> Instead, if >> you want to use this lts-v2.8.13 version for STM32MP1 defconfigs, you >> should simply set BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE >> to lts-v2.8.13, and have a BR2_GLOBAL_PATCH_DIR with the patch that you >> need to apply on top of it. >> >> Due to this, I will mark your patches 4, 5 and 6 in this series as >> Changes Requested. If you have the chance to do this update and send a >> new iteration, it would be nice! >> >> Best regards, >> >> Thomas From yann.morin.1998 at free.fr Tue Feb 6 13:48:36 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 14:48:36 +0100 Subject: [Buildroot] [git commit] package/glm: Bump to 1.0.0 Message-ID: <20240206140239.2DB8881F76@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=12b97949ef47161e7117e6092789a00cc8cbaaa7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master glm did not install headers since [1], at least in a per-package build. Bumping to 1.0.0 fixes that. The cmake option to avoid building the lib has changed Partially fixes [2], where cegui failed to configure because of the missing glm headers. It also fixes kodi-screensaver and kodi-visualisation (no autobuidl failures so far): CMake Error at [...]/output/per-package/kodi-screensaver-asteroids/host/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:230 (message): Could NOT find glm (missing: GLM_INCLUDE_DIR) [1] 01ad113 package/glm: bump to version 0.9.9.8 [2] http://autobuild.buildroot.org/results/241/241a60f8ecb6fec5dc122d64dd438dd4249f8c3e/ Signed-off-by: Andreas Naumann [yann.morin.1998 at free.fr: add kodi failures from Bernd] Signed-off-by: Yann E. MORIN --- package/glm/glm.hash | 2 +- package/glm/glm.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/glm/glm.hash b/package/glm/glm.hash index c4e2101604..0084bd0930 100644 --- a/package/glm/glm.hash +++ b/package/glm/glm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz +sha256 e51f6c89ff33b7cfb19daafb215f293d106cd900f8d681b9b1295312ccadbd23 glm-1.0.0.tar.gz sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt diff --git a/package/glm/glm.mk b/package/glm/glm.mk index ef549931f6..ce8efc11a7 100644 --- a/package/glm/glm.mk +++ b/package/glm/glm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLM_VERSION = 0.9.9.8 +GLM_VERSION = 1.0.0 GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) GLM_LICENSE = MIT GLM_LICENSE_FILES = copying.txt @@ -17,7 +17,6 @@ GLM_INSTALL_TARGET = NO # Don't build libraries as GLM is header-only GLM_CONF_OPTS = \ -DGLM_TEST_ENABLE=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_STATIC_LIBS=OFF + -DGLM_BUILD_LIBRARY=OFF $(eval $(cmake-package)) From yann.morin.1998 at free.fr Tue Feb 6 14:03:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 15:03:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/glm: Bump to 1.0.0 In-Reply-To: <20240206102144.1831146-1-anaumann@ultratronik.de> References: <20240206102144.1831146-1-anaumann@ultratronik.de> Message-ID: Andreas, All, On 2024-02-06 11:21 +0100, Andreas Naumann spake thusly: > glm did not install headers since [1], at least in a per-package > build. Bumping to 1.0.0 fixes that. > The cmake option to avoid building the lib has changed > > Partially fixes [2], where cegui failed to configure because of > the missing glm headers. > > [1] 01ad113 package/glm: bump to version 0.9.9.8 > [2] http://autobuild.buildroot.org/results/241/241a60f8ecb6fec5dc122d64dd438dd4249f8c3e/ > > Signed-off-by: Andreas Naumann Applied to master, thanks. Bernd sent an earlier patch to bump to a random git sha1, and I grabbed the failures from his commit log and added them to this patch when applying. Regards, Yann E. MORIN. > --- > note: 0.9.9.8 from 2020 was the latest tag until a 1.0.0 was cut about > two weeks ago (24th january 2024). I've seen commit 3a4b550 which might > have been responsible but didnt check since 1.0.0 was available. > > > package/glm/glm.hash | 2 +- > package/glm/glm.mk | 5 ++--- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/package/glm/glm.hash b/package/glm/glm.hash > index c4e21016047..0084bd0930c 100644 > --- a/package/glm/glm.hash > +++ b/package/glm/glm.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz > +sha256 e51f6c89ff33b7cfb19daafb215f293d106cd900f8d681b9b1295312ccadbd23 glm-1.0.0.tar.gz > sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt > diff --git a/package/glm/glm.mk b/package/glm/glm.mk > index ef549931f6a..ce8efc11a78 100644 > --- a/package/glm/glm.mk > +++ b/package/glm/glm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -GLM_VERSION = 0.9.9.8 > +GLM_VERSION = 1.0.0 > GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) > GLM_LICENSE = MIT > GLM_LICENSE_FILES = copying.txt > @@ -17,7 +17,6 @@ GLM_INSTALL_TARGET = NO > # Don't build libraries as GLM is header-only > GLM_CONF_OPTS = \ > -DGLM_TEST_ENABLE=OFF \ > - -DBUILD_SHARED_LIBS=OFF \ > - -DBUILD_STATIC_LIBS=OFF > + -DGLM_BUILD_LIBRARY=OFF > > $(eval $(cmake-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 14:06:16 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 15:06:16 +0100 Subject: [Buildroot] [PATCH 2/2] package/glm: bump version In-Reply-To: References: <20240114174823.2732695-1-bernd@kuhls.net> <20240114174823.2732695-2-bernd@kuhls.net> Message-ID: Andreas, Bernd, All, On 2024-02-06 14:58 +0100, Andreas Naumann spake thusly: > Am 14.01.24 um 18:48 schrieb Bernd Kuhls: > > Fixes build error with packages depending on glm, like kodi-screensaver* > > and kodi-visualisation*: > > > > CMake Error at /home/buildroot/br2/output/per-package/kodi-screensaver-asteroids/host/share/cmake-3.28/Modules/FindPackageHandleStandardArgs.cmake:230 (message): > > Could NOT find glm (missing: GLM_INCLUDE_DIR) > > > > Since glm release 0.9.9.8 (bumped in buildroot with commit > > 01ad11343172ea698e4dcc1c64cb02ce26671e49) many fixes were added for its > > cmake support: https://github.com/g-truc/glm/pull/1054 > > > > Instead of backporting all of them we bump to latest git HEAD. > > Preparations for glm 1.0.0 are underway: > > https://github.com/g-truc/glm/pull/1180 > > I just now find this patch, after having sent one bumping glm to tag 1.0.0 > (which is only about 2 weeks old). However, since it's a tag, I suggest my > patch supersedes this one. Ah, I see you evnetually spotted this patch too! ;-) I indeed applied your patch, but as I said, I also grabbed the kodi failures Bernd noticed. Regards, Yann E. MORIN. > regards, > Andreas > > > > > Fixes build error with this defconfig: > > > > BR2_x86_64=y > > BR2_x86_x86_64_v4=y > > BR2_BINUTILS_VERSION_2_41_X=y > > BR2_GCC_VERSION_13_X=y > > BR2_TOOLCHAIN_BUILDROOT_CXX=y > > BR2_PER_PACKAGE_DIRECTORIES=y > > BR2_INIT_NONE=y > > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > > BR2_PACKAGE_KODI=y > > BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS=y > > BR2_PACKAGE_MESA3D=y > > BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y > > BR2_PACKAGE_MESA3D_OPENGL_EGL=y > > BR2_PACKAGE_MESA3D_OPENGL_ES=y > > BR2_PACKAGE_PYTHON3=y > > BR2_PACKAGE_PYTHON3_PY_ONLY=y > > > > Signed-off-by: Bernd Kuhls > > --- > > package/glm/glm.hash | 2 +- > > package/glm/glm.mk | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/package/glm/glm.hash b/package/glm/glm.hash > > index c4e2101604..6bc88739b3 100644 > > --- a/package/glm/glm.hash > > +++ b/package/glm/glm.hash > > @@ -1,3 +1,3 @@ > > # Locally calculated > > -sha256 7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592 glm-0.9.9.8.tar.gz > > +sha256 9dc8c27c2b00d44a0b9d4a619b13848f1092914e7ec60447ac3db528a8e9ba8a glm-b06b775c1c80af51a1183c0e167f9de3b2351a79.tar.gz > > sha256 62d2d642c7d054d4fb4c9b42faad617d6c88fcd91e317f8035aa9f277cc159c3 copying.txt > > diff --git a/package/glm/glm.mk b/package/glm/glm.mk > > index ef549931f6..92357b4fe2 100644 > > --- a/package/glm/glm.mk > > +++ b/package/glm/glm.mk > > @@ -4,7 +4,7 @@ > > # > > ################################################################################ > > -GLM_VERSION = 0.9.9.8 > > +GLM_VERSION = b06b775c1c80af51a1183c0e167f9de3b2351a79 > > GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) > > GLM_LICENSE = MIT > > GLM_LICENSE_FILES = copying.txt > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From antoine.coutant at smile.fr Tue Feb 6 14:09:32 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Tue, 6 Feb 2024 15:09:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: <20240111051726.2918732-1-james.hilliard1@gmail.com> References: <20240111051726.2918732-1-james.hilliard1@gmail.com> Message-ID: <1dd4afa6-e225-4e79-bb3a-21d0e04c7571@smile.fr> James, All, On 11/01/2024 06:17, James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-rpds-py/python-rpds-py.hash | 2 +- > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > index b04aa210d3..8c4b6181d0 100644 > --- a/package/python-rpds-py/python-rpds-py.hash > +++ b/package/python-rpds-py/python-rpds-py.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > +sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz > # Locally computed sha256 checksums > sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE > diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk > index 6f71d02047..5f0d30d002 100644 > --- a/package/python-rpds-py/python-rpds-py.mk > +++ b/package/python-rpds-py/python-rpds-py.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > +PYTHON_RPDS_PY_VERSION = 0.16.2 > PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz > -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 > +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 > PYTHON_RPDS_PY_SETUP_TYPE = maturin > PYTHON_RPDS_PY_LICENSE = MIT > PYTHON_RPDS_PY_LICENSE_FILES = LICENSE rpds depends on the crate pyo3. This crate uses "std::sync::atomic::AtomicI64" which doesn't exist for 32 bits targets. That leads to an error [1]. An issue have been opened on pyo3's github [2]. A fix have been accepted [3] but it isn't in the last release. Thus, this version bump doesn't fix this problem. [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854842 [2]: https://github.com/PyO3/pyo3/issues/3614 [3]: https://github.com/PyO3/pyo3/pull/3619 regards, Antoine Coutant From thomas.petazzoni at bootlin.com Tue Feb 6 14:11:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:11:44 +0100 Subject: [Buildroot] CVE-2023-0687 version range fix Message-ID: <20240206151144.103d5b2b@windsurf> Dear NVD maintainers, Your entry at https://nvd.nist.gov/vuln/detail/CVE-2023-0687 for CVE-2023-0687 states that the affected CPE ID is cpe:2.3:a:gnu:glibc:2.38:*:*:*:*:*:*:*, which indicates that only glibc 2.38 is affected. But actually, the bug was fixed in glibc 2.38, so it's all versions prior to 2.38 that are affected. According to the bug report at https://sourceware.org/bugzilla/show_bug.cgi?id=29444, this issue was fixed in commit https://sourceware.org/git/?p=glibc.git;a=commit;h=801af9fafd4689337ebf27260aa115335a0cb2bc, and: $ git tag --contains 801af9fafd46 glibc-2.38 glibc-2.38.9000 So the commit fixing this issue made it to the 2.38 release. Do you think you could adjust the NVD entry for this CVE ? Thanks a lot in advance! Thomas Petazzoni -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:13:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:13:27 +0100 Subject: [Buildroot] [PATCH 3/3] package/glibc: ignore CVE-2023-0687, disputed In-Reply-To: References: <20231220200110.1819507-1-thomas.petazzoni@bootlin.com> <20231220200110.1819507-3-thomas.petazzoni@bootlin.com> Message-ID: <20240206151327.0855d4b8@windsurf> Hello Yann, On Sat, 23 Dec 2023 11:19:57 +0100 "Yann E. MORIN" wrote: > This CVE is supposed to be fixed by 801af9fafd46 (gmon: Fix allocated > buffer overflow (bug 29444)) which is in 2.38: > > $ git tag --contains 801af9fafd46 > glibc-2.38 > glibc-2.38.9000 > > So the CVE DB should be updated to state that glibc >= 2.38 is not > affected. Good point. Sorry for the delay in getting back to you. I just send a mail to the NVD maintainers, Cc'ed to the Buildroot mailing list. I'll mark my patch as Rejected in patchwork. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:15:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:15:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-jsonschema-specifications: bump to version 2023.12.1 In-Reply-To: <20240109083922.4085395-1-james.hilliard1@gmail.com> References: <20240109083922.4085395-1-james.hilliard1@gmail.com> Message-ID: <20240206151502.5ceb586b@windsurf> On Tue, 9 Jan 2024 01:39:22 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > .../python-jsonschema-specifications.hash | 4 ++-- > .../python-jsonschema-specifications.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:15:07 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:15:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-jsonschema: bump to version 4.20.0 In-Reply-To: <20240109084236.4087932-1-james.hilliard1@gmail.com> References: <20240109084236.4087932-1-james.hilliard1@gmail.com> Message-ID: <20240206151507.5a1ba109@windsurf> On Tue, 9 Jan 2024 01:42:36 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-jsonschema/python-jsonschema.hash | 4 ++-- > package/python-jsonschema/python-jsonschema.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:15:11 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:15:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lxml: bump to version 5.1.0 In-Reply-To: <20240109085421.33259-1-james.hilliard1@gmail.com> References: <20240109085421.33259-1-james.hilliard1@gmail.com> Message-ID: <20240206151511.175b500c@windsurf> On Tue, 9 Jan 2024 01:54:21 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-lxml/python-lxml.hash | 2 +- > package/python-lxml/python-lxml.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:17:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:17:09 +0100 Subject: [Buildroot] [PATCH 1/2] package/kodi: needs host-cmake >= 3.26 In-Reply-To: <20240114174823.2732695-1-bernd@kuhls.net> References: <20240114174823.2732695-1-bernd@kuhls.net> Message-ID: <20240206151709.61d8e308@windsurf> On Sun, 14 Jan 2024 18:48:22 +0100 Bernd Kuhls wrote: > Fixes build error on Debian bookworm with > > $ cmake --version > cmake version 3.25.1 > > -- Found Python3: /home/buildroot/br2/output/per-package/kodi/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/python3.11 > (found suitable exact version "3.11.6") found components: Development Development.Module Development.Embed > -- Could NOT find Python3 (missing: Interpreter) > Reason given by package: > Interpreter: Cannot run the interpreter > "/home/buildroot/br2/output/per-package/kodi/host/x86_64-buildroot-linux-gnu/sysroot/usr/bin/python3" > > CMake Error at cmake/scripts/common/Macros.cmake:432 (message): > PYTHON enabled but not found > Call Stack (most recent call first): > CMakeLists.txt:214 (core_optional_dep) > > -- Configuring incomplete, errors occurred! > > Signed-off-by: Bernd Kuhls > --- > package/kodi/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Since when does kodi needs host-cmake >= 3.26 ? Indeed, we need to understand that so that we can understand if this patch needs to be backported to one of the LTS/stable branches. Could you check this, and submit an updated version that includes those details in the commit log. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 14:18:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:18:31 +0100 Subject: [Buildroot] [git commit] package/python-jsonschema: bump to version 4.20.0 Message-ID: <20240206141842.49D1B8708D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81b9842d2ad534e3e01b9efb2b353ab3ecc1e4f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-jsonschema/python-jsonschema.hash | 4 ++-- package/python-jsonschema/python-jsonschema.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jsonschema/python-jsonschema.hash b/package/python-jsonschema/python-jsonschema.hash index f421b8a48b..645a6657fe 100644 --- a/package/python-jsonschema/python-jsonschema.hash +++ b/package/python-jsonschema/python-jsonschema.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/jsonschema/json -md5 8bf5f0a2342dc4c8390c28a99be555e7 jsonschema-4.19.2.tar.gz -sha256 c9ff4d7447eed9592c23a12ccee508baf0dd0d59650615e847feb6cdca74f392 jsonschema-4.19.2.tar.gz +md5 e758f0f6a8f3f59d754e7e35ea9f0792 jsonschema-4.20.0.tar.gz +sha256 4f614fd46d8d61258610998997743ec5492a648b33cf478c1ddc23ed4598a5fa jsonschema-4.20.0.tar.gz # Locally computed sha256 checksums sha256 4f92a015a13c4d1a040bef018aa13430b4f1bc73b41b16bb846c346766de7439 COPYING sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a json/LICENSE diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index dee87e8f9d..512c92aa77 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JSONSCHEMA_VERSION = 4.19.2 +PYTHON_JSONSCHEMA_VERSION = 4.20.0 PYTHON_JSONSCHEMA_SOURCE = jsonschema-$(PYTHON_JSONSCHEMA_VERSION).tar.gz -PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/95/18/618159fb2efbe3fb2cd32b16c40278954cde94744957734ef0482286a052 +PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/a8/74/77bf12d3dd32b764692a71d4200f03429c41eee2e8a9225d344d91c03aff PYTHON_JSONSCHEMA_SETUP_TYPE = pep517 PYTHON_JSONSCHEMA_LICENSE = MIT PYTHON_JSONSCHEMA_LICENSE_FILES = COPYING json/LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 14:18:32 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:18:32 +0100 Subject: [Buildroot] [git commit] package/python-jsonschema-specifications: bump to version 2023.12.1 Message-ID: <20240206141842.5509F8708F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=008fabd150c68d55ac1b0d676607d243df97545e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-jsonschema-specifications.hash | 4 ++-- .../python-jsonschema-specifications.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.hash b/package/python-jsonschema-specifications/python-jsonschema-specifications.hash index 5aaba45210..aa919681ac 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.hash +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jsonschema-specifications/json -md5 d37762167688d8a05024b92dc8a1e20f jsonschema_specifications-2023.7.1.tar.gz -sha256 c91a50404e88a1f6ba40636778e2ee08f6e24c5613fe4c53ac24578a5a7f72bb jsonschema_specifications-2023.7.1.tar.gz +md5 de730f6937d1e3660a2d835c4f93f31b jsonschema_specifications-2023.12.1.tar.gz +sha256 48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc jsonschema_specifications-2023.12.1.tar.gz # Locally computed sha256 checksums sha256 42dcd63495f87b4eb7c7757afa379bb55a53f94afd7a5f657d9adf57236e515c COPYING diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 7a19eee423..40879898c9 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JSONSCHEMA_SPECIFICATIONS_VERSION = 2023.7.1 +PYTHON_JSONSCHEMA_SPECIFICATIONS_VERSION = 2023.12.1 PYTHON_JSONSCHEMA_SPECIFICATIONS_SOURCE = jsonschema_specifications-$(PYTHON_JSONSCHEMA_SPECIFICATIONS_VERSION).tar.gz -PYTHON_JSONSCHEMA_SPECIFICATIONS_SITE = https://files.pythonhosted.org/packages/12/ce/eb5396b34c28cbac19a6a8632f0e03d309135d77285536258b82120198d8 +PYTHON_JSONSCHEMA_SPECIFICATIONS_SITE = https://files.pythonhosted.org/packages/f8/b9/cc0cc592e7c195fb8a650c1d5990b10175cf13b4c97465c72ec841de9e4b PYTHON_JSONSCHEMA_SPECIFICATIONS_SETUP_TYPE = pep517 PYTHON_JSONSCHEMA_SPECIFICATIONS_LICENSE = MIT PYTHON_JSONSCHEMA_SPECIFICATIONS_LICENSE_FILES = COPYING From thomas.petazzoni at bootlin.com Tue Feb 6 14:18:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 15:18:30 +0100 Subject: [Buildroot] [git commit] package/python-lxml: bump to version 5.1.0 Message-ID: <20240206141842.3090C8708A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f9ba407d991e108ca40a2059f979ec731f505dc2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index e34cb193f4..a23cdcec9e 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # From https://pypi.org/project/lxml/ -sha256 48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c lxml-4.9.3.tar.gz +sha256 3eea6ed6e6c918e468e693c41ef07f3c3acc310b70ddd9cc72d9ef84bc9564ca lxml-5.1.0.tar.gz # Locally computed sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 3ef3aabdbc..519a9a77ac 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.9.3 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/30/39/7305428d1c4f28282a4f5bdbef24e0f905d351f34cf351ceb131f5cddf78 +PYTHON_LXML_VERSION = 5.1.0 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/2b/b4/bbccb250adbee490553b6a52712c46c20ea1ba533a643f1424b27ffc6845 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From giulio.benetti at benettiengineering.com Tue Feb 6 14:18:51 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 15:18:51 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/milkv_duo: new defconfig In-Reply-To: References: <20240206080603.28916-1-hanyuan-z@qq.com> Message-ID: Hi Hanyuan, On 06/02/24 09:06, Hanyuan Zhao wrote: > Milk-V Duo is an ultra-compact embedded RISC-V development platform based on the CV1800B chip. > It can run Linux and RTOS, providing a reliable, low-cost, and high-performance platform > for professionals, industrial ODMs, AIoT enthusiasts, DIY hobbyists, and creators. > > https://milkv.io/duo > > Co-authored-by: Emil S > Co-authored-by: GP Orcullo > Signed-off-by: Hanyuan Zhao > --- Here you definetely need to add that this patch depends on this patchset: https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 to work-around a gcc bug on htop package. After the 3 dashes above you should add changes between patch versions like: V1->V2: * changed this * changed that V2->V3: * change thee etc.. and I usually close with other 3 dashes --- > board/milkv/duo/genimage.cfg | 25 ++++++++ > board/milkv/duo/post-image.sh | 47 +++++++++++++++ > board/milkv/duo/readme.txt | 54 +++++++++++++++++ > configs/milkv_duo_musl_riscv64_defconfig | 63 ++++++++++++++++++++ > configs/milkv_duo_musl_riscv64_ion_defconfig | 63 ++++++++++++++++++++ > 5 files changed, 252 insertions(+) > create mode 100644 board/milkv/duo/genimage.cfg > create mode 100755 board/milkv/duo/post-image.sh > create mode 100644 board/milkv/duo/readme.txt > create mode 100644 configs/milkv_duo_musl_riscv64_defconfig > create mode 100644 configs/milkv_duo_musl_riscv64_ion_defconfig > > diff --git a/board/milkv/duo/genimage.cfg b/board/milkv/duo/genimage.cfg > new file mode 100644 > index 0000000000..1fd74f845a > --- /dev/null > +++ b/board/milkv/duo/genimage.cfg > @@ -0,0 +1,25 @@ > +image boot.vfat { > + vfat { > + files = { > + "fip.bin", > + "boot.sd", > + } > + } > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + } > +} > diff --git a/board/milkv/duo/post-image.sh b/board/milkv/duo/post-image.sh > new file mode 100755 > index 0000000000..c58233003e > --- /dev/null > +++ b/board/milkv/duo/post-image.sh > @@ -0,0 +1,47 @@ > +#!/bin/sh > + > +########################################################### > +# File: post-image.sh > +# Author: GP Orcullo > +# Hanyuan Zhao > +# Description: this sh will make the fip.bin and boot.sd, > +# then pack everything to an image file. > +########################################################### > + > +FIPTOOL_OPTS="genfip ${BINARIES_DIR}/fip.bin \ > + --MONITOR_RUNADDR=0x80000000 \ > + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ > + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ > + --NAND_INFO=00000000 \ > + --BL2=${BINARIES_DIR}/bl2.bin \ > + --BLCP_IMG_RUNADDR=0x05200200 \ > + --BLCP_PARAM_LOADADDR=0 \ > + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ > + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ > + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin" > + > +if [ -f ${BINARIES_DIR}/cvirtos.bin ]; then > + FIPTOOL_OPTS="${FIPTOOL_OPTS} \ > + --BLCP=${BINARIES_DIR}/empty.bin \ > + --BLCP_2ND=${BINARIES_DIR}/cvirtos.bin \ > + --BLCP_2ND_RUNADDR=0x83f40000" > + echo "[Duo Post-Image fiptool.py] Integrating FreeRTOS" > +fi > + > +${BINARIES_DIR}/fiptool.py ${FIPTOOL_OPTS}\ missing space before trailing '\', but maybe a Maintainer can apply while fixing this, > +> ${BINARIES_DIR}/fip.log 2>&1 > +if [ -f ${BINARIES_DIR}/fip.bin ]; then > + echo "[Duo Post-Image fiptool.py] > fip.bin generated!" > +fi > + > +cp ${BINARIES_DIR}/u-boot.dtb ${BINARIES_DIR}/cv1800b_milkv_duo_sd.dtb > +lzma -fk ${BINARIES_DIR}/Image > +mkimage -f ${BINARIES_DIR}/multi.its ${BINARIES_DIR}/boot.sd > +if [ -f ${BINARIES_DIR}/boot.sd ]; then > + echo "[Duo Post-Image] > boot.sd generated!" > +fi > +support/scripts/genimage.sh -c $(pwd)/board/milkv/duo/genimage.cfg > +gzip -fk ${BINARIES_DIR}/sdcard.img > +if [ -f ${BINARIES_DIR}/sdcard.img ]; then > + echo "[Duo Post-Image] > sdcard.img generated!" > +fi > diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt > new file mode 100644 > index 0000000000..1623fa97c5 > --- /dev/null > +++ b/board/milkv/duo/readme.txt > @@ -0,0 +1,54 @@ > +Milk-V Duo (https://milkv.io/docs/duo/overview) > + > +Intro > +===== > + > +Milk-V Duo is an ultra-compact embedded development platform > +based on the rv64 CV1800B chip. It can run Linux and RTOS, > +providing a reliable, cost-effective, and high-performance > +platform for professionals, industrial ODMs, AIoT enthusiasts, > +DIY enthusiasts, and creators. > + > +How to build it > +=============== > + > +Configure Buildroot: > + > + $ make milkv_duo_musl_riscv64_defconfig > + > +The milkv_duo_musl_riscv64_defconfig will by default provide > +the full 64MiB free RAM. If you want to build with memory > +reserved for ION (generalized memory manager in linux, i.e. > +some memory will be reserved for the camera algorithms), please try: > + > + $ make milkv_duo_musl_riscv64_ion_defconfig > + > +For more information about the ION, please refer to > + > +https://github.com/milkv-duo/duo-buildroot-sdk/blob/develop/README.md?plain=1#L436 > + > +Modify configuration if needed, e.g. add more packages to target: > + > + $ make menuconfig > + > +Compile everything and build the SD card image: > + > + $ make > + please drop from here... > +To configure the linux kernel or u-boot: > + > + $ make linux-menuconfig > + > +To rebuild something (e.g. linux): > + > + $ make linux-rebuild > + ...to here, since it's part of Buildroot manual and also you should point "linux-menuconfig and uboot-menuconfig", but it doesn't make sense to me, so yes please drop it, > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image > +called "sdcard.img" in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_musl_riscv64_defconfig > new file mode 100644 > index 0000000000..4155ad1f57 > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_defconfig > @@ -0,0 +1,63 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Using gcc13 and musl to have t-head's optimization and features Here I would expand comment by pointing that glibc is not suitable and why. It should be a gcc ICE, so maybe someone can fix or work it around later with this indication. > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_64mb" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > diff --git a/configs/milkv_duo_musl_riscv64_ion_defconfig b/configs/milkv_duo_musl_riscv64_ion_defconfig > new file mode 100644 > index 0000000000..7af0d9a44d > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_ion_defconfig > @@ -0,0 +1,63 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Using gcc13 and musl to have t-head's optimization and features Ditto, > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_ion" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y Except that it looks good to me so: Reviewed-by: Giulio Benetti [Build Tested only both defconfigs] Tested-by: Giulio Benetti Please keep my 2 tags above while send V4, thanks. Also please wait for me or someone else to review the other patch of the series before respinning. Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Tue Feb 6 14:21:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 15:21:10 +0100 Subject: [Buildroot] [PATCH] package/azure-iot-sdk-c: bump to version LTS_08_2023 In-Reply-To: <20240206112109.2175948-1-sergio.prado@e-labworks.com> (sergio prado's message of "Tue, 6 Feb 2024 08:21:09 -0300") References: <20240206112109.2175948-1-sergio.prado@e-labworks.com> Message-ID: <87o7ct7jxl.fsf@48ers.dk> >>>>> "sergio" == sergio prado writes: > From: Sergio Prado > Release notes: https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_08_2023 > Signed-off-by: Sergio Prado Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 14:21:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 15:21:29 +0100 Subject: [Buildroot] [git commit] package/azure-iot-sdk-c: bump to version LTS_08_2023 Message-ID: <20240206142202.E939287096@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=25c255ece8c171adeb86a4b905b72715b05c2bcf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/Azure/azure-iot-sdk-c/releases/tag/LTS_08_2023 Signed-off-by: Sergio Prado Signed-off-by: Peter Korsgaard --- package/azure-iot-sdk-c/azure-iot-sdk-c.hash | 2 +- package/azure-iot-sdk-c/azure-iot-sdk-c.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash index b960c0e571..d51dcc60aa 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.hash +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 7b52b9886a3aff20a55a0d5bc5e140c212f85fd06af18c31291c15d363743a77 azure-iot-sdk-c-LTS_01_2023_Ref02-br1.tar.gz +sha256 b853d5ab04f3c6863fe78e3936f0d0840012d5260ae4a3b23f03e157395dc15b azure-iot-sdk-c-LTS_08_2023-br1.tar.gz # Hash for license files: sha256 be2e9913fad9ff33607287c728f392579e2a6cc83e51b203ef6274c41db02ee7 LICENSE diff --git a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk index e07cdf986e..4d0ecb077f 100644 --- a/package/azure-iot-sdk-c/azure-iot-sdk-c.mk +++ b/package/azure-iot-sdk-c/azure-iot-sdk-c.mk @@ -4,7 +4,7 @@ # ################################################################################ -AZURE_IOT_SDK_C_VERSION = LTS_01_2023_Ref02 +AZURE_IOT_SDK_C_VERSION = LTS_08_2023 AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c AZURE_IOT_SDK_C_SITE_METHOD = git AZURE_IOT_SDK_C_GIT_SUBMODULES = YES From peter at korsgaard.com Tue Feb 6 14:25:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 15:25:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/tcf-agent: fix powerpc64 build In-Reply-To: <20240115212003.7847-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 15 Jan 2024 22:20:03 +0100") References: <20240115212003.7847-1-fontaine.fabrice@gmail.com> Message-ID: <87jznh7jr4.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Translation of ppc64 to powerpc has been removed since version 1.8.0 and > https://git.eclipse.org/c/tcf/org.eclipse.tcf.agent.git/commit/?id=94fa43963538afffc1fff77623cd1561a05d0e21 > resulting in the following build failure since commit > 81802e263a12e173e0e1028449d1e1e11b2e5974: > In file included from /home/buildroot/autobuild/instance-0/output-1/build/tcf-agent-1.8.0/agent/system/GNU/Linux/tcf/context-linux.c:58: > /home/buildroot/autobuild/instance-0/output-1/build/tcf-agent-1.8.0/agent/../agent/system/GNU/Linux/tcf/regset.h:25:10: fatal error: tcf/regset-mdep.h: No such file or directory > 25 | #include > | ^~~~~~~~~~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/821049a692d4a64fa45b73e8e18eb48c36d46e6b > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 14:24:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 15:24:08 +0100 Subject: [Buildroot] [git commit] package/tcf-agent: fix powerpc64 build Message-ID: <20240206142517.808748709D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2298ceb213e4ce858f048603c44113057766efcf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Translation of ppc64 to powerpc has been removed since version 1.8.0 and https://git.eclipse.org/c/tcf/org.eclipse.tcf.agent.git/commit/?id=94fa43963538afffc1fff77623cd1561a05d0e21 resulting in the following build failure since commit 81802e263a12e173e0e1028449d1e1e11b2e5974: In file included from /home/buildroot/autobuild/instance-0/output-1/build/tcf-agent-1.8.0/agent/system/GNU/Linux/tcf/context-linux.c:58: /home/buildroot/autobuild/instance-0/output-1/build/tcf-agent-1.8.0/agent/../agent/system/GNU/Linux/tcf/regset.h:25:10: fatal error: tcf/regset-mdep.h: No such file or directory 25 | #include | ^~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/821049a692d4a64fa45b73e8e18eb48c36d46e6b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tcf-agent/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcf-agent/Config.in b/package/tcf-agent/Config.in index 8c7aab0c0b..a016871e6d 100644 --- a/package/tcf-agent/Config.in +++ b/package/tcf-agent/Config.in @@ -27,8 +27,8 @@ config BR2_PACKAGE_TCF_AGENT_ARCH default "i686" if BR2_i386 && BR2_ARCH="i686" default "i386" if BR2_i386 && !BR2_ARCH="i686" default "x86_64" if BR2_x86_64 - default "powerpc" if BR2_powerpc - default "ppc64" if BR2_powerpc64 || BR2_powerpc64le + default "powerpc" if BR2_powerpc || BR2_powerpc64 || \ + BR2_powerpc64le default "microblaze" if BR2_microblaze || BR2_microblazeel config BR2_PACKAGE_TCF_AGENT_ARCH_SUPPORTS From arnout at mind.be Tue Feb 6 14:35:00 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 15:35:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/pkg-cargo: configure cargo profiles In-Reply-To: <20221021224448.3502942-1-james.hilliard1@gmail.com> References: <20221021224448.3502942-1-james.hilliard1@gmail.com> Message-ID: Hi James, There's really no reason why this should have taken more than a year, but finally I applied to master. On 22/10/2022 00:44, James Hilliard wrote: > The cargo profile flags currently only select a cargo build flag which > does not accurately reflect the configured build settings, setting the > cargo build flag also only works for packages using the cargo > infrastructure directly and not with other packages using the cargo > environment such as pyo3 based python packages(which indirectly invoke > cargo build via the setuptools-rust and maturn python build backends). I slightly rewrote the commit message to hopefully make it even clearer. > To ensure that cargo uses the correct profile settings for the build > we need to set env variables for the two root profiles(dev/release) > based on the buildroot build settings. > > For reference the default cargo root profile settings are: > https://doc.rust-lang.org/cargo/reference/profiles.html#default-profiles I checked this page, and there are three configs we are not setting at the moment: strip, panic and rpath. They default to the same value for dev and release, and those values look appropriate for Buildroot: - strip = "none" - OK because we strip in post-build. - panic = "unwind" - sounds OK to me - rpath = "false" - OK because all libs should be installed in /usr/lib. Ideally this should have been mentioned in the commit message as well. I didn't do that because I wasn't 100% sure of the above - so can the people in Cc of this mail check if it looks correct? Regards, Arnout > > As applications not using cargo infrastructure do not have a standard > way of configuring a specific build profile due to the selected > profile being determined by the cargo command line flags, the only > reliable way to configure profile settings is to set both root > profiles in the environment as this will ensure that they are used > regardless of which cargo build flag(such as --debug or --release) is > used. > > Cc: Moritz Bitsch > Signed-off-by: James Hilliard > --- > package/pkg-cargo.mk | 100 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 100 insertions(+) > > diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk > index f7e3f39503..4945770079 100644 > --- a/package/pkg-cargo.mk > +++ b/package/pkg-cargo.mk > @@ -46,6 +46,106 @@ PKG_CARGO_ENV = \ > CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ > CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc > > +# We always set both CARGO_PROFILE_DEV and CARGO_PROFILE_RELEASE > +# as we are unable to select a build profile using the environment. > +# > +# Other cargo profiles generally derive from these two profiles. > + > +# Disable incremental compilation to match release default. > +# > +# Set codegen-units to release default. > +# > +# Set split-debuginfo to default off for ELF platforms. > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_INCREMENTAL="false" \ > + CARGO_PROFILE_RELEASE_INCREMENTAL="false" \ > + CARGO_PROFILE_DEV_CODEGEN_UNITS="16" \ > + CARGO_PROFILE_RELEASE_CODEGEN_UNITS="16" \ > + CARGO_PROFILE_DEV_SPLIT_DEBUGINFO="off" \ > + CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO="off" > + > +# Set the optimization level with the release default as fallback. > +ifeq ($(BR2_OPTIMIZE_0),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="0" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="0" > +else ifeq ($(BR2_OPTIMIZE_1),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="1" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="1" > +else ifeq ($(BR2_OPTIMIZE_2),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="2" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="2" > +else ifeq ($(BR2_OPTIMIZE_3),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" > +else ifeq ($(BR2_OPTIMIZE_G),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="0" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="0" > +else ifeq ($(BR2_OPTIMIZE_S),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="s" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="s" > +else ifeq ($(BR2_OPTIMIZE_FAST),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" > +else > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ > + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" > +endif > + > +ifeq ($(BR2_ENABLE_LTO),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_LTO="true" \ > + CARGO_PROFILE_RELEASE_LTO="true" > +else > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_LTO="false" \ > + CARGO_PROFILE_RELEASE_LTO="false" > +endif > + > + > +ifeq ($(BR2_ENABLE_DEBUG),y) > +ifeq ($(BR2_DEBUG_3),y) > +# full debug info > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_DEBUG="2" \ > + CARGO_PROFILE_RELEASE_DEBUG="2" > +else > +# line tables only > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_DEBUG="1" \ > + CARGO_PROFILE_RELEASE_DEBUG="1" > +endif > +else > +# no debug info > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_DEBUG="0" \ > + CARGO_PROFILE_RELEASE_DEBUG="0" > +endif > + > +# Enabling debug-assertions enables the runtime debug_assert! macro. > +# > +# Enabling overflow-checks enables runtime panic on integer overflow. > +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_DEBUG_ASSERTIONS="true" \ > + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="true" \ > + CARGO_PROFILE_DEV_OVERFLOW_CHECKS="true" \ > + CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS="true" > +else > +PKG_CARGO_ENV += \ > + CARGO_PROFILE_DEV_DEBUG_ASSERTIONS="false" \ > + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="false" \ > + CARGO_PROFILE_DEV_OVERFLOW_CHECKS="false" \ > + CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS="false" > +endif > + > # > # This is a workaround for https://github.com/rust-lang/compiler-builtins/issues/420 > # and should be removed when fixed upstream From arnout at mind.be Tue Feb 6 14:35:04 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 15:35:04 +0100 Subject: [Buildroot] [git commit] package/pkg-cargo: configure cargo profiles Message-ID: <20240206143519.9F438870A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5b0094c1057ba9e38caa98067f695a87e67b5b1b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pkg-cargo currently sets the --release flag unless BR2_ENABLE_DEBUG is set. However, this does not accurately reflect the configured build settings. In addition, it only works for packages that use the cargo infrastructure directory and not with packages using the cargo environment indirectly, such as pyo3 based python packages. To support these, we really want to pass the necessary flags in PKG_CARGO_ENV. In order to accurately reflect the configured build settings (optimization and debug levels), we set the appropriate environment variables according to the global settings. There is no way to specify the profile to use through an environment variable, it has to be set through a cargo flag like --release. Since we can't easily control the profile flags used by non-cargo package infrastructures, we instead set the env variables for both root profiles (dev/release). For the aspects that are not affected by the global settings (incremental, codegen-units, split-debuginfo), we set them equal to the default for release - which in our context is the appropriate choice even when BR2_ENABLE_DEBUG is set. For reference the default cargo root profile settings are: https://doc.rust-lang.org/cargo/reference/profiles.html#default-profiles Cc: Moritz Bitsch Signed-off-by: James Hilliard Tested-by: Moritz Bitsch Tested-by: Adam Duskett Reviewed-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- package/pkg-cargo.mk | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 2c277f7079..47ce68bf02 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -53,6 +53,106 @@ PKG_CARGO_ENV = \ CARGO_HOST_RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \ CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc +# We always set both CARGO_PROFILE_DEV and CARGO_PROFILE_RELEASE +# as we are unable to select a build profile using the environment. +# +# Other cargo profiles generally derive from these two profiles. + +# Disable incremental compilation to match release default. +# +# Set codegen-units to release default. +# +# Set split-debuginfo to default off for ELF platforms. +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_INCREMENTAL="false" \ + CARGO_PROFILE_RELEASE_INCREMENTAL="false" \ + CARGO_PROFILE_DEV_CODEGEN_UNITS="16" \ + CARGO_PROFILE_RELEASE_CODEGEN_UNITS="16" \ + CARGO_PROFILE_DEV_SPLIT_DEBUGINFO="off" \ + CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO="off" + +# Set the optimization level with the release default as fallback. +ifeq ($(BR2_OPTIMIZE_0),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="0" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="0" +else ifeq ($(BR2_OPTIMIZE_1),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="1" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="1" +else ifeq ($(BR2_OPTIMIZE_2),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="2" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="2" +else ifeq ($(BR2_OPTIMIZE_3),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" +else ifeq ($(BR2_OPTIMIZE_G),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="0" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="0" +else ifeq ($(BR2_OPTIMIZE_S),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="s" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="s" +else ifeq ($(BR2_OPTIMIZE_FAST),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" +else +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_OPT_LEVEL="3" \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="3" +endif + +ifeq ($(BR2_ENABLE_LTO),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_LTO="true" \ + CARGO_PROFILE_RELEASE_LTO="true" +else +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_LTO="false" \ + CARGO_PROFILE_RELEASE_LTO="false" +endif + + +ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_DEBUG_3),y) +# full debug info +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_DEBUG="2" \ + CARGO_PROFILE_RELEASE_DEBUG="2" +else +# line tables only +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_DEBUG="1" \ + CARGO_PROFILE_RELEASE_DEBUG="1" +endif +else +# no debug info +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_DEBUG="0" \ + CARGO_PROFILE_RELEASE_DEBUG="0" +endif + +# Enabling debug-assertions enables the runtime debug_assert! macro. +# +# Enabling overflow-checks enables runtime panic on integer overflow. +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_DEBUG_ASSERTIONS="true" \ + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="true" \ + CARGO_PROFILE_DEV_OVERFLOW_CHECKS="true" \ + CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS="true" +else +PKG_CARGO_ENV += \ + CARGO_PROFILE_DEV_DEBUG_ASSERTIONS="false" \ + CARGO_PROFILE_RELEASE_DEBUG_ASSERTIONS="false" \ + CARGO_PROFILE_DEV_OVERFLOW_CHECKS="false" \ + CARGO_PROFILE_RELEASE_OVERFLOW_CHECKS="false" +endif + # # This is a workaround for https://github.com/rust-lang/compiler-builtins/issues/420 # and should be removed when fixed upstream From ismael at iodev.co.uk Tue Feb 6 14:40:12 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 15:40:12 +0100 Subject: [Buildroot] [RFC PATCH] docs/website: Add Makefile to pre-generate the website Message-ID: <20240206144030.18329-1-ismael@iodev.co.uk> Supports the current includes plus smu [0] lightweight markup. [0] https://github.com/Gottox/smu Signed-off-by: Ismael Luceno --- docs/website/Makefile | 33 +++++++++++++++++++++++++++++++++ docs/website/incfile.awk | 23 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 docs/website/Makefile create mode 100644 docs/website/incfile.awk diff --git a/docs/website/Makefile b/docs/website/Makefile new file mode 100644 index 000000000000..b0a56919c0e7 --- /dev/null +++ b/docs/website/Makefile @@ -0,0 +1,33 @@ +.PHONY: all +all: + +# Avoid implicit rules +MAKEFLAGS += -r + +AWK ?= mawk + +SRCDIR := ${CURDIR} +DEPLOYDIR := ${CURDIR}/out + +src-pages != find ${SRCDIR} -maxdepth 1 -name \*.html -o -name \*.smu +dst-pages := ${src-pages:${SRCDIR}/%=${DEPLOYDIR}/%} +dst-pages := ${dst-pages:.smu=.html} + +all: ${dst-pages} + +conf-files := ${MAKEFILE_LIST} +conf-files += $(wildcard ${HOME}/.tidyrc) +conf-files += ${SRCDIR}/incfile.awk + +${DEPLOYDIR}/%.html: ${SRCDIR}/%.html ${conf-files} + mkdir -p "${@D}" + tmpfile=$$(mktemp) && \ + ${AWK} -f incfile.awk $< > "$$tmpfile" && \ + { tidy -q -m -i "$$tmpfile"; :; } && \ + mv "$$tmpfile" $@ + +${DEPLOYDIR}/%.html: ${SRCDIR}/%.smu ${conf-files} + mkdir -p "${@D}" + tmpfile=$$(mktemp) && \ + smu < $< | ${AWK} -f incfile.awk | tidy -q -m > "$$tmpfile" && \ + mv "$$tmpfile" $@ diff --git a/docs/website/incfile.awk b/docs/website/incfile.awk new file mode 100644 index 000000000000..350a88e7b956 --- /dev/null +++ b/docs/website/incfile.awk @@ -0,0 +1,23 @@ +BEGIN { + FS="\"" +} + +{ + do { + if (match($0, /^$/)) { + file_stack[++file_cur] = $2 + } else { + print + } + if (file_cur) { + e = getline < file_stack[file_cur] + if (!e) { + --file_cur + } else if (e == -1) { + printf "%s: read error\n", \ + file_stack[file_cur] \ + > "/dev/stderr" + } + } + } while (file_cur) +} -- 2.43.0 From adam.duskett at amarulasolutions.com Tue Feb 6 14:42:08 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Tue, 6 Feb 2024 15:42:08 +0100 Subject: [Buildroot] dracut: no longer works since bump to 059 In-Reply-To: <977bc5e8-28c7-44b4-8651-9522d205aa59@linatsea.fr> References: <5d1e6b74-ed9c-48d7-abfc-9de470b04be0@linatsea.fr> <977bc5e8-28c7-44b4-8651-9522d205aa59@linatsea.fr> Message-ID: Hello again! I have internet again and am back from FOSDEM! On Sun, Feb 4, 2024 at 10:12?AM Thierry Bultel wrote: > Dear Adam, > > please see my comments below > > Le 03/02/2024 ? 13:55, Adam Duskett a ?crit : > > Hello Thierry; > > I am going to top-post to bother Yann. ;) > > Dracut support in Buildroot is very broken and must be patched to work > properly. > > Not so broken, before the dump to 059 ! I am pretty happy with it. > Bu I admit that the ramdisk I need does not have systemd at all, > so that in my case, dracut.conf basically consists in removing all systemd > modules. > I have no idea of how the current integration works with a aimed systemd > ramdisk. > > Yes, but it was broken in the sense that systemd doesn't work at all, which is usually why dracut is used. It provides several systemd services which are used in the initramfs. Having Dracut not work for systemd makes it very broken (in my opinion.) > I don't have time currently to submit patches, but I do have a working > Buildroot with a working Dracut > that you can find here: > https://gitlab.com/aduskett/buildroot/-/tree/dracut-fixups?ref_type=heads > > > I have read your patches and there are a couple of things that puzzle me. > > In the very first patch series I submitted about 2 years ago, > it worked this way: > > - new fs target, not just cpio variant > - usage of cross-ldd as recommended by dracut documentation > > But this was reviewed appropriately, and finally integrated as the version > we currently have (only the replacement of cross-ldd by rtls-prelink, IMHO, > buy I did not notice any issues from one to the other). > So I am afraid (despite of being rather agnostic) that your patches would > not be accepted > as such either, for the same reasons. > > Of course not, which is why I didn't submit them, and never will. Furthermmore, rtls-prelink has been removed from yocto. The only use for it was for gobject-introspection, and they now use objdump for that purpose. As such, it would be best to use a cross-ldd instead. > I notice some pieces in your patches, that we do need, indeed, > for instance the kernel config fixups, and the forced symlinks. > > It's only a few months old, but I have tested it, and it works quite well. > If you would like to port what I have > done to master, and then submit patches based on my work; by all means, > please do! > > Changes include: > > fs/ > - Remove all dracut references from fs/cpio/ > - Add fs/dracut/ > - Dracut needs to be it's own option in fs/ > - Add a dracut option to fs/initramfs/Config.in > - Add separate dracut and cpio options to fs/initramfs/initramfs.mk > - Add `source "fs/dracut/Config.in"` to fs/Config.in > > package/dracut: > - Add it as a target package, as there are several systemd files it > installs on the target. > This is a huge problem with the current dracut package in buildroot. > - Add linux kernel kconfig fixups > - Add options for bash > - Add systemd options > - Add a cross-ldd script (probably wouldn't be accepted into mainline, > but you can try!) > - dracut-install is broken and requires a wrapper, so I added one, > because of the ldd issue. > - Add 0002-ignore-ldd-127.patch > - Add 0003-force-symlink-making.patch > > package/linux/linux.mk: > - Add ifeq clauses for rootfs-cpio and rootfs-dracut > > I have made a diff for you to try here based on commit 5e4eba64 > https://pastebin.com/WShjbdYi > > However, be aware that the patch loses the functionality of defining a > dracut.conf file! > > > As long as producing a busybox-init based ramdisk still works ... > > Probably? It would be easy enough to wrap the dracut.mk logic into a ifeq block and re-add the dracut.conf menuconfig option that would overwrite all the automated logic. > > > Thanks so much! > > > Best regards > Thierry > > Adam > > On Thu, Feb 1, 2024 at 1:43?PM Thierry Bultel > wrote: > >> Hi, since bump to this version, >> >> invocation of 'ldd' wrapper fails in dracut-install. >> >> After analysis, this is because version uses "execlp" for launching the >> 'ldd' wrapper variable, >> which in out case consists in the executable name + the rootfs argument, >> leading to the fault. >> >> Version 057 used to call "popen" instead that what Ok with that. >> >> Thierry >> >> -- >> >> [image: www.linatsea.fr] >> -- >> www.linatsea.fr >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot >> > > -- > > > -- > www.linatsea.fr > -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: penguin.png Type: image/png Size: 60087 bytes Desc: not available URL: From yann.morin.1998 at free.fr Tue Feb 6 14:53:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 15:53:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: <1dd4afa6-e225-4e79-bb3a-21d0e04c7571@smile.fr> References: <20240111051726.2918732-1-james.hilliard1@gmail.com> <1dd4afa6-e225-4e79-bb3a-21d0e04c7571@smile.fr> Message-ID: Antoine, All, On 2024-02-06 15:09 +0100, Antoine Coutant spake thusly: > On 11/01/2024 06:17, James Hilliard wrote: > > Signed-off-by: James Hilliard [--SNIP--] > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > > +PYTHON_RPDS_PY_VERSION = 0.16.2 > rpds depends on the crate pyo3. This crate uses > "std::sync::atomic::AtomicI64" which doesn't exist for 32 bits > targets. That leads to an error [1]. I have been discussing this with Romain IRL, and he explained that the issue _already_ happenned with 0.12.0, so this is not a regression and thus reverting this patch will not fix the issue. Is that correct? Also, will std::sync::atomic::AtomicI64 ever be available for 32-bit targets? If not, would that be considered a bug in the std lib? > An issue have been opened on pyo3's github [2]. A fix have been accepted [3] > but it isn't in the last release. Thus, this version bump doesn't > fix this problem. > [1]: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854842 > [2]: https://github.com/PyO3/pyo3/issues/3614 > [3]: https://github.com/PyO3/pyo3/pull/3619 It is not going to be easy to carry this change as a patch in Buildroot: it would require that we be able to patch a package during the vendoring step. In this case, we'd need to do the vendoring (because we need the pyo3 crate to be downloaded), then apply the patch (with mangled paths) to add the new dependency, then restart the vendoring. In the generic case, we'd even need to be able to repeat the process in case that new dependency has to be patched and so on and so on... That's not going to be easy, by far... Meh... We can't even update to a random sha1 from the rpds git tree, because they do nit even have an update to switch to a newer (even if unreleased) pyo3. Meh, again... Not sure what to do... What about adding a dependency on BR2_ARCH_IS_64 to python-rpds-pym and propagate that to all its dependencies? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ismael at iodev.co.uk Tue Feb 6 14:53:50 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 15:53:50 +0100 Subject: [Buildroot] [RFC PATCH v2] docs/website: Add Makefile to pre-generate the website Message-ID: <20240206145353.19868-1-ismael@iodev.co.uk> Supports the current includes plus smu [0] lightweight markup. [0] https://github.com/Gottox/smu Signed-off-by: Ismael Luceno --- docs/website/Makefile | 33 +++++++++++++++++++++++++++++++++ docs/website/incfile.awk | 23 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 docs/website/Makefile create mode 100644 docs/website/incfile.awk diff --git a/docs/website/Makefile b/docs/website/Makefile new file mode 100644 index 000000000000..42069967f7ec --- /dev/null +++ b/docs/website/Makefile @@ -0,0 +1,33 @@ +.PHONY: all +all: + +# Avoid implicit rules +MAKEFLAGS += -r + +AWK ?= mawk + +SRCDIR := ${CURDIR} +DEPLOYDIR := ${CURDIR}/out + +src-pages != find ${SRCDIR} -maxdepth 1 -name \*.html -o -name \*.smu +dst-pages := ${src-pages:${SRCDIR}/%=${DEPLOYDIR}/%} +dst-pages := ${dst-pages:.smu=.html} + +all: ${dst-pages} + +conf-files := ${MAKEFILE_LIST} +conf-files += $(wildcard ${HOME}/.tidyrc) +conf-files += ${SRCDIR}/incfile.awk + +${DEPLOYDIR}/%.html: ${SRCDIR}/%.html ${conf-files} + mkdir -p "${@D}" + tmpfile=$$(mktemp) && \ + ${AWK} -f incfile.awk $< > "$$tmpfile" && \ + { tidy -q -m -i "$$tmpfile"; :; } && \ + mv "$$tmpfile" $@ + +${DEPLOYDIR}/%.html: ${SRCDIR}/%.smu ${conf-files} + mkdir -p "${@D}" + tmpfile=$$(mktemp) && \ + ${AWK} -f incfile.awk $< | smu | tidy -q -m > "$$tmpfile" && \ + mv "$$tmpfile" $@ diff --git a/docs/website/incfile.awk b/docs/website/incfile.awk new file mode 100644 index 000000000000..350a88e7b956 --- /dev/null +++ b/docs/website/incfile.awk @@ -0,0 +1,23 @@ +BEGIN { + FS="\"" +} + +{ + do { + if (match($0, /^$/)) { + file_stack[++file_cur] = $2 + } else { + print + } + if (file_cur) { + e = getline < file_stack[file_cur] + if (!e) { + --file_cur + } else if (e == -1) { + printf "%s: read error\n", \ + file_stack[file_cur] \ + > "/dev/stderr" + } + } + } while (file_cur) +} -- 2.43.0 From giulio.benetti at benettiengineering.com Tue Feb 6 15:02:41 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 16:02:41 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/milkv-duo: add packages for milkv-duo In-Reply-To: References: Message-ID: <987c773c-fb81-4d09-afab-6657773ce26b@benettiengineering.com> Hi Hanyuan, please split this patch into 2 separate patches, one per package: - milkv-duo-libraries - milkv-duo-smallcore-freertos On 06/02/24 09:06, Hanyuan Zhao via buildroot wrote: > This commit adds the packages that are necessary for milkv-duo image's > generating and configurations. > > https://github.com/milkv-duo/duo-buildroot-sdk/ This ^^^ should be part of a cover letter and instead per package you should point what the package does > > Co-authored-by: Emil S > Signed-off-by: Hanyuan Zhao > --- > package/Config.in | 2 + > package/milkv-duo-libraries/Config.in | 63 ++++++++++ > .../milkv-duo-libraries.mk | 51 +++++++++ > .../milkv-duo-smallcore-freertos/Config.in | 21 ++++ > .../milkv-duo-smallcore-freertos.mk | 108 ++++++++++++++++++ > 5 files changed, 245 insertions(+) > create mode 100644 package/milkv-duo-libraries/Config.in > create mode 100644 package/milkv-duo-libraries/milkv-duo-libraries.mk > create mode 100644 package/milkv-duo-smallcore-freertos/Config.in > create mode 100644 package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > > diff --git a/package/Config.in b/package/Config.in > index 7fc383da83..2c560377b4 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -564,6 +564,8 @@ endmenu > source "package/memtester/Config.in" > source "package/memtool/Config.in" > source "package/mhz/Config.in" > + source "package/milkv-duo-libraries/Config.in" > + source "package/milkv-duo-smallcore-freertos/Config.in" > source "package/minicom/Config.in" > source "package/msr-tools/Config.in" > source "package/nanocom/Config.in" > diff --git a/package/milkv-duo-libraries/Config.in b/package/milkv-duo-libraries/Config.in > new file mode 100644 > index 0000000000..ea4d0aadac > --- /dev/null > +++ b/package/milkv-duo-libraries/Config.in > @@ -0,0 +1,63 @@ > +config BR2_PACKAGE_MILKV_DUO_LIBRARIES > + bool "milk-v duo libraries" > + depends on BR2_riscv > + help > + Those packages provide board-specific firmware and > + hardware tools for the Milk-V Duo platform. What about: ` Package providing board-specific firmware and hardware tools for Milk-V Duo platform. ` > + > + https://github.com/milkv-duo/milkv-duo-buildroot-libraries > + > +if BR2_PACKAGE_MILKV_DUO_LIBRARIES > + > +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + bool "milkv-duo-firmware-fsbl" > + select BR2_PACKAGE_HOST_MTOOLS > + help > + This package is obtained from > + https://github.com/milkv-duo/duo-buildroot-sdk, > + from which we download the first stage bootloader source and > + compile it, generating the ATF bl2.bin. At the mean time, we > + will use the fiptool.py in this package to create the binary > + file fip.bin to pack the opensbi, u-boot and so on. > + > + If you intend to generate the whole sdcard image or the > + fip.bin for milk-v duo, you must say Y to this package! > + > +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB > + bool "64 MiB free ram" > + default n > + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + help > + Say Y to this will disable the ION in order to > + have the all 64MiB Free memory. Please add ...the ION(Camera Memory) in order... This ^^^ is my understanding at least, of what ION is, > + > +config BR2_PACKAGE_MILKV_DUO_PINMUX > + bool "duo-pinmux tool" > + default n > + help > + Say Y to this will compile the duo-pinmux, which can > + get or set function of any Milk-V Duo GPIO Pin. More info at > + > + https://milkv.io/docs/duo/application-development/pinmux > + > +config BR2_PACKAGE_MILKV_DUO_FEATURES > + bool "duo usb features" > + default n > + select BR2_PACKAGE_DHCPCD > + select BR2_PACKAGE_DNSMASQ > + select BR2_PACKAGE_DROPBEAR > + select BR2_PACKAGE_LRZSZ > + select BR2_PACKAGE_HTOP > + help > + Say Y to this will copy the cvitek usb shell scripts to have > + the USB features. The role could be configured at > + > + /etc/milkv-duo.conf > + > + Supported usb functions are rndis, host and mass-storage. > + By default Duo has the LED blinking. It could be configured > + in that conf file as well. Say Y to this will also select > + some packages automatically, to have the same experience > + with the official release. > + > +endif > diff --git a/package/milkv-duo-libraries/milkv-duo-libraries.mk b/package/milkv-duo-libraries/milkv-duo-libraries.mk > new file mode 100644 > index 0000000000..a5cf40a764 > --- /dev/null > +++ b/package/milkv-duo-libraries/milkv-duo-libraries.mk > @@ -0,0 +1,51 @@ > +################################################################################ > +# > +# milkv-duo-libraries > +# > +################################################################################ > + > +MILKV_DUO_LIBRARIES_VERSION = f359994bd497f942bb67734280d81f6640c7c168 > +MILKV_DUO_LIBRARIES_SITE = $(call github,milkv-duo,milkv-duo-buildroot-libraries,$(MILKV_DUO_LIBRARIES_VERSION)) > +MILKV_DUO_LIBRARIES_INSTALL_STAGING = YES > +MILKV_DUO_LIBRARIES_DEPENDENCIES = host-python3 host-mtools > +MILKV_DUO_LIBRARIES_FSBL_64MB = ION > + > +ifeq ($(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB),y) > +MILKV_DUO_LIBRARIES_FSBL_64MB = 64MB > +endif > + > +define MILKV_DUO_LIBRARIES_BUILD_CMDS > + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ > + $(MAKE) -C $(@D)/firmware \ > + ARCH=riscv BOOT_CPU=riscv CHIP_ARCH=cv180x \ > + PROJECT_FULLNAME=cv1800b_milkv_duo_sd \ > + CROSS_COMPILE=$(TARGET_CROSS) \ > + FREE_RAM_SIZE=$(MILKV_DUO_LIBRARIES_FSBL_64MB) \ > + bl2; \ > + fi Please for all occurences use Makefile "$(if ...)" statement instead of "if [ ... = y ]" > + > + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ > + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ > + -I $(@D)/pinmux/include $(@D)/pinmux/src/*.c -o $(@D)/pinmux/duo-pinmux; \ > + fi > +endef > + > +define MILKV_DUO_LIBRARIES_INSTALL_STAGING_CMDS > + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/build/cv180x/bl2.bin $(BINARIES_DIR)/bl2.bin; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/chip_conf.bin $(BINARIES_DIR)/chip_conf.bin; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/fiptool.py $(BINARIES_DIR)/fiptool.py; \ > + $(INSTALL) -D -m 0644 $(@D)/firmware/plat/cv180x/multi.its $(BINARIES_DIR)/multi.its; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/test/cv181x/ddr_param.bin $(BINARIES_DIR)/ddr_param.bin; \ > + fi > + > + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ > + $(INSTALL) -D -m 0755 $(@D)/pinmux/duo-pinmux $(TARGET_DIR)/usr/bin/; \ > + fi > + > + if [ $(BR2_PACKAGE_MILKV_DUO_FEATURES) = y ]; then \ > + cp $(@D)/overlay/* -r $(TARGET_DIR); \ > + fi > +endef > + > +$(eval $(generic-package)) > diff --git a/package/milkv-duo-smallcore-freertos/Config.in b/package/milkv-duo-smallcore-freertos/Config.in > new file mode 100644 > index 0000000000..8503932461 > --- /dev/null > +++ b/package/milkv-duo-smallcore-freertos/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS > + bool "milkv-duo-smallcore-freertos" > + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + select BR2_PACKAGE_HOST_CMAKE > + help > + This package is obtained from > + https://github.com/milkv-duo/duo-buildroot-sdk, > + from which we download the FreeRTOS ported to Milk-V Duo > + into the Buildroot. This FreeRTOS will run in the small core > + and will not do anything because it is simply a template > + with some basic UART demos. You can realize your own ideas > + by adding code to > + > + output/build/milkv-duo-smallcore-freertos-hash/cvitek/task > + /comm/src/riscv64/comm_main.c > + > + If you say Y, then every time you make Buildroot, it will > + automatically compile and include the FreeRTOS into the > + fip.bin, which will then be packed into sdcard.img > + > + https://github.com/milkv-duo/milkv-duo-smallcore-freertos > diff --git a/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > new file mode 100644 > index 0000000000..52028f3c90 > --- /dev/null > +++ b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > @@ -0,0 +1,108 @@ > +################################################################################ > +# > +# milkv-duo-smallcore-freertos > +# > +################################################################################ > + > +MILKV_DUO_SMALLCORE_FREERTOS_VERSION = 1dac21ade58b0f9a0a531cfe93ee319337a88d80 > +MILKV_DUO_SMALLCORE_FREERTOS_SITE = $(call github,milkv-duo,milkv-duo-smallcore-freertos,$(MILKV_DUO_SMALLCORE_FREERTOS_VERSION)) > +MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING = YES > +MILKV_DUO_SMALLCORE_FREERTOS_DEPENDENCIES = host-cmake host-ninja > +MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV = CROSS_COMPILE=$(TARGET_CROSS) > + > +define MILKV_DUO_SMALLCORE_FREERTOS_BUILD_CMDS > + if [ ! -d $(@D)/cvitek/build/arch ]; then \ > + mkdir -p $(@D)/cvitek/build/arch; \ > + fi mkdir -p will create new folder if it's not already there, so no need to check for $(@D)/cvitek/build/arch > + > + cd $(@D)/cvitek/build/arch && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DRUN_TYPE=CVIRTOS \ > + -DRUN_ARCH=riscv64 \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > + $(@D)/cvitek/arch > + cd $(@D)/cvitek/build/arch && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + > + if [ ! -d $(@D)/cvitek/build/kernel ]; then \ > + mkdir -p $(@D)/cvitek/build/kernel; \ > + fi Ditto > + > + cd $(@D)/cvitek/build/kernel && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DRUN_ARCH=riscv64 \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > + $(@D)/cvitek/kernel > + cd $(@D)/cvitek/build/kernel && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + > + if [ ! -d $(@D)/cvitek/build/common ]; then \ > + mkdir -p $(@D)/cvitek/build/common; \ > + fi Ditto > + > + cd $(@D)/cvitek/build/common && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DRUN_ARCH=riscv64 \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > + $(@D)/cvitek/common > + cd $(@D)/cvitek/build/common && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + > + if [ ! -d $(@D)/cvitek/build/hal ]; then \ > + mkdir -p $(@D)/cvitek/build/hal; \ > + fi Ditto > + > + cd $(@D)/cvitek/build/hal && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DRUN_ARCH=riscv64 \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DRUN_TYPE=CVIRTOS \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > + -DBOARD_FPGA=n \ > + $(@D)/cvitek/hal/cv180x > + cd $(@D)/cvitek/build/hal && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + > + if [ ! -d $(@D)/cvitek/build/driver ]; then \ > + mkdir -p $(@D)/cvitek/build/driver; \ > + fi Ditto > + > + cd $(@D)/cvitek/build/driver && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DRUN_ARCH=riscv64 \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DRUN_TYPE=CVIRTOS \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DBOARD_FPGA=n \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > + $(@D)/cvitek/driver > + cd $(@D)/cvitek/build/driver && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + > + if [ ! -d $(@D)/cvitek/build/task ]; then \ > + mkdir -p $(@D)/cvitek/build/task; \ > + fi Ditto > + > + cd $(@D)/cvitek/build/task && \ > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > + -DRUN_ARCH=riscv64 \ > + -DRUN_TYPE=CVIRTOS \ > + -DTOP_DIR=$(@D)/cvitek \ > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > + -DBOARD_FPGA=n \ > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ The build command is common for every "target", so please declare it into a variable on the top. > + $(@D)/cvitek/task > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target cvirtos.bin -- -v To tell the truth all the points above can be shrinked using a foreach loop through all the build directories since they all look the same except directory name. Can you provide such change? > +endef > + > +define MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING_CMDS > + $(INSTALL) -D -m 0755 $(@D)/cvitek/install/bin/cvirtos.bin $(BINARIES_DIR)/cvirtos.bin > + if [ ! -e $(BINARIES_DIR)/empty.bin ]; then \ > + touch $(BINARIES_DIR)/empty.bin; \ > + fi if you touch an empy file again it recreates an empty file again, so you can remove the if check. > +endef > + > +$(eval $(generic-package)) Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From ismael at iodev.co.uk Tue Feb 6 15:04:24 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 16:04:24 +0100 Subject: [Buildroot] [RFC PATCH v2] docs/website: Add Makefile to pre-generate the website In-Reply-To: <20240206145353.19868-1-ismael@iodev.co.uk> References: <20240206145353.19868-1-ismael@iodev.co.uk> Message-ID: On 06/Feb/2024 15:53, Ismael Luceno wrote: > Supports the current includes plus smu [0] lightweight markup. > > [0] https://github.com/Gottox/smu > Signed-off-by: Ismael Luceno Changes from v1: - Processes includes before passing through smu - Still imperfect because smu mangles many html tags To do: - Maybe special-case html header and footer for smu files. From peter at korsgaard.com Tue Feb 6 15:07:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 16:07:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-django: bump to version 5.0.1 In-Reply-To: <20240206112714.7beb00e5@windsurf> (Thomas Petazzoni via buildroot's message of "Tue, 6 Feb 2024 11:27:14 +0100") References: <20240109070626.4019996-1-james.hilliard1@gmail.com> <20240206112714.7beb00e5@windsurf> Message-ID: <87cyt97hs9.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Tue, 9 Jan 2024 00:06:26 -0700 > James Hilliard wrote: >> Signed-off-by: James Hilliard >> --- >> package/python-django/python-django.hash | 4 ++-- >> package/python-django/python-django.mk | 4 ++-- >> 2 files changed, 4 insertions(+), 4 deletions(-) > Applied to master, thanks. Notice that django-5.0.x is not a LTS, but given that it goes out of extended support in April 2025 it is probably OK. See (bottow of) https://www.djangoproject.com/download/ -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Tue Feb 6 15:08:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 16:08:39 +0100 Subject: [Buildroot] [RFC PATCH] docs/website: Add Makefile to pre-generate the website In-Reply-To: <20240206144030.18329-1-ismael@iodev.co.uk> References: <20240206144030.18329-1-ismael@iodev.co.uk> Message-ID: Ismael, All, On 2024-02-06 15:40 +0100, Ismael Luceno spake thusly: > Supports the current includes plus smu [0] lightweight markup. > > [0] https://github.com/Gottox/smu > Signed-off-by: Ismael Luceno > --- [--SNIP--] > diff --git a/docs/website/Makefile b/docs/website/Makefile > new file mode 100644 > index 000000000000..b0a56919c0e7 > --- /dev/null > +++ b/docs/website/Makefile > @@ -0,0 +1,33 @@ > +.PHONY: all > +all: > + > +# Avoid implicit rules > +MAKEFLAGS += -r > + > +AWK ?= mawk Make that gawk, so that we can do [0] (see below) > +SRCDIR := ${CURDIR} Use parentheses not curly braces, to expand variables in Makefiles, like we do everyelse in Buildroot: $(..) (yes, both are valid, but lets be consistent throughout our code base) > +DEPLOYDIR := ${CURDIR}/out > + > +src-pages != find ${SRCDIR} -maxdepth 1 -name \*.html -o -name \*.smu > +dst-pages := ${src-pages:${SRCDIR}/%=${DEPLOYDIR}/%} > +dst-pages := ${dst-pages:.smu=.html} > + > +all: ${dst-pages} > + > +conf-files := ${MAKEFILE_LIST} > +conf-files += $(wildcard ${HOME}/.tidyrc) > +conf-files += ${SRCDIR}/incfile.awk > + > +${DEPLOYDIR}/%.html: ${SRCDIR}/%.html ${conf-files} > + mkdir -p "${@D}" > + tmpfile=$$(mktemp) && \ > + ${AWK} -f incfile.awk $< > "$$tmpfile" && \ > + { tidy -q -m -i "$$tmpfile"; :; } && \ > + mv "$$tmpfile" $@ > + > +${DEPLOYDIR}/%.html: ${SRCDIR}/%.smu ${conf-files} > + mkdir -p "${@D}" > + tmpfile=$$(mktemp) && \ > + smu < $< | ${AWK} -f incfile.awk | tidy -q -m > "$$tmpfile" && \ What is the rationale for using smu and tidy to do the deployement? We don't need/want to minimify the content... > + mv "$$tmpfile" $@ > diff --git a/docs/website/incfile.awk b/docs/website/incfile.awk > new file mode 100644 > index 000000000000..350a88e7b956 > --- /dev/null > +++ b/docs/website/incfile.awk > @@ -0,0 +1,23 @@ > +BEGIN { > + FS="\"" > +} > + > +{ > + do { > + if (match($0, /^$/)) { > + file_stack[++file_cur] = $2 > + } else { > + print > + } > + if (file_cur) { > + e = getline < file_stack[file_cur] > + if (!e) { > + --file_cur > + } else if (e == -1) { > + printf "%s: read error\n", \ > + file_stack[file_cur] \ > + > "/dev/stderr" [0] In case of error, we do want to exit in error and be sure this is caught at the Makefile level; by using gawk, you can call: exit 42 Regards, Yann E. MORIN. > + } > + } > + } while (file_cur) > +} > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 15:10:52 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 16:10:52 +0100 Subject: [Buildroot] [RFC PATCH v2] docs/website: Add Makefile to pre-generate the website In-Reply-To: <20240206145353.19868-1-ismael@iodev.co.uk> References: <20240206145353.19868-1-ismael@iodev.co.uk> Message-ID: Ismael, All, I'll do the rest of my review in this new iteration! ;-) On 2024-02-06 15:53 +0100, Ismael Luceno spake thusly: [--SNIP--] > +${DEPLOYDIR}/%.html: ${SRCDIR}/%.smu ${conf-files} > + mkdir -p "${@D}" > + tmpfile=$$(mktemp) && \ > + ${AWK} -f incfile.awk $< | smu | tidy -q -m > "$$tmpfile" && \ Don't use pipes, otherwise we can't catch the failure of any intermediate command. For example, if we can get the awk script to properly fail in case of error, using pipes will not allow the Makefile to catch issues. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Tue Feb 6 15:11:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:11:52 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/attr: affected by gcc bug 101766 In-Reply-To: <20240116065831.9471-2-fontaine.fabrice@gmail.com> References: <20240116065831.9471-1-fontaine.fabrice@gmail.com> <20240116065831.9471-2-fontaine.fabrice@gmail.com> Message-ID: <20240206161152.0e178414@windsurf> Hello Fabrice, On Tue, 16 Jan 2024 07:58:31 +0100 Fabrice Fontaine wrote: > attr is affected by gcc bug 101766 since version 1.5.2 and > https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=11b9069098b4d4c23efb06c9457a085b784354d4 > resulting in the following build failure on microblaze since commit > b31b91296e7f985b909f104f06a098adddef1fea: > > libattr/syscalls.c:133:10: error: symver is only supported on ELF platforms > 133 | # pragma GCC visibility pop > | ^~~ > > So let's disable package attr and packages depending on it. > > Fixes: > - http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a > > Reviewed-by: Giulio Benetti > Signed-off-by: Fabrice Fontaine I don't like this very much. It's annoying to propagate this dependency to all reverse dependencies of attr, and make it unavailable on Microblaze for this silly reason. So I came up with the attached patch for attr, which rather detects if __attribute__(__symver__) works or not, and fall backs to another mechanism if not (this fallback already exists in the attr code). Could you have a look at my proposal, and if it suits you, submit it upstream and as a patch to Buildroot ? :-) (Yeah, I know I'm pushing some of the work for you, my goal is to be able to continue review/merge other patches) Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-configure.ac-add-detection-of-symver-gcc-attribute.patch Type: text/x-patch Size: 1669 bytes Desc: not available URL: From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:01 +0100 Subject: [Buildroot] [git commit] package/python-pydantic: bump to version 2.5.3 Message-ID: <20240206151815.B9408870F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=afbca9230889bc6bbed4d8f9559a8d00cb864461 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pydantic/python-pydantic.hash | 4 ++-- package/python-pydantic/python-pydantic.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index 0848debc1c..75ecb23053 100644 --- a/package/python-pydantic/python-pydantic.hash +++ b/package/python-pydantic/python-pydantic.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydantic/json -md5 348281a5a27eb5253c7a83927aae64e1 pydantic-2.5.2.tar.gz -sha256 ff177ba64c6faf73d7afa2e8cad38fd456c0dbe01c9954e71038001cd15a6edd pydantic-2.5.2.tar.gz +md5 4651fb3374d2a0d74442c2cc780770d0 pydantic-2.5.3.tar.gz +sha256 b3ef57c62535b0941697cce638c08900d87fcb67e29cfa99e8a68f747f393f7a pydantic-2.5.3.tar.gz # Locally computed sha256 checksums sha256 a9e186f3ca16b5eef84318e7a701721351a00cb7b8ae3a4394b67b49e3529ef3 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index b5bb7ff853..7ad7abeb8d 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 2.5.2 +PYTHON_PYDANTIC_VERSION = 2.5.3 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/b7/41/3c8108f79fb7da2d2b17f35744232af4ffcd9e764ebe1e3fd4b26669b325 +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/aa/3f/56142232152145ecbee663d70a19a45d078180633321efb3847d2562b490 PYTHON_PYDANTIC_SETUP_TYPE = pep517 PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:00 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:00 +0100 Subject: [Buildroot] [git commit] package/python-pycryptodomex: bump to version 3.19.1 Message-ID: <20240206151815.A4570870EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a582e9e19c27fc30317e5b4054482af9daab4d4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 2b74e03e76..10447fd800 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.hash +++ b/package/python-pycryptodomex/python-pycryptodomex.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycryptodomex/json -md5 0dc96e1ffb42c955d89c2ce3f3875c9c pycryptodomex-3.19.0.tar.gz -sha256 af83a554b3f077564229865c45af0791be008ac6469ef0098152139e6bd4b5b6 pycryptodomex-3.19.0.tar.gz +md5 db8f8d516e0229f503dd111ac4de177f pycryptodomex-3.19.1.tar.gz +sha256 0b7154aff2272962355f8941fd514104a88cb29db2d8f43a29af900d6398eb1c pycryptodomex-3.19.1.tar.gz # Locally computed sha256 checksums sha256 4e04660d77c1c64e89d79537919fb8240fa21484a7e3db29f358b2c7f84ea073 LICENSE.rst sha256 8e563c767164faa0831a333b57d23d4311cf566eb1b15d93250f4606be4eb549 Doc/LEGAL/COPYRIGHT.pycrypto diff --git a/package/python-pycryptodomex/python-pycryptodomex.mk b/package/python-pycryptodomex/python-pycryptodomex.mk index bfb6acf7ba..d969e600a3 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.19.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.19.1 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/14/c9/09d5df04c9f29ae1b49d0e34c9934646b53bb2131a55e8ed2a0d447c7c53 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/3f/13/84f2aea851d75e12e7f32ccc11a00f1defc3d285b4ed710e5d049f31c5a6 PYTHON_PYCRYPTODOMEX_SETUP_TYPE = setuptools PYTHON_PYCRYPTODOMEX_LICENSE = \ BSD-2-Clause, \ From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:02 +0100 Subject: [Buildroot] [git commit] package/python-pyftpdlib: bump to version 1.5.9 Message-ID: <20240206151815.C296A870F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc68e20d8525408389866b15f492e9911f92cbe8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pyftpdlib/python-pyftpdlib.hash | 4 ++-- package/python-pyftpdlib/python-pyftpdlib.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyftpdlib/python-pyftpdlib.hash b/package/python-pyftpdlib/python-pyftpdlib.hash index 46b5ae6336..7b5dabdfdc 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.hash +++ b/package/python-pyftpdlib/python-pyftpdlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyftpdlib/json -md5 6d9539aea866d4f959d86ae001cdddf7 pyftpdlib-1.5.7.tar.gz -sha256 7ea3ce4137db8209af1f6b9ea020590f462c63ed7c7a1240bd596e4d3a7b656e pyftpdlib-1.5.7.tar.gz +md5 cb32bca52ba0d4850a92513154c253e1 pyftpdlib-1.5.9.tar.gz +sha256 323d4c42f1406aedb4df18faf680f64f32c080ff66f6c26090ba592f5bfc4a0f pyftpdlib-1.5.9.tar.gz # Locally computed sha256 checksums sha256 67a832551570a5ac5f7901eaa5ece4b9491fda7f2d8c93957c3bbc68a5a76d88 LICENSE diff --git a/package/python-pyftpdlib/python-pyftpdlib.mk b/package/python-pyftpdlib/python-pyftpdlib.mk index bd1ada8125..da101083b6 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 1.5.7 +PYTHON_PYFTPDLIB_VERSION = 1.5.9 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/2f/bc/f03a15bf807698bbecdcf316041e3d79b25a40fa7b6e071e17702ff7b9d4 +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/47/9f/5dc055ab2db58db561f72b1b2f18b1dafc025f2ac5dd842c40259c17195e PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:04 +0100 Subject: [Buildroot] [git commit] package/python-pyicu: bump to version 2.12 Message-ID: <20240206151815.DF295870F0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=17c6737d5eb659f4708338aeb147eb304d3083ba branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pyicu/python-pyicu.hash | 4 ++-- package/python-pyicu/python-pyicu.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyicu/python-pyicu.hash b/package/python-pyicu/python-pyicu.hash index 395d2fe47b..01d4bf7fdf 100644 --- a/package/python-pyicu/python-pyicu.hash +++ b/package/python-pyicu/python-pyicu.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyicu/json -md5 f13ffa91014efde6962c4c1ed6ee7a3c PyICU-2.11.tar.gz -sha256 3ab531264cfe9132b3d2ac5d708da9a4649d25f6e6813730ac88cf040a08a844 PyICU-2.11.tar.gz +md5 a4411ff1ed8a09e3e9c1d0d02dc89ad8 PyICU-2.12.tar.gz +sha256 bd7ab5efa93ad692e6daa29cd249364e521218329221726a113ca3cb281c8611 PyICU-2.12.tar.gz # Locally computed sha256 checksums sha256 00da5bf22f2386c4f6f07c734490e9b818c4dcf70e6ca49f594e9cec636b9c40 LICENSE diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk index 213c099d07..50962f601e 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYICU_VERSION = 2.11 +PYTHON_PYICU_VERSION = 2.12 PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz -PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/03/1b/800fce0236be0b8a99b3ccbb797786dd178028960b3fd65544e2d8bad5ac +PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/c8/25/38a2104fd48373cfd4eac5104f104ef486f61527e48d627de74794354a2c PYTHON_PYICU_LICENSE = MIT PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:03 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:03 +0100 Subject: [Buildroot] [git commit] package/python-pygments: bump to version 2.17.2 Message-ID: <20240206151815.CB8B5870F5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d7b0259e21335c8da8566a581ef84d785d5a861 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools to hatchling pep517 build backend. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pygments/python-pygments.hash | 4 ++-- package/python-pygments/python-pygments.mk | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index 9714fd2ea0..a742a05e52 100644 --- a/package/python-pygments/python-pygments.hash +++ b/package/python-pygments/python-pygments.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pygments/json -md5 e40631bb812bbd15954027c23b23013a Pygments-2.15.1.tar.gz -sha256 8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c Pygments-2.15.1.tar.gz +md5 7c059773b0f4808f9402eb0650de6bd4 pygments-2.17.2.tar.gz +sha256 da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367 pygments-2.17.2.tar.gz # Locally computed sha256 checksums sha256 a9d66f1d526df02e29dce73436d34e56e8632f46c275bbdffc70569e882f9f17 LICENSE diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index f151f0061b..e42f613cf1 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,13 +4,14 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.15.1 -PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/89/6b/2114e54b290824197006e41be3f9bbe1a26e9c39d1f5fa20a6d62945a0b3 +PYTHON_PYGMENTS_VERSION = 2.17.2 +PYTHON_PYGMENTS_SOURCE = pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/55/59/8bccf4157baf25e4aa5a0bb7fa3ba8600907de105ebc22b0c78cfbf6f565 PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments PYTHON_PYGMENTS_CPE_ID_PRODUCT = pygments -PYTHON_PYGMENTS_SETUP_TYPE = setuptools +PYTHON_PYGMENTS_SETUP_TYPE = pep517 +PYTHON_PYGMENTS_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:06 +0100 Subject: [Buildroot] [git commit] package/python-pylibftdi: bump to version 0.21.0 Message-ID: <20240206151815.F2B2F870F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f8cd4499afa28b0757013781c7f0509a810092c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/codedstructure/pylibftdi/commit/c96231bb8134a2afeb0b77c12474b97a3355d2dc Fixup patch so that it applies against 0.21.0. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- .../python-pylibftdi/0001-do-not-use-find-library.patch | 15 ++++++++------- package/python-pylibftdi/python-pylibftdi.hash | 6 +++--- package/python-pylibftdi/python-pylibftdi.mk | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package/python-pylibftdi/0001-do-not-use-find-library.patch b/package/python-pylibftdi/0001-do-not-use-find-library.patch index 192ed43e54..19dabebffe 100644 --- a/package/python-pylibftdi/0001-do-not-use-find-library.patch +++ b/package/python-pylibftdi/0001-do-not-use-find-library.patch @@ -15,17 +15,18 @@ this package. Signed-off-by: Christian Kellermann --- -diff -purN pylibftdi-0.15.0.orig/pylibftdi/driver.py pylibftdi-0.15.0/pylibftdi/driver.py ---- pylibftdi-0.15.0.orig/pylibftdi/driver.py 2015-04-26 22:41:39.000000000 +0200 -+++ pylibftdi-0.15.0/pylibftdi/driver.py 2017-02-27 13:08:56.502958000 +0100 -@@ -121,8 +121,8 @@ class Driver(object): +diff -purN pylibftdi-0.21.0.orig/src/pylibftdi/driver.py pylibftdi-0.21.0/src/pylibftdi/driver.py +--- pylibftdi-0.21.0.orig/src/pylibftdi/driver.py 2015-04-26 22:41:39.000000000 +0200 ++++ pylibftdi-0.21.0/src/pylibftdi/driver.py 2017-02-27 13:08:56.502958000 +0100 +@@ -148,9 +148,8 @@ class Driver: lib = getattr(cdll, lib_path) break if lib is None: -- raise LibraryMissingError('{} library not found (search: {})'.format( -- name, search_list)) +- raise LibraryMissingError( +- f"{name} library not found (search: {str(search_list)})" +- ) + return cdll.LoadLibrary(name + '.so') + return lib - + @property diff --git a/package/python-pylibftdi/python-pylibftdi.hash b/package/python-pylibftdi/python-pylibftdi.hash index ee0ba127ca..5d8a19647f 100644 --- a/package/python-pylibftdi/python-pylibftdi.hash +++ b/package/python-pylibftdi/python-pylibftdi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pylibftdi/json -md5 fb43ade3283b809d4ebe92bf4a60d7fc pylibftdi-0.20.0.tar.gz -sha256 f4a87fc4af2c9c7d42badd4192ca9b529f32c9d96fdc8daea7e29c509226df5f pylibftdi-0.20.0.tar.gz +md5 75b63f325b760cc6342b7d35fbb84fde pylibftdi-0.21.0.tar.gz +sha256 eb7e2f5052852547f4c6c46022a1665f9d7453439639171eade56fdc80a58832 pylibftdi-0.21.0.tar.gz # Locally computed sha256 checksums -sha256 0d3f1af06b566a783091422061b60e864fc5d5853418b71643041e254b4ae7f9 LICENSE.txt +sha256 b8a7b113cfaa2c01d0701183de16ba653465692b1e29e0229244eee42fb3a9a8 LICENSE.txt diff --git a/package/python-pylibftdi/python-pylibftdi.mk b/package/python-pylibftdi/python-pylibftdi.mk index 34040b72ac..7dca37e416 100644 --- a/package/python-pylibftdi/python-pylibftdi.mk +++ b/package/python-pylibftdi/python-pylibftdi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYLIBFTDI_VERSION = 0.20.0 +PYTHON_PYLIBFTDI_VERSION = 0.21.0 PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz -PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/b8/03/4f778ce6dceea58dc5bfd555c22fdb265afc922d81d3c4496a791a54c479 +PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/d2/ce/ff3e83f3a14eb5b7950ff3657f07cdc3033dd0ded5c8ed093db515e1de33 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:05 +0100 Subject: [Buildroot] [git commit] package/python-pyjwt: bump to version 2.8.0 Message-ID: <20240206151815.E99E5870F1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb2f00f621315054b7f6ac5a8b99681af5c4af35 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pyjwt/python-pyjwt.hash | 4 ++-- package/python-pyjwt/python-pyjwt.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash index 249f0e478e..06b91bc14a 100644 --- a/package/python-pyjwt/python-pyjwt.hash +++ b/package/python-pyjwt/python-pyjwt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/PyJWT/json -md5 228adbf1f9d2bcd42bbfb6d3b43dc48a PyJWT-2.7.0.tar.gz -sha256 bd6ca4a3c4285c1a2d4349e5a035fdf8fb94e04ccd0fcbe6ba289dae9cc3e074 PyJWT-2.7.0.tar.gz +md5 a683445793adb7fcf39ad3e55c5c347c PyJWT-2.8.0.tar.gz +sha256 57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de PyJWT-2.8.0.tar.gz # Locally computed sha256 checksums sha256 797a7a20231d4c433e9f1911db1731d06b5828b98f499819a034f7c0f56f5ce5 LICENSE diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk index 982bc758df..d4cf226941 100644 --- a/package/python-pyjwt/python-pyjwt.mk +++ b/package/python-pyjwt/python-pyjwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYJWT_VERSION = 2.7.0 +PYTHON_PYJWT_VERSION = 2.8.0 PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/e0/f0/9804c72e9a314360c135f42c434eb42eaabb5e7ebad760cbd8fc7023be38 +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/30/72/8259b2bccfe4673330cea843ab23f86858a419d8f1493f66d413a76c7e3b PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:04 +0100 Subject: [Buildroot] [git commit] package/python-pyhamcrest: bump to version 2.1.0 Message-ID: <20240206151815.D5B9F870EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2f4126a9cc5b7e044a90edad20e2e7de6f090fc7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools to hatchling pep517 build backend. Drop no longer required python-setuptools runtime dependency. Drop no longer required python-six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pyhamcrest/Config.in | 2 -- package/python-pyhamcrest/python-pyhamcrest.hash | 4 ++-- package/python-pyhamcrest/python-pyhamcrest.mk | 9 ++++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-pyhamcrest/Config.in b/package/python-pyhamcrest/Config.in index c2a4dc06f7..27224cdbf1 100644 --- a/package/python-pyhamcrest/Config.in +++ b/package/python-pyhamcrest/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_PYTHON_PYHAMCREST bool "python-pyhamcrest" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help Hamcrest framework for matcher objects. diff --git a/package/python-pyhamcrest/python-pyhamcrest.hash b/package/python-pyhamcrest/python-pyhamcrest.hash index 176079e0f5..ba230d3a07 100644 --- a/package/python-pyhamcrest/python-pyhamcrest.hash +++ b/package/python-pyhamcrest/python-pyhamcrest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyhamcrest/json -md5 c808291b2fca0991d044927884e6d15e pyhamcrest-2.0.4.tar.gz -sha256 b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1 pyhamcrest-2.0.4.tar.gz +md5 c731efc9bcb93ef4f73d110f5ca8e844 pyhamcrest-2.1.0.tar.gz +sha256 c6acbec0923d0cb7e72c22af1926f3e7c97b8e8d69fc7498eabacaf7c975bd9c pyhamcrest-2.1.0.tar.gz # Locally computed sha256 checksums sha256 71beae6c8151362cfe398cbd350191a1cc52d3d28499839a7830b25f5b50a7fe LICENSE.txt diff --git a/package/python-pyhamcrest/python-pyhamcrest.mk b/package/python-pyhamcrest/python-pyhamcrest.mk index de5295e964..6631ff1d6a 100644 --- a/package/python-pyhamcrest/python-pyhamcrest.mk +++ b/package/python-pyhamcrest/python-pyhamcrest.mk @@ -4,11 +4,14 @@ # ################################################################################ -PYTHON_PYHAMCREST_VERSION = 2.0.4 +PYTHON_PYHAMCREST_VERSION = 2.1.0 PYTHON_PYHAMCREST_SOURCE = pyhamcrest-$(PYTHON_PYHAMCREST_VERSION).tar.gz -PYTHON_PYHAMCREST_SITE = https://files.pythonhosted.org/packages/b1/9a/588f086b64ace8d2e9843d8551e9068b2570c3c51b06cb49a107303f8700 -PYTHON_PYHAMCREST_SETUP_TYPE = setuptools +PYTHON_PYHAMCREST_SITE = https://files.pythonhosted.org/packages/16/3f/f286caba4e64391a8dc9200e6de6ce0d07471e3f718248c3276843b7793b +PYTHON_PYHAMCREST_SETUP_TYPE = pep517 PYTHON_PYHAMCREST_LICENSE = BSD-3-Clause PYTHON_PYHAMCREST_LICENSE_FILES = LICENSE.txt +PYTHON_PYHAMCREST_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs $(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 15:18:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:18:01 +0100 Subject: [Buildroot] [git commit] package/python-pydantic-core: bump to version 2.14.6 Message-ID: <20240206151815.AF80F870F0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2378442d2b6a3618062d3aaebe3dc7def9aff395 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pydantic-core/python-pydantic-core.hash | 2 +- package/python-pydantic-core/python-pydantic-core.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-pydantic-core/python-pydantic-core.hash b/package/python-pydantic-core/python-pydantic-core.hash index 4927d816be..817595ba8c 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 b54296f8317e7ffd72726836636aa3a6c8c977d8f73b68253c443c0fe3731064 pydantic_core-2.14.5.tar.gz +sha256 032fff43cdec54ac579bbdda1a09163e89634c729c1a8163340601a5dfc55eb3 pydantic_core-2.14.6.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 8b61323ab3..8b6e0053e4 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.14.5 +PYTHON_PYDANTIC_CORE_VERSION = 2.14.6 PYTHON_PYDANTIC_CORE_SOURCE = pydantic_core-$(PYTHON_PYDANTIC_CORE_VERSION).tar.gz -PYTHON_PYDANTIC_CORE_SITE = https://files.pythonhosted.org/packages/64/26/cffb93fe9c6b5a91c497f37fae14a4b073ecbc47fc36a9979c7aa888b245 +PYTHON_PYDANTIC_CORE_SITE = https://files.pythonhosted.org/packages/b2/7d/8304d8471cfe4288f95a3065ebda56f9790d087edc356ad5bd83c89e2d79 PYTHON_PYDANTIC_CORE_SETUP_TYPE = maturin PYTHON_PYDANTIC_CORE_LICENSE = MIT PYTHON_PYDANTIC_CORE_LICENSE_FILES = LICENSE From giulio.benetti at benettiengineering.com Tue Feb 6 15:20:09 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 16:20:09 +0100 Subject: [Buildroot] [PATCH v2, 2/2] package/attr: affected by gcc bug 101766 In-Reply-To: <20240206161152.0e178414@windsurf> References: <20240116065831.9471-1-fontaine.fabrice@gmail.com> <20240116065831.9471-2-fontaine.fabrice@gmail.com> <20240206161152.0e178414@windsurf> Message-ID: Hi Thomas, Fabrice, On 06/02/24 16:11, Thomas Petazzoni via buildroot wrote: > Hello Fabrice, > > On Tue, 16 Jan 2024 07:58:31 +0100 > Fabrice Fontaine wrote: > >> attr is affected by gcc bug 101766 since version 1.5.2 and >> https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=11b9069098b4d4c23efb06c9457a085b784354d4 >> resulting in the following build failure on microblaze since commit >> b31b91296e7f985b909f104f06a098adddef1fea: >> >> libattr/syscalls.c:133:10: error: symver is only supported on ELF platforms >> 133 | # pragma GCC visibility pop >> | ^~~ >> >> So let's disable package attr and packages depending on it. >> >> Fixes: >> - http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a >> >> Reviewed-by: Giulio Benetti >> Signed-off-by: Fabrice Fontaine > > I don't like this very much. It's annoying to propagate this dependency > to all reverse dependencies of attr, and make it unavailable on > Microblaze for this silly reason. So I came up with the attached patch > for attr, which rather detects if __attribute__(__symver__) works or > not, and fall backs to another mechanism if not (this fallback already > exists in the attr code). > > Could you have a look at my proposal, and if it suits you, submit it > upstream and as a patch to Buildroot ? :-) I deal with attached patch. -- Giulio Benetti CEO&CTO at Benetti Engineering sas > (Yeah, I know I'm pushing some of the work for you, my goal is to be > able to continue review/merge other patches) > > Thanks a lot! > > Thomas > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Tue Feb 6 15:20:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:20:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pycryptodomex: bump to version 3.19.1 In-Reply-To: <20240110044601.1084866-1-james.hilliard1@gmail.com> References: <20240110044601.1084866-1-james.hilliard1@gmail.com> Message-ID: <20240206162039.7feb7ac9@windsurf> On Tue, 9 Jan 2024 21:46:01 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pycryptodomex/python-pycryptodomex.hash | 4 ++-- > package/python-pycryptodomex/python-pycryptodomex.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:20:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:20:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pydantic-core bump to version 2.14.6 In-Reply-To: <20240110045128.1093380-1-james.hilliard1@gmail.com> References: <20240110045128.1093380-1-james.hilliard1@gmail.com> Message-ID: <20240206162043.2399e2c5@windsurf> On Tue, 9 Jan 2024 21:51:28 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pydantic-core/python-pydantic-core.hash | 2 +- > package/python-pydantic-core/python-pydantic-core.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:20:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:20:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pydantic: bump to version 2.5.3 In-Reply-To: <20240110045604.1099561-1-james.hilliard1@gmail.com> References: <20240110045604.1099561-1-james.hilliard1@gmail.com> Message-ID: <20240206162050.26037021@windsurf> On Tue, 9 Jan 2024 21:56:04 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pydantic/python-pydantic.hash | 4 ++-- > package/python-pydantic/python-pydantic.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:00 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyftpdlib: bump to version 1.5.9 In-Reply-To: <20240110045803.1101457-1-james.hilliard1@gmail.com> References: <20240110045803.1101457-1-james.hilliard1@gmail.com> Message-ID: <20240206162100.14d93b73@windsurf> On Tue, 9 Jan 2024 21:58:03 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pyftpdlib/python-pyftpdlib.hash | 4 ++-- > package/python-pyftpdlib/python-pyftpdlib.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pygments: bump to version 2.17.2 In-Reply-To: <20240110050337.1106376-1-james.hilliard1@gmail.com> References: <20240110050337.1106376-1-james.hilliard1@gmail.com> Message-ID: <20240206162104.4a327738@windsurf> On Tue, 9 Jan 2024 22:03:37 -0700 James Hilliard wrote: > Migrate from setuptools to hatchling pep517 build backend. > > Signed-off-by: James Hilliard > --- > package/python-pygments/python-pygments.hash | 4 ++-- > package/python-pygments/python-pygments.mk | 9 +++++---- > 2 files changed, 7 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyhamcrest: bump to version 2.1.0 In-Reply-To: <20240110050813.1109654-1-james.hilliard1@gmail.com> References: <20240110050813.1109654-1-james.hilliard1@gmail.com> Message-ID: <20240206162112.16152573@windsurf> On Tue, 9 Jan 2024 22:08:13 -0700 James Hilliard wrote: > Migrate from setuptools to hatchling pep517 build backend. > > Drop no longer required python-setuptools runtime dependency. > > Drop no longer required python-six runtime dependency. > > Signed-off-by: James Hilliard > --- > package/python-pyhamcrest/Config.in | 2 -- > package/python-pyhamcrest/python-pyhamcrest.hash | 4 ++-- > package/python-pyhamcrest/python-pyhamcrest.mk | 9 ++++++--- > 3 files changed, 8 insertions(+), 7 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyicu: bump to version 2.12 In-Reply-To: <20240110051321.1132678-1-james.hilliard1@gmail.com> References: <20240110051321.1132678-1-james.hilliard1@gmail.com> Message-ID: <20240206162117.2755729b@windsurf> On Tue, 9 Jan 2024 22:13:21 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pyicu/python-pyicu.hash | 4 ++-- > package/python-pyicu/python-pyicu.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:24 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pyjwt: bump to version 2.8.0 In-Reply-To: <20240110051911.1137724-1-james.hilliard1@gmail.com> References: <20240110051911.1137724-1-james.hilliard1@gmail.com> Message-ID: <20240206162124.58dd2a51@windsurf> On Tue, 9 Jan 2024 22:19:10 -0700 James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-pyjwt/python-pyjwt.hash | 4 ++-- > package/python-pyjwt/python-pyjwt.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 15:21:29 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 16:21:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pylibftdi: bump to version 0.21.0 In-Reply-To: <20240110053449.1157385-1-james.hilliard1@gmail.com> References: <20240110053449.1157385-1-james.hilliard1@gmail.com> Message-ID: <20240206162129.2286080a@windsurf> On Tue, 9 Jan 2024 22:34:49 -0700 James Hilliard wrote: > License hash changed due to year update: > https://github.com/codedstructure/pylibftdi/commit/c96231bb8134a2afeb0b77c12474b97a3355d2dc > > Fixup patch so that it applies against 0.21.0. > > Signed-off-by: James Hilliard > --- > .../0001-do-not-use-find-library.patch | 15 ++++++++------- > package/python-pylibftdi/python-pylibftdi.hash | 6 +++--- > package/python-pylibftdi/python-pylibftdi.mk | 4 ++-- > 3 files changed, 13 insertions(+), 12 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From ismael at iodev.co.uk Tue Feb 6 15:21:50 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 16:21:50 +0100 Subject: [Buildroot] [RFC PATCH] docs/website: Add Makefile to pre-generate the website In-Reply-To: References: <20240206144030.18329-1-ismael@iodev.co.uk> Message-ID: On 06/Feb/2024 16:08, Yann E. MORIN wrote: <...> > Make that gawk, so that we can do [0] (see below) Mawk might be more complete than you think ;-). > > +SRCDIR := ${CURDIR} > > Use parentheses not curly braces, to expand variables in Makefiles, > like we do everyelse in Buildroot: $(..) > > (yes, both are valid, but lets be consistent throughout our code base) OK, I'll change it for v3. I mentioned this before, according to both GNU and BSD this is legacy syntax, and new stuff should use curly braces... <...> > What is the rationale for using smu and tidy to do the deployement? > We don't need/want to minimify the content... smu is for having some markup support, not used for .html files; as for tidy, it just normalises the html indentation, no minification is going on. <...> > [0] In case of error, we do want to exit in error and be sure this is > caught at the Makefile level; by using gawk, you can call: > > exit 42 That also works with any other AWK. From peter at korsgaard.com Tue Feb 6 15:39:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 16:39:42 +0100 Subject: [Buildroot] [git commit] package/python-semver: bump to version 3.0.2 Message-ID: <20240206154117.AEA7A870FF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbcdb086677e73a0f0b7ceb6919619c3712b60ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new host-python-setuptools-scm build dependency. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-semver/Config.in | 2 +- package/python-semver/python-semver.hash | 6 +++--- package/python-semver/python-semver.mk | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-semver/Config.in b/package/python-semver/Config.in index 4af2bbf449..db83d8edc4 100644 --- a/package/python-semver/Config.in +++ b/package/python-semver/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_SEMVER bool "python-semver" help - Python helper for Semantic Versioning (http://semver.org/). + Python helper for Semantic Versioning (https://semver.org). https://github.com/python-semver/python-semver diff --git a/package/python-semver/python-semver.hash b/package/python-semver/python-semver.hash index 10cb0a8464..1e06167610 100644 --- a/package/python-semver/python-semver.hash +++ b/package/python-semver/python-semver.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/semver/json -md5 e98b5fb283ea84daa5195087de83ebf1 semver-2.13.0.tar.gz -sha256 fa0fe2722ee1c3f57eac478820c3a5ae2f624af8264cbdf9000c980ff7f75e3f semver-2.13.0.tar.gz -# Locally computed +md5 0bbc4d74959c9f1522f75ffb4ae0934d semver-3.0.2.tar.gz +sha256 6253adb39c70f6e51afed2fa7152bcd414c411286088fb4b9effb133885ab4cc semver-3.0.2.tar.gz +# Locally computed sha256 checksums sha256 cda490c32e61d3884dc17791fc8078f2a3e564fba98dd18b4dc64eb2720b2b6f LICENSE.txt diff --git a/package/python-semver/python-semver.mk b/package/python-semver/python-semver.mk index d3a905754f..29d7ba46b1 100644 --- a/package/python-semver/python-semver.mk +++ b/package/python-semver/python-semver.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_SEMVER_VERSION = 2.13.0 +PYTHON_SEMVER_VERSION = 3.0.2 PYTHON_SEMVER_SOURCE = semver-$(PYTHON_SEMVER_VERSION).tar.gz -PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/31/a9/b61190916030ee9af83de342e101f192bbb436c59be20a4cb0cdb7256ece +PYTHON_SEMVER_SITE = https://files.pythonhosted.org/packages/41/6c/a536cc008f38fd83b3c1b98ce19ead13b746b5588c9a0cb9dd9f6ea434bc PYTHON_SEMVER_SETUP_TYPE = setuptools PYTHON_SEMVER_LICENSE = BSD-3-Clause PYTHON_SEMVER_LICENSE_FILES = LICENSE.txt +PYTHON_SEMVER_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 15:41:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 16:41:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-semver: bump to version 3.0.2 In-Reply-To: <20240111060214.3026046-1-james.hilliard1@gmail.com> References: <20240111060214.3026046-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 07.02, James Hilliard wrote: > Add new host-python-setuptools-scm build dependency. > > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Tue Feb 6 15:51:39 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 16:51:39 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-bitarray: new package Message-ID: <20240206155140.2351424-1-romain.naour@smile.fr> This package is needed at runtime by python-bitstring since 4.1.1 already. Note: the License is under Python-2.0 but Python Software Foundation ("PSF") has been remplaced by the author of bitarray Ilan Schnell. [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.1 Signed-off-by: Romain Naour --- Triple checked the license type with other distribution: https://salsa.debian.org/python-team/packages/python-bitarray/-/blob/master/debian/copyright?ref_type=heads https://src.fedoraproject.org/rpms/python-bitarray/blob/rawhide/f/python-bitarray.spec https://aur.archlinux.org/packages/python-bitarray --- package/Config.in | 1 + package/python-bitarray/Config.in | 6 ++++++ package/python-bitarray/python-bitarray.hash | 5 +++++ package/python-bitarray/python-bitarray.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-bitarray/Config.in create mode 100644 package/python-bitarray/python-bitarray.hash create mode 100644 package/python-bitarray/python-bitarray.mk diff --git a/package/Config.in b/package/Config.in index 728bd03b80..708dc376b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1007,6 +1007,7 @@ menu "External python modules" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bidict/Config.in" + source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" source "package/python-bleak/Config.in" source "package/python-blinker/Config.in" diff --git a/package/python-bitarray/Config.in b/package/python-bitarray/Config.in new file mode 100644 index 0000000000..38d685f4fd --- /dev/null +++ b/package/python-bitarray/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_BITARRAY + bool "python-bitarray" + help + efficient arrays of booleans -- C extension. + + https://github.com/ilanschnell/bitarray diff --git a/package/python-bitarray/python-bitarray.hash b/package/python-bitarray/python-bitarray.hash new file mode 100644 index 0000000000..d91a28af20 --- /dev/null +++ b/package/python-bitarray/python-bitarray.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/bitarray/json +md5 024324a82314e9e68ecdcdefdc69071f bitarray-2.9.2.tar.gz +sha256 a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e bitarray-2.9.2.tar.gz +# Locally computed sha256 checksums +sha256 6b5e04f6e0462e1b97be833f9d65e66cd5eceb3283f4a6f532261087d0ab1233 LICENSE diff --git a/package/python-bitarray/python-bitarray.mk b/package/python-bitarray/python-bitarray.mk new file mode 100644 index 0000000000..f86320c112 --- /dev/null +++ b/package/python-bitarray/python-bitarray.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-bitarray +# +################################################################################ + +PYTHON_BITARRAY_VERSION = 2.9.2 +PYTHON_BITARRAY_SOURCE = bitarray-$(PYTHON_BITARRAY_VERSION).tar.gz +PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/c7/bf/25cf92a83e1fe4948d7935ae3c02f4c9ff9cb9c13e977fba8af11a5f642c +PYTHON_BITARRAY_SETUP_TYPE = setuptools +PYTHON_BITARRAY_LICENSE = Python-2.0 +PYTHON_BITARRAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 6 15:51:40 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 16:51:40 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-bitstring: add missing runtime dependency In-Reply-To: <20240206155140.2351424-1-romain.naour@smile.fr> References: <20240206155140.2351424-1-romain.naour@smile.fr> Message-ID: <20240206155140.2351424-2-romain.naour@smile.fr> python-bitstring require python-bitarray and python-zlib at runtime since 4.0.1 release [1][2]. python-zlib is now needed for the "Experimental support for two 8-bit float types". Intended to fixes (fixed locally): https://gitlab.com/buildroot.org/buildroot/-/jobs/6104227183 (TestPythonPy3Bitstring) https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854810 (TestPythonPy3Crossbar) gitlab-ci reports another issue at build time not reproduced locally: *** Error compiling '[...]/TestPythonPy3Bitstring/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... Sorry: IndentationError: expected an indented block after function definition on line 6 (plugin_test.py, line 8) [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.1 [2] https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 Signed-off-by: Romain Naour Cc: James Hilliard --- package/python-bitstring/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-bitstring/Config.in b/package/python-bitstring/Config.in index 93d7682577..82d0bb29c6 100644 --- a/package/python-bitstring/Config.in +++ b/package/python-bitstring/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_BITSTRING bool "python-bitstring" + select BR2_PACKAGE_PYTHON_BITARRAY # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Simple construction, analysis and modification of binary data. -- 2.43.0 From giulio.benetti at benettiengineering.com Tue Feb 6 15:54:13 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 16:54:13 +0100 Subject: [Buildroot] [PATCH] package/attr: fix build failure on Microblaze architecture In-Reply-To: <20240206161152.0e178414@windsurf> References: <20240206161152.0e178414@windsurf> Message-ID: <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> On Microblaze architecture __has_attribute(__symver__) support is broken and always return true even if symver is not supported so let's add a local patch pending upstream to detect if symver is supported during autoreconf. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Signed-off-by: Giulio Benetti --- ...dd-detection-of-symver-gcc-attribute.patch | 56 +++++++++++++++++++ package/attr/attr.mk | 3 + 2 files changed, 59 insertions(+) create mode 100644 package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch new file mode 100644 index 0000000000..15bd266d7b --- /dev/null +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch @@ -0,0 +1,56 @@ +From 1be7c2251040f1152de9ceb5263e6e96fa5c3d75 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 15:33:15 +0100 +Subject: [PATCH] configure.ac: add detection of symver gcc attribute + +Upstream: https://lists.gnu.org/archive/html/savannah-hackers-public/2024-02/msg00009.html + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Giulio Benetti +--- + configure.ac | 15 +++++++++++++++ + libattr/syscalls.c | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7e362e9..98477b5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,21 @@ AS_CASE([$host_os], + [linux*], [os_linux=yes]) + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) + ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, ++ gcc_cv_symver_attribute, ++ [cat > conftest.c </dev/null 2>&1; then \ ++ gcc_cv_symver_attribute=yes ++ fi ++ rm -f conftest.[cs] ++]) ++AS_IF([test $gcc_cv_symver_attribute = yes], ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) ++ + AC_CONFIG_COMMANDS([include/attr], + [dnl + rm -rf include/attr +diff --git a/libattr/syscalls.c b/libattr/syscalls.c +index 907560a..caa70bc 100644 +--- a/libattr/syscalls.c ++++ b/libattr/syscalls.c +@@ -32,7 +32,7 @@ + * fall back to traditional .symver asm directive otherwise. + */ + #ifdef __has_attribute +-# if __has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) + # elif __has_attribute(__no_reorder__) + /* +-- +2.43.0 + diff --git a/package/attr/attr.mk b/package/attr/attr.mk index 6ecf5c53f4..f4f911333a 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_CPE_ID_VENDOR = attr_project +# Flag added for patch dealing with symver in configure.ac +ATTR_AUTORECONF = YES + ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls -- 2.34.1 From yann.morin.1998 at free.fr Tue Feb 6 15:59:45 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 16:59:45 +0100 Subject: [Buildroot] [PATCH 1/6] utils/readme.txt: expand check-package description In-Reply-To: <20240206105246.1220945-1-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > check-package does a lot more by now than checking .mk and > Config.in files. Add this to the description. > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > utils/readme.txt | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/utils/readme.txt b/utils/readme.txt > index 3e8833c4ea..d5cda70bfc 100644 > --- a/utils/readme.txt > +++ b/utils/readme.txt > @@ -12,8 +12,11 @@ brmake > nothing. > > check-package > - a script that checks the coding style of a package's Config.in and > - .mk files, and also tests them for various types of typoes. > + a script that checks the coding style across the buildroot tree. It > + checks package's Config.in and .mk files, runs shellcheck for all shell > + scripts, flake8 for python files, checks for typoes, etc. > + It checks the .checkpackageignore file if errors should be ignored and > + errors if there's a file listed that doesn't produce an error. > > genrandconfig > a script that generates a random configuration, used by the autobuilders > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 16:00:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:00:15 +0100 Subject: [Buildroot] [PATCH 2/6] utils/readme.txt: document docker-run script In-Reply-To: <20240206105246.1220945-2-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> <20240206105246.1220945-2-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > Signed-off-by: Marcus Hoffmann > --- > utils/readme.txt | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/utils/readme.txt b/utils/readme.txt > index d5cda70bfc..2cb6b0af9b 100644 > --- a/utils/readme.txt > +++ b/utils/readme.txt > @@ -18,6 +18,10 @@ check-package > It checks the .checkpackageignore file if errors should be ignored and > errors if there's a file listed that doesn't produce an error. > > +docker-run > + a script that runs a command (like make check-package) inside the buildroot > + ci docker container. I've slightly extended that to state that an interactive shell is spawned if not command is specified. Applied to master, thanks. Regards, Yann E. MORIN. > genrandconfig > a script that generates a random configuration, used by the autobuilders > (http://autobuild.buildroot.org). It selects a random toolchain from > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From antoine.coutant at smile.fr Tue Feb 6 16:00:17 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Tue, 6 Feb 2024 17:00:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.16.2 In-Reply-To: References: <20240111051726.2918732-1-james.hilliard1@gmail.com> <1dd4afa6-e225-4e79-bb3a-21d0e04c7571@smile.fr> Message-ID: <8260a015-44ed-4a2a-8d33-67c4268f810d@smile.fr> On 06/02/2024 15:53, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-06 15:09 +0100, Antoine Coutant spake thusly: >> On 11/01/2024 06:17, James Hilliard wrote: >>> Signed-off-by: James Hilliard > [--SNIP--] >>> -PYTHON_RPDS_PY_VERSION = 0.12.0 >>> +PYTHON_RPDS_PY_VERSION = 0.16.2 >> rpds depends on the crate pyo3. This crate uses >> "std::sync::atomic::AtomicI64" which doesn't exist for 32 bits >> targets. That leads to an error [1]. > I have been discussing this with Romain IRL, and he explained that the > issue _already_ happenned with 0.12.0, so this is not a regression and > thus reverting this patch will not fix the issue. > > Is that correct? Yes, this patch is not a regression. I did a test with Buildroot 2023.11 and it failed. This bug is old but i described it here because I was working on it when the version bump was applied and I thought it was related. > > Also, will std::sync::atomic::AtomicI64 ever be available for 32-bit > targets? If not, would that be considered a bug in the std lib? according to the rust doc, std::sync::atomic::AtomicI64 is only available on platforms that support atomic loads and stores of i64 [1]. Moreover, std::sync::atomic types might not be available on all platforms [2]. That's why the crate portable-atomic [3] have been created. It provides atomic types and compare and swap operations for all targets that can use std. That's the crate used by pyo3 upstream to solve the problem [4]. >> An issue have been opened on pyo3's github [2]. A fix have been accepted [3] >> but it isn't in the last release. Thus, this version bump doesn't >> fix this problem. >> [1]:https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854842 >> [2]:https://github.com/PyO3/pyo3/issues/3614 >> [3]:https://github.com/PyO3/pyo3/pull/3619 > It is not going to be easy to carry this change as a patch in Buildroot: > it would require that we be able to patch a package during the vendoring > step. > > In this case, we'd need to do the vendoring (because we need the pyo3 > crate to be downloaded), then apply the patch (with mangled paths) to > add the new dependency, then restart the vendoring. In the generic case, > we'd even need to be able to repeat the process in case that new > dependency has to be patched and so on and so on... That's not going to > be easy, by far... > > Meh... > > We can't even update to a random sha1 from the rpds git tree, because > they do nit even have an update to switch to a newer (even if > unreleased) pyo3. > > Meh, again... > > Not sure what to do... > > What about adding a dependency on BR2_ARCH_IS_64 to python-rpds-pym and > propagate that to all its dependencies? I think this is the best way to avoid this bug. Patching during the vendoring process seams to be possible. But it will be quite impossible to maintain. The dependency on BR2_ARCH_IS_64 must be removed when the version of spo3 used by rpds will use portable-atomic. > > Regards, > Yann E. MORIN. [1]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI64.html [2]: https://doc.rust-lang.org/std/sync/atomic/index.html#portability [3]: https://github.com/taiki-e/portable-atomic [4]: https://github.com/PyO3/pyo3/pull/3619/files Regards, Antoine Coutant -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Tue Feb 6 16:00:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:00:35 +0100 Subject: [Buildroot] [PATCH 3/6] docs/website/support.html: document how to join irc channel from matrix In-Reply-To: <20240206105246.1220945-3-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> <20240206105246.1220945-3-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > docs/website/support.html | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/docs/website/support.html b/docs/website/support.html > index 9be816f836..13d63b13a9 100644 > --- a/docs/website/support.html > +++ b/docs/website/support.html > @@ -21,7 +21,9 @@ >
    >

    The Buildroot IRC channel is > #buildroot, hosted on OFTC. If you do not have an IRC client, you can > - use the OFTC web interface. > + use the OFTC web interface. The > + channel is also bridged to matrix as > + #_oftc_#buildroot:matrix.org. > When asking for help on IRC, share relevant logs or pieces of code using a code > sharing website.

    > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 16:02:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:06 +0100 Subject: [Buildroot] [PATCH 4/6] docs/website/support.html: document irc channel permission changes In-Reply-To: <20240206105246.1220945-4-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> <20240206105246.1220945-4-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > The #buildroot IRC channel recently changed from only allowing > registered users to join to allowing anyone to join but only allowing > registered users to talk in the channel. This still avoids the spam > problem on IRC while allowing an exception for users bridged from > matrix.org. These already have a username registered on the matrix side > and thus similar properties as a registered IRC user/nick. > > The commands to set these options were: > > * Set +q on all unregistered nicks: ~/mode #buildroot +q $~a~ this lets > people join but they can't talk > * Set exempt on matrix hosts: ~/mode #buildroot +e $x:matrix.org~ > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > docs/website/support.html | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/docs/website/support.html b/docs/website/support.html > index 13d63b13a9..28873c6d76 100644 > --- a/docs/website/support.html > +++ b/docs/website/support.html > @@ -27,8 +27,8 @@ > When asking for help on IRC, share relevant logs or pieces of code using a code > sharing website.

    > > -

    Note that due to excessive spamming on IRC, the channel can only be > - joined if you are a registered user with > +

    Note that due to excessive spamming on IRC, you can only talk in the > + channel if you are a registered user with > OFTC NickServ > service. Follow the instructions to register as a user with a password, > and then join the #buildroot channel.

    > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 16:03:03 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:03:03 +0100 Subject: [Buildroot] [PATCH 5/6] docs/manual/contribute.adoc: link to git-send-email.io In-Reply-To: <20240206105246.1220945-5-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> <20240206105246.1220945-5-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > https://git-send-email.io/ is a page maintained by sourcehut which > explains how to setup git send-email on many OS's for many popular email > providers. > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > docs/manual/contribute.adoc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc > index 2b90d13b41..684e9f4809 100644 > --- a/docs/manual/contribute.adoc > +++ b/docs/manual/contribute.adoc > @@ -369,7 +369,7 @@ $ git send-email origin/master > --------------------- > > Note that +git+ should be configured to use your mail account. > -To configure +git+, see +man git-send-email+ or google it. > +To configure +git+, see +man git-send-email+ or https://git-send-email.io/. > > If you do not use +git send-email+, make sure posted *patches are not > line-wrapped*, otherwise they cannot easily be applied. In such a case, > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 6 16:02:02 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:02 +0100 Subject: [Buildroot] [git commit] utils/readme.txt: expand check-package description Message-ID: <20240206160322.96B118711A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fba40a9f39cbd6b3f662073d148aad371dc07964 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master check-package does a lot more by now than checking .mk and Config.in files. Add this to the description. Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- utils/readme.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/readme.txt b/utils/readme.txt index 3e8833c4ea..d5cda70bfc 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -12,8 +12,11 @@ brmake nothing. check-package - a script that checks the coding style of a package's Config.in and - .mk files, and also tests them for various types of typoes. + a script that checks the coding style across the buildroot tree. It + checks package's Config.in and .mk files, runs shellcheck for all shell + scripts, flake8 for python files, checks for typoes, etc. + It checks the .checkpackageignore file if errors should be ignored and + errors if there's a file listed that doesn't produce an error. genrandconfig a script that generates a random configuration, used by the autobuilders From yann.morin.1998 at free.fr Tue Feb 6 16:02:03 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:03 +0100 Subject: [Buildroot] [git commit] utils/readme.txt: document docker-run script Message-ID: <20240206160322.A26068711B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=21d89a5b86f550958b4e23262b33e8497842b8dd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann [yann.morin.1998 at free.fr: the default is an interactive shell] Signed-off-by: Yann E. MORIN --- utils/readme.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/readme.txt b/utils/readme.txt index d5cda70bfc..6488d13c75 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -18,6 +18,11 @@ check-package It checks the .checkpackageignore file if errors should be ignored and errors if there's a file listed that doesn't produce an error. +docker-run + a script that runs a command (like make check-package) inside the + buildroot CI docker container; pass no command to get an interactive + shell. + genrandconfig a script that generates a random configuration, used by the autobuilders (http://autobuild.buildroot.org). It selects a random toolchain from From yann.morin.1998 at free.fr Tue Feb 6 16:02:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:06 +0100 Subject: [Buildroot] [git commit] docs/website/support.html: document irc channel permission changes Message-ID: <20240206160322.B8A958711D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1e6d7845b0f3b450709b84a6e4fc4527f12b196 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The #buildroot IRC channel recently changed from only allowing registered users to join to allowing anyone to join but only allowing registered users to talk in the channel. This still avoids the spam problem on IRC while allowing an exception for users bridged from matrix.org. These already have a username registered on the matrix side and thus similar properties as a registered IRC user/nick. The commands to set these options were: * Set +q on all unregistered nicks: ~/mode #buildroot +q $~a~ this lets people join but they can't talk * Set exempt on matrix hosts: ~/mode #buildroot +e $x:matrix.org~ Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- docs/website/support.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/support.html b/docs/website/support.html index 13d63b13a9..28873c6d76 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -27,8 +27,8 @@ When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

    -

    Note that due to excessive spamming on IRC, the channel can only be - joined if you are a registered user with +

    Note that due to excessive spamming on IRC, you can only talk in the + channel if you are a registered user with OFTC NickServ service. Follow the instructions to register as a user with a password, and then join the #buildroot channel.

    From yann.morin.1998 at free.fr Tue Feb 6 16:02:04 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:04 +0100 Subject: [Buildroot] [git commit] docs/website/support.html: document how to join irc channel from matrix Message-ID: <20240206160322.AD36E8711C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb4d03c6a3637c3ab219a93640df3ed33d956555 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- docs/website/support.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/website/support.html b/docs/website/support.html index 9be816f836..13d63b13a9 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -21,7 +21,9 @@

    The Buildroot IRC channel is #buildroot, hosted on OFTC. If you do not have an IRC client, you can - use the OFTC web interface. + use the OFTC web interface. The + channel is also bridged to matrix as + #_oftc_#buildroot:matrix.org. When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

    From yann.morin.1998 at free.fr Tue Feb 6 16:02:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:02:07 +0100 Subject: [Buildroot] [git commit] docs/manual/contribute.adoc: link to git-send-email.io Message-ID: <20240206160322.C58528711A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4639b493a9729e1d8bfe0839aed871f1a96a207 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://git-send-email.io/ is a page maintained by sourcehut which explains how to setup git send-email on many OS's for many popular email providers. Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- docs/manual/contribute.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 2b90d13b41..684e9f4809 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -369,7 +369,7 @@ $ git send-email origin/master --------------------- Note that +git+ should be configured to use your mail account. -To configure +git+, see +man git-send-email+ or google it. +To configure +git+, see +man git-send-email+ or https://git-send-email.io/. If you do not use +git send-email+, make sure posted *patches are not line-wrapped*, otherwise they cannot easily be applied. In such a case, From hanyuan-z at qq.com Tue Feb 6 16:01:29 2024 From: hanyuan-z at qq.com (=?gb18030?B?aGFueXVhbi16?=) Date: Wed, 7 Feb 2024 00:01:29 +0800 Subject: [Buildroot] [PATCH v3 2/2] configs/milkv_duo: new defconfig Message-ID: Hello Giulio, Thanks for your careful review! However there are a few things I still get confused about. Could you please give me some hints? > Here you definetely need to add that this patch depends on this > patchset: > https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 > to work-around a gcc bug on htop package. Do you mean that I should submit my patches after yours gets merged? Or should I declare that my patch depends on yours, and how? > After the 3 dashes above you should add changes between patch versions like: > V1->V2: > * changed this > * changed that > > V2->V3: > * change thee Could I only add lines from V2 -> V3 since the V1 -> V2 was happened nearly two months ago and the changes from V1 -> V2 were very big. > please drop from here... > > > +To configure the linux kernel or u-boot: > > + > > + $ make linux-menuconfig > > + > > +To rebuild something (e.g. linux): > > + > > + $ make linux-rebuild > > + > > ...to here, since it's part of Buildroot manual and also > you should point "linux-menuconfig and uboot-menuconfig", > but it doesn't make sense to me, so yes please drop it, Do you mean that I should remove those lines? > Here I would expand comment by pointing that glibc is not suitable and > why. It should be a gcc ICE, so maybe someone can fix or work it around > later with this indication. Yes, the problem is gcc ICE. More detailed, the ICE is coming from the t-head optimizations. Once t-head stuff removed, no more ICE. No more glibc and htop problems. However once the optimizations removed, the Milk-v duo board's architect and performance features are gone. So it is troublesome. And I think this problem is associated with the one from another email. Let me put them together. > > I think I should tell you this. In fact I encountered another gcc bug > > when using all the t-head?s optimizations with the glibc. The gcc reported > > internal errors when we > > > > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > > > > So we have to use musl and find this bug is not reported anymore. > I was wondering why you were using exactly musl and I suspected > something like that. The reason I use musl is that the original sdk not prepared for the mainline buildroot is using the musl. And for the compatibility I think it's better to use musl here to rather than the rest option uClibc-ng, though it works fine. So should I put more lines at the defconfig to comment more about these embarrassing situations? > Please for all occurences use Makefile "$(if ...)" statement instead of > "if [ ... = y ]" Sorry for the inconsistency. However the Makefile's if statement is too weird for me to implement such a branch of things to make. So I spend a lot of time to find that the shell's if statement could work this way. And I have find examples that are using the same technique. For example the line 699 at package/systemd/systemd.mk. Could you please kindly give me an exemption here? > > + > > + cd $(@D)/cvitek/build/task && \ > > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > > + -DRUN_ARCH=riscv64 \ > > + -DRUN_TYPE=CVIRTOS \ > > + -DTOP_DIR=$(@D)/cvitek \ > > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > > + -DBOARD_FPGA=n \ > > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > > The build command is common for every "target", so please declare it > into a variable on the top. > > > + $(@D)/cvitek/task > > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target cvirtos.bin -- -v > > To tell the truth all the points above can be shrinked using a foreach > loop through all the build directories since they all look the same > except directory name. Can you provide such change? These are too painful for me. Could I move these code into the remote code repo so that these annoying code will not be included in the buildroot? And then the buildroot package would only have good lines like "$(eval $(generic-package))" Great thanks again for your thorough review and insightful feedback on my code! I truly appreciate your patience and the valuable time you spend on my patches. Best regards, Hanyuan Zhao From giulio.benetti at benettiengineering.com Tue Feb 6 16:15:43 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 17:15:43 +0100 Subject: [Buildroot] [External] - [PATCH] package/attr: fix build failure on Microblaze architecture In-Reply-To: References: <20240206161152.0e178414@windsurf> <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> Message-ID: <40f3713a-2cbe-4cdf-9b7b-3f30d5742b56@benettiengineering.com> Hi Vincent, my thought is, On 06/02/24 17:05, Vincent Fazio wrote: > All, > > Would it make sense to patch GCC for Microblaze to address these at the compiler level instead of constantly patching the packages? until gcc is not fixed yes, but, > I tested https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c6 back when we were solving this problem for xz and had no issues https://gcc.gnu.org/pipermail/gcc/2023-March/240834.html this absolutely makes sense. It would great if you could backport those patches for all gcc versions we deal with like I've done time ago fo OpenRisc and when they merge them upstream we can drop them after bumping gcc versions with that patch applied. -- Giulio Benetti CEO&CTO at Benetti Engineering sas > >> -----Original Message----- >> From: buildroot On Behalf Of Giulio >> Benetti >> Sent: Tuesday, February 6, 2024 9:54 AM >> To: buildroot at buildroot.org; Thomas Petazzoni >> >> Cc: Giulio Benetti ; Fabrice >> Fontaine >> Subject: [External] - [Buildroot] [PATCH] package/attr: fix build failure on >> Microblaze architecture >> >> On Microblaze architecture __has_attribute(__symver__) support is broken >> and always return true even if symver is not supported so let's add a local >> patch pending upstream to detect if symver is supported during autoreconf. >> >> Fixes: >> http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078 >> bf77d2a >> >> Signed-off-by: Giulio Benetti >> --- >> ...dd-detection-of-symver-gcc-attribute.patch | 56 +++++++++++++++++++ >> package/attr/attr.mk | 3 + >> 2 files changed, 59 insertions(+) >> create mode 100644 package/attr/0002-configure.ac-add-detection-of- >> symver-gcc-attribute.patch >> >> diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc- >> attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver- >> gcc-attribute.patch >> new file mode 100644 >> index 0000000000..15bd266d7b >> --- /dev/null >> +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribu >> +++ te.patch >> @@ -0,0 +1,56 @@ >> +From 1be7c2251040f1152de9ceb5263e6e96fa5c3d75 Mon Sep 17 00:00:00 >> 2001 >> +From: Thomas Petazzoni >> +Date: Tue, 6 Feb 2024 15:33:15 +0100 >> +Subject: [PATCH] configure.ac: add detection of symver gcc attribute >> + >> +Upstream: >> +https://lists.gnu.org/archive/html/savannah-hackers-public/2024-02/msg0 >> +0009.html >> + >> +Signed-off-by: Thomas Petazzoni >> +Signed-off-by: Giulio Benetti >> +--- >> + configure.ac | 15 +++++++++++++++ >> + libattr/syscalls.c | 2 +- >> + 2 files changed, 16 insertions(+), 1 deletion(-) >> + >> +diff --git a/configure.ac b/configure.ac index 7e362e9..98477b5 100644 >> +--- a/configure.ac >> ++++ b/configure.ac >> +@@ -57,6 +57,21 @@ AS_CASE([$host_os], >> + [linux*], [os_linux=yes]) >> + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) >> + >> ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, >> ++ gcc_cv_symver_attribute, >> ++ [cat > conftest.c <> ++void foo (void) {} >> ++__typeof(foo) foo __attribute__ ((__symver__("foo at foo"))); EOF >> ++ gcc_cv_symver_attribute=no >> ++ if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then \ >> ++ gcc_cv_symver_attribute=yes >> ++ fi >> ++ rm -f conftest.[cs] >> ++]) >> ++AS_IF([test $gcc_cv_symver_attribute = yes], >> ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver >> ++attribute])]) >> ++ >> + AC_CONFIG_COMMANDS([include/attr], >> + [dnl >> + rm -rf include/attr >> +diff --git a/libattr/syscalls.c b/libattr/syscalls.c index >> +907560a..caa70bc 100644 >> +--- a/libattr/syscalls.c >> ++++ b/libattr/syscalls.c >> +@@ -32,7 +32,7 @@ >> + * fall back to traditional .symver asm directive otherwise. >> + */ >> + #ifdef __has_attribute >> +-# if __has_attribute(__symver__) >> ++# if defined(HAVE_SYMVER_ATTRIBUTE) >> + # define SYMVER(cn, vn) __typeof(cn) cn >> +__attribute__((__symver__(vn))) # elif __has_attribute(__no_reorder__) >> + /* >> +-- >> +2.43.0 >> + >> diff --git a/package/attr/attr.mk b/package/attr/attr.mk index >> 6ecf5c53f4..f4f911333a 100644 >> --- a/package/attr/attr.mk >> +++ b/package/attr/attr.mk >> @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ >> (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL >> ATTR_CPE_ID_VENDOR = attr_project >> >> +# Flag added for patch dealing with symver in configure.ac >> +ATTR_AUTORECONF = YES >> + >> ATTR_INSTALL_STAGING = YES >> >> ATTR_CONF_OPTS = --disable-nls >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot >> CAUTION: This email originated from outside of the organization. Do not click >> links or open attachments unless you recognize the sender and know the >> content is safe. > From james.hilliard1 at gmail.com Tue Feb 6 16:17:15 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 09:17:15 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/python-ml-dtypes: bump to version 0.3.2 Message-ID: <20240206161715.550268-1-james.hilliard1@gmail.com> Migrate from distutils which is being deprecated to setuptools. Drop python-pybind which is no longer required: https://github.com/jax-ml/ml_dtypes/blob/v0.3.2/CHANGELOG.md#032---2024-01-03 Signed-off-by: James Hilliard --- Changes v1 -> v2: - drop pybind --- package/python-ml-dtypes/Config.in | 1 - package/python-ml-dtypes/python-ml-dtypes.hash | 4 ++-- package/python-ml-dtypes/python-ml-dtypes.mk | 9 ++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in index 72506896df..8791564b19 100644 --- a/package/python-ml-dtypes/Config.in +++ b/package/python-ml-dtypes/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy select BR2_PACKAGE_PYTHON_NUMPY - select BR2_PACKAGE_PYTHON_PYBIND help ml_dtypes is a stand-alone implementation of several NumPy dtype extensions used in machine learning libraries. diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash index a440268e39..53bfacb528 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.hash +++ b/package/python-ml-dtypes/python-ml-dtypes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ml_dtypes/json -md5 6adbb05530819bdb4a78d2372d187fe2 ml_dtypes-0.3.1.tar.gz -sha256 60778f99194b4c4f36ba42da200b35ef851ce4d4af698aaf70f5b91fe70fc611 ml_dtypes-0.3.1.tar.gz +md5 438c04dc0d941ec1b3b71667225c74c8 ml_dtypes-0.3.2.tar.gz +sha256 533059bc5f1764fac071ef54598db358c167c51a718f68f5bb55e3dee79d2967 ml_dtypes-0.3.2.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk index 92d23bece4..676137ecf1 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.mk +++ b/package/python-ml-dtypes/python-ml-dtypes.mk @@ -4,16 +4,15 @@ # ################################################################################ -PYTHON_ML_DTYPES_VERSION = 0.3.1 +PYTHON_ML_DTYPES_VERSION = 0.3.2 PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz -PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/16/6e/9a7a51ee1ca24b8e92109128260c5aec8340c8fe5572e9ceecddae559abe +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/39/7d/8d85fcba868758b3a546e6914e727abd8f29ea6918079f816975c9eecd63 PYTHON_ML_DTYPES_LICENSE = Apache-2.0 PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE -PYTHON_ML_DTYPES_SETUP_TYPE = distutils +PYTHON_ML_DTYPES_SETUP_TYPE = setuptools PYTHON_ML_DTYPES_DEPENDENCIES = \ host-python-numpy \ - python-numpy \ - python-pybind + python-numpy $(eval $(python-package)) -- 2.34.1 From vfazio at xes-inc.com Tue Feb 6 16:05:31 2024 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 6 Feb 2024 16:05:31 +0000 Subject: [Buildroot] [External] - [PATCH] package/attr: fix build failure on Microblaze architecture In-Reply-To: <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> References: <20240206161152.0e178414@windsurf> <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> Message-ID: All, Would it make sense to patch GCC for Microblaze to address these at the compiler level instead of constantly patching the packages? I tested https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c6 back when we were solving this problem for xz and had no issues https://gcc.gnu.org/pipermail/gcc/2023-March/240834.html > -----Original Message----- > From: buildroot On Behalf Of Giulio > Benetti > Sent: Tuesday, February 6, 2024 9:54 AM > To: buildroot at buildroot.org; Thomas Petazzoni > > Cc: Giulio Benetti ; Fabrice > Fontaine > Subject: [External] - [Buildroot] [PATCH] package/attr: fix build failure on > Microblaze architecture > > On Microblaze architecture __has_attribute(__symver__) support is broken > and always return true even if symver is not supported so let's add a local > patch pending upstream to detect if symver is supported during autoreconf. > > Fixes: > http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078 > bf77d2a > > Signed-off-by: Giulio Benetti > --- > ...dd-detection-of-symver-gcc-attribute.patch | 56 +++++++++++++++++++ > package/attr/attr.mk | 3 + > 2 files changed, 59 insertions(+) > create mode 100644 package/attr/0002-configure.ac-add-detection-of- > symver-gcc-attribute.patch > > diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc- > attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver- > gcc-attribute.patch > new file mode 100644 > index 0000000000..15bd266d7b > --- /dev/null > +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribu > +++ te.patch > @@ -0,0 +1,56 @@ > +From 1be7c2251040f1152de9ceb5263e6e96fa5c3d75 Mon Sep 17 00:00:00 > 2001 > +From: Thomas Petazzoni > +Date: Tue, 6 Feb 2024 15:33:15 +0100 > +Subject: [PATCH] configure.ac: add detection of symver gcc attribute > + > +Upstream: > +https://lists.gnu.org/archive/html/savannah-hackers-public/2024-02/msg0 > +0009.html > + > +Signed-off-by: Thomas Petazzoni > +Signed-off-by: Giulio Benetti > +--- > + configure.ac | 15 +++++++++++++++ > + libattr/syscalls.c | 2 +- > + 2 files changed, 16 insertions(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac index 7e362e9..98477b5 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -57,6 +57,21 @@ AS_CASE([$host_os], > + [linux*], [os_linux=yes]) > + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) > + > ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, > ++ gcc_cv_symver_attribute, > ++ [cat > conftest.c < ++void foo (void) {} > ++__typeof(foo) foo __attribute__ ((__symver__("foo at foo"))); EOF > ++ gcc_cv_symver_attribute=no > ++ if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then \ > ++ gcc_cv_symver_attribute=yes > ++ fi > ++ rm -f conftest.[cs] > ++]) > ++AS_IF([test $gcc_cv_symver_attribute = yes], > ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver > ++attribute])]) > ++ > + AC_CONFIG_COMMANDS([include/attr], > + [dnl > + rm -rf include/attr > +diff --git a/libattr/syscalls.c b/libattr/syscalls.c index > +907560a..caa70bc 100644 > +--- a/libattr/syscalls.c > ++++ b/libattr/syscalls.c > +@@ -32,7 +32,7 @@ > + * fall back to traditional .symver asm directive otherwise. > + */ > + #ifdef __has_attribute > +-# if __has_attribute(__symver__) > ++# if defined(HAVE_SYMVER_ATTRIBUTE) > + # define SYMVER(cn, vn) __typeof(cn) cn > +__attribute__((__symver__(vn))) # elif __has_attribute(__no_reorder__) > + /* > +-- > +2.43.0 > + > diff --git a/package/attr/attr.mk b/package/attr/attr.mk index > 6ecf5c53f4..f4f911333a 100644 > --- a/package/attr/attr.mk > +++ b/package/attr/attr.mk > @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ > (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL > ATTR_CPE_ID_VENDOR = attr_project > > +# Flag added for patch dealing with symver in configure.ac > +ATTR_AUTORECONF = YES > + > ATTR_INSTALL_STAGING = YES > > ATTR_CONF_OPTS = --disable-nls > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. From thomas.petazzoni at bootlin.com Tue Feb 6 16:25:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:25:40 +0100 Subject: [Buildroot] [External] - [PATCH] package/attr: fix build failure on Microblaze architecture In-Reply-To: References: <20240206161152.0e178414@windsurf> <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> Message-ID: <20240206172540.2d1ed291@windsurf> Hello Vincent, On Tue, 6 Feb 2024 16:05:31 +0000 Vincent Fazio wrote: > Would it make sense to patch GCC for Microblaze to address these at > the compiler level instead of constantly patching the packages? > > I tested https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c6 back > when we were solving this problem for xz and had no issues > https://gcc.gnu.org/pipermail/gcc/2023-March/240834.html It would definitely make sense of course. Have you been able to get the necessary changes accepted in upstream GCC ? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From ismael at iodev.co.uk Tue Feb 6 16:25:53 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 17:25:53 +0100 Subject: [Buildroot] [RFC PATCH v3] docs/website: Add Makefile to pre-generate the website Message-ID: <20240206162555.31657-1-ismael@iodev.co.uk> Supports the current includes plus smu [0] lightweight markup. [0] https://github.com/Gottox/smu Signed-off-by: Ismael Luceno --- Notes: Changes since v2: - Integrate with toplevel makefile - Use parethesis instead of curly braces for variables - Removed smu rule - Copy resources to output directory too - Filter-out footer.html & header.html Makefile | 8 ++++++-- docs/website/incfile.awk | 30 ++++++++++++++++++++++++++++++ docs/website/website.mk | 31 +++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 docs/website/incfile.awk create mode 100644 docs/website/website.mk diff --git a/Makefile b/Makefile index ac625152c678..cd56bc268917 100644 --- a/Makefile +++ b/Makefile @@ -123,7 +123,8 @@ endif noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \ defconfig %_defconfig allyesconfig allnoconfig alldefconfig syncconfig release \ randpackageconfig allyespackageconfig allnopackageconfig \ - print-version olddefconfig distclean manual manual-% check-package + print-version olddefconfig distclean manual manual-% check-package \ + website # Some global targets do not trigger a build, but are used to collect # metadata, or do various checks. When such targets are triggered, @@ -1180,6 +1181,7 @@ help: @echo ' graph-depends - generate graph of the dependency tree' @echo ' graph-size - generate stats of the filesystem size' @echo ' list-defconfigs - list all defconfigs (pre-configured minimal systems)' + @echo ' website - build website' @echo @echo 'Miscellaneous:' @echo ' source - download all sources needed for offline-build' @@ -1234,7 +1236,7 @@ release: OUT = buildroot-$(BR2_VERSION) # documentation to the git output release: git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar - $(MAKE) O=$(OUT) manual-html manual-text manual-pdf + $(MAKE) O=$(OUT) manual-html manual-text manual-pdf website $(MAKE) O=$(OUT) distclean tar rf $(OUT).tar $(OUT) gzip -9 -c < $(OUT).tar > $(OUT).tar.gz @@ -1253,6 +1255,8 @@ check-package: $(Q)./utils/check-package --failed-only `git ls-tree -r --name-only HEAD` \ > .checkpackageignore +include docs/website/website.mk + include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/docs/website/incfile.awk b/docs/website/incfile.awk new file mode 100644 index 000000000000..e8ae571de271 --- /dev/null +++ b/docs/website/incfile.awk @@ -0,0 +1,30 @@ +BEGIN { + FS="\"" +} + +FNR == 1 { + curdir = FILENAME + sub(/[^/]*$/, "", curdir) + if (curdir !~ /[/]$/) + curdir = curdir "/" +} + +{ + do { + if (match($0, /^$/)) { + file_stack[++file_cur] = curdir $2 + } else { + print + } + if (file_cur > 0) { + e = getline < file_stack[file_cur] + if (!e) { + --file_cur + } else if (e == -1) { + printf "%s: read error\n", \ + file_stack[file_cur] \ + > "/dev/stderr" + } + } + } while (file_cur > 0) +} diff --git a/docs/website/website.mk b/docs/website/website.mk new file mode 100644 index 000000000000..d3f7b28aaa07 --- /dev/null +++ b/docs/website/website.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# The Buildroot website +# +################################################################################ + +AWK ?= mawk + +website-dir = $(TOPDIR)/docs/website +website-src = $(wildcard $(website-dir)/*.html) +website-gen = $(filter-out %/header.html %/footer.html,\ + $(website-src:$(website-dir)/%=$(O)/website/%)) +website-res = $(patsubst $(website-dir)/%,$(O)/website/%,$(wildcard \ + $(website-dir)/js/*.js \ + $(website-dir)/css/*.css \ + $(website-dir)/fonts/* \ + $(website-dir)/images/* \ +)) + +website: $(website-gen) $(website-res) + +$(website-res): $(O)/website/%: $(website-dir)/% + install -m644 -D $< $@ + +website-dep = $(website-dir)/website.mk $(website-dir)/incfile.awk + +$(O)/website/%.html: $(website-dir)/%.html $(website-dep) + mkdir -p "$(@D)" + tmpfile=$$(mktemp) && \ + $(AWK) -f $(website-dir)/incfile.awk $< > "$$tmpfile" && \ + mv "$$tmpfile" $@ -- 2.43.0 From romain.naour at smile.fr Tue Feb 6 16:26:20 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 17:26:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/qemu: reenable Qemu user-land emulation for musl toolchains In-Reply-To: <20230112075509.2200-1-caseorum@gmail.com> References: <20230112075509.2200-1-caseorum@gmail.com> Message-ID: Hello, Le 12/01/2023 ? 08:55, Joseph Burt a ?crit?: > Compatible "struct sigevent" added upstream in musl 1.2.2 [1]. > > [1] https://git.musl-libc.org/cgit/musl/commit/?id=7c71792e87691451f2a6b76348e83ad1889f1dcb Ok but it would fail with existing (old) prebuilt musl toolchains. Is musl 1.2.2 old enough? Best regards, Romain > > Signed-off-by: Joseph Burt > --- > package/qemu/Config.in | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/package/qemu/Config.in b/package/qemu/Config.in > index 154b98a541..d818bebb34 100644 > --- a/package/qemu/Config.in > +++ b/package/qemu/Config.in > @@ -102,16 +102,11 @@ comment "systems emulation needs a toolchain w/ dynamic library" > > config BR2_PACKAGE_QEMU_LINUX_USER > bool "Enable Linux user-land emulation" > - # Incompatible "struct sigevent" definition on musl > - depends on !BR2_TOOLCHAIN_USES_MUSL > help > Say 'y' to build Linux user-land emulators. > > # Note: bsd-user can not be build on Linux > > -comment "Linux user-land emulation needs a glibc or uClibc toolchain" > - depends on BR2_TOOLCHAIN_USES_MUSL > - > config BR2_PACKAGE_QEMU_CHOOSE_TARGETS > bool "Select individual emulator targets" > depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER From ismael at iodev.co.uk Tue Feb 6 16:28:55 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 17:28:55 +0100 Subject: [Buildroot] [RFC PATCH v3] docs/website: Add Makefile to pre-generate the website In-Reply-To: <20240206162555.31657-1-ismael@iodev.co.uk> References: <20240206162555.31657-1-ismael@iodev.co.uk> Message-ID: Ignore the commit message, it only supports the server-side includes now. From yann.morin.1998 at free.fr Tue Feb 6 16:30:37 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 17:30:37 +0100 Subject: [Buildroot] [RFC PATCH] docs/website: Add Makefile to pre-generate the website In-Reply-To: References: <20240206144030.18329-1-ismael@iodev.co.uk> Message-ID: Ismael, All, On 2024-02-06 16:21 +0100, Ismael Luceno spake thusly: > On 06/Feb/2024 16:08, Yann E. MORIN wrote: [--SNIP--] > > > +SRCDIR := ${CURDIR} > > Use parentheses not curly braces, to expand variables in Makefiles, > > like we do everyelse in Buildroot: $(..) > > > > (yes, both are valid, but lets be consistent throughout our code base) > OK, I'll change it for v3. I mentioned this before, according to > both GNU and BSD this is legacy syntax, and new stuff should use > curly braces... There is no such deprecation in POSIX: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html > > What is the rationale for using smu and tidy to do the deployement? > > We don't need/want to minimify the content... > smu is for having some markup support, not used for .html files; as > for tidy, it just normalises the html indentation, no minification is > going on. As we discussed IRL, there is no reason to run smu, as we have no markup currently; if we want to add markup in the future, then will be the moment to add the processing, not now. Ditto, cleanup the files with tidy, if that is even needed, should be done as a linter step to fixup the files in the tree, not at deployment time. > > [0] In case of error, we do want to exit in error and be sure this is > > caught at the Makefile level; by using gawk, you can call: > > exit 42 > That also works with any other AWK. Ah, right: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/awk.html There is however no requirement on any awk implementation for Buildroot, then just default to: AWK=awk Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Tue Feb 6 16:31:08 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 17:31:08 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <20231204231212.36450-3-kilian.zinnecker@mail.de> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-3-kilian.zinnecker@mail.de> Message-ID: <8f6baf1d-3caa-4b47-aad9-a34fa0761058@benettiengineering.com> Hi Yegor, Kilian, On 05/12/23 00:12, yegorslists--- via buildroot wrote: > From: Kilian Zinnecker > > This patch adds board support for the BeagleV-Ahead. It uses a > custom kernel for the board's SoC. As the SoC has an outdated and > currently not supported version of the RISC-V vector extension, the > vector extension is disabled. can you please provide an URL to the product page? > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 2 + > board/beaglev-ahead/genimage.cfg | 62 ++++++++++++++++ > board/beaglev-ahead/linux.fragment | 2 + > .../0001-Overwrite-bootcmd-by-force.patch | 30 ++++++++ > board/beaglev-ahead/post-image.sh | 6 ++ > board/beaglev-ahead/readme.txt | 70 +++++++++++++++++++ > board/beaglev-ahead/uEnv.txt | 4 ++ > board/beaglev-ahead/uboot.fragment | 2 + > configs/beaglev_ahead_defconfig | 44 ++++++++++++ > 9 files changed, 222 insertions(+) > create mode 100644 board/beaglev-ahead/genimage.cfg > create mode 100644 board/beaglev-ahead/linux.fragment > create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > create mode 100755 board/beaglev-ahead/post-image.sh > create mode 100644 board/beaglev-ahead/readme.txt > create mode 100644 board/beaglev-ahead/uEnv.txt > create mode 100644 board/beaglev-ahead/uboot.fragment > create mode 100644 configs/beaglev_ahead_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index 4d18bc49d4..71f672f9e6 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1839,7 +1839,9 @@ N: Kieran Bingham > F: package/libcamera/ > > N: Kilian Zinnecker > +F: board/beaglev-ahead/ > F: board/radxa/rock5b/ > +F: configs/beaglev_ahead_defconfig > F: configs/rock5b_defconfig > F: package/rockchip-rkbin/ > F: package/xuantie-bins/ > diff --git a/board/beaglev-ahead/genimage.cfg b/board/beaglev-ahead/genimage.cfg > new file mode 100644 > index 0000000000..080b169527 > --- /dev/null > +++ b/board/beaglev-ahead/genimage.cfg > @@ -0,0 +1,62 @@ > +# SD card image for BeagleV-Ahead > + > +image boot.vfat { > + vfat { > + files = { > + "fw_dynamic.bin", > + "Image", > + "light_aon_fpga.bin", > + "light-beagle.dtb", > + "light_c906_audio.bin", > + } > + > + file uEnv.txt { > + image = "uEnv.txt" > + } > + > + file overlays/BBORG_LOAD-00A2.dtbo { > + image = "overlays/BBORG_LOAD-00A2.dtbo" > + } > + > + file overlays/BBORG_RELAY-00A2.dtbo { > + image = "overlays/BBORG_RELAY-00A2.dtbo" > + } > + > + file overlays/BONE-LED_P8_03.dtbo { > + image = "overlays/BONE-LED_P8_03.dtbo" > + } > + > + file overlays/BONE-LED_P9_11.dtbo { > + image = "overlays/BONE-LED_P9_11.dtbo" > + } > + > + file overlays/BVA-MIKROBUS-0.dtbo { > + image = "overlays/BVA-MIKROBUS-0.dtbo" > + } > + } > + size = 48M > +} > + > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 2M > + } > + > + partition uboot { > + in-partition-table = "false" > + image = "u-boot-with-spl.bin" > + offset = 0 > + holes = {"(440; 1048576)"} > + } > + > + partition boot { > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + image = "rootfs.ext2" > + } > +} > + > diff --git a/board/beaglev-ahead/linux.fragment b/board/beaglev-ahead/linux.fragment > new file mode 100644 > index 0000000000..00f93f39a4 > --- /dev/null > +++ b/board/beaglev-ahead/linux.fragment > @@ -0,0 +1,2 @@ > +# CONFIG_VECTOR is not set > +# CONFIG_VECTOR_0_7 is not set > diff --git a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > new file mode 100644 > index 0000000000..32cd6fa975 > --- /dev/null > +++ b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > @@ -0,0 +1,30 @@ > +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 > +From: Kilian Zinnecker > +Date: Mon, 21 Aug 2023 23:51:59 +0200 > +Subject: [PATCH] Overwrite bootcmd by force > + > +This patch is a dirty hack: Trying to overwrite the bootcmd via the > +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted > +to some preset value and could not be changed easily. Therefore a > +hook is used to force the bootcmd to be overwritten. > + > +Signed-off-by: Kilian Zinnecker > +--- > + board/thead/light-c910/light.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c > +index 8d5478e916..1448db974e 100644 > +--- a/board/thead/light-c910/light.c > ++++ b/board/thead/light-c910/light.c > +@@ -2282,6 +2282,7 @@ int board_late_init(void) > + light_usb_boot_check(); > + do_firmware_load(); > + ap_peri_clk_disable(); > ++ run_command("load mmc 1:1 $ramdisk_addr_r uEnv.txt; env import -t $ramdisk_addr_r $filesize; run uenvcmd", 0); > + return 0; > + } > + > +-- > +2.34.1 > + > diff --git a/board/beaglev-ahead/post-image.sh b/board/beaglev-ahead/post-image.sh > new file mode 100755 > index 0000000000..9e16eeff3f > --- /dev/null > +++ b/board/beaglev-ahead/post-image.sh > @@ -0,0 +1,6 @@ > +#!/usr/bin/env bash > +set -e > + > +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ ${BINARIES_DIR} linux-custom should substituted with $(LINUX_DIR) > +cp board/beaglev-ahead/uEnv.txt ${BINARIES_DIR}/ > +support/scripts/genimage.sh -c board/beaglev-ahead/genimage.cfg > diff --git a/board/beaglev-ahead/readme.txt b/board/beaglev-ahead/readme.txt > new file mode 100644 > index 0000000000..21aceb23c9 > --- /dev/null > +++ b/board/beaglev-ahead/readme.txt > @@ -0,0 +1,70 @@ > +BeagleV-Ahead > +============== > +https://forum.beagleboard.org/c/beaglev/ > + > +Build: > +====== > + $ make beaglev_ahead_defconfig > + $ make > + > +Files created in output directory > +================================= > + > +output/images > +. > +??? Image > +??? boot.vfat > +??? bootloader-JH7100-buildroot.bin.out > +??? ddrinit-2133-buildroot.bin.out > +??? fw_dynamic.bin > +??? fw_dynamic.elf > +??? fw_jump.bin > +??? fw_jump.elf > +??? fw_payload.bin > +??? fw_payload.elf > +??? light-beagle.dtb > +??? light_aon_fpga.bin > +??? light_c906_audio.bin > +??? overlays > +??? rootfs.ext2 > +??? rootfs.ext4 > +??? rootfs.tar > +??? sdcard.img > +??? u-boot-with-spl.bin > +??? u-boot.bin > +??? uEnv.txt > + > +Creating bootable SD card: > +========================== > + > +Simply invoke (as root) > + > +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync > + > +Where X is your SD card device. > + > +Booting: > +======== > + > +SD card boot button: > +-------------------- > +To let the board boot from SD card, keep the "SD button" pressed during power > +up / power cycle. The button is near the SD card slot. > + > +Serial console: > +--------------- > +The BeagleV-Ahead has a "Debug" GPIO header. Its layout can be seen here: > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/02-quick-start.html#access-uart-debug-console > + > +Note, that there are reported issues with some uart interface cables/dongles: > +https://forum.beagleboard.org/t/beaglev-ahead-debug-terminal-problems/35331 > + > +Baudrate for this board is 115200. > + > +Login: > +------ > +Enter 'root' as login user, and the prompt is ready. > + > +wiki link: > +---------- > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/index.html > diff --git a/board/beaglev-ahead/uEnv.txt b/board/beaglev-ahead/uEnv.txt > new file mode 100644 > index 0000000000..7e98ae5f81 > --- /dev/null > +++ b/board/beaglev-ahead/uEnv.txt > @@ -0,0 +1,4 @@ > +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} > +uenvcmd=fatload mmc 1:1 ${kernel_addr_r} Image; fatload mmc 1:1 ${fdt_addr_r} light-beagle.dtb > +bootargs=root=/dev/mmcblk1p2 rootfstype=ext4 rootwait ro console=ttyS0,115200 earlycon clk_ignore_unused net.ifnames=0 > + > diff --git a/board/beaglev-ahead/uboot.fragment b/board/beaglev-ahead/uboot.fragment > new file mode 100644 > index 0000000000..1f51cef106 > --- /dev/null > +++ b/board/beaglev-ahead/uboot.fragment > @@ -0,0 +1,2 @@ > +CONFIG_LEGACY_IMAGE_FORMAT=y > +CONFIG_AUTOBOOT=y > diff --git a/configs/beaglev_ahead_defconfig b/configs/beaglev_ahead_defconfig > new file mode 100644 > index 0000000000..4b349cc6f9 > --- /dev/null > +++ b/configs/beaglev_ahead_defconfig > @@ -0,0 +1,44 @@ > +BR2_riscv=y > +BR2_riscv_custom=y > +BR2_RISCV_ISA_CUSTOM_RVM=y > +BR2_RISCV_ISA_CUSTOM_RVA=y > +BR2_RISCV_ISA_CUSTOM_RVF=y > +BR2_RISCV_ISA_CUSTOM_RVD=y > +BR2_RISCV_ISA_CUSTOM_RVC=y With commit cbd91e89e43d600172c62fd1cbd33aa74d0a851a all "_CUSTOM" have been dropped, so can you please replace all the: BR2_RISCV_ISA_CUSTOM_* occurences with: BR2_RISCV_ISA_* ? > +BR2_GCC_VERSION_13_X=y I think there is a reason you force using gcc 13, can you describe it in the commit log and here? > +BR2_GLOBAL_PATCH_DIR="board/beaglev-ahead/patches" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglev-ahead/post-image.sh" > +BR2_TARGET_GENERIC_HOSTNAME="BeagleV-Ahead" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the BeagleV-Ahead" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/linux/archive/refs/heads/beaglev-v5.10.113-1.1.2-ubuntu.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="beaglev" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/light-beagle" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/linux.fragment" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_BEAGLEV_DDRINIT=y > +BR2_TARGET_BEAGLEV_SECONDBOOT=y > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-opensbi/archive/refs/heads/0.9-1.1.2-ubuntu.tar.gz" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-u-boot/archive/refs/heads/beaglev-v2020.01-1.1.2-ubuntu.tar.gz" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="light_beagle" > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragment" > +BR2_TARGET_UBOOT_FORMAT_BIN=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" Here you need to add: BR2_PACKAGE_HOST_DOSFSTOOLS=y otherwise it fails to build under buildroot/utils/docker-run > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_XUANTIE_BINS=y After enabling BR2_RISCV_ISA_ options it builds successfully using buildroot/utils/docker-run Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Tue Feb 6 16:31:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:31:43 +0100 Subject: [Buildroot] [git commit] boot/arm-trusted-firmware: change BR_NO_CHECK_HASH_FOR logic Message-ID: <20240206163157.A9D6487135@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6ab9328e13c6c9a1538b4a33824525a990b623d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, arm-trusted-firmware checks the hash only if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION=y. As we're about to introduce other version options for which the hash checking is needed, let's reverse the logic, and instead ignore hash checking if we're using a custom version or custom git or custom tarball. Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 7f9c896387..89cdf48c70 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -25,7 +25,7 @@ ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif endif -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) endif From thomas.petazzoni at bootlin.com Tue Feb 6 16:31:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:31:45 +0100 Subject: [Buildroot] [git commit] configs/stm32mp157a_dk1_defconfig: update arm-trusted-firmware to lts-v2.8.13 Message-ID: <20240206163157.C36F987137@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5367c08162aea89f0b1140d80a134ce67d0252d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The assumption is that updates to the stable branch should not break anything, so we use the latest LTS rather than a specific version. Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- configs/stm32mp157a_dk1_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/stm32mp157a_dk1_defconfig b/configs/stm32mp157a_dk1_defconfig index 3122c9647a..aed6cfad34 100644 --- a/configs/stm32mp157a_dk1_defconfig +++ b/configs/stm32mp157a_dk1_defconfig @@ -27,8 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y From thomas.petazzoni at bootlin.com Tue Feb 6 16:31:46 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:31:46 +0100 Subject: [Buildroot] [git commit] configs/stm32mp157c_dk2_defconfig: update arm-trusted-firmware to lts-v2.8.13 Message-ID: <20240206163157.D460287138@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81724d15cdaded0b40cd76f1736002fc6fef2554 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The assumption is that updates to the stable branch should not break anything, so we use the latest LTS rather than a specific version. Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- configs/stm32mp157c_dk2_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/stm32mp157c_dk2_defconfig b/configs/stm32mp157c_dk2_defconfig index 7472be38bb..c48705b2fb 100644 --- a/configs/stm32mp157c_dk2_defconfig +++ b/configs/stm32mp157c_dk2_defconfig @@ -27,8 +27,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y From thomas.petazzoni at bootlin.com Tue Feb 6 16:31:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:31:44 +0100 Subject: [Buildroot] [git commit] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 Message-ID: <20240206163157.B64DD87136@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2a310666e06c9c5edd6879d32295c63b7851c817 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as found in v2.8 patch dir has already been applied in lts-v2.8.13 Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has been included as 0001-build-tools-avoid-unnecessary-link.patch for lts-v2.8.13 Signed-off-by: Marleen Vos Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 6 ++ .../arm-trusted-firmware/arm-trusted-firmware.hash | 1 + .../0001-build-tools-avoid-unnecessary-link.patch | 77 ++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index c65f4aaba2..2fe3dd1146 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.10" +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION + bool "latest lts-v2.8.x" + help + Select the latest LTS v2.8.x version available + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION bool "Custom version" help @@ -43,6 +48,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string default "v2.10" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "lts-v2.8.13" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index c63e9d30b0..73ab431b9f 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,4 @@ # Locally calculated sha256 2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c arm-trusted-firmware-v2.10.tar.gz +sha256 e55ae7105c996b60f748b2eb6adeaf5ac8946425e1d4294ecc1c56aebf435274 arm-trusted-firmware-lts-v2.8.13.tar.gz sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 0000000000..9e0ea74248 --- /dev/null +++ b/boot/arm-trusted-firmware/lts-v2.8.13/0001-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehl?? +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + From thomas.petazzoni at bootlin.com Tue Feb 6 16:38:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:38:01 +0100 Subject: [Buildroot] [PATCH 4/7] boot/arm-trusted-firmware: add config option to use latest lts-v2.8.13 In-Reply-To: <20231219121508.1695768-5-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-5-marleen.vos@mind.be> Message-ID: <20240206173801.02d805c1@windsurf> Hello Marleen, On Tue, 19 Dec 2023 13:15:05 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > Patch 0001-feat-build-add-support-for-new-binutils-versions.patch as > found in v2.8 patch dir has already been applied in lts-v2.8.13 > Patch 0002-build-tools-avoid-unnecessary-link.patch from v2.8 has > been included as 0001-build-tools-avoid-unnecessary-link.patch for > lts-v2.8.13 > > Signed-off-by: Marleen Vos Thanks for the good arguments from Arnout, we got convinced and applied your patch to master, with a few changes, see below. > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_v2_8_VERSION ^^^ we dropped the "v" from here > sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz > +sha256 e55ae7105c996b60f748b2eb6adeaf5ac8946425e1d4294ecc1c56aebf435274 trusted-firmware-a-lts-v2.8.13.tar.gz We were surprised by the files having different base names here. Turns out the hash of trusted-firmware-a-lts-v2.8.13.tar.gz was in fact never checked, which is why you didn't release that trusted-firmware-a-lts-v2.8.13.tar.gz was an incorrect file name. So we added a preliminary commit to make sure that this hash will be checked, and fixed the file name. See: https://gitlab.com/buildroot.org/buildroot/-/commit/c6ab9328e13c6c9a1538b4a33824525a990b623d https://gitlab.com/buildroot.org/buildroot/-/commit/2a310666e06c9c5edd6879d32295c63b7851c817 Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 16:38:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:38:17 +0100 Subject: [Buildroot] [PATCH 5/7] configs/stm32mp157a_dk1_defconfig: update arm-trusted-firmware to lts-v2.8.13 In-Reply-To: <20231219121508.1695768-6-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-6-marleen.vos@mind.be> Message-ID: <20240206173817.35dea315@windsurf> On Tue, 19 Dec 2023 13:15:06 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > The assumption is that updates to the stable branch should not break anything, > so we use the latest LTS rather than a specific version. > > Signed-off-by: Marleen Vos > --- > configs/stm32mp157a_dk1_defconfig | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Applied to master after adjusting the changes in the defconfig file to the changes we made to the option name, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 16:38:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:38:22 +0100 Subject: [Buildroot] [PATCH 6/7] configs/stm32mp157c_dk2_defconfig: update arm-trusted-firmware to lts-v2.8.13 In-Reply-To: <20231219121508.1695768-7-marleen.vos@mind.be> References: <20231219121508.1695768-1-marleen.vos@mind.be> <20231219121508.1695768-7-marleen.vos@mind.be> Message-ID: <20240206173822.27cbeb7b@windsurf> On Tue, 19 Dec 2023 13:15:07 +0100 Marleen Vos via buildroot wrote: > From: Marleen Vos > > The assumption is that updates to the stable branch should not break anything, > so we use the latest LTS rather than a specific version. > > Signed-off-by: Marleen Vos > --- > configs/stm32mp157c_dk2_defconfig | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Applied to master after adjusting the changes in the defconfig file to the changes we made to the option name, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From vfazio at xes-inc.com Tue Feb 6 16:38:58 2024 From: vfazio at xes-inc.com (Vincent Fazio) Date: Tue, 6 Feb 2024 16:38:58 +0000 Subject: [Buildroot] [External] - [PATCH] package/attr: fix build failure on Microblaze architecture In-Reply-To: <20240206172540.2d1ed291@windsurf> References: <20240206161152.0e178414@windsurf> <20240206155413.1349720-1-giulio.benetti@benettiengineering.com> <20240206172540.2d1ed291@windsurf> Message-ID: Thomas, > -----Original Message----- > From: Thomas Petazzoni > Sent: Tuesday, February 6, 2024 10:26 AM > To: Vincent Fazio > Cc: Giulio Benetti ; > buildroot at buildroot.org; Fabrice Fontaine > Subject: Re: [External] - [Buildroot] [PATCH] package/attr: fix build failure on > Microblaze architecture > > Hello Vincent, > > On Tue, 6 Feb 2024 16:05:31 +0000 > Vincent Fazio wrote: > > > Would it make sense to patch GCC for Microblaze to address these at > > the compiler level instead of constantly patching the packages? > > > > I tested https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c6 back > > when we were solving this problem for xz and had no issues > > https://gcc.gnu.org/pipermail/gcc/2023-March/240834.html > > It would definitely make sense of course. Have you been able to get the > necessary changes accepted in upstream GCC ? > The mailing list conversation died out very quickly, but I can try to submit the patch for this specific fixup. I didn't feel comfortable with migrating all of Microblaze to elfos.h as that got very nasty, very quickly and the only change we (Buildroot) need is the `ASM_OUTPUT_SYMVER_DIRECTIVE` macro. > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel > engineering and training https://bootlin.com From peter at korsgaard.com Tue Feb 6 16:50:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 17:50:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.13.0 In-Reply-To: <20240205065335.22493-1-jubalh@iodoru.org> (Michael Vetter's message of "Mon, 5 Feb 2024 07:53:35 +0100") References: <20240205065335.22493-1-jubalh@iodoru.org> Message-ID: <878r3x7d12.fsf@48ers.dk> >>>>> "Michael" == Michael Vetter writes: > Signed-off-by: Michael Vetter Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 16:48:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 17:48:53 +0100 Subject: [Buildroot] [git commit] package/libstrophe: bump to version 0.13.0 Message-ID: <20240206165036.74EE48713A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e4b9ed4792cfc63366afe6f75ee051a105b6e8b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Vetter Signed-off-by: Peter Korsgaard --- package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index a6a529eb6c..e284e8cca6 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d82e9e8585b8fc68fb91791377fbfb0051b98259a0ec64cf31c8a09bb7e2621e libstrophe-0.12.3.tar.xz +sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index ad0860ad30..257593bbec 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.12.3 +LIBSTROPHE_VERSION = 0.13.0 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Tue Feb 6 16:51:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 17:51:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2_ttf: bump version to 2.22.0 In-Reply-To: <20240131201747.23175-1-peter.macleod.thompson@gmail.com> (Peter Thompson's message of "Wed, 31 Jan 2024 13:17:47 -0700") References: <20240131201747.23175-1-peter.macleod.thompson@gmail.com> Message-ID: <874jel7cys.fsf@48ers.dk> >>>>> "Peter" == Peter Thompson writes: > From: Peter Macleod Thompson > Update LICENSE.txt hash for change in copyright year to 2024 > Signed-off-by: Peter Macleod Thompson Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 16:50:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 17:50:52 +0100 Subject: [Buildroot] [git commit] package/sdl2_ttf: bump version to 2.22.0 Message-ID: <20240206165230.711F587141@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=99186e42f0243c33666a188c6a1e2bead50e8b97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update LICENSE.txt hash for change in copyright year to 2024 Signed-off-by: Peter Macleod Thompson Signed-off-by: Peter Korsgaard --- package/sdl2_ttf/sdl2_ttf.hash | 4 ++-- package/sdl2_ttf/sdl2_ttf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index f43ec790fd..7693aeba6b 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9dc71ed93487521b107a2c4a9ca6bf43fb62f6bddd5c26b055e6b91418a22053 SDL2_ttf-2.20.2.tar.gz -sha256 1852c8549e3d154687197d46abababd3e8faae035f19991b2ca850fa3a43ad57 LICENSE.txt +sha256 d48cbd1ce475b9e178206bf3b72d56b66d84d44f64ac05803328396234d67723 SDL2_ttf-2.22.0.tar.gz +sha256 a0e8ce06504966e45088ee1cc7583cc8af9aac615d4cf56d47d847da9cb15139 LICENSE.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index c2c4b660f8..f4f293cec1 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.20.2 +SDL2_TTF_VERSION = 2.22.0 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release SDL2_TTF_LICENSE = Zlib From giulio.benetti at benettiengineering.com Tue Feb 6 16:56:06 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 17:56:06 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/xuantie-bins: new package In-Reply-To: <20231204231212.36450-2-kilian.zinnecker@mail.de> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-2-kilian.zinnecker@mail.de> Message-ID: <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> Hi Yegor, Kilian, On 05/12/23 00:12, yegorslists--- via buildroot wrote: > From: Kilian Zinnecker > > This patch adds a package for Xuantie binary blobs. These binaries > are needed for the BeagleV-Ahead. > > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 5 +++-- > package/Config.in | 1 + > package/xuantie-bins/Config.in | 6 ++++++ > package/xuantie-bins/xuantie-bins.hash | 1 + > package/xuantie-bins/xuantie-bins.mk | 27 ++++++++++++++++++++++++++ > 5 files changed, 38 insertions(+), 2 deletions(-) > create mode 100644 package/xuantie-bins/Config.in > create mode 100644 package/xuantie-bins/xuantie-bins.hash > create mode 100644 package/xuantie-bins/xuantie-bins.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index f504ca8d36..4d18bc49d4 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1839,9 +1839,10 @@ N: Kieran Bingham > F: package/libcamera/ > > N: Kilian Zinnecker > -F: package/rockchip-rkbin/ > -F: configs/rock5b_defconfig > F: board/radxa/rock5b/ > +F: configs/rock5b_defconfig can you please provide a separate patch to alphabetize? > +F: package/rockchip-rkbin/ > +F: package/xuantie-bins/ > > N: Klaus Heinrich Kiwi > F: package/wqy-zenhei/ > diff --git a/package/Config.in b/package/Config.in > index fcc09b07c4..3772e2ac81 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -653,6 +653,7 @@ endmenu > source "package/wipe/Config.in" > source "package/xorriso/Config.in" > source "package/xr819-xradio/Config.in" > + source "package/xuantie-bins/Config.in" > endmenu > > menu "Interpreter languages and scripting" > diff --git a/package/xuantie-bins/Config.in b/package/xuantie-bins/Config.in > new file mode 100644 > index 0000000000..a04497ce6b > --- /dev/null > +++ b/package/xuantie-bins/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_XUANTIE_BINS > + bool "xuantie-bins" > + depends on BR2_riscv > + help > + This package provides binary blobs, needed for the > + BeagleV-Ahead's SoC (TH1520). Can you please describe a bit what those binaries are meant for? > diff --git a/package/xuantie-bins/xuantie-bins.hash b/package/xuantie-bins/xuantie-bins.hash > new file mode 100644 > index 0000000000..4d1ec297c9 > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.hash > @@ -0,0 +1 @@ > +sha256 608e9fec79823996004f65ba692a76d741307b0de23552d147ad1b567e7054dc xuantie-bins-0a2e02bb53758cc12448d8670e65c854528a96b4-br1.tar.gz > diff --git a/package/xuantie-bins/xuantie-bins.mk b/package/xuantie-bins/xuantie-bins.mk > new file mode 100644 > index 0000000000..3a5611cf36 > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.mk > @@ -0,0 +1,27 @@ > +################################################################################ > +# > +# xuantie-bins > +# > +################################################################################ > + > +XUANTIE_BINS_VERSION = 0a2e02bb53758cc12448d8670e65c854528a96b4 > +XUANTIE_BINS_SITE = https://github.com/beagleboard/xuantie-ubuntu.git > +XUANTIE_BINS_SITE_METHOD = git > +XUANTIE_BINS_LICENSE = PROPRIETARY > + > +XUANTIE_BINS_INSTALL_IMAGES = YES > +XUANTIE_BINS_INSTALL_TARGET = NO > + > +XUANTIE_BINS_FPGA_BIN_FILENAME = "bins/light_aon_fpga.bin" > +XUANTIE_BINS_AUDIO_BIN_FILENAME = "bins/light_c906_audio.bin" > + > +define XUANTIE_BINS_INSTALL_IMAGES_CMDS > + $(foreach f, \ > + $(XUANTIE_BINS_FPGA_BIN_FILENAME) \ > + $(XUANTIE_BINS_AUDIO_BIN_FILENAME) \ > + , \ > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(f) > + ) > +endef Being only 2 files to be installed I'd prefer to see 2 lines instead of foreach loop. Can you please change it accordingly? Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From arnout at mind.be Tue Feb 6 16:57:09 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 17:57:09 +0100 Subject: [Buildroot] [PATCH] support/pkg-stats: list packages from external trees. In-Reply-To: <20221102103428.82414-1-juan.carrano@ebee.berlin> References: <20221102103428.82414-1-juan.carrano@ebee.berlin> Message-ID: <18a19685-2383-4f27-81d5-b4db3a126b53@mind.be> Hi Juan, On 02/11/2022 11:34, Juan Carrano wrote: > Search the external trees for package files and add them to the list. > The list of directories walked and excluded are the same as for the main > tree, and should work out of the box if the user sticks to the directory > structure suggested in the manual. > > Two additional properties were added to the Package class, the tree name and > the path. For consistency and to simplify the code, packages in the main tree > are marked as coming from "BR2". > > The HTML output has a new column listing the external name (or "BR2") and the > json output has a new property "tree". > > Signed-off-by: Juan Carrano After more than a year, finally applied to master. There's really no excuse that it takes so long, other than that the maintainers are a bit overloaded. I made a few minor changes. - fix flake8 error "'itertools' imported but unused"; - use str.split instead of str.partition; - use BR2_EXTERNAL_BUILDROOT_PATH instead of BR2_EXTERNAL_BR2_PATH; - remove pkgdir variable, instead use self.pkgdir. Regards, Arnout > --- > support/scripts/pkg-stats | 90 ++++++++++++++++++++++++++------------- > 1 file changed, 60 insertions(+), 30 deletions(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index 3248e3678d..2dfcc54d57 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -23,7 +23,7 @@ import asyncio > import datetime > import fnmatch > import os > -from collections import defaultdict > +from collections import defaultdict, namedtuple > import re > import subprocess > import json > @@ -32,6 +32,7 @@ import time > import gzip > import xml.etree.ElementTree > import requests > +import itertools > > brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")) > > @@ -77,6 +78,19 @@ def get_defconfig_list(): > ] > > > +Br2Tree = namedtuple("Br2Tree", ["name", "path"]) > + > + > +def get_trees(): > + raw_variables = subprocess.check_output(["make", "--no-print-directory", "-s", > + "BR2_HAVE_DOT_CONFIG=y", "printvars", > + "VARS=BR2_EXTERNAL_NAMES BR2_EXTERNAL_%_PATH"]) > + variables = dict(line.partition("=")[0::2] for line in raw_variables.decode().split("\n") if line) > + variables["BR2_EXTERNAL_BR2_PATH"] = brpath > + externals = ["BR2", *variables["BR2_EXTERNAL_NAMES"].split()] > + return [Br2Tree(name, os.path.normpath(variables[f"BR2_EXTERNAL_{name}_PATH"])) for name in externals] > + > + > class Package: > all_licenses = dict() > all_license_files = list() > @@ -89,7 +103,9 @@ class Package: > status_checks = ['cve', 'developers', 'hash', 'license', > 'license-files', 'patches', 'pkg-check', 'url', 'version'] > > - def __init__(self, name, path): > + def __init__(self, tree, name, path): > + self.tree = tree.name > + self.tree_path = tree.path > self.name = name > self.path = path > self.pkg_path = os.path.dirname(path) > @@ -118,12 +134,24 @@ class Package: > def pkgvar(self): > return self.name.upper().replace("-", "_") > > + @property > + def pkgdir(self): > + return os.path.join(self.tree_path, self.pkg_path) > + > + @property > + def pkgfile(self): > + return os.path.join(self.tree_path, self.path) > + > + @property > + def hashpath(self): > + return self.pkgfile.replace(".mk", ".hash") > + > def set_url(self): > """ > Fills in the .url field > """ > self.status['url'] = ("warning", "no Config.in") > - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) > + pkgdir = self.pkgdir > for filename in os.listdir(pkgdir): > if fnmatch.fnmatch(filename, 'Config.*'): > fp = open(os.path.join(pkgdir, filename), "r") > @@ -172,7 +200,7 @@ class Package: > keep_target = True > > self.infras = list() > - with open(os.path.join(brpath, self.path), 'r') as f: > + with open(self.pkgfile, 'r') as f: > lines = f.readlines() > for line in lines: > match = INFRA_RE.match(line) > @@ -211,8 +239,7 @@ class Package: > self.status['hash-license'] = ("na", "no valid package infra") > return > > - hashpath = self.path.replace(".mk", ".hash") > - if os.path.exists(os.path.join(brpath, hashpath)): > + if os.path.exists(self.hashpath): > self.status['hash'] = ("ok", "found") > else: > self.status['hash'] = ("error", "missing") > @@ -225,8 +252,7 @@ class Package: > self.status['patches'] = ("na", "no valid package infra") > return > > - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) > - for subdir, _, _ in os.walk(pkgdir): > + for subdir, _, _ in os.walk(self.pkgdir): > self.patch_files = fnmatch.filter(os.listdir(subdir), '*.patch') > > if self.patch_count == 0: > @@ -268,9 +294,8 @@ class Package: > Fills in the .warnings and .status['pkg-check'] fields > """ > cmd = [os.path.join(brpath, "utils/check-package")] > - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) > self.status['pkg-check'] = ("error", "Missing") > - for root, dirs, files in os.walk(pkgdir): > + for root, dirs, files in os.walk(self.pkgdir): > for f in files: > if f.endswith(".mk") or f.endswith(".hash") or f == "Config.in" or f == "Config.in.host": > cmd.append(os.path.join(root, f)) > @@ -328,7 +353,7 @@ class Package: > self.is_status_ok('license-files'), self.status['hash'], self.patch_count) > > > -def get_pkglist(npackages, package_list): > +def get_pkglist(trees, npackages, package_list): > """ > Builds the list of Buildroot packages, returning a list of Package > objects. Only the .name and .path fields of the Package object are > @@ -358,8 +383,8 @@ def get_pkglist(npackages, package_list): > "toolchain/toolchain-wrapper.mk"] > packages = list() > count = 0 > - for root, dirs, files in os.walk(brpath): > - root = os.path.relpath(root, brpath) > + for br_tree, root, dirs, files in ((tree, *rdf) for tree in trees for rdf in os.walk(tree.path)): > + root = os.path.relpath(root, br_tree.path) > rootdir = root.split("/") > if len(rootdir) < 1: > continue > @@ -380,7 +405,7 @@ def get_pkglist(npackages, package_list): > continue > if skip: > continue > - p = Package(pkgname, pkgpath) > + p = Package(br_tree, pkgname, pkgpath) > packages.append(p) > count += 1 > if npackages and count == npackages: > @@ -854,7 +879,7 @@ function expandField(fieldId){ > #package-grid, #results-grid { > display: grid; > grid-gap: 2px; > - grid-template-columns: 1fr repeat(12, min-content); > + grid-template-columns: min-content 1fr repeat(12, min-content); > } > #results-grid { > grid-template-columns: 3fr 1fr; > @@ -920,6 +945,8 @@ def boolean_str(b): > > def dump_html_pkg(f, pkg): > pkg_css_class = pkg.path.replace("/", "_")[:-3] > + f.write(f'
    + class="tree data _{pkg_css_class}">{pkg.tree}
    \n') > f.write(f'
    class="package data _{pkg_css_class}">{pkg.path}
    \n') > # Patch count > @@ -1122,31 +1149,33 @@ def dump_html_pkg(f, pkg): > def dump_html_all_pkgs(f, packages): > f.write(""" >
    > -
    +
    + class="tree data label">Tree
    > +
    class="package data label">Package
    > -
    +
    class="centered patch_count data label">Patch count
    > -
    +
    class="centered infrastructure data label">Infrastructure
    > -
    +
    class="centered license data label">License
    > -
    +
    class="centered license_files data label">License files
    > -
    +
    class="centered hash_file data label">Hash file
    > -
    +
    class="centered current_version data label">Current version
    > -
    +
    class="centered latest_version data label">Latest version
    > -
    +
    class="centered warnings data label">Warnings
    > -
    +
    class="centered upstream_url data label">Upstream URL
    > -
    +
    class="centered cves data label">CVEs
    > -
    +
    class="centered ignored_cves data label">CVEs Ignored
    > -
    +
    class="centered cpe_id data label">CPE ID
    > """) > for pkg in sorted(packages): > @@ -1217,7 +1246,7 @@ def dump_html(packages, stats, date, commit, output): > def dump_json(packages, defconfigs, stats, date, commit, output): > # Format packages as a dictionnary instead of a list > # Exclude local field that does not contains real date > - excluded_fields = ['url_worker', 'name'] > + excluded_fields = ['url_worker', 'name', 'tree_path'] > pkgs = { > pkg.name: { > k: v > @@ -1305,7 +1334,8 @@ def __main__(): > 'rev-parse', > 'HEAD']).splitlines()[0].decode() > print("Build package list ...") > - packages = get_pkglist(args.npackages, package_list) > + all_trees = get_trees() > + packages = get_pkglist(all_trees, args.npackages, package_list) > print("Getting developers ...") > developers = parse_developers() > print("Build defconfig list ...") From thomas.petazzoni at bootlin.com Tue Feb 6 16:57:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:57:18 +0100 Subject: [Buildroot] [git commit] package/binutils-bare-metal: new package Message-ID: <20240206165731.4216487178@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11b439ce1bd28506051fff14646f8bbdbbbe58d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds a new package for building binutils for a bare-metal toolchain. The cpu architecture is defined by a toolchain-bare-metal virtual package. While any cpu architecture could be used, the default configuration will be a Xilinx microblaze little endian architecture, so that buildroot will be able to build the microblaze firmware applications for zynqmp and versal. In order to build the zynqmp pmufw and versal plm applications without error, binutils version 2.41 or higher is required. Signed-off-by: Neal Frager Signed-off-by: Ibai Erkiaga Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ .../binutils-bare-metal/binutils-bare-metal.hash | 1 + package/binutils-bare-metal/binutils-bare-metal.mk | 33 ++++++++++++++++++++++ package/binutils/binutils.hash | 1 + 4 files changed, 37 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 5cc4d37aef..9f93746015 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1386,6 +1386,7 @@ N: Ian Haylock F: package/python-rpi-gpio/ N: Ibai Erkiaga +F: package/binutils-bare-metal/ F: toolchain/toolchain-bare-metal-buildroot/ N: Ignacy Gaw??dzki @@ -2269,6 +2270,7 @@ F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig F: configs/zynqmp_zcu104_defconfig F: configs/zynqmp_zcu106_defconfig +F: package/binutils-bare-metal/ F: package/bootgen/ F: package/versal-firmware/ F: toolchain/toolchain-bare-metal-buildroot/ diff --git a/package/binutils-bare-metal/binutils-bare-metal.hash b/package/binutils-bare-metal/binutils-bare-metal.hash new file mode 120000 index 0000000000..e0655d3af3 --- /dev/null +++ b/package/binutils-bare-metal/binutils-bare-metal.hash @@ -0,0 +1 @@ +../binutils/binutils.hash \ No newline at end of file diff --git a/package/binutils-bare-metal/binutils-bare-metal.mk b/package/binutils-bare-metal/binutils-bare-metal.mk new file mode 100644 index 0000000000..d55c2d081e --- /dev/null +++ b/package/binutils-bare-metal/binutils-bare-metal.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# binutils-bare-metal +# +################################################################################ + +HOST_BINUTILS_BARE_METAL_VERSION = 2.42 +HOST_BINUTILS_BARE_METAL_SITE = $(BR2_GNU_MIRROR)/binutils +HOST_BINUTILS_BARE_METAL_SOURCE = binutils-$(HOST_BINUTILS_BARE_METAL_VERSION).tar.xz + +HOST_BINUTILS_BARE_METAL_LICENSE = GPL-3.0+, libiberty LGPL-2.1+ +HOST_BINUTILS_BARE_METAL_LICENSE_FILES = COPYING3 COPYING.LIB +HOST_BINUTILS_BARE_METAL_CPE_ID_VENDOR = gnu + +HOST_BINUTILS_BARE_METAL_DEPENDENCIES = host-zlib + +# Don't build documentation. It takes up extra space / build time, +# and sometimes needs specific makeinfo versions to work +HOST_BINUTILS_BARE_METAL_CONF_ENV += MAKEINFO=true +HOST_BINUTILS_BARE_METAL_MAKE_OPTS += MAKEINFO=true +HOST_BINUTILS_BARE_METAL_INSTALL_OPTS += MAKEINFO=true install + +HOST_BINUTILS_BARE_METAL_CONF_OPTS = \ + --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \ + --disable-gprof \ + --disable-shared \ + --enable-lto \ + --enable-static \ + --disable-initfini-array \ + --disable-multilib \ + --disable-werror + +$(eval $(host-autotools-package)) diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 519a0ca887..e4c6a0b0b6 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -2,6 +2,7 @@ sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz sha512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 binutils-2.40.tar.xz sha512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 binutils-2.41.tar.xz +sha512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6 binutils-2.42.tar.xz # Locally calculated (fetched from Github) sha512 3518b47d5c11d1fb478ee152bde1719363f9391db73f3b9f5491217c17742bef8ebca6a51a40302dfaa9476c5a32a8b8f70a4bf64289422dea5f750ae53ab88d binutils-gdb-arc-2023.09-release.tar.gz From thomas.petazzoni at bootlin.com Tue Feb 6 16:57:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:57:17 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-bare-metal-buildroot: new toolchain Message-ID: <20240206165731.2947487177@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7befbaaea74ff282b4b8ec5b3c3ad52be0d99937 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds a new virtual package for adding a bare-metal toolchain to Buildroot. For now, it depends on nothing, so it will not actually build anything, but it defines some options that will be needed by the various packages that will be part of this toolchain build process. Signed-off-by: Neal Frager Signed-off-by: Ibai Erkiaga Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 4 ++++ toolchain/Config.in | 10 ++++++++++ toolchain/toolchain-bare-metal-buildroot/Config.in | 9 +++++++++ .../toolchain-bare-metal-buildroot.mk | 12 ++++++++++++ utils/checksymbolslib/br.py | 3 +++ 5 files changed, 38 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 94952f72a8..5cc4d37aef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1385,6 +1385,9 @@ F: package/mrp/ N: Ian Haylock F: package/python-rpi-gpio/ +N: Ibai Erkiaga +F: toolchain/toolchain-bare-metal-buildroot/ + N: Ignacy Gaw??dzki F: package/angularjs/ @@ -2268,6 +2271,7 @@ F: configs/zynqmp_zcu104_defconfig F: configs/zynqmp_zcu106_defconfig F: package/bootgen/ F: package/versal-firmware/ +F: toolchain/toolchain-bare-metal-buildroot/ N: Nicola Di Lieto F: package/uacme/ diff --git a/toolchain/Config.in b/toolchain/Config.in index 34e0ae2c5f..64a07f91dc 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -923,4 +923,14 @@ config BR2_TOOLCHAIN_HAS_LIBQUADMATH default y if BR2_i386 || BR2_x86_64 default y if BR2_POWERPC_CPU_HAS_VSX +comment "Bare metal toolchain" + +config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT + bool "Build a bare metal toolchain" + help + Select if you need a bare-metal toolchain for building + platform specific firmware images. + +source "toolchain/toolchain-bare-metal-buildroot/Config.in" + endmenu diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in new file mode 100644 index 0000000000..3c99c7e1b5 --- /dev/null +++ b/toolchain/toolchain-bare-metal-buildroot/Config.in @@ -0,0 +1,9 @@ +if BR2_TOOLCHAIN_BARE_METAL_BUILDROOT + +config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH + string "architecture tuple" + help + This option allows to define the architecture tuple for the + bare-metal toolchain. + +endif # BR2_TOOLCHAIN_BARE_METAL_BUILDROOT diff --git a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk new file mode 100644 index 0000000000..4dc36ef3f3 --- /dev/null +++ b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# toolchain-bare-metal-buildroot +# +################################################################################ + +TOOLCHAIN_BARE_METAL_BUILDROOT_DEPENDENCIES = +TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE = $(call qstrip,$(BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH)) +TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT = $(HOST_DIR)/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/sysroot +TOOLCHAIN_BARE_METAL_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO + +$(eval $(virtual-package)) diff --git a/utils/checksymbolslib/br.py b/utils/checksymbolslib/br.py index 846a609829..f9dc336e64 100644 --- a/utils/checksymbolslib/br.py +++ b/utils/checksymbolslib/br.py @@ -36,11 +36,14 @@ symbols_defined_only_for_barebox_variant = [ ] # toolchain/toolchain/toolchain.mk # toolchain/toolchain-buildroot/toolchain-buildroot.mk +# toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk symbols_not_defined_for_fake_virtual_packages = [ 'BR2_PACKAGE_HAS_TOOLCHAIN', 'BR2_PACKAGE_HAS_TOOLCHAIN_BUILDROOT', + 'BR2_PACKAGE_HAS_TOOLCHAIN_BARE_METAL_BUILDROOT', 'BR2_PACKAGE_PROVIDES_TOOLCHAIN', 'BR2_PACKAGE_PROVIDES_TOOLCHAIN_BUILDROOT', + 'BR2_PACKAGE_PROVIDES_TOOLCHAIN_BARE_METAL_BUILDROOT', ] # fs/common.mk suffixes_not_defined_for_all_rootfs_types = [ From thomas.petazzoni at bootlin.com Tue Feb 6 16:57:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:57:19 +0100 Subject: [Buildroot] [git commit] package/gcc-bare-metal: new package Message-ID: <20240206165731.4FD9687179@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f1bfab23d0cc024425a0b6d69a8cd6e7c6b50432 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds a new package for building gcc for a bare-metal toolchain. The cpu architecture is defined by a toolchain-bare-metal virtual package. While any cpu architecture could be used, the default configuration will be a Xilinx microblaze little endian architecture, so that buildroot will be able to build the microblaze firmware applications for zynqmp and versal. Signed-off-by: Neal Frager Signed-off-by: Ibai Erkiaga Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/gcc-bare-metal/13.2.0 | 1 + package/gcc-bare-metal/gcc-bare-metal.hash | 1 + package/gcc-bare-metal/gcc-bare-metal.mk | 61 ++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9f93746015..0a6e5a9c06 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1387,6 +1387,7 @@ F: package/python-rpi-gpio/ N: Ibai Erkiaga F: package/binutils-bare-metal/ +F: package/gcc-bare-metal/ F: toolchain/toolchain-bare-metal-buildroot/ N: Ignacy Gaw??dzki @@ -2272,6 +2273,7 @@ F: configs/zynqmp_zcu104_defconfig F: configs/zynqmp_zcu106_defconfig F: package/binutils-bare-metal/ F: package/bootgen/ +F: package/gcc-bare-metal/ F: package/versal-firmware/ F: toolchain/toolchain-bare-metal-buildroot/ diff --git a/package/gcc-bare-metal/13.2.0 b/package/gcc-bare-metal/13.2.0 new file mode 120000 index 0000000000..b7a75dc7dd --- /dev/null +++ b/package/gcc-bare-metal/13.2.0 @@ -0,0 +1 @@ +../gcc/13.2.0/ \ No newline at end of file diff --git a/package/gcc-bare-metal/gcc-bare-metal.hash b/package/gcc-bare-metal/gcc-bare-metal.hash new file mode 120000 index 0000000000..d417b0dc77 --- /dev/null +++ b/package/gcc-bare-metal/gcc-bare-metal.hash @@ -0,0 +1 @@ +../gcc/gcc.hash \ No newline at end of file diff --git a/package/gcc-bare-metal/gcc-bare-metal.mk b/package/gcc-bare-metal/gcc-bare-metal.mk new file mode 100644 index 0000000000..f391f094fe --- /dev/null +++ b/package/gcc-bare-metal/gcc-bare-metal.mk @@ -0,0 +1,61 @@ +################################################################################ +# +# gcc-bare-metal +# +################################################################################ + +HOST_GCC_BARE_METAL_VERSION = 13.2.0 +HOST_GCC_BARE_METAL_SITE = \ + https://ftp.gnu.org/gnu/gcc/gcc-$(HOST_GCC_BARE_METAL_VERSION) +HOST_GCC_BARE_METAL_SOURCE = gcc-$(HOST_GCC_BARE_METAL_VERSION).tar.xz + +HOST_GCC_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 +HOST_GCC_BARE_METAL_LICENSE_FILES = COPYING COPYING3 COPYING.LIB COPYING3.LIB + +HOST_GCC_BARE_METAL_DEPENDENCIES = \ + host-binutils-bare-metal \ + host-gmp \ + host-mpc \ + host-mpfr \ + host-isl + +# gcc doesn't support in-tree build, so we create a 'build' +# subdirectory in the gcc sources, and build from there. +define GCC_BARE_METAL_CONFIGURE_SYMLINK + mkdir -p $(@D)/build + ln -sf ../configure $(@D)/build/configure +endef + +HOST_GCC_BARE_METAL_PRE_CONFIGURE_HOOKS += GCC_BARE_METAL_CONFIGURE_SYMLINK +HOST_GCC_BARE_METAL_SUBDIR = build + +HOST_GCC_BARE_METAL_MAKE_OPTS = \ + $(HOST_GCC_COMMON_MAKE_OPTS) \ + all-gcc \ + all-target-libgcc + +HOST_GCC_BARE_METAL_INSTALL_OPTS = install-gcc install-target-libgcc + +HOST_GCC_BARE_METAL_CONF_OPTS = \ + --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \ + --disable-initfini_array \ + --disable-__cxa_atexit \ + --disable-libstdcxx-pch \ + --with-newlib \ + --disable-threads \ + --enable-plugins \ + --with-gnu-as \ + --disable-libitm \ + --without-long-double-128 \ + --without-headers \ + --enable-languages=c \ + --disable-multilib \ + --with-gmp=$(HOST_DIR) \ + --with-mpc=$(HOST_DIR) \ + --with-mpfr=$(HOST_DIR) \ + --with-isl=$(HOST_DIR) \ + --with-sysroot=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) \ + AR_FOR_TARGET=$(HOST_DIR)/bin/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)-ar \ + RANLIB_FOR_TARGET=$(HOST_DIR)/bin/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)-ranlib + +$(eval $(host-autotools-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 16:57:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:57:20 +0100 Subject: [Buildroot] [git commit] package/newlib-bare-metal: new package Message-ID: <20240206165731.5CF2087177@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b95ff658bf4859eb5cffd28cbbedd1826fad9a6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds a new package for building newlib for a bare-metal toolchain. The cpu architecture is defined by a toolchain-bare-metal virtual package. While any cpu architecture could be used, the default configuration will be a Xilinx microblaze little endian architecture, so that buildroot will be able to build the microblaze firmware applications for zynqmp and versal. Signed-off-by: Neal Frager Signed-off-by: Ibai Erkiaga Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/newlib-bare-metal/Config.in | 2 + package/newlib-bare-metal/newlib-bare-metal.hash | 8 ++++ package/newlib-bare-metal/newlib-bare-metal.mk | 52 ++++++++++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0a6e5a9c06..c103bdadf8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1388,6 +1388,7 @@ F: package/python-rpi-gpio/ N: Ibai Erkiaga F: package/binutils-bare-metal/ F: package/gcc-bare-metal/ +F: package/newlib-bare-metal/ F: toolchain/toolchain-bare-metal-buildroot/ N: Ignacy Gaw??dzki @@ -2274,6 +2275,7 @@ F: configs/zynqmp_zcu106_defconfig F: package/binutils-bare-metal/ F: package/bootgen/ F: package/gcc-bare-metal/ +F: package/newlib-bare-metal/ F: package/versal-firmware/ F: toolchain/toolchain-bare-metal-buildroot/ diff --git a/package/newlib-bare-metal/Config.in b/package/newlib-bare-metal/Config.in new file mode 100644 index 0000000000..1ff3d5d8ec --- /dev/null +++ b/package/newlib-bare-metal/Config.in @@ -0,0 +1,2 @@ +config BR2_PACKAGE_NEWLIB_BARE_METAL + bool diff --git a/package/newlib-bare-metal/newlib-bare-metal.hash b/package/newlib-bare-metal/newlib-bare-metal.hash new file mode 100644 index 0000000000..f8c553cf86 --- /dev/null +++ b/package/newlib-bare-metal/newlib-bare-metal.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 0c166a39e1bf0951dfafcd68949fe0e4b6d3658081d6282f39aeefc6310f2f13 newlib-4.4.0.20231231.tar.gz + +# Hashes for license files locally calculated +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 f3b7f3e4426b1fa6f60198dae7adfedd94b77b28db2d108adc0253575011e0ff COPYING.LIBGLOSS +sha256 422aa40293093fb54fc66e692a0d68fd0b24ed5602e5d1d33ad05ba3909057e9 COPYING.NEWLIB diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk new file mode 100644 index 0000000000..452bc4da25 --- /dev/null +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# newlib-bare-metal +# +################################################################################ + +NEWLIB_BARE_METAL_VERSION = 4.4.0 +NEWLIB_BARE_METAL_SITE = ftp://sourceware.org/pub/newlib +NEWLIB_BARE_METAL_SOURCE = newlib-$(NEWLIB_BARE_METAL_VERSION).20231231.tar.gz +NEWLIB_BARE_METAL_DEPENDENCIES = host-gcc-bare-metal +NEWLIB_BARE_METAL_ADD_TOOLCHAIN_DEPENDENCY = NO +NEWLIB_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 +NEWLIB_BARE_METAL_LICENSE_FILES = \ + COPYING \ + COPYING.LIB \ + COPYING.LIBGLOSS \ + COPYING.NEWLIB + +NEWLIB_BARE_METAL_INSTALL_STAGING = YES +NEWLIB_BARE_METAL_INSTALL_TARGET = NO + +define NEWLIB_BARE_METAL_CONFIGURE_CMDS + (cd $(@D) && \ + PATH=$(BR_PATH) \ + ./configure \ + --target=$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE) \ + --prefix=/usr \ + --enable-newlib-io-c99-formats \ + --enable-newlib-io-long-long \ + --enable-newlib-io-float \ + --enable-newlib-io-long-double \ + --disable-multilib \ + ) +endef + +define NEWLIB_BARE_METAL_BUILD_CMDS + PATH=$(BR_PATH) $(MAKE1) -C $(@D) +endef + +define NEWLIB_BARE_METAL_INSTALL_STAGING_CMDS + PATH=$(BR_PATH) $(MAKE1) -C $(@D) DESTDIR=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) install +endef + +define NEWLIB_BARE_METAL_FIXUP + mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/include \ + $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/include + mv $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/lib \ + $(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT)/usr/lib +endef +NEWLIB_BARE_METAL_POST_INSTALL_STAGING_HOOKS += NEWLIB_BARE_METAL_FIXUP + +$(eval $(generic-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 16:57:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 17:57:20 +0100 Subject: [Buildroot] [git commit] toolchain/toolchain-bare-metal-buildroot: wire up newlib-bare-metal Message-ID: <20240206165731.66D1A8717B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0e7a1d3d15727a2f14db83b7c651db73f2a50f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni --- toolchain/Config.in | 1 + toolchain/toolchain-bare-metal-buildroot/Config.in | 2 ++ .../toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 64a07f91dc..407a03c42e 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -927,6 +927,7 @@ comment "Bare metal toolchain" config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT bool "Build a bare metal toolchain" + select BR2_PACKAGE_NEWLIB_BARE_METAL help Select if you need a bare-metal toolchain for building platform specific firmware images. diff --git a/toolchain/toolchain-bare-metal-buildroot/Config.in b/toolchain/toolchain-bare-metal-buildroot/Config.in index 3c99c7e1b5..6fe969357f 100644 --- a/toolchain/toolchain-bare-metal-buildroot/Config.in +++ b/toolchain/toolchain-bare-metal-buildroot/Config.in @@ -6,4 +6,6 @@ config BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH This option allows to define the architecture tuple for the bare-metal toolchain. +source "package/newlib-bare-metal/Config.in" + endif # BR2_TOOLCHAIN_BARE_METAL_BUILDROOT diff --git a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk index 4dc36ef3f3..dbfe30a910 100644 --- a/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk +++ b/toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOOLCHAIN_BARE_METAL_BUILDROOT_DEPENDENCIES = +TOOLCHAIN_BARE_METAL_BUILDROOT_DEPENDENCIES = newlib-bare-metal TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE = $(call qstrip,$(BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH)) TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT = $(HOST_DIR)/$(TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH_TUPLE)/sysroot TOOLCHAIN_BARE_METAL_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO From buildroot at bubu1.eu Tue Feb 6 17:04:37 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 18:04:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-bitstring: add missing runtime dependency In-Reply-To: <20240206155140.2351424-2-romain.naour@smile.fr> References: <20240206155140.2351424-1-romain.naour@smile.fr> <20240206155140.2351424-2-romain.naour@smile.fr> Message-ID: Hi Romain, On 06.02.24 16:51, Romain Naour wrote: > python-bitstring require python-bitarray and python-zlib at runtime > since 4.0.1 release [1][2]. I needed to look at the version numbers 3 times, but this dependency actually got introduced in 4.1.0 :-). [1] > > python-zlib is now needed for the "Experimental support for two 8-bit > float types". Is there a reference to that somewhere? (I know, nobody documents their dependencies on internal python modules, but where is the quote from?) > > Intended to fixes (fixed locally): > https://gitlab.com/buildroot.org/buildroot/-/jobs/6104227183 (TestPythonPy3Bitstring) > https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854810 (TestPythonPy3Crossbar) This test failed for a different reason: It ran with bitstring version 4.1.2 which included a bogus python file with invalid syntax [2] which the pyc compilation step stumbles over. The version bump to 4.1.4 already solved this. [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 [2] https://github.com/scott-griffiths/bitstring/issues/293 > > gitlab-ci reports another issue at build time not reproduced locally: > > *** Error compiling '[...]/TestPythonPy3Bitstring/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... > Sorry: IndentationError: expected an indented block after function definition on line 6 (plugin_test.py, line 8) > > [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.1 > [2] https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 > > Signed-off-by: Romain Naour > Cc: James Hilliard > --- > package/python-bitstring/Config.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/python-bitstring/Config.in b/package/python-bitstring/Config.in > index 93d7682577..82d0bb29c6 100644 > --- a/package/python-bitstring/Config.in > +++ b/package/python-bitstring/Config.in > @@ -1,5 +1,7 @@ > config BR2_PACKAGE_PYTHON_BITSTRING > bool "python-bitstring" > + select BR2_PACKAGE_PYTHON_BITARRAY # runtime > + select BR2_PACKAGE_PYTHON3_ZLIB # runtime > help > Simple construction, analysis and modification of binary data. > From yann.morin.1998 at free.fr Tue Feb 6 17:03:57 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 18:03:57 +0100 Subject: [Buildroot] [git commit] docs/manual/contribute.adoc: mention sr.ht as a fallback for sending patches Message-ID: <20240206170513.2087287185@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fc3d2bcb40e5cc47b4d6a3dd73fc145c1f00db50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann [yann.morin.1998 at free.fr: make it explicit it is not the official way] Signed-off-by: Yann E. MORIN --- docs/manual/contribute.adoc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 684e9f4809..6ff6c15314 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -375,6 +375,15 @@ If you do not use +git send-email+, make sure posted *patches are not line-wrapped*, otherwise they cannot easily be applied. In such a case, fix your e-mail client, or better yet, learn to use +git send-email+. +https://sr.ht also has a light-weight UI for +https://man.sr.ht/git.sr.ht/#sending-patches-upstream[preparing patchseries] +and can also send out the patches for you. There are a few drawbacks to +this, as you cannot edit your patches' status in Patchwork and you +currently can't edit your display name with which the match emails are +sent out but it is an option if you cannot get git send-email to work +with your mail provider (i.e. O365); it shall not be considered the +official way of sending patches, but just a fallback. + ==== Cover letter If you want to present the whole patch set in a separate mail, add From yann.morin.1998 at free.fr Tue Feb 6 17:06:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 18:06:07 +0100 Subject: [Buildroot] [PATCH 6/6] docs/manual/contribute.adoc: mention sr.ht as an alternative for sending patches In-Reply-To: <20240206105246.1220945-6-buildroot@bubu1.eu> References: <20240206105246.1220945-1-buildroot@bubu1.eu> <20240206105246.1220945-6-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-06 11:52 +0100, Marcus Hoffmann via buildroot spake thusly: > Signed-off-by: Marcus Hoffmann > --- > docs/manual/contribute.adoc | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc > index 684e9f4809..7d0611be28 100644 > --- a/docs/manual/contribute.adoc > +++ b/docs/manual/contribute.adoc > @@ -375,6 +375,14 @@ If you do not use +git send-email+, make sure posted *patches are not > line-wrapped*, otherwise they cannot easily be applied. In such a case, > fix your e-mail client, or better yet, learn to use +git send-email+. > > +https://sr.ht also has a light-weight UI for > +https://man.sr.ht/git.sr.ht/#sending-patches-upstream[preparing patchseries] > +and can also send out the patches for you. There are a few drawbacks to > +this, as you cannot edit your patches' status in Patchwork and you > +currently can't edit your display name with which the match emails are > +sent out but it is an option if you cannot get git send-email to work > +with your mail provider (i.e. O365). As seen IRL, I extended that with a blurb explicitly stating that it's not the official way of sneding patches, just a fallback. Applied to master, thanks. Regards, Yann E. MORIN. > ==== Cover letter > > If you want to present the whole patch set in a separate mail, add > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Tue Feb 6 17:06:50 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 18:06:50 +0100 Subject: [Buildroot] [PATCH v3] buildroot: Add basic support for LoongArch architecture (toolchain only) In-Reply-To: <20221212083457.8308-1-duanzhiwei@loongson.cn> References: <20221212083457.8308-1-duanzhiwei@loongson.cn> Message-ID: <4941efd8-36e6-47b9-b2d8-a9599429fa3d@smile.fr> Hello, Le 12/12/2022 ? 09:34, Zhiwei Duan a ?crit?: > With this patch, the buildroot can compile the rootfs of the loongarch architecture. > Both external toolchain and buildroot toolchain can compile rootfs. > buildroot toolchain: binutils>=2.38 GCC>=12 Linux>=5.19 glibc>=2.36. Thanks for this patch. It would be great if you can add a defconfig targeting qemu for LoongArch architecture in order to perform a runtime test (see other qemu defconfig for other architectures). Nowadays qemu 8.1 support LoongArch architecture so it seems doable without too much patches (if any). > > Signed-off-by: Zhiwei Duan > --- > arch/Config.in | 16 +++++++++++ > arch/Config.in.loongarch | 52 ++++++++++++++++++++++++++++++++++++ > package/glibc/Config.in | 1 + > support/gnuconfig/config.sub | 11 ++++++-- > toolchain/Config.in | 2 +- > 5 files changed, 79 insertions(+), 3 deletions(-) > create mode 100644 arch/Config.in.loongarch > > diff --git a/arch/Config.in b/arch/Config.in > index 1c0c400a98..88f805bb1e 100644 > --- a/arch/Config.in > +++ b/arch/Config.in > @@ -251,6 +251,17 @@ config BR2_xtensa > http://en.wikipedia.org/wiki/Xtensa > http://www.tensilica.com/ > > +config BR2_loongarch64 > + bool "LOONGARCH64 (little endian)" > + select BR2_ARCH_IS_64 > + select BR2_USE_MMU > + help > + LOONGARCH is a RISC microprocessor from LOONGARCH Technologies. Little > + endian. Add an empty line here > + https://www.loongson.cn/ Remove trailing / > + #http://en.wikipedia.org/wiki/MIPS_Technologies Remove the commented line and the additional empty line > + > + > endchoice > > # For some architectures or specific cores, our internal toolchain > @@ -414,6 +425,11 @@ if BR2_xtensa > source "arch/Config.in.xtensa" > endif > > +if BR2_loongarch64 > +source "arch/Config.in.loongarch" > +endif > + > + Remove the additional empty line > # Set up target binary format > choice > prompt "Target Binary Format" > diff --git a/arch/Config.in.loongarch b/arch/Config.in.loongarch > new file mode 100644 > index 0000000000..bf86490cff > --- /dev/null > +++ b/arch/Config.in.loongarch > @@ -0,0 +1,52 @@ > +# loongarch config > +config BR2_LOONGARCH_CPU_LOONGARCH64 > + bool > + select BR2_LOONGARCH_NAN_LEGACY > + > +choice > + prompt "Target Architecture Variant" > + default BR2_loongarch_64 if BR2_loongarch64 > + depends on BR2_loongarch64 > + help > + Specific CPU variant to use > + > +config BR2_loongarch_64 > + bool "Generic LOONGARCH64" > + depends on BR2_ARCH_IS_64 > + select BR2_LOONGARCH_CPU_LOONGARCH64 > +endchoice > + > +config BR2_LOONGARCH_NAN_LEGACY Since it's a new architecture from Buildroot point of view, maybe we don't really want to support legacy features. > + bool > + > +#config BR2_GCC_TARGET_NAN > +# default "legacy" if BR2_LOONGARCH_NAN_LEGACY Please, remove commented lines. > + > +config BR2_ARCH > + default "loongarch64" if BR2_loongarch64 > + > +config BR2_NORMALIZED_ARCH > + default "loongarch" > + > +config BR2_ENDIAN > + default "LITTLE" if BR2_loongarch64 > + > +config BR2_GCC_TARGET_ARCH > + default "loongarch64" if BR2_loongarch_64 > + > +config BR2_READELF_ARCH_NAME > + default "LoongArch" > + > +config BR2_LOONGARCH_SOFT_FLOAT > + bool "Use soft-float" > + #default y Remove commented line. > + select BR2_SOFT_FLOAT > + help > + If your target CPU does not have a Floating Point Unit (FPU) > + or a kernel FPU emulator, but you still wish to support > + floating point functions, then everything will need to be > + compiled with soft floating point support (-msoft-float). > + > + > +# vim: ft=kconfig > +# -*- mode:kconfig; -*- > diff --git a/package/glibc/Config.in b/package/glibc/Config.in > index 71c50504ac..d8325610f5 100644 > --- a/package/glibc/Config.in > +++ b/package/glibc/Config.in > @@ -21,6 +21,7 @@ config BR2_PACKAGE_GLIBC_ARCH_SUPPORTS > default y if BR2_microblaze > default y if BR2_nios2 > default y if BR2_arc && BR2_ARC_ATOMIC_EXT > + default y if BR2_loongarch64 > depends on !BR2_powerpc_SPE > depends on BR2_RISCV_ISA_RVA || !BR2_riscv > depends on BR2_USE_MMU > diff --git a/support/gnuconfig/config.sub b/support/gnuconfig/config.sub > index 9bc49a7e92..c751ddf15a 100755 > --- a/support/gnuconfig/config.sub > +++ b/support/gnuconfig/config.sub In order to ease review, it would be great to split this patch into several smaller patches. > @@ -164,7 +164,7 @@ case $1 in > basic_os=$field2 > ;; > # Manufacturers > - dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ > + dec* | mips* | loongarch* | sequent* | encore* | pc533* | sgi* | sony* \ > | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ > | unicom* | ibm* | next | hp | isi* | apollo | altos* \ > | convergent* | ncr* | news | 32* | 3600* | 3100* \ > @@ -632,6 +632,11 @@ case $1 in > basic_machine=ymp-cray > basic_os=unicos > ;; > + loongarch) > + basic_machine=loongarch-loongson > + basic_os= > + ;; > + > *) > basic_machine=$1 > basic_os= > @@ -1211,6 +1216,7 @@ case $cpu-$vendor in > | mipsisa64sr71k | mipsisa64sr71kel \ > | mipsr5900 | mipsr5900el \ > | mipstx39 | mipstx39el \ > + | loongarch | loongarch64 \ Here you add loongarch while only loongarch64 is supported in Buildroot. Remove loongarch if not needed. > | mmix \ > | mn10200 | mn10300 \ > | moxie \ > @@ -1253,7 +1259,8 @@ case $cpu-$vendor in > | x86 | x86_64 | xc16x | xgate | xps100 \ > | xstormy16 | xtensa* \ > | ymp \ > - | z8k | z80) > + | z8k | z80 \ > + | loongarch | loongarch64) same here > ;; > > *) > diff --git a/toolchain/Config.in b/toolchain/Config.in > index 4947ab3aae..a4939af6fb 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -24,7 +24,7 @@ config BR2_TOOLCHAIN_USES_UCLIBC > # architectures > select BR2_TOOLCHAIN_HAS_UCONTEXT if BR2_ARM_CPU_HAS_ARM || BR2_i386 \ > || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \ > - || BR2_sparc || BR2_x86_64 > + || BR2_sparc || BR2_x86_64 || BR2_loongarch64 > select BR2_TOOLCHAIN_SUPPORTS_PIE if !BR2_m68k && !BR2_microblaze && !BR2_STATIC_LIBS > > config BR2_TOOLCHAIN_USES_MUSL Can you add a new entry in the DEVELOPERS file for arch/Config.in.loongarch in order to get an email about issues related to loongarch64. I'll mark you patch as "changes requested" in the patchwork. Best regards, Romain From arnout at mind.be Tue Feb 6 17:10:32 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:10:32 +0100 Subject: [Buildroot] [git commit] support/pkg-stats: list packages from external trees. Message-ID: <20240206171103.3D6D78718C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbea83fc47046653778e0cf49863b2c4a3bac8e7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Search the external trees for package files and add them to the list. The list of directories walked and excluded are the same as for the main tree, and should work out of the box if the user sticks to the directory structure suggested in the manual. Two additional properties were added to the Package class, the tree name and the path. For consistency and to simplify the code, packages in the main tree are marked as coming from "BR2". The HTML output has a new column listing the external name (or "BR2") and the json output has a new property "tree". Signed-off-by: Juan Carrano [Arnout: - fix flake8 error "'itertools' imported but unused"; - use str.split instead of str.partition; - use BR2_EXTERNAL_BUILDROOT_PATH instead of BR2_EXTERNAL_BR2_PATH; - remove pkgdir variable, instead use self.pkgdir. ] Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 92 ++++++++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9349a0df57..05f0cd9e4a 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -23,7 +23,7 @@ import asyncio import datetime import fnmatch import os -from collections import defaultdict +from collections import defaultdict, namedtuple import re import subprocess import json @@ -77,6 +77,19 @@ def get_defconfig_list(): ] +Br2Tree = namedtuple("Br2Tree", ["name", "path"]) + + +def get_trees(): + raw_variables = subprocess.check_output(["make", "--no-print-directory", "-s", + "BR2_HAVE_DOT_CONFIG=y", "printvars", + "VARS=BR2_EXTERNAL_NAMES BR2_EXTERNAL_%_PATH"]) + variables = dict(line.split("=") for line in raw_variables.decode().split("\n") if line) + variables["BR2_EXTERNAL_BUILDROOT_PATH"] = brpath + externals = ["BUILDROOT", *variables["BR2_EXTERNAL_NAMES"].split()] + return [Br2Tree(name, os.path.normpath(variables[f"BR2_EXTERNAL_{name}_PATH"])) for name in externals] + + class Package: all_licenses = dict() all_license_files = list() @@ -89,7 +102,9 @@ class Package: status_checks = ['cve', 'developers', 'hash', 'license', 'license-files', 'patches', 'pkg-check', 'url', 'version'] - def __init__(self, name, path): + def __init__(self, tree, name, path): + self.tree = tree.name + self.tree_path = tree.path self.name = name self.path = path self.pkg_path = os.path.dirname(path) @@ -118,15 +133,26 @@ class Package: def pkgvar(self): return self.name.upper().replace("-", "_") + @property + def pkgdir(self): + return os.path.join(self.tree_path, self.pkg_path) + + @property + def pkgfile(self): + return os.path.join(self.tree_path, self.path) + + @property + def hashpath(self): + return self.pkgfile.replace(".mk", ".hash") + def set_url(self): """ Fills in the .url field """ self.status['url'] = ("warning", "no Config.in") - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) - for filename in os.listdir(pkgdir): + for filename in os.listdir(self.pkgdir): if fnmatch.fnmatch(filename, 'Config.*'): - fp = open(os.path.join(pkgdir, filename), "r") + fp = open(os.path.join(self.pkgdir, filename), "r") for config_line in fp: if URL_RE.match(config_line): self.url = config_line.strip() @@ -172,7 +198,7 @@ class Package: keep_target = True self.infras = list() - with open(os.path.join(brpath, self.path), 'r') as f: + with open(self.pkgfile, 'r') as f: lines = f.readlines() for line in lines: match = INFRA_RE.match(line) @@ -211,8 +237,7 @@ class Package: self.status['hash-license'] = ("na", "no valid package infra") return - hashpath = self.path.replace(".mk", ".hash") - if os.path.exists(os.path.join(brpath, hashpath)): + if os.path.exists(self.hashpath): self.status['hash'] = ("ok", "found") else: self.status['hash'] = ("error", "missing") @@ -225,8 +250,7 @@ class Package: self.status['patches'] = ("na", "no valid package infra") return - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) - for subdir, _, _ in os.walk(pkgdir): + for subdir, _, _ in os.walk(self.pkgdir): self.patch_files = fnmatch.filter(os.listdir(subdir), '*.patch') if self.patch_count == 0: @@ -268,9 +292,8 @@ class Package: Fills in the .warnings and .status['pkg-check'] fields """ cmd = [os.path.join(brpath, "utils/check-package")] - pkgdir = os.path.dirname(os.path.join(brpath, self.path)) self.status['pkg-check'] = ("error", "Missing") - for root, dirs, files in os.walk(pkgdir): + for root, dirs, files in os.walk(self.pkgdir): for f in files: cmd.append(os.path.join(root, f)) o = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[1] @@ -327,7 +350,7 @@ class Package: self.is_status_ok('license-files'), self.status['hash'], self.patch_count) -def get_pkglist(npackages, package_list): +def get_pkglist(trees, npackages, package_list): """ Builds the list of Buildroot packages, returning a list of Package objects. Only the .name and .path fields of the Package object are @@ -362,8 +385,8 @@ def get_pkglist(npackages, package_list): "toolchain/toolchain-wrapper.mk"] packages = list() count = 0 - for root, dirs, files in os.walk(brpath): - root = os.path.relpath(root, brpath) + for br_tree, root, dirs, files in ((tree, *rdf) for tree in trees for rdf in os.walk(tree.path)): + root = os.path.relpath(root, br_tree.path) rootdir = root.split("/") if len(rootdir) < 1: continue @@ -384,7 +407,7 @@ def get_pkglist(npackages, package_list): continue if skip: continue - p = Package(pkgname, pkgpath) + p = Package(br_tree, pkgname, pkgpath) packages.append(p) count += 1 if npackages and count == npackages: @@ -858,7 +881,7 @@ function expandField(fieldId){ #package-grid, #results-grid { display: grid; grid-gap: 2px; - grid-template-columns: 1fr repeat(12, min-content); + grid-template-columns: min-content 1fr repeat(12, min-content); } #results-grid { grid-template-columns: 3fr 1fr; @@ -924,6 +947,8 @@ def boolean_str(b): def dump_html_pkg(f, pkg): pkg_css_class = pkg.path.replace("/", "_")[:-3] + f.write(f'
    {pkg.tree}
    \n') f.write(f'
    {pkg.path}
    \n') # Patch count @@ -1128,31 +1153,33 @@ def dump_html_pkg(f, pkg): def dump_html_all_pkgs(f, packages): f.write("""
    -
    Tree
    +
    Package
    -
    Patch count
    -
    Infrastructure
    -
    License
    -
    License files
    -
    Hash file
    -
    Current version
    -
    Latest version
    -
    Warnings
    -
    Upstream URL
    -
    CVEs
    -
    CVEs Ignored
    -
    CPE ID
    """) for pkg in sorted(packages): @@ -1223,7 +1250,7 @@ def dump_html(packages, stats, date, commit, output): def dump_json(packages, defconfigs, stats, date, commit, output): # Format packages as a dictionnary instead of a list # Exclude local field that does not contains real date - excluded_fields = ['url_worker', 'name'] + excluded_fields = ['url_worker', 'name', 'tree_path'] pkgs = { pkg.name: { k: v @@ -1311,7 +1338,8 @@ def __main__(): 'rev-parse', 'HEAD']).splitlines()[0].decode() print("Build package list ...") - packages = get_pkglist(args.npackages, package_list) + all_trees = get_trees() + packages = get_pkglist(all_trees, args.npackages, package_list) print("Getting developers ...") developers = parse_developers() print("Build defconfig list ...") From yann.morin.1998 at free.fr Tue Feb 6 17:15:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 18:15:25 +0100 Subject: [Buildroot] [git commit] package/python-ml-dtypes: bump to version 0.3.2 Message-ID: <20240206171637.4F6D583A39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06e1a3620e5268951be089d2b150c1802de7de4c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from distutils which is being deprecated to setuptools. Drop python-pybind which is no longer required: https://github.com/jax-ml/ml_dtypes/blob/v0.3.2/CHANGELOG.md#032---2024-01-03 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-ml-dtypes/Config.in | 1 - package/python-ml-dtypes/python-ml-dtypes.hash | 4 ++-- package/python-ml-dtypes/python-ml-dtypes.mk | 9 ++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in index 72506896df..8791564b19 100644 --- a/package/python-ml-dtypes/Config.in +++ b/package/python-ml-dtypes/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy select BR2_PACKAGE_PYTHON_NUMPY - select BR2_PACKAGE_PYTHON_PYBIND help ml_dtypes is a stand-alone implementation of several NumPy dtype extensions used in machine learning libraries. diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash index a440268e39..53bfacb528 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.hash +++ b/package/python-ml-dtypes/python-ml-dtypes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ml_dtypes/json -md5 6adbb05530819bdb4a78d2372d187fe2 ml_dtypes-0.3.1.tar.gz -sha256 60778f99194b4c4f36ba42da200b35ef851ce4d4af698aaf70f5b91fe70fc611 ml_dtypes-0.3.1.tar.gz +md5 438c04dc0d941ec1b3b71667225c74c8 ml_dtypes-0.3.2.tar.gz +sha256 533059bc5f1764fac071ef54598db358c167c51a718f68f5bb55e3dee79d2967 ml_dtypes-0.3.2.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk index 92d23bece4..676137ecf1 100644 --- a/package/python-ml-dtypes/python-ml-dtypes.mk +++ b/package/python-ml-dtypes/python-ml-dtypes.mk @@ -4,16 +4,15 @@ # ################################################################################ -PYTHON_ML_DTYPES_VERSION = 0.3.1 +PYTHON_ML_DTYPES_VERSION = 0.3.2 PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz -PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/16/6e/9a7a51ee1ca24b8e92109128260c5aec8340c8fe5572e9ceecddae559abe +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/39/7d/8d85fcba868758b3a546e6914e727abd8f29ea6918079f816975c9eecd63 PYTHON_ML_DTYPES_LICENSE = Apache-2.0 PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE -PYTHON_ML_DTYPES_SETUP_TYPE = distutils +PYTHON_ML_DTYPES_SETUP_TYPE = setuptools PYTHON_ML_DTYPES_DEPENDENCIES = \ host-python-numpy \ - python-numpy \ - python-pybind + python-numpy $(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 17:17:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:17:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/ltp-testsuite: bump version to 20240129 In-Reply-To: <20240131181902.26975-1-petr.vorel@gmail.com> (Petr Vorel's message of "Wed, 31 Jan 2024 19:19:02 +0100") References: <20240131181902.26975-1-petr.vorel@gmail.com> Message-ID: <87zfwd5x7h.fsf@48ers.dk> >>>>> "Petr" == Petr Vorel writes: > Signed-off-by: Petr Vorel Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Tue Feb 6 17:17:37 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:17:37 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/python-aiosqlite: new package In-Reply-To: <20240106214410.3294887-2-james.hilliard1@gmail.com> References: <20240106214410.3294887-1-james.hilliard1@gmail.com> <20240106214410.3294887-2-james.hilliard1@gmail.com> Message-ID: On 06/01/2024 22:44, James Hilliard wrote: > Signed-off-by: James Hilliard Applied both to master, thanks. Regards, Arnout > --- > Changes v1 -> v2: > - add missing python sqlite module > --- > package/Config.in | 1 + > package/python-aiosqlite/Config.in | 7 +++++++ > package/python-aiosqlite/python-aiosqlite.hash | 5 +++++ > package/python-aiosqlite/python-aiosqlite.mk | 14 ++++++++++++++ > 4 files changed, 27 insertions(+) > create mode 100644 package/python-aiosqlite/Config.in > create mode 100644 package/python-aiosqlite/python-aiosqlite.hash > create mode 100644 package/python-aiosqlite/python-aiosqlite.mk > > diff --git a/package/Config.in b/package/Config.in > index f5d0c06334..ea023a84ef 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -978,6 +978,7 @@ menu "External python modules" > source "package/python-aioredis/Config.in" > source "package/python-aiorwlock/Config.in" > source "package/python-aiosignal/Config.in" > + source "package/python-aiosqlite/Config.in" > source "package/python-aiozipkin/Config.in" > source "package/python-alembic/Config.in" > source "package/python-alsaaudio/Config.in" > diff --git a/package/python-aiosqlite/Config.in b/package/python-aiosqlite/Config.in > new file mode 100644 > index 0000000000..77c78ea25d > --- /dev/null > +++ b/package/python-aiosqlite/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_PYTHON_AIOSQLITE > + bool "python-aiosqlite" > + select BR2_PACKAGE_PYTHON3_SQLITE # runtime > + help > + asyncio bridge to the standard sqlite3 module. > + > + https://aiosqlite.omnilib.dev/ > diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash > new file mode 100644 > index 0000000000..e06061346c > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/aiosqlite/json > +md5 e829bf8f641ab115c1a9ca0494d35278 aiosqlite-0.19.0.tar.gz > +sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d aiosqlite-0.19.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 > new file mode 100644 > index 0000000000..e513d53c02 > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-aiosqlite > +# > +################################################################################ > + > +PYTHON_AIOSQLITE_VERSION = 0.19.0 > +PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz > +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 > +PYTHON_AIOSQLITE_SETUP_TYPE = flit > +PYTHON_AIOSQLITE_LICENSE = MIT > +PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE > + > +$(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 17:18:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:18:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libheif: add jpeg-turbo support In-Reply-To: <20240131200754.1784621-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 21:07:54 +0100") References: <20240131200754.1784621-1-fontaine.fabrice@gmail.com> Message-ID: <87v8715x69.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > jpeg support is not limited to libjpeg > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 17:17:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:17:03 +0100 Subject: [Buildroot] [git commit] package/ltp-testsuite: bump version to 20240129 Message-ID: <20240206171815.B3651872D8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e06febce59f9e9a387e663e79d7f46771eee3de4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Petr Vorel Signed-off-by: Peter Korsgaard --- package/ltp-testsuite/ltp-testsuite.hash | 4 ++-- package/ltp-testsuite/ltp-testsuite.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index 2e84e978d1..1562f346b4 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,4 +1,4 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20230929/ltp-full-20230929.tar.xz.sha256 -sha256 eb161ff8f1966a1f3428fd4561eb20ebb9f83b7519e35cc12fc66bcfa7983b6b ltp-full-20230929.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20240129/ltp-full-20240129.tar.xz.sha256 +sha256 c302f6b2ca09cbb7835f549777bdb9233fe31f7086d7ad8e65472a0804e3e025 ltp-full-20240129.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 2a8c12fc25..ea57686a9c 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20230929 +LTP_TESTSUITE_VERSION = 20240129 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) From yann.morin.1998 at free.fr Tue Feb 6 17:18:20 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 6 Feb 2024 18:18:20 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-ml-dtypes: bump to version 0.3.2 In-Reply-To: <20240206161715.550268-1-james.hilliard1@gmail.com> References: <20240206161715.550268-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-06 09:17 -0700, James Hilliard spake thusly: > Migrate from distutils which is being deprecated to setuptools. > > Drop python-pybind which is no longer required: > https://github.com/jax-ml/ml_dtypes/blob/v0.3.2/CHANGELOG.md#032---2024-01-03 > > Signed-off-by: James Hilliard Applied to master, thanks. Could you check whether the following patches are still valid and required, please: https://patchwork.ozlabs.org/project/buildroot/patch/3afcc982685e876ac9b2ae54f86164647040ab85.1706448055.git.yann.morin.1998 at free.fr/ https://patchwork.ozlabs.org/project/buildroot/patch/20240112221910.14778-1-fontaine.fabrice at gmail.com/ Regards, Yann E. MORIN. > --- > Changes v1 -> v2: > - drop pybind > --- > package/python-ml-dtypes/Config.in | 1 - > package/python-ml-dtypes/python-ml-dtypes.hash | 4 ++-- > package/python-ml-dtypes/python-ml-dtypes.mk | 9 ++++----- > 3 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in > index 72506896df..8791564b19 100644 > --- a/package/python-ml-dtypes/Config.in > +++ b/package/python-ml-dtypes/Config.in > @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy > depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy > select BR2_PACKAGE_PYTHON_NUMPY > - select BR2_PACKAGE_PYTHON_PYBIND > help > ml_dtypes is a stand-alone implementation of several NumPy > dtype extensions used in machine learning libraries. > diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash > index a440268e39..53bfacb528 100644 > --- a/package/python-ml-dtypes/python-ml-dtypes.hash > +++ b/package/python-ml-dtypes/python-ml-dtypes.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/ml_dtypes/json > -md5 6adbb05530819bdb4a78d2372d187fe2 ml_dtypes-0.3.1.tar.gz > -sha256 60778f99194b4c4f36ba42da200b35ef851ce4d4af698aaf70f5b91fe70fc611 ml_dtypes-0.3.1.tar.gz > +md5 438c04dc0d941ec1b3b71667225c74c8 ml_dtypes-0.3.2.tar.gz > +sha256 533059bc5f1764fac071ef54598db358c167c51a718f68f5bb55e3dee79d2967 ml_dtypes-0.3.2.tar.gz > # Locally computed sha256 checksums > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk > index 92d23bece4..676137ecf1 100644 > --- a/package/python-ml-dtypes/python-ml-dtypes.mk > +++ b/package/python-ml-dtypes/python-ml-dtypes.mk > @@ -4,16 +4,15 @@ > # > ################################################################################ > > -PYTHON_ML_DTYPES_VERSION = 0.3.1 > +PYTHON_ML_DTYPES_VERSION = 0.3.2 > PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz > -PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/16/6e/9a7a51ee1ca24b8e92109128260c5aec8340c8fe5572e9ceecddae559abe > +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/39/7d/8d85fcba868758b3a546e6914e727abd8f29ea6918079f816975c9eecd63 > PYTHON_ML_DTYPES_LICENSE = Apache-2.0 > PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE > -PYTHON_ML_DTYPES_SETUP_TYPE = distutils > +PYTHON_ML_DTYPES_SETUP_TYPE = setuptools > > PYTHON_ML_DTYPES_DEPENDENCIES = \ > host-python-numpy \ > - python-numpy \ > - python-pybind > + python-numpy > > $(eval $(python-package)) > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Tue Feb 6 17:17:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:17:44 +0100 Subject: [Buildroot] [git commit] package/libheif: add jpeg-turbo support Message-ID: <20240206171938.E85F1872E8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=854ea58174b38f7556fbc4891d7512c2512a8327 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master jpeg support is not limited to libjpeg Signed-off-by: Fabrice Fontaine Reviewed-by: Antoine Coutant Signed-off-by: Peter Korsgaard --- package/libheif/libheif.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk index bd307deb7b..908e2ce068 100644 --- a/package/libheif/libheif.mk +++ b/package/libheif/libheif.mk @@ -51,9 +51,9 @@ else LIBHEIF_CONF_OPTS += -DWITH_LIBDE265=OFF endif -ifeq ($(BR2_PACKAGE_LIBJPEG),y) +ifeq ($(BR2_PACKAGE_JPEG),y) LIBHEIF_CONF_OPTS += -DWITH_JPEG_DECODER=ON -DWITH_JPEG_ENCODER=ON -LIBHEIF_DEPENDENCIES += libjpeg +LIBHEIF_DEPENDENCIES += jpeg else LIBHEIF_CONF_OPTS += -DWITH_JPEG_DECODER=OFF -DWITH_JPEG_ENCODER=OFF endif From giulio.benetti at benettiengineering.com Tue Feb 6 17:21:52 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 18:21:52 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/milkv_duo: new defconfig In-Reply-To: References: Message-ID: <9ed1a976-a5e3-44c4-8788-d035b618a823@benettiengineering.com> Hi Hanyuan, On 06/02/24 17:01, hanyuan-z wrote: > Hello Giulio, > > Thanks for your careful review! However there are a few > things I still get confused about. Could you please give me > some hints? Sure, > > Here you definetely need to add that this patch depends on this > > patchset: > > https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 > > to work-around a gcc bug on htop package. > > Do you mean that I should submit my patches after yours gets merged? > Or should I declare that my patch depends on yours, and how? The second one, you can note it after the 3 dashes under commit log, something like: --- This patch depends on: https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 to work-around a gcc bug on htop package. --- > > After the 3 dashes above you should add changes between patch versions like: > > V1->V2: > > * changed this > > * changed that > > > > V2->V3: > > * change thee > > Could I only add lines from V2 -> V3 since the V1 -> V2 was happened > nearly two months ago and the changes from V1 -> V2 were very big. No, you need to keep all of them so can keep track of the history of the patch in Mailing List. > > please drop from here... > > > > > +To configure the linux kernel or u-boot: > > > + > > > + $ make linux-menuconfig > > > + > > > +To rebuild something (e.g. linux): > > > + > > > + $ make linux-rebuild > > > + > > > > ...to here, since it's part of Buildroot manual and also > > you should point "linux-menuconfig and uboot-menuconfig", > > but it doesn't make sense to me, so yes please drop it, > > Do you mean that I should remove those lines? Yes please > > > Here I would expand comment by pointing that glibc is not suitable and > > why. It should be a gcc ICE, so maybe someone can fix or work it around > > later with this indication. > > Yes, the problem is gcc ICE. More detailed, the ICE is coming from the t-head > optimizations. Once t-head stuff removed, no more ICE. No more glibc and htop > problems. However once the optimizations removed, the Milk-v duo board's > architect and performance features are gone. So it is troublesome. And I think this > problem is associated with the one from another email. Let me put them together. Yes. Then since my work-around works I think it's ok to keep t-head optimizations. > > > I think I should tell you this. In fact I encountered another gcc bug > > > when using all the t-head?s optimizations with the glibc. The gcc reported > > > internal errors when we > > > > > > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > > > > > > So we have to use musl and find this bug is not reported anymore. > > > I was wondering why you were using exactly musl and I suspected > > something like that. > > The reason I use musl is that the original sdk not prepared for the > mainline buildroot is using the musl. And for the compatibility I think > it's better to use musl here to rather than the rest option uClibc-ng, > though it works fine. Maybe we can go this way and in case change later. Not totally sure what Maintainers will choose. > So should I put more lines at the defconfig to comment more about > these embarrassing situations? Yes please > > Please for all occurences use Makefile "$(if ...)" statement instead of > > "if [ ... = y ]" > > Sorry for the inconsistency. However the Makefile's if statement is > too weird for me to implement such a branch of things to make. > So I spend a lot of time to find that the shell's if statement could work > this way. And I have find examples that are using the same technique. > For example the line 699 at package/systemd/systemd.mk. Could you > please kindly give me an exemption here? Pardon, using $(if ...) makes things harder in this case, check the Makefile manual: https://www.gnu.org/software/make/manual/make.html#Conditional-Functions So please forget about it and leave it as is. > > > + > > > + cd $(@D)/cvitek/build/task && \ > > > + $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) -G Ninja -DCHIP=cv180x \ > > > + -DRUN_ARCH=riscv64 \ > > > + -DRUN_TYPE=CVIRTOS \ > > > + -DTOP_DIR=$(@D)/cvitek \ > > > + -DBUILD_ENV_PATH=$(@D)/cvitek/build \ > > > + -DBOARD_FPGA=n \ > > > + -DCMAKE_TOOLCHAIN_FILE=$(@D)/cvitek/scripts/toolchain-riscv64-elf.cmake \ > > > > The build command is common for every "target", so please declare it > > into a variable on the top. > > > > > + $(@D)/cvitek/task > > > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target install -- -v > > > + cd $(@D)/cvitek/build/task && $(TARGET_MAKE_ENV) $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) $(BR2_CMAKE) --build . --target cvirtos.bin -- -v > > > > To tell the truth all the points above can be shrinked using a foreach > > loop through all the build directories since they all look the same > > except directory name. Can you provide such change? > > These are too painful for me. Could I move these code into the remote > code repo so that these annoying code will not be included in the buildroot? > And then the buildroot package would only have good lines > like "$(eval $(generic-package))" Sure, if you have access to the repository it's pretty easier then! > Great thanks again for your thorough review and insightful feedback on my > code! I truly appreciate your patience and the valuable time you spend on > my patches. You're welcome :-) Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Tue Feb 6 17:23:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:23:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2: force arm mode instead of Thumb mode In-Reply-To: <20240131203739.2092971-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 21:37:39 +0100") References: <20240131203739.2092971-1-fontaine.fabrice@gmail.com> Message-ID: <87r0hp5wwm.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure in Thumb mode: > /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers > 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers > | ^~~~~ > Fixes: > - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e > - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 17:22:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:22:43 +0100 Subject: [Buildroot] [git commit] package/sdl2: force arm mode instead of Thumb mode Message-ID: <20240206172426.2A888872EF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ecedc4ae8c0632cdd9ba0bf63a64a51e67a1525b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure in Thumb mode: /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 4646e7d1f8..42b4a433e8 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -54,6 +54,10 @@ SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SDL2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) SDL2_DEPENDENCIES += udev SDL2_CONF_OPTS += --enable-libudev @@ -76,7 +80,7 @@ endif ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config +SDL2_CONF_ENV += ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config else SDL2_CONF_OPTS += --disable-video-directfb endif From james.hilliard1 at gmail.com Tue Feb 6 17:26:50 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 10:26:50 -0700 Subject: [Buildroot] [PATCH v2 1/1] package/python-ml-dtypes: bump to version 0.3.2 In-Reply-To: References: <20240206161715.550268-1-james.hilliard1@gmail.com> Message-ID: On Tue, Feb 6, 2024 at 10:18?AM Yann E. MORIN wrote: > > James, All, > > On 2024-02-06 09:17 -0700, James Hilliard spake thusly: > > Migrate from distutils which is being deprecated to setuptools. > > > > Drop python-pybind which is no longer required: > > https://github.com/jax-ml/ml_dtypes/blob/v0.3.2/CHANGELOG.md#032---2024-01-03 > > > > Signed-off-by: James Hilliard > > Applied to master, thanks. > > Could you check whether the following patches are still valid and > required, please: > > https://patchwork.ozlabs.org/project/buildroot/patch/3afcc982685e876ac9b2ae54f86164647040ab85.1706448055.git.yann.morin.1998 at free.fr/ > https://patchwork.ozlabs.org/project/buildroot/patch/20240112221910.14778-1-fontaine.fabrice at gmail.com/ Yeah, looks like they are still needed due to the numpy dependency, although the python-pybind comment I think can be dropped. > > Regards, > Yann E. MORIN. > > > --- > > Changes v1 -> v2: > > - drop pybind > > --- > > package/python-ml-dtypes/Config.in | 1 - > > package/python-ml-dtypes/python-ml-dtypes.hash | 4 ++-- > > package/python-ml-dtypes/python-ml-dtypes.mk | 9 ++++----- > > 3 files changed, 6 insertions(+), 8 deletions(-) > > > > diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in > > index 72506896df..8791564b19 100644 > > --- a/package/python-ml-dtypes/Config.in > > +++ b/package/python-ml-dtypes/Config.in > > @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES > > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy > > depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy > > select BR2_PACKAGE_PYTHON_NUMPY > > - select BR2_PACKAGE_PYTHON_PYBIND > > help > > ml_dtypes is a stand-alone implementation of several NumPy > > dtype extensions used in machine learning libraries. > > diff --git a/package/python-ml-dtypes/python-ml-dtypes.hash b/package/python-ml-dtypes/python-ml-dtypes.hash > > index a440268e39..53bfacb528 100644 > > --- a/package/python-ml-dtypes/python-ml-dtypes.hash > > +++ b/package/python-ml-dtypes/python-ml-dtypes.hash > > @@ -1,5 +1,5 @@ > > # md5, sha256 from https://pypi.org/pypi/ml_dtypes/json > > -md5 6adbb05530819bdb4a78d2372d187fe2 ml_dtypes-0.3.1.tar.gz > > -sha256 60778f99194b4c4f36ba42da200b35ef851ce4d4af698aaf70f5b91fe70fc611 ml_dtypes-0.3.1.tar.gz > > +md5 438c04dc0d941ec1b3b71667225c74c8 ml_dtypes-0.3.2.tar.gz > > +sha256 533059bc5f1764fac071ef54598db358c167c51a718f68f5bb55e3dee79d2967 ml_dtypes-0.3.2.tar.gz > > # Locally computed sha256 checksums > > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > > diff --git a/package/python-ml-dtypes/python-ml-dtypes.mk b/package/python-ml-dtypes/python-ml-dtypes.mk > > index 92d23bece4..676137ecf1 100644 > > --- a/package/python-ml-dtypes/python-ml-dtypes.mk > > +++ b/package/python-ml-dtypes/python-ml-dtypes.mk > > @@ -4,16 +4,15 @@ > > # > > ################################################################################ > > > > -PYTHON_ML_DTYPES_VERSION = 0.3.1 > > +PYTHON_ML_DTYPES_VERSION = 0.3.2 > > PYTHON_ML_DTYPES_SOURCE = ml_dtypes-$(PYTHON_ML_DTYPES_VERSION).tar.gz > > -PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/16/6e/9a7a51ee1ca24b8e92109128260c5aec8340c8fe5572e9ceecddae559abe > > +PYTHON_ML_DTYPES_SITE = https://files.pythonhosted.org/packages/39/7d/8d85fcba868758b3a546e6914e727abd8f29ea6918079f816975c9eecd63 > > PYTHON_ML_DTYPES_LICENSE = Apache-2.0 > > PYTHON_ML_DTYPES_LICENSE_FILES = LICENSE > > -PYTHON_ML_DTYPES_SETUP_TYPE = distutils > > +PYTHON_ML_DTYPES_SETUP_TYPE = setuptools > > > > PYTHON_ML_DTYPES_DEPENDENCIES = \ > > host-python-numpy \ > > - python-numpy \ > > - python-pybind > > + python-numpy > > > > $(eval $(python-package)) > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From ismael at iodev.co.uk Tue Feb 6 17:29:43 2024 From: ismael at iodev.co.uk (Ismael Luceno) Date: Tue, 6 Feb 2024 18:29:43 +0100 Subject: [Buildroot] [PATCH] package/axel: bump version to 2.17.13 Message-ID: <20240206173002.25650-1-ismael@iodev.co.uk> Signed-off-by: Ismael Luceno --- package/axel/axel.hash | 2 +- package/axel/axel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/axel/axel.hash b/package/axel/axel.hash index ebcdc652fc7f..b2ff52876b4b 100644 --- a/package/axel/axel.hash +++ b/package/axel/axel.hash @@ -1,2 +1,2 @@ -sha256 fb4e70535ebf732211af253bfe24f9ada57d80fd465ac02c721406c7d4e1d496 axel-2.17.12.tar.xz +sha256 6af9c0238ca4fb850baa17878de0361868e3ff6d9302298d83c6d26931c28723 axel-2.17.13.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/axel/axel.mk b/package/axel/axel.mk index d3a2f4d42c8f..fbfbc8be3472 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -4,7 +4,7 @@ # ################################################################################ -AXEL_VERSION = 2.17.12 +AXEL_VERSION = 2.17.13 AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION) AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ -- 2.43.0 From peter at korsgaard.com Tue Feb 6 17:30:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:30:56 +0100 Subject: [Buildroot] [PATCH-2023.02.x] package/{glibc, localedef}: security bump to version glibc-2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7 In-Reply-To: <20240131111301.497468-1-peter@korsgaard.com> (Peter Korsgaard's message of "Wed, 31 Jan 2024 12:13:01 +0100") References: <20240131111301.497468-1-peter@korsgaard.com> Message-ID: <87mssd5wkv.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issues: > CVE-2023-6246: syslog: Fix heap buffer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD > CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD > CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal > https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD > For details, see the Qualys advisory: > https://www.openwall.com/lists/oss-security/2024/01/30/6 > Signed-off-by: Peter Korsgaard Committed to 2023.02.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 17:29:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:29:52 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/{glibc, localedef}: security bump to version glibc-2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7 Message-ID: <20240206173113.4AC3C8730F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90f69f4277d037e30c32c4b2503acbbbf963cbbd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following security issues: CVE-2023-6246: syslog: Fix heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD For details, see the Qualys advisory: https://www.openwall.com/lists/oss-security/2024/01/30/6 Signed-off-by: Peter Korsgaard --- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 15 ++++++++++++++- package/localedef/localedef.mk | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index dcff16d465..b2eee2e9af 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 d7d829f90f03e00d42d7d34ff7e972a59b14e2b70fa2e852893018349aafa5f7 glibc-2.36-118-g22955ad85186ee05834e47e665056148ca07699c.tar.gz +sha256 30cdd65d82b6d53d4470e4bf89cab7c5cc1a8edaf8830358d8542e1c847e2d0b glibc-2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 98e7db7b4b..324fb0de9a 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,8 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.36-118-g22955ad85186ee05834e47e665056148ca07699c +GLIBC_VERSION = 2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7 + # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -44,6 +45,18 @@ GLIBC_IGNORE_CVES += CVE-2023-4911 # 2.36 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-5156 +# Fixed by d1a83b6767f68b3cb5b4b4ea2617254acd040c82, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6246 + +# Fixed by 2bc9d7c002bdac38b5c2a3f11b78e309d7765b83, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6779 + +# Fixed by b9b7d6a27aa0632f334352fa400771115b3c69b7, which is between +# 2.36 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6780 + # All these CVEs are considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 51d3ddc932..c755f59b34 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.36-118-g22955ad85186ee05834e47e665056148ca07699c +LOCALEDEF_VERSION = 2.36-128-gb9b7d6a27aa0632f334352fa400771115b3c69b7 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From romain.naour at smile.fr Tue Feb 6 17:32:37 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 18:32:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: <20240106101202.495801-1-fontaine.fabrice@gmail.com> References: <20240106101202.495801-1-fontaine.fabrice@gmail.com> Message-ID: <2be6d0df-6165-4da9-b69c-ad0deb5444be@smile.fr> Hello, Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit?: > ncmpc is able to automatically detect NLS support since version 0.47 and > https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 > so let it handle automatically to avoid the following build failure with > a bootlin toolchain which embeds a gettext definition in libintl.h which > will clash with the fake gettext definition provided by ncmpc since > https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: > > In file included from ../src/save_playlist.cxx:8: > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' > 39 | extern char *gettext (const char *__msgid) > | ^~~~~~~ > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' > ../src/i18n.h:22:20: note: to match this '(' > 22 | #define gettext(x) (x) > | ^ > > Indeed, even if NLS is disabled by the user, libintl.h will be included > by > /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h > though include We usually want to explicitly handle such option from Buildroot package to not rely on automatic detection (as currently done). It look like more a bug in ncmpc build system? Best regards, Romain > > Fixes: > - http://autobuild.buildroot.org/results/c860e64909dd3b7fa033db0970e1cfc1376c4ec5 > - http://autobuild.buildroot.org/results/36eab556fac80124755bff4110af3e43fe6edd78 > > Signed-off-by: Fabrice Fontaine > --- > package/ncmpc/ncmpc.mk | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk > index bc8a62daea..0965981f23 100644 > --- a/package/ncmpc/ncmpc.mk > +++ b/package/ncmpc/ncmpc.mk > @@ -20,8 +20,7 @@ NCMPC_CPE_ID_VENDOR = ncmpc_project > > NCMPC_CONF_OPTS = \ > -Dcurses=ncurses \ > - -Ddocumentation=disabled \ > - $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) > + -Ddocumentation=disabled > > ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) > NCMPC_DEPENDENCIES += lirc-tools From fran.millocs at live.com.ar Tue Feb 6 17:34:26 2024 From: fran.millocs at live.com.ar (franco ariel) Date: Tue, 6 Feb 2024 17:34:26 +0000 Subject: [Buildroot] Best board to fast boot In-Reply-To: <71301602-56ac-46b4-a853-bd71ed74da27@benettiengineering.com> References: <71301602-56ac-46b4-a853-bd71ed74da27@benettiengineering.com> Message-ID: Hi Giulio, Thank you for you answer. Based on the PDF I see that I can't do those optimizations on my rpi4, because the bootloader is not open source, right? So, the Beagleboard looks good but, the RAM is quite low, I was looking for something better to run my qt application, which has smooth animations and transitions, BLE, touchscreen support, etc. witch board, with the bootloader open source, can I use to boot as fast as possible into the qt app? Thank you, Franco ________________________________ De: Giulio Benetti Enviado: martes, 6 de febrero de 2024 06:52 Para: franco ariel ; Thomas Petazzoni via buildroot Asunto: Re: [Buildroot] Best board to fast boot Hi Franco, On 06/02/24 05:14, franco ariel wrote: > Hello guys! > I few weeks ago I started working with buildroot on rpi4, and it's look > amazing, thanks to the community I was able to run a flutter app on my > rpi4. But now, I want to keep going forward with my project, so ?Witch > one are the best board to achieve te best boot time to a Qt application? > I was looking for the Rockpro64 from pine but I'm not sure, since there > is not so much information about this board. > > What do you think it will be good for my project? On rpi4 I was able to > get 10sec boot time until the qt app shows up. And I want to achieve > less than 7s. This depends a lot on optimization you do on bootloader, linux and init script. I suggest you to take a look at these slides: https://bootlin.com/doc/training/boot-time/boot-time-slides.pdf Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas -------------- next part -------------- An HTML attachment was scrubbed... URL: From peter at korsgaard.com Tue Feb 6 17:34:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:34:47 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: new jq runtime test In-Reply-To: <20240204221915.460639-1-ju.o@free.fr> (Julien Olivain's message of "Sun, 4 Feb 2024 23:19:15 +0100") References: <20240204221915.460639-1-ju.o@free.fr> Message-ID: <87il315weg.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 17:33:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:33:49 +0100 Subject: [Buildroot] [git commit] support/testing: new jq runtime test Message-ID: <20240206173734.A21F88732F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=feab8290a492ae76d57132f61cd1716a43a0cf78 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_jq.py | 62 ++++++++++++++++++++++ .../test_jq/rootfs-overlay/root/broken.json | 1 + .../test_jq/rootfs-overlay/root/ex13-1.json | 14 +++++ .../test_jq/rootfs-overlay/root/ex13-2.json | 22 ++++++++ .../test_jq/rootfs-overlay/root/ex13-3.json | 1 + .../test_jq/rootfs-overlay/root/ex13-4.json | 1 + .../test_jq/rootfs-overlay/root/ex13-5.json | 1 + 8 files changed, 104 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c103bdadf8..4b8d195f9f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1790,6 +1790,8 @@ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_jq.py +F: support/testing/tests/package/test_jq/ F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_kmscube.py diff --git a/support/testing/tests/package/test_jq.py b/support/testing/tests/package/test_jq.py new file mode 100644 index 0000000000..67420abb6b --- /dev/null +++ b/support/testing/tests/package/test_jq.py @@ -0,0 +1,62 @@ +import json +import os + +import infra.basetest + + +class TestJq(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_jq/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_JQ=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("jq --version") + + # Run jq on examples extracted from JSON RFC: + # https://www.rfc-editor.org/rfc/rfc8259.txt + for i in range(1, 6): + fname = f"ex13-{i}.json" + cmd = f"jq -M '.' {fname}" + self.assertRunOk(cmd) + + # Check the execution fails on a non JSON file. + cmd = "jq -M '.' broken.json" + _, ret = self.emulator.run(cmd) + self.assertNotEqual(ret, 0) + + # Check an execution of a simple query. Note that output is a + # JSON (quoted) string. + cmd = "jq -M '.[1].City' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], '"SUNNYVALE"') + + # Run the same query with the -r option, to output raw text + # (i.e. strings without quotes). + cmd = "jq -r -M '.[1].City' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], "SUNNYVALE") + + # Print the ex13-2.json file as compact JSON (with option -c). + cmd = "jq -c -M '.' ex13-2.json" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + # We reload this compact string using the Python json parser, + # to test interoperability. We check the same element as in + # previous queries in the Python object. + json_data = json.loads(out[0]) + self.assertEqual(json_data[1]["City"], "SUNNYVALE") diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json new file mode 100644 index 0000000000..fc2bf94565 --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/broken.json @@ -0,0 +1 @@ +[ This is is NOT a JSON file! } diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json new file mode 100644 index 0000000000..52b7b6493f --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-1.json @@ -0,0 +1,14 @@ +{ + "Image": { + "Width": 800, + "Height": 600, + "Title": "View from 15th Floor", + "Thumbnail": { + "Url": "http://www.example.com/image/481989943", + "Height": 125, + "Width": 100 + }, + "Animated" : false, + "IDs": [116, 943, 234, 38793] + } +} diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json new file mode 100644 index 0000000000..b4545b28c8 --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-2.json @@ -0,0 +1,22 @@ +[ + { + "precision": "zip", + "Latitude": 37.7668, + "Longitude": -122.3959, + "Address": "", + "City": "SAN FRANCISCO", + "State": "CA", + "Zip": "94107", + "Country": "US" + }, + { + "precision": "zip", + "Latitude": 37.371991, + "Longitude": -122.026020, + "Address": "", + "City": "SUNNYVALE", + "State": "CA", + "Zip": "94085", + "Country": "US" + } +] diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json new file mode 100644 index 0000000000..6ccebb9abe --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-3.json @@ -0,0 +1 @@ +"Hello world!" diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-4.json @@ -0,0 +1 @@ +42 diff --git a/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json new file mode 100644 index 0000000000..27ba77ddaf --- /dev/null +++ b/support/testing/tests/package/test_jq/rootfs-overlay/root/ex13-5.json @@ -0,0 +1 @@ +true From peter at korsgaard.com Tue Feb 6 17:40:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:40:07 +0100 Subject: [Buildroot] [PATCH] package/axel: bump version to 2.17.13 In-Reply-To: <20240206173002.25650-1-ismael@iodev.co.uk> (Ismael Luceno's message of "Tue, 6 Feb 2024 18:29:43 +0100") References: <20240206173002.25650-1-ismael@iodev.co.uk> Message-ID: <87eddp5w5k.fsf@48ers.dk> >>>>> "Ismael" == Ismael Luceno writes: > Signed-off-by: Ismael Luceno Committed, thanks. -- Bye, Peter Korsgaard From arnout at mind.be Tue Feb 6 17:43:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:43:08 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/python-poetry-core: new host package In-Reply-To: <20240106214410.3294887-1-james.hilliard1@gmail.com> References: <20240106214410.3294887-1-james.hilliard1@gmail.com> Message-ID: Hi James, On 06/01/2024 22:44, James Hilliard wrote: > Signed-off-by: James Hilliard > --- > package/python-poetry-core/python-poetry-core.hash | 5 +++++ > package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ > 2 files changed, 19 insertions(+) > create mode 100644 package/python-poetry-core/python-poetry-core.hash > create mode 100644 package/python-poetry-core/python-poetry-core.mk > > diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash > new file mode 100644 > index 0000000000..3c07fef04f > --- /dev/null > +++ b/package/python-poetry-core/python-poetry-core.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/poetry-core/json > +md5 9ed2f2e9244165b34d7233c306a34a2a poetry_core-1.8.1.tar.gz > +sha256 67a76c671da2a70e55047cddda83566035b701f7e463b32a2abfeac6e2a16376 poetry_core-1.8.1.tar.gz > +# Locally computed sha256 checksums > +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE > diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk > new file mode 100644 > index 0000000000..e1acf3179c > --- /dev/null > +++ b/package/python-poetry-core/python-poetry-core.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-poetry-core > +# > +################################################################################ > + > +PYTHON_POETRY_CORE_VERSION = 1.8.1 > +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz > +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/36/66/6af2891495d12020419c8447d0b29c1e96f3be16631faaed6bda5b886d5d > +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 > +PYTHON_POETRY_CORE_LICENSE = MIT > +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE This package has 4 vendored dependencies, each with their own license. Those should also be specified in the LICENSE and LICENSE_FILES. In addition, for lark, there's a file under MPL and a file under GPL, even though neither if those licenses is mentioned in the lark license. Ideally those two should be mentioned in the LICENSES as well. And of course, this should ideally also be done for the python-lark package which suffers from the same issue... Regards, Arnout > + > +$(eval $(host-python-package)) From peter at korsgaard.com Tue Feb 6 17:39:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:39:31 +0100 Subject: [Buildroot] [git commit] package/axel: bump version to 2.17.13 Message-ID: <20240206174452.CD84D87358@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=041e8e7e403121fcdf4c5a5fc363230c5ded2980 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Ismael Luceno Signed-off-by: Peter Korsgaard --- package/axel/axel.hash | 2 +- package/axel/axel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/axel/axel.hash b/package/axel/axel.hash index ebcdc652fc..b2ff52876b 100644 --- a/package/axel/axel.hash +++ b/package/axel/axel.hash @@ -1,2 +1,2 @@ -sha256 fb4e70535ebf732211af253bfe24f9ada57d80fd465ac02c721406c7d4e1d496 axel-2.17.12.tar.xz +sha256 6af9c0238ca4fb850baa17878de0361868e3ff6d9302298d83c6d26931c28723 axel-2.17.13.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/axel/axel.mk b/package/axel/axel.mk index d3a2f4d42c..fbfbc8be34 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -4,7 +4,7 @@ # ################################################################################ -AXEL_VERSION = 2.17.12 +AXEL_VERSION = 2.17.13 AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION) AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ From buildroot at busybox.net Tue Feb 6 17:45:09 2024 From: buildroot at busybox.net (Mail Accounts) Date: 6 Feb 2024 18:45:09 +0100 Subject: [Buildroot] Your mailbox quota is full Message-ID: <20240206184509.4E53D66CEEE201DA@busybox.net> An HTML attachment was scrubbed... URL: From peter at korsgaard.com Tue Feb 6 17:46:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 18:46:54 +0100 Subject: [Buildroot] [PATCH 1/1] board/radxa/rock5b: Disable FIQ debug interface In-Reply-To: <20240202233030.1192392-1-kilian.zinnecker@mail.de> (Kilian Zinnecker via buildroot's message of "Sat, 3 Feb 2024 00:30:30 +0100") References: <20240202233030.1192392-1-kilian.zinnecker@mail.de> Message-ID: <87a5od5vu9.fsf@48ers.dk> >>>>> "Kilian" == Kilian Zinnecker via buildroot writes: > The custom kernel used for the Rock5B features an FIQ debug > interface which is enabled by default. As it is not needed, it is > disabled. The documentation features instructions on how to > re-enable it, if it is needed. > Signed-off-by: Kilian Zinnecker Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 17:46:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 18:46:01 +0100 Subject: [Buildroot] [git commit] board/radxa/rock5b: Disable FIQ debug interface Message-ID: <20240206174709.BC7C387390@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c77a7acb8806a775cd6365c1c5de0f03141e138f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The custom kernel used for the Rock5B features an FIQ debug interface which is enabled by default. As it is not needed, it is disabled. The documentation features instructions on how to re-enable it, if it is needed. Signed-off-by: Kilian Zinnecker Signed-off-by: Peter Korsgaard --- board/radxa/rock5b/linux.fragment | 1 + board/radxa/rock5b/readme.txt | 20 ++++++++++++++++++++ board/radxa/rock5b/rock5b.dts | 12 ++++++++++++ board/radxa/rock5b/rock5b.its | 2 +- configs/rock5b_defconfig | 3 ++- 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 6d65cb7bb8..28bb373ef2 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1,4 +1,5 @@ CONFIG_R8169=y +# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set # Disable Rockchip specific WiFi drivers, as the kernel # code cannot be build with GCC 12 due to several Werrors # CONFIG_WL_ROCKCHIP is not set diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index f02f3d380e..b3eb06851a 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -20,6 +20,7 @@ output/images ????????? rk3588-rock-5b.dtb ????????? rk3588_bl31_v1.40.elf ????????? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin +????????? rock5b.dts ????????? rock5b.its ????????? rootfs.ext2 ????????? rootfs.ext4 @@ -64,6 +65,8 @@ https://forum.radxa.com/c/rock5 Issues: ======= +WiFi +---- The custom Radxa kernel provides custom code to support WiFi. However, that code does not compile with GCC 12, which is the current default version in buildroot. Hence, the WiFi kernel drivers are disabled, until @@ -80,3 +83,20 @@ BR2_GCC_VERSION_11_X=y board/radxa/rock5b/linux.fragment: # CONFIG_WL_ROCKCHIP is not set + +Rockchip FIQ Debugger +--------------------- +The custom kernel used for this board features an FIQ debugger, which +can be activated by typing "fiq" on the serial interface. As this can be +annoying if a user wants to type these charakters and it is not needed +for most users, this board support disables the FIQ debugger by default. +To re-enable the FIQ debugger follow the steps: + +1. In board/radxa/rock5b/rock5b.dts set the status property of the +fiq_debugger node to "okay" and set the status property of the uart2 +node to "disabled" + +2. Re-enable the fiq debugger module by removing the following line +from board/radxa/rock5b/linux.fragment: + +# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts new file mode 100644 index 0000000000..71a4e42b5e --- /dev/null +++ b/board/radxa/rock5b/rock5b.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +#include "rockchip/rk3588-rock-5b.dts" + +&fiq_debugger { + status = "disabled"; +}; + +&uart2 { + pinctrl-0 = <&uart2m0_xfer>; + status = "okay"; +}; diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its index d73659a56e..9ce235d041 100644 --- a/board/radxa/rock5b/rock5b.its +++ b/board/radxa/rock5b/rock5b.its @@ -20,7 +20,7 @@ }; fdt { description = "Device Tree"; - data = /incbin/("rk3588-rock-5b.dtb"); + data = /incbin/("rock5b.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 2e72b386b1..7175aa66bf 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -14,7 +14,8 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" +# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" BR2_TARGET_ROOTFS_EXT2=y From arnout at mind.be Tue Feb 6 17:47:20 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:47:20 +0100 Subject: [Buildroot] [PATCH 2/4] package/python-aiosqlite: new package In-Reply-To: <20231214091504.101102-2-james.hilliard1@gmail.com> References: <20231214091504.101102-1-james.hilliard1@gmail.com> <20231214091504.101102-2-james.hilliard1@gmail.com> Message-ID: <28d526e3-7700-4588-881e-2aeaf63e742c@mind.be> On 14/12/2023 10:15, James Hilliard wrote: > Signed-off-by: James Hilliard Applied both to master, thanks. Regards, Arnout > --- > package/Config.in | 1 + > package/python-aiosqlite/Config.in | 6 ++++++ > package/python-aiosqlite/python-aiosqlite.hash | 5 +++++ > package/python-aiosqlite/python-aiosqlite.mk | 14 ++++++++++++++ > 4 files changed, 26 insertions(+) > create mode 100644 package/python-aiosqlite/Config.in > create mode 100644 package/python-aiosqlite/python-aiosqlite.hash > create mode 100644 package/python-aiosqlite/python-aiosqlite.mk > > diff --git a/package/Config.in b/package/Config.in > index fcc09b07c4..d24db2550e 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -971,6 +971,7 @@ menu "External python modules" > source "package/python-aioredis/Config.in" > source "package/python-aiorwlock/Config.in" > source "package/python-aiosignal/Config.in" > + source "package/python-aiosqlite/Config.in" > source "package/python-aiozipkin/Config.in" > source "package/python-alembic/Config.in" > source "package/python-alsaaudio/Config.in" > diff --git a/package/python-aiosqlite/Config.in b/package/python-aiosqlite/Config.in > new file mode 100644 > index 0000000000..950c879a49 > --- /dev/null > +++ b/package/python-aiosqlite/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_PYTHON_AIOSQLITE > + bool "python-aiosqlite" > + help > + asyncio bridge to the standard sqlite3 module. > + > + https://aiosqlite.omnilib.dev/ > diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash > new file mode 100644 > index 0000000000..e06061346c > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/aiosqlite/json > +md5 e829bf8f641ab115c1a9ca0494d35278 aiosqlite-0.19.0.tar.gz > +sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d aiosqlite-0.19.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 > new file mode 100644 > index 0000000000..e513d53c02 > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-aiosqlite > +# > +################################################################################ > + > +PYTHON_AIOSQLITE_VERSION = 0.19.0 > +PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz > +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 > +PYTHON_AIOSQLITE_SETUP_TYPE = flit > +PYTHON_AIOSQLITE_LICENSE = MIT > +PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE > + > +$(eval $(python-package)) From arnout at mind.be Tue Feb 6 17:48:18 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:48:18 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-aiosqlite: new package In-Reply-To: <20231124225945.163643-1-james.hilliard1@gmail.com> References: <20231124225945.163643-1-james.hilliard1@gmail.com> Message-ID: On 24/11/2023 23:59, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/Config.in | 1 + > package/python-aiosqlite/Config.in | 7 +++++++ > package/python-aiosqlite/python-aiosqlite.hash | 5 +++++ > package/python-aiosqlite/python-aiosqlite.mk | 14 ++++++++++++++ > 4 files changed, 27 insertions(+) > create mode 100644 package/python-aiosqlite/Config.in > create mode 100644 package/python-aiosqlite/python-aiosqlite.hash > create mode 100644 package/python-aiosqlite/python-aiosqlite.mk > > diff --git a/package/Config.in b/package/Config.in > index 5a3410d758..1f7d262265 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -971,6 +971,7 @@ menu "External python modules" > source "package/python-aioredis/Config.in" > source "package/python-aiorwlock/Config.in" > source "package/python-aiosignal/Config.in" > + source "package/python-aiosqlite/Config.in" > source "package/python-aiozipkin/Config.in" > source "package/python-alembic/Config.in" > source "package/python-alsaaudio/Config.in" > diff --git a/package/python-aiosqlite/Config.in b/package/python-aiosqlite/Config.in > new file mode 100644 > index 0000000000..6f2af23cef > --- /dev/null > +++ b/package/python-aiosqlite/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_PYTHON_AIOSQLITE > + bool "python-aiosqlite" > + help > + aiosqlite provides a friendly, async interface to sqlite > + databases. > + > + https://aiosqlite.omnilib.dev > diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash > new file mode 100644 > index 0000000000..e06061346c > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/aiosqlite/json > +md5 e829bf8f641ab115c1a9ca0494d35278 aiosqlite-0.19.0.tar.gz > +sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d aiosqlite-0.19.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 > new file mode 100644 > index 0000000000..e513d53c02 > --- /dev/null > +++ b/package/python-aiosqlite/python-aiosqlite.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-aiosqlite > +# > +################################################################################ > + > +PYTHON_AIOSQLITE_VERSION = 0.19.0 > +PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz > +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 > +PYTHON_AIOSQLITE_SETUP_TYPE = flit > +PYTHON_AIOSQLITE_LICENSE = MIT > +PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE > + > +$(eval $(python-package)) From romain.naour at smile.fr Tue Feb 6 17:50:12 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 18:50:12 +0100 Subject: [Buildroot] [PATCH v3 02/11] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <20231218081958.506691-3-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-3-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > The patch sets the configurations required by TI HS systems. Some of these > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > are provided by the ti-k3-core-secdev package in the binaries directory. AFAIK the ti-k3-image-gen tool is deprecated and must be replaced by binman tool provided by upstream u-boot. Is all k3 SoC migrated to binman in the latest u-boot release 2024.01? See the FOSDEM talk: https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/21919/FOSDEM24_Speaker_Slides_y7FsIKM.pdf Best regards, Romain > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3-image-gen/Config.in | 1 + > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > index d76cef82e911..38d1598d9fc0 100644 > --- a/boot/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3-image-gen/Config.in > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > bool "ti-k3-image-gen" > depends on BR2_TARGET_TI_K3_R5_LOADER > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > # We need FIT support in uboot-tools, which is why we select a > # host package > select BR2_PACKAGE_HOST_UBOOT_TOOLS > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > index 64be9a18f2c4..91aed63bab84 100644 > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +else > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > + > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > +endif > > define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > + ) > endef > > define TI_K3_IMAGE_GEN_BUILD_CMDS > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > $(BR2_MAKE) -C $(@D) \ > SOC=$(TI_K3_IMAGE_GEN_SOC) \ > SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > + TI_SECURE_DEV_PKG=$(BINARIES_DIR) \ > CONFIG=evm \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ From giulio.benetti at benettiengineering.com Tue Feb 6 17:51:09 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 6 Feb 2024 18:51:09 +0100 Subject: [Buildroot] Best board to fast boot In-Reply-To: References: <71301602-56ac-46b4-a853-bd71ed74da27@benettiengineering.com> Message-ID: Hi Franco, On 06/02/24 18:34, franco ariel wrote: > Hi Giulio, > > Thank you for you answer. > > Based on the PDF I see that I can't do those optimizations on my rpi4, > because the bootloader is not open source, right? It depends if you already tried all possible rpi bootloader options. Take a look here: https://forums.raspberrypi.com/viewtopic.php?t=277010#p1684446 that way you can zero boot_delay. Someone claims that it doesn't work, but it's worth a try to get 2/3 seconds less. Also I think there could be other options to tweak. Then it depends when you launch your qt application, I mean in which script and it also depends which init system you use. Busybox one is pretty fast, but it depends if for example you leave all init.d scripts as they are. Let's say you wait for network to be connected(waiting for handshake etc.), that will result in many seconds wasted. So, the Beagleboard > looks good but, the RAM is quite low, I was looking for something better > to run my qt application, which has smooth animations and transitions, > BLE, touchscreen support, etc. witch board, with the bootloader open > source, can I use to boot as fast as possible into the qt app? I would try to optimize what you get to understand more deeply what's going on. Because rpi4 processor BCM2711 is really very very fast. Otherwise you can switch to any ready to go defconfig we have and dig the board that fits better for you. That way you will have u-boot in general and you can save time, but again, on boot_delay. The choice is yours of course. -- Giulio Benetti CEO&CTO at Benetti Engineering sas > Thank you, > Franco > > > > ------------------------------------------------------------------------ > *De:*?Giulio Benetti > *Enviado:*?martes, 6 de febrero de 2024 06:52 > *Para:*?franco ariel ; Thomas Petazzoni via > buildroot > *Asunto:*?Re: [Buildroot] Best board to fast boot > Hi Franco, > > On 06/02/24 05:14, franco ariel wrote: >> Hello guys! >> I few weeks ago I started working with buildroot on rpi4, and it's look >> amazing, thanks to the community I was able to run a flutter app on my >> rpi4. But now, I want to keep going forward with my project, so ?Witch >> one are the best board to achieve te best boot time to a Qt application? >> I was looking for the Rockpro64 from pine but I'm not sure, since there >> is not so much information about this board. >> >> What do you think it will be good for my project? On rpi4 I was able to >> get 10sec boot time until the qt app shows up. And I want to achieve >> less than 7s. > > This depends a lot on optimization you do on bootloader, linux and init > script. > > I suggest you to take a look at these slides: > https://bootlin.com/doc/training/boot-time/boot-time-slides.pdf > > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Tue Feb 6 17:52:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:52:34 +0100 Subject: [Buildroot] [PATCH v9 01/11] toolchain/toolchain-bare-metal-buildroot: new toolchain In-Reply-To: <20240131112223.2175855-1-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> Message-ID: <20240206185234.04a67c61@windsurf> On Wed, 31 Jan 2024 11:22:13 +0000 Neal Frager via buildroot wrote: > This patch adds a new virtual package for adding a bare-metal > toolchain to Buildroot. For now, it depends on nothing, so it will not > actually build anything, but it defines some options that will be > needed by the various packages that will be part of this toolchain > build process. > > Signed-off-by: Neal Frager > Signed-off-by: Ibai Erkiaga > Signed-off-by: Thomas Petazzoni > --- > DEVELOPERS | 4 ++++ > toolchain/Config.in | 10 ++++++++++ > toolchain/toolchain-bare-metal-buildroot/Config.in | 9 +++++++++ > .../toolchain-bare-metal-buildroot.mk | 12 ++++++++++++ > utils/checksymbolslib/br.py | 3 +++ > 5 files changed, 38 insertions(+) > create mode 100644 toolchain/toolchain-bare-metal-buildroot/Config.in > create mode 100644 toolchain/toolchain-bare-metal-buildroot/toolchain-bare-metal-buildroot.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 17:52:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:52:37 +0100 Subject: [Buildroot] [PATCH v9 02/11] package/binutils-bare-metal: new package In-Reply-To: <20240131112223.2175855-2-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-2-neal.frager@amd.com> Message-ID: <20240206185237.2eb77996@windsurf> On Wed, 31 Jan 2024 11:22:14 +0000 Neal Frager via buildroot wrote: > This patch adds a new package for building binutils for a bare-metal toolchain. > The cpu architecture is defined by a toolchain-bare-metal virtual package. > While any cpu architecture could be used, the default configuration will be a > Xilinx microblaze little endian architecture, so that buildroot will be able > to build the microblaze firmware applications for zynqmp and versal. > > In order to build the zynqmp pmufw and versal plm applications without error, > binutils version 2.41 or higher is required. > > Signed-off-by: Neal Frager > Signed-off-by: Ibai Erkiaga > Signed-off-by: Thomas Petazzoni > --- > V1->V2: > - removed default enable to be replaced with toolchain select config > V2->V3: > - no changes > V3->V4: > - split tar instruction into multiple lines > - replaced unnecessary =? with = for assignments > - changed xlnx-rel-v2023.1.tar.gz hash to sha256 > - improved menuconfig help comment > V4->V5: > - moved to upstream version 2.41 with needed patches > - reduced all lines to <80 chars > V5->V6: > - migrated to toolchain-bare-metal-buildroot > V6->V7: > - removed Config.in and hard-coded version > V7->V8: > - no changes > V8->V9: > - bumped to binutils 2.42 > - removed patches since they are included with binutils 2.42 > --- > DEVELOPERS | 2 ++ > .../binutils-bare-metal.hash | 1 + > .../binutils-bare-metal.mk | 33 +++++++++++++++++++ > package/binutils/binutils.hash | 1 + > 4 files changed, 37 insertions(+) > create mode 120000 package/binutils-bare-metal/binutils-bare-metal.hash > create mode 100644 package/binutils-bare-metal/binutils-bare-metal.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 17:52:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:52:41 +0100 Subject: [Buildroot] [PATCH v9 03/11] package/gcc-bare-metal: new package In-Reply-To: <20240131112223.2175855-3-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-3-neal.frager@amd.com> Message-ID: <20240206185241.2d3bba6e@windsurf> On Wed, 31 Jan 2024 11:22:15 +0000 Neal Frager via buildroot wrote: > This patch adds a new package for building gcc for a bare-metal toolchain. > The cpu architecture is defined by a toolchain-bare-metal virtual package. > While any cpu architecture could be used, the default configuration will be a > Xilinx microblaze little endian architecture, so that buildroot will be able > to build the microblaze firmware applications for zynqmp and versal. > > Signed-off-by: Neal Frager > Signed-off-by: Ibai Erkiaga > Signed-off-by: Thomas Petazzoni > --- > V1->V2: > - removed default enable to be replaced with toolchain select config > V2->V3: > - no changes > V3->V4: > - split tar instruction into multiple lines > - replaced unnecessary =? with = for assignments > - changed xlnx-rel-v2023.1.tar.gz hash to sha256 > - improved menuconfig help comment > V4->V5: > - moved to upstream gcc without any xilinx patches > - reduced all lines to <80 chars > - added license files > V5->V6: > - migrated to toolchain-bare-metal-buildroot > V6->V7: > - removed Config.in and hard-coded version > - added sysroot for newlib install > V7->V8: > - no changes > V8->V9: > - integrated changes from Thomas > --- > DEVELOPERS | 2 + > package/gcc-bare-metal/13.2.0 | 1 + > package/gcc-bare-metal/gcc-bare-metal.hash | 1 + > package/gcc-bare-metal/gcc-bare-metal.mk | 61 ++++++++++++++++++++++ > 4 files changed, 65 insertions(+) > create mode 120000 package/gcc-bare-metal/13.2.0 > create mode 120000 package/gcc-bare-metal/gcc-bare-metal.hash > create mode 100644 package/gcc-bare-metal/gcc-bare-metal.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 17:52:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:52:44 +0100 Subject: [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: new package In-Reply-To: <20240131112223.2175855-4-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-4-neal.frager@amd.com> Message-ID: <20240206185244.2b75b044@windsurf> On Wed, 31 Jan 2024 11:22:16 +0000 Neal Frager via buildroot wrote: > This patch adds a new package for building newlib for a bare-metal toolchain. > The cpu architecture is defined by a toolchain-bare-metal virtual package. > While any cpu architecture could be used, the default configuration will be a > Xilinx microblaze little endian architecture, so that buildroot will be able > to build the microblaze firmware applications for zynqmp and versal. > > Signed-off-by: Neal Frager > Signed-off-by: Ibai Erkiaga > Signed-off-by: Thomas Petazzoni > --- > V1->V2: > - removed default enable to be replaced with toolchain select config > V2->V3: > - no changes > V3->V4: > - replaced unnecessary =? with = for assignments > - improved menuconfig help comment > V4->V5: > - added license files > - reduced all lines to <80 chars > V5->V6: > - migrated to toolchain-bare-metal-buildroot > V6->V7: > - hard-coded version > - converted to target package with gcc-bare-metal sysroot install > V7->V8: > - no changes > V8->V9: > - bumped to version 4.4.0 > --- > DEVELOPERS | 2 + > package/newlib-bare-metal/Config.in | 2 + > .../newlib-bare-metal/newlib-bare-metal.hash | 8 +++ > .../newlib-bare-metal/newlib-bare-metal.mk | 52 +++++++++++++++++++ > 4 files changed, 64 insertions(+) > create mode 100644 package/newlib-bare-metal/Config.in > create mode 100644 package/newlib-bare-metal/newlib-bare-metal.hash > create mode 100644 package/newlib-bare-metal/newlib-bare-metal.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 17:53:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:53:02 +0100 Subject: [Buildroot] [PATCH v9 04/11] package/newlib-bare-metal: new package In-Reply-To: References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-4-neal.frager@amd.com> Message-ID: <20240206185302.75f46cf6@windsurf> On Fri, 2 Feb 2024 12:11:29 +0000 "Frager, Neal via buildroot" wrote: > 1. Thanks to the binutils 2.42 release, we do not need microblaze patches > anymore. Excellent! > 2. I chose to keep the newlib fixup. Even though the --with-tooldir patch was > accepted upstream, newlib requires autoconf 2.69 for this patch to be applied. > So rather than including a version of the patch that works on the output > configure script directly, I thought it would be better to just keep the fixup > for now. We can remove the fixup with the next newlib release which will have > a configurable --with-tooldir option. I think it's a reasonable trade-off indeed. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 17:53:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 18:53:05 +0100 Subject: [Buildroot] [PATCH v9 05/11] toolchain/toolchain-bare-metal-buildroot: wire up newlib-bare-metal In-Reply-To: <20240131112223.2175855-5-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-5-neal.frager@amd.com> Message-ID: <20240206185305.0ca3bb42@windsurf> On Wed, 31 Jan 2024 11:22:17 +0000 Neal Frager via buildroot wrote: > Signed-off-by: Thomas Petazzoni > Signed-off-by: Neal Frager > --- > toolchain/Config.in | 1 + > toolchain/toolchain-bare-metal-buildroot/Config.in | 2 ++ > .../toolchain-bare-metal-buildroot.mk | 2 +- > 3 files changed, 4 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From dario.binacchi at amarulasolutions.com Tue Feb 6 17:53:28 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 6 Feb 2024 18:53:28 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinyxml2: add host variant Message-ID: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> It is required by package uuu starting from version 1.5.165. Signed-off-by: Dario Binacchi --- package/tinyxml2/tinyxml2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index 5ea9e13a4b0b..f53e8d6b9926 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -16,3 +16,4 @@ TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON endif $(eval $(cmake-package)) +$(eval $(host-cmake-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 6 17:53:29 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 6 Feb 2024 18:53:29 +0100 Subject: [Buildroot] [PATCH 2/2] package/uuu: bump to version 1.5.165 In-Reply-To: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> References: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240206175330.570115-2-dario.binacchi@amarulasolutions.com> It requires the host-tinyxml2 package. The hash of README.md has changed because a reference to the tinyxml2 license has been added: + - tinyxml (zlib license) is from https://github.com/leethomason/tinyxml2 Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.163 https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.165 Signed-off-by: Dario Binacchi --- package/uuu/uuu.hash | 4 ++-- package/uuu/uuu.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index 20816b5081db..c231d5d729f0 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 6972c7a1e76d60a22212913a8867b737104410c2a47ad88c8af460bd4885ec09 uuu_source-uuu_1.5.141.tar.gz +sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE -sha256 2d872c6e5aaea15ec1932bfb378fb62e24ee7ec399fe7f998f03d9b728215335 README.md +sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 93c748ee46d8..d1bae61f528e 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,11 +4,11 @@ # ################################################################################ -UUU_VERSION = 1.5.141 +UUU_VERSION = 1.5.165 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License UUU_LICENSE_FILES = LICENSE README.md -HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd +HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd host-tinyxml2 $(eval $(host-cmake-package)) -- 2.43.0 From arnout at mind.be Tue Feb 6 17:55:45 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:55:45 +0100 Subject: [Buildroot] [PATCH v2 2/4] package/python-aiosqlite: new package In-Reply-To: References: <20240106214410.3294887-1-james.hilliard1@gmail.com> <20240106214410.3294887-2-james.hilliard1@gmail.com> Message-ID: <2e4bb17c-ef38-437b-bc6e-853c92f32646@mind.be> On 06/02/2024 18:17, Arnout Vandecappelle wrote: > > > On 06/01/2024 22:44, James Hilliard wrote: >> Signed-off-by: James Hilliard > > ?Applied both to master, thanks. ?Sorry, I got confused with the different versions. I actually applied this version of python-aiosqlite, but I used the help text from the other one because that was better. ?I didn't apply any other patch from this series because the license of poetry-core is not correct. The rest of the series is also marked Changes Requested. ?Please avoid having the same patch (like this one) in several series. If you need it in several series, just combine those patches in a single series and mark the previous version as Superseded. That makes our live a lot easier. ?Regards, ?Arnout > > ?Regards, > ?Arnout > >> --- >> Changes v1 -> v2: >> ?? - add missing python sqlite module >> --- >> ? package/Config.in????????????????????????????? |? 1 + >> ? package/python-aiosqlite/Config.in???????????? |? 7 +++++++ >> ? package/python-aiosqlite/python-aiosqlite.hash |? 5 +++++ >> ? package/python-aiosqlite/python-aiosqlite.mk?? | 14 ++++++++++++++ >> ? 4 files changed, 27 insertions(+) >> ? create mode 100644 package/python-aiosqlite/Config.in >> ? create mode 100644 package/python-aiosqlite/python-aiosqlite.hash >> ? create mode 100644 package/python-aiosqlite/python-aiosqlite.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index f5d0c06334..ea023a84ef 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -978,6 +978,7 @@ menu "External python modules" >> ????? source "package/python-aioredis/Config.in" >> ????? source "package/python-aiorwlock/Config.in" >> ????? source "package/python-aiosignal/Config.in" >> +??? source "package/python-aiosqlite/Config.in" >> ????? source "package/python-aiozipkin/Config.in" >> ????? source "package/python-alembic/Config.in" >> ????? source "package/python-alsaaudio/Config.in" >> diff --git a/package/python-aiosqlite/Config.in >> b/package/python-aiosqlite/Config.in >> new file mode 100644 >> index 0000000000..77c78ea25d >> --- /dev/null >> +++ b/package/python-aiosqlite/Config.in >> @@ -0,0 +1,7 @@ >> +config BR2_PACKAGE_PYTHON_AIOSQLITE >> +??? bool "python-aiosqlite" >> +??? select BR2_PACKAGE_PYTHON3_SQLITE # runtime >> +??? help >> +????? asyncio bridge to the standard sqlite3 module. >> + >> +????? https://aiosqlite.omnilib.dev/ >> diff --git a/package/python-aiosqlite/python-aiosqlite.hash >> b/package/python-aiosqlite/python-aiosqlite.hash >> new file mode 100644 >> index 0000000000..e06061346c >> --- /dev/null >> +++ b/package/python-aiosqlite/python-aiosqlite.hash >> @@ -0,0 +1,5 @@ >> +# md5, sha256 from https://pypi.org/pypi/aiosqlite/json >> +md5? e829bf8f641ab115c1a9ca0494d35278? aiosqlite-0.19.0.tar.gz >> +sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d >> aiosqlite-0.19.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 >> new file mode 100644 >> index 0000000000..e513d53c02 >> --- /dev/null >> +++ b/package/python-aiosqlite/python-aiosqlite.mk >> @@ -0,0 +1,14 @@ >> +################################################################################ >> >> +# >> +# python-aiosqlite >> +# >> +################################################################################ >> >> + >> +PYTHON_AIOSQLITE_VERSION = 0.19.0 >> +PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz >> +PYTHON_AIOSQLITE_SITE = >> https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 >> +PYTHON_AIOSQLITE_SETUP_TYPE = flit >> +PYTHON_AIOSQLITE_LICENSE = MIT >> +PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE >> + >> +$(eval $(python-package)) From arnout at mind.be Tue Feb 6 17:53:35 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:53:35 +0100 Subject: [Buildroot] [git commit] package/python-opcua-asyncio: bump to version 1.0.5 Message-ID: <20240206175614.47340873AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=46a985eb4dacac201dfc8b2b8d272ee3112ef80f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add new python-aiosqlite, python-sortedcontainers and python-pyopenssl runtime dependencies. Remove no longer required python-lxml runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-opcua-asyncio/Config.in | 4 +++- package/python-opcua-asyncio/python-opcua-asyncio.hash | 4 ++-- package/python-opcua-asyncio/python-opcua-asyncio.mk | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/python-opcua-asyncio/Config.in b/package/python-opcua-asyncio/Config.in index e5b8623f0d..139238b5e9 100644 --- a/package/python-opcua-asyncio/Config.in +++ b/package/python-opcua-asyncio/Config.in @@ -2,10 +2,12 @@ config BR2_PACKAGE_PYTHON_OPCUA_ASYNCIO bool "python-opcua-asyncio" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_AIOFILES # runtime + select BR2_PACKAGE_PYTHON_AIOSQLITE # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_DATEUTIL # runtime - select BR2_PACKAGE_PYTHON_LXML # runtime select BR2_PACKAGE_PYTHON_PYTZ # runtime + select BR2_PACKAGE_PYTHON_SORTEDCONTAINERS # runtime + select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime help opcua-asyncio is an asyncio-based asynchronous OPC UA client based on python-opcua, removing diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.hash b/package/python-opcua-asyncio/python-opcua-asyncio.hash index 21b5794ebf..f5856019a5 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.hash +++ b/package/python-opcua-asyncio/python-opcua-asyncio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asyncua/json -md5 f67770b896d2ffe975adbaea38c5efc9 asyncua-1.0.1.tar.gz -sha256 515342470022b9c391587dcf526015ff4c7582f566c72406c778c9f9a2757cad asyncua-1.0.1.tar.gz +md5 37000bc60b98b4822511ced1c2b4c020 asyncua-1.0.5.tar.gz +sha256 2757163f2a2ff1d8b923297d4af9b8161d25bed95867c1f67078faaf7f2d3f92 asyncua-1.0.5.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index 52c5d5117e..a8be2c8722 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OPCUA_ASYNCIO_VERSION = 1.0.1 +PYTHON_OPCUA_ASYNCIO_VERSION = 1.0.5 PYTHON_OPCUA_ASYNCIO_SOURCE = asyncua-$(PYTHON_OPCUA_ASYNCIO_VERSION).tar.gz -PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/9f/88/c32bd5904c92475dd30fa2c3130c4f9170a36343d390e2ce5b002fdf1cee +PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/bf/c6/3c17b8b5335faffc2f08c728008c5ae7cc46d24f674bc1038a69d1849ef6 PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING From arnout at mind.be Tue Feb 6 17:53:24 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 6 Feb 2024 18:53:24 +0100 Subject: [Buildroot] [git commit] package/python-aiosqlite: new package Message-ID: <20240206175614.3A925873AE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=60a6188a8616fdf5b4c8d71c650ff014c29f7c32 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/Config.in | 1 + package/python-aiosqlite/Config.in | 8 ++++++++ package/python-aiosqlite/python-aiosqlite.hash | 5 +++++ package/python-aiosqlite/python-aiosqlite.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) diff --git a/package/Config.in b/package/Config.in index 728bd03b80..b48f9eb1c7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -978,6 +978,7 @@ menu "External python modules" source "package/python-aioredis/Config.in" source "package/python-aiorwlock/Config.in" source "package/python-aiosignal/Config.in" + source "package/python-aiosqlite/Config.in" source "package/python-aiozipkin/Config.in" source "package/python-alembic/Config.in" source "package/python-alsaaudio/Config.in" diff --git a/package/python-aiosqlite/Config.in b/package/python-aiosqlite/Config.in new file mode 100644 index 0000000000..c95c2b9510 --- /dev/null +++ b/package/python-aiosqlite/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_AIOSQLITE + bool "python-aiosqlite" + select BR2_PACKAGE_PYTHON3_SQLITE # runtime + help + aiosqlite provides a friendly, async interface to sqlite + databases. + + https://aiosqlite.omnilib.dev diff --git a/package/python-aiosqlite/python-aiosqlite.hash b/package/python-aiosqlite/python-aiosqlite.hash new file mode 100644 index 0000000000..e06061346c --- /dev/null +++ b/package/python-aiosqlite/python-aiosqlite.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiosqlite/json +md5 e829bf8f641ab115c1a9ca0494d35278 aiosqlite-0.19.0.tar.gz +sha256 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d aiosqlite-0.19.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 new file mode 100644 index 0000000000..e513d53c02 --- /dev/null +++ b/package/python-aiosqlite/python-aiosqlite.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiosqlite +# +################################################################################ + +PYTHON_AIOSQLITE_VERSION = 0.19.0 +PYTHON_AIOSQLITE_SOURCE = aiosqlite-$(PYTHON_AIOSQLITE_VERSION).tar.gz +PYTHON_AIOSQLITE_SITE = https://files.pythonhosted.org/packages/ea/51/060efa10a814145acd4e42c6e5ed540b8714cad52ca026c5930e7c473049 +PYTHON_AIOSQLITE_SETUP_TYPE = flit +PYTHON_AIOSQLITE_LICENSE = MIT +PYTHON_AIOSQLITE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From buildroot at bubu1.eu Tue Feb 6 17:56:12 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 18:56:12 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-bitarray: new package In-Reply-To: <20240206155140.2351424-1-romain.naour@smile.fr> References: <20240206155140.2351424-1-romain.naour@smile.fr> Message-ID: <553ce8df-aa66-4c92-be68-9486821ca36e@bubu1.eu> On 06.02.24 16:51, Romain Naour wrote: > This package is needed at runtime by python-bitstring since > 4.1.1 already. > > Note: the License is under Python-2.0 but Python Software Foundation ("PSF") > has been remplaced by the author of bitarray Ilan Schnell. I had a bit of trouble understanding this sentence, so after IRL discussion: The license of the package is "Python Software Foundation License (PSF)" (with the developer name changed to the package author name). > > [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.1 > > Signed-off-by: Romain Naour > --- > Triple checked the license type with other distribution: > https://salsa.debian.org/python-team/packages/python-bitarray/-/blob/master/debian/copyright?ref_type=heads > https://src.fedoraproject.org/rpms/python-bitarray/blob/rawhide/f/python-bitarray.spec > https://aur.archlinux.org/packages/python-bitarray Reviewed-by: Marcus Hoffmann > --- > package/Config.in | 1 + > package/python-bitarray/Config.in | 6 ++++++ > package/python-bitarray/python-bitarray.hash | 5 +++++ > package/python-bitarray/python-bitarray.mk | 14 ++++++++++++++ > 4 files changed, 26 insertions(+) > create mode 100644 package/python-bitarray/Config.in > create mode 100644 package/python-bitarray/python-bitarray.hash > create mode 100644 package/python-bitarray/python-bitarray.mk > > diff --git a/package/Config.in b/package/Config.in > index 728bd03b80..708dc376b1 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1007,6 +1007,7 @@ menu "External python modules" > source "package/python-bcrypt/Config.in" > source "package/python-beautifulsoup4/Config.in" > source "package/python-bidict/Config.in" > + source "package/python-bitarray/Config.in" > source "package/python-bitstring/Config.in" > source "package/python-bleak/Config.in" > source "package/python-blinker/Config.in" > diff --git a/package/python-bitarray/Config.in b/package/python-bitarray/Config.in > new file mode 100644 > index 0000000000..38d685f4fd > --- /dev/null > +++ b/package/python-bitarray/Config.in > @@ -0,0 +1,6 @@ > +config BR2_PACKAGE_PYTHON_BITARRAY > + bool "python-bitarray" > + help > + efficient arrays of booleans -- C extension. > + > + https://github.com/ilanschnell/bitarray > diff --git a/package/python-bitarray/python-bitarray.hash b/package/python-bitarray/python-bitarray.hash > new file mode 100644 > index 0000000000..d91a28af20 > --- /dev/null > +++ b/package/python-bitarray/python-bitarray.hash > @@ -0,0 +1,5 @@ > +# md5, sha256 from https://pypi.org/pypi/bitarray/json > +md5 024324a82314e9e68ecdcdefdc69071f bitarray-2.9.2.tar.gz > +sha256 a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e bitarray-2.9.2.tar.gz > +# Locally computed sha256 checksums > +sha256 6b5e04f6e0462e1b97be833f9d65e66cd5eceb3283f4a6f532261087d0ab1233 LICENSE > diff --git a/package/python-bitarray/python-bitarray.mk b/package/python-bitarray/python-bitarray.mk > new file mode 100644 > index 0000000000..f86320c112 > --- /dev/null > +++ b/package/python-bitarray/python-bitarray.mk > @@ -0,0 +1,14 @@ > +################################################################################ > +# > +# python-bitarray > +# > +################################################################################ > + > +PYTHON_BITARRAY_VERSION = 2.9.2 > +PYTHON_BITARRAY_SOURCE = bitarray-$(PYTHON_BITARRAY_VERSION).tar.gz > +PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/c7/bf/25cf92a83e1fe4948d7935ae3c02f4c9ff9cb9c13e977fba8af11a5f642c > +PYTHON_BITARRAY_SETUP_TYPE = setuptools > +PYTHON_BITARRAY_LICENSE = Python-2.0 > +PYTHON_BITARRAY_LICENSE_FILES = LICENSE > + > +$(eval $(python-package)) From fontaine.fabrice at gmail.com Tue Feb 6 17:59:00 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 18:59:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: <2be6d0df-6165-4da9-b69c-ad0deb5444be@smile.fr> References: <20240106101202.495801-1-fontaine.fabrice@gmail.com> <2be6d0df-6165-4da9-b69c-ad0deb5444be@smile.fr> Message-ID: Hello Romain, Le mar. 6 f?vr. 2024 ? 18:32, Romain Naour a ?crit : > > Hello, > > Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit : > > ncmpc is able to automatically detect NLS support since version 0.47 and > > https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 > > so let it handle automatically to avoid the following build failure with > > a bootlin toolchain which embeds a gettext definition in libintl.h which > > will clash with the fake gettext definition provided by ncmpc since > > https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: > > > > In file included from ../src/save_playlist.cxx:8: > > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' > > 39 | extern char *gettext (const char *__msgid) > > | ^~~~~~~ > > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' > > ../src/i18n.h:22:20: note: to match this '(' > > 22 | #define gettext(x) (x) > > | ^ > > > > Indeed, even if NLS is disabled by the user, libintl.h will be included > > by > > /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h > > though include > > We usually want to explicitly handle such option from Buildroot package to not > rely on automatic detection (as currently done). > > It look like more a bug in ncmpc build system? I don't know, upstream wants to have the same code with and without NLS, so they decided to define a gettext macro when NLS is disabled. I could find an upstreamable solution as upstream will probably reject a patch that removes this gettext define and puts #ifdef ENABLE_NLS before every gettext calls. Do you have an upstreamable solution or should we just add a NLS dependency to ncmpc? > > Best regards, > Romain > > > > > > Fixes: > > - http://autobuild.buildroot.org/results/c860e64909dd3b7fa033db0970e1cfc1376c4ec5 > > - http://autobuild.buildroot.org/results/36eab556fac80124755bff4110af3e43fe6edd78 > > > > Signed-off-by: Fabrice Fontaine > > --- > > package/ncmpc/ncmpc.mk | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk > > index bc8a62daea..0965981f23 100644 > > --- a/package/ncmpc/ncmpc.mk > > +++ b/package/ncmpc/ncmpc.mk > > @@ -20,8 +20,7 @@ NCMPC_CPE_ID_VENDOR = ncmpc_project > > > > NCMPC_CONF_OPTS = \ > > -Dcurses=ncurses \ > > - -Ddocumentation=disabled \ > > - $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) > > + -Ddocumentation=disabled > > > > ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) > > NCMPC_DEPENDENCIES += lirc-tools > Best Regards, Fabrice From fontaine.fabrice at gmail.com Tue Feb 6 18:03:41 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 19:03:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/linux-pam: fix musl build Message-ID: <20240206180341.3910-1-fontaine.fabrice@gmail.com> Fix the following musl build failure raised since bump to version 1.6.0 in commit 7794fa4c4e1d19a245bb0367cde94560432a2bc5: pam_namespace.c: In function 'process_line': pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { | ^~~~~~~~ pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? 40 | #include "argv_parse.h" +++ |+#include 41 | Fixes: - http://autobuild.buildroot.org/results/f07360f33010a2cf19aace266faae14a834bd9a4 Signed-off-by: Fabrice Fontaine --- .../0001-pam_namespace-include-stdint-h.patch | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 package/linux-pam/0001-pam_namespace-include-stdint-h.patch diff --git a/package/linux-pam/0001-pam_namespace-include-stdint-h.patch b/package/linux-pam/0001-pam_namespace-include-stdint-h.patch new file mode 100644 index 0000000000..59d2e8700f --- /dev/null +++ b/package/linux-pam/0001-pam_namespace-include-stdint-h.patch @@ -0,0 +1,42 @@ +From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001 +From: Jacob Heider +Date: Wed, 17 Jan 2024 11:49:26 -0500 +Subject: [PATCH] pam_namespace: include stdint.h + +pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h, +resulting in the following build failures on 1.6.0: + + pam_namespace.c: In function 'process_line': + pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) + 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { + | ^~~~~~~~ + pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? + 40 | #include "argv_parse.h" + +++ |+#include + 41 | + pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in + 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { + | ^~~~~~~~ + +Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config") +Resolves: https://github.com/linux-pam/linux-pam/issues/733 + +Upstream: https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 +SIgned-off-by: Fabrice Fontaine +--- + modules/pam_namespace/pam_namespace.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c +index f72d67189..b16731c22 100644 +--- a/modules/pam_namespace/pam_namespace.c ++++ b/modules/pam_namespace/pam_namespace.c +@@ -34,6 +34,8 @@ + + #define _ATFILE_SOURCE + ++#include "config.h" ++#include + #include "pam_cc_compat.h" + #include "pam_inline.h" + #include "pam_namespace.h" -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 6 18:07:43 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 19:07:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pydantic: add CPE variables Message-ID: <20240206180743.6460-1-fontaine.fabrice@gmail.com> cpe:2.3:a:pydantic_project:pydantic is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/9B7C28E5-ACB1-4252-AE8F-4225C1AF739E Signed-off-by: Fabrice Fontaine --- package/python-pydantic/python-pydantic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index 7ad7abeb8d..0cce5a153f 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -10,6 +10,8 @@ PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/aa/3f/56142232152 PYTHON_PYDANTIC_SETUP_TYPE = pep517 PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE +PYTHON_PYDANTIC_CPE_ID_VENDOR = pydantic_project +PYTHON_PYDANTIC_CPE_ID_PRODUCT = pydantic PYTHON_PYDANTIC_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-fancy-pypi-readme -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 6 18:35:36 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 19:35:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-opcua-asyncio: add CPE variables Message-ID: <20240206183536.284845-1-fontaine.fabrice@gmail.com> cpe:2.3:a:freeopcua:opcua-asyncio is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/39E826E8-04D1-465F-AA4E-7A41B387D7CE Signed-off-by: Fabrice Fontaine --- package/python-opcua-asyncio/python-opcua-asyncio.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index a8be2c8722..226b9bbc21 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -10,5 +10,7 @@ PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/bf/c6/3c17b8 PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING +PYTHON_OPCUA_ASYNCIO_CPE_ID_VENDOR = freeopcua +PYTHON_OPCUA_ASYNCIO_CPE_ID_PRODUCT = opcua-asyncio $(eval $(python-package)) -- 2.43.0 From ddrokosov at salutedevices.com Tue Feb 6 19:25:34 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Tue, 6 Feb 2024 22:25:34 +0300 Subject: [Buildroot] [PATCH v2 2/2] package/linux-tools: multilib build supported In-Reply-To: <20240206192543.7179-1-ddrokosov@salutedevices.com> References: <20240206192543.7179-1-ddrokosov@salutedevices.com> Message-ID: <20240206192543.7179-3-ddrokosov@salutedevices.com> From: Konstantin Menyaev - LINUX_TOOLS_MAKE_OPTS option introduced: allows to override CROSS_COMPILE param Signed-off-by: Konstantin Menyaev Signed-off-by: Dmitry Rokosov --- package/linux-tools/linux-tool-gpio.mk.in | 2 +- package/linux-tools/linux-tool-iio.mk.in | 2 +- package/linux-tools/linux-tool-mm.mk.in | 2 +- package/linux-tools/linux-tool-pci.mk.in | 2 +- package/linux-tools/linux-tool-perf.mk.in | 2 +- package/linux-tools/linux-tool-selftests.mk.in | 2 +- package/linux-tools/linux-tool-tmon.mk.in | 2 +- package/linux-tools/linux-tools.mk | 2 ++ 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package/linux-tools/linux-tool-gpio.mk.in b/package/linux-tools/linux-tool-gpio.mk.in index e825db1b1127..dcee11002e8c 100644 --- a/package/linux-tools/linux-tool-gpio.mk.in +++ b/package/linux-tools/linux-tool-gpio.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += gpio -GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" +GPIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" define GPIO_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-iio.mk.in b/package/linux-tools/linux-tool-iio.mk.in index 27ab0ed7ed63..1372faafd1a8 100644 --- a/package/linux-tools/linux-tool-iio.mk.in +++ b/package/linux-tools/linux-tool-iio.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += iio -IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" +IIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" define IIO_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in index 5431e0574b04..51a54026dea4 100644 --- a/package/linux-tools/linux-tool-mm.mk.in +++ b/package/linux-tools/linux-tool-mm.mk.in @@ -7,7 +7,7 @@ LINUX_TOOLS += mm MM_DEPENDENCIES = linux -MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" +MM_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) CC="$(TARGET_CC)" define MM_BUILD_CMDS $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in index 17246f5d7ed2..48c3435a5c8a 100644 --- a/package/linux-tools/linux-tool-pci.mk.in +++ b/package/linux-tools/linux-tool-pci.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += pci -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" +PCI_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" define PCI_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index ee308a85dfd1..38910cda7d75 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -19,7 +19,7 @@ PERF_ARCH=$(NORMALIZED_ARCH) endif PERF_MAKE_FLAGS = \ - $(LINUX_MAKE_FLAGS) \ + $(LINUX_TOOLS_MAKE_OPTS) \ JOBS=$(PARALLEL_JOBS) \ ARCH=$(PERF_ARCH) \ DESTDIR=$(TARGET_DIR) \ diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in index e29c7f59debd..144dd6616f2b 100644 --- a/package/linux-tools/linux-tool-selftests.mk.in +++ b/package/linux-tools/linux-tool-selftests.mk.in @@ -22,7 +22,7 @@ SELFTESTS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_OPENSSL),openssl) SELFTESTS_MAKE_FLAGS = \ - $(LINUX_MAKE_FLAGS) \ + $(LINUX_TOOLS_MAKE_OPTS) \ ARCH=$(SELFTESTS_ARCH) # O must be redefined here to overwrite the one used by Buildroot for diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in index 56c328c51fd7..7c33915049c2 100644 --- a/package/linux-tools/linux-tool-tmon.mk.in +++ b/package/linux-tools/linux-tool-tmon.mk.in @@ -7,7 +7,7 @@ LINUX_TOOLS += tmon TMON_DEPENDENCIES = host-pkgconf ncurses -TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ +TMON_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) \ CC=$(TARGET_CC) \ LDFLAGS="$(TARGET_LDFLAGS)" \ PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig diff --git a/package/linux-tools/linux-tools.mk b/package/linux-tools/linux-tools.mk index 81b1fbc17605..38bb2c83966a 100644 --- a/package/linux-tools/linux-tools.mk +++ b/package/linux-tools/linux-tools.mk @@ -26,6 +26,8 @@ LINUX_TOOLS_PATCH_DEPENDENCIES = linux # may install shared libraries and headers (e.g. cpupower). LINUX_TOOLS_INSTALL_STAGING = YES +LINUX_TOOLS_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CROSS_COMPILE="$(TARGET_CROSS)" + LINUX_TOOLS_DEPENDENCIES += $(foreach tool,$(LINUX_TOOLS),\ $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ $($(call UPPERCASE,$(tool))_DEPENDENCIES))) -- 2.43.0 From ddrokosov at salutedevices.com Tue Feb 6 19:25:32 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Tue, 6 Feb 2024 22:25:32 +0300 Subject: [Buildroot] [PATCH v2 0/2] package/linux-tools: introduce linux mm tools Message-ID: <20240206192543.7179-1-ddrokosov@salutedevices.com> This toolset was designed to facilitate the testing, monitoring, and tracing of various things with virtual memory, pages, and slab objects. It is an invaluable resource for identifying and analyzing memory-related issues, such as leaks and bottlenecks, and can greatly enhance one's understanding of memory utilization within a system. Also this patch series includes multilib build support for all linux-tools. Changes v2 since v1 at [1]: - instead of comparing kernel versions, verify the presence of the tools/{mm|vm}/Makefile - add multilib build support patch for all linux-tools Links: [1] https://lore.kernel.org/all/20230609113415.13856-1-ddrokosov at sberdevices.ru/ Dmitry Rokosov (1): package/linux-tools: introduce linux mm tools Konstantin Menyaev (1): package/linux-tools: multilib build supported package/linux-tools/Config.in | 18 ++++++++ package/linux-tools/linux-tool-gpio.mk.in | 2 +- package/linux-tools/linux-tool-iio.mk.in | 2 +- package/linux-tools/linux-tool-mm.mk.in | 41 +++++++++++++++++++ package/linux-tools/linux-tool-pci.mk.in | 2 +- package/linux-tools/linux-tool-perf.mk.in | 2 +- .../linux-tools/linux-tool-selftests.mk.in | 2 +- package/linux-tools/linux-tool-tmon.mk.in | 2 +- package/linux-tools/linux-tools.mk | 2 + 9 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 package/linux-tools/linux-tool-mm.mk.in -- 2.43.0 From indrek.kruusa at gmail.com Tue Feb 6 19:30:01 2024 From: indrek.kruusa at gmail.com (Indrek Kruusa) Date: Tue, 6 Feb 2024 21:30:01 +0200 Subject: [Buildroot] [PATCH v4 1/1] configs/mangopi_mangopi_mq_d1s: new defconfig In-Reply-To: <57cacd5b-aa2c-4199-b1d0-1de38b5ffd27@benettiengineering.com> References: <20230907200013.11620-1-indrek.kruusa@gmail.com> <57cacd5b-aa2c-4199-b1d0-1de38b5ffd27@benettiengineering.com> Message-ID: Kontakt Giulio Benetti () kirjutas kuup?eval E, 5. veebruar 2024 kell 12:00: > > Hi Indrek, > > sorry for the late reply, > Hi Giulio, no problem! Thanks for the review! > On 07/09/23 22:00, Indrek Kruusa wrote: > > Here we need a commit log, something like: > " > Add support for MangoPi MQ1RW: > https://mangopi.org/mqr > > An Allwinner D1S(1xRISCV C906 R1S0 + 64MB DDR2-1066 embedded) based SBC > with: > * USB-OTG Type-C socket > * USB-HOST Type-C socket > * 2x 18 pin GPIO headers > * TF card slot > * RTL8723DS WiFi module with ext. antenna connector > * 40 pin RGB FPC connector > * 6 pin CTP FPC connector > * 24 pin DVP FPC connector > * onboard mic > * onboard audio amplifier > * FEL,reset button > " > > > Signed-off-by: Indrek Kruusa > > --- snip > > I've build tested successfully with the change above using utils/docker > run and the rest looks good to me so with the commit log reworded and > the missing "BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y" added: > Reviewed-by: Giulio Benetti > Actually I've been trying to prepare an updated patch for this board. Currently its pointing to the older u-boot but newer version is provided by Samuel Holland. Though, the newer version needs special memory configuration for D1s SOC and I'm a bit stuck with that. When ready I will add a proper commit log also. Best regards, Indrek From james.hilliard1 at gmail.com Tue Feb 6 19:30:46 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 12:30:46 -0700 Subject: [Buildroot] [PATCH v3 1/3] package/python-poetry-core: new host package Message-ID: <20240206193048.658003-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v2 -> v3: - add vendored licenses - bump to version 1.9.0 --- .../python-poetry-core.hash | 9 +++++++ .../python-poetry-core/python-poetry-core.mk | 24 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 package/python-poetry-core/python-poetry-core.hash create mode 100644 package/python-poetry-core/python-poetry-core.mk diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash new file mode 100644 index 0000000000..0d908be0f4 --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.hash @@ -0,0 +1,9 @@ +# md5, sha256 from https://pypi.org/pypi/poetry-core/json +md5 eb8730e30aec5f644754b29587b47122 poetry_core-1.9.0.tar.gz +sha256 fa7a4001eae8aa572ee84f35feb510b321bd652e5cf9293249d62853e1f935a2 poetry_core-1.9.0.tar.gz +# Locally computed sha256 checksums +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE +sha256 8263e5652d07cecb3adadf05140b65e70cfa169ecec5f520fe1671479ce12a83 src/poetry/core/_vendor/lark/LICENSE +sha256 cad1ef5bd340d73e074ba614d26f7deaca5c7940c3d8c34852e65c4909686c48 src/poetry/core/_vendor/packaging/LICENSE +sha256 b80816b0d530b8accb4c2211783790984a6e3b61922c2b5ee92f3372ab2742fe src/poetry/core/_vendor/tomli/LICENSE +sha256 9ccddf69eb3998a60148debe85b94c5afed53691b6474692e78abcc0a0e544f1 src/poetry/core/_vendor/fastjsonschema/LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk new file mode 100644 index 0000000000..676a0c9a52 --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# python-poetry-core +# +################################################################################ + +PYTHON_POETRY_CORE_VERSION = 1.9.0 +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/f2/db/20a9f9cae3f3c213a8c406deb4395698459fd96962cea8f2ccb230b1943c +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 +PYTHON_POETRY_CORE_LICENSE = \ + Apache-2.0 or BSD-2-Clause (packaging), \ + BSD-3-Clause (fastjsonschema), \ + GPL-2.0-or-later (lark), \ + MIT (lark, poetry-core, tomli), \ + MPL-2.0 (lark) +PYTHON_POETRY_CORE_LICENSE_FILES = \ + LICENSE \ + src/poetry/core/_vendor/lark/LICENSE \ + src/poetry/core/_vendor/packaging/LICENSE \ + src/poetry/core/_vendor/tomli/LICENSE \ + src/poetry/core/_vendor/fastjsonschema/LICENSE + +$(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 6 19:30:47 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 12:30:47 -0700 Subject: [Buildroot] [PATCH v3 2/3] package/python-pypika-tortoise: new package In-Reply-To: <20240206193048.658003-1-james.hilliard1@gmail.com> References: <20240206193048.658003-1-james.hilliard1@gmail.com> Message-ID: <20240206193048.658003-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-pypika-tortoise/Config.in | 6 ++++++ .../python-pypika-tortoise.hash | 5 +++++ .../python-pypika-tortoise.mk | 15 +++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-pypika-tortoise/Config.in create mode 100644 package/python-pypika-tortoise/python-pypika-tortoise.hash create mode 100644 package/python-pypika-tortoise/python-pypika-tortoise.mk diff --git a/package/Config.in b/package/Config.in index b48f9eb1c7..d1ed6cf224 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1277,6 +1277,7 @@ menu "External python modules" source "package/python-pyparsing/Config.in" source "package/python-pyparted/Config.in" source "package/python-pyphen/Config.in" + source "package/python-pypika-tortoise/Config.in" source "package/python-pypng/Config.in" source "package/python-pyqrcode/Config.in" source "package/python-pyqt5/Config.in" diff --git a/package/python-pypika-tortoise/Config.in b/package/python-pypika-tortoise/Config.in new file mode 100644 index 0000000000..62e14c6d50 --- /dev/null +++ b/package/python-pypika-tortoise/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYPIKA_TORTOISE + bool "python-pypika-tortoise" + help + Forked from pypika and streamline just for tortoise-orm. + + https://github.com/tortoise/pypika-tortoise diff --git a/package/python-pypika-tortoise/python-pypika-tortoise.hash b/package/python-pypika-tortoise/python-pypika-tortoise.hash new file mode 100644 index 0000000000..629762f4f7 --- /dev/null +++ b/package/python-pypika-tortoise/python-pypika-tortoise.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pypika-tortoise/json +md5 98c9677516f06f61f211f834d51949a6 pypika-tortoise-0.1.6.tar.gz +sha256 d802868f479a708e3263724c7b5719a26ad79399b2a70cea065f4a4cadbebf36 pypika-tortoise-0.1.6.tar.gz +# Locally computed sha256 checksums +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/python-pypika-tortoise/python-pypika-tortoise.mk b/package/python-pypika-tortoise/python-pypika-tortoise.mk new file mode 100644 index 0000000000..84aa19cfbb --- /dev/null +++ b/package/python-pypika-tortoise/python-pypika-tortoise.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-pypika-tortoise +# +################################################################################ + +PYTHON_PYPIKA_TORTOISE_VERSION = 0.1.6 +PYTHON_PYPIKA_TORTOISE_SOURCE = pypika-tortoise-$(PYTHON_PYPIKA_TORTOISE_VERSION).tar.gz +PYTHON_PYPIKA_TORTOISE_SITE = https://files.pythonhosted.org/packages/86/55/1bfd4150f664d2e07b36c8f442178cc1f717bb9ae6cae20f21e851c208c6 +PYTHON_PYPIKA_TORTOISE_SETUP_TYPE = pep517 +PYTHON_PYPIKA_TORTOISE_LICENSE = Apache-2.0 +PYTHON_PYPIKA_TORTOISE_LICENSE_FILES = LICENSE +PYTHON_PYPIKA_TORTOISE_DEPENDENCIES = host-python-poetry-core + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 6 19:30:48 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 12:30:48 -0700 Subject: [Buildroot] [PATCH v3 3/3] package/python-tortoise-orm: new package In-Reply-To: <20240206193048.658003-1-james.hilliard1@gmail.com> References: <20240206193048.658003-1-james.hilliard1@gmail.com> Message-ID: <20240206193048.658003-3-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-tortoise-orm/Config.in | 10 ++++++++++ .../python-tortoise-orm/python-tortoise-orm.hash | 5 +++++ .../python-tortoise-orm/python-tortoise-orm.mk | 15 +++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/python-tortoise-orm/Config.in create mode 100644 package/python-tortoise-orm/python-tortoise-orm.hash create mode 100644 package/python-tortoise-orm/python-tortoise-orm.mk diff --git a/package/Config.in b/package/Config.in index d1ed6cf224..30113d1a1b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1381,6 +1381,7 @@ menu "External python modules" source "package/python-toml/Config.in" source "package/python-tomli/Config.in" source "package/python-tornado/Config.in" + source "package/python-tortoise-orm/Config.in" source "package/python-tqdm/Config.in" source "package/python-trafaret/Config.in" source "package/python-traitlets/Config.in" diff --git a/package/python-tortoise-orm/Config.in b/package/python-tortoise-orm/Config.in new file mode 100644 index 0000000000..62b1a5a86e --- /dev/null +++ b/package/python-tortoise-orm/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_TORTOISE_ORM + bool "python-tortoise-orm" + select BR2_PACKAGE_PYTHON_AIOSQLITE # runtime + select BR2_PACKAGE_PYTHON_ISO8601 # runtime + select BR2_PACKAGE_PYTHON_PYPIKA_TORTOISE # runtime + select BR2_PACKAGE_PYTHON_PYTZ # runtime + help + Easy async ORM for python, built with relations in mind. + + https://github.com/tortoise/tortoise-orm diff --git a/package/python-tortoise-orm/python-tortoise-orm.hash b/package/python-tortoise-orm/python-tortoise-orm.hash new file mode 100644 index 0000000000..4796c8277f --- /dev/null +++ b/package/python-tortoise-orm/python-tortoise-orm.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/tortoise-orm/json +md5 aa5efa50e69d0a67b75c187f7550acd7 tortoise_orm-0.20.0.tar.gz +sha256 283af584d685dcc58d6cc1da35b9115bb1e41c89075eae2a19c493b39b9b41f7 tortoise_orm-0.20.0.tar.gz +# Locally computed sha256 checksums +sha256 f955d347b975d5867ee364f978476b3012878a706d468571b9758cac74de6041 LICENSE.txt diff --git a/package/python-tortoise-orm/python-tortoise-orm.mk b/package/python-tortoise-orm/python-tortoise-orm.mk new file mode 100644 index 0000000000..cc1c2126b7 --- /dev/null +++ b/package/python-tortoise-orm/python-tortoise-orm.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-tortoise-orm +# +################################################################################ + +PYTHON_TORTOISE_ORM_VERSION = 0.20.0 +PYTHON_TORTOISE_ORM_SOURCE = tortoise_orm-$(PYTHON_TORTOISE_ORM_VERSION).tar.gz +PYTHON_TORTOISE_ORM_SITE = https://files.pythonhosted.org/packages/3b/84/8ca142fe370d59c4e3135825b2822d199c4f885ae855657c1a7361e68511 +PYTHON_TORTOISE_ORM_SETUP_TYPE = pep517 +PYTHON_TORTOISE_ORM_LICENSE = Apache-2.0 +PYTHON_TORTOISE_ORM_LICENSE_FILES = LICENSE.txt +PYTHON_TORTOISE_ORM_DEPENDENCIES = host-python-poetry-core + +$(eval $(python-package)) -- 2.34.1 From ddrokosov at salutedevices.com Tue Feb 6 19:25:33 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Tue, 6 Feb 2024 22:25:33 +0300 Subject: [Buildroot] [PATCH v2 1/2] package/linux-tools: introduce linux mm tools In-Reply-To: <20240206192543.7179-1-ddrokosov@salutedevices.com> References: <20240206192543.7179-1-ddrokosov@salutedevices.com> Message-ID: <20240206192543.7179-2-ddrokosov@salutedevices.com> This toolset was designed to facilitate the testing, monitoring, and tracing of various things with virtual memory, pages, and slab objects. It is an invaluable resource for identifying and analyzing memory-related issues, such as leaks and bottlenecks, and can greatly enhance one's understanding of memory utilization within a system. The mm toolset includes: - page_owner_sort: userspace helper to sort the output of /sys/kernel/debug/page_owner, which helps to know who allocates the page from kernel context - slabinfo: the tool which gets reports about slabs, for example show empty slabs, modify of slab debug options at runtime, display all information about a slabcache - page-types: a handy tool for querying page flags Signed-off-by: Dmitry Rokosov Signed-off-by: Alexey Romanov --- package/linux-tools/Config.in | 18 +++++++++++ package/linux-tools/linux-tool-mm.mk.in | 41 +++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 package/linux-tools/linux-tool-mm.mk.in diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index 8a0b6d5802cc..ede966ec792d 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -185,4 +185,22 @@ config BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON endif # BR2_PACKAGE_LINUX_TOOLS_HV +config BR2_PACKAGE_LINUX_TOOLS_MM + bool "mm" + select BR2_PACKAGE_LINUX_TOOLS + help + mm is a toolset for testing/monitoring/tracing vm/pages/slabs objects. + + - page_owner_sort: userspace helper to sort the output of + /sys/kernel/debug/page_owner, which helps to know who allocates + the page from kernel context + + - slabinfo: the tool which gets reports about slabs, for example + show empty slabs, modify of slab debug options at runtime, display + all information about a slabcache + + - page-types: a handy tool for querying page flags + + These tools are available only from kernel version 3.4. + endmenu diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in new file mode 100644 index 000000000000..5431e0574b04 --- /dev/null +++ b/package/linux-tools/linux-tool-mm.mk.in @@ -0,0 +1,41 @@ +################################################################################ +# +# mm +# +################################################################################ + +LINUX_TOOLS += mm + +MM_DEPENDENCIES = linux +MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" + +define MM_BUILD_CMDS + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ + MM_SUBDIR=vm; \ + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ + MM_SUBDIR=mm; \ + else \ + echo "Your kernel version is too old and does not have the mm tool." ; \ + echo "At least kernel 3.4 must be used." ; \ + exit 1 ; \ + fi ; \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(MM_MAKE_OPTS) $${MM_SUBDIR} +endef + +define MM_INSTALL_TARGET_CMDS + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ + MM_SUBDIR=vm; \ + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ + MM_SUBDIR=mm; \ + else \ + echo "Your kernel version is too old and does not have the mm tool." ; \ + echo "At least kernel 3.4 must be used." ; \ + exit 1 ; \ + fi ; \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(MM_MAKE_OPTS) \ + INSTALL_ROOT=$(TARGET_DIR) \ + DESTDIR=$(TARGET_DIR) \ + $${MM_SUBDIR}_install +endef -- 2.43.0 From james.hilliard1 at gmail.com Tue Feb 6 19:32:33 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 12:32:33 -0700 Subject: [Buildroot] [PATCH v2 1/4] package/python-poetry-core: new host package In-Reply-To: References: <20240106214410.3294887-1-james.hilliard1@gmail.com> Message-ID: On Tue, Feb 6, 2024 at 10:43?AM Arnout Vandecappelle wrote: > > Hi James, > > On 06/01/2024 22:44, James Hilliard wrote: > > Signed-off-by: James Hilliard > > --- > > package/python-poetry-core/python-poetry-core.hash | 5 +++++ > > package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ > > 2 files changed, 19 insertions(+) > > create mode 100644 package/python-poetry-core/python-poetry-core.hash > > create mode 100644 package/python-poetry-core/python-poetry-core.mk > > > > diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash > > new file mode 100644 > > index 0000000000..3c07fef04f > > --- /dev/null > > +++ b/package/python-poetry-core/python-poetry-core.hash > > @@ -0,0 +1,5 @@ > > +# md5, sha256 from https://pypi.org/pypi/poetry-core/json > > +md5 9ed2f2e9244165b34d7233c306a34a2a poetry_core-1.8.1.tar.gz > > +sha256 67a76c671da2a70e55047cddda83566035b701f7e463b32a2abfeac6e2a16376 poetry_core-1.8.1.tar.gz > > +# Locally computed sha256 checksums > > +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE > > diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk > > new file mode 100644 > > index 0000000000..e1acf3179c > > --- /dev/null > > +++ b/package/python-poetry-core/python-poetry-core.mk > > @@ -0,0 +1,14 @@ > > +################################################################################ > > +# > > +# python-poetry-core > > +# > > +################################################################################ > > + > > +PYTHON_POETRY_CORE_VERSION = 1.8.1 > > +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz > > +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/36/66/6af2891495d12020419c8447d0b29c1e96f3be16631faaed6bda5b886d5d > > +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 > > +PYTHON_POETRY_CORE_LICENSE = MIT > > +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE > > This package has 4 vendored dependencies, each with their own license. Those > should also be specified in the LICENSE and LICENSE_FILES. Does this look right? https://patchwork.ozlabs.org/project/buildroot/patch/20240206193048.658003-1-james.hilliard1 at gmail.com/ > > In addition, for lark, there's a file under MPL and a file under GPL, even > though neither if those licenses is mentioned in the lark license. Ideally those > two should be mentioned in the LICENSES as well. And of course, this should > ideally also be done for the python-lark package which suffers from the same > issue... > > Regards, > Arnout > > > + > > +$(eval $(host-python-package)) From caseorum at gmail.com Tue Feb 6 19:46:03 2024 From: caseorum at gmail.com (Joseph Burt) Date: Tue, 6 Feb 2024 19:46:03 +0000 Subject: [Buildroot] [PATCH 1/1] package/qemu: reenable Qemu user-land emulation for musl toolchains In-Reply-To: References: <20230112075509.2200-1-caseorum@gmail.com> Message-ID: Hello Romain, On Tue, Feb 6, 2024 at 4:26?PM Romain Naour wrote: > Ok but it would fail with existing (old) prebuilt musl toolchains. > Is musl 1.2.2 old enough? Musl 1.2.2 is three years old, and anyone building qemu-user pre musl 1.2.2 has patched qemu and buildroot to do so. This fails if someone is building qemu-user for the first time on the latest buildroot with a very old musl toolchain. I hope that is unlikely, but I don't know. Best wishes, Joseph From ddrokosov at salutedevices.com Tue Feb 6 19:47:20 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Tue, 6 Feb 2024 22:47:20 +0300 Subject: [Buildroot] [PATCH v1] package/linux-tools: introduce linux mm tools In-Reply-To: <20240206115217.3r43du5b4wnt23a7@CAB-WSD-L081021> References: <20230609113415.13856-1-ddrokosov@sberdevices.ru> <20230622171806.vywakqz7q7ezqnrv@CAB-WSD-L081021> <20230626121237.4z7alvantlkjc7ha@CAB-WSD-L081021> <20230626154719.GC646621@scaer> <20230627102456.ias6peqvoxxzjyik@CAB-WSD-L081021> <20240206115217.3r43du5b4wnt23a7@CAB-WSD-L081021> Message-ID: <20240206194720.suyww3i3bxcztgn5@CAB-WSD-L081021> Hello Chris, I've sent v2 patch series, please take a look: https://lore.kernel.org/buildroot/20240206192543.7179-2-ddrokosov at salutedevices.com/ On Tue, Feb 06, 2024 at 02:52:17PM +0300, Dmitry Rokosov wrote: > Hello Chris, > > I had actually forgotten about this patch. Today, I will update it and > would appreciate it if you could review it. I will add you to the CC. > > On Tue, Feb 06, 2024 at 06:12:27AM -0500, Christian Hopps wrote: > > > > Hi Dmitry, et al., > > > > I locally modified this patch according to the suggestion and am using it successfully. Will you be resubmitting this patch, or could I resubmit it with the suggested changes? > > > > Thanks, > > Chris. > > > > Dmitry Rokosov via buildroot writes: > > > > > Hello Yann, > > > > > > On Mon, Jun 26, 2023 at 05:47:19PM +0200, Yann E. MORIN wrote: > > > > Dmitry, All, > > > > > > > > On 2023-06-26 15:12 +0300, Dmitry Rokosov spake thusly: > > > > > Please take a look into this patchset. I appreciate any feedback. > > > > > > > > Don't be impatient. Your patch has been pending for about two seeks now. > > > > We have 495 pending patches: https://patchwork.ozlabs.org/project/buildroot/list/ > > > > some of witch are so much older... > > > > > > > > Yes, I know it can be frustrating. For various reasons, we've been a bit > > > > less active than usual the past few months, but we'll eventually get to > > > > it... > > > > > > > > Regards, > > > > Yann E. MORIN. > > > > > > > > > > Thank you so much for the detailed reply! I wasn't aware of the backlog, > > > and I apologize for any misunderstanding caused by my eagerness. I fully > > > understand the situation now, so please don't worry - I'm happy to wait > > > my turn. Thank you for your hard work in maintaining buildroot! > > > > > > > > On Thu, Jun 22, 2023 at 08:18:06PM +0300, Dmitry Rokosov wrote: > > > > > > Hello, > > > > > > > > > > > > Add Peter Korsgaard and move "buildroot" mailing list from Cc. > > > > > > > > > > > > Could you please take a look at this patchset? I believe that linux-mm > > > > > > tools are helpful for investigating kernel memory distribution in > > > > > > embedded systems. > > > > > > > > > > > > On Fri, Jun 09, 2023 at 02:34:15PM +0300, Dmitry Rokosov wrote: > > > > > > > This toolset was designed to facilitate the testing, monitoring, and > > > > > > > tracing of various things with virtual memory, pages, and slab objects. > > > > > > > It is an invaluable resource for identifying and analyzing > > > > > > > memory-related issues, such as leaks and bottlenecks, and can greatly > > > > > > > enhance one's understanding of memory utilization within a system. > > > > > > > > > > > > > > The mm toolset includes: > > > > > > > - page_owner_sort: userspace helper to sort the output of > > > > > > > /sys/kernel/debug/page_owner, which helps to know who allocates > > > > > > > the page from kernel context > > > > > > > - slabinfo: the tool which gets reports about slabs, for example > > > > > > > show empty slabs, modify of slab debug options at runtime, display > > > > > > > all information about a slabcache > > > > > > > - page-types: a handy tool for querying page flags > > > > > > > > > > > > > > Signed-off-by: Dmitry Rokosov > > > > > > > --- > > > > > > > package/linux-tools/Config.in | 18 ++++++++ > > > > > > > package/linux-tools/linux-tool-mm.mk.in | 59 +++++++++++++++++++++++++ > > > > > > > 2 files changed, 77 insertions(+) > > > > > > > create mode 100644 package/linux-tools/linux-tool-mm.mk.in > > > > > > > > > > > > > > diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in > > > > > > > index 880ad08f0f1c..3ecc45574b82 100644 > > > > > > > --- a/package/linux-tools/Config.in > > > > > > > +++ b/package/linux-tools/Config.in > > > > > > > @@ -171,4 +171,22 @@ config BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON > > > > > > > > > > > > > > endif # BR2_PACKAGE_LINUX_TOOLS_HV > > > > > > > > > > > > > > +config BR2_PACKAGE_LINUX_TOOLS_MM > > > > > > > + bool "mm" > > > > > > > + select BR2_PACKAGE_LINUX_TOOLS > > > > > > > + help > > > > > > > + mm is a toolset for testing/monitoring/tracing vm/pages/slabs objects. > > > > > > > + > > > > > > > + - page_owner_sort: userspace helper to sort the output of > > > > > > > + /sys/kernel/debug/page_owner, which helps to know who allocates > > > > > > > + the page from kernel context > > > > > > > + > > > > > > > + - slabinfo: the tool which gets reports about slabs, for example > > > > > > > + show empty slabs, modify of slab debug options at runtime, display > > > > > > > + all information about a slabcache > > > > > > > + > > > > > > > + - page-types: a handy tool for querying page flags > > > > > > > + > > > > > > > + These tools are available only from kernel version 3.4. > > > > > > > + > > > > > > > endmenu > > > > > > > diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in > > > > > > > new file mode 100644 > > > > > > > index 000000000000..a59f1c46ff97 > > > > > > > --- /dev/null > > > > > > > +++ b/package/linux-tools/linux-tool-mm.mk.in > > > > > > > @@ -0,0 +1,59 @@ > > > > > > > +################################################################################ > > > > > > > +# > > > > > > > +# mm > > > > > > > +# > > > > > > > +################################################################################ > > > > > > > + > > > > > > > +LINUX_TOOLS += mm > > > > > > > + > > > > > > > +MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" > > > > > > > + > > > > > > > +KVER = $(shell echo $(LINUX_VERSION_PROBED)) > > > > > > > +KVER_MAJOR = $(word 1,$(subst ., ,$(KVER))) > > > > > > > +KVER_MINOR = $(word 2,$(subst ., ,$(KVER))) > > > > > > > + > > > > > > > +# For the first time tools/vm was introduced in the 3.4 kernel version > > > > > > > +KVER_MAJOR_MIN = 3 > > > > > > > +KVER_MINOR_MIN = 4 > > > > > > > + > > > > > > > +# Starting from 6.3 kernel version mm tools are located at tools/mm folder > > > > > > > +# instead of tools/vm > > > > > > > +KVER_MAJOR_MM = 6 > > > > > > > +KVER_MINOR_MM = 3 > > > > > > > + > > > > > > > +define MM_BUILD_CMDS > > > > > > > + $(Q)if [ $(KVER_MAJOR) -lt $(KVER_MAJOR_MIN) ] || \ > > > > > > > + [ $(KVER_MAJOR) -eq $(KVER_MAJOR_MIN) -a \ > > > > > > > + $(KVER_MINOR) -lt $(KVER_MINOR_MIN) ]; then \ > > > > > > > + echo -n "Your kernel version $(KVER_MAJOR).$(KVER_MINOR) is "; \ > > > > > > > + echo "too old and doesn't have the mm tools." ; \ > > > > > > > + echo -n "At least $(KVER_MAJOR_MIN).$(KVER_MINOR_MIN) "; \ > > > > > > > + echo "kernel must be used." ; \ > > > > > > > + exit 1 ; \ > > > > > > > + fi > > > > > > > + > > > > > > > + $(Q)if [ $(KVER_MAJOR) -gt $(KVER_MAJOR_MM) ] || \ > > > > > > > + [ $(KVER_MAJOR) -eq $(KVER_MAJOR_MM) -a \ > > > > > > > + $(KVER_MINOR) -ge $(KVER_MINOR_MM) ]; then \ > > > > > > > + MM=mm; \ > > > > > > > + else \ > > > > > > > + MM=vm; \ > > > > > > > + fi; \ > > > > > > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > > > > > > > + $(MM_MAKE_OPTS) $${MM} > > > > > > > +endef > > > > > > > + > > > > > > > +define MM_INSTALL_TARGET_CMDS > > > > > > > + $(Q)if [ $(KVER_MAJOR) -gt $(KVER_MAJOR_MM) ] || \ > > > > > > > + [ $(KVER_MAJOR) -eq $(KVER_MAJOR_MM) -a \ > > > > > > > + $(KVER_MINOR) -ge $(KVER_MINOR_MM) ]; then \ > > > > > > > + MM=mm; \ > > > > > > > + else \ > > > > > > > + MM=vm; \ > > > > > > > + fi; \ > > > > > > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > > > > > > > + $(MM_MAKE_OPTS) \ > > > > > > > + INSTALL_ROOT=$(TARGET_DIR) \ > > > > > > > + DESTDIR=$(TARGET_DIR) \ > > > > > > > + $${MM}_install > > > > > > > +endef > > > > > > > -- > > > > > > > 2.36.0 > > > > > > > > > > > > > > > > > > > -- > > > > > > Thank you, > > > > > > Dmitry > > > > > > > > > > -- > > > > > Thank you, > > > > > Dmitry > > > > > > > > -- > > > > .-----------------.--------------------.------------------.--------------------. > > > > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > > > > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > > > > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > > > > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > > > > '------------------------------^-------^------------------^--------------------' > > > > -- > Thank you, > Dmitry -- Thank you, Dmitry From fontaine.fabrice at gmail.com Tue Feb 6 19:47:10 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 20:47:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/libp11: drop libressl support Message-ID: <20240206194710.394671-1-fontaine.fabrice@gmail.com> libressl dropped engine support since version 3.8.1 resulting in the following build failure since bump of libressl to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: eng_front.c: In function 'IMPLEMENT_DYNAMIC_CHECK_FN': eng_front.c:262:1: error: expected declaration specifiers before 'IMPLEMENT_DYNAMIC_BIND_FN' 262 | IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) | ^~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/389ed112f082a4917f777f3e236211059c4c6d6e Signed-off-by: Fabrice Fontaine --- package/libp11/Config.in | 1 + package/libp11/libp11.mk | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/libp11/Config.in b/package/libp11/Config.in index ef1e5b4703..3c7ccdee27 100644 --- a/package/libp11/Config.in +++ b/package/libp11/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBP11 depends on !BR2_STATIC_LIBS # dlopen depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help OpenSSL engine for PKCS#11 modules. Part of the OpenSC project. diff --git a/package/libp11/libp11.mk b/package/libp11/libp11.mk index 7718573ace..cd4ed34297 100644 --- a/package/libp11/libp11.mk +++ b/package/libp11/libp11.mk @@ -11,16 +11,10 @@ LIBP11_INSTALL_STAGING = YES LIBP11_LICENSE = LGPL-2.1+ LIBP11_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -LIBP11_ENGINESDIR = enginesdir -else ifeq ($(BR2_PACKAGE_LIBRESSL),y) -LIBP11_ENGINESDIR = libdir -endif - # pkg-config returns a libcrypto enginesdir prefixed with the sysroot, # so let's rip it out. LIBP11_CONF_OPTS = \ - --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable $(LIBP11_ENGINESDIR) libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` + --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable enginesdir libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` ifeq ($(BR2_PACKAGE_P11_KIT),y) LIBP11_CONF_OPTS += --with-pkcs11-module=/usr/lib/p11-kit-proxy.so -- 2.43.0 From ju.o at free.fr Tue Feb 6 19:52:37 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 6 Feb 2024 20:52:37 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: new acl runtime test Message-ID: <20240206195237.55252-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_acl.py | 87 +++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 support/testing/tests/package/test_acl.py diff --git a/DEVELOPERS b/DEVELOPERS index 4b8d195f9f..ce248e8706 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1762,6 +1762,7 @@ F: support/testing/tests/package/sample_python_midiutil.py F: support/testing/tests/package/sample_python_ml_dtypes.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py diff --git a/support/testing/tests/package/test_acl.py b/support/testing/tests/package/test_acl.py new file mode 100644 index 0000000000..e4827c7bec --- /dev/null +++ b/support/testing/tests/package/test_acl.py @@ -0,0 +1,87 @@ +import os + +import infra.basetest + + +class TestAcl(infra.basetest.BRTest): + # Note: this test requires a Kernel with a filesystem on /tmp + # supporting ACLs. This is the case for the basetest reference + # config. Kernel has CONFIG_TMPFS_POSIX_ACL=y, and /tmp is tmpfs + # in the default Buildroot config. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ACL=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]) + self.emulator.login() + + # Check the programs can execute. + self.assertRunOk("getfacl --version") + self.assertRunOk("setfacl --version") + + # Constants used in this test. + test_user = "acltest" + test_data = "Hello Buildroot!" + test_file = "/tmp/file.txt" + + # Create a test user: + # -D don't set a password + # -h set home directory + # -H don't create home directory + # -s set shell to /bin/sh + self.assertRunOk(f"adduser -D -h /tmp -H -s /bin/sh {test_user}") + + # Create a test file, and make sure the owner is "root" with + # standard Unix permissions to read/write only for the owner. + self.assertRunOk(f"echo '{test_data}' > {test_file}") + self.assertRunOk(f"chown root:root {test_file}") + self.assertRunOk(f"chmod 0600 {test_file}") + + # Check we have no ACL for the test user. + getacl_cmd = f"getfacl -c -p {test_file}" + out, ret = self.emulator.run(getacl_cmd) + self.assertEqual(ret, 0) + self.assertNotIn(f"user:{test_user}:", "\n".join(out)) + + # Reading the file as the test user is expected to fail. + test_read_cmd = f"su - {test_user} -c 'cat {test_file}'" + _, ret = self.emulator.run(test_read_cmd) + self.assertNotEqual(ret, 0) + + # We add a special read ACL for the test user. + cmd = f"setfacl -m u:{test_user}:r {test_file}" + self.assertRunOk(cmd) + + # Check we now have an ACL entry for the test user. + out, ret = self.emulator.run(getacl_cmd) + self.assertEqual(ret, 0) + self.assertIn(f"user:{test_user}:", "\n".join(out)) + + # Reading the file as the test user is now expected to + # succeed. + out, ret = self.emulator.run(test_read_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], test_data) + + # Attempting to write to the file as the test user is expected + # to fail (since we put an ACL only for reading). + cmd = f"su - {test_user} -c 'echo WriteTest > {test_file}'" + _, ret = self.emulator.run(cmd) + self.assertNotEqual(ret, 0) + + # Remove all ACLs. This could have been done with the command + # "setfacl -b". Instead, we use the "chacl -B" command which + # is doing the same. The reason is to slightly improve the + # coverage of this test, by including an execution of "chacl". + self.assertRunOk(f"chacl -B {test_file}") + + # Reading the file as the test user is expected to fail again. + _, ret = self.emulator.run(test_read_cmd) + self.assertNotEqual(ret, 0) -- 2.43.0 From ju.o at free.fr Tue Feb 6 20:12:13 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 6 Feb 2024 21:12:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/acl: bump to version 2.3.2 Message-ID: <20240206201213.187788-1-ju.o@free.fr> See release announcement [1]. This commit also updates the _SITE variable to match the download URL published in the release announcement in [1]. The package homepage is also updated to match the one published at [2]. The main motivation of those URL updates is to switch to https. [1] https://lists.nongnu.org/archive/html/acl-devel/2024-01/msg00012.html [2] https://git.savannah.nongnu.org/cgit/acl.git/tree/README?h=v2.3.2#n4 Signed-off-by: Julien Olivain --- package/acl/Config.in | 2 +- package/acl/acl.hash | 2 +- package/acl/acl.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/acl/Config.in b/package/acl/Config.in index 92f2251878..056a31baa8 100644 --- a/package/acl/Config.in +++ b/package/acl/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_ACL directories. This package also provides libacl. - http://savannah.nongnu.org/projects/acl + https://savannah.nongnu.org/projects/acl diff --git a/package/acl/acl.hash b/package/acl/acl.hash index 32e904baf3..a6094fb985 100644 --- a/package/acl/acl.hash +++ b/package/acl/acl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 c0234042e17f11306c23c038b08e5e070edb7be44bef6697fb8734dcff1c66b1 acl-2.3.1.tar.xz +sha256 97203a72cae99ab89a067fe2210c1cbf052bc492b479eca7d226d9830883b0bd acl-2.3.2.tar.xz # Locally calculated sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 doc/COPYING diff --git a/package/acl/acl.mk b/package/acl/acl.mk index c898421dc5..a5371e1aea 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -4,9 +4,9 @@ # ################################################################################ -ACL_VERSION = 2.3.1 +ACL_VERSION = 2.3.2 ACL_SOURCE = acl-$(ACL_VERSION).tar.xz -ACL_SITE = http://download.savannah.gnu.org/releases/acl +ACL_SITE = https://download.savannah.nongnu.org/releases/acl ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ACL_CPE_ID_VENDOR = acl_project -- 2.43.0 From ju.o at free.fr Tue Feb 6 20:13:10 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 6 Feb 2024 21:13:10 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add thttpd runtime test Message-ID: <20240206201310.188097-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_thttpd.py | 26 ++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 support/testing/tests/package/test_thttpd.py diff --git a/DEVELOPERS b/DEVELOPERS index 94a89c63d5..72add029b5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1814,6 +1814,7 @@ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ +F: support/testing/tests/package/test_thttpd.py F: support/testing/tests/package/test_weston.py F: support/testing/tests/package/test_weston/ F: support/testing/tests/package/test_xz.py diff --git a/support/testing/tests/package/test_thttpd.py b/support/testing/tests/package/test_thttpd.py new file mode 100644 index 0000000000..007bc91f2d --- /dev/null +++ b/support/testing/tests/package/test_thttpd.py @@ -0,0 +1,26 @@ +import os + +import infra.basetest + + +class TestThttpd(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_THTTPD=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]) + self.emulator.login() + + msg = "Hello Buildroot!" + + self.assertRunOk("thttpd -V") + self.assertRunOk(f"echo '{msg}' > /var/www/data/index.html") + self.assertRunOk("wget http://localhost/index.html") + self.assertRunOk(f"grep -F '{msg}' index.html") -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 6 20:30:31 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 21:30:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.18 Message-ID: <20240206203031.851666-1-fontaine.fabrice@gmail.com> Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP in their default configuration allows the arbitrary writing of files. By exploiting these combination of primitives, an attacker can execute arbitrary code. https://netatalk.io/CVE-2022-22995 https://netatalk.io/3.1/ReleaseNotes3.1.18 Signed-off-by: Fabrice Fontaine --- package/netatalk/netatalk.hash | 8 ++++---- package/netatalk/netatalk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index a35e6bc36c..9ab5d604a8 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.17/ -md5 a6429a28948f85b69c9012fb437dd9c2 netatalk-3.1.17.tar.xz -sha1 bc6578d9fa874b3816fd4ddd60a30a8f3aadc71d netatalk-3.1.17.tar.xz +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ +md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz +sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz # Locally computed -sha256 8c208e2c94bf3047db33cdbc3ce4325d2b80db61d6cc527f18f9dbd8e95b5cff netatalk-3.1.17.tar.xz +sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 40e64dabeb..53cd53876a 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.17 +NETATALK_VERSION = 3.1.18 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 6 20:42:08 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 21:42:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.6.0 Message-ID: <20240206204209.864622-1-fontaine.fabrice@gmail.com> Security fixes: - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can cause denial of service, in partial where dealing with compressed XML input. Applications that parsed a document in one go -- a single call to functions XML_Parse or XML_ParseBuffer -- were not affected. The smaller the chunks/buffers you use for parsing previously, the bigger the problem prior to the fix. - CVE-2023-52426: Fix billion laughs attacks for users compiling *without* XML_DTD defined (which is not common). Users with XML_DTD defined have been protected since Expat >=2.4.0 (and that was CVE-2013-0340 back then). https://blog.hartwork.org/posts/expat-2-6-0-released/ Signed-off-by: Fabrice Fontaine --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index c6c25aa3e0..043501378b 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.5.0/ -md5 ac6677b6d1b95d209ab697ce8b688704 expat-2.5.0.tar.xz -sha1 5178e13c1e34f4643d5118d5758babfe0e836fe2 expat-2.5.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.0/ +md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz +sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz # Locally calculated -sha256 ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 6f22024cc0..5f4016e0d1 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.5.0 +EXPAT_VERSION = 2.6.0 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -- 2.43.0 From thomas.petazzoni at bootlin.com Tue Feb 6 20:47:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 21:47:35 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/python-poetry-core: new host package In-Reply-To: <20240206193048.658003-1-james.hilliard1@gmail.com> References: <20240206193048.658003-1-james.hilliard1@gmail.com> Message-ID: <20240206214735.7d69db1e@windsurf> On Tue, 6 Feb 2024 12:30:46 -0700 James Hilliard wrote: > +PYTHON_POETRY_CORE_LICENSE = \ > + Apache-2.0 or BSD-2-Clause (packaging), \ > + BSD-3-Clause (fastjsonschema), \ > + GPL-2.0-or-later (lark), \ Didn't review the licensing, but in Buildroot we diverge from SPDX on this point, and we encode GPL-2.0-or-later as GPL-2.0+. No need to resend just for that, it can be fixed when applying. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Tue Feb 6 20:49:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 21:49:36 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add a postgresql runtime test In-Reply-To: <20240111224003.243443-1-ju.o@free.fr> (Julien Olivain's message of "Thu, 11 Jan 2024 23:40:03 +0100") References: <20240111224003.243443-1-ju.o@free.fr> Message-ID: <87h6il5ndr.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > Since commit 2a8065e "package/postgresql: bump version to 16.1", the > postgresql service fail to start at runtime with an error: > FATAL: could not load library "/usr/lib/postgresql/dict_snowball.so": /usr/lib/postgresql/dict_snowball.so: undefined symbol: CurrentMemoryContext > See: https://www.postgresql.org/message-id/flat/1266022.1701958693%40sss.pgh.pa.us > This runtime test works with postgresql 15.5, when this commit is > reverted. > Patch tested on branch master at commit 66414ed with commands: Given that this is now fixed with 16.1, it should work there as well. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 20:49:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 21:49:49 +0100 Subject: [Buildroot] [git commit] support/testing: add a postgresql runtime test Message-ID: <20240206205007.54D47873BD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9add4cbfeaafaf3b1c31140429278cd68bd72150 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_postgresql.py | 197 +++++++++++++++++++++++ 2 files changed, 198 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4b8d195f9f..d0ab37f5c2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1821,6 +1821,7 @@ F: support/testing/tests/package/test_openblas.py F: support/testing/tests/package/test_pciutils.py F: support/testing/tests/package/test_perftest.py F: support/testing/tests/package/test_pigz.py +F: support/testing/tests/package/test_postgresql.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py F: support/testing/tests/package/test_python_hkdf.py diff --git a/support/testing/tests/package/test_postgresql.py b/support/testing/tests/package/test_postgresql.py new file mode 100644 index 0000000000..bd41fc3f1b --- /dev/null +++ b/support/testing/tests/package/test_postgresql.py @@ -0,0 +1,197 @@ +import os + +import infra.basetest + + +class TestPostgreSQL(infra.basetest.BRTest): + # We use a specific configuration for: + # - using Aarch64, to have more than 256MB memory, + # - to have an ext4 rootfs image exposed as a virtio storage + # (rather than cpio initrd). This will save some memory, as the + # rootfs image is big. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.72" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_POSTGRESQL=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="256M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def __init__(self, names): + super(TestPostgreSQL, self).__init__(names) + self.db_admin = "postgres" + self.db_user = "br_user" + self.db_name = "br_database" + self.backup_file = "dump.sql" + self.pgdata_dir = "/var/lib/pgsql" + + def run_user_db_query(self, user, database, query, opts=None): + cmd = f"psql --username={user} --dbname={database}" + cmd += f' --command="{query}"' + if opts is not None: + cmd += " " + opts + self.assertRunOk(cmd) + + def run_admin_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_admin, self.db_admin, query, opts) + + def run_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_user, self.db_name, query, opts) + + def cleanup_database(self): + # This cleanup is useful when run-test -k is used. It makes + # this test idempotent. Since the drive storage is preserved + # between reboots, this cleanup will prevent errors during the + # user/db creation. + + # Drop the test database, if it exists. + cmd = f"dropdb --username={self.db_admin} " + cmd += f"--if-exists {self.db_name}" + self.assertRunOk(cmd) + + # Drop the test user, if it exists. + cmd = f"dropuser --username={self.db_admin} " + cmd += f"--if-exists {self.db_user}" + self.assertRunOk(cmd) + + def create_tables(self): + sql_query = "CREATE TABLE fruits (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE colors (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE fruit_colors (" + sql_query += "fruit_id integer REFERENCES fruits(id), " + sql_query += "color_id integer REFERENCES colors(id), " + sql_query += "UNIQUE (fruit_id, color_id));" + self.run_sql_query(sql_query) + + def insert_data(self): + fruits = ["Banana", "Blueberry", "Orange", "Raspberry"] + fruit_id = 1 + for fruit in fruits: + sql_query = "INSERT INTO fruits (id, name) " + sql_query += f"VALUES ({fruit_id}, '{fruit}');" + self.run_sql_query(sql_query) + fruit_id += 1 + + colors = ["Blue", "Orange", "Red", "Yellow"] + color_id = 1 + for color in colors: + sql_query = "INSERT INTO colors (id, name) " + sql_query += f"VALUES ({color_id}, '{color}');" + self.run_sql_query(sql_query) + color_id += 1 + + fruit_colors = [(1, 4), (2, 1), (3, 2), (4, 3)] + for fruit_color in fruit_colors: + fruit_id, color_id = fruit_color + sql_query = "INSERT INTO fruit_colors (fruit_id, color_id) " + sql_query += f"VALUES ({fruit_id}, {color_id});" + self.run_sql_query(sql_query) + + def query_database(self): + sql_query = "SELECT " + sql_query += "fruits.name AS fruit, colors.name AS color " + sql_query += "FROM fruits, colors, fruit_colors " + sql_query += "WHERE fruits.id = fruit_colors.fruit_id " + sql_query += "AND colors.id = fruit_colors.color_id " + sql_query += "ORDER BY fruit;" + self.run_sql_query(sql_query) + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "512M", + "-smp", "2", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Check the server binary can execute. + self.assertRunOk("postgres --version") + + # Check the client binary can execute. + self.assertRunOk("psql --version") + + # Check the server is ready. + self.assertRunOk("pg_isready") + + # Query the server version from the client. + sql_query = "SELECT version();" + self.run_admin_sql_query(sql_query, + opts="--tuples-only --no-align") + + self.cleanup_database() + + # Create a new user. + cmd = f"createuser --username={self.db_admin} " + cmd += "--no-superuser --no-createdb --no-createrole " + cmd += self.db_user + self.assertRunOk(cmd) + + # Create a new database. + cmd = f"createdb --username={self.db_admin} " + cmd += f"--owner={self.db_user} " + cmd += f'{self.db_name} "Test Database for Buildroot Test"' + self.assertRunOk(cmd) + + self.create_tables() + + self.insert_data() + + self.query_database() + + # Update a table. + sql_query = "UPDATE fruits SET name = 'Lemon' WHERE id = 1;" + self.run_sql_query(sql_query) + + # Backup the test database. + cmd = f"pg_dump --username={self.db_user} --dbname={self.db_name} " + cmd += f"--file={self.backup_file} --inserts" + self.assertRunOk(cmd) + + # Drop all the tables. + sql_query = "DROP TABLE fruit_colors, fruits, colors;" + self.run_sql_query(sql_query) + + # Query the server status. + cmd = f"su - {self.db_admin} -c 'pg_ctl status -D {self.pgdata_dir}'" + self.assertRunOk(cmd) + + # Stop the server. + cmd = f"su - {self.db_admin} -c 'pg_ctl stop -D {self.pgdata_dir}'" + self.assertRunOk(cmd) + + # Check the server is no longer ready. + _, exit_code = self.emulator.run("pg_isready") + self.assertNotEqual(exit_code, 0) + + # Restart the server. + cmd = f"su - {self.db_admin} -c 'pg_ctl start -D {self.pgdata_dir}'" + self.assertRunOk(cmd) + + # Restore the backup. + cmd = f"psql --username={self.db_user} --dbname={self.db_name} " + cmd += f"--file={self.backup_file}" + self.assertRunOk(cmd) + + # Query on last time our data, to check the backup restoration + # succeeded. + self.query_database() From peter at korsgaard.com Tue Feb 6 20:51:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 21:51:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/acl: bump to version 2.3.2 In-Reply-To: <20240206201213.187788-1-ju.o@free.fr> (Julien Olivain's message of "Tue, 6 Feb 2024 21:12:13 +0100") References: <20240206201213.187788-1-ju.o@free.fr> Message-ID: <87cyt95nbb.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > See release announcement [1]. > This commit also updates the _SITE variable to match the download URL > published in the release announcement in [1]. The package homepage is > also updated to match the one published at [2]. The main motivation > of those URL updates is to switch to https. > [1] https://lists.nongnu.org/archive/html/acl-devel/2024-01/msg00012.html > [2] https://git.savannah.nongnu.org/cgit/acl.git/tree/README?h=v2.3.2#n4 > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 20:50:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 21:50:36 +0100 Subject: [Buildroot] [git commit] package/acl: bump to version 2.3.2 Message-ID: <20240206205120.10621873C6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09cc83df9f75cc378e1f2acd418dda50aa0db294 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See release announcement [1]. This commit also updates the _SITE variable to match the download URL published in the release announcement in [1]. The package homepage is also updated to match the one published at [2]. The main motivation of those URL updates is to switch to https. [1] https://lists.nongnu.org/archive/html/acl-devel/2024-01/msg00012.html [2] https://git.savannah.nongnu.org/cgit/acl.git/tree/README?h=v2.3.2#n4 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/acl/Config.in | 2 +- package/acl/acl.hash | 2 +- package/acl/acl.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/acl/Config.in b/package/acl/Config.in index 92f2251878..056a31baa8 100644 --- a/package/acl/Config.in +++ b/package/acl/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_ACL directories. This package also provides libacl. - http://savannah.nongnu.org/projects/acl + https://savannah.nongnu.org/projects/acl diff --git a/package/acl/acl.hash b/package/acl/acl.hash index 32e904baf3..a6094fb985 100644 --- a/package/acl/acl.hash +++ b/package/acl/acl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 c0234042e17f11306c23c038b08e5e070edb7be44bef6697fb8734dcff1c66b1 acl-2.3.1.tar.xz +sha256 97203a72cae99ab89a067fe2210c1cbf052bc492b479eca7d226d9830883b0bd acl-2.3.2.tar.xz # Locally calculated sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 doc/COPYING diff --git a/package/acl/acl.mk b/package/acl/acl.mk index c898421dc5..a5371e1aea 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -4,9 +4,9 @@ # ################################################################################ -ACL_VERSION = 2.3.1 +ACL_VERSION = 2.3.2 ACL_SOURCE = acl-$(ACL_VERSION).tar.xz -ACL_SITE = http://download.savannah.gnu.org/releases/acl +ACL_SITE = https://download.savannah.nongnu.org/releases/acl ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ACL_CPE_ID_VENDOR = acl_project From peter at korsgaard.com Tue Feb 6 20:51:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 21:51:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.18 In-Reply-To: <20240206203031.851666-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 21:30:31 +0100") References: <20240206203031.851666-1-fontaine.fabrice@gmail.com> Message-ID: <878r3x5na3.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP > in their default configuration allows the arbitrary writing of files. By > exploiting these combination of primitives, an attacker can execute > arbitrary code. > https://netatalk.io/CVE-2022-22995 > https://netatalk.io/3.1/ReleaseNotes3.1.18 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 20:52:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 21:52:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.6.0 In-Reply-To: <20240206204209.864622-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 21:42:08 +0100") References: <20240206204209.864622-1-fontaine.fabrice@gmail.com> Message-ID: <874jel5n8g.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Security fixes: > - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can > cause denial of service, in partial where dealing with compressed XML > input. Applications that parsed a document in one go -- a single call > to functions XML_Parse or XML_ParseBuffer -- were not affected. The > smaller the chunks/buffers you use for parsing previously, the bigger > the problem prior to the fix. > - CVE-2023-52426: Fix billion laughs attacks for users compiling > *without* XML_DTD defined (which is not common). Users with XML_DTD > defined have been protected since Expat >=2.4.0 (and that was > CVE-2013-0340 back then). > https://blog.hartwork.org/posts/expat-2-6-0-released/ > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 20:51:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 21:51:19 +0100 Subject: [Buildroot] [git commit] package/netatalk: security bump to version 3.1.18 Message-ID: <20240206205253.C146A873D9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e472e0872a71395cf8a3541b5883081e929bc11 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP in their default configuration allows the arbitrary writing of files. By exploiting these combination of primitives, an attacker can execute arbitrary code. https://netatalk.io/CVE-2022-22995 https://netatalk.io/3.1/ReleaseNotes3.1.18 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.hash | 8 ++++---- package/netatalk/netatalk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index a35e6bc36c..9ab5d604a8 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.17/ -md5 a6429a28948f85b69c9012fb437dd9c2 netatalk-3.1.17.tar.xz -sha1 bc6578d9fa874b3816fd4ddd60a30a8f3aadc71d netatalk-3.1.17.tar.xz +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ +md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz +sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz # Locally computed -sha256 8c208e2c94bf3047db33cdbc3ce4325d2b80db61d6cc527f18f9dbd8e95b5cff netatalk-3.1.17.tar.xz +sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 40e64dabeb..53cd53876a 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.17 +NETATALK_VERSION = 3.1.18 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config From peter at korsgaard.com Tue Feb 6 20:51:59 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 21:51:59 +0100 Subject: [Buildroot] [git commit] package/expat: security bump to version 2.6.0 Message-ID: <20240206205253.D95FB873DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dad5e7d7f7bc03e648621b9be6974e7ae39a467 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Security fixes: - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can cause denial of service, in partial where dealing with compressed XML input. Applications that parsed a document in one go -- a single call to functions XML_Parse or XML_ParseBuffer -- were not affected. The smaller the chunks/buffers you use for parsing previously, the bigger the problem prior to the fix. - CVE-2023-52426: Fix billion laughs attacks for users compiling *without* XML_DTD defined (which is not common). Users with XML_DTD defined have been protected since Expat >=2.4.0 (and that was CVE-2013-0340 back then). https://blog.hartwork.org/posts/expat-2-6-0-released/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index c6c25aa3e0..043501378b 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.5.0/ -md5 ac6677b6d1b95d209ab697ce8b688704 expat-2.5.0.tar.xz -sha1 5178e13c1e34f4643d5118d5758babfe0e836fe2 expat-2.5.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.0/ +md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz +sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz # Locally calculated -sha256 ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 6f22024cc0..5f4016e0d1 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.5.0 +EXPAT_VERSION = 2.6.0 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From fontaine.fabrice at gmail.com Tue Feb 6 21:06:41 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 22:06:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-esptool: add CPE variables Message-ID: <20240206210641.878279-1-fontaine.fabrice@gmail.com> cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E Signed-off-by: Fabrice Fontaine --- package/python-esptool/python-esptool.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index f5aaface74..648748237d 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -10,5 +10,7 @@ PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/1b/8b/f0d1e75879de PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE +PYTHON_ESPTOOL_CPE_ID_VENDOR = espressif +PYTHON_ESPTOOL_CPE_ID_PRODUCT = esptool $(eval $(python-package)) -- 2.43.0 From peter at korsgaard.com Tue Feb 6 21:06:52 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:06:52 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add mdadm runtime test In-Reply-To: <20240127223838.274418-1-ju.o@free.fr> (Julien Olivain's message of "Sat, 27 Jan 2024 23:38:38 +0100") References: <20240127223838.274418-1-ju.o@free.fr> Message-ID: <87zfwd480j.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 2 + > support/testing/tests/package/test_mdadm.py | 138 ++++++++++++++++++ > .../package/test_mdadm/linux-mdadm.fragment | 3 + > 3 files changed, 143 insertions(+) > create mode 100644 support/testing/tests/package/test_mdadm.py > create mode 100644 support/testing/tests/package/test_mdadm/linux-mdadm.fragment .. > + > + # We add back this blank drive to the array. > + self.assertRunOk(f"mdadm {md_dev} --add {failing_dev}") > + > + # We wait few seconds to let the device rebuild. > + time.sleep(3) > + > + # The array should no longer be marked as degraded. > + out, ret = self.emulator.run(monitor_cmd) > + self.assertEqual(ret, 0) > + self.assertNotIn("DegradedArray", "\n".join(out)) That hard coded 3s is likely to cause problems on gitlab as the runners can be quite slow. How about reworking this to to check every few seconds for up to E.G. 30s if it has gotten out of the DegradedArray state? That can be done later though - So committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 20:54:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 21:54:20 +0100 Subject: [Buildroot] [git commit] support/testing: add mdadm runtime test Message-ID: <20240206210737.4FE5D873E3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6338bdfc1c772956de13d2ff7c6abaa23740325d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_mdadm.py | 138 +++++++++++++++++++++ .../tests/package/test_mdadm/linux-mdadm.fragment | 3 + 3 files changed, 143 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index d0ab37f5c2..ac65cbb450 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1805,6 +1805,8 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_mdadm.py +F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py F: support/testing/tests/package/test_micropython/ F: support/testing/tests/package/test_mtools.py diff --git a/support/testing/tests/package/test_mdadm.py b/support/testing/tests/package/test_mdadm.py new file mode 100644 index 0000000000..75385309a6 --- /dev/null +++ b/support/testing/tests/package/test_mdadm.py @@ -0,0 +1,138 @@ +import os +import subprocess +import time + +import infra.basetest + + +class TestMdadm(infra.basetest.BRTest): + # This test creates a dm-raid volume with mdadm. A specific Kernel + # need to be built with a config fragment enabling this support. + kernel_fragment = \ + infra.filepath("tests/package/test_mdadm/linux-mdadm.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.75" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_E2FSPROGS=y + BR2_PACKAGE_MDADM=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + # Test configuration: + md_dev = "/dev/md0" + storage_devs = ["/dev/vda", "/dev/vdb", "/dev/vdc"] + storage_size = 16 # Mega Bytes + failing_dev = storage_devs[-1] + mnt_pt = "/mnt/raid-storage" + data_file = f"{mnt_pt}/data.bin" + + qemu_storage_opts = [] + for i in range(len(storage_devs)): + disk_file = os.path.join(self.builddir, "images", f"disk{i}.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}\n") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", + "bs=1M", f"count={storage_size}"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + opts = ["-drive", f"file={disk_file},if=virtio,format=raw"] + qemu_storage_opts += opts + + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img] + qemu_storage_opts) + self.emulator.login() + + # Test the program can execute. + self.assertRunOk("mdadm --version") + + # Show the mdstat, to confirm the Kernel has support and the + # configuration is empty. + cat_mdstat_cmd = "cat /proc/mdstat" + self.assertRunOk(cat_mdstat_cmd) + + # We create a raid5 array with the drives. + cmd = f"mdadm --create --verbose {md_dev} --level=5 " + cmd += f"--raid-devices={len(storage_devs)} " + cmd += " ".join(storage_devs) + self.assertRunOk(cmd) + + # We show again mdstat, to confirm the array creation. This is + # also for debugging. + self.assertRunOk(cat_mdstat_cmd) + + # We format the device as ext4 and mount it. + self.assertRunOk(f"mkfs.ext4 {md_dev}") + self.assertRunOk(f"mkdir -p {mnt_pt}") + self.assertRunOk(f"mount {md_dev} {mnt_pt}") + + # We store some random data on this new filesystem. Note: this + # file is slightly larger than a single storage drive. This + # data file should span over two drives and use the raid5. + file_size = storage_size + 4 + cmd = f"dd if=/dev/urandom of={data_file} bs=1M count={file_size}" + self.assertRunOk(cmd) + + # We compute the hash of our data, and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # We run few common mdadm commands. + self.assertRunOk("mdadm --detail --scan") + self.assertRunOk(f"mdadm --query {md_dev}") + self.assertRunOk(f"mdadm --detail --test {md_dev}") + self.assertRunOk(f"mdadm --action=check {md_dev}") + self.assertRunOk(f"mdadm --monitor --oneshot {md_dev}") + + # We mark a device as "failed". + self.assertRunOk(f"mdadm {md_dev} --fail {failing_dev}") + + # The monitoring should now report the array as degraded. + monitor_cmd = f"mdadm --monitor --oneshot {md_dev}" + out, ret = self.emulator.run(monitor_cmd) + self.assertEqual(ret, 0) + self.assertIn("DegradedArray", "\n".join(out)) + + # We remove the failing drive from the array. + self.assertRunOk(f"mdadm {md_dev} --remove {failing_dev}") + + # We wipe the failing drive by writing zeroes. + cmd = f"dd if=/dev/zero of={failing_dev} bs=1M count={storage_size}" + self.assertRunOk(cmd) + + # We add back this blank drive to the array. + self.assertRunOk(f"mdadm {md_dev} --add {failing_dev}") + + # We wait few seconds to let the device rebuild. + time.sleep(3) + + # The array should no longer be marked as degraded. + out, ret = self.emulator.run(monitor_cmd) + self.assertEqual(ret, 0) + self.assertNotIn("DegradedArray", "\n".join(out)) + + # With all those array manipulations, the data file should not + # be corrupted. We should be able to recompute the same hash + # as before. + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) diff --git a/support/testing/tests/package/test_mdadm/linux-mdadm.fragment b/support/testing/tests/package/test_mdadm/linux-mdadm.fragment new file mode 100644 index 0000000000..152192ceb4 --- /dev/null +++ b/support/testing/tests/package/test_mdadm/linux-mdadm.fragment @@ -0,0 +1,3 @@ +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_RAID=y From peter at korsgaard.com Tue Feb 6 21:10:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:10:10 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add numactl runtime test In-Reply-To: <20240129203635.183112-1-ju.o@free.fr> (Julien Olivain's message of "Mon, 29 Jan 2024 21:36:35 +0100") References: <20240129203635.183112-1-ju.o@free.fr> Message-ID: <87v87147v1.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:08:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:08:50 +0100 Subject: [Buildroot] [git commit] support/testing: add numactl runtime test Message-ID: <20240206212609.81147873F2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=506073c3edff7fcb913924c1dd06c50fafe9665b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_numactl.py | 142 +++++++++++++++++++++ .../package/test_numactl/linux-numactl.fragment | 1 + 3 files changed, 145 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index ac65cbb450..dffbbf4605 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1816,6 +1816,8 @@ F: support/testing/tests/package/test_netcat.py F: support/testing/tests/package/test_nftables.py F: support/testing/tests/package/test_nftables/ F: support/testing/tests/package/test_ngrep.py +F: support/testing/tests/package/test_numactl.py +F: support/testing/tests/package/test_numactl/ F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py F: support/testing/tests/package/test_ola/ diff --git a/support/testing/tests/package/test_numactl.py b/support/testing/tests/package/test_numactl.py new file mode 100644 index 0000000000..2ef9eb3635 --- /dev/null +++ b/support/testing/tests/package/test_numactl.py @@ -0,0 +1,142 @@ +import os +import re + +import infra.basetest + + +class TestNumaCtl(infra.basetest.BRTest): + # A specific configuration is needed for testing numactl: + # - This test uses a x86_64 config, which has mature NUMA support. + # - A kernel need to compiled with a NUMA support. + kernel_fragment = \ + infra.filepath("tests/package/test_numactl/linux-numactl.fragment") + config = \ + f""" + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.75" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + BR2_PACKAGE_NUMACTL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def check_numactl_preferred(self): + # Show the default NUMA policy settings. We check we have the + # 4 physical cpus on 2 nodes we configured the emulator + # command line. + out, ret = self.emulator.run("numactl --show") + self.assertEqual(ret, 0) + checks = [ + "policy: default", + "preferred node: current", + "physcpubind: 0 1 2 3 ", + "nodebind: 0 1 ", + "membind: 0 1 " + ] + for pattern in checks: + self.assertIn(pattern, out) + + # Check the preferred policy on different nodes. This command + # is taken from the numactl man page. + for pref_node in range(2): + cmd = f"numactl --preferred={pref_node} numactl --show" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + checks = [ + "policy: preferred", + f"preferred node: {pref_node}" + ] + for pattern in checks: + self.assertIn(pattern, out) + + def get_numa_node_free_mem(self): + out, ret = self.emulator.run("numactl --hardware") + self.assertEqual(ret, 0) + free_mem = {} + p = re.compile("^node ([0-9]+) free: ([0-9]+) MB") + for line in out: + m = p.match(line) + if m: + node = int(m.group(1)) + mem = int(m.group(2)) + free_mem[node] = mem + return free_mem + + def check_numactl_membind(self): + # We get the current amount of free memory on each node, for + # later comparison. + initial_node_free_mem = self.get_numa_node_free_mem() + + # We allocate a shared memory file with a restriction to be in + # node 1 memory only. + shm_file = "/dev/shm/file" + file_size = 100 + cmd = f"numactl --membind=1 dd if=/dev/zero of={shm_file} bs=1M count={file_size}" + self.assertRunOk(cmd) + + # We collect again the amount of free memory per node. + node_free_mem = self.get_numa_node_free_mem() + + # Since we allocated 100M on node 1 only, we check the free + # space on node 0 did not significantly changed and on node 1 + # approximately reduced of the file size. + diff = initial_node_free_mem[0] - node_free_mem[0] + self.assertAlmostEqual(diff, 0, delta=10) + diff = initial_node_free_mem[1] - node_free_mem[1] + self.assertAlmostEqual(diff, file_size, delta=10) + + # Remove the file, to free the memory. + self.assertRunOk(f"rm -f {shm_file}") + + # We allocate again a file in shared memory, but this time in + # two chunks. Each chunk is requested to be allocated in two + # different nodes. This example is taken from the numactl man + # page. + chunk_size = file_size // 2 + cmd = "numactl --membind=0 " + cmd += f"dd if=/dev/zero of={shm_file} bs=1M count={chunk_size}" + self.assertRunOk(cmd) + cmd = "numactl --membind=1 " + cmd += f"dd if=/dev/zero of={shm_file} bs=1M count={chunk_size} seek={chunk_size}" + self.assertRunOk(cmd) + + # We collect again the amount of free memory. + node_free_mem = self.get_numa_node_free_mem() + + # We check the free memory space approximately reduced of each + # chunk size. + for node in range(2): + free_mem_diff = initial_node_free_mem[node] - node_free_mem[node] + self.assertAlmostEqual(free_mem_diff, chunk_size, delta=5) + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "bzImage") + # We start the Qemu emulator with 4 processors on 2 NUMA nodes. + self.emulator.boot(arch="x86_64", + kernel=kern, + kernel_cmdline=["console=ttyS0"], + options=["-cpu", "Nehalem", "-m", "512M", + "-smp", "cpus=4,sockets=2,cores=2,maxcpus=4", + "-object", "memory-backend-ram,size=256M,id=m0", + "-object", "memory-backend-ram,size=256M,id=m1", + "-numa", "node,cpus=0-1,nodeid=0,memdev=m0", + "-numa", "node,cpus=2-3,nodeid=1,memdev=m1", + "-initrd", img]) + self.emulator.login() + + # Check a simple numactl invication: + # show the NUMA hardware inventory. + self.assertRunOk("numactl --hardware") + + self.check_numactl_preferred() + self.check_numactl_membind() diff --git a/support/testing/tests/package/test_numactl/linux-numactl.fragment b/support/testing/tests/package/test_numactl/linux-numactl.fragment new file mode 100644 index 0000000000..e480f0c042 --- /dev/null +++ b/support/testing/tests/package/test_numactl/linux-numactl.fragment @@ -0,0 +1 @@ +CONFIG_NUMA=y From peter at korsgaard.com Tue Feb 6 21:38:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:38:53 +0100 Subject: [Buildroot] [git commit] package/python-esptool: add CPE variables Message-ID: <20240206214130.D2C84873FA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=81fab735aee5d052e02a1304fb537b001c7d69c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-esptool/python-esptool.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index f5aaface74..648748237d 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -10,5 +10,7 @@ PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/1b/8b/f0d1e75879de PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE +PYTHON_ESPTOOL_CPE_ID_VENDOR = espressif +PYTHON_ESPTOOL_CPE_ID_PRODUCT = esptool $(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 21:41:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:41:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-esptool: add CPE variables In-Reply-To: <20240206210641.878279-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 22:06:41 +0100") References: <20240206210641.878279-1-fontaine.fabrice@gmail.com> Message-ID: <87plx946fh.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:42:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:42:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/libp11: drop libressl support In-Reply-To: <20240206194710.394671-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 20:47:10 +0100") References: <20240206194710.394671-1-fontaine.fabrice@gmail.com> Message-ID: <87le7x46dm.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libressl dropped engine support since version 3.8.1 resulting in the > following build failure since bump of libressl to version 3.8.2 in > commit 21eca49ed5110872407b76ab9337d2877c4cda24: > eng_front.c: In function 'IMPLEMENT_DYNAMIC_CHECK_FN': > eng_front.c:262:1: error: expected declaration specifiers before 'IMPLEMENT_DYNAMIC_BIND_FN' > 262 | IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/389ed112f082a4917f777f3e236211059c4c6d6e > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:41:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:41:55 +0100 Subject: [Buildroot] [git commit] package/libp11: drop libressl support Message-ID: <20240206214329.85E3187403@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f622944bc88a895601955d5ce13a2b7015e54232 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libressl dropped engine support since version 3.8.1 resulting in the following build failure since bump of libressl to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: eng_front.c: In function 'IMPLEMENT_DYNAMIC_CHECK_FN': eng_front.c:262:1: error: expected declaration specifiers before 'IMPLEMENT_DYNAMIC_BIND_FN' 262 | IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) | ^~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/389ed112f082a4917f777f3e236211059c4c6d6e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libp11/Config.in | 1 + package/libp11/libp11.mk | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/libp11/Config.in b/package/libp11/Config.in index ef1e5b4703..3c7ccdee27 100644 --- a/package/libp11/Config.in +++ b/package/libp11/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBP11 depends on !BR2_STATIC_LIBS # dlopen depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help OpenSSL engine for PKCS#11 modules. Part of the OpenSC project. diff --git a/package/libp11/libp11.mk b/package/libp11/libp11.mk index 7718573ace..cd4ed34297 100644 --- a/package/libp11/libp11.mk +++ b/package/libp11/libp11.mk @@ -11,16 +11,10 @@ LIBP11_INSTALL_STAGING = YES LIBP11_LICENSE = LGPL-2.1+ LIBP11_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -LIBP11_ENGINESDIR = enginesdir -else ifeq ($(BR2_PACKAGE_LIBRESSL),y) -LIBP11_ENGINESDIR = libdir -endif - # pkg-config returns a libcrypto enginesdir prefixed with the sysroot, # so let's rip it out. LIBP11_CONF_OPTS = \ - --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable $(LIBP11_ENGINESDIR) libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` + --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable enginesdir libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` ifeq ($(BR2_PACKAGE_P11_KIT),y) LIBP11_CONF_OPTS += --with-pkcs11-module=/usr/lib/p11-kit-proxy.so From peter at korsgaard.com Tue Feb 6 21:48:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:48:51 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: new acl runtime test In-Reply-To: <20240206195237.55252-1-ju.o@free.fr> (Julien Olivain's message of "Tue, 6 Feb 2024 20:52:37 +0100") References: <20240206195237.55252-1-ju.o@free.fr> Message-ID: <87h6il462k.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 1 + > support/testing/tests/package/test_acl.py | 87 +++++++++++++++++++++++ > 2 files changed, 88 insertions(+) > create mode 100644 support/testing/tests/package/test_acl.py > diff --git a/DEVELOPERS b/DEVELOPERS > index 4b8d195f9f..ce248e8706 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1762,6 +1762,7 @@ F: support/testing/tests/package/sample_python_midiutil.py > F: support/testing/tests/package/sample_python_ml_dtypes.py > F: support/testing/tests/package/sample_python_pyalsa.py > F: support/testing/tests/package/sample_python_spake2.py > +F: support/testing/tests/package/test_acl.py > F: support/testing/tests/package/test_acpica.py > F: support/testing/tests/package/test_acpica/ > F: support/testing/tests/package/test_apache.py > diff --git a/support/testing/tests/package/test_acl.py b/support/testing/tests/package/test_acl.py > new file mode 100644 > index 0000000000..e4827c7bec > --- /dev/null > +++ b/support/testing/tests/package/test_acl.py > @@ -0,0 +1,87 @@ > +import os > + > +import infra.basetest > + > + > +class TestAcl(infra.basetest.BRTest): > + # Note: this test requires a Kernel with a filesystem on /tmp > + # supporting ACLs. This is the case for the basetest reference > + # config. Kernel has CONFIG_TMPFS_POSIX_ACL=y, and /tmp is tmpfs > + # in the default Buildroot config. > + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ > + """ > + BR2_PACKAGE_ACL=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]) > + self.emulator.login() > + > + # Check the programs can execute. > + self.assertRunOk("getfacl --version") > + self.assertRunOk("setfacl --version") > + > + # Constants used in this test. > + test_user = "acltest" > + test_data = "Hello Buildroot!" > + test_file = "/tmp/file.txt" > + > + # Create a test user: > + # -D don't set a password > + # -h set home directory > + # -H don't create home directory > + # -s set shell to /bin/sh > + self.assertRunOk(f"adduser -D -h /tmp -H -s /bin/sh {test_user}") > + > + # Create a test file, and make sure the owner is "root" with > + # standard Unix permissions to read/write only for the owner. > + self.assertRunOk(f"echo '{test_data}' > {test_file}") > + self.assertRunOk(f"chown root:root {test_file}") > + self.assertRunOk(f"chmod 0600 {test_file}") > + > + # Check we have no ACL for the test user. > + getacl_cmd = f"getfacl -c -p {test_file}" > + out, ret = self.emulator.run(getacl_cmd) > + self.assertEqual(ret, 0) NIT: Maybe we should consider making assertRunOk() return the stdout output so we don't need to open code the exit code check every time that we also need stdout? Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:49:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:49:08 +0100 Subject: [Buildroot] [git commit] support/testing: new acl runtime test Message-ID: <20240206214927.6B2AB8740E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=26b7e0f2824e6df7d865ffae8ff2ec17fd58a9e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_acl.py | 87 +++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index dffbbf4605..4d916ff6a1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1762,6 +1762,7 @@ F: support/testing/tests/package/sample_python_midiutil.py F: support/testing/tests/package/sample_python_ml_dtypes.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py diff --git a/support/testing/tests/package/test_acl.py b/support/testing/tests/package/test_acl.py new file mode 100644 index 0000000000..e4827c7bec --- /dev/null +++ b/support/testing/tests/package/test_acl.py @@ -0,0 +1,87 @@ +import os + +import infra.basetest + + +class TestAcl(infra.basetest.BRTest): + # Note: this test requires a Kernel with a filesystem on /tmp + # supporting ACLs. This is the case for the basetest reference + # config. Kernel has CONFIG_TMPFS_POSIX_ACL=y, and /tmp is tmpfs + # in the default Buildroot config. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ACL=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]) + self.emulator.login() + + # Check the programs can execute. + self.assertRunOk("getfacl --version") + self.assertRunOk("setfacl --version") + + # Constants used in this test. + test_user = "acltest" + test_data = "Hello Buildroot!" + test_file = "/tmp/file.txt" + + # Create a test user: + # -D don't set a password + # -h set home directory + # -H don't create home directory + # -s set shell to /bin/sh + self.assertRunOk(f"adduser -D -h /tmp -H -s /bin/sh {test_user}") + + # Create a test file, and make sure the owner is "root" with + # standard Unix permissions to read/write only for the owner. + self.assertRunOk(f"echo '{test_data}' > {test_file}") + self.assertRunOk(f"chown root:root {test_file}") + self.assertRunOk(f"chmod 0600 {test_file}") + + # Check we have no ACL for the test user. + getacl_cmd = f"getfacl -c -p {test_file}" + out, ret = self.emulator.run(getacl_cmd) + self.assertEqual(ret, 0) + self.assertNotIn(f"user:{test_user}:", "\n".join(out)) + + # Reading the file as the test user is expected to fail. + test_read_cmd = f"su - {test_user} -c 'cat {test_file}'" + _, ret = self.emulator.run(test_read_cmd) + self.assertNotEqual(ret, 0) + + # We add a special read ACL for the test user. + cmd = f"setfacl -m u:{test_user}:r {test_file}" + self.assertRunOk(cmd) + + # Check we now have an ACL entry for the test user. + out, ret = self.emulator.run(getacl_cmd) + self.assertEqual(ret, 0) + self.assertIn(f"user:{test_user}:", "\n".join(out)) + + # Reading the file as the test user is now expected to + # succeed. + out, ret = self.emulator.run(test_read_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], test_data) + + # Attempting to write to the file as the test user is expected + # to fail (since we put an ACL only for reading). + cmd = f"su - {test_user} -c 'echo WriteTest > {test_file}'" + _, ret = self.emulator.run(cmd) + self.assertNotEqual(ret, 0) + + # Remove all ACLs. This could have been done with the command + # "setfacl -b". Instead, we use the "chacl -B" command which + # is doing the same. The reason is to slightly improve the + # coverage of this test, by including an execution of "chacl". + self.assertRunOk(f"chacl -B {test_file}") + + # Reading the file as the test user is expected to fail again. + _, ret = self.emulator.run(test_read_cmd) + self.assertNotEqual(ret, 0) From peter at korsgaard.com Tue Feb 6 21:50:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:50:50 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add thttpd runtime test In-Reply-To: <20240206201310.188097-1-ju.o@free.fr> (Julien Olivain's message of "Tue, 6 Feb 2024 21:13:10 +0100") References: <20240206201310.188097-1-ju.o@free.fr> Message-ID: <87cyt945z9.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:52:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:52:29 +0100 Subject: [Buildroot] [git commit] support/testing: add thttpd runtime test Message-ID: <20240206215310.01FF987416@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7bbea9a6c4780210afc6ff6da3513b83a8a0270 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_thttpd.py | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 4d916ff6a1..376a1662d9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1847,6 +1847,7 @@ F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_tcpdump.py F: support/testing/tests/package/test_tesseract_ocr.py +F: support/testing/tests/package/test_thttpd.py F: support/testing/tests/package/test_trace_cmd.py F: support/testing/tests/package/test_trace_cmd/ F: support/testing/tests/package/test_usbutils.py diff --git a/support/testing/tests/package/test_thttpd.py b/support/testing/tests/package/test_thttpd.py new file mode 100644 index 0000000000..007bc91f2d --- /dev/null +++ b/support/testing/tests/package/test_thttpd.py @@ -0,0 +1,26 @@ +import os + +import infra.basetest + + +class TestThttpd(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_THTTPD=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]) + self.emulator.login() + + msg = "Hello Buildroot!" + + self.assertRunOk("thttpd -V") + self.assertRunOk(f"echo '{msg}' > /var/www/data/index.html") + self.assertRunOk("wget http://localhost/index.html") + self.assertRunOk(f"grep -F '{msg}' index.html") From peter at korsgaard.com Tue Feb 6 21:54:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:54:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-pydantic: add CPE variables In-Reply-To: <20240206180743.6460-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 19:07:43 +0100") References: <20240206180743.6460-1-fontaine.fabrice@gmail.com> Message-ID: <878r3x45sp.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:pydantic_project:pydantic is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/9B7C28E5-ACB1-4252-AE8F-4225C1AF739E > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:55:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 22:55:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-opcua-asyncio: add CPE variables In-Reply-To: <20240206183536.284845-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 19:35:36 +0100") References: <20240206183536.284845-1-fontaine.fabrice@gmail.com> Message-ID: <874jel45sb.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:freeopcua:opcua-asyncio is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/39E826E8-04D1-465F-AA4E-7A41B387D7CE > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 21:54:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:54:55 +0100 Subject: [Buildroot] [git commit] package/python-opcua-asyncio: add CPE variables Message-ID: <20240206215536.8612787421@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa44cc4aaa7f47f6fb0e725d33c776d526a82da0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:freeopcua:opcua-asyncio is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/39E826E8-04D1-465F-AA4E-7A41B387D7CE Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-opcua-asyncio/python-opcua-asyncio.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index a8be2c8722..226b9bbc21 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -10,5 +10,7 @@ PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/bf/c6/3c17b8 PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING +PYTHON_OPCUA_ASYNCIO_CPE_ID_VENDOR = freeopcua +PYTHON_OPCUA_ASYNCIO_CPE_ID_PRODUCT = opcua-asyncio $(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 21:53:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 22:53:23 +0100 Subject: [Buildroot] [git commit] package/python-pydantic: add CPE variables Message-ID: <20240206215536.7AE8587420@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3803513e87cb75795edfd3205337996ad971bb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:pydantic_project:pydantic is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/9B7C28E5-ACB1-4252-AE8F-4225C1AF739E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-pydantic/python-pydantic.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index 7ad7abeb8d..0cce5a153f 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -10,6 +10,8 @@ PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/aa/3f/56142232152 PYTHON_PYDANTIC_SETUP_TYPE = pep517 PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE +PYTHON_PYDANTIC_CPE_ID_VENDOR = pydantic_project +PYTHON_PYDANTIC_CPE_ID_PRODUCT = pydantic PYTHON_PYDANTIC_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-fancy-pypi-readme From fontaine.fabrice at gmail.com Tue Feb 6 22:07:25 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 6 Feb 2024 23:07:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lmdb: add CPE variables Message-ID: <20240206220725.910499-1-fontaine.fabrice@gmail.com> cpe:2.3:a:py-lmdb_project:py-lmdb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AFE6D0BA-D905-43F6-81FE-308D591A82B8 Signed-off-by: Fabrice Fontaine --- package/python-lmdb/python-lmdb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index 52617b6ed0..7906d388ae 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -9,6 +9,8 @@ PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/de/13/dd9b0c1924f0becc93e0bacd123a4e7a347966e3e74753ace3b1e85acc39 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE +PYTHON_LMDB_CPE_ID_VENDOR = py-lmdb_project +PYTHON_LMDB_CPE_ID_PRODUCT = py-lmdb PYTHON_LMDB_SETUP_TYPE = setuptools PYTHON_LMDB_DEPENDENCIES = host-python-cffi -- 2.43.0 From christian at aperture.us Tue Feb 6 22:17:22 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 14:17:22 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/go: bump version to go1.21.7 Message-ID: <20240206221722.33303-1-christian@aperture.us> go1.21.7 (released 2024-02-06) includes fixes to the compiler, the go command, the runtime, and the crypto/x509 package. https://go.dev/doc/devel/release#go1.21.7 Signed-off-by: Christian Stewart --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index bee10089a7..d008019e94 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248 go1.21.6.src.tar.gz +sha256 00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6 go1.21.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index f9d31aacac..9efd4a3123 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.6 +GO_VERSION = 1.21.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz -- 2.43.0 From peter at korsgaard.com Tue Feb 6 22:19:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 23:19:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-selenium: bump to version 4.16.0 In-Reply-To: <20240111055742.3023327-1-james.hilliard1@gmail.com> (James Hilliard's message of "Wed, 10 Jan 2024 22:57:42 -0700") References: <20240111055742.3023327-1-james.hilliard1@gmail.com> Message-ID: <87zfwd2q38.fsf@48ers.dk> >>>>> "James" == James Hilliard writes: > Signed-off-by: James Hilliard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 22:18:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 23:18:41 +0100 Subject: [Buildroot] [git commit] package/python-selenium: bump to version 4.16.0 Message-ID: <20240206221953.9DBEA87426@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=84fd8580aaaa346176e43df35823b78fd3fa686a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-selenium/python-selenium.hash | 4 ++-- package/python-selenium/python-selenium.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-selenium/python-selenium.hash b/package/python-selenium/python-selenium.hash index 03a9683a21..ef1c34bfd3 100644 --- a/package/python-selenium/python-selenium.hash +++ b/package/python-selenium/python-selenium.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/selenium/json -md5 02404033a10b2b29aa098f50503c0a1a selenium-4.9.1.tar.gz -sha256 3444f4376321530c36ce8355b6b357d8cf4a7d588ce5cf772183465930bbed0e selenium-4.9.1.tar.gz +md5 9afd7110a9e06721baae028ac42a2221 selenium-4.16.0.tar.gz +sha256 b2e987a445306151f7be0e6dfe2aa72a479c2ac6a91b9d5ef2d6dd4e49ad0435 selenium-4.16.0.tar.gz diff --git a/package/python-selenium/python-selenium.mk b/package/python-selenium/python-selenium.mk index d59a16a57d..0428cefa46 100644 --- a/package/python-selenium/python-selenium.mk +++ b/package/python-selenium/python-selenium.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SELENIUM_VERSION = 4.9.1 +PYTHON_SELENIUM_VERSION = 4.16.0 PYTHON_SELENIUM_SOURCE = selenium-$(PYTHON_SELENIUM_VERSION).tar.gz -PYTHON_SELENIUM_SITE = https://files.pythonhosted.org/packages/fd/e2/0e5bee6762a7bf7852b47a79c5b12f9e526e6962958dbb9719fa490ba24c +PYTHON_SELENIUM_SITE = https://files.pythonhosted.org/packages/16/fd/a0ef793383077dd6296e4637acc82d1e9893e9a49a47f56e96996909e427 PYTHON_SELENIUM_SETUP_TYPE = setuptools PYTHON_SELENIUM_LICENSE = Apache-2.0 From romain.naour at smile.fr Tue Feb 6 22:20:07 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 6 Feb 2024 23:20:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: References: <20240106101202.495801-1-fontaine.fabrice@gmail.com> <2be6d0df-6165-4da9-b69c-ad0deb5444be@smile.fr> Message-ID: Le 06/02/2024 ? 18:59, Fabrice Fontaine a ?crit?: > Hello Romain, > > Le mar. 6 f?vr. 2024 ? 18:32, Romain Naour a ?crit : >> >> Hello, >> >> Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit : >>> ncmpc is able to automatically detect NLS support since version 0.47 and >>> https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 >>> so let it handle automatically to avoid the following build failure with >>> a bootlin toolchain which embeds a gettext definition in libintl.h which >>> will clash with the fake gettext definition provided by ncmpc since >>> https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: >>> >>> In file included from ../src/save_playlist.cxx:8: >>> /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' >>> 39 | extern char *gettext (const char *__msgid) >>> | ^~~~~~~ >>> /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' >>> ../src/i18n.h:22:20: note: to match this '(' >>> 22 | #define gettext(x) (x) >>> | ^ >>> >>> Indeed, even if NLS is disabled by the user, libintl.h will be included >>> by >>> /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h >>> though include >> >> We usually want to explicitly handle such option from Buildroot package to not >> rely on automatic detection (as currently done). >> >> It look like more a bug in ncmpc build system? > > I don't know, upstream wants to have the same code with and without > NLS, so they decided to define a gettext macro when NLS is disabled. > I could find an upstreamable solution as upstream will probably reject > a patch that removes this gettext define and puts #ifdef ENABLE_NLS > before every gettext calls. > Do you have an upstreamable solution or should we just add a NLS > dependency to ncmpc? The problem here is that libintl.h header is present in the staging directory when a glibc based toolchain is used with or without NLS enabled. If ncmpc want to define gettext as a macro when NLS is disabled, its build system should at least do some check before defining gettext as a macro since the libintl.h header can be included indirectly. When libintl.h header provide gettext, it should be undef before adding the gettext macro. Something like this (untested): i18n.h: #ifdef HAVE_INTL #include #endif #ifdef ENABLE_NLS ... #else #undef gettext #define gettext(x) (x) ... #endif Best regards, Romain > >> >> Best regards, >> Romain >> >> >>> >>> Fixes: >>> - http://autobuild.buildroot.org/results/c860e64909dd3b7fa033db0970e1cfc1376c4ec5 >>> - http://autobuild.buildroot.org/results/36eab556fac80124755bff4110af3e43fe6edd78 >>> >>> Signed-off-by: Fabrice Fontaine >>> --- >>> package/ncmpc/ncmpc.mk | 3 +-- >>> 1 file changed, 1 insertion(+), 2 deletions(-) >>> >>> diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk >>> index bc8a62daea..0965981f23 100644 >>> --- a/package/ncmpc/ncmpc.mk >>> +++ b/package/ncmpc/ncmpc.mk >>> @@ -20,8 +20,7 @@ NCMPC_CPE_ID_VENDOR = ncmpc_project >>> >>> NCMPC_CONF_OPTS = \ >>> -Dcurses=ncurses \ >>> - -Ddocumentation=disabled \ >>> - $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) >>> + -Ddocumentation=disabled >>> >>> ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) >>> NCMPC_DEPENDENCIES += lirc-tools >> > > Best Regards, > > Fabrice From thomas.petazzoni at bootlin.com Tue Feb 6 22:21:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:21:22 +0100 Subject: [Buildroot] [git commit] package/python3: bump version to 3.12.1 Message-ID: <20240206222231.8950D87481@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=36e635d2d5c0166476858aa239ccbe78e8f2af14 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Python 3.12.1 has removed distutils support. As such, we remove the distutils option from pkg-python.mk as well. Tested on Fedora 39, and Debian 11. All 68 package tests pass. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 44 +++------ ...1-Make-the-build-of-pyc-files-conditional.patch | 32 +++--- ...gy_getaddrinfo-configure-test-when-cross-.patch | 8 +- ...ructure-to-disable-the-build-of-certain-e.patch | 108 --------------------- ...brary-header-paths-for-cross-compilation.patch} | 37 +++---- ...nd.patch => 0004-Serial-ioctl-workaround.patch} | 6 +- ...n-t-look-in-usr-lib-termcap-for-libraries.patch | 31 ------ ...config.sh.in-ensure-sed-invocations-only.patch} | 6 +- .../0006-Add-an-option-to-disable-pydoc.patch | 84 ++++++++++++++++ .../python3/0006-Don-t-add-multiarch-paths.patch | 37 ------- .../0007-Abort-on-failed-module-build.patch | 30 ------ ...=> 0007-Add-an-option-to-disable-lib2to3.patch} | 94 ++++++++---------- ...ch => 0008-Add-an-option-to-disable-IDLE.patch} | 63 ++++++------ ...st-the-shebang-of-Python-scripts-for-cros.patch | 35 ------- ...9-python-config.sh-don-t-reassign-prefix.patch} | 6 +- ...e.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch | 44 +++++++++ .../0011-Add-an-option-to-disable-pydoc.patch | 100 ------------------- ...Add-option-to-disable-the-sqlite3-module.patch} | 35 ++++--- ...12-Add-an-option-to-disable-the-tk-module.patch | 79 +++++++++++++++ ...d-an-option-to-disable-the-curses-module.patch} | 39 ++++---- ...h => 0014-Add-an-option-to-disable-expat.patch} | 59 +++++------ ...14-Add-an-option-to-disable-the-tk-module.patch | 77 --------------- ...0015-fix-building-on-older-distributions.patch} | 16 +-- ...-fixup-CC-print-multiarch-output-for-mus.patch} | 8 +- .../0017-Add-an-option-to-disable-CJK-codecs.patch | 30 ------ ...libc-ng-doesn-t-set-errno-when-encryptio.patch} | 6 +- .../0018-Add-an-option-to-disable-NIS.patch | 33 ------- ...0019-Add-an-option-to-disable-unicodedata.patch | 30 ------ .../0021-Add-an-option-to-disable-decimal.patch | 54 ----------- ...-option-to-disable-the-ossaudiodev-module.patch | 30 ------ ...-Add-an-option-to-disable-openssl-support.patch | 30 ------ ...-an-option-to-disable-the-readline-module.patch | 30 ------ ...ions-to-disable-zlib-bzip2-and-xz-modules.patch | 42 -------- ...0027-Add-an-option-to-disable-uuid-module.patch | 33 ------- ...n-option-to-disable-the-berkeleydb-module.patch | 30 ------ package/python3/python3.hash | 6 +- package/python3/python3.mk | 62 +++++++----- 37 files changed, 456 insertions(+), 1038 deletions(-) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Tue Feb 6 22:21:23 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:21:23 +0100 Subject: [Buildroot] [git commit] docs/manual: update documentation about support python _SETUP_TYPE Message-ID: <20240206222231.94FEB87482@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89e67a96383f1a0d8f44a9385637798f8c31ef3f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Note that we do not document the special flit-bootstrap value, as it is considered an internal implementation detail, and shouldn't normally be used by packages. Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.adoc | 4 ++-- docs/manual/adding-packages-python.adoc | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index e994b7e1f6..03249ca06f 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -429,8 +429,8 @@ different way, using different infrastructures: and xref:cmake-package-reference[reference]. * *Makefiles for Python modules*: We have a dedicated infrastructure - for Python modules that use the +flit+, +pep517+ or +setuptools+ - mechanisms. We cover them through a + for Python modules that use the +flit+, +pep517+, +setuptools+, + +setuptools-rust+ or +maturin+ mechanisms. We cover them through a xref:python-package-tutorial[tutorial] and a xref:python-package-reference[reference]. diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 44fd77fd1d..9953be6639 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -4,9 +4,9 @@ === Infrastructure for Python packages This infrastructure applies to Python packages that use the standard -Python setuptools or pep517 mechanisms as their build system, generally -recognizable by the usage of a +setup.py+ script or +pyproject.toml+ -file. +Python setuptools, pep517, flit or maturin mechanisms as their build +system, generally recognizable by the usage of a +setup.py+ script or ++pyproject.toml+ file. [[python-package-tutorial]] @@ -51,8 +51,9 @@ On line 13, we declare our dependencies, so that they are built before the build process of our package starts. On line 14, we declare the specific Python build system being used. In -this case the +setuptools+ Python build system is used. The three -supported ones are +flit+, +pep517+ and +setuptools+. +this case the +setuptools+ Python build system is used. The five +supported ones are +flit+, +pep517+, +setuptools+, +setuptools-rust+ +and +maturin+. Finally, on line 16, we invoke the +python-package+ macro that generates all the Makefile rules that actually allow the package to be @@ -98,13 +99,14 @@ Note that: One variable specific to the Python infrastructure is mandatory: * +PYTHON_FOO_SETUP_TYPE+, to define which Python build system is used - by the package. The three supported values are +flit+, +pep517+ and - +setuptools+. If you don't know which one is used in your package, - look at the +setup.py+ or +pyproject.toml+ file in your package - source code, and see whether it imports things from the +flit+ - module or the +setuptools+ module. If the package is using a - +pyproject.toml+ file without any build-system requires and with a - local in-tree backend-path one should use +pep517+. + by the package. The five supported values are +flit+, +pep517+ and + +setuptools+, +setuptools-rust+ and +maturin+. If you don't know + which one is used in your package, look at the +setup.py+ or + +pyproject.toml+ file in your package source code, and see whether + it imports things from the +flit+ module or the +setuptools+ + module. If the package is using a +pyproject.toml+ file without any + build-system requires and with a local in-tree backend-path one + should use +pep517+. A few additional variables, specific to the Python infrastructure, can optionally be defined, depending on the package's needs. Many of them From thomas.petazzoni at bootlin.com Tue Feb 6 22:21:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:21:21 +0100 Subject: [Buildroot] [git commit] package/pkg-python.mk: remove distutils support Message-ID: <20240206222231.74FDF87485@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09de823cbc7bd50a40e25f4166b4e42be94b0c7b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master All Python packages have been migrated to a different setup type, and we're about to bump to Python 3.12 which no longer supports distutils, so let's drop support for distutils in our python-package infrastructure. Signed-off-by: Adam Duskett [Thomas: also update the Buildroot manual] Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.adoc | 4 +-- docs/manual/adding-packages-python.adoc | 46 ++++++++++++++---------------- package/pkg-python.mk | 38 ++---------------------- 3 files changed, 26 insertions(+), 62 deletions(-) diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index 5a0f298eb1..e994b7e1f6 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -429,8 +429,8 @@ different way, using different infrastructures: and xref:cmake-package-reference[reference]. * *Makefiles for Python modules*: We have a dedicated infrastructure - for Python modules that use the +distutils+, +flit+, +pep517+ or - +setuptools+ mechanisms. We cover them through a + for Python modules that use the +flit+, +pep517+ or +setuptools+ + mechanisms. We cover them through a xref:python-package-tutorial[tutorial] and a xref:python-package-reference[reference]. diff --git a/docs/manual/adding-packages-python.adoc b/docs/manual/adding-packages-python.adoc index 33dbfc30a5..44fd77fd1d 100644 --- a/docs/manual/adding-packages-python.adoc +++ b/docs/manual/adding-packages-python.adoc @@ -29,7 +29,7 @@ with an example : 11: PYTHON_FOO_LICENSE_FILES = LICENSE 12: PYTHON_FOO_ENV = SOME_VAR=1 13: PYTHON_FOO_DEPENDENCIES = libmad -14: PYTHON_FOO_SETUP_TYPE = distutils +14: PYTHON_FOO_SETUP_TYPE = setuptools 15: 16: $(eval $(python-package)) ------------------------ @@ -51,8 +51,8 @@ On line 13, we declare our dependencies, so that they are built before the build process of our package starts. On line 14, we declare the specific Python build system being used. In -this case the +distutils+ Python build system is used. The four -supported ones are +distutils+, +flit+, +pep517+ and +setuptools+. +this case the +setuptools+ Python build system is used. The three +supported ones are +flit+, +pep517+ and +setuptools+. Finally, on line 16, we invoke the +python-package+ macro that generates all the Makefile rules that actually allow the package to be @@ -98,13 +98,13 @@ Note that: One variable specific to the Python infrastructure is mandatory: * +PYTHON_FOO_SETUP_TYPE+, to define which Python build system is used - by the package. The four supported values are +distutils+, +flit+, - +pep517+ and +setuptools+. If you don't know which one is used in - your package, look at the +setup.py+ or +pyproject.toml+ file in your - package source code, and see whether it imports things from the - +distutils+, +flit+ module or the +setuptools+ module. If the package - is using a +pyproject.toml+ file without any build-system requires - and with a local in-tree backend-path one should use +pep517+. + by the package. The three supported values are +flit+, +pep517+ and + +setuptools+. If you don't know which one is used in your package, + look at the +setup.py+ or +pyproject.toml+ file in your package + source code, and see whether it imports things from the +flit+ + module or the +setuptools+ module. If the package is using a + +pyproject.toml+ file without any build-system requires and with a + local in-tree backend-path one should use +pep517+. A few additional variables, specific to the Python infrastructure, can optionally be defined, depending on the package's needs. Many of them @@ -119,27 +119,25 @@ therefore only use a few of them, or none. +PYTHON_FOO_SUBDIR+. * +PYTHON_FOO_ENV+, to specify additional environment variables to - pass to the Python +setup.py+ script (for distutils/setuptools - packages) or the +support/scripts/pyinstaller.py+ script (for - flit/pep517 packages) for both the build and install steps. Note - that the infrastructure is automatically passing several standard - variables, defined in +PKG_PYTHON_DISTUTILS_ENV+ (for distutils - target packages), +HOST_PKG_PYTHON_DISTUTILS_ENV+ (for distutils - host packages), +PKG_PYTHON_SETUPTOOLS_ENV+ (for setuptools target + pass to the Python +setup.py+ script (for setuptools packages) or + the +support/scripts/pyinstaller.py+ script (for flit/pep517 + packages) for both the build and install steps. Note that the + infrastructure is automatically passing several standard variables, + defined in +PKG_PYTHON_SETUPTOOLS_ENV+ (for setuptools target packages), +HOST_PKG_PYTHON_SETUPTOOLS_ENV+ (for setuptools host packages), +PKG_PYTHON_PEP517_ENV+ (for flit/pep517 target packages) and +HOST_PKG_PYTHON_PEP517_ENV+ (for flit/pep517 host packages). -* +PYTHON_FOO_BUILD_OPTS+, to specify additional options to pass to the - Python +setup.py+ script during the build step, this generally only - makes sense to use for distutils/setuptools based packages as - flit/pep517 based packages do not pass these options to a +setup.py+ - script but instead pass them to +support/scripts/pyinstaller.py+. +* +PYTHON_FOO_BUILD_OPTS+, to specify additional options to pass to + the Python +setup.py+ script during the build step, this generally + only makes sense to use for setuptools based packages as flit/pep517 + based packages do not pass these options to a +setup.py+ script but + instead pass them to +support/scripts/pyinstaller.py+. * +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+, +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass - to the Python +setup.py+ script (for distutils/setuptools packages) - or +support/scripts/pyinstaller.py+ (for flit/pep517 packages) during + to the Python +setup.py+ script (for setuptools packages) or + +support/scripts/pyinstaller.py+ (for flit/pep517 packages) during the target installation step, the staging installation step or the host installation, respectively. diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 4bed5a1835..94f28ff841 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -52,40 +52,6 @@ HOST_PKG_PYTHON_ENV = \ PYTHONNOUSERSITE=1 \ $(HOST_CONFIGURE_OPTS) -# Target distutils-based packages -PKG_PYTHON_DISTUTILS_ENV = \ - $(PKG_PYTHON_ENV) \ - LDSHARED="$(TARGET_CROSS)gcc -shared" - -PKG_PYTHON_DISTUTILS_BUILD_CMD = \ - setup.py build \ - --executable=/usr/bin/python - -PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ - --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr - -PKG_PYTHON_DISTUTILS_INSTALL_TARGET_CMD = \ - setup.py install --no-compile \ - $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ - --root=$(TARGET_DIR) - -PKG_PYTHON_DISTUTILS_INSTALL_STAGING_CMD = \ - setup.py install \ - $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ - --root=$(STAGING_DIR) - -# Host distutils-based packages -HOST_PKG_PYTHON_DISTUTILS_ENV = \ - $(HOST_PKG_PYTHON_ENV) - -HOST_PKG_PYTHON_DISTUTILS_BUILD_CMD = \ - setup.py build \ - -HOST_PKG_PYTHON_DISTUTILS_INSTALL_CMD = \ - setup.py install \ - --prefix=$(HOST_DIR) - # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ $(PKG_PYTHON_ENV) @@ -287,8 +253,8 @@ endif $(2)_SETUP_TYPE_UPPER = $$(call UPPERCASE,$$($(2)_SETUP_TYPE)) -ifneq ($$(filter-out distutils setuptools setuptools-rust pep517 flit flit-bootstrap maturin,$$($(2)_SETUP_TYPE)),) -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'maturin', 'setuptools', 'setuptools-rust', 'pep517' or 'flit'.") +ifneq ($$(filter-out setuptools setuptools-rust pep517 flit flit-bootstrap maturin,$$($(2)_SETUP_TYPE)),) +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'maturin', 'setuptools', 'setuptools-rust', 'pep517' or 'flit'.") endif ifeq ($(4)-$$($(2)_SETUP_TYPE),target-flit-bootstrap) $$(error flit-bootstrap setup type only supported for host packages) From thomas.petazzoni at bootlin.com Tue Feb 6 22:21:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:21:20 +0100 Subject: [Buildroot] [git commit] package/python-crossbar: drop package Message-ID: <20240206222231.6834B87482@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dcf0c3612dff3445d2de5862d34246ab18a43b8d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The current package has not recieved an update since Sat Oct 9 2021 33ece2446e25e20929d1c7eefa9f3244a3b79a92 and is not python 3.12 compatible. Furthermore, the current version requires at least 42 new packages worth of depedencies of which several require patches to be python 3.12 compatible. As nobody has stepped up to maintain the package and its ever-growing list of dependencies, along with the other problems, it is time to drop the package. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 3 - Config.in.legacy | 16 +++++ DEVELOPERS | 1 - package/Config.in | 1 - .../0001-Avoid-intentional-syntax-error.patch | 29 --------- ...ements-min.txt-drop-indirect-dependencies.patch | 74 ---------------------- ...bservice-wap-use-markupsafe-instead-of-we.patch | 53 ---------------- package/python-crossbar/Config.in | 72 --------------------- package/python-crossbar/python-crossbar.hash | 5 -- package/python-crossbar/python-crossbar.mk | 14 ---- .../tests/package/sample_python_crossbar.py | 3 - .../testing/tests/package/test_python_crossbar.py | 23 ------- 12 files changed, 16 insertions(+), 278 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 1f85ff2e07..bda57f46b0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1064,9 +1064,6 @@ package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch package/pulseview/0003-Support-glibmm-2.68.patch Upstream package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch Upstream package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch Upstream -package/python-crossbar/0001-Avoid-intentional-syntax-error.patch Upstream -package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch Upstream -package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch Upstream package/python-daphne/0001-remove-pytest-runner-requirement.patch Upstream package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch Upstream package/python-pylibftdi/0001-do-not-use-find-library.patch Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 208f8347c4..5fbe5d9030 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,22 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_PYTHON_CROSSBAR + bool "python-crossbar removed" + select BR2_LEGACY + help + python-crossbar has been removed. The current package has + not received an update since Sat Oct 9 13:55:06 2021 commit: + 33ece2446e25e20929d1c7eefa9f3244a3b79a92 and is not python + 3.12.0 compatible. + + Furthermore, the current version requires at least 42 new + packages worth of depedencies of which several require + patches to be python 3.12.0 compatible. As nobody has + stepped up to maintain the package and its ever-growing list + of dependencies, along with the other problems, it was time + to drop the package. + config BR2_PACKAGE_PYTHON_PYGAME bool "python-pygame removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index cf98d56aa1..3e0b2e5c9c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2155,7 +2155,6 @@ F: package/python-autobahn/ F: package/python-cbor/ F: package/python-characteristic/ F: package/python-click/ -F: package/python-crossbar/ F: package/python-lmdb/ F: package/python-mistune/ F: package/python-netaddr/ diff --git a/package/Config.in b/package/Config.in index e10fbd8b35..047877c960 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1047,7 +1047,6 @@ menu "External python modules" source "package/python-crc16/Config.in" source "package/python-crcmod/Config.in" source "package/python-crontab/Config.in" - source "package/python-crossbar/Config.in" source "package/python-cryptography/Config.in" source "package/python-cssselect/Config.in" source "package/python-cssselect2/Config.in" diff --git a/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch b/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch deleted file mode 100644 index 0ff7cae21a..0000000000 --- a/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 423a1b081f6b7198f6a921ca83043270ebbace1a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 1 May 2016 15:35:32 +0200 -Subject: [PATCH] Avoid intentional syntax error - -This file has an intentional syntax error, meant to validate QA, but -it breaks byte compilation of this package. - -Issue reported upstream: -https://github.com/crossbario/crossbar/issues/750. - -Signed-off-by: Thomas Petazzoni ---- - crossbar/worker/test/examples/syntaxerror.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/crossbar/worker/test/examples/syntaxerror.py b/crossbar/worker/test/examples/syntaxerror.py -index 7b88e088..cd7de901 100644 ---- a/crossbar/worker/test/examples/syntaxerror.py -+++ b/crossbar/worker/test/examples/syntaxerror.py -@@ -27,5 +27,3 @@ - # with this program. If not, see . - # - ##################################################################################### -- --class # noqa --- -2.20.1 - diff --git a/package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch b/package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch deleted file mode 100644 index 12027d779c..0000000000 --- a/package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3ae2b36e48fc0f75f0bb6c89f893ece033bccd87 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Aug 2022 18:44:29 +0200 -Subject: [PATCH] requirements-min.txt: drop indirect dependencies - -For some interesting reason, the crossbar maintainers have decided to -include indirect dependencies in their requirements-min.txt, i.e -dependencies that they don't use directly, but that packages they -depend on themselves depend on. - -This makes the packaging in Buildroot confusing, as it means not all -dependencies in requirements-min.txt should be taken into -account. Also some of these indirect dependencies cause issues due to -upper bounds set on the version (which is the case for idna and -urllib3). - -This patch therefore clarifies the situation by removing such indirect -dependencies from requirements-min.txt. As the patch is obviously not -upstreamable, it will require some maintenance effort, but that effort -is anyway already there to sort out direct dependencies from indirect -dependencies when updating the Buildroot packaging for crossbar. - -Signed-off-by: Thomas Petazzoni ---- - requirements-min.txt | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/requirements-min.txt b/requirements-min.txt -index 5ac4e0ee..cdd82d27 100644 ---- a/requirements-min.txt -+++ b/requirements-min.txt -@@ -1,20 +1,13 @@ --attrs>=17.2.0 - autobahn[asyncio,twisted,encryption,compress,serialization,scram]>=21.3.1 - bitstring>=3.1.5 --bcrypt>=3.1.6 - cbor>=1.0.0 - click>=6.7 - colorama>=0.4.4 --constantly>=15.1.0 - cryptography>=2.6.1 --h2>=3.2.0 --idna<2.6,>=2.5 - importlib-resources>=4.1.1 --incremental>=17.5.0 - jinja2>=2.10.1 - lmdb>=0.92 - mistune>=0.7.4 --netaddr>=0.7.19 - passlib>=1.7.1 - priority>=1.3.0 - psutil>=5.2.2 -@@ -28,7 +21,6 @@ pyqrcode>=1.2.1 - pytrie>=0.3 - pyyaml>=4.2b4 - sdnotify>=0.3.1 --service_identity>=17.0.0 - setproctitle>=1.1.10 - setuptools>=36.2.7 - treq>=20.4.1 -@@ -37,10 +29,6 @@ twisted[tls,conch,http2,osx_platform]>=20.3.0; sys_platform == 'darwin' - twisted[tls,conch,http2,windows_platform]>=20.3.0; sys_platform == 'win32' - txaio>=21.2.1 - txtorcon>=20.0.0 --u-msgpack-python>=2.4.1 --# urllib3 is an indirect dependency, but we force a recent version because of https://nvd.nist.gov/vuln/detail/CVE-2019-11324 --# workaround for version conflict in requests vs sth else: --urllib3<1.25,>=1.21.1 - vmprof>=0.4.12; platform_machine=='x86_64' or platform_machine=='i386' or platform_machine=='arm' - watchdog>=0.8.3 - werkzeug>=0.14.1 --- -2.37.1 - diff --git a/package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch b/package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch deleted file mode 100644 index ab2d4709bd..0000000000 --- a/package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a6866509b0387ab6d6f99f68cd82bcac922fe839 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 30 May 2022 19:38:11 +0200 -Subject: [PATCH] crossbar/webservice/wap: use markupsafe instead of werkzeug - -wap.py use escape from werkzeug but it has been removed since -the version 2.1.0 [1]. - -Replace with escape from markupsafe like upstream commit [2] -(wihout other changes). - -[1] https://github.com/pallets/werkzeug/commit/22d1e9ac13829b83347107a9b4d77072a8e1af6a -[2] https://github.com/crossbario/crossbar/commit/ca8d383f01231e2b3f986e791f215f12f2deee5d - -Signed-off-by: Romain Naour ---- - crossbar/webservice/wap.py | 7 ++++++- - requirements-min.txt | 1 + - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/crossbar/webservice/wap.py b/crossbar/webservice/wap.py -index 825558b1..6daa9b21 100644 ---- a/crossbar/webservice/wap.py -+++ b/crossbar/webservice/wap.py -@@ -36,7 +36,12 @@ from collections.abc import Mapping, Sequence - - from werkzeug.routing import Map, Rule - from werkzeug.exceptions import NotFound, MethodNotAllowed --from werkzeug.utils import escape -+ -+try: -+ # removed in werkzeug 2.1.0 -+ from werkzeug.utils import escape -+except ImportError: -+ from markupsafe import escape - - from jinja2 import Environment, FileSystemLoader - from jinja2.sandbox import SandboxedEnvironment -diff --git a/requirements-min.txt b/requirements-min.txt -index cdd82d27..50cb1489 100644 ---- a/requirements-min.txt -+++ b/requirements-min.txt -@@ -7,6 +7,7 @@ cryptography>=2.6.1 - importlib-resources>=4.1.1 - jinja2>=2.10.1 - lmdb>=0.92 -+MarkupSafe>=1.1.1 - mistune>=0.7.4 - passlib>=1.7.1 - priority>=1.3.0 --- -2.37.1 - diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in deleted file mode 100644 index 357be4803c..0000000000 --- a/package/python-crossbar/Config.in +++ /dev/null @@ -1,72 +0,0 @@ -config BR2_PACKAGE_PYTHON_CROSSBAR - bool "python-crossbar" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography - depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy - depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy - depends on BR2_INSTALL_LIBSTDCPP # python-autobahn's compress and serialization - # All the following dependencies are runtime dependencies. It - # matches almost 1:1 the requirements-min.txt from crossbar - # with the following exceptions: - # - importlib-resources is in Python itself, so no external - # module is needed - # - vmprof, while listed as a needed dependency, isn't - # actually strictly necesary - # - wsaccel is not a direct dependency, it is there to make - # sure autobahn has the 'accelerate' feature, when the - # Python implementation is CPython, and our package does - # enable autobahn[accelerate] - select BR2_PACKAGE_PYTHON_AUTOBAHN - select BR2_PACKAGE_PYTHON_AUTOBAHN_ACCELERATE - select BR2_PACKAGE_PYTHON_AUTOBAHN_COMPRESS - select BR2_PACKAGE_PYTHON_AUTOBAHN_ENCRYPTION - select BR2_PACKAGE_PYTHON_AUTOBAHN_SCRAM - select BR2_PACKAGE_PYTHON_AUTOBAHN_SERIALIZATION - select BR2_PACKAGE_PYTHON_AUTOBAHN_TWISTED - select BR2_PACKAGE_PYTHON_BITSTRING - select BR2_PACKAGE_PYTHON_CBOR - select BR2_PACKAGE_PYTHON_CLICK - select BR2_PACKAGE_PYTHON_COLORAMA - select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY - select BR2_PACKAGE_PYTHON_JINJA2 - select BR2_PACKAGE_PYTHON_LMDB - select BR2_PACKAGE_PYTHON_MARKUPSAFE - select BR2_PACKAGE_PYTHON_MISTUNE - select BR2_PACKAGE_PYTHON_PASSLIB - select BR2_PACKAGE_PYTHON_PRIORITY - select BR2_PACKAGE_PYTHON_PSUTIL - select BR2_PACKAGE_PYTHON_PYASN1 - select BR2_PACKAGE_PYTHON_PYASN1_MODULES - select BR2_PACKAGE_PYTHON_PYGMENTS - select BR2_PACKAGE_PYTHON_PYNACL - select BR2_PACKAGE_PYTHON_PYOPENSSL - select BR2_PACKAGE_PYTHON_PYQRCODE - select BR2_PACKAGE_PYTHON_PYTRIE - select BR2_PACKAGE_PYTHON_PYYAML - select BR2_PACKAGE_PYTHON_SDNOTIFY - select BR2_PACKAGE_PYTHON_SETPROCTITLE - select BR2_PACKAGE_PYTHON_SETUPTOOLS - select BR2_PACKAGE_PYTHON_TREQ - select BR2_PACKAGE_PYTHON_TWISTED - select BR2_PACKAGE_PYTHON_TWISTED_CONCH - select BR2_PACKAGE_PYTHON_TWISTED_HTTP2 - select BR2_PACKAGE_PYTHON_TWISTED_TLS - select BR2_PACKAGE_PYTHON_TXAIO - select BR2_PACKAGE_PYTHON_TXTORCON - select BR2_PACKAGE_PYTHON_UBJSON - select BR2_PACKAGE_PYTHON_WATCHDOG - select BR2_PACKAGE_PYTHON_WERKZEUG - select BR2_PACKAGE_PYTHON_ZLMDB - select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE - help - Crossbar.io is an open-source WAMP application router that - allows to build advanced applications from loosely-coupled - components that can talk in real-time with each other. - - https://pypi.python.org/pypi/crossbar - -comment "python-crossbar needs a glibc or musl toolchain w/ C++, gcc >= 9" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 diff --git a/package/python-crossbar/python-crossbar.hash b/package/python-crossbar/python-crossbar.hash deleted file mode 100644 index 4441578a29..0000000000 --- a/package/python-crossbar/python-crossbar.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/crossbar/json -md5 df576100bcf6e423cdc1e2e96b602140 crossbar-21.3.1.tar.gz -sha256 ac71959f0c57ab08d43f7830b85c6312e000b25543a179cd751ac357944dd7ef crossbar-21.3.1.tar.gz -# Locally computed -sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 crossbar/LICENSE diff --git a/package/python-crossbar/python-crossbar.mk b/package/python-crossbar/python-crossbar.mk deleted file mode 100644 index aae61cd2e8..0000000000 --- a/package/python-crossbar/python-crossbar.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-crossbar -# -################################################################################ - -PYTHON_CROSSBAR_VERSION = 21.3.1 -PYTHON_CROSSBAR_SOURCE = crossbar-$(PYTHON_CROSSBAR_VERSION).tar.gz -PYTHON_CROSSBAR_SITE = https://files.pythonhosted.org/packages/17/37/aafc4ec30068fd7ebb97f1a00d4ddf8de482dfa4c1d2a1fc6bb814d91400 -PYTHON_CROSSBAR_LICENSE = AGPL-3.0 -PYTHON_CROSSBAR_LICENSE_FILES = crossbar/LICENSE -PYTHON_CROSSBAR_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_crossbar.py b/support/testing/tests/package/sample_python_crossbar.py deleted file mode 100644 index 3695fe92c0..0000000000 --- a/support/testing/tests/package/sample_python_crossbar.py +++ /dev/null @@ -1,3 +0,0 @@ -import crossbar - -crossbar.run(["version"]) diff --git a/support/testing/tests/package/test_python_crossbar.py b/support/testing/tests/package/test_python_crossbar.py deleted file mode 100644 index e67ab9ff6e..0000000000 --- a/support/testing/tests/package/test_python_crossbar.py +++ /dev/null @@ -1,23 +0,0 @@ -from tests.package.test_python import TestPythonPackageBase -import os - - -class TestPythonPy3Crossbar(TestPythonPackageBase): - __test__ = True - config = TestPythonPackageBase.config + \ - """ - BR2_PACKAGE_PYTHON3=y - BR2_PACKAGE_PYTHON_CROSSBAR=y - BR2_TARGET_ROOTFS_EXT2=y - BR2_TARGET_ROOTFS_EXT2_SIZE="120M" - """ - sample_scripts = ["tests/package/sample_python_crossbar.py"] - timeout = 60 - - def login(self): - ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") - self.emulator.boot(arch="armv5", - kernel="builtin", - options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], - kernel_cmdline=["rootwait", "root=/dev/sda"]) - self.emulator.login() From thomas.petazzoni at bootlin.com Tue Feb 6 22:21:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:21:19 +0100 Subject: [Buildroot] [git commit] package/python-pygame: drop package Message-ID: <20240206222231.55E6B87481@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd8b5d18507b9e01075fa6f90b981e79b400e3f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The python-pygame package has not recieved any update since Sun May 1 22:15:17 2016 (commit: a9ec96e545102ae5ccd4280323d35360b0a5072d) Also, this package no longer builds properly against python 3.12.0. Receiving the following error when building: ``` src/surface.c:2812:14: error: invalid type argument of unary ???*??? (have ???int???) 2812 | ch = *PyUnicode_AS_UNICODE (obj); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ src/surface.c: In function ???PySurface_Blit???: ``` If someone wants to re-introduce this package at a later date they are more than welcome to do so! Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 ++ DEVELOPERS | 1 - package/Config.in | 1 - package/python-pygame/Config.in | 50 -------------- package/python-pygame/python-pygame.hash | 3 - package/python-pygame/python-pygame.mk | 111 ------------------------------- 6 files changed, 7 insertions(+), 166 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 9421d07aa1..208f8347c4 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_PYTHON_PYGAME + bool "python-pygame removed" + select BR2_LEGACY + help + python-pygame has been removed due to being abandoned and + the old version no longer building with python 3.12.0. + config BR2_KERNEL_HEADERS_4_14 bool "kernel headers version 4.14.x are no longer supported" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 376a1662d9..cf98d56aa1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1704,7 +1704,6 @@ F: package/libcddb/ F: package/libmodbus/ F: package/ltris/ F: package/opentyrian/ -F: package/python-pygame/ N: Julien Corjon F: package/qt5/ diff --git a/package/Config.in b/package/Config.in index b48f9eb1c7..e10fbd8b35 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1259,7 +1259,6 @@ menu "External python modules" source "package/python-pydyf/Config.in" source "package/python-pyelftools/Config.in" source "package/python-pyftpdlib/Config.in" - source "package/python-pygame/Config.in" source "package/python-pygments/Config.in" source "package/python-pyhamcrest/Config.in" source "package/python-pyicu/Config.in" diff --git a/package/python-pygame/Config.in b/package/python-pygame/Config.in deleted file mode 100644 index 57eb020742..0000000000 --- a/package/python-pygame/Config.in +++ /dev/null @@ -1,50 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYGAME - bool "python-pygame" - select BR2_PACKAGE_SDL - help - Pygame is a cross-platfrom library designed to make it easy - to write multimedia software, such as games, in - Python. Pygame requires the Python language and SDL - multimedia library. - It can also make use of several other popular libraries. - - http://www.pygame.org/ - -if BR2_PACKAGE_PYTHON_PYGAME -config BR2_PACKAGE_PYTHON_PYGAME_IMAGE - bool "pygame.image" - select BR2_PACKAGE_SDL_IMAGE - select BR2_PACKAGE_SDL_IMAGE_PNG - select BR2_PACKAGE_SDL_IMAGE_JPEG - help - pygame module for loading, saving and transfering images. - Will autoselect sdl_image with png and jpeg support. - -config BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES - bool "pygame.examples" - help - Include examples. - Selecting this option adds about 1.5 MB to the target file - system. - -config BR2_PACKAGE_PYTHON_PYGAME_FONT - bool "pygame.font" - select BR2_PACKAGE_SDL_TTF - help - pygame module for loading and rendering fonts. - Will autoselect sdl_ttf. - -config BR2_PACKAGE_PYTHON_PYGAME_MIXER - bool "pygame.mixer" - select BR2_PACKAGE_SDL_MIXER - help - pygame module for loading and playing sounds. - Will autoselect sdl_mixer. - -config BR2_PACKAGE_PYTHON_PYGAME_SCRAP - bool "pygame.scrap" - depends on BR2_PACKAGE_SDL_X11 - help - pygame module for clipboard support (X11 needed) - -endif diff --git a/package/python-pygame/python-pygame.hash b/package/python-pygame/python-pygame.hash deleted file mode 100644 index c0496515e2..0000000000 --- a/package/python-pygame/python-pygame.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 f95a7dd68ea294d415e36e068d2f533c5a01c67773452d14a535c5c7455681fe pygame-d61ea8eabd56.tar.gz -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 LGPL diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk deleted file mode 100644 index 84fd6df4e2..0000000000 --- a/package/python-pygame/python-pygame.mk +++ /dev/null @@ -1,111 +0,0 @@ -################################################################################ -# -# python-pygame -# -################################################################################ - -# stable 1.9.1 release requires V4L which has been wiped out of recent Linux -# kernels, so use latest mercurial revision until next stable release is out. -PYTHON_PYGAME_VERSION = d61ea8eabd56 -PYTHON_PYGAME_SOURCE = pygame-$(PYTHON_PYGAME_VERSION).tar.gz -PYTHON_PYGAME_SITE = https://bitbucket.org/pygame/pygame -PYTHON_PYGAME_SITE_METHOD = hg -PYTHON_PYGAME_SETUP_TYPE = setuptools -PYTHON_PYGAME_LICENSE = LGPL-2.1+ -PYTHON_PYGAME_LICENSE_FILES = LGPL - -ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y) -PYTHON_PYGAME_OPT_DEPENDS += sdl_image -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y) -PYTHON_PYGAME_OPT_DEPENDS += sdl_ttf -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y) -PYTHON_PYGAME_OPT_DEPENDS += sdl_mixer -endif - -PYTHON_PYGAME_DEPENDENCIES = sdl $(PYTHON_PYGAME_OPT_DEPENDS) - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y) -define PYTHON_PYGAME_UNCONFIGURE_IMAGE - $(SED) 's/^imageext/#imageext/' $(@D)/Setup -endef -endif - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y) -define PYTHON_PYGAME_UNCONFIGURE_FONT - $(SED) 's/^font/#font/' $(@D)/Setup -endef -endif - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y) -define PYTHON_PYGAME_UNCONFIGURE_MIXER - $(SED) 's/^mixer/#mixer/g' $(@D)/Setup -endef -endif - -# Both require numpy or numeric python module -define PYTHON_PYGAME_UNCONFIGURE_SNDARRAY - $(SED) 's/^_numericsndarray/#_numericsndarray/' $(@D)/Setup -endef - -define PYTHON_PYGAME_UNCONFIGURE_SURFARRAY - $(SED) 's/^_numericsurfarray/#_numericsurfarray/' $(@D)/Setup -endef - -# Requires smpeg -define PYTHON_PYGAME_UNCONFIGURE_MOVIE - $(SED) 's/^movie/#movie/' $(@D)/Setup -endef - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_SCRAP),y) -define PYTHON_PYGAME_UNCONFIGURE_SCRAP - $(SED) 's/^scrap/#scrap/' $(@D)/Setup -endef -endif - -define PYTHON_PYGAME_UNCONFIGURE_FREETYPE - $(SED) 's/^_freetype/#_freetype/' $(@D)/Setup -endef - -PYTHON_PYGAME_SDL_FLAGS = `$(STAGING_DIR)/usr/bin/sdl-config --cflags` -PYTHON_PYGAME_SDL_FLAGS += `$(STAGING_DIR)/usr/bin/sdl-config --libs` - -# Pygame needs a Setup file where options should be commented out if -# dependencies are not available -define PYTHON_PYGAME_CONFIGURE_CMDS - cp -f $(@D)/Setup.in $(@D)/Setup - $(SED) "s~^SDL = ~SDL = $(PYTHON_PYGAME_SDL_FLAGS) \n#~" $(@D)/Setup - $(SED) 's/^pypm/#pypm/' $(@D)/Setup - $(PYTHON_PYGAME_UNCONFIGURE_IMAGE) - $(PYTHON_PYGAME_UNCONFIGURE_FONT) - $(PYTHON_PYGAME_UNCONFIGURE_MIXER) - $(PYTHON_PYGAME_UNCONFIGURE_SNDARRAY) - $(PYTHON_PYGAME_UNCONFIGURE_SURFARRAY) - $(PYTHON_PYGAME_UNCONFIGURE_MOVIE) - $(PYTHON_PYGAME_UNCONFIGURE_SCRAP) - $(PYTHON_PYGAME_UNCONFIGURE_FREETYPE) -endef - -define PYTHON_PYGAME_REMOVE_DOC - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs -endef - -PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_DOC - -define PYTHON_PYGAME_REMOVE_TESTS - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests -endef - -PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES),y) -define PYTHON_PYGAME_REMOVE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pygame/examples -endef -PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_EXAMPLES -endif - -$(eval $(python-package)) From peter at korsgaard.com Tue Feb 6 22:25:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 23:25:55 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add libcamera runtime test In-Reply-To: <20240204191922.366955-1-ju.o@free.fr> (Julien Olivain's message of "Sun, 4 Feb 2024 20:19:22 +0100") References: <20240204191922.366955-1-ju.o@free.fr> Message-ID: <87v8712psc.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 22:26:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 23:26:02 +0100 Subject: [Buildroot] [git commit] support/testing: add libcamera runtime test Message-ID: <20240206222624.6E52587494@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22f9ce63a30200696dbcbe6ae3a6cc417f007979 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_libcamera.py | 79 ++++++++++++++++++++++ .../package/test_libcamera/linux-vimc.fragment | 4 ++ 3 files changed, 85 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3e0b2e5c9c..fc47c51d33 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1797,6 +1797,8 @@ F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_kmscube.py F: support/testing/tests/package/test_kmscube/ F: support/testing/tests/package/test_less.py +F: support/testing/tests/package/test_libcamera.py +F: support/testing/tests/package/test_libcamera/ F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py diff --git a/support/testing/tests/package/test_libcamera.py b/support/testing/tests/package/test_libcamera.py new file mode 100644 index 0000000000..8953021b82 --- /dev/null +++ b/support/testing/tests/package/test_libcamera.py @@ -0,0 +1,79 @@ +import os + +import infra.basetest + + +class TestLibCamera(infra.basetest.BRTest): + # A specific configuration is needed for testing libcamera: + # a kernel config fragment enables v4l2 vimc driver. + # The libevent package is also enabled to have the libcamera "cam" + # test application. + kernel_fragment = \ + infra.filepath("tests/package/test_libcamera/linux-vimc.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.76" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_LIBCAMERA=y + BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC=y + BR2_PACKAGE_LIBEVENT=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # The Kernel config of this test has only one v4l2 vimc + # driver. The camera index is expected to be #1. + cam_idx = 1 + + # We test libcamera with its simple "cam" application, by + # requesting a list of available cameras. + cmd = "cam --list" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + # libcamera generates info messages. We filter only the + # line(s) starting with our camera index. + cam_line = [ln for ln in out if ln.startswith(f"{cam_idx}:")] + # We should have the vimc camera in this line. + self.assertIn("platform/vimc.0", cam_line[0]) + + # List the camera information. + cmd = f"cam --camera {cam_idx} --info" + self.assertRunOk(cmd) + + # List the camera controls and check we have a brightness + # control. + cmd = f"cam --camera {cam_idx} --list-controls" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn("Control: Brightness:", "\n".join(out)) + + # List the camera properties and check we have a camera + # "Model" property. + cmd = f"cam --camera {cam_idx} --list-properties" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn("Property: Model = ", "\n".join(out)) + + # Capture few frames. + cmd = f"cam --camera {cam_idx} --capture=5" + cmd += " --stream width=160,height=120,role=video,pixelformat=RGB888" + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_libcamera/linux-vimc.fragment b/support/testing/tests/package/test_libcamera/linux-vimc.fragment new file mode 100644 index 0000000000..04436e7518 --- /dev/null +++ b/support/testing/tests/package/test_libcamera/linux-vimc.fragment @@ -0,0 +1,4 @@ +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_TEST_SUPPORT=y +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIMC=y From peter at korsgaard.com Tue Feb 6 22:30:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 23:30:35 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/go: bump version to go1.21.7 In-Reply-To: <20240206221722.33303-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 14:17:22 -0800") References: <20240206221722.33303-1-christian@aperture.us> Message-ID: <87r0hp2pkk.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > go1.21.7 (released 2024-02-06) includes fixes to the compiler, the go command, > the runtime, and the crypto/x509 package. > https://go.dev/doc/devel/release#go1.21.7 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From buildroot at bubu1.eu Tue Feb 6 22:31:01 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 6 Feb 2024 23:31:01 +0100 Subject: [Buildroot] [PATCH v6 5/5] package/pkg-python.mk: migrate setuptools to pep517 In-Reply-To: <20231126180840.2081945-5-james.hilliard1@gmail.com> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-5-james.hilliard1@gmail.com> Message-ID: <6049c19d-3ba6-4991-b47f-72b5d46c1e91@bubu1.eu> Hi James, all On 26.11.23 19:08, James Hilliard wrote: > Now that setuptools and its dependencies are using pep517 we can > migrate the setuptools infrastructure itself to use the pep517 > build frontend. > > As part of this we need to migrate the all python packages using > _BUILD_OPTS to the new config settings format used by the pep517 > build frontend. > > Use new setup type variables to define setup type specific > dependencies instead of using the conditional block. > > Signed-off-by: James Hilliard > Reviewed-by: Yegor Yefremov I tested this with all python packages we use in our project and except for uvloop (see below) it all went well. The patch looks sensible to me as well. Reviewed-by: Marcus Hoffmann Tested-by: Marcus Hoffmann > --- > Changes v5 -> v6: > - use setup type variables for dependencies > Changes v4 -> v5: > - rebase on next > Changes v1 -> v3: > - rebase on master > - combine setuptools-rust and maturin env variables > - drop patch which is now upstream > --- > package/pkg-python.mk | 160 ++++++++++----------- > package/python-evdev/python-evdev.mk | 4 +- > package/python-lxml/python-lxml.mk | 8 +- > package/python-m2crypto/python-m2crypto.mk | 4 +- > package/python-pillow/python-pillow.mk | 35 +++-- > package/python-psycopg2/python-psycopg2.mk | 5 +- > package/python-pyzmq/python-pyzmq.mk | 4 +- This parts needs a rebase. > package/python-uvloop/python-uvloop.mk | 6 +- > 8 files changed, 113 insertions(+), 113 deletions(-) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index bda79116c8..cb9f6ab5e6 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -86,15 +86,62 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_CMD = \ > setup.py install \ > --prefix=$(HOST_DIR) > > -# Target setuptools-based packages > -PKG_PYTHON_SETUPTOOLS_ENV = \ > +# Target pep517-based packages > +PKG_PYTHON_PEP517_ENV = \ > $(PKG_PYTHON_ENV) > > -PKG_PYTHON_SETUPTOOLS_CMD = \ > - $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') > +PKG_PYTHON_PEP517_BUILD_CMD = \ > + -m build -n -w > + > +PKG_PYTHON_PEP517_INSTALL_OPTS = \ > + --interpreter=/usr/bin/python \ > + --script-kind=posix > + > +PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ > + $(TOPDIR)/support/scripts/pyinstaller.py \ > + dist/* \ > + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ > + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > + --scripts=$(TARGET_DIR)/usr/bin \ > + --data=$(TARGET_DIR)/usr > + > +PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ > + $(TOPDIR)/support/scripts/pyinstaller.py \ > + dist/* \ > + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ > + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > + --scripts=$(STAGING_DIR)/usr/bin \ > + --data=$(STAGING_DIR)/usr > + > +PKG_PYTHON_PEP517_DEPENDENCIES = \ > + host-python-pypa-build \ > + host-python-installer > + > +# Host pep517-based packages > +HOST_PKG_PYTHON_PEP517_ENV = \ > + $(HOST_PKG_PYTHON_ENV) > + > +HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ > + -m build -n -w > + > +HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ > + $(TOPDIR)/support/scripts/pyinstaller.py \ > + dist/* \ > + --interpreter=$(HOST_DIR)/bin/python \ > + --script-kind=posix \ > + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > + --scripts=$(HOST_DIR)/bin \ > + --data=$(HOST_DIR) > + > +# Target setuptools-based packages > +PKG_PYTHON_SETUPTOOLS_ENV = \ > + $(PKG_PYTHON_PEP517_ENV) > > PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ > - $(PKG_PYTHON_SETUPTOOLS_CMD) build > + $(PKG_PYTHON_PEP517_BUILD_CMD) > > PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ > --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > @@ -103,30 +150,24 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ > --single-version-externally-managed > > PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD = \ > - $(PKG_PYTHON_SETUPTOOLS_CMD) \ > - install --no-compile \ > - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ > - --root=$(TARGET_DIR) > + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) > > PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD = \ > - $(PKG_PYTHON_SETUPTOOLS_CMD) \ > - install \ > - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ > - --root=$(STAGING_DIR) > + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) > + > +PKG_PYTHON_SETUPTOOLS_DEPENDENCIES = \ > + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ > + host-python-setuptools > > # Host setuptools-based packages > HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ > - $(HOST_PKG_PYTHON_ENV) > + $(HOST_PKG_PYTHON_PEP517_ENV) > > HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ > - $(PKG_PYTHON_SETUPTOOLS_CMD) build > + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) > > HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD = \ > - $(PKG_PYTHON_SETUPTOOLS_CMD) \ > - install \ > - --prefix=$(HOST_DIR) \ > - --root=/ \ > - --single-version-externally-managed > + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) > > # Target setuptools-rust-based packages > PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ > @@ -143,6 +184,10 @@ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_TARGET_CMD = \ > PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_STAGING_CMD = \ > $(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD) > > +PKG_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ > + $(PKG_PYTHON_SETUPTOOLS_DEPENDENCIES) \ > + host-python-setuptools-rust > + > # Host setuptools-rust-based packages > HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ > $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ > @@ -155,52 +200,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ > HOST_PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_CMD = \ > $(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD) > > -# Target pep517-based packages > -PKG_PYTHON_PEP517_ENV = \ > - $(PKG_PYTHON_ENV) > - > -PKG_PYTHON_PEP517_BUILD_CMD = \ > - -m build -n -w > - > -PKG_PYTHON_PEP517_INSTALL_OPTS = \ > - --interpreter=/usr/bin/python \ > - --script-kind=posix > - > -PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ > - $(TOPDIR)/support/scripts/pyinstaller.py \ > - dist/* \ > - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ > - --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > - --scripts=$(TARGET_DIR)/usr/bin \ > - --data=$(TARGET_DIR)/usr > - > -PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ > - $(TOPDIR)/support/scripts/pyinstaller.py \ > - dist/* \ > - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ > - --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ > - --scripts=$(STAGING_DIR)/usr/bin \ > - --data=$(STAGING_DIR)/usr > - > -# Host pep517-based packages > -HOST_PKG_PYTHON_PEP517_ENV = \ > - $(HOST_PKG_PYTHON_ENV) > - > -HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ > - -m build -n -w > - > -HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ > - $(TOPDIR)/support/scripts/pyinstaller.py \ > - dist/* \ > - --interpreter=$(HOST_DIR)/bin/python \ > - --script-kind=posix \ > - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ > - --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ > - --scripts=$(HOST_DIR)/bin \ > - --data=$(HOST_DIR) > - > # Target flit packages > PKG_PYTHON_FLIT_ENV = \ > $(PKG_PYTHON_PEP517_ENV) > @@ -214,6 +213,10 @@ PKG_PYTHON_FLIT_INSTALL_TARGET_CMD = \ > PKG_PYTHON_FLIT_INSTALL_STAGING_CMD = \ > $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) > > +PKG_PYTHON_FLIT_DEPENDENCIES = \ > + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ > + host-python-flit-core > + > # Host flit packages > HOST_PKG_PYTHON_FLIT_ENV = \ > $(HOST_PKG_PYTHON_PEP517_ENV) > @@ -249,6 +252,10 @@ PKG_PYTHON_MATURIN_INSTALL_TARGET_CMD = \ > PKG_PYTHON_MATURIN_INSTALL_STAGING_CMD = \ > $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) > > +PKG_PYTHON_MATURIN_DEPENDENCIES = \ > + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ > + host-python-maturin > + > # Host maturin packages > HOST_PKG_PYTHON_MATURIN_ENV = \ > $(HOST_PKG_PYTHON_PEP517_ENV) \ > @@ -327,28 +334,17 @@ else > $(2)_DEPENDENCIES += host-python3 > endif # ($(4),target) > > -# Setuptools based packages will need setuptools for the host Python > -# interpreter (both host and target). > +# Setup type specific dependencies are the same whether we are > +# building for the host or the target. > # > -ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) > -$(2)_DEPENDENCIES += host-python-setuptools > -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) > -$(2)_DEPENDENCIES += host-python-setuptools-rust > -endif > -else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) > -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer > -ifeq ($$($(2)_SETUP_TYPE),flit) > -$(2)_DEPENDENCIES += host-python-flit-core > -endif > -ifeq ($$($(2)_SETUP_TYPE),maturin) > -$(2)_DEPENDENCIES += host-python-maturin > -endif > -else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) > +ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) > # Don't add dependency on host-python-installer for > # host-python-installer itself, and its dependencies. > ifeq ($$(filter host-python-flit-core host-python-installer,$(1)),) > $(2)_DEPENDENCIES += host-python-installer > endif > +else > +$(2)_DEPENDENCIES += $$(PKG_PYTHON_$$($(2)_SETUP_TYPE_UPPER)_DEPENDENCIES) > endif > > # Pyo3 based packages(setuptools-rust and maturin) will need rust > diff --git a/package/python-evdev/python-evdev.mk b/package/python-evdev/python-evdev.mk > index 5cf62b5160..b509b43e8a 100644 > --- a/package/python-evdev/python-evdev.mk > +++ b/package/python-evdev/python-evdev.mk > @@ -12,7 +12,7 @@ PYTHON_EVDEV_LICENSE = Revised BSD License > PYTHON_EVDEV_LICENSE_FILES = LICENSE > > PYTHON_EVDEV_BUILD_OPTS = \ > - build_ecodes \ > - --evdev-headers $(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h > + -C--build-option=build_ecodes \ > + -C--build-option=--evdev-headers=$(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h > > $(eval $(python-package)) > diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk > index 3ef3aabdbc..4454f5aa0c 100644 > --- a/package/python-lxml/python-lxml.mk > +++ b/package/python-lxml/python-lxml.mk > @@ -28,11 +28,11 @@ HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib > # python-lxml needs these scripts in order to properly detect libxml2 and > # libxslt compiler and linker flags > PYTHON_LXML_BUILD_OPTS = \ > - --xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ > - --xml2-config=$(STAGING_DIR)/usr/bin/xml2-config > + -C--build-option=--xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ > + -C--build-option=--xml2-config=$(STAGING_DIR)/usr/bin/xml2-config > HOST_PYTHON_LXML_BUILD_OPTS = \ > - --xslt-config=$(HOST_DIR)/bin/xslt-config \ > - --xml2-config=$(HOST_DIR)/bin/xml2-config > + -C--build-option=--xslt-config=$(HOST_DIR)/bin/xslt-config \ > + -C--build-option=--xml2-config=$(HOST_DIR)/bin/xml2-config > > $(eval $(python-package)) > $(eval $(host-python-package)) > diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk > index 69a0c28df5..6c07f42d06 100644 > --- a/package/python-m2crypto/python-m2crypto.mk > +++ b/package/python-m2crypto/python-m2crypto.mk > @@ -13,6 +13,8 @@ PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE > PYTHON_M2CRYPTO_CPE_ID_VENDOR = m2crypto_project > PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto > PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig > -PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr > +PYTHON_M2CRYPTO_BUILD_OPTS = \ > + -C--build-option=build_ext \ > + -C--build-option=--openssl=$(STAGING_DIR)/usr > > $(eval $(python-package)) > diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk > index bc94062da8..e2077654d2 100644 > --- a/package/python-pillow/python-pillow.mk > +++ b/package/python-pillow/python-pillow.mk > @@ -14,61 +14,60 @@ PYTHON_PILLOW_CPE_ID_PRODUCT = pillow > PYTHON_PILLOW_SETUP_TYPE = setuptools > > PYTHON_PILLOW_DEPENDENCIES = host-pkgconf > -PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing > -PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) > +PYTHON_PILLOW_BUILD_OPTS = -C--build-option=build_ext -C--build-option=--disable-platform-guessing > > ifeq ($(BR2_PACKAGE_FREETYPE),y) > PYTHON_PILLOW_DEPENDENCIES += freetype > -PYTHON_PILLOW_BUILD_OPTS += --enable-freetype > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-freetype > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-freetype > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-freetype > endif > > ifeq ($(BR2_PACKAGE_JPEG),y) > PYTHON_PILLOW_DEPENDENCIES += jpeg > -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg > endif > > ifeq ($(BR2_PACKAGE_LCMS2),y) > PYTHON_PILLOW_DEPENDENCIES += lcms2 > -PYTHON_PILLOW_BUILD_OPTS += --enable-lcms > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-lcms > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-lcms > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-lcms > endif > > ifeq ($(BR2_PACKAGE_LIBXCB),y) > PYTHON_PILLOW_DEPENDENCIES += libxcb > -PYTHON_PILLOW_BUILD_OPTS += --enable-xcb > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-xcb > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-xcb > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-xcb > endif > > ifeq ($(BR2_PACKAGE_OPENJPEG),y) > PYTHON_PILLOW_DEPENDENCIES += openjpeg > -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000 > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg2000 > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg2000 > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg2000 > endif > > ifeq ($(BR2_PACKAGE_TIFF),y) > PYTHON_PILLOW_DEPENDENCIES += tiff > -PYTHON_PILLOW_BUILD_OPTS += --enable-tiff > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-tiff > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-tiff > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-tiff > endif > > ifeq ($(BR2_PACKAGE_WEBP),y) > PYTHON_PILLOW_DEPENDENCIES += webp > -PYTHON_PILLOW_BUILD_OPTS += --enable-webp > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webp > ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) > -PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webpmux > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webpmux > endif > else > -PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux > +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webp -C--build-option=--disable-webpmux > endif > > $(eval $(python-package)) > diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk > index 0149b8d185..1b33b7505d 100644 > --- a/package/python-psycopg2/python-psycopg2.mk > +++ b/package/python-psycopg2/python-psycopg2.mk > @@ -13,7 +13,8 @@ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE > PYTHON_PSYCOPG2_DEPENDENCIES = postgresql > # Force psycopg2 to use the Buildroot provided postgresql version > # instead of the one from the host machine > -PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config > -PYTHON_PSYCOPG2_INSTALL_TARGET_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config > +PYTHON_PSYCOPG2_BUILD_OPTS = \ > + -C--build-option=build_ext \ > + -C--build-option=--pg-config=$(STAGING_DIR)/usr/bin/pg_config > > $(eval $(python-package)) > diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk > index 5792957eaf..1b7bceae5e 100644 > --- a/package/python-pyzmq/python-pyzmq.mk > +++ b/package/python-pyzmq/python-pyzmq.mk > @@ -12,7 +12,7 @@ PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 > PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD > PYTHON_PYZMQ_DEPENDENCIES = host-python-packaging zeromq > PYTHON_PYZMQ_SETUP_TYPE = setuptools > -PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr > +PYTHON_PYZMQ_BUILD_OPTS = -C--build-option=--zmq=$(STAGING_DIR)/usr > > # Due to issues with cross-compiling, hardcode to the zeromq in BR > define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION > @@ -23,7 +23,7 @@ endef > PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION > > ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y) > -PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts > +PYTHON_PYZMQ_BUILD_OPTS += -C--build-option=--enable-drafts > endif > > $(eval $(python-package)) > diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk > index 285884a2bb..70508fb6de 100644 > --- a/package/python-uvloop/python-uvloop.mk > +++ b/package/python-uvloop/python-uvloop.mk > @@ -10,8 +10,10 @@ PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/9c/16/728cc5dde368e > PYTHON_UVLOOP_SETUP_TYPE = setuptools > PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT > PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT > -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv > -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace --use-system-libuv > PYTHON_UVLOOP_DEPENDENCIES = libuv This needs a new dependency on host-python-cython now. Otherwise it fails with the following error: ERROR Missing dependencies: Cython<0.30.0,>=0.29.36 > +PYTHON_UVLOOP_BUILD_OPTS = \ > + -C--build-option=build_ext \ > + -C--build-option=--inplace \ > + -C--build-option=--use-system-libuv > > $(eval $(python-package)) From thomas.petazzoni at bootlin.com Tue Feb 6 22:31:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:31:16 +0100 Subject: [Buildroot] [PATCH v4 1/3] package/python-pygame: drop package In-Reply-To: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> Message-ID: <20240206233116.7f7c2602@windsurf> On Mon, 18 Dec 2023 15:04:54 -0700 Adam Duskett wrote: > The python-pygame package has not recieved any update since > Sun May 1 22:15:17 2016 (commit: a9ec96e545102ae5ccd4280323d35360b0a5072d) > > Also, this package no longer builds properly against python 3.12.0. Recieving > the following error when building: > > ``` > src/surface.c:2812:14: error: invalid type argument of unary ?*? (have > ?int?) > 2812 | ch = *PyUnicode_AS_UNICODE (obj); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > src/surface.c: In function ?PySurface_Blit?: > ``` > > If someone wants to re-introduce this package at a later date they are more > than welcome to do so! > > Signed-off-by: Adam Duskett > --- > Config.in.legacy | 9 ++ > DEVELOPERS | 1 - > package/Config.in | 1 - > package/python-pygame/Config.in | 50 ---------- > package/python-pygame/python-pygame.hash | 3 - > package/python-pygame/python-pygame.mk | 111 ----------------------- > 6 files changed, 9 insertions(+), 166 deletions(-) > delete mode 100644 package/python-pygame/Config.in > delete mode 100644 package/python-pygame/python-pygame.hash > delete mode 100644 package/python-pygame/python-pygame.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 22:31:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:31:22 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/python-crossbar: drop package In-Reply-To: <20231218220457.1705749-2-adam.duskett@amarulasolutions.com> References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-2-adam.duskett@amarulasolutions.com> Message-ID: <20240206233122.30f9be84@windsurf> On Mon, 18 Dec 2023 15:04:55 -0700 Adam Duskett wrote: > The current package has not recieved an update since Sat Oct 9 2021 > 33ece2446e25e20929d1c7eefa9f3244a3b79a92 and is not python 3.12 compatible. > > Furthermore, the current version requires at least 42 new packages worth of > depedencies of which several require patches to be python 3.12 compatible. > As nobody has stepped up to maintain the package and its ever-growing list of > dependencies, along with the other problems, it is time to drop the package. > > Signed-off-by: Adam Duskett > --- > Config.in.legacy | 16 ++++ > DEVELOPERS | 1 - > package/Config.in | 1 - > .../0001-Avoid-intentional-syntax-error.patch | 29 -------- > ...s-min.txt-drop-indirect-dependencies.patch | 74 ------------------- > ...ice-wap-use-markupsafe-instead-of-we.patch | 53 ------------- > package/python-crossbar/Config.in | 72 ------------------ > package/python-crossbar/python-crossbar.hash | 5 -- > package/python-crossbar/python-crossbar.mk | 14 ---- > 9 files changed, 16 insertions(+), 249 deletions(-) > delete mode 100644 package/python-crossbar/0001-Avoid-intentional-syntax-error.patch > delete mode 100644 package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch > delete mode 100644 package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch > delete mode 100644 package/python-crossbar/Config.in > delete mode 100644 package/python-crossbar/python-crossbar.hash > delete mode 100644 package/python-crossbar/python-crossbar.mk Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Tue Feb 6 22:29:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 23:29:14 +0100 Subject: [Buildroot] [git commit] package/go: bump version to go1.21.7 Message-ID: <20240206223127.BB378870FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=568bd6c39d1a28f27d6509d885e09de281953e63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master go1.21.7 (released 2024-02-06) includes fixes to the compiler, the go command, the runtime, and the crypto/x509 package. https://go.dev/doc/devel/release#go1.21.7 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index bee10089a7..d008019e94 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 124926a62e45f78daabbaedb9c011d97633186a33c238ffc1e25320c02046248 go1.21.6.src.tar.gz +sha256 00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6 go1.21.7.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index f9d31aacac..9efd4a3123 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.6 +GO_VERSION = 1.21.7 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From peter at korsgaard.com Tue Feb 6 22:32:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 23:32:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-lmdb: add CPE variables In-Reply-To: <20240206220725.910499-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 23:07:25 +0100") References: <20240206220725.910499-1-fontaine.fabrice@gmail.com> Message-ID: <87mssd2pi3.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:py-lmdb_project:py-lmdb is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/AFE6D0BA-D905-43F6-81FE-308D591A82B8 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 22:31:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 23:31:43 +0100 Subject: [Buildroot] [git commit] package/python-lmdb: add CPE variables Message-ID: <20240206223241.EAF89873F6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d496d7a215af398e9708cfd8d1f458b8b92dbfe branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master cpe:2.3:a:py-lmdb_project:py-lmdb is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AFE6D0BA-D905-43F6-81FE-308D591A82B8 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-lmdb/python-lmdb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk index 52617b6ed0..7906d388ae 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -9,6 +9,8 @@ PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/de/13/dd9b0c1924f0becc93e0bacd123a4e7a347966e3e74753ace3b1e85acc39 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE +PYTHON_LMDB_CPE_ID_VENDOR = py-lmdb_project +PYTHON_LMDB_CPE_ID_PRODUCT = py-lmdb PYTHON_LMDB_SETUP_TYPE = setuptools PYTHON_LMDB_DEPENDENCIES = host-python-cffi From thomas.petazzoni at bootlin.com Tue Feb 6 22:33:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:33:18 +0100 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 In-Reply-To: <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> Message-ID: <20240206233318.593730bd@windsurf> Hello Adam, On Mon, 18 Dec 2023 15:04:56 -0700 Adam Duskett wrote: > Python 3.12.1 has removed distutils support. As such, we remove the distutils > option from pkg-python.mk as well. > > Tested on Fedora 39, and Debian 11. All 68 package tests pass. > > Signed-off-by: Adam Duskett > --- > v3 -> v4: > - Drop distutils in pkg-python.mk > - 3.12.0 -> 3.12.1 I applied, but after doing a number of changes. The most important one is that I had to reintroduce some of our --disable options: for ncurses, sqlite and expat. Indeed, without these, you ended up with the Python code installed, but not the correspond native library (the py_cv_module__=n/a only disables building the native library). I split up the pkg-python.mk change into a separate commit, which is made before the python 3.12 bump. Indeed, it's semantically separate. Finally, I updated the Buildroot manual to no longer mention distutils support. And I did a separate commit to update the Buildroot manual with other _SETUP_TYPE values that we support. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Tue Feb 6 22:42:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 06 Feb 2024 23:42:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-anyio: bump to version 4.2.0 In-Reply-To: (Marcus Hoffmann via buildroot's message of "Tue, 6 Feb 2024 13:42:02 +0100") References: <20240108064820.3450359-1-james.hilliard1@gmail.com> <0eb549da-1140-4071-8e58-376d9dd5f434@bubu1.eu> Message-ID: <87fry52p11.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Hi, > On 08.01.24 14:03, Marcus Hoffmann via buildroot wrote: >> Hi James, >> On 08.01.24 07:48, James Hilliard wrote: >>> Signed-off-by: James Hilliard >>> --- >>> ? package/python-anyio/python-anyio.hash | 4 ++-- >>> ? package/python-anyio/python-anyio.mk?? | 4 ++-- >>> ? 2 files changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/package/python-anyio/python-anyio.hash >>> b/package/python-anyio/python-anyio.hash >>> index 1cea549bc1..e77d30249c 100644 >>> --- a/package/python-anyio/python-anyio.hash >>> +++ b/package/python-anyio/python-anyio.hash >>> @@ -1,5 +1,5 @@ >>> ? # md5, sha256 from https://pypi.org/pypi/anyio/json >>> -md5? 58d288dd84e28e2507ff9ce7e4620010? anyio-3.7.1.tar.gz >>> -sha256 >>> 44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780 >>> anyio-3.7.1.tar.gz >>> +md5? 22e660fff1a584e72281f0d6a083e4e0? anyio-4.2.0.tar.gz >>> +sha256 >>> e1875bb4b4e2de1669f4bc7869b6d3f54231cdced71605e6e64c9be77e3be50f >>> anyio-4.2.0.tar.gz >> This was introduced in this version because fastapi didn't support a >> newer version. >> Fastapi 0.108.0 supports starlette 0.32 now, which supports anyio >> 4.2.0. >> So I think these should be bumped together/in the same series? > Now that more recent fastapi and starlette versions are available this > can be applied. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 6 22:41:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 6 Feb 2024 23:41:49 +0100 Subject: [Buildroot] [git commit] package/python-anyio: bump to version 4.2.0 Message-ID: <20240206224250.9384386E4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f20fbc9c28cfbe077b4d446f868dbf17c594aa5b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard --- package/python-anyio/python-anyio.hash | 4 ++-- package/python-anyio/python-anyio.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-anyio/python-anyio.hash b/package/python-anyio/python-anyio.hash index 1cea549bc1..e77d30249c 100644 --- a/package/python-anyio/python-anyio.hash +++ b/package/python-anyio/python-anyio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/anyio/json -md5 58d288dd84e28e2507ff9ce7e4620010 anyio-3.7.1.tar.gz -sha256 44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780 anyio-3.7.1.tar.gz +md5 22e660fff1a584e72281f0d6a083e4e0 anyio-4.2.0.tar.gz +sha256 e1875bb4b4e2de1669f4bc7869b6d3f54231cdced71605e6e64c9be77e3be50f anyio-4.2.0.tar.gz # Locally computed sha256 checksums sha256 5361ac9dc58f2ef5fd2e9b09c68297c17f04950909bbc8023bdb82eacf22c2b0 LICENSE diff --git a/package/python-anyio/python-anyio.mk b/package/python-anyio/python-anyio.mk index 80404ac660..32c2286157 100644 --- a/package/python-anyio/python-anyio.mk +++ b/package/python-anyio/python-anyio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ANYIO_VERSION = 3.7.1 +PYTHON_ANYIO_VERSION = 4.2.0 PYTHON_ANYIO_SOURCE = anyio-$(PYTHON_ANYIO_VERSION).tar.gz -PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/28/99/2dfd53fd55ce9838e6ff2d4dac20ce58263798bd1a0dbe18b3a9af3fcfce +PYTHON_ANYIO_SITE = https://files.pythonhosted.org/packages/2d/b8/7333d87d5f03247215d86a86362fd3e324111788c6cdd8d2e6196a6ba833 PYTHON_ANYIO_SETUP_TYPE = setuptools PYTHON_ANYIO_LICENSE = MIT PYTHON_ANYIO_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Tue Feb 6 22:59:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Tue, 6 Feb 2024 23:59:27 +0100 Subject: [Buildroot] [PATCH] package/python3: add option to disable ensurepip Message-ID: <20240206225928.2290100-1-thomas.petazzoni@bootlin.com> This module takes 2.1 MB and is not needed in most Python installations. Reported-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- ...-add-disable-ensurepip-module-option.patch | 68 +++++++++++++++++++ package/python3/Config.in | 5 ++ package/python3/python3.mk | 6 ++ 3 files changed, 79 insertions(+) create mode 100644 package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch diff --git a/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch b/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch new file mode 100644 index 0000000000..2761236c9b --- /dev/null +++ b/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch @@ -0,0 +1,68 @@ +From 10b67aeb6a6be10218c3dd675d3e54874ced1a55 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 23:49:32 +0100 +Subject: [PATCH] configure.ac: add --disable-ensurepip-module option + +The ensurepip module weights 2.1 MB and is only needed if you need +"support for bootstrapping the pip installer into an existing Python +installation or virtual environment" [1]. + +This patch adds a --disable-ensurepip-module option that allows to not +install it. It should not be confused with --without-ensurepip, which +already exists, but even with --without-ensurepip, the ensurepip +module gets installed, but not used during the build to bootstrap the +pip installer. + +[1] https://docs.python.org/3/library/ensurepip.html + +Upstream: non-cooperative upstream +Signed-off-by: Thomas Petazzoni +--- + Makefile.pre.in | 5 ++++- + configure.ac | 7 +++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index d9fae62aa9c..3a8e6200891 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -2096,7 +2096,6 @@ LIBSUBDIRS= asyncio \ + dbm \ + email email/mime \ + encodings \ +- ensurepip ensurepip/_bundled \ + html \ + http \ + importlib importlib/resources importlib/metadata \ +@@ -2274,6 +2273,10 @@ ifeq (@EXPAT@,yes) + LIBSUBDIRS += $(XMLLIBSUBDIRS) + endif + ++ifeq (@ENSUREPIP_MODULE@,yes) ++LIBSUBDIRS += ensurepip ensurepip/_bundled ++endif ++ + TEST_MODULES=@TEST_MODULES@ + + .PHONY: libinstall +diff --git a/configure.ac b/configure.ac +index 06df165ccc8..5774297b9da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6944,6 +6944,13 @@ AS_CASE([$with_ensurepip], + AC_MSG_RESULT([$ENSUREPIP]) + AC_SUBST([ENSUREPIP]) + ++AC_ARG_ENABLE([ensurepip-module], ++ AS_HELP_STRING([--disable-ensurepip-module], [disable ensurepip module installation]), ++ [ENSUREPIP_MODULE="${enableval}"], ++ [ENSUREPIP_MODULE="yes"]) ++AS_IF([test "${ENSUREPIP}" != "no"], [ENSUREPIP_MODULE="yes"]) ++AC_SUBST([ENSUREPIP_MODULE]) ++ + # check if the dirent structure of a d_type field and DT_UNKNOWN is defined + AC_CACHE_CHECK([if the dirent structure of a d_type field], [ac_cv_dirent_d_type], [ + AC_LINK_IFELSE( +-- +2.43.0 + diff --git a/package/python3/Config.in b/package/python3/Config.in index 38f0580aa4..a398a1d7dd 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -75,6 +75,11 @@ config BR2_PACKAGE_PYTHON3_DECIMAL help decimal module for Python3. +config BR2_PACKAGE_PYTHON3_ENSUREPIP + bool "ensurepip module" + help + ensurepip module for Python3. + config BR2_PACKAGE_PYTHON3_OSSAUDIODEV bool "ossaudiodev module" help diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 42765abcf4..8685ca238d 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -107,6 +107,12 @@ else PYTHON3_CONF_ENV += py_cv_module__decimal=n/a endif +ifeq ($(BR2_PACKAGE_PYTHON3_ENSUREPIP),y) +PYTHON3_CONF_OPTS += --enable-ensurepip-module +else +PYTHON3_CONF_OPTS += --disable-ensurepip-module +endif + ifeq ($(BR2_PACKAGE_PYTHON3_PYEXPAT),y) PYTHON3_DEPENDENCIES += expat PYTHON3_CONF_OPTS += --with-expat=system -- 2.43.0 From thomas.petazzoni at bootlin.com Tue Feb 6 23:00:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:00:33 +0100 Subject: [Buildroot] [PATCH v2] configs/asus_tinker_rk3288_defconfig: switch to zImage and bump Linux to 6.1.44, U-Boot to 2023.07 In-Reply-To: <20230810221020.12181-1-giulio.benetti@benettiengineering.com> References: <20230810221020.12181-1-giulio.benetti@benettiengineering.com> Message-ID: <20240207000033.55001acb@windsurf> On Fri, 11 Aug 2023 00:10:20 +0200 Giulio Benetti wrote: > uImage is almost deprecated so let's switch to zImage. Let's also bump > Linux version to 6.1.44, U-Boot to 2023.07 and remove > BR2_TARGET_UBOOT_NEEDS_PYTHON3 since it's selected by > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT. > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * changed uImage to zImage in extlinux.conf > --- > board/asus/tinker/extlinux.conf | 2 +- > configs/asus_tinker_rk3288_defconfig | 7 ++----- > 2 files changed, 3 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 23:01:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:01:20 +0100 Subject: [Buildroot] [git commit] configs/asus_tinker_rk3288_defconfig: switch to zImage and bump Linux to 6.1.44, U-Boot to 2023.07 Message-ID: <20240206230133.8914E874A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=842f19849edeadd5846df3723e906b347383b164 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master uImage is almost deprecated so let's switch to zImage. Let's also bump Linux version to 6.1.44, U-Boot to 2023.07 and remove BR2_TARGET_UBOOT_NEEDS_PYTHON3 since it's selected by BR2_TARGET_UBOOT_NEEDS_PYLIBFDT. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- board/asus/tinker/extlinux.conf | 2 +- configs/asus_tinker_rk3288_defconfig | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index bb96ddb893..be21e246ec 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ label Tinker linux - kernel /boot/uImage + kernel /boot/zImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 40f4125880..b3e4502a45 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -10,10 +10,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y @@ -23,10 +22,8 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker" BR2_LINUX_KERNEL_INSTALL_TARGET=y From thomas.petazzoni at bootlin.com Tue Feb 6 23:01:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:01:20 +0100 Subject: [Buildroot] [git commit] package/linux-pam: fix musl build Message-ID: <20240206230133.937D3874AA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4f2cd9a2caeeacde0803b331b3f17c8be98584c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following musl build failure raised since bump to version 1.6.0 in commit 7794fa4c4e1d19a245bb0367cde94560432a2bc5: pam_namespace.c: In function 'process_line': pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { | ^~~~~~~~ pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? 40 | #include "argv_parse.h" +++ |+#include 41 | Fixes: - http://autobuild.buildroot.org/results/f07360f33010a2cf19aace266faae14a834bd9a4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-pam_namespace-include-stdint-h.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/package/linux-pam/0001-pam_namespace-include-stdint-h.patch b/package/linux-pam/0001-pam_namespace-include-stdint-h.patch new file mode 100644 index 0000000000..5eda619505 --- /dev/null +++ b/package/linux-pam/0001-pam_namespace-include-stdint-h.patch @@ -0,0 +1,42 @@ +From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001 +From: Jacob Heider +Date: Wed, 17 Jan 2024 11:49:26 -0500 +Subject: [PATCH] pam_namespace: include stdint.h + +pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h, +resulting in the following build failures on 1.6.0: + + pam_namespace.c: In function 'process_line': + pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) + 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { + | ^~~~~~~~ + pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? + 40 | #include "argv_parse.h" + +++ |+#include + 41 | + pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in + 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { + | ^~~~~~~~ + +Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config") +Resolves: https://github.com/linux-pam/linux-pam/issues/733 + +Upstream: https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 +Signed-off-by: Fabrice Fontaine +--- + modules/pam_namespace/pam_namespace.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c +index f72d67189..b16731c22 100644 +--- a/modules/pam_namespace/pam_namespace.c ++++ b/modules/pam_namespace/pam_namespace.c +@@ -34,6 +34,8 @@ + + #define _ATFILE_SOURCE + ++#include "config.h" ++#include + #include "pam_cc_compat.h" + #include "pam_inline.h" + #include "pam_namespace.h" From thomas.petazzoni at bootlin.com Tue Feb 6 23:01:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:01:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/linux-pam: fix musl build In-Reply-To: <20240206180341.3910-1-fontaine.fabrice@gmail.com> References: <20240206180341.3910-1-fontaine.fabrice@gmail.com> Message-ID: <20240207000133.71a948a2@windsurf> On Tue, 6 Feb 2024 19:03:41 +0100 Fabrice Fontaine wrote: > Fix the following musl build failure raised since bump to version 1.6.0 > in commit 7794fa4c4e1d19a245bb0367cde94560432a2bc5: > > pam_namespace.c: In function 'process_line': > pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function) > 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) { > | ^~~~~~~~ > pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header ''; did you forget to '#include '? > 40 | #include "argv_parse.h" > +++ |+#include > 41 | > > Fixes: > - http://autobuild.buildroot.org/results/f07360f33010a2cf19aace266faae14a834bd9a4 > > Signed-off-by: Fabrice Fontaine > --- > .../0001-pam_namespace-include-stdint-h.patch | 42 +++++++++++++++++++ > 1 file changed, 42 insertions(+) > create mode 100644 package/linux-pam/0001-pam_namespace-include-stdint-h.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Tue Feb 6 23:09:09 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:09:09 +0100 Subject: [Buildroot] [git commit] package/stunnel: fix build without psk Message-ID: <20240206230924.09A85874AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e1b7be3abb5424a906d57fb4e5bcb64db5b4fda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure without psk raised since bump to version 5.71 in commit 059259eabbd8d15c1e60c0c3b8631d0c02b93898: ocsp.c: In function 'ocsp_init': ocsp.c:112:20: error: 'SERVICE_OPTIONS' {aka 'struct service_options_struct'} has no member named 'psk_keys' 112 | if(!section->psk_keys) { | ^~ Fixes: - http://autobuild.buildroot.org/results/1707beea413a8da8713ad2dc59db947329da45d2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-src-ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/package/stunnel/0001-src-ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch b/package/stunnel/0001-src-ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch new file mode 100644 index 0000000000..a8edc1d465 --- /dev/null +++ b/package/stunnel/0001-src-ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch @@ -0,0 +1,45 @@ +From 93e5cdd68b13cc3161d9b0094b0f331bdaf07cbc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 6 Jan 2024 17:28:20 +0100 +Subject: [PATCH] src/ocsp.c: fix build with OPENSSL_NO_PSK + +Fix the following build failure with OPENSSL_NO_PSK: + +ocsp.c: In function 'ocsp_init': +ocsp.c:112:20: error: 'SERVICE_OPTIONS' {aka 'struct service_options_struct'} has no member named 'psk_keys' + 112 | if(!section->psk_keys) { + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/1707beea413a8da8713ad2dc59db947329da45d2 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/mtrojnar/stunnel/pull/18 +--- + src/ocsp.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/ocsp.c b/src/ocsp.c +index 5073ded..12792af 100644 +--- a/src/ocsp.c ++++ b/src/ocsp.c +@@ -109,12 +109,16 @@ int ocsp_init(SERVICE_OPTIONS *section) { + s_log(LOG_DEBUG, "OCSP: Client OCSP stapling enabled"); + } else { + #if OPENSSL_VERSION_NUMBER>=0x10002000L ++#ifndef OPENSSL_NO_PSK + if(!section->psk_keys) { ++#endif + if(SSL_CTX_set_tlsext_status_cb(section->ctx, ocsp_server_cb)==TLSEXT_STATUSTYPE_ocsp) + s_log(LOG_DEBUG, "OCSP: Server OCSP stapling enabled"); ++#ifndef OPENSSL_NO_PSK + } else { + s_log(LOG_NOTICE, "OCSP: Server OCSP stapling is incompatible with PSK"); + } ++#endif + #else /* OpenSSL version 1.0.2 or later */ + s_log(LOG_NOTICE, "OCSP: Server OCSP stapling not supported"); + #endif /* OpenSSL version 1.0.2 or later */ +-- +2.43.0 + From thomas.petazzoni at bootlin.com Tue Feb 6 23:09:23 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 00:09:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/stunnel: fix build without psk In-Reply-To: <20240107172201.734515-1-fontaine.fabrice@gmail.com> References: <20240107172201.734515-1-fontaine.fabrice@gmail.com> Message-ID: <20240207000923.7a16983e@windsurf> On Sun, 7 Jan 2024 18:22:01 +0100 Fabrice Fontaine wrote: > Fix the following build failure without psk raised since bump to version > 5.71 in commit 059259eabbd8d15c1e60c0c3b8631d0c02b93898: > > ocsp.c: In function 'ocsp_init': > ocsp.c:112:20: error: 'SERVICE_OPTIONS' {aka 'struct service_options_struct'} has no member named 'psk_keys' > 112 | if(!section->psk_keys) { > | ^~ > > Fixes: > - http://autobuild.buildroot.org/results/1707beea413a8da8713ad2dc59db947329da45d2 > > Signed-off-by: Fabrice Fontaine > --- > ...ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch | 45 +++++++++++++++++++ > 1 file changed, 45 insertions(+) > create mode 100644 package/stunnel/0001-src-ocsp.c-fix-build-with-OPENSSL_NO_PSK.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Tue Feb 6 23:13:38 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 00:13:38 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-bitstring: add missing runtime dependency In-Reply-To: References: <20240206155140.2351424-1-romain.naour@smile.fr> <20240206155140.2351424-2-romain.naour@smile.fr> Message-ID: <3d9bb061-0dd0-4400-891e-9e9612e3906c@smile.fr> Hi Marcus, Le 06/02/2024 ? 18:04, Marcus Hoffmann a ?crit?: > Hi Romain, > > On 06.02.24 16:51, Romain Naour wrote: >> python-bitstring require python-bitarray and python-zlib at runtime >> since 4.0.1 release [1][2]. > > I needed to look at the version numbers 3 times, but this dependency actually > got introduced in 4.1.0? :-). [1] Indeed, the version is not even good in my first link "[1]" below. > >> >> python-zlib is now needed for the "Experimental support for two 8-bit >> float types". > > Is there a reference to that somewhere? (I know, nobody documents their > dependencies on internal python modules, but where is the quote from?) it's the commit title introducing python-zlib dependency (second link [2]). > >> >> Intended to fixes (fixed locally): >> https://gitlab.com/buildroot.org/buildroot/-/jobs/6104227183 >> (TestPythonPy3Bitstring) >> https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854810 >> (TestPythonPy3Crossbar) > > This test failed for a different reason: It ran with bitstring version 4.1.2 > which included a bogus python file with invalid syntax [2] which the pyc > compilation step stumbles over. The version bump to 4.1.4 already solved this. Indeed, I missed the version bump to 4.1.4 but still there is a missing runtime dependency that prevent to use python-bitstream. Best regards, Romain > > [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 > [2] https://github.com/scott-griffiths/bitstring/issues/293 > >> >> gitlab-ci reports another issue at build time not reproduced locally: >> >> ?? *** Error compiling >> '[...]/TestPythonPy3Bitstring/target/usr/lib/python3.11/site-packages/bitstring/plugin_test.py'... >> ?? Sorry: IndentationError: expected an indented block after function >> definition on line 6 (plugin_test.py, line 8) >> >> [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.1 >> [2] >> https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 >> >> Signed-off-by: Romain Naour >> Cc: James Hilliard >> --- >> ? package/python-bitstring/Config.in | 2 ++ >> ? 1 file changed, 2 insertions(+) >> >> diff --git a/package/python-bitstring/Config.in >> b/package/python-bitstring/Config.in >> index 93d7682577..82d0bb29c6 100644 >> --- a/package/python-bitstring/Config.in >> +++ b/package/python-bitstring/Config.in >> @@ -1,5 +1,7 @@ >> ? config BR2_PACKAGE_PYTHON_BITSTRING >> ????? bool "python-bitstring" >> +??? select BR2_PACKAGE_PYTHON_BITARRAY # runtime >> +??? select BR2_PACKAGE_PYTHON3_ZLIB # runtime >> ????? help >> ??????? Simple construction, analysis and modification of binary data. >> ? From christian at aperture.us Wed Feb 7 02:21:56 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:21:56 -0800 Subject: [Buildroot] [PATCH v1 1/2] package/docker-engine: bump version to v25.0.3 Message-ID: <20240207022157.2560531-1-christian@aperture.us> https://github.com/moby/moby/releases/tag/v25.0.3 Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 931d6529e1..40293be7e0 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 docker-engine-24.0.7.tar.gz +sha256 4cdb516f5d6f5caf8b3bcf93c2962277ba727cfd2d1620176a3bb0cf153b3590 docker-engine-25.0.3.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 262be2df20..066959e0c0 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 24.0.7 +DOCKER_ENGINE_VERSION = 25.0.3 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 -- 2.43.0 From christian at aperture.us Wed Feb 7 02:21:57 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:21:57 -0800 Subject: [Buildroot] [PATCH v1 2/2] package/docker-cli: bump version to v25.0.3 In-Reply-To: <20240207022157.2560531-1-christian@aperture.us> References: <20240207022157.2560531-1-christian@aperture.us> Message-ID: <20240207022157.2560531-2-christian@aperture.us> https://github.com/moby/moby/releases/tag/v25.0.3 Signed-off-by: Christian Stewart --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 9c8d08bba5..17b179852a 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 72a54d131c28938221c81bd08364459fed9c71c093d4d615d324aaf31de6db1d docker-cli-24.0.7.tar.gz +sha256 04ad0cea992a65db20cb1b0dbf6d1ce32c705ce879de51b22095fe8d28030815 docker-cli-25.0.3.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 95fce27ffb..9d307e991c 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 24.0.7 +DOCKER_CLI_VERSION = 25.0.3 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 -- 2.43.0 From christian at aperture.us Wed Feb 7 02:22:45 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:22:45 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump version to v2.24.5 Message-ID: <20240207022245.2560726-1-christian@aperture.us> https://github.com/docker/compose/releases/tag/v2.24.5 Signed-off-by: Christian Stewart --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index afccafd994..92f7b227d3 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8a1109124e7dfef736ad3db0457d807eb41a0068211bd13e52051252cab28dda docker-compose-2.23.0.tar.gz +sha256 ed132bcc226261a595469f5ca6d4ea20b02965867216b56d4e7a5962efb46570 docker-compose-2.24.5.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 54557b9841..947f09d0b3 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.23.0 +DOCKER_COMPOSE_VERSION = 2.24.5 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE -- 2.43.0 From christian at aperture.us Wed Feb 7 02:31:58 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:31:58 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump version to v1.7.13 Message-ID: <20240207023158.2572044-1-christian@aperture.us> https://github.com/containerd/containerd/releases/tag/v1.7.13 Signed-off-by: Christian Stewart --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 5524a1a44e..25dc7ff55d 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 containerd-1.7.8.tar.gz +sha256 ae2b914bff0ddbb9b29d5fc689a51e1ce89ea4edfc4df9ae10517c6f5d2d5aaf containerd-1.7.13.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index d3ca102797..50c2965b87 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.8 +CONTAINERD_VERSION = 1.7.13 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE -- 2.43.0 From christian at aperture.us Wed Feb 7 02:32:25 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:32:25 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/runc: bump version to v1.1.12 Message-ID: <20240207023225.2572189-1-christian@aperture.us> https://github.com/opencontainers/runc/releases/tag/v1.1.12 Signed-off-by: Christian Stewart --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 5ffd21a5dd..d6eb27d352 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 509993674481aad7e14aedfb280e0eb160f3a34c0b77e2e98c4b3c0b1df76894 runc-1.1.9.tar.gz +sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 runc-1.1.12.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 62e117685a..273509b860 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.9 +RUNC_VERSION = 1.1.12 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE -- 2.43.0 From james.hilliard1 at gmail.com Wed Feb 7 02:32:34 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 6 Feb 2024 19:32:34 -0700 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 In-Reply-To: <20240206233318.593730bd@windsurf> References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> <20240206233318.593730bd@windsurf> Message-ID: On Tue, Feb 6, 2024 at 3:33?PM Thomas Petazzoni wrote: > > Hello Adam, > > On Mon, 18 Dec 2023 15:04:56 -0700 > Adam Duskett wrote: > > > Python 3.12.1 has removed distutils support. As such, we remove the distutils > > option from pkg-python.mk as well. > > > > Tested on Fedora 39, and Debian 11. All 68 package tests pass. > > > > Signed-off-by: Adam Duskett > > --- > > v3 -> v4: > > - Drop distutils in pkg-python.mk > > - 3.12.0 -> 3.12.1 > > I applied, but after doing a number of changes. The most important one > is that I had to reintroduce some of our --disable options: for > ncurses, sqlite and expat. Indeed, without these, you ended up with the > Python code installed, but not the correspond native library (the > py_cv_module__=n/a only disables building the native > library). > > I split up the pkg-python.mk change into a separate commit, which is > made before the python 3.12 bump. Indeed, it's semantically separate. > > Finally, I updated the Buildroot manual to no longer mention distutils > support. And I did a separate commit to update the Buildroot manual > with other _SETUP_TYPE values that we support. There seems to be a bug somewhere here breaking builds when the host and target have the same architecture: /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -I./Modules/_sqlite -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -fPIC -c ./Modules/_sqlite/util.c -o Modules/_sqlite/util.o /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -shared Modules/_sqlite/blob.o Modules/_sqlite/connection.o Modules/_sqlite/cursor.o Modules/_sqlite/microprotocols.o Modules/_sqlite/module.o Modules/_sqlite/prepare_protocol.o Modules/_sqlite/row.o Modules/_sqlite/statement.o Modules/_sqlite/util.o -L/home/buildroot/buildroot/output/per-package/python3/host/bin/../x86_64-buildroot-linux-gnu/sysroot/usr/lib -lsqlite3 -o Modules/_sqlite3.cpython-312-x86_64-linux-gnu.so /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -I/home/buildroot/buildroot/output/per-package/python3/host/x86_64-buildroot-linux-gnu/sysroot/usr/include -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -fPIC -c ./Modules/_ssl.c -o Modules/_ssl.o /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -shared Modules/_ssl.o -L/home/buildroot/buildroot/output/per-package/python3/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib -lssl -lcrypto -o Modules/_ssl.cpython-312-x86_64-linux-gnu.so /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -I/home/buildroot/buildroot/output/per-package/python3/host/x86_64-buildroot-linux-gnu/sysroot/usr/include -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -fPIC -c ./Modules/_hashopenssl.c -o Modules/_hashopenssl.o /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -shared Modules/_hashopenssl.o -L/home/buildroot/buildroot/output/per-package/python3/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib -lcrypto -o Modules/_hashlib.cpython-312-x86_64-linux-gnu.so /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -fPIC -c ./Modules/xxlimited.c -o Modules/xxlimited.o /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -shared Modules/xxlimited.o -o Modules/xxlimited.cpython-312-x86_64-linux-gnu.so /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -fPIC -c ./Modules/xxlimited_35.c -o Modules/xxlimited_35.o /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -shared Modules/xxlimited_35.o -o Modules/xxlimited_35.cpython-312-x86_64-linux-gnu.so /usr/bin/install -c -m 644 ./Tools/gdb/libpython.py python-gdb.py /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -c -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -std=c11 -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fvisibility=hidden -I./Include/internal -I. -I./Include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -DPy_BUILD_CORE -o Programs/_testembed.o ./Programs/_testembed.c /home/buildroot/buildroot/output/per-package/python3/host/bin/x86_64-linux-gcc -Xlinker -export-dynamic -o Programs/_testembed Programs/_testembed.o -L. -lpython3.12 -ldl -lpthread -lm sed -e "s,/usr/bin/env python3,/usr/bin/python3.12," < ./Tools/scripts/2to3 > build/scripts-3.12/2to3-3.12 sed -e "s,/usr/bin/env python3,/usr/bin/python3.12," < ./Tools/scripts/idle3 > build/scripts-3.12/idle3.12 sed -e "s,/usr/bin/env python3,/usr/bin/python3.12," < ./Tools/scripts/pydoc3 > build/scripts-3.12/pydoc3.12 sed -e "s, at EXENAME@,/usr/bin/python3.12," < ./Misc/python-config.in >python-config.py LC_ALL=C sed -e 's,\$(\([A-Za-z0-9_]*\)),\$\{\1\},g' < Misc/python-config.sh >python-config Traceback (most recent call last): File "/home/buildroot/buildroot/output/build/python3-3.12.1/./Tools/build/check_extension_modules.py", line 25, in import pathlib File "/home/buildroot/buildroot/output/build/python3-3.12.1/Lib/pathlib.py", line 20, in from urllib.parse import quote_from_bytes as urlquote_from_bytes File "/home/buildroot/buildroot/output/build/python3-3.12.1/Lib/urllib/parse.py", line 36, in import math ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' not found (required by /home/buildroot/buildroot/output/build/python3-3.12.1/build/lib.linux-x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) make[2]: *** [Makefile:1136: checksharedmods] Error 1 make[1]: *** [package/pkg-generic.mk:283: /home/buildroot/buildroot/output/build/python3-3.12.1/.stamp_built] Error 2 > > Thanks! > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com From christian at aperture.us Wed Feb 7 02:32:57 2024 From: christian at aperture.us (Christian Stewart) Date: Tue, 6 Feb 2024 18:32:57 -0800 Subject: [Buildroot] [PATCH v1 1/1] package/nerdctl: bump version to v1.7.3 Message-ID: <20240207023258.2572359-1-christian@aperture.us> https://github.com/containerd/nerdctl/releases/tag/v1.7.3 Signed-off-by: Christian Stewart --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index 1fb0649fb2..52e249824f 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 574438dd7c88e6a607c6f82932f8ada174b1133a66ee0fa0f7510e7c3bebacb4 nerdctl-1.3.1.tar.gz +sha256 fff8c348efa4ff6753e1aacded0dedddcb255c50b00d8b3a37a660b1fb1dd31a nerdctl-1.7.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index 43e862f7f9..66b22df646 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.3.1 +NERDCTL_VERSION = 1.7.3 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 -- 2.43.0 From asd617140123 at gmail.com Wed Feb 7 03:03:39 2024 From: asd617140123 at gmail.com (Nigel Wang) Date: Wed, 7 Feb 2024 11:03:39 +0800 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. Message-ID: <20240207030339.3910-1-asd617140123@gmail.com> From: nigel_wang add Cubieboard4 board support. - SOC: Allwinner A80. - DRAM: 2GiB DDR3 @ 672MHZ. - NAND: 8GBeMMC - Power: DC 5V. - Wifi: 80211 b/g/n. (module is AP6330) Reference: https://hirokun.jp/AP6330.pdf - Ethernet: RTL8211E The detail of board: https://linux-sunxi.org/Cubietech_Cubieboard4 Board support package includes the following components: - mainline Linux Kernel 6.6.8 - mainline U-boot 2021.10. Signed-off-by: Nigel Wang --- v1 -> v2 * Add BR2_cortex_a15_a7=y in buildroot defconfig. * Bump linux version to 6.6.8 * Using sunxi_defconfig in kernel. * Using "make savedefconfig" to save defconfig. * Remove boot.cmd. --- DEVELOPERS | 4 +++ board/cubietech/cubieboard4/extlinux.conf | 5 +++ board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ 5 files changed, 104 insertions(+) create mode 100644 board/cubietech/cubieboard4/extlinux.conf create mode 100644 board/cubietech/cubieboard4/genimage.cfg create mode 100755 board/cubietech/cubieboard4/post-image.sh create mode 100644 configs/cubieboard4_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index a03018ab2b..bffb8f2069 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3297,3 +3297,7 @@ F: package/quazip/ F: package/shapelib/ F: package/simple-mail/ F: package/tinc/ + +N: Nigel Wang +F: board/cubietech/cubieboard4/ +F: configs/cubieboard4_defconfig diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf new file mode 100644 index 0000000000..5084e2237b --- /dev/null +++ b/board/cubietech/cubieboard4/extlinux.conf @@ -0,0 +1,5 @@ +label linux + kernel /boot/zImage + devicetree /sun9i-a80-cubieboard4.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait + diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg new file mode 100644 index 0000000000..f1dee13923 --- /dev/null +++ b/board/cubietech/cubieboard4/genimage.cfg @@ -0,0 +1,38 @@ +# Minimal SD card image for the Cubieboard2 +# Based in the Orange Pi genimage.cfg + +image boot.vfat { + vfat { + files = { + "zImage", + "sun9i-a80-cubieboard4.dtb", + "extlinux" + } + } + + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 512M + } +} diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh new file mode 100755 index 0000000000..e37b960a4d --- /dev/null +++ b/board/cubietech/cubieboard4/post-image.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf + +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +exit $? diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig new file mode 100644 index 0000000000..0592fe4a2d --- /dev/null +++ b/configs/cubieboard4_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15_a7=y +BR2_ARM_FPU_NEON_VFPV4=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.34.1 From fido_max at inbox.ru Wed Feb 7 06:33:24 2024 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Wed, 7 Feb 2024 09:33:24 +0300 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: bump version to 2.13.1 Message-ID: <20240207063324.1003727-1-fido_max@inbox.ru> Release notes: https://github.com/timescale/timescaledb/blob/2.13.1/CHANGELOG.md Signed-off-by: Maxim Kochetkov --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index b7e4c71774..8d0fc125d6 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 584a351c7775f0e067eaa0e7277ea88cab9077cc4c455cbbf09a5d9723dce95d timescaledb-2.13.0.tar.gz +sha256 ca4f48147cb1bf3bf22af9f643822a5931e12a89909cc73c4a89ddae3c828ac1 timescaledb-2.13.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 34a48ad0c3..a5d77eda80 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.13.0 +TIMESCALEDB_VERSION = 2.13.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE -- 2.43.0 From thomas.petazzoni at bootlin.com Wed Feb 7 06:47:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 07 Feb 2024 06:47:19 -0000 Subject: [Buildroot] [autobuild.buildroot.net] Daily results for 2024-02-06 Message-ID: Hello, Autobuild statistics for 2024-02-06 =================================== branch | OK | NOK | TIM | TOT | 2023.02.x | 1 | 6 | 0 | 7 | 2023.11.x | 7 | 4 | 0 | 11 | master | 38 | 57 | 0 | 95 | Classification of failures by reason for master ----------------------------------------------- libressl-3.8.2 | 6 prboom-2.5.0 | 6 libpthsem-2.0.8 | 5 host-erlang-26.0.2 | 3 host-heimdal-f4faaeaba371ff... | 3 libopenssl-3.2.0 | 3 linux-6.6.15 | 3 stunnel-5.71 | 3 unknown | 3 attr-2.5.2 | 2 gobject-introspection-1.76.1 | 2 openssh-9.6p1 | 2 cegui-00b4e1fe174da53b7ed72... | 1 coreutils-9.3 | 1 dmraid-1.0.0.rc16-3 | 1 elfutils-0.189 | 1 eza-0.16.0 | 1 frr-8.5.4 | 1 fs/axfs/axfs.mk:32: /home/a... | 1 host-rust-1.74.1 | 1 ipmitool-1_8_19 | 1 libarchive-3.7.2 | 1 libp11-0.4.12 | 1 linux-5.10.162-cip24-rt10 | 1 memtest86-6.20 | 1 openvmtools-11.3.5-18557794 | 1 strongswan-5.9.13 | 1 sudo-1.9.15p5 | 1 Detail of failures for master ----------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- microblazeel | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/4238e6e079fe419d6d3c3a380077168f93ccc565 | microblaze | attr-2.5.2 | NOK | http://autobuild.buildroot.net/results/abfb6cbe4ad1fe7884427737324b8f803bacbbfc | sparc64 | cegui-00b4e1fe174da53b7ed72... | NOK | http://autobuild.buildroot.net/results/05e5d98ee545db0126a74e61ad4bab8905766fa3 | powerpc | coreutils-9.3 | NOK | http://autobuild.buildroot.net/results/9f4c318f695c5c49f02a419e43cdce799c87e76f | ORPH mips64el | dmraid-1.0.0.rc16-3 | NOK | http://autobuild.buildroot.net/results/82749d726687bd86c86f8e8381068a4ef5a67059 | ORPH microblazeel | elfutils-0.189 | NOK | http://autobuild.buildroot.net/results/8966b479902f42a449a3a4154e751d6f07e96152 | ORPH armeb | eza-0.16.0 | NOK | http://autobuild.buildroot.net/results/9f09e9351ba9b18a3cbbadebb42eb6982c8ebb32 | arceb | frr-8.5.4 | NOK | http://autobuild.buildroot.net/results/8980db502421b3e3830bdbb54bb93883d467f2c2 | microblazeel | fs/axfs/axfs.mk:32: /home/a... | NOK | http://autobuild.buildroot.net/results/cf4e5b2aaccc54c3538c491765f0b015bc5159d9 | nios2 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/d9d1e477d1c01a42ba0041e2fd5f9316a044271a | ORPH i686 | gobject-introspection-1.76.1 | NOK | http://autobuild.buildroot.net/results/d8f01f0ddd2d5c1f5f263d7fd4b7502953570886 | ORPH i686 | host-erlang-26.0.2 | NOK | http://autobuild.buildroot.net/results/fccf20aae3f7d0d29defe0073fdd7c36a594d087 | arm | host-erlang-26.0.2 | NOK | http://autobuild.buildroot.net/results/0a901a05401cf5ca525c8a093390ecf16cff2d4e | arm | host-erlang-26.0.2 | NOK | http://autobuild.buildroot.net/results/e431a680aad0eacc77d8dfd53c2d47e4d76d4f0a | mips64 | host-heimdal-f4faaeaba371ff... | NOK | http://autobuild.buildroot.net/results/63265677734dd9d9318da01864ac14c8f10fa1bb | ORPH mips64 | host-heimdal-f4faaeaba371ff... | NOK | http://autobuild.buildroot.net/results/175fb65f0151866cd2d83c91c23b453d8c4489f7 | ORPH m68k | host-heimdal-f4faaeaba371ff... | NOK | http://autobuild.buildroot.net/results/c644c218aa1173ad00bd0fa85ef90db5cbeef543 | ORPH armeb | host-rust-1.74.1 | NOK | http://autobuild.buildroot.net/results/d4022ba7480aca5173f3cc4f74cbfdc619e13bb6 | armeb | ipmitool-1_8_19 | NOK | http://autobuild.buildroot.net/results/b27bd257fba655a767322cf53943644d636b587a | powerpc64 | libarchive-3.7.2 | NOK | http://autobuild.buildroot.net/results/cdc08582a7eed6e2c8595aff12ae165e9c835dc1 | s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/dfdb7c1892f7ee7889496d28957a7a61b19571aa | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/2b931bb75dc27f7ecc70e49f9200b1358aa8faba | ORPH s390x | libopenssl-3.2.0 | NOK | http://autobuild.buildroot.net/results/e52d6f890180ca189b07577de883584bcdbe0f8f | ORPH x86_64 | libp11-0.4.12 | NOK | http://autobuild.buildroot.net/results/389ed112f082a4917f777f3e236211059c4c6d6e | ORPH mips64 | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/61f8fa01cea96a5741e7742e2642c9c7d3a8205a | arceb | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/b339bce76f457ae410d0bda41df9e43834cc4be4 | aarch64_be | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/18a46c290f4e1d56e75935d4758b26cf015890ca | arceb | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/c2cb591e3f52d0bc9761939a922c0241e2c06f57 | nios2 | libpthsem-2.0.8 | NOK | http://autobuild.buildroot.net/results/6d9f85ba9ba3baa2c1fc09672be3272af109b715 | powerpc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/5aa4e4fe7b6edbbb305e8af5f4d78b4eea6991b2 | ORPH arc | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/5d9e9502dc76357aaae2bdb5caf21ac65ee31368 | ORPH powerpc64le | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/687c1b945911259ab09f2720abd425e1526deef6 | ORPH mips64el | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/928e96eef2930fd6f60afee0907f971608b61aa6 | ORPH arceb | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/96e8ab7061d70971b0ab4023100532b0b420aee2 | ORPH mips64el | libressl-3.8.2 | NOK | http://autobuild.buildroot.net/results/d11d4190d2c242240dcba870ce243c6108d53ef6 | ORPH sh4eb | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/840ea58e5a68ccd571cdf70ae56d18aa1e6bae4a | ORPH sh4a | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/138accf6123d92d9b90b7c7648f4dd41d601cea0 | ORPH nios2 | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/de547d66c32293abe87a9ed21c4d5bb4bac9e8da | ORPH sparc64 | linux-6.6.15 | NOK | http://autobuild.buildroot.net/results/403156920015806119096b8c45c833c7512a4c11 | ORPH x86_64 | memtest86-6.20 | NOK | http://autobuild.buildroot.net/results/aedc886e12eca0a995f3755da1d4197c2aa56a47 | mips | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/c8019d1930b3bbdda52b1365e896cb8faf965923 | ORPH mips | openssh-9.6p1 | NOK | http://autobuild.buildroot.net/results/6127d174c7e259c08d73f743b9050d3fa0e347e1 | ORPH x86_64 | openvmtools-11.3.5-18557794 | NOK | http://autobuild.buildroot.net/results/44cca7d0f5faf0c389be11b15f7baf370ef3acb9 | powerpc64 | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/bf979078b19d05e9a705e98d4d3d081d00795ecb | ORPH or1k | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/c78ec1714fcef43cc17a0295f1d55c9c41563529 | ORPH aarch64_be | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/42818e9d6c672a4b844ce5264cffb2262a9f28a8 | ORPH mips64 | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/8a34fe357c4726f658595e445b2678fb27dff0a3 | ORPH m68k | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/5e3d74505002dba176ddcaceab7097b88428aa66 | ORPH sparc64 | prboom-2.5.0 | NOK | http://autobuild.buildroot.net/results/56aa83036ad0de6cd0be2faaf0a16184ec5d66d2 | ORPH powerpc64 | strongswan-5.9.13 | NOK | http://autobuild.buildroot.net/results/1cef4d5e1631b0841a5a6218039bff8458c2906a | armeb | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/7e3439e298744c1d96855d8777491246938d7011 | mips | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/5b8337a4061ee1ac17ebe3114066f4558bfa5b00 | arc | stunnel-5.71 | NOK | http://autobuild.buildroot.net/results/a3ae9b8cb4f40abe3d7d561bc1eb75b1daf94593 | mips | sudo-1.9.15p5 | NOK | http://autobuild.buildroot.net/results/9c0ff3bf8620a36bb4d6dabe14b5a94a376791e8 | ORPH x86_64 | unknown | NOK | http://autobuild.buildroot.net/results/b3ec10f6a50a63ed0bd1adce2fe6ad34581a5395 | mips | unknown | NOK | http://autobuild.buildroot.net/results/055ccc7ab71823fefbfa8430b58c88ad3510ebd9 | arc | unknown | NOK | http://autobuild.buildroot.net/results/7cb470fe00b1eb3a49dab028a2ac85a99cb76765 | Classification of failures by reason for 2023.02.x -------------------------------------------------- acpica-20220331 | 1 fontconfig-2.13.1 | 1 host-gcc-final-11.4.0 | 1 libsepol-3.3 | 1 linux-5.10.162-cip24-rt10 | 1 raptor-2.0.15 | 1 Detail of failures for 2023.02.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- powerpc64le | acpica-20220331 | NOK | http://autobuild.buildroot.net/results/ae4acb746bad649ef14258d00d36b6a250722ce1 | riscv64 | fontconfig-2.13.1 | NOK | http://autobuild.buildroot.net/results/2ce1ae6df4645d1da9de48469c3f7003cb47429c | ORPH microblazeel | host-gcc-final-11.4.0 | NOK | http://autobuild.buildroot.net/results/3866fe052e878aba04e19d8920559a059fd8b773 | mips64 | libsepol-3.3 | NOK | http://autobuild.buildroot.net/results/f0414712a59cc3ebbd2f20fe49279e0fe96995d8 | arm | linux-5.10.162-cip24-rt10 | NOK | http://autobuild.buildroot.net/results/7ddeb9a4b5175dd2bcdeb021bbd82f9dcd99919c | ORPH mipsel | raptor-2.0.15 | NOK | http://autobuild.buildroot.net/results/7fdb119beeb8f2c29300fcb14fbf5c324ddacf80 | ORPH Classification of failures by reason for 2023.11.x -------------------------------------------------- host-rust-1.71.1 | 2 freeswitch-1.10.11 | 1 libabseil-cpp-20220623.1 | 1 Detail of failures for 2023.11.x -------------------------------- arch | reason | OK? | url | orph? -------------+--------------------------------+-----+---------------------------------------------------------------------------------+------- mips64el | freeswitch-1.10.11 | NOK | http://autobuild.buildroot.net/results/aea32de0be0cb5de38d8871bd575dd0bda096920 | powerpc64le | host-rust-1.71.1 | NOK | http://autobuild.buildroot.net/results/c80e3934bd6ac5b599a7e2c84fd8ea5431e55204 | powerpc | host-rust-1.71.1 | NOK | http://autobuild.buildroot.net/results/457a86557af5db3320e0c4ce1b9ea6af7c4fe63c | mips64el | libabseil-cpp-20220623.1 | NOK | http://autobuild.buildroot.net/results/6211b5584518655fa3ee2b7c80c4a4a128670c22 | Gitlab CI results for 2024-02-06 ================================ Detail of runtime-test failures for master ------------------------------------------ runtime-test | link to the job | orph? --------------------------+---------------------------------------------------------------+------ TestCpioDracutGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853966 | ORPH ...ioDracutGlibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853979 | ORPH TestCpioDracutMusl | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854009 | ORPH ...pioDracutMuslMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854017 | ORPH TestCpioDracutUclibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854027 | ORPH ...oDracutUclibcMergedUsr | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854034 | ORPH TestDockerCompose | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854423 | ORPH TestGlxinfo | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854455 | ORPH TestGrubX8664EFI | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093853712 | ORPH TestPythonPy3Bitstring | https://gitlab.com/buildroot.org/buildroot/-/jobs/6104227183 | ORPH TestPythonPy3Crossbar | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854810 | ORPH TestPythonPy3Dtschema | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854842 | ORPH ...honPy3FlaskExpectsJson | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854855 | ORPH TestRust | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854998 | ORPH TestZfsGlibc | https://gitlab.com/buildroot.org/buildroot/-/jobs/6093855074 | ORPH -- http://autobuild.buildroot.net From thomas.petazzoni at bootlin.com Wed Feb 7 07:05:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 08:05:40 +0100 Subject: [Buildroot] [PATCH] utils/genrandconfig: add default setting for bare-metal toolchain arch Message-ID: <20240207070541.2296330-1-thomas.petazzoni@bootlin.com> We recently added support for building a bare-metal toolchain, and the autobuilders are therefore trying to build such toolchains. However, by default the BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH option is empty, causing the target tuple to be empty, and therefore host-gcc-bare-metal tries to build a toolchain for the target "x86_64-pc-linux-gnu", which isn't a bare-metal target, and fails badly. In order to properly test this bare-metal support, this commit adjusts the genrandconfig script so that it injects a valid target architecture tuple. Fixes: http://autobuild.buildroot.net/results/6cb1514b19bfe056fb984d3538bdccdda5e174c1/ Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 52edad06d8..eb1f8cbd4a 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -315,6 +315,10 @@ def fixup_config(sysinfo, configfile): 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: return False + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y' in configlines: + configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""') + configlines.add('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"') + if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: return False -- 2.43.0 From thomas.petazzoni at bootlin.com Wed Feb 7 07:07:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 08:07:54 +0100 Subject: [Buildroot] [PATCH] package/autoconf: bump to version 2.72 In-Reply-To: <20240118182808.551258-1-francois.perrad@gadz.org> References: <20240118182808.551258-1-francois.perrad@gadz.org> Message-ID: <20240207080754.606a403e@windsurf> On Thu, 18 Jan 2024 19:28:08 +0100 Francois Perrad wrote: > https://git.savannah.gnu.org/cgit/autoconf.git/tree/NEWS?h=v2.72 > Signed-off-by: Francois Perrad > --- > package/autoconf/0001-dont-add-dirty-to-version.patch | 2 +- > package/autoconf/autoconf.hash | 2 +- > package/autoconf/autoconf.mk | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) This version bump broke the build of host-erlang: http://autobuild.buildroot.net/results/cab/cabca5a5ed9bb0874ed33e58a69947b50a6e2318/build-end.log Could you have a look? Perhaps it's just the host-erlang configure machinery that is too strict, and simply their check needs to be relaxed. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From kilian.zinnecker at mail.de Wed Feb 7 07:08:05 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Wed, 7 Feb 2024 08:08:05 +0100 Subject: [Buildroot] [PATCH 0/1] Fix alphabetical order of DEVELOPERS file entry Message-ID: <20240207070806.7331-1-kilian.zinnecker@mail.de> The files in my own entry in the DEVELOPERS file are not in alphabetical order. I currently have two further board supports submitted. I was asked to fix that seperately, and this makes sense, because else the patches of the two board supports can easily become non compatible, if they both try to fix the DEVELOPERS file. Kilian Zinnecker (1): Fix alphabetical order of DEVELOPER's file entry DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.34.1 From kilian.zinnecker at mail.de Wed Feb 7 07:08:06 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Wed, 7 Feb 2024 08:08:06 +0100 Subject: [Buildroot] [PATCH 1/1] Fix alphabetical order of DEVELOPERS file entry In-Reply-To: <20240207070806.7331-1-kilian.zinnecker@mail.de> References: <20240207070806.7331-1-kilian.zinnecker@mail.de> Message-ID: <20240207070806.7331-2-kilian.zinnecker@mail.de> Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index fc47c51d33..dd29f395d9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1887,9 +1887,9 @@ N: Kieran Bingham F: package/libcamera/ N: Kilian Zinnecker -F: package/rockchip-rkbin/ -F: configs/rock5b_defconfig F: board/radxa/rock5b/ +F: configs/rock5b_defconfig +F: package/rockchip-rkbin/ N: Klaus Heinrich Kiwi F: package/wqy-zenhei/ -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 7 07:12:07 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 08:12:07 +0100 Subject: [Buildroot] [git commit] support/dependencies/dependencies.sh: libopenssl needs perl Math::BigInt on s390 In-Reply-To: <20240110204909.795AC85DB2@busybox.osuosl.org> References: <20240110204909.795AC85DB2@busybox.osuosl.org> Message-ID: <20240207081207.27f3ca68@windsurf> Hello Fabrice, It looks like this patch isn't sufficient (or there is some other issue?) because the issue pops up in the autobuilders: http://autobuild.buildroot.net/results/dfd/dfdb7c1892f7ee7889496d28957a7a61b19571aa/build-end.log Could you have a look? Thomas On Wed, 10 Jan 2024 21:22:57 +0100 Thomas Petazzoni via buildroot wrote: > commit: https://git.buildroot.net/buildroot/commit/?id=7ea38660e01a87ab70c02e38c78a49202e8e5c21 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > libopenssl needs perl Math::BigInt for s390x asm to avoid the following > build failure since commit a5cacb63082b9e58194c4b9f8b2af2c3e38ff15c: > > Can't locate bigint.pm in @INC (you may need to install the bigint module) (@INC contains: /home/buildroot/autobuild/instance-0/output-1/build/libopenssl-3.2.0/crypto/poly1305/asm/../.. /home/buildroot/autobuild/instance-0/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-0/output-1/build/libopenssl-3.2.0/crypto/poly1305/asm/../../perlasm/s390x.pm line 16. > BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-0/output-1/build/libopenssl-3.2.0/crypto/poly1305/asm/../../perlasm/s390x.pm line 16. > > Fixes: > - http://autobuild.buildroot.org/results/986cb07d368c7214ffbc9d60c378e7ac00797f00 > > Signed-off-by: Fabrice Fontaine > Signed-off-by: Thomas Petazzoni > --- > support/dependencies/dependencies.sh | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh > index 6e7d067ccd..3d83cb3285 100755 > --- a/support/dependencies/dependencies.sh > +++ b/support/dependencies/dependencies.sh > @@ -282,6 +282,10 @@ required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-auto > required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl > required_perl_modules="$required_perl_modules IPC::Cmd" # Used by (host-)libopenssl > > +if grep -q ^BR2_PACKAGE_LIBOPENSSL=y $BR2_CONFIG && grep -q ^BR2_s390x=y $BR2_CONFIG ; then > + required_perl_modules="$required_perl_modules Math::BigInt" > +fi > + > if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then > required_perl_modules="$required_perl_modules diagnostics" > fi > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From hanyuan-z at qq.com Wed Feb 7 07:49:49 2024 From: hanyuan-z at qq.com (Hanyuan Zhao) Date: Wed, 7 Feb 2024 15:49:49 +0800 Subject: [Buildroot] [PATCH v4 1/3] package/milkv-duo-libraries: new package Message-ID: This commit adds the libraries for RISC-V dev board milk-v duo, containing board-specific firmware and hardware tools. https://github.com/milkv-duo/milkv-duo-buildroot-libraries Co-authored-by: Emil S Signed-off-by: Hanyuan Zhao --- Changes v3 -> v4: - Update the info in help section - Provide more info about ION (camera memory use) Changes v2 -> v3: - Update the desc's repo url Changes v1 -> v2: - Lint the code - Refactor the select and depend logic --- package/Config.in | 1 + package/milkv-duo-libraries/Config.in | 63 +++++++++++++++++++ .../milkv-duo-libraries.mk | 51 +++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 package/milkv-duo-libraries/Config.in create mode 100644 package/milkv-duo-libraries/milkv-duo-libraries.mk diff --git a/package/Config.in b/package/Config.in index 047877c960..322aba90b8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -564,6 +564,7 @@ endmenu source "package/memtester/Config.in" source "package/memtool/Config.in" source "package/mhz/Config.in" + source "package/milkv-duo-libraries/Config.in" source "package/minicom/Config.in" source "package/msr-tools/Config.in" source "package/nanocom/Config.in" diff --git a/package/milkv-duo-libraries/Config.in b/package/milkv-duo-libraries/Config.in new file mode 100644 index 0000000000..047b78fb7b --- /dev/null +++ b/package/milkv-duo-libraries/Config.in @@ -0,0 +1,63 @@ +config BR2_PACKAGE_MILKV_DUO_LIBRARIES + bool "milk-v duo libraries" + depends on BR2_riscv + help + Package providing board-specific firmware and hardware tools + for Milk-V Duo platform. + + https://github.com/milkv-duo/milkv-duo-buildroot-libraries + +if BR2_PACKAGE_MILKV_DUO_LIBRARIES + +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + bool "milkv-duo-firmware-fsbl" + select BR2_PACKAGE_HOST_MTOOLS + help + This package is obtained from + https://github.com/milkv-duo/duo-buildroot-sdk, + from which we download the first stage bootloader source and + compile it, generating the ATF bl2.bin. At the mean time, we + will use the fiptool.py in this package to create the binary + file fip.bin to pack the opensbi, u-boot and so on. + + If you intend to generate the whole sdcard image or the + fip.bin for milk-v duo, you must say Y to this package! + +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB + bool "64 MiB free ram" + default n + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + help + Say Y to this will disable the ION (Camera Algorithm Memory) + in order to have the all 64MiB Free memory. + +config BR2_PACKAGE_MILKV_DUO_PINMUX + bool "duo-pinmux tool" + default n + help + Say Y to this will compile the duo-pinmux, which can + get or set function of any Milk-V Duo GPIO Pin. More info at + + https://milkv.io/docs/duo/application-development/pinmux + +config BR2_PACKAGE_MILKV_DUO_FEATURES + bool "duo usb features" + default n + select BR2_PACKAGE_DHCPCD + select BR2_PACKAGE_DNSMASQ + select BR2_PACKAGE_DROPBEAR + select BR2_PACKAGE_LRZSZ + select BR2_PACKAGE_HTOP + help + Say Y to this will copy the cvitek usb shell scripts to have + the USB features. The role could be configured at + + /etc/milkv-duo.conf + + Supported usb functions are rndis, host and mass-storage. + By default Duo has the LED blinking. It could be configured + in that conf file as well. Say Y to this will also select + some packages automatically, to have the same experience + with the official release. + +endif diff --git a/package/milkv-duo-libraries/milkv-duo-libraries.mk b/package/milkv-duo-libraries/milkv-duo-libraries.mk new file mode 100644 index 0000000000..a5cf40a764 --- /dev/null +++ b/package/milkv-duo-libraries/milkv-duo-libraries.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# milkv-duo-libraries +# +################################################################################ + +MILKV_DUO_LIBRARIES_VERSION = f359994bd497f942bb67734280d81f6640c7c168 +MILKV_DUO_LIBRARIES_SITE = $(call github,milkv-duo,milkv-duo-buildroot-libraries,$(MILKV_DUO_LIBRARIES_VERSION)) +MILKV_DUO_LIBRARIES_INSTALL_STAGING = YES +MILKV_DUO_LIBRARIES_DEPENDENCIES = host-python3 host-mtools +MILKV_DUO_LIBRARIES_FSBL_64MB = ION + +ifeq ($(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB),y) +MILKV_DUO_LIBRARIES_FSBL_64MB = 64MB +endif + +define MILKV_DUO_LIBRARIES_BUILD_CMDS + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ + $(MAKE) -C $(@D)/firmware \ + ARCH=riscv BOOT_CPU=riscv CHIP_ARCH=cv180x \ + PROJECT_FULLNAME=cv1800b_milkv_duo_sd \ + CROSS_COMPILE=$(TARGET_CROSS) \ + FREE_RAM_SIZE=$(MILKV_DUO_LIBRARIES_FSBL_64MB) \ + bl2; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + -I $(@D)/pinmux/include $(@D)/pinmux/src/*.c -o $(@D)/pinmux/duo-pinmux; \ + fi +endef + +define MILKV_DUO_LIBRARIES_INSTALL_STAGING_CMDS + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ + $(INSTALL) -D -m 0755 $(@D)/firmware/build/cv180x/bl2.bin $(BINARIES_DIR)/bl2.bin; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/chip_conf.bin $(BINARIES_DIR)/chip_conf.bin; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/fiptool.py $(BINARIES_DIR)/fiptool.py; \ + $(INSTALL) -D -m 0644 $(@D)/firmware/plat/cv180x/multi.its $(BINARIES_DIR)/multi.its; \ + $(INSTALL) -D -m 0755 $(@D)/firmware/test/cv181x/ddr_param.bin $(BINARIES_DIR)/ddr_param.bin; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ + $(INSTALL) -D -m 0755 $(@D)/pinmux/duo-pinmux $(TARGET_DIR)/usr/bin/; \ + fi + + if [ $(BR2_PACKAGE_MILKV_DUO_FEATURES) = y ]; then \ + cp $(@D)/overlay/* -r $(TARGET_DIR); \ + fi +endef + +$(eval $(generic-package)) -- 2.34.1 From hanyuan-z at qq.com Wed Feb 7 07:49:53 2024 From: hanyuan-z at qq.com (Hanyuan Zhao) Date: Wed, 7 Feb 2024 15:49:53 +0800 Subject: [Buildroot] [PATCH v4 3/3] configs/milkv_duo: new defconfig In-Reply-To: <20240207074950.2049-1-hanyuan-z@qq.com> References: <20240207074950.2049-1-hanyuan-z@qq.com> Message-ID: Milk-V Duo is an ultra-compact embedded RISC-V development platform based on the CV1800B chip. It can run Linux and RTOS, providing a reliable, low-cost, and high-performance platform for professionals, industrial ODMs, AIoT enthusiasts, DIY hobbyists, and creators. https://milkv.io/duo Co-authored-by: Emil S Co-authored-by: GP Orcullo Signed-off-by: Hanyuan Zhao Reviewed-by: Giulio Benetti [Build Tested only both defconfigs] Tested-by: Giulio Benetti --- This patch depends on: https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 to work-around a gcc bug on htop package. --- Changes v3 -> v4: - Lint the code - Add more comments about gcc ICE in defconfig - Remove unnecessary comments Changes v2 -> v3: - Remove BR2_TOOLCHAIN_BUILDROOT_CXX in defconfig - Refactor post-image.sh - Provide more info about ION and camera memory use Changes v1 -> v2: - Refactor defconfig - Set the boot partition size to 8M - Refactor the image generating logic --- board/milkv/duo/genimage.cfg | 25 ++++++++ board/milkv/duo/post-image.sh | 47 ++++++++++++++ board/milkv/duo/readme.txt | 46 ++++++++++++++ configs/milkv_duo_musl_riscv64_defconfig | 67 ++++++++++++++++++++ configs/milkv_duo_musl_riscv64_ion_defconfig | 67 ++++++++++++++++++++ 5 files changed, 252 insertions(+) create mode 100644 board/milkv/duo/genimage.cfg create mode 100755 board/milkv/duo/post-image.sh create mode 100644 board/milkv/duo/readme.txt create mode 100644 configs/milkv_duo_musl_riscv64_defconfig create mode 100644 configs/milkv_duo_musl_riscv64_ion_defconfig diff --git a/board/milkv/duo/genimage.cfg b/board/milkv/duo/genimage.cfg new file mode 100644 index 0000000000..1fd74f845a --- /dev/null +++ b/board/milkv/duo/genimage.cfg @@ -0,0 +1,25 @@ +image boot.vfat { + vfat { + files = { + "fip.bin", + "boot.sd", + } + } + size = 8M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/milkv/duo/post-image.sh b/board/milkv/duo/post-image.sh new file mode 100755 index 0000000000..3856d977df --- /dev/null +++ b/board/milkv/duo/post-image.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +########################################################### +# File: post-image.sh +# Author: GP Orcullo +# Hanyuan Zhao +# Description: this sh will make the fip.bin and boot.sd, +# then pack everything to an image file. +########################################################### + +FIPTOOL_OPTS="genfip ${BINARIES_DIR}/fip.bin \ + --MONITOR_RUNADDR=0x80000000 \ + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ + --NAND_INFO=00000000 \ + --BL2=${BINARIES_DIR}/bl2.bin \ + --BLCP_IMG_RUNADDR=0x05200200 \ + --BLCP_PARAM_LOADADDR=0 \ + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin" + +if [ -f ${BINARIES_DIR}/cvirtos.bin ]; then + FIPTOOL_OPTS="${FIPTOOL_OPTS} \ + --BLCP=${BINARIES_DIR}/empty.bin \ + --BLCP_2ND=${BINARIES_DIR}/cvirtos.bin \ + --BLCP_2ND_RUNADDR=0x83f40000" + echo "[Duo Post-Image fiptool.py] Integrating FreeRTOS" +fi + +${BINARIES_DIR}/fiptool.py ${FIPTOOL_OPTS} \ +> ${BINARIES_DIR}/fip.log 2>&1 +if [ -f ${BINARIES_DIR}/fip.bin ]; then + echo "[Duo Post-Image fiptool.py] > fip.bin generated!" +fi + +cp ${BINARIES_DIR}/u-boot.dtb ${BINARIES_DIR}/cv1800b_milkv_duo_sd.dtb +lzma -fk ${BINARIES_DIR}/Image +mkimage -f ${BINARIES_DIR}/multi.its ${BINARIES_DIR}/boot.sd +if [ -f ${BINARIES_DIR}/boot.sd ]; then + echo "[Duo Post-Image] > boot.sd generated!" +fi +support/scripts/genimage.sh -c $(pwd)/board/milkv/duo/genimage.cfg +gzip -fk ${BINARIES_DIR}/sdcard.img +if [ -f ${BINARIES_DIR}/sdcard.img ]; then + echo "[Duo Post-Image] > sdcard.img generated!" +fi diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt new file mode 100644 index 0000000000..bb05050245 --- /dev/null +++ b/board/milkv/duo/readme.txt @@ -0,0 +1,46 @@ +Milk-V Duo (https://milkv.io/docs/duo/overview) + +Intro +===== + +Milk-V Duo is an ultra-compact embedded development platform +based on the rv64 CV1800B chip. It can run Linux and RTOS, +providing a reliable, cost-effective, and high-performance +platform for professionals, industrial ODMs, AIoT enthusiasts, +DIY enthusiasts, and creators. + +How to build it +=============== + +Configure Buildroot: + + $ make milkv_duo_musl_riscv64_defconfig + +The milkv_duo_musl_riscv64_defconfig will by default provide +the full 64MiB free RAM. If you want to build with memory +reserved for ION (generalized memory manager in linux, i.e. +some memory will be reserved for the camera algorithms), please try: + + $ make milkv_duo_musl_riscv64_ion_defconfig + +For more information about the ION, please refer to + +https://github.com/milkv-duo/duo-buildroot-sdk/blob/develop/README.md?plain=1#L436 + +Modify configuration if needed, e.g. add more packages to target: + + $ make menuconfig + +Compile everything and build the SD card image: + + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image +called "sdcard.img" in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_musl_riscv64_defconfig new file mode 100644 index 0000000000..0773924072 --- /dev/null +++ b/configs/milkv_duo_musl_riscv64_defconfig @@ -0,0 +1,67 @@ +# Architecture +BR2_riscv=y +BR2_riscv_g=y +BR2_RISCV_ISA_RVC=y + +# Linux headers same as kernel 5.10 series +BR2_KERNEL_HEADERS_5_10=y + +# Since gcc 13 and later versions with the t-head's optimizations +# below are currently not well compatible with glibc, which will +# throw gcc ICE (Internal Compiler Error) when the buildroot is +# compiling the glibc, so we choose musl used by the official sdk +# until this ICE gets fixed. +BR2_GCC_VERSION_13_X=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" + +# opensbi +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_GIT=y +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_OPENSBI_FW_FDT_PATH=y + +# u-boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_64mb" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_LINUX_KERNEL_LZMA=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# SD card image generating script +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" + +# rootfs +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Packages for the sdcard image generating +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB=y +BR2_PACKAGE_MILKV_DUO_PINMUX=y +BR2_PACKAGE_MILKV_DUO_FEATURES=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y + +# Host packages for the sdcard image generating +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_LZMA_ALONE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y diff --git a/configs/milkv_duo_musl_riscv64_ion_defconfig b/configs/milkv_duo_musl_riscv64_ion_defconfig new file mode 100644 index 0000000000..18458726d9 --- /dev/null +++ b/configs/milkv_duo_musl_riscv64_ion_defconfig @@ -0,0 +1,67 @@ +# Architecture +BR2_riscv=y +BR2_riscv_g=y +BR2_RISCV_ISA_RVC=y + +# Linux headers same as kernel 5.10 series +BR2_KERNEL_HEADERS_5_10=y + +# Since gcc 13 and later versions with the t-head's optimizations +# below are currently not well compatible with glibc, which will +# throw gcc ICE (Internal Compiler Error) when the buildroot is +# compiling the glibc, so we choose musl used by the official sdk +# until this ICE gets fixed. +BR2_GCC_VERSION_13_X=y +BR2_TOOLCHAIN_BUILDROOT_MUSL=y +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" + +# opensbi +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_GIT=y +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_OPENSBI_FW_FDT_PATH=y + +# u-boot +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_ion" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" +BR2_LINUX_KERNEL_LZMA=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# SD card image generating script +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" + +# rootfs +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Packages for the sdcard image generating +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y +BR2_PACKAGE_MILKV_DUO_PINMUX=y +BR2_PACKAGE_MILKV_DUO_FEATURES=y +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y + +# Host packages for the sdcard image generating +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_LZMA_ALONE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -- 2.34.1 From hanyuan-z at qq.com Wed Feb 7 07:49:51 2024 From: hanyuan-z at qq.com (Hanyuan Zhao) Date: Wed, 7 Feb 2024 15:49:51 +0800 Subject: [Buildroot] [PATCH v4 2/3] package/milkv-duo-smallcore-freertos: new package In-Reply-To: <20240207074950.2049-1-hanyuan-z@qq.com> References: <20240207074950.2049-1-hanyuan-z@qq.com> Message-ID: This commit adds the freertos support for the RISC-V dev board milk-v duo. https://github.com/milkv-duo/milkv-duo-smallcore-freertos Co-authored-by: Emil S Signed-off-by: Hanyuan Zhao --- Changes v3 -> v4: - Move the make recipes to the repo - Bump the version to latest Changes v2 -> v3: - No Changes Changes v1 -> v2: - Set the depends and select logic - Add host tools --- package/Config.in | 1 + .../milkv-duo-smallcore-freertos/Config.in | 21 ++++++++++++++++++ .../milkv-duo-smallcore-freertos.mk | 22 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 package/milkv-duo-smallcore-freertos/Config.in create mode 100644 package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk diff --git a/package/Config.in b/package/Config.in index 322aba90b8..7be3316f71 100644 --- a/package/Config.in +++ b/package/Config.in @@ -565,6 +565,7 @@ endmenu source "package/memtool/Config.in" source "package/mhz/Config.in" source "package/milkv-duo-libraries/Config.in" + source "package/milkv-duo-smallcore-freertos/Config.in" source "package/minicom/Config.in" source "package/msr-tools/Config.in" source "package/nanocom/Config.in" diff --git a/package/milkv-duo-smallcore-freertos/Config.in b/package/milkv-duo-smallcore-freertos/Config.in new file mode 100644 index 0000000000..8503932461 --- /dev/null +++ b/package/milkv-duo-smallcore-freertos/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS + bool "milkv-duo-smallcore-freertos" + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL + select BR2_PACKAGE_HOST_CMAKE + help + This package is obtained from + https://github.com/milkv-duo/duo-buildroot-sdk, + from which we download the FreeRTOS ported to Milk-V Duo + into the Buildroot. This FreeRTOS will run in the small core + and will not do anything because it is simply a template + with some basic UART demos. You can realize your own ideas + by adding code to + + output/build/milkv-duo-smallcore-freertos-hash/cvitek/task + /comm/src/riscv64/comm_main.c + + If you say Y, then every time you make Buildroot, it will + automatically compile and include the FreeRTOS into the + fip.bin, which will then be packed into sdcard.img + + https://github.com/milkv-duo/milkv-duo-smallcore-freertos diff --git a/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk new file mode 100644 index 0000000000..1d8d4fcf12 --- /dev/null +++ b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# milkv-duo-smallcore-freertos +# +################################################################################ + +MILKV_DUO_SMALLCORE_FREERTOS_VERSION = 10b86e308ca2305a464ae2bb3eb868a72295f7ab +MILKV_DUO_SMALLCORE_FREERTOS_SITE = $(call github,milkv-duo,milkv-duo-smallcore-freertos,$(MILKV_DUO_SMALLCORE_FREERTOS_VERSION)) +MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING = YES +MILKV_DUO_SMALLCORE_FREERTOS_DEPENDENCIES = host-cmake host-ninja +MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV = CROSS_COMPILE=$(TARGET_CROSS) MK_ENV=$(TARGET_MAKE_ENV) TARGET_CMAKE=$(BR2_CMAKE) BUILD_PATH=$(@D) + +define MILKV_DUO_SMALLCORE_FREERTOS_BUILD_CMDS + $(MAKE) -C $(@D) all $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) +endef + +define MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0755 $(@D)/cvitek/install/bin/cvirtos.bin $(BINARIES_DIR)/cvirtos.bin + touch $(BINARIES_DIR)/empty.bin +endef + +$(eval $(generic-package)) -- 2.34.1 From peter at korsgaard.com Wed Feb 7 08:16:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 09:16:29 +0100 Subject: [Buildroot] [PATCH v2] package/minisign: new package In-Reply-To: <20240108222957.3567-1-patrick.oppenlander@gmail.com> (patrick oppenlander's message of "Tue, 9 Jan 2024 09:25:51 +1100") References: <20240108222957.3567-1-patrick.oppenlander@gmail.com> Message-ID: <87bk8s3d0i.fsf@48ers.dk> >>>>> "patrick" == patrick oppenlander writes: > From: Patrick Oppenlander > Signed-off-by: Patrick Oppenlander > --- > Changes from v1 (reviewed by Baruch Siach): > * host-libsodium dependency was incorrectly on to the target dependencies list. ./utils/check-package points out a few minor issues: package/Config.in:1572: Packages in: menu "Crypto", are not alphabetically ordered; correct order: '-', '_', digits, capitals, lowercase; first incorrect package: minisign package/minisign/Config.in:6: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/minisign/Config.in.host:4: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) You put it in Libraries/Crypto, but I isn't a library, so I think it makes more sense to put it under "shell and utilities" like we do for gnupg2. Committed with those issues fixed and an entry in DEVELOPERS added, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 08:20:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 09:20:38 +0100 Subject: [Buildroot] [git commit] package/minisign: new package Message-ID: <20240207082105.001BE874DA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d90ac63d9b3448a239bb9aa8030326699a3fdc3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Patrick Oppenlander [Peter: Fix check-package warnings, move to "Shell and utilities" and add DEVELOPERS entry] Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/Config.in.host | 1 + package/minisign/Config.in | 9 +++++++++ package/minisign/Config.in.host | 7 +++++++ package/minisign/minisign.hash | 3 +++ package/minisign/minisign.mk | 19 +++++++++++++++++++ 7 files changed, 43 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index fc47c51d33..471c739678 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2402,6 +2402,9 @@ N: Patrick Havelange F: support/testing/tests/package/test_lxc.py F: support/testing/tests/package/test_lxc/ +N: Patrick Oppenlander +F: package/minisign/ + N: Paul Cercueil F: package/libiio/ F: package/lightning/ diff --git a/package/Config.in b/package/Config.in index 047877c960..24e5f04ed6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2685,6 +2685,7 @@ comment "Utilities" source "package/lockfile-progs/Config.in" source "package/logrotate/Config.in" source "package/logsurfer/Config.in" + source "package/minisign/Config.in" source "package/neofetch/Config.in" source "package/pdmenu/Config.in" source "package/pinentry/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index c80842c33a..f03ca16b7b 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -64,6 +64,7 @@ menu "Host utilities" source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" source "package/microchip-hss-payload-generator/Config.in.host" + source "package/minisign/Config.in.host" source "package/mkpasswd/Config.in.host" source "package/moby-buildkit/Config.in.host" source "package/mosquitto/Config.in.host" diff --git a/package/minisign/Config.in b/package/minisign/Config.in new file mode 100644 index 0000000000..b852903921 --- /dev/null +++ b/package/minisign/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_MINISIGN + bool "minisign" + select BR2_PACKAGE_LIBSODIUM + select BR2_PACKAGE_LIBSODIUM_FULL + help + Minisign is a dead simple tool to sign files and verify + signatures. + + https://github.com/jedisct1/minisign diff --git a/package/minisign/Config.in.host b/package/minisign/Config.in.host new file mode 100644 index 0000000000..99a89b7cf3 --- /dev/null +++ b/package/minisign/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_MINISIGN + bool "host minisign" + help + Minisign is a dead simple tool to sign files and verify + signatures. + + https://github.com/jedisct1/minisign diff --git a/package/minisign/minisign.hash b/package/minisign/minisign.hash new file mode 100644 index 0000000000..12cde42a43 --- /dev/null +++ b/package/minisign/minisign.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 74c2c78a1cd51a43a6c98f46a4eabefbc8668074ca9aa14115544276b663fc55 minisign-0.11.tar.gz +sha256 d775d155cbf31638714c31c6f990f9fdc5f07998d91e42d1bf15483bd2d1706b LICENSE diff --git a/package/minisign/minisign.mk b/package/minisign/minisign.mk new file mode 100644 index 0000000000..34b3f4046e --- /dev/null +++ b/package/minisign/minisign.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# minisign +# +################################################################################ + +MINISIGN_VERSION = 0.11 +MINISIGN_SITE = $(call github,jedisct1,minisign,$(MINISIGN_VERSION)) +MINISIGN_LICENSE = ISC +MINISIGN_LICENSE_FILES = LICENSE +MINISIGN_DEPENDENCIES = libsodium +HOST_MINISIGN_DEPENDENCIES = host-libsodium + +ifeq ($(BR2_STATIC_LIBS),y) +MINISIGN_CONF_OPTS += -DBUILD_STATIC_EXECUTABLES=1 +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From arnout at mind.be Wed Feb 7 08:23:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 09:23:15 +0100 Subject: [Buildroot] [PATCH v2 1/4] package/python-poetry-core: new host package In-Reply-To: References: <20240106214410.3294887-1-james.hilliard1@gmail.com> Message-ID: <9b42a9e2-c741-41f3-be5a-cc36c421b1bf@mind.be> On 06/02/2024 20:32, James Hilliard wrote: > On Tue, Feb 6, 2024 at 10:43?AM Arnout Vandecappelle wrote: >> >> Hi James, >> >> On 06/01/2024 22:44, James Hilliard wrote: >>> Signed-off-by: James Hilliard >>> --- >>> package/python-poetry-core/python-poetry-core.hash | 5 +++++ >>> package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ >>> 2 files changed, 19 insertions(+) >>> create mode 100644 package/python-poetry-core/python-poetry-core.hash >>> create mode 100644 package/python-poetry-core/python-poetry-core.mk >>> >>> diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash >>> new file mode 100644 >>> index 0000000000..3c07fef04f >>> --- /dev/null >>> +++ b/package/python-poetry-core/python-poetry-core.hash >>> @@ -0,0 +1,5 @@ >>> +# md5, sha256 from https://pypi.org/pypi/poetry-core/json >>> +md5 9ed2f2e9244165b34d7233c306a34a2a poetry_core-1.8.1.tar.gz >>> +sha256 67a76c671da2a70e55047cddda83566035b701f7e463b32a2abfeac6e2a16376 poetry_core-1.8.1.tar.gz >>> +# Locally computed sha256 checksums >>> +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE >>> diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk >>> new file mode 100644 >>> index 0000000000..e1acf3179c >>> --- /dev/null >>> +++ b/package/python-poetry-core/python-poetry-core.mk >>> @@ -0,0 +1,14 @@ >>> +################################################################################ >>> +# >>> +# python-poetry-core >>> +# >>> +################################################################################ >>> + >>> +PYTHON_POETRY_CORE_VERSION = 1.8.1 >>> +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz >>> +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/36/66/6af2891495d12020419c8447d0b29c1e96f3be16631faaed6bda5b886d5d >>> +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 >>> +PYTHON_POETRY_CORE_LICENSE = MIT >>> +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE >> >> This package has 4 vendored dependencies, each with their own license. Those >> should also be specified in the LICENSE and LICENSE_FILES. > > Does this look right? > https://patchwork.ozlabs.org/project/buildroot/patch/20240206193048.658003-1-james.hilliard1 at gmail.com/ Excellent, thank you! Regards, Arnout > >> >> In addition, for lark, there's a file under MPL and a file under GPL, even >> though neither if those licenses is mentioned in the lark license. Ideally those >> two should be mentioned in the LICENSES as well. And of course, this should >> ideally also be done for the python-lark package which suffers from the same >> issue... >> >> Regards, >> Arnout >> >>> + >>> +$(eval $(host-python-package)) From peter at korsgaard.com Wed Feb 7 08:37:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 09:37:24 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/containerd: bump version to v1.7.13 In-Reply-To: <20240207023158.2572044-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 18:31:58 -0800") References: <20240207023158.2572044-1-christian@aperture.us> Message-ID: <877cjg3c1n.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/containerd/containerd/releases/tag/v1.7.13 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 08:38:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 09:38:34 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/runc: bump version to v1.1.12 In-Reply-To: <20240207023225.2572189-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 18:32:25 -0800") References: <20240207023225.2572189-1-christian@aperture.us> Message-ID: <8734u43bzp.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/opencontainers/runc/releases/tag/v1.1.12 As clearly stated in the release notes this is a security fix (for https://github.com/advisories/GHSA-xr7r-f8xq-vfvv), so I've marked it as such and committed, thanks. > Signed-off-by: Christian Stewart > --- > package/runc/runc.hash | 2 +- > package/runc/runc.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > diff --git a/package/runc/runc.hash b/package/runc/runc.hash > index 5ffd21a5dd..d6eb27d352 100644 > --- a/package/runc/runc.hash > +++ b/package/runc/runc.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 509993674481aad7e14aedfb280e0eb160f3a34c0b77e2e98c4b3c0b1df76894 runc-1.1.9.tar.gz > +sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 runc-1.1.12.tar.gz > sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE > diff --git a/package/runc/runc.mk b/package/runc/runc.mk > index 62e117685a..273509b860 100644 > --- a/package/runc/runc.mk > +++ b/package/runc/runc.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -RUNC_VERSION = 1.1.9 > +RUNC_VERSION = 1.1.12 > RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) > RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) > RUNC_LICENSE_FILES = LICENSE > -- > 2.43.0 -- Bye, Peter Korsgaard From romain.naour at smile.fr Wed Feb 7 08:45:02 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 09:45:02 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/python-bitarray: new package Message-ID: <20240207084503.11109-1-romain.naour@smile.fr> This package is needed at runtime by python-bitstring since 4.1.0 already [1]. Note: the License is under Python-2.0 but "Python Software Foundation License (PSF)" has been remplaced by the author of bitarray Ilan Schnell. [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 Signed-off-by: Romain Naour Reviewed-by: Marcus Hoffmann --- Triple checked the license type with other distribution: https://salsa.debian.org/python-team/packages/python-bitarray/-/blob/master/debian/copyright?ref_type=heads https://src.fedoraproject.org/rpms/python-bitarray/blob/rawhide/f/python-bitarray.spec https://aur.archlinux.org/packages/python-bitarray v2: update python-bitstring version (Marcus Hoffmann) --- package/Config.in | 1 + package/python-bitarray/Config.in | 6 ++++++ package/python-bitarray/python-bitarray.hash | 5 +++++ package/python-bitarray/python-bitarray.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-bitarray/Config.in create mode 100644 package/python-bitarray/python-bitarray.hash create mode 100644 package/python-bitarray/python-bitarray.mk diff --git a/package/Config.in b/package/Config.in index 24e5f04ed6..89537f87b6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1008,6 +1008,7 @@ menu "External python modules" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bidict/Config.in" + source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" source "package/python-bleak/Config.in" source "package/python-blinker/Config.in" diff --git a/package/python-bitarray/Config.in b/package/python-bitarray/Config.in new file mode 100644 index 0000000000..38d685f4fd --- /dev/null +++ b/package/python-bitarray/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_BITARRAY + bool "python-bitarray" + help + efficient arrays of booleans -- C extension. + + https://github.com/ilanschnell/bitarray diff --git a/package/python-bitarray/python-bitarray.hash b/package/python-bitarray/python-bitarray.hash new file mode 100644 index 0000000000..d91a28af20 --- /dev/null +++ b/package/python-bitarray/python-bitarray.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/bitarray/json +md5 024324a82314e9e68ecdcdefdc69071f bitarray-2.9.2.tar.gz +sha256 a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e bitarray-2.9.2.tar.gz +# Locally computed sha256 checksums +sha256 6b5e04f6e0462e1b97be833f9d65e66cd5eceb3283f4a6f532261087d0ab1233 LICENSE diff --git a/package/python-bitarray/python-bitarray.mk b/package/python-bitarray/python-bitarray.mk new file mode 100644 index 0000000000..f86320c112 --- /dev/null +++ b/package/python-bitarray/python-bitarray.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-bitarray +# +################################################################################ + +PYTHON_BITARRAY_VERSION = 2.9.2 +PYTHON_BITARRAY_SOURCE = bitarray-$(PYTHON_BITARRAY_VERSION).tar.gz +PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/c7/bf/25cf92a83e1fe4948d7935ae3c02f4c9ff9cb9c13e977fba8af11a5f642c +PYTHON_BITARRAY_SETUP_TYPE = setuptools +PYTHON_BITARRAY_LICENSE = Python-2.0 +PYTHON_BITARRAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) -- 2.43.0 From romain.naour at smile.fr Wed Feb 7 08:45:03 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 09:45:03 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/python-bitstring: add missing runtime dependency In-Reply-To: <20240207084503.11109-1-romain.naour@smile.fr> References: <20240207084503.11109-1-romain.naour@smile.fr> Message-ID: <20240207084503.11109-2-romain.naour@smile.fr> python-bitstring require python-bitarray and python-zlib at runtime since 4.1.0 release [1][2]. python-zlib is now needed for the "Experimental support for two 8-bit float types" [2]. Fixes: https://gitlab.com/kubu93/buildroot/-/jobs/6114047821 [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 [2] https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 Signed-off-by: Romain Naour Cc: James Hilliard --- v2: fix commit log about python-bitstring release (Marcus Hoffmann) reproduce the issue on gitlab-ci and update the Fixes tag url. --- package/python-bitstring/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-bitstring/Config.in b/package/python-bitstring/Config.in index 93d7682577..82d0bb29c6 100644 --- a/package/python-bitstring/Config.in +++ b/package/python-bitstring/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_BITSTRING bool "python-bitstring" + select BR2_PACKAGE_PYTHON_BITARRAY # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Simple construction, analysis and modification of binary data. -- 2.43.0 From peter at korsgaard.com Wed Feb 7 08:35:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 09:35:01 +0100 Subject: [Buildroot] [git commit] package/containerd: bump version to v1.7.13 Message-ID: <20240207084729.86562874ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54e95ba1711bb4fd389f07d803a5518dcfe97745 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/containerd/containerd/releases/tag/v1.7.13 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 5524a1a44e..25dc7ff55d 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 containerd-1.7.8.tar.gz +sha256 ae2b914bff0ddbb9b29d5fc689a51e1ce89ea4edfc4df9ae10517c6f5d2d5aaf containerd-1.7.13.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index d3ca102797..50c2965b87 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.7.8 +CONTAINERD_VERSION = 1.7.13 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 7 08:38:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 09:38:38 +0100 Subject: [Buildroot] [git commit] package/runc: security bump to version v1.1.12 Message-ID: <20240207084729.951F3874EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c0b5beea44005a38ab563067fedbe27a0c015cd5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following vulnerabilities: - CVE-2024-21626: runc vulnerable to container breakout through process.cwd trickery and leaked fds https://github.com/advisories/GHSA-xr7r-f8xq-vfvv https://github.com/opencontainers/runc/releases/tag/v1.1.12 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 5ffd21a5dd..d6eb27d352 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 509993674481aad7e14aedfb280e0eb160f3a34c0b77e2e98c4b3c0b1df76894 runc-1.1.9.tar.gz +sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 runc-1.1.12.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 62e117685a..273509b860 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.9 +RUNC_VERSION = 1.1.12 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Feb 7 08:50:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 09:50:12 +0100 Subject: [Buildroot] [git commit] package/linux-tools: introduce linux mm tools Message-ID: <20240207085040.0A7DC874F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39aaf091ae0a88a7f84c50d52aff84c36caeadaa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This toolset was designed to facilitate the testing, monitoring, and tracing of various things with virtual memory, pages, and slab objects. It is an invaluable resource for identifying and analyzing memory-related issues, such as leaks and bottlenecks, and can greatly enhance one's understanding of memory utilization within a system. The mm toolset includes: - page_owner_sort: userspace helper to sort the output of /sys/kernel/debug/page_owner, which helps to know who allocates the page from kernel context - slabinfo: the tool which gets reports about slabs, for example show empty slabs, modify of slab debug options at runtime, display all information about a slabcache - page-types: a handy tool for querying page flags Signed-off-by: Dmitry Rokosov Signed-off-by: Alexey Romanov [yann.morin.1998 at free.fr: - don't depend on linux, already a patch dependency - don't set CC: default is based on CROSS_COMPILE - no need to fully recheck at install time - move the option for alphabetical ordering - fix check-package ] Signed-off-by: Yann E. MORIN --- package/linux-tools/Config.in | 19 +++++++++++++++++ package/linux-tools/linux-tool-mm.mk.in | 37 +++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index fb158f84d4..5a38f6dafe 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -38,6 +38,25 @@ config BR2_PACKAGE_LINUX_TOOLS_IIO These tools are available only from kernel version 4.7. +config BR2_PACKAGE_LINUX_TOOLS_MM + bool "mm" + select BR2_PACKAGE_LINUX_TOOLS + help + mm is a toolset for testing/monitoring/tracing vm/pages/slabs + objects. + + - page_owner_sort: userspace helper to sort the output of + /sys/kernel/debug/page_owner, which helps to know who + allocates the page from kernel context + + - slabinfo: the tool which gets reports about slabs, for + example show empty slabs, modify of slab debug options at + runtime, display all information about a slabcache + + - page-types: a handy tool for querying page flags + + These tools are available only from kernel version 3.4. + config BR2_PACKAGE_LINUX_TOOLS_PCI bool "pci" select BR2_PACKAGE_LINUX_TOOLS diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in new file mode 100644 index 0000000000..b2ec090fc0 --- /dev/null +++ b/package/linux-tools/linux-tool-mm.mk.in @@ -0,0 +1,37 @@ +################################################################################ +# +# mm +# +################################################################################ + +LINUX_TOOLS += mm + +define MM_BUILD_CMDS + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ + MM_SUBDIR=vm; \ + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ + MM_SUBDIR=mm; \ + else \ + echo "Your kernel version is too old and does not have the mm tool." ; \ + echo "At least kernel 3.4 must be used." ; \ + exit 1 ; \ + fi ; \ + $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR)/tools \ + $(MM_MAKE_OPTS) $${MM_SUBDIR} +endef + +# For install no need to recheck both cases: we know at least one +# exists, because that was checked at build time already; we just +# need to find which of the two: if not one, then the other. +define MM_INSTALL_TARGET_CMDS + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ + MM_SUBDIR=vm; \ + else \ + MM_SUBDIR=mm; \ + fi ; \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(LINUX_MAKE_FLAGS) \ + INSTALL_ROOT=$(TARGET_DIR) \ + DESTDIR=$(TARGET_DIR) \ + $${MM_SUBDIR}_install +endef From peter at korsgaard.com Wed Feb 7 08:51:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 09:51:17 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/nerdctl: bump version to v1.7.3 In-Reply-To: <20240207023258.2572359-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 18:32:57 -0800") References: <20240207023258.2572359-1-christian@aperture.us> Message-ID: <87y1bw1wu2.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/containerd/nerdctl/releases/tag/v1.7.3 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From yann.morin.1998 at free.fr Wed Feb 7 08:55:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 09:55:23 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/linux-tools: introduce linux mm tools In-Reply-To: <20240206192543.7179-2-ddrokosov@salutedevices.com> References: <20240206192543.7179-1-ddrokosov@salutedevices.com> <20240206192543.7179-2-ddrokosov@salutedevices.com> Message-ID: Dmitry, All, On 2024-02-06 22:25 +0300, Dmitry Rokosov spake thusly: > This toolset was designed to facilitate the testing, monitoring, and > tracing of various things with virtual memory, pages, and slab objects. > It is an invaluable resource for identifying and analyzing > memory-related issues, such as leaks and bottlenecks, and can greatly > enhance one's understanding of memory utilization within a system. > > The mm toolset includes: > - page_owner_sort: userspace helper to sort the output of > /sys/kernel/debug/page_owner, which helps to know who allocates > the page from kernel context > - slabinfo: the tool which gets reports about slabs, for example > show empty slabs, modify of slab debug options at runtime, display > all information about a slabcache > - page-types: a handy tool for querying page flags > > Signed-off-by: Dmitry Rokosov > Signed-off-by: Alexey Romanov I've applied, after making a few changes: - don't depend on linux, already a patch dependency - don't set CC: default is based on CROSS_COMPILE - no need to fully recheck at install time - move the option for alphabetical ordering - fix check-package See below for a few more omments... > --- > package/linux-tools/Config.in | 18 +++++++++++ > package/linux-tools/linux-tool-mm.mk.in | 41 +++++++++++++++++++++++++ > 2 files changed, 59 insertions(+) > create mode 100644 package/linux-tools/linux-tool-mm.mk.in > > diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in > index 8a0b6d5802cc..ede966ec792d 100644 > --- a/package/linux-tools/Config.in > +++ b/package/linux-tools/Config.in > @@ -185,4 +185,22 @@ config BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON > > endif # BR2_PACKAGE_LINUX_TOOLS_HV > > +config BR2_PACKAGE_LINUX_TOOLS_MM > + bool "mm" > + select BR2_PACKAGE_LINUX_TOOLS > + help > + mm is a toolset for testing/monitoring/tracing vm/pages/slabs objects. > + > + - page_owner_sort: userspace helper to sort the output of > + /sys/kernel/debug/page_owner, which helps to know who allocates > + the page from kernel context > + > + - slabinfo: the tool which gets reports about slabs, for example > + show empty slabs, modify of slab debug options at runtime, display > + all information about a slabcache > + > + - page-types: a handy tool for querying page flags > + > + These tools are available only from kernel version 3.4. $ ./utils/docker-run make check-package package/linux-tools/Config.in:244: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/linux-tools/Config.in:247: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/linux-tools/Config.in:250: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) package/linux-tools/Config.in:251: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > endmenu > diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in > new file mode 100644 > index 000000000000..5431e0574b04 > --- /dev/null > +++ b/package/linux-tools/linux-tool-mm.mk.in > @@ -0,0 +1,41 @@ > +################################################################################ > +# > +# mm > +# > +################################################################################ > + > +LINUX_TOOLS += mm > + > +MM_DEPENDENCIES = linux No need to add an explicit dependency: the linux-tools micro-infra already handles it in a generic way; indeed, there is no reason for each individual linux-tool to add a dependency on linux: they all have that dependency. > +MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" No need to explicitly set CC: the kernel Makefile sets it based on CROSS_COMPILE already. > +define MM_BUILD_CMDS > + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > + MM_SUBDIR=vm; \ > + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ > + MM_SUBDIR=mm; \ > + else \ > + echo "Your kernel version is too old and does not have the mm tool." ; \ > + echo "At least kernel 3.4 must be used." ; \ > + exit 1 ; \ > + fi ; \ > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > + $(MM_MAKE_OPTS) $${MM_SUBDIR} > +endef > + > +define MM_INSTALL_TARGET_CMDS > + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > + MM_SUBDIR=vm; \ > + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ > + MM_SUBDIR=mm; \ > + else \ > + echo "Your kernel version is too old and does not have the mm tool." ; \ > + echo "At least kernel 3.4 must be used." ; \ > + exit 1 ; \ > + fi ; \ For install, we do need to know which directory to use, indeed, but we already do know one exists, as it was used at build, above; so we do not need the error case. I've simplified this part and added a comment to explain it. Applied to master with those changes, thanks. Regards, Yann E. MORIN. > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > + $(MM_MAKE_OPTS) \ > + INSTALL_ROOT=$(TARGET_DIR) \ > + DESTDIR=$(TARGET_DIR) \ > + $${MM_SUBDIR}_install > +endef > -- > 2.43.0 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Feb 7 08:58:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 09:58:20 +0100 Subject: [Buildroot] [PATCH v1 1/2] package/docker-engine: bump version to v25.0.3 In-Reply-To: <20240207022157.2560531-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 18:21:56 -0800") References: <20240207022157.2560531-1-christian@aperture.us> Message-ID: <87ttmk1wib.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/moby/moby/releases/tag/v25.0.3 This is also a security bump. In fact, it would be nicer to first bump to 24.0.9 which could then be backported to 2023.02.x and 2023.11.x and then afterwards bump to 25.0.3. I see the buildkit issues are not fixed in 24.0.9, but I guess it is unlikely that we have Buildroot based systems BUILDING containers, so that is probably less critical. Care to rework it as two bumps? > Signed-off-by: Christian Stewart > --- > package/docker-engine/docker-engine.hash | 2 +- > package/docker-engine/docker-engine.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash > index 931d6529e1..40293be7e0 100644 > --- a/package/docker-engine/docker-engine.hash > +++ b/package/docker-engine/docker-engine.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 docker-engine-24.0.7.tar.gz > +sha256 4cdb516f5d6f5caf8b3bcf93c2962277ba727cfd2d1620176a3bb0cf153b3590 docker-engine-25.0.3.tar.gz > sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE > diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk > index 262be2df20..066959e0c0 100644 > --- a/package/docker-engine/docker-engine.mk > +++ b/package/docker-engine/docker-engine.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -DOCKER_ENGINE_VERSION = 24.0.7 > +DOCKER_ENGINE_VERSION = 25.0.3 > DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) > DOCKER_ENGINE_LICENSE = Apache-2.0 > -- > 2.43.0 -- Bye, Peter Korsgaard From neal.frager at amd.com Wed Feb 7 09:00:00 2024 From: neal.frager at amd.com (Frager, Neal) Date: Wed, 7 Feb 2024 09:00:00 +0000 Subject: [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware In-Reply-To: <20240131112223.2175855-6-neal.frager@amd.com> References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-6-neal.frager@amd.com> Message-ID: Hello everyone, Now that the toolchain-bare-metal-buildroot has been applied, do you have any feedback regarding the remainder of the patch set? One open question I have is regarding the patches for zynqmp-firmware and versal-firmware. These patches are no longer neeeded since being applied to release version xilinx_v2023.2. I kept them with the idea that users may still be using older versions of software, so the patches enable users to work with versions as old as 2022.2 for zynqmp and 2023.1 for versal. Do you agree with keeping the patches or do you think it is better not to include them and to say that support begins starting with version xilinx_v2023.2? What are your thoughts? > create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch > create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch Best regards, Neal Frager AMD From peter at korsgaard.com Wed Feb 7 09:01:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:01:53 +0100 Subject: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump version to v2.24.5 In-Reply-To: <20240207022245.2560726-1-christian@aperture.us> (Christian Stewart's message of "Tue, 6 Feb 2024 18:22:45 -0800") References: <20240207022245.2560726-1-christian@aperture.us> Message-ID: <87plx81wce.fsf@48ers.dk> >>>>> "Christian" == Christian Stewart writes: > https://github.com/docker/compose/releases/tag/v2.24.5 > Signed-off-by: Christian Stewart Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:02:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:02:01 +0100 Subject: [Buildroot] [git commit] package/nerdctl: bump version to v1.7.3 Message-ID: <20240207090226.D2BED87500@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e37b73f7a2a6f4d2628c7d35f402557357a11101 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/containerd/nerdctl/releases/tag/v1.7.3 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/nerdctl/nerdctl.hash | 2 +- package/nerdctl/nerdctl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash index 1fb0649fb2..52e249824f 100644 --- a/package/nerdctl/nerdctl.hash +++ b/package/nerdctl/nerdctl.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 574438dd7c88e6a607c6f82932f8ada174b1133a66ee0fa0f7510e7c3bebacb4 nerdctl-1.3.1.tar.gz +sha256 fff8c348efa4ff6753e1aacded0dedddcb255c50b00d8b3a37a660b1fb1dd31a nerdctl-1.7.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk index 43e862f7f9..66b22df646 100644 --- a/package/nerdctl/nerdctl.mk +++ b/package/nerdctl/nerdctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NERDCTL_VERSION = 1.3.1 +NERDCTL_VERSION = 1.7.3 NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) NERDCTL_LICENSE = Apache-2.0 From peter at korsgaard.com Wed Feb 7 09:02:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:02:02 +0100 Subject: [Buildroot] [git commit] package/docker-compose: bump version to v2.24.5 Message-ID: <20240207090226.E11FD874F3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=457db5c328d777ada4c9c0d5ff3c84c189dea5e2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master https://github.com/docker/compose/releases/tag/v2.24.5 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index afccafd994..92f7b227d3 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8a1109124e7dfef736ad3db0457d807eb41a0068211bd13e52051252cab28dda docker-compose-2.23.0.tar.gz +sha256 ed132bcc226261a595469f5ca6d4ea20b02965867216b56d4e7a5962efb46570 docker-compose-2.24.5.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 54557b9841..947f09d0b3 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.23.0 +DOCKER_COMPOSE_VERSION = 2.24.5 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From peter at korsgaard.com Wed Feb 7 09:07:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:07:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/timescaledb: bump version to 2.13.1 In-Reply-To: <20240207063324.1003727-1-fido_max@inbox.ru> (Maxim Kochetkov via buildroot's message of "Wed, 7 Feb 2024 09:33:24 +0300") References: <20240207063324.1003727-1-fido_max@inbox.ru> Message-ID: <87le7w1w3s.fsf@48ers.dk> >>>>> "Maxim" == Maxim Kochetkov via buildroot writes: > Release notes: https://github.com/timescale/timescaledb/blob/2.13.1/CHANGELOG.md > Signed-off-by: Maxim Kochetkov Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:03:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:03:24 +0100 Subject: [Buildroot] [git commit] package/timescaledb: bump version to 2.13.1 Message-ID: <20240207090723.649FF87505@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d2e694b95e4f1410ac5c76687db695401c5649c6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/timescale/timescaledb/blob/2.13.1/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index b7e4c71774..8d0fc125d6 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 584a351c7775f0e067eaa0e7277ea88cab9077cc4c455cbbf09a5d9723dce95d timescaledb-2.13.0.tar.gz +sha256 ca4f48147cb1bf3bf22af9f643822a5931e12a89909cc73c4a89ddae3c828ac1 timescaledb-2.13.1.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 34a48ad0c3..a5d77eda80 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.13.0 +TIMESCALEDB_VERSION = 2.13.1 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Feb 7 09:07:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:07:51 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/linux-tools: multilib build supported In-Reply-To: <20240206192543.7179-3-ddrokosov@salutedevices.com> References: <20240206192543.7179-1-ddrokosov@salutedevices.com> <20240206192543.7179-3-ddrokosov@salutedevices.com> Message-ID: Dmitry, All, On 2024-02-06 22:25 +0300, Dmitry Rokosov spake thusly: > From: Konstantin Menyaev > > - LINUX_TOOLS_MAKE_OPTS option introduced: > allows to override CROSS_COMPILE param What is the rationale for this? How is it supposed to be used? CROSS_COMPILE is already part of LINUX_MAKE_FLAGS, so there is no reason to pass it explicitly either. Otherwise, I am not convinced anout the "multilib" title either, because Buildroot does not do multilib systems anyway, so I am missing the point of the patch... If you feel there really is a nedd, please resubmit with an extended commit log. Thanks! Regards, Yann E. MORIN. > Signed-off-by: Konstantin Menyaev > Signed-off-by: Dmitry Rokosov > --- > package/linux-tools/linux-tool-gpio.mk.in | 2 +- > package/linux-tools/linux-tool-iio.mk.in | 2 +- > package/linux-tools/linux-tool-mm.mk.in | 2 +- > package/linux-tools/linux-tool-pci.mk.in | 2 +- > package/linux-tools/linux-tool-perf.mk.in | 2 +- > package/linux-tools/linux-tool-selftests.mk.in | 2 +- > package/linux-tools/linux-tool-tmon.mk.in | 2 +- > package/linux-tools/linux-tools.mk | 2 ++ > 8 files changed, 9 insertions(+), 7 deletions(-) > > diff --git a/package/linux-tools/linux-tool-gpio.mk.in b/package/linux-tools/linux-tool-gpio.mk.in > index e825db1b1127..dcee11002e8c 100644 > --- a/package/linux-tools/linux-tool-gpio.mk.in > +++ b/package/linux-tools/linux-tool-gpio.mk.in > @@ -6,7 +6,7 @@ > > LINUX_TOOLS += gpio > > -GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > +GPIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > define GPIO_BUILD_CMDS > $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ > diff --git a/package/linux-tools/linux-tool-iio.mk.in b/package/linux-tools/linux-tool-iio.mk.in > index 27ab0ed7ed63..1372faafd1a8 100644 > --- a/package/linux-tools/linux-tool-iio.mk.in > +++ b/package/linux-tools/linux-tool-iio.mk.in > @@ -6,7 +6,7 @@ > > LINUX_TOOLS += iio > > -IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > +IIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > define IIO_BUILD_CMDS > $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ > diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in > index 5431e0574b04..51a54026dea4 100644 > --- a/package/linux-tools/linux-tool-mm.mk.in > +++ b/package/linux-tools/linux-tool-mm.mk.in > @@ -7,7 +7,7 @@ > LINUX_TOOLS += mm > > MM_DEPENDENCIES = linux > -MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" > +MM_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) CC="$(TARGET_CC)" > > define MM_BUILD_CMDS > $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in > index 17246f5d7ed2..48c3435a5c8a 100644 > --- a/package/linux-tools/linux-tool-pci.mk.in > +++ b/package/linux-tools/linux-tool-pci.mk.in > @@ -6,7 +6,7 @@ > > LINUX_TOOLS += pci > > -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > +PCI_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > define PCI_BUILD_CMDS > $(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \ > diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in > index ee308a85dfd1..38910cda7d75 100644 > --- a/package/linux-tools/linux-tool-perf.mk.in > +++ b/package/linux-tools/linux-tool-perf.mk.in > @@ -19,7 +19,7 @@ PERF_ARCH=$(NORMALIZED_ARCH) > endif > > PERF_MAKE_FLAGS = \ > - $(LINUX_MAKE_FLAGS) \ > + $(LINUX_TOOLS_MAKE_OPTS) \ > JOBS=$(PARALLEL_JOBS) \ > ARCH=$(PERF_ARCH) \ > DESTDIR=$(TARGET_DIR) \ > diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in > index e29c7f59debd..144dd6616f2b 100644 > --- a/package/linux-tools/linux-tool-selftests.mk.in > +++ b/package/linux-tools/linux-tool-selftests.mk.in > @@ -22,7 +22,7 @@ SELFTESTS_DEPENDENCIES = \ > $(if $(BR2_PACKAGE_OPENSSL),openssl) > > SELFTESTS_MAKE_FLAGS = \ > - $(LINUX_MAKE_FLAGS) \ > + $(LINUX_TOOLS_MAKE_OPTS) \ > ARCH=$(SELFTESTS_ARCH) > > # O must be redefined here to overwrite the one used by Buildroot for > diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in > index 56c328c51fd7..7c33915049c2 100644 > --- a/package/linux-tools/linux-tool-tmon.mk.in > +++ b/package/linux-tools/linux-tool-tmon.mk.in > @@ -7,7 +7,7 @@ > LINUX_TOOLS += tmon > > TMON_DEPENDENCIES = host-pkgconf ncurses > -TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ > +TMON_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) \ > CC=$(TARGET_CC) \ > LDFLAGS="$(TARGET_LDFLAGS)" \ > PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig > diff --git a/package/linux-tools/linux-tools.mk b/package/linux-tools/linux-tools.mk > index 81b1fbc17605..38bb2c83966a 100644 > --- a/package/linux-tools/linux-tools.mk > +++ b/package/linux-tools/linux-tools.mk > @@ -26,6 +26,8 @@ LINUX_TOOLS_PATCH_DEPENDENCIES = linux > # may install shared libraries and headers (e.g. cpupower). > LINUX_TOOLS_INSTALL_STAGING = YES > > +LINUX_TOOLS_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CROSS_COMPILE="$(TARGET_CROSS)" > + > LINUX_TOOLS_DEPENDENCIES += $(foreach tool,$(LINUX_TOOLS),\ > $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ > $($(call UPPERCASE,$(tool))_DEPENDENCIES))) > -- > 2.43.0 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Feb 7 09:08:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:08:39 +0100 Subject: [Buildroot] [PATCH 1/1] Fix alphabetical order of DEVELOPERS file entry In-Reply-To: <20240207070806.7331-2-kilian.zinnecker@mail.de> (Kilian Zinnecker via buildroot's message of "Wed, 7 Feb 2024 08:08:06 +0100") References: <20240207070806.7331-1-kilian.zinnecker@mail.de> <20240207070806.7331-2-kilian.zinnecker@mail.de> Message-ID: <87h6ik1w14.fsf@48ers.dk> >>>>> "Kilian" == Kilian Zinnecker via buildroot writes: > Signed-off-by: Kilian Zinnecker Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:08:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:08:28 +0100 Subject: [Buildroot] [git commit] Fix alphabetical order of DEVELOPERS file entry Message-ID: <20240207090857.B36D187509@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53fad3242d74b9fad11978429d6cc2879f783f4b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Kilian Zinnecker Signed-off-by: Peter Korsgaard --- DEVELOPERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 471c739678..7906a940a9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1887,9 +1887,9 @@ N: Kieran Bingham F: package/libcamera/ N: Kilian Zinnecker -F: package/rockchip-rkbin/ -F: configs/rock5b_defconfig F: board/radxa/rock5b/ +F: configs/rock5b_defconfig +F: package/rockchip-rkbin/ N: Klaus Heinrich Kiwi F: package/wqy-zenhei/ From thomas.petazzoni at bootlin.com Wed Feb 7 09:09:14 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 10:09:14 +0100 Subject: [Buildroot] [git commit] boot/arm-trusted-firmware: fix hash checking Message-ID: <20240207091027.96A568750E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de964d7b784442e598ea40accff364a661ad893e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c6ab9328e13c6c9a1538b4a33824525a990b623d ("boot/arm-trusted-firmware: change BR_NO_CHECK_HASH_FOR logic") was written too hastily, and is actually broken as it does the reverse of what it should do. It really should disable the check when we're using a custom version/git/tarball of TF-A, not the opposite. Thanks to Romain for pointing out the problem, and providing an IRL patch to solve the issue. Reported-by: Romain Naour Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 89cdf48c70..2d554c1da8 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -25,7 +25,7 @@ ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif endif -ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE):$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y:y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) endif From romain.naour at smile.fr Wed Feb 7 09:21:10 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:21:10 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am64x_sk_defconfig: explicitly set the kernel version Message-ID: <20240207092111.236577-1-romain.naour@smile.fr> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the Linux kernel version, so do that now. When the defconfig was added, the default version was 6.4.x, so use version 6.4.16. Signed-off-by: Romain Naour --- configs/ti_am64x_sk_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 052c440093..b3e69e9e93 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,7 +1,10 @@ BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" -- 2.43.0 From romain.naour at smile.fr Wed Feb 7 09:21:11 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:21:11 +0100 Subject: [Buildroot] [PATCH 2/2] configs/ti_am64x_sk_defconfig: drop redundant defconfig choice In-Reply-To: <20240207092111.236577-1-romain.naour@smile.fr> References: <20240207092111.236577-1-romain.naour@smile.fr> Message-ID: <20240207092111.236577-2-romain.naour@smile.fr> The defconfig choice is the default one, so it is redundant and can be removed without effect. Signed-off-by: Romain Naour --- configs/ti_am64x_sk_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index b3e69e9e93..4bfd31f0c8 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -24,7 +24,6 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y -BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y -- 2.43.0 From romain.naour at smile.fr Wed Feb 7 09:19:23 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:19:23 +0100 Subject: [Buildroot] [git commit] configs/ti_am62x_sk_defconfig: explicitly set the kernel version Message-ID: <20240207092234.A448D87517@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b75fb9f5a51261843807779a99c6c383cdad95c1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig) forgot to specify the Linux kernel version, so do that now. When the defconfig was added, the default version was 6.4.x, so use version 6.4.16. Signed-off-by: Dario Binacchi [Romain: use BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 as suggested by Giulio Benetti] Signed-off-by: Romain Naour --- configs/ti_am62x_sk_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index b98a68ff15..495b233789 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,7 +1,10 @@ BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" From romain.naour at smile.fr Wed Feb 7 09:19:25 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:19:25 +0100 Subject: [Buildroot] [git commit] configs/ti_am62x_sk_defconfig: drop redundant defconfig choice Message-ID: <20240207092234.B2BFB87518@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=694001df1ad6024b2a3f2748bb3712c782573087 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The defconfig choice is the default one, so it is redundant and can be removed without effect. Signed-off-by: Dario Binacchi Reviewed-by: Giulio Benetti Signed-off-by: Romain Naour --- configs/ti_am62x_sk_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 495b233789..f88252a89c 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -24,7 +24,6 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y -BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y From yann.morin.1998 at free.fr Wed Feb 7 09:24:10 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:24:10 +0100 Subject: [Buildroot] [PATCH] utils/genrandconfig: add default setting for bare-metal toolchain arch In-Reply-To: <20240207070541.2296330-1-thomas.petazzoni@bootlin.com> References: <20240207070541.2296330-1-thomas.petazzoni@bootlin.com> Message-ID: Thomas, All, On 2024-02-07 08:05 +0100, Thomas Petazzoni via buildroot spake thusly: > We recently added support for building a bare-metal toolchain, and the > autobuilders are therefore trying to build such toolchains. However, > by default the BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH option is > empty, causing the target tuple to be empty, and therefore > host-gcc-bare-metal tries to build a toolchain for the target > "x86_64-pc-linux-gnu", which isn't a bare-metal target, and fails > badly. > > In order to properly test this bare-metal support, this commit adjusts > the genrandconfig script so that it injects a valid target > architecture tuple. > > Fixes: > > http://autobuild.buildroot.net/results/6cb1514b19bfe056fb984d3538bdccdda5e174c1/ > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > utils/genrandconfig | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/utils/genrandconfig b/utils/genrandconfig > index 52edad06d8..eb1f8cbd4a 100755 > --- a/utils/genrandconfig > +++ b/utils/genrandconfig > @@ -315,6 +315,10 @@ def fixup_config(sysinfo, configfile): > 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: > return False > > + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y' in configlines: > + configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""') > + configlines.add('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"') > + > if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ > 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: > return False > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Wed Feb 7 09:24:46 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:24:46 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am62x_sk_defconfig: explicitly set the kernel version In-Reply-To: <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> References: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> Message-ID: <56e14939-d7e3-4cc4-87f1-90c4e3decac1@smile.fr> Hello Dario, All, Le 05/02/2024 ? 16:13, Giulio Benetti a ?crit?: > Hi Dario, > > On 23/11/23 14:40, Dario Binacchi wrote: >> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig) forgot to >> specify the Linux kernel version, so do that now. >> >> When the defconfig was added, the default version was 6.4.x, so use >> version 6.4.16. >> >> Signed-off-by: Dario Binacchi > --- >> ? configs/ti_am62x_sk_defconfig | 3 +++ >> ? 1 file changed, 3 insertions(+) >> >> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >> index b98a68ff153f..6610e6fcf890 100644 >> --- a/configs/ti_am62x_sk_defconfig >> +++ b/configs/ti_am62x_sk_defconfig >> @@ -1,7 +1,10 @@ >> ? BR2_aarch64=y >> +BR2_KERNEL_HEADERS_6_4=y > > here ^^^ you need to specify BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 > and not the line above, > >> ? BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> ? BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" >> ? BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" >> ? BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >> ? BR2_LINUX_KERNEL_DTS_SUPPORT=y >> ? BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > > Can you please correct and send V2? I fixed the kernel header symbol before pushing. Both patches applied to master, thanks. Best regards, Romain > > Thank you! > > Best regards From dario.binacchi at amarulasolutions.com Wed Feb 7 09:24:45 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 10:24:45 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/davinci-bootcount: update GitHub URL Message-ID: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> The patch updates the GitHub URL, which has recently changed. Signed-off-by: Dario Binacchi --- (no changes since v2) package/davinci-bootcount/Config.in | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/davinci-bootcount/Config.in b/package/davinci-bootcount/Config.in index e34adde570af..0201530f9166 100644 --- a/package/davinci-bootcount/Config.in +++ b/package/davinci-bootcount/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_DAVINCI_BOOTCOUNT SCRATCH2 register. This tool allows to read and write this register from userspace. - https://github.com/VoltServer/uboot-davinci-bootcount + https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 695d39688ac6..884bf420f396 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -5,7 +5,7 @@ ################################################################################ DAVINCI_BOOTCOUNT_VERSION = 2.0.0 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING -- 2.43.0 From dario.binacchi at amarulasolutions.com Wed Feb 7 09:24:46 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 10:24:46 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/davinci-bootcount: rename to uboot-bootcount In-Reply-To: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> References: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207092447.2094160-2-dario.binacchi@amarulasolutions.com> Born as a project to read/write the bootcount on the TI am3xx platform, over time it has introduced bootcount management on EEPROM and for the stm32mp1 platform. As a result, the project removed the 'davinci' tag from its name and GitHub link. The patch aligns the package name in Buildroot with the current one on GitHub. Signed-off-by: Dario Binacchi --- Config.in.legacy | 6 ++++++ DEVELOPERS | 2 +- package/Config.in | 2 +- package/davinci-bootcount/Config.in | 11 ----------- package/davinci-bootcount/davinci-bootcount.mk | 15 --------------- package/uboot-bootcount/Config.in | 10 ++++++++++ .../uboot-bootcount.hash} | 2 +- package/uboot-bootcount/uboot-bootcount.mk | 15 +++++++++++++++ 8 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 package/davinci-bootcount/Config.in delete mode 100644 package/davinci-bootcount/davinci-bootcount.mk create mode 100644 package/uboot-bootcount/Config.in rename package/{davinci-bootcount/davinci-bootcount.hash => uboot-bootcount/uboot-bootcount.hash} (80%) create mode 100644 package/uboot-bootcount/uboot-bootcount.mk diff --git a/Config.in.legacy b/Config.in.legacy index 5fbe5d903074..cf32f887d4b0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_DAVINCI_BOOTCOUNT + bool "davinci-bootcount has been renamed" + select BR2_LEGACY + help + The davinci-bootcount package has been renamed. + config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7906a940a9b2..43dd5c8cb49d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -760,7 +760,7 @@ F: package/sscep/ F: package/uuu/ N: Dario Binacchi -F: package/davinci-bootcount/ +F: package/uboot-bootcount/ F: package/libmnl/ N: David Bachelart diff --git a/package/Config.in b/package/Config.in index 24e5f04ed671..4c6deb13337c 100644 --- a/package/Config.in +++ b/package/Config.in @@ -486,7 +486,6 @@ endmenu source "package/cwiid/Config.in" source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" - source "package/davinci-bootcount/Config.in" source "package/dbus/Config.in" source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" @@ -638,6 +637,7 @@ endmenu source "package/ti-utils/Config.in" source "package/tio/Config.in" source "package/triggerhappy/Config.in" + source "package/uboot-bootcount/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" source "package/udev/Config.in" diff --git a/package/davinci-bootcount/Config.in b/package/davinci-bootcount/Config.in deleted file mode 100644 index 0201530f9166..000000000000 --- a/package/davinci-bootcount/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_DAVINCI_BOOTCOUNT - bool "davinci-bootcount" - depends on BR2_arm # only relevant for TI am335x - help - U-Boot implements a boot count scheme that can be used to - detect multiple failed attempts to boot Linux. On Davinci - platform (TI AM 335x) the `bootcount' is stored in the RTC - SCRATCH2 register. This tool allows to read and write this - register from userspace. - - https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk deleted file mode 100644 index 884bf420f396..000000000000 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# davinci-bootcount -# -################################################################################ - -DAVINCI_BOOTCOUNT_VERSION = 2.0.0 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) -DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 -DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING - -# sources fetched from github, no configure script -DAVINCI_BOOTCOUNT_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package/uboot-bootcount/Config.in b/package/uboot-bootcount/Config.in new file mode 100644 index 000000000000..53a0bd9174a4 --- /dev/null +++ b/package/uboot-bootcount/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_UBOOT_BOOTCOUNT + bool "uboot-bootcount" + default y if BR2_PACKAGE_DAVINCI_BOOTCOUNT # legacy + help + U-Boot implements a boot count scheme that can be used to + detect multiple failed attempts to boot Linux. This tool + allows to read and write bootcount from userspace for some + platforms (TI AM335X or STM32MP1) or from I2C EEPROM. + + https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash similarity index 80% rename from package/davinci-bootcount/davinci-bootcount.hash rename to package/uboot-bootcount/uboot-bootcount.hash index 53435b1d1d6d..e1ebc442357e 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/uboot-bootcount/uboot-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-2.0.0.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e uboot-bootcount-2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk new file mode 100644 index 000000000000..07b52ab89eb5 --- /dev/null +++ b/package/uboot-bootcount/uboot-bootcount.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# uboot-bootcount +# +################################################################################ + +UBOOT_BOOTCOUNT_VERSION = 2.0.0 +UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION)) +UBOOT_BOOTCOUNT_LICENSE = GPL-3.0 +UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING + +# sources fetched from github, no configure script +UBOOT_BOOTCOUNT_AUTORECONF = YES + +$(eval $(autotools-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Wed Feb 7 09:24:47 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 10:24:47 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/uboot-bootcount: bump to version 3.0.0 In-Reply-To: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> References: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207092447.2094160-3-dario.binacchi@amarulasolutions.com> - Support for i.MX 8M chipsets - README: updated documentation and source comments Release notes: https://github.com/VoltServer/uboot-bootcount/releases/tag/v3.0.0 Signed-off-by: Dario Binacchi --- Changes in v3: - The patch has been added to the series because a new version has been released in the meantime. package/uboot-bootcount/uboot-bootcount.hash | 2 +- package/uboot-bootcount/uboot-bootcount.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uboot-bootcount/uboot-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash index e1ebc442357e..7f46da22ebe0 100644 --- a/package/uboot-bootcount/uboot-bootcount.hash +++ b/package/uboot-bootcount/uboot-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e uboot-bootcount-2.0.0.tar.gz +sha256 b26b9135716afb2ea967edc2327d1d307cdd15a643bd105dc223d062e18f2dda uboot-bootcount-3.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk index 07b52ab89eb5..48a45b91aae0 100644 --- a/package/uboot-bootcount/uboot-bootcount.mk +++ b/package/uboot-bootcount/uboot-bootcount.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_BOOTCOUNT_VERSION = 2.0.0 +UBOOT_BOOTCOUNT_VERSION = 3.0.0 UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION)) UBOOT_BOOTCOUNT_LICENSE = GPL-3.0 UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING -- 2.43.0 From yann.morin.1998 at free.fr Wed Feb 7 09:23:48 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:23:48 +0100 Subject: [Buildroot] [git commit] utils/genrandconfig: add default setting for bare-metal toolchain arch Message-ID: <20240207093130.758A88751C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b7232c51dd402afb361d7c310855e0bf5666958d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We recently added support for building a bare-metal toolchain, and the autobuilders are therefore trying to build such toolchains. However, by default the BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH option is empty, causing the target tuple to be empty, and therefore host-gcc-bare-metal tries to build a toolchain for the target "x86_64-pc-linux-gnu", which isn't a bare-metal target, and fails badly. In order to properly test this bare-metal support, this commit adjusts the genrandconfig script so that it injects a valid target architecture tuple. Fixes: http://autobuild.buildroot.net/results/6cb1514b19bfe056fb984d3538bdccdda5e174c1/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- utils/genrandconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 52edad06d8..eb1f8cbd4a 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -315,6 +315,10 @@ def fixup_config(sysinfo, configfile): 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: return False + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y' in configlines: + configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""') + configlines.add('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"') + if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: return False From peter at korsgaard.com Wed Feb 7 09:35:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:35:37 +0100 Subject: [Buildroot] [PATCH v3 1/3] package/davinci-bootcount: update GitHub URL In-Reply-To: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> (Dario Binacchi's message of "Wed, 7 Feb 2024 10:24:45 +0100") References: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> Message-ID: <87a5oc1us6.fsf@48ers.dk> >>>>> "Dario" == Dario Binacchi writes: > The patch updates the GitHub URL, which has recently changed. > Signed-off-by: Dario Binacchi > --- > (no changes since v2) Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:37:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:37:23 +0100 Subject: [Buildroot] [PATCH v3 2/3] package/davinci-bootcount: rename to uboot-bootcount In-Reply-To: <20240207092447.2094160-2-dario.binacchi@amarulasolutions.com> (Dario Binacchi's message of "Wed, 7 Feb 2024 10:24:46 +0100") References: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> <20240207092447.2094160-2-dario.binacchi@amarulasolutions.com> Message-ID: <875xz01up8.fsf@48ers.dk> >>>>> "Dario" == Dario Binacchi writes: > Born as a project to read/write the bootcount on the TI am3xx platform, > over time it has introduced bootcount management on EEPROM and for the > stm32mp1 platform. As a result, the project removed the 'davinci' tag > from its name and GitHub link. > The patch aligns the package name in Buildroot with the current one on > GitHub. > Signed-off-by: Dario Binacchi > --- > Config.in.legacy | 6 ++++++ > DEVELOPERS | 2 +- > package/Config.in | 2 +- > package/davinci-bootcount/Config.in | 11 ----------- > package/davinci-bootcount/davinci-bootcount.mk | 15 --------------- > package/uboot-bootcount/Config.in | 10 ++++++++++ > .../uboot-bootcount.hash} | 2 +- > package/uboot-bootcount/uboot-bootcount.mk | 15 +++++++++++++++ > 8 files changed, 34 insertions(+), 29 deletions(-) > delete mode 100644 package/davinci-bootcount/Config.in > delete mode 100644 package/davinci-bootcount/davinci-bootcount.mk > create mode 100644 package/uboot-bootcount/Config.in > rename package/{davinci-bootcount/davinci-bootcount.hash => > uboot-bootcount/uboot-bootcount.hash} (80%) > create mode 100644 package/uboot-bootcount/uboot-bootcount.mk > diff --git a/Config.in.legacy b/Config.in.legacy > index 5fbe5d903074..cf32f887d4b0 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,12 @@ endif > comment "Legacy options removed in 2024.02" > +config BR2_PACKAGE_DAVINCI_BOOTCOUNT > + bool "davinci-bootcount has been renamed" > + select BR2_LEGACY We normally add the legacy handling here, so I've added select BR2_PACKAGE_UBOOT_BOOTCOUNT (and dropped it from the package). > + help > + The davinci-bootcount package has been renamed. And extended this to mention the new name. Committed with these changes, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:38:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 10:38:57 +0100 Subject: [Buildroot] [PATCH v3 3/3] package/uboot-bootcount: bump to version 3.0.0 In-Reply-To: <20240207092447.2094160-3-dario.binacchi@amarulasolutions.com> (Dario Binacchi's message of "Wed, 7 Feb 2024 10:24:47 +0100") References: <20240207092447.2094160-1-dario.binacchi@amarulasolutions.com> <20240207092447.2094160-3-dario.binacchi@amarulasolutions.com> Message-ID: <871q9o1umm.fsf@48ers.dk> >>>>> "Dario" == Dario Binacchi writes: > - Support for i.MX 8M chipsets > - README: updated documentation and source comments > Release notes: > https://github.com/VoltServer/uboot-bootcount/releases/tag/v3.0.0 > Signed-off-by: Dario Binacchi > --- > Changes in v3: > - The patch has been added to the series because a new version has been > released in the meantime. Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 09:39:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:39:10 +0100 Subject: [Buildroot] [git commit] package/uboot-bootcount: bump to version 3.0.0 Message-ID: <20240207093924.4C0F687535@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f8035296fe603c2457821c022d5c0f14b46d819 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Support for i.MX 8M chipsets - README: updated documentation and source comments Release notes: https://github.com/VoltServer/uboot-bootcount/releases/tag/v3.0.0 Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard --- package/uboot-bootcount/uboot-bootcount.hash | 2 +- package/uboot-bootcount/uboot-bootcount.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uboot-bootcount/uboot-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash index e1ebc44235..7f46da22eb 100644 --- a/package/uboot-bootcount/uboot-bootcount.hash +++ b/package/uboot-bootcount/uboot-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e uboot-bootcount-2.0.0.tar.gz +sha256 b26b9135716afb2ea967edc2327d1d307cdd15a643bd105dc223d062e18f2dda uboot-bootcount-3.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk index 07b52ab89e..48a45b91aa 100644 --- a/package/uboot-bootcount/uboot-bootcount.mk +++ b/package/uboot-bootcount/uboot-bootcount.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_BOOTCOUNT_VERSION = 2.0.0 +UBOOT_BOOTCOUNT_VERSION = 3.0.0 UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION)) UBOOT_BOOTCOUNT_LICENSE = GPL-3.0 UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 7 09:39:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:39:08 +0100 Subject: [Buildroot] [git commit] package/davinci-bootcount: update GitHub URL Message-ID: <20240207093924.2AAE787532@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f443c7236d42c21f676cfb2cd3c8deea2423a3c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The patch updates the GitHub URL, which has recently changed. Signed-off-by: Dario Binacchi Signed-off-by: Peter Korsgaard --- package/davinci-bootcount/Config.in | 2 +- package/davinci-bootcount/davinci-bootcount.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/davinci-bootcount/Config.in b/package/davinci-bootcount/Config.in index e34adde570..0201530f91 100644 --- a/package/davinci-bootcount/Config.in +++ b/package/davinci-bootcount/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_DAVINCI_BOOTCOUNT SCRATCH2 register. This tool allows to read and write this register from userspace. - https://github.com/VoltServer/uboot-davinci-bootcount + https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 695d39688a..884bf420f3 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -5,7 +5,7 @@ ################################################################################ DAVINCI_BOOTCOUNT_VERSION = 2.0.0 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 7 09:39:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 10:39:09 +0100 Subject: [Buildroot] [git commit] package/davinci-bootcount: rename to uboot-bootcount Message-ID: <20240207093924.3DC5F8751B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=678cf889ec2551a0a523dbf67cf08d8880cc0aa7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Born as a project to read/write the bootcount on the TI am3xx platform, over time it has introduced bootcount management on EEPROM and for the stm32mp1 platform. As a result, the project removed the 'davinci' tag from its name and GitHub link. The patch aligns the package name in Buildroot with the current one on GitHub. Signed-off-by: Dario Binacchi [Peter: extend/rework legacy handling] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 ++++++++ DEVELOPERS | 2 +- package/Config.in | 2 +- package/davinci-bootcount/Config.in | 11 ----------- package/davinci-bootcount/davinci-bootcount.mk | 15 --------------- package/uboot-bootcount/Config.in | 9 +++++++++ .../uboot-bootcount.hash} | 2 +- package/uboot-bootcount/uboot-bootcount.mk | 15 +++++++++++++++ 8 files changed, 35 insertions(+), 29 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 5fbe5d9030..5e0db855cc 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_DAVINCI_BOOTCOUNT + bool "davinci-bootcount has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_UBOOT_BOOTCOUNT + help + The davinci-bootcount package has been renamed to + uboot-bootcount. + config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 7906a940a9..43dd5c8cb4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -760,7 +760,7 @@ F: package/sscep/ F: package/uuu/ N: Dario Binacchi -F: package/davinci-bootcount/ +F: package/uboot-bootcount/ F: package/libmnl/ N: David Bachelart diff --git a/package/Config.in b/package/Config.in index 24e5f04ed6..4c6deb1333 100644 --- a/package/Config.in +++ b/package/Config.in @@ -486,7 +486,6 @@ endmenu source "package/cwiid/Config.in" source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" - source "package/davinci-bootcount/Config.in" source "package/dbus/Config.in" source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" @@ -638,6 +637,7 @@ endmenu source "package/ti-utils/Config.in" source "package/tio/Config.in" source "package/triggerhappy/Config.in" + source "package/uboot-bootcount/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" source "package/udev/Config.in" diff --git a/package/davinci-bootcount/Config.in b/package/davinci-bootcount/Config.in deleted file mode 100644 index 0201530f91..0000000000 --- a/package/davinci-bootcount/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_DAVINCI_BOOTCOUNT - bool "davinci-bootcount" - depends on BR2_arm # only relevant for TI am335x - help - U-Boot implements a boot count scheme that can be used to - detect multiple failed attempts to boot Linux. On Davinci - platform (TI AM 335x) the `bootcount' is stored in the RTC - SCRATCH2 register. This tool allows to read and write this - register from userspace. - - https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk deleted file mode 100644 index 884bf420f3..0000000000 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# davinci-bootcount -# -################################################################################ - -DAVINCI_BOOTCOUNT_VERSION = 2.0.0 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) -DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 -DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING - -# sources fetched from github, no configure script -DAVINCI_BOOTCOUNT_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package/uboot-bootcount/Config.in b/package/uboot-bootcount/Config.in new file mode 100644 index 0000000000..ae936b424a --- /dev/null +++ b/package/uboot-bootcount/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_UBOOT_BOOTCOUNT + bool "uboot-bootcount" + help + U-Boot implements a boot count scheme that can be used to + detect multiple failed attempts to boot Linux. This tool + allows to read and write bootcount from userspace for some + platforms (TI AM335X or STM32MP1) or from I2C EEPROM. + + https://github.com/VoltServer/uboot-bootcount diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash similarity index 80% rename from package/davinci-bootcount/davinci-bootcount.hash rename to package/uboot-bootcount/uboot-bootcount.hash index 53435b1d1d..e1ebc44235 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/uboot-bootcount/uboot-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-2.0.0.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e uboot-bootcount-2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk new file mode 100644 index 0000000000..07b52ab89e --- /dev/null +++ b/package/uboot-bootcount/uboot-bootcount.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# uboot-bootcount +# +################################################################################ + +UBOOT_BOOTCOUNT_VERSION = 2.0.0 +UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION)) +UBOOT_BOOTCOUNT_LICENSE = GPL-3.0 +UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING + +# sources fetched from github, no configure script +UBOOT_BOOTCOUNT_AUTORECONF = YES + +$(eval $(autotools-package)) From yann.morin.1998 at free.fr Wed Feb 7 09:39:42 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:39:42 +0100 Subject: [Buildroot] [git commit] package/tinyxml2: add host variant Message-ID: <20240207094101.70AE68753D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1a572abf8a552b42f3107a05871255f44d77f217 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It is required by package uuu starting from version 1.5.165. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/tinyxml2/tinyxml2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index 5ea9e13a4b..f53e8d6b99 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -16,3 +16,4 @@ TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON endif $(eval $(cmake-package)) +$(eval $(host-cmake-package)) From yann.morin.1998 at free.fr Wed Feb 7 09:39:43 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:39:43 +0100 Subject: [Buildroot] [git commit] package/uuu: bump to version 1.5.165 Message-ID: <20240207094101.7B2D48753F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7b13cc2c264d20698d7f48a4bbbbdffc0698b06f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It requires the host-tinyxml2 package. The hash of README.md has changed because a reference to the tinyxml2 license has been added: + - tinyxml (zlib license) is from https://github.com/leethomason/tinyxml2 Release notes: https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.163 https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.165 Signed-off-by: Dario Binacchi [yann.morin.1998 at free.fr: - split long dependency line - reorder dependencies alphabetically ] Signed-off-by: Yann E. MORIN --- package/uuu/uuu.hash | 4 ++-- package/uuu/uuu.mk | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index 20816b5081..c231d5d729 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,4 @@ # locally computed -sha256 6972c7a1e76d60a22212913a8867b737104410c2a47ad88c8af460bd4885ec09 uuu_source-uuu_1.5.141.tar.gz +sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE -sha256 2d872c6e5aaea15ec1932bfb378fb62e24ee7ec399fe7f998f03d9b728215335 README.md +sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 93c748ee46..80d5e1937a 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -4,11 +4,17 @@ # ################################################################################ -UUU_VERSION = 1.5.141 +UUU_VERSION = 1.5.165 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License UUU_LICENSE_FILES = LICENSE README.md -HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd +HOST_UUU_DEPENDENCIES = \ + host-bzip2 \ + host-libusb \ + host-openssl \ + host-tinyxml2 \ + host-zlib \ + host-zstd $(eval $(host-cmake-package)) From yann.morin.1998 at free.fr Wed Feb 7 09:41:11 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:41:11 +0100 Subject: [Buildroot] [PATCH 1/2] package/tinyxml2: add host variant In-Reply-To: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> References: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> Message-ID: Dario, All, On 2024-02-06 18:53 +0100, Dario Binacchi spake thusly: > It is required by package uuu starting from version 1.5.165. > > Signed-off-by: Dario Binacchi Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/tinyxml2/tinyxml2.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk > index 5ea9e13a4b0b..f53e8d6b9926 100644 > --- a/package/tinyxml2/tinyxml2.mk > +++ b/package/tinyxml2/tinyxml2.mk > @@ -16,3 +16,4 @@ TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON > endif > > $(eval $(cmake-package)) > +$(eval $(host-cmake-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Wed Feb 7 09:52:31 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 10:52:31 +0100 Subject: [Buildroot] [PATCH v3 01/11] boot/ti-k3-core-secdev: new package In-Reply-To: <20231218081958.506691-2-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-2-dario.binacchi@amarulasolutions.com> Message-ID: <51c20d9b-e85b-4ae1-a4e2-fa6c8741be3c@smile.fr> Hello Dario, All, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > This is a security development package containing tools for > High-Security(HS) TI K3 platform devices. > > Signed-off-by: Dario Binacchi > --- > DEVELOPERS | 1 + > boot/Config.in | 1 + > boot/ti-k3-core-secdev/Config.in | 9 +++++++++ > boot/ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 +++ > boot/ti-k3-core-secdev/ti-k3-core-secdev.mk | 19 +++++++++++++++++++ > 5 files changed, 33 insertions(+) > create mode 100644 boot/ti-k3-core-secdev/Config.in > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 311dcd950481..60a95434c70f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -754,6 +754,7 @@ F: package/xinetd/ > N: Dario Binacchi > F: board/bsh/ > F: board/stmicroelectronics/stm32f769-disco/ > +F: boot/ti-k3-core-secdev/ > F: configs/imx8mn_bsh_smm_s2_defconfig > F: configs/imx8mn_bsh_smm_s2_pro_defconfig > F: configs/stm32f769_disco_sd_defconfig > diff --git a/boot/Config.in b/boot/Config.in > index e5fdf7ad439e..18a7d268f95a 100644 > --- a/boot/Config.in > +++ b/boot/Config.in > @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" > source "boot/shim/Config.in" > source "boot/syslinux/Config.in" > source "boot/ti-k3-boot-firmware/Config.in" > +source "boot/ti-k3-core-secdev/Config.in" > source "boot/ti-k3-image-gen/Config.in" > source "boot/ti-k3-r5-loader/Config.in" > source "boot/uboot/Config.in" > diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in > new file mode 100644 > index 000000000000..1749b7ab5fd9 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/Config.in > @@ -0,0 +1,9 @@ > +config BR2_TARGET_TI_K3_CORE_SECDEV > + bool "ti-k3-core-secdev" > + depends on BR2_aarch64 > + help > + This package downloads and installs development tools for > + High-Security(HS) TI K3 platforms (which include AM62x, > + AM64x, AM65x and more). > + > + https://git.ti.com/cgit/security-development-tools/core-secdev-k3/ Remove the trailing '/' at the end of the url. > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > new file mode 100644 > index 000000000000..0460cff6c59f > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06 core-secdev-k3-08.06.00.007.tar.xz > +sha256 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369 k3-secdev-0.2-manifest.html > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > new file mode 100644 > index 000000000000..0127e6503d4d > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > @@ -0,0 +1,19 @@ > +################################################################################ > +# > +# ti-k3-core-secdev > +# > +################################################################################ > + > +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 > +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot > +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz > +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES > +TI_K3_CORE_SECDEV_LICENSE = TI Text File, Apache-2.0 What's the meaning of "TI Text File"? meta-ti's ti-k3-secdev package use BSD-3-Clause as license: https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb?h=kirkstone#n4 Can you verify the license? > +TI_K3_CORE_SECDEV_LICENSE_FILES = k3-secdev-0.2-manifest.html legal-info doesn't work since this file is under "manifest" directory. > + > +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS > + cp -dpfr $(@D)/keys $(BINARIES_DIR)/ > + cp -dpfr $(@D)/scripts $(BINARIES_DIR)/ > +endef I would suggest to create a sub-directory under $(BINARIES_DIR) to avoid any file conflict. Best regards, Romain > + > +$(eval $(generic-package)) From yann.morin.1998 at free.fr Wed Feb 7 09:56:10 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 10:56:10 +0100 Subject: [Buildroot] [PATCH 2/2] package/uuu: bump to version 1.5.165 In-Reply-To: <20240206175330.570115-2-dario.binacchi@amarulasolutions.com> References: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> <20240206175330.570115-2-dario.binacchi@amarulasolutions.com> Message-ID: Dario, All, On 2024-02-06 18:53 +0100, Dario Binacchi spake thusly: > It requires the host-tinyxml2 package. > > The hash of README.md has changed because a reference to the tinyxml2 > license has been added: > > + - tinyxml (zlib license) is from https://github.com/leethomason/tinyxml2 Thanks for explaining the hash change. :-) I wonder if it really makes sense to keep using the README file as a license file in Buildroot. Indeed, the licensing terms are for third-party libraries uuu links to, and even though they are bundled in the source tree of uuu|mfgtools, they are not used by Buildroot as we use the ones we build. Thoughts? > Release notes: > https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.163 > https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.165 > > Signed-off-by: Dario Binacchi Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/uuu/uuu.hash | 4 ++-- > package/uuu/uuu.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash > index 20816b5081db..c231d5d729f0 100644 > --- a/package/uuu/uuu.hash > +++ b/package/uuu/uuu.hash > @@ -1,4 +1,4 @@ > # locally computed > -sha256 6972c7a1e76d60a22212913a8867b737104410c2a47ad88c8af460bd4885ec09 uuu_source-uuu_1.5.141.tar.gz > +sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz > sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE > -sha256 2d872c6e5aaea15ec1932bfb378fb62e24ee7ec399fe7f998f03d9b728215335 README.md > +sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md > diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk > index 93c748ee46d8..d1bae61f528e 100644 > --- a/package/uuu/uuu.mk > +++ b/package/uuu/uuu.mk > @@ -4,11 +4,11 @@ > # > ################################################################################ > > -UUU_VERSION = 1.5.141 > +UUU_VERSION = 1.5.165 > UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz > UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) > UUU_LICENSE = BSD 3-Clause "New" or "Revised" License > UUU_LICENSE_FILES = LICENSE README.md > -HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd > +HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd host-tinyxml2 > > $(eval $(host-cmake-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From buildroot at bubu1.eu Wed Feb 7 09:58:48 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 10:58:48 +0100 Subject: [Buildroot] [PATCH] package/python3: add option to disable ensurepip In-Reply-To: <20240206225928.2290100-1-thomas.petazzoni@bootlin.com> References: <20240206225928.2290100-1-thomas.petazzoni@bootlin.com> Message-ID: Hi Thomas, On 06.02.24 23:59, Thomas Petazzoni via buildroot wrote: > This module takes 2.1 MB and is not needed in most Python > installations. > > Reported-by: Marcus Hoffmann > Signed-off-by: Thomas Petazzoni Thanks a lot for this patch after my suggestion! Patch looks good, but given the unfortunate "non-cooperative upstream", I still wonder if this wouldn't be easier to maintain if we just remove the installed module after the fact with a post install hook? I suppose a similar thing could be done for the other optional modules as well with the new py_cv_module_XYZ, which disables the native part but still requires patching makefile/configure.ac for not installing the python lib part. Both approaches work and get us to the same end result, so it's not too important to worry about, I guess :). Reviewed-by: Marcus Hoffmann > --- > ...-add-disable-ensurepip-module-option.patch | 68 +++++++++++++++++++ > package/python3/Config.in | 5 ++ > package/python3/python3.mk | 6 ++ > 3 files changed, 79 insertions(+) > create mode 100644 package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch > > diff --git a/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch b/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch > new file mode 100644 > index 0000000000..2761236c9b > --- /dev/null > +++ b/package/python3/0018-configure.ac-add-disable-ensurepip-module-option.patch > @@ -0,0 +1,68 @@ > +From 10b67aeb6a6be10218c3dd675d3e54874ced1a55 Mon Sep 17 00:00:00 2001 > +From: Thomas Petazzoni > +Date: Tue, 6 Feb 2024 23:49:32 +0100 > +Subject: [PATCH] configure.ac: add --disable-ensurepip-module option > + > +The ensurepip module weights 2.1 MB and is only needed if you need > +"support for bootstrapping the pip installer into an existing Python > +installation or virtual environment" [1]. > + > +This patch adds a --disable-ensurepip-module option that allows to not > +install it. It should not be confused with --without-ensurepip, which > +already exists, but even with --without-ensurepip, the ensurepip > +module gets installed, but not used during the build to bootstrap the > +pip installer. > + > +[1] https://docs.python.org/3/library/ensurepip.html > + > +Upstream: non-cooperative upstream > +Signed-off-by: Thomas Petazzoni > +--- > + Makefile.pre.in | 5 ++++- > + configure.ac | 7 +++++++ > + 2 files changed, 11 insertions(+), 1 deletion(-) > + > +diff --git a/Makefile.pre.in b/Makefile.pre.in > +index d9fae62aa9c..3a8e6200891 100644 > +--- a/Makefile.pre.in > ++++ b/Makefile.pre.in > +@@ -2096,7 +2096,6 @@ LIBSUBDIRS= asyncio \ > + dbm \ > + email email/mime \ > + encodings \ > +- ensurepip ensurepip/_bundled \ > + html \ > + http \ > + importlib importlib/resources importlib/metadata \ > +@@ -2274,6 +2273,10 @@ ifeq (@EXPAT@,yes) > + LIBSUBDIRS += $(XMLLIBSUBDIRS) > + endif > + > ++ifeq (@ENSUREPIP_MODULE@,yes) > ++LIBSUBDIRS += ensurepip ensurepip/_bundled > ++endif > ++ > + TEST_MODULES=@TEST_MODULES@ > + > + .PHONY: libinstall > +diff --git a/configure.ac b/configure.ac > +index 06df165ccc8..5774297b9da 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -6944,6 +6944,13 @@ AS_CASE([$with_ensurepip], > + AC_MSG_RESULT([$ENSUREPIP]) > + AC_SUBST([ENSUREPIP]) > + > ++AC_ARG_ENABLE([ensurepip-module], > ++ AS_HELP_STRING([--disable-ensurepip-module], [disable ensurepip module installation]), > ++ [ENSUREPIP_MODULE="${enableval}"], > ++ [ENSUREPIP_MODULE="yes"]) > ++AS_IF([test "${ENSUREPIP}" != "no"], [ENSUREPIP_MODULE="yes"]) > ++AC_SUBST([ENSUREPIP_MODULE]) > ++ > + # check if the dirent structure of a d_type field and DT_UNKNOWN is defined > + AC_CACHE_CHECK([if the dirent structure of a d_type field], [ac_cv_dirent_d_type], [ > + AC_LINK_IFELSE( > +-- > +2.43.0 > + > diff --git a/package/python3/Config.in b/package/python3/Config.in > index 38f0580aa4..a398a1d7dd 100644 > --- a/package/python3/Config.in > +++ b/package/python3/Config.in > @@ -75,6 +75,11 @@ config BR2_PACKAGE_PYTHON3_DECIMAL > help > decimal module for Python3. > > +config BR2_PACKAGE_PYTHON3_ENSUREPIP > + bool "ensurepip module" > + help > + ensurepip module for Python3. > + > config BR2_PACKAGE_PYTHON3_OSSAUDIODEV > bool "ossaudiodev module" > help > diff --git a/package/python3/python3.mk b/package/python3/python3.mk > index 42765abcf4..8685ca238d 100644 > --- a/package/python3/python3.mk > +++ b/package/python3/python3.mk > @@ -107,6 +107,12 @@ else > PYTHON3_CONF_ENV += py_cv_module__decimal=n/a > endif > > +ifeq ($(BR2_PACKAGE_PYTHON3_ENSUREPIP),y) > +PYTHON3_CONF_OPTS += --enable-ensurepip-module > +else > +PYTHON3_CONF_OPTS += --disable-ensurepip-module > +endif > + > ifeq ($(BR2_PACKAGE_PYTHON3_PYEXPAT),y) > PYTHON3_DEPENDENCIES += expat > PYTHON3_CONF_OPTS += --with-expat=system From buildroot at bubu1.eu Wed Feb 7 10:01:36 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 11:01:36 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/python-bitstring: add missing runtime dependency In-Reply-To: <20240207084503.11109-2-romain.naour@smile.fr> References: <20240207084503.11109-1-romain.naour@smile.fr> <20240207084503.11109-2-romain.naour@smile.fr> Message-ID: <0662d5f1-1582-480a-a10f-f714586cf546@bubu1.eu> On 07.02.24 09:45, Romain Naour wrote: > python-bitstring require python-bitarray and python-zlib at runtime > since 4.1.0 release [1][2]. > > python-zlib is now needed for the "Experimental support for two 8-bit > float types" [2]. > > Fixes: > https://gitlab.com/kubu93/buildroot/-/jobs/6114047821 > > [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 > [2] https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 > > Signed-off-by: Romain Naour > Cc: James Hilliard Reviewed-by: Marcus Hoffmann > --- > v2: fix commit log about python-bitstring release (Marcus Hoffmann) > reproduce the issue on gitlab-ci and update the Fixes tag url. > --- > package/python-bitstring/Config.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/package/python-bitstring/Config.in b/package/python-bitstring/Config.in > index 93d7682577..82d0bb29c6 100644 > --- a/package/python-bitstring/Config.in > +++ b/package/python-bitstring/Config.in > @@ -1,5 +1,7 @@ > config BR2_PACKAGE_PYTHON_BITSTRING > bool "python-bitstring" > + select BR2_PACKAGE_PYTHON_BITARRAY # runtime > + select BR2_PACKAGE_PYTHON3_ZLIB # runtime > help > Simple construction, analysis and modification of binary data. > From romain.naour at smile.fr Wed Feb 7 10:04:26 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 11:04:26 +0100 Subject: [Buildroot] [PATCH v3 02/11] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-3-dario.binacchi@amarulasolutions.com> Message-ID: <3d674bd1-a53f-4f82-93c1-58cbe14ab1db@smile.fr> Hello Dario, All, Le 06/02/2024 ? 18:50, Romain Naour a ?crit?: > Hello Dario, > > Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: >> The patch sets the configurations required by TI HS systems. Some of these >> configurations (i. e. HS SYSFW image signing key, HS Software Revision) >> are provided by the ti-k3-core-secdev package in the binaries directory. > > AFAIK the ti-k3-image-gen tool is deprecated and must be replaced by binman tool > provided by upstream u-boot. > > Is all k3 SoC migrated to binman in the latest u-boot release 2024.01? > > See the FOSDEM talk: > > https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/21919/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > > Best regards, > Romain > > >> >> Signed-off-by: Dario Binacchi >> --- >> boot/ti-k3-image-gen/Config.in | 1 + >> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- >> 2 files changed, 15 insertions(+), 2 deletions(-) >> >> diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in >> index d76cef82e911..38d1598d9fc0 100644 >> --- a/boot/ti-k3-image-gen/Config.in >> +++ b/boot/ti-k3-image-gen/Config.in >> @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >> bool "ti-k3-image-gen" >> depends on BR2_TARGET_TI_K3_R5_LOADER >> select BR2_TARGET_TI_K3_BOOT_FIRMWARE >> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS Does it means that currently TI HS configuration are missing the ti-k3-core-secdev tool to build properly? It seems this patch should fixes them. Best regards, Romain >> # We need FIT support in uboot-tools, which is why we select a >> # host package >> select BR2_PACKAGE_HOST_UBOOT_TOOLS >> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> index 64be9a18f2c4..91aed63bab84 100644 >> --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) >> TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) >> TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) >> >> -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >> +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) >> +TI_K3_IMAGE_GEN_SYSFW = \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >> +else >> +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev >> + >> +TI_K3_IMAGE_GEN_SYSFW = \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin >> +endif >> >> define TI_K3_IMAGE_GEN_CONFIGURE_CMDS >> - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) >> + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ >> + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ >> + ) >> endef >> >> define TI_K3_IMAGE_GEN_BUILD_CMDS >> @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS >> $(BR2_MAKE) -C $(@D) \ >> SOC=$(TI_K3_IMAGE_GEN_SOC) \ >> SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ >> + TI_SECURE_DEV_PKG=$(BINARIES_DIR) \ >> CONFIG=evm \ >> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ >> SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > From dario.binacchi at amarulasolutions.com Wed Feb 7 10:04:56 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 11:04:56 +0100 Subject: [Buildroot] [PATCH 1/4] configs/stm32f429_disco_xip_defconfig: drop redundant defconfig choice Message-ID: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi --- configs/stm32f429_disco_xip_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index d4e000487a80..99ae8cc7533b 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Wed Feb 7 10:04:57 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 11:04:57 +0100 Subject: [Buildroot] [PATCH 2/4] configs/stm32f469_disco_sd_defconfig: drop redundant defconfig choice In-Reply-To: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> References: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207100459.2896502-2-dario.binacchi@amarulasolutions.com> The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi --- configs/stm32f469_disco_sd_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index 8b10bc674176..66840a774230 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Wed Feb 7 10:04:58 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 11:04:58 +0100 Subject: [Buildroot] [PATCH 3/4] configs/stm32f469_disco_xip_defconfig: drop redundant defconfig choice In-Reply-To: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> References: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207100459.2896502-3-dario.binacchi@amarulasolutions.com> The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi --- configs/stm32f469_disco_xip_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index e362a9985116..6e6ead0fdebb 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Wed Feb 7 10:04:59 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 11:04:59 +0100 Subject: [Buildroot] [PATCH 4/4] configs/stm32f769_disco_sd_defconfig: drop redundant defconfig choice In-Reply-To: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> References: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207100459.2896502-4-dario.binacchi@amarulasolutions.com> The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi --- configs/stm32f769_disco_sd_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index 2ae27fb2d852..725c985ec04e 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f769-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" -- 2.43.0 From romain.naour at smile.fr Wed Feb 7 10:09:50 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 11:09:50 +0100 Subject: [Buildroot] [PATCH v3 05/11] package/python-referencing: add host variant In-Reply-To: <20231218081958.506691-6-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-6-dario.binacchi@amarulasolutions.com> Message-ID: <272a9412-ca98-4e6f-b91c-e5ff58bd0e92@smile.fr> Hello Dario, All, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. This package is required by binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi > > --- > > Changes in v3: > - Drop Config.in.host > > package/python-referencing/python-referencing.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk > index 4d11c99deb3b..9d8fc5a2f541 100644 > --- a/package/python-referencing/python-referencing.mk > +++ b/package/python-referencing/python-referencing.mk > @@ -11,7 +11,14 @@ PYTHON_REFERENCING_SETUP_TYPE = pep517 > PYTHON_REFERENCING_LICENSE = MIT > PYTHON_REFERENCING_LICENSE_FILES = COPYING > PYTHON_REFERENCING_DEPENDENCIES = \ > + host-python-attrs \ > + host-python-hatchling \ > + host-python-hatch-vcs Why are you adding host-python-attrs in dependency? is host-python-attrs already missing and should be fixed in a separate patch? Best regards, Romain > + > +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ > + host-python-attrs \ > host-python-hatchling \ > host-python-hatch-vcs > > $(eval $(python-package)) > +$(eval $(host-python-package)) From buildroot at bubu1.eu Wed Feb 7 10:10:15 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 11:10:15 +0100 Subject: [Buildroot] [PATCH v6 5/5] package/pkg-python.mk: migrate setuptools to pep517 In-Reply-To: <6049c19d-3ba6-4991-b47f-72b5d46c1e91@bubu1.eu> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-5-james.hilliard1@gmail.com> <6049c19d-3ba6-4991-b47f-72b5d46c1e91@bubu1.eu> Message-ID: <42b067d8-57ff-4cb8-836b-d8449226ec8a@bubu1.eu> On 06.02.24 23:31, Marcus Hoffmann wrote: > Hi James, all > [...] >> diff --git a/package/python-uvloop/python-uvloop.mk >> b/package/python-uvloop/python-uvloop.mk >> index 285884a2bb..70508fb6de 100644 >> --- a/package/python-uvloop/python-uvloop.mk >> +++ b/package/python-uvloop/python-uvloop.mk >> @@ -10,8 +10,10 @@ PYTHON_UVLOOP_SITE = >> https://files.pythonhosted.org/packages/9c/16/728cc5dde368e >> ? PYTHON_UVLOOP_SETUP_TYPE = setuptools >> ? PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT >> ? PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT >> -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv >> -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace >> --use-system-libuv >> ? PYTHON_UVLOOP_DEPENDENCIES = libuv > > This needs a new dependency on host-python-cython now. Otherwise it > fails with the following error: > > ERROR Missing dependencies: > ????Cython<0.30.0,>=0.29.36 To try and clarify why this is related to the pep517 switch: This dependency is also mentioned in the pyproject.toml [1]. When using the old setup.py this way to build the project this was only sometimes required. I.e. when you either explicitly forced a rebuild of the cython-generate files or were building from a git checkout instead of the pypi source tarball. I don't know why this logic didn't carry over to the pep517 world. @James, can we systematically check for packages that might now require cython? Did you build all setuptools packages with this patch at some point and only msgpack came up with the same problem? [1] https://github.com/MagicStack/uvloop/blob/v0.18.0/pyproject.toml#L59 >> +PYTHON_UVLOOP_BUILD_OPTS = \ >> +??? -C--build-option=build_ext \ >> +??? -C--build-option=--inplace \ >> +??? -C--build-option=--use-system-libuv >> ? $(eval $(python-package)) From buildroot at bubu1.eu Wed Feb 7 10:16:27 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 11:16:27 +0100 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <20231126180840.2081945-3-james.hilliard1@gmail.com> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> Message-ID: <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> Hi James, On 26.11.23 19:08, James Hilliard wrote: > We need host-python-cython for python-msgpack to build correctly. > This is a hard error when using a pep517 frontend. > > Fixes: > * Getting build dependencies for wheel... > running egg_info > writing msgpack.egg-info/PKG-INFO > writing dependency_links to msgpack.egg-info/dependency_links.txt > writing top-level names to msgpack.egg-info/top_level.txt > reading manifest file 'msgpack.egg-info/SOURCES.txt' > reading manifest template 'MANIFEST.in' > warning: no files found matching '*.c' under directory 'msgpack' > adding license file 'COPYING' > writing manifest file 'msgpack.egg-info/SOURCES.txt' > > ERROR Missing dependencies: > Cython~=0.29.30 > Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop still uses) also seem to be still developed in parallel. So maybe we need both as build host packages? Or do you see another solution? Marcus > Signed-off-by: James Hilliard > --- > package/python-msgpack/python-msgpack.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk > index 061ff5a761..c915b23bf4 100644 > --- a/package/python-msgpack/python-msgpack.mk > +++ b/package/python-msgpack/python-msgpack.mk > @@ -10,5 +10,6 @@ PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/c2/d5/5662032db157 > PYTHON_MSGPACK_LICENSE = Apache-2.0 > PYTHON_MSGPACK_LICENSE_FILES = COPYING > PYTHON_MSGPACK_SETUP_TYPE = setuptools > +PYTHON_MSGPACK_DEPENDENCIES = host-python-cython > > $(eval $(python-package)) From buildroot at bubu1.eu Wed Feb 7 10:17:38 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 11:17:38 +0100 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> Message-ID: <8bc41c70-4156-4c8d-8c8f-ed75df205c12@bubu1.eu> Forgot the reference link... On 07.02.24 11:16, Marcus Hoffmann via buildroot wrote: > Hi James, > > On 26.11.23 19:08, James Hilliard wrote: >> We need host-python-cython for python-msgpack to build correctly. >> This is a hard error when using a pep517 frontend. >> >> Fixes: >> * Getting build dependencies for wheel... >> running egg_info >> writing msgpack.egg-info/PKG-INFO >> writing dependency_links to msgpack.egg-info/dependency_links.txt >> writing top-level names to msgpack.egg-info/top_level.txt >> reading manifest file 'msgpack.egg-info/SOURCES.txt' >> reading manifest template 'MANIFEST.in' >> warning: no files found matching '*.c' under directory 'msgpack' >> adding license file 'COPYING' >> writing manifest file 'msgpack.egg-info/SOURCES.txt' >> >> ERROR Missing dependencies: >> ????Cython~=0.29.30 >> > > Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 > [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop > still uses) also seem to be still developed in parallel. So maybe we > need both as build host packages? Or do you see another solution? > > Marcus [1] https://github.com/msgpack/msgpack-python/blob/v1.0.7/pyproject.toml#L5 > >> Signed-off-by: James Hilliard >> --- >> ? package/python-msgpack/python-msgpack.mk | 1 + >> ? 1 file changed, 1 insertion(+) >> >> diff --git a/package/python-msgpack/python-msgpack.mk >> b/package/python-msgpack/python-msgpack.mk >> index 061ff5a761..c915b23bf4 100644 >> --- a/package/python-msgpack/python-msgpack.mk >> +++ b/package/python-msgpack/python-msgpack.mk >> @@ -10,5 +10,6 @@ PYTHON_MSGPACK_SITE = >> https://files.pythonhosted.org/packages/c2/d5/5662032db157 >> ? PYTHON_MSGPACK_LICENSE = Apache-2.0 >> ? PYTHON_MSGPACK_LICENSE_FILES = COPYING >> ? PYTHON_MSGPACK_SETUP_TYPE = setuptools >> +PYTHON_MSGPACK_DEPENDENCIES = host-python-cython >> ? $(eval $(python-package)) > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Wed Feb 7 10:20:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:20:58 +0100 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> Message-ID: <20240207112058.37534f3d@windsurf> On Wed, 7 Feb 2024 11:16:27 +0100 Marcus Hoffmann wrote: > Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 > [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop > still uses) also seem to be still developed in parallel. So maybe we > need both as build host packages? Or do you see another solution? If we were to have both in parallel, then the big question is whether it is possible to install them both in parallel without them conflicting with each other. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From romain.naour at smile.fr Wed Feb 7 10:26:02 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 11:26:02 +0100 Subject: [Buildroot] [PATCH v3 08/11] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20231218081958.506691-9-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-9-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > The patch set the BINMAN_INDIRS environment variable to provide the > directory to search for binary blobs and select the packages required by > binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi > > --- > > Changes in v2: > - Change commit message > - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > - Select packages required by binman if > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > > boot/ti-k3-r5-loader/Config.in | 13 +++++++++++++ > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 15 +++++++++++++++ > 2 files changed, 28 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in > index 8c8368a1a5a8..a40eaed9467b 100644 > --- a/boot/ti-k3-r5-loader/Config.in > +++ b/boot/ti-k3-r5-loader/Config.in > @@ -93,4 +93,17 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE > help > Path to the TI K3 R5 Loader configuration file. > > +config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN > + bool "U-Boot uses binman" > + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT > + select BR2_PACKAGE_HOST_PYTHON_ATTRS > + select BR2_PACKAGE_HOST_PYTHON_JSONSCHEMA > + select BR2_PACKAGE_HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS > + select BR2_PACKAGE_HOST_PYTHON_PYYAML > + select BR2_PACKAGE_HOST_PYTHON_REFERENCING > + select BR2_PACKAGE_HOST_PYTHON_RPDS_PY There is no such BR2_PACKAGE_HOST_PYTHON_* symbols added when you enabled host variant. We don't really need such option for host package, just add them in ti-k3-r5-loader build dependency from .mk file. > + help > + Select this option if your U-Boot version uses binman > + for building images. It seems that this is a TI specific script tools/binman/etype/ti_board_config.py that requires python-jsonschema but its already a requirement for buildman [1]. So it should also be handled in u-boot package. [1] https://source.denx.de/u-boot/u-boot/-/blob/master/tools/buildman/requirements.txt?ref_type=heads Best regards, Romain > + > endif > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0ffcb8235f2e..7f6da0fb24ea 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -49,6 +49,20 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ > $(BR2_BISON_HOST_DEPENDENCY) \ > $(BR2_FLEX_HOST_DEPENDENCY) > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) > +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt > +endif > + > +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) > +TI_K3_R5_LOADER_DEPENDENCIES += \ > + host-python-attrs \ > + host-python-jsonschema \ > + host-python-jsonschema-specifications \ > + host-python-pyyaml \ > + host-python-referencing \ > + host-python-rpds-py > +endif > + > ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) > TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig > else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) > @@ -58,6 +72,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ARCH=arm \ > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > + BINMAN_INDIRS=$(BINARIES_DIR) \ > HOSTLDFLAGS="$(HOST_LDFLAGS)" > > define TI_K3_R5_LOADER_BUILD_CMDS From thomas.petazzoni at bootlin.com Wed Feb 7 10:34:01 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:34:01 +0100 Subject: [Buildroot] [PATCH 10/10] package/atkmm: propagate dependency from at-spi2-core In-Reply-To: References: Message-ID: <20240207113401.30235a22@windsurf> On Sun, 28 Jan 2024 14:20:59 +0100 "Yann E. MORIN" wrote: > Commit 2c3ca7bea1de (package/atk: remove package) forgot to propagate to > atkmm, the then just introduced dependency on !static from at-spi2-core, > causing unmet dependencies warnings (unfortuantely, not errors), such > as: > > $ KCONFIG_SEED=0xAFA763CA make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_AT_SPI2_CORE > Depends on [n]: BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_USE_MMU [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=y] > Selected by [y]: > - BR2_PACKAGE_ATKMM [=y] && BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_7 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_USE_MMU [=y] && BR2_USE_WCHAR [=y] > > Propagate the dependency now. > > Signed-off-by: Yann E. MORIN > Cc: James Knight > Cc: Daniel Lang > --- > package/atkmm/Config.in | 1 + > 1 file changed, 1 insertion(+) There's a patch at https://patchwork.ozlabs.org/project/buildroot/patch/20230916154940.746749-1-fontaine.fabrice at gmail.com/ that propagates many more dependencies of at-spi2-core. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Wed Feb 7 10:39:40 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 11:39:40 +0100 Subject: [Buildroot] [PATCH v3 10/11] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2023.10 In-Reply-To: <20231218081958.506691-11-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-11-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > The 2023.10 version of U-Boot for the am62x-sk board has introduced two > major changes: > - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in > /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET > and the use of extlinux.conf for the proper loading of the device tree. > Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to > auto-generate the extlinux.conf file so that developers can change the > kernel loading options by modifying the .config. > - The use of binman for building images. > > Tested on SK-AM62B-P1. > > Signed-off-by: Dario Binacchi > > --- > > Changes in v2: > - Update the commit message > - Drop Python options required by binman. > - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically > selects the Python modules required by binman. > > board/ti/am62x-sk/genimage.cfg | 7 ++++- > board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++++++++++++++++++++ > board/ti/am62x-sk/post-image.sh | 5 ++++ > configs/ti_am62x_sk_defconfig | 11 +++++--- > 4 files changed, 67 insertions(+), 5 deletions(-) > create mode 100755 board/ti/am62x-sk/post-build.sh > create mode 100755 board/ti/am62x-sk/post-image.sh > > diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg > index 26304fe98f99..398209f4d831 100644 > --- a/board/ti/am62x-sk/genimage.cfg > +++ b/board/ti/am62x-sk/genimage.cfg > @@ -4,10 +4,15 @@ image boot.vfat { > "tiboot3.bin", > "tispl.bin", > "u-boot.img", > + "k3-am625-sk.dtb", > + "Image" > + } > + file extlinux/extlinux.conf { > + image = extlinux.conf > } > } > > - size = 16M > + size = 64M > } > > image sdcard.img { > diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh > new file mode 100755 > index 000000000000..0f1f98ef217a > --- /dev/null > +++ b/board/ti/am62x-sk/post-build.sh > @@ -0,0 +1,49 @@ > +#!/bin/sh -x > + > +# genimage will need to find the extlinux.conf > +# in the binaries directory > + > +die() { > + cat <&2 > +Error: $@ > + > +Usage: ${0} -c -r [-x ] > +EOF > + exit 1 > +} > + > +o='c:r:x:' > +O='console:,root:,extra-args:' > +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" > +eval set -- "${opts}" > +while [ ${#} -gt 0 ]; do > + case "${1}" in > + (-c|--console) > + CONSOLE="${2}"; shift 2 > + ;; > + (-r|--root) > + ROOT="${2}"; shift 2 > + ;; > + (-x|--extra-args) > + EXTRA_ARGS="${2}"; shift 2 > + ;; > + (--) > + shift 1; break > + ;; > + esac > +done > + > +[ -n "${CONSOLE}" ] || die "Missing argument" > +[ -n "${ROOT}" ] || die "Missing argument" > +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" > +if [ -n "${EXTRA_ARGS}" ]; then > + append="${append} ${EXTRA_ARGS}" > +fi > + > +mkdir -p "${BINARIES_DIR}" > +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" > + label am62x-sk-buildroot > + kernel /Image > + fdtdir / > + append ${append} > + __HEADER_EOF > diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh > new file mode 100755 > index 000000000000..34f732c091ad > --- /dev/null > +++ b/board/ti/am62x-sk/post-image.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh -x > + > +BOARD_DIR="$(dirname "$0")" > + > +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index b98a68ff153f..0fb9a2f0246c 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r PARTUUID=00000000-02 -x earlycon=ns16550a,mmio32,0x02800000" Can the harcoded PARTUUID be avoided by using uuidgen as for some other defconfigs? > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > -BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > BR2_TARGET_ROOTFS_EXT2=y > @@ -23,11 +23,14 @@ BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > BR2_TARGET_TI_K3_R5_LOADER=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2023.10" Maybe the BR2_TARGET_TI_K3_R5_LOADER version should be fixed in this defconfig before your version bump. Indded it would be better to fix the BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE to 2022.10 even if it's the default one. Care to update BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION to 2024.01? Best regards, Romain > BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" > +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From thomas.petazzoni at bootlin.com Wed Feb 7 10:39:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:39:43 +0100 Subject: [Buildroot] [git commit] package/util-linux: propagate linux-pam dependencies Message-ID: <20240207104003.A5CE287547@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=20ee36e0b096185853835aea848b86a7fccd238b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c77e25c3f113 (package/linux-pam: needs gcc >= 4.9) forgot to propagate that new dependency to the util-linux runuser and su, yielding unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0x8AE589A3 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=n] Selected by [y]: - BR2_PACKAGE_UTIL_LINUX_RUNUSER [=y] && BR2_PACKAGE_UTIL_LINUX [=y] && BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && !BR2_TOOLCHAIN_USES_MUSL [=n] && BR2_USE_MMU [=y] - BR2_PACKAGE_UTIL_LINUX_SU [=y] && BR2_PACKAGE_UTIL_LINUX [=y] && BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && !BR2_TOOLCHAIN_USES_MUSL [=n] && BR2_USE_MMU [=y] Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/util-linux/Config.in | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index be87494b35..73fa11380e 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -88,13 +88,15 @@ config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # linux-pam + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam select BR2_PACKAGE_LINUX_PAM help Change login shell, real user name and information -comment "chfn/chsh needs a toolchain w/ wchar, locale, dynamic library" +comment "chfn/chsh needs a toolchain w/ wchar, locale, dynamic library, gcc >= 4.9" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS + || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_UTIL_LINUX_CHMEM bool "chmem" @@ -196,13 +198,16 @@ config BR2_PACKAGE_UTIL_LINUX_LOGIN depends on !BR2_STATIC_LIBS # linux-pam depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam select BR2_PACKAGE_LINUX_PAM help Begin a session on the system -comment "login needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "login needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library, gcc >= 4.9" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_UTIL_LINUX_LOSETUP bool "losetup" @@ -343,15 +348,18 @@ config BR2_PACKAGE_UTIL_LINUX_RUNUSER depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam select BR2_PACKAGE_LINUX_PAM help Run a command with substitute user and group ID (does not need to ask for a password, because it may be executed by the root user only) -comment "runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library, gcc >= 4.9" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS bool "scheduling utilities" @@ -380,13 +388,16 @@ config BR2_PACKAGE_UTIL_LINUX_SU depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on BR2_USE_MMU # fork(), linux-pam + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam select BR2_PACKAGE_LINUX_PAM help Run a command with substitute user and group ID -comment "su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" +comment "su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library, gcc >= 4.9" depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_UTIL_LINUX_SULOGIN bool "sulogin" From thomas.petazzoni at bootlin.com Wed Feb 7 10:41:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:41:26 +0100 Subject: [Buildroot] [git commit] package/ivi-homescreen: fix dependencies for gstreamer plugin Message-ID: <20240207104142.933F78754B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e0ef9213e4a99c7cf12aed4d21dc3b5338d81d50 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The gstreamer plugin select the EGL backend of gst1-plugins-base, but forgot to propagate all of its dependencies, notably the _HAS_API condition, causing unmet dependencies warnings (unfortunately, not errors), such as; $ KCONFIG_SEED=0x597D22A8 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL Depends on [n]: BR2_PACKAGE_GSTREAMER1 [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API [=n] && BR2_PACKAGE_HAS_LIBEGL [=y] Selected by [y]: - BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN [=y] && BR2_PACKAGE_IVI_HOMESCREEN [=y] && BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS [=y] && BR2_PACKAGE_HAS_LIBEGL [=y] We can't select _HAS_API, because it is a symbol that represents a capability provided by other features of gst1-plugins-base; it's semantically like a virtual package: we can't select it, we can only depend on it. Add this dependency to fix this situation. This however causes circular (recursive) dependencies errors: package/gstreamer1/gst1-plugins-base/Config.in:135:error: recursive dependency detected! package/gstreamer1/gst1-plugins-base/Config.in:135: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL is selected by BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN package/ivi-homescreen/Config.in:221: symbol BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API package/gstreamer1/gst1-plugins-base/Config.in:149: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API is selected by BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL package/gstreamer1/gst1-plugins-base/Config.in:152: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL Indeed, _HAS_API is only even set when gstreamer1, gst1-plugins-base, and the gst1-plugins-base's lib-opengl support, are all already enabled. As such, the dependency on _HAS_API already implies those, and there is no need to select them. Signed-off-by: Yann E. MORIN Cc: Adam Duskett Reviewed-by: Adam Duskett Tested-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/ivi-homescreen/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/ivi-homescreen/Config.in b/package/ivi-homescreen/Config.in index de7509320f..c24df05b6d 100644 --- a/package/ivi-homescreen/Config.in +++ b/package/ivi-homescreen/Config.in @@ -222,10 +222,8 @@ config BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN bool "GStreamer EGL" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API # GST1_PLUGINS_BASE_LIB_OPENGL_EGL select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL help A GStreamer-powered alternative to Flutter's video_player that @@ -233,9 +231,10 @@ config BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN https://pub.dev/packages/flutter_gstreamer_player -comment "GStreamer plugin needs an EGL backend" +comment "GStreamer plugin needs gst1-plugins-base with an EGL backend" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on !BR2_PACKAGE_HAS_LIBEGL + depends on !BR2_PACKAGE_HAS_LIBEGL \ + || !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API config BR2_PACKAGE_IVI_HOMESCREEN_OPENGL_TEXTURE_PLUGIN bool "OpenGL Texture" From thomas.petazzoni at bootlin.com Wed Feb 7 10:41:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:41:43 +0100 Subject: [Buildroot] [PATCH 01/10] package/util-linux: propagate linux-pam dependencies In-Reply-To: References: Message-ID: <20240207114143.786a5be8@windsurf> On Sun, 28 Jan 2024 14:20:50 +0100 "Yann E. MORIN" wrote: > Commit c77e25c3f113 (package/linux-pam: needs gcc >= 4.9) forgot to > propagate that new dependency to the util-linux runuser and su, yielding > unmet dependencies warnings (unfortunately, not errors), such as: > > $ KCONFIG_SEED=0x8AE589A3 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM > Depends on [n]: BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=n] > Selected by [y]: > - BR2_PACKAGE_UTIL_LINUX_RUNUSER [=y] && BR2_PACKAGE_UTIL_LINUX [=y] && BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && !BR2_TOOLCHAIN_USES_MUSL [=n] && BR2_USE_MMU [=y] > - BR2_PACKAGE_UTIL_LINUX_SU [=y] && BR2_PACKAGE_UTIL_LINUX [=y] && BR2_ENABLE_LOCALE [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && !BR2_TOOLCHAIN_USES_MUSL [=n] && BR2_USE_MMU [=y] > > Signed-off-by: Yann E. MORIN > Cc: Fabrice Fontaine > --- > package/util-linux/Config.in | 27 +++++++++++++++++++-------- > 1 file changed, 19 insertions(+), 8 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 10:41:46 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 11:41:46 +0100 Subject: [Buildroot] [PATCH 02/10] package/ivi-homescreen: fix dependencies for gstreamer plugin In-Reply-To: References: Message-ID: <20240207114146.3335b6b8@windsurf> On Sun, 28 Jan 2024 14:20:51 +0100 "Yann E. MORIN" wrote: > The gstreamer plugin select the EGL backend of gst1-plugins-base, but > forgot to propagate all of its dependencies, notably the _HAS_API > condition, causing unmet dependencies warnings (unfortunately, not > errors), such as; > > $ KCONFIG_SEED=0x597D22A8 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL > Depends on [n]: BR2_PACKAGE_GSTREAMER1 [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL [=y] && BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API [=n] && BR2_PACKAGE_HAS_LIBEGL [=y] > Selected by [y]: > - BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN [=y] && BR2_PACKAGE_IVI_HOMESCREEN [=y] && BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS [=y] && BR2_PACKAGE_HAS_LIBEGL [=y] > > We can't select _HAS_API, because it is a symbol that represents a > capability provided by other features of gst1-plugins-base; it's > semantically like a virtual package: we can't select it, we can only > depend on it. > > Add this dependency to fix this situation. > > This however causes circular (recursive) dependencies errors: > > package/gstreamer1/gst1-plugins-base/Config.in:135:error: recursive dependency detected! > package/gstreamer1/gst1-plugins-base/Config.in:135: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL is selected by BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN > package/ivi-homescreen/Config.in:221: symbol BR2_PACKAGE_IVI_HOMESCREEN_GSTREAMER_EGL_PLUGIN depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API > package/gstreamer1/gst1-plugins-base/Config.in:149: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_API is selected by BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL > package/gstreamer1/gst1-plugins-base/Config.in:152: symbol BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL > > Indeed, _HAS_API is only even set when gstreamer1, gst1-plugins-base, > and the gst1-plugins-base's lib-opengl support, are all already enabled. > As such, the dependency on _HAS_API already implies those, and there is > no need to select them. > > Signed-off-by: Yann E. MORIN > Cc: Adam Duskett > --- > package/ivi-homescreen/Config.in | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From romain.naour at smile.fr Wed Feb 7 10:43:13 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 11:43:13 +0100 Subject: [Buildroot] [PATCH v3 11/11] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 In-Reply-To: <20231218081958.506691-12-dario.binacchi@amarulasolutions.com> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-12-dario.binacchi@amarulasolutions.com> Message-ID: <5c8f11b3-6142-47d9-a05f-bd4c8750f10b@smile.fr> Hello Dario, Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit?: > Tested on SK-AM62B-P1. > > Signed-off-by: Dario Binacchi > --- > configs/ti_am62x_sk_defconfig | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 0fb9a2f0246c..9e825d65c0f6 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,8 +1,11 @@ > BR2_aarch64=y > +BR2_KERNEL_HEADERS_6_6=y As reported by Giulio Benetti in a preview patch, BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 must be used instead. This patch series needs some rework, I'll mark it as "changes requested". Thank you, Best regards, Romain > BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r PARTUUID=00000000-02 -x earlycon=ns16550a,mmio32,0x02800000" > BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.1" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" From yann.morin.1998 at free.fr Wed Feb 7 11:06:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 12:06:14 +0100 Subject: [Buildroot] [git commit] package/makedevs: used manual's description Message-ID: <20240207110648.315F387552@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f4be5c41bdf296e6f5c7ad7b9811d34386f89ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, the makedevs syntax explanations are duplicated: one in the package directory, which was introduced firat but bit-rotted for a while each time the makedevs was updated, and once in the manual, which lagged much less. As for all duplicated documentation, the two diverged and one was not updated. In commit 738fb6dfa48b (docs/manual: extend makedev syntax section), we recently updated the makedevs syntax description, but that indeed missed the old README. Get rid of the README and replace it with a symlink to the manual makedevs section. Signed-off-by: Marcus Folkesson Signed-off-by: Yann E. MORIN --- package/makedevs/README | 35 ----------------------------------- package/makedevs/README.adoc | 1 + 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/package/makedevs/README b/package/makedevs/README deleted file mode 100644 index 70844bf802..0000000000 --- a/package/makedevs/README +++ /dev/null @@ -1,35 +0,0 @@ -When building a target filesystem, it is desirable to not have to -become root and then run 'mknod' a thousand times. Using a device -table you can create device nodes and directories "on the fly". - -You can do all sorts of interesting things with a device table file. -For example, if you want to adjust the permissions on a particular -file you can just add an entry like: - - /sbin/foobar f 2755 0 0 - - - - - - -and (assuming the file /sbin/foobar exists) it will be made setuid -root (regardless of what its permissions are on the host filesystem. - -Furthermore, you can use a single table entry to create a many device -minors. For example, if I wanted to create /dev/hda and -/dev/hda[0-15] I could just use the following two table entries: - - /dev/hda b 640 0 0 3 0 0 0 - - /dev/hda b 640 0 0 3 1 1 1 15 - -Device table entries take the form of: - - - -where name is the file name, type can be one of: - - f: A regular file - d: Directory - c: Character special device file - b: Block special device file - p: Fifo (named pipe) - -uid is the user id for the target file, gid is the group id for the -target file. The rest of the entries (major, minor, etc) apply only -to device special files. diff --git a/package/makedevs/README.adoc b/package/makedevs/README.adoc new file mode 120000 index 0000000000..d62887a747 --- /dev/null +++ b/package/makedevs/README.adoc @@ -0,0 +1 @@ +../../docs/manual/makedev-syntax.adoc \ No newline at end of file From giulio.benetti at benettiengineering.com Wed Feb 7 11:06:52 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 12:06:52 +0100 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. In-Reply-To: <20240207030339.3910-1-asd617140123@gmail.com> References: <20240207030339.3910-1-asd617140123@gmail.com> Message-ID: <0e623797-b573-4604-b89e-737c7c503350@benettiengineering.com> Hi Nigel, On 07/02/24 04:03, Nigel Wang wrote: > From: nigel_wang > > add Cubieboard4 board support. > > - SOC: Allwinner A80. > - DRAM: 2GiB DDR3 @ 672MHZ. > - NAND: 8GBeMMC > - Power: DC 5V. > - Wifi: 80211 b/g/n. (module is AP6330) > Reference: https://hirokun.jp/AP6330.pdf > - Ethernet: RTL8211E > > The detail of board: https://linux-sunxi.org/Cubietech_Cubieboard4 > > Board support package includes the following components: > - mainline Linux Kernel 6.6.8 > - mainline U-boot 2021.10. > > Signed-off-by: Nigel Wang Here you have to keep the previous tags when sending new version of patches: Reviewed-by: Giulio Benetti [Build Tested] Tested-by: Giulio Benetti > --- > v1 -> v2 > * Add BR2_cortex_a15_a7=y in buildroot defconfig. > * Bump linux version to 6.6.8 > * Using sunxi_defconfig in kernel. > * Using "make savedefconfig" to save defconfig. > * Remove boot.cmd. this patch had to be V3, but don't mind at this point. I ask you when you send newer patches to set as superseded the previous patch in patchwork: https://patchwork.ozlabs.org/project/buildroot/list/ > --- > DEVELOPERS | 4 +++ > board/cubietech/cubieboard4/extlinux.conf | 5 +++ > board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ > board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ > configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ > 5 files changed, 104 insertions(+) > create mode 100644 board/cubietech/cubieboard4/extlinux.conf > create mode 100644 board/cubietech/cubieboard4/genimage.cfg > create mode 100755 board/cubietech/cubieboard4/post-image.sh > create mode 100644 configs/cubieboard4_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index a03018ab2b..bffb8f2069 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -3297,3 +3297,7 @@ F: package/quazip/ > F: package/shapelib/ > F: package/simple-mail/ > F: package/tinc/ > + > +N: Nigel Wang > +F: board/cubietech/cubieboard4/ > +F: configs/cubieboard4_defconfig > diff --git a/board/cubietech/cubieboard4/extlinux.conf b/board/cubietech/cubieboard4/extlinux.conf > new file mode 100644 > index 0000000000..5084e2237b > --- /dev/null > +++ b/board/cubietech/cubieboard4/extlinux.conf > @@ -0,0 +1,5 @@ > +label linux > + kernel /boot/zImage > + devicetree /sun9i-a80-cubieboard4.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > + > diff --git a/board/cubietech/cubieboard4/genimage.cfg b/board/cubietech/cubieboard4/genimage.cfg > new file mode 100644 > index 0000000000..f1dee13923 > --- /dev/null > +++ b/board/cubietech/cubieboard4/genimage.cfg > @@ -0,0 +1,38 @@ > +# Minimal SD card image for the Cubieboard2 > +# Based in the Orange Pi genimage.cfg > + > +image boot.vfat { > + vfat { > + files = { > + "zImage", > + "sun9i-a80-cubieboard4.dtb", > + "extlinux" > + } > + } > + > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + size = 1016K # 1MB - 8KB > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 512M > + } > +} > diff --git a/board/cubietech/cubieboard4/post-image.sh b/board/cubietech/cubieboard4/post-image.sh > new file mode 100755 > index 0000000000..e37b960a4d > --- /dev/null > +++ b/board/cubietech/cubieboard4/post-image.sh > @@ -0,0 +1,18 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf > + > +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > + > +rm -rf "${GENIMAGE_TMP}" > + > +genimage \ > + --rootpath "${TARGET_DIR}" \ > + --tmppath "${GENIMAGE_TMP}" \ > + --inputpath "${BINARIES_DIR}" \ > + --outputpath "${BINARIES_DIR}" \ > + --config "${GENIMAGE_CFG}" > + > +exit $? > diff --git a/configs/cubieboard4_defconfig b/configs/cubieboard4_defconfig > new file mode 100644 > index 0000000000..0592fe4a2d > --- /dev/null > +++ b/configs/cubieboard4_defconfig > @@ -0,0 +1,39 @@ > +# Architecture > +BR2_arm=y > +BR2_cortex_a15_a7=y > +BR2_ARM_FPU_NEON_VFPV4=y > + > +# System > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" Here the option below is missing and it's needed otherwise the newest Linux version will be picked and build will fail. Now we don't see the problem because the latest version is exactly 6.6, so need this: # Linux headers same as kernel, a 6.6 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -- > 2.34.1 > This patch looks to me, except missing Linux header version. I've added that option and re-built successfully so I confirm my: Reviewed-by: Giulio Benetti [Build Tested] Tested-by: Giulio Benetti Maybe a Maintainer can edit while committing, of if you can please send a V3 with that missing line. Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From romain.naour at smile.fr Wed Feb 7 11:07:12 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 12:07:12 +0100 Subject: [Buildroot] [PATCH 1/4] configs/stm32f429_disco_xip_defconfig: drop redundant defconfig choice In-Reply-To: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> References: <20240207100459.2896502-1-dario.binacchi@amarulasolutions.com> Message-ID: <7fdd9207-c7e1-40db-a20e-e64cd8709a94@smile.fr> Hello Dario, Le 07/02/2024 ? 11:04, Dario Binacchi a ?crit?: > The package/busybox/busybox-minimal.config is the default configuration > for MMU-less systems, so the setting is redundant and can be removed > without effect. This is due to a change in Buildroot 2023.11 [1] and several other boards are explicitly selecting busybox-minimal.config $ git grep BR2_PACKAGE_BUSYBOX_CONFIG | grep minimal configs/canaan_kd233_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/imxrt1050-evk_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/qemu_m68k_mcf5208_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/qemu_riscv64_nommu_virt_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/qemu_xtensa_lx60_nommu_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_bit_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_bit_sdcard_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_dock_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_dock_sdcard_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_go_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maix_go_sdcard_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maixduino_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/sipeed_maixduino_sdcard_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/stm32f429_disco_xip_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/stm32f469_disco_sd_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/stm32f469_disco_xip_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" configs/stm32f769_disco_sd_defconfig:BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" Can you do this change in one commit ? [1] https://gitlab.com/buildroot.org/buildroot/-/commit/80b56887006cfba50833881dc31f045d494af185 Best regards, Romain > > Signed-off-by: Dario Binacchi > --- > configs/stm32f429_disco_xip_defconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig > index d4e000487a80..99ae8cc7533b 100644 > --- a/configs/stm32f429_disco_xip_defconfig > +++ b/configs/stm32f429_disco_xip_defconfig > @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y > BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" > -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" > BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" > # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set > BR2_TARGET_ROOTFS_INITRAMFS=y From yann.morin.1998 at free.fr Wed Feb 7 11:10:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 12:10:25 +0100 Subject: [Buildroot] [PATCH] package/makedevs: describe the recursive type in the README In-Reply-To: <20240206090048.2214719-1-marcus.folkesson@gmail.com> References: <20240206090048.2214719-1-marcus.folkesson@gmail.com> Message-ID: Marcus, All, On 2024-02-06 10:00 +0100, Marcus Folkesson spake thusly: > The recursive type is described everywhere else, so add it to > the README as well. Instead of updating the README file, I removed it and repalced it with a symlink to the corresponding section in the manujal, to avoid duplicating the documentation. Indeed, the manual section for makedevs was already recently updated, but the README was missed. Having the symlink will prevvent the two from diverging in the future. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Marcus Folkesson > --- > package/makedevs/README | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/makedevs/README b/package/makedevs/README > index 70844bf802..6c583609a5 100644 > --- a/package/makedevs/README > +++ b/package/makedevs/README > @@ -26,6 +26,7 @@ where name is the file name, type can be one of: > > f: A regular file > d: Directory > + r: Directory recursively > c: Character special device file > b: Block special device file > p: Fifo (named pipe) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From peter at korsgaard.com Wed Feb 7 11:24:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 12:24:34 +0100 Subject: [Buildroot] [PATCH] package/libtalloc: bump version to 2.4.2 Message-ID: <20240207112435.3712652-1-peter@korsgaard.com> Fixes build issue of the python support with python 3.12 (2.3.4 unconditionally uses distutils). Signed-off-by: Peter Korsgaard --- package/libtalloc/libtalloc.hash | 4 ++-- package/libtalloc/libtalloc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libtalloc/libtalloc.hash b/package/libtalloc/libtalloc.hash index 0bc8edb695..5577583881 100644 --- a/package/libtalloc/libtalloc.hash +++ b/package/libtalloc/libtalloc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505 talloc-2.3.4.tar.gz -sha256 f8340c449dd64a55c6605b02fcad2aec6f473612ac6026739a22995380a8043c talloc.h +sha256 85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6 talloc-2.4.2.tar.gz +sha256 e01fb092aaed2b431be26674e2b791c77fb5984537c29b514e957582c6b31465 talloc.h diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk index ca15180d22..676076b857 100644 --- a/package/libtalloc/libtalloc.mk +++ b/package/libtalloc/libtalloc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTALLOC_VERSION = 2.3.4 +LIBTALLOC_VERSION = 2.4.2 LIBTALLOC_SOURCE = talloc-$(LIBTALLOC_VERSION).tar.gz LIBTALLOC_SITE = https://www.samba.org/ftp/talloc LIBTALLOC_LICENSE = LGPL-3.0+ -- 2.39.2 From peter at korsgaard.com Wed Feb 7 11:25:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 12:25:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/freeradius-server: fix python3 build with -Ofast In-Reply-To: <20240111194242.2572172-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 11 Jan 2024 20:42:42 +0100") References: <20240111194242.2572172-1-fontaine.fabrice@gmail.com> Message-ID: <87wmrgzfc5.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following python3 build failure with -Ofast raised since commit > 4513f5198a8f24af7bd24fdfc1ede143eb4e844a: > powerpc64-buildroot-linux-gnu-gcc.br_real: error: ast: linker input > file not found: No such file or directory > Fixes: > - http://autobuild.buildroot.org/results/904c43241b99a8d848c1891cb5af132a291311b4 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 11:25:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 12:25:21 +0100 Subject: [Buildroot] [git commit] package/freeradius-server: fix python3 build with -Ofast Message-ID: <20240207112532.1663087559@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ef199d362985031d473754c42a64f7ab2e9e57d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following python3 build failure with -Ofast raised since commit 4513f5198a8f24af7bd24fdfc1ede143eb4e844a: powerpc64-buildroot-linux-gnu-gcc.br_real: error: ast: linker input file not found: No such file or directory Fixes: - http://autobuild.buildroot.org/results/904c43241b99a8d848c1891cb5af132a291311b4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...c-modules-rlm_python-fix-build-with-Ofast.patch | 49 ++++++++++++++++++++++ package/freeradius-server/freeradius-server.mk | 6 +++ 2 files changed, 55 insertions(+) diff --git a/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch b/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch new file mode 100644 index 0000000000..c92b4171d2 --- /dev/null +++ b/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch @@ -0,0 +1,49 @@ +From 963edf3f87d34e274885d9cc448651d8a1601a6f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 11 Jan 2024 17:38:41 +0100 +Subject: [PATCH] src/modules/rlm_python: fix build with -Ofast + +Stripping logic wrongly translates -Ofast into ast resulting in the +following build failure: + +configure: /home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/bin/python3-config's cflags were "-I/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -I/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -Wsign-compare -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -DNDEBUG -g -fwrapv -O3 -Wall" +configure: Sanitized cflags were " -isystem/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -isystem/home/fabrice/buildroot/output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/python3.11 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ast -D_FORTIFY_SOURCE=2 -fwrapv " + +[...] + +powerpc64-buildroot-linux-gnu-gcc.br_real: error: ast: linker input file not found: No such file or directory + +Fixes: + - http://autobuild.buildroot.org/results/904c43241b99a8d848c1891cb5af132a291311b4 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/5263 +--- + src/modules/rlm_python/configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac +index e2f74574fb..ee30b324d9 100644 +--- a/src/modules/rlm_python3/configure.ac ++++ b/src/modules/rlm_python3/configure.ac +@@ -59,7 +59,7 @@ else + + dnl # Convert -I to -isystem to get rid of warnings about issues in Python headers + dnl # Strip -systemroot +- dnl # Strip optimisation flags (-O[0-9]?). We decide our optimisation level, not python. ++ dnl # Strip optimisation flags (-O[0-9|fast]?). We decide our optimisation level, not python. + dnl # -D_FORTIFY_SOURCE needs -O. + dnl # Strip debug symbol flags (-g[0-9]?). We decide on debugging symbols, not python + dnl # Strip -W*, we decide what warnings are important +@@ -73,7 +73,7 @@ else + mod_cflags=`echo " $python_cflags" | sed -e '\ + s/ -I/ -isystem/g;\ + s/ -isysroot[[ =]]\{0,1\}[[^-]]*/ /g;\ +- s/ -O[[^[[:blank:]]]]*/ /g;\ ++ s/ -O[[^[[:blank:]]*]]*/ /g;\ + s/ -Wp,-D_FORTIFY_SOURCE=[[[:digit:]]]/ /g;\ + s/ -g[[^ ]]*/ /g;\ + s/ -W[[^ ]]*/ /g;\ +-- +2.43.0 + diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 16a817b680..1b5751d753 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -21,6 +21,12 @@ define FREERADIUS_SERVER_RUN_KRB5_AUTORECONF endef FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_KRB5_AUTORECONF +# We're patching src/modules/rlm_python3/configure.ac +define FREERADIUS_SERVER_RUN_PYTHON3_AUTORECONF + cd $(@D)/src/modules/rlm_python3; $(AUTORECONF) -I$(@D)/m4 +endef +FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_PYTHON3_AUTORECONF + # some compiler checks are not supported while cross compiling. # instead of removing those checks, we cache the answers FREERADIUS_SERVER_CONF_OPTS += \ From thomas.petazzoni at bootlin.com Wed Feb 7 11:27:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:27:26 +0100 Subject: [Buildroot] [PATCH 03/10] package/openssh: fix dependencies with refpolicy In-Reply-To: <0fab83c33d4c5d4afe807e78169f68d539bcf5af.1706448055.git.yann.morin.1998@free.fr> References: <0fab83c33d4c5d4afe807e78169f68d539bcf5af.1706448055.git.yann.morin.1998@free.fr> Message-ID: <20240207122726.2aa4be3c@windsurf> Hello, On Sun, 28 Jan 2024 14:20:52 +0100 "Yann E. MORIN" wrote: > Commit 2c5a82a29ceb(package/openssh: select linux-pam if refpolicy > upstream is selected) did not account for the linux-pam dependencies > before selecting it, causing unmet dependencies warnings (unfortunately, > not errors), such as: > > $ KCONFIG_SEED=0x8D55903B make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LIBABSEIL_CPP > Depends on [n]: BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_8 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] && !BR2_STATIC_LIBS [=n] && BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS [=n] > Selected by [y]: > - BR2_PACKAGE_RE2 [=y] && BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_8 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] Seems like this was copy/pasted from the wrong error :-) Also, as we discussed during the meeting, it seems like we want to: - Move this select to the refpolicy package - Handle it as a "soft select" that selects linux-pam if possible, to not have some crazy dependencies for a quite corner case (using SELinux non a non-glibc system, with a toolchain missing locale/wchar, etc.) Could you rework according to our discussion? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From giulio.benetti at benettiengineering.com Wed Feb 7 11:31:27 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 12:31:27 +0100 Subject: [Buildroot] [PATCH v4 1/3] package/milkv-duo-libraries: new package In-Reply-To: References: Message-ID: <0ae0fea1-c044-4016-85e2-cf7090ce8905@benettiengineering.com> Hi Hanyuan, On 07/02/24 08:49, Hanyuan Zhao wrote: > This commit adds the libraries for RISC-V dev board > milk-v duo, containing board-specific firmware and > hardware tools. > > https://github.com/milkv-duo/milkv-duo-buildroot-libraries > > Co-authored-by: Emil S > Signed-off-by: Hanyuan Zhao It looks good to me: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > > --- > Changes v3 -> v4: > - Update the info in help section > - Provide more info about ION (camera memory use) > > Changes v2 -> v3: > - Update the desc's repo url > > Changes v1 -> v2: > - Lint the code > - Refactor the select and depend logic > --- > package/Config.in | 1 + > package/milkv-duo-libraries/Config.in | 63 +++++++++++++++++++ > .../milkv-duo-libraries.mk | 51 +++++++++++++++ > 3 files changed, 115 insertions(+) > create mode 100644 package/milkv-duo-libraries/Config.in > create mode 100644 package/milkv-duo-libraries/milkv-duo-libraries.mk > > diff --git a/package/Config.in b/package/Config.in > index 047877c960..322aba90b8 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -564,6 +564,7 @@ endmenu > source "package/memtester/Config.in" > source "package/memtool/Config.in" > source "package/mhz/Config.in" > + source "package/milkv-duo-libraries/Config.in" > source "package/minicom/Config.in" > source "package/msr-tools/Config.in" > source "package/nanocom/Config.in" > diff --git a/package/milkv-duo-libraries/Config.in b/package/milkv-duo-libraries/Config.in > new file mode 100644 > index 0000000000..047b78fb7b > --- /dev/null > +++ b/package/milkv-duo-libraries/Config.in > @@ -0,0 +1,63 @@ > +config BR2_PACKAGE_MILKV_DUO_LIBRARIES > + bool "milk-v duo libraries" > + depends on BR2_riscv > + help > + Package providing board-specific firmware and hardware tools > + for Milk-V Duo platform. > + > + https://github.com/milkv-duo/milkv-duo-buildroot-libraries > + > +if BR2_PACKAGE_MILKV_DUO_LIBRARIES > + > +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + bool "milkv-duo-firmware-fsbl" > + select BR2_PACKAGE_HOST_MTOOLS > + help > + This package is obtained from > + https://github.com/milkv-duo/duo-buildroot-sdk, > + from which we download the first stage bootloader source and > + compile it, generating the ATF bl2.bin. At the mean time, we > + will use the fiptool.py in this package to create the binary > + file fip.bin to pack the opensbi, u-boot and so on. > + > + If you intend to generate the whole sdcard image or the > + fip.bin for milk-v duo, you must say Y to this package! > + > +config BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB > + bool "64 MiB free ram" > + default n > + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + help > + Say Y to this will disable the ION (Camera Algorithm Memory) > + in order to have the all 64MiB Free memory. > + > +config BR2_PACKAGE_MILKV_DUO_PINMUX > + bool "duo-pinmux tool" > + default n > + help > + Say Y to this will compile the duo-pinmux, which can > + get or set function of any Milk-V Duo GPIO Pin. More info at > + > + https://milkv.io/docs/duo/application-development/pinmux > + > +config BR2_PACKAGE_MILKV_DUO_FEATURES > + bool "duo usb features" > + default n > + select BR2_PACKAGE_DHCPCD > + select BR2_PACKAGE_DNSMASQ > + select BR2_PACKAGE_DROPBEAR > + select BR2_PACKAGE_LRZSZ > + select BR2_PACKAGE_HTOP > + help > + Say Y to this will copy the cvitek usb shell scripts to have > + the USB features. The role could be configured at > + > + /etc/milkv-duo.conf > + > + Supported usb functions are rndis, host and mass-storage. > + By default Duo has the LED blinking. It could be configured > + in that conf file as well. Say Y to this will also select > + some packages automatically, to have the same experience > + with the official release. > + > +endif > diff --git a/package/milkv-duo-libraries/milkv-duo-libraries.mk b/package/milkv-duo-libraries/milkv-duo-libraries.mk > new file mode 100644 > index 0000000000..a5cf40a764 > --- /dev/null > +++ b/package/milkv-duo-libraries/milkv-duo-libraries.mk > @@ -0,0 +1,51 @@ > +################################################################################ > +# > +# milkv-duo-libraries > +# > +################################################################################ > + > +MILKV_DUO_LIBRARIES_VERSION = f359994bd497f942bb67734280d81f6640c7c168 > +MILKV_DUO_LIBRARIES_SITE = $(call github,milkv-duo,milkv-duo-buildroot-libraries,$(MILKV_DUO_LIBRARIES_VERSION)) > +MILKV_DUO_LIBRARIES_INSTALL_STAGING = YES > +MILKV_DUO_LIBRARIES_DEPENDENCIES = host-python3 host-mtools > +MILKV_DUO_LIBRARIES_FSBL_64MB = ION > + > +ifeq ($(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB),y) > +MILKV_DUO_LIBRARIES_FSBL_64MB = 64MB > +endif > + > +define MILKV_DUO_LIBRARIES_BUILD_CMDS > + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ > + $(MAKE) -C $(@D)/firmware \ > + ARCH=riscv BOOT_CPU=riscv CHIP_ARCH=cv180x \ > + PROJECT_FULLNAME=cv1800b_milkv_duo_sd \ > + CROSS_COMPILE=$(TARGET_CROSS) \ > + FREE_RAM_SIZE=$(MILKV_DUO_LIBRARIES_FSBL_64MB) \ > + bl2; \ > + fi > + > + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ > + $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ > + -I $(@D)/pinmux/include $(@D)/pinmux/src/*.c -o $(@D)/pinmux/duo-pinmux; \ > + fi > +endef > + > +define MILKV_DUO_LIBRARIES_INSTALL_STAGING_CMDS > + if [ $(BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL) = y ]; then \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/build/cv180x/bl2.bin $(BINARIES_DIR)/bl2.bin; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/chip_conf.bin $(BINARIES_DIR)/chip_conf.bin; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/plat/cv180x/fiptool.py $(BINARIES_DIR)/fiptool.py; \ > + $(INSTALL) -D -m 0644 $(@D)/firmware/plat/cv180x/multi.its $(BINARIES_DIR)/multi.its; \ > + $(INSTALL) -D -m 0755 $(@D)/firmware/test/cv181x/ddr_param.bin $(BINARIES_DIR)/ddr_param.bin; \ > + fi > + > + if [ $(BR2_PACKAGE_MILKV_DUO_PINMUX) = y ]; then \ > + $(INSTALL) -D -m 0755 $(@D)/pinmux/duo-pinmux $(TARGET_DIR)/usr/bin/; \ > + fi > + > + if [ $(BR2_PACKAGE_MILKV_DUO_FEATURES) = y ]; then \ > + cp $(@D)/overlay/* -r $(TARGET_DIR); \ > + fi > +endef > + > +$(eval $(generic-package)) From yann.morin.1998 at free.fr Wed Feb 7 11:38:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 12:38:15 +0100 Subject: [Buildroot] [git commit] support/testing: add python-uvloop runtime test Message-ID: <20240207113846.0AD7987564@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a232ee101d70c8e1f72e9e9eaac3144543dd5cd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- .../testing/tests/package/sample_python_uvloop.py | 6 ++++++ .../testing/tests/package/test_python_uvloop.py | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/support/testing/tests/package/sample_python_uvloop.py b/support/testing/tests/package/sample_python_uvloop.py new file mode 100644 index 0000000000..dc85d3e04e --- /dev/null +++ b/support/testing/tests/package/sample_python_uvloop.py @@ -0,0 +1,6 @@ +import uvloop + +async def main(): + print("Hello world!") + +uvloop.run(main()) diff --git a/support/testing/tests/package/test_python_uvloop.py b/support/testing/tests/package/test_python_uvloop.py new file mode 100644 index 0000000000..c5079ba59c --- /dev/null +++ b/support/testing/tests/package/test_python_uvloop.py @@ -0,0 +1,22 @@ +import os + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Uvloop(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_UVLOOP=y + """ + sample_scripts = ["tests/package/sample_python_uvloop.py"] + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + + cmd = "%s %s" % (self.interpreter, os.path.basename(self.sample_scripts[0])) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "Hello world!") From br015 at umbiko.net Wed Feb 7 11:30:11 2024 From: br015 at umbiko.net (Andreas Ziegler) Date: Wed, 07 Feb 2024 11:30:11 +0000 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: References: Message-ID: Hi Fabrice, sorry in case I do not reply to the latest message in the thread; my in-box is currently a bit crowded ... On 2024-02-06 18:59, Fabrice Fontaine wrote: > Message: 30 > Date: Tue, 6 Feb 2024 18:59:00 +0100 > From: Fabrice Fontaine > To: Romain Naour > Cc: buildroot at buildroot.org > Subject: Re: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS > Message-ID: > > Content-Type: text/plain; charset="UTF-8" > > Hello Romain, > > Le mar. 6 f?vr. 2024 ? 18:32, Romain Naour a > ?crit : >> >> Hello, >> >> Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit : >> > ncmpc is able to automatically detect NLS support since version 0.47 and >> > https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 >> > so let it handle automatically to avoid the following build failure with >> > a bootlin toolchain which embeds a gettext definition in libintl.h which >> > will clash with the fake gettext definition provided by ncmpc since >> > https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: >> > >> > In file included from ../src/save_playlist.cxx:8: >> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' >> > 39 | extern char *gettext (const char *__msgid) >> > | ^~~~~~~ >> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' >> > ../src/i18n.h:22:20: note: to match this '(' >> > 22 | #define gettext(x) (x) >> > | ^ >> > >> > Indeed, even if NLS is disabled by the user, libintl.h will be included >> > by >> > /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h >> > though include >> >> We usually want to explicitly handle such option from Buildroot >> package to not >> rely on automatic detection (as currently done). >> >> It look like more a bug in ncmpc build system? > > I don't know, upstream wants to have the same code with and without > NLS, so they decided to define a gettext macro when NLS is disabled. > I could find an upstreamable solution as upstream will probably reject > a patch that removes this gettext define and puts #ifdef ENABLE_NLS > before every gettext calls. > Do you have an upstreamable solution or should we just add a NLS > dependency to ncmpc? This is probably not related to NLS, but to gettext being included in the build by some other package. This tricks Meson into believing that NLS is enabled. Also, the code in meson.txt may lead to unexpected results: if meson.version().version_compare('>= 0.59') and not mini # Meson 0.59 has native libintl support intl_dep = dependency('intl', required: enable_nls) enable_nls = intl_dep.found() elif enable_nls.disabled() or mini intl_dep = dependency('', required: false) enable_nls = false elif cc.has_header('libintl.h') intl_dep = dependency('', required: false) enable_nls = true elif enable_nls.auto() intl_dep = dependency('', required: false) enable_nls = false else error('libintl.h not found') -- build is (Meson) version dependent -- 'disabled' command line option overridden by the build system (> 0.59) -- 'auto' treated as 'disabled' (< 0.59) It would be better to handle 'disabled' first (untested): intl_dep = dependency('', required: false) if enable_nls.disabled() or mini enable_nls = false # Meson from 0.59: New custom dependency for libintl elif meson.version().version_compare('>= 0.59') require_intl = enable_nls if enable_nls.auto() require_intl = false intl_dep = dependency('intl', required: require_intl) enable_nls = intl_dep.found() # Meson prior to 0.59 elif cc.has_header('libintl.h') # auto and enabled w/ dependency met enable_nls = true elif enable_nls.enabled() # enabled with w/ dependency unmet error('libintl.h not found') Kind regards, Andreas >> >> Best regards, >> Romain >> >> >> > >> > Fixes: >> > - http://autobuild.buildroot.org/results/c860e64909dd3b7fa033db0970e1cfc1376c4ec5 >> > - http://autobuild.buildroot.org/results/36eab556fac80124755bff4110af3e43fe6edd78 >> > >> > Signed-off-by: Fabrice Fontaine >> > --- >> > package/ncmpc/ncmpc.mk | 3 +-- >> > 1 file changed, 1 insertion(+), 2 deletions(-) >> > >> > diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk >> > index bc8a62daea..0965981f23 100644 >> > --- a/package/ncmpc/ncmpc.mk >> > +++ b/package/ncmpc/ncmpc.mk >> > @@ -20,8 +20,7 @@ NCMPC_CPE_ID_VENDOR = ncmpc_project >> > >> > NCMPC_CONF_OPTS = \ >> > -Dcurses=ncurses \ >> > - -Ddocumentation=disabled \ >> > - $(if $(BR2_SYSTEM_ENABLE_NLS),-Dnls=enabled,-Dnls=disabled) >> > + -Ddocumentation=disabled >> > >> > ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) >> > NCMPC_DEPENDENCIES += lirc-tools >> > > Best Regards, > > Fabrice From giulio.benetti at benettiengineering.com Wed Feb 7 11:39:09 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 12:39:09 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/milkv-duo-smallcore-freertos: new package In-Reply-To: References: <20240207074950.2049-1-hanyuan-z@qq.com> Message-ID: <8b908c45-80d2-428f-885f-febedfc5e4bf@benettiengineering.com> Hi Hanyuan, On 07/02/24 08:49, Hanyuan Zhao wrote: > This commit adds the freertos support for the > RISC-V dev board milk-v duo. > > https://github.com/milkv-duo/milkv-duo-smallcore-freertos > > Co-authored-by: Emil S > Signed-off-by: Hanyuan Zhao > > --- > Changes v3 -> v4: > - Move the make recipes to the repo > - Bump the version to latest > > Changes v2 -> v3: > - No Changes > > Changes v1 -> v2: > - Set the depends and select logic > - Add host tools > --- > package/Config.in | 1 + > .../milkv-duo-smallcore-freertos/Config.in | 21 ++++++++++++++++++ > .../milkv-duo-smallcore-freertos.mk | 22 +++++++++++++++++++ > 3 files changed, 44 insertions(+) > create mode 100644 package/milkv-duo-smallcore-freertos/Config.in > create mode 100644 package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > > diff --git a/package/Config.in b/package/Config.in > index 322aba90b8..7be3316f71 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -565,6 +565,7 @@ endmenu > source "package/memtool/Config.in" > source "package/mhz/Config.in" > source "package/milkv-duo-libraries/Config.in" > + source "package/milkv-duo-smallcore-freertos/Config.in" > source "package/minicom/Config.in" > source "package/msr-tools/Config.in" > source "package/nanocom/Config.in" > diff --git a/package/milkv-duo-smallcore-freertos/Config.in b/package/milkv-duo-smallcore-freertos/Config.in > new file mode 100644 > index 0000000000..8503932461 > --- /dev/null > +++ b/package/milkv-duo-smallcore-freertos/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS > + bool "milkv-duo-smallcore-freertos" > + depends on BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL > + select BR2_PACKAGE_HOST_CMAKE > + help > + This package is obtained from > + https://github.com/milkv-duo/duo-buildroot-sdk, > + from which we download the FreeRTOS ported to Milk-V Duo > + into the Buildroot. This FreeRTOS will run in the small core > + and will not do anything because it is simply a template > + with some basic UART demos. You can realize your own ideas > + by adding code to > + > + output/build/milkv-duo-smallcore-freertos-hash/cvitek/task > + /comm/src/riscv64/comm_main.c > + > + If you say Y, then every time you make Buildroot, it will > + automatically compile and include the FreeRTOS into the > + fip.bin, which will then be packed into sdcard.img > + > + https://github.com/milkv-duo/milkv-duo-smallcore-freertos > diff --git a/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > new file mode 100644 > index 0000000000..1d8d4fcf12 > --- /dev/null > +++ b/package/milkv-duo-smallcore-freertos/milkv-duo-smallcore-freertos.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# milkv-duo-smallcore-freertos > +# > +################################################################################ > + > +MILKV_DUO_SMALLCORE_FREERTOS_VERSION = 10b86e308ca2305a464ae2bb3eb868a72295f7ab > +MILKV_DUO_SMALLCORE_FREERTOS_SITE = $(call github,milkv-duo,milkv-duo-smallcore-freertos,$(MILKV_DUO_SMALLCORE_FREERTOS_VERSION)) > +MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING = YES > +MILKV_DUO_SMALLCORE_FREERTOS_DEPENDENCIES = host-cmake host-ninja > +MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV = CROSS_COMPILE=$(TARGET_CROSS) MK_ENV=$(TARGET_MAKE_ENV) TARGET_CMAKE=$(BR2_CMAKE) BUILD_PATH=$(@D) > + > +define MILKV_DUO_SMALLCORE_FREERTOS_BUILD_CMDS > + $(MAKE) -C $(@D) all $(MILKV_DUO_SMALLCORE_FREERTOS_CONF_ENV) > +endef > + > +define MILKV_DUO_SMALLCORE_FREERTOS_INSTALL_STAGING_CMDS > + $(INSTALL) -D -m 0755 $(@D)/cvitek/install/bin/cvirtos.bin $(BINARIES_DIR)/cvirtos.bin > + touch $(BINARIES_DIR)/empty.bin > +endef > + > +$(eval $(generic-package)) It looks good to me, moving build system to repository made it really easier, so: Reviewed-by: Giulio Benetti Just FYI, buildroot also deal with cmake package using: $(eval $(cmake-package)) so in the future you can use that or other infrastructure that it provides that you can find under buildroot/package/pkg-*.mk Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From yann.morin.1998 at free.fr Wed Feb 7 11:39:11 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 12:39:11 +0100 Subject: [Buildroot] [PATCH buildroot] support/testing: add python-uvloop runtime test In-Reply-To: <170717110256.12359.16509380444438086733-0@git.sr.ht> References: <170717110256.12359.16509380444438086733-0@git.sr.ht> Message-ID: Marcus, All, On 2024-02-05 22:47 +0100, ~bubu spake thusly: > From: Marcus Hoffmann Applied to master, with your SoB added, thanks. Regards, Yann E. MORIN. > --- > .../tests/package/sample_python_uvloop.py | 6 +++++ > .../tests/package/test_python_uvloop.py | 22 +++++++++++++++++++ > 2 files changed, 28 insertions(+) > create mode 100644 support/testing/tests/package/sample_python_uvloop.py > create mode 100644 support/testing/tests/package/test_python_uvloop.py > > diff --git a/support/testing/tests/package/sample_python_uvloop.py b/support/testing/tests/package/sample_python_uvloop.py > new file mode 100644 > index 0000000000..dc85d3e04e > --- /dev/null > +++ b/support/testing/tests/package/sample_python_uvloop.py > @@ -0,0 +1,6 @@ > +import uvloop > + > +async def main(): > + print("Hello world!") > + > +uvloop.run(main()) > diff --git a/support/testing/tests/package/test_python_uvloop.py b/support/testing/tests/package/test_python_uvloop.py > new file mode 100644 > index 0000000000..c5079ba59c > --- /dev/null > +++ b/support/testing/tests/package/test_python_uvloop.py > @@ -0,0 +1,22 @@ > +import os > + > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonPy3Uvloop(TestPythonPackageBase): > + __test__ = True > + config = TestPythonPackageBase.config + \ > + """ > + BR2_PACKAGE_PYTHON3=y > + BR2_PACKAGE_PYTHON_UVLOOP=y > + """ > + sample_scripts = ["tests/package/sample_python_uvloop.py"] > + > + def test_run(self): > + self.login() > + self.check_sample_scripts_exist() > + > + cmd = "%s %s" % (self.interpreter, os.path.basename(self.sample_scripts[0])) > + output, exit_code = self.emulator.run(cmd) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output[0], "Hello world!") > -- > 2.38.5 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Wed Feb 7 11:41:00 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 12:41:00 +0100 Subject: [Buildroot] [PATCH v4 3/3] configs/milkv_duo: new defconfig In-Reply-To: References: <20240207074950.2049-1-hanyuan-z@qq.com> Message-ID: <9957d4b8-944a-4314-a8f4-471446deda52@benettiengineering.com> Hi Hanyuan, On 07/02/24 08:49, Hanyuan Zhao wrote: > Milk-V Duo is an ultra-compact embedded RISC-V development platform based on the CV1800B chip. > It can run Linux and RTOS, providing a reliable, low-cost, and high-performance platform > for professionals, industrial ODMs, AIoT enthusiasts, DIY hobbyists, and creators. > > https://milkv.io/duo > > Co-authored-by: Emil S > Co-authored-by: GP Orcullo > Signed-off-by: Hanyuan Zhao > Reviewed-by: Giulio Benetti > [Build Tested only both defconfigs] > Tested-by: Giulio Benetti > > --- > This patch depends on: > https://patchwork.ozlabs.org/project/buildroot/list/?series=393667 > to work-around a gcc bug on htop package. > --- > Changes v3 -> v4: > - Lint the code > - Add more comments about gcc ICE in defconfig > - Remove unnecessary comments > > Changes v2 -> v3: > - Remove BR2_TOOLCHAIN_BUILDROOT_CXX in defconfig > - Refactor post-image.sh > - Provide more info about ION and camera memory use > > Changes v1 -> v2: > - Refactor defconfig > - Set the boot partition size to 8M > - Refactor the image generating logic > --- > board/milkv/duo/genimage.cfg | 25 ++++++++ > board/milkv/duo/post-image.sh | 47 ++++++++++++++ > board/milkv/duo/readme.txt | 46 ++++++++++++++ > configs/milkv_duo_musl_riscv64_defconfig | 67 ++++++++++++++++++++ > configs/milkv_duo_musl_riscv64_ion_defconfig | 67 ++++++++++++++++++++ > 5 files changed, 252 insertions(+) > create mode 100644 board/milkv/duo/genimage.cfg > create mode 100755 board/milkv/duo/post-image.sh > create mode 100644 board/milkv/duo/readme.txt > create mode 100644 configs/milkv_duo_musl_riscv64_defconfig > create mode 100644 configs/milkv_duo_musl_riscv64_ion_defconfig > > diff --git a/board/milkv/duo/genimage.cfg b/board/milkv/duo/genimage.cfg > new file mode 100644 > index 0000000000..1fd74f845a > --- /dev/null > +++ b/board/milkv/duo/genimage.cfg > @@ -0,0 +1,25 @@ > +image boot.vfat { > + vfat { > + files = { > + "fip.bin", > + "boot.sd", > + } > + } > + size = 8M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + } > +} > diff --git a/board/milkv/duo/post-image.sh b/board/milkv/duo/post-image.sh > new file mode 100755 > index 0000000000..3856d977df > --- /dev/null > +++ b/board/milkv/duo/post-image.sh > @@ -0,0 +1,47 @@ > +#!/bin/sh > + > +########################################################### > +# File: post-image.sh > +# Author: GP Orcullo > +# Hanyuan Zhao > +# Description: this sh will make the fip.bin and boot.sd, > +# then pack everything to an image file. > +########################################################### > + > +FIPTOOL_OPTS="genfip ${BINARIES_DIR}/fip.bin \ > + --MONITOR_RUNADDR=0x80000000 \ > + --CHIP_CONF=${BINARIES_DIR}/chip_conf.bin \ > + --NOR_INFO=FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF \ > + --NAND_INFO=00000000 \ > + --BL2=${BINARIES_DIR}/bl2.bin \ > + --BLCP_IMG_RUNADDR=0x05200200 \ > + --BLCP_PARAM_LOADADDR=0 \ > + --DDR_PARAM=${BINARIES_DIR}/ddr_param.bin \ > + --MONITOR=${BINARIES_DIR}/fw_dynamic.bin \ > + --LOADER_2ND=${BINARIES_DIR}/u-boot.bin" > + > +if [ -f ${BINARIES_DIR}/cvirtos.bin ]; then > + FIPTOOL_OPTS="${FIPTOOL_OPTS} \ > + --BLCP=${BINARIES_DIR}/empty.bin \ > + --BLCP_2ND=${BINARIES_DIR}/cvirtos.bin \ > + --BLCP_2ND_RUNADDR=0x83f40000" > + echo "[Duo Post-Image fiptool.py] Integrating FreeRTOS" > +fi > + > +${BINARIES_DIR}/fiptool.py ${FIPTOOL_OPTS} \ > +> ${BINARIES_DIR}/fip.log 2>&1 > +if [ -f ${BINARIES_DIR}/fip.bin ]; then > + echo "[Duo Post-Image fiptool.py] > fip.bin generated!" > +fi > + > +cp ${BINARIES_DIR}/u-boot.dtb ${BINARIES_DIR}/cv1800b_milkv_duo_sd.dtb > +lzma -fk ${BINARIES_DIR}/Image > +mkimage -f ${BINARIES_DIR}/multi.its ${BINARIES_DIR}/boot.sd > +if [ -f ${BINARIES_DIR}/boot.sd ]; then > + echo "[Duo Post-Image] > boot.sd generated!" > +fi > +support/scripts/genimage.sh -c $(pwd)/board/milkv/duo/genimage.cfg > +gzip -fk ${BINARIES_DIR}/sdcard.img > +if [ -f ${BINARIES_DIR}/sdcard.img ]; then > + echo "[Duo Post-Image] > sdcard.img generated!" > +fi > diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt > new file mode 100644 > index 0000000000..bb05050245 > --- /dev/null > +++ b/board/milkv/duo/readme.txt > @@ -0,0 +1,46 @@ > +Milk-V Duo (https://milkv.io/docs/duo/overview) > + > +Intro > +===== > + > +Milk-V Duo is an ultra-compact embedded development platform > +based on the rv64 CV1800B chip. It can run Linux and RTOS, > +providing a reliable, cost-effective, and high-performance > +platform for professionals, industrial ODMs, AIoT enthusiasts, > +DIY enthusiasts, and creators. > + > +How to build it > +=============== > + > +Configure Buildroot: > + > + $ make milkv_duo_musl_riscv64_defconfig > + > +The milkv_duo_musl_riscv64_defconfig will by default provide > +the full 64MiB free RAM. If you want to build with memory > +reserved for ION (generalized memory manager in linux, i.e. > +some memory will be reserved for the camera algorithms), please try: > + > + $ make milkv_duo_musl_riscv64_ion_defconfig > + > +For more information about the ION, please refer to > + > +https://github.com/milkv-duo/duo-buildroot-sdk/blob/develop/README.md?plain=1#L436 > + > +Modify configuration if needed, e.g. add more packages to target: > + > + $ make menuconfig > + > +Compile everything and build the SD card image: > + > + $ make > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image > +called "sdcard.img" in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_musl_riscv64_defconfig > new file mode 100644 > index 0000000000..0773924072 > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_defconfig > @@ -0,0 +1,67 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Since gcc 13 and later versions with the t-head's optimizations > +# below are currently not well compatible with glibc, which will > +# throw gcc ICE (Internal Compiler Error) when the buildroot is > +# compiling the glibc, so we choose musl used by the official sdk > +# until this ICE gets fixed. > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_64mb" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL_64MB=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > diff --git a/configs/milkv_duo_musl_riscv64_ion_defconfig b/configs/milkv_duo_musl_riscv64_ion_defconfig > new file mode 100644 > index 0000000000..18458726d9 > --- /dev/null > +++ b/configs/milkv_duo_musl_riscv64_ion_defconfig > @@ -0,0 +1,67 @@ > +# Architecture > +BR2_riscv=y > +BR2_riscv_g=y > +BR2_RISCV_ISA_RVC=y > + > +# Linux headers same as kernel 5.10 series > +BR2_KERNEL_HEADERS_5_10=y > + > +# Since gcc 13 and later versions with the t-head's optimizations > +# below are currently not well compatible with glibc, which will > +# throw gcc ICE (Internal Compiler Error) when the buildroot is > +# compiling the glibc, so we choose musl used by the official sdk > +# until this ICE gets fixed. > +BR2_GCC_VERSION_13_X=y > +BR2_TOOLCHAIN_BUILDROOT_MUSL=y > +BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" > + > +# opensbi > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_GIT=y > +BR2_TARGET_OPENSBI_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-opensbi.git" > +BR2_TARGET_OPENSBI_CUSTOM_REPO_VERSION="ee78f99daf8ac5956c6bf95458983ead52142548" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_OPENSBI_FW_FDT_PATH=y > + > +# u-boot > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_GIT=y > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-u-boot.git" > +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2021.10_ion" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/milkv-duo/milkv-duo-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="duo-linux-5.10.4" > +BR2_LINUX_KERNEL_DEFCONFIG="cvitek_cv1800b_milkv_duo_sd" > +BR2_LINUX_KERNEL_LZMA=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# SD card image generating script > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/milkv/duo/post-image.sh" > + > +# rootfs > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > + > +# Packages for the sdcard image generating > +BR2_PACKAGE_MILKV_DUO_LIBRARIES=y > +BR2_PACKAGE_MILKV_DUO_FIRMWARE_FSBL=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > +BR2_PACKAGE_MILKV_DUO_PINMUX=y > +BR2_PACKAGE_MILKV_DUO_FEATURES=y > +BR2_PACKAGE_MILKV_DUO_SMALLCORE_FREERTOS=y > + > +# Host packages for the sdcard image generating > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_LZMA_ALONE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y Everything looks good to me now, so let's wait for some Maintainer to take care of this patch along with the others in the patchset. Best regards! -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Wed Feb 7 11:44:04 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:44:04 +0100 Subject: [Buildroot] [git commit] package/re2: propagate libabseil-cpp dependencies Message-ID: <20240207114414.E163F8756E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4f7f0565699b5f396b918954c3c7a91a7ede16b0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit fc7606010e4edde7a34c545fac0fe7f82d4a5e18 forgot to propagate libabseil-cpp dependencies to re2 Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Reviewed-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/grpc/Config.in | 2 +- package/qt5/qt5webengine/Config.in | 6 ++++-- package/re2/Config.in | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package/grpc/Config.in b/package/grpc/Config.in index ef3e1c86cb..7664948b40 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_GRPC depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp, re2 - depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp + depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp, re2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS select BR2_PACKAGE_C_ARES diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index cfa5893f41..99a2980a25 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -9,12 +9,13 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative depends on !BR2_BINFMT_FLAT # qt5base-icu depends on BR2_USE_MMU # libglib2, qt5base-dbus + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # re2 -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar" +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, dynamic library, threads, wchar" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ - !BR2_HOST_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR comment "qt5webengine needs an OpenGL and EGL-capable backend" @@ -24,6 +25,7 @@ comment "qt5webengine needs an OpenGL and EGL-capable backend" config BR2_PACKAGE_QT5WEBENGINE bool "qt5webengine" depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS + depends on !BR2_STATIC_LIBS # re2 depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo depends on BR2_HOST_GCC_AT_LEAST_4_9 # qt5base-icu depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # re2 diff --git a/package/re2/Config.in b/package/re2/Config.in index 0ac0041f6d..b79e711ad3 100644 --- a/package/re2/Config.in +++ b/package/re2/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_RE2 bool "re2" + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS # libabseil-cpp select BR2_PACKAGE_LIBABSEIL_CPP help RE2 is a fast, safe, thread-friendly alternative @@ -12,7 +14,8 @@ config BR2_PACKAGE_RE2 https://github.com/google/re2 -comment "re2 needs a toolchain w/ C++, threads, gcc >= 8" +comment "re2 needs a toolchain w/ C++, threads, dynamic library, gcc >= 8" + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 From romain.naour at smile.fr Wed Feb 7 11:49:41 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 7 Feb 2024 12:49:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/swipl: new package In-Reply-To: <20221216221934.465323-1-ju.o@free.fr> References: <20221216221934.465323-1-ju.o@free.fr> Message-ID: <0d0380e0-e56c-4b0a-bdfa-4a6253124b0b@smile.fr> Hello Julien, Le 16/12/2022 ? 23:19, Julien Olivain a ?crit?: > SWI-Prolog offers a comprehensive free Prolog environment. Since its > start in 1987, SWI-Prolog development has been driven by the needs of > real world applications. SWI-Prolog is widely used in research and > education as well as commercial applications. > > Signed-off-by: Julien Olivain > --- > Tested on top of branch master at commit f62d409 with commands: > > make check-package > ... > 0 warnings generated > > python3 -m flake8 support/testing/tests/package/test_swipl.py > [no-output] > > ./utils/test-pkg -a -p swipl > arm-aarch64 [ 1/44]: OK > bootlin-aarch64-glibc [ 2/44]: OK > bootlin-arcle-hs38-uclibc [ 3/44]: SKIPPED > bootlin-armv5-uclibc [ 4/44]: SKIPPED > bootlin-armv7-glibc [ 5/44]: OK > bootlin-armv7m-uclibc [ 6/44]: SKIPPED > bootlin-armv7-musl [ 7/44]: OK > bootlin-m68k-5208-uclibc [ 8/44]: SKIPPED > bootlin-m68k-68040-uclibc [ 9/44]: SKIPPED > bootlin-microblazeel-uclibc [10/44]: SKIPPED > bootlin-mipsel32r6-glibc [11/44]: OK > bootlin-mipsel-uclibc [12/44]: SKIPPED > bootlin-nios2-glibc [13/44]: SKIPPED > bootlin-openrisc-uclibc [14/44]: SKIPPED > bootlin-powerpc64le-power8-glibc [15/44]: OK > bootlin-powerpc-e500mc-uclibc [16/44]: SKIPPED > bootlin-riscv32-glibc [17/44]: OK > bootlin-riscv64-glibc [18/44]: OK > bootlin-riscv64-musl [19/44]: OK > bootlin-sh4-uclibc [20/44]: SKIPPED > bootlin-sparc64-glibc [21/44]: OK > bootlin-sparc-uclibc [22/44]: SKIPPED > bootlin-x86-64-glibc [23/44]: OK > bootlin-x86-64-musl [24/44]: OK > bootlin-x86-64-uclibc [25/44]: SKIPPED > bootlin-xtensa-uclibc [26/44]: SKIPPED > br-arm-basic [27/44]: SKIPPED > br-arm-full-nothread [28/44]: SKIPPED > br-arm-full-static [29/44]: SKIPPED > br-i386-pentium4-full [30/44]: SKIPPED > br-i386-pentium-mmx-musl [31/44]: OK > br-mips64-n64-full [32/44]: SKIPPED > br-mips64r6-el-hf-glibc [33/44]: OK > br-powerpc-603e-basic-cpp [34/44]: SKIPPED > br-powerpc64-power7-glibc [35/44]: OK > linaro-aarch64-be [36/44]: OK > linaro-aarch64 [37/44]: OK > linaro-arm [38/44]: OK > sourcery-arm-armv4t [39/44]: SKIPPED > sourcery-arm [40/44]: SKIPPED > sourcery-arm-thumb2 [41/44]: SKIPPED > sourcery-mips64 [42/44]: OK > sourcery-mips [43/44]: OK > sourcery-nios2 [44/44]: SKIPPED > 44 builds, 24 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_swipl.TestSWIPL > ... > OK > --- > DEVELOPERS | 3 + > package/Config.in | 1 + > package/swipl/Config.in | 38 +++++++++++++ > package/swipl/swipl.hash | 4 ++ > package/swipl/swipl.mk | 55 +++++++++++++++++++ > support/testing/tests/package/test_swipl.py | 52 ++++++++++++++++++ > .../test_swipl/rootfs-overlay/root/sudoku.pl | 42 ++++++++++++++ > 7 files changed, 195 insertions(+) > create mode 100644 package/swipl/Config.in > create mode 100644 package/swipl/swipl.hash > create mode 100644 package/swipl/swipl.mk > create mode 100644 support/testing/tests/package/test_swipl.py > create mode 100644 support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl > > diff --git a/DEVELOPERS b/DEVELOPERS > index 3a0e3c14ab..38259fd0d8 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1682,6 +1682,7 @@ F: package/python-distro/ > F: package/python-gnupg/ > F: package/python-pyalsa/ > F: package/riscv-isa-sim/ > +F: package/swipl/ > F: package/tinycompress/ > F: package/z3/ > F: package/zynaddsubfx/ > @@ -1696,6 +1697,8 @@ F: support/testing/tests/package/test_ola/ > F: support/testing/tests/package/test_python_distro.py > F: support/testing/tests/package/test_python_gnupg.py > F: support/testing/tests/package/test_python_pyalsa.py > +F: support/testing/tests/package/test_swipl.py > +F: support/testing/tests/package/test_swipl/ > F: support/testing/tests/package/test_z3.py > > N: Julien Viard de Galbert > diff --git a/package/Config.in b/package/Config.in > index 914c3584e9..64e2bdd991 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1351,6 +1351,7 @@ endmenu > endif > source "package/quickjs/Config.in" > source "package/ruby/Config.in" > + source "package/swipl/Config.in" > source "package/tcl/Config.in" > if BR2_PACKAGE_TCL > menu "Tcl libraries/modules" > diff --git a/package/swipl/Config.in b/package/swipl/Config.in > new file mode 100644 > index 0000000000..8d8d5b1b76 > --- /dev/null > +++ b/package/swipl/Config.in > @@ -0,0 +1,38 @@ > +# swipl supports arch for which libc fenv.h provides all four macros: > +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD > +# See for example in glibc https://sourceware.org/git/glibc.git > +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ > +config BR2_PACKAGE_SWIPL_ARCH_SUPPORTS > + bool > + default y if BR2_aarch64 || BR2_aarch64_be > + default y if BR2_arceb || BR2_arcle > + default y if BR2_arm || BR2_armeb > + default y if BR2_i386 > + default y if BR2_m68k > + # BR2_microblaze has only FE_TONEAREST > + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el > + # BR2_nios2 has only FE_TONEAREST > + default y if BR2_or1k > + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le > + default y if BR2_riscv > + default y if BR2_s390x > + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} > + default y if BR2_sparc || BR2_sparc64 > + default y if BR2_x86_64 > + # BR2_xtensa supports only uclibc which does not have fenv.h > + > +config BR2_PACKAGE_SWIPL > + bool "SWI-Prolog" > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # __has_attribute() > + depends on BR2_PACKAGE_SWIPL_ARCH_SUPPORTS > + # swipl needs fenv.h which is not provided by uclibc > + depends on !BR2_TOOLCHAIN_USES_UCLIBC > + select BR2_PACKAGE_ZLIB > + help > + SWI-Prolog offers a comprehensive free Prolog > + environment. Since its start in 1987, SWI-Prolog development > + has been driven by the needs of real world > + applications. SWI-Prolog is widely used in research and > + education as well as commercial applications. > + > + https://swi-prolog.org > diff --git a/package/swipl/swipl.hash b/package/swipl/swipl.hash > new file mode 100644 > index 0000000000..be448a5604 > --- /dev/null > +++ b/package/swipl/swipl.hash > @@ -0,0 +1,4 @@ > +# From https://www.swi-prolog.org/download/stable > +sha256 33b5de34712d58f14c1e019bd1613df9a474f5e5fd024155a0f6e67ebb01c307 swipl-9.0.2.tar.gz > +# Locally calculated > +sha256 770594d0f4463b71f1485f00e4bc5cf4b6f667d62ef6bc9bde2fee236541992a LICENSE > diff --git a/package/swipl/swipl.mk b/package/swipl/swipl.mk > new file mode 100644 > index 0000000000..3f232f47f3 > --- /dev/null > +++ b/package/swipl/swipl.mk > @@ -0,0 +1,55 @@ > +################################################################################ > +# > +# swipl > +# > +################################################################################ > + > +SWIPL_VERSION = 9.0.2 > +SWIPL_SITE = https://www.swi-prolog.org/download/stable/src > +SWIPL_LICENSE = BSD-2-Clause > +SWIPL_LICENSE_FILES = LICENSE > + > +SWIPL_DEPENDENCIES = host-swipl zlib > + > +# A host-swipl is needed to compile the target prolog boot > +# boot.prl file. > +HOST_SWIPL_CONF_OPTS = \ > + -DBUILD_PDF_DOCUMENTATION=OFF \ > + -DSWIPL_PACKAGES=OFF \ > + -DUSE_GMP=OFF \ > + -DUSE_TCMALLOC=OFF > + > +# swipl uses cmake macros try_run() and check_c_source_runs(), which > +# are not suitable for cross compilation. We add results in cache to > +# avoid running those tests. The SWIPL_NATIVE_FRIEND variable, is > +# meant to point to build directory of a host native swipl, rather > +# than the binary itself. The Cmake macro will append "src/swipl" to > +# the path set to this variable. Therefore, we cannot use the host > +# "swipl" binary installed in $(HOST_DIR)/usr/bin. > +SWIPL_CONF_OPTS = \ > + -DBUILD_PDF_DOCUMENTATION=OFF \ > + -DHAVE_WEAK_ATTRIBUTE=1 \ > + -DLLROUND_OK=1 \ > + -DMODF_OK=1 \ > + -DQSORT_R_GNU=1 \ > + -DSWIPL_NATIVE_FRIEND=$(BUILD_DIR)/host-swipl-$(SWIPL_VERSION) \ > + -DSWIPL_PACKAGES=OFF \ > + -DUSE_TCMALLOC=OFF > + > +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > +SWIPL_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > +endif > + > +ifeq ($(BR2_PACKAGE_GMP),y) > +SWIPL_CONF_OPTS += -DUSE_GMP=ON > +SWIPL_DEPENDENCIES += gmp > +else > +SWIPL_CONF_OPTS += -DUSE_GMP=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_NCURSES),y) > +SWIPL_DEPENDENCIES += ncurses > +endif > + > +$(eval $(cmake-package)) > +$(eval $(host-cmake-package)) > diff --git a/support/testing/tests/package/test_swipl.py b/support/testing/tests/package/test_swipl.py > new file mode 100644 > index 0000000000..4248f6f13c > --- /dev/null > +++ b/support/testing/tests/package/test_swipl.py > @@ -0,0 +1,52 @@ > +import os > + > +import infra.basetest > + > + > +class TestSWIPL(infra.basetest.BRTest): > + # Need to use a different toolchain than the default due to > + # swipl requiring fenv.h not provided by uclibc. This not true anymore, the Buildroot testing infrastructure switched from uClibc to Glibc somewhere between 2022 and 2024 :) Hopefully the runtime test still pass on the current Buildroot master: ./support/testing/run-tests -k -d dl/ -o testsuite-master tests.package.test_swipl.TestSWIPL 12:33:08 TestSWIPL Starting 12:33:09 TestSWIPL Building 12:35:49 TestSWIPL Building done 12:36:02 TestSWIPL Cleaning up . ---------------------------------------------------------------------- Ran 1 test in 173.451s The complexity of the architecture dependency and the buildsystem make it difficult to review in details. Without going into the details, it seems ok for me. Obviously, the DEVELOPERS file conflict nowadays since several entries has been added since then. Best regards, Romain > + config = \ > + """ > + BR2_arm=y > + BR2_TOOLCHAIN_EXTERNAL=y > + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y > + BR2_PACKAGE_SWIPL=y > + BR2_ROOTFS_OVERLAY="{}" > + BR2_TARGET_ROOTFS_CPIO=y > + # BR2_TARGET_ROOTFS_TAR is not set > + """.format( > + # overlay to add a swi prolog test scripts > + infra.filepath("tests/package/test_swipl/rootfs-overlay")) > + > + 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]) > + self.emulator.login() > + > + # Check program executes > + cmd = "swipl --version" > + self.assertRunOk(cmd) > + > + # Check swipl fails when goal is false > + cmd = "swipl -g false" > + _, exit_code = self.emulator.run(cmd) > + self.assertNotEqual(exit_code, 0) > + > + # Test output > + string = "Hello Buildroot !" > + cmd = "swipl -g 'writeln(\"{}\")' -t halt".format(string) > + output, exit_code = self.emulator.run(cmd) > + self.assertEqual(exit_code, 0) > + self.assertEqual(output, [string]) > + > + # Check the swipl demo file works (ex: "sam" likes "pizza") > + cmd = "swipl -g '[swi(demo/likes)]' -g 'likes(sam,pizza)' -t halt" > + self.assertRunOk(cmd) > + > + # Run a more complex logic program (solve a sudoku) > + cmd = "swipl -g top -t halt /root/sudoku.pl" > + self.assertRunOk(cmd, timeout=10) > diff --git a/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl b/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl > new file mode 100644 > index 0000000000..2b68b6cc89 > --- /dev/null > +++ b/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl > @@ -0,0 +1,42 @@ > +% taken from: > +% https://www.swi-prolog.org/pldoc/man?section=clpfd-sudoku > + > +:- use_module(library(clpfd)). > + > +sudoku(Rows) :- > + length(Rows, 9), maplist(same_length(Rows), Rows), > + append(Rows, Vs), Vs ins 1..9, > + maplist(all_distinct, Rows), > + transpose(Rows, Columns), > + maplist(all_distinct, Columns), > + Rows = [As,Bs,Cs,Ds,Es,Fs,Gs,Hs,Is], > + blocks(As, Bs, Cs), > + blocks(Ds, Es, Fs), > + blocks(Gs, Hs, Is). > + > +blocks([], [], []). > +blocks([N1,N2,N3|Ns1], [N4,N5,N6|Ns2], [N7,N8,N9|Ns3]) :- > + all_distinct([N1,N2,N3,N4,N5,N6,N7,N8,N9]), > + blocks(Ns1, Ns2, Ns3). > + > +problem(1, [[_,_,_,_,_,_,_,_,_], > + [_,_,_,_,_,3,_,8,5], > + [_,_,1,_,2,_,_,_,_], > + [_,_,_,5,_,7,_,_,_], > + [_,_,4,_,_,_,1,_,_], > + [_,9,_,_,_,_,_,_,_], > + [5,_,_,_,_,_,_,7,3], > + [_,_,2,_,1,_,_,_,_], > + [_,_,_,_,4,_,_,_,9]]). > + > +top :- writeln("Sudoku solution:"), > + problem(1, Rows), sudoku(Rows), maplist(portray_clause, Rows), > + Rows = [[9, 8, 7, 6, 5, 4, 3, 2, 1], > + [2, 4, 6, 1, 7, 3, 9, 8, 5], > + [3, 5, 1, 9, 2, 8, 7, 4, 6], > + [1, 2, 8, 5, 3, 7, 6, 9, 4], > + [6, 3, 4, 8, 9, 2, 1, 5, 7], > + [7, 9, 5, 4, 6, 1, 8, 3, 2], > + [5, 1, 9, 2, 8, 6, 4, 7, 3], > + [4, 7, 2, 3, 1, 9, 5, 6, 8], > + [8, 6, 3, 7, 4, 5, 2, 1, 9]]. From thomas.petazzoni at bootlin.com Wed Feb 7 11:50:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:50:06 +0100 Subject: [Buildroot] [PATCH 04/10] package/re2: propagate dependencies from libabseil-cpp In-Reply-To: References: Message-ID: <20240207125006.27c84c03@windsurf> On Sun, 28 Jan 2024 14:20:53 +0100 "Yann E. MORIN" wrote: > Commit fc7606010e4e (package/re2: bump to version 2023.11.01) forgot to > propagate the arch dependency from libabsel-cpp to re2, and transitively > to its dependees, causing unmet dependencies warnings (unfortunately, > not errors), such as: > > $ KCONFIG_SEED=0xCCB17344 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LIBABSEIL_CPP > Depends on [n]: BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_8 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] && !BR2_STATIC_LIBS [=n] && BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS [=n] > Selected by [y]: > - BR2_PACKAGE_RE2 [=y] && BR2_INSTALL_LIBSTDCPP [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_8 [=y] && BR2_TOOLCHAIN_HAS_THREADS [=y] > > Fix that, and propagate the dependency. > > Note that qt5webengine depends on glibc, so that implies !static > already. > > Signed-off-by: Yann E. MORIN > Cc: Michael Nosthoff > Cc: Julien Corjon > Cc: Giulio Benetti > --- > package/grpc/Config.in | 2 +- > package/qt5/qt5webengine/Config.in | 1 + > package/re2/Config.in | 8 ++++++-- > 3 files changed, 8 insertions(+), 3 deletions(-) There was already a previous patch from Fabrice to fix this, so I applied his patch https://patchwork.ozlabs.org/project/buildroot/patch/20240118220422.167000-1-fontaine.fabrice at gmail.com/, with some edits. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 11:50:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:50:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/re2: propagate libabseil-cpp dependencies In-Reply-To: <20240118220422.167000-1-fontaine.fabrice@gmail.com> References: <20240118220422.167000-1-fontaine.fabrice@gmail.com> Message-ID: <20240207125041.175fb99a@windsurf> On Thu, 18 Jan 2024 23:04:22 +0100 Fabrice Fontaine wrote: > Commit fc7606010e4edde7a34c545fac0fe7f82d4a5e18 forgot to propagate > libabseil-cpp dependencies to re2 > > Fixes: > - No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > package/qt5/qt5webengine/Config.in | 7 +++++-- > package/re2/Config.in | 7 +++++-- > 2 files changed, 10 insertions(+), 4 deletions(-) I updated the package/grpc/Config.in package, as Yann did in his patch. > diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in > index cfa5893f41..49c9d0e450 100644 > --- a/package/qt5/qt5webengine/Config.in > +++ b/package/qt5/qt5webengine/Config.in > @@ -10,11 +10,12 @@ config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS > depends on !BR2_BINFMT_FLAT # qt5base-icu > depends on BR2_USE_MMU # libglib2, qt5base-dbus > > -comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, threads, wchar" > +comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 8, host gcc >= 4.9, dynamic library, threads, wchar" > depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS > + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS This should have gone into BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS, so I moved it there. Thanks, applied with those two changes! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 11:51:00 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:51:00 +0100 Subject: [Buildroot] [git commit] package/petitboot: fix ordering of comments and sub-options Message-ID: <20240207115109.76B8C87574@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=06dcbdf8ad3d55b92df4bc3ded82c08e21cbb60e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, the comment about availability is between the package main symbol and its suboptions, breaking the threading in menuconfig. Invert the order, and move the comment last. Also enclose the suboptions between an if-block, as it is more customary. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- package/petitboot/Config.in | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 93ed3642c3..f931ab91cd 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -19,17 +19,20 @@ config BR2_PACKAGE_PETITBOOT http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html -comment "petitboot needs a toolchain w/ wchar, dynamic library, threads, udev /dev management" - depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_PACKAGE_HAS_UDEV +if BR2_PACKAGE_PETITBOOT config BR2_PACKAGE_PETITBOOT_GETTY_PORT string "TTY port(s)" default "console" - depends on BR2_PACKAGE_PETITBOOT help Specify a space-separated list of ports to run the petitboot UI on. Wildcards are allowed. Example: "hvc* ttys0 ttyS*" + +endif # BR2_PACKAGE_PETITBOOT + +comment "petitboot needs a toolchain w/ wchar, dynamic library, threads, udev /dev management" + depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_PACKAGE_HAS_UDEV From thomas.petazzoni at bootlin.com Wed Feb 7 11:51:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 12:51:12 +0100 Subject: [Buildroot] [PATCH 05/10] package/petitboot: fix ordering of comments and sub-options In-Reply-To: References: Message-ID: <20240207125112.4d4f7de2@windsurf> On Sun, 28 Jan 2024 14:20:54 +0100 "Yann E. MORIN" wrote: > Currently, the comment about availability is between the package main > symbol and its suboptions, breaking the threading in menuconfig. > > Invert the order, and move the comment last. Also enclose the suboptions > between an if-block, as it is more customary. > > Signed-off-by: Yann E. MORIN > --- > package/petitboot/Config.in | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Wed Feb 7 11:57:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 12:57:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-ml-dtypes: needs C++ In-Reply-To: <20240112221910.14778-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 12 Jan 2024 23:19:10 +0100") References: <20240112221910.14778-1-fontaine.fabrice@gmail.com> Message-ID: <87sf24zdu7.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit ebe47e7605c6cde295e209d80690508cfd11ba61 forgot to add C++ > dependency resulting in the following build failure: > ../output-1/build/python-numpy-1.25.0/meson.build:1:0: ERROR: Unable to detect GNU compiler type: > Fixes: > - http://autobuild.buildroot.org/results/6f3532598355732b289730fc751e9aebdab4b0e4 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 7 11:58:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 12:58:13 +0100 Subject: [Buildroot] [git commit] package/python-ml-dtypes: needs C++ Message-ID: <20240207115839.087798757A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=650c2b83b515bf6941189b837d87819a901ec901 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit ebe47e7605c6cde295e209d80690508cfd11ba61 forgot to add C++ dependency resulting in the following build failure: ../output-1/build/python-numpy-1.25.0/meson.build:1:0: ERROR: Unable to detect GNU compiler type: Fixes: - http://autobuild.buildroot.org/results/6f3532598355732b289730fc751e9aebdab4b0e4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-ml-dtypes/Config.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python-ml-dtypes/Config.in b/package/python-ml-dtypes/Config.in index 8791564b19..58c218b214 100644 --- a/package/python-ml-dtypes/Config.in +++ b/package/python-ml-dtypes/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES bool "python-ml-dtypes" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # python-pybind, python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy @@ -10,3 +11,9 @@ config BR2_PACKAGE_PYTHON_ML_DTYPES dtype extensions used in machine learning libraries. https://github.com/jax-ml/ml_dtypes + +comment "python-ml-dtypes needs a glibc or musl toolchain w/ C++, gcc >= 9" + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) From giulio.benetti at benettiengineering.com Wed Feb 7 13:48:50 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 14:48:50 +0100 Subject: [Buildroot] [PATCH v4 3/3] configs/freescale_imx93evk: new defconfig In-Reply-To: <20240115-imx93-support-v4-3-8d7f90f60980@armadeus.com> References: <20240115-imx93-support-v4-0-8d7f90f60980@armadeus.com> <20240115-imx93-support-v4-3-8d7f90f60980@armadeus.com> Message-ID: <89d38f8c-5190-4813-9163-fb2dfa222a6c@benettiengineering.com> Hi S?bastien, On 23/01/24 09:45, S?bastien Szymanski wrote: > This patch adds support for the NXP i.MX 93 11x11 EVK board [1]. > > [1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-93-evaluation-kit:i.MX93EVK > > Reviewed-by: Julien Olivain > Tested-by: Julien Olivain > [Julien: tested on NXP board i.MX93EVK, cpu rev A1, board rev B] > Signed-off-by: S?bastien Szymanski > Reviewed-by: Gary Bisson > --- > Changes for v4: > - None > > Changes for v3: > - BR2_PACKAGE_FIRMWARE_SENTINEL=y -> BR2_PACKAGE_FIRMWARE_ELE_IMX=y > - add a note about the debug UART in the readme.txt file (Julien Olivain) > - add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y and > BR2_TARGET_UBOOT_NEEDS_GNUTLS=y to the defconfig file (Julien Olivain) > - bump ATF, U-Boot and Linux to latest NXP release lf-6.1.55-2.2.0 > (Julien Olivain) > > Changes for v2: > - none > --- > .../common/imx/genimage.cfg.template_imx9 | 41 ++++++++++++ > .../common/imx/imx9-bootloader-prepare.sh | 34 ++++++++++ > board/freescale/common/imx/post-image.sh | 4 ++ > board/freescale/imx93evk/readme.txt | 77 ++++++++++++++++++++++ > configs/freescale_imx93evk_defconfig | 39 +++++++++++ > 5 files changed, 195 insertions(+) > > diff --git a/board/freescale/common/imx/genimage.cfg.template_imx9 b/board/freescale/common/imx/genimage.cfg.template_imx9 > new file mode 100644 > index 000000000000..10e192ce5774 > --- /dev/null > +++ b/board/freescale/common/imx/genimage.cfg.template_imx9 > @@ -0,0 +1,41 @@ > +# Minimal SD card image for the Freescale iMX9 boards > +# > +# We mimic the .sdcard Freescale's image format: > +# * the SD card must have 32 kB free space at the beginning, > +# * U-Boot is integrated into imx9-boot-sd.bin and is dumped as is, > +# * a FAT partition at offset 8MB is containing Image and DTB files > +# * a single root filesystem partition is required (ext2, ext3 or ext4) > +# > + > +image boot.vfat { > + vfat { > + label = "boot" > + files = { > + %FILES% > + } > + } > + size = 64M > +} > + > +image sdcard.img { > + hdimage { > + } > + > + partition imx-boot { > + in-partition-table = "no" > + image = "imx9-boot-sd.bin" > + offset = %IMXOFFSET% > + } > + > + partition boot { > + partition-type = 0xC > + bootable = "true" > + image = "boot.vfat" > + offset = 8M > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext2" > + } > +} Please format genimage.cfg file according to Buildroot Manual: https://buildroot.org/downloads/manual/manual.html#writing-genimage-cfg > diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh > new file mode 100755 > index 000000000000..4ff92fa4cd23 > --- /dev/null > +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh > @@ -0,0 +1,34 @@ > +#!/usr/bin/env bash > + > +main () > +{ > + SPL_LOAD_ADDR=0x2049A000 > + ATF_LOAD_ADDR=0x204E0000 > + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" ${BR2_CONFIG}; then > + SPL_LOAD_ADDR=0x204A0000 > + ATF_LOAD_ADDR=0x204C0000 > + fi > + > + dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync > + cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin > + > + ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit > + cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin > + rm -f ${BINARIES_DIR}/mkimg.commit > + > + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then > + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -c -ap ${BINARIES_DIR}/bl31.bin a35 ${ATF_LOAD_ADDR} -ap ${BINARIES_DIR}/u-boot-hash.bin a35 0x80200000 -ap ${BINARIES_DIR}/tee.bin a35 0x96000000 -out ${BINARIES_DIR}/u-boot-atf-container.img > + else > + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -c -ap ${BINARIES_DIR}/bl31.bin a35 ${ATF_LOAD_ADDR} -ap ${BINARIES_DIR}/u-boot-hash.bin a35 0x80200000 -out ${BINARIES_DIR}/u-boot-atf-container.img > + fi > + > + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -append ${BINARIES_DIR}/ahab-container.img -c -ap ${BINARIES_DIR}/u-boot-spl-ddr.bin a35 ${SPL_LOAD_ADDR} -out ${BINARIES_DIR}/imx9-boot-sd.bin > + > + flashbin_size=$(wc -c ${BINARIES_DIR}/imx9-boot-sd.bin | awk '{print $1}') > + pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400)) > + dd if=${BINARIES_DIR}/u-boot-atf-container.img of=${BINARIES_DIR}/imx9-boot-sd.bin bs=1K seek=${pad_cnt} > + > + exit $? > +} > + > +main $@ > diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh > index c359ef6032a6..3df7e820938b 100755 > --- a/board/freescale/common/imx/post-image.sh > +++ b/board/freescale/common/imx/post-image.sh > @@ -48,6 +48,10 @@ genimage_type() > echo "genimage.cfg.template_imx8" > elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" ${BR2_CONFIG}; then > echo "genimage.cfg.template_imx8" > + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" ${BR2_CONFIG}; then > + echo "genimage.cfg.template_imx9" > + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y$" ${BR2_CONFIG}; then > + echo "genimage.cfg.template_imx9" > elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then > if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then > echo "genimage.cfg.template_no_boot_part_spl" > diff --git a/board/freescale/imx93evk/readme.txt b/board/freescale/imx93evk/readme.txt > new file mode 100644 > index 000000000000..1173de39dbb1 > --- /dev/null > +++ b/board/freescale/imx93evk/readme.txt > @@ -0,0 +1,77 @@ > +********************* > +NXP i.MX93 EVK board > +********************* > + > +This file documents the Buildroot support for the i.MX 93 EVK board. > + > +Build > +===== > + > +First, configure Buildroot for the i.MX 93 EVK board: > + > + make freescale_imx93evk_defconfig > + > +Build all components: > + > + make > + > +You will find in output/images/ the following files: > + - ahab-container.img > + - bl31.bin > + - boot.vfat > + - ddr_fw.bin > + - Image > + - imx93-11x11-evk.dtb > + - imx9-boot-sd.bin > + - lpddr4_pmu_train_fw.bin > + - rootfs.ext2 > + - rootfs.ext4 > + - rootfs.tar > + - sdcard.img > + - u-boot-atf-container.img > + - u-boot.bin > + - u-boot-hash.bin > + - u-boot-spl.bin > + - u-boot-spl-ddr.bin > + - u-boot-spl-padded.bin > + > +Create a bootable SD card > +========================= > + > +To determine the device associated to the SD card have a look in the > +/proc/partitions file: > + > + cat /proc/partitions > + > +Buildroot prepares a bootable "sdcard.img" image in the output/images/ > +directory, ready to be dumped on a SD card. Launch the following > +command as root: > + > + dd if=output/images/sdcard.img of=/dev/ > + > +*** WARNING! This will destroy all the card content. Use with care! *** > + > +For details about the medium image layout, see the definition in > +board/freescale/common/imx/genimage.cfg.template_imx9. > + > +Boot the i.MX 93 EVK board > +=============================== > + > +To boot your newly created system (refer to the i.MX 93 EVK Documentation > +[1] for guidance): > +- insert the SD card in the SD slot of the board; > +- Configure the switches as follows: > +SW1301: 0100 SW1301[1-4] > +- put a micro USB cable into the Debug USB Port and connect using a terminal > + emulator at 115200 bps, 8n1; > +- power on the board. > + > +Note: the debug USB connector presents 4 UARTs (for example /dev/ttyUSB[0-3]), > +the Cortex-A55 UART should be the 3rd one (in the previous example, /dev/ttyUSB2). > +Refer to the documentation [1] for more details. > + > +Enjoy! > + > +References > +========== > +[1] https://www.nxp.com/document/guide/getting-started-with-the-i-mx93-evk:GS-IMX93EVK > diff --git a/configs/freescale_imx93evk_defconfig b/configs/freescale_imx93evk_defconfig > new file mode 100644 > index 000000000000..34baf04c88db > --- /dev/null > +++ b/configs/freescale_imx93evk_defconfig > @@ -0,0 +1,39 @@ > +BR2_aarch64=y > +BR2_cortex_a55=y > +BR2_ARM_FPU_VFPV4D16=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > +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.1.55-2.2.0)/linux-imx-lf-6.1.55-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" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_FREESCALE_IMX=y > +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y > +BR2_PACKAGE_FIRMWARE_ELE_IMX=y > +BR2_PACKAGE_FIRMWARE_IMX=y > +BR2_TARGET_ROOTFS_EXT2=y > +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.1.55-2.2.0)/imx-atf-lf-6.1.55-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.1.55-2.2.0)/uboot-imx-lf-6.1.55-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 > +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_IMX_MKIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y For the rest all the patchset looks good to me and I've built this defconfig successfully using buildroot/utils/docker-run so: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From thomas.petazzoni at bootlin.com Wed Feb 7 14:06:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:06:16 +0100 Subject: [Buildroot] Call for more autobuilder machines Message-ID: <20240207150616.2683d894@windsurf> Dear Buildroot community members, Our "autobuilder" infrastructure, whose results are presented at http://autobuild.buildroot.net/, and sent on a daily basis to the mailing list and individual developers, is critical to the proper testing of Buildroot. Unfortunately, over recent times, less and less machines have been contributing build results, to the point where we only test 100-120 builds per day, which is not enough to have good coverage. Indeed, the builds are done by various machines that contribute their results to autobuild.buildroot.net. Therefore, the way to increase the number of builds done per day is to increase the number of machines that contributes to the build. So this e-mail is a call for participation: if you have some machines that could be used to run Buildroot builds 24/7, or at least during the night and/or week-end, it would be useful. However, beware that it only makes sense to contribute if you have a sufficiently powerful machine at hand: enough RAM, fast storage, recently recent CPU. At least 4 cores (not threads), 32 GB of RAM, and SSD/NVMe. If you are interested in contributing to this, contact us and we will give you the details. It's pretty much as simple as running https://git.buildroot.org/buildroot-test/tree/scripts/autobuild-run on your machine, as an unprivileged user (no root/sudo access needed), and that's it. Thanks a lot for your collaboration! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:25:23 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:25:23 +0100 Subject: [Buildroot] [git commit] package/petitboot: propagate dependencies from kexec/kexec-lite Message-ID: <20240207142542.5284687589@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c721a583790ef9e35e2a974450bdcbc5662621c8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 719921bebe17 (package/kexec: bump to version 2.0.27) forgot to propagate the new dependency on kernel headers to petitboot, which may select kexec, causing unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0x84462FFC make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_KEXEC Depends on [n]: BR2_PACKAGE_KEXEC_ARCH_SUPPORTS [=y] && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 [=n] Selected by [y]: - BR2_PACKAGE_PETITBOOT [=y] && (BR2_PACKAGE_KEXEC_ARCH_SUPPORTS [=y] || BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS [=n]) && BR2_USE_MMU [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_PACKAGE_HAS_UDEV [=y] && !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS [=n] Propagate the dependency from kexec, and add comments about dependencies also inherited from kexec-lite. Signed-off-by: Yann E. MORIN Cc: Laurent Vivier Cc: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/petitboot/Config.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index f931ab91cd..6a3d476b11 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -2,10 +2,11 @@ config BR2_PACKAGE_PETITBOOT bool "petitboot" depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS || BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS depends on BR2_USE_MMU # lvm2 - depends on BR2_USE_WCHAR # elfutils - depends on !BR2_STATIC_LIBS # elfutils, lvm2 - depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, lvm2 + depends on BR2_USE_WCHAR # elfutils, kexec-lite + depends on !BR2_STATIC_LIBS # elfutils, kexec-lite, lvm2 + depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, kexec-lite, lvm2 depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || !BR2_PACKAGE_KEXEC_ARCH_SUPPORTS # kexec select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LVM2 # devmapper select BR2_PACKAGE_NCURSES @@ -36,3 +37,7 @@ comment "petitboot needs a toolchain w/ wchar, dynamic library, threads, udev /d depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_PACKAGE_HAS_UDEV + +comment "petitboot w/ kexec needs a toolchain w/ headers >= 3.17" + depends on BR2_PACKAGE_KEXEC_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 From thomas.petazzoni at bootlin.com Wed Feb 7 14:25:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:25:49 +0100 Subject: [Buildroot] [PATCH 06/10] package/petitboot: propagate depednencies from kexec/kexec-lite In-Reply-To: <7a6ed8af0a4692069c8b146c6b14647db89c9d23.1706448055.git.yann.morin.1998@free.fr> References: <7a6ed8af0a4692069c8b146c6b14647db89c9d23.1706448055.git.yann.morin.1998@free.fr> Message-ID: <20240207152549.767b3a75@windsurf> On Sun, 28 Jan 2024 14:20:55 +0100 "Yann E. MORIN" wrote: > Commit 719921bebe17 (package/kexec: bump to version 2.0.27) forgot to > propagate the new dependency on kernel headers to petitboot, which may > select kexec, causing unmet dependencies warnings (unfortunately, not > errors), such as; > > $ KCONFIG_SEED=0x84462FFC make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_KEXEC > Depends on [n]: BR2_PACKAGE_KEXEC_ARCH_SUPPORTS [=y] && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 [=n] > Selected by [y]: > - BR2_PACKAGE_PETITBOOT [=y] && (BR2_PACKAGE_KEXEC_ARCH_SUPPORTS [=y] || BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS [=n]) && BR2_USE_MMU [=y] && BR2_USE_WCHAR [=y] && !BR2_STATIC_LIBS [=n] && BR2_TOOLCHAIN_HAS_THREADS [=y] && BR2_PACKAGE_HAS_UDEV [=y] && !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS [=n] > > Propagate the dependency from kexec, and add comments about dependencies > also inherited from kexec-lite. > > Signed-off-by: Yann E. MORIN > Cc: Laurent Vivier > Cc: Julien Olivain > --- > package/petitboot/Config.in | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:26:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:26:43 +0100 Subject: [Buildroot] [PATCH 07/10] package/python-ml-dtypes: propagate dependencies from numpy, pybind In-Reply-To: <3afcc982685e876ac9b2ae54f86164647040ab85.1706448055.git.yann.morin.1998@free.fr> References: <3afcc982685e876ac9b2ae54f86164647040ab85.1706448055.git.yann.morin.1998@free.fr> Message-ID: <20240207152643.1443c46a@windsurf> On Sun, 28 Jan 2024 14:20:56 +0100 "Yann E. MORIN" wrote: > Commit ebe47e7605c6 (package/python-ml-dtypes: new package) forgot to > account for all the dependencies from python-pybind and python-numpy, > causing unmet dependencies warnings (unfortunately, not errors), such > as: > > $ KCONFIG_SEED=0x85C244F4 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_NUMPY > Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS [=y] && BR2_INSTALL_LIBSTDCPP [=n] && (BR2_TOOLCHAIN_USES_GLIBC [=y] || BR2_TOOLCHAIN_USES_MUSL [=n]) && BR2_TOOLCHAIN_GCC_AT_LEAST_9 [=y] > Selected by [y]: > - BR2_PACKAGE_PYTHON_ML_DTYPES [=y] && BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS [=y] && (BR2_TOOLCHAIN_USES_GLIBC [=y] || BR2_TOOLCHAIN_USES_MUSL [=n]) && BR2_TOOLCHAIN_GCC_AT_LEAST_9 [=y] && BR2_HOST_GCC_AT_LEAST_9 [=y] > > WARNING: unmet direct dependencies detected for BR2_PACKAGE_PYTHON_PYBIND > Depends on [n]: BR2_PACKAGE_PYTHON3 [=y] && BR2_INSTALL_LIBSTDCPP [=n] > Selected by [y]: > - BR2_PACKAGE_PYTHON_ML_DTYPES [=y] && BR2_PACKAGE_PYTHON3 [=y] && BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS [=y] && (BR2_TOOLCHAIN_USES_GLIBC [=y] || BR2_TOOLCHAIN_USES_MUSL [=n]) && BR2_TOOLCHAIN_GCC_AT_LEAST_9 [=y] && BR2_HOST_GCC_AT_LEAST_9 [=y] > > Propagate the C++ dependency from both numpy and pybind. > > Signed-off-by: Yann E. MORIN > Cc: Julien Olivain > --- > package/python-ml-dtypes/Config.in | 1 + > 1 file changed, 1 insertion(+) This has already been fixed by 650c2b83b515bf6941189b837d87819a901ec901, which also added the Config.in comment. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:45:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:45:31 +0100 Subject: [Buildroot] Invitation to the Buildroot Association General Assembly Message-ID: <20240207154531.02546408@windsurf> Hello, The Buildroot project is supported by the "Buildroot Association" a french "association loi 1901" non-profit organization. As per its bylaws, the Buildroot Association will organize its yearly General Assembly on February 28, at 9 PM UTC+1, online. The agenda of the General Assembly is: - Presentation and approval of the 2023 moral report - Presentation and approval of the 2023 financial report - Election of the new association board - Misc topics, Q&A The General Assembly is open to everyone. Only the members of the association will be allowed to vote. How to become a member of the association is described at https://buildroot.org/association.html. The link to join the video call for the General Assembly is: https://meet.google.com/ffc-exxp-piv Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:53:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:53:49 +0100 Subject: [Buildroot] [git commit] package/opencv-contrib: propagate opencv4 dependencies Message-ID: <20240207145429.846BB8759B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2e01b23fc441a4be4416e68d91e331e00db3bbd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit a7736afacaef (package/opencv4-contrib: properly note dependencies between modules) forgot to propagate the dependencies of selected symbols, causing unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0x9F66F854 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_OPENCV4_LIB_DNN Depends on [n]: BR2_PACKAGE_OPENCV4 [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=y] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y] Selected by [y]: - BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT [=y] && BR2_PACKAGE_OPENCV4_CONTRIB [=y] Propagate the dependencies and add associated comments. Signed-off-by: Yann E. MORIN Cc: Woodrow Douglass Signed-off-by: Thomas Petazzoni --- package/opencv4-contrib/Config.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/opencv4-contrib/Config.in b/package/opencv4-contrib/Config.in index 951d5f71ad..261d414869 100644 --- a/package/opencv4-contrib/Config.in +++ b/package/opencv4-contrib/Config.in @@ -74,19 +74,31 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DATASETS config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT bool "dnn_objdetect" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 dnn + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 dnn select BR2_PACKAGE_OPENCV4_LIB_DNN help Object Detection using CNNs -- Implements compact CNN Model for object detection. Trained using Caffe but uses opencv_dnn module. +comment "dnn_objdetect needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_SUPERRES bool "dnn_superres" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 dnn + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 dnn select BR2_PACKAGE_OPENCV4_LIB_DNN help Superresolution using CNNs -- Contains four trained convolutional neural networks to upscale images. +comment "dnn_superres needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED bool "dnns_easily_fooled" help From thomas.petazzoni at bootlin.com Wed Feb 7 14:52:00 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:52:00 +0100 Subject: [Buildroot] [git commit] package/opencv4: propagate internal dependencies Message-ID: <20240207145429.78E4A87599@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b553c9123b9fff5e7a97c19668bee20b15c1d736 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit e22994378553 (package/opencv4: BR2_PACKAGE_OPENCV4_LIB_OBJDETECT requires BR2_PACKAGE_OPENCV4_LIB_DNN) forgot to propagate the dependency to the internal stitching option, and to the contrib options dpm, face, and xobjdetect, causing unmet dependencies warning (unfortunately, not errors) such as: $ KCONFIG_SEED=0x9F66F854 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_OPENCV4_LIB_OBJDETECT Depends on [n]: BR2_PACKAGE_OPENCV4 [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=y] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y] Selected by [y]: - BR2_PACKAGE_OPENCV4_LIB_STITCHING [=y] && BR2_PACKAGE_OPENCV4 [=y] - BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT [=y] && BR2_PACKAGE_OPENCV4_CONTRIB [=y] Propagate the dependencies. Signed-off-by: Yann E. MORIN Cc: Woodrow Douglass Cc: Fabrice Fontaine Cc: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/opencv4-contrib/Config.in | 18 ++++++++++++++++++ package/opencv4/Config.in | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/package/opencv4-contrib/Config.in b/package/opencv4-contrib/Config.in index 851241ce5e..951d5f71ad 100644 --- a/package/opencv4-contrib/Config.in +++ b/package/opencv4-contrib/Config.in @@ -95,18 +95,30 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DPM bool "dpm" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT help Deformable Part Model -- Felzenszwalb's Cascade with deformable parts object recognition code. +comment "dpm needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FACE bool "face" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT help Face Recognition -- Face recognition techniques: Eigen, Fisher and Local Binary Pattern Histograms LBPH methods. +comment "face needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FREETYPE bool "freetype" help @@ -317,12 +329,18 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XIMGPROC config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT bool "xobjdetect" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect select BR2_PACKAGE_OPENCV4_LIB_OBJDETECT help Boosted 2D Object Detection -- Uses a Waldboost cascade and local binary patterns computed as integral features for 2D object detection. +comment "xobjdetect needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # opencv4 objdetect + depends on BR2_TOOLCHAIN_USES_UCLIBC # opencv4 objdetect + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO bool "xphoto" select BR2_PACKAGE_OPENCV4_LIB_PHOTO diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in index 78ec7c2e41..f1a2d02d50 100644 --- a/package/opencv4/Config.in +++ b/package/opencv4/Config.in @@ -203,6 +203,8 @@ config BR2_PACKAGE_OPENCV4_LIB_SHAPE config BR2_PACKAGE_OPENCV4_LIB_STITCHING bool "stitching" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # objdetect + depends on !BR2_TOOLCHAIN_USES_UCLIBC # objdetect select BR2_PACKAGE_OPENCV4_LIB_CALIB3D select BR2_PACKAGE_OPENCV4_LIB_FEATURES2D select BR2_PACKAGE_OPENCV4_LIB_IMGPROC @@ -211,6 +213,10 @@ config BR2_PACKAGE_OPENCV4_LIB_STITCHING Include opencv_stitching (images stitching) module into the OpenCV build. +comment "stitching needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_LIB_SUPERRES bool "superres" select BR2_PACKAGE_OPENCV4_LIB_IMGPROC From thomas.petazzoni at bootlin.com Wed Feb 7 14:55:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:55:12 +0100 Subject: [Buildroot] [PATCH 08/10] package/opencv4: propagate internal dependencies In-Reply-To: <4ec42d32f6ea3c94fee3da6d63c884b5594d2c0e.1706448055.git.yann.morin.1998@free.fr> References: <4ec42d32f6ea3c94fee3da6d63c884b5594d2c0e.1706448055.git.yann.morin.1998@free.fr> Message-ID: <20240207155512.150c4abc@windsurf> On Sun, 28 Jan 2024 14:20:57 +0100 "Yann E. MORIN" wrote: > Commit e22994378553 (package/opencv4: BR2_PACKAGE_OPENCV4_LIB_OBJDETECT > requires BR2_PACKAGE_OPENCV4_LIB_DNN) forgot to propagate the dependency > to the internal stitching option, and to the contrib options dpm, face, > and xobjdetect, causing unmet dependencies warning (unfortunately, not > errors) such as: > > $ KCONFIG_SEED=0x9F66F854 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_OPENCV4_LIB_OBJDETECT > Depends on [n]: BR2_PACKAGE_OPENCV4 [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=y] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y] > Selected by [y]: > - BR2_PACKAGE_OPENCV4_LIB_STITCHING [=y] && BR2_PACKAGE_OPENCV4 [=y] > - BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT [=y] && BR2_PACKAGE_OPENCV4_CONTRIB [=y] > > Propagate the dependencies. > > Signed-off-by: Yann E. MORIN > Cc: Woodrow Douglass > Cc: Fabrice Fontaine > Cc: Giulio Benetti > --- > package/opencv4-contrib/Config.in | 18 ++++++++++++++++++ > package/opencv4/Config.in | 6 ++++++ > 2 files changed, 24 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:55:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:55:15 +0100 Subject: [Buildroot] [PATCH 09/10] package/opencv-contrib: propagate opencv4 dependencies In-Reply-To: <681d58c130501398b80678a980d2fe511d35015f.1706448055.git.yann.morin.1998@free.fr> References: <681d58c130501398b80678a980d2fe511d35015f.1706448055.git.yann.morin.1998@free.fr> Message-ID: <20240207155515.6cd7da0f@windsurf> On Sun, 28 Jan 2024 14:20:58 +0100 "Yann E. MORIN" wrote: > Commit a7736afacaef (package/opencv4-contrib: properly note dependencies > between modules) forgot to propagate the dependencies of selected > symbols, causing unmet dependencies warnings (unfortunately, not > errors), such as: > > $ KCONFIG_SEED=0x9F66F854 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_OPENCV4_LIB_DNN > Depends on [n]: BR2_PACKAGE_OPENCV4 [=y] && !BR2_TOOLCHAIN_USES_UCLIBC [=y] && BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS [=y] > Selected by [y]: > - BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT [=y] && BR2_PACKAGE_OPENCV4_CONTRIB [=y] > > Propagate the dependencies and add associated comments. > > Signed-off-by: Yann E. MORIN > Cc: Woodrow Douglass > --- > package/opencv4-contrib/Config.in | 12 ++++++++++++ > 1 file changed, 12 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:56:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:56:15 +0100 Subject: [Buildroot] [git commit] package/libtalloc: bump version to 2.4.2 Message-ID: <20240207145654.C144B875A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=647edeba3476921c0dab901c7124ecbfeaa5da97 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes build issue of the python support with python 3.12 (2.3.4 unconditionally uses distutils). The license file used being a header file, it has changed due to code changes, but the license is still LGPL-3.0+. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/libtalloc/libtalloc.hash | 4 ++-- package/libtalloc/libtalloc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libtalloc/libtalloc.hash b/package/libtalloc/libtalloc.hash index 0bc8edb695..5577583881 100644 --- a/package/libtalloc/libtalloc.hash +++ b/package/libtalloc/libtalloc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505 talloc-2.3.4.tar.gz -sha256 f8340c449dd64a55c6605b02fcad2aec6f473612ac6026739a22995380a8043c talloc.h +sha256 85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6 talloc-2.4.2.tar.gz +sha256 e01fb092aaed2b431be26674e2b791c77fb5984537c29b514e957582c6b31465 talloc.h diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk index ca15180d22..676076b857 100644 --- a/package/libtalloc/libtalloc.mk +++ b/package/libtalloc/libtalloc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTALLOC_VERSION = 2.3.4 +LIBTALLOC_VERSION = 2.4.2 LIBTALLOC_SOURCE = talloc-$(LIBTALLOC_VERSION).tar.gz LIBTALLOC_SITE = https://www.samba.org/ftp/talloc LIBTALLOC_LICENSE = LGPL-3.0+ From thomas.petazzoni at bootlin.com Wed Feb 7 14:57:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:57:42 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am64x_sk_defconfig: explicitly set the kernel version In-Reply-To: <20240207092111.236577-1-romain.naour@smile.fr> References: <20240207092111.236577-1-romain.naour@smile.fr> Message-ID: <20240207155742.1d6e70a2@windsurf> On Wed, 7 Feb 2024 10:21:10 +0100 Romain Naour wrote: > Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to > specify the Linux kernel version, so do that now. > > When the defconfig was added, the default version was 6.4.x, so use > version 6.4.16. > > Signed-off-by: Romain Naour > --- > configs/ti_am64x_sk_defconfig | 3 +++ > 1 file changed, 3 insertions(+) Both applied to master, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 14:57:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:57:27 +0100 Subject: [Buildroot] [git commit] configs/ti_am64x_sk_defconfig: explicitly set the kernel version Message-ID: <20240207145844.C7072875A9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=820db039f2d6e34326400f01ab61d21cb664fa34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the Linux kernel version, so do that now. When the defconfig was added, the default version was 6.4.x, so use version 6.4.16. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/ti_am64x_sk_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 052c440093..b3e69e9e93 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,7 +1,10 @@ BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" From thomas.petazzoni at bootlin.com Wed Feb 7 14:57:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:57:30 +0100 Subject: [Buildroot] [git commit] configs/ti_am64x_sk_defconfig: drop redundant defconfig choice Message-ID: <20240207145844.D0B72875AB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=65a12fb53ab95a22a2a7b19b8f53396ce4fb561c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The defconfig choice is the default one, so it is redundant and can be removed without effect. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- configs/ti_am64x_sk_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index b3e69e9e93..4bfd31f0c8 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -24,7 +24,6 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y -BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y From yann.morin.1998 at free.fr Wed Feb 7 15:08:42 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:08:42 +0100 Subject: [Buildroot] [PATCH v4 3/7] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib In-Reply-To: <20240202093625.1409559-4-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-4-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > From: Romain Naour > > This target version is needed for Rusticl which is an LLVM based OpenCL > framework[1]. Rusticl allow programs to compile OpenCL C/C++ code > at runtime with Clang. Clang generates LLVM IR which is translated into > SPIR-V by spirv-llvm-translator. Finally, mesa can use its internal > tools to manage SPIR-V. > > [1]: https://docs.mesa3d.org/rusticl.html > > Signed-off-by: Romain Naour > Signed-off-by: Sebastian Weyer > Signed-off-by: Antoine Coutant > --- [--SNIP--] > diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk > index 523890a986..8361a74c59 100644 > --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk > +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk > @@ -10,7 +10,7 @@ SPIRV_LLVM_TRANSLATOR_VERSION = v15.0.0-46-ge82ecc2bd7295604fcf1824e47c95fa6a09c > SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) > SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA > SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT > -HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers > +HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers spirv-headers zlib It looks dubious that a host package, host-spirv-llvm-translator, depends on target packages, spirv-headers and zlib. If this is really the case, then this would require a good explanation in the commit log. > HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ > -DLLVM_BUILD_TOOLS=ON \ > -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ > @@ -19,4 +19,14 @@ HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ > -DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \ > -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(HOST_DIR)/include > > +SPIRV_LLVM_TRANSLATOR_INSTALL_STAGING = YES > +SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm llvm > +SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ > + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${STAGING_DIR}/usr \ $ ./utils/docker-run make check-package package/spirv-llvm-translator/spirv-llvm-translator.mk:25: use $() to delimit variables, not ${} Regards, Yann E. MORIN. > + -DLLVM_BUILD_TOOLS=ON \ > + -DLLVM_DIR=$(STAGING_DIR)/lib/cmake/llvm \ > + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ > + -DLLVM_SPIRV_INCLUDE_TESTS=OFF > + > +$(eval $(cmake-package)) > $(eval $(host-cmake-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Feb 7 14:59:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 15:59:02 +0100 Subject: [Buildroot] [git commit] package/python-bitarray: new package Message-ID: <20240207150901.E23EA875B8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=218fa820f541df593f35ee8468c4f531499caf4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package is needed at runtime by python-bitstring since 4.1.0 already [1]. Note: the License is under Python-2.0 but "Python Software Foundation License (PSF)" has been remplaced by the author of bitarray Ilan Schnell. [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 Signed-off-by: Romain Naour Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/Config.in | 1 + package/python-bitarray/Config.in | 6 ++++++ package/python-bitarray/python-bitarray.hash | 5 +++++ package/python-bitarray/python-bitarray.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/package/Config.in b/package/Config.in index 4c6deb1333..91a6f1de00 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1008,6 +1008,7 @@ menu "External python modules" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" source "package/python-bidict/Config.in" + source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" source "package/python-bleak/Config.in" source "package/python-blinker/Config.in" diff --git a/package/python-bitarray/Config.in b/package/python-bitarray/Config.in new file mode 100644 index 0000000000..38d685f4fd --- /dev/null +++ b/package/python-bitarray/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_BITARRAY + bool "python-bitarray" + help + efficient arrays of booleans -- C extension. + + https://github.com/ilanschnell/bitarray diff --git a/package/python-bitarray/python-bitarray.hash b/package/python-bitarray/python-bitarray.hash new file mode 100644 index 0000000000..d91a28af20 --- /dev/null +++ b/package/python-bitarray/python-bitarray.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/bitarray/json +md5 024324a82314e9e68ecdcdefdc69071f bitarray-2.9.2.tar.gz +sha256 a8f286a51a32323715d77755ed959f94bef13972e9a2fe71b609e40e6d27957e bitarray-2.9.2.tar.gz +# Locally computed sha256 checksums +sha256 6b5e04f6e0462e1b97be833f9d65e66cd5eceb3283f4a6f532261087d0ab1233 LICENSE diff --git a/package/python-bitarray/python-bitarray.mk b/package/python-bitarray/python-bitarray.mk new file mode 100644 index 0000000000..f86320c112 --- /dev/null +++ b/package/python-bitarray/python-bitarray.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-bitarray +# +################################################################################ + +PYTHON_BITARRAY_VERSION = 2.9.2 +PYTHON_BITARRAY_SOURCE = bitarray-$(PYTHON_BITARRAY_VERSION).tar.gz +PYTHON_BITARRAY_SITE = https://files.pythonhosted.org/packages/c7/bf/25cf92a83e1fe4948d7935ae3c02f4c9ff9cb9c13e977fba8af11a5f642c +PYTHON_BITARRAY_SETUP_TYPE = setuptools +PYTHON_BITARRAY_LICENSE = Python-2.0 +PYTHON_BITARRAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 7 15:08:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:08:31 +0100 Subject: [Buildroot] [git commit] package/python-bitstring: add missing runtime dependency Message-ID: <20240207150901.F1D8F875A8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7f1e1b1b171618952725bffdbe73827e062735c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master python-bitstring require python-bitarray and python-zlib at runtime since 4.1.0 release [1][2]. python-zlib is now needed for the "Experimental support for two 8-bit float types" [2]. Fixes: https://gitlab.com/kubu93/buildroot/-/jobs/6114047821 [1] https://github.com/scott-griffiths/bitstring/releases/tag/bitstring-4.1.0 [2] https://github.com/scott-griffiths/bitstring/commit/70c8af4d8bef557bc7d96f809d37e2c241587dd0 Signed-off-by: Romain Naour Cc: James Hilliard Reviewed-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-bitstring/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-bitstring/Config.in b/package/python-bitstring/Config.in index 93d7682577..82d0bb29c6 100644 --- a/package/python-bitstring/Config.in +++ b/package/python-bitstring/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_BITSTRING bool "python-bitstring" + select BR2_PACKAGE_PYTHON_BITARRAY # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Simple construction, analysis and modification of binary data. From yann.morin.1998 at free.fr Wed Feb 7 15:13:20 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:13:20 +0100 Subject: [Buildroot] [PATCH v4 2/7] package/pkg-meson.mk: add rust cross-compiler support In-Reply-To: <20240202093625.1409559-3-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-3-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > From: Romain Naour > > This change is needed to be able to build target packages requiring > rust. If a package has rust in its project or in an add_language() > call in their meson.build file, meson will try to find a suitable > compiler for this language[1]. If the language is classified as > required but not found, it will abort the build. > > It is necessary to specify rust and rust_ld separately in > support/misc/cross-compilation.conf.in. If you specify it in one line > just as "rust", it will generate the following warning: > WARNING: Please do not put -C linker= in your compiler command, > set rust_ld=command in your cross file or use the RUST_LD environment > variable, otherwise meson will override your selection. > > [1] https://mesonbuild.com/Reference-manual_functions.html#add_languages > > Signed-off-by: Romain Naour > Signed-off-by: Sebastian Weyer > Signed-off-by: Antoine Coutant > --- > package/pkg-meson.mk | 13 +++++++++++++ > support/misc/cross-compilation.conf.in | 2 ++ > 2 files changed, 15 insertions(+) > > diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk > index 65cabf23ba..25dd4f0d7f 100644 > --- a/package/pkg-meson.mk > +++ b/package/pkg-meson.mk > @@ -82,6 +82,16 @@ else > PKG_MESON_TARGET_FC = /bin/false > endif > > +ifeq ($(BR2_PACKAGE_HOST_RUSTC),y) > +PKG_MESON_TARGET_RUSTC = $(HOST_DIR)/bin/rustc > +PKG_MESON_TARGET_RUSTC_LINKER = $(notdir $(TARGET_CROSS))gcc Why can't PKG_MESON_TARGET_RUSTC_LINKER be an absolute path, when PKG_MESON_TARGET_RUSTC is one, and [...] > +PKG_MESON_TARGET_RUSTC_TARGET_NAME = $(RUSTC_TARGET_NAME) > +else > +PKG_MESON_TARGET_RUSTC = /bin/false > +PKG_MESON_TARGET_RUSTC_LINKER = /bin/false [...] especially since here PKG_MESON_TARGET_RUSTC_LINKER is an absolute path? Regards, Yann E. MORIN. > +PKG_MESON_TARGET_RUSTC_TARGET_NAME = > +endif > + > # Generates sed patterns for patching the cross-compilation.conf template, > # since Flags might contain commas the arguments are passed indirectly by > # variable name (stripped to deal with whitespaces). > @@ -91,6 +101,7 @@ define PKG_MESON_CROSSCONFIG_SED > -e "s%@TARGET_CXX@%$(PKG_MESON_TARGET_CXX)%g" \ > -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ > -e "s%@TARGET_FC@%$(PKG_MESON_TARGET_FC)%g" \ > + -e "s%@TARGET_RUSTC@%$(PKG_MESON_TARGET_RUSTC)%g" \ > -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ > -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ > -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ > @@ -99,6 +110,8 @@ define PKG_MESON_CROSSCONFIG_SED > -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ > -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ > -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ > + -e "s%@TARGET_RUSTC_LINKER@%$(PKG_MESON_TARGET_RUSTC_LINKER)%g" \ > + -e "s%@RUSTC_TARGET_NAME@%$(PKG_MESON_TARGET_RUSTC_TARGET_NAME)%g" \ > -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ > -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ > -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ > diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in > index a58ab553d0..21cec10b82 100644 > --- a/support/misc/cross-compilation.conf.in > +++ b/support/misc/cross-compilation.conf.in > @@ -13,6 +13,8 @@ fortran = '@TARGET_FC@' > pkg-config = '@PKGCONF_HOST_BINARY@' > g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' > g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' > +rust = ['@TARGET_RUSTC@', '--target', '@RUSTC_TARGET_NAME@' ] > +rust_ld = '@TARGET_RUSTC_LINKER@' > > [built-in options] > c_args = [@TARGET_CFLAGS@] > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Wed Feb 7 15:15:40 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:15:40 +0100 Subject: [Buildroot] [PATCH v4 3/7] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-4-antoine.coutant@smile.fr> Message-ID: <93c369b0-12f2-466b-bf6c-af8802bf706f@mind.be> On 07/02/2024 16:08, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >> From: Romain Naour >> >> This target version is needed for Rusticl which is an LLVM based OpenCL >> framework[1]. Rusticl allow programs to compile OpenCL C/C++ code >> at runtime with Clang. Clang generates LLVM IR which is translated into >> SPIR-V by spirv-llvm-translator. Finally, mesa can use its internal >> tools to manage SPIR-V. >> >> [1]: https://docs.mesa3d.org/rusticl.html >> >> Signed-off-by: Romain Naour >> Signed-off-by: Sebastian Weyer >> Signed-off-by: Antoine Coutant >> --- > [--SNIP--] >> diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk >> index 523890a986..8361a74c59 100644 >> --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk >> +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk >> @@ -10,7 +10,7 @@ SPIRV_LLVM_TRANSLATOR_VERSION = v15.0.0-46-ge82ecc2bd7295604fcf1824e47c95fa6a09c >> SPIRV_LLVM_TRANSLATOR_SITE = $(call github,KhronosGroup,SPIRV-LLVM-Translator,$(SPIRV_LLVM_TRANSLATOR_VERSION)) >> SPIRV_LLVM_TRANSLATOR_LICENSE = NCSA >> SPIRV_LLVM_TRANSLATOR_LICENSE_FILES = LICENSE.TXT >> -HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers >> +HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm host-spirv-headers spirv-headers zlib > > It looks dubious that a host package, host-spirv-llvm-translator, > depends on target packages, spirv-headers and zlib. Purely based on the names of the packages, it sounds similar to hos host-gcc-final depends on target glibc, or host-rust depends on target toolchain. "host" often means "cross", so it _can_ indeed depend on target packages. > If this is really the case, then this would require a good explanation > in the commit log. > That is absolutely true! Regards, Arnout >> HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ >> -DLLVM_BUILD_TOOLS=ON \ >> -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ >> @@ -19,4 +19,14 @@ HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ >> -DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \ >> -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(HOST_DIR)/include >> >> +SPIRV_LLVM_TRANSLATOR_INSTALL_STAGING = YES >> +SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm llvm >> +SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ >> + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${STAGING_DIR}/usr \ > > $ ./utils/docker-run make check-package > package/spirv-llvm-translator/spirv-llvm-translator.mk:25: use $() to delimit variables, not ${} > > Regards, > Yann E. MORIN. > >> + -DLLVM_BUILD_TOOLS=ON \ >> + -DLLVM_DIR=$(STAGING_DIR)/lib/cmake/llvm \ >> + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ >> + -DLLVM_SPIRV_INCLUDE_TESTS=OFF >> + >> +$(eval $(cmake-package)) >> $(eval $(host-cmake-package)) >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From thomas.petazzoni at bootlin.com Wed Feb 7 15:18:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:18:27 +0100 Subject: [Buildroot] [git commit] support/testing: use core2duo cpu emulation for TestGlxinfo Message-ID: <20240207151854.9C31B875C6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc25b8d99f812777294b5e188d7975c0e36dd5ef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master TestGlxinfo fail with a new runtime error: # glxinfo -B -display :0 name of display: :0 traps: glxinfo[84] trap invalid opcode ip:b73c7027 sp:bf8433c0 error:0 in swrast_dri.so[b6e4c000+64f000] Illegal instruction The x86-core2 Bootlin toolchains are built for a core2 CPU [0], this means that the Bootlin toolchains may use core2-specific instructions. The TestGlxinfo test is setup for BR2_x86_core2, so our executables will also contain core2 instructions. However, the default Qemu x86 is not guaranteed to emulate all the instructions specific to core2, causing runtime issues as reported above. A similar issue has been fixed by adding Nehalem cpu emulation on the qemu command line. See 4f565b5222 ("support/testing: use Nehalem cpu emulation for TestGrubX8664EFI"). Set core2duo cpu emulation for TestGlxinfo on the qemu command line. [0] https://gitlab.com/buildroot.org/toolchains-builder/-/blob/kubu/toolchain-builder-2023.08/configs/arch/x86-core2.config?ref_type=heads Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_glxinfo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py index 6bedee5298..3ccbdca8d9 100644 --- a/support/testing/tests/package/test_glxinfo.py +++ b/support/testing/tests/package/test_glxinfo.py @@ -42,7 +42,8 @@ class TestGlxinfo(infra.basetest.BRTest): self.emulator.boot(arch="i386", kernel=kern, kernel_cmdline=["root=/dev/vda console=ttyS0"], - options=["-M", "pc", "-m", "512", "-drive", "file={},if=virtio,format=raw".format(img)]) + options=["-M", "pc", "-cpu", "core2duo", "-m", "512", + "-drive", "file={},if=virtio,format=raw".format(img)]) self.emulator.login() def test_run(self): From thomas.petazzoni at bootlin.com Wed Feb 7 15:18:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:18:20 +0100 Subject: [Buildroot] [git commit] package/mesa3d: fix drisw build without dri3 Message-ID: <20240207151854.933B2875C5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8b114822e9897d33089cd7203edbf3d7cb7dd5d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master mesa3d 23.3 added dri3_priv.h header and dri3_check_multibuffer() function in drisw (part of swrast gallium driver) that can be build without dri3. i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' collect2: error: ld returned 1 exit status Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using dri3_check_multibuffer(). While testing again the TestGlxinfo runtime test, a new unexpected error line appeared in the glxinfo log: MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so mesa3d try to load zink gallium driver even if it was not enabled at build time, indeed there is no such option in Buildroot. Apply patches sent upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854455 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- .../mesa3d/0006-drisw-fix-build-without-dri3.patch | 58 ++++++++++++++++++++++ ...ext-don-t-try-zink-if-not-enabled-in-mesa.patch | 42 ++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/package/mesa3d/0006-drisw-fix-build-without-dri3.patch b/package/mesa3d/0006-drisw-fix-build-without-dri3.patch new file mode 100644 index 0000000000..ab27d384cf --- /dev/null +++ b/package/mesa3d/0006-drisw-fix-build-without-dri3.patch @@ -0,0 +1,58 @@ +From 3ab46dcfda9edf5c9bc27c8f5031146d9d9d8ade Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 18 Jan 2024 22:50:16 +0100 +Subject: [PATCH] drisw: fix build without dri3 + +commit 1887368df41 ("glx/sw: check for modifier support in the kopper path") +added dri3_priv.h header and dri3_check_multibuffer() function in drisw that +can be build without dri3. + + i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': + drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' + collect2: error: ld returned 1 exit status + +Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using +dri3_check_multibuffer(). + +Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path") + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 + +Signed-off-by: Romain Naour +--- + src/glx/drisw_glx.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c +index 3d3f75259bc..4b19e2d7707 100644 +--- a/src/glx/drisw_glx.c ++++ b/src/glx/drisw_glx.c +@@ -32,7 +32,9 @@ + #include + #include "dri_common.h" + #include "drisw_priv.h" ++#ifdef HAVE_DRI3 + #include "dri3_priv.h" ++#endif + #include + #include + #include +@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, + goto handle_error; + } + ++#ifdef HAVE_DRI3 + if (pdpyp->zink) { + bool err; + psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err); +@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, + goto handle_error; + } + } ++#endif + + glx_config_destroy_list(psc->base.configs); + psc->base.configs = configs; +-- +2.43.0 + diff --git a/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch b/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch new file mode 100644 index 0000000000..f9e4d50fd7 --- /dev/null +++ b/package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch @@ -0,0 +1,42 @@ +From 83b4ff6616708bd7ba5981d22cd5211ca6787d58 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 24 Jan 2024 14:28:32 +0100 +Subject: [PATCH] glxext: don't try zink if not enabled in mesa + +Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") +added an automatic zink fallback even when the zink gallium is not +enabled at build time. + +It leads to unexpected error log while loading drisw driver and +zink is not installed on the rootfs: + + MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so + +Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 + +Signed-off-by: Romain Naour +--- + src/glx/glxext.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/glx/glxext.c b/src/glx/glxext.c +index 39d5f08bdcf..e106eb40046 100644 +--- a/src/glx/glxext.c ++++ b/src/glx/glxext.c +@@ -904,9 +904,11 @@ __glXInitialize(Display * dpy) + #endif /* HAVE_DRI3 */ + if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false)) + dpyPriv->dri2Display = dri2CreateDisplay(dpy); ++#if defined(HAVE_ZINK) + if (!dpyPriv->dri3Display && !dpyPriv->dri2Display) + try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) && + !getenv("GALLIUM_DRIVER"); ++#endif /* HAVE_ZINK */ + } + #endif /* GLX_USE_DRM */ + if (glx_direct) +-- +2.43.0 + From thomas.petazzoni at bootlin.com Wed Feb 7 15:19:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:19:20 +0100 Subject: [Buildroot] [PATCH 1/2] package/mesa3d: fix drisw build without dri3 In-Reply-To: <20240206124947.1617078-2-romain.naour@smile.fr> References: <20240206124947.1617078-1-romain.naour@smile.fr> <20240206124947.1617078-2-romain.naour@smile.fr> Message-ID: <20240207161920.61fb7da9@windsurf> On Tue, 6 Feb 2024 13:49:46 +0100 Romain Naour wrote: > mesa3d 23.3 added dri3_priv.h header and dri3_check_multibuffer() function in > drisw (part of swrast gallium driver) that can be build without dri3. > > i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': > drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' > collect2: error: ld returned 1 exit status > > Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using > dri3_check_multibuffer(). > > While testing again the TestGlxinfo runtime test, a new unexpected error line > appeared in the glxinfo log: > > MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so > > mesa3d try to load zink gallium driver even if it was not enabled at > build time, indeed there is no such option in Buildroot. > > Apply patches sent upstream: > https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478 > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6093854455 > > Signed-off-by: Romain Naour > --- > .../0006-drisw-fix-build-without-dri3.patch | 58 +++++++++++++++++++ > ...on-t-try-zink-if-not-enabled-in-mesa.patch | 42 ++++++++++++++ > 2 files changed, 100 insertions(+) > create mode 100644 package/mesa3d/0006-drisw-fix-build-without-dri3.patch > create mode 100644 package/mesa3d/0007-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch Both applied. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 7 15:19:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:19:35 +0100 Subject: [Buildroot] [git commit] package/meson: bump version to 1.3.1 Message-ID: <20240207152251.3A128875D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3118b7e222e8a56847daa17aae5ea1c2bb083837 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The meson upgrade from 1.1.1 to 1.2.0 have been reverted because host-qemu (version v8.0.3) was searching libraries in the build machine instead of buildroot host directory [1]. $ grep -r LINK_ARGS * | grep "\-L/usr" build.ninja: LINK_ARGS = -L/usr/lib/gcc/x86_64-linux-gnu/10 \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../../lib -L/usr/lib \ -L/lib/x86_64-linux-gnu \ -L/lib/../lib \ -L/usr/lib/../lib \ -L/usr/lib/gcc/x86_64-linux-gnu/10/../../.. \ -L/lib \ -I/[...]/host/include \ -L/[...]/host/lib \ -I/[...]/host/include/libfdt \ ... Upgrading qemu to version v8.1.0 solves the problem: $ grep -r LINK_ARGS * | grep "\-L/usr" build.ninja: LINK_ARGS = -I/[...]/host/include \ -L/[...]/host/lib \ -I/[...]/host/include/libfdt \ ... Those two tests were done with the same buildroot version (2023.08) on the same machine were the bug appeared. Using, git bisect, in this environment, it was found that the problem was fixed in qemu by the commit [2]. Thus, it is possible that the problem was introduced by improper use of meson by qemu <= v8.0.3. Also, meson has been updated to version 1.2.1 and 1.3.0 in yocto and it doesn't seem to create any issue. [3] The original problem is no longer present and some projects require meson > 1.1.1 (e.g. rusticl requires meson 1.2.0 since mesa 23.3.0 and meson 1.3.1 since mesa 24.0.0). "pkgconfig" field is deprecated by meson 1.3.0 and replaced by "pkg-config". See: [4] The patch that adds the pkg_config_static property has been rebased. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/acfdf21f0b752e844a33c70a0fd2f82f4534a5a0 [2] https://gitlab.com/qemu-project/qemu/-/commit/Fc9a809e0d28417fa1e7f7efc19f845bda4c1be9 [3] https://github.com/yoctoproject/poky/commits/master/meta/recipes-devtools/meson [4] https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig Signed-off-by: Antoine Coutant [yann.morin.1998 at free.fr: - keep our formatting in the patch - reflow commit log (to keep busy while test-building!) ] Signed-off-by: Yann E. MORIN --- ...dependencies-base.py-add-pkg_config_stati.patch | 30 ++++++++++++---------- package/meson/meson.hash | 4 +-- package/meson/meson.mk | 2 +- support/misc/cross-compilation.conf.in | 2 +- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch index 8e15d3210c..8b95dc7592 100644 --- a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +++ b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -1,4 +1,4 @@ -From 3d6a2db2270346236dd6247e0648ea0c949ba468 Mon Sep 17 00:00:00 2001 +From 59934e2116e025ecfe23baf6febc4a0eb85f60cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static @@ -20,24 +20,26 @@ Signed-off-by: Fabrice Fontaine Signed-off-by: Romain Naour [Rebased on 0.57.1] Signed-off-by: Peter Seiderer +[rebased on 1.3.0] +Signed-off-by: Antoine Coutant --- - mesonbuild/dependencies/pkgconfig.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + mesonbuild/dependencies/pkgconfig.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py -index 1e8d9132e..d902ba215 100644 +index e86206b88..94888657d 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py -@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency): - env = None - libcmd = ['--libs'] - -- if self.static: -+ if self.static or \ +@@ -169,7 +169,8 @@ class PkgConfigCLI(PkgConfigInterface): + env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1' + args: T.List[str] = [] + args += self._define_variable_args(define_variable) +- if static: ++ if static or \ + (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): - libcmd.append('--static') - - libcmd.append(self.name) --- + args.append('--static') + args += ['--libs', name] + ret, out, err = self._call_pkgbin(args, env=env) +-- 2.25.1 diff --git a/package/meson/meson.hash b/package/meson/meson.hash index cb36b674fa..150fd6d1bb 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc -sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc +sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 503aca8c25..467569d28b 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.1.1 +MESON_VERSION = 1.3.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 7053df472b..a58ab553d0 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -10,7 +10,7 @@ ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' cmake = '@BR2_CMAKE@' fortran = '@TARGET_FC@' -pkgconfig = '@PKGCONF_HOST_BINARY@' +pkg-config = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' From yann.morin.1998 at free.fr Wed Feb 7 15:23:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:23:23 +0100 Subject: [Buildroot] [PATCH v4 1/7] package/meson: bump version to 1.3.1 In-Reply-To: <20240202093625.1409559-2-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-2-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > The meson upgrade from 1.1.1 to 1.2.0 have been reverted > because host-qemu (version v8.0.3) was searching > libraries in the build machine instead of buildroot host > directory [1]. > $ grep -r LINK_ARGS * | grep "\-L/usr" > build.ninja: LINK_ARGS = > -L/usr/lib/gcc/x86_64-linux-gnu/10 \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../../lib -L/usr/lib \ > -L/lib/x86_64-linux-gnu \ > -L/lib/../lib \ > -L/usr/lib/../lib \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../.. \ > -L/lib \ > -I/[...]/host/include \ > -L/[...]/host/lib \ > -I/[...]/host/include/libfdt \ > ... > > Upgrading qemu to version v8.1.0 solves the problem: > $ grep -r LINK_ARGS * | grep "\-L/usr" > build.ninja: LINK_ARGS = > -I/[...]/host/include \ > -L/[...]/host/lib \ > -I/[...]/host/include/libfdt \ > ... > > Those two tests were done with the same buildroot version > (2023.08) on the same machine were the bug appeared. Using, > git bisect, in this environment, it was found that the > problem was fixed in qemu by the commit [2]. > > Thus, it is possible that the problem was introduced by > improper use of meson by qemu <= v8.0.3. Also, meson has > been updated to version 1.2.1 and 1.3.0 in yocto and it > doesn't seem to create any issue. [3] > > The original problem is no longer present and some > projects require meson > 1.1.1 (e.g. rusticl requires > meson 1.2.0 since mesa 23.3.0 and meson 1.3.1 since mesa > 24.0.0). > > "pkgconfig" field is deprecated by meson 1.3.0 and > replaced by "pkg-config". See: [4] > > The patch that adds the pkg_config_static property has > been rebased. > > [1] https://gitlab.com/buildroot.org/buildroot/-/commit/acfdf21f0b752e844a33c70a0fd2f82f4534a5a0 > [2] https://gitlab.com/qemu-project/qemu/-/commit/Fc9a809e0d28417fa1e7f7efc19f845bda4c1be9 > [3] https://github.com/yoctoproject/poky/commits/master/meta/recipes-devtools/meson > [4] https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig > > Signed-off-by: Antoine Coutant Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v3 -> v4: > - cross-compilation.conf.in have been changed. > - Bump version from 1.3.0 to 1.3.1. > > Signed-off-by: Antoine Coutant > --- > ...dencies-base.py-add-pkg_config_stati.patch | 29 ++++++++++--------- > package/meson/meson.hash | 4 +-- > package/meson/meson.mk | 2 +- > support/misc/cross-compilation.conf.in | 2 +- > 4 files changed, 19 insertions(+), 18 deletions(-) > > diff --git a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch > index 8e15d3210c..49a0ef93dc 100644 > --- a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch > +++ b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch > @@ -1,4 +1,4 @@ > -From 3d6a2db2270346236dd6247e0648ea0c949ba468 Mon Sep 17 00:00:00 2001 > +From 59934e2116e025ecfe23baf6febc4a0eb85f60cd Mon Sep 17 00:00:00 2001 > From: Fabrice Fontaine > Date: Sat, 15 Feb 2020 15:13:59 +0100 > Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static > @@ -20,24 +20,25 @@ Signed-off-by: Fabrice Fontaine > Signed-off-by: Romain Naour > [Rebased on 0.57.1] > Signed-off-by: Peter Seiderer > +[rebased on 1.3.0] > +Signed-off-by: Antoine Coutant > --- > - mesonbuild/dependencies/pkgconfig.py | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > + mesonbuild/dependencies/pkgconfig.py | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py > -index 1e8d9132e..d902ba215 100644 > +index e86206b88..94888657d 100644 > --- a/mesonbuild/dependencies/pkgconfig.py > +++ b/mesonbuild/dependencies/pkgconfig.py > -@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency): > - env = None > - libcmd = ['--libs'] > - > -- if self.static: > -+ if self.static or \ > -+ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): > - libcmd.append('--static') > - > - libcmd.append(self.name) > +@@ -169,7 +169,7 @@ class PkgConfigCLI(PkgConfigInterface): > + env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1' > + args: T.List[str] = [] > + args += self._define_variable_args(define_variable) > +- if static: > ++ if static or (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): > + args.append('--static') > + args += ['--libs', name] > + ret, out, err = self._call_pkgbin(args, env=env) > -- > 2.25.1 > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > index cb36b674fa..150fd6d1bb 100644 > --- a/package/meson/meson.hash > +++ b/package/meson/meson.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc > -sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz > +# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc > +sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index 503aca8c25..467569d28b 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MESON_VERSION = 1.1.1 > +MESON_VERSION = 1.3.1 > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > MESON_LICENSE = Apache-2.0 > MESON_LICENSE_FILES = COPYING > diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in > index 7053df472b..a58ab553d0 100644 > --- a/support/misc/cross-compilation.conf.in > +++ b/support/misc/cross-compilation.conf.in > @@ -10,7 +10,7 @@ ar = '@TARGET_AR@' > strip = '@TARGET_STRIP@' > cmake = '@BR2_CMAKE@' > fortran = '@TARGET_FC@' > -pkgconfig = '@PKGCONF_HOST_BINARY@' > +pkg-config = '@PKGCONF_HOST_BINARY@' > g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' > g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 7 15:30:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:30:51 +0100 Subject: [Buildroot] [PATCH v4 1/7] package/meson: bump version to 1.3.1 In-Reply-To: <20240202093625.1409559-2-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-2-antoine.coutant@smile.fr> Message-ID: Antoine, All, (sorry, I sent too fast, here are a bit more details below...) On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > The meson upgrade from 1.1.1 to 1.2.0 have been reverted > because host-qemu (version v8.0.3) was searching > libraries in the build machine instead of buildroot host > directory [1]. > $ grep -r LINK_ARGS * | grep "\-L/usr" > build.ninja: LINK_ARGS = > -L/usr/lib/gcc/x86_64-linux-gnu/10 \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../../../lib -L/usr/lib \ > -L/lib/x86_64-linux-gnu \ > -L/lib/../lib \ > -L/usr/lib/../lib \ > -L/usr/lib/gcc/x86_64-linux-gnu/10/../../.. \ > -L/lib \ > -I/[...]/host/include \ > -L/[...]/host/lib \ > -I/[...]/host/include/libfdt \ > ... > > Upgrading qemu to version v8.1.0 solves the problem: > $ grep -r LINK_ARGS * | grep "\-L/usr" > build.ninja: LINK_ARGS = > -I/[...]/host/include \ > -L/[...]/host/lib \ > -I/[...]/host/include/libfdt \ > ... > > Those two tests were done with the same buildroot version > (2023.08) on the same machine were the bug appeared. Using, > git bisect, in this environment, it was found that the > problem was fixed in qemu by the commit [2]. > > Thus, it is possible that the problem was introduced by > improper use of meson by qemu <= v8.0.3. Also, meson has > been updated to version 1.2.1 and 1.3.0 in yocto and it > doesn't seem to create any issue. [3] > > The original problem is no longer present and some > projects require meson > 1.1.1 (e.g. rusticl requires > meson 1.2.0 since mesa 23.3.0 and meson 1.3.1 since mesa > 24.0.0). > > "pkgconfig" field is deprecated by meson 1.3.0 and > replaced by "pkg-config". See: [4] > > The patch that adds the pkg_config_static property has > been rebased. I reflowed the commit log to approach the 72-char limit on line length (I needed soemthing to do while there aas a test-build on-going!) > [1] https://gitlab.com/buildroot.org/buildroot/-/commit/acfdf21f0b752e844a33c70a0fd2f82f4534a5a0 > [2] https://gitlab.com/qemu-project/qemu/-/commit/Fc9a809e0d28417fa1e7f7efc19f845bda4c1be9 > [3] https://github.com/yoctoproject/poky/commits/master/meta/recipes-devtools/meson > [4] https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig > > Signed-off-by: Antoine Coutant > --- [--SNIP--] > diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py > -index 1e8d9132e..d902ba215 100644 > +index e86206b88..94888657d 100644 > --- a/mesonbuild/dependencies/pkgconfig.py > +++ b/mesonbuild/dependencies/pkgconfig.py > -@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency): > - env = None > - libcmd = ['--libs'] > - > -- if self.static: > -+ if self.static or \ > -+ (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): > - libcmd.append('--static') > - > - libcmd.append(self.name) > +@@ -169,7 +169,7 @@ class PkgConfigCLI(PkgConfigInterface): > + env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1' > + args: T.List[str] = [] > + args += self._define_variable_args(define_variable) > +- if static: > ++ if static or (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): I changed that code back to have our addition on a separate line, so that it stands out better when updating the patch. Applied to master, thanks. Regards, Yann E. MORIN. > + args.append('--static') > + args += ['--libs', name] > + ret, out, err = self._call_pkgbin(args, env=env) > -- > 2.25.1 > > diff --git a/package/meson/meson.hash b/package/meson/meson.hash > index cb36b674fa..150fd6d1bb 100644 > --- a/package/meson/meson.hash > +++ b/package/meson/meson.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc > -sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz > +# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc > +sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz > sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING > diff --git a/package/meson/meson.mk b/package/meson/meson.mk > index 503aca8c25..467569d28b 100644 > --- a/package/meson/meson.mk > +++ b/package/meson/meson.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -MESON_VERSION = 1.1.1 > +MESON_VERSION = 1.3.1 > MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) > MESON_LICENSE = Apache-2.0 > MESON_LICENSE_FILES = COPYING > diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in > index 7053df472b..a58ab553d0 100644 > --- a/support/misc/cross-compilation.conf.in > +++ b/support/misc/cross-compilation.conf.in > @@ -10,7 +10,7 @@ ar = '@TARGET_AR@' > strip = '@TARGET_STRIP@' > cmake = '@BR2_CMAKE@' > fortran = '@TARGET_FC@' > -pkgconfig = '@PKGCONF_HOST_BINARY@' > +pkg-config = '@PKGCONF_HOST_BINARY@' > g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' > g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Wed Feb 7 15:35:17 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:35:17 +0100 Subject: [Buildroot] [PATCH 1/3] support/scripts/pkg-stats: remove checking the CPE database Message-ID: <20240207153519.657048-1-arnout@mind.be> We currently check the CPE database to see if the CPE ID we use (including the version) is already in the database. However, the version part of the CPE ID is not actually used for CVE matching. Instead, the CVEs have a range of versions associated with them and we match against those ranges. In addition, NVD is moving to a new API for accessing the CPE database. It will not longer be possible to simply download all the CPE IDs, and due to rate limiting, the download will have to be done in several queries. Since all of this is anyway of limited use, drop the CPE database lookup entirely. Instead, as long as a CPE ID is defined in a package, it is considered OK, without any checks. Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 50 ++------------------------------------- 1 file changed, 2 insertions(+), 48 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 05f0cd9e4a..caef159afe 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -40,7 +40,6 @@ from getdeveloperlib import parse_developers # noqa: E402 INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)") URL_RE = re.compile(r"\s*https?://\S*\s*$") -CPEDB_URL = "https://static.nvd.nist.gov/feeds/xml/cpe/dictionary/official-cpe-dictionary_v2.3.xml.gz" RM_API_STATUS_ERROR = 1 RM_API_STATUS_FOUND_BY_DISTRO = 2 @@ -282,8 +281,7 @@ class Package: if var in self.all_cpeids: self.cpeid = self.all_cpeids[var] - # Set a preliminary status, it might be overridden by check_package_cpes() - self.status['cpe'] = ("warning", "not checked against CPE dictionary") + self.status['cpe'] = ("ok", "(not checked against CPE dictionary)") else: self.status['cpe'] = ("error", "no verified CPE identifier") @@ -674,47 +672,6 @@ def check_package_cves(nvd_path, packages): pkg.status['cve'] = ("ok", "not affected by CVEs") -def check_package_cpes(nvd_path, packages): - class CpeXmlParser: - cpes = [] - - def start(self, tag, attrib): - if tag == "{http://scap.nist.gov/schema/cpe-extension/2.3}cpe23-item": - self.cpes.append(attrib['name']) - - def close(self): - return self.cpes - - print("CPE: Setting up NIST dictionary") - if not os.path.exists(os.path.join(nvd_path, "cpe")): - os.makedirs(os.path.join(nvd_path, "cpe")) - - cpe_dict_local = os.path.join(nvd_path, "cpe", os.path.basename(CPEDB_URL)) - if not os.path.exists(cpe_dict_local) or os.stat(cpe_dict_local).st_mtime < time.time() - 86400: - print("CPE: Fetching xml manifest from [" + CPEDB_URL + "]") - cpe_dict = requests.get(CPEDB_URL) - open(cpe_dict_local, "wb").write(cpe_dict.content) - - print("CPE: Unzipping xml manifest...") - nist_cpe_file = gzip.GzipFile(fileobj=open(cpe_dict_local, 'rb')) - - parser = xml.etree.ElementTree.XMLParser(target=CpeXmlParser()) - while True: - c = nist_cpe_file.read(1024*1024) - if not c: - break - parser.feed(c) - cpes = parser.close() - - for p in packages: - if not p.cpeid: - continue - if p.cpeid in cpes: - p.status['cpe'] = ("ok", "verified CPE identifier") - else: - p.status['cpe'] = ("error", "CPE version unknown in CPE database") - - def calculate_stats(packages): stats = defaultdict(int) stats['packages'] = len(packages) @@ -1309,7 +1266,7 @@ def parse_args(): parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) parser.add_argument('--disable', type=list_str, - help='Features to disable, comma-separated (cve, upstream, url, cpe, warning)', + help='Features to disable, comma-separated (cve, upstream, url, warning)', default=[]) args = parser.parse_args() if not args.html and not args.json: @@ -1372,9 +1329,6 @@ def __main__(): if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) - if "cpe" not in args.disable and args.nvd_path: - print("Checking packages CPEs") - check_package_cpes(args.nvd_path, packages) print("Calculate stats") stats = calculate_stats(packages) if args.html: -- 2.43.0 From arnout at mind.be Wed Feb 7 15:35:18 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:35:18 +0100 Subject: [Buildroot] [PATCH 2/3] support/scripts/cve.py: switch from NVD to FKIE for the JSON files In-Reply-To: <20240207153519.657048-1-arnout@mind.be> References: <20240207153519.657048-1-arnout@mind.be> Message-ID: <20240207153519.657048-2-arnout@mind.be> NVD will deprecate the v1.1 API which allows us to download the full database as individual JSON files. Instead, there's a horribly crappy API that is extremely slow and subject to race conditions. Fortunately, there is a project, Fraunhofer FKIE - Cyber Analysis and Defense [1], that goes through the effort of adapting to this new API and regenerating the convenient JSON files. The JSON files and meta files are re-generated daily. Instead of implementing the NVD v2 API, we decided to just use the JSON files generatd by fkie-cad. That saves us the effort of solving the race conditions, devising a cache mechanism that works, handling the frequent gateway timeouts on the NVD servers, dealing with the rate limiting, and keeping up with changes in the API. Switch to this repository on github as NVD_BASE_URL. The file name is also slightly different (CVE-20XX.json instead of nvdcve-1.1-20XX.json). The fkie-cad repository compresses with xz instead of gz. Therefore: - rename the filename variables to _xz instead of _gz; - use xz as a subprocess because there is no xz decompressor in Python stdlib. [1] https://www.fkie.fraunhofer.de/en/departments/cad.html Cc: Daniel Lang Signed-off-by: Arnout Vandecappelle --- Even better would be to clone the https://github.com/fkie-cad/nvd-json-data-feeds repository so we can cache with simple "git pull". I leave that as an exercise to the reader :-) --- support/scripts/cve.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 7cd6fce4d8..46c384955c 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -22,7 +22,7 @@ import os import requests # URL checking import distutils.version import time -import gzip +import subprocess import sys import operator @@ -41,8 +41,7 @@ except ImportError: sys.path.append('utils/') NVD_START_YEAR = 2002 -NVD_JSON_VERSION = "1.1" -NVD_BASE_URL = "https://nvd.nist.gov/feeds/json/cve/" + NVD_JSON_VERSION +NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" ops = { '>=': operator.ge, @@ -83,15 +82,15 @@ class CVE: @staticmethod def download_nvd_year(nvd_path, year): - metaf = "nvdcve-%s-%s.meta" % (NVD_JSON_VERSION, year) + metaf = "CVE-%s.meta" % year path_metaf = os.path.join(nvd_path, metaf) - jsonf_gz = "nvdcve-%s-%s.json.gz" % (NVD_JSON_VERSION, year) - path_jsonf_gz = os.path.join(nvd_path, jsonf_gz) + jsonf_xz = "CVE-%s.json.xz" % year + path_jsonf_xz = os.path.join(nvd_path, jsonf_xz) # If the database file is less than a day old, we assume the NVD data # locally available is recent enough. - if os.path.exists(path_jsonf_gz) and os.stat(path_jsonf_gz).st_mtime >= time.time() - 86400: - return path_jsonf_gz + if os.path.exists(path_jsonf_xz) and os.stat(path_jsonf_xz).st_mtime >= time.time() - 86400: + return path_jsonf_xz # If not, we download the meta file url = "%s/%s" % (NVD_BASE_URL, metaf) @@ -104,19 +103,19 @@ class CVE: # we need to re-download the database. # If the database does not exist locally, we need to redownload it in # any case. - if os.path.exists(path_metaf) and os.path.exists(path_jsonf_gz): + if os.path.exists(path_metaf) and os.path.exists(path_jsonf_xz): meta_known = open(path_metaf, "r").read() if page_meta.text == meta_known: - return path_jsonf_gz + return path_jsonf_xz # Grab the compressed JSON NVD, and write files to disk - url = "%s/%s" % (NVD_BASE_URL, jsonf_gz) + url = "%s/%s" % (NVD_BASE_URL, jsonf_xz) print("Getting %s" % url) page_json = requests.get(url) page_json.raise_for_status() - open(path_jsonf_gz, "wb").write(page_json.content) + open(path_jsonf_xz, "wb").write(page_json.content) open(path_metaf, "w").write(page_meta.text) - return path_jsonf_gz + return path_jsonf_xz @classmethod def read_nvd_dir(cls, nvd_dir): @@ -128,7 +127,8 @@ class CVE: for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - content = ijson.items(gzip.GzipFile(filename), 'CVE_Items.item') + uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) + content = ijson.items(uncompressed, 'CVE_Items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise -- 2.43.0 From arnout at mind.be Wed Feb 7 15:35:19 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:35:19 +0100 Subject: [Buildroot] [PATCH 3/3] support/scripts/cve.py: start in 1999 In-Reply-To: <20240207153519.657048-1-arnout@mind.be> References: <20240207153519.657048-1-arnout@mind.be> Message-ID: <20240207153519.657048-3-arnout@mind.be> When the CVE lookup was added in commit 4a157be9efac8ba8888e4972f42eda213077152c, the starting year of the JSON files was set to 2002. However, there are also CVEs from 1999, 2000 and 2001. It is not clear why these were skipped back then. Set the start year to 1999 to capture these old CVEs too. Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 46c384955c..f12a8048cd 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -40,7 +40,7 @@ except ImportError: sys.path.append('utils/') -NVD_START_YEAR = 2002 +NVD_START_YEAR = 1999 NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" ops = { -- 2.43.0 From sergio.prado at e-labworks.com Wed Feb 7 15:35:32 2024 From: sergio.prado at e-labworks.com (Sergio Prado) Date: Wed, 7 Feb 2024 12:35:32 -0300 Subject: [Buildroot] [PATCH] package/tio: bump to version 2.7 Message-ID: <20240207153532.1199300-1-sergio.prado@e-labworks.com> Signed-off-by: Sergio Prado --- package/tio/tio.hash | 4 ++-- package/tio/tio.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tio/tio.hash b/package/tio/tio.hash index cb0311a752ed..02699fdeb435 100644 --- a/package/tio/tio.hash +++ b/package/tio/tio.hash @@ -1,5 +1,5 @@ -# From https://github.com/tio/tio/releases/download/v1.47/tio-1.47.tar.xz.sha256sum: -sha256 6f39ac582de747feb9a64c14e6b378c61cb0c3bfa6639e62050022c1b7f5c544 tio-1.47.tar.xz +# From https://github.com/tio/tio/releases/download/v2.7/tio-2.7.tar.xz.sha256sum: +sha256 bf8fe434848c2c1b6540af0b42503c986068176ddc1a988cf02e521e7de5daa5 tio-2.7.tar.xz # Hash for license files: sha256 9248dee77ee136321f24556a96e07ff8f90461013941884a9defd0ac825ef131 LICENSE diff --git a/package/tio/tio.mk b/package/tio/tio.mk index 0035ce445ee2..d7b554ee8478 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIO_VERSION = 1.47 +TIO_VERSION = 2.7 TIO_SOURCE = tio-$(TIO_VERSION).tar.xz TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ -- 2.34.1 From thomas.petazzoni at bootlin.com Wed Feb 7 15:36:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:36:25 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add optee-os runtime test In-Reply-To: <20240120232854.1938582-1-ju.o@free.fr> References: <20240120232854.1938582-1-ju.o@free.fr> Message-ID: <20240207163625.75917cf7@windsurf> On Sun, 21 Jan 2024 00:28:54 +0100 Julien Olivain wrote: > Cc: Etienne Carriere > Signed-off-by: Julien Olivain > --- > Patch tested on branch master at commit 3780925 with commands: Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 15:36:31 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:36:31 +0100 Subject: [Buildroot] [git commit] support/testing: add optee-os runtime test Message-ID: <20240207153646.BD600875E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd56ac9eb63f0acecd78b1983f9d889f21f8fe0e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Cc: Etienne Carriere Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/boot/test_optee_os.py | 74 ++++++++++++++++++++++ .../tests/boot/test_optee_os/u-boot.fragment | 8 +++ 3 files changed, 84 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 43dd5c8cb4..8e65a93122 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1754,6 +1754,8 @@ F: package/riscv-isa-sim/ F: package/tinycompress/ F: package/z3/ F: package/zynaddsubfx/ +F: support/testing/tests/boot/test_optee_os.py +F: support/testing/tests/boot/test_optee_os/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_hwdata.py diff --git a/support/testing/tests/boot/test_optee_os.py b/support/testing/tests/boot/test_optee_os.py new file mode 100644 index 0000000000..5f5cd17464 --- /dev/null +++ b/support/testing/tests/boot/test_optee_os.py @@ -0,0 +1,74 @@ +import os + +import infra.basetest + + +class TestOptee(infra.basetest.BRTest): + # A custom configuration is needed to enable OP-TEE support in the + # Kernel. This config is inspired from: + # configs/qemu_arm_vexpress_tz_defconfig + uboot_fragment = \ + infra.filepath("tests/boot/test_optee_os/u-boot.fragment") + config = \ + f""" + BR2_arm=y + BR2_cortex_a15=y + BR2_ARM_FPU_VFPV3D16=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/arm-vexpress-tz/post-build.sh" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.73" + BR2_LINUX_KERNEL_DEFCONFIG="vexpress" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" + BR2_PACKAGE_OPTEE_EXAMPLES=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + BR2_TARGET_ROOTFS_CPIO_UIMAGE=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ARM_TRUSTED_FIRMWARE=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" + BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y + BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" + BR2_TARGET_OPTEE_OS=y + BR2_TARGET_OPTEE_OS_NEEDS_DTC=y + BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" + BR2_TARGET_UBOOT=y + BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y + BR2_TARGET_UBOOT_CUSTOM_VERSION=y + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" + BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" + BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="{uboot_fragment}" + """ + + def test_run(self): + # There is no Kernel nor rootfs image here. They will be + # loaded by TFTP through the emulated network interface in + # u-boot. + bios = os.path.join(self.builddir, "images", "flash.bin") + tftp_dir = os.path.join(self.builddir, "images") + self.emulator.boot(arch="arm", + options=["-M", "virt,secure=on", + "-d", "unimp", + "-cpu", "cortex-a15", + "-m", "1024M", + "-netdev", f"user,id=vmnic,tftp={tftp_dir}", + "-device", "virtio-net-device,netdev=vmnic", + "-bios", bios]) + self.emulator.login() + + # Check the Kernel has OP-TEE messages + self.assertRunOk("dmesg | grep -F optee:") + + # Check we have OP-TEE devices + self.assertRunOk("ls -al /dev/tee*") + + # Run some OP-TEE examples + examples = ["aes", "hello_world", "hotp", "random", "secure_storage"] + for ex in examples: + self.assertRunOk(f"optee_example_{ex}") diff --git a/support/testing/tests/boot/test_optee_os/u-boot.fragment b/support/testing/tests/boot/test_optee_os/u-boot.fragment new file mode 100644 index 0000000000..b9505a1ff8 --- /dev/null +++ b/support/testing/tests/boot/test_optee_os/u-boot.fragment @@ -0,0 +1,8 @@ +CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_BOOTCOMMAND="setenv ipaddr 10.0.2.15 && setenv serverip 10.0.2.2 && tftp ${kernel_addr_r} zImage && tftp ${ramdisk_addr_r} rootfs.cpio.uboot && setenv bootargs console=ttyAMA0,115200 earlyprintk=serial,ttyAMA0,115200 && bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr}" +CONFIG_SEMIHOSTING=y +# Drop flash accesses +CONFIG_ENV_IS_IN_FLASH=n +CONFIG_MTD=n +CONFIG_MTD_NOR_FLASH=n +CONFIG_ENV_IS_NOWHERE=y From thomas.petazzoni at bootlin.com Wed Feb 7 15:40:07 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:40:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/libnss: fix musl build In-Reply-To: <23F59953-57A8-48F0-9809-4841CC10CA0F@benettiengineering.com> References: <23F59953-57A8-48F0-9809-4841CC10CA0F@benettiengineering.com> Message-ID: <20240207164007.566c2d6b@windsurf> Hello Giulio, On Fri, 12 Jan 2024 23:39:55 +0100 Giulio Benetti wrote: > > So basically, when FREEBL_NO_DEPEND is set to 1, freebl shall not > > depend on PR_SetError as this function is defined by nspr. > > > Yes but your patch only comment out PR_SetError() while it should > depend on FREEBL_NO_DEPEND at this point even if I didn?t go in depth > again after 1/2 years. > > But the point is why this only happens on musl and specific > architectures. This is indeed the question that we need to answer. Why is that musl only? According to Fabrice's explanation, it should happen on all platforms, regarding of the C library. So there is something "more" to it, that we don't yet understand. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 15:40:30 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:40:30 +0100 Subject: [Buildroot] [git commit] package/elfutils: drop -fpic workaround Message-ID: <20240207154043.3C1A7875EB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2abe228230a017a7014d7aefd002ebb2c904442 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master -fpic workaround is not needed since bump to version 0.166 in commit 794ae61a15f7a36e199b62b2e5224cfc41bdabea and https://sourceware.org/git/?p=elfutils.git;a=commit;h=133509fa406e0e8d4d0f0632e2ee8c5e32dcb010 https://sourceware.org/git/?p=elfutils.git;a=commit;h=6a20e20ea9f122aea86533d28a688e7bb2812aa1 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/elfutils/elfutils.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 24eb168894..d43b545f2f 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -33,11 +33,6 @@ HOST_ELFUTILS_CONF_OPTS = \ ELFUTILS_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) ELFUTILS_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) -# sparc64 needs -fPIC instead of -fpic -ifeq ($(BR2_sparc64),y) -ELFUTILS_CFLAGS += -fPIC -endif - ELFUTILS_CONF_ENV += \ CFLAGS="$(ELFUTILS_CFLAGS)" \ CPPFLAGS="$(ELFUTILS_CPPFLAGS)" From thomas.petazzoni at bootlin.com Wed Feb 7 15:40:48 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:40:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/elfutils: drop -fpic workaround In-Reply-To: <20240112192154.1005937-1-fontaine.fabrice@gmail.com> References: <20240112192154.1005937-1-fontaine.fabrice@gmail.com> Message-ID: <20240207164048.65fe5d46@windsurf> On Fri, 12 Jan 2024 20:21:54 +0100 Fabrice Fontaine wrote: > -fpic workaround is not needed since bump to version 0.166 in commit > 794ae61a15f7a36e199b62b2e5224cfc41bdabea and > https://sourceware.org/git/?p=elfutils.git;a=commit;h=133509fa406e0e8d4d0f0632e2ee8c5e32dcb010 > https://sourceware.org/git/?p=elfutils.git;a=commit;h=6a20e20ea9f122aea86533d28a688e7bb2812aa1 > > Signed-off-by: Fabrice Fontaine > --- > package/elfutils/elfutils.mk | 5 ----- > 1 file changed, 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 15:47:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 16:47:41 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/tinymembench: force arm mode instead of Thumb mode In-Reply-To: <20240114135446.1156025-1-fontaine.fabrice@gmail.com> References: <20240114135446.1156025-1-fontaine.fabrice@gmail.com> Message-ID: <20240207164741.1bad9b44@windsurf> Hello Fabrice, On Sun, 14 Jan 2024 14:54:46 +0100 Fabrice Fontaine wrote: > +# tinymembench has some assembly function that is not present in Thumb mode: > +# Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' > +# so, we desactivate Thumb mode > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > +TINYMEMBENCH_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -marm" > +endif Why don't we simply extend the existing patch in the same way? It's just that new code has been added in main.c that isn't Thumb compatible, so I think you could change: #ifdef __arm__ to #if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) in main.c, and this should get you going. Could you try this instead? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From arnout at mind.be Wed Feb 7 15:58:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:58:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sentry-sdk: bump to version 1.39.2 In-Reply-To: <20240111060552.3028285-1-james.hilliard1@gmail.com> References: <20240111060552.3028285-1-james.hilliard1@gmail.com> Message-ID: <56eb755c-7365-477c-baf8-898ea62dd24c@mind.be> On 11/01/2024 07:05, James Hilliard wrote: > License changed to MIT: > https://github.com/getsentry/sentry-python/commit/9ed5e27636d05bc30cd363c19a032ace8447f5ad > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-sentry-sdk/python-sentry-sdk.hash | 6 +++--- > package/python-sentry-sdk/python-sentry-sdk.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash > index 38ae3380a8..2534a48221 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 ea2d728c847879f66c3d24cfbade2026 sentry-sdk-1.12.1.tar.gz > -sha256 5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c sentry-sdk-1.12.1.tar.gz > +md5 94ba9002bbfaf8c443c496b05bbc32eb sentry-sdk-1.39.2.tar.gz > +sha256 24c83b0b41c887d33328a9166f5950dc37ad58f01c9f2fbff6b87a6f1094170c sentry-sdk-1.39.2.tar.gz > # Locally computed sha256 checksums > -sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c 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 c3092a5184..f1c5648f07 100644 > --- a/package/python-sentry-sdk/python-sentry-sdk.mk > +++ b/package/python-sentry-sdk/python-sentry-sdk.mk > @@ -4,11 +4,11 @@ > # > ################################################################################ > > -PYTHON_SENTRY_SDK_VERSION = 1.12.1 > +PYTHON_SENTRY_SDK_VERSION = 1.39.2 > PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz > -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/32/03/496a7c8313658dec419303e8add969f314b7538c29f4ec5ebe6d86fb8ce2 > +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/66/90/9deac5c137e9f0ede908757d886af77938ef28f94b24decedbdf98f1ca4d > PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools > -PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause > +PYTHON_SENTRY_SDK_LICENSE = MIT > PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE > > $(eval $(python-package)) From arnout at mind.be Wed Feb 7 15:58:11 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:58:11 +0100 Subject: [Buildroot] [git commit] package/python-sentry-sdk: bump to version 1.39.2 Message-ID: <20240207155839.036E7875F4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cc1181524da559b684320ee4d3a5a0fdd69dc3bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License changed to MIT: https://github.com/getsentry/sentry-python/commit/9ed5e27636d05bc30cd363c19a032ace8447f5ad Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-sentry-sdk/python-sentry-sdk.hash | 6 +++--- package/python-sentry-sdk/python-sentry-sdk.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 38ae3380a8..2534a48221 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 ea2d728c847879f66c3d24cfbade2026 sentry-sdk-1.12.1.tar.gz -sha256 5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c sentry-sdk-1.12.1.tar.gz +md5 94ba9002bbfaf8c443c496b05bbc32eb sentry-sdk-1.39.2.tar.gz +sha256 24c83b0b41c887d33328a9166f5950dc37ad58f01c9f2fbff6b87a6f1094170c sentry-sdk-1.39.2.tar.gz # Locally computed sha256 checksums -sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c 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 c3092a5184..f1c5648f07 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 1.12.1 +PYTHON_SENTRY_SDK_VERSION = 1.39.2 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/32/03/496a7c8313658dec419303e8add969f314b7538c29f4ec5ebe6d86fb8ce2 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/66/90/9deac5c137e9f0ede908757d886af77938ef28f94b24decedbdf98f1ca4d PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools -PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause +PYTHON_SENTRY_SDK_LICENSE = MIT PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 7 15:58:59 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 16:58:59 +0100 Subject: [Buildroot] [PATCH v4 4/7] package/opencl-headers: new package In-Reply-To: <20240202093625.1409559-5-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-5-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > From: Sebastian Weyer > > These headers provide the C language API bindings. It is a complement to > the C++ bindings already available in opencl-clhpp. This package is > required to build opencl-icd-loader: > > https://github.com/KhronosGroup/OpenCL-ICD-Loader#dependencies > > Signed-off-by: Sebastian Weyer > Signed-off-by: Antoine Coutant > --- [--SNIP--] > diff --git a/package/opencl-headers/Config.in b/package/opencl-headers/Config.in > new file mode 100644 > index 0000000000..092d8a2a4d > --- /dev/null > +++ b/package/opencl-headers/Config.in > @@ -0,0 +1,7 @@ > +config BR2_PACKAGE_OPENCL_HEADERS > + bool "opencl-headers" > + depends on BR2_PACKAGE_HAS_LIBOPENCL BR2_PACKAGE_HAS_LIBOPENCL can be set by mesa3d when BR2_PACKAGE_MESA3D_OPENCL is enabled. In this case, will mesa3d install its own headers? If so, that will generate a conflict. Furthermore, this will also conflict with mesa3d-headers, and it also installs CL headers. So, why do we need opencl-headers and can't rely on the existing mesa3d-headers package? Regards, Yann E. MORIN. > + help > + C language headers for the OpenCL API > + > + https://github.com/KhronosGroup/OpenCL-Headers > diff --git a/package/opencl-headers/opencl-headers.hash b/package/opencl-headers/opencl-headers.hash > new file mode 100644 > index 0000000000..802ed05450 > --- /dev/null > +++ b/package/opencl-headers/opencl-headers.hash > @@ -0,0 +1,3 @@ > +#Locally generated > +sha256 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d OpenCL-Headers-2023.12.14.tar.gz > +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE > diff --git a/package/opencl-headers/opencl-headers.mk b/package/opencl-headers/opencl-headers.mk > new file mode 100644 > index 0000000000..7aa0e0d168 > --- /dev/null > +++ b/package/opencl-headers/opencl-headers.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# opencl-headers > +# > +################################################################################ > + > +OPENCL_HEADERS_VERSION = 2023.12.14 > +OPENCL_HEADERS_SOURCE = OpenCL-Headers-$(OPENCL_HEADERS_VERSION).tar.gz > +OPENCL_HEADERS_SITE = $(call github,KhronosGroup,OpenCL-Headers,v$(OPENCL_HEADERS_VERSION)) > +OPENCL_HEADERS_LICENSE = Apache-2.0 > +OPENCL_HEADERS_LICENSE_FILES = LICENSE > +OPENCL_HEADERS_INSTALL_STAGING = YES > + > +OPENCL_HEADERS_INSTALL_TARGET = NO > + > +define OPENCL_HEADERS_INSTALL_STAGING_CMDS > + mkdir -p $(STAGING_DIR)/usr/include/CL > + $(INSTALL) -D -m 0644 $(@D)/CL/* \ > + $(STAGING_DIR)/usr/include/CL > +endef > + > +$(eval $(generic-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Wed Feb 7 16:01:06 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:01:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-service-identity: bump to version 23.1.0 In-Reply-To: <20240111061658.3034731-1-james.hilliard1@gmail.com> References: <20240111061658.3034731-1-james.hilliard1@gmail.com> Message-ID: <457e9920-3397-40b6-a746-9ba3bf0511f7@mind.be> On 11/01/2024 07:16, James Hilliard wrote: > License hash changed due to MIT header added: > https://github.com/pyca/service-identity/commit/a4a82c1b646d07cf2f3b4705ce17f22e6484556c > > Migrate from setuptools to hatchling pep517 build backend. > > Drop no longer python-pyopenssl runtime dependency. > > Drop no longer python-six runtime dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-service-identity/Config.in | 2 -- > .../python-service-identity.hash | 6 +++--- > .../python-service-identity.mk | 12 ++++++++---- > 3 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in > index 278900971e..dccd8f37c0 100644 > --- a/package/python-service-identity/Config.in > +++ b/package/python-service-identity/Config.in > @@ -5,8 +5,6 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY > select BR2_PACKAGE_PYTHON_ATTRS # runtime > select BR2_PACKAGE_PYTHON_PYASN1 # runtime > select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime > - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime > - select BR2_PACKAGE_PYTHON_SIX # runtime > help > Service identity verification for pyOpenSSL. > > diff --git a/package/python-service-identity/python-service-identity.hash b/package/python-service-identity/python-service-identity.hash > index f648918dbd..32d8f21ad4 100644 > --- a/package/python-service-identity/python-service-identity.hash > +++ b/package/python-service-identity/python-service-identity.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/service-identity/json > -md5 5e5c195d8fcedc72f9068be2ad9b5a13 service-identity-21.1.0.tar.gz > -sha256 6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34 service-identity-21.1.0.tar.gz > +md5 14a751406024544784459474d93d1ea5 service_identity-23.1.0.tar.gz > +sha256 ecb33cd96307755041e978ab14f8b14e13b40f1fbd525a4dc78f46d2b986431d service_identity-23.1.0.tar.gz > # Locally computed sha256 checksums > -sha256 c5075126e1272b176504e36af369781a95c5c1124239da8e4f61b0f9c15a56cf LICENSE > +sha256 51f7c647190e74d19f9f24f1b19645b425eb8f30f049196053686bff188505cf LICENSE > diff --git a/package/python-service-identity/python-service-identity.mk b/package/python-service-identity/python-service-identity.mk > index e4ae8e6889..6e61dd951b 100644 > --- a/package/python-service-identity/python-service-identity.mk > +++ b/package/python-service-identity/python-service-identity.mk > @@ -4,11 +4,15 @@ > # > ################################################################################ > > -PYTHON_SERVICE_IDENTITY_VERSION = 21.1.0 > -PYTHON_SERVICE_IDENTITY_SOURCE = service-identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz > -PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/09/2e/26ade69944773df4748c19d3053e025b282f48de02aad84906d34a29d28b > +PYTHON_SERVICE_IDENTITY_VERSION = 23.1.0 > +PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz > +PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/3b/98/2a46c7414ffc1d06ba67d2c2dd62a207a70cb351028a8cd8c85b3dbd1cf7 > PYTHON_SERVICE_IDENTITY_LICENSE = MIT > PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE > -PYTHON_SERVICE_IDENTITY_SETUP_TYPE = setuptools > +PYTHON_SERVICE_IDENTITY_SETUP_TYPE = pep517 > +PYTHON_SERVICE_IDENTITY_DEPENDENCIES = \ > + host-python-hatchling \ > + host-python-hatch-vcs \ > + host-python-hatch-fancy-pypi-readme > > $(eval $(python-package)) From arnout at mind.be Wed Feb 7 15:58:44 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 16:58:44 +0100 Subject: [Buildroot] [git commit] package/python-service-identity: bump to version 23.1.0 Message-ID: <20240207160129.C517F875FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6008f2b1b901be1374ac201b5e560cca61b4b61e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to MIT header added: https://github.com/pyca/service-identity/commit/a4a82c1b646d07cf2f3b4705ce17f22e6484556c Migrate from setuptools to hatchling pep517 build backend. Drop no longer python-pyopenssl runtime dependency. Drop no longer python-six runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-service-identity/Config.in | 2 -- package/python-service-identity/python-service-identity.hash | 6 +++--- package/python-service-identity/python-service-identity.mk | 12 ++++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index 278900971e..dccd8f37c0 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -5,8 +5,6 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY select BR2_PACKAGE_PYTHON_ATTRS # runtime select BR2_PACKAGE_PYTHON_PYASN1 # runtime select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help Service identity verification for pyOpenSSL. diff --git a/package/python-service-identity/python-service-identity.hash b/package/python-service-identity/python-service-identity.hash index f648918dbd..32d8f21ad4 100644 --- a/package/python-service-identity/python-service-identity.hash +++ b/package/python-service-identity/python-service-identity.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/service-identity/json -md5 5e5c195d8fcedc72f9068be2ad9b5a13 service-identity-21.1.0.tar.gz -sha256 6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34 service-identity-21.1.0.tar.gz +md5 14a751406024544784459474d93d1ea5 service_identity-23.1.0.tar.gz +sha256 ecb33cd96307755041e978ab14f8b14e13b40f1fbd525a4dc78f46d2b986431d service_identity-23.1.0.tar.gz # Locally computed sha256 checksums -sha256 c5075126e1272b176504e36af369781a95c5c1124239da8e4f61b0f9c15a56cf LICENSE +sha256 51f7c647190e74d19f9f24f1b19645b425eb8f30f049196053686bff188505cf LICENSE diff --git a/package/python-service-identity/python-service-identity.mk b/package/python-service-identity/python-service-identity.mk index e4ae8e6889..6e61dd951b 100644 --- a/package/python-service-identity/python-service-identity.mk +++ b/package/python-service-identity/python-service-identity.mk @@ -4,11 +4,15 @@ # ################################################################################ -PYTHON_SERVICE_IDENTITY_VERSION = 21.1.0 -PYTHON_SERVICE_IDENTITY_SOURCE = service-identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz -PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/09/2e/26ade69944773df4748c19d3053e025b282f48de02aad84906d34a29d28b +PYTHON_SERVICE_IDENTITY_VERSION = 23.1.0 +PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz +PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/3b/98/2a46c7414ffc1d06ba67d2c2dd62a207a70cb351028a8cd8c85b3dbd1cf7 PYTHON_SERVICE_IDENTITY_LICENSE = MIT PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE -PYTHON_SERVICE_IDENTITY_SETUP_TYPE = setuptools +PYTHON_SERVICE_IDENTITY_SETUP_TYPE = pep517 +PYTHON_SERVICE_IDENTITY_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs \ + host-python-hatch-fancy-pypi-readme $(eval $(python-package)) From yann.morin.1998 at free.fr Wed Feb 7 16:01:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 17:01:39 +0100 Subject: [Buildroot] [PATCH v4 5/7] package/opencl-icd-loader: new package In-Reply-To: <20240202093625.1409559-6-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-6-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > From: Sebastian Weyer > > With this package it is possible to have multiple implementations of > OpenCL at the same time. This package provides a libOpenCL.so file that > captures the OpenCL API calls and forwards them to the correct > implementation of OpenCL. OpenCL implementations can be manually > registered by creating a file containing its full file path in > /etc/OpenCL/vendors/.icd[1] > > This package is required by certain OpenCL implementations, for example > Mesa3D's Clover implementation if it is not built in standalone mode. > > [1] https://github.com/KhronosGroup/OpenCL-ICD-Loader#registering-icds > > Signed-off-by: Sebastian Weyer > Signed-off-by: Antoine Coutant > --- [--SNIP--] > diff --git a/package/opencl-icd-loader/Config.in b/package/opencl-icd-loader/Config.in > new file mode 100644 > index 0000000000..405dc5401a > --- /dev/null > +++ b/package/opencl-icd-loader/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_OPENCL_ICD_LOADER > + bool "OpenCL-ICD-Loader" > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_PACKAGE_HAS_LIBOPENCL > + select BR2_PACKAGE_OPENCL_HEADERS Following on the review of the previous patch: maybe that could rely on mesa3d-headers, and if so, we'ds not need to introduce a new opencl-headers package. Regards, Yann E. MORIN. > + help > + OpenCL defines an Installable Client Driver (ICD) mechanism to > + allow developers to build applications against an Installable > + Client Driver loader (ICD loader) rather than linking their > + applications against a specific OpenCL implementation. > + > + https://github.com/KhronosGroup/OpenCL-ICD-Loader > diff --git a/package/opencl-icd-loader/opencl-icd-loader.hash b/package/opencl-icd-loader/opencl-icd-loader.hash > new file mode 100644 > index 0000000000..1c894f1293 > --- /dev/null > +++ b/package/opencl-icd-loader/opencl-icd-loader.hash > @@ -0,0 +1,3 @@ > +# locally generated > +sha256 af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917 OpenCL-ICD-Loader-2023.12.14.tar.gz > +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE > diff --git a/package/opencl-icd-loader/opencl-icd-loader.mk b/package/opencl-icd-loader/opencl-icd-loader.mk > new file mode 100644 > index 0000000000..04f6fb4b85 > --- /dev/null > +++ b/package/opencl-icd-loader/opencl-icd-loader.mk > @@ -0,0 +1,19 @@ > +################################################################################ > +# > +# opencl-icd-loader > +# > +################################################################################ > + > +OPENCL_ICD_LOADER_VERSION = 2023.12.14 > +OPENCL_ICD_LOADER_SOURCE = OpenCL-ICD-Loader-$(OPENCL_ICD_LOADER_VERSION).tar.gz > +OPENCL_ICD_LOADER_SITE = $(call github,KhronosGroup,OpenCL-ICD-Loader,v$(OPENCL_ICD_LOADER_VERSION)) > +OPENCL_ICD_LOADER_LICENSE = Apache-2.0 > +OPENCL_ICD_LOADER_LICENSE_FILES = LICENSE > +OPENCL_ICD_LOADER_INSTALL_STAGING = YES > + > +OPENCL_ICD_LOADER_DEPENDENCIES = opencl-headers > + > +OPENCL_ICD_LOADER_CONF_OPTS += -DOPENCL_ICD_LOADER_HEADERS_DIR=$(STAGING_DIR)/usr/include > + > +$(eval $(cmake-package)) > +$(eval $(host-cmake-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Wed Feb 7 16:03:37 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:03:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setproctitle: bump to version 1.3.3 In-Reply-To: <20240111062157.3037879-1-james.hilliard1@gmail.com> References: <20240111062157.3037879-1-james.hilliard1@gmail.com> Message-ID: <3cee30f6-97c4-4a42-b5eb-5128313584dd@mind.be> On 11/01/2024 07:21, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-setproctitle/python-setproctitle.hash | 6 +++--- > package/python-setproctitle/python-setproctitle.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-setproctitle/python-setproctitle.hash b/package/python-setproctitle/python-setproctitle.hash > index ac8fed986a..f60595bf6c 100644 > --- a/package/python-setproctitle/python-setproctitle.hash > +++ b/package/python-setproctitle/python-setproctitle.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/setproctitle/json > -md5 fa9771540422a59a8dee1331ad6fd3a9 setproctitle-1.3.2.tar.gz > -sha256 b9fb97907c830d260fa0658ed58afd48a86b2b88aac521135c352ff7fd3477fd setproctitle-1.3.2.tar.gz > -# Locally computed > +md5 1c042d6717212de791c4f9b63e7b544e setproctitle-1.3.3.tar.gz > +sha256 c913e151e7ea01567837ff037a23ca8740192880198b7fbb90b16d181607caae setproctitle-1.3.3.tar.gz > +# Locally computed sha256 checksums > sha256 4ace14d0836da75079088cfc5cef6f2ddc8ce16f600609b36ee1bf10f8101f61 COPYRIGHT > diff --git a/package/python-setproctitle/python-setproctitle.mk b/package/python-setproctitle/python-setproctitle.mk > index 7055920c08..ca2d0ffbc6 100644 > --- a/package/python-setproctitle/python-setproctitle.mk > +++ b/package/python-setproctitle/python-setproctitle.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SETPROCTITLE_VERSION = 1.3.2 > +PYTHON_SETPROCTITLE_VERSION = 1.3.3 > PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz > -PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/b5/47/ac709629ddb9779fee29b7d10ae9580f60a4b37e49bce72360ddf9a79cdc > +PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/ff/e1/b16b16a1aa12174349d15b73fd4b87e641a8ae3fb1163e80938dbbf6ae98 > PYTHON_SETPROCTITLE_LICENSE = BSD-3-Clause > PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT > PYTHON_SETPROCTITLE_SETUP_TYPE = setuptools From arnout at mind.be Wed Feb 7 16:01:32 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:01:32 +0100 Subject: [Buildroot] [git commit] package/python-setproctitle: bump to version 1.3.3 Message-ID: <20240207160356.3B0CC87605@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33ac66e792b559bcbf31d69c58750a97b188933c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-setproctitle/python-setproctitle.hash | 6 +++--- package/python-setproctitle/python-setproctitle.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-setproctitle/python-setproctitle.hash b/package/python-setproctitle/python-setproctitle.hash index ac8fed986a..f60595bf6c 100644 --- a/package/python-setproctitle/python-setproctitle.hash +++ b/package/python-setproctitle/python-setproctitle.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setproctitle/json -md5 fa9771540422a59a8dee1331ad6fd3a9 setproctitle-1.3.2.tar.gz -sha256 b9fb97907c830d260fa0658ed58afd48a86b2b88aac521135c352ff7fd3477fd setproctitle-1.3.2.tar.gz -# Locally computed +md5 1c042d6717212de791c4f9b63e7b544e setproctitle-1.3.3.tar.gz +sha256 c913e151e7ea01567837ff037a23ca8740192880198b7fbb90b16d181607caae setproctitle-1.3.3.tar.gz +# Locally computed sha256 checksums sha256 4ace14d0836da75079088cfc5cef6f2ddc8ce16f600609b36ee1bf10f8101f61 COPYRIGHT diff --git a/package/python-setproctitle/python-setproctitle.mk b/package/python-setproctitle/python-setproctitle.mk index 7055920c08..ca2d0ffbc6 100644 --- a/package/python-setproctitle/python-setproctitle.mk +++ b/package/python-setproctitle/python-setproctitle.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETPROCTITLE_VERSION = 1.3.2 +PYTHON_SETPROCTITLE_VERSION = 1.3.3 PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz -PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/b5/47/ac709629ddb9779fee29b7d10ae9580f60a4b37e49bce72360ddf9a79cdc +PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/ff/e1/b16b16a1aa12174349d15b73fd4b87e641a8ae3fb1163e80938dbbf6ae98 PYTHON_SETPROCTITLE_LICENSE = BSD-3-Clause PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT PYTHON_SETPROCTITLE_SETUP_TYPE = setuptools From thomas.petazzoni at bootlin.com Wed Feb 7 16:07:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:07:15 +0100 Subject: [Buildroot] [git commit] package/libglib2: fix libiconv (intl) support Message-ID: <20240207160746.39F598760C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3641347ff13267fe8a7f45d0207d333dac9ca38a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Libglib2 can compile without localization support, but still depends on libiconv, which is selected in Config.in. This fallback support was broken, and is fixed in this upstream commit: https://gitlab.gnome.org/GNOME/glib/-/commit/a497d5be122f193dcf8679334308333bbbc14a71, which partially reverts commits that were brought through merge commit 4a8120ec22be0b63705c1ed28b47920b99388087, that landed in 2.74.0 (as the first stable release). The other patch is purely added to avoid merge conflicts while cherry-picking. Fixes: http://autobuild.buildroot.org/results/04d9a17e64503e0bece7bad33549ef3ad4b237c9/ Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- ...etection-of-a-system-provided-proxy-libin.patch | 53 ++++++++++++++++++++++ .../0005-meson-try-iconv-in-libintl-lookup.patch | 53 ++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch b/package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch new file mode 100644 index 0000000000..57404705d0 --- /dev/null +++ b/package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch @@ -0,0 +1,53 @@ +From 2ca9f53327308e85e376bcbef7f8259a6331a453 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan +Date: Thu, 8 Sep 2022 02:36:33 +0530 +Subject: [PATCH] meson: Fix detection of a system-provided proxy-libintl + +proxy-libintl defines ngettext() as a define in the header that points +to the actual symbol in the library which is g_libintl_ngettext(). +Same with bind_textdomain_codeset(). + +Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/32249a22fc39319651e7c23442d37ec837f05764 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 0cbc9689f..de0bee5a3 100644 +--- a/meson.build ++++ b/meson.build +@@ -2089,6 +2089,7 @@ libz_dep = dependency('zlib') + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible + # implementations. This could be extended if issues are found in some platforms. + libintl_deps = [] ++libintl_prefix = '#include ' + libintl = dependency('intl', required: false, allow_fallback: false) + if libintl.found() + # libintl supports different threading APIs, which may not +@@ -2100,11 +2101,11 @@ if libintl.found() + # + # Meson's builtin dependency lookup as of 0.60.0 doesn't check for + # pthread, so we do this manually here. +- if cc.has_function('ngettext', dependencies : libintl) ++ if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix) + libintl_deps += [libintl] + else + libintl_pthread = cc.find_library('pthread', required : false) +- if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread]) ++ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) + libintl_deps += [libintl, libintl_pthread] + else + libintl = disabler() +@@ -2113,7 +2114,7 @@ if libintl.found() + endif + + if libintl.found() +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) ++ have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps, prefix: libintl_prefix) + else + libintl = dependency('intl', allow_fallback: true) + assert(libintl.type_name() == 'internal') +-- +2.34.1 + diff --git a/package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch b/package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch new file mode 100644 index 0000000000..a342ee95d6 --- /dev/null +++ b/package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch @@ -0,0 +1,53 @@ +From fe7f54d4f339b7948c961b60729f620f2eaec716 Mon Sep 17 00:00:00 2001 +From: Jan200101 +Date: Tue, 23 May 2023 23:42:37 +0200 +Subject: [PATCH] meson: try iconv in libintl lookup +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This was originally removed in !2734 but still appears to be required for +some MinGW setups, such as the `x86_64-w64-mingw32.static` target in +[mxe](https://github.com/mxe/mxe). + +Currently, this configuration fails the libintl internal assert on line +2128, as on this platform `ngettext()` is only found inside libiconv. + +This commit will look up iconv potentially twice, once as `libiconv` and +potentially once as `libintl_iconv`. This is what the code did before +!2734 landed, so it???s known to work reliably on a number of platforms. + +Upstream: https://gitlab.gnome.org/GNOME/glib/-/commit/a497d5be122f193dcf8679334308333bbbc14a71 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index de0bee5a3..653f9eddf 100644 +--- a/meson.build ++++ b/meson.build +@@ -2104,11 +2104,16 @@ if libintl.found() + if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix) + libintl_deps += [libintl] + else +- libintl_pthread = cc.find_library('pthread', required : false) +- if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) +- libintl_deps += [libintl, libintl_pthread] ++ libintl_iconv = cc.find_library('iconv', required : false) ++ if libintl_iconv.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv]) ++ libintl_deps += [libintl, libintl_iconv] + else +- libintl = disabler() ++ libintl_pthread = cc.find_library('pthread', required : false) ++ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) ++ libintl_deps += [libintl, libintl_pthread] ++ else ++ libintl = disabler() ++ endif + endif + endif + endif +-- +2.34.1 + From thomas.petazzoni at bootlin.com Wed Feb 7 16:10:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:10:34 +0100 Subject: [Buildroot] [PATCH v2] package/libglib2: fix libiconv (intl) support In-Reply-To: <20240114184111.454187-1-thomas@devoogdt.com> References: <20240114184111.454187-1-thomas@devoogdt.com> Message-ID: <20240207171034.535dd392@windsurf> On Sun, 14 Jan 2024 19:41:11 +0100 Thomas Devoogdt wrote: > Libglib2 can compile without localization support, > but still depends on libiconv, which is selected in Config.in. > > This fallback support was broken, and is fixed in this upstream commit: > https://gitlab.gnome.org/GNOME/glib/-/commit/a497d5be122f193dcf8679334308333bbbc14a71 > > The other patch is purely added to avoid merge conflicts while cherry-picking. > > Fixes: http://autobuild.buildroot.org/results/04d/04d9a17e64503e0bece7bad33549ef3ad4b237c9/build-end.log. > > Signed-off-by: Thomas Devoogdt > --- > v2: dropped meson libintl wrap, problem was the libiconv detection > --- > ...ion-of-a-system-provided-proxy-libin.patch | 53 +++++++++++++++++++ > ...05-meson-try-iconv-in-libintl-lookup.patch | 53 +++++++++++++++++++ > 2 files changed, 106 insertions(+) > create mode 100644 package/libglib2/0004-meson-Fix-detection-of-a-system-provided-proxy-libin.patch > create mode 100644 package/libglib2/0005-meson-try-iconv-in-libintl-lookup.patch Applied to master after doing some research to explain when the problem was introduced, so that Peter can more easily decide if this should be backported, and to which branches. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 16:11:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:11:05 +0100 Subject: [Buildroot] [git commit] package/swugenerator: add missing runtime dependencies Message-ID: <20240207161143.F3E0987610@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34da86d1ef85226f758e83a381a81c03c6824734 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master swugenerator might use openssl to encrypt files in .swu(cpio) resulting output archive and gzip or zlib to compress the same files but we're not sure whether build environment have or not openssl, gzip and zlib installed so we add them as host dependencies. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/swugenerator/swugenerator.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/swugenerator/swugenerator.mk b/package/swugenerator/swugenerator.mk index f4ead1d229..466fe1f046 100644 --- a/package/swugenerator/swugenerator.mk +++ b/package/swugenerator/swugenerator.mk @@ -9,6 +9,10 @@ SWUGENERATOR_SITE = $(call github,sbabic,swugenerator,v$(SWUGENERATOR_VERSION)) SWUGENERATOR_LICENSE = GPL-3.0 SWUGENERATOR_LICENSE_FILES = LICENSE HOST_SWUGENERATOR_SETUP_TYPE = setuptools -HOST_SWUGENERATOR_DEPENDENCIES = host-python-libconf +HOST_SWUGENERATOR_DEPENDENCIES = \ + host-gzip \ + host-openssl \ + host-python-libconf \ + host-zstd $(eval $(host-python-package)) From thomas.petazzoni at bootlin.com Wed Feb 7 16:11:49 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:11:49 +0100 Subject: [Buildroot] [PATCH v3] package/swugenerator: add missing runtime dependencies In-Reply-To: <20240107115958.173945-1-giulio.benetti@benettiengineering.com> References: <20240105140611.6a19a037@windsurf> <20240107115958.173945-1-giulio.benetti@benettiengineering.com> Message-ID: <20240207171149.2f609365@windsurf> On Sun, 7 Jan 2024 12:59:58 +0100 Giulio Benetti wrote: > From: Giulio Benetti > > Package swugenerator can use openssl to encrypt files in .swu(cpio) > resulting output archive and gzip or zlib to compress the same files but > we're not sure build environment have or not openssl, gzip and zlib > installed so add them as host dependencies like: > * host-openssl > * host-gzip > * host-zlib > > Signed-off-by: Giulio Benetti > --- > V1->V2: > * V1->V2: > * add host-zstd and clarify in commit log these are runtime dependencies as > pointed by Thomas Petazzoni > V2->V3: > * improve commit log explaining why we need this patch as pointed by > Thomas Petazzoni > --- > package/swugenerator/swugenerator.mk | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Wed Feb 7 16:17:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 07 Feb 2024 17:17:00 +0100 Subject: [Buildroot] [PATCH v8 1/2] package/cairo: move to the meson build system In-Reply-To: <20240205213035.3180167-1-thomas@devoogdt.com> (Thomas Devoogdt's message of "Mon, 5 Feb 2024 22:30:34 +0100") References: <20240205212300.3178519-2-thomas@devoogdt.com> <20240205213035.3180167-1-thomas@devoogdt.com> Message-ID: <87le7wz1tv.fsf@48ers.dk> >>>>> "Thomas" == Thomas Devoogdt writes: > - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy > since they are not selectable anymore in the meson-build options. > BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. > - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG > option already selects that one. This is now in sync with the > meson build options. > - Note that the dependencies for the various options are slightly changed, > but there is not much mentioned about that, the meson introduction is done > in one big commit: [1]. > - Added xlib_libXrender dependency, which was already required > before meson, it just came to my attention since it's a hard > error now. In what configuration do you see that? I just did a test with current master (commit 6008f2b1b901b) and the following defconfig without issues: BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_XORG7=y BR2_PACKAGE_CAIRO=y # BR2_TARGET_ROOTFS_TAR is not set -- Bye, Peter Korsgaard From dario.binacchi at amarulasolutions.com Wed Feb 7 16:17:04 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 17:17:04 +0100 Subject: [Buildroot] [PATCH 1/1] configs: drop redundant configuration for no MMU platforms Message-ID: <20240207161704.2981151-1-dario.binacchi@amarulasolutions.com> The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi --- configs/canaan_kd233_defconfig | 1 - configs/imxrt1050-evk_defconfig | 3 --- configs/qemu_m68k_mcf5208_defconfig | 3 --- configs/qemu_riscv64_nommu_virt_defconfig | 3 --- configs/qemu_xtensa_lx60_nommu_defconfig | 3 --- configs/sipeed_maix_bit_defconfig | 1 - configs/sipeed_maix_bit_sdcard_defconfig | 1 - configs/sipeed_maix_dock_defconfig | 1 - configs/sipeed_maix_dock_sdcard_defconfig | 1 - configs/sipeed_maix_go_defconfig | 1 - configs/sipeed_maix_go_sdcard_defconfig | 1 - configs/sipeed_maixduino_defconfig | 1 - configs/sipeed_maixduino_sdcard_defconfig | 1 - configs/stm32f429_disco_xip_defconfig | 1 - configs/stm32f469_disco_sd_defconfig | 1 - configs/stm32f469_disco_xip_defconfig | 1 - configs/stm32f769_disco_sd_defconfig | 1 - 17 files changed, 25 deletions(-) diff --git a/configs/canaan_kd233_defconfig b/configs/canaan_kd233_defconfig index 3335195f2589..672fee57a185 100644 --- a/configs/canaan_kd233_defconfig +++ b/configs/canaan_kd233_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig index 947abe5df206..b493c1109820 100644 --- a/configs/imxrt1050-evk_defconfig +++ b/configs/imxrt1050-evk_defconfig @@ -23,9 +23,6 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="16M" -# NOMMU Busybox -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index e35f3546fed4..0c95756a8e16 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -29,9 +29,6 @@ BR2_LINUX_KERNEL_VMLINUX=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -# use minimal busybox with hush and networking tools -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index 2a0aea01d703..9999bcf7f336 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -6,9 +6,6 @@ BR2_RISCV_64=y # Linux headers same as kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y -# Busybox with hush -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # System BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index c3224576f76b..d1d59b95254f 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -4,9 +4,6 @@ BR2_XTENSA_CUSTOM=y BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz" # BR2_XTENSA_USE_MMU is not set -# Use minimal busybox with hush and networking tools -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" diff --git a/configs/sipeed_maix_bit_defconfig b/configs/sipeed_maix_bit_defconfig index 03ae57e1b7fd..e45996879a6a 100644 --- a/configs/sipeed_maix_bit_defconfig +++ b/configs/sipeed_maix_bit_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig index 720d2169205a..7e293e5a490c 100644 --- a/configs/sipeed_maix_bit_sdcard_defconfig +++ b/configs/sipeed_maix_bit_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_bit" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maix_dock_defconfig b/configs/sipeed_maix_dock_defconfig index 045967f5899b..0352382fcd86 100644 --- a/configs/sipeed_maix_dock_defconfig +++ b/configs/sipeed_maix_dock_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig index eb7294d55911..20658813bad1 100644 --- a/configs/sipeed_maix_dock_sdcard_defconfig +++ b/configs/sipeed_maix_dock_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_dock" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maix_go_defconfig b/configs/sipeed_maix_go_defconfig index c320d19703ab..27272dac4c44 100644 --- a/configs/sipeed_maix_go_defconfig +++ b/configs/sipeed_maix_go_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig index d2392ba822fb..1bc12dd05819 100644 --- a/configs/sipeed_maix_go_sdcard_defconfig +++ b/configs/sipeed_maix_go_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_go" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maixduino_defconfig b/configs/sipeed_maixduino_defconfig index ba83dd76ee7f..3e04ea3a046a 100644 --- a/configs/sipeed_maixduino_defconfig +++ b/configs/sipeed_maixduino_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig index 09bc1b4ab15a..253ee7d7cfc3 100644 --- a/configs/sipeed_maixduino_sdcard_defconfig +++ b/configs/sipeed_maixduino_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maixduino" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index d4e000487a80..99ae8cc7533b 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index 8b10bc674176..66840a774230 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index e362a9985116..6e6ead0fdebb 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index 2ae27fb2d852..725c985ec04e 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f769-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" -- 2.43.0 From yann.morin.1998 at free.fr Wed Feb 7 16:19:42 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 17:19:42 +0100 Subject: [Buildroot] [git commit] package/python-rpds-py: bump to version 0.17.1 Message-ID: <20240207161954.61A0287616@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=538332d944883ebeb2b91d3b31425593165c0d34 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/python-rpds-py/python-rpds-py.hash | 2 +- package/python-rpds-py/python-rpds-py.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash index 8c4b6181d0..4650d9c385 100644 --- a/package/python-rpds-py/python-rpds-py.hash +++ b/package/python-rpds-py/python-rpds-py.hash @@ -1,4 +1,4 @@ # Locally calculated after vendoring -sha256 861b1fa8c37819b2e2cebbde6dea66ac2fa1247e4a7c3933dbf4c89244d7fecb rpds_py-0.16.2.tar.gz +sha256 760b05720269195d86071ac7cf627b3a4ab9366680d8d449a6a63b84d96a5bc0 rpds_py-0.17.1.tar.gz # Locally computed sha256 checksums sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 5f0d30d002..80670f2e4f 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPDS_PY_VERSION = 0.16.2 +PYTHON_RPDS_PY_VERSION = 0.17.1 PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/c2/63/94a1e9406b34888bdf8506e91d654f1cd84365a5edafa5f8ff0c97d4d9e1 +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/b7/0a/e3bdcc977e6db3bf32a3f42172f583adfa7c3604091a03d512333e0161fe PYTHON_RPDS_PY_SETUP_TYPE = maturin PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/bayer2rgb-neon: fix aarch64 build with BR2_OPTIMIZE_0 In-Reply-To: <20240106224233.3637602-1-fontaine.fabrice@gmail.com> References: <20240106224233.3637602-1-fontaine.fabrice@gmail.com> Message-ID: <20240207172418.45613b76@windsurf> On Sat, 6 Jan 2024 23:42:33 +0100 Fabrice Fontaine wrote: > Fix the following build failure with aarch64 and BR2_OPTIMIZE_0 raised > since commit 0512910e4901edcb78bb1daa4eb3be9bdc4dc8a9: > > src/convert-neon-body-bayer8.inc.h: In function 'bayer2rgb_convert_neon': > src/convert-neon.c:233:17: error: third argument to '__builtin_prefetch' must be a constant > 233 | __builtin_prefetch(((void const *)(_addr)) + 64, 0, (_lvl)); \ > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > src/convert-neon-body-bayer8.inc.h:8:9: note: in expansion of macro 'do_prefetch' > 8 | do_prefetch(&in[+1*stride - 1], (rows_per_loop) < 3 ? 3 : 0); > | ^~~~~~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/307c1c448becd99dfba3a17b3ef816db0bb5cad6 > > Signed-off-by: Fabrice Fontaine > --- > package/bayer2rgb-neon/bayer2rgb-neon.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/bayer2rgb-neon: bump to latest commit In-Reply-To: <20240106224320.3638136-1-fontaine.fabrice@gmail.com> References: <20240106224320.3638136-1-fontaine.fabrice@gmail.com> Message-ID: <20240207172422.09b472a7@windsurf> On Sat, 6 Jan 2024 23:43:20 +0100 Fabrice Fontaine wrote: > Drop patch (already in version) > > Signed-off-by: Fabrice Fontaine > --- > .checkpackageignore | 1 - > ...add-some-_always_inline_-annotations.patch | 75 ------------------- > package/bayer2rgb-neon/bayer2rgb-neon.hash | 2 +- > package/bayer2rgb-neon/bayer2rgb-neon.mk | 2 +- > 4 files changed, 2 insertions(+), 78 deletions(-) > delete mode 100644 package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 7 16:24:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 17:24:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-rpds-py: bump to version 0.17.1 In-Reply-To: <20240205165353.515894-1-james.hilliard1@gmail.com> References: <20240205165353.515894-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-05 09:53 -0700, James Hilliard spake thusly: > Signed-off-by: James Hilliard > --- > package/python-rpds-py/python-rpds-py.hash | 2 +- > package/python-rpds-py/python-rpds-py.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/python-rpds-py/python-rpds-py.hash b/package/python-rpds-py/python-rpds-py.hash > index b04aa210d3..4650d9c385 100644 > --- a/package/python-rpds-py/python-rpds-py.hash > +++ b/package/python-rpds-py/python-rpds-py.hash > @@ -1,4 +1,4 @@ > # Locally calculated after vendoring > -sha256 87361601241744fff6235e35050addfe34d00508172d2bd4f178193a28727287 rpds_py-0.12.0.tar.gz > +sha256 760b05720269195d86071ac7cf627b3a4ab9366680d8d449a6a63b84d96a5bc0 rpds_py-0.17.1.tar.gz > # Locally computed sha256 checksums > sha256 314e4e91be3baa93c0fb4bccc9e4e97cd643eb839b065af921782c2175fe9909 LICENSE > diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk > index 6f71d02047..80670f2e4f 100644 > --- a/package/python-rpds-py/python-rpds-py.mk > +++ b/package/python-rpds-py/python-rpds-py.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RPDS_PY_VERSION = 0.12.0 > +PYTHON_RPDS_PY_VERSION = 0.17.1 Your previous patch bumping to 0.16.2 was still in patchwork and not marked superseded, so that's what Arnout was looking at yet=sterday; we missed your newer version bump. Be sure to mark your superseded patches as such in patchwork, it will help reduce the load. Applied to master, after fixing the conflicts, thanks. Also, as discussed previously with Antoine, rpds-py is currently 64-bit only and breaks on 32-bit architectures. Could you look into fixing that by making it "depends on BR2_ARCH_IS_64" (and propagate that dependency) until it eventually gets fixed upstream (and maybe work with them)? Regards, Yann E. MORIN. > PYTHON_RPDS_PY_SOURCE = rpds_py-$(PYTHON_RPDS_PY_VERSION).tar.gz > -PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/75/be/e3f366aa4cd1e3a814f136773e506fc5423eff903ef0372a251df34e6e45 > +PYTHON_RPDS_PY_SITE = https://files.pythonhosted.org/packages/b7/0a/e3bdcc977e6db3bf32a3f42172f583adfa7c3604091a03d512333e0161fe > PYTHON_RPDS_PY_SETUP_TYPE = maturin > PYTHON_RPDS_PY_LICENSE = MIT > PYTHON_RPDS_PY_LICENSE_FILES = LICENSE > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:34 +0100 Subject: [Buildroot] [git commit] package/bayer2rgb-neon: fix aarch64 build with BR2_OPTIMIZE_0 Message-ID: <20240207162449.B16EA87623@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13f8df8ed6e69f102d71d2040176b9374ff81706 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with aarch64 and BR2_OPTIMIZE_0 raised since commit 0512910e4901edcb78bb1daa4eb3be9bdc4dc8a9: src/convert-neon-body-bayer8.inc.h: In function 'bayer2rgb_convert_neon': src/convert-neon.c:233:17: error: third argument to '__builtin_prefetch' must be a constant 233 | __builtin_prefetch(((void const *)(_addr)) + 64, 0, (_lvl)); \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/convert-neon-body-bayer8.inc.h:8:9: note: in expansion of macro 'do_prefetch' 8 | do_prefetch(&in[+1*stride - 1], (rows_per_loop) < 3 ? 3 : 0); | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/307c1c448becd99dfba3a17b3ef816db0bb5cad6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/bayer2rgb-neon/bayer2rgb-neon.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/bayer2rgb-neon/bayer2rgb-neon.mk b/package/bayer2rgb-neon/bayer2rgb-neon.mk index 212fe76766..5147a985e8 100644 --- a/package/bayer2rgb-neon/bayer2rgb-neon.mk +++ b/package/bayer2rgb-neon/bayer2rgb-neon.mk @@ -19,6 +19,14 @@ ifeq ($(BR2_arm),y) BAYER2RGB_NEON_CFLAGS += -mfpu=neon endif +# __builtin_prefetch() third argument must be a constant, but +# bayer2rgb-neon uses a variable, derived from a constant, so some +# optimization is needed to allow the compiler to turn it into a +# constant, otherwise the build fails +ifeq ($(BR2_OPTIMIZE_0),y) +BAYER2RGB_NEON_CFLAGS += -O1 +endif + BAYER2RGB_NEON_CONF_ENV = CFLAGS="$(BAYER2RGB_NEON_CFLAGS)" $(eval $(autotools-package)) From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:35 +0100 Subject: [Buildroot] [git commit] package/bayer2rgb-neon: bump to latest commit Message-ID: <20240207162449.BD12D87624@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e591475b4d0c2e2661d3710abd0964b5b42275e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop patch (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...0001-add-some-_always_inline_-annotations.patch | 75 ---------------------- package/bayer2rgb-neon/bayer2rgb-neon.hash | 2 +- package/bayer2rgb-neon/bayer2rgb-neon.mk | 2 +- 4 files changed, 2 insertions(+), 78 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 93489b5e0a..d099fd3761 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -178,7 +178,6 @@ package/bandwidthd/0001-src-bandwidthd.h-fix-build-with-gcc-10.patch Upstream package/bash/0001-input.h-add-missing-include-on-stdio.h.patch Upstream package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch Upstream package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch Upstream -package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch Upstream package/bc/0001-bc-use-MAKEINFO-variable-for-docs.patch Upstream package/bc/0002-notice-read-and-write-errors-on-input-and-output.patch Upstream package/bc/0003-dc-fix-exit-code-of-q-command.patch Upstream diff --git a/package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch b/package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch deleted file mode 100644 index 281f90c875..0000000000 --- a/package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 4e5d8be1b0d18453b76fca2c5139222a071dd207 Mon Sep 17 00:00:00 2001 -From: Enrico Scholz -Date: Mon, 4 Jul 2022 12:05:30 +0200 -Subject: [PATCH] add some _always_inline_ annotations - -enforce inlining to fix build errors with '-Og' - -fixes #1 - -Signed-off-by: Enrico Scholz -[Retrieved from: -https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb/-/commit/4e5d8be1b0d18453b76fca2c5139222a071dd207] -Signed-off-by: Fabrice Fontaine ---- - src/convert.c | 5 +++-- - src/main.c | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/convert.c b/src/convert.c -index c852a14..ec77040 100644 ---- a/src/convert.c -+++ b/src/convert.c -@@ -17,8 +17,9 @@ - #include - #include - #include "bayer2rgb.h" -+#include "compiler.h" - --static bool have_neon() -+inline static _always_inline_ bool have_neon() - { - #ifdef HAVE_NEON - return true; -@@ -27,7 +28,7 @@ static bool have_neon() - #endif - } - --static bool have_cplusplus() -+inline static _always_inline_ bool have_cplusplus() - { - #ifdef HAVE_CPLUSPLUS - return true; -diff --git a/src/main.c b/src/main.c -index 841a142..087e8e5 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -33,6 +33,7 @@ - - #include "src/bayer2rgb.h" - #include "src/bayer2rgb-cmdline.h" -+#include "src/compiler.h" - - #define BPP_TO_BYTE(_bpp) (((_bpp) + 7) / 8) - -@@ -68,7 +69,7 @@ struct x_image_out { - size_t total_size; - }; - --inline static bool have_neon(void) -+inline static _always_inline_ bool have_neon(void) - { - #ifdef HAVE_NEON - return true; -@@ -77,7 +78,7 @@ inline static bool have_neon(void) - #endif - } - --static bool have_cplusplus() -+inline static _always_inline_ bool have_cplusplus() - { - #ifdef HAVE_CPLUSPLUS - return true; --- -GitLab - diff --git a/package/bayer2rgb-neon/bayer2rgb-neon.hash b/package/bayer2rgb-neon/bayer2rgb-neon.hash index 26a14fcb51..7b26073de0 100644 --- a/package/bayer2rgb-neon/bayer2rgb-neon.hash +++ b/package/bayer2rgb-neon/bayer2rgb-neon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 edf451dbb52ad67eb35f9043390bd75ea7228d493c99184aae80b3bd27beab62 bayer2rgb-neon-15feb1115b4828488cc36d09f625e23e8b6a0ec5-br1.tar.gz +sha256 35b38a40e98e9fa7fb8042c718f460fb806e916d2bf3e9721c07bbe4b42faad5 bayer2rgb-neon-bc950b3398ba034fe5cc39f625796a6111cdb87f-br1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bayer2rgb-neon/bayer2rgb-neon.mk b/package/bayer2rgb-neon/bayer2rgb-neon.mk index 5147a985e8..61d6334979 100644 --- a/package/bayer2rgb-neon/bayer2rgb-neon.mk +++ b/package/bayer2rgb-neon/bayer2rgb-neon.mk @@ -4,7 +4,7 @@ # ################################################################################ -BAYER2RGB_NEON_VERSION = 15feb1115b4828488cc36d09f625e23e8b6a0ec5 +BAYER2RGB_NEON_VERSION = bc950b3398ba034fe5cc39f625796a6111cdb87f BAYER2RGB_NEON_SITE = https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb.git BAYER2RGB_NEON_SITE_METHOD = git BAYER2RGB_NEON_LICENSE = GPL-3.0 From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:44 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:44 +0100 Subject: [Buildroot] [git commit] package/tio: bump to version 2.7 Message-ID: <20240207162621.45DA98763E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b33d7a47dd41fed5364a398320c2b7d0687ba5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Sergio Prado Signed-off-by: Thomas Petazzoni --- package/tio/tio.hash | 4 ++-- package/tio/tio.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tio/tio.hash b/package/tio/tio.hash index cb0311a752..02699fdeb4 100644 --- a/package/tio/tio.hash +++ b/package/tio/tio.hash @@ -1,5 +1,5 @@ -# From https://github.com/tio/tio/releases/download/v1.47/tio-1.47.tar.xz.sha256sum: -sha256 6f39ac582de747feb9a64c14e6b378c61cb0c3bfa6639e62050022c1b7f5c544 tio-1.47.tar.xz +# From https://github.com/tio/tio/releases/download/v2.7/tio-2.7.tar.xz.sha256sum: +sha256 bf8fe434848c2c1b6540af0b42503c986068176ddc1a988cf02e521e7de5daa5 tio-2.7.tar.xz # Hash for license files: sha256 9248dee77ee136321f24556a96e07ff8f90461013941884a9defd0ac825ef131 LICENSE diff --git a/package/tio/tio.mk b/package/tio/tio.mk index 0035ce445e..d7b554ee84 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIO_VERSION = 1.47 +TIO_VERSION = 2.7 TIO_SOURCE = tio-$(TIO_VERSION).tar.xz TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Wed Feb 7 16:24:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:24:50 +0100 Subject: [Buildroot] [git commit] configs: drop redundant configuration for no MMU platforms Message-ID: <20240207162621.5C21F8763F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98a49edda69e868c95bd8cf4e923eb0bd0a65ff7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The package/busybox/busybox-minimal.config is the default configuration for MMU-less systems, so the setting is redundant and can be removed without effect. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- configs/canaan_kd233_defconfig | 1 - configs/imxrt1050-evk_defconfig | 3 --- configs/qemu_m68k_mcf5208_defconfig | 3 --- configs/qemu_riscv64_nommu_virt_defconfig | 3 --- configs/qemu_xtensa_lx60_nommu_defconfig | 3 --- configs/sipeed_maix_bit_defconfig | 1 - configs/sipeed_maix_bit_sdcard_defconfig | 1 - configs/sipeed_maix_dock_defconfig | 1 - configs/sipeed_maix_dock_sdcard_defconfig | 1 - configs/sipeed_maix_go_defconfig | 1 - configs/sipeed_maix_go_sdcard_defconfig | 1 - configs/sipeed_maixduino_defconfig | 1 - configs/sipeed_maixduino_sdcard_defconfig | 1 - configs/stm32f429_disco_xip_defconfig | 1 - configs/stm32f469_disco_sd_defconfig | 1 - configs/stm32f469_disco_xip_defconfig | 1 - configs/stm32f769_disco_sd_defconfig | 1 - 17 files changed, 25 deletions(-) diff --git a/configs/canaan_kd233_defconfig b/configs/canaan_kd233_defconfig index 3335195f25..672fee57a1 100644 --- a/configs/canaan_kd233_defconfig +++ b/configs/canaan_kd233_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/imxrt1050-evk_defconfig b/configs/imxrt1050-evk_defconfig index 947abe5df2..b493c11098 100644 --- a/configs/imxrt1050-evk_defconfig +++ b/configs/imxrt1050-evk_defconfig @@ -23,9 +23,6 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="16M" -# NOMMU Busybox -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index e35f3546fe..0c95756a8e 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -29,9 +29,6 @@ BR2_LINUX_KERNEL_VMLINUX=y BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -# use minimal busybox with hush and networking tools -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index 2a0aea01d7..9999bcf7f3 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -6,9 +6,6 @@ BR2_RISCV_64=y # Linux headers same as kernel BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y -# Busybox with hush -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # System BR2_TARGET_GENERIC_GETTY=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index c3224576f7..d1d59b9525 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -4,9 +4,6 @@ BR2_XTENSA_CUSTOM=y BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz" # BR2_XTENSA_USE_MMU is not set -# Use minimal busybox with hush and networking tools -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" diff --git a/configs/sipeed_maix_bit_defconfig b/configs/sipeed_maix_bit_defconfig index 03ae57e1b7..e45996879a 100644 --- a/configs/sipeed_maix_bit_defconfig +++ b/configs/sipeed_maix_bit_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig index 720d216920..7e293e5a49 100644 --- a/configs/sipeed_maix_bit_sdcard_defconfig +++ b/configs/sipeed_maix_bit_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_bit" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maix_dock_defconfig b/configs/sipeed_maix_dock_defconfig index 045967f589..0352382fcd 100644 --- a/configs/sipeed_maix_dock_defconfig +++ b/configs/sipeed_maix_dock_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig index eb7294d559..20658813ba 100644 --- a/configs/sipeed_maix_dock_sdcard_defconfig +++ b/configs/sipeed_maix_dock_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_dock" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maix_go_defconfig b/configs/sipeed_maix_go_defconfig index c320d19703..27272dac4c 100644 --- a/configs/sipeed_maix_go_defconfig +++ b/configs/sipeed_maix_go_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig index d2392ba822..1bc12dd058 100644 --- a/configs/sipeed_maix_go_sdcard_defconfig +++ b/configs/sipeed_maix_go_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_go" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/sipeed_maixduino_defconfig b/configs/sipeed_maixduino_defconfig index ba83dd76ee..3e04ea3a04 100644 --- a/configs/sipeed_maixduino_defconfig +++ b/configs/sipeed_maixduino_defconfig @@ -29,7 +29,6 @@ BR2_LINUX_KERNEL_IMAGE_NAME="loader.bin" # Packages BR2_PACKAGE_HOST_PYTHON_KFLASH=y -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig index 09bc1b4ab1..253ee7d7cf 100644 --- a/configs/sipeed_maixduino_sdcard_defconfig +++ b/configs/sipeed_maixduino_sdcard_defconfig @@ -31,7 +31,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maixduino" # Packages -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set # Filesystem diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index d4e000487a..99ae8cc753 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index 8b10bc6741..66840a7742 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index e362a99851..6e6ead0fde 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/stmicroelectronics/common/stm32f4xx/busybox.fragment" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/stm32f769_disco_sd_defconfig b/configs/stm32f769_disco_sd_defconfig index 2ae27fb2d8..725c985ec0 100644 --- a/configs/stm32f769_disco_sd_defconfig +++ b/configs/stm32f769_disco_sd_defconfig @@ -13,7 +13,6 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f769-disco" -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" From arnout at mind.be Wed Feb 7 16:27:19 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:27:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sentry-sdk: bump to version 1.39.2 In-Reply-To: <20240111060552.3028285-1-james.hilliard1@gmail.com> References: <20240111060552.3028285-1-james.hilliard1@gmail.com> Message-ID: <43277e98-686d-40c5-a88c-ce1ef879a230@mind.be> On 11/01/2024 07:05, James Hilliard wrote: > License changed to MIT: > https://github.com/getsentry/sentry-python/commit/9ed5e27636d05bc30cd363c19a032ace8447f5ad > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-sentry-sdk/python-sentry-sdk.hash | 6 +++--- > package/python-sentry-sdk/python-sentry-sdk.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash > index 38ae3380a8..2534a48221 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 ea2d728c847879f66c3d24cfbade2026 sentry-sdk-1.12.1.tar.gz > -sha256 5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c sentry-sdk-1.12.1.tar.gz > +md5 94ba9002bbfaf8c443c496b05bbc32eb sentry-sdk-1.39.2.tar.gz > +sha256 24c83b0b41c887d33328a9166f5950dc37ad58f01c9f2fbff6b87a6f1094170c sentry-sdk-1.39.2.tar.gz > # Locally computed sha256 checksums > -sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c 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 c3092a5184..f1c5648f07 100644 > --- a/package/python-sentry-sdk/python-sentry-sdk.mk > +++ b/package/python-sentry-sdk/python-sentry-sdk.mk > @@ -4,11 +4,11 @@ > # > ################################################################################ > > -PYTHON_SENTRY_SDK_VERSION = 1.12.1 > +PYTHON_SENTRY_SDK_VERSION = 1.39.2 > PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz > -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/32/03/496a7c8313658dec419303e8add969f314b7538c29f4ec5ebe6d86fb8ce2 > +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/66/90/9deac5c137e9f0ede908757d886af77938ef28f94b24decedbdf98f1ca4d > PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools > -PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause > +PYTHON_SENTRY_SDK_LICENSE = MIT > PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE > > $(eval $(python-package)) From dario.binacchi at amarulasolutions.com Wed Feb 7 16:28:45 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 17:28:45 +0100 Subject: [Buildroot] [PATCH 2/2] package/uuu: bump to version 1.5.165 In-Reply-To: References: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> <20240206175330.570115-2-dario.binacchi@amarulasolutions.com> Message-ID: Yann, All On Wed, Feb 7, 2024 at 10:56?AM Yann E. MORIN wrote: > > Dario, All, > > On 2024-02-06 18:53 +0100, Dario Binacchi spake thusly: > > It requires the host-tinyxml2 package. > > > > The hash of README.md has changed because a reference to the tinyxml2 > > license has been added: > > > > + - tinyxml (zlib license) is from https://github.com/leethomason/tinyxml2 > > Thanks for explaining the hash change. :-) > > I wonder if it really makes sense to keep using the README file as a > license file in Buildroot. I agree with you. The license of the package is located in the file LICENSE. Additionally, by removing the file README.md from the license files, we simplify the bump to new versions. So, if you agree, I will submit a patch for the removal of README.md from the license files. Thanks and regards, Dario > Indeed, the licensing terms are for > third-party libraries uuu links to, and even though they are bundled in > the source tree of uuu|mfgtools, they are not used by Buildroot as we > use the ones we build. > > Thoughts? > > > Release notes: > > https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.163 > > https://github.com/nxp-imx/mfgtools/releases/tag/uuu_1.5.165 > > > > Signed-off-by: Dario Binacchi > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > > > --- > > package/uuu/uuu.hash | 4 ++-- > > package/uuu/uuu.mk | 4 ++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash > > index 20816b5081db..c231d5d729f0 100644 > > --- a/package/uuu/uuu.hash > > +++ b/package/uuu/uuu.hash > > @@ -1,4 +1,4 @@ > > # locally computed > > -sha256 6972c7a1e76d60a22212913a8867b737104410c2a47ad88c8af460bd4885ec09 uuu_source-uuu_1.5.141.tar.gz > > +sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz > > sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE > > -sha256 2d872c6e5aaea15ec1932bfb378fb62e24ee7ec399fe7f998f03d9b728215335 README.md > > +sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md > > diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk > > index 93c748ee46d8..d1bae61f528e 100644 > > --- a/package/uuu/uuu.mk > > +++ b/package/uuu/uuu.mk > > @@ -4,11 +4,11 @@ > > # > > ################################################################################ > > > > -UUU_VERSION = 1.5.141 > > +UUU_VERSION = 1.5.165 > > UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz > > UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) > > UUU_LICENSE = BSD 3-Clause "New" or "Revised" License > > UUU_LICENSE_FILES = LICENSE README.md > > -HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd > > +HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd host-tinyxml2 > > > > $(eval $(host-cmake-package)) > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From yann.morin.1998 at free.fr Wed Feb 7 16:34:52 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 17:34:52 +0100 Subject: [Buildroot] [PATCH 2/2] package/uuu: bump to version 1.5.165 In-Reply-To: References: <20240206175330.570115-1-dario.binacchi@amarulasolutions.com> <20240206175330.570115-2-dario.binacchi@amarulasolutions.com> Message-ID: Dario, All, On 2024-02-07 17:28 +0100, Dario Binacchi spake thusly: > On Wed, Feb 7, 2024 at 10:56?AM Yann E. MORIN wrote: > > I wonder if it really makes sense to keep using the README file as a > > license file in Buildroot. > I agree with you. The license of the package is located in the file LICENSE. > Additionally, by removing the file README.md from the license files, we > simplify the bump to new versions. > So, if you agree, I will submit a patch for the removal of README.md from > the license files. Yes, please go ahead! Just sumarise the situation in the commit log. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From arnout at mind.be Wed Feb 7 16:36:44 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:36:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm-git-archive: bump to version 1.4.1 In-Reply-To: <20240111062711.3041375-1-james.hilliard1@gmail.com> References: <20240111062711.3041375-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 07:27, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > .../python-setuptools-scm-git-archive.hash | 4 ++-- > .../python-setuptools-scm-git-archive.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash > index 40b4b0e7f7..ce790a3d59 100644 > --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash > +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/setuptools-scm-git-archive/json > -md5 df3933d33c49c5d9aca06715b4c65370 setuptools_scm_git_archive-1.4.tar.gz > -sha256 b048b27b32e1e76ec865b0caa4bb85df6ddbf4697d6909f567ac36709f6ef2f0 setuptools_scm_git_archive-1.4.tar.gz > +md5 cfcdab6edbe6b710ab24ad355e7cf7a3 setuptools_scm_git_archive-1.4.1.tar.gz > +sha256 c418bc77b3974d3ac65f268f058f23e01dc5f991f2233128b0e16a69de227b09 setuptools_scm_git_archive-1.4.1.tar.gz > # Locally computed sha256 checksums > sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE > diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > index 278fc972e5..153343788b 100644 > --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4 > +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4.1 > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SOURCE = setuptools_scm_git_archive-$(PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION).tar.gz > -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/69/5f/7135eec07395c51d3dd6899251b277405ecc2f8f7a80ef80a483e3c5a2bd > +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/47/d6/c9a8d1ea95613f79b9b914cf9a5e8e420b7625fc54137c1d7c9cbbda5adf > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 7 16:37:57 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:37:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools-scm: bump to version 8.0.4 In-Reply-To: <20240111063622.3047258-1-james.hilliard1@gmail.com> References: <20240111063622.3047258-1-james.hilliard1@gmail.com> Message-ID: <143e5206-5b0a-4860-a575-44fbef70c582@mind.be> On 11/01/2024 07:36, James Hilliard wrote: > Migrate from setuptools to intree pep517 build backend. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-setuptools-scm/python-setuptools-scm.hash | 6 +++--- > package/python-setuptools-scm/python-setuptools-scm.mk | 9 +++++---- > 2 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash > index 8cfe07d1d9..1a884dbbbf 100644 > --- a/package/python-setuptools-scm/python-setuptools-scm.hash > +++ b/package/python-setuptools-scm/python-setuptools-scm.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json > -md5 158dc741637fb4fa4b955c62bd2c08be setuptools_scm-7.1.0.tar.gz > -sha256 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 setuptools_scm-7.1.0.tar.gz > -# sha256 locally computed > +md5 a05e98ab9ae447e173f0c747e0d49e81 setuptools-scm-8.0.4.tar.gz > +sha256 b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7 setuptools-scm-8.0.4.tar.gz > +# Locally computed sha256 checksums > sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE > diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk > index 5a35c35a1f..4cbf914690 100644 > --- a/package/python-setuptools-scm/python-setuptools-scm.mk > +++ b/package/python-setuptools-scm/python-setuptools-scm.mk > @@ -4,15 +4,16 @@ > # > ################################################################################ > > -PYTHON_SETUPTOOLS_SCM_VERSION = 7.1.0 > -PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz > -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/98/12/2c1e579bb968759fc512391473340d0661b1a8c96a59fb7c65b02eec1321 > +PYTHON_SETUPTOOLS_SCM_VERSION = 8.0.4 > +PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools-scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz > +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/eb/b1/0248705f10f6de5eefe7ff93e399f7192257b23df4d431d2f5680bb2778f > PYTHON_SETUPTOOLS_SCM_LICENSE = MIT > PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE > -PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools > +PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = pep517 > > HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = \ > host-python-packaging \ > + host-python-setuptools \ > host-python-typing-extensions > > $(eval $(host-python-package)) From arnout at mind.be Wed Feb 7 16:38:24 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:38:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-setuptools: bump to version 69.0.3 In-Reply-To: <20240111064140.3051598-1-james.hilliard1@gmail.com> References: <20240111064140.3051598-1-james.hilliard1@gmail.com> Message-ID: <01de635a-74e6-4784-9b1a-d5b357a41603@mind.be> On 11/01/2024 07:41, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-setuptools/python-setuptools.hash | 7 ++++--- > package/python-setuptools/python-setuptools.mk | 4 ++-- > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash > index 6e1df42e3f..7f13ac3896 100644 > --- a/package/python-setuptools/python-setuptools.hash > +++ b/package/python-setuptools/python-setuptools.hash > @@ -1,4 +1,5 @@ > -# From https://pypi.org/pypi/setuptools/json > -md5 d967ca2ba7f46db887daee2d5c9bd6a2 setuptools-68.2.2.tar.gz > -sha256 4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 setuptools-68.2.2.tar.gz > +# md5, sha256 from https://pypi.org/pypi/setuptools/json > +md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz > +sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz > +# Locally computed sha256 checksums > sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE > diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk > index f26f427ccc..0aea3c6cfa 100644 > --- a/package/python-setuptools/python-setuptools.mk > +++ b/package/python-setuptools/python-setuptools.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SETUPTOOLS_VERSION = 68.2.2 > +PYTHON_SETUPTOOLS_VERSION = 69.0.3 > PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz > -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9 > +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 > PYTHON_SETUPTOOLS_LICENSE = MIT > PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE > PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From thomas.petazzoni at bootlin.com Wed Feb 7 16:29:13 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:29:13 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: remove checking the CPE database Message-ID: <20240207163840.BB1CF87653@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2bf75464d6027b8079431c34410ab9d070b818f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We currently check the CPE database to see if the CPE ID we use (including the version) is already in the database. However, the version part of the CPE ID is not actually used for CVE matching. Instead, the CVEs have a range of versions associated with them and we match against those ranges. In addition, NVD is moving to a new API for accessing the CPE database. It will not longer be possible to simply download all the CPE IDs, and due to rate limiting, the download will have to be done in several queries. Since all of this is anyway of limited use, drop the CPE database lookup entirely. Instead, as long as a CPE ID is defined in a package, it is considered OK, without any checks. Signed-off-by: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- support/scripts/pkg-stats | 54 ++--------------------------------------------- 1 file changed, 2 insertions(+), 52 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 05f0cd9e4a..7835cb3d62 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -28,10 +28,6 @@ import re import subprocess import json import sys -import time -import gzip -import xml.etree.ElementTree -import requests brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")) @@ -40,7 +36,6 @@ from getdeveloperlib import parse_developers # noqa: E402 INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)") URL_RE = re.compile(r"\s*https?://\S*\s*$") -CPEDB_URL = "https://static.nvd.nist.gov/feeds/xml/cpe/dictionary/official-cpe-dictionary_v2.3.xml.gz" RM_API_STATUS_ERROR = 1 RM_API_STATUS_FOUND_BY_DISTRO = 2 @@ -282,8 +277,7 @@ class Package: if var in self.all_cpeids: self.cpeid = self.all_cpeids[var] - # Set a preliminary status, it might be overridden by check_package_cpes() - self.status['cpe'] = ("warning", "not checked against CPE dictionary") + self.status['cpe'] = ("ok", "(not checked against CPE dictionary)") else: self.status['cpe'] = ("error", "no verified CPE identifier") @@ -674,47 +668,6 @@ def check_package_cves(nvd_path, packages): pkg.status['cve'] = ("ok", "not affected by CVEs") -def check_package_cpes(nvd_path, packages): - class CpeXmlParser: - cpes = [] - - def start(self, tag, attrib): - if tag == "{http://scap.nist.gov/schema/cpe-extension/2.3}cpe23-item": - self.cpes.append(attrib['name']) - - def close(self): - return self.cpes - - print("CPE: Setting up NIST dictionary") - if not os.path.exists(os.path.join(nvd_path, "cpe")): - os.makedirs(os.path.join(nvd_path, "cpe")) - - cpe_dict_local = os.path.join(nvd_path, "cpe", os.path.basename(CPEDB_URL)) - if not os.path.exists(cpe_dict_local) or os.stat(cpe_dict_local).st_mtime < time.time() - 86400: - print("CPE: Fetching xml manifest from [" + CPEDB_URL + "]") - cpe_dict = requests.get(CPEDB_URL) - open(cpe_dict_local, "wb").write(cpe_dict.content) - - print("CPE: Unzipping xml manifest...") - nist_cpe_file = gzip.GzipFile(fileobj=open(cpe_dict_local, 'rb')) - - parser = xml.etree.ElementTree.XMLParser(target=CpeXmlParser()) - while True: - c = nist_cpe_file.read(1024*1024) - if not c: - break - parser.feed(c) - cpes = parser.close() - - for p in packages: - if not p.cpeid: - continue - if p.cpeid in cpes: - p.status['cpe'] = ("ok", "verified CPE identifier") - else: - p.status['cpe'] = ("error", "CPE version unknown in CPE database") - - def calculate_stats(packages): stats = defaultdict(int) stats['packages'] = len(packages) @@ -1309,7 +1262,7 @@ def parse_args(): parser.add_argument('--nvd-path', dest='nvd_path', help='Path to the local NVD database', type=resolvepath) parser.add_argument('--disable', type=list_str, - help='Features to disable, comma-separated (cve, upstream, url, cpe, warning)', + help='Features to disable, comma-separated (cve, upstream, url, warning)', default=[]) args = parser.parse_args() if not args.html and not args.json: @@ -1372,9 +1325,6 @@ def __main__(): if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) - if "cpe" not in args.disable and args.nvd_path: - print("Checking packages CPEs") - check_package_cpes(args.nvd_path, packages) print("Calculate stats") stats = calculate_stats(packages) if args.html: From thomas.petazzoni at bootlin.com Wed Feb 7 16:29:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:29:34 +0100 Subject: [Buildroot] [git commit] support/scripts/cve.py: switch from NVD to FKIE for the JSON files Message-ID: <20240207163840.D093F8763D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=22b69455526f3d12744bc285a33b74bbad58e4bc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master NVD will deprecate the v1.1 API which allows us to download the full database as individual JSON files. Instead, there's a horribly crappy API that is extremely slow and subject to race conditions. Fortunately, there is a project, Fraunhofer FKIE - Cyber Analysis and Defense [1], that goes through the effort of adapting to this new API and regenerating the convenient JSON files. The JSON files and meta files are re-generated daily. Instead of implementing the NVD v2 API, we decided to just use the JSON files generatd by fkie-cad. That saves us the effort of solving the race conditions, devising a cache mechanism that works, handling the frequent gateway timeouts on the NVD servers, dealing with the rate limiting, and keeping up with changes in the API. Switch to this repository on github as NVD_BASE_URL. The file name is also slightly different (CVE-20XX.json instead of nvdcve-1.1-20XX.json). The fkie-cad repository compresses with xz instead of gz. Therefore: - rename the filename variables to _xz instead of _gz; - use xz as a subprocess because there is no xz decompressor in Python stdlib. [1] https://www.fkie.fraunhofer.de/en/departments/cad.html Cc: Daniel Lang Signed-off-by: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- support/scripts/cve.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 7cd6fce4d8..46c384955c 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -22,7 +22,7 @@ import os import requests # URL checking import distutils.version import time -import gzip +import subprocess import sys import operator @@ -41,8 +41,7 @@ except ImportError: sys.path.append('utils/') NVD_START_YEAR = 2002 -NVD_JSON_VERSION = "1.1" -NVD_BASE_URL = "https://nvd.nist.gov/feeds/json/cve/" + NVD_JSON_VERSION +NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" ops = { '>=': operator.ge, @@ -83,15 +82,15 @@ class CVE: @staticmethod def download_nvd_year(nvd_path, year): - metaf = "nvdcve-%s-%s.meta" % (NVD_JSON_VERSION, year) + metaf = "CVE-%s.meta" % year path_metaf = os.path.join(nvd_path, metaf) - jsonf_gz = "nvdcve-%s-%s.json.gz" % (NVD_JSON_VERSION, year) - path_jsonf_gz = os.path.join(nvd_path, jsonf_gz) + jsonf_xz = "CVE-%s.json.xz" % year + path_jsonf_xz = os.path.join(nvd_path, jsonf_xz) # If the database file is less than a day old, we assume the NVD data # locally available is recent enough. - if os.path.exists(path_jsonf_gz) and os.stat(path_jsonf_gz).st_mtime >= time.time() - 86400: - return path_jsonf_gz + if os.path.exists(path_jsonf_xz) and os.stat(path_jsonf_xz).st_mtime >= time.time() - 86400: + return path_jsonf_xz # If not, we download the meta file url = "%s/%s" % (NVD_BASE_URL, metaf) @@ -104,19 +103,19 @@ class CVE: # we need to re-download the database. # If the database does not exist locally, we need to redownload it in # any case. - if os.path.exists(path_metaf) and os.path.exists(path_jsonf_gz): + if os.path.exists(path_metaf) and os.path.exists(path_jsonf_xz): meta_known = open(path_metaf, "r").read() if page_meta.text == meta_known: - return path_jsonf_gz + return path_jsonf_xz # Grab the compressed JSON NVD, and write files to disk - url = "%s/%s" % (NVD_BASE_URL, jsonf_gz) + url = "%s/%s" % (NVD_BASE_URL, jsonf_xz) print("Getting %s" % url) page_json = requests.get(url) page_json.raise_for_status() - open(path_jsonf_gz, "wb").write(page_json.content) + open(path_jsonf_xz, "wb").write(page_json.content) open(path_metaf, "w").write(page_meta.text) - return path_jsonf_gz + return path_jsonf_xz @classmethod def read_nvd_dir(cls, nvd_dir): @@ -128,7 +127,8 @@ class CVE: for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - content = ijson.items(gzip.GzipFile(filename), 'CVE_Items.item') + uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) + content = ijson.items(uncompressed, 'CVE_Items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise From thomas.petazzoni at bootlin.com Wed Feb 7 16:29:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:29:41 +0100 Subject: [Buildroot] [git commit] support/scripts/cve.py: start in 1999 Message-ID: <20240207163840.DBF6787655@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b2d0b466cf79e25d95a06213b803c1554aec2aa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When the CVE lookup was added in commit 4a157be9efac8ba8888e4972f42eda213077152c, the starting year of the JSON files was set to 2002. However, there are also CVEs from 1999, 2000 and 2001. It is not clear why these were skipped back then. Set the start year to 1999 to capture these old CVEs too. Signed-off-by: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- support/scripts/cve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 46c384955c..f12a8048cd 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -40,7 +40,7 @@ except ImportError: sys.path.append('utils/') -NVD_START_YEAR = 2002 +NVD_START_YEAR = 1999 NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" ops = { From arnout at mind.be Wed Feb 7 16:39:50 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:39:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sh: bump to version 2.0.6 In-Reply-To: <20240111064511.3053913-1-james.hilliard1@gmail.com> References: <20240111064511.3053913-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 07:45, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-sh/python-sh.hash | 4 ++-- > package/python-sh/python-sh.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-sh/python-sh.hash b/package/python-sh/python-sh.hash > index a31aacdee1..c0d3f62f12 100644 > --- a/package/python-sh/python-sh.hash > +++ b/package/python-sh/python-sh.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/sh/json > -md5 d60498172876f35aef6303a9cbb8eb11 sh-1.14.3.tar.gz > -sha256 e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7 sh-1.14.3.tar.gz > +md5 aadf37759a9cb4862257cef3cf44a27b sh-2.0.6.tar.gz > +sha256 9b2998f313f201c777e2c0061f0b1367497097ef13388595be147e2a00bf7ba1 sh-2.0.6.tar.gz > # Locally computed sha256 checksums > sha256 d8491c6e236568d04f7c8c07f2f1b8f5d142706dab6ab88f6e0d2dd476b6c706 LICENSE.txt > diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk > index 781de88ab1..af4da3f6c9 100644 > --- a/package/python-sh/python-sh.mk > +++ b/package/python-sh/python-sh.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SH_VERSION = 1.14.3 > +PYTHON_SH_VERSION = 2.0.6 > PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz > -PYTHON_SH_SITE = https://files.pythonhosted.org/packages/b7/09/89c28aaf2a49f226fef8587c90c6386bd2cc03a0295bc4ff7fc6ee43c01d > +PYTHON_SH_SITE = https://files.pythonhosted.org/packages/cd/51/7355831d8e1cee8348157d769ccda8a31ca9fa0548e7f93d87837d83866d > PYTHON_SH_SETUP_TYPE = setuptools > PYTHON_SH_LICENSE = MIT > PYTHON_SH_LICENSE_FILES = LICENSE.txt From arnout at mind.be Wed Feb 7 16:38:42 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:38:42 +0100 Subject: [Buildroot] [git commit] package/python-setuptools: bump to version 69.0.3 Message-ID: <20240207164000.CDB6587666@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6b62384e3d2a9e1d200b5b99783bd3d1611175ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-setuptools/python-setuptools.hash | 7 ++++--- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 6e1df42e3f..7f13ac3896 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,5 @@ -# From https://pypi.org/pypi/setuptools/json -md5 d967ca2ba7f46db887daee2d5c9bd6a2 setuptools-68.2.2.tar.gz -sha256 4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 setuptools-68.2.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/setuptools/json +md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz +sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz +# Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index f26f427ccc..0aea3c6cfa 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 68.2.2 +PYTHON_SETUPTOOLS_VERSION = 69.0.3 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From arnout at mind.be Wed Feb 7 16:38:40 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:38:40 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-scm-git-archive: bump to version 1.4.1 Message-ID: <20240207164000.B345A81001@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8bdb470c7b41e7c0425f59a23f78a398dba883fd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- .../python-setuptools-scm-git-archive.hash | 4 ++-- .../python-setuptools-scm-git-archive.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash index 40b4b0e7f7..ce790a3d59 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm-git-archive/json -md5 df3933d33c49c5d9aca06715b4c65370 setuptools_scm_git_archive-1.4.tar.gz -sha256 b048b27b32e1e76ec865b0caa4bb85df6ddbf4697d6909f567ac36709f6ef2f0 setuptools_scm_git_archive-1.4.tar.gz +md5 cfcdab6edbe6b710ab24ad355e7cf7a3 setuptools_scm_git_archive-1.4.1.tar.gz +sha256 c418bc77b3974d3ac65f268f058f23e01dc5f991f2233128b0e16a69de227b09 setuptools_scm_git_archive-1.4.1.tar.gz # Locally computed sha256 checksums sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 278fc972e5..153343788b 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4 +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4.1 PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SOURCE = setuptools_scm_git_archive-$(PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/69/5f/7135eec07395c51d3dd6899251b277405ecc2f8f7a80ef80a483e3c5a2bd +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/47/d6/c9a8d1ea95613f79b9b914cf9a5e8e420b7625fc54137c1d7c9cbbda5adf PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 7 16:38:41 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:38:41 +0100 Subject: [Buildroot] [git commit] package/python-setuptools-scm: bump to version 8.0.4 Message-ID: <20240207164000.C0E2487665@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=03e360c380f5398fe168296284c7cf46318ca425 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Migrate from setuptools to intree pep517 build backend. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-setuptools-scm/python-setuptools-scm.hash | 6 +++--- package/python-setuptools-scm/python-setuptools-scm.mk | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 8cfe07d1d9..1a884dbbbf 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.hash +++ b/package/python-setuptools-scm/python-setuptools-scm.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm/json -md5 158dc741637fb4fa4b955c62bd2c08be setuptools_scm-7.1.0.tar.gz -sha256 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 setuptools_scm-7.1.0.tar.gz -# sha256 locally computed +md5 a05e98ab9ae447e173f0c747e0d49e81 setuptools-scm-8.0.4.tar.gz +sha256 b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7 setuptools-scm-8.0.4.tar.gz +# Locally computed sha256 checksums sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index 5a35c35a1f..4cbf914690 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,15 +4,16 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 7.1.0 -PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/98/12/2c1e579bb968759fc512391473340d0661b1a8c96a59fb7c65b02eec1321 +PYTHON_SETUPTOOLS_SCM_VERSION = 8.0.4 +PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools-scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/eb/b1/0248705f10f6de5eefe7ff93e399f7192257b23df4d431d2f5680bb2778f PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE -PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools +PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = pep517 HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = \ host-python-packaging \ + host-python-setuptools \ host-python-typing-extensions $(eval $(host-python-package)) From arnout at mind.be Wed Feb 7 16:40:10 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:40:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-simplejson: bump to version 3.19.2 In-Reply-To: <20240111065011.3057364-1-james.hilliard1@gmail.com> References: <20240111065011.3057364-1-james.hilliard1@gmail.com> Message-ID: <8275fdf4-c20b-4f30-b6bd-a3ef1c03575c@mind.be> On 11/01/2024 07:50, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-simplejson/python-simplejson.hash | 4 ++-- > package/python-simplejson/python-simplejson.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash > index a8b946b2c4..9f96f99bf4 100644 > --- a/package/python-simplejson/python-simplejson.hash > +++ b/package/python-simplejson/python-simplejson.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/simplejson/json > -md5 ecd07fca7a7fa0bcc9acdf9d82e41eb1 simplejson-3.18.1.tar.gz > -sha256 746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa simplejson-3.18.1.tar.gz > +md5 3b334627d870a3c849e1322d18a7bfe7 simplejson-3.19.2.tar.gz > +sha256 9eb442a2442ce417801c912df68e1f6ccfcd41577ae7274953ab3ad24ef7d82c simplejson-3.19.2.tar.gz > # Locally computed sha256 checksums > sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt > diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk > index 5782626387..d5ba3948b7 100644 > --- a/package/python-simplejson/python-simplejson.mk > +++ b/package/python-simplejson/python-simplejson.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SIMPLEJSON_VERSION = 3.18.1 > +PYTHON_SIMPLEJSON_VERSION = 3.19.2 > PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz > -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/0f/a0/79d2bec499cb53678bc20d41f9706ca02777f0876efa9b29a69fb3d55dfd > +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/79/79/3ccb95bb4154952532f280f7a41979fbfb0fbbaee4d609810ecb01650afa > PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT > PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt > PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project From thomas.petazzoni at bootlin.com Wed Feb 7 16:40:32 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:40:32 +0100 Subject: [Buildroot] [PATCH 1/1] configs: drop redundant configuration for no MMU platforms In-Reply-To: <20240207161704.2981151-1-dario.binacchi@amarulasolutions.com> References: <20240207161704.2981151-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207174032.5de5fb81@windsurf> On Wed, 7 Feb 2024 17:17:04 +0100 Dario Binacchi wrote: > The package/busybox/busybox-minimal.config is the default configuration > for MMU-less systems, so the setting is redundant and can be removed > without effect. > > Signed-off-by: Dario Binacchi > --- > configs/canaan_kd233_defconfig | 1 - > configs/imxrt1050-evk_defconfig | 3 --- > configs/qemu_m68k_mcf5208_defconfig | 3 --- > configs/qemu_riscv64_nommu_virt_defconfig | 3 --- > configs/qemu_xtensa_lx60_nommu_defconfig | 3 --- > configs/sipeed_maix_bit_defconfig | 1 - > configs/sipeed_maix_bit_sdcard_defconfig | 1 - > configs/sipeed_maix_dock_defconfig | 1 - > configs/sipeed_maix_dock_sdcard_defconfig | 1 - > configs/sipeed_maix_go_defconfig | 1 - > configs/sipeed_maix_go_sdcard_defconfig | 1 - > configs/sipeed_maixduino_defconfig | 1 - > configs/sipeed_maixduino_sdcard_defconfig | 1 - > configs/stm32f429_disco_xip_defconfig | 1 - > configs/stm32f469_disco_sd_defconfig | 1 - > configs/stm32f469_disco_xip_defconfig | 1 - > configs/stm32f769_disco_sd_defconfig | 1 - > 17 files changed, 25 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 7 16:41:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:41:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-smbprotocol: bump to version 1.12.0 In-Reply-To: <20240111070215.3064748-1-james.hilliard1@gmail.com> References: <20240111070215.3064748-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 08:02, James Hilliard wrote: > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-smbprotocol/python-smbprotocol.hash | 7 +++---- > package/python-smbprotocol/python-smbprotocol.mk | 4 ++-- > 2 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/package/python-smbprotocol/python-smbprotocol.hash b/package/python-smbprotocol/python-smbprotocol.hash > index a46f9f635b..b9d5f74999 100644 > --- a/package/python-smbprotocol/python-smbprotocol.hash > +++ b/package/python-smbprotocol/python-smbprotocol.hash > @@ -1,6 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/smbprotocol/json > -md5 a7474ab4cf8912dffaab56ad5067f429 smbprotocol-1.10.1.tar.gz > -sha256 b5bc9d4930ec947d42c21089a4d373b97e3f6488fd15d32d27189312fd8a04c9 smbprotocol-1.10.1.tar.gz > - > -# Locally computed > +md5 ccbb42bdd58a0070f56e966d8562451b smbprotocol-1.12.0.tar.gz > +sha256 5916a4b6c948bb70f82c246bdbfc86cf152226b71dac9f33b3d731d91e86274f smbprotocol-1.12.0.tar.gz > +# Locally computed sha256 checksums > sha256 4c3c550abc2b04c507ed0d641dd7e524eaff5bd06c7862af957301836d496d15 LICENSE > diff --git a/package/python-smbprotocol/python-smbprotocol.mk b/package/python-smbprotocol/python-smbprotocol.mk > index 17c2b17dbc..ece0744252 100644 > --- a/package/python-smbprotocol/python-smbprotocol.mk > +++ b/package/python-smbprotocol/python-smbprotocol.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SMBPROTOCOL_VERSION = 1.10.1 > +PYTHON_SMBPROTOCOL_VERSION = 1.12.0 > PYTHON_SMBPROTOCOL_SOURCE = smbprotocol-$(PYTHON_SMBPROTOCOL_VERSION).tar.gz > -PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/13/1a/73ad1883beebe4f6f47879cb9880690944faa00681141920c7a2219f6152 > +PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/57/72/d95216a9fd5da1b2fa225130741f50d4949c8f76d46669d30921c06d69ff > PYTHON_SMBPROTOCOL_SETUP_TYPE = setuptools > PYTHON_SMBPROTOCOL_LICENSE = MIT > PYTHON_SMBPROTOCOL_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 7 16:41:53 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:41:53 +0100 Subject: [Buildroot] [PATCH 1/3] support/scripts/pkg-stats: remove checking the CPE database In-Reply-To: <20240207153519.657048-1-arnout@mind.be> References: <20240207153519.657048-1-arnout@mind.be> Message-ID: <20240207174153.2023e1a6@windsurf> On Wed, 7 Feb 2024 16:35:17 +0100 Arnout Vandecappelle via buildroot wrote: > We currently check the CPE database to see if the CPE ID we use > (including the version) is already in the database. > > However, the version part of the CPE ID is not actually used for CVE > matching. Instead, the CVEs have a range of versions associated with > them and we match against those ranges. > > In addition, NVD is moving to a new API for accessing the CPE database. > It will not longer be possible to simply download all the CPE IDs, and > due to rate limiting, the download will have to be done in several > queries. > > Since all of this is anyway of limited use, drop the CPE database lookup > entirely. Instead, as long as a CPE ID is defined in a package, it is > considered OK, without any checks. > > Signed-off-by: Arnout Vandecappelle > --- > support/scripts/pkg-stats | 50 ++------------------------------------- > 1 file changed, 2 insertions(+), 48 deletions(-) Series applied, thanks! There were only a few flake8 warnings on PATCH 1/3 due to Python imports that were no longer needed. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From arnout at mind.be Wed Feb 7 16:39:42 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:39:42 +0100 Subject: [Buildroot] [git commit] package/python-simplejson: bump to version 3.19.2 Message-ID: <20240207164326.5925B8767B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bb00267175bc0d0cc5de0c14b03a9dd5d1cc627 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-simplejson/python-simplejson.hash | 4 ++-- package/python-simplejson/python-simplejson.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index a8b946b2c4..9f96f99bf4 100644 --- a/package/python-simplejson/python-simplejson.hash +++ b/package/python-simplejson/python-simplejson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/simplejson/json -md5 ecd07fca7a7fa0bcc9acdf9d82e41eb1 simplejson-3.18.1.tar.gz -sha256 746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa simplejson-3.18.1.tar.gz +md5 3b334627d870a3c849e1322d18a7bfe7 simplejson-3.19.2.tar.gz +sha256 9eb442a2442ce417801c912df68e1f6ccfcd41577ae7274953ab3ad24ef7d82c simplejson-3.19.2.tar.gz # Locally computed sha256 checksums sha256 fcaa1e313a99304322e2e0836ea4ee7d839ce9a480438f3922a853edfdde129f LICENSE.txt diff --git a/package/python-simplejson/python-simplejson.mk b/package/python-simplejson/python-simplejson.mk index 5782626387..d5ba3948b7 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.18.1 +PYTHON_SIMPLEJSON_VERSION = 3.19.2 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/0f/a0/79d2bec499cb53678bc20d41f9706ca02777f0876efa9b29a69fb3d55dfd +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/79/79/3ccb95bb4154952532f280f7a41979fbfb0fbbaee4d609810ecb01650afa PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt PYTHON_SIMPLEJSON_CPE_ID_VENDOR = simplejson_project From arnout at mind.be Wed Feb 7 16:40:24 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:40:24 +0100 Subject: [Buildroot] [git commit] package/python-smbprotocol: bump to version 1.12.0 Message-ID: <20240207164326.6438F8767C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ea08bfdf4511180def1a04befa5b06f5a627af3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-smbprotocol/python-smbprotocol.hash | 7 +++---- package/python-smbprotocol/python-smbprotocol.mk | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/python-smbprotocol/python-smbprotocol.hash b/package/python-smbprotocol/python-smbprotocol.hash index a46f9f635b..b9d5f74999 100644 --- a/package/python-smbprotocol/python-smbprotocol.hash +++ b/package/python-smbprotocol/python-smbprotocol.hash @@ -1,6 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/smbprotocol/json -md5 a7474ab4cf8912dffaab56ad5067f429 smbprotocol-1.10.1.tar.gz -sha256 b5bc9d4930ec947d42c21089a4d373b97e3f6488fd15d32d27189312fd8a04c9 smbprotocol-1.10.1.tar.gz - -# Locally computed +md5 ccbb42bdd58a0070f56e966d8562451b smbprotocol-1.12.0.tar.gz +sha256 5916a4b6c948bb70f82c246bdbfc86cf152226b71dac9f33b3d731d91e86274f smbprotocol-1.12.0.tar.gz +# Locally computed sha256 checksums sha256 4c3c550abc2b04c507ed0d641dd7e524eaff5bd06c7862af957301836d496d15 LICENSE diff --git a/package/python-smbprotocol/python-smbprotocol.mk b/package/python-smbprotocol/python-smbprotocol.mk index 17c2b17dbc..ece0744252 100644 --- a/package/python-smbprotocol/python-smbprotocol.mk +++ b/package/python-smbprotocol/python-smbprotocol.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SMBPROTOCOL_VERSION = 1.10.1 +PYTHON_SMBPROTOCOL_VERSION = 1.12.0 PYTHON_SMBPROTOCOL_SOURCE = smbprotocol-$(PYTHON_SMBPROTOCOL_VERSION).tar.gz -PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/13/1a/73ad1883beebe4f6f47879cb9880690944faa00681141920c7a2219f6152 +PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/57/72/d95216a9fd5da1b2fa225130741f50d4949c8f76d46669d30921c06d69ff PYTHON_SMBPROTOCOL_SETUP_TYPE = setuptools PYTHON_SMBPROTOCOL_LICENSE = MIT PYTHON_SMBPROTOCOL_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 7 16:39:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:39:08 +0100 Subject: [Buildroot] [git commit] package/python-sh: bump to version 2.0.6 Message-ID: <20240207164326.4F64A8767A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d1269073e7b4a2a7f92ebfe88581eaf9e09616a5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-sh/python-sh.hash | 4 ++-- package/python-sh/python-sh.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sh/python-sh.hash b/package/python-sh/python-sh.hash index a31aacdee1..c0d3f62f12 100644 --- a/package/python-sh/python-sh.hash +++ b/package/python-sh/python-sh.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sh/json -md5 d60498172876f35aef6303a9cbb8eb11 sh-1.14.3.tar.gz -sha256 e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7 sh-1.14.3.tar.gz +md5 aadf37759a9cb4862257cef3cf44a27b sh-2.0.6.tar.gz +sha256 9b2998f313f201c777e2c0061f0b1367497097ef13388595be147e2a00bf7ba1 sh-2.0.6.tar.gz # Locally computed sha256 checksums sha256 d8491c6e236568d04f7c8c07f2f1b8f5d142706dab6ab88f6e0d2dd476b6c706 LICENSE.txt diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk index 781de88ab1..af4da3f6c9 100644 --- a/package/python-sh/python-sh.mk +++ b/package/python-sh/python-sh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SH_VERSION = 1.14.3 +PYTHON_SH_VERSION = 2.0.6 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz -PYTHON_SH_SITE = https://files.pythonhosted.org/packages/b7/09/89c28aaf2a49f226fef8587c90c6386bd2cc03a0295bc4ff7fc6ee43c01d +PYTHON_SH_SITE = https://files.pythonhosted.org/packages/cd/51/7355831d8e1cee8348157d769ccda8a31ca9fa0548e7f93d87837d83866d PYTHON_SH_SETUP_TYPE = setuptools PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt From arnout at mind.be Wed Feb 7 16:44:27 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:44:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-soupsieve: bump to version 2.5 In-Reply-To: <20240111071354.3071382-1-james.hilliard1@gmail.com> References: <20240111071354.3071382-1-james.hilliard1@gmail.com> Message-ID: <72875bd7-8a7d-4db1-917d-17dbc90ce35b@mind.be> On 11/01/2024 08:13, James Hilliard wrote: > License hash changed due to year update: > https://github.com/facelessuser/soupsieve/commit/1615584814d597ce87d4b4d675250cbe20e3fa30 > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-soupsieve/python-soupsieve.hash | 6 +++--- > package/python-soupsieve/python-soupsieve.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-soupsieve/python-soupsieve.hash b/package/python-soupsieve/python-soupsieve.hash > index cf348d441f..278c7d1b0c 100644 > --- a/package/python-soupsieve/python-soupsieve.hash > +++ b/package/python-soupsieve/python-soupsieve.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/soupsieve/json > -md5 4c824620563604cbf783de149c8b8889 soupsieve-2.3.2.post1.tar.gz > -sha256 fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d soupsieve-2.3.2.post1.tar.gz > +md5 88ae72bd970b425692235d17224204e6 soupsieve-2.5.tar.gz > +sha256 5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690 soupsieve-2.5.tar.gz > # Locally computed sha256 checksums > -sha256 bc66234cadd3f6e7aaf7160faf165f3f869ffc8a11b6b0d6c44a2e2a83314dd0 LICENSE.md > +sha256 ceb7b9053b88addffa3102a457302bd840d123925ee9ed9c2ac90cf6548b33bf LICENSE.md > diff --git a/package/python-soupsieve/python-soupsieve.mk b/package/python-soupsieve/python-soupsieve.mk > index ebf2ada7ac..581df7e787 100644 > --- a/package/python-soupsieve/python-soupsieve.mk > +++ b/package/python-soupsieve/python-soupsieve.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SOUPSIEVE_VERSION = 2.3.2.post1 > +PYTHON_SOUPSIEVE_VERSION = 2.5 > PYTHON_SOUPSIEVE_SOURCE = soupsieve-$(PYTHON_SOUPSIEVE_VERSION).tar.gz > -PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/f3/03/bac179d539362319b4779a00764e95f7542f4920084163db6b0fd4742d38 > +PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/ce/21/952a240de1c196c7e3fbcd4e559681f0419b1280c617db21157a0390717b > PYTHON_SOUPSIEVE_SETUP_TYPE = pep517 > PYTHON_SOUPSIEVE_LICENSE = MIT > PYTHON_SOUPSIEVE_LICENSE_FILES = LICENSE.md From arnout at mind.be Wed Feb 7 16:45:23 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:45:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-sqliteschema: bump to version 2.0.0 In-Reply-To: <20240111071706.3073259-1-james.hilliard1@gmail.com> References: <20240111071706.3073259-1-james.hilliard1@gmail.com> Message-ID: On 11/01/2024 08:17, James Hilliard wrote: > Drop no longer required python-setuptools runtime dependency. > > Signed-off-by: James Hilliard Applied to master, thanks. Regards, Arnout > --- > package/python-sqliteschema/Config.in | 1 - > package/python-sqliteschema/python-sqliteschema.hash | 4 ++-- > package/python-sqliteschema/python-sqliteschema.mk | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in > index 102a615765..3097102100 100644 > --- a/package/python-sqliteschema/Config.in > +++ b/package/python-sqliteschema/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_PYTHON_SQLITESCHEMA > bool "python-sqliteschema" > - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime > select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime > select BR2_PACKAGE_PYTHON_TABLEDATA # runtime > select BR2_PACKAGE_PYTHON_TYPEPY # runtime > diff --git a/package/python-sqliteschema/python-sqliteschema.hash b/package/python-sqliteschema/python-sqliteschema.hash > index d5fe6e7af1..7fe8ee925d 100644 > --- a/package/python-sqliteschema/python-sqliteschema.hash > +++ b/package/python-sqliteschema/python-sqliteschema.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/sqliteschema/json > -md5 46da4f7575a0cc6c1d92377a279e5188 sqliteschema-1.3.0.tar.gz > -sha256 1acdd5087cab54a099135a5623bb1960019816e2e3042b889c637901a832d3c3 sqliteschema-1.3.0.tar.gz > +md5 b7fd543b82ad709f70cdc06c4ec8639a sqliteschema-2.0.0.tar.gz > +sha256 fe6cedddf10de8934ec1ace8319340a2256667e4a1a36f3da4fd1c0956124dc8 sqliteschema-2.0.0.tar.gz > # Locally computed sha256 checksums > sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE > diff --git a/package/python-sqliteschema/python-sqliteschema.mk b/package/python-sqliteschema/python-sqliteschema.mk > index c399ebd6f6..4b224048f9 100644 > --- a/package/python-sqliteschema/python-sqliteschema.mk > +++ b/package/python-sqliteschema/python-sqliteschema.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SQLITESCHEMA_VERSION = 1.3.0 > +PYTHON_SQLITESCHEMA_VERSION = 2.0.0 > PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz > -PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/3d/ff/91cfff0c96f9ba2bddc27d6855db4907af77551a267b86740c8842beeb78 > +PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/29/e7/4482eebf6d8ff7923bb3fd0e9239d3e634f67125cfda3001c88506b939b9 > PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools > PYTHON_SQLITESCHEMA_LICENSE = MIT > PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE From arnout at mind.be Wed Feb 7 16:43:31 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:43:31 +0100 Subject: [Buildroot] [git commit] package/python-soupsieve: bump to version 2.5 Message-ID: <20240207164556.05CC98768C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bcaf6b43279ba711888222bdad5b6988831b2d70 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License hash changed due to year update: https://github.com/facelessuser/soupsieve/commit/1615584814d597ce87d4b4d675250cbe20e3fa30 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-soupsieve/python-soupsieve.hash | 6 +++--- package/python-soupsieve/python-soupsieve.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-soupsieve/python-soupsieve.hash b/package/python-soupsieve/python-soupsieve.hash index cf348d441f..278c7d1b0c 100644 --- a/package/python-soupsieve/python-soupsieve.hash +++ b/package/python-soupsieve/python-soupsieve.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/soupsieve/json -md5 4c824620563604cbf783de149c8b8889 soupsieve-2.3.2.post1.tar.gz -sha256 fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d soupsieve-2.3.2.post1.tar.gz +md5 88ae72bd970b425692235d17224204e6 soupsieve-2.5.tar.gz +sha256 5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690 soupsieve-2.5.tar.gz # Locally computed sha256 checksums -sha256 bc66234cadd3f6e7aaf7160faf165f3f869ffc8a11b6b0d6c44a2e2a83314dd0 LICENSE.md +sha256 ceb7b9053b88addffa3102a457302bd840d123925ee9ed9c2ac90cf6548b33bf LICENSE.md diff --git a/package/python-soupsieve/python-soupsieve.mk b/package/python-soupsieve/python-soupsieve.mk index ebf2ada7ac..581df7e787 100644 --- a/package/python-soupsieve/python-soupsieve.mk +++ b/package/python-soupsieve/python-soupsieve.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SOUPSIEVE_VERSION = 2.3.2.post1 +PYTHON_SOUPSIEVE_VERSION = 2.5 PYTHON_SOUPSIEVE_SOURCE = soupsieve-$(PYTHON_SOUPSIEVE_VERSION).tar.gz -PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/f3/03/bac179d539362319b4779a00764e95f7542f4920084163db6b0fd4742d38 +PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/ce/21/952a240de1c196c7e3fbcd4e559681f0419b1280c617db21157a0390717b PYTHON_SOUPSIEVE_SETUP_TYPE = pep517 PYTHON_SOUPSIEVE_LICENSE = MIT PYTHON_SOUPSIEVE_LICENSE_FILES = LICENSE.md From arnout at mind.be Wed Feb 7 16:44:37 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 7 Feb 2024 17:44:37 +0100 Subject: [Buildroot] [git commit] package/python-sqliteschema: bump to version 2.0.0 Message-ID: <20240207164556.1BC7187679@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29524958d52db07f749aef9d405ef06dee47ba22 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Drop no longer required python-setuptools runtime dependency. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-sqliteschema/Config.in | 1 - package/python-sqliteschema/python-sqliteschema.hash | 4 ++-- package/python-sqliteschema/python-sqliteschema.mk | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/python-sqliteschema/Config.in b/package/python-sqliteschema/Config.in index 102a615765..3097102100 100644 --- a/package/python-sqliteschema/Config.in +++ b/package/python-sqliteschema/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_SQLITESCHEMA bool "python-sqliteschema" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime select BR2_PACKAGE_PYTHON_TABLEDATA # runtime select BR2_PACKAGE_PYTHON_TYPEPY # runtime diff --git a/package/python-sqliteschema/python-sqliteschema.hash b/package/python-sqliteschema/python-sqliteschema.hash index d5fe6e7af1..7fe8ee925d 100644 --- a/package/python-sqliteschema/python-sqliteschema.hash +++ b/package/python-sqliteschema/python-sqliteschema.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqliteschema/json -md5 46da4f7575a0cc6c1d92377a279e5188 sqliteschema-1.3.0.tar.gz -sha256 1acdd5087cab54a099135a5623bb1960019816e2e3042b889c637901a832d3c3 sqliteschema-1.3.0.tar.gz +md5 b7fd543b82ad709f70cdc06c4ec8639a sqliteschema-2.0.0.tar.gz +sha256 fe6cedddf10de8934ec1ace8319340a2256667e4a1a36f3da4fd1c0956124dc8 sqliteschema-2.0.0.tar.gz # Locally computed sha256 checksums sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-sqliteschema/python-sqliteschema.mk b/package/python-sqliteschema/python-sqliteschema.mk index c399ebd6f6..4b224048f9 100644 --- a/package/python-sqliteschema/python-sqliteschema.mk +++ b/package/python-sqliteschema/python-sqliteschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLITESCHEMA_VERSION = 1.3.0 +PYTHON_SQLITESCHEMA_VERSION = 2.0.0 PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz -PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/3d/ff/91cfff0c96f9ba2bddc27d6855db4907af77551a267b86740c8842beeb78 +PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/29/e7/4482eebf6d8ff7923bb3fd0e9239d3e634f67125cfda3001c88506b939b9 PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools PYTHON_SQLITESCHEMA_LICENSE = MIT PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE From thomas.petazzoni at bootlin.com Wed Feb 7 16:46:55 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 17:46:55 +0100 Subject: [Buildroot] [PATCH] package/tio: bump to version 2.7 In-Reply-To: <20240207153532.1199300-1-sergio.prado@e-labworks.com> References: <20240207153532.1199300-1-sergio.prado@e-labworks.com> Message-ID: <20240207174655.283732cb@windsurf> On Wed, 7 Feb 2024 12:35:32 -0300 Sergio Prado wrote: > Signed-off-by: Sergio Prado > --- > package/tio/tio.hash | 4 ++-- > package/tio/tio.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From buildroot at bubu1.eu Wed Feb 7 17:09:53 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:09:53 +0100 Subject: [Buildroot] [PATCH 1/4] package/python-ruamel-yaml: fix comment in hash file Message-ID: <20240207170959.2672846-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- package/python-ruamel-yaml/python-ruamel-yaml.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index 29852a51ed..ee5016835b 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,4 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/rfc3987/json +# md5, sha256 from https://pypi.org/pypi/ruamel.yaml/json md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz # Locally computed sha256 checksums -- 2.43.0 From buildroot at bubu1.eu Wed Feb 7 17:09:54 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:09:54 +0100 Subject: [Buildroot] [PATCH 2/4] support/testing: add new python-ruamel-yaml runtime test In-Reply-To: <20240207170959.2672846-1-buildroot@bubu1.eu> References: <20240207170959.2672846-1-buildroot@bubu1.eu> Message-ID: <20240207170959.2672846-2-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- .../package/sample_python_ruamel_yaml.py | 27 +++++++++++++++++++ .../tests/package/test_python_ruamel_yaml.py | 12 +++++++++ 2 files changed, 39 insertions(+) create mode 100644 support/testing/tests/package/sample_python_ruamel_yaml.py create mode 100644 support/testing/tests/package/test_python_ruamel_yaml.py diff --git a/support/testing/tests/package/sample_python_ruamel_yaml.py b/support/testing/tests/package/sample_python_ruamel_yaml.py new file mode 100644 index 0000000000..5b3a079471 --- /dev/null +++ b/support/testing/tests/package/sample_python_ruamel_yaml.py @@ -0,0 +1,27 @@ +from ruamel.yaml import YAML + +yaml_text = """ +Rootkey: + - ListEntry +AnotherRootKey: some-string + +ListRoot: + - float-value: '1.0' + int-value: 10234 + NestedList: + - 1 + - 2 + + - another-float: '1.1' + another-int: 1111 + +OneMoreRootKey: 9.99 +""" + +# Tests the pure python based implementation +yaml = YAML(typ='safe', pure=True) + +parsed = yaml.load(yaml_text) + +assert parsed['OneMoreRootKey'] == 9.99 +assert parsed['ListRoot'][1]['another-int'] == 1111 diff --git a/support/testing/tests/package/test_python_ruamel_yaml.py b/support/testing/tests/package/test_python_ruamel_yaml.py new file mode 100644 index 0000000000..15062b4455 --- /dev/null +++ b/support/testing/tests/package/test_python_ruamel_yaml.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3RuamelYaml(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_RUAMEL_YAML=y + """ + sample_scripts = ["tests/package/sample_python_ruamel_yaml.py"] + timeout = 40 -- 2.43.0 From buildroot at bubu1.eu Wed Feb 7 17:09:55 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:09:55 +0100 Subject: [Buildroot] [PATCH 3/4] package/python-ruamel-yaml-clib: new package In-Reply-To: <20240207170959.2672846-1-buildroot@bubu1.eu> References: <20240207170959.2672846-1-buildroot@bubu1.eu> Message-ID: <20240207170959.2672846-3-buildroot@bubu1.eu> Add optional c extension for python-ruamel-yaml which can speed up yaml loading/parsing. Extend the ruamel-yaml runtime test to check if the c extension works correctly. Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/python-ruamel-yaml-clib/Config.in | 9 +++++++++ .../python-ruamel-yaml-clib.hash | 5 +++++ .../python-ruamel-yaml-clib.mk | 16 ++++++++++++++++ .../tests/package/sample_python_ruamel_yaml.py | 12 ++++++++++++ .../tests/package/test_python_ruamel_yaml.py | 1 + 6 files changed, 44 insertions(+) create mode 100644 package/python-ruamel-yaml-clib/Config.in create mode 100644 package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash create mode 100644 package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk diff --git a/package/Config.in b/package/Config.in index bf8c325e99..e256202276 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1320,6 +1320,7 @@ menu "External python modules" source "package/python-rtoml/Config.in" source "package/python-rtslib-fb/Config.in" source "package/python-ruamel-yaml/Config.in" + source "package/python-ruamel-yaml-clib/Config.in" source "package/python-s3transfer/Config.in" source "package/python-scandir/Config.in" source "package/python-scapy/Config.in" diff --git a/package/python-ruamel-yaml-clib/Config.in b/package/python-ruamel-yaml-clib/Config.in new file mode 100644 index 0000000000..a06080873f --- /dev/null +++ b/package/python-ruamel-yaml-clib/Config.in @@ -0,0 +1,9 @@ +if BR2_PACKAGE_PYTHON_RUAMEL_YAML +config BR2_PACKAGE_PYTHON_RUAMEL_YAML_CLIB + bool "python-ruamel-yaml-clib" + help + C version of reader, parser and emitter for ruamel.yaml + derived from libyaml + + https://sourceforge.net/projects/ruamel-yaml/ +endif diff --git a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash new file mode 100644 index 0000000000..937afc3df1 --- /dev/null +++ b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/ruamel.yaml.clib/json +md5 b72e549363fa1b9c4f9123e98f2b46cc ruamel.yaml.clib-0.2.8.tar.gz +sha256 beb2e0404003de9a4cab9753a8805a8fe9320ee6673136ed7f04255fe60bb512 ruamel.yaml.clib-0.2.8.tar.gz +# Locally computed sha256 checksums +sha256 5458f90e82366f660f956b3c929ba5f7a0efdb99a99a847e2f51f2020ffbe887 LICENSE diff --git a/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk new file mode 100644 index 0000000000..3e5434fa9a --- /dev/null +++ b/package/python-ruamel-yaml-clib/python-ruamel-yaml-clib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-ruamel-yaml +# +################################################################################ + +PYTHON_RUAMEL_YAML_CLIB_VERSION = 0.2.8 +PYTHON_RUAMEL_YAML_CLIB_SOURCE = ruamel.yaml.clib-$(PYTHON_RUAMEL_YAML_CLIB_VERSION).tar.gz +PYTHON_RUAMEL_YAML_CLIB_SITE = https://files.pythonhosted.org/packages/46/ab/bab9eb1566cd16f060b54055dd39cf6a34bfa0240c53a7218c43e974295b +PYTHON_RUAMEL_YAML_CLIB_SETUP_TYPE = setuptools +PYTHON_RUAMEL_YAML_CLIB_LICENSE = MIT +PYTHON_RUAMEL_YAML_CLIB_LICENSE_FILES = LICENSE +PYTHON_RUAMEL_YAML_CLIB_CPE_ID_VENDOR = ruamel.yaml_project +PYTHON_RUAMEL_YAML_CLIB_CPE_ID_PRODUCT = ruamel.yaml + +$(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_ruamel_yaml.py b/support/testing/tests/package/sample_python_ruamel_yaml.py index 5b3a079471..55cd696278 100644 --- a/support/testing/tests/package/sample_python_ruamel_yaml.py +++ b/support/testing/tests/package/sample_python_ruamel_yaml.py @@ -25,3 +25,15 @@ parsed = yaml.load(yaml_text) assert parsed['OneMoreRootKey'] == 9.99 assert parsed['ListRoot'][1]['another-int'] == 1111 + +# Tests the C extension based loader +# ruamel.yaml automatically falls back to the pure python version, so we need +# to explicitly check if importing the CLoader works here. +# Import this here, so it's clearer what part of the test is failing. +from ruamel.yaml import CLoader # noqa: E402 +assert CLoader is not None +yaml = YAML(typ='safe') +parsed_from_c = yaml.load(yaml_text) + +assert parsed_from_c['OneMoreRootKey'] == 9.99 +assert parsed_from_c['ListRoot'][1]['another-int'] == 1111 diff --git a/support/testing/tests/package/test_python_ruamel_yaml.py b/support/testing/tests/package/test_python_ruamel_yaml.py index 15062b4455..b145da4b24 100644 --- a/support/testing/tests/package/test_python_ruamel_yaml.py +++ b/support/testing/tests/package/test_python_ruamel_yaml.py @@ -7,6 +7,7 @@ class TestPythonPy3RuamelYaml(TestPythonPackageBase): """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_RUAMEL_YAML=y + BR2_PACKAGE_PYTHON_RUAMEL_YAML_CLIB=y """ sample_scripts = ["tests/package/sample_python_ruamel_yaml.py"] timeout = 40 -- 2.43.0 From buildroot at bubu1.eu Wed Feb 7 17:09:56 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:09:56 +0100 Subject: [Buildroot] [PATCH 4/4] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <20240207170959.2672846-1-buildroot@bubu1.eu> References: <20240207170959.2672846-1-buildroot@bubu1.eu> Message-ID: <20240207170959.2672846-4-buildroot@bubu1.eu> From: James Hilliard License hash changed due to year update: https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ Signed-off-by: James Hilliard Signed-off-by: Marcus Hoffmann --- package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash index ee5016835b..02845d112b 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ruamel.yaml/json -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz +sha256 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ruamel.yaml-0.18.5.tar.gz # Locally computed sha256 checksums -sha256 ab837b032c5aae84503fc0c733a116a26fd272e90dc4402fa68d3c9e51aed3b0 LICENSE +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 LICENSE diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk index a6fed3bc2c..bbdac591ca 100644 --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RUAMEL_YAML_VERSION = 0.17.21 +PYTHON_RUAMEL_YAML_VERSION = 0.18.5 PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/82/43/fa976e03a4a9ae406904489119cd7dd4509752ca692b2e0a19491ca1782c PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools PYTHON_RUAMEL_YAML_LICENSE = MIT PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE -- 2.43.0 From buildroot at bubu1.eu Wed Feb 7 17:13:29 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:13:29 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/python-ruamel-yaml: bump to version 0.18.5 In-Reply-To: <20240205163024.500599-1-james.hilliard1@gmail.com> References: <20240205163024.500599-1-james.hilliard1@gmail.com> Message-ID: <5e97bc80-0758-4685-a614-7eb9fb2f8b6b@bubu1.eu> On 05.02.24 17:30, James Hilliard wrote: > License hash changed due to year update: > https://sourceforge.net/p/ruamel-yaml/code/ci/56b3e2666fb275deab3eec99193c103e4edf93bb/ > > Signed-off-by: James Hilliard > --- > Changes v1 -> v2: > - fix package hash typo > --- > package/python-ruamel-yaml/python-ruamel-yaml.hash | 6 +++--- > package/python-ruamel-yaml/python-ruamel-yaml.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash > index 29852a51ed..b614c01d79 100644 > --- a/package/python-ruamel-yaml/python-ruamel-yaml.hash > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/rfc3987/json This still points to the wrong package, but was wrong before. I've resend this patch as part of https://patchwork.ozlabs.org/project/buildroot/list/?series=394024 as fixing this introduced a merge conflict. > -md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz > -sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz > +md5 24fac3544a3c7bd7eeaf6e4f704a056e ruamel.yaml-0.18.5.tar.gz > +sha256 61917e3a35a569c1133a8f772e1226961bf5a1198bea7e23f06a0841dea1ab0e ruamel.yaml-0.18.5.tar.gz > # Locally computed sha256 checksums > -sha256 ab837b032c5aae84503fc0c733a116a26fd272e90dc4402fa68d3c9e51aed3b0 LICENSE > +sha256 ba45629abb7022949148ce65de4a59e7ee164d30c94450389a6afdd3ebe4e9e0 LICENSE > diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk > index a6fed3bc2c..bbdac591ca 100644 > --- a/package/python-ruamel-yaml/python-ruamel-yaml.mk > +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_RUAMEL_YAML_VERSION = 0.17.21 > +PYTHON_RUAMEL_YAML_VERSION = 0.18.5 > PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz > -PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c > +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/82/43/fa976e03a4a9ae406904489119cd7dd4509752ca692b2e0a19491ca1782c > PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools > PYTHON_RUAMEL_YAML_LICENSE = MIT > PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE From buildroot at bubu1.eu Wed Feb 7 17:15:12 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:15:12 +0100 Subject: [Buildroot] [PATCH] support/testing: remove hardcoded sleep from python-flask test Message-ID: <20240207171513.2673706-1-buildroot@bubu1.eu> Similar to the new fastapi test, instead of waiting for a hard coded amount of time we can retry every second until the server is available and abort if after the timeout we still didn't manage to connect. Signed-off-by: Marcus Hoffmann --- support/testing/tests/package/test_python_flask.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/support/testing/tests/package/test_python_flask.py b/support/testing/tests/package/test_python_flask.py index 9d8587e918..32d9da34a5 100644 --- a/support/testing/tests/package/test_python_flask.py +++ b/support/testing/tests/package/test_python_flask.py @@ -21,9 +21,13 @@ class TestPythonPy3Flask(TestPythonPackageBase): _, exit_code = self.emulator.run(cmd, timeout=self.timeout) # Give enough time for the flask server to start up - time.sleep(30) + for attempt in range(30): + time.sleep(1) - cmd = "wget -q -O - http://127.0.0.1:5000/" - output, exit_code = self.emulator.run(cmd, timeout=self.timeout) - self.assertEqual(exit_code, 0) - self.assertEqual(output[0], "Hello, World!") + cmd = "wget -q -O - http://127.0.0.1:5000/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + if exit_code == 0: + self.assertEqual(output[0], 'Hello, World!') + break + else: + self.assertTrue(False, "Timeout while waiting for flask server") -- 2.43.0 From ddrokosov at salutedevices.com Wed Feb 7 17:15:52 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Wed, 7 Feb 2024 20:15:52 +0300 Subject: [Buildroot] [PATCH v2 1/2] package/linux-tools: introduce linux mm tools In-Reply-To: References: <20240206192543.7179-1-ddrokosov@salutedevices.com> <20240206192543.7179-2-ddrokosov@salutedevices.com> Message-ID: <20240207171552.nrn7dnbvltc3oy4b@CAB-WSD-L081021> Hello Yann, Thank you for such a quick response! On Wed, Feb 07, 2024 at 09:55:23AM +0100, Yann E. MORIN wrote: > Dmitry, All, > > On 2024-02-06 22:25 +0300, Dmitry Rokosov spake thusly: > > This toolset was designed to facilitate the testing, monitoring, and > > tracing of various things with virtual memory, pages, and slab objects. > > It is an invaluable resource for identifying and analyzing > > memory-related issues, such as leaks and bottlenecks, and can greatly > > enhance one's understanding of memory utilization within a system. > > > > The mm toolset includes: > > - page_owner_sort: userspace helper to sort the output of > > /sys/kernel/debug/page_owner, which helps to know who allocates > > the page from kernel context > > - slabinfo: the tool which gets reports about slabs, for example > > show empty slabs, modify of slab debug options at runtime, display > > all information about a slabcache > > - page-types: a handy tool for querying page flags > > > > Signed-off-by: Dmitry Rokosov > > Signed-off-by: Alexey Romanov > > I've applied, after making a few changes: > > - don't depend on linux, already a patch dependency > - don't set CC: default is based on CROSS_COMPILE > - no need to fully recheck at install time > - move the option for alphabetical ordering > - fix check-package > > See below for a few more omments... > > > --- > > package/linux-tools/Config.in | 18 +++++++++++ > > package/linux-tools/linux-tool-mm.mk.in | 41 +++++++++++++++++++++++++ > > 2 files changed, 59 insertions(+) > > create mode 100644 package/linux-tools/linux-tool-mm.mk.in > > > > diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in > > index 8a0b6d5802cc..ede966ec792d 100644 > > --- a/package/linux-tools/Config.in > > +++ b/package/linux-tools/Config.in > > @@ -185,4 +185,22 @@ config BR2_PACKAGE_LINUX_TOOLS_HV_VSS_DAEMON > > > > endif # BR2_PACKAGE_LINUX_TOOLS_HV > > > > +config BR2_PACKAGE_LINUX_TOOLS_MM > > + bool "mm" > > + select BR2_PACKAGE_LINUX_TOOLS > > + help > > + mm is a toolset for testing/monitoring/tracing vm/pages/slabs objects. > > + > > + - page_owner_sort: userspace helper to sort the output of > > + /sys/kernel/debug/page_owner, which helps to know who allocates > > + the page from kernel context > > + > > + - slabinfo: the tool which gets reports about slabs, for example > > + show empty slabs, modify of slab debug options at runtime, display > > + all information about a slabcache > > + > > + - page-types: a handy tool for querying page flags > > + > > + These tools are available only from kernel version 3.4. > > $ ./utils/docker-run make check-package > package/linux-tools/Config.in:244: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > package/linux-tools/Config.in:247: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > package/linux-tools/Config.in:250: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > package/linux-tools/Config.in:251: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) > I will run check-package for the next contribution. Thank you very much for fixing the coding style problems. > > endmenu > > diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in > > new file mode 100644 > > index 000000000000..5431e0574b04 > > --- /dev/null > > +++ b/package/linux-tools/linux-tool-mm.mk.in > > @@ -0,0 +1,41 @@ > > +################################################################################ > > +# > > +# mm > > +# > > +################################################################################ > > + > > +LINUX_TOOLS += mm > > + > > +MM_DEPENDENCIES = linux > > No need to add an explicit dependency: the linux-tools micro-infra > already handles it in a generic way; indeed, there is no reason for each > individual linux-tool to add a dependency on linux: they all have that > dependency. > Yep, you are totally right. It was needed for LINUX_VERSION_PROBED variable. Without this dependency we couldn't get LINUX_VERSION_PROBED environment value. > > +MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" > > No need to explicitly set CC: the kernel Makefile sets it based on > CROSS_COMPILE already. > Hmmmm, very strange. AFAIR, withoug explicit CC I can't build linux-tools-mm with cross compilation. I will check the final merged patchset and back to the thread if any. > > +define MM_BUILD_CMDS > > + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > > + MM_SUBDIR=vm; \ > > + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ > > + MM_SUBDIR=mm; \ > > + else \ > > + echo "Your kernel version is too old and does not have the mm tool." ; \ > > + echo "At least kernel 3.4 must be used." ; \ > > + exit 1 ; \ > > + fi ; \ > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > > + $(MM_MAKE_OPTS) $${MM_SUBDIR} > > +endef > > + > > +define MM_INSTALL_TARGET_CMDS > > + $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > > + MM_SUBDIR=vm; \ > > + elif test -f $(LINUX_DIR)/tools/mm/Makefile ; then \ > > + MM_SUBDIR=mm; \ > > + else \ > > + echo "Your kernel version is too old and does not have the mm tool." ; \ > > + echo "At least kernel 3.4 must be used." ; \ > > + exit 1 ; \ > > + fi ; \ > > For install, we do need to know which directory to use, indeed, but we > already do know one exists, as it was used at build, above; so we do not > need the error case. I've simplified this part and added a comment to > explain it. > > Applied to master with those changes, thanks. Okay, many thanks, appreciate it so much! > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ > > + $(MM_MAKE_OPTS) \ > > + INSTALL_ROOT=$(TARGET_DIR) \ > > + DESTDIR=$(TARGET_DIR) \ > > + $${MM_SUBDIR}_install > > +endef > > -- > > 2.43.0 > > > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -- Thank you, Dmitry From buildroot at bubu1.eu Wed Feb 7 17:18:27 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:18:27 +0100 Subject: [Buildroot] [PATCH] package/python-waitress: new package Message-ID: <20240207171829.2676569-1-buildroot@bubu1.eu> The test runs the flask sample app through the waitress wsgi server instead of the flask development server. Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/python-waitress/Config.in | 11 ++++++ package/python-waitress/python-waitress.hash | 5 +++ package/python-waitress/python-waitress.mk | 14 ++++++++ .../tests/package/test_python_waitress.py | 34 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 package/python-waitress/Config.in create mode 100644 package/python-waitress/python-waitress.hash create mode 100644 package/python-waitress/python-waitress.mk create mode 100644 support/testing/tests/package/test_python_waitress.py diff --git a/package/Config.in b/package/Config.in index 97f590e2b7..bf8c325e99 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1406,6 +1406,7 @@ menu "External python modules" source "package/python-validators/Config.in" source "package/python-versiontools/Config.in" source "package/python-visitor/Config.in" + source "package/python-waitress/Config.in" source "package/python-watchdog/Config.in" source "package/python-wcwidth/Config.in" source "package/python-weasyprint/Config.in" diff --git a/package/python-waitress/Config.in b/package/python-waitress/Config.in new file mode 100644 index 0000000000..7d8c73a650 --- /dev/null +++ b/package/python-waitress/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_WAITRESS + bool "python-waitress" + help + Waitress WSGI server. + + Waitress is a production-quality pure-Python WSGI server + with very acceptable performance. It has no dependencies + except ones which live in the Python standard library. + It supports HTTP/1.0 and HTTP/1.1. + + https://github.com/Pylons/waitress diff --git a/package/python-waitress/python-waitress.hash b/package/python-waitress/python-waitress.hash new file mode 100644 index 0000000000..c1663a351a --- /dev/null +++ b/package/python-waitress/python-waitress.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/waitress/json +md5 b8c671ed131b84a0099493f445c98014 waitress-3.0.0.tar.gz +sha256 005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1 waitress-3.0.0.tar.gz +# Locally computed sha256 checksums +sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-waitress/python-waitress.mk b/package/python-waitress/python-waitress.mk new file mode 100644 index 0000000000..c1618817dc --- /dev/null +++ b/package/python-waitress/python-waitress.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-waitress +# +################################################################################ + +PYTHON_WAITRESS_VERSION = 3.0.0 +PYTHON_WAITRESS_SOURCE = waitress-$(PYTHON_WAITRESS_VERSION).tar.gz +PYTHON_WAITRESS_SITE = https://files.pythonhosted.org/packages/70/34/cb77e5249c433eb177a11ab7425056b32d3b57855377fa1e38b397412859 +PYTHON_WAITRESS_SETUP_TYPE = setuptools +PYTHON_WAITRESS_LICENSE = ZPL-2.1 +PYTHON_WAITRESS_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_waitress.py b/support/testing/tests/package/test_python_waitress.py new file mode 100644 index 0000000000..46f04109c0 --- /dev/null +++ b/support/testing/tests/package/test_python_waitress.py @@ -0,0 +1,34 @@ +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonWaitress(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_FLASK=y + BR2_PACKAGE_PYTHON_WAITRESS=y + """ + + sample_scripts = ["tests/package/sample_python_flask.py"] + + def test_run(self): + self.login() + self.check_sample_scripts_exist() + cmd = self.interpreter + " -m waitress sample_python_flask:app > /dev/null 2>&1 &" + # give some time to setup the server + _, exit = self.emulator.run(cmd, timeout=self.timeout) + + # Give enough time for the uvicorn server to start up + for attempt in range(30): + time.sleep(1) + + cmd = "wget -q -O - http://127.0.0.1:8080/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + if exit_code == 0: + self.assertEqual(output[0], 'Hello, World!') + break + else: + self.assertTrue(False, "Timeout while waiting for waitress server") -- 2.43.0 From ddrokosov at salutedevices.com Wed Feb 7 17:19:07 2024 From: ddrokosov at salutedevices.com (Dmitry Rokosov) Date: Wed, 7 Feb 2024 20:19:07 +0300 Subject: [Buildroot] [PATCH v2 2/2] package/linux-tools: multilib build supported In-Reply-To: References: <20240206192543.7179-1-ddrokosov@salutedevices.com> <20240206192543.7179-3-ddrokosov@salutedevices.com> Message-ID: <20240207171907.m3ksufcpalqhahfz@CAB-WSD-L081021> Hello Yann, Thank you very much for such a quick response! On Wed, Feb 07, 2024 at 10:07:51AM +0100, Yann E. MORIN wrote: > Dmitry, All, > > On 2024-02-06 22:25 +0300, Dmitry Rokosov spake thusly: > > From: Konstantin Menyaev > > > > - LINUX_TOOLS_MAKE_OPTS option introduced: > > allows to override CROSS_COMPILE param > > What is the rationale for this? How is it supposed to be used? > > CROSS_COMPILE is already part of LINUX_MAKE_FLAGS, so there is no reason > to pass it explicitly either. > > Otherwise, I am not convinced anout the "multilib" title either, because > Buildroot does not do multilib systems anyway, so I am missing the point > of the patch... > > If you feel there really is a nedd, please resubmit with an extended > commit log. Thanks! Okay, we will try to describe it with extra comments and resubmit the patch in the separate email. > > Regards, > Yann E. MORIN. > > > Signed-off-by: Konstantin Menyaev > > Signed-off-by: Dmitry Rokosov > > --- > > package/linux-tools/linux-tool-gpio.mk.in | 2 +- > > package/linux-tools/linux-tool-iio.mk.in | 2 +- > > package/linux-tools/linux-tool-mm.mk.in | 2 +- > > package/linux-tools/linux-tool-pci.mk.in | 2 +- > > package/linux-tools/linux-tool-perf.mk.in | 2 +- > > package/linux-tools/linux-tool-selftests.mk.in | 2 +- > > package/linux-tools/linux-tool-tmon.mk.in | 2 +- > > package/linux-tools/linux-tools.mk | 2 ++ > > 8 files changed, 9 insertions(+), 7 deletions(-) > > > > diff --git a/package/linux-tools/linux-tool-gpio.mk.in b/package/linux-tools/linux-tool-gpio.mk.in > > index e825db1b1127..dcee11002e8c 100644 > > --- a/package/linux-tools/linux-tool-gpio.mk.in > > +++ b/package/linux-tools/linux-tool-gpio.mk.in > > @@ -6,7 +6,7 @@ > > > > LINUX_TOOLS += gpio > > > > -GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > > +GPIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > > > define GPIO_BUILD_CMDS > > $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ > > diff --git a/package/linux-tools/linux-tool-iio.mk.in b/package/linux-tools/linux-tool-iio.mk.in > > index 27ab0ed7ed63..1372faafd1a8 100644 > > --- a/package/linux-tools/linux-tool-iio.mk.in > > +++ b/package/linux-tools/linux-tool-iio.mk.in > > @@ -6,7 +6,7 @@ > > > > LINUX_TOOLS += iio > > > > -IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > > +IIO_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > > > define IIO_BUILD_CMDS > > $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ > > diff --git a/package/linux-tools/linux-tool-mm.mk.in b/package/linux-tools/linux-tool-mm.mk.in > > index 5431e0574b04..51a54026dea4 100644 > > --- a/package/linux-tools/linux-tool-mm.mk.in > > +++ b/package/linux-tools/linux-tool-mm.mk.in > > @@ -7,7 +7,7 @@ > > LINUX_TOOLS += mm > > > > MM_DEPENDENCIES = linux > > -MM_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CC="$(TARGET_CC)" > > +MM_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) CC="$(TARGET_CC)" > > > > define MM_BUILD_CMDS > > $(Q)if test -f $(LINUX_DIR)/tools/vm/Makefile ; then \ > > diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in > > index 17246f5d7ed2..48c3435a5c8a 100644 > > --- a/package/linux-tools/linux-tool-pci.mk.in > > +++ b/package/linux-tools/linux-tool-pci.mk.in > > @@ -6,7 +6,7 @@ > > > > LINUX_TOOLS += pci > > > > -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" > > +PCI_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" > > > > define PCI_BUILD_CMDS > > $(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \ > > diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in > > index ee308a85dfd1..38910cda7d75 100644 > > --- a/package/linux-tools/linux-tool-perf.mk.in > > +++ b/package/linux-tools/linux-tool-perf.mk.in > > @@ -19,7 +19,7 @@ PERF_ARCH=$(NORMALIZED_ARCH) > > endif > > > > PERF_MAKE_FLAGS = \ > > - $(LINUX_MAKE_FLAGS) \ > > + $(LINUX_TOOLS_MAKE_OPTS) \ > > JOBS=$(PARALLEL_JOBS) \ > > ARCH=$(PERF_ARCH) \ > > DESTDIR=$(TARGET_DIR) \ > > diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in > > index e29c7f59debd..144dd6616f2b 100644 > > --- a/package/linux-tools/linux-tool-selftests.mk.in > > +++ b/package/linux-tools/linux-tool-selftests.mk.in > > @@ -22,7 +22,7 @@ SELFTESTS_DEPENDENCIES = \ > > $(if $(BR2_PACKAGE_OPENSSL),openssl) > > > > SELFTESTS_MAKE_FLAGS = \ > > - $(LINUX_MAKE_FLAGS) \ > > + $(LINUX_TOOLS_MAKE_OPTS) \ > > ARCH=$(SELFTESTS_ARCH) > > > > # O must be redefined here to overwrite the one used by Buildroot for > > diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in > > index 56c328c51fd7..7c33915049c2 100644 > > --- a/package/linux-tools/linux-tool-tmon.mk.in > > +++ b/package/linux-tools/linux-tool-tmon.mk.in > > @@ -7,7 +7,7 @@ > > LINUX_TOOLS += tmon > > > > TMON_DEPENDENCIES = host-pkgconf ncurses > > -TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ > > +TMON_MAKE_OPTS = $(LINUX_TOOLS_MAKE_OPTS) \ > > CC=$(TARGET_CC) \ > > LDFLAGS="$(TARGET_LDFLAGS)" \ > > PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig > > diff --git a/package/linux-tools/linux-tools.mk b/package/linux-tools/linux-tools.mk > > index 81b1fbc17605..38bb2c83966a 100644 > > --- a/package/linux-tools/linux-tools.mk > > +++ b/package/linux-tools/linux-tools.mk > > @@ -26,6 +26,8 @@ LINUX_TOOLS_PATCH_DEPENDENCIES = linux > > # may install shared libraries and headers (e.g. cpupower). > > LINUX_TOOLS_INSTALL_STAGING = YES > > > > +LINUX_TOOLS_MAKE_OPTS = $(LINUX_MAKE_FLAGS) CROSS_COMPILE="$(TARGET_CROSS)" > > + > > LINUX_TOOLS_DEPENDENCIES += $(foreach tool,$(LINUX_TOOLS),\ > > $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ > > $($(call UPPERCASE,$(tool))_DEPENDENCIES))) > > -- > > 2.43.0 > > > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -- Thank you, Dmitry From dario.binacchi at amarulasolutions.com Wed Feb 7 17:39:11 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 18:39:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/uuu: drop README.md from license files Message-ID: <20240207173911.3704142-1-dario.binacchi@amarulasolutions.com> The patch drops the file README.md from the license files. Indeed, the licensing terms apply to third-party libraries that uuu links to, and even though they are bundled in the source tree of uuu|mfgtools, they are not used by Buildroot as we use the ones we build. Therefore, the actual license file of the package is the file LICENSE. Moreover, this also leads to simplifying the bump to new versions. Signed-off-by: Dario Binacchi --- package/uuu/uuu.hash | 1 - package/uuu/uuu.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index c231d5d729f0..e45cbb868078 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,3 @@ # locally computed sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE -sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 80d5e1937a97..5800277b10d5 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -8,7 +8,7 @@ UUU_VERSION = 1.5.165 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License -UUU_LICENSE_FILES = LICENSE README.md +UUU_LICENSE_FILES = LICENSE HOST_UUU_DEPENDENCIES = \ host-bzip2 \ host-libusb \ -- 2.43.0 From buildroot at bubu1.eu Wed Feb 7 17:39:25 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 7 Feb 2024 18:39:25 +0100 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <20240207112058.37534f3d@windsurf> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> <20240207112058.37534f3d@windsurf> Message-ID: On 07.02.24 11:20, Thomas Petazzoni via buildroot wrote: > On Wed, 7 Feb 2024 11:16:27 +0100 > Marcus Hoffmann wrote: > >> Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 >> [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop >> still uses) also seem to be still developed in parallel. So maybe we >> need both as build host packages? Or do you see another solution? > > If we were to have both in parallel, then the big question is whether > it is possible to install them both in parallel without them > conflicting with each other. They would conflict and there's no easy way to avoid that AFAIK. I think the best path forward is upgrading to cython 3.0 and passing the language_level=2 compatibility option[1], which seems to restore the 0.29.x behavior? I've yet to understand how to pass this option for a pep517 build though. uvloop at least also has a pending MR to support cython 3 directly [2] but we have a bunch of other packages depending on cython. [1] https://cython.readthedocs.io/en/stable/src/userguide/migrating_to_cy30.html#python-3-syntax-semantics [2] https://github.com/MagicStack/uvloop/pull/587/files > > Thomas From arbab at linux.ibm.com Wed Feb 7 17:51:31 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 7 Feb 2024 11:51:31 -0600 Subject: [Buildroot] [PATCH v5 1/5] package/petitboot: minor makefile cleanup In-Reply-To: <20240207175135.1532037-1-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> Message-ID: <20240207175135.1532037-2-arbab@linux.ibm.com> Normalize the order of arguments to $(INSTALL). Remove an unnecessary pair of parentheses. Signed-off-by: Reza Arbab --- package/petitboot/petitboot.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 2087f01b090c..4c8bc35adb38 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -63,15 +63,15 @@ define PETITBOOT_POST_INSTALL $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb - $(INSTALL) -m 0755 -D $(PETITBOOT_PKGDIR)/S15pb-discover \ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ $(TARGET_DIR)/etc/init.d/S15pb-discover $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-console \ $(TARGET_DIR)/etc/init.d/pb-console mkdir -p $(TARGET_DIR)/etc/udev/rules.d - (for port in $(PETITBOOT_GETTY_PORT); do \ + for port in $(PETITBOOT_GETTY_PORT); do \ printf 'SUBSYSTEM=="tty", KERNEL=="%s", RUN+="/etc/init.d/pb-console start $$name"\n' "$$port"; \ - done) > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules + done > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules mkdir -p $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ ln -sf /usr/sbin/pb-udhcpc \ -- 2.39.3 From arbab at linux.ibm.com Wed Feb 7 17:51:34 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 7 Feb 2024 11:51:34 -0600 Subject: [Buildroot] [PATCH v5 4/5] package/petitboot: run script when exiting to shell In-Reply-To: <20240207175135.1532037-1-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> Message-ID: <20240207175135.1532037-5-arbab@linux.ibm.com> When the user selects the shell escape option from the petitboot menu, reset the terminal so output is raw rather than being confined to the ncurses window set up for the petitboot menu, and print some helpful text before running the shell. To do this, override the default HOST_PROG_SH (/bin/sh) with a small script. Doing so also enables someone to customize this behavior by overlaying a different script. Signed-off-by: Reza Arbab --- package/petitboot/pb-shell | 10 ++++++++++ package/petitboot/petitboot.mk | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 package/petitboot/pb-shell diff --git a/package/petitboot/pb-shell b/package/petitboot/pb-shell new file mode 100644 index 000000000000..99887c3f3b87 --- /dev/null +++ b/package/petitboot/pb-shell @@ -0,0 +1,10 @@ +#!/bin/sh + +reset + +cat < References: <20240207175135.1532037-1-arbab@linux.ibm.com> Message-ID: <20240207175135.1532037-3-arbab@linux.ibm.com> The petitboot UI looks much nicer in a Unicode locale: * Items in the language selection submenu use multibyte Unicode characters. In other locales, they say "Unable to display text in this locale". * The combination of TERM=linux with a UTF-8 locale is required to trigger a special-case workaround in ncurses code[1]. Without this, line-drawing characters in the menu look like q's. Turn on wchar support in ncurses, and add a reminder that a UTF-8 locale should be generated for things to look right. [1] https://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing Signed-off-by: Reza Arbab --- package/petitboot/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 6a3d476b11b3..4f3b1c1ea4d1 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_PETITBOOT select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LVM2 # devmapper select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR # run-time dependencies select BR2_PACKAGE_KEXEC if !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS select BR2_PACKAGE_KEXEC_LITE if BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC @@ -18,6 +19,8 @@ config BR2_PACKAGE_PETITBOOT help Petitboot is a small kexec-based bootloader + NOTE: petitboot looks best in a UTF-8 locale (BR2_GENERATE_LOCALE) + http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html if BR2_PACKAGE_PETITBOOT -- 2.39.3 From arbab at linux.ibm.com Wed Feb 7 17:51:35 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 7 Feb 2024 11:51:35 -0600 Subject: [Buildroot] [PATCH v5 5/5] package/petitboot: run UI as non-root user In-Reply-To: <20240207175135.1532037-1-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> Message-ID: <20240207175135.1532037-6-arbab@linux.ibm.com> Though the petitboot UI is a user application, it is currently being run by root only because we use getty to display it on the console. Create an unprivileged user to run the UI instead. The unix socket the pb-discover daemon sets up is accessible to "petitgroup", so that should be the gid, with arbitrary uid "petituser" to match. This is currently the chain of processes leading to the UI: 1. /etc/init.d/pb-console start console 2. /usr/libexec/petitboot/pb-console --getty --detach -- -n -i 0 console linux 3. /sbin/getty -l/usr/libexec/petitboot/pb-console -n -i 0 console linux 4. /usr/libexec/petitboot/pb-console 5. /usr/sbin/petitboot-nc Instead of (3) running the pb-console helper directly with "getty -l", we can use "agetty -a" to autologin petituser, and run pb-console via petituser's login shell: 1. /etc/init.d/pb-console start console 2. /usr/libexec/petitboot/pb-console --getty=/sbin/agetty --detach -- -a petituser -n -i console linux 3. /sbin/agetty -a petituser -n -i console linux 4. /home/petituser/.profile 5. /usr/libexec/petitboot/pb-console 6. /usr/sbin/petiboot-nc Here, everything from (4) down is running as petituser. In (4), use $PPID to determine if we're logging in via getty, so that logging in by other means will give a normal shell. Signed-off-by: Reza Arbab --- package/petitboot/Config.in | 1 + package/petitboot/S15pb-discover | 4 +++- package/petitboot/pb-console | 6 ++++-- package/petitboot/petitboot.mk | 6 ++++++ package/petitboot/shell_profile | 3 +++ 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 package/petitboot/shell_profile diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 4f3b1c1ea4d1..e561547c10c8 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_PETITBOOT select BR2_PACKAGE_KEXEC_LITE if BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC select BR2_PACKAGE_NVME if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) select BR2_PACKAGE_POWERPC_UTILS if ( BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le ) + select BR2_PACKAGE_UTIL_LINUX_AGETTY help Petitboot is a small kexec-based bootloader diff --git a/package/petitboot/S15pb-discover b/package/petitboot/S15pb-discover index 71ab62d99859..9e8f6c87f8bb 100644 --- a/package/petitboot/S15pb-discover +++ b/package/petitboot/S15pb-discover @@ -12,7 +12,9 @@ fi start() { printf 'Starting %s: ' "$DAEMON" - mkdir -p /var/log/petitboot + # shellcheck disable=SC2174 # only apply -m to deepest dir + mkdir -p -m 0775 /var/log/petitboot + chown petituser:petitgroup /var/log/petitboot # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -b -m -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ diff --git a/package/petitboot/pb-console b/package/petitboot/pb-console index 407ff3b30232..8b23b2233dee 100644 --- a/package/petitboot/pb-console +++ b/package/petitboot/pb-console @@ -3,14 +3,16 @@ DAEMON="pb-console" PB_CONSOLE_PORT=${2:-"console"} -PB_CONSOLE_ARGS="--getty --detach -- -n -i 0 $PB_CONSOLE_PORT linux" +PB_CONSOLE_ARGS="--getty=/sbin/agetty --detach -- -a petituser -n -i $PB_CONSOLE_PORT linux" # shellcheck source=/dev/null [ -r "/etc/default/petitboot" ] && . "/etc/default/petitboot" start() { printf 'Starting %s on %s: ' "$DAEMON" "$PB_CONSOLE_PORT" - mkdir -p /var/log/petitboot + # shellcheck disable=SC2174 # only apply -m to deepest dir + mkdir -p -m 0775 /var/log/petitboot + chown petituser:petitgroup /var/log/petitboot # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -x "/usr/libexec/petitboot/$DAEMON" \ diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index e2f762842534..8e02118f25f1 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -84,6 +84,8 @@ define PETITBOOT_POST_INSTALL $(TARGET_DIR)/etc/init.d/pb-console $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-shell \ $(TARGET_DIR)/usr/libexec/petitboot/pb-shell + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/shell_profile \ + $(TARGET_DIR)/home/petituser/.profile mkdir -p $(TARGET_DIR)/etc/udev/rules.d for port in $(PETITBOOT_GETTY_PORT); do \ @@ -97,4 +99,8 @@ endef PETITBOOT_POST_INSTALL_TARGET_HOOKS += PETITBOOT_POST_INSTALL +define PETITBOOT_USERS + petituser -1 petitgroup -1 * /home/petituser /bin/sh - petitboot user +endef + $(eval $(autotools-package)) diff --git a/package/petitboot/shell_profile b/package/petitboot/shell_profile new file mode 100644 index 000000000000..a958ca4402f2 --- /dev/null +++ b/package/petitboot/shell_profile @@ -0,0 +1,3 @@ +if [ "$PPID" = "1" ]; then + exec /usr/libexec/petitboot/pb-console +fi -- 2.39.3 From arbab at linux.ibm.com Wed Feb 7 17:51:30 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 7 Feb 2024 11:51:30 -0600 Subject: [Buildroot] [PATCH v5 0/5] package/petitboot: misc fixes/enhancement Message-ID: <20240207175135.1532037-1-arbab@linux.ibm.com> The br2-external tree used to build OpenPOWER firmware has long carried petitboot as a custom package[1]. Now that petitboot has been added to buildroot proper, it would be nice to leverage the base package instead. To make that transition easier, here is a set of patches which port over some of the enhancements made to that external package. [1] https://github.com/open-power/op-build/tree/master/openpower/package/petitboot --- v5: * Rebase to apply on top of some recent NLS fixes. * Nobody replied to v4. Cc'ing some more people in hopes of getting these changes into the next release. v4: * Change the buildroot menu help to say that petitboot *looks best* in a UTF-8 locale, not that it *needs* one. * Change the shutdown patch to accomodate any buildroot init system. * Split the user separation patch into a couple of smaller ones with better log messages. v3: * Add a number of small fixes. * Add user separation, so the UI runs as non-root. * Remove udev rules that enabled some additional types of boot devices. These should more appropriately live outside of buildroot. * Remove a sysctl.d file to silence kernel output. I think there's a bug upstream; see https://github.com/open-power/petitboot/pull/103 v2: * Use Laurent's suggested additions to "run pb-console at boot" patch. Reza Arbab (5): package/petitboot: minor makefile cleanup package/petitboot: prefer UTF-8 support package/petitboot: fix shutdown package/petitboot: run script when exiting to shell package/petitboot: run UI as non-root user package/petitboot/Config.in | 4 ++++ package/petitboot/S15pb-discover | 4 +++- package/petitboot/kexec-restart | 26 ++++++++++++++++++++++++ package/petitboot/pb-console | 6 ++++-- package/petitboot/pb-shell | 10 +++++++++ package/petitboot/petitboot.mk | 35 ++++++++++++++++++++++++++------ package/petitboot/shell_profile | 3 +++ 7 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 package/petitboot/kexec-restart create mode 100644 package/petitboot/pb-shell create mode 100644 package/petitboot/shell_profile -- 2.39.3 From arbab at linux.ibm.com Wed Feb 7 17:51:33 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Wed, 7 Feb 2024 11:51:33 -0600 Subject: [Buildroot] [PATCH v5 3/5] package/petitboot: fix shutdown In-Reply-To: <20240207175135.1532037-1-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> Message-ID: <20240207175135.1532037-4-arbab@linux.ibm.com> It's good practice to unmount filesystems and gracefully terminate running services before running "kexec -e". So when a boot option has been chosen from the petitboot menu, poke init to shut the system down and kexec the new kernel. One benefit to us in particular is that when pb-console is killed, it notifies the user that we're booting: trap 'reset; echo "SIGTERM received, booting..."; sleep 2' SIGTERM This terminal reset is also useful, exiting the ncurses visual mode so subsequent boot output is raw rather than being confined to the window set up for the petitboot menu. Currently we assume busybox init, but do not add an accompanying entry in the inittab to run kexec, so things aren't working. Fix this and accomodate the other buildroot init systems as well. Signed-off-by: Reza Arbab --- package/petitboot/kexec-restart | 26 ++++++++++++++++++++++++++ package/petitboot/petitboot.mk | 20 +++++++++++++++++--- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 package/petitboot/kexec-restart diff --git a/package/petitboot/kexec-restart b/package/petitboot/kexec-restart new file mode 100644 index 000000000000..14e6899f70bb --- /dev/null +++ b/package/petitboot/kexec-restart @@ -0,0 +1,26 @@ +#!/bin/sh + +case "$(/usr/bin/readlink -f /proc/1/exe)" in + /bin/busybox) + # inittab "restart" runlevel entry runs kexec + /bin/kill -QUIT 1 + ;; + /sbin/init) + # inittab runlevel 6 entry runs kexec + /sbin/shutdown -r now + ;; + /sbin/openrc-init) + /sbin/openrc-shutdown --kexec now + ;; + /usr/lib/systemd/systemd) + /usr/bin/systemctl kexec + ;; + *) + /usr/sbin/kexec -f -e + ;; +esac + +while : +do + sleep 1 +done diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 4c8bc35adb38..291083269ae9 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -29,7 +29,7 @@ PETITBOOT_CONF_OPTS = \ --without-twin-x11 \ $(if $(BR2_PACKAGE_BUSYBOX),--enable-busybox,--disable-busybox) \ HOST_PROG_KEXEC=/usr/sbin/kexec \ - HOST_PROG_SHUTDOWN=/usr/libexec/petitboot/bb-kexec-reboot + HOST_PROG_SHUTDOWN=/usr/sbin/kexec-restart # HPA and Busybox tftp are supported. HPA tftp is part of Buildroot's tftpd # package. @@ -54,17 +54,31 @@ else PETITBOOT_CONF_OPTS += --without-fdt endif +ifeq ($(BR2_INIT_BUSYBOX),y) +define PETITBOOT_BUSYBOX_INITTAB + grep -q kexec $(TARGET_DIR)/etc/inittab || \ + printf "\nnull::restart:/usr/sbin/kexec -f -e\n" >> $(TARGET_DIR)/etc/inittab +endef +PETITBOOT_TARGET_FINALIZE_HOOKS += PETITBOOT_BUSYBOX_INITTAB +else ifeq ($(BR2_INIT_SYSV),y) +define PETITBOOT_SYSV_INITTAB + grep -q kexec $(TARGET_DIR)/etc/inittab || \ + $(SED) 's~^reb0:.*~reb0:6:wait:/usr/sbin/kexec -f -e~' $(TARGET_DIR)/etc/inittab +endef +PETITBOOT_TARGET_FINALIZE_HOOKS += PETITBOOT_SYSV_INITTAB +endif + PETITBOOT_GETTY_PORT = $(patsubst %,'%',$(call qstrip,$(BR2_PACKAGE_PETITBOOT_GETTY_PORT))) define PETITBOOT_POST_INSTALL - $(INSTALL) -D -m 0755 $(@D)/utils/bb-kexec-reboot \ - $(TARGET_DIR)/usr/libexec/petitboot/bb-kexec-reboot $(INSTALL) -D -m 0755 $(@D)/utils/hooks/01-create-default-dtb \ $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ $(TARGET_DIR)/etc/init.d/S15pb-discover + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/kexec-restart \ + $(TARGET_DIR)/usr/sbin/kexec-restart $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-console \ $(TARGET_DIR)/etc/init.d/pb-console -- 2.39.3 From peter at korsgaard.com Wed Feb 7 18:06:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 7 Feb 2024 19:06:19 +0100 Subject: [Buildroot] [PATCH] package/ruby: build host-ruby with yaml support Message-ID: <20240207180620.298393-1-peter@korsgaard.com> webkitgtk/wpewebkit needs a host-ruby with yaml support, otherwise the build fails with errors like: cd /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore && \ /home/peko/source/buildroot/output/host/bin/ruby \ /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/GenerateSettings.rb \ --outputDir /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/WebCore/DerivedSources \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.cpp.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.idl.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/InternalSettingsGenerated.h.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/Settings.cpp.erb \ --template /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/Scripts/SettingsTemplates/Settings.h.erb \ /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml \ /home/peko/source/buildroot/output/build/webkitgtk-2.42.2/Source/WebCore/page/Settings.yaml /home/peko/source/buildroot/output/host/lib/ruby/3.3.0/yaml.rb:3: warning: It seems your ruby installation is missing psych (for YAML output). To eliminate this warning, please install libyaml and reinstall your ruby. We do not currently have any Config.in.host options for ruby or libyaml, but given how small/fast libyaml is to build just do it unconditionally. Signed-off-by: Peter Korsgaard --- package/ruby/ruby.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 4b9ce80e67..00fa0e0f65 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -20,7 +20,7 @@ RUBY_LICENSE_FILES = LEGAL COPYING BSDL RUBY_CPE_ID_VENDOR = ruby-lang RUBY_DEPENDENCIES = host-pkgconf host-ruby -HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl +HOST_RUBY_DEPENDENCIES = host-libyaml host-pkgconf host-openssl RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) RUBY_CONF_OPTS = \ --disable-install-doc \ -- 2.39.2 From yann.morin.1998 at free.fr Wed Feb 7 18:48:22 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 19:48:22 +0100 Subject: [Buildroot] [git commit] package/uuu: drop README.md from license files Message-ID: <20240207184901.EAC7C87694@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b5d83b4b649ee1e77811d9bf8ca6398725f6cce1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The patch drops the file README.md from the license files. Indeed, the licensing terms apply to third-party libraries that uuu links to, and even though they are bundled in the source tree of uuu|mfgtools, they are not used by Buildroot as we use the ones we build. Therefore, the actual license file of the package is the file LICENSE. Moreover, this also leads to simplifying the bump to new versions. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/uuu/uuu.hash | 1 - package/uuu/uuu.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash index c231d5d729..e45cbb8680 100644 --- a/package/uuu/uuu.hash +++ b/package/uuu/uuu.hash @@ -1,4 +1,3 @@ # locally computed sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE -sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index 80d5e1937a..5800277b10 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -8,7 +8,7 @@ UUU_VERSION = 1.5.165 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License -UUU_LICENSE_FILES = LICENSE README.md +UUU_LICENSE_FILES = LICENSE HOST_UUU_DEPENDENCIES = \ host-bzip2 \ host-libusb \ From yann.morin.1998 at free.fr Wed Feb 7 18:49:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 19:49:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/uuu: drop README.md from license files In-Reply-To: <20240207173911.3704142-1-dario.binacchi@amarulasolutions.com> References: <20240207173911.3704142-1-dario.binacchi@amarulasolutions.com> Message-ID: Darrio, All, On 2024-02-07 18:39 +0100, Dario Binacchi spake thusly: > The patch drops the file README.md from the license files. Indeed, the > licensing terms apply to third-party libraries that uuu links to, and > even though they are bundled in the source tree of uuu|mfgtools, they > are not used by Buildroot as we use the ones we build. Therefore, the > actual license file of the package is the file LICENSE. > > Moreover, this also leads to simplifying the bump to new versions. > > Signed-off-by: Dario Binacchi Applied to master from Brussels airport, thanks. Regards, Yann E. MORIN. > --- > package/uuu/uuu.hash | 1 - > package/uuu/uuu.mk | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash > index c231d5d729f0..e45cbb868078 100644 > --- a/package/uuu/uuu.hash > +++ b/package/uuu/uuu.hash > @@ -1,4 +1,3 @@ > # locally computed > sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz > sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE > -sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md > diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk > index 80d5e1937a97..5800277b10d5 100644 > --- a/package/uuu/uuu.mk > +++ b/package/uuu/uuu.mk > @@ -8,7 +8,7 @@ UUU_VERSION = 1.5.165 > UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz > UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) > UUU_LICENSE = BSD 3-Clause "New" or "Revised" License > -UUU_LICENSE_FILES = LICENSE README.md > +UUU_LICENSE_FILES = LICENSE > HOST_UUU_DEPENDENCIES = \ > host-bzip2 \ > host-libusb \ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Feb 7 18:51:23 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 19:51:23 +0100 Subject: [Buildroot] [git commit] package/libopenssl: add patches fixing hangs asn1parse Message-ID: <20240207185138.CB0DC8769C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=55c6ae5656a0bbd04baf5d6fbbeb060124e71e4a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The asn1parse command hangs forever on 3.2.0 when the genstr or genconf option is passed. This commit fixes the issue by adding upstream commits [1] [2]. [1] https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 [2] https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e Signed-off-by: Martin Kurbanov Signed-off-by: Thomas Petazzoni --- ...05-Fix-genstr-genconf-option-in-asn1parse.patch | 42 +++++++ ...-Harden-asn1-oid-loader-to-invalid-inputs.patch | 122 +++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch b/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch new file mode 100644 index 0000000000..9fa36d83be --- /dev/null +++ b/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch @@ -0,0 +1,42 @@ +From 749fcc0e3ce796474a15d6fac221e57daeacff1e Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Tue, 5 Dec 2023 14:50:01 -0500 +Subject: [PATCH] Fix genstr/genconf option in asn1parse + +At some point the asn1parse applet was changed to default the inform to +PEM, and defalt input file to stdin. Doing so broke the -genstr|conf options, +in that, before we attempt to generate an ASN1 block from the provided +genstr string, we attempt to read a PEM input from stdin. As a result, +this command: +openssl asn1parse -genstr OID:1.2.3.4 +hangs because we are attempting a blocking read on stdin, waiting for +data that never arrives + +Fix it by giving priority to genstr|genconf, such that, if set, will just run +do_generate on that string and exit + +Reviewed-by: Hugo Landau +Reviewed-by: Tomas Mraz +(Merged from https://github.com/openssl/openssl/pull/22957) +Upstream: https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e +Signed-off-by: Martin Kurbanov +--- + apps/asn1parse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apps/asn1parse.c b/apps/asn1parse.c +index 097b0cc1ed..6597a6180b 100644 +--- a/apps/asn1parse.c ++++ b/apps/asn1parse.c +@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) + + if ((buf = BUF_MEM_new()) == NULL) + goto end; +- if (informat == FORMAT_PEM) { ++ if (genstr == NULL && informat == FORMAT_PEM) { + if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { + BIO_printf(bio_err, "Error reading PEM file\n"); + ERR_print_errors(bio_err); +-- +2.40.0 + diff --git a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch b/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch new file mode 100644 index 0000000000..299ecbc2ed --- /dev/null +++ b/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch @@ -0,0 +1,122 @@ +From a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Tue, 5 Dec 2023 15:24:20 -0500 +Subject: [PATCH] Harden asn1 oid loader to invalid inputs + +In the event that a config file contains this sequence: +======= +openssl_conf = openssl_init + +config_diagnostics = 1 + +[openssl_init] +oid_section = oids + +[oids] +testoid1 = 1.2.3.4.1 +testoid2 = A Very Long OID Name, 1.2.3.4.2 +testoid3 = ,1.2.3.4.3 +====== + +The leading comma in testoid3 can cause a heap buffer overflow, as the +parsing code will move the string pointer back 1 character, thereby +pointing to an invalid memory space + +correct the parser to detect this condition and handle it by treating it +as if the comma doesn't exist (i.e. an empty long oid name) + +Reviewed-by: Hugo Landau +Reviewed-by: Tomas Mraz +(Merged from https://github.com/openssl/openssl/pull/22957) +Upstream: https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 +Signed-off-by: Martin Kurbanov +--- + apps/asn1parse.c | 2 +- + crypto/asn1/asn_moid.c | 4 ++++ + test/recipes/04-test_asn1_parse.t | 26 ++++++++++++++++++++++++++ + test/test_asn1_parse.cnf | 12 ++++++++++++ + 4 files changed, 43 insertions(+), 1 deletion(-) + create mode 100644 test/recipes/04-test_asn1_parse.t + create mode 100644 test/test_asn1_parse.cnf + +diff --git a/apps/asn1parse.c b/apps/asn1parse.c +index 6597a6180b..bf62f85947 100644 +--- a/apps/asn1parse.c ++++ b/apps/asn1parse.c +@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) + + if ((buf = BUF_MEM_new()) == NULL) + goto end; +- if (genstr == NULL && informat == FORMAT_PEM) { ++ if (genconf == NULL && genstr == NULL && informat == FORMAT_PEM) { + if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { + BIO_printf(bio_err, "Error reading PEM file\n"); + ERR_print_errors(bio_err); +diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c +index 6f816307af..1e183f4f18 100644 +--- a/crypto/asn1/asn_moid.c ++++ b/crypto/asn1/asn_moid.c +@@ -67,6 +67,10 @@ static int do_create(const char *value, const char *name) + if (p == NULL) { + ln = name; + ostr = value; ++ } else if (p == value) { ++ /* we started with a leading comma */ ++ ln = name; ++ ostr = p + 1; + } else { + ln = value; + ostr = p + 1; +diff --git a/test/recipes/04-test_asn1_parse.t b/test/recipes/04-test_asn1_parse.t +new file mode 100644 +index 0000000000..f3af436592 +--- /dev/null ++++ b/test/recipes/04-test_asn1_parse.t +@@ -0,0 +1,26 @@ ++#! /usr/bin/env perl ++# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. ++# ++# Licensed under the Apache License 2.0 (the "License"). You may not use ++# this file except in compliance with the License. You can obtain a copy ++# in the file LICENSE in the source distribution or at ++# https://www.openssl.org/source/license.html ++ ++use strict; ++use OpenSSL::Test qw(:DEFAULT srctop_file); ++use OpenSSL::Test::Utils; ++ ++setup("test_asn1_parse"); ++ ++plan tests => 3; ++ ++$ENV{OPENSSL_CONF} = srctop_file("test", "test_asn1_parse.cnf"); ++ ++ok(run(app(([ 'openssl', 'asn1parse', ++ '-genstr', 'OID:1.2.3.4.1'])))); ++ ++ok(run(app(([ 'openssl', 'asn1parse', ++ '-genstr', 'OID:1.2.3.4.2'])))); ++ ++ok(run(app(([ 'openssl', 'asn1parse', ++ '-genstr', 'OID:1.2.3.4.3'])))); +diff --git a/test/test_asn1_parse.cnf b/test/test_asn1_parse.cnf +new file mode 100644 +index 0000000000..5f0305657e +--- /dev/null ++++ b/test/test_asn1_parse.cnf +@@ -0,0 +1,12 @@ ++openssl_conf = openssl_init ++ ++# Comment out the next line to ignore configuration errors ++config_diagnostics = 1 ++ ++[openssl_init] ++oid_section = oids ++ ++[oids] ++testoid1 = 1.2.3.4.1 ++testoid2 = A Very Long OID Name, 1.2.3.4.2 ++testoid3 = ,1.2.3.4.3 +-- +2.40.0 + From thomas.petazzoni at bootlin.com Wed Feb 7 18:52:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 19:52:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/libopenssl: add patches fixing hangs asn1parse In-Reply-To: <20240119150244.204049-1-mmkurbanov@salutedevices.com> References: <20240119150244.204049-1-mmkurbanov@salutedevices.com> Message-ID: <20240207195216.5ded8acb@windsurf> On Fri, 19 Jan 2024 18:02:44 +0300 Martin Kurbanov via buildroot wrote: > The asn1parse command hangs forever on 3.2.0 when the genstr or genconf > option is passed. > > This commit fixes the issue by adding upstream commits [1] [2]. > > [1] https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 > [2] https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e > > Signed-off-by: Martin Kurbanov > --- > ...x-genstr-genconf-option-in-asn1parse.patch | 42 ++++++ > ...en-asn1-oid-loader-to-invalid-inputs.patch | 122 ++++++++++++++++++ > 2 files changed, 164 insertions(+) > create mode 100644 package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch > create mode 100644 package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch Sorry for the delay in getting back to you! I have applied your patch, after updating the two patches to indicate the final upstream commit references, rather than the reference to the pull request. Thanks a lot for your contribution! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 18:56:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 19:56:12 +0100 Subject: [Buildroot] [PATCH 1/1] boot/ti-k3-r5-loader: add support for patch files and URLs In-Reply-To: <20231129172852.1684628-1-dario.binacchi@amarulasolutions.com> References: <20231129172852.1684628-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240207195612.7ea08e54@windsurf> On Wed, 29 Nov 2023 18:28:52 +0100 Dario Binacchi wrote: > The patch adds support for URLs using similar code as found > in linux/linux.mk and uboot/uboot.mk. > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3-r5-loader/Config.in | 11 +++++++++++ > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 18 ++++++++++++++++++ > 2 files changed, 29 insertions(+) Thanks a lot for your proposal, but we no longer add package-specific options to apply patches, as BR2_GLOBAL_PATCH_DIR allows to patch all packages. We do have options that exist for linux and u-boot indeed, because they predate BR2_GLOBAL_PATCH_DIR, and we need to keep them for backwards compatibility. But we do not introduce such options for new packages. For the example, the arm-trusted-firmware has no custom patch option, because BR2_GLOBAL_PATCH_DIR can/should be used instead. Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 18:58:28 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 19:58:28 +0100 Subject: [Buildroot] [git commit] utils/scanpypi: use a set comprehension for dependencies Message-ID: <20240207185839.909778769F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c12e1c7b5946aa7ddc744e17ba5d3d04d639b075 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This ensures that we don't have duplicate dependencies. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- utils/scanpypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/scanpypi b/utils/scanpypi index 021c99a172..5a58550145 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -411,8 +411,8 @@ class BuildrootPackage(): for req in self.pkg_req] # get rid of commented lines and also strip the package strings - self.pkg_req = [item.strip() for item in self.pkg_req - if len(item) > 0 and item[0] != '#'] + self.pkg_req = {item.strip() for item in self.pkg_req + if len(item) > 0 and item[0] != '#'} req_not_found = self.pkg_req self.pkg_req = list(map(pkg_buildroot_name, self.pkg_req)) From thomas.petazzoni at bootlin.com Wed Feb 7 19:00:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:00:08 +0100 Subject: [Buildroot] [PATCH 1/1] utils/scanpypi: use a set comprehension for dependencies In-Reply-To: <20231130211910.2298144-1-james.hilliard1@gmail.com> References: <20231130211910.2298144-1-james.hilliard1@gmail.com> Message-ID: <20240207200008.3a125f1c@windsurf> On Thu, 30 Nov 2023 14:19:10 -0700 James Hilliard wrote: > This ensures that we don't have duplicate dependencies. > > Signed-off-by: James Hilliard > --- > utils/scanpypi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 7 19:07:46 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 20:07:46 +0100 Subject: [Buildroot] [PATCH v4 6/7] package/llvm-project: add opencl-c-base.h on target In-Reply-To: <20240202093625.1409559-7-antoine.coutant@smile.fr> References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-7-antoine.coutant@smile.fr> Message-ID: Antoine, All, On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: > rusticl depends on the mesa clc_compile_to_llvm_module function. > This function requires opencl-c-base.h when LLVM version >= 15. > > The header is deleted automatically by CLANG_FILES_TO_REMOVE > post install target hook in llvm-project/clang package. > When rusticl is enabled, after the whole clang directory has > been removed, the header is copied back to > /usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/ > > By default, the mesa3d variable used to retrieve the header > is set to the staging directory on the host machine. A merge > request on mesa's gitlab solved this problem. See: > > https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25568 > > The patches have been backported to mesa 23.3.4. > > Signed-off-by: Antoine Coutant > --- > Changes v3 -> v4: > - Add patches merged by mesa upstream. Adding those patches has nothing to do in this commit, but should in the next one, that adds rusticl support in mesa3d, right? Regards, Yann E. MORIN. > --- > Running an app that uses rusticl leads to an error. > Example: > > RUSTICL_ENABLE=panfrost clpeak > > Platform: rusticl > Device: Mali-G52 (Panfrost) > Driver version : 23.3.4 (Linux ARM64) > Compute units : 2 > Clock frequency : 800 MHz > Build Log: :1:10: fatal error: 'opencl-c-base.h' file not found > Error executing LLVM compilation action. > > Signed-off-by: Antoine Coutant > --- > package/llvm-project/clang/clang.mk | 9 ++ > ...ncl-external-clang-headers-option-an.patch | 72 ++++++++++++++++ > ...or-every-user-when-using-shared-LLVM.patch | 40 +++++++++ > ...lc-retrieve-libclang-path-at-runtime.patch | 86 +++++++++++++++++++ > 4 files changed, 207 insertions(+) > create mode 100644 package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch > create mode 100644 package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch > create mode 100644 package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch > > diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk > index 0bafd6461b..09aac7f0ec 100644 > --- a/package/llvm-project/clang/clang.mk > +++ b/package/llvm-project/clang/clang.mk > @@ -90,6 +90,15 @@ define HOST_CLANG_INSTALL_CLANG_TBLGEN > endef > HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN > > +# Rusticl needs opencl-c-base.h to be present on the target. > +define CLANG_OPENCL_C_BASE_HEADER_TO_TARGET > + mkdir -p $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include > + $(INSTALL) -D -m 0644 $(@D)/lib/Headers/opencl-c-base.h $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/opencl-c-base.h > +endef > +ifeq ($(BR2_PACKAGE_MESA3D_RUSTICL),y) > +CLANG_POST_INSTALL_TARGET_HOOKS += CLANG_OPENCL_C_BASE_HEADER_TO_TARGET > +endif > + > # This option must be enabled to link libclang dynamically against libLLVM.so > HOST_CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON > CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON > diff --git a/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch > new file mode 100644 > index 0000000000..ebe3542627 > --- /dev/null > +++ b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch > @@ -0,0 +1,72 @@ > +From b7f2ada31d85dfd2e9906a7343d14a3b0b85cf14 Mon Sep 17 00:00:00 2001 > +From: Karol Herbst > +Date: Tue, 2 Jan 2024 22:58:39 +0100 > +Subject: [PATCH 1/3] meson: remove opencl-external-clang-headers option and > + rely on shared-llvm > + > +Setting opencl-external-clang-headers to enabled while using shared LLVM > +was broken and this option was mostly used for windows to force static > +inclusion of opencl base headers. > + > +Simply relying on the shared-llvm option here is enough to get what we > +want. > + > +Signed-off-by: Karol Herbst > +Reviewed-by: Jesse Natalie > +Part-of: > +[antoine.coutant at smile.fr: backported to mesa-23.3.4] > +Signed-off-by: Antoine Coutant > +--- > + .gitlab-ci/windows/mesa_build.ps1 | 1 - > + meson_options.txt | 7 ------- > + src/compiler/clc/meson.build | 4 +--- > + 3 files changed, 1 insertion(+), 11 deletions(-) > + > +diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 > +index a4f87c4eadb..e79eb6b6587 100644 > +--- a/.gitlab-ci/windows/mesa_build.ps1 > ++++ b/.gitlab-ci/windows/mesa_build.ps1 > +@@ -59,7 +59,6 @@ meson setup ` > + -Dopencl-spirv=true ` > + -Dmicrosoft-clc=enabled ` > + -Dstatic-libclc=all ` > +--Dopencl-external-clang-headers=disabled ` > + -Dspirv-to-dxil=true ` > + -Dbuild-tests=true ` > + -Dwerror=true ` > +diff --git a/meson_options.txt b/meson_options.txt > +index e885ba61a8a..537ba797407 100644 > +--- a/meson_options.txt > ++++ b/meson_options.txt > +@@ -191,13 +191,6 @@ option( > + description : 'Link libclc SPIR-V statically.', > + ) > + > +-option( > +- 'opencl-external-clang-headers', > +- type : 'feature', > +- description : 'Use system Clang headers at runtime for OpenCL kernel ' + > +- 'compilation.', > +-) > +- > + option( > + 'd3d-drivers-path', > + type : 'string', > +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build > +index 3e4f1a7f441..81345225768 100644 > +--- a/src/compiler/clc/meson.build > ++++ b/src/compiler/clc/meson.build > +@@ -30,9 +30,7 @@ _libmesaclc_c_args = [] > + _libmesaclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)] > + _libmesaclc_sources = [] > + > +-if get_option('opencl-external-clang-headers') \ > +- .disable_auto_if(host_machine.system() == 'windows') \ > +- .disabled() > ++if not _shared_llvm > + # LLVM 16 moved clang header path from using full version to only major version > + if dep_llvm.version().version_compare('< 16') > + # Prior to LLVM 16, this path used a full version > +-- > +2.25.1 > + > diff --git a/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch > new file mode 100644 > index 0000000000..3560f6805f > --- /dev/null > +++ b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch > @@ -0,0 +1,40 @@ > +From 56c85c4c7a757a9ba3d8ac08e6c4c4c7f19e6cab Mon Sep 17 00:00:00 2001 > +From: Karol Herbst > +Date: Thu, 11 Jan 2024 14:55:46 +0100 > +Subject: [PATCH 2/3] clc: force fPIC for every user when using shared LLVM > + > +As we want to start using `dladdr`, this is needed to prevent `dladdr` > +returning information of the wrong file. > + > +Fixes tag as it's required by the actual fix. > + > +Signed-off-by: Karol Herbst > +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") > +Part-of: > +[antoine.coutant at smile.fr: backported to mesa-23.3.4] > +Signed-off-by: Antoine Coutant > +--- > + src/compiler/clc/meson.build | 6 ++++++ > + 1 file changed, 6 insertions(+) > + > +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build > +index 81345225768..442a583065b 100644 > +--- a/src/compiler/clc/meson.build > ++++ b/src/compiler/clc/meson.build > +@@ -123,7 +123,13 @@ _libmesaclc = static_library( > + idep_mesautil, dep_spirv_tools] > + ) > + > ++_idep_mesaclc_link_args = [] > ++if _shared_llvm > ++ _idep_mesaclc_link_args += cc.get_supported_link_arguments('-fPIC') > ++endif > ++ > + idep_mesaclc = declare_dependency( > + link_with : _libmesaclc, > + include_directories : include_directories('.'), > ++ link_args : _idep_mesaclc_link_args, > + ) > +-- > +2.25.1 > + > diff --git a/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch > new file mode 100644 > index 0000000000..c19ba7d2b7 > --- /dev/null > +++ b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch > @@ -0,0 +1,86 @@ > +From fa2c045e04370beb454951c32bccc087638e04c7 Mon Sep 17 00:00:00 2001 > +From: Antoine Coutant > +Date: Thu, 30 Nov 2023 11:10:20 +0100 > +Subject: [PATCH 3/3] clc: retrieve libclang path at runtime. > + > +LLVM_LIB_DIR is a variable used for runtime compilations. > +When cross compiling, LLVM_LIB_DIR must be set to the > +libclang path on the target. So, this path should not > +be retrieved during compilation but at runtime. > + > +dladdr uses an address to search for a loaded library. > +If a library is found, it returns information about it. > +The path to the libclang library can therefore be > +retrieved using one of its functions. This is useful > +because we don't know the name of the libclang library > +(libclang.so.X or libclang-cpp.so.X) > + > +v2 (Karol): use clang::CompilerInvocation::CreateFromArgs for dladdr > +v3 (Karol): follow symlinks to fix errors on debian > + > +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") > +Signed-off-by: Antoine Coutant > +Reviewed-by: Karol Herbst > +Reviewed-by (v1): Jesse Natalie > +[antoine.coutant at smile.fr: backported to mesa-23.3.4] > + > +Part-of: > +--- > + src/compiler/clc/clc_helpers.cpp | 24 +++++++++++++++++++++--- > + 1 file changed, 21 insertions(+), 3 deletions(-) > + > +diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp > +index 55287f22683..22eb3495be9 100644 > +--- a/src/compiler/clc/clc_helpers.cpp > ++++ b/src/compiler/clc/clc_helpers.cpp > +@@ -23,6 +23,7 @@ > + // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + // OTHER DEALINGS IN THE SOFTWARE. > + > ++#include > + #include > + #include > + #include > +@@ -57,6 +58,10 @@ > + > + #include "spirv.h" > + > ++#if DETECT_OS_UNIX > ++#include > ++#endif > ++ > + #ifdef USE_STATIC_OPENCL_C_H > + #if LLVM_VERSION_MAJOR < 15 > + #include "opencl-c.h.h" > +@@ -876,12 +881,25 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx, > + #endif > + } > + #else > ++ > ++ Dl_info info; > ++ if (dladdr((void *)clang::CompilerInvocation::CreateFromArgs, &info) == 0) { > ++ clc_error(logger, "Couldn't find libclang path.\n"); > ++ return {}; > ++ } > ++ > ++ char *clang_path = realpath(info.dli_fname, NULL); > ++ if (clang_path == nullptr) { > ++ clc_error(logger, "Couldn't find libclang path.\n"); > ++ return {}; > ++ } > ++ > + // GetResourcePath is a way to retrive the actual libclang resource dir based on a given binary > +- // or library. The path doesn't even need to exist, we just have to put something in there, > +- // because we might have linked clang statically. > ++ // or library. > + auto libclang_path = fs::path(LLVM_LIB_DIR) / "libclang.so"; > + auto clang_res_path = > +- fs::path(Driver::GetResourcesPath(libclang_path.string(), CLANG_RESOURCE_DIR)) / "include"; > ++ fs::path(Driver::GetResourcesPath(std::string(clang_path), CLANG_RESOURCE_DIR)) / "include"; > ++ free(clang_path); > + > + c->getHeaderSearchOpts().UseBuiltinIncludes = true; > + c->getHeaderSearchOpts().UseStandardSystemIncludes = true; > +-- > +2.25.1 > + > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 7 19:13:48 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 20:13:48 +0100 Subject: [Buildroot] [git commit] package/petitboot: minor makefile cleanup Message-ID: <20240207191413.2325C876A6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de86cac61bb2cbe875707990e49e80eccdba2796 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Normalize the order of arguments to $(INSTALL). Remove an unnecessary pair of parentheses. Signed-off-by: Reza Arbab Signed-off-by: Yann E. MORIN --- package/petitboot/petitboot.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 2087f01b09..4c8bc35adb 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -63,15 +63,15 @@ define PETITBOOT_POST_INSTALL $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb - $(INSTALL) -m 0755 -D $(PETITBOOT_PKGDIR)/S15pb-discover \ + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ $(TARGET_DIR)/etc/init.d/S15pb-discover $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-console \ $(TARGET_DIR)/etc/init.d/pb-console mkdir -p $(TARGET_DIR)/etc/udev/rules.d - (for port in $(PETITBOOT_GETTY_PORT); do \ + for port in $(PETITBOOT_GETTY_PORT); do \ printf 'SUBSYSTEM=="tty", KERNEL=="%s", RUN+="/etc/init.d/pb-console start $$name"\n' "$$port"; \ - done) > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules + done > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules mkdir -p $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ ln -sf /usr/sbin/pb-udhcpc \ From yann.morin.1998 at free.fr Wed Feb 7 19:14:16 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 20:14:16 +0100 Subject: [Buildroot] [PATCH v5 1/5] package/petitboot: minor makefile cleanup In-Reply-To: <20240207175135.1532037-2-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> <20240207175135.1532037-2-arbab@linux.ibm.com> Message-ID: Reza, All, On 2024-02-07 11:51 -0600, Reza Arbab spake thusly: > Normalize the order of arguments to $(INSTALL). Remove an unnecessary > pair of parentheses. > > Signed-off-by: Reza Arbab Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/petitboot/petitboot.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk > index 2087f01b090c..4c8bc35adb38 100644 > --- a/package/petitboot/petitboot.mk > +++ b/package/petitboot/petitboot.mk > @@ -63,15 +63,15 @@ define PETITBOOT_POST_INSTALL > $(TARGET_DIR)/etc/petitboot/boot.d/01-create-default-dtb > $(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \ > $(TARGET_DIR)/etc/petitboot/boot.d/90-sort-dtb > - $(INSTALL) -m 0755 -D $(PETITBOOT_PKGDIR)/S15pb-discover \ > + $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/S15pb-discover \ > $(TARGET_DIR)/etc/init.d/S15pb-discover > $(INSTALL) -D -m 0755 $(PETITBOOT_PKGDIR)/pb-console \ > $(TARGET_DIR)/etc/init.d/pb-console > > mkdir -p $(TARGET_DIR)/etc/udev/rules.d > - (for port in $(PETITBOOT_GETTY_PORT); do \ > + for port in $(PETITBOOT_GETTY_PORT); do \ > printf 'SUBSYSTEM=="tty", KERNEL=="%s", RUN+="/etc/init.d/pb-console start $$name"\n' "$$port"; \ > - done) > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules > + done > $(TARGET_DIR)/etc/udev/rules.d/petitboot-console-ui.rules > > mkdir -p $(TARGET_DIR)/usr/share/udhcpc/default.script.d/ > ln -sf /usr/sbin/pb-udhcpc \ > -- > 2.39.3 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas at devoogdt.com Wed Feb 7 19:15:04 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 7 Feb 2024 20:15:04 +0100 Subject: [Buildroot] [PATCH v8 1/2] package/cairo: move to the meson build system In-Reply-To: <87le7wz1tv.fsf@48ers.dk> References: <20240205212300.3178519-2-thomas@devoogdt.com> <20240205213035.3180167-1-thomas@devoogdt.com> <87le7wz1tv.fsf@48ers.dk> Message-ID: Hi Peter, I compiled cairo with the same config, once with autotools (current master), and once with the meson patch. Compile with autotools-package: CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x cairo (version 1.17.4 [snapshot]) will be compiled with: The following surface backends: ... Xlib: yes Xlib Xrender: no (disabled, use --enable-xlib-xrender to enable) XCB: yes The following functions: ... X11-xcb functions: no (disabled, use --enable-xlib-xcb to enable) XCB-shm functions: yes Compile with meson-package: CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled cairo 1.17.4 Surface Backends ... Xlib : YES Xlib Xrender : YES XCB : YES Functions ... X11-xcb : YES XCB-shm : YES So it seems that autotools just didn't compile xrender support, while meson does require it. See https://gitlab.freedesktop.org/cairo/cairo/-/blame/1.17.4/meson.build#L277. So it seems that the git commit message should be adapted slightly. Kr, Thomas Op wo 7 feb 2024 om 17:17 schreef Peter Korsgaard : > > >>>>> "Thomas" == Thomas Devoogdt writes: > > > - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy > > since they are not selectable anymore in the meson-build options. > > BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. > > > - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG > > option already selects that one. This is now in sync with the > > meson build options. > > > - Note that the dependencies for the various options are slightly changed, > > but there is not much mentioned about that, the meson introduction is done > > in one big commit: [1]. > > > - Added xlib_libXrender dependency, which was already required > > before meson, it just came to my attention since it's a hard > > error now. > > In what configuration do you see that? I just did a test with current > master (commit 6008f2b1b901b) and the following defconfig without > issues: > > BR2_arm=y > BR2_cortex_a9=y > BR2_ARM_ENABLE_VFP=y > BR2_TOOLCHAIN_EXTERNAL=y > BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y > BR2_INIT_NONE=y > BR2_SYSTEM_BIN_SH_NONE=y > # BR2_PACKAGE_BUSYBOX is not set > BR2_PACKAGE_XORG7=y > BR2_PACKAGE_CAIRO=y > # BR2_TARGET_ROOTFS_TAR is not set > > -- > Bye, Peter Korsgaard > From thomas.petazzoni at bootlin.com Wed Feb 7 19:22:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:22:25 +0100 Subject: [Buildroot] [PATCH v2 1/1] utils/scanpypi: refactor setuptools handling to not use imp In-Reply-To: <20231130212153.2299051-1-james.hilliard1@gmail.com> References: <20231130212153.2299051-1-james.hilliard1@gmail.com> Message-ID: <20240207202225.1755a09b@windsurf> Hello James, On Thu, 30 Nov 2023 14:21:53 -0700 James Hilliard wrote: > The imp module is deprecated as of python verison 3.12. > > Refactor setuptools handling to remove monkeypatching hack and > instead do pep517 metadata generation and dependency resolution. How does it work without monkeypatching? Why was monkeypatching needed before and no longer needed now? > Invert setuptools/pyproject fallback ordering so that we try > parsing pyproject.toml files first. What is the motivation for this particular change (inverting the order between setuptools and pyproject)? Also, this patch should be split into several ones, as you're really doing several independent things, as far as I can see. > diff --git a/utils/scanpypi b/utils/scanpypi > index 021c99a172..9de1b5d402 100755 > --- a/utils/scanpypi > +++ b/utils/scanpypi > @@ -18,8 +18,8 @@ import hashlib > import re > import textwrap > import tempfile > -import imp > -from functools import wraps > +import importlib > +from setuptools.build_meta import prepare_metadata_for_build_wheel This is part of the "don't use imp / remove monkeypatching" thing if I understand correctly. > import six.moves.urllib.request > import six.moves.urllib.error > import six.moves.urllib.parse > @@ -93,32 +93,6 @@ def toml_load(f): > raise ex > > > -def setup_decorator(func, method): > - """ > - Decorator for distutils.core.setup and setuptools.setup. > - Puts the arguments with which setup is called as a dict > - Add key 'method' which should be either 'setuptools' or 'distutils'. > - > - Keyword arguments: > - func -- either setuptools.setup or distutils.core.setup > - method -- either 'setuptools' or 'distutils' > - """ > - > - @wraps(func) > - def closure(*args, **kwargs): > - # Any python packages calls its setup function to be installed. > - # Argument 'name' of this setup function is the package's name > - BuildrootPackage.setup_args[kwargs['name']] = kwargs > - BuildrootPackage.setup_args[kwargs['name']]['method'] = method > - return closure > - > -# monkey patch > -import setuptools # noqa E402 > -setuptools.setup = setup_decorator(setuptools.setup, 'setuptools') > -import distutils # noqa E402 > -distutils.core.setup = setup_decorator(setuptools.setup, 'distutils') This is part of the "don't use imp / remove monkeypatching" thing if I understand correctly. > def find_file_upper_case(filenames, path='./'): > """ > List generator: > @@ -345,26 +319,18 @@ class BuildrootPackage(): > """ > current_dir = os.getcwd() > os.chdir(self.tmp_extract) > - sys.path.insert(0, self.tmp_extract) Not sure to what this is related? The monkeypatching as well? The use of imp? > try: > - s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) > - imp.load_module('__main__', s_file, s_path, s_desc) > - if self.metadata_name in self.setup_args: > - pass > - elif self.metadata_name.replace('_', '-') in self.setup_args: > - self.metadata_name = self.metadata_name.replace('_', '-') > - elif self.metadata_name.replace('-', '_') in self.setup_args: > - self.metadata_name = self.metadata_name.replace('-', '_') > + metadata = prepare_metadata_for_build_wheel(self.tmp_extract) > try: > - self.setup_metadata = self.setup_args[self.metadata_name] > - except KeyError: > - # This means setup was not called > - print('ERROR: Could not determine package metadata for {pkg}.\n' > - .format(pkg=self.real_name)) > - raise > + dist = importlib.metadata.Distribution.at(metadata) > + self.metadata_name = dist.name > + self.setup_metadata = {'method': 'setuptools'} > + if dist.requires: > + self.setup_metadata['install_requires'] = dist.requires > + finally: > + shutil.rmtree(metadata) This is part of the "don't use imp / remove monkeypatching" thing if I understand correctly. > finally: > os.chdir(current_dir) > - sys.path.remove(self.tmp_extract) > > def load_pyproject(self): > """ > @@ -372,7 +338,6 @@ class BuildrootPackage(): > """ > current_dir = os.getcwd() > os.chdir(self.tmp_extract) > - sys.path.insert(0, self.tmp_extract) > try: > pyproject_data = toml_load('pyproject.toml') > try: > @@ -380,20 +345,25 @@ class BuildrootPackage(): > self.metadata_name = self.setup_metadata.get('name', self.real_name) > build_system = pyproject_data.get('build-system', {}) > build_backend = build_system.get('build-backend', None) > - if build_backend and build_backend == 'flit_core.buildapi': > - self.setup_metadata['method'] = 'flit' > + if build_backend: > + if build_backend == 'flit_core.buildapi': > + self.setup_metadata['method'] = 'flit' > + elif build_backend == 'setuptools.build_meta': > + raise Exception("handle setuptools") > + else: > + self.setup_metadata['method'] = 'unknown' This seems more related to PEP517 handling improvements? > elif build_system.get('backend-path', None): > self.setup_metadata['method'] = 'pep517' > else: > - self.setup_metadata['method'] = 'unknown' > + raise Exception("handle setuptools") So we don't support setuptools as a PEP517 backend? I guess it was already the case before your patch? > except KeyError: > print('ERROR: Could not determine package metadata for {pkg}.\n' > .format(pkg=self.real_name)) > raise > except FileNotFoundError: > raise > - os.chdir(current_dir) > - sys.path.remove(self.tmp_extract) Related to what? > + finally: > + os.chdir(current_dir) > > def get_requirements(self, pkg_folder): > """ > @@ -778,15 +748,15 @@ def main(): > > # Loading the package install info from the package > try: > - package.load_setup() > - except ImportError as err: > - if 'buildutils' in str(err): > - print('This package needs buildutils') > - continue > - else: > - try: > - package.load_pyproject() > - except Exception: > + package.load_pyproject() > + except Exception: > + try: > + package.load_setup() > + except ImportError as err: > + if 'buildutils' in str(err): > + print('This package needs buildutils') > + continue > + else: This is a separate change, about the ordering between .load_setup() and .load_pyproject(). Could you split this useful patch into smaller chunks, with a better justification for each chunk? Believe me, if you do this, patches like this will be merged, much, much, much faster. Thanks a lot for your contribution! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas at devoogdt.com Wed Feb 7 19:31:22 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 7 Feb 2024 20:31:22 +0100 Subject: [Buildroot] [PATCH v9 1/2] package/cairo: move to the meson build system In-Reply-To: References: Message-ID: <20240207193123.3400214-1-thomas@devoogdt.com> - Moved BR2_PACKAGE_CAIRO_{SCRIPT,PS,PDF,XML} to Config.in.legacy since they are not selectable anymore in the meson-build options. BR2_PACKAGE_CAIRO_ZLIB serves for all of them now. - Moved BR2_PACKAGE_CAIRO_SVG to Config.in.legacy since the PNG option already selects that one. This is now in sync with the meson build options. - Note that the dependencies for the various options are slightly changed, but there is not much mentioned about that, the meson introduction is done in one big commit: [1]. - Added xlib_libXrender dependency, which was optional when using autotools (--enable-xlib-xrender), but became mandatory when using meson [2]. - Added two patches to fix cross compiling, upstream: [3] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/596a82f2d185b101bd74645492821fe2f9e0daa0 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/blame/1.17.4/meson.build#L277 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 Signed-off-by: Thomas Devoogdt --- v2: added -std=gnu11 (allow inline int declaration in if loop, 99 caused some directives problems) v3: enabled host-zlib, needed for librsvg v4: also added gnu11 for host-cairo compiling (fixes my compilation on a gcc 4.9.2 based system) v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v6: fix host-zlib option (again) v7: reworked patch by moving the old config options to legacy and by restoring their original order v9: update git message wrt xlib_libXrender + made ipc_rmid_deferred_release false again by default --- Config.in.legacy | 35 ++++ ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 +++++++ ...p-IPC_RMID_DEFERRED_RELEASE-check-wh.patch | 42 +++++ package/cairo/Config.in | 28 +-- package/cairo/cairo.mk | 160 +++++------------- package/libgtk2/Config.in | 5 +- package/libgtk3/Config.in | 5 +- package/librsvg/Config.in | 2 +- package/libsvg-cairo/Config.in | 2 +- package/rrdtool/Config.in | 4 +- 10 files changed, 195 insertions(+), 150 deletions(-) create mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch create mode 100644 package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/Config.in.legacy b/Config.in.legacy index 82387338d9..431552afe7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,41 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_CAIRO_SVG + bool "cairo svg support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_PNG + help + Cairo SVG is compiled together with PNG, so no need to have this config. + +config BR2_PACKAGE_CAIRO_SCRIPT + bool "cairo script support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo script got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PS + bool "cairo postscript support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PS got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_PDF + bool "cairo pdf support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo PDF got merged in to cairo zlib with the introduction of meson. + +config BR2_PACKAGE_CAIRO_XML + bool "cairo xml support" + select BR2_LEGACY + select BR2_PACKAGE_CAIRO_ZLIB + help + Cairo XML got merged in to cairo zlib with the introduction of meson. + config BR2_KERNEL_HEADERS_4_14 bool "kernel headers version 4.14.x are no longer supported" select BR2_LEGACY diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch new file mode 100644 index 0000000000..193a210391 --- /dev/null +++ b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch @@ -0,0 +1,62 @@ +From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= +Date: Thu, 25 Feb 2021 10:52:45 +0000 +Subject: [PATCH] meson: allow skipping of run check for + IPC_RMID_DEFERRED_RELEASE + +The run check is particularly annoying in cross-compile scenarios, +so allow bypassing the check by having the user provide the value +via a cross file or native file: + + [properties] + ipc_rmid_deferred_release = true + +Closes #408 + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index b159b4071..5f593e54d 100644 +--- a/meson.build ++++ b/meson.build +@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() + ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], + ] + deps += [x11_dep, xext_dep] +- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), +- dependencies: [x11_dep, xext_dep], +- name: 'shmctl IPC_RMID allowes subsequent attaches') + +- if res.returncode() == 0 +- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) ++ # Can skip the run check by providing the result in a cross file or ++ # native file as bool property value. ++ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ # We don't know the type of prop (bool, string) but need to differentiate ++ # between a set value (bool) or the fallback value (string), so convert to ++ # a string and chec the string value. ++ prop_str = '@0@'.format(prop) ++ if prop_str in ['true', 'false'] ++ ipc_rmid_deferred_release = (prop_str == 'true') ++ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) ++ elif prop_str == 'auto' ++ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), ++ dependencies: [x11_dep, xext_dep], ++ name: 'shmctl IPC_RMID allowes subsequent attaches') ++ ++ ipc_rmid_deferred_release = (res.returncode() == 0) ++ else ++ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) + endif ++ ++ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) + endif + + if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 +-- +2.34.1 + diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch new file mode 100644 index 0000000000..157508b704 --- /dev/null +++ b/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch @@ -0,0 +1,42 @@ +From 8d5037ed642b02cdb018e49866aa286f30a7b59a Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 5 Feb 2024 17:47:07 +0100 +Subject: [PATCH] meson: always skip IPC_RMID_DEFERRED_RELEASE check when + cross-compiling + +../../br-test-pkg/bootlin-armv5-uclibc/build/cairo-1.17.4/meson.build:279:13: +ERROR: Can not run test applications in this cross environment. + +Commit 1bec56ea8a931e1ae1c74cc740134497ec365267 added support to define +ipc_rmid_deferred_release in a cross-compile config, but still kept +the default to auto, which anyhow results in an error when cross-compiling. + +There is only one usage of the ipc_rmid_deferred_release compile declarative +which was originally added in this commit: 5041b462d084de8552336275914d30c23bf5dd35. + +If ipc_rmid_deferred_release is set to FALSE, an additional XSync is performed. +This doesn't sound very harmful, so that is why this commit defaults to FALSE +and thus avoids any cross-compile errors. + +Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/534 +Signed-off-by: Thomas Devoogdt +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9efe91978..6a670bf94 100644 +--- a/meson.build ++++ b/meson.build +@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found() + + # Can skip the run check by providing the result in a cross file or + # native file as bool property value. +- prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') ++ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'false' : 'auto') + # We don't know the type of prop (bool, string) but need to differentiate + # between a set value (bool) or the fallback value (string), so convert to + # a string and check the string value. +-- +2.34.1 + diff --git a/package/cairo/Config.in b/package/cairo/Config.in index 0c87a2904b..c41a12fe81 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_CAIRO select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_XORG7 help Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include @@ -15,34 +16,15 @@ config BR2_PACKAGE_CAIRO if BR2_PACKAGE_CAIRO -config BR2_PACKAGE_CAIRO_PS - bool "postscript support" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_CAIRO_PDF - -config BR2_PACKAGE_CAIRO_PDF - bool "pdf support" - select BR2_PACKAGE_ZLIB - config BR2_PACKAGE_CAIRO_PNG - bool "png support" + bool "png support (png and svg surfaces)" select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_ZLIB - -config BR2_PACKAGE_CAIRO_SCRIPT - bool "script support" - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_CAIRO_SVG - bool "svg support" - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PDF config BR2_PACKAGE_CAIRO_TEE bool "tee support" -config BR2_PACKAGE_CAIRO_XML - bool "xml support" - select BR2_PACKAGE_CAIRO_PNG +config BR2_PACKAGE_CAIRO_ZLIB + bool "zlib support (script, ps, pdf, and xml surfaces)" + select BR2_PACKAGE_ZLIB endif diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 4515b76075..3d2a67a6c5 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -17,168 +17,96 @@ CAIRO_IGNORE_CVES += CVE-2019-6462 # 0002-Fix-mask-usage-in-image-compositor.patch CAIRO_IGNORE_CVES += CVE-2020-35492 -CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" +CAIRO_CFLAGS = $(TARGET_CFLAGS) +CAIRO_LDFLAGS = $(TARGET_LDFLAGS) # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) -CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" +CAIRO_CFLAGS += -mxgot endif # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CAIRO_LIBS += -latomic +CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no - -CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman + -Dfontconfig=enabled \ + -Dtests=disabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 +CAIRO_DEPENDENCIES = \ + host-pkgconf \ + fontconfig \ + pixman # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no \ - --disable-directfb \ - --enable-ft \ - --enable-gobject \ - --disable-glesv2 \ - --disable-vg \ - --disable-xlib \ - --disable-xcb \ - --without-x \ - --disable-xlib-xrender \ - --disable-ps \ - --disable-pdf \ - --enable-png \ - --enable-script \ - --disable-svg \ - --disable-tee \ - --disable-xml + -Dfontconfig=enabled \ + -Dfreetype=enabled \ + -Dpng=enabled \ + -Dtee=disabled \ + -Dxcb=disabled \ + -Dxlib=disabled \ + -Dzlib=enabled \ + -Dtests=disabled \ + -Dglib=enabled \ + -Dspectre=disabled \ + -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ host-fontconfig \ host-libglib2 \ host-libpng \ host-pixman \ - host-pkgconf + host-pkgconf \ + host-zlib -# DirectFB svg support rely on Cairo and Cairo DirectFB support depends on -# DirectFB. Break circular dependency by disabling DirectFB support in Cairo -# (which is experimental) -ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx) -CAIRO_CONF_OPTS += --enable-directfb -CAIRO_DEPENDENCIES += directfb -else -CAIRO_CONF_OPTS += --disable-directfb +ifeq ($(BR2_PACKAGE_LZO),y) +CAIRO_DEPENDENCIES += lzo endif ifeq ($(BR2_PACKAGE_FREETYPE),y) -CAIRO_CONF_OPTS += --enable-ft +CAIRO_CONF_OPTS += -Dfreetype=enabled CAIRO_DEPENDENCIES += freetype else -CAIRO_CONF_OPTS += --disable-ft -endif - -ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) -CAIRO_DEPENDENCIES += libexecinfo -CAIRO_LIBS += -lexecinfo +CAIRO_CONF_OPTS += -Dfreetype=disabled endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -CAIRO_CONF_OPTS += --enable-gobject +CAIRO_CONF_OPTS += -Dglib=enabled CAIRO_DEPENDENCIES += libglib2 else -CAIRO_CONF_OPTS += --disable-gobject -endif - -# Can use GL or GLESv2 but not both -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -CAIRO_CONF_OPTS += --enable-gl --disable-glesv2 -CAIRO_DEPENDENCIES += libgl -else -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -CAIRO_CONF_OPTS += --disable-gl --enable-glesv2 -CAIRO_DEPENDENCIES += libgles -else -CAIRO_CONF_OPTS += --disable-gl --disable-glesv2 -endif -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -CAIRO_CONF_OPTS += --enable-vg -CAIRO_DEPENDENCIES += libopenvg -else -CAIRO_CONF_OPTS += --disable-vg -endif - -ifeq ($(BR2_PACKAGE_LZO),y) -CAIRO_DEPENDENCIES += lzo +CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x -CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext -else -CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -CAIRO_CONF_OPTS += --enable-xlib-xrender -CAIRO_DEPENDENCIES += xlib_libXrender -else -CAIRO_CONF_OPTS += --disable-xlib-xrender -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PS),y) -CAIRO_CONF_OPTS += --enable-ps -CAIRO_DEPENDENCIES += zlib +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += --disable-ps -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PDF),y) -CAIRO_CONF_OPTS += --enable-pdf -CAIRO_DEPENDENCIES += zlib -else -CAIRO_CONF_OPTS += --disable-pdf +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -CAIRO_CONF_OPTS += --enable-png +CAIRO_CONF_OPTS += -Dpng=enabled CAIRO_DEPENDENCIES += libpng else -CAIRO_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y) -CAIRO_CONF_OPTS += --enable-script -else -CAIRO_CONF_OPTS += --disable-script -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SVG),y) -CAIRO_CONF_OPTS += --enable-svg -else -CAIRO_CONF_OPTS += --disable-svg +CAIRO_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_TEE),y) -CAIRO_CONF_OPTS += --enable-tee +CAIRO_CONF_OPTS += -Dtee=enabled else -CAIRO_CONF_OPTS += --disable-tee +CAIRO_CONF_OPTS += -Dtee=disabled endif -ifeq ($(BR2_PACKAGE_CAIRO_XML),y) -CAIRO_CONF_OPTS += --enable-xml +ifeq ($(BR2_PACKAGE_CAIRO_ZLIB),y) +CAIRO_CONF_OPTS += -Dzlib=enabled +CAIRO_DEPENDENCIES += zlib else -CAIRO_CONF_OPTS += --disable-xml +CAIRO_CONF_OPTS += -Dzlib=disabled endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index f2888b2f51..f8821ba246 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -9,9 +9,8 @@ config BR2_PACKAGE_LIBGTK2 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO select BR2_PACKAGE_GDK_PIXBUF diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index 34b8d49eb3..9f9a081ecb 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -25,9 +25,8 @@ config BR2_PACKAGE_LIBGTK3 BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_AT_SPI2_CORE select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_LIBEPOXY select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in index 270b524b37..d74359dfc9 100644 --- a/package/librsvg/Config.in +++ b/package/librsvg/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBRSVG depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_SCRIPT + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_HOST_RUSTC select BR2_PACKAGE_LIBGLIB2 diff --git a/package/libsvg-cairo/Config.in b/package/libsvg-cairo/Config.in index 9577c69bf0..4602e93c2a 100644 --- a/package/libsvg-cairo/Config.in +++ b/package/libsvg-cairo/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_LIBSVG_CAIRO bool "libsvg-cairo" select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBSVG help Libsvg-cairo provides the ability to render SVG content from diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in index 5ffdc92618..d954fd1214 100644 --- a/package/rrdtool/Config.in +++ b/package/rrdtool/Config.in @@ -19,10 +19,8 @@ config BR2_PACKAGE_RRDTOOL_RRDGRAPH depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PDF select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_SVG + select BR2_PACKAGE_CAIRO_ZLIB select BR2_PACKAGE_PANGO help This enables the graphing capabilities ('rrdgraph'). -- 2.34.1 From thomas at devoogdt.com Wed Feb 7 19:31:23 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 7 Feb 2024 20:31:23 +0100 Subject: [Buildroot] [PATCH v9 2/2] package/cairo: bump to 1.18.0 In-Reply-To: <20240207193123.3400214-1-thomas@devoogdt.com> References: <20240207193123.3400214-1-thomas@devoogdt.com> Message-ID: <20240207193123.3400214-2-thomas@devoogdt.com> News: - https://www.cairographics.org/news/cairo-1.17.8/ - https://www.cairographics.org/news/cairo-1.18.0/ Some options are renamed/dropped so fix that along. - GL and GLES drawing has been dropped in 1.17.8. - The XML surface has been removed in 1.18.0. - xlib-xcb was added [1] Patches: - drop 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch, upstream: [2] - drop 0002-Fix-mask-usage-in-image-compositor.patch, upstream: [3] - drop 0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch, upstream: [4] [1]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/3468c67fe91f0c37e0ec5d335082653a6fa609b6 [2]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 [3]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be [4]: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 Signed-off-by: Thomas Devoogdt --- v5: split in 3 commits: https://lore.kernel.org/buildroot/20240105101105.6a181dcd at windsurf/ v7: rebased on v7-0001-package-cairo-move-to-the-meson-build-system v8: forgot .checkpackageignore v9: n/a --- .checkpackageignore | 2 - ...or_tolerance_normalized-fix-infinite.patch | 39 ------------ ...rivate.h-fix-missing-FT_Color-error.patch} | 0 ...2-Fix-mask-usage-in-image-compositor.patch | 56 ----------------- ...-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} | 0 ...ping-of-run-check-for-IPC_RMID_DEFER.patch | 62 ------------------- package/cairo/cairo.hash | 6 +- package/cairo/cairo.mk | 21 ++++--- 8 files changed, 14 insertions(+), 172 deletions(-) delete mode 100644 package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch rename package/cairo/{0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch => 0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch} (100%) delete mode 100644 package/cairo/0002-Fix-mask-usage-in-image-compositor.patch rename package/cairo/{0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch => 0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch} (100%) delete mode 100644 package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch diff --git a/.checkpackageignore b/.checkpackageignore index 348cf3d289..86a774139a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -227,8 +227,6 @@ package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch Upstrea package/c-icap/S96cicap Indent Shellcheck Variables package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch Upstream package/cache-calibrator/0001-Fix-conflicting-round-function.patch Upstream -package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream -package/cairo/0002-Fix-mask-usage-in-image-compositor.patch Upstream package/caps/0001-Fix-stdint-types-with-musl.patch Upstream package/cdrkit/0001-no-rcmd.patch Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch Upstream diff --git a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch deleted file mode 100644 index 078e90fa42..0000000000 --- a/package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Sun, 1 Aug 2021 11:16:03 +0000 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - -[Retrieved from: -https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] -Signed-off-by: Quentin Schulz ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -2.38.1 - diff --git a/package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch b/package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch similarity index 100% rename from package/cairo/0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch rename to package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch diff --git a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch deleted file mode 100644 index 54a95593c5..0000000000 --- a/package/cairo/0002-Fix-mask-usage-in-image-compositor.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - -[Retrieved from -https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be] -[Removed changes in test/ directory to remove binary diff so that the -patch can be applied by `patch` tool] -Signed-off-by: Quentin Schulz ---- - src/cairo-image-compositor.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index bbf4cf228..2352c478e 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - unsigned num_spans) - { - cairo_image_span_renderer_t *r = abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); - int x0; - - if (num_spans == 0) - return CAIRO_STATUS_SUCCESS; - - x0 = spans[0].x; -- m = r->_buf; -+ m = base; - do { - int len = spans[1].x - spans[0].x; - if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { -@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - spans[0].x, y, - spans[1].x - spans[0].x, h); - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else if (spans[0].coverage == 0x0) { - if (spans[0].x != x0) { -@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - #endif - } - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else { - *m++ = spans[0].coverage; --- -2.38.1 - diff --git a/package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch b/package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch similarity index 100% rename from package/cairo/0005-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch rename to package/cairo/0002-meson-always-skip-IPC_RMID_DEFERRED_RELEASE-check-wh.patch diff --git a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch b/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch deleted file mode 100644 index 193a210391..0000000000 --- a/package/cairo/0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Thu, 25 Feb 2021 10:52:45 +0000 -Subject: [PATCH] meson: allow skipping of run check for - IPC_RMID_DEFERRED_RELEASE - -The run check is particularly annoying in cross-compile scenarios, -so allow bypassing the check by having the user provide the value -via a cross file or native file: - - [properties] - ipc_rmid_deferred_release = true - -Closes #408 - -Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267 -Signed-off-by: Thomas Devoogdt ---- - meson.build | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index b159b4071..5f593e54d 100644 ---- a/meson.build -+++ b/meson.build -@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found() - ['X11/extensions/shmstr.h', {'extra-headers': extra_headers}], - ] - deps += [x11_dep, xext_dep] -- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -- dependencies: [x11_dep, xext_dep], -- name: 'shmctl IPC_RMID allowes subsequent attaches') - -- if res.returncode() == 0 -- conf.set('IPC_RMID_DEFERRED_RELEASE', 1) -+ # Can skip the run check by providing the result in a cross file or -+ # native file as bool property value. -+ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') -+ # We don't know the type of prop (bool, string) but need to differentiate -+ # between a set value (bool) or the fallback value (string), so convert to -+ # a string and chec the string value. -+ prop_str = '@0@'.format(prop) -+ if prop_str in ['true', 'false'] -+ ipc_rmid_deferred_release = (prop_str == 'true') -+ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release) -+ elif prop_str == 'auto' -+ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'), -+ dependencies: [x11_dep, xext_dep], -+ name: 'shmctl IPC_RMID allowes subsequent attaches') -+ -+ ipc_rmid_deferred_release = (res.returncode() == 0) -+ else -+ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str)) - endif -+ -+ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release) - endif - - if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 --- -2.34.1 - diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index fca9ff678c..df9c693bad 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,7 +1,5 @@ -# From https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz.sha1 -sha1 68712ae1039b114347be3b7200bc1c901d47a636 cairo-1.17.4.tar.xz -# Calculated based on the hash above -sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 cairo-1.17.4.tar.xz +# From https://www.cairographics.org/releases/cairo-1.18.0.tar.xz.sha256sum +sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 cairo-1.18.0.tar.xz # Hash for license files: sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 3d2a67a6c5..4ace04ebbe 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -4,19 +4,14 @@ # ################################################################################ -CAIRO_VERSION = 1.17.4 +CAIRO_VERSION = 1.18.0 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library) CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 CAIRO_CPE_ID_VENDOR = cairographics -CAIRO_SITE = http://cairographics.org/snapshots +CAIRO_SITE = http://cairographics.org/releases CAIRO_INSTALL_STAGING = YES -# 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch -CAIRO_IGNORE_CVES += CVE-2019-6462 -# 0002-Fix-mask-usage-in-image-compositor.patch -CAIRO_IGNORE_CVES += CVE-2020-35492 - CAIRO_CFLAGS = $(TARGET_CFLAGS) CAIRO_LDFLAGS = $(TARGET_LDFLAGS) @@ -32,9 +27,13 @@ CAIRO_LDFLAGS += -latomic endif CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ + -Dquartz=disabled \ -Dtests=disabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 CAIRO_DEPENDENCIES = \ host-pkgconf \ @@ -43,9 +42,11 @@ CAIRO_DEPENDENCIES = \ # Just the bare minimum to make other host-* packages happy HOST_CAIRO_CONF_OPTS = \ + -Ddwrite=disabled \ -Dfontconfig=enabled \ -Dfreetype=enabled \ -Dpng=enabled \ + -Dquartz=disabled \ -Dtee=disabled \ -Dxcb=disabled \ -Dxlib=disabled \ @@ -53,6 +54,8 @@ HOST_CAIRO_CONF_OPTS = \ -Dtests=disabled \ -Dglib=enabled \ -Dspectre=disabled \ + -Dsymbol-lookup=disabled \ + -Dgtk_doc=false \ -Dc_std=gnu11 HOST_CAIRO_DEPENDENCIES = \ host-freetype \ @@ -82,10 +85,10 @@ CAIRO_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled +CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled -Dxlib-xcb=enabled CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender else -CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled +CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled -Dxlib-xcb=disabled endif ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -- 2.34.1 From ju.o at free.fr Wed Feb 7 19:42:33 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 7 Feb 2024 20:42:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnupg2: security bump to version 2.4.4 Message-ID: <20240207194233.590328-1-ju.o@free.fr> See release announce: https://lists.gnupg.org/pipermail/gnupg-announce/2024q1/000481.html For the details about the security advisory for GnuPG created smartcard keys, see: https://gnupg.org/blog/20240125-smartcard-backup-key.html This commit also drops the package patch, which is now included in this new version. Signed-off-by: Julien Olivain --- ...he-call-of-ks_ldap_help_variables-wh.patch | 36 ------------------- package/gnupg2/gnupg2.hash | 4 +-- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch diff --git a/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch b/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch deleted file mode 100644 index 53dd39cf47..0000000000 --- a/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch +++ /dev/null @@ -1,36 +0,0 @@ -From dc13361524c1477b2106c7385f2059f9ea111b84 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Wed, 5 Jul 2023 09:29:54 +0900 -Subject: [PATCH] dirmngr: Enable the call of ks_ldap_help_variables when - USE_LDAP. - -* dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize. - --- - -Signed-off-by: NIIBE Yutaka - -Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=dc13361524c1477b2106c7385f2059f9ea111b84 - -Signed-off-by: Bernd Kuhls ---- - dirmngr/server.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dirmngr/server.c b/dirmngr/server.c -index 51a149cb2..ee61f63d6 100644 ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line) - - if (opt_help) - { -+#if USE_LDAP - ks_ldap_help_variables (ctrl); -+#endif - err = 0; - goto leave; - } --- -2.11.0 - diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index 4b770fa520..c821afb55e 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 79a60c8e415e3daaa33d0546398174252a56f7ac gnupg-2.4.3.tar.bz2 -sha256 a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d gnupg-2.4.3.tar.bz2 +sha1 228b3984325fdeebc5e3f2d165c6419a5ebc28de gnupg-2.4.4.tar.bz2 +sha256 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 gnupg-2.4.4.tar.bz2 # Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index d21c1e242d..986da4790c 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.3 +GNUPG2_VERSION = 2.4.4 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ -- 2.43.0 From yann.morin.1998 at free.fr Wed Feb 7 19:41:36 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 20:41:36 +0100 Subject: [Buildroot] [git commit] package/petitboot: prefer UTF-8 support Message-ID: <20240207194320.4A6F7876AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=026338f66bdb2d9436898bd968a3f22995851b92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The petitboot UI looks much nicer in a Unicode locale: * Items in the language selection submenu use multibyte Unicode characters. In other locales, they say "Unable to display text in this locale". * The combination of TERM=linux with a UTF-8 locale is required to trigger a special-case workaround in ncurses code[1]. Without this, line-drawing characters in the menu look like q's. Turn on wchar support in ncurses, and add a reminder that a UTF-8 locale should be generated for things to look right. [1] https://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing Signed-off-by: Reza Arbab Signed-off-by: Yann E. MORIN --- package/petitboot/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in index 6a3d476b11..533c7a9f29 100644 --- a/package/petitboot/Config.in +++ b/package/petitboot/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_PETITBOOT select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_LVM2 # devmapper select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_NCURSES_WCHAR # run-time dependencies select BR2_PACKAGE_KEXEC if !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS select BR2_PACKAGE_KEXEC_LITE if BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC @@ -18,6 +19,9 @@ config BR2_PACKAGE_PETITBOOT help Petitboot is a small kexec-based bootloader + NOTE: petitboot looks best in a UTF-8 locale; be sure there + is one listed in BR2_GENERATE_LOCALE. + http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html if BR2_PACKAGE_PETITBOOT From thomas.petazzoni at bootlin.com Wed Feb 7 19:43:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:43:37 +0100 Subject: [Buildroot] [PATCH 1/1] configs/rzboard_v2L_defconfig: new defconfig In-Reply-To: <20231130223101.132221-1-kilian.zinnecker@mail.de> References: <20231130223101.132221-1-kilian.zinnecker@mail.de> Message-ID: <20240207204337.561d3b54@windsurf> Hello, On Thu, 30 Nov 2023 23:31:01 +0100 "kilian.zinnecker--- via buildroot" wrote: > From: Kilian Zinnecker > > This patch adds support for the AVNET RZBoard V2L. > > The board support creates a bootable sd card image. The board is > shipped with a u-boot inside its eMMC. The board support uses this > u-boot and does not build and deploy a u-boot onto the sd card. > Instead the sd card only contains a uEnv.txt, a kernel image and > the rootfs. > > Signed-off-by: Kilian Zinnecker Thanks, I have applied to master, after renaming to avnet_rzboard_v2l_defconfig, and taking into account the feedback from Giulio. However, I find it not so nice that we don't build a fully bootable image that includes U-Boot. Could you work on this and submit a follow-up patch? There is a DIP switch on the board that allows to boot from SD, see page 15 of the board hardware manual; Best regards, Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 7 19:43:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 7 Feb 2024 20:43:33 +0100 Subject: [Buildroot] [PATCH v5 2/5] package/petitboot: prefer UTF-8 support In-Reply-To: <20240207175135.1532037-3-arbab@linux.ibm.com> References: <20240207175135.1532037-1-arbab@linux.ibm.com> <20240207175135.1532037-3-arbab@linux.ibm.com> Message-ID: Reza, All, On 2024-02-07 11:51 -0600, Reza Arbab spake thusly: > The petitboot UI looks much nicer in a Unicode locale: > > * Items in the language selection submenu use multibyte Unicode > characters. In other locales, they say "Unable to display text in this > locale". > > * The combination of TERM=linux with a UTF-8 locale is required to > trigger a special-case workaround in ncurses code[1]. Without > this, line-drawing characters in the menu look like q's. > > Turn on wchar support in ncurses, and add a reminder that a UTF-8 locale > should be generated for things to look right. > > [1] https://invisible-island.net/ncurses/ncurses.faq.html#no_line_drawing > > Signed-off-by: Reza Arbab > --- > package/petitboot/Config.in | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/petitboot/Config.in b/package/petitboot/Config.in > index 6a3d476b11b3..4f3b1c1ea4d1 100644 > --- a/package/petitboot/Config.in > +++ b/package/petitboot/Config.in > @@ -10,6 +10,7 @@ config BR2_PACKAGE_PETITBOOT > select BR2_PACKAGE_ELFUTILS > select BR2_PACKAGE_LVM2 # devmapper > select BR2_PACKAGE_NCURSES > + select BR2_PACKAGE_NCURSES_WCHAR > # run-time dependencies > select BR2_PACKAGE_KEXEC if !BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS > select BR2_PACKAGE_KEXEC_LITE if BR2_PACKAGE_KEXEC_LITE_ARCH_SUPPORTS && !BR2_PACKAGE_KEXEC > @@ -18,6 +19,8 @@ config BR2_PACKAGE_PETITBOOT > help > Petitboot is a small kexec-based bootloader > > + NOTE: petitboot looks best in a UTF-8 locale (BR2_GENERATE_LOCALE) $ ./utils/docker-run make check-package package/petitboot/Config.in:22: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) I slightly reworded that sentence to better fit. Applied to master with the above fixed, thanks. Regards, Yann E. MORIN. > http://www.kernel.org/pub/linux/kernel/people/geoff/petitboot/petitboot.html > > if BR2_PACKAGE_PETITBOOT > -- > 2.39.3 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ju.o at free.fr Wed Feb 7 19:44:28 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 7 Feb 2024 20:44:28 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: gnupg2: increase a timeout Message-ID: <20240207194428.591147-1-ju.o@free.fr> The symmetric encryption test can sometimes take longer than the default timeout. This commit increase the timeout to 10 seconds for that command. Signed-off-by: Julien Olivain --- support/testing/tests/package/test_gnupg2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_gnupg2.py b/support/testing/tests/package/test_gnupg2.py index 4505e1c339..2b18f54fa3 100644 --- a/support/testing/tests/package/test_gnupg2.py +++ b/support/testing/tests/package/test_gnupg2.py @@ -37,7 +37,7 @@ class TestGnupg2(infra.basetest.BRTest): # Test symmetric encrypt cmd = "gpg --batch --symmetric" cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=10) # Test symmetric decrypt cmd = "gpg --batch --decrypt" -- 2.43.0 From thomas.petazzoni at bootlin.com Wed Feb 7 19:46:53 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:46:53 +0100 Subject: [Buildroot] [git commit] configs/avnet_rzboard_v2l: new defconfig Message-ID: <20240207194713.652EC876BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f003675119c9ca503afa19c04074e81c49538baf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds support for the AVNET RZBoard V2L. The board support creates a bootable sd card image. The board is shipped with a u-boot inside its eMMC. The board support uses this u-boot and does not build and deploy a u-boot onto the sd card. Instead the sd card only contains a uEnv.txt, a kernel image and the rootfs. Signed-off-by: Kilian Zinnecker Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + board/avnet/rzboard_v2l/genimage.cfg | 29 ++++++++++++++ board/avnet/rzboard_v2l/post-image.sh | 5 +++ board/avnet/rzboard_v2l/readme.txt | 71 +++++++++++++++++++++++++++++++++++ board/avnet/rzboard_v2l/uEnv.txt | 3 ++ configs/avnet_rzboard_v2l_defconfig | 20 ++++++++++ 6 files changed, 130 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8e65a93122..1c6c84b05b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1889,8 +1889,10 @@ N: Kieran Bingham F: package/libcamera/ N: Kilian Zinnecker +F: board/avnet/rzboard_v2l/ F: board/radxa/rock5b/ F: configs/rock5b_defconfig +F: configs/avnet_rzboard_v2l_defconfig F: package/rockchip-rkbin/ N: Klaus Heinrich Kiwi diff --git a/board/avnet/rzboard_v2l/genimage.cfg b/board/avnet/rzboard_v2l/genimage.cfg new file mode 100644 index 0000000000..94f35cb360 --- /dev/null +++ b/board/avnet/rzboard_v2l/genimage.cfg @@ -0,0 +1,29 @@ +# SD card image for RZBoard V2L + +image boot.vfat { + vfat { + files = { + "Image", + "rzboard.dtb", + "uEnv.txt" + } + } + size = 24M +} + +image sdcard.img { + hdimage { + partition-table-type = "hybrid" + } + + partition boot { + partition-type = "0xC" + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/avnet/rzboard_v2l/post-image.sh b/board/avnet/rzboard_v2l/post-image.sh new file mode 100755 index 0000000000..25bef8f793 --- /dev/null +++ b/board/avnet/rzboard_v2l/post-image.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -e + +cp board/avnet/rzboard_v2l/uEnv.txt "${BINARIES_DIR}" +support/scripts/genimage.sh -c board/avnet/rzboard_v2l/genimage.cfg diff --git a/board/avnet/rzboard_v2l/readme.txt b/board/avnet/rzboard_v2l/readme.txt new file mode 100644 index 0000000000..24b5680874 --- /dev/null +++ b/board/avnet/rzboard_v2l/readme.txt @@ -0,0 +1,71 @@ +RZBoard V2L +=========== + +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ + +This board support creates a bootable sd card image for the AVNET RZBoard V2L. +This board is shipped with a u-boot inside its eMMC. This board support uses +that u-boot and only puts uEnv.txt, kernel image and rootfs onto the sd card. + +Build: +====== + + $ make rzboard_v2l_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +????????? Image +????????? boot.vfat +????????? rootfs.ext2 +????????? rootfs.ext4 +????????? rootfs.tar +????????? rzboard.dtb +????????? sdcard.img +????????? uEnv.txt + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +Configure board for sd card boot: +--------------------------------- +Set the 'BOOT1' switch (next to the audio jack) to '1' (away from 'ON') in +order to let the board boot kernel and rootfs from SD card. + +Serial console: +--------------- +The RZBoard V2L has a 4-pin header "J19" right next to the micro USB. Its +layout can be seen in the Quick-Start Guide, or the Hardware User Guide, +obtainable from: +https://www.avnet.com/wps/portal/us/products/avnet-boards/avnet-board-families/rzboard-v2l/ + +The uart pins are as follows (from left to right - orientation according to the +board's labeling): + +pin 1: n/a (most away from the board's corner) +pin 2: tx +pin 3: rx +pin 4: gnd (nearest to the board's corner) + +Baudrate for this board is 115200. + +Power-Up: +--------- +Plug in a suitable USB-C power supply and press the button 'S1' (next to the +USB-C port) for 2 seconds until the LED goes on. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. diff --git a/board/avnet/rzboard_v2l/uEnv.txt b/board/avnet/rzboard_v2l/uEnv.txt new file mode 100644 index 0000000000..28b8acb8c6 --- /dev/null +++ b/board/avnet/rzboard_v2l/uEnv.txt @@ -0,0 +1,3 @@ +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} +uenvcmd=fatload mmc 0:1 ${kernel_addr_r} Image; fatload mmc 0:1 ${fdt_addr_r} rzboard.dtb +bootargs=root=/dev/mmcblk0p2 rw rootfstype=ext4 earlyprintk console=ttyS0,115200 rootwait earlycon clk_ignore_unused debug diff --git a/configs/avnet_rzboard_v2l_defconfig b/configs/avnet_rzboard_v2l_defconfig new file mode 100644 index 0000000000..285aef39bc --- /dev/null +++ b/configs/avnet_rzboard_v2l_defconfig @@ -0,0 +1,20 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_KERNEL_HEADERS_5_10=y +BR2_TARGET_GENERIC_HOSTNAME="rzboard_v2l" +BR2_TARGET_GENERIC_ISSUE="Welcome to the AVNET RZBoard V2L" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/avnet/rzboard_v2l/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Avnet/renesas-linux-cip.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="c197622df526c82ae9e3674e06b4092dac33eafa" +BR2_LINUX_KERNEL_DEFCONFIG="rzboard" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="renesas/rzboard" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From thomas.petazzoni at bootlin.com Wed Feb 7 19:47:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:47:42 +0100 Subject: [Buildroot] [PATCH] package/rtl8189es: en/disable runtime debug according to BR2_ENABLE_RUNTIME_DEBUG In-Reply-To: <20231121173318.724862-1-giulio.benetti@benettiengineering.com> References: <20231121173318.724862-1-giulio.benetti@benettiengineering.com> Message-ID: <20240207204742.60127fe3@windsurf> On Tue, 21 Nov 2023 18:33:18 +0100 Giulio Benetti wrote: > Signed-off-by: Giulio Benetti > --- > package/rtl8189es/rtl8189es.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 19:47:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:47:08 +0100 Subject: [Buildroot] [git commit] package/rtl8189es: en/disable runtime debug according to BR2_ENABLE_RUNTIME_DEBUG Message-ID: <20240207194841.DF6E8876C3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f7bd4ef67013e3f94f91e0c5be4e2dc950d5bae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8189es/rtl8189es.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index 17d76aceb7..8bac0a125f 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -14,6 +14,10 @@ RTL8189ES_MODULE_MAKE_OPTS = \ KSRC=$(LINUX_DIR) \ USER_EXTRA_CFLAGS="-Wno-error" +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),) +RTL8189ES_MODULE_MAKE_OPTS += CONFIG_RTW_DEBUG=n +endif + define RTL8189ES_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) From thomas.petazzoni at bootlin.com Wed Feb 7 19:49:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:49:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnupg2: security bump to version 2.4.4 In-Reply-To: <20240207194233.590328-1-ju.o@free.fr> References: <20240207194233.590328-1-ju.o@free.fr> Message-ID: <20240207204934.7b726238@windsurf> On Wed, 7 Feb 2024 20:42:33 +0100 Julien Olivain wrote: > See release announce: > https://lists.gnupg.org/pipermail/gnupg-announce/2024q1/000481.html > > For the details about the security advisory for GnuPG created > smartcard keys, see: > https://gnupg.org/blog/20240125-smartcard-backup-key.html > > This commit also drops the package patch, which is now included in > this new version. > > Signed-off-by: Julien Olivain > --- > ...he-call-of-ks_ldap_help_variables-wh.patch | 36 ------------------- > package/gnupg2/gnupg2.hash | 4 +-- > package/gnupg2/gnupg2.mk | 2 +- > 3 files changed, 3 insertions(+), 39 deletions(-) > delete mode 100644 package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 19:49:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:49:37 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: gnupg2: increase a timeout In-Reply-To: <20240207194428.591147-1-ju.o@free.fr> References: <20240207194428.591147-1-ju.o@free.fr> Message-ID: <20240207204937.49368b78@windsurf> On Wed, 7 Feb 2024 20:44:28 +0100 Julien Olivain wrote: > The symmetric encryption test can sometimes take longer than the default > timeout. This commit increase the timeout to 10 seconds for that > command. > > Signed-off-by: Julien Olivain > --- > support/testing/tests/package/test_gnupg2.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Wed Feb 7 19:49:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:49:15 +0100 Subject: [Buildroot] [git commit] support/testing: gnupg2: increase a timeout Message-ID: <20240207195030.8BF5E876D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f44c0807c63f0bdd9640b7b29c131590f03be0ca branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The symmetric encryption test can sometimes take longer than the default timeout. This commit increase the timeout to 10 seconds for that command. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_gnupg2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_gnupg2.py b/support/testing/tests/package/test_gnupg2.py index 4505e1c339..2b18f54fa3 100644 --- a/support/testing/tests/package/test_gnupg2.py +++ b/support/testing/tests/package/test_gnupg2.py @@ -37,7 +37,7 @@ class TestGnupg2(infra.basetest.BRTest): # Test symmetric encrypt cmd = "gpg --batch --symmetric" cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=10) # Test symmetric decrypt cmd = "gpg --batch --decrypt" From thomas.petazzoni at bootlin.com Wed Feb 7 19:48:32 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:48:32 +0100 Subject: [Buildroot] [git commit] package/gnupg2: security bump to version 2.4.4 Message-ID: <20240207195030.82965876D0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bdcd5adf39186e8c67a2b55c05a67fd45bc04110 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See release announce: https://lists.gnupg.org/pipermail/gnupg-announce/2024q1/000481.html For the details about the security advisory for GnuPG created smartcard keys, see: https://gnupg.org/blog/20240125-smartcard-backup-key.html This commit also drops the package patch, which is now included in this new version. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...ble-the-call-of-ks_ldap_help_variables-wh.patch | 36 ---------------------- package/gnupg2/gnupg2.hash | 4 +-- package/gnupg2/gnupg2.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch b/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch deleted file mode 100644 index 53dd39cf47..0000000000 --- a/package/gnupg2/0001-dirmngr-Enable-the-call-of-ks_ldap_help_variables-wh.patch +++ /dev/null @@ -1,36 +0,0 @@ -From dc13361524c1477b2106c7385f2059f9ea111b84 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Wed, 5 Jul 2023 09:29:54 +0900 -Subject: [PATCH] dirmngr: Enable the call of ks_ldap_help_variables when - USE_LDAP. - -* dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize. - --- - -Signed-off-by: NIIBE Yutaka - -Upstream: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=dc13361524c1477b2106c7385f2059f9ea111b84 - -Signed-off-by: Bernd Kuhls ---- - dirmngr/server.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dirmngr/server.c b/dirmngr/server.c -index 51a149cb2..ee61f63d6 100644 ---- a/dirmngr/server.c -+++ b/dirmngr/server.c -@@ -2776,7 +2776,9 @@ cmd_ad_query (assuan_context_t ctx, char *line) - - if (opt_help) - { -+#if USE_LDAP - ks_ldap_help_variables (ctrl); -+#endif - err = 0; - goto leave; - } --- -2.11.0 - diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index 4b770fa520..c821afb55e 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 79a60c8e415e3daaa33d0546398174252a56f7ac gnupg-2.4.3.tar.bz2 -sha256 a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d gnupg-2.4.3.tar.bz2 +sha1 228b3984325fdeebc5e3f2d165c6419a5ebc28de gnupg-2.4.4.tar.bz2 +sha256 67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6 gnupg-2.4.4.tar.bz2 # Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index d21c1e242d..986da4790c 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.3 +GNUPG2_VERSION = 2.4.4 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From thomas.petazzoni at bootlin.com Wed Feb 7 19:50:53 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:50:53 +0100 Subject: [Buildroot] [git commit] package/python-aiocoap: bump to version 0.4.7 Message-ID: <20240207195229.57729876D6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae5274dd545eb011f18cae24331300d944b8be0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master License file moved: https://github.com/chrysn/aiocoap/commit/8f2e96d76bcf1f6f8d7b8065b5c5865afa50d20f https://github.com/chrysn/aiocoap/commit/065945fb7f34db33f641199aceb527527c1a3431 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-aiocoap/python-aiocoap.hash | 6 +++--- package/python-aiocoap/python-aiocoap.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python-aiocoap/python-aiocoap.hash b/package/python-aiocoap/python-aiocoap.hash index ab50ff0958..c9d73cda26 100644 --- a/package/python-aiocoap/python-aiocoap.hash +++ b/package/python-aiocoap/python-aiocoap.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiocoap/json -md5 03ca0411b7401bfd6e9bdaefe09bd88a aiocoap-0.4.5.tar.gz -sha256 906c927822185c8acf04fdcc1dd98fd845f31dabf5d5e395c39137dcbd6ba1e3 aiocoap-0.4.5.tar.gz +md5 baebbc38bc8db31472c438521f7121e3 aiocoap-0.4.7.tar.gz +sha256 90f3bcaffd454f5421d3ad55ddbe3fe10a686d4b9f3c4445d427b130493a96a4 aiocoap-0.4.7.tar.gz # Locally computed sha256 checksums -sha256 2bb211d412a6bfa4b2a9cf01123c7fe90e5e6185938896e23ab07b84f8494180 LICENSE +sha256 0ad39132b3529369998eb7493b950dc7452b07ba9d8cca7619766b6c6d8270fa doc/LICENSE.rst diff --git a/package/python-aiocoap/python-aiocoap.mk b/package/python-aiocoap/python-aiocoap.mk index 92f47b7a4f..73a0d61eba 100644 --- a/package/python-aiocoap/python-aiocoap.mk +++ b/package/python-aiocoap/python-aiocoap.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_AIOCOAP_VERSION = 0.4.5 +PYTHON_AIOCOAP_VERSION = 0.4.7 PYTHON_AIOCOAP_SOURCE = aiocoap-$(PYTHON_AIOCOAP_VERSION).tar.gz -PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/65/63/9051af6a2fc498f50b71f23bdbde0cc1d1f0a69eb767776dbf6d1411e240 +PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/de/14/843232b56c0f09b2ceddae3da37598d9109c4b1d9383b1ab72232018e9e8 PYTHON_AIOCOAP_SETUP_TYPE = setuptools PYTHON_AIOCOAP_LICENSE = MIT -PYTHON_AIOCOAP_LICENSE_FILES = LICENSE +PYTHON_AIOCOAP_LICENSE_FILES = doc/LICENSE.rst $(eval $(python-package)) From thomas.petazzoni at bootlin.com Wed Feb 7 19:52:29 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 7 Feb 2024 20:52:29 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiocoap: bump to version 0.4.7 In-Reply-To: <20231104231506.2669884-1-james.hilliard1@gmail.com> References: <20231104231506.2669884-1-james.hilliard1@gmail.com> Message-ID: <20240207205229.1ff8abfc@windsurf> On Sat, 4 Nov 2023 17:15:06 -0600 James Hilliard wrote: > License file moved: > https://github.com/chrysn/aiocoap/commit/8f2e96d76bcf1f6f8d7b8065b5c5865afa50d20f > https://github.com/chrysn/aiocoap/commit/065945fb7f34db33f641199aceb527527c1a3431 > > Signed-off-by: James Hilliard > --- > package/python-aiocoap/python-aiocoap.hash | 6 +++--- > package/python-aiocoap/python-aiocoap.mk | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From james.hilliard1 at gmail.com Wed Feb 7 19:56:55 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 7 Feb 2024 12:56:55 -0700 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <20240207112058.37534f3d@windsurf> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> <20240207112058.37534f3d@windsurf> Message-ID: On Wed, Feb 7, 2024 at 3:21?AM Thomas Petazzoni wrote: > > On Wed, 7 Feb 2024 11:16:27 +0100 > Marcus Hoffmann wrote: > > > Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 > > [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop > > still uses) also seem to be still developed in parallel. So maybe we > > need both as build host packages? Or do you see another solution? That's annoying, maybe the easiest option is to downgrade msgpack for now until everything supports cython 3.0? > > If we were to have both in parallel, then the big question is whether > it is possible to install them both in parallel without them > conflicting with each other. Seems tricky. > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From dario.binacchi at amarulasolutions.com Wed Feb 7 20:11:41 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 21:11:41 +0100 Subject: [Buildroot] [PATCH 1/1] boot/ti-k3-r5-loader: add support for patch files and URLs In-Reply-To: <20240207195612.7ea08e54@windsurf> References: <20231129172852.1684628-1-dario.binacchi@amarulasolutions.com> <20240207195612.7ea08e54@windsurf> Message-ID: Hi Thomas, On Wed, Feb 7, 2024 at 7:56?PM Thomas Petazzoni wrote: > > On Wed, 29 Nov 2023 18:28:52 +0100 > Dario Binacchi wrote: > > > The patch adds support for URLs using similar code as found > > in linux/linux.mk and uboot/uboot.mk. > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3-r5-loader/Config.in | 11 +++++++++++ > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 18 ++++++++++++++++++ > > 2 files changed, 29 insertions(+) > > Thanks a lot for your proposal, but we no longer add package-specific > options to apply patches, as BR2_GLOBAL_PATCH_DIR allows to patch all > packages. We do have options that exist for linux and u-boot indeed, > because they predate BR2_GLOBAL_PATCH_DIR, and we need to keep them for > backwards compatibility. But we do not introduce such options for new > packages. For the example, the arm-trusted-firmware has no custom patch > option, because BR2_GLOBAL_PATCH_DIR can/should be used instead. Thank you for your explanations. Best regards, Dario > > Best regards, > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Wed Feb 7 20:15:00 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 7 Feb 2024 21:15:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/uuu: drop README.md from license files In-Reply-To: References: <20240207173911.3704142-1-dario.binacchi@amarulasolutions.com> Message-ID: Hi Yann, On Wed, Feb 7, 2024 at 7:49?PM Yann E. MORIN wrote: > > Darrio, All, > > On 2024-02-07 18:39 +0100, Dario Binacchi spake thusly: > > The patch drops the file README.md from the license files. Indeed, the > > licensing terms apply to third-party libraries that uuu links to, and > > even though they are bundled in the source tree of uuu|mfgtools, they > > are not used by Buildroot as we use the ones we build. Therefore, the > > actual license file of the package is the file LICENSE. > > > > Moreover, this also leads to simplifying the bump to new versions. > > > > Signed-off-by: Dario Binacchi > > Applied to master from Brussels airport, thanks. Thank you very much, and please remember to put your laptop in airplane mode at least during the flight. :) Best regards, Dario > > Regards, > Yann E. MORIN. > > > --- > > package/uuu/uuu.hash | 1 - > > package/uuu/uuu.mk | 2 +- > > 2 files changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash > > index c231d5d729f0..e45cbb868078 100644 > > --- a/package/uuu/uuu.hash > > +++ b/package/uuu/uuu.hash > > @@ -1,4 +1,3 @@ > > # locally computed > > sha256 6e65fc028afacc94b805ae376e3da3864dcb2570d425037820e716207ab70373 uuu_source-uuu_1.5.165.tar.gz > > sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE > > -sha256 1b3d030a1824d633f75194743bd92bc1ed2d9a4bf1915bc11e49bf4c0c54012d README.md > > diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk > > index 80d5e1937a97..5800277b10d5 100644 > > --- a/package/uuu/uuu.mk > > +++ b/package/uuu/uuu.mk > > @@ -8,7 +8,7 @@ UUU_VERSION = 1.5.165 > > UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz > > UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) > > UUU_LICENSE = BSD 3-Clause "New" or "Revised" License > > -UUU_LICENSE_FILES = LICENSE README.md > > +UUU_LICENSE_FILES = LICENSE > > HOST_UUU_DEPENDENCIES = \ > > host-bzip2 \ > > host-libusb \ > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From fontaine.fabrice at gmail.com Wed Feb 7 20:48:51 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 7 Feb 2024 21:48:51 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/tinymembench: force arm mode instead of Thumb mode In-Reply-To: <20240207164741.1bad9b44@windsurf> References: <20240114135446.1156025-1-fontaine.fabrice@gmail.com> <20240207164741.1bad9b44@windsurf> Message-ID: Hello, Le mer. 7 f?vr. 2024 ? 16:47, Thomas Petazzoni a ?crit : > > Hello Fabrice, > > On Sun, 14 Jan 2024 14:54:46 +0100 > Fabrice Fontaine wrote: > > > +# tinymembench has some assembly function that is not present in Thumb mode: > > +# Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' > > +# so, we desactivate Thumb mode > > +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > > +TINYMEMBENCH_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -marm" > > +endif > > Why don't we simply extend the existing patch in the same way? It's > just that new code has been added in main.c that isn't Thumb > compatible, so I think you could change: > > #ifdef __arm__ > > to > > #if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) > > in main.c, and this should get you going. Could you try this instead? First, it should be noted that the build failure is not related to any new code, this code was already there in v0.3: https://github.com/ssvb/tinymembench/blob/v0.3/main.c Moreover, I already tried that approach and this doesn't work as __ARM_ARCH_ISA_ARM is defined by the toolchain. __ARM_ARCH_ISA_THUMB value could be checked instead but I was not confident in this solution as: - I don't fully understand what are the different meaning of __ARM_ARCH_ISA_{ARM,THUMB} values - upstream feedback on first patch was not really positive back in 2017 - upstream seems dead now so non upstreamable patches will have to be kept "forever" > > Thanks! > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com Best Regards, Fabrice From giulio.benetti at benettiengineering.com Wed Feb 7 21:47:29 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 7 Feb 2024 22:47:29 +0100 Subject: [Buildroot] [PATCH] package/rtl8188eu: bump to 2024-02-06 version on v5.2.2.4 branch Message-ID: <20240207214729.115691-1-giulio.benetti@benettiengineering.com> This version allows to build with Linux 6.8 Signed-off-by: Giulio Benetti --- package/rtl8188eu/rtl8188eu.hash | 2 +- package/rtl8188eu/rtl8188eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8188eu/rtl8188eu.hash b/package/rtl8188eu/rtl8188eu.hash index eb28e6cf0a..4f8f83e78c 100644 --- a/package/rtl8188eu/rtl8188eu.hash +++ b/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cb10a047d39f13c776b0097ef1290f6b3c63590fd57bc0827e8638c878819f0 rtl8188eu-306f3e62cf7cddf8cee74f70f88a7a7b3af46f56.tar.gz +sha256 507d32eb91d3d407c7758319c81a36a9dc69e2b89378cabcd382411153927b7b rtl8188eu-f42fc9c45d2086c415dce70d3018031b54a7beef.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk index 36a84d34de..eca0fb8007 100644 --- a/package/rtl8188eu/rtl8188eu.mk +++ b/package/rtl8188eu/rtl8188eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8188EU_VERSION = 306f3e62cf7cddf8cee74f70f88a7a7b3af46f56 +RTL8188EU_VERSION = f42fc9c45d2086c415dce70d3018031b54a7beef RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING -- 2.34.1 From ju.o at free.fr Wed Feb 7 22:51:00 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 7 Feb 2024 23:51:00 +0100 Subject: [Buildroot] [PATCH v2 1/1] package/swipl: new package Message-ID: <20240207225100.1320837-1-ju.o@free.fr> SWI-Prolog offers a comprehensive free Prolog environment. Since its start in 1987, SWI-Prolog development has been driven by the needs of real world applications. SWI-Prolog is widely used in research and education as well as commercial applications. Signed-off-by: Julien Olivain --- Changes v1 -> v2: Updates and changes from comments by Romain Naour: - udpate homepage URL in Config.in to match the http redirect. - package updated from 9.0.2 to latest version 9.2.0 - runtime test updated to use basetest config (since it's now using glibc toolchain) - minor runtime test style changes (use python f-strings) - rebased DEVELOPERS entries Patch tested on branch master at commit ae5274d with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_swipl ... OK ./utils/test-pkg -a -p swipl arm-aarch64 [ 1/45]: OK bootlin-aarch64-glibc [ 2/45]: OK bootlin-arcle-hs38-uclibc [ 3/45]: SKIPPED bootlin-armv5-uclibc [ 4/45]: SKIPPED bootlin-armv7-glibc [ 5/45]: OK bootlin-armv7m-uclibc [ 6/45]: SKIPPED bootlin-armv7-musl [ 7/45]: OK bootlin-m68k-5208-uclibc [ 8/45]: SKIPPED bootlin-m68k-68040-uclibc [ 9/45]: SKIPPED bootlin-microblazeel-uclibc [10/45]: SKIPPED bootlin-mipsel32r6-glibc [11/45]: OK bootlin-mipsel-uclibc [12/45]: SKIPPED bootlin-nios2-glibc [13/45]: SKIPPED bootlin-openrisc-uclibc [14/45]: SKIPPED bootlin-powerpc64le-power8-glibc [15/45]: OK bootlin-powerpc-e500mc-uclibc [16/45]: SKIPPED bootlin-riscv32-glibc [17/45]: OK bootlin-riscv64-glibc [18/45]: OK bootlin-riscv64-musl [19/45]: OK bootlin-s390x-z13-glibc [20/45]: OK bootlin-sh4-uclibc [21/45]: SKIPPED bootlin-sparc64-glibc [22/45]: OK bootlin-sparc-uclibc [23/45]: SKIPPED bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: SKIPPED bootlin-xtensa-uclibc [27/45]: SKIPPED br-arm-basic [28/45]: SKIPPED br-arm-full-nothread [29/45]: SKIPPED br-arm-full-static [30/45]: SKIPPED br-i386-pentium4-full [31/45]: SKIPPED br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: SKIPPED br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: SKIPPED br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: SKIPPED sourcery-arm [41/45]: SKIPPED sourcery-arm-thumb2 [42/45]: SKIPPED sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: SKIPPED 45 builds, 24 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- DEVELOPERS | 3 + package/Config.in | 1 + package/swipl/Config.in | 38 +++++++++++++ package/swipl/swipl.hash | 4 ++ package/swipl/swipl.mk | 55 +++++++++++++++++++ support/testing/tests/package/test_swipl.py | 46 ++++++++++++++++ .../test_swipl/rootfs-overlay/root/sudoku.pl | 42 ++++++++++++++ 7 files changed, 189 insertions(+) create mode 100644 package/swipl/Config.in create mode 100644 package/swipl/swipl.hash create mode 100644 package/swipl/swipl.mk create mode 100644 support/testing/tests/package/test_swipl.py create mode 100644 support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..8d3c17c3cb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1751,6 +1751,7 @@ F: package/python-pyalsa/ F: package/python-spake2/ F: package/rdma-core/ F: package/riscv-isa-sim/ +F: package/swipl/ F: package/tinycompress/ F: package/z3/ F: package/zynaddsubfx/ @@ -1846,6 +1847,8 @@ F: support/testing/tests/package/test_sed.py F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py +F: support/testing/tests/package/test_swipl.py +F: support/testing/tests/package/test_swipl/ F: support/testing/tests/package/test_tcl.py F: support/testing/tests/package/test_tcl/ F: support/testing/tests/package/test_tcpdump.py diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..b1a9d74af1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1443,6 +1443,7 @@ endmenu endif source "package/quickjs/Config.in" source "package/ruby/Config.in" + source "package/swipl/Config.in" source "package/tcl/Config.in" if BR2_PACKAGE_TCL menu "Tcl libraries/modules" diff --git a/package/swipl/Config.in b/package/swipl/Config.in new file mode 100644 index 0000000000..f0fb2d786d --- /dev/null +++ b/package/swipl/Config.in @@ -0,0 +1,38 @@ +# swipl supports arch for which libc fenv.h provides all four macros: +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD +# See for example in glibc https://sourceware.org/git/glibc.git +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ +config BR2_PACKAGE_SWIPL_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arceb || BR2_arcle + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + default y if BR2_m68k + # BR2_microblaze has only FE_TONEAREST + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + # BR2_nios2 has only FE_TONEAREST + default y if BR2_or1k + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_s390x + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} + default y if BR2_sparc || BR2_sparc64 + default y if BR2_x86_64 + # BR2_xtensa supports only uclibc which does not have fenv.h + +config BR2_PACKAGE_SWIPL + bool "SWI-Prolog" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # __has_attribute() + depends on BR2_PACKAGE_SWIPL_ARCH_SUPPORTS + # swipl needs fenv.h which is not provided by uclibc + depends on !BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_ZLIB + help + SWI-Prolog offers a comprehensive free Prolog + environment. Since its start in 1987, SWI-Prolog development + has been driven by the needs of real world + applications. SWI-Prolog is widely used in research and + education as well as commercial applications. + + https://www.swi-prolog.org diff --git a/package/swipl/swipl.hash b/package/swipl/swipl.hash new file mode 100644 index 0000000000..9f980654ba --- /dev/null +++ b/package/swipl/swipl.hash @@ -0,0 +1,4 @@ +# From https://www.swi-prolog.org/download/stable +sha256 10d90b15734d14d0d7972dc11a3584defd300d65a9f0b1185821af8c3896da5e swipl-9.2.0.tar.gz +# Locally calculated +sha256 770594d0f4463b71f1485f00e4bc5cf4b6f667d62ef6bc9bde2fee236541992a LICENSE diff --git a/package/swipl/swipl.mk b/package/swipl/swipl.mk new file mode 100644 index 0000000000..8514b9d449 --- /dev/null +++ b/package/swipl/swipl.mk @@ -0,0 +1,55 @@ +################################################################################ +# +# swipl +# +################################################################################ + +SWIPL_VERSION = 9.2.0 +SWIPL_SITE = https://www.swi-prolog.org/download/stable/src +SWIPL_LICENSE = BSD-2-Clause +SWIPL_LICENSE_FILES = LICENSE + +SWIPL_DEPENDENCIES = host-swipl zlib + +# A host-swipl is needed to compile the target prolog boot +# boot.prl file. +HOST_SWIPL_CONF_OPTS = \ + -DBUILD_PDF_DOCUMENTATION=OFF \ + -DSWIPL_PACKAGES=OFF \ + -DUSE_GMP=OFF \ + -DUSE_TCMALLOC=OFF + +# swipl uses cmake macros try_run() and check_c_source_runs(), which +# are not suitable for cross compilation. We add results in cache to +# avoid running those tests. The SWIPL_NATIVE_FRIEND variable, is +# meant to point to build directory of a host native swipl, rather +# than the binary itself. The Cmake macro will append "src/swipl" to +# the path set to this variable. Therefore, we cannot use the host +# "swipl" binary installed in $(HOST_DIR)/usr/bin. +SWIPL_CONF_OPTS = \ + -DBUILD_PDF_DOCUMENTATION=OFF \ + -DHAVE_WEAK_ATTRIBUTE=1 \ + -DLLROUND_OK=1 \ + -DMODF_OK=1 \ + -DQSORT_R_GNU=1 \ + -DSWIPL_NATIVE_FRIEND=$(BUILD_DIR)/host-swipl-$(SWIPL_VERSION) \ + -DSWIPL_PACKAGES=OFF \ + -DUSE_TCMALLOC=OFF + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +SWIPL_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +endif + +ifeq ($(BR2_PACKAGE_GMP),y) +SWIPL_CONF_OPTS += -DUSE_GMP=ON +SWIPL_DEPENDENCIES += gmp +else +SWIPL_CONF_OPTS += -DUSE_GMP=OFF +endif + +ifeq ($(BR2_PACKAGE_NCURSES),y) +SWIPL_DEPENDENCIES += ncurses +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/support/testing/tests/package/test_swipl.py b/support/testing/tests/package/test_swipl.py new file mode 100644 index 0000000000..0839101599 --- /dev/null +++ b/support/testing/tests/package/test_swipl.py @@ -0,0 +1,46 @@ +import os + +import infra.basetest + + +class TestSWIPL(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_swipl/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_SWIPL=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + 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]) + self.emulator.login() + + # Check program executes. + cmd = "swipl --version" + self.assertRunOk(cmd) + + # Check swipl fails when goal is false. + cmd = "swipl -g false" + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Test output. + string = "Hello Buildroot !" + cmd = f"swipl -g 'writeln(\"{string}\")' -t halt" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], string) + + # Check the swipl demo file works (ex: "sam" likes "pizza"). + cmd = "swipl -g '[swi(demo/likes)]' -g 'likes(sam,pizza)' -t halt" + self.assertRunOk(cmd) + + # Run a more complex logic program (solve a sudoku). + cmd = "swipl -g top -t halt /root/sudoku.pl" + self.assertRunOk(cmd, timeout=10) diff --git a/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl b/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl new file mode 100644 index 0000000000..2b68b6cc89 --- /dev/null +++ b/support/testing/tests/package/test_swipl/rootfs-overlay/root/sudoku.pl @@ -0,0 +1,42 @@ +% taken from: +% https://www.swi-prolog.org/pldoc/man?section=clpfd-sudoku + +:- use_module(library(clpfd)). + +sudoku(Rows) :- + length(Rows, 9), maplist(same_length(Rows), Rows), + append(Rows, Vs), Vs ins 1..9, + maplist(all_distinct, Rows), + transpose(Rows, Columns), + maplist(all_distinct, Columns), + Rows = [As,Bs,Cs,Ds,Es,Fs,Gs,Hs,Is], + blocks(As, Bs, Cs), + blocks(Ds, Es, Fs), + blocks(Gs, Hs, Is). + +blocks([], [], []). +blocks([N1,N2,N3|Ns1], [N4,N5,N6|Ns2], [N7,N8,N9|Ns3]) :- + all_distinct([N1,N2,N3,N4,N5,N6,N7,N8,N9]), + blocks(Ns1, Ns2, Ns3). + +problem(1, [[_,_,_,_,_,_,_,_,_], + [_,_,_,_,_,3,_,8,5], + [_,_,1,_,2,_,_,_,_], + [_,_,_,5,_,7,_,_,_], + [_,_,4,_,_,_,1,_,_], + [_,9,_,_,_,_,_,_,_], + [5,_,_,_,_,_,_,7,3], + [_,_,2,_,1,_,_,_,_], + [_,_,_,_,4,_,_,_,9]]). + +top :- writeln("Sudoku solution:"), + problem(1, Rows), sudoku(Rows), maplist(portray_clause, Rows), + Rows = [[9, 8, 7, 6, 5, 4, 3, 2, 1], + [2, 4, 6, 1, 7, 3, 9, 8, 5], + [3, 5, 1, 9, 2, 8, 7, 4, 6], + [1, 2, 8, 5, 3, 7, 6, 9, 4], + [6, 3, 4, 8, 9, 2, 1, 5, 7], + [7, 9, 5, 4, 6, 1, 8, 3, 2], + [5, 1, 9, 2, 8, 6, 4, 7, 3], + [4, 7, 2, 3, 1, 9, 5, 6, 8], + [8, 6, 3, 7, 4, 5, 2, 1, 9]]. -- 2.43.0 From ju.o at free.fr Wed Feb 7 22:55:24 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 07 Feb 2024 23:55:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/swipl: new package In-Reply-To: <0d0380e0-e56c-4b0a-bdfa-4a6253124b0b@smile.fr> References: <20221216221934.465323-1-ju.o@free.fr> <0d0380e0-e56c-4b0a-bdfa-4a6253124b0b@smile.fr> Message-ID: <7111666ff232bb1c937f292eb04a01fe@free.fr> Hi Romain, On 07/02/2024 12:49, Romain Naour wrote: > Hello Julien, > > Le 16/12/2022 ? 23:19, Julien Olivain a ?crit?: >> SWI-Prolog offers a comprehensive free Prolog environment. Since its >> start in 1987, SWI-Prolog development has been driven by the needs of >> real world applications. SWI-Prolog is widely used in research and >> education as well as commercial applications. >> >> Signed-off-by: Julien Olivain [...] >> +class TestSWIPL(infra.basetest.BRTest): >> + # Need to use a different toolchain than the default due to >> + # swipl requiring fenv.h not provided by uclibc. > > This not true anymore, the Buildroot testing infrastructure switched > from uClibc > to Glibc somewhere between 2022 and 2024 :) > > Hopefully the runtime test still pass on the current Buildroot master: > > ./support/testing/run-tests -k -d dl/ -o testsuite-master > tests.package.test_swipl.TestSWIPL > 12:33:08 TestSWIPL Starting > 12:33:09 TestSWIPL Building > 12:35:49 TestSWIPL Building done > 12:36:02 TestSWIPL Cleaning up > . > ---------------------------------------------------------------------- > Ran 1 test in 173.451s > > The complexity of the architecture dependency and the buildsystem make > it > difficult to review in details. > > Without going into the details, it seems ok for me. > > Obviously, the DEVELOPERS file conflict nowadays since several entries > has been > added since then. Thanks for the review. I sent a v2 to refresh this old patch. See: https://patchwork.ozlabs.org/project/buildroot/patch/20240207225100.1320837-1-ju.o at free.fr/ > > Best regards, > Romain > Best regards, Julien. From kilian.zinnecker at mail.de Wed Feb 7 23:22:21 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Thu, 08 Feb 2024 00:22:21 +0100 Subject: [Buildroot] [PATCH 1/1] configs/rzboard_v2L_defconfig: new defconfig In-Reply-To: <20240207204337.561d3b54@windsurf> References: <20231130223101.132221-1-kilian.zinnecker@mail.de> <20240207204337.561d3b54@windsurf> Message-ID: <2254622.iZASKD2KPV@laptop> Hello Thomas, Giulio, all, Thanks Giulio for reviewing my patch and your feedback! [--SNIP--] > Thanks, I have applied to master, after renaming to > avnet_rzboard_v2l_defconfig, and taking into account the feedback from > Giulio. Thanks for fixing the issues and applying the patch! > However, I find it not so nice that we don't build a fully bootable > image that includes U-Boot. Could you work on this and submit a > follow-up patch? > > There is a DIP switch on the board that allows to boot from SD, see > page 15 of the board hardware manual; Yes, I agree and would prefer a bootable image, containing a uboot built by buildroot as part of the boot chain, too. I therefore tried to run uboot from SD card at first (using the information from the hardware manual you refered to), but I was not successful. Hence I asked the author of a hackster.io article about the RZBoard V2L boot [1], whether he could help me. He told me, that he asked the Avnet BSP team, and "they confirmed there is no official support for storing bootloader files on micro sd". This matches his article, listing only eMMC and QSPI as possible locations for the bootloader. However, maybe this information is incomplete and there is in fact a way to run uboot from SD card, which I just was not able to get working. I can try to reach out to the Avnet support myself. And even if there is no way to do that, I can try to adjust the board support to build uboot, figure out how to flash uboot to the eMMC and document that in the readme. May take me some time though at the moment. Best regards, Kilian [1] https://www.hackster.io/lucas-keller/mastering-rzboardv2l-emmc-micro-sd-and-network-booting-dc87f3 From peter at korsgaard.com Thu Feb 8 07:09:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 08:09:39 +0100 Subject: [Buildroot] [PATCH] package/webkitgtk: security bump to version 2.42.5 Message-ID: <20240208070939.493203-1-peter@korsgaard.com> Fixes the following security issues: https://webkitgtk.org/security/WSA-2024-0001.html - CVE-2024-23222: Processing maliciously crafted web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been exploited. Description: A type confusion issue was addressed with improved checks. - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint the user. Description: An access issue was addressed with improved access restrictions. - CVE-2024-23213: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. - CVE-2023-40414: Processing web content may lead to arbitrary code execution. Description: A use-after-free issue was addressed with improved memory management. - CVE-2023-42833: Processing web content may lead to arbitrary code execution. Description: A correctness issue was addressed with improved checks. - CVE-2014-1745: Processing a file may lead to a denial-of-service or potentially disclose memory contents. Description: The issue was addressed with improved checks. https://webkitgtk.org/security/WSA-2023-0012.html - CVE-2023-42883: Processing a SVG image may lead to a denial-of-service. Description: The issue was addressed with improved memory handling. - CVE-2023-42890: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. https://webkitgtk.org/security/WSA-2023-0011.html - CVE-2023-42916: Processing web content may disclose sensitive information. Apple is aware of a report that this issue may have been actively exploited. Description: An out-of-bounds read was addressed with improved input validation. - CVE-2023-42917: Processing web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been actively exploited. Description: A memory corruption vulnerability was addressed with improved locking. Add an upstream post-2.42.5 patch to fix an issue with an invalid backport causing a build issue. Signed-off-by: Peter Korsgaard --- ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++ package/webkitgtk/webkitgtk.hash | 6 +-- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch diff --git a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 0000000000..c9667fedbd --- /dev/null +++ b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Peter Korsgaard +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.39.2 + diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 59782732c3..ac4799d4cf 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.42.2.tar.xz.sums -sha1 05bec6a824e46f043b865478735bc8395249510e webkitgtk-2.42.2.tar.xz -sha256 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 webkitgtk-2.42.2.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.5.tar.xz.sums +sha1 c3ffb2beaac56f1089029f2254482f48d9e3db37 webkitgtk-2.42.5.tar.xz +sha256 b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 webkitgtk-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 611d7f65d3..075a36654f 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.42.2 +WEBKITGTK_VERSION = 2.42.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES -- 2.39.2 From roykollensvendsen at gmail.com Thu Feb 8 07:49:00 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Thu, 8 Feb 2024 08:49:00 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install Message-ID: <20240208074901.1654224-1-roy.kollen.svendsen@akersolutions.com> Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... --- package/python3/python3.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 42765abcf4..81d9a904c7 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -34,6 +34,7 @@ HOST_PYTHON3_CONF_OPTS += \ HOST_PYTHON3_CONF_ENV += \ LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ py_cv_module_nis=n/a \ + py_cv_module__tkinter=n/a \ py_cv_module_unicodedata=yes \ py_cv_module__codecs_cn=n/a \ py_cv_module__codecs_hk=n/a \ -- 2.43.0 From br015 at umbiko.net Thu Feb 8 07:59:20 2024 From: br015 at umbiko.net (Andreas Ziegler) Date: Thu, 08 Feb 2024 07:59:20 +0000 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: References: Message-ID: Hi Fabrice, Romain, *, more complicated than I thought ... On 2024-02-07 11:30, Andreas Ziegler wrote: > Hi Fabrice, > > sorry in case I do not reply to the latest message in the thread; my > in-box is currently a bit crowded ... > > On 2024-02-06 18:59, Fabrice Fontaine wrote: > >> Message: 30 >> Date: Tue, 6 Feb 2024 18:59:00 +0100 >> From: Fabrice Fontaine >> To: Romain Naour >> Cc: buildroot at buildroot.org >> Subject: Re: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS >> Message-ID: >> >> Content-Type: text/plain; charset="UTF-8" >> >> Hello Romain, >> >> Le mar. 6 f?vr. 2024 ? 18:32, Romain Naour a >> ?crit : >>> >>> Hello, >>> >>> Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit : >>> > ncmpc is able to automatically detect NLS support since version 0.47 and >>> > https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 >>> > so let it handle automatically to avoid the following build failure with >>> > a bootlin toolchain which embeds a gettext definition in libintl.h which >>> > will clash with the fake gettext definition provided by ncmpc since >>> > https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: >>> > >>> > In file included from ../src/save_playlist.cxx:8: >>> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' >>> > 39 | extern char *gettext (const char *__msgid) >>> > | ^~~~~~~ >>> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' >>> > ../src/i18n.h:22:20: note: to match this '(' >>> > 22 | #define gettext(x) (x) >>> > | ^ >>> > >>> > Indeed, even if NLS is disabled by the user, libintl.h will be included >>> > by >>> > /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h >>> > though include >>> >>> We usually want to explicitly handle such option from Buildroot >>> package to not >>> rely on automatic detection (as currently done). >>> >>> It look like more a bug in ncmpc build system? >> >> I don't know, upstream wants to have the same code with and without >> NLS, so they decided to define a gettext macro when NLS is disabled. >> I could find an upstreamable solution as upstream will probably reject >> a patch that removes this gettext define and puts #ifdef ENABLE_NLS >> before every gettext calls. >> Do you have an upstreamable solution or should we just add a NLS >> dependency to ncmpc? > > This is probably not related to NLS, but to gettext being included in > the build by some other package. This tricks Meson into believing that > NLS is enabled. > > Also, the code in meson.txt may lead to unexpected results: > > if meson.version().version_compare('>= 0.59') and not mini > # Meson 0.59 has native libintl support > intl_dep = dependency('intl', required: enable_nls) > enable_nls = intl_dep.found() > elif enable_nls.disabled() or mini > intl_dep = dependency('', required: false) > enable_nls = false > elif cc.has_header('libintl.h') > intl_dep = dependency('', required: false) > enable_nls = true > elif enable_nls.auto() > intl_dep = dependency('', required: false) > enable_nls = false > else > error('libintl.h not found') > meson.txt works like nls=auto within Buildroot, thus reflecting the setting of BR2_SYSTEM_ENABLE_NLS, so no worries. The toolchain seems to have been built with NLS support; the C++ library makes use of this: [3/73] Compiling C++ object src/event/libevent.a.p/TimerList.cxx.o FAILED: src/event/libevent.a.p/TimerList.cxx.o /home/data/test/autobuild/host/bin/or1k-linux-g++ -Isrc/event/libevent.a.p -Isrc/event -I../src/event -Isrc -I../src -I. -I.. -fdiagnostics-color=always -Wall -Winvalid-pch -Wextra -Wpedantic -std=c++2a -O3 -Wcast-qual -Wcast-align -Wdouble-promotion -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wredundant-decls -Wshadow -Wundef -Wvla -Wwrite-strings -fno-threadsafe-statics -fmerge-all-constants -Wno-non-virtual-dtor -Wno-format-truncation -D_GNU_SOURCE -fvisibility=hidden -ffunction-sections -fdata-sections -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=2 -fPIC -MD -MQ src/event/libevent.a.p/TimerList.cxx.o -MF src/event/libevent.a.p/TimerList.cxx.o.d -o src/event/libevent.a.p/TimerList.cxx.o -c ../src/event/TimerList.cxx In file included from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h:36, from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/bits/locale_facets_nonio.h:2064, from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/locale:43, from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/iomanip:45, from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/bits/chrono_io.h:38, from /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/chrono:3330, from ../src/event/Chrono.hxx:6, from ../src/event/TimerList.hxx:7, from ../src/event/TimerList.cxx:5: /home/data/test/autobuild/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:23:2: error: #error "libintl.h included here" 23 | #error "libintl.h included here" | ^~~~~ Probably the least invasive solution would be to add a new ncmpc dependency: + depends on !BR2_TOOLCHAIN_HAS_FULL_GETTEXT || BR2_SYSTEM_ENABLE_NLS Kind regards, Andreas From thomas.petazzoni at bootlin.com Thu Feb 8 08:01:20 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 8 Feb 2024 09:01:20 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install In-Reply-To: <20240208074901.1654224-1-roy.kollen.svendsen@akersolutions.com> References: <20240208074901.1654224-1-roy.kollen.svendsen@akersolutions.com> Message-ID: <20240208090120.4d886b8c@windsurf> Hello Roy, On Thu, 8 Feb 2024 08:49:00 +0100 Roy Kollen Svendsen wrote: > diff --git a/package/python3/python3.mk b/package/python3/python3.mk > index 42765abcf4..81d9a904c7 100644 > --- a/package/python3/python3.mk > +++ b/package/python3/python3.mk > @@ -34,6 +34,7 @@ HOST_PYTHON3_CONF_OPTS += \ > HOST_PYTHON3_CONF_ENV += \ > LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ > py_cv_module_nis=n/a \ > + py_cv_module__tkinter=n/a \ > py_cv_module_unicodedata=yes \ > py_cv_module__codecs_cn=n/a \ > py_cv_module__codecs_hk=n/a \ Thanks a lot for your patch! However, in order to be consistent with how we do it with ncurses, sqlite, etc, I think it is the --disable-tk option that should automatically set py_cv_module__tkinter=n/a. +AC_SUBST(TK) +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) should be followed by something like AS_IF([test "${enable_tk}" = "no"], [PY_STDLIB_MOD_SET_NA([_tkinter])]) something like this (in package/python3/0012-Add-an-option-to-disable-the-tk-module.patch). Or, we need to turn around how things are done, and instead of adding those --enable/--disable, look at whether py_cv_module_ is passed to appropriately disable things. Might be more upstreamable (but I thought about this idea *after* redoing the 3.12 patches). That said, the 3.12 bump is for now causing quite a few issues, so it is not impossible that we revert it before the 2024.02 release. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Thu Feb 8 08:02:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 8 Feb 2024 09:02:56 +0100 Subject: [Buildroot] [PATCH 1/1] configs/rzboard_v2L_defconfig: new defconfig In-Reply-To: <2254622.iZASKD2KPV@laptop> References: <20231130223101.132221-1-kilian.zinnecker@mail.de> <20240207204337.561d3b54@windsurf> <2254622.iZASKD2KPV@laptop> Message-ID: <20240208090256.25b75053@windsurf> Hello Kilian, On Thu, 08 Feb 2024 00:22:21 +0100 kilian.zinnecker at mail.de wrote: > Yes, I agree and would prefer a bootable image, containing a uboot built by > buildroot as part of the boot chain, too. I therefore tried to run uboot from > SD card at first (using the information from the hardware manual you refered > to), but I was not successful. Hence I asked the author of a hackster.io > article about the RZBoard V2L boot [1], whether he could help me. He told me, > that he asked the Avnet BSP team, and "they confirmed there is no official > support for storing bootloader files on micro sd". This matches his article, > listing only eMMC and QSPI as possible locations for the bootloader. > > However, maybe this information is incomplete and there is in fact a way to > run uboot from SD card, which I just was not able to get working. I can try to > reach out to the Avnet support myself. And even if there is no way to do that, > I can try to adjust the board support to build uboot, figure out how to flash > uboot to the eMMC and document that in the readme. May take me some time > though at the moment. Thanks for the additional details. Indeed in this case, the best option would be to have our defconfig build a uboot that works on QSPI, or eMMC, and provide the instructions on how to reflash the QSPI or eMMC. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Thu Feb 8 08:38:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 09:38:04 +0100 Subject: [Buildroot] [PATCH] boot/shim: security bump to version 15.8 Message-ID: <20240208083805.528949-1-peter@korsgaard.com> Fixes the following security issues: CVE-2023-40546 mok: fix LogError() invocation CVE-2023-40547 - avoid incorrectly trusting HTTP headers CVE-2023-40548 Fix integer overflow on SBAT section size on 32-bit system CVE-2023-40549 Authenticode: verify that the signature header is in bounds. CVE-2023-40550 pe: Fix an out-of-bound read in verify_buffer_sbat() CVE-2023-40551: pe-relocate: Fix bounds check for MZ binaries https://github.com/rhboot/shim/tree/15.8 Signed-off-by: Peter Korsgaard --- boot/shim/shim.hash | 2 +- boot/shim/shim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/shim/shim.hash b/boot/shim/shim.hash index c9c489fd2f..5aa4ca06e8 100644 --- a/boot/shim/shim.hash +++ b/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 eab91644a3efe91a666399f5d8eb3eed0e04d04f79d4b6c0b278ef7747a239a5 shim-15.6.tar.bz2 +sha256 a79f0a9b89f3681ab384865b1a46ab3f79d88b11b4ca59aa040ab03fffae80a9 shim-15.8.tar.bz2 sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index bbef81cfc4..19b11f4086 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHIM_VERSION = 15.6 +SHIM_VERSION = 15.8 SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION) SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2 SHIM_LICENSE = BSD-2-Clause -- 2.39.2 From aperez at igalia.com Thu Feb 8 09:28:26 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 8 Feb 2024 11:28:26 +0200 Subject: [Buildroot] [PATCH] package/webkitgtk: security bump to version 2.42.5 In-Reply-To: <20240208070939.493203-1-peter@korsgaard.com> References: <20240208070939.493203-1-peter@korsgaard.com> Message-ID: <20240208112826.GB3464513@igalia.com> Hi Peter, I was about to submit basically the same patch, you have beaten me to it. Thanks! (Later today I to submit the wpewebkit update as well :D) On Thu, 08 Feb 2024 08:09:39 +0100 Peter Korsgaard wrote: > Fixes the following security issues: > > https://webkitgtk.org/security/WSA-2024-0001.html > > - CVE-2024-23222: Processing maliciously crafted web content may lead to > arbitrary code execution. Apple is aware of a report that this issue may > have been exploited. Description: A type confusion issue was addressed > with improved checks. > > - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint > the user. Description: An access issue was addressed with improved access > restrictions. > > - CVE-2024-23213: Processing web content may lead to arbitrary code execution. > Description: The issue was addressed with improved memory handling. > > - CVE-2023-40414: Processing web content may lead to arbitrary code > execution. Description: A use-after-free issue was addressed with > improved memory management. > > - CVE-2023-42833: Processing web content may lead to arbitrary code execution. > Description: A correctness issue was addressed with improved checks. > > - CVE-2014-1745: Processing a file may lead to a denial-of-service or > potentially disclose memory contents. Description: The issue was > addressed with improved checks. > > https://webkitgtk.org/security/WSA-2023-0012.html > > - CVE-2023-42883: Processing a SVG image may lead to a denial-of-service. > Description: The issue was addressed with improved memory handling. > > - CVE-2023-42890: Processing web content may lead to arbitrary code > execution. Description: The issue was addressed with improved memory > handling. > > https://webkitgtk.org/security/WSA-2023-0011.html > > - CVE-2023-42916: Processing web content may disclose sensitive information. > Apple is aware of a report that this issue may have been actively > exploited. Description: An out-of-bounds read was addressed with improved > input validation. > > - CVE-2023-42917: Processing web content may lead to arbitrary code > execution. Apple is aware of a report that this issue may have been > actively exploited. Description: A memory corruption vulnerability was > addressed with improved locking. > > Add an upstream post-2.42.5 patch to fix an issue with an invalid backport > causing a build issue. > > Signed-off-by: Peter Korsgaard Acked-by: Adrian Perez de Castro > --- > ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++ > package/webkitgtk/webkitgtk.hash | 6 +-- > package/webkitgtk/webkitgtk.mk | 2 +- > 3 files changed, 43 insertions(+), 4 deletions(-) > create mode 100644 package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > > diff --git a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > new file mode 100644 > index 0000000000..c9667fedbd > --- /dev/null > +++ b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > @@ -0,0 +1,39 @@ > +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 > +From: Michael Catanzaro > +Date: Mon, 5 Feb 2024 11:00:49 -0600 > +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= > + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= > + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= > + =?UTF-8?q?=3D268739?= > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Unreviewed build fix. Seems a backport went badly, and we didn't notice > +because the code is architecture-specific. > + > +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: > +(JSC::CLoop::execute): > + > +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff > +Signed-off-by: Peter Korsgaard > +--- > + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- > + 1 file changed, 2 deletions(-) > + > +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > +index 5064ead6cd2e..9a2e2653b121 100644 > +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, > + UNUSED_VARIABLE(t2); > + UNUSED_VARIABLE(t3); > + UNUSED_VARIABLE(t5); > +- UNUSED_VARIABLE(t6); > +- UNUSED_VARIABLE(t7); > + > + struct StackPointerScope { > + StackPointerScope(CLoopStack& stack) > +-- > +2.39.2 > + > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash > index 59782732c3..ac4799d4cf 100644 > --- a/package/webkitgtk/webkitgtk.hash > +++ b/package/webkitgtk/webkitgtk.hash > @@ -1,6 +1,6 @@ > -# From https://www.webkitgtk.org/releases/webkitgtk-2.42.2.tar.xz.sums > -sha1 05bec6a824e46f043b865478735bc8395249510e webkitgtk-2.42.2.tar.xz > -sha256 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 webkitgtk-2.42.2.tar.xz > +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.5.tar.xz.sums > +sha1 c3ffb2beaac56f1089029f2254482f48d9e3db37 webkitgtk-2.42.5.tar.xz > +sha256 b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 webkitgtk-2.42.5.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk > index 611d7f65d3..075a36654f 100644 > --- a/package/webkitgtk/webkitgtk.mk > +++ b/package/webkitgtk/webkitgtk.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -WEBKITGTK_VERSION = 2.42.2 > +WEBKITGTK_VERSION = 2.42.5 > WEBKITGTK_SITE = https://www.webkitgtk.org/releases > WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz > WEBKITGTK_INSTALL_STAGING = YES > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot > Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From roykollensvendsen at gmail.com Thu Feb 8 09:38:12 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Thu, 8 Feb 2024 10:38:12 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install Message-ID: <20240208093813.2395828-1-roy.kollen.svendsen@akersolutions.com> Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... Signed-off-by: Roy Kollen Svendsen --- Changes v1 -> v2: Make the --disable-tk option automatically set py_cv_module__tkinter=n/a (suggested by Thomas Petazzoni) --- .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 7fafbedddb..08617241a6 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,6 +70,8 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) -- 2.43.0 From roykollensvendsen at gmail.com Thu Feb 8 09:41:36 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Thu, 8 Feb 2024 10:41:36 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install Message-ID: <20240208094137.2396094-1-roy.kollen.svendsen@akersolutions.com> Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... Signed-off-by: Roy Kollen Svendsen --- Changes v1 -> v2: Make the --disable-tk option automatically set py_cv_module__tkinter=n/a (suggested by Thomas Petazzoni) --- .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 7fafbedddb..08617241a6 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,6 +70,8 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) -- 2.43.0 From aperez at igalia.com Thu Feb 8 09:55:28 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 8 Feb 2024 11:55:28 +0200 Subject: [Buildroot] [PATCH 1/3] package/wpebackend-rdk: new package In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> Message-ID: <20240208095531.99049-2-aperez@igalia.com> The wpebackend-rdk can be used as an alternative to wpebackend-fdo in some cases, and also supports a few additional configurations. For now only the Wayland-EGL and Broadcom RaspberryPi userland implementations can be enabled. The former is useful for testing, and the latter allows using WPE WebKit directly on top of Dispmanx in combination with the rpi-userland package in supported RaspberryPi models. This only adds the new package, follow-up commits will un-hardcode the usage of wpebackend-fdo and allow selecting either which of both to build. Signed-off-by: Adrian Perez de Castro --- package/Config.in | 1 + package/wpebackend-rdk/Config.in | 57 ++++++++++++++++++++++ package/wpebackend-rdk/wpebackend-rdk.hash | 5 ++ package/wpebackend-rdk/wpebackend-rdk.mk | 43 ++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 package/wpebackend-rdk/Config.in create mode 100644 package/wpebackend-rdk/wpebackend-rdk.hash create mode 100644 package/wpebackend-rdk/wpebackend-rdk.mk diff --git a/package/Config.in b/package/Config.in index 91a6f1de00d..99bd6fee22e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1723,6 +1723,7 @@ menu "Graphics" source "package/wlroots/Config.in" source "package/woff2/Config.in" source "package/wpebackend-fdo/Config.in" + source "package/wpebackend-rdk/Config.in" source "package/wpewebkit/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" diff --git a/package/wpebackend-rdk/Config.in b/package/wpebackend-rdk/Config.in new file mode 100644 index 00000000000..6125911bec9 --- /dev/null +++ b/package/wpebackend-rdk/Config.in @@ -0,0 +1,57 @@ +comment "wpebackend-rdk needs a toolchain w/ C++, wchar, threads, dynamic library, and rpi-userland or an OpenGL-capable Wayland backend" + depends on !(BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_HAS_LIBEGL_WAYLAND) \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +config BR2_PACKAGE_WPEBACKEND_RDK + bool "wpebackend-rdk" + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBWPE + help + WPEBackend interface supporting a number of configurations. + +if BR2_PACKAGE_WPEBACKEND_RDK + +choice + prompt Implementation + default BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI if BR2_PACKAGE_RPI_USERLAND + default BR2_PACKAGE_WPEBACKEND_RDK_IMPL_WAYLAND_EGL if BR2_PACKAGE_HAS_LIBEGL_WAYLAND + +comment "brcm-rpi needs rpi-userland" + depends on !BR2_PACKAGE_RPI_USERLAND || !BR2_arm + +config BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI + bool "brcm-rpi" + depends on BR2_arm + depends on BR2_PACKAGE_RPI_USERLAND + help + Build RaspberryPi support using Broadcom's rpi-userland. + +comment "wayland-egl needs an EGL capable Wayland implementation" + depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + +config BR2_PACKAGE_WPEBACKEND_RDK_IMPL_WAYLAND_EGL + bool "wayland-egl" + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + help + Build Wayland-EGL support. + +endchoice + +if BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI + +config BR2_PACKAGE_WPEBACKEND_RDK_LIBINPUT + bool "libinput support" + select BR2_PACKAGE_LIBINPUT + help + Support keyboard and mouse input through libinput + +endif + +endif diff --git a/package/wpebackend-rdk/wpebackend-rdk.hash b/package/wpebackend-rdk/wpebackend-rdk.hash new file mode 100644 index 00000000000..af7dab6a365 --- /dev/null +++ b/package/wpebackend-rdk/wpebackend-rdk.hash @@ -0,0 +1,5 @@ +# Generated locally +sha256 4c6ae288cf66f0a47052a50972e3d3727617c4c3e104db20494a3c5feb262f40 wpebackend-rdk-4.4.1.tar.gz + +# License files +sha256 a5ba969938c2896411ea1a23ee7d9ccb68306a65615b6711afe738c8f6ff2153 COPYING diff --git a/package/wpebackend-rdk/wpebackend-rdk.mk b/package/wpebackend-rdk/wpebackend-rdk.mk new file mode 100644 index 00000000000..f9740eb46cd --- /dev/null +++ b/package/wpebackend-rdk/wpebackend-rdk.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# wpebackend-rdk +# +################################################################################ + +WPEBACKEND_RDK_VERSION = 4.4.1 +WPEBACKEND_RDK_SITE = $(call github,WebPlatformForEmbedded,WPEBackend-rdk,R$(WPEBACKEND_RDK_VERSION)) +WPEBACKEND_RDK_INSTALL_STAGING = YES +WPEBACKEND_RDK_LICENSE = BSD-2-Clause +WPEBACKEND_RDK_LICENSE_FILES = COPYING +WPEBACKEND_RDK_DEPENDENCIES = libglib2 libwpe +WPEBACKEND_RDK_CONF_OPTS = \ + -DUSE_BACKEND_BCM_NEXUS=OFF \ + -DUSE_BACKEND_BCM_NEXUS_WAYLAND=OFF \ + -DUSE_BACKEND_INTEL_CE=OFF \ + -DUSE_BACKEND_WESTEROS=OFF \ + -DUSE_BACKEND_WPEFRAMEWORK=OFF \ + -DUSE_HOLE_PUNCH_GSTREAMER=OFF \ + -DUSE_VIRTUAL_KEYBOARD=OFF + +ifeq ($(BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI),y) +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_BCM_RPI=ON +WPEBACKEND_RDK_DEPENDENCIES += rpi-userland +else +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_BCM_RPI=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEBACKEND_RDK_IMPL_WAYLAND_EGL),y) +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_WAYLAND_EGL=ON +WPEBACKEND_RDK_DEPENDENCIES += libegl wayland +else +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_WAYLAND_EGL=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEBACKEND_RDK_LIBINPUT),y) +WPEBACKEND_RDK_CONF_OPTS += -DUSE_INPUT_LIBINPUT=ON +WPEBACKEND_RDK_DEPENDENCIES += libinput +else +WPEBACKEND_RDK_CONF_OPTS += -DUSE_INPUT_LIBINPUT=OFF +endif + +$(eval $(cmake-package)) -- 2.43.0 From aperez at igalia.com Thu Feb 8 09:55:30 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 8 Feb 2024 11:55:30 +0200 Subject: [Buildroot] [PATCH 3/3] package/wpewebkit: do not depend on wpebackend-fdo In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> Message-ID: <20240208095531.99049-4-aperez@igalia.com> Remove the wpewebkit package dependency on wpebackend-fdo, as it is not needed at all during the build. What is needed is a WPE backend at run time, which may be provided by wpebackend-fdo or wpebackend-rdk. To reflect this, we make wpewebkit depend on either being selected. Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/Config.in | 9 ++++----- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 432aa4c3a30..779af0c892e 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -24,11 +24,11 @@ comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gc || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ || !BR2_HOST_GCC_AT_LEAST_4_9 -comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" +comment "wpewebkit needs an OpenGL ES w/ EGL-capable implementation and an WPE backend" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT - depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL \ - || !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL + depends on !BR2_PACKAGE_WPEBACKEND_FDO && !BR2_PACKAGE_WPEBACKEND_RDK config BR2_PACKAGE_WPEWEBKIT bool "wpewebkit" @@ -41,8 +41,8 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wpebackend-fdo depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_WPEBACKEND_FDO || BR2_PACKAGE_WPEBACKEND_RDK select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_HARFBUZZ @@ -59,7 +59,6 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX - select BR2_PACKAGE_WPEBACKEND_FDO help WPE (Web Platform for Embedded) port of the WebKit engine, to allow embedders to create simple and performant systems diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 13143efb38b..e54ec2952ff 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -16,7 +16,7 @@ WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby host-unifdef \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup3 libtasn1 \ - libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo + libpng libxslt libwpe openjpeg wayland-protocols webp WPEWEBKIT_CMAKE_BACKEND = ninja -- 2.43.0 From aperez at igalia.com Thu Feb 8 09:55:29 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 8 Feb 2024 11:55:29 +0200 Subject: [Buildroot] [PATCH 2/3] package/cog: depend on wpebackend-fdo only if needed In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> Message-ID: <20240208095531.99049-3-aperez@igalia.com> Make the Cog headless platform plug-in selectable, allowing to configure the build without any plug-in at all. When all plug-ins are disabled, Cog does not require wpebackend-fdo at build time, and it is still able to use its built-in "fallback" support to load other WPE backends like wpebackend-rdk. Signed-off-by: Adrian Perez de Castro --- package/cog/Config.in | 28 ++++++++++++++++++++++++++-- package/cog/cog.mk | 13 ++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/package/cog/Config.in b/package/cog/Config.in index d2a910f9b89..d706b045b15 100644 --- a/package/cog/Config.in +++ b/package/cog/Config.in @@ -19,6 +19,10 @@ config BR2_PACKAGE_COG if BR2_PACKAGE_COG +config BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO + bool + default n + config BR2_PACKAGE_COG_PROGRAMS_HOME_URI string "home uri" default "https://wpewebkit.org" @@ -30,6 +34,8 @@ config BR2_PACKAGE_COG_PROGRAMS_HOME_URI config BR2_PACKAGE_COG_PLATFORM_FDO bool "Wayland backend" default y + depends on BR2_PACKAGE_WPEBACKEND_FDO + select BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_WAYLAND_PROTOCOLS help @@ -43,6 +49,8 @@ config BR2_PACKAGE_COG_PLATFORM_DRM depends on BR2_PACKAGE_HAS_LIBGBM depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT + depends on BR2_PACKAGE_WPEBACKEND_FDO + select BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT help @@ -50,16 +58,32 @@ config BR2_PACKAGE_COG_PLATFORM_DRM with video drivers that support kernel mode-setting (KMS) via the DRM user-space API. +config BR2_PACKAGE_COG_PLATFORM_HEADLESS + bool "Headless backend" + depends on BR2_PACKAGE_WPEBACKEND_FDO + select BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO + help + Enable the headless platform backend. + config BR2_PACKAGE_COG_USE_SYSTEM_DBUS bool "expose system D-Bus control interface" help Expose remote control interface on system bus -comment "DRM platform needs EGL and GBM" +comment "Headless platform needs wpebackend-fdo" + depends on \ + !BR2_PACKAGE_WPEBACKEND_FDO + +comment "DRM platform needs EGL, GBM, wpebackend-fdo" depends on \ !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_PACKAGE_HAS_LIBGBM || \ !BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF || \ - !BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT + !BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT || \ + !BR2_PACKAGE_WPEBACKEND_FDO + +comment "Wayland platform needs wpebackend-fdo" + depends on \ + !BR2_PACKAGE_WPEBACKEND_FDO endif diff --git a/package/cog/cog.mk b/package/cog/cog.mk index e96909f7796..8fc50de56f1 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -8,7 +8,7 @@ COG_VERSION = 0.18.2 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland +COG_DEPENDENCIES = dbus wpewebkit wayland COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ @@ -19,8 +19,6 @@ COG_CONF_OPTS = \ -Dcog_home_uri='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ -Dplatforms='$(subst $(space),$(comma),$(strip $(COG_PLATFORMS_LIST)))' -COG_PLATFORMS_LIST = headless - ifeq ($(BR2_PACKAGE_WESTON),y) COG_CONF_OPTS += -Dwayland_weston_direct_display=true COG_DEPENDENCIES += weston @@ -28,6 +26,11 @@ else COG_CONF_OPTS += -Dwayland_weston_direct_display=false endif +ifeq ($(BR2_PACKAGE_COG_PLATFORM_HEADLESS),y) +COG_PLATFORMS_LIST += headless +COG_DEPENDENCIES += wpebackend-fdo +endif + ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) COG_PLATFORMS_LIST += wayland COG_DEPENDENCIES += libxkbcommon wayland-protocols @@ -48,4 +51,8 @@ ifeq ($(BR2_PACKAGE_LIBMANETTE),y) COG_DEPENDENCIES += libmanette endif +ifeq ($(BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO),y) +COG_DEPENDENCIES += wpebackend-fdo +endif + $(eval $(meson-package)) -- 2.43.0 From aperez at igalia.com Thu Feb 8 09:55:27 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Thu, 8 Feb 2024 11:55:27 +0200 Subject: [Buildroot] [PATCH 0/3] Add support for the WPE WebKit RDK backend Message-ID: <20240208095531.99049-1-aperez@igalia.com> Hello all, This patch series allows using the RDK backend for WPE WebKit. Currently the main use case is to run WPEWebKit on RaspberryPi boards using on Dispmanx via the rpi-userland EGL/GLES libraries. In order to allow using the new wpebackend-rdk package I needed to un-hardcode usage of wpebackend-fdo, in two places: - The cog package may be built without wpebackend-fdo, passing an empty list of platform plug-ins. It has built-in support to load "simple" WPE backends like wpebackend-rdk. This was done by adding a config option for the headless plug-in, instead of always building it, and adjusting dependencies. - The wpewebkit package does not need wpebackend-fdo at all during the build. It only needs a backend installed at run time. This means it is enough to make wpewebkit have a "depends on" on any of the backends, to make sure they will be in the build, but none needs to be listed in WPEWEBKIT_DEPENDENCIES. I have tested this making builds based on raspberrypi3_defconfig, adding rpi-userland and then picking wpebackend-rdk + wpewebkit + cog. Hopefully the patch set is fine and nothing has slipped in the Kconfig dependencies (typically my weakest part of Buildroot contributions). Best regards, -Adrian Adrian Perez de Castro (3): package/wpebackend-rdk: new package package/cog: depend on wpebackend-fdo only if needed package/wpewebkit: do not depend on wpebackend-fdo package/Config.in | 1 + package/cog/Config.in | 28 ++++++++++- package/cog/cog.mk | 13 +++-- package/wpebackend-rdk/Config.in | 57 ++++++++++++++++++++++ package/wpebackend-rdk/wpebackend-rdk.hash | 5 ++ package/wpebackend-rdk/wpebackend-rdk.mk | 43 ++++++++++++++++ package/wpewebkit/Config.in | 9 ++-- package/wpewebkit/wpewebkit.mk | 2 +- 8 files changed, 147 insertions(+), 11 deletions(-) create mode 100644 package/wpebackend-rdk/Config.in create mode 100644 package/wpebackend-rdk/wpebackend-rdk.hash create mode 100644 package/wpebackend-rdk/wpebackend-rdk.mk -- 2.43.0 From roykollensvendsen at gmail.com Thu Feb 8 09:56:14 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Thu, 8 Feb 2024 10:56:14 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install Message-ID: <20240208095615.2397148-1-roy.kollen.svendsen@akersolutions.com> Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... Signed-off-by: Roy Kollen Svendsen --- Changes v1 -> v2: Make the --disable-tk option automatically set py_cv_module__tkinter=n/a (suggested by Thomas Petazzoni) --- .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 7fafbedddb..08617241a6 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,6 +70,8 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) -- 2.43.0 From antoine.coutant at smile.fr Thu Feb 8 10:25:22 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Thu, 8 Feb 2024 11:25:22 +0100 Subject: [Buildroot] [PATCH v4 2/7] package/pkg-meson.mk: add rust cross-compiler support In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-3-antoine.coutant@smile.fr> Message-ID: On 07/02/2024 16:13, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >> From: Romain Naour >> >> This change is needed to be able to build target packages requiring >> rust. If a package has rust in its project or in an add_language() >> call in their meson.build file, meson will try to find a suitable >> compiler for this language[1]. If the language is classified as >> required but not found, it will abort the build. >> >> It is necessary to specify rust and rust_ld separately in >> support/misc/cross-compilation.conf.in. If you specify it in one line >> just as "rust", it will generate the following warning: >> WARNING: Please do not put -C linker= in your compiler command, >> set rust_ld=command in your cross file or use the RUST_LD environment >> variable, otherwise meson will override your selection. >> >> [1] https://mesonbuild.com/Reference-manual_functions.html#add_languages >> >> Signed-off-by: Romain Naour >> Signed-off-by: Sebastian Weyer >> Signed-off-by: Antoine Coutant >> --- >> package/pkg-meson.mk | 13 +++++++++++++ >> support/misc/cross-compilation.conf.in | 2 ++ >> 2 files changed, 15 insertions(+) >> >> diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk >> index 65cabf23ba..25dd4f0d7f 100644 >> --- a/package/pkg-meson.mk >> +++ b/package/pkg-meson.mk >> @@ -82,6 +82,16 @@ else >> PKG_MESON_TARGET_FC = /bin/false >> endif >> >> +ifeq ($(BR2_PACKAGE_HOST_RUSTC),y) >> +PKG_MESON_TARGET_RUSTC = $(HOST_DIR)/bin/rustc >> +PKG_MESON_TARGET_RUSTC_LINKER = $(notdir $(TARGET_CROSS))gcc > Why can't PKG_MESON_TARGET_RUSTC_LINKER be an absolute path, when > PKG_MESON_TARGET_RUSTC is one, and [...] I tested with an absolute path and it worked. I don't know why I chose to use a relative path. Thanks for the report, I will make the change in the v5. Regards, Antoine Coutant >> +PKG_MESON_TARGET_RUSTC_TARGET_NAME = $(RUSTC_TARGET_NAME) >> +else >> +PKG_MESON_TARGET_RUSTC = /bin/false >> +PKG_MESON_TARGET_RUSTC_LINKER = /bin/false > [...] especially since here PKG_MESON_TARGET_RUSTC_LINKER is an absolute > path? > > Regards, > Yann E. MORIN. > >> +PKG_MESON_TARGET_RUSTC_TARGET_NAME = >> +endif >> + >> # Generates sed patterns for patching the cross-compilation.conf template, >> # since Flags might contain commas the arguments are passed indirectly by >> # variable name (stripped to deal with whitespaces). >> @@ -91,6 +101,7 @@ define PKG_MESON_CROSSCONFIG_SED >> -e "s%@TARGET_CXX@%$(PKG_MESON_TARGET_CXX)%g" \ >> -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ >> -e "s%@TARGET_FC@%$(PKG_MESON_TARGET_FC)%g" \ >> + -e "s%@TARGET_RUSTC@%$(PKG_MESON_TARGET_RUSTC)%g" \ >> -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ >> -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ >> -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ >> @@ -99,6 +110,8 @@ define PKG_MESON_CROSSCONFIG_SED >> -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ >> -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ >> -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ >> + -e "s%@TARGET_RUSTC_LINKER@%$(PKG_MESON_TARGET_RUSTC_LINKER)%g" \ >> + -e "s%@RUSTC_TARGET_NAME@%$(PKG_MESON_TARGET_RUSTC_TARGET_NAME)%g" \ >> -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ >> -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ >> -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ >> diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in >> index a58ab553d0..21cec10b82 100644 >> --- a/support/misc/cross-compilation.conf.in >> +++ b/support/misc/cross-compilation.conf.in >> @@ -13,6 +13,8 @@ fortran = '@TARGET_FC@' >> pkg-config = '@PKGCONF_HOST_BINARY@' >> g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' >> g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' >> +rust = ['@TARGET_RUSTC@', '--target', '@RUSTC_TARGET_NAME@' ] >> +rust_ld = '@TARGET_RUSTC_LINKER@' >> >> [built-in options] >> c_args = [@TARGET_CFLAGS@] >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From thomas.petazzoni at bootlin.com Thu Feb 8 10:29:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 8 Feb 2024 11:29:40 +0100 Subject: [Buildroot] [PATCH 0/3] Add support for the WPE WebKit RDK backend In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> Message-ID: <20240208112940.6fa6e89b@windsurf> Hello Adrian, On Thu, 8 Feb 2024 11:55:27 +0200 Adrian Perez de Castro wrote: > This patch series allows using the RDK backend for WPE WebKit. Currently the > main use case is to run WPEWebKit on RaspberryPi boards using on Dispmanx via > the rpi-userland EGL/GLES libraries. Thanks for this patch series! We have some other patches in patchwork related to webkit: Some from you: https://patchwork.ozlabs.org/project/buildroot/patch/20230423213001.2961215-1-aperez at igalia.com/ https://patchwork.ozlabs.org/project/buildroot/patch/20230423213233.2961770-1-aperez at igalia.com/ Are they still valid/application? We also have twice the same (?) patch from Giulio: https://patchwork.ozlabs.org/project/buildroot/patch/20230221161522.3749804-1-giulio.benetti at benettiengineering.com/ https://patchwork.ozlabs.org/project/buildroot/patch/20230221161522.3749804-2-giulio.benetti at benettiengineering.com/ is it relevant? Could you have a look so we can hopefully clear up the backlog? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From roykollensvendsen at gmail.com Thu Feb 8 10:50:34 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Thu, 8 Feb 2024 11:50:34 +0100 Subject: [Buildroot] [PATCH v2] package/python3: fix install In-Reply-To: <20240208074901.1654224-1-roy.kollen.svendsen@akersolutions.com> References: <20240208074901.1654224-1-roy.kollen.svendsen@akersolutions.com> Message-ID: <20240208105034.2401301-2-roy.kollen.svendsen@akersolutions.com> Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... Signed-off-by: Roy Kollen Svendsen --- Changes v1 -> v2: Make the --disable-tk option automatically set py_cv_module__tkinter=n/a (suggested by Thomas Petazzoni) --- .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 7fafbedddb..08617241a6 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,6 +70,8 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) -- 2.43.0 From thomas.petazzoni at bootlin.com Thu Feb 8 10:52:59 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Thu, 8 Feb 2024 11:52:59 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/tinymembench: force arm mode instead of Thumb mode In-Reply-To: References: <20240114135446.1156025-1-fontaine.fabrice@gmail.com> <20240207164741.1bad9b44@windsurf> Message-ID: <20240208115259.150a3219@windsurf> On Wed, 7 Feb 2024 21:48:51 +0100 Fabrice Fontaine wrote: > - upstream seems dead now so non upstreamable patches will have to be > kept "forever" Indeed. The repo has not seen any commits since 11 years, despite PRs and issues being opened by several people. I think we should drop this package, and stop bothering. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From peter at korsgaard.com Thu Feb 8 11:12:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 12:12:13 +0100 Subject: [Buildroot] [PATCH] package/libopenssl: security bump to version 3.2.1 Message-ID: <20240208111214.679980-1-peter@korsgaard.com> And drop the now upstreamed patches. Fixes the following (low severity) issues: - CVE-2023-6129 POLY1305 MAC implementation corrupts vector registers on PowerPC https://www.openssl.org/news/secadv/20240109.txt - CVE-2023-6237 Excessive time spent checking invalid RSA public keys https://www.openssl.org/news/secadv/20240115.txt - CVE-2024-0727 PKCS12 Decoding crashes https://www.openssl.org/news/secadv/20240125.txt Signed-off-by: Peter Korsgaard --- ...x-mispelling-of-extension-test-macro.patch | 30 ----- ...x-genstr-genconf-option-in-asn1parse.patch | 42 ------ ...en-asn1-oid-loader-to-invalid-inputs.patch | 122 ------------------ package/libopenssl/libopenssl.hash | 4 +- package/libopenssl/libopenssl.mk | 2 +- 5 files changed, 3 insertions(+), 197 deletions(-) delete mode 100644 package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch delete mode 100644 package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch delete mode 100644 package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch diff --git a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch deleted file mode 100644 index 93b191a61c..0000000000 --- a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001 -From: Grant Nichol -Date: Fri, 22 Dec 2023 23:46:39 -0600 -Subject: [PATCH] riscv: Fix mispelling of extension test macro - -When refactoring the riscv extension test macros, -RISCV_HAS_ZKND_AND_ZKNE was mispelled. - -Upstream: https://github.com/openssl/openssl/pull/23139 -Signed-off-by: Grant Nichol ---- - providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c -index b35b71020e..65adc47d1f 100644 ---- a/providers/implementations/ciphers/cipher_aes_xts_hw.c -+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c -@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \ - # define PROV_CIPHER_HW_select_xts() \ - if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \ - return &aes_xts_rv32i_zbkb_zknd_zkne; \ --if (RISCV_HAS_ZKND_ZKNE()) \ -+if (RISCV_HAS_ZKND_AND_ZKNE()) \ - return &aes_xts_rv32i_zknd_zkne; - # else - /* The generic case */ --- -2.43.0 - diff --git a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch b/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch deleted file mode 100644 index 9fa36d83be..0000000000 --- a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 749fcc0e3ce796474a15d6fac221e57daeacff1e Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Tue, 5 Dec 2023 14:50:01 -0500 -Subject: [PATCH] Fix genstr/genconf option in asn1parse - -At some point the asn1parse applet was changed to default the inform to -PEM, and defalt input file to stdin. Doing so broke the -genstr|conf options, -in that, before we attempt to generate an ASN1 block from the provided -genstr string, we attempt to read a PEM input from stdin. As a result, -this command: -openssl asn1parse -genstr OID:1.2.3.4 -hangs because we are attempting a blocking read on stdin, waiting for -data that never arrives - -Fix it by giving priority to genstr|genconf, such that, if set, will just run -do_generate on that string and exit - -Reviewed-by: Hugo Landau -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/22957) -Upstream: https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e -Signed-off-by: Martin Kurbanov ---- - apps/asn1parse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apps/asn1parse.c b/apps/asn1parse.c -index 097b0cc1ed..6597a6180b 100644 ---- a/apps/asn1parse.c -+++ b/apps/asn1parse.c -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) - - if ((buf = BUF_MEM_new()) == NULL) - goto end; -- if (informat == FORMAT_PEM) { -+ if (genstr == NULL && informat == FORMAT_PEM) { - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { - BIO_printf(bio_err, "Error reading PEM file\n"); - ERR_print_errors(bio_err); --- -2.40.0 - diff --git a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch b/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch deleted file mode 100644 index 299ecbc2ed..0000000000 --- a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch +++ /dev/null @@ -1,122 +0,0 @@ -From a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Tue, 5 Dec 2023 15:24:20 -0500 -Subject: [PATCH] Harden asn1 oid loader to invalid inputs - -In the event that a config file contains this sequence: -======= -openssl_conf = openssl_init - -config_diagnostics = 1 - -[openssl_init] -oid_section = oids - -[oids] -testoid1 = 1.2.3.4.1 -testoid2 = A Very Long OID Name, 1.2.3.4.2 -testoid3 = ,1.2.3.4.3 -====== - -The leading comma in testoid3 can cause a heap buffer overflow, as the -parsing code will move the string pointer back 1 character, thereby -pointing to an invalid memory space - -correct the parser to detect this condition and handle it by treating it -as if the comma doesn't exist (i.e. an empty long oid name) - -Reviewed-by: Hugo Landau -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/22957) -Upstream: https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 -Signed-off-by: Martin Kurbanov ---- - apps/asn1parse.c | 2 +- - crypto/asn1/asn_moid.c | 4 ++++ - test/recipes/04-test_asn1_parse.t | 26 ++++++++++++++++++++++++++ - test/test_asn1_parse.cnf | 12 ++++++++++++ - 4 files changed, 43 insertions(+), 1 deletion(-) - create mode 100644 test/recipes/04-test_asn1_parse.t - create mode 100644 test/test_asn1_parse.cnf - -diff --git a/apps/asn1parse.c b/apps/asn1parse.c -index 6597a6180b..bf62f85947 100644 ---- a/apps/asn1parse.c -+++ b/apps/asn1parse.c -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) - - if ((buf = BUF_MEM_new()) == NULL) - goto end; -- if (genstr == NULL && informat == FORMAT_PEM) { -+ if (genconf == NULL && genstr == NULL && informat == FORMAT_PEM) { - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { - BIO_printf(bio_err, "Error reading PEM file\n"); - ERR_print_errors(bio_err); -diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c -index 6f816307af..1e183f4f18 100644 ---- a/crypto/asn1/asn_moid.c -+++ b/crypto/asn1/asn_moid.c -@@ -67,6 +67,10 @@ static int do_create(const char *value, const char *name) - if (p == NULL) { - ln = name; - ostr = value; -+ } else if (p == value) { -+ /* we started with a leading comma */ -+ ln = name; -+ ostr = p + 1; - } else { - ln = value; - ostr = p + 1; -diff --git a/test/recipes/04-test_asn1_parse.t b/test/recipes/04-test_asn1_parse.t -new file mode 100644 -index 0000000000..f3af436592 ---- /dev/null -+++ b/test/recipes/04-test_asn1_parse.t -@@ -0,0 +1,26 @@ -+#! /usr/bin/env perl -+# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. -+# -+# Licensed under the Apache License 2.0 (the "License"). You may not use -+# this file except in compliance with the License. You can obtain a copy -+# in the file LICENSE in the source distribution or at -+# https://www.openssl.org/source/license.html -+ -+use strict; -+use OpenSSL::Test qw(:DEFAULT srctop_file); -+use OpenSSL::Test::Utils; -+ -+setup("test_asn1_parse"); -+ -+plan tests => 3; -+ -+$ENV{OPENSSL_CONF} = srctop_file("test", "test_asn1_parse.cnf"); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.1'])))); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.2'])))); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.3'])))); -diff --git a/test/test_asn1_parse.cnf b/test/test_asn1_parse.cnf -new file mode 100644 -index 0000000000..5f0305657e ---- /dev/null -+++ b/test/test_asn1_parse.cnf -@@ -0,0 +1,12 @@ -+openssl_conf = openssl_init -+ -+# Comment out the next line to ignore configuration errors -+config_diagnostics = 1 -+ -+[openssl_init] -+oid_section = oids -+ -+[oids] -+testoid1 = 1.2.3.4.1 -+testoid2 = A Very Long OID Name, 1.2.3.4.2 -+testoid3 = ,1.2.3.4.3 --- -2.40.0 - diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 9e09e12461..841d4b4cfd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.2.0.tar.gz.sha256 -sha256 14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e openssl-3.2.0.tar.gz +# From https://www.openssl.org/source/openssl-3.2.1.tar.gz.sha256 +sha256 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 openssl-3.2.1.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 7dc6d93256..feb5026c02 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.2.0 +LIBOPENSSL_VERSION = 3.2.1 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 -- 2.39.2 From raphael.melotte at mind.be Thu Feb 8 11:28:10 2024 From: raphael.melotte at mind.be (=?UTF-8?B?UmFwaGHDq2wgTcOpbG90dGU=?=) Date: Thu, 8 Feb 2024 12:28:10 +0100 Subject: [Buildroot] [PATCH 6/6] package/python-pymupdf: bump to version 1.23.9rc2 In-Reply-To: <20240110093850.2302133-6-james.hilliard1@gmail.com> References: <20240110093850.2302133-1-james.hilliard1@gmail.com> <20240110093850.2302133-6-james.hilliard1@gmail.com> Message-ID: <454a12aa-fe40-4435-8c6e-5f020d960bb5@mind.be> Hi James, all, Thanks for the patches! I added a few comments/questions below. On 1/10/24 10:38, James Hilliard wrote: > Migrate to in tree pep517 based build backend. > Does this new version cross-compile for you? I get the following error because the wrong python-config is used (I only briefly tried armv5 so far): error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > Note that version 1.23.8 is not compatible with mupdf 1.23.8 due to > header conflict bugs that were fixed after the 1.23.8 release. > > Signed-off-by: James Hilliard > --- > package/python-pymupdf/python-pymupdf.hash | 4 +-- > package/python-pymupdf/python-pymupdf.mk | 33 ++++++++++++---------- > 2 files changed, 20 insertions(+), 17 deletions(-) > > diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash > index 9fd8150088..e57652ab69 100644 > --- a/package/python-pymupdf/python-pymupdf.hash > +++ b/package/python-pymupdf/python-pymupdf.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/pymupdf/json > -md5 468fe56375a1fca99e83fe0aa0b9f8bd PyMuPDF-1.22.0.tar.gz > -sha256 6e1694e5c0cd8b92d503a506ee8e4ba1bed768528de586889d3ec90e9dc4a7d3 PyMuPDF-1.22.0.tar.gz > +md5 eb0b65eaa063c2417d89c5453e7c82ad PyMuPDF-1.23.9rc2.tar.gz > +sha256 ba6fdd907814acb968ce669f49b0c14ef9ef8b1e2d161829b7a31461aab04429 PyMuPDF-1.23.9rc2.tar.gz > # Locally computed sha256 checksums > sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING > diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk > index 639ce0e00e..ac76afa3f6 100644 > --- a/package/python-pymupdf/python-pymupdf.mk > +++ b/package/python-pymupdf/python-pymupdf.mk > @@ -5,25 +5,28 @@ > ################################################################################ > > # python-pymupdf's version must match mupdf's version > -PYTHON_PYMUPDF_VERSION = 1.22.0 > +PYTHON_PYMUPDF_VERSION = 1.23.9rc2 > PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz > -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/28/ba/d6bb6fd678e8396d7b944870286fb25fd6f499b8cb599b5436c8f725adbf > -PYTHON_PYMUPDF_SETUP_TYPE = setuptools > +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/b4/ff/db44303d60b8cc310a7187d500c7765b3b48aa113c86428d5d1c390b8fb5 > +PYTHON_PYMUPDF_SETUP_TYPE = pep517 > PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ > PYTHON_PYMUPDF_LICENSE_FILES = COPYING > # No license file included in pip, but it's present on github > -PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib > +PYTHON_PYMUPDF_DEPENDENCIES = \ > + host-python-libclang \ Isn't libclang only required by the PyMuPDF plumbing when it builds the bundled MuPDF? In our case since we're building MuPDF as a separate package, we hopefully don't need it... > + host-python-psutil \ From a quick look at the PyMuPDF code, this seems to be needed only for a single test (which we don't run, so we don't need it). > + host-python-setuptools \ > + host-python-swig \ The way I understand it, PyMuPDF added this host-python-swig dependency as a way to make sure swig is available when building. Since we already have host-swig as a dependency, we can probably use that one to build as Yann suggested? > + host-swig \ > + freetype \ > + mupdf \ > + zlib > > -PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" > - > -# We need to remove the original paths as we provide them in the CFLAGS: > -define PYTHON_PYMUPDF_REMOVE_PATHS > - sed -i "/\/usr\/include\/mupdf/d" $(@D)/setup.py > - sed -i "/\/usr\/include\/freetype2/d" $(@D)/setup.py > - sed -i "/\/usr\/local\/include\/mupdf/d" $(@D)/setup.py > - sed -i "/mupdf\/thirdparty\/freetype\/include/d" $(@D)/setup.py > -endef > - > -PYTHON_PYMUPDF_POST_PATCH_HOOKS = PYTHON_PYMUPDF_REMOVE_PATHS > +PYTHON_PYMUPDF_ENV = \ > + PYMUPDF_INCLUDES="$(STAGING_DIR)/usr/include/freetype2:$(STAGING_DIR)/usr/include" \ > + PYMUPDF_MUPDF_LIB="$(STAGING_DIR)/usr/lib" \ > + PYMUPDF_SETUP_FLAVOUR=p \> + PYMUPDF_SETUP_IMPLEMENTATIONS=a \ It's worth noting that PyMuPDF is gradually switching to a new implementation which will require MuPDF to be built with python bindings in the future (but for now, both implementations are still available AFAICT). > + PYMUPDF_SETUP_MUPDF_BUILD= > > $(eval $(python-package)) There seem to be more work needed to get this new version to work, I'll try to have a closer look at it in the next few days. Kind regards, Rapha?l From peter at korsgaard.com Thu Feb 8 12:52:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 13:52:47 +0100 Subject: [Buildroot] [PATCH 3/4] package/v4l2loopback: drop _CPE_ID_VENDOR In-Reply-To: <1bfeb8d9649b7bb7fcd44cab8b5bd811bf389c0f.1707060159.git.yann.morin.1998@free.fr> References: <1bfeb8d9649b7bb7fcd44cab8b5bd811bf389c0f.1707060159.git.yann.morin.1998@free.fr> Message-ID: <6433c090-b23b-4c5c-8097-9c3a77086509@korsgaard.com> On 04/02/2024 16.22, Yann E. MORIN wrote: > Commit 1edb9d691dec (package/v4l2loopback: add > V4L2LOOPBACK_CPE_ID_VENDOR) added that variable, but set to its default > value. > > This is however not required to define a valid CPE ID, as it also > defines a non-default CPE_ID_PREFIX. > > Drop V4L2LOOPBACK_CPE_ID_VENDOR now. > > Signed-off-by: Yann E. MORIN > Cc: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 8 12:57:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 08 Feb 2024 13:57:44 +0100 Subject: [Buildroot] [PATCH] package/webkitgtk: security bump to version 2.42.5 In-Reply-To: <20240208070939.493203-1-peter@korsgaard.com> (Peter Korsgaard's message of "Thu, 8 Feb 2024 08:09:39 +0100") References: <20240208070939.493203-1-peter@korsgaard.com> Message-ID: <87h6ijyuyf.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Fixes the following security issues: > https://webkitgtk.org/security/WSA-2024-0001.html > - CVE-2024-23222: Processing maliciously crafted web content may lead to > arbitrary code execution. Apple is aware of a report that this issue may > have been exploited. Description: A type confusion issue was addressed > with improved checks. > - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint > the user. Description: An access issue was addressed with improved access > restrictions. > - CVE-2024-23213: Processing web content may lead to arbitrary code execution. > Description: The issue was addressed with improved memory handling. > - CVE-2023-40414: Processing web content may lead to arbitrary code > execution. Description: A use-after-free issue was addressed with > improved memory management. > - CVE-2023-42833: Processing web content may lead to arbitrary code execution. > Description: A correctness issue was addressed with improved checks. > - CVE-2014-1745: Processing a file may lead to a denial-of-service or > potentially disclose memory contents. Description: The issue was > addressed with improved checks. > https://webkitgtk.org/security/WSA-2023-0012.html > - CVE-2023-42883: Processing a SVG image may lead to a denial-of-service. > Description: The issue was addressed with improved memory handling. > - CVE-2023-42890: Processing web content may lead to arbitrary code > execution. Description: The issue was addressed with improved memory > handling. > https://webkitgtk.org/security/WSA-2023-0011.html > - CVE-2023-42916: Processing web content may disclose sensitive information. > Apple is aware of a report that this issue may have been actively > exploited. Description: An out-of-bounds read was addressed with improved > input validation. > - CVE-2023-42917: Processing web content may lead to arbitrary code > execution. Apple is aware of a report that this issue may have been > actively exploited. Description: A memory corruption vulnerability was > addressed with improved locking. > Add an upstream post-2.42.5 patch to fix an issue with an invalid backport > causing a build issue. > Signed-off-by: Peter Korsgaard Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 8 12:48:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 13:48:01 +0100 Subject: [Buildroot] [git commit] package/v4l2loopback: drop _CPE_ID_VENDOR Message-ID: <20240208125807.0101787563@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74682e07df455aa49a637ebbda580df969e64ccf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 1edb9d691dec (package/v4l2loopback: add V4L2LOOPBACK_CPE_ID_VENDOR) added that variable, but set to its default value. This is however not required to define a valid CPE ID, as it also defines a non-default CPE_ID_PREFIX. Drop V4L2LOOPBACK_CPE_ID_VENDOR now. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/v4l2loopback/v4l2loopback.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/v4l2loopback/v4l2loopback.mk b/package/v4l2loopback/v4l2loopback.mk index 84e1927ce3..50a168fcab 100644 --- a/package/v4l2loopback/v4l2loopback.mk +++ b/package/v4l2loopback/v4l2loopback.mk @@ -8,7 +8,6 @@ V4L2LOOPBACK_VERSION = 0.12.7 V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,v$(V4L2LOOPBACK_VERSION)) V4L2LOOPBACK_LICENSE = GPL-2.0+ V4L2LOOPBACK_LICENSE_FILES = COPYING -V4L2LOOPBACK_CPE_ID_VENDOR = v4l2loopback_project V4L2LOOPBACK_CPE_ID_PREFIX = cpe:2.3:o ifeq ($(BR2_PACKAGE_V4L2LOOPBACK_UTILS),y) From peter at korsgaard.com Thu Feb 8 12:52:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 13:52:57 +0100 Subject: [Buildroot] [git commit] package/webkitgtk: security bump to version 2.42.5 Message-ID: <20240208125807.0D3CA87565@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=de3684f57df79c19eba34dac98418ceeaccd03db branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: https://webkitgtk.org/security/WSA-2024-0001.html - CVE-2024-23222: Processing maliciously crafted web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been exploited. Description: A type confusion issue was addressed with improved checks. - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint the user. Description: An access issue was addressed with improved access restrictions. - CVE-2024-23213: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. - CVE-2023-40414: Processing web content may lead to arbitrary code execution. Description: A use-after-free issue was addressed with improved memory management. - CVE-2023-42833: Processing web content may lead to arbitrary code execution. Description: A correctness issue was addressed with improved checks. - CVE-2014-1745: Processing a file may lead to a denial-of-service or potentially disclose memory contents. Description: The issue was addressed with improved checks. https://webkitgtk.org/security/WSA-2023-0012.html - CVE-2023-42883: Processing a SVG image may lead to a denial-of-service. Description: The issue was addressed with improved memory handling. - CVE-2023-42890: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. https://webkitgtk.org/security/WSA-2023-0011.html - CVE-2023-42916: Processing web content may disclose sensitive information. Apple is aware of a report that this issue may have been actively exploited. Description: An out-of-bounds read was addressed with improved input validation. - CVE-2023-42917: Processing web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been actively exploited. Description: A memory corruption vulnerability was addressed with improved locking. Add an upstream post-2.42.5 patch to fix an issue with an invalid backport causing a build issue. Signed-off-by: Peter Korsgaard Acked-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- ...LowLevelInterpreter.cpp-339-21-error-t6-w.patch | 39 ++++++++++++++++++++++ package/webkitgtk/webkitgtk.hash | 6 ++-- package/webkitgtk/webkitgtk.mk | 2 +- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 0000000000..c9667fedbd --- /dev/null +++ b/package/webkitgtk/0001-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Peter Korsgaard +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.39.2 + diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 59782732c3..ac4799d4cf 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.42.2.tar.xz.sums -sha1 05bec6a824e46f043b865478735bc8395249510e webkitgtk-2.42.2.tar.xz -sha256 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 webkitgtk-2.42.2.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.5.tar.xz.sums +sha1 c3ffb2beaac56f1089029f2254482f48d9e3db37 webkitgtk-2.42.5.tar.xz +sha256 b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749 webkitgtk-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 611d7f65d3..075a36654f 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.42.2 +WEBKITGTK_VERSION = 2.42.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From sebastien.szymanski at armadeus.com Thu Feb 8 12:54:21 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Thu, 8 Feb 2024 13:54:21 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> Message-ID: <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> This commit adds i.MX91 and i.MX93 support to Buildroot. https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors:IMX9-PROCESSORS There is no i.MX95 software provided by NXP at the moment that's why i.MX95 is left behind. Adapt package firmware-imx for the LPPDR4 firwmares binaries. Reviewed-by: Gary Bisson Signed-off-by: S?bastien Szymanski --- Changes for v5: - none Changes for v4 - move i.MX Silicon Revision changes into this patch (Gary Bisson) - BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION default to "v202201" instead of just "202201" (Gary Bisson) - Copy all DDR files to $(BINARIES_DIR) as U-Boot can now create a bootable image: https://source.denx.de/u-boot/u-boot/-/commit/f637dfe8c468229c9fb313d13c46d51cdbb88824 - remove "pmu_train" from generated _pad binary file names Changes for v3: - none Changes for v2: - none --- package/freescale-imx/Config.in | 37 ++++++++++++++++++++++ package/freescale-imx/firmware-imx/Config.in | 9 ++++++ package/freescale-imx/firmware-imx/firmware-imx.mk | 25 +++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 1c26b3cc6f4c..ba169ead18cb 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -61,6 +61,41 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL bool "imx8dxl" +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + bool "imx91" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + bool "imx93" + +endchoice + +choice + prompt "i.MX Silicon Revision" + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 \ + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 \ + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + help + Some packages related to the selected i.MX platform need to know the + silicon revision of the platform they will run on. + If you don't know, leave the default value. + + Note - mismatches may result in a failure to boot! + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 + bool "imx91a1" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 + bool "imx93a0" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + bool "imx93a1" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + endchoice config BR2_PACKAGE_FREESCALE_IMX_PLATFORM @@ -80,6 +115,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM default "IMX8MN" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN default "IMX8MP" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default "IMX91" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + default "IMX93" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU bool diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 087ddef8771b..d83b5e129a9f 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -55,6 +55,8 @@ config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW @@ -73,11 +75,15 @@ config BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 config BR2_PACKAGE_FIRMWARE_IMX_DDR4 bool "DDR4" + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 help Use DDR4 binaries (i.e.: ddr4_*_201810.bin). config BR2_PACKAGE_FIRMWARE_IMX_DDR3 bool "DDR3" + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 help Use DDR3 binaries (i.e.: ddr3_*_201810.bin). @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION # unconditionally use HW version 201810 when DDR3/DDR4 was # selected default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || BR2_PACKAGE_FIRMWARE_IMX_DDR4 + default "v202201" if \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 help Use a specific version of the imx ddr binaries. Leaving this field empty will select the default version. diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 66ef8c3930be..1f36f917cdc8 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -48,6 +48,30 @@ endif ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW + # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate lpddr4_fw.bin. + # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin + # which is done in post-image script. + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_1d_fw) + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_2d_fw) + cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ + $(BINARIES_DIR)/lpddr4_fw.bin + ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin + + # U-Boot supports creation of the combined flash.bin image. To make + # sure that U-Boot can access all available files copy them to + # the binary dir. + cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ +endef +else define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW # Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin. # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ endef endif +endif ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys -- 2.43.0 From sebastien.szymanski at armadeus.com Thu Feb 8 12:54:20 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Thu, 8 Feb 2024 13:54:20 +0100 Subject: [Buildroot] [PATCH v5 0/3] i.MX91 and i.MX93 support Message-ID: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> This series adds i.MX91, i.MX93 and i.MX93 11x11 EVK to Buildroot. --- Changes for v5: - follow BR coding style for the genimage.cfg.template_imx9 file (Giulio Benetti) Changes for v4: - "i.MX platform asic version" -> "i.MX Silicon Revision" (Gary Bisson) - move i.MX Silicon Revision changes into first patch (Gary Bisson) - BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION default to "v202201" instead of just "202201" (Gary Bisson) - Copy all DDR files to $(BINARIES_DIR) as U-Boot can now create a bootable image: https://source.denx.de/u-boot/u-boot/-/commit/f637dfe8c468229c9fb313d13c46d51cdbb88824 - remove "pmu_train" from generated _pad binary file names Changes for v3: - rename package firmware-sentinel to firmware-ele-imx - add a note about the debug UART in the readme.txt file (Julien Olivain) - add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y and BR2_TARGET_UBOOT_NEEDS_GNUTLS=y to the defconfig file (Julien Olivain) - bump ATF, U-Boot and Linux to latest NXP release lf-6.1.55-2.2.0 (Julien Olivain) Changes for v2: - patch 1 of v1 has been applied - move SoC asic version selection to package/freescale-imx/Config.in - minor fixes in latest patch --- S?bastien Szymanski (3): package/freescale-imx: add i.MX91 and i.MX93 SoC support package/freescale-imx/firmware-ele-imx: new package configs/freescale_imx93evk: new defconfig .../common/imx/genimage.cfg.template_imx9 | 42 ++++++++++++ .../common/imx/imx9-bootloader-prepare.sh | 34 ++++++++++ board/freescale/common/imx/post-image.sh | 4 ++ board/freescale/imx93evk/readme.txt | 77 ++++++++++++++++++++++ configs/freescale_imx93evk_defconfig | 39 +++++++++++ package/freescale-imx/Config.in | 38 +++++++++++ package/freescale-imx/firmware-ele-imx/Config.in | 21 ++++++ .../firmware-ele-imx/firmware-ele-imx.hash | 4 ++ .../firmware-ele-imx/firmware-ele-imx.mk | 27 ++++++++ package/freescale-imx/firmware-imx/Config.in | 9 +++ package/freescale-imx/firmware-imx/firmware-imx.mk | 25 +++++++ 11 files changed, 320 insertions(+) --- base-commit: ae5274dd545eb011f18cae24331300d944b8be0f change-id: 20240115-imx93-support-16671b5b7f12 Best regards, -- S?bastien Szymanski From buildroot at bubu1.eu Thu Feb 8 13:08:37 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 8 Feb 2024 14:08:37 +0100 Subject: [Buildroot] [PATCH] package/python-django: security bump to 5.0.2 Message-ID: <20240208130838.196406-1-buildroot@bubu1.eu> Minor 5.0 bugfix release [1] fixing one "moderate" severity CVE. Fixes: CVE-2024-24680 [1] https://docs.djangoproject.com/en/5.0/releases/5.0.2/#django-5-0-2-release-notes Signed-off-by: Marcus Hoffmann --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 39fd9afdae..20b66a4106 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 5ff3c69d7e6b4f5ed378ec5713af8df7 Django-5.0.1.tar.gz -sha256 8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854 Django-5.0.1.tar.gz +md5 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz +sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index ed4f4bcdf1..231de0b833 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.1 +PYTHON_DJANGO_VERSION = 5.0.2 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject -- 2.34.1 From buildroot at bubu1.eu Thu Feb 8 13:13:42 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 8 Feb 2024 14:13:42 +0100 Subject: [Buildroot] [PATCH] package/python-django: security bump to 5.0.2 In-Reply-To: <20240208130838.196406-1-buildroot@bubu1.eu> References: <20240208130838.196406-1-buildroot@bubu1.eu> Message-ID: <83bcb5ed-83bb-4680-9fbb-34e3d155cd21@bubu1.eu> Hi Peter, On 08.02.24 14:08, Marcus Hoffmann via buildroot wrote: > Minor 5.0 bugfix release [1] fixing one "moderate" severity CVE. > > Fixes: CVE-2024-24680 > > [1] https://docs.djangoproject.com/en/5.0/releases/5.0.2/#django-5-0-2-release-notes Buildroot stable releases should probably be updated to 4.2.10: https://www.djangoproject.com/weblog/2024/feb/06/security-releases/ > > Signed-off-by: Marcus Hoffmann > --- > package/python-django/python-django.hash | 4 ++-- > package/python-django/python-django.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash > index 39fd9afdae..20b66a4106 100644 > --- a/package/python-django/python-django.hash > +++ b/package/python-django/python-django.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/django/json > -md5 5ff3c69d7e6b4f5ed378ec5713af8df7 Django-5.0.1.tar.gz > -sha256 8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854 Django-5.0.1.tar.gz > +md5 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz > +sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz > # Locally computed sha256 checksums > sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE > diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk > index ed4f4bcdf1..231de0b833 100644 > --- a/package/python-django/python-django.mk > +++ b/package/python-django/python-django.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > > -PYTHON_DJANGO_VERSION = 5.0.1 > +PYTHON_DJANGO_VERSION = 5.0.2 > PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz > # The official Django site has an unpractical URL > -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269 > +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa > PYTHON_DJANGO_LICENSE = BSD-3-Clause > PYTHON_DJANGO_LICENSE_FILES = LICENSE > PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From sebastien.szymanski at armadeus.com Thu Feb 8 12:54:22 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Thu, 8 Feb 2024 13:54:22 +0100 Subject: [Buildroot] [PATCH v5 2/3] package/freescale-imx/firmware-ele-imx: new package In-Reply-To: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> Message-ID: <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> This package provides firmware blobs for the Edgelock Secure Enclave (ELE) [1] present on i.MX8ULP and i.MX9 Socs. This version comes from the 6.1.55-2.2.0 release. [1] https://www.nxp.com/products/nxp-product-information/nxp-product-programs/edgelock-secure-enclave:EDGELOCK-SECURE-ENCLAVE Reviewed-by: Gary Bisson Signed-off-by: S?bastien Szymanski --- Changes for v5: - none Changes for v4: - move i.MX Silicon Revision changes into first patch (Gary Bisson) Changes for v3: - rename package from firmware-sentinel to package firmware-ele-imx Changes for v2: - none --- package/freescale-imx/Config.in | 1 + package/freescale-imx/firmware-ele-imx/Config.in | 21 +++++++++++++++++ .../firmware-ele-imx/firmware-ele-imx.hash | 4 ++++ .../firmware-ele-imx/firmware-ele-imx.mk | 27 ++++++++++++++++++++++ 4 files changed, 53 insertions(+) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index ba169ead18cb..f12acc3bd024 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -154,6 +154,7 @@ source "package/freescale-imx/imx-uuc/Config.in" source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/imx-vpu-hantro/Config.in" source "package/freescale-imx/imx-vpuwrap/Config.in" +source "package/freescale-imx/firmware-ele-imx/Config.in" source "package/freescale-imx/firmware-imx/Config.in" source "package/freescale-imx/imx-sc-firmware/Config.in" source "package/freescale-imx/imx-seco/Config.in" diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in new file mode 100644 index 000000000000..7867c3712c9c --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_FIRMWARE_ELE_IMX + bool "firmware-ele-imx" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + help + Firmware blobs for the Edgelock Secure Enclave (ELE) + present on i.MX8ULP and i.MX9 SoCs. + + This library is provided by NXP as-is and doesn't have an + upstream. + +if BR2_PACKAGE_FIRMWARE_ELE_IMX + +config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE + string + default "mx93a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 + default "mx93a1-ahab-container.img" if \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + +endif # BR2_PACKAGE_FIRMWARE_ELE_IMX diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash new file mode 100644 index 000000000000..58565cef43e9 --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca firmware-ele-imx-0.1.0.bin +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING +sha256 c800aaca3a7e9f470d99d7cde0a48c95982ed601d4c306f7b8f43f3710054f28 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 new file mode 100644 index 000000000000..600b50c5b456 --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# firmware-ele-imx +# +################################################################################ + +FIRMWARE_ELE_IMX_VERSION = 0.1.0 +FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) +FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin + +FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING SCR.txt +FIRMWARE_ELE_IMX_REDISTRIBUTE = NO + +FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES + +define FIRMWARE_ELE_IMX_EXTRACT_CMDS + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_ELE_IMX_DL_DIR)/$(FIRMWARE_ELE_IMX_SOURCE)) +endef + +FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE)) + +define FIRMWARE_ELE_IMX_INSTALL_IMAGES_CMDS + cp $(@D)/$(FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE) $(BINARIES_DIR)/ahab-container.img +endef + +$(eval $(generic-package)) -- 2.43.0 From peter at korsgaard.com Thu Feb 8 13:51:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 08 Feb 2024 14:51:32 +0100 Subject: [Buildroot] [PATCH] package/python-django: security bump to 5.0.2 In-Reply-To: <83bcb5ed-83bb-4680-9fbb-34e3d155cd21@bubu1.eu> (Marcus Hoffmann's message of "Thu, 8 Feb 2024 14:13:42 +0100") References: <20240208130838.196406-1-buildroot@bubu1.eu> <83bcb5ed-83bb-4680-9fbb-34e3d155cd21@bubu1.eu> Message-ID: <87cyt7ysgr.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann writes: > Hi Peter, > On 08.02.24 14:08, Marcus Hoffmann via buildroot wrote: >> Minor 5.0 bugfix release [1] fixing one "moderate" severity CVE. >> Fixes: CVE-2024-24680 >> [1] >> https://docs.djangoproject.com/en/5.0/releases/5.0.2/#django-5-0-2-release-notes > Buildroot stable releases should probably be updated to 4.2.10: > https://www.djangoproject.com/weblog/2024/feb/06/security-releases/ Yes, care to send a patch? 2023.02.x is using 4.1.13, but it looks like the 4.1.x series is EOL, so I'll also update that to 4.2.10. -- Bye, Peter Korsgaard From buildroot at bubu1.eu Thu Feb 8 14:08:01 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 8 Feb 2024 15:08:01 +0100 Subject: [Buildroot] [PATCH] package/python-uvicorn: bump to 0.27.0.post1 Message-ID: <20240208140802.984184-1-buildroot@bubu1.eu> Changelog: https://github.com/encode/uvicorn/blob/master/CHANGELOG.md#0270post1---2024-01-29 Signed-off-by: Marcus Hoffmann --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index cfa999e210..c7feaf3bfe 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 a1af843e7e305d551030abfa09dd3b15 uvicorn-0.24.0.post1.tar.gz -sha256 09c8e5a79dc466bdf28dead50093957db184de356fcdc48697bad3bde4c2588e uvicorn-0.24.0.post1.tar.gz +md5 a98f96c2578d9e6d454e271d0eae3ba3 uvicorn-0.27.0.post1.tar.gz +sha256 54898fcd80c13ff1cd28bf77b04ec9dbd8ff60c5259b499b4b12bb0917f22907 uvicorn-0.27.0.post1.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 04e6dd66a7..502cc06ad8 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.24.0.post1 +PYTHON_UVICORN_VERSION = 0.27.0.post1 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/e5/84/d43ce8fe6b31a316ef0ed04ea0d58cab981bdf7f17f8423491fa8b4f50b6 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/38/56/7bc5cf1d693d0c8e5d9dd66c29808691c17260b31346e4ddfbee26ba9bc2 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md -- 2.34.1 From peter at korsgaard.com Thu Feb 8 14:29:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 08 Feb 2024 15:29:28 +0100 Subject: [Buildroot] [PATCH] package/python-django: security bump to 5.0.2 In-Reply-To: <20240208130838.196406-1-buildroot@bubu1.eu> (Marcus Hoffmann via buildroot's message of "Thu, 8 Feb 2024 14:08:37 +0100") References: <20240208130838.196406-1-buildroot@bubu1.eu> Message-ID: <878r3vyqpj.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Minor 5.0 bugfix release [1] fixing one "moderate" severity CVE. > Fixes: CVE-2024-24680 > [1] https://docs.djangoproject.com/en/5.0/releases/5.0.2/#django-5-0-2-release-notes > Signed-off-by: Marcus Hoffmann Committed, thanks. > --- > package/python-django/python-django.hash | 4 ++-- > package/python-django/python-django.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash > index 39fd9afdae..20b66a4106 100644 > --- a/package/python-django/python-django.hash > +++ b/package/python-django/python-django.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/django/json > -md5 5ff3c69d7e6b4f5ed378ec5713af8df7 Django-5.0.1.tar.gz > -sha256 8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854 Django-5.0.1.tar.gz > +md5 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz > +sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz > # Locally computed sha256 checksums > sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE > diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk > index ed4f4bcdf1..231de0b833 100644 > --- a/package/python-django/python-django.mk > +++ b/package/python-django/python-django.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > -PYTHON_DJANGO_VERSION = 5.0.1 > +PYTHON_DJANGO_VERSION = 5.0.2 > PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz > # The official Django site has an unpractical URL > -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269 > +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa > PYTHON_DJANGO_LICENSE = BSD-3-Clause > PYTHON_DJANGO_LICENSE_FILES = LICENSE > PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject > -- > 2.34.1 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 8 14:29:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 8 Feb 2024 15:29:18 +0100 Subject: [Buildroot] [git commit] package/python-django: security bump to 5.0.2 Message-ID: <20240208143011.D348E87598@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=034c57b2e24acaa236ac5f6a23e6e42b0522b221 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Minor 5.0 bugfix release [1] fixing one "moderate" severity CVE. Fixes: CVE-2024-24680 [1] https://docs.djangoproject.com/en/5.0/releases/5.0.2/#django-5-0-2-release-notes Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 39fd9afdae..20b66a4106 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 5ff3c69d7e6b4f5ed378ec5713af8df7 Django-5.0.1.tar.gz -sha256 8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854 Django-5.0.1.tar.gz +md5 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz +sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index ed4f4bcdf1..231de0b833 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.1 +PYTHON_DJANGO_VERSION = 5.0.2 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/53/82/c8e8ed137da1c72fa110e3be9ab0f26bcfcf6f3d2994601d164dfac86269 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From sebastien.szymanski at armadeus.com Thu Feb 8 12:54:23 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Thu, 8 Feb 2024 13:54:23 +0100 Subject: [Buildroot] [PATCH v5 3/3] configs/freescale_imx93evk: new defconfig In-Reply-To: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> Message-ID: <20240115-imx93-support-v5-3-c2c950104c58@armadeus.com> This patch adds support for the NXP i.MX 93 11x11 EVK board [1]. [1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-93-evaluation-kit:i.MX93EVK Reviewed-by: Julien Olivain Tested-by: Julien Olivain [Julien: tested on NXP board i.MX93EVK, cpu rev A1, board rev B] Reviewed-by: Gary Bisson Reviewed-by: Giulio Benetti Signed-off-by: S?bastien Szymanski --- Changes for v5: - follow BR coding style for the genimage.cfg.template_imx9 file (Giulio Benetti) Changes for v4: - None Changes for v3: - BR2_PACKAGE_FIRMWARE_SENTINEL=y -> BR2_PACKAGE_FIRMWARE_ELE_IMX=y - add a note about the debug UART in the readme.txt file (Julien Olivain) - add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y and BR2_TARGET_UBOOT_NEEDS_GNUTLS=y to the defconfig file (Julien Olivain) - bump ATF, U-Boot and Linux to latest NXP release lf-6.1.55-2.2.0 (Julien Olivain) Changes for v2: - none --- .../common/imx/genimage.cfg.template_imx9 | 42 ++++++++++++ .../common/imx/imx9-bootloader-prepare.sh | 34 ++++++++++ board/freescale/common/imx/post-image.sh | 4 ++ board/freescale/imx93evk/readme.txt | 77 ++++++++++++++++++++++ configs/freescale_imx93evk_defconfig | 39 +++++++++++ 5 files changed, 196 insertions(+) diff --git a/board/freescale/common/imx/genimage.cfg.template_imx9 b/board/freescale/common/imx/genimage.cfg.template_imx9 new file mode 100644 index 000000000000..df7ddc25b73e --- /dev/null +++ b/board/freescale/common/imx/genimage.cfg.template_imx9 @@ -0,0 +1,42 @@ +# Minimal SD card image for the NXP i.MX9 boards +# +# We mimic the .sdcard NXP's image format: +# * the SD card must have 32 kB free space at the beginning, +# * U-Boot is integrated into imx9-boot-sd.bin and is dumped as is, +# * a FAT partition at offset 8MB is containing Image and DTB files +# * a single root filesystem partition is required (ext2, ext3 or ext4) +# + +image boot.vfat { + vfat { + label = "boot" + files = { + %FILES% + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition imx-boot { + in-partition-table = "no" + image = "imx9-boot-sd.bin" + offset = %IMXOFFSET% + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh new file mode 100755 index 000000000000..4ff92fa4cd23 --- /dev/null +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +main () +{ + SPL_LOAD_ADDR=0x2049A000 + ATF_LOAD_ADDR=0x204E0000 + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" ${BR2_CONFIG}; then + SPL_LOAD_ADDR=0x204A0000 + ATF_LOAD_ADDR=0x204C0000 + fi + + dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync + cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + + ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit + cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin + rm -f ${BINARIES_DIR}/mkimg.commit + + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -c -ap ${BINARIES_DIR}/bl31.bin a35 ${ATF_LOAD_ADDR} -ap ${BINARIES_DIR}/u-boot-hash.bin a35 0x80200000 -ap ${BINARIES_DIR}/tee.bin a35 0x96000000 -out ${BINARIES_DIR}/u-boot-atf-container.img + else + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -c -ap ${BINARIES_DIR}/bl31.bin a35 ${ATF_LOAD_ADDR} -ap ${BINARIES_DIR}/u-boot-hash.bin a35 0x80200000 -out ${BINARIES_DIR}/u-boot-atf-container.img + fi + + ${HOST_DIR}/bin/mkimage_imx8 -soc IMX9 -append ${BINARIES_DIR}/ahab-container.img -c -ap ${BINARIES_DIR}/u-boot-spl-ddr.bin a35 ${SPL_LOAD_ADDR} -out ${BINARIES_DIR}/imx9-boot-sd.bin + + flashbin_size=$(wc -c ${BINARIES_DIR}/imx9-boot-sd.bin | awk '{print $1}') + pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400)) + dd if=${BINARIES_DIR}/u-boot-atf-container.img of=${BINARIES_DIR}/imx9-boot-sd.bin bs=1K seek=${pad_cnt} + + exit $? +} + +main $@ diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index c359ef6032a6..3df7e820938b 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -48,6 +48,10 @@ genimage_type() echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx9" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx9" elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_no_boot_part_spl" diff --git a/board/freescale/imx93evk/readme.txt b/board/freescale/imx93evk/readme.txt new file mode 100644 index 000000000000..1173de39dbb1 --- /dev/null +++ b/board/freescale/imx93evk/readme.txt @@ -0,0 +1,77 @@ +********************* +NXP i.MX93 EVK board +********************* + +This file documents the Buildroot support for the i.MX 93 EVK board. + +Build +===== + +First, configure Buildroot for the i.MX 93 EVK board: + + make freescale_imx93evk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - ddr_fw.bin + - Image + - imx93-11x11-evk.dtb + - imx9-boot-sd.bin + - lpddr4_pmu_train_fw.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf-container.img + - u-boot.bin + - u-boot-hash.bin + - u-boot-spl.bin + - u-boot-spl-ddr.bin + - u-boot-spl-padded.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx9. + +Boot the i.MX 93 EVK board +=============================== + +To boot your newly created system (refer to the i.MX 93 EVK Documentation +[1] for guidance): +- insert the SD card in the SD slot of the board; +- Configure the switches as follows: +SW1301: 0100 SW1301[1-4] +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Note: the debug USB connector presents 4 UARTs (for example /dev/ttyUSB[0-3]), +the Cortex-A55 UART should be the 3rd one (in the previous example, /dev/ttyUSB2). +Refer to the documentation [1] for more details. + +Enjoy! + +References +========== +[1] https://www.nxp.com/document/guide/getting-started-with-the-i-mx93-evk:GS-IMX93EVK diff --git a/configs/freescale_imx93evk_defconfig b/configs/freescale_imx93evk_defconfig new file mode 100644 index 000000000000..34baf04c88db --- /dev/null +++ b/configs/freescale_imx93evk_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_ARM_FPU_VFPV4D16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +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.1.55-2.2.0)/linux-imx-lf-6.1.55-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" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y +BR2_PACKAGE_FIRMWARE_ELE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +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.1.55-2.2.0)/imx-atf-lf-6.1.55-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.1.55-2.2.0)/uboot-imx-lf-6.1.55-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 +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y -- 2.43.0 From james.d.knight at live.com Thu Feb 8 16:55:30 2024 From: james.d.knight at live.com (James Knight) Date: Thu, 8 Feb 2024 11:55:30 -0500 Subject: [Buildroot] [PATCH 1/1] elfutils: drop lfs tweak Message-ID: When the elfutils package was first introduced, it filtered out LFS-related compiler flags due to issues with the package's implementation. This package has since evolved over the years to support LFS (e.g. using `AC_SYS_LARGEFILE` [1]). Filtering out `-D_FILE_OFFSET_BITS=64` can lead to a configuration error when `BR2_TIME_BITS_64` is enabled: checking whether gcc supports -Wl,-z,relro... yes checking for __thread support... no configure: error: __thread support required ... With the configuration log providing the specific reason: configure:7175: .../output-1/host/bin/m68k-buildroot-linux-gnu-gcc -o conftest -fPIC -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -shared -Wl,-z,defs -Wl,-z,relro -latomic -Wl,--build-id conftest.c >&5 In file included from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/stdlib.h:26, from conftest.c:13: .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ configure:7175: $? = 1 ... Fixes: - http://autobuild.buildroot.org/results/fbfe131673ed78999a07dbc879436e0ef6a8a1c0 [1]: https://sourceware.org/git/?p=elfutils.git;a=commit;h=3425454a10d307fae891fb667cf7969e945cde79 Signed-off-by: James Knight --- package/elfutils/elfutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index d43b545f2f81ec728573b5ac994e0b45a6813762..3531142fd2dafb01dedf583574ff3ad33524ba97 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -29,10 +29,6 @@ HOST_ELFUTILS_CONF_OPTS = \ --without-zstd \ --disable-progs -# elfutils gets confused when lfs mode is forced, so don't -ELFUTILS_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) -ELFUTILS_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) - ELFUTILS_CONF_ENV += \ CFLAGS="$(ELFUTILS_CFLAGS)" \ CPPFLAGS="$(ELFUTILS_CPPFLAGS)" -- 2.40.1.windows.1 From romain.naour at smile.fr Thu Feb 8 17:13:54 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 8 Feb 2024 18:13:54 +0100 Subject: [Buildroot] [git commit] configs/am574x_idk_defconfig: new defconfig Message-ID: <20240208171528.D14F6875E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=35eb74c6343a9ec1407fb473271dda0516792391 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds a basic support for AM574x Industrial Development Kit [1]. Use multi_v7_defconfig as kernel configuration file instead of the deprecated omap2plus_defconfig [2]. The main differences between upstream kernels and the TI vendor tree (5.10.x based) are: - pru based 100M ethernet ports will not work with upstream kernels since the prueth driver for AM57 is not upstream yet (as of 6.8-rc2) [3]. - The ARM/DSP examples provided by TI [4] will not work either since they requires an experimental patch [5] adding "remote-processor messaging sockets". - There is no support for the POWERVR GPU SGX544 that requires additional userpace vendor (closed source) libraries. [1] https://www.ti.com/tool/TMDSIDK574 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cca9f6838bac3441a42fa906314bf5e3bff50ac5 [3] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=792b57aac224416f66175c15d60379a4cf581d0f [4] https://git.ti.com/cgit/processor-sdk/big-data-ipc-examples [5] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=f4b978a978c38149f712ddd137f12ed5fb914161 Signed-off-by: Romain Naour Reviewed-by: Giulio Benetti Tested-by: Giulio Benetti Signed-off-by: Romain Naour --- board/ti/am574x-idk/extlinux.conf | 4 ++++ board/ti/am574x-idk/genimage.cfg | 30 ++++++++++++++++++++++++++ board/ti/am574x-idk/post-build.sh | 4 ++++ board/ti/am574x-idk/readme.txt | 28 ++++++++++++++++++++++++ configs/am574x_idk_defconfig | 45 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+) diff --git a/board/ti/am574x-idk/extlinux.conf b/board/ti/am574x-idk/extlinux.conf new file mode 100644 index 0000000000..29e0ecfa14 --- /dev/null +++ b/board/ti/am574x-idk/extlinux.conf @@ -0,0 +1,4 @@ +label am5749-idk-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/board/ti/am574x-idk/genimage.cfg b/board/ti/am574x-idk/genimage.cfg new file mode 100644 index 0000000000..02a9ffe013 --- /dev/null +++ b/board/ti/am574x-idk/genimage.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "MLO", + "u-boot.img", + "zImage", + "am574x-idk.dtb", + "extlinux" + } + } + + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 1G + } +} diff --git a/board/ti/am574x-idk/post-build.sh b/board/ti/am574x-idk/post-build.sh new file mode 100755 index 0000000000..5dcdb352eb --- /dev/null +++ b/board/ti/am574x-idk/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf "${BINARIES_DIR}"/extlinux/extlinux.conf diff --git a/board/ti/am574x-idk/readme.txt b/board/ti/am574x-idk/readme.txt new file mode 100644 index 0000000000..4869984cf1 --- /dev/null +++ b/board/ti/am574x-idk/readme.txt @@ -0,0 +1,28 @@ +Texas Instuments AM574x IDK Test and Development Board + +Description +=========== + +This configuration will build a basic image for the TI AM574x IDK +board: https://www.ti.com/tool/TMDSIDK574 + +How to build it +=============== + +Configure Buildroot: + + $ make am574x_idk_defconfig + +Compile everything and build the USB flash drive image: + + $ make + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX diff --git a/configs/am574x_idk_defconfig b/configs/am574x_idk_defconfig new file mode 100644 index 0000000000..bbae73dff4 --- /dev/null +++ b/configs/am574x_idk_defconfig @@ -0,0 +1,45 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am574x-idk" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am574x-idk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am574x-idk/genimage.cfg" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" +BR2_TARGET_UBOOT_NEEDS_DTC=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="MLO" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y From romain.naour at smile.fr Thu Feb 8 17:16:39 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 8 Feb 2024 18:16:39 +0100 Subject: [Buildroot] [PATCH] configs/am574x_idk_defconfig: new defconfig In-Reply-To: References: <20240131173827.1281120-1-romain.naour@smile.fr> Message-ID: <89be08e4-f2a3-4fb6-b1b5-b62cd2d03a82@smile.fr> Hello Giulio, Le 05/02/2024 ? 16:36, Giulio Benetti a ?crit?: > Hi Romain, > > On 31/01/24 18:38, Romain Naour wrote: >> This patch adds a basic support for AM574x Industrial Development Kit >> [1]. >> >> Use multi_v7_defconfig as kernel configuration file instead of >> the deprecated omap2plus_defconfig [2]. >> >> The main differences between upstream kernels and the TI vendor tree >> (5.10.x based) are: >> >> ?? - pru based 100M ethernet ports will not work with upstream kernels >> ?? since the prueth driver for AM57 is not upstream yet (as of 6.8-rc2) >> ?? [3]. >> >> ?? - The ARM/DSP examples provided by TI [4] will not work either since >> ?? they requires an experimental patch [5] adding "remote-processor >> ?? messaging sockets". >> >> ?? - There is no support for the POWERVR GPU SGX544 that requires >> ?? additional userpace vendor (closed source) libraries. >> >> [1] https://www.ti.com/tool/TMDSIDK574 >> [2] >> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cca9f6838bac3441a42fa906314bf5e3bff50ac5 >> [3] >> https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=792b57aac224416f66175c15d60379a4cf581d0f >> [4] https://git.ti.com/cgit/processor-sdk/big-data-ipc-examples >> [5] >> https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?id=f4b978a978c38149f712ddd137f12ed5fb914161 >> >> Signed-off-by: Romain Naour >> --- >> ? board/ti/am574x-idk/extlinux.conf |? 4 +++ >> ? board/ti/am574x-idk/genimage.cfg? | 30 +++++++++++++++++++++ >> ? board/ti/am574x-idk/post-build.sh |? 4 +++ >> ? board/ti/am574x-idk/readme.txt??? | 28 +++++++++++++++++++ >> ? configs/am574x_idk_defconfig????? | 45 +++++++++++++++++++++++++++++++ >> ? 5 files changed, 111 insertions(+) >> ? create mode 100644 board/ti/am574x-idk/extlinux.conf >> ? create mode 100644 board/ti/am574x-idk/genimage.cfg >> ? create mode 100755 board/ti/am574x-idk/post-build.sh >> ? create mode 100644 board/ti/am574x-idk/readme.txt >> ? create mode 100644 configs/am574x_idk_defconfig >> >> diff --git a/board/ti/am574x-idk/extlinux.conf >> b/board/ti/am574x-idk/extlinux.conf >> new file mode 100644 >> index 0000000000..29e0ecfa14 >> --- /dev/null >> +++ b/board/ti/am574x-idk/extlinux.conf >> @@ -0,0 +1,4 @@ >> +label am5749-idk-buildroot >> +? kernel /zImage >> +? fdtdir / >> +? append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait >> diff --git a/board/ti/am574x-idk/genimage.cfg b/board/ti/am574x-idk/genimage.cfg >> new file mode 100644 >> index 0000000000..02a9ffe013 >> --- /dev/null >> +++ b/board/ti/am574x-idk/genimage.cfg >> @@ -0,0 +1,30 @@ >> +image boot.vfat { >> +??? vfat { >> +??????? files = { >> +??????????? "MLO", >> +??????????? "u-boot.img", >> +??????????? "zImage", >> +??????????? "am574x-idk.dtb", >> +??????????? "extlinux" >> +??????? } >> +??? } >> + >> +??? size = 16M >> +} >> + >> +image sdcard.img { >> +??? hdimage { >> +??? } >> + >> +??? partition u-boot { >> +??????? partition-type = 0xC >> +??????? bootable = "true" >> +??????????????? image = "boot.vfat" >> +??? } >> + >> +??? partition rootfs { >> +??????? partition-type = 0x83 >> +??????? image = "rootfs.ext4" >> +??????? size = 1G >> +??? } >> +} >> diff --git a/board/ti/am574x-idk/post-build.sh >> b/board/ti/am574x-idk/post-build.sh >> new file mode 100755 >> index 0000000000..5dcdb352eb >> --- /dev/null >> +++ b/board/ti/am574x-idk/post-build.sh >> @@ -0,0 +1,4 @@ >> +#!/bin/sh >> +BOARD_DIR="$(dirname "$0")" >> + >> +install -m 0644 -D "${BOARD_DIR}"/extlinux.conf >> "${BINARIES_DIR}"/extlinux/extlinux.conf >> diff --git a/board/ti/am574x-idk/readme.txt b/board/ti/am574x-idk/readme.txt >> new file mode 100644 >> index 0000000000..4869984cf1 >> --- /dev/null >> +++ b/board/ti/am574x-idk/readme.txt >> @@ -0,0 +1,28 @@ >> +Texas Instuments AM574x IDK Test and Development Board >> + >> +Description >> +=========== >> + >> +This configuration will build a basic image for the TI AM574x IDK >> +board: https://www.ti.com/tool/TMDSIDK574 >> + >> +How to build it >> +=============== >> + >> +Configure Buildroot: >> + >> +??? $ make am574x_idk_defconfig >> + >> +Compile everything and build the USB flash drive image: >> + >> +??? $ make >> + >> +How to write the SD card >> +======================== >> + >> +Once the build process is finished you will have an image called "sdcard.img" >> +in the output/images/ directory. >> + >> +Copy the bootable "sdcard.img" onto an SD card with "dd": >> + >> +? $ sudo dd if=output/images/sdcard.img of=/dev/sdX >> diff --git a/configs/am574x_idk_defconfig b/configs/am574x_idk_defconfig >> new file mode 100644 >> index 0000000000..bbae73dff4 >> --- /dev/null >> +++ b/configs/am574x_idk_defconfig >> @@ -0,0 +1,45 @@ >> +# Architecture >> +BR2_arm=y >> +BR2_cortex_a15=y >> + >> +# System >> +BR2_SYSTEM_DHCP="eth0" >> + >> +# Linux headers same as kernel, a 6.6 series >> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y >> + >> +# Kernel >> +BR2_LINUX_KERNEL=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.14" >> +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" >> +BR2_LINUX_KERNEL_DTS_SUPPORT=y >> +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/omap/am574x-idk" >> +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y >> + >> +# Filesystem >> +BR2_TARGET_ROOTFS_EXT2=y >> +BR2_TARGET_ROOTFS_EXT2_4=y >> + >> +# Image >> +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am574x-idk/post-build.sh" >> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" >> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am574x-idk/genimage.cfg" >> + >> +# Bootloader >> +BR2_TARGET_UBOOT=y >> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> +BR2_TARGET_UBOOT_CUSTOM_VERSION=y >> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" >> +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am57xx_evm" >> +BR2_TARGET_UBOOT_NEEDS_DTC=y >> +# BR2_TARGET_UBOOT_FORMAT_BIN is not set >> +BR2_TARGET_UBOOT_FORMAT_IMG=y >> +BR2_TARGET_UBOOT_SPL=y >> +BR2_TARGET_UBOOT_SPL_NAME="MLO" >> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >> + >> +# Required tools to create the SD image >> +BR2_PACKAGE_HOST_DOSFSTOOLS=y >> +BR2_PACKAGE_HOST_GENIMAGE=y >> +BR2_PACKAGE_HOST_MTOOLS=y > > It looks good to me and I've build tested it using docker-run. > > Reviewed-by: Giulio Benetti > [Build Tested] > Tested-by: Giulio Benetti Thanks for the review and testing! Applied to master. Best regards, Romain > > Best regards From fontaine.fabrice at gmail.com Thu Feb 8 19:01:13 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 8 Feb 2024 20:01:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS In-Reply-To: References: Message-ID: Hi Andreas, Romain, Le jeu. 8 f?vr. 2024 ? 08:59, Andreas Ziegler a ?crit : > > Hi Fabrice, Romain, *, > > more complicated than I thought ... > > On 2024-02-07 11:30, Andreas Ziegler wrote: > > Hi Fabrice, > > > > sorry in case I do not reply to the latest message in the thread; my > > in-box is currently a bit crowded ... > > > > On 2024-02-06 18:59, Fabrice Fontaine wrote: > > > >> Message: 30 > >> Date: Tue, 6 Feb 2024 18:59:00 +0100 > >> From: Fabrice Fontaine > >> To: Romain Naour > >> Cc: buildroot at buildroot.org > >> Subject: Re: [Buildroot] [PATCH 1/1] package/ncmpc: don't set NLS > >> Message-ID: > >> > >> Content-Type: text/plain; charset="UTF-8" > >> > >> Hello Romain, > >> > >> Le mar. 6 f?vr. 2024 ? 18:32, Romain Naour a > >> ?crit : > >>> > >>> Hello, > >>> > >>> Le 06/01/2024 ? 11:12, Fabrice Fontaine a ?crit : > >>> > ncmpc is able to automatically detect NLS support since version 0.47 and > >>> > https://github.com/MusicPlayerDaemon/ncmpc/commit/c264db04dd30af301e7d85c9d145bb1f1ae3fea3 > >>> > so let it handle automatically to avoid the following build failure with > >>> > a bootlin toolchain which embeds a gettext definition in libintl.h which > >>> > will clash with the fake gettext definition provided by ncmpc since > >>> > https://github.com/MusicPlayerDaemon/ncmpc/commit/95af27ab2d3ceb9df26ebb4e0d936e392a84c153: > >>> > > >>> > In file included from ../src/save_playlist.cxx:8: > >>> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected unqualified-id before 'const' > >>> > 39 | extern char *gettext (const char *__msgid) > >>> > | ^~~~~~~ > >>> > /home/buildroot/autobuild/instance-2/output-1/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:39:14: error: expected ')' before 'const' > >>> > ../src/i18n.h:22:20: note: to match this '(' > >>> > 22 | #define gettext(x) (x) > >>> > | ^ > >>> > > >>> > Indeed, even if NLS is disabled by the user, libintl.h will be included > >>> > by > >>> > /home/fabrice/buildroot/output/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h > >>> > though include > >>> > >>> We usually want to explicitly handle such option from Buildroot > >>> package to not > >>> rely on automatic detection (as currently done). > >>> > >>> It look like more a bug in ncmpc build system? > >> > >> I don't know, upstream wants to have the same code with and without > >> NLS, so they decided to define a gettext macro when NLS is disabled. > >> I could find an upstreamable solution as upstream will probably reject > >> a patch that removes this gettext define and puts #ifdef ENABLE_NLS > >> before every gettext calls. > >> Do you have an upstreamable solution or should we just add a NLS > >> dependency to ncmpc? > > > > This is probably not related to NLS, but to gettext being included in > > the build by some other package. This tricks Meson into believing that > > NLS is enabled. > > > > Also, the code in meson.txt may lead to unexpected results: > > > > if meson.version().version_compare('>= 0.59') and not mini > > # Meson 0.59 has native libintl support > > intl_dep = dependency('intl', required: enable_nls) > > enable_nls = intl_dep.found() > > elif enable_nls.disabled() or mini > > intl_dep = dependency('', required: false) > > enable_nls = false > > elif cc.has_header('libintl.h') > > intl_dep = dependency('', required: false) > > enable_nls = true > > elif enable_nls.auto() > > intl_dep = dependency('', required: false) > > enable_nls = false > > else > > error('libintl.h not found') > > > > > > meson.txt works like nls=auto within Buildroot, thus reflecting the > setting of BR2_SYSTEM_ENABLE_NLS, so no worries. > > The toolchain seems to have been built with NLS support; the C++ library > makes use of this: > > [3/73] Compiling C++ object src/event/libevent.a.p/TimerList.cxx.o > FAILED: src/event/libevent.a.p/TimerList.cxx.o > /home/data/test/autobuild/host/bin/or1k-linux-g++ > -Isrc/event/libevent.a.p -Isrc/event -I../src/event -Isrc -I../src -I. > -I.. -fdiagnostics-color=always -Wall -Winvalid-pch -Wextra -Wpedantic > -std=c++2a -O3 -Wcast-qual -Wcast-align -Wdouble-promotion > -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn > -Wredundant-decls -Wshadow -Wundef -Wvla -Wwrite-strings > -fno-threadsafe-statics -fmerge-all-constants -Wno-non-virtual-dtor > -Wno-format-truncation -D_GNU_SOURCE -fvisibility=hidden > -ffunction-sections -fdata-sections -D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -D_FORTIFY_SOURCE=2 > -fPIC -MD -MQ src/event/libevent.a.p/TimerList.cxx.o -MF > src/event/libevent.a.p/TimerList.cxx.o.d -o > src/event/libevent.a.p/TimerList.cxx.o -c ../src/event/TimerList.cxx > In file included from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/or1k-buildroot-linux-gnu/bits/messages_members.h:36, > from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/bits/locale_facets_nonio.h:2064, > from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/locale:43, > from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/iomanip:45, > from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/bits/chrono_io.h:38, > from > /home/data/test/autobuild/host/opt/ext-toolchain/or1k-buildroot-linux-gnu/include/c++/13.2.0/chrono:3330, > from ../src/event/Chrono.hxx:6, > from ../src/event/TimerList.hxx:7, > from ../src/event/TimerList.cxx:5: > /home/data/test/autobuild/host/or1k-buildroot-linux-gnu/sysroot/usr/include/libintl.h:23:2: > error: #error "libintl.h included here" > 23 | #error "libintl.h included here" > | ^~~~~ > > Probably the least invasive solution would be to add a new ncmpc > dependency: > > + depends on !BR2_TOOLCHAIN_HAS_FULL_GETTEXT || BR2_SYSTEM_ENABLE_NLS The following PR should fix the issue: https://github.com/MusicPlayerDaemon/ncmpc/pull/142 Waiting for upstream feedback. > > Kind regards, > Andreas Best Regards, Fabrice From fontaine.fabrice at gmail.com Thu Feb 8 19:54:38 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 8 Feb 2024 20:54:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinymembench: drop package Message-ID: <20240208195438.89814-1-fontaine.fabrice@gmail.com> As advised by Thomas Petazzoni in [1], drop tinymembench which is abandonned (last commit in 2017). Moreover, it raises the following build failure in Thumb mode: /tmp/ccaZHrla.s:40: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' /tmp/ccaZHrla.s:43: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' main.c:45: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode main.c:46: Error: unshifted register required -- `and r8,r7,r2,lsr#16' main.c:47: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode main.c:48: Error: unshifted register required -- `and r9,r6,r2,lsr#8' main.c:49: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240114135446.1156025-1-fontaine.fabrice at gmail.com/ Fixes: - http://autobuild.buildroot.org/results/1e359c294a8d71fb1833e5d04a6bc7d4fd533510 - http://autobuild.buildroot.org/results/c06010d7a2bdb33a1707266133a3880e14be7657 Signed-off-by: Fabrice Fontaine --- .checkpackageignore | 1 - Config.in.legacy | 6 +++ DEVELOPERS | 1 - package/Config.in | 1 - ...ix-build-on-Thumb-only-architectures.patch | 47 ------------------- package/tinymembench/Config.in | 12 ----- package/tinymembench/tinymembench.hash | 3 -- package/tinymembench/tinymembench.mk | 21 --------- 8 files changed, 6 insertions(+), 86 deletions(-) delete mode 100644 package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch delete mode 100644 package/tinymembench/Config.in delete mode 100644 package/tinymembench/tinymembench.hash delete mode 100644 package/tinymembench/tinymembench.mk diff --git a/.checkpackageignore b/.checkpackageignore index 4a1041a84a..a2b5c14a94 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1265,7 +1265,6 @@ package/tinyalsa/0001-include-time.h-before-asound.h.patch Upstream package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch Upstream package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch Upstream package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream -package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch Upstream package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables diff --git a/Config.in.legacy b/Config.in.legacy index 5e0db855cc..a869279af7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_TINYMEMBENCH + bool "tinymembench removed" + select BR2_LEGACY + help + tinymembench has been removed due to being abandoned. + config BR2_PACKAGE_DAVINCI_BOOTCOUNT bool "davinci-bootcount has been renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index eeca05cd94..5632d2771d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1064,7 +1064,6 @@ F: package/snort3/ F: package/suricata/ F: package/tinycbor/ F: package/tinydtls/ -F: package/tinymembench/ F: package/whois/ F: package/x11r7/xlib_libXpresent/ F: package/zeek/ diff --git a/package/Config.in b/package/Config.in index ee4058155d..ebcc8c2655 100644 --- a/package/Config.in +++ b/package/Config.in @@ -156,7 +156,6 @@ menu "Debugging, profiling and benchmark" source "package/sysdig/Config.in" source "package/sysprof/Config.in" source "package/tcf-agent/Config.in" - source "package/tinymembench/Config.in" source "package/trace-cmd/Config.in" source "package/trinity/Config.in" source "package/uclibc-ng-test/Config.in" diff --git a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch b/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch deleted file mode 100644 index 88559ec012..0000000000 --- a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 034a3552e9700c6d424bd706db106f5bce1f5a5e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 11 Nov 2016 21:49:39 +0100 -Subject: [PATCH] arm: fix build on Thumb-only architectures - -Building tinymembench for ARM Cortex-M currently fails, because the -arm-neon.S file contains ARM code that doesn't build on Thumb-only -architectures. To account for this and fix the build for Cortex-M, -this patch adjusts the compile time condition to also verify that the -architecture supports the ARM instruction set, by testing the -__ARM_ARCH_ISA_ARM compiler define. - -Signed-off-by: Thomas Petazzoni ---- - arm-neon.S | 2 +- - asm-opt.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arm-neon.S b/arm-neon.S -index 4db78ce..19c30ad 100644 ---- a/arm-neon.S -+++ b/arm-neon.S -@@ -21,7 +21,7 @@ - * DEALINGS IN THE SOFTWARE. - */ - --#ifdef __arm__ -+#if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) - - .text - .fpu neon -diff --git a/asm-opt.c b/asm-opt.c -index 9da4596..eba1183 100644 ---- a/asm-opt.c -+++ b/asm-opt.c -@@ -202,7 +202,7 @@ bench_info *get_asm_framebuffer_benchmarks(void) - return empty; - } - --#elif defined(__arm__) -+#elif defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) - - #include "arm-neon.h" - --- -2.7.4 - diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in deleted file mode 100644 index 8f6e1a2b35..0000000000 --- a/package/tinymembench/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_TINYMEMBENCH - bool "tinymembench" - depends on !BR2_MIPS_NABI32 && !BR2_MIPS_NABI64 - help - Tinymembench is a simple memory benchmark program, which - tries to measure the peak bandwidth of sequential memory - accesses and the latency of random memory accesses. - Bandwidth is measured by running different assembly code for - the aligned memory blocks and attempting different prefetch - strategies. - - https://github.com/ssvb/tinymembench diff --git a/package/tinymembench/tinymembench.hash b/package/tinymembench/tinymembench.hash deleted file mode 100644 index 04dbd30f81..0000000000 --- a/package/tinymembench/tinymembench.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-0.4.tar.gz -sha256 8ba473aced4630aee2808efe17b53e904a9d68a9b3361de491717f9a4e75da39 LICENSE diff --git a/package/tinymembench/tinymembench.mk b/package/tinymembench/tinymembench.mk deleted file mode 100644 index 016d680ce7..0000000000 --- a/package/tinymembench/tinymembench.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# tinymembench -# -################################################################################ - -TINYMEMBENCH_VERSION = 0.4 -TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,v$(TINYMEMBENCH_VERSION)) -TINYMEMBENCH_LICENSE = MIT -TINYMEMBENCH_LICENSE_FILES = LICENSE - -define TINYMEMBENCH_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define TINYMEMBENCH_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/tinymembench \ - $(TARGET_DIR)/usr/bin/tinymembench -endef - -$(eval $(generic-package)) -- 2.43.0 From ju.o at free.fr Thu Feb 8 20:15:59 2024 From: ju.o at free.fr (Julien Olivain) Date: Thu, 8 Feb 2024 21:15:59 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add attr runtime test Message-ID: <20240208201559.112223-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_attr.py | 75 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 support/testing/tests/package/test_attr.py diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..635d7aedd1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1767,6 +1767,7 @@ F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py +F: support/testing/tests/package/test_attr.py F: support/testing/tests/package/test_bc.py F: support/testing/tests/package/test_brotli.py F: support/testing/tests/package/test_bzip2.py diff --git a/support/testing/tests/package/test_attr.py b/support/testing/tests/package/test_attr.py new file mode 100644 index 0000000000..1b43f7daf6 --- /dev/null +++ b/support/testing/tests/package/test_attr.py @@ -0,0 +1,75 @@ +import os + + +import infra.basetest + + +class TestAttr(infra.basetest.BRTest): + # Note: this test uses extended attributes (xattr). We use a ext4 + # rootfs (which fully supports xattrs). Note that tmpfs has + # partial support of xattrs, and cpio initrd has not. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ATTR=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + disk_file = os.path.join(self.builddir, "images", "rootfs.ext4") + self.emulator.boot(arch="armv5", + kernel="builtin", + kernel_cmdline=["rootwait", "root=/dev/sda"], + options=["-drive", f"file={disk_file},if=scsi,format=raw"]) + self.emulator.login() + + # Check the programs can execute. + self.assertRunOk("getfattr --version") + self.assertRunOk("setfattr --version") + + test_file = "/root/file.txt" + attr_name = "buildroot" + attr_value = "is-great" + + # Create a test file. + self.assertRunOk(f"echo 'Hello Buildroot!' > {test_file}") + + # Set an extended attribute. + cmd = f"setfattr -n user.{attr_name} -v {attr_value} {test_file}" + self.assertRunOk(cmd) + + # Read back the attribute value. We add an extra "echo" to add + # a new line. getfattr --only-values prints raw attribute + # values and lack of a new line. + cmd = "getfattr" + cmd += f" -n user.{attr_name} --absolute-names --only-values" + cmd += f" {test_file} && echo" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], attr_value) + + # We read back the attribute value again, but with the "attr" + # command this time. + cmd = f"attr -q -g {attr_name} {test_file} && echo" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], attr_value) + + # List extended attributes with "attr", and check we see our + # test attribute. + cmd = f"attr -l {test_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn(attr_name, "\n".join(out)) + + # Remove the test attribute with setfattr. + cmd = f"setfattr -x user.{attr_name} {test_file}" + self.assertRunOk(cmd) + + # We check the test attribute is no longer listed by the attr + # command. + cmd = f"attr -l {test_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertNotIn(attr_name, "\n".join(out)) -- 2.43.0 From tekieli.lukasz at gmail.com Thu Feb 8 21:15:15 2024 From: tekieli.lukasz at gmail.com (Lukasz Tekieli) Date: Thu, 8 Feb 2024 22:15:15 +0100 Subject: [Buildroot] [PATCH v2 0/2] board/visionfive2: enable u-boot Message-ID: <20240208211517.9234-1-tekieli.lukasz@gmail.com> This series adds support for U-Boot deployment in SD card image. Lukasz Tekieli (2): board/visionfive2: fix genimage.cfg path board/visionfive2: enable u-boot board/visionfive2/genimage.cfg | 16 +++++++++------- configs/visionfive2_defconfig | 21 ++++++++++++++++++++- 2 files changed, 29 insertions(+), 8 deletions(-) -- 2.39.2 From tekieli.lukasz at gmail.com Thu Feb 8 21:15:16 2024 From: tekieli.lukasz at gmail.com (Lukasz Tekieli) Date: Thu, 8 Feb 2024 22:15:16 +0100 Subject: [Buildroot] [PATCH v2 1/2] board/visionfive2: fix genimage.cfg path In-Reply-To: <20240208211517.9234-1-tekieli.lukasz@gmail.com> References: <20240208211517.9234-1-tekieli.lukasz@gmail.com> Message-ID: <20240208211517.9234-2-tekieli.lukasz@gmail.com> Set correct directory for the BR2_ROOTFS_POST_SCRIPT_ARGS. Signed-off-by: Lukasz Tekieli --- Changes for v2: - fix extracted to a separate commit --- configs/visionfive2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index dc086953a0..3a1a4f527c 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,05533e9c31d6f0da20efc2d436a3b0f6d516ed4b)/linux-05533e9c31d6f0da20efc2d436a3b0f6d516ed4b.tar.gz" -- 2.39.2 From tekieli.lukasz at gmail.com Thu Feb 8 21:15:17 2024 From: tekieli.lukasz at gmail.com (Lukasz Tekieli) Date: Thu, 8 Feb 2024 22:15:17 +0100 Subject: [Buildroot] [PATCH v2 2/2] board/visionfive2: enable u-boot In-Reply-To: <20240208211517.9234-1-tekieli.lukasz@gmail.com> References: <20240208211517.9234-1-tekieli.lukasz@gmail.com> Message-ID: <20240208211517.9234-3-tekieli.lukasz@gmail.com> Enables U-Boot and required OpenSBI builds for the VisionFive2. Changes the sdcard.img to use GPT and adds the SPL and U-Boot to partitons specified in U-Boot's documentation for the board. U-Boot config uses BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME with value "u-boot.itb". Using BR2_TARGET_UBOOT_FORMAT_ITB fails, because the build does not support u-boot.itb make target. Signed-off-by: Lukasz Tekieli --- Changes for v2: - added fixed U-Boot version - added fixed OpenSBI version --- board/visionfive2/genimage.cfg | 16 +++++++++------- configs/visionfive2_defconfig | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/board/visionfive2/genimage.cfg b/board/visionfive2/genimage.cfg index c221b49c7b..8133e740c0 100644 --- a/board/visionfive2/genimage.cfg +++ b/board/visionfive2/genimage.cfg @@ -2,20 +2,22 @@ image sdcard.img { hdimage { + partition-table-type = "gpt" } - # u-boot is hard coded to look at 3rd partition - partition dummy1 { - size = 512 + partition spl { + partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + image = "u-boot-spl.bin.normal.out" } - partition dummy2 { - size = 512 + partition uboot { + partition-type-uuid = BC13C2FF-59E6-4262-A352-B275FD6F7172 + image = "u-boot.itb" } partition rootfs { - partition-type = 0x83 + partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + bootable = true image = "rootfs.ext4" - bootable = "true" } } diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index 3a1a4f527c..c8576a35a7 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -15,4 +15,23 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.4" +BR2_TARGET_OPENSBI_PLAT="generic" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES="FW_TEXT_START=0x40000000 FW_OPTIONS=0" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin.normal.out" BR2_PACKAGE_HOST_GENIMAGE=y -- 2.39.2 From ju.o at free.fr Thu Feb 8 21:26:09 2024 From: ju.o at free.fr (Julien Olivain) Date: Thu, 8 Feb 2024 22:26:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/ddrescue: bump to version 1.28 Message-ID: <20240208212610.256053-1-ju.o@free.fr> See the release announce: https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00014.html Signed-off-by: Julien Olivain --- package/ddrescue/ddrescue.hash | 4 ++-- package/ddrescue/ddrescue.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ddrescue/ddrescue.hash b/package/ddrescue/ddrescue.hash index 3caec5667f..4103d4fd6f 100644 --- a/package/ddrescue/ddrescue.hash +++ b/package/ddrescue/ddrescue.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-01/msg00011.html -sha256 38c80c98c5a44f15e53663e4510097fd68d6ec20758efdf3a925037c183232eb ddrescue-1.27.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00014.html +sha256 6626c07a7ca1cc1d03cad0958522c5279b156222d32c342e81117cfefaeb10c1 ddrescue-1.28.tar.lz # Locally computed sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk index f4376a9340..13798bb4bb 100644 --- a/package/ddrescue/ddrescue.mk +++ b/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.27 +DDRESCUE_VERSION = 1.28 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ -- 2.43.0 From arnout at mind.be Thu Feb 8 21:29:24 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 8 Feb 2024 22:29:24 +0100 Subject: [Buildroot] [PATCH 6/6] package/python-pymupdf: bump to version 1.23.9rc2 In-Reply-To: <454a12aa-fe40-4435-8c6e-5f020d960bb5@mind.be> References: <20240110093850.2302133-1-james.hilliard1@gmail.com> <20240110093850.2302133-6-james.hilliard1@gmail.com> <454a12aa-fe40-4435-8c6e-5f020d960bb5@mind.be> Message-ID: <269f1999-249c-4ede-82a6-6240bc36dbdd@mind.be> Hi Raphae?l, On 08/02/2024 12:28, Rapha?l M?lotte via buildroot wrote: > Hi James, all, > > Thanks for the patches! > I added a few comments/questions below. Your comments actually sound pretty essential, and I think they affect the earlier patches in the series as well. Should I mark the entire series as Changes Requested? Also, will you work on fixing the issues or should James take it on? Regards, Arnout > > On 1/10/24 10:38, James Hilliard wrote: >> Migrate to in tree pep517 based build backend. >> > > Does this new version cross-compile for you? > I get the following error because the wrong python-config is used (I only > briefly tried armv5 so far): > > error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc > config?)." > >> Note that version 1.23.8 is not compatible with mupdf 1.23.8 due to >> header conflict bugs that were fixed after the 1.23.8 release. >> >> Signed-off-by: James Hilliard >> --- >> ? package/python-pymupdf/python-pymupdf.hash |? 4 +-- >> ? package/python-pymupdf/python-pymupdf.mk?? | 33 ++++++++++++---------- >> ? 2 files changed, 20 insertions(+), 17 deletions(-) >> >> diff --git a/package/python-pymupdf/python-pymupdf.hash >> b/package/python-pymupdf/python-pymupdf.hash >> index 9fd8150088..e57652ab69 100644 >> --- a/package/python-pymupdf/python-pymupdf.hash >> +++ b/package/python-pymupdf/python-pymupdf.hash >> @@ -1,5 +1,5 @@ >> ? # md5, sha256 from https://pypi.org/pypi/pymupdf/json >> -md5? 468fe56375a1fca99e83fe0aa0b9f8bd? PyMuPDF-1.22.0.tar.gz >> -sha256? 6e1694e5c0cd8b92d503a506ee8e4ba1bed768528de586889d3ec90e9dc4a7d3 >> PyMuPDF-1.22.0.tar.gz >> +md5? eb0b65eaa063c2417d89c5453e7c82ad? PyMuPDF-1.23.9rc2.tar.gz >> +sha256? ba6fdd907814acb968ce669f49b0c14ef9ef8b1e2d161829b7a31461aab04429 >> PyMuPDF-1.23.9rc2.tar.gz >> ? # Locally computed sha256 checksums >> ? sha256? 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 >> COPYING >> diff --git a/package/python-pymupdf/python-pymupdf.mk >> b/package/python-pymupdf/python-pymupdf.mk >> index 639ce0e00e..ac76afa3f6 100644 >> --- a/package/python-pymupdf/python-pymupdf.mk >> +++ b/package/python-pymupdf/python-pymupdf.mk >> @@ -5,25 +5,28 @@ >> >> ################################################################################ >> ? # python-pymupdf's version must match mupdf's version >> -PYTHON_PYMUPDF_VERSION = 1.22.0 >> +PYTHON_PYMUPDF_VERSION = 1.23.9rc2 >> ? PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz >> -PYTHON_PYMUPDF_SITE = >> https://files.pythonhosted.org/packages/28/ba/d6bb6fd678e8396d7b944870286fb25fd6f499b8cb599b5436c8f725adbf >> -PYTHON_PYMUPDF_SETUP_TYPE = setuptools >> +PYTHON_PYMUPDF_SITE = >> https://files.pythonhosted.org/packages/b4/ff/db44303d60b8cc310a7187d500c7765b3b48aa113c86428d5d1c390b8fb5 >> +PYTHON_PYMUPDF_SETUP_TYPE = pep517 >> ? PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ >> ? PYTHON_PYMUPDF_LICENSE_FILES = COPYING >> ? # No license file included in pip, but it's present on github >> -PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib >> +PYTHON_PYMUPDF_DEPENDENCIES = \ >> +??? host-python-libclang \ > > Isn't libclang only required by the PyMuPDF plumbing when it builds the bundled > MuPDF? > In our case since we're building MuPDF as a separate package, we hopefully don't > need it... > >> +??? host-python-psutil \ > > From a quick look at the PyMuPDF code, this seems to be needed only for a > single test (which we don't run, so we don't need it). > >> +??? host-python-setuptools \ >> +??? host-python-swig \ > > The way I understand it, PyMuPDF added this host-python-swig dependency as a way > to make sure swig is available when building. > Since we already have host-swig as a dependency, we can probably use that one to > build as Yann suggested? > >> +??? host-swig \ >> +??? freetype \ >> +??? mupdf \ >> +??? zlib >> -PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf >> -I$(STAGING_DIR)/usr/include/freetype2" >> - >> -# We need to remove the original paths as we provide them in the CFLAGS: >> -define PYTHON_PYMUPDF_REMOVE_PATHS >> -??? sed -i "/\/usr\/include\/mupdf/d" $(@D)/setup.py >> -??? sed -i "/\/usr\/include\/freetype2/d" $(@D)/setup.py >> -??? sed -i "/\/usr\/local\/include\/mupdf/d" $(@D)/setup.py >> -??? sed -i "/mupdf\/thirdparty\/freetype\/include/d" $(@D)/setup.py >> -endef >> - >> -PYTHON_PYMUPDF_POST_PATCH_HOOKS = PYTHON_PYMUPDF_REMOVE_PATHS >> +PYTHON_PYMUPDF_ENV = \ >> + >> PYMUPDF_INCLUDES="$(STAGING_DIR)/usr/include/freetype2:$(STAGING_DIR)/usr/include" \ >> +??? PYMUPDF_MUPDF_LIB="$(STAGING_DIR)/usr/lib" \ >> +??? PYMUPDF_SETUP_FLAVOUR=p \> +??? PYMUPDF_SETUP_IMPLEMENTATIONS=a \ > > It's worth noting that PyMuPDF is gradually switching to a new implementation > which will require MuPDF to be built with python bindings in the future (but for > now, both implementations are still available AFAICT). > >> +??? PYMUPDF_SETUP_MUPDF_BUILD= >> ? $(eval $(python-package)) > > There seem to be more work needed to get this new version to work, I'll try to > have a closer look at it in the next few days. > > > Kind regards, > > Rapha?l > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From arnout at mind.be Thu Feb 8 21:42:58 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 8 Feb 2024 22:42:58 +0100 Subject: [Buildroot] [PATCH] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20231211181504.3035423-1-roy.kollen.svendsen@akersolutions.com> References: <20231211181504.3035423-1-roy.kollen.svendsen@akersolutions.com> Message-ID: Hi Roy, On 11/12/2023 19:15, Roy Kollen Svendsen wrote: > Bump qt5 packages to latest submodule versions from: > https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > Signed-off-by: Roy Kollen Svendsen > --- > package/qt5/qt5.mk | 2 +- > package/qt5/qt53d/qt53d.hash | 2 +- > package/qt5/qt53d/qt53d.mk | 2 +- Sebastien Weyer submitted the same version bump earlier [1], but he left out qt53d because it doesn't build. Was it working for you or did you just not test qt53d? > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > package/qt5/qt5charts/qt5charts.hash | 2 +- > package/qt5/qt5charts/qt5charts.mk | 2 +- > package/qt5/qt5connectivity/qt5connectivity.hash | 2 +- > package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- > package/qt5/qt5declarative/qt5declarative.hash | 2 +- > package/qt5/qt5declarative/qt5declarative.mk | 2 +- > package/qt5/qt5doc/qt5doc.hash | 2 +- > package/qt5/qt5doc/qt5doc.mk | 2 +- I don't know why, but Sebastian didn't update qt5doc either... Regards, Arnout [1] https://patchwork.ozlabs.org/project/buildroot/patch/20231012132616.2180337-1-sebastian.weyer at smile.fr/ > package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 +- > package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- > package/qt5/qt5imageformats/qt5imageformats.hash | 2 +- > package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- > package/qt5/qt5location/qt5location.mk | 2 +- > package/qt5/qt5lottie/qt5lottie.hash | 2 +- > package/qt5/qt5lottie/qt5lottie.mk | 2 +- > package/qt5/qt5multimedia/qt5multimedia.hash | 2 +- > package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- > package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 +- > package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- > package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 +- > package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- > package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 2 +- > package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 2 +- > package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 2 +- > package/qt5/qt5remoteobjects/qt5remoteobjects.mk | 2 +- > package/qt5/qt5script/qt5script.hash | 2 +- > package/qt5/qt5script/qt5script.mk | 2 +- > package/qt5/qt5scxml/qt5scxml.hash | 2 +- > package/qt5/qt5scxml/qt5scxml.mk | 2 +- > package/qt5/qt5sensors/qt5sensors.hash | 2 +- > package/qt5/qt5sensors/qt5sensors.mk | 2 +- > package/qt5/qt5serialbus/qt5serialbus.hash | 2 +- > package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- > package/qt5/qt5serialport/qt5serialport.hash | 2 +- > package/qt5/qt5serialport/qt5serialport.mk | 2 +- > package/qt5/qt5speech/qt5speech.hash | 2 +- > package/qt5/qt5speech/qt5speech.mk | 2 +- > package/qt5/qt5svg/qt5svg.hash | 2 +- > package/qt5/qt5svg/qt5svg.mk | 2 +- > package/qt5/qt5tools/qt5tools.hash | 2 +- > package/qt5/qt5tools/qt5tools.mk | 2 +- > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 2 +- > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- > package/qt5/qt5wayland/qt5wayland.hash | 2 +- > package/qt5/qt5wayland/qt5wayland.mk | 2 +- > package/qt5/qt5webchannel/qt5webchannel.hash | 2 +- > package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- > package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash | 4 ++-- > package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk | 2 +- > package/qt5/qt5websockets/qt5websockets.hash | 2 +- > package/qt5/qt5websockets/qt5websockets.mk | 2 +- > package/qt5/qt5webview/qt5webview.hash | 2 +- > package/qt5/qt5webview/qt5webview.mk | 2 +- > package/qt5/qt5x11extras/qt5x11extras.hash | 2 +- > package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- > 62 files changed, 63 insertions(+), 63 deletions(-) [snip] From arnout at mind.be Thu Feb 8 22:36:48 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 8 Feb 2024 23:36:48 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> Message-ID: Hi Se?bastien, It's no fun that I still have questions on v5, but unfortunately... On 08/02/2024 13:54, S?bastien Szymanski wrote: > This commit adds i.MX91 and i.MX93 support to Buildroot. > https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors:IMX9-PROCESSORS > > There is no i.MX95 software provided by NXP at the moment that's why > i.MX95 is left behind. > > Adapt package firmware-imx for the LPPDR4 firwmares binaries. > > Reviewed-by: Gary Bisson > Signed-off-by: S?bastien Szymanski [snip] > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + bool "imx91" > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + bool "imx93" > + > +endchoice > + > +choice > + prompt "i.MX Silicon Revision" > + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 \ > + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 \ > + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + help > + Some packages related to the selected i.MX platform need to know the > + silicon revision of the platform they will run on. > + If you don't know, leave the default value. > + > + Note - mismatches may result in a failure to boot! This sentence conflicts with "If you don't know, leave the default value"... So I think that "If you don't know" sentence should be dropped. > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 > + bool "imx91a1" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 Since for IMX91 there is only one option, I think it makes more sense to not offer a choice for this. Just always use this one for the IMX91. We can still add it back if there ever turns out to be an imx91a2. > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 > + bool "imx93a0" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 > + bool "imx93a1" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + > endchoice > [snip] > @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION > # unconditionally use HW version 201810 when DDR3/DDR4 was > # selected > default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || BR2_PACKAGE_FIRMWARE_IMX_DDR4 > + default "v202201" if \ For the time being, there is only one version for the IMX91/3. So it makes no sense to give an option for it. (In fact, this really should have been a choice instead of a string option because there are only a fixed set of options... But that's a separate topic.) By the way, do these SoCs use the plain 202006 version for DDR4 like the other SoCs? And do they also support DDR3? > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > help > Use a specific version of the imx ddr binaries. Leaving this > field empty will select the default version. > diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk > index 66ef8c3930be..1f36f917cdc8 100644 > --- a/package/freescale-imx/firmware-imx/firmware-imx.mk > +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk > @@ -48,6 +48,30 @@ endif > ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) > FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys > > +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) To make the conditions more symmetrical/regular, perhaps it's better to create a new BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X option and encode the platform conditions there. The prompt would be the same for BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 and for BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X ("lpddr4" for both). But perhaps I'm overthinking things. > +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > + # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate lpddr4_fw.bin. > + # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin > + # which is done in post-image script. > + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ > + lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), So the v202201 could be hardcoded here. > + lpddr4_1d_fw) > + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ > + lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_2d_fw) > + cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ > + $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ > + $(BINARIES_DIR)/lpddr4_fw.bin > + ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin > + > + # U-Boot supports creation of the combined flash.bin image. To make > + # sure that U-Boot can access all available files copy them to > + # the binary dir. > + cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ We now have 3 instances of this exact same code block with only the file names that differ, so perhaps it's time to factor this into a second helper function. Or better, define a few auxiliary variables FIRMWARE_IMX_DDRFW_IMEM_1D, FIRMWARE_IMX_DDRFW_DMEM_1D etc that are set for each variant, and then one definition of FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW that uses those variables. If that sounds too complex, don't worry, it's just a "niceification" so not really necessary to do. In fact, the only of my comments above that is really important is dropping BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1. Regards, Arnout > +endef > +else > define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > # Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin. > # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin > @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ > endef > endif > +endif > > ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) > FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys > From arnout at mind.be Thu Feb 8 22:39:52 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 8 Feb 2024 23:39:52 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> Message-ID: <41227294-6a3d-42d7-a3cd-fefa713a3546@mind.be> On 08/02/2024 23:36, Arnout Vandecappelle wrote: > ?To make the conditions more symmetrical/regular, perhaps it's better to > create a new BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X option and encode the > platform conditions there. The prompt would be the same for > BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 and for BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X > ("lpddr4" for both).? But perhaps I'm overthinking things. ?That would be BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9, not IMX9X. ?Regards, ?Arnout From arnout at mind.be Thu Feb 8 22:43:04 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 8 Feb 2024 23:43:04 +0100 Subject: [Buildroot] [PATCH v5 2/3] package/freescale-imx/firmware-ele-imx: new package In-Reply-To: <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> Message-ID: <7cc235a5-b0ee-4517-a4ce-941e6f868c19@mind.be> On 08/02/2024 13:54, S?bastien Szymanski wrote: > This package provides firmware blobs for the Edgelock Secure > Enclave (ELE) [1] present on i.MX8ULP and i.MX9 Socs. > This version comes from the 6.1.55-2.2.0 release. > > [1] https://www.nxp.com/products/nxp-product-information/nxp-product-programs/edgelock-secure-enclave:EDGELOCK-SECURE-ENCLAVE > > Reviewed-by: Gary Bisson > Signed-off-by: S?bastien Szymanski > --- > Changes for v5: > - none > > Changes for v4: > - move i.MX Silicon Revision changes into first patch (Gary Bisson) > > Changes for v3: > - rename package from firmware-sentinel to package firmware-ele-imx > > Changes for v2: > - none > --- > package/freescale-imx/Config.in | 1 + > package/freescale-imx/firmware-ele-imx/Config.in | 21 +++++++++++++++++ > .../firmware-ele-imx/firmware-ele-imx.hash | 4 ++++ > .../firmware-ele-imx/firmware-ele-imx.mk | 27 ++++++++++++++++++++++ > 4 files changed, 53 insertions(+) > > diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in > index ba169ead18cb..f12acc3bd024 100644 > --- a/package/freescale-imx/Config.in > +++ b/package/freescale-imx/Config.in > @@ -154,6 +154,7 @@ source "package/freescale-imx/imx-uuc/Config.in" > source "package/freescale-imx/imx-vpu/Config.in" > source "package/freescale-imx/imx-vpu-hantro/Config.in" > source "package/freescale-imx/imx-vpuwrap/Config.in" > +source "package/freescale-imx/firmware-ele-imx/Config.in" > source "package/freescale-imx/firmware-imx/Config.in" > source "package/freescale-imx/imx-sc-firmware/Config.in" > source "package/freescale-imx/imx-seco/Config.in" > diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in > new file mode 100644 > index 000000000000..7867c3712c9c > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_FIRMWARE_ELE_IMX > + bool "firmware-ele-imx" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + help > + Firmware blobs for the Edgelock Secure Enclave (ELE) ELE, not ELSE? Weird... > + present on i.MX8ULP and i.MX9 SoCs. I guess we simply don't have support for i.MX8ULP yet in Buildroot? Perhaps it's better to create a BR2_PACKAGE_FREESCALE_IMX_HAS_ELE option in freescale-imx/Config.in > + > + This library is provided by NXP as-is and doesn't have an > + upstream. > + > +if BR2_PACKAGE_FIRMWARE_ELE_IMX > + > +config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE > + string > + default "mx93a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 > + default "mx93a1-ahab-container.img" if \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 || \ So i.MX91 uses the mx93 image? Weird... Regards, Arnout > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 > + > +endif # BR2_PACKAGE_FIRMWARE_ELE_IMX > diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash > new file mode 100644 > index 000000000000..58565cef43e9 > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash > @@ -0,0 +1,4 @@ > +# Locally calculated > +sha256 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca firmware-ele-imx-0.1.0.bin > +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING > +sha256 c800aaca3a7e9f470d99d7cde0a48c95982ed601d4c306f7b8f43f3710054f28 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 > new file mode 100644 > index 000000000000..600b50c5b456 > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk > @@ -0,0 +1,27 @@ > +################################################################################ > +# > +# firmware-ele-imx > +# > +################################################################################ > + > +FIRMWARE_ELE_IMX_VERSION = 0.1.0 > +FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) > +FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin > + > +FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement > +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING SCR.txt > +FIRMWARE_ELE_IMX_REDISTRIBUTE = NO > + > +FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES > + > +define FIRMWARE_ELE_IMX_EXTRACT_CMDS > + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_ELE_IMX_DL_DIR)/$(FIRMWARE_ELE_IMX_SOURCE)) > +endef > + > +FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE)) > + > +define FIRMWARE_ELE_IMX_INSTALL_IMAGES_CMDS > + cp $(@D)/$(FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE) $(BINARIES_DIR)/ahab-container.img > +endef > + > +$(eval $(generic-package)) > From james.d.knight at live.com Fri Feb 9 02:14:52 2024 From: james.d.knight at live.com (James Knight) Date: Thu, 8 Feb 2024 21:14:52 -0500 Subject: [Buildroot] [git commit] package/python3: bump version to 3.12.1 In-Reply-To: <20240206222231.8950D87481@busybox.osuosl.org> References: <20240206222231.8950D87481@busybox.osuosl.org> Message-ID: For those playing with this new Python version, On Tue, Feb 6, 2024 at 5:21?PM Thomas Petazzoni via buildroot wrote: > commit: https://git.buildroot.net/buildroot/commit/?id=36e635d2d5c0166476858aa239ccbe78e8f2af14 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master I noticed after this patch, I can no longer build the "python3" package for my x86_64 configuration. I see some talk on the mailing list about maybe other issues with this version of Python (if I have interpreted this correctly). I am also planning to investigate why I'm having this issue soon, but I wanted to give a heads-up just in case this information helps. The build issue that occurs is the following: >>> python3 3.12.1 Building GIT_DIR=. PATH="/builds/buildroot/output/host/bin:/builds/buildroot/output/host/sbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" /usr/bin/make -j33 -C /builds/buildroot/output/build/python3-3.12.1/ make[1]: Entering directory '/builds/buildroot/output/build/python3-3.12.1' ... /builds/buildroot/output/host/bin/x86_64-ottchain-linux-gnu-gcc -shared -Wl,--no-as-needed -o libpython3.so -Wl,-hlibpython3.so libpython3.12.so /builds/buildroot/output/host/bin/x86_64-ottchain-linux-gnu-gcc -Xlinker -export-dynamic -o python Programs/python.o -L. -lpython3.12 -ldl -lpthread -lm /builds/buildroot/output/host/bin/x86_64-ottchain-linux-gnu-gcc -Xlinker -export-dynamic -o Programs/_testembed Programs/_testembed.o -L. -lpython3.12 -ldl -lpthread -lm Traceback (most recent call last): File "/builds/buildroot/output/build/python3-3.12.1/./Tools/build/check_extension_modules.py", line 25, in import pathlib File "/builds/buildroot/output/build/python3-3.12.1/Lib/pathlib.py", line 20, in from urllib.parse import quote_from_bytes as urlquote_from_bytes File "/builds/buildroot/output/build/python3-3.12.1/Lib/urllib/parse.py", line 36, in import math ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' not found (required by /builds/buildroot/output/build/python3-3.12.1/build/lib.linux-x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) make[1]: Leaving directory '/builds/buildroot/output/build/python3-3.12.1' make[1]: *** [Makefile:1120: checksharedmods] Error 1 make: *** [package/pkg-generic.mk:283: /builds/buildroot/output/build/python3-3.12.1/.stamp_built] Error 2 First noticed this issue using the most recent sources of Buildroot (at the time: 35eb74c6343a9ec1407fb473271dda0516792391). Tested my build against some old commits and was able to confirm that the build works with "09de823cbc7bd50a40e25f4166b4e42be94b0c7b", but fails at "36e635d2d5c0166476858aa239ccbe78e8f2af14" (this patch). Additional information: - Buildroot configuration: BR2_x86_64=y, using a crosstool-ng toolchain (v1.26.0+6cf65d; CT_ARCH_X86=y; CT_ARCH_64=y; GCC 13) - Host: Ubuntu 22.04.3 LTS (Jammy Jellyfish) (Docker container: ubuntu:latest) From roykollensvendsen at gmail.com Fri Feb 9 05:14:26 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Fri, 9 Feb 2024 06:14:26 +0100 Subject: [Buildroot] [PATCH] package/qt5: bump packages to latest kde submodule versions In-Reply-To: References: <20231211181504.3035423-1-roy.kollen.svendsen@akersolutions.com> Message-ID: Hi Arnout, This patch broke the build for me too, after activating all the modules in menuconfig. I tried to change the state in patchwork to indicate this, but i should probably have pointed it out on the mailinglist. I believe i fixed the build at a later point though, but then I ran into problems again related to qt5webengine...I will trace my steps today Regards, Roy tor. 8. feb. 2024, 22:43 skrev Arnout Vandecappelle : > Hi Roy, > > On 11/12/2023 19:15, Roy Kollen Svendsen wrote: > > Bump qt5 packages to latest submodule versions from: > > https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > > > Signed-off-by: Roy Kollen Svendsen < > roy.kollen.svendsen at akersolutions.com> > > --- > > package/qt5/qt5.mk | 2 +- > > package/qt5/qt53d/qt53d.hash | 2 +- > > package/qt5/qt53d/qt53d.mk | 2 +- > > Sebastien Weyer submitted the same version bump earlier [1], but he left > out > qt53d because it doesn't build. Was it working for you or did you just not > test > qt53d? > > > package/qt5/qt5base/qt5base.hash | 2 +- > > package/qt5/qt5base/qt5base.mk | 2 +- > > package/qt5/qt5charts/qt5charts.hash | 2 +- > > package/qt5/qt5charts/qt5charts.mk | 2 +- > > package/qt5/qt5connectivity/qt5connectivity.hash | 2 +- > > package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- > > package/qt5/qt5declarative/qt5declarative.hash | 2 +- > > package/qt5/qt5declarative/qt5declarative.mk | 2 +- > > package/qt5/qt5doc/qt5doc.hash | 2 +- > > package/qt5/qt5doc/qt5doc.mk | 2 +- > > I don't know why, but Sebastian didn't update qt5doc either... > > > Regards, > Arnout > > [1] > > https://patchwork.ozlabs.org/project/buildroot/patch/20231012132616.2180337-1-sebastian.weyer at smile.fr/ > > > > package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 +- > > package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- > > package/qt5/qt5imageformats/qt5imageformats.hash | 2 +- > > package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- > > package/qt5/qt5location/qt5location.mk | 2 +- > > package/qt5/qt5lottie/qt5lottie.hash | 2 +- > > package/qt5/qt5lottie/qt5lottie.mk | 2 +- > > package/qt5/qt5multimedia/qt5multimedia.hash | 2 +- > > package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- > > package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 +- > > package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- > > package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 +- > > package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- > > package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 2 +- > > package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 2 +- > > package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 2 +- > > package/qt5/qt5remoteobjects/qt5remoteobjects.mk | 2 +- > > package/qt5/qt5script/qt5script.hash | 2 +- > > package/qt5/qt5script/qt5script.mk | 2 +- > > package/qt5/qt5scxml/qt5scxml.hash | 2 +- > > package/qt5/qt5scxml/qt5scxml.mk | 2 +- > > package/qt5/qt5sensors/qt5sensors.hash | 2 +- > > package/qt5/qt5sensors/qt5sensors.mk | 2 +- > > package/qt5/qt5serialbus/qt5serialbus.hash | 2 +- > > package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- > > package/qt5/qt5serialport/qt5serialport.hash | 2 +- > > package/qt5/qt5serialport/qt5serialport.mk | 2 +- > > package/qt5/qt5speech/qt5speech.hash | 2 +- > > package/qt5/qt5speech/qt5speech.mk | 2 +- > > package/qt5/qt5svg/qt5svg.hash | 2 +- > > package/qt5/qt5svg/qt5svg.mk | 2 +- > > package/qt5/qt5tools/qt5tools.hash | 2 +- > > package/qt5/qt5tools/qt5tools.mk | 2 +- > > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 2 +- > > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- > > package/qt5/qt5wayland/qt5wayland.hash | 2 +- > > package/qt5/qt5wayland/qt5wayland.mk | 2 +- > > package/qt5/qt5webchannel/qt5webchannel.hash | 2 +- > > package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- > > package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash | 4 ++-- > > package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk | 2 +- > > package/qt5/qt5websockets/qt5websockets.hash | 2 +- > > package/qt5/qt5websockets/qt5websockets.mk | 2 +- > > package/qt5/qt5webview/qt5webview.hash | 2 +- > > package/qt5/qt5webview/qt5webview.mk | 2 +- > > package/qt5/qt5x11extras/qt5x11extras.hash | 2 +- > > package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- > > package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 +- > > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- > > 62 files changed, 63 insertions(+), 63 deletions(-) > [snip] > -------------- next part -------------- An HTML attachment was scrubbed... URL: From arnout at mind.be Fri Feb 9 07:50:36 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 9 Feb 2024 08:50:36 +0100 Subject: [Buildroot] [PATCH] package/qt5: bump packages to latest kde submodule versions In-Reply-To: References: <20231211181504.3035423-1-roy.kollen.svendsen@akersolutions.com> Message-ID: <9c06da48-ccdd-4e56-95e5-40089d298c4c@mind.be> On 09/02/2024 06:14, Roy Kollen Svendsen wrote: > Hi Arnout, > > This patch broke the build for me too, after? activating all the modules in > menuconfig. I tried to change the state in patchwork to indicate this, but i > should probably have pointed it out on the mailinglist. I believe i fixed the > build at a later point though, but then I ran into problems again related to > qt5webengine...I will trace my steps today Ah, yes indeed the patch was marked as Changes Requested in patchwork, but since I didn't see any comment about it on the mailing list, I assumed that that was a mistake. I will move it back to Changes Requested and merge Sebastian's patch. Regards, Arnout > > Regards, > Roy > > tor. 8. feb. 2024, 22:43 skrev Arnout Vandecappelle >: > > ? Hi Roy, > > On 11/12/2023 19:15, Roy Kollen Svendsen wrote: > > Bump qt5 packages to latest submodule versions from: > > https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > > > > Signed-off-by: Roy Kollen Svendsen > > > --- > >? ?package/qt5/qt5.mk > ? ? ?| 2 +- > >? ?package/qt5/qt53d/qt53d.hash? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt53d/qt53d.mk > ? ? ? ?| 2 +- > > ? Sebastien Weyer submitted the same version bump earlier [1], but he left out > qt53d because it doesn't build. Was it working for you or did you just not test > qt53d? > > >? ?package/qt5/qt5base/qt5base.hash? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5base/qt5base.mk > ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5charts/qt5charts.hash? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5charts/qt5charts.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5connectivity/qt5connectivity.hash? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5connectivity/qt5connectivity.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5declarative/qt5declarative.hash? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5declarative/qt5declarative.mk > ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5doc/qt5doc.hash? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5doc/qt5doc.mk > ? ? ? ? ?| 2 +- > > ? I don't know why, but Sebastian didn't update qt5doc either... > > > ? Regards, > ? Arnout > > [1] > https://patchwork.ozlabs.org/project/buildroot/patch/20231012132616.2180337-1-sebastian.weyer at smile.fr/ > > > >? ?package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash? ? ?| 2 +- > >? ?package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > ? ? ? ?| 2 +- > >? ?package/qt5/qt5imageformats/qt5imageformats.hash? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5imageformats/qt5imageformats.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5location/qt5location.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5lottie/qt5lottie.hash? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5lottie/qt5lottie.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5multimedia/qt5multimedia.hash? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5multimedia/qt5multimedia.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quickcontrols/qt5quickcontrols.hash? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quickcontrols/qt5quickcontrols.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quicktimeline/qt5quicktimeline.hash? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5quicktimeline/qt5quicktimeline.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5remoteobjects/qt5remoteobjects.hash? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5remoteobjects/qt5remoteobjects.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5script/qt5script.hash? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5script/qt5script.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5scxml/qt5scxml.hash? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5scxml/qt5scxml.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5sensors/qt5sensors.hash? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5sensors/qt5sensors.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5serialbus/qt5serialbus.hash? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5serialbus/qt5serialbus.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5serialport/qt5serialport.hash? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5serialport/qt5serialport.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5speech/qt5speech.hash? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5speech/qt5speech.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5svg/qt5svg.hash? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5svg/qt5svg.mk > ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5tools/qt5tools.hash? ? ? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5tools/qt5tools.mk > ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash? ? ? ?| 2 +- > >? ?package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5wayland/qt5wayland.hash? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5wayland/qt5wayland.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5webchannel/qt5webchannel.hash? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5webchannel/qt5webchannel.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash | 4 ++-- > >? ?package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk > ? ?| 2 +- > >? ?package/qt5/qt5websockets/qt5websockets.hash? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5websockets/qt5websockets.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5webview/qt5webview.hash? ? ? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5webview/qt5webview.mk > ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5x11extras/qt5x11extras.hash? ? ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5x11extras/qt5x11extras.mk > ? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash? ? ? ? ? ? ? ?| 2 +- > >? ?package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > ? ? ? ? ? ? ? ? ?| 2 +- > >? ?62 files changed, 63 insertions(+), 63 deletions(-) > [snip] > From arnout at mind.be Fri Feb 9 07:53:26 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 9 Feb 2024 08:53:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5: bump packages to latest kde submodule versions In-Reply-To: <20231012132616.2180337-1-sebastian.weyer@smile.fr> References: <20231012132616.2180337-1-sebastian.weyer@smile.fr> Message-ID: <67c8c262-ac4b-46a5-93fa-b3bb18a1d9cb@mind.be> On 12/10/2023 15:26, Sebastian Weyer wrote: > Bump qt5 packages to latest submodule versions from: > https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 > > Signed-off-by: Sebastian Weyer > --- > The package qt53d was not updated with the rest as it fails with > > qgltf.cpp:29:10: fatal error: assimp/Importer.hpp: No such file or directory > 29 | #include > > although assimp is installed and the header file is present in > host/aarch64-buildroot-linux-gnu/sysroot/usr/include/assimp/Importer.hpp > > This package was also not updated in the last version bump to 5.15.10 in > 6b23dff9e71786191797d3b41ce80afe659f0396. Starting from 5.15.9 it fails > with this error. I couldn't find out why this package wasn't updated to > 5.15.10 to begin with but it seems like it could be this error? So I thought > it might be okay to leave it at 5.15.8 for now. What do you think? > > Signed-off-by: Sebastian Weyer Applied to master, thanks. Regards, Arnout > --- > package/qt5/qt5.mk | 2 +- > package/qt5/qt5base/qt5base.hash | 2 +- > package/qt5/qt5base/qt5base.mk | 2 +- > package/qt5/qt5charts/qt5charts.hash | 2 +- > package/qt5/qt5charts/qt5charts.mk | 2 +- > package/qt5/qt5connectivity/qt5connectivity.hash | 2 +- > package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- > package/qt5/qt5declarative/qt5declarative.hash | 2 +- > package/qt5/qt5declarative/qt5declarative.mk | 2 +- > package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 +- > package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- > package/qt5/qt5imageformats/qt5imageformats.hash | 2 +- > package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- > package/qt5/qt5location/qt5location.hash | 2 +- > package/qt5/qt5location/qt5location.mk | 2 +- > package/qt5/qt5lottie/qt5lottie.hash | 2 +- > package/qt5/qt5lottie/qt5lottie.mk | 2 +- > package/qt5/qt5multimedia/qt5multimedia.hash | 2 +- > package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- > package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 +- > package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- > package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 +- > package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- > package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 2 +- > package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 2 +- > package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 2 +- > package/qt5/qt5remoteobjects/qt5remoteobjects.mk | 2 +- > package/qt5/qt5scxml/qt5scxml.hash | 2 +- > package/qt5/qt5scxml/qt5scxml.mk | 2 +- > package/qt5/qt5sensors/qt5sensors.hash | 2 +- > package/qt5/qt5sensors/qt5sensors.mk | 2 +- > package/qt5/qt5serialbus/qt5serialbus.hash | 2 +- > package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- > package/qt5/qt5serialport/qt5serialport.hash | 2 +- > package/qt5/qt5serialport/qt5serialport.mk | 2 +- > package/qt5/qt5speech/qt5speech.hash | 2 +- > package/qt5/qt5speech/qt5speech.mk | 2 +- > package/qt5/qt5svg/qt5svg.hash | 2 +- > package/qt5/qt5svg/qt5svg.mk | 2 +- > package/qt5/qt5tools/qt5tools.hash | 2 +- > package/qt5/qt5tools/qt5tools.mk | 2 +- > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 2 +- > package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- > package/qt5/qt5wayland/qt5wayland.hash | 2 +- > package/qt5/qt5wayland/qt5wayland.mk | 2 +- > package/qt5/qt5webchannel/qt5webchannel.hash | 2 +- > package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- > package/qt5/qt5webengine/qt5webengine.hash | 2 +- > package/qt5/qt5websockets/qt5websockets.hash | 2 +- > package/qt5/qt5websockets/qt5websockets.mk | 2 +- > package/qt5/qt5webview/qt5webview.hash | 2 +- > package/qt5/qt5webview/qt5webview.mk | 2 +- > package/qt5/qt5x11extras/qt5x11extras.hash | 2 +- > package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 +- > package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- > 56 files changed, 56 insertions(+), 56 deletions(-) > > diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk > index b55accacf1..a43b36dd51 100644 > --- a/package/qt5/qt5.mk > +++ b/package/qt5/qt5.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > QT5_VERSION_MAJOR = 5.15 > -QT5_VERSION = $(QT5_VERSION_MAJOR).10 > +QT5_VERSION = $(QT5_VERSION_MAJOR).11 > QT5_SITE = https://invent.kde.org/qt/qt > > include $(sort $(wildcard package/qt5/*/*.mk)) > diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash > index 4efc8fa172..ffc474f49e 100644 > --- a/package/qt5/qt5base/qt5base.hash > +++ b/package/qt5/qt5base/qt5base.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 5622a9053154af9a353b8e8be217104c6af068b5b5aba8b07ef4fea2dc79fded qtbase-e44097b63d17ba3178a637df7fac51ddc51cb48b.tar.bz2 > +sha256 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index cc29f5523f..7ee6124d4b 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5BASE_VERSION = e44097b63d17ba3178a637df7fac51ddc51cb48b > +QT5BASE_VERSION = da6e958319e95fe564d3b30c931492dd666bfaff > QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) > QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 > > diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash > index 0688f64615..fec54c86b1 100644 > --- a/package/qt5/qt5charts/qt5charts.hash > +++ b/package/qt5/qt5charts/qt5charts.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 9d2ad94a054bd7df08e5d11bc77b6422ccecbf99ea8dd6f06908bafc72ea869d qtcharts-841083c263f16f8acb81e4915bf24bbed0461c9a.tar.bz2 > +sha256 66dae46a8bcb1dfc10dd3404296701c41e50658792e4a6a7317a182fad6f36c8 qtcharts-e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk > index fa69263be4..bfc6021289 100644 > --- a/package/qt5/qt5charts/qt5charts.mk > +++ b/package/qt5/qt5charts/qt5charts.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5CHARTS_VERSION = 841083c263f16f8acb81e4915bf24bbed0461c9a > +QT5CHARTS_VERSION = e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826 > QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) > QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 > QT5CHARTS_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash > index 1252a73247..776448502b 100644 > --- a/package/qt5/qt5connectivity/qt5connectivity.hash > +++ b/package/qt5/qt5connectivity/qt5connectivity.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 ec1d91fc35d8b4a333209fb5fd85e00ab77345bff48b60b4e43b804a59f60979 qtconnectivity-c5f35f89e975c2ad58c83c6b606d40ba41057f15.tar.bz2 > +sha256 7a44848e113e1d7232c077f9fa8021ab038f59765123920e11936e7d4b8e3c66 qtconnectivity-f0c98c39447894bba493aa91c65053d7f18d68cb.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk > index 72797de1a0..dc5e647e0b 100644 > --- a/package/qt5/qt5connectivity/qt5connectivity.mk > +++ b/package/qt5/qt5connectivity/qt5connectivity.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5CONNECTIVITY_VERSION = c5f35f89e975c2ad58c83c6b606d40ba41057f15 > +QT5CONNECTIVITY_VERSION = f0c98c39447894bba493aa91c65053d7f18d68cb > QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) > QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 > QT5CONNECTIVITY_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash > index 0e7978dc58..3db5c94458 100644 > --- a/package/qt5/qt5declarative/qt5declarative.hash > +++ b/package/qt5/qt5declarative/qt5declarative.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 dbe0cdf84767564a56abf9d0d867c9cfcc754827169357a0f8162309c11882b5 qtdeclarative-b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a.tar.bz2 > +sha256 bebd1205aa087f529b8824f0284e127e08672ff7ce36a6b865cd921514ec1192 qtdeclarative-960a980dc885622cb84990c4da75d5060318302d.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk > index 18c1608fca..99c88e7d06 100644 > --- a/package/qt5/qt5declarative/qt5declarative.mk > +++ b/package/qt5/qt5declarative/qt5declarative.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5DECLARATIVE_VERSION = b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a > +QT5DECLARATIVE_VERSION = 960a980dc885622cb84990c4da75d5060318302d > QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) > QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 > QT5DECLARATIVE_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > index 95567b2476..e5fdaf67bf 100644 > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 de41af344889d35252fec9a6b6c78e1f67b7a7be15a5d3986b2ec20e2fcafadc qtgraphicaleffects-e6e1e58ec28fd0f2e6426e6962cc4ccddb493349.tar.bz2 > +sha256 18afbc24b40420ce0fe6bfad8331f43a1d8c8ec22501b7987ecec9334b69e9a2 qtgraphicaleffects-cce7d784237cd2dd4af1abe2757d048e34e02685.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > index f829c67122..ddf805303b 100644 > --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5GRAPHICALEFFECTS_VERSION = e6e1e58ec28fd0f2e6426e6962cc4ccddb493349 > +QT5GRAPHICALEFFECTS_VERSION = cce7d784237cd2dd4af1abe2757d048e34e02685 > QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) > QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 > QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash > index 9d821672b3..779db8d109 100644 > --- a/package/qt5/qt5imageformats/qt5imageformats.hash > +++ b/package/qt5/qt5imageformats/qt5imageformats.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 8bf646d4db7d0099dd49b7c049a64fb585a3e180d73fc2b6edf22a1384529d1d qtimageformats-9044695f4b1acdd7ec24e7b01f6a6ca61f982a75.tar.bz2 > +sha256 bac150b9c5eaf0132a39a0b2a75cfca5400c11f4b8bf60f7362a6e0307f5c19e qtimageformats-6a1af670d52492ab0955933b830026b2a18ed6d6.tar.bz2 > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk > index 0ce6e4ffb4..27ef05777d 100644 > --- a/package/qt5/qt5imageformats/qt5imageformats.mk > +++ b/package/qt5/qt5imageformats/qt5imageformats.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5IMAGEFORMATS_VERSION = 9044695f4b1acdd7ec24e7b01f6a6ca61f982a75 > +QT5IMAGEFORMATS_VERSION = 6a1af670d52492ab0955933b830026b2a18ed6d6 > QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) > QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 > QT5IMAGEFORMATS_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash > index f73053f388..0188f51c83 100644 > --- a/package/qt5/qt5location/qt5location.hash > +++ b/package/qt5/qt5location/qt5location.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 90b57a335d8c7311a86865a56b2b9cd944a8a1cafa6a7499de5b35a105c5b247 qt5location-ebdf5b38da6e3fe0a183702bcca395c589c459ed-br1.tar.gz > +sha256 133d28fc0071e419682b7ed736c17b39240545c8e9d6ff7e9905f365bb1eb693 qt5location-0ec8f5e82da7369a92824167c4d7331f6c502325-br1.tar.gz > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk > index 904d31a983..88bf3d289c 100644 > --- a/package/qt5/qt5location/qt5location.mk > +++ b/package/qt5/qt5location/qt5location.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5LOCATION_VERSION = ebdf5b38da6e3fe0a183702bcca395c589c459ed > +QT5LOCATION_VERSION = 0ec8f5e82da7369a92824167c4d7331f6c502325 > QT5LOCATION_SITE = $(QT5_SITE)/qtlocation > QT5LOCATION_SITE_METHOD = git > QT5LOCATION_GIT_SUBMODULES = YES > diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash > index cbd94fd111..642625753c 100644 > --- a/package/qt5/qt5lottie/qt5lottie.hash > +++ b/package/qt5/qt5lottie/qt5lottie.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 82336dd063f8bedc28e9545cc8c0123053434d6c681e470434c80ad3908ca4b0 qtlottie-d40b67401afe7156b03c62c9a4d517b07555fe64.tar.bz2 > +sha256 4d8a063687c25675b012821e252a1afd455bdb4ea43e6d79787f9991c68cb5c5 qtlottie-909b79f4810b8ac62baa3544837793cfb132593b.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk > index 42a920582a..d4ad3afc63 100644 > --- a/package/qt5/qt5lottie/qt5lottie.mk > +++ b/package/qt5/qt5lottie/qt5lottie.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5LOTTIE_VERSION = d40b67401afe7156b03c62c9a4d517b07555fe64 > +QT5LOTTIE_VERSION = 909b79f4810b8ac62baa3544837793cfb132593b > QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) > QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 > QT5LOTTIE_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash > index 4803ef9230..7925c4fe05 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.hash > +++ b/package/qt5/qt5multimedia/qt5multimedia.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 842c5be64dafe7a68d2b120e24faffd14af6e4d9d8e9c0aa8bbf4330b3491aa3 qtmultimedia-76f84c545429a1b988b79f971734ef4bc3e6643f.tar.bz2 > +sha256 3f78ede5dcc231d0e92e9907d11fa1d7a7cf506eb73d3f035e8461b57dc692b4 qtmultimedia-b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk > index 0d0f5dd53d..7a56d238f2 100644 > --- a/package/qt5/qt5multimedia/qt5multimedia.mk > +++ b/package/qt5/qt5multimedia/qt5multimedia.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5MULTIMEDIA_VERSION = 76f84c545429a1b988b79f971734ef4bc3e6643f > +QT5MULTIMEDIA_VERSION = b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4 > QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) > QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 > QT5MULTIMEDIA_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > index 05a021e8b2..219dc8d588 100644 > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 e2c7bc6346a8eb4c21510f8fbf7e752648f68a0c5af8525a784e64503570f72c qtquickcontrols-e62b8b6d2f45a79652238b33f4bbe23023004ae7.tar.bz2 > +sha256 8c02691d3eb45b9f144bef64c9705e26e8a4c725a0731b18450d39a589965c49 qtquickcontrols-dcc90558d9c0cba41eec7df290943994289b0e87.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > index 25c1a74f5c..86792ddd8e 100644 > --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5QUICKCONTROLS_VERSION = e62b8b6d2f45a79652238b33f4bbe23023004ae7 > +QT5QUICKCONTROLS_VERSION = dcc90558d9c0cba41eec7df290943994289b0e87 > QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) > QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 > QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > index 88777a5cc3..91fb31a7b7 100644 > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 53caea73e6bdf234cb445067be3bc4e07ed59af7da967638ac598188b719958e qtquickcontrols2-74e8db97fdb9b55c4b4614b83f4bf17e00df55e9.tar.bz2 > +sha256 481220682ce3127711465d6ade22c9ce0e4a4130dd9735344f7464f9147d8f0d qtquickcontrols2-1ce461bd1dc713cd2f79fc16c5454d587b45eefa.tar.bz2 > > # Hashes for license files: > sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > index 1732921203..a2503eb9a3 100644 > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5QUICKCONTROLS2_VERSION = 74e8db97fdb9b55c4b4614b83f4bf17e00df55e9 > +QT5QUICKCONTROLS2_VERSION = 1ce461bd1dc713cd2f79fc16c5454d587b45eefa > QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) > QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 > QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > index a8acf3c5a2..1c9f436b1b 100644 > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 d22637609c4afcc7560d92c894eb55d4afa01706bb5c86499bf56f7c8723a605 qtquicktimeline-87ad61716a7cba5a070d8a7b1756c8b2b48d5d53.tar.bz2 > +sha256 ee404943ef00dbac33928cf001b613ca517fdfdf2767b932a8def5f8c2b0797f qtquicktimeline-b1b4b882dabaa036c3fb73c4a879ba8efbb02ded.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > index de94bd0375..3a8542ab1b 100644 > --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5QUICKTIMELINE_VERSION = 87ad61716a7cba5a070d8a7b1756c8b2b48d5d53 > +QT5QUICKTIMELINE_VERSION = b1b4b882dabaa036c3fb73c4a879ba8efbb02ded > QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) > QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 > QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > index 1b41ab675f..a931ce09cb 100644 > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 ef8e1f64911f7e03da6306693031fdf953af00d453ec154497178bb7ceab1aa2 qtremoteobjects-aa705010da0f658b78c1155babce7091ae44529a.tar.bz2 > +sha256 677b8ccb5c07673296c4fa01bcbc6bd9b8e3a534d332624f61fe0360a5649703 qtremoteobjects-bdc316aca82769b43cb7821c10d80a1ca02b846e.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > index 3160d37ad7..5fea3487a5 100644 > --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5REMOTEOBJECTS_VERSION = aa705010da0f658b78c1155babce7091ae44529a > +QT5REMOTEOBJECTS_VERSION = bdc316aca82769b43cb7821c10d80a1ca02b846e > QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) > QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 > QT5REMOTEOBJECTS_DEPENDENCIES = qt5base > diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash > index f4d52b8a52..0f13743f45 100644 > --- a/package/qt5/qt5scxml/qt5scxml.hash > +++ b/package/qt5/qt5scxml/qt5scxml.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 a0113f54d9df14ebae15dd85530f87f093a284372ee8237d1ccceb02e6a4607b qtscxml-631fd7bcc34802b7650c2b1dc73691463954d982.tar.bz2 > +sha256 d598238bfa3bbbe283a8bd2907a4e8e813e00c522f08297a856e6595bbd44099 qtscxml-e8727aabe55526956295407d27317ec15e12b283.tar.bz2 > > # Hashes for license files: > sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT > diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk > index f6ccb9298e..32ef425e97 100644 > --- a/package/qt5/qt5scxml/qt5scxml.mk > +++ b/package/qt5/qt5scxml/qt5scxml.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SCXML_VERSION = 631fd7bcc34802b7650c2b1dc73691463954d982 > +QT5SCXML_VERSION = e8727aabe55526956295407d27317ec15e12b283 > QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) > QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 > QT5SCXML_DEPENDENCIES = qt5declarative > diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash > index d43fa8ba65..37a23516df 100644 > --- a/package/qt5/qt5sensors/qt5sensors.hash > +++ b/package/qt5/qt5sensors/qt5sensors.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 8325826a259189fc7dea66651df4022a92a73664e953f86bce5bf5946ebacdf5 qtsensors-35eb5ac7eaef4745a38958c3ca780d7baa2e4f30.tar.bz2 > +sha256 f44148d1a21f3959d79f973d8aa233ddfacf37af6e27902fca8c885b91933fcc qtsensors-a41492b23cde20d1e00427d31e4637d06aea3638.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk > index 40bb72e038..29e257fdda 100644 > --- a/package/qt5/qt5sensors/qt5sensors.mk > +++ b/package/qt5/qt5sensors/qt5sensors.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SENSORS_VERSION = 35eb5ac7eaef4745a38958c3ca780d7baa2e4f30 > +QT5SENSORS_VERSION = a41492b23cde20d1e00427d31e4637d06aea3638 > QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) > QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 > QT5SENSORS_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash > index 01ffd7c215..1d1861a4a3 100644 > --- a/package/qt5/qt5serialbus/qt5serialbus.hash > +++ b/package/qt5/qt5serialbus/qt5serialbus.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 fe08415d2348797429dc09722478630ceee3d7477652a2712460e79127b7291b qtserialbus-f9f7eee60adac72fcf6617d164e3bf61222bb5c5.tar.bz2 > +sha256 952b145ae64e03208d7c2a0b0b2b94b928e8998eb72c6762b54e4d9760737dde qtserialbus-c41785c9f36560722b917d373ee97eed8cc4089a.tar.bz2 > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 > diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk > index c718414932..3315ef5be7 100644 > --- a/package/qt5/qt5serialbus/qt5serialbus.mk > +++ b/package/qt5/qt5serialbus/qt5serialbus.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SERIALBUS_VERSION = f9f7eee60adac72fcf6617d164e3bf61222bb5c5 > +QT5SERIALBUS_VERSION = c41785c9f36560722b917d373ee97eed8cc4089a > QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) > QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 > QT5SERIALBUS_DEPENDENCIES = qt5serialport > diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash > index 58461430c7..e95392b880 100644 > --- a/package/qt5/qt5serialport/qt5serialport.hash > +++ b/package/qt5/qt5serialport/qt5serialport.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 6d49d0da174632f51291b0190f6f1db2397a3b339cf293514252766f8a20c63b qtserialport-c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694.tar.bz2 > +sha256 2b7584de148f0b6ea2cf162609d44d7ad3bb893b1995427ceed72cb4562db6d7 qtserialport-3380465d5d4977326616c5e57789a81681be650e.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk > index 7d00bd2ab7..462d1dd7b9 100644 > --- a/package/qt5/qt5serialport/qt5serialport.mk > +++ b/package/qt5/qt5serialport/qt5serialport.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SERIALPORT_VERSION = c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694 > +QT5SERIALPORT_VERSION = 3380465d5d4977326616c5e57789a81681be650e > QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) > QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 > QT5SERIALPORT_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5speech/qt5speech.hash b/package/qt5/qt5speech/qt5speech.hash > index 595aac9f22..3be66a77fe 100644 > --- a/package/qt5/qt5speech/qt5speech.hash > +++ b/package/qt5/qt5speech/qt5speech.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 6d0794ab9d5286d04fbac2db44c00ed3306e569c876f84cfd91ac0e79c834b1e qtspeech-d32f4a479d38a11f547598004b975f4356424a16.tar.bz2 > +sha256 4be0161595806cfc5c9c3160a83d0379269a2813dd4b3ffe2e2a1328f23d8fbc qtspeech-214dcefc7c408e11a3e9fe9d221e4a384e2eaca1.tar.bz2 > > # Hashes for license files: > sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 > diff --git a/package/qt5/qt5speech/qt5speech.mk b/package/qt5/qt5speech/qt5speech.mk > index 8cf6fe19c1..c8054431df 100644 > --- a/package/qt5/qt5speech/qt5speech.mk > +++ b/package/qt5/qt5speech/qt5speech.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SPEECH_VERSION = d32f4a479d38a11f547598004b975f4356424a16 > +QT5SPEECH_VERSION = 214dcefc7c408e11a3e9fe9d221e4a384e2eaca1 > QT5SPEECH_SITE = $(QT5_SITE)/qtspeech/-/archive/$(QT5SPEECH_VERSION) > QT5SPEECH_SOURCE = qtspeech-$(QT5SPEECH_VERSION).tar.bz2 > QT5SPEECH_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash > index 4816206d64..f3e47da5de 100644 > --- a/package/qt5/qt5svg/qt5svg.hash > +++ b/package/qt5/qt5svg/qt5svg.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 063ee53515b934c00a65838fe8521142e4a9161b07c8e19b5bb0ea26a0ce9ab3 qtsvg-a9752b00a03438de8e5b080073816e12409404b7.tar.bz2 > +sha256 6a71029b46e71667f86c48923f0b292c3057ea56b2aedb8aeaa5af70e85e71c3 qtsvg-3385b64df939815e9df5955f991d270d47a5515b.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk > index 2a39ed18fe..c1d019000b 100644 > --- a/package/qt5/qt5svg/qt5svg.mk > +++ b/package/qt5/qt5svg/qt5svg.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5SVG_VERSION = a9752b00a03438de8e5b080073816e12409404b7 > +QT5SVG_VERSION = 3385b64df939815e9df5955f991d270d47a5515b > QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) > QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 > QT5SVG_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash > index d603598257..d4ea0dc047 100644 > --- a/package/qt5/qt5tools/qt5tools.hash > +++ b/package/qt5/qt5tools/qt5tools.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 b6eebbd61dcde981d63ce6de39b3c957bad8f11b0140585ba4d57d166c4dd79d qttools-32912a06aadfc3dcbc34e0a668ce2c78351eee6e.tar.bz2 > +sha256 7214584115d0b89a362c6b0e8586d6228ac138f3ed5e52c97962b8634edbbcfd qttools-ddf6686e9bce7a3232af14a2966b4c895e654f02.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk > index a01a336584..98f3948d17 100644 > --- a/package/qt5/qt5tools/qt5tools.mk > +++ b/package/qt5/qt5tools/qt5tools.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5TOOLS_VERSION = 32912a06aadfc3dcbc34e0a668ce2c78351eee6e > +QT5TOOLS_VERSION = ddf6686e9bce7a3232af14a2966b4c895e654f02 > QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) > QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 > > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > index 60d51fa5fe..89559b63f2 100644 > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 e1e356e81f3a3fb5da6f6739aa475c15aab15090e202de6704441a3bf41c335b qtvirtualkeyboard-9fbb837b55887bec5d73fad142c853ef68db35b3.tar.bz2 > +sha256 c8dfb16614a63e39c714673abe35a7c30107d359356695634af619e62e8ce6cd qtvirtualkeyboard-817378aa10176fd26eed36542bc657e48d9dd42e.tar.bz2 > > # Hashes for license files: > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 > diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > index 49ce71b75e..5657d78c30 100644 > --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5VIRTUALKEYBOARD_VERSION = 9fbb837b55887bec5d73fad142c853ef68db35b3 > +QT5VIRTUALKEYBOARD_VERSION = 817378aa10176fd26eed36542bc657e48d9dd42e > QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) > QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 > QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg > diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash > index c9d7f3434c..f4a1663add 100644 > --- a/package/qt5/qt5wayland/qt5wayland.hash > +++ b/package/qt5/qt5wayland/qt5wayland.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 c881745403a7c3639ee928f64ac9e7252d7a941cb62ef682a7ee83ccf3ae0a60 qtwayland-8faf74a7966b520f0ac3eb4d88235f8ec63b31b8.tar.bz2 > +sha256 d45149cce43ad76f0c8ee43f0469728259d2ab341cf7e2c02ddab6163c5f1d13 qtwayland-b8f1882df7215b6e00f66b7a6a08afafe230de29.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk > index aeca1b0381..4ce89fc46a 100644 > --- a/package/qt5/qt5wayland/qt5wayland.mk > +++ b/package/qt5/qt5wayland/qt5wayland.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5WAYLAND_VERSION = 8faf74a7966b520f0ac3eb4d88235f8ec63b31b8 > +QT5WAYLAND_VERSION = b8f1882df7215b6e00f66b7a6a08afafe230de29 > QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) > QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 > QT5WAYLAND_DEPENDENCIES = wayland > diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash > index b5e9f1a043..7f2a357dbb 100644 > --- a/package/qt5/qt5webchannel/qt5webchannel.hash > +++ b/package/qt5/qt5webchannel/qt5webchannel.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 a281a053471f5c480d7c2679caa0a759e8628f6eafc07c1781f1eb8bb97ee37d qtwebchannel-8c842152da613f941892481d62267c73c4a4f006.tar.bz2 > +sha256 7d482e5140d789b417c359f557da783ed2cc07e8148133971caeb5b48b418645 qtwebchannel-48a520c11a0ef57f2553746159acf739c7f3863d.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk > index 54e6a70ddb..8ba81383d1 100644 > --- a/package/qt5/qt5webchannel/qt5webchannel.mk > +++ b/package/qt5/qt5webchannel/qt5webchannel.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5WEBCHANNEL_VERSION = 8c842152da613f941892481d62267c73c4a4f006 > +QT5WEBCHANNEL_VERSION = 48a520c11a0ef57f2553746159acf739c7f3863d > QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) > QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 > QT5WEBCHANNEL_DEPENDENCIES = qt5websockets > diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash > index 038446a9f4..e0447c70b1 100644 > --- a/package/qt5/qt5webengine/qt5webengine.hash > +++ b/package/qt5/qt5webengine/qt5webengine.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 4a3456df42e1c1b859232b3ee1d58360e629d55daf6e5ad308871142c1b0c2fa qtwebengine-v5.15.10-lts.tar.bz2 > +sha256 e7c9534453472311c06605f2892e038e9920bf10ca3a0dad99b46955ea124618 qtwebengine-v5.15.11-lts.tar.bz2 > > # Locally calculated > sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium > diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash > index 72fbb4a599..fa3cc48995 100644 > --- a/package/qt5/qt5websockets/qt5websockets.hash > +++ b/package/qt5/qt5websockets/qt5websockets.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 00a6d312f2e0ec8c64c12f6a178681d5936ec65bc7f1b85948b58cdb5021a8b6 qtwebsockets-6a4991250793cd38efa5e8db858cd49c82439130.tar.bz2 > +sha256 2e024a4c0706d58a9c846cc1d036f383906e392f3cd7c3051fc56915b7530eee qtwebsockets-50f3853a83ffc80a978cfa0882bdc2859e8de71e.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk > index 4eafb0b212..bb96fefe82 100644 > --- a/package/qt5/qt5websockets/qt5websockets.mk > +++ b/package/qt5/qt5websockets/qt5websockets.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5WEBSOCKETS_VERSION = 6a4991250793cd38efa5e8db858cd49c82439130 > +QT5WEBSOCKETS_VERSION = 50f3853a83ffc80a978cfa0882bdc2859e8de71e > QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) > QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 > QT5WEBSOCKETS_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash > index d928c7cdce..00525dbad2 100644 > --- a/package/qt5/qt5webview/qt5webview.hash > +++ b/package/qt5/qt5webview/qt5webview.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 38f6c0a2863e9144632286b0ef43db506b8631eeff0f8facae14b0da86ca0491 qtwebview-87577dde04ed219bda776dabca86176149736331.tar.bz2 > +sha256 2427179da946d6df409e334c94ffe3f8589035a5d566caf52db2333cc9bfe47c qtwebview-f078642eb9a440f6aa88f2beaf10f445de1e29bb.tar.bz2 > > # Hashes for license files: > sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL > diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk > index a55fd8ae74..01a377c27b 100644 > --- a/package/qt5/qt5webview/qt5webview.mk > +++ b/package/qt5/qt5webview/qt5webview.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5WEBVIEW_VERSION = 87577dde04ed219bda776dabca86176149736331 > +QT5WEBVIEW_VERSION = f078642eb9a440f6aa88f2beaf10f445de1e29bb > QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) > QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 > QT5WEBVIEW_DEPENDENCIES = qt5webengine > diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash > index 87dac8625e..132c28dd96 100644 > --- a/package/qt5/qt5x11extras/qt5x11extras.hash > +++ b/package/qt5/qt5x11extras/qt5x11extras.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 cf9124f3d35f1c8db4e9e47943cb1ec86834abf2be38d70412d0452e64462906 qtx11extras-982f20eb585d77e5b5c721e05a466d7161f7f2d1.tar.bz2 > +sha256 7d99fa4d900207c0ae1c7a514e7dc0b607c04e0232d2842a8d84f52534bd16e6 qtx11extras-5fb2e067a38d3583684310130f5d8aad064f512f.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk > index 80c5498518..a6fade0135 100644 > --- a/package/qt5/qt5x11extras/qt5x11extras.mk > +++ b/package/qt5/qt5x11extras/qt5x11extras.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5X11EXTRAS_VERSION = 982f20eb585d77e5b5c721e05a466d7161f7f2d1 > +QT5X11EXTRAS_VERSION = 5fb2e067a38d3583684310130f5d8aad064f512f > QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) > QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 > QT5X11EXTRAS_INSTALL_STAGING = YES > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > index 353dfc8485..9be7bb7831 100644 > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 067b801049f6fada8e7ebcfbce0530db6217a1a94b8ed34c99c530be4129889d qtxmlpatterns-30e6c84fe2752cde8b53aff9d38c2095cd7c8761.tar.bz2 > +sha256 7770b333f2c0079cf65aa19dafd9e7d80fe058baf8e924f1c0d6e75c0b6e7374 qtxmlpatterns-5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2.tar.bz2 > > # Hashes for license files: > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 > diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > index 803c36cf04..2126d3c915 100644 > --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QT5XMLPATTERNS_VERSION = 30e6c84fe2752cde8b53aff9d38c2095cd7c8761 > +QT5XMLPATTERNS_VERSION = 5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2 > QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) > QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 > QT5XMLPATTERNS_INSTALL_STAGING = YES From arnout at mind.be Fri Feb 9 07:51:49 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 9 Feb 2024 08:51:49 +0100 Subject: [Buildroot] [git commit] package/qt5: bump packages to latest kde submodule versions Message-ID: <20240209075338.E37388770E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ab4a0a348b255a074d16b640e8a372fe94596dc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Bump qt5 packages to latest submodule versions from: https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 Signed-off-by: Sebastian Weyer Signed-off-by: Arnout Vandecappelle --- package/qt5/qt5.mk | 2 +- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/qt5/qt5charts/qt5charts.hash | 2 +- package/qt5/qt5charts/qt5charts.mk | 2 +- package/qt5/qt5connectivity/qt5connectivity.hash | 2 +- package/qt5/qt5connectivity/qt5connectivity.mk | 2 +- package/qt5/qt5declarative/qt5declarative.hash | 2 +- package/qt5/qt5declarative/qt5declarative.mk | 2 +- package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 2 +- package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +- package/qt5/qt5imageformats/qt5imageformats.hash | 2 +- package/qt5/qt5imageformats/qt5imageformats.mk | 2 +- package/qt5/qt5location/qt5location.hash | 2 +- package/qt5/qt5location/qt5location.mk | 2 +- package/qt5/qt5lottie/qt5lottie.hash | 2 +- package/qt5/qt5lottie/qt5lottie.mk | 2 +- package/qt5/qt5multimedia/qt5multimedia.hash | 2 +- package/qt5/qt5multimedia/qt5multimedia.mk | 2 +- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 2 +- package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +- package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 2 +- package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +- package/qt5/qt5quicktimeline/qt5quicktimeline.hash | 2 +- package/qt5/qt5quicktimeline/qt5quicktimeline.mk | 2 +- package/qt5/qt5remoteobjects/qt5remoteobjects.hash | 2 +- package/qt5/qt5remoteobjects/qt5remoteobjects.mk | 2 +- package/qt5/qt5scxml/qt5scxml.hash | 2 +- package/qt5/qt5scxml/qt5scxml.mk | 2 +- package/qt5/qt5sensors/qt5sensors.hash | 2 +- package/qt5/qt5sensors/qt5sensors.mk | 2 +- package/qt5/qt5serialbus/qt5serialbus.hash | 2 +- package/qt5/qt5serialbus/qt5serialbus.mk | 2 +- package/qt5/qt5serialport/qt5serialport.hash | 2 +- package/qt5/qt5serialport/qt5serialport.mk | 2 +- package/qt5/qt5speech/qt5speech.hash | 2 +- package/qt5/qt5speech/qt5speech.mk | 2 +- package/qt5/qt5svg/qt5svg.hash | 2 +- package/qt5/qt5svg/qt5svg.mk | 2 +- package/qt5/qt5tools/qt5tools.hash | 2 +- package/qt5/qt5tools/qt5tools.mk | 2 +- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 2 +- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 2 +- package/qt5/qt5wayland/qt5wayland.hash | 2 +- package/qt5/qt5wayland/qt5wayland.mk | 2 +- package/qt5/qt5webchannel/qt5webchannel.hash | 2 +- package/qt5/qt5webchannel/qt5webchannel.mk | 2 +- package/qt5/qt5webengine/qt5webengine.hash | 2 +- package/qt5/qt5websockets/qt5websockets.hash | 2 +- package/qt5/qt5websockets/qt5websockets.mk | 2 +- package/qt5/qt5webview/qt5webview.hash | 2 +- package/qt5/qt5webview/qt5webview.mk | 2 +- package/qt5/qt5x11extras/qt5x11extras.hash | 2 +- package/qt5/qt5x11extras/qt5x11extras.mk | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 2 +- package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +- 56 files changed, 56 insertions(+), 56 deletions(-) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index b55accacf1..a43b36dd51 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,7 +5,7 @@ ################################################################################ QT5_VERSION_MAJOR = 5.15 -QT5_VERSION = $(QT5_VERSION_MAJOR).10 +QT5_VERSION = $(QT5_VERSION_MAJOR).11 QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 4efc8fa172..ffc474f49e 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 5622a9053154af9a353b8e8be217104c6af068b5b5aba8b07ef4fea2dc79fded qtbase-e44097b63d17ba3178a637df7fac51ddc51cb48b.tar.bz2 +sha256 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 91891a2ec2..fbd882da21 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = e44097b63d17ba3178a637df7fac51ddc51cb48b +QT5BASE_VERSION = da6e958319e95fe564d3b30c931492dd666bfaff QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 QT5BASE_CPE_ID_VENDOR = qt diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index 0688f64615..fec54c86b1 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 9d2ad94a054bd7df08e5d11bc77b6422ccecbf99ea8dd6f06908bafc72ea869d qtcharts-841083c263f16f8acb81e4915bf24bbed0461c9a.tar.bz2 +sha256 66dae46a8bcb1dfc10dd3404296701c41e50658792e4a6a7317a182fad6f36c8 qtcharts-e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index fa69263be4..bfc6021289 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CHARTS_VERSION = 841083c263f16f8acb81e4915bf24bbed0461c9a +QT5CHARTS_VERSION = e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826 QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 1252a73247..776448502b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ec1d91fc35d8b4a333209fb5fd85e00ab77345bff48b60b4e43b804a59f60979 qtconnectivity-c5f35f89e975c2ad58c83c6b606d40ba41057f15.tar.bz2 +sha256 7a44848e113e1d7232c077f9fa8021ab038f59765123920e11936e7d4b8e3c66 qtconnectivity-f0c98c39447894bba493aa91c65053d7f18d68cb.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 72797de1a0..dc5e647e0b 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = c5f35f89e975c2ad58c83c6b606d40ba41057f15 +QT5CONNECTIVITY_VERSION = f0c98c39447894bba493aa91c65053d7f18d68cb QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 0e7978dc58..3db5c94458 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 dbe0cdf84767564a56abf9d0d867c9cfcc754827169357a0f8162309c11882b5 qtdeclarative-b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a.tar.bz2 +sha256 bebd1205aa087f529b8824f0284e127e08672ff7ce36a6b865cd921514ec1192 qtdeclarative-960a980dc885622cb84990c4da75d5060318302d.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 18c1608fca..99c88e7d06 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = b3aaf1482c48bbc0ca4f7c7934597c055afe4b6a +QT5DECLARATIVE_VERSION = 960a980dc885622cb84990c4da75d5060318302d QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 95567b2476..e5fdaf67bf 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 de41af344889d35252fec9a6b6c78e1f67b7a7be15a5d3986b2ec20e2fcafadc qtgraphicaleffects-e6e1e58ec28fd0f2e6426e6962cc4ccddb493349.tar.bz2 +sha256 18afbc24b40420ce0fe6bfad8331f43a1d8c8ec22501b7987ecec9334b69e9a2 qtgraphicaleffects-cce7d784237cd2dd4af1abe2757d048e34e02685.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index f829c67122..ddf805303b 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = e6e1e58ec28fd0f2e6426e6962cc4ccddb493349 +QT5GRAPHICALEFFECTS_VERSION = cce7d784237cd2dd4af1abe2757d048e34e02685 QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 9d821672b3..779db8d109 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8bf646d4db7d0099dd49b7c049a64fb585a3e180d73fc2b6edf22a1384529d1d qtimageformats-9044695f4b1acdd7ec24e7b01f6a6ca61f982a75.tar.bz2 +sha256 bac150b9c5eaf0132a39a0b2a75cfca5400c11f4b8bf60f7362a6e0307f5c19e qtimageformats-6a1af670d52492ab0955933b830026b2a18ed6d6.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 0ce6e4ffb4..27ef05777d 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = 9044695f4b1acdd7ec24e7b01f6a6ca61f982a75 +QT5IMAGEFORMATS_VERSION = 6a1af670d52492ab0955933b830026b2a18ed6d6 QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index f73053f388..0188f51c83 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 90b57a335d8c7311a86865a56b2b9cd944a8a1cafa6a7499de5b35a105c5b247 qt5location-ebdf5b38da6e3fe0a183702bcca395c589c459ed-br1.tar.gz +sha256 133d28fc0071e419682b7ed736c17b39240545c8e9d6ff7e9905f365bb1eb693 qt5location-0ec8f5e82da7369a92824167c4d7331f6c502325-br1.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index 904d31a983..88bf3d289c 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOCATION_VERSION = ebdf5b38da6e3fe0a183702bcca395c589c459ed +QT5LOCATION_VERSION = 0ec8f5e82da7369a92824167c4d7331f6c502325 QT5LOCATION_SITE = $(QT5_SITE)/qtlocation QT5LOCATION_SITE_METHOD = git QT5LOCATION_GIT_SUBMODULES = YES diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index cbd94fd111..642625753c 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 82336dd063f8bedc28e9545cc8c0123053434d6c681e470434c80ad3908ca4b0 qtlottie-d40b67401afe7156b03c62c9a4d517b07555fe64.tar.bz2 +sha256 4d8a063687c25675b012821e252a1afd455bdb4ea43e6d79787f9991c68cb5c5 qtlottie-909b79f4810b8ac62baa3544837793cfb132593b.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index 42a920582a..d4ad3afc63 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOTTIE_VERSION = d40b67401afe7156b03c62c9a4d517b07555fe64 +QT5LOTTIE_VERSION = 909b79f4810b8ac62baa3544837793cfb132593b QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 4803ef9230..7925c4fe05 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 842c5be64dafe7a68d2b120e24faffd14af6e4d9d8e9c0aa8bbf4330b3491aa3 qtmultimedia-76f84c545429a1b988b79f971734ef4bc3e6643f.tar.bz2 +sha256 3f78ede5dcc231d0e92e9907d11fa1d7a7cf506eb73d3f035e8461b57dc692b4 qtmultimedia-b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 0d0f5dd53d..7a56d238f2 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = 76f84c545429a1b988b79f971734ef4bc3e6643f +QT5MULTIMEDIA_VERSION = b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4 QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 05a021e8b2..219dc8d588 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e2c7bc6346a8eb4c21510f8fbf7e752648f68a0c5af8525a784e64503570f72c qtquickcontrols-e62b8b6d2f45a79652238b33f4bbe23023004ae7.tar.bz2 +sha256 8c02691d3eb45b9f144bef64c9705e26e8a4c725a0731b18450d39a589965c49 qtquickcontrols-dcc90558d9c0cba41eec7df290943994289b0e87.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index 25c1a74f5c..86792ddd8e 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = e62b8b6d2f45a79652238b33f4bbe23023004ae7 +QT5QUICKCONTROLS_VERSION = dcc90558d9c0cba41eec7df290943994289b0e87 QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 88777a5cc3..91fb31a7b7 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 53caea73e6bdf234cb445067be3bc4e07ed59af7da967638ac598188b719958e qtquickcontrols2-74e8db97fdb9b55c4b4614b83f4bf17e00df55e9.tar.bz2 +sha256 481220682ce3127711465d6ade22c9ce0e4a4130dd9735344f7464f9147d8f0d qtquickcontrols2-1ce461bd1dc713cd2f79fc16c5454d587b45eefa.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index 1732921203..a2503eb9a3 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = 74e8db97fdb9b55c4b4614b83f4bf17e00df55e9 +QT5QUICKCONTROLS2_VERSION = 1ce461bd1dc713cd2f79fc16c5454d587b45eefa QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index a8acf3c5a2..1c9f436b1b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 d22637609c4afcc7560d92c894eb55d4afa01706bb5c86499bf56f7c8723a605 qtquicktimeline-87ad61716a7cba5a070d8a7b1756c8b2b48d5d53.tar.bz2 +sha256 ee404943ef00dbac33928cf001b613ca517fdfdf2767b932a8def5f8c2b0797f qtquicktimeline-b1b4b882dabaa036c3fb73c4a879ba8efbb02ded.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index de94bd0375..3a8542ab1b 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = 87ad61716a7cba5a070d8a7b1756c8b2b48d5d53 +QT5QUICKTIMELINE_VERSION = b1b4b882dabaa036c3fb73c4a879ba8efbb02ded QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index 1b41ab675f..a931ce09cb 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ef8e1f64911f7e03da6306693031fdf953af00d453ec154497178bb7ceab1aa2 qtremoteobjects-aa705010da0f658b78c1155babce7091ae44529a.tar.bz2 +sha256 677b8ccb5c07673296c4fa01bcbc6bd9b8e3a534d332624f61fe0360a5649703 qtremoteobjects-bdc316aca82769b43cb7821c10d80a1ca02b846e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index 3160d37ad7..5fea3487a5 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = aa705010da0f658b78c1155babce7091ae44529a +QT5REMOTEOBJECTS_VERSION = bdc316aca82769b43cb7821c10d80a1ca02b846e QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index f4d52b8a52..0f13743f45 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a0113f54d9df14ebae15dd85530f87f093a284372ee8237d1ccceb02e6a4607b qtscxml-631fd7bcc34802b7650c2b1dc73691463954d982.tar.bz2 +sha256 d598238bfa3bbbe283a8bd2907a4e8e813e00c522f08297a856e6595bbd44099 qtscxml-e8727aabe55526956295407d27317ec15e12b283.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index f6ccb9298e..32ef425e97 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SCXML_VERSION = 631fd7bcc34802b7650c2b1dc73691463954d982 +QT5SCXML_VERSION = e8727aabe55526956295407d27317ec15e12b283 QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index d43fa8ba65..37a23516df 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8325826a259189fc7dea66651df4022a92a73664e953f86bce5bf5946ebacdf5 qtsensors-35eb5ac7eaef4745a38958c3ca780d7baa2e4f30.tar.bz2 +sha256 f44148d1a21f3959d79f973d8aa233ddfacf37af6e27902fca8c885b91933fcc qtsensors-a41492b23cde20d1e00427d31e4637d06aea3638.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index 40bb72e038..29e257fdda 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SENSORS_VERSION = 35eb5ac7eaef4745a38958c3ca780d7baa2e4f30 +QT5SENSORS_VERSION = a41492b23cde20d1e00427d31e4637d06aea3638 QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 01ffd7c215..1d1861a4a3 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fe08415d2348797429dc09722478630ceee3d7477652a2712460e79127b7291b qtserialbus-f9f7eee60adac72fcf6617d164e3bf61222bb5c5.tar.bz2 +sha256 952b145ae64e03208d7c2a0b0b2b94b928e8998eb72c6762b54e4d9760737dde qtserialbus-c41785c9f36560722b917d373ee97eed8cc4089a.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index c718414932..3315ef5be7 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALBUS_VERSION = f9f7eee60adac72fcf6617d164e3bf61222bb5c5 +QT5SERIALBUS_VERSION = c41785c9f36560722b917d373ee97eed8cc4089a QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 58461430c7..e95392b880 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6d49d0da174632f51291b0190f6f1db2397a3b339cf293514252766f8a20c63b qtserialport-c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694.tar.bz2 +sha256 2b7584de148f0b6ea2cf162609d44d7ad3bb893b1995427ceed72cb4562db6d7 qtserialport-3380465d5d4977326616c5e57789a81681be650e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 7d00bd2ab7..462d1dd7b9 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALPORT_VERSION = c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694 +QT5SERIALPORT_VERSION = 3380465d5d4977326616c5e57789a81681be650e QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5speech/qt5speech.hash b/package/qt5/qt5speech/qt5speech.hash index 595aac9f22..3be66a77fe 100644 --- a/package/qt5/qt5speech/qt5speech.hash +++ b/package/qt5/qt5speech/qt5speech.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6d0794ab9d5286d04fbac2db44c00ed3306e569c876f84cfd91ac0e79c834b1e qtspeech-d32f4a479d38a11f547598004b975f4356424a16.tar.bz2 +sha256 4be0161595806cfc5c9c3160a83d0379269a2813dd4b3ffe2e2a1328f23d8fbc qtspeech-214dcefc7c408e11a3e9fe9d221e4a384e2eaca1.tar.bz2 # Hashes for license files: sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 diff --git a/package/qt5/qt5speech/qt5speech.mk b/package/qt5/qt5speech/qt5speech.mk index 8cf6fe19c1..c8054431df 100644 --- a/package/qt5/qt5speech/qt5speech.mk +++ b/package/qt5/qt5speech/qt5speech.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SPEECH_VERSION = d32f4a479d38a11f547598004b975f4356424a16 +QT5SPEECH_VERSION = 214dcefc7c408e11a3e9fe9d221e4a384e2eaca1 QT5SPEECH_SITE = $(QT5_SITE)/qtspeech/-/archive/$(QT5SPEECH_VERSION) QT5SPEECH_SOURCE = qtspeech-$(QT5SPEECH_VERSION).tar.bz2 QT5SPEECH_INSTALL_STAGING = YES diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 4816206d64..f3e47da5de 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 063ee53515b934c00a65838fe8521142e4a9161b07c8e19b5bb0ea26a0ce9ab3 qtsvg-a9752b00a03438de8e5b080073816e12409404b7.tar.bz2 +sha256 6a71029b46e71667f86c48923f0b292c3057ea56b2aedb8aeaa5af70e85e71c3 qtsvg-3385b64df939815e9df5955f991d270d47a5515b.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index 2a39ed18fe..c1d019000b 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SVG_VERSION = a9752b00a03438de8e5b080073816e12409404b7 +QT5SVG_VERSION = 3385b64df939815e9df5955f991d270d47a5515b QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index d603598257..d4ea0dc047 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b6eebbd61dcde981d63ce6de39b3c957bad8f11b0140585ba4d57d166c4dd79d qttools-32912a06aadfc3dcbc34e0a668ce2c78351eee6e.tar.bz2 +sha256 7214584115d0b89a362c6b0e8586d6228ac138f3ed5e52c97962b8634edbbcfd qttools-ddf6686e9bce7a3232af14a2966b4c895e654f02.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index a01a336584..98f3948d17 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5TOOLS_VERSION = 32912a06aadfc3dcbc34e0a668ce2c78351eee6e +QT5TOOLS_VERSION = ddf6686e9bce7a3232af14a2966b4c895e654f02 QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 60d51fa5fe..89559b63f2 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e1e356e81f3a3fb5da6f6739aa475c15aab15090e202de6704441a3bf41c335b qtvirtualkeyboard-9fbb837b55887bec5d73fad142c853ef68db35b3.tar.bz2 +sha256 c8dfb16614a63e39c714673abe35a7c30107d359356695634af619e62e8ce6cd qtvirtualkeyboard-817378aa10176fd26eed36542bc657e48d9dd42e.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 49ce71b75e..5657d78c30 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = 9fbb837b55887bec5d73fad142c853ef68db35b3 +QT5VIRTUALKEYBOARD_VERSION = 817378aa10176fd26eed36542bc657e48d9dd42e QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index c9d7f3434c..f4a1663add 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c881745403a7c3639ee928f64ac9e7252d7a941cb62ef682a7ee83ccf3ae0a60 qtwayland-8faf74a7966b520f0ac3eb4d88235f8ec63b31b8.tar.bz2 +sha256 d45149cce43ad76f0c8ee43f0469728259d2ab341cf7e2c02ddab6163c5f1d13 qtwayland-b8f1882df7215b6e00f66b7a6a08afafe230de29.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index aeca1b0381..4ce89fc46a 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WAYLAND_VERSION = 8faf74a7966b520f0ac3eb4d88235f8ec63b31b8 +QT5WAYLAND_VERSION = b8f1882df7215b6e00f66b7a6a08afafe230de29 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index b5e9f1a043..7f2a357dbb 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a281a053471f5c480d7c2679caa0a759e8628f6eafc07c1781f1eb8bb97ee37d qtwebchannel-8c842152da613f941892481d62267c73c4a4f006.tar.bz2 +sha256 7d482e5140d789b417c359f557da783ed2cc07e8148133971caeb5b48b418645 qtwebchannel-48a520c11a0ef57f2553746159acf739c7f3863d.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 54e6a70ddb..8ba81383d1 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = 8c842152da613f941892481d62267c73c4a4f006 +QT5WEBCHANNEL_VERSION = 48a520c11a0ef57f2553746159acf739c7f3863d QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 038446a9f4..e0447c70b1 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4a3456df42e1c1b859232b3ee1d58360e629d55daf6e5ad308871142c1b0c2fa qtwebengine-v5.15.10-lts.tar.bz2 +sha256 e7c9534453472311c06605f2892e038e9920bf10ca3a0dad99b46955ea124618 qtwebengine-v5.15.11-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 72fbb4a599..fa3cc48995 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 00a6d312f2e0ec8c64c12f6a178681d5936ec65bc7f1b85948b58cdb5021a8b6 qtwebsockets-6a4991250793cd38efa5e8db858cd49c82439130.tar.bz2 +sha256 2e024a4c0706d58a9c846cc1d036f383906e392f3cd7c3051fc56915b7530eee qtwebsockets-50f3853a83ffc80a978cfa0882bdc2859e8de71e.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index 4eafb0b212..bb96fefe82 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = 6a4991250793cd38efa5e8db858cd49c82439130 +QT5WEBSOCKETS_VERSION = 50f3853a83ffc80a978cfa0882bdc2859e8de71e QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index d928c7cdce..00525dbad2 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 38f6c0a2863e9144632286b0ef43db506b8631eeff0f8facae14b0da86ca0491 qtwebview-87577dde04ed219bda776dabca86176149736331.tar.bz2 +sha256 2427179da946d6df409e334c94ffe3f8589035a5d566caf52db2333cc9bfe47c qtwebview-f078642eb9a440f6aa88f2beaf10f445de1e29bb.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index a55fd8ae74..01a377c27b 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBVIEW_VERSION = 87577dde04ed219bda776dabca86176149736331 +QT5WEBVIEW_VERSION = f078642eb9a440f6aa88f2beaf10f445de1e29bb QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index 87dac8625e..132c28dd96 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 cf9124f3d35f1c8db4e9e47943cb1ec86834abf2be38d70412d0452e64462906 qtx11extras-982f20eb585d77e5b5c721e05a466d7161f7f2d1.tar.bz2 +sha256 7d99fa4d900207c0ae1c7a514e7dc0b607c04e0232d2842a8d84f52534bd16e6 qtx11extras-5fb2e067a38d3583684310130f5d8aad064f512f.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 80c5498518..a6fade0135 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = 982f20eb585d77e5b5c721e05a466d7161f7f2d1 +QT5X11EXTRAS_VERSION = 5fb2e067a38d3583684310130f5d8aad064f512f QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 353dfc8485..9be7bb7831 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 067b801049f6fada8e7ebcfbce0530db6217a1a94b8ed34c99c530be4129889d qtxmlpatterns-30e6c84fe2752cde8b53aff9d38c2095cd7c8761.tar.bz2 +sha256 7770b333f2c0079cf65aa19dafd9e7d80fe058baf8e924f1c0d6e75c0b6e7374 qtxmlpatterns-5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 803c36cf04..2126d3c915 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = 30e6c84fe2752cde8b53aff9d38c2095cd7c8761 +QT5XMLPATTERNS_VERSION = 5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2 QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES From sebastien.szymanski at armadeus.com Fri Feb 9 09:29:13 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Fri, 9 Feb 2024 10:29:13 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> Message-ID: Hi Arnout, On 2/8/24 23:36, Arnout Vandecappelle wrote: > ?Hi Se?bastien, > > ?It's no fun that I still have questions on v5, but unfortunately... > > On 08/02/2024 13:54, S?bastien Szymanski wrote: >> This commit adds i.MX91 and i.MX93 support to Buildroot. >> https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors:IMX9-PROCESSORS >> >> There is no i.MX95 software provided by NXP at the moment that's why >> i.MX95 is left behind. >> >> Adapt package firmware-imx for the LPPDR4 firwmares binaries. >> >> Reviewed-by: Gary Bisson >> Signed-off-by: S?bastien Szymanski > > [snip] >> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 >> +??? bool "imx91" >> + >> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> +??? bool "imx93" >> + >> +endchoice >> + >> +choice >> +??? prompt "i.MX Silicon Revision" >> +??? default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 \ >> +??????? if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 >> +??? default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 \ >> +??????? if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> +??? help >> +????? Some packages related to the selected i.MX platform need to >> know the >> +????? silicon revision of the platform they will run on. >> +????? If you don't know, leave the default value. >> + >> +????? Note - mismatches may result in a failure to boot! > > ?This sentence conflicts with "If you don't know, leave the default > value"... So I think that "If you don't know" sentence should be dropped. > ok. >> + >> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 >> +??? bool "imx91a1" >> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > > ?Since for IMX91 there is only one option, I think it makes more sense > to not offer a choice for this. Just always use this one for the IMX91. > We can still add it back if there ever turns out to be an imx91a2. > >> + >> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 >> +??? bool "imx93a0" >> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> + >> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 >> +??? bool "imx93a1" >> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> + >> ? endchoice > > [snip] >> @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION >> ????? # unconditionally use HW version 201810 when DDR3/DDR4 was >> ????? # selected >> ????? default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || >> BR2_PACKAGE_FIRMWARE_IMX_DDR4 >> +??? default "v202201" if \ > > ?For the time being, there is only one version for the IMX91/3. So it > makes no sense to give an option for it. (In fact, this really should > have been a choice instead of a string option because there are only a > fixed set of options... But that's a separate topic.) > > ?By the way, do these SoCs use the plain 202006 version for DDR4 like > the other SoCs? And do they also support DDR3? The i.MX9{1,3} SoCs don't support DDR4 and DDR3... Only LPDDR4 or LPDDR4X, hence my changes below BR2_PACKAGE_FIRMWARE_IMX_DDR{3,4} options. > >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> ????? help >> ??????? Use a specific version of the imx ddr binaries. Leaving this >> ??????? field empty will select the default version. >> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk >> b/package/freescale-imx/firmware-imx/firmware-imx.mk >> index 66ef8c3930be..1f36f917cdc8 100644 >> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk >> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk >> @@ -48,6 +48,30 @@ endif >> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) >> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >> +ifeq >> ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) > > ?To make the conditions more symmetrical/regular, perhaps it's better > to create a new BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X option and encode > the platform conditions there. The prompt would be the same for > BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 and for > BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X ("lpddr4" for both).? But perhaps > I'm overthinking things. I don't see the benefits to do so. Also, i.MX95 supports LPPDR5. > >> +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >> +??? # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate >> lpddr4_fw.bin. >> +??? # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin >> +??? # which is done in post-image script. >> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >> +??????? lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >> +??????? lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > > ?So the v202201 could be hardcoded here. > >> +??????? lpddr4_1d_fw) >> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >> +??????? lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >> +??????? lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >> +??????? lpddr4_2d_fw) >> +??? cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ >> +??????? $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ >> +??????? $(BINARIES_DIR)/lpddr4_fw.bin >> +??? ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin >> + >> +??? # U-Boot supports creation of the combined flash.bin image. To make >> +??? # sure that U-Boot can access all available files copy them to >> +??? # the binary dir. >> +??? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ > > ?We now have 3 instances of this exact same code block with only the > file names that differ, so perhaps it's time to factor this into a > second helper function. Or better, define a few auxiliary variables > FIRMWARE_IMX_DDRFW_IMEM_1D, FIRMWARE_IMX_DDRFW_DMEM_1D etc that are set > for each variant, and then one definition of > FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW that uses those variables. > > ?If that sounds too complex, don't worry, it's just a "niceification" > so not really necessary to do. This should done be in a separated patch, right ? > > ?In fact, the only of my comments above that is really important is > dropping BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1. ok ! Regards, > > ?Regards, > ?Arnout > >> +endef >> +else >> ? define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >> ????? # Create padded versions of lpddr4_pmu_* and generate >> lpddr4_pmu_train_fw.bin. >> ????? # lpddr4_pmu_train_fw.bin is needed when generating >> imx8-boot-sd.bin >> @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >> ????? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ >> ? endef >> ? endif >> +endif >> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) >> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >> -- S?bastien Szymanski, Armadeus Systems Software engineer From sebastien.szymanski at armadeus.com Fri Feb 9 09:34:51 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Fri, 9 Feb 2024 10:34:51 +0100 Subject: [Buildroot] [PATCH v5 2/3] package/freescale-imx/firmware-ele-imx: new package In-Reply-To: <7cc235a5-b0ee-4517-a4ce-941e6f868c19@mind.be> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> <7cc235a5-b0ee-4517-a4ce-941e6f868c19@mind.be> Message-ID: <02fc9dc6-4cc4-4bac-a5d8-218c1ed04446@armadeus.com> Hi Arnout, On 2/8/24 23:43, Arnout Vandecappelle wrote: > > > On 08/02/2024 13:54, S?bastien Szymanski wrote: >> This package provides firmware blobs for the Edgelock Secure >> Enclave (ELE) [1] present on i.MX8ULP and i.MX9 Socs. >> This version comes from the 6.1.55-2.2.0 release. >> >> [1] >> https://www.nxp.com/products/nxp-product-information/nxp-product-programs/edgelock-secure-enclave:EDGELOCK-SECURE-ENCLAVE >> >> Reviewed-by: Gary Bisson >> Signed-off-by: S?bastien Szymanski >> --- >> Changes for v5: >> ? - none >> >> Changes for v4: >> ? - move i.MX Silicon Revision changes into first patch (Gary Bisson) >> >> Changes for v3: >> ? - rename package from firmware-sentinel to package firmware-ele-imx >> >> Changes for v2: >> ? - none >> --- >> ? package/freescale-imx/Config.in??????????????????? |? 1 + >> ? package/freescale-imx/firmware-ele-imx/Config.in?? | 21 >> +++++++++++++++++ >> ? .../firmware-ele-imx/firmware-ele-imx.hash???????? |? 4 ++++ >> ? .../firmware-ele-imx/firmware-ele-imx.mk?????????? | 27 >> ++++++++++++++++++++++ >> ? 4 files changed, 53 insertions(+) >> >> diff --git a/package/freescale-imx/Config.in >> b/package/freescale-imx/Config.in >> index ba169ead18cb..f12acc3bd024 100644 >> --- a/package/freescale-imx/Config.in >> +++ b/package/freescale-imx/Config.in >> @@ -154,6 +154,7 @@ source "package/freescale-imx/imx-uuc/Config.in" >> ? source "package/freescale-imx/imx-vpu/Config.in" >> ? source "package/freescale-imx/imx-vpu-hantro/Config.in" >> ? source "package/freescale-imx/imx-vpuwrap/Config.in" >> +source "package/freescale-imx/firmware-ele-imx/Config.in" >> ? source "package/freescale-imx/firmware-imx/Config.in" >> ? source "package/freescale-imx/imx-sc-firmware/Config.in" >> ? source "package/freescale-imx/imx-seco/Config.in" >> diff --git a/package/freescale-imx/firmware-ele-imx/Config.in >> b/package/freescale-imx/firmware-ele-imx/Config.in >> new file mode 100644 >> index 000000000000..7867c3712c9c >> --- /dev/null >> +++ b/package/freescale-imx/firmware-ele-imx/Config.in >> @@ -0,0 +1,21 @@ >> +config BR2_PACKAGE_FIRMWARE_ELE_IMX >> +??? bool "firmware-ele-imx" >> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >> +??? help >> +????? Firmware blobs for the Edgelock Secure Enclave (ELE) > > ?ELE, not ELSE? Weird... Following NXP here... > >> +????? present on i.MX8ULP and i.MX9 SoCs. > > ?I guess we simply don't have support for i.MX8ULP yet in Buildroot? Nope, not yet. > > ?Perhaps it's better to create a BR2_PACKAGE_FREESCALE_IMX_HAS_ELE > option in freescale-imx/Config.in > >> + >> +????? This library is provided by NXP as-is and doesn't have an >> +????? upstream. >> + >> +if BR2_PACKAGE_FIRMWARE_ELE_IMX >> + >> +config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE >> +??? string >> +??? default "mx93a0-ahab-container.img" if >> BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 >> +??? default "mx93a1-ahab-container.img" if \ >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 || \ > > ?So i.MX91 uses the mx93 image? Weird... Yes, there is no specific files for i.MX91 in the package. Regards, > > ?Regards, > ?Arnout > > >> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 >> + >> +endif # BR2_PACKAGE_FIRMWARE_ELE_IMX >> diff --git >> a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash >> b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash >> new file mode 100644 >> index 000000000000..58565cef43e9 >> --- /dev/null >> +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash >> @@ -0,0 +1,4 @@ >> +# Locally calculated >> +sha256 >> 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca >> firmware-ele-imx-0.1.0.bin >> +sha256 >> 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84? COPYING >> +sha256 >> c800aaca3a7e9f470d99d7cde0a48c95982ed601d4c306f7b8f43f3710054f28? 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 >> new file mode 100644 >> index 000000000000..600b50c5b456 >> --- /dev/null >> +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk >> @@ -0,0 +1,27 @@ >> +################################################################################ >> +# >> +# firmware-ele-imx >> +# >> +################################################################################ >> + >> +FIRMWARE_ELE_IMX_VERSION = 0.1.0 >> +FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) >> +FIRMWARE_ELE_IMX_SOURCE = >> firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin >> + >> +FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement >> +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING SCR.txt >> +FIRMWARE_ELE_IMX_REDISTRIBUTE = NO >> + >> +FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES >> + >> +define FIRMWARE_ELE_IMX_EXTRACT_CMDS >> +??? $(call >> NXP_EXTRACT_HELPER,$(FIRMWARE_ELE_IMX_DL_DIR)/$(FIRMWARE_ELE_IMX_SOURCE)) >> +endef >> + >> +FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE = $(call >> qstrip,$(BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE)) >> + >> +define FIRMWARE_ELE_IMX_INSTALL_IMAGES_CMDS >> +??? cp $(@D)/$(FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE) >> $(BINARIES_DIR)/ahab-container.img >> +endef >> + >> +$(eval $(generic-package)) >> -- S?bastien Szymanski, Armadeus Systems Software engineer From arnout at mind.be Fri Feb 9 10:25:39 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 9 Feb 2024 11:25:39 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> Message-ID: <6211cb6a-632a-404a-94c8-998f499c7cf2@mind.be> On 09/02/2024 10:29, S?bastien Szymanski wrote: > Hi Arnout, > > On 2/8/24 23:36, Arnout Vandecappelle wrote: >> ??Hi Se?bastien, >> >> ??It's no fun that I still have questions on v5, but unfortunately... I'll see this weekend if I can merge v5 with the feedback you give below. Unless you send a v6 before that of course! [snip] >>> + >>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 >>> +??? bool "imx91a1" >>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 >> >> ??Since for IMX91 there is only one option, I think it makes more sense to not >> offer a choice for this. Just always use this one for the IMX91. We can still >> add it back if there ever turns out to be an imx91a2. This is actually the main thing I wanted confirmation about from you... Do you agree that we only need the revision option for IMX93, not for IMX91? >> >>> + >>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 >>> +??? bool "imx93a0" >>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>> + >>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 >>> +??? bool "imx93a1" >>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>> + >>> ? endchoice >> >> [snip] >>> @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION >>> ????? # unconditionally use HW version 201810 when DDR3/DDR4 was >>> ????? # selected >>> ????? default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || >>> BR2_PACKAGE_FIRMWARE_IMX_DDR4 >>> +??? default "v202201" if \ >> >> ??For the time being, there is only one version for the IMX91/3. So it makes >> no sense to give an option for it. (In fact, this really should have been a >> choice instead of a string option because there are only a fixed set of >> options... But that's a separate topic.) >> >> ??By the way, do these SoCs use the plain 202006 version for DDR4 like the >> other SoCs? And do they also support DDR3? > > The i.MX9{1,3} SoCs don't support DDR4 and DDR3... Only LPDDR4 or LPDDR4X, hence > my changes below BR2_PACKAGE_FIRMWARE_IMX_DDR{3,4} options. Oh, I missed that. So for IMX9 there is no actual choice, it's always LPDDR4 (because we have no LPDDR4X option at the moment, and there also doesn't seem to be any firmware for it...)? >>> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ >>> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>> ????? help >>> ??????? Use a specific version of the imx ddr binaries. Leaving this >>> ??????? field empty will select the default version. >>> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk >>> b/package/freescale-imx/firmware-imx/firmware-imx.mk >>> index 66ef8c3930be..1f36f917cdc8 100644 >>> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk >>> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk >>> @@ -48,6 +48,30 @@ endif >>> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) >>> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >>> +ifeq >>> ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) >> >> ??To make the conditions more symmetrical/regular, perhaps it's better to >> create a new BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X option and encode the >> platform conditions there. The prompt would be the same for >> BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 and for BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X >> ("lpddr4" for both).? But perhaps I'm overthinking things. > > I don't see the benefits to do so. Also, i.MX95 supports LPPDR5. But there also doesn't seem to be firmware for LPDDR5? >>> +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>> +??? # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate >>> lpddr4_fw.bin. >>> +??? # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin >>> +??? # which is done in post-image script. >>> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >>> +??????? lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>> +??????? lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >> >> ??So the v202201 could be hardcoded here. >> >>> +??????? lpddr4_1d_fw) >>> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >>> +??????? lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>> +??????? lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>> +??????? lpddr4_2d_fw) >>> +??? cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ >>> +??????? $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ >>> +??????? $(BINARIES_DIR)/lpddr4_fw.bin >>> +??? ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin >>> + >>> +??? # U-Boot supports creation of the combined flash.bin image. To make >>> +??? # sure that U-Boot can access all available files copy them to >>> +??? # the binary dir. >>> +??? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ >> >> ??We now have 3 instances of this exact same code block with only the file >> names that differ, so perhaps it's time to factor this into a second helper >> function. Or better, define a few auxiliary variables >> FIRMWARE_IMX_DDRFW_IMEM_1D, FIRMWARE_IMX_DDRFW_DMEM_1D etc that are set for >> each variant, and then one definition of FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >> that uses those variables. >> >> ??If that sounds too complex, don't worry, it's just a "niceification" so not >> really necessary to do. > > This should done be in a separated patch, right ? Yes, I think it's better to merge this series pretty much as is (except for dropping IMX91A1), and then do a refactoring patch seperately. I actually have a bunch more refactoring ideas, so perhaps it's better if I make a PoC patch of my ideas and you fix up all the mistakes I make in it? Regards, Arnout > >> >> ??In fact, the only of my comments above that is really important is dropping >> BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1. > > ok ! > > Regards, > >> >> ??Regards, >> ??Arnout >> >>> +endef >>> +else >>> ? define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>> ????? # Create padded versions of lpddr4_pmu_* and generate >>> lpddr4_pmu_train_fw.bin. >>> ????? # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin >>> @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>> ????? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ >>> ? endef >>> ? endif >>> +endif >>> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) >>> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >>> > From buildroot at bubu1.eu Fri Feb 9 10:25:55 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Fri, 9 Feb 2024 11:25:55 +0100 Subject: [Buildroot] [PATCH] package/python-jc: new package Message-ID: <20240209102556.2020962-1-buildroot@bubu1.eu> This version still requires xmltodict and pyexpat for the cli tool to work correctly but this should become optional in a future release. [1] The other dependencies are already optional and this only mentioned in the package's help text. [2] [1] https://github.com/kellyjonbrazil/jc/issues/537 [2] https://github.com/kellyjonbrazil/jc/issues/108 Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/python-jc/Config.in | 12 ++++++++++ package/python-jc/python-jc.hash | 5 +++++ package/python-jc/python-jc.mk | 14 ++++++++++++ .../testing/tests/package/test_python_jc.py | 22 +++++++++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 package/python-jc/Config.in create mode 100644 package/python-jc/python-jc.hash create mode 100644 package/python-jc/python-jc.mk create mode 100644 support/testing/tests/package/test_python_jc.py diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..7f4d0740ac 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1151,6 +1151,7 @@ menu "External python modules" source "package/python-janus/Config.in" source "package/python-jaraco-classes/Config.in" source "package/python-jaraco-functools/Config.in" + source "package/python-jc/Config.in" source "package/python-jedi/Config.in" source "package/python-jeepney/Config.in" source "package/python-jinja2/Config.in" diff --git a/package/python-jc/Config.in b/package/python-jc/Config.in new file mode 100644 index 0000000000..ec1f855b8c --- /dev/null +++ b/package/python-jc/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_JC + bool "python-jc" + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON_XMLTODICT + help + Converts the output of popular command-line tools and file- + types to JSON. + + Optionally requires python-pygments for syntax highlighting, + python-ruamel-yaml for yaml parsing and output. + + https://github.com/kellyjonbrazil/jc diff --git a/package/python-jc/python-jc.hash b/package/python-jc/python-jc.hash new file mode 100644 index 0000000000..b06c660a51 --- /dev/null +++ b/package/python-jc/python-jc.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jc/json +md5 dffc3f8e92e4c535f5653641abfa5397 jc-1.25.0.tar.gz +sha256 eba4aaaf5128f18a16121c0bcfc1b794fc80b665ee97f6a25da9c156559da54e jc-1.25.0.tar.gz +# Locally computed sha256 checksums +sha256 6493f2db400f4166ca0956cf192a41aa092bd1396ff463e7fdaf51f257c10497 LICENSE.md diff --git a/package/python-jc/python-jc.mk b/package/python-jc/python-jc.mk new file mode 100644 index 0000000000..872c1aa377 --- /dev/null +++ b/package/python-jc/python-jc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jc +# +################################################################################ + +PYTHON_JC_VERSION = 1.25.0 +PYTHON_JC_SOURCE = jc-$(PYTHON_JC_VERSION).tar.gz +PYTHON_JC_SITE = https://files.pythonhosted.org/packages/b7/42/be8a1d0410bfddc1a30c06d77d06a1856c49fb18ec5545474a6f17dc3399 +PYTHON_JC_SETUP_TYPE = setuptools +PYTHON_JC_LICENSE = MIT +PYTHON_JC_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_jc.py b/support/testing/tests/package/test_python_jc.py new file mode 100644 index 0000000000..6c7fb34cac --- /dev/null +++ b/support/testing/tests/package/test_python_jc.py @@ -0,0 +1,22 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonJc(TestPythonPackageBase): + __test__ = True + # We deliberately run the test without the optional dependencies, + # as this configuration is less tested upstream. + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_JC=y + """ + timeout = 60 + + def test_run(self): + self.login() + cmd = "jc -h > /dev/null 2>&1" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc id | grep -q root" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc env | grep -q PATH" + self.assertRunOk(cmd, self.timeout) -- 2.34.1 From sebastian.weyer at smile.fr Fri Feb 9 10:47:04 2024 From: sebastian.weyer at smile.fr (Sebastian Weyer) Date: Fri, 9 Feb 2024 11:47:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt5doc: bump to latest kde submodule version Message-ID: <20240209104705.1825396-1-sebastian.weyer@smile.fr> Bump qt5doc that was missing from the latest version bump to latest submodule versions from: https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15 Signed-off-by: Sebastian Weyer --- This was not the only package that was not touched in the latest update of the submodule versions. Here is a list of the missing packages and the reason why it hasn't been updated: - qt53d: does not compile qgltf.cpp:29:10: fatal error: assimp/Importer.hpp: No such file or directory 29 | #include - qt5coap: no tag 5.15.11, last one 5.15.2, already at latest version - qt5enginio: no tag 5.15.11, last one 5.6.3, already at latest version - qt5knx: no tag 5.15.11, last one 5.15.2, already at latest version - qt5mqtt: no tag 5.15.11, last one 5.15.2, already at latest version - qt5opcua: no tag 5.15.11, last one 5.15.2, already at latest version - qt5script: already got updated to 5.15.11 during version bump to 5.15.10 in commit 6b23dff9e71786191797d3b41ce80afe659f0396 - qt5webengine-chromium: no tag 5.15.11, last one 5.15.2, already at latest version - qt5webengine-chromium-catapult: no tags in repo, not sure which version corresponds to 5.15.11 - qt5webkit: no tag 5.15.11, last stable version 5.5.0, currently used version 5.212.0-alpha4 Signed-off-by: Sebastian Weyer --- package/qt5/qt5doc/qt5doc.hash | 2 +- package/qt5/qt5doc/qt5doc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5doc/qt5doc.hash b/package/qt5/qt5doc/qt5doc.hash index ec84ecdcb5..13a3167211 100644 --- a/package/qt5/qt5doc/qt5doc.hash +++ b/package/qt5/qt5doc/qt5doc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 87ef0ba72ede78148dfae8fbe78c839f0e9966e1ab4a58d7725041144c0de70f qtdoc-897e90fe304d844beaf694b82a93a50237fa8b9e.tar.bz2 +sha256 1dda7d710bc463cc0d33ad6c88762f5a7fe4606ad9cb73feb24b3c4ea8ab66f5 qtdoc-b7b96305c8cdc23bfd63e77a336802d0d3d99004.tar.bz2 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5doc/qt5doc.mk b/package/qt5/qt5doc/qt5doc.mk index 77845a347f..5dbfafd94a 100644 --- a/package/qt5/qt5doc/qt5doc.mk +++ b/package/qt5/qt5doc/qt5doc.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DOC_VERSION = 897e90fe304d844beaf694b82a93a50237fa8b9e +QT5DOC_VERSION = b7b96305c8cdc23bfd63e77a336802d0d3d99004 QT5DOC_SITE = $(QT5_SITE)/qtdoc/-/archive/$(QT5DOC_VERSION) QT5DOC_SOURCE = qtdoc-$(QT5DOC_VERSION).tar.bz2 QT5DOC_DEPENDENCIES = qt5declarative -- 2.42.0 From arnout at mind.be Fri Feb 9 11:16:24 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 9 Feb 2024 12:16:24 +0100 Subject: [Buildroot] Buildroot on LInkedIn Message-ID: ?Hello all Buildroot users! ?In order to do a bit more marketing for Buildroot, we have created a LinkedIn page for us! ?If you would like to spread the word a little, you can re-post the announcement: https://www.linkedin.com/posts/buildroot_buildroot-finally-has-a-linkedin-presence-activity-7161677759159721985-mCzP?utm_source=share&utm_medium=member_desktop And of course, follow the page :-) Better yet, tell other people (who don't want to be on the mailing list - I'm thinking manager types here) to follow the page. ?Now of course the question is if there will be any content to post... ?Regards, ?Arnout From raphael.melotte at mind.be Fri Feb 9 13:15:45 2024 From: raphael.melotte at mind.be (=?UTF-8?B?UmFwaGHDq2wgTcOpbG90dGU=?=) Date: Fri, 9 Feb 2024 14:15:45 +0100 Subject: [Buildroot] [PATCH 6/6] package/python-pymupdf: bump to version 1.23.9rc2 In-Reply-To: <269f1999-249c-4ede-82a6-6240bc36dbdd@mind.be> References: <20240110093850.2302133-1-james.hilliard1@gmail.com> <20240110093850.2302133-6-james.hilliard1@gmail.com> <454a12aa-fe40-4435-8c6e-5f020d960bb5@mind.be> <269f1999-249c-4ede-82a6-6240bc36dbdd@mind.be> Message-ID: <36c6330f-b003-4649-87c8-a9691e185325@mind.be> Hi Arnout, On 2/8/24 22:29, Arnout Vandecappelle wrote: > ?Hi Raphae?l, > > On 08/02/2024 12:28, Rapha?l M?lotte via buildroot wrote: >> Hi James, all, >> >> Thanks for the patches! >> I added a few comments/questions below. > > ?Your comments actually sound pretty essential, and I think they affect the earlier patches in the series as well. Should I mark the entire series as Changes Requested? The new python-pymupdf version from this series doesn't cross-compile, and updating mupdf alone would also break python-pymupdf (as their versions have to be kept in sync) so to me, yes. > > ?Also, will you work on fixing the issues or should James take it on? I have some idea of what is causing the new build failure for python-pymupdf, I will take care of it (I should be able to do that within the next few days). Kind regards, Rapha?l From sebastien.szymanski at armadeus.com Fri Feb 9 11:09:08 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Fri, 9 Feb 2024 12:09:08 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: <6211cb6a-632a-404a-94c8-998f499c7cf2@mind.be> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> <6211cb6a-632a-404a-94c8-998f499c7cf2@mind.be> Message-ID: Hi Arnout, On 2/9/24 11:25, Arnout Vandecappelle wrote: > > > On 09/02/2024 10:29, S?bastien Szymanski wrote: >> Hi Arnout, >> >> On 2/8/24 23:36, Arnout Vandecappelle wrote: >>> ??Hi Se?bastien, >>> >>> ??It's no fun that I still have questions on v5, but unfortunately... > > ?I'll see this weekend if I can merge v5 with the feedback you give > below. Unless you send a v6 before that of course! > > [snip] >>>> + >>>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 >>>> +??? bool "imx91a1" >>>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 >>> >>> ??Since for IMX91 there is only one option, I think it makes more >>> sense to not offer a choice for this. Just always use this one for >>> the IMX91. We can still add it back if there ever turns out to be an >>> imx91a2. > > ?This is actually the main thing I wanted confirmation about from > you... Do you agree that we only need the revision option for IMX93, not > for IMX91? I don't know :-) I guess there probably are i.MX91A0 out there. Maybe I should add an option for i.MX91A0 ? > >>> >>>> + >>>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 >>>> +??? bool "imx93a0" >>>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>>> + >>>> +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 >>>> +??? bool "imx93a1" >>>> +??? depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>>> + >>>> ? endchoice >>> >>> [snip] >>>> @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION >>>> ????? # unconditionally use HW version 201810 when DDR3/DDR4 was >>>> ????? # selected >>>> ????? default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || >>>> BR2_PACKAGE_FIRMWARE_IMX_DDR4 >>>> +??? default "v202201" if \ >>> >>> ??For the time being, there is only one version for the IMX91/3. So >>> it makes no sense to give an option for it. (In fact, this really >>> should have been a choice instead of a string option because there >>> are only a fixed set of options... But that's a separate topic.) >>> >>> ??By the way, do these SoCs use the plain 202006 version for DDR4 >>> like the other SoCs? And do they also support DDR3? >> >> The i.MX9{1,3} SoCs don't support DDR4 and DDR3... Only LPDDR4 or >> LPDDR4X, hence my changes below BR2_PACKAGE_FIRMWARE_IMX_DDR{3,4} >> options. > > ?Oh, I missed that. So for IMX9 there is no actual choice, it's always > LPDDR4 (because we have no LPDDR4X option at the moment, and there also > doesn't seem to be any firmware for it...)? I don't think LPDDR4X needs a specific firmware. > > >>>> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ >>>> +??????? BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 >>>> ????? help >>>> ??????? Use a specific version of the imx ddr binaries. Leaving this >>>> ??????? field empty will select the default version. >>>> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk >>>> b/package/freescale-imx/firmware-imx/firmware-imx.mk >>>> index 66ef8c3930be..1f36f917cdc8 100644 >>>> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk >>>> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk >>>> @@ -48,6 +48,30 @@ endif >>>> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) >>>> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >>>> +ifeq >>>> ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) >>> >>> ??To make the conditions more symmetrical/regular, perhaps it's >>> better to create a new BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X option >>> and encode the platform conditions there. The prompt would be the >>> same for BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 and for >>> BR2_PACKAGE_FIRMWARE_IMX_LPDDR4_IMX9X ("lpddr4" for both).? But >>> perhaps I'm overthinking things. >> >> I don't see the benefits to do so. Also, i.MX95 supports LPPDR5. > > ?But there also doesn't seem to be firmware for LPDDR5? There is no support for i.MX95 in the latest release from NXP yet. However, I just found out there are two lpddr5*.bin files here: https://github.com/nxp-imx/imx-mkimage/tree/lf-6.1.55_2.2.0/iMX9 :-) > >>>> +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>>> +??? # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and >>>> generate lpddr4_fw.bin. >>>> +??? # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin >>>> +??? # which is done in post-image script. >>>> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >>>> +??????? lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>>> +??????? lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>> >>> ??So the v202201 could be hardcoded here. >>> >>>> +??????? lpddr4_1d_fw) >>>> +??? $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ >>>> +??????? lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>>> +??????? lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), >>>> +??????? lpddr4_2d_fw) >>>> +??? cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ >>>> +??????? $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ >>>> +??????? $(BINARIES_DIR)/lpddr4_fw.bin >>>> +??? ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin >>>> + >>>> +??? # U-Boot supports creation of the combined flash.bin image. To >>>> make >>>> +??? # sure that U-Boot can access all available files copy them to >>>> +??? # the binary dir. >>>> +??? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ >>> >>> ??We now have 3 instances of this exact same code block with only the >>> file names that differ, so perhaps it's time to factor this into a >>> second helper function. Or better, define a few auxiliary variables >>> FIRMWARE_IMX_DDRFW_IMEM_1D, FIRMWARE_IMX_DDRFW_DMEM_1D etc that are >>> set for each variant, and then one definition of >>> FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW that uses those variables. >>> >>> ??If that sounds too complex, don't worry, it's just a >>> "niceification" so not really necessary to do. >> >> This should done be in a separated patch, right ? > > ?Yes, I think it's better to merge this series pretty much as is > (except for dropping IMX91A1), and then do a refactoring patch seperately. > > ?I actually have a bunch more refactoring ideas, so perhaps it's better > if I make a PoC patch of my ideas and you fix up all the mistakes I make > in it? Sure :) Regards, > > > ?Regards, > ?Arnout > > >> >>> >>> ??In fact, the only of my comments above that is really important is >>> dropping BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1. >> >> ok ! >> >> Regards, >> >>> >>> ??Regards, >>> ??Arnout >>> >>>> +endef >>>> +else >>>> ? define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>>> ????? # Create padded versions of lpddr4_pmu_* and generate >>>> lpddr4_pmu_train_fw.bin. >>>> ????? # lpddr4_pmu_train_fw.bin is needed when generating >>>> imx8-boot-sd.bin >>>> @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW >>>> ????? cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ >>>> ? endef >>>> ? endif >>>> +endif >>>> ? ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) >>>> ? FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys >>>> >> -- S?bastien Szymanski, Armadeus Systems Software engineer From dario.binacchi at amarulasolutions.com Fri Feb 9 13:48:01 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Fri, 9 Feb 2024 14:48:01 +0100 Subject: [Buildroot] [PATCH 1/2] configs/ti_am62x_sk_defconfig: explicitly set the kernel version In-Reply-To: <53ee955f-0870-456f-8c46-67fafb8bfff8@benettiengineering.com> References: <20231123134052.239690-1-dario.binacchi@amarulasolutions.com> <63d87792-b361-4915-b3bb-4bbb192a880d@benettiengineering.com> <53ee955f-0870-456f-8c46-67fafb8bfff8@benettiengineering.com> Message-ID: Hi Giulio and Romain, All On Mon, Feb 5, 2024 at 4:34?PM Giulio Benetti wrote: > > Dario, > > I've also tried to build this defconfig and it fails while building > ti-k3-r5-loader > with: > ``` > COPY spl/u-boot-spl.bin > ./tools/k3_gen_x509_cert.sh -c 16 -b spl/u-boot-spl.bin \ > -o tiboot3.bin -l 0x43c00000 -r 1 -k "" > SWRV = 1 > Could not open file or uri for loading private key from eckey.pem: No > such file or directory > cat: certificate.bin: No such file or directory > rm: cannot remove 'certificate.bin': No such file or directory > rm: cannot remove 'eckey.pem': No such file or directory > make[3]: *** [arch/arm/mach-k3//config.mk:55: tiboot3.bin] Error 1 > make[3]: *** Deleting file 'tiboot3.bin' > ``` > > Can you please take a look into it? The compilation with `BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP` enabled is fine, while the compilation with `BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS` enabled is broken. Have you enabled the `BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS` or `BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS` option? Thanks and regards, Dario > > Thank you > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > > On 05/02/24 16:13, Giulio Benetti wrote: > > Hi Dario, > > > > On 23/11/23 14:40, Dario Binacchi wrote: > >> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig) forgot to > >> specify the Linux kernel version, so do that now. > >> > >> When the defconfig was added, the default version was 6.4.x, so use > >> version 6.4.16. > >> > >> Signed-off-by: Dario Binacchi > --- > >> configs/ti_am62x_sk_defconfig | 3 +++ > >> 1 file changed, 3 insertions(+) > >> > >> diff --git a/configs/ti_am62x_sk_defconfig > >> b/configs/ti_am62x_sk_defconfig > >> index b98a68ff153f..6610e6fcf890 100644 > >> --- a/configs/ti_am62x_sk_defconfig > >> +++ b/configs/ti_am62x_sk_defconfig > >> @@ -1,7 +1,10 @@ > >> BR2_aarch64=y > >> +BR2_KERNEL_HEADERS_6_4=y > > > > here ^^^ you need to specify BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4 > > and not the line above, > > > >> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > >> BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" > >> BR2_LINUX_KERNEL=y > >> +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > >> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > >> BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > >> BR2_LINUX_KERNEL_DTS_SUPPORT=y > >> BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > > > > Can you please correct and send V2? > > > > Thank you! > > > > Best regards > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Fri Feb 9 13:58:17 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Fri, 9 Feb 2024 14:58:17 +0100 Subject: [Buildroot] [PATCH v3 02/11] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <3d674bd1-a53f-4f82-93c1-58cbe14ab1db@smile.fr> References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-3-dario.binacchi@amarulasolutions.com> <3d674bd1-a53f-4f82-93c1-58cbe14ab1db@smile.fr> Message-ID: Hi Romain, All On Wed, Feb 7, 2024 at 11:04?AM Romain Naour wrote: > > Hello Dario, All, > > Le 06/02/2024 ? 18:50, Romain Naour a ?crit : > > Hello Dario, > > > > Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit : > >> The patch sets the configurations required by TI HS systems. Some of these > >> configurations (i. e. HS SYSFW image signing key, HS Software Revision) > >> are provided by the ti-k3-core-secdev package in the binaries directory. > > > > AFAIK the ti-k3-image-gen tool is deprecated and must be replaced by binman tool > > provided by upstream u-boot. > > > > Is all k3 SoC migrated to binman in the latest u-boot release 2024.01? > > > > See the FOSDEM talk: > > > > https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/21919/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > > > > Best regards, > > Romain > > > > > >> > >> Signed-off-by: Dario Binacchi > >> --- > >> boot/ti-k3-image-gen/Config.in | 1 + > >> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > >> 2 files changed, 15 insertions(+), 2 deletions(-) > >> > >> diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > >> index d76cef82e911..38d1598d9fc0 100644 > >> --- a/boot/ti-k3-image-gen/Config.in > >> +++ b/boot/ti-k3-image-gen/Config.in > >> @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > >> bool "ti-k3-image-gen" > >> depends on BR2_TARGET_TI_K3_R5_LOADER > >> select BR2_TARGET_TI_K3_BOOT_FIRMWARE > >> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > Does it means that currently TI HS configuration are missing the > ti-k3-core-secdev tool to build properly? Yes, you are right. Currently, the compilation with BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS enabled is broken: ./tools/k3_gen_x509_cert.sh -c 16 -b spl/u-boot-spl.bin \ -o tiboot3.bin -l 0x43c00000 -r 1 -k "" SWRV = 1 >>> ti-k3-r5-loader 2022.10 Installing to target >>> ti-k3-r5-loader 2022.10 Installing to images directory cp /home/dario/projects/buildroot/output/build/ti-k3-r5-loader-2022.10/spl/u-boot-spl.bin /home/dario/projects/buildroot/output/images/r5-u-boot-spl.bin k3-image-gen-08.06.00.007.tar.gz: OK (sha256: f89ea4b1f5c992455b1a682fde48359221b53f3294135df4bf20feea6aea90e4) >>> ti-k3-image-gen 08.06.00.007 Extracting gzip -d -c /home/dario/projects/buildroot/dl/ti-k3-image-gen/k3-image-gen-08.06.00.007.tar.gz | tar --strip-components=1 -C /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007 -xf - >>> ti-k3-image-gen 08.06.00.007 Patching >>> ti-k3-image-gen 08.06.00.007 Configuring cp /home/dario/projects/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007 cp: cannot stat '/home/dario/projects/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin': No such file or directory make[1]: *** [package/pkg-generic.mk:273: /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007/.stamp_configured] Error 1 make: *** [Makefile:82: _all] Error 2 What do you think if, for this series, I fix the compilation issue for HS configurations by continuing to use the `ti-k3-image-gen` package, and then once the series is merged, I try and test the the bump of u-boot to version 2024.01 to see if it is indeed possible to do without `ti-k3-image-gen`? Meanwhile, let's at least fix this problem immediately. Thanks and regards, Dario > > It seems this patch should fixes them. > > Best regards, > Romain > > >> # We need FIT support in uboot-tools, which is why we select a > >> # host package > >> select BR2_PACKAGE_HOST_UBOOT_TOOLS > >> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > >> index 64be9a18f2c4..91aed63bab84 100644 > >> --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > >> +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > >> @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > >> TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > >> TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > >> > >> -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > >> +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > >> +TI_K3_IMAGE_GEN_SYSFW = \ > >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > >> +else > >> +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > >> + > >> +TI_K3_IMAGE_GEN_SYSFW = \ > >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > >> +endif > >> > >> define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > >> - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > >> + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > >> + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > >> + ) > >> endef > >> > >> define TI_K3_IMAGE_GEN_BUILD_CMDS > >> @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > >> $(BR2_MAKE) -C $(@D) \ > >> SOC=$(TI_K3_IMAGE_GEN_SOC) \ > >> SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > >> + TI_SECURE_DEV_PKG=$(BINARIES_DIR) \ > >> CONFIG=evm \ > >> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > >> SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From roykollensvendsen at gmail.com Fri Feb 9 14:23:26 2024 From: roykollensvendsen at gmail.com (Roy Kollen Svendsen) Date: Fri, 9 Feb 2024 15:23:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version In-Reply-To: <20240209104705.1825396-1-sebastian.weyer@smile.fr> References: <20240209104705.1825396-1-sebastian.weyer@smile.fr> Message-ID: <20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com> The build failed because assimp was missing. Use git instead of downloading the tar-ball so that we also fetch the associated assimp src submodule. Signed-off-by: Roy Kollen Svendsen --- package/qt5/qt53d/qt53d.hash | 2 +- package/qt5/qt53d/qt53d.mk | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 0f63aab72a..81de91558e 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 +sha256 bab48eab35184144fc8789d2958a983a60bfc8dfa242cb65966a3d129fddaea7 qt53d-e1b1a0d2970fd384bd52c734a72536d8452ad070-br1.tar.gz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index 4b748a4972..8fcfb72fec 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,9 +4,10 @@ # ################################################################################ -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 -QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) -QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 +QT53D_VERSION = e1b1a0d2970fd384bd52c734a72536d8452ad070 +QT53D_SITE = $(QT5_SITE)/qt3d +QT53D_SITE_METHOD = git +QT53D_GIT_SUBMODULES = YES QT53D_DEPENDENCIES = qt5declarative QT53D_INSTALL_STAGING = YES QT53D_SYNC_QT_HEADERS = YES -- 2.43.0 From ps.report at gmx.net Fri Feb 9 15:05:04 2024 From: ps.report at gmx.net (Peter Seiderer) Date: Fri, 9 Feb 2024 16:05:04 +0100 Subject: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version In-Reply-To: <20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com> References: <20240209104705.1825396-1-sebastian.weyer@smile.fr> <20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com> Message-ID: <20240209160504.1d6f7ae5@gmx.net> On Fri, 9 Feb 2024 15:23:26 +0100, Roy Kollen Svendsen wrote: > The build failed because assimp was missing. There is already an assimp dependency in package/qt5/qt53d/qt53d.mk (see [1]): 14: ifeq ($(BR2_PACKAGE_ASSIMP),y) 15: QT53D_DEPENDENCIES += assimp 16: endif Regards, Peter [1] https://gitlab.com/buildroot.org/buildroot/-/blame/master/package/qt5/qt53d/qt53d.mk?ref_type=heads#L14 > > Use git instead of downloading the tar-ball so that > we also fetch the associated assimp src submodule. > > Signed-off-by: Roy Kollen Svendsen > --- > package/qt5/qt53d/qt53d.hash | 2 +- > package/qt5/qt53d/qt53d.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > index 0f63aab72a..81de91558e 100644 > --- a/package/qt5/qt53d/qt53d.hash > +++ b/package/qt5/qt53d/qt53d.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 > +sha256 bab48eab35184144fc8789d2958a983a60bfc8dfa242cb65966a3d129fddaea7 qt53d-e1b1a0d2970fd384bd52c734a72536d8452ad070-br1.tar.gz > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > index 4b748a4972..8fcfb72fec 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 > -QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > -QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > +QT53D_VERSION = e1b1a0d2970fd384bd52c734a72536d8452ad070 > +QT53D_SITE = $(QT5_SITE)/qt3d > +QT53D_SITE_METHOD = git > +QT53D_GIT_SUBMODULES = YES > QT53D_DEPENDENCIES = qt5declarative > QT53D_INSTALL_STAGING = YES > QT53D_SYNC_QT_HEADERS = YES From Roy.Kollen.Svendsen at akersolutions.com Fri Feb 9 15:29:44 2024 From: Roy.Kollen.Svendsen at akersolutions.com (Svendsen, Roy Kollen) Date: Fri, 9 Feb 2024 15:29:44 +0000 Subject: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version In-Reply-To: <20240209160504.1d6f7ae5@gmx.net> References: <20240209104705.1825396-1-sebastian.weyer@smile.fr> <20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com> <20240209160504.1d6f7ae5@gmx.net> Message-ID: Hi Peter, What do you recommand doing? These are the options avilable for assimp in qt53d: Qt3D options: -assimp .............. Select used assimp library [system/qt/no] ... Last time i tried 'system' and 'no' failed. If this is the case I should either make assimp configurable or hardcode it to qt. Regards, Roy ________________________________ From: Peter Seiderer Sent: Friday, February 9, 2024 4:05 PM To: Roy Kollen Svendsen Cc: buildroot at buildroot.org ; Svendsen, Roy Kollen ; sebastian.weyer at smile.fr ; Giulio Benetti ; Julien Corjon Subject: Re: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version [You don't often get email from ps.report at gmx.net. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] CAUTION: This email originated from outside of Aker Solutions. Exercise caution when responding, opening attachments and clicking links. On Fri, 9 Feb 2024 15:23:26 +0100, Roy Kollen Svendsen wrote: > The build failed because assimp was missing. There is already an assimp dependency in package/qt5/qt53d/qt53d.mk (see [1]): 14: ifeq ($(BR2_PACKAGE_ASSIMP),y) 15: QT53D_DEPENDENCIES += assimp 16: endif Regards, Peter [1] https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.com%2Fbuildroot.org%2Fbuildroot%2F-%2Fblame%2Fmaster%2Fpackage%2Fqt5%2Fqt53d%2Fqt53d.mk%3Fref_type%3Dheads%23L14&data=05%7C02%7Croy.kollen.svendsen%40akersolutions.com%7Cc9ad43b7795d4a21fbb008dc298082d7%7C26b749f68c7244e3bbdeae3de07b4206%7C0%7C0%7C638430879122415164%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7C%7C%7C&sdata=VDhBLxcvmZSPA96XrMcW9EDA%2B0%2BCM6DxSj2F7AKIWto%3D&reserved=0 > > Use git instead of downloading the tar-ball so that > we also fetch the associated assimp src submodule. > > Signed-off-by: Roy Kollen Svendsen > --- > package/qt5/qt53d/qt53d.hash | 2 +- > package/qt5/qt53d/qt53d.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > index 0f63aab72a..81de91558e 100644 > --- a/package/qt5/qt53d/qt53d.hash > +++ b/package/qt5/qt53d/qt53d.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 > +sha256 bab48eab35184144fc8789d2958a983a60bfc8dfa242cb65966a3d129fddaea7 qt53d-e1b1a0d2970fd384bd52c734a72536d8452ad070-br1.tar.gz > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > index 4b748a4972..8fcfb72fec 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 > -QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > -QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > +QT53D_VERSION = e1b1a0d2970fd384bd52c734a72536d8452ad070 > +QT53D_SITE = $(QT5_SITE)/qt3d > +QT53D_SITE_METHOD = git > +QT53D_GIT_SUBMODULES = YES > QT53D_DEPENDENCIES = qt5declarative > QT53D_INSTALL_STAGING = YES > QT53D_SYNC_QT_HEADERS = YES This e-mail and any attachment are confidential and may be privileged or otherwise protected from disclosure. It is solely intended for the person(s) named above. If you are not the intended recipient, any reading, use, disclosure, copying or distribution of all or parts of this e-mail or associated attachments is strictly prohibited. If you are not an intended recipient, please notify the sender immediately by replying to this message or by telephone and delete this e-mail and any attachments permanently from your system. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bernd at kuhls.net Fri Feb 9 16:10:29 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 09 Feb 2024 17:10:29 +0100 Subject: [Buildroot] [git commit] package/python3: bump version to 3.12.1 References: <20240206222231.8950D87481@busybox.osuosl.org> Message-ID: Am Thu, 8 Feb 2024 21:14:52 -0500 schrieb James Knight: > import math > ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' > not found (required by > /builds/buildroot/output/build/python3-3.12.1/build/lib.linux- x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) Hi James, same here on Debian 12.4/bookworm, try this patch: https://github.com/bkuhls/buildroot/commit/ dca8b5bee7742ffedf81a027affadd4b7e18fc3f Regards, Bernd From james.hilliard1 at gmail.com Fri Feb 9 17:56:31 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 9 Feb 2024 10:56:31 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-cython: bump to version 3.0.8 In-Reply-To: <20240209175631.1337370-1-james.hilliard1@gmail.com> References: <20240209175631.1337370-1-james.hilliard1@gmail.com> Message-ID: <20240209175631.1337370-2-james.hilliard1@gmail.com> License hash changed due to changing links from http to https: https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 Signed-off-by: James Hilliard --- package/python-cython/python-cython.hash | 6 +++--- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 08ad8f6d84..55e4a6f203 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 a4d0f9fbc9c137f1a88937cd40e8c5ee Cython-0.29.36.tar.gz -sha256 41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f Cython-0.29.36.tar.gz +md5 9f7baaa983e1bd06eaeb4fa0adfc77e5 Cython-3.0.8.tar.gz +sha256 8333423d8fd5765e7cceea3a9985dd1e0a5dfeb2734629e1a2ed2d6233d39de6 Cython-3.0.8.tar.gz # Locally computed sha256 checksums -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt +sha256 9568a2b155e66ac3e0ba1fd80b52b827b9460e6cf6f233125e7cbca8e206ddc3 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 47e105c065..d76bfb766d 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.36 +PYTHON_CYTHON_VERSION = 3.0.8 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 9 17:56:30 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 9 Feb 2024 10:56:30 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 Message-ID: <20240209175631.1337370-1-james.hilliard1@gmail.com> Add patches from pending upstream pull request which add cython3 compatibility. Signed-off-by: James Hilliard --- .../0001-Updates-for-Cython3.patch | 631 ++++++++++++++++++ ...ebug-has-args-difference-in-python-3.patch | 30 + .../0003-fix-tests-on-python-3.8.patch | 31 + .../0004-fix-arg-count-for-wrap.patch | 52 ++ 4 files changed, 744 insertions(+) create mode 100644 package/python-uvloop/0001-Updates-for-Cython3.patch create mode 100644 package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch create mode 100644 package/python-uvloop/0003-fix-tests-on-python-3.8.patch create mode 100644 package/python-uvloop/0004-fix-arg-count-for-wrap.patch diff --git a/package/python-uvloop/0001-Updates-for-Cython3.patch b/package/python-uvloop/0001-Updates-for-Cython3.patch new file mode 100644 index 0000000000..b7ef1091ac --- /dev/null +++ b/package/python-uvloop/0001-Updates-for-Cython3.patch @@ -0,0 +1,631 @@ +From 087a2983c8022598232cb7ed0a49da334d7af9ff Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 12:18:15 +0000 +Subject: [PATCH] Updates for Cython3 Remove SSL depreciation warnings buillt + on debian 12.6 python-3.22 Cython-3.0.7 libuv-1.46.0 + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/MagicStack/uvloop/pull/587] +--- + Makefile | 2 +- + setup.py | 6 ++++-- + tests/test_process.py | 4 ++-- + tests/test_tcp.py | 19 ++++++++++++------- + uvloop/_testbase.py | 4 +++- + uvloop/cbhandles.pyx | 4 ++-- + uvloop/dns.pyx | 4 ++-- + uvloop/handles/basetransport.pxd | 4 ++-- + uvloop/handles/basetransport.pyx | 4 ++-- + uvloop/handles/handle.pyx | 2 +- + uvloop/handles/pipe.pyx | 2 +- + uvloop/handles/poll.pxd | 2 +- + uvloop/handles/poll.pyx | 2 +- + uvloop/handles/stream.pyx | 16 ++++++++++------ + uvloop/handles/udp.pyx | 4 ++-- + uvloop/includes/consts.pxi | 25 ------------------------- + uvloop/includes/fork_handler.h | 6 +++++- + uvloop/includes/system.h | 16 ++++++++++++++++ + uvloop/includes/system.pxd | 12 ++++-------- + uvloop/includes/uv.pxd | 6 +++--- + uvloop/loop.pxd | 28 ++++++++++++++++++++++++---- + uvloop/loop.pyx | 10 +++++----- + uvloop/sslproto.pxd | 4 ++-- + uvloop/sslproto.pyx | 4 ++-- + 24 files changed, 107 insertions(+), 83 deletions(-) + delete mode 100644 uvloop/includes/consts.pxi + create mode 100755 uvloop/includes/system.h + +diff --git a/Makefile b/Makefile +index 4375e5d..6a0475a 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,7 @@ _default: compile + + + clean: +- rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd ++ rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd + rm -fr uvloop/*.c uvloop/*.html uvloop/*.so + rm -fr uvloop/handles/*.html uvloop/includes/*.html + find . -name '__pycache__' | xargs rm -rf +diff --git a/setup.py b/setup.py +index ba15af5..8fdf0e5 100644 +--- a/setup.py ++++ b/setup.py +@@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext + from setuptools.command.sdist import sdist + + +-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)' ++CYTHON_DEPENDENCY = 'Cython(>=0.29.36)' + MACHINE = platform.machine() + MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')] + _ROOT = pathlib.Path(__file__).parent +@@ -144,7 +144,9 @@ class uvloop_build_ext(build_ext): + self.distribution.ext_modules[:] = cythonize( + self.distribution.ext_modules, + compiler_directives=directives, +- annotate=self.cython_annotate) ++ annotate=self.cython_annotate, ++ compile_time_env=dict(DEFAULT_FREELIST_SIZE=250, SSL_READ_MAX_SIZE=256 * 1024), ++ emit_linenums=True) + + super().finalize_options() + +diff --git a/tests/test_process.py b/tests/test_process.py +index bfcbba1..95e1c9e 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -912,7 +912,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +@@ -931,7 +931,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +diff --git a/tests/test_tcp.py b/tests/test_tcp.py +index 812e62b..213e2d9 100644 +--- a/tests/test_tcp.py ++++ b/tests/test_tcp.py +@@ -1630,17 +1630,22 @@ class _TestSSL(tb.SSLTestCase): + self.fail("unexpected call to connection_made()") + + def test_ssl_connect_accepted_socket(self): +- if hasattr(ssl, 'PROTOCOL_TLS'): +- proto = ssl.PROTOCOL_TLS ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ server_proto = ssl.PROTOCOL_TLS_SERVER ++ client_proto = ssl.PROTOCOL_TLS_CLIENT + else: +- proto = ssl.PROTOCOL_SSLv23 +- server_context = ssl.SSLContext(proto) ++ if hasattr(ssl, 'PROTOCOL_TLS'): ++ client_proto = server_proto = ssl.PROTOCOL_TLS ++ else: ++ client_proto = server_proto = ssl.PROTOCOL_SSLv23 ++ ++ server_context = ssl.SSLContext(server_proto) + server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY) + if hasattr(server_context, 'check_hostname'): + server_context.check_hostname = False + server_context.verify_mode = ssl.CERT_NONE + +- client_context = ssl.SSLContext(proto) ++ client_context = ssl.SSLContext(client_proto) + if hasattr(server_context, 'check_hostname'): + client_context.check_hostname = False + client_context.verify_mode = ssl.CERT_NONE +@@ -2233,7 +2238,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx.use_privatekey_file(self.ONLYKEY) + sslctx.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + def server(sock): +@@ -2592,7 +2597,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx_openssl.use_privatekey_file(self.ONLYKEY) + sslctx_openssl.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + future = None +diff --git a/uvloop/_testbase.py b/uvloop/_testbase.py +index c4a7595..e620e15 100644 +--- a/uvloop/_testbase.py ++++ b/uvloop/_testbase.py +@@ -269,7 +269,9 @@ def find_free_port(start_from=50000): + class SSLTestCase: + + def _create_server_ssl_context(self, certfile, keyfile=None): +- if hasattr(ssl, 'PROTOCOL_TLS'): ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) ++ elif hasattr(ssl, 'PROTOCOL_TLS'): + sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS) + else: + sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) +diff --git a/uvloop/cbhandles.pyx b/uvloop/cbhandles.pyx +index 2914b42..8bcc5aa 100644 +--- a/uvloop/cbhandles.pyx ++++ b/uvloop/cbhandles.pyx +@@ -76,8 +76,8 @@ cdef class Handle: + self.arg1, self.arg2, self.arg3, self.arg4) + + else: +- raise RuntimeError('invalid Handle.cb_type: {}'.format( +- cb_type)) ++ raise RuntimeError('invalid Handle.cb_type: {} {!r}/{!r}'.format( ++ cb_type, self.args1, self.args2)) + + except (KeyboardInterrupt, SystemExit): + raise +diff --git a/uvloop/dns.pyx b/uvloop/dns.pyx +index 7aad631..09b9282 100644 +--- a/uvloop/dns.pyx ++++ b/uvloop/dns.pyx +@@ -298,7 +298,7 @@ cdef class AddrInfo: + uv.uv_freeaddrinfo(self.data) # returns void + self.data = NULL + +- cdef void set_data(self, system.addrinfo *data): ++ cdef void set_data(self, system.addrinfo *data) noexcept: + self.data = data + + cdef unpack(self): +@@ -326,7 +326,7 @@ cdef class AddrInfo: + return result + + @staticmethod +- cdef int isinstance(object other): ++ cdef int isinstance(object other) noexcept: + return type(other) is AddrInfo + + +diff --git a/uvloop/handles/basetransport.pxd b/uvloop/handles/basetransport.pxd +index ba356a7..8112622 100644 +--- a/uvloop/handles/basetransport.pxd ++++ b/uvloop/handles/basetransport.pxd +@@ -47,8 +47,8 @@ cdef class UVBaseTransport(UVSocketHandle): + # === overloads === + + cdef _new_socket(self) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + +- cdef bint _is_reading(self) ++ cdef bint _is_reading(self) noexcept + cdef _start_reading(self) + cdef _stop_reading(self) +diff --git a/uvloop/handles/basetransport.pyx b/uvloop/handles/basetransport.pyx +index 28b3079..a8592f2 100644 +--- a/uvloop/handles/basetransport.pyx ++++ b/uvloop/handles/basetransport.pyx +@@ -18,7 +18,7 @@ cdef class UVBaseTransport(UVSocketHandle): + + self._closing = 0 + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return 0 + + cdef inline _schedule_call_connection_made(self): +@@ -211,7 +211,7 @@ cdef class UVBaseTransport(UVSocketHandle): + self._extra_info = {} + self._extra_info[name] = obj + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + raise NotImplementedError + + cdef _start_reading(self): +diff --git a/uvloop/handles/handle.pyx b/uvloop/handles/handle.pyx +index 6efe375..2c96458 100644 +--- a/uvloop/handles/handle.pyx ++++ b/uvloop/handles/handle.pyx +@@ -363,7 +363,7 @@ cdef void __uv_close_handle_cb(uv.uv_handle_t* handle) noexcept with gil: + Py_DECREF(h) # Was INCREFed in UVHandle._close + + +-cdef void __close_all_handles(Loop loop): ++cdef void __close_all_handles(Loop loop) noexcept: + uv.uv_walk(loop.uvloop, + __uv_walk_close_all_handles_cb, + loop) # void +diff --git a/uvloop/handles/pipe.pyx b/uvloop/handles/pipe.pyx +index 195576c..d30a736 100644 +--- a/uvloop/handles/pipe.pyx ++++ b/uvloop/handles/pipe.pyx +@@ -25,7 +25,7 @@ cdef __pipe_init_uv_handle(UVStream handle, Loop loop): + cdef __pipe_open(UVStream handle, int fd): + cdef int err + err = uv.uv_pipe_open(handle._handle, +- fd) ++ fd) + if err < 0: + exc = convert_error(err) + raise exc +diff --git a/uvloop/handles/poll.pxd b/uvloop/handles/poll.pxd +index d07030b..c220540 100644 +--- a/uvloop/handles/poll.pxd ++++ b/uvloop/handles/poll.pxd +@@ -10,7 +10,7 @@ cdef class UVPoll(UVHandle): + cdef inline _poll_start(self, int flags) + cdef inline _poll_stop(self) + +- cdef int is_active(self) ++ cdef int is_active(self) noexcept + + cdef is_reading(self) + cdef is_writing(self) +diff --git a/uvloop/handles/poll.pyx b/uvloop/handles/poll.pyx +index fca5981..c905e9b 100644 +--- a/uvloop/handles/poll.pyx ++++ b/uvloop/handles/poll.pyx +@@ -29,7 +29,7 @@ cdef class UVPoll(UVHandle): + handle._init(loop, fd) + return handle + +- cdef int is_active(self): ++ cdef int is_active(self) noexcept: + return (self.reading_handle is not None or + self.writing_handle is not None) + +diff --git a/uvloop/handles/stream.pyx b/uvloop/handles/stream.pyx +index d4e02e3..09df887 100644 +--- a/uvloop/handles/stream.pyx ++++ b/uvloop/handles/stream.pyx +@@ -1,4 +1,8 @@ +-DEF __PREALLOCED_BUFS = 4 ++cdef extern from *: ++ ''' ++ enum {__PREALLOCED_BUFS = 4}; ++ ''' ++ const bint __PREALLOCED_BUFS + + + @cython.no_gc_clear +@@ -279,7 +283,7 @@ cdef class UVStream(UVBaseTransport): + cdef inline _close_on_read_error(self): + self.__read_error_close = 1 + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__reading + + cdef _start_reading(self): +@@ -578,7 +582,7 @@ cdef class UVStream(UVBaseTransport): + + self._maybe_resume_protocol() + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return ((self._handle).write_queue_size + +@@ -755,7 +759,7 @@ cdef inline bint __uv_stream_on_read_common( + UVStream sc, + Loop loop, + ssize_t nread, +-): ++) noexcept: + if sc._closed: + # The stream was closed, there is no reason to + # do any work now. +@@ -818,7 +822,7 @@ cdef inline void __uv_stream_on_read_impl( + uv.uv_stream_t* stream, + ssize_t nread, + const uv.uv_buf_t* buf, +-): ++) noexcept: + cdef: + UVStream sc = stream.data + Loop loop = sc._loop +@@ -849,7 +853,7 @@ cdef inline void __uv_stream_on_read_impl( + cdef inline void __uv_stream_on_write_impl( + uv.uv_write_t* req, + int status, +-): ++) noexcept: + cdef: + _StreamWriteContext ctx = <_StreamWriteContext> req.data + UVStream stream = ctx.stream +diff --git a/uvloop/handles/udp.pyx b/uvloop/handles/udp.pyx +index bbe60d5..fdd1d8b 100644 +--- a/uvloop/handles/udp.pyx ++++ b/uvloop/handles/udp.pyx +@@ -127,12 +127,12 @@ cdef class UDPTransport(UVBaseTransport): + exc = convert_error(err) + raise exc + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return (self._handle).send_queue_size + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__receiving + + cdef _start_reading(self): +diff --git a/uvloop/includes/consts.pxi b/uvloop/includes/consts.pxi +deleted file mode 100644 +index f765053..0000000 +--- a/uvloop/includes/consts.pxi ++++ /dev/null +@@ -1,25 +0,0 @@ +-DEF UV_STREAM_RECV_BUF_SIZE = 256000 # 250kb +- +-DEF FLOW_CONTROL_HIGH_WATER = 64 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB +- +-DEF DEFAULT_FREELIST_SIZE = 250 +-DEF DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 +- +-DEF DEBUG_STACK_DEPTH = 10 +- +- +-DEF __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 +- +- +-DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 +- +- +-# Number of seconds to wait for SSL handshake to complete +-# The default timeout matches that of Nginx. +-DEF SSL_HANDSHAKE_TIMEOUT = 60.0 +-# Number of seconds to wait for SSL shutdown to complete +-# The default timeout mimics lingering_time +-DEF SSL_SHUTDOWN_TIMEOUT = 30.0 +-DEF SSL_READ_MAX_SIZE = 256 * 1024 +diff --git a/uvloop/includes/fork_handler.h b/uvloop/includes/fork_handler.h +index 47bbe03..9d3573a 100644 +--- a/uvloop/includes/fork_handler.h ++++ b/uvloop/includes/fork_handler.h +@@ -1,7 +1,10 @@ ++#ifndef UVLOOP_FORK_HANDLER_H_ ++#define UVLOOP_FORK_HANDLER_H_ ++ + volatile uint64_t MAIN_THREAD_ID = 0; + volatile int8_t MAIN_THREAD_ID_SET = 0; + +-typedef void (*OnForkHandler)(); ++typedef void (*OnForkHandler)(void); + + OnForkHandler __forkHandler = NULL; + +@@ -36,3 +39,4 @@ void setMainThreadID(uint64_t id) { + MAIN_THREAD_ID = id; + MAIN_THREAD_ID_SET = 1; + } ++#endif +diff --git a/uvloop/includes/system.h b/uvloop/includes/system.h +new file mode 100755 +index 0000000..e143bb5 +--- /dev/null ++++ b/uvloop/includes/system.h +@@ -0,0 +1,16 @@ ++#ifndef UVLOOP_SYSTEM_H_ ++#define UVLOOP_SYSTEM_H_ ++#if defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER) ++#include "Winsock2.h" ++#include "ws2def.h" ++#include "includes/fork_handler.h" ++#else ++#include "arpa/inet.h" ++#include "sys/socket.h" ++#include "sys/un.h" ++#include "unistd.h" ++#include "pthread.h" ++#endif ++#endif ++ ++ +diff --git a/uvloop/includes/system.pxd b/uvloop/includes/system.pxd +index 367fedd..d1da74e 100644 +--- a/uvloop/includes/system.pxd ++++ b/uvloop/includes/system.pxd +@@ -1,13 +1,9 @@ + from libc.stdint cimport int8_t, uint64_t + +-cdef extern from "arpa/inet.h" nogil: +- +- int ntohl(int) +- int htonl(int) +- int ntohs(int) +- +- +-cdef extern from "sys/socket.h" nogil: ++cdef extern from "includes/system.h": ++ int ntohl(int) nogil ++ int htonl(int) nogil ++ int ntohs(int) nogil + + struct sockaddr: + unsigned short sa_family +diff --git a/uvloop/includes/uv.pxd b/uvloop/includes/uv.pxd +index 8765130..ddd9738 100644 +--- a/uvloop/includes/uv.pxd ++++ b/uvloop/includes/uv.pxd +@@ -220,7 +220,7 @@ cdef extern from "uv.h" nogil: + UV_LEAVE_GROUP = 0, + UV_JOIN_GROUP + +- cpdef enum uv_fs_event: ++ cdef enum uv_fs_event: + UV_RENAME = 1, + UV_CHANGE = 2 + +@@ -282,7 +282,7 @@ cdef extern from "uv.h" nogil: + int uv_loop_close(uv_loop_t* loop) + int uv_loop_alive(uv_loop_t* loop) + int uv_loop_fork(uv_loop_t* loop) +- int uv_backend_fd(uv_loop_t* loop) ++ uv_os_fd_t uv_backend_fd(uv_loop_t* loop) + + void uv_update_time(uv_loop_t* loop) + uint64_t uv_now(const uv_loop_t*) +@@ -378,7 +378,7 @@ cdef extern from "uv.h" nogil: + # Pipes + + int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) +- int uv_pipe_open(uv_pipe_t* handle, uv_file file) ++ int uv_pipe_open(uv_pipe_t* handle, uv_os_fd_t file) + int uv_pipe_bind(uv_pipe_t* handle, const char* name) + + void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index 5613473..f90c704 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -1,15 +1,35 @@ + # cython: language_level=3 + ++cdef extern from *: ++ ''' ++ enum { UV_STREAM_RECV_BUF_SIZE = 256000, ++ SSL_READ_MAX_SIZE = 256 * 1024, // 250kb ++ }; ++ const float SSL_HANDSHAKE_TIMEOUT = 60.0; // Number of seconds to wait for SSL handshake to complete The default timeout matches that of Nginx. ++ const float SSL_SHUTDOWN_TIMEOUT = 30.0; // Number of seconds to wait for SSL shutdown to complete The default timeout mimics lingering_time ++ ''' ++ const bint UV_STREAM_RECV_BUF_SIZE ++ const bint SSL_READ_MAX_SIZE ++ ++ const float SSL_HANDSHAKE_TIMEOUT ++ const float SSL_SHUTDOWN_TIMEOUT ++ ++cdef enum: ++ FLOW_CONTROL_HIGH_WATER = 64 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB ++ ++ DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 ++ DEBUG_STACK_DEPTH = 10 ++ __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 ++ LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 ++ + + from .includes cimport uv + from .includes cimport system + + from libc.stdint cimport uint64_t, uint32_t, int64_t + +- +-include "includes/consts.pxi" +- +- + cdef extern from *: + ctypedef int vint "volatile int" + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 334d8d5..53e1160 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -43,7 +43,7 @@ from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer + from . import _noop + + +-include "includes/consts.pxi" ++ + include "includes/stdlib.pxi" + + include "errors.pyx" +@@ -1118,7 +1118,7 @@ cdef class Loop: + + cdef _sock_set_reuseport(self, int fd): + cdef: +- int err ++ int err = 0 + int reuseport_flag = 1 + + err = system.setsockopt( +@@ -1397,7 +1397,7 @@ cdef class Loop: + self._debug = bool(enabled) + if self.is_running(): + self.call_soon_threadsafe( +- self._set_coroutine_debug, self, self._debug) ++ self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +@@ -2750,7 +2750,7 @@ cdef class Loop: + executable=None, + pass_fds=(), + # For tests only! Do not use in your code. Ever. +- __uvloop_sleep_after_fork=False): ++ uvloop_sleep_after_fork=False): + + # TODO: Implement close_fds (might not be very important in + # Python 3.5, since all FDs aren't inheritable by default.) +@@ -2770,7 +2770,7 @@ cdef class Loop: + if executable is not None: + args[0] = executable + +- if __uvloop_sleep_after_fork: ++ if uvloop_sleep_after_fork: + debug_flags |= __PROCESS_DEBUG_SLEEP_AFTER_FORK + + waiter = self._new_future() +diff --git a/uvloop/sslproto.pxd b/uvloop/sslproto.pxd +index 3da10f0..68e4d57 100644 +--- a/uvloop/sslproto.pxd ++++ b/uvloop/sslproto.pxd +@@ -122,7 +122,7 @@ cdef class SSLProtocol: + # Flow control for writes from APP socket + + cdef _control_app_writing(self, object context=*) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + cdef _set_write_buffer_limits(self, high=*, low=*) + + # Flow control for reads to APP socket +@@ -134,5 +134,5 @@ cdef class SSLProtocol: + + cdef _control_ssl_reading(self) + cdef _set_read_buffer_limits(self, high=*, low=*) +- cdef size_t _get_read_buffer_size(self) ++ cdef size_t _get_read_buffer_size(self) noexcept + cdef _fatal_error(self, exc, message=*) +diff --git a/uvloop/sslproto.pyx b/uvloop/sslproto.pyx +index 42bb764..0a43746 100644 +--- a/uvloop/sslproto.pyx ++++ b/uvloop/sslproto.pyx +@@ -861,7 +861,7 @@ cdef class SSLProtocol: + 'protocol': self, + }) + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return self._outgoing.pending + self._write_buffer_size + + cdef _set_write_buffer_limits(self, high=None, low=None): +@@ -903,7 +903,7 @@ cdef class SSLProtocol: + self._incoming_high_water = high + self._incoming_low_water = low + +- cdef size_t _get_read_buffer_size(self): ++ cdef size_t _get_read_buffer_size(self) noexcept: + return self._incoming.pending + + # Flow control for writes to SSL socket +-- +2.34.1 + diff --git a/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch new file mode 100644 index 0000000000..ac6170aff3 --- /dev/null +++ b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch @@ -0,0 +1,30 @@ +From 8b63801bfdb1f0cf7fde4f58e96f8628a587b186 Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 16:17:49 +0000 +Subject: [PATCH] _set_coroutine_debug has args difference in python 3.11 + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/MagicStack/uvloop/pull/587] +--- + uvloop/loop.pyx | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 53e1160..5ca718e 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,8 +1396,9 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): ++ args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) + self.call_soon_threadsafe( +- self._set_coroutine_debug, self._debug) ++ self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0003-fix-tests-on-python-3.8.patch b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch new file mode 100644 index 0000000000..42f04f2241 --- /dev/null +++ b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch @@ -0,0 +1,31 @@ +From ef5c3e5c6f331692ebcbea9e4c6aead8b2187038 Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 19:58:11 +0000 +Subject: [PATCH] fix tests on python 3.8 + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/MagicStack/uvloop/pull/587] +--- + uvloop/loop.pyx | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 5ca718e..75b915a 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,9 +1396,8 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe( +- self._set_coroutine_debug, *args) ++ args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) ++ self.call_soon_threadsafe(self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0004-fix-arg-count-for-wrap.patch b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch new file mode 100644 index 0000000000..fe082f4f90 --- /dev/null +++ b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch @@ -0,0 +1,52 @@ +From afef6364c2c3100ab23c2bb2de82d2da330b258c Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Fri, 29 Dec 2023 11:24:19 +0000 +Subject: [PATCH] fix arg count for wrap() + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/MagicStack/uvloop/pull/587] +--- + uvloop/loop.pxd | 2 +- + uvloop/loop.pyx | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index f90c704..d34ffeb 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -220,7 +220,7 @@ cdef class Loop: + cdef inline _ceval_process_signals(self) + cdef _invoke_signals(self, bytes data) + +- cdef _set_coroutine_debug(self, bint enabled) ++ cpdef _set_coroutine_debug(self, bint enabled) + + cdef _print_debug_info(self) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 75b915a..a3eeb60 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1131,7 +1131,7 @@ cdef class Loop: + if err < 0: + raise convert_error(-errno.errno) + +- cdef _set_coroutine_debug(self, bint enabled): ++ cpdef _set_coroutine_debug(self, bint enabled): + enabled = bool(enabled) + if self._coroutine_debug_set == enabled: + return +@@ -1396,8 +1396,7 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe(self._set_coroutine_debug, *args) ++ self.call_soon_threadsafe(self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 9 17:59:06 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 9 Feb 2024 10:59:06 -0700 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> <9dcac81b-522c-4ea3-80ed-7d9544cea12f@bubu1.eu> <20240207112058.37534f3d@windsurf> Message-ID: On Wed, Feb 7, 2024 at 12:56?PM James Hilliard wrote: > > On Wed, Feb 7, 2024 at 3:21?AM Thomas Petazzoni > wrote: > > > > On Wed, 7 Feb 2024 11:16:27 +0100 > > Marcus Hoffmann wrote: > > > > > Unfortunately msgpack 1.0.7 which buildroot has now requires cython ~3.0 > > > [1], which we don't have yet. cython 3.0 and cython 0.29.x (which uvloop > > > still uses) also seem to be still developed in parallel. So maybe we > > > need both as build host packages? Or do you see another solution? > > That's annoying, maybe the easiest option is to downgrade msgpack for now > until everything supports cython 3.0? There are patches adding cython 3 support to uvloop(gentoo also uses these), so I've gone ahead and added those and bumped cython to version 3.0: https://patchwork.ozlabs.org/project/buildroot/patch/20240209175631.1337370-1-james.hilliard1 at gmail.com/ https://patchwork.ozlabs.org/project/buildroot/patch/20240209175631.1337370-2-james.hilliard1 at gmail.com/ > > > > > If we were to have both in parallel, then the big question is whether > > it is possible to install them both in parallel without them > > conflicting with each other. > > Seems tricky. > > > > > Thomas > > -- > > Thomas Petazzoni, co-owner and CEO, Bootlin > > Embedded Linux and Kernel engineering and training > > https://bootlin.com From james.hilliard1 at gmail.com Fri Feb 9 18:48:14 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 9 Feb 2024 11:48:14 -0700 Subject: [Buildroot] [PATCH 1/1] package/gst1-python: disable tests Message-ID: <20240209184814.1438551-1-james.hilliard1@gmail.com> We don't need tests enabled which can also cause build issues. Signed-off-by: James Hilliard --- package/gstreamer1/gst1-python/gst1-python.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index f843e37052..501ca5e02b 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -34,6 +34,7 @@ GST1_PYTHON_CONF_ENV += \ # the correct .so file, and the resulting compiled library has the appropriate # path of /usr/lib/python3.$(PYTHON3_VERSION_MAJOR).so GST1_PYTHON_CONF_OPTS += \ - -Dlibpython-dir=/usr/lib/ + -Dlibpython-dir=/usr/lib/ \ + -Dtests=disabled $(eval $(meson-package)) -- 2.34.1 From Roy.Kollen.Svendsen at akersolutions.com Fri Feb 9 19:02:17 2024 From: Roy.Kollen.Svendsen at akersolutions.com (Svendsen, Roy Kollen) Date: Fri, 9 Feb 2024 19:02:17 +0000 Subject: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version In-Reply-To: <20240209160504.1d6f7ae5@gmx.net> References: <20240209104705.1825396-1-sebastian.weyer@smile.fr> <20240209142326.2570138-2-roy.kollen.svendsen@akersolutions.com> <20240209160504.1d6f7ae5@gmx.net> Message-ID: Hi, I will change the state of this patch to 'Not Applicable' since the version that was recently pushed to master builds successfully. This patch was actually meant as part of a bump to 5.15.12. Regards, Roy ________________________________ From: Peter Seiderer Sent: Friday, February 9, 2024 4:05 PM To: Roy Kollen Svendsen Cc: buildroot at buildroot.org ; Svendsen, Roy Kollen ; sebastian.weyer at smile.fr ; Giulio Benetti ; Julien Corjon Subject: Re: [Buildroot] [PATCH 1/1] package/qt53d: bump to latest kde submodule version [You don't often get email from ps.report at gmx.net. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] CAUTION: This email originated from outside of Aker Solutions. Exercise caution when responding, opening attachments and clicking links. On Fri, 9 Feb 2024 15:23:26 +0100, Roy Kollen Svendsen wrote: > The build failed because assimp was missing. There is already an assimp dependency in package/qt5/qt53d/qt53d.mk (see [1]): 14: ifeq ($(BR2_PACKAGE_ASSIMP),y) 15: QT53D_DEPENDENCIES += assimp 16: endif Regards, Peter [1] https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.com%2Fbuildroot.org%2Fbuildroot%2F-%2Fblame%2Fmaster%2Fpackage%2Fqt5%2Fqt53d%2Fqt53d.mk%3Fref_type%3Dheads%23L14&data=05%7C02%7Croy.kollen.svendsen%40akersolutions.com%7Cc9ad43b7795d4a21fbb008dc298082d7%7C26b749f68c7244e3bbdeae3de07b4206%7C0%7C0%7C638430879122415164%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7C%7C%7C&sdata=VDhBLxcvmZSPA96XrMcW9EDA%2B0%2BCM6DxSj2F7AKIWto%3D&reserved=0 > > Use git instead of downloading the tar-ball so that > we also fetch the associated assimp src submodule. > > Signed-off-by: Roy Kollen Svendsen > --- > package/qt5/qt53d/qt53d.hash | 2 +- > package/qt5/qt53d/qt53d.mk | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash > index 0f63aab72a..81de91558e 100644 > --- a/package/qt5/qt53d/qt53d.hash > +++ b/package/qt5/qt53d/qt53d.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 > +sha256 bab48eab35184144fc8789d2958a983a60bfc8dfa242cb65966a3d129fddaea7 qt53d-e1b1a0d2970fd384bd52c734a72536d8452ad070-br1.tar.gz > > # Hashes for license files: > sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL > diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk > index 4b748a4972..8fcfb72fec 100644 > --- a/package/qt5/qt53d/qt53d.mk > +++ b/package/qt5/qt53d/qt53d.mk > @@ -4,9 +4,10 @@ > # > ################################################################################ > > -QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 > -QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) > -QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 > +QT53D_VERSION = e1b1a0d2970fd384bd52c734a72536d8452ad070 > +QT53D_SITE = $(QT5_SITE)/qt3d > +QT53D_SITE_METHOD = git > +QT53D_GIT_SUBMODULES = YES > QT53D_DEPENDENCIES = qt5declarative > QT53D_INSTALL_STAGING = YES > QT53D_SYNC_QT_HEADERS = YES This e-mail and any attachment are confidential and may be privileged or otherwise protected from disclosure. It is solely intended for the person(s) named above. If you are not the intended recipient, any reading, use, disclosure, copying or distribution of all or parts of this e-mail or associated attachments is strictly prohibited. If you are not an intended recipient, please notify the sender immediately by replying to this message or by telephone and delete this e-mail and any attachments permanently from your system. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ju.o at free.fr Fri Feb 9 19:29:23 2024 From: ju.o at free.fr (Julien Olivain) Date: Fri, 9 Feb 2024 20:29:23 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add ghostscript runtime test Message-ID: <20240209192923.1201371-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + .../testing/tests/package/test_ghostscript.py | 48 +++++++++++++++++++ .../rootfs-overlay/root/document.ps | 9 ++++ 3 files changed, 59 insertions(+) create mode 100644 support/testing/tests/package/test_ghostscript.py create mode 100644 support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..db0821c82b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1783,6 +1783,8 @@ F: support/testing/tests/package/test_fluidsynth.py F: support/testing/tests/package/test_fluidsynth/ F: support/testing/tests/package/test_fping.py F: support/testing/tests/package/test_gawk.py +F: support/testing/tests/package/test_ghostscript.py +F: support/testing/tests/package/test_ghostscript/ F: support/testing/tests/package/test_glslsandbox_player.py F: support/testing/tests/package/test_glslsandbox_player/ F: support/testing/tests/package/test_gnupg2.py diff --git a/support/testing/tests/package/test_ghostscript.py b/support/testing/tests/package/test_ghostscript.py new file mode 100644 index 0000000000..3c6c16ef2c --- /dev/null +++ b/support/testing/tests/package/test_ghostscript.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestGhostscript(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_ghostscript/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_GHOSTSCRIPT=y + BR2_PACKAGE_TESSERACT_OCR=y + BR2_PACKAGE_TESSERACT_OCR_LANG_ENG=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("gs --version") + + doc_basename = "document" + ps_file = doc_basename + ".ps" + pgm_file = doc_basename + ".pgm" + txt_file = doc_basename + ".txt" + + # Render a basic PostScript file to an image file. + cmd = "gs -dSAFER -dBATCH -dNOPAUSE -sDEVICE=pgmraw -r150" + cmd += f" -dTextAlphaBits=4 -sOutputFile='{pgm_file}' {ps_file}" + self.assertRunOk(cmd) + + # Run text recognition on the image file. + cmd = f"tesseract {pgm_file} {doc_basename}" + self.assertRunOk(cmd, timeout=30) + + # Check we extracted the expected string from the input + # PostScript file. + cmd = f"cat {txt_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello Buildroot!") diff --git a/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps b/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps new file mode 100644 index 0000000000..5ca2b3581f --- /dev/null +++ b/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps @@ -0,0 +1,9 @@ +%!PS +% See: PostScript: Language Reference, third edition +% Example 5.1, page 314 +% https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf +/Helvetica findfont +16 scalefont setfont +54 720 moveto +(Hello Buildroot!) show +showpage -- 2.43.0 From ju.o at free.fr Fri Feb 9 19:37:43 2024 From: ju.o at free.fr (Julien Olivain) Date: Fri, 9 Feb 2024 20:37:43 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add iozone runtime test Message-ID: <20240209193743.1204013-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_iozone.py | 22 ++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 support/testing/tests/package/test_iozone.py diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..45cafc6a03 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1791,6 +1791,7 @@ F: support/testing/tests/package/test_gnuradio/ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf3.py F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ diff --git a/support/testing/tests/package/test_iozone.py b/support/testing/tests/package/test_iozone.py new file mode 100644 index 0000000000..9a9843df56 --- /dev/null +++ b/support/testing/tests/package/test_iozone.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestIozone(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IOZONE=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]) + self.emulator.login() + + self.assertRunOk("iozone -v") + self.assertRunOk("iozone -s64 -r4") -- 2.43.0 From fontaine.fabrice at gmail.com Fri Feb 9 19:50:21 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 9 Feb 2024 20:50:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/rlwrap: needs MMU Message-ID: <20240209195021.341782-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit 0a1f2fce0494388080af0a4130e62522c26fe4a9: /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: pty.o: in function `my_pty_fork': pty.c:(.text+0x68): undefined reference to `fork' /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: filter.o: in function `.L0 ': filter.c:(.text+0x134): undefined reference to `fork' Fixes: - http://autobuild.buildroot.org/results/0a3a68cfb181bc67a7dbf1d44f64b0a29df75987 Signed-off-by: Fabrice Fontaine --- package/rlwrap/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rlwrap/Config.in b/package/rlwrap/Config.in index 0cb3e33fa7..4e18dfde52 100644 --- a/package/rlwrap/Config.in +++ b/package/rlwrap/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RLWRAP bool "rlwrap" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_READLINE help rlwrap is a 'readline wrapper', a small utility that uses the -- 2.43.0 From gael.portay at rtone.fr Fri Feb 9 20:44:39 2024 From: gael.portay at rtone.fr (=?UTF-8?q?Ga=C3=ABl=20PORTAY?=) Date: Fri, 9 Feb 2024 21:44:39 +0100 Subject: [Buildroot] [PATCH v3 1/1] configs: add raspberrypi 5 defconfig Message-ID: <20240209204441.86187-1-gael.portay@rtone.fr> This configuration builds an image for the RaspberryPi 5. Cc: Adam Duskett Cc: Yann E. MORIN Signed-off-by: Ga?l PORTAY --- Dear maintainers, That change adds the raspberrypi5_defconfig for the Raspberry Pi 5 64-bit. It uses the defconfig bcm2712_defconfig[2] and the device-tree source bcm2712-rpi-5-b.dts[3]. Note: The kernel defconfig defaults to 16k page-size; a kernel fragment is added to use a 4k page-size to compile and run using all toolchains. The Raspberry Pi 5 has now a dedicated debug UART connector[4] (it is always active and enabled; there is no more need to enable_uart=1 in the file config.txt). The UART device name changes to ttyAMA10 and the command line has to be updated in the file cmdline.txt. The Raspberry Pi 5 only supports 64-bit kernel[5]. Tested on internal toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1117-g95a905918c) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Fri Feb 9 20:09:08 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Tested on external Bootlin toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-linux-gcc.br_real (Buildroot 2021.11-10014-g6257e8c) 13.2.0, GNU ld (GNU Binutils) 2.41) #1 SMP PREEMPT Fri Feb 9 20:54:08 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Tested on external ARM toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 13.2.1 20231009, GNU ld (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 2.41.0.20231009) #1 SMP PREEMPT Fri Feb 9 21:00:24 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Changes since RFC: - Update README to add model Pi 5 B - Add support for 64K MMU page-size for ARM64 and Raspberry Pi 5 - Add Raspberry Pi 5 specific cmdline_5.txt to set its console on its debug uart (ttyAMA10 instead of ttyAMA0) - Remove 32-bit variant since Raspberry Pi 5 supports booting a 64-bit kernel only - Remove the property arm_64bit=1 from config_5_64bit.txt - Remove the _64bit suffix - Remove unecessary Pi 5 variant from package rpi-firmware Changes since v1: - Rebase on top of master - Remove the bumps for the rpi-firmware and linux packages - Bump the kernel to linux-17f135b742c4edb340afb365873c3a574f7e16cb (6.1.61, i.e. the same version as the other raspberrypi defconfigs) Changes since v2: - Rebase on top of master (remove applied patch) - Add a kernel fragment to force 4k page-size - Remove BR2_ARM64_PAGE_SIZE_16K from the board's defconfig [0]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#introduction [1]: https://www.raspberrypi.com/documentation/computers/config_txt.html#kernel [2]: https://github.com/raspberrypi/linux/commit/9cfb379147f803b0362b0fe249e5b145d232bea3 [3]: https://github.com/raspberrypi/linux/commit/1196bf1a7736ff0ab79f5012fa84082e298031a7 [4]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#uart-connector [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#arm_64bit Kind Regards, Ga?l PORTAY board/raspberrypi/cmdline_5.txt | 1 + board/raspberrypi/config_5.txt | 14 ++++++ board/raspberrypi/linux-4k-page-size.fragment | 1 + board/raspberrypi/readme.txt | 6 +++ board/raspberrypi5 | 1 + configs/raspberrypi5_defconfig | 47 +++++++++++++++++++ 6 files changed, 70 insertions(+) create mode 100644 board/raspberrypi/cmdline_5.txt create mode 100644 board/raspberrypi/config_5.txt create mode 100644 board/raspberrypi/linux-4k-page-size.fragment create mode 120000 board/raspberrypi5 create mode 100644 configs/raspberrypi5_defconfig diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt new file mode 100644 index 0000000000..ac457353e2 --- /dev/null +++ b/board/raspberrypi/cmdline_5.txt @@ -0,0 +1 @@ +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt new file mode 100644 index 0000000000..bbed19fe46 --- /dev/null +++ b/board/raspberrypi/config_5.txt @@ -0,0 +1,14 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 diff --git a/board/raspberrypi/linux-4k-page-size.fragment b/board/raspberrypi/linux-4k-page-size.fragment new file mode 100644 index 0000000000..5df91df1aa --- /dev/null +++ b/board/raspberrypi/linux-4k-page-size.fragment @@ -0,0 +1 @@ +CONFIG_ARM64_4K_PAGES=y diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 9202b5ff37..aa6421ea01 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: - the model B3 (aka Raspberry Pi 3). - the model B4 (aka Raspberry Pi 4). - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). + - the model B5 (aka Raspberry Pi 5). How to build it =============== @@ -64,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): $ make raspberrypicm4io_64_defconfig +For model 5 B: + + $ make raspberrypi5_defconfig + Build the rootfs ---------------- @@ -94,6 +99,7 @@ After building, you should obtain this tree: +-- bcm2710-rpi-cm3.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] + +-- bcm2712-rpi-5-b.dtb [1] +-- bcm2837-rpi-3-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 diff --git a/board/raspberrypi5 b/board/raspberrypi5 new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypi5 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig new file mode 100644 index 0000000000..d0760824bd --- /dev/null +++ b/configs/raspberrypi5_defconfig @@ -0,0 +1,47 @@ +BR2_aarch64=y +BR2_cortex_a76_a55=y +BR2_ARM_FPU_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y -- 2.43.0 From gael.portay at rtone.fr Fri Feb 9 20:45:44 2024 From: gael.portay at rtone.fr (=?UTF-8?q?Ga=C3=ABl=20PORTAY?=) Date: Fri, 9 Feb 2024 21:45:44 +0100 Subject: [Buildroot] [PATCH v3 1/1] configs: add raspberrypi 5 defconfig Message-ID: <20240209204545.86221-1-gael.portay@rtone.fr> This configuration builds an image for the RaspberryPi 5. Cc: Adam Duskett Cc: Yann E. MORIN Signed-off-by: Ga?l PORTAY --- Dear maintainers, That change adds the raspberrypi5_defconfig for the Raspberry Pi 5 64-bit. It uses the defconfig bcm2712_defconfig[2] and the device-tree source bcm2712-rpi-5-b.dts[3]. Note: The kernel defconfig defaults to 16k page-size; a kernel fragment is added to use a 4k page-size to compile and run using all toolchains. The Raspberry Pi 5 has now a dedicated debug UART connector[4] (it is always active and enabled; there is no more need to enable_uart=1 in the file config.txt). The UART device name changes to ttyAMA10 and the command line has to be updated in the file cmdline.txt. The Raspberry Pi 5 only supports 64-bit kernel[5]. Tested on internal toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1117-g95a905918c) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Fri Feb 9 20:09:08 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Tested on external Bootlin toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-linux-gcc.br_real (Buildroot 2021.11-10014-g6257e8c) 13.2.0, GNU ld (GNU Binutils) 2.41) #1 SMP PREEMPT Fri Feb 9 20:54:08 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Tested on external ARM toolchain: [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 13.2.1 20231009, GNU ld (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 2.41.0.20231009) #1 SMP PREEMPT Fri Feb 9 21:00:24 CET 2024 (...) # grep PageSize /proc/1/smaps | sort -u KernelPageSize: 4 kB MMUPageSize: 4 kB Changes since RFC: - Update README to add model Pi 5 B - Add support for 64K MMU page-size for ARM64 and Raspberry Pi 5 - Add Raspberry Pi 5 specific cmdline_5.txt to set its console on its debug uart (ttyAMA10 instead of ttyAMA0) - Remove 32-bit variant since Raspberry Pi 5 supports booting a 64-bit kernel only - Remove the property arm_64bit=1 from config_5_64bit.txt - Remove the _64bit suffix - Remove unecessary Pi 5 variant from package rpi-firmware Changes since v1: - Rebase on top of master - Remove the bumps for the rpi-firmware and linux packages - Bump the kernel to linux-17f135b742c4edb340afb365873c3a574f7e16cb (6.1.61, i.e. the same version as the other raspberrypi defconfigs) Changes since v2: - Rebase on top of master (remove applied patch) - Add a kernel fragment to force 4k page-size - Remove BR2_ARM64_PAGE_SIZE_16K from the board's defconfig [0]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#introduction [1]: https://www.raspberrypi.com/documentation/computers/config_txt.html#kernel [2]: https://github.com/raspberrypi/linux/commit/9cfb379147f803b0362b0fe249e5b145d232bea3 [3]: https://github.com/raspberrypi/linux/commit/1196bf1a7736ff0ab79f5012fa84082e298031a7 [4]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#uart-connector [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#arm_64bit Kind Regards, Ga?l PORTAY board/raspberrypi/cmdline_5.txt | 1 + board/raspberrypi/config_5.txt | 14 ++++++ board/raspberrypi/linux-4k-page-size.fragment | 1 + board/raspberrypi/readme.txt | 6 +++ board/raspberrypi5 | 1 + configs/raspberrypi5_defconfig | 47 +++++++++++++++++++ 6 files changed, 70 insertions(+) create mode 100644 board/raspberrypi/cmdline_5.txt create mode 100644 board/raspberrypi/config_5.txt create mode 100644 board/raspberrypi/linux-4k-page-size.fragment create mode 120000 board/raspberrypi5 create mode 100644 configs/raspberrypi5_defconfig diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt new file mode 100644 index 0000000000..ac457353e2 --- /dev/null +++ b/board/raspberrypi/cmdline_5.txt @@ -0,0 +1 @@ +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt new file mode 100644 index 0000000000..bbed19fe46 --- /dev/null +++ b/board/raspberrypi/config_5.txt @@ -0,0 +1,14 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 diff --git a/board/raspberrypi/linux-4k-page-size.fragment b/board/raspberrypi/linux-4k-page-size.fragment new file mode 100644 index 0000000000..5df91df1aa --- /dev/null +++ b/board/raspberrypi/linux-4k-page-size.fragment @@ -0,0 +1 @@ +CONFIG_ARM64_4K_PAGES=y diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 9202b5ff37..aa6421ea01 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: - the model B3 (aka Raspberry Pi 3). - the model B4 (aka Raspberry Pi 4). - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). + - the model B5 (aka Raspberry Pi 5). How to build it =============== @@ -64,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): $ make raspberrypicm4io_64_defconfig +For model 5 B: + + $ make raspberrypi5_defconfig + Build the rootfs ---------------- @@ -94,6 +99,7 @@ After building, you should obtain this tree: +-- bcm2710-rpi-cm3.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] + +-- bcm2712-rpi-5-b.dtb [1] +-- bcm2837-rpi-3-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 diff --git a/board/raspberrypi5 b/board/raspberrypi5 new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypi5 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig new file mode 100644 index 0000000000..d0760824bd --- /dev/null +++ b/configs/raspberrypi5_defconfig @@ -0,0 +1,47 @@ +BR2_aarch64=y +BR2_cortex_a76_a55=y +BR2_ARM_FPU_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y -- 2.43.0 From fontaine.fabrice at gmail.com Fri Feb 9 20:38:52 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 9 Feb 2024 21:38:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqrtr-glib: fix static build Message-ID: <20240209203852.671387-1-fontaine.fabrice@gmail.com> Fix the following static build failure raised since bump to version 1.2.2 in commit b50bb982208011841fe0a9a7e4309808085cf493: [5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 Fixes: - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d Signed-off-by: Fabrice Fontaine --- ...rtr-lib-meson.build-fix-static-build.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch diff --git a/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch b/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch new file mode 100644 index 0000000000..8c0db7bed5 --- /dev/null +++ b/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch @@ -0,0 +1,36 @@ +From dd9d68259c1fb79bcf40fcdf6aa1e6026edec9b2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 9 Feb 2024 21:16:39 +0100 +Subject: [PATCH] src/libqrtr-lib/meson.build: fix static build + +Replace shared_library by library to avoid the following static build +failure: + +[5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 +FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 + +Fixes: + - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/merge_requests/24 +--- + src/libqrtr-glib/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libqrtr-glib/meson.build b/src/libqrtr-glib/meson.build +index bbdd869..0cddcc7 100644 +--- a/src/libqrtr-glib/meson.build ++++ b/src/libqrtr-glib/meson.build +@@ -39,7 +39,7 @@ c_flags = [ + '-DLIBEXEC_PATH="@0@"'.format(qrtr_prefix / qrtr_libexecdir), + ] + +-libqrtr_glib = shared_library( ++libqrtr_glib = library( + libname, + version: qrtr_glib_version, + sources: sources + [version_header], +-- +2.43.0 + -- 2.43.0 From gael.portay at rtone.fr Fri Feb 9 20:50:29 2024 From: gael.portay at rtone.fr (=?utf-8?q?Ga=C3=ABl_PORTAY?=) Date: Fri, 09 Feb 2024 21:50:29 +0100 Subject: [Buildroot] [PATCH v3 1/1] configs: add raspberrypi 5 defconfig In-Reply-To: <20240209204545.86221-1-gael.portay@rtone.fr> References: <20240209204545.86221-1-gael.portay@rtone.fr> Message-ID: Sorry for that double post. On Fri Feb 9, 2024 at 9:45 PM CET, Ga?l PORTAY wrote: > This configuration builds an image for the RaspberryPi 5. > > Cc: Adam Duskett > Cc: Yann E. MORIN > Signed-off-by: Ga?l PORTAY > --- > Dear maintainers, > > That change adds the raspberrypi5_defconfig for the Raspberry Pi 5 > 64-bit. > > It uses the defconfig bcm2712_defconfig[2] and the device-tree source > bcm2712-rpi-5-b.dts[3]. > > Note: The kernel defconfig defaults to 16k page-size; a kernel fragment > is added to use a 4k page-size to compile and run using all toolchains. > > The Raspberry Pi 5 has now a dedicated debug UART connector[4] (it is > always active and enabled; there is no more need to enable_uart=1 in the > file config.txt). > > The UART device name changes to ttyAMA10 and the command line has to be > updated in the file cmdline.txt. > > The Raspberry Pi 5 only supports 64-bit kernel[5]. > > Tested on internal toolchain: > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1117-g95a905918c) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Fri Feb 9 20:09:08 CET 2024 > (...) > # grep PageSize /proc/1/smaps | sort -u > KernelPageSize: 4 kB > MMUPageSize: 4 kB > > Tested on external Bootlin toolchain: > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-linux-gcc.br_real (Buildroot 2021.11-10014-g6257e8c) 13.2.0, GNU ld (GNU Binutils) 2.41) #1 SMP PREEMPT Fri Feb 9 20:54:08 CET 2024 > (...) > # grep PageSize /proc/1/smaps | sort -u > KernelPageSize: 4 kB > MMUPageSize: 4 kB > > Tested on external ARM toolchain: > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 13.2.1 20231009, GNU ld (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 2.41.0.20231009) #1 SMP PREEMPT Fri Feb 9 21:00:24 CET 2024 > (...) > # grep PageSize /proc/1/smaps | sort -u > KernelPageSize: 4 kB > MMUPageSize: 4 kB > > Changes since RFC: > - Update README to add model Pi 5 B > - Add support for 64K MMU page-size for ARM64 and Raspberry Pi 5 > - Add Raspberry Pi 5 specific cmdline_5.txt to set its console on its > debug uart (ttyAMA10 instead of ttyAMA0) > - Remove 32-bit variant since Raspberry Pi 5 supports booting a 64-bit > kernel only > - Remove the property arm_64bit=1 from config_5_64bit.txt > - Remove the _64bit suffix > - Remove unecessary Pi 5 variant from package rpi-firmware > > Changes since v1: > - Rebase on top of master > - Remove the bumps for the rpi-firmware and linux packages > - Bump the kernel to linux-17f135b742c4edb340afb365873c3a574f7e16cb > (6.1.61, i.e. the same version as the other raspberrypi defconfigs) > > Changes since v2: > - Rebase on top of master (remove applied patch) > - Add a kernel fragment to force 4k page-size > - Remove BR2_ARM64_PAGE_SIZE_16K from the board's defconfig > > [0]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#introduction > [1]: https://www.raspberrypi.com/documentation/computers/config_txt.html#kernel > [2]: https://github.com/raspberrypi/linux/commit/9cfb379147f803b0362b0fe249e5b145d232bea3 > [3]: https://github.com/raspberrypi/linux/commit/1196bf1a7736ff0ab79f5012fa84082e298031a7 > [4]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#uart-connector > [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#arm_64bit > > Kind Regards, > Ga?l PORTAY > > board/raspberrypi/cmdline_5.txt | 1 + > board/raspberrypi/config_5.txt | 14 ++++++ > board/raspberrypi/linux-4k-page-size.fragment | 1 + > board/raspberrypi/readme.txt | 6 +++ > board/raspberrypi5 | 1 + > configs/raspberrypi5_defconfig | 47 +++++++++++++++++++ > 6 files changed, 70 insertions(+) > create mode 100644 board/raspberrypi/cmdline_5.txt > create mode 100644 board/raspberrypi/config_5.txt > create mode 100644 board/raspberrypi/linux-4k-page-size.fragment > create mode 120000 board/raspberrypi5 > create mode 100644 configs/raspberrypi5_defconfig > > diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt > new file mode 100644 > index 0000000000..ac457353e2 > --- /dev/null > +++ b/board/raspberrypi/cmdline_5.txt > @@ -0,0 +1 @@ > +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 > diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt > new file mode 100644 > index 0000000000..bbed19fe46 > --- /dev/null > +++ b/board/raspberrypi/config_5.txt > @@ -0,0 +1,14 @@ > +# Please note that this is only a sample, we recommend you to change it to fit > +# your needs. > +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. > +# See http://buildroot.org/manual.html#rootfs-custom > +# and http://elinux.org/RPiconfig for a description of config.txt syntax > + > +kernel=Image > + > +# To use an external initramfs file > +#initramfs rootfs.cpio.gz > + > +# Disable overscan assuming the display supports displaying the full resolution > +# If the text shown on the screen disappears off the edge, comment this out > +disable_overscan=1 > diff --git a/board/raspberrypi/linux-4k-page-size.fragment b/board/raspberrypi/linux-4k-page-size.fragment > new file mode 100644 > index 0000000000..5df91df1aa > --- /dev/null > +++ b/board/raspberrypi/linux-4k-page-size.fragment > @@ -0,0 +1 @@ > +CONFIG_ARM64_4K_PAGES=y > diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt > index 9202b5ff37..aa6421ea01 100644 > --- a/board/raspberrypi/readme.txt > +++ b/board/raspberrypi/readme.txt > @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: > - the model B3 (aka Raspberry Pi 3). > - the model B4 (aka Raspberry Pi 4). > - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). > + - the model B5 (aka Raspberry Pi 5). > > How to build it > =============== > @@ -64,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): > > $ make raspberrypicm4io_64_defconfig > > +For model 5 B: > + > + $ make raspberrypi5_defconfig > + > Build the rootfs > ---------------- > > @@ -94,6 +99,7 @@ After building, you should obtain this tree: > +-- bcm2710-rpi-cm3.dtb [1] > +-- bcm2711-rpi-4-b.dtb [1] > +-- bcm2711-rpi-cm4.dtb [1] > + +-- bcm2712-rpi-5-b.dtb [1] > +-- bcm2837-rpi-3-b.dtb [1] > +-- boot.vfat > +-- rootfs.ext4 > diff --git a/board/raspberrypi5 b/board/raspberrypi5 > new file mode 120000 > index 0000000000..fcdafc81ed > --- /dev/null > +++ b/board/raspberrypi5 > @@ -0,0 +1 @@ > +raspberrypi > \ No newline at end of file > diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig > new file mode 100644 > index 0000000000..d0760824bd > --- /dev/null > +++ b/configs/raspberrypi5_defconfig > @@ -0,0 +1,47 @@ > +BR2_aarch64=y > +BR2_cortex_a76_a55=y > +BR2_ARM_FPU_VFPV4=y > + > +BR2_TOOLCHAIN_BUILDROOT_CXX=y > + > +BR2_SYSTEM_DHCP="eth0" > + > +# Linux headers same as kernel, a 6.1 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > + > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" > + > +# Build the DTB from the kernel sources > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" > + > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +BR2_PACKAGE_RPI_FIRMWARE=y > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" > +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" > +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > + > +# Filesystem / image > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +# BR2_TARGET_ROOTFS_TAR is not set > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" > + > +# Enable compressed kernel module support > +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > +BR2_PACKAGE_KMOD_TOOLS=y > +BR2_PACKAGE_XZ=y > +BR2_PACKAGE_KMOD=y > +BR2_PACKAGE_HOST_KMOD_XZ=y > -- > 2.43.0 From fontaine.fabrice at gmail.com Fri Feb 9 21:08:01 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 9 Feb 2024 22:08:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/uhd: fix build with gcc >= 13 Message-ID: <20240209210801.880001-1-fontaine.fabrice@gmail.com> Fix the following build failure with gcc >= 13: In file included from /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/lib/cal/database.cpp:7: /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:86:24: error: 'uint8_t' was not declared in this scope 86 | static std::vector read_cal_data(const std::string& key, | ^~~~~~~ /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:14:1: note: 'uint8_t' is defined in header ''; did you forget to '#include '? 13 | #include +++ |+#include 14 | Fixes: - http://autobuild.buildroot.org/results/cc52f2ed4fa43fe9c92713eb8561afcba29e12f3 Signed-off-by: Fabrice Fontaine --- ...h-GCC-13-add-missing-cstdint-include.patch | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch diff --git a/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch b/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch new file mode 100644 index 0000000000..acf720a15d --- /dev/null +++ b/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch @@ -0,0 +1,117 @@ +From 3acf784e988608cbce34cd0be0a8703ba53ea515 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 3 Jan 2023 23:04:52 +0000 +Subject: [PATCH] Fix build with GCC 13 (add missing include) + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so is no longer transitively included. + +Explicitly include for uint8_t. + +``` +/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:43:14: error: 'uint32_t' does not name a type + 43 | static const uint32_t DEFAULT_NOC_ID = 0xFFFFFFFF; + | ^~~~~~~~ +/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:1:1: note: 'uint32_t' is defined in header ''; did you forget to '#include '? + +++ |+#include + 1 | // +``` + +Signed-off-by: Sam James + +Upstream: https://github.com/EttusResearch/uhd/commit/3acf784e988608cbce34cd0be0a8703ba53ea515 +Signed-off-by: Fabrice Fontaine +--- + host/include/uhd/cal/database.hpp | 1 + + host/include/uhd/rfnoc/defaults.hpp | 1 + + host/include/uhd/types/eeprom.hpp | 1 + + host/include/uhd/usrp/zbx_tune_map_item.hpp | 1 + + host/lib/usrp/dboard/magnesium/magnesium_constants.hpp | 1 + + host/lib/usrp/dboard/rhodium/rhodium_constants.hpp | 1 + + host/lib/utils/serial_number.cpp | 1 + + 7 files changed, 7 insertions(+) + +diff --git a/host/include/uhd/cal/database.hpp b/host/include/uhd/cal/database.hpp +index b6abbb6df7..9d47febedd 100644 +--- a/host/include/uhd/cal/database.hpp ++++ b/host/include/uhd/cal/database.hpp +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp +index aa7778aacf..6c878a8d70 100644 +--- a/host/include/uhd/rfnoc/defaults.hpp ++++ b/host/include/uhd/rfnoc/defaults.hpp +@@ -8,6 +8,7 @@ + + #pragma once + ++#include + #include + + namespace uhd { namespace rfnoc { +diff --git a/host/include/uhd/types/eeprom.hpp b/host/include/uhd/types/eeprom.hpp +index 3a7605d3cb..420440aa64 100644 +--- a/host/include/uhd/types/eeprom.hpp ++++ b/host/include/uhd/types/eeprom.hpp +@@ -6,6 +6,7 @@ + + #pragma once + ++#include + #include + #include + #include +diff --git a/host/include/uhd/usrp/zbx_tune_map_item.hpp b/host/include/uhd/usrp/zbx_tune_map_item.hpp +index e49f49f785..ce95623de2 100644 +--- a/host/include/uhd/usrp/zbx_tune_map_item.hpp ++++ b/host/include/uhd/usrp/zbx_tune_map_item.hpp +@@ -6,6 +6,7 @@ + + #pragma once + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp +index 99f2b910c6..99f5a4933f 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp +index 591d02d305..1577e02d9e 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/host/lib/utils/serial_number.cpp b/host/lib/utils/serial_number.cpp +index 61296a9139..c07730e24d 100644 +--- a/host/lib/utils/serial_number.cpp ++++ b/host/lib/utils/serial_number.cpp +@@ -5,6 +5,7 @@ + // + + #include ++#include + #include + #include + -- 2.43.0 From thomas.petazzoni at bootlin.com Fri Feb 9 22:00:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Fri, 9 Feb 2024 23:00:08 +0100 Subject: [Buildroot] [PATCH] package/ifplugd: add option to override sysconfdir In-Reply-To: References: <20240115142744.70711-1-aolvolk@salutedevices.com> <20240205180959.5c662ae1@windsurf> Message-ID: <20240209230008.615bf94e@windsurf> Hello Alisa, Your e-mail wraps very weirdly the messages you reply to, as it forgets the quotation mark on the second line of the quoted text. On Fri, 9 Feb 2024 14:02:14 +0300 Alisa Volk wrote: > The init script is auto-generated, and the path to ifplugd.conf file > inside it is configured with sysconfdir option. Correct, I hadn't realized this init script was installed. Usually, Buildroot provides its own init scripts. My suggestion here will be to patch/override this init script in your root filesystem overlay, or using a post-build script. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From petr.vorel at gmail.com Sat Feb 10 00:03:57 2024 From: petr.vorel at gmail.com (Petr Vorel) Date: Sat, 10 Feb 2024 01:03:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqrtr-glib: fix static build In-Reply-To: <20240209203852.671387-1-fontaine.fabrice@gmail.com> References: <20240209203852.671387-1-fontaine.fabrice@gmail.com> Message-ID: <20240210000357.GA381153@pevik> Hi Fabrice, Reviewed-by: Petr Vorel Thanks! > Fix the following static build failure raised since bump to version > 1.2.2 in commit b50bb982208011841fe0a9a7e4309808085cf493: > [5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 > FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 > Fixes: > - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d I would also add usual Fixes:, but Buildroot might not use it. Fixes: b50bb98220 ("package/libqrtr-glib: bump version to 1.2.2") Kind regards, Petr From bernd at kuhls.net Sat Feb 10 07:36:59 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 10 Feb 2024 08:36:59 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240210073659.5018-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index da22b439e3..773cb4fbb5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.15" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.16" 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 10edcc2ed9..52fb480af2 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa linux-6.6.15.tar.xz -sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz +sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz +sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a0e572adc0..69857566e3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.76" if BR2_KERNEL_HEADERS_6_1 - default "6.6.15" if BR2_KERNEL_HEADERS_6_6 + default "6.1.77" if BR2_KERNEL_HEADERS_6_1 + default "6.6.16" if BR2_KERNEL_HEADERS_6_6 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 \ -- 2.39.2 From fperrad at gmail.com Sat Feb 10 08:27:51 2024 From: fperrad at gmail.com (Francois Perrad) Date: Sat, 10 Feb 2024 09:27:51 +0100 Subject: [Buildroot] [PATCH] package/lua-http: fix CVE-2023-4540 Message-ID: <20240210082751.12920-1-francois.perrad@gadz.org> see https://nvd.nist.gov/vuln/detail/CVE-2023-4540 & https://cert.pl/en/posts/2023/09/CVE-2023-4540 Signed-off-by: Francois Perrad --- ...andle-EOF-when-body_read_type-length.patch | 68 +++++++++++++++++++ package/lua-http/lua-http.mk | 3 + 2 files changed, 71 insertions(+) create mode 100644 package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch diff --git a/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch new file mode 100644 index 000000000..e8f88f1ae --- /dev/null +++ b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch @@ -0,0 +1,68 @@ +From ddab2835c583d45dec62680ca8d3cbde55e0bae6 Mon Sep 17 00:00:00 2001 +From: daurnimator +Date: Tue, 22 Aug 2023 23:30:20 +1000 +Subject: [PATCH] http/h1_stream: handle EOF when `body_read_type==length` + +If a client closes the connection before sending the expected number of bytes +then return `EPIPE`. +This fixes a potential infinite draining loop when trying to trying to +`:shutdown()` a stream. +--- + http/h1_stream.lua | 2 ++ + spec/h1_stream_spec.lua | 27 +++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/lua-http-0.4/http/h1_stream.lua b/lua-http-0.4/http/h1_stream.lua +index b2469a1..b0ca821 100644 +--- a/lua-http-0.4/http/h1_stream.lua ++++ b/lua-http-0.4/http/h1_stream.lua +@@ -861,6 +861,8 @@ function stream_methods:read_next_chunk(timeout) + if chunk ~= nil then + self.body_read_left = length_n - #chunk + end_stream = (self.body_read_left == 0) ++ elseif err == nil then ++ return nil, ce.strerror(ce.EPIPE), ce.EPIPE + end + elseif length_n == 0 then + chunk = "" +diff --git a/lua-http-0.4/spec/h1_stream_spec.lua b/lua-http-0.4/spec/h1_stream_spec.lua +index f9cfea9..1303f94 100644 +--- a/lua-http-0.4/spec/h1_stream_spec.lua ++++ b/lua-http-0.4/spec/h1_stream_spec.lua +@@ -295,6 +295,33 @@ describe("http1 stream", function() + server:close() + client:close() + end) ++ it("Doesn't hang when a content-length delimited stream is closed", function() ++ local server, client = new_pair(1.1) ++ local cq = cqueues.new() ++ cq:wrap(function() ++ local stream = client:new_stream() ++ local headers = new_headers() ++ headers:append(":method", "GET") ++ headers:append(":scheme", "http") ++ headers:append(":authority", "myauthority") ++ headers:append(":path", "/a") ++ assert(stream:write_headers(headers, true)) ++ end) ++ cq:wrap(function() ++ local stream = server:get_next_incoming_stream() ++ assert(stream:get_headers()) ++ local res_headers = new_headers() ++ res_headers:append(":status", "200") ++ res_headers:append("content-length", "100") ++ assert(stream:write_headers(res_headers, false)) ++ assert(stream:write_chunk("foo", false)) ++ assert(stream:shutdown()) ++ end) ++ assert_loop(cq, TEST_TIMEOUT) ++ assert.truthy(cq:empty()) ++ server:close() ++ client:close() ++ end) + it("allows pipelining", function() + local server, client = new_pair(1.1) + local cq = cqueues.new() +-- +2.40.1 + diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index df3e2c005..34387c12e 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -13,4 +13,7 @@ LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_CPE_ID_VENDOR = daurnimator +# 0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch +LUA_HTTP_IGNORE_CVES += CVE-2023-4540 + $(eval $(luarocks-package)) -- 2.40.1 From cjts at protonmail.ch Sat Feb 10 09:32:00 2024 From: cjts at protonmail.ch (cjts) Date: Sat, 10 Feb 2024 09:32:00 +0000 Subject: [Buildroot] Unable to build host python3.12 Message-ID: Hi I checked out the master branch at 8ab4a0a348b255a074d16b640e8a372fe94596dc and tried to build a defconfig (x86_64) with HOST_PYTHON3 enabled. The install part fails thus: ost/lib/python3.12/lib-dynload/_tkinter.cpython-312-x86_64-linux-gnu.so /usr/bin/install -c -m 644 ./Lib/shutil.py /mnt/vmtmp/buildroot/output/host/lib/python3.12 /usr/bin/install -c -m 644 ./Lib/signal.py /mnt/vmtmp/buildroot/output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory I looked at the makefile.pre.in but I cannot see why tkinter is being included. Cheers CJ From ju.o at free.fr Sat Feb 10 10:09:28 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 10 Feb 2024 11:09:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/ghostscript: security bump to version 10.02.1 Message-ID: <20240210100928.172584-1-ju.o@free.fr> For release note, see: https://ghostscript.readthedocs.io/en/gs10.02.1/News.html For detailed history, see: https://git.ghostscript.com/?p=ghostpdl.git;a=shortlog;h=refs/tags/ghostpdl-10.02.1 Fixes: - CVE-2023-46751: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-46751 Signed-off-by: Julien Olivain --- package/ghostscript/ghostscript.hash | 4 ++-- package/ghostscript/ghostscript.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 77c8faccbe..849f6c64ba 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10020/SHA512SUMS -sha512 c49344151063e915add55a0a842c2a645d8362a5cbca663bd07638f4bd3699a08cade37a9efe905ad5a41e014353e5e1b1268b7925e43128ad30d5b031396b71 ghostscript-10.02.0.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10021/SHA512SUMS +sha512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11 ghostscript-10.02.1.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 161521f970..da23ebbadb 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.02.0 +GHOSTSCRIPT_VERSION = 10.02.1 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 -- 2.43.0 From bernd at kuhls.net Sat Feb 10 10:36:34 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 10 Feb 2024 11:36:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/heimdal: Fix build with autoconf-2.72 Message-ID: <20240210103634.3502847-1-bernd@kuhls.net> Fixes: http://autobuild.buildroot.net/results/175/175fb65f0151866cd2d83c91c23b453d8c4489f7/ Signed-off-by: Bernd Kuhls --- ...file.m4-Fix-build-with-autoconf-2.72.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch diff --git a/package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch b/package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch new file mode 100644 index 0000000000..655ede2af6 --- /dev/null +++ b/package/heimdal/0002-cf-largefile.m4-Fix-build-with-autoconf-2.72.patch @@ -0,0 +1,30 @@ +From 2b372170c894ed9aa3fe2fca976f3541ea7041d9 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 10 Feb 2024 09:33:48 +0100 +Subject: [PATCH] cf/largefile.m4: Fix build with autoconf-2.72 + +Fixes https://github.com/heimdal/heimdal/issues/1201 + +Upstream: https://github.com/heimdal/heimdal/pull/1229 + +Signed-off-by: Bernd Kuhls +--- + cf/largefile.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cf/largefile.m4 b/cf/largefile.m4 +index 5c54897be..cdbbc5543 100644 +--- a/cf/largefile.m4 ++++ b/cf/largefile.m4 +@@ -10,7 +10,7 @@ dnl with generated code, such as lex + if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then + CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files" + fi +-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then ++if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then + CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" + fi + ]) +-- +2.39.2 + -- 2.39.2 From ju.o at free.fr Sat Feb 10 12:23:38 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 10 Feb 2024 13:23:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgpgme: bump to version 1.23.2 Message-ID: <20240210122338.999772-1-ju.o@free.fr> For change log, see [1] and [2]. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-1.23.2 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=shortlog;h=gpgme-1.23.2 Signed-off-by: Julien Olivain --- Patch tested on branch master at commit 8ab4a0a with commands: make check-package ... 0 warnings generated utils/test-pkg -p libgpgme ... 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_libgpgme ... OK --- package/libgpgme/libgpgme.hash | 4 ++-- package/libgpgme/libgpgme.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index 5c47db76d5..64099df4c3 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 12f4c98ffa75bdbfc4934d38757f57ba718b5aa0 gpgme-1.22.0.tar.bz2 -sha256 9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71 gpgme-1.22.0.tar.bz2 +sha1 b3a938939a9fb2182684aa9ba094c8e8ecd6167b gpgme-1.23.2.tar.bz2 +sha256 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 gpgme-1.23.2.tar.bz2 # Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 036103b7fc..dd39b37aa2 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPGME_VERSION = 1.22.0 +LIBGPGME_VERSION = 1.23.2 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ -- 2.43.0 From ju.o at free.fr Sat Feb 10 12:25:52 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 10 Feb 2024 13:25:52 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: libgpgme: increase gpg key generation timeout Message-ID: <20240210122552.1001346-1-ju.o@free.fr> gpg key generation can take longer than the default timeout on a loaded or slow test host. The commit increase the timeout for the key generation command to prevent the test to randomly fail. Signed-off-by: Julien Olivain --- support/testing/tests/package/test_libgpgme.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_libgpgme.py b/support/testing/tests/package/test_libgpgme.py index 28a33bab03..b497891249 100644 --- a/support/testing/tests/package/test_libgpgme.py +++ b/support/testing/tests/package/test_libgpgme.py @@ -37,7 +37,7 @@ class TestLibGpgme(infra.basetest.BRTest): # We now create our gpg key. cmd = "gpg --batch --passphrase ''" cmd += f" --quick-generate-key {gpg_userid} default default" - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=30) # We should now see our key in the list. self.assertRunOk(gpgme_listkey) -- 2.43.0 From kilian.zinnecker at mail.de Sat Feb 10 15:22:10 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Sat, 10 Feb 2024 16:22:10 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/xuantie-bins: new package In-Reply-To: <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-2-kilian.zinnecker@mail.de> <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> Message-ID: <4544153.LvFx2qVVIh@laptop> Hello Giulio, all, > Hi Yegor, Kilian, This is strange, maybe someone can have a look here: On ozlabs, there are a lot of patches, which have the submitter "kilian.zinnecker--- via buildroot". However, most of them are NOT from me. E.g., one from Yegor Yefremov [1] is marked with submitter "kilian.zinnecker--- via buildroot" - However, I am definitively not Yegor, and none of his patches is from me. There are even more patches marked with "kilian.zinnecker--- via buildroot" [2], some of them even from before I ever submitted my first patch (the Rock5B board support) to buildroot. Does anyone have any idea what this is about, or can have a deeper look at this? (The BeagleV-Ahead patches are from me.) [1] https://patchwork.ozlabs.org/project/buildroot/patch/ 20240206132051.2838897-1-yegorslists at googlemail.com/ [2] https://patchwork.ozlabs.org/project/buildroot/list/? submitter=82609&archive=both&state=* [--SNIP--] Thanks for your review Giulio. I will try to address the issues and prepare a new version of the patches. Best regards, Kilian From kilian.zinnecker at mail.de Sat Feb 10 18:37:22 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Sat, 10 Feb 2024 19:37:22 +0100 Subject: [Buildroot] [help] configs/rock5b_defconfig: Switch to mainline kernel In-Reply-To: References: <2716329.mvXUDI8C0e@laptop> Message-ID: <1956485.PYKUYFuaPT@laptop> Hello Arnout, all, I was told that from kernel 6.7 on the ethernet of the Rock5B is supported, so I switched to that version (precisely 6.7.4 currently). > Clearly, the rootfs is on mmcblk1p2, not mmcblk0p2. So if you have > mmcblk0p2 on your command line, and rootwait, it will just wait > indefinitely for the rootfs to appear. Yes, correct, when I switch to mmcblk1p2 it works now! But I also switched to kernel 6.7.4 for now and switched the console in the bootargs to ttyS2 again. > > [ 31.717905] vdd_gpu_s0: disabling > > [ 115.285576] random: crng init done > > That's pretty late for the RNG to be initialized, you'll need the RNG > seeder from userspace - but this is enabled by default in Buildroot I > think. How could I check that? > > Of course it could be, that it is just not configured anymore to put a > > shell on the serial interface, but I already tried to address that with: > > > > BR2_TARGET_GENERIC_GETTY=y > > BR2_TARGET_GENERIC_GETTY_PORT="serial2" > > > > However, that did not seem to help. Could it be, that there is something > > wrong with the SD card formatting? It at least complains about it, but I > > am too unfamiliar with that, so I don't know whether it is a problem. > > That's normal. It's because the generated image is not the exact size of > your SD card, so the backup GPT partition table is somewhere in the middle > instead of at the end. You can run parted on your laptop after writing the > SD card and before booting it to fix the issue. But it shouldn't make any > difference at all for booting. Thanks, I am not familiar with this and thought, it might cause some troubles. Currently the Rock5B does boot now with the 6.7.4 upstream kernel, but ethernet does not work yet. I try to figure out how to get it working, then I will submit a patch. Thanks for your help and best regards, Kilian From yann.morin.1998 at free.fr Sat Feb 10 21:24:59 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:59 +0100 Subject: [Buildroot] [PATCH 6/6 v2] utils/checkpackagelib: add check for CPE variables set to default values In-Reply-To: References: Message-ID: Now that we can specify that the default values for the CPE_ID variables are valid, without having to actually set one (or more) to their default, add a check-package check that validates that the CPE_ID variables are indeed not set to their default. It also validates that CPE_ID_VALID is not set when another CPE_ID variable is set to a non-default value. Add an anchor in the manual so that we can easily point to it. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Cc: Ricardo Martincoski --- docs/manual/adding-packages-generic.adoc | 2 +- utils/checkpackagelib/lib_mk.py | 73 ++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index ce8608682f..9d365a10ca 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -511,7 +511,7 @@ LIBFOO_IGNORE_CVES += CVE-2020-12345 LIBFOO_IGNORE_CVES += CVE-2020-54321 ---------------------- -* +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the +* [[cpe-id]] +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the package to define its https://nvd.nist.gov/products/cpe[CPE identifier]. The available variables are: + diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index d340882971..ce2ab5157c 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -366,3 +366,76 @@ class VariableWithBraces(_CheckFunction): return ["{}:{}: use $() to delimit variables, not ${{}}" .format(self.filename, lineno), text] + + +class CPEVariables(_CheckFunction): + """ + Check that the values for the CPE variables are not the default. + - CPE_ID_* variables must not be set to their default + - CPE_ID_VALID must not be set if a non-default CPE_ID variable is set + """ + def before(self): + pkg, _ = os.path.splitext(os.path.basename(self.filename)) + self.CPE_fields_defaults = { + "VALID": "NO", + "PREFIX": "cpe:2.3:a", + "VENDOR": f"{pkg}_project", + "PRODUCT": pkg, + "VERSION": None, + "UPDATE": "*", + } + self.valid = None + self.non_defaults = 0 + self.CPE_FIELDS_RE = re.compile( + r"^\s*(.+_CPE_ID_({}))\s*=\s*(.+)$" + .format("|".join(self.CPE_fields_defaults)), + ) + self.VERSION_RE = re.compile( + rf"^(HOST_)?{pkg.upper().replace('-', '_')}_VERSION\s*=\s*(.+)$", + ) + self.COMMENT_RE = re.compile(r"^\s*#.*") + + def check_line(self, lineno, text): + text = self.COMMENT_RE.sub('', text.rstrip()) + + # WARNING! The VERSION_RE can _also_ match the same lines as CPE_FIELDS_RE, + # but not the other way around. So we must first check for CPE_FIELDS_RE, + # and if not matched, then and only then check for VERSION_RE. + match = self.CPE_FIELDS_RE.match(text) + if match: + var, field, val = match.groups() + return self._check_field(lineno, text, field, var, val) + + match = self.VERSION_RE.match(text) + if match: + self.CPE_fields_defaults["VERSION"] = match.groups()[1] + + def after(self): + # "VALID" counts in the non-defaults; so when "VALID" is present, + # 1 non-default means only "VALID" is present, so that's OK. + if self.valid and self.non_defaults > 1: + return ["{}:{}: 'YES' is implied when a non-default CPE_ID field is specified: {} ({}#cpe-id)".format( + self.filename, + self.valid["lineno"], + self.valid["text"], + self.url_to_manual, + )] + + def _check_field(self, lineno, text, field, var, val): + if field == "VERSION" and self.CPE_fields_defaults[field] is None: + return ["{}:{}: expecting package version to be set before CPE_ID_VERSION".format( + self.filename, + lineno, + )] + if val == self.CPE_fields_defaults[field]: + return ["{}:{}: '{}' is the default value for {} ({}#cpe-id)".format( + self.filename, + lineno, + val, + var, + self.url_to_manual, + )] + else: + if field == "VALID": + self.valid = {"lineno": lineno, "text": text} + self.non_defaults += 1 -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 10 21:24:54 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:54 +0100 Subject: [Buildroot] [PATCH 1/6 v2] utils/check-package: use https for the manual URL In-Reply-To: References: Message-ID: Signed-off-by: Yann E. MORIN --- utils/check-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/check-package b/utils/check-package index 105902303e..de41891b56 100755 --- a/utils/check-package +++ b/utils/check-package @@ -69,7 +69,7 @@ def parse_args(): help='override the default list of ignored warnings') parser.add_argument("--manual-url", action="store", - default="http://nightly.buildroot.org/", + default="https://nightly.buildroot.org/", help="default: %(default)s") parser.add_argument("--verbose", "-v", action="count", default=0) parser.add_argument("--quiet", "-q", action="count", default=0) -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 10 21:24:55 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:55 +0100 Subject: [Buildroot] [PATCH 2/6 v2] doc/manual: fixup ordered lists In-Reply-To: References: Message-ID: <62cf7f8a3ab7e42c2354cfa3881477d35ae5890d.1707600292.git.yann.morin.1998@free.fr> With recent asiidoc versions (at least 10.2.0 is known to report that), rendering the manual yields a few warnings related to ordered lists: asciidoc: WARNING: customize-quick-guide.adoc: line 13: list item index: expected 2 got 1 asciidoc: WARNING: customize-quick-guide.adoc: line 15: list item index: expected 3 got 1 [...] asciidoc: WARNING: customize-quick-guide.adoc: line 65: list item index: expected 13 got 1 asciidoc: WARNING: customize-quick-guide.adoc: line 66: list item index: expected 14 got 1 asciidoc: WARNING: adding-packages-gettext.adoc: line 30: list item index: expected 2 got 1 asciidoc: WARNING: adding-packages-gettext.adoc: line 41: list item index: expected 3 got 1 The reason is that we use the same index to tell asciidoc to automatically number items. However, the official way to provide an automatic index is to write no index: https://docs.asciidoctor.org/asciidoc/latest/lists/ordered/ [...] since the numbering is obvious, the AsciiDoc processor will insert the numbers for you if you omit them: [...] If you number the ordered list explicitly, you have to manually keep the list numerals sequential. Otherwise, you will get a warning. So, abide by the documentation, and drop the repeating indices to ordered lists where we want automatic numbering. Note that there is another ordered list, in adding-packages-directory.adoc, but it does use explicit, sequential numbering. For consistency within the whole document, we also convert it. To avoid extra useless churn, the indentation of the items is not changed to match the elided indices. Signed-off-by: Yann E. MORIN --- docs/manual/adding-packages-directory.adoc | 14 +++++------ docs/manual/adding-packages-gettext.adoc | 6 ++--- docs/manual/customize-quick-guide.adoc | 28 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index 03249ca06f..0b7221aae0 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -44,13 +44,13 @@ project after an empty line. As a convention specific to Buildroot, the ordering of the attributes is as follows: -1. The type of option: +bool+, +string+... with the prompt -2. If needed, the +default+ value(s) -3. Any dependencies on the target in +depends on+ form -4. Any dependencies on the toolchain in +depends on+ form -5. Any dependencies on other packages in +depends on+ form -6. Any dependency of the +select+ form -7. The help keyword and help text. +. The type of option: +bool+, +string+... with the prompt +. If needed, the +default+ value(s) +. Any dependencies on the target in +depends on+ form +. Any dependencies on the toolchain in +depends on+ form +. Any dependencies on other packages in +depends on+ form +. Any dependency of the +select+ form +. The help keyword and help text. You can add other sub-options into a +if BR2_PACKAGE_LIBFOO...endif+ statement to configure particular things in your software. You can look at diff --git a/docs/manual/adding-packages-gettext.adoc b/docs/manual/adding-packages-gettext.adoc index e9c6968e79..739bed25d5 100644 --- a/docs/manual/adding-packages-gettext.adoc +++ b/docs/manual/adding-packages-gettext.adoc @@ -23,11 +23,11 @@ Due to this, and in order to make sure that Native Language Support is properly handled, packages in Buildroot that can use NLS support should: -1. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This +. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This is done automatically for 'autotools' packages and therefore should only be done for packages using other package infrastructures. -1. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +_DEPENDENCIES+ variable. This addition should be done unconditionally: the value of this variable is automatically adjusted by the core infrastructure to contain the relevant list of @@ -38,7 +38,7 @@ should: also contains +gettext+ in order to get the full-blown 'gettext' implementation. -1. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that +. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that the package gets linked with +libintl+. This is generally not needed with 'autotools' packages as they usually detect automatically that they should link with +libintl+. However, diff --git a/docs/manual/customize-quick-guide.adoc b/docs/manual/customize-quick-guide.adoc index 627ecbacb1..315027c590 100644 --- a/docs/manual/customize-quick-guide.adoc +++ b/docs/manual/customize-quick-guide.adoc @@ -9,11 +9,11 @@ now summarize all this by providing step-by-step instructions to storing your project-specific customizations. Clearly, the steps that are not relevant to your project can be skipped. -1. +make menuconfig+ to configure toolchain, packages and kernel. -1. +make linux-menuconfig+ to update the kernel config, similar for +. +make menuconfig+ to configure toolchain, packages and kernel. +. +make linux-menuconfig+ to update the kernel config, similar for other configuration like busybox, uclibc, ... -1. +mkdir -p board//+ -1. Set the following options to +board///.config+ +. +mkdir -p board//+ +. Set the following options to +board///.config+ (as far as they are relevant): * +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+ * +BR2_PACKAGE_BUSYBOX_CONFIG+ @@ -21,7 +21,7 @@ your project can be skipped. * +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE+ -1. Write the configuration files: +. Write the configuration files: * +make linux-update-defconfig+ * +make busybox-update-config+ * +make uclibc-update-config+ @@ -29,38 +29,38 @@ your project can be skipped. board///at91bootstrap3.config+ * +make barebox-update-defconfig+ * +make uboot-update-defconfig+ -1. Create +board///rootfs-overlay/+ and fill it +. Create +board///rootfs-overlay/+ and fill it with additional files you need on your rootfs, e.g. +board///rootfs-overlay/etc/inittab+. Set +BR2_ROOTFS_OVERLAY+ to +board///rootfs-overlay+. -1. Create a post-build script +. Create a post-build script +board///post_build.sh+. Set +BR2_ROOTFS_POST_BUILD_SCRIPT+ to +board///post_build.sh+ -1. If additional setuid permissions have to be set or device nodes have +. If additional setuid permissions have to be set or device nodes have to be created, create +board///device_table.txt+ and add that path to +BR2_ROOTFS_DEVICE_TABLE+. -1. If additional user accounts have to be created, create +. If additional user accounts have to be created, create +board///users_table.txt+ and add that path to +BR2_ROOTFS_USERS_TABLES+. -1. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ +. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ to +board///patches/+ and add your patches for each package in a subdirectory named after the package. Each patch should be called +--.patch+. -1. Specifically for the Linux kernel, there also exists the option +. Specifically for the Linux kernel, there also exists the option +BR2_LINUX_KERNEL_PATCH+ with as main advantage that it can also download patches from a URL. If you do not need this, +BR2_GLOBAL_PATCH_DIR+ is preferred. U-Boot, Barebox, at91bootstrap and at91bootstrap3 also have separate options, but these do not provide any advantage over +BR2_GLOBAL_PATCH_DIR+ and will likely be removed in the future. -1. If you need to add project-specific packages, create +. If you need to add project-specific packages, create +package//+ and place your packages in that directory. Create an overall +.mk+ file that includes the +.mk+ files of all your packages. Create an overall +Config.in+ file that sources the +Config.in+ files of all your packages. Include this +Config.in+ file from Buildroot's +package/Config.in+ file. -1. +make savedefconfig+ to save the buildroot configuration. -1. +cp defconfig configs/_defconfig+ +. +make savedefconfig+ to save the buildroot configuration. +. +cp defconfig configs/_defconfig+ -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 10 21:24:56 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:56 +0100 Subject: [Buildroot] [PATCH 0/6 v2] utils/checkpackagelib: check CPE variables (branch yem/checkpkg-cpe) Message-ID: Hello All! This series removes superfluous CPE variables that are set to their default values, replaces them with the specific _CPE_VALID one, and eventually adds a check-package test that ensures none crop in back in the future. The series also includes a few preliminary cleanups and fixes. Cha?es v1 -> v2: - drop applied patches - use CPE_ID_VALID to assert the defaults are valid - manual cleanups - https URL! Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (6): utils/check-package: use https for the manual URL doc/manual: fixup ordered lists doc/manual: indent the CVE example the same as the CVE list item doc/manual: document _CPE_ID_VALID package: switch to _CPE_ID_VALID utils/checkpackagelib: add check for CPE variables set to default values docs/manual/adding-packages-directory.adoc | 14 ++--- docs/manual/adding-packages-generic.adoc | 8 ++- docs/manual/adding-packages-gettext.adoc | 6 +- docs/manual/customize-quick-guide.adoc | 28 ++++----- package/acl/acl.mk | 2 +- package/asn1c/asn1c.mk | 2 +- package/atftp/atftp.mk | 2 +- package/atop/atop.mk | 2 +- package/attr/attr.mk | 2 +- package/axel/axel.mk | 2 +- package/bdwgc/bdwgc.mk | 2 +- package/beecrypt/beecrypt.mk | 2 +- package/blktrace/blktrace.mk | 2 +- package/botan/botan.mk | 2 +- package/bwm-ng/bwm-ng.mk | 2 +- package/c-icap/c-icap.mk | 2 +- package/c-periphery/c-periphery.mk | 2 +- package/cgroupfs-mount/cgroupfs-mount.mk | 2 +- package/civetweb/civetweb.mk | 2 +- package/cjson/cjson.mk | 2 +- package/cmake/cmake.mk | 2 +- package/cracklib/cracklib.mk | 2 +- package/crun/crun.mk | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- package/cups-pk-helper/cups-pk-helper.mk | 2 +- package/darkhttpd/darkhttpd.mk | 2 +- package/dbus-broker/dbus-broker.mk | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- package/dosfstools/dosfstools.mk | 2 +- package/dracut/dracut.mk | 2 +- package/dtc/dtc.mk | 2 +- package/duktape/duktape.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 2 +- package/elfutils/elfutils.mk | 2 +- package/exempi/exempi.mk | 2 +- package/exfat/exfat.mk | 2 +- package/f2fs-tools/f2fs-tools.mk | 2 +- package/feh/feh.mk | 2 +- package/file/file.mk | 2 +- package/flac/flac.mk | 2 +- package/fontconfig/fontconfig.mk | 2 +- package/giflib/giflib.mk | 2 +- package/gnuplot/gnuplot.mk | 2 +- package/gpsd/gpsd.mk | 2 +- package/gutenprint/gutenprint.mk | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- package/haserl/haserl.mk | 2 +- package/heimdal/heimdal.mk | 2 +- package/i2c-tools/i2c-tools.mk | 2 +- package/ipmitool/ipmitool.mk | 2 +- package/iproute2/iproute2.mk | 2 +- package/iputils/iputils.mk | 2 +- package/iucode-tool/iucode-tool.mk | 2 +- package/jansson/jansson.mk | 2 +- package/jasper/jasper.mk | 2 +- package/jhead/jhead.mk | 2 +- package/jq/jq.mk | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- package/jszip/jszip.mk | 2 +- package/keyutils/keyutils.mk | 2 +- package/kvmtool/kvmtool.mk | 2 +- package/lame/lame.mk | 2 +- package/lapack/lapack.mk | 2 +- package/lftp/lftp.mk | 2 +- package/libaio/libaio.mk | 2 +- package/libass/libass.mk | 2 +- package/libatomic_ops/libatomic_ops.mk | 2 +- package/libbpf/libbpf.mk | 2 +- package/libcap-ng/libcap-ng.mk | 2 +- package/libcap/libcap.mk | 2 +- package/libcgroup/libcgroup.mk | 2 +- package/libconfuse/libconfuse.mk | 2 +- package/libdaemon/libdaemon.mk | 2 +- package/libesmtp/libesmtp.mk | 2 +- package/libevent/libevent.mk | 2 +- package/libexif/libexif.mk | 2 +- package/libffi/libffi.mk | 2 +- package/libfuse/libfuse.mk | 2 +- package/libgit2/libgit2.mk | 2 +- package/libical/libical.mk | 2 +- package/libjxl/libjxl.mk | 2 +- package/libmms/libmms.mk | 2 +- package/libnet/libnet.mk | 2 +- package/libnids/libnids.mk | 2 +- package/libnl/libnl.mk | 2 +- package/libqmi/libqmi.mk | 2 +- package/librsync/librsync.mk | 2 +- package/libsamplerate/libsamplerate.mk | 2 +- package/libseccomp/libseccomp.mk | 2 +- package/libsndfile/libsndfile.mk | 2 +- package/libtirpc/libtirpc.mk | 2 +- package/libunwind/libunwind.mk | 2 +- package/libupnp/libupnp.mk | 2 +- package/libvncserver/libvncserver.mk | 2 +- package/linuxptp/linuxptp.mk | 2 +- package/lldpd/lldpd.mk | 2 +- package/logrotate/logrotate.mk | 2 +- package/lrzsz/lrzsz.mk | 2 +- package/lsof/lsof.mk | 2 +- package/lynx/lynx.mk | 2 +- package/lz4/lz4.mk | 2 +- package/lzo/lzo.mk | 2 +- package/matio/matio.mk | 2 +- package/mdadm/mdadm.mk | 2 +- package/minicom/minicom.mk | 2 +- package/motion/motion.mk | 2 +- package/ncmpc/ncmpc.mk | 2 +- package/net-tools/net-tools.mk | 2 +- package/netcat/netcat.mk | 2 +- package/nettle/nettle.mk | 2 +- package/oniguruma/oniguruma.mk | 2 +- package/open-iscsi/open-iscsi.mk | 2 +- package/openblas/openblas.mk | 2 +- package/openrc/openrc.mk | 2 +- package/openresolv/openresolv.mk | 2 +- package/opensc/opensc.mk | 2 +- package/p11-kit/p11-kit.mk | 2 +- package/parted/parted.mk | 2 +- package/pcmanfm/pcmanfm.mk | 2 +- package/picocom/picocom.mk | 2 +- package/polkit/polkit.mk | 2 +- package/popt/popt.mk | 2 +- package/powerpc-utils/powerpc-utils.mk | 2 +- package/procps-ng/procps-ng.mk | 2 +- package/protobuf-c/protobuf-c.mk | 2 +- package/proxychains-ng/proxychains-ng.mk | 2 +- package/pugixml/pugixml.mk | 2 +- package/pwgen/pwgen.mk | 2 +- package/python-ecdsa/python-ecdsa.mk | 2 +- package/python-engineio/python-engineio.mk | 2 +- package/python-markdown2/python-markdown2.mk | 2 +- package/python-rsa/python-rsa.mk | 2 +- package/qdecoder/qdecoder.mk | 2 +- package/qpdf/qpdf.mk | 2 +- package/quazip/quazip.mk | 2 +- package/quickjs/quickjs.mk | 2 +- package/rabbitmq-c/rabbitmq-c.mk | 2 +- package/rhash/rhash.mk | 2 +- package/ripgrep/ripgrep.mk | 2 +- package/rng-tools/rng-tools.mk | 2 +- package/rp-pppoe/rp-pppoe.mk | 2 +- package/rpcbind/rpcbind.mk | 2 +- package/rtl_433/rtl_433.mk | 2 +- package/rtmpdump/rtmpdump.mk | 2 +- package/sane-backends/sane-backends.mk | 2 +- package/shellinabox/shellinabox.mk | 2 +- package/spice/spice.mk | 2 +- package/squashfs/squashfs.mk | 2 +- package/sslh/sslh.mk | 2 +- package/strace/strace.mk | 2 +- package/sylpheed/sylpheed.mk | 2 +- package/sysklogd/sysklogd.mk | 2 +- package/sysstat/sysstat.mk | 2 +- package/systemd/systemd.mk | 2 +- package/sysvinit/sysvinit.mk | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- package/tclap/tclap.mk | 2 +- package/tini/tini.mk | 2 +- package/tinyproxy/tinyproxy.mk | 2 +- package/tinyxml/tinyxml.mk | 2 +- package/tinyxml2/tinyxml2.mk | 2 +- package/tmux/tmux.mk | 2 +- package/tpm2-tools/tpm2-tools.mk | 2 +- package/trinity/trinity.mk | 2 +- package/unzip/unzip.mk | 2 +- package/upx/upx.mk | 2 +- package/usbguard/usbguard.mk | 2 +- package/valijson/valijson.mk | 2 +- package/vsftpd/vsftpd.mk | 2 +- package/x11vnc/x11vnc.mk | 2 +- package/xscreensaver/xscreensaver.mk | 2 +- package/yajl/yajl.mk | 2 +- package/yaml-cpp/yaml-cpp.mk | 2 +- package/zbar/zbar.mk | 2 +- package/zlog/zlog.mk | 2 +- package/zziplib/zziplib.mk | 2 +- utils/check-package | 2 +- utils/checkpackagelib/lib_mk.py | 73 ++++++++++++++++++++++ 179 files changed, 277 insertions(+), 200 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sat Feb 10 21:24:56 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:56 +0100 Subject: [Buildroot] [PATCH 3/6 v2] doc/manual: indent the CVE example the same as the CVE list item In-Reply-To: References: Message-ID: Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- docs/manual/adding-packages-generic.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 76b037f436..935270a19c 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -503,7 +503,7 @@ not and can not work as people would expect it should: the package, or when the CVE for some reason does not affect the Buildroot package. A Makefile comment must always precede the addition of a CVE to this variable. Example: - ++ ---------------------- # 0001-fix-cve-2020-12345.patch LIBFOO_IGNORE_CVES += CVE-2020-12345 -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 10 21:24:57 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:57 +0100 Subject: [Buildroot] [PATCH 4/6 v2] doc/manual: document _CPE_ID_VALID In-Reply-To: References: Message-ID: The way we handle CPE_ID variable is unsual compared to the other variables: we mostly compute defaults for all of them, and eventually aggregate the various CPE_ID variables to form the CPE ID name. However, we do not consider that CPE ID to valid, unless there is one (or more) CPE_ID variables actually set by the package; this shows that the CPE ID has been checked to be valid against the NVD CPE database. In that situation, we internally define the duly undocumented _CPE_ID_VALID variable. However, it is totally possible (and very often the case) that the default value we set to those variables are appropriate, and do defne a valid CPE ID. In this case, the package will define any arbitrary CPE_ID variable to its default value, usually by setting either the VENDOR or PRODUCT field, though there is no rule or requirement that be the case. This is not very clean, non-obvious, and does not allow for easily adding checks in check-package. Add the _CPE_ID_VALID variable to the manual, to make it official that it should be used when the default values of the others are valid. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- docs/manual/adding-packages-generic.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 935270a19c..ce8608682f 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -516,6 +516,10 @@ LIBFOO_IGNORE_CVES += CVE-2020-54321 identifier]. The available variables are: + -- +** +LIBFOO_CPE_ID_VALID+, if set to +YES+, specifies that the default + values for each of the following variables is appropriate, and + generates a valid CPE ID. + ** +LIBFOO_CPE_ID_PREFIX+, specifies the prefix of the CPE identifier, i.e the first three fields. When not defined, the default value is +cpe:2.3:a+. -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 10 21:24:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 10 Feb 2024 22:24:58 +0100 Subject: [Buildroot] [PATCH 5/6 v2] package: switch to _CPE_ID_VALID In-Reply-To: References: Message-ID: Now that we document _CPE_ID_VALID, and that it shall be used instead of setting a default value to one of the other _CPE_ID_* variables, change all of the existing packages to use it, to avoid any error when we later extend check-package to validate the sanity ofthe _CPE_ID_* variables. Mechanical change done within the reference container, running the new check in check-package, to report the CPE_ID errors: $ make check-package 2>/dev/null \ |awk '{ split($(1), a, ":"); fname = a[1] split($(2), a, "'\''"); val = a[2] new_var = $(8); gsub("_CPE_ID_.*", "_CPE_ID_VALID", new_var) printf("%s %s %s %s\n", fname, $(8), val, new_var) }' \ |while read fname var val new_var; do sed -r -i -e "s/${var}[[:space:]]*=[[:space:]]*${val}/${new_var} = YES/" "${fname}" done $ git diff -I'CPE_ID_(VENDOR|VALID)' [empty] Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine --- package/acl/acl.mk | 2 +- package/asn1c/asn1c.mk | 2 +- package/atftp/atftp.mk | 2 +- package/atop/atop.mk | 2 +- package/attr/attr.mk | 2 +- package/axel/axel.mk | 2 +- package/bdwgc/bdwgc.mk | 2 +- package/beecrypt/beecrypt.mk | 2 +- package/blktrace/blktrace.mk | 2 +- package/botan/botan.mk | 2 +- package/bwm-ng/bwm-ng.mk | 2 +- package/c-icap/c-icap.mk | 2 +- package/c-periphery/c-periphery.mk | 2 +- package/cgroupfs-mount/cgroupfs-mount.mk | 2 +- package/civetweb/civetweb.mk | 2 +- package/cjson/cjson.mk | 2 +- package/cmake/cmake.mk | 2 +- package/cracklib/cracklib.mk | 2 +- package/crun/crun.mk | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- package/cups-pk-helper/cups-pk-helper.mk | 2 +- package/darkhttpd/darkhttpd.mk | 2 +- package/dbus-broker/dbus-broker.mk | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- package/dosfstools/dosfstools.mk | 2 +- package/dracut/dracut.mk | 2 +- package/dtc/dtc.mk | 2 +- package/duktape/duktape.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 2 +- package/elfutils/elfutils.mk | 2 +- package/exempi/exempi.mk | 2 +- package/exfat/exfat.mk | 2 +- package/f2fs-tools/f2fs-tools.mk | 2 +- package/feh/feh.mk | 2 +- package/file/file.mk | 2 +- package/flac/flac.mk | 2 +- package/fontconfig/fontconfig.mk | 2 +- package/giflib/giflib.mk | 2 +- package/gnuplot/gnuplot.mk | 2 +- package/gpsd/gpsd.mk | 2 +- package/gutenprint/gutenprint.mk | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- package/haserl/haserl.mk | 2 +- package/heimdal/heimdal.mk | 2 +- package/i2c-tools/i2c-tools.mk | 2 +- package/ipmitool/ipmitool.mk | 2 +- package/iproute2/iproute2.mk | 2 +- package/iputils/iputils.mk | 2 +- package/iucode-tool/iucode-tool.mk | 2 +- package/jansson/jansson.mk | 2 +- package/jasper/jasper.mk | 2 +- package/jhead/jhead.mk | 2 +- package/jq/jq.mk | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- package/jszip/jszip.mk | 2 +- package/keyutils/keyutils.mk | 2 +- package/kvmtool/kvmtool.mk | 2 +- package/lame/lame.mk | 2 +- package/lapack/lapack.mk | 2 +- package/lftp/lftp.mk | 2 +- package/libaio/libaio.mk | 2 +- package/libass/libass.mk | 2 +- package/libatomic_ops/libatomic_ops.mk | 2 +- package/libbpf/libbpf.mk | 2 +- package/libcap-ng/libcap-ng.mk | 2 +- package/libcap/libcap.mk | 2 +- package/libcgroup/libcgroup.mk | 2 +- package/libconfuse/libconfuse.mk | 2 +- package/libdaemon/libdaemon.mk | 2 +- package/libesmtp/libesmtp.mk | 2 +- package/libevent/libevent.mk | 2 +- package/libexif/libexif.mk | 2 +- package/libffi/libffi.mk | 2 +- package/libfuse/libfuse.mk | 2 +- package/libgit2/libgit2.mk | 2 +- package/libical/libical.mk | 2 +- package/libjxl/libjxl.mk | 2 +- package/libmms/libmms.mk | 2 +- package/libnet/libnet.mk | 2 +- package/libnids/libnids.mk | 2 +- package/libnl/libnl.mk | 2 +- package/libqmi/libqmi.mk | 2 +- package/librsync/librsync.mk | 2 +- package/libsamplerate/libsamplerate.mk | 2 +- package/libseccomp/libseccomp.mk | 2 +- package/libsndfile/libsndfile.mk | 2 +- package/libtirpc/libtirpc.mk | 2 +- package/libunwind/libunwind.mk | 2 +- package/libupnp/libupnp.mk | 2 +- package/libvncserver/libvncserver.mk | 2 +- package/linuxptp/linuxptp.mk | 2 +- package/lldpd/lldpd.mk | 2 +- package/logrotate/logrotate.mk | 2 +- package/lrzsz/lrzsz.mk | 2 +- package/lsof/lsof.mk | 2 +- package/lynx/lynx.mk | 2 +- package/lz4/lz4.mk | 2 +- package/lzo/lzo.mk | 2 +- package/matio/matio.mk | 2 +- package/mdadm/mdadm.mk | 2 +- package/minicom/minicom.mk | 2 +- package/motion/motion.mk | 2 +- package/ncmpc/ncmpc.mk | 2 +- package/net-tools/net-tools.mk | 2 +- package/netcat/netcat.mk | 2 +- package/nettle/nettle.mk | 2 +- package/oniguruma/oniguruma.mk | 2 +- package/open-iscsi/open-iscsi.mk | 2 +- package/openblas/openblas.mk | 2 +- package/openrc/openrc.mk | 2 +- package/openresolv/openresolv.mk | 2 +- package/opensc/opensc.mk | 2 +- package/p11-kit/p11-kit.mk | 2 +- package/parted/parted.mk | 2 +- package/pcmanfm/pcmanfm.mk | 2 +- package/picocom/picocom.mk | 2 +- package/polkit/polkit.mk | 2 +- package/popt/popt.mk | 2 +- package/powerpc-utils/powerpc-utils.mk | 2 +- package/procps-ng/procps-ng.mk | 2 +- package/protobuf-c/protobuf-c.mk | 2 +- package/proxychains-ng/proxychains-ng.mk | 2 +- package/pugixml/pugixml.mk | 2 +- package/pwgen/pwgen.mk | 2 +- package/python-ecdsa/python-ecdsa.mk | 2 +- package/python-engineio/python-engineio.mk | 2 +- package/python-markdown2/python-markdown2.mk | 2 +- package/python-rsa/python-rsa.mk | 2 +- package/qdecoder/qdecoder.mk | 2 +- package/qpdf/qpdf.mk | 2 +- package/quazip/quazip.mk | 2 +- package/quickjs/quickjs.mk | 2 +- package/rabbitmq-c/rabbitmq-c.mk | 2 +- package/rhash/rhash.mk | 2 +- package/ripgrep/ripgrep.mk | 2 +- package/rng-tools/rng-tools.mk | 2 +- package/rp-pppoe/rp-pppoe.mk | 2 +- package/rpcbind/rpcbind.mk | 2 +- package/rtl_433/rtl_433.mk | 2 +- package/rtmpdump/rtmpdump.mk | 2 +- package/sane-backends/sane-backends.mk | 2 +- package/shellinabox/shellinabox.mk | 2 +- package/spice/spice.mk | 2 +- package/squashfs/squashfs.mk | 2 +- package/sslh/sslh.mk | 2 +- package/strace/strace.mk | 2 +- package/sylpheed/sylpheed.mk | 2 +- package/sysklogd/sysklogd.mk | 2 +- package/sysstat/sysstat.mk | 2 +- package/systemd/systemd.mk | 2 +- package/sysvinit/sysvinit.mk | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- package/tclap/tclap.mk | 2 +- package/tini/tini.mk | 2 +- package/tinyproxy/tinyproxy.mk | 2 +- package/tinyxml/tinyxml.mk | 2 +- package/tinyxml2/tinyxml2.mk | 2 +- package/tmux/tmux.mk | 2 +- package/tpm2-tools/tpm2-tools.mk | 2 +- package/trinity/trinity.mk | 2 +- package/unzip/unzip.mk | 2 +- package/upx/upx.mk | 2 +- package/usbguard/usbguard.mk | 2 +- package/valijson/valijson.mk | 2 +- package/vsftpd/vsftpd.mk | 2 +- package/x11vnc/x11vnc.mk | 2 +- package/xscreensaver/xscreensaver.mk | 2 +- package/yajl/yajl.mk | 2 +- package/yaml-cpp/yaml-cpp.mk | 2 +- package/zbar/zbar.mk | 2 +- package/zlog/zlog.mk | 2 +- package/zziplib/zziplib.mk | 2 +- 173 files changed, 173 insertions(+), 173 deletions(-) diff --git a/package/acl/acl.mk b/package/acl/acl.mk index a5371e1aea..6ae0581ef5 100644 --- a/package/acl/acl.mk +++ b/package/acl/acl.mk @@ -9,7 +9,7 @@ ACL_SOURCE = acl-$(ACL_VERSION).tar.xz ACL_SITE = https://download.savannah.nongnu.org/releases/acl ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL -ACL_CPE_ID_VENDOR = acl_project +ACL_CPE_ID_VALID = YES ACL_DEPENDENCIES = attr HOST_ACL_DEPENDENCIES = host-attr diff --git a/package/asn1c/asn1c.mk b/package/asn1c/asn1c.mk index a5fb9ccf1b..e76a9f84fd 100644 --- a/package/asn1c/asn1c.mk +++ b/package/asn1c/asn1c.mk @@ -8,6 +8,6 @@ ASN1C_VERSION = 0.9.28 ASN1C_SITE = https://github.com/vlm/asn1c/releases/download/v$(ASN1C_VERSION) ASN1C_LICENSE = BSD-2-Clause ASN1C_LICENSE_FILES = LICENSE -ASN1C_CPE_ID_VENDOR = asn1c_project +ASN1C_CPE_ID_VALID = YES $(eval $(host-autotools-package)) diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk index 288501bc11..d41178cac4 100644 --- a/package/atftp/atftp.mk +++ b/package/atftp/atftp.mk @@ -8,7 +8,7 @@ ATFTP_VERSION = 0.8.0 ATFTP_SITE = http://sourceforge.net/projects/atftp/files ATFTP_LICENSE = GPL-2.0+ ATFTP_LICENSE_FILES = LICENSE -ATFTP_CPE_ID_VENDOR = atftp_project +ATFTP_CPE_ID_VALID = YES ATFTP_SELINUX_MODULES = tftp # No configure in tarball ATFTP_AUTORECONF = YES diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 6a0ff3a0d1..27cd537f64 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -8,7 +8,7 @@ ATOP_VERSION = 2.9.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING -ATOP_CPE_ID_VENDOR = atop_project +ATOP_CPE_ID_VALID = YES ATOP_DEPENDENCIES = ncurses zlib ATOP_CFLAGS = $(TARGET_CFLAGS) diff --git a/package/attr/attr.mk b/package/attr/attr.mk index 6ecf5c53f4..d1397921ff 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -9,7 +9,7 @@ ATTR_SOURCE = attr-$(ATTR_VERSION).tar.xz ATTR_SITE = http://download.savannah.gnu.org/releases/attr ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL -ATTR_CPE_ID_VENDOR = attr_project +ATTR_CPE_ID_VALID = YES ATTR_INSTALL_STAGING = YES diff --git a/package/axel/axel.mk b/package/axel/axel.mk index fbfbc8be34..90e5156e06 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -9,7 +9,7 @@ AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/ AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ AXEL_LICENSE_FILES = COPYING -AXEL_CPE_ID_VENDOR = axel_project +AXEL_CPE_ID_VALID = YES AXEL_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk index bff703ee98..0e9c9d849c 100644 --- a/package/bdwgc/bdwgc.mk +++ b/package/bdwgc/bdwgc.mk @@ -10,7 +10,7 @@ BDWGC_SITE = https://github.com/ivmai/bdwgc/releases/download/v$(BDWGC_VERSION) BDWGC_INSTALL_STAGING = YES BDWGC_LICENSE = bdwgc license BDWGC_LICENSE_FILES = README.QUICK -BDWGC_CPE_ID_VENDOR = bdwgc_project +BDWGC_CPE_ID_VALID = YES BDWGC_DEPENDENCIES = libatomic_ops host-pkgconf HOST_BDWGC_DEPENDENCIES = host-libatomic_ops host-pkgconf diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk index 78c3c2ebb1..20e1a122d0 100644 --- a/package/beecrypt/beecrypt.mk +++ b/package/beecrypt/beecrypt.mk @@ -10,7 +10,7 @@ BEECRYPT_AUTORECONF = YES BEECRYPT_INSTALL_STAGING = YES BEECRYPT_LICENSE = LGPL-2.1+ BEECRYPT_LICENSE_FILES = COPYING.LIB -BEECRYPT_CPE_ID_VENDOR = beecrypt_project +BEECRYPT_CPE_ID_VALID = YES BEECRYPT_CONF_OPTS = \ --disable-expert-mode \ diff --git a/package/blktrace/blktrace.mk b/package/blktrace/blktrace.mk index d66a35227e..90038fc788 100644 --- a/package/blktrace/blktrace.mk +++ b/package/blktrace/blktrace.mk @@ -10,7 +10,7 @@ BLKTRACE_SITE = http://brick.kernel.dk/snaps BLKTRACE_DEPENDENCIES = libaio BLKTRACE_LICENSE = GPL-2.0+ BLKTRACE_LICENSE_FILES = COPYING -BLKTRACE_CPE_ID_VENDOR = blktrace_project +BLKTRACE_CPE_ID_VALID = YES define BLKTRACE_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 74cf6175dd..b933e99785 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -9,7 +9,7 @@ BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause BOTAN_LICENSE_FILES = license.txt -BOTAN_CPE_ID_VENDOR = botan_project +BOTAN_CPE_ID_VALID = YES BOTAN_INSTALL_STAGING = YES diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk index bf3ed74afc..31edda0c23 100644 --- a/package/bwm-ng/bwm-ng.mk +++ b/package/bwm-ng/bwm-ng.mk @@ -9,7 +9,7 @@ BWM_NG_SITE = $(call github,vgropp,bwm-ng,v$(BWM_NG_VERSION)) BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats BWM_NG_LICENSE = GPL-2.0+ BWM_NG_LICENSE_FILES = COPYING -BWM_NG_CPE_ID_VENDOR = bwm-ng_project +BWM_NG_CPE_ID_VALID = YES BWM_NG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_NCURSES),y) diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk index 707069870d..36ef1c8b12 100644 --- a/package/c-icap/c-icap.mk +++ b/package/c-icap/c-icap.mk @@ -9,7 +9,7 @@ C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ C_ICAP_LICENSE_FILES = COPYING -C_ICAP_CPE_ID_VENDOR = c-icap_project +C_ICAP_CPE_ID_VALID = YES C_ICAP_INSTALL_STAGING = YES C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config C_ICAP_CONF_OPTS = \ diff --git a/package/c-periphery/c-periphery.mk b/package/c-periphery/c-periphery.mk index 367ac319b3..e3745c4af6 100644 --- a/package/c-periphery/c-periphery.mk +++ b/package/c-periphery/c-periphery.mk @@ -9,6 +9,6 @@ C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,v$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES C_PERIPHERY_LICENSE = MIT C_PERIPHERY_LICENSE_FILES = LICENSE -C_PERIPHERY_CPE_ID_VENDOR = c-periphery_project +C_PERIPHERY_CPE_ID_VALID = YES $(eval $(cmake-package)) diff --git a/package/cgroupfs-mount/cgroupfs-mount.mk b/package/cgroupfs-mount/cgroupfs-mount.mk index acf7442056..5af87629ea 100644 --- a/package/cgroupfs-mount/cgroupfs-mount.mk +++ b/package/cgroupfs-mount/cgroupfs-mount.mk @@ -8,7 +8,7 @@ CGROUPFS_MOUNT_VERSION = 1.4 CGROUPFS_MOUNT_SITE = $(call github,tianon,cgroupfs-mount,$(CGROUPFS_MOUNT_VERSION)) CGROUPFS_MOUNT_LICENSE = GPL-3.0+ CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright -CGROUPFS_MOUNT_CPE_ID_VENDOR = cgroupfs-mount_project +CGROUPFS_MOUNT_CPE_ID_VALID = YES define CGROUPFS_MOUNT_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/cgroupfs-mount $(TARGET_DIR)/usr/bin/cgroupfs-mount diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk index 633ae21c00..629c1b59b2 100644 --- a/package/civetweb/civetweb.mk +++ b/package/civetweb/civetweb.mk @@ -8,7 +8,7 @@ CIVETWEB_VERSION = 1.16 CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION)) CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md -CIVETWEB_CPE_ID_VENDOR = civetweb_project +CIVETWEB_CPE_ID_VALID = YES CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \ $(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1) diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index f699c160ef..4719a3dc9b 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -9,7 +9,7 @@ CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE -CJSON_CPE_ID_VENDOR = cjson_project +CJSON_CPE_ID_VALID = YES # Set ENABLE_CUSTOM_COMPILER_FLAGS to OFF in particular to disable # -fstack-protector-strong which depends on BR2_TOOLCHAIN_HAS_SSP CJSON_CONF_OPTS += \ diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index f56be9ba5c..23d00b95c5 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -10,7 +10,7 @@ CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt -CMAKE_CPE_ID_VENDOR = cmake_project +CMAKE_CPE_ID_VALID = YES # Tool download MITM attack warning if using npm package to install cmake CMAKE_IGNORE_CVES = CVE-2016-10642 diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index c1834b4730..c5226b3326 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -9,7 +9,7 @@ CRACKLIB_SOURCE = cracklib-$(CRACKLIB_VERSION).tar.xz CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/v$(CRACKLIB_VERSION) CRACKLIB_LICENSE = LGPL-2.1 CRACKLIB_LICENSE_FILES = COPYING.LIB -CRACKLIB_CPE_ID_VENDOR = cracklib_project +CRACKLIB_CPE_ID_VALID = YES CRACKLIB_INSTALL_STAGING = YES CRACKLIB_DEPENDENCIES = host-cracklib $(TARGET_NLS_DEPENDENCIES) CRACKLIB_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/crun/crun.mk b/package/crun/crun.mk index a6088c13a0..005d5fb397 100644 --- a/package/crun/crun.mk +++ b/package/crun/crun.mk @@ -10,7 +10,7 @@ CRUN_DEPENDENCIES = host-pkgconf yajl CRUN_LICENSE = GPL-2.0+ (crun binary), LGPL-2.1+ (libcrun) CRUN_LICENSE_FILES = COPYING COPYING.libcrun -CRUN_CPE_ID_VENDOR = crun_project +CRUN_CPE_ID_VALID = YES CRUN_AUTORECONF = YES CRUN_CONF_OPTS = --disable-embedded-yajl diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 1b181e1b75..d17de96143 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -15,7 +15,7 @@ CRYPTSETUP_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL -CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project +CRYPTSETUP_CPE_ID_VALID = YES CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" diff --git a/package/cups-pk-helper/cups-pk-helper.mk b/package/cups-pk-helper/cups-pk-helper.mk index 2bd00c6912..2e057c2de0 100644 --- a/package/cups-pk-helper/cups-pk-helper.mk +++ b/package/cups-pk-helper/cups-pk-helper.mk @@ -9,7 +9,7 @@ CUPS_PK_HELPER_SITE = https://www.freedesktop.org/software/cups-pk-helper/releas CUPS_PK_HELPER_SOURCE = cups-pk-helper-$(CUPS_PK_HELPER_VERSION).tar.xz CUPS_PK_HELPER_LICENSE = GPL-2.0+ CUPS_PK_HELPER_LICENSE_FILES = COPYING -CUPS_PK_HELPER_CPE_ID_VENDOR = cups-pk-helper_project +CUPS_PK_HELPER_CPE_ID_VALID = YES CUPS_PK_HELPER_DEPENDENCIES = cups libglib2 polkit $(eval $(meson-package)) diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index e13f8f7770..956ef4042c 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -8,7 +8,7 @@ DARKHTTPD_VERSION = 1.15 DARKHTTPD_SITE = $(call github,emikulic,darkhttpd,v$(DARKHTTPD_VERSION)) DARKHTTPD_LICENSE = ISC DARKHTTPD_LICENSE_FILES = COPYING -DARKHTTPD_CPE_ID_VENDOR = darkhttpd_project +DARKHTTPD_CPE_ID_VALID = YES define DARKHTTPD_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index c4e3679a2e..4266441ac9 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -23,7 +23,7 @@ DBUS_BROKER_LICENSE_FILES = \ subprojects/libcstdaux-1/AUTHORS subprojects/libcstdaux-1/README.md \ subprojects/libcutf8-1/AUTHORS subprojects/libcutf8-1/README.md -DBUS_BROKER_CPE_ID_VENDOR = dbus-broker_project +DBUS_BROKER_CPE_ID_VALID = YES DBUS_BROKER_DEPENDENCIES = expat systemd DBUS_BROKER_CONF_OPTS = -Dlauncher=true diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index ab3f98dd5a..991c5cca57 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -10,7 +10,7 @@ DHCPCD_SITE = https://github.com/NetworkConfiguration/dhcpcd/releases/download/v DHCPCD_DEPENDENCIES = host-pkgconf DHCPCD_LICENSE = BSD-2-Clause DHCPCD_LICENSE_FILES = LICENSE -DHCPCD_CPE_ID_VENDOR = dhcpcd_project +DHCPCD_CPE_ID_VALID = YES DHCPCD_CONFIG_OPTS = \ --libexecdir=/lib/dhcpcd \ diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk index 26a28670c0..5019bd125d 100644 --- a/package/dosfstools/dosfstools.mk +++ b/package/dosfstools/dosfstools.mk @@ -8,7 +8,7 @@ DOSFSTOOLS_VERSION = 4.2 DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION) DOSFSTOOLS_LICENSE = GPL-3.0+ DOSFSTOOLS_LICENSE_FILES = COPYING -DOSFSTOOLS_CPE_ID_VENDOR = dosfstools_project +DOSFSTOOLS_CPE_ID_VALID = YES DOSFSTOOLS_SELINUX_MODULES = fstools DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/ HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk index 1de11d208d..8573e64055 100644 --- a/package/dracut/dracut.mk +++ b/package/dracut/dracut.mk @@ -8,7 +8,7 @@ DRACUT_VERSION = 059 DRACUT_SITE = $(call github,dracutdevs,dracut,$(DRACUT_VERSION)) DRACUT_LICENSE = GPL-2.0 DRACUT_LICENSE_FILES = COPYING -DRACUT_CPE_ID_VENDOR = dracut_project +DRACUT_CPE_ID_VALID = YES HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-prelink-cross diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk index ff3ed49b37..5868ae0e5a 100644 --- a/package/dtc/dtc.mk +++ b/package/dtc/dtc.mk @@ -9,7 +9,7 @@ DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz DTC_SITE = https://www.kernel.org/pub/software/utils/dtc DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library) DTC_LICENSE_FILES = README.license GPL BSD-2-Clause -DTC_CPE_ID_VENDOR = dtc_project +DTC_CPE_ID_VALID = YES DTC_INSTALL_STAGING = YES DTC_DEPENDENCIES = host-bison host-flex host-pkgconf HOST_DTC_DEPENDENCIES = host-bison host-flex host-pkgconf diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index 9b5fb65f06..59fc17f7ed 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -11,7 +11,7 @@ DUKTAPE_SITE = \ DUKTAPE_LICENSE = MIT DUKTAPE_LICENSE_FILES = LICENSE.txt DUKTAPE_INSTALL_STAGING = YES -DUKTAPE_CPE_ID_VENDOR = duktape_project +DUKTAPE_CPE_ID_VALID = YES define DUKTAPE_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f Makefile.sharedlibrary diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 7491f4c067..cbaac4f40b 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -9,7 +9,7 @@ E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h -E2FSPROGS_CPE_ID_VENDOR = e2fsprogs_project +E2FSPROGS_CPE_ID_VALID = YES E2FSPROGS_INSTALL_STAGING = YES # Use libblkid and libuuid from util-linux for host and target packages. diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index d43b545f2f..521c37a776 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -10,7 +10,7 @@ ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 -ELFUTILS_CPE_ID_VENDOR = elfutils_project +ELFUTILS_CPE_ID_VALID = YES ELFUTILS_DEPENDENCIES = host-pkgconf zlib $(TARGET_NLS_DEPENDENCIES) HOST_ELFUTILS_DEPENDENCIES = host-pkgconf host-zlib host-bzip2 host-xz diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index f808afd53c..b5156c1e3c 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -13,6 +13,6 @@ EXEMPI_DEPENDENCIES = host-pkgconf expat zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) EXEMPI_LICENSE = BSD-3-Clause EXEMPI_LICENSE_FILES = COPYING -EXEMPI_CPE_ID_VENDOR = exempi_project +EXEMPI_CPE_ID_VALID = YES $(eval $(autotools-package)) diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk index a8efe5b0ba..d8c28464db 100644 --- a/package/exfat/exfat.mk +++ b/package/exfat/exfat.mk @@ -12,7 +12,7 @@ EXFAT_DEPENDENCIES = \ host-pkgconf EXFAT_LICENSE = GPL-2.0+ EXFAT_LICENSE_FILES = COPYING -EXFAT_CPE_ID_VENDOR = exfat_project +EXFAT_CPE_ID_VALID = YES EXFAT_CONF_OPTS += --exec-prefix=/ diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk index a92ab4fe3e..87f4487750 100644 --- a/package/f2fs-tools/f2fs-tools.mk +++ b/package/f2fs-tools/f2fs-tools.mk @@ -14,7 +14,7 @@ F2FS_TOOLS_AUTORECONF = YES F2FS_TOOLS_INSTALL_STAGING = YES F2FS_TOOLS_LICENSE = GPL-2.0 F2FS_TOOLS_LICENSE_FILES = COPYING -F2FS_TOOLS_CPE_ID_VENDOR = f2fs-tools_project +F2FS_TOOLS_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBSELINUX),y) F2FS_TOOLS_CONF_OPTS += --with-selinux diff --git a/package/feh/feh.mk b/package/feh/feh.mk index 3aa509abfe..df03deedde 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -10,7 +10,7 @@ FEH_SITE = http://feh.finalrewind.org FEH_DEPENDENCIES = imlib2 libpng xlib_libXt FEH_LICENSE = MIT FEH_LICENSE_FILES = COPYING -FEH_CPE_ID_VENDOR = feh_project +FEH_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBCURL),y) FEH_DEPENDENCIES += libcurl diff --git a/package/file/file.mk b/package/file/file.mk index 5fc540bc9d..b67fcaead4 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -8,7 +8,7 @@ FILE_VERSION = 5.45 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c -FILE_CPE_ID_VENDOR = file_project +FILE_CPE_ID_VALID = YES FILE_AUTORECONF = YES diff --git a/package/flac/flac.mk b/package/flac/flac.mk index ab06af826e..6bac9ef8a7 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -11,7 +11,7 @@ FLAC_INSTALL_STAGING = YES FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries) FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL -FLAC_CPE_ID_VENDOR = flac_project +FLAC_CPE_ID_VALID = YES FLAC_CONF_OPTS = \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index d2eb76e40a..11758a4c80 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -18,7 +18,7 @@ HOST_FONTCONFIG_DEPENDENCIES = \ host-gettext FONTCONFIG_LICENSE = fontconfig license FONTCONFIG_LICENSE_FILES = COPYING -FONTCONFIG_CPE_ID_VENDOR = fontconfig_project +FONTCONFIG_CPE_ID_VALID = YES FONTCONFIG_CONF_OPTS = \ --with-arch=$(GNU_TARGET_NAME) \ diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index d91c77e2ee..3ac74f9244 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -9,7 +9,7 @@ GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING -GIFLIB_CPE_ID_VENDOR = giflib_project +GIFLIB_CPE_ID_VALID = YES # 0002-Fix-CVE-2022-28506.patch GIFLIB_IGNORE_CVES = CVE-2022-28506 diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 825863d080..91e9bfb9bf 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -8,7 +8,7 @@ GNUPLOT_VERSION = 5.4.10 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright -GNUPLOT_CPE_ID_VENDOR = gnuplot_project +GNUPLOT_CPE_ID_VALID = YES GNUPLOT_AUTORECONF = YES diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index d7425513fd..1d4013d122 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -8,7 +8,7 @@ GPSD_VERSION = 3.25 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING -GPSD_CPE_ID_VENDOR = gpsd_project +GPSD_CPE_ID_VALID = YES GPSD_SELINUX_MODULES = gpsd GPSD_INSTALL_STAGING = YES diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk index b0fcd5a598..bcc9c54beb 100644 --- a/package/gutenprint/gutenprint.mk +++ b/package/gutenprint/gutenprint.mk @@ -10,7 +10,7 @@ GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2 GUTENPRINT_LICENSE = GPL-2.0+ GUTENPRINT_LICENSE_FILES = COPYING -GUTENPRINT_CPE_ID_VENDOR = gutenprint_project +GUTENPRINT_CPE_ID_VALID = YES # Needed, as we touch Makefile.am GUTENPRINT_AUTORECONF = YES diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 4435cbb736..599ea548d0 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -9,7 +9,7 @@ HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZ HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) HARFBUZZ_LICENSE_FILES = COPYING -HARFBUZZ_CPE_ID_VENDOR = harfbuzz_project +HARFBUZZ_CPE_ID_VALID = YES HARFBUZZ_INSTALL_STAGING = YES HARFBUZZ_CONF_OPTS = \ -Dgdi=disabled \ diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk index 22950f4d6d..f2a9d714b7 100644 --- a/package/haserl/haserl.mk +++ b/package/haserl/haserl.mk @@ -8,7 +8,7 @@ HASERL_VERSION = 0.9.36 HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel HASERL_LICENSE = GPL-2.0 HASERL_LICENSE_FILES = COPYING -HASERL_CPE_ID_VENDOR = haserl_project +HASERL_CPE_ID_VALID = YES HASERL_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y) diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 59b64c358b..786d94a1aa 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -32,7 +32,7 @@ HOST_HEIMDAL_CONF_OPTS = \ HOST_HEIMDAL_CONF_ENV = ac_cv_prog_COMPILE_ET=no MAKEINFO=true HEIMDAL_LICENSE = BSD-3-Clause HEIMDAL_LICENSE_FILES = LICENSE -HEIMDAL_CPE_ID_VENDOR = heimdal_project +HEIMDAL_CPE_ID_VALID = YES # We need compile_et for samba4 define HOST_HEIMDAL_INSTALL_COMPILE_ET diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index f8d1bcb4b0..99388d9537 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -9,7 +9,7 @@ I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.xz I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus), LGPL-2.1+ (libi2c) I2C_TOOLS_LICENSE_FILES = COPYING COPYING.LGPL README -I2C_TOOLS_CPE_ID_VENDOR = i2c-tools_project +I2C_TOOLS_CPE_ID_VALID = YES I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog I2C_TOOLS_INSTALL_STAGING = YES diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index b3f1e217ff..4f2151904d 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -8,7 +8,7 @@ IPMITOOL_VERSION = 1_8_19 IPMITOOL_SITE = $(call github,ipmitool,ipmitool,IPMITOOL_$(IPMITOOL_VERSION)) IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING -IPMITOOL_CPE_ID_VENDOR = ipmitool_project +IPMITOOL_CPE_ID_VALID = YES # From git IPMITOOL_AUTORECONF = YES IPMITOOL_DEPENDENCIES = host-pkgconf diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 7e70f62ff2..4adb4e3356 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -11,7 +11,7 @@ IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ $(if $(BR2_PACKAGE_LIBMNL),libmnl) IPROUTE2_LICENSE = GPL-2.0+ IPROUTE2_LICENSE_FILES = COPYING -IPROUTE2_CPE_ID_VENDOR = iproute2_project +IPROUTE2_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_ELFUTILS),y) IPROUTE2_DEPENDENCIES += elfutils diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 58e44d673a..08d849e69d 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -8,7 +8,7 @@ IPUTILS_VERSION = 20240117 IPUTILS_SITE = https://github.com/iputils/iputils/releases/download/$(IPUTILS_VERSION) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 -IPUTILS_CPE_ID_VENDOR = iputils_project +IPUTILS_CPE_ID_VALID = YES IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # Selectively build binaries diff --git a/package/iucode-tool/iucode-tool.mk b/package/iucode-tool/iucode-tool.mk index b123973a90..e22e782804 100644 --- a/package/iucode-tool/iucode-tool.mk +++ b/package/iucode-tool/iucode-tool.mk @@ -9,7 +9,7 @@ IUCODE_TOOL_SOURCE = iucode-tool_$(IUCODE_TOOL_VERSION).tar.xz IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/master IUCODE_TOOL_LICENSE = GPL-2.0+ IUCODE_TOOL_LICENSE_FILES = COPYING -IUCODE_TOOL_CPE_ID_VENDOR = iucode-tool_project +IUCODE_TOOL_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) IUCODE_TOOL_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) diff --git a/package/jansson/jansson.mk b/package/jansson/jansson.mk index 99e1817eef..8efe28bf4a 100644 --- a/package/jansson/jansson.mk +++ b/package/jansson/jansson.mk @@ -10,7 +10,7 @@ JANSSON_SITE = \ https://github.com/akheron/jansson/releases/download/v$(JANSSON_VERSION) JANSSON_LICENSE = MIT JANSSON_LICENSE_FILES = LICENSE -JANSSON_CPE_ID_VENDOR = jansson_project +JANSSON_CPE_ID_VALID = YES JANSSON_INSTALL_STAGING = YES JANSSON_CONF_ENV = LIBS="-lm" diff --git a/package/jasper/jasper.mk b/package/jasper/jasper.mk index 6b6bbcd6e6..45b9c49558 100644 --- a/package/jasper/jasper.mk +++ b/package/jasper/jasper.mk @@ -9,7 +9,7 @@ JASPER_SITE = https://github.com/jasper-software/jasper/releases/download/versio JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE -JASPER_CPE_ID_VENDOR = jasper_project +JASPER_CPE_ID_VALID = YES JASPER_SUPPORTS_IN_SOURCE_BUILD = NO JASPER_CONF_OPTS = \ -DJAS_ENABLE_DOC=OFF \ diff --git a/package/jhead/jhead.mk b/package/jhead/jhead.mk index f07739bc21..940312780e 100644 --- a/package/jhead/jhead.mk +++ b/package/jhead/jhead.mk @@ -8,7 +8,7 @@ JHEAD_VERSION = 3.08 JHEAD_SITE = $(call github,Matthias-Wandel,jhead,$(JHEAD_VERSION)) JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt -JHEAD_CPE_ID_VENDOR = jhead_project +JHEAD_CPE_ID_VALID = YES define JHEAD_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) diff --git a/package/jq/jq.mk b/package/jq/jq.mk index 8c417fad31..ba27e22f7f 100644 --- a/package/jq/jq.mk +++ b/package/jq/jq.mk @@ -8,7 +8,7 @@ JQ_VERSION = 1.7.1 JQ_SITE = https://github.com/jqlang/jq/releases/download/jq-$(JQ_VERSION) JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation) JQ_LICENSE_FILES = COPYING -JQ_CPE_ID_VENDOR = jq_project +JQ_CPE_ID_VALID = YES JQ_INSTALL_STAGING = YES # uses c99 specific features diff --git a/package/json-for-modern-cpp/json-for-modern-cpp.mk b/package/json-for-modern-cpp/json-for-modern-cpp.mk index b89eb32a45..345280b346 100644 --- a/package/json-for-modern-cpp/json-for-modern-cpp.mk +++ b/package/json-for-modern-cpp/json-for-modern-cpp.mk @@ -9,7 +9,7 @@ JSON_FOR_MODERN_CPP_SOURCE = json-$(JSON_FOR_MODERN_CPP_VERSION).tar.gz JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,v$(JSON_FOR_MODERN_CPP_VERSION)) JSON_FOR_MODERN_CPP_LICENSE = MIT JSON_FOR_MODERN_CPP_LICENSE_FILES = LICENSE.MIT -JSON_FOR_MODERN_CPP_CPE_ID_VENDOR = json-for-modern-cpp_project +JSON_FOR_MODERN_CPP_CPE_ID_VALID = YES JSON_FOR_MODERN_CPP_INSTALL_STAGING = YES # header only library diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index e7022bfd39..5ef62befbc 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -8,7 +8,7 @@ JSONCPP_VERSION = 1.9.5 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE -JSONCPP_CPE_ID_VENDOR = jsoncpp_project +JSONCPP_CPE_ID_VALID = YES JSONCPP_INSTALL_STAGING = YES JSONCPP_CONF_OPTS = -Dtests=false diff --git a/package/jszip/jszip.mk b/package/jszip/jszip.mk index b282610a0d..f038263a77 100644 --- a/package/jszip/jszip.mk +++ b/package/jszip/jszip.mk @@ -8,7 +8,7 @@ JSZIP_VERSION = 3.10.1 JSZIP_SITE = $(call github,Stuk,jszip,v$(JSZIP_VERSION)) JSZIP_LICENSE = MIT or GPL-3.0 JSZIP_LICENSE_FILES = LICENSE.markdown -JSZIP_CPE_ID_VENDOR = jszip_project +JSZIP_CPE_ID_VALID = YES define JSZIP_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/dist/jszip.min.js \ diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk index 5af5c4e92c..fb387ed1a3 100644 --- a/package/keyutils/keyutils.mk +++ b/package/keyutils/keyutils.mk @@ -8,7 +8,7 @@ KEYUTILS_VERSION = 1.6.3 KEYUTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot KEYUTILS_LICENSE = GPL-2.0+, LGPL-2.1+ KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL -KEYUTILS_CPE_ID_VENDOR = keyutils_project +KEYUTILS_CPE_ID_VALID = YES KEYUTILS_INSTALL_STAGING = YES KEYUTILS_MAKE_PARAMS = \ diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk index 9c58e44876..2bcd556f9b 100644 --- a/package/kvmtool/kvmtool.mk +++ b/package/kvmtool/kvmtool.mk @@ -17,7 +17,7 @@ KVMTOOL_DEPENDENCIES = \ $(if $(BR2_PACKAGE_ZLIB),zlib) KVMTOOL_LICENSE = GPL-2.0 KVMTOOL_LICENSE_FILES = COPYING -KVMTOOL_CPE_ID_VENDOR = kvmtool_project +KVMTOOL_CPE_ID_VALID = YES # Disable -Werror, otherwise musl is not happy KVMTOOL_MAKE_OPTS = \ diff --git a/package/lame/lame.mk b/package/lame/lame.mk index 3a57cffe3d..206e4407c9 100644 --- a/package/lame/lame.mk +++ b/package/lame/lame.mk @@ -12,7 +12,7 @@ LAME_CONF_ENV = GTK_CONFIG=/bin/false LAME_CONF_OPTS = --enable-dynamic-frontends LAME_LICENSE = LGPL-2.0+ LAME_LICENSE_FILES = COPYING -LAME_CPE_ID_VENDOR = lame_project +LAME_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) LAME_DEPENDENCIES += libsndfile diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index 3db2797202..3c1ab1fc67 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -8,7 +8,7 @@ LAPACK_VERSION = 3.10.1 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) -LAPACK_CPE_ID_VENDOR = lapack_project +LAPACK_CPE_ID_VALID = YES LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk index 00b33b91fb..483ca298cd 100644 --- a/package/lftp/lftp.mk +++ b/package/lftp/lftp.mk @@ -9,7 +9,7 @@ LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz LFTP_SITE = http://lftp.yar.ru/ftp LFTP_LICENSE = GPL-3.0+ LFTP_LICENSE_FILES = COPYING -LFTP_CPE_ID_VENDOR = lftp_project +LFTP_CPE_ID_VALID = YES LFTP_DEPENDENCIES = readline zlib host-pkgconf # Help lftp finding readline and zlib diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index 12cfbc4ef4..16cb502f16 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -9,7 +9,7 @@ LIBAIO_SITE = https://releases.pagure.org/libaio LIBAIO_INSTALL_STAGING = YES LIBAIO_LICENSE = LGPL-2.1+ LIBAIO_LICENSE_FILES = COPYING -LIBAIO_CPE_ID_VENDOR = libaio_project +LIBAIO_CPE_ID_VALID = YES LIBAIO_CONFIGURE_OPTS = $(TARGET_CONFIGURE_OPTS) diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 8b14c899c4..f48673014a 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -12,7 +12,7 @@ LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSIO LIBASS_INSTALL_STAGING = YES LIBASS_LICENSE = ISC LIBASS_LICENSE_FILES = COPYING -LIBASS_CPE_ID_VENDOR = libass_project +LIBASS_CPE_ID_VALID = YES LIBASS_DEPENDENCIES = \ host-pkgconf \ freetype \ diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index bf6994b3a0..555ba678fe 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -16,7 +16,7 @@ LIBATOMIC_OPS_AUTORECONF = YES # library, libatomic_ops_gpl.a." LIBATOMIC_OPS_LICENSE = MIT (main library) / GPL-2.0+ (gpl extension) LIBATOMIC_OPS_LICENSE_FILES = COPYING LICENSE -LIBATOMIC_OPS_CPE_ID_VENDOR = libatomic_ops_project +LIBATOMIC_OPS_CPE_ID_VALID = YES LIBATOMIC_OPS_INSTALL_STAGING = YES diff --git a/package/libbpf/libbpf.mk b/package/libbpf/libbpf.mk index 670dbee87e..ef33542f2d 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -8,7 +8,7 @@ LIBBPF_VERSION = 1.1.0 LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION)) LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1 -LIBBPF_CPE_ID_VENDOR = libbpf_project +LIBBPF_CPE_ID_VALID = YES LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib HOST_LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf host-elfutils host-zlib LIBBPF_INSTALL_STAGING = YES diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 5e3ca20029..2ec88810b4 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -8,7 +8,7 @@ LIBCAP_NG_VERSION = 0.8.4 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB -LIBCAP_NG_CPE_ID_VENDOR = libcap-ng_project +LIBCAP_NG_CPE_ID_VALID = YES LIBCAP_NG_INSTALL_STAGING = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index c9727c75c9..fe2f24ad8c 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -9,7 +9,7 @@ LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause LIBCAP_LICENSE_FILES = License -LIBCAP_CPE_ID_VENDOR = libcap_project +LIBCAP_CPE_ID_VALID = YES LIBCAP_DEPENDENCIES = host-gperf LIBCAP_INSTALL_STAGING = YES diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk index e3de48c561..cfe1d0f9f8 100644 --- a/package/libcgroup/libcgroup.mk +++ b/package/libcgroup/libcgroup.mk @@ -8,7 +8,7 @@ LIBCGROUP_VERSION = 2.0.3 LIBCGROUP_SITE = https://github.com/libcgroup/libcgroup/releases/download/v$(LIBCGROUP_VERSION) LIBCGROUP_LICENSE = LGPL-2.1 LIBCGROUP_LICENSE_FILES = COPYING -LIBCGROUP_CPE_ID_VENDOR = libcgroup_project +LIBCGROUP_CPE_ID_VALID = YES LIBCGROUP_DEPENDENCIES = host-bison host-flex LIBCGROUP_INSTALL_STAGING = YES diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index e7c2ef0a84..76123a7e6b 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -11,7 +11,7 @@ LIBCONFUSE_INSTALL_STAGING = YES LIBCONFUSE_CONF_OPTS = --disable-rpath LIBCONFUSE_LICENSE = ISC LIBCONFUSE_LICENSE_FILES = LICENSE -LIBCONFUSE_CPE_ID_VENDOR = libconfuse_project +LIBCONFUSE_CPE_ID_VALID = YES LIBCONFUSE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # 0001-Fix-163-unterminated-username-used-with-getpwnam.patch diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk index cdf0819e68..aa9bb8080e 100644 --- a/package/libdaemon/libdaemon.mk +++ b/package/libdaemon/libdaemon.mk @@ -8,7 +8,7 @@ LIBDAEMON_VERSION = 0.14 LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon LIBDAEMON_LICENSE = LGPL-2.1+ LIBDAEMON_LICENSE_FILES = LICENSE -LIBDAEMON_CPE_ID_VENDOR = libdaemon_project +LIBDAEMON_CPE_ID_VALID = YES LIBDAEMON_INSTALL_STAGING = YES LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk index 10fe7bf324..6456e83e10 100644 --- a/package/libesmtp/libesmtp.mk +++ b/package/libesmtp/libesmtp.mk @@ -9,7 +9,7 @@ LIBESMTP_SITE = $(call github,libesmtp,libESMTP,v$(LIBESMTP_VERSION)) LIBESMTP_INSTALL_STAGING = YES LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBESMTP_LICENSE_FILES = COPYING.GPL LICENSE -LIBESMTP_CPE_ID_VENDOR = libesmtp_project +LIBESMTP_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBESMTP_CONF_OPTS += -Dtls=enabled diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index 4c23156f72..355dfedcc1 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -10,7 +10,7 @@ LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz LIBEVENT_INSTALL_STAGING = YES LIBEVENT_LICENSE = BSD-3-Clause, OpenBSD LIBEVENT_LICENSE_FILES = LICENSE -LIBEVENT_CPE_ID_VENDOR = libevent_project +LIBEVENT_CPE_ID_VALID = YES LIBEVENT_CONF_OPTS = \ --disable-libevent-regress \ --disable-samples diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk index 921029b4ac..858901f40e 100644 --- a/package/libexif/libexif.mk +++ b/package/libexif/libexif.mk @@ -12,6 +12,6 @@ LIBEXIF_INSTALL_STAGING = YES LIBEXIF_DEPENDENCIES = host-pkgconf LIBEXIF_LICENSE = LGPL-2.1+ LIBEXIF_LICENSE_FILES = COPYING -LIBEXIF_CPE_ID_VENDOR = libexif_project +LIBEXIF_CPE_ID_VALID = YES $(eval $(autotools-package)) diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 8f6844113c..6249023eae 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -9,7 +9,7 @@ LIBFFI_SITE = \ https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION) LIBFFI_LICENSE = MIT LIBFFI_LICENSE_FILES = LICENSE -LIBFFI_CPE_ID_VENDOR = libffi_project +LIBFFI_CPE_ID_VALID = YES LIBFFI_INSTALL_STAGING = YES # We're patching Makefile.am LIBFFI_AUTORECONF = YES diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index 723060931f..147b38b2e2 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -9,7 +9,7 @@ LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION) LIBFUSE_LICENSE = GPL-2.0, LGPL-2.1 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB -LIBFUSE_CPE_ID_VENDOR = libfuse_project +LIBFUSE_CPE_ID_VALID = YES LIBFUSE_INSTALL_STAGING = YES # We're patching configure.ac LIBFUSE_AUTORECONF = YES diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 92563d24bb..46ccc1e517 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -15,7 +15,7 @@ LIBGIT2_LICENSE = \ BSD-2-Clause (basename_r), \ LGPL-2.1+ (libxdiff) LIBGIT2_LICENSE_FILES = COPYING -LIBGIT2_CPE_ID_VENDOR = libgit2_project +LIBGIT2_CPE_ID_VALID = YES LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ diff --git a/package/libical/libical.mk b/package/libical/libical.mk index afbbfd98c8..992ef51375 100644 --- a/package/libical/libical.mk +++ b/package/libical/libical.mk @@ -9,7 +9,7 @@ LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_V LIBICAL_INSTALL_STAGING = YES LIBICAL_LICENSE = MPL-1.0 or LGPL-2.1 LIBICAL_LICENSE_FILES = LICENSE -LIBICAL_CPE_ID_VENDOR = libical_project +LIBICAL_CPE_ID_VALID = YES # 0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch LIBICAL_IGNORE_CVES += CVE-2016-9584 diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk index d2c5e70c98..4072633ffe 100644 --- a/package/libjxl/libjxl.mk +++ b/package/libjxl/libjxl.mk @@ -8,7 +8,7 @@ LIBJXL_VERSION = 0.9.0 LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) LIBJXL_LICENSE = BSD-3-Clause LIBJXL_LICENSE_FILES = LICENSE PATENTS -LIBJXL_CPE_ID_VENDOR = libjxl_project +LIBJXL_CPE_ID_VALID = YES LIBJXL_INSTALL_STAGING = YES LIBJXL_DEPENDENCIES = \ diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk index a4c40ad60a..1140996cb8 100644 --- a/package/libmms/libmms.mk +++ b/package/libmms/libmms.mk @@ -10,6 +10,6 @@ LIBMMS_INSTALL_STAGING = YES LIBMMS_DEPENDENCIES = host-pkgconf libglib2 LIBMMS_LICENSE = LGPL-2.1+ LIBMMS_LICENSE_FILES = COPYING.LIB -LIBMMS_CPE_ID_VENDOR = libmms_project +LIBMMS_CPE_ID_VALID = YES $(eval $(autotools-package)) diff --git a/package/libnet/libnet.mk b/package/libnet/libnet.mk index a803fcd17a..3bc9e30dfa 100644 --- a/package/libnet/libnet.mk +++ b/package/libnet/libnet.mk @@ -14,7 +14,7 @@ LIBNET_CONF_OPTS = \ --disable-doxygen-doc LIBNET_LICENSE = BSD-2-Clause, BSD-3-Clause LIBNET_LICENSE_FILES = LICENSE -LIBNET_CPE_ID_VENDOR = libnet_project +LIBNET_CPE_ID_VALID = YES LIBNET_CONFIG_SCRIPTS = libnet-config $(eval $(autotools-package)) diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk index 40620eca57..712630bac8 100644 --- a/package/libnids/libnids.mk +++ b/package/libnids/libnids.mk @@ -8,7 +8,7 @@ LIBNIDS_VERSION = 1.26 LIBNIDS_SITE = $(call github,MITRECND,libnids,$(LIBNIDS_VERSION)) LIBNIDS_LICENSE = GPL-2.0 LIBNIDS_LICENSE_FILES = COPYING -LIBNIDS_CPE_ID_VENDOR = libnids_project +LIBNIDS_CPE_ID_VALID = YES LIBNIDS_INSTALL_STAGING = YES LIBNIDS_DEPENDENCIES = host-pkgconf libpcap LIBNIDS_AUTORECONF = YES diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index 8fbea3db5f..6f50fd6afc 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -8,7 +8,7 @@ LIBNL_VERSION = 3.9.0 LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION)) LIBNL_LICENSE = LGPL-2.1+ LIBNL_LICENSE_FILES = COPYING -LIBNL_CPE_ID_VENDOR = libnl_project +LIBNL_CPE_ID_VALID = YES LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison host-flex host-pkgconf diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index c3db50a92c..eae41446e2 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -8,7 +8,7 @@ LIBQMI_VERSION = 1.32.2 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB -LIBQMI_CPE_ID_VENDOR = libqmi_project +LIBQMI_CPE_ID_VALID = YES LIBQMI_INSTALL_STAGING = YES LIBQMI_DEPENDENCIES = libglib2 diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk index 1465963c61..26c003be21 100644 --- a/package/librsync/librsync.mk +++ b/package/librsync/librsync.mk @@ -8,7 +8,7 @@ LIBRSYNC_VERSION = 2.3.4 LIBRSYNC_SITE = https://github.com/librsync/librsync/releases/download/v$(LIBRSYNC_VERSION) LIBRSYNC_LICENSE = LGPL-2.1+ LIBRSYNC_LICENSE_FILES = COPYING -LIBRSYNC_CPE_ID_VENDOR = librsync_project +LIBRSYNC_CPE_ID_VALID = YES LIBRSYNC_INSTALL_STAGING = YES LIBRSYNC_DEPENDENCIES = host-pkgconf zlib bzip2 popt diff --git a/package/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk index 2844fde33c..0ac3c42451 100644 --- a/package/libsamplerate/libsamplerate.mk +++ b/package/libsamplerate/libsamplerate.mk @@ -17,7 +17,7 @@ LIBSAMPLERATE_CONF_OPTS = \ --program-transform-name='' LIBSAMPLERATE_LICENSE = BSD-2-Clause LIBSAMPLERATE_LICENSE_FILES = COPYING -LIBSAMPLERATE_CPE_ID_VENDOR = libsamplerate_project +LIBSAMPLERATE_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_ALSA_LIB),y) LIBSAMPLERATE_DEPENDENCIES += alsa-lib diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk index ff295e986a..10d57bb78c 100644 --- a/package/libseccomp/libseccomp.mk +++ b/package/libseccomp/libseccomp.mk @@ -8,7 +8,7 @@ LIBSECCOMP_VERSION = 2.5.5 LIBSECCOMP_SITE = https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE -LIBSECCOMP_CPE_ID_VENDOR = libseccomp_project +LIBSECCOMP_CPE_ID_VALID = YES LIBSECCOMP_INSTALL_STAGING = YES LIBSECCOMP_DEPENDENCIES = host-gperf diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index 89eb4f3c1d..dc23d94cb1 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -10,7 +10,7 @@ LIBSNDFILE_SITE = https://github.com/libsndfile/libsndfile/releases/download/$(L LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING -LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project +LIBSNDFILE_CPE_ID_VALID = YES LIBSNDFILE_DEPENDENCIES = host-pkgconf LIBSNDFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 298b3c36bd..04196f2f7c 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -9,7 +9,7 @@ LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause LIBTIRPC_LICENSE_FILES = COPYING -LIBTIRPC_CPE_ID_VENDOR = libtirpc_project +LIBTIRPC_CPE_ID_VALID = YES LIBTIRPC_INSTALL_STAGING = YES diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index afc17f7b25..d7ddb8f179 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -9,7 +9,7 @@ LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING LIBUNWIND_LICENSE = MIT -LIBUNWIND_CPE_ID_VENDOR = libunwind_project +LIBUNWIND_CPE_ID_VALID = YES LIBUNWIND_AUTORECONF = YES LIBUNWIND_CONF_OPTS = \ diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index f8551a2a0d..61e52c095a 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -12,7 +12,7 @@ LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no LIBUPNP_INSTALL_STAGING = YES LIBUPNP_LICENSE = BSD-3-Clause LIBUPNP_LICENSE_FILES = COPYING -LIBUPNP_CPE_ID_VENDOR = libupnp_project +LIBUPNP_CPE_ID_VALID = YES LIBUPNP_DEPENDENCIES = host-pkgconf # Bind the internal miniserver socket with reuseaddr to allow clean restarts. diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index 700e26a8d6..3a15a82d08 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -9,7 +9,7 @@ LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ LIBVNCSERVER_LICENSE_FILES = COPYING -LIBVNCSERVER_CPE_ID_VENDOR = libvncserver_project +LIBVNCSERVER_CPE_ID_VALID = YES LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON diff --git a/package/linuxptp/linuxptp.mk b/package/linuxptp/linuxptp.mk index e0ab82a2c4..eea41f0baf 100644 --- a/package/linuxptp/linuxptp.mk +++ b/package/linuxptp/linuxptp.mk @@ -9,7 +9,7 @@ LINUXPTP_SOURCE = linuxptp-$(LINUXPTP_VERSION).tgz LINUXPTP_SITE = http://downloads.sourceforge.net/linuxptp LINUXPTP_LICENSE = GPL-2.0+ LINUXPTP_LICENSE_FILES = COPYING -LINUXPTP_CPE_ID_VENDOR = linuxptp_project +LINUXPTP_CPE_ID_VALID = YES LINUXPTP_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index 75457a25e3..34e1c8c249 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -14,7 +14,7 @@ LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_VALGRIND),valgrind) LLDPD_LICENSE = ISC LLDPD_LICENSE_FILES = LICENSE -LLDPD_CPE_ID_VENDOR = lldpd_project +LLDPD_CPE_ID_VALID = YES # Detection of c99 support in configure fails without WCHAR. To enable # automatic detection of c99 support by configure, we need to enable diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index 37c48121f1..3fed1b957f 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -9,7 +9,7 @@ LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.xz LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION) LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE_FILES = COPYING -LOGROTATE_CPE_ID_VENDOR = logrotate_project +LOGROTATE_CPE_ID_VALID = YES LOGROTATE_DEPENDENCIES = popt host-pkgconf LOGROTATE_SELINUX_MODULES = logrotate LOGROTATE_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`" diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 3897975d73..d9be23540e 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -9,7 +9,7 @@ LRZSZ_SITE = http://www.ohse.de/uwe/releases LRZSZ_CONF_OPTS = --disable-timesync LRZSZ_LICENSE = GPL-2.0+ LRZSZ_LICENSE_FILES = COPYING -LRZSZ_CPE_ID_VENDOR = lrzsz_project +LRZSZ_CPE_ID_VALID = YES LRZSZ_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LRZSZ_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 1831080b17..cb4e987bd5 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -8,7 +8,7 @@ LSOF_VERSION = 4.99.3 LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION)) LSOF_LICENSE = lsof license LSOF_LICENSE_FILES = COPYING -LSOF_CPE_ID_VENDOR = lsof_project +LSOF_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBTIRPC),y) LSOF_DEPENDENCIES += libtirpc diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index b441eacef7..da57eb2601 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -13,7 +13,7 @@ LYNX_PATCH = \ LYNX_IGNORE_CVES += CVE-2021-38165 LYNX_LICENSE = GPL-2.0 LYNX_LICENSE_FILES = COPYING -LYNX_CPE_ID_VENDOR = lynx_project +LYNX_CPE_ID_VALID = YES LYNX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index 5da1ae2703..202dc172f7 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -9,7 +9,7 @@ LZ4_SITE = $(call github,lz4,lz4,v$(LZ4_VERSION)) LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs) LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING -LZ4_CPE_ID_VENDOR = lz4_project +LZ4_CPE_ID_VALID = YES ifeq ($(BR2_STATIC_LIBS),y) LZ4_MAKE_OPTS += BUILD_SHARED=no diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 0682d8d0ff..76c00615d5 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -8,7 +8,7 @@ LZO_VERSION = 2.10 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download LZO_LICENSE = GPL-2.0+ LZO_LICENSE_FILES = COPYING -LZO_CPE_ID_VENDOR = lzo_project +LZO_CPE_ID_VALID = YES LZO_INSTALL_STAGING = YES LZO_SUPPORTS_IN_SOURCE_BUILD = NO diff --git a/package/matio/matio.mk b/package/matio/matio.mk index d8268a109f..dc9be2ac18 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -10,7 +10,7 @@ MATIO_SITE = \ https://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING -MATIO_CPE_ID_VENDOR = matio_project +MATIO_CPE_ID_VALID = YES MATIO_DEPENDENCIES = zlib MATIO_INSTALL_STAGING = YES diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index ef518cd238..b54e34b230 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -9,7 +9,7 @@ MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING -MDADM_CPE_ID_VENDOR = mdadm_project +MDADM_CPE_ID_VALID = YES MDADM_CXFLAGS = $(TARGET_CFLAGS) diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk index 2f10fe627b..8bc5717417 100644 --- a/package/minicom/minicom.mk +++ b/package/minicom/minicom.mk @@ -10,7 +10,7 @@ MINICOM_SITE = \ https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION) MINICOM_LICENSE = GPL-2.0+ MINICOM_LICENSE_FILES = COPYING -MINICOM_CPE_ID_VENDOR = minicom_project +MINICOM_CPE_ID_VALID = YES MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \ $(TARGET_NLS_DEPENDENCIES) host-pkgconf diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 554d056999..a42c2ad149 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -8,7 +8,7 @@ MOTION_VERSION = 4.6.0 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = LICENSE -MOTION_CPE_ID_VENDOR = motion_project +MOTION_CPE_ID_VALID = YES MOTION_DEPENDENCIES = host-pkgconf jpeg libmicrohttpd $(TARGET_NLS_DEPENDENCIES) # From git MOTION_AUTORECONF = YES diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index bc8a62daea..ee75c2a676 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -16,7 +16,7 @@ NCMPC_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING -NCMPC_CPE_ID_VENDOR = ncmpc_project +NCMPC_CPE_ID_VALID = YES NCMPC_CONF_OPTS = \ -Dcurses=ncurses \ diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk index 4a03e3d846..0744bf18cb 100644 --- a/package/net-tools/net-tools.mk +++ b/package/net-tools/net-tools.mk @@ -10,7 +10,7 @@ NET_TOOLS_SITE = http://downloads.sourceforge.net/project/net-tools NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) NET_TOOLS_LICENSE = GPL-2.0+ NET_TOOLS_LICENSE_FILES = COPYING -NET_TOOLS_CPE_ID_VENDOR = net-tools_project +NET_TOOLS_CPE_ID_VALID = YES define NET_TOOLS_CONFIGURE_CMDS (cd $(@D); yes "" | ./configure.sh config.in ) diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index 939c9fa9fb..c9d7952e59 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -8,6 +8,6 @@ NETCAT_VERSION = 0.7.1 NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION) NETCAT_LICENSE = GPL-2.0+ NETCAT_LICENSE_FILES = COPYING -NETCAT_CPE_ID_VENDOR = netcat_project +NETCAT_CPE_ID_VALID = YES $(eval $(autotools-package)) diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index adeaf40868..20f755cc98 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -10,7 +10,7 @@ NETTLE_DEPENDENCIES = host-m4 gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 -NETTLE_CPE_ID_VENDOR = nettle_project +NETTLE_CPE_ID_VALID = YES # don't include openssl support for (unused) examples as it has problems # with static linking NETTLE_CONF_OPTS = --disable-openssl diff --git a/package/oniguruma/oniguruma.mk b/package/oniguruma/oniguruma.mk index 1e8a119cf1..e056048cb5 100644 --- a/package/oniguruma/oniguruma.mk +++ b/package/oniguruma/oniguruma.mk @@ -10,7 +10,7 @@ ONIGURUMA_SITE = \ ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz ONIGURUMA_LICENSE = BSD-2-Clause ONIGURUMA_LICENSE_FILES = COPYING -ONIGURUMA_CPE_ID_VENDOR = oniguruma_project +ONIGURUMA_CPE_ID_VALID = YES ONIGURUMA_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index 00370a339a..d1f40d3e20 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -8,7 +8,7 @@ OPEN_ISCSI_VERSION = 2.1.9 OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING README libopeniscsiusr/COPYING -OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project +OPEN_ISCSI_CPE_ID_VALID = YES OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 2d6cdaa7bb..a678153d7b 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -9,7 +9,7 @@ OPENBLAS_SITE = https://github.com/OpenMathLib/OpenBLAS/releases/download/v$(OPE OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES -OPENBLAS_CPE_ID_VENDOR = openblas_project +OPENBLAS_CPE_ID_VALID = YES # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) diff --git a/package/openrc/openrc.mk b/package/openrc/openrc.mk index 0dd6a5d1ac..f8e51f6720 100644 --- a/package/openrc/openrc.mk +++ b/package/openrc/openrc.mk @@ -8,7 +8,7 @@ OPENRC_VERSION = 0.52.1 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) OPENRC_LICENSE = BSD-2-Clause OPENRC_LICENSE_FILES = LICENSE -OPENRC_CPE_ID_VENDOR = openrc_project +OPENRC_CPE_ID_VALID = YES OPENRC_DEPENDENCIES = ncurses diff --git a/package/openresolv/openresolv.mk b/package/openresolv/openresolv.mk index 176f6dab3a..8a8b578781 100644 --- a/package/openresolv/openresolv.mk +++ b/package/openresolv/openresolv.mk @@ -9,7 +9,7 @@ OPENRESOLV_SITE = https://github.com/rsmarples/openresolv/releases/download/v$(O OPENRESOLV_SOURCE = openresolv-$(OPENRESOLV_VERSION).tar.xz OPENRESOLV_LICENSE = BSD-2-Clause OPENRESOLV_LICENSE_FILES = LICENSE -OPENRESOLV_CPE_ID_VENDOR = openresolv_project +OPENRESOLV_CPE_ID_VALID = YES define OPENRESOLV_CONFIGURE_CMDS cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure --sysconfdir=/etc diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index 49bdcae37a..aa82bd18da 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -8,7 +8,7 @@ OPENSC_VERSION = 0.24.0 OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) OPENSC_LICENSE = LGPL-2.1+ OPENSC_LICENSE_FILES = COPYING -OPENSC_CPE_ID_VENDOR = opensc_project +OPENSC_CPE_ID_VALID = YES OPENSC_DEPENDENCIES = openssl pcsc-lite OPENSC_INSTALL_STAGING = YES OPENSC_CONF_OPTS = --disable-cmocka --disable-strict --disable-tests diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk index 8547ee33c2..53e953e070 100644 --- a/package/p11-kit/p11-kit.mk +++ b/package/p11-kit/p11-kit.mk @@ -13,7 +13,7 @@ P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \ ac_cv_have_decl___progname=no P11_KIT_LICENSE = BSD-3-Clause P11_KIT_LICENSE_FILES = COPYING -P11_KIT_CPE_ID_VENDOR = p11-kit_project +P11_KIT_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_LIBFFI),y) P11_KIT_DEPENDENCIES += host-pkgconf libffi diff --git a/package/parted/parted.mk b/package/parted/parted.mk index bfd9ef3432..5b55a9f21e 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -11,7 +11,7 @@ PARTED_DEPENDENCIES = host-pkgconf util-linux PARTED_INSTALL_STAGING = YES PARTED_LICENSE = GPL-3.0+ PARTED_LICENSE_FILES = COPYING -PARTED_CPE_ID_VENDOR = parted_project +PARTED_CPE_ID_VALID = YES ifeq ($(BR2_PACKAGE_READLINE),y) PARTED_DEPENDENCIES += readline diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk index 1379b19f5d..9b233f614d 100644 --- a/package/pcmanfm/pcmanfm.mk +++ b/package/pcmanfm/pcmanfm.mk @@ -10,7 +10,7 @@ PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm $(TARGET_NLS_DEPENDENCIES) PCMANFM_LICENSE = GPL-2.0+ PCMANFM_LICENSE_FILES = COPYING -PCMANFM_CPE_ID_VENDOR = pcmanfm_project +PCMANFM_CPE_ID_VALID = YES PCMANFM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk index 2828c98fb7..bb55c3c1d1 100644 --- a/package/picocom/picocom.mk +++ b/package/picocom/picocom.mk @@ -8,7 +8,7 @@ PICOCOM_VERSION = 2023-04 PICOCOM_SITE = $(call gitlab,wsakernel,picocom,$(PICOCOM_VERSION)) PICOCOM_LICENSE = GPL-2.0+ PICOCOM_LICENSE_FILES = LICENSE.txt -PICOCOM_CPE_ID_VENDOR = picocom_project +PICOCOM_CPE_ID_VALID = YES define PICOCOM_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index f58dbe43de..e393672c1e 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -8,7 +8,7 @@ POLKIT_VERSION = 123 POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING -POLKIT_CPE_ID_VENDOR = polkit_project +POLKIT_CPE_ID_VALID = YES POLKIT_INSTALL_STAGING = YES POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) diff --git a/package/popt/popt.mk b/package/popt/popt.mk index 5cee8e9673..06bab375f6 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -9,7 +9,7 @@ POPT_SITE = http://ftp.rpm.org/popt/releases/popt-1.x POPT_INSTALL_STAGING = YES POPT_LICENSE = MIT POPT_LICENSE_FILES = COPYING -POPT_CPE_ID_VENDOR = popt_project +POPT_CPE_ID_VALID = YES POPT_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) diff --git a/package/powerpc-utils/powerpc-utils.mk b/package/powerpc-utils/powerpc-utils.mk index 8d5491133b..ddeb830b07 100644 --- a/package/powerpc-utils/powerpc-utils.mk +++ b/package/powerpc-utils/powerpc-utils.mk @@ -10,7 +10,7 @@ POWERPC_UTILS_DEPENDENCIES = zlib numactl POWERPC_UTILS_AUTORECONF = YES POWERPC_UTILS_LICENSE = GPL-2.0+ POWERPC_UTILS_LICENSE_FILES = COPYING -POWERPC_UTILS_CPE_ID_VENDOR = powerpc-utils_project +POWERPC_UTILS_CPE_ID_VALID = YES POWERPC_UTILS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 46f75a48ef..ba8958d146 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -9,7 +9,7 @@ PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB -PROCPS_NG_CPE_ID_VENDOR = procps-ng_project +PROCPS_NG_CPE_ID_VALID = YES PROCPS_NG_INSTALL_STAGING = YES # We're patching configure.ac PROCPS_NG_AUTORECONF = YES diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk index ccabd4723f..2b3e86a1bc 100644 --- a/package/protobuf-c/protobuf-c.mk +++ b/package/protobuf-c/protobuf-c.mk @@ -13,7 +13,7 @@ PROTOBUF_C_CONF_OPTS = --disable-protoc PROTOBUF_C_INSTALL_STAGING = YES PROTOBUF_C_LICENSE = BSD-2-Clause PROTOBUF_C_LICENSE_FILES = LICENSE -PROTOBUF_C_CPE_ID_VENDOR = protobuf-c_project +PROTOBUF_C_CPE_ID_VALID = YES # when building with protoc (from host-protobuf) c++17 is now required HOST_PROTOBUF_C_CONF_ENV += CXXFLAGS="$(HOST_CXXFLAGS) -std=c++17" diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index beb8909088..3573cf1f09 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -9,7 +9,7 @@ PROXYCHAINS_NG_SOURCE = proxychains-ng-$(PROXYCHAINS_NG_VERSION).tar.xz PROXYCHAINS_NG_SITE = https://github.com/rofl0r/proxychains-ng/releases/download/v$(PROXYCHAINS_NG_VERSION) PROXYCHAINS_NG_LICENSE = GPL-2.0+ PROXYCHAINS_NG_LICENSE_FILES = COPYING -PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project +PROXYCHAINS_NG_CPE_ID_VALID = YES define PROXYCHAINS_NG_CONFIGURE_CMDS cd $(@D) && \ diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index 9772788d2d..3935526af6 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -8,7 +8,7 @@ PUGIXML_VERSION = 1.14 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md -PUGIXML_CPE_ID_VENDOR = pugixml_project +PUGIXML_CPE_ID_VALID = YES PUGIXML_INSTALL_STAGING = YES diff --git a/package/pwgen/pwgen.mk b/package/pwgen/pwgen.mk index 89925bb300..90b5ac63fa 100644 --- a/package/pwgen/pwgen.mk +++ b/package/pwgen/pwgen.mk @@ -8,7 +8,7 @@ PWGEN_VERSION = 2.08 PWGEN_SITE = http://downloads.sourceforge.net/project/pwgen/pwgen/$(PWGEN_VERSION) PWGEN_LICENSE = GPL-2.0 PWGEN_LICENSE_FILES = debian/copyright -PWGEN_CPE_ID_VENDOR = pwgen_project +PWGEN_CPE_ID_VALID = YES $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/python-ecdsa/python-ecdsa.mk b/package/python-ecdsa/python-ecdsa.mk index d3d49c2520..321e87e0a3 100644 --- a/package/python-ecdsa/python-ecdsa.mk +++ b/package/python-ecdsa/python-ecdsa.mk @@ -10,6 +10,6 @@ PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/ff/7b/ba6547a76c468a PYTHON_ECDSA_SETUP_TYPE = setuptools PYTHON_ECDSA_LICENSE = MIT PYTHON_ECDSA_LICENSE_FILES = LICENSE -PYTHON_ECDSA_CPE_ID_VENDOR = python-ecdsa_project +PYTHON_ECDSA_CPE_ID_VALID = YES $(eval $(python-package)) diff --git a/package/python-engineio/python-engineio.mk b/package/python-engineio/python-engineio.mk index 7702b5f294..67092402b4 100644 --- a/package/python-engineio/python-engineio.mk +++ b/package/python-engineio/python-engineio.mk @@ -9,6 +9,6 @@ PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/e2/24/4a69dd119d1 PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE -PYTHON_ENGINEIO_CPE_ID_VENDOR = python-engineio_project +PYTHON_ENGINEIO_CPE_ID_VALID = YES $(eval $(python-package)) diff --git a/package/python-markdown2/python-markdown2.mk b/package/python-markdown2/python-markdown2.mk index 4c21eb98e8..a78e6ea0d8 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -10,6 +10,6 @@ PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/3c/e4/87a454674a PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt -PYTHON_MARKDOWN2_CPE_ID_VENDOR = python-markdown2_project +PYTHON_MARKDOWN2_CPE_ID_VALID = YES $(eval $(python-package)) diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk index 01b5c49b50..d84ba8b431 100644 --- a/package/python-rsa/python-rsa.mk +++ b/package/python-rsa/python-rsa.mk @@ -10,6 +10,6 @@ PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/aa/65/7d973b89c4d2351d PYTHON_RSA_SETUP_TYPE = setuptools PYTHON_RSA_LICENSE = Apache-2.0 PYTHON_RSA_LICENSE_FILES = LICENSE -PYTHON_RSA_CPE_ID_VENDOR = python-rsa_project +PYTHON_RSA_CPE_ID_VALID = YES $(eval $(python-package)) diff --git a/package/qdecoder/qdecoder.mk b/package/qdecoder/qdecoder.mk index c465617e26..9544dcf5e1 100644 --- a/package/qdecoder/qdecoder.mk +++ b/package/qdecoder/qdecoder.mk @@ -8,7 +8,7 @@ QDECODER_VERSION = 12.1.0 QDECODER_SITE = $(call github,wolkykim,qdecoder,v$(QDECODER_VERSION)) QDECODER_LICENSE = BSD-2-Clause QDECODER_LICENSE_FILES = COPYING -QDECODER_CPE_ID_VENDOR = qdecoder_project +QDECODER_CPE_ID_VALID = YES QDECODER_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' QDECODER_INSTALL_STAGING = YES diff --git a/package/qpdf/qpdf.mk b/package/qpdf/qpdf.mk index a58781f4f1..d479515789 100644 --- a/package/qpdf/qpdf.mk +++ b/package/qpdf/qpdf.mk @@ -9,7 +9,7 @@ QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION) QPDF_INSTALL_STAGING = YES QPDF_LICENSE = Apache-2.0 or Artistic-2.0 QPDF_LICENSE_FILES = LICENSE.txt Artistic-2.0 -QPDF_CPE_ID_VENDOR = qpdf_project +QPDF_CPE_ID_VALID = YES QPDF_DEPENDENCIES = host-pkgconf zlib jpeg QPDF_CONF_OPTS = --with-random=/dev/urandom diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index 665058d890..ac28792f20 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -18,6 +18,6 @@ endif QUAZIP_LICENSE = LGPL-2.1 QUAZIP_LICENSE_FILES = COPYING -QUAZIP_CPE_ID_VENDOR = quazip_project +QUAZIP_CPE_ID_VALID = YES $(eval $(cmake-package)) diff --git a/package/quickjs/quickjs.mk b/package/quickjs/quickjs.mk index 091862635e..186397f9aa 100644 --- a/package/quickjs/quickjs.mk +++ b/package/quickjs/quickjs.mk @@ -9,7 +9,7 @@ QUICKJS_SOURCE = quickjs-$(QUICKJS_VERSION).tar.xz QUICKJS_SITE = https://bellard.org/quickjs QUICKJS_LICENSE = MIT QUICKJS_LICENSE_FILES = LICENSE -QUICKJS_CPE_ID_VENDOR = quickjs_project +QUICKJS_CPE_ID_VALID = YES QUICKJS_INSTALL_STAGING = YES ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) diff --git a/package/rabbitmq-c/rabbitmq-c.mk b/package/rabbitmq-c/rabbitmq-c.mk index cac0f67ddc..5a0775f353 100644 --- a/package/rabbitmq-c/rabbitmq-c.mk +++ b/package/rabbitmq-c/rabbitmq-c.mk @@ -8,7 +8,7 @@ RABBITMQ_C_VERSION = 0.13.0 RABBITMQ_C_SITE = $(call github,alanxz,rabbitmq-c,v$(RABBITMQ_C_VERSION)) RABBITMQ_C_LICENSE = MIT RABBITMQ_C_LICENSE_FILES = LICENSE README.md -RABBITMQ_C_CPE_ID_VENDOR = rabbitmq-c_project +RABBITMQ_C_CPE_ID_VALID = YES RABBITMQ_C_INSTALL_STAGING = YES RABBITMQ_C_CONF_OPTS = \ -DBUILD_API_DOCS=OFF \ diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 99762ec0c7..3cc9d427a7 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -9,7 +9,7 @@ RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) RHASH_LICENSE = 0BSD RHASH_LICENSE_FILES = COPYING -RHASH_CPE_ID_VENDOR = rhash_project +RHASH_CPE_ID_VALID = YES RHASH_INSTALL_STAGING = YES RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 05b8d5c48e..288c20ee95 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -8,7 +8,7 @@ RIPGREP_VERSION = 14.1.0 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT -RIPGREP_CPE_ID_VENDOR = ripgrep_project +RIPGREP_CPE_ID_VALID = YES # CVE only impacts ripgrep on Windows RIPGREP_IGNORE_CVES += CVE-2021-3013 diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 933370c9a9..f50005343b 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -8,7 +8,7 @@ RNG_TOOLS_VERSION = 6.16 RNG_TOOLS_SITE = $(call github,nhorman,rng-tools,v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING -RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project +RNG_TOOLS_CPE_ID_VALID = YES RNG_TOOLS_SELINUX_MODULES = rngd RNG_TOOLS_DEPENDENCIES = host-pkgconf libcap openssl diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index 698894fda9..f50f1e5a1f 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -8,7 +8,7 @@ RP_PPPOE_VERSION = 3.15 RP_PPPOE_SITE = https://dianne.skoll.ca/projects/rp-pppoe/download RP_PPPOE_LICENSE = GPL-2.0 RP_PPPOE_LICENSE_FILES = doc/LICENSE -RP_PPPOE_CPE_ID_VENDOR = rp-pppoe_project +RP_PPPOE_CPE_ID_VALID = YES RP_PPPOE_DEPENDENCIES = pppd RP_PPPOE_SUBDIR = src diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk index 2eee116755..2c158213ad 100644 --- a/package/rpcbind/rpcbind.mk +++ b/package/rpcbind/rpcbind.mk @@ -9,7 +9,7 @@ RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIN RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 RPCBIND_LICENSE = BSD-3-Clause RPCBIND_LICENSE_FILES = COPYING -RPCBIND_CPE_ID_VENDOR = rpcbind_project +RPCBIND_CPE_ID_VALID = YES RPCBIND_SELINUX_MODULES = rpcbind RPCBIND_CONF_ENV += \ diff --git a/package/rtl_433/rtl_433.mk b/package/rtl_433/rtl_433.mk index 7c33a71f31..0af25c7936 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -8,7 +8,7 @@ RTL_433_VERSION = 23.11 RTL_433_SITE = $(call github,merbanan,rtl_433,$(RTL_433_VERSION)) RTL_433_LICENSE = GPL-2.0+ RTL_433_LICENSE_FILES = COPYING -RTL_433_CPE_ID_VENDOR = rtl_433_project +RTL_433_CPE_ID_VALID = YES # Force Release build to remove ASAN. RTL_433_CONF_OPTS = \ diff --git a/package/rtmpdump/rtmpdump.mk b/package/rtmpdump/rtmpdump.mk index fb381d0e10..4c8ecfe127 100644 --- a/package/rtmpdump/rtmpdump.mk +++ b/package/rtmpdump/rtmpdump.mk @@ -12,7 +12,7 @@ RTMPDUMP_INSTALL_STAGING = YES # care about librtmp, it's LGPL-2.1+ RTMPDUMP_LICENSE = LGPL-2.1+ RTMPDUMP_LICENSE_FILES = librtmp/COPYING -RTMPDUMP_CPE_ID_VENDOR = rtmpdump_project +RTMPDUMP_CPE_ID_VALID = YES RTMPDUMP_DEPENDENCIES = zlib ifeq ($(BR2_PACKAGE_GNUTLS),y) diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk index 83c40e684f..fe89e7747d 100644 --- a/package/sane-backends/sane-backends.mk +++ b/package/sane-backends/sane-backends.mk @@ -10,7 +10,7 @@ SANE_BACKENDS_SITE = \ SANE_BACKENDS_CONFIG_SCRIPTS = sane-config SANE_BACKENDS_LICENSE = GPL-2.0+ SANE_BACKENDS_LICENSE_FILES = COPYING -SANE_BACKENDS_CPE_ID_VENDOR = sane-backends_project +SANE_BACKENDS_CPE_ID_VALID = YES SANE_BACKENDS_INSTALL_STAGING = YES SANE_BACKENDS_CONF_OPTS = \ diff --git a/package/shellinabox/shellinabox.mk b/package/shellinabox/shellinabox.mk index 58c1668112..725b8d9c52 100644 --- a/package/shellinabox/shellinabox.mk +++ b/package/shellinabox/shellinabox.mk @@ -8,7 +8,7 @@ SHELLINABOX_VERSION = 2.20 SHELLINABOX_SITE = $(call github,shellinabox,shellinabox,v$(SHELLINABOX_VERSION)) SHELLINABOX_LICENSE = GPL-2.0 with OpenSSL exception SHELLINABOX_LICENSE_FILES = COPYING GPL-2 -SHELLINABOX_CPE_ID_VENDOR = shellinabox_project +SHELLINABOX_CPE_ID_VALID = YES # 0002-CVE-2018-16789-fix-for-broken-multipart-form-data.patch SHELLINABOX_IGNORE_CVES += CVE-2018-16789 diff --git a/package/spice/spice.mk b/package/spice/spice.mk index 5f7bcd9d2f..608a9413fe 100644 --- a/package/spice/spice.mk +++ b/package/spice/spice.mk @@ -9,7 +9,7 @@ SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases/spice-server SPICE_LICENSE = LGPL-2.1+ SPICE_LICENSE_FILES = COPYING -SPICE_CPE_ID_VENDOR = spice_project +SPICE_CPE_ID_VALID = YES SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ host-pkgconf \ diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 082104b6d4..b9fbf54b01 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -8,7 +8,7 @@ SQUASHFS_VERSION = 4.6.1 SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING -SQUASHFS_CPE_ID_VENDOR = squashfs_project +SQUASHFS_CPE_ID_VALID = YES SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y) diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk index 5dad6aafc2..e829af0bba 100644 --- a/package/sslh/sslh.mk +++ b/package/sslh/sslh.mk @@ -9,7 +9,7 @@ SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz SSLH_SITE = http://www.rutschle.net/tech/sslh SSLH_LICENSE = GPL-2.0+ SSLH_LICENSE_FILES = COPYING -SSLH_CPE_ID_VENDOR = sslh_project +SSLH_CPE_ID_VALID = YES SSLH_DEPENDENCIES = pcre2 SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 6279622fdb..70b4a8f6c6 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -9,7 +9,7 @@ STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ STRACE_LICENSE_FILES = COPYING LGPL-2.1-or-later -STRACE_CPE_ID_VENDOR = strace_project +STRACE_CPE_ID_VALID = YES STRACE_CONF_OPTS = --enable-mpers=no ifeq ($(BR2_PACKAGE_LIBUNWIND),y) diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk index a7c7adade3..fc419e2867 100644 --- a/package/sylpheed/sylpheed.mk +++ b/package/sylpheed/sylpheed.mk @@ -10,7 +10,7 @@ SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.xz SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR) SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPL-2.1+ (library, attachment plugin) SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB -SYLPHEED_CPE_ID_VENDOR = sylpheed_project +SYLPHEED_CPE_ID_VALID = YES SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2 diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 7a46d759d3..083f505a2b 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -9,7 +9,7 @@ SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKL SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE SYSKLOGD_INSTALL_STAGING = YES -SYSKLOGD_CPE_ID_VENDOR = sysklogd_project +SYSKLOGD_CPE_ID_VALID = YES # Busybox install logger in /usr/bin, and syslogd in /sbin, so install in # the same locations so that busybox does not install its applets in there. diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index ec0c666157..f77a60b1da 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -11,7 +11,7 @@ SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ SYSSTAT_LICENSE_FILES = COPYING -SYSSTAT_CPE_ID_VENDOR = sysstat_project +SYSSTAT_CPE_ID_VALID = YES SYSSTAT_SELINUX_MODULES = sysstat ifeq ($(BR2_PACKAGE_LM_SENSORS),y) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index d371233cfe..528fe60b1d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -46,7 +46,7 @@ SYSTEMD_LICENSE_FILES = \ LICENSES/murmurhash2-public-domain.txt \ LICENSES/OFL-1.1.txt \ LICENSES/README.md -SYSTEMD_CPE_ID_VENDOR = systemd_project +SYSTEMD_CPE_ID_VALID = YES SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index b7fe39ca43..49c92ec2ac 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -9,7 +9,7 @@ SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit SYSVINIT_LICENSE = GPL-2.0+ SYSVINIT_LICENSE_FILES = COPYING -SYSVINIT_CPE_ID_VENDOR = sysvinit_project +SYSVINIT_CPE_ID_VALID = YES SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR) diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index c6ca776b27..d2cbf79e26 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -10,7 +10,7 @@ TARGETCLI_FB_VERSION = 2.1.54 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING -TARGETCLI_FB_CPE_ID_VENDOR = targetcli-fb_project +TARGETCLI_FB_CPE_ID_VALID = YES TARGETCLI_FB_SETUP_TYPE = setuptools TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six diff --git a/package/tclap/tclap.mk b/package/tclap/tclap.mk index d7f96bd034..665bec2d67 100644 --- a/package/tclap/tclap.mk +++ b/package/tclap/tclap.mk @@ -9,7 +9,7 @@ TCLAP_SITE = http://downloads.sourceforge.net/project/tclap TCLAP_LICENSE = MIT TCLAP_LICENSE_FILES = COPYING TCLAP_INSTALL_STAGING = YES -TCLAP_CPE_ID_VENDOR = tclap_project +TCLAP_CPE_ID_VALID = YES # This package is a pure C++ template library, only made of headers. TCLAP_INSTALL_TARGET = NO diff --git a/package/tini/tini.mk b/package/tini/tini.mk index aa8e259db2..83e86237d4 100644 --- a/package/tini/tini.mk +++ b/package/tini/tini.mk @@ -8,7 +8,7 @@ TINI_VERSION = 0.19.0 TINI_SITE = $(call github,krallin,tini,v$(TINI_VERSION)) TINI_LICENSE = MIT TINI_LICENSE_FILES = LICENSE -TINI_CPE_ID_VENDOR = tini_project +TINI_CPE_ID_VALID = YES TINI_CFLAGS = $(TARGET_CFLAGS) \ -static \ diff --git a/package/tinyproxy/tinyproxy.mk b/package/tinyproxy/tinyproxy.mk index e91a886888..e989f70a22 100644 --- a/package/tinyproxy/tinyproxy.mk +++ b/package/tinyproxy/tinyproxy.mk @@ -9,7 +9,7 @@ TINYPROXY_SITE = https://github.com/tinyproxy/tinyproxy/releases/download/$(TINY TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.xz TINYPROXY_LICENSE = GPL-2.0+ TINYPROXY_LICENSE_FILES = COPYING -TINYPROXY_CPE_ID_VENDOR = tinyproxy_project +TINYPROXY_CPE_ID_VALID = YES # 0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch TINYPROXY_IGNORE_CVES += CVE-2022-40468 diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index 8e706f1a1e..01c25f7c1c 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,7 +12,7 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README -TINYXML_CPE_ID_VENDOR = tinyxml_project +TINYXML_CPE_ID_VALID = YES # 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch TINYXML_IGNORE_CVES += CVE-2021-42260 diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk index f53e8d6b99..044b8f82db 100644 --- a/package/tinyxml2/tinyxml2.mk +++ b/package/tinyxml2/tinyxml2.mk @@ -9,7 +9,7 @@ TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) TINYXML2_LICENSE = Zlib TINYXML2_LICENSE_FILES = LICENSE.txt TINYXML2_INSTALL_STAGING = YES -TINYXML2_CPE_ID_VENDOR = tinyxml2_project +TINYXML2_CPE_ID_VALID = YES ifeq ($(BR2_STATIC_LIBS),y) TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index af06c8570b..533a82bbad 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -8,7 +8,7 @@ TMUX_VERSION = 3.3a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING -TMUX_CPE_ID_VENDOR = tmux_project +TMUX_CPE_ID_VALID = YES TMUX_DEPENDENCIES = libevent ncurses host-pkgconf ifeq ($(BR2_PACKAGE_SYSTEMD),y) diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 01b029d942..12f924eee5 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -8,7 +8,7 @@ TPM2_TOOLS_VERSION = 5.2 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = doc/LICENSE -TPM2_TOOLS_CPE_ID_VENDOR = tpm2-tools_project +TPM2_TOOLS_CPE_ID_VALID = YES TPM2_TOOLS_SELINUX_MODULES = tpm2 TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk index 4dca50c0b6..f6b56f6241 100644 --- a/package/trinity/trinity.mk +++ b/package/trinity/trinity.mk @@ -9,7 +9,7 @@ TRINITY_SITE = http://codemonkey.org.uk/projects/trinity TRINITY_SOURCE = trinity-$(TRINITY_VERSION).tar.xz TRINITY_LICENSE = GPL-2.0 TRINITY_LICENSE_FILES = COPYING -TRINITY_CPE_ID_VENDOR = trinity_project +TRINITY_CPE_ID_VALID = YES TRINITY_LDFLAGS = $(TARGET_LDFLAGS) diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk index 14ccedd48f..5effebee4a 100644 --- a/package/unzip/unzip.mk +++ b/package/unzip/unzip.mk @@ -10,7 +10,7 @@ UNZIP_PATCH = unzip_$(UNZIP_VERSION)-27.debian.tar.xz UNZIP_SITE = https://snapshot.debian.org/archive/debian/20220916T090657Z/pool/main/u/unzip UNZIP_LICENSE = Info-ZIP UNZIP_LICENSE_FILES = LICENSE -UNZIP_CPE_ID_VENDOR = unzip_project +UNZIP_CPE_ID_VALID = YES # unzip_$(UNZIP_VERSION)-27.debian.tar.xz has patches to fix: UNZIP_IGNORE_CVES = \ diff --git a/package/upx/upx.mk b/package/upx/upx.mk index d6c068fc3b..65f4bac517 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -9,7 +9,7 @@ UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING -UPX_CPE_ID_VENDOR = upx_project +UPX_CPE_ID_VALID = YES UPX_SUPPORTS_IN_SOURCE_BUILD = NO $(eval $(host-cmake-package)) diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 60b69df3be..4a5028f509 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -8,7 +8,7 @@ USBGUARD_VERSION = 1.1.2 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE -USBGUARD_CPE_ID_VENDOR = usbguard_project +USBGUARD_CPE_ID_VALID = YES USBGUARD_SELINUX_MODULES = usbguard USBGUARD_CONF_ENV = ac_cv_prog_A2X="" USBGUARD_CONF_OPTS = \ diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index 5b68dc9864..df640577ac 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -8,7 +8,7 @@ VALIJSON_VERSION = 1.0.2 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE -VALIJSON_CPE_ID_VENDOR = valijson_project +VALIJSON_CPE_ID_VALID = YES VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO VALIJSON_CONF_OPTS = -Dvalijson_BUILD_TESTS=FALSE diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index 3e7b233e48..6742843c19 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -9,7 +9,7 @@ VSFTPD_SITE = https://security.appspot.com/downloads VSFTPD_LIBS = -lcrypt VSFTPD_LICENSE = GPL-2.0 VSFTPD_LICENSE_FILES = COPYING -VSFTPD_CPE_ID_VENDOR = vsftpd_project +VSFTPD_CPE_ID_VALID = YES VSFTPD_SELINUX_MODULES = ftp define VSFTPD_DISABLE_UTMPX diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk index 1eda717c68..aa0f14c456 100644 --- a/package/x11vnc/x11vnc.mk +++ b/package/x11vnc/x11vnc.mk @@ -12,7 +12,7 @@ X11VNC_CONF_OPTS = --without-sdl X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver X11VNC_LICENSE = GPL-2.0+ X11VNC_LICENSE_FILES = COPYING -X11VNC_CPE_ID_VENDOR = x11vnc_project +X11VNC_CPE_ID_VALID = YES # 0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch X11VNC_IGNORE_CVES += CVE-2020-29074 diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 6cc7e8febe..466d309940 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -10,7 +10,7 @@ XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h -XSCREENSAVER_CPE_ID_VENDOR = xscreensaver_project +XSCREENSAVER_CPE_ID_VALID = YES XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver XSCREENSAVER_DEPENDENCIES = \ diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index cd23c8728d..1a13cb9da8 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -9,6 +9,6 @@ YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING -YAJL_CPE_ID_VENDOR = yajl_project +YAJL_CPE_ID_VALID = YES $(eval $(cmake-package)) diff --git a/package/yaml-cpp/yaml-cpp.mk b/package/yaml-cpp/yaml-cpp.mk index 1f87956589..c259f1e531 100644 --- a/package/yaml-cpp/yaml-cpp.mk +++ b/package/yaml-cpp/yaml-cpp.mk @@ -9,7 +9,7 @@ YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,$(YAML_CPP_VERSION)) YAML_CPP_INSTALL_STAGING = YES YAML_CPP_LICENSE = MIT YAML_CPP_LICENSE_FILES = LICENSE -YAML_CPP_CPE_ID_VENDOR = yaml-cpp_project +YAML_CPP_CPE_ID_VALID = YES # Disable testing and parse tools YAML_CPP_CONF_OPTS += \ diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index 1a1e4eb24b..0e79004bb3 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -9,7 +9,7 @@ ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2 ZBAR_SITE = https://www.linuxtv.org/downloads/zbar ZBAR_LICENSE = LGPL-2.1+ ZBAR_LICENSE_FILES = LICENSE.md -ZBAR_CPE_ID_VENDOR = zbar_project +ZBAR_CPE_ID_VALID = YES ZBAR_INSTALL_STAGING = YES ZBAR_DEPENDENCIES = libv4l jpeg $(TARGET_NLS_DEPENDENCIES) # uses C99 features diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk index 347f482211..e5bbf6ff3b 100644 --- a/package/zlog/zlog.mk +++ b/package/zlog/zlog.mk @@ -8,7 +8,7 @@ ZLOG_VERSION = 1.2.17 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) ZLOG_LICENSE = Apache-2.0 ZLOG_LICENSE_FILES = LICENSE -ZLOG_CPE_ID_VENDOR = zlog_project +ZLOG_CPE_ID_VALID = YES ZLOG_INSTALL_STAGING = YES define ZLOG_BUILD_CMDS diff --git a/package/zziplib/zziplib.mk b/package/zziplib/zziplib.mk index 6b7b64cacc..6cb9dedce8 100644 --- a/package/zziplib/zziplib.mk +++ b/package/zziplib/zziplib.mk @@ -8,7 +8,7 @@ ZZIPLIB_VERSION = 0.13.72 ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm -ZZIPLIB_CPE_ID_VENDOR = zziplib_project +ZZIPLIB_CPE_ID_VALID = YES ZZIPLIB_INSTALL_STAGING = YES ZZIPLIB_CONF_OPTS += \ -DZZIPDOCS=OFF \ -- 2.43.0 From ju.o at free.fr Sat Feb 10 22:26:59 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 10 Feb 2024 23:26:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/jailhouse: install files to /usr Message-ID: <20240210222659.805747-1-ju.o@free.fr> The jailhouse package installs files in the /usr/local prefix. This is not convenient, because the jailhouse binary ends up in /usr/local/sbin, which is not in the default Buildroot PATH. See [1]. Moreover, all other Buildroot packages install files in /usr. This is because the Buildroot package recipe does not set any prefix value, and the upstream Jailhouse Makefile has a default to /usr/local. See [2]. This commit sets the prefix value in the JAILHOUSE_MAKE_OPTS and also updates other installation commands to put all the files in /usr. [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2023.11.1/system/Config.in#L495 [2] https://github.com/siemens/jailhouse/blob/v0.12/scripts/include.mk#L22 Signed-off-by: Julien Olivain --- package/jailhouse/jailhouse.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index c239e75e76..e7de40cf8c 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -15,7 +15,8 @@ JAILHOUSE_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(KERNEL_ARCH)" \ KDIR="$(LINUX_DIR)" \ - DESTDIR="$(TARGET_DIR)" + DESTDIR="$(TARGET_DIR)" \ + prefix=/usr ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) JAILHOUSE_DEPENDENCIES += \ @@ -60,8 +61,8 @@ define JAILHOUSE_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/jailhouse $(INSTALL) -D -m 0644 $(@D)/configs/*/*.cell $(TARGET_DIR)/etc/jailhouse - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/libexec/jailhouse/demos - $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/local/libexec/jailhouse/demos + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/libexec/jailhouse/demos + $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/libexec/jailhouse/demos $(JAILHOUSE_INSTALL_HELPER_SCRIPTS) endef -- 2.43.0 From ju.o at free.fr Sat Feb 10 22:29:40 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 10 Feb 2024 23:29:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/jailhouse: bump to commit e57d1ef Message-ID: <20240210222940.806905-1-ju.o@free.fr> The last Jailhouse tag is v0.12. It dates from 2020-02-04, which is 4 years old. This version no longer compiles with recent Kernels. This commit updates Jailhouse to the latest commit e57d1ef, which dates from 2023-01-10. For commit logs, see: https://github.com/siemens/jailhouse/commits/master/ Signed-off-by: Julien Olivain --- package/jailhouse/jailhouse.hash | 2 +- package/jailhouse/jailhouse.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jailhouse/jailhouse.hash b/package/jailhouse/jailhouse.hash index 297d0f1930..96d5819847 100644 --- a/package/jailhouse/jailhouse.hash +++ b/package/jailhouse/jailhouse.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3777a553c2acb2b693843fe4d16ab80333879daedd47d9c9f3717c9644e6cf93 jailhouse-0.12.tar.gz +sha256 38ea5d2d9672ce7f76fd0c163edaa8968711aca58f245aec3c8934f140e828b6 jailhouse-e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560.tar.gz sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index c239e75e76..907ad92c0f 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -4,8 +4,8 @@ # ################################################################################ -JAILHOUSE_VERSION = 0.12 -JAILHOUSE_SITE = $(call github,siemens,jailhouse,v$(JAILHOUSE_VERSION)) +JAILHOUSE_VERSION = e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560 +JAILHOUSE_SITE = $(call github,siemens,jailhouse,$(JAILHOUSE_VERSION)) JAILHOUSE_LICENSE = GPL-2.0 JAILHOUSE_LICENSE_FILES = COPYING JAILHOUSE_DEPENDENCIES = \ -- 2.43.0 From kadambini.nema at gmail.com Sun Feb 11 05:19:07 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 10 Feb 2024 21:19:07 -0800 Subject: [Buildroot] [PATCH 1/1] package/strace: bump to version 6.7 Message-ID: <20240211051907.551771-1-kadambini.nema@gmail.com> - Updated hash of COPYING (year updated with https://github.com/strace/strace/commit/eba0ac1fc4f8896b938d41081e0643cb06283a9b) Signed-off-by: Kadambini Nema --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 75a35d7cf4..a35d2b0be6 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.6/strace-6.6.tar.xz.asc -sha256 421b4186c06b705163e64dc85f271ebdcf67660af8667283147d5e859fc8a96c strace-6.6.tar.xz -sha256 6e5648c0ed522b163f9df1dc500c73491b1743495bd78388e99685cecfa79707 COPYING +# https://strace.io/files/6.7/strace-6.7.tar.xz.asc +sha256 2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7 strace-6.7.tar.xz +sha256 1988d0e1aa101d68855e8c4f940aacf2531051b82f6b608eb026c5fad1f33df1 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 6279622fdb..f916936207 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.6 +STRACE_VERSION = 6.7 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ -- 2.25.1 From kadambini.nema at gmail.com Sun Feb 11 09:14:22 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sun, 11 Feb 2024 01:14:22 -0800 Subject: [Buildroot] [PATCH 1/1] package/ustreamer: new package Message-ID: <20240211091422.597625-1-kadambini.nema@gmail.com> Lightweight and fast MJPEG-HTTP streamer (https://github.com/pikvm/ustreamer/tree/master#%C2%B5streamer) Signed-off-by: Kadambini Nema --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/ustreamer/Config.in | 17 +++++++++++++++++ package/ustreamer/ustreamer.hash | 3 +++ package/ustreamer/ustreamer.mk | 24 ++++++++++++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 package/ustreamer/Config.in create mode 100644 package/ustreamer/ustreamer.hash create mode 100644 package/ustreamer/ustreamer.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..cf22054970 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1870,6 +1870,9 @@ F: package/easy-rsa/ N: Justin Maggard F: package/dtach/ +N: Kadambini Nema +F: package/ustreamer/ + N: Kamel Bouhara F: package/libodb-boost/ F: package/libodb-mysql/ diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..ea3ecd6fdc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2596,6 +2596,7 @@ endif source "package/uredir/Config.in" source "package/ushare/Config.in" source "package/ussp-push/Config.in" + source "package/ustreamer/Config.in" source "package/vde2/Config.in" source "package/vdr/Config.in" source "package/vdr-plugin-vnsiserver/Config.in" diff --git a/package/ustreamer/Config.in b/package/ustreamer/Config.in new file mode 100644 index 0000000000..52c511e22d --- /dev/null +++ b/package/ustreamer/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_USTREAMER + bool "ustreamer" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 # V4L2_EVENT_SOURCE_CHANGE + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_ATOMIC + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBBSD + select BR2_PACKAGE_LIBGPIOD + help + Lightweight and fast MJPEG-HTTP streamer + + https://github.com/pikvm/ustreamer + +comment "ustreamer needs a toolchain w/ threads, headers >= 3.16, dynamic library" diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash new file mode 100644 index 0000000000..b7a85ca2d5 --- /dev/null +++ b/package/ustreamer/ustreamer.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 198283aaea5e7aa51da54426eb79ea436641ffb9b431e9ebace8fe5a76dfb105 ustreamer-b2ebcf99c8c51f97c44eccb6c768f5e824ecf952.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk new file mode 100644 index 0000000000..86ce18f476 --- /dev/null +++ b/package/ustreamer/ustreamer.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# ustreamer +# +################################################################################ + +USTREAMER_VERSION = b2ebcf99c8c51f97c44eccb6c768f5e824ecf952 +USTREAMER_SITE = $(call github,pikvm,ustreamer,$(USTREAMER_VERSION)) +USTREAMER_SUBDIR = ustreamer +USTREAMER_LICENSE = GPL-3.0-or-later +USTREAMER_LICENSE_FILES = $(USTREAMER_SUBDIR)/LICENSE +USTREAMER_DEPENDENCIES = jpeg libevent libbsd libgpiod +USTREAMER_CONF_ENV = "CFLAGS=$(TARGET_CFLAGS)" + +define USTREAMER_BUILD_CMDS + $(MAKE) $(if $(BR2_PACKAGE_SYSTEMD),WITH_SYSTEMD=1, ) WITH_PTHREAD_NP=1 WITH_SETPROCTITLE=1 HAS_PDEATHSIG=1 $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define USTREAMER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/ustreamer $(TARGET_DIR)/usr/bin/ustreamer + $(INSTALL) -D -m 0755 $(@D)/ustreamer-dump $(TARGET_DIR)/usr/bin/ustreamer-dump +endef + +$(eval $(generic-package)) -- 2.25.1 From yann.morin.1998 at free.fr Sun Feb 11 09:35:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 10:35:18 +0100 Subject: [Buildroot] [git commit] package/jailhouse: bump to commit e57d1ef Message-ID: <20240211093811.23CC6820E2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=52b43a12472a9853ff5d69b136144427c41f2803 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The last Jailhouse tag is v0.12. It dates from 2020-02-04, which is 4 years old. This version no longer compiles with recent Kernels. This commit updates Jailhouse to the latest commit e57d1ef, which dates from 2023-01-10. For commit logs, see: https://github.com/siemens/jailhouse/commits/master/ Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/jailhouse/jailhouse.hash | 2 +- package/jailhouse/jailhouse.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jailhouse/jailhouse.hash b/package/jailhouse/jailhouse.hash index 297d0f1930..96d5819847 100644 --- a/package/jailhouse/jailhouse.hash +++ b/package/jailhouse/jailhouse.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3777a553c2acb2b693843fe4d16ab80333879daedd47d9c9f3717c9644e6cf93 jailhouse-0.12.tar.gz +sha256 38ea5d2d9672ce7f76fd0c163edaa8968711aca58f245aec3c8934f140e828b6 jailhouse-e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560.tar.gz sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index e7de40cf8c..b5a8b40fdd 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -4,8 +4,8 @@ # ################################################################################ -JAILHOUSE_VERSION = 0.12 -JAILHOUSE_SITE = $(call github,siemens,jailhouse,v$(JAILHOUSE_VERSION)) +JAILHOUSE_VERSION = e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560 +JAILHOUSE_SITE = $(call github,siemens,jailhouse,$(JAILHOUSE_VERSION)) JAILHOUSE_LICENSE = GPL-2.0 JAILHOUSE_LICENSE_FILES = COPYING JAILHOUSE_DEPENDENCIES = \ From yann.morin.1998 at free.fr Sun Feb 11 09:31:41 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 10:31:41 +0100 Subject: [Buildroot] [git commit] package/jailhouse: install files to /usr Message-ID: <20240211093811.19E0E873FA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e40ca97d71330c153041b4db856698be8a47c823 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The jailhouse package installs files in the /usr/local prefix. This is not convenient, because the jailhouse binary ends up in /usr/local/sbin, which is not in the default Buildroot PATH. See [1]. Moreover, all other Buildroot packages install files in /usr. This is because the Buildroot package recipe does not set any prefix value, and the upstream Jailhouse Makefile has a default to /usr/local. See [2]. This commit sets the prefix value in the JAILHOUSE_MAKE_OPTS and also updates other installation commands to put all the files in /usr. [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2023.11.1/system/Config.in#L495 [2] https://github.com/siemens/jailhouse/blob/v0.12/scripts/include.mk#L22 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/jailhouse/jailhouse.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index c239e75e76..e7de40cf8c 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -15,7 +15,8 @@ JAILHOUSE_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(KERNEL_ARCH)" \ KDIR="$(LINUX_DIR)" \ - DESTDIR="$(TARGET_DIR)" + DESTDIR="$(TARGET_DIR)" \ + prefix=/usr ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) JAILHOUSE_DEPENDENCIES += \ @@ -60,8 +61,8 @@ define JAILHOUSE_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/jailhouse $(INSTALL) -D -m 0644 $(@D)/configs/*/*.cell $(TARGET_DIR)/etc/jailhouse - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/libexec/jailhouse/demos - $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/local/libexec/jailhouse/demos + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/libexec/jailhouse/demos + $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/libexec/jailhouse/demos $(JAILHOUSE_INSTALL_HELPER_SCRIPTS) endef From yann.morin.1998 at free.fr Sun Feb 11 09:38:43 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 10:38:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/jailhouse: install files to /usr In-Reply-To: <20240210222659.805747-1-ju.o@free.fr> References: <20240210222659.805747-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-10 23:26 +0100, Julien Olivain spake thusly: > The jailhouse package installs files in the /usr/local prefix. This is > not convenient, because the jailhouse binary ends up in /usr/local/sbin, > which is not in the default Buildroot PATH. See [1]. Moreover, all > other Buildroot packages install files in /usr. > > This is because the Buildroot package recipe does not set any prefix > value, and the upstream Jailhouse Makefile has a default to /usr/local. > See [2]. > > This commit sets the prefix value in the JAILHOUSE_MAKE_OPTS and also > updates other installation commands to put all the files in /usr. > > [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2023.11.1/system/Config.in#L495 > [2] https://github.com/siemens/jailhouse/blob/v0.12/scripts/include.mk#L22 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/jailhouse/jailhouse.mk | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk > index c239e75e76..e7de40cf8c 100644 > --- a/package/jailhouse/jailhouse.mk > +++ b/package/jailhouse/jailhouse.mk > @@ -15,7 +15,8 @@ JAILHOUSE_MAKE_OPTS = \ > CROSS_COMPILE="$(TARGET_CROSS)" \ > ARCH="$(KERNEL_ARCH)" \ > KDIR="$(LINUX_DIR)" \ > - DESTDIR="$(TARGET_DIR)" > + DESTDIR="$(TARGET_DIR)" \ > + prefix=/usr > > ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) > JAILHOUSE_DEPENDENCIES += \ > @@ -60,8 +61,8 @@ define JAILHOUSE_INSTALL_TARGET_CMDS > $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/jailhouse > $(INSTALL) -D -m 0644 $(@D)/configs/*/*.cell $(TARGET_DIR)/etc/jailhouse > > - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/local/libexec/jailhouse/demos > - $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/local/libexec/jailhouse/demos > + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/libexec/jailhouse/demos > + $(INSTALL) -D -m 0755 $(@D)/inmates/demos/*/*.bin $(TARGET_DIR)/usr/libexec/jailhouse/demos > > $(JAILHOUSE_INSTALL_HELPER_SCRIPTS) > endef > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 11 09:38:58 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 10:38:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/minisign: needs threads Message-ID: <20240211093858.14022-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since the addition of the package in commit d90ac63d9b3448a239bb9aa8030326699a3fdc3d: Could NOT find Threads (missing: Threads_FOUND) Fixes: - http://autobuild.buildroot.org/results/8d63a88291de945661a936d2437917a3428de276 Signed-off-by: Fabrice Fontaine --- package/minisign/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/minisign/Config.in b/package/minisign/Config.in index b852903921..a211177925 100644 --- a/package/minisign/Config.in +++ b/package/minisign/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MINISIGN bool "minisign" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBSODIUM select BR2_PACKAGE_LIBSODIUM_FULL help @@ -7,3 +8,6 @@ config BR2_PACKAGE_MINISIGN signatures. https://github.com/jedisct1/minisign + +comment "minisign needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 11 09:57:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 10:57:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/jailhouse: bump to commit e57d1ef In-Reply-To: <20240210222940.806905-1-ju.o@free.fr> References: <20240210222940.806905-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-10 23:29 +0100, Julien Olivain spake thusly: > The last Jailhouse tag is v0.12. It dates from 2020-02-04, which is > 4 years old. This version no longer compiles with recent Kernels. > > This commit updates Jailhouse to the latest commit e57d1ef, which > dates from 2023-01-10. I wonder how relevant it is to keep a security-related package that hasn't had any release in 4 years, and that has not had a single commit for more than a year now. I mean, the system partitiomnning provided by Jailhouse, apart from separating resource usage, is a mean of protecting the various cells from each other, so the compromise of one does not trickle down to the other cells and to the rest of the system. Carlo, do you have any insights as to where Jailhouse might be going in the future? > For commit logs, see: > https://github.com/siemens/jailhouse/commits/master/ > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/jailhouse/jailhouse.hash | 2 +- > package/jailhouse/jailhouse.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/jailhouse/jailhouse.hash b/package/jailhouse/jailhouse.hash > index 297d0f1930..96d5819847 100644 > --- a/package/jailhouse/jailhouse.hash > +++ b/package/jailhouse/jailhouse.hash > @@ -1,3 +1,3 @@ > # Locally computed: > -sha256 3777a553c2acb2b693843fe4d16ab80333879daedd47d9c9f3717c9644e6cf93 jailhouse-0.12.tar.gz > +sha256 38ea5d2d9672ce7f76fd0c163edaa8968711aca58f245aec3c8934f140e828b6 jailhouse-e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560.tar.gz > sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING > diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk > index c239e75e76..907ad92c0f 100644 > --- a/package/jailhouse/jailhouse.mk > +++ b/package/jailhouse/jailhouse.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -JAILHOUSE_VERSION = 0.12 > -JAILHOUSE_SITE = $(call github,siemens,jailhouse,v$(JAILHOUSE_VERSION)) > +JAILHOUSE_VERSION = e57d1eff6d55aeed5f977fe4e2acfb6ccbdd7560 > +JAILHOUSE_SITE = $(call github,siemens,jailhouse,$(JAILHOUSE_VERSION)) > JAILHOUSE_LICENSE = GPL-2.0 > JAILHOUSE_LICENSE_FILES = COPYING > JAILHOUSE_DEPENDENCIES = \ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ju.o at free.fr Sun Feb 11 10:12:12 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 11 Feb 2024 11:12:12 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add jailhouse runtime test Message-ID: <20240211101212.171127-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + .../testing/tests/package/test_jailhouse.py | 103 ++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 support/testing/tests/package/test_jailhouse.py diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..1826fd59c6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1792,6 +1792,7 @@ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ F: support/testing/tests/package/test_kexec.py diff --git a/support/testing/tests/package/test_jailhouse.py b/support/testing/tests/package/test_jailhouse.py new file mode 100644 index 0000000000..4634fc4de2 --- /dev/null +++ b/support/testing/tests/package/test_jailhouse.py @@ -0,0 +1,103 @@ +import os +import time + +import infra.basetest + + +class TestJailhouse(infra.basetest.BRTest): + # This test uses a specific configuration, mainly for matching the + # requirements of the Jailhouse Qemu inmate demo. We also use the + # Linux kernel from Siemens, which includes patches for + # Jailhouse. Finally, we use the kernel config from + # board/qemu/aarch64-virt rather than the Kernel defconfig, for + # faster build (as it enable less components, but includes + # everything needed for this test). + kernel_ver = "eb6927f7eea77f823b96c0c22ad9d4a2d7ffdfce" + kernel_url = \ + f"$(call github,siemens,linux,{kernel_ver})/linux-{kernel_ver}.tar.gz" + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_TARBALL=y + BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="{kernel_url}" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_JAILHOUSE=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + # Qemu option and Kernel args are taken from Jailhouse demo. See: + # https://github.com/siemens/jailhouse/blob/master/README.md + # We also add oops=panic to improve the test coverage. + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0 mem=768M oops=panic"], + options=["-M", "virt,gic-version=3,virtualization=on,its=off", + "-cpu", "cortex-a57", + "-m", "1G", + "-smp", "16", + "-drive", f"file={drive},if=none,format=raw,id=hd0", + "-device", "virtio-blk-device,drive=hd0"]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("jailhouse --version") + + # Load the kernel module. + self.assertRunOk("modprobe jailhouse") + + # Check the device is present. + self.assertRunOk("ls -al /dev/jailhouse") + + # Load the cell config this this qemu test. + self.assertRunOk("jailhouse enable /etc/jailhouse/qemu-arm64.cell") + + # Dump the jailhouse console, and check we see its + # initialization string. + out, ret = self.emulator.run("jailhouse console") + self.assertEqual(ret, 0) + self.assertIn("Initializing Jailhouse hypervisor", "\n".join(out)) + + # Create the cell. + cell_cfg = "/etc/jailhouse/qemu-arm64-inmate-demo.cell" + cmd = f"jailhouse cell create {cell_cfg}" + self.assertRunOk(cmd) + + # Load the demo image. + cell_name = "inmate-demo" + img = "/usr/libexec/jailhouse/demos/gic-demo.bin" + cmd = f"jailhouse cell load {cell_name} {img}" + self.assertRunOk(cmd) + + # List Jailhouse cells and check we see the one we loaded. + out, ret = self.emulator.run("jailhouse cell list") + self.assertEqual(ret, 0) + self.assertIn(cell_name, "\n".join(out)) + + # We should also see our cell in sysfs. + cmd = "cat /sys/devices/jailhouse/cells/1/name" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], cell_name) + + # Start the cell. + self.assertRunOk(f"jailhouse cell start {cell_name}") + + # Let the demo cell run for few seconds... + time.sleep(3) + + # Stop and unload the cell. + self.assertRunOk(f"jailhouse cell shutdown {cell_name}") + self.assertRunOk(f"jailhouse cell destroy {cell_name}") + + # Stop and unload jailhouse. + self.assertRunOk("jailhouse disable") + self.assertRunOk("modprobe -r jailhouse") -- 2.43.0 From kilian.zinnecker at mail.de Sun Feb 11 12:08:54 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sun, 11 Feb 2024 13:08:54 +0100 Subject: [Buildroot] [PATCH v3 0/2] Add board support for the BeagleV-Ahead Message-ID: <20240211120857.6622-1-kilian.zinnecker@mail.de> This patch series adds board support for the BeagleV-Ahead. This patch series introduces a package which fetches binaries for the SoC, i.e., one binary blob for an on-chip FPGA and one binary blob for audio. Currently they are not used, but are intended to be used in the future. This board support generates an image suitable for SD card. The boot command for uboot to boot the kernel could not easily be changed. It seemed that a default boot command was persisent and any change to it by normal means (e.g., uboot config parameters like CONFIG_BOOT_COMMAND) did not have any effect. Hence a patch for the custom u-boot is introduced for now, to insert the proper boot command. v2 -> v3: - Added brief description what the xuantie bin binaries are for - Unrolled loop in XUANTIE_BINS_INSTALL_IMAGES_CMDS of package/xuantie-bins/xuantie-bins.mk - Added a second product page link to board's readme.txt - Added URL to the product page to git commit message - Dropped "_CUSTOM" from all "BR2_RISCV_ISA_*" in the board's defconfig - Add description to the board's readme.txt and defconfig why GCC v13 is chosen - Added BR2_PACKAGE_HOST_DOSFSTOOLS to board's defconfig v1 -> v2: - Added hash file for xuantie-bins package - Now uses uEnv.txt for actual boot commands - Removed extlinux.conf - Removed superflous comments inside config files Kilian Zinnecker (2): package/xuantie-bins: new package configs/beaglev_ahead: new defconfig DEVELOPERS | 3 + board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ board/beaglev-ahead/linux.fragment | 2 + .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ board/beaglev-ahead/post-image.sh | 6 ++ board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ board/beaglev-ahead/uEnv.txt | 4 + board/beaglev-ahead/uboot.fragment | 2 + configs/beaglev_ahead_defconfig | 46 +++++++++++ package/Config.in | 1 + package/xuantie-bins/Config.in | 8 ++ package/xuantie-bins/xuantie-bins.hash | 1 + package/xuantie-bins/xuantie-bins.mk | 23 ++++++ 13 files changed, 266 insertions(+) create mode 100644 board/beaglev-ahead/genimage.cfg create mode 100644 board/beaglev-ahead/linux.fragment create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch create mode 100755 board/beaglev-ahead/post-image.sh create mode 100644 board/beaglev-ahead/readme.txt create mode 100644 board/beaglev-ahead/uEnv.txt create mode 100644 board/beaglev-ahead/uboot.fragment create mode 100644 configs/beaglev_ahead_defconfig create mode 100644 package/xuantie-bins/Config.in create mode 100644 package/xuantie-bins/xuantie-bins.hash create mode 100644 package/xuantie-bins/xuantie-bins.mk -- 2.34.1 From kilian.zinnecker at mail.de Sun Feb 11 12:08:55 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sun, 11 Feb 2024 13:08:55 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/xuantie-bins: new package In-Reply-To: <20240211120857.6622-1-kilian.zinnecker@mail.de> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> Message-ID: <20240211120857.6622-2-kilian.zinnecker@mail.de> This patch adds a package for Xuantie binary blobs. These binaries are needed for the BeagleV-Ahead. Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 1 + package/Config.in | 1 + package/xuantie-bins/Config.in | 8 ++++++++ package/xuantie-bins/xuantie-bins.hash | 1 + package/xuantie-bins/xuantie-bins.mk | 23 +++++++++++++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 package/xuantie-bins/Config.in create mode 100644 package/xuantie-bins/xuantie-bins.hash create mode 100644 package/xuantie-bins/xuantie-bins.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..fa0596fd6b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1894,6 +1894,7 @@ F: board/radxa/rock5b/ F: configs/rock5b_defconfig F: configs/avnet_rzboard_v2l_defconfig F: package/rockchip-rkbin/ +F: package/xuantie-bins/ N: Klaus Heinrich Kiwi F: package/wqy-zenhei/ diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..5e28fb6e88 100644 --- a/package/Config.in +++ b/package/Config.in @@ -657,6 +657,7 @@ endmenu source "package/wipe/Config.in" source "package/xorriso/Config.in" source "package/xr819-xradio/Config.in" + source "package/xuantie-bins/Config.in" endmenu menu "Interpreter languages and scripting" diff --git a/package/xuantie-bins/Config.in b/package/xuantie-bins/Config.in new file mode 100644 index 0000000000..40388edd06 --- /dev/null +++ b/package/xuantie-bins/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_XUANTIE_BINS + bool "xuantie-bins" + depends on BR2_riscv + help + This package provides binary blobs, needed for the + BeagleV-Ahead's SoC (TH1520). They contain an FPGA binary + (light_aon_fpga.bin) for power management and a binary for + the audio system (light_c906_audio.bin). diff --git a/package/xuantie-bins/xuantie-bins.hash b/package/xuantie-bins/xuantie-bins.hash new file mode 100644 index 0000000000..4d1ec297c9 --- /dev/null +++ b/package/xuantie-bins/xuantie-bins.hash @@ -0,0 +1 @@ +sha256 608e9fec79823996004f65ba692a76d741307b0de23552d147ad1b567e7054dc xuantie-bins-0a2e02bb53758cc12448d8670e65c854528a96b4-br1.tar.gz diff --git a/package/xuantie-bins/xuantie-bins.mk b/package/xuantie-bins/xuantie-bins.mk new file mode 100644 index 0000000000..6db18685bc --- /dev/null +++ b/package/xuantie-bins/xuantie-bins.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# xuantie-bins +# +################################################################################ + +XUANTIE_BINS_VERSION = 0a2e02bb53758cc12448d8670e65c854528a96b4 +XUANTIE_BINS_SITE = https://github.com/beagleboard/xuantie-ubuntu.git +XUANTIE_BINS_SITE_METHOD = git +XUANTIE_BINS_LICENSE = PROPRIETARY + +XUANTIE_BINS_INSTALL_IMAGES = YES +XUANTIE_BINS_INSTALL_TARGET = NO + +XUANTIE_BINS_FPGA_BIN_FILENAME = "bins/light_aon_fpga.bin" +XUANTIE_BINS_AUDIO_BIN_FILENAME = "bins/light_c906_audio.bin" + +define XUANTIE_BINS_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(XUANTIE_BINS_FPGA_BIN_FILENAME) + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(XUANTIE_BINS_AUDIO_BIN_FILENAME) +endef + +$(eval $(generic-package)) -- 2.34.1 From kilian.zinnecker at mail.de Sun Feb 11 12:08:56 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sun, 11 Feb 2024 13:08:56 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <20240211120857.6622-1-kilian.zinnecker@mail.de> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> Message-ID: <20240211120857.6622-3-kilian.zinnecker@mail.de> This patch adds board support for the BeagleV-Ahead. It uses a custom kernel for the board's SoC. As the SoC has an outdated and currently not supported version of the RISC-V vector extension, the vector extension is disabled. The used OpenSBI version for this board support does not define the neccessary flags for GCC 12 to activate the zicsr and zifencei extensions. Therefore this board support uses GCC 13. https://www.beagleboard.org/boards/beaglev-ahead Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 2 + board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ board/beaglev-ahead/linux.fragment | 2 + .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ board/beaglev-ahead/post-image.sh | 6 ++ board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ board/beaglev-ahead/uEnv.txt | 4 + board/beaglev-ahead/uboot.fragment | 2 + configs/beaglev_ahead_defconfig | 46 +++++++++++ 9 files changed, 232 insertions(+) create mode 100644 board/beaglev-ahead/genimage.cfg create mode 100644 board/beaglev-ahead/linux.fragment create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch create mode 100755 board/beaglev-ahead/post-image.sh create mode 100644 board/beaglev-ahead/readme.txt create mode 100644 board/beaglev-ahead/uEnv.txt create mode 100644 board/beaglev-ahead/uboot.fragment create mode 100644 configs/beaglev_ahead_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index fa0596fd6b..3ede2a111d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1890,9 +1890,11 @@ F: package/libcamera/ N: Kilian Zinnecker F: board/avnet/rzboard_v2l/ +F: board/beaglev-ahead/ F: board/radxa/rock5b/ F: configs/rock5b_defconfig F: configs/avnet_rzboard_v2l_defconfig +F: configs/beaglev_ahead_defconfig F: package/rockchip-rkbin/ F: package/xuantie-bins/ diff --git a/board/beaglev-ahead/genimage.cfg b/board/beaglev-ahead/genimage.cfg new file mode 100644 index 0000000000..080b169527 --- /dev/null +++ b/board/beaglev-ahead/genimage.cfg @@ -0,0 +1,62 @@ +# SD card image for BeagleV-Ahead + +image boot.vfat { + vfat { + files = { + "fw_dynamic.bin", + "Image", + "light_aon_fpga.bin", + "light-beagle.dtb", + "light_c906_audio.bin", + } + + file uEnv.txt { + image = "uEnv.txt" + } + + file overlays/BBORG_LOAD-00A2.dtbo { + image = "overlays/BBORG_LOAD-00A2.dtbo" + } + + file overlays/BBORG_RELAY-00A2.dtbo { + image = "overlays/BBORG_RELAY-00A2.dtbo" + } + + file overlays/BONE-LED_P8_03.dtbo { + image = "overlays/BONE-LED_P8_03.dtbo" + } + + file overlays/BONE-LED_P9_11.dtbo { + image = "overlays/BONE-LED_P9_11.dtbo" + } + + file overlays/BVA-MIKROBUS-0.dtbo { + image = "overlays/BVA-MIKROBUS-0.dtbo" + } + } + size = 48M +} + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 2M + } + + partition uboot { + in-partition-table = "false" + image = "u-boot-with-spl.bin" + offset = 0 + holes = {"(440; 1048576)"} + } + + partition boot { + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + image = "rootfs.ext2" + } +} + diff --git a/board/beaglev-ahead/linux.fragment b/board/beaglev-ahead/linux.fragment new file mode 100644 index 0000000000..00f93f39a4 --- /dev/null +++ b/board/beaglev-ahead/linux.fragment @@ -0,0 +1,2 @@ +# CONFIG_VECTOR is not set +# CONFIG_VECTOR_0_7 is not set diff --git a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch new file mode 100644 index 0000000000..bcf5b965ce --- /dev/null +++ b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch @@ -0,0 +1,30 @@ +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 +From: Kilian Zinnecker +Date: Mon, 21 Aug 2023 23:51:59 +0200 +Subject: [PATCH] Overwrite bootcmd by force + +This patch is a dirty hack: Trying to overwrite the bootcmd via the +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted +to some preset value and could not be changed easily. Therefore a +hook is used to force the bootcmd to be overwritten. + +Signed-off-by: Kilian Zinnecker +--- + board/thead/light-c910/light.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c +index 8d5478e916..1448db974e 100644 +--- a/board/thead/light-c910/light.c ++++ b/board/thead/light-c910/light.c +@@ -2282,6 +2282,7 @@ int board_late_init(void) + light_usb_boot_check(); + do_firmware_load(); + ap_peri_clk_disable(); ++ run_command("load mmc 1:1 $ramdisk_addr_r uEnv.txt; env import -t $ramdisk_addr_r $filesize; run uenvcmd", 0); + return 0; + } + +-- +2.34.1 + diff --git a/board/beaglev-ahead/post-image.sh b/board/beaglev-ahead/post-image.sh new file mode 100755 index 0000000000..9e16eeff3f --- /dev/null +++ b/board/beaglev-ahead/post-image.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -e + +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ ${BINARIES_DIR} +cp board/beaglev-ahead/uEnv.txt ${BINARIES_DIR}/ +support/scripts/genimage.sh -c board/beaglev-ahead/genimage.cfg diff --git a/board/beaglev-ahead/readme.txt b/board/beaglev-ahead/readme.txt new file mode 100644 index 0000000000..758082a792 --- /dev/null +++ b/board/beaglev-ahead/readme.txt @@ -0,0 +1,78 @@ +BeagleV-Ahead +============== +https://www.beagleboard.org/boards/beaglev-ahead +https://forum.beagleboard.org/c/beaglev/ + +The SoC (TH1520) of the BeagleV-Ahead implements an outdated and +currently not supported version of the RISC-V vector extension. Hence, +the vector extension is disabled. The used OpenSBI version for this +board support does not define the neccessary flags for GCC 12 to +activate the zicsr and zifencei extensions. Therefore this board +support uses GCC 13. + +Build: +====== + $ make beaglev_ahead_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +??? boot.vfat +??? bootloader-JH7100-buildroot.bin.out +??? ddrinit-2133-buildroot.bin.out +??? fw_dynamic.bin +??? fw_dynamic.elf +??? fw_jump.bin +??? fw_jump.elf +??? fw_payload.bin +??? fw_payload.elf +??? Image +??? light-beagle.dtb +??? light_aon_fpga.bin +??? light_c906_audio.bin +??? overlays +??? rootfs.ext2 +??? rootfs.ext4 +??? rootfs.tar +??? sdcard.img +??? u-boot-with-spl.bin +??? u-boot.bin +??? uEnv.txt + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +SD card boot button: +-------------------- +To let the board boot from SD card, keep the "SD button" pressed during power +up / power cycle. The button is near the SD card slot. + +Serial console: +--------------- +The BeagleV-Ahead has a "Debug" GPIO header. Its layout can be seen here: +https://docs.beagleboard.org/latest/boards/beaglev/ahead/02-quick-start.html#access-uart-debug-console + +Note, that there are reported issues with some uart interface cables/dongles: +https://forum.beagleboard.org/t/beaglev-ahead-debug-terminal-problems/35331 + +Baudrate for this board is 115200. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +wiki link: +---------- +https://docs.beagleboard.org/latest/boards/beaglev/ahead/index.html diff --git a/board/beaglev-ahead/uEnv.txt b/board/beaglev-ahead/uEnv.txt new file mode 100644 index 0000000000..7e98ae5f81 --- /dev/null +++ b/board/beaglev-ahead/uEnv.txt @@ -0,0 +1,4 @@ +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} +uenvcmd=fatload mmc 1:1 ${kernel_addr_r} Image; fatload mmc 1:1 ${fdt_addr_r} light-beagle.dtb +bootargs=root=/dev/mmcblk1p2 rootfstype=ext4 rootwait ro console=ttyS0,115200 earlycon clk_ignore_unused net.ifnames=0 + diff --git a/board/beaglev-ahead/uboot.fragment b/board/beaglev-ahead/uboot.fragment new file mode 100644 index 0000000000..1f51cef106 --- /dev/null +++ b/board/beaglev-ahead/uboot.fragment @@ -0,0 +1,2 @@ +CONFIG_LEGACY_IMAGE_FORMAT=y +CONFIG_AUTOBOOT=y diff --git a/configs/beaglev_ahead_defconfig b/configs/beaglev_ahead_defconfig new file mode 100644 index 0000000000..9000b1f0ad --- /dev/null +++ b/configs/beaglev_ahead_defconfig @@ -0,0 +1,46 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_RVM=y +BR2_RISCV_ISA_RVA=y +BR2_RISCV_ISA_RVF=y +BR2_RISCV_ISA_RVD=y +BR2_RISCV_ISA_RVC=y +# Use GCC 13 for OpenSBI zicsr zifencei issue +BR2_GCC_VERSION_13_X=y +BR2_GLOBAL_PATCH_DIR="board/beaglev-ahead/patches" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglev-ahead/post-image.sh" +BR2_TARGET_GENERIC_HOSTNAME="BeagleV-Ahead" +BR2_TARGET_GENERIC_ISSUE="Welcome to the BeagleV-Ahead" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/linux/archive/refs/heads/beaglev-v5.10.113-1.1.2-ubuntu.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="beaglev" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/light-beagle" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/linux.fragment" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_BEAGLEV_DDRINIT=y +BR2_TARGET_BEAGLEV_SECONDBOOT=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-opensbi/archive/refs/heads/0.9-1.1.2-ubuntu.tar.gz" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-u-boot/archive/refs/heads/beaglev-v2020.01-1.1.2-ubuntu.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="light_beagle" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragment" +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_XUANTIE_BINS=y -- 2.34.1 From kilian.zinnecker at mail.de Sun Feb 11 12:15:35 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Sun, 11 Feb 2024 13:15:35 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/xuantie-bins: new package In-Reply-To: <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-2-kilian.zinnecker@mail.de> <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> Message-ID: <6015348.lOV4Wx5bFT@laptop> Hello Giulio, all, [--SNIP--] > can you please provide a separate patch to alphabetize? I did so: https://gitlab.com/buildroot.org/buildroot/-/commit/ 53fad3242d74b9fad11978429d6cc2879f783f4b However, unfortunately Thomas de-alphabetized it again when he applied my RZBoard V2L patches: https://gitlab.com/buildroot.org/buildroot/-/commit/ f003675119c9ca503afa19c04074e81c49538baf I just send a v3 of the BeagleV-Ahead patches. After we get this series applied, I will then again send a single patch to alphabetize. [--SNIP--] > > --- /dev/null > > +++ b/package/xuantie-bins/Config.in > > @@ -0,0 +1,6 @@ > > +config BR2_PACKAGE_XUANTIE_BINS > > + bool "xuantie-bins" > > + depends on BR2_riscv > > + help > > + This package provides binary blobs, needed for the > > + BeagleV-Ahead's SoC (TH1520). > > Can you please describe a bit what those binaries are meant for? I gave a brief description, but I don't know much about these. Maybe Robert can give even more information, if more is needed? [--SNIP--] > > +XUANTIE_BINS_FPGA_BIN_FILENAME = "bins/light_aon_fpga.bin" > > +XUANTIE_BINS_AUDIO_BIN_FILENAME = "bins/light_c906_audio.bin" > > + > > +define XUANTIE_BINS_INSTALL_IMAGES_CMDS > > + $(foreach f, \ > > + $(XUANTIE_BINS_FPGA_BIN_FILENAME) \ > > + $(XUANTIE_BINS_AUDIO_BIN_FILENAME) \ > > + , \ > > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(f) > > + ) > > +endef > > Being only 2 files to be installed I'd prefer to see 2 lines instead of > foreach loop. Can you please change it accordingly? I unrolled the loop in my v3 of the patches. Thanks for reviewing and best regards, Kilian From kilian.zinnecker at mail.de Sun Feb 11 12:24:57 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Sun, 11 Feb 2024 13:24:57 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <8f6baf1d-3caa-4b47-aad9-a34fa0761058@benettiengineering.com> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-3-kilian.zinnecker@mail.de> <8f6baf1d-3caa-4b47-aad9-a34fa0761058@benettiengineering.com> Message-ID: <2172310.irdbgypaU6@laptop> Hello Giulio, all, > > This patch adds board support for the BeagleV-Ahead. It uses a > > custom kernel for the board's SoC. As the SoC has an outdated and > > currently not supported version of the RISC-V vector extension, the > > vector extension is disabled. > > can you please provide an URL to the product page? Yes, I added an URL into the commit message of v3. [--SNIP--] > > --- /dev/null > > +++ b/board/beaglev-ahead/post-image.sh > > @@ -0,0 +1,6 @@ > > +#!/usr/bin/env bash > > +set -e > > + > > +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ > > ${BINARIES_DIR} > linux-custom should substituted with $(LINUX_DIR) I tried $(LINUX_DIR) and ${LINUX_DIR}, but both resulted in an empty string and as a consequence in a wrong path and broke the build. So in my v3 I kept it as it is for now. Should I try something else? > > --- /dev/null > > +++ b/configs/beaglev_ahead_defconfig > > @@ -0,0 +1,44 @@ > > +BR2_riscv=y > > +BR2_riscv_custom=y > > +BR2_RISCV_ISA_CUSTOM_RVM=y > > +BR2_RISCV_ISA_CUSTOM_RVA=y > > +BR2_RISCV_ISA_CUSTOM_RVF=y > > +BR2_RISCV_ISA_CUSTOM_RVD=y > > +BR2_RISCV_ISA_CUSTOM_RVC=y > > With commit cbd91e89e43d600172c62fd1cbd33aa74d0a851a all "_CUSTOM" have > been dropped, so can you please replace all the: > BR2_RISCV_ISA_CUSTOM_* > occurences with: > BR2_RISCV_ISA_* > ? I fixed it, thanks. > > +BR2_GCC_VERSION_13_X=y > > I think there is a reason you force using gcc 13, can you describe it in > the commit log and here? Yes, there were problems. I am not 100% sure, but as I remember it: the OpenSBI used has an old version and in its build, it does not define certain flags, which are needed by GCC 12 to activate the needed zifencei and zicsr extension. Those extension where redefined to be in some other extension pack of RiscV (or something like that, I don't remeber this exactly). Anyway it threw an error in GCC 12, and I thinkt to fix that, one would have to touch the old OpenSBI version. Switching to GCC 13 (where it works out of the box) seems then to be cleaner for me. [--SNIP--] > > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragmen > > t" +BR2_TARGET_UBOOT_FORMAT_BIN=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" > > Here you need to add: > BR2_PACKAGE_HOST_DOSFSTOOLS=y > otherwise it fails to build under buildroot/utils/docker-run Added dosfstools to the defconfig, thanks! > > +BR2_PACKAGE_HOST_MTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_XUANTIE_BINS=y > > After enabling BR2_RISCV_ISA_ options it builds successfully using > buildroot/utils/docker-run I build the image with buildroot/utils/docker-run and it boots. Thanks for the hint, I will use buildroot/utils/docker-run in the future as well! Thanks for your review and best regards, Kilian From thomas.petazzoni at bootlin.com Sun Feb 11 12:38:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 13:38:39 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/xuantie-bins: new package In-Reply-To: <4544153.LvFx2qVVIh@laptop> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-2-kilian.zinnecker@mail.de> <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> <4544153.LvFx2qVVIh@laptop> Message-ID: <20240211133839.5b235cbb@windsurf> On Sat, 10 Feb 2024 16:22:10 +0100 kilian.zinnecker at mail.de wrote: > This is strange, maybe someone can have a look here: On ozlabs, there are a > lot of patches, which have the submitter "kilian.zinnecker--- via buildroot". > However, most of them are NOT from me. E.g., one from Yegor Yefremov [1] is > marked with submitter "kilian.zinnecker--- via buildroot" - However, I am > definitively not Yegor, and none of his patches is from me. There are even more > patches marked with "kilian.zinnecker--- via buildroot" [2], some of them even > from before I ever submitted my first patch (the Rock5B board support) to > buildroot. Does anyone have any idea what this is about, or can have a deeper > look at this? (The BeagleV-Ahead patches are from me.) Yes, this is a known issue, caused by an interaction between the From: rewriting by mailman (needed due to strict DMARC policies by some SMTP servers) and a bug in patchwork. Sadly, the patchwork instance we are using (ozlabs.org) is using an ancient version of patchwork, which is no longer updated. We have asked the kernel.org people if we could migrate to the patchwork.kernel.org, but we still haven't heard back a definitive answer. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From sen at phobosdpl.com Sun Feb 11 13:16:35 2024 From: sen at phobosdpl.com (Sen Hastings) Date: Sun, 11 Feb 2024 13:16:35 +0000 Subject: [Buildroot] [PATCH 1/1] update sen hastings email in DEVELOPERS file Message-ID: <20240211131635.152044-1-sen@phobosdpl.com> phobosdpl is an old work email I don't really use anymore, so I'm changing it to my personal email. Signed-off-by: Sen Hastings --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..1c035eeb8f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2765,7 +2765,7 @@ F: package/libbson/ F: package/lua-resty-http/ F: package/mpir/ -N: Sen Hastings +N: Sen Hastings F: package/systemd F: support/scripts/pkg-stats -- 2.25.1 From bernd at kuhls.net Sun Feb 11 14:54:46 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 15:54:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 8.6.0 Message-ID: <20240211145446.270865-1-bernd@kuhls.net> Changelog: https://curl.se/changes.html#8_6_0 Removed patch which was included in upstream release. Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/57cc70e559aa065426021e22e2af8166af6084f6 Added configure options for optional libpsl support due to upstream commit which throws an error during configure when libpsl is missing and --without-libpsl was not used: https://github.com/curl/curl/commit/2998874bb61ac6ef3b72d6a61467cd2aaf6e53ea Signed-off-by: Bernd Kuhls --- ...nutls-fix-build-with-disable-verbose.patch | 60 ------------------- package/libcurl/libcurl.hash | 6 +- package/libcurl/libcurl.mk | 9 ++- 3 files changed, 11 insertions(+), 64 deletions(-) delete mode 100644 package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch diff --git a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch deleted file mode 100644 index 25e389c972..0000000000 --- a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0d9f9c5ea8c15c70eb420242b60179d9083c70b7 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Mon, 11 Dec 2023 20:45:01 +0200 -Subject: [PATCH] gnutls: fix build with --disable-verbose - -infof() parameters must be defined event with --disable-verbose since -commit dac293cfb702 ("lib: apache style infof and trace -macros/functions"). - -Move also 'ptr' definition under !CURL_DISABLE_VERBOSE_STRINGS. - -Fixes the following build failure: - -In file included from ../lib/sendf.h:29, - from vtls/gtls.c:44: -vtls/gtls.c: In function 'Curl_gtls_verifyserver': -vtls/gtls.c:841:34: error: 'version' undeclared (first use in this function); did you mean 'session'? - 841 | gnutls_protocol_get_name(version), ptr); - | ^~~~~~~ - -Signed-off-by: Baruch Siach -Upstream: https://github.com/curl/curl/commit/af520ac9fec7d88e942f05fdcd90704adb9fa566 ---- - lib/vtls/gtls.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c -index f42b6d6691de..b95c5be3c5e5 100644 ---- a/lib/vtls/gtls.c -+++ b/lib/vtls/gtls.c -@@ -818,16 +818,17 @@ Curl_gtls_verifyserver(struct Curl_easy *data, - char certname[65] = ""; /* limited to 64 chars by ASN.1 */ - size_t size; - time_t certclock; -- const char *ptr; - int rc; - CURLcode result = CURLE_OK; - #ifndef CURL_DISABLE_VERBOSE_STRINGS -+ const char *ptr; - unsigned int algo; - unsigned int bits; - gnutls_protocol_t version = gnutls_protocol_get_version(session); - #endif - long * const certverifyresult = &ssl_config->certverifyresult; - -+#ifndef CURL_DISABLE_VERBOSE_STRINGS - /* the name of the cipher suite used, e.g. ECDHE_RSA_AES_256_GCM_SHA384. */ - ptr = gnutls_cipher_suite_get_name(gnutls_kx_get(session), - gnutls_cipher_get(session), -@@ -835,6 +836,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data, - - infof(data, "SSL connection using %s / %s", - gnutls_protocol_get_name(version), ptr); -+#endif - - /* This function will return the peer's raw certificate (chain) as sent by - the peer. These certificates are in raw format (DER encoded for --- -2.43.0 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index d5c20d29d3..1f3dce0fd5 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.5.0.tar.xz.asc +# https://curl.se/download/curl-8.6.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb curl-8.5.0.tar.xz -sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING +sha256 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 curl-8.6.0.tar.xz +sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 83845b8e87..9dafe90c82 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.5.0 +LIBCURL_VERSION = 8.6.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -112,6 +112,13 @@ else LIBCURL_CONF_OPTS += --without-libidn2 endif +ifeq ($(BR2_PACKAGE_LIBPSL),y) +LIBCURL_DEPENDENCIES += libpsl +LIBCURL_CONF_OPTS += --with-libpsl +else +LIBCURL_CONF_OPTS += --without-libpsl +endif + # Configure curl to support libssh2 ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBCURL_DEPENDENCIES += libssh2 -- 2.39.2 From thomas.petazzoni at bootlin.com Sun Feb 11 15:08:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:08:54 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: update Sen Hastings email Message-ID: <20240211150926.1CACF87497@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=622fec1bb39fb1ca6aa9c5a9df2f93b3246be4a8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master phobosdpl is an old work email I don't really use anymore, so I'm changing it to my personal email. Signed-off-by: Sen Hastings Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..1c035eeb8f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2765,7 +2765,7 @@ F: package/libbson/ F: package/lua-resty-http/ F: package/mpir/ -N: Sen Hastings +N: Sen Hastings F: package/systemd F: support/scripts/pkg-stats From thomas.petazzoni at bootlin.com Sun Feb 11 15:09:24 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:09:24 +0100 Subject: [Buildroot] [PATCH 1/1] update sen hastings email in DEVELOPERS file In-Reply-To: <20240211131635.152044-1-sen@phobosdpl.com> References: <20240211131635.152044-1-sen@phobosdpl.com> Message-ID: <20240211160924.775f7908@windsurf> On Sun, 11 Feb 2024 13:16:35 +0000 Sen Hastings wrote: > phobosdpl is an old work email I don't really use anymore, > so I'm changing it to my personal email. > > Signed-off-by: Sen Hastings > --- > DEVELOPERS | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:09:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:09:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: bump version to 8.6.0 In-Reply-To: <20240211145446.270865-1-bernd@kuhls.net> References: <20240211145446.270865-1-bernd@kuhls.net> Message-ID: <20240211160958.40721d40@windsurf> On Sun, 11 Feb 2024 15:54:46 +0100 Bernd Kuhls wrote: > Changelog: https://curl.se/changes.html#8_6_0 > > Removed patch which was included in upstream release. > > Updated license hash due to copyright year bump: > https://github.com/curl/curl/commit/57cc70e559aa065426021e22e2af8166af6084f6 > > Added configure options for optional libpsl support due to upstream > commit which throws an error during configure when libpsl is missing and > --without-libpsl was not used: > https://github.com/curl/curl/commit/2998874bb61ac6ef3b72d6a61467cd2aaf6e53ea > > Signed-off-by: Bernd Kuhls > --- > ...nutls-fix-build-with-disable-verbose.patch | 60 ------------------- > package/libcurl/libcurl.hash | 6 +- > package/libcurl/libcurl.mk | 9 ++- > 3 files changed, 11 insertions(+), 64 deletions(-) > delete mode 100644 package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:09:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:09:39 +0100 Subject: [Buildroot] [git commit] package/libcurl: bump version to 8.6.0 Message-ID: <20240211151102.C55EB874CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5cee6b6be6524e443012d130e09b0e6983b0ff90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://curl.se/changes.html#8_6_0 Removed patch which was included in upstream release. Updated license hash due to copyright year bump: https://github.com/curl/curl/commit/57cc70e559aa065426021e22e2af8166af6084f6 Added configure options for optional libpsl support due to upstream commit which throws an error during configure when libpsl is missing and --without-libpsl was not used: https://github.com/curl/curl/commit/2998874bb61ac6ef3b72d6a61467cd2aaf6e53ea Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...001-gnutls-fix-build-with-disable-verbose.patch | 60 ---------------------- package/libcurl/libcurl.hash | 6 +-- package/libcurl/libcurl.mk | 9 +++- 3 files changed, 11 insertions(+), 64 deletions(-) diff --git a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch b/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch deleted file mode 100644 index 25e389c972..0000000000 --- a/package/libcurl/0001-gnutls-fix-build-with-disable-verbose.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0d9f9c5ea8c15c70eb420242b60179d9083c70b7 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Mon, 11 Dec 2023 20:45:01 +0200 -Subject: [PATCH] gnutls: fix build with --disable-verbose - -infof() parameters must be defined event with --disable-verbose since -commit dac293cfb702 ("lib: apache style infof and trace -macros/functions"). - -Move also 'ptr' definition under !CURL_DISABLE_VERBOSE_STRINGS. - -Fixes the following build failure: - -In file included from ../lib/sendf.h:29, - from vtls/gtls.c:44: -vtls/gtls.c: In function 'Curl_gtls_verifyserver': -vtls/gtls.c:841:34: error: 'version' undeclared (first use in this function); did you mean 'session'? - 841 | gnutls_protocol_get_name(version), ptr); - | ^~~~~~~ - -Signed-off-by: Baruch Siach -Upstream: https://github.com/curl/curl/commit/af520ac9fec7d88e942f05fdcd90704adb9fa566 ---- - lib/vtls/gtls.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c -index f42b6d6691de..b95c5be3c5e5 100644 ---- a/lib/vtls/gtls.c -+++ b/lib/vtls/gtls.c -@@ -818,16 +818,17 @@ Curl_gtls_verifyserver(struct Curl_easy *data, - char certname[65] = ""; /* limited to 64 chars by ASN.1 */ - size_t size; - time_t certclock; -- const char *ptr; - int rc; - CURLcode result = CURLE_OK; - #ifndef CURL_DISABLE_VERBOSE_STRINGS -+ const char *ptr; - unsigned int algo; - unsigned int bits; - gnutls_protocol_t version = gnutls_protocol_get_version(session); - #endif - long * const certverifyresult = &ssl_config->certverifyresult; - -+#ifndef CURL_DISABLE_VERBOSE_STRINGS - /* the name of the cipher suite used, e.g. ECDHE_RSA_AES_256_GCM_SHA384. */ - ptr = gnutls_cipher_suite_get_name(gnutls_kx_get(session), - gnutls_cipher_get(session), -@@ -835,6 +836,7 @@ Curl_gtls_verifyserver(struct Curl_easy *data, - - infof(data, "SSL connection using %s / %s", - gnutls_protocol_get_name(version), ptr); -+#endif - - /* This function will return the peer's raw certificate (chain) as sent by - the peer. These certificates are in raw format (DER encoded for --- -2.43.0 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index d5c20d29d3..1f3dce0fd5 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.5.0.tar.xz.asc +# https://curl.se/download/curl-8.6.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb curl-8.5.0.tar.xz -sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING +sha256 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 curl-8.6.0.tar.xz +sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 83845b8e87..9dafe90c82 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.5.0 +LIBCURL_VERSION = 8.6.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -112,6 +112,13 @@ else LIBCURL_CONF_OPTS += --without-libidn2 endif +ifeq ($(BR2_PACKAGE_LIBPSL),y) +LIBCURL_DEPENDENCIES += libpsl +LIBCURL_CONF_OPTS += --with-libpsl +else +LIBCURL_CONF_OPTS += --without-libpsl +endif + # Configure curl to support libssh2 ifeq ($(BR2_PACKAGE_LIBSSH2),y) LIBCURL_DEPENDENCIES += libssh2 From thomas.petazzoni at bootlin.com Sun Feb 11 15:11:25 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:11:25 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add jailhouse runtime test In-Reply-To: <20240211101212.171127-1-ju.o@free.fr> References: <20240211101212.171127-1-ju.o@free.fr> Message-ID: <20240211161125.419a1bcf@windsurf> On Sun, 11 Feb 2024 11:12:12 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 1 + > .../testing/tests/package/test_jailhouse.py | 103 ++++++++++++++++++ > 2 files changed, 104 insertions(+) > create mode 100644 support/testing/tests/package/test_jailhouse.py Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:11:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:11:39 +0100 Subject: [Buildroot] [git commit] package/minisign: needs threads Message-ID: <20240211151227.7C9C28755D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=79f38212c5fc95f64fc59c96b651024dc39cc0ae branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit d90ac63d9b3448a239bb9aa8030326699a3fdc3d: Could NOT find Threads (missing: Threads_FOUND) Fixes: - http://autobuild.buildroot.org/results/8d63a88291de945661a936d2437917a3428de276 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/minisign/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/minisign/Config.in b/package/minisign/Config.in index b852903921..a211177925 100644 --- a/package/minisign/Config.in +++ b/package/minisign/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MINISIGN bool "minisign" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBSODIUM select BR2_PACKAGE_LIBSODIUM_FULL help @@ -7,3 +8,6 @@ config BR2_PACKAGE_MINISIGN signatures. https://github.com/jedisct1/minisign + +comment "minisign needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS From thomas.petazzoni at bootlin.com Sun Feb 11 15:11:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:11:15 +0100 Subject: [Buildroot] [git commit] support/testing: add jailhouse runtime test Message-ID: <20240211151227.6F8558755A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=74ffd0a4df3f321b5d5ac6b14b52174b3e7ef2de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_jailhouse.py | 103 ++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 1c035eeb8f..d7947821e4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1792,6 +1792,7 @@ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ F: support/testing/tests/package/test_kexec.py diff --git a/support/testing/tests/package/test_jailhouse.py b/support/testing/tests/package/test_jailhouse.py new file mode 100644 index 0000000000..4634fc4de2 --- /dev/null +++ b/support/testing/tests/package/test_jailhouse.py @@ -0,0 +1,103 @@ +import os +import time + +import infra.basetest + + +class TestJailhouse(infra.basetest.BRTest): + # This test uses a specific configuration, mainly for matching the + # requirements of the Jailhouse Qemu inmate demo. We also use the + # Linux kernel from Siemens, which includes patches for + # Jailhouse. Finally, we use the kernel config from + # board/qemu/aarch64-virt rather than the Kernel defconfig, for + # faster build (as it enable less components, but includes + # everything needed for this test). + kernel_ver = "eb6927f7eea77f823b96c0c22ad9d4a2d7ffdfce" + kernel_url = \ + f"$(call github,siemens,linux,{kernel_ver})/linux-{kernel_ver}.tar.gz" + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_TARBALL=y + BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="{kernel_url}" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_JAILHOUSE=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + # Qemu option and Kernel args are taken from Jailhouse demo. See: + # https://github.com/siemens/jailhouse/blob/master/README.md + # We also add oops=panic to improve the test coverage. + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0 mem=768M oops=panic"], + options=["-M", "virt,gic-version=3,virtualization=on,its=off", + "-cpu", "cortex-a57", + "-m", "1G", + "-smp", "16", + "-drive", f"file={drive},if=none,format=raw,id=hd0", + "-device", "virtio-blk-device,drive=hd0"]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("jailhouse --version") + + # Load the kernel module. + self.assertRunOk("modprobe jailhouse") + + # Check the device is present. + self.assertRunOk("ls -al /dev/jailhouse") + + # Load the cell config this this qemu test. + self.assertRunOk("jailhouse enable /etc/jailhouse/qemu-arm64.cell") + + # Dump the jailhouse console, and check we see its + # initialization string. + out, ret = self.emulator.run("jailhouse console") + self.assertEqual(ret, 0) + self.assertIn("Initializing Jailhouse hypervisor", "\n".join(out)) + + # Create the cell. + cell_cfg = "/etc/jailhouse/qemu-arm64-inmate-demo.cell" + cmd = f"jailhouse cell create {cell_cfg}" + self.assertRunOk(cmd) + + # Load the demo image. + cell_name = "inmate-demo" + img = "/usr/libexec/jailhouse/demos/gic-demo.bin" + cmd = f"jailhouse cell load {cell_name} {img}" + self.assertRunOk(cmd) + + # List Jailhouse cells and check we see the one we loaded. + out, ret = self.emulator.run("jailhouse cell list") + self.assertEqual(ret, 0) + self.assertIn(cell_name, "\n".join(out)) + + # We should also see our cell in sysfs. + cmd = "cat /sys/devices/jailhouse/cells/1/name" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], cell_name) + + # Start the cell. + self.assertRunOk(f"jailhouse cell start {cell_name}") + + # Let the demo cell run for few seconds... + time.sleep(3) + + # Stop and unload the cell. + self.assertRunOk(f"jailhouse cell shutdown {cell_name}") + self.assertRunOk(f"jailhouse cell destroy {cell_name}") + + # Stop and unload jailhouse. + self.assertRunOk("jailhouse disable") + self.assertRunOk("modprobe -r jailhouse") From bernd at kuhls.net Sun Feb 11 15:14:18 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:14:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump version to 1.0.5 Message-ID: <20240211151418.1615015-1-bernd@kuhls.net> Release notes: https://blog.clamav.net/2023/11/clamav-130-122-105-released.html Fixes CVE-2024-20290 & CVE-2024-20328. Signed-off-by: Bernd Kuhls --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index cb4f67156c..cd03a11840 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3d6b99644874558b7de5faf9b340737a9bbc1083878fcd95a49f989c7c980146 clamav-1.0.4.tar.gz +sha256 aa67ee9679f747af3c492353d768464c27d614b3fed62eb7f988b6776d4aedbb clamav-1.0.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index c9012261fa..7c6dfce6f2 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 1.0.4 +CLAMAV_VERSION = 1.0.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = \ -- 2.39.2 From bernd at kuhls.net Sun Feb 11 15:15:46 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:15:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: bump version to 20.4-Nexus Message-ID: <20240211151546.1615163-1-bernd@kuhls.net> Release notes: https://github.com/xbmc/xbmc/releases/tag/20.4-Nexus Signed-off-by: Bernd Kuhls --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 2ed4961e68..b785a71b6e 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 20.3-Nexus +KODI_JSONSCHEMABUILDER_VERSION = 20.4-Nexus KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 728e25606c..9810193014 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 20.3-Nexus +KODI_TEXTUREPACKER_VERSION = 20.4-Nexus KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 81d26f1cb1..7b26778b68 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 1dbf1d9f4d5eeeb6aa2593813703343a8a377e88a00c68226354e4d67467f64d kodi-20.3-Nexus.tar.gz +sha256 ccb2d3e382b5ae628a89db2325f5e778f1770a2a182f6eaa25645a22ccdffb18 kodi-20.4-Nexus.tar.gz sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 97d02e9b92..d057eb3f05 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 20.3 +KODI_VERSION_MAJOR = 20.4 KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) -- 2.39.2 From thomas.petazzoni at bootlin.com Sun Feb 11 15:27:51 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:27:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/minisign: needs threads In-Reply-To: <20240211093858.14022-1-fontaine.fabrice@gmail.com> References: <20240211093858.14022-1-fontaine.fabrice@gmail.com> Message-ID: <20240211162751.38fdb544@windsurf> On Sun, 11 Feb 2024 10:38:58 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit d90ac63d9b3448a239bb9aa8030326699a3fdc3d: > Could NOT find Threads (missing: Threads_FOUND) > > Fixes: > - http://autobuild.buildroot.org/results/8d63a88291de945661a936d2437917a3428de276 > > Signed-off-by: Fabrice Fontaine > --- > package/minisign/Config.in | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:27:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:27:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/strace: bump to version 6.7 In-Reply-To: <20240211051907.551771-1-kadambini.nema@gmail.com> References: <20240211051907.551771-1-kadambini.nema@gmail.com> Message-ID: <20240211162754.68a62dfd@windsurf> On Sat, 10 Feb 2024 21:19:07 -0800 Kadambini Nema wrote: > - Updated hash of COPYING (year updated with > https://github.com/strace/strace/commit/eba0ac1fc4f8896b938d41081e0643cb06283a9b) > > Signed-off-by: Kadambini Nema > --- > package/strace/strace.hash | 6 +++--- > package/strace/strace.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:11:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:11:56 +0100 Subject: [Buildroot] [git commit] package/strace: bump to version 6.7 Message-ID: <20240211152805.6F7568757E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ebeb4f435303bf6802b647ac83373d5ed9980de5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Updated hash of COPYING (year updated with https://github.com/strace/strace/commit/eba0ac1fc4f8896b938d41081e0643cb06283a9b) Signed-off-by: Kadambini Nema Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 6 +++--- package/strace/strace.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 75a35d7cf4..a35d2b0be6 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.6/strace-6.6.tar.xz.asc -sha256 421b4186c06b705163e64dc85f271ebdcf67660af8667283147d5e859fc8a96c strace-6.6.tar.xz -sha256 6e5648c0ed522b163f9df1dc500c73491b1743495bd78388e99685cecfa79707 COPYING +# https://strace.io/files/6.7/strace-6.7.tar.xz.asc +sha256 2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7 strace-6.7.tar.xz +sha256 1988d0e1aa101d68855e8c4f940aacf2531051b82f6b608eb026c5fad1f33df1 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 6279622fdb..f916936207 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.6 +STRACE_VERSION = 6.7 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From bernd at kuhls.net Sun Feb 11 15:28:28 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:28:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.19.4 Message-ID: <20240211152828.2164674-1-bernd@kuhls.net> Release notes: https://www.samba.org/samba/history/samba-4.19.4.html Signed-off-by: Bernd Kuhls --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 81e8a6f2e9..3353221959 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.3.tar.asc -sha256 280553b90f131b1940580df293653c9e9bd8906201f5def6e5e8c160f0bfac96 samba-4.19.3.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc +sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 42bcd0a928..78c5db308d 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.3 +SAMBA4_VERSION = 4.19.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES -- 2.39.2 From thomas.petazzoni at bootlin.com Sun Feb 11 15:28:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:28:10 +0100 Subject: [Buildroot] [git commit] utils/check-package: use https for the manual URL Message-ID: <20240211153111.3302187482@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dfed5acb5610c90115235a78433e798a6a692b29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- utils/check-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/check-package b/utils/check-package index 105902303e..de41891b56 100755 --- a/utils/check-package +++ b/utils/check-package @@ -69,7 +69,7 @@ def parse_args(): help='override the default list of ignored warnings') parser.add_argument("--manual-url", action="store", - default="http://nightly.buildroot.org/", + default="https://nightly.buildroot.org/", help="default: %(default)s") parser.add_argument("--verbose", "-v", action="count", default=0) parser.add_argument("--quiet", "-q", action="count", default=0) From thomas.petazzoni at bootlin.com Sun Feb 11 15:28:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:28:45 +0100 Subject: [Buildroot] [git commit] doc/manual: indent the CVE example the same as the CVE list item Message-ID: <20240211153111.47019875E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=949c1a51b7f31982b66efe2d4adc55095a4c7811 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 76b037f436..935270a19c 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -503,7 +503,7 @@ not and can not work as people would expect it should: the package, or when the CVE for some reason does not affect the Buildroot package. A Makefile comment must always precede the addition of a CVE to this variable. Example: - ++ ---------------------- # 0001-fix-cve-2020-12345.patch LIBFOO_IGNORE_CVES += CVE-2020-12345 From thomas.petazzoni at bootlin.com Sun Feb 11 15:30:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:30:06 +0100 Subject: [Buildroot] [git commit] package: switch to _CPE_ID_VALID Message-ID: <20240211153111.6D5BF875E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c19cca045225164e7df4046c500c5e7117114f1b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that we document _CPE_ID_VALID, and that it shall be used instead of setting a default value to one of the other _CPE_ID_* variables, change all of the existing packages to use it, to avoid any error when we later extend check-package to validate the sanity ofthe _CPE_ID_* variables. Mechanical change done within the reference container, running the new check in check-package, to report the CPE_ID errors: $ make check-package 2>/dev/null \ |awk '{ split($(1), a, ":"); fname = a[1] split($(2), a, "'\''"); val = a[2] new_var = $(8); gsub("_CPE_ID_.*", "_CPE_ID_VALID", new_var) printf("%s %s %s %s\n", fname, $(8), val, new_var) }' \ |while read fname var val new_var; do sed -r -i -e "s/${var}[[:space:]]*=[[:space:]]*${val}/${new_var} = YES/" "${fname}" done $ git diff -I'CPE_ID_(VENDOR|VALID)' [empty] Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/acl/acl.mk | 2 +- package/asn1c/asn1c.mk | 2 +- package/atftp/atftp.mk | 2 +- package/atop/atop.mk | 2 +- package/attr/attr.mk | 2 +- package/axel/axel.mk | 2 +- package/bdwgc/bdwgc.mk | 2 +- package/beecrypt/beecrypt.mk | 2 +- package/blktrace/blktrace.mk | 2 +- package/botan/botan.mk | 2 +- package/bwm-ng/bwm-ng.mk | 2 +- package/c-icap/c-icap.mk | 2 +- package/c-periphery/c-periphery.mk | 2 +- package/cgroupfs-mount/cgroupfs-mount.mk | 2 +- package/civetweb/civetweb.mk | 2 +- package/cjson/cjson.mk | 2 +- package/cmake/cmake.mk | 2 +- package/cracklib/cracklib.mk | 2 +- package/crun/crun.mk | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- package/cups-pk-helper/cups-pk-helper.mk | 2 +- package/darkhttpd/darkhttpd.mk | 2 +- package/dbus-broker/dbus-broker.mk | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- package/dosfstools/dosfstools.mk | 2 +- package/dracut/dracut.mk | 2 +- package/dtc/dtc.mk | 2 +- package/duktape/duktape.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 2 +- package/elfutils/elfutils.mk | 2 +- package/exempi/exempi.mk | 2 +- package/exfat/exfat.mk | 2 +- package/f2fs-tools/f2fs-tools.mk | 2 +- package/feh/feh.mk | 2 +- package/file/file.mk | 2 +- package/flac/flac.mk | 2 +- package/fontconfig/fontconfig.mk | 2 +- package/giflib/giflib.mk | 2 +- package/gnuplot/gnuplot.mk | 2 +- package/gpsd/gpsd.mk | 2 +- package/gutenprint/gutenprint.mk | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- package/haserl/haserl.mk | 2 +- package/heimdal/heimdal.mk | 2 +- package/i2c-tools/i2c-tools.mk | 2 +- package/ipmitool/ipmitool.mk | 2 +- package/iproute2/iproute2.mk | 2 +- package/iputils/iputils.mk | 2 +- package/iucode-tool/iucode-tool.mk | 2 +- package/jansson/jansson.mk | 2 +- package/jasper/jasper.mk | 2 +- package/jhead/jhead.mk | 2 +- package/jq/jq.mk | 2 +- package/json-for-modern-cpp/json-for-modern-cpp.mk | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- package/jszip/jszip.mk | 2 +- package/keyutils/keyutils.mk | 2 +- package/kvmtool/kvmtool.mk | 2 +- package/lame/lame.mk | 2 +- package/lapack/lapack.mk | 2 +- package/lftp/lftp.mk | 2 +- package/libaio/libaio.mk | 2 +- package/libass/libass.mk | 2 +- package/libatomic_ops/libatomic_ops.mk | 2 +- package/libbpf/libbpf.mk | 2 +- package/libcap-ng/libcap-ng.mk | 2 +- package/libcap/libcap.mk | 2 +- package/libcgroup/libcgroup.mk | 2 +- package/libconfuse/libconfuse.mk | 2 +- package/libdaemon/libdaemon.mk | 2 +- package/libesmtp/libesmtp.mk | 2 +- package/libevent/libevent.mk | 2 +- package/libexif/libexif.mk | 2 +- package/libffi/libffi.mk | 2 +- package/libfuse/libfuse.mk | 2 +- package/libgit2/libgit2.mk | 2 +- package/libical/libical.mk | 2 +- package/libjxl/libjxl.mk | 2 +- package/libmms/libmms.mk | 2 +- package/libnet/libnet.mk | 2 +- package/libnids/libnids.mk | 2 +- package/libnl/libnl.mk | 2 +- package/libqmi/libqmi.mk | 2 +- package/librsync/librsync.mk | 2 +- package/libsamplerate/libsamplerate.mk | 2 +- package/libseccomp/libseccomp.mk | 2 +- package/libsndfile/libsndfile.mk | 2 +- package/libtirpc/libtirpc.mk | 2 +- package/libunwind/libunwind.mk | 2 +- package/libupnp/libupnp.mk | 2 +- package/libvncserver/libvncserver.mk | 2 +- package/linuxptp/linuxptp.mk | 2 +- package/lldpd/lldpd.mk | 2 +- package/logrotate/logrotate.mk | 2 +- package/lrzsz/lrzsz.mk | 2 +- package/lsof/lsof.mk | 2 +- package/lynx/lynx.mk | 2 +- package/lz4/lz4.mk | 2 +- package/lzo/lzo.mk | 2 +- package/matio/matio.mk | 2 +- package/mdadm/mdadm.mk | 2 +- package/minicom/minicom.mk | 2 +- package/motion/motion.mk | 2 +- package/ncmpc/ncmpc.mk | 2 +- package/net-tools/net-tools.mk | 2 +- package/netcat/netcat.mk | 2 +- package/nettle/nettle.mk | 2 +- package/oniguruma/oniguruma.mk | 2 +- package/open-iscsi/open-iscsi.mk | 2 +- package/openblas/openblas.mk | 2 +- package/openrc/openrc.mk | 2 +- package/openresolv/openresolv.mk | 2 +- package/opensc/opensc.mk | 2 +- package/p11-kit/p11-kit.mk | 2 +- package/parted/parted.mk | 2 +- package/pcmanfm/pcmanfm.mk | 2 +- package/picocom/picocom.mk | 2 +- package/polkit/polkit.mk | 2 +- package/popt/popt.mk | 2 +- package/powerpc-utils/powerpc-utils.mk | 2 +- package/procps-ng/procps-ng.mk | 2 +- package/protobuf-c/protobuf-c.mk | 2 +- package/proxychains-ng/proxychains-ng.mk | 2 +- package/pugixml/pugixml.mk | 2 +- package/pwgen/pwgen.mk | 2 +- package/python-ecdsa/python-ecdsa.mk | 2 +- package/python-engineio/python-engineio.mk | 2 +- package/python-markdown2/python-markdown2.mk | 2 +- package/python-rsa/python-rsa.mk | 2 +- package/qdecoder/qdecoder.mk | 2 +- package/qpdf/qpdf.mk | 2 +- package/quazip/quazip.mk | 2 +- package/quickjs/quickjs.mk | 2 +- package/rabbitmq-c/rabbitmq-c.mk | 2 +- package/rhash/rhash.mk | 2 +- package/ripgrep/ripgrep.mk | 2 +- package/rng-tools/rng-tools.mk | 2 +- package/rp-pppoe/rp-pppoe.mk | 2 +- package/rpcbind/rpcbind.mk | 2 +- package/rtl_433/rtl_433.mk | 2 +- package/rtmpdump/rtmpdump.mk | 2 +- package/sane-backends/sane-backends.mk | 2 +- package/shellinabox/shellinabox.mk | 2 +- package/spice/spice.mk | 2 +- package/squashfs/squashfs.mk | 2 +- package/sslh/sslh.mk | 2 +- package/strace/strace.mk | 2 +- package/sylpheed/sylpheed.mk | 2 +- package/sysklogd/sysklogd.mk | 2 +- package/sysstat/sysstat.mk | 2 +- package/systemd/systemd.mk | 2 +- package/sysvinit/sysvinit.mk | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- package/tclap/tclap.mk | 2 +- package/tini/tini.mk | 2 +- package/tinyproxy/tinyproxy.mk | 2 +- package/tinyxml/tinyxml.mk | 2 +- package/tinyxml2/tinyxml2.mk | 2 +- package/tmux/tmux.mk | 2 +- package/tpm2-tools/tpm2-tools.mk | 2 +- package/trinity/trinity.mk | 2 +- package/unzip/unzip.mk | 2 +- package/upx/upx.mk | 2 +- package/usbguard/usbguard.mk | 2 +- package/valijson/valijson.mk | 2 +- package/vsftpd/vsftpd.mk | 2 +- package/x11vnc/x11vnc.mk | 2 +- package/xscreensaver/xscreensaver.mk | 2 +- package/yajl/yajl.mk | 2 +- package/yaml-cpp/yaml-cpp.mk | 2 +- package/zbar/zbar.mk | 2 +- package/zlog/zlog.mk | 2 +- package/zziplib/zziplib.mk | 2 +- 173 files changed, 173 insertions(+), 173 deletions(-) Patch is too large, so refusing to show it From thomas.petazzoni at bootlin.com Sun Feb 11 15:29:02 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:29:02 +0100 Subject: [Buildroot] [git commit] doc/manual: document _CPE_ID_VALID Message-ID: <20240211153111.52BC687482@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ddf66867b192b5576632a44c4edfe23c98d8a3d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The way we handle CPE_ID variable is unusual compared to the other variables: we mostly compute defaults for all of them, and eventually aggregate the various CPE_ID variables to form the CPE ID name. However, we do not consider that CPE ID to valid, unless there is one (or more) CPE_ID variables actually set by the package; this shows that the CPE ID has been checked to be valid against the NVD CPE database. In that situation, we internally define the duly undocumented _CPE_ID_VALID variable. However, it is totally possible (and very often the case) that the default value we set to those variables are appropriate, and do defne a valid CPE ID. In this case, the package will define any arbitrary CPE_ID variable to its default value, usually by setting either the VENDOR or PRODUCT field, though there is no rule or requirement that be the case. This is not very clean, non-obvious, and does not allow for easily adding checks in check-package. Add the _CPE_ID_VALID variable to the manual, to make it official that it should be used when the default values of the others are valid. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index 935270a19c..ce8608682f 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -516,6 +516,10 @@ LIBFOO_IGNORE_CVES += CVE-2020-54321 identifier]. The available variables are: + -- +** +LIBFOO_CPE_ID_VALID+, if set to +YES+, specifies that the default + values for each of the following variables is appropriate, and + generates a valid CPE ID. + ** +LIBFOO_CPE_ID_PREFIX+, specifies the prefix of the CPE identifier, i.e the first three fields. When not defined, the default value is +cpe:2.3:a+. From thomas.petazzoni at bootlin.com Sun Feb 11 15:28:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:28:35 +0100 Subject: [Buildroot] [git commit] doc/manual: fixup ordered lists Message-ID: <20240211153111.3D3EA875E6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c24d83cc80c25f60fe7974495a43b5cc34b72f5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master With recent asiidoc versions (at least 10.2.0 is known to report that), rendering the manual yields a few warnings related to ordered lists: asciidoc: WARNING: customize-quick-guide.adoc: line 13: list item index: expected 2 got 1 asciidoc: WARNING: customize-quick-guide.adoc: line 15: list item index: expected 3 got 1 [...] asciidoc: WARNING: customize-quick-guide.adoc: line 65: list item index: expected 13 got 1 asciidoc: WARNING: customize-quick-guide.adoc: line 66: list item index: expected 14 got 1 asciidoc: WARNING: adding-packages-gettext.adoc: line 30: list item index: expected 2 got 1 asciidoc: WARNING: adding-packages-gettext.adoc: line 41: list item index: expected 3 got 1 The reason is that we use the same index to tell asciidoc to automatically number items. However, the official way to provide an automatic index is to write no index: https://docs.asciidoctor.org/asciidoc/latest/lists/ordered/ [...] since the numbering is obvious, the AsciiDoc processor will insert the numbers for you if you omit them: [...] If you number the ordered list explicitly, you have to manually keep the list numerals sequential. Otherwise, you will get a warning. So, abide by the documentation, and drop the repeating indices to ordered lists where we want automatic numbering. Note that there is another ordered list, in adding-packages-directory.adoc, but it does use explicit, sequential numbering. For consistency within the whole document, we also convert it. To avoid extra useless churn, the indentation of the items is not changed to match the elided indices. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-directory.adoc | 14 +++++++------- docs/manual/adding-packages-gettext.adoc | 6 +++--- docs/manual/customize-quick-guide.adoc | 28 ++++++++++++++-------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/manual/adding-packages-directory.adoc b/docs/manual/adding-packages-directory.adoc index 03249ca06f..0b7221aae0 100644 --- a/docs/manual/adding-packages-directory.adoc +++ b/docs/manual/adding-packages-directory.adoc @@ -44,13 +44,13 @@ project after an empty line. As a convention specific to Buildroot, the ordering of the attributes is as follows: -1. The type of option: +bool+, +string+... with the prompt -2. If needed, the +default+ value(s) -3. Any dependencies on the target in +depends on+ form -4. Any dependencies on the toolchain in +depends on+ form -5. Any dependencies on other packages in +depends on+ form -6. Any dependency of the +select+ form -7. The help keyword and help text. +. The type of option: +bool+, +string+... with the prompt +. If needed, the +default+ value(s) +. Any dependencies on the target in +depends on+ form +. Any dependencies on the toolchain in +depends on+ form +. Any dependencies on other packages in +depends on+ form +. Any dependency of the +select+ form +. The help keyword and help text. You can add other sub-options into a +if BR2_PACKAGE_LIBFOO...endif+ statement to configure particular things in your software. You can look at diff --git a/docs/manual/adding-packages-gettext.adoc b/docs/manual/adding-packages-gettext.adoc index e9c6968e79..739bed25d5 100644 --- a/docs/manual/adding-packages-gettext.adoc +++ b/docs/manual/adding-packages-gettext.adoc @@ -23,11 +23,11 @@ Due to this, and in order to make sure that Native Language Support is properly handled, packages in Buildroot that can use NLS support should: -1. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This +. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This is done automatically for 'autotools' packages and therefore should only be done for packages using other package infrastructures. -1. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package +_DEPENDENCIES+ variable. This addition should be done unconditionally: the value of this variable is automatically adjusted by the core infrastructure to contain the relevant list of @@ -38,7 +38,7 @@ should: also contains +gettext+ in order to get the full-blown 'gettext' implementation. -1. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that +. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that the package gets linked with +libintl+. This is generally not needed with 'autotools' packages as they usually detect automatically that they should link with +libintl+. However, diff --git a/docs/manual/customize-quick-guide.adoc b/docs/manual/customize-quick-guide.adoc index 627ecbacb1..315027c590 100644 --- a/docs/manual/customize-quick-guide.adoc +++ b/docs/manual/customize-quick-guide.adoc @@ -9,11 +9,11 @@ now summarize all this by providing step-by-step instructions to storing your project-specific customizations. Clearly, the steps that are not relevant to your project can be skipped. -1. +make menuconfig+ to configure toolchain, packages and kernel. -1. +make linux-menuconfig+ to update the kernel config, similar for +. +make menuconfig+ to configure toolchain, packages and kernel. +. +make linux-menuconfig+ to update the kernel config, similar for other configuration like busybox, uclibc, ... -1. +mkdir -p board//+ -1. Set the following options to +board///.config+ +. +mkdir -p board//+ +. Set the following options to +board///.config+ (as far as they are relevant): * +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE+ * +BR2_PACKAGE_BUSYBOX_CONFIG+ @@ -21,7 +21,7 @@ your project can be skipped. * +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE+ * +BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE+ -1. Write the configuration files: +. Write the configuration files: * +make linux-update-defconfig+ * +make busybox-update-config+ * +make uclibc-update-config+ @@ -29,38 +29,38 @@ your project can be skipped. board///at91bootstrap3.config+ * +make barebox-update-defconfig+ * +make uboot-update-defconfig+ -1. Create +board///rootfs-overlay/+ and fill it +. Create +board///rootfs-overlay/+ and fill it with additional files you need on your rootfs, e.g. +board///rootfs-overlay/etc/inittab+. Set +BR2_ROOTFS_OVERLAY+ to +board///rootfs-overlay+. -1. Create a post-build script +. Create a post-build script +board///post_build.sh+. Set +BR2_ROOTFS_POST_BUILD_SCRIPT+ to +board///post_build.sh+ -1. If additional setuid permissions have to be set or device nodes have +. If additional setuid permissions have to be set or device nodes have to be created, create +board///device_table.txt+ and add that path to +BR2_ROOTFS_DEVICE_TABLE+. -1. If additional user accounts have to be created, create +. If additional user accounts have to be created, create +board///users_table.txt+ and add that path to +BR2_ROOTFS_USERS_TABLES+. -1. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ +. To add custom patches to certain packages, set +BR2_GLOBAL_PATCH_DIR+ to +board///patches/+ and add your patches for each package in a subdirectory named after the package. Each patch should be called +--.patch+. -1. Specifically for the Linux kernel, there also exists the option +. Specifically for the Linux kernel, there also exists the option +BR2_LINUX_KERNEL_PATCH+ with as main advantage that it can also download patches from a URL. If you do not need this, +BR2_GLOBAL_PATCH_DIR+ is preferred. U-Boot, Barebox, at91bootstrap and at91bootstrap3 also have separate options, but these do not provide any advantage over +BR2_GLOBAL_PATCH_DIR+ and will likely be removed in the future. -1. If you need to add project-specific packages, create +. If you need to add project-specific packages, create +package//+ and place your packages in that directory. Create an overall +.mk+ file that includes the +.mk+ files of all your packages. Create an overall +Config.in+ file that sources the +Config.in+ files of all your packages. Include this +Config.in+ file from Buildroot's +package/Config.in+ file. -1. +make savedefconfig+ to save the buildroot configuration. -1. +cp defconfig configs/_defconfig+ +. +make savedefconfig+ to save the buildroot configuration. +. +cp defconfig configs/_defconfig+ From thomas.petazzoni at bootlin.com Sun Feb 11 15:30:59 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:30:59 +0100 Subject: [Buildroot] [git commit] utils/checkpackagelib: add check for CPE variables set to default values Message-ID: <20240211153111.77A0A875E7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fcf465d04bac45e447378ec02b50f019ca2864e8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Now that we can specify that the default values for the CPE_ID variables are valid, without having to actually set one (or more) to their default, add a check-package check that validates that the CPE_ID variables are indeed not set to their default. It also validates that CPE_ID_VALID is not set when another CPE_ID variable is set to a non-default value. Add an anchor in the manual so that we can easily point to it. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine Cc: Ricardo Martincoski Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-generic.adoc | 2 +- utils/checkpackagelib/lib_mk.py | 73 ++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-generic.adoc b/docs/manual/adding-packages-generic.adoc index ce8608682f..9d365a10ca 100644 --- a/docs/manual/adding-packages-generic.adoc +++ b/docs/manual/adding-packages-generic.adoc @@ -511,7 +511,7 @@ LIBFOO_IGNORE_CVES += CVE-2020-12345 LIBFOO_IGNORE_CVES += CVE-2020-54321 ---------------------- -* +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the +* [[cpe-id]] +LIBFOO_CPE_ID_*+ variables is a set of variables that allows the package to define its https://nvd.nist.gov/products/cpe[CPE identifier]. The available variables are: + diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index d340882971..ce2ab5157c 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -366,3 +366,76 @@ class VariableWithBraces(_CheckFunction): return ["{}:{}: use $() to delimit variables, not ${{}}" .format(self.filename, lineno), text] + + +class CPEVariables(_CheckFunction): + """ + Check that the values for the CPE variables are not the default. + - CPE_ID_* variables must not be set to their default + - CPE_ID_VALID must not be set if a non-default CPE_ID variable is set + """ + def before(self): + pkg, _ = os.path.splitext(os.path.basename(self.filename)) + self.CPE_fields_defaults = { + "VALID": "NO", + "PREFIX": "cpe:2.3:a", + "VENDOR": f"{pkg}_project", + "PRODUCT": pkg, + "VERSION": None, + "UPDATE": "*", + } + self.valid = None + self.non_defaults = 0 + self.CPE_FIELDS_RE = re.compile( + r"^\s*(.+_CPE_ID_({}))\s*=\s*(.+)$" + .format("|".join(self.CPE_fields_defaults)), + ) + self.VERSION_RE = re.compile( + rf"^(HOST_)?{pkg.upper().replace('-', '_')}_VERSION\s*=\s*(.+)$", + ) + self.COMMENT_RE = re.compile(r"^\s*#.*") + + def check_line(self, lineno, text): + text = self.COMMENT_RE.sub('', text.rstrip()) + + # WARNING! The VERSION_RE can _also_ match the same lines as CPE_FIELDS_RE, + # but not the other way around. So we must first check for CPE_FIELDS_RE, + # and if not matched, then and only then check for VERSION_RE. + match = self.CPE_FIELDS_RE.match(text) + if match: + var, field, val = match.groups() + return self._check_field(lineno, text, field, var, val) + + match = self.VERSION_RE.match(text) + if match: + self.CPE_fields_defaults["VERSION"] = match.groups()[1] + + def after(self): + # "VALID" counts in the non-defaults; so when "VALID" is present, + # 1 non-default means only "VALID" is present, so that's OK. + if self.valid and self.non_defaults > 1: + return ["{}:{}: 'YES' is implied when a non-default CPE_ID field is specified: {} ({}#cpe-id)".format( + self.filename, + self.valid["lineno"], + self.valid["text"], + self.url_to_manual, + )] + + def _check_field(self, lineno, text, field, var, val): + if field == "VERSION" and self.CPE_fields_defaults[field] is None: + return ["{}:{}: expecting package version to be set before CPE_ID_VERSION".format( + self.filename, + lineno, + )] + if val == self.CPE_fields_defaults[field]: + return ["{}:{}: '{}' is the default value for {} ({}#cpe-id)".format( + self.filename, + lineno, + val, + var, + self.url_to_manual, + )] + else: + if field == "VALID": + self.valid = {"lineno": lineno, "text": text} + self.non_defaults += 1 From thomas.petazzoni at bootlin.com Sun Feb 11 15:31:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:31:35 +0100 Subject: [Buildroot] [PATCH 0/6 v2] utils/checkpackagelib: check CPE variables (branch yem/checkpkg-cpe) In-Reply-To: References: Message-ID: <20240211163135.04c16bc4@windsurf> On Sat, 10 Feb 2024 22:24:56 +0100 "Yann E. MORIN" wrote: > Yann E. MORIN (6): > utils/check-package: use https for the manual URL > doc/manual: fixup ordered lists > doc/manual: indent the CVE example the same as the CVE list item > doc/manual: document _CPE_ID_VALID > package: switch to _CPE_ID_VALID > utils/checkpackagelib: add check for CPE variables set to default values Thanks, series applied! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:32:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:32:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/gst1-python: disable tests In-Reply-To: <20240209184814.1438551-1-james.hilliard1@gmail.com> References: <20240209184814.1438551-1-james.hilliard1@gmail.com> Message-ID: <20240211163205.79ceedd3@windsurf> On Fri, 9 Feb 2024 11:48:14 -0700 James Hilliard wrote: > We don't need tests enabled which can also cause build issues. > > Signed-off-by: James Hilliard > --- > package/gstreamer1/gst1-python/gst1-python.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From bernd at kuhls.net Sun Feb 11 15:32:11 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:32:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/fetchmail: bump version to 6.4.38 Message-ID: <20240211153211.2187231-1-bernd@kuhls.net> Release notes: https://sourceforge.net/p/fetchmail/mailman/message/58731594/ Signed-off-by: Bernd Kuhls --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 9ca6b2c7a7..3c0403fa78 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37783197/ -sha256 4a182e5d893e9abe6ac37ae71e542651fce6d606234fc735c2aaae18657e69ea fetchmail-6.4.37.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/58731594/ +sha256 a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9 fetchmail-6.4.38.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 6d418f9739..c74b259698 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).37 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).38 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING -- 2.39.2 From thomas.petazzoni at bootlin.com Sun Feb 11 15:31:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:31:56 +0100 Subject: [Buildroot] [git commit] package/gst1-python: disable tests Message-ID: <20240211153246.1BF488768B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ae8cb9b2bfa95a3107ad312748316a11801d8472 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master We don't need tests enabled which can also cause build issues. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-python/gst1-python.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index f843e37052..501ca5e02b 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -34,6 +34,7 @@ GST1_PYTHON_CONF_ENV += \ # the correct .so file, and the resulting compiled library has the appropriate # path of /usr/lib/python3.$(PYTHON3_VERSION_MAJOR).so GST1_PYTHON_CONF_OPTS += \ - -Dlibpython-dir=/usr/lib/ + -Dlibpython-dir=/usr/lib/ \ + -Dtests=disabled $(eval $(meson-package)) From thomas.petazzoni at bootlin.com Sun Feb 11 15:32:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:32:33 +0100 Subject: [Buildroot] [git commit] package/rlwrap: needs MMU Message-ID: <20240211153246.31C718768C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e0826d0672e9347fba03cf96ac9e7a48c36dac6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since the addition of the package in commit 0a1f2fce0494388080af0a4130e62522c26fe4a9: /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: pty.o: in function `my_pty_fork': pty.c:(.text+0x68): undefined reference to `fork' /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: filter.o: in function `.L0 ': filter.c:(.text+0x134): undefined reference to `fork' Fixes: - http://autobuild.buildroot.org/results/0a3a68cfb181bc67a7dbf1d44f64b0a29df75987 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/rlwrap/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rlwrap/Config.in b/package/rlwrap/Config.in index 0cb3e33fa7..4e18dfde52 100644 --- a/package/rlwrap/Config.in +++ b/package/rlwrap/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RLWRAP bool "rlwrap" + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_READLINE help rlwrap is a 'readline wrapper', a small utility that uses the From thomas.petazzoni at bootlin.com Sun Feb 11 15:32:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:32:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/rlwrap: needs MMU In-Reply-To: <20240209195021.341782-1-fontaine.fabrice@gmail.com> References: <20240209195021.341782-1-fontaine.fabrice@gmail.com> Message-ID: <20240211163256.0471a81d@windsurf> On Fri, 9 Feb 2024 20:50:21 +0100 Fabrice Fontaine wrote: > Fix the following build failure raised since the addition of the package > in commit 0a1f2fce0494388080af0a4130e62522c26fe4a9: > > /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: pty.o: in function `my_pty_fork': > pty.c:(.text+0x68): undefined reference to `fork' > /home/autobuild/autobuild/instance-0/output-1/host/riscv64-buildroot-linux-uclibc/bin/ld.real: filter.o: in function `.L0 ': > filter.c:(.text+0x134): undefined reference to `fork' > > Fixes: > - http://autobuild.buildroot.org/results/0a3a68cfb181bc67a7dbf1d44f64b0a29df75987 > > Signed-off-by: Fabrice Fontaine > --- > package/rlwrap/Config.in | 1 + > 1 file changed, 1 insertion(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:33:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:33:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/libqrtr-glib: fix static build In-Reply-To: <20240209203852.671387-1-fontaine.fabrice@gmail.com> References: <20240209203852.671387-1-fontaine.fabrice@gmail.com> Message-ID: <20240211163317.68b199d6@windsurf> On Fri, 9 Feb 2024 21:38:52 +0100 Fabrice Fontaine wrote: > Fix the following static build failure raised since bump to version > 1.2.2 in commit b50bb982208011841fe0a9a7e4309808085cf493: > > [5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 > FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 > > Fixes: > - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d > > Signed-off-by: Fabrice Fontaine > --- > ...rtr-lib-meson.build-fix-static-build.patch | 36 +++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100644 package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 15:33:11 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 16:33:11 +0100 Subject: [Buildroot] [git commit] package/libqrtr-glib: fix static build Message-ID: <20240211153429.F35CF8770E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=614e05f91524ae0f4c7d0bb8c7844645a85497fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following static build failure raised since bump to version 1.2.2 in commit b50bb982208011841fe0a9a7e4309808085cf493: [5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 Fixes: - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d Signed-off-by: Fabrice Fontaine Reviewed-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...-libqrtr-lib-meson.build-fix-static-build.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch b/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch new file mode 100644 index 0000000000..8c0db7bed5 --- /dev/null +++ b/package/libqrtr-glib/0001-src-libqrtr-lib-meson.build-fix-static-build.patch @@ -0,0 +1,36 @@ +From dd9d68259c1fb79bcf40fcdf6aa1e6026edec9b2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 9 Feb 2024 21:16:39 +0100 +Subject: [PATCH] src/libqrtr-lib/meson.build: fix static build + +Replace shared_library by library to avoid the following static build +failure: + +[5/5] Linking target src/libqrtr-glib/libqrtr-glib.so.0.0.0 +FAILED: src/libqrtr-glib/libqrtr-glib.so.0.0.0 + +Fixes: + - http://autobuild.buildroot.org/results/e0442e97279a07f33a14ec52840f98b7ec0fe32d + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib/-/merge_requests/24 +--- + src/libqrtr-glib/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libqrtr-glib/meson.build b/src/libqrtr-glib/meson.build +index bbdd869..0cddcc7 100644 +--- a/src/libqrtr-glib/meson.build ++++ b/src/libqrtr-glib/meson.build +@@ -39,7 +39,7 @@ c_flags = [ + '-DLIBEXEC_PATH="@0@"'.format(qrtr_prefix / qrtr_libexecdir), + ] + +-libqrtr_glib = shared_library( ++libqrtr_glib = library( + libname, + version: qrtr_glib_version, + sources: sources + [version_header], +-- +2.43.0 + From fontaine.fabrice at gmail.com Sun Feb 11 15:44:01 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 16:44:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdk-pixbuf: fix static build Message-ID: <20240211154401.5516-1-fontaine.fabrice@gmail.com> Fix the following static build failure raised, at least, since bump to version 2.42.10 in commit cd2757bd76d2bc2411e67a27a25b8ab55d40bdb7: FAILED: gdk-pixbuf/gdk-pixbuf-csource /home/autobuild/autobuild/instance-9/output-1/host/bin/mips-buildroot-linux-musl-gcc -o gdk-pixbuf/gdk-pixbuf-csource gdk-pixbuf/gdk-pixbuf-csource.p/gdk-pixbuf-csource.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static -Wl,--start-group gdk-pixbuf/libgdk_pixbuf-2.0.a -lm /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libglib-2.0.a -pthread /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libpcre2-8.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libffi.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libblkid.a -Wl,--end-group /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/12.3.0/../../../../mips-buildroot-linux-musl/bin/ld: gdk-pixbuf/libgdk_pixbuf-2.0.a(io-png.c.o): in function `png_simple_error_callback': io-png.c:(.text+0xf8): undefined reference to `png_get_error_ptr' Fixes: - http://autobuild.buildroot.org/results/e194d8f90caed7ceefd200d4e40d5fa5b3567d03 Signed-off-by: Fabrice Fontaine --- ...-pixbuf-meson.build-fix-static-build.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/gdk-pixbuf/0001-gdk-pixbuf-meson.build-fix-static-build.patch diff --git a/package/gdk-pixbuf/0001-gdk-pixbuf-meson.build-fix-static-build.patch b/package/gdk-pixbuf/0001-gdk-pixbuf-meson.build-fix-static-build.patch new file mode 100644 index 0000000000..44fff9b66d --- /dev/null +++ b/package/gdk-pixbuf/0001-gdk-pixbuf-meson.build-fix-static-build.patch @@ -0,0 +1,38 @@ +From 02cb9c96528a756c346aae59facb8bb7a18463c4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 10 Feb 2024 18:32:06 +0100 +Subject: [PATCH] gdk-pixbuf/meson.build: fix static build + +Add included_loaders_deps to dependencies of gdkpixbuf_dep to avoid the +following build failure when building statically: + +FAILED: gdk-pixbuf/gdk-pixbuf-csource +/home/autobuild/autobuild/instance-9/output-1/host/bin/mips-buildroot-linux-musl-gcc -o gdk-pixbuf/gdk-pixbuf-csource gdk-pixbuf/gdk-pixbuf-csource.p/gdk-pixbuf-csource.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -static -Wl,--start-group gdk-pixbuf/libgdk_pixbuf-2.0.a -lm /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libglib-2.0.a -pthread /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libpcre2-8.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgobject-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libffi.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgmodule-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libgio-2.0.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libz.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libmount.a /home/autobuild/autobuild/instance-9/output-1/host/mips-buildroot-linux-musl/sysroot/usr/lib/libblkid.a -Wl,--end-group +/home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/mips-buildroot-linux-musl/12.3.0/../../../../mips-buildroot-linux-musl/bin/ld: gdk-pixbuf/libgdk_pixbuf-2.0.a(io-png.c.o): in function `png_simple_error_callback': +io-png.c:(.text+0xf8): undefined reference to `png_get_error_ptr' + +Fixes: + - http://autobuild.buildroot.org/results/e194d8f90caed7ceefd200d4e40d5fa5b3567d03 + +Signed-off-by: Fabrice Fontaine +Upstream: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/162 +--- + gdk-pixbuf/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build +index a11926eee..450484d68 100644 +--- a/gdk-pixbuf/meson.build ++++ b/gdk-pixbuf/meson.build +@@ -269,7 +269,7 @@ endif + gdkpixbuf_dep = declare_dependency( + link_with: gdkpixbuf, + include_directories: root_inc, +- dependencies: gdk_pixbuf_deps, ++ dependencies: [ gdk_pixbuf_deps, included_loaders_deps ], + sources: [ gdkpixbuf_enum_h, built_girs ], + ) + meson.override_dependency('gdk-pixbuf-2.0', gdkpixbuf_dep) +-- +2.43.0 + -- 2.43.0 From bernd at kuhls.net Sun Feb 11 15:47:13 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:47:13 +0100 Subject: [Buildroot] [PATCH 1/2] package/alsa-lib: bump version to 1.2.11 Message-ID: <20240211154714.2311642-1-bernd@kuhls.net> Removed patch which is included in this release. Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.10_v1.2.11#alsa-lib Signed-off-by: Bernd Kuhls --- ...STRING-macro-outside-PIC-ifdef-block.patch | 50 ------------------- package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch diff --git a/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch b/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch deleted file mode 100644 index 7bd67507fd..0000000000 --- a/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 6 Sep 2023 15:16:44 +0200 -Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block - -It solves the musl libc compilation issue. - -control.c: In function 'snd_ctl_open_conf': -../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio] - 98 | #define SND_DLSYM_VERSION(version) __STRING(version) - | ^~~~~~~~ - -Fixes: https://github.com/alsa-project/alsa-lib/issues/350 -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c - -Signed-off-by: Bernd Kuhls ---- - include/global.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/global.h b/include/global.h -index dfe9bc2b..3ecaeee8 100644 ---- a/include/global.h -+++ b/include/global.h -@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void); - #define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) - #endif - -+#ifndef __STRING -+/** \brief Return 'x' argument as string */ -+#define __STRING(x) #x -+#endif -+ - #ifdef PIC /* dynamic build */ - - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ -@@ -71,11 +76,6 @@ struct snd_dlsym_link { - - extern struct snd_dlsym_link *snd_dlsym_start; - --#ifndef __STRING --/** \brief Return 'x' argument as string */ --#define __STRING(x) #x --#endif -- - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ - #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version - /** diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index a6d9c7dbdc..830643dea8 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e alsa-lib-1.2.10.tar.bz2 +sha256 9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d alsa-lib-1.2.11.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 5dfcd1e861..246761d4e6 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.10 +ALSA_LIB_VERSION = 1.2.11 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) -- 2.39.2 From bernd at kuhls.net Sun Feb 11 15:47:14 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 16:47:14 +0100 Subject: [Buildroot] [PATCH 2/2] package/alsa-utils: bump version to 1.2.11 In-Reply-To: <20240211154714.2311642-1-bernd@kuhls.net> References: <20240211154714.2311642-1-bernd@kuhls.net> Message-ID: <20240211154714.2311642-2-bernd@kuhls.net> Removed patches which are included in this release. Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.10_v1.2.11#alsa-utils Signed-off-by: Bernd Kuhls --- ...UTE_UNUSED-instead-remove-argument-n.patch | 233 ------------- ...UTE_UNUSED-instead-remove-argument-n.patch | 34 -- ...RIBUTE_UNUSED-instead-remove-argumen.patch | 57 ---- ...E_UNUSED-instead-remove-argument-nam.patch | 67 ---- ...E_UNUSED-instead-remove-argument-nam.patch | 93 ------ ...IBUTE_UNUSED-instead-remove-argument.patch | 109 ------ ...RIBUTE_UNUSED-instead-remove-argumen.patch | 312 ------------------ .../0009-topology-include-locale.h.patch | 33 -- ...nhlt-dmic-info.c-include-sys-types.h.patch | 33 -- ...nfigure.ac-fix-UMP-support-detection.patch | 38 --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 12 files changed, 2 insertions(+), 1011 deletions(-) delete mode 100644 package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch delete mode 100644 package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch delete mode 100644 package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch delete mode 100644 package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch delete mode 100644 package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch delete mode 100644 package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch delete mode 100644 package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch delete mode 100644 package/alsa-utils/0009-topology-include-locale.h.patch delete mode 100644 package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch delete mode 100644 package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch diff --git a/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch b/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch deleted file mode 100644 index 92622292c0..0000000000 --- a/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch +++ /dev/null @@ -1,233 +0,0 @@ -From a90faa2dd644af585d6a00f0aaf297c15ea0aa7b Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:33:47 +0200 -Subject: [PATCH] axfer: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: ad5a1c0 ("axfer: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/a90faa2dd644af585d6a00f0aaf297c15ea0aa7b - -Signed-off-by: Bernd Kuhls ---- - axfer/container-raw.c | 14 +++++++------- - axfer/mapper-single.c | 6 +++--- - axfer/subcmd-list.c | 2 +- - axfer/subcmd-transfer.c | 4 ++-- - axfer/waiter-poll.c | 4 ++-- - axfer/waiter-select.c | 4 ++-- - axfer/waiter.h | 1 + - axfer/xfer-libasound-irq-rw.c | 2 +- - axfer/xfer-libasound.c | 4 ++-- - axfer/xfer-options.c | 3 ++- - 10 files changed, 23 insertions(+), 21 deletions(-) - -diff --git a/axfer/container-raw.c b/axfer/container-raw.c -index 071f94c..1886045 100644 ---- a/axfer/container-raw.c -+++ b/axfer/container-raw.c -@@ -13,10 +13,10 @@ - #include - #include - --static int raw_builder_pre_process(struct container_context *, -- snd_pcm_format_t *, -- unsigned int *, -- unsigned int *, -+static int raw_builder_pre_process(struct container_context *cntr ATTRIBUTE_UNUSED, -+ snd_pcm_format_t *format ATTRIBUTE_UNUSED, -+ unsigned int *samples_per_frame ATTRIBUTE_UNUSED, -+ unsigned int *frames_per_second ATTRIBUTE_UNUSED, - uint64_t *byte_count) - { - *byte_count = UINT64_MAX; -@@ -25,9 +25,9 @@ static int raw_builder_pre_process(struct container_context *, - } - - static int raw_parser_pre_process(struct container_context *cntr, -- snd_pcm_format_t *, -- unsigned int *, -- unsigned int *, -+ snd_pcm_format_t *format ATTRIBUTE_UNUSED, -+ unsigned int *samples_per_frame ATTRIBUTE_UNUSED, -+ unsigned int *frames_per_second ATTRIBUTE_UNUSED, - uint64_t *byte_count) - { - struct stat buf = {0}; -diff --git a/axfer/mapper-single.c b/axfer/mapper-single.c -index 13e7fc5..f669f7f 100644 ---- a/axfer/mapper-single.c -+++ b/axfer/mapper-single.c -@@ -62,7 +62,7 @@ static void align_from_vector(void *frame_buf, unsigned int frame_count, - - static int single_pre_process(struct mapper_context *mapper, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - unsigned int bytes_per_buffer; -@@ -110,7 +110,7 @@ static int single_muxer_process_frames(struct mapper_context *mapper, - void *frame_buf, - unsigned int *frame_count, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - void *src; -@@ -141,7 +141,7 @@ static int single_demuxer_process_frames(struct mapper_context *mapper, - void *frame_buf, - unsigned int *frame_count, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - void *dst; -diff --git a/axfer/subcmd-list.c b/axfer/subcmd-list.c -index f9c8e0f..187e1d7 100644 ---- a/axfer/subcmd-list.c -+++ b/axfer/subcmd-list.c -@@ -19,7 +19,7 @@ enum list_op { - }; - - static int dump_device(snd_ctl_t *handle, const char *id, const char *name, -- snd_pcm_stream_t, snd_pcm_info_t *info) -+ snd_pcm_stream_t stream ATTRIBUTE_UNUSED, snd_pcm_info_t *info) - { - unsigned int i, count; - int err; -diff --git a/axfer/subcmd-transfer.c b/axfer/subcmd-transfer.c -index b39fde8..8d63043 100644 ---- a/axfer/subcmd-transfer.c -+++ b/axfer/subcmd-transfer.c -@@ -40,7 +40,7 @@ static void handle_unix_signal_for_finish(int sig) - ctx_ptr->interrupted = true; - } - --static void handle_unix_signal_for_suspend(int) -+static void handle_unix_signal_for_suspend(int sig ATTRIBUTE_UNUSED) - { - sigset_t curr, prev; - struct sigaction sa = {0}; -@@ -439,7 +439,7 @@ static int context_process_frames(struct context *ctx, - } - - static void context_post_process(struct context *ctx, -- uint64_t) -+ uint64_t accumulated_frame_count ATTRIBUTE_UNUSED) - { - uint64_t total_frame_count; - unsigned int i; -diff --git a/axfer/waiter-poll.c b/axfer/waiter-poll.c -index 31fab88..b81300c 100644 ---- a/axfer/waiter-poll.c -+++ b/axfer/waiter-poll.c -@@ -13,7 +13,7 @@ - #include - #include - --static int poll_prepare(struct waiter_context *) -+static int poll_prepare(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - // Nothing to do because an instance of waiter has required data. - return 0; -@@ -30,7 +30,7 @@ static int poll_wait_event(struct waiter_context *waiter, int timeout_msec) - return err; - } - --static void poll_release(struct waiter_context *) -+static void poll_release(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - // Nothing to do because an instance of waiter has required data. - return; -diff --git a/axfer/waiter-select.c b/axfer/waiter-select.c -index 164c9c8..fe19776 100644 ---- a/axfer/waiter-select.c -+++ b/axfer/waiter-select.c -@@ -34,7 +34,7 @@ struct select_state { - fd_set rfds_ex; - }; - --static int select_prepare(struct waiter_context *) -+static int select_prepare(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - return 0; - } -@@ -94,7 +94,7 @@ static int select_wait_event(struct waiter_context *waiter, int timeout_msec) - return err; - } - --static void select_release(struct waiter_context *) -+static void select_release(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - return; - } -diff --git a/axfer/waiter.h b/axfer/waiter.h -index db18e33..0f4e9b9 100644 ---- a/axfer/waiter.h -+++ b/axfer/waiter.h -@@ -9,6 +9,7 @@ - #ifndef __ALSA_UTILS_AXFER_WAITER__H_ - #define __ALSA_UTILS_AXFER_WAITER__H_ - -+#include - #include - - enum waiter_type { -diff --git a/axfer/xfer-libasound-irq-rw.c b/axfer/xfer-libasound-irq-rw.c -index b7f0645..45fb6d5 100644 ---- a/axfer/xfer-libasound-irq-rw.c -+++ b/axfer/xfer-libasound-irq-rw.c -@@ -313,7 +313,7 @@ error: - } - - static int w_process_frames_nonblocking(struct libasound_state *state, -- snd_pcm_state_t, -+ snd_pcm_state_t pcm_state ATTRIBUTE_UNUSED, - unsigned int *frame_count, - struct mapper_context *mapper, - struct container_context *cntrs) -diff --git a/axfer/xfer-libasound.c b/axfer/xfer-libasound.c -index 9713533..36ee08d 100644 ---- a/axfer/xfer-libasound.c -+++ b/axfer/xfer-libasound.c -@@ -60,7 +60,7 @@ static const struct option l_opts[] = { - }; - - static int xfer_libasound_init(struct xfer_context *xfer, -- snd_pcm_stream_t) -+ snd_pcm_stream_t stream ATTRIBUTE_UNUSED) - { - struct libasound_state *state = xfer->private_data; - int err; -@@ -887,7 +887,7 @@ static void xfer_libasound_destroy(struct xfer_context *xfer) - state->log = NULL; - } - --static void xfer_libasound_help(struct xfer_context *) -+static void xfer_libasound_help(struct xfer_context *xfer ATTRIBUTE_UNUSED) - { - printf( - " [BASICS]\n" -diff --git a/axfer/xfer-options.c b/axfer/xfer-options.c -index 974570c..e716ded 100644 ---- a/axfer/xfer-options.c -+++ b/axfer/xfer-options.c -@@ -447,7 +447,8 @@ static int generate_path_with_suffix(struct xfer_context *xfer, - - static int generate_path_without_suffix(struct xfer_context *xfer, - const char *template, -- unsigned int index, const char *) -+ unsigned int index, -+ const char *suffix ATTRIBUTE_UNUSED) - { - static const char *const single_format = "%s"; - static const char *const multiple_format = "%s-%i"; --- -2.39.2 - diff --git a/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch b/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch deleted file mode 100644 index 12a098b6fb..0000000000 --- a/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2db896afd475b0b3ad07e97ba74ec9680b4f7f6d Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:37:24 +0200 -Subject: [PATCH] amidi: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 1843540 ("amidi: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/2db896afd475b0b3ad07e97ba74ec9680b4f7f6d - -Signed-off-by: Bernd Kuhls ---- - amidi/amidi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amidi/amidi.c b/amidi/amidi.c -index f930ca8..75fb8c0 100644 ---- a/amidi/amidi.c -+++ b/amidi/amidi.c -@@ -446,7 +446,7 @@ static void print_byte(unsigned char byte, struct timespec *ts) - printf("%02X", byte); - } - --static void sig_handler(int) -+static void sig_handler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } --- -2.39.2 - diff --git a/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch b/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch deleted file mode 100644 index 4720531415..0000000000 --- a/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7552aef6e08b5b1fd8c1704e21cb9f6f15017bfa Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:45:09 +0200 -Subject: [PATCH] alsaloop: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: d609a58 ("alsaloop: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/7552aef6e08b5b1fd8c1704e21cb9f6f15017bfa - -Signed-off-by: Bernd Kuhls ---- - alsaloop/alsaloop.c | 2 +- - alsaloop/pcmjob.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/alsaloop/alsaloop.c b/alsaloop/alsaloop.c -index b10733e..51fb646 100644 ---- a/alsaloop/alsaloop.c -+++ b/alsaloop/alsaloop.c -@@ -821,7 +821,7 @@ static void send_to_all(int sig) - } - } - --static void signal_handler(int) -+static void signal_handler(int sig ATTRIBUTE_UNUSED) - { - quit = 1; - send_to_all(SIGUSR2); -diff --git a/alsaloop/pcmjob.c b/alsaloop/pcmjob.c -index be71971..ffb439b 100644 ---- a/alsaloop/pcmjob.c -+++ b/alsaloop/pcmjob.c -@@ -625,7 +625,7 @@ static void buf_add_src(struct loopback *loop) - } - } - #else --static void buf_add_src(struct loopback *) -+static void buf_add_src(struct loopback *loop ATTRIBUTE_UNUSED) - { - } - #endif -@@ -1794,7 +1794,7 @@ static int ctl_event_check(snd_ctl_elem_value_t *val, snd_ctl_event_t *ev) - } - - static int handle_ctl_events(struct loopback_handle *lhandle, -- unsigned short) -+ unsigned short events ATTRIBUTE_UNUSED) - { - struct loopback *loop = lhandle->loopback; - snd_ctl_event_t *ev; --- -2.39.2 - diff --git a/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch b/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch deleted file mode 100644 index 1a42f24d3c..0000000000 --- a/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 94eeb5a40f77e92624eb32d2e9c50b1cd9e4f837 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:49:03 +0200 -Subject: [PATCH] bat: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: b366875 ("bat: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/94eeb5a40f77e92624eb32d2e9c50b1cd9e4f837 - -Signed-off-by: Bernd Kuhls ---- - bat/bat.c | 3 ++- - bat/common.c | 3 ++- - bat/common.h | 5 +++++ - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/bat/bat.c b/bat/bat.c -index e88c65f..ea04ed9 100644 ---- a/bat/bat.c -+++ b/bat/bat.c -@@ -158,7 +158,8 @@ static void get_format(struct bat *bat, char *optarg) - } - } - --static inline int thread_wait_completion(struct bat *, pthread_t id, int **val) -+static inline int thread_wait_completion(struct bat *bat ATTRIBUTE_UNUSED, -+ pthread_t id, int **val) - { - int err; - -diff --git a/bat/common.c b/bat/common.c -index 9ff9405..470a7e6 100644 ---- a/bat/common.c -+++ b/bat/common.c -@@ -47,7 +47,8 @@ static int update_fmt_to_bat(struct bat *bat, struct chunk_fmt *fmt) - } - - /* calculate frames and update to bat */ --static int update_frames_to_bat(struct bat *bat, struct wav_chunk_header *header, FILE *) -+static int update_frames_to_bat(struct bat *bat, struct wav_chunk_header *header, -+ FILE *file ATTRIBUTE_UNUSED) - { - /* The number of analyzed captured frames is arbitrarily set to half of - the number of frames of the wav file or the number of frames of the -diff --git a/bat/common.h b/bat/common.h -index a9bae5d..bb51b0d 100644 ---- a/bat/common.h -+++ b/bat/common.h -@@ -13,6 +13,11 @@ - * - */ - -+#ifndef ATTRIBUTE_UNUSED -+/** do not print warning (gcc) when function parameter is not used */ -+#define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -+#endif -+ - #define TEMP_RECORD_FILE_NAME "/tmp/bat.wav.XXXXXX" - #define DEFAULT_DEV_NAME "default" - --- -2.39.2 - diff --git a/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch b/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch deleted file mode 100644 index 9e7e7da5ce..0000000000 --- a/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 66112d60e4ce68720022eaf26080c0f1a2caf81f Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:52:46 +0200 -Subject: [PATCH] seq: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 181e190 ("aplaymidi: fix the verbose compilation warnings for latest gcc") -Fixes: a03377a ("aseqnet: fix the verbose compilation warnings for latest gcc") -Fixes: 429c32a ("aseqdump: fix the verbose compilation warnings for latest gcc") -Fixes: 0b48dd6 ("aconnect: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/66112d60e4ce68720022eaf26080c0f1a2caf81f - -Signed-off-by: Bernd Kuhls ---- - seq/aconnect/aconnect.c | 9 ++++++--- - seq/aplaymidi/arecordmidi.c | 2 +- - seq/aseqdump/aseqdump.c | 2 +- - seq/aseqnet/aseqnet.c | 2 +- - 4 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/seq/aconnect/aconnect.c b/seq/aconnect/aconnect.c -index 3a10de9..7096feb 100644 ---- a/seq/aconnect/aconnect.c -+++ b/seq/aconnect/aconnect.c -@@ -193,7 +193,8 @@ static void do_search_port(snd_seq_t *seq, int perm, action_func_t do_action) - } - - --static void print_port(snd_seq_t *, snd_seq_client_info_t *cinfo, -+static void print_port(snd_seq_t *seq ATTRIBUTE_UNUSED, -+ snd_seq_client_info_t *cinfo, - snd_seq_port_info_t *pinfo, int count) - { - if (! count) { -@@ -247,8 +248,10 @@ static void print_port_and_subs(snd_seq_t *seq, snd_seq_client_info_t *cinfo, - /* - * remove all (exported) connections - */ --static void remove_connection(snd_seq_t *seq, snd_seq_client_info_t *, -- snd_seq_port_info_t *pinfo, int) -+static void remove_connection(snd_seq_t *seq, -+ snd_seq_client_info_t *info ATTRIBUTE_UNUSED, -+ snd_seq_port_info_t *pinfo, -+ int count ATTRIBUTE_UNUSED) - { - snd_seq_query_subscribe_t *query; - snd_seq_port_info_t *port; -diff --git a/seq/aplaymidi/arecordmidi.c b/seq/aplaymidi/arecordmidi.c -index ce71472..a4c1181 100644 ---- a/seq/aplaymidi/arecordmidi.c -+++ b/seq/aplaymidi/arecordmidi.c -@@ -719,7 +719,7 @@ static void version(void) - fputs("arecordmidi version " SND_UTIL_VERSION_STR "\n", stderr); - } - --static void sighandler(int) -+static void sighandler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } -diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c -index 8455ecb..af4ca21 100644 ---- a/seq/aseqdump/aseqdump.c -+++ b/seq/aseqdump/aseqdump.c -@@ -676,7 +676,7 @@ static void version(void) - puts("aseqdump version " SND_UTIL_VERSION_STR); - } - --static void sighandler(int) -+static void sighandler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } -diff --git a/seq/aseqnet/aseqnet.c b/seq/aseqnet/aseqnet.c -index f40de7d..aa70b50 100644 ---- a/seq/aseqnet/aseqnet.c -+++ b/seq/aseqnet/aseqnet.c -@@ -334,7 +334,7 @@ static void get_net_addr(struct addrinfo *rp, char *buf, size_t buflen) - /* - * signal handler - */ --static void sigterm_exit(int) -+static void sigterm_exit(int sig ATTRIBUTE_UNUSED) - { - close_files(); - exit(1); --- -2.39.2 - diff --git a/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch b/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch deleted file mode 100644 index 66826c4515..0000000000 --- a/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 9e5e9a6d70de63bea01f0669b01319952f2cfdea Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:57:47 +0200 -Subject: [PATCH] alsaucm: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: d7bbc26 ("alsaucm: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/9e5e9a6d70de63bea01f0669b01319952f2cfdea - -Signed-off-by: Bernd Kuhls ---- - alsaucm/dump.c | 22 ++++++++++++---------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -diff --git a/alsaucm/dump.c b/alsaucm/dump.c -index 102ac4d..a5c57f2 100644 ---- a/alsaucm/dump.c -+++ b/alsaucm/dump.c -@@ -93,7 +93,8 @@ static char *tesc(const char *s, char *buf, size_t buf_len) - - #define ESC(s, esc) tesc((s), (esc), sizeof(esc)) - --static int text_verb_start(struct renderer *, const char *verb, const char *comment) -+static int text_verb_start(struct renderer *r ATTRIBUTE_UNUSED, -+ const char *verb, const char *comment) - { - char buf1[128], buf2[128]; - printf("Verb.%s {\n", ESC(verb, buf1)); -@@ -102,13 +103,13 @@ static int text_verb_start(struct renderer *, const char *verb, const char *comm - return 0; - } - --static int text_verb_end(struct renderer *) -+static int text_verb_end(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("}\n"); - return 0; - } - --static int text_2nd_level_begin(struct renderer *, -+static int text_2nd_level_begin(struct renderer *r ATTRIBUTE_UNUSED, - const char *key, - const char *val, - const char *comment) -@@ -120,19 +121,19 @@ static int text_2nd_level_begin(struct renderer *, - return 0; - } - --static int text_2nd_level_end(struct renderer *) -+static int text_2nd_level_end(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("\t}\n"); - return 0; - } - --static int text_2nd_level(struct renderer *, const char *txt) -+static int text_2nd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf("\t\t%s", txt); - return 0; - } - --static int text_3rd_level(struct renderer *, const char *txt) -+static int text_3rd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf("\t\t\t%s", txt); - return 0; -@@ -266,7 +267,7 @@ static void json_block(struct renderer *r, int level, int last) - j->block[level] = last ? 0 : 1; - } - --static int json_init(struct renderer *) -+static int json_init(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("{\n \"Verbs\": {"); - return 0; -@@ -325,13 +326,13 @@ static int json_2nd_level_end(struct renderer *r) - return 0; - } - --static int json_2nd_level(struct renderer *, const char *txt) -+static int json_2nd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf(" %s", txt); - return 0; - } - --static int json_3rd_level(struct renderer *, const char *txt) -+static int json_3rd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf(" %s", txt); - return 0; -@@ -360,7 +361,8 @@ static int json_supcon_start(struct renderer *r, const char *key) - return 0; - } - --static int json_supcon_value(struct renderer *r, const char *value, int) -+static int json_supcon_value(struct renderer *r, const char *value, -+ int last ATTRIBUTE_UNUSED) - { - char buf[256]; - JESC(value, buf); --- -2.39.2 - diff --git a/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch b/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch deleted file mode 100644 index 07b10b3ab8..0000000000 --- a/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch +++ /dev/null @@ -1,312 +0,0 @@ -From dfe1c7143ab6ea01789e276b1ba361a00e545997 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 17:11:05 +0200 -Subject: [PATCH] topology: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 153d185 ("topology: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/dfe1c7143ab6ea01789e276b1ba361a00e545997 - -Signed-off-by: Bernd Kuhls ---- - topology/nhlt/intel/dmic-nhlt.c | 3 ++- - topology/nhlt/intel/dmic/dmic-debug.c | 7 ++++--- - topology/nhlt/intel/ssp/ssp-debug.c | 5 +++-- - topology/nhlt/intel/ssp/ssp-process.c | 4 +++- - topology/nhlt/nhlt-processor.c | 7 +++++-- - topology/pre-process-class.c | 10 +++++----- - topology/pre-process-object.c | 21 +++++++++++---------- - topology/pre-processor.c | 10 ++++++---- - 8 files changed, 39 insertions(+), 28 deletions(-) - -diff --git a/topology/nhlt/intel/dmic-nhlt.c b/topology/nhlt/intel/dmic-nhlt.c -index 70a22e3..de659cf 100644 ---- a/topology/nhlt/intel/dmic-nhlt.c -+++ b/topology/nhlt/intel/dmic-nhlt.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -155,7 +156,7 @@ static int set_vendor_mic_data(struct intel_nhlt_params *nhlt, snd_config_t *cfg - horizontal_angle_end); - } - --static int set_bytes_data(struct intel_nhlt_params *, snd_config_t *cfg) -+static int set_bytes_data(struct intel_nhlt_params *nhlt ATTRIBUTE_UNUSED, snd_config_t *cfg) - { - snd_config_iterator_t i, next; - snd_config_t *n; -diff --git a/topology/nhlt/intel/dmic/dmic-debug.c b/topology/nhlt/intel/dmic/dmic-debug.c -index f99d308..a977c93 100644 ---- a/topology/nhlt/intel/dmic/dmic-debug.c -+++ b/topology/nhlt/intel/dmic/dmic-debug.c -@@ -8,6 +8,7 @@ - #include "aconfig.h" - #include - #include -+#include - #include "dmic-debug.h" - - #ifdef NHLT_DEBUG -@@ -181,7 +182,7 @@ void dmic_print_internal(struct intel_dmic_params *dmic) - } - - #else /* NHLT_DEBUG */ --void dmic_print_bytes_as_hex(uint8_t *, size_t) {} --void dmic_print_integers_as_hex(uint32_t *, size_t) {} --void dmic_print_internal(struct intel_dmic_params *) {} -+void dmic_print_bytes_as_hex(uint8_t *src ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED) {} -+void dmic_print_integers_as_hex(uint32_t *src ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED) {} -+void dmic_print_internal(struct intel_dmic_params *dmic ATTRIBUTE_UNUSED) {} - #endif -diff --git a/topology/nhlt/intel/ssp/ssp-debug.c b/topology/nhlt/intel/ssp/ssp-debug.c -index 8c64675..2d2f6b0 100644 ---- a/topology/nhlt/intel/ssp/ssp-debug.c -+++ b/topology/nhlt/intel/ssp/ssp-debug.c -@@ -7,6 +7,7 @@ - #include "aconfig.h" - #include - #include -+#include - #include "ssp-debug.h" - #include "../intel-nhlt.h" - -@@ -252,6 +253,6 @@ void ssp_print_internal(struct intel_ssp_params *ssp) - } - - #else /* NHLT_DEBUG */ --void ssp_print_internal(struct intel_ssp_params *) {} --void ssp_print_calculated(struct intel_ssp_params *) {} -+void ssp_print_internal(struct intel_ssp_params *ssp ATTRIBUTE_UNUSED) {} -+void ssp_print_calculated(struct intel_ssp_params *ssp ATTRIBUTE_UNUSED) {} - #endif -diff --git a/topology/nhlt/intel/ssp/ssp-process.c b/topology/nhlt/intel/ssp/ssp-process.c -index 9cda5c3..17b88d2 100644 ---- a/topology/nhlt/intel/ssp/ssp-process.c -+++ b/topology/nhlt/intel/ssp/ssp-process.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -952,7 +953,8 @@ int ssp_set_params(struct intel_nhlt_params *nhlt, const char *dir, int dai_inde - return 0; - } - --int ssp_hw_set_params(struct intel_nhlt_params *nhlt, const char *format, const char *, -+int ssp_hw_set_params(struct intel_nhlt_params *nhlt, const char *format, -+ const char *mclk ATTRIBUTE_UNUSED, - const char *bclk, const char *bclk_invert, const char *fsync, - const char *fsync_invert, int mclk_freq, int bclk_freq, int fsync_freq, - int tdm_slots, int tdm_slot_width, int tx_slots, int rx_slots) -diff --git a/topology/nhlt/nhlt-processor.c b/topology/nhlt/nhlt-processor.c -index 567fa5c..ca539c3 100644 ---- a/topology/nhlt/nhlt-processor.c -+++ b/topology/nhlt/nhlt-processor.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -87,7 +88,8 @@ static void debug_print_nhlt(struct nhlt *blob, struct endpoint_descriptor **eps - fprintf(stdout, "\n"); - } - #else --static void debug_print_nhlt(struct nhlt *, struct endpoint_descriptor **) {} -+static void debug_print_nhlt(struct nhlt *blob ATTRIBUTE_UNUSED, -+ struct endpoint_descriptor **eps ATTRIBUTE_UNUSED) {} - #endif - - static int print_as_hex_bytes(uint8_t *manifest_buffer, uint32_t manifest_size, -@@ -313,7 +315,8 @@ static int nhlt_get_flat_buffer(struct nhlt *blob, struct endpoint_descriptor ** - } - - /* called at the end of topology pre-processing, create flat buffer from variable size nhlt */ --static int nhlt_create(struct intel_nhlt_params *nhlt, snd_config_t *input, snd_config_t *, -+static int nhlt_create(struct intel_nhlt_params *nhlt, snd_config_t *input, -+ snd_config_t *output ATTRIBUTE_UNUSED, - uint8_t **nhlt_buffer, uint32_t *nhlt_size) - { - struct endpoint_descriptor *eps[MAX_ENDPOINT_COUNT]; -diff --git a/topology/pre-process-class.c b/topology/pre-process-class.c -index d883d05..bedcebe 100644 ---- a/topology/pre-process-class.c -+++ b/topology/pre-process-class.c -@@ -127,7 +127,7 @@ snd_config_t *tplg_class_lookup(struct tplg_pre_processor *tplg_pp, snd_config_t - } - - /* find the attribute config by name in the class definition */ --snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *, -+snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *tplg_p ATTRIBUTE_UNUSED, - snd_config_t *class, const char *name) - { - snd_config_t *attr = NULL; -@@ -152,7 +152,7 @@ snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *, - } - - /* get the name of the attribute that must have a unique value in the object instance */ --const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *, -+const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class) - { - snd_config_t *unique; -@@ -177,7 +177,7 @@ const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *, - } - - /* get attribute type from the definition */ --snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *, -+snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *attr) - { - snd_config_t *type; -@@ -208,7 +208,7 @@ snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *, - } - - /* get token_ref for attribute with name attr_name in the class */ --const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *, -+const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, const char *attr_name) - { - snd_config_t *attributes, *attr, *token_ref; -@@ -235,7 +235,7 @@ const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *, - } - - /* convert a valid attribute string value to the corresponding tuple value */ --long tplg_class_attribute_valid_tuple_value(struct tplg_pre_processor *, -+long tplg_class_attribute_valid_tuple_value(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, snd_config_t *attr) - { - -diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c -index 48555e7..61cc85f 100644 ---- a/topology/pre-process-object.c -+++ b/topology/pre-process-object.c -@@ -31,7 +31,8 @@ - - /* Parse VendorToken object, create the "SectionVendorToken" and save it */ - int tplg_build_vendor_token_object(struct tplg_pre_processor *tplg_pp, -- snd_config_t *obj_cfg, snd_config_t *) -+ snd_config_t *obj_cfg, -+ snd_config_t *parent ATTRIBUTE_UNUSED) - { - snd_config_iterator_t i, next; - snd_config_t *vtop, *n, *obj; -@@ -196,7 +197,7 @@ int tplg_build_data_object(struct tplg_pre_processor *tplg_pp, snd_config_t *obj - return tplg_parent_update(tplg_pp, parent, "data", name); - } - --static int tplg_create_config_template(struct tplg_pre_processor *, -+static int tplg_create_config_template(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t **template, - const struct config_template_items *items) - { -@@ -499,7 +500,7 @@ min_max_check: - } - - /* get object's name attribute value */ --const char *tplg_object_get_name(struct tplg_pre_processor *, -+const char *tplg_object_get_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *object) - { - snd_config_t *cfg; -@@ -518,7 +519,7 @@ const char *tplg_object_get_name(struct tplg_pre_processor *, - } - - /* look up the instance of object in a config */ --static snd_config_t *tplg_object_lookup_in_config(struct tplg_pre_processor *, -+static snd_config_t *tplg_object_lookup_in_config(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, const char *type, - const char *class_name, const char *id) - { -@@ -977,7 +978,7 @@ template: - } - - static int tplg_build_generic_object(struct tplg_pre_processor *tplg_pp, snd_config_t *obj_cfg, -- snd_config_t *) -+ snd_config_t *parent ATTRIBUTE_UNUSED) - { - snd_config_t *wtop; - const char *name; -@@ -1090,7 +1091,7 @@ const struct build_function_map object_build_map[] = { - NULL, &pcm_caps_config}, - }; - --static const struct build_function_map *tplg_object_get_map(struct tplg_pre_processor *, -+static const struct build_function_map *tplg_object_get_map(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *obj) - { - snd_config_iterator_t first; -@@ -1145,7 +1146,7 @@ snd_config_t *tplg_object_get_section(struct tplg_pre_processor *tplg_pp, snd_co - } - - /* return 1 if attribute not found in search_config, 0 on success and negative value on error */ --static int tplg_object_copy_and_add_param(struct tplg_pre_processor *, -+static int tplg_object_copy_and_add_param(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *obj, - snd_config_t *attr_cfg, - snd_config_t *search_config) -@@ -1351,8 +1352,8 @@ static int tplg_object_pre_process_children(struct tplg_pre_processor *tplg_pp, - return 0; - } - --static int tplg_construct_object_name(struct tplg_pre_processor *, snd_config_t *obj, -- snd_config_t *class_cfg) -+static int tplg_construct_object_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ snd_config_t *obj, snd_config_t *class_cfg) - { - snd_config_iterator_t i, next; - snd_config_t *args, *n; -@@ -1547,7 +1548,7 @@ static int tplg_object_set_unique_attribute(struct tplg_pre_processor *tplg_pp, - * Helper function to get object instance config which is 2 nodes down from class_type config. - * ex: Get the pointer to the config node with ID "0" from the input config Widget.pga.0 {} - */ --snd_config_t *tplg_object_get_instance_config(struct tplg_pre_processor *, -+snd_config_t *tplg_object_get_instance_config(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class_type) - { - snd_config_iterator_t first; -diff --git a/topology/pre-processor.c b/topology/pre-processor.c -index 3903dee..01f8a5d 100644 ---- a/topology/pre-processor.c -+++ b/topology/pre-processor.c -@@ -231,8 +231,9 @@ void tplg_pp_config_debug(struct tplg_pre_processor *tplg_pp, snd_config_t *cfg) - snd_config_save(cfg, tplg_pp->dbg_output); - } - #else --void tplg_pp_debug(char *, ...) {} --void tplg_pp_config_debug(struct tplg_pre_processor *, snd_config_t *){} -+void tplg_pp_debug(char *fmt ATTRIBUTE_UNUSED, ...) {} -+void tplg_pp_config_debug(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ snd_config_t *cfg ATTRIBUTE_UNUSED) {} - #endif - - static int pre_process_config(struct tplg_pre_processor *tplg_pp, snd_config_t *cfg) -@@ -640,8 +641,9 @@ static int pre_process_includes_all(struct tplg_pre_processor *tplg_pp, snd_conf - } - - /* duplicate the existing objects in src into dest and update with new attribute */ --static int pre_process_add_objects(struct tplg_pre_processor *, int *object_count, -- snd_config_t *src, snd_config_t *dest, snd_config_t *attr_cfg) -+static int pre_process_add_objects(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ int *object_count, snd_config_t *src, -+ snd_config_t *dest, snd_config_t *attr_cfg) - { - snd_config_iterator_t i, next; - int ret; --- -2.39.2 - diff --git a/package/alsa-utils/0009-topology-include-locale.h.patch b/package/alsa-utils/0009-topology-include-locale.h.patch deleted file mode 100644 index 14a059cbf6..0000000000 --- a/package/alsa-utils/0009-topology-include-locale.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8c229270f6bae83b705a03714c46067a7aa57b02 Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Tue, 19 Sep 2023 13:14:29 +0200 -Subject: [PATCH] topology: include locale.h - -This solves an issue compiling with the musl libc. - -Fixes: https://github.com/alsa-project/alsa-utils/issues/239 -Signed-off-by: Michael Opdenacker -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/8c229270f6bae83b705a03714c46067a7aa57b02 - -Signed-off-by: Bernd Kuhls ---- - topology/topology.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/topology/topology.c b/topology/topology.c -index 1840ffe..5d03a8b 100644 ---- a/topology/topology.c -+++ b/topology/topology.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.39.2 - diff --git a/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch b/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch deleted file mode 100644 index b5f8489703..0000000000 --- a/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3 Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Tue, 19 Sep 2023 13:14:30 +0200 -Subject: [PATCH] nhlt-dmic-info.c: include sys/types.h - -This fixes an issue compiling with the musl libc. - -Fixes: https://github.com/alsa-project/alsa-utils/issues/238 -Signed-off-by: Michael Opdenacker -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3 - -Signed-off-by: Bernd Kuhls ---- - nhlt/nhlt-dmic-info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/nhlt/nhlt-dmic-info.c b/nhlt/nhlt-dmic-info.c -index 3f6c64d..331555a 100644 ---- a/nhlt/nhlt-dmic-info.c -+++ b/nhlt/nhlt-dmic-info.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - - int debug = 0; --- -2.39.2 - diff --git a/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch b/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch deleted file mode 100644 index 66cf051733..0000000000 --- a/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8a0da6d4484cd2ca4f1939a6c44941e070db2147 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 13 Oct 2023 20:32:32 +0200 -Subject: [PATCH] configure.ac: fix UMP support detection - -https://github.com/alsa-project/alsa-utils/commit/b399fb85a919636b7da34e8bcf17f484dd9046f7 -added usage of alsa/ump_msg.h without checking whether alsa-lib was -compiled with rawmidi support: -https://github.com/alsa-project/alsa-lib/blob/master/include/Makefile.am#L37 - -Fixes a build error when alsa-lib was compiled with --disable-rawmidi - -aplaymidi.c:34:10: fatal error: alsa/ump_msg.h: No such file or directory - 34 | #include - -Upstream: https://github.com/alsa-project/alsa-utils/pull/240 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index beb4963..4217741 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,7 +55,7 @@ if test "$HAVE_SEQ_CLIENT_INFO_GET_PID" = "yes" ; then - AC_DEFINE([HAVE_SEQ_CLIENT_INFO_GET_PID], 1, [alsa-lib supports snd_seq_client_info_get_pid]) - fi - AC_CHECK_LIB([asound], [snd_seq_client_info_get_midi_version], [HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION="yes"]) --if test "$HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION" = "yes" ; then -+if test "$HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION" = "yes" -a "$have_rawmidi" = "yes"; then - AC_DEFINE([HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION], 1, [alsa-lib supports snd_seq_client_info_get_midi_version]) - fi - AC_CHECK_LIB([atopology], [snd_tplg_save], [have_topology="yes"], [have_topology="no"]) --- -2.39.2 - diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index 0ace406286..bf98f578cd 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a alsa-utils-1.2.10.tar.bz2 +sha256 9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7 alsa-utils-1.2.11.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 6f6021400e..3ece7ddca4 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.10 +ALSA_UTILS_VERSION = 1.2.11 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 -- 2.39.2 From fontaine.fabrice at gmail.com Sun Feb 11 16:05:53 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 17:05:53 +0100 Subject: [Buildroot] [PATCH 1/1] package:libselinux: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211160553.429144-1-fontaine.fabrice@gmail.com> Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as libselinux uses setuptools instead of distutils since version 3.5 and https://github.com/SELinuxProject/selinux/commit/2b5d5585754eb731a68158b613c7676fc3195ed9 This will avoid the following build failure raised since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: In file included from /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/Python.h:38, from selinuxswig_python_wrap.c:168: /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/3fbbb741de33310c8cacab753a32e79c5e531036 Signed-off-by: Fabrice Fontaine --- package/libselinux/libselinux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 529745f82e..734084ba50 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -38,7 +38,7 @@ LIBSELINUX_DEPENDENCIES += \ host-swig LIBSELINUX_MAKE_OPTS += \ - $(PKG_PYTHON_DISTUTILS_ENV) \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ PYTHON=python$(PYTHON3_VERSION_MAJOR) LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap @@ -85,7 +85,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ PREFIX=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/lib \ - $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ + $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ PYTHON=python$(PYTHON3_VERSION_MAJOR) \ USE_PCRE2=y -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 11 16:12:19 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 17:12:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdnet: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211161219.453635-1-fontaine.fabrice@gmail.com> Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as libdnet uses setuptools instead of distutils since version 1.16.2 and https://github.com/ofalk/libdnet/commit/4e4fc687953105b66bcc847a68869126ac3ec918 This will avoid the following build failure raised since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: In file included from /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/Python.h:38, from ./dnet.c:40: /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- package/libdnet/libdnet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index fc2995979d..e678565bdf 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -19,7 +19,7 @@ LIBDNET_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin -LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +LIBDNET_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endif -- 2.43.0 From bernd at kuhls.net Sun Feb 11 16:31:16 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 17:31:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpng: bump version to 1.6.42 Message-ID: <20240211163116.2318321-1-bernd@kuhls.net> Release notes: https://raw.githubusercontent.com/pnggroup/libpng/v1.6.42/ANNOUNCE Removed patch which disabled pngfix and png-fix-itxt tools and use the new upstream-provided configure option --disable-tools instead: https://github.com/pnggroup/libpng/commit/22ad62c25e7355b20d1486da301cb69159db0915 https://github.com/pnggroup/libpng/commit/71475b064f3e628e55a2f89f55e873945650afe9 Updated license hash due to copyright year bump: https://github.com/pnggroup/libpng/commit/0dfe422e9f872d3a851d52fc45047bdfd6da0cf4 Signed-off-by: Bernd Kuhls --- ...0001-Disable-pngfix-and-png-fix-itxt.patch | 47 ------------------- package/libpng/libpng.hash | 6 +-- package/libpng/libpng.mk | 3 +- 3 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch diff --git a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch deleted file mode 100644 index d16bdb2b11..0000000000 --- a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 60c3ee917c8e7a4760b1ef7c3dc2b44a615150d3 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 26 May 2016 16:26:18 -0300 -Subject: [PATCH] Disable pngfix and png-fix-itxt - -Disable the new pngfix and png-fix-itxt tools: they take up space, fail -to build on some oddball toolchain configurations and aren't -expected/needed in a non-interactive embedded system. - -[Julien: update for 1.6.25] -Signed-off-by: Julien Boibessot - -Signed-off-by: Gustavo Zacarias ---- - Makefile.am | 2 +- - Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 7212951..3430dca 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,7 +18,7 @@ check_PROGRAMS += timepng - endif - - # Utilities - installed --bin_PROGRAMS= pngfix png-fix-itxt -+bin_PROGRAMS= - - # This ensures that pnglibconf.h gets built at the start of 'make all' or - # 'make check', but it does not add dependencies to the individual programs, -diff --git a/Makefile.in b/Makefile.in -index a66f6aa..4e67782 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -104,7 +104,7 @@ check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \ - pngstest$(EXEEXT) pngvalid$(EXEEXT) pngimage$(EXEEXT) \ - pngcp$(EXEEXT) $(am__EXEEXT_1) - @HAVE_CLOCK_GETTIME_TRUE at am__append_1 = timepng --bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT) -+bin_PROGRAMS = - @PNG_ARM_NEON_TRUE at am__append_2 = arm/arm_init.c\ - @PNG_ARM_NEON_TRUE@ arm/filter_neon.S arm/filter_neon_intrinsics.c \ - @PNG_ARM_NEON_TRUE@ arm/palette_neon_intrinsics.c --- -2.7.3 - diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index d864850b06..fbae14c51d 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/png-mng/mailman/message/37860896/ -sha256 535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1 libpng-1.6.40.tar.xz +# From https://sourceforge.net/p/png-mng/mailman/message/58731120/ +sha256 c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450 libpng-1.6.42.tar.xz # Locally computed: -sha256 5c0bb4b05b1354ae7c173532b6702ea68b611047ff9b91c4d3af77da39c195d9 LICENSE +sha256 7317e078e2d3b5d7ba5a6159e650945153262b44b76f6700f8e9edb261c5143e LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index b7bacd9217..c4da9f89c7 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.40 +LIBPNG_VERSION = 1.6.42 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) @@ -15,6 +15,7 @@ LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config +LIBPNG_CONF_OPTS = --disable-tools ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon -- 2.39.2 From yann.morin.1998 at free.fr Sun Feb 11 17:02:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:02:25 +0100 Subject: [Buildroot] [git commit] package/libdnet: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211170407.9FB368770D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9dfaa179dbc6efba3f2033e35ef9c3b2653061b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as libdnet uses setuptools instead of distutils since version 1.16.2 and https://github.com/ofalk/libdnet/commit/4e4fc687953105b66bcc847a68869126ac3ec918 This will avoid the following build failure raised since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: In file included from /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/Python.h:38, from ./dnet.c:40: /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b (No autobuilder failure (yet)) Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libdnet/libdnet.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index fc2995979d..e678565bdf 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -19,7 +19,7 @@ LIBDNET_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin -LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +LIBDNET_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install endif From yann.morin.1998 at free.fr Sun Feb 11 17:01:01 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:01:01 +0100 Subject: [Buildroot] [git commit] package:libselinux: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211170407.942CA8771B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c10349bf67c113444c9f9081b18cf15457f78d04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as libselinux uses setuptools instead of distutils since version 3.5 and https://github.com/SELinuxProject/selinux/commit/2b5d5585754eb731a68158b613c7676fc3195ed9 This will avoid the following build failure raised since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: In file included from /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/Python.h:38, from selinuxswig_python_wrap.c:168: /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." | ^~~~~ Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Fixes: http://autobuild.buildroot.org/results/3fbbb741de33310c8cacab753a32e79c5e531036 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libselinux/libselinux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index b8de21edaa..4a8d71050d 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -38,7 +38,7 @@ LIBSELINUX_DEPENDENCIES += \ host-swig LIBSELINUX_MAKE_OPTS += \ - $(PKG_PYTHON_DISTUTILS_ENV) \ + $(PKG_PYTHON_SETUPTOOLS_ENV) \ PYTHON=python$(PYTHON3_VERSION_MAJOR) LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap @@ -93,7 +93,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ PREFIX=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/lib \ - $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ + $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ PYTHON=python$(PYTHON3_VERSION_MAJOR) \ USE_PCRE2=y From yann.morin.1998 at free.fr Sun Feb 11 17:04:49 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:04:49 +0100 Subject: [Buildroot] [PATCH 1/1] package:libselinux: replace PKG_PYTHON_DISTUTILS_ENV In-Reply-To: <20240211160553.429144-1-fontaine.fabrice@gmail.com> References: <20240211160553.429144-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-11 17:05 +0100, Fabrice Fontaine spake thusly: > Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as > libselinux uses setuptools instead of distutils since version 3.5 and > https://github.com/SELinuxProject/selinux/commit/2b5d5585754eb731a68158b613c7676fc3195ed9 > > This will avoid the following build failure raised since commit > 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: > > In file included from /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/Python.h:38, > from selinuxswig_python_wrap.c:168: > /home/buildroot/autobuild/instance-0/output-1/per-package/libselinux/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > | ^~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/3fbbb741de33310c8cacab753a32e79c5e531036 I've slightly changes the formatting of the "fixes" tag, to also point to the commit introducing the issue. > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libselinux/libselinux.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk > index 529745f82e..734084ba50 100644 > --- a/package/libselinux/libselinux.mk > +++ b/package/libselinux/libselinux.mk > @@ -38,7 +38,7 @@ LIBSELINUX_DEPENDENCIES += \ > host-swig > > LIBSELINUX_MAKE_OPTS += \ > - $(PKG_PYTHON_DISTUTILS_ENV) \ > + $(PKG_PYTHON_SETUPTOOLS_ENV) \ > PYTHON=python$(PYTHON3_VERSION_MAJOR) > > LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap > @@ -85,7 +85,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ > $(HOST_CONFIGURE_OPTS) \ > PREFIX=$(HOST_DIR) \ > SHLIBDIR=$(HOST_DIR)/lib \ > - $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ > + $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ > PYTHON=python$(PYTHON3_VERSION_MAJOR) \ > USE_PCRE2=y > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 11 17:05:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:05:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/libdnet: replace PKG_PYTHON_DISTUTILS_ENV In-Reply-To: <20240211161219.453635-1-fontaine.fabrice@gmail.com> References: <20240211161219.453635-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-11 17:12 +0100, Fabrice Fontaine spake thusly: > Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as libdnet > uses setuptools instead of distutils since version 1.16.2 and > https://github.com/ofalk/libdnet/commit/4e4fc687953105b66bcc847a68869126ac3ec918 > > This will avoid the following build failure raised since commit > 09de823cbc7bd50a40e25f4166b4e42be94b0c7b: > > In file included from /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/Python.h:38, > from ./dnet.c:40: > /home/fabrice/buildroot/output/per-package/libdnet/host/include/python3.12/pyport.h:586:2: error: #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > 586 | #error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." > | ^~~~~ > > Fixes: > - No autobuilder failures (yet) I've also added a reference to the commit that introduced the issue. > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libdnet/libdnet.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk > index fc2995979d..e678565bdf 100644 > --- a/package/libdnet/libdnet.mk > +++ b/package/libdnet/libdnet.mk > @@ -19,7 +19,7 @@ LIBDNET_DEPENDENCIES = host-pkgconf > ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) > LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 > LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin > -LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) > +LIBDNET_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) > LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec > LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install > endif > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 11 17:05:53 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:05:53 +0100 Subject: [Buildroot] [git commit] package/clamav: security bump version to 1.0.5 Message-ID: <20240211170609.E0D8587729@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6e54416adb3146972e29ba1ac0991bb77088c29 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://blog.clamav.net/2023/11/clamav-130-122-105-released.html Fixes CVE-2024-20290 & CVE-2024-20328. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/clamav/clamav.hash | 2 +- package/clamav/clamav.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index cb4f67156c..cd03a11840 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3d6b99644874558b7de5faf9b340737a9bbc1083878fcd95a49f989c7c980146 clamav-1.0.4.tar.gz +sha256 aa67ee9679f747af3c492353d768464c27d614b3fed62eb7f988b6776d4aedbb clamav-1.0.5.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index c9012261fa..7c6dfce6f2 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 1.0.4 +CLAMAV_VERSION = 1.0.5 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = \ From yann.morin.1998 at free.fr Sun Feb 11 17:06:26 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:06:26 +0100 Subject: [Buildroot] [PATCH 1/1] package/clamav: security bump version to 1.0.5 In-Reply-To: <20240211151418.1615015-1-bernd@kuhls.net> References: <20240211151418.1615015-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-11 16:14 +0100, Bernd Kuhls spake thusly: > Release notes: > https://blog.clamav.net/2023/11/clamav-130-122-105-released.html > > Fixes CVE-2024-20290 & CVE-2024-20328. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/clamav/clamav.hash | 2 +- > package/clamav/clamav.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash > index cb4f67156c..cd03a11840 100644 > --- a/package/clamav/clamav.hash > +++ b/package/clamav/clamav.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 3d6b99644874558b7de5faf9b340737a9bbc1083878fcd95a49f989c7c980146 clamav-1.0.4.tar.gz > +sha256 aa67ee9679f747af3c492353d768464c27d614b3fed62eb7f988b6776d4aedbb clamav-1.0.5.tar.gz > sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING.txt > sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING/COPYING.bzip2 > sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING/COPYING.file > diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk > index c9012261fa..7c6dfce6f2 100644 > --- a/package/clamav/clamav.mk > +++ b/package/clamav/clamav.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CLAMAV_VERSION = 1.0.4 > +CLAMAV_VERSION = 1.0.5 > CLAMAV_SITE = https://www.clamav.net/downloads/production > CLAMAV_LICENSE = GPL-2.0 > CLAMAV_LICENSE_FILES = \ > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 11 17:07:07 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 18:07:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/cracklib: python needs autoreconf Message-ID: <20240211170707.524645-1-fontaine.fabrice@gmail.com> Set CRACKLIB_AUTORECONF when building python to regenerate python/test/Makefile and avoid the following build failure with python 3.12 (which removed imp mpodule) raised since commit 36e635d2d5c0166476858aa239ccbe78e8f2af14: Traceback (most recent call last): File "", line 2, in ModuleNotFoundError: No module named 'imp' make[3]: *** [Makefile:485: install-pythonPYTHON] Error 1 Fixes: - http://autobuild.buildroot.org/results/aec4c19fdf8087c76c1d5f472e855e0f84fcf7fd Signed-off-by: Fabrice Fontaine --- package/cracklib/cracklib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index c5226b3326..dce1fe9c9f 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -22,6 +22,8 @@ CRACKLIB_CONF_OPTS += --without-zlib endif ifeq ($(BR2_PACKAGE_PYTHON3),y) +# Needed because python 3.12 removed imp module +CRACKLIB_AUTORECONF = YES CRACKLIB_CONF_OPTS += --with-python CRACKLIB_CONF_ENV += \ ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 \ -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 11 17:08:16 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:08:16 +0100 Subject: [Buildroot] [git commit] package/kodi: bump version to 20.4-Nexus Message-ID: <20240211171006.139BE87735@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8f523f899fd810b37f75806ec6598c6b72d675d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://github.com/xbmc/xbmc/releases/tag/20.4-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 2ed4961e68..b785a71b6e 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 20.3-Nexus +KODI_JSONSCHEMABUILDER_VERSION = 20.4-Nexus KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 728e25606c..9810193014 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 20.3-Nexus +KODI_TEXTUREPACKER_VERSION = 20.4-Nexus KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 81d26f1cb1..7b26778b68 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 1dbf1d9f4d5eeeb6aa2593813703343a8a377e88a00c68226354e4d67467f64d kodi-20.3-Nexus.tar.gz +sha256 ccb2d3e382b5ae628a89db2325f5e778f1770a2a182f6eaa25645a22ccdffb18 kodi-20.4-Nexus.tar.gz sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 97d02e9b92..d057eb3f05 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 20.3 +KODI_VERSION_MAJOR = 20.4 KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) From yann.morin.1998 at free.fr Sun Feb 11 17:11:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:11:39 +0100 Subject: [Buildroot] [git commit] package/samba4: bump version to 4.19.4 Message-ID: <20240211171154.1DF348773D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d414c757fdb18093e2930bbebfb4f2705ce8b96d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.samba.org/samba/history/samba-4.19.4.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 81e8a6f2e9..3353221959 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.3.tar.asc -sha256 280553b90f131b1940580df293653c9e9bd8906201f5def6e5e8c160f0bfac96 samba-4.19.3.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc +sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 42bcd0a928..78c5db308d 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.3 +SAMBA4_VERSION = 4.19.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Sun Feb 11 17:12:03 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:12:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi: bump version to 20.4-Nexus In-Reply-To: <20240211151546.1615163-1-bernd@kuhls.net> References: <20240211151546.1615163-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-11 16:15 +0100, Bernd Kuhls spake thusly: > Release notes: https://github.com/xbmc/xbmc/releases/tag/20.4-Nexus > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- > package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- > package/kodi/kodi.hash | 2 +- > package/kodi/kodi.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > index 2ed4961e68..b785a71b6e 100644 > --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk > @@ -6,7 +6,7 @@ > > # Not possible to directly refer to kodi variables, because of > # first/second expansion trickery... > -KODI_JSONSCHEMABUILDER_VERSION = 20.3-Nexus > +KODI_JSONSCHEMABUILDER_VERSION = 20.4-Nexus > KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) > KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz > KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi > diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk > index 728e25606c..9810193014 100644 > --- a/package/kodi-texturepacker/kodi-texturepacker.mk > +++ b/package/kodi-texturepacker/kodi-texturepacker.mk > @@ -6,7 +6,7 @@ > > # Not possible to directly refer to kodi variables, because of > # first/second expansion trickery... > -KODI_TEXTUREPACKER_VERSION = 20.3-Nexus > +KODI_TEXTUREPACKER_VERSION = 20.4-Nexus > KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) > KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz > KODI_TEXTUREPACKER_DL_SUBDIR = kodi > diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash > index 81d26f1cb1..7b26778b68 100644 > --- a/package/kodi/kodi.hash > +++ b/package/kodi/kodi.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 1dbf1d9f4d5eeeb6aa2593813703343a8a377e88a00c68226354e4d67467f64d kodi-20.3-Nexus.tar.gz > +sha256 ccb2d3e382b5ae628a89db2325f5e778f1770a2a182f6eaa25645a22ccdffb18 kodi-20.4-Nexus.tar.gz > sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz > sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz > sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz > diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk > index 97d02e9b92..d057eb3f05 100644 > --- a/package/kodi/kodi.mk > +++ b/package/kodi/kodi.mk > @@ -6,7 +6,7 @@ > > # When updating the version, please also update kodi-jsonschemabuilder > # and kodi-texturepacker > -KODI_VERSION_MAJOR = 20.3 > +KODI_VERSION_MAJOR = 20.4 > KODI_VERSION_NAME = Nexus > KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) > KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 11 17:12:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:12:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.19.4 In-Reply-To: <20240211152828.2164674-1-bernd@kuhls.net> References: <20240211152828.2164674-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-11 16:28 +0100, Bernd Kuhls spake thusly: > Release notes: https://www.samba.org/samba/history/samba-4.19.4.html > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/samba4/samba4.hash | 4 ++-- > package/samba4/samba4.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash > index 81e8a6f2e9..3353221959 100644 > --- a/package/samba4/samba4.hash > +++ b/package/samba4/samba4.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://download.samba.org/pub/samba/stable/samba-4.19.3.tar.asc > -sha256 280553b90f131b1940580df293653c9e9bd8906201f5def6e5e8c160f0bfac96 samba-4.19.3.tar.gz > +# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc > +sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING > diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk > index 42bcd0a928..78c5db308d 100644 > --- a/package/samba4/samba4.mk > +++ b/package/samba4/samba4.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SAMBA4_VERSION = 4.19.3 > +SAMBA4_VERSION = 4.19.4 > SAMBA4_SITE = https://download.samba.org/pub/samba/stable > SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz > SAMBA4_INSTALL_STAGING = YES > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 11 17:12:30 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:12:30 +0100 Subject: [Buildroot] [git commit] package/fetchmail: bump version to 6.4.38 Message-ID: <20240211171420.776C587746@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3abd1ca5ca02e620370988dc3878bdd940ddc23d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://sourceforge.net/p/fetchmail/mailman/message/58731594/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 9ca6b2c7a7..3c0403fa78 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37783197/ -sha256 4a182e5d893e9abe6ac37ae71e542651fce6d606234fc735c2aaae18657e69ea fetchmail-6.4.37.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/58731594/ +sha256 a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9 fetchmail-6.4.38.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 6d418f9739..c74b259698 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).37 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).38 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From yann.morin.1998 at free.fr Sun Feb 11 17:14:47 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:14:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/fetchmail: bump version to 6.4.38 In-Reply-To: <20240211153211.2187231-1-bernd@kuhls.net> References: <20240211153211.2187231-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-11 16:32 +0100, Bernd Kuhls spake thusly: > Release notes: > https://sourceforge.net/p/fetchmail/mailman/message/58731594/ > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/fetchmail/fetchmail.hash | 4 ++-- > package/fetchmail/fetchmail.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash > index 9ca6b2c7a7..3c0403fa78 100644 > --- a/package/fetchmail/fetchmail.hash > +++ b/package/fetchmail/fetchmail.hash > @@ -1,4 +1,4 @@ > -# From https://sourceforge.net/p/fetchmail/mailman/message/37783197/ > -sha256 4a182e5d893e9abe6ac37ae71e542651fce6d606234fc735c2aaae18657e69ea fetchmail-6.4.37.tar.xz > +# From https://sourceforge.net/p/fetchmail/mailman/message/58731594/ > +sha256 a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9 fetchmail-6.4.38.tar.xz > # Locally computed: > sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING > diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk > index 6d418f9739..c74b259698 100644 > --- a/package/fetchmail/fetchmail.mk > +++ b/package/fetchmail/fetchmail.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > FETCHMAIL_VERSION_MAJOR = 6.4 > -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).37 > +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).38 > FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz > FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) > FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From abiliojr at gmail.com Sun Feb 11 17:15:12 2024 From: abiliojr at gmail.com (Abilio Marques) Date: Sun, 11 Feb 2024 09:15:12 -0800 Subject: [Buildroot] [PATCH] package/micropython: add support for manifest.py in the configuration In-Reply-To: References: <20240204062645.3616072-1-abiliojr@gmail.com> Message-ID: Hello Yann, One of the uses of manifest.py is to specify which modules of micropython-lib should be frozen within the binary. For those modules you don't need to include the path. e.g., package('os') That's the application I'm going for. I know it seems limited but it's really useful, and probably welcomed by other people using Micropython in the next release of Buildroot. I have ideas on how to solve the path and dependency order problem while still using the "official" manifest.py concept. The biggest challenge is that currently there are no other 3rd party Micropython modules available for Buildroot, so that makes it all very theoretical. All solutions require a bigger amount of work than the one needed for this patch. Also, I would like to discuss them before actually presenting a patch that allows 3rd party modules to be frozen. I always try to go for an incremental approach, where I get the bigger bang for the buck. I believe that allowing people to freeze the official Micropython modules is already a big step forward. But at the same time, I'm new to the Buildroot project, so please advice on the approach. Kind regards, Abilio On Mon, Feb 5, 2024 at 5:24?AM Yann E. MORIN wrote: > Abilio, All, > > On 2024-02-03 22:26 -0800, Abilio Marques spake thusly: > > Micropython can embed packages an modules as frozen bytecode. What code > > gets built this way can be defined by means of a "manifest.py" file. > > > > This commit exposes the variable FROZEN_MANIFEST to Buildroot users > > through a new variable called BR2_PACKAGE_MICROPYTHON_MANIFEST. > > > > Please check Micropython's documentation for more information: > > https://docs.micropython.org/en/latest/reference/manifest.html > > Minor nit: this blurb should have been in the help text of the new > option, and I could have done that when applying, but I have a much > more involved question, see below. > > > Signed-off-by: Abilio Marques > > --- > > package/micropython/Config.in | 8 ++++++++ > > package/micropython/micropython.mk | 5 +++++ > > 2 files changed, 13 insertions(+) > > > > diff --git a/package/micropython/Config.in > b/package/micropython/Config.in > > index 26a00baab0..52717d815a 100644 > > --- a/package/micropython/Config.in > > +++ b/package/micropython/Config.in > > @@ -17,6 +17,14 @@ config BR2_PACKAGE_MICROPYTHON_LIB > > help > > Core Python libraries ported to MicroPython. > > > > +config BR2_PACKAGE_MICROPYTHON_MANIFEST > > + string "Path to a manifest.py file" > > + help > > + MicroPython allows Python code to be ?frozen? as bytecode > > + into its binary, as an alternative to loading code from > > + the filesystem. See MicroPython's documentation for more > > + information. > > + > > endif # BR2_PACKAGE_MICROPYTHON > > > > comment "micropython needs a toolchain w/ threads, dynamic library" > > diff --git a/package/micropython/micropython.mk b/package/micropython/ > micropython.mk > > index 125a0edcfb..5a2c136547 100644 > > --- a/package/micropython/micropython.mk > > +++ b/package/micropython/micropython.mk > > @@ -43,6 +43,11 @@ else > > MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 > > endif > > > > +ifneq ($(BR2_PACKAGE_MICROPYTHON_MANIFEST),"") > > +MICROPYTHON_MAKE_OPTS += \ > > + FROZEN_MANIFEST=$(BR2_PACKAGE_MICROPYTHON_MANIFEST) > > +endif > > So, as I understand this, micropython will grab the files (from modules, > files, etc...) listed from the manifest and bundle them in the > micropython executable. It seems the paths in the manifest can be either > absolute, or relative; in the latter case, it not documented what they > would be relative to; additionally there are placeholders (see below) > that can be used but are absolute paths. > > So this has a few implications: > > - the files must be available before micropython is built, so some > dependency order is needed to ensure that: if files are provided in > a package, then we need a dependency and it is going to be a little > bit difficult to do and we need a way to address that; > > - the paths can't be hard-coded to absolute paths in the manifest file > itself, because we don't know beforehand where the buildroot build > directory will be, so we need a way to shoehorn $(TOPDIR) or some > such variable in the manifest; > > - absolute paths must be fixed to accommodate the per-package option, > because those paths change for eaach package. > > From the micropython doc, that you pointed above, there are a few > placeholders that will be replaced in the manifest, but I don't think > we can reuse those: > > Any paths used in manifest files can include the following variables. > These all resolve to absolute paths. > * $(MPY_DIR) ? path to the micropython repo. > * $(MPY_LIB_DIR) ? path to the micropython-lib submodule. Prefer to > use require(). > * $(PORT_DIR) ? path to the current port (e.g. ports/stm32) > * $(BOARD_DIR) ? path to the current board (e.g. > ports/stm32/boards/PYBV11) > > So we need a bit more information how this feature is to be used, and an > example (or a few) would probably help a lot in this respect. We also > have a runtime test for micropython, in: > support/testing/tests/package/test_micropython.py > > It would be nice to extend that runtime test as well. > > Regards, > Yann E. MORIN. > > > define MICROPYTHON_BUILD_CMDS > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross > > $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' > conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ > | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is > no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v > conspiracy. | > > '------------------------------^-------^------------------^--------------------' > -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Sun Feb 11 17:14:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:14:34 +0100 Subject: [Buildroot] [git commit] support/testing: libgpgme: increase gpg key generation timeout Message-ID: <20240211172644.CDD698774F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3efc611f531c708b0292061fd0049b4012724c09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master gpg key generation can take longer than the default timeout on a loaded or slow test host. The commit increase the timeout for the key generation command to prevent the test to randomly fail. Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_libgpgme.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_libgpgme.py b/support/testing/tests/package/test_libgpgme.py index 28a33bab03..b497891249 100644 --- a/support/testing/tests/package/test_libgpgme.py +++ b/support/testing/tests/package/test_libgpgme.py @@ -37,7 +37,7 @@ class TestLibGpgme(infra.basetest.BRTest): # We now create our gpg key. cmd = "gpg --batch --passphrase ''" cmd += f" --quick-generate-key {gpg_userid} default default" - self.assertRunOk(cmd) + self.assertRunOk(cmd, timeout=30) # We should now see our key in the list. self.assertRunOk(gpgme_listkey) From yann.morin.1998 at free.fr Sun Feb 11 17:27:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:27:27 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: libgpgme: increase gpg key generation timeout In-Reply-To: <20240210122552.1001346-1-ju.o@free.fr> References: <20240210122552.1001346-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-10 13:25 +0100, Julien Olivain spake thusly: > gpg key generation can take longer than the default timeout on a > loaded or slow test host. The commit increase the timeout for the > key generation command to prevent the test to randomly fail. > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/testing/tests/package/test_libgpgme.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/testing/tests/package/test_libgpgme.py b/support/testing/tests/package/test_libgpgme.py > index 28a33bab03..b497891249 100644 > --- a/support/testing/tests/package/test_libgpgme.py > +++ b/support/testing/tests/package/test_libgpgme.py > @@ -37,7 +37,7 @@ class TestLibGpgme(infra.basetest.BRTest): > # We now create our gpg key. > cmd = "gpg --batch --passphrase ''" > cmd += f" --quick-generate-key {gpg_userid} default default" > - self.assertRunOk(cmd) > + self.assertRunOk(cmd, timeout=30) > > # We should now see our key in the list. > self.assertRunOk(gpgme_listkey) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 11 17:27:56 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 18:27:56 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpwquality: fix build with python 3.12 Message-ID: <20240211172756.704681-1-fontaine.fabrice@gmail.com> Switch from distutils to setuptools to avoid the following build failure raised since bump of python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14: Traceback (most recent call last): File "/home/fabrice/buildroot/output/build/libpwquality-1.4.5/python/setup.py", line 9, in from distutils.core import setup, Extension ModuleNotFoundError: No module named 'distutils' Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine --- ...-Use-setuptools-instead-of-distutils.patch | 78 +++++++++++++++++++ package/libpwquality/libpwquality.mk | 6 +- 2 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch diff --git a/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch b/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 0000000000..4d4e4c8f54 --- /dev/null +++ b/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,78 @@ +From 7b5e0f0097faebdcc6a8b783237bbba7a983147a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Fri, 31 Mar 2023 14:52:19 +0200 +Subject: [PATCH] Use setuptools instead of distutils + +distutils is removed from Python 3.12+: +https://peps.python.org/pep-0632/ + +Upstream: https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a +Signed-off-by: Fabrice Fontaine +--- + libpwquality.spec.in | 11 ++--------- + python/Makefile.am | 2 +- + python/setup.py.in | 6 +++--- + 3 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/libpwquality.spec.in b/libpwquality.spec.in +index 70a6f53..0809126 100644 +--- a/libpwquality.spec.in ++++ b/libpwquality.spec.in +@@ -33,9 +33,11 @@ BuildRequires: gettext + BuildRequires: pam-devel + %if %{with python2} + BuildRequires: python2-devel ++BuildRequires: python2-setuptools + %endif + %if %{with python3} + BuildRequires: python3-devel ++BuildRequires: python3-setuptools + %endif + + URL: https://github.com/libpwquality/libpwquality/ +@@ -103,15 +105,6 @@ cp -a . %{py3dir} + pushd %{py3dir} + %endif + %if %{with python3} +-# setuptools >= 60 changes the environment to use its bundled copy of distutils +-# by default, not the Python-bundled one. To run the Python's standard library +-# distutils, the environment variable must be set. +-# Although technically setuptools is not needed for this package, if it's +-# pulled by another package, it changes the environment and consequently, +-# the build fails. This was reported in: +-# https://github.com/pypa/setuptools/issues/3143 +-export SETUPTOOLS_USE_DISTUTILS=stdlib +- + %configure \ + --with-securedir=%{_moduledir} \ + --with-pythonsitedir=%{python3_sitearch} \ +diff --git a/python/Makefile.am b/python/Makefile.am +index 1d00c0c..6e51744 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} + + clean-local: + rm -rf py$(PYTHONREV) +diff --git a/python/setup.py.in b/python/setup.py.in +index a741b91..f934c50 100755 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -6,9 +6,9 @@ + + import os + +-from distutils.core import setup, Extension +-from distutils.command.build_ext import build_ext as _build_ext +-from distutils.command.sdist import sdist as _sdist ++from setuptools import setup, Extension ++from setuptools.command.build_ext import build_ext as _build_ext ++from setuptools.command.sdist import sdist as _sdist + + def genconstants(headerfile, outputfile): + hf = open(headerfile, 'r') diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index ae6babbcae..f12e583b2d 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -11,11 +11,13 @@ LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING +# We're patching python/Makefile.am +LIBPWQUALITY_AUTORECONF = YES ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += python3 -LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +LIBPWQUALITY_DEPENDENCIES += python3 host-python-setuptools +LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings endif -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 11 17:26:47 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:26:47 +0100 Subject: [Buildroot] [git commit] package/libgpgme: bump to version 1.23.2 Message-ID: <20240211173048.23BE387757@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d9e02b8896fee9a5e657231c30182750ef206cf7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For change log, see [1] and [2]. [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-1.23.2 [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=shortlog;h=gpgme-1.23.2 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/libgpgme/libgpgme.hash | 4 ++-- package/libgpgme/libgpgme.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index 5c47db76d5..64099df4c3 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 12f4c98ffa75bdbfc4934d38757f57ba718b5aa0 gpgme-1.22.0.tar.bz2 -sha256 9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71 gpgme-1.22.0.tar.bz2 +sha1 b3a938939a9fb2182684aa9ba094c8e8ecd6167b gpgme-1.23.2.tar.bz2 +sha256 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 gpgme-1.23.2.tar.bz2 # Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index 036103b7fc..dd39b37aa2 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPGME_VERSION = 1.22.0 +LIBGPGME_VERSION = 1.23.2 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ From yann.morin.1998 at free.fr Sun Feb 11 17:31:01 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:31:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/libgpgme: bump to version 1.23.2 In-Reply-To: <20240210122338.999772-1-ju.o@free.fr> References: <20240210122338.999772-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-10 13:23 +0100, Julien Olivain spake thusly: > For change log, see [1] and [2]. > > [1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=NEWS;hb=refs/tags/gpgme-1.23.2 > [2] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=shortlog;h=gpgme-1.23.2 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > Patch tested on branch master at commit 8ab4a0a with commands: > > make check-package > ... > 0 warnings generated > > utils/test-pkg -p libgpgme > ... > 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > support/testing/run-tests \ > -d dl -o output_folder \ > tests.package.test_libgpgme > ... > OK > --- > package/libgpgme/libgpgme.hash | 4 ++-- > package/libgpgme/libgpgme.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash > index 5c47db76d5..64099df4c3 100644 > --- a/package/libgpgme/libgpgme.hash > +++ b/package/libgpgme/libgpgme.hash > @@ -1,5 +1,5 @@ > # From https://www.gnupg.org/download/integrity_check.html > -sha1 12f4c98ffa75bdbfc4934d38757f57ba718b5aa0 gpgme-1.22.0.tar.bz2 > -sha256 9551e37081ad3bde81018a0d24f245c3f8206990549598fb31a97a68380a7b71 gpgme-1.22.0.tar.bz2 > +sha1 b3a938939a9fb2182684aa9ba094c8e8ecd6167b gpgme-1.23.2.tar.bz2 > +sha256 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224 gpgme-1.23.2.tar.bz2 > # Locally calculated > sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER > diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk > index 036103b7fc..dd39b37aa2 100644 > --- a/package/libgpgme/libgpgme.mk > +++ b/package/libgpgme/libgpgme.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBGPGME_VERSION = 1.22.0 > +LIBGPGME_VERSION = 1.23.2 > LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme > LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 > LIBGPGME_LICENSE = LGPL-2.1+ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd at kuhls.net Sun Feb 11 17:33:23 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sun, 11 Feb 2024 18:33:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 24.0.0 Message-ID: <20240211173323.2755976-1-bernd@kuhls.net> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html https://cgit.freedesktop.org/mesa/mesa/tree/docs/relnotes/24.0.0.rst?h=24.0 Removed patch which is included in this release. Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...e_description-fix-unknown-linux-3.5-.patch | 68 ------------------- package/mesa3d/mesa3d.hash | 6 +- package/mesa3d/mesa3d.mk | 2 +- 4 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index b9b328b268..1d006dbc91 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.3.5 +MESA3D_HEADERS_VERSION = 24.0.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch b/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch deleted file mode 100644 index c011580f6b..0000000000 --- a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b60974fac8a2f4c85cbb2ca788fc4ec3e81998f9 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Tue, 17 Aug 2021 11:54:49 +0200 -Subject: [PATCH] util: os_same_file_description: fix unknown linux < 3.5 - syscall SYS_kcmp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -https://man7.org/linux/man-pages/man2/kcmp.2.html - -The kcmp() system call first appeared in Linux 3.5. - -But was probably also not supported by all major platforms -at that time. So fallback to the check that is done for windows. - -Signed-off-by: Thomas Devoogdt -Acked-by: Yonggang Luo -Acked-by: Michel D?nzer -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/3ef514982441ce496aa127611edd26b9867f4b95 -Signed-off-by: Thomas Devoogdt ---- - src/util/os_file.c | 18 ++++++------------ - 1 file changed, 6 insertions(+), 12 deletions(-) - -diff --git a/src/util/os_file.c b/src/util/os_file.c -index 5fb30f2d908..464425a9b87 100644 ---- a/src/util/os_file.c -+++ b/src/util/os_file.c -@@ -202,29 +202,23 @@ os_read_file(const char *filename, size_t *size) - /* copied from */ - #define KCMP_FILE 0 - -+#endif -+ - int - os_same_file_description(int fd1, int fd2) - { -+#ifdef SYS_kcmp - pid_t pid = getpid(); -+#endif - - /* Same file descriptor trivially implies same file description */ - if (fd1 == fd2) - return 0; - -+#ifdef SYS_kcmp - return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); --} -- - #else -- --int --os_same_file_description(int fd1, int fd2) --{ -- /* Same file descriptor trivially implies same file description */ -- if (fd1 == fd2) -- return 0; -- - /* Otherwise we can't tell */ - return -1; --} -- - #endif -+} --- -2.34.1 - diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 7e49119c41..49b42e2132 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html -sha256 69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f mesa-23.3.5.tar.xz -sha512 1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea mesa-23.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html +sha256 dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 mesa-24.0.0.tar.xz +sha512 9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15 mesa-24.0.0.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 4e6cb3571a..2d13f7336f 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.3.5 +MESA3D_VERSION = 24.0.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.39.2 From yann.morin.1998 at free.fr Sun Feb 11 17:54:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 18:54:51 +0100 Subject: [Buildroot] [PATCH] package/micropython: add support for manifest.py in the configuration In-Reply-To: References: <20240204062645.3616072-1-abiliojr@gmail.com> Message-ID: Abilio, All, [Please, don't top-post, but reply in-line] On 2024-02-11 09:15 -0800, Abilio Marques spake thusly: > One of the uses of manifest.py is to specify which modules of > micropython-lib should be frozen within the binary. For those modules you > don't need to include the path. e.g., > package('os') > > That's the application I'm going for. I know it seems limited but it's > really useful, OK, so maybe this can be explained in the help text of the new option, like: Note: in Buildroot, only modules provided with micropython-lib can be frozen with a manifest; freezing arbitrary files is not supported. along with a little blurb in the commit log, statng something like; We only support freezing of modules from micropython-lib. Freezing arbitrary modules would require some handling of absoulte paths, and a guarantee that the files be available before micropython is built, which is considered a bit too complex; an interested party can provide such support in the future. And thus, would it be possible to sanity-check the manifest to ensure that it indeed only references modules from icropython-lib, so that people do not get the impression it works when in fact it does not? Like, grep that only require(...) are used? (Note: you mentioned package(...) but that is not limited to files from micropython-lib; require(...) however is.) > and probably welcomed by other people using Micropython in > the next release of Buildroot. One question I was wondering about: if a module is frozen in the binary, then it is no longer needed in the filesystem, right? If so, should we have a way to remove them? > I have ideas on how to solve the path and dependency order problem while > still using the "official" manifest.py concept. The biggest challenge is > that currently there are no other 3rd party Micropython modules available > for Buildroot, so that makes it all very theoretical. All solutions require > a bigger amount of work than the one needed for this patch. Also, I would > like to discuss them before actually presenting a patch that allows 3rd > party modules to be frozen. Indeed, without a few actual examples, it's going to be difficult to see a common pattern and abstract that away. Are there any pulicly available? > I always try to go for an incremental approach, where I get the bigger bang > for the buck. I believe that allowing people to freeze the official > Micropython modules is already a big step forward. But at the same time, > I'm new to the Buildroot project, so please advice on the approach. The incremental path is totally OK; I even prefer it. Of course, any limitation (such as those we are discussing) should be explained in the commit log. Given all the feedback in this thread, can you respin a v2 taking the comments into account? As for your ideas for lifting those limitations, you can just explain them in a reply in this thread. Usually, a patchset doing the job is also a good first step to start the dicsussion. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 11 18:36:31 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 19:36:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv3: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211183631.1162846-1-fontaine.fabrice@gmail.com> Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV to avoid an issue with naming of python modules since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Signed-off-by: Fabrice Fontaine --- package/opencv3/opencv3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 29fb246e65..5064496ca6 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -341,7 +341,7 @@ OPENCV3_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV3_DEPENDENCIES += python3 OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +OPENCV3_CONF_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) OPENCV3_DEPENDENCIES += python-numpy else OPENCV3_CONF_OPTS += \ -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 11 18:38:13 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 19:38:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv4: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211183813.1164093-1-fontaine.fabrice@gmail.com> Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV to avoid an issue with naming of python modules since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Signed-off-by: Fabrice Fontaine --- package/opencv4/opencv4.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index b535761cb2..e50e0f99a9 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -410,7 +410,7 @@ OPENCV4_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV4_DEPENDENCIES += python3 OPENCV4_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -OPENCV4_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +OPENCV4_CONF_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) OPENCV4_DEPENDENCIES += python-numpy else OPENCV4_CONF_OPTS += \ -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 11 19:33:45 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 20:33:45 +0100 Subject: [Buildroot] [git commit] package/libselinux: drop remnant of PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211193527.0DFF98775F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2d381b8823b29534932b23ac800ef71eeb954ec7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c10349bf67c1 (package:libselinux: replace PKG_PYTHON_DISTUTILS_ENV) forgot to update a comment that refered to PKG_PYTHON_DISTUTILS_ENV. Replace that now. Signed-off-by: Yann E. MORIN --- package/libselinux/libselinux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 4a8d71050d..601038e46f 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -54,7 +54,7 @@ endif # python3 # Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc 2.22. We # set CFLAGS, CPPFLAGS and LDFLAGS here because we want to win over the -# CFLAGS/CPPFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_DISTUTILS_ENV) +# CFLAGS/CPPFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_SETUPTOOLS_ENV) # when the python binding is enabled. LIBSELINUX_MAKE_OPTS += \ CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ From yann.morin.1998 at free.fr Sun Feb 11 19:36:45 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 20:36:45 +0100 Subject: [Buildroot] [PATCH 1/1] package:libselinux: replace PKG_PYTHON_DISTUTILS_ENV In-Reply-To: <20240211160553.429144-1-fontaine.fabrice@gmail.com> References: <20240211160553.429144-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-11 17:05 +0100, Fabrice Fontaine spake thusly: > Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV as > libselinux uses setuptools instead of distutils since version 3.5 and > https://github.com/SELinuxProject/selinux/commit/2b5d5585754eb731a68158b613c7676fc3195ed9 [--SNIP--] > diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk > index 529745f82e..734084ba50 100644 > --- a/package/libselinux/libselinux.mk > +++ b/package/libselinux/libselinux.mk > @@ -38,7 +38,7 @@ LIBSELINUX_DEPENDENCIES += \ > host-swig > > LIBSELINUX_MAKE_OPTS += \ > - $(PKG_PYTHON_DISTUTILS_ENV) \ > + $(PKG_PYTHON_SETUPTOOLS_ENV) \ > PYTHON=python$(PYTHON3_VERSION_MAJOR) You had forgotten to update the comment a few lines below, and I just noticed, so I pushed a follow-up commit. Regards, Yann E. MORIN. > LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap > @@ -85,7 +85,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \ > $(HOST_CONFIGURE_OPTS) \ > PREFIX=$(HOST_DIR) \ > SHLIBDIR=$(HOST_DIR)/lib \ > - $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ > + $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ > PYTHON=python$(PYTHON3_VERSION_MAJOR) \ > USE_PCRE2=y > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 20:41:16 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 21:41:16 +0100 Subject: [Buildroot] [PATCH] package/lua-http: fix CVE-2023-4540 In-Reply-To: <20240210082751.12920-1-francois.perrad@gadz.org> References: <20240210082751.12920-1-francois.perrad@gadz.org> Message-ID: <20240211214116.72131219@windsurf> On Sat, 10 Feb 2024 09:27:51 +0100 Francois Perrad wrote: > see https://nvd.nist.gov/vuln/detail/CVE-2023-4540 > & https://cert.pl/en/posts/2023/09/CVE-2023-4540 > > Signed-off-by: Francois Perrad Thanks, this looks good, but... > diff --git a/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch > new file mode 100644 > index 000000000..e8f88f1ae > --- /dev/null > +++ b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch > @@ -0,0 +1,68 @@ > +From ddab2835c583d45dec62680ca8d3cbde55e0bae6 Mon Sep 17 00:00:00 2001 > +From: daurnimator > +Date: Tue, 22 Aug 2023 23:30:20 +1000 > +Subject: [PATCH] http/h1_stream: handle EOF when `body_read_type==length` > + > +If a client closes the connection before sending the expected number of bytes > +then return `EPIPE`. > +This fixes a potential infinite draining loop when trying to trying to > +`:shutdown()` a stream. We need you to add your Signed-off-by here, and a Upstream: tag with the reference to the upstream commit. (Please use "make check-package", which would have warned about those two issues) Could you send an updated version? Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 20:34:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 21:34:27 +0100 Subject: [Buildroot] [git commit] package/ddrescue: bump to version 1.28 Message-ID: <20240211203442.DA66E87768@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd011d097fa41cf9e449843e78439d43f66b87ee branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master See the release announce: https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00014.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ddrescue/ddrescue.hash | 4 ++-- package/ddrescue/ddrescue.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ddrescue/ddrescue.hash b/package/ddrescue/ddrescue.hash index 3caec5667f..4103d4fd6f 100644 --- a/package/ddrescue/ddrescue.hash +++ b/package/ddrescue/ddrescue.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2023-01/msg00011.html -sha256 38c80c98c5a44f15e53663e4510097fd68d6ec20758efdf3a925037c183232eb ddrescue-1.27.tar.lz +# From https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00014.html +sha256 6626c07a7ca1cc1d03cad0958522c5279b156222d32c342e81117cfefaeb10c1 ddrescue-1.28.tar.lz # Locally computed sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk index f4376a9340..13798bb4bb 100644 --- a/package/ddrescue/ddrescue.mk +++ b/package/ddrescue/ddrescue.mk @@ -4,7 +4,7 @@ # ################################################################################ -DDRESCUE_VERSION = 1.27 +DDRESCUE_VERSION = 1.28 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue DDRESCUE_LICENSE = GPL-2.0+ From thomas.petazzoni at bootlin.com Sun Feb 11 20:39:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 21:39:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/ddrescue: bump to version 1.28 In-Reply-To: <20240208212610.256053-1-ju.o@free.fr> References: <20240208212610.256053-1-ju.o@free.fr> Message-ID: <20240211213943.0c2155a7@windsurf> On Thu, 8 Feb 2024 22:26:09 +0100 Julien Olivain wrote: > See the release announce: > https://lists.gnu.org/archive/html/info-gnu/2024-01/msg00014.html > > Signed-off-by: Julien Olivain > --- > package/ddrescue/ddrescue.hash | 4 ++-- > package/ddrescue/ddrescue.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 11 21:10:22 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 22:10:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/exim: fix libressl build Message-ID: <20240211211022.2003157-1-fontaine.fabrice@gmail.com> Fix the following libressl build failure raised since bump to version 4.97 in commit faec3ca30e358575f70a036879029f63f7da9b29 and https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: In file included from tls.c:473: tls-openssl.c: In function 'tls_client_stapling_cb': tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} 2652 | bs->certs | ^~ Fixes: faec3ca30e358575f70a036879029f63f7da9b29 - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d Signed-off-by: Fabrice Fontaine --- package/exim/0007-typoes.patch | 58 +++++++++++++++++++ ...nssl.c-fix-build-with-libressl-3.5.0.patch | 43 ++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 package/exim/0007-typoes.patch create mode 100644 package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch diff --git a/package/exim/0007-typoes.patch b/package/exim/0007-typoes.patch new file mode 100644 index 0000000000..6bbfc9eecd --- /dev/null +++ b/package/exim/0007-typoes.patch @@ -0,0 +1,58 @@ +From caf57fe7eb5018b8df196e6d9f99586232798eb3 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 8 Nov 2023 14:22:37 +0000 +Subject: [PATCH] typoes + +Upstream: https://git.exim.org/exim.git/commit/caf57fe7eb5018b8df196e6d9f99586232798eb3 +Signed-off-by: Fabrice Fontaine +--- + src/src/tls-openssl.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/tls-openssl.c b/src/tls-openssl.c +index 851ac77c5..237303ba9 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -77,9 +77,9 @@ change this guard and punt the issue for a while longer. */ + # define EXIM_HAVE_OPENSSL_KEYLOG + # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID + # define EXIM_HAVE_SESSION_TICKET +-# define EXIM_HAVE_OPESSL_TRACE +-# define EXIM_HAVE_OPESSL_GET0_SERIAL +-# define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS ++# define EXIM_HAVE_OPENSSL_TRACE ++# define EXIM_HAVE_OPENSSL_GET0_SERIAL ++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS + # define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN + # ifndef DISABLE_OCSP + # define EXIM_HAVE_OCSP +@@ -1756,7 +1756,7 @@ level. */ + DEBUG(D_tls) + { + SSL_CTX_set_info_callback(ctx, info_callback); +-#if defined(EXIM_HAVE_OPESSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) ++#if defined(EXIM_HAVE_OPENSSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) + /* this needs a debug build of OpenSSL */ + SSL_CTX_set_msg_callback(ctx, SSL_trace); + #endif +@@ -2442,7 +2442,7 @@ tls_in.ocsp = OCSP_NOT_RESP; + if (!olist) + return SSL_TLSEXT_ERR_NOACK; + +-#ifdef EXIM_HAVE_OPESSL_GET0_SERIAL ++#ifdef EXIM_HAVE_OPENSSL_GET0_SERIAL + { + const X509 * cert_sent = SSL_get_certificate(s); + const ASN1_INTEGER * cert_serial = X509_get0_serialNumber(cert_sent); +@@ -2646,7 +2646,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) + + debug_printf("certs contained in basicresp:\n"); + x509_stack_dump_cert_s_names( +-#ifdef EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS ++#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS + OCSP_resp_get0_certs(bs) + #else + bs->certs +-- +2.30.2 + diff --git a/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..67d96fc1af --- /dev/null +++ b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,43 @@ +From 88f45502272a9a674948204e460ebe90202827d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 11 Feb 2024 21:45:42 +0100 +Subject: [PATCH] src/src/tls-openssl.c: fix build with libressl >= 3.5.0 + +OCSP_BASICRESP is an opaque structure since libressl 3.5.0 and +https://github.com/libressl/openbsd/commit/57442b0028fb09287793f279ee57ebb38e9ab954 +resulting in the following build failure since version 4.97 and +https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: + +In file included from tls.c:473: +tls-openssl.c: In function 'tls_client_stapling_cb': +tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} + 2652 | bs->certs + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d + +Signed-off-by: Fabrice Fontaine +Upstream: https://bugs.exim.org/show_bug.cgi?id=3074 +--- + src/src/tls-openssl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tls-openssl.c b/src/tls-openssl.c +index 237303ba9..c7f94c160 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -98,6 +98,10 @@ change this guard and punt the issue for a while longer. */ + # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID + #endif + ++#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS ++#endif ++ + #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x030000000L) + # define EXIM_HAVE_EXPORT_CHNL_BNGNG + # define EXIM_HAVE_OPENSSL_X509_STORE_GET1_ALL_CERTS +-- +2.43.0 + -- 2.43.0 From james.hilliard1 at gmail.com Sun Feb 11 21:20:31 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 14:20:31 -0700 Subject: [Buildroot] [git commit] package/python3: bump version to 3.12.1 In-Reply-To: References: <20240206222231.8950D87481@busybox.osuosl.org> Message-ID: On Fri, Feb 9, 2024 at 9:11?AM Bernd Kuhls wrote: > > Am Thu, 8 Feb 2024 21:14:52 -0500 schrieb James Knight: > > > import math > > ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' > > not found (required by > > /builds/buildroot/output/build/python3-3.12.1/build/lib.linux- > x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) > > Hi James, > > same here on Debian 12.4/bookworm, try this patch: > https://github.com/bkuhls/buildroot/commit/ > dca8b5bee7742ffedf81a027affadd4b7e18fc3f Yeah, this fixes the issue for me as well. > > Regards, Bernd > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From yann.morin.1998 at free.fr Sun Feb 11 21:24:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:24:14 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: <20240209175631.1337370-1-james.hilliard1@gmail.com> References: <20240209175631.1337370-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > Add patches from pending upstream pull request which add cython3 > compatibility. We are a little bit cautious at applying random patches that have not yet been at least reviewd by upstream. In this case, there has not been any upstream activity since the last release, and not muc before that either... We have no in-tree user of uvloop, so I wonder whether it makes snse to keep it, espcially since it mau be blocking the bumps of other packages (like cython 3.x being required by whats-its-name). Plus, see below... > Signed-off-by: James Hilliard > --- > .../0001-Updates-for-Cython3.patch | 631 ++++++++++++++++++ > ...ebug-has-args-difference-in-python-3.patch | 30 + > .../0003-fix-tests-on-python-3.8.patch | 31 + > .../0004-fix-arg-count-for-wrap.patch | 52 ++ > 4 files changed, 744 insertions(+) > create mode 100644 package/python-uvloop/0001-Updates-for-Cython3.patch > create mode 100644 package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > create mode 100644 package/python-uvloop/0003-fix-tests-on-python-3.8.patch > create mode 100644 package/python-uvloop/0004-fix-arg-count-for-wrap.patch > > diff --git a/package/python-uvloop/0001-Updates-for-Cython3.patch b/package/python-uvloop/0001-Updates-for-Cython3.patch > new file mode 100644 > index 0000000000..b7ef1091ac > --- /dev/null > +++ b/package/python-uvloop/0001-Updates-for-Cython3.patch > @@ -0,0 +1,631 @@ > +From 087a2983c8022598232cb7ed0a49da334d7af9ff Mon Sep 17 00:00:00 2001 > +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> > +Date: Thu, 28 Dec 2023 12:18:15 +0000 > +Subject: [PATCH] Updates for Cython3 Remove SSL depreciation warnings buillt > + on debian 12.6 python-3.22 Cython-3.0.7 libuv-1.46.0 > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/MagicStack/uvloop/pull/587] $ ./utils/docker-run make check-package package/python-uvloop/0001-Updates-for-Cython3.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) package/python-uvloop/0003-fix-tests-on-python-3.8.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) package/python-uvloop/0004-fix-arg-count-for-wrap.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) Runing check-package is really a trivial thing to do locally before sending patches, and we've been advertising it for long enough now... Regards, Yann E. MORIN. > +--- > + Makefile | 2 +- > + setup.py | 6 ++++-- > + tests/test_process.py | 4 ++-- > + tests/test_tcp.py | 19 ++++++++++++------- > + uvloop/_testbase.py | 4 +++- > + uvloop/cbhandles.pyx | 4 ++-- > + uvloop/dns.pyx | 4 ++-- > + uvloop/handles/basetransport.pxd | 4 ++-- > + uvloop/handles/basetransport.pyx | 4 ++-- > + uvloop/handles/handle.pyx | 2 +- > + uvloop/handles/pipe.pyx | 2 +- > + uvloop/handles/poll.pxd | 2 +- > + uvloop/handles/poll.pyx | 2 +- > + uvloop/handles/stream.pyx | 16 ++++++++++------ > + uvloop/handles/udp.pyx | 4 ++-- > + uvloop/includes/consts.pxi | 25 ------------------------- > + uvloop/includes/fork_handler.h | 6 +++++- > + uvloop/includes/system.h | 16 ++++++++++++++++ > + uvloop/includes/system.pxd | 12 ++++-------- > + uvloop/includes/uv.pxd | 6 +++--- > + uvloop/loop.pxd | 28 ++++++++++++++++++++++++---- > + uvloop/loop.pyx | 10 +++++----- > + uvloop/sslproto.pxd | 4 ++-- > + uvloop/sslproto.pyx | 4 ++-- > + 24 files changed, 107 insertions(+), 83 deletions(-) > + delete mode 100644 uvloop/includes/consts.pxi > + create mode 100755 uvloop/includes/system.h > + > +diff --git a/Makefile b/Makefile > +index 4375e5d..6a0475a 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -9,7 +9,7 @@ _default: compile > + > + > + clean: > +- rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd > ++ rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd > + rm -fr uvloop/*.c uvloop/*.html uvloop/*.so > + rm -fr uvloop/handles/*.html uvloop/includes/*.html > + find . -name '__pycache__' | xargs rm -rf > +diff --git a/setup.py b/setup.py > +index ba15af5..8fdf0e5 100644 > +--- a/setup.py > ++++ b/setup.py > +@@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext > + from setuptools.command.sdist import sdist > + > + > +-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)' > ++CYTHON_DEPENDENCY = 'Cython(>=0.29.36)' > + MACHINE = platform.machine() > + MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')] > + _ROOT = pathlib.Path(__file__).parent > +@@ -144,7 +144,9 @@ class uvloop_build_ext(build_ext): > + self.distribution.ext_modules[:] = cythonize( > + self.distribution.ext_modules, > + compiler_directives=directives, > +- annotate=self.cython_annotate) > ++ annotate=self.cython_annotate, > ++ compile_time_env=dict(DEFAULT_FREELIST_SIZE=250, SSL_READ_MAX_SIZE=256 * 1024), > ++ emit_linenums=True) > + > + super().finalize_options() > + > +diff --git a/tests/test_process.py b/tests/test_process.py > +index bfcbba1..95e1c9e 100644 > +--- a/tests/test_process.py > ++++ b/tests/test_process.py > +@@ -912,7 +912,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): > + stdin=subprocess.PIPE, > + stdout=subprocess.PIPE, > + stderr=subprocess.PIPE, > +- __uvloop_sleep_after_fork=True)) > ++ uvloop_sleep_after_fork=True)) > + self.assertIsNot(transport, None) > + self.assertEqual(transport.get_returncode(), 0) > + self.assertEqual( > +@@ -931,7 +931,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): > + stdin=None, > + stdout=subprocess.PIPE, > + stderr=subprocess.PIPE, > +- __uvloop_sleep_after_fork=True)) > ++ uvloop_sleep_after_fork=True)) > + self.assertIsNot(transport, None) > + self.assertEqual(transport.get_returncode(), 0) > + self.assertEqual( > +diff --git a/tests/test_tcp.py b/tests/test_tcp.py > +index 812e62b..213e2d9 100644 > +--- a/tests/test_tcp.py > ++++ b/tests/test_tcp.py > +@@ -1630,17 +1630,22 @@ class _TestSSL(tb.SSLTestCase): > + self.fail("unexpected call to connection_made()") > + > + def test_ssl_connect_accepted_socket(self): > +- if hasattr(ssl, 'PROTOCOL_TLS'): > +- proto = ssl.PROTOCOL_TLS > ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): > ++ server_proto = ssl.PROTOCOL_TLS_SERVER > ++ client_proto = ssl.PROTOCOL_TLS_CLIENT > + else: > +- proto = ssl.PROTOCOL_SSLv23 > +- server_context = ssl.SSLContext(proto) > ++ if hasattr(ssl, 'PROTOCOL_TLS'): > ++ client_proto = server_proto = ssl.PROTOCOL_TLS > ++ else: > ++ client_proto = server_proto = ssl.PROTOCOL_SSLv23 > ++ > ++ server_context = ssl.SSLContext(server_proto) > + server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY) > + if hasattr(server_context, 'check_hostname'): > + server_context.check_hostname = False > + server_context.verify_mode = ssl.CERT_NONE > + > +- client_context = ssl.SSLContext(proto) > ++ client_context = ssl.SSLContext(client_proto) > + if hasattr(server_context, 'check_hostname'): > + client_context.check_hostname = False > + client_context.verify_mode = ssl.CERT_NONE > +@@ -2233,7 +2238,7 @@ class _TestSSL(tb.SSLTestCase): > + sslctx.use_privatekey_file(self.ONLYKEY) > + sslctx.use_certificate_chain_file(self.ONLYCERT) > + client_sslctx = self._create_client_ssl_context() > +- if hasattr(ssl, 'OP_NO_TLSv1_3'): > ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): > + client_sslctx.options |= ssl.OP_NO_TLSv1_3 > + > + def server(sock): > +@@ -2592,7 +2597,7 @@ class _TestSSL(tb.SSLTestCase): > + sslctx_openssl.use_privatekey_file(self.ONLYKEY) > + sslctx_openssl.use_certificate_chain_file(self.ONLYCERT) > + client_sslctx = self._create_client_ssl_context() > +- if hasattr(ssl, 'OP_NO_TLSv1_3'): > ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): > + client_sslctx.options |= ssl.OP_NO_TLSv1_3 > + > + future = None > +diff --git a/uvloop/_testbase.py b/uvloop/_testbase.py > +index c4a7595..e620e15 100644 > +--- a/uvloop/_testbase.py > ++++ b/uvloop/_testbase.py > +@@ -269,7 +269,9 @@ def find_free_port(start_from=50000): > + class SSLTestCase: > + > + def _create_server_ssl_context(self, certfile, keyfile=None): > +- if hasattr(ssl, 'PROTOCOL_TLS'): > ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): > ++ sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) > ++ elif hasattr(ssl, 'PROTOCOL_TLS'): > + sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS) > + else: > + sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) > +diff --git a/uvloop/cbhandles.pyx b/uvloop/cbhandles.pyx > +index 2914b42..8bcc5aa 100644 > +--- a/uvloop/cbhandles.pyx > ++++ b/uvloop/cbhandles.pyx > +@@ -76,8 +76,8 @@ cdef class Handle: > + self.arg1, self.arg2, self.arg3, self.arg4) > + > + else: > +- raise RuntimeError('invalid Handle.cb_type: {}'.format( > +- cb_type)) > ++ raise RuntimeError('invalid Handle.cb_type: {} {!r}/{!r}'.format( > ++ cb_type, self.args1, self.args2)) > + > + except (KeyboardInterrupt, SystemExit): > + raise > +diff --git a/uvloop/dns.pyx b/uvloop/dns.pyx > +index 7aad631..09b9282 100644 > +--- a/uvloop/dns.pyx > ++++ b/uvloop/dns.pyx > +@@ -298,7 +298,7 @@ cdef class AddrInfo: > + uv.uv_freeaddrinfo(self.data) # returns void > + self.data = NULL > + > +- cdef void set_data(self, system.addrinfo *data): > ++ cdef void set_data(self, system.addrinfo *data) noexcept: > + self.data = data > + > + cdef unpack(self): > +@@ -326,7 +326,7 @@ cdef class AddrInfo: > + return result > + > + @staticmethod > +- cdef int isinstance(object other): > ++ cdef int isinstance(object other) noexcept: > + return type(other) is AddrInfo > + > + > +diff --git a/uvloop/handles/basetransport.pxd b/uvloop/handles/basetransport.pxd > +index ba356a7..8112622 100644 > +--- a/uvloop/handles/basetransport.pxd > ++++ b/uvloop/handles/basetransport.pxd > +@@ -47,8 +47,8 @@ cdef class UVBaseTransport(UVSocketHandle): > + # === overloads === > + > + cdef _new_socket(self) > +- cdef size_t _get_write_buffer_size(self) > ++ cdef size_t _get_write_buffer_size(self) noexcept > + > +- cdef bint _is_reading(self) > ++ cdef bint _is_reading(self) noexcept > + cdef _start_reading(self) > + cdef _stop_reading(self) > +diff --git a/uvloop/handles/basetransport.pyx b/uvloop/handles/basetransport.pyx > +index 28b3079..a8592f2 100644 > +--- a/uvloop/handles/basetransport.pyx > ++++ b/uvloop/handles/basetransport.pyx > +@@ -18,7 +18,7 @@ cdef class UVBaseTransport(UVSocketHandle): > + > + self._closing = 0 > + > +- cdef size_t _get_write_buffer_size(self): > ++ cdef size_t _get_write_buffer_size(self) noexcept: > + return 0 > + > + cdef inline _schedule_call_connection_made(self): > +@@ -211,7 +211,7 @@ cdef class UVBaseTransport(UVSocketHandle): > + self._extra_info = {} > + self._extra_info[name] = obj > + > +- cdef bint _is_reading(self): > ++ cdef bint _is_reading(self) noexcept: > + raise NotImplementedError > + > + cdef _start_reading(self): > +diff --git a/uvloop/handles/handle.pyx b/uvloop/handles/handle.pyx > +index 6efe375..2c96458 100644 > +--- a/uvloop/handles/handle.pyx > ++++ b/uvloop/handles/handle.pyx > +@@ -363,7 +363,7 @@ cdef void __uv_close_handle_cb(uv.uv_handle_t* handle) noexcept with gil: > + Py_DECREF(h) # Was INCREFed in UVHandle._close > + > + > +-cdef void __close_all_handles(Loop loop): > ++cdef void __close_all_handles(Loop loop) noexcept: > + uv.uv_walk(loop.uvloop, > + __uv_walk_close_all_handles_cb, > + loop) # void > +diff --git a/uvloop/handles/pipe.pyx b/uvloop/handles/pipe.pyx > +index 195576c..d30a736 100644 > +--- a/uvloop/handles/pipe.pyx > ++++ b/uvloop/handles/pipe.pyx > +@@ -25,7 +25,7 @@ cdef __pipe_init_uv_handle(UVStream handle, Loop loop): > + cdef __pipe_open(UVStream handle, int fd): > + cdef int err > + err = uv.uv_pipe_open(handle._handle, > +- fd) > ++ fd) > + if err < 0: > + exc = convert_error(err) > + raise exc > +diff --git a/uvloop/handles/poll.pxd b/uvloop/handles/poll.pxd > +index d07030b..c220540 100644 > +--- a/uvloop/handles/poll.pxd > ++++ b/uvloop/handles/poll.pxd > +@@ -10,7 +10,7 @@ cdef class UVPoll(UVHandle): > + cdef inline _poll_start(self, int flags) > + cdef inline _poll_stop(self) > + > +- cdef int is_active(self) > ++ cdef int is_active(self) noexcept > + > + cdef is_reading(self) > + cdef is_writing(self) > +diff --git a/uvloop/handles/poll.pyx b/uvloop/handles/poll.pyx > +index fca5981..c905e9b 100644 > +--- a/uvloop/handles/poll.pyx > ++++ b/uvloop/handles/poll.pyx > +@@ -29,7 +29,7 @@ cdef class UVPoll(UVHandle): > + handle._init(loop, fd) > + return handle > + > +- cdef int is_active(self): > ++ cdef int is_active(self) noexcept: > + return (self.reading_handle is not None or > + self.writing_handle is not None) > + > +diff --git a/uvloop/handles/stream.pyx b/uvloop/handles/stream.pyx > +index d4e02e3..09df887 100644 > +--- a/uvloop/handles/stream.pyx > ++++ b/uvloop/handles/stream.pyx > +@@ -1,4 +1,8 @@ > +-DEF __PREALLOCED_BUFS = 4 > ++cdef extern from *: > ++ ''' > ++ enum {__PREALLOCED_BUFS = 4}; > ++ ''' > ++ const bint __PREALLOCED_BUFS > + > + > + @cython.no_gc_clear > +@@ -279,7 +283,7 @@ cdef class UVStream(UVBaseTransport): > + cdef inline _close_on_read_error(self): > + self.__read_error_close = 1 > + > +- cdef bint _is_reading(self): > ++ cdef bint _is_reading(self) noexcept: > + return self.__reading > + > + cdef _start_reading(self): > +@@ -578,7 +582,7 @@ cdef class UVStream(UVBaseTransport): > + > + self._maybe_resume_protocol() > + > +- cdef size_t _get_write_buffer_size(self): > ++ cdef size_t _get_write_buffer_size(self) noexcept: > + if self._handle is NULL: > + return 0 > + return ((self._handle).write_queue_size + > +@@ -755,7 +759,7 @@ cdef inline bint __uv_stream_on_read_common( > + UVStream sc, > + Loop loop, > + ssize_t nread, > +-): > ++) noexcept: > + if sc._closed: > + # The stream was closed, there is no reason to > + # do any work now. > +@@ -818,7 +822,7 @@ cdef inline void __uv_stream_on_read_impl( > + uv.uv_stream_t* stream, > + ssize_t nread, > + const uv.uv_buf_t* buf, > +-): > ++) noexcept: > + cdef: > + UVStream sc = stream.data > + Loop loop = sc._loop > +@@ -849,7 +853,7 @@ cdef inline void __uv_stream_on_read_impl( > + cdef inline void __uv_stream_on_write_impl( > + uv.uv_write_t* req, > + int status, > +-): > ++) noexcept: > + cdef: > + _StreamWriteContext ctx = <_StreamWriteContext> req.data > + UVStream stream = ctx.stream > +diff --git a/uvloop/handles/udp.pyx b/uvloop/handles/udp.pyx > +index bbe60d5..fdd1d8b 100644 > +--- a/uvloop/handles/udp.pyx > ++++ b/uvloop/handles/udp.pyx > +@@ -127,12 +127,12 @@ cdef class UDPTransport(UVBaseTransport): > + exc = convert_error(err) > + raise exc > + > +- cdef size_t _get_write_buffer_size(self): > ++ cdef size_t _get_write_buffer_size(self) noexcept: > + if self._handle is NULL: > + return 0 > + return (self._handle).send_queue_size > + > +- cdef bint _is_reading(self): > ++ cdef bint _is_reading(self) noexcept: > + return self.__receiving > + > + cdef _start_reading(self): > +diff --git a/uvloop/includes/consts.pxi b/uvloop/includes/consts.pxi > +deleted file mode 100644 > +index f765053..0000000 > +--- a/uvloop/includes/consts.pxi > ++++ /dev/null > +@@ -1,25 +0,0 @@ > +-DEF UV_STREAM_RECV_BUF_SIZE = 256000 # 250kb > +- > +-DEF FLOW_CONTROL_HIGH_WATER = 64 # KiB > +-DEF FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB > +-DEF FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB > +- > +-DEF DEFAULT_FREELIST_SIZE = 250 > +-DEF DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 > +- > +-DEF DEBUG_STACK_DEPTH = 10 > +- > +- > +-DEF __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 > +- > +- > +-DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 > +- > +- > +-# Number of seconds to wait for SSL handshake to complete > +-# The default timeout matches that of Nginx. > +-DEF SSL_HANDSHAKE_TIMEOUT = 60.0 > +-# Number of seconds to wait for SSL shutdown to complete > +-# The default timeout mimics lingering_time > +-DEF SSL_SHUTDOWN_TIMEOUT = 30.0 > +-DEF SSL_READ_MAX_SIZE = 256 * 1024 > +diff --git a/uvloop/includes/fork_handler.h b/uvloop/includes/fork_handler.h > +index 47bbe03..9d3573a 100644 > +--- a/uvloop/includes/fork_handler.h > ++++ b/uvloop/includes/fork_handler.h > +@@ -1,7 +1,10 @@ > ++#ifndef UVLOOP_FORK_HANDLER_H_ > ++#define UVLOOP_FORK_HANDLER_H_ > ++ > + volatile uint64_t MAIN_THREAD_ID = 0; > + volatile int8_t MAIN_THREAD_ID_SET = 0; > + > +-typedef void (*OnForkHandler)(); > ++typedef void (*OnForkHandler)(void); > + > + OnForkHandler __forkHandler = NULL; > + > +@@ -36,3 +39,4 @@ void setMainThreadID(uint64_t id) { > + MAIN_THREAD_ID = id; > + MAIN_THREAD_ID_SET = 1; > + } > ++#endif > +diff --git a/uvloop/includes/system.h b/uvloop/includes/system.h > +new file mode 100755 > +index 0000000..e143bb5 > +--- /dev/null > ++++ b/uvloop/includes/system.h > +@@ -0,0 +1,16 @@ > ++#ifndef UVLOOP_SYSTEM_H_ > ++#define UVLOOP_SYSTEM_H_ > ++#if defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER) > ++#include "Winsock2.h" > ++#include "ws2def.h" > ++#include "includes/fork_handler.h" > ++#else > ++#include "arpa/inet.h" > ++#include "sys/socket.h" > ++#include "sys/un.h" > ++#include "unistd.h" > ++#include "pthread.h" > ++#endif > ++#endif > ++ > ++ > +diff --git a/uvloop/includes/system.pxd b/uvloop/includes/system.pxd > +index 367fedd..d1da74e 100644 > +--- a/uvloop/includes/system.pxd > ++++ b/uvloop/includes/system.pxd > +@@ -1,13 +1,9 @@ > + from libc.stdint cimport int8_t, uint64_t > + > +-cdef extern from "arpa/inet.h" nogil: > +- > +- int ntohl(int) > +- int htonl(int) > +- int ntohs(int) > +- > +- > +-cdef extern from "sys/socket.h" nogil: > ++cdef extern from "includes/system.h": > ++ int ntohl(int) nogil > ++ int htonl(int) nogil > ++ int ntohs(int) nogil > + > + struct sockaddr: > + unsigned short sa_family > +diff --git a/uvloop/includes/uv.pxd b/uvloop/includes/uv.pxd > +index 8765130..ddd9738 100644 > +--- a/uvloop/includes/uv.pxd > ++++ b/uvloop/includes/uv.pxd > +@@ -220,7 +220,7 @@ cdef extern from "uv.h" nogil: > + UV_LEAVE_GROUP = 0, > + UV_JOIN_GROUP > + > +- cpdef enum uv_fs_event: > ++ cdef enum uv_fs_event: > + UV_RENAME = 1, > + UV_CHANGE = 2 > + > +@@ -282,7 +282,7 @@ cdef extern from "uv.h" nogil: > + int uv_loop_close(uv_loop_t* loop) > + int uv_loop_alive(uv_loop_t* loop) > + int uv_loop_fork(uv_loop_t* loop) > +- int uv_backend_fd(uv_loop_t* loop) > ++ uv_os_fd_t uv_backend_fd(uv_loop_t* loop) > + > + void uv_update_time(uv_loop_t* loop) > + uint64_t uv_now(const uv_loop_t*) > +@@ -378,7 +378,7 @@ cdef extern from "uv.h" nogil: > + # Pipes > + > + int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) > +- int uv_pipe_open(uv_pipe_t* handle, uv_file file) > ++ int uv_pipe_open(uv_pipe_t* handle, uv_os_fd_t file) > + int uv_pipe_bind(uv_pipe_t* handle, const char* name) > + > + void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, > +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd > +index 5613473..f90c704 100644 > +--- a/uvloop/loop.pxd > ++++ b/uvloop/loop.pxd > +@@ -1,15 +1,35 @@ > + # cython: language_level=3 > + > ++cdef extern from *: > ++ ''' > ++ enum { UV_STREAM_RECV_BUF_SIZE = 256000, > ++ SSL_READ_MAX_SIZE = 256 * 1024, // 250kb > ++ }; > ++ const float SSL_HANDSHAKE_TIMEOUT = 60.0; // Number of seconds to wait for SSL handshake to complete The default timeout matches that of Nginx. > ++ const float SSL_SHUTDOWN_TIMEOUT = 30.0; // Number of seconds to wait for SSL shutdown to complete The default timeout mimics lingering_time > ++ ''' > ++ const bint UV_STREAM_RECV_BUF_SIZE > ++ const bint SSL_READ_MAX_SIZE > ++ > ++ const float SSL_HANDSHAKE_TIMEOUT > ++ const float SSL_SHUTDOWN_TIMEOUT > ++ > ++cdef enum: > ++ FLOW_CONTROL_HIGH_WATER = 64 # KiB > ++ FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB > ++ FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB > ++ > ++ DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 > ++ DEBUG_STACK_DEPTH = 10 > ++ __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 > ++ LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 > ++ > + > + from .includes cimport uv > + from .includes cimport system > + > + from libc.stdint cimport uint64_t, uint32_t, int64_t > + > +- > +-include "includes/consts.pxi" > +- > +- > + cdef extern from *: > + ctypedef int vint "volatile int" > + > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > +index 334d8d5..53e1160 100644 > +--- a/uvloop/loop.pyx > ++++ b/uvloop/loop.pyx > +@@ -43,7 +43,7 @@ from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer > + from . import _noop > + > + > +-include "includes/consts.pxi" > ++ > + include "includes/stdlib.pxi" > + > + include "errors.pyx" > +@@ -1118,7 +1118,7 @@ cdef class Loop: > + > + cdef _sock_set_reuseport(self, int fd): > + cdef: > +- int err > ++ int err = 0 > + int reuseport_flag = 1 > + > + err = system.setsockopt( > +@@ -1397,7 +1397,7 @@ cdef class Loop: > + self._debug = bool(enabled) > + if self.is_running(): > + self.call_soon_threadsafe( > +- self._set_coroutine_debug, self, self._debug) > ++ self._set_coroutine_debug, self._debug) > + > + def is_running(self): > + """Return whether the event loop is currently running.""" > +@@ -2750,7 +2750,7 @@ cdef class Loop: > + executable=None, > + pass_fds=(), > + # For tests only! Do not use in your code. Ever. > +- __uvloop_sleep_after_fork=False): > ++ uvloop_sleep_after_fork=False): > + > + # TODO: Implement close_fds (might not be very important in > + # Python 3.5, since all FDs aren't inheritable by default.) > +@@ -2770,7 +2770,7 @@ cdef class Loop: > + if executable is not None: > + args[0] = executable > + > +- if __uvloop_sleep_after_fork: > ++ if uvloop_sleep_after_fork: > + debug_flags |= __PROCESS_DEBUG_SLEEP_AFTER_FORK > + > + waiter = self._new_future() > +diff --git a/uvloop/sslproto.pxd b/uvloop/sslproto.pxd > +index 3da10f0..68e4d57 100644 > +--- a/uvloop/sslproto.pxd > ++++ b/uvloop/sslproto.pxd > +@@ -122,7 +122,7 @@ cdef class SSLProtocol: > + # Flow control for writes from APP socket > + > + cdef _control_app_writing(self, object context=*) > +- cdef size_t _get_write_buffer_size(self) > ++ cdef size_t _get_write_buffer_size(self) noexcept > + cdef _set_write_buffer_limits(self, high=*, low=*) > + > + # Flow control for reads to APP socket > +@@ -134,5 +134,5 @@ cdef class SSLProtocol: > + > + cdef _control_ssl_reading(self) > + cdef _set_read_buffer_limits(self, high=*, low=*) > +- cdef size_t _get_read_buffer_size(self) > ++ cdef size_t _get_read_buffer_size(self) noexcept > + cdef _fatal_error(self, exc, message=*) > +diff --git a/uvloop/sslproto.pyx b/uvloop/sslproto.pyx > +index 42bb764..0a43746 100644 > +--- a/uvloop/sslproto.pyx > ++++ b/uvloop/sslproto.pyx > +@@ -861,7 +861,7 @@ cdef class SSLProtocol: > + 'protocol': self, > + }) > + > +- cdef size_t _get_write_buffer_size(self): > ++ cdef size_t _get_write_buffer_size(self) noexcept: > + return self._outgoing.pending + self._write_buffer_size > + > + cdef _set_write_buffer_limits(self, high=None, low=None): > +@@ -903,7 +903,7 @@ cdef class SSLProtocol: > + self._incoming_high_water = high > + self._incoming_low_water = low > + > +- cdef size_t _get_read_buffer_size(self): > ++ cdef size_t _get_read_buffer_size(self) noexcept: > + return self._incoming.pending > + > + # Flow control for writes to SSL socket > +-- > +2.34.1 > + > diff --git a/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > new file mode 100644 > index 0000000000..ac6170aff3 > --- /dev/null > +++ b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > @@ -0,0 +1,30 @@ > +From 8b63801bfdb1f0cf7fde4f58e96f8628a587b186 Mon Sep 17 00:00:00 2001 > +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> > +Date: Thu, 28 Dec 2023 16:17:49 +0000 > +Subject: [PATCH] _set_coroutine_debug has args difference in python 3.11 > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/MagicStack/uvloop/pull/587] > +--- > + uvloop/loop.pyx | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > +index 53e1160..5ca718e 100644 > +--- a/uvloop/loop.pyx > ++++ b/uvloop/loop.pyx > +@@ -1396,8 +1396,9 @@ cdef class Loop: > + def set_debug(self, enabled): > + self._debug = bool(enabled) > + if self.is_running(): > ++ args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) > + self.call_soon_threadsafe( > +- self._set_coroutine_debug, self._debug) > ++ self._set_coroutine_debug, *args) > + > + def is_running(self): > + """Return whether the event loop is currently running.""" > +-- > +2.34.1 > + > diff --git a/package/python-uvloop/0003-fix-tests-on-python-3.8.patch b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch > new file mode 100644 > index 0000000000..42f04f2241 > --- /dev/null > +++ b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch > @@ -0,0 +1,31 @@ > +From ef5c3e5c6f331692ebcbea9e4c6aead8b2187038 Mon Sep 17 00:00:00 2001 > +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> > +Date: Thu, 28 Dec 2023 19:58:11 +0000 > +Subject: [PATCH] fix tests on python 3.8 > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/MagicStack/uvloop/pull/587] > +--- > + uvloop/loop.pyx | 5 ++--- > + 1 file changed, 2 insertions(+), 3 deletions(-) > + > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > +index 5ca718e..75b915a 100644 > +--- a/uvloop/loop.pyx > ++++ b/uvloop/loop.pyx > +@@ -1396,9 +1396,8 @@ cdef class Loop: > + def set_debug(self, enabled): > + self._debug = bool(enabled) > + if self.is_running(): > +- args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) > +- self.call_soon_threadsafe( > +- self._set_coroutine_debug, *args) > ++ args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) > ++ self.call_soon_threadsafe(self._set_coroutine_debug, *args) > + > + def is_running(self): > + """Return whether the event loop is currently running.""" > +-- > +2.34.1 > + > diff --git a/package/python-uvloop/0004-fix-arg-count-for-wrap.patch b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch > new file mode 100644 > index 0000000000..fe082f4f90 > --- /dev/null > +++ b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch > @@ -0,0 +1,52 @@ > +From afef6364c2c3100ab23c2bb2de82d2da330b258c Mon Sep 17 00:00:00 2001 > +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> > +Date: Fri, 29 Dec 2023 11:24:19 +0000 > +Subject: [PATCH] fix arg count for wrap() > + > +Signed-off-by: James Hilliard > +[Upstream status: > +https://github.com/MagicStack/uvloop/pull/587] > +--- > + uvloop/loop.pxd | 2 +- > + uvloop/loop.pyx | 5 ++--- > + 2 files changed, 3 insertions(+), 4 deletions(-) > + > +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd > +index f90c704..d34ffeb 100644 > +--- a/uvloop/loop.pxd > ++++ b/uvloop/loop.pxd > +@@ -220,7 +220,7 @@ cdef class Loop: > + cdef inline _ceval_process_signals(self) > + cdef _invoke_signals(self, bytes data) > + > +- cdef _set_coroutine_debug(self, bint enabled) > ++ cpdef _set_coroutine_debug(self, bint enabled) > + > + cdef _print_debug_info(self) > + > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > +index 75b915a..a3eeb60 100644 > +--- a/uvloop/loop.pyx > ++++ b/uvloop/loop.pyx > +@@ -1131,7 +1131,7 @@ cdef class Loop: > + if err < 0: > + raise convert_error(-errno.errno) > + > +- cdef _set_coroutine_debug(self, bint enabled): > ++ cpdef _set_coroutine_debug(self, bint enabled): > + enabled = bool(enabled) > + if self._coroutine_debug_set == enabled: > + return > +@@ -1396,8 +1396,7 @@ cdef class Loop: > + def set_debug(self, enabled): > + self._debug = bool(enabled) > + if self.is_running(): > +- args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) > +- self.call_soon_threadsafe(self._set_coroutine_debug, *args) > ++ self.call_soon_threadsafe(self._set_coroutine_debug, self._debug) > + > + def is_running(self): > + """Return whether the event loop is currently running.""" > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 21:26:38 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:26:38 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240211212652.8E02C87773@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6e5229c252abbf4b86476cfafbc26753f803cfd0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index da22b439e3..773cb4fbb5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.15" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.16" 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 10edcc2ed9..52fb480af2 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa linux-6.6.15.tar.xz -sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz +sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz +sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a0e572adc0..69857566e3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.76" if BR2_KERNEL_HEADERS_6_1 - default "6.6.15" if BR2_KERNEL_HEADERS_6_6 + default "6.1.77" if BR2_KERNEL_HEADERS_6_1 + default "6.6.16" if BR2_KERNEL_HEADERS_6_6 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 \ From thomas.petazzoni at bootlin.com Sun Feb 11 21:26:57 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:26:57 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 6.{1, 6}.x series In-Reply-To: <20240210073659.5018-1-bernd@kuhls.net> References: <20240210073659.5018-1-bernd@kuhls.net> Message-ID: <20240211222657.4861ec2a@windsurf> On Sat, 10 Feb 2024 08:36:59 +0100 Bernd Kuhls wrote: > Signed-off-by: Bernd Kuhls > --- > linux/Config.in | 2 +- > linux/linux.hash | 4 ++-- > package/linux-headers/Config.in.host | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:27:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:27:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/uhd: fix build with gcc >= 13 In-Reply-To: <20240209210801.880001-1-fontaine.fabrice@gmail.com> References: <20240209210801.880001-1-fontaine.fabrice@gmail.com> Message-ID: <20240211222741.501ddbc4@windsurf> On Fri, 9 Feb 2024 22:08:01 +0100 Fabrice Fontaine wrote: > Fix the following build failure with gcc >= 13: > > In file included from /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/lib/cal/database.cpp:7: > /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:86:24: error: 'uint8_t' was not declared in this scope > 86 | static std::vector read_cal_data(const std::string& key, > | ^~~~~~~ > /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:14:1: note: 'uint8_t' is defined in header ''; did you forget to '#include '? > 13 | #include > +++ |+#include > 14 | > > Fixes: > - http://autobuild.buildroot.org/results/cc52f2ed4fa43fe9c92713eb8561afcba29e12f3 > > Signed-off-by: Fabrice Fontaine > --- > ...h-GCC-13-add-missing-cstdint-include.patch | 117 ++++++++++++++++++ > 1 file changed, 117 insertions(+) > create mode 100644 package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:27:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:27:10 +0100 Subject: [Buildroot] [git commit] package/uhd: fix build with gcc >= 13 Message-ID: <20240211212840.63A5A87779@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69ad593a410ac734a629fd0dc4590ec7f43308ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with gcc >= 13: In file included from /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/lib/cal/database.cpp:7: /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:86:24: error: 'uint8_t' was not declared in this scope 86 | static std::vector read_cal_data(const std::string& key, | ^~~~~~~ /home/buildroot/autobuild/instance-3/output-1/build/uhd-4.3.0.0/host/include/uhd/cal/database.hpp:14:1: note: 'uint8_t' is defined in header ''; did you forget to '#include '? 13 | #include +++ |+#include 14 | Fixes: - http://autobuild.buildroot.org/results/cc52f2ed4fa43fe9c92713eb8561afcba29e12f3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...d-with-GCC-13-add-missing-cstdint-include.patch | 117 +++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch b/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch new file mode 100644 index 0000000000..acf720a15d --- /dev/null +++ b/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch @@ -0,0 +1,117 @@ +From 3acf784e988608cbce34cd0be0a8703ba53ea515 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 3 Jan 2023 23:04:52 +0000 +Subject: [PATCH] Fix build with GCC 13 (add missing include) + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so is no longer transitively included. + +Explicitly include for uint8_t. + +``` +/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:43:14: error: 'uint32_t' does not name a type + 43 | static const uint32_t DEFAULT_NOC_ID = 0xFFFFFFFF; + | ^~~~~~~~ +/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:1:1: note: 'uint32_t' is defined in header ''; did you forget to '#include '? + +++ |+#include + 1 | // +``` + +Signed-off-by: Sam James + +Upstream: https://github.com/EttusResearch/uhd/commit/3acf784e988608cbce34cd0be0a8703ba53ea515 +Signed-off-by: Fabrice Fontaine +--- + host/include/uhd/cal/database.hpp | 1 + + host/include/uhd/rfnoc/defaults.hpp | 1 + + host/include/uhd/types/eeprom.hpp | 1 + + host/include/uhd/usrp/zbx_tune_map_item.hpp | 1 + + host/lib/usrp/dboard/magnesium/magnesium_constants.hpp | 1 + + host/lib/usrp/dboard/rhodium/rhodium_constants.hpp | 1 + + host/lib/utils/serial_number.cpp | 1 + + 7 files changed, 7 insertions(+) + +diff --git a/host/include/uhd/cal/database.hpp b/host/include/uhd/cal/database.hpp +index b6abbb6df7..9d47febedd 100644 +--- a/host/include/uhd/cal/database.hpp ++++ b/host/include/uhd/cal/database.hpp +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp +index aa7778aacf..6c878a8d70 100644 +--- a/host/include/uhd/rfnoc/defaults.hpp ++++ b/host/include/uhd/rfnoc/defaults.hpp +@@ -8,6 +8,7 @@ + + #pragma once + ++#include + #include + + namespace uhd { namespace rfnoc { +diff --git a/host/include/uhd/types/eeprom.hpp b/host/include/uhd/types/eeprom.hpp +index 3a7605d3cb..420440aa64 100644 +--- a/host/include/uhd/types/eeprom.hpp ++++ b/host/include/uhd/types/eeprom.hpp +@@ -6,6 +6,7 @@ + + #pragma once + ++#include + #include + #include + #include +diff --git a/host/include/uhd/usrp/zbx_tune_map_item.hpp b/host/include/uhd/usrp/zbx_tune_map_item.hpp +index e49f49f785..ce95623de2 100644 +--- a/host/include/uhd/usrp/zbx_tune_map_item.hpp ++++ b/host/include/uhd/usrp/zbx_tune_map_item.hpp +@@ -6,6 +6,7 @@ + + #pragma once + #include ++#include + #include + #include + #include +diff --git a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp +index 99f2b910c6..99f5a4933f 100644 +--- a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp ++++ b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp +index 591d02d305..1577e02d9e 100644 +--- a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp ++++ b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/host/lib/utils/serial_number.cpp b/host/lib/utils/serial_number.cpp +index 61296a9139..c07730e24d 100644 +--- a/host/lib/utils/serial_number.cpp ++++ b/host/lib/utils/serial_number.cpp +@@ -5,6 +5,7 @@ + // + + #include ++#include + #include + #include + From thomas.petazzoni at bootlin.com Sun Feb 11 21:29:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:29:27 +0100 Subject: [Buildroot] [PATCH 1/2] package/alsa-lib: bump version to 1.2.11 In-Reply-To: <20240211154714.2311642-1-bernd@kuhls.net> References: <20240211154714.2311642-1-bernd@kuhls.net> Message-ID: <20240211222927.4587f57b@windsurf> On Sun, 11 Feb 2024 16:47:13 +0100 Bernd Kuhls wrote: > Removed patch which is included in this release. > > Changelog: > https://www.alsa-project.org/wiki/Changes_v1.2.10_v1.2.11#alsa-lib > > Signed-off-by: Bernd Kuhls > --- > ...STRING-macro-outside-PIC-ifdef-block.patch | 50 ------------------- > package/alsa-lib/alsa-lib.hash | 2 +- > package/alsa-lib/alsa-lib.mk | 2 +- > 3 files changed, 2 insertions(+), 52 deletions(-) > delete mode 100644 package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:28:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:28:40 +0100 Subject: [Buildroot] [git commit] package/alsa-lib: bump version to 1.2.11 Message-ID: <20240211213031.9C31187789@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cd27bde7f0d1d254b386fb7a719fe3b0f892bc9f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patch which is included in this release. Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.10_v1.2.11#alsa-lib Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ve-__STRING-macro-outside-PIC-ifdef-block.patch | 50 ---------------------- package/alsa-lib/alsa-lib.hash | 2 +- package/alsa-lib/alsa-lib.mk | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch b/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch deleted file mode 100644 index 7bd67507fd..0000000000 --- a/package/alsa-lib/0002-global-h-move-__STRING-macro-outside-PIC-ifdef-block.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Wed, 6 Sep 2023 15:16:44 +0200 -Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block - -It solves the musl libc compilation issue. - -control.c: In function 'snd_ctl_open_conf': -../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio] - 98 | #define SND_DLSYM_VERSION(version) __STRING(version) - | ^~~~~~~~ - -Fixes: https://github.com/alsa-project/alsa-lib/issues/350 -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c - -Signed-off-by: Bernd Kuhls ---- - include/global.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/global.h b/include/global.h -index dfe9bc2b..3ecaeee8 100644 ---- a/include/global.h -+++ b/include/global.h -@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void); - #define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) - #endif - -+#ifndef __STRING -+/** \brief Return 'x' argument as string */ -+#define __STRING(x) #x -+#endif -+ - #ifdef PIC /* dynamic build */ - - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ -@@ -71,11 +76,6 @@ struct snd_dlsym_link { - - extern struct snd_dlsym_link *snd_dlsym_start; - --#ifndef __STRING --/** \brief Return 'x' argument as string */ --#define __STRING(x) #x --#endif -- - /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */ - #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version - /** diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index a6d9c7dbdc..830643dea8 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e alsa-lib-1.2.10.tar.bz2 +sha256 9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d alsa-lib-1.2.11.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk index 5dfcd1e861..246761d4e6 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.10 +ALSA_LIB_VERSION = 1.2.11 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) From thomas.petazzoni at bootlin.com Sun Feb 11 21:28:57 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:28:57 +0100 Subject: [Buildroot] [git commit] package/alsa-utils: bump version to 1.2.11 Message-ID: <20240211213031.A7D0487777@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=96a7db5a4b7526ecf744d89d9c19986b91626325 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Removed patches which are included in this release. Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.10_v1.2.11#alsa-utils Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...TTRIBUTE_UNUSED-instead-remove-argument-n.patch | 233 --------------- ...TTRIBUTE_UNUSED-instead-remove-argument-n.patch | 34 --- ...e-ATTRIBUTE_UNUSED-instead-remove-argumen.patch | 57 ---- ...RIBUTE_UNUSED-instead-remove-argument-nam.patch | 67 ----- ...RIBUTE_UNUSED-instead-remove-argument-nam.patch | 93 ------ ...-ATTRIBUTE_UNUSED-instead-remove-argument.patch | 109 ------- ...e-ATTRIBUTE_UNUSED-instead-remove-argumen.patch | 312 --------------------- .../0009-topology-include-locale.h.patch | 33 --- ...0010-nhlt-dmic-info.c-include-sys-types.h.patch | 33 --- ...11-configure.ac-fix-UMP-support-detection.patch | 38 --- package/alsa-utils/alsa-utils.hash | 2 +- package/alsa-utils/alsa-utils.mk | 2 +- 12 files changed, 2 insertions(+), 1011 deletions(-) diff --git a/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch b/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch deleted file mode 100644 index 92622292c0..0000000000 --- a/package/alsa-utils/0002-axfer-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch +++ /dev/null @@ -1,233 +0,0 @@ -From a90faa2dd644af585d6a00f0aaf297c15ea0aa7b Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:33:47 +0200 -Subject: [PATCH] axfer: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: ad5a1c0 ("axfer: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/a90faa2dd644af585d6a00f0aaf297c15ea0aa7b - -Signed-off-by: Bernd Kuhls ---- - axfer/container-raw.c | 14 +++++++------- - axfer/mapper-single.c | 6 +++--- - axfer/subcmd-list.c | 2 +- - axfer/subcmd-transfer.c | 4 ++-- - axfer/waiter-poll.c | 4 ++-- - axfer/waiter-select.c | 4 ++-- - axfer/waiter.h | 1 + - axfer/xfer-libasound-irq-rw.c | 2 +- - axfer/xfer-libasound.c | 4 ++-- - axfer/xfer-options.c | 3 ++- - 10 files changed, 23 insertions(+), 21 deletions(-) - -diff --git a/axfer/container-raw.c b/axfer/container-raw.c -index 071f94c..1886045 100644 ---- a/axfer/container-raw.c -+++ b/axfer/container-raw.c -@@ -13,10 +13,10 @@ - #include - #include - --static int raw_builder_pre_process(struct container_context *, -- snd_pcm_format_t *, -- unsigned int *, -- unsigned int *, -+static int raw_builder_pre_process(struct container_context *cntr ATTRIBUTE_UNUSED, -+ snd_pcm_format_t *format ATTRIBUTE_UNUSED, -+ unsigned int *samples_per_frame ATTRIBUTE_UNUSED, -+ unsigned int *frames_per_second ATTRIBUTE_UNUSED, - uint64_t *byte_count) - { - *byte_count = UINT64_MAX; -@@ -25,9 +25,9 @@ static int raw_builder_pre_process(struct container_context *, - } - - static int raw_parser_pre_process(struct container_context *cntr, -- snd_pcm_format_t *, -- unsigned int *, -- unsigned int *, -+ snd_pcm_format_t *format ATTRIBUTE_UNUSED, -+ unsigned int *samples_per_frame ATTRIBUTE_UNUSED, -+ unsigned int *frames_per_second ATTRIBUTE_UNUSED, - uint64_t *byte_count) - { - struct stat buf = {0}; -diff --git a/axfer/mapper-single.c b/axfer/mapper-single.c -index 13e7fc5..f669f7f 100644 ---- a/axfer/mapper-single.c -+++ b/axfer/mapper-single.c -@@ -62,7 +62,7 @@ static void align_from_vector(void *frame_buf, unsigned int frame_count, - - static int single_pre_process(struct mapper_context *mapper, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - unsigned int bytes_per_buffer; -@@ -110,7 +110,7 @@ static int single_muxer_process_frames(struct mapper_context *mapper, - void *frame_buf, - unsigned int *frame_count, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - void *src; -@@ -141,7 +141,7 @@ static int single_demuxer_process_frames(struct mapper_context *mapper, - void *frame_buf, - unsigned int *frame_count, - struct container_context *cntrs, -- unsigned int) -+ unsigned int cntr_count ATTRIBUTE_UNUSED) - { - struct single_state *state = mapper->private_data; - void *dst; -diff --git a/axfer/subcmd-list.c b/axfer/subcmd-list.c -index f9c8e0f..187e1d7 100644 ---- a/axfer/subcmd-list.c -+++ b/axfer/subcmd-list.c -@@ -19,7 +19,7 @@ enum list_op { - }; - - static int dump_device(snd_ctl_t *handle, const char *id, const char *name, -- snd_pcm_stream_t, snd_pcm_info_t *info) -+ snd_pcm_stream_t stream ATTRIBUTE_UNUSED, snd_pcm_info_t *info) - { - unsigned int i, count; - int err; -diff --git a/axfer/subcmd-transfer.c b/axfer/subcmd-transfer.c -index b39fde8..8d63043 100644 ---- a/axfer/subcmd-transfer.c -+++ b/axfer/subcmd-transfer.c -@@ -40,7 +40,7 @@ static void handle_unix_signal_for_finish(int sig) - ctx_ptr->interrupted = true; - } - --static void handle_unix_signal_for_suspend(int) -+static void handle_unix_signal_for_suspend(int sig ATTRIBUTE_UNUSED) - { - sigset_t curr, prev; - struct sigaction sa = {0}; -@@ -439,7 +439,7 @@ static int context_process_frames(struct context *ctx, - } - - static void context_post_process(struct context *ctx, -- uint64_t) -+ uint64_t accumulated_frame_count ATTRIBUTE_UNUSED) - { - uint64_t total_frame_count; - unsigned int i; -diff --git a/axfer/waiter-poll.c b/axfer/waiter-poll.c -index 31fab88..b81300c 100644 ---- a/axfer/waiter-poll.c -+++ b/axfer/waiter-poll.c -@@ -13,7 +13,7 @@ - #include - #include - --static int poll_prepare(struct waiter_context *) -+static int poll_prepare(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - // Nothing to do because an instance of waiter has required data. - return 0; -@@ -30,7 +30,7 @@ static int poll_wait_event(struct waiter_context *waiter, int timeout_msec) - return err; - } - --static void poll_release(struct waiter_context *) -+static void poll_release(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - // Nothing to do because an instance of waiter has required data. - return; -diff --git a/axfer/waiter-select.c b/axfer/waiter-select.c -index 164c9c8..fe19776 100644 ---- a/axfer/waiter-select.c -+++ b/axfer/waiter-select.c -@@ -34,7 +34,7 @@ struct select_state { - fd_set rfds_ex; - }; - --static int select_prepare(struct waiter_context *) -+static int select_prepare(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - return 0; - } -@@ -94,7 +94,7 @@ static int select_wait_event(struct waiter_context *waiter, int timeout_msec) - return err; - } - --static void select_release(struct waiter_context *) -+static void select_release(struct waiter_context *waiter ATTRIBUTE_UNUSED) - { - return; - } -diff --git a/axfer/waiter.h b/axfer/waiter.h -index db18e33..0f4e9b9 100644 ---- a/axfer/waiter.h -+++ b/axfer/waiter.h -@@ -9,6 +9,7 @@ - #ifndef __ALSA_UTILS_AXFER_WAITER__H_ - #define __ALSA_UTILS_AXFER_WAITER__H_ - -+#include - #include - - enum waiter_type { -diff --git a/axfer/xfer-libasound-irq-rw.c b/axfer/xfer-libasound-irq-rw.c -index b7f0645..45fb6d5 100644 ---- a/axfer/xfer-libasound-irq-rw.c -+++ b/axfer/xfer-libasound-irq-rw.c -@@ -313,7 +313,7 @@ error: - } - - static int w_process_frames_nonblocking(struct libasound_state *state, -- snd_pcm_state_t, -+ snd_pcm_state_t pcm_state ATTRIBUTE_UNUSED, - unsigned int *frame_count, - struct mapper_context *mapper, - struct container_context *cntrs) -diff --git a/axfer/xfer-libasound.c b/axfer/xfer-libasound.c -index 9713533..36ee08d 100644 ---- a/axfer/xfer-libasound.c -+++ b/axfer/xfer-libasound.c -@@ -60,7 +60,7 @@ static const struct option l_opts[] = { - }; - - static int xfer_libasound_init(struct xfer_context *xfer, -- snd_pcm_stream_t) -+ snd_pcm_stream_t stream ATTRIBUTE_UNUSED) - { - struct libasound_state *state = xfer->private_data; - int err; -@@ -887,7 +887,7 @@ static void xfer_libasound_destroy(struct xfer_context *xfer) - state->log = NULL; - } - --static void xfer_libasound_help(struct xfer_context *) -+static void xfer_libasound_help(struct xfer_context *xfer ATTRIBUTE_UNUSED) - { - printf( - " [BASICS]\n" -diff --git a/axfer/xfer-options.c b/axfer/xfer-options.c -index 974570c..e716ded 100644 ---- a/axfer/xfer-options.c -+++ b/axfer/xfer-options.c -@@ -447,7 +447,8 @@ static int generate_path_with_suffix(struct xfer_context *xfer, - - static int generate_path_without_suffix(struct xfer_context *xfer, - const char *template, -- unsigned int index, const char *) -+ unsigned int index, -+ const char *suffix ATTRIBUTE_UNUSED) - { - static const char *const single_format = "%s"; - static const char *const multiple_format = "%s-%i"; --- -2.39.2 - diff --git a/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch b/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch deleted file mode 100644 index 12a098b6fb..0000000000 --- a/package/alsa-utils/0003-amidi-use-ATTRIBUTE_UNUSED-instead-remove-argument-n.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2db896afd475b0b3ad07e97ba74ec9680b4f7f6d Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:37:24 +0200 -Subject: [PATCH] amidi: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 1843540 ("amidi: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/2db896afd475b0b3ad07e97ba74ec9680b4f7f6d - -Signed-off-by: Bernd Kuhls ---- - amidi/amidi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/amidi/amidi.c b/amidi/amidi.c -index f930ca8..75fb8c0 100644 ---- a/amidi/amidi.c -+++ b/amidi/amidi.c -@@ -446,7 +446,7 @@ static void print_byte(unsigned char byte, struct timespec *ts) - printf("%02X", byte); - } - --static void sig_handler(int) -+static void sig_handler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } --- -2.39.2 - diff --git a/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch b/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch deleted file mode 100644 index 4720531415..0000000000 --- a/package/alsa-utils/0004-alsaloop-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7552aef6e08b5b1fd8c1704e21cb9f6f15017bfa Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:45:09 +0200 -Subject: [PATCH] alsaloop: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: d609a58 ("alsaloop: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/7552aef6e08b5b1fd8c1704e21cb9f6f15017bfa - -Signed-off-by: Bernd Kuhls ---- - alsaloop/alsaloop.c | 2 +- - alsaloop/pcmjob.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/alsaloop/alsaloop.c b/alsaloop/alsaloop.c -index b10733e..51fb646 100644 ---- a/alsaloop/alsaloop.c -+++ b/alsaloop/alsaloop.c -@@ -821,7 +821,7 @@ static void send_to_all(int sig) - } - } - --static void signal_handler(int) -+static void signal_handler(int sig ATTRIBUTE_UNUSED) - { - quit = 1; - send_to_all(SIGUSR2); -diff --git a/alsaloop/pcmjob.c b/alsaloop/pcmjob.c -index be71971..ffb439b 100644 ---- a/alsaloop/pcmjob.c -+++ b/alsaloop/pcmjob.c -@@ -625,7 +625,7 @@ static void buf_add_src(struct loopback *loop) - } - } - #else --static void buf_add_src(struct loopback *) -+static void buf_add_src(struct loopback *loop ATTRIBUTE_UNUSED) - { - } - #endif -@@ -1794,7 +1794,7 @@ static int ctl_event_check(snd_ctl_elem_value_t *val, snd_ctl_event_t *ev) - } - - static int handle_ctl_events(struct loopback_handle *lhandle, -- unsigned short) -+ unsigned short events ATTRIBUTE_UNUSED) - { - struct loopback *loop = lhandle->loopback; - snd_ctl_event_t *ev; --- -2.39.2 - diff --git a/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch b/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch deleted file mode 100644 index 1a42f24d3c..0000000000 --- a/package/alsa-utils/0005-bat-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 94eeb5a40f77e92624eb32d2e9c50b1cd9e4f837 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:49:03 +0200 -Subject: [PATCH] bat: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: b366875 ("bat: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/94eeb5a40f77e92624eb32d2e9c50b1cd9e4f837 - -Signed-off-by: Bernd Kuhls ---- - bat/bat.c | 3 ++- - bat/common.c | 3 ++- - bat/common.h | 5 +++++ - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/bat/bat.c b/bat/bat.c -index e88c65f..ea04ed9 100644 ---- a/bat/bat.c -+++ b/bat/bat.c -@@ -158,7 +158,8 @@ static void get_format(struct bat *bat, char *optarg) - } - } - --static inline int thread_wait_completion(struct bat *, pthread_t id, int **val) -+static inline int thread_wait_completion(struct bat *bat ATTRIBUTE_UNUSED, -+ pthread_t id, int **val) - { - int err; - -diff --git a/bat/common.c b/bat/common.c -index 9ff9405..470a7e6 100644 ---- a/bat/common.c -+++ b/bat/common.c -@@ -47,7 +47,8 @@ static int update_fmt_to_bat(struct bat *bat, struct chunk_fmt *fmt) - } - - /* calculate frames and update to bat */ --static int update_frames_to_bat(struct bat *bat, struct wav_chunk_header *header, FILE *) -+static int update_frames_to_bat(struct bat *bat, struct wav_chunk_header *header, -+ FILE *file ATTRIBUTE_UNUSED) - { - /* The number of analyzed captured frames is arbitrarily set to half of - the number of frames of the wav file or the number of frames of the -diff --git a/bat/common.h b/bat/common.h -index a9bae5d..bb51b0d 100644 ---- a/bat/common.h -+++ b/bat/common.h -@@ -13,6 +13,11 @@ - * - */ - -+#ifndef ATTRIBUTE_UNUSED -+/** do not print warning (gcc) when function parameter is not used */ -+#define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -+#endif -+ - #define TEMP_RECORD_FILE_NAME "/tmp/bat.wav.XXXXXX" - #define DEFAULT_DEV_NAME "default" - --- -2.39.2 - diff --git a/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch b/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch deleted file mode 100644 index 9e7e7da5ce..0000000000 --- a/package/alsa-utils/0006-seq-use-ATTRIBUTE_UNUSED-instead-remove-argument-nam.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 66112d60e4ce68720022eaf26080c0f1a2caf81f Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:52:46 +0200 -Subject: [PATCH] seq: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 181e190 ("aplaymidi: fix the verbose compilation warnings for latest gcc") -Fixes: a03377a ("aseqnet: fix the verbose compilation warnings for latest gcc") -Fixes: 429c32a ("aseqdump: fix the verbose compilation warnings for latest gcc") -Fixes: 0b48dd6 ("aconnect: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/66112d60e4ce68720022eaf26080c0f1a2caf81f - -Signed-off-by: Bernd Kuhls ---- - seq/aconnect/aconnect.c | 9 ++++++--- - seq/aplaymidi/arecordmidi.c | 2 +- - seq/aseqdump/aseqdump.c | 2 +- - seq/aseqnet/aseqnet.c | 2 +- - 4 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/seq/aconnect/aconnect.c b/seq/aconnect/aconnect.c -index 3a10de9..7096feb 100644 ---- a/seq/aconnect/aconnect.c -+++ b/seq/aconnect/aconnect.c -@@ -193,7 +193,8 @@ static void do_search_port(snd_seq_t *seq, int perm, action_func_t do_action) - } - - --static void print_port(snd_seq_t *, snd_seq_client_info_t *cinfo, -+static void print_port(snd_seq_t *seq ATTRIBUTE_UNUSED, -+ snd_seq_client_info_t *cinfo, - snd_seq_port_info_t *pinfo, int count) - { - if (! count) { -@@ -247,8 +248,10 @@ static void print_port_and_subs(snd_seq_t *seq, snd_seq_client_info_t *cinfo, - /* - * remove all (exported) connections - */ --static void remove_connection(snd_seq_t *seq, snd_seq_client_info_t *, -- snd_seq_port_info_t *pinfo, int) -+static void remove_connection(snd_seq_t *seq, -+ snd_seq_client_info_t *info ATTRIBUTE_UNUSED, -+ snd_seq_port_info_t *pinfo, -+ int count ATTRIBUTE_UNUSED) - { - snd_seq_query_subscribe_t *query; - snd_seq_port_info_t *port; -diff --git a/seq/aplaymidi/arecordmidi.c b/seq/aplaymidi/arecordmidi.c -index ce71472..a4c1181 100644 ---- a/seq/aplaymidi/arecordmidi.c -+++ b/seq/aplaymidi/arecordmidi.c -@@ -719,7 +719,7 @@ static void version(void) - fputs("arecordmidi version " SND_UTIL_VERSION_STR "\n", stderr); - } - --static void sighandler(int) -+static void sighandler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } -diff --git a/seq/aseqdump/aseqdump.c b/seq/aseqdump/aseqdump.c -index 8455ecb..af4ca21 100644 ---- a/seq/aseqdump/aseqdump.c -+++ b/seq/aseqdump/aseqdump.c -@@ -676,7 +676,7 @@ static void version(void) - puts("aseqdump version " SND_UTIL_VERSION_STR); - } - --static void sighandler(int) -+static void sighandler(int sig ATTRIBUTE_UNUSED) - { - stop = 1; - } -diff --git a/seq/aseqnet/aseqnet.c b/seq/aseqnet/aseqnet.c -index f40de7d..aa70b50 100644 ---- a/seq/aseqnet/aseqnet.c -+++ b/seq/aseqnet/aseqnet.c -@@ -334,7 +334,7 @@ static void get_net_addr(struct addrinfo *rp, char *buf, size_t buflen) - /* - * signal handler - */ --static void sigterm_exit(int) -+static void sigterm_exit(int sig ATTRIBUTE_UNUSED) - { - close_files(); - exit(1); --- -2.39.2 - diff --git a/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch b/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch deleted file mode 100644 index 66826c4515..0000000000 --- a/package/alsa-utils/0007-alsaucm-use-ATTRIBUTE_UNUSED-instead-remove-argument.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 9e5e9a6d70de63bea01f0669b01319952f2cfdea Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 16:57:47 +0200 -Subject: [PATCH] alsaucm: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: d7bbc26 ("alsaucm: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/9e5e9a6d70de63bea01f0669b01319952f2cfdea - -Signed-off-by: Bernd Kuhls ---- - alsaucm/dump.c | 22 ++++++++++++---------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -diff --git a/alsaucm/dump.c b/alsaucm/dump.c -index 102ac4d..a5c57f2 100644 ---- a/alsaucm/dump.c -+++ b/alsaucm/dump.c -@@ -93,7 +93,8 @@ static char *tesc(const char *s, char *buf, size_t buf_len) - - #define ESC(s, esc) tesc((s), (esc), sizeof(esc)) - --static int text_verb_start(struct renderer *, const char *verb, const char *comment) -+static int text_verb_start(struct renderer *r ATTRIBUTE_UNUSED, -+ const char *verb, const char *comment) - { - char buf1[128], buf2[128]; - printf("Verb.%s {\n", ESC(verb, buf1)); -@@ -102,13 +103,13 @@ static int text_verb_start(struct renderer *, const char *verb, const char *comm - return 0; - } - --static int text_verb_end(struct renderer *) -+static int text_verb_end(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("}\n"); - return 0; - } - --static int text_2nd_level_begin(struct renderer *, -+static int text_2nd_level_begin(struct renderer *r ATTRIBUTE_UNUSED, - const char *key, - const char *val, - const char *comment) -@@ -120,19 +121,19 @@ static int text_2nd_level_begin(struct renderer *, - return 0; - } - --static int text_2nd_level_end(struct renderer *) -+static int text_2nd_level_end(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("\t}\n"); - return 0; - } - --static int text_2nd_level(struct renderer *, const char *txt) -+static int text_2nd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf("\t\t%s", txt); - return 0; - } - --static int text_3rd_level(struct renderer *, const char *txt) -+static int text_3rd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf("\t\t\t%s", txt); - return 0; -@@ -266,7 +267,7 @@ static void json_block(struct renderer *r, int level, int last) - j->block[level] = last ? 0 : 1; - } - --static int json_init(struct renderer *) -+static int json_init(struct renderer *r ATTRIBUTE_UNUSED) - { - printf("{\n \"Verbs\": {"); - return 0; -@@ -325,13 +326,13 @@ static int json_2nd_level_end(struct renderer *r) - return 0; - } - --static int json_2nd_level(struct renderer *, const char *txt) -+static int json_2nd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf(" %s", txt); - return 0; - } - --static int json_3rd_level(struct renderer *, const char *txt) -+static int json_3rd_level(struct renderer *r ATTRIBUTE_UNUSED, const char *txt) - { - printf(" %s", txt); - return 0; -@@ -360,7 +361,8 @@ static int json_supcon_start(struct renderer *r, const char *key) - return 0; - } - --static int json_supcon_value(struct renderer *r, const char *value, int) -+static int json_supcon_value(struct renderer *r, const char *value, -+ int last ATTRIBUTE_UNUSED) - { - char buf[256]; - JESC(value, buf); --- -2.39.2 - diff --git a/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch b/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch deleted file mode 100644 index 07b10b3ab8..0000000000 --- a/package/alsa-utils/0008-topology-use-ATTRIBUTE_UNUSED-instead-remove-argumen.patch +++ /dev/null @@ -1,312 +0,0 @@ -From dfe1c7143ab6ea01789e276b1ba361a00e545997 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 4 Sep 2023 17:11:05 +0200 -Subject: [PATCH] topology: use ATTRIBUTE_UNUSED instead remove argument name - -We need to support older compilers than GCC 11. - -Link: https://github.com/alsa-project/alsa-utils/issues/233 -Fixes: 153d185 ("topology: fix the verbose compilation warnings for latest gcc") -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/dfe1c7143ab6ea01789e276b1ba361a00e545997 - -Signed-off-by: Bernd Kuhls ---- - topology/nhlt/intel/dmic-nhlt.c | 3 ++- - topology/nhlt/intel/dmic/dmic-debug.c | 7 ++++--- - topology/nhlt/intel/ssp/ssp-debug.c | 5 +++-- - topology/nhlt/intel/ssp/ssp-process.c | 4 +++- - topology/nhlt/nhlt-processor.c | 7 +++++-- - topology/pre-process-class.c | 10 +++++----- - topology/pre-process-object.c | 21 +++++++++++---------- - topology/pre-processor.c | 10 ++++++---- - 8 files changed, 39 insertions(+), 28 deletions(-) - -diff --git a/topology/nhlt/intel/dmic-nhlt.c b/topology/nhlt/intel/dmic-nhlt.c -index 70a22e3..de659cf 100644 ---- a/topology/nhlt/intel/dmic-nhlt.c -+++ b/topology/nhlt/intel/dmic-nhlt.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -155,7 +156,7 @@ static int set_vendor_mic_data(struct intel_nhlt_params *nhlt, snd_config_t *cfg - horizontal_angle_end); - } - --static int set_bytes_data(struct intel_nhlt_params *, snd_config_t *cfg) -+static int set_bytes_data(struct intel_nhlt_params *nhlt ATTRIBUTE_UNUSED, snd_config_t *cfg) - { - snd_config_iterator_t i, next; - snd_config_t *n; -diff --git a/topology/nhlt/intel/dmic/dmic-debug.c b/topology/nhlt/intel/dmic/dmic-debug.c -index f99d308..a977c93 100644 ---- a/topology/nhlt/intel/dmic/dmic-debug.c -+++ b/topology/nhlt/intel/dmic/dmic-debug.c -@@ -8,6 +8,7 @@ - #include "aconfig.h" - #include - #include -+#include - #include "dmic-debug.h" - - #ifdef NHLT_DEBUG -@@ -181,7 +182,7 @@ void dmic_print_internal(struct intel_dmic_params *dmic) - } - - #else /* NHLT_DEBUG */ --void dmic_print_bytes_as_hex(uint8_t *, size_t) {} --void dmic_print_integers_as_hex(uint32_t *, size_t) {} --void dmic_print_internal(struct intel_dmic_params *) {} -+void dmic_print_bytes_as_hex(uint8_t *src ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED) {} -+void dmic_print_integers_as_hex(uint32_t *src ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED) {} -+void dmic_print_internal(struct intel_dmic_params *dmic ATTRIBUTE_UNUSED) {} - #endif -diff --git a/topology/nhlt/intel/ssp/ssp-debug.c b/topology/nhlt/intel/ssp/ssp-debug.c -index 8c64675..2d2f6b0 100644 ---- a/topology/nhlt/intel/ssp/ssp-debug.c -+++ b/topology/nhlt/intel/ssp/ssp-debug.c -@@ -7,6 +7,7 @@ - #include "aconfig.h" - #include - #include -+#include - #include "ssp-debug.h" - #include "../intel-nhlt.h" - -@@ -252,6 +253,6 @@ void ssp_print_internal(struct intel_ssp_params *ssp) - } - - #else /* NHLT_DEBUG */ --void ssp_print_internal(struct intel_ssp_params *) {} --void ssp_print_calculated(struct intel_ssp_params *) {} -+void ssp_print_internal(struct intel_ssp_params *ssp ATTRIBUTE_UNUSED) {} -+void ssp_print_calculated(struct intel_ssp_params *ssp ATTRIBUTE_UNUSED) {} - #endif -diff --git a/topology/nhlt/intel/ssp/ssp-process.c b/topology/nhlt/intel/ssp/ssp-process.c -index 9cda5c3..17b88d2 100644 ---- a/topology/nhlt/intel/ssp/ssp-process.c -+++ b/topology/nhlt/intel/ssp/ssp-process.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -952,7 +953,8 @@ int ssp_set_params(struct intel_nhlt_params *nhlt, const char *dir, int dai_inde - return 0; - } - --int ssp_hw_set_params(struct intel_nhlt_params *nhlt, const char *format, const char *, -+int ssp_hw_set_params(struct intel_nhlt_params *nhlt, const char *format, -+ const char *mclk ATTRIBUTE_UNUSED, - const char *bclk, const char *bclk_invert, const char *fsync, - const char *fsync_invert, int mclk_freq, int bclk_freq, int fsync_freq, - int tdm_slots, int tdm_slot_width, int tx_slots, int rx_slots) -diff --git a/topology/nhlt/nhlt-processor.c b/topology/nhlt/nhlt-processor.c -index 567fa5c..ca539c3 100644 ---- a/topology/nhlt/nhlt-processor.c -+++ b/topology/nhlt/nhlt-processor.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -87,7 +88,8 @@ static void debug_print_nhlt(struct nhlt *blob, struct endpoint_descriptor **eps - fprintf(stdout, "\n"); - } - #else --static void debug_print_nhlt(struct nhlt *, struct endpoint_descriptor **) {} -+static void debug_print_nhlt(struct nhlt *blob ATTRIBUTE_UNUSED, -+ struct endpoint_descriptor **eps ATTRIBUTE_UNUSED) {} - #endif - - static int print_as_hex_bytes(uint8_t *manifest_buffer, uint32_t manifest_size, -@@ -313,7 +315,8 @@ static int nhlt_get_flat_buffer(struct nhlt *blob, struct endpoint_descriptor ** - } - - /* called at the end of topology pre-processing, create flat buffer from variable size nhlt */ --static int nhlt_create(struct intel_nhlt_params *nhlt, snd_config_t *input, snd_config_t *, -+static int nhlt_create(struct intel_nhlt_params *nhlt, snd_config_t *input, -+ snd_config_t *output ATTRIBUTE_UNUSED, - uint8_t **nhlt_buffer, uint32_t *nhlt_size) - { - struct endpoint_descriptor *eps[MAX_ENDPOINT_COUNT]; -diff --git a/topology/pre-process-class.c b/topology/pre-process-class.c -index d883d05..bedcebe 100644 ---- a/topology/pre-process-class.c -+++ b/topology/pre-process-class.c -@@ -127,7 +127,7 @@ snd_config_t *tplg_class_lookup(struct tplg_pre_processor *tplg_pp, snd_config_t - } - - /* find the attribute config by name in the class definition */ --snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *, -+snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *tplg_p ATTRIBUTE_UNUSED, - snd_config_t *class, const char *name) - { - snd_config_t *attr = NULL; -@@ -152,7 +152,7 @@ snd_config_t *tplg_class_find_attribute_by_name(struct tplg_pre_processor *, - } - - /* get the name of the attribute that must have a unique value in the object instance */ --const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *, -+const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class) - { - snd_config_t *unique; -@@ -177,7 +177,7 @@ const char *tplg_class_get_unique_attribute_name(struct tplg_pre_processor *, - } - - /* get attribute type from the definition */ --snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *, -+snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *attr) - { - snd_config_t *type; -@@ -208,7 +208,7 @@ snd_config_type_t tplg_class_get_attribute_type(struct tplg_pre_processor *, - } - - /* get token_ref for attribute with name attr_name in the class */ --const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *, -+const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, const char *attr_name) - { - snd_config_t *attributes, *attr, *token_ref; -@@ -235,7 +235,7 @@ const char *tplg_class_get_attribute_token_ref(struct tplg_pre_processor *, - } - - /* convert a valid attribute string value to the corresponding tuple value */ --long tplg_class_attribute_valid_tuple_value(struct tplg_pre_processor *, -+long tplg_class_attribute_valid_tuple_value(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, snd_config_t *attr) - { - -diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c -index 48555e7..61cc85f 100644 ---- a/topology/pre-process-object.c -+++ b/topology/pre-process-object.c -@@ -31,7 +31,8 @@ - - /* Parse VendorToken object, create the "SectionVendorToken" and save it */ - int tplg_build_vendor_token_object(struct tplg_pre_processor *tplg_pp, -- snd_config_t *obj_cfg, snd_config_t *) -+ snd_config_t *obj_cfg, -+ snd_config_t *parent ATTRIBUTE_UNUSED) - { - snd_config_iterator_t i, next; - snd_config_t *vtop, *n, *obj; -@@ -196,7 +197,7 @@ int tplg_build_data_object(struct tplg_pre_processor *tplg_pp, snd_config_t *obj - return tplg_parent_update(tplg_pp, parent, "data", name); - } - --static int tplg_create_config_template(struct tplg_pre_processor *, -+static int tplg_create_config_template(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t **template, - const struct config_template_items *items) - { -@@ -499,7 +500,7 @@ min_max_check: - } - - /* get object's name attribute value */ --const char *tplg_object_get_name(struct tplg_pre_processor *, -+const char *tplg_object_get_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *object) - { - snd_config_t *cfg; -@@ -518,7 +519,7 @@ const char *tplg_object_get_name(struct tplg_pre_processor *, - } - - /* look up the instance of object in a config */ --static snd_config_t *tplg_object_lookup_in_config(struct tplg_pre_processor *, -+static snd_config_t *tplg_object_lookup_in_config(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class, const char *type, - const char *class_name, const char *id) - { -@@ -977,7 +978,7 @@ template: - } - - static int tplg_build_generic_object(struct tplg_pre_processor *tplg_pp, snd_config_t *obj_cfg, -- snd_config_t *) -+ snd_config_t *parent ATTRIBUTE_UNUSED) - { - snd_config_t *wtop; - const char *name; -@@ -1090,7 +1091,7 @@ const struct build_function_map object_build_map[] = { - NULL, &pcm_caps_config}, - }; - --static const struct build_function_map *tplg_object_get_map(struct tplg_pre_processor *, -+static const struct build_function_map *tplg_object_get_map(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *obj) - { - snd_config_iterator_t first; -@@ -1145,7 +1146,7 @@ snd_config_t *tplg_object_get_section(struct tplg_pre_processor *tplg_pp, snd_co - } - - /* return 1 if attribute not found in search_config, 0 on success and negative value on error */ --static int tplg_object_copy_and_add_param(struct tplg_pre_processor *, -+static int tplg_object_copy_and_add_param(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *obj, - snd_config_t *attr_cfg, - snd_config_t *search_config) -@@ -1351,8 +1352,8 @@ static int tplg_object_pre_process_children(struct tplg_pre_processor *tplg_pp, - return 0; - } - --static int tplg_construct_object_name(struct tplg_pre_processor *, snd_config_t *obj, -- snd_config_t *class_cfg) -+static int tplg_construct_object_name(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ snd_config_t *obj, snd_config_t *class_cfg) - { - snd_config_iterator_t i, next; - snd_config_t *args, *n; -@@ -1547,7 +1548,7 @@ static int tplg_object_set_unique_attribute(struct tplg_pre_processor *tplg_pp, - * Helper function to get object instance config which is 2 nodes down from class_type config. - * ex: Get the pointer to the config node with ID "0" from the input config Widget.pga.0 {} - */ --snd_config_t *tplg_object_get_instance_config(struct tplg_pre_processor *, -+snd_config_t *tplg_object_get_instance_config(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, - snd_config_t *class_type) - { - snd_config_iterator_t first; -diff --git a/topology/pre-processor.c b/topology/pre-processor.c -index 3903dee..01f8a5d 100644 ---- a/topology/pre-processor.c -+++ b/topology/pre-processor.c -@@ -231,8 +231,9 @@ void tplg_pp_config_debug(struct tplg_pre_processor *tplg_pp, snd_config_t *cfg) - snd_config_save(cfg, tplg_pp->dbg_output); - } - #else --void tplg_pp_debug(char *, ...) {} --void tplg_pp_config_debug(struct tplg_pre_processor *, snd_config_t *){} -+void tplg_pp_debug(char *fmt ATTRIBUTE_UNUSED, ...) {} -+void tplg_pp_config_debug(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ snd_config_t *cfg ATTRIBUTE_UNUSED) {} - #endif - - static int pre_process_config(struct tplg_pre_processor *tplg_pp, snd_config_t *cfg) -@@ -640,8 +641,9 @@ static int pre_process_includes_all(struct tplg_pre_processor *tplg_pp, snd_conf - } - - /* duplicate the existing objects in src into dest and update with new attribute */ --static int pre_process_add_objects(struct tplg_pre_processor *, int *object_count, -- snd_config_t *src, snd_config_t *dest, snd_config_t *attr_cfg) -+static int pre_process_add_objects(struct tplg_pre_processor *tplg_pp ATTRIBUTE_UNUSED, -+ int *object_count, snd_config_t *src, -+ snd_config_t *dest, snd_config_t *attr_cfg) - { - snd_config_iterator_t i, next; - int ret; --- -2.39.2 - diff --git a/package/alsa-utils/0009-topology-include-locale.h.patch b/package/alsa-utils/0009-topology-include-locale.h.patch deleted file mode 100644 index 14a059cbf6..0000000000 --- a/package/alsa-utils/0009-topology-include-locale.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8c229270f6bae83b705a03714c46067a7aa57b02 Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Tue, 19 Sep 2023 13:14:29 +0200 -Subject: [PATCH] topology: include locale.h - -This solves an issue compiling with the musl libc. - -Fixes: https://github.com/alsa-project/alsa-utils/issues/239 -Signed-off-by: Michael Opdenacker -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/8c229270f6bae83b705a03714c46067a7aa57b02 - -Signed-off-by: Bernd Kuhls ---- - topology/topology.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/topology/topology.c b/topology/topology.c -index 1840ffe..5d03a8b 100644 ---- a/topology/topology.c -+++ b/topology/topology.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.39.2 - diff --git a/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch b/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch deleted file mode 100644 index b5f8489703..0000000000 --- a/package/alsa-utils/0010-nhlt-dmic-info.c-include-sys-types.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3 Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Tue, 19 Sep 2023 13:14:30 +0200 -Subject: [PATCH] nhlt-dmic-info.c: include sys/types.h - -This fixes an issue compiling with the musl libc. - -Fixes: https://github.com/alsa-project/alsa-utils/issues/238 -Signed-off-by: Michael Opdenacker -Signed-off-by: Jaroslav Kysela - -Upstream: https://github.com/alsa-project/alsa-utils/commit/0925ad7f09b2dc77015784f9ac2f5e34dd0dd5c3 - -Signed-off-by: Bernd Kuhls ---- - nhlt/nhlt-dmic-info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/nhlt/nhlt-dmic-info.c b/nhlt/nhlt-dmic-info.c -index 3f6c64d..331555a 100644 ---- a/nhlt/nhlt-dmic-info.c -+++ b/nhlt/nhlt-dmic-info.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - - int debug = 0; --- -2.39.2 - diff --git a/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch b/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch deleted file mode 100644 index 66cf051733..0000000000 --- a/package/alsa-utils/0011-configure.ac-fix-UMP-support-detection.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8a0da6d4484cd2ca4f1939a6c44941e070db2147 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 13 Oct 2023 20:32:32 +0200 -Subject: [PATCH] configure.ac: fix UMP support detection - -https://github.com/alsa-project/alsa-utils/commit/b399fb85a919636b7da34e8bcf17f484dd9046f7 -added usage of alsa/ump_msg.h without checking whether alsa-lib was -compiled with rawmidi support: -https://github.com/alsa-project/alsa-lib/blob/master/include/Makefile.am#L37 - -Fixes a build error when alsa-lib was compiled with --disable-rawmidi - -aplaymidi.c:34:10: fatal error: alsa/ump_msg.h: No such file or directory - 34 | #include - -Upstream: https://github.com/alsa-project/alsa-utils/pull/240 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index beb4963..4217741 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,7 +55,7 @@ if test "$HAVE_SEQ_CLIENT_INFO_GET_PID" = "yes" ; then - AC_DEFINE([HAVE_SEQ_CLIENT_INFO_GET_PID], 1, [alsa-lib supports snd_seq_client_info_get_pid]) - fi - AC_CHECK_LIB([asound], [snd_seq_client_info_get_midi_version], [HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION="yes"]) --if test "$HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION" = "yes" ; then -+if test "$HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION" = "yes" -a "$have_rawmidi" = "yes"; then - AC_DEFINE([HAVE_SEQ_CLIENT_INFO_GET_MIDI_VERSION], 1, [alsa-lib supports snd_seq_client_info_get_midi_version]) - fi - AC_CHECK_LIB([atopology], [snd_tplg_save], [have_topology="yes"], [have_topology="no"]) --- -2.39.2 - diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index 0ace406286..bf98f578cd 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 104b62ec7f02a7ce16ca779f4815616df1cc21933503783a9107b5944f83063a alsa-utils-1.2.10.tar.bz2 +sha256 9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7 alsa-utils-1.2.11.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 6f6021400e..3ece7ddca4 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.10 +ALSA_UTILS_VERSION = 1.2.11 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils ALSA_UTILS_LICENSE = GPL-2.0 From yann.morin.1998 at free.fr Sun Feb 11 21:30:29 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:30:29 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-cython: bump to version 3.0.8 In-Reply-To: <20240209175631.1337370-2-james.hilliard1@gmail.com> References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <20240209175631.1337370-2-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > License hash changed due to changing links from http to https: > https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 Thanks for the simple and sufficient explanation. ? > Signed-off-by: James Hilliard > --- [--SNIP--] > diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk > index 47e105c065..d76bfb766d 100644 > --- a/package/python-cython/python-cython.mk > +++ b/package/python-cython/python-cython.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_CYTHON_VERSION = 0.29.36 > +PYTHON_CYTHON_VERSION = 3.0.8 Given there was an earlier discussion about how the cython bump was causing some issues with various packages, I would have expected at least a post-commit summarising what tests were done to ensure the bump was OK. Also, as those same discussions hinted at, cython 0.29 seems to still be in active development (or at least active maintenance), so the commit log should have also explained why it was decided to go with a full bump to 3.0.x rather than intriducing a cython3 package and installing both in parallel. Or that it was not possiblr to do so becaus they can't be installed in parallel. Could you respin this series, fixing the check-package issues in patch 1, and extending the commit log pqtch 2 to better assess the situation, please? Regards, Yann E. MORIN. > PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz > -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 > +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 > PYTHON_CYTHON_SETUP_TYPE = setuptools > PYTHON_CYTHON_LICENSE = Apache-2.0 > PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 21:31:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:31:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpng: bump version to 1.6.42 In-Reply-To: <20240211163116.2318321-1-bernd@kuhls.net> References: <20240211163116.2318321-1-bernd@kuhls.net> Message-ID: <20240211223133.3d6c3247@windsurf> On Sun, 11 Feb 2024 17:31:16 +0100 Bernd Kuhls wrote: > Release notes: > https://raw.githubusercontent.com/pnggroup/libpng/v1.6.42/ANNOUNCE > > Removed patch which disabled pngfix and png-fix-itxt tools and use the > new upstream-provided configure option --disable-tools instead: > https://github.com/pnggroup/libpng/commit/22ad62c25e7355b20d1486da301cb69159db0915 > https://github.com/pnggroup/libpng/commit/71475b064f3e628e55a2f89f55e873945650afe9 > > Updated license hash due to copyright year bump: > https://github.com/pnggroup/libpng/commit/0dfe422e9f872d3a851d52fc45047bdfd6da0cf4 > > Signed-off-by: Bernd Kuhls > --- > ...0001-Disable-pngfix-and-png-fix-itxt.patch | 47 ------------------- > package/libpng/libpng.hash | 6 +-- > package/libpng/libpng.mk | 3 +- > 3 files changed, 5 insertions(+), 51 deletions(-) > delete mode 100644 package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:30:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:30:33 +0100 Subject: [Buildroot] [git commit] package/libpng: bump version to 1.6.42 Message-ID: <20240211213233.06FA887791@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=632d8f25b7a36708cddf9628dfaa92d84acc5151 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://raw.githubusercontent.com/pnggroup/libpng/v1.6.42/ANNOUNCE Removed patch which disabled pngfix and png-fix-itxt tools and use the new upstream-provided configure option --disable-tools instead: https://github.com/pnggroup/libpng/commit/22ad62c25e7355b20d1486da301cb69159db0915 https://github.com/pnggroup/libpng/commit/71475b064f3e628e55a2f89f55e873945650afe9 Updated license hash due to copyright year bump: https://github.com/pnggroup/libpng/commit/0dfe422e9f872d3a851d52fc45047bdfd6da0cf4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - .../0001-Disable-pngfix-and-png-fix-itxt.patch | 47 ---------------------- package/libpng/libpng.hash | 6 +-- package/libpng/libpng.mk | 3 +- 4 files changed, 5 insertions(+), 52 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index d099fd3761..5948492d07 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -676,7 +676,6 @@ package/liboping/0004-Fix-compile-error-on-GCC-7.patch Upstream package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch Upstream package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch Upstream package/libplatform/0001-cmake-require-c-11-as-the-minimum-standard.patch Upstream -package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch Upstream package/libpthsem/0001-fix-build-on-linux-3.x-host.patch Upstream package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch Upstream package/libroxml/0001-src-roxml_mem.h-add-missing-extern.patch Upstream diff --git a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch deleted file mode 100644 index d16bdb2b11..0000000000 --- a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 60c3ee917c8e7a4760b1ef7c3dc2b44a615150d3 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 26 May 2016 16:26:18 -0300 -Subject: [PATCH] Disable pngfix and png-fix-itxt - -Disable the new pngfix and png-fix-itxt tools: they take up space, fail -to build on some oddball toolchain configurations and aren't -expected/needed in a non-interactive embedded system. - -[Julien: update for 1.6.25] -Signed-off-by: Julien Boibessot - -Signed-off-by: Gustavo Zacarias ---- - Makefile.am | 2 +- - Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 7212951..3430dca 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,7 +18,7 @@ check_PROGRAMS += timepng - endif - - # Utilities - installed --bin_PROGRAMS= pngfix png-fix-itxt -+bin_PROGRAMS= - - # This ensures that pnglibconf.h gets built at the start of 'make all' or - # 'make check', but it does not add dependencies to the individual programs, -diff --git a/Makefile.in b/Makefile.in -index a66f6aa..4e67782 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -104,7 +104,7 @@ check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \ - pngstest$(EXEEXT) pngvalid$(EXEEXT) pngimage$(EXEEXT) \ - pngcp$(EXEEXT) $(am__EXEEXT_1) - @HAVE_CLOCK_GETTIME_TRUE at am__append_1 = timepng --bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT) -+bin_PROGRAMS = - @PNG_ARM_NEON_TRUE at am__append_2 = arm/arm_init.c\ - @PNG_ARM_NEON_TRUE@ arm/filter_neon.S arm/filter_neon_intrinsics.c \ - @PNG_ARM_NEON_TRUE@ arm/palette_neon_intrinsics.c --- -2.7.3 - diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index d864850b06..fbae14c51d 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/png-mng/mailman/message/37860896/ -sha256 535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1 libpng-1.6.40.tar.xz +# From https://sourceforge.net/p/png-mng/mailman/message/58731120/ +sha256 c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450 libpng-1.6.42.tar.xz # Locally computed: -sha256 5c0bb4b05b1354ae7c173532b6702ea68b611047ff9b91c4d3af77da39c195d9 LICENSE +sha256 7317e078e2d3b5d7ba5a6159e650945153262b44b76f6700f8e9edb261c5143e LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index b7bacd9217..c4da9f89c7 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.40 +LIBPNG_VERSION = 1.6.42 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) @@ -15,6 +15,7 @@ LIBPNG_INSTALL_STAGING = YES LIBPNG_DEPENDENCIES = host-pkgconf zlib HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config +LIBPNG_CONF_OPTS = --disable-tools ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) LIBPNG_CONF_OPTS += --enable-arm-neon From thomas.petazzoni at bootlin.com Sun Feb 11 21:33:45 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:33:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/cracklib: python needs autoreconf In-Reply-To: <20240211170707.524645-1-fontaine.fabrice@gmail.com> References: <20240211170707.524645-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223345.2298964c@windsurf> On Sun, 11 Feb 2024 18:07:07 +0100 Fabrice Fontaine wrote: > Set CRACKLIB_AUTORECONF when building python to regenerate > python/test/Makefile and avoid the following build failure with python > 3.12 (which removed imp mpodule) raised since commit > 36e635d2d5c0166476858aa239ccbe78e8f2af14: > > Traceback (most recent call last): > File "", line 2, in > ModuleNotFoundError: No module named 'imp' > make[3]: *** [Makefile:485: install-pythonPYTHON] Error 1 > > Fixes: > - http://autobuild.buildroot.org/results/aec4c19fdf8087c76c1d5f472e855e0f84fcf7fd Thanks for the fix. Could you describe a bit how an autoreconf helps in resolving this? Is it because the new Python comes with a newer set of .m4 macros? Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:34:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:34:19 +0100 Subject: [Buildroot] [git commit] package/libpwquality: fix build with python 3.12 Message-ID: <20240211213440.9EF6A87797@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1662a165c6d9762c4e77743ea930dcfa3ffd4cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Switch from distutils to setuptools to avoid the following build failure raised since bump of python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14: Traceback (most recent call last): File "/home/fabrice/buildroot/output/build/libpwquality-1.4.5/python/setup.py", line 9, in from distutils.core import setup, Extension ModuleNotFoundError: No module named 'distutils' Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Use-setuptools-instead-of-distutils.patch | 78 ++++++++++++++++++++++ package/libpwquality/libpwquality.mk | 6 +- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch b/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 0000000000..4d4e4c8f54 --- /dev/null +++ b/package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,78 @@ +From 7b5e0f0097faebdcc6a8b783237bbba7a983147a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Fri, 31 Mar 2023 14:52:19 +0200 +Subject: [PATCH] Use setuptools instead of distutils + +distutils is removed from Python 3.12+: +https://peps.python.org/pep-0632/ + +Upstream: https://github.com/libpwquality/libpwquality/commit/7b5e0f0097faebdcc6a8b783237bbba7a983147a +Signed-off-by: Fabrice Fontaine +--- + libpwquality.spec.in | 11 ++--------- + python/Makefile.am | 2 +- + python/setup.py.in | 6 +++--- + 3 files changed, 6 insertions(+), 13 deletions(-) + +diff --git a/libpwquality.spec.in b/libpwquality.spec.in +index 70a6f53..0809126 100644 +--- a/libpwquality.spec.in ++++ b/libpwquality.spec.in +@@ -33,9 +33,11 @@ BuildRequires: gettext + BuildRequires: pam-devel + %if %{with python2} + BuildRequires: python2-devel ++BuildRequires: python2-setuptools + %endif + %if %{with python3} + BuildRequires: python3-devel ++BuildRequires: python3-setuptools + %endif + + URL: https://github.com/libpwquality/libpwquality/ +@@ -103,15 +105,6 @@ cp -a . %{py3dir} + pushd %{py3dir} + %endif + %if %{with python3} +-# setuptools >= 60 changes the environment to use its bundled copy of distutils +-# by default, not the Python-bundled one. To run the Python's standard library +-# distutils, the environment variable must be set. +-# Although technically setuptools is not needed for this package, if it's +-# pulled by another package, it changes the environment and consequently, +-# the build fails. This was reported in: +-# https://github.com/pypa/setuptools/issues/3143 +-export SETUPTOOLS_USE_DISTUTILS=stdlib +- + %configure \ + --with-securedir=%{_moduledir} \ + --with-pythonsitedir=%{python3_sitearch} \ +diff --git a/python/Makefile.am b/python/Makefile.am +index 1d00c0c..6e51744 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --root ${DESTDIR} --prefix=${prefix} + + clean-local: + rm -rf py$(PYTHONREV) +diff --git a/python/setup.py.in b/python/setup.py.in +index a741b91..f934c50 100755 +--- a/python/setup.py.in ++++ b/python/setup.py.in +@@ -6,9 +6,9 @@ + + import os + +-from distutils.core import setup, Extension +-from distutils.command.build_ext import build_ext as _build_ext +-from distutils.command.sdist import sdist as _sdist ++from setuptools import setup, Extension ++from setuptools.command.build_ext import build_ext as _build_ext ++from setuptools.command.sdist import sdist as _sdist + + def genconstants(headerfile, outputfile): + hf = open(headerfile, 'r') diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index ae6babbcae..f12e583b2d 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -11,11 +11,13 @@ LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ LIBPWQUALITY_INSTALL_STAGING = YES LIBPWQUALITY_DEPENDENCIES = cracklib LIBPWQUALITY_LICENSE_FILES = COPYING +# We're patching python/Makefile.am +LIBPWQUALITY_AUTORECONF = YES ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBPWQUALITY_CONF_OPTS += --enable-python-bindings -LIBPWQUALITY_DEPENDENCIES += python3 -LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +LIBPWQUALITY_DEPENDENCIES += python3 host-python-setuptools +LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) else LIBPWQUALITY_CONF_OPTS += --disable-python-bindings endif From thomas.petazzoni at bootlin.com Sun Feb 11 21:34:39 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:34:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpwquality: fix build with python 3.12 In-Reply-To: <20240211172756.704681-1-fontaine.fabrice@gmail.com> References: <20240211172756.704681-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223439.01ab2bb7@windsurf> On Sun, 11 Feb 2024 18:27:56 +0100 Fabrice Fontaine wrote: > Switch from distutils to setuptools to avoid the following build failure > raised since bump of python to version 3.12.1 in commit > 36e635d2d5c0166476858aa239ccbe78e8f2af14: > > Traceback (most recent call last): > File "/home/fabrice/buildroot/output/build/libpwquality-1.4.5/python/setup.py", line 9, in > from distutils.core import setup, Extension > ModuleNotFoundError: No module named 'distutils' > > Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 > No autobuilder failures (yet) > > Signed-off-by: Fabrice Fontaine > --- > ...-Use-setuptools-instead-of-distutils.patch | 78 +++++++++++++++++++ > package/libpwquality/libpwquality.mk | 6 +- > 2 files changed, 82 insertions(+), 2 deletions(-) > create mode 100644 package/libpwquality/0001-Use-setuptools-instead-of-distutils.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:34:55 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:34:55 +0100 Subject: [Buildroot] [git commit] package/{mesa3d, mesa3d-headers}: bump version to 24.0.0 Message-ID: <20240211213616.F06BA877A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ad8608df6b95737eb9a93e7335ab714fee45ae1c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html https://cgit.freedesktop.org/mesa/mesa/tree/docs/relnotes/24.0.0.rst?h=24.0 Removed patch which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...e_file_description-fix-unknown-linux-3.5-.patch | 68 ---------------------- package/mesa3d/mesa3d.hash | 6 +- package/mesa3d/mesa3d.mk | 2 +- 4 files changed, 5 insertions(+), 73 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index b9b328b268..1d006dbc91 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 23.3.5 +MESA3D_HEADERS_VERSION = 24.0.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch b/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch deleted file mode 100644 index c011580f6b..0000000000 --- a/package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b60974fac8a2f4c85cbb2ca788fc4ec3e81998f9 Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Tue, 17 Aug 2021 11:54:49 +0200 -Subject: [PATCH] util: os_same_file_description: fix unknown linux < 3.5 - syscall SYS_kcmp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -https://man7.org/linux/man-pages/man2/kcmp.2.html - -The kcmp() system call first appeared in Linux 3.5. - -But was probably also not supported by all major platforms -at that time. So fallback to the check that is done for windows. - -Signed-off-by: Thomas Devoogdt -Acked-by: Yonggang Luo -Acked-by: Michel D??nzer -Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/3ef514982441ce496aa127611edd26b9867f4b95 -Signed-off-by: Thomas Devoogdt ---- - src/util/os_file.c | 18 ++++++------------ - 1 file changed, 6 insertions(+), 12 deletions(-) - -diff --git a/src/util/os_file.c b/src/util/os_file.c -index 5fb30f2d908..464425a9b87 100644 ---- a/src/util/os_file.c -+++ b/src/util/os_file.c -@@ -202,29 +202,23 @@ os_read_file(const char *filename, size_t *size) - /* copied from */ - #define KCMP_FILE 0 - -+#endif -+ - int - os_same_file_description(int fd1, int fd2) - { -+#ifdef SYS_kcmp - pid_t pid = getpid(); -+#endif - - /* Same file descriptor trivially implies same file description */ - if (fd1 == fd2) - return 0; - -+#ifdef SYS_kcmp - return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2); --} -- - #else -- --int --os_same_file_description(int fd1, int fd2) --{ -- /* Same file descriptor trivially implies same file description */ -- if (fd1 == fd2) -- return 0; -- - /* Otherwise we can't tell */ - return -1; --} -- - #endif -+} --- -2.34.1 - diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 7e49119c41..49b42e2132 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html -sha256 69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f mesa-23.3.5.tar.xz -sha512 1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea mesa-23.3.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html +sha256 dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 mesa-24.0.0.tar.xz +sha512 9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15 mesa-24.0.0.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index d622d513f0..8e3cd7245d 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 23.3.5 +MESA3D_VERSION = 24.0.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From thomas.petazzoni at bootlin.com Sun Feb 11 21:36:18 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:36:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 24.0.0 In-Reply-To: <20240211173323.2755976-1-bernd@kuhls.net> References: <20240211173323.2755976-1-bernd@kuhls.net> Message-ID: <20240211223618.7ec20dc6@windsurf> On Sun, 11 Feb 2024 18:33:23 +0100 Bernd Kuhls wrote: > Release notes: > https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html > https://cgit.freedesktop.org/mesa/mesa/tree/docs/relnotes/24.0.0.rst?h=24.0 > > Removed patch which is included in this release. > > Signed-off-by: Bernd Kuhls > --- > package/mesa3d-headers/mesa3d-headers.mk | 2 +- > ...e_description-fix-unknown-linux-3.5-.patch | 68 ------------------- > package/mesa3d/mesa3d.hash | 6 +- > package/mesa3d/mesa3d.mk | 2 +- > 4 files changed, 5 insertions(+), 73 deletions(-) > delete mode 100644 package/mesa3d/0005-util-os_same_file_description-fix-unknown-linux-3.5-.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:37:03 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:37:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv3: replace PKG_PYTHON_DISTUTILS_ENV In-Reply-To: <20240211183631.1162846-1-fontaine.fabrice@gmail.com> References: <20240211183631.1162846-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223703.2d5ec6a5@windsurf> On Sun, 11 Feb 2024 19:36:31 +0100 Fabrice Fontaine wrote: > Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV > to avoid an issue with naming of python modules since commit > 09de823cbc7bd50a40e25f4166b4e42be94b0c7b > > Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b > > Signed-off-by: Fabrice Fontaine > --- > package/opencv3/opencv3.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:37:06 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:37:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/opencv4: replace PKG_PYTHON_DISTUTILS_ENV In-Reply-To: <20240211183813.1164093-1-fontaine.fabrice@gmail.com> References: <20240211183813.1164093-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223706.0199eaa9@windsurf> On Sun, 11 Feb 2024 19:38:13 +0100 Fabrice Fontaine wrote: > Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV > to avoid an issue with naming of python modules since commit > 09de823cbc7bd50a40e25f4166b4e42be94b0c7b > > Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b > > Signed-off-by: Fabrice Fontaine > --- > package/opencv4/opencv4.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:36:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:36:26 +0100 Subject: [Buildroot] [git commit] package/opencv3: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211213756.31664877AE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6444c4278d643f4f315afa3e42d8cce7faf20da4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV to avoid an issue with naming of python modules since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/opencv3/opencv3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 29fb246e65..5064496ca6 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -341,7 +341,7 @@ OPENCV3_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV3_DEPENDENCIES += python3 OPENCV3_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -OPENCV3_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +OPENCV3_CONF_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) OPENCV3_DEPENDENCIES += python-numpy else OPENCV3_CONF_OPTS += \ From thomas.petazzoni at bootlin.com Sun Feb 11 21:36:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:36:56 +0100 Subject: [Buildroot] [git commit] package/opencv4: replace PKG_PYTHON_DISTUTILS_ENV Message-ID: <20240211213756.3E7F2877AF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1d95ad6100036debde5670262ececac336b5f252 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Replace PKG_PYTHON_DISTUTILS_ENV by PKG_PYTHON_SETUPTOOLS_ENV to avoid an issue with naming of python modules since commit 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Fixes: 09de823cbc7bd50a40e25f4166b4e42be94b0c7b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/opencv4/opencv4.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index b535761cb2..e50e0f99a9 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -410,7 +410,7 @@ OPENCV4_CONF_OPTS += \ -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) OPENCV4_DEPENDENCIES += python3 OPENCV4_KEEP_PY_FILES += usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/cv2/config*.py -OPENCV4_CONF_ENV += $(PKG_PYTHON_DISTUTILS_ENV) +OPENCV4_CONF_ENV += $(PKG_PYTHON_SETUPTOOLS_ENV) OPENCV4_DEPENDENCIES += python-numpy else OPENCV4_CONF_OPTS += \ From thomas.petazzoni at bootlin.com Sun Feb 11 21:37:41 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:37:41 +0100 Subject: [Buildroot] [git commit] package/exim: fix libressl build Message-ID: <20240211213857.0C47C877B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc59cbe4674f9d0f953857edff11cd93d570f360 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following libressl build failure raised since bump to version 4.97 in commit faec3ca30e358575f70a036879029f63f7da9b29 and https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: In file included from tls.c:473: tls-openssl.c: In function 'tls_client_stapling_cb': tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} 2652 | bs->certs | ^~ Fixes: faec3ca30e358575f70a036879029f63f7da9b29 - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/exim/0007-typoes.patch | 58 ++++++++++++++++++++++ ...s-openssl.c-fix-build-with-libressl-3.5.0.patch | 43 ++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/package/exim/0007-typoes.patch b/package/exim/0007-typoes.patch new file mode 100644 index 0000000000..6bbfc9eecd --- /dev/null +++ b/package/exim/0007-typoes.patch @@ -0,0 +1,58 @@ +From caf57fe7eb5018b8df196e6d9f99586232798eb3 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 8 Nov 2023 14:22:37 +0000 +Subject: [PATCH] typoes + +Upstream: https://git.exim.org/exim.git/commit/caf57fe7eb5018b8df196e6d9f99586232798eb3 +Signed-off-by: Fabrice Fontaine +--- + src/src/tls-openssl.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/tls-openssl.c b/src/tls-openssl.c +index 851ac77c5..237303ba9 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -77,9 +77,9 @@ change this guard and punt the issue for a while longer. */ + # define EXIM_HAVE_OPENSSL_KEYLOG + # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID + # define EXIM_HAVE_SESSION_TICKET +-# define EXIM_HAVE_OPESSL_TRACE +-# define EXIM_HAVE_OPESSL_GET0_SERIAL +-# define EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS ++# define EXIM_HAVE_OPENSSL_TRACE ++# define EXIM_HAVE_OPENSSL_GET0_SERIAL ++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS + # define EXIM_HAVE_SSL_GET0_VERIFIED_CHAIN + # ifndef DISABLE_OCSP + # define EXIM_HAVE_OCSP +@@ -1756,7 +1756,7 @@ level. */ + DEBUG(D_tls) + { + SSL_CTX_set_info_callback(ctx, info_callback); +-#if defined(EXIM_HAVE_OPESSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) ++#if defined(EXIM_HAVE_OPENSSL_TRACE) && !defined(OPENSSL_NO_SSL_TRACE) + /* this needs a debug build of OpenSSL */ + SSL_CTX_set_msg_callback(ctx, SSL_trace); + #endif +@@ -2442,7 +2442,7 @@ tls_in.ocsp = OCSP_NOT_RESP; + if (!olist) + return SSL_TLSEXT_ERR_NOACK; + +-#ifdef EXIM_HAVE_OPESSL_GET0_SERIAL ++#ifdef EXIM_HAVE_OPENSSL_GET0_SERIAL + { + const X509 * cert_sent = SSL_get_certificate(s); + const ASN1_INTEGER * cert_serial = X509_get0_serialNumber(cert_sent); +@@ -2646,7 +2646,7 @@ if (!(bs = OCSP_response_get1_basic(rsp))) + + debug_printf("certs contained in basicresp:\n"); + x509_stack_dump_cert_s_names( +-#ifdef EXIM_HAVE_OPESSL_OCSP_RESP_GET0_CERTS ++#ifdef EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS + OCSP_resp_get0_certs(bs) + #else + bs->certs +-- +2.30.2 + diff --git a/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 0000000000..67d96fc1af --- /dev/null +++ b/package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,43 @@ +From 88f45502272a9a674948204e460ebe90202827d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 11 Feb 2024 21:45:42 +0100 +Subject: [PATCH] src/src/tls-openssl.c: fix build with libressl >= 3.5.0 + +OCSP_BASICRESP is an opaque structure since libressl 3.5.0 and +https://github.com/libressl/openbsd/commit/57442b0028fb09287793f279ee57ebb38e9ab954 +resulting in the following build failure since version 4.97 and +https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: + +In file included from tls.c:473: +tls-openssl.c: In function 'tls_client_stapling_cb': +tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} + 2652 | bs->certs + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d + +Signed-off-by: Fabrice Fontaine +Upstream: https://bugs.exim.org/show_bug.cgi?id=3074 +--- + src/src/tls-openssl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tls-openssl.c b/src/tls-openssl.c +index 237303ba9..c7f94c160 100644 +--- a/src/tls-openssl.c ++++ b/src/tls-openssl.c +@@ -98,6 +98,10 @@ change this guard and punt the issue for a while longer. */ + # define EXIM_HAVE_OPENSSL_CIPHER_GET_ID + #endif + ++#if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define EXIM_HAVE_OPENSSL_OCSP_RESP_GET0_CERTS ++#endif ++ + #if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x030000000L) + # define EXIM_HAVE_EXPORT_CHNL_BNGNG + # define EXIM_HAVE_OPENSSL_X509_STORE_GET1_ALL_CERTS +-- +2.43.0 + From thomas.petazzoni at bootlin.com Sun Feb 11 21:38:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:38:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/exim: fix libressl build In-Reply-To: <20240211211022.2003157-1-fontaine.fabrice@gmail.com> References: <20240211211022.2003157-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223858.559fe171@windsurf> On Sun, 11 Feb 2024 22:10:22 +0100 Fabrice Fontaine wrote: > Fix the following libressl build failure raised since bump to version > 4.97 in commit faec3ca30e358575f70a036879029f63f7da9b29 and > https://git.exim.org/exim.git/commit/6bf0021993572586f031ac7d973ca33358c2dac8: > > In file included from tls.c:473: > tls-openssl.c: In function 'tls_client_stapling_cb': > tls-openssl.c:2652:11: error: invalid use of incomplete typedef 'OCSP_BASICRESP' {aka 'struct ocsp_basic_response_st'} > 2652 | bs->certs > | ^~ > > Fixes: faec3ca30e358575f70a036879029f63f7da9b29 > - http://autobuild.buildroot.org/results/869fde62128d7b0c65e0ac596a3a3f69b332583d > > Signed-off-by: Fabrice Fontaine > --- > package/exim/0007-typoes.patch | 58 +++++++++++++++++++ > ...nssl.c-fix-build-with-libressl-3.5.0.patch | 43 ++++++++++++++ > 2 files changed, 101 insertions(+) > create mode 100644 package/exim/0007-typoes.patch > create mode 100644 package/exim/0008-src-src-tls-openssl.c-fix-build-with-libressl-3.5.0.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:39:52 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:39:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdk-pixbuf: fix static build In-Reply-To: <20240211154401.5516-1-fontaine.fabrice@gmail.com> References: <20240211154401.5516-1-fontaine.fabrice@gmail.com> Message-ID: <20240211223944.19730c36@windsurf> On Sun, 11 Feb 2024 16:44:01 +0100 Fabrice Fontaine wrote: > Fix the following static build failure raised, at least, since bump to > version 2.42.10 in commit cd2757bd76d2bc2411e67a27a25b8ab55d40bdb7: > [...] > Fixes: > - http://autobuild.buildroot.org/results/e194d8f90caed7ceefd200d4e40d5fa5b3567d03 > > Signed-off-by: Fabrice Fontaine > --- > ...-pixbuf-meson.build-fix-static-build.patch | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 package/gdk-pixbuf/0001-gdk-pixbuf-meson.build-fix-static-build.patch I am not sure to fully grasp the issue and the fix, so I was planning on waiting to get some feedback from upstream (hopefully). Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From james.hilliard1 at gmail.com Sun Feb 11 21:39:40 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 14:39:40 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> Message-ID: On Sun, Feb 11, 2024 at 2:24?PM Yann E. MORIN wrote: > > James, All, > > On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > > Add patches from pending upstream pull request which add cython3 > > compatibility. > > We are a little bit cautious at applying random patches that have not > yet been at least reviewd by upstream. In this case, there has not been > any upstream activity since the last release, and not muc before that > either... Well these patches are being used by gentoo so they are not entirely untested in the real world. > > We have no in-tree user of uvloop, so I wonder whether it makes snse to > keep it, espcially since it mau be blocking the bumps of other packages > (like cython 3.x being required by whats-its-name). That's not entirely true, it's a common optional dependency for packages like python-uvicorn for example. > > Plus, see below... > > > Signed-off-by: James Hilliard > > --- > > .../0001-Updates-for-Cython3.patch | 631 ++++++++++++++++++ > > ...ebug-has-args-difference-in-python-3.patch | 30 + > > .../0003-fix-tests-on-python-3.8.patch | 31 + > > .../0004-fix-arg-count-for-wrap.patch | 52 ++ > > 4 files changed, 744 insertions(+) > > create mode 100644 package/python-uvloop/0001-Updates-for-Cython3.patch > > create mode 100644 package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > > create mode 100644 package/python-uvloop/0003-fix-tests-on-python-3.8.patch > > create mode 100644 package/python-uvloop/0004-fix-arg-count-for-wrap.patch > > > > diff --git a/package/python-uvloop/0001-Updates-for-Cython3.patch b/package/python-uvloop/0001-Updates-for-Cython3.patch > > new file mode 100644 > > index 0000000000..b7ef1091ac > > --- /dev/null > > +++ b/package/python-uvloop/0001-Updates-for-Cython3.patch > > @@ -0,0 +1,631 @@ > > +From 087a2983c8022598232cb7ed0a49da334d7af9ff Mon Sep 17 00:00:00 2001 > > +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> > > +Date: Thu, 28 Dec 2023 12:18:15 +0000 > > +Subject: [PATCH] Updates for Cython3 Remove SSL depreciation warnings buillt > > + on debian 12.6 python-3.22 Cython-3.0.7 libuv-1.46.0 > > + > > +Signed-off-by: James Hilliard > > +[Upstream status: > > +https://github.com/MagicStack/uvloop/pull/587] > > $ ./utils/docker-run make check-package > package/python-uvloop/0001-Updates-for-Cython3.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) > package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) > package/python-uvloop/0003-fix-tests-on-python-3.8.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) > package/python-uvloop/0004-fix-arg-count-for-wrap.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) > > Runing check-package is really a trivial thing to do locally before > sending patches, and we've been advertising it for long enough now... Oh, must have forgotten to do that, I usually do run that for anything that's not a version bump. I'll fix and resend. > > Regards, > Yann E. MORIN. > > > +--- > > + Makefile | 2 +- > > + setup.py | 6 ++++-- > > + tests/test_process.py | 4 ++-- > > + tests/test_tcp.py | 19 ++++++++++++------- > > + uvloop/_testbase.py | 4 +++- > > + uvloop/cbhandles.pyx | 4 ++-- > > + uvloop/dns.pyx | 4 ++-- > > + uvloop/handles/basetransport.pxd | 4 ++-- > > + uvloop/handles/basetransport.pyx | 4 ++-- > > + uvloop/handles/handle.pyx | 2 +- > > + uvloop/handles/pipe.pyx | 2 +- > > + uvloop/handles/poll.pxd | 2 +- > > + uvloop/handles/poll.pyx | 2 +- > > + uvloop/handles/stream.pyx | 16 ++++++++++------ > > + uvloop/handles/udp.pyx | 4 ++-- > > + uvloop/includes/consts.pxi | 25 ------------------------- > > + uvloop/includes/fork_handler.h | 6 +++++- > > + uvloop/includes/system.h | 16 ++++++++++++++++ > > + uvloop/includes/system.pxd | 12 ++++-------- > > + uvloop/includes/uv.pxd | 6 +++--- > > + uvloop/loop.pxd | 28 ++++++++++++++++++++++++---- > > + uvloop/loop.pyx | 10 +++++----- > > + uvloop/sslproto.pxd | 4 ++-- > > + uvloop/sslproto.pyx | 4 ++-- > > + 24 files changed, 107 insertions(+), 83 deletions(-) > > + delete mode 100644 uvloop/includes/consts.pxi > > + create mode 100755 uvloop/includes/system.h > > + > > +diff --git a/Makefile b/Makefile > > +index 4375e5d..6a0475a 100644 > > +--- a/Makefile > > ++++ b/Makefile > > +@@ -9,7 +9,7 @@ _default: compile > > + > > + > > + clean: > > +- rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd > > ++ rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd > > + rm -fr uvloop/*.c uvloop/*.html uvloop/*.so > > + rm -fr uvloop/handles/*.html uvloop/includes/*.html > > + find . -name '__pycache__' | xargs rm -rf > > +diff --git a/setup.py b/setup.py > > +index ba15af5..8fdf0e5 100644 > > +--- a/setup.py > > ++++ b/setup.py > > +@@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext > > + from setuptools.command.sdist import sdist > > + > > + > > +-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)' > > ++CYTHON_DEPENDENCY = 'Cython(>=0.29.36)' > > + MACHINE = platform.machine() > > + MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')] > > + _ROOT = pathlib.Path(__file__).parent > > +@@ -144,7 +144,9 @@ class uvloop_build_ext(build_ext): > > + self.distribution.ext_modules[:] = cythonize( > > + self.distribution.ext_modules, > > + compiler_directives=directives, > > +- annotate=self.cython_annotate) > > ++ annotate=self.cython_annotate, > > ++ compile_time_env=dict(DEFAULT_FREELIST_SIZE=250, SSL_READ_MAX_SIZE=256 * 1024), > > ++ emit_linenums=True) > > + > > + super().finalize_options() > > + > > +diff --git a/tests/test_process.py b/tests/test_process.py > > +index bfcbba1..95e1c9e 100644 > > +--- a/tests/test_process.py > > ++++ b/tests/test_process.py > > +@@ -912,7 +912,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): > > + stdin=subprocess.PIPE, > > + stdout=subprocess.PIPE, > > + stderr=subprocess.PIPE, > > +- __uvloop_sleep_after_fork=True)) > > ++ uvloop_sleep_after_fork=True)) > > + self.assertIsNot(transport, None) > > + self.assertEqual(transport.get_returncode(), 0) > > + self.assertEqual( > > +@@ -931,7 +931,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): > > + stdin=None, > > + stdout=subprocess.PIPE, > > + stderr=subprocess.PIPE, > > +- __uvloop_sleep_after_fork=True)) > > ++ uvloop_sleep_after_fork=True)) > > + self.assertIsNot(transport, None) > > + self.assertEqual(transport.get_returncode(), 0) > > + self.assertEqual( > > +diff --git a/tests/test_tcp.py b/tests/test_tcp.py > > +index 812e62b..213e2d9 100644 > > +--- a/tests/test_tcp.py > > ++++ b/tests/test_tcp.py > > +@@ -1630,17 +1630,22 @@ class _TestSSL(tb.SSLTestCase): > > + self.fail("unexpected call to connection_made()") > > + > > + def test_ssl_connect_accepted_socket(self): > > +- if hasattr(ssl, 'PROTOCOL_TLS'): > > +- proto = ssl.PROTOCOL_TLS > > ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): > > ++ server_proto = ssl.PROTOCOL_TLS_SERVER > > ++ client_proto = ssl.PROTOCOL_TLS_CLIENT > > + else: > > +- proto = ssl.PROTOCOL_SSLv23 > > +- server_context = ssl.SSLContext(proto) > > ++ if hasattr(ssl, 'PROTOCOL_TLS'): > > ++ client_proto = server_proto = ssl.PROTOCOL_TLS > > ++ else: > > ++ client_proto = server_proto = ssl.PROTOCOL_SSLv23 > > ++ > > ++ server_context = ssl.SSLContext(server_proto) > > + server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY) > > + if hasattr(server_context, 'check_hostname'): > > + server_context.check_hostname = False > > + server_context.verify_mode = ssl.CERT_NONE > > + > > +- client_context = ssl.SSLContext(proto) > > ++ client_context = ssl.SSLContext(client_proto) > > + if hasattr(server_context, 'check_hostname'): > > + client_context.check_hostname = False > > + client_context.verify_mode = ssl.CERT_NONE > > +@@ -2233,7 +2238,7 @@ class _TestSSL(tb.SSLTestCase): > > + sslctx.use_privatekey_file(self.ONLYKEY) > > + sslctx.use_certificate_chain_file(self.ONLYCERT) > > + client_sslctx = self._create_client_ssl_context() > > +- if hasattr(ssl, 'OP_NO_TLSv1_3'): > > ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): > > + client_sslctx.options |= ssl.OP_NO_TLSv1_3 > > + > > + def server(sock): > > +@@ -2592,7 +2597,7 @@ class _TestSSL(tb.SSLTestCase): > > + sslctx_openssl.use_privatekey_file(self.ONLYKEY) > > + sslctx_openssl.use_certificate_chain_file(self.ONLYCERT) > > + client_sslctx = self._create_client_ssl_context() > > +- if hasattr(ssl, 'OP_NO_TLSv1_3'): > > ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): > > + client_sslctx.options |= ssl.OP_NO_TLSv1_3 > > + > > + future = None > > +diff --git a/uvloop/_testbase.py b/uvloop/_testbase.py > > +index c4a7595..e620e15 100644 > > +--- a/uvloop/_testbase.py > > ++++ b/uvloop/_testbase.py > > +@@ -269,7 +269,9 @@ def find_free_port(start_from=50000): > > + class SSLTestCase: > > + > > + def _create_server_ssl_context(self, certfile, keyfile=None): > > +- if hasattr(ssl, 'PROTOCOL_TLS'): > > ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): > > ++ sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) > > ++ elif hasattr(ssl, 'PROTOCOL_TLS'): > > + sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS) > > + else: > > + sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) > > +diff --git a/uvloop/cbhandles.pyx b/uvloop/cbhandles.pyx > > +index 2914b42..8bcc5aa 100644 > > +--- a/uvloop/cbhandles.pyx > > ++++ b/uvloop/cbhandles.pyx > > +@@ -76,8 +76,8 @@ cdef class Handle: > > + self.arg1, self.arg2, self.arg3, self.arg4) > > + > > + else: > > +- raise RuntimeError('invalid Handle.cb_type: {}'.format( > > +- cb_type)) > > ++ raise RuntimeError('invalid Handle.cb_type: {} {!r}/{!r}'.format( > > ++ cb_type, self.args1, self.args2)) > > + > > + except (KeyboardInterrupt, SystemExit): > > + raise > > +diff --git a/uvloop/dns.pyx b/uvloop/dns.pyx > > +index 7aad631..09b9282 100644 > > +--- a/uvloop/dns.pyx > > ++++ b/uvloop/dns.pyx > > +@@ -298,7 +298,7 @@ cdef class AddrInfo: > > + uv.uv_freeaddrinfo(self.data) # returns void > > + self.data = NULL > > + > > +- cdef void set_data(self, system.addrinfo *data): > > ++ cdef void set_data(self, system.addrinfo *data) noexcept: > > + self.data = data > > + > > + cdef unpack(self): > > +@@ -326,7 +326,7 @@ cdef class AddrInfo: > > + return result > > + > > + @staticmethod > > +- cdef int isinstance(object other): > > ++ cdef int isinstance(object other) noexcept: > > + return type(other) is AddrInfo > > + > > + > > +diff --git a/uvloop/handles/basetransport.pxd b/uvloop/handles/basetransport.pxd > > +index ba356a7..8112622 100644 > > +--- a/uvloop/handles/basetransport.pxd > > ++++ b/uvloop/handles/basetransport.pxd > > +@@ -47,8 +47,8 @@ cdef class UVBaseTransport(UVSocketHandle): > > + # === overloads === > > + > > + cdef _new_socket(self) > > +- cdef size_t _get_write_buffer_size(self) > > ++ cdef size_t _get_write_buffer_size(self) noexcept > > + > > +- cdef bint _is_reading(self) > > ++ cdef bint _is_reading(self) noexcept > > + cdef _start_reading(self) > > + cdef _stop_reading(self) > > +diff --git a/uvloop/handles/basetransport.pyx b/uvloop/handles/basetransport.pyx > > +index 28b3079..a8592f2 100644 > > +--- a/uvloop/handles/basetransport.pyx > > ++++ b/uvloop/handles/basetransport.pyx > > +@@ -18,7 +18,7 @@ cdef class UVBaseTransport(UVSocketHandle): > > + > > + self._closing = 0 > > + > > +- cdef size_t _get_write_buffer_size(self): > > ++ cdef size_t _get_write_buffer_size(self) noexcept: > > + return 0 > > + > > + cdef inline _schedule_call_connection_made(self): > > +@@ -211,7 +211,7 @@ cdef class UVBaseTransport(UVSocketHandle): > > + self._extra_info = {} > > + self._extra_info[name] = obj > > + > > +- cdef bint _is_reading(self): > > ++ cdef bint _is_reading(self) noexcept: > > + raise NotImplementedError > > + > > + cdef _start_reading(self): > > +diff --git a/uvloop/handles/handle.pyx b/uvloop/handles/handle.pyx > > +index 6efe375..2c96458 100644 > > +--- a/uvloop/handles/handle.pyx > > ++++ b/uvloop/handles/handle.pyx > > +@@ -363,7 +363,7 @@ cdef void __uv_close_handle_cb(uv.uv_handle_t* handle) noexcept with gil: > > + Py_DECREF(h) # Was INCREFed in UVHandle._close > > + > > + > > +-cdef void __close_all_handles(Loop loop): > > ++cdef void __close_all_handles(Loop loop) noexcept: > > + uv.uv_walk(loop.uvloop, > > + __uv_walk_close_all_handles_cb, > > + loop) # void > > +diff --git a/uvloop/handles/pipe.pyx b/uvloop/handles/pipe.pyx > > +index 195576c..d30a736 100644 > > +--- a/uvloop/handles/pipe.pyx > > ++++ b/uvloop/handles/pipe.pyx > > +@@ -25,7 +25,7 @@ cdef __pipe_init_uv_handle(UVStream handle, Loop loop): > > + cdef __pipe_open(UVStream handle, int fd): > > + cdef int err > > + err = uv.uv_pipe_open(handle._handle, > > +- fd) > > ++ fd) > > + if err < 0: > > + exc = convert_error(err) > > + raise exc > > +diff --git a/uvloop/handles/poll.pxd b/uvloop/handles/poll.pxd > > +index d07030b..c220540 100644 > > +--- a/uvloop/handles/poll.pxd > > ++++ b/uvloop/handles/poll.pxd > > +@@ -10,7 +10,7 @@ cdef class UVPoll(UVHandle): > > + cdef inline _poll_start(self, int flags) > > + cdef inline _poll_stop(self) > > + > > +- cdef int is_active(self) > > ++ cdef int is_active(self) noexcept > > + > > + cdef is_reading(self) > > + cdef is_writing(self) > > +diff --git a/uvloop/handles/poll.pyx b/uvloop/handles/poll.pyx > > +index fca5981..c905e9b 100644 > > +--- a/uvloop/handles/poll.pyx > > ++++ b/uvloop/handles/poll.pyx > > +@@ -29,7 +29,7 @@ cdef class UVPoll(UVHandle): > > + handle._init(loop, fd) > > + return handle > > + > > +- cdef int is_active(self): > > ++ cdef int is_active(self) noexcept: > > + return (self.reading_handle is not None or > > + self.writing_handle is not None) > > + > > +diff --git a/uvloop/handles/stream.pyx b/uvloop/handles/stream.pyx > > +index d4e02e3..09df887 100644 > > +--- a/uvloop/handles/stream.pyx > > ++++ b/uvloop/handles/stream.pyx > > +@@ -1,4 +1,8 @@ > > +-DEF __PREALLOCED_BUFS = 4 > > ++cdef extern from *: > > ++ ''' > > ++ enum {__PREALLOCED_BUFS = 4}; > > ++ ''' > > ++ const bint __PREALLOCED_BUFS > > + > > + > > + @cython.no_gc_clear > > +@@ -279,7 +283,7 @@ cdef class UVStream(UVBaseTransport): > > + cdef inline _close_on_read_error(self): > > + self.__read_error_close = 1 > > + > > +- cdef bint _is_reading(self): > > ++ cdef bint _is_reading(self) noexcept: > > + return self.__reading > > + > > + cdef _start_reading(self): > > +@@ -578,7 +582,7 @@ cdef class UVStream(UVBaseTransport): > > + > > + self._maybe_resume_protocol() > > + > > +- cdef size_t _get_write_buffer_size(self): > > ++ cdef size_t _get_write_buffer_size(self) noexcept: > > + if self._handle is NULL: > > + return 0 > > + return ((self._handle).write_queue_size + > > +@@ -755,7 +759,7 @@ cdef inline bint __uv_stream_on_read_common( > > + UVStream sc, > > + Loop loop, > > + ssize_t nread, > > +-): > > ++) noexcept: > > + if sc._closed: > > + # The stream was closed, there is no reason to > > + # do any work now. > > +@@ -818,7 +822,7 @@ cdef inline void __uv_stream_on_read_impl( > > + uv.uv_stream_t* stream, > > + ssize_t nread, > > + const uv.uv_buf_t* buf, > > +-): > > ++) noexcept: > > + cdef: > > + UVStream sc = stream.data > > + Loop loop = sc._loop > > +@@ -849,7 +853,7 @@ cdef inline void __uv_stream_on_read_impl( > > + cdef inline void __uv_stream_on_write_impl( > > + uv.uv_write_t* req, > > + int status, > > +-): > > ++) noexcept: > > + cdef: > > + _StreamWriteContext ctx = <_StreamWriteContext> req.data > > + UVStream stream = ctx.stream > > +diff --git a/uvloop/handles/udp.pyx b/uvloop/handles/udp.pyx > > +index bbe60d5..fdd1d8b 100644 > > +--- a/uvloop/handles/udp.pyx > > ++++ b/uvloop/handles/udp.pyx > > +@@ -127,12 +127,12 @@ cdef class UDPTransport(UVBaseTransport): > > + exc = convert_error(err) > > + raise exc > > + > > +- cdef size_t _get_write_buffer_size(self): > > ++ cdef size_t _get_write_buffer_size(self) noexcept: > > + if self._handle is NULL: > > + return 0 > > + return (self._handle).send_queue_size > > + > > +- cdef bint _is_reading(self): > > ++ cdef bint _is_reading(self) noexcept: > > + return self.__receiving > > + > > + cdef _start_reading(self): > > +diff --git a/uvloop/includes/consts.pxi b/uvloop/includes/consts.pxi > > +deleted file mode 100644 > > +index f765053..0000000 > > +--- a/uvloop/includes/consts.pxi > > ++++ /dev/null > > +@@ -1,25 +0,0 @@ > > +-DEF UV_STREAM_RECV_BUF_SIZE = 256000 # 250kb > > +- > > +-DEF FLOW_CONTROL_HIGH_WATER = 64 # KiB > > +-DEF FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB > > +-DEF FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB > > +- > > +-DEF DEFAULT_FREELIST_SIZE = 250 > > +-DEF DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 > > +- > > +-DEF DEBUG_STACK_DEPTH = 10 > > +- > > +- > > +-DEF __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 > > +- > > +- > > +-DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 > > +- > > +- > > +-# Number of seconds to wait for SSL handshake to complete > > +-# The default timeout matches that of Nginx. > > +-DEF SSL_HANDSHAKE_TIMEOUT = 60.0 > > +-# Number of seconds to wait for SSL shutdown to complete > > +-# The default timeout mimics lingering_time > > +-DEF SSL_SHUTDOWN_TIMEOUT = 30.0 > > +-DEF SSL_READ_MAX_SIZE = 256 * 1024 > > +diff --git a/uvloop/includes/fork_handler.h b/uvloop/includes/fork_handler.h > > +index 47bbe03..9d3573a 100644 > > +--- a/uvloop/includes/fork_handler.h > > ++++ b/uvloop/includes/fork_handler.h > > +@@ -1,7 +1,10 @@ > > ++#ifndef UVLOOP_FORK_HANDLER_H_ > > ++#define UVLOOP_FORK_HANDLER_H_ > > ++ > > + volatile uint64_t MAIN_THREAD_ID = 0; > > + volatile int8_t MAIN_THREAD_ID_SET = 0; > > + > > +-typedef void (*OnForkHandler)(); > > ++typedef void (*OnForkHandler)(void); > > + > > + OnForkHandler __forkHandler = NULL; > > + > > +@@ -36,3 +39,4 @@ void setMainThreadID(uint64_t id) { > > + MAIN_THREAD_ID = id; > > + MAIN_THREAD_ID_SET = 1; > > + } > > ++#endif > > +diff --git a/uvloop/includes/system.h b/uvloop/includes/system.h > > +new file mode 100755 > > +index 0000000..e143bb5 > > +--- /dev/null > > ++++ b/uvloop/includes/system.h > > +@@ -0,0 +1,16 @@ > > ++#ifndef UVLOOP_SYSTEM_H_ > > ++#define UVLOOP_SYSTEM_H_ > > ++#if defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER) > > ++#include "Winsock2.h" > > ++#include "ws2def.h" > > ++#include "includes/fork_handler.h" > > ++#else > > ++#include "arpa/inet.h" > > ++#include "sys/socket.h" > > ++#include "sys/un.h" > > ++#include "unistd.h" > > ++#include "pthread.h" > > ++#endif > > ++#endif > > ++ > > ++ > > +diff --git a/uvloop/includes/system.pxd b/uvloop/includes/system.pxd > > +index 367fedd..d1da74e 100644 > > +--- a/uvloop/includes/system.pxd > > ++++ b/uvloop/includes/system.pxd > > +@@ -1,13 +1,9 @@ > > + from libc.stdint cimport int8_t, uint64_t > > + > > +-cdef extern from "arpa/inet.h" nogil: > > +- > > +- int ntohl(int) > > +- int htonl(int) > > +- int ntohs(int) > > +- > > +- > > +-cdef extern from "sys/socket.h" nogil: > > ++cdef extern from "includes/system.h": > > ++ int ntohl(int) nogil > > ++ int htonl(int) nogil > > ++ int ntohs(int) nogil > > + > > + struct sockaddr: > > + unsigned short sa_family > > +diff --git a/uvloop/includes/uv.pxd b/uvloop/includes/uv.pxd > > +index 8765130..ddd9738 100644 > > +--- a/uvloop/includes/uv.pxd > > ++++ b/uvloop/includes/uv.pxd > > +@@ -220,7 +220,7 @@ cdef extern from "uv.h" nogil: > > + UV_LEAVE_GROUP = 0, > > + UV_JOIN_GROUP > > + > > +- cpdef enum uv_fs_event: > > ++ cdef enum uv_fs_event: > > + UV_RENAME = 1, > > + UV_CHANGE = 2 > > + > > +@@ -282,7 +282,7 @@ cdef extern from "uv.h" nogil: > > + int uv_loop_close(uv_loop_t* loop) > > + int uv_loop_alive(uv_loop_t* loop) > > + int uv_loop_fork(uv_loop_t* loop) > > +- int uv_backend_fd(uv_loop_t* loop) > > ++ uv_os_fd_t uv_backend_fd(uv_loop_t* loop) > > + > > + void uv_update_time(uv_loop_t* loop) > > + uint64_t uv_now(const uv_loop_t*) > > +@@ -378,7 +378,7 @@ cdef extern from "uv.h" nogil: > > + # Pipes > > + > > + int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) > > +- int uv_pipe_open(uv_pipe_t* handle, uv_file file) > > ++ int uv_pipe_open(uv_pipe_t* handle, uv_os_fd_t file) > > + int uv_pipe_bind(uv_pipe_t* handle, const char* name) > > + > > + void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, > > +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd > > +index 5613473..f90c704 100644 > > +--- a/uvloop/loop.pxd > > ++++ b/uvloop/loop.pxd > > +@@ -1,15 +1,35 @@ > > + # cython: language_level=3 > > + > > ++cdef extern from *: > > ++ ''' > > ++ enum { UV_STREAM_RECV_BUF_SIZE = 256000, > > ++ SSL_READ_MAX_SIZE = 256 * 1024, // 250kb > > ++ }; > > ++ const float SSL_HANDSHAKE_TIMEOUT = 60.0; // Number of seconds to wait for SSL handshake to complete The default timeout matches that of Nginx. > > ++ const float SSL_SHUTDOWN_TIMEOUT = 30.0; // Number of seconds to wait for SSL shutdown to complete The default timeout mimics lingering_time > > ++ ''' > > ++ const bint UV_STREAM_RECV_BUF_SIZE > > ++ const bint SSL_READ_MAX_SIZE > > ++ > > ++ const float SSL_HANDSHAKE_TIMEOUT > > ++ const float SSL_SHUTDOWN_TIMEOUT > > ++ > > ++cdef enum: > > ++ FLOW_CONTROL_HIGH_WATER = 64 # KiB > > ++ FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB > > ++ FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB > > ++ > > ++ DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 > > ++ DEBUG_STACK_DEPTH = 10 > > ++ __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 > > ++ LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 > > ++ > > + > > + from .includes cimport uv > > + from .includes cimport system > > + > > + from libc.stdint cimport uint64_t, uint32_t, int64_t > > + > > +- > > +-include "includes/consts.pxi" > > +- > > +- > > + cdef extern from *: > > + ctypedef int vint "volatile int" > > + > > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > > +index 334d8d5..53e1160 100644 > > +--- a/uvloop/loop.pyx > > ++++ b/uvloop/loop.pyx > > +@@ -43,7 +43,7 @@ from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer > > + from . import _noop > > + > > + > > +-include "includes/consts.pxi" > > ++ > > + include "includes/stdlib.pxi" > > + > > + include "errors.pyx" > > +@@ -1118,7 +1118,7 @@ cdef class Loop: > > + > > + cdef _sock_set_reuseport(self, int fd): > > + cdef: > > +- int err > > ++ int err = 0 > > + int reuseport_flag = 1 > > + > > + err = system.setsockopt( > > +@@ -1397,7 +1397,7 @@ cdef class Loop: > > + self._debug = bool(enabled) > > + if self.is_running(): > > + self.call_soon_threadsafe( > > +- self._set_coroutine_debug, self, self._debug) > > ++ self._set_coroutine_debug, self._debug) > > + > > + def is_running(self): > > + """Return whether the event loop is currently running.""" > > +@@ -2750,7 +2750,7 @@ cdef class Loop: > > + executable=None, > > + pass_fds=(), > > + # For tests only! Do not use in your code. Ever. > > +- __uvloop_sleep_after_fork=False): > > ++ uvloop_sleep_after_fork=False): > > + > > + # TODO: Implement close_fds (might not be very important in > > + # Python 3.5, since all FDs aren't inheritable by default.) > > +@@ -2770,7 +2770,7 @@ cdef class Loop: > > + if executable is not None: > > + args[0] = executable > > + > > +- if __uvloop_sleep_after_fork: > > ++ if uvloop_sleep_after_fork: > > + debug_flags |= __PROCESS_DEBUG_SLEEP_AFTER_FORK > > + > > + waiter = self._new_future() > > +diff --git a/uvloop/sslproto.pxd b/uvloop/sslproto.pxd > > +index 3da10f0..68e4d57 100644 > > +--- a/uvloop/sslproto.pxd > > ++++ b/uvloop/sslproto.pxd > > +@@ -122,7 +122,7 @@ cdef class SSLProtocol: > > + # Flow control for writes from APP socket > > + > > + cdef _control_app_writing(self, object context=*) > > +- cdef size_t _get_write_buffer_size(self) > > ++ cdef size_t _get_write_buffer_size(self) noexcept > > + cdef _set_write_buffer_limits(self, high=*, low=*) > > + > > + # Flow control for reads to APP socket > > +@@ -134,5 +134,5 @@ cdef class SSLProtocol: > > + > > + cdef _control_ssl_reading(self) > > + cdef _set_read_buffer_limits(self, high=*, low=*) > > +- cdef size_t _get_read_buffer_size(self) > > ++ cdef size_t _get_read_buffer_size(self) noexcept > > + cdef _fatal_error(self, exc, message=*) > > +diff --git a/uvloop/sslproto.pyx b/uvloop/sslproto.pyx > > +index 42bb764..0a43746 100644 > > +--- a/uvloop/sslproto.pyx > > ++++ b/uvloop/sslproto.pyx > > +@@ -861,7 +861,7 @@ cdef class SSLProtocol: > > + 'protocol': self, > > + }) > > + > > +- cdef size_t _get_write_buffer_size(self): > > ++ cdef size_t _get_write_buffer_size(self) noexcept: > > + return self._outgoing.pending + self._write_buffer_size > > + > > + cdef _set_write_buffer_limits(self, high=None, low=None): > > +@@ -903,7 +903,7 @@ cdef class SSLProtocol: > > + self._incoming_high_water = high > > + self._incoming_low_water = low > > + > > +- cdef size_t _get_read_buffer_size(self): > > ++ cdef size_t _get_read_buffer_size(self) noexcept: > > + return self._incoming.pending > > + > > + # Flow control for writes to SSL socket > > +-- > > +2.34.1 > > + > > diff --git a/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > > new file mode 100644 > > index 0000000000..ac6170aff3 > > --- /dev/null > > +++ b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch > > @@ -0,0 +1,30 @@ > > +From 8b63801bfdb1f0cf7fde4f58e96f8628a587b186 Mon Sep 17 00:00:00 2001 > > +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> > > +Date: Thu, 28 Dec 2023 16:17:49 +0000 > > +Subject: [PATCH] _set_coroutine_debug has args difference in python 3.11 > > + > > +Signed-off-by: James Hilliard > > +[Upstream status: > > +https://github.com/MagicStack/uvloop/pull/587] > > +--- > > + uvloop/loop.pyx | 3 ++- > > + 1 file changed, 2 insertions(+), 1 deletion(-) > > + > > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > > +index 53e1160..5ca718e 100644 > > +--- a/uvloop/loop.pyx > > ++++ b/uvloop/loop.pyx > > +@@ -1396,8 +1396,9 @@ cdef class Loop: > > + def set_debug(self, enabled): > > + self._debug = bool(enabled) > > + if self.is_running(): > > ++ args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) > > + self.call_soon_threadsafe( > > +- self._set_coroutine_debug, self._debug) > > ++ self._set_coroutine_debug, *args) > > + > > + def is_running(self): > > + """Return whether the event loop is currently running.""" > > +-- > > +2.34.1 > > + > > diff --git a/package/python-uvloop/0003-fix-tests-on-python-3.8.patch b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch > > new file mode 100644 > > index 0000000000..42f04f2241 > > --- /dev/null > > +++ b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch > > @@ -0,0 +1,31 @@ > > +From ef5c3e5c6f331692ebcbea9e4c6aead8b2187038 Mon Sep 17 00:00:00 2001 > > +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> > > +Date: Thu, 28 Dec 2023 19:58:11 +0000 > > +Subject: [PATCH] fix tests on python 3.8 > > + > > +Signed-off-by: James Hilliard > > +[Upstream status: > > +https://github.com/MagicStack/uvloop/pull/587] > > +--- > > + uvloop/loop.pyx | 5 ++--- > > + 1 file changed, 2 insertions(+), 3 deletions(-) > > + > > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > > +index 5ca718e..75b915a 100644 > > +--- a/uvloop/loop.pyx > > ++++ b/uvloop/loop.pyx > > +@@ -1396,9 +1396,8 @@ cdef class Loop: > > + def set_debug(self, enabled): > > + self._debug = bool(enabled) > > + if self.is_running(): > > +- args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) > > +- self.call_soon_threadsafe( > > +- self._set_coroutine_debug, *args) > > ++ args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) > > ++ self.call_soon_threadsafe(self._set_coroutine_debug, *args) > > + > > + def is_running(self): > > + """Return whether the event loop is currently running.""" > > +-- > > +2.34.1 > > + > > diff --git a/package/python-uvloop/0004-fix-arg-count-for-wrap.patch b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch > > new file mode 100644 > > index 0000000000..fe082f4f90 > > --- /dev/null > > +++ b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch > > @@ -0,0 +1,52 @@ > > +From afef6364c2c3100ab23c2bb2de82d2da330b258c Mon Sep 17 00:00:00 2001 > > +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> > > +Date: Fri, 29 Dec 2023 11:24:19 +0000 > > +Subject: [PATCH] fix arg count for wrap() > > + > > +Signed-off-by: James Hilliard > > +[Upstream status: > > +https://github.com/MagicStack/uvloop/pull/587] > > +--- > > + uvloop/loop.pxd | 2 +- > > + uvloop/loop.pyx | 5 ++--- > > + 2 files changed, 3 insertions(+), 4 deletions(-) > > + > > +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd > > +index f90c704..d34ffeb 100644 > > +--- a/uvloop/loop.pxd > > ++++ b/uvloop/loop.pxd > > +@@ -220,7 +220,7 @@ cdef class Loop: > > + cdef inline _ceval_process_signals(self) > > + cdef _invoke_signals(self, bytes data) > > + > > +- cdef _set_coroutine_debug(self, bint enabled) > > ++ cpdef _set_coroutine_debug(self, bint enabled) > > + > > + cdef _print_debug_info(self) > > + > > +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx > > +index 75b915a..a3eeb60 100644 > > +--- a/uvloop/loop.pyx > > ++++ b/uvloop/loop.pyx > > +@@ -1131,7 +1131,7 @@ cdef class Loop: > > + if err < 0: > > + raise convert_error(-errno.errno) > > + > > +- cdef _set_coroutine_debug(self, bint enabled): > > ++ cpdef _set_coroutine_debug(self, bint enabled): > > + enabled = bool(enabled) > > + if self._coroutine_debug_set == enabled: > > + return > > +@@ -1396,8 +1396,7 @@ cdef class Loop: > > + def set_debug(self, enabled): > > + self._debug = bool(enabled) > > + if self.is_running(): > > +- args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) > > +- self.call_soon_threadsafe(self._set_coroutine_debug, *args) > > ++ self.call_soon_threadsafe(self._set_coroutine_debug, self._debug) > > + > > + def is_running(self): > > + """Return whether the event loop is currently running.""" > > +-- > > +2.34.1 > > + > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 21:40:35 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:40:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/ghostscript: security bump to version 10.02.1 In-Reply-To: <20240210100928.172584-1-ju.o@free.fr> References: <20240210100928.172584-1-ju.o@free.fr> Message-ID: <20240211224035.69db8394@windsurf> On Sat, 10 Feb 2024 11:09:28 +0100 Julien Olivain wrote: > For release note, see: > https://ghostscript.readthedocs.io/en/gs10.02.1/News.html > > For detailed history, see: > https://git.ghostscript.com/?p=ghostpdl.git;a=shortlog;h=refs/tags/ghostpdl-10.02.1 > > Fixes: > - CVE-2023-46751: > https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-46751 > > Signed-off-by: Julien Olivain > --- > package/ghostscript/ghostscript.hash | 4 ++-- > package/ghostscript/ghostscript.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From yann.morin.1998 at free.fr Sun Feb 11 21:41:24 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:41:24 +0100 Subject: [Buildroot] [git commit] package/tinymembench: drop package Message-ID: <20240211214202.19B13877C2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=16eec251427b3075d68ea43d7f1395567e2effe4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master As advised by Thomas Petazzoni in [1], drop tinymembench which is abandonned (last commit in 2017). Moreover, it raises the following build failure in Thumb mode: /tmp/ccaZHrla.s:40: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' /tmp/ccaZHrla.s:43: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' main.c:45: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode main.c:46: Error: unshifted register required -- `and r8,r7,r2,lsr#16' main.c:47: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode main.c:48: Error: unshifted register required -- `and r9,r6,r2,lsr#8' main.c:49: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240114135446.1156025-1-fontaine.fabrice at gmail.com/ Fixes: - http://autobuild.buildroot.org/results/1e359c294a8d71fb1833e5d04a6bc7d4fd533510 - http://autobuild.buildroot.org/results/c06010d7a2bdb33a1707266133a3880e14be7657 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - Config.in.legacy | 6 +++ DEVELOPERS | 1 - package/Config.in | 1 - ...arm-fix-build-on-Thumb-only-architectures.patch | 47 ---------------------- package/tinymembench/Config.in | 12 ------ package/tinymembench/tinymembench.hash | 3 -- package/tinymembench/tinymembench.mk | 21 ---------- 8 files changed, 6 insertions(+), 86 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 5948492d07..c2e107ce96 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1274,7 +1274,6 @@ package/tinyalsa/0001-include-time.h-before-asound.h.patch Upstream package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch Upstream package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch Upstream package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream -package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch Upstream package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables diff --git a/Config.in.legacy b/Config.in.legacy index 5e0db855cc..a869279af7 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_TINYMEMBENCH + bool "tinymembench removed" + select BR2_LEGACY + help + tinymembench has been removed due to being abandoned. + config BR2_PACKAGE_DAVINCI_BOOTCOUNT bool "davinci-bootcount has been renamed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index d7947821e4..8234d578cf 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1062,7 +1062,6 @@ F: package/snort3/ F: package/suricata/ F: package/tinycbor/ F: package/tinydtls/ -F: package/tinymembench/ F: package/whois/ F: package/x11r7/xlib_libXpresent/ F: package/zeek/ diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..bf0fe078b9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -156,7 +156,6 @@ menu "Debugging, profiling and benchmark" source "package/sysdig/Config.in" source "package/sysprof/Config.in" source "package/tcf-agent/Config.in" - source "package/tinymembench/Config.in" source "package/trace-cmd/Config.in" source "package/trinity/Config.in" source "package/uclibc-ng-test/Config.in" diff --git a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch b/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch deleted file mode 100644 index 88559ec012..0000000000 --- a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 034a3552e9700c6d424bd706db106f5bce1f5a5e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 11 Nov 2016 21:49:39 +0100 -Subject: [PATCH] arm: fix build on Thumb-only architectures - -Building tinymembench for ARM Cortex-M currently fails, because the -arm-neon.S file contains ARM code that doesn't build on Thumb-only -architectures. To account for this and fix the build for Cortex-M, -this patch adjusts the compile time condition to also verify that the -architecture supports the ARM instruction set, by testing the -__ARM_ARCH_ISA_ARM compiler define. - -Signed-off-by: Thomas Petazzoni ---- - arm-neon.S | 2 +- - asm-opt.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arm-neon.S b/arm-neon.S -index 4db78ce..19c30ad 100644 ---- a/arm-neon.S -+++ b/arm-neon.S -@@ -21,7 +21,7 @@ - * DEALINGS IN THE SOFTWARE. - */ - --#ifdef __arm__ -+#if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) - - .text - .fpu neon -diff --git a/asm-opt.c b/asm-opt.c -index 9da4596..eba1183 100644 ---- a/asm-opt.c -+++ b/asm-opt.c -@@ -202,7 +202,7 @@ bench_info *get_asm_framebuffer_benchmarks(void) - return empty; - } - --#elif defined(__arm__) -+#elif defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) - - #include "arm-neon.h" - --- -2.7.4 - diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in deleted file mode 100644 index 8f6e1a2b35..0000000000 --- a/package/tinymembench/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_TINYMEMBENCH - bool "tinymembench" - depends on !BR2_MIPS_NABI32 && !BR2_MIPS_NABI64 - help - Tinymembench is a simple memory benchmark program, which - tries to measure the peak bandwidth of sequential memory - accesses and the latency of random memory accesses. - Bandwidth is measured by running different assembly code for - the aligned memory blocks and attempting different prefetch - strategies. - - https://github.com/ssvb/tinymembench diff --git a/package/tinymembench/tinymembench.hash b/package/tinymembench/tinymembench.hash deleted file mode 100644 index 04dbd30f81..0000000000 --- a/package/tinymembench/tinymembench.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-0.4.tar.gz -sha256 8ba473aced4630aee2808efe17b53e904a9d68a9b3361de491717f9a4e75da39 LICENSE diff --git a/package/tinymembench/tinymembench.mk b/package/tinymembench/tinymembench.mk deleted file mode 100644 index 016d680ce7..0000000000 --- a/package/tinymembench/tinymembench.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# tinymembench -# -################################################################################ - -TINYMEMBENCH_VERSION = 0.4 -TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,v$(TINYMEMBENCH_VERSION)) -TINYMEMBENCH_LICENSE = MIT -TINYMEMBENCH_LICENSE_FILES = LICENSE - -define TINYMEMBENCH_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define TINYMEMBENCH_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/tinymembench \ - $(TARGET_DIR)/usr/bin/tinymembench -endef - -$(eval $(generic-package)) From yann.morin.1998 at free.fr Sun Feb 11 21:42:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:42:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinymembench: drop package In-Reply-To: <20240208195438.89814-1-fontaine.fabrice@gmail.com> References: <20240208195438.89814-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-08 20:54 +0100, Fabrice Fontaine spake thusly: > As advised by Thomas Petazzoni in [1], drop tinymembench which is > abandonned (last commit in 2017). Moreover, it raises the following > build failure in Thumb mode: > > /tmp/ccaZHrla.s:40: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' > /tmp/ccaZHrla.s:43: Error: instruction not supported in Thumb16 mode -- `subs r1,r1,#16' > main.c:45: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode > main.c:46: Error: unshifted register required -- `and r8,r7,r2,lsr#16' > main.c:47: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode > main.c:48: Error: unshifted register required -- `and r9,r6,r2,lsr#8' > main.c:49: Error: selected processor does not support `mla r2,r10,r2,r5' in Thumb mode > > [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20240114135446.1156025-1-fontaine.fabrice at gmail.com/ > > Fixes: > - http://autobuild.buildroot.org/results/1e359c294a8d71fb1833e5d04a6bc7d4fd533510 > - http://autobuild.buildroot.org/results/c06010d7a2bdb33a1707266133a3880e14be7657 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > .checkpackageignore | 1 - > Config.in.legacy | 6 +++ > DEVELOPERS | 1 - > package/Config.in | 1 - > ...ix-build-on-Thumb-only-architectures.patch | 47 ------------------- > package/tinymembench/Config.in | 12 ----- > package/tinymembench/tinymembench.hash | 3 -- > package/tinymembench/tinymembench.mk | 21 --------- > 8 files changed, 6 insertions(+), 86 deletions(-) > delete mode 100644 package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch > delete mode 100644 package/tinymembench/Config.in > delete mode 100644 package/tinymembench/tinymembench.hash > delete mode 100644 package/tinymembench/tinymembench.mk > > diff --git a/.checkpackageignore b/.checkpackageignore > index 4a1041a84a..a2b5c14a94 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -1265,7 +1265,6 @@ package/tinyalsa/0001-include-time.h-before-asound.h.patch Upstream > package/tinycbor/0001-Makefile-add-DISABLE_WERROR.patch Upstream > package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch Upstream > package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream > -package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch Upstream > package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream > package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream > package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables > diff --git a/Config.in.legacy b/Config.in.legacy > index 5e0db855cc..a869279af7 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,12 @@ endif > > comment "Legacy options removed in 2024.02" > > +config BR2_PACKAGE_TINYMEMBENCH > + bool "tinymembench removed" > + select BR2_LEGACY > + help > + tinymembench has been removed due to being abandoned. > + > config BR2_PACKAGE_DAVINCI_BOOTCOUNT > bool "davinci-bootcount has been renamed" > select BR2_LEGACY > diff --git a/DEVELOPERS b/DEVELOPERS > index eeca05cd94..5632d2771d 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1064,7 +1064,6 @@ F: package/snort3/ > F: package/suricata/ > F: package/tinycbor/ > F: package/tinydtls/ > -F: package/tinymembench/ > F: package/whois/ > F: package/x11r7/xlib_libXpresent/ > F: package/zeek/ > diff --git a/package/Config.in b/package/Config.in > index ee4058155d..ebcc8c2655 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -156,7 +156,6 @@ menu "Debugging, profiling and benchmark" > source "package/sysdig/Config.in" > source "package/sysprof/Config.in" > source "package/tcf-agent/Config.in" > - source "package/tinymembench/Config.in" > source "package/trace-cmd/Config.in" > source "package/trinity/Config.in" > source "package/uclibc-ng-test/Config.in" > diff --git a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch b/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch > deleted file mode 100644 > index 88559ec012..0000000000 > --- a/package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch > +++ /dev/null > @@ -1,47 +0,0 @@ > -From 034a3552e9700c6d424bd706db106f5bce1f5a5e Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni > -Date: Fri, 11 Nov 2016 21:49:39 +0100 > -Subject: [PATCH] arm: fix build on Thumb-only architectures > - > -Building tinymembench for ARM Cortex-M currently fails, because the > -arm-neon.S file contains ARM code that doesn't build on Thumb-only > -architectures. To account for this and fix the build for Cortex-M, > -this patch adjusts the compile time condition to also verify that the > -architecture supports the ARM instruction set, by testing the > -__ARM_ARCH_ISA_ARM compiler define. > - > -Signed-off-by: Thomas Petazzoni > ---- > - arm-neon.S | 2 +- > - asm-opt.c | 2 +- > - 2 files changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/arm-neon.S b/arm-neon.S > -index 4db78ce..19c30ad 100644 > ---- a/arm-neon.S > -+++ b/arm-neon.S > -@@ -21,7 +21,7 @@ > - * DEALINGS IN THE SOFTWARE. > - */ > - > --#ifdef __arm__ > -+#if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) > - > - .text > - .fpu neon > -diff --git a/asm-opt.c b/asm-opt.c > -index 9da4596..eba1183 100644 > ---- a/asm-opt.c > -+++ b/asm-opt.c > -@@ -202,7 +202,7 @@ bench_info *get_asm_framebuffer_benchmarks(void) > - return empty; > - } > - > --#elif defined(__arm__) > -+#elif defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) > - > - #include "arm-neon.h" > - > --- > -2.7.4 > - > diff --git a/package/tinymembench/Config.in b/package/tinymembench/Config.in > deleted file mode 100644 > index 8f6e1a2b35..0000000000 > --- a/package/tinymembench/Config.in > +++ /dev/null > @@ -1,12 +0,0 @@ > -config BR2_PACKAGE_TINYMEMBENCH > - bool "tinymembench" > - depends on !BR2_MIPS_NABI32 && !BR2_MIPS_NABI64 > - help > - Tinymembench is a simple memory benchmark program, which > - tries to measure the peak bandwidth of sequential memory > - accesses and the latency of random memory accesses. > - Bandwidth is measured by running different assembly code for > - the aligned memory blocks and attempting different prefetch > - strategies. > - > - https://github.com/ssvb/tinymembench > diff --git a/package/tinymembench/tinymembench.hash b/package/tinymembench/tinymembench.hash > deleted file mode 100644 > index 04dbd30f81..0000000000 > --- a/package/tinymembench/tinymembench.hash > +++ /dev/null > @@ -1,3 +0,0 @@ > -# Locally calculated > -sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-0.4.tar.gz > -sha256 8ba473aced4630aee2808efe17b53e904a9d68a9b3361de491717f9a4e75da39 LICENSE > diff --git a/package/tinymembench/tinymembench.mk b/package/tinymembench/tinymembench.mk > deleted file mode 100644 > index 016d680ce7..0000000000 > --- a/package/tinymembench/tinymembench.mk > +++ /dev/null > @@ -1,21 +0,0 @@ > -################################################################################ > -# > -# tinymembench > -# > -################################################################################ > - > -TINYMEMBENCH_VERSION = 0.4 > -TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,v$(TINYMEMBENCH_VERSION)) > -TINYMEMBENCH_LICENSE = MIT > -TINYMEMBENCH_LICENSE_FILES = LICENSE > - > -define TINYMEMBENCH_BUILD_CMDS > - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) > -endef > - > -define TINYMEMBENCH_INSTALL_TARGET_CMDS > - $(INSTALL) -m 0755 -D $(@D)/tinymembench \ > - $(TARGET_DIR)/usr/bin/tinymembench > -endef > - > -$(eval $(generic-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 11 21:43:00 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:43:00 +0100 Subject: [Buildroot] [git commit] package/libopenssl: security bump to version 3.2.1 Message-ID: <20240211214348.E9E8A877CD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ce4d278739953c830cea0c017836f26ceabef63a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master And drop the now upstreamed patches. Fixes the following (low severity) issues: - CVE-2023-6129 POLY1305 MAC implementation corrupts vector registers on PowerPC https://www.openssl.org/news/secadv/20240109.txt - CVE-2023-6237 Excessive time spent checking invalid RSA public keys https://www.openssl.org/news/secadv/20240115.txt - CVE-2024-0727 PKCS12 Decoding crashes https://www.openssl.org/news/secadv/20240125.txt Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- ...cv-Fix-mispelling-of-extension-test-macro.patch | 30 ----- ...05-Fix-genstr-genconf-option-in-asn1parse.patch | 42 ------- ...-Harden-asn1-oid-loader-to-invalid-inputs.patch | 122 --------------------- package/libopenssl/libopenssl.hash | 4 +- package/libopenssl/libopenssl.mk | 2 +- 5 files changed, 3 insertions(+), 197 deletions(-) diff --git a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch deleted file mode 100644 index 93b191a61c..0000000000 --- a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001 -From: Grant Nichol -Date: Fri, 22 Dec 2023 23:46:39 -0600 -Subject: [PATCH] riscv: Fix mispelling of extension test macro - -When refactoring the riscv extension test macros, -RISCV_HAS_ZKND_AND_ZKNE was mispelled. - -Upstream: https://github.com/openssl/openssl/pull/23139 -Signed-off-by: Grant Nichol ---- - providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c -index b35b71020e..65adc47d1f 100644 ---- a/providers/implementations/ciphers/cipher_aes_xts_hw.c -+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c -@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \ - # define PROV_CIPHER_HW_select_xts() \ - if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \ - return &aes_xts_rv32i_zbkb_zknd_zkne; \ --if (RISCV_HAS_ZKND_ZKNE()) \ -+if (RISCV_HAS_ZKND_AND_ZKNE()) \ - return &aes_xts_rv32i_zknd_zkne; - # else - /* The generic case */ --- -2.43.0 - diff --git a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch b/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch deleted file mode 100644 index 9fa36d83be..0000000000 --- a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 749fcc0e3ce796474a15d6fac221e57daeacff1e Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Tue, 5 Dec 2023 14:50:01 -0500 -Subject: [PATCH] Fix genstr/genconf option in asn1parse - -At some point the asn1parse applet was changed to default the inform to -PEM, and defalt input file to stdin. Doing so broke the -genstr|conf options, -in that, before we attempt to generate an ASN1 block from the provided -genstr string, we attempt to read a PEM input from stdin. As a result, -this command: -openssl asn1parse -genstr OID:1.2.3.4 -hangs because we are attempting a blocking read on stdin, waiting for -data that never arrives - -Fix it by giving priority to genstr|genconf, such that, if set, will just run -do_generate on that string and exit - -Reviewed-by: Hugo Landau -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/22957) -Upstream: https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e -Signed-off-by: Martin Kurbanov ---- - apps/asn1parse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apps/asn1parse.c b/apps/asn1parse.c -index 097b0cc1ed..6597a6180b 100644 ---- a/apps/asn1parse.c -+++ b/apps/asn1parse.c -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) - - if ((buf = BUF_MEM_new()) == NULL) - goto end; -- if (informat == FORMAT_PEM) { -+ if (genstr == NULL && informat == FORMAT_PEM) { - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { - BIO_printf(bio_err, "Error reading PEM file\n"); - ERR_print_errors(bio_err); --- -2.40.0 - diff --git a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch b/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch deleted file mode 100644 index 299ecbc2ed..0000000000 --- a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch +++ /dev/null @@ -1,122 +0,0 @@ -From a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Tue, 5 Dec 2023 15:24:20 -0500 -Subject: [PATCH] Harden asn1 oid loader to invalid inputs - -In the event that a config file contains this sequence: -======= -openssl_conf = openssl_init - -config_diagnostics = 1 - -[openssl_init] -oid_section = oids - -[oids] -testoid1 = 1.2.3.4.1 -testoid2 = A Very Long OID Name, 1.2.3.4.2 -testoid3 = ,1.2.3.4.3 -====== - -The leading comma in testoid3 can cause a heap buffer overflow, as the -parsing code will move the string pointer back 1 character, thereby -pointing to an invalid memory space - -correct the parser to detect this condition and handle it by treating it -as if the comma doesn't exist (i.e. an empty long oid name) - -Reviewed-by: Hugo Landau -Reviewed-by: Tomas Mraz -(Merged from https://github.com/openssl/openssl/pull/22957) -Upstream: https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 -Signed-off-by: Martin Kurbanov ---- - apps/asn1parse.c | 2 +- - crypto/asn1/asn_moid.c | 4 ++++ - test/recipes/04-test_asn1_parse.t | 26 ++++++++++++++++++++++++++ - test/test_asn1_parse.cnf | 12 ++++++++++++ - 4 files changed, 43 insertions(+), 1 deletion(-) - create mode 100644 test/recipes/04-test_asn1_parse.t - create mode 100644 test/test_asn1_parse.cnf - -diff --git a/apps/asn1parse.c b/apps/asn1parse.c -index 6597a6180b..bf62f85947 100644 ---- a/apps/asn1parse.c -+++ b/apps/asn1parse.c -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) - - if ((buf = BUF_MEM_new()) == NULL) - goto end; -- if (genstr == NULL && informat == FORMAT_PEM) { -+ if (genconf == NULL && genstr == NULL && informat == FORMAT_PEM) { - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { - BIO_printf(bio_err, "Error reading PEM file\n"); - ERR_print_errors(bio_err); -diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c -index 6f816307af..1e183f4f18 100644 ---- a/crypto/asn1/asn_moid.c -+++ b/crypto/asn1/asn_moid.c -@@ -67,6 +67,10 @@ static int do_create(const char *value, const char *name) - if (p == NULL) { - ln = name; - ostr = value; -+ } else if (p == value) { -+ /* we started with a leading comma */ -+ ln = name; -+ ostr = p + 1; - } else { - ln = value; - ostr = p + 1; -diff --git a/test/recipes/04-test_asn1_parse.t b/test/recipes/04-test_asn1_parse.t -new file mode 100644 -index 0000000000..f3af436592 ---- /dev/null -+++ b/test/recipes/04-test_asn1_parse.t -@@ -0,0 +1,26 @@ -+#! /usr/bin/env perl -+# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. -+# -+# Licensed under the Apache License 2.0 (the "License"). You may not use -+# this file except in compliance with the License. You can obtain a copy -+# in the file LICENSE in the source distribution or at -+# https://www.openssl.org/source/license.html -+ -+use strict; -+use OpenSSL::Test qw(:DEFAULT srctop_file); -+use OpenSSL::Test::Utils; -+ -+setup("test_asn1_parse"); -+ -+plan tests => 3; -+ -+$ENV{OPENSSL_CONF} = srctop_file("test", "test_asn1_parse.cnf"); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.1'])))); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.2'])))); -+ -+ok(run(app(([ 'openssl', 'asn1parse', -+ '-genstr', 'OID:1.2.3.4.3'])))); -diff --git a/test/test_asn1_parse.cnf b/test/test_asn1_parse.cnf -new file mode 100644 -index 0000000000..5f0305657e ---- /dev/null -+++ b/test/test_asn1_parse.cnf -@@ -0,0 +1,12 @@ -+openssl_conf = openssl_init -+ -+# Comment out the next line to ignore configuration errors -+config_diagnostics = 1 -+ -+[openssl_init] -+oid_section = oids -+ -+[oids] -+testoid1 = 1.2.3.4.1 -+testoid2 = A Very Long OID Name, 1.2.3.4.2 -+testoid3 = ,1.2.3.4.3 --- -2.40.0 - diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 9e09e12461..841d4b4cfd 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-3.2.0.tar.gz.sha256 -sha256 14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e openssl-3.2.0.tar.gz +# From https://www.openssl.org/source/openssl-3.2.1.tar.gz.sha256 +sha256 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 openssl-3.2.1.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 7dc6d93256..feb5026c02 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.2.0 +LIBOPENSSL_VERSION = 3.2.1 LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 From yann.morin.1998 at free.fr Sun Feb 11 21:44:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:44:07 +0100 Subject: [Buildroot] [PATCH] package/libopenssl: security bump to version 3.2.1 In-Reply-To: <20240208111214.679980-1-peter@korsgaard.com> References: <20240208111214.679980-1-peter@korsgaard.com> Message-ID: Peter, all, On 2024-02-08 12:12 +0100, Peter Korsgaard spake thusly: > And drop the now upstreamed patches. > > Fixes the following (low severity) issues: > > - CVE-2023-6129 POLY1305 MAC implementation corrupts vector registers on > PowerPC > https://www.openssl.org/news/secadv/20240109.txt > > - CVE-2023-6237 Excessive time spent checking invalid RSA public keys > https://www.openssl.org/news/secadv/20240115.txt > > - CVE-2024-0727 PKCS12 Decoding crashes > https://www.openssl.org/news/secadv/20240125.txt > > Signed-off-by: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...x-mispelling-of-extension-test-macro.patch | 30 ----- > ...x-genstr-genconf-option-in-asn1parse.patch | 42 ------ > ...en-asn1-oid-loader-to-invalid-inputs.patch | 122 ------------------ > package/libopenssl/libopenssl.hash | 4 +- > package/libopenssl/libopenssl.mk | 2 +- > 5 files changed, 3 insertions(+), 197 deletions(-) > delete mode 100644 package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch > delete mode 100644 package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch > delete mode 100644 package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch > > diff --git a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch b/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch > deleted file mode 100644 > index 93b191a61c..0000000000 > --- a/package/libopenssl/0004-riscv-Fix-mispelling-of-extension-test-macro.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From 68c549df05892c16b99603b9a831c79c540f268c Mon Sep 17 00:00:00 2001 > -From: Grant Nichol > -Date: Fri, 22 Dec 2023 23:46:39 -0600 > -Subject: [PATCH] riscv: Fix mispelling of extension test macro > - > -When refactoring the riscv extension test macros, > -RISCV_HAS_ZKND_AND_ZKNE was mispelled. > - > -Upstream: https://github.com/openssl/openssl/pull/23139 > -Signed-off-by: Grant Nichol > ---- > - providers/implementations/ciphers/cipher_aes_xts_hw.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c > -index b35b71020e..65adc47d1f 100644 > ---- a/providers/implementations/ciphers/cipher_aes_xts_hw.c > -+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c > -@@ -285,7 +285,7 @@ static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \ > - # define PROV_CIPHER_HW_select_xts() \ > - if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE()) \ > - return &aes_xts_rv32i_zbkb_zknd_zkne; \ > --if (RISCV_HAS_ZKND_ZKNE()) \ > -+if (RISCV_HAS_ZKND_AND_ZKNE()) \ > - return &aes_xts_rv32i_zknd_zkne; > - # else > - /* The generic case */ > --- > -2.43.0 > - > diff --git a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch b/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch > deleted file mode 100644 > index 9fa36d83be..0000000000 > --- a/package/libopenssl/0005-Fix-genstr-genconf-option-in-asn1parse.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -From 749fcc0e3ce796474a15d6fac221e57daeacff1e Mon Sep 17 00:00:00 2001 > -From: Neil Horman > -Date: Tue, 5 Dec 2023 14:50:01 -0500 > -Subject: [PATCH] Fix genstr/genconf option in asn1parse > - > -At some point the asn1parse applet was changed to default the inform to > -PEM, and defalt input file to stdin. Doing so broke the -genstr|conf options, > -in that, before we attempt to generate an ASN1 block from the provided > -genstr string, we attempt to read a PEM input from stdin. As a result, > -this command: > -openssl asn1parse -genstr OID:1.2.3.4 > -hangs because we are attempting a blocking read on stdin, waiting for > -data that never arrives > - > -Fix it by giving priority to genstr|genconf, such that, if set, will just run > -do_generate on that string and exit > - > -Reviewed-by: Hugo Landau > -Reviewed-by: Tomas Mraz > -(Merged from https://github.com/openssl/openssl/pull/22957) > -Upstream: https://github.com/openssl/openssl/commit/749fcc0e3ce796474a15d6fac221e57daeacff1e > -Signed-off-by: Martin Kurbanov > ---- > - apps/asn1parse.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/apps/asn1parse.c b/apps/asn1parse.c > -index 097b0cc1ed..6597a6180b 100644 > ---- a/apps/asn1parse.c > -+++ b/apps/asn1parse.c > -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) > - > - if ((buf = BUF_MEM_new()) == NULL) > - goto end; > -- if (informat == FORMAT_PEM) { > -+ if (genstr == NULL && informat == FORMAT_PEM) { > - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { > - BIO_printf(bio_err, "Error reading PEM file\n"); > - ERR_print_errors(bio_err); > --- > -2.40.0 > - > diff --git a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch b/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch > deleted file mode 100644 > index 299ecbc2ed..0000000000 > --- a/package/libopenssl/0006-Harden-asn1-oid-loader-to-invalid-inputs.patch > +++ /dev/null > @@ -1,122 +0,0 @@ > -From a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 Mon Sep 17 00:00:00 2001 > -From: Neil Horman > -Date: Tue, 5 Dec 2023 15:24:20 -0500 > -Subject: [PATCH] Harden asn1 oid loader to invalid inputs > - > -In the event that a config file contains this sequence: > -======= > -openssl_conf = openssl_init > - > -config_diagnostics = 1 > - > -[openssl_init] > -oid_section = oids > - > -[oids] > -testoid1 = 1.2.3.4.1 > -testoid2 = A Very Long OID Name, 1.2.3.4.2 > -testoid3 = ,1.2.3.4.3 > -====== > - > -The leading comma in testoid3 can cause a heap buffer overflow, as the > -parsing code will move the string pointer back 1 character, thereby > -pointing to an invalid memory space > - > -correct the parser to detect this condition and handle it by treating it > -as if the comma doesn't exist (i.e. an empty long oid name) > - > -Reviewed-by: Hugo Landau > -Reviewed-by: Tomas Mraz > -(Merged from https://github.com/openssl/openssl/pull/22957) > -Upstream: https://github.com/openssl/openssl/commit/a552c23c6502592c1b3c67d93dd7e5ffbe958aa4 > -Signed-off-by: Martin Kurbanov > ---- > - apps/asn1parse.c | 2 +- > - crypto/asn1/asn_moid.c | 4 ++++ > - test/recipes/04-test_asn1_parse.t | 26 ++++++++++++++++++++++++++ > - test/test_asn1_parse.cnf | 12 ++++++++++++ > - 4 files changed, 43 insertions(+), 1 deletion(-) > - create mode 100644 test/recipes/04-test_asn1_parse.t > - create mode 100644 test/test_asn1_parse.cnf > - > -diff --git a/apps/asn1parse.c b/apps/asn1parse.c > -index 6597a6180b..bf62f85947 100644 > ---- a/apps/asn1parse.c > -+++ b/apps/asn1parse.c > -@@ -178,7 +178,7 @@ int asn1parse_main(int argc, char **argv) > - > - if ((buf = BUF_MEM_new()) == NULL) > - goto end; > -- if (genstr == NULL && informat == FORMAT_PEM) { > -+ if (genconf == NULL && genstr == NULL && informat == FORMAT_PEM) { > - if (PEM_read_bio(in, &name, &header, &str, &num) != 1) { > - BIO_printf(bio_err, "Error reading PEM file\n"); > - ERR_print_errors(bio_err); > -diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c > -index 6f816307af..1e183f4f18 100644 > ---- a/crypto/asn1/asn_moid.c > -+++ b/crypto/asn1/asn_moid.c > -@@ -67,6 +67,10 @@ static int do_create(const char *value, const char *name) > - if (p == NULL) { > - ln = name; > - ostr = value; > -+ } else if (p == value) { > -+ /* we started with a leading comma */ > -+ ln = name; > -+ ostr = p + 1; > - } else { > - ln = value; > - ostr = p + 1; > -diff --git a/test/recipes/04-test_asn1_parse.t b/test/recipes/04-test_asn1_parse.t > -new file mode 100644 > -index 0000000000..f3af436592 > ---- /dev/null > -+++ b/test/recipes/04-test_asn1_parse.t > -@@ -0,0 +1,26 @@ > -+#! /usr/bin/env perl > -+# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved. > -+# > -+# Licensed under the Apache License 2.0 (the "License"). You may not use > -+# this file except in compliance with the License. You can obtain a copy > -+# in the file LICENSE in the source distribution or at > -+# https://www.openssl.org/source/license.html > -+ > -+use strict; > -+use OpenSSL::Test qw(:DEFAULT srctop_file); > -+use OpenSSL::Test::Utils; > -+ > -+setup("test_asn1_parse"); > -+ > -+plan tests => 3; > -+ > -+$ENV{OPENSSL_CONF} = srctop_file("test", "test_asn1_parse.cnf"); > -+ > -+ok(run(app(([ 'openssl', 'asn1parse', > -+ '-genstr', 'OID:1.2.3.4.1'])))); > -+ > -+ok(run(app(([ 'openssl', 'asn1parse', > -+ '-genstr', 'OID:1.2.3.4.2'])))); > -+ > -+ok(run(app(([ 'openssl', 'asn1parse', > -+ '-genstr', 'OID:1.2.3.4.3'])))); > -diff --git a/test/test_asn1_parse.cnf b/test/test_asn1_parse.cnf > -new file mode 100644 > -index 0000000000..5f0305657e > ---- /dev/null > -+++ b/test/test_asn1_parse.cnf > -@@ -0,0 +1,12 @@ > -+openssl_conf = openssl_init > -+ > -+# Comment out the next line to ignore configuration errors > -+config_diagnostics = 1 > -+ > -+[openssl_init] > -+oid_section = oids > -+ > -+[oids] > -+testoid1 = 1.2.3.4.1 > -+testoid2 = A Very Long OID Name, 1.2.3.4.2 > -+testoid3 = ,1.2.3.4.3 > --- > -2.40.0 > - > diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash > index 9e09e12461..841d4b4cfd 100644 > --- a/package/libopenssl/libopenssl.hash > +++ b/package/libopenssl/libopenssl.hash > @@ -1,5 +1,5 @@ > -# From https://www.openssl.org/source/openssl-3.2.0.tar.gz.sha256 > -sha256 14c826f07c7e433706fb5c69fa9e25dab95684844b4c962a2cf1bf183eb4690e openssl-3.2.0.tar.gz > +# From https://www.openssl.org/source/openssl-3.2.1.tar.gz.sha256 > +sha256 83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39 openssl-3.2.1.tar.gz > > # License files > sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt > diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk > index 7dc6d93256..feb5026c02 100644 > --- a/package/libopenssl/libopenssl.mk > +++ b/package/libopenssl/libopenssl.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBOPENSSL_VERSION = 3.2.0 > +LIBOPENSSL_VERSION = 3.2.1 > LIBOPENSSL_SITE = https://www.openssl.org/source > LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz > LIBOPENSSL_LICENSE = Apache-2.0 > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 21:46:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:46:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/heimdal: Fix build with autoconf-2.72 In-Reply-To: <20240210103634.3502847-1-bernd@kuhls.net> References: <20240210103634.3502847-1-bernd@kuhls.net> Message-ID: <20240211224621.32d6eb40@windsurf> On Sat, 10 Feb 2024 11:36:34 +0100 Bernd Kuhls wrote: > +-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then > ++if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then Could you provide more details? I don't see the relation ship between this change and the build failure. Also, you're using && while the rest of the test is using -a. And you're testing if the strong is non empty *after* testing if it's different from no. We really need more details. Thanks a lot! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From fontaine.fabrice at gmail.com Sun Feb 11 21:47:51 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 22:47:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/shadow: drop BR2_PACKAGE_SHADOW_UTMPX Message-ID: <20240211214751.2522403-1-fontaine.fabrice@gmail.com> utmpx is not available since bump to version 4.14.3 in commit 8a01774d9897310c00a0945865f5a6d5167dfca3 and https://github.com/shadow-maint/shadow/commit/3be7b9d75a6b73fe24394d7ac1e315d60d45b5ee: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-utmpx Fixes: 8a01774d9897310c00a0945865f5a6d5167dfca3 Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 6 ++++++ package/shadow/Config.in | 5 ----- package/shadow/shadow.mk | 6 ------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index a869279af7..576148c4af 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_SHADOW_UTMPX + bool "shadow utmpx removed" + select BR2_LEGACY + help + UTMPX has been dropped by upstream. + config BR2_PACKAGE_TINYMEMBENCH bool "tinymembench removed" select BR2_LEGACY diff --git a/package/shadow/Config.in b/package/shadow/Config.in index e85e5884d2..230271af7d 100644 --- a/package/shadow/Config.in +++ b/package/shadow/Config.in @@ -31,11 +31,6 @@ comment "account-tools-setuid needs a toolchain w/ dynamic library, wchar, local depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -config BR2_PACKAGE_SHADOW_UTMPX - bool "utmpx" - help - Enable loggin in utmpx / wtmpx. - config BR2_PACKAGE_SHADOW_SUBORDINATE_IDS bool "subordinate-ids" help diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 03eb16a3f4..1e7ada6148 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -43,12 +43,6 @@ else SHADOW_CONF_OPTS += --disable-account-tools-setuid endif -ifeq ($(BR2_PACKAGE_SHADOW_UTMPX),y) -SHADOW_CONF_OPTS += --enable-utmpx -else -SHADOW_CONF_OPTS += --disable-utmpx -endif - ifeq ($(BR2_PACKAGE_SHADOW_SUBORDINATE_IDS),y) SHADOW_CONF_OPTS += --enable-subordinate-ids define SHADOW_SUBORDINATE_IDS_PERMISSIONS -- 2.43.0 From thomas.petazzoni at bootlin.com Sun Feb 11 21:48:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:48:36 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add ghostscript runtime test In-Reply-To: <20240209192923.1201371-1-ju.o@free.fr> References: <20240209192923.1201371-1-ju.o@free.fr> Message-ID: <20240211224836.70745fbd@windsurf> On Fri, 9 Feb 2024 20:29:23 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 2 + > .../testing/tests/package/test_ghostscript.py | 48 +++++++++++++++++++ > .../rootfs-overlay/root/document.ps | 9 ++++ > 3 files changed, 59 insertions(+) > create mode 100644 support/testing/tests/package/test_ghostscript.py > create mode 100644 support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:48:43 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:48:43 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add iozone runtime test In-Reply-To: <20240209193743.1204013-1-ju.o@free.fr> References: <20240209193743.1204013-1-ju.o@free.fr> Message-ID: <20240211224843.36f35b11@windsurf> On Fri, 9 Feb 2024 20:37:43 +0100 Julien Olivain wrote: > Signed-off-by: Julien Olivain > --- > DEVELOPERS | 1 + > support/testing/tests/package/test_iozone.py | 22 ++++++++++++++++++++ > 2 files changed, 23 insertions(+) > create mode 100644 support/testing/tests/package/test_iozone.py Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From james.hilliard1 at gmail.com Sun Feb 11 21:49:04 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 14:49:04 -0700 Subject: [Buildroot] [PATCH v2 2/2] package/python-cython: bump to version 3.0.8 In-Reply-To: <20240211214904.89575-1-james.hilliard1@gmail.com> References: <20240211214904.89575-1-james.hilliard1@gmail.com> Message-ID: <20240211214904.89575-2-james.hilliard1@gmail.com> License hash changed due to changing links from http to https: https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 Signed-off-by: James Hilliard --- package/python-cython/python-cython.hash | 6 +++--- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 08ad8f6d84..55e4a6f203 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 a4d0f9fbc9c137f1a88937cd40e8c5ee Cython-0.29.36.tar.gz -sha256 41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f Cython-0.29.36.tar.gz +md5 9f7baaa983e1bd06eaeb4fa0adfc77e5 Cython-3.0.8.tar.gz +sha256 8333423d8fd5765e7cceea3a9985dd1e0a5dfeb2734629e1a2ed2d6233d39de6 Cython-3.0.8.tar.gz # Locally computed sha256 checksums -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt +sha256 9568a2b155e66ac3e0ba1fd80b52b827b9460e6cf6f233125e7cbca8e206ddc3 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 47e105c065..d76bfb766d 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.36 +PYTHON_CYTHON_VERSION = 3.0.8 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -- 2.34.1 From james.hilliard1 at gmail.com Sun Feb 11 21:49:03 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 14:49:03 -0700 Subject: [Buildroot] [PATCH v2 1/2] package/python-uvloop: add support for cython3 Message-ID: <20240211214904.89575-1-james.hilliard1@gmail.com> Add patches from pending upstream pull request which add cython3 compatibility. These patches have been in use by gentoo so they should be have a decent amount of real world testing/usage. See: https://github.com/gentoo/gentoo/commit/cd37f8eb287497af5a30b3c68beafc82412cd88d Signed-off-by: James Hilliard --- Changes v1 -> v2: - fix header for check-package --- .../0001-Updates-for-Cython3.patch | 630 ++++++++++++++++++ ...ebug-has-args-difference-in-python-3.patch | 29 + .../0003-fix-tests-on-python-3.8.patch | 30 + .../0004-fix-arg-count-for-wrap.patch | 51 ++ 4 files changed, 740 insertions(+) create mode 100644 package/python-uvloop/0001-Updates-for-Cython3.patch create mode 100644 package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch create mode 100644 package/python-uvloop/0003-fix-tests-on-python-3.8.patch create mode 100644 package/python-uvloop/0004-fix-arg-count-for-wrap.patch diff --git a/package/python-uvloop/0001-Updates-for-Cython3.patch b/package/python-uvloop/0001-Updates-for-Cython3.patch new file mode 100644 index 0000000000..5ed1c7536f --- /dev/null +++ b/package/python-uvloop/0001-Updates-for-Cython3.patch @@ -0,0 +1,630 @@ +From 087a2983c8022598232cb7ed0a49da334d7af9ff Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 12:18:15 +0000 +Subject: [PATCH] Updates for Cython3 Remove SSL depreciation warnings buillt + on debian 12.6 python-3.22 Cython-3.0.7 libuv-1.46.0 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + Makefile | 2 +- + setup.py | 6 ++++-- + tests/test_process.py | 4 ++-- + tests/test_tcp.py | 19 ++++++++++++------- + uvloop/_testbase.py | 4 +++- + uvloop/cbhandles.pyx | 4 ++-- + uvloop/dns.pyx | 4 ++-- + uvloop/handles/basetransport.pxd | 4 ++-- + uvloop/handles/basetransport.pyx | 4 ++-- + uvloop/handles/handle.pyx | 2 +- + uvloop/handles/pipe.pyx | 2 +- + uvloop/handles/poll.pxd | 2 +- + uvloop/handles/poll.pyx | 2 +- + uvloop/handles/stream.pyx | 16 ++++++++++------ + uvloop/handles/udp.pyx | 4 ++-- + uvloop/includes/consts.pxi | 25 ------------------------- + uvloop/includes/fork_handler.h | 6 +++++- + uvloop/includes/system.h | 16 ++++++++++++++++ + uvloop/includes/system.pxd | 12 ++++-------- + uvloop/includes/uv.pxd | 6 +++--- + uvloop/loop.pxd | 28 ++++++++++++++++++++++++---- + uvloop/loop.pyx | 10 +++++----- + uvloop/sslproto.pxd | 4 ++-- + uvloop/sslproto.pyx | 4 ++-- + 24 files changed, 107 insertions(+), 83 deletions(-) + delete mode 100644 uvloop/includes/consts.pxi + create mode 100755 uvloop/includes/system.h + +diff --git a/Makefile b/Makefile +index 4375e5d..6a0475a 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,7 @@ _default: compile + + + clean: +- rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd ++ rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd + rm -fr uvloop/*.c uvloop/*.html uvloop/*.so + rm -fr uvloop/handles/*.html uvloop/includes/*.html + find . -name '__pycache__' | xargs rm -rf +diff --git a/setup.py b/setup.py +index ba15af5..8fdf0e5 100644 +--- a/setup.py ++++ b/setup.py +@@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext + from setuptools.command.sdist import sdist + + +-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)' ++CYTHON_DEPENDENCY = 'Cython(>=0.29.36)' + MACHINE = platform.machine() + MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')] + _ROOT = pathlib.Path(__file__).parent +@@ -144,7 +144,9 @@ class uvloop_build_ext(build_ext): + self.distribution.ext_modules[:] = cythonize( + self.distribution.ext_modules, + compiler_directives=directives, +- annotate=self.cython_annotate) ++ annotate=self.cython_annotate, ++ compile_time_env=dict(DEFAULT_FREELIST_SIZE=250, SSL_READ_MAX_SIZE=256 * 1024), ++ emit_linenums=True) + + super().finalize_options() + +diff --git a/tests/test_process.py b/tests/test_process.py +index bfcbba1..95e1c9e 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -912,7 +912,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +@@ -931,7 +931,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +diff --git a/tests/test_tcp.py b/tests/test_tcp.py +index 812e62b..213e2d9 100644 +--- a/tests/test_tcp.py ++++ b/tests/test_tcp.py +@@ -1630,17 +1630,22 @@ class _TestSSL(tb.SSLTestCase): + self.fail("unexpected call to connection_made()") + + def test_ssl_connect_accepted_socket(self): +- if hasattr(ssl, 'PROTOCOL_TLS'): +- proto = ssl.PROTOCOL_TLS ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ server_proto = ssl.PROTOCOL_TLS_SERVER ++ client_proto = ssl.PROTOCOL_TLS_CLIENT + else: +- proto = ssl.PROTOCOL_SSLv23 +- server_context = ssl.SSLContext(proto) ++ if hasattr(ssl, 'PROTOCOL_TLS'): ++ client_proto = server_proto = ssl.PROTOCOL_TLS ++ else: ++ client_proto = server_proto = ssl.PROTOCOL_SSLv23 ++ ++ server_context = ssl.SSLContext(server_proto) + server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY) + if hasattr(server_context, 'check_hostname'): + server_context.check_hostname = False + server_context.verify_mode = ssl.CERT_NONE + +- client_context = ssl.SSLContext(proto) ++ client_context = ssl.SSLContext(client_proto) + if hasattr(server_context, 'check_hostname'): + client_context.check_hostname = False + client_context.verify_mode = ssl.CERT_NONE +@@ -2233,7 +2238,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx.use_privatekey_file(self.ONLYKEY) + sslctx.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + def server(sock): +@@ -2592,7 +2597,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx_openssl.use_privatekey_file(self.ONLYKEY) + sslctx_openssl.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + future = None +diff --git a/uvloop/_testbase.py b/uvloop/_testbase.py +index c4a7595..e620e15 100644 +--- a/uvloop/_testbase.py ++++ b/uvloop/_testbase.py +@@ -269,7 +269,9 @@ def find_free_port(start_from=50000): + class SSLTestCase: + + def _create_server_ssl_context(self, certfile, keyfile=None): +- if hasattr(ssl, 'PROTOCOL_TLS'): ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) ++ elif hasattr(ssl, 'PROTOCOL_TLS'): + sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS) + else: + sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) +diff --git a/uvloop/cbhandles.pyx b/uvloop/cbhandles.pyx +index 2914b42..8bcc5aa 100644 +--- a/uvloop/cbhandles.pyx ++++ b/uvloop/cbhandles.pyx +@@ -76,8 +76,8 @@ cdef class Handle: + self.arg1, self.arg2, self.arg3, self.arg4) + + else: +- raise RuntimeError('invalid Handle.cb_type: {}'.format( +- cb_type)) ++ raise RuntimeError('invalid Handle.cb_type: {} {!r}/{!r}'.format( ++ cb_type, self.args1, self.args2)) + + except (KeyboardInterrupt, SystemExit): + raise +diff --git a/uvloop/dns.pyx b/uvloop/dns.pyx +index 7aad631..09b9282 100644 +--- a/uvloop/dns.pyx ++++ b/uvloop/dns.pyx +@@ -298,7 +298,7 @@ cdef class AddrInfo: + uv.uv_freeaddrinfo(self.data) # returns void + self.data = NULL + +- cdef void set_data(self, system.addrinfo *data): ++ cdef void set_data(self, system.addrinfo *data) noexcept: + self.data = data + + cdef unpack(self): +@@ -326,7 +326,7 @@ cdef class AddrInfo: + return result + + @staticmethod +- cdef int isinstance(object other): ++ cdef int isinstance(object other) noexcept: + return type(other) is AddrInfo + + +diff --git a/uvloop/handles/basetransport.pxd b/uvloop/handles/basetransport.pxd +index ba356a7..8112622 100644 +--- a/uvloop/handles/basetransport.pxd ++++ b/uvloop/handles/basetransport.pxd +@@ -47,8 +47,8 @@ cdef class UVBaseTransport(UVSocketHandle): + # === overloads === + + cdef _new_socket(self) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + +- cdef bint _is_reading(self) ++ cdef bint _is_reading(self) noexcept + cdef _start_reading(self) + cdef _stop_reading(self) +diff --git a/uvloop/handles/basetransport.pyx b/uvloop/handles/basetransport.pyx +index 28b3079..a8592f2 100644 +--- a/uvloop/handles/basetransport.pyx ++++ b/uvloop/handles/basetransport.pyx +@@ -18,7 +18,7 @@ cdef class UVBaseTransport(UVSocketHandle): + + self._closing = 0 + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return 0 + + cdef inline _schedule_call_connection_made(self): +@@ -211,7 +211,7 @@ cdef class UVBaseTransport(UVSocketHandle): + self._extra_info = {} + self._extra_info[name] = obj + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + raise NotImplementedError + + cdef _start_reading(self): +diff --git a/uvloop/handles/handle.pyx b/uvloop/handles/handle.pyx +index 6efe375..2c96458 100644 +--- a/uvloop/handles/handle.pyx ++++ b/uvloop/handles/handle.pyx +@@ -363,7 +363,7 @@ cdef void __uv_close_handle_cb(uv.uv_handle_t* handle) noexcept with gil: + Py_DECREF(h) # Was INCREFed in UVHandle._close + + +-cdef void __close_all_handles(Loop loop): ++cdef void __close_all_handles(Loop loop) noexcept: + uv.uv_walk(loop.uvloop, + __uv_walk_close_all_handles_cb, + loop) # void +diff --git a/uvloop/handles/pipe.pyx b/uvloop/handles/pipe.pyx +index 195576c..d30a736 100644 +--- a/uvloop/handles/pipe.pyx ++++ b/uvloop/handles/pipe.pyx +@@ -25,7 +25,7 @@ cdef __pipe_init_uv_handle(UVStream handle, Loop loop): + cdef __pipe_open(UVStream handle, int fd): + cdef int err + err = uv.uv_pipe_open(handle._handle, +- fd) ++ fd) + if err < 0: + exc = convert_error(err) + raise exc +diff --git a/uvloop/handles/poll.pxd b/uvloop/handles/poll.pxd +index d07030b..c220540 100644 +--- a/uvloop/handles/poll.pxd ++++ b/uvloop/handles/poll.pxd +@@ -10,7 +10,7 @@ cdef class UVPoll(UVHandle): + cdef inline _poll_start(self, int flags) + cdef inline _poll_stop(self) + +- cdef int is_active(self) ++ cdef int is_active(self) noexcept + + cdef is_reading(self) + cdef is_writing(self) +diff --git a/uvloop/handles/poll.pyx b/uvloop/handles/poll.pyx +index fca5981..c905e9b 100644 +--- a/uvloop/handles/poll.pyx ++++ b/uvloop/handles/poll.pyx +@@ -29,7 +29,7 @@ cdef class UVPoll(UVHandle): + handle._init(loop, fd) + return handle + +- cdef int is_active(self): ++ cdef int is_active(self) noexcept: + return (self.reading_handle is not None or + self.writing_handle is not None) + +diff --git a/uvloop/handles/stream.pyx b/uvloop/handles/stream.pyx +index d4e02e3..09df887 100644 +--- a/uvloop/handles/stream.pyx ++++ b/uvloop/handles/stream.pyx +@@ -1,4 +1,8 @@ +-DEF __PREALLOCED_BUFS = 4 ++cdef extern from *: ++ ''' ++ enum {__PREALLOCED_BUFS = 4}; ++ ''' ++ const bint __PREALLOCED_BUFS + + + @cython.no_gc_clear +@@ -279,7 +283,7 @@ cdef class UVStream(UVBaseTransport): + cdef inline _close_on_read_error(self): + self.__read_error_close = 1 + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__reading + + cdef _start_reading(self): +@@ -578,7 +582,7 @@ cdef class UVStream(UVBaseTransport): + + self._maybe_resume_protocol() + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return ((self._handle).write_queue_size + +@@ -755,7 +759,7 @@ cdef inline bint __uv_stream_on_read_common( + UVStream sc, + Loop loop, + ssize_t nread, +-): ++) noexcept: + if sc._closed: + # The stream was closed, there is no reason to + # do any work now. +@@ -818,7 +822,7 @@ cdef inline void __uv_stream_on_read_impl( + uv.uv_stream_t* stream, + ssize_t nread, + const uv.uv_buf_t* buf, +-): ++) noexcept: + cdef: + UVStream sc = stream.data + Loop loop = sc._loop +@@ -849,7 +853,7 @@ cdef inline void __uv_stream_on_read_impl( + cdef inline void __uv_stream_on_write_impl( + uv.uv_write_t* req, + int status, +-): ++) noexcept: + cdef: + _StreamWriteContext ctx = <_StreamWriteContext> req.data + UVStream stream = ctx.stream +diff --git a/uvloop/handles/udp.pyx b/uvloop/handles/udp.pyx +index bbe60d5..fdd1d8b 100644 +--- a/uvloop/handles/udp.pyx ++++ b/uvloop/handles/udp.pyx +@@ -127,12 +127,12 @@ cdef class UDPTransport(UVBaseTransport): + exc = convert_error(err) + raise exc + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return (self._handle).send_queue_size + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__receiving + + cdef _start_reading(self): +diff --git a/uvloop/includes/consts.pxi b/uvloop/includes/consts.pxi +deleted file mode 100644 +index f765053..0000000 +--- a/uvloop/includes/consts.pxi ++++ /dev/null +@@ -1,25 +0,0 @@ +-DEF UV_STREAM_RECV_BUF_SIZE = 256000 # 250kb +- +-DEF FLOW_CONTROL_HIGH_WATER = 64 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB +- +-DEF DEFAULT_FREELIST_SIZE = 250 +-DEF DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 +- +-DEF DEBUG_STACK_DEPTH = 10 +- +- +-DEF __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 +- +- +-DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 +- +- +-# Number of seconds to wait for SSL handshake to complete +-# The default timeout matches that of Nginx. +-DEF SSL_HANDSHAKE_TIMEOUT = 60.0 +-# Number of seconds to wait for SSL shutdown to complete +-# The default timeout mimics lingering_time +-DEF SSL_SHUTDOWN_TIMEOUT = 30.0 +-DEF SSL_READ_MAX_SIZE = 256 * 1024 +diff --git a/uvloop/includes/fork_handler.h b/uvloop/includes/fork_handler.h +index 47bbe03..9d3573a 100644 +--- a/uvloop/includes/fork_handler.h ++++ b/uvloop/includes/fork_handler.h +@@ -1,7 +1,10 @@ ++#ifndef UVLOOP_FORK_HANDLER_H_ ++#define UVLOOP_FORK_HANDLER_H_ ++ + volatile uint64_t MAIN_THREAD_ID = 0; + volatile int8_t MAIN_THREAD_ID_SET = 0; + +-typedef void (*OnForkHandler)(); ++typedef void (*OnForkHandler)(void); + + OnForkHandler __forkHandler = NULL; + +@@ -36,3 +39,4 @@ void setMainThreadID(uint64_t id) { + MAIN_THREAD_ID = id; + MAIN_THREAD_ID_SET = 1; + } ++#endif +diff --git a/uvloop/includes/system.h b/uvloop/includes/system.h +new file mode 100755 +index 0000000..e143bb5 +--- /dev/null ++++ b/uvloop/includes/system.h +@@ -0,0 +1,16 @@ ++#ifndef UVLOOP_SYSTEM_H_ ++#define UVLOOP_SYSTEM_H_ ++#if defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER) ++#include "Winsock2.h" ++#include "ws2def.h" ++#include "includes/fork_handler.h" ++#else ++#include "arpa/inet.h" ++#include "sys/socket.h" ++#include "sys/un.h" ++#include "unistd.h" ++#include "pthread.h" ++#endif ++#endif ++ ++ +diff --git a/uvloop/includes/system.pxd b/uvloop/includes/system.pxd +index 367fedd..d1da74e 100644 +--- a/uvloop/includes/system.pxd ++++ b/uvloop/includes/system.pxd +@@ -1,13 +1,9 @@ + from libc.stdint cimport int8_t, uint64_t + +-cdef extern from "arpa/inet.h" nogil: +- +- int ntohl(int) +- int htonl(int) +- int ntohs(int) +- +- +-cdef extern from "sys/socket.h" nogil: ++cdef extern from "includes/system.h": ++ int ntohl(int) nogil ++ int htonl(int) nogil ++ int ntohs(int) nogil + + struct sockaddr: + unsigned short sa_family +diff --git a/uvloop/includes/uv.pxd b/uvloop/includes/uv.pxd +index 8765130..ddd9738 100644 +--- a/uvloop/includes/uv.pxd ++++ b/uvloop/includes/uv.pxd +@@ -220,7 +220,7 @@ cdef extern from "uv.h" nogil: + UV_LEAVE_GROUP = 0, + UV_JOIN_GROUP + +- cpdef enum uv_fs_event: ++ cdef enum uv_fs_event: + UV_RENAME = 1, + UV_CHANGE = 2 + +@@ -282,7 +282,7 @@ cdef extern from "uv.h" nogil: + int uv_loop_close(uv_loop_t* loop) + int uv_loop_alive(uv_loop_t* loop) + int uv_loop_fork(uv_loop_t* loop) +- int uv_backend_fd(uv_loop_t* loop) ++ uv_os_fd_t uv_backend_fd(uv_loop_t* loop) + + void uv_update_time(uv_loop_t* loop) + uint64_t uv_now(const uv_loop_t*) +@@ -378,7 +378,7 @@ cdef extern from "uv.h" nogil: + # Pipes + + int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) +- int uv_pipe_open(uv_pipe_t* handle, uv_file file) ++ int uv_pipe_open(uv_pipe_t* handle, uv_os_fd_t file) + int uv_pipe_bind(uv_pipe_t* handle, const char* name) + + void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index 5613473..f90c704 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -1,15 +1,35 @@ + # cython: language_level=3 + ++cdef extern from *: ++ ''' ++ enum { UV_STREAM_RECV_BUF_SIZE = 256000, ++ SSL_READ_MAX_SIZE = 256 * 1024, // 250kb ++ }; ++ const float SSL_HANDSHAKE_TIMEOUT = 60.0; // Number of seconds to wait for SSL handshake to complete The default timeout matches that of Nginx. ++ const float SSL_SHUTDOWN_TIMEOUT = 30.0; // Number of seconds to wait for SSL shutdown to complete The default timeout mimics lingering_time ++ ''' ++ const bint UV_STREAM_RECV_BUF_SIZE ++ const bint SSL_READ_MAX_SIZE ++ ++ const float SSL_HANDSHAKE_TIMEOUT ++ const float SSL_SHUTDOWN_TIMEOUT ++ ++cdef enum: ++ FLOW_CONTROL_HIGH_WATER = 64 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB ++ ++ DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 ++ DEBUG_STACK_DEPTH = 10 ++ __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 ++ LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 ++ + + from .includes cimport uv + from .includes cimport system + + from libc.stdint cimport uint64_t, uint32_t, int64_t + +- +-include "includes/consts.pxi" +- +- + cdef extern from *: + ctypedef int vint "volatile int" + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 334d8d5..53e1160 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -43,7 +43,7 @@ from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer + from . import _noop + + +-include "includes/consts.pxi" ++ + include "includes/stdlib.pxi" + + include "errors.pyx" +@@ -1118,7 +1118,7 @@ cdef class Loop: + + cdef _sock_set_reuseport(self, int fd): + cdef: +- int err ++ int err = 0 + int reuseport_flag = 1 + + err = system.setsockopt( +@@ -1397,7 +1397,7 @@ cdef class Loop: + self._debug = bool(enabled) + if self.is_running(): + self.call_soon_threadsafe( +- self._set_coroutine_debug, self, self._debug) ++ self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +@@ -2750,7 +2750,7 @@ cdef class Loop: + executable=None, + pass_fds=(), + # For tests only! Do not use in your code. Ever. +- __uvloop_sleep_after_fork=False): ++ uvloop_sleep_after_fork=False): + + # TODO: Implement close_fds (might not be very important in + # Python 3.5, since all FDs aren't inheritable by default.) +@@ -2770,7 +2770,7 @@ cdef class Loop: + if executable is not None: + args[0] = executable + +- if __uvloop_sleep_after_fork: ++ if uvloop_sleep_after_fork: + debug_flags |= __PROCESS_DEBUG_SLEEP_AFTER_FORK + + waiter = self._new_future() +diff --git a/uvloop/sslproto.pxd b/uvloop/sslproto.pxd +index 3da10f0..68e4d57 100644 +--- a/uvloop/sslproto.pxd ++++ b/uvloop/sslproto.pxd +@@ -122,7 +122,7 @@ cdef class SSLProtocol: + # Flow control for writes from APP socket + + cdef _control_app_writing(self, object context=*) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + cdef _set_write_buffer_limits(self, high=*, low=*) + + # Flow control for reads to APP socket +@@ -134,5 +134,5 @@ cdef class SSLProtocol: + + cdef _control_ssl_reading(self) + cdef _set_read_buffer_limits(self, high=*, low=*) +- cdef size_t _get_read_buffer_size(self) ++ cdef size_t _get_read_buffer_size(self) noexcept + cdef _fatal_error(self, exc, message=*) +diff --git a/uvloop/sslproto.pyx b/uvloop/sslproto.pyx +index 42bb764..0a43746 100644 +--- a/uvloop/sslproto.pyx ++++ b/uvloop/sslproto.pyx +@@ -861,7 +861,7 @@ cdef class SSLProtocol: + 'protocol': self, + }) + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return self._outgoing.pending + self._write_buffer_size + + cdef _set_write_buffer_limits(self, high=None, low=None): +@@ -903,7 +903,7 @@ cdef class SSLProtocol: + self._incoming_high_water = high + self._incoming_low_water = low + +- cdef size_t _get_read_buffer_size(self): ++ cdef size_t _get_read_buffer_size(self) noexcept: + return self._incoming.pending + + # Flow control for writes to SSL socket +-- +2.34.1 + diff --git a/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch new file mode 100644 index 0000000000..0567eebe82 --- /dev/null +++ b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch @@ -0,0 +1,29 @@ +From 8b63801bfdb1f0cf7fde4f58e96f8628a587b186 Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 16:17:49 +0000 +Subject: [PATCH] _set_coroutine_debug has args difference in python 3.11 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pyx | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 53e1160..5ca718e 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,8 +1396,9 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): ++ args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) + self.call_soon_threadsafe( +- self._set_coroutine_debug, self._debug) ++ self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0003-fix-tests-on-python-3.8.patch b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch new file mode 100644 index 0000000000..e9bed5e877 --- /dev/null +++ b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch @@ -0,0 +1,30 @@ +From ef5c3e5c6f331692ebcbea9e4c6aead8b2187038 Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 19:58:11 +0000 +Subject: [PATCH] fix tests on python 3.8 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pyx | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 5ca718e..75b915a 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,9 +1396,8 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe( +- self._set_coroutine_debug, *args) ++ args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) ++ self.call_soon_threadsafe(self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0004-fix-arg-count-for-wrap.patch b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch new file mode 100644 index 0000000000..d19923a5bc --- /dev/null +++ b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch @@ -0,0 +1,51 @@ +From afef6364c2c3100ab23c2bb2de82d2da330b258c Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Fri, 29 Dec 2023 11:24:19 +0000 +Subject: [PATCH] fix arg count for wrap() + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pxd | 2 +- + uvloop/loop.pyx | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index f90c704..d34ffeb 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -220,7 +220,7 @@ cdef class Loop: + cdef inline _ceval_process_signals(self) + cdef _invoke_signals(self, bytes data) + +- cdef _set_coroutine_debug(self, bint enabled) ++ cpdef _set_coroutine_debug(self, bint enabled) + + cdef _print_debug_info(self) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 75b915a..a3eeb60 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1131,7 +1131,7 @@ cdef class Loop: + if err < 0: + raise convert_error(-errno.errno) + +- cdef _set_coroutine_debug(self, bint enabled): ++ cpdef _set_coroutine_debug(self, bint enabled): + enabled = bool(enabled) + if self._coroutine_debug_set == enabled: + return +@@ -1396,8 +1396,7 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe(self._set_coroutine_debug, *args) ++ self.call_soon_threadsafe(self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + -- 2.34.1 From ju.o at free.fr Sun Feb 11 21:49:35 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 11 Feb 2024 22:49:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: bump to version 3.0.17 Message-ID: <20240211214935.1603160-1-ju.o@free.fr> For commit logs, see: https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ Signed-off-by: Julien Olivain --- package/gnu-efi/gnu-efi.hash | 6 +++--- package/gnu-efi/gnu-efi.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gnu-efi/gnu-efi.hash b/package/gnu-efi/gnu-efi.hash index 251a99e5d7..7d98650991 100644 --- a/package/gnu-efi/gnu-efi.hash +++ b/package/gnu-efi/gnu-efi.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/gnu-efi/files -md5 192d94e995ddd4ebdce4903adfd06039 gnu-efi-3.0.15.tar.bz2 -sha1 40c8a4715cf8c409a093c8d2ca9f5d5b24d73058 gnu-efi-3.0.15.tar.bz2 +md5 832496719182e7d6a4b12bc7c0b534d2 gnu-efi-3.0.17.tar.bz2 +sha1 9715285022124b231520d58b26709f5ab338e981 gnu-efi-3.0.17.tar.bz2 # Locally computed -sha256 931a257b9c5c1ba65ff519f18373c438a26825f2db7866b163e96d1b168f20ea gnu-efi-3.0.15.tar.bz2 +sha256 7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4 gnu-efi-3.0.17.tar.bz2 sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 686a14be01..8b9a6aa4c6 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNU_EFI_VERSION = 3.0.15 +GNU_EFI_VERSION = 3.0.17 GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2 GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi GNU_EFI_INSTALL_STAGING = YES -- 2.43.0 From thomas.petazzoni at bootlin.com Sun Feb 11 21:49:38 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:49:38 +0100 Subject: [Buildroot] [git commit] support/testing: add iozone runtime test Message-ID: <20240211214949.4DD4787804@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e728889e8c8aeab4dde27210e983e295c0e21068 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_iozone.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index caf8a5fb37..26868f74fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1792,6 +1792,7 @@ F: support/testing/tests/package/test_gnuradio/ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf3.py F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py diff --git a/support/testing/tests/package/test_iozone.py b/support/testing/tests/package/test_iozone.py new file mode 100644 index 0000000000..9a9843df56 --- /dev/null +++ b/support/testing/tests/package/test_iozone.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestIozone(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IOZONE=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]) + self.emulator.login() + + self.assertRunOk("iozone -v") + self.assertRunOk("iozone -s64 -r4") From thomas.petazzoni at bootlin.com Sun Feb 11 21:49:37 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:49:37 +0100 Subject: [Buildroot] [git commit] support/testing: add ghostscript runtime test Message-ID: <20240211214949.4352887803@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72c4c5740d52220669b519f6b76d80b748dc012a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_ghostscript.py | 48 ++++++++++++++++++++++ .../rootfs-overlay/root/document.ps | 9 ++++ 3 files changed, 59 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 8234d578cf..caf8a5fb37 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1782,6 +1782,8 @@ F: support/testing/tests/package/test_fluidsynth.py F: support/testing/tests/package/test_fluidsynth/ F: support/testing/tests/package/test_fping.py F: support/testing/tests/package/test_gawk.py +F: support/testing/tests/package/test_ghostscript.py +F: support/testing/tests/package/test_ghostscript/ F: support/testing/tests/package/test_glslsandbox_player.py F: support/testing/tests/package/test_glslsandbox_player/ F: support/testing/tests/package/test_gnupg2.py diff --git a/support/testing/tests/package/test_ghostscript.py b/support/testing/tests/package/test_ghostscript.py new file mode 100644 index 0000000000..3c6c16ef2c --- /dev/null +++ b/support/testing/tests/package/test_ghostscript.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestGhostscript(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_ghostscript/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_GHOSTSCRIPT=y + BR2_PACKAGE_TESSERACT_OCR=y + BR2_PACKAGE_TESSERACT_OCR_LANG_ENG=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("gs --version") + + doc_basename = "document" + ps_file = doc_basename + ".ps" + pgm_file = doc_basename + ".pgm" + txt_file = doc_basename + ".txt" + + # Render a basic PostScript file to an image file. + cmd = "gs -dSAFER -dBATCH -dNOPAUSE -sDEVICE=pgmraw -r150" + cmd += f" -dTextAlphaBits=4 -sOutputFile='{pgm_file}' {ps_file}" + self.assertRunOk(cmd) + + # Run text recognition on the image file. + cmd = f"tesseract {pgm_file} {doc_basename}" + self.assertRunOk(cmd, timeout=30) + + # Check we extracted the expected string from the input + # PostScript file. + cmd = f"cat {txt_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello Buildroot!") diff --git a/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps b/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps new file mode 100644 index 0000000000..5ca2b3581f --- /dev/null +++ b/support/testing/tests/package/test_ghostscript/rootfs-overlay/root/document.ps @@ -0,0 +1,9 @@ +%!PS +% See: PostScript: Language Reference, third edition +% Example 5.1, page 314 +% https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf +/Helvetica findfont +16 scalefont setfont +54 720 moveto +(Hello Buildroot!) show +showpage From thomas.petazzoni at bootlin.com Sun Feb 11 21:49:36 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:49:36 +0100 Subject: [Buildroot] [git commit] package/ghostscript: security bump to version 10.02.1 Message-ID: <20240211214949.38A2F87802@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c456fefb9120ef9a9580b1a97d6fd67b90a42a82 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For release note, see: https://ghostscript.readthedocs.io/en/gs10.02.1/News.html For detailed history, see: https://git.ghostscript.com/?p=ghostpdl.git;a=shortlog;h=refs/tags/ghostpdl-10.02.1 Fixes: - CVE-2023-46751: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-46751 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ghostscript/ghostscript.hash | 4 ++-- package/ghostscript/ghostscript.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 77c8faccbe..849f6c64ba 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10020/SHA512SUMS -sha512 c49344151063e915add55a0a842c2a645d8362a5cbca663bd07638f4bd3699a08cade37a9efe905ad5a41e014353e5e1b1268b7925e43128ad30d5b031396b71 ghostscript-10.02.0.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10021/SHA512SUMS +sha512 ee0f754c1bd8a18428ad14eaa3ead80ff8b96275af5012e7a8384f1f10490da056eec9ae3cc791a7a13a24e16e54df5bccdd109c7d53a14534bbd7360a300b11 ghostscript-10.02.1.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 161521f970..da23ebbadb 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.02.0 +GHOSTSCRIPT_VERSION = 10.02.1 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 From yann.morin.1998 at free.fr Sun Feb 11 21:57:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 22:57:51 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-11 14:39 -0700, James Hilliard spake thusly: > On Sun, Feb 11, 2024 at 2:24?PM Yann E. MORIN wrote: > > On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > > > Add patches from pending upstream pull request which add cython3 > > > compatibility. > > We are a little bit cautious at applying random patches that have not > > yet been at least reviewd by upstream. In this case, there has not been > > any upstream activity since the last release, and not muc before that > > either... > Well these patches are being used by gentoo so they are not entirely > untested in the real world. It's not that they are tested or not. It is about whether they'll have a chance to be accepted upstream, or whether we'll have to carry and maintain them forever in Buildroot. Maybe it's time that someone pings upstream about that PR? > > We have no in-tree user of uvloop, so I wonder whether it makes snse to > > keep it, espcially since it mau be blocking the bumps of other packages > > (like cython 3.x being required by whats-its-name). > That's not entirely true, it's a common optional dependency for packages > like python-uvicorn for example. $ git grep -i -E python.uvloop would turn only python-uvloop itself, and its runtime test. If it is only optional, and prevents us from updating unless we apply non-upstreamable patches, then I'd argue we should drop it. [--SNIP--] > I'll fix and resend. Thanks. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 11 22:02:22 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 11 Feb 2024 23:02:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/jack2: fix build with python 3.12 Message-ID: <20240211220223.2819553-1-fontaine.fabrice@gmail.com> Fix the following build failure with python 3.12 (which removed imp module): Traceback (most recent call last): File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/./waf", line 166, in from waflib import Scripting File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Scripting.py", line 10, in from waflib import Utils, Configure, Logs, Options, ConfigSet, Context, Errors, Build, Node File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Configure.py", line 16, in from waflib import ConfigSet, Utils, Options, Logs, Context, Build, Errors File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Options.py", line 14, in from waflib import Logs, Utils, Context, Errors File "/home/autobuild/autobuild/instance-7/output-1/build/jack2-1.9.22/waflib/Context.py", line 9, in import os, re, imp, sys ModuleNotFoundError: No module named 'imp' Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 - http://autobuild.buildroot.org/results/1bfe34e10ffdab80647ac01863165e93bcc9b0d8 Signed-off-by: Fabrice Fontaine --- package/jack2/0001-Update-to-waf-2-0-26.patch | 3480 +++++++++++++++++ 1 file changed, 3480 insertions(+) create mode 100644 package/jack2/0001-Update-to-waf-2-0-26.patch diff --git a/package/jack2/0001-Update-to-waf-2-0-26.patch b/package/jack2/0001-Update-to-waf-2-0-26.patch new file mode 100644 index 0000000000..8471de09bc --- /dev/null +++ b/package/jack2/0001-Update-to-waf-2-0-26.patch @@ -0,0 +1,3480 @@ +From 553ca1e649293ef87e96dd3e7621fd87e0b59986 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Tue, 29 Aug 2023 12:41:46 +0200 +Subject: [PATCH] Update to waf 2.0.26 + +This makes waf compatible with Python 3.12 again. + +Also, apply modifications needed for MacOS and add as a patch file (see +commits 0f2e3b2 and dc6c995). + +Signed-off-by: Nils Philippsen + +Upstream: https://github.com/jackaudio/jack2/pull/953/commits/553ca1e649293ef87e96dd3e7621fd87e0b59986 +Signed-off-by: Fabrice Fontaine +--- + waf | 7 +- + waflib-macos-mods.patch | 18 + + waflib/Build.py | 47 +- + waflib/ConfigSet.py | 2 +- + waflib/Configure.py | 46 +- + waflib/Context.py | 24 +- + waflib/Logs.py | 9 +- + waflib/Node.py | 3 +- + waflib/Options.py | 31 +- + waflib/Runner.py | 27 +- + waflib/Scripting.py | 27 +- + waflib/Task.py | 48 ++- + waflib/TaskGen.py | 16 +- + waflib/Tools/c_aliases.py | 10 +- + waflib/Tools/c_config.py | 37 +- + waflib/Tools/c_preproc.py | 6 +- + waflib/Tools/c_tests.py | 18 +- + waflib/Tools/ccroot.py | 20 +- + waflib/Tools/compiler_c.py | 25 +- + waflib/Tools/compiler_cxx.py | 25 +- + waflib/Tools/irixcc.py | 14 +- + waflib/Tools/msvc.py | 45 +- + waflib/Tools/waf_unit_test.py | 14 +- + waflib/Utils.py | 60 ++- + waflib/ansiterm.py | 2 +- + waflib/extras/clang_cross.py | 92 ++++ + waflib/extras/clang_cross_common.py | 113 +++++ + waflib/extras/clangxx_cross.py | 106 +++++ + waflib/extras/classic_runner.py | 68 +++ + waflib/extras/color_msvc.py | 59 +++ + waflib/extras/fc_fujitsu.py | 52 +++ + waflib/extras/fc_nfort.py | 52 +++ + waflib/extras/genpybind.py | 194 +++++++++ + waflib/extras/haxe.py | 154 +++++++ + waflib/extras/msvc_pdb.py | 46 ++ + waflib/extras/sphinx.py | 120 ++++++ + waflib/extras/wafcache.py | 648 ++++++++++++++++++++++++++++ + waflib/extras/xcode6.py | 18 +- + waflib/fixpy2.py | 2 +- + waflib/processor.py | 4 + + 40 files changed, 2114 insertions(+), 195 deletions(-) + create mode 100644 waflib-macos-mods.patch + create mode 100644 waflib/extras/clang_cross.py + create mode 100644 waflib/extras/clang_cross_common.py + create mode 100644 waflib/extras/clangxx_cross.py + create mode 100644 waflib/extras/classic_runner.py + create mode 100644 waflib/extras/color_msvc.py + create mode 100644 waflib/extras/fc_fujitsu.py + create mode 100644 waflib/extras/fc_nfort.py + create mode 100644 waflib/extras/genpybind.py + create mode 100644 waflib/extras/haxe.py + create mode 100644 waflib/extras/msvc_pdb.py + create mode 100644 waflib/extras/sphinx.py + create mode 100644 waflib/extras/wafcache.py + +diff --git a/waf b/waf +index 845fba5e9..38b2c9106 100755 +--- a/waf ++++ b/waf +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/env python + # encoding: latin-1 + # Thomas Nagy, 2005-2018 + # +@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. + + import os, sys, inspect + +-VERSION="2.0.12" ++VERSION="2.0.26" + REVISION="x" + GIT="x" + INSTALL="x" +@@ -142,6 +142,9 @@ def find_lib(): + if name.endswith('waf-light'): + w = test(base) + if w: return w ++ for dir in sys.path: ++ if test(dir): ++ return dir + err('waf-light requires waflib -> export WAFDIR=/folder') + + dirname = '%s-%s-%s' % (WAF, VERSION, REVISION) +diff --git a/waflib-macos-mods.patch b/waflib-macos-mods.patch +new file mode 100644 +index 000000000..9e2c8a3de +--- /dev/null ++++ b/waflib-macos-mods.patch +@@ -0,0 +1,18 @@ ++diff --git a/waflib/Tools/ccroot.py b/waflib/Tools/ccroot.py ++index cfef8bf5..484846f5 100644 ++--- a/waflib/Tools/ccroot.py +++++ b/waflib/Tools/ccroot.py ++@@ -575,12 +575,10 @@ def apply_vnum(self): ++ ++ cnum = getattr(self, 'cnum', str(nums[0])) ++ cnums = cnum.split('.') ++- if len(cnums)>len(nums) or nums[0:len(cnums)] != cnums: ++- raise Errors.WafError('invalid compatibility version %s' % cnum) ++ ++ libname = node.name ++ if libname.endswith('.dylib'): ++- name3 = libname.replace('.dylib', '.%s.dylib' % self.vnum) +++ name3 = libname.replace('.dylib', '.%s.dylib' % cnums[0]) ++ name2 = libname.replace('.dylib', '.%s.dylib' % cnum) ++ else: ++ name3 = libname + '.' + self.vnum +diff --git a/waflib/Build.py b/waflib/Build.py +index c9661df15..b49dd8302 100644 +--- a/waflib/Build.py ++++ b/waflib/Build.py +@@ -104,7 +104,7 @@ def __init__(self, **kw): + """Amount of jobs to run in parallel""" + + self.targets = Options.options.targets +- """List of targets to build (default: \*)""" ++ """List of targets to build (default: \\*)""" + + self.keep = Options.options.keep + """Whether the build should continue past errors""" +@@ -753,10 +753,12 @@ def tgpost(tg): + else: + ln = self.launch_node() + if ln.is_child_of(self.bldnode): +- Logs.warn('Building from the build directory, forcing --targets=*') ++ if Logs.verbose > 1: ++ Logs.warn('Building from the build directory, forcing --targets=*') + ln = self.srcnode + elif not ln.is_child_of(self.srcnode): +- Logs.warn('CWD %s is not under %s, forcing --targets=* (run distclean?)', ln.abspath(), self.srcnode.abspath()) ++ if Logs.verbose > 1: ++ Logs.warn('CWD %s is not under %s, forcing --targets=* (run distclean?)', ln.abspath(), self.srcnode.abspath()) + ln = self.srcnode + + def is_post(tg, ln): +@@ -1054,7 +1056,7 @@ def post_run(self): + def get_install_path(self, destdir=True): + """ + Returns the destination path where files will be installed, pre-pending `destdir`. +- ++ + Relative paths will be interpreted relative to `PREFIX` if no `destdir` is given. + + :rtype: string +@@ -1062,11 +1064,11 @@ def get_install_path(self, destdir=True): + if isinstance(self.install_to, Node.Node): + dest = self.install_to.abspath() + else: +- dest = Utils.subst_vars(self.install_to, self.env) ++ dest = os.path.normpath(Utils.subst_vars(self.install_to, self.env)) + if not os.path.isabs(dest): +- dest = os.path.join(self.env.PREFIX, dest) ++ dest = os.path.join(self.env.PREFIX, dest) + if destdir and Options.options.destdir: +- dest = os.path.join(Options.options.destdir, os.path.splitdrive(dest)[1].lstrip(os.sep)) ++ dest = Options.options.destdir.rstrip(os.sep) + os.sep + os.path.splitdrive(dest)[1].lstrip(os.sep) + return dest + + def copy_fun(self, src, tgt): +@@ -1160,11 +1162,19 @@ def do_install(self, src, tgt, lbl, **kw): + # same size and identical timestamps -> make no copy + if st1.st_mtime + 2 >= st2.st_mtime and st1.st_size == st2.st_size: + if not self.generator.bld.progress_bar: +- Logs.info('- install %s (from %s)', tgt, lbl) ++ ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ ++ Logs.info('%s- install %s%s%s (from %s)', c1, c2, tgt, c1, lbl) + return False + + if not self.generator.bld.progress_bar: +- Logs.info('+ install %s (from %s)', tgt, lbl) ++ ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ ++ Logs.info('%s+ install %s%s%s (from %s)', c1, c2, tgt, c1, lbl) + + # Give best attempt at making destination overwritable, + # like the 'install' utility used by 'make install' does. +@@ -1221,14 +1231,18 @@ def do_link(self, src, tgt, **kw): + """ + if os.path.islink(tgt) and os.readlink(tgt) == src: + if not self.generator.bld.progress_bar: +- Logs.info('- symlink %s (to %s)', tgt, src) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s- symlink %s%s%s (to %s)', c1, c2, tgt, c1, src) + else: + try: + os.remove(tgt) + except OSError: + pass + if not self.generator.bld.progress_bar: +- Logs.info('+ symlink %s (to %s)', tgt, src) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s+ symlink %s%s%s (to %s)', c1, c2, tgt, c1, src) + os.symlink(src, tgt) + self.fix_perms(tgt) + +@@ -1237,7 +1251,9 @@ def do_uninstall(self, src, tgt, lbl, **kw): + See :py:meth:`waflib.Build.inst.do_install` + """ + if not self.generator.bld.progress_bar: +- Logs.info('- remove %s', tgt) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s- remove %s%s%s', c1, c2, tgt, c1) + + #self.uninstall.append(tgt) + try: +@@ -1257,7 +1273,9 @@ def do_unlink(self, src, tgt, **kw): + """ + try: + if not self.generator.bld.progress_bar: +- Logs.info('- remove %s', tgt) ++ c1 = Logs.colors.NORMAL ++ c2 = Logs.colors.BLUE ++ Logs.info('%s- remove %s%s%s', c1, c2, tgt, c1) + os.remove(tgt) + except OSError: + pass +@@ -1318,7 +1336,8 @@ def build(bld): + lst = [] + for env in self.all_envs.values(): + lst.extend(self.root.find_or_declare(f) for f in env[CFG_FILES]) +- for n in self.bldnode.ant_glob('**/*', excl='.lock* *conf_check_*/** config.log c4che/*', quiet=True): ++ excluded_dirs = '.lock* *conf_check_*/** config.log %s/*' % CACHE_DIR ++ for n in self.bldnode.ant_glob('**/*', excl=excluded_dirs, quiet=True): + if n in lst: + continue + n.delete() +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index 84736c9c8..901fba6c0 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -11,7 +11,7 @@ + + import copy, re, os + from waflib import Logs, Utils +-re_imp = re.compile('^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) ++re_imp = re.compile(r'^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) + + class ConfigSet(object): + """ +diff --git a/waflib/Configure.py b/waflib/Configure.py +index d0a4793a8..f6fdc4e94 100644 +--- a/waflib/Configure.py ++++ b/waflib/Configure.py +@@ -125,7 +125,7 @@ def init_dirs(self): + self.bldnode.mkdir() + + if not os.path.isdir(self.bldnode.abspath()): +- conf.fatal('Could not create the build directory %s' % self.bldnode.abspath()) ++ self.fatal('Could not create the build directory %s' % self.bldnode.abspath()) + + def execute(self): + """ +@@ -180,6 +180,7 @@ def execute(self): + env.hash = self.hash + env.files = self.files + env.environ = dict(self.environ) ++ env.launch_dir = Context.launch_dir + + if not (self.env.NO_LOCK_IN_RUN or env.environ.get('NO_LOCK_IN_RUN') or getattr(Options.options, 'no_lock_in_run')): + env.store(os.path.join(Context.run_dir, Options.lockfile)) +@@ -438,7 +439,7 @@ def find_program(self, filename, **kw): + + var = kw.get('var', '') + if not var: +- var = re.sub(r'[-.]', '_', filename[0].upper()) ++ var = re.sub(r'\W', '_', filename[0].upper()) + + path_list = kw.get('path_list', '') + if path_list: +@@ -507,23 +508,27 @@ def find_binary(self, filenames, exts, paths): + @conf + def run_build(self, *k, **kw): + """ +- Create a temporary build context to execute a build. A reference to that build +- context is kept on self.test_bld for debugging purposes, and you should not rely +- on it too much (read the note on the cache below). +- The parameters given in the arguments to this function are passed as arguments for +- a single task generator created in the build. Only three parameters are obligatory: ++ Create a temporary build context to execute a build. A temporary reference to that build ++ context is kept on self.test_bld for debugging purposes. ++ The arguments to this function are passed to a single task generator for that build. ++ Only three parameters are mandatory: + + :param features: features to pass to a task generator created in the build + :type features: list of string + :param compile_filename: file to create for the compilation (default: *test.c*) + :type compile_filename: string +- :param code: code to write in the filename to compile ++ :param code: input file contents + :type code: string + +- Though this function returns *0* by default, the build may set an attribute named *retval* on the ++ Though this function returns *0* by default, the build may bind attribute named *retval* on the + build context object to return a particular value. See :py:func:`waflib.Tools.c_config.test_exec_fun` for example. + +- This function also provides a limited cache. To use it, provide the following option:: ++ The temporary builds creates a temporary folder; the name of that folder is calculated ++ by hashing input arguments to this function, with the exception of :py:class:`waflib.ConfigSet.ConfigSet` ++ objects which are used for both reading and writing values. ++ ++ This function also features a cache which is disabled by default; that cache relies ++ on the hash value calculated as indicated above:: + + def options(opt): + opt.add_option('--confcache', dest='confcache', default=0, +@@ -534,10 +539,24 @@ def options(opt): + $ waf configure --confcache + + """ +- lst = [str(v) for (p, v) in kw.items() if p != 'env'] +- h = Utils.h_list(lst) ++ buf = [] ++ for key in sorted(kw.keys()): ++ v = kw[key] ++ if isinstance(v, ConfigSet.ConfigSet): ++ # values are being written to, so they are excluded from contributing to the hash ++ continue ++ elif hasattr(v, '__call__'): ++ buf.append(Utils.h_fun(v)) ++ else: ++ buf.append(str(v)) ++ h = Utils.h_list(buf) + dir = self.bldnode.abspath() + os.sep + (not Utils.is_win32 and '.' or '') + 'conf_check_' + Utils.to_hex(h) + ++ cachemode = kw.get('confcache', getattr(Options.options, 'confcache', None)) ++ ++ if not cachemode and os.path.exists(dir): ++ shutil.rmtree(dir) ++ + try: + os.makedirs(dir) + except OSError: +@@ -548,7 +567,6 @@ def options(opt): + except OSError: + self.fatal('cannot use the configuration test folder %r' % dir) + +- cachemode = getattr(Options.options, 'confcache', None) + if cachemode == 1: + try: + proj = ConfigSet.ConfigSet(os.path.join(dir, 'cache_run_build')) +@@ -588,7 +606,7 @@ def options(opt): + else: + ret = getattr(bld, 'retval', 0) + finally: +- if cachemode == 1: ++ if cachemode: + # cache the results each time + proj = ConfigSet.ConfigSet() + proj['cache_run_build'] = ret +diff --git a/waflib/Context.py b/waflib/Context.py +index 761b521f5..369664819 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -6,20 +6,30 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, sys + from waflib import Utils, Errors, Logs + import waflib.Node + ++if sys.hexversion > 0x3040000: ++ import types ++ class imp(object): ++ new_module = lambda x: types.ModuleType(x) ++else: ++ import imp ++ + # the following 3 constants are updated on each new release (do not touch) +-HEXVERSION=0x2000c00 ++HEXVERSION=0x2001a00 + """Constant updated on new releases""" + +-WAFVERSION="2.0.12" ++WAFVERSION="2.0.26" + """Constant updated on new releases""" + +-WAFREVISION="54841218840ffa34fddf834680a5a17db69caa12" ++WAFREVISION="0fb985ce1932c6f3e7533f435e4ee209d673776e" + """Git revision when the waf version is updated""" + ++WAFNAME="waf" ++"""Application name displayed on --help""" ++ + ABI = 20 + """Version of the build data cache file format (used in :py:const:`waflib.Context.DBFILE`)""" + +@@ -134,7 +144,7 @@ def foo(ctx): + :type fun: string + + .. inheritance-diagram:: waflib.Context.Context waflib.Build.BuildContext waflib.Build.InstallContext waflib.Build.UninstallContext waflib.Build.StepContext waflib.Build.ListContext waflib.Configure.ConfigurationContext waflib.Scripting.Dist waflib.Scripting.DistCheck waflib.Build.CleanContext +- ++ :top-classes: waflib.Context.Context + """ + + errors = Errors +@@ -613,7 +623,7 @@ def load_special_tools(self, var, ban=[]): + is typically called once for a programming language group, see for + example :py:mod:`waflib.Tools.compiler_c` + +- :param var: glob expression, for example 'cxx\_\*.py' ++ :param var: glob expression, for example 'cxx\\_\\*.py' + :type var: string + :param ban: list of exact file names to exclude + :type ban: list of string +@@ -678,7 +688,7 @@ def load_module(path, encoding=None): + + def load_tool(tool, tooldir=None, ctx=None, with_sys_path=True): + """ +- Importx a Waf tool as a python module, and stores it in the dict :py:const:`waflib.Context.Context.tools` ++ Imports a Waf tool as a python module, and stores it in the dict :py:const:`waflib.Context.Context.tools` + + :type tool: string + :param tool: Name of the tool +diff --git a/waflib/Logs.py b/waflib/Logs.py +index 2a475169b..298411db5 100644 +--- a/waflib/Logs.py ++++ b/waflib/Logs.py +@@ -237,7 +237,10 @@ def format(self, rec): + if rec.levelno >= logging.INFO: + # the goal of this is to format without the leading "Logs, hour" prefix + if rec.args: +- return msg % rec.args ++ try: ++ return msg % rec.args ++ except UnicodeDecodeError: ++ return msg.encode('utf-8') % rec.args + return msg + + rec.msg = msg +@@ -276,9 +279,9 @@ def error(*k, **kw): + + def warn(*k, **kw): + """ +- Wraps logging.warn ++ Wraps logging.warning + """ +- log.warn(*k, **kw) ++ log.warning(*k, **kw) + + def info(*k, **kw): + """ +diff --git a/waflib/Node.py b/waflib/Node.py +index 4ac1ea8a0..2ad184669 100644 +--- a/waflib/Node.py ++++ b/waflib/Node.py +@@ -73,7 +73,7 @@ def ant_matcher(s, ignorecase): + if k == '**': + accu.append(k) + else: +- k = k.replace('.', '[.]').replace('*','.*').replace('?', '.').replace('+', '\\+') ++ k = k.replace('.', '[.]').replace('*', '.*').replace('?', '.').replace('+', '\\+') + k = '^%s$' % k + try: + exp = re.compile(k, flags=reflags) +@@ -595,7 +595,6 @@ def ant_iter(self, accept=None, maxdepth=25, pats=[], dir=False, src=True, remov + :rtype: iterator + """ + dircont = self.listdir() +- dircont.sort() + + try: + lst = set(self.children.keys()) +diff --git a/waflib/Options.py b/waflib/Options.py +index ad802d4b9..d4104917c 100644 +--- a/waflib/Options.py ++++ b/waflib/Options.py +@@ -44,7 +44,7 @@ class opt_parser(optparse.OptionParser): + """ + def __init__(self, ctx, allow_unknown=False): + optparse.OptionParser.__init__(self, conflict_handler='resolve', add_help_option=False, +- version='waf %s (%s)' % (Context.WAFVERSION, Context.WAFREVISION)) ++ version='%s %s (%s)' % (Context.WAFNAME, Context.WAFVERSION, Context.WAFREVISION)) + self.formatter.width = Logs.get_term_cols() + self.ctx = ctx + self.allow_unknown = allow_unknown +@@ -62,6 +62,21 @@ def _process_args(self, largs, rargs, values): + else: + self.error(str(e)) + ++ def _process_long_opt(self, rargs, values): ++ # --custom-option=-ftxyz is interpreted as -f -t... see #2280 ++ if self.allow_unknown: ++ back = [] + rargs ++ try: ++ optparse.OptionParser._process_long_opt(self, rargs, values) ++ except optparse.BadOptionError: ++ while rargs: ++ rargs.pop() ++ rargs.extend(back) ++ rargs.pop(0) ++ raise ++ else: ++ optparse.OptionParser._process_long_opt(self, rargs, values) ++ + def print_usage(self, file=None): + return self.print_help(file) + +@@ -96,11 +111,11 @@ def get_usage(self): + lst.sort() + ret = '\n'.join(lst) + +- return '''waf [commands] [options] ++ return '''%s [commands] [options] + +-Main commands (example: ./waf build -j4) ++Main commands (example: ./%s build -j4) + %s +-''' % ret ++''' % (Context.WAFNAME, Context.WAFNAME, ret) + + + class OptionsContext(Context.Context): +@@ -141,9 +156,9 @@ def __init__(self, **kw): + gr.add_option('-o', '--out', action='store', default='', help='build dir for the project', dest='out') + gr.add_option('-t', '--top', action='store', default='', help='src dir for the project', dest='top') + +- gr.add_option('--no-lock-in-run', action='store_true', default='', help=optparse.SUPPRESS_HELP, dest='no_lock_in_run') +- gr.add_option('--no-lock-in-out', action='store_true', default='', help=optparse.SUPPRESS_HELP, dest='no_lock_in_out') +- gr.add_option('--no-lock-in-top', action='store_true', default='', help=optparse.SUPPRESS_HELP, dest='no_lock_in_top') ++ gr.add_option('--no-lock-in-run', action='store_true', default=os.environ.get('NO_LOCK_IN_RUN', ''), help=optparse.SUPPRESS_HELP, dest='no_lock_in_run') ++ gr.add_option('--no-lock-in-out', action='store_true', default=os.environ.get('NO_LOCK_IN_OUT', ''), help=optparse.SUPPRESS_HELP, dest='no_lock_in_out') ++ gr.add_option('--no-lock-in-top', action='store_true', default=os.environ.get('NO_LOCK_IN_TOP', ''), help=optparse.SUPPRESS_HELP, dest='no_lock_in_top') + + default_prefix = getattr(Context.g_module, 'default_prefix', os.environ.get('PREFIX')) + if not default_prefix: +@@ -282,6 +297,8 @@ def parse_cmd_args(self, _args=None, cwd=None, allow_unknown=False): + elif arg != 'options': + commands.append(arg) + ++ if options.jobs < 1: ++ options.jobs = 1 + for name in 'top out destdir prefix bindir libdir'.split(): + # those paths are usually expanded from Context.launch_dir + if getattr(options, name, None): +diff --git a/waflib/Runner.py b/waflib/Runner.py +index 261084d27..350c86a22 100644 +--- a/waflib/Runner.py ++++ b/waflib/Runner.py +@@ -37,6 +37,8 @@ def __len__(self): + return len(self.lst) + def __iter__(self): + return iter(self.lst) ++ def __str__(self): ++ return 'PriorityTasks: [%s]' % '\n '.join(str(x) for x in self.lst) + def clear(self): + self.lst = [] + def append(self, task): +@@ -69,7 +71,7 @@ def __init__(self, spawner, task): + """Task to execute""" + self.spawner = spawner + """Coordinator object""" +- self.setDaemon(1) ++ self.daemon = True + self.start() + def run(self): + """ +@@ -96,7 +98,7 @@ def __init__(self, master): + """:py:class:`waflib.Runner.Parallel` producer instance""" + self.sem = Utils.threading.Semaphore(master.numjobs) + """Bounded semaphore that prevents spawning more than *n* concurrent consumers""" +- self.setDaemon(1) ++ self.daemon = True + self.start() + def run(self): + """ +@@ -181,10 +183,12 @@ def __init__(self, bld, j=2): + The reverse dependency graph of dependencies obtained from Task.run_after + """ + +- self.spawner = Spawner(self) ++ self.spawner = None + """ + Coordinating daemon thread that spawns thread consumers + """ ++ if self.numjobs > 1: ++ self.spawner = Spawner(self) + + def get_next_task(self): + """ +@@ -254,6 +258,8 @@ def refill_task_list(self): + self.outstanding.append(x) + break + else: ++ if self.stop or self.error: ++ break + raise Errors.WafError('Broken revdeps detected on %r' % self.incomplete) + else: + tasks = next(self.biter) +@@ -331,11 +337,16 @@ def try_unfreeze(x): + + if hasattr(tsk, 'semaphore'): + sem = tsk.semaphore +- sem.release(tsk) +- while sem.waiting and not sem.is_locked(): +- # take a frozen task, make it ready to run +- x = sem.waiting.pop() +- self._add_task(x) ++ try: ++ sem.release(tsk) ++ except KeyError: ++ # TODO ++ pass ++ else: ++ while sem.waiting and not sem.is_locked(): ++ # take a frozen task, make it ready to run ++ x = sem.waiting.pop() ++ self._add_task(x) + + def get_out(self): + """ +diff --git a/waflib/Scripting.py b/waflib/Scripting.py +index 749d4f2e6..a80cb3678 100644 +--- a/waflib/Scripting.py ++++ b/waflib/Scripting.py +@@ -216,7 +216,10 @@ def parse_options(): + ctx = Context.create_context('options') + ctx.execute() + if not Options.commands: +- Options.commands.append(default_cmd) ++ if isinstance(default_cmd, list): ++ Options.commands.extend(default_cmd) ++ else: ++ Options.commands.append(default_cmd) + if Options.options.whelp: + ctx.parser.print_help() + sys.exit(0) +@@ -280,7 +283,7 @@ def distclean_dir(dirname): + pass + + try: +- shutil.rmtree('c4che') ++ shutil.rmtree(Build.CACHE_DIR) + except OSError: + pass + +@@ -303,7 +306,7 @@ def remove_and_log(k, fun): + + # remove a build folder, if any + cur = '.' +- if ctx.options.no_lock_in_top: ++ if os.environ.get('NO_LOCK_IN_TOP') or ctx.options.no_lock_in_top: + cur = ctx.options.out + + try: +@@ -329,7 +332,12 @@ def remove_and_log(k, fun): + else: + remove_and_log(env.out_dir, shutil.rmtree) + +- for k in (env.out_dir, env.top_dir, env.run_dir): ++ env_dirs = [env.out_dir] ++ if not (os.environ.get('NO_LOCK_IN_TOP') or ctx.options.no_lock_in_top): ++ env_dirs.append(env.top_dir) ++ if not (os.environ.get('NO_LOCK_IN_RUN') or ctx.options.no_lock_in_run): ++ env_dirs.append(env.run_dir) ++ for k in env_dirs: + p = os.path.join(k, Options.lockfile) + remove_and_log(p, os.remove) + +@@ -380,7 +388,11 @@ def archive(self): + + for x in files: + archive_name = self.get_base_name() + '/' + x.path_from(self.base_path) +- zip.write(x.abspath(), archive_name, zipfile.ZIP_DEFLATED) ++ if os.environ.get('SOURCE_DATE_EPOCH'): ++ # TODO: parse that timestamp ++ zip.writestr(zipfile.ZipInfo(archive_name), x.read(), zipfile.ZIP_DEFLATED) ++ else: ++ zip.write(x.abspath(), archive_name, zipfile.ZIP_DEFLATED) + zip.close() + else: + self.fatal('Valid algo types are tar.bz2, tar.gz, tar.xz or zip') +@@ -417,6 +429,8 @@ def add_tar_file(self, x, tar): + tinfo.gid = 0 + tinfo.uname = 'root' + tinfo.gname = 'root' ++ if os.environ.get('SOURCE_DATE_EPOCH'): ++ tinfo.mtime = int(os.environ.get('SOURCE_DATE_EPOCH')) + + if os.path.isfile(p): + with open(p, 'rb') as f: +@@ -598,12 +612,15 @@ def execute(self): + cmd = env.config_cmd or 'configure' + if Configure.autoconfig == 'clobber': + tmp = Options.options.__dict__ ++ launch_dir_tmp = Context.launch_dir + if env.options: + Options.options.__dict__ = env.options ++ Context.launch_dir = env.launch_dir + try: + run_command(cmd) + finally: + Options.options.__dict__ = tmp ++ Context.launch_dir = launch_dir_tmp + else: + run_command(cmd) + run_command(self.cmd) +diff --git a/waflib/Task.py b/waflib/Task.py +index 6aebc6074..cb49a7394 100644 +--- a/waflib/Task.py ++++ b/waflib/Task.py +@@ -163,10 +163,10 @@ class Task(evil): + """File extensions that objects of this task class may create""" + + before = [] +- """List of task class names to execute before instances of this class""" ++ """The instances of this class are executed before the instances of classes whose names are in this list""" + + after = [] +- """List of task class names to execute after instances of this class""" ++ """The instances of this class are executed after the instances of classes whose names are in this list""" + + hcode = Utils.SIG_NIL + """String representing an additional hash for the class representation""" +@@ -306,25 +306,31 @@ def exec_command(self, cmd, **kw): + if hasattr(self, 'stderr'): + kw['stderr'] = self.stderr + +- # workaround for command line length limit: +- # http://support.microsoft.com/kb/830473 +- if not isinstance(cmd, str) and (len(repr(cmd)) >= 8192 if Utils.is_win32 else len(cmd) > 200000): +- cmd, args = self.split_argfile(cmd) +- try: +- (fd, tmp) = tempfile.mkstemp() +- os.write(fd, '\r\n'.join(args).encode()) +- os.close(fd) +- if Logs.verbose: +- Logs.debug('argfile: @%r -> %r', tmp, args) +- return self.generator.bld.exec_command(cmd + ['@' + tmp], **kw) +- finally: ++ if not isinstance(cmd, str): ++ if Utils.is_win32: ++ # win32 compares the resulting length http://support.microsoft.com/kb/830473 ++ too_long = sum([len(arg) for arg in cmd]) + len(cmd) > 8192 ++ else: ++ # non-win32 counts the amount of arguments (200k) ++ too_long = len(cmd) > 200000 ++ ++ if too_long and getattr(self, 'allow_argsfile', True): ++ # Shunt arguments to a temporary file if the command is too long. ++ cmd, args = self.split_argfile(cmd) + try: +- os.remove(tmp) +- except OSError: +- # anti-virus and indexers can keep files open -_- +- pass +- else: +- return self.generator.bld.exec_command(cmd, **kw) ++ (fd, tmp) = tempfile.mkstemp() ++ os.write(fd, '\r\n'.join(args).encode()) ++ os.close(fd) ++ if Logs.verbose: ++ Logs.debug('argfile: @%r -> %r', tmp, args) ++ return self.generator.bld.exec_command(cmd + ['@' + tmp], **kw) ++ finally: ++ try: ++ os.remove(tmp) ++ except OSError: ++ # anti-virus and indexers can keep files open -_- ++ pass ++ return self.generator.bld.exec_command(cmd, **kw) + + def process(self): + """ +@@ -1044,7 +1050,7 @@ def funex(c): + exec(c, dc) + return dc['f'] + +-re_cond = re.compile('(?P\w+)|(?P\|)|(?P&)') ++re_cond = re.compile(r'(?P\w+)|(?P\|)|(?P&)') + re_novar = re.compile(r'^(SRC|TGT)\W+.*?$') + reg_act = re.compile(r'(?P\\)|(?P\$\$)|(?P\$\{(?P\w+)(?P.*?)\})', re.M) + def compile_fun_shell(line): +diff --git a/waflib/TaskGen.py b/waflib/TaskGen.py +index a74e6431d..32468f03d 100644 +--- a/waflib/TaskGen.py ++++ b/waflib/TaskGen.py +@@ -74,7 +74,7 @@ def __init__(self, *k, **kw): + else: + self.bld = kw['bld'] + self.env = self.bld.env.derive() +- self.path = self.bld.path # emulate chdir when reading scripts ++ self.path = kw.get('path', self.bld.path) # by default, emulate chdir when reading scripts + + # Provide a unique index per folder + # This is part of a measure to prevent output file name collisions +@@ -400,7 +400,7 @@ def feature(*k): + Decorator that registers a task generator method that will be executed when the + object attribute ``feature`` contains the corresponding key(s):: + +- from waflib.Task import feature ++ from waflib.TaskGen import feature + @feature('myfeature') + def myfunction(self): + print('that is my feature!') +@@ -631,12 +631,8 @@ def chmod_fun(tsk): + cls.scan = self.scan + elif has_deps: + def scan(self): +- nodes = [] +- for x in self.generator.to_list(getattr(self.generator, 'deps', None)): +- node = self.generator.path.find_resource(x) +- if not node: +- self.generator.bld.fatal('Could not find %r (was it declared?)' % x) +- nodes.append(node) ++ deps = getattr(self.generator, 'deps', None) ++ nodes = self.generator.to_nodes(deps) + return [nodes, []] + cls.scan = scan + +@@ -727,7 +723,7 @@ def sequence_order(self): + self.bld.prev = self + + +-re_m4 = re.compile('@(\w+)@', re.M) ++re_m4 = re.compile(r'@(\w+)@', re.M) + + class subst_pc(Task.Task): + """ +@@ -905,7 +901,7 @@ def build(bld): + # paranoid safety measure for the general case foo.in->foo.h with ambiguous dependencies + for xt in HEADER_EXTS: + if b.name.endswith(xt): +- tsk.ext_in = tsk.ext_in + ['.h'] ++ tsk.ext_out = tsk.ext_out + ['.h'] + break + + inst_to = getattr(self, 'install_path', None) +diff --git a/waflib/Tools/c_aliases.py b/waflib/Tools/c_aliases.py +index c9d53692e..928cfe29c 100644 +--- a/waflib/Tools/c_aliases.py ++++ b/waflib/Tools/c_aliases.py +@@ -38,7 +38,7 @@ def sniff_features(**kw): + :return: the list of features for a task generator processing the source files + :rtype: list of string + """ +- exts = get_extensions(kw['source']) ++ exts = get_extensions(kw.get('source', [])) + typ = kw['typ'] + feats = [] + +@@ -47,10 +47,12 @@ def sniff_features(**kw): + if x in exts: + feats.append('cxx') + break +- + if 'c' in exts or 'vala' in exts or 'gs' in exts: + feats.append('c') + ++ if 's' in exts or 'S' in exts: ++ feats.append('asm') ++ + for x in 'f f90 F F90 for FOR'.split(): + if x in exts: + feats.append('fc') +@@ -66,11 +68,11 @@ def sniff_features(**kw): + if typ in ('program', 'shlib', 'stlib'): + will_link = False + for x in feats: +- if x in ('cxx', 'd', 'fc', 'c'): ++ if x in ('cxx', 'd', 'fc', 'c', 'asm'): + feats.append(x + typ) + will_link = True + if not will_link and not kw.get('features', []): +- raise Errors.WafError('Cannot link from %r, try passing eg: features="c cprogram"?' % kw) ++ raise Errors.WafError('Unable to determine how to link %r, try adding eg: features="c cshlib"?' % kw) + return feats + + def set_features(kw, typ): +diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py +index d2b3c0d8f..f5ab19bf6 100644 +--- a/waflib/Tools/c_config.py ++++ b/waflib/Tools/c_config.py +@@ -68,6 +68,8 @@ + '__s390__' : 's390', + '__sh__' : 'sh', + '__xtensa__' : 'xtensa', ++'__e2k__' : 'e2k', ++'__riscv' : 'riscv', + } + + @conf +@@ -86,6 +88,10 @@ def configure(conf): + :type uselib_store: string + :param env: config set or conf.env by default + :type env: :py:class:`waflib.ConfigSet.ConfigSet` ++ :param force_static: force usage of static libraries ++ :type force_static: bool default False ++ :param posix: usage of POSIX mode for shlex lexical analiysis library ++ :type posix: bool default True + """ + + assert(isinstance(line, str)) +@@ -103,6 +109,8 @@ def configure(conf): + lex.commenters = '' + lst = list(lex) + ++ so_re = re.compile(r"\.so(?:\.[0-9]+)*$") ++ + # append_unique is not always possible + # for example, apple flags may require both -arch i386 and -arch ppc + uselib = uselib_store +@@ -144,7 +152,7 @@ def appu(var, val): + elif x.startswith('-std='): + prefix = 'CXXFLAGS' if '++' in x else 'CFLAGS' + app(prefix, x) +- elif x.startswith('+') or x in ('-pthread', '-fPIC', '-fpic', '-fPIE', '-fpie'): ++ elif x.startswith('+') or x in ('-pthread', '-fPIC', '-fpic', '-fPIE', '-fpie', '-flto', '-fno-lto'): + app('CFLAGS', x) + app('CXXFLAGS', x) + app('LINKFLAGS', x) +@@ -180,7 +188,7 @@ def appu(var, val): + app('CFLAGS', tmp) + app('CXXFLAGS', tmp) + app('LINKFLAGS', tmp) +- elif x.endswith(('.a', '.so', '.dylib', '.lib')): ++ elif x.endswith(('.a', '.dylib', '.lib')) or so_re.search(x): + appu('LINKFLAGS', x) # not cool, #762 + else: + self.to_log('Unhandled flag %r' % x) +@@ -246,13 +254,15 @@ def exec_cfg(self, kw): + * if modversion is given, then return the module version + * else, execute the *-config* program with the *args* and *variables* given, and set the flags on the *conf.env.FLAGS_name* variable + ++ :param path: the **-config program to use** ++ :type path: list of string + :param atleast_pkgconfig_version: minimum pkg-config version to use (disable other tests) + :type atleast_pkgconfig_version: string + :param package: package name, for example *gtk+-2.0* + :type package: string +- :param uselib_store: if the test is successful, define HAVE\_*name*. It is also used to define *conf.env.FLAGS_name* variables. ++ :param uselib_store: if the test is successful, define HAVE\\_*name*. It is also used to define *conf.env.FLAGS_name* variables. + :type uselib_store: string +- :param modversion: if provided, return the version of the given module and define *name*\_VERSION ++ :param modversion: if provided, return the version of the given module and define *name*\\_VERSION + :type modversion: string + :param args: arguments to give to *package* when retrieving flags + :type args: list of string +@@ -260,6 +270,12 @@ def exec_cfg(self, kw): + :type variables: list of string + :param define_variable: additional variables to define (also in conf.env.PKG_CONFIG_DEFINES) + :type define_variable: dict(string: string) ++ :param pkg_config_path: paths where pkg-config should search for .pc config files (overrides env.PKG_CONFIG_PATH if exists) ++ :type pkg_config_path: string, list of directories separated by colon ++ :param force_static: force usage of static libraries ++ :type force_static: bool default False ++ :param posix: usage of POSIX mode for shlex lexical analiysis library ++ :type posix: bool default True + """ + + path = Utils.to_list(kw['path']) +@@ -334,6 +350,7 @@ def check_cfg(self, *k, **kw): + """ + Checks for configuration flags using a **-config**-like program (pkg-config, sdl-config, etc). + This wraps internal calls to :py:func:`waflib.Tools.c_config.validate_cfg` and :py:func:`waflib.Tools.c_config.exec_cfg` ++ so check exec_cfg parameters descriptions for more details on kw passed + + A few examples:: + +@@ -659,20 +676,21 @@ class test_exec(Task.Task): + """ + color = 'PINK' + def run(self): ++ cmd = [self.inputs[0].abspath()] + getattr(self.generator, 'test_args', []) + if getattr(self.generator, 'rpath', None): + if getattr(self.generator, 'define_ret', False): +- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) ++ self.generator.bld.retval = self.generator.bld.cmd_and_log(cmd) + else: +- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) ++ self.generator.bld.retval = self.generator.bld.exec_command(cmd) + else: + env = self.env.env or {} + env.update(dict(os.environ)) + for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): + env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') + if getattr(self.generator, 'define_ret', False): +- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) ++ self.generator.bld.retval = self.generator.bld.cmd_and_log(cmd, env=env) + else: +- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) ++ self.generator.bld.retval = self.generator.bld.exec_command(cmd, env=env) + + @feature('test_exec') + @after_method('apply_link') +@@ -1266,10 +1284,11 @@ def to_log(self, *k, **kw): + tasks = [] + + id_to_task = {} +- for dct in k: ++ for counter, dct in enumerate(k): + x = Task.classes['cfgtask'](bld=bld, env=None) + tasks.append(x) + x.args = dct ++ x.args['multicheck_counter'] = counter + x.bld = bld + x.conf = self + x.args = dct +diff --git a/waflib/Tools/c_preproc.py b/waflib/Tools/c_preproc.py +index 7e04b4a7c..68e5f5aea 100644 +--- a/waflib/Tools/c_preproc.py ++++ b/waflib/Tools/c_preproc.py +@@ -75,13 +75,13 @@ class PreprocError(Errors.WafError): + re.IGNORECASE | re.MULTILINE) + """Match #include lines""" + +-re_mac = re.compile("^[a-zA-Z_]\w*") ++re_mac = re.compile(r"^[a-zA-Z_]\w*") + """Match macro definitions""" + + re_fun = re.compile('^[a-zA-Z_][a-zA-Z0-9_]*[(]') + """Match macro functions""" + +-re_pragma_once = re.compile('^\s*once\s*', re.IGNORECASE) ++re_pragma_once = re.compile(r'^\s*once\s*', re.IGNORECASE) + """Match #pragma once statements""" + + re_nl = re.compile('\\\\\r*\n', re.MULTILINE) +@@ -660,7 +660,7 @@ def extract_macro(txt): + # empty define, assign an empty token + return (v, [[], [('T','')]]) + +-re_include = re.compile('^\s*(<(?:.*)>|"(?:.*)")') ++re_include = re.compile(r'^\s*(<(?:.*)>|"(?:.*)")') + def extract_include(txt, defs): + """ + Process a line in the form:: +diff --git a/waflib/Tools/c_tests.py b/waflib/Tools/c_tests.py +index f858df576..bdd186c6b 100644 +--- a/waflib/Tools/c_tests.py ++++ b/waflib/Tools/c_tests.py +@@ -180,9 +180,15 @@ def check_large_file(self, **kw): + ######################################################################################## + + ENDIAN_FRAGMENT = ''' ++#ifdef _MSC_VER ++#define testshlib_EXPORT __declspec(dllexport) ++#else ++#define testshlib_EXPORT ++#endif ++ + short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +-int use_ascii (int i) { ++int testshlib_EXPORT use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +@@ -208,12 +214,12 @@ def run(self): + return -1 + + @feature('grep_for_endianness') +- at after_method('process_source') ++ at after_method('apply_link') + def grep_for_endianness_fun(self): + """ + Used by the endianness configuration test + """ +- self.create_task('grep_for_endianness', self.compiled_tasks[0].outputs[0]) ++ self.create_task('grep_for_endianness', self.link_task.outputs[0]) + + @conf + def check_endianness(self): +@@ -223,7 +229,9 @@ def check_endianness(self): + tmp = [] + def check_msg(self): + return tmp[0] +- self.check(fragment=ENDIAN_FRAGMENT, features='c grep_for_endianness', +- msg='Checking for endianness', define='ENDIANNESS', tmp=tmp, okmsg=check_msg) ++ ++ self.check(fragment=ENDIAN_FRAGMENT, features='c cshlib grep_for_endianness', ++ msg='Checking for endianness', define='ENDIANNESS', tmp=tmp, ++ okmsg=check_msg, confcache=None) + return tmp[0] + +diff --git a/waflib/Tools/ccroot.py b/waflib/Tools/ccroot.py +index 484846f5f..533992903 100644 +--- a/waflib/Tools/ccroot.py ++++ b/waflib/Tools/ccroot.py +@@ -111,7 +111,7 @@ def apply_incpaths(self): + tg = bld(features='includes', includes='.') + + The folders only need to be relative to the current directory, the equivalent build directory is +- added automatically (for headers created in the build directory). This enable using a build directory ++ added automatically (for headers created in the build directory). This enables using a build directory + or not (``top == out``). + + This method will add a list of nodes read by :py:func:`waflib.Tools.ccroot.to_incnodes` in ``tg.env.INCPATHS``, +@@ -128,6 +128,7 @@ class link_task(Task.Task): + Base class for all link tasks. A task generator is supposed to have at most one link task bound in the attribute *link_task*. See :py:func:`waflib.Tools.ccroot.apply_link`. + + .. inheritance-diagram:: waflib.Tools.ccroot.stlink_task waflib.Tools.c.cprogram waflib.Tools.c.cshlib waflib.Tools.cxx.cxxstlib waflib.Tools.cxx.cxxprogram waflib.Tools.cxx.cxxshlib waflib.Tools.d.dprogram waflib.Tools.d.dshlib waflib.Tools.d.dstlib waflib.Tools.ccroot.fake_shlib waflib.Tools.ccroot.fake_stlib waflib.Tools.asm.asmprogram waflib.Tools.asm.asmshlib waflib.Tools.asm.asmstlib ++ :top-classes: waflib.Tools.ccroot.link_task + """ + color = 'YELLOW' + +@@ -238,6 +239,17 @@ def wrap(self): + setattr(cls, 'run', wrap) + rm_tgt(stlink_task) + ++ at feature('skip_stlib_link_deps') ++ at before_method('process_use') ++def apply_skip_stlib_link_deps(self): ++ """ ++ This enables an optimization in the :py:func:wafilb.Tools.ccroot.processes_use: method that skips dependency and ++ link flag optimizations for targets that generate static libraries (via the :py:class:Tools.ccroot.stlink_task task). ++ The actual behavior is implemented in :py:func:wafilb.Tools.ccroot.processes_use: method so this feature only tells waf ++ to enable the new behavior. ++ """ ++ self.env.SKIP_STLIB_LINK_DEPS = True ++ + @feature('c', 'cxx', 'd', 'fc', 'asm') + @after_method('process_source') + def apply_link(self): +@@ -386,7 +398,11 @@ def build(bld): + y = self.bld.get_tgen_by_name(x) + var = y.tmp_use_var + if var and link_task: +- if var == 'LIB' or y.tmp_use_stlib or x in names: ++ if self.env.SKIP_STLIB_LINK_DEPS and isinstance(link_task, stlink_task): ++ # If the skip_stlib_link_deps feature is enabled then we should ++ # avoid adding lib deps to the stlink_task instance. ++ pass ++ elif var == 'LIB' or y.tmp_use_stlib or x in names: + self.env.append_value(var, [y.target[y.target.rfind(os.sep) + 1:]]) + self.link_task.dep_nodes.extend(y.link_task.outputs) + tmp_path = y.link_task.outputs[0].parent.path_from(self.get_cwd()) +diff --git a/waflib/Tools/compiler_c.py b/waflib/Tools/compiler_c.py +index 2dba3f827..e033ce6c5 100644 +--- a/waflib/Tools/compiler_c.py ++++ b/waflib/Tools/compiler_c.py +@@ -36,18 +36,19 @@ def build(bld): + from waflib.Logs import debug + + c_compiler = { +-'win32': ['msvc', 'gcc', 'clang'], +-'cygwin': ['gcc'], +-'darwin': ['clang', 'gcc'], +-'aix': ['xlc', 'gcc', 'clang'], +-'linux': ['gcc', 'clang', 'icc'], +-'sunos': ['suncc', 'gcc'], +-'irix': ['gcc', 'irixcc'], +-'hpux': ['gcc'], +-'osf1V': ['gcc'], +-'gnu': ['gcc', 'clang'], +-'java': ['gcc', 'msvc', 'clang', 'icc'], +-'default':['clang', 'gcc'], ++'win32': ['msvc', 'gcc', 'clang'], ++'cygwin': ['gcc', 'clang'], ++'darwin': ['clang', 'gcc'], ++'aix': ['xlc', 'gcc', 'clang'], ++'linux': ['gcc', 'clang', 'icc'], ++'sunos': ['suncc', 'gcc'], ++'irix': ['gcc', 'irixcc'], ++'hpux': ['gcc'], ++'osf1V': ['gcc'], ++'gnu': ['gcc', 'clang'], ++'java': ['gcc', 'msvc', 'clang', 'icc'], ++'gnukfreebsd': ['gcc', 'clang'], ++'default': ['clang', 'gcc'], + } + """ + Dict mapping platform names to Waf tools finding specific C compilers:: +diff --git a/waflib/Tools/compiler_cxx.py b/waflib/Tools/compiler_cxx.py +index 1af65a226..42658c584 100644 +--- a/waflib/Tools/compiler_cxx.py ++++ b/waflib/Tools/compiler_cxx.py +@@ -37,18 +37,19 @@ def build(bld): + from waflib.Logs import debug + + cxx_compiler = { +-'win32': ['msvc', 'g++', 'clang++'], +-'cygwin': ['g++'], +-'darwin': ['clang++', 'g++'], +-'aix': ['xlc++', 'g++', 'clang++'], +-'linux': ['g++', 'clang++', 'icpc'], +-'sunos': ['sunc++', 'g++'], +-'irix': ['g++'], +-'hpux': ['g++'], +-'osf1V': ['g++'], +-'gnu': ['g++', 'clang++'], +-'java': ['g++', 'msvc', 'clang++', 'icpc'], +-'default': ['clang++', 'g++'] ++'win32': ['msvc', 'g++', 'clang++'], ++'cygwin': ['g++', 'clang++'], ++'darwin': ['clang++', 'g++'], ++'aix': ['xlc++', 'g++', 'clang++'], ++'linux': ['g++', 'clang++', 'icpc'], ++'sunos': ['sunc++', 'g++'], ++'irix': ['g++'], ++'hpux': ['g++'], ++'osf1V': ['g++'], ++'gnu': ['g++', 'clang++'], ++'java': ['g++', 'msvc', 'clang++', 'icpc'], ++'gnukfreebsd': ['g++', 'clang++'], ++'default': ['clang++', 'g++'] + } + """ + Dict mapping the platform names to Waf tools finding specific C++ compilers:: +diff --git a/waflib/Tools/irixcc.py b/waflib/Tools/irixcc.py +index c3ae1ac91..0335c13cb 100644 +--- a/waflib/Tools/irixcc.py ++++ b/waflib/Tools/irixcc.py +@@ -13,22 +13,11 @@ + @conf + def find_irixcc(conf): + v = conf.env +- cc = None +- if v.CC: +- cc = v.CC +- elif 'CC' in conf.environ: +- cc = conf.environ['CC'] +- if not cc: +- cc = conf.find_program('cc', var='CC') +- if not cc: +- conf.fatal('irixcc was not found') +- ++ cc = conf.find_program('cc', var='CC') + try: + conf.cmd_and_log(cc + ['-version']) + except Errors.WafError: + conf.fatal('%r -version could not be executed' % cc) +- +- v.CC = cc + v.CC_NAME = 'irix' + + @conf +@@ -57,7 +46,6 @@ def irixcc_common_flags(conf): + + def configure(conf): + conf.find_irixcc() +- conf.find_cpp() + conf.find_ar() + conf.irixcc_common_flags() + conf.cc_load_tools() +diff --git a/waflib/Tools/msvc.py b/waflib/Tools/msvc.py +index 17b347d45..d60f67026 100644 +--- a/waflib/Tools/msvc.py ++++ b/waflib/Tools/msvc.py +@@ -99,10 +99,31 @@ def build(bld): + """List of icl platforms""" + + def options(opt): +- opt.add_option('--msvc_version', type='string', help = 'msvc version, eg: "msvc 10.0,msvc 9.0"', default='') ++ default_ver = '' ++ vsver = os.getenv('VSCMD_VER') ++ if vsver: ++ m = re.match(r'(^\d+\.\d+).*', vsver) ++ if m: ++ default_ver = 'msvc %s' % m.group(1) ++ opt.add_option('--msvc_version', type='string', help = 'msvc version, eg: "msvc 10.0,msvc 9.0"', default=default_ver) + opt.add_option('--msvc_targets', type='string', help = 'msvc targets, eg: "x64,arm"', default='') + opt.add_option('--no-msvc-lazy', action='store_false', help = 'lazily check msvc target environments', default=True, dest='msvc_lazy') + ++class MSVCVersion(object): ++ def __init__(self, ver): ++ m = re.search(r'^(.*)\s+(\d+[.]\d+)', ver) ++ if m: ++ self.name = m.group(1) ++ self.number = float(m.group(2)) ++ else: ++ self.name = ver ++ self.number = 0. ++ ++ def __lt__(self, other): ++ if self.number == other.number: ++ return self.name < other.name ++ return self.number < other.number ++ + @conf + def setup_msvc(conf, versiondict): + """ +@@ -119,7 +140,7 @@ def setup_msvc(conf, versiondict): + platforms=Utils.to_list(conf.env.MSVC_TARGETS) or [i for i,j in all_msvc_platforms+all_icl_platforms+all_wince_platforms] + desired_versions = getattr(Options.options, 'msvc_version', '').split(',') + if desired_versions == ['']: +- desired_versions = conf.env.MSVC_VERSIONS or list(reversed(sorted(versiondict.keys()))) ++ desired_versions = conf.env.MSVC_VERSIONS or list(sorted(versiondict.keys(), key=MSVCVersion, reverse=True)) + + # Override lazy detection by evaluating after the fact. + lazy_detect = getattr(Options.options, 'msvc_lazy', True) +@@ -187,7 +208,7 @@ def get_msvc_version(conf, compiler, version, target, vcvars): + echo INCLUDE=%%INCLUDE%% + echo LIB=%%LIB%%;%%LIBPATH%% + """ % (vcvars,target)) +- sout = conf.cmd_and_log(['cmd.exe', '/E:on', '/V:on', '/C', batfile.abspath()]) ++ sout = conf.cmd_and_log(['cmd.exe', '/E:on', '/V:on', '/C', batfile.abspath()], stdin=getattr(Utils.subprocess, 'DEVNULL', None)) + lines = sout.splitlines() + + if not lines[0]: +@@ -281,7 +302,7 @@ def gather_wince_supported_platforms(): + + def gather_msvc_detected_versions(): + #Detected MSVC versions! +- version_pattern = re.compile('^(\d\d?\.\d\d?)(Exp)?$') ++ version_pattern = re.compile(r'^(\d\d?\.\d\d?)(Exp)?$') + detected_versions = [] + for vcver,vcvar in (('VCExpress','Exp'), ('VisualStudio','')): + prefix = 'SOFTWARE\\Wow6432node\\Microsoft\\' + vcver +@@ -367,7 +388,7 @@ def gather_wsdk_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^v..?.?\...?.?') ++ version_pattern = re.compile(r'^v..?.?\...?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Microsoft\\Microsoft SDKs\\Windows') + except OSError: +@@ -525,7 +546,7 @@ def gather_icl_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\....?.?') ++ version_pattern = re.compile(r'^...?.?\....?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Compilers\\C++') + except OSError: +@@ -579,7 +600,7 @@ def gather_intel_composer_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\...?.?.?') ++ version_pattern = re.compile(r'^...?.?\...?.?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Suites') + except OSError: +@@ -683,7 +704,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + if not is_static and ltdict.get('library_names', ''): + dllnames=ltdict['library_names'].split() + dll=dllnames[0].lower() +- dll=re.sub('\.dll$', '', dll) ++ dll=re.sub(r'\.dll$', '', dll) + return (lt_libdir, dll, False) + elif ltdict.get('old_library', ''): + olib=ltdict['old_library'] +@@ -700,7 +721,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + @conf + def libname_msvc(self, libname, is_static=False): + lib = libname.lower() +- lib = re.sub('\.lib$','',lib) ++ lib = re.sub(r'\.lib$','',lib) + + if lib in g_msvc_systemlibs: + return lib +@@ -747,11 +768,11 @@ def libname_msvc(self, libname, is_static=False): + for libn in libnames: + if os.path.exists(os.path.join(path, libn)): + Logs.debug('msvc: lib found: %s', os.path.join(path,libn)) +- return re.sub('\.lib$', '',libn) ++ return re.sub(r'\.lib$', '',libn) + + #if no lib can be found, just return the libname as msvc expects it + self.fatal('The library %r could not be found' % libname) +- return re.sub('\.lib$', '', libname) ++ return re.sub(r'\.lib$', '', libname) + + @conf + def check_lib_msvc(self, libname, is_static=False, uselib_store=None): +@@ -969,7 +990,7 @@ def build(bld): + if not is_static: + for f in self.env.LINKFLAGS: + d = f.lower() +- if d[1:] == 'debug': ++ if d[1:] in ('debug', 'debug:full', 'debug:fastlink'): + pdbnode = self.link_task.outputs[0].change_ext('.pdb') + self.link_task.outputs.append(pdbnode) + +diff --git a/waflib/Tools/waf_unit_test.py b/waflib/Tools/waf_unit_test.py +index 74d6c0561..8cff89bde 100644 +--- a/waflib/Tools/waf_unit_test.py ++++ b/waflib/Tools/waf_unit_test.py +@@ -97,6 +97,7 @@ def make_interpreted_test(self): + if isinstance(v, str): + v = v.split(os.pathsep) + self.ut_env[k] = os.pathsep.join(p + v) ++ self.env.append_value('UT_DEPS', ['%r%r' % (key, self.ut_env[key]) for key in self.ut_env]) + + @feature('test') + @after_method('apply_link', 'process_use') +@@ -108,7 +109,8 @@ def make_test(self): + tsk = self.create_task('utest', self.link_task.outputs) + if getattr(self, 'ut_str', None): + self.ut_run, lst = Task.compile_fun(self.ut_str, shell=getattr(self, 'ut_shell', False)) +- tsk.vars = lst + tsk.vars ++ tsk.vars = tsk.vars + lst ++ self.env.append_value('UT_DEPS', self.ut_str) + + self.handle_ut_cwd('ut_cwd') + +@@ -139,6 +141,10 @@ def add_path(var): + if not hasattr(self, 'ut_cmd'): + self.ut_cmd = getattr(Options.options, 'testcmd', False) + ++ self.env.append_value('UT_DEPS', str(self.ut_cmd)) ++ self.env.append_value('UT_DEPS', self.ut_paths) ++ self.env.append_value('UT_DEPS', ['%r%r' % (key, self.ut_env[key]) for key in self.ut_env]) ++ + @taskgen_method + def add_test_results(self, tup): + """Override and return tup[1] to interrupt the build immediately if a test does not run""" +@@ -159,7 +165,7 @@ class utest(Task.Task): + """ + color = 'PINK' + after = ['vnum', 'inst'] +- vars = [] ++ vars = ['UT_DEPS'] + + def runnable_status(self): + """ +@@ -200,7 +206,7 @@ def run(self): + self.ut_exec = getattr(self.generator, 'ut_exec', [self.inputs[0].abspath()]) + ut_cmd = getattr(self.generator, 'ut_cmd', False) + if ut_cmd: +- self.ut_exec = shlex.split(ut_cmd % ' '.join(self.ut_exec)) ++ self.ut_exec = shlex.split(ut_cmd % Utils.shell_escape(self.ut_exec)) + + return self.exec_command(self.ut_exec) + +@@ -214,7 +220,7 @@ def exec_command(self, cmd, **kw): + 'cmd': cmd + } + script_file = self.inputs[0].abspath() + '_run.py' +- Utils.writef(script_file, script_code) ++ Utils.writef(script_file, script_code, encoding='utf-8') + os.chmod(script_file, Utils.O755) + if Logs.verbose > 1: + Logs.info('Test debug file written as %r' % script_file) +diff --git a/waflib/Utils.py b/waflib/Utils.py +index a0cc2a09d..ea0f7a9db 100644 +--- a/waflib/Utils.py ++++ b/waflib/Utils.py +@@ -11,7 +11,7 @@ + + from __future__ import with_statement + +-import atexit, os, sys, errno, inspect, re, datetime, platform, base64, signal, functools, time ++import atexit, os, sys, errno, inspect, re, datetime, platform, base64, signal, functools, time, shlex + + try: + import cPickle +@@ -49,10 +49,16 @@ class TimeoutExpired(Exception): + from hashlib import md5 + except ImportError: + try: +- from md5 import md5 ++ from hashlib import sha1 as md5 + except ImportError: +- # never fail to enable fixes from another module ++ # never fail to enable potential fixes from another module + pass ++else: ++ try: ++ md5().digest() ++ except ValueError: ++ # Fips? #2213 ++ from hashlib import sha1 as md5 + + try: + import threading +@@ -202,7 +208,7 @@ def __next__(self): + + next = __next__ + +-is_win32 = os.sep == '\\' or sys.platform == 'win32' # msys2 ++is_win32 = os.sep == '\\' or sys.platform == 'win32' or os.name == 'nt' # msys2 + """ + Whether this system is a Windows series + """ +@@ -446,6 +452,8 @@ def console_encoding(): + pass + else: + if codepage: ++ if 65001 == codepage and sys.version_info < (3, 3): ++ return 'utf-8' + return 'cp%d' % codepage + return sys.stdout.encoding or ('cp1252' if is_win32 else 'latin-1') + +@@ -484,7 +492,9 @@ def split_path_msys(path): + if sys.platform == 'cygwin': + split_path = split_path_cygwin + elif is_win32: +- if os.environ.get('MSYSTEM'): ++ # Consider this an MSYSTEM environment if $MSYSTEM is set and python ++ # reports is executable from a unix like path on a windows host. ++ if os.environ.get('MSYSTEM') and sys.executable.startswith('/'): + split_path = split_path_msys + else: + split_path = split_path_win32 +@@ -569,10 +579,13 @@ def quote_define_name(s): + fu = fu.upper() + return fu + +-re_sh = re.compile('\\s|\'|"') +-""" +-Regexp used for shell_escape below +-""" ++# shlex.quote didn't exist until python 3.3. Prior to that it was a non-documented ++# function in pipes. ++try: ++ shell_quote = shlex.quote ++except AttributeError: ++ import pipes ++ shell_quote = pipes.quote + + def shell_escape(cmd): + """ +@@ -581,7 +594,7 @@ def shell_escape(cmd): + """ + if isinstance(cmd, str): + return cmd +- return ' '.join(repr(x) if re_sh.search(x) else x for x in cmd) ++ return ' '.join(shell_quote(x) for x in cmd) + + def h_list(lst): + """ +@@ -596,6 +609,12 @@ def h_list(lst): + """ + return md5(repr(lst).encode()).digest() + ++if sys.hexversion < 0x3000000: ++ def h_list_python2(lst): ++ return md5(repr(lst)).digest() ++ h_list_python2.__doc__ = h_list.__doc__ ++ h_list = h_list_python2 ++ + def h_fun(fun): + """ + Hash functions +@@ -615,7 +634,7 @@ def h_fun(fun): + # + # The sorting result outcome will be consistent because: + # 1. tuples are compared in order of their elements +- # 2. optional argument names are unique ++ # 2. optional argument namess are unique + code.extend(sorted(fun.keywords.items())) + code.append(h_fun(fun.func)) + fun.code = h_list(code) +@@ -730,7 +749,7 @@ def unversioned_sys_platform(): + if s == 'cli' and os.name == 'nt': + # ironpython is only on windows as far as we know + return 'win32' +- return re.split('\d+$', s)[0] ++ return re.split(r'\d+$', s)[0] + + def nada(*k, **kw): + """ +@@ -851,6 +870,19 @@ def lib64(): + return '64' + return '' + ++def loose_version(ver_str): ++ # private for the time being! ++ # see #2402 ++ lst = re.split(r'([.]|\\d+|[a-zA-Z])', ver_str) ++ ver = [] ++ for i, val in enumerate(lst): ++ try: ++ ver.append(int(val)) ++ except ValueError: ++ if val != '.': ++ ver.append(val) ++ return ver ++ + def sane_path(p): + # private function for the time being! + return os.path.abspath(os.path.expanduser(p)) +@@ -871,13 +903,13 @@ def get_process(): + except IndexError: + filepath = os.path.dirname(os.path.abspath(__file__)) + os.sep + 'processor.py' + cmd = [sys.executable, '-c', readf(filepath)] +- return subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, bufsize=0) ++ return subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, bufsize=0, close_fds=not is_win32) + + def run_prefork_process(cmd, kwargs, cargs): + """ + Delegates process execution to a pre-forked process instance. + """ +- if not 'env' in kwargs: ++ if not kwargs.get('env'): + kwargs['env'] = dict(os.environ) + try: + obj = base64.b64encode(cPickle.dumps([cmd, kwargs, cargs])) +diff --git a/waflib/ansiterm.py b/waflib/ansiterm.py +index 0d20c6374..027f0ad68 100644 +--- a/waflib/ansiterm.py ++++ b/waflib/ansiterm.py +@@ -264,7 +264,7 @@ def hide_cursor(self,param): + 'u': pop_cursor, + } + # Match either the escape sequence or text not containing escape sequence +- ansi_tokens = re.compile('(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') ++ ansi_tokens = re.compile(r'(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') + def write(self, text): + try: + wlock.acquire() +diff --git a/waflib/extras/clang_cross.py b/waflib/extras/clang_cross.py +new file mode 100644 +index 000000000..1b51e2886 +--- /dev/null ++++ b/waflib/extras/clang_cross.py +@@ -0,0 +1,92 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Krzysztof Kosi?ski 2014 ++# DragoonX6 2018 ++ ++""" ++Detect the Clang C compiler ++This version is an attempt at supporting the -target and -sysroot flag of Clang. ++""" ++ ++from waflib.Tools import ccroot, ar, gcc ++from waflib.Configure import conf ++import waflib.Context ++import waflib.extras.clang_cross_common ++ ++def options(opt): ++ """ ++ Target triplet for clang:: ++ $ waf configure --clang-target-triple=x86_64-pc-linux-gnu ++ """ ++ cc_compiler_opts = opt.add_option_group('Configuration options') ++ cc_compiler_opts.add_option('--clang-target-triple', default=None, ++ help='Target triple for clang', ++ dest='clang_target_triple') ++ cc_compiler_opts.add_option('--clang-sysroot', default=None, ++ help='Sysroot for clang', ++ dest='clang_sysroot') ++ ++ at conf ++def find_clang(conf): ++ """ ++ Finds the program clang and executes it to ensure it really is clang ++ """ ++ ++ import os ++ ++ cc = conf.find_program('clang', var='CC') ++ ++ if conf.options.clang_target_triple != None: ++ conf.env.append_value('CC', ['-target', conf.options.clang_target_triple]) ++ ++ if conf.options.clang_sysroot != None: ++ sysroot = str() ++ ++ if os.path.isabs(conf.options.clang_sysroot): ++ sysroot = conf.options.clang_sysroot ++ else: ++ sysroot = os.path.normpath(os.path.join(os.getcwd(), conf.options.clang_sysroot)) ++ ++ conf.env.append_value('CC', ['--sysroot', sysroot]) ++ ++ conf.get_cc_version(cc, clang=True) ++ conf.env.CC_NAME = 'clang' ++ ++ at conf ++def clang_modifier_x86_64_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++ at conf ++def clang_modifier_i386_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++ at conf ++def clang_modifier_x86_64_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clang_modifier_x86_64_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++ at conf ++def clang_modifier_i386_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clang_modifier_i386_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++def configure(conf): ++ conf.find_clang() ++ conf.find_program(['llvm-ar', 'ar'], var='AR') ++ conf.find_ar() ++ conf.gcc_common_flags() ++ # Allow the user to provide flags for the target platform. ++ conf.gcc_modifier_platform() ++ # And allow more fine grained control based on the compiler's triplet. ++ conf.clang_modifier_target_triple() ++ conf.cc_load_tools() ++ conf.cc_add_flags() ++ conf.link_add_flags() +diff --git a/waflib/extras/clang_cross_common.py b/waflib/extras/clang_cross_common.py +new file mode 100644 +index 000000000..b76a07006 +--- /dev/null ++++ b/waflib/extras/clang_cross_common.py +@@ -0,0 +1,113 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# DragoonX6 2018 ++ ++""" ++Common routines for cross_clang.py and cross_clangxx.py ++""" ++ ++from waflib.Configure import conf ++import waflib.Context ++ ++def normalize_target_triple(target_triple): ++ target_triple = target_triple[:-1] ++ normalized_triple = target_triple.replace('--', '-unknown-') ++ ++ if normalized_triple.startswith('-'): ++ normalized_triple = 'unknown' + normalized_triple ++ ++ if normalized_triple.endswith('-'): ++ normalized_triple += 'unknown' ++ ++ # Normalize MinGW builds to *arch*-w64-mingw32 ++ if normalized_triple.endswith('windows-gnu'): ++ normalized_triple = normalized_triple[:normalized_triple.index('-')] + '-w64-mingw32' ++ ++ # Strip the vendor when doing msvc builds, since it's unused anyway. ++ if normalized_triple.endswith('windows-msvc'): ++ normalized_triple = normalized_triple[:normalized_triple.index('-')] + '-windows-msvc' ++ ++ return normalized_triple.replace('-', '_') ++ ++ at conf ++def clang_modifier_msvc(conf): ++ import os ++ ++ """ ++ Really basic setup to use clang in msvc mode. ++ We actually don't really want to do a lot, even though clang is msvc compatible ++ in this mode, that doesn't mean we're actually using msvc. ++ It's probably the best to leave it to the user, we can assume msvc mode if the user ++ uses the clang-cl frontend, but this module only concerns itself with the gcc-like frontend. ++ """ ++ v = conf.env ++ v.cprogram_PATTERN = '%s.exe' ++ ++ v.cshlib_PATTERN = '%s.dll' ++ v.implib_PATTERN = '%s.lib' ++ v.IMPLIB_ST = '-Wl,-IMPLIB:%s' ++ v.SHLIB_MARKER = [] ++ ++ v.CFLAGS_cshlib = [] ++ v.LINKFLAGS_cshlib = ['-Wl,-DLL'] ++ v.cstlib_PATTERN = '%s.lib' ++ v.STLIB_MARKER = [] ++ ++ del(v.AR) ++ conf.find_program(['llvm-lib', 'lib'], var='AR') ++ v.ARFLAGS = ['-nologo'] ++ v.AR_TGT_F = ['-out:'] ++ ++ # Default to the linker supplied with llvm instead of link.exe or ld ++ v.LINK_CC = v.CC + ['-fuse-ld=lld', '-nostdlib'] ++ v.CCLNK_TGT_F = ['-o'] ++ v.def_PATTERN = '-Wl,-def:%s' ++ ++ v.LINKFLAGS = [] ++ ++ v.LIB_ST = '-l%s' ++ v.LIBPATH_ST = '-Wl,-LIBPATH:%s' ++ v.STLIB_ST = '-l%s' ++ v.STLIBPATH_ST = '-Wl,-LIBPATH:%s' ++ ++ CFLAGS_CRT_COMMON = [ ++ '-Xclang', '--dependent-lib=oldnames', ++ '-Xclang', '-fno-rtti-data', ++ '-D_MT' ++ ] ++ ++ v.CFLAGS_CRT_MULTITHREADED = CFLAGS_CRT_COMMON + [ ++ '-Xclang', '-flto-visibility-public-std', ++ '-Xclang', '--dependent-lib=libcmt', ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED = v.CFLAGS_CRT_MULTITHREADED ++ ++ v.CFLAGS_CRT_MULTITHREADED_DBG = CFLAGS_CRT_COMMON + [ ++ '-D_DEBUG', ++ '-Xclang', '-flto-visibility-public-std', ++ '-Xclang', '--dependent-lib=libcmtd', ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED_DBG = v.CFLAGS_CRT_MULTITHREADED_DBG ++ ++ v.CFLAGS_CRT_MULTITHREADED_DLL = CFLAGS_CRT_COMMON + [ ++ '-D_DLL', ++ '-Xclang', '--dependent-lib=msvcrt' ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED_DLL = v.CFLAGS_CRT_MULTITHREADED_DLL ++ ++ v.CFLAGS_CRT_MULTITHREADED_DLL_DBG = CFLAGS_CRT_COMMON + [ ++ '-D_DLL', ++ '-D_DEBUG', ++ '-Xclang', '--dependent-lib=msvcrtd', ++ ] ++ v.CXXFLAGS_CRT_MULTITHREADED_DLL_DBG = v.CFLAGS_CRT_MULTITHREADED_DLL_DBG ++ ++ at conf ++def clang_modifier_target_triple(conf, cpp=False): ++ compiler = conf.env.CXX if cpp else conf.env.CC ++ output = conf.cmd_and_log(compiler + ['-dumpmachine'], output=waflib.Context.STDOUT) ++ ++ modifier = ('clangxx' if cpp else 'clang') + '_modifier_' ++ clang_modifier_func = getattr(conf, modifier + normalize_target_triple(output), None) ++ if clang_modifier_func: ++ clang_modifier_func() +diff --git a/waflib/extras/clangxx_cross.py b/waflib/extras/clangxx_cross.py +new file mode 100644 +index 000000000..0ad38ad46 +--- /dev/null ++++ b/waflib/extras/clangxx_cross.py +@@ -0,0 +1,106 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Thomas Nagy 2009-2018 (ita) ++# DragoonX6 2018 ++ ++""" ++Detect the Clang++ C++ compiler ++This version is an attempt at supporting the -target and -sysroot flag of Clang++. ++""" ++ ++from waflib.Tools import ccroot, ar, gxx ++from waflib.Configure import conf ++import waflib.extras.clang_cross_common ++ ++def options(opt): ++ """ ++ Target triplet for clang++:: ++ $ waf configure --clangxx-target-triple=x86_64-pc-linux-gnu ++ """ ++ cxx_compiler_opts = opt.add_option_group('Configuration options') ++ cxx_compiler_opts.add_option('--clangxx-target-triple', default=None, ++ help='Target triple for clang++', ++ dest='clangxx_target_triple') ++ cxx_compiler_opts.add_option('--clangxx-sysroot', default=None, ++ help='Sysroot for clang++', ++ dest='clangxx_sysroot') ++ ++ at conf ++def find_clangxx(conf): ++ """ ++ Finds the program clang++, and executes it to ensure it really is clang++ ++ """ ++ ++ import os ++ ++ cxx = conf.find_program('clang++', var='CXX') ++ ++ if conf.options.clangxx_target_triple != None: ++ conf.env.append_value('CXX', ['-target', conf.options.clangxx_target_triple]) ++ ++ if conf.options.clangxx_sysroot != None: ++ sysroot = str() ++ ++ if os.path.isabs(conf.options.clangxx_sysroot): ++ sysroot = conf.options.clangxx_sysroot ++ else: ++ sysroot = os.path.normpath(os.path.join(os.getcwd(), conf.options.clangxx_sysroot)) ++ ++ conf.env.append_value('CXX', ['--sysroot', sysroot]) ++ ++ conf.get_cc_version(cxx, clang=True) ++ conf.env.CXX_NAME = 'clang' ++ ++ at conf ++def clangxx_modifier_x86_64_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++ at conf ++def clangxx_modifier_i386_w64_mingw32(conf): ++ conf.gcc_modifier_win32() ++ ++ at conf ++def clangxx_modifier_msvc(conf): ++ v = conf.env ++ v.cxxprogram_PATTERN = v.cprogram_PATTERN ++ v.cxxshlib_PATTERN = v.cshlib_PATTERN ++ ++ v.CXXFLAGS_cxxshlib = [] ++ v.LINKFLAGS_cxxshlib = v.LINKFLAGS_cshlib ++ v.cxxstlib_PATTERN = v.cstlib_PATTERN ++ ++ v.LINK_CXX = v.CXX + ['-fuse-ld=lld', '-nostdlib'] ++ v.CXXLNK_TGT_F = v.CCLNK_TGT_F ++ ++ at conf ++def clangxx_modifier_x86_64_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ conf.clangxx_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clangxx_modifier_x86_64_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++ at conf ++def clangxx_modifier_i386_windows_msvc(conf): ++ conf.clang_modifier_msvc() ++ conf.clangxx_modifier_msvc() ++ ++ # Allow the user to override any flags if they so desire. ++ clang_modifier_user_func = getattr(conf, 'clangxx_modifier_i386_windows_msvc_user', None) ++ if clang_modifier_user_func: ++ clang_modifier_user_func() ++ ++def configure(conf): ++ conf.find_clangxx() ++ conf.find_program(['llvm-ar', 'ar'], var='AR') ++ conf.find_ar() ++ conf.gxx_common_flags() ++ # Allow the user to provide flags for the target platform. ++ conf.gxx_modifier_platform() ++ # And allow more fine grained control based on the compiler's triplet. ++ conf.clang_modifier_target_triple(cpp=True) ++ conf.cxx_load_tools() ++ conf.cxx_add_flags() ++ conf.link_add_flags() +diff --git a/waflib/extras/classic_runner.py b/waflib/extras/classic_runner.py +new file mode 100644 +index 000000000..b08c794e8 +--- /dev/null ++++ b/waflib/extras/classic_runner.py +@@ -0,0 +1,68 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Thomas Nagy, 2021 (ita) ++ ++from waflib import Utils, Runner ++ ++""" ++Re-enable the classic threading system from waf 1.x ++ ++def configure(conf): ++ conf.load('classic_runner') ++""" ++ ++class TaskConsumer(Utils.threading.Thread): ++ """ ++ Task consumers belong to a pool of workers ++ ++ They wait for tasks in the queue and then use ``task.process(...)`` ++ """ ++ def __init__(self, spawner): ++ Utils.threading.Thread.__init__(self) ++ """ ++ Obtain :py:class:`waflib.Task.TaskBase` instances from this queue. ++ """ ++ self.spawner = spawner ++ self.daemon = True ++ self.start() ++ ++ def run(self): ++ """ ++ Loop over the tasks to execute ++ """ ++ try: ++ self.loop() ++ except Exception: ++ pass ++ ++ def loop(self): ++ """ ++ Obtain tasks from :py:attr:`waflib.Runner.TaskConsumer.ready` and call ++ :py:meth:`waflib.Task.TaskBase.process`. If the object is a function, execute it. ++ """ ++ master = self.spawner.master ++ while 1: ++ if not master.stop: ++ try: ++ tsk = master.ready.get() ++ if tsk: ++ tsk.log_display(tsk.generator.bld) ++ master.process_task(tsk) ++ else: ++ break ++ finally: ++ master.out.put(tsk) ++ ++class Spawner(object): ++ """ ++ Daemon thread that consumes tasks from :py:class:`waflib.Runner.Parallel` producer and ++ spawns a consuming thread :py:class:`waflib.Runner.Consumer` for each ++ :py:class:`waflib.Task.Task` instance. ++ """ ++ def __init__(self, master): ++ self.master = master ++ """:py:class:`waflib.Runner.Parallel` producer instance""" ++ ++ self.pool = [TaskConsumer(self) for i in range(master.numjobs)] ++ ++Runner.Spawner = Spawner +diff --git a/waflib/extras/color_msvc.py b/waflib/extras/color_msvc.py +new file mode 100644 +index 000000000..60bacb7b2 +--- /dev/null ++++ b/waflib/extras/color_msvc.py +@@ -0,0 +1,59 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++ ++# Replaces the default formatter by one which understands MSVC output and colorizes it. ++# Modified from color_gcc.py ++ ++__author__ = __maintainer__ = "Alibek Omarov " ++__copyright__ = "Alibek Omarov, 2019" ++ ++import sys ++from waflib import Logs ++ ++class ColorMSVCFormatter(Logs.formatter): ++ def __init__(self, colors): ++ self.colors = colors ++ Logs.formatter.__init__(self) ++ ++ def parseMessage(self, line, color): ++ # Split messaage from 'disk:filepath: type: message' ++ arr = line.split(':', 3) ++ if len(arr) < 4: ++ return line ++ ++ colored = self.colors.BOLD + arr[0] + ':' + arr[1] + ':' + self.colors.NORMAL ++ colored += color + arr[2] + ':' + self.colors.NORMAL ++ colored += arr[3] ++ return colored ++ ++ def format(self, rec): ++ frame = sys._getframe() ++ while frame: ++ func = frame.f_code.co_name ++ if func == 'exec_command': ++ cmd = frame.f_locals.get('cmd') ++ if isinstance(cmd, list): ++ # Fix file case, it may be CL.EXE or cl.exe ++ argv0 = cmd[0].lower() ++ if 'cl.exe' in argv0: ++ lines = [] ++ # This will not work with "localized" versions ++ # of MSVC ++ for line in rec.msg.splitlines(): ++ if ': warning ' in line: ++ lines.append(self.parseMessage(line, self.colors.YELLOW)) ++ elif ': error ' in line: ++ lines.append(self.parseMessage(line, self.colors.RED)) ++ elif ': fatal error ' in line: ++ lines.append(self.parseMessage(line, self.colors.RED + self.colors.BOLD)) ++ elif ': note: ' in line: ++ lines.append(self.parseMessage(line, self.colors.CYAN)) ++ else: ++ lines.append(line) ++ rec.msg = "\n".join(lines) ++ frame = frame.f_back ++ return Logs.formatter.format(self, rec) ++ ++def options(opt): ++ Logs.log.handlers[0].setFormatter(ColorMSVCFormatter(Logs.colors)) ++ +diff --git a/waflib/extras/fc_fujitsu.py b/waflib/extras/fc_fujitsu.py +new file mode 100644 +index 000000000..cae676c20 +--- /dev/null ++++ b/waflib/extras/fc_fujitsu.py +@@ -0,0 +1,52 @@ ++#! /usr/bin/env python ++# encoding: utf-8 ++# Detection of the Fujitsu Fortran compiler for ARM64FX ++ ++import re ++from waflib.Tools import fc,fc_config,fc_scan ++from waflib.Configure import conf ++from waflib.Tools.compiler_fc import fc_compiler ++fc_compiler['linux'].append('fc_fujitsu') ++ ++ at conf ++def find_fujitsu(conf): ++ fc=conf.find_program(['frtpx'],var='FC') ++ conf.get_fujitsu_version(fc) ++ conf.env.FC_NAME='FUJITSU' ++ conf.env.FC_MOD_CAPITALIZATION='lower' ++ ++ at conf ++def fujitsu_flags(conf): ++ v=conf.env ++ v['_FCMODOUTFLAGS']=[] ++ v['FCFLAGS_DEBUG']=[] ++ v['FCFLAGS_fcshlib']=[] ++ v['LINKFLAGS_fcshlib']=[] ++ v['FCSTLIB_MARKER']='' ++ v['FCSHLIB_MARKER']='' ++ ++ at conf ++def get_fujitsu_version(conf,fc): ++ version_re=re.compile(r"frtpx\s*\(FRT\)\s*(?P\d+)\.(?P\d+)\.",re.I).search ++ cmd=fc+['--version'] ++ out,err=fc_config.getoutput(conf,cmd,stdin=False) ++ if out: ++ match=version_re(out) ++ else: ++ match=version_re(err) ++ if not match: ++ return(False) ++ conf.fatal('Could not determine the Fujitsu FRT Fortran compiler version.') ++ else: ++ k=match.groupdict() ++ conf.env['FC_VERSION']=(k['major'],k['minor']) ++ ++def configure(conf): ++ conf.find_fujitsu() ++ conf.find_program('ar',var='AR') ++ conf.add_os_flags('ARFLAGS') ++ if not conf.env.ARFLAGS: ++ conf.env.ARFLAGS=['rcs'] ++ conf.fc_flags() ++ conf.fc_add_flags() ++ conf.fujitsu_flags() +diff --git a/waflib/extras/fc_nfort.py b/waflib/extras/fc_nfort.py +new file mode 100644 +index 000000000..c25886b8e +--- /dev/null ++++ b/waflib/extras/fc_nfort.py +@@ -0,0 +1,52 @@ ++#! /usr/bin/env python ++# encoding: utf-8 ++# Detection of the NEC Fortran compiler for Aurora Tsubasa ++ ++import re ++from waflib.Tools import fc,fc_config,fc_scan ++from waflib.Configure import conf ++from waflib.Tools.compiler_fc import fc_compiler ++fc_compiler['linux'].append('fc_nfort') ++ ++ at conf ++def find_nfort(conf): ++ fc=conf.find_program(['nfort'],var='FC') ++ conf.get_nfort_version(fc) ++ conf.env.FC_NAME='NFORT' ++ conf.env.FC_MOD_CAPITALIZATION='lower' ++ ++ at conf ++def nfort_flags(conf): ++ v=conf.env ++ v['_FCMODOUTFLAGS']=[] ++ v['FCFLAGS_DEBUG']=[] ++ v['FCFLAGS_fcshlib']=[] ++ v['LINKFLAGS_fcshlib']=[] ++ v['FCSTLIB_MARKER']='' ++ v['FCSHLIB_MARKER']='' ++ ++ at conf ++def get_nfort_version(conf,fc): ++ version_re=re.compile(r"nfort\s*\(NFORT\)\s*(?P\d+)\.(?P\d+)\.",re.I).search ++ cmd=fc+['--version'] ++ out,err=fc_config.getoutput(conf,cmd,stdin=False) ++ if out: ++ match=version_re(out) ++ else: ++ match=version_re(err) ++ if not match: ++ return(False) ++ conf.fatal('Could not determine the NEC NFORT Fortran compiler version.') ++ else: ++ k=match.groupdict() ++ conf.env['FC_VERSION']=(k['major'],k['minor']) ++ ++def configure(conf): ++ conf.find_nfort() ++ conf.find_program('nar',var='AR') ++ conf.add_os_flags('ARFLAGS') ++ if not conf.env.ARFLAGS: ++ conf.env.ARFLAGS=['rcs'] ++ conf.fc_flags() ++ conf.fc_add_flags() ++ conf.nfort_flags() +diff --git a/waflib/extras/genpybind.py b/waflib/extras/genpybind.py +new file mode 100644 +index 000000000..ac206ee8a +--- /dev/null ++++ b/waflib/extras/genpybind.py +@@ -0,0 +1,194 @@ ++import os ++import pipes ++import subprocess ++import sys ++ ++from waflib import Logs, Task, Context ++from waflib.Tools.c_preproc import scan as scan_impl ++# ^-- Note: waflib.extras.gccdeps.scan does not work for us, ++# due to its current implementation: ++# The -MD flag is injected into the {C,CXX}FLAGS environment variable and ++# dependencies are read out in a separate step after compiling by reading ++# the .d file saved alongside the object file. ++# As the genpybind task refers to a header file that is never compiled itself, ++# gccdeps will not be able to extract the list of dependencies. ++ ++from waflib.TaskGen import feature, before_method ++ ++ ++def join_args(args): ++ return " ".join(pipes.quote(arg) for arg in args) ++ ++ ++def configure(cfg): ++ cfg.load("compiler_cxx") ++ cfg.load("python") ++ cfg.check_python_version(minver=(2, 7)) ++ if not cfg.env.LLVM_CONFIG: ++ cfg.find_program("llvm-config", var="LLVM_CONFIG") ++ if not cfg.env.GENPYBIND: ++ cfg.find_program("genpybind", var="GENPYBIND") ++ ++ # find clang reasource dir for builtin headers ++ cfg.env.GENPYBIND_RESOURCE_DIR = os.path.join( ++ cfg.cmd_and_log(cfg.env.LLVM_CONFIG + ["--libdir"]).strip(), ++ "clang", ++ cfg.cmd_and_log(cfg.env.LLVM_CONFIG + ["--version"]).strip()) ++ if os.path.exists(cfg.env.GENPYBIND_RESOURCE_DIR): ++ cfg.msg("Checking clang resource dir", cfg.env.GENPYBIND_RESOURCE_DIR) ++ else: ++ cfg.fatal("Clang resource dir not found") ++ ++ ++ at feature("genpybind") ++ at before_method("process_source") ++def generate_genpybind_source(self): ++ """ ++ Run genpybind on the headers provided in `source` and compile/link the ++ generated code instead. This works by generating the code on the fly and ++ swapping the source node before `process_source` is run. ++ """ ++ # name of module defaults to name of target ++ module = getattr(self, "module", self.target) ++ ++ # create temporary source file in build directory to hold generated code ++ out = "genpybind-%s.%d.cpp" % (module, self.idx) ++ out = self.path.get_bld().find_or_declare(out) ++ ++ task = self.create_task("genpybind", self.to_nodes(self.source), out) ++ # used to detect whether CFLAGS or CXXFLAGS should be passed to genpybind ++ task.features = self.features ++ task.module = module ++ # can be used to select definitions to include in the current module ++ # (when header files are shared by more than one module) ++ task.genpybind_tags = self.to_list(getattr(self, "genpybind_tags", [])) ++ # additional include directories ++ task.includes = self.to_list(getattr(self, "includes", [])) ++ task.genpybind = self.env.GENPYBIND ++ ++ # Tell waf to compile/link the generated code instead of the headers ++ # originally passed-in via the `source` parameter. (see `process_source`) ++ self.source = [out] ++ ++ ++class genpybind(Task.Task): # pylint: disable=invalid-name ++ """ ++ Runs genpybind on headers provided as input to this task. ++ Generated code will be written to the first (and only) output node. ++ """ ++ quiet = True ++ color = "PINK" ++ scan = scan_impl ++ ++ @staticmethod ++ def keyword(): ++ return "Analyzing" ++ ++ def run(self): ++ if not self.inputs: ++ return ++ ++ args = self.find_genpybind() + self._arguments( ++ resource_dir=self.env.GENPYBIND_RESOURCE_DIR) ++ ++ output = self.run_genpybind(args) ++ ++ # For debugging / log output ++ pasteable_command = join_args(args) ++ ++ # write generated code to file in build directory ++ # (will be compiled during process_source stage) ++ (output_node,) = self.outputs ++ output_node.write("// {}\n{}\n".format( ++ pasteable_command.replace("\n", "\n// "), output)) ++ ++ def find_genpybind(self): ++ return self.genpybind ++ ++ def run_genpybind(self, args): ++ bld = self.generator.bld ++ ++ kwargs = dict(cwd=bld.variant_dir) ++ if hasattr(bld, "log_command"): ++ bld.log_command(args, kwargs) ++ else: ++ Logs.debug("runner: {!r}".format(args)) ++ proc = subprocess.Popen( ++ args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs) ++ stdout, stderr = proc.communicate() ++ ++ if not isinstance(stdout, str): ++ stdout = stdout.decode(sys.stdout.encoding, errors="replace") ++ if not isinstance(stderr, str): ++ stderr = stderr.decode(sys.stderr.encoding, errors="replace") ++ ++ if proc.returncode != 0: ++ bld.fatal( ++ "genpybind returned {code} during the following call:" ++ "\n{command}\n\n{stdout}\n\n{stderr}".format( ++ code=proc.returncode, ++ command=join_args(args), ++ stdout=stdout, ++ stderr=stderr, ++ )) ++ ++ if stderr.strip(): ++ Logs.debug("non-fatal warnings during genpybind run:\n{}".format(stderr)) ++ ++ return stdout ++ ++ def _include_paths(self): ++ return self.generator.to_incnodes(self.includes + self.env.INCLUDES) ++ ++ def _inputs_as_relative_includes(self): ++ include_paths = self._include_paths() ++ relative_includes = [] ++ for node in self.inputs: ++ for inc in include_paths: ++ if node.is_child_of(inc): ++ relative_includes.append(node.path_from(inc)) ++ break ++ else: ++ self.generator.bld.fatal("could not resolve {}".format(node)) ++ return relative_includes ++ ++ def _arguments(self, genpybind_parse=None, resource_dir=None): ++ args = [] ++ relative_includes = self._inputs_as_relative_includes() ++ is_cxx = "cxx" in self.features ++ ++ # options for genpybind ++ args.extend(["--genpybind-module", self.module]) ++ if self.genpybind_tags: ++ args.extend(["--genpybind-tag"] + self.genpybind_tags) ++ if relative_includes: ++ args.extend(["--genpybind-include"] + relative_includes) ++ if genpybind_parse: ++ args.extend(["--genpybind-parse", genpybind_parse]) ++ ++ args.append("--") ++ ++ # headers to be processed by genpybind ++ args.extend(node.abspath() for node in self.inputs) ++ ++ args.append("--") ++ ++ # options for clang/genpybind-parse ++ args.append("-D__GENPYBIND__") ++ args.append("-xc++" if is_cxx else "-xc") ++ has_std_argument = False ++ for flag in self.env["CXXFLAGS" if is_cxx else "CFLAGS"]: ++ flag = flag.replace("-std=gnu", "-std=c") ++ if flag.startswith("-std=c"): ++ has_std_argument = True ++ args.append(flag) ++ if not has_std_argument: ++ args.append("-std=c++14") ++ args.extend("-I{}".format(n.abspath()) for n in self._include_paths()) ++ args.extend("-D{}".format(p) for p in self.env.DEFINES) ++ ++ # point to clang resource dir, if specified ++ if resource_dir: ++ args.append("-resource-dir={}".format(resource_dir)) ++ ++ return args +diff --git a/waflib/extras/haxe.py b/waflib/extras/haxe.py +new file mode 100644 +index 000000000..4ff374579 +--- /dev/null ++++ b/waflib/extras/haxe.py +@@ -0,0 +1,154 @@ ++import re ++ ++from waflib import Utils, Task, Errors, Logs ++from waflib.Configure import conf ++from waflib.TaskGen import extension, taskgen_method ++ ++HAXE_COMPILERS = { ++ 'JS': {'tgt': '--js', 'ext_out': ['.js']}, ++ 'LUA': {'tgt': '--lua', 'ext_out': ['.lua']}, ++ 'SWF': {'tgt': '--swf', 'ext_out': ['.swf']}, ++ 'NEKO': {'tgt': '--neko', 'ext_out': ['.n']}, ++ 'PHP': {'tgt': '--php', 'ext_out': ['.php']}, ++ 'CPP': {'tgt': '--cpp', 'ext_out': ['.h', '.cpp']}, ++ 'CPPIA': {'tgt': '--cppia', 'ext_out': ['.cppia']}, ++ 'CS': {'tgt': '--cs', 'ext_out': ['.cs']}, ++ 'JAVA': {'tgt': '--java', 'ext_out': ['.java']}, ++ 'JVM': {'tgt': '--jvm', 'ext_out': ['.jar']}, ++ 'PYTHON': {'tgt': '--python', 'ext_out': ['.py']}, ++ 'HL': {'tgt': '--hl', 'ext_out': ['.hl']}, ++ 'HLC': {'tgt': '--hl', 'ext_out': ['.h', '.c']}, ++} ++ ++ at conf ++def check_haxe_pkg(self, **kw): ++ self.find_program('haxelib') ++ libs = kw.get('libs') ++ if not libs or not (type(libs) == str or (type(libs) == list and all(isinstance(s, str) for s in libs))): ++ self.fatal('Specify correct libs value in ensure call') ++ return ++ fetch = kw.get('fetch') ++ if not fetch is None and not type(fetch) == bool: ++ self.fatal('Specify correct fetch value in ensure call') ++ ++ libs = [libs] if type(libs) == str else libs ++ halt = False ++ for lib in libs: ++ try: ++ self.start_msg('Checking for library %s' % lib) ++ output = self.cmd_and_log(self.env.HAXELIB + ['list', lib]) ++ except Errors.WafError: ++ self.end_msg(False) ++ self.fatal('Can\'t run haxelib list, ensuring halted') ++ return ++ ++ if lib in output: ++ self.end_msg(lib in output) ++ else: ++ if not fetch: ++ self.end_msg(False) ++ halt = True ++ continue ++ try: ++ status = self.exec_command(self.env.HAXELIB + ['install', lib]) ++ if status: ++ self.end_msg(False) ++ self.fatal('Can\'t get %s with haxelib, ensuring halted' % lib) ++ return ++ else: ++ self.end_msg('downloaded', color='YELLOW') ++ except Errors.WafError: ++ self.end_msg(False) ++ self.fatal('Can\'t run haxelib install, ensuring halted') ++ return ++ postfix = kw.get('uselib_store') or lib.upper() ++ self.env.append_unique('LIB_' + postfix, lib) ++ ++ if halt: ++ self.fatal('Can\'t find libraries in haxelib list, ensuring halted') ++ return ++ ++class haxe(Task.Task): ++ vars = ['HAXE_VERSION', 'HAXE_FLAGS'] ++ ext_in = ['.hx'] ++ ++ def run(self): ++ cmd = self.env.HAXE + self.env.HAXE_FLAGS_DEFAULT + self.env.HAXE_FLAGS ++ return self.exec_command(cmd) ++ ++for COMP in HAXE_COMPILERS: ++ # create runners for each compile target ++ type("haxe_" + COMP, (haxe,), {'ext_out': HAXE_COMPILERS[COMP]['ext_out']}) ++ ++ at taskgen_method ++def init_haxe(self): ++ errmsg = '%s not found, specify correct value' ++ try: ++ compiler = HAXE_COMPILERS[self.compiler] ++ comp_tgt = compiler['tgt'] ++ comp_mod = '/main.c' if self.compiler == 'HLC' else '' ++ except (AttributeError, KeyError): ++ self.bld.fatal(errmsg % 'COMPILER' + ': ' + ', '.join(HAXE_COMPILERS.keys())) ++ return ++ ++ self.env.append_value( ++ 'HAXE_FLAGS', ++ [comp_tgt, self.path.get_bld().make_node(self.target + comp_mod).abspath()]) ++ if hasattr(self, 'use'): ++ if not (type(self.use) == str or type(self.use) == list): ++ self.bld.fatal(errmsg % 'USE') ++ return ++ self.use = [self.use] if type(self.use) == str else self.use ++ ++ for dep in self.use: ++ if self.env['LIB_' + dep]: ++ for lib in self.env['LIB_' + dep]: ++ self.env.append_value('HAXE_FLAGS', ['-lib', lib]) ++ ++ if hasattr(self, 'res'): ++ if not type(self.res) == str: ++ self.bld.fatal(errmsg % 'RES') ++ return ++ self.env.append_value('HAXE_FLAGS', ['-D', 'resourcesPath=%s' % self.res]) ++ ++ at extension('.hx') ++def haxe_hook(self, node): ++ if len(self.source) > 1: ++ self.bld.fatal('Use separate task generators for multiple files') ++ return ++ ++ src = node ++ tgt = self.path.get_bld().find_or_declare(self.target) ++ ++ self.init_haxe() ++ self.create_task('haxe_' + self.compiler, src, tgt) ++ ++ at conf ++def check_haxe(self, mini=None, maxi=None): ++ self.start_msg('Checking for haxe version') ++ try: ++ curr = re.search( ++ r'(\d+.?)+', ++ self.cmd_and_log(self.env.HAXE + ['-version'])).group() ++ except Errors.WafError: ++ self.end_msg(False) ++ self.fatal('Can\'t get haxe version') ++ return ++ ++ if mini and Utils.num2ver(curr) < Utils.num2ver(mini): ++ self.end_msg('wrong', color='RED') ++ self.fatal('%s is too old, need >= %s' % (curr, mini)) ++ return ++ if maxi and Utils.num2ver(curr) > Utils.num2ver(maxi): ++ self.end_msg('wrong', color='RED') ++ self.fatal('%s is too new, need <= %s' % (curr, maxi)) ++ return ++ self.end_msg(curr, color='GREEN') ++ self.env.HAXE_VERSION = curr ++ ++def configure(self): ++ self.env.append_value( ++ 'HAXE_FLAGS_DEFAULT', ++ ['-D', 'no-compilation', '-cp', self.path.abspath()]) ++ Logs.warn('Default flags: %s' % ' '.join(self.env.HAXE_FLAGS_DEFAULT)) ++ self.find_program('haxe') +diff --git a/waflib/extras/msvc_pdb.py b/waflib/extras/msvc_pdb.py +new file mode 100644 +index 000000000..077656b4f +--- /dev/null ++++ b/waflib/extras/msvc_pdb.py +@@ -0,0 +1,46 @@ ++#!/usr/bin/env python ++# encoding: utf-8 ++# Rafa?l Kooi 2019 ++ ++from waflib import TaskGen ++ ++ at TaskGen.feature('c', 'cxx', 'fc') ++ at TaskGen.after_method('propagate_uselib_vars') ++def add_pdb_per_object(self): ++ """For msvc/fortran, specify a unique compile pdb per object, to work ++ around LNK4099. Flags are updated with a unique /Fd flag based on the ++ task output name. This is separate from the link pdb. ++ """ ++ if not hasattr(self, 'compiled_tasks'): ++ return ++ ++ link_task = getattr(self, 'link_task', None) ++ ++ for task in self.compiled_tasks: ++ if task.inputs and task.inputs[0].name.lower().endswith('.rc'): ++ continue ++ ++ add_pdb = False ++ for flagname in ('CFLAGS', 'CXXFLAGS', 'FCFLAGS'): ++ # several languages may be used at once ++ for flag in task.env[flagname]: ++ if flag[1:].lower() == 'zi': ++ add_pdb = True ++ break ++ ++ if add_pdb: ++ node = task.outputs[0].change_ext('.pdb') ++ pdb_flag = '/Fd:' + node.abspath() ++ ++ for flagname in ('CFLAGS', 'CXXFLAGS', 'FCFLAGS'): ++ buf = [pdb_flag] ++ for flag in task.env[flagname]: ++ if flag[1:3] == 'Fd' or flag[1:].lower() == 'fs' or flag[1:].lower() == 'mp': ++ continue ++ buf.append(flag) ++ task.env[flagname] = buf ++ ++ if link_task and not node in link_task.dep_nodes: ++ link_task.dep_nodes.append(node) ++ if not node in task.outputs: ++ task.outputs.append(node) +diff --git a/waflib/extras/sphinx.py b/waflib/extras/sphinx.py +new file mode 100644 +index 000000000..08f3cfd8a +--- /dev/null ++++ b/waflib/extras/sphinx.py +@@ -0,0 +1,120 @@ ++"""Support for Sphinx documentation ++ ++This is a wrapper for sphinx-build program. Please note that sphinx-build supports only ++one output format at a time, but the tool can create multiple tasks to handle more. ++The output formats can be passed via the sphinx_output_format, which is an array of ++strings. For backwards compatibility if only one output is needed, it can be passed ++as a single string. ++The default output format is html. ++ ++Specific formats can be installed in different directories by specifying the ++install_path_ attribute. If not defined, the standard install_path ++will be used instead. ++ ++Example wscript: ++ ++def configure(cnf): ++ conf.load('sphinx') ++ ++def build(bld): ++ bld( ++ features='sphinx', ++ sphinx_source='sources', # path to source directory ++ sphinx_options='-a -v', # sphinx-build program additional options ++ sphinx_output_format=['html', 'man'], # output format of sphinx documentation ++ install_path_man='${DOCDIR}/man' # put man pages in a specific directory ++ ) ++ ++""" ++ ++from waflib.Node import Node ++from waflib import Utils ++from waflib import Task ++from waflib.TaskGen import feature, after_method ++ ++ ++def configure(cnf): ++ """Check if sphinx-build program is available and loads gnu_dirs tool.""" ++ cnf.find_program('sphinx-build', var='SPHINX_BUILD', mandatory=False) ++ cnf.load('gnu_dirs') ++ ++ ++ at feature('sphinx') ++def build_sphinx(self): ++ """Builds sphinx sources. ++ """ ++ if not self.env.SPHINX_BUILD: ++ self.bld.fatal('Program SPHINX_BUILD not defined.') ++ if not getattr(self, 'sphinx_source', None): ++ self.bld.fatal('Attribute sphinx_source not defined.') ++ if not isinstance(self.sphinx_source, Node): ++ self.sphinx_source = self.path.find_node(self.sphinx_source) ++ if not self.sphinx_source: ++ self.bld.fatal('Can\'t find sphinx_source: %r' % self.sphinx_source) ++ ++ # In the taskgen we have the complete list of formats ++ Utils.def_attrs(self, sphinx_output_format='html') ++ self.sphinx_output_format = Utils.to_list(self.sphinx_output_format) ++ ++ self.env.SPHINX_OPTIONS = getattr(self, 'sphinx_options', []) ++ ++ for source_file in self.sphinx_source.ant_glob('**/*'): ++ self.bld.add_manual_dependency(self.sphinx_source, source_file) ++ ++ for cfmt in self.sphinx_output_format: ++ sphinx_build_task = self.create_task('SphinxBuildingTask') ++ sphinx_build_task.set_inputs(self.sphinx_source) ++ # In task we keep the specific format this task is generating ++ sphinx_build_task.env.SPHINX_OUTPUT_FORMAT = cfmt ++ ++ # the sphinx-build results are in directory ++ sphinx_build_task.sphinx_output_directory = self.path.get_bld().make_node(cfmt) ++ sphinx_build_task.set_outputs(sphinx_build_task.sphinx_output_directory) ++ sphinx_build_task.sphinx_output_directory.mkdir() ++ ++ Utils.def_attrs(sphinx_build_task, install_path=getattr(self, 'install_path_' + cfmt, getattr(self, 'install_path', get_install_path(sphinx_build_task)))) ++ ++ ++def get_install_path(object): ++ if object.env.SPHINX_OUTPUT_FORMAT == 'man': ++ return object.env.MANDIR ++ elif object.env.SPHINX_OUTPUT_FORMAT == 'info': ++ return object.env.INFODIR ++ else: ++ return object.env.DOCDIR ++ ++ ++class SphinxBuildingTask(Task.Task): ++ color = 'BOLD' ++ run_str = '${SPHINX_BUILD} -M ${SPHINX_OUTPUT_FORMAT} ${SRC} ${TGT} -d ${TGT[0].bld_dir()}/doctrees-${SPHINX_OUTPUT_FORMAT} ${SPHINX_OPTIONS}' ++ ++ def keyword(self): ++ return 'Compiling (%s)' % self.env.SPHINX_OUTPUT_FORMAT ++ ++ def runnable_status(self): ++ ++ for x in self.run_after: ++ if not x.hasrun: ++ return Task.ASK_LATER ++ ++ self.signature() ++ ret = Task.Task.runnable_status(self) ++ if ret == Task.SKIP_ME: ++ # in case the files were removed ++ self.add_install() ++ return ret ++ ++ ++ def post_run(self): ++ self.add_install() ++ return Task.Task.post_run(self) ++ ++ ++ def add_install(self): ++ nodes = self.sphinx_output_directory.ant_glob('**/*', quiet=True) ++ self.outputs += nodes ++ self.generator.add_install_files(install_to=self.install_path, ++ install_from=nodes, ++ postpone=False, ++ cwd=self.sphinx_output_directory.make_node(self.env.SPHINX_OUTPUT_FORMAT), ++ relative_trick=True) +diff --git a/waflib/extras/wafcache.py b/waflib/extras/wafcache.py +new file mode 100644 +index 000000000..30ac3ef51 +--- /dev/null ++++ b/waflib/extras/wafcache.py +@@ -0,0 +1,648 @@ ++#! /usr/bin/env python ++# encoding: utf-8 ++# Thomas Nagy, 2019 (ita) ++ ++""" ++Filesystem-based cache system to share and re-use build artifacts ++ ++Cache access operations (copy to and from) are delegated to ++independent pre-forked worker subprocesses. ++ ++The following environment variables may be set: ++* WAFCACHE: several possibilities: ++ - File cache: ++ absolute path of the waf cache (~/.cache/wafcache_user, ++ where `user` represents the currently logged-in user) ++ - URL to a cache server, for example: ++ export WAFCACHE=http://localhost:8080/files/ ++ in that case, GET/POST requests are made to urls of the form ++ http://localhost:8080/files/000000000/0 (cache management is delegated to the server) ++ - GCS, S3 or MINIO bucket ++ gs://my-bucket/ (uses gsutil command line tool or WAFCACHE_CMD) ++ s3://my-bucket/ (uses aws command line tool or WAFCACHE_CMD) ++ minio://my-bucket/ (uses mc command line tool or WAFCACHE_CMD) ++* WAFCACHE_CMD: bucket upload/download command, for example: ++ WAFCACHE_CMD="gsutil cp %{SRC} %{TGT}" ++ Note that the WAFCACHE bucket value is used for the source or destination ++ depending on the operation (upload or download). For example, with: ++ WAFCACHE="gs://mybucket/" ++ the following commands may be run: ++ gsutil cp build/myprogram gs://mybucket/aa/aaaaa/1 ++ gsutil cp gs://mybucket/bb/bbbbb/2 build/somefile ++* WAFCACHE_NO_PUSH: if set, disables pushing to the cache ++* WAFCACHE_VERBOSITY: if set, displays more detailed cache operations ++* WAFCACHE_STATS: if set, displays cache usage statistics on exit ++ ++File cache specific options: ++ Files are copied using hard links by default; if the cache is located ++ onto another partition, the system switches to file copies instead. ++* WAFCACHE_TRIM_MAX_FOLDER: maximum amount of tasks to cache (1M) ++* WAFCACHE_EVICT_MAX_BYTES: maximum amount of cache size in bytes (10GB) ++* WAFCACHE_EVICT_INTERVAL_MINUTES: minimum time interval to try ++ and trim the cache (3 minutes) ++ ++Upload specific options: ++* WAFCACHE_ASYNC_WORKERS: define a number of workers to upload results asynchronously ++ this may improve build performance with many/long file uploads ++ the default is unset (synchronous uploads) ++* WAFCACHE_ASYNC_NOWAIT: do not wait for uploads to complete (default: False) ++ this requires asynchonous uploads to have an effect ++ ++Usage:: ++ ++ def build(bld): ++ bld.load('wafcache') ++ ... ++ ++To troubleshoot:: ++ ++ waf clean build --zone=wafcache ++""" ++ ++import atexit, base64, errno, fcntl, getpass, os, re, shutil, sys, time, threading, traceback, urllib3, shlex ++try: ++ import subprocess32 as subprocess ++except ImportError: ++ import subprocess ++ ++base_cache = os.path.expanduser('~/.cache/') ++if not os.path.isdir(base_cache): ++ base_cache = '/tmp/' ++default_wafcache_dir = os.path.join(base_cache, 'wafcache_' + getpass.getuser()) ++ ++CACHE_DIR = os.environ.get('WAFCACHE', default_wafcache_dir) ++WAFCACHE_CMD = os.environ.get('WAFCACHE_CMD') ++TRIM_MAX_FOLDERS = int(os.environ.get('WAFCACHE_TRIM_MAX_FOLDER', 1000000)) ++EVICT_INTERVAL_MINUTES = int(os.environ.get('WAFCACHE_EVICT_INTERVAL_MINUTES', 3)) ++EVICT_MAX_BYTES = int(os.environ.get('WAFCACHE_EVICT_MAX_BYTES', 10**10)) ++WAFCACHE_NO_PUSH = 1 if os.environ.get('WAFCACHE_NO_PUSH') else 0 ++WAFCACHE_VERBOSITY = 1 if os.environ.get('WAFCACHE_VERBOSITY') else 0 ++WAFCACHE_STATS = 1 if os.environ.get('WAFCACHE_STATS') else 0 ++WAFCACHE_ASYNC_WORKERS = os.environ.get('WAFCACHE_ASYNC_WORKERS') ++WAFCACHE_ASYNC_NOWAIT = os.environ.get('WAFCACHE_ASYNC_NOWAIT') ++OK = "ok" ++ ++re_waf_cmd = re.compile('(?P%{SRC})|(?P%{TGT})') ++ ++try: ++ import cPickle ++except ImportError: ++ import pickle as cPickle ++ ++if __name__ != '__main__': ++ from waflib import Task, Logs, Utils, Build ++ ++def can_retrieve_cache(self): ++ """ ++ New method for waf Task classes ++ """ ++ if not self.outputs: ++ return False ++ ++ self.cached = False ++ ++ sig = self.signature() ++ ssig = Utils.to_hex(self.uid() + sig) ++ ++ if WAFCACHE_STATS: ++ self.generator.bld.cache_reqs += 1 ++ ++ files_to = [node.abspath() for node in self.outputs] ++ proc = get_process() ++ err = cache_command(proc, ssig, [], files_to) ++ process_pool.append(proc) ++ if err.startswith(OK): ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('CYAN', ' Fetched %r from cache' % files_to) ++ else: ++ Logs.debug('wafcache: fetched %r from cache', files_to) ++ if WAFCACHE_STATS: ++ self.generator.bld.cache_hits += 1 ++ else: ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('YELLOW', ' No cache entry %s' % files_to) ++ else: ++ Logs.debug('wafcache: No cache entry %s: %s', files_to, err) ++ return False ++ ++ self.cached = True ++ return True ++ ++def put_files_cache(self): ++ """ ++ New method for waf Task classes ++ """ ++ if WAFCACHE_NO_PUSH or getattr(self, 'cached', None) or not self.outputs: ++ return ++ ++ files_from = [] ++ for node in self.outputs: ++ path = node.abspath() ++ if not os.path.isfile(path): ++ return ++ files_from.append(path) ++ ++ bld = self.generator.bld ++ old_sig = self.signature() ++ ++ for node in self.inputs: ++ try: ++ del node.ctx.cache_sig[node] ++ except KeyError: ++ pass ++ ++ delattr(self, 'cache_sig') ++ sig = self.signature() ++ ++ def _async_put_files_cache(bld, ssig, files_from): ++ proc = get_process() ++ if WAFCACHE_ASYNC_WORKERS: ++ with bld.wafcache_lock: ++ if bld.wafcache_stop: ++ process_pool.append(proc) ++ return ++ bld.wafcache_procs.add(proc) ++ ++ err = cache_command(proc, ssig, files_from, []) ++ process_pool.append(proc) ++ if err.startswith(OK): ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('CYAN', ' Successfully uploaded %s to cache' % files_from) ++ else: ++ Logs.debug('wafcache: Successfully uploaded %r to cache', files_from) ++ if WAFCACHE_STATS: ++ bld.cache_puts += 1 ++ else: ++ if WAFCACHE_VERBOSITY: ++ Logs.pprint('RED', ' Error caching step results %s: %s' % (files_from, err)) ++ else: ++ Logs.debug('wafcache: Error caching results %s: %s', files_from, err) ++ ++ if old_sig == sig: ++ ssig = Utils.to_hex(self.uid() + sig) ++ if WAFCACHE_ASYNC_WORKERS: ++ fut = bld.wafcache_executor.submit(_async_put_files_cache, bld, ssig, files_from) ++ bld.wafcache_uploads.append(fut) ++ else: ++ _async_put_files_cache(bld, ssig, files_from) ++ else: ++ Logs.debug('wafcache: skipped %r upload due to late input modifications %r', self.outputs, self.inputs) ++ ++ bld.task_sigs[self.uid()] = self.cache_sig ++ ++def hash_env_vars(self, env, vars_lst): ++ """ ++ Reimplement BuildContext.hash_env_vars so that the resulting hash does not depend on local paths ++ """ ++ if not env.table: ++ env = env.parent ++ if not env: ++ return Utils.SIG_NIL ++ ++ idx = str(id(env)) + str(vars_lst) ++ try: ++ cache = self.cache_env ++ except AttributeError: ++ cache = self.cache_env = {} ++ else: ++ try: ++ return self.cache_env[idx] ++ except KeyError: ++ pass ++ ++ v = str([env[a] for a in vars_lst]) ++ v = v.replace(self.srcnode.abspath().__repr__()[:-1], '') ++ m = Utils.md5() ++ m.update(v.encode()) ++ ret = m.digest() ++ ++ Logs.debug('envhash: %r %r', ret, v) ++ ++ cache[idx] = ret ++ ++ return ret ++ ++def uid(self): ++ """ ++ Reimplement Task.uid() so that the signature does not depend on local paths ++ """ ++ try: ++ return self.uid_ ++ except AttributeError: ++ m = Utils.md5() ++ src = self.generator.bld.srcnode ++ up = m.update ++ up(self.__class__.__name__.encode()) ++ for x in self.inputs + self.outputs: ++ up(x.path_from(src).encode()) ++ self.uid_ = m.digest() ++ return self.uid_ ++ ++ ++def make_cached(cls): ++ """ ++ Enable the waf cache for a given task class ++ """ ++ if getattr(cls, 'nocache', None) or getattr(cls, 'has_cache', False): ++ return ++ ++ full_name = "%s.%s" % (cls.__module__, cls.__name__) ++ if full_name in ('waflib.Tools.ccroot.vnum', 'waflib.Build.inst'): ++ return ++ ++ m1 = getattr(cls, 'run', None) ++ def run(self): ++ if getattr(self, 'nocache', False): ++ return m1(self) ++ if self.can_retrieve_cache(): ++ return 0 ++ return m1(self) ++ cls.run = run ++ ++ m2 = getattr(cls, 'post_run', None) ++ def post_run(self): ++ if getattr(self, 'nocache', False): ++ return m2(self) ++ ret = m2(self) ++ self.put_files_cache() ++ return ret ++ cls.post_run = post_run ++ cls.has_cache = True ++ ++process_pool = [] ++def get_process(): ++ """ ++ Returns a worker process that can process waf cache commands ++ The worker process is assumed to be returned to the process pool when unused ++ """ ++ try: ++ return process_pool.pop() ++ except IndexError: ++ filepath = os.path.dirname(os.path.abspath(__file__)) + os.sep + 'wafcache.py' ++ cmd = [sys.executable, '-c', Utils.readf(filepath)] ++ return subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, bufsize=0) ++ ++def atexit_pool(): ++ for proc in process_pool: ++ proc.kill() ++atexit.register(atexit_pool) ++ ++def build(bld): ++ """ ++ Called during the build process to enable file caching ++ """ ++ ++ if WAFCACHE_ASYNC_WORKERS: ++ try: ++ num_workers = int(WAFCACHE_ASYNC_WORKERS) ++ except ValueError: ++ Logs.warn('Invalid WAFCACHE_ASYNC_WORKERS specified: %r' % WAFCACHE_ASYNC_WORKERS) ++ else: ++ from concurrent.futures import ThreadPoolExecutor ++ bld.wafcache_executor = ThreadPoolExecutor(max_workers=num_workers) ++ bld.wafcache_uploads = [] ++ bld.wafcache_procs = set([]) ++ bld.wafcache_stop = False ++ bld.wafcache_lock = threading.Lock() ++ ++ def finalize_upload_async(bld): ++ if WAFCACHE_ASYNC_NOWAIT: ++ with bld.wafcache_lock: ++ bld.wafcache_stop = True ++ ++ for fut in reversed(bld.wafcache_uploads): ++ fut.cancel() ++ ++ for proc in bld.wafcache_procs: ++ proc.kill() ++ ++ bld.wafcache_procs.clear() ++ else: ++ Logs.pprint('CYAN', '... waiting for wafcache uploads to complete (%s uploads)' % len(bld.wafcache_uploads)) ++ bld.wafcache_executor.shutdown(wait=True) ++ bld.add_post_fun(finalize_upload_async) ++ ++ if WAFCACHE_STATS: ++ # Init counter for statistics and hook to print results at the end ++ bld.cache_reqs = bld.cache_hits = bld.cache_puts = 0 ++ ++ def printstats(bld): ++ hit_ratio = 0 ++ if bld.cache_reqs > 0: ++ hit_ratio = (bld.cache_hits / bld.cache_reqs) * 100 ++ Logs.pprint('CYAN', ' wafcache stats: %s requests, %s hits (ratio: %.2f%%), %s writes' % ++ (bld.cache_reqs, bld.cache_hits, hit_ratio, bld.cache_puts) ) ++ bld.add_post_fun(printstats) ++ ++ if process_pool: ++ # already called once ++ return ++ ++ # pre-allocation ++ processes = [get_process() for x in range(bld.jobs)] ++ process_pool.extend(processes) ++ ++ Task.Task.can_retrieve_cache = can_retrieve_cache ++ Task.Task.put_files_cache = put_files_cache ++ Task.Task.uid = uid ++ Build.BuildContext.hash_env_vars = hash_env_vars ++ for x in reversed(list(Task.classes.values())): ++ make_cached(x) ++ ++def cache_command(proc, sig, files_from, files_to): ++ """ ++ Create a command for cache worker processes, returns a pickled ++ base64-encoded tuple containing the task signature, a list of files to ++ cache and a list of files files to get from cache (one of the lists ++ is assumed to be empty) ++ """ ++ obj = base64.b64encode(cPickle.dumps([sig, files_from, files_to])) ++ proc.stdin.write(obj) ++ proc.stdin.write('\n'.encode()) ++ proc.stdin.flush() ++ obj = proc.stdout.readline() ++ if not obj: ++ raise OSError('Preforked sub-process %r died' % proc.pid) ++ return cPickle.loads(base64.b64decode(obj)) ++ ++try: ++ copyfun = os.link ++except NameError: ++ copyfun = shutil.copy2 ++ ++def atomic_copy(orig, dest): ++ """ ++ Copy files to the cache, the operation is atomic for a given file ++ """ ++ global copyfun ++ tmp = dest + '.tmp' ++ up = os.path.dirname(dest) ++ try: ++ os.makedirs(up) ++ except OSError: ++ pass ++ ++ try: ++ copyfun(orig, tmp) ++ except OSError as e: ++ if e.errno == errno.EXDEV: ++ copyfun = shutil.copy2 ++ copyfun(orig, tmp) ++ else: ++ raise ++ os.rename(tmp, dest) ++ ++def lru_trim(): ++ """ ++ the cache folders take the form: ++ `CACHE_DIR/0b/0b180f82246d726ece37c8ccd0fb1cde2650d7bfcf122ec1f169079a3bfc0ab9` ++ they are listed in order of last access, and then removed ++ until the amount of folders is within TRIM_MAX_FOLDERS and the total space ++ taken by files is less than EVICT_MAX_BYTES ++ """ ++ lst = [] ++ for up in os.listdir(CACHE_DIR): ++ if len(up) == 2: ++ sub = os.path.join(CACHE_DIR, up) ++ for hval in os.listdir(sub): ++ path = os.path.join(sub, hval) ++ ++ size = 0 ++ for fname in os.listdir(path): ++ try: ++ size += os.lstat(os.path.join(path, fname)).st_size ++ except OSError: ++ pass ++ lst.append((os.stat(path).st_mtime, size, path)) ++ ++ lst.sort(key=lambda x: x[0]) ++ lst.reverse() ++ ++ tot = sum(x[1] for x in lst) ++ while tot > EVICT_MAX_BYTES or len(lst) > TRIM_MAX_FOLDERS: ++ _, tmp_size, path = lst.pop() ++ tot -= tmp_size ++ ++ tmp = path + '.remove' ++ try: ++ shutil.rmtree(tmp) ++ except OSError: ++ pass ++ try: ++ os.rename(path, tmp) ++ except OSError: ++ sys.stderr.write('Could not rename %r to %r\n' % (path, tmp)) ++ else: ++ try: ++ shutil.rmtree(tmp) ++ except OSError: ++ sys.stderr.write('Could not remove %r\n' % tmp) ++ sys.stderr.write("Cache trimmed: %r bytes in %r folders left\n" % (tot, len(lst))) ++ ++ ++def lru_evict(): ++ """ ++ Reduce the cache size ++ """ ++ lockfile = os.path.join(CACHE_DIR, 'all.lock') ++ try: ++ st = os.stat(lockfile) ++ except EnvironmentError as e: ++ if e.errno == errno.ENOENT: ++ with open(lockfile, 'w') as f: ++ f.write('') ++ return ++ else: ++ raise ++ ++ if st.st_mtime < time.time() - EVICT_INTERVAL_MINUTES * 60: ++ # check every EVICT_INTERVAL_MINUTES minutes if the cache is too big ++ # OCLOEXEC is unnecessary because no processes are spawned ++ fd = os.open(lockfile, os.O_RDWR | os.O_CREAT, 0o755) ++ try: ++ try: ++ fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB) ++ except EnvironmentError: ++ if WAFCACHE_VERBOSITY: ++ sys.stderr.write('wafcache: another cleaning process is running\n') ++ else: ++ # now dow the actual cleanup ++ lru_trim() ++ os.utime(lockfile, None) ++ finally: ++ os.close(fd) ++ ++class netcache(object): ++ def __init__(self): ++ self.http = urllib3.PoolManager() ++ ++ def url_of(self, sig, i): ++ return "%s/%s/%s" % (CACHE_DIR, sig, i) ++ ++ def upload(self, file_path, sig, i): ++ url = self.url_of(sig, i) ++ with open(file_path, 'rb') as f: ++ file_data = f.read() ++ r = self.http.request('POST', url, timeout=60, ++ fields={ 'file': ('%s/%s' % (sig, i), file_data), }) ++ if r.status >= 400: ++ raise OSError("Invalid status %r %r" % (url, r.status)) ++ ++ def download(self, file_path, sig, i): ++ url = self.url_of(sig, i) ++ with self.http.request('GET', url, preload_content=False, timeout=60) as inf: ++ if inf.status >= 400: ++ raise OSError("Invalid status %r %r" % (url, inf.status)) ++ with open(file_path, 'wb') as out: ++ shutil.copyfileobj(inf, out) ++ ++ def copy_to_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_from): ++ if not os.path.islink(x): ++ self.upload(x, sig, i) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++ def copy_from_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_to): ++ self.download(x, sig, i) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++class fcache(object): ++ def __init__(self): ++ if not os.path.exists(CACHE_DIR): ++ try: ++ os.makedirs(CACHE_DIR) ++ except OSError: ++ pass ++ if not os.path.exists(CACHE_DIR): ++ raise ValueError('Could not initialize the cache directory') ++ ++ def copy_to_cache(self, sig, files_from, files_to): ++ """ ++ Copy files to the cache, existing files are overwritten, ++ and the copy is atomic only for a given file, not for all files ++ that belong to a given task object ++ """ ++ try: ++ for i, x in enumerate(files_from): ++ dest = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ atomic_copy(x, dest) ++ except Exception: ++ return traceback.format_exc() ++ else: ++ # attempt trimming if caching was successful: ++ # we may have things to trim! ++ try: ++ lru_evict() ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++ def copy_from_cache(self, sig, files_from, files_to): ++ """ ++ Copy files from the cache ++ """ ++ try: ++ for i, x in enumerate(files_to): ++ orig = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ atomic_copy(orig, x) ++ ++ # success! update the cache time ++ os.utime(os.path.join(CACHE_DIR, sig[:2], sig), None) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++class bucket_cache(object): ++ def bucket_copy(self, source, target): ++ if WAFCACHE_CMD: ++ def replacer(match): ++ if match.group('src'): ++ return source ++ elif match.group('tgt'): ++ return target ++ cmd = [re_waf_cmd.sub(replacer, x) for x in shlex.split(WAFCACHE_CMD)] ++ elif CACHE_DIR.startswith('s3://'): ++ cmd = ['aws', 's3', 'cp', source, target] ++ elif CACHE_DIR.startswith('gs://'): ++ cmd = ['gsutil', 'cp', source, target] ++ else: ++ cmd = ['mc', 'cp', source, target] ++ ++ proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ++ out, err = proc.communicate() ++ if proc.returncode: ++ raise OSError('Error copy %r to %r using: %r (exit %r):\n out:%s\n err:%s' % ( ++ source, target, cmd, proc.returncode, out.decode(errors='replace'), err.decode(errors='replace'))) ++ ++ def copy_to_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_from): ++ dest = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ self.bucket_copy(x, dest) ++ except Exception: ++ return traceback.format_exc() ++ return OK ++ ++ def copy_from_cache(self, sig, files_from, files_to): ++ try: ++ for i, x in enumerate(files_to): ++ orig = os.path.join(CACHE_DIR, sig[:2], sig, str(i)) ++ self.bucket_copy(orig, x) ++ except EnvironmentError: ++ return traceback.format_exc() ++ return OK ++ ++def loop(service): ++ """ ++ This function is run when this file is run as a standalone python script, ++ it assumes a parent process that will communicate the commands to it ++ as pickled-encoded tuples (one line per command) ++ ++ The commands are to copy files to the cache or copy files from the ++ cache to a target destination ++ """ ++ # one operation is performed at a single time by a single process ++ # therefore stdin never has more than one line ++ txt = sys.stdin.readline().strip() ++ if not txt: ++ # parent process probably ended ++ sys.exit(1) ++ ret = OK ++ ++ [sig, files_from, files_to] = cPickle.loads(base64.b64decode(txt)) ++ if files_from: ++ # TODO return early when pushing files upstream ++ ret = service.copy_to_cache(sig, files_from, files_to) ++ elif files_to: ++ # the build process waits for workers to (possibly) obtain files from the cache ++ ret = service.copy_from_cache(sig, files_from, files_to) ++ else: ++ ret = "Invalid command" ++ ++ obj = base64.b64encode(cPickle.dumps(ret)) ++ sys.stdout.write(obj.decode()) ++ sys.stdout.write('\n') ++ sys.stdout.flush() ++ ++if __name__ == '__main__': ++ if CACHE_DIR.startswith('s3://') or CACHE_DIR.startswith('gs://') or CACHE_DIR.startswith('minio://'): ++ if CACHE_DIR.startswith('minio://'): ++ CACHE_DIR = CACHE_DIR[8:] # minio doesn't need the protocol part, uses config aliases ++ service = bucket_cache() ++ elif CACHE_DIR.startswith('http'): ++ service = netcache() ++ else: ++ service = fcache() ++ while 1: ++ try: ++ loop(service) ++ except KeyboardInterrupt: ++ break ++ +diff --git a/waflib/extras/xcode6.py b/waflib/extras/xcode6.py +index 91bbff181..c5b309120 100644 +--- a/waflib/extras/xcode6.py ++++ b/waflib/extras/xcode6.py +@@ -99,7 +99,7 @@ def delete_invalid_values(dct): + ... + } + 'Release': { +- 'ARCHS' x86_64' ++ 'ARCHS': x86_64' + ... + } + } +@@ -163,12 +163,12 @@ def tostring(self, value): + result = result + "\t\t}" + return result + elif isinstance(value, str): +- return "\"%s\"" % value ++ return '"%s"' % value.replace('"', '\\\\\\"') + elif isinstance(value, list): + result = "(\n" + for i in value: +- result = result + "\t\t\t%s,\n" % self.tostring(i) +- result = result + "\t\t)" ++ result = result + "\t\t\t\t%s,\n" % self.tostring(i) ++ result = result + "\t\t\t)" + return result + elif isinstance(value, XCodeNode): + return value._id +@@ -565,13 +565,13 @@ def process_xcode(self): + # Override target specific build settings + bldsettings = { + 'HEADER_SEARCH_PATHS': ['$(inherited)'] + self.env['INCPATHS'], +- 'LIBRARY_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.LIBPATH) + Utils.to_list(self.env.STLIBPATH) + Utils.to_list(self.env.LIBDIR) , ++ 'LIBRARY_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.LIBPATH) + Utils.to_list(self.env.STLIBPATH) + Utils.to_list(self.env.LIBDIR), + 'FRAMEWORK_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.FRAMEWORKPATH), +- 'OTHER_LDFLAGS': libs + ' ' + frameworks, +- 'OTHER_LIBTOOLFLAGS': bld.env['LINKFLAGS'], ++ 'OTHER_LDFLAGS': libs + ' ' + frameworks + ' ' + ' '.join(bld.env['LINKFLAGS']), + 'OTHER_CPLUSPLUSFLAGS': Utils.to_list(self.env['CXXFLAGS']), + 'OTHER_CFLAGS': Utils.to_list(self.env['CFLAGS']), +- 'INSTALL_PATH': [] ++ 'INSTALL_PATH': [], ++ 'GCC_PREPROCESSOR_DEFINITIONS': self.env['DEFINES'] + } + + # Install path +@@ -591,7 +591,7 @@ def process_xcode(self): + + # The keys represents different build configuration, e.g. Debug, Release and so on.. + # Insert our generated build settings to all configuration names +- keys = set(settings.keys() + bld.env.PROJ_CONFIGURATION.keys()) ++ keys = set(settings.keys()) | set(bld.env.PROJ_CONFIGURATION.keys()) + for k in keys: + if k in settings: + settings[k].update(bldsettings) +diff --git a/waflib/fixpy2.py b/waflib/fixpy2.py +index 24176e066..c99bff4b9 100644 +--- a/waflib/fixpy2.py ++++ b/waflib/fixpy2.py +@@ -56,7 +56,7 @@ def r1(code): + @subst('Runner.py') + def r4(code): + "generator syntax" +- return code.replace('next(self.biter)', 'self.biter.next()') ++ return code.replace('next(self.biter)', 'self.biter.next()').replace('self.daemon = True', 'self.setDaemon(1)') + + @subst('Context.py') + def r5(code): +diff --git a/waflib/processor.py b/waflib/processor.py +index 2eecf3bd9..eff2e69ad 100755 +--- a/waflib/processor.py ++++ b/waflib/processor.py +@@ -27,6 +27,10 @@ def run(): + [cmd, kwargs, cargs] = cPickle.loads(base64.b64decode(txt)) + cargs = cargs or {} + ++ if not 'close_fds' in kwargs: ++ # workers have no fds ++ kwargs['close_fds'] = False ++ + ret = 1 + out, err, ex, trace = (None, None, None, None) + try: -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 11 22:04:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 11 Feb 2024 23:04:35 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/python-cython: bump to version 3.0.8 In-Reply-To: <20240211214904.89575-2-james.hilliard1@gmail.com> References: <20240211214904.89575-1-james.hilliard1@gmail.com> <20240211214904.89575-2-james.hilliard1@gmail.com> Message-ID: James, All, On 2024-02-11 14:49 -0700, James Hilliard spake thusly: > License hash changed due to changing links from http to https: > https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 > > Signed-off-by: James Hilliard Err... I haven't seen my comments on your v1 addressed in this v2? Regards, Yann E. MORIN. > --- > package/python-cython/python-cython.hash | 6 +++--- > package/python-cython/python-cython.mk | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash > index 08ad8f6d84..55e4a6f203 100644 > --- a/package/python-cython/python-cython.hash > +++ b/package/python-cython/python-cython.hash > @@ -1,6 +1,6 @@ > # md5, sha256 from https://pypi.org/pypi/cython/json > -md5 a4d0f9fbc9c137f1a88937cd40e8c5ee Cython-0.29.36.tar.gz > -sha256 41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f Cython-0.29.36.tar.gz > +md5 9f7baaa983e1bd06eaeb4fa0adfc77e5 Cython-3.0.8.tar.gz > +sha256 8333423d8fd5765e7cceea3a9985dd1e0a5dfeb2734629e1a2ed2d6233d39de6 Cython-3.0.8.tar.gz > # Locally computed sha256 checksums > -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt > +sha256 9568a2b155e66ac3e0ba1fd80b52b827b9460e6cf6f233125e7cbca8e206ddc3 LICENSE.txt > sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt > diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk > index 47e105c065..d76bfb766d 100644 > --- a/package/python-cython/python-cython.mk > +++ b/package/python-cython/python-cython.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_CYTHON_VERSION = 0.29.36 > +PYTHON_CYTHON_VERSION = 3.0.8 > PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz > -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 > +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 > PYTHON_CYTHON_SETUP_TYPE = setuptools > PYTHON_CYTHON_LICENSE = Apache-2.0 > PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 11 22:08:07 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:08:07 +0100 Subject: [Buildroot] [PATCH v2 1/1] configs/imx6ulz_bsh_smm_m2_defconfig: new defconfig In-Reply-To: <20231214161855.1738492-1-dario.binacchi@amarulasolutions.com> References: <20231214161855.1738492-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240211230807.6007763d@windsurf> Hello Dario, On Thu, 14 Dec 2023 17:18:54 +0100 Dario Binacchi wrote: > From: Michael Trimarchi > > BSH SMM M2 (SystemMaster M2) Board is an add-on board which provides > input and output interfaces to a dedicated carrier board. It is designed > mainly to provide graphical/video and connectivity interfaces to the > appliance. > > Board support package includes the following components: > - mainline Linux kernel 6.1.68 > - mainline U-Boot 2023.10 > > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi I am sorry to provide this feedback so late, but there is one thing to improve in this submission: > board/bsh/imx6ulz-bsh-smm-m2/linux.config | 415 +++++++++++++++++++++ This defconfig is too long and clearly contains stuff that is useless. Could you review it and clean it up? > +CONFIG_WL12XX=m > +CONFIG_WL18XX=m Need both of these? > +CONFIG_WLCORE_SDIO=m > +# CONFIG_WILINK_PLATFORM_DATA is not set > +CONFIG_INPUT_EVDEV=y > +CONFIG_INPUT_EVBUG=m > +CONFIG_KEYBOARD_GPIO=y > +CONFIG_KEYBOARD_SNVS_PWRKEY=y > +CONFIG_KEYBOARD_IMX=y > +CONFIG_MOUSE_PS2=m > +CONFIG_MOUSE_PS2_ELANTECH=y > +CONFIG_INPUT_TOUCHSCREEN=y > +CONFIG_TOUCHSCREEN_ADS7846=y > +CONFIG_TOUCHSCREEN_AD7879=y > +CONFIG_TOUCHSCREEN_AD7879_I2C=y > +CONFIG_TOUCHSCREEN_ATMEL_MXT=y > +CONFIG_TOUCHSCREEN_DA9052=y > +CONFIG_TOUCHSCREEN_EGALAX=y > +CONFIG_TOUCHSCREEN_GOODIX=y > +CONFIG_TOUCHSCREEN_ILI210X=y > +CONFIG_TOUCHSCREEN_MAX11801=y > +CONFIG_TOUCHSCREEN_IMX6UL_TSC=y > +CONFIG_TOUCHSCREEN_MC13783=y > +CONFIG_TOUCHSCREEN_TSC2004=y > +CONFIG_TOUCHSCREEN_TSC2007=y > +CONFIG_TOUCHSCREEN_STMPE=y > +CONFIG_TOUCHSCREEN_SX8654=y So many touchscreen drivers? > +CONFIG_SPI=y > +CONFIG_SPI_FSL_QUADSPI=y > +CONFIG_SPI_GPIO=y > +CONFIG_SPI_IMX=y > +CONFIG_SPI_SPIDEV=y > +CONFIG_SPI_SLAVE=y You're using slave SPI? > +CONFIG_SPI_SLAVE_TIME=y > +CONFIG_SPI_SLAVE_SYSTEM_CONTROL=y > +CONFIG_PTP_1588_CLOCK=y > +CONFIG_GPIO_SYSFS=y > +CONFIG_GPIO_MXC=y > +CONFIG_GPIO_MAX732X=y > +CONFIG_GPIO_PCA953X=y > +CONFIG_GPIO_PCF857X=y > +CONFIG_GPIO_STMPE=y > +CONFIG_GPIO_74X164=y All those GPIO drivers are needed? > +CONFIG_POWER_RESET=y > +CONFIG_POWER_RESET_BRCMSTB=y A reset driver for broadcom platform? > +CONFIG_MFD_DA9052_I2C=y > +CONFIG_MFD_DA9062=y > +CONFIG_MFD_DA9063=y > +CONFIG_MFD_MC13XXX_SPI=y > +CONFIG_MFD_MC13XXX_I2C=y > +CONFIG_MFD_RN5T618=y > +CONFIG_MFD_STMPE=y > +CONFIG_MFD_WM8994=y All those MFD devices? > +CONFIG_REGULATOR=y > +CONFIG_REGULATOR_FIXED_VOLTAGE=y > +CONFIG_REGULATOR_ANATOP=y > +CONFIG_REGULATOR_DA9052=y > +CONFIG_REGULATOR_DA9062=y > +CONFIG_REGULATOR_DA9063=y > +CONFIG_REGULATOR_GPIO=y > +CONFIG_REGULATOR_LTC3676=y > +CONFIG_REGULATOR_MC13783=y > +CONFIG_REGULATOR_MC13892=y > +CONFIG_REGULATOR_PFUZE100=y > +CONFIG_REGULATOR_RN5T618=y All those regulators? etc. Please review globally :-) > diff --git a/configs/imx6ulz_bsh_smm_m2_defconfig b/configs/imx6ulz_bsh_smm_m2_defconfig > new file mode 100644 > index 000000000000..b12f36b84e65 > --- /dev/null > +++ b/configs/imx6ulz_bsh_smm_m2_defconfig > @@ -0,0 +1,42 @@ > +BR2_arm=y > +BR2_cortex_a7=y > +BR2_ARM_FPU_VFPV3=y > +BR2_KERNEL_HEADERS_6_1=y > +BR2_TOOLCHAIN_BUILDROOT_CXX=y Why is C++ enabled? > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx6ulz-bsh-smm-m2/post-build.sh" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.68" > +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/bsh/imx6ulz-bsh-smm-m2/linux.config" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ulz-bsh-smm-m2" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y Why is this option enabled? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 21:54:58 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 22:54:58 +0100 Subject: [Buildroot] [git commit] package/elfutils: drop lfs tweak Message-ID: <20240211220824.9088F87807@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7593aea519dee34cb25715296c1b03f471123ee2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When the elfutils package was first introduced, it filtered out LFS-related compiler flags due to issues with the package's implementation. This package has since evolved over the years to support LFS (e.g. using `AC_SYS_LARGEFILE` [1]). Filtering out `-D_FILE_OFFSET_BITS=64` can lead to a configuration error when `BR2_TIME_BITS_64` is enabled: checking whether gcc supports -Wl,-z,relro... yes checking for __thread support... no configure: error: __thread support required ... With the configuration log providing the specific reason: configure:7175: .../output-1/host/bin/m68k-buildroot-linux-gnu-gcc -o conftest -fPIC -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -shared -Wl,-z,defs -Wl,-z,relro -latomic -Wl,--build-id conftest.c >&5 In file included from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/stdlib.h:26, from conftest.c:13: .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ configure:7175: $? = 1 ... Fixes: - http://autobuild.buildroot.org/results/fbfe131673ed78999a07dbc879436e0ef6a8a1c0 [1]: https://sourceware.org/git/?p=elfutils.git;a=commit;h=3425454a10d307fae891fb667cf7969e945cde79 Signed-off-by: James Knight Signed-off-by: Thomas Petazzoni --- package/elfutils/elfutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 521c37a776..cb4293b0c3 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -29,10 +29,6 @@ HOST_ELFUTILS_CONF_OPTS = \ --without-zstd \ --disable-progs -# elfutils gets confused when lfs mode is forced, so don't -ELFUTILS_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) -ELFUTILS_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) - ELFUTILS_CONF_ENV += \ CFLAGS="$(ELFUTILS_CFLAGS)" \ CPPFLAGS="$(ELFUTILS_CPPFLAGS)" From thomas.petazzoni at bootlin.com Sun Feb 11 22:08:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:08:27 +0100 Subject: [Buildroot] [PATCH 1/1] elfutils: drop lfs tweak In-Reply-To: References: Message-ID: <20240211230827.3d820fe5@windsurf> On Thu, 8 Feb 2024 11:55:30 -0500 James Knight wrote: > When the elfutils package was first introduced, it filtered out > LFS-related compiler flags due to issues with the package's > implementation. This package has since evolved over the years to support > LFS (e.g. using `AC_SYS_LARGEFILE` [1]). > > Filtering out `-D_FILE_OFFSET_BITS=64` can lead to a configuration error > when `BR2_TIME_BITS_64` is enabled: > > checking whether gcc supports -Wl,-z,relro... yes > checking for __thread support... no > configure: error: __thread support required > ... > > With the configuration log providing the specific reason: > > configure:7175: .../output-1/host/bin/m68k-buildroot-linux-gnu-gcc -o conftest -fPIC -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -Ofast -g0 -D_FORTIFY_SOURCE=2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -shared -Wl,-z,defs -Wl,-z,relro -latomic -Wl,--build-id conftest.c >&5 > In file included from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features.h:394, > from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, > from .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/stdlib.h:26, > from conftest.c:13: > .../output-1/host/m68k-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > | ^~~~~ > configure:7175: $? = 1 > ... > > Fixes: > - http://autobuild.buildroot.org/results/fbfe131673ed78999a07dbc879436e0ef6a8a1c0 > > [1]: https://sourceware.org/git/?p=elfutils.git;a=commit;h=3425454a10d307fae891fb667cf7969e945cde79 > > Signed-off-by: James Knight > --- > package/elfutils/elfutils.mk | 4 ---- > 1 file changed, 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 22:08:34 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:08:34 +0100 Subject: [Buildroot] [git commit] package/python-uvicorn: bump to 0.27.0.post1 Message-ID: <20240211221044.3B6F48780D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4abcf5872cd14cd2b1633142ffed3794b838ac1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://github.com/encode/uvicorn/blob/master/CHANGELOG.md#0270post1---2024-01-29 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index cfa999e210..c7feaf3bfe 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 a1af843e7e305d551030abfa09dd3b15 uvicorn-0.24.0.post1.tar.gz -sha256 09c8e5a79dc466bdf28dead50093957db184de356fcdc48697bad3bde4c2588e uvicorn-0.24.0.post1.tar.gz +md5 a98f96c2578d9e6d454e271d0eae3ba3 uvicorn-0.27.0.post1.tar.gz +sha256 54898fcd80c13ff1cd28bf77b04ec9dbd8ff60c5259b499b4b12bb0917f22907 uvicorn-0.27.0.post1.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 04e6dd66a7..502cc06ad8 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.24.0.post1 +PYTHON_UVICORN_VERSION = 0.27.0.post1 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/e5/84/d43ce8fe6b31a316ef0ed04ea0d58cab981bdf7f17f8423491fa8b4f50b6 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/38/56/7bc5cf1d693d0c8e5d9dd66c29808691c17260b31346e4ddfbee26ba9bc2 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md From thomas.petazzoni at bootlin.com Sun Feb 11 22:10:46 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:10:46 +0100 Subject: [Buildroot] [PATCH] package/python-uvicorn: bump to 0.27.0.post1 In-Reply-To: <20240208140802.984184-1-buildroot@bubu1.eu> References: <20240208140802.984184-1-buildroot@bubu1.eu> Message-ID: <20240211231046.27b4371b@windsurf> On Thu, 8 Feb 2024 15:08:01 +0100 Marcus Hoffmann via buildroot wrote: > Changelog: > > https://github.com/encode/uvicorn/blob/master/CHANGELOG.md#0270post1---2024-01-29 > > Signed-off-by: Marcus Hoffmann > --- > package/python-uvicorn/python-uvicorn.hash | 4 ++-- > package/python-uvicorn/python-uvicorn.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 22:11:56 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:11:56 +0100 Subject: [Buildroot] [PATCH] package/python3: fix install In-Reply-To: <20240208095615.2397148-1-roy.kollen.svendsen@akersolutions.com> References: <20240208095615.2397148-1-roy.kollen.svendsen@akersolutions.com> Message-ID: <20240211231156.68fa41ab@windsurf> On Thu, 8 Feb 2024 10:56:14 +0100 Roy Kollen Svendsen wrote: > Fixes the following failure in the install step of host-python3: > ... > /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h > [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo > The following modules are *disabled* in configure script: > _ctypes_test _testbuffer _testcapi > _testclinic _testimportmultiple _testinternalcapi > _testmultiphase _xxtestfuzz xxsubtype > > Following modules built successfully but were removed because they could not be imported: > _tkinter > > Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) > ... > /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 > /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory > /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 > make[3]: *** [Makefile:2068: sharedinstall] Error 1 > ... > > Signed-off-by: Roy Kollen Svendsen > --- > Changes v1 -> v2: > Make the --disable-tk option automatically set py_cv_module__tkinter=n/a (suggested by Thomas Petazzoni) > --- > .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied to master after improving the commit title, and extending the commit log to indicate which commit this is fixing. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 22:10:57 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:10:57 +0100 Subject: [Buildroot] [git commit] package/python3: fix install when tk is disabled Message-ID: <20240211221213.A68FF8781B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=687b96db4d3518eadd16f74f7defdc05b1cfb736 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following failure in the install step of host-python3: ... /usr/bin/install -c -m 644 pyconfig.h output/host/include/python3.12/pyconfig.h [ERROR] _tkinter failed to import: output/build/host-python3-3.12.1/build/lib.linux-x86_64-3.12/_tkinter.cpython-312-x86_64-linux-gnu.so: undefined symbol: Tcl_AddErrorInfo The following modules are *disabled* in configure script: _ctypes_test _testbuffer _testcapi _testclinic _testimportmultiple _testinternalcapi _testmultiphase _xxtestfuzz xxsubtype Following modules built successfully but were removed because they could not be imported: _tkinter Checked 110 modules (31 built-in, 54 shared, 15 n/a on linux-x86_64, 9 disabled, 0 missing, 1 failed on import) ... /usr/bin/install -c -m 644 ./Lib/types.py output/host/lib/python3.12 /usr/bin/install: cannot stat 'Modules/_tkinter.cpython-312-x86_64-linux-gnu.so': No such file or directory /usr/bin/install -c -m 644 ./Lib/typing.py output/host/lib/python3.12 make[3]: *** [Makefile:2068: sharedinstall] Error 1 ... Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 ("package/python3: bump version to 3.12.1") Signed-off-by: Roy Kollen Svendsen Signed-off-by: Thomas Petazzoni --- package/python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 7fafbedddb..08617241a6 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,6 +70,8 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) ++AS_IF([test "$TK" = "no"], ++ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) From thomas.petazzoni at bootlin.com Sun Feb 11 22:12:03 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:12:03 +0100 Subject: [Buildroot] [git commit] support/testing: remove hardcoded sleep from python-flask test Message-ID: <20240211221213.B0A888781C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cbe0f4de67aef0f4695073c2047ba65cc420c83a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Similar to the new fastapi test, instead of waiting for a hard coded amount of time we can retry every second until the server is available and abort if after the timeout we still didn't manage to connect. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_python_flask.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/support/testing/tests/package/test_python_flask.py b/support/testing/tests/package/test_python_flask.py index 9d8587e918..32d9da34a5 100644 --- a/support/testing/tests/package/test_python_flask.py +++ b/support/testing/tests/package/test_python_flask.py @@ -21,9 +21,13 @@ class TestPythonPy3Flask(TestPythonPackageBase): _, exit_code = self.emulator.run(cmd, timeout=self.timeout) # Give enough time for the flask server to start up - time.sleep(30) + for attempt in range(30): + time.sleep(1) - cmd = "wget -q -O - http://127.0.0.1:5000/" - output, exit_code = self.emulator.run(cmd, timeout=self.timeout) - self.assertEqual(exit_code, 0) - self.assertEqual(output[0], "Hello, World!") + cmd = "wget -q -O - http://127.0.0.1:5000/" + output, exit_code = self.emulator.run(cmd, timeout=self.timeout) + if exit_code == 0: + self.assertEqual(output[0], 'Hello, World!') + break + else: + self.assertTrue(False, "Timeout while waiting for flask server") From thomas.petazzoni at bootlin.com Sun Feb 11 22:12:19 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:12:19 +0100 Subject: [Buildroot] [PATCH] support/testing: remove hardcoded sleep from python-flask test In-Reply-To: <20240207171513.2673706-1-buildroot@bubu1.eu> References: <20240207171513.2673706-1-buildroot@bubu1.eu> Message-ID: <20240211231219.39c02e88@windsurf> On Wed, 7 Feb 2024 18:15:12 +0100 Marcus Hoffmann via buildroot wrote: > Similar to the new fastapi test, instead of waiting for a hard coded > amount of time we can retry every second until the server is available > and abort if after the timeout we still didn't manage to connect. > > Signed-off-by: Marcus Hoffmann > --- > support/testing/tests/package/test_python_flask.py | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 22:13:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:13:12 +0100 Subject: [Buildroot] [git commit] configs/mangopi_mq1rdw1_defconfig: new defconfig Message-ID: <20240211221335.62A188783E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fe8f95a61ec9c4d2a1416d3f1dd327ad063beb4e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add support for MangoPi MQ1RDW2: https://mangopi.org/mqr An Allwinner T113-S3(2xCortex-A7+128MB DDR3-1600 embedded) based SBC with: * USB-OTG Type-C socket * USB-HOST Type-C socket * 2x 18 pin GPIO headers * TF card slot * RTL8723DS WiFi module with ext. antenna connector * 40 pin RGB FPC connector * 6 pin CTP FPC connector * 24 pin DVP FPC connector * onboard mic * onboard audio amplifier * FEL,reset button Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + board/mangopi/mq1rdw2/genimage.cfg | 16 ++++++++ board/mangopi/mq1rdw2/readme.txt | 46 ++++++++++++++++++++++ .../rootfs_overlay/boot/extlinux/extlinux.conf | 4 ++ .../mq1rdw2/rootfs_overlay/etc/network/interfaces | 6 +++ .../mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf | 8 ++++ configs/mangopi_mq1rdw2_defconfig | 40 +++++++++++++++++++ 7 files changed, 122 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 26868f74fe..0d12c3abcb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1211,6 +1211,7 @@ N: Giulio Benetti F: board/bananapi/bananapi-m2-ultra/ F: board/freescale/imx6ullevk/ F: board/freescale/imxrt1050evk/ +F: board/mangopi/mq1rdw2/ F: board/olimex/a* F: board/pine64/rockpro64 F: configs/amarula_vyasa_rk3288_defconfig @@ -1220,6 +1221,7 @@ F: configs/bananapi_m2_ultra_defconfig F: configs/freescale_imx6ullevk_defconfig F: configs/imx6ullevk_defconfig F: configs/imxrt1050-evk_defconfig +F: configs/mangopi_mq1rdw2_defconfig F: configs/olimex_a* F: configs/rockpro64_defconfig F: package/at/ diff --git a/board/mangopi/mq1rdw2/genimage.cfg b/board/mangopi/mq1rdw2/genimage.cfg new file mode 100644 index 0000000000..92c8677545 --- /dev/null +++ b/board/mangopi/mq1rdw2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1016K # 1MB - 8KB + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/mangopi/mq1rdw2/readme.txt b/board/mangopi/mq1rdw2/readme.txt new file mode 100644 index 0000000000..fd37f63154 --- /dev/null +++ b/board/mangopi/mq1rdw2/readme.txt @@ -0,0 +1,46 @@ +MangoPi MQ1RDW2 +=============== + +MangoPi MQ1RDW2 is a tiny ARM Cortex-A7 based single board computer. +It's built around Allwinner T113-S3 dual core 1GHz CPU with integrated +128MB DDR3-1600 RAM. +Board features: +- USB-OTG Type-C socket +- USB-HOST Type-C socket +- 2x 18 pin GPIO headers +- TF card slot +- RTL8723DS WiFi module with ext. antenna connector +- 40 pin RGB FPC connector +- 6 pin CTP FPC connector +- 24 pin DVP FPC connector +- onboard mic +- onboard audio amplifier +- FEL,reset button + +How to build +============ + +$ make mangopi_mq1rdw2_defconfig +$ make + +Wifi +========== + +Edit board/mangopi/mq1rdw2/overlay/etc/wpa_supplicant.conf or +/etc/wpa_supplicant.conf once connected to the board: + +* Replace YOURSSID with your AP ssid +* Replace YOURPASSWD with your AP password + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Connect a TTL UART to the UART3 on P8 header (unpopulated), insert the microSD card and +plug in a USB-C cable to the OTG or HOST connector to boot the system. diff --git a/board/mangopi/mq1rdw2/rootfs_overlay/boot/extlinux/extlinux.conf b/board/mangopi/mq1rdw2/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 0000000000..c190ff7659 --- /dev/null +++ b/board/mangopi/mq1rdw2/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label MANGOPI-MQ1RDW2 + kernel /boot/zImage + devicetree /boot/sun8i-t113s-mangopi-mq-r-t113.dtb + append console=ttyS3,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} diff --git a/board/mangopi/mq1rdw2/rootfs_overlay/etc/network/interfaces b/board/mangopi/mq1rdw2/rootfs_overlay/etc/network/interfaces new file mode 100644 index 0000000000..89e7d74aff --- /dev/null +++ b/board/mangopi/mq1rdw2/rootfs_overlay/etc/network/interfaces @@ -0,0 +1,6 @@ +auto lo +iface lo inet loopback + +auto wlan0 +iface wlan0 inet dhcp +wpa-conf /etc/wpa_supplicant.conf diff --git a/board/mangopi/mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf b/board/mangopi/mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf new file mode 100644 index 0000000000..b43292b0a7 --- /dev/null +++ b/board/mangopi/mq1rdw2/rootfs_overlay/etc/wpa_supplicant.conf @@ -0,0 +1,8 @@ +ap_scan=1 + +network={ + ssid="YOURSSID" + scan_ssid=1 + key_mgmt=WPA-PSK + psk="YOURPASSWD" +} diff --git a/configs/mangopi_mq1rdw2_defconfig b/configs/mangopi_mq1rdw2_defconfig new file mode 100644 index 0000000000..a2f8a1299b --- /dev/null +++ b/configs/mangopi_mq1rdw2_defconfig @@ -0,0 +1,40 @@ +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4=y +BR2_TARGET_GENERIC_HOSTNAME="mangopi-mq1rdw2" +BR2_TARGET_GENERIC_ISSUE="Welcome to MangoPI MQ1RDW2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS3" +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/mangopi/mq1rdw2/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/mangopi/mq1rdw2/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.5" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-t113s-mangopi-mq-r-t113" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_RTL8723DS=y +BR2_PACKAGE_WIRELESS_TOOLS=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y +BR2_PACKAGE_WPA_SUPPLICANT_CLI=y +BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y +BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01-rc4" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mangopi_mq_r" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y From thomas.petazzoni at bootlin.com Sun Feb 11 22:14:28 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:14:28 +0100 Subject: [Buildroot] [PATCH] configs/mangopi_mq1rdw1_defconfig: new defconfig In-Reply-To: <20231215213019.32352-1-giulio.benetti@benettiengineering.com> References: <20231215213019.32352-1-giulio.benetti@benettiengineering.com> Message-ID: <20240211231428.5d9049c1@windsurf> On Fri, 15 Dec 2023 22:30:19 +0100 Giulio Benetti wrote: > Add support for MangoPi MQ1RDW2: > https://mangopi.org/mqr > > An Allwinner T113-S3(2xCortex-A7+128MB DDR3-1600 embedded) based SBC > with: > * USB-OTG Type-C socket > * USB-HOST Type-C socket > * 2x 18 pin GPIO headers > * TF card slot > * RTL8723DS WiFi module with ext. antenna connector > * 40 pin RGB FPC connector > * 6 pin CTP FPC connector > * 24 pin DVP FPC connector > * onboard mic > * onboard audio amplifier > * FEL,reset button > > Signed-off-by: Giulio Benetti Applied, with minor changes. > diff --git a/DEVELOPERS b/DEVELOPERS > index 83b970b591..12dd1fdcc9 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1213,6 +1213,7 @@ N: Giulio Benetti > F: board/bananapi/bananapi-m2-ultra/ > F: board/freescale/imx6ullevk/ > F: board/freescale/imxrt1050evk/ > +F: board/mangopi/mq1rdw2 ^^^ missing final slash > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + size = 512M The size is not needed: the partition will automatically take the size of the rootfs.ext4 image. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Sun Feb 11 22:23:17 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:23:17 +0100 Subject: [Buildroot] [git commit] package/util-linux: fix build with -O0 Message-ID: <20240211222336.7400B87844@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8740387457f4dfccbd211ffaef1cae91db9f232d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure with -O0 raised since bump to version 2.39 in commit ad276d94a392fb13244e042851a44269e6254d61 and https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant THREAD_LOCAL int cache_size = cs_min; ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/7c9b8508345ffaba167c08521fb865d76555be1d - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...uid-src-gen_uuid.c-fix-cs_min-declaration.patch | 80 ++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch new file mode 100644 index 0000000000..bba4d54619 --- /dev/null +++ b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch @@ -0,0 +1,80 @@ +From bcd11dece7d278bb0b76b138d08dedea80fa8262 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 7 Nov 2023 18:43:57 +0100 +Subject: [PATCH] libuuid/src/gen_uuid.c: fix cs_min declaration + +Define cs_min through a define and not a const int to avoid the +following build failure with -O0 raised since version 2.39 and +https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: + +libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': +libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant + THREAD_LOCAL int cache_size = cs_min; + ^~~~~~ + +For consistency, also use define for cs_max and cs_factor + +Fixes: + - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/util-linux/util-linux/commit/07e5c29d501c19e7af84fecb5915e0f9f94cb49f +--- + libuuid/src/gen_uuid.c | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c +index 619ef0131..db793c374 100644 +--- a/libuuid/src/gen_uuid.c ++++ b/libuuid/src/gen_uuid.c +@@ -518,6 +518,10 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) + return __uuid_generate_time_internal(out, num, cont_offset); + } + ++#define CS_MIN (1<<6) ++#define CS_MAX (1<<18) ++#define CS_FACTOR 2 ++ + /* + * Generate time-based UUID and store it to @out + * +@@ -529,11 +533,8 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) + static int uuid_generate_time_generic(uuid_t out) { + #ifdef HAVE_TLS + /* thread local cache for uuidd based requests */ +- const int cs_min = (1<<6); +- const int cs_max = (1<<18); +- const int cs_factor = 2; + THREAD_LOCAL int num = 0; +- THREAD_LOCAL int cache_size = cs_min; ++ THREAD_LOCAL int cache_size = CS_MIN; + THREAD_LOCAL int last_used = 0; + THREAD_LOCAL struct uuid uu; + THREAD_LOCAL time_t last_time = 0; +@@ -552,10 +553,10 @@ static int uuid_generate_time_generic(uuid_t out) { + * Start with a small cache size to cover short running applications + * and adjust the cache size over the runntime. + */ +- if ((last_used == cache_size) && (cache_size < cs_max)) +- cache_size *= cs_factor; +- else if ((last_used < (cache_size / cs_factor)) && (cache_size > cs_min)) +- cache_size /= cs_factor; ++ if ((last_used == cache_size) && (cache_size < CS_MAX)) ++ cache_size *= CS_FACTOR; ++ else if ((last_used < (cache_size / CS_FACTOR)) && (cache_size > CS_MIN)) ++ cache_size /= CS_FACTOR; + + num = cache_size; + +@@ -568,7 +569,7 @@ static int uuid_generate_time_generic(uuid_t out) { + } + /* request to daemon failed, reset cache */ + num = 0; +- cache_size = cs_min; ++ cache_size = CS_MIN; + } + if (num > 0) { /* serve uuid from cache */ + uu.time_low++; +-- +2.43.0 + From thomas.petazzoni at bootlin.com Sun Feb 11 22:27:05 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:27:05 +0100 Subject: [Buildroot] [PATCH] package/util-linux: bump to version 2.39.3 Message-ID: <20240211222706.2959549-1-thomas.petazzoni@bootlin.com> Changes between 2.39.2 and 2.39.3: 2da5c904e18fdcffd2b252d641e6f76374c7b406 build-sys: release++ (v2.39.3) 03c939edda81c5a4d6e5f5c1cb896e79c1e82e16 docs: update v2.39.3-ReleaseNotes dafb120ef79c878cfd1b65c1d1c46497f17a7f7e docs: update AUTHORS file bfc9691ce5d964b87f6c02cc236361b4772456d0 po-man: merge changes d2232b60963a6e4e43fd359d1a4b552c4291b327 po: merge changes 4ab356c1c02c34cd3935e1bb0aa47ed6e27cfe3c po: add ro.po (from translationproject.org) 7e147d16c06f14b3f760b620d4f359cef12fe4ad po: update es.po (from translationproject.org) e8cb61f07430d5f1d624245a219c2e21694c5f52 lsfd: fix memory leak in append_filter_expr() 192d8aaa07e088e44fcb78736a53baae1ead7ccd lsfd: avoid undefined behavior 756588f8c8b2ed93c124ca15cfb3f0efc4a0f9f6 lsfd: (man) fix the form for the optional argument of --inet option 8d78c1306d1a9d5ebf9ec058344685da0360b87b Add Phytium FTC310 & FTC664 support b75322cdb13c6c0b3789ff8fc19dcd017c069784 Add Phytium FTC862 cpu model. fix:#2486 ec1b0eb36bd6c5a5079293ab03241163f61a8bf4 libmount: accept '\' as escape for options separator 2e5f5c8d85338811595d321a77647a40e12321c9 tests: add ts_skip_docker 0b3254cac3a275bbe32af57c6037cd29c21324d7 Merge branch 'stable-2.39/bcachefs-fixes' of https://github.com/t-8ch/util-linux into PR/stable-v2.39.3 6498439340a16e6acee54987df016c6b7928b17a tests: skip broken tests on docker fa9b5365861934faab9ba73bd405095f56f02e45 libblkid: (bcachefs) add support for sub-device labels 3c5d991b0323b33816e661e52da5d6f5402f47b5 libblkid: (bcachefs) adapt to major.minor version ece194082fb318d0fa3fec31193ce6f61b97c67a libuuid: avoid truncate clocks.txt to improve performance 84a62c1a5a614bde2530544bf2558c73f0179d42 libuuid/src/gen_uuid.c: fix cs_min declaration 93239aa7869ddd236db8e5a28b4e6873ce6e0f22 libmount: fix possible NULL dereference [coverity scan] a6def815e21d50db7a99ec74080c3fd7eb64e934 meson: install wall executable with group 'tty' c6c1c69c3e83606eced938d841af03c1acef03a0 meson: install write executable with group 'tty' bf2cd1d5a6eb273fbb11931b86ae165e7da5a397 libmount: improve mnt_table_next_child_fs() c14f5bf37adf681c378fc004f0996e0bcfd30ce0 docs: add SPDX to boilerplate.c fdd9f11f5e38b044617d3bc5f6c00789096b233f disk-utils: add SPDX and Copyright notices e7dbe9c788da98b86f8cf87bc20ec74e32206451 include/audit-arch: add missing SPDX 5ec7b14a72d9893d2a8d8c7f40cd45b44c9575c9 setterm: avoid restoring flags from uninitialized memory 64d2300e6443c311219f187433046751a86ed18e Fix man page for col to correct documentation error 7cc2c962567fe40daa9b12481224e5a0e6f96c47 Update col.c to fix option mistake 122d7e7afb44d8a823e362673b0d2d1e31f7d478 umount: handle bindmounts during --recursive da18b31ff1cb504e3d288f77d1f1d1179c39e4d8 lscpu: fix caches separator for --parse= 3a5c9c1dd6935fb16f15f210b80ce9c5228e6a19 Use empty libuser config file. 7058d793def09c3d4645e9efd1d8a5d212e839b0 libblkid: exfat: fix fail to find volume label d065ff00a36b7244842f743372099837bc61328b blkpr: store return value of getopt_long in int 9ca6f1712a5803e32e26e065e32e99837ba8b5d2 lib/path: Set errno in case of fgets failure e2f0aa5c25c0295ef6187d3c53c2801fe17385e5 autotools: fix AC_DEFINE_UNQUOTED() use cefd05c479e5456af8db2a86fabad165d247176b autotools: fix librtas check f27fbafb24bdcefaa2463d47abc18491c3497451 lib/path: fix typos f8ab70477e2ca7ac050fd4e2337b76a1972c8aa3 lib/path: set errno in case of error 5ec30a362a5dd91c018c04a64fd1a481029dc4c6 lib/path: fix possible out of boundary access edc723cd3341ff3d3e660051525dca40a2af6b3b libblkid: reset errno before calling probefuncs 8de89778b945d552796f09576925310810ce798b setpriv: fix group argument completion 41599054c7248f12c8a54d02f7161d0aff4275a9 libfdisk: reset errno before calling read() cce4e44059405f3170b166fbf1774bf4b89c11c4 blkid: fix call to err_exclusive_options b718f985cb6cc3bc65618649e9f231ecafcf81fb docs: use HTTPS for GitHub clone URLs 2bddfa6928af328675b2ffbfc9b6546e9ee81722 libblkid: (probe) handle probe without chain gracefully 3d31216787d6725fed361d27f0f01aff6ef46981 lib/idcache: always gracefully handle null cache 368521e45e1c9cb44145fc72c04d1cc903a883e8 script-playutils: close filestream in case ignore_line() fails 087b0d2383b8ab1ee4564d692d5f797ac781896f libblkid: (vxfs) report endianness 7e5056f33bdfd867ce6f1a642f560fdf0b402c1e libblkid: (ntfs) validate that sector_size is a power of two f368ccc759f9684338da723a93449764d0a8e312 libsmartcols: handle nameless tables in export format f5cace8da07291c94b76b5cf80da1f921be67419 ldattach: don't call exit() from signal handler 03c12a34c58d2550c6c718275950866d387d33f5 lslogins: fix realloc() loop allocation size 83ba179b12d3c6c5f400bf78f2f742b1cc7ce256 lib/env: avoid underflow of read_all_alloc() return value 813851fba28cb3ecde6a7f0c90a7e343920cd8c7 libblkid: avoid memory leak of cachefile path 4459623cde42a5d021a6d71e38fcdfd4fff3e171 libmount: gracefully handle NULL path in mnt_resolve_target() dbde7a537f27b23d64a8d3f583af472357de7192 more: avoid out-of-bound access c26badd5d4295d52e987c75e69113edfb407fb27 libfdisk: handle allocation failure in fdisk_new_partition 5c250aa6425fc3e35c07bce019eb4b7fa34bf722 login: Use pid_t for child_pid be3f1712ee2e1e43d9b82b7cf4987c8a609a81ef login: move comment 98be90b5bafa66d98655f8639efb3ffa984fc530 build-sys: fix libmount/src/hooks.c use a711af02d32c0a0a31f1bbb943ffff2e94203e86 lscpu: Use 4K buffer size instead of BUFSIZ 45c6136cba5f7607cca08c5aaab8e9b22ef87c25 autotools: fix typos aa98c4ecc938a3459ffb759a444a8a585a9d0a3a libmount: make.stx_mnt_id use more robust c697c2bb69f55aa24b6c0e2e752548f823c53796 libmount: report statx in features list 13711f3ab79dfa92e8815eb9b752ec2bf4832d80 libmount: fix statx() includes e9ed5a2b80bf8a76924caf8cd93b4cfff4d210a7 libblkid: (vfat) avoid modifying shared buffer d2cadf0992cce589bfffeb603325c3c2fe54a991 libblkid: (jmicron_raid) use checksum APIs c54c99efd0c3fc7f1e8db8b7191a6e1e3b295f1f libblkid: (jmicron_raid) avoid modifying shared buffer 64418c52bc594abf01fc4ae8148e7aa93e4b3f22 libblkid: (zonefs) avoid modifying shared buffer b66da7ce4a04d6c960817a56fe82498c4e7dea44 losetup: fix JSON MAJ:MIN 44d7bf2c8d1c6d34a40416807d16db6c07ac4916 lslogins: (man) fix -y option formatting 7d6c71e51ed3c5f8505c67962b6d03490738a879 include: add DragonFlyBSD GPT partition types 6b9fda87c4e5d0c6f945d7565197f157b9fa3d5f libblkid: (bcachefs) fix size validation acbf17ae8f8ee0f941fe98ed12f115f2b349bba8 libblkid: (bcachefs) fix compiler warning [-Werror=sign-compare] 1ec71634aa4ef5ddca23d65c8a296f3614231e8a libblkid: (bcachefs) fix not detecting large superblocks 68564ebb50f8afab5a9527c534417e247cca0b27 libmount: Fix regression when mounting with atime We can drop 0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch as it was backported by upstream to the 2.39.x branch, and included in 2.39.3. Signed-off-by: Thomas Petazzoni --- ...rc-gen_uuid.c-fix-cs_min-declaration.patch | 80 ------------------- package/util-linux/util-linux.hash | 2 +- package/util-linux/util-linux.mk | 2 +- 3 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch diff --git a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch deleted file mode 100644 index bba4d54619..0000000000 --- a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch +++ /dev/null @@ -1,80 +0,0 @@ -From bcd11dece7d278bb0b76b138d08dedea80fa8262 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Nov 2023 18:43:57 +0100 -Subject: [PATCH] libuuid/src/gen_uuid.c: fix cs_min declaration - -Define cs_min through a define and not a const int to avoid the -following build failure with -O0 raised since version 2.39 and -https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: - -libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': -libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant - THREAD_LOCAL int cache_size = cs_min; - ^~~~~~ - -For consistency, also use define for cs_max and cs_factor - -Fixes: - - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/util-linux/util-linux/commit/07e5c29d501c19e7af84fecb5915e0f9f94cb49f ---- - libuuid/src/gen_uuid.c | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c -index 619ef0131..db793c374 100644 ---- a/libuuid/src/gen_uuid.c -+++ b/libuuid/src/gen_uuid.c -@@ -518,6 +518,10 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - return __uuid_generate_time_internal(out, num, cont_offset); - } - -+#define CS_MIN (1<<6) -+#define CS_MAX (1<<18) -+#define CS_FACTOR 2 -+ - /* - * Generate time-based UUID and store it to @out - * -@@ -529,11 +533,8 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - static int uuid_generate_time_generic(uuid_t out) { - #ifdef HAVE_TLS - /* thread local cache for uuidd based requests */ -- const int cs_min = (1<<6); -- const int cs_max = (1<<18); -- const int cs_factor = 2; - THREAD_LOCAL int num = 0; -- THREAD_LOCAL int cache_size = cs_min; -+ THREAD_LOCAL int cache_size = CS_MIN; - THREAD_LOCAL int last_used = 0; - THREAD_LOCAL struct uuid uu; - THREAD_LOCAL time_t last_time = 0; -@@ -552,10 +553,10 @@ static int uuid_generate_time_generic(uuid_t out) { - * Start with a small cache size to cover short running applications - * and adjust the cache size over the runntime. - */ -- if ((last_used == cache_size) && (cache_size < cs_max)) -- cache_size *= cs_factor; -- else if ((last_used < (cache_size / cs_factor)) && (cache_size > cs_min)) -- cache_size /= cs_factor; -+ if ((last_used == cache_size) && (cache_size < CS_MAX)) -+ cache_size *= CS_FACTOR; -+ else if ((last_used < (cache_size / CS_FACTOR)) && (cache_size > CS_MIN)) -+ cache_size /= CS_FACTOR; - - num = cache_size; - -@@ -568,7 +569,7 @@ static int uuid_generate_time_generic(uuid_t out) { - } - /* request to daemon failed, reset cache */ - num = 0; -- cache_size = cs_min; -+ cache_size = CS_MIN; - } - if (num > 0) { /* serve uuid from cache */ - uu.time_low++; --- -2.43.0 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 1638cd9967..480f82d751 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc -sha256 87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f util-linux-2.39.2.tar.xz +sha256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f util-linux-2.39.3.tar.xz # License files, locally calculated sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 72126adb00..a9e5b0bf68 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.39 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) -- 2.43.0 From thomas.petazzoni at bootlin.com Sun Feb 11 22:27:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 11 Feb 2024 23:27:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/util-linux: fix build with -O0 In-Reply-To: <20231107174651.5995-1-fontaine.fabrice@gmail.com> References: <20231107174651.5995-1-fontaine.fabrice@gmail.com> Message-ID: <20240211232733.77d59395@windsurf> On Tue, 7 Nov 2023 18:46:51 +0100 Fabrice Fontaine wrote: > Fix the following build failure with -O0 raised since bump to version > 2.39 in commit ad276d94a392fb13244e042851a44269e6254d61 and > https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: > > libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': > libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant > THREAD_LOCAL int cache_size = cs_min; > ^~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/7c9b8508345ffaba167c08521fb865d76555be1d > - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 > > Signed-off-by: Fabrice Fontaine > --- > ...rc-gen_uuid.c-fix-cs_min-declaration.patch | 70 +++++++++++++++++++ > 1 file changed, 70 insertions(+) > create mode 100644 package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From ju.o at free.fr Sun Feb 11 22:30:46 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 11 Feb 2024 23:30:46 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: mdadm: improve test robustness on slow runners Message-ID: <20240211223046.1768519-1-ju.o@free.fr> As expected by Peter in [1], the hardcoded 3 seconds for waiting the RAID array to rebuild are not enough on slow test host runners. This test already failed at least once for that reason, in [2]. In order to fix those failures, this commit adds extra logic to allow several attempts, before failing. The timeout is currently set at 10 attempts, waiting 3 seconds between each attempts. To help even more, those 3 seconds are also scaled with the timeout_multiplier. Fixes: [2] [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685034.html [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/6137469690 Signed-off-by: Julien Olivain --- support/testing/tests/package/test_mdadm.py | 22 ++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_mdadm.py b/support/testing/tests/package/test_mdadm.py index 75385309a6..d5abdb0706 100644 --- a/support/testing/tests/package/test_mdadm.py +++ b/support/testing/tests/package/test_mdadm.py @@ -122,13 +122,21 @@ class TestMdadm(infra.basetest.BRTest): # We add back this blank drive to the array. self.assertRunOk(f"mdadm {md_dev} --add {failing_dev}") - # We wait few seconds to let the device rebuild. - time.sleep(3) - - # The array should no longer be marked as degraded. - out, ret = self.emulator.run(monitor_cmd) - self.assertEqual(ret, 0) - self.assertNotIn("DegradedArray", "\n".join(out)) + # Device rebuild can take a variable amount of time, depending + # on the load of the test controller host. So we will allow + # several attempts, before failing. + for attempt in range(10): + # We wait few seconds to let the device rebuild. + time.sleep(3 * self.timeout_multiplier) + + # Once rebuilt, the array should no longer be marked as + # degraded. + out, ret = self.emulator.run(monitor_cmd) + self.assertEqual(ret, 0) + if "DegradedArray" not in "\n".join(out): + break + else: + self.fail("Timeout while waiting for the array to rebuild.") # With all those array manipulations, the data file should not # be corrupted. We should be able to recompute the same hash -- 2.43.0 From aperez at igalia.com Sun Feb 11 22:52:26 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 12 Feb 2024 00:52:26 +0200 Subject: [Buildroot] [git commit] package/python3: bump version to 3.12.1 In-Reply-To: References: <20240206222231.8950D87481@busybox.osuosl.org> Message-ID: <20240212005226.GB2106578@igalia.com> Hi, On Sun, 11 Feb 2024 14:20:31 -0700 James Hilliard wrote: > On Fri, Feb 9, 2024 at 9:11?AM Bernd Kuhls wrote: > > > > Am Thu, 8 Feb 2024 21:14:52 -0500 schrieb James Knight: > > > > > import math > > > ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' > > > not found (required by > > > /builds/buildroot/output/build/python3-3.12.1/build/lib.linux- > > x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) > > > > Hi James, > > > > same here on Debian 12.4/bookworm, try this patch: > > https://github.com/bkuhls/buildroot/commit/ > > dca8b5bee7742ffedf81a027affadd4b7e18fc3f > > Yeah, this fixes the issue for me as well. Same here on Arch, I needed to apply the commit to get host-python3 built. Cheers, ?Adri?n -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 195 bytes Desc: not available URL: From buildroot at bubu1.eu Mon Feb 12 00:00:57 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 01:00:57 +0100 Subject: [Buildroot] [PATCH] support/testing: add python-msgpack runtime test Message-ID: <20240212000058.3000442-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- .../testing/tests/package/sample_python_msgpack.py | 5 +++++ support/testing/tests/package/test_python_msgpack.py | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 support/testing/tests/package/sample_python_msgpack.py create mode 100644 support/testing/tests/package/test_python_msgpack.py diff --git a/support/testing/tests/package/sample_python_msgpack.py b/support/testing/tests/package/sample_python_msgpack.py new file mode 100644 index 0000000000..1940f70821 --- /dev/null +++ b/support/testing/tests/package/sample_python_msgpack.py @@ -0,0 +1,5 @@ +import msgpack + +packaed = msgpack.packb([1, 2, 3], use_bin_type=True) + +assert msgpack.unpackb(packaed, raw=False) == [1, 2, 3] diff --git a/support/testing/tests/package/test_python_msgpack.py b/support/testing/tests/package/test_python_msgpack.py new file mode 100644 index 0000000000..e5876e400d --- /dev/null +++ b/support/testing/tests/package/test_python_msgpack.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3MsgPack(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MSGPACK=y + """ + sample_scripts = ["tests/package/sample_python_msgpack.py"] + timeout = 40 -- 2.43.0 From buildroot at bubu1.eu Mon Feb 12 00:10:00 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 01:10:00 +0100 Subject: [Buildroot] [PATCH v6 3/5] package/python-msgpack: add host cython dependency In-Reply-To: <20231126180840.2081945-3-james.hilliard1@gmail.com> References: <20231126180840.2081945-1-james.hilliard1@gmail.com> <20231126180840.2081945-3-james.hilliard1@gmail.com> Message-ID: <46469c10-9987-41fe-997e-e05e0f814319@bubu1.eu> Hi James, I hopefully found an acceptable solution to the cython problem. On 26.11.23 19:08, James Hilliard wrote: > We need host-python-cython for python-msgpack to build correctly. > This is a hard error when using a pep517 frontend. I did some more tests and actually this error comes just from Cython now being mentioned in the pyproject.toml build-system requires section.[1] In practice it is no more or less required than when using the old setup.py method. If the cython generated files are already there (they are usually present in the sdist, and indeed they are for msgpack here), then cython will never be invoked. So something simple like running sed -i -e '/Cython~=3.0.0/d' $(@D)/pyproject.toml inside some pre-build hook (or a patch to similar effect) works around this problem. I think, given the whole mess that the different cython version dependencies are currently causing, relying on the upstream generated files (as we have done before) sounds like the best option. (similarly for uvloop, which behaves just the same regarding the cython dependency). [1] https://github.com/msgpack/msgpack-python/blob/main/pyproject.toml#L5 > > Fixes: > * Getting build dependencies for wheel... > running egg_info > writing msgpack.egg-info/PKG-INFO > writing dependency_links to msgpack.egg-info/dependency_links.txt > writing top-level names to msgpack.egg-info/top_level.txt > reading manifest file 'msgpack.egg-info/SOURCES.txt' > reading manifest template 'MANIFEST.in' > warning: no files found matching '*.c' under directory 'msgpack' > adding license file 'COPYING' > writing manifest file 'msgpack.egg-info/SOURCES.txt' > > ERROR Missing dependencies: > Cython~=0.29.30 > > Signed-off-by: James Hilliard > --- > package/python-msgpack/python-msgpack.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk > index 061ff5a761..c915b23bf4 100644 > --- a/package/python-msgpack/python-msgpack.mk > +++ b/package/python-msgpack/python-msgpack.mk > @@ -10,5 +10,6 @@ PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/c2/d5/5662032db157 > PYTHON_MSGPACK_LICENSE = Apache-2.0 > PYTHON_MSGPACK_LICENSE_FILES = COPYING > PYTHON_MSGPACK_SETUP_TYPE = setuptools > +PYTHON_MSGPACK_DEPENDENCIES = host-python-cython > > $(eval $(python-package)) Marcus From buildroot at bubu1.eu Mon Feb 12 00:13:20 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 01:13:20 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> Message-ID: <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Hi Yann, James, On 11.02.24 22:57, Yann E. MORIN wrote: > James, All, > > On 2024-02-11 14:39 -0700, James Hilliard spake thusly: >> On Sun, Feb 11, 2024 at 2:24?PM Yann E. MORIN wrote: >>> On 2024-02-09 10:56 -0700, James Hilliard spake thusly: >>>> Add patches from pending upstream pull request which add cython3 >>>> compatibility. >>> We are a little bit cautious at applying random patches that have not >>> yet been at least reviewd by upstream. In this case, there has not been >>> any upstream activity since the last release, and not muc before that >>> either... >> Well these patches are being used by gentoo so they are not entirely >> untested in the real world. > > It's not that they are tested or not. It is about whether they'll have a > chance to be accepted upstream, or whether we'll have to carry and > maintain them forever in Buildroot. > > Maybe it's time that someone pings upstream about that PR? > >>> We have no in-tree user of uvloop, so I wonder whether it makes snse to >>> keep it, espcially since it mau be blocking the bumps of other packages >>> (like cython 3.x being required by whats-its-name). >> That's not entirely true, it's a common optional dependency for packages >> like python-uvicorn for example. > > $ git grep -i -E python.uvloop > > would turn only python-uvloop itself, and its runtime test. If it > is only optional, and prevents us from updating unless we apply > non-upstreamable patches, then I'd argue we should drop it. It's an optional dependency, but a recommended one, see the install instructions for uvivorn: https://github.com/encode/uvicorn?tab=readme-ov-file#quickstart It's a faster drop-in replacement for the python async event loop, but only compatible with CPython, not i.e. pypy, so usually projects don't declare a hard dependency on it. I found a hopefully better solution to our cython problems though: see the python-msgpack thread. In short: if we continue to use the sdists from pypi, cython is not a real build dependency and we can just remove it from pyptoject.toml instead of trying to provide the correct version that's never going to be invoked. > > [--SNIP--] >> I'll fix and resend. > > Thanks. > > Regards, > Yann E. MORIN. > From buildroot at bubu1.eu Mon Feb 12 00:21:26 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 01:21:26 +0100 Subject: [Buildroot] [PATCH] Revert "docs/website/support.html: document irc channel permission changes" Message-ID: <20240212002128.3002289-1-buildroot@bubu1.eu> This didn't work out as planned, neither the restriction of muting unregistered users, nor the exception for matrix users worked as planned. The channel mode has been reverted to +R (meaning only registered users are allowed to join) and an exception for *that* has been introduced for matrix users via +e. The channel modes are documented in [1]. [1] https://www.oftc.net/ChannelModes/ This reverts commit d1e6d7845b0f3b450709b84a6e4fc4527f12b196. Signed-off-by: Marcus Hoffmann --- docs/website/support.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/support.html b/docs/website/support.html index 28873c6d76..13d63b13a9 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -27,8 +27,8 @@ When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

    -

    Note that due to excessive spamming on IRC, you can only talk in the - channel if you are a registered user with +

    Note that due to excessive spamming on IRC, the channel can only be + joined if you are a registered user with OFTC NickServ service. Follow the instructions to register as a user with a password, and then join the #buildroot channel.

    -- 2.43.0 From kadambini.nema at gmail.com Mon Feb 12 00:26:07 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sun, 11 Feb 2024 16:26:07 -0800 Subject: [Buildroot] [PATCH v2] package/ustreamer: new package Message-ID: <20240212002607.12158-1-kadambini.nema@gmail.com> Lightweight and fast MJPEG-HTTP streamer (https://github.com/pikvm/ustreamer/tree/master#%C2%B5streamer) Signed-off-by: Kadambini Nema --- Changes v1 -> v2: - Fix 'make legal-info' with ustreamer package enabled. --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/ustreamer/Config.in | 17 +++++++++++++++++ package/ustreamer/ustreamer.hash | 3 +++ package/ustreamer/ustreamer.mk | 23 +++++++++++++++++++++++ 5 files changed, 47 insertions(+) create mode 100644 package/ustreamer/Config.in create mode 100644 package/ustreamer/ustreamer.hash create mode 100644 package/ustreamer/ustreamer.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..a6182777c0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1875,6 +1875,9 @@ F: package/easy-rsa/ N: Justin Maggard F: package/dtach/ +N: Kadambini Nema +F: package/ustreamer/ + N: Kamel Bouhara F: package/libodb-boost/ F: package/libodb-mysql/ diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..479c8b6657 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2595,6 +2595,7 @@ endif source "package/uredir/Config.in" source "package/ushare/Config.in" source "package/ussp-push/Config.in" + source "package/ustreamer/Config.in" source "package/vde2/Config.in" source "package/vdr/Config.in" source "package/vdr-plugin-vnsiserver/Config.in" diff --git a/package/ustreamer/Config.in b/package/ustreamer/Config.in new file mode 100644 index 0000000000..52c511e22d --- /dev/null +++ b/package/ustreamer/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_USTREAMER + bool "ustreamer" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 # V4L2_EVENT_SOURCE_CHANGE + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_ATOMIC + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBBSD + select BR2_PACKAGE_LIBGPIOD + help + Lightweight and fast MJPEG-HTTP streamer + + https://github.com/pikvm/ustreamer + +comment "ustreamer needs a toolchain w/ threads, headers >= 3.16, dynamic library" diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash new file mode 100644 index 0000000000..b7a85ca2d5 --- /dev/null +++ b/package/ustreamer/ustreamer.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 198283aaea5e7aa51da54426eb79ea436641ffb9b431e9ebace8fe5a76dfb105 ustreamer-b2ebcf99c8c51f97c44eccb6c768f5e824ecf952.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk new file mode 100644 index 0000000000..fbc30527bc --- /dev/null +++ b/package/ustreamer/ustreamer.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# ustreamer +# +################################################################################ + +USTREAMER_VERSION = b2ebcf99c8c51f97c44eccb6c768f5e824ecf952 +USTREAMER_SITE = $(call github,pikvm,ustreamer,$(USTREAMER_VERSION)) +USTREAMER_LICENSE = GPL-3.0-or-later +USTREAMER_LICENSE_FILES = LICENSE +USTREAMER_DEPENDENCIES = jpeg libevent libbsd libgpiod +USTREAMER_CONF_ENV = "CFLAGS=$(TARGET_CFLAGS)" + +define USTREAMER_BUILD_CMDS + $(MAKE) $(if $(BR2_PACKAGE_SYSTEMD),WITH_SYSTEMD=1, ) WITH_PTHREAD_NP=1 WITH_SETPROCTITLE=1 HAS_PDEATHSIG=1 $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define USTREAMER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/ustreamer $(TARGET_DIR)/usr/bin/ustreamer + $(INSTALL) -D -m 0755 $(@D)/ustreamer-dump $(TARGET_DIR)/usr/bin/ustreamer-dump +endef + +$(eval $(generic-package)) -- 2.25.1 From james.hilliard1 at gmail.com Mon Feb 12 00:40:58 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:40:58 -0700 Subject: [Buildroot] [PATCH v3 2/5] package/python-pyyaml: disable cython build In-Reply-To: <20240212004101.614670-1-james.hilliard1@gmail.com> References: <20240212004101.614670-1-james.hilliard1@gmail.com> Message-ID: <20240212004101.614670-2-james.hilliard1@gmail.com> Currently pyyaml does not support cython 3, as this is only an optional build dependency lets just disable cython for now as it will otherwise prevent us from updating cython. Signed-off-by: James Hilliard --- package/python-pyyaml/python-pyyaml.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 846c57df4f..2e4696a504 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -12,8 +12,7 @@ PYTHON_PYYAML_LICENSE = MIT PYTHON_PYYAML_LICENSE_FILES = LICENSE PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml -PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml -PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 +PYTHON_PYYAML_DEPENDENCIES = libyaml HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 00:40:57 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:40:57 -0700 Subject: [Buildroot] [PATCH v3 1/5] package/python-uvloop: add support for cython3 Message-ID: <20240212004101.614670-1-james.hilliard1@gmail.com> Add patches from pending upstream pull request which add cython3 compatibility. These patches have been in use by gentoo so they should be have a decent amount of real world testing/usage. See: https://github.com/gentoo/gentoo/commit/cd37f8eb287497af5a30b3c68beafc82412cd88d Signed-off-by: James Hilliard --- Changes v1 -> v2: - fix header for check-package --- .../0001-Updates-for-Cython3.patch | 630 ++++++++++++++++++ ...ebug-has-args-difference-in-python-3.patch | 29 + .../0003-fix-tests-on-python-3.8.patch | 30 + .../0004-fix-arg-count-for-wrap.patch | 51 ++ 4 files changed, 740 insertions(+) create mode 100644 package/python-uvloop/0001-Updates-for-Cython3.patch create mode 100644 package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch create mode 100644 package/python-uvloop/0003-fix-tests-on-python-3.8.patch create mode 100644 package/python-uvloop/0004-fix-arg-count-for-wrap.patch diff --git a/package/python-uvloop/0001-Updates-for-Cython3.patch b/package/python-uvloop/0001-Updates-for-Cython3.patch new file mode 100644 index 0000000000..5ed1c7536f --- /dev/null +++ b/package/python-uvloop/0001-Updates-for-Cython3.patch @@ -0,0 +1,630 @@ +From 087a2983c8022598232cb7ed0a49da334d7af9ff Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 12:18:15 +0000 +Subject: [PATCH] Updates for Cython3 Remove SSL depreciation warnings buillt + on debian 12.6 python-3.22 Cython-3.0.7 libuv-1.46.0 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + Makefile | 2 +- + setup.py | 6 ++++-- + tests/test_process.py | 4 ++-- + tests/test_tcp.py | 19 ++++++++++++------- + uvloop/_testbase.py | 4 +++- + uvloop/cbhandles.pyx | 4 ++-- + uvloop/dns.pyx | 4 ++-- + uvloop/handles/basetransport.pxd | 4 ++-- + uvloop/handles/basetransport.pyx | 4 ++-- + uvloop/handles/handle.pyx | 2 +- + uvloop/handles/pipe.pyx | 2 +- + uvloop/handles/poll.pxd | 2 +- + uvloop/handles/poll.pyx | 2 +- + uvloop/handles/stream.pyx | 16 ++++++++++------ + uvloop/handles/udp.pyx | 4 ++-- + uvloop/includes/consts.pxi | 25 ------------------------- + uvloop/includes/fork_handler.h | 6 +++++- + uvloop/includes/system.h | 16 ++++++++++++++++ + uvloop/includes/system.pxd | 12 ++++-------- + uvloop/includes/uv.pxd | 6 +++--- + uvloop/loop.pxd | 28 ++++++++++++++++++++++++---- + uvloop/loop.pyx | 10 +++++----- + uvloop/sslproto.pxd | 4 ++-- + uvloop/sslproto.pyx | 4 ++-- + 24 files changed, 107 insertions(+), 83 deletions(-) + delete mode 100644 uvloop/includes/consts.pxi + create mode 100755 uvloop/includes/system.h + +diff --git a/Makefile b/Makefile +index 4375e5d..6a0475a 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,7 @@ _default: compile + + + clean: +- rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd ++ rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd + rm -fr uvloop/*.c uvloop/*.html uvloop/*.so + rm -fr uvloop/handles/*.html uvloop/includes/*.html + find . -name '__pycache__' | xargs rm -rf +diff --git a/setup.py b/setup.py +index ba15af5..8fdf0e5 100644 +--- a/setup.py ++++ b/setup.py +@@ -21,7 +21,7 @@ from setuptools.command.build_ext import build_ext + from setuptools.command.sdist import sdist + + +-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)' ++CYTHON_DEPENDENCY = 'Cython(>=0.29.36)' + MACHINE = platform.machine() + MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')] + _ROOT = pathlib.Path(__file__).parent +@@ -144,7 +144,9 @@ class uvloop_build_ext(build_ext): + self.distribution.ext_modules[:] = cythonize( + self.distribution.ext_modules, + compiler_directives=directives, +- annotate=self.cython_annotate) ++ annotate=self.cython_annotate, ++ compile_time_env=dict(DEFAULT_FREELIST_SIZE=250, SSL_READ_MAX_SIZE=256 * 1024), ++ emit_linenums=True) + + super().finalize_options() + +diff --git a/tests/test_process.py b/tests/test_process.py +index bfcbba1..95e1c9e 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -912,7 +912,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +@@ -931,7 +931,7 @@ class Test_UV_Process_Delayed(tb.UVTestCase): + stdin=None, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, +- __uvloop_sleep_after_fork=True)) ++ uvloop_sleep_after_fork=True)) + self.assertIsNot(transport, None) + self.assertEqual(transport.get_returncode(), 0) + self.assertEqual( +diff --git a/tests/test_tcp.py b/tests/test_tcp.py +index 812e62b..213e2d9 100644 +--- a/tests/test_tcp.py ++++ b/tests/test_tcp.py +@@ -1630,17 +1630,22 @@ class _TestSSL(tb.SSLTestCase): + self.fail("unexpected call to connection_made()") + + def test_ssl_connect_accepted_socket(self): +- if hasattr(ssl, 'PROTOCOL_TLS'): +- proto = ssl.PROTOCOL_TLS ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ server_proto = ssl.PROTOCOL_TLS_SERVER ++ client_proto = ssl.PROTOCOL_TLS_CLIENT + else: +- proto = ssl.PROTOCOL_SSLv23 +- server_context = ssl.SSLContext(proto) ++ if hasattr(ssl, 'PROTOCOL_TLS'): ++ client_proto = server_proto = ssl.PROTOCOL_TLS ++ else: ++ client_proto = server_proto = ssl.PROTOCOL_SSLv23 ++ ++ server_context = ssl.SSLContext(server_proto) + server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY) + if hasattr(server_context, 'check_hostname'): + server_context.check_hostname = False + server_context.verify_mode = ssl.CERT_NONE + +- client_context = ssl.SSLContext(proto) ++ client_context = ssl.SSLContext(client_proto) + if hasattr(server_context, 'check_hostname'): + client_context.check_hostname = False + client_context.verify_mode = ssl.CERT_NONE +@@ -2233,7 +2238,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx.use_privatekey_file(self.ONLYKEY) + sslctx.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + def server(sock): +@@ -2592,7 +2597,7 @@ class _TestSSL(tb.SSLTestCase): + sslctx_openssl.use_privatekey_file(self.ONLYKEY) + sslctx_openssl.use_certificate_chain_file(self.ONLYCERT) + client_sslctx = self._create_client_ssl_context() +- if hasattr(ssl, 'OP_NO_TLSv1_3'): ++ if sys.version_info < (3, 8) and hasattr(ssl, 'OP_NO_TLSv1_3'): + client_sslctx.options |= ssl.OP_NO_TLSv1_3 + + future = None +diff --git a/uvloop/_testbase.py b/uvloop/_testbase.py +index c4a7595..e620e15 100644 +--- a/uvloop/_testbase.py ++++ b/uvloop/_testbase.py +@@ -269,7 +269,9 @@ def find_free_port(start_from=50000): + class SSLTestCase: + + def _create_server_ssl_context(self, certfile, keyfile=None): +- if hasattr(ssl, 'PROTOCOL_TLS'): ++ if hasattr(ssl, 'PROTOCOL_TLS_SERVER'): ++ sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) ++ elif hasattr(ssl, 'PROTOCOL_TLS'): + sslcontext = ssl.SSLContext(ssl.PROTOCOL_TLS) + else: + sslcontext = ssl.SSLContext(ssl.PROTOCOL_SSLv23) +diff --git a/uvloop/cbhandles.pyx b/uvloop/cbhandles.pyx +index 2914b42..8bcc5aa 100644 +--- a/uvloop/cbhandles.pyx ++++ b/uvloop/cbhandles.pyx +@@ -76,8 +76,8 @@ cdef class Handle: + self.arg1, self.arg2, self.arg3, self.arg4) + + else: +- raise RuntimeError('invalid Handle.cb_type: {}'.format( +- cb_type)) ++ raise RuntimeError('invalid Handle.cb_type: {} {!r}/{!r}'.format( ++ cb_type, self.args1, self.args2)) + + except (KeyboardInterrupt, SystemExit): + raise +diff --git a/uvloop/dns.pyx b/uvloop/dns.pyx +index 7aad631..09b9282 100644 +--- a/uvloop/dns.pyx ++++ b/uvloop/dns.pyx +@@ -298,7 +298,7 @@ cdef class AddrInfo: + uv.uv_freeaddrinfo(self.data) # returns void + self.data = NULL + +- cdef void set_data(self, system.addrinfo *data): ++ cdef void set_data(self, system.addrinfo *data) noexcept: + self.data = data + + cdef unpack(self): +@@ -326,7 +326,7 @@ cdef class AddrInfo: + return result + + @staticmethod +- cdef int isinstance(object other): ++ cdef int isinstance(object other) noexcept: + return type(other) is AddrInfo + + +diff --git a/uvloop/handles/basetransport.pxd b/uvloop/handles/basetransport.pxd +index ba356a7..8112622 100644 +--- a/uvloop/handles/basetransport.pxd ++++ b/uvloop/handles/basetransport.pxd +@@ -47,8 +47,8 @@ cdef class UVBaseTransport(UVSocketHandle): + # === overloads === + + cdef _new_socket(self) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + +- cdef bint _is_reading(self) ++ cdef bint _is_reading(self) noexcept + cdef _start_reading(self) + cdef _stop_reading(self) +diff --git a/uvloop/handles/basetransport.pyx b/uvloop/handles/basetransport.pyx +index 28b3079..a8592f2 100644 +--- a/uvloop/handles/basetransport.pyx ++++ b/uvloop/handles/basetransport.pyx +@@ -18,7 +18,7 @@ cdef class UVBaseTransport(UVSocketHandle): + + self._closing = 0 + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return 0 + + cdef inline _schedule_call_connection_made(self): +@@ -211,7 +211,7 @@ cdef class UVBaseTransport(UVSocketHandle): + self._extra_info = {} + self._extra_info[name] = obj + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + raise NotImplementedError + + cdef _start_reading(self): +diff --git a/uvloop/handles/handle.pyx b/uvloop/handles/handle.pyx +index 6efe375..2c96458 100644 +--- a/uvloop/handles/handle.pyx ++++ b/uvloop/handles/handle.pyx +@@ -363,7 +363,7 @@ cdef void __uv_close_handle_cb(uv.uv_handle_t* handle) noexcept with gil: + Py_DECREF(h) # Was INCREFed in UVHandle._close + + +-cdef void __close_all_handles(Loop loop): ++cdef void __close_all_handles(Loop loop) noexcept: + uv.uv_walk(loop.uvloop, + __uv_walk_close_all_handles_cb, + loop) # void +diff --git a/uvloop/handles/pipe.pyx b/uvloop/handles/pipe.pyx +index 195576c..d30a736 100644 +--- a/uvloop/handles/pipe.pyx ++++ b/uvloop/handles/pipe.pyx +@@ -25,7 +25,7 @@ cdef __pipe_init_uv_handle(UVStream handle, Loop loop): + cdef __pipe_open(UVStream handle, int fd): + cdef int err + err = uv.uv_pipe_open(handle._handle, +- fd) ++ fd) + if err < 0: + exc = convert_error(err) + raise exc +diff --git a/uvloop/handles/poll.pxd b/uvloop/handles/poll.pxd +index d07030b..c220540 100644 +--- a/uvloop/handles/poll.pxd ++++ b/uvloop/handles/poll.pxd +@@ -10,7 +10,7 @@ cdef class UVPoll(UVHandle): + cdef inline _poll_start(self, int flags) + cdef inline _poll_stop(self) + +- cdef int is_active(self) ++ cdef int is_active(self) noexcept + + cdef is_reading(self) + cdef is_writing(self) +diff --git a/uvloop/handles/poll.pyx b/uvloop/handles/poll.pyx +index fca5981..c905e9b 100644 +--- a/uvloop/handles/poll.pyx ++++ b/uvloop/handles/poll.pyx +@@ -29,7 +29,7 @@ cdef class UVPoll(UVHandle): + handle._init(loop, fd) + return handle + +- cdef int is_active(self): ++ cdef int is_active(self) noexcept: + return (self.reading_handle is not None or + self.writing_handle is not None) + +diff --git a/uvloop/handles/stream.pyx b/uvloop/handles/stream.pyx +index d4e02e3..09df887 100644 +--- a/uvloop/handles/stream.pyx ++++ b/uvloop/handles/stream.pyx +@@ -1,4 +1,8 @@ +-DEF __PREALLOCED_BUFS = 4 ++cdef extern from *: ++ ''' ++ enum {__PREALLOCED_BUFS = 4}; ++ ''' ++ const bint __PREALLOCED_BUFS + + + @cython.no_gc_clear +@@ -279,7 +283,7 @@ cdef class UVStream(UVBaseTransport): + cdef inline _close_on_read_error(self): + self.__read_error_close = 1 + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__reading + + cdef _start_reading(self): +@@ -578,7 +582,7 @@ cdef class UVStream(UVBaseTransport): + + self._maybe_resume_protocol() + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return ((self._handle).write_queue_size + +@@ -755,7 +759,7 @@ cdef inline bint __uv_stream_on_read_common( + UVStream sc, + Loop loop, + ssize_t nread, +-): ++) noexcept: + if sc._closed: + # The stream was closed, there is no reason to + # do any work now. +@@ -818,7 +822,7 @@ cdef inline void __uv_stream_on_read_impl( + uv.uv_stream_t* stream, + ssize_t nread, + const uv.uv_buf_t* buf, +-): ++) noexcept: + cdef: + UVStream sc = stream.data + Loop loop = sc._loop +@@ -849,7 +853,7 @@ cdef inline void __uv_stream_on_read_impl( + cdef inline void __uv_stream_on_write_impl( + uv.uv_write_t* req, + int status, +-): ++) noexcept: + cdef: + _StreamWriteContext ctx = <_StreamWriteContext> req.data + UVStream stream = ctx.stream +diff --git a/uvloop/handles/udp.pyx b/uvloop/handles/udp.pyx +index bbe60d5..fdd1d8b 100644 +--- a/uvloop/handles/udp.pyx ++++ b/uvloop/handles/udp.pyx +@@ -127,12 +127,12 @@ cdef class UDPTransport(UVBaseTransport): + exc = convert_error(err) + raise exc + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + if self._handle is NULL: + return 0 + return (self._handle).send_queue_size + +- cdef bint _is_reading(self): ++ cdef bint _is_reading(self) noexcept: + return self.__receiving + + cdef _start_reading(self): +diff --git a/uvloop/includes/consts.pxi b/uvloop/includes/consts.pxi +deleted file mode 100644 +index f765053..0000000 +--- a/uvloop/includes/consts.pxi ++++ /dev/null +@@ -1,25 +0,0 @@ +-DEF UV_STREAM_RECV_BUF_SIZE = 256000 # 250kb +- +-DEF FLOW_CONTROL_HIGH_WATER = 64 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB +-DEF FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB +- +-DEF DEFAULT_FREELIST_SIZE = 250 +-DEF DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 +- +-DEF DEBUG_STACK_DEPTH = 10 +- +- +-DEF __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 +- +- +-DEF LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 +- +- +-# Number of seconds to wait for SSL handshake to complete +-# The default timeout matches that of Nginx. +-DEF SSL_HANDSHAKE_TIMEOUT = 60.0 +-# Number of seconds to wait for SSL shutdown to complete +-# The default timeout mimics lingering_time +-DEF SSL_SHUTDOWN_TIMEOUT = 30.0 +-DEF SSL_READ_MAX_SIZE = 256 * 1024 +diff --git a/uvloop/includes/fork_handler.h b/uvloop/includes/fork_handler.h +index 47bbe03..9d3573a 100644 +--- a/uvloop/includes/fork_handler.h ++++ b/uvloop/includes/fork_handler.h +@@ -1,7 +1,10 @@ ++#ifndef UVLOOP_FORK_HANDLER_H_ ++#define UVLOOP_FORK_HANDLER_H_ ++ + volatile uint64_t MAIN_THREAD_ID = 0; + volatile int8_t MAIN_THREAD_ID_SET = 0; + +-typedef void (*OnForkHandler)(); ++typedef void (*OnForkHandler)(void); + + OnForkHandler __forkHandler = NULL; + +@@ -36,3 +39,4 @@ void setMainThreadID(uint64_t id) { + MAIN_THREAD_ID = id; + MAIN_THREAD_ID_SET = 1; + } ++#endif +diff --git a/uvloop/includes/system.h b/uvloop/includes/system.h +new file mode 100755 +index 0000000..e143bb5 +--- /dev/null ++++ b/uvloop/includes/system.h +@@ -0,0 +1,16 @@ ++#ifndef UVLOOP_SYSTEM_H_ ++#define UVLOOP_SYSTEM_H_ ++#if defined(_WIN32) || defined(MS_WINDOWS) || defined(_MSC_VER) ++#include "Winsock2.h" ++#include "ws2def.h" ++#include "includes/fork_handler.h" ++#else ++#include "arpa/inet.h" ++#include "sys/socket.h" ++#include "sys/un.h" ++#include "unistd.h" ++#include "pthread.h" ++#endif ++#endif ++ ++ +diff --git a/uvloop/includes/system.pxd b/uvloop/includes/system.pxd +index 367fedd..d1da74e 100644 +--- a/uvloop/includes/system.pxd ++++ b/uvloop/includes/system.pxd +@@ -1,13 +1,9 @@ + from libc.stdint cimport int8_t, uint64_t + +-cdef extern from "arpa/inet.h" nogil: +- +- int ntohl(int) +- int htonl(int) +- int ntohs(int) +- +- +-cdef extern from "sys/socket.h" nogil: ++cdef extern from "includes/system.h": ++ int ntohl(int) nogil ++ int htonl(int) nogil ++ int ntohs(int) nogil + + struct sockaddr: + unsigned short sa_family +diff --git a/uvloop/includes/uv.pxd b/uvloop/includes/uv.pxd +index 8765130..ddd9738 100644 +--- a/uvloop/includes/uv.pxd ++++ b/uvloop/includes/uv.pxd +@@ -220,7 +220,7 @@ cdef extern from "uv.h" nogil: + UV_LEAVE_GROUP = 0, + UV_JOIN_GROUP + +- cpdef enum uv_fs_event: ++ cdef enum uv_fs_event: + UV_RENAME = 1, + UV_CHANGE = 2 + +@@ -282,7 +282,7 @@ cdef extern from "uv.h" nogil: + int uv_loop_close(uv_loop_t* loop) + int uv_loop_alive(uv_loop_t* loop) + int uv_loop_fork(uv_loop_t* loop) +- int uv_backend_fd(uv_loop_t* loop) ++ uv_os_fd_t uv_backend_fd(uv_loop_t* loop) + + void uv_update_time(uv_loop_t* loop) + uint64_t uv_now(const uv_loop_t*) +@@ -378,7 +378,7 @@ cdef extern from "uv.h" nogil: + # Pipes + + int uv_pipe_init(uv_loop_t* loop, uv_pipe_t* handle, int ipc) +- int uv_pipe_open(uv_pipe_t* handle, uv_file file) ++ int uv_pipe_open(uv_pipe_t* handle, uv_os_fd_t file) + int uv_pipe_bind(uv_pipe_t* handle, const char* name) + + void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index 5613473..f90c704 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -1,15 +1,35 @@ + # cython: language_level=3 + ++cdef extern from *: ++ ''' ++ enum { UV_STREAM_RECV_BUF_SIZE = 256000, ++ SSL_READ_MAX_SIZE = 256 * 1024, // 250kb ++ }; ++ const float SSL_HANDSHAKE_TIMEOUT = 60.0; // Number of seconds to wait for SSL handshake to complete The default timeout matches that of Nginx. ++ const float SSL_SHUTDOWN_TIMEOUT = 30.0; // Number of seconds to wait for SSL shutdown to complete The default timeout mimics lingering_time ++ ''' ++ const bint UV_STREAM_RECV_BUF_SIZE ++ const bint SSL_READ_MAX_SIZE ++ ++ const float SSL_HANDSHAKE_TIMEOUT ++ const float SSL_SHUTDOWN_TIMEOUT ++ ++cdef enum: ++ FLOW_CONTROL_HIGH_WATER = 64 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_READ = 256 # KiB ++ FLOW_CONTROL_HIGH_WATER_SSL_WRITE = 512 # KiB ++ ++ DNS_PYADDR_TO_SOCKADDR_CACHE_SIZE = 2048 ++ DEBUG_STACK_DEPTH = 10 ++ __PROCESS_DEBUG_SLEEP_AFTER_FORK = 1 ++ LOG_THRESHOLD_FOR_CONNLOST_WRITES = 5 ++ + + from .includes cimport uv + from .includes cimport system + + from libc.stdint cimport uint64_t, uint32_t, int64_t + +- +-include "includes/consts.pxi" +- +- + cdef extern from *: + ctypedef int vint "volatile int" + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 334d8d5..53e1160 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -43,7 +43,7 @@ from cpython.pycapsule cimport PyCapsule_New, PyCapsule_GetPointer + from . import _noop + + +-include "includes/consts.pxi" ++ + include "includes/stdlib.pxi" + + include "errors.pyx" +@@ -1118,7 +1118,7 @@ cdef class Loop: + + cdef _sock_set_reuseport(self, int fd): + cdef: +- int err ++ int err = 0 + int reuseport_flag = 1 + + err = system.setsockopt( +@@ -1397,7 +1397,7 @@ cdef class Loop: + self._debug = bool(enabled) + if self.is_running(): + self.call_soon_threadsafe( +- self._set_coroutine_debug, self, self._debug) ++ self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +@@ -2750,7 +2750,7 @@ cdef class Loop: + executable=None, + pass_fds=(), + # For tests only! Do not use in your code. Ever. +- __uvloop_sleep_after_fork=False): ++ uvloop_sleep_after_fork=False): + + # TODO: Implement close_fds (might not be very important in + # Python 3.5, since all FDs aren't inheritable by default.) +@@ -2770,7 +2770,7 @@ cdef class Loop: + if executable is not None: + args[0] = executable + +- if __uvloop_sleep_after_fork: ++ if uvloop_sleep_after_fork: + debug_flags |= __PROCESS_DEBUG_SLEEP_AFTER_FORK + + waiter = self._new_future() +diff --git a/uvloop/sslproto.pxd b/uvloop/sslproto.pxd +index 3da10f0..68e4d57 100644 +--- a/uvloop/sslproto.pxd ++++ b/uvloop/sslproto.pxd +@@ -122,7 +122,7 @@ cdef class SSLProtocol: + # Flow control for writes from APP socket + + cdef _control_app_writing(self, object context=*) +- cdef size_t _get_write_buffer_size(self) ++ cdef size_t _get_write_buffer_size(self) noexcept + cdef _set_write_buffer_limits(self, high=*, low=*) + + # Flow control for reads to APP socket +@@ -134,5 +134,5 @@ cdef class SSLProtocol: + + cdef _control_ssl_reading(self) + cdef _set_read_buffer_limits(self, high=*, low=*) +- cdef size_t _get_read_buffer_size(self) ++ cdef size_t _get_read_buffer_size(self) noexcept + cdef _fatal_error(self, exc, message=*) +diff --git a/uvloop/sslproto.pyx b/uvloop/sslproto.pyx +index 42bb764..0a43746 100644 +--- a/uvloop/sslproto.pyx ++++ b/uvloop/sslproto.pyx +@@ -861,7 +861,7 @@ cdef class SSLProtocol: + 'protocol': self, + }) + +- cdef size_t _get_write_buffer_size(self): ++ cdef size_t _get_write_buffer_size(self) noexcept: + return self._outgoing.pending + self._write_buffer_size + + cdef _set_write_buffer_limits(self, high=None, low=None): +@@ -903,7 +903,7 @@ cdef class SSLProtocol: + self._incoming_high_water = high + self._incoming_low_water = low + +- cdef size_t _get_read_buffer_size(self): ++ cdef size_t _get_read_buffer_size(self) noexcept: + return self._incoming.pending + + # Flow control for writes to SSL socket +-- +2.34.1 + diff --git a/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch new file mode 100644 index 0000000000..0567eebe82 --- /dev/null +++ b/package/python-uvloop/0002-_set_coroutine_debug-has-args-difference-in-python-3.patch @@ -0,0 +1,29 @@ +From 8b63801bfdb1f0cf7fde4f58e96f8628a587b186 Mon Sep 17 00:00:00 2001 +From: Alan Brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 16:17:49 +0000 +Subject: [PATCH] _set_coroutine_debug has args difference in python 3.11 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pyx | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 53e1160..5ca718e 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,8 +1396,9 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): ++ args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) + self.call_soon_threadsafe( +- self._set_coroutine_debug, self._debug) ++ self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0003-fix-tests-on-python-3.8.patch b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch new file mode 100644 index 0000000000..e9bed5e877 --- /dev/null +++ b/package/python-uvloop/0003-fix-tests-on-python-3.8.patch @@ -0,0 +1,30 @@ +From ef5c3e5c6f331692ebcbea9e4c6aead8b2187038 Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Thu, 28 Dec 2023 19:58:11 +0000 +Subject: [PATCH] fix tests on python 3.8 + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pyx | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 5ca718e..75b915a 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1396,9 +1396,8 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = (self, self._debug) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe( +- self._set_coroutine_debug, *args) ++ args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) ++ self.call_soon_threadsafe(self._set_coroutine_debug, *args) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + diff --git a/package/python-uvloop/0004-fix-arg-count-for-wrap.patch b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch new file mode 100644 index 0000000000..d19923a5bc --- /dev/null +++ b/package/python-uvloop/0004-fix-arg-count-for-wrap.patch @@ -0,0 +1,51 @@ +From afef6364c2c3100ab23c2bb2de82d2da330b258c Mon Sep 17 00:00:00 2001 +From: alan-brooks <12380017+alan-brooks at users.noreply.github.com> +Date: Fri, 29 Dec 2023 11:24:19 +0000 +Subject: [PATCH] fix arg count for wrap() + +Signed-off-by: James Hilliard +Upstream: https://github.com/MagicStack/uvloop/pull/587 +--- + uvloop/loop.pxd | 2 +- + uvloop/loop.pyx | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/uvloop/loop.pxd b/uvloop/loop.pxd +index f90c704..d34ffeb 100644 +--- a/uvloop/loop.pxd ++++ b/uvloop/loop.pxd +@@ -220,7 +220,7 @@ cdef class Loop: + cdef inline _ceval_process_signals(self) + cdef _invoke_signals(self, bytes data) + +- cdef _set_coroutine_debug(self, bint enabled) ++ cpdef _set_coroutine_debug(self, bint enabled) + + cdef _print_debug_info(self) + +diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx +index 75b915a..a3eeb60 100644 +--- a/uvloop/loop.pyx ++++ b/uvloop/loop.pyx +@@ -1131,7 +1131,7 @@ cdef class Loop: + if err < 0: + raise convert_error(-errno.errno) + +- cdef _set_coroutine_debug(self, bint enabled): ++ cpdef _set_coroutine_debug(self, bint enabled): + enabled = bool(enabled) + if self._coroutine_debug_set == enabled: + return +@@ -1396,8 +1396,7 @@ cdef class Loop: + def set_debug(self, enabled): + self._debug = bool(enabled) + if self.is_running(): +- args = ((self, self._debug),) if sys.version_info < (3, 11) else (self._debug,) +- self.call_soon_threadsafe(self._set_coroutine_debug, *args) ++ self.call_soon_threadsafe(self._set_coroutine_debug, self._debug) + + def is_running(self): + """Return whether the event loop is currently running.""" +-- +2.34.1 + -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 00:40:59 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:40:59 -0700 Subject: [Buildroot] [PATCH v3 3/5] package/python-numpy: bump to version 1.26.4 In-Reply-To: <20240212004101.614670-1-james.hilliard1@gmail.com> References: <20240212004101.614670-1-james.hilliard1@gmail.com> Message-ID: <20240212004101.614670-3-james.hilliard1@gmail.com> License hash changed due to date update: https://github.com/numpy/numpy/commit/c1ffdbc0c29d48ece717acb5bfbf811c935b41f6 We need to build python-numpy with its vendored version of meson as it currently relies on features that are not yet upstream. To do this we can simply set the PYTHONPATH with the vendored meson path before the normal PYTHON3_PATH so that the vendored version will have precedence. We need to set this for both host and target numpy. We also need to set the architecture specific longdouble_format property as numpy is unable to determine the value for this without being able to execute target binaries. See: https://github.com/numpy/numpy/blob/3e7e5c3cabb8f1a0d940dc6f2058fed4a8c3e284/doc/source/building/cross_compilation.rst Signed-off-by: James Hilliard --- package/python-numpy/python-numpy.hash | 7 ++-- package/python-numpy/python-numpy.mk | 44 ++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index 6629cebbce..34426e7557 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,7 +1,8 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.25.0 -sha256 f1accae9a28dc3cda46a91de86acf69de0d1b5f4edd44a9b0c3ceb8036dfff19 numpy-1.25.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/numpy/json +md5 19550cbe7bedd96a928da9d4ad69509d numpy-1.26.4.tar.gz +sha256 2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010 numpy-1.26.4.tar.gz # License files, locally calculated -sha256 1034d3bd61783f3b5e7ec3e7ca818f4da4135132323a0ef99f4c0edb3c7f6bd2 LICENSE.txt +sha256 263223390c43a9d4a0841e0209265fd927a198f8e89c8eee809b7437d7e5e8c2 LICENSE.txt sha256 c27d0a8026bdb8876562b720ab24d1688e3827a89f6083cd6e7e8caa9584aba3 numpy/core/src/multiarray/dragon4.c sha256 fbc539f47d0cf83bc61378080fb873d5c14630126cacbfe754035c3926daa5ec numpy/core/include/numpy/libdivide/LICENSE.txt sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 200fac20a1..36ae278ff1 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.25.0 +PYTHON_NUMPY_VERSION = 1.26.4 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz -PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) +PYTHON_NUMPY_SITE = https://files.pythonhosted.org/packages/65/6e/09db70a523a96d25e115e71cc56a6f9031e7b8cd166c1ac8438307c14058 PYTHON_NUMPY_LICENSE = BSD-3-Clause, MIT, Zlib PYTHON_NUMPY_LICENSE_FILES = \ LICENSE.txt \ @@ -22,7 +22,10 @@ HOST_PYTHON_NUMPY_DEPENDENCIES = host-python-cython PYTHON_NUMPY_CONF_ENV += \ _PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \ - PYTHONPATH=$(PYTHON3_PATH) + PYTHONPATH="$(@D)/vendored-meson/meson:$(PYTHON3_PATH)" + +PYTHON_NUMPY_NINJA_ENV += \ + PYTHONPATH="$(@D)/vendored-meson/meson:$(PYTHON3_PATH)" ifeq ($(BR2_PACKAGE_LAPACK),y) PYTHON_NUMPY_DEPENDENCIES += lapack @@ -38,6 +41,41 @@ else PYTHON_NUMPY_CONF_OPTS += -Dblas="" endif +ifeq ($(BR2_arcle),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_DOUBLE_LE +else ifeq ($(BR2_arceb),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_DOUBLE_BE +else ifeq ($(BR2_aarch64),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_QUAD_LE +else ifeq ($(BR2_arm),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = INTEL_EXTENDED_12_BYTES_LE +else ifeq ($(BR2_armeb),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = MOTOROLA_EXTENDED_12_BYTES_BE +else ifeq ($(BR2_i386),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = INTEL_EXTENDED_12_BYTES_LE +else ifeq ($(BR2_mips),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_DOUBLE_BE +else ifeq ($(BR2_mipsel),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = INTEL_EXTENDED_12_BYTES_LE +else ifeq ($(BR2_powerpc),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_QUAD_BE +else ifeq ($(BR2_powerpc64),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_QUAD_BE +else ifeq ($(BR2_sh),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_DOUBLE_LE +else ifeq ($(BR2_x86_64),y) +PYTHON_NUMPY_LONGDOUBLE_FORMAT = IEEE_QUAD_LE +endif + +PYTHON_NUMPY_MESON_EXTRA_PROPERTIES = \ + longdouble_format='$(PYTHON_NUMPY_LONGDOUBLE_FORMAT)' + +HOST_PYTHON_NUMPY_CONF_ENV += \ + PYTHONPATH="$(@D)/vendored-meson/meson:$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)" + +HOST_PYTHON_NUMPY_NINJA_ENV += \ + PYTHONPATH="$(@D)/vendored-meson/meson:$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)" + # Rather than add a host-blas or host-lapack dependencies, just use unoptimized, # in-tree code. HOST_PYTHON_NUMPY_CONF_OPTS = -Dblas="" -Dlapack="" -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 00:41:00 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:41:00 -0700 Subject: [Buildroot] [PATCH v3 4/5] package/python-scipy: bump to version 1.12.0 In-Reply-To: <20240212004101.614670-1-james.hilliard1@gmail.com> References: <20240212004101.614670-1-james.hilliard1@gmail.com> Message-ID: <20240212004101.614670-4-james.hilliard1@gmail.com> License hash changed due to date update: https://github.com/scipy/scipy/commit/0ace7295322148d74932bee32b0647e29c38fc8a Signed-off-by: James Hilliard --- package/python-scipy/python-scipy.hash | 6 +++--- package/python-scipy/python-scipy.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash index bee5d698a0..5b8cac8055 100644 --- a/package/python-scipy/python-scipy.hash +++ b/package/python-scipy/python-scipy.hash @@ -1,8 +1,8 @@ # md5, sha256 from https://pypi.org/pypi/scipy/json -md5 0e8eea0f7c4fe7d8102366230c96d66d scipy-1.11.4.tar.gz -sha256 90a2b78e7f5733b9de748f589f09225013685f9b218275257f8a8168ededaeaa scipy-1.11.4.tar.gz +md5 22683fcf9a411f0a5254b7509bea0a6b scipy-1.12.0.tar.gz +sha256 4bf5abab8a36d20193c698b0f1fc282c1d083c94723902c447e5d2f1780936a3 scipy-1.12.0.tar.gz # Locally computed sha256 checksums -sha256 5517022426a56179540ee6eace15fd723ef8fdb83b2900fed2152dd2e2f972a2 LICENSE.txt +sha256 c29fb8e5936f33237a8b15256b4c6e93037f05bbf58c3d7b5755aede4c200173 LICENSE.txt sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/_dsolve/SuperLU/License.txt diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk index 6626826e33..9110a5b847 100644 --- a/package/python-scipy/python-scipy.mk +++ b/package/python-scipy/python-scipy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCIPY_VERSION = 1.11.4 +PYTHON_SCIPY_VERSION = 1.12.0 PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.gz -PYTHON_SCIPY_SITE = https://files.pythonhosted.org/packages/6e/1f/91144ba78dccea567a6466262922786ffc97be1e9b06ed9574ef0edc11e1 +PYTHON_SCIPY_SITE = https://files.pythonhosted.org/packages/30/85/cdbf2c3c460fe5aae812917866392068a88d02f07de0fe31ce738734c477 PYTHON_SCIPY_LICENSE = \ BSD-3-Clause, \ BSD-2-Clause, \ -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 00:41:01 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:41:01 -0700 Subject: [Buildroot] [PATCH v3 5/5] package/python-cython: bump to version 3.0.8 In-Reply-To: <20240212004101.614670-1-james.hilliard1@gmail.com> References: <20240212004101.614670-1-james.hilliard1@gmail.com> Message-ID: <20240212004101.614670-5-james.hilliard1@gmail.com> Tested by ensuring all packages with a host-python-cython dependency build succesfully. Note that due to namespace conflicts supporting both cython 0.29 and cython 3.0 variants at the same time would be difficult as both can not be installed at the same time. License hash changed due to changing links from http to https: https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 Signed-off-by: James Hilliard --- Changes v2 -> v3: - add more details to commit message --- package/python-cython/python-cython.hash | 6 +++--- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 08ad8f6d84..55e4a6f203 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 a4d0f9fbc9c137f1a88937cd40e8c5ee Cython-0.29.36.tar.gz -sha256 41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f Cython-0.29.36.tar.gz +md5 9f7baaa983e1bd06eaeb4fa0adfc77e5 Cython-3.0.8.tar.gz +sha256 8333423d8fd5765e7cceea3a9985dd1e0a5dfeb2734629e1a2ed2d6233d39de6 Cython-3.0.8.tar.gz # Locally computed sha256 checksums -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt +sha256 9568a2b155e66ac3e0ba1fd80b52b827b9460e6cf6f233125e7cbca8e206ddc3 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index 47e105c065..d76bfb766d 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.36 +PYTHON_CYTHON_VERSION = 3.0.8 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 00:46:18 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:46:18 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-cython: bump to version 3.0.8 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <20240209175631.1337370-2-james.hilliard1@gmail.com> Message-ID: On Sun, Feb 11, 2024 at 2:30?PM Yann E. MORIN wrote: > > James, All, > > On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > > License hash changed due to changing links from http to https: > > https://github.com/cython/cython/commit/331d9d824ee5f0c539310332215ebd6ed3257325 > > Thanks for the simple and sufficient explanation. ? > > > Signed-off-by: James Hilliard > > --- > [--SNIP--] > > diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk > > index 47e105c065..d76bfb766d 100644 > > --- a/package/python-cython/python-cython.mk > > +++ b/package/python-cython/python-cython.mk > > @@ -4,9 +4,9 @@ > > # > > ################################################################################ > > > > -PYTHON_CYTHON_VERSION = 0.29.36 > > +PYTHON_CYTHON_VERSION = 3.0.8 > > Given there was an earlier discussion about how the cython bump was > causing some issues with various packages, I would have expected at > least a post-commit summarising what tests were done to ensure the bump > was OK. Yeah, there was some more breakage that needed fixing, I had to bump some packages(numpy/scipy) and tweak a few things to get everything building with cython 3. > > Also, as those same discussions hinted at, cython 0.29 seems to still be > in active development (or at least active maintenance), so the commit > log should have also explained why it was decided to go with a full bump > to 3.0.x rather than intriducing a cython3 package and installing both > in parallel. Or that it was not possiblr to do so becaus they can't be > installed in parallel. I'm not aware of any way to install both at the same time since they share the same namespace essentially. > > Could you respin this series, fixing the check-package issues in patch > 1, and extending the commit log pqtch 2 to better assess the situation, > please? Added more details in v3: https://patchwork.ozlabs.org/project/buildroot/patch/20240212004101.614670-5-james.hilliard1 at gmail.com/ > > Regards, > Yann E. MORIN. > > > PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz > > -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/38/db/df0e99d6c5fe19ee5c981d22aad557be4bdeed3ecfae25d47b84b07f0f98 > > +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/68/09/ffb61f29b8e3d207c444032b21328327d753e274ea081bc74e009827cc81 > > PYTHON_CYTHON_SETUP_TYPE = setuptools > > PYTHON_CYTHON_LICENSE = Apache-2.0 > > PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From james.hilliard1 at gmail.com Mon Feb 12 00:51:30 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 17:51:30 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Message-ID: On Sun, Feb 11, 2024 at 5:13?PM Marcus Hoffmann wrote: > > Hi Yann, James, > > On 11.02.24 22:57, Yann E. MORIN wrote: > > James, All, > > > > On 2024-02-11 14:39 -0700, James Hilliard spake thusly: > >> On Sun, Feb 11, 2024 at 2:24?PM Yann E. MORIN wrote: > >>> On 2024-02-09 10:56 -0700, James Hilliard spake thusly: > >>>> Add patches from pending upstream pull request which add cython3 > >>>> compatibility. > >>> We are a little bit cautious at applying random patches that have not > >>> yet been at least reviewd by upstream. In this case, there has not been > >>> any upstream activity since the last release, and not muc before that > >>> either... > >> Well these patches are being used by gentoo so they are not entirely > >> untested in the real world. > > > > It's not that they are tested or not. It is about whether they'll have a > > chance to be accepted upstream, or whether we'll have to carry and > > maintain them forever in Buildroot. > > > > Maybe it's time that someone pings upstream about that PR? Ok, I pinged one of the maintainers: https://github.com/MagicStack/uvloop/pull/587#issuecomment-1937896616 > > > >>> We have no in-tree user of uvloop, so I wonder whether it makes snse to > >>> keep it, espcially since it mau be blocking the bumps of other packages > >>> (like cython 3.x being required by whats-its-name). > >> That's not entirely true, it's a common optional dependency for packages > >> like python-uvicorn for example. > > > > $ git grep -i -E python.uvloop > > > > would turn only python-uvloop itself, and its runtime test. If it > > is only optional, and prevents us from updating unless we apply > > non-upstreamable patches, then I'd argue we should drop it. > > It's an optional dependency, but a recommended one, see the install > instructions for uvivorn: > https://github.com/encode/uvicorn?tab=readme-ov-file#quickstart > > It's a faster drop-in replacement for the python async event loop, but > only compatible with CPython, not i.e. pypy, so usually projects don't > declare a hard dependency on it. > > I found a hopefully better solution to our cython problems though: see > the python-msgpack thread. > > In short: if we continue to use the sdists from pypi, cython is not a > real build dependency and we can just remove it from pyptoject.toml > instead of trying to provide the correct version that's never going to > be invoked. We can probably just pass --skip-dependency-check as a build arg or something like that I suppose. > > > > > [--SNIP--] > >> I'll fix and resend. > > > > Thanks. > > > > Regards, > > Yann E. MORIN. > > From james.hilliard1 at gmail.com Mon Feb 12 01:35:11 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Sun, 11 Feb 2024 18:35:11 -0700 Subject: [Buildroot] [PATCH 1/1] package/python-cryptography: bump to version 42.0.2 Message-ID: <20240212013511.1146354-1-james.hilliard1@gmail.com> License hash changed due to dropping PSF license: https://github.com/pyca/cryptography/commit/5e6476a4c6e094926a983dcf5cbe9488c30aeb53 We now need to enable chacha support when building with libopenssl. Signed-off-by: James Hilliard --- package/python-cryptography/Config.in | 1 + package/python-cryptography/python-cryptography.hash | 4 ++-- package/python-cryptography/python-cryptography.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/python-cryptography/Config.in b/package/python-cryptography/Config.in index 213aa24fa8..d12f040656 100644 --- a/package/python-cryptography/Config.in +++ b/package/python-cryptography/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY bool "python-cryptography" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_PYTHON_CFFI # runtime help cryptography is a package designed to expose cryptographic diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index e083014750..43c458e274 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,6 +1,6 @@ # Locally calculated after vendoring -sha256 405c9a6271e1a088ea0b432bc2094e2e8baadb2241e192ce9c73a7cc9793b127 cryptography-39.0.2.tar.gz +sha256 44b00c8a646aeb0d2de5a385364115d1bd170880964c4844a7b568523f82bb61 cryptography-42.0.2.tar.gz # Locally computed sha256 checksums -sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE +sha256 3e0c7c091a948b82533ba98fd7cbb40432d6f1a9acbf85f5922d2f99a93ae6bb LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE sha256 602c4c7482de6479dd2e9793cda275e5e63d773dacd1eca689232ab7008fb4fb LICENSE.BSD diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index 07c88ec3da..9e052f6376 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.2 +PYTHON_CRYPTOGRAPHY_VERSION = 42.0.2 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/fa/f3/f4b8c175ea9a1de650b0085858059050b7953a93d66c97ed89b93b232996 +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/0f/6f/40f1b5c6bafc809dd21a9e577458ecc1d8062a7e10148d140f402b535eaa PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools-rust PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -- 2.34.1 From abiliojr at gmail.com Mon Feb 12 02:12:53 2024 From: abiliojr at gmail.com (Abilio Marques) Date: Sun, 11 Feb 2024 18:12:53 -0800 Subject: [Buildroot] [PATCH v2 1/1] package/micropython: add support for manifest.py in the configuration Message-ID: <20240212021255.246556-1-abiliojr@gmail.com> Micropython can embed packages an modules as frozen bytecode. What code gets built this way can be defined by means of a "manifest.py" file. This commit exposes the variable FROZEN_MANIFEST to Buildroot users through a new variable called BR2_PACKAGE_MICROPYTHON_MANIFEST. Please check Micropython's documentation for more information: https://docs.micropython.org/en/latest/reference/manifest.html We only support freezing of modules from micropython-lib. Freezing arbitrary modules would require some handling of absoulte paths, and a guarantee that the files be available before micropython is built, which is considered a bit too complex; an interested party can provide such support in the future. Signed-off-by: Abilio Marques --- package/micropython/Config.in | 17 +++++++++++++++++ package/micropython/micropython.mk | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 26a00baab0..6b99cfd2ff 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -17,6 +17,23 @@ config BR2_PACKAGE_MICROPYTHON_LIB help Core Python libraries ported to MicroPython. +config BR2_PACKAGE_MICROPYTHON_MANIFEST + string "Path to a manifest.py file" + help + MicroPython allows Python code to be ?frozen? as bytecode + into its binary, as an alternative to loading code from + the filesystem. + + A list of "frozen" modules can be provided using a "manifest.py" + file. You can set the path to such file using this variable. + + See MicroPython's documentation for more information on how to + use the file. + + Note: in Buildroot, only modules provided with micropython-lib + can be frozen with a manifest; freezing arbitrary files is + currently not supported. + endif # BR2_PACKAGE_MICROPYTHON comment "micropython needs a toolchain w/ threads, dynamic library" diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 125a0edcfb..5a2c136547 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -43,6 +43,11 @@ else MICROPYTHON_MAKE_OPTS += MICROPY_PY_FFI=0 endif +ifneq ($(BR2_PACKAGE_MICROPYTHON_MANIFEST),"") +MICROPYTHON_MAKE_OPTS += \ + FROZEN_MANIFEST=$(BR2_PACKAGE_MICROPYTHON_MANIFEST) +endif + define MICROPYTHON_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/mpy-cross $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/ports/unix \ -- 2.43.0 From kadambini.nema at gmail.com Mon Feb 12 03:47:57 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sun, 11 Feb 2024 19:47:57 -0800 Subject: [Buildroot] [PATCH 1/1] package/atop: bump to version 2.10.0 - Added a new dependency - libglib2 - Remove 0001-atop.h-include-time.h.patch. It was applied upstream (https://github.com/Atoptool/atop/commit/03c5c4dd29bc7590baccb55a36d61e7f4b39c1fe). Message-ID: <20240212034757.99951-1-kadambini.nema@gmail.com> Signed-off-by: Kadambini Nema --- package/atop/0001-atop.h-include-time.h.patch | 41 ------------------- package/atop/Config.in | 1 + package/atop/atop.hash | 2 +- package/atop/atop.mk | 10 +++-- 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 package/atop/0001-atop.h-include-time.h.patch diff --git a/package/atop/0001-atop.h-include-time.h.patch b/package/atop/0001-atop.h-include-time.h.patch deleted file mode 100644 index 2b8a390e71..0000000000 --- a/package/atop/0001-atop.h-include-time.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 03c5c4dd29bc7590baccb55a36d61e7f4b39c1fe Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 29 Oct 2023 18:56:35 +0100 -Subject: [PATCH] atop.h: include time.h - -Include time.h to avoid the following build failure with musl: - -atop.h:157:1: error: unknown type name 'time_t' - 157 | time_t normalize_epoch(time_t, long); - | ^~~~~~ -atop.h:157:1: note: 'time_t' is defined in header ''; did you forget to '#include '? -atop.h:157:40: error: expected ')' before 'long' - 157 | time_t normalize_epoch(time_t, long); - | ^~~~~ - | ) - -Fixes: - - http://autobuild.buildroot.org/results/e7ec8d16f2299320f374a0198c8e9b18a102b037 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/Atoptool/atop/pull/280 ---- - atop.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/atop.h b/atop.h -index 9274fc5..3d5fea4 100644 ---- a/atop.h -+++ b/atop.h -@@ -24,6 +24,8 @@ - #ifndef __ATOP__ - #define __ATOP__ - -+#include -+ - #define EQ 0 - #define SECONDSINDAY 86400 - #define RAWNAMESZ 256 --- -2.42.0 - diff --git a/package/atop/Config.in b/package/atop/Config.in index b8ee30c306..c00281fc47 100644 --- a/package/atop/Config.in +++ b/package/atop/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_ATOP select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES_WCHAR select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBGLIB2 help Atop is an ASCII full-screen performance monitor for Linux that is capable of reporting the activity of all processes diff --git a/package/atop/atop.hash b/package/atop/atop.hash index 0b7ee061dd..a6539e6211 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 8d82f211b712a227000ef254c0a2b53bcb71235bf40d93316acce80b04bff926 atop-2.9.0.tar.gz +sha256 e7a673cf2c82578e7dd82ecb0dec83fd9ecb30828b2561c28a9fa5aaf75d5f93 atop-2.10.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 27cd537f64..6c40805eb7 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,21 +4,23 @@ # ################################################################################ -ATOP_VERSION = 2.9.0 +ATOP_VERSION = 2.10.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING ATOP_CPE_ID_VALID = YES -ATOP_DEPENDENCIES = ncurses zlib +ATOP_DEPENDENCIES = ncurses zlib libglib2 -ATOP_CFLAGS = $(TARGET_CFLAGS) +ATOP_CFLAGS = $(TARGET_CFLAGS) -O2 -I. -Wall $(shell $(HOST_DIR)/bin/pkg-config --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security + +ATOP_LDFLAGS = $(TARGET_LDFLAGS) $(shell $(HOST_DIR)/bin/pkg-config --libs glib-2.0) ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) ATOP_CFLAGS += -O0 endif define ATOP_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" \ + $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" LDFLAGS="$(ATOP_LDFLAGS)" \ -C $(@D) endef -- 2.25.1 From abiliojr at gmail.com Mon Feb 12 05:16:17 2024 From: abiliojr at gmail.com (Abilio Marques) Date: Sun, 11 Feb 2024 21:16:17 -0800 Subject: [Buildroot] [PATCH] package/micropython: add support for manifest.py in the configuration In-Reply-To: References: <20240204062645.3616072-1-abiliojr@gmail.com> Message-ID: On Sun, Feb 11, 2024 at 9:54?AM Yann E. MORIN wrote: > > Abilio, All, > > [Please, don't top-post, but reply in-line] > > On 2024-02-11 09:15 -0800, Abilio Marques spake thusly: > > One of the uses of manifest.py is to specify which modules of > > micropython-lib should be frozen within the binary. For those modules you > > don't need to include the path. e.g., > > package('os') > > > > That's the application I'm going for. I know it seems limited but it's > > really useful, > > OK, so maybe this can be explained in the help text of the new option, > like: > > Note: in Buildroot, only modules provided with micropython-lib > can be frozen with a manifest; freezing arbitrary files is not > supported. > > along with a little blurb in the commit log, statng something like; > > We only support freezing of modules from micropython-lib. Freezing > arbitrary modules would require some handling of absoulte paths, and > a guarantee that the files be available before micropython is built, > which is considered a bit too complex; an interested party can > provide such support in the future. > > And thus, would it be possible to sanity-check the manifest to ensure > that it indeed only references modules from icropython-lib, so that > people do not get the impression it works when in fact it does not? > > Like, grep that only require(...) are used? Not sure how to do it correctly. The manifest is a regular python file, and I'm not sure how to do it in a way that does the correct the thing. e.g., the user might want to add comment lines or an include to a second part of the manifest. > > (Note: you mentioned package(...) but that is not limited to files from > micropython-lib; require(...) however is.) > > > and probably welcomed by other people using Micropython in > > the next release of Buildroot. > > One question I was wondering about: if a module is frozen in the binary, > then it is no longer needed in the filesystem, right? If so, should we > have a way to remove them? Good idea. Do you mind if I add this in a separate patch? > > > I have ideas on how to solve the path and dependency order problem while > > still using the "official" manifest.py concept. The biggest challenge is > > that currently there are no other 3rd party Micropython modules available > > for Buildroot, so that makes it all very theoretical. All solutions require > > a bigger amount of work than the one needed for this patch. Also, I would > > like to discuss them before actually presenting a patch that allows 3rd > > party modules to be frozen. > > Indeed, without a few actual examples, it's going to be difficult to see > a common pattern and abstract that away. Are there any pulicly > available? > > > I always try to go for an incremental approach, where I get the bigger bang > > for the buck. I believe that allowing people to freeze the official > > Micropython modules is already a big step forward. But at the same time, > > I'm new to the Buildroot project, so please advice on the approach. > > The incremental path is totally OK; I even prefer it. Of course, any > limitation (such as those we are discussing) should be explained in the > commit log. > > Given all the feedback in this thread, can you respin a v2 taking the > comments into account? I did, but just found out that I submitted a patch with a whitespace problem, in this line "can be frozen with a manifest; freezing arbitrary files is" Could you please correct it? > > As for your ideas for lifting those limitations, you can just explain > them in a reply in this thread. Usually, a patchset doing the job is > also a good first step to start the dicsussion. Will try a few things and submit one. > > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From yegorslists at googlemail.com Mon Feb 12 09:00:20 2024 From: yegorslists at googlemail.com (Yegor Yefremov) Date: Mon, 12 Feb 2024 10:00:20 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: <67502ba4-3f73-428e-802e-6ee9cbc1fe6a@mind.be> References: <20240206132051.2838897-1-yegorslists@googlemail.com> <67502ba4-3f73-428e-802e-6ee9cbc1fe6a@mind.be> Message-ID: Hi Yann, On Tue, Feb 6, 2024 at 2:37?PM Arnout Vandecappelle wrote: > > > > On 06/02/2024 14:30, Yann E. MORIN wrote: > > Yegor, All, > > > > On 2024-02-06 14:20 +0100, yegorslists--- via buildroot spake thusly: > >> From: Yegor Yefremov > >> > >> This .gitignore file ignores all files in an output directory and > >> hence doesn't change the git status. > >> > >> Remove "/output" entry from the main .gitignore file as it is already > >> handled by this general approach. > > > > What are you trying to achieve with this that does not work currently? > > I you do `make O=output-test-mypkg` (which I do quite a lot), that output > directory doesn't get ignored by git. We could ignore output* but maybe you name > the output directory o-foo or something. > > Putting a .gitignore in a generated directory is a very elegant solution for > that. It is used by e.g. virtualenv, pytest, and a load of other applications > that generate output in a directory. > > Since the .gitignore is created in the output directory, it is no longer > necessary to put output/ in the .gitignore file. > > > All of the above could be put in the commit message, of course, but for me > Yegor's commit message was sufficiently clear :-) Were we able to convince you? Regards, Yegor > Regards, > Arnout > > > > > > Regards, > > Yann E. MORIN. > > > >> Signed-off-by: Yegor Yefremov > >> --- > >> .gitignore | 1 - > >> Makefile | 3 +++ > >> 2 files changed, 3 insertions(+), 1 deletion(-) > >> > >> diff --git a/.gitignore b/.gitignore > >> index bb02d9f572..14b7ca5040 100644 > >> --- a/.gitignore > >> +++ b/.gitignore > >> @@ -1,4 +1,3 @@ > >> -/output > >> /dl > >> /.auto.deps > >> /.config.cmd > >> diff --git a/Makefile b/Makefile > >> index ac625152c6..86d4444745 100644 > >> --- a/Makefile > >> +++ b/Makefile > >> @@ -63,6 +63,9 @@ ifneq ($(findstring @,$(CANONICAL_O)),) > >> $(error The build directory can not contain a '@') > >> endif > >> > >> +# Create a default .gitignore file that ignores everything > >> +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") > >> + > >> CANONICAL_CURDIR = $(realpath $(CURDIR)) > >> > >> REQ_UMASK = 0022 > >> -- > >> 2.34.1 > >> > >> _______________________________________________ > >> buildroot mailing list > >> buildroot at buildroot.org > >> https://lists.buildroot.org/mailman/listinfo/buildroot > > From buildroot at uclibc.org Mon Feb 12 09:44:14 2024 From: buildroot at uclibc.org (Email Support) Date: 12 Feb 2024 01:44:14 -0800 Subject: [Buildroot] uclibc.org Support Team Message-ID: <20240212014414.BF282FCB54983959@uclibc.org> An HTML attachment was scrubbed... URL: From buildroot at bubu1.eu Mon Feb 12 09:55:14 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 10:55:14 +0100 Subject: [Buildroot] [PATCH] package/python3: security bump to 3.12.2 Message-ID: <20240212095514.11656-1-buildroot@bubu1.eu> Fixes the following security issue: * Skip .pth files with names starting with a dot or hidden file attribute. [1] [1] https://docs.python.org/release/3.12.2/whatsnew/changelog.html#security --- package/python3/python3.hash | 6 +++--- package/python3/python3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 725c854050..611b8d0432 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3121/ -md5 50f827c800483776c8ef86e6a53831fa Python-3.12.1.tar.xz +# From https://www.python.org/downloads/release/python-3122/ +md5 e7c178b97bf8f7ccd677b94d614f7b3c Python-3.12.2.tar.xz # Locally computed -sha256 8dfb8f426fcd226657f9e2bd5f1e96e53264965176fa17d32658e873591aeb21 Python-3.12.1.tar.xz +sha256 be28112dac813d2053545c14bf13a16401a21877f1a69eb6ea5d84c4a0f3d870 Python-3.12.2.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 42765abcf4..e500155c80 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.12 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others -- 2.34.1 From buildroot at bubu1.eu Mon Feb 12 09:58:03 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 10:58:03 +0100 Subject: [Buildroot] [PATCH] package/uvicorn: bump to 0.27.1 Message-ID: <20240212095804.12454-1-buildroot@bubu1.eu> Changelog: https://github.com/encode/uvicorn/blob/master/CHANGELOG.md#0271---2024-02-10 --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index c7feaf3bfe..773995ab9d 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 a98f96c2578d9e6d454e271d0eae3ba3 uvicorn-0.27.0.post1.tar.gz -sha256 54898fcd80c13ff1cd28bf77b04ec9dbd8ff60c5259b499b4b12bb0917f22907 uvicorn-0.27.0.post1.tar.gz +md5 98f40515e34fb49e9d2842b6a147acec uvicorn-0.27.1.tar.gz +sha256 3d9a267296243532db80c83a959a3400502165ade2c1338dea4e67915fd4745a uvicorn-0.27.1.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 502cc06ad8..899b9660f6 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.27.0.post1 +PYTHON_UVICORN_VERSION = 0.27.1 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/38/56/7bc5cf1d693d0c8e5d9dd66c29808691c17260b31346e4ddfbee26ba9bc2 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/09/d8/8aa69c76585035ca81851d99c3b00fd6be050aefd478a5376ff9fc5feb69 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md -- 2.34.1 From buildroot at uclibc.org Mon Feb 12 10:06:06 2024 From: buildroot at uclibc.org (Email Support) Date: 12 Feb 2024 11:06:06 +0100 Subject: [Buildroot] uclibc.org Support Team Message-ID: <20240212110606.784C3BDAC2EA8B6E@uclibc.org> An HTML attachment was scrubbed... URL: From buildroot at bubu1.eu Mon Feb 12 12:47:59 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 13:47:59 +0100 Subject: [Buildroot] [PATCH] support/testing: add python-asn1crypto runtime test Message-ID: <20240212124759.209203-1-buildroot@bubu1.eu> --- .../tests/package/sample_python_asn1crypto.py | 11 +++++++++++ .../testing/tests/package/test_python_asn1crypto.py | 13 +++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 support/testing/tests/package/sample_python_asn1crypto.py create mode 100644 support/testing/tests/package/test_python_asn1crypto.py diff --git a/support/testing/tests/package/sample_python_asn1crypto.py b/support/testing/tests/package/sample_python_asn1crypto.py new file mode 100644 index 0000000000..0b10487572 --- /dev/null +++ b/support/testing/tests/package/sample_python_asn1crypto.py @@ -0,0 +1,11 @@ +from asn1crypto import pem, x509 + + +with open('/etc/ssl/certs/ISRG_Root_X2.pem', 'rb') as f: + der_bytes = f.read() + if pem.detect(der_bytes): + type_name, headers, der_bytes = pem.unarmor(der_bytes) + +cert = x509.Certificate.load(der_bytes) + +assert cert.subject.native["common_name"] == "ISRG Root X2" diff --git a/support/testing/tests/package/test_python_asn1crypto.py b/support/testing/tests/package/test_python_asn1crypto.py new file mode 100644 index 0000000000..97df3d3ac8 --- /dev/null +++ b/support/testing/tests/package/test_python_asn1crypto.py @@ -0,0 +1,13 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Asn1Crypto(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_ASN1CRYPTO=y + """ + sample_scripts = ["tests/package/sample_python_asn1crypto.py"] + timeout = 40 -- 2.34.1 From buildroot at bubu1.eu Mon Feb 12 12:56:49 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 12 Feb 2024 13:56:49 +0100 Subject: [Buildroot] [PATCH] support/testing: add python-asn1crypto runtime test Message-ID: <20240212125649.210272-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- .../tests/package/sample_python_asn1crypto.py | 11 +++++++++++ .../testing/tests/package/test_python_asn1crypto.py | 13 +++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 support/testing/tests/package/sample_python_asn1crypto.py create mode 100644 support/testing/tests/package/test_python_asn1crypto.py diff --git a/support/testing/tests/package/sample_python_asn1crypto.py b/support/testing/tests/package/sample_python_asn1crypto.py new file mode 100644 index 0000000000..0b10487572 --- /dev/null +++ b/support/testing/tests/package/sample_python_asn1crypto.py @@ -0,0 +1,11 @@ +from asn1crypto import pem, x509 + + +with open('/etc/ssl/certs/ISRG_Root_X2.pem', 'rb') as f: + der_bytes = f.read() + if pem.detect(der_bytes): + type_name, headers, der_bytes = pem.unarmor(der_bytes) + +cert = x509.Certificate.load(der_bytes) + +assert cert.subject.native["common_name"] == "ISRG Root X2" diff --git a/support/testing/tests/package/test_python_asn1crypto.py b/support/testing/tests/package/test_python_asn1crypto.py new file mode 100644 index 0000000000..97df3d3ac8 --- /dev/null +++ b/support/testing/tests/package/test_python_asn1crypto.py @@ -0,0 +1,13 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Asn1Crypto(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_ASN1CRYPTO=y + """ + sample_scripts = ["tests/package/sample_python_asn1crypto.py"] + timeout = 40 -- 2.34.1 From antoine.coutant at smile.fr Mon Feb 12 13:44:25 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 12 Feb 2024 14:44:25 +0100 Subject: [Buildroot] [PATCH v4 4/7] package/opencl-headers: new package In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-5-antoine.coutant@smile.fr> Message-ID: Yann, All, On 07/02/2024 16:58, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >> From: Sebastian Weyer >> >> These headers provide the C language API bindings. It is a complement to >> the C++ bindings already available in opencl-clhpp. This package is >> required to build opencl-icd-loader: >> >> https://github.com/KhronosGroup/OpenCL-ICD-Loader#dependencies >> >> Signed-off-by: Sebastian Weyer >> Signed-off-by: Antoine Coutant >> --- > [--SNIP--] >> diff --git a/package/opencl-headers/Config.in b/package/opencl-headers/Config.in >> new file mode 100644 >> index 0000000000..092d8a2a4d >> --- /dev/null >> +++ b/package/opencl-headers/Config.in >> @@ -0,0 +1,7 @@ >> +config BR2_PACKAGE_OPENCL_HEADERS >> + bool "opencl-headers" >> + depends on BR2_PACKAGE_HAS_LIBOPENCL > BR2_PACKAGE_HAS_LIBOPENCL can be set by mesa3d when BR2_PACKAGE_MESA3D_OPENCL > is enabled. In this case, will mesa3d install its own headers? If so, > that will generate a conflict. BR2_PACKAGE_HAS_LIBOPENCL doesn't guarantee that CL headers will be installed. Mesa3d install headers if Clover is enabled and opencl-icd is disabled [1]. So you are right, it will generate conflict in case OpenCL-Headers and Clover are built without icd mode. > Furthermore, this will also conflict with mesa3d-headers, and it also > installs CL headers. Yes, this will generate the same conflict here... > > So, why do we need opencl-headers and can't rely on the existing > mesa3d-headers package? The problem is that the headers installed by mesa differ from those in the OpenCL-Headers package. $ diff -q OpenCL-Headers/CL/cl_icd.h mesa/include/CL/cl_icd.h Files OpenCL-Headers/CL/cl_icd.h and mesa/include/CL/cl_icd.h differ This diff was performed using OpenCL-Headers v2023.12.14 and mesa-23.3.4. Moreover, cl_layer.h, cl_half.h and cl_function_types.h files are missing from mesa headers. These differences causes errors when building opencl-icd-loader: ... ./build/opencl-icd-loader-2023.12.14/loader/icd.c:23:10: fatal error: CL/cl_layer.h: No such file or directory ???23 | #include | ^~~~~~~~~~~~~~~ compilation terminated. ./build/opencl-icd-loader-2023.12.14/loader/icd_dispatch.c:26:8: error: unknown type name ?clGetICDLoaderInfoOCLICD_t? ???26 | static clGetICDLoaderInfoOCLICD_t clGetICDLoaderInfoOCLICD; | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ... This is why we cannot rely on mesa3d headers and why OpenCL-Headers package is required. > Regards, > Yann E. MORIN. I will add guards to prevent conflicts in the v5. And add some lines in the commit log to explain why mesa3d headers can't be used to build OpenCL-ICD-Loader. Thanks for your feedback ! [1]: https://gitlab.freedesktop.org/mesa/mesa/-/blob/23.3/include/meson.build?ref_type=heads#L135 Regards, Antoine Coutant > >> + help >> + C language headers for the OpenCL API >> + >> + https://github.com/KhronosGroup/OpenCL-Headers >> diff --git a/package/opencl-headers/opencl-headers.hash b/package/opencl-headers/opencl-headers.hash >> new file mode 100644 >> index 0000000000..802ed05450 >> --- /dev/null >> +++ b/package/opencl-headers/opencl-headers.hash >> @@ -0,0 +1,3 @@ >> +#Locally generated >> +sha256 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d OpenCL-Headers-2023.12.14.tar.gz >> +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE >> diff --git a/package/opencl-headers/opencl-headers.mk b/package/opencl-headers/opencl-headers.mk >> new file mode 100644 >> index 0000000000..7aa0e0d168 >> --- /dev/null >> +++ b/package/opencl-headers/opencl-headers.mk >> @@ -0,0 +1,22 @@ >> +################################################################################ >> +# >> +# opencl-headers >> +# >> +################################################################################ >> + >> +OPENCL_HEADERS_VERSION = 2023.12.14 >> +OPENCL_HEADERS_SOURCE = OpenCL-Headers-$(OPENCL_HEADERS_VERSION).tar.gz >> +OPENCL_HEADERS_SITE = $(call github,KhronosGroup,OpenCL-Headers,v$(OPENCL_HEADERS_VERSION)) >> +OPENCL_HEADERS_LICENSE = Apache-2.0 >> +OPENCL_HEADERS_LICENSE_FILES = LICENSE >> +OPENCL_HEADERS_INSTALL_STAGING = YES >> + >> +OPENCL_HEADERS_INSTALL_TARGET = NO >> + >> +define OPENCL_HEADERS_INSTALL_STAGING_CMDS >> + mkdir -p $(STAGING_DIR)/usr/include/CL >> + $(INSTALL) -D -m 0644 $(@D)/CL/* \ >> + $(STAGING_DIR)/usr/include/CL >> +endef >> + >> +$(eval $(generic-package)) >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From vfazio at xes-inc.com Mon Feb 12 13:45:36 2024 From: vfazio at xes-inc.com (Vincent Fazio) Date: Mon, 12 Feb 2024 13:45:36 +0000 Subject: [Buildroot] [External] - Re: [git commit] package/python3: bump version to 3.12.1 In-Reply-To: <20240212005226.GB2106578@igalia.com> References: <20240206222231.8950D87481@busybox.osuosl.org> <20240212005226.GB2106578@igalia.com> Message-ID: All > -----Original Message----- > From: buildroot On Behalf Of Adrian > Perez de Castro > Sent: Sunday, February 11, 2024 4:52 PM > To: James Hilliard > Cc: Bernd Kuhls ; buildroot at uclibc.org > Subject: [External] - Re: [Buildroot] [git commit] package/python3: bump > version to 3.12.1 > > Hi, > > On Sun, 11 Feb 2024 14:20:31 -0700 James Hilliard > wrote: > > On Fri, Feb 9, 2024 at 9:11?AM Bernd Kuhls wrote: > > > > > > Am Thu, 8 Feb 2024 21:14:52 -0500 schrieb James Knight: > > > > > > > import math > > > > ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' > > > > not found (required by > > > > /builds/buildroot/output/build/python3-3.12.1/build/lib.linux- > > > x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) > > > > > > Hi James, > > > > > > same here on Debian 12.4/bookworm, try this patch: > > > https://github.com/bkuhls/buildroot/commit/ > > > dca8b5bee7742ffedf81a027affadd4b7e18fc3f This certainly avoids the issue by not running the problematic check. I am a little concerned about the root cause. I haven't had a chance to test 3.11, but from the debugging I did on Friday, I know that when the host python is executed to check the built modules for the foreign python, because PYTHONPATH includes the path to the foreign "builtin" libraries and because they are the same architecture, those libraries get used instead of the ones from the host's build. So the host python attempts to load and execute libraries that may have been built for a different libc. I found simply dropping the foreign python's path from PYTHONPATH caused the script to execute fine, but I don't know the full ramifications for dropping that path as part of PYTHON_FOR_BUILD which is used in the body of this problematic make target and a few others. > > > > Yeah, this fixes the issue for me as well. > > Same here on Arch, I needed to apply the commit to get host-python3 built. > > Cheers, > ?Adri?n > CAUTION: This email originated from outside of the organization. Do not click > links or open attachments unless you recognize the sender and know the > content is safe. From antoine.coutant at smile.fr Mon Feb 12 14:19:20 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 12 Feb 2024 15:19:20 +0100 Subject: [Buildroot] [PATCH v4 5/7] package/opencl-icd-loader: new package In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-6-antoine.coutant@smile.fr> Message-ID: <8e198a6f-ccb7-4438-9a0d-e983a6fcc29a@smile.fr> Yann, All, On 07/02/2024 17:01, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >> From: Sebastian Weyer >> >> With this package it is possible to have multiple implementations of >> OpenCL at the same time. This package provides a libOpenCL.so file that >> captures the OpenCL API calls and forwards them to the correct >> implementation of OpenCL. OpenCL implementations can be manually >> registered by creating a file containing its full file path in >> /etc/OpenCL/vendors/.icd[1] >> >> This package is required by certain OpenCL implementations, for example >> Mesa3D's Clover implementation if it is not built in standalone mode. >> >> [1] https://github.com/KhronosGroup/OpenCL-ICD-Loader#registering-icds >> >> Signed-off-by: Sebastian Weyer >> Signed-off-by: Antoine Coutant >> --- > [--SNIP--] >> diff --git a/package/opencl-icd-loader/Config.in b/package/opencl-icd-loader/Config.in >> new file mode 100644 >> index 0000000000..405dc5401a >> --- /dev/null >> +++ b/package/opencl-icd-loader/Config.in >> @@ -0,0 +1,12 @@ >> +config BR2_PACKAGE_OPENCL_ICD_LOADER >> + bool "OpenCL-ICD-Loader" >> + depends on BR2_INSTALL_LIBSTDCPP >> + depends on BR2_PACKAGE_HAS_LIBOPENCL >> + select BR2_PACKAGE_OPENCL_HEADERS > Following on the review of the previous patch: maybe that could rely on > mesa3d-headers, and if so, we'ds not need to introduce a new > opencl-headers package. As I answered to the previous patch review, the headers installed by mesa differ from those installed by OpenCL-Headers. Indeed, mesa headers are fetched from OpenCL-Headers by [1] but nothing guarantees that their version will match OpenCL-ICD-Loader version. Therefore, the OpenCL-ICD-Loader build fails with mesa headers. That's why we need OpenCL-Headers here. I'll explain it in the v5 commit message. [1}: https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/bin/khronos-update.py Regards, Antoine Coutant > > Regards, > Yann E. MORIN. > >> + help >> + OpenCL defines an Installable Client Driver (ICD) mechanism to >> + allow developers to build applications against an Installable >> + Client Driver loader (ICD loader) rather than linking their >> + applications against a specific OpenCL implementation. >> + >> + https://github.com/KhronosGroup/OpenCL-ICD-Loader >> diff --git a/package/opencl-icd-loader/opencl-icd-loader.hash b/package/opencl-icd-loader/opencl-icd-loader.hash >> new file mode 100644 >> index 0000000000..1c894f1293 >> --- /dev/null >> +++ b/package/opencl-icd-loader/opencl-icd-loader.hash >> @@ -0,0 +1,3 @@ >> +# locally generated >> +sha256 af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917 OpenCL-ICD-Loader-2023.12.14.tar.gz >> +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE >> diff --git a/package/opencl-icd-loader/opencl-icd-loader.mk b/package/opencl-icd-loader/opencl-icd-loader.mk >> new file mode 100644 >> index 0000000000..04f6fb4b85 >> --- /dev/null >> +++ b/package/opencl-icd-loader/opencl-icd-loader.mk >> @@ -0,0 +1,19 @@ >> +################################################################################ >> +# >> +# opencl-icd-loader >> +# >> +################################################################################ >> + >> +OPENCL_ICD_LOADER_VERSION = 2023.12.14 >> +OPENCL_ICD_LOADER_SOURCE = OpenCL-ICD-Loader-$(OPENCL_ICD_LOADER_VERSION).tar.gz >> +OPENCL_ICD_LOADER_SITE = $(call github,KhronosGroup,OpenCL-ICD-Loader,v$(OPENCL_ICD_LOADER_VERSION)) >> +OPENCL_ICD_LOADER_LICENSE = Apache-2.0 >> +OPENCL_ICD_LOADER_LICENSE_FILES = LICENSE >> +OPENCL_ICD_LOADER_INSTALL_STAGING = YES >> + >> +OPENCL_ICD_LOADER_DEPENDENCIES = opencl-headers >> + >> +OPENCL_ICD_LOADER_CONF_OPTS += -DOPENCL_ICD_LOADER_HEADERS_DIR=$(STAGING_DIR)/usr/include >> + >> +$(eval $(cmake-package)) >> +$(eval $(host-cmake-package)) >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From aperez at igalia.com Mon Feb 12 14:32:19 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 12 Feb 2024 16:32:19 +0200 Subject: [Buildroot] [PATCH 2/2] package/wpewebkit: update ARM NEON patch for 2.42.x In-Reply-To: <20240212143222.1555220-1-aperez@igalia.com> References: <20240212143222.1555220-1-aperez@igalia.com> Message-ID: <20240212143222.1555220-3-aperez@igalia.com> Update patch to compile correctly with newer versions of GCC, which has gotten stricter about the placement of the alignas() attribute. Signed-off-by: Adrian Perez de Castro --- ...cpp-fails-to-build-NEON-fast-path-se.patch | 105 ++++++++++-------- 1 file changed, 57 insertions(+), 48 deletions(-) diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch index ea1676abb6..17d4957657 100644 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -1,4 +1,4 @@ -From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 +From 5ba2d275457c4fdf1efdcca8351792400bda5679 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -33,38 +33,47 @@ left for a follow-up fix. * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: Signed-off-by: Adrian Perez de Castro -[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] +Upstream: https://bugs.webkit.org/show_bug.cgi?id=241182 --- Source/WebCore/Sources.txt | 1 + - .../cpu/arm/filters/FELightingNEON.cpp | 4 +- + .../cpu/arm/filters/FELightingNEON.cpp | 6 +-- .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 8 files changed, 58 insertions(+), 36 deletions(-) + 8 files changed, 59 insertions(+), 37 deletions(-) diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt -index 8ce3510fe1a8..efd56bcb8746 100644 +index 9ca28a7b2bc0..ed2c7f9f41ee 100644 --- a/Source/WebCore/Sources.txt +++ b/Source/WebCore/Sources.txt -@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp - platform/graphics/WOFFFileFormat.cpp - platform/graphics/WidthIterator.cpp +@@ -2303,6 +2303,7 @@ platform/graphics/controls/MeterPart.cpp + platform/graphics/controls/ProgressBarPart.cpp + platform/graphics/controls/SliderTrackPart.cpp platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp +platform/graphics/cpu/arm/filters/FELightingNEON.cpp platform/graphics/displaylists/DisplayList.cpp platform/graphics/displaylists/DisplayListDrawingContext.cpp platform/graphics/displaylists/DisplayListItems.cpp diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp -index f6ff8c20a5a8..42a97ffc5372 100644 +index f6ff8c20a5a8..dced3d55eb4e 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +@@ -35,7 +35,7 @@ namespace WebCore { + // ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D + + +-static alignas(16) short s_FELightingConstantsForNeon[] = { ++alignas(16) static short s_FELightingConstantsForNeon[] = { + // Alpha coefficients. + -2, 1, 0, -1, 2, 1, 0, -1, + 0, -1, -2, -1, 0, 1, 2, 1, @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() return s_FELightingConstantsForNeon; } - + -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) { @@ -73,26 +82,26 @@ index f6ff8c20a5a8..42a97ffc5372 100644 @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL "b .lightStrengthCalculated" NL ); // NOLINT - + -int FELighting::getPowerCoefficients(float exponent) +int FELightingSoftwareApplier::getPowerCoefficients(float exponent) { // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..c6d17f573eca 100644 +index b17c603d40d3..fd23e31cce29 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + -#ifndef FELightingNEON_h -#define FELightingNEON_h +#pragma once - + #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - + -#include "FELighting.h" +#include "FELightingSoftwareApplier.h" +#include "ImageBuffer.h" @@ -100,19 +109,19 @@ index b17c603d40d3..c6d17f573eca 100644 #include "SpotLightSource.h" +#include #include - + namespace WebCore { @@ -93,14 +94,14 @@ extern "C" { void neonDrawLighting(FELightingPaintingDataForNeon*); } - + -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { - data.pixels->data(), -+ WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; ++ alignas(16) WebCore::FELightingFloatArgumentsForNeon floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { + data.pixels->bytes(), 1, @@ -126,15 +135,15 @@ index b17c603d40d3..c6d17f573eca 100644 @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set light source arguments. floatArguments.constOne = 1; - + - auto color = m_lightingColor.toColorTypeLossy>().resolved(); + auto color = data.lightingColor.toColorTypeLossy>().resolved(); - + floatArguments.colorRed = color.red; floatArguments.colorGreen = color.green; floatArguments.colorBlue = color.blue; floatArguments.padding4 = 0; - + - if (m_lightSource->type() == LS_POINT) { + if (data.lightSource->type() == LS_POINT) { neonData.flags |= FLAG_POINT_LIGHT; @@ -181,7 +190,7 @@ index b17c603d40d3..c6d17f573eca 100644 } if (floatArguments.diffuseConstant == 1) neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; - + - int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; + static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs + int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; @@ -189,7 +198,7 @@ index b17c603d40d3..c6d17f573eca 100644 // Initialize parallel jobs - ParallelJobs parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); + ParallelJobs parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); - + // Fill the parameter array int job = parallelJobs.numberOfJobs(); if (job > 1) { @@ -213,42 +222,42 @@ index b17c603d40d3..c6d17f573eca 100644 return; @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS } // namespace WebCore - + #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) - -#endif // FELightingNEON_h diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -index 0660143fc1cf..2b1e86d99fa4 100644 +index 70f583b36e2c..7d5d27e5ccf8 100644 --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -@@ -25,6 +25,10 @@ - #include "LightSource.h" +@@ -26,6 +26,10 @@ + #include #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class DistantLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h -index 0c073bc13f8c..e0db00545c17 100644 +index 179edf6dba24..694d712d56fd 100644 --- a/Source/WebCore/platform/graphics/filters/FELighting.h +++ b/Source/WebCore/platform/graphics/filters/FELighting.h @@ -35,8 +35,6 @@ - + namespace WebCore { - + -struct FELightingPaintingDataForNeon; - class FELighting : public FilterEffect { public: - const Color& lightingColor() const { return m_lightingColor; } -@@ -67,11 +65,6 @@ protected: - + bool operator==(const FELighting&) const; +@@ -68,11 +66,6 @@ protected: + std::unique_ptr createSoftwareApplier() const override; - + -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - static int getPowerCoefficients(float exponent); - inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); @@ -258,34 +267,34 @@ index 0c073bc13f8c..e0db00545c17 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 126b3b2350f6..d906db21aa9c 100644 +index a8cfdab895a9..34f867bba237 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 641b205f986d..64380d9b6eb8 100644 +index 6404467a5b6f..5cac38f22362 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h index c974d92115ff..e2896660cfbd 100644 @@ -293,14 +302,14 @@ index c974d92115ff..e2896660cfbd 100644 +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ namespace WebCore { - + class FELighting; +struct FELightingPaintingDataForNeon; - + class FELightingSoftwareApplier final : public FilterEffectConcreteApplier { WTF_MAKE_FAST_ALLOCATED; @@ -132,8 +133,23 @@ private: - + static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); static void applyPlatformGenericWorker(ApplyParameters*); + @@ -319,10 +328,10 @@ index c974d92115ff..e2896660cfbd 100644 + static void applyPlatform(const LightingData&); }; - + } // namespace WebCore + +#include "FELightingNEON.h" --- -2.37.3 +-- +2.43.1 -- 2.43.1 From aperez at igalia.com Mon Feb 12 14:32:17 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 12 Feb 2024 16:32:17 +0200 Subject: [Buildroot] [PATCH 0/2] Update wpewebkit to 2.42.5 and update patch Message-ID: <20240212143222.1555220-1-aperez@igalia.com> Hello, These two patches don't neccessarily need to be applied together, but it wouldn't hurt to do so. Cheers, Adrian Perez de Castro (2): package/wpewebkit: security bump to version 2.42.5 package/wpewebkit: update ARM NEON patch for 2.42.x ...cpp-fails-to-build-NEON-fast-path-se.patch | 105 ++++++++++-------- ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++ package/wpewebkit/wpewebkit.hash | 6 +- package/wpewebkit/wpewebkit.mk | 3 +- 4 files changed, 101 insertions(+), 52 deletions(-) create mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch -- 2.43.1 From aperez at igalia.com Mon Feb 12 14:32:18 2024 From: aperez at igalia.com (Adrian Perez de Castro) Date: Mon, 12 Feb 2024 16:32:18 +0200 Subject: [Buildroot] [PATCH 1/2] package/wpewebkit: security bump to version 2.42.5 In-Reply-To: <20240212143222.1555220-1-aperez@igalia.com> References: <20240212143222.1555220-1-aperez@igalia.com> Message-ID: <20240212143222.1555220-2-aperez@igalia.com> Fixes the following security issues: https://wpewebkit.org/security/WSA-2024-0001.html - CVE-2024-23222: Processing maliciously crafted web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been exploited. Description: A type confusion issue was addressed with improved checks. - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint the user. Description: An access issue was addressed with improved access restrictions. - CVE-2024-23213: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. Add an upstream post-2.42.5 patch to fix an issue with an invalid backport causing a build issue. Signed-off-by: Adrian Perez de Castro --- ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++ package/wpewebkit/wpewebkit.hash | 6 +-- package/wpewebkit/wpewebkit.mk | 3 +- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 0000000000..a15d9e647f --- /dev/null +++ b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Adrian Perez de Castro +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.43.1 + diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 322e494c36..71e41bb1dd 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,6 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums -sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz -sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums +sha1 50a18f43452520e9f34f84c04bc0166af655ffff wpewebkit-2.42.5.tar.xz +sha256 4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532 wpewebkit-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index e54ec2952f..60a45b13b1 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,8 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.42.4 +# The middle number is even for stable releases, odd for development ones. +WPEWEBKIT_VERSION = 2.42.5 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES -- 2.43.1 From antoine.coutant at smile.fr Mon Feb 12 14:54:52 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Mon, 12 Feb 2024 15:54:52 +0100 Subject: [Buildroot] [PATCH v4 6/7] package/llvm-project: add opencl-c-base.h on target In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-7-antoine.coutant@smile.fr> Message-ID: <7e506d41-f4ff-4c9f-b407-2d39eccc559c@smile.fr> Yann, All, On 07/02/2024 20:07, Yann E. MORIN wrote: > Antoine, All, > > On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >> rusticl depends on the mesa clc_compile_to_llvm_module function. >> This function requires opencl-c-base.h when LLVM version >= 15. >> >> The header is deleted automatically by CLANG_FILES_TO_REMOVE >> post install target hook in llvm-project/clang package. >> When rusticl is enabled, after the whole clang directory has >> been removed, the header is copied back to >> /usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/ >> >> By default, the mesa3d variable used to retrieve the header >> is set to the staging directory on the host machine. A merge >> request on mesa's gitlab solved this problem. See: >> >> https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25568 >> >> The patches have been backported to mesa 23.3.4. >> >> Signed-off-by: Antoine Coutant >> --- >> Changes v3 -> v4: >> - Add patches merged by mesa upstream. > Adding those patches has nothing to do in this commit, but should in the > next one, that adds rusticl support in mesa3d, right? I added them here because they are necessary when using the missing header. However, you are right, their place is not in this patch as they are not useful to add the missing header on the target. I will move them into the patch that adds rusticl support. Thanks, for this feedback ! Regards, Antoine Coutant > > Regards, > Yann E. MORIN. > >> --- >> Running an app that uses rusticl leads to an error. >> Example: >> >> RUSTICL_ENABLE=panfrost clpeak >> >> Platform: rusticl >> Device: Mali-G52 (Panfrost) >> Driver version : 23.3.4 (Linux ARM64) >> Compute units : 2 >> Clock frequency : 800 MHz >> Build Log: :1:10: fatal error: 'opencl-c-base.h' file not found >> Error executing LLVM compilation action. >> >> Signed-off-by: Antoine Coutant >> --- >> package/llvm-project/clang/clang.mk | 9 ++ >> ...ncl-external-clang-headers-option-an.patch | 72 ++++++++++++++++ >> ...or-every-user-when-using-shared-LLVM.patch | 40 +++++++++ >> ...lc-retrieve-libclang-path-at-runtime.patch | 86 +++++++++++++++++++ >> 4 files changed, 207 insertions(+) >> create mode 100644 package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch >> create mode 100644 package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch >> create mode 100644 package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch >> >> diff --git a/package/llvm-project/clang/clang.mk b/package/llvm-project/clang/clang.mk >> index 0bafd6461b..09aac7f0ec 100644 >> --- a/package/llvm-project/clang/clang.mk >> +++ b/package/llvm-project/clang/clang.mk >> @@ -90,6 +90,15 @@ define HOST_CLANG_INSTALL_CLANG_TBLGEN >> endef >> HOST_CLANG_POST_INSTALL_HOOKS = HOST_CLANG_INSTALL_CLANG_TBLGEN >> >> +# Rusticl needs opencl-c-base.h to be present on the target. >> +define CLANG_OPENCL_C_BASE_HEADER_TO_TARGET >> + mkdir -p $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include >> + $(INSTALL) -D -m 0644 $(@D)/lib/Headers/opencl-c-base.h $(TARGET_DIR)/usr/lib/clang/$(LLVM_PROJECT_VERSION)/include/opencl-c-base.h >> +endef >> +ifeq ($(BR2_PACKAGE_MESA3D_RUSTICL),y) >> +CLANG_POST_INSTALL_TARGET_HOOKS += CLANG_OPENCL_C_BASE_HEADER_TO_TARGET >> +endif >> + >> # This option must be enabled to link libclang dynamically against libLLVM.so >> HOST_CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON >> CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON >> diff --git a/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch >> new file mode 100644 >> index 0000000000..ebe3542627 >> --- /dev/null >> +++ b/package/mesa3d/0006-meson-remove-opencl-external-clang-headers-option-an.patch >> @@ -0,0 +1,72 @@ >> +From b7f2ada31d85dfd2e9906a7343d14a3b0b85cf14 Mon Sep 17 00:00:00 2001 >> +From: Karol Herbst >> +Date: Tue, 2 Jan 2024 22:58:39 +0100 >> +Subject: [PATCH 1/3] meson: remove opencl-external-clang-headers option and >> + rely on shared-llvm >> + >> +Setting opencl-external-clang-headers to enabled while using shared LLVM >> +was broken and this option was mostly used for windows to force static >> +inclusion of opencl base headers. >> + >> +Simply relying on the shared-llvm option here is enough to get what we >> +want. >> + >> +Signed-off-by: Karol Herbst >> +Reviewed-by: Jesse Natalie >> +Part-of: >> +[antoine.coutant at smile.fr: backported to mesa-23.3.4] >> +Signed-off-by: Antoine Coutant >> +--- >> + .gitlab-ci/windows/mesa_build.ps1 | 1 - >> + meson_options.txt | 7 ------- >> + src/compiler/clc/meson.build | 4 +--- >> + 3 files changed, 1 insertion(+), 11 deletions(-) >> + >> +diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 >> +index a4f87c4eadb..e79eb6b6587 100644 >> +--- a/.gitlab-ci/windows/mesa_build.ps1 >> ++++ b/.gitlab-ci/windows/mesa_build.ps1 >> +@@ -59,7 +59,6 @@ meson setup ` >> + -Dopencl-spirv=true ` >> + -Dmicrosoft-clc=enabled ` >> + -Dstatic-libclc=all ` >> +--Dopencl-external-clang-headers=disabled ` >> + -Dspirv-to-dxil=true ` >> + -Dbuild-tests=true ` >> + -Dwerror=true ` >> +diff --git a/meson_options.txt b/meson_options.txt >> +index e885ba61a8a..537ba797407 100644 >> +--- a/meson_options.txt >> ++++ b/meson_options.txt >> +@@ -191,13 +191,6 @@ option( >> + description : 'Link libclc SPIR-V statically.', >> + ) >> + >> +-option( >> +- 'opencl-external-clang-headers', >> +- type : 'feature', >> +- description : 'Use system Clang headers at runtime for OpenCL kernel ' + >> +- 'compilation.', >> +-) >> +- >> + option( >> + 'd3d-drivers-path', >> + type : 'string', >> +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build >> +index 3e4f1a7f441..81345225768 100644 >> +--- a/src/compiler/clc/meson.build >> ++++ b/src/compiler/clc/meson.build >> +@@ -30,9 +30,7 @@ _libmesaclc_c_args = [] >> + _libmesaclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)] >> + _libmesaclc_sources = [] >> + >> +-if get_option('opencl-external-clang-headers') \ >> +- .disable_auto_if(host_machine.system() == 'windows') \ >> +- .disabled() >> ++if not _shared_llvm >> + # LLVM 16 moved clang header path from using full version to only major version >> + if dep_llvm.version().version_compare('< 16') >> + # Prior to LLVM 16, this path used a full version >> +-- >> +2.25.1 >> + >> diff --git a/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch >> new file mode 100644 >> index 0000000000..3560f6805f >> --- /dev/null >> +++ b/package/mesa3d/0007-clc-force-fPIC-for-every-user-when-using-shared-LLVM.patch >> @@ -0,0 +1,40 @@ >> +From 56c85c4c7a757a9ba3d8ac08e6c4c4c7f19e6cab Mon Sep 17 00:00:00 2001 >> +From: Karol Herbst >> +Date: Thu, 11 Jan 2024 14:55:46 +0100 >> +Subject: [PATCH 2/3] clc: force fPIC for every user when using shared LLVM >> + >> +As we want to start using `dladdr`, this is needed to prevent `dladdr` >> +returning information of the wrong file. >> + >> +Fixes tag as it's required by the actual fix. >> + >> +Signed-off-by: Karol Herbst >> +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") >> +Part-of: >> +[antoine.coutant at smile.fr: backported to mesa-23.3.4] >> +Signed-off-by: Antoine Coutant >> +--- >> + src/compiler/clc/meson.build | 6 ++++++ >> + 1 file changed, 6 insertions(+) >> + >> +diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build >> +index 81345225768..442a583065b 100644 >> +--- a/src/compiler/clc/meson.build >> ++++ b/src/compiler/clc/meson.build >> +@@ -123,7 +123,13 @@ _libmesaclc = static_library( >> + idep_mesautil, dep_spirv_tools] >> + ) >> + >> ++_idep_mesaclc_link_args = [] >> ++if _shared_llvm >> ++ _idep_mesaclc_link_args += cc.get_supported_link_arguments('-fPIC') >> ++endif >> ++ >> + idep_mesaclc = declare_dependency( >> + link_with : _libmesaclc, >> + include_directories : include_directories('.'), >> ++ link_args : _idep_mesaclc_link_args, >> + ) >> +-- >> +2.25.1 >> + >> diff --git a/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch >> new file mode 100644 >> index 0000000000..c19ba7d2b7 >> --- /dev/null >> +++ b/package/mesa3d/0008-clc-retrieve-libclang-path-at-runtime.patch >> @@ -0,0 +1,86 @@ >> +From fa2c045e04370beb454951c32bccc087638e04c7 Mon Sep 17 00:00:00 2001 >> +From: Antoine Coutant >> +Date: Thu, 30 Nov 2023 11:10:20 +0100 >> +Subject: [PATCH 3/3] clc: retrieve libclang path at runtime. >> + >> +LLVM_LIB_DIR is a variable used for runtime compilations. >> +When cross compiling, LLVM_LIB_DIR must be set to the >> +libclang path on the target. So, this path should not >> +be retrieved during compilation but at runtime. >> + >> +dladdr uses an address to search for a loaded library. >> +If a library is found, it returns information about it. >> +The path to the libclang library can therefore be >> +retrieved using one of its functions. This is useful >> +because we don't know the name of the libclang library >> +(libclang.so.X or libclang-cpp.so.X) >> + >> +v2 (Karol): use clang::CompilerInvocation::CreateFromArgs for dladdr >> +v3 (Karol): follow symlinks to fix errors on debian >> + >> +Fixes: e22491c8326 ("clc: fetch clang resource dir at runtime") >> +Signed-off-by: Antoine Coutant >> +Reviewed-by: Karol Herbst >> +Reviewed-by (v1): Jesse Natalie >> +[antoine.coutant at smile.fr: backported to mesa-23.3.4] >> + >> +Part-of: >> +--- >> + src/compiler/clc/clc_helpers.cpp | 24 +++++++++++++++++++++--- >> + 1 file changed, 21 insertions(+), 3 deletions(-) >> + >> +diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp >> +index 55287f22683..22eb3495be9 100644 >> +--- a/src/compiler/clc/clc_helpers.cpp >> ++++ b/src/compiler/clc/clc_helpers.cpp >> +@@ -23,6 +23,7 @@ >> + // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR >> + // OTHER DEALINGS IN THE SOFTWARE. >> + >> ++#include >> + #include >> + #include >> + #include >> +@@ -57,6 +58,10 @@ >> + >> + #include "spirv.h" >> + >> ++#if DETECT_OS_UNIX >> ++#include >> ++#endif >> ++ >> + #ifdef USE_STATIC_OPENCL_C_H >> + #if LLVM_VERSION_MAJOR < 15 >> + #include "opencl-c.h.h" >> +@@ -876,12 +881,25 @@ clc_compile_to_llvm_module(LLVMContext &llvm_ctx, >> + #endif >> + } >> + #else >> ++ >> ++ Dl_info info; >> ++ if (dladdr((void *)clang::CompilerInvocation::CreateFromArgs, &info) == 0) { >> ++ clc_error(logger, "Couldn't find libclang path.\n"); >> ++ return {}; >> ++ } >> ++ >> ++ char *clang_path = realpath(info.dli_fname, NULL); >> ++ if (clang_path == nullptr) { >> ++ clc_error(logger, "Couldn't find libclang path.\n"); >> ++ return {}; >> ++ } >> ++ >> + // GetResourcePath is a way to retrive the actual libclang resource dir based on a given binary >> +- // or library. The path doesn't even need to exist, we just have to put something in there, >> +- // because we might have linked clang statically. >> ++ // or library. >> + auto libclang_path = fs::path(LLVM_LIB_DIR) / "libclang.so"; >> + auto clang_res_path = >> +- fs::path(Driver::GetResourcesPath(libclang_path.string(), CLANG_RESOURCE_DIR)) / "include"; >> ++ fs::path(Driver::GetResourcesPath(std::string(clang_path), CLANG_RESOURCE_DIR)) / "include"; >> ++ free(clang_path); >> + >> + c->getHeaderSearchOpts().UseBuiltinIncludes = true; >> + c->getHeaderSearchOpts().UseStandardSystemIncludes = true; >> +-- >> +2.25.1 >> + >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From fperrad at gmail.com Mon Feb 12 17:26:19 2024 From: fperrad at gmail.com (Francois Perrad) Date: Mon, 12 Feb 2024 18:26:19 +0100 Subject: [Buildroot] [PATCH v2] package/lua-http: fix CVE-2023-4540 Message-ID: <20240212172619.13550-1-francois.perrad@gadz.org> see https://nvd.nist.gov/vuln/detail/CVE-2023-4540 & https://cert.pl/en/posts/2023/09/CVE-2023-4540 Signed-off-by: Francois Perrad --- ...andle-EOF-when-body_read_type-length.patch | 71 +++++++++++++++++++ package/lua-http/lua-http.mk | 3 + 2 files changed, 74 insertions(+) create mode 100644 package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch diff --git a/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch new file mode 100644 index 000000000..fdbf5243f --- /dev/null +++ b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch @@ -0,0 +1,71 @@ +From ddab2835c583d45dec62680ca8d3cbde55e0bae6 Mon Sep 17 00:00:00 2001 +From: daurnimator +Date: Tue, 22 Aug 2023 23:30:20 +1000 +Subject: [PATCH] http/h1_stream: handle EOF when `body_read_type==length` + +If a client closes the connection before sending the expected number of bytes +then return `EPIPE`. +This fixes a potential infinite draining loop when trying to trying to +`:shutdown()` a stream. + +Upstream: https://github.com/daurnimator/lua-http/commit/ddab2835c583d45dec62680ca8d3cbde55e0bae6 +Signed-off-by: Francois Perrad +--- + http/h1_stream.lua | 2 ++ + spec/h1_stream_spec.lua | 27 +++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/lua-http-0.4/http/h1_stream.lua b/lua-http-0.4/http/h1_stream.lua +index b2469a1..b0ca821 100644 +--- a/lua-http-0.4/http/h1_stream.lua ++++ b/lua-http-0.4/http/h1_stream.lua +@@ -861,6 +861,8 @@ function stream_methods:read_next_chunk(timeout) + if chunk ~= nil then + self.body_read_left = length_n - #chunk + end_stream = (self.body_read_left == 0) ++ elseif err == nil then ++ return nil, ce.strerror(ce.EPIPE), ce.EPIPE + end + elseif length_n == 0 then + chunk = "" +diff --git a/lua-http-0.4/spec/h1_stream_spec.lua b/lua-http-0.4/spec/h1_stream_spec.lua +index f9cfea9..1303f94 100644 +--- a/lua-http-0.4/spec/h1_stream_spec.lua ++++ b/lua-http-0.4/spec/h1_stream_spec.lua +@@ -295,6 +295,33 @@ describe("http1 stream", function() + server:close() + client:close() + end) ++ it("Doesn't hang when a content-length delimited stream is closed", function() ++ local server, client = new_pair(1.1) ++ local cq = cqueues.new() ++ cq:wrap(function() ++ local stream = client:new_stream() ++ local headers = new_headers() ++ headers:append(":method", "GET") ++ headers:append(":scheme", "http") ++ headers:append(":authority", "myauthority") ++ headers:append(":path", "/a") ++ assert(stream:write_headers(headers, true)) ++ end) ++ cq:wrap(function() ++ local stream = server:get_next_incoming_stream() ++ assert(stream:get_headers()) ++ local res_headers = new_headers() ++ res_headers:append(":status", "200") ++ res_headers:append("content-length", "100") ++ assert(stream:write_headers(res_headers, false)) ++ assert(stream:write_chunk("foo", false)) ++ assert(stream:shutdown()) ++ end) ++ assert_loop(cq, TEST_TIMEOUT) ++ assert.truthy(cq:empty()) ++ server:close() ++ client:close() ++ end) + it("allows pipelining", function() + local server, client = new_pair(1.1) + local cq = cqueues.new() +-- +2.40.1 + diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index df3e2c005..34387c12e 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -13,4 +13,7 @@ LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_CPE_ID_VENDOR = daurnimator +# 0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch +LUA_HTTP_IGNORE_CVES += CVE-2023-4540 + $(eval $(luarocks-package)) -- 2.40.1 From fontaine.fabrice at gmail.com Mon Feb 12 17:52:51 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 12 Feb 2024 18:52:51 +0100 Subject: [Buildroot] [PATCH v2, 1/1] package/cracklib: python needs autoreconf Message-ID: <20240212175251.721803-1-fontaine.fabrice@gmail.com> Set CRACKLIB_AUTORECONF when building python to regenerate py-compile and avoid the following build failure with python 3.12 (which removed imp module) raised since commit 36e635d2d5c0166476858aa239ccbe78e8f2af14: Traceback (most recent call last): File "", line 2, in ModuleNotFoundError: No module named 'imp' make[3]: *** [Makefile:485: install-pythonPYTHON] Error 1 Indeed, after autoreconf, py-compile will contain: if test "$python_major" -le 2; then import_lib=imp import_test="hasattr(imp, 'get_tag')" import_call=imp.cache_from_source import_arg2=', False' # needed in one call and not the other else import_lib=importlib import_test="hasattr(sys.implementation, 'cache_tag')" import_call=importlib.util.cache_from_source import_arg2= fi $PYTHON -c " import sys, os, py_compile, $import_lib instead of: import sys, os, py_compile, imp Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 - http://autobuild.buildroot.org/results/aec4c19fdf8087c76c1d5f472e855e0f84fcf7fd Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni): - Give more details in commit message package/cracklib/cracklib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index c5226b3326..9f5f32c87a 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -22,6 +22,8 @@ CRACKLIB_CONF_OPTS += --without-zlib endif ifeq ($(BR2_PACKAGE_PYTHON3),y) +# py-compile must be rebuilt because python 3.12 removed imp module +CRACKLIB_AUTORECONF = YES CRACKLIB_CONF_OPTS += --with-python CRACKLIB_CONF_ENV += \ ac_cv_path_PYTHON=$(HOST_DIR)/bin/python3 \ -- 2.43.0 From paul at crapouillou.net Mon Feb 12 18:13:48 2024 From: paul at crapouillou.net (Paul Cercueil) Date: Mon, 12 Feb 2024 19:13:48 +0100 Subject: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status In-Reply-To: <20240205222949.2805f50f@windsurf> References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> <20240121204252.152952-2-adam.duskett@amarulasolutions.com> <20240205222949.2805f50f@windsurf> Message-ID: <80b6517820300e318ea9b5c89572115f5d4c3a44.camel@crapouillou.net> Patches were merged upstream, both in wlroots and uClibc: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4540 https://mailman.openadk.org/mailman3/hyperkitty/list/devel at uclibc-ng.org/thread/OMMGSP7PDXQDOQNUXTKRG5DWELAD2CII/ Cheers, -Paul Le lundi 05 f?vrier 2024 ? 22:29 +0100, Thomas Petazzoni a ?crit?: > Hello Adam, > > +Paul Cercueil in Cc, see below. > > On Sun, 21 Jan 2024 13:42:52 -0700 > Adam Duskett wrote: > > > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has > > been > > rejected upstream, and the initial pull request was moved to the > > freedesktop gitlab. Update the patch to reflect these changes. > > > > Signed-off-by: Adam Duskett > > Thanks, applied! > > Paul: could you follow-up with upstream (either wlroots, or uclibc, > or > both) to try to find an acceptable solution so that some day we can > drop this patch? > > Thanks a lot! > > Thomas From arnout at mind.be Mon Feb 12 19:50:44 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 20:50:44 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Message-ID: On 12/02/2024 01:51, James Hilliard wrote: > On Sun, Feb 11, 2024 at 5:13?PM Marcus Hoffmann wrote: [snip]>> In short: if we continue to use the sdists from pypi, cython is not a >> real build dependency and we can just remove it from pyptoject.toml >> instead of trying to provide the correct version that's never going to >> be invoked. > > We can probably just pass --skip-dependency-check as a build arg or > something like that I suppose. That skips _all_ dependency checks, and we usually want to check dependencies. Unless the dependency check will require host packages for runtime dependencies? But if that were the case we'd already have a lot of useless host-python-foo packages I expect... Regards, Arnout From fontaine.fabrice at gmail.com Mon Feb 12 20:04:42 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 12 Feb 2024 21:04:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/elfutils: drop ELFUTILS_{C, CPP}FLAGS Message-ID: <20240212200442.848248-1-fontaine.fabrice@gmail.com> ELFUTILS_CFLAGS and ELFUTILS_CPPFLAGS are empty since commit 7593aea519dee34cb25715296c1b03f471123ee2 so drop them to avoid setting incorrect flags Fixes: 7593aea519dee34cb25715296c1b03f471123ee2 Signed-off-by: Fabrice Fontaine --- package/elfutils/elfutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index eb1b1794c3..6ba8db1370 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -29,10 +29,6 @@ HOST_ELFUTILS_CONF_OPTS = \ --without-zstd \ --disable-progs -ELFUTILS_CONF_ENV += \ - CFLAGS="$(ELFUTILS_CFLAGS)" \ - CPPFLAGS="$(ELFUTILS_CPPFLAGS)" - ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) \ $(TARGET_NLS_LIBS) -- 2.43.0 From yann.morin.1998 at free.fr Mon Feb 12 20:07:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 12 Feb 2024 21:07:12 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: References: <20240206132051.2838897-1-yegorslists@googlemail.com> <67502ba4-3f73-428e-802e-6ee9cbc1fe6a@mind.be> Message-ID: Yegor, All, On 2024-02-12 10:00 +0100, Yegor Yefremov via buildroot spake thusly: > On Tue, Feb 6, 2024 at 2:37?PM Arnout Vandecappelle wrote: > > On 06/02/2024 14:30, Yann E. MORIN wrote: > > > On 2024-02-06 14:20 +0100, yegorslists--- via buildroot spake thusly: > > >> From: Yegor Yefremov > > >> This .gitignore file ignores all files in an output directory and > > >> hence doesn't change the git status. > > > What are you trying to achieve with this that does not work currently? > > I you do `make O=output-test-mypkg` (which I do quite a lot), that output > > directory doesn't get ignored by git. We could ignore output* but maybe you name > > the output directory o-foo or something. > > > > Putting a .gitignore in a generated directory is a very elegant solution for > > that. It is used by e.g. virtualenv, pytest, and a load of other applications > > that generate output in a directory. > > > > Since the .gitignore is created in the output directory, it is no longer > > necessary to put output/ in the .gitignore file. > > All of the above could be put in the commit message, of course, but for me > > Yegor's commit message was sufficiently clear :-) > Were we able to convince you? I now understand the purpose. Saying I'm convinced is another stride. In my case, I have all my output directories outside of the buildroot tree. Having a .gitignore in there would be totally useless and spurious, and would get caught by my (superficial) tests that no unknown files gets created outside the build/ target/ and such dirs for example. So there are pros and cons either ways... Maybe just create .gitignore only if $(O) a sub-dir of $(TOPDIR) ? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Mon Feb 12 20:27:08 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 12 Feb 2024 21:27:08 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: bump to version 2024-02-09 on branch 5.11.2.1 Message-ID: <20240212202708.3514522-1-giulio.benetti@benettiengineering.com> It supports up to Linux 6.8. Signed-off-by: Giulio Benetti --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index e27acba124..a08ed04010 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 2326902c27aee022bd1f6e49e8dbf789b08613e660385c23ded8038074d7929b rtl8192eu-a928f08c1dd4f9a1e84d85811a543e974551bc4f.tar.gz +sha256 b5d3b8de0b4f05aa2b452dd01f4386e9b671e03c2bbf8e032f1c593befc5a153 rtl8192eu-e90a6043be141bde8847e84223e106eff38ecdfd.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index a2fde6fef0..3d24b0caf8 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = a928f08c1dd4f9a1e84d85811a543e974551bc4f +RTL8192EU_VERSION = e90a6043be141bde8847e84223e106eff38ecdfd RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 21:09:20 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 14:09:20 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Message-ID: On Mon, Feb 12, 2024 at 12:50?PM Arnout Vandecappelle wrote: > > > > On 12/02/2024 01:51, James Hilliard wrote: > > On Sun, Feb 11, 2024 at 5:13?PM Marcus Hoffmann wrote: > [snip]>> In short: if we continue to use the sdists from pypi, cython is not a > >> real build dependency and we can just remove it from pyptoject.toml > >> instead of trying to provide the correct version that's never going to > >> be invoked. > > > > We can probably just pass --skip-dependency-check as a build arg or > > something like that I suppose. > > That skips _all_ dependency checks, and we usually want to check dependencies. > Unless the dependency check will require host packages for runtime dependencies? > But if that were the case we'd already have a lot of useless host-python-foo > packages I expect... Yeah, so runtime dependencies are basically not checked at all since we don't generally have buildroot target python packages which depend on other buildroot target python packages, they merely select their dependencies which allows for their dependencies to be built parallel but prevents any sort of target package dependency validation. I think that --skip-dependency-check flag just disables pep517 build dependency checks which would be those host-python-foo build dependencies that some have. > > Regards, > Arnout > From arnout at mind.be Mon Feb 12 20:49:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 21:49:15 +0100 Subject: [Buildroot] [git commit] package/freescale-imx: add i.MX91 and i.MX93 SoC support Message-ID: <20240212214540.E61F7878BC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c1cdd48e13b2842669f0ab30e817d8064663beec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This commit adds i.MX91 and i.MX93 support to Buildroot. https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors:IMX9-PROCESSORS There is no i.MX95 software provided by NXP at the moment that's why i.MX95 is left behind. Adapt package firmware-imx for the LPPDR4 firmware binaries. The i.MX91 and i.MX93 only support LPDDR4 and LPDDR4x, but using different binaries than i.MX8. For simplicity, use a completely separate code path for i.MX91 and i.MX93, using the symbol BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9. There is only one type of firmware supported, so there's no need for a choice or for selecting the version (at least for now). Reviewed-by: Gary Bisson Signed-off-by: S??bastien Szymanski [Arnout: - Remove BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 option. - Re-wrap help text. - Introduce BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 instead of reusing BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW. - Create completely separate instance of FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW for BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9. - Drop the training binaries choice for IMX9. - Drop the firmware version option for IMX9. - Keep options for IMEM and DMEM padding. ] Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/Config.in | 26 +++++++++++++++++++++ package/freescale-imx/firmware-imx/Config.in | 11 ++++++++- package/freescale-imx/firmware-imx/firmware-imx.mk | 27 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 1c26b3cc6f..3221f06e43 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -61,6 +61,30 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL bool "imx8dxl" +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + bool "imx91" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + bool "imx93" + +endchoice + +choice + prompt "i.MX Silicon Revision" + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + help + Some packages related to the selected i.MX platform need to + know the silicon revision of the platform they will run on. + + Note - mismatches may result in a failure to boot! + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 + bool "imx93a0" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + bool "imx93a1" + endchoice config BR2_PACKAGE_FREESCALE_IMX_PLATFORM @@ -80,6 +104,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM default "IMX8MN" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN default "IMX8MP" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default "IMX91" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + default "IMX93" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU bool diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 087ddef877..63990947c8 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -56,6 +56,11 @@ config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP +config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW choice @@ -93,6 +98,10 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION Use a specific version of the imx ddr binaries. Leaving this field empty will select the default version. +endif # BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW + +if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW || BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 + config BR2_PACKAGE_FIRMWARE_IMX_IMEM_LEN hex "(LP)DDR IMEM padding length" default 0x8000 @@ -105,6 +114,6 @@ config BR2_PACKAGE_FIRMWARE_IMX_DMEM_LEN help The DMEM firmware will be padded to this length -endif # BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW +endif # BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW || BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 endif # BR2_PACKAGE_FIRMWARE_IMX diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 66ef8c3930..2a74f58aa6 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -45,6 +45,33 @@ ifneq ($(FIRMWARE_IMX_DDR_VERSION),) FIRMWARE_IMX_DDR_VERSION_SUFFIX = _$(FIRMWARE_IMX_DDR_VERSION) endif +ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9),y) +FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys + +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW + # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate lpddr4_fw.bin. + # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin + # which is done in post-image script. + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_imem_1d_v202201, + lpddr4_dmem_1d_v202201, + lpddr4_1d_fw) + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ + lpddr4_imem_2d_v202201, + lpddr4_dmem_2d_v202201, + lpddr4_2d_fw) + cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ + $(BINARIES_DIR)/lpddr4_fw.bin + ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin + + # U-Boot supports creation of the combined flash.bin image. To make + # sure that U-Boot can access all available files copy them to + # the binary dir. + cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ +endef +endif + ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys From arnout at mind.be Mon Feb 12 21:01:57 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:01:57 +0100 Subject: [Buildroot] [git commit] package/freescale-imx/firmware-ele-imx: new package Message-ID: <20240212214541.024AF8353C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=69d127fe29dc8ca0321588ed19f14f644ff7e910 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This package provides firmware blobs for the Edgelock Secure Enclave (ELE) [1] present on i.MX8ULP and i.MX9 Socs. This version comes from the 6.1.55-2.2.0 release. Since i.MX8ULP is not added to Buildroot yet, only support i.MX9. [1] https://www.nxp.com/products/nxp-product-information/nxp-product-programs/edgelock-secure-enclave:EDGELOCK-SECURE-ENCLAVE Reviewed-by: Gary Bisson Signed-off-by: S??bastien Szymanski [Arnout: - Introduce BR2_PACKAGE_FREESCALE_IMX_HAS_ELE instead of specific dependencies. - Drop BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1, use BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 instead. - Don't use SCR.txt as license file (it's just an index file); instead, use EULA. ] Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/Config.in | 6 +++++ package/freescale-imx/firmware-ele-imx/Config.in | 23 ++++++++++++++++++ .../firmware-ele-imx/firmware-ele-imx.hash | 4 ++++ .../firmware-ele-imx/firmware-ele-imx.mk | 27 ++++++++++++++++++++++ 4 files changed, 60 insertions(+) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 3221f06e43..3211592468 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -133,6 +133,11 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X || \ BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL +config BR2_PACKAGE_FREESCALE_IMX_HAS_ELE + bool + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 + source "package/freescale-imx/imx-alsa-plugins/Config.in" source "package/freescale-imx/imx-codec/Config.in" source "package/freescale-imx/imx-kobs/Config.in" @@ -143,6 +148,7 @@ source "package/freescale-imx/imx-uuc/Config.in" source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/imx-vpu-hantro/Config.in" source "package/freescale-imx/imx-vpuwrap/Config.in" +source "package/freescale-imx/firmware-ele-imx/Config.in" source "package/freescale-imx/firmware-imx/Config.in" source "package/freescale-imx/imx-sc-firmware/Config.in" source "package/freescale-imx/imx-seco/Config.in" diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in new file mode 100644 index 0000000000..241ad3942d --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/Config.in @@ -0,0 +1,23 @@ +comment "firmware-ele-imx needs an i.MX platform with EdgeLock Secure Enclave" + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + +config BR2_PACKAGE_FIRMWARE_ELE_IMX + bool "firmware-ele-imx" + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_ELE + help + Firmware blobs for the EdgeLock Secure Enclave (ELE) + present on i.MX8ULP and i.MX9 SoCs. + + This library is provided by NXP as-is and doesn't have an + upstream. + +if BR2_PACKAGE_FIRMWARE_ELE_IMX + +config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE + string + default "mx93a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 + default "mx93a1-ahab-container.img" if \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 + +endif # BR2_PACKAGE_FIRMWARE_ELE_IMX diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash new file mode 100644 index 0000000000..0923e546b0 --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca firmware-ele-imx-0.1.0.bin +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING +sha256 3282d88fad766897f93b0827297a70c2707d9358db24cccd5777abf7c997da77 EULA diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk new file mode 100644 index 0000000000..d493fe4a96 --- /dev/null +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# firmware-ele-imx +# +################################################################################ + +FIRMWARE_ELE_IMX_VERSION = 0.1.0 +FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) +FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin + +FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING EULA +FIRMWARE_ELE_IMX_REDISTRIBUTE = NO + +FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES + +define FIRMWARE_ELE_IMX_EXTRACT_CMDS + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_ELE_IMX_DL_DIR)/$(FIRMWARE_ELE_IMX_SOURCE)) +endef + +FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE)) + +define FIRMWARE_ELE_IMX_INSTALL_IMAGES_CMDS + cp $(@D)/$(FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE) $(BINARIES_DIR)/ahab-container.img +endef + +$(eval $(generic-package)) From arnout at mind.be Mon Feb 12 21:11:50 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:11:50 +0100 Subject: [Buildroot] [git commit] board/freescale/common/imx/post-image.sh: fix shellcheck errors Message-ID: <20240212214541.08756878BF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=202e35e4b68a6bb8e891b3ec068ca09f67963c59 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This file has many shellcheck errors. Fix them as reported by shellcheck. Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - board/freescale/common/imx/post-image.sh | 61 +++++++++++++++++--------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index c2e107ce96..05a9241962 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -31,7 +31,6 @@ board/chromebook/snow/sign.sh Shellcheck board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch Upstream board/cubietech/cubieboard2/post-image.sh Shellcheck board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck -board/freescale/common/imx/post-image.sh Shellcheck board/freescale/common/mxs/post-image.sh Shellcheck board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch Upstream board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index c359ef6032..638da4b86c 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -7,10 +7,12 @@ # dtb_list() { - local DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" + local DTB_LIST + + DTB_LIST="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([\/a-z0-9 \-]*\)"$/\1/p' "${BR2_CONFIG}")" for dt in $DTB_LIST; do - echo -n "\"`basename $dt`.dtb\", " + echo -n "\"$(basename "${dt}").dtb\", " done } @@ -21,11 +23,11 @@ dtb_list() # linux_image() { - if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_LINUX_KERNEL_UIMAGE=y$" "${BR2_CONFIG}"; then echo "\"uImage\"" - elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" "${BR2_CONFIG}"; then echo "\"Image\"" - elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" "${BR2_CONFIG}"; then echo "\"Image.gz\"" else echo "\"zImage\"" @@ -34,27 +36,27 @@ linux_image() genimage_type() { - if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" - elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then - if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" "${BR2_CONFIG}"; then + if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_no_boot_part_spl" else echo "genimage.cfg.template_no_boot_part" fi - elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_spl" else echo "genimage.cfg.template" @@ -63,9 +65,9 @@ genimage_type() imx_offset() { - if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" "${BR2_CONFIG}"; then echo "33K" - elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" "${BR2_CONFIG}"; then echo "33K" else echo "32K" @@ -74,29 +76,30 @@ imx_offset() uboot_image() { - if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then + if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" "${BR2_CONFIG}"; then echo "u-boot-dtb.imx" - elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" "${BR2_CONFIG}"; then echo "u-boot.imx" - elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y$" "${BR2_CONFIG}"; then echo "u-boot-dtb.img" - elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" ${BR2_CONFIG}; then + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMG=y$" "${BR2_CONFIG}"; then echo "u-boot.img" fi } main() { - local FILES="$(dtb_list) $(linux_image)" - local IMXOFFSET="$(imx_offset)" - local UBOOTBIN="$(uboot_image)" - local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" - local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + local FILES IMXOFFSET UBOOTBIN GENIMAGE_CFG GENIMAGE_TMP + FILES="$(dtb_list) $(linux_image)" + IMXOFFSET="$(imx_offset)" + UBOOTBIN="$(uboot_image)" + GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" + GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" sed -e "s/%FILES%/${FILES}/" \ -e "s/%IMXOFFSET%/${IMXOFFSET}/" \ -e "s/%UBOOTBIN%/${UBOOTBIN}/" \ - board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG} + "board/freescale/common/imx/$(genimage_type)" > "${GENIMAGE_CFG}" rm -rf "${GENIMAGE_TMP}" @@ -107,9 +110,9 @@ main() --outputpath "${BINARIES_DIR}" \ --config "${GENIMAGE_CFG}" - rm -f ${GENIMAGE_CFG} + rm -f "${GENIMAGE_CFG}" exit $? } -main $@ +main "$@" From arnout at mind.be Mon Feb 12 21:44:37 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:44:37 +0100 Subject: [Buildroot] [git commit] configs/freescale_imx93evk: new defconfig Message-ID: <20240212214541.157CC878C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c05f27c8ae46cc6d9236a30d51f854f221d55ff6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This patch adds support for the NXP i.MX 93 11x11 EVK board [1]. [1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-93-evaluation-kit:i.MX93EVK Reviewed-by: Julien Olivain Tested-by: Julien Olivain [Julien: tested on NXP board i.MX93EVK, cpu rev A1, board rev B] Reviewed-by: Gary Bisson Reviewed-by: Giulio Benetti Signed-off-by: S??bastien Szymanski [Arnout: - Fix shellcheck errors. - Add hash files for ATF, linux, U-Boot. ] Signed-off-by: Arnout Vandecappelle --- .../common/imx/genimage.cfg.template_imx9 | 42 ++++++++++++ .../common/imx/imx9-bootloader-prepare.sh | 43 ++++++++++++ board/freescale/common/imx/post-image.sh | 4 ++ .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 + .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx93evk/patches/linux/linux.hash | 3 + board/freescale/imx93evk/patches/uboot/uboot.hash | 2 + board/freescale/imx93evk/readme.txt | 77 ++++++++++++++++++++++ configs/freescale_imx93evk_defconfig | 40 +++++++++++ 9 files changed, 214 insertions(+) diff --git a/board/freescale/common/imx/genimage.cfg.template_imx9 b/board/freescale/common/imx/genimage.cfg.template_imx9 new file mode 100644 index 0000000000..df7ddc25b7 --- /dev/null +++ b/board/freescale/common/imx/genimage.cfg.template_imx9 @@ -0,0 +1,42 @@ +# Minimal SD card image for the NXP i.MX9 boards +# +# We mimic the .sdcard NXP's image format: +# * the SD card must have 32 kB free space at the beginning, +# * U-Boot is integrated into imx9-boot-sd.bin and is dumped as is, +# * a FAT partition at offset 8MB is containing Image and DTB files +# * a single root filesystem partition is required (ext2, ext3 or ext4) +# + +image boot.vfat { + vfat { + label = "boot" + files = { + %FILES% + } + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition imx-boot { + in-partition-table = "no" + image = "imx9-boot-sd.bin" + offset = %IMXOFFSET% + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 8M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + } +} diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh new file mode 100755 index 0000000000..a9611a81bd --- /dev/null +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +main () +{ + SPL_LOAD_ADDR=0x2049A000 + ATF_LOAD_ADDR=0x204E0000 + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" "${BR2_CONFIG}"; then + SPL_LOAD_ADDR=0x204A0000 + ATF_LOAD_ADDR=0x204C0000 + fi + + dd if="${BINARIES_DIR}/u-boot-spl.bin" of="${BINARIES_DIR}/u-boot-spl-padded.bin" bs=4 conv=sync + cat "${BINARIES_DIR}/u-boot-spl-padded.bin" "${BINARIES_DIR}/ddr_fw.bin" > "${BINARIES_DIR}/u-boot-spl-ddr.bin" + + "${HOST_DIR}/bin/mkimage_imx8" -commit > "${BINARIES_DIR}/mkimg.commit" + cat "${BINARIES_DIR}/u-boot.bin" "${BINARIES_DIR}/mkimg.commit" > "${BINARIES_DIR}/u-boot-hash.bin" + rm -f "${BINARIES_DIR}/mkimg.commit" + + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" "${BR2_CONFIG}"; then + "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ + -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ + -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ + -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ + -out "${BINARIES_DIR}/u-boot-atf-container.img" \ + else + "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ + -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ + -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ + -out "${BINARIES_DIR}/u-boot-atf-container.img" + fi + + "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -append "${BINARIES_DIR}/ahab-container.img" -c \ + -ap "${BINARIES_DIR}/u-boot-spl-ddr.bin" a35 ${SPL_LOAD_ADDR} \ + -out "${BINARIES_DIR}/imx9-boot-sd.bin" + + flashbin_size="$(wc -c "${BINARIES_DIR}/imx9-boot-sd.bin" | awk '{print $1}')" + pad_cnt=$(($((flashbin_size + 0x400 - 1)) / 0x400)) + dd if="${BINARIES_DIR}/u-boot-atf-container.img" of="${BINARIES_DIR}/imx9-boot-sd.bin" bs=1K seek=${pad_cnt} + + exit $? +} + +main "$@" diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index 638da4b86c..a440bfb75c 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -50,6 +50,10 @@ genimage_type() echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91=y$" "${BR2_CONFIG}"; then + echo "genimage.cfg.template_imx9" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y$" "${BR2_CONFIG}"; then + echo "genimage.cfg.template_imx9" elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" "${BR2_CONFIG}"; then if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" "${BR2_CONFIG}"; then echo "genimage.cfg.template_no_boot_part_spl" 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 new file mode 100644 index 0000000000..98f425a89e --- /dev/null +++ b/board/freescale/imx93evk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 cfb927722272897f850681c78d5f129b0883a8efaba9c52d30e029086524f7ff imx-atf-lf-6.1.55-2.2.0.tar.gz diff --git a/board/freescale/imx93evk/patches/linux-headers/linux-headers.hash b/board/freescale/imx93evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx93evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash new file mode 100644 index 0000000000..5687ec7343 --- /dev/null +++ b/board/freescale/imx93evk/patches/linux/linux.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 eb94414f952444289c0af8ad82afa0dc2d07e08f9000ccd2cc39f11da5b494ea linux-imx-lf-6.1.55-2.2.0.tar.gz + diff --git a/board/freescale/imx93evk/patches/uboot/uboot.hash b/board/freescale/imx93evk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..9bc17c3f6f --- /dev/null +++ b/board/freescale/imx93evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 64441ee5bf3d5011e7853c028d06211b6f0439d21e147a8f36972c95a07ae9ac uboot-imx-lf-6.1.55-2.2.0.tar.gz diff --git a/board/freescale/imx93evk/readme.txt b/board/freescale/imx93evk/readme.txt new file mode 100644 index 0000000000..1173de39db --- /dev/null +++ b/board/freescale/imx93evk/readme.txt @@ -0,0 +1,77 @@ +********************* +NXP i.MX93 EVK board +********************* + +This file documents the Buildroot support for the i.MX 93 EVK board. + +Build +===== + +First, configure Buildroot for the i.MX 93 EVK board: + + make freescale_imx93evk_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - ddr_fw.bin + - Image + - imx93-11x11-evk.dtb + - imx9-boot-sd.bin + - lpddr4_pmu_train_fw.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf-container.img + - u-boot.bin + - u-boot-hash.bin + - u-boot-spl.bin + - u-boot-spl-ddr.bin + - u-boot-spl-padded.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx9. + +Boot the i.MX 93 EVK board +=============================== + +To boot your newly created system (refer to the i.MX 93 EVK Documentation +[1] for guidance): +- insert the SD card in the SD slot of the board; +- Configure the switches as follows: +SW1301: 0100 SW1301[1-4] +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Note: the debug USB connector presents 4 UARTs (for example /dev/ttyUSB[0-3]), +the Cortex-A55 UART should be the 3rd one (in the previous example, /dev/ttyUSB2). +Refer to the documentation [1] for more details. + +Enjoy! + +References +========== +[1] https://www.nxp.com/document/guide/getting-started-with-the-i-mx93-evk:GS-IMX93EVK diff --git a/configs/freescale_imx93evk_defconfig b/configs/freescale_imx93evk_defconfig new file mode 100644 index 0000000000..fa16967884 --- /dev/null +++ b/configs/freescale_imx93evk_defconfig @@ -0,0 +1,40 @@ +BR2_aarch64=y +BR2_cortex_a55=y +BR2_ARM_FPU_VFPV4D16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx93evk/patches" +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.1.55-2.2.0)/linux-imx-lf-6.1.55-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" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y +BR2_PACKAGE_FIRMWARE_ELE_IMX=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +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.1.55-2.2.0)/imx-atf-lf-6.1.55-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.1.55-2.2.0)/uboot-imx-lf-6.1.55-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 +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y From arnout at mind.be Mon Feb 12 21:46:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:46:13 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/freescale-imx: add i.MX91 and i.MX93 SoC support In-Reply-To: <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-1-c2c950104c58@armadeus.com> Message-ID: <2191e9a1-eae3-4ca7-8280-300a66cf5a70@mind.be> On 08/02/2024 13:54, S?bastien Szymanski wrote: > This commit adds i.MX91 and i.MX93 support to Buildroot. > https://www.nxp.com/products/processors-and-microcontrollers/arm-processors/i-mx-applications-processors/i-mx-9-processors:IMX9-PROCESSORS > > There is no i.MX95 software provided by NXP at the moment that's why > i.MX95 is left behind. > > Adapt package firmware-imx for the LPPDR4 firwmares binaries. > > Reviewed-by: Gary Bisson > Signed-off-by: S?bastien Szymanski Applied to master, with changes as already mentioned in my review: - Remove BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 option. - Re-wrap help text. - Introduce BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9 instead of reusing BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW. - Create completely separate instance of FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW for BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW_IMX9. - Drop the training binaries choice for IMX9. - Drop the firmware version option for IMX9. - Keep options for IMEM and DMEM padding. Regards, Arnout > --- > Changes for v5: > - none > > Changes for v4 > - move i.MX Silicon Revision changes into this patch (Gary Bisson) > - BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION default to "v202201" instead of > just "202201" (Gary Bisson) > - Copy all DDR files to $(BINARIES_DIR) as U-Boot can now create a > bootable image: > https://source.denx.de/u-boot/u-boot/-/commit/f637dfe8c468229c9fb313d13c46d51cdbb88824 > - remove "pmu_train" from generated _pad binary file names > > Changes for v3: > - none > > Changes for v2: > - none > --- > package/freescale-imx/Config.in | 37 ++++++++++++++++++++++ > package/freescale-imx/firmware-imx/Config.in | 9 ++++++ > package/freescale-imx/firmware-imx/firmware-imx.mk | 25 +++++++++++++++ > 3 files changed, 71 insertions(+) > > diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in > index 1c26b3cc6f4c..ba169ead18cb 100644 > --- a/package/freescale-imx/Config.in > +++ b/package/freescale-imx/Config.in > @@ -61,6 +61,41 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X > config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8DXL > bool "imx8dxl" > > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + bool "imx91" > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + bool "imx93" > + > +endchoice > + > +choice > + prompt "i.MX Silicon Revision" > + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 \ > + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + default BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 \ > + if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + help > + Some packages related to the selected i.MX platform need to know the > + silicon revision of the platform they will run on. > + If you don't know, leave the default value. > + > + Note - mismatches may result in a failure to boot! > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 > + bool "imx91a1" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 > + bool "imx93a0" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + > +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 > + bool "imx93a1" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + > endchoice > > config BR2_PACKAGE_FREESCALE_IMX_PLATFORM > @@ -80,6 +115,8 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM > default "IMX8MM" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM > default "IMX8MN" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN > default "IMX8MP" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP > + default "IMX91" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + default "IMX93" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > > config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU > bool > diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in > index 087ddef8771b..d83b5e129a9f 100644 > --- a/package/freescale-imx/firmware-imx/Config.in > +++ b/package/freescale-imx/firmware-imx/Config.in > @@ -55,6 +55,8 @@ config BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW > default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM > default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN > default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP > + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > > if BR2_PACKAGE_FIRMWARE_IMX_NEEDS_DDR_FW > > @@ -73,11 +75,15 @@ config BR2_PACKAGE_FIRMWARE_IMX_LPDDR4 > > config BR2_PACKAGE_FIRMWARE_IMX_DDR4 > bool "DDR4" > + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > help > Use DDR4 binaries (i.e.: ddr4_*_201810.bin). > > config BR2_PACKAGE_FIRMWARE_IMX_DDR3 > bool "DDR3" > + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 > + depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > help > Use DDR3 binaries (i.e.: ddr3_*_201810.bin). > > @@ -89,6 +95,9 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION > # unconditionally use HW version 201810 when DDR3/DDR4 was > # selected > default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || BR2_PACKAGE_FIRMWARE_IMX_DDR4 > + default "v202201" if \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > help > Use a specific version of the imx ddr binaries. Leaving this > field empty will select the default version. > diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk > index 66ef8c3930be..1f36f917cdc8 100644 > --- a/package/freescale-imx/firmware-imx/firmware-imx.mk > +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk > @@ -48,6 +48,30 @@ endif > ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) > FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys > > +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91)$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93),y) > +define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > + # Create padded versions of lpddr4_{d,i}mem_{1,2}d_* and generate lpddr4_fw.bin. > + # lpddr4_fw.bin is needed when generating imx9-boot-sd.bin > + # which is done in post-image script. > + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ > + lpddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_1d_fw) > + $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ > + lpddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), > + lpddr4_2d_fw) > + cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_1d_fw.bin \ > + $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_2d_fw.bin > \ > + $(BINARIES_DIR)/lpddr4_fw.bin > + ln -sf $(BINARIES_DIR)/lpddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin > + > + # U-Boot supports creation of the combined flash.bin image. To make > + # sure that U-Boot can access all available files copy them to > + # the binary dir. > + cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ > +endef > +else > define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > # Create padded versions of lpddr4_pmu_* and generate lpddr4_pmu_train_fw.bin. > # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin > @@ -71,6 +95,7 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW > cp $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4*.bin $(BINARIES_DIR)/ > endef > endif > +endif > > ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_DDR4),y) > FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys > From arnout at mind.be Mon Feb 12 21:46:43 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:46:43 +0100 Subject: [Buildroot] [PATCH v5 2/3] package/freescale-imx/firmware-ele-imx: new package In-Reply-To: <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-2-c2c950104c58@armadeus.com> Message-ID: On 08/02/2024 13:54, S?bastien Szymanski wrote: > This package provides firmware blobs for the Edgelock Secure > Enclave (ELE) [1] present on i.MX8ULP and i.MX9 Socs. > This version comes from the 6.1.55-2.2.0 release. > > [1] https://www.nxp.com/products/nxp-product-information/nxp-product-programs/edgelock-secure-enclave:EDGELOCK-SECURE-ENCLAVE > > Reviewed-by: Gary Bisson > Signed-off-by: S?bastien Szymanski Applied to master, thanks, with some changes: - Introduce BR2_PACKAGE_FREESCALE_IMX_HAS_ELE instead of specific dependencies. - Drop BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1, use BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 instead. - Don't use SCR.txt as license file (it's just an index file); instead, use EULA. Regards, Arnout > --- > Changes for v5: > - none > > Changes for v4: > - move i.MX Silicon Revision changes into first patch (Gary Bisson) > > Changes for v3: > - rename package from firmware-sentinel to package firmware-ele-imx > > Changes for v2: > - none > --- > package/freescale-imx/Config.in | 1 + > package/freescale-imx/firmware-ele-imx/Config.in | 21 +++++++++++++++++ > .../firmware-ele-imx/firmware-ele-imx.hash | 4 ++++ > .../firmware-ele-imx/firmware-ele-imx.mk | 27 ++++++++++++++++++++++ > 4 files changed, 53 insertions(+) > > diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in > index ba169ead18cb..f12acc3bd024 100644 > --- a/package/freescale-imx/Config.in > +++ b/package/freescale-imx/Config.in > @@ -154,6 +154,7 @@ source "package/freescale-imx/imx-uuc/Config.in" > source "package/freescale-imx/imx-vpu/Config.in" > source "package/freescale-imx/imx-vpu-hantro/Config.in" > source "package/freescale-imx/imx-vpuwrap/Config.in" > +source "package/freescale-imx/firmware-ele-imx/Config.in" > source "package/freescale-imx/firmware-imx/Config.in" > source "package/freescale-imx/imx-sc-firmware/Config.in" > source "package/freescale-imx/imx-seco/Config.in" > diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in > new file mode 100644 > index 000000000000..7867c3712c9c > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/Config.in > @@ -0,0 +1,21 @@ > +config BR2_PACKAGE_FIRMWARE_ELE_IMX > + bool "firmware-ele-imx" > + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93 > + help > + Firmware blobs for the Edgelock Secure Enclave (ELE) > + present on i.MX8ULP and i.MX9 SoCs. > + > + This library is provided by NXP as-is and doesn't have an > + upstream. > + > +if BR2_PACKAGE_FIRMWARE_ELE_IMX > + > +config BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE > + string > + default "mx93a0-ahab-container.img" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0 > + default "mx93a1-ahab-container.img" if \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX91A1 || \ > + BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A1 > + > +endif # BR2_PACKAGE_FIRMWARE_ELE_IMX > diff --git a/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash > new file mode 100644 > index 000000000000..58565cef43e9 > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.hash > @@ -0,0 +1,4 @@ > +# Locally calculated > +sha256 4a0440168d8dfb95989a17be8fafb149589e110e7d4518e5e8a33463dfb5e5ca firmware-ele-imx-0.1.0.bin > +sha256 24d7cb3a7e51011466a149bd99acf89387b832be2d0890ce2e183dfbc9d7cb84 COPYING > +sha256 c800aaca3a7e9f470d99d7cde0a48c95982ed601d4c306f7b8f43f3710054f28 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 > new file mode 100644 > index 000000000000..600b50c5b456 > --- /dev/null > +++ b/package/freescale-imx/firmware-ele-imx/firmware-ele-imx.mk > @@ -0,0 +1,27 @@ > +################################################################################ > +# > +# firmware-ele-imx > +# > +################################################################################ > + > +FIRMWARE_ELE_IMX_VERSION = 0.1.0 > +FIRMWARE_ELE_IMX_SITE = $(FREESCALE_IMX_SITE) > +FIRMWARE_ELE_IMX_SOURCE = firmware-ele-imx-$(FIRMWARE_ELE_IMX_VERSION).bin > + > +FIRMWARE_ELE_IMX_LICENSE = NXP Semiconductor Software License Agreement > +FIRMWARE_ELE_IMX_LICENSE_FILES = COPYING SCR.txt > +FIRMWARE_ELE_IMX_REDISTRIBUTE = NO > + > +FIRMWARE_ELE_IMX_INSTALL_IMAGES = YES > + > +define FIRMWARE_ELE_IMX_EXTRACT_CMDS > + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_ELE_IMX_DL_DIR)/$(FIRMWARE_ELE_IMX_SOURCE)) > +endef > + > +FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE)) > + > +define FIRMWARE_ELE_IMX_INSTALL_IMAGES_CMDS > + cp $(@D)/$(FIRMWARE_ELE_IMX_AHAB_CONTAINER_IMAGE) $(BINARIES_DIR)/ahab-container.img > +endef > + > +$(eval $(generic-package)) > From arnout at mind.be Mon Feb 12 21:49:27 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:49:27 +0100 Subject: [Buildroot] [PATCH v5 3/3] configs/freescale_imx93evk: new defconfig In-Reply-To: <20240115-imx93-support-v5-3-c2c950104c58@armadeus.com> References: <20240115-imx93-support-v5-0-c2c950104c58@armadeus.com> <20240115-imx93-support-v5-3-c2c950104c58@armadeus.com> Message-ID: <48843560-82c9-49c7-972f-e3032a4502b0@mind.be> On 08/02/2024 13:54, S?bastien Szymanski wrote: > This patch adds support for the NXP i.MX 93 11x11 EVK board [1]. > > [1] https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-93-evaluation-kit:i.MX93EVK > > Reviewed-by: Julien Olivain > Tested-by: Julien Olivain > [Julien: tested on NXP board i.MX93EVK, cpu rev A1, board rev B] > Reviewed-by: Gary Bisson > Reviewed-by: Giulio Benetti > Signed-off-by: S?bastien Szymanski > --- > Changes for v5: > - follow BR coding style for the genimage.cfg.template_imx9 file > (Giulio Benetti) > > Changes for v4: > - None > > Changes for v3: > - BR2_PACKAGE_FIRMWARE_SENTINEL=y -> BR2_PACKAGE_FIRMWARE_ELE_IMX=y > - add a note about the debug UART in the readme.txt file (Julien Olivain) > - add BR2_TARGET_UBOOT_NEEDS_OPENSSL=y and > BR2_TARGET_UBOOT_NEEDS_GNUTLS=y to the defconfig file (Julien Olivain) > - bump ATF, U-Boot and Linux to latest NXP release lf-6.1.55-2.2.0 > (Julien Olivain) > > Changes for v2: > - none > --- > .../common/imx/genimage.cfg.template_imx9 | 42 ++++++++++++ > .../common/imx/imx9-bootloader-prepare.sh | 34 ++++++++++ This new script had some shellcheck errors. > board/freescale/common/imx/post-image.sh | 4 ++ This one introduced some new shellcheck errors. I pushed an extra commit that fixes all the shellcheck errors before this patch. > board/freescale/imx93evk/readme.txt | 77 ++++++++++++++++++++++ > configs/freescale_imx93evk_defconfig | 39 +++++++++++ > 5 files changed, 196 insertions(+) We now support hash files for the custom kernel etc. - they are only used if BR2_DOWNLOAD_FORCE_CHECK_HASHES=y, but it's still good to have them. So I added those. Applied to master with those changes, thanks. Could you re-test the series just to be sure that I didn't do anything stupid? Regards, Arnout [snip] From arnout at mind.be Mon Feb 12 21:51:45 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:51:45 +0100 Subject: [Buildroot] [PATCH] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: References: <20240206132051.2838897-1-yegorslists@googlemail.com> <67502ba4-3f73-428e-802e-6ee9cbc1fe6a@mind.be> Message-ID: <17870736-446d-43bb-a453-80e9efbd2274@mind.be> On 12/02/2024 21:07, Yann E. MORIN wrote: > Yegor, All, > > On 2024-02-12 10:00 +0100, Yegor Yefremov via buildroot spake thusly: >> On Tue, Feb 6, 2024 at 2:37?PM Arnout Vandecappelle wrote: >>> On 06/02/2024 14:30, Yann E. MORIN wrote: >>>> On 2024-02-06 14:20 +0100, yegorslists--- via buildroot spake thusly: >>>>> From: Yegor Yefremov >>>>> This .gitignore file ignores all files in an output directory and >>>>> hence doesn't change the git status. >>>> What are you trying to achieve with this that does not work currently? >>> I you do `make O=output-test-mypkg` (which I do quite a lot), that output >>> directory doesn't get ignored by git. We could ignore output* but maybe you name >>> the output directory o-foo or something. >>> >>> Putting a .gitignore in a generated directory is a very elegant solution for >>> that. It is used by e.g. virtualenv, pytest, and a load of other applications >>> that generate output in a directory. >>> >>> Since the .gitignore is created in the output directory, it is no longer >>> necessary to put output/ in the .gitignore file. >>> All of the above could be put in the commit message, of course, but for me >>> Yegor's commit message was sufficiently clear :-) >> Were we able to convince you? > > I now understand the purpose. Saying I'm convinced is another stride. > > In my case, I have all my output directories outside of the buildroot > tree. Having a .gitignore in there would be totally useless and > spurious, and would get caught by my (superficial) tests that no unknown > files gets created outside the build/ target/ and such dirs for example. That sounds like something you should update regularly, because we regularly add new stuff in the output directory. > So there are pros and cons either ways... > > Maybe just create .gitignore only if $(O) a sub-dir of $(TOPDIR) ? That would be quite complicated, while this patch is pretty simple. Regards, Arnout > > Regards, > Yann E. MORIN. > From thomas.petazzoni at bootlin.com Mon Feb 12 21:52:40 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:52:40 +0100 Subject: [Buildroot] [git commit] package/rtl8192eu: bump to version 2024-02-09 on branch 5.11.2.1 Message-ID: <20240212215333.AC640878C6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=835c647375182da571bfb0170b7cd7750cad38e4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master It supports up to Linux 6.8. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index e27acba124..a08ed04010 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 2326902c27aee022bd1f6e49e8dbf789b08613e660385c23ded8038074d7929b rtl8192eu-a928f08c1dd4f9a1e84d85811a543e974551bc4f.tar.gz +sha256 b5d3b8de0b4f05aa2b452dd01f4386e9b671e03c2bbf8e032f1c593befc5a153 rtl8192eu-e90a6043be141bde8847e84223e106eff38ecdfd.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index a2fde6fef0..3d24b0caf8 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = a928f08c1dd4f9a1e84d85811a543e974551bc4f +RTL8192EU_VERSION = e90a6043be141bde8847e84223e106eff38ecdfd RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From arnout at mind.be Mon Feb 12 21:53:46 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 12 Feb 2024 22:53:46 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Message-ID: On 12/02/2024 22:09, James Hilliard wrote: > On Mon, Feb 12, 2024 at 12:50?PM Arnout Vandecappelle wrote: >> >> >> >> On 12/02/2024 01:51, James Hilliard wrote: >>> On Sun, Feb 11, 2024 at 5:13?PM Marcus Hoffmann wrote: >> [snip]>> In short: if we continue to use the sdists from pypi, cython is not a >>>> real build dependency and we can just remove it from pyptoject.toml >>>> instead of trying to provide the correct version that's never going to >>>> be invoked. >>> >>> We can probably just pass --skip-dependency-check as a build arg or >>> something like that I suppose. >> >> That skips _all_ dependency checks, and we usually want to check dependencies. >> Unless the dependency check will require host packages for runtime dependencies? >> But if that were the case we'd already have a lot of useless host-python-foo >> packages I expect... > > Yeah, so runtime dependencies are basically not checked at all since we don't > generally have buildroot target python packages which depend on other buildroot > target python packages, they merely select their dependencies which allows for > their dependencies to be built parallel but prevents any sort of target package > dependency validation. > > I think that --skip-dependency-check flag just disables pep517 build dependency > checks which would be those host-python-foo build dependencies that some have. Oh, and a missing build dependency (that is actually used) would actually trigger a build error, so indeed it sounds like the pep517 build dependency check is quite redundant. Regards, Arnout From thomas.petazzoni at bootlin.com Mon Feb 12 21:54:26 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:54:26 +0100 Subject: [Buildroot] [PATCH] package/rtl8192eu: bump to version 2024-02-09 on branch 5.11.2.1 In-Reply-To: <20240212202708.3514522-1-giulio.benetti@benettiengineering.com> References: <20240212202708.3514522-1-giulio.benetti@benettiengineering.com> Message-ID: <20240212225426.25d80a95@windsurf> On Mon, 12 Feb 2024 21:27:08 +0100 Giulio Benetti wrote: > It supports up to Linux 6.8. > > Signed-off-by: Giulio Benetti > --- > package/rtl8192eu/rtl8192eu.hash | 2 +- > package/rtl8192eu/rtl8192eu.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 21:55:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:55:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: bump to version 3.0.17 In-Reply-To: <20240211214935.1603160-1-ju.o@free.fr> References: <20240211214935.1603160-1-ju.o@free.fr> Message-ID: <20240212225521.70d80a7c@windsurf> On Sun, 11 Feb 2024 22:49:35 +0100 Julien Olivain wrote: > For commit logs, see: > https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ > > Signed-off-by: Julien Olivain > --- > package/gnu-efi/gnu-efi.hash | 6 +++--- > package/gnu-efi/gnu-efi.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 21:55:54 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:55:54 +0100 Subject: [Buildroot] [git commit] package/elfutils: drop ELFUTILS_{C, CPP}FLAGS Message-ID: <20240212215607.AD88C878D2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed804a9f0c09a151f32be36f63ae4c924b9dc360 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master ELFUTILS_CFLAGS and ELFUTILS_CPPFLAGS are empty since commit 7593aea519dee34cb25715296c1b03f471123ee2 so drop them to avoid setting incorrect flags Fixes: 7593aea519dee34cb25715296c1b03f471123ee2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/elfutils/elfutils.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index cb4293b0c3..87b51aa5b5 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -29,10 +29,6 @@ HOST_ELFUTILS_CONF_OPTS = \ --without-zstd \ --disable-progs -ELFUTILS_CONF_ENV += \ - CFLAGS="$(ELFUTILS_CFLAGS)" \ - CPPFLAGS="$(ELFUTILS_CPPFLAGS)" - ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) \ $(TARGET_NLS_LIBS) From thomas.petazzoni at bootlin.com Mon Feb 12 21:54:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:54:22 +0100 Subject: [Buildroot] [git commit] package/gnu-efi: bump to version 3.0.17 Message-ID: <20240212215607.A299C878D1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fa9893ad8fb94278d7e8b80cd3e795469223faf0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For commit logs, see: https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gnu-efi/gnu-efi.hash | 6 +++--- package/gnu-efi/gnu-efi.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gnu-efi/gnu-efi.hash b/package/gnu-efi/gnu-efi.hash index 251a99e5d7..7d98650991 100644 --- a/package/gnu-efi/gnu-efi.hash +++ b/package/gnu-efi/gnu-efi.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/gnu-efi/files -md5 192d94e995ddd4ebdce4903adfd06039 gnu-efi-3.0.15.tar.bz2 -sha1 40c8a4715cf8c409a093c8d2ca9f5d5b24d73058 gnu-efi-3.0.15.tar.bz2 +md5 832496719182e7d6a4b12bc7c0b534d2 gnu-efi-3.0.17.tar.bz2 +sha1 9715285022124b231520d58b26709f5ab338e981 gnu-efi-3.0.17.tar.bz2 # Locally computed -sha256 931a257b9c5c1ba65ff519f18373c438a26825f2db7866b163e96d1b168f20ea gnu-efi-3.0.15.tar.bz2 +sha256 7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4 gnu-efi-3.0.17.tar.bz2 sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 686a14be01..8b9a6aa4c6 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNU_EFI_VERSION = 3.0.15 +GNU_EFI_VERSION = 3.0.17 GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2 GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi GNU_EFI_INSTALL_STAGING = YES From thomas.petazzoni at bootlin.com Mon Feb 12 21:56:08 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:56:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/elfutils: drop ELFUTILS_{C, CPP}FLAGS In-Reply-To: <20240212200442.848248-1-fontaine.fabrice@gmail.com> References: <20240212200442.848248-1-fontaine.fabrice@gmail.com> Message-ID: <20240212225608.4b41250b@windsurf> On Mon, 12 Feb 2024 21:04:42 +0100 Fabrice Fontaine wrote: > ELFUTILS_CFLAGS and ELFUTILS_CPPFLAGS are empty since commit > 7593aea519dee34cb25715296c1b03f471123ee2 so drop them to avoid setting > incorrect flags > > Fixes: 7593aea519dee34cb25715296c1b03f471123ee2 > > Signed-off-by: Fabrice Fontaine > --- > package/elfutils/elfutils.mk | 4 ---- > 1 file changed, 4 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 21:56:33 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:56:33 +0100 Subject: [Buildroot] [PATCH v2] package/lua-http: fix CVE-2023-4540 In-Reply-To: <20240212172619.13550-1-francois.perrad@gadz.org> References: <20240212172619.13550-1-francois.perrad@gadz.org> Message-ID: <20240212225633.483a6ff1@windsurf> On Mon, 12 Feb 2024 18:26:19 +0100 Francois Perrad wrote: > see https://nvd.nist.gov/vuln/detail/CVE-2023-4540 > & https://cert.pl/en/posts/2023/09/CVE-2023-4540 > > Signed-off-by: Francois Perrad > --- > ...andle-EOF-when-body_read_type-length.patch | 71 +++++++++++++++++++ > package/lua-http/lua-http.mk | 3 + > 2 files changed, 74 insertions(+) > create mode 100644 package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 21:56:15 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:56:15 +0100 Subject: [Buildroot] [git commit] package/lua-http: fix CVE-2023-4540 Message-ID: <20240212215749.208B7878D7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=431c02174078e359b6379b8021e6aeb06b2dbb9d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master see https://nvd.nist.gov/vuln/detail/CVE-2023-4540 & https://cert.pl/en/posts/2023/09/CVE-2023-4540 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- ...eam-handle-EOF-when-body_read_type-length.patch | 71 ++++++++++++++++++++++ package/lua-http/lua-http.mk | 3 + 2 files changed, 74 insertions(+) diff --git a/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch new file mode 100644 index 0000000000..fdbf5243f5 --- /dev/null +++ b/package/lua-http/0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch @@ -0,0 +1,71 @@ +From ddab2835c583d45dec62680ca8d3cbde55e0bae6 Mon Sep 17 00:00:00 2001 +From: daurnimator +Date: Tue, 22 Aug 2023 23:30:20 +1000 +Subject: [PATCH] http/h1_stream: handle EOF when `body_read_type==length` + +If a client closes the connection before sending the expected number of bytes +then return `EPIPE`. +This fixes a potential infinite draining loop when trying to trying to +`:shutdown()` a stream. + +Upstream: https://github.com/daurnimator/lua-http/commit/ddab2835c583d45dec62680ca8d3cbde55e0bae6 +Signed-off-by: Francois Perrad +--- + http/h1_stream.lua | 2 ++ + spec/h1_stream_spec.lua | 27 +++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/lua-http-0.4/http/h1_stream.lua b/lua-http-0.4/http/h1_stream.lua +index b2469a1..b0ca821 100644 +--- a/lua-http-0.4/http/h1_stream.lua ++++ b/lua-http-0.4/http/h1_stream.lua +@@ -861,6 +861,8 @@ function stream_methods:read_next_chunk(timeout) + if chunk ~= nil then + self.body_read_left = length_n - #chunk + end_stream = (self.body_read_left == 0) ++ elseif err == nil then ++ return nil, ce.strerror(ce.EPIPE), ce.EPIPE + end + elseif length_n == 0 then + chunk = "" +diff --git a/lua-http-0.4/spec/h1_stream_spec.lua b/lua-http-0.4/spec/h1_stream_spec.lua +index f9cfea9..1303f94 100644 +--- a/lua-http-0.4/spec/h1_stream_spec.lua ++++ b/lua-http-0.4/spec/h1_stream_spec.lua +@@ -295,6 +295,33 @@ describe("http1 stream", function() + server:close() + client:close() + end) ++ it("Doesn't hang when a content-length delimited stream is closed", function() ++ local server, client = new_pair(1.1) ++ local cq = cqueues.new() ++ cq:wrap(function() ++ local stream = client:new_stream() ++ local headers = new_headers() ++ headers:append(":method", "GET") ++ headers:append(":scheme", "http") ++ headers:append(":authority", "myauthority") ++ headers:append(":path", "/a") ++ assert(stream:write_headers(headers, true)) ++ end) ++ cq:wrap(function() ++ local stream = server:get_next_incoming_stream() ++ assert(stream:get_headers()) ++ local res_headers = new_headers() ++ res_headers:append(":status", "200") ++ res_headers:append("content-length", "100") ++ assert(stream:write_headers(res_headers, false)) ++ assert(stream:write_chunk("foo", false)) ++ assert(stream:shutdown()) ++ end) ++ assert_loop(cq, TEST_TIMEOUT) ++ assert.truthy(cq:empty()) ++ server:close() ++ client:close() ++ end) + it("allows pipelining", function() + local server, client = new_pair(1.1) + local cq = cqueues.new() +-- +2.40.1 + diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index df3e2c0059..34387c12e5 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -13,4 +13,7 @@ LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_CPE_ID_VENDOR = daurnimator +# 0001-http-h1_stream-handle-EOF-when-body_read_type-length.patch +LUA_HTTP_IGNORE_CVES += CVE-2023-4540 + $(eval $(luarocks-package)) From thomas.petazzoni at bootlin.com Mon Feb 12 21:59:53 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 22:59:53 +0100 Subject: [Buildroot] [PATCH v2] package/environment-setup: add variable KERNEL_DIR alongside KERNELDIR In-Reply-To: <20240131-kernel_dir-v2-1-555eeeee1722@microchip.com> References: <20240131-kernel_dir-v2-1-555eeeee1722@microchip.com> Message-ID: <20240212225953.79488771@windsurf> Hello Nayab, On Wed, 31 Jan 2024 23:48:28 +0530 Nayab Sayed via buildroot wrote: > Update host environment setup helper script to incorporate the variable > KENREL_DIR alongside the existing KERNELDIR. This adjustment ensures > consistency, as some projects utilize KERNELDIR while others use KERNEL_DIR. > > Signed-off-by: Nayab Sayed Thanks for this new iteration, but on my side, I'm tempted to reject this patch, and actually to remove the support for KERNELDIR as well. Indeed, even Angelo, who added the environment-setup script was not able to provide a solid reason for exporting KERNELDIR in the first place. I don't think there is any standard, or somewhat standard variable to point to the Linux kernel source directory. I'm fine with environment-setup exposing CC, LD, CFLAGS, LDFLAGS, or even CROSS_COMPILE as these are reasonably standardized by various build systems. But KERNELDIR or KERNEL_DIR are not, and the simple fact that both would be needed/useful is a clear hint of that. The whole thing I didn't like in the first place with environment-setup is the fact that it exports a mixed bag of somewhat random environment variables, and exposing both KERNELDIR and KERNEL_DIR clearly goes further into this direction in my opinion. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 22:00:27 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:00:27 +0100 Subject: [Buildroot] [PATCH] configs/wandboard: Update U-Boot and kernel In-Reply-To: <20240119170651.641923-1-festevam@gmail.com> References: <20240119170651.641923-1-festevam@gmail.com> Message-ID: <20240212230027.227104e1@windsurf> On Fri, 19 Jan 2024 14:06:51 -0300 Fabio Estevam wrote: > Update U-Boot to version 2024.01 and kernel to 6.6.12. > > In kernel 6.6 the arm32 i.MX device trees were placed into the > nxp/imx kernel directory, so adapt accordingly. > > Signed-off-by: Fabio Estevam > --- > configs/wandboard_defconfig | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 22:00:13 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:00:13 +0100 Subject: [Buildroot] [git commit] configs/wandboard: update U-Boot and kernel Message-ID: <20240212220035.E5F33878DC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b3404e90e7303a20e5d96a3fa2a29b197ea74847 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update U-Boot to version 2024.01 and kernel to 6.6.12. In kernel 6.6 the arm32 i.MX device trees were placed into the nxp/imx kernel directory, so adapt accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- configs/wandboard_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 0966719d48..522173b8ed 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -5,8 +5,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 5.13 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_13=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -23,7 +23,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="wandboard" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y @@ -32,10 +32,10 @@ BR2_TARGET_UBOOT_SPL_NAME="SPL" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1 imx6qp-wandboard-revd1" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-wandboard nxp/imx/imx6dl-wandboard nxp/imx/imx6q-wandboard-revb1 nxp/imx/imx6dl-wandboard-revb1 nxp/imx/imx6q-wandboard-revd1 nxp/imx/imx6dl-wandboard-revd1 nxp/imx/imx6qp-wandboard-revd1" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From thomas.petazzoni at bootlin.com Mon Feb 12 22:02:50 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:02:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/botan: disable neon with arm soft float In-Reply-To: <20240106132608.1264366-1-fontaine.fabrice@gmail.com> References: <20240106132608.1264366-1-fontaine.fabrice@gmail.com> Message-ID: <20240212230250.47533eb3@windsurf> On Sat, 6 Jan 2024 14:26:08 +0100 Fabrice Fontaine wrote: > Disable neon with soft float to fix the following build failure raised > at least since version 2.19.1: > > In file included from build/include/botan/internal/simd_32.h:27, > from src/lib/block/aes/aes_vperm/aes_vperm.cpp:15: > /home/thomas/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/10.4.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" > 31 | #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" > | ^~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/6b311e97484db2b0f8adbda140320d696713b1e0 > - http://autobuild.buildroot.org/results/c309940ea6db0845d8221fb51611d0254222c644 > > Signed-off-by: Fabrice Fontaine > --- > package/botan/botan.mk | 4 ++++ > 1 file changed, 4 insertions(+) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 22:02:42 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:02:42 +0100 Subject: [Buildroot] [git commit] package/botan: disable neon with arm soft float Message-ID: <20240212220300.80EB4878E1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=48c5053576334d9349180349e58240ea02753188 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Disable neon with soft float to fix the following build failure raised at least since version 2.19.1: In file included from build/include/botan/internal/simd_32.h:27, from src/lib/block/aes/aes_vperm/aes_vperm.cpp:15: /home/thomas/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-musleabi/10.4.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" 31 | #error "NEON intrinsics not available with the soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/6b311e97484db2b0f8adbda140320d696713b1e0 - http://autobuild.buildroot.org/results/c309940ea6db0845d8221fb51611d0254222c644 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/botan/botan.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index b933e99785..7c290f04ad 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -90,6 +90,10 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),) BOTAN_CONF_OPTS += --disable-neon endif +ifeq ($(BR2_SOFT_FLOAT),y) +BOTAN_CONF_OPTS += --disable-neon +endif + define BOTAN_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure.py $(BOTAN_CONF_OPTS)) endef From thomas.petazzoni at bootlin.com Mon Feb 12 22:04:10 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:04:10 +0100 Subject: [Buildroot] [git commit] package/rsync: fix openssl static build Message-ID: <20240212220420.98376878ED@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e889a1c9e983753dd0fa5062d3b9475a8cba6072 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following openssl static build raised since commit 80fa5672da85a110e60be0d2143e85f9e08a0f4a: /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/aarch64_be-buildroot-linux-uclibc/12.3.0/../../../../aarch64_be-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/aarch64_be-buildroot-linux-uclibc/sysroot/lib/../lib64/libcrypto.a(libcrypto-lib-c_zlib.o): in function `zlib_oneshot_expand_block': c_zlib.c:(.text+0xaec): undefined reference to `uncompress' Commit b9a062b354953f3fbfee702bb5b5007598299925 can also be reverted as pkg-config will also retrieve -latomic to avoid the following build failure: /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-1/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(threads_pthread.o): in function `CRYPTO_atomic_add': threads_pthread.c:(.text+0x208): undefined reference to `__atomic_is_lock_free' RSYNC_POST_CONFIGURE_HOOKS must be added to call reconfigure and avoid the following build failure after autoreconf: autoconf -o configure.sh autoheader && touch config.h.in configure.sh has CHANGED. config.h.in is unchanged. You may need to run: make reconfigure Fixes: - http://autobuild.buildroot.org/results/6c1636f7556e7370a4c9f6d02c63cf3e20dc985c - http://autobuild.buildroot.org/results/49abbaa1eab94b248bff434b40728065d687e278 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...TX_copy-in-crypto-lib-instead-of-MD5_Init.patch | 28 +++++++++++++ ...c-use-pkg-config-to-retrieve-openssl-depe.patch | 48 ++++++++++++++++++++++ package/rsync/rsync.mk | 12 ++++-- 3 files changed, 84 insertions(+), 4 deletions(-) diff --git a/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch b/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch new file mode 100644 index 0000000000..5381159968 --- /dev/null +++ b/package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch @@ -0,0 +1,28 @@ +From 556a2c5bc2f6244f140a96302d4df92cfc25af8b Mon Sep 17 00:00:00 2001 +From: Wayne Davison +Date: Tue, 25 Oct 2022 21:55:53 -0700 +Subject: [PATCH] Check for EVP_MD_CTX_copy in crypto lib instead of MD5_Init. + +Upstream: https://github.com/WayneD/rsync/commit/556a2c5bc2f6244f140a96302d4df92cfc25af8b +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a2c99558..ccad7f13 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -432,10 +432,10 @@ AH_TEMPLATE([USE_OPENSSL], + if test x"$enable_openssl" != x"no"; then + if test x"$ac_cv_header_openssl_md4_h" = x"yes" && test x"$ac_cv_header_openssl_md5_h" = x"yes"; then + AC_MSG_RESULT(yes) +- AC_SEARCH_LIBS(MD5_Init, crypto, ++ AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, + [AC_DEFINE(USE_OPENSSL) + enable_openssl=yes], +- [err_msg="$err_msg$nl- Failed to find MD5_Init function in openssl crypto lib."; ++ [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; + no_lib="$no_lib openssl"]) + else + AC_MSG_RESULT(no) diff --git a/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch b/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch new file mode 100644 index 0000000000..61fe4b0269 --- /dev/null +++ b/package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch @@ -0,0 +1,48 @@ +From 93865bad4c00e7d3c867965663fdb9a1a0448db8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 1 Jan 2023 16:53:23 +0100 +Subject: [PATCH] configure.ac: use pkg-config to retrieve openssl dependencies + +Use pkg-config to retrieve openssl dependencies such as -latomic and +avoids the following build failure when building statically on +architectures such as sparc: + +/home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-1/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(threads_pthread.o): in function `CRYPTO_atomic_add': +threads_pthread.c:(.text+0x208): undefined reference to `__atomic_is_lock_free' + +Fixes: + - http://autobuild.buildroot.org/results/49abbaa1eab94b248bff434b40728065d687e278 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/WayneD/rsync/pull/426 +--- + configure.ac | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ccad7f13..b9591866 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -432,11 +432,15 @@ AH_TEMPLATE([USE_OPENSSL], + if test x"$enable_openssl" != x"no"; then + if test x"$ac_cv_header_openssl_md4_h" = x"yes" && test x"$ac_cv_header_openssl_md5_h" = x"yes"; then + AC_MSG_RESULT(yes) +- AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, ++ PKG_CHECK_MODULES(LIBCRYPTO, libcrypto, + [AC_DEFINE(USE_OPENSSL) +- enable_openssl=yes], +- [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; +- no_lib="$no_lib openssl"]) ++ enable_openssl=yes ++ LIBS="$LIBS $LIBCRYPTO_LIBS"], ++ [AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto, ++ [AC_DEFINE(USE_OPENSSL) ++ enable_openssl=yes], ++ [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib."; ++ no_lib="$no_lib openssl"])]) + else + AC_MSG_RESULT(no) + err_msg="$err_msg$nl- Failed to find openssl/md4.h and openssl/md5.h for openssl crypto lib support." +-- +2.35.1 + diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 3fd2ef257e..b9d392c8cb 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -10,7 +10,9 @@ RSYNC_LICENSE = GPL-3.0+ with exceptions RSYNC_LICENSE_FILES = COPYING RSYNC_CPE_ID_VENDOR = samba RSYNC_SELINUX_MODULES = rsync -RSYNC_DEPENDENCIES = zlib popt +# We're patching configure.ac +RSYNC_AUTORECONF = YES +RSYNC_DEPENDENCIES = host-pkgconf zlib popt # We know that our C library is modern enough for C99 vsnprintf(). Since # configure can't detect this, we tell configure that vsnprintf() is safe. RSYNC_CONF_ENV = rsync_cv_HAVE_C99_VSNPRINTF=yes @@ -20,9 +22,11 @@ RSYNC_CONF_OPTS = \ --disable-roll-simd \ --disable-md5-asm -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -RSYNC_CONF_ENV += LIBS=-latomic -endif +# reconfigure must be run after autoreconf +define RSYNC_RUN_RECONFIGURE + cd $(@D) && PATH=$(BR_PATH) make reconfigure +endef +RSYNC_POST_CONFIGURE_HOOKS += RSYNC_RUN_RECONFIGURE ifeq ($(BR2_PACKAGE_ACL),y) RSYNC_DEPENDENCIES += acl From thomas.petazzoni at bootlin.com Mon Feb 12 22:04:22 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:04:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/rsync: fix openssl static build In-Reply-To: <20231229214418.9331-1-fontaine.fabrice@gmail.com> References: <20231229214418.9331-1-fontaine.fabrice@gmail.com> Message-ID: <20240212230422.5e1aff0b@windsurf> On Fri, 29 Dec 2023 22:44:18 +0100 Fabrice Fontaine wrote: > Fix the following openssl static build raised since commit > 80fa5672da85a110e60be0d2143e85f9e08a0f4a: > > /home/buildroot/autobuild/instance-0/output-1/host/lib/gcc/aarch64_be-buildroot-linux-uclibc/12.3.0/../../../../aarch64_be-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/aarch64_be-buildroot-linux-uclibc/sysroot/lib/../lib64/libcrypto.a(libcrypto-lib-c_zlib.o): in function `zlib_oneshot_expand_block': > c_zlib.c:(.text+0xaec): undefined reference to `uncompress' > > Commit b9a062b354953f3fbfee702bb5b5007598299925 can also be reverted as > pkg-config will also retrieve -latomic to avoid the following build > failure: > > /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-1/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(threads_pthread.o): in function `CRYPTO_atomic_add': > threads_pthread.c:(.text+0x208): undefined reference to `__atomic_is_lock_free' > > RSYNC_POST_CONFIGURE_HOOKS must be added to call reconfigure and avoid > the following build failure after autoreconf: > > autoconf -o configure.sh > autoheader && touch config.h.in > configure.sh has CHANGED. > config.h.in is unchanged. > You may need to run: > make reconfigure > > Fixes: > - http://autobuild.buildroot.org/results/6c1636f7556e7370a4c9f6d02c63cf3e20dc985c > - http://autobuild.buildroot.org/results/49abbaa1eab94b248bff434b40728065d687e278 > > Signed-off-by: Fabrice Fontaine > --- > ...py-in-crypto-lib-instead-of-MD5_Init.patch | 28 +++++++++++ > ...-pkg-config-to-retrieve-openssl-depe.patch | 48 +++++++++++++++++++ > package/rsync/rsync.mk | 12 +++-- > 3 files changed, 84 insertions(+), 4 deletions(-) > create mode 100644 package/rsync/0001-Check-for-EVP_MD_CTX_copy-in-crypto-lib-instead-of-MD5_Init.patch > create mode 100644 package/rsync/0002-configure.ac-use-pkg-config-to-retrieve-openssl-depe.patch Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From thomas.petazzoni at bootlin.com Mon Feb 12 22:07:21 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Mon, 12 Feb 2024 23:07:21 +0100 Subject: [Buildroot] [PATCH 3/3] packages/libcamera-apps: Fix build to use meson In-Reply-To: <20231227182429.1215185-3-mail@sebastianbauer.info> References: <20231227182429.1215185-1-mail@sebastianbauer.info> <20231227182429.1215185-3-mail@sebastianbauer.info> Message-ID: <20240212230721.4f97dae3@windsurf> Hello Sebastian, On Wed, 27 Dec 2023 19:24:29 +0100 Sebastian Bauer wrote: > Upstream uses meson instead of cmake since a while. > > Signed-off-by: Sebastian Bauer Thanks for your patch, and sorry for the slow feedback. Could you clarify why this you say "Fix build" in your commit title? Is there some build failure, or is this an improvement patch? > -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) > -LIBCAMERA_APPS_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic > -endif You're removing this chunk, but it was important. Do you have some evidence that it is no longer needed? It was added in f41d47f15b63a4bbe026834478e63acba85d33fe, as otherwise libcamera-apps would fail to build on the SPARC CPU architecture. See the commit log for a reference to an autobuilder failure. Thanks in advance for your feedback! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From james.hilliard1 at gmail.com Mon Feb 12 22:11:02 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 15:11:02 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-uvloop: add support for cython3 In-Reply-To: References: <20240209175631.1337370-1-james.hilliard1@gmail.com> <18bea399-dc8e-424b-b087-3823d0bd4545@bubu1.eu> Message-ID: On Mon, Feb 12, 2024 at 2:53?PM Arnout Vandecappelle wrote: > > > > On 12/02/2024 22:09, James Hilliard wrote: > > On Mon, Feb 12, 2024 at 12:50?PM Arnout Vandecappelle wrote: > >> > >> > >> > >> On 12/02/2024 01:51, James Hilliard wrote: > >>> On Sun, Feb 11, 2024 at 5:13?PM Marcus Hoffmann wrote: > >> [snip]>> In short: if we continue to use the sdists from pypi, cython is not a > >>>> real build dependency and we can just remove it from pyptoject.toml > >>>> instead of trying to provide the correct version that's never going to > >>>> be invoked. > >>> > >>> We can probably just pass --skip-dependency-check as a build arg or > >>> something like that I suppose. > >> > >> That skips _all_ dependency checks, and we usually want to check dependencies. > >> Unless the dependency check will require host packages for runtime dependencies? > >> But if that were the case we'd already have a lot of useless host-python-foo > >> packages I expect... > > > > Yeah, so runtime dependencies are basically not checked at all since we don't > > generally have buildroot target python packages which depend on other buildroot > > target python packages, they merely select their dependencies which allows for > > their dependencies to be built parallel but prevents any sort of target package > > dependency validation. > > > > I think that --skip-dependency-check flag just disables pep517 build dependency > > checks which would be those host-python-foo build dependencies that some have. > > Oh, and a missing build dependency (that is actually used) would actually > trigger a build error, so indeed it sounds like the pep517 build dependency > check is quite redundant. Probably a good idea to only use that flag for packages where we want to bypass a build dependency. > > Regards, > Arnout From ju.o at free.fr Mon Feb 12 22:17:30 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 12 Feb 2024 23:17:30 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add git runtime test Message-ID: <20240212221730.66390-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_git.py | 57 +++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 support/testing/tests/package/test_git.py diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..5a6fc11191 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1786,6 +1786,7 @@ F: support/testing/tests/package/test_fping.py F: support/testing/tests/package/test_gawk.py F: support/testing/tests/package/test_ghostscript.py F: support/testing/tests/package/test_ghostscript/ +F: support/testing/tests/package/test_git.py F: support/testing/tests/package/test_glslsandbox_player.py F: support/testing/tests/package/test_glslsandbox_player/ F: support/testing/tests/package/test_gnupg2.py diff --git a/support/testing/tests/package/test_git.py b/support/testing/tests/package/test_git.py new file mode 100644 index 0000000000..878c4c8092 --- /dev/null +++ b/support/testing/tests/package/test_git.py @@ -0,0 +1,57 @@ +import os + +import infra.basetest + + +class TestGit(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_GIT=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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("git --version") + + # Initialize some git global configuration. + git_cfg = [ + ("user.name", "Build Root"), + ("user.email", "build.root at localhost.localdomain"), + ("color.ui", "false"), + ("init.defaultBranch", "master"), + ("core.pager", "") + ] + for cfg_name, cfg_value in git_cfg: + cmd = f"git config --global {cfg_name} '{cfg_value}'" + self.assertRunOk(cmd) + + # Run a sequence of few git commands. + commands = [ + "mkdir workdir", + "cd workdir", + "git init", + "echo 'Hello World' > file.txt", + "git add file.txt", + "git commit -as -m 'Initial commit'", + "git checkout -b my_branch", + "sed -i 's/World/Buildroot/g' file.txt", + "git status", + "git commit -as -m 'Replace World by Buildroot'", + "git format-patch -M -n -s -o patches master", + "ls -al patches/*.patch", + "git checkout -b another_branch master", + "git am patches/*.patch", + "git diff --exit-code my_branch another_branch", + "git tag -a -m 'Tagged v1.0' v1.0", + "git log" + ] + for cmd in commands: + self.assertRunOk(cmd) -- 2.43.0 From james.hilliard1 at gmail.com Mon Feb 12 22:35:46 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 15:35:46 -0700 Subject: [Buildroot] [PATCH v7 1/4] package/python-poetry-core: new host package Message-ID: <20240212223549.3665464-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - update to 1.7.0 - drop patch which is now upstream --- package/python-poetry-core/python-poetry-core.hash | 5 +++++ package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-poetry-core/python-poetry-core.hash create mode 100644 package/python-poetry-core/python-poetry-core.mk diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash new file mode 100644 index 0000000000..c6b180c852 --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/poetry-core/json +md5 7461547cac0e0e9c8cd7463aa87e7470 poetry_core-1.7.0.tar.gz +sha256 8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74 poetry_core-1.7.0.tar.gz +# Locally computed sha256 checksums +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk new file mode 100644 index 0000000000..4ca587b11d --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-poetry-core +# +################################################################################ + +PYTHON_POETRY_CORE_VERSION = 1.7.0 +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/cb/1c/af7f886e723b2dfbaea9b8a739153f227b386dd856cf956f9fd0ed0a502b +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 +PYTHON_POETRY_CORE_LICENSE = MIT +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 22:35:47 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 15:35:47 -0700 Subject: [Buildroot] [PATCH v7 2/4] package/python-terminaltables: use correct pep517 build backend In-Reply-To: <20240212223549.3665464-1-james.hilliard1@gmail.com> References: <20240212223549.3665464-1-james.hilliard1@gmail.com> Message-ID: <20240212223549.3665464-2-james.hilliard1@gmail.com> We need to migrate python-terminaltables to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Upstream has merged a patch replacing poetry with poetry-core, however we can not backport this using a patch file due to CRLF line ending issues so we will have to apply the change in the patch using sed instead. See upstream commit: https://github.com/matthewdeanmartin/terminaltables/commit/9e3dda0efb54fee6934c744a13a7336d24c6e9e9 Signed-off-by: James Hilliard --- Changes v1 -> v2: - add more details regarding pep517 frontend compatibility --- package/python-terminaltables/python-terminaltables.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index b31ed332b6..385c71ae2d 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -7,8 +7,16 @@ PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 -PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools +PYTHON_TERMINALTABLES_SETUP_TYPE = pep517 PYTHON_TERMINALTABLES_LICENSE = MIT PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE +PYTHON_TERMINALTABLES_DEPENDENCIES = host-python-poetry-core + +# we can't use a normal patch file due to different line endings +define PYTHON_TERMINALTABLES_USE_POETRY_CORE + $(SED) 's/requires = \["poetry>=0.12"\]/requires = \["poetry-core>=1.0.0"\]/' $(@D)/pyproject.toml + $(SED) 's/build-backend = "poetry.masonry.api"/build-backend = "poetry.core.masonry.api"/' $(@D)/pyproject.toml +endef +PYTHON_TERMINALTABLES_POST_PATCH_HOOKS += PYTHON_TERMINALTABLES_USE_POETRY_CORE $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 22:35:48 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 15:35:48 -0700 Subject: [Buildroot] [PATCH v7 3/4] package/python-setuptools-rust: add host setuptools-scm dependency In-Reply-To: <20240212223549.3665464-1-james.hilliard1@gmail.com> References: <20240212223549.3665464-1-james.hilliard1@gmail.com> Message-ID: <20240212223549.3665464-3-james.hilliard1@gmail.com> We need host-python-setuptools-scm for python-setuptools-rust to build correctly when using a pep517 frontend. Fixes: * Getting build dependencies for wheel... running egg_info writing setuptools_rust.egg-info/PKG-INFO writing dependency_links to setuptools_rust.egg-info/dependency_links.txt writing entry points to setuptools_rust.egg-info/entry_points.txt writing requirements to setuptools_rust.egg-info/requires.txt writing top-level names to setuptools_rust.egg-info/top_level.txt reading manifest file 'setuptools_rust.egg-info/SOURCES.txt' reading manifest template 'MANIFEST.in' adding license file 'LICENSE' writing manifest file 'setuptools_rust.egg-info/SOURCES.txt' ERROR Missing dependencies: setuptools_scm Signed-off-by: James Hilliard --- package/python-setuptools-rust/python-setuptools-rust.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index f07263becf..e664a5604f 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -10,6 +10,9 @@ PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/f2/40/f1e9 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-semantic-version +HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + host-rustc \ + host-python-semantic-version \ + host-python-setuptools-scm $(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Mon Feb 12 22:35:49 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Mon, 12 Feb 2024 15:35:49 -0700 Subject: [Buildroot] [PATCH v7 4/4] package/pkg-python.mk: migrate setuptools to pep517 In-Reply-To: <20240212223549.3665464-1-james.hilliard1@gmail.com> References: <20240212223549.3665464-1-james.hilliard1@gmail.com> Message-ID: <20240212223549.3665464-4-james.hilliard1@gmail.com> Now that setuptools and its dependencies are using pep517 we can migrate the setuptools infrastructure itself to use the pep517 build frontend. As part of this we need to migrate the all python packages using _BUILD_OPTS to the new config settings format used by the pep517 build frontend. Use new setup type variables to define setup type specific dependencies instead of using the conditional block. We also need to set --skip-dependency-check for msgpack as it enforces cython3 as a requirement while not actually being required. Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov --- Changes v6 -> v7: - just disable dependency enforcement for msgpack - rebase Changes v5 -> v6: - use setup type variables for dependencies Changes v4 -> v5: - rebase on next Changes v1 -> v3: - rebase on master - combine setuptools-rust and maturin env variables - drop patch which is now upstream --- package/pkg-python.mk | 160 ++++++++++----------- package/python-evdev/python-evdev.mk | 4 +- package/python-lxml/python-lxml.mk | 8 +- package/python-m2crypto/python-m2crypto.mk | 4 +- package/python-msgpack/python-msgpack.mk | 1 + package/python-pillow/python-pillow.mk | 35 +++-- package/python-psycopg2/python-psycopg2.mk | 5 +- package/python-pyzmq/python-pyzmq.mk | 4 +- package/python-uvloop/python-uvloop.mk | 6 +- 9 files changed, 114 insertions(+), 113 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 94f28ff841..839f728e2f 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -52,15 +52,62 @@ HOST_PKG_PYTHON_ENV = \ PYTHONNOUSERSITE=1 \ $(HOST_CONFIGURE_OPTS) -# Target setuptools-based packages -PKG_PYTHON_SETUPTOOLS_ENV = \ +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ $(PKG_PYTHON_ENV) -PKG_PYTHON_SETUPTOOLS_CMD = \ - $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') +PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + +PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix + +PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +PKG_PYTHON_PEP517_DEPENDENCIES = \ + host-python-pypa-build \ + host-python-installer + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + $(HOST_PKG_PYTHON_ENV) + +HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + +HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + --interpreter=$(HOST_DIR)/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ + --data=$(HOST_DIR) + +# Target setuptools-based packages +PKG_PYTHON_SETUPTOOLS_ENV = \ + $(PKG_PYTHON_PEP517_ENV) PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) build + $(PKG_PYTHON_PEP517_BUILD_CMD) PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ @@ -69,30 +116,24 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --single-version-externally-managed PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install --no-compile \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(TARGET_DIR) + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(STAGING_DIR) + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + +PKG_PYTHON_SETUPTOOLS_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-setuptools # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - $(HOST_PKG_PYTHON_ENV) + $(HOST_PKG_PYTHON_PEP517_ENV) HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) build + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install \ - --prefix=$(HOST_DIR) \ - --root=/ \ - --single-version-externally-managed + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) # Target setuptools-rust-based packages PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ @@ -109,6 +150,10 @@ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_TARGET_CMD = \ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD) +PKG_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + $(PKG_PYTHON_SETUPTOOLS_DEPENDENCIES) \ + host-python-setuptools-rust + # Host setuptools-rust-based packages HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ @@ -121,52 +166,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ HOST_PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_CMD = \ $(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD) -# Target pep517-based packages -PKG_PYTHON_PEP517_ENV = \ - $(PKG_PYTHON_ENV) - -PKG_PYTHON_PEP517_BUILD_CMD = \ - -m build -n -w - -PKG_PYTHON_PEP517_INSTALL_OPTS = \ - --interpreter=/usr/bin/python \ - --script-kind=posix - -PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ - --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(TARGET_DIR)/usr/bin \ - --data=$(TARGET_DIR)/usr - -PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ - --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(STAGING_DIR)/usr/bin \ - --data=$(STAGING_DIR)/usr - -# Host pep517-based packages -HOST_PKG_PYTHON_PEP517_ENV = \ - $(HOST_PKG_PYTHON_ENV) - -HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ - -m build -n -w - -HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - --interpreter=$(HOST_DIR)/bin/python \ - --script-kind=posix \ - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/bin \ - --data=$(HOST_DIR) - # Target flit packages PKG_PYTHON_FLIT_ENV = \ $(PKG_PYTHON_PEP517_ENV) @@ -180,6 +179,10 @@ PKG_PYTHON_FLIT_INSTALL_TARGET_CMD = \ PKG_PYTHON_FLIT_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) +PKG_PYTHON_FLIT_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-flit-core + # Host flit packages HOST_PKG_PYTHON_FLIT_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) @@ -215,6 +218,10 @@ PKG_PYTHON_MATURIN_INSTALL_TARGET_CMD = \ PKG_PYTHON_MATURIN_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) +PKG_PYTHON_MATURIN_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-maturin + # Host maturin packages HOST_PKG_PYTHON_MATURIN_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) \ @@ -293,28 +300,17 @@ else $(2)_DEPENDENCIES += host-python3 endif # ($(4),target) -# Setuptools based packages will need setuptools for the host Python -# interpreter (both host and target). +# Setup type specific dependencies are the same whether we are +# building for the host or the target. # -ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-setuptools -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) -$(2)_DEPENDENCIES += host-python-setuptools-rust -endif -else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer -ifeq ($$($(2)_SETUP_TYPE),flit) -$(2)_DEPENDENCIES += host-python-flit-core -endif -ifeq ($$($(2)_SETUP_TYPE),maturin) -$(2)_DEPENDENCIES += host-python-maturin -endif -else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) # Don't add dependency on host-python-installer for # host-python-installer itself, and its dependencies. ifeq ($$(filter host-python-flit-core host-python-installer,$(1)),) $(2)_DEPENDENCIES += host-python-installer endif +else +$(2)_DEPENDENCIES += $$(PKG_PYTHON_$$($(2)_SETUP_TYPE_UPPER)_DEPENDENCIES) endif # Pyo3 based packages(setuptools-rust and maturin) will need rust diff --git a/package/python-evdev/python-evdev.mk b/package/python-evdev/python-evdev.mk index 5cf62b5160..b509b43e8a 100644 --- a/package/python-evdev/python-evdev.mk +++ b/package/python-evdev/python-evdev.mk @@ -12,7 +12,7 @@ PYTHON_EVDEV_LICENSE = Revised BSD License PYTHON_EVDEV_LICENSE_FILES = LICENSE PYTHON_EVDEV_BUILD_OPTS = \ - build_ecodes \ - --evdev-headers $(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h + -C--build-option=build_ecodes \ + -C--build-option=--evdev-headers=$(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h $(eval $(python-package)) diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 519a9a77ac..3222234780 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -28,11 +28,11 @@ HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib # python-lxml needs these scripts in order to properly detect libxml2 and # libxslt compiler and linker flags PYTHON_LXML_BUILD_OPTS = \ - --xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ - --xml2-config=$(STAGING_DIR)/usr/bin/xml2-config + -C--build-option=--xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ + -C--build-option=--xml2-config=$(STAGING_DIR)/usr/bin/xml2-config HOST_PYTHON_LXML_BUILD_OPTS = \ - --xslt-config=$(HOST_DIR)/bin/xslt-config \ - --xml2-config=$(HOST_DIR)/bin/xml2-config + -C--build-option=--xslt-config=$(HOST_DIR)/bin/xslt-config \ + -C--build-option=--xml2-config=$(HOST_DIR)/bin/xml2-config $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 69a0c28df5..6c07f42d06 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -13,6 +13,8 @@ PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE PYTHON_M2CRYPTO_CPE_ID_VENDOR = m2crypto_project PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig -PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +PYTHON_M2CRYPTO_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--openssl=$(STAGING_DIR)/usr $(eval $(python-package)) diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index 3ee7c54ce1..9cdf5263de 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -10,6 +10,7 @@ PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/c2/d5/5662032db157 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools +PYTHON_MSGPACK_BUILD_OPTS = --skip-dependency-check # When set in the environment, whatever the value, MSGPACK_PUREPYTHON drives # using the pure python implementation rather than rely on the C++ native code. diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 10939d8467..7f5b4dd0f9 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -14,61 +14,60 @@ PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools PYTHON_PILLOW_DEPENDENCIES = host-pkgconf -PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing -PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) +PYTHON_PILLOW_BUILD_OPTS = -C--build-option=build_ext -C--build-option=--disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype -PYTHON_PILLOW_BUILD_OPTS += --enable-freetype +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-freetype else -PYTHON_PILLOW_BUILD_OPTS += --disable-freetype +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-freetype endif ifeq ($(BR2_PACKAGE_JPEG),y) PYTHON_PILLOW_DEPENDENCIES += jpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg endif ifeq ($(BR2_PACKAGE_LCMS2),y) PYTHON_PILLOW_DEPENDENCIES += lcms2 -PYTHON_PILLOW_BUILD_OPTS += --enable-lcms +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-lcms else -PYTHON_PILLOW_BUILD_OPTS += --disable-lcms +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-lcms endif ifeq ($(BR2_PACKAGE_LIBXCB),y) PYTHON_PILLOW_DEPENDENCIES += libxcb -PYTHON_PILLOW_BUILD_OPTS += --enable-xcb +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-xcb else -PYTHON_PILLOW_BUILD_OPTS += --disable-xcb +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-xcb endif ifeq ($(BR2_PACKAGE_OPENJPEG),y) PYTHON_PILLOW_DEPENDENCIES += openjpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg2000 else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg2000 endif ifeq ($(BR2_PACKAGE_TIFF),y) PYTHON_PILLOW_DEPENDENCIES += tiff -PYTHON_PILLOW_BUILD_OPTS += --enable-tiff +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-tiff else -PYTHON_PILLOW_BUILD_OPTS += --disable-tiff +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-tiff endif ifeq ($(BR2_PACKAGE_WEBP),y) PYTHON_PILLOW_DEPENDENCIES += webp -PYTHON_PILLOW_BUILD_OPTS += --enable-webp +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webp ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) -PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webpmux else -PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webpmux endif else -PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webp -C--build-option=--disable-webpmux endif $(eval $(python-package)) diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk index 0149b8d185..1b33b7505d 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -13,7 +13,8 @@ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE PYTHON_PSYCOPG2_DEPENDENCIES = postgresql # Force psycopg2 to use the Buildroot provided postgresql version # instead of the one from the host machine -PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config -PYTHON_PSYCOPG2_INSTALL_TARGET_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config +PYTHON_PSYCOPG2_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--pg-config=$(STAGING_DIR)/usr/bin/pg_config $(eval $(python-package)) diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index 1d9a7d01cb..db3370f9a1 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -11,7 +11,7 @@ PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD PYTHON_PYZMQ_SETUP_TYPE = setuptools -PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr +PYTHON_PYZMQ_BUILD_OPTS = -C--build-option=--zmq=$(STAGING_DIR)/usr PYTHON_PYZMQ_DEPENDENCIES = \ host-python-packaging \ host-python-setuptools-scm \ @@ -26,7 +26,7 @@ endef PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y) -PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts +PYTHON_PYZMQ_BUILD_OPTS += -C--build-option=--enable-drafts endif $(eval $(python-package)) diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk index 285884a2bb..70508fb6de 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -10,8 +10,10 @@ PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/9c/16/728cc5dde368e PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace --use-system-libuv PYTHON_UVLOOP_DEPENDENCIES = libuv +PYTHON_UVLOOP_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--inplace \ + -C--build-option=--use-system-libuv $(eval $(python-package)) -- 2.34.1 From vfazio at xes-inc.com Mon Feb 12 23:50:27 2024 From: vfazio at xes-inc.com (Vincent Fazio) Date: Mon, 12 Feb 2024 23:50:27 +0000 Subject: [Buildroot] [External] - Re: [git commit] package/python3: bump version to 3.12.1 In-Reply-To: References: <20240206222231.8950D87481@busybox.osuosl.org> <20240212005226.GB2106578@igalia.com> Message-ID: All, > -----Original Message----- > From: buildroot On Behalf Of Vincent > Fazio > Sent: Monday, February 12, 2024 7:46 AM > To: Adrian Perez de Castro ; James Hilliard > > Cc: Bernd Kuhls ; buildroot at uclibc.org > Subject: Re: [Buildroot] [External] - Re: [git commit] package/python3: bump > version to 3.12.1 > > All > > > -----Original Message----- > > From: buildroot On Behalf Of Adrian > > Perez de Castro > > Sent: Sunday, February 11, 2024 4:52 PM > > To: James Hilliard > > Cc: Bernd Kuhls ; buildroot at uclibc.org > > Subject: [External] - Re: [Buildroot] [git commit] package/python3: > > bump version to 3.12.1 > > > > Hi, > > > > On Sun, 11 Feb 2024 14:20:31 -0700 James Hilliard > > wrote: > > > On Fri, Feb 9, 2024 at 9:11?AM Bernd Kuhls wrote: > > > > > > > > Am Thu, 8 Feb 2024 21:14:52 -0500 schrieb James Knight: > > > > > > > > > import math > > > > > ImportError: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.38' > > > > > not found (required by > > > > > /builds/buildroot/output/build/python3-3.12.1/build/lib.linux- > > > > x86_64-3.12/math.cpython-312-x86_64-linux-gnu.so) > > > > > > > > Hi James, > > > > > > > > same here on Debian 12.4/bookworm, try this patch: > > > > https://github.com/bkuhls/buildroot/commit/ > > > > dca8b5bee7742ffedf81a027affadd4b7e18fc3f > > This certainly avoids the issue by not running the problematic check. I am a > little concerned about the root cause. > > I haven't had a chance to test 3.11, but from the debugging I did on Friday, I > know that when the host python is executed to check the built modules for > the foreign python, because PYTHONPATH includes the path to the foreign > "builtin" libraries and because they are the same architecture, those libraries > get used instead of the ones from the host's build. So the host python > attempts to load and execute libraries that may have been built for a > different libc. I found simply dropping the foreign python's path from > PYTHONPATH caused the script to execute fine, but I don't know the full > ramifications for dropping that path as part of PYTHON_FOR_BUILD which is > used in the body of this problematic make target and a few others. > I ended up writing an issue in CPython https://github.com/python/cpython/issues/115382 Dropping this make target is probably fine in the interim or we can try dropping the PYTHONPATH for the target directory but without feedback from maintainers I'm not sure what all that would impact. Tangentially related as I was digging into this, 3.13 looks slated to disable uClibc so something to keep on our radar https://github.com/python/cpython/blame/main/Misc/platform_triplet.c#L24 > > > > > > Yeah, this fixes the issue for me as well. > > > > Same here on Arch, I needed to apply the commit to get host-python3 > built. > > > > Cheers, > > ?Adri?n > > CAUTION: This email originated from outside of the organization. Do > > not click links or open attachments unless you recognize the sender > > and know the content is safe. > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From kadambini.nema at gmail.com Tue Feb 13 02:04:20 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 12 Feb 2024 18:04:20 -0800 Subject: [Buildroot] [PATCH 1/1] package/xz: bump version to 5.4.6 Message-ID: <20240213020420.1339668-1-kadambini.nema@gmail.com> Change Log - https://github.com/tukaani-project/xz/commit/0ef8192e8d5af4e6200d5d4aee22d1f177f7a2df Updated hash of the COPYING. Signed-off-by: Kadambini Nema --- package/xz/xz.hash | 6 +++--- package/xz/xz.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3d93ad6b5e..e8025a8065 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,9 +1,9 @@ # Locally calculated after checking pgp signature -# https://tukaani.org/xz/xz-5.4.5.tar.bz2.sig -sha256 8ccf5fff868c006f29522e386fb4c6a1b66463fbca65a4cfc3c4bd596e895e79 xz-5.4.5.tar.bz2 +# https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.bz2.sig +sha256 913851b274e8e1d31781ec949f1c23e8dbcf0ecf6e73a2436dc21769dd3e6f49 xz-5.4.6.tar.bz2 # Hash for license files -sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING +sha256 29a1e305b2e34eefe5d4602d00cde1d528b71c5d9f2eec5106972cf6ddb6f73f COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING.GPLv3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 547959c743..40fa59ca7c 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,9 +4,9 @@ # ################################################################################ -XZ_VERSION = 5.4.5 +XZ_VERSION = 5.4.6 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 -XZ_SITE = https://tukaani.org/xz +XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ -- 2.25.1 From kadambini.nema at gmail.com Tue Feb 13 02:17:44 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 12 Feb 2024 18:17:44 -0800 Subject: [Buildroot] [PATCH 1/1] package/zlib-ng: bump version to 2.1.6 Message-ID: <20240213021745.1350798-1-kadambini.nema@gmail.com> Signed-off-by: Kadambini Nema --- package/zlib-ng/zlib-ng.hash | 2 +- package/zlib-ng/zlib-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index a2fe98435c..908164aa60 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d20e55f89d71991c59f1c5ad1ef944815e5850526c0d9cd8e504eaed5b24491a zlib-ng-2.1.3.tar.gz +sha256 a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2 zlib-ng-2.1.6.tar.gz sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index fbb906503a..2fb6ea763f 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLIB_NG_VERSION = 2.1.3 +ZLIB_NG_VERSION = 2.1.6 ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md -- 2.25.1 From kadambini.nema at gmail.com Tue Feb 13 04:42:19 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 12 Feb 2024 20:42:19 -0800 Subject: [Buildroot] [PATCH 1/1] package/hwdata: bump version to 0.379 Message-ID: <20240213044219.1368954-1-kadambini.nema@gmail.com> Signed-off-by: Kadambini Nema --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 6915e04e46..92b7eaab6d 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0db28dc635d5059ad23d068d2e56ef5dc540f95bc813ea5a3c0f5d63b03d20d6 hwdata-0.373.tar.gz +sha256 b98ef646d530d5fd3afa3180efbf7c8e22d3da0088f5836f41ee25380d87b092 hwdata-0.379.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 025f5b4969..555fb58f14 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.373 +HWDATA_VERSION = 0.379 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE -- 2.25.1 From kadambini.nema at gmail.com Tue Feb 13 05:01:06 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 12 Feb 2024 21:01:06 -0800 Subject: [Buildroot] [PATCH 1/1] board/freescale: Fix check-package warning Message-ID: <20240213050106.1371689-1-kadambini.nema@gmail.com> $ utils/docker-run make check-package board/freescale/imx93evk/patches/linux-headers/linux-headers.hash:3: empty line at end of file board/freescale/imx93evk/patches/linux/linux.hash:3: empty line at end of file 402624 lines processed 2 warnings generated make: *** [Makefile:1248: check-package] Error 1 Signed-off-by: Kadambini Nema --- board/freescale/imx93evk/patches/linux/linux.hash | 1 - 1 file changed, 1 deletion(-) diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash index 5687ec7343..715a590825 100644 --- a/board/freescale/imx93evk/patches/linux/linux.hash +++ b/board/freescale/imx93evk/patches/linux/linux.hash @@ -1,3 +1,2 @@ # Locally calculated sha256 eb94414f952444289c0af8ad82afa0dc2d07e08f9000ccd2cc39f11da5b494ea linux-imx-lf-6.1.55-2.2.0.tar.gz - -- 2.25.1 From arnout at mind.be Tue Feb 13 08:23:17 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Tue, 13 Feb 2024 09:23:17 +0100 Subject: [Buildroot] [PATCH v2] package/environment-setup: add variable KERNEL_DIR alongside KERNELDIR In-Reply-To: <20240212225953.79488771@windsurf> References: <20240131-kernel_dir-v2-1-555eeeee1722@microchip.com> <20240212225953.79488771@windsurf> Message-ID: On 12/02/2024 22:59, Thomas Petazzoni wrote: > Hello Nayab, > > On Wed, 31 Jan 2024 23:48:28 +0530 > Nayab Sayed via buildroot wrote: > >> Update host environment setup helper script to incorporate the variable >> KENREL_DIR alongside the existing KERNELDIR. This adjustment ensures >> consistency, as some projects utilize KERNELDIR while others use KERNEL_DIR. >> >> Signed-off-by: Nayab Sayed > > Thanks for this new iteration, but on my side, I'm tempted to reject > this patch, and actually to remove the support for KERNELDIR as well. > > Indeed, even Angelo, who added the environment-setup script was not > able to provide a solid reason for exporting KERNELDIR in the first > place. I don't think there is any standard, or somewhat standard > variable to point to the Linux kernel source directory. > > I'm fine with environment-setup exposing CC, LD, CFLAGS, LDFLAGS, or > even CROSS_COMPILE as these are reasonably standardized by various > build systems. But KERNELDIR or KERNEL_DIR are not, and the simple fact > that both would be needed/useful is a clear hint of that. The whole > thing I didn't like in the first place with environment-setup is the > fact that it exports a mixed bag of somewhat random environment > variables, and exposing both KERNELDIR and KERNEL_DIR clearly goes > further into this direction in my opinion. Well, without an exported KERNELDIR, it will be very hard to build kernel modules outside of buildroot (and the whole point of this environment-setup thing is to make it easier to build stuff outside of buildroot). Indeed, output/build/linux-* will match stuff like linux-pam as well. That said, I agree that exporting both KERNELDIR and KERNEL_DIR sounds a bit over the top. Regards, Arnout From buildroot at bubu1.eu Tue Feb 13 09:40:15 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 10:40:15 +0100 Subject: [Buildroot] [PATCH v2] package/python-jc: new package Message-ID: <20240213094015.2203982-1-buildroot@bubu1.eu> All dependencies are optional, and thus only mentioned in the package help text. Signed-off-by: Marcus Hoffmann --- Changes v1 -> v2: - update to 1.25.1 - xmltodict and python xml module are now optional dependencies - rename test class to conform to naming scheme --- package/Config.in | 1 + package/python-jc/Config.in | 12 ++++++++++ package/python-jc/python-jc.hash | 5 +++++ package/python-jc/python-jc.mk | 14 ++++++++++++ .../testing/tests/package/test_python_jc.py | 22 +++++++++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 package/python-jc/Config.in create mode 100644 package/python-jc/python-jc.hash create mode 100644 package/python-jc/python-jc.mk create mode 100644 support/testing/tests/package/test_python_jc.py diff --git a/package/Config.in b/package/Config.in index 91a6f1de00..7f4d0740ac 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1151,6 +1151,7 @@ menu "External python modules" source "package/python-janus/Config.in" source "package/python-jaraco-classes/Config.in" source "package/python-jaraco-functools/Config.in" + source "package/python-jc/Config.in" source "package/python-jedi/Config.in" source "package/python-jeepney/Config.in" source "package/python-jinja2/Config.in" diff --git a/package/python-jc/Config.in b/package/python-jc/Config.in new file mode 100644 index 0000000000..b88150e069 --- /dev/null +++ b/package/python-jc/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_JC + bool "python-jc" + help + Converts the output of popular command-line tools and file- + types to JSON. + + Optionally requires python-pygments for syntax highlighting, + python-ruamel-yaml for yaml parsing and output and + python-xmltodict for xml parsing. PYTHON3_PYEXPAT is required + for xml and plist parsers. + + https://github.com/kellyjonbrazil/jc diff --git a/package/python-jc/python-jc.hash b/package/python-jc/python-jc.hash new file mode 100644 index 0000000000..f54e69eaeb --- /dev/null +++ b/package/python-jc/python-jc.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jc/json +md5 80e4c7d46ec856255577c6b364e7f931 jc-1.25.1.tar.gz +sha256 683352e903ece9a86eae0c3232188e40178139e710c740a466ef91ed87c4cc7e jc-1.25.1.tar.gz +# Locally computed sha256 checksums +sha256 6493f2db400f4166ca0956cf192a41aa092bd1396ff463e7fdaf51f257c10497 LICENSE.md diff --git a/package/python-jc/python-jc.mk b/package/python-jc/python-jc.mk new file mode 100644 index 0000000000..bb5bd426ec --- /dev/null +++ b/package/python-jc/python-jc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jc +# +################################################################################ + +PYTHON_JC_VERSION = 1.25.1 +PYTHON_JC_SOURCE = jc-$(PYTHON_JC_VERSION).tar.gz +PYTHON_JC_SITE = https://files.pythonhosted.org/packages/53/a6/065f0796a0a21bc040bc88c8a33410c12729a2a6f4c269d0349f685796da +PYTHON_JC_SETUP_TYPE = setuptools +PYTHON_JC_LICENSE = MIT +PYTHON_JC_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_jc.py b/support/testing/tests/package/test_python_jc.py new file mode 100644 index 0000000000..974ce0c4b0 --- /dev/null +++ b/support/testing/tests/package/test_python_jc.py @@ -0,0 +1,22 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Jc(TestPythonPackageBase): + __test__ = True + # We deliberately run the test without the optional dependencies, + # as this configuration is less tested upstream. + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_JC=y + """ + timeout = 60 + + def test_run(self): + self.login() + cmd = "jc -h > /dev/null 2>&1" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc id | grep -q root" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc env | grep -q PATH" + self.assertRunOk(cmd, self.timeout) -- 2.34.1 From sebastien.szymanski at armadeus.com Tue Feb 13 10:09:48 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?q?S=C3=A9bastien=20Szymanski?=) Date: Tue, 13 Feb 2024 11:09:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/freescale-imx/firmware-ele-imx: fix dependency comment condition Message-ID: <20240213100948.5264-1-sebastien.szymanski@armadeus.com> The dependency comment must be shown when the platform has no ELE and not when the platform has no VPU. Fixes: 69d127fe29dc ("package/freescale-imx/firmware-ele-imx: new package") Signed-off-by: S?bastien Szymanski --- package/freescale-imx/firmware-ele-imx/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in index 241ad3942d65..a99cbc3392c2 100644 --- a/package/freescale-imx/firmware-ele-imx/Config.in +++ b/package/freescale-imx/firmware-ele-imx/Config.in @@ -1,5 +1,5 @@ comment "firmware-ele-imx needs an i.MX platform with EdgeLock Secure Enclave" - depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_ELE config BR2_PACKAGE_FIRMWARE_ELE_IMX bool "firmware-ele-imx" -- 2.43.0 From buildroot at bubu1.eu Tue Feb 13 10:58:40 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 11:58:40 +0100 Subject: [Buildroot] [PATCH] package/rauc: bump to 1.11.1 Message-ID: <20240213105841.2410425-1-buildroot@bubu1.eu> This fixes an incompatibility with openssl 3.2 when using codesign certificate purpose [1]. [1] https://github.com/rauc/rauc/releases/tag/v1.11.1 Signed-off-by: Marcus Hoffmann --- package/rauc/rauc.hash | 2 +- package/rauc/rauc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 8de309f8c7..63aa4715e0 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a28f415c580390dd9e65016a5d90a63ee1cfd7e1b3e864cbb13cb3ac3513391f rauc-1.11.tar.xz +sha256 391d13d709abb630c459e79e62e474e68224c5d07c816355784bba75a86a2507 rauc-1.11.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index aff5ead281..fbdea4e235 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.11 +RAUC_VERSION = 1.11.1 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 -- 2.34.1 From buildroot at bubu1.eu Tue Feb 13 11:49:31 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 12:49:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/tio: install bash-completions Message-ID: <20240213114933.2444440-1-buildroot@bubu1.eu> See meson_options.txt file [1]. [1] https://github.com/tio/tio/blob/master/meson_options.txt Signed-off-by: Marcus Hoffmann --- package/tio/tio.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/tio/tio.mk b/package/tio/tio.mk index d7b554ee84..a7d3537850 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -10,5 +10,10 @@ TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ TIO_LICENSE_FILES = LICENSE TIO_DEPENDENCIES = inih +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +TIO_CONF_OPTS +=-Dbashcompletiondir=/usr/share/bash-completion/completions/ +else +TIO_CONF_OPTS +=-Dbashcompletiondir=no +endif $(eval $(meson-package)) -- 2.34.1 From buildroot at bubu1.eu Tue Feb 13 11:49:32 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 12:49:32 +0100 Subject: [Buildroot] [PATCH 2/2] package/tio: disable installing man page In-Reply-To: <20240213114933.2444440-1-buildroot@bubu1.eu> References: <20240213114933.2444440-1-buildroot@bubu1.eu> Message-ID: <20240213114933.2444440-2-buildroot@bubu1.eu> Remove the man subdir from inclusion in the main meson.build file. Reported upstream to get an option to disable this properly: https://github.com/tio/tio/issues/222 Signed-off-by: Marcus Hoffmann --- package/tio/tio.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/tio/tio.mk b/package/tio/tio.mk index a7d3537850..66ce69db2f 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -16,4 +16,10 @@ else TIO_CONF_OPTS +=-Dbashcompletiondir=no endif +define TIO_DISABLE_BUILDING_MAN_PAGE + sed -i -e "/subdir('man')/d" $(@D)/meson.build +endef + +TIO_POST_PATCH_HOOKS += TIO_DISABLE_BUILDING_MAN_PAGE + $(eval $(meson-package)) -- 2.34.1 From buildroot at bubu1.eu Tue Feb 13 12:04:51 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 13:04:51 +0100 Subject: [Buildroot] [PATCH] package/nethogs: new package Message-ID: <20240213120452.2465425-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/nethogs/Config.in | 10 ++++++++++ package/nethogs/nethogs.hash | 3 +++ package/nethogs/nethogs.mk | 21 +++++++++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 package/nethogs/Config.in create mode 100644 package/nethogs/nethogs.hash create mode 100644 package/nethogs/nethogs.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..2d352dd8cc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2476,6 +2476,7 @@ endif source "package/ndisc6/Config.in" source "package/net-tools/Config.in" source "package/netatalk/Config.in" + source "package/nethogs/Config.in" source "package/netcalc/Config.in" source "package/netcat/Config.in" source "package/netcat-openbsd/Config.in" diff --git a/package/nethogs/Config.in b/package/nethogs/Config.in new file mode 100644 index 0000000000..2d6b44739c --- /dev/null +++ b/package/nethogs/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_NETHOGS + bool "nethogs" + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_NCURSES + help + NetHogs is a small 'net top' tool. Instead of breaking the + traffic down per protocol or per subnet, like most tools + do, it groups bandwidth by process. + + https://github.com/raboof/nethogs diff --git a/package/nethogs/nethogs.hash b/package/nethogs/nethogs.hash new file mode 100644 index 0000000000..fd1f236250 --- /dev/null +++ b/package/nethogs/nethogs.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 957d6afcc220dfbba44c819162f44818051c5b4fb793c47ba98294393986617d nethogs-0.8.7.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nethogs/nethogs.mk b/package/nethogs/nethogs.mk new file mode 100644 index 0000000000..69dabda191 --- /dev/null +++ b/package/nethogs/nethogs.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# nethogs +# +################################################################################ + +NETHOGS_VERSION = 0.8.7 +NETHOGS_SITE = $(call github,raboof,nethogs,v$(NETHOGS_VERSION)) +NETHOGS_LICENSE = GPL-2.0 +NETHOGS_LICENSE_FILES = COPYING +NETHOGS_DEPENDENCIES = libpcap ncurses + +define NETHOGS_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) nethogs +endef + +define NETHOGS_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/src/nethogs $(TARGET_DIR)/usr/sbin +endef + +$(eval $(generic-package)) -- 2.34.1 From sen at hastings.org Tue Feb 13 12:07:14 2024 From: sen at hastings.org (Sen Hastings) Date: Tue, 13 Feb 2024 12:07:14 +0000 Subject: [Buildroot] [PATCH 1/1] support/scripts/pkg-stats: make current version cell scrollable Message-ID: <20240213120714.393026-1-sen@hastings.org> *Resubmitted to mailing list because I messed up the subject line.* I realized that instead of truncating the version number, we could simply make the cell horizontally scrollable. This of course allows us to have a fixed cell width, while preserving the full version number. A demo is available here: https://sen-h.codeberg.page/pkg-stats-demos/@pages/make-current-version-cell-scrollable.html Signed-off-by: Sen Hastings --- support/scripts/pkg-stats | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7835cb3d62..9307992d29 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -845,6 +845,13 @@ function expandField(fieldId){ .centered { text-align: center; } + + .current_version { + overflow: scroll; + width: 21ch; + padding: 10px 2px 10px 2px; + } + .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { background: #d2ffc4; } @@ -964,10 +971,7 @@ def dump_html_pkg(f, pkg): # Current version data_field_id = f'current_version__{pkg_css_class}' - if len(pkg.current_version) > 20: - current_version = pkg.current_version[:20] + "..." - else: - current_version = pkg.current_version + current_version = pkg.current_version f.write(f'
    {current_version}
    \n') -- 2.25.1 From buildroot at bubu1.eu Tue Feb 13 12:09:59 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 13:09:59 +0100 Subject: [Buildroot] [PATCH] package/nethogs: new package In-Reply-To: <20240213120452.2465425-1-buildroot@bubu1.eu> References: <20240213120452.2465425-1-buildroot@bubu1.eu> Message-ID: <5b2f5482-d1e5-481f-80a1-ddce036c84d4@bubu1.eu> On 13.02.24 13:04, Marcus Hoffmann via buildroot wrote: > Signed-off-by: Marcus Hoffmann > --- > package/Config.in | 1 + > package/nethogs/Config.in | 10 ++++++++++ > package/nethogs/nethogs.hash | 3 +++ > package/nethogs/nethogs.mk | 21 +++++++++++++++++++++ > 4 files changed, 35 insertions(+) > create mode 100644 package/nethogs/Config.in > create mode 100644 package/nethogs/nethogs.hash > create mode 100644 package/nethogs/nethogs.mk > > diff --git a/package/Config.in b/package/Config.in > index bf0fe078b9..2d352dd8cc 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -2476,6 +2476,7 @@ endif > source "package/ndisc6/Config.in" > source "package/net-tools/Config.in" > source "package/netatalk/Config.in" > + source "package/nethogs/Config.in" Oops, that is not quite alphabetically sorted here... > source "package/netcalc/Config.in" > source "package/netcat/Config.in" > source "package/netcat-openbsd/Config.in" > diff --git a/package/nethogs/Config.in b/package/nethogs/Config.in > new file mode 100644 > index 0000000000..2d6b44739c > --- /dev/null > +++ b/package/nethogs/Config.in > @@ -0,0 +1,10 @@ > +config BR2_PACKAGE_NETHOGS > + bool "nethogs" > + select BR2_PACKAGE_LIBPCAP > + select BR2_PACKAGE_NCURSES > + help > + NetHogs is a small 'net top' tool. Instead of breaking the > + traffic down per protocol or per subnet, like most tools > + do, it groups bandwidth by process. > + > + https://github.com/raboof/nethogs > diff --git a/package/nethogs/nethogs.hash b/package/nethogs/nethogs.hash > new file mode 100644 > index 0000000000..fd1f236250 > --- /dev/null > +++ b/package/nethogs/nethogs.hash > @@ -0,0 +1,3 @@ > +# Locally computed > +sha256 957d6afcc220dfbba44c819162f44818051c5b4fb793c47ba98294393986617d nethogs-0.8.7.tar.gz > +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > diff --git a/package/nethogs/nethogs.mk b/package/nethogs/nethogs.mk > new file mode 100644 > index 0000000000..69dabda191 > --- /dev/null > +++ b/package/nethogs/nethogs.mk > @@ -0,0 +1,21 @@ > +################################################################################ > +# > +# nethogs > +# > +################################################################################ > + > +NETHOGS_VERSION = 0.8.7 > +NETHOGS_SITE = $(call github,raboof,nethogs,v$(NETHOGS_VERSION)) > +NETHOGS_LICENSE = GPL-2.0 > +NETHOGS_LICENSE_FILES = COPYING > +NETHOGS_DEPENDENCIES = libpcap ncurses > + > +define NETHOGS_BUILD_CMDS > + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) nethogs > +endef > + > +define NETHOGS_INSTALL_TARGET_CMDS > + $(INSTALL) -D -m 0755 $(@D)/src/nethogs $(TARGET_DIR)/usr/sbin > +endef > + > +$(eval $(generic-package)) From sen at hastings.org Tue Feb 13 11:59:14 2024 From: sen at hastings.org (Sen Hastings) Date: Tue, 13 Feb 2024 11:59:14 +0000 Subject: [Buildroot] [PATCH 1/1] make current version cell scrollable Message-ID: <20240213115914.392552-1-sen@hastings.org> I realized that instead of truncating the version number, we could simply make the cell horizontally scrollable. This of course allows us to have a fixed cell width, while preserving the full version number. A demo is available here: https://sen-h.codeberg.page/pkg-stats-demos/@pages/make-current-version-cell-scrollable.html Signed-off-by: Sen Hastings --- support/scripts/pkg-stats | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7835cb3d62..9307992d29 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -845,6 +845,13 @@ function expandField(fieldId){ .centered { text-align: center; } + + .current_version { + overflow: scroll; + width: 21ch; + padding: 10px 2px 10px 2px; + } + .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { background: #d2ffc4; } @@ -964,10 +971,7 @@ def dump_html_pkg(f, pkg): # Current version data_field_id = f'current_version__{pkg_css_class}' - if len(pkg.current_version) > 20: - current_version = pkg.current_version[:20] + "..." - else: - current_version = pkg.current_version + current_version = pkg.current_version f.write(f'
    {current_version}
    \n') -- 2.25.1 From buildroot at bubu1.eu Tue Feb 13 12:37:52 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 13:37:52 +0100 Subject: [Buildroot] [PATCH 1/2] package/python-can/Config.in: sort selects Message-ID: <20240213123753.2471309-1-buildroot@bubu1.eu> Sort python builtin modules before external python libs. Signed-off-by: Marcus Hoffmann --- package/python-can/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index a00c9263cf..61955a2b00 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" select BR2_PACKAGE_PYTHON3_SQLITE # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime - select BR2_PACKAGE_PYTHON3_ZLIB help This module provides controller area network support for Python. -- 2.34.1 From buildroot at bubu1.eu Tue Feb 13 12:37:53 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 13:37:53 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-can: needs PYTHON3_CURSES In-Reply-To: <20240213123753.2471309-1-buildroot@bubu1.eu> References: <20240213123753.2471309-1-buildroot@bubu1.eu> Message-ID: <20240213123753.2471309-2-buildroot@bubu1.eu> The can.viewer tool requires curses support. [1] [1] https://github.com/hardbyte/python-can/blob/v4.3.1/can/viewer.py#L44-L53 Signed-off-by: Marcus Hoffmann --- package/python-can/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 61955a2b00..106da4560c 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" + select BR2_PACKAGE_PYTHON3_CURSES # runtime for can.viewer tool select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime -- 2.34.1 From ju.o at free.fr Tue Feb 13 13:04:44 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 13 Feb 2024 14:04:44 +0100 Subject: [Buildroot] [PATCH 1/1] board/freescale: imx9-bootloader-prepare.sh: fix script Message-ID: <20240213130444.12586-1-ju.o@free.fr> Commit c05f27c "configs/freescale_imx93evk: new defconfig", when applied, added few ShellCheck fixups on top of the orginial submission. During those changes, one extra backslash was added, making the imx9-bootloader-prepare.sh fail. This commit fixes the issue by removing this extra backslash. Fixes: dd: failed to open '/buildroot/output/images/u-boot-atf-container.img': No such file or directory make: *** [Makefile:820: target-post-image] Error 1 Signed-off-by: Julien Olivain --- board/freescale/common/imx/imx9-bootloader-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh index a9611a81bd..8ab5a241b0 100755 --- a/board/freescale/common/imx/imx9-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh @@ -21,7 +21,7 @@ main () -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ - -out "${BINARIES_DIR}/u-boot-atf-container.img" \ + -out "${BINARIES_DIR}/u-boot-atf-container.img" else "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ -- 2.43.0 From buildroot at bubu1.eu Tue Feb 13 13:13:26 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 13 Feb 2024 14:13:26 +0100 Subject: [Buildroot] [PATCH] package/nodejs: bump to version v20.11.0 Message-ID: <20240213131327.2823205-1-buildroot@bubu1.eu> LICENSE hash changed due to two things: * c-ares vendored dependency license got updated [1]. This is unused by buildroot though anyway * base64 vendored library license updated copyright years and sorted contributor names [2], [3] [1] https://github.com/c-ares/c-ares/pull/556 [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b Signed-off-by: Marcus Hoffmann --- package/nodejs/nodejs.hash | 12 ++++++------ package/nodejs/nodejs.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2d60437a7c..86bc86e73a 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ # From https://nodejs.org/dist/v20.9.0/SHASUMS256.txt.asc -sha256 ced3ecece4b7c3a664bca3d9e34a0e3b9a31078525283a6fdb7ea2de8ca5683b node-v20.9.0-linux-arm64.tar.xz -sha256 64099d7e62bdbb8efd52c216a6759b3cdd77c38aa993096fdee9f875d95b2d8e node-v20.9.0-linux-armv7l.tar.xz -sha256 3c6cea5d614cfbb95d92de43fbc2f8ecd66e431502fe5efc4f3c02637897bd45 node-v20.9.0-linux-ppc64le.tar.xz -sha256 9033989810bf86220ae46b1381bdcdc6c83a0294869ba2ad39e1061f1e69217a node-v20.9.0-linux-x64.tar.xz -sha256 a23d96810abf0455426b349d47ce5310f33095b7bc0571b9cc510f481c3a4519 node-v20.9.0.tar.xz +sha256 f6df68c6793244071f69023a9b43a0cf0b13d65cbe86d55925c28e4134d9aafb node-v20.11.0-linux-arm64.tar.xz +sha256 f943abd348d2b8ff8754ca912c118a20301eb6a0014cc4cdea86cff021fde8e6 node-v20.11.0-linux-armv7l.tar.xz +sha256 6a0e1fa23d7bc707711bbc36159b4220eca123e13435d266d690c6b6c443dc67 node-v20.11.0-linux-ppc64le.tar.xz +sha256 822780369d0ea309e7d218e41debbd1a03f8cdf354ebf8a4420e89f39cc2e612 node-v20.11.0-linux-x64.tar.xz +sha256 31807ebeeeb049c53f1765e4a95aed69476a4b696dd100cb539ab668d7950b40 node-v20.11.0.tar.xz # Locally calculated -sha256 93ac846282ce6c5255e00fada2fd2e7e292255239fe58d5502b0a554859e6a3e LICENSE +sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9806a64d38..e70c39f803 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.9.0 +NODEJS_COMMON_VERSION = 20.11.0 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) -- 2.34.1 From sebastien.szymanski at armadeus.com Tue Feb 13 14:02:57 2024 From: sebastien.szymanski at armadeus.com (=?UTF-8?Q?S=C3=A9bastien_Szymanski?=) Date: Tue, 13 Feb 2024 15:02:57 +0100 Subject: [Buildroot] [PATCH 1/1] board/freescale: imx9-bootloader-prepare.sh: fix script In-Reply-To: <20240213130444.12586-1-ju.o@free.fr> References: <20240213130444.12586-1-ju.o@free.fr> Message-ID: Hi Julien, all, On 2/13/24 14:04, Julien Olivain wrote: > Commit c05f27c "configs/freescale_imx93evk: new defconfig", when > applied, added few ShellCheck fixups on top of the orginial > submission. During those changes, one extra backslash was added, > making the imx9-bootloader-prepare.sh fail. > > This commit fixes the issue by removing this extra backslash. > > Fixes: > > dd: failed to open '/buildroot/output/images/u-boot-atf-container.img': No such file or directory > make: *** [Makefile:820: target-post-image] Error 1 > > Signed-off-by: Julien Olivain > --- Reviewed-by: S?bastien Szymanski Tested-By: S?bastien Szymanski Regards, > board/freescale/common/imx/imx9-bootloader-prepare.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh > index a9611a81bd..8ab5a241b0 100755 > --- a/board/freescale/common/imx/imx9-bootloader-prepare.sh > +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh > @@ -21,7 +21,7 @@ main () > -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ > -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ > -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ > - -out "${BINARIES_DIR}/u-boot-atf-container.img" \ > + -out "${BINARIES_DIR}/u-boot-atf-container.img" > else > "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ > -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ -- S?bastien Szymanski, Armadeus Systems Software engineer From yegorslists at googlemail.com Tue Feb 13 14:30:25 2024 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Tue, 13 Feb 2024 15:30:25 +0100 Subject: [Buildroot] [PATCH v2] Create a .gitignore file in the CANONICAL_O directory Message-ID: <20240213143025.274988-1-yegorslists@googlemail.com> From: Yegor Yefremov This .gitignore file ignores all files in an output directory and hence doesn't change the git status. The .gitignore file will be only created if $(O) is a subfolder of $(TOPDIR). Remove "/output" entry from the main .gitignore file as it is already handled by this general approach. Signed-off-by: Yegor Yefremov --- Changes v1 -> v2: - create .gitignore only if $(O) is a subfolder of $(TOPDIR) (Yann E. MORIN) .gitignore | 1 - Makefile | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bb02d9f572..14b7ca5040 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/output /dl /.auto.deps /.config.cmd diff --git a/Makefile b/Makefile index ac625152c6..71764ce1fa 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,13 @@ endif CANONICAL_CURDIR = $(realpath $(CURDIR)) +# Create a default .gitignore file that ignores everything and doesn't make git +# repository "dirty". Perform this action only if $(O) is a subfolder of +# $(TOPDIR). +ifeq ($(realpath $(dir $(CANONICAL_O))),$(CANONICAL_CURDIR)) +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") +endif + REQ_UMASK = 0022 # Make sure O= is passed (with its absolute canonical path) everywhere the -- 2.34.1 From arbab at linux.ibm.com Tue Feb 13 15:20:05 2024 From: arbab at linux.ibm.com (Reza Arbab) Date: Tue, 13 Feb 2024 09:20:05 -0600 Subject: [Buildroot] [PATCH] package/petitboot: bump to version 1.15 Message-ID: <20240213152005.83369-1-arbab@linux.ibm.com> This fixes an issue where the pb-console helper was not properly silencing kernel log messages printed to the console. https://github.com/open-power/petitboot/releases/tag/v1.15 Signed-off-by: Reza Arbab --- package/petitboot/petitboot.hash | 2 +- package/petitboot/petitboot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash index a9a21f2c1b69..3a90bc529672 100644 --- a/package/petitboot/petitboot.hash +++ b/package/petitboot/petitboot.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fa2367370d3ce5dd9910ab08a0832071e2508c8bf75cfec6d3b9807fbefc507a petitboot-v1.14.tar.gz +sha256 eed29ec841c2bcd5ecc65347f5b95a0087a541bd9c04ca3c17c55d1f7357d189 petitboot-v1.15.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk index 2f1e459dd3fa..a74992377131 100644 --- a/package/petitboot/petitboot.mk +++ b/package/petitboot/petitboot.mk @@ -4,7 +4,7 @@ # ################################################################################ -PETITBOOT_VERSION = 1.14 +PETITBOOT_VERSION = 1.15 PETITBOOT_SOURCE = petitboot-v$(PETITBOOT_VERSION).tar.gz PETITBOOT_SITE = https://github.com/open-power/petitboot/releases/download/v$(PETITBOOT_VERSION) PETITBOOT_DEPENDENCIES = \ -- 2.39.3 From michael at walle.cc Tue Feb 13 15:48:47 2024 From: michael at walle.cc (Michael Walle) Date: Tue, 13 Feb 2024 16:48:47 +0100 Subject: [Buildroot] [PATCH] linux: add support for device tree overlays Message-ID: <20240213154847.914068-1-michael@walle.cc> The linux kernel can build device tree overlays (.dtbo) itself. Add support to build and copy them along with the actual device trees. These can either be in-tree device tree overlays (BR2_LINUX_KERNEL_INTREE_DTBOS) or they can be provided outside of the kernel (BR2_LINUX_KERNEL_CUSTOM_DTS_PATH). In the latter case, the overlay source files will be copied into the kernel tree first. Signed-off-by: Michael Walle --- Alternatively, one could make BR2_LINUX_KERNEL_INTREE_DTS_NAME similar to BR2_LINUX_KERNEL_CUSTOM_DTS_PATH and provide a list of dts and dtso files. But that would mean deprecating BR2_LINUX_KERNEL_INTREE_DTS_NAME and touch all defconfigs to rename that option and append the ".dts" suffix. I'm not sure what's better here. --- linux/Config.in | 14 +++++++++++--- linux/linux.mk | 8 ++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 773cb4fbb5..486a2144e3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -411,12 +411,20 @@ config BR2_LINUX_KERNEL_INTREE_DTS_NAME the trailing .dts. You can provide a list of dts files to build, separated by spaces. +config BR2_LINUX_KERNEL_INTREE_DTBOS + string "In-tree Device Tree Overlay file names" + help + Names of in-tree device tree overlay files (.dtbo) which + should be built and installed into the target system, + separated by spaces. + config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH string "Out-of-tree Device Tree Source file paths" help - Paths to out-of-tree Device Tree Source (.dts) and Device Tree - Source Include (.dtsi) files, separated by spaces. These files - will be copied to the kernel sources and the .dts files will + Paths to out-of-tree Device Tree Source (.dts), Device Tree + Source Include (.dtsi) and Device Tree Overlay Source (.dtso) + files, separated by spaces. These files will be copied to the + kernel sources and the .dts files will be compiled from there. config BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME diff --git a/linux/linux.mk b/linux/linux.mk index 53e2ad6d48..de6c5bd602 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -190,14 +190,18 @@ endif LINUX_VERSION_PROBED = `MAKEFLAGS='$(filter-out w,$(MAKEFLAGS))' $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null` LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) +LINUX_DTBOS += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTBOS)) # We keep only the .dts files, so that the user can specify both .dts # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be # copied to arch//boot/dts, but only the .dts files will # actually be generated as .dtb. -LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) +LINUX_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) +LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(LINUX_CUSTOM_DTS_PATH)))) +LINUX_DTBOS += $(addsuffix .dtbo,$(basename $(filter %.dtso,$(notdir $(LINUX_CUSTOM_DTS_PATH))))) +$(error $(LINUX_CUSTOM_DTS_PATH)) -LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME)) +LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME)) $(LINUX_DTBOS) ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y) LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME)) -- 2.39.2 From romain.naour at smile.fr Tue Feb 13 16:43:30 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 17:43:30 +0100 Subject: [Buildroot] [PATCH v3 02/11] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: References: <20231218081958.506691-1-dario.binacchi@amarulasolutions.com> <20231218081958.506691-3-dario.binacchi@amarulasolutions.com> <3d674bd1-a53f-4f82-93c1-58cbe14ab1db@smile.fr> Message-ID: <626bdd42-18ae-4d6a-90d8-b7c9b84bf966@smile.fr> Hello Dario, Le 09/02/2024 ? 14:58, Dario Binacchi a ?crit?: > Hi Romain, All > > On Wed, Feb 7, 2024 at 11:04?AM Romain Naour wrote: >> >> Hello Dario, All, >> >> Le 06/02/2024 ? 18:50, Romain Naour a ?crit : >>> Hello Dario, >>> >>> Le 18/12/2023 ? 09:19, Dario Binacchi a ?crit : >>>> The patch sets the configurations required by TI HS systems. Some of these >>>> configurations (i. e. HS SYSFW image signing key, HS Software Revision) >>>> are provided by the ti-k3-core-secdev package in the binaries directory. >>> >>> AFAIK the ti-k3-image-gen tool is deprecated and must be replaced by binman tool >>> provided by upstream u-boot. >>> >>> Is all k3 SoC migrated to binman in the latest u-boot release 2024.01? >>> >>> See the FOSDEM talk: >>> >>> https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/21919/FOSDEM24_Speaker_Slides_y7FsIKM.pdf >>> >>> Best regards, >>> Romain >>> >>> >>>> >>>> Signed-off-by: Dario Binacchi >>>> --- >>>> boot/ti-k3-image-gen/Config.in | 1 + >>>> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- >>>> 2 files changed, 15 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in >>>> index d76cef82e911..38d1598d9fc0 100644 >>>> --- a/boot/ti-k3-image-gen/Config.in >>>> +++ b/boot/ti-k3-image-gen/Config.in >>>> @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >>>> bool "ti-k3-image-gen" >>>> depends on BR2_TARGET_TI_K3_R5_LOADER >>>> select BR2_TARGET_TI_K3_BOOT_FIRMWARE >>>> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >> >> Does it means that currently TI HS configuration are missing the >> ti-k3-core-secdev tool to build properly? > > Yes, you are right. Currently, the compilation with > BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS enabled is broken: > > ./tools/k3_gen_x509_cert.sh -c 16 -b spl/u-boot-spl.bin \ > -o tiboot3.bin -l 0x43c00000 -r 1 -k "" > SWRV = 1 >>>> ti-k3-r5-loader 2022.10 Installing to target >>>> ti-k3-r5-loader 2022.10 Installing to images directory > cp /home/dario/projects/buildroot/output/build/ti-k3-r5-loader-2022.10/spl/u-boot-spl.bin > /home/dario/projects/buildroot/output/images/r5-u-boot-spl.bin > k3-image-gen-08.06.00.007.tar.gz: OK (sha256: > f89ea4b1f5c992455b1a682fde48359221b53f3294135df4bf20feea6aea90e4) >>>> ti-k3-image-gen 08.06.00.007 Extracting > gzip -d -c /home/dario/projects/buildroot/dl/ti-k3-image-gen/k3-image-gen-08.06.00.007.tar.gz > | tar --strip-components=1 -C > /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007 > -xf - >>>> ti-k3-image-gen 08.06.00.007 Patching >>>> ti-k3-image-gen 08.06.00.007 Configuring > cp /home/dario/projects/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin > /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007 > cp: cannot stat > '/home/dario/projects/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin': > No such file or directory > make[1]: *** [package/pkg-generic.mk:273: > /home/dario/projects/buildroot/output/build/ti-k3-image-gen-08.06.00.007/.stamp_configured] > Error 1 > make: *** [Makefile:82: _all] Error 2 > > What do you think if, for this series, I fix the compilation issue for > HS configurations by continuing to use the `ti-k3-image-gen` package, > and then > once the series is merged, I try and test the the bump of u-boot to > version 2024.01 to see if it is indeed possible to do without > `ti-k3-image-gen`? > Meanwhile, let's at least fix this problem immediately. I'm working on the SK-TDA4VM (j721e) and I'm able to boot this board with uboot 2024.01 without ti-k3-image-gen. I'll post a v4 including binman support with some improvement regarding host-python modules dependencies. About existing am62 and am64 defconfigs, are you sure that optee-os platform is correct ? BR2_TARGET_OPTEE_OS_PLATFORM="k3" meta-ti define OPTEEMACHINE = "k3-am62x" instead (not "k3) I had a crash on the SK-TDA4VM due to the wrong platform and it worked as soone as I use OPTEEMACHINE = "k3-j721e". It would be great if you can do a runtime test on am62 and/or am64. Thanks to binman, I don't think core-secdev-k3 tool is required for HS devices. Best regards, Romain > > Thanks and regards, > Dario > >> >> It seems this patch should fixes them. >> >> Best regards, >> Romain >> >>>> # We need FIT support in uboot-tools, which is why we select a >>>> # host package >>>> select BR2_PACKAGE_HOST_UBOOT_TOOLS >>>> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >>>> index 64be9a18f2c4..91aed63bab84 100644 >>>> --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk >>>> +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >>>> @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) >>>> TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) >>>> TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) >>>> >>>> -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >>>> +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) >>>> +TI_K3_IMAGE_GEN_SYSFW = \ >>>> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >>>> +else >>>> +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev >>>> + >>>> +TI_K3_IMAGE_GEN_SYSFW = \ >>>> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ >>>> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin >>>> +endif >>>> >>>> define TI_K3_IMAGE_GEN_CONFIGURE_CMDS >>>> - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) >>>> + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ >>>> + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ >>>> + ) >>>> endef >>>> >>>> define TI_K3_IMAGE_GEN_BUILD_CMDS >>>> @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS >>>> $(BR2_MAKE) -C $(@D) \ >>>> SOC=$(TI_K3_IMAGE_GEN_SOC) \ >>>> SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ >>>> + TI_SECURE_DEV_PKG=$(BINARIES_DIR) \ >>>> CONFIG=evm \ >>>> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ >>>> SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ >>> >> > > From yann.morin.1998 at free.fr Tue Feb 13 17:00:40 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 13 Feb 2024 18:00:40 +0100 Subject: [Buildroot] [PATCH v2] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: <20240213143025.274988-1-yegorslists@googlemail.com> References: <20240213143025.274988-1-yegorslists@googlemail.com> Message-ID: Yegor, All, On 2024-02-13 15:30 +0100, yegorslists at googlemail.com spake thusly: > From: Yegor Yefremov > This .gitignore file ignores all files in an output directory and > hence doesn't change the git status. > > The .gitignore file will be only created if $(O) is a subfolder of > $(TOPDIR). > > Remove "/output" entry from the main .gitignore file as it is already > handled by this general approach. > > Signed-off-by: Yegor Yefremov > --- [--SNIP--] > +# Create a default .gitignore file that ignores everything and doesn't make git > +# repository "dirty". Perform this action only if $(O) is a subfolder of s/subfolder/subdirectory/ > +# $(TOPDIR). > +ifeq ($(realpath $(dir $(CANONICAL_O))),$(CANONICAL_CURDIR)) This only accounts for direct sub-directory, i.e. $(TOPDIR)/foo, not $(TOPDIR)/project-42/board-27/debug which is arguably more interesting. What about: diff --git a/Makefile b/Makefile index ac625152c6..ba76949e6d 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,13 @@ endif CANONICAL_CURDIR = $(realpath $(CURDIR)) +# Create a default .gitignore file that ignores everything and doesn't make git +# repository "dirty". Perform this action only if $(O) is a subdirectory of +# $(CANONICAL_CURDIR) (aka TOPDIR, but it's only defined later). +ifeq ($(filter-out $(CANONICAL_CURDIR)/%,$(CANONICAL_O)),) +$(file >$(CANONICAL_O)/.gitignore,*) +endif + REQ_UMASK = 0022 # Make sure O= is passed (with its absolute canonical path) everywhere the This is quite simple, and accounts for arbitrarily-deep sub-directories. Note: since we work with the CANONICAL_* variants, we know they do not end with a '/' so even if the user calls O=/path/to/buildroot/ , we'd find that it is _not_ a subdirectory, and thuis we wil lnot overwrite our own .gitignore file. Regards, Yann E. MORIN. > +$(shell echo "*" > "$(CANONICAL_O)/.gitignore") > +endif > + > REQ_UMASK = 0022 > > # Make sure O= is passed (with its absolute canonical path) everywhere the > -- > 2.34.1 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From david.picard at clermont.in2p3.fr Tue Feb 13 16:31:47 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Tue, 13 Feb 2024 17:31:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package Message-ID: <20240213163147.493265-1-david.picard@clermont.in2p3.fr> Add a package for the Intel/Altera SoC FPGA hardware library. It is used to let the HPS and the FPGA fabric communicate with each other. Signed-off-by: David Picard --- package/Config.in | 1 + package/intel-socfpga-hwlib/Config.in | 12 ++++++ .../intel-socfpga-hwlib.hash | 2 + .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/intel-socfpga-hwlib/Config.in create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..cd6c6bcaba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1736,6 +1736,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/intel-socfpga-hwlib/Config.in" source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/intel-socfpga-hwlib/Config.in b/package/intel-socfpga-hwlib/Config.in new file mode 100644 index 0000000000..ced6483a59 --- /dev/null +++ b/package/intel-socfpga-hwlib/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB + bool "intel-socfpga-hwlib" + depends on BR2_arm + help + This package provides the Intel SoC FPGA HWLIB for + Intel/Altera SoC FPGA chips. + This library allows to communicate with the FPGA fabric from + Linux, running on the HPS device. + The source code is not compiled. Instead, a symlink is added + to $(STAGING_DIR)/lib. + + https://github.com/altera-opensource/intel-socfpga-hwlib diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash new file mode 100644 index 0000000000..60efe9013e --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash @@ -0,0 +1,2 @@ +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 intel-socfpga-hwlib-23.12.02.tar.gz +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 License.txt diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk new file mode 100644 index 0000000000..bf18c23560 --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# intel-socfpga-hwlib +# +################################################################################ + +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 +INTEL_SOCFPGA_HWLIB_SITE = $(call github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES + +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) $(STAGING_DIR)/lib/intel-socfpga-hwlib +endef + +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS +# mkdir -p $(BINARIES_DIR)/intel-ucode +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# else +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO +# endif + +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +# endef + +$(eval $(generic-package)) -- 2.40.1 From romain.naour at smile.fr Tue Feb 13 17:27:57 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:27:57 +0100 Subject: [Buildroot] [PATCH 01/21] DEVELOPERS: add Romain Naour for am574x_idk_defconfig In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-2-romain.naour@smile.fr> The DEVELOPERS entry was missing. Fixes: 35eb74c634 ("configs/am574x_idk_defconfig: new defconfig") Signed-off-by: Romain Naour --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..ff44741f9f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2667,7 +2667,9 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ +F: board/ti/am574x-idk/ F: configs/qemu_* +F: configs/am574x_idk_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:27:58 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:27:58 +0100 Subject: [Buildroot] [PATCH 02/21] configs/ti_am62x_sk_defconfig: fix optee-os plateform In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-3-romain.naour@smile.fr> According to meta-ti, the optee-os plateform must be "k3-am62x" not "k3". meta-ti uses the OPTEEMACHINE to set optee-os platform [1]. meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Signed-off-by: Romain Naour --- On SK-TDA4VM, such error leads to a runtime boot crash. --- configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c..c3ad555a81 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:27:56 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:27:56 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig Message-ID: <20240213172817.2872849-1-romain.naour@smile.fr> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. This series start by adding U-boot binman support already submitted in the preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi [1], with small improvements. See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] With binman support, we can add the TI K3 j721e SoC support by providing all required firmware generated by the build. Add the new ti_j721e_sk_defconfig file to build a basic SD card image to boot the board (serial debug and ethernet working). Thanks to binman support, we can remove the ti-k3-image-gen tool from Buildroot. To do that, we have to update existing defconfig (am62, am64). Followup commits can improve TI K3 HS-FS devices based on binman instead of legacy core-secdev-k3 tool. [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf Best regards, Romain Dario Binacchi (5): package/python-attrs: add host variant package/python-rpds-py: add host variant package/python-referencing: add host variant package/python-jsonschema-specifications: add host variant package/python-jsonschema: add host variant Romain Naour (16): DEVELOPERS: add Romain Naour for am574x_idk_defconfig configs/ti_am62x_sk_defconfig: fix optee-os plateform configs/ti_am64x_sk_defconfig: fix optee-os plateform boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR boot/ti-k3-boot-firmware: introduce BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} boot/uboot: use DM firmware name defined by ti-k3-boot-firmware package boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options boot/uboot: enable TI K3 Device Manager (DM) for j721e boot/ti-k3-boot-firmware: bump to version 09.02.00.004 configs/ti_j721e_sk_defconfig: new defconfig configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman tool configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman tool boot/ti-k3-image-gen: remove package Config.in.legacy | 7 ++ DEVELOPERS | 6 +- board/ti/j721e-sk/genimage.cfg | 28 +++++++ board/ti/j721e-sk/post-build.sh | 16 ++++ board/ti/j721e-sk/readme.txt | 34 ++++++++ boot/Config.in | 1 - boot/ti-k3-boot-firmware/Config.in | 39 ++++++++++ .../ti-k3-boot-firmware.hash | 2 +- .../ti-k3-boot-firmware.mk | 16 ++-- boot/ti-k3-image-gen/Config.in | 77 ------------------- boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ------------- boot/ti-k3-r5-loader/Config.in | 8 ++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 23 ++++++ boot/uboot/Config.in | 27 ++++--- boot/uboot/uboot.mk | 10 ++- configs/ti_am62x_sk_defconfig | 14 ++-- configs/ti_am64x_sk_defconfig | 14 ++-- ...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- package/python-attrs/python-attrs.mk | 6 ++ .../python-jsonschema-specifications.mk | 10 +++ .../python-jsonschema/python-jsonschema.mk | 14 ++++ .../python-referencing/python-referencing.mk | 11 +++ package/python-rpds-py/python-rpds-py.mk | 1 + 24 files changed, 275 insertions(+), 180 deletions(-) create mode 100644 board/ti/j721e-sk/genimage.cfg create mode 100755 board/ti/j721e-sk/post-build.sh create mode 100644 board/ti/j721e-sk/readme.txt delete mode 100644 boot/ti-k3-image-gen/Config.in delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:00 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:00 +0100 Subject: [Buildroot] [PATCH 04/21] package/python-attrs: add host variant In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-5-romain.naour@smile.fr> From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. On some plateforms (curently TI K3 SoC familly) binman uses python-jsonschema [1] on the host that requires host-python-attrs. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi [Romain: extend commit log] Signed-off-by: Romain Naour --- Changes in v4: - extend commit log Changes in v3: - Drop Config.in.host --- package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc44..fb1729e62f 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:27:59 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:27:59 +0100 Subject: [Buildroot] [PATCH 03/21] configs/ti_am64x_sk_defconfig: fix optee-os plateform In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-4-romain.naour@smile.fr> According to meta-ti, the optee-os plateform must be "k3-am64x" not "k3". meta-ti uses the OPTEEMACHINE to set optee-os platform [1]. meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Signed-off-by: Romain Naour --- On SK-TDA4VM, such error leads to a runtime boot crash. --- configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8..097175bd8f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:01 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:01 +0100 Subject: [Buildroot] [PATCH 05/21] package/python-rpds-py: add host variant In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-6-romain.naour@smile.fr> From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman On some plateforms (curently TI K3 SoC familly) binman uses python-jsonschema [1] on the host that requires host-python-rpds-py. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi [Romain: extend commit log] Signed-off-by: Romain Naour --- Changes in v4: - extend commit log Changes in v3: - Drop Config.in.host --- package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4f..cee2ff290a 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:02 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:02 +0100 Subject: [Buildroot] [PATCH 06/21] package/python-referencing: add host variant In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-7-romain.naour@smile.fr> From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. On some plateforms (curently TI K3 SoC familly) binman uses python-jsonschema [1] on the host that requires host-python-referencing. We don't have the concept of runtime dependencies for host packages, so we must add them as build dependencies of the host variant. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi [Romain: - extend commit log - remove host-python-attrs from target variant dependency - add missing host runtime dependencies] Signed-off-by: Romain Naour --- Changes in v4: - extend commit log - remove host-python-attrs from target variant dependency - add missing host runtime dependencies Changes in v3: - Drop Config.in.host --- package/python-referencing/python-referencing.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e91..66d59ed809 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_REFERENCING_DEPENDENCIES += \ + host-python-attrs \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:03 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:03 +0100 Subject: [Buildroot] [PATCH 07/21] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-8-romain.naour@smile.fr> From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. On some plateforms (curently TI K3 SoC familly) binman uses python-jsonschema [1] on the host that requires host-python-jsonschema-specifications. We don't have the concept of runtime dependencies for host packages, so we must add them as build dependencies of the host variant. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi [Romain: - extend commit log - add missing host runtime dependencies] Signed-off-by: Romain Naour --- Changes in v4: - extend commit log - add missing host runtime dependencies Changes in v3: - Drop Config.in.host --- .../python-jsonschema-specifications.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9..653c839bb4 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,14 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES += \ + host-python-referencing + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:04 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:04 +0100 Subject: [Buildroot] [PATCH 08/21] package/python-jsonschema: add host variant In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-9-romain.naour@smile.fr> From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. On some plateforms (curently TI K3 SoC familly) binman uses python-jsonschema [1] add all missing runtime rependencies for the host variant. We don't have the concept of runtime dependencies for host packages, so we must add them as build dependencies of the host variant. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi [Romain: - extend commit log - add missing host runtime dependencies] Signed-off-by: Romain Naour --- Changes in v4: - extend commit log - add missing host runtime dependencies Changes in v3: - Drop Config.in.host --- package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa77..9e8b6e18b8 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \ + host-python-attrs \ + host-python-jsonschema-specifications \ + host-python-referencing \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:06 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:06 +0100 Subject: [Buildroot] [PATCH 10/21] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-11-romain.naour@smile.fr> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. As for U-boot package, this tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. The binman requirement is directly included in buildman dependency (tools/buildman/requirements.txt) since within U-Boot, binman is invoked by the build system, here buildman [1]. Make sure that all binman requirements are build before ti-k3-r5-loader. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot Signed-off-by: Romain Naour --- Note: binman is bundled in U-Boot source code. Use "USE_BINMAN" instead of "NEEDS_BINMAN" since it's not an external U-Boot dependency. --- boot/ti-k3-r5-loader/Config.in | 8 ++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5..d678bd17c2 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -93,4 +93,12 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE help Path to the TI K3 R5 Loader configuration file. +config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN + bool "ti-k3-r5-loader use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + endif diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f..8f86e0fb07 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -60,6 +60,20 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +TI_K3_R5_LOADER_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml +# Make sure that all binman requirements are build before ti-k3-r5-loader. +TI_K3_R5_LOADER_DEPENDENCIES += \ + host-python3 \ + host-python-setuptools \ + host-python-pylibfdt \ + host-python-pyelftools +TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:05 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:05 +0100 Subject: [Buildroot] [PATCH 09/21] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-10-romain.naour@smile.fr> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. The binman requirement is directly included in buildman dependency (tools/buildman/requirements.txt) since within U-Boot, binman is invoked by the build system, here buildman [1]. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot Signed-off-by: Romain Naour --- Note: binman is bundled in U-Boot source code. Use "USE_BINMAN" instead of "NEEDS_BINMAN" since it's not an external U-Boot dependency. --- boot/uboot/Config.in | 11 +++++++++++ boot/uboot/uboot.mk | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930..e6e7956adc 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -290,6 +290,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN This option makes sure that the needed binary blobs are copied into the U-Boot source directory. +config BR2_TARGET_UBOOT_USE_BINMAN + bool "U-Boot use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a880..0714522550 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -269,6 +269,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) UBOOT_DEPENDENCIES += host-vim endif +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +UBOOT_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:09 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:09 +0100 Subject: [Buildroot] [PATCH 13/21] boot/uboot: use DM firmware name defined by ti-k3-boot-firmware package In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-14-romain.naour@smile.fr> The DM firmware name is now defined by ti-k3-boot-frimware package by BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM, so BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME can be removed to avoid duplication in Kconfig. Signed-off-by: Romain Naour --- boot/uboot/Config.in | 9 --------- boot/uboot/uboot.mk | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index e6e7956adc..63359266c6 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -250,15 +250,6 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM - -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME - string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - -endif - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 0714522550..aa2ca99bdd 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -187,7 +187,7 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:08 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:08 +0100 Subject: [Buildroot] [PATCH 12/21] boot/ti-k3-boot-firmware: introduce BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX, AM62X, AM64X, AM65X} In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-13-romain.naour@smile.fr> ti-k3-image-gen tool is deprecated an replaced by binman [1]. But BR2_TARGET_TI_K3_IMAGE_GEN_SOC_{AM62AX,AM62X} is used by u-boot package to select which Device Manager (DM) firmware to use for the U-Boot build. In order to remove ti-k3-image-gen package, introduce BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} to replace BR2_TARGET_TI_K3_IMAGE_GEN_SOC_{AM62AX,AM62X,AM64X,AM65X}. In order to avoid breaking existing defconfig still using ti-k3-image-gen tool (ti_am62x_sk_defconfig, ti_am64x_sk_defconfig) select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC symbol from ti-k3-image-gen package. While at it, only install required firmware to BINARIES_DIR based on the selected TI K3 SoC variant. This requires two intall step: - ti-sysfw installation based on the SoC variant. - ti-dm installation only for SoC using split firmware boot flow (eg: am62, j721e) [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 Signed-off-by: Romain Naour --- boot/ti-k3-boot-firmware/Config.in | 34 +++++++++++++++++++ .../ti-k3-boot-firmware.mk | 12 +++++-- boot/ti-k3-image-gen/Config.in | 4 +++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3-boot-firmware/Config.in index d80bb4bdb3..8393699998 100644 --- a/boot/ti-k3-boot-firmware/Config.in +++ b/boot/ti-k3-boot-firmware/Config.in @@ -5,3 +5,37 @@ config BR2_TARGET_TI_K3_BOOT_FIRMWARE This package downloads and installs the TI-specific ti-sysfw and ti-dm firmware needed to boot TI K3 platforms (which include AM62x, AM64x, AM65x and more). + +if BR2_TARGET_TI_K3_BOOT_FIRMWARE +choice + prompt "SoC family" + +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX + bool "am62ax" + +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X + bool "am62x" + +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X + bool "am64x" + +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X + bool "am65x" + +endchoice + +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC + string + default "am62ax" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX + default "am62x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X + default "am64x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X + default "am65x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X + +# Only devices with a split firmware boot flow requires a DM firmware (eg: am62, j721e) +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM + string + default "am62axx" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX + default "am62xx" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X + default "" + +endif diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk index 1f8ade207c..c7c5eb0818 100644 --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk @@ -13,9 +13,17 @@ TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES = YES TI_K3_BOOT_FIRMWARE_LICENSE = TI Proprietary TI_K3_BOOT_FIRMWARE_LICENSE_FILES = LICENSE.ti +ifneq ($(BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM),) +define TI_K3_BOOT_FIRMWARE_INSTALL_DM_FILES + mkdir -p $(BINARIES_DIR)/ti-dm + cp -dpfr $(@D)/ti-dm/$(BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM) $(BINARIES_DIR)/ti-dm +endef +endif + define TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES_CMDS - cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ - cp -dpfr $(@D)/ti-dm $(BINARIES_DIR)/ + mkdir -p $(BINARIES_DIR)/ti-sysfw + cp -dpfr $(@D)/ti-sysfw/*$(BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC)* $(BINARIES_DIR)/ti-sysfw + $(TI_K3_BOOT_FIRMWARE_INSTALL_DM_FILES) endef $(eval $(generic-package)) diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e9..e54f5ec992 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -18,15 +18,19 @@ choice config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX bool "am62ax" + select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X bool "am62x" + select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X bool "am64x" + select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X bool "am65x" + select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X endchoice -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:07 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:07 +0100 Subject: [Buildroot] [PATCH 11/21] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-12-romain.naour@smile.fr> U-boot for k3 r5 core (ti-k3-r5-loader) can install different target image (tiboot3*.bin) depending on the k3 SoC variant using different boot flow [1]: - Split binary with a combined firmware: (eg: AM65) - Combined binary with a combined firmware: (eg: AM64) - Split binary with a split firmware: (eg: J721E) - Combined binary with a split firmware: (eg: AM62) K3 SoC using Split Binary Boot Flow also requires sysfw-*.itb file to boot (eg: am65, j721e). Only tiboot3*.bin is needed for other boot flow. >From [1]: "It's important to rename the generated tiboot3.bin and sysfw.itb to match exactly tiboot3.bin and sysfw.itb as ROM and the wakeup UBoot SPL will only look for and load the files with these names." So boards using HS (High Secure) K3 SoC variant must update the tiboot3.bin (and sysfw.itb) in their post-build script. ti-k3-r5-loader must install any tiboot3*.bin (and sysfw*.itb) to BINARIES_DIR let the user which one should be used in a post-build script. See the list of all tiboot3*.bin and sysfw*.itb file variant found in meta-ti: meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" meta-ti-bsp/conf/machine/include/am62pxx.inc:IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j722s.inc:IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/k3r5.inc:SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw.itb" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst Signed-off-by: Romain Naour --- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 8f86e0fb07..b3c756dc47 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -78,8 +78,17 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e) define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + for f in $(@D)/tiboot3*.bin ; do \ + $(INSTALL) -D -m 0644 $$f $(BINARIES_DIR)/`basename $$f` || exit 1; \ + done + for f in $(@D)/sysfw*.itb ; do \ + if test -e $$f ; then \ + $(INSTALL) -D -m 0644 $$f $(BINARIES_DIR)/`basename $$f` || exit 1; \ + fi ; \ + done endef $(eval $(kconfig-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:11 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:11 +0100 Subject: [Buildroot] [PATCH 15/21] boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-16-romain.naour@smile.fr> ti-k3-image-gen tool is deprecated an replaced by binman [1]. Use the newly introduced BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X}. [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 Signed-off-by: Romain Naour --- boot/uboot/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 63359266c6..7586f24c90 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -242,10 +242,10 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" - # We use the SoC selection defined for the ti-k3-image-gen + # We use the SoC selection defined for the ti-k3-boot-firmware # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:10 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:10 +0100 Subject: [Buildroot] [PATCH 14/21] boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-15-romain.naour@smile.fr> The k3 J721E support is needed to build for DRA829/TDA4VM SoC. https://www.ti.com/product/TDA4VM (SoC) https://www.ti.com/tool/PROCESSOR-SDK-J721E (TI SDK) https://www.ti.com/tool/SK-TDA4VM (TDA4VM processor starter kit) https://beagleboard.org/ai-64 (BeagleBone AI-64 SBC) Signed-off-by: Romain Naour --- boot/ti-k3-boot-firmware/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3-boot-firmware/Config.in index 8393699998..c9a09d8b19 100644 --- a/boot/ti-k3-boot-firmware/Config.in +++ b/boot/ti-k3-boot-firmware/Config.in @@ -22,6 +22,9 @@ config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X bool "am65x" +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E + bool "j721e" + endchoice config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC @@ -30,12 +33,14 @@ config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC default "am62x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X default "am64x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X default "am65x" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X + default "j721e" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E # Only devices with a split firmware boot flow requires a DM firmware (eg: am62, j721e) config BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM string default "am62axx" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX default "am62xx" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X + default "j721e" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E default "" endif -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:12 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:12 +0100 Subject: [Buildroot] [PATCH 16/21] boot/uboot: enable TI K3 Device Manager (DM) for j721e In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-17-romain.naour@smile.fr> The TI K3 Device Manager (DM) support for J721E is needed to boot DRA829/TDA4VM SoC. https://www.ti.com/product/TDA4VM (SoC) https://www.ti.com/tool/PROCESSOR-SDK-J721E (TI SDK) https://www.ti.com/tool/SK-TDA4VM (TDA4VM processor starter kit) https://beagleboard.org/ai-64 (BeagleBone AI-64 SBC) Signed-off-by: Romain Naour --- boot/uboot/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 7586f24c90..837f1605b7 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -245,7 +245,8 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM # We use the SoC selection defined for the ti-k3-boot-firmware # package depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE - depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X \ + || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:15 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:15 +0100 Subject: [Buildroot] [PATCH 19/21] configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman tool In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-20-romain.naour@smile.fr> Update u-boot for a53 and r5 core to 2024.01 and enable binman support in order to remove BR2_TARGET_TI_K3_IMAGE_GEN. Signed-off-by: Romain Naour --- configs/ti_am62x_sk_defconfig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a81..f725734551 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -16,25 +16,29 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" -BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:13 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:13 +0100 Subject: [Buildroot] [PATCH 17/21] boot/ti-k3-boot-firmware: bump to version 09.02.00.004 In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-18-romain.naour@smile.fr> Remove the comment about ti-k3-image-gen since this tool is deprecated an replaced by binman. ti-k3-image-gen has been removed from meta-ti [1]. [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 Signed-off-by: Romain Naour --- boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 2 +- boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash index 95131180ef..939bd0794a 100644 --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 ab20ffbe7bba7e94be246b3417d33a914b3f07c16c47ef5a7f7602349a666a61 LICENSE.ti -sha256 6032a258ce731d987576115f5de44c677a6b0cf8bddcd61a9a2852928bdfff92 ti-linux-firmware-08.06.00.006.tar.xz +sha256 701d400ac33b2885ec35d73f0d66e5186e3c2f71ef28679508b58ef986804d35 ti-linux-firmware-09.02.00.004.tar.xz diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk index c7c5eb0818..fb28d8ac41 100644 --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk @@ -4,9 +4,7 @@ # ################################################################################ -# The hash 340194800a581baf976360386dfc7b5acab8d948 defined in the -# Makefile of ti-k3-image-gen corresponds to the tag 08.06.00.006. -TI_K3_BOOT_FIRMWARE_VERSION = 08.06.00.006 +TI_K3_BOOT_FIRMWARE_VERSION = 09.02.00.004 TI_K3_BOOT_FIRMWARE_SITE = https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/snapshot TI_K3_BOOT_FIRMWARE_SOURCE = ti-linux-firmware-$(TI_K3_BOOT_FIRMWARE_VERSION).tar.xz TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES = YES -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:14 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:14 +0100 Subject: [Buildroot] [PATCH 18/21] configs/ti_j721e_sk_defconfig: new defconfig In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-19-romain.naour@smile.fr> Adds support for TI's SK-TDA4VM board by introducing the ti_j721e_sk_defconfig file and related support files. Retrieve BSP settings from meta-ti (may be useful for other TI boards): - Don't set BR2_TARGET_TI_K3_IMAGE_GEN since this tool is deprecated [1] and must be replaced by u-boot binman (upstream). See FOSDEM 2024 talk by TI folks about Binman and how it simplify the overall boot-loader build flow [2]. - Set BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD = "generic" meta-ti]$ git grep TFA_BOARD meta-ti-bsp/conf/machine/beagleplay.conf:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/am62axx.inc:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/am62pxx.inc:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/am62xx.inc:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/am64xx.inc:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/am65xx.inc:TFA_BOARD = "generic" meta-ti-bsp/conf/machine/include/j7200.inc:TFA_BOARD = "generic" meta-ti-bsp/conf/machine/include/j721e.inc:TFA_BOARD = "generic" meta-ti-bsp/conf/machine/include/j721s2.inc:TFA_BOARD = "generic" meta-ti-bsp/conf/machine/include/j722s.inc:TFA_BOARD = "lite" meta-ti-bsp/conf/machine/include/j784s4.inc:TFA_BOARD = "j784s4" - Set BR2_TARGET_UBOOT_NEEDS_ATF_BL31 to provide BL31 variable pointing to ATF bl31.bin to the U-Boot build process [3]. - Set BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE to OP-TEE as BL32 secure payload. meta-ti set "SPD=opteed" to build ATF [4]. - Set BR2_TARGET_OPTEE_OS_PLATFORM to "k3-j721e". meta-ti uses the OPTEEMACHINE to set optee-os platform [5]. meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" - Set BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME since u-boot is looking at /boot/dtb/ti for devicetree. (Yocto uses KERNEL_DTBDEST) Create a symlink to make sure /boot/dtb/ti exist. (We want to keep the u-boot environment provided by upstream as is). [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 [2] https://fosdem.org/2024/schedule/event/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/ [3] https://git.yoctoproject.org/meta-ti/commit/?id=e74b9a1746d4d04757c87c1920a0f743e55ff096 [4] https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc?h=09.02.00.004#n7 [5] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 More information about the board can be found at: https://www.ti.com/tool/SK-TDA4VM Signed-off-by: Romain Naour --- DEVELOPERS | 2 ++ board/ti/j721e-sk/genimage.cfg | 28 ++++++++++++++++++ board/ti/j721e-sk/post-build.sh | 16 +++++++++++ board/ti/j721e-sk/readme.txt | 34 ++++++++++++++++++++++ configs/ti_j721e_sk_defconfig | 51 +++++++++++++++++++++++++++++++++ 5 files changed, 131 insertions(+) create mode 100644 board/ti/j721e-sk/genimage.cfg create mode 100755 board/ti/j721e-sk/post-build.sh create mode 100644 board/ti/j721e-sk/readme.txt create mode 100644 configs/ti_j721e_sk_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index ff44741f9f..e5f2dd2327 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2668,8 +2668,10 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ F: board/ti/am574x-idk/ +F: board/ti/j721e-sk/ F: configs/qemu_* F: configs/am574x_idk_defconfig +F: configs/ti_j721e_sk_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ diff --git a/board/ti/j721e-sk/genimage.cfg b/board/ti/j721e-sk/genimage.cfg new file mode 100644 index 0000000000..2a991748d5 --- /dev/null +++ b/board/ti/j721e-sk/genimage.cfg @@ -0,0 +1,28 @@ +image boot.vfat { + vfat { + files = { + "sysfw.itb", + "tiboot3.bin", + "tispl.bin", + "u-boot.img", + } + } + + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition u-boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/ti/j721e-sk/post-build.sh b/board/ti/j721e-sk/post-build.sh new file mode 100755 index 0000000000..01af6ca474 --- /dev/null +++ b/board/ti/j721e-sk/post-build.sh @@ -0,0 +1,16 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +# u-boot is looking at /boot/dtb/ti for devicetree in the rootfs +# partition while Buildroot install the kernel and its devicetree +# in /boot (BR2_LINUX_KERNEL_INSTALL_TARGET enabled). +# Enabling BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME allows to keep the +# "ti" subdirectory but "dts" is still missing. +# Make sure /boot/dtb/ti exist by creating a symlink in +# ${TARGET_DIR}/boot +# https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc?h=09.02.00.004#n13 +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/include/env/ti/mmc.env?ref_type=tags#L18 +if [ -L ${TARGET_DIR}/boot/dtb ]; then + rm ${TARGET_DIR}/boot/dtb + ln -sf . ${TARGET_DIR}/boot/dtb +fi diff --git a/board/ti/j721e-sk/readme.txt b/board/ti/j721e-sk/readme.txt new file mode 100644 index 0000000000..bebed1b3f6 --- /dev/null +++ b/board/ti/j721e-sk/readme.txt @@ -0,0 +1,34 @@ +Texas Instuments SK-TDA4VM Test and Development Board + +Description +=========== + +This configuration will build a basic image for the TI SK-TDA4VM +board: https://www.ti.com/tool/SK-TDA4VM. + +How to Build +============ + +Select the default configuration for the target: + +$ make ti_j721e_sk_defconfig + +Optional: modify the configuration: + +$ make menuconfig + +Build: + +$ make + +To copy the resultimg output image file to an SD card use dd: + +$ dd if=output/images/sdcard.img of=/dev/sdX bs=1M + +How to Run +========== + +Insert the SD card into the SK-TDA4VM board, and power it up through the +USB Type-C connector. The system should come up. You can use a +micro-USB cable to connect to the connector labeled DEBUG CONSOLE to +communicate with the board. diff --git a/configs/ti_j721e_sk_defconfig b/configs/ti_j721e_sk_defconfig new file mode 100644 index 0000000000..fc2d70d76f --- /dev/null +++ b/configs/ti_j721e_sk_defconfig @@ -0,0 +1,51 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/j721e-sk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/j721e-sk/genimage.cfg" +BR2_SYSTEM_DHCP="eth0" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.4" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-j721e-sk" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="256M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="generic" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_PLATFORM="k3-j721e" +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E=y +BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="j721e_evm_r5" +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="j721e_evm_a72" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +BR2_TARGET_UBOOT_USE_BINMAN=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_IMG=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="tispl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="TEE=$(BINARIES_DIR)/tee-pager_v2.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:17 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:17 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-22-romain.naour@smile.fr> ti-k3-image-gen tool is deprecated an replaced by binman [1]. All defconfig that was using it have been updated to use U-boot binman tool instead. So, we can safely remove ti-k3-image-gen package. [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 Cc: Anand Gadiyar Cc: Xuanhao Shi Signed-off-by: Romain Naour --- Config.in.legacy | 7 ++ DEVELOPERS | 2 - boot/Config.in | 1 - boot/ti-k3-image-gen/Config.in | 81 ----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 --------------- 6 files changed, 7 insertions(+), 141 deletions(-) delete mode 100644 boot/ti-k3-image-gen/Config.in delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk diff --git a/Config.in.legacy b/Config.in.legacy index a869279af7..2b59a65f1c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.02" +config BR2_TARGET_TI_K3_IMAGE_GEN + bool "ti-k3-image-gen removed" + select BR2_LEGACY + help + ti-k3-image-gen tool has been removed and replaced by + U-Boot binman tool (requires U-boot >= 2024.01). + config BR2_PACKAGE_TINYMEMBENCH bool "tinymembench removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index e5f2dd2327..df6c60704c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -151,7 +151,6 @@ N: Anand Gadiyar F: board/ti/am62x-sk/ F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ -F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig @@ -3219,7 +3218,6 @@ N: Xuanhao Shi F: board/ti/am62x-sk/ F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ -F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig diff --git a/boot/Config.in b/boot/Config.in index e5fdf7ad43..87e1b7c00e 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,7 +20,6 @@ source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-boot-firmware/Config.in" -source "boot/ti-k3-image-gen/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in deleted file mode 100644 index e54f5ec992..0000000000 --- a/boot/ti-k3-image-gen/Config.in +++ /dev/null @@ -1,81 +0,0 @@ -config BR2_TARGET_TI_K3_IMAGE_GEN - bool "ti-k3-image-gen" - depends on BR2_TARGET_TI_K3_R5_LOADER - select BR2_TARGET_TI_K3_BOOT_FIRMWARE - # We need FIT support in uboot-tools, which is why we select a - # host package - select BR2_PACKAGE_HOST_UBOOT_TOOLS - select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT - help - Use TI's k3-image-gen to build a separate bare metal boot - binary from a separate SPL that is running on the R5 core. - - https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ - -if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE - string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - -endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3-image-gen/ti-k3-image-gen.hash deleted file mode 100644 index c968c5648f..0000000000 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 f89ea4b1f5c992455b1a682fde48359221b53f3294135df4bf20feea6aea90e4 k3-image-gen-08.06.00.007.tar.gz -sha256 f012e8d000d711d0539e5b4c812fc1d3a59c10fc1e3d6ea155556f5b78286845 LICENSE diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk deleted file mode 100644 index 64be9a18f2..0000000000 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# ti-k3-image-gen -# -################################################################################ - -TI_K3_IMAGE_GEN_VERSION = 08.06.00.007 -TI_K3_IMAGE_GEN_SITE = https://git.ti.com/cgit/k3-image-gen/k3-image-gen/snapshot -TI_K3_IMAGE_GEN_SOURCE = k3-image-gen-$(TI_K3_IMAGE_GEN_VERSION).tar.gz -TI_K3_IMAGE_GEN_LICENSE = BSD-3-Clause -TI_K3_IMAGE_GEN_LICENSE_FILES = LICENSE -TI_K3_IMAGE_GEN_INSTALL_IMAGES = YES - -# - ti-k3-image-gen is used to build tiboot3.bin, using the -# r5-u-boot-spl.bin file from the ti-k3-r5-loader package. Hence the -# dependency on ti-k3-r5-loader. -# - the ti-k3-image-gen makefiles seem to need some feature from Make -# v4.0, similar to u-boot. -TI_K3_IMAGE_GEN_DEPENDENCIES = \ - host-arm-gnu-toolchain \ - host-python3 \ - host-openssl \ - host-uboot-tools \ - ti-k3-r5-loader \ - ti-k3-boot-firmware \ - $(BR2_MAKE_HOST_DEPENDENCY) - -TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) - -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin - -define TI_K3_IMAGE_GEN_CONFIGURE_CMDS - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) -endef - -define TI_K3_IMAGE_GEN_BUILD_CMDS - $(TARGET_MAKE_ENV) \ - $(BR2_MAKE) -C $(@D) \ - SOC=$(TI_K3_IMAGE_GEN_SOC) \ - SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ - CONFIG=evm \ - CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ - SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ - O=$(@D)/tmp \ - BIN_DIR=$(@D) -endef - -define TI_K3_IMAGE_GEN_INSTALL_IMAGES_CMDS - cp $(@D)/tiboot3.bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) -- 2.43.0 From romain.naour at smile.fr Tue Feb 13 17:28:16 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 18:28:16 +0100 Subject: [Buildroot] [PATCH 20/21] configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman tool In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240213172817.2872849-21-romain.naour@smile.fr> Update u-boot for a53 and r5 core to 2024.01 and enable binman support in order to remove BR2_TARGET_TI_K3_IMAGE_GEN. Signed-off-by: Romain Naour --- configs/ti_am64x_sk_defconfig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f..bcef16777e 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -16,24 +16,28 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" -BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -- 2.43.0 From giulio.benetti at benettiengineering.com Tue Feb 13 17:44:05 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 13 Feb 2024 18:44:05 +0100 Subject: [Buildroot] [PATCH v3 0/2] Add board support for the BeagleV-Ahead In-Reply-To: <20240211120857.6622-1-kilian.zinnecker@mail.de> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> Message-ID: Hi Kilian, On 11/02/24 13:08, Kilian Zinnecker via buildroot wrote: > This patch series adds board support for the BeagleV-Ahead. > > This patch series introduces a package which fetches binaries for the > SoC, i.e., one binary blob for an on-chip FPGA and one binary blob for > audio. Currently they are not used, but are intended to be used in the > future. > > This board support generates an image suitable for SD card. The boot > command for uboot to boot the kernel could not easily be changed. It > seemed that a default boot command was persisent and any change to it > by normal means (e.g., uboot config parameters like > CONFIG_BOOT_COMMAND) did not have any effect. Hence a patch for the > custom u-boot is introduced for now, to insert the proper boot > command. > please report the patches changelogs in the patches most of all. It's useful there while reviewing, more than here where it should be a brief explanation. Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > v2 -> v3: > > - Added brief description what the xuantie bin binaries are for > - Unrolled loop in XUANTIE_BINS_INSTALL_IMAGES_CMDS of > package/xuantie-bins/xuantie-bins.mk > - Added a second product page link to board's readme.txt > - Added URL to the product page to git commit message > - Dropped "_CUSTOM" from all "BR2_RISCV_ISA_*" in the board's > defconfig > - Add description to the board's readme.txt and defconfig why GCC > v13 is chosen > - Added BR2_PACKAGE_HOST_DOSFSTOOLS to board's defconfig > > v1 -> v2: > > - Added hash file for xuantie-bins package > - Now uses uEnv.txt for actual boot commands > - Removed extlinux.conf > - Removed superflous comments inside config files > > > Kilian Zinnecker (2): > package/xuantie-bins: new package > configs/beaglev_ahead: new defconfig > > DEVELOPERS | 3 + > board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ > board/beaglev-ahead/linux.fragment | 2 + > .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ > board/beaglev-ahead/post-image.sh | 6 ++ > board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ > board/beaglev-ahead/uEnv.txt | 4 + > board/beaglev-ahead/uboot.fragment | 2 + > configs/beaglev_ahead_defconfig | 46 +++++++++++ > package/Config.in | 1 + > package/xuantie-bins/Config.in | 8 ++ > package/xuantie-bins/xuantie-bins.hash | 1 + > package/xuantie-bins/xuantie-bins.mk | 23 ++++++ > 13 files changed, 266 insertions(+) > create mode 100644 board/beaglev-ahead/genimage.cfg > create mode 100644 board/beaglev-ahead/linux.fragment > create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > create mode 100755 board/beaglev-ahead/post-image.sh > create mode 100644 board/beaglev-ahead/readme.txt > create mode 100644 board/beaglev-ahead/uEnv.txt > create mode 100644 board/beaglev-ahead/uboot.fragment > create mode 100644 configs/beaglev_ahead_defconfig > create mode 100644 package/xuantie-bins/Config.in > create mode 100644 package/xuantie-bins/xuantie-bins.hash > create mode 100644 package/xuantie-bins/xuantie-bins.mk > From giulio.benetti at benettiengineering.com Tue Feb 13 17:49:03 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 13 Feb 2024 18:49:03 +0100 Subject: [Buildroot] [PATCH v3 1/2] package/xuantie-bins: new package In-Reply-To: <20240211120857.6622-2-kilian.zinnecker@mail.de> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> <20240211120857.6622-2-kilian.zinnecker@mail.de> Message-ID: Hi Kilian, On 11/02/24 13:08, Kilian Zinnecker via buildroot wrote: > This patch adds a package for Xuantie binary blobs. These binaries > are needed for the BeagleV-Ahead. Please report here the same description you point in Config.in > > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/xuantie-bins/Config.in | 8 ++++++++ > package/xuantie-bins/xuantie-bins.hash | 1 + > package/xuantie-bins/xuantie-bins.mk | 23 +++++++++++++++++++++++ > 5 files changed, 34 insertions(+) > create mode 100644 package/xuantie-bins/Config.in > create mode 100644 package/xuantie-bins/xuantie-bins.hash > create mode 100644 package/xuantie-bins/xuantie-bins.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 1c6c84b05b..fa0596fd6b 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1894,6 +1894,7 @@ F: board/radxa/rock5b/ > F: configs/rock5b_defconfig > F: configs/avnet_rzboard_v2l_defconfig Can you please send a patch to alphabetize the 2 lines above? > F: package/rockchip-rkbin/ > +F: package/xuantie-bins/ > > N: Klaus Heinrich Kiwi > F: package/wqy-zenhei/ > diff --git a/package/Config.in b/package/Config.in > index 91a6f1de00..5e28fb6e88 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -657,6 +657,7 @@ endmenu > source "package/wipe/Config.in" > source "package/xorriso/Config.in" > source "package/xr819-xradio/Config.in" > + source "package/xuantie-bins/Config.in" > endmenu > > menu "Interpreter languages and scripting" > diff --git a/package/xuantie-bins/Config.in b/package/xuantie-bins/Config.in > new file mode 100644 > index 0000000000..40388edd06 > --- /dev/null > +++ b/package/xuantie-bins/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_XUANTIE_BINS > + bool "xuantie-bins" > + depends on BR2_riscv > + help > + This package provides binary blobs, needed for the > + BeagleV-Ahead's SoC (TH1520). They contain an FPGA binary > + (light_aon_fpga.bin) for power management and a binary for > + the audio system (light_c906_audio.bin). the 2 lines above have 4 useless empty spaces, please remove them > diff --git a/package/xuantie-bins/xuantie-bins.hash b/package/xuantie-bins/xuantie-bins.hash > new file mode 100644 > index 0000000000..4d1ec297c9 > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.hash > @@ -0,0 +1 @@ > +sha256 608e9fec79823996004f65ba692a76d741307b0de23552d147ad1b567e7054dc xuantie-bins-0a2e02bb53758cc12448d8670e65c854528a96b4-br1.tar.gz > diff --git a/package/xuantie-bins/xuantie-bins.mk b/package/xuantie-bins/xuantie-bins.mk > new file mode 100644 > index 0000000000..6db18685bc > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.mk > @@ -0,0 +1,23 @@ > +################################################################################ > +# > +# xuantie-bins > +# > +################################################################################ > + > +XUANTIE_BINS_VERSION = 0a2e02bb53758cc12448d8670e65c854528a96b4 > +XUANTIE_BINS_SITE = https://github.com/beagleboard/xuantie-ubuntu.git > +XUANTIE_BINS_SITE_METHOD = git Here ^^^ please use github helper instead of this, like: https://gitlab.com/buildroot.org/buildroot/-/blob/master/package/openswan/openswan.mk#L8 > +XUANTIE_BINS_LICENSE = PROPRIETARY > + > +XUANTIE_BINS_INSTALL_IMAGES = YES > +XUANTIE_BINS_INSTALL_TARGET = NO > + > +XUANTIE_BINS_FPGA_BIN_FILENAME = "bins/light_aon_fpga.bin" > +XUANTIE_BINS_AUDIO_BIN_FILENAME = "bins/light_c906_audio.bin" The 2 lines above are useless now since you use them only once so please drop them > + > +define XUANTIE_BINS_INSTALL_IMAGES_CMDS > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(XUANTIE_BINS_FPGA_BIN_FILENAME) > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(XUANTIE_BINS_AUDIO_BIN_FILENAME) > +endef > + > +$(eval $(generic-package)) Can you please send a V4 with such corrections? Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 13 18:06:43 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 13 Feb 2024 19:06:43 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <20240211120857.6622-3-kilian.zinnecker@mail.de> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> <20240211120857.6622-3-kilian.zinnecker@mail.de> Message-ID: Hi Kilian, On 11/02/24 13:08, Kilian Zinnecker wrote: > This patch adds board support for the BeagleV-Ahead. It uses a > custom kernel for the board's SoC. As the SoC has an outdated and > currently not supported version of the RISC-V vector extension, the > vector extension is disabled. The used OpenSBI version for this board > support does not define the neccessary flags for GCC 12 to activate > the zicsr and zifencei extensions. Therefore this board support uses > GCC 13. > > https://www.beagleboard.org/boards/beaglev-ahead Please add newline here > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 2 + > board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ > board/beaglev-ahead/linux.fragment | 2 + > .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ > board/beaglev-ahead/post-image.sh | 6 ++ > board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ > board/beaglev-ahead/uEnv.txt | 4 + > board/beaglev-ahead/uboot.fragment | 2 + > configs/beaglev_ahead_defconfig | 46 +++++++++++ > 9 files changed, 232 insertions(+) > create mode 100644 board/beaglev-ahead/genimage.cfg > create mode 100644 board/beaglev-ahead/linux.fragment > create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > create mode 100755 board/beaglev-ahead/post-image.sh > create mode 100644 board/beaglev-ahead/readme.txt > create mode 100644 board/beaglev-ahead/uEnv.txt > create mode 100644 board/beaglev-ahead/uboot.fragment > create mode 100644 configs/beaglev_ahead_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index fa0596fd6b..3ede2a111d 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1890,9 +1890,11 @@ F: package/libcamera/ > > N: Kilian Zinnecker > F: board/avnet/rzboard_v2l/ > +F: board/beaglev-ahead/ > F: board/radxa/rock5b/ > F: configs/rock5b_defconfig > F: configs/avnet_rzboard_v2l_defconfig as told on previous patch need an "alphabetization" patch > +F: configs/beaglev_ahead_defconfig > F: package/rockchip-rkbin/ > F: package/xuantie-bins/ > > diff --git a/board/beaglev-ahead/genimage.cfg b/board/beaglev-ahead/genimage.cfg > new file mode 100644 > index 0000000000..080b169527 > --- /dev/null > +++ b/board/beaglev-ahead/genimage.cfg > @@ -0,0 +1,62 @@ > +# SD card image for BeagleV-Ahead > + > +image boot.vfat { > + vfat { > + files = { > + "fw_dynamic.bin", > + "Image", > + "light_aon_fpga.bin", > + "light-beagle.dtb", > + "light_c906_audio.bin", > + } > + > + file uEnv.txt { > + image = "uEnv.txt" > + } > + > + file overlays/BBORG_LOAD-00A2.dtbo { > + image = "overlays/BBORG_LOAD-00A2.dtbo" > + } > + > + file overlays/BBORG_RELAY-00A2.dtbo { > + image = "overlays/BBORG_RELAY-00A2.dtbo" > + } > + > + file overlays/BONE-LED_P8_03.dtbo { > + image = "overlays/BONE-LED_P8_03.dtbo" > + } > + > + file overlays/BONE-LED_P9_11.dtbo { > + image = "overlays/BONE-LED_P9_11.dtbo" > + } > + > + file overlays/BVA-MIKROBUS-0.dtbo { > + image = "overlays/BVA-MIKROBUS-0.dtbo" > + } > + } > + size = 48M > +} > + > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 2M > + } > + > + partition uboot { > + in-partition-table = "false" > + image = "u-boot-with-spl.bin" > + offset = 0 > + holes = {"(440; 1048576)"} > + } > + > + partition boot { > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + image = "rootfs.ext2" > + } > +} > + > diff --git a/board/beaglev-ahead/linux.fragment b/board/beaglev-ahead/linux.fragment > new file mode 100644 > index 0000000000..00f93f39a4 > --- /dev/null > +++ b/board/beaglev-ahead/linux.fragment > @@ -0,0 +1,2 @@ > +# CONFIG_VECTOR is not set > +# CONFIG_VECTOR_0_7 is not set > diff --git a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > new file mode 100644 > index 0000000000..bcf5b965ce > --- /dev/null > +++ b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > @@ -0,0 +1,30 @@ > +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 > +From: Kilian Zinnecker > +Date: Mon, 21 Aug 2023 23:51:59 +0200 > +Subject: [PATCH] Overwrite bootcmd by force > + > +This patch is a dirty hack: Trying to overwrite the bootcmd via the > +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted > +to some preset value and could not be changed easily. Therefore a > +hook is used to force the bootcmd to be overwritten. This is strange because if so also the bootcmd content of uEnv.txt below should be skipped, or maybe there is a bug in this u-boot that evaluates bootcmd too early without taking into account environment variables. But I'm also noticing that you have your Environment variables in Fat, but it depends how u-boot deals with environment variables. Usually you have to specificy an offset in memory where environment variables live. But I see in your "make uboot-menuconfig" that CONFIG_ENV_IS_IN_FAT is not enabled, but only CONFIG_ENV_IS_IN_MMC is and you have to specify: CONFIG_ENV_OFFSET CONFIG_ENV_SIZE So if you want to go with vfat way you need to enable CONFIG_ENV_IS_IN_FAT and specify: CONFIG_ENV_FAT_INTERFACE CONFIG_ENV_FAT_DEVICE_AND_PART and most of all: CONFIG_ENV_FAT_FILE=uEnv.txt in uboot.fragment below I would go with this last way instead of adding such dirty hack, can you work on that? > + > +Signed-off-by: Kilian Zinnecker > +--- > + board/thead/light-c910/light.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c > +index 8d5478e916..1448db974e 100644 > +--- a/board/thead/light-c910/light.c > ++++ b/board/thead/light-c910/light.c > +@@ -2282,6 +2282,7 @@ int board_late_init(void) > + light_usb_boot_check(); > + do_firmware_load(); > + ap_peri_clk_disable(); > ++ run_command("load mmc 1:1 $ramdisk_addr_r uEnv.txt; env import -t $ramdisk_addr_r $filesize; run uenvcmd", 0); > + return 0; > + } > + > +-- > +2.34.1 > + > diff --git a/board/beaglev-ahead/post-image.sh b/board/beaglev-ahead/post-image.sh > new file mode 100755 > index 0000000000..9e16eeff3f > --- /dev/null > +++ b/board/beaglev-ahead/post-image.sh > @@ -0,0 +1,6 @@ > +#!/usr/bin/env bash > +set -e > + > +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ ${BINARIES_DIR} > +cp board/beaglev-ahead/uEnv.txt ${BINARIES_DIR}/ > +support/scripts/genimage.sh -c board/beaglev-ahead/genimage.cfg > diff --git a/board/beaglev-ahead/readme.txt b/board/beaglev-ahead/readme.txt > new file mode 100644 > index 0000000000..758082a792 > --- /dev/null > +++ b/board/beaglev-ahead/readme.txt > @@ -0,0 +1,78 @@ > +BeagleV-Ahead > +============== > +https://www.beagleboard.org/boards/beaglev-ahead > +https://forum.beagleboard.org/c/beaglev/ > + > +The SoC (TH1520) of the BeagleV-Ahead implements an outdated and > +currently not supported version of the RISC-V vector extension. Hence, > +the vector extension is disabled. The used OpenSBI version for this > +board support does not define the neccessary flags for GCC 12 to > +activate the zicsr and zifencei extensions. Therefore this board > +support uses GCC 13. > + > +Build: > +====== > + $ make beaglev_ahead_defconfig > + $ make > + > +Files created in output directory > +================================= > + > +output/images > +. > +??? boot.vfat > +??? bootloader-JH7100-buildroot.bin.out > +??? ddrinit-2133-buildroot.bin.out > +??? fw_dynamic.bin > +??? fw_dynamic.elf > +??? fw_jump.bin > +??? fw_jump.elf > +??? fw_payload.bin > +??? fw_payload.elf > +??? Image > +??? light-beagle.dtb > +??? light_aon_fpga.bin > +??? light_c906_audio.bin > +??? overlays > +??? rootfs.ext2 > +??? rootfs.ext4 > +??? rootfs.tar > +??? sdcard.img > +??? u-boot-with-spl.bin > +??? u-boot.bin > +??? uEnv.txt > + > +Creating bootable SD card: > +========================== > + > +Simply invoke (as root) > + > +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync > + > +Where X is your SD card device. > + > +Booting: > +======== > + > +SD card boot button: > +-------------------- > +To let the board boot from SD card, keep the "SD button" pressed during power > +up / power cycle. The button is near the SD card slot. > + > +Serial console: > +--------------- > +The BeagleV-Ahead has a "Debug" GPIO header. Its layout can be seen here: > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/02-quick-start.html#access-uart-debug-console > + > +Note, that there are reported issues with some uart interface cables/dongles: > +https://forum.beagleboard.org/t/beaglev-ahead-debug-terminal-problems/35331 > + > +Baudrate for this board is 115200. > + > +Login: > +------ > +Enter 'root' as login user, and the prompt is ready. > + > +wiki link: > +---------- > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/index.html > diff --git a/board/beaglev-ahead/uEnv.txt b/board/beaglev-ahead/uEnv.txt > new file mode 100644 > index 0000000000..7e98ae5f81 > --- /dev/null > +++ b/board/beaglev-ahead/uEnv.txt > @@ -0,0 +1,4 @@ > +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} > +uenvcmd=fatload mmc 1:1 ${kernel_addr_r} Image; fatload mmc 1:1 ${fdt_addr_r} light-beagle.dtb > +bootargs=root=/dev/mmcblk1p2 rootfstype=ext4 rootwait ro console=ttyS0,115200 earlycon clk_ignore_unused net.ifnames=0 > + > diff --git a/board/beaglev-ahead/uboot.fragment b/board/beaglev-ahead/uboot.fragment > new file mode 100644 > index 0000000000..1f51cef106 > --- /dev/null > +++ b/board/beaglev-ahead/uboot.fragment > @@ -0,0 +1,2 @@ > +CONFIG_LEGACY_IMAGE_FORMAT=y > +CONFIG_AUTOBOOT=y > diff --git a/configs/beaglev_ahead_defconfig b/configs/beaglev_ahead_defconfig > new file mode 100644 > index 0000000000..9000b1f0ad > --- /dev/null > +++ b/configs/beaglev_ahead_defconfig > @@ -0,0 +1,46 @@ > +BR2_riscv=y > +BR2_riscv_custom=y > +BR2_RISCV_ISA_RVM=y > +BR2_RISCV_ISA_RVA=y > +BR2_RISCV_ISA_RVF=y > +BR2_RISCV_ISA_RVD=y > +BR2_RISCV_ISA_RVC=y > +# Use GCC 13 for OpenSBI zicsr zifencei issue > +BR2_GCC_VERSION_13_X=y > +BR2_GLOBAL_PATCH_DIR="board/beaglev-ahead/patches" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglev-ahead/post-image.sh" > +BR2_TARGET_GENERIC_HOSTNAME="BeagleV-Ahead" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the BeagleV-Ahead" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/linux/archive/refs/heads/beaglev-v5.10.113-1.1.2-ubuntu.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="beaglev" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/light-beagle" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/linux.fragment" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_BEAGLEV_DDRINIT=y > +BR2_TARGET_BEAGLEV_SECONDBOOT=y > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-opensbi/archive/refs/heads/0.9-1.1.2-ubuntu.tar.gz" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-u-boot/archive/refs/heads/beaglev-v2020.01-1.1.2-ubuntu.tar.gz" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="light_beagle" > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragment" > +BR2_TARGET_UBOOT_FORMAT_BIN=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_XUANTIE_BINS=y Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Tue Feb 13 18:17:48 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 13 Feb 2024 19:17:48 +0100 Subject: [Buildroot] [PATCH v2 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <2172310.irdbgypaU6@laptop> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-3-kilian.zinnecker@mail.de> <8f6baf1d-3caa-4b47-aad9-a34fa0761058@benettiengineering.com> <2172310.irdbgypaU6@laptop> Message-ID: <75e279f2-ff11-4ff8-bb59-f33b352ea3f7@benettiengineering.com> Hi Kilian, On 11/02/24 13:24, kilian.zinnecker--- via buildroot wrote: > Hello Giulio, all, > >>> This patch adds board support for the BeagleV-Ahead. It uses a >>> custom kernel for the board's SoC. As the SoC has an outdated and >>> currently not supported version of the RISC-V vector extension, the >>> vector extension is disabled. >> >> can you please provide an URL to the product page? > > Yes, I added an URL into the commit message of v3. > > [--SNIP--] >>> --- /dev/null >>> +++ b/board/beaglev-ahead/post-image.sh >>> @@ -0,0 +1,6 @@ >>> +#!/usr/bin/env bash >>> +set -e >>> + >>> +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ >>> ${BINARIES_DIR} >> linux-custom should substituted with $(LINUX_DIR) > > I tried $(LINUX_DIR) and ${LINUX_DIR}, but both resulted in an empty string > and as a consequence in a wrong path and broke the build. You're right, LINUX_DIR is not exported in Makefile, that's why it can't be found in scripts. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > So in my v3 I kept it as it is for now. Should I try something else? > >>> --- /dev/null >>> +++ b/configs/beaglev_ahead_defconfig >>> @@ -0,0 +1,44 @@ >>> +BR2_riscv=y >>> +BR2_riscv_custom=y >>> +BR2_RISCV_ISA_CUSTOM_RVM=y >>> +BR2_RISCV_ISA_CUSTOM_RVA=y >>> +BR2_RISCV_ISA_CUSTOM_RVF=y >>> +BR2_RISCV_ISA_CUSTOM_RVD=y >>> +BR2_RISCV_ISA_CUSTOM_RVC=y >> >> With commit cbd91e89e43d600172c62fd1cbd33aa74d0a851a all "_CUSTOM" have >> been dropped, so can you please replace all the: >> BR2_RISCV_ISA_CUSTOM_* >> occurences with: >> BR2_RISCV_ISA_* >> ? > > I fixed it, thanks. > >>> +BR2_GCC_VERSION_13_X=y >> >> I think there is a reason you force using gcc 13, can you describe it in >> the commit log and here? > > Yes, there were problems. I am not 100% sure, but as I remember it: the > OpenSBI used has an old version and in its build, it does not define certain > flags, which are needed by GCC 12 to activate the needed zifencei and zicsr > extension. Those extension where redefined to be in some other extension pack > of RiscV (or something like that, I don't remeber this exactly). Anyway it > threw an error in GCC 12, and I thinkt to fix that, one would have to touch the > old OpenSBI version. Switching to GCC 13 (where it works out of the box) seems > then to be cleaner for me. > > [--SNIP--] >>> +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragmen >>> t" +BR2_TARGET_UBOOT_FORMAT_BIN=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y >>> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" >> >> Here you need to add: >> BR2_PACKAGE_HOST_DOSFSTOOLS=y >> otherwise it fails to build under buildroot/utils/docker-run > > Added dosfstools to the defconfig, thanks! > >>> +BR2_PACKAGE_HOST_MTOOLS=y >>> +BR2_PACKAGE_HOST_GENIMAGE=y >>> +BR2_PACKAGE_XUANTIE_BINS=y >> >> After enabling BR2_RISCV_ISA_ options it builds successfully using >> buildroot/utils/docker-run > > I build the image with buildroot/utils/docker-run and it boots. Thanks for the > hint, I will use buildroot/utils/docker-run in the future as well! > > Thanks for your review and best regards, > Kilian > > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Tue Feb 13 18:19:24 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Tue, 13 Feb 2024 19:19:24 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/xuantie-bins: new package In-Reply-To: <6015348.lOV4Wx5bFT@laptop> References: <20231204231212.36450-1-kilian.zinnecker@mail.de> <20231204231212.36450-2-kilian.zinnecker@mail.de> <08b6187c-94f2-4cbc-b0e8-0066ca687796@benettiengineering.com> <6015348.lOV4Wx5bFT@laptop> Message-ID: Hi Kilian, On 11/02/24 13:15, kilian.zinnecker--- via buildroot wrote: > Hello Giulio, all, > > [--SNIP--] >> can you please provide a separate patch to alphabetize? > > I did so: https://gitlab.com/buildroot.org/buildroot/-/commit/ > 53fad3242d74b9fad11978429d6cc2879f783f4b > > However, unfortunately Thomas de-alphabetized it again when he applied my > RZBoard V2L patches: https://gitlab.com/buildroot.org/buildroot/-/commit/ > f003675119c9ca503afa19c04074e81c49538baf > > I just send a v3 of the BeagleV-Ahead patches. After we get this series > applied, I will then again send a single patch to alphabetize. Please send the alphabetize patch along with the V4 patchset, > > [--SNIP--] >>> --- /dev/null >>> +++ b/package/xuantie-bins/Config.in >>> @@ -0,0 +1,6 @@ >>> +config BR2_PACKAGE_XUANTIE_BINS >>> + bool "xuantie-bins" >>> + depends on BR2_riscv >>> + help >>> + This package provides binary blobs, needed for the >>> + BeagleV-Ahead's SoC (TH1520). >> >> Can you please describe a bit what those binaries are meant for? > > > I gave a brief description, but I don't know much about these. Maybe Robert > can give even more information, if more is needed? I see sufficient explanation in V3 > > [--SNIP--] >>> +XUANTIE_BINS_FPGA_BIN_FILENAME = "bins/light_aon_fpga.bin" >>> +XUANTIE_BINS_AUDIO_BIN_FILENAME = "bins/light_c906_audio.bin" >>> + >>> +define XUANTIE_BINS_INSTALL_IMAGES_CMDS >>> + $(foreach f, \ >>> + $(XUANTIE_BINS_FPGA_BIN_FILENAME) \ >>> + $(XUANTIE_BINS_AUDIO_BIN_FILENAME) \ >>> + , \ >>> + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/$(f) >>> + ) >>> +endef >> >> Being only 2 files to be installed I'd prefer to see 2 lines instead of >> foreach loop. Can you please change it accordingly? > > I unrolled the loop in my v3 of the patches. Fine, see V3 comments. Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From ju.o at free.fr Tue Feb 13 18:21:57 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 13 Feb 2024 19:21:57 +0100 Subject: [Buildroot] [PATCH 1/1] package/tinycompress: bump to version 1.2.11 Message-ID: <20240213182157.916696-1-ju.o@free.fr> For commit log, see: https://github.com/alsa-project/tinycompress/commits/v1.2.11/ Signed-off-by: Julien Olivain --- Patch tested master branch at commit e889a1c with commands: utils/test-pkg -a -p tinycompress ... 45 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/tinycompress/tinycompress.hash | 2 +- package/tinycompress/tinycompress.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tinycompress/tinycompress.hash b/package/tinycompress/tinycompress.hash index 164f3a36c3..f86b75f346 100644 --- a/package/tinycompress/tinycompress.hash +++ b/package/tinycompress/tinycompress.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 2f897e5112cd3bca6790b5cecfda6e0662c8bc5ee0fbab972b247a0cc620d66c tinycompress-1.2.8.tar.bz2 +sha256 ebbe788c28328e7cca245aaf9194a5ad0dc91e9e0dc883c2cf9feb6d42c9f3fc tinycompress-1.2.11.tar.bz2 # Locally calculated sha256 912ea37a4435594a3b3c35f04efa4b5b7af2e68a05f5319c16c881711a31e4b7 COPYING diff --git a/package/tinycompress/tinycompress.mk b/package/tinycompress/tinycompress.mk index c9cfbb574b..fabd5884b2 100644 --- a/package/tinycompress/tinycompress.mk +++ b/package/tinycompress/tinycompress.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYCOMPRESS_VERSION = 1.2.8 +TINYCOMPRESS_VERSION = 1.2.11 TINYCOMPRESS_SOURCE = tinycompress-$(TINYCOMPRESS_VERSION).tar.bz2 TINYCOMPRESS_SITE = https://www.alsa-project.org/files/pub/tinycompress TINYCOMPRESS_LICENSE = BSD-3-Clause and LGPL-2.1 -- 2.43.0 From mail at sebastianbauer.info Tue Feb 13 18:30:44 2024 From: mail at sebastianbauer.info (Sebastian Bauer) Date: Tue, 13 Feb 2024 19:30:44 +0100 Subject: [Buildroot] [PATCH 3/3] packages/libcamera-apps: Fix build to use meson In-Reply-To: <20240212230721.4f97dae3@windsurf> References: <20231227182429.1215185-1-mail@sebastianbauer.info> <20231227182429.1215185-3-mail@sebastianbauer.info> <20240212230721.4f97dae3@windsurf> Message-ID: <52d43e0922ed044d0cb15d50af7d85d5@sebastianbauer.info> Hello Thomas, Am 2024-02-12 23:07, schrieb Thomas Petazzoni: > On Wed, 27 Dec 2023 19:24:29 +0100 > Sebastian Bauer wrote: > >> Upstream uses meson instead of cmake since a while. >> >> Signed-off-by: Sebastian Bauer > Thanks for your patch, and sorry for the slow feedback. Could you > clarify why this you say "Fix build" in your commit title? Is there > some build failure, or is this an improvement patch? There has been a build failure, because the libcamera-apps version pinned at that time did not come with a CMakeLists.txt file (anymore). The build is not broken currently because libcamera-apps was reverted to 1.2.1 by one previous patch. The subject is probably not correct anymore. But if libcamera-apps is bumped again, a switch to meson is mandatory. I have tried to bump libcamera and libcamera-apps to newer versions in the meantime but I haven't found a combination that works yet on the Pi (it builds but the resulting binarys do not work as they used to work). >> -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) >> -LIBCAMERA_APPS_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic >> -endif > You're removing this chunk, but it was important. Do you have some > evidence that it is no longer needed? I cannot say it for sure, but given the fact that the build was broken for all platforms before this patch series I did not bother to investigate it. However, I saw the presence of the flag in the build for the Raspberry Pi, which may indicate that this chunk is not necessary, but I'm not on SPARC to test it. I also have no idea how to inject this flag manually using meson. But I believe that, if the problem is still existent, a proper fix would be at a different place, as the propagation of the flag works on other platforms. Note that in the meantime also the project libcamera-apps was renamed to rpicam-apps suggesting that SPARC is not the original target of that toolset. Bye Sebastian From alexander.sverdlin at gmail.com Tue Feb 13 18:45:14 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Tue, 13 Feb 2024 19:45:14 +0100 Subject: [Buildroot] [PATCH 02/21] configs/ti_am62x_sk_defconfig: fix optee-os plateform In-Reply-To: <20240213172817.2872849-3-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-3-romain.naour@smile.fr> Message-ID: <08881a814bf7466c4130ff4d137415b54c007808.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: > According to meta-ti, the optee-os plateform must be > "k3-am62x" not "k3". > > ? meta-ti uses the OPTEEMACHINE to set optee-os platform [1]. > ? meta-ti]$ git grep OPTEEMACHINE > ? meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" > ? meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" > ? meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" > ? meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" > ? meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" > ? meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" > ? meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" > > [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 > > Signed-off-by: Romain Naour indeed, Reviewed-by: Alexander Sverdlin > --- > On SK-TDA4VM, such error leads to a runtime boot crash. > --- > ?configs/ti_am62x_sk_defconfig | 2 +- > ?1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index f88252a89c..c3ad555a81 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > ?BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Tue Feb 13 18:56:22 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Tue, 13 Feb 2024 19:56:22 +0100 Subject: [Buildroot] [PATCH 03/21] configs/ti_am64x_sk_defconfig: fix optee-os plateform In-Reply-To: <20240213172817.2872849-4-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-4-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: > According to meta-ti, the optee-os plateform must be > "k3-am64x" not "k3". > > ? meta-ti uses the OPTEEMACHINE to set optee-os platform [1]. > ? meta-ti]$ git grep OPTEEMACHINE > ? meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" > ? meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" > ? meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" > ? meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" > ? meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" > ? meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" > ? meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" > > [1] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > On SK-TDA4VM, such error leads to a runtime boot crash. > --- > ?configs/ti_am64x_sk_defconfig | 2 +- > ?1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 4bfd31f0c8..097175bd8f 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > ?BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Tue Feb 13 19:05:15 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Tue, 13 Feb 2024 20:05:15 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240213172817.2872849-22-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > ti-k3-image-gen tool is deprecated an replaced by binman [1]. > > All defconfig that was using it have been updated to use U-boot > binman tool instead. > > So, we can safely remove ti-k3-image-gen package. > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > > Cc: Anand Gadiyar > Cc: Xuanhao Shi > Signed-off-by: Romain Naour > --- > ?Config.in.legacy????????????????????????? |? 7 ++ > ?DEVELOPERS??????????????????????????????? |? 2 - > ?boot/Config.in??????????????????????????? |? 1 - > ?boot/ti-k3-image-gen/Config.in??????????? | 81 ----------------------- > ?boot/ti-k3-image-gen/ti-k3-image-gen.hash |? 3 - > ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?? | 54 --------------- > ?6 files changed, 7 insertions(+), 141 deletions(-) > ?delete mode 100644 boot/ti-k3-image-gen/Config.in > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk > > diff --git a/Config.in.legacy b/Config.in.legacy > index a869279af7..2b59a65f1c 100644 > --- a/Config.in.legacy > +++ b/Config.in.legacy > @@ -146,6 +146,13 @@ endif > ? > ?comment "Legacy options removed in 2024.02" > ? > +config BR2_TARGET_TI_K3_IMAGE_GEN > + bool "ti-k3-image-gen removed" > + select BR2_LEGACY > + help > + ? ti-k3-image-gen tool? has been removed and replaced by > + ? U-Boot binman tool (requires U-boot >= 2024.01). Is commit 6d6228ab8fe5 "am62a: dts: binman: Package tiboot3.bin, tispl.bin, u-boot.img" in U-Boot repo not what is actually required (since v2023.10)? At least that's the version which works for me. -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Tue Feb 13 20:23:10 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Tue, 13 Feb 2024 21:23:10 +0100 Subject: [Buildroot] [PATCH 14/21] boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E In-Reply-To: <20240213172817.2872849-15-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-15-romain.naour@smile.fr> Message-ID: <4f0f43f7cba1c96f5ba3ba0a4c4e7299e916c2f3.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > The k3 J721E support is needed to build for DRA829/TDA4VM SoC. > > https://www.ti.com/product/TDA4VM?(SoC) > https://www.ti.com/tool/PROCESSOR-SDK-J721E?(TI SDK) > https://www.ti.com/tool/SK-TDA4VM?(TDA4VM processor starter kit) > https://beagleboard.org/ai-64?(BeagleBone AI-64 SBC) > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/ti-k3-boot-firmware/Config.in | 5 +++++ > ?1 file changed, 5 insertions(+) > > diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3-boot-firmware/Config.in > index 8393699998..c9a09d8b19 100644 > --- a/boot/ti-k3-boot-firmware/Config.in > +++ b/boot/ti-k3-boot-firmware/Config.in > @@ -22,6 +22,9 @@ config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X > ?config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X > ? bool "am65x" > ? > +config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > + bool "j721e" > + > ?endchoice > ? > ?config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC > @@ -30,12 +33,14 @@ config BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC > ? default "am62x"? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X > ? default "am64x"? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X > ? default "am65x"? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM65X > + default "j721e"? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > ? > ?# Only devices with a split firmware boot flow requires a DM firmware (eg: am62, j721e) > ?config BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM > ? string > ? default "am62axx" if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX > ? default "am62xx"? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X > + default "j721e"?? if BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > ? default "" > ? > ?endif -- Alexander Sverdlin. From thomas at devoogdt.com Tue Feb 13 20:40:13 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 13 Feb 2024 21:40:13 +0100 Subject: [Buildroot] [PATCH v1] package/wayland-protocols: bump to 1.33 Message-ID: <20240213204013.104794-1-thomas@devoogdt.com> [ANNOUNCE] wayland-protocols 1.32 https://lists.freedesktop.org/archives/wayland-devel/2023-July/042836.html Signed-off-by: Thomas Devoogdt --- package/wayland-protocols/wayland-protocols.hash | 6 +++--- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index d039cd6fba..58c432e365 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-July/042836.html -sha256 7459799d340c8296b695ef857c07ddef24c5a09b09ab6a74f7b92640d2b1ba11 wayland-protocols-1.32.tar.xz -sha512 90bbd52daf342b98823ddeed04e349ae242d2eaf925ab8d603cceb36c980c83b5681bb890961e0d49584cb5c2e60a33abf8821770c6ab87956383630bd5b7966 wayland-protocols-1.32.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2024-January/043400.html +sha256 94f0c50b090d6e61a03f62048467b19abbe851be4e11ae7b36f65f8b98c3963a wayland-protocols-1.33.tar.xz +sha512 4584f6ac86367655f9db5d0c0ed0681efa31e73f984e4b620fbe5317df21790927f4f5317ecbbc194ac31eaf88caebc431bcc52c23d9dc0098c71de3cb4a9fef wayland-protocols-1.33.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 2cfaa830e5..50a08d1988 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.32 +WAYLAND_PROTOCOLS_VERSION = 1.33 WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT -- 2.34.1 From thomas at devoogdt.com Tue Feb 13 20:42:40 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Tue, 13 Feb 2024 21:42:40 +0100 Subject: [Buildroot] [PATCH v2] package/wayland-protocols: bump to 1.33 Message-ID: <20240213204240.105047-1-thomas@devoogdt.com> Announce: https://lists.freedesktop.org/archives/wayland-devel/2024-January/043400.html Signed-off-by: Thomas Devoogdt --- v2: fix wrong announce version in git message --- package/wayland-protocols/wayland-protocols.hash | 6 +++--- package/wayland-protocols/wayland-protocols.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index d039cd6fba..58c432e365 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-July/042836.html -sha256 7459799d340c8296b695ef857c07ddef24c5a09b09ab6a74f7b92640d2b1ba11 wayland-protocols-1.32.tar.xz -sha512 90bbd52daf342b98823ddeed04e349ae242d2eaf925ab8d603cceb36c980c83b5681bb890961e0d49584cb5c2e60a33abf8821770c6ab87956383630bd5b7966 wayland-protocols-1.32.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2024-January/043400.html +sha256 94f0c50b090d6e61a03f62048467b19abbe851be4e11ae7b36f65f8b98c3963a wayland-protocols-1.33.tar.xz +sha512 4584f6ac86367655f9db5d0c0ed0681efa31e73f984e4b620fbe5317df21790927f4f5317ecbbc194ac31eaf88caebc431bcc52c23d9dc0098c71de3cb4a9fef wayland-protocols-1.33.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 2cfaa830e5..50a08d1988 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.32 +WAYLAND_PROTOCOLS_VERSION = 1.33 WAYLAND_PROTOCOLS_SITE = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz WAYLAND_PROTOCOLS_LICENSE = MIT -- 2.34.1 From ju.o at free.fr Tue Feb 13 20:49:15 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 13 Feb 2024 21:49:15 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add lvm2 runtime test Message-ID: <20240213204915.27898-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + support/testing/tests/package/test_lvm2.py | 163 ++++++++++++++++++ .../package/test_lvm2/linux-lvm2.fragment | 2 + 3 files changed, 167 insertions(+) create mode 100644 support/testing/tests/package/test_lvm2.py create mode 100644 support/testing/tests/package/test_lvm2/linux-lvm2.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..e6d79f3675 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1810,6 +1810,8 @@ F: support/testing/tests/package/test_libgpgme.py F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lrzip.py F: support/testing/tests/package/test_ltrace.py +F: support/testing/tests/package/test_lvm2.py +F: support/testing/tests/package/test_lvm2/ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py diff --git a/support/testing/tests/package/test_lvm2.py b/support/testing/tests/package/test_lvm2.py new file mode 100644 index 0000000000..bdbae7a4ec --- /dev/null +++ b/support/testing/tests/package/test_lvm2.py @@ -0,0 +1,163 @@ +import os +import subprocess + +import infra.basetest + + +class TestLvm2(infra.basetest.BRTest): + # This test creates a lvm2 volume. A specific Kernel need to be + # built with a config fragment enabling this support. This test + # also uses resize2fs from e2fsprogs. + kernel_fragment = \ + infra.filepath("tests/package/test_lvm2/linux-lvm2.fragment") + config = \ + f""" + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.77" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_E2FSPROGS=y + BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y + BR2_PACKAGE_LVM2=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def get_free_disk_space(self, path): + out, ret = self.emulator.run(f"df -k {path}") + self.assertEqual(ret, 0) + return int(out[1].split()[3]) + + def test_run(self): + # Test configuration: + storage_devs = ["/dev/vda", "/dev/vdb", "/dev/vdc"] + storage_size = 16 # Mega Bytes + lvm_vg = "br_vg" # Volume Group name + lvm_lv = "br_lv" # Logical Volume name + lv_dev = f"/dev/{lvm_vg}/{lvm_lv}" # Logical Volume dev name + mnt_pt = "/mnt/lvm2-storage" + data_file = f"{mnt_pt}/data.bin" + + qemu_storage_opts = [] + for i in range(len(storage_devs)): + disk_file = os.path.join(self.builddir, "images", f"disk{i}.img") + self.emulator.logfile.write(f"Creating disk image: {disk_file}\n") + self.emulator.logfile.flush() + subprocess.check_call( + ["dd", "if=/dev/zero", f"of={disk_file}", + "bs=1M", f"count={storage_size}"], + stdout=self.emulator.logfile, + stderr=self.emulator.logfile) + opts = ["-drive", f"file={disk_file},if=virtio,format=raw"] + qemu_storage_opts += opts + + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-initrd", img] + qemu_storage_opts) + self.emulator.login() + + # Test the program can execute. + self.assertRunOk("lvm version") + + # We did not created any Physical Volume yet. We should NOT + # see any of our storage devices in a pvscan. + out, ret = self.emulator.run("pvscan") + self.assertEqual(ret, 0) + for dev in storage_devs: + self.assertNotIn(dev, "\n".join(out)) + + # We initialize our Physical Volumes (PVs). + pv_devs = " ".join(storage_devs) + self.assertRunOk(f"pvcreate {pv_devs}") + + # We run few diagnostic commands related to PVs. + self.assertRunOk(f"pvck {pv_devs}") + self.assertRunOk(f"pvdisplay {pv_devs}") + self.assertRunOk("pvs") + + # Now we initialized the PVs, we should see them in a pvscan. + out, ret = self.emulator.run("pvscan") + self.assertEqual(ret, 0) + for dev in storage_devs: + self.assertIn(dev, "\n".join(out)) + + # We create a Volume Group (VG) including two of our three + # PVs. + cmd = f"vgcreate {lvm_vg} {storage_devs[0]} {storage_devs[1]}" + self.assertRunOk(cmd) + + # We run few diagnostic commands related to VGs. + self.assertRunOk(f"vgck {lvm_vg}") + self.assertRunOk(f"vgdisplay {lvm_vg}") + self.assertRunOk("vgscan") + self.assertRunOk("vgs") + + # We create a Logical Volume (LV) in our VG. + self.assertRunOk(f"lvcreate -l 100%FREE -n {lvm_lv} {lvm_vg}") + + # We check LVM created the LV device. + self.assertRunOk(f"ls -al {lv_dev}") + + # We run few diagnostic commands related to LVs. + self.assertRunOk("lvscan") + self.assertRunOk("lvs") + + # We create a ext4 filesystem on our LV. + self.assertRunOk(f"mkfs.ext4 {lv_dev}") + + # We create a mount point directory and mount the device. + self.assertRunOk(f"mkdir -p {mnt_pt}") + self.assertRunOk(f"mount {lv_dev} {mnt_pt}") + + # We create a data file in our new filesystem. Note: this file + # is slightly larger than a single PV. This data file should + # span over the two PVs in the VG. + data_size = storage_size + 4 + cmd = f"dd if=/dev/urandom of={data_file} bs=1M count={data_size}" + self.assertRunOk(cmd) + + # We compute the hash of our data, and save it for later. + hash_cmd = f"sha256sum {data_file}" + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + data_sha256 = out[0] + + # We compute the free space of the mount point. + fs_free_space = self.get_free_disk_space(mnt_pt) + + # We extend of VG with our third PV. + self.assertRunOk(f"vgextend {lvm_vg} {storage_devs[2]}") + + # We grow the LV to use all the space of the VG. + self.assertRunOk(f"lvresize -l +100%FREE {lvm_vg}/{lvm_lv}") + + # We resize the filesystem to use all the LV space. + self.assertRunOk(f"resize2fs {lv_dev}") + + # Now we grew the LV and resized the filesystem, we recompute + # the free space and check we have more. + fs2_free_space = self.get_free_disk_space(mnt_pt) + self.assertGreater(fs2_free_space, fs_free_space) + + # With all those on-the-fly operations on the mounted + # filesystem, the data file should be intact. We should + # recompute the same data checksum as before. + out, ret = self.emulator.run(hash_cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], data_sha256) + + # Finally, we unmount the filesystem. It should not contain + # any error. + self.assertRunOk(f"umount {mnt_pt}") + self.assertRunOk(f"e2fsck -f -n {lv_dev}") diff --git a/support/testing/tests/package/test_lvm2/linux-lvm2.fragment b/support/testing/tests/package/test_lvm2/linux-lvm2.fragment new file mode 100644 index 0000000000..0fade167a3 --- /dev/null +++ b/support/testing/tests/package/test_lvm2/linux-lvm2.fragment @@ -0,0 +1,2 @@ +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y -- 2.43.1 From fontaine.fabrice at gmail.com Tue Feb 13 21:00:51 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 13 Feb 2024 22:00:51 +0100 Subject: [Buildroot] [PATCH 1/1] package/botan: fix uclibc build Message-ID: <20240213210051.162913-1-fontaine.fabrice@gmail.com> getentropy is enabled by default since version 3.0 and https://github.com/randombit/botan/commit/8642f2a99deefc85cdb512ee50d9f62c5e0ae4b8 and explicit_bzero is also enabled since version 3.0 and https://github.com/randombit/botan/commit/e6819a380fb67c1be546dc618248b62d93266423 resulting in the following build failure since bump to version 3.2.0 in commit 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813: src/lib/entropy/getentropy/getentropy.cpp:26:9: error: '::getentropy' has not been declared; did you mean 'Getentropy'? 26 | if(::getentropy(buf.data(), buf.size()) == 0) { | ^~~~~~~~~~ | Getentropy Fixes: 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 - http://autobuild.buildroot.org/results/d58c4730c770467b42af426545dd917ecc5fed17 Signed-off-by: Fabrice Fontaine --- package/botan/botan.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 7c290f04ad..88dbfa5807 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -49,7 +49,7 @@ BOTAN_CONF_OPTS += --without-stack-protector endif ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -BOTAN_CONF_OPTS += --without-os-feature=getauxval +BOTAN_CONF_OPTS += --without-os-feature=explicit_bzero,getauxval,getentropy endif ifeq ($(BR2_PACKAGE_BOOST_FILESYSTEM)$(BR2_PACKAGE_BOOST_SYSTEM),yy) -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 13 21:05:23 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 13 Feb 2024 22:05:23 +0100 Subject: [Buildroot] [PATCH 1/1] Revert "package/crun: allow building with uClibc" Message-ID: <20240213210523.166319-1-fontaine.fabrice@gmail.com> This reverts commit 223596c75d73a7eb29152235d3c5d9bf53bd58f5 indeed fexecve is only available since https://github.com/wbx-github/uclibc-ng/commit/858ffad217076227089cc17eb832db0bd1497792 resulting in the following build failure with uclibc < 1.0.33: /home/thomas/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arceb-snps-linux-uclibc/9.2.1/../../../../arceb-snps-linux-uclibc/bin/ld: libcrun_testing.a(libcrun_testing_a-cloned_binary.o): in function `ensure_cloned_binary': /home/thomas/autobuild/instance-3/output-1/build/crun-1.8.4/src/libcrun/cloned_binary.c:540: undefined reference to `fexecve' Fixes: 223596c75d73a7eb29152235d3c5d9bf53bd58f5 - http://autobuild.buildroot.org/results/9c4488d5d26e575f39bcbaed8e0793ed1cdb8cd5 Signed-off-by: Fabrice Fontaine --- package/crun/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/crun/Config.in b/package/crun/Config.in index f6a1ec7c66..bbed21817e 100644 --- a/package/crun/Config.in +++ b/package/crun/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_CRUN bool "crun" depends on BR2_USE_MMU # fork() + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h - select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_YAJL # libocispec help crun is a fast and low-memory OCI Container Runtime in C. -- 2.43.0 From james.hilliard1 at gmail.com Tue Feb 13 21:14:47 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:47 -0700 Subject: [Buildroot] [PATCH v8 01/26] package/python-poetry-core: new host package Message-ID: <20240213211512.3918044-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - update to 1.7.0 - drop patch which is now upstream --- package/python-poetry-core/python-poetry-core.hash | 5 +++++ package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-poetry-core/python-poetry-core.hash create mode 100644 package/python-poetry-core/python-poetry-core.mk diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash new file mode 100644 index 0000000000..c6b180c852 --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/poetry-core/json +md5 7461547cac0e0e9c8cd7463aa87e7470 poetry_core-1.7.0.tar.gz +sha256 8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74 poetry_core-1.7.0.tar.gz +# Locally computed sha256 checksums +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk new file mode 100644 index 0000000000..4ca587b11d --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-poetry-core +# +################################################################################ + +PYTHON_POETRY_CORE_VERSION = 1.7.0 +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/cb/1c/af7f886e723b2dfbaea9b8a739153f227b386dd856cf956f9fd0ed0a502b +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 +PYTHON_POETRY_CORE_LICENSE = MIT +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:48 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:48 -0700 Subject: [Buildroot] [PATCH v8 02/26] package/python-terminaltables: use correct pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-2-james.hilliard1@gmail.com> We need to migrate python-terminaltables to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Upstream has merged a patch replacing poetry with poetry-core, however we can not backport this using a patch file due to CRLF line ending issues so we will have to apply the change in the patch using sed instead. See upstream commit: https://github.com/matthewdeanmartin/terminaltables/commit/9e3dda0efb54fee6934c744a13a7336d24c6e9e9 Signed-off-by: James Hilliard --- Changes v1 -> v2: - add more details regarding pep517 frontend compatibility --- package/python-terminaltables/python-terminaltables.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index b31ed332b6..385c71ae2d 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -7,8 +7,16 @@ PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 -PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools +PYTHON_TERMINALTABLES_SETUP_TYPE = pep517 PYTHON_TERMINALTABLES_LICENSE = MIT PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE +PYTHON_TERMINALTABLES_DEPENDENCIES = host-python-poetry-core + +# we can't use a normal patch file due to different line endings +define PYTHON_TERMINALTABLES_USE_POETRY_CORE + $(SED) 's/requires = \["poetry>=0.12"\]/requires = \["poetry-core>=1.0.0"\]/' $(@D)/pyproject.toml + $(SED) 's/build-backend = "poetry.masonry.api"/build-backend = "poetry.core.masonry.api"/' $(@D)/pyproject.toml +endef +PYTHON_TERMINALTABLES_POST_PATCH_HOOKS += PYTHON_TERMINALTABLES_USE_POETRY_CORE $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:49 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:49 -0700 Subject: [Buildroot] [PATCH v8 03/26] package/python-setuptools-rust: add host setuptools-scm dependency In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-3-james.hilliard1@gmail.com> We need host-python-setuptools-scm for python-setuptools-rust to build correctly when using a pep517 frontend. Fixes: * Getting build dependencies for wheel... running egg_info writing setuptools_rust.egg-info/PKG-INFO writing dependency_links to setuptools_rust.egg-info/dependency_links.txt writing entry points to setuptools_rust.egg-info/entry_points.txt writing requirements to setuptools_rust.egg-info/requires.txt writing top-level names to setuptools_rust.egg-info/top_level.txt reading manifest file 'setuptools_rust.egg-info/SOURCES.txt' reading manifest template 'MANIFEST.in' adding license file 'LICENSE' writing manifest file 'setuptools_rust.egg-info/SOURCES.txt' ERROR Missing dependencies: setuptools_scm Signed-off-by: James Hilliard --- package/python-setuptools-rust/python-setuptools-rust.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index f07263becf..e664a5604f 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -10,6 +10,9 @@ PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/f2/40/f1e9 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-semantic-version +HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + host-rustc \ + host-python-semantic-version \ + host-python-setuptools-scm $(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:50 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:50 -0700 Subject: [Buildroot] [PATCH v8 04/26] package/python-setuptools: revert to last version with functional --build-option In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-4-james.hilliard1@gmail.com> A recent change in setuptools accidentially broke the ability to pass build_ext args via the --build-option config setting. Lets downgrade to the last working version for now. Signed-off-by: James Hilliard --- package/python-setuptools/python-setuptools.hash | 4 ++-- package/python-setuptools/python-setuptools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 7f13ac3896..9c971eec11 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools/json -md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz -sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz +md5 d967ca2ba7f46db887daee2d5c9bd6a2 setuptools-68.2.2.tar.gz +sha256 4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 setuptools-68.2.2.tar.gz # Locally computed sha256 checksums sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 0aea3c6cfa..f26f427ccc 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 69.0.3 +PYTHON_SETUPTOOLS_VERSION = 68.2.2 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9 PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:51 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:51 -0700 Subject: [Buildroot] [PATCH v8 05/26] package/python-pyyaml: add cython for host-python-pyyaml In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-5-james.hilliard1@gmail.com> When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for pyyaml. Signed-off-by: James Hilliard --- package/python-pyyaml/python-pyyaml.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 846c57df4f..4ab91ca5f6 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -14,7 +14,8 @@ PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 -HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml +HOST_PYTHON_PYYAML_DEPENDENCIES = host-python-cython host-libyaml +HOST_PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 $(eval $(python-package)) $(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:52 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:52 -0700 Subject: [Buildroot] [PATCH v8 06/26] package/python-aiofiles: migrate to hatching pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-6-james.hilliard1@gmail.com> When building with a pep517 frontend we need to use the specified build backend as opposed to the fallback setuptools build which only works when not building with a pep517 frontend. Fixes: ERROR Backend 'hatchling.build' is not available. Signed-off-by: James Hilliard --- package/python-aiofiles/python-aiofiles.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index 582f7908cd..954647bf76 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -7,8 +7,9 @@ PYTHON_AIOFILES_VERSION = 23.2.1 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/af/41/cfed10bc64d774f497a86e5ede9248e1d062db675504b41c320954d99641 -PYTHON_AIOFILES_SETUP_TYPE = setuptools +PYTHON_AIOFILES_SETUP_TYPE = pep517 PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE +PYTHON_AIOFILES_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:53 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:53 -0700 Subject: [Buildroot] [PATCH v8 07/26] package/python-aiologstash: migrate to flit build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-7-james.hilliard1@gmail.com> We need to add a patch which selects the correct flit build backend. As flit is configured as the pep517 build backend for aiologstash we need to migrate from setuptools to flit prior to migrating setuptools to pep517 as the frontend will not fall back to using setuptools once migrated. Signed-off-by: James Hilliard --- ...Fix-flit_core-build-requires-backend.patch | 31 +++++++++++++++++++ .../python-aiologstash/python-aiologstash.mk | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch diff --git a/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch b/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch new file mode 100644 index 0000000000..99a150a344 --- /dev/null +++ b/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch @@ -0,0 +1,31 @@ +From 3c4d1203eb9ee3dbe79b096d587c9baaf8b802ed Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 11 Mar 2022 13:26:31 -0700 +Subject: [PATCH] Fix flit_core build requires/backend. + +Only flit_core should be required by pyproject.toml, the regular flit +package is the pep517 frontend which is not what should be set for the +build system. + +Signed-off-by: James Hilliard +Upstream: https://github.com/aio-libs/aiologstash/pull/258 +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 7bdaebb..252a660 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] +-requires = ["flit"] +-build-backend = "flit.buildapi" ++requires = ["flit_core"] ++build-backend = "flit_core.buildapi" + + [tool.flit.metadata] + module = "aiologstash" +-- +2.34.1 + diff --git a/package/python-aiologstash/python-aiologstash.mk b/package/python-aiologstash/python-aiologstash.mk index de0ed820a0..bcf60a72e9 100644 --- a/package/python-aiologstash/python-aiologstash.mk +++ b/package/python-aiologstash/python-aiologstash.mk @@ -7,7 +7,7 @@ PYTHON_AIOLOGSTASH_VERSION = 2.0.0 PYTHON_AIOLOGSTASH_SOURCE = aiologstash-$(PYTHON_AIOLOGSTASH_VERSION).tar.gz PYTHON_AIOLOGSTASH_SITE = https://files.pythonhosted.org/packages/1c/dc/382861d5d25ccc976d02118922598fc4547f74f3287793e270ed614d8176 -PYTHON_AIOLOGSTASH_SETUP_TYPE = setuptools +PYTHON_AIOLOGSTASH_SETUP_TYPE = flit PYTHON_AIOLOGSTASH_LICENSE = MIT PYTHON_AIOLOGSTASH_LICENSE_FILES = LICENSE -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:54 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:54 -0700 Subject: [Buildroot] [PATCH v8 08/26] package/python-bleak: use correct pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-8-james.hilliard1@gmail.com> We need to migrate python-bleak to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-bleak/python-bleak.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index ed3c3f2f93..716b6327ed 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -7,8 +7,9 @@ PYTHON_BLEAK_VERSION = 0.21.1 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/6a/c0/3aca655fa43b8ff5340d99fac4e67061f53f42f092fc847bdd0559d67846 -PYTHON_BLEAK_SETUP_TYPE = setuptools +PYTHON_BLEAK_SETUP_TYPE = pep517 PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE +PYTHON_BLEAK_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:55 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:55 -0700 Subject: [Buildroot] [PATCH v8 09/26] package/python-canopen: add setuptools-scm build dependency In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-9-james.hilliard1@gmail.com> The host-python-setuptools-scm dependency needs to be added prior to migrating setuptools to pep517 as this dependency is listed as a build requirement in the pyproject.toml. Signed-off-by: James Hilliard --- package/python-canopen/python-canopen.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index 963c4ab801..09ec595ec6 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -10,5 +10,6 @@ PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/49/55/67e555f6f4ea PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt +PYTHON_CANOPEN_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:56 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:56 -0700 Subject: [Buildroot] [PATCH v8 10/26] package/python-dbus-fast: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-10-james.hilliard1@gmail.com> We need to migrate python-dbus-fast to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. We do need to additinally keep a dependency on host-python-setuptools as that is specified as an additional build requirement. Signed-off-by: James Hilliard --- package/python-dbus-fast/python-dbus-fast.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/python-dbus-fast/python-dbus-fast.mk b/package/python-dbus-fast/python-dbus-fast.mk index b890177c74..1456ce5e4c 100644 --- a/package/python-dbus-fast/python-dbus-fast.mk +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -7,10 +7,13 @@ PYTHON_DBUS_FAST_VERSION = 2.12.0 PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/f5/8c/220fcbe4337b842d730d5752f207fc8efd3a02405c71c329e61218e947b8 -PYTHON_DBUS_FAST_SETUP_TYPE = setuptools +PYTHON_DBUS_FAST_SETUP_TYPE = pep517 PYTHON_DBUS_FAST_LICENSE = MIT PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE PYTHON_DBUS_FAST_ENV = REQUIRE_CYTHON=1 -PYTHON_DBUS_FAST_DEPENDENCIES = host-python-cython +PYTHON_DBUS_FAST_DEPENDENCIES = \ + host-python-cython \ + host-python-poetry-core \ + host-python-setuptools $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:57 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:57 -0700 Subject: [Buildroot] [PATCH v8 11/26] package/python-dnspython: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-11-james.hilliard1@gmail.com> We need to migrate python-dnspython to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-dnspython/python-dnspython.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-dnspython/python-dnspython.mk b/package/python-dnspython/python-dnspython.mk index 1459ec8881..f0df733143 100644 --- a/package/python-dnspython/python-dnspython.mk +++ b/package/python-dnspython/python-dnspython.mk @@ -9,9 +9,9 @@ PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).tar.gz PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/65/2d/372a20e52a87b2ba0160997575809806111a72e18aa92738daccceb8d2b9 PYTHON_DNSPYTHON_LICENSE = ISC PYTHON_DNSPYTHON_LICENSE_FILES = LICENSE -PYTHON_DNSPYTHON_SETUP_TYPE = setuptools -PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm -HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm +PYTHON_DNSPYTHON_SETUP_TYPE = pep517 +PYTHON_DNSPYTHON_DEPENDENCIES = host-python-poetry-core +HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) $(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:58 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:58 -0700 Subject: [Buildroot] [PATCH v8 12/26] package/python-flask-babel: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-12-james.hilliard1@gmail.com> We need to migrate python-flask-babel to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-flask-babel/python-flask-babel.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-flask-babel/python-flask-babel.mk b/package/python-flask-babel/python-flask-babel.mk index b3ecdf6cf6..3970a14db1 100644 --- a/package/python-flask-babel/python-flask-babel.mk +++ b/package/python-flask-babel/python-flask-babel.mk @@ -8,7 +8,8 @@ PYTHON_FLASK_BABEL_VERSION = 4.0.0 PYTHON_FLASK_BABEL_SOURCE = flask_babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz PYTHON_FLASK_BABEL_SITE = https://files.pythonhosted.org/packages/58/1a/4c65e3b90bda699a637bfb7fb96818b0a9bbff7636ea91aade67f6020a31 PYTHON_FLASK_BABEL_LICENSE = BSD-3-Clause -PYTHON_FLASK_BABEL_SETUP_TYPE = setuptools +PYTHON_FLASK_BABEL_SETUP_TYPE = pep517 PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE +PYTHON_FLASK_BABEL_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:14:59 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:14:59 -0700 Subject: [Buildroot] [PATCH v8 13/26] package/python-flask-wtf: migrate to hatching pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-13-james.hilliard1@gmail.com> When building with a pep517 frontend we need to use the specified build backend as opposed to the fallback setuptools build which only works when not building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is hatchling and not setuptools. Signed-off-by: James Hilliard --- package/python-flask-wtf/python-flask-wtf.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-flask-wtf/python-flask-wtf.mk b/package/python-flask-wtf/python-flask-wtf.mk index 8274585ad3..bb32d55e25 100644 --- a/package/python-flask-wtf/python-flask-wtf.mk +++ b/package/python-flask-wtf/python-flask-wtf.mk @@ -9,6 +9,7 @@ PYTHON_FLASK_WTF_SOURCE = flask_wtf-$(PYTHON_FLASK_WTF_VERSION).tar.gz PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/9b/ef/b6ec35e02f479f6e76e02ede14594c9cfa5e6dcbab6ea0e82fa413993a2a PYTHON_FLASK_WTF_LICENSE = BSD-3-Clause PYTHON_FLASK_WTF_LICENSE_FILES = LICENSE.rst -PYTHON_FLASK_WTF_SETUP_TYPE = setuptools +PYTHON_FLASK_WTF_SETUP_TYPE = pep517 +PYTHON_FLASK_WTF_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:00 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:00 -0700 Subject: [Buildroot] [PATCH v8 14/26] package/python-expandvars: new host package In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-14-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/python-expandvars/python-expandvars.hash | 5 +++++ package/python-expandvars/python-expandvars.mk | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 package/python-expandvars/python-expandvars.hash create mode 100644 package/python-expandvars/python-expandvars.mk diff --git a/package/python-expandvars/python-expandvars.hash b/package/python-expandvars/python-expandvars.hash new file mode 100644 index 0000000000..0123ed5420 --- /dev/null +++ b/package/python-expandvars/python-expandvars.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/expandvars/json +md5 8091f578a547e2b4b9df59100a179266 expandvars-0.12.0.tar.gz +sha256 7d1adfa55728cf4b5d812ece3d087703faea953e0c0a1a78415de9df5024d844 expandvars-0.12.0.tar.gz +# Locally computed sha256 checksums +sha256 b8a43c35080fc5855e4f8171e4d0d002f6ff1633d8cfc0b5dee0ac4ced2deac7 LICENSE diff --git a/package/python-expandvars/python-expandvars.mk b/package/python-expandvars/python-expandvars.mk new file mode 100644 index 0000000000..5c9a7249b3 --- /dev/null +++ b/package/python-expandvars/python-expandvars.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-expandvars +# +################################################################################ + +PYTHON_EXPANDVARS_VERSION = 0.12.0 +PYTHON_EXPANDVARS_SOURCE = expandvars-$(PYTHON_EXPANDVARS_VERSION).tar.gz +PYTHON_EXPANDVARS_SITE = https://files.pythonhosted.org/packages/2b/a5/46d1f58edcae1d632fafdfee313e378240e002ae45d26502bac938bd8751 +PYTHON_EXPANDVARS_SETUP_TYPE = pep517 +PYTHON_EXPANDVARS_LICENSE = MIT +PYTHON_EXPANDVARS_LICENSE_FILES = LICENSE +HOST_PYTHON_EXPANDVARS_DEPENDENCIES = host-python-hatchling + +$(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:01 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:01 -0700 Subject: [Buildroot] [PATCH v8 15/26] package/python-frozenlist: migrate to in-tree pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-15-james.hilliard1@gmail.com> When building with a pep517 frontend we need to use the specified build backend as opposed to the fallback setuptools build which only works when not building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is hatchling and not setuptools. The custom in tree backend depends on setuptools and expandvars, additionally it depends on cython 3 unless disabled. As we do not currently support cython 3 lets use the pure python build instead. Signed-off-by: James Hilliard --- package/python-frozenlist/python-frozenlist.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index 9333598808..92670b3cbd 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -7,8 +7,12 @@ PYTHON_FROZENLIST_VERSION = 1.4.1 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/cf/3d/2102257e7acad73efc4a0c306ad3953f68c504c16982bbdfee3ad75d8085 -PYTHON_FROZENLIST_SETUP_TYPE = setuptools +PYTHON_FROZENLIST_SETUP_TYPE = pep517 PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE +PYTHON_FROZENLIST_DEPENDENCIES = \ + host-python-expandvars \ + host-python-setuptools +PYTHON_FROZENLIST_BUILD_OPTS = -C=pure-python=true $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:02 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:02 -0700 Subject: [Buildroot] [PATCH v8 16/26] package/python-humanize: add setuptools-scm build dependency In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-16-james.hilliard1@gmail.com> The host-python-setuptools-scm will be enforced once we migrate setuptools to use a pep517 build frontend. Signed-off-by: James Hilliard --- package/python-humanize/python-humanize.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-humanize/python-humanize.mk b/package/python-humanize/python-humanize.mk index 04cb0713fc..6155954b82 100644 --- a/package/python-humanize/python-humanize.mk +++ b/package/python-humanize/python-humanize.mk @@ -10,5 +10,6 @@ PYTHON_HUMANIZE_SITE = https://files.pythonhosted.org/packages/51/19/3e1adf0e7a8 PYTHON_HUMANIZE_SETUP_TYPE = setuptools PYTHON_HUMANIZE_LICENSE = MIT PYTHON_HUMANIZE_LICENSE_FILES = LICENCE +PYTHON_HUMANIZE_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:03 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:03 -0700 Subject: [Buildroot] [PATCH v8 17/26] package/python-iso8601: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-17-james.hilliard1@gmail.com> We need to migrate python-iso8601 to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-iso8601/python-iso8601.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-iso8601/python-iso8601.mk b/package/python-iso8601/python-iso8601.mk index ce25a2fb28..080daa4693 100644 --- a/package/python-iso8601/python-iso8601.mk +++ b/package/python-iso8601/python-iso8601.mk @@ -7,8 +7,9 @@ PYTHON_ISO8601_VERSION = 2.1.0 PYTHON_ISO8601_SOURCE = iso8601-$(PYTHON_ISO8601_VERSION).tar.gz PYTHON_ISO8601_SITE = https://files.pythonhosted.org/packages/b9/f3/ef59cee614d5e0accf6fd0cbba025b93b272e626ca89fb70a3e9187c5d15 -PYTHON_ISO8601_SETUP_TYPE = setuptools +PYTHON_ISO8601_SETUP_TYPE = pep517 PYTHON_ISO8601_LICENSE = MIT PYTHON_ISO8601_LICENSE_FILES = LICENSE +PYTHON_ISO8601_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:04 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:04 -0700 Subject: [Buildroot] [PATCH v8 18/26] package/python-cppy: add setuptools-scm build dependency In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-18-james.hilliard1@gmail.com> The host-python-setuptools-scm dependency needs to be added prior to migrating setuptools to pep517 as this dependency is listed as a build requirement in the pyproject.toml. Signed-off-by: James Hilliard --- package/python-cppy/python-cppy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-cppy/python-cppy.mk b/package/python-cppy/python-cppy.mk index adadc352d3..5bfd5a0f16 100644 --- a/package/python-cppy/python-cppy.mk +++ b/package/python-cppy/python-cppy.mk @@ -10,5 +10,6 @@ PYTHON_CPPY_SITE = https://files.pythonhosted.org/packages/c5/7e/6cc5acd93752ee5 PYTHON_CPPY_LICENSE = BSD-3-Clause PYTHON_CPPY_LICENSE_FILES = LICENSE PYTHON_CPPY_SETUP_TYPE = setuptools +HOST_PYTHON_CPPY_DEPENDENCIES = host-python-setuptools-scm $(eval $(host-python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:05 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:05 -0700 Subject: [Buildroot] [PATCH v8 19/26] package/python-pylibftdi: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-19-james.hilliard1@gmail.com> We need to migrate python-pylibftdi to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-pylibftdi/python-pylibftdi.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/python-pylibftdi/python-pylibftdi.mk b/package/python-pylibftdi/python-pylibftdi.mk index 7dca37e416..7607c90d4a 100644 --- a/package/python-pylibftdi/python-pylibftdi.mk +++ b/package/python-pylibftdi/python-pylibftdi.mk @@ -9,7 +9,9 @@ PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/d2/ce/ff3e83f3a14eb5b7950ff3657f07cdc3033dd0ded5c8ed093db515e1de33 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt -PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi -PYTHON_PYLIBFTDI_SETUP_TYPE = setuptools +PYTHON_PYLIBFTDI_SETUP_TYPE = pep517 +PYTHON_PYLIBFTDI_DEPENDENCIES = \ + host-python-poetry-core \ + libftdi $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:06 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:06 -0700 Subject: [Buildroot] [PATCH v8 20/26] package/python-sip: add missing setuptools dependency In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-20-james.hilliard1@gmail.com> The python-sip package requires distutils which is no longer included with python but is now part of setuptools. Signed-off-by: James Hilliard --- package/python-sip/python-sip.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 3e015fa16c..392928f01e 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -9,8 +9,8 @@ PYTHON_SIP_SOURCE = sip-$(PYTHON_SIP_VERSION).tar.gz PYTHON_SIP_SITE = https://www.riverbankcomputing.com/static/Downloads/sip/$(PYTHON_SIP_VERSION) PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 -PYTHON_SIP_DEPENDENCIES = python3 qt5base -HOST_PYTHON_SIP_DEPENDENCIES = host-python3 +PYTHON_SIP_DEPENDENCIES = host-python-setuptools python3 qt5base +HOST_PYTHON_SIP_DEPENDENCIES = host-python3 host-python-setuptools define HOST_PYTHON_SIP_CONFIGURE_CMDS (cd $(@D); \ -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:07 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:07 -0700 Subject: [Buildroot] [PATCH v8 21/26] package/python-rsa: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-21-james.hilliard1@gmail.com> We need to migrate python-rsa to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-rsa/python-rsa.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk index d84ba8b431..69a6309b19 100644 --- a/package/python-rsa/python-rsa.mk +++ b/package/python-rsa/python-rsa.mk @@ -7,9 +7,10 @@ PYTHON_RSA_VERSION = 4.9 PYTHON_RSA_SOURCE = rsa-$(PYTHON_RSA_VERSION).tar.gz PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/aa/65/7d973b89c4d2351d7fb232c2e452547ddfa243e93131e7cfa766da627b52 -PYTHON_RSA_SETUP_TYPE = setuptools +PYTHON_RSA_SETUP_TYPE = pep517 PYTHON_RSA_LICENSE = Apache-2.0 PYTHON_RSA_LICENSE_FILES = LICENSE PYTHON_RSA_CPE_ID_VALID = YES +PYTHON_RSA_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:08 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:08 -0700 Subject: [Buildroot] [PATCH v8 22/26] package/python-sh: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-22-james.hilliard1@gmail.com> We need to migrate python-sh to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard --- package/python-sh/python-sh.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-sh/python-sh.mk b/package/python-sh/python-sh.mk index af4da3f6c9..29843d645b 100644 --- a/package/python-sh/python-sh.mk +++ b/package/python-sh/python-sh.mk @@ -7,8 +7,9 @@ PYTHON_SH_VERSION = 2.0.6 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz PYTHON_SH_SITE = https://files.pythonhosted.org/packages/cd/51/7355831d8e1cee8348157d769ccda8a31ca9fa0548e7f93d87837d83866d -PYTHON_SH_SETUP_TYPE = setuptools +PYTHON_SH_SETUP_TYPE = pep517 PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt +PYTHON_SH_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:10 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:10 -0700 Subject: [Buildroot] [PATCH v8 24/26] package/python-sqlalchemy: add cython for python-sqlalchemy In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-24-james.hilliard1@gmail.com> When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for python-sqlalchemy. Signed-off-by: James Hilliard --- package/python-sqlalchemy/python-sqlalchemy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 400ad92f63..167c3a4498 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -12,5 +12,6 @@ PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE PYTHON_SQLALCHEMY_CPE_ID_VENDOR = sqlalchemy PYTHON_SQLALCHEMY_CPE_ID_PRODUCT = sqlalchemy +PYTHON_SQLALCHEMY_DEPENDENCIES = host-python-cython $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:09 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:09 -0700 Subject: [Buildroot] [PATCH v8 23/26] package/python-simplelogging: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-23-james.hilliard1@gmail.com> We need to migrate package/python-simplelogging to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. We also need to add a patch which switches from poetry to poetry core as we do not support the full poetry package. Signed-off-by: James Hilliard --- ...-Switch-build-backend-to-poetry-core.patch | 31 +++++++++++++++++++ .../python-simplelogging.mk | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch diff --git a/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch b/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch new file mode 100644 index 0000000000..2c345fe268 --- /dev/null +++ b/package/python-simplelogging/0001-Switch-build-backend-to-poetry-core.patch @@ -0,0 +1,31 @@ +From 76c1c545bad28f592405ca1e5bcf6081051c946a Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 13 Feb 2024 13:37:00 -0700 +Subject: [PATCH] Switch build-backend to poetry-core + +poetry-core is the lightweight counterpart of poetry that is intended +to be used as a build-backend. Unlike poetry, it does not require +installing all the dependencies of the package manager, making +the builds much faster. The generated artifacts are the same. + +Signed-off-by: James Hilliard +Upstream: https://github.com/vpoulailleau/simplelogging/pull/230 +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index a89ab64..79403cb 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -55,5 +55,5 @@ commands = + """ + + [build-system] +-requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++requires = ["poetry-core>=1.0.0"] ++build-backend = "poetry.core.masonry.api" +-- +2.34.1 + diff --git a/package/python-simplelogging/python-simplelogging.mk b/package/python-simplelogging/python-simplelogging.mk index 556628613b..dbd9ce3ae3 100644 --- a/package/python-simplelogging/python-simplelogging.mk +++ b/package/python-simplelogging/python-simplelogging.mk @@ -7,8 +7,9 @@ PYTHON_SIMPLELOGGING_VERSION = 0.11.0 PYTHON_SIMPLELOGGING_SOURCE = simplelogging-$(PYTHON_SIMPLELOGGING_VERSION).tar.gz PYTHON_SIMPLELOGGING_SITE = https://files.pythonhosted.org/packages/73/d6/4c06aa7f2c3b9fc09429a1196fd357357cc555de5e16c09b2d12e9db1ebb -PYTHON_SIMPLELOGGING_SETUP_TYPE = setuptools +PYTHON_SIMPLELOGGING_SETUP_TYPE = pep517 PYTHON_SIMPLELOGGING_LICENSE = BSD-3-Clause PYTHON_SIMPLELOGGING_LICENSE_FILES = LICENSE +PYTHON_SIMPLELOGGING_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:11 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:11 -0700 Subject: [Buildroot] [PATCH v8 25/26] package/python-pyzmq: add cython for python-pyzmq In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-25-james.hilliard1@gmail.com> When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for python-pyzmq. Signed-off-by: James Hilliard --- package/python-pyzmq/python-pyzmq.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index 1d9a7d01cb..f1444b9124 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -13,6 +13,7 @@ PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD PYTHON_PYZMQ_SETUP_TYPE = setuptools PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr PYTHON_PYZMQ_DEPENDENCIES = \ + host-python-cython \ host-python-packaging \ host-python-setuptools-scm \ zeromq -- 2.34.1 From james.hilliard1 at gmail.com Tue Feb 13 21:15:12 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 14:15:12 -0700 Subject: [Buildroot] [PATCH v8 26/26] package/pkg-python.mk: migrate setuptools to pep517 In-Reply-To: <20240213211512.3918044-1-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> Message-ID: <20240213211512.3918044-26-james.hilliard1@gmail.com> Now that setuptools and its dependencies are using pep517 we can migrate the setuptools infrastructure itself to use the pep517 build frontend. As part of this we need to migrate the all python packages using _BUILD_OPTS to the new config settings format used by the pep517 build frontend. Use new setup type variables to define setup type specific dependencies instead of using the conditional block. We also need to set --skip-dependency-check for the following packages which specify build dependencies that are not actually required: - python-lxml - python-matplotlib - python-msgpack - python-pymupdf - python-setuptools-scm-git-archive - python-uvloop - python-wsaccel Signed-off-by: James Hilliard Reviewed-by: Yegor Yefremov --- Changes v7 -> v8: - disable dependency enforcement for more packages Changes v6 -> v7: - just disable dependency enforcement for msgpack - rebase Changes v5 -> v6: - use setup type variables for dependencies Changes v4 -> v5: - rebase on next Changes v1 -> v3: - rebase on master - combine setuptools-rust and maturin env variables - drop patch which is now upstream --- package/pkg-python.mk | 160 +++++++++--------- package/python-evdev/python-evdev.mk | 4 +- package/python-lxml/python-lxml.mk | 10 +- package/python-m2crypto/python-m2crypto.mk | 4 +- .../python-matplotlib/python-matplotlib.mk | 1 + package/python-msgpack/python-msgpack.mk | 1 + package/python-pillow/python-pillow.mk | 35 ++-- package/python-psycopg2/python-psycopg2.mk | 5 +- package/python-pymupdf/python-pymupdf.mk | 1 + package/python-pyzmq/python-pyzmq.mk | 4 +- .../python-setuptools-scm-git-archive.mk | 1 + package/python-uvloop/python-uvloop.mk | 7 +- package/python-wsaccel/python-wsaccel.mk | 1 + 13 files changed, 121 insertions(+), 113 deletions(-) diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 94f28ff841..839f728e2f 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -52,15 +52,62 @@ HOST_PKG_PYTHON_ENV = \ PYTHONNOUSERSITE=1 \ $(HOST_CONFIGURE_OPTS) -# Target setuptools-based packages -PKG_PYTHON_SETUPTOOLS_ENV = \ +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ $(PKG_PYTHON_ENV) -PKG_PYTHON_SETUPTOOLS_CMD = \ - $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') +PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + +PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix + +PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +PKG_PYTHON_PEP517_DEPENDENCIES = \ + host-python-pypa-build \ + host-python-installer + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + $(HOST_PKG_PYTHON_ENV) + +HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ + -m build -n -w + +HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ + $(TOPDIR)/support/scripts/pyinstaller.py \ + dist/* \ + --interpreter=$(HOST_DIR)/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ + --data=$(HOST_DIR) + +# Target setuptools-based packages +PKG_PYTHON_SETUPTOOLS_ENV = \ + $(PKG_PYTHON_PEP517_ENV) PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) build + $(PKG_PYTHON_PEP517_BUILD_CMD) PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ @@ -69,30 +116,24 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --single-version-externally-managed PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install --no-compile \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(TARGET_DIR) + $(PKG_PYTHON_PEP517_INSTALL_TARGET_CMD) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install \ - $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ - --root=$(STAGING_DIR) + $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) + +PKG_PYTHON_SETUPTOOLS_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-setuptools # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - $(HOST_PKG_PYTHON_ENV) + $(HOST_PKG_PYTHON_PEP517_ENV) HOST_PKG_PYTHON_SETUPTOOLS_BUILD_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) build + $(HOST_PKG_PYTHON_PEP517_BUILD_CMD) HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD = \ - $(PKG_PYTHON_SETUPTOOLS_CMD) \ - install \ - --prefix=$(HOST_DIR) \ - --root=/ \ - --single-version-externally-managed + $(HOST_PKG_PYTHON_PEP517_INSTALL_CMD) # Target setuptools-rust-based packages PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ @@ -109,6 +150,10 @@ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_TARGET_CMD = \ PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_CMD) +PKG_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + $(PKG_PYTHON_SETUPTOOLS_DEPENDENCIES) \ + host-python-setuptools-rust + # Host setuptools-rust-based packages HOST_PKG_PYTHON_SETUPTOOLS_RUST_ENV = \ $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \ @@ -121,52 +166,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_RUST_BUILD_CMD = \ HOST_PKG_PYTHON_SETUPTOOLS_RUST_INSTALL_CMD = \ $(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_CMD) -# Target pep517-based packages -PKG_PYTHON_PEP517_ENV = \ - $(PKG_PYTHON_ENV) - -PKG_PYTHON_PEP517_BUILD_CMD = \ - -m build -n -w - -PKG_PYTHON_PEP517_INSTALL_OPTS = \ - --interpreter=/usr/bin/python \ - --script-kind=posix - -PKG_PYTHON_PEP517_INSTALL_TARGET_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ - --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(TARGET_DIR)/usr/bin \ - --data=$(TARGET_DIR)/usr - -PKG_PYTHON_PEP517_INSTALL_STAGING_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ - --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(STAGING_DIR)/usr/bin \ - --data=$(STAGING_DIR)/usr - -# Host pep517-based packages -HOST_PKG_PYTHON_PEP517_ENV = \ - $(HOST_PKG_PYTHON_ENV) - -HOST_PKG_PYTHON_PEP517_BUILD_CMD = \ - -m build -n -w - -HOST_PKG_PYTHON_PEP517_INSTALL_CMD = \ - $(TOPDIR)/support/scripts/pyinstaller.py \ - dist/* \ - --interpreter=$(HOST_DIR)/bin/python \ - --script-kind=posix \ - --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ - --scripts=$(HOST_DIR)/bin \ - --data=$(HOST_DIR) - # Target flit packages PKG_PYTHON_FLIT_ENV = \ $(PKG_PYTHON_PEP517_ENV) @@ -180,6 +179,10 @@ PKG_PYTHON_FLIT_INSTALL_TARGET_CMD = \ PKG_PYTHON_FLIT_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) +PKG_PYTHON_FLIT_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-flit-core + # Host flit packages HOST_PKG_PYTHON_FLIT_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) @@ -215,6 +218,10 @@ PKG_PYTHON_MATURIN_INSTALL_TARGET_CMD = \ PKG_PYTHON_MATURIN_INSTALL_STAGING_CMD = \ $(PKG_PYTHON_PEP517_INSTALL_STAGING_CMD) +PKG_PYTHON_MATURIN_DEPENDENCIES = \ + $(PKG_PYTHON_PEP517_DEPENDENCIES) \ + host-python-maturin + # Host maturin packages HOST_PKG_PYTHON_MATURIN_ENV = \ $(HOST_PKG_PYTHON_PEP517_ENV) \ @@ -293,28 +300,17 @@ else $(2)_DEPENDENCIES += host-python3 endif # ($(4),target) -# Setuptools based packages will need setuptools for the host Python -# interpreter (both host and target). +# Setup type specific dependencies are the same whether we are +# building for the host or the target. # -ifneq ($$(filter setuptools setuptools-rust,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-setuptools -ifeq ($$($(2)_SETUP_TYPE),setuptools-rust) -$(2)_DEPENDENCIES += host-python-setuptools-rust -endif -else ifneq ($$(filter flit maturin pep517,$$($(2)_SETUP_TYPE)),) -$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer -ifeq ($$($(2)_SETUP_TYPE),flit) -$(2)_DEPENDENCIES += host-python-flit-core -endif -ifeq ($$($(2)_SETUP_TYPE),maturin) -$(2)_DEPENDENCIES += host-python-maturin -endif -else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) # Don't add dependency on host-python-installer for # host-python-installer itself, and its dependencies. ifeq ($$(filter host-python-flit-core host-python-installer,$(1)),) $(2)_DEPENDENCIES += host-python-installer endif +else +$(2)_DEPENDENCIES += $$(PKG_PYTHON_$$($(2)_SETUP_TYPE_UPPER)_DEPENDENCIES) endif # Pyo3 based packages(setuptools-rust and maturin) will need rust diff --git a/package/python-evdev/python-evdev.mk b/package/python-evdev/python-evdev.mk index 5cf62b5160..b509b43e8a 100644 --- a/package/python-evdev/python-evdev.mk +++ b/package/python-evdev/python-evdev.mk @@ -12,7 +12,7 @@ PYTHON_EVDEV_LICENSE = Revised BSD License PYTHON_EVDEV_LICENSE_FILES = LICENSE PYTHON_EVDEV_BUILD_OPTS = \ - build_ecodes \ - --evdev-headers $(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h + -C--build-option=build_ecodes \ + -C--build-option=--evdev-headers=$(STAGING_DIR)/usr/include/linux/input.h:$(STAGING_DIR)/usr/include/linux/input-event-codes.h:$(STAGING_DIR)/usr/include/linux/uinput.h $(eval $(python-package)) diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 519a9a77ac..336f954775 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -28,11 +28,13 @@ HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib # python-lxml needs these scripts in order to properly detect libxml2 and # libxslt compiler and linker flags PYTHON_LXML_BUILD_OPTS = \ - --xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ - --xml2-config=$(STAGING_DIR)/usr/bin/xml2-config + --skip-dependency-check + -C--build-option=--xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ + -C--build-option=--xml2-config=$(STAGING_DIR)/usr/bin/xml2-config HOST_PYTHON_LXML_BUILD_OPTS = \ - --xslt-config=$(HOST_DIR)/bin/xslt-config \ - --xml2-config=$(HOST_DIR)/bin/xml2-config + --skip-dependency-check + -C--build-option=--xslt-config=$(HOST_DIR)/bin/xslt-config \ + -C--build-option=--xml2-config=$(HOST_DIR)/bin/xml2-config $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 69a0c28df5..6c07f42d06 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -13,6 +13,8 @@ PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE PYTHON_M2CRYPTO_CPE_ID_VENDOR = m2crypto_project PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig -PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +PYTHON_M2CRYPTO_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--openssl=$(STAGING_DIR)/usr $(eval $(python-package)) diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 4fd2b5f432..5f5d53172e 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -20,6 +20,7 @@ PYTHON_MATPLOTLIB_DEPENDENCIES = \ python-pybind \ qhull PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools +PYTHON_MATPLOTLIB_BUILD_OPTS = --skip-dependency-check ifeq ($(BR2_PACKAGE_PYTHON_MATPLOTLIB_QT),y) PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk index 3ee7c54ce1..9cdf5263de 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -10,6 +10,7 @@ PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/c2/d5/5662032db157 PYTHON_MSGPACK_LICENSE = Apache-2.0 PYTHON_MSGPACK_LICENSE_FILES = COPYING PYTHON_MSGPACK_SETUP_TYPE = setuptools +PYTHON_MSGPACK_BUILD_OPTS = --skip-dependency-check # When set in the environment, whatever the value, MSGPACK_PUREPYTHON drives # using the pure python implementation rather than rely on the C++ native code. diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 10939d8467..7f5b4dd0f9 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -14,61 +14,60 @@ PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools PYTHON_PILLOW_DEPENDENCIES = host-pkgconf -PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing -PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) +PYTHON_PILLOW_BUILD_OPTS = -C--build-option=build_ext -C--build-option=--disable-platform-guessing ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype -PYTHON_PILLOW_BUILD_OPTS += --enable-freetype +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-freetype else -PYTHON_PILLOW_BUILD_OPTS += --disable-freetype +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-freetype endif ifeq ($(BR2_PACKAGE_JPEG),y) PYTHON_PILLOW_DEPENDENCIES += jpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg endif ifeq ($(BR2_PACKAGE_LCMS2),y) PYTHON_PILLOW_DEPENDENCIES += lcms2 -PYTHON_PILLOW_BUILD_OPTS += --enable-lcms +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-lcms else -PYTHON_PILLOW_BUILD_OPTS += --disable-lcms +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-lcms endif ifeq ($(BR2_PACKAGE_LIBXCB),y) PYTHON_PILLOW_DEPENDENCIES += libxcb -PYTHON_PILLOW_BUILD_OPTS += --enable-xcb +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-xcb else -PYTHON_PILLOW_BUILD_OPTS += --disable-xcb +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-xcb endif ifeq ($(BR2_PACKAGE_OPENJPEG),y) PYTHON_PILLOW_DEPENDENCIES += openjpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-jpeg2000 else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg2000 +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-jpeg2000 endif ifeq ($(BR2_PACKAGE_TIFF),y) PYTHON_PILLOW_DEPENDENCIES += tiff -PYTHON_PILLOW_BUILD_OPTS += --enable-tiff +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-tiff else -PYTHON_PILLOW_BUILD_OPTS += --disable-tiff +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-tiff endif ifeq ($(BR2_PACKAGE_WEBP),y) PYTHON_PILLOW_DEPENDENCIES += webp -PYTHON_PILLOW_BUILD_OPTS += --enable-webp +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webp ifeq ($(BR2_PACKAGE_WEBP_DEMUX)$(BR2_PACKAGE_WEBP_MUX),yy) -PYTHON_PILLOW_BUILD_OPTS += --enable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--enable-webpmux else -PYTHON_PILLOW_BUILD_OPTS += --disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webpmux endif else -PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux +PYTHON_PILLOW_BUILD_OPTS += -C--build-option=--disable-webp -C--build-option=--disable-webpmux endif $(eval $(python-package)) diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk index 0149b8d185..1b33b7505d 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -13,7 +13,8 @@ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE PYTHON_PSYCOPG2_DEPENDENCIES = postgresql # Force psycopg2 to use the Buildroot provided postgresql version # instead of the one from the host machine -PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config -PYTHON_PSYCOPG2_INSTALL_TARGET_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config +PYTHON_PSYCOPG2_BUILD_OPTS = \ + -C--build-option=build_ext \ + -C--build-option=--pg-config=$(STAGING_DIR)/usr/bin/pg_config $(eval $(python-package)) diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 639ce0e00e..8825868fb5 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -13,6 +13,7 @@ PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING # No license file included in pip, but it's present on github PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib +PYTHON_PYMUPDF_BUILD_OPTS = --skip-dependency-check PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index f1444b9124..48a298b221 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -11,7 +11,7 @@ PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD PYTHON_PYZMQ_SETUP_TYPE = setuptools -PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr +PYTHON_PYZMQ_BUILD_OPTS = -C--build-option=--zmq=$(STAGING_DIR)/usr PYTHON_PYZMQ_DEPENDENCIES = \ host-python-cython \ host-python-packaging \ @@ -27,7 +27,7 @@ endef PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y) -PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts +PYTHON_PYZMQ_BUILD_OPTS += -C--build-option=--enable-drafts endif $(eval $(python-package)) diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 153343788b..95cfa025b3 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_BUILD_OPTS = --skip-dependency-check $(eval $(host-python-package)) diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk index 285884a2bb..aaeab2805f 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -10,8 +10,11 @@ PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/9c/16/728cc5dde368e PYTHON_UVLOOP_SETUP_TYPE = setuptools PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace --use-system-libuv PYTHON_UVLOOP_DEPENDENCIES = libuv +PYTHON_UVLOOP_BUILD_OPTS = \ + --skip-dependency-check \ + -C--build-option=build_ext \ + -C--build-option=--inplace \ + -C--build-option=--use-system-libuv $(eval $(python-package)) diff --git a/package/python-wsaccel/python-wsaccel.mk b/package/python-wsaccel/python-wsaccel.mk index 1f63aa5c40..7ccb033256 100644 --- a/package/python-wsaccel/python-wsaccel.mk +++ b/package/python-wsaccel/python-wsaccel.mk @@ -10,5 +10,6 @@ PYTHON_WSACCEL_SITE = https://files.pythonhosted.org/packages/94/28/41c0e711b538 PYTHON_WSACCEL_LICENSE = Apache-2.0 PYTHON_WSACCEL_LICENSE_FILES = LICENSE PYTHON_WSACCEL_SETUP_TYPE = setuptools +PYTHON_WSACCEL_BUILD_OPTS = --skip-dependency-check $(eval $(python-package)) -- 2.34.1 From romain.naour at smile.fr Tue Feb 13 21:35:23 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 13 Feb 2024 22:35:23 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> Message-ID: <7e3c7380-a550-4e54-b395-eb568e834a42@smile.fr> Hi Alexander, Le 13/02/2024 ? 20:05, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >> ti-k3-image-gen tool is deprecated an replaced by binman [1]. >> >> All defconfig that was using it have been updated to use U-boot >> binman tool instead. >> >> So, we can safely remove ti-k3-image-gen package. >> >> [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 >> >> Cc: Anand Gadiyar >> Cc: Xuanhao Shi >> Signed-off-by: Romain Naour >> --- >> ?Config.in.legacy????????????????????????? |? 7 ++ >> ?DEVELOPERS??????????????????????????????? |? 2 - >> ?boot/Config.in??????????????????????????? |? 1 - >> ?boot/ti-k3-image-gen/Config.in??????????? | 81 ----------------------- >> ?boot/ti-k3-image-gen/ti-k3-image-gen.hash |? 3 - >> ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?? | 54 --------------- >> ?6 files changed, 7 insertions(+), 141 deletions(-) >> ?delete mode 100644 boot/ti-k3-image-gen/Config.in >> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash >> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk >> >> diff --git a/Config.in.legacy b/Config.in.legacy >> index a869279af7..2b59a65f1c 100644 >> --- a/Config.in.legacy >> +++ b/Config.in.legacy >> @@ -146,6 +146,13 @@ endif >> ? >> ?comment "Legacy options removed in 2024.02" >> ? >> +config BR2_TARGET_TI_K3_IMAGE_GEN >> + bool "ti-k3-image-gen removed" >> + select BR2_LEGACY >> + help >> + ? ti-k3-image-gen tool? has been removed and replaced by >> + ? U-Boot binman tool (requires U-boot >= 2024.01). > > Is commit 6d6228ab8fe5 "am62a: dts: binman: Package tiboot3.bin, tispl.bin, u-boot.img" > in U-Boot repo not what is actually required (since v2023.10)? > At least that's the version which works for me. > Thank you for the info, indeed v2023.10 should be good-enough. I was looking at meta-ti history [1] and I thought that v2024.01 was the minimum u-boot release for complete binman support for all TI K3 SoC variant. I'll fix! [1] https://git.yoctoproject.org/meta-ti/commit/?id=5b5b8b932561d76c5ed50a4210a726df86c649bf Best regards, Romain From ju.o at free.fr Tue Feb 13 21:45:10 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 13 Feb 2024 22:45:10 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: bump to version 2.03.23 Message-ID: <20240213214510.545574-1-ju.o@free.fr> For release notes since 2.03.14, see: https://gitlab.com/lvmteam/lvm2/-/blob/22e482d9655e8d041703af984b81d9b742027a78/WHATS_NEW#L4 This commit removes the package patches 1 and 2 which are now included in the new release. Patches 3 and 4 are kept and renumbered. Signed-off-by: Julien Olivain --- ...sible-better-compilation-with-musl-c.patch | 30 ---------------- ...-freopen-to-reopen-standard-streams.patch} | 0 ...-freopen-to-reopen-standard-streams.patch} | 0 ...m-preallocate-memory-only-with-glibc.patch | 34 ------------------- package/lvm2/lvm2.hash | 2 +- package/lvm2/lvm2.mk | 2 +- 6 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch rename package/lvm2/{0003-cmdline-use-freopen-to-reopen-standard-streams.patch => 0001-cmdline-use-freopen-to-reopen-standard-streams.patch} (100%) rename package/lvm2/{0004-log-use-freopen-to-reopen-standard-streams.patch => 0002-log-use-freopen-to-reopen-standard-streams.patch} (100%) delete mode 100644 package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch diff --git a/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch b/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch deleted file mode 100644 index f537331a2c..0000000000 --- a/package/lvm2/0001-clang-possible-better-compilation-with-musl-c.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bac596b3685520acaa404dc3ebd2131e6de96d47 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac -Date: Wed, 16 Feb 2022 00:48:49 +0100 -Subject: [PATCH] clang: possible better compilation with musl c - -Try to help resolving reported compilation problem with -clang & musl C. -https://github.com/lvmteam/lvm2/issues/61 - -Backported from: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4fd76de4b69f8e5e6d5afa03d54cb4b8986c4bcc -Signed-off-by: Simon Rowe ---- - libdaemon/server/daemon-server.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c -index 88905a7dd..96cfc392e 100644 ---- a/libdaemon/server/daemon-server.c -+++ b/libdaemon/server/daemon-server.c -@@ -18,6 +18,7 @@ - - #include - #include -+#include /* help musl C */ - #include - #include - #include --- -2.22.3 - diff --git a/package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch b/package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch similarity index 100% rename from package/lvm2/0003-cmdline-use-freopen-to-reopen-standard-streams.patch rename to package/lvm2/0001-cmdline-use-freopen-to-reopen-standard-streams.patch diff --git a/package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch b/package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch similarity index 100% rename from package/lvm2/0004-log-use-freopen-to-reopen-standard-streams.patch rename to package/lvm2/0002-log-use-freopen-to-reopen-standard-streams.patch diff --git a/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch b/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch deleted file mode 100644 index db16d60ace..0000000000 --- a/package/lvm2/0002-mm-preallocate-memory-only-with-glibc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b668022f9b8aecf52109c9e0b7e5847054231361 Mon Sep 17 00:00:00 2001 -From: Zdenek Kabelac -Date: Fri, 19 Aug 2022 16:15:17 +0200 -Subject: [PATCH] mm: preallocate memory only with glibc - -Use mallinfo() only with glibc. - -Backported from: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8370d117d7ef8a472c95315a3cd085696c90b3be -Signed-off-by: Simon Rowe ---- - lib/mm/memlock.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/mm/memlock.c b/lib/mm/memlock.c -index 3d1a3927c..efcc6d91f 100644 ---- a/lib/mm/memlock.c -+++ b/lib/mm/memlock.c -@@ -160,7 +160,12 @@ static void _touch_memory(void *mem, size_t size) - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if defined(__GLIBC__) && !defined(VALGRIND_POOL) -+ /* Memory allocation is currently only tested with glibc -+ * for different C libraries, some other mechanisms might be needed -+ * meanwhile let users use lvm2 code without memory preallocation. -+ * Compilation for VALGRIND tracing also goes without preallocation. -+ */ - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; --- -2.22.3 - diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 126748d339..74c5f4f1bc 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,5 +1,5 @@ # From https://sourceware.org/ftp/lvm2/sha512.sum -sha512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d LVM2.2.03.14.tgz +sha512 293430a80c7f599d14e77610456d0f44cac8164e6159cd0e2e287462278a89787e289fdb4d481eb8fd6b5eea07a6535c41cb7fdc3deee83df7fea9bf77dcbdaa LVM2.2.03.23.tgz # Locally computed sha256 checksums sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LIB diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 810d668ec2..bda1648955 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.03.14 +LVM2_VERSION = 2.03.23 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES -- 2.43.1 From buildroot at bubu1.eu Tue Feb 13 23:13:47 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 14 Feb 2024 00:13:47 +0100 Subject: [Buildroot] [PATCH v8 04/26] package/python-setuptools: revert to last version with functional --build-option In-Reply-To: <20240213211512.3918044-4-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> <20240213211512.3918044-4-james.hilliard1@gmail.com> Message-ID: <7384cb6e-1b5b-4fca-ba0c-2c4d0fcd05a3@bubu1.eu> Hi James, On 13.02.24 22:14, James Hilliard wrote: > A recent change in setuptools accidentially broke the ability to > pass build_ext args via the --build-option config setting. > > Lets downgrade to the last working version for now. Do you have a link to a issue here? Is thing acknowledged by upstream, is this planned to be fixed? > > Signed-off-by: James Hilliard > --- > package/python-setuptools/python-setuptools.hash | 4 ++-- > package/python-setuptools/python-setuptools.mk | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash > index 7f13ac3896..9c971eec11 100644 > --- a/package/python-setuptools/python-setuptools.hash > +++ b/package/python-setuptools/python-setuptools.hash > @@ -1,5 +1,5 @@ > # md5, sha256 from https://pypi.org/pypi/setuptools/json > -md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz > -sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz > +md5 d967ca2ba7f46db887daee2d5c9bd6a2 setuptools-68.2.2.tar.gz > +sha256 4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 setuptools-68.2.2.tar.gz > # Locally computed sha256 checksums > sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE > diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk > index 0aea3c6cfa..f26f427ccc 100644 > --- a/package/python-setuptools/python-setuptools.mk > +++ b/package/python-setuptools/python-setuptools.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -PYTHON_SETUPTOOLS_VERSION = 69.0.3 > +PYTHON_SETUPTOOLS_VERSION = 68.2.2 > PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz > -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 > +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9 > PYTHON_SETUPTOOLS_LICENSE = MIT > PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE > PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From james.hilliard1 at gmail.com Tue Feb 13 23:43:16 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Tue, 13 Feb 2024 16:43:16 -0700 Subject: [Buildroot] [PATCH v8 04/26] package/python-setuptools: revert to last version with functional --build-option In-Reply-To: <7384cb6e-1b5b-4fca-ba0c-2c4d0fcd05a3@bubu1.eu> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> <20240213211512.3918044-4-james.hilliard1@gmail.com> <7384cb6e-1b5b-4fca-ba0c-2c4d0fcd05a3@bubu1.eu> Message-ID: On Tue, Feb 13, 2024 at 4:14?PM Marcus Hoffmann wrote: > > Hi James, > > On 13.02.24 22:14, James Hilliard wrote: > > A recent change in setuptools accidentially broke the ability to > > pass build_ext args via the --build-option config setting. > > > > Lets downgrade to the last working version for now. > > Do you have a link to a issue here? Is thing acknowledged by upstream, > is this planned to be fixed? Yeah, I have a pull request reverting the change that caused this to break: https://github.com/pypa/setuptools/pull/4218 There's some links/threads there with more info. > > > > > Signed-off-by: James Hilliard > > --- > > package/python-setuptools/python-setuptools.hash | 4 ++-- > > package/python-setuptools/python-setuptools.mk | 4 ++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash > > index 7f13ac3896..9c971eec11 100644 > > --- a/package/python-setuptools/python-setuptools.hash > > +++ b/package/python-setuptools/python-setuptools.hash > > @@ -1,5 +1,5 @@ > > # md5, sha256 from https://pypi.org/pypi/setuptools/json > > -md5 b82de45aaa6b9bb911226660212ebb83 setuptools-69.0.3.tar.gz > > -sha256 be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78 setuptools-69.0.3.tar.gz > > +md5 d967ca2ba7f46db887daee2d5c9bd6a2 setuptools-68.2.2.tar.gz > > +sha256 4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 setuptools-68.2.2.tar.gz > > # Locally computed sha256 checksums > > sha256 86da0f01aeae46348a3c3d465195dc1ceccde79f79e87769a64b8da04b2a4741 LICENSE > > diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk > > index 0aea3c6cfa..f26f427ccc 100644 > > --- a/package/python-setuptools/python-setuptools.mk > > +++ b/package/python-setuptools/python-setuptools.mk > > @@ -4,9 +4,9 @@ > > # > > ################################################################################ > > > > -PYTHON_SETUPTOOLS_VERSION = 69.0.3 > > +PYTHON_SETUPTOOLS_VERSION = 68.2.2 > > PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz > > -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/fc/c9/b146ca195403e0182a374e0ea4dbc69136bad3cd55bc293df496d625d0f7 > > +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e632ef256b406b8569606c3f160ed8e1c9 > > PYTHON_SETUPTOOLS_LICENSE = MIT > > PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE > > PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python From yegorslists at googlemail.com Wed Feb 14 07:19:08 2024 From: yegorslists at googlemail.com (yegorslists at googlemail.com) Date: Wed, 14 Feb 2024 08:19:08 +0100 Subject: [Buildroot] [PATCH v3] Create a .gitignore file in the CANONICAL_O directory Message-ID: <20240214071908.297656-1-yegorslists@googlemail.com> From: Yegor Yefremov This .gitignore file ignores all files in an output directory and hence doesn't change the git status. The .gitignore file will be only created if $(O) is a subdirectory of $(CANONICAL_CURDIR) (aka TOPDIR, but it's only defined later). Remove "/output" entry from the main .gitignore file as it is already handled by this general approach. Signed-off-by: Yegor Yefremov --- Changes v1 -> v2: - create .gitignore only if $(O) is a subfolder of $(TOPDIR) (Yann E. MORIN) Changes v2 -> v3: - also support nested subdirectories (Yann E. MORIN) .gitignore | 1 - Makefile | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bb02d9f572..14b7ca5040 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/output /dl /.auto.deps /.config.cmd diff --git a/Makefile b/Makefile index ac625152c6..aea6abb4d3 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,13 @@ endif CANONICAL_CURDIR = $(realpath $(CURDIR)) +# Create a default .gitignore file that ignores everything and doesn't make git +# repository "dirty". Perform this action only if $(O) is a subdirectory of +# $(CANONICAL_CURDIR) (aka TOPDIR, but it's only defined later). +ifeq ($(filter-out $(CANONICAL_CURDIR)/%,$(CANONICAL_O)),) +$(file >$(CANONICAL_O)/.gitignore,*) +endif + REQ_UMASK = 0022 # Make sure O= is passed (with its absolute canonical path) everywhere the -- 2.34.1 From laurent at vivier.eu Wed Feb 14 07:25:17 2024 From: laurent at vivier.eu (Laurent Vivier) Date: Wed, 14 Feb 2024 08:25:17 +0100 Subject: [Buildroot] [PATCH] package/petitboot: bump to version 1.15 In-Reply-To: <20240213152005.83369-1-arbab@linux.ibm.com> References: <20240213152005.83369-1-arbab@linux.ibm.com> Message-ID: Le 13/02/2024 ? 16:20, Reza Arbab a ?crit?: > This fixes an issue where the pb-console helper was not properly > silencing kernel log messages printed to the console. > > https://github.com/open-power/petitboot/releases/tag/v1.15 > > Signed-off-by: Reza Arbab > --- > package/petitboot/petitboot.hash | 2 +- > package/petitboot/petitboot.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/petitboot/petitboot.hash b/package/petitboot/petitboot.hash > index a9a21f2c1b69..3a90bc529672 100644 > --- a/package/petitboot/petitboot.hash > +++ b/package/petitboot/petitboot.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 fa2367370d3ce5dd9910ab08a0832071e2508c8bf75cfec6d3b9807fbefc507a petitboot-v1.14.tar.gz > +sha256 eed29ec841c2bcd5ecc65347f5b95a0087a541bd9c04ca3c17c55d1f7357d189 petitboot-v1.15.tar.gz > sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING > diff --git a/package/petitboot/petitboot.mk b/package/petitboot/petitboot.mk > index 2f1e459dd3fa..a74992377131 100644 > --- a/package/petitboot/petitboot.mk > +++ b/package/petitboot/petitboot.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -PETITBOOT_VERSION = 1.14 > +PETITBOOT_VERSION = 1.15 > PETITBOOT_SOURCE = petitboot-v$(PETITBOOT_VERSION).tar.gz > PETITBOOT_SITE = https://github.com/open-power/petitboot/releases/download/v$(PETITBOOT_VERSION) > PETITBOOT_DEPENDENCIES = \ Reviewed-by: Laurent Vivier From thomas at devoogdt.com Wed Feb 14 07:54:45 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 14 Feb 2024 08:54:45 +0100 Subject: [Buildroot] [PATCH v1] package/weston: bump to 13.0.0 Message-ID: <20240214075445.1011185-1-thomas.devoogdt@barco.com> Announce: https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html Drop -Dlauncher-libseat=true, as it has been dropped upstream: https://gitlab.freedesktop.org/wayland/weston/-/commit/e3b6ed50f1c3c259c51274c78d08b58ccea8a0df Signed-off-by: Thomas Devoogdt --- package/weston/weston.hash | 6 +++--- package/weston/weston.mk | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 0ecbaa4168..ded5d35275 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-May/042725.html -sha256 b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535 weston-12.0.1.tar.xz -sha512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688 weston-12.0.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html +sha256 52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a weston-13.0.0.tar.xz +sha512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc weston-13.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index b07e798765..5ae9c22973 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 12.0.1 +WESTON_VERSION = 13.0.0 WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -19,7 +19,6 @@ WESTON_CONF_OPTS = \ -Ddoc=false \ -Dremoting=false \ -Dbackend-vnc=false \ - -Dlauncher-libseat=true \ -Dtools=calibrator,debug,info,terminal,touch-calibrator ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) -- 2.43.0 From david.picard at clermont.in2p3.fr Wed Feb 14 08:19:21 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 14 Feb 2024 09:19:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package Message-ID: <20240214081921.4663-1-david.picard@clermont.in2p3.fr> Add a package for the Intel/Altera SoC FPGA hardware library. It is used to let the HPS and the FPGA fabric communicate with each other. Signed-off-by: David Picard --- package/Config.in | 1 + package/intel-socfpga-hwlib/Config.in | 12 ++++++ .../intel-socfpga-hwlib.hash | 2 + .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/intel-socfpga-hwlib/Config.in create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..cd6c6bcaba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1736,6 +1736,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/intel-socfpga-hwlib/Config.in" source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/intel-socfpga-hwlib/Config.in b/package/intel-socfpga-hwlib/Config.in new file mode 100644 index 0000000000..ced6483a59 --- /dev/null +++ b/package/intel-socfpga-hwlib/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB + bool "intel-socfpga-hwlib" + depends on BR2_arm + help + This package provides the Intel SoC FPGA HWLIB for + Intel/Altera SoC FPGA chips. + This library allows to communicate with the FPGA fabric from + Linux, running on the HPS device. + The source code is not compiled. Instead, a symlink is added + to $(STAGING_DIR)/lib. + + https://github.com/altera-opensource/intel-socfpga-hwlib diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash new file mode 100644 index 0000000000..60efe9013e --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash @@ -0,0 +1,2 @@ +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 intel-socfpga-hwlib-23.12.02.tar.gz +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 License.txt diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk new file mode 100644 index 0000000000..bf18c23560 --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# intel-socfpga-hwlib +# +################################################################################ + +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 +INTEL_SOCFPGA_HWLIB_SITE = $(call github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES + +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) $(STAGING_DIR)/lib/intel-socfpga-hwlib +endef + +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS +# mkdir -p $(BINARIES_DIR)/intel-ucode +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# else +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO +# endif + +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +# endef + +$(eval $(generic-package)) -- 2.40.1 From arnout at mind.be Wed Feb 14 08:19:55 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 09:19:55 +0100 Subject: [Buildroot] [PATCH v3] Create a .gitignore file in the CANONICAL_O directory In-Reply-To: <20240214071908.297656-1-yegorslists@googlemail.com> References: <20240214071908.297656-1-yegorslists@googlemail.com> Message-ID: On 14/02/2024 08:19, yegorslists at googlemail.com wrote: > From: Yegor Yefremov > > This .gitignore file ignores all files in an output directory and > hence doesn't change the git status. > > The .gitignore file will be only created if $(O) is a subdirectory > of $(CANONICAL_CURDIR) (aka TOPDIR, but it's only defined later). > > Remove "/output" entry from the main .gitignore file as it is already > handled by this general approach. > > Signed-off-by: Yegor Yefremov > --- > Changes v1 -> v2: > - create .gitignore only if $(O) is a subfolder of $(TOPDIR) (Yann > E. MORIN) I like to create my output directories as subfolders of my BR2_EXTERNAL. Currently I have them in the .gitignore of the BR2_EXTERNAL itself, of course, but it would be convenient if they got ignored automatically. In other words, I'd like to go back to v1 of this patch. There's no reason, ever, to not want an output directory to be gitignored. Since two maintainers are disagreeing about this, I guess it's up to the other maintainers to pipe up and take a decision? Regards, Arnout > Changes v2 -> v3: > - also support nested subdirectories (Yann E. MORIN) > > .gitignore | 1 - > Makefile | 7 +++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/.gitignore b/.gitignore > index bb02d9f572..14b7ca5040 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -1,4 +1,3 @@ > -/output > /dl > /.auto.deps > /.config.cmd > diff --git a/Makefile b/Makefile > index ac625152c6..aea6abb4d3 100644 > --- a/Makefile > +++ b/Makefile > @@ -65,6 +65,13 @@ endif > > CANONICAL_CURDIR = $(realpath $(CURDIR)) > > +# Create a default .gitignore file that ignores everything and doesn't make git > +# repository "dirty". Perform this action only if $(O) is a subdirectory of > +# $(CANONICAL_CURDIR) (aka TOPDIR, but it's only defined later). > +ifeq ($(filter-out $(CANONICAL_CURDIR)/%,$(CANONICAL_O)),) > +$(file >$(CANONICAL_O)/.gitignore,*) > +endif > + > REQ_UMASK = 0022 > > # Make sure O= is passed (with its absolute canonical path) everywhere the > -- > 2.34.1 > From arnout at mind.be Wed Feb 14 09:05:43 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:05:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/freescale-imx/firmware-ele-imx: fix dependency comment condition In-Reply-To: <20240213100948.5264-1-sebastien.szymanski@armadeus.com> References: <20240213100948.5264-1-sebastien.szymanski@armadeus.com> Message-ID: On 13/02/2024 11:09, S?bastien Szymanski wrote: > The dependency comment must be shown when the platform has no ELE and > not when the platform has no VPU. > > Fixes: 69d127fe29dc ("package/freescale-imx/firmware-ele-imx: new package") > Signed-off-by: S?bastien Szymanski Applied to master, thanks. Thank you for fixing my mistkes! Regards, Arnout > --- > package/freescale-imx/firmware-ele-imx/Config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in > index 241ad3942d65..a99cbc3392c2 100644 > --- a/package/freescale-imx/firmware-ele-imx/Config.in > +++ b/package/freescale-imx/firmware-ele-imx/Config.in > @@ -1,5 +1,5 @@ > comment "firmware-ele-imx needs an i.MX platform with EdgeLock Secure Enclave" > - depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU > + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_ELE > > config BR2_PACKAGE_FIRMWARE_ELE_IMX > bool "firmware-ele-imx" From arnout at mind.be Wed Feb 14 09:05:57 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:05:57 +0100 Subject: [Buildroot] [PATCH 1/1] board/freescale: imx9-bootloader-prepare.sh: fix script In-Reply-To: <20240213130444.12586-1-ju.o@free.fr> References: <20240213130444.12586-1-ju.o@free.fr> Message-ID: On 13/02/2024 14:04, Julien Olivain wrote: > Commit c05f27c "configs/freescale_imx93evk: new defconfig", when > applied, added few ShellCheck fixups on top of the orginial > submission. During those changes, one extra backslash was added, > making the imx9-bootloader-prepare.sh fail. > > This commit fixes the issue by removing this extra backslash. > > Fixes: > > dd: failed to open '/buildroot/output/images/u-boot-atf-container.img': No such file or directory > make: *** [Makefile:820: target-post-image] Error 1 > > Signed-off-by: Julien Olivain Applied to master, thanks. Thank you for fixing my mistakes! Regards, Arnout > --- > board/freescale/common/imx/imx9-bootloader-prepare.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh > index a9611a81bd..8ab5a241b0 100755 > --- a/board/freescale/common/imx/imx9-bootloader-prepare.sh > +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh > @@ -21,7 +21,7 @@ main () > -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ > -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ > -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ > - -out "${BINARIES_DIR}/u-boot-atf-container.img" \ > + -out "${BINARIES_DIR}/u-boot-atf-container.img" > else > "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ > -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ From arnout at mind.be Wed Feb 14 09:07:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:07:22 +0100 Subject: [Buildroot] [PATCH 1/1] board/freescale: Fix check-package warning In-Reply-To: <20240213050106.1371689-1-kadambini.nema@gmail.com> References: <20240213050106.1371689-1-kadambini.nema@gmail.com> Message-ID: <897ad4ff-78af-412f-aa74-ef20d6eb2a1b@mind.be> On 13/02/2024 06:01, Kadambini Nema wrote: > $ utils/docker-run make check-package > board/freescale/imx93evk/patches/linux-headers/linux-headers.hash:3: empty line at end of file > board/freescale/imx93evk/patches/linux/linux.hash:3: empty line at end of file > 402624 lines processed > 2 warnings generated > make: *** [Makefile:1248: check-package] Error 1 > > Signed-off-by: Kadambini Nema Applied to master, thanks. Thank you for fixing my mistakes! Regards, Arnout > --- > board/freescale/imx93evk/patches/linux/linux.hash | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash > index 5687ec7343..715a590825 100644 > --- a/board/freescale/imx93evk/patches/linux/linux.hash > +++ b/board/freescale/imx93evk/patches/linux/linux.hash > @@ -1,3 +1,2 @@ > # Locally calculated > sha256 eb94414f952444289c0af8ad82afa0dc2d07e08f9000ccd2cc39f11da5b494ea linux-imx-lf-6.1.55-2.2.0.tar.gz > - From arnout at mind.be Wed Feb 14 09:02:25 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:02:25 +0100 Subject: [Buildroot] [git commit] package/freescale-imx/firmware-ele-imx: fix dependency comment condition Message-ID: <20240214091150.730CC8794A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4bcce65f634dfce8e6ee1961ed68df3e778cd945 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The dependency comment must be shown when the platform has no ELE and not when the platform has no VPU. Fixes: 69d127fe29dc ("package/freescale-imx/firmware-ele-imx: new package") Signed-off-by: S??bastien Szymanski Signed-off-by: Arnout Vandecappelle --- package/freescale-imx/firmware-ele-imx/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freescale-imx/firmware-ele-imx/Config.in b/package/freescale-imx/firmware-ele-imx/Config.in index 241ad3942d..a99cbc3392 100644 --- a/package/freescale-imx/firmware-ele-imx/Config.in +++ b/package/freescale-imx/firmware-ele-imx/Config.in @@ -1,5 +1,5 @@ comment "firmware-ele-imx needs an i.MX platform with EdgeLock Secure Enclave" - depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_ELE config BR2_PACKAGE_FIRMWARE_ELE_IMX bool "firmware-ele-imx" From arnout at mind.be Wed Feb 14 09:03:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:03:08 +0100 Subject: [Buildroot] [git commit] board/freescale: Fix check-package warning Message-ID: <20240214091150.8228A878EC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cf9c8fa2c844748145d83ffc279a9548cf3792ce branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master $ utils/docker-run make check-package board/freescale/imx93evk/patches/linux-headers/linux-headers.hash:3: empty line at end of file board/freescale/imx93evk/patches/linux/linux.hash:3: empty line at end of file 402624 lines processed 2 warnings generated make: *** [Makefile:1248: check-package] Error 1 Signed-off-by: Kadambini Nema Signed-off-by: Arnout Vandecappelle --- board/freescale/imx93evk/patches/linux/linux.hash | 1 - 1 file changed, 1 deletion(-) diff --git a/board/freescale/imx93evk/patches/linux/linux.hash b/board/freescale/imx93evk/patches/linux/linux.hash index 5687ec7343..715a590825 100644 --- a/board/freescale/imx93evk/patches/linux/linux.hash +++ b/board/freescale/imx93evk/patches/linux/linux.hash @@ -1,3 +1,2 @@ # Locally calculated sha256 eb94414f952444289c0af8ad82afa0dc2d07e08f9000ccd2cc39f11da5b494ea linux-imx-lf-6.1.55-2.2.0.tar.gz - From arnout at mind.be Wed Feb 14 09:03:55 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 14 Feb 2024 10:03:55 +0100 Subject: [Buildroot] [git commit] board/freescale: imx9-bootloader-prepare.sh: fix script Message-ID: <20240214091150.99D908794C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c455505eb5ed8ed5bbf090f2bfb6241c9f153a2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit c05f27c "configs/freescale_imx93evk: new defconfig", when applied, added few ShellCheck fixups on top of the orginial submission. During those changes, one extra backslash was added, making the imx9-bootloader-prepare.sh fail. This commit fixes the issue by removing this extra backslash. Fixes: dd: failed to open '/buildroot/output/images/u-boot-atf-container.img': No such file or directory make: *** [Makefile:820: target-post-image] Error 1 Signed-off-by: Julien Olivain Reviewed-by: S??bastien Szymanski Tested-By: S??bastien Szymanski Signed-off-by: Arnout Vandecappelle --- board/freescale/common/imx/imx9-bootloader-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/common/imx/imx9-bootloader-prepare.sh b/board/freescale/common/imx/imx9-bootloader-prepare.sh index a9611a81bd..8ab5a241b0 100755 --- a/board/freescale/common/imx/imx9-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx9-bootloader-prepare.sh @@ -21,7 +21,7 @@ main () -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ -ap "${BINARIES_DIR}/u-boot-hash.bin" a35 0x80200000 \ -ap "${BINARIES_DIR}/tee.bin" a35 0x96000000 \ - -out "${BINARIES_DIR}/u-boot-atf-container.img" \ + -out "${BINARIES_DIR}/u-boot-atf-container.img" else "${HOST_DIR}/bin/mkimage_imx8" -soc IMX9 -c \ -ap "${BINARIES_DIR}/bl31.bin" a35 ${ATF_LOAD_ADDR} \ From david.picard at clermont.in2p3.fr Wed Feb 14 09:29:21 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 14 Feb 2024 10:29:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package Message-ID: <2770b2ac-4cec-4d56-81e9-89dfd33f786a@clermont.in2p3.fr> Add a package for the Intel/Altera SoC FPGA hardware library. It is used to let the HPS and the FPGA fabric communicate with each other. Signed-off-by: David Picard --- package/Config.in | 1 + package/intel-socfpga-hwlib/Config.in | 12 ++++++ .../intel-socfpga-hwlib.hash | 2 + .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/intel-socfpga-hwlib/Config.in create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..cd6c6bcaba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1736,6 +1736,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/intel-socfpga-hwlib/Config.in" source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/intel-socfpga-hwlib/Config.in b/package/intel-socfpga-hwlib/Config.in new file mode 100644 index 0000000000..ced6483a59 --- /dev/null +++ b/package/intel-socfpga-hwlib/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB + bool "intel-socfpga-hwlib" + depends on BR2_arm + help + This package provides the Intel SoC FPGA HWLIB for + Intel/Altera SoC FPGA chips. + This library allows to communicate with the FPGA fabric from + Linux, running on the HPS device. + The source code is not compiled. Instead, a symlink is added + to $(STAGING_DIR)/lib. + + https://github.com/altera-opensource/intel-socfpga-hwlib diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash new file mode 100644 index 0000000000..60efe9013e --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash @@ -0,0 +1,2 @@ +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 intel-socfpga-hwlib-23.12.02.tar.gz +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 License.txt diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk new file mode 100644 index 0000000000..bf18c23560 --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# intel-socfpga-hwlib +# +################################################################################ + +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 +INTEL_SOCFPGA_HWLIB_SITE = $(call github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES + +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) $(STAGING_DIR)/lib/intel-socfpga-hwlib +endef + +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS +# mkdir -p $(BINARIES_DIR)/intel-ucode +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# else +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO +# endif + +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +# endef + +$(eval $(generic-package)) -- 2.40.1 From buildroot at bubu1.eu Wed Feb 14 09:31:41 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 14 Feb 2024 10:31:41 +0100 Subject: [Buildroot] [PATCH] package/python-pytz: bump to 2024.1 Message-ID: <20240214093142.3423721-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- package/python-pytz/python-pytz.hash | 4 ++-- package/python-pytz/python-pytz.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index be6f0e976b..a8bfe67817 100644 --- a/package/python-pytz/python-pytz.hash +++ b/package/python-pytz/python-pytz.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytz/json -md5 84e6569fcc917b096cca1063819c4ab0 pytz-2023.3.post1.tar.gz -sha256 7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b pytz-2023.3.post1.tar.gz +md5 b26bb090d1fe96064019bf7068eeb801 pytz-2024.1.tar.gz +sha256 2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812 pytz-2024.1.tar.gz # Locally computed sha256 checksums sha256 be8b1a37ebe26c592a90f6c0eb33103a7f383ce2f4d7498c0af9a526990a07b8 LICENSE.txt diff --git a/package/python-pytz/python-pytz.mk b/package/python-pytz/python-pytz.mk index 182d8156fc..300e26befe 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2023.3.post1 +PYTHON_PYTZ_VERSION = 2024.1 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/69/4f/7bf883f12ad496ecc9514cd9e267b29a68b3e9629661a2bbc24f80eff168 +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/90/26/9f1f00a5d021fff16dee3de13d43e5e978f3d58928e129c3a62cf7eb9738 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt -- 2.34.1 From david.picard at clermont.in2p3.fr Wed Feb 14 09:32:20 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 14 Feb 2024 10:32:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package Message-ID: Add a package for the Intel/Altera SoC FPGA hardware library. It is used to let the HPS and the FPGA fabric communicate with each other. Signed-off-by: David Picard --- package/Config.in | 1 + package/intel-socfpga-hwlib/Config.in | 12 ++++++ .../intel-socfpga-hwlib.hash | 2 + .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/intel-socfpga-hwlib/Config.in create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..cd6c6bcaba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1736,6 +1736,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/intel-socfpga-hwlib/Config.in" source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/intel-socfpga-hwlib/Config.in b/package/intel-socfpga-hwlib/Config.in new file mode 100644 index 0000000000..ced6483a59 --- /dev/null +++ b/package/intel-socfpga-hwlib/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB + bool "intel-socfpga-hwlib" + depends on BR2_arm + help + This package provides the Intel SoC FPGA HWLIB for + Intel/Altera SoC FPGA chips. + This library allows to communicate with the FPGA fabric from + Linux, running on the HPS device. + The source code is not compiled. Instead, a symlink is added + to $(STAGING_DIR)/lib. + + https://github.com/altera-opensource/intel-socfpga-hwlib diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash new file mode 100644 index 0000000000..60efe9013e --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash @@ -0,0 +1,2 @@ +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 intel-socfpga-hwlib-23.12.02.tar.gz +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 License.txt diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk new file mode 100644 index 0000000000..bf18c23560 --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# intel-socfpga-hwlib +# +################################################################################ + +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 +INTEL_SOCFPGA_HWLIB_SITE = $(call github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES + +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) $(STAGING_DIR)/lib/intel-socfpga-hwlib +endef + +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS +# mkdir -p $(BINARIES_DIR)/intel-ucode +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# else +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO +# endif + +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +# endef + +$(eval $(generic-package)) -- 2.40.1 From david.picard at clermont.in2p3.fr Wed Feb 14 09:34:48 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 14 Feb 2024 10:34:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package Message-ID: Add a package for the Intel/Altera SoC FPGA hardware library. It is used to let the HPS and the FPGA fabric communicate with each other. Signed-off-by: David Picard --- package/Config.in | 1 + package/intel-socfpga-hwlib/Config.in | 12 ++++++ .../intel-socfpga-hwlib.hash | 2 + .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 package/intel-socfpga-hwlib/Config.in create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..cd6c6bcaba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1736,6 +1736,7 @@ menu "Hardware handling" source "package/gnu-efi/Config.in" source "package/hackrf/Config.in" source "package/hidapi/Config.in" + source "package/intel-socfpga-hwlib/Config.in" source "package/jitterentropy-library/Config.in" source "package/lcdapi/Config.in" source "package/let-me-create/Config.in" diff --git a/package/intel-socfpga-hwlib/Config.in b/package/intel-socfpga-hwlib/Config.in new file mode 100644 index 0000000000..ced6483a59 --- /dev/null +++ b/package/intel-socfpga-hwlib/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB + bool "intel-socfpga-hwlib" + depends on BR2_arm + help + This package provides the Intel SoC FPGA HWLIB for + Intel/Altera SoC FPGA chips. + This library allows to communicate with the FPGA fabric from + Linux, running on the HPS device. + The source code is not compiled. Instead, a symlink is added + to $(STAGING_DIR)/lib. + + https://github.com/altera-opensource/intel-socfpga-hwlib diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash new file mode 100644 index 0000000000..60efe9013e --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash @@ -0,0 +1,2 @@ +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 intel-socfpga-hwlib-23.12.02.tar.gz +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 License.txt diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk new file mode 100644 index 0000000000..bf18c23560 --- /dev/null +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# intel-socfpga-hwlib +# +################################################################################ + +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 +INTEL_SOCFPGA_HWLIB_SITE = $(call github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES + +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) $(STAGING_DIR)/lib/intel-socfpga-hwlib +endef + +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS +# mkdir -p $(BINARIES_DIR)/intel-ucode +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ +# $(@D)/intel-ucode/* +# endef +# else +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO +# endif + +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) +# endef + +$(eval $(generic-package)) -- 2.40.1 From alexander.sverdlin at gmail.com Wed Feb 14 10:58:32 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:58:32 +0100 Subject: [Buildroot] [PATCH 09/21] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option In-Reply-To: <20240213172817.2872849-10-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-10-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > This tool uses additional host python modules that must be provided by > Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to > add additional host packages in U-Boot build dependency to use binman. > > The binman requirement is directly included in buildman dependency > (tools/buildman/requirements.txt) since within U-Boot, binman is > invoked by the build system, here buildman [1]. > > [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > Note: > ? binman is bundled in U-Boot source code. Use "USE_BINMAN" instead of > ? "NEEDS_BINMAN" since it's not an external U-Boot dependency. > --- > ?boot/uboot/Config.in | 11 +++++++++++ > ?boot/uboot/uboot.mk? |? 8 ++++++++ > ?2 files changed, 19 insertions(+) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index beafb38930..e6e7956adc 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -290,6 +290,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN > ? ? This option makes sure that the needed binary blobs are copied > ? ? into the U-Boot source directory. > ? > +config BR2_TARGET_UBOOT_USE_BINMAN > + bool "U-Boot use binman" > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema > + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 > + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS > + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT > + help > + ? Use binman tool for generation and signing of boot images. > + > + ? https://docs.u-boot.org/en/v2024.01/develop/package/binman.html > + > ?menu "U-Boot binary format" > ? > ?config BR2_TARGET_UBOOT_FORMAT_AIS > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dda606a880..0714522550 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -269,6 +269,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) > ?UBOOT_DEPENDENCIES += host-vim > ?endif > ? > +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt > +UBOOT_DEPENDENCIES += \ > + host-python-jsonschema \ > + host-python-pyyaml > +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) > +endif > + > ?# prior to u-boot 2013.10 the license info was in COPYING. Copy it so > ?# legal-info finds it > ?define UBOOT_COPY_OLD_LICENSE_FILE -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 10:58:38 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:58:38 +0100 Subject: [Buildroot] [PATCH 10/21] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option In-Reply-To: <20240213172817.2872849-11-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-11-romain.naour@smile.fr> Message-ID: <450e202a12ad55dd348d72840bbaaa3619a3c9ae.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > As for U-boot package, this tool uses additional host python modules > that must be provided by Buildroot. So introduce a new option > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN to add additional host packages > in U-Boot build dependency to use binman. > > The binman requirement is directly included in buildman dependency > (tools/buildman/requirements.txt) since within U-Boot, binman is > invoked by the build system, here buildman [1]. > > Make sure that all binman requirements are build before > ti-k3-r5-loader. > > [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > Note: > ? binman is bundled in U-Boot source code. Use "USE_BINMAN" instead of > ? "NEEDS_BINMAN" since it's not an external U-Boot dependency. > --- > ?boot/ti-k3-r5-loader/Config.in????????? |? 8 ++++++++ > ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 14 ++++++++++++++ > ?2 files changed, 22 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in > index 8c8368a1a5..d678bd17c2 100644 > --- a/boot/ti-k3-r5-loader/Config.in > +++ b/boot/ti-k3-r5-loader/Config.in > @@ -93,4 +93,12 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE > ? help > ? ? Path to the TI K3 R5 Loader configuration file. > ? > +config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN > + bool "ti-k3-r5-loader use binman" > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema > + help > + ? Use binman tool for generation and signing of boot images. > + > + ? https://docs.u-boot.org/en/v2024.01/develop/package/binman.html > + > ?endif > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0ffcb8235f..8f86e0fb07 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -60,6 +60,20 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > ? HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > ? HOSTLDFLAGS="$(HOST_LDFLAGS)" > ? > +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt > +TI_K3_R5_LOADER_DEPENDENCIES += \ > + host-python-jsonschema \ > + host-python-pyyaml > +# Make sure that all binman requirements are build before ti-k3-r5-loader. > +TI_K3_R5_LOADER_DEPENDENCIES += \ > + host-python3 \ > + host-python-setuptools \ > + host-python-pylibfdt \ > + host-python-pyelftools > +TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) > +endif > + > ?define TI_K3_R5_LOADER_BUILD_CMDS > ? $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > ?endef -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 10:58:44 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:58:44 +0100 Subject: [Buildroot] [PATCH 11/21] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR In-Reply-To: <20240213172817.2872849-12-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-12-romain.naour@smile.fr> Message-ID: <05c23828b1121bf48fe3af89459da706b04cd9c9.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > U-boot for k3 r5 core (ti-k3-r5-loader) can install different target > image (tiboot3*.bin) depending on the k3 SoC variant using different > boot flow [1]: > > - Split binary with a combined firmware: (eg: AM65) > - Combined binary with a combined firmware: (eg: AM64) > - Split binary with a split firmware: (eg: J721E) > - Combined binary with a split firmware: (eg: AM62) > > K3 SoC using Split Binary Boot Flow also requires sysfw-*.itb file > to boot (eg: am65, j721e). Only tiboot3*.bin is needed for other > boot flow. > > From [1]: > "It's important to rename the generated tiboot3.bin and sysfw.itb > to match exactly tiboot3.bin and sysfw.itb as ROM and the wakeup > UBoot SPL will only look for and load the files with these names." > > So boards using HS (High Secure) K3 SoC variant must update the > tiboot3.bin (and sysfw.itb) in their post-build script. > > ti-k3-r5-loader must install any tiboot3*.bin (and sysfw*.itb) > to BINARIES_DIR let the user which one should be used in a > post-build script. > > See the list of all tiboot3*.bin and sysfw*.itb file variant found in meta-ti: [] > [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 9 +++++++++ > ?1 file changed, 9 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 8f86e0fb07..b3c756dc47 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -78,8 +78,17 @@ define TI_K3_R5_LOADER_BUILD_CMDS > ? $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > ?endef > ? > +# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e) > ?define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > ? cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + for f in $(@D)/tiboot3*.bin ; do \ > + $(INSTALL) -D -m 0644 $$f $(BINARIES_DIR)/`basename $$f` || exit 1; \ > + done > + for f in $(@D)/sysfw*.itb ; do \ > + if test -e $$f ; then \ > + $(INSTALL) -D -m 0644 $$f $(BINARIES_DIR)/`basename $$f` || exit 1; \ > + fi ; \ > + done > ?endef > ? > ?$(eval $(kconfig-package)) -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 10:58:50 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:58:50 +0100 Subject: [Buildroot] [PATCH 16/21] boot/uboot: enable TI K3 Device Manager (DM) for j721e In-Reply-To: <20240213172817.2872849-17-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-17-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > The TI K3 Device Manager (DM) support for J721E is needed to boot > DRA829/TDA4VM SoC. > > https://www.ti.com/product/TDA4VM?(SoC) > https://www.ti.com/tool/PROCESSOR-SDK-J721E?(TI SDK) > https://www.ti.com/tool/SK-TDA4VM?(TDA4VM processor starter kit) > https://beagleboard.org/ai-64?(BeagleBone AI-64 SBC) > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/uboot/Config.in | 3 ++- > ?1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index 7586f24c90..837f1605b7 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -245,7 +245,8 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > ? # We use the SoC selection defined for the ti-k3-boot-firmware > ? # package > ? depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE > - depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X > + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X \ > + || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > ? help > ? ? Some TI K3 devices need the Device Manager (DM) firmware to > ? ? be available for the U-Boot build. -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 10:58:56 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:58:56 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240213172817.2872849-22-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > ti-k3-image-gen tool is deprecated an replaced by binman [1]. > > All defconfig that was using it have been updated to use U-boot > binman tool instead. > > So, we can safely remove ti-k3-image-gen package. > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > > Cc: Anand Gadiyar > Cc: Xuanhao Shi > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?Config.in.legacy????????????????????????? |? 7 ++ > ?DEVELOPERS??????????????????????????????? |? 2 - > ?boot/Config.in??????????????????????????? |? 1 - > ?boot/ti-k3-image-gen/Config.in??????????? | 81 ----------------------- > ?boot/ti-k3-image-gen/ti-k3-image-gen.hash |? 3 - > ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?? | 54 --------------- > ?6 files changed, 7 insertions(+), 141 deletions(-) > ?delete mode 100644 boot/ti-k3-image-gen/Config.in > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 10:59:01 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 11:59:01 +0100 Subject: [Buildroot] [PATCH 19/21] configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman tool In-Reply-To: <20240213172817.2872849-20-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-20-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Update u-boot for a53 and r5 core to 2024.01 and enable binman support > in order to remove BR2_TARGET_TI_K3_IMAGE_GEN. > > Signed-off-by: Romain Naour Looks good to me in principle, so Reviewed-by: Alexander Sverdlin But maybe you could add a word into commit message about updated ATF if you'll re-spin. > --- > ?configs/ti_am62x_sk_defconfig | 12 ++++++++---- > ?1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index c3ad555a81..f725734551 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -16,25 +16,29 @@ BR2_TARGET_ROOTFS_EXT2_4=y > ?BR2_TARGET_ROOTFS_EXT2_SIZE="256M" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > ?BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > -BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > ?BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" > +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y > ?BR2_TARGET_UBOOT=y > ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > ?BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > ?BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" > ?BR2_TARGET_UBOOT_NEEDS_DTC=y > ?BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > ?BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > ?BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y > +BR2_TARGET_UBOOT_USE_BINMAN=y > ?# BR2_TARGET_UBOOT_FORMAT_BIN is not set > ?BR2_TARGET_UBOOT_FORMAT_IMG=y > ?BR2_TARGET_UBOOT_SPL=y -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 11:05:01 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 12:05:01 +0100 Subject: [Buildroot] [PATCH 20/21] configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman tool In-Reply-To: <20240213172817.2872849-21-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-21-romain.naour@smile.fr> Message-ID: Hi Romain, looks good to me, maybe ATF update is worth a word in the commit message in case you'll re-spin. On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Update u-boot for a53 and r5 core to 2024.01 and enable binman support > in order to remove BR2_TARGET_TI_K3_IMAGE_GEN. > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?configs/ti_am64x_sk_defconfig | 12 ++++++++---- > ?1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 097175bd8f..bcef16777e 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -16,24 +16,28 @@ BR2_TARGET_ROOTFS_EXT2_4=y > ?BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > ?BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > -BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM64X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > ?BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" > +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y > ?BR2_TARGET_UBOOT=y > ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > ?BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > ?BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" > ?BR2_TARGET_UBOOT_NEEDS_DTC=y > ?BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > ?BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_USE_BINMAN=y > ?# BR2_TARGET_UBOOT_FORMAT_BIN is not set > ?BR2_TARGET_UBOOT_FORMAT_IMG=y > ?BR2_TARGET_UBOOT_SPL=y -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 11:20:25 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 12:20:25 +0100 Subject: [Buildroot] [PATCH 12/21] boot/ti-k3-boot-firmware: introduce BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX, AM62X, AM64X, AM65X} In-Reply-To: <20240213172817.2872849-13-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-13-romain.naour@smile.fr> Message-ID: <766f0b7f72ef1fd10596bc84d23269fe969134e4.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > ti-k3-image-gen tool is deprecated an replaced by binman [1]. > > But BR2_TARGET_TI_K3_IMAGE_GEN_SOC_{AM62AX,AM62X} is used by u-boot > package to select which Device Manager (DM) firmware to use for the > U-Boot build. > > In order to remove ti-k3-image-gen package, introduce > BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} to > replace BR2_TARGET_TI_K3_IMAGE_GEN_SOC_{AM62AX,AM62X,AM64X,AM65X}. > > In order to avoid breaking existing defconfig still using > ti-k3-image-gen tool (ti_am62x_sk_defconfig, ti_am64x_sk_defconfig) > select BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC symbol from ti-k3-image-gen > package. > > While at it, only install required firmware to BINARIES_DIR based > on the selected TI K3 SoC variant. > > This requires two intall step: > ? - ti-sysfw installation based on the SoC variant. > ? - ti-dm installation only for SoC using split firmware boot flow > ??? (eg: am62, j721e) > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/ti-k3-boot-firmware/Config.in??????????? | 34 +++++++++++++++++++ > ?.../ti-k3-boot-firmware.mk??????????????????? | 12 +++++-- > ?boot/ti-k3-image-gen/Config.in??????????????? |? 4 +++ > ?3 files changed, 48 insertions(+), 2 deletions(-) -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 11:25:58 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 12:25:58 +0100 Subject: [Buildroot] [PATCH 17/21] boot/ti-k3-boot-firmware: bump to version 09.02.00.004 In-Reply-To: <20240213172817.2872849-18-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-18-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Remove the comment about ti-k3-image-gen since this tool is > deprecated an replaced by binman. > > ti-k3-image-gen has been removed from meta-ti [1]. > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 2 +- > ?boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk?? | 4 +--- > ?2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > index 95131180ef..939bd0794a 100644 > --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > @@ -1,3 +1,3 @@ > ?# Locally calculated > ?sha256? ab20ffbe7bba7e94be246b3417d33a914b3f07c16c47ef5a7f7602349a666a61? LICENSE.ti > -sha256? 6032a258ce731d987576115f5de44c677a6b0cf8bddcd61a9a2852928bdfff92? ti-linux-firmware-08.06.00.006.tar.xz > +sha256? 701d400ac33b2885ec35d73f0d66e5186e3c2f71ef28679508b58ef986804d35? ti-linux-firmware-09.02.00.004.tar.xz > diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > index c7c5eb0818..fb28d8ac41 100644 > --- a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > +++ b/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > @@ -4,9 +4,7 @@ > ?# > ?################################################################################ > ? > -# The hash 340194800a581baf976360386dfc7b5acab8d948 defined in the > -# Makefile of ti-k3-image-gen corresponds to the tag 08.06.00.006. > -TI_K3_BOOT_FIRMWARE_VERSION = 08.06.00.006 > +TI_K3_BOOT_FIRMWARE_VERSION = 09.02.00.004 > ?TI_K3_BOOT_FIRMWARE_SITE = https://git.ti.com/cgit/processor-firmware/ti-linux-firmware/snapshot > ?TI_K3_BOOT_FIRMWARE_SOURCE = ti-linux-firmware-$(TI_K3_BOOT_FIRMWARE_VERSION).tar.xz > ?TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES = YES -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 11:29:48 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 12:29:48 +0100 Subject: [Buildroot] [PATCH 13/21] boot/uboot: use DM firmware name defined by ti-k3-boot-firmware package In-Reply-To: <20240213172817.2872849-14-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-14-romain.naour@smile.fr> Message-ID: <9be87fcdf09a2c130766d9b9e08d6af971e3b322.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > The DM firmware name is now defined by ti-k3-boot-frimware package by > BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM, so BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > can be removed to avoid duplication in Kconfig. > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/uboot/Config.in | 9 --------- > ?boot/uboot/uboot.mk? | 2 +- > ?2 files changed, 1 insertion(+), 10 deletions(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index e6e7956adc..63359266c6 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -250,15 +250,6 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > ? ? Some TI K3 devices need the Device Manager (DM) firmware to > ? ? be available for the U-Boot build. > ? > -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > - > -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > - string > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62xx"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - > -endif > - > ?config BR2_TARGET_UBOOT_NEEDS_OPENSBI > ? bool "U-Boot needs OpenSBI" > ? depends on BR2_TARGET_OPENSBI > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 0714522550..aa2ca99bdd 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -187,7 +187,7 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > ?endif > ? > ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_TI_K3_BOOT_FIRMWARE_DM)) > ?UBOOT_DEPENDENCIES += ti-k3-boot-firmware > ?UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > ?endif -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 11:37:23 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 12:37:23 +0100 Subject: [Buildroot] [PATCH 15/21] boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options In-Reply-To: <20240213172817.2872849-16-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-16-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > ti-k3-image-gen tool is deprecated an replaced by binman [1]. > > Use the newly introduced BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X}. > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > > Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin > --- > ?boot/uboot/Config.in | 6 +++--- > ?1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index 63359266c6..7586f24c90 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -242,10 +242,10 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE > ? > ?config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > ? bool "U-Boot needs TI K3 Device Manager (DM)" > - # We use the SoC selection defined for the ti-k3-image-gen > + # We use the SoC selection defined for the ti-k3-boot-firmware > ? # package > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE > + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62AX || BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X > ? help > ? ? Some TI K3 devices need the Device Manager (DM) firmware to > ? ? be available for the U-Boot build. -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Wed Feb 14 12:06:45 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 14 Feb 2024 13:06:45 +0100 Subject: [Buildroot] [PATCH 18/21] configs/ti_j721e_sk_defconfig: new defconfig In-Reply-To: <20240213172817.2872849-19-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-19-romain.naour@smile.fr> Message-ID: Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > Adds support for TI's SK-TDA4VM board by introducing the > ti_j721e_sk_defconfig file and related support files. > > Retrieve BSP settings from meta-ti (may be useful for other TI boards): > > - Don't set BR2_TARGET_TI_K3_IMAGE_GEN since this tool is deprecated > ? [1] and must be replaced by u-boot binman (upstream). > ? See FOSDEM 2024 talk by TI folks about Binman and how it simplify the > ? overall boot-loader build flow [2]. > > - Set BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD = "generic" > > ? meta-ti]$ git grep TFA_BOARD > ? meta-ti-bsp/conf/machine/beagleplay.conf:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/am62axx.inc:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/am62pxx.inc:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/am62xx.inc:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/am64xx.inc:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/am65xx.inc:TFA_BOARD = "generic" > ? meta-ti-bsp/conf/machine/include/j7200.inc:TFA_BOARD = "generic" > ? meta-ti-bsp/conf/machine/include/j721e.inc:TFA_BOARD = "generic" > ? meta-ti-bsp/conf/machine/include/j721s2.inc:TFA_BOARD = "generic" > ? meta-ti-bsp/conf/machine/include/j722s.inc:TFA_BOARD = "lite" > ? meta-ti-bsp/conf/machine/include/j784s4.inc:TFA_BOARD = "j784s4" > > - Set BR2_TARGET_UBOOT_NEEDS_ATF_BL31 to provide BL31 variable pointing > ? to ATF bl31.bin to the U-Boot build process [3]. > > - Set BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE to OP-TEE as BL32 > ? secure payload. meta-ti set "SPD=opteed" to build ATF [4]. > > - Set BR2_TARGET_OPTEE_OS_PLATFORM to "k3-j721e". > ? meta-ti uses the OPTEEMACHINE to set optee-os platform [5]. > ? meta-ti]$ git grep OPTEEMACHINE > ? meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" > ? meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" > ? meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" > ? meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" > ? meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" > ? meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" > ? meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" > ? meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" > ? meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" > > - Set BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME since u-boot is looking at /boot/dtb/ti > ? for devicetree. (Yocto uses KERNEL_DTBDEST) > ? Create a symlink to make sure /boot/dtb/ti exist. > ? (We want to keep the u-boot environment provided by upstream as is). > > [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 > [2] https://fosdem.org/2024/schedule/event/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/ > [3] https://git.yoctoproject.org/meta-ti/commit/?id=e74b9a1746d4d04757c87c1920a0f743e55ff096 > [4] https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc?h=09.02.00.004#n7 > [5] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 > > More information about the board can be found at: > https://www.ti.com/tool/SK-TDA4VM > > Signed-off-by: Romain Naour looks good to me, Reviewed-by: Alexander Sverdlin > --- > ?DEVELOPERS????????????????????? |? 2 ++ > ?board/ti/j721e-sk/genimage.cfg? | 28 ++++++++++++++++++ > ?board/ti/j721e-sk/post-build.sh | 16 +++++++++++ > ?board/ti/j721e-sk/readme.txt??? | 34 ++++++++++++++++++++++ > ?configs/ti_j721e_sk_defconfig?? | 51 +++++++++++++++++++++++++++++++++ > ?5 files changed, 131 insertions(+) > ?create mode 100644 board/ti/j721e-sk/genimage.cfg > ?create mode 100755 board/ti/j721e-sk/post-build.sh > ?create mode 100644 board/ti/j721e-sk/readme.txt > ?create mode 100644 configs/ti_j721e_sk_defconfig > -- Alexander Sverdlin. From romain.naour at smile.fr Wed Feb 14 15:24:05 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 14 Feb 2024 16:24:05 +0100 Subject: [Buildroot] [PATCH 19/21] configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman tool In-Reply-To: References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-20-romain.naour@smile.fr> Message-ID: Hi Alexander, Le 14/02/2024 ? 11:59, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >> Update u-boot for a53 and r5 core to 2024.01 and enable binman support >> in order to remove BR2_TARGET_TI_K3_IMAGE_GEN. >> >> Signed-off-by: Romain Naour > > Looks good to me in principle, so > Reviewed-by: Alexander Sverdlin > > But maybe you could add a word into commit message about updated ATF > if you'll re-spin. Ok. I'll wait before re-spin if someone can do a runtime test. Thanks for the review! Best regards, Romain > >> --- >> ?configs/ti_am62x_sk_defconfig | 12 ++++++++---- >> ?1 file changed, 8 insertions(+), 4 deletions(-) >> >> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >> index c3ad555a81..f725734551 100644 >> --- a/configs/ti_am62x_sk_defconfig >> +++ b/configs/ti_am62x_sk_defconfig >> @@ -16,25 +16,29 @@ BR2_TARGET_ROOTFS_EXT2_4=y >> ?BR2_TARGET_ROOTFS_EXT2_SIZE="256M" >> ?BR2_TARGET_ARM_TRUSTED_FIRMWARE=y >> ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y >> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" >> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.10" >> ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" >> ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" >> ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y >> ?BR2_TARGET_OPTEE_OS=y >> ?BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" >> -BR2_TARGET_TI_K3_IMAGE_GEN=y >> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y >> +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y >> +BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_AM62X=y >> ?BR2_TARGET_TI_K3_R5_LOADER=y >> +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y >> +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" >> ?BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" >> +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y >> ?BR2_TARGET_UBOOT=y >> ?BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y >> ?BR2_TARGET_UBOOT_CUSTOM_VERSION=y >> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" >> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" >> ?BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" >> ?BR2_TARGET_UBOOT_NEEDS_DTC=y >> ?BR2_TARGET_UBOOT_NEEDS_OPENSSL=y >> ?BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y >> ?BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y >> +BR2_TARGET_UBOOT_USE_BINMAN=y >> ?# BR2_TARGET_UBOOT_FORMAT_BIN is not set >> ?BR2_TARGET_UBOOT_FORMAT_IMG=y >> ?BR2_TARGET_UBOOT_SPL=y > From bugzilla at busybox.net Wed Feb 14 15:30:21 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 14 Feb 2024 15:30:21 +0000 Subject: [Buildroot] [Bug 15943] New: Reevaluate Python3 patches Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15943 Bug ID: 15943 Summary: Reevaluate Python3 patches Product: buildroot Version: unspecified Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: vfazio at xes-inc.com CC: buildroot at uclibc.org Target Milestone: --- Currently, we have the following patches for Python 3: 0001-Make-the-build-of-pyc-files-conditional.patch 0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch 0003-Adjust-library-header-paths-for-cross-compilation.patch 0004-Serial-ioctl-workaround.patch 0005-Misc-python-config.sh.in-ensure-sed-invocations-only.patch 0006-Add-an-option-to-disable-pydoc.patch 0007-Add-an-option-to-disable-lib2to3.patch 0008-Add-an-option-to-disable-IDLE.patch 0009-python-config.sh-don-t-reassign-prefix.patch 0010-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch 0011-Add-option-to-disable-the-sqlite3-module.patch 0012-Add-an-option-to-disable-the-tk-module.patch 0013-Add-an-option-to-disable-the-curses-module.patch 0014-Add-an-option-to-disable-expat.patch 0015-fix-building-on-older-distributions.patch 0016-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch 0017-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch This issue is just to start some discussion on removing or reworking some of these patches and to check upstream status I'm going to skip 6-8, 11-14. These would be preferable to upstream or to find an alternative disable mechanism but so far are necessary. Some seem to require these build flags, others are being disabled via py_cv_ autoconf variables. Patch 0001: * Has no upstream status * could maybe be upstreamed * we disable it because: * we don't need all levels of optimization consuming disk space * we generate the legacy variants for sourceless distributions (https://github.com/python/cpython/issues/95827) * We could, instead, remove the files post build instead of patching to disable it * this costs build time, but is one less patch to maintain since we already have a hook to remove these files in python3.mk though it is not removing opt-0.pyc Patch 0002: * no upstream status * could maybe be upstreamed as you can't reliably run cross built code to determine bugginess of a function * patch could be removed if we define ac_cv_buggy_getaddrinfo=no like we do other ac_cv values in python3.mk or if we explicitly set either --(en|dis)able-ipv6 (https://github.com/python/cpython/commit/9635013a8fb68c044ea2cae2ec344b3940c188b2) * there could be issues if there is an actually buggy IPv6 implementation Patch 0003: * has no upstream status * not likely to be upstreamed * can probably be removed because these environment variables were dropped in BR 0d327c267a57e3a75b10becde772addb7fc49297 so this patch isn't doing anything Patch 0004: * has no upstream status * original discussion: http://lists.busybox.net/pipermail/buildroot/2014-July/102202.html * may not be needed for toolchains using kernel headers newer than 3.17 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f61bf8e7d19e0a3456a7a9ed97c399e4353698dc * what's our required minimum kernel header version? If we had one defined, we can make assumptions in our packages & patches. Patch 0005: * Upstream: https://github.com/python/cpython/issues/67096 * can likely be dropped since Python 3.10 https://github.com/python/cpython/commit/14086cfc5eed8c5e78342d79e5db87a135d75fa8 Patch 0010: * no upstream status * could maybe be upstreamed if the argument was made for it... the argument for landing this is buttressed by the other disable flags we patch in Patch 15: * no upstream status * no need for one... * should be dropped, we do not use the build host's python when cross compiling python as it requires a reasonably new version for regen, so we use the BR host version which is the same as the target version to satisfy this. * As of 3.12 it requires 3.10 https://github.com/python/cpython/commit/146106a0f1cc61815fa33f0d3f808a3e3e3275be Patch 16: * no upstream status * musl and uClibc do not have official upstream support though concessions have been made for musl * I think this needs more consideration... * CPython has very specific checks for the PLATFORM_TRIPLET which got reworked for 3.13 (and actually forcibly disables uClibc) * There's a bug in 3.12 where the "build_os" gets substituted for the PLATFORM_TRIPLET instead of the "host_os", fixed in 3.13 via https://github.com/python/cpython/commit/c163d7f0b67a568e9b64eeb9c1cbbaa127818596 * this commit (c163d7f0b67a568e9b64eeb9c1cbbaa127818596) also changes the PLATFORM_TRIPLET calculation * The patch should maybe be changed to fix the build_os/host_os issue and add a line for uclibc and/or to change the platform triplet detection code to correctly identify musl/uclibc Patch 17: * no upstream status (cpython doesn't have uclibc support) * should not be necessary for uClibc versions newer than 1.0.37 (see https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/libcrypt/crypt.c?id=6993d9378224489b49325bd1fb962f0e8bb935f1) * Do we specify a minimum uClibc version requirement anywhere so we can make assumptions in our packages & patches? -- Should the option disable patches just be a single patch? If not, I think I'd argue they should be the first few patches in the series. That way as we add and remove patches there's less patch reordering. -- You are receiving this mail because: You are on the CC list for the bug. From raphael.melotte at mind.be Wed Feb 14 15:47:02 2024 From: raphael.melotte at mind.be (=?UTF-8?B?UmFwaGHDq2wgTcOpbG90dGU=?=) Date: Wed, 14 Feb 2024 16:47:02 +0100 Subject: [Buildroot] [PATCH v8 21/26] package/python-rsa: migrate to poetry core pep517 build backend In-Reply-To: <20240213211512.3918044-21-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> <20240213211512.3918044-21-james.hilliard1@gmail.com> Message-ID: <70f20edd-f97e-4bb4-925a-9c0295a80fe1@mind.be> Hi James, all On 2/13/24 22:15, James Hilliard wrote: > We need to migrate python-rsa to the pep517 poetry-core > backend as setuptools is not supported when building with a pep517 > frontend. > > This package currently builds using setuptools as we do not yet > use setuptools with a pep517 build frontend. The package contains > a setuptools fallback which only can be used when using setuptools > without a pep517 frontend as the pep517 frontend will only use the > build backend specified in the package pyproject.toml which is > poetry-core and not setuptools. > > Signed-off-by: James Hilliard I ran the associated run-tests test on my side (only for python-rsa so far), it looks good to me. Tested-by: Rapha?l M?lotte > --- > package/python-rsa/python-rsa.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk > index d84ba8b431..69a6309b19 100644 > --- a/package/python-rsa/python-rsa.mk > +++ b/package/python-rsa/python-rsa.mk > @@ -7,9 +7,10 @@ > PYTHON_RSA_VERSION = 4.9 > PYTHON_RSA_SOURCE = rsa-$(PYTHON_RSA_VERSION).tar.gz > PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/aa/65/7d973b89c4d2351d7fb232c2e452547ddfa243e93131e7cfa766da627b52 > -PYTHON_RSA_SETUP_TYPE = setuptools > +PYTHON_RSA_SETUP_TYPE = pep517 > PYTHON_RSA_LICENSE = Apache-2.0 > PYTHON_RSA_LICENSE_FILES = LICENSE > PYTHON_RSA_CPE_ID_VALID = YES > +PYTHON_RSA_DEPENDENCIES = host-python-poetry-core > > $(eval $(python-package)) From romain.naour at smile.fr Wed Feb 14 16:23:00 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 14 Feb 2024 17:23:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: Message-ID: Hello David, Le 14/02/2024 ? 10:34, David Picard a ?crit?: > Add a package for the Intel/Altera SoC FPGA hardware library. It is > used to let the HPS and the FPGA fabric communicate with each other. We received 4 thime the same patch on the mailing list: http://patchwork.ozlabs.org/project/buildroot/patch/20240214081921.4663-1-david.picard at clermont.in2p3.fr/ http://patchwork.ozlabs.org/project/buildroot/patch/2770b2ac-4cec-4d56-81e9-89dfd33f786a at clermont.in2p3.fr/ http://patchwork.ozlabs.org/project/buildroot/patch/abcd4153-41e2-45ce-a89a-e198e86ba337 at clermont.in2p3.fr/ http://patchwork.ozlabs.org/project/buildroot/patch/c90e4512-405c-40fb-b597-1a04d7449afa at clermont.in2p3.fr/ Which one should we review? Please, send patch using git send-email tool. (https://nightly.buildroot.org/manual.html#submitting-patches) Also, when you resend a patch, add the changelog info. https://nightly.buildroot.org/manual.html#_patch_revision_changelog > > Signed-off-by: David Picard > --- > package/Config.in | 1 + > package/intel-socfpga-hwlib/Config.in | 12 ++++++ > .../intel-socfpga-hwlib.hash | 2 + > .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ > 4 files changed, 54 insertions(+) > create mode 100644 package/intel-socfpga-hwlib/Config.in > create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash > create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk > > diff --git a/package/Config.in b/package/Config.in > index bf0fe078b9..cd6c6bcaba 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1736,6 +1736,7 @@ menu "Hardware handling" > source "package/gnu-efi/Config.in" > source "package/hackrf/Config.in" > source "package/hidapi/Config.in" > + source "package/intel-socfpga-hwlib/Config.in" > source "package/jitterentropy-library/Config.in" > source "package/lcdapi/Config.in" > source "package/let-me-create/Config.in" > diff --git a/package/intel-socfpga-hwlib/Config.in > b/package/intel-socfpga-hwlib/Config.in > new file mode 100644 > index 0000000000..ced6483a59 > --- /dev/null > +++ b/package/intel-socfpga-hwlib/Config.in > @@ -0,0 +1,12 @@ > +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB > + bool "intel-socfpga-hwlib" > + depends on BR2_arm > + help > + This package provides the Intel SoC FPGA HWLIB for > + Intel/Altera SoC FPGA chips. > + This library allows to communicate with the FPGA fabric from > + Linux, running on the HPS device. > + The source code is not compiled. Instead, a symlink is added > + to $(STAGING_DIR)/lib. > + > + https://github.com/altera-opensource/intel-socfpga-hwlib Check the coding style with ./utils/check-package > diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash > b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash > new file mode 100644 > index 0000000000..60efe9013e > --- /dev/null > +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash > @@ -0,0 +1,2 @@ > +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 > intel-socfpga-hwlib-23.12.02.tar.gz > +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 > License.txt > diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk > b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk > new file mode 100644 > index 0000000000..bf18c23560 > --- /dev/null > +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk > @@ -0,0 +1,39 @@ > +################################################################################ > +# > +# intel-socfpga-hwlib > +# > +################################################################################ > + > +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 > +INTEL_SOCFPGA_HWLIB_SITE = $(call > github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) > +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY It's unexpected to find a PROPRIETARY tool in a gitbub accound with "opensource" in their name :) > +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt It look like a BSD-3-Clause license https://spdx.org/licenses/BSD-3-Clause.html > +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES > +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES > + > +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS > + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) > $(STAGING_DIR)/lib/intel-socfpga-hwlib > +endef I don't think this is what you want to do. > + > +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS > +# mkdir -p $(BINARIES_DIR)/intel-ucode > +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ > +# $(@D)/intel-ucode/* > +# endef > +# > +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) > +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS > +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode > +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ > +# $(@D)/intel-ucode/* > +# endef > +# else > +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO > +# endif > + > +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS > +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) > +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) > +# endef Please, don't add commended code. Best regards, Romain > + > +$(eval $(generic-package)) > From raphael.melotte at mind.be Wed Feb 14 17:03:33 2024 From: raphael.melotte at mind.be (=?UTF-8?B?UmFwaGHDq2wgTcOpbG90dGU=?=) Date: Wed, 14 Feb 2024 18:03:33 +0100 Subject: [Buildroot] [PATCH v8 26/26] package/pkg-python.mk: migrate setuptools to pep517 In-Reply-To: <20240213211512.3918044-26-james.hilliard1@gmail.com> References: <20240213211512.3918044-1-james.hilliard1@gmail.com> <20240213211512.3918044-26-james.hilliard1@gmail.com> Message-ID: On 2/13/24 22:15, James Hilliard wrote: > diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk > index 0149b8d185..1b33b7505d 100644 > --- a/package/python-psycopg2/python-psycopg2.mk > +++ b/package/python-psycopg2/python-psycopg2.mk > @@ -13,7 +13,8 @@ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE > PYTHON_PSYCOPG2_DEPENDENCIES = postgresql > # Force psycopg2 to use the Buildroot provided postgresql version > # instead of the one from the host machine > -PYTHON_PSYCOPG2_BUILD_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config > -PYTHON_PSYCOPG2_INSTALL_TARGET_OPTS = build_ext --pg-config=$(STAGING_DIR)/usr/bin/pg_config > +PYTHON_PSYCOPG2_BUILD_OPTS = \ > + -C--build-option=build_ext \ > + -C--build-option=--pg-config=$(STAGING_DIR)/usr/bin/pg_config > > $(eval $(python-package)) > diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk > index 639ce0e00e..8825868fb5 100644 > --- a/package/python-pymupdf/python-pymupdf.mk > +++ b/package/python-pymupdf/python-pymupdf.mk > @@ -13,6 +13,7 @@ PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ > PYTHON_PYMUPDF_LICENSE_FILES = COPYING > # No license file included in pip, but it's present on github > PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib > +PYTHON_PYMUPDF_BUILD_OPTS = --skip-dependency-check I tested python-pymupdf (only) on my side: apart from a runtime issue completely unrelated to this series (that I'm going to fix in a new series), it runs fine. Using '--skip-dependency-check' makes sense to me, as the pyproject.toml anyway contains only host dependencies that we already installed in another way (e.g. swig). So in other words: this part looks good to me! Tested-by: Rapha?l M?lotte (please note that I haven't tested any of the other packages changed in this patch) > > PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" > > diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk > index f1444b9124..48a298b221 100644 > --- a/package/python-pyzmq/python-pyzmq.mk > +++ b/package/python-pyzmq/python-pyzmq.mk > @@ -11,7 +11,7 @@ PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 > # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 > PYTHON_PYZMQ_LICENSE_FILES = LICENSE.LESSER LICENSE.BSD > PYTHON_PYZMQ_SETUP_TYPE = setuptools > -PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr > +PYTHON_PYZMQ_BUILD_OPTS = -C--build-option=--zmq=$(STAGING_DIR)/usr > PYTHON_PYZMQ_DEPENDENCIES = \ > host-python-cython \ > host-python-packaging \ > @@ -27,7 +27,7 @@ endef > PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION > > ifeq ($(BR2_PACKAGE_ZEROMQ_DRAFTS),y) > -PYTHON_PYZMQ_BUILD_OPTS += --enable-drafts > +PYTHON_PYZMQ_BUILD_OPTS += -C--build-option=--enable-drafts > endif > > $(eval $(python-package)) > diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > index 153343788b..95cfa025b3 100644 > --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk > @@ -11,5 +11,6 @@ PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT > PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE > HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm > +HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_BUILD_OPTS = --skip-dependency-check > > $(eval $(host-python-package)) > diff --git a/package/python-uvloop/python-uvloop.mk b/package/python-uvloop/python-uvloop.mk > index 285884a2bb..aaeab2805f 100644 > --- a/package/python-uvloop/python-uvloop.mk > +++ b/package/python-uvloop/python-uvloop.mk > @@ -10,8 +10,11 @@ PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/9c/16/728cc5dde368e > PYTHON_UVLOOP_SETUP_TYPE = setuptools > PYTHON_UVLOOP_LICENSE = Apache-2.0, MIT > PYTHON_UVLOOP_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT > -PYTHON_UVLOOP_BUILD_OPTS = build_ext --inplace --use-system-libuv > -PYTHON_UVLOOP_INSTALL_TARGET_OPTS = build_ext --inplace --use-system-libuv > PYTHON_UVLOOP_DEPENDENCIES = libuv > +PYTHON_UVLOOP_BUILD_OPTS = \ > + --skip-dependency-check \ > + -C--build-option=build_ext \ > + -C--build-option=--inplace \ > + -C--build-option=--use-system-libuv > > $(eval $(python-package)) > diff --git a/package/python-wsaccel/python-wsaccel.mk b/package/python-wsaccel/python-wsaccel.mk > index 1f63aa5c40..7ccb033256 100644 > --- a/package/python-wsaccel/python-wsaccel.mk > +++ b/package/python-wsaccel/python-wsaccel.mk > @@ -10,5 +10,6 @@ PYTHON_WSACCEL_SITE = https://files.pythonhosted.org/packages/94/28/41c0e711b538 > PYTHON_WSACCEL_LICENSE = Apache-2.0 > PYTHON_WSACCEL_LICENSE_FILES = LICENSE > PYTHON_WSACCEL_SETUP_TYPE = setuptools > +PYTHON_WSACCEL_BUILD_OPTS = --skip-dependency-check > > $(eval $(python-package)) From thomas at devoogdt.com Wed Feb 14 18:29:31 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 14 Feb 2024 19:29:31 +0100 Subject: [Buildroot] [PATCH v1] package/weston: fix auto seatd daemon selection Message-ID: <20240214182931.116813-1-thomas@devoogdt.com> Commit 9d6f966f9ad012879bb472896eb35eeda5baa9ab "package/weston: don't select seatd daemon if we have logind", added a fix to only select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND, but that conflicts with BR2_PACKAGE_SEATD_BUILTIN, which is selected by default in the seatd. Add the same logic here, so that it is possible again to select either the built-in or the daemon option. Signed-off-by: Thomas Devoogdt --- package/weston/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index db6a78ee8a..6bc43c73c2 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -19,7 +19,8 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_SEATD - select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND + select BR2_PACKAGE_SEATD_BUILTIN \ + if !BR2_PACKAGE_SYSTEMD_LOGIND && !BR2_PACKAGE_SEATD_DAEMON # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG select BR2_PACKAGE_WESTON_SHELL_DESKTOP if !BR2_PACKAGE_WESTON_HAS_SHELL -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 14 19:58:58 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 14 Feb 2024 20:58:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/gstreamer1/gst1-vaapi: fix wayland build Message-ID: <20240214195858.1796266-1-fontaine.fabrice@gmail.com> wayland-protocols is a mandatory dependency with wayland since bump to version 1.22.0 in commit 33d4c226e582f6c0086431c4d9154e462cb3cf34 and https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/3c713cc16ee1d374213cb2b47a3127e14e5ff8a5: Run-time dependency wayland-protocols found: NO (tried pkgconfig and cmake) ../output-1/build/gst1-vaapi-1.22.0/meson.build:111:0: ERROR: Dependency "wayland-protocols" not found, tried pkgconfig and cmake Fixes: 33d4c226e582f6c0086431c4d9154e462cb3cf34 - http://autobuild.buildroot.org/results/b5e79d4e10fdf24c3fd43ab742d9d14a5d07824b - http://autobuild.buildroot.org/results/ad624cd11d5a1b3346974000ae2b61f4261af02c Signed-off-by: Fabrice Fontaine --- package/gstreamer1/gst1-vaapi/Config.in | 1 + package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index a1062097ed..d6a1542ad3 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_GST1_VAAPI select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 4b04d1bb72..d934bab233 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -39,6 +39,7 @@ endif ifeq ($(BR2_PACKAGE_WAYLAND),y) GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +GST1_VAAPI_DEPENDENCIES += wayland wayland-protocols else GST1_VAAPI_CONF_OPTS += -Dwayland=disabled endif -- 2.43.0 From thomas at devoogdt.com Wed Feb 14 20:38:45 2024 From: thomas at devoogdt.com (Thomas Devoogdt) Date: Wed, 14 Feb 2024 21:38:45 +0100 Subject: [Buildroot] [PATCH v2] package/weston: bump to 13.0.0 Message-ID: <20240214203845.121720-1-thomas@devoogdt.com> Announce: https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html Drop -Dlauncher-libseat=true, as it has been dropped upstream [1]. Also drop the BR2_PACKAGE_SEATD_DAEMON, which was added in commit 6d677931284d58ae0e8e001cfd990eafaee5cecc "package/weston: select the seatd daemon", and commit 9d6f966f9ad012879bb472896eb35eeda5baa9ab "package/weston: don't select seatd daemon if we have logind", as it is not strictly needed anymore. In package/seatd/Config.in we have: select BR2_PACKAGE_SEATD_BUILTIN \ if !BR2_PACKAGE_SYSTEMD_LOGIND && !BR2_PACKAGE_SEATD_DAEMON Here we have: select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND This makes it impossible to select BR2_PACKAGE_SEATD_BUILTIN as the -only- backend if not BR2_PACKAGE_SYSTEMD_LOGIND, so drop it altogether. This kind of logic should be selected in the device defconfigs or by packages that really need one specific backend. [1]: https://gitlab.freedesktop.org/wayland/weston/-/commit/e3b6ed50f1c3c259c51274c78d08b58> Signed-off-by: Thomas Devoogdt --- v2: Combine and rework git message these two patches: - [v1] package/weston: bump to 13.0.0 https://patchwork.ozlabs.org/project/buildroot/patch/20240214075445.1011185-1-thomas.devoogdt at barco.com/ - [v1] package/weston: fix auto seatd daemon selection https://patchwork.ozlabs.org/project/buildroot/patch/20240214182931.116813-1-thomas at devoogdt.com/ --- package/weston/Config.in | 1 - package/weston/weston.hash | 6 +++--- package/weston/weston.mk | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index db6a78ee8a..1b282fb362 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -19,7 +19,6 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_SEATD - select BR2_PACKAGE_SEATD_DAEMON if !BR2_PACKAGE_SYSTEMD_LOGIND # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG select BR2_PACKAGE_WESTON_SHELL_DESKTOP if !BR2_PACKAGE_WESTON_HAS_SHELL diff --git a/package/weston/weston.hash b/package/weston/weston.hash index 0ecbaa4168..ded5d35275 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,4 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2023-May/042725.html -sha256 b18591eab278bc191720f6c09158040b795e7118af1d5ddca6acd9a8e2039535 weston-12.0.1.tar.xz -sha512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688 weston-12.0.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2023-November/043326.html +sha256 52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a weston-13.0.0.tar.xz +sha512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc weston-13.0.0.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index b07e798765..5ae9c22973 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,7 +4,7 @@ # ################################################################################ -WESTON_VERSION = 12.0.1 +WESTON_VERSION = 13.0.0 WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT @@ -19,7 +19,6 @@ WESTON_CONF_OPTS = \ -Ddoc=false \ -Dremoting=false \ -Dbackend-vnc=false \ - -Dlauncher-libseat=true \ -Dtools=calibrator,debug,info,terminal,touch-calibrator ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) -- 2.34.1 From kadambini.nema at gmail.com Wed Feb 14 22:25:39 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Wed, 14 Feb 2024 14:25:39 -0800 Subject: [Buildroot] [PATCH 1/1] package/ttyd: bump version to 1.7.4 Message-ID: <20240214222539.2268283-1-kadambini.nema@gmail.com> change log - https://github.com/tsl0922/ttyd/releases/tag/1.7.4 Signed-off-by: Kadambini Nema --- package/ttyd/ttyd.hash | 2 +- package/ttyd/ttyd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ttyd/ttyd.hash b/package/ttyd/ttyd.hash index 85bd71ba2d..b11327c465 100644 --- a/package/ttyd/ttyd.hash +++ b/package/ttyd/ttyd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c9cf5eece52d27c5d728000f11315d36cb400c6948d1964a34a7eae74b454099 ttyd-1.7.3.tar.gz +sha256 300d8cef4b0b32b0ec30d7bf4d3721a5d180e22607f9467a95ab7b6d9652ca9b ttyd-1.7.4.tar.gz sha256 8b7e100f8311cb428c57609164d93099bada2599f948359045d1ac876a7a625b LICENSE diff --git a/package/ttyd/ttyd.mk b/package/ttyd/ttyd.mk index d17e21d60b..d0e144b252 100644 --- a/package/ttyd/ttyd.mk +++ b/package/ttyd/ttyd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TTYD_VERSION = 1.7.3 +TTYD_VERSION = 1.7.4 TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) TTYD_LICENSE = MIT TTYD_LICENSE_FILES = LICENSE -- 2.25.1 From vineetg at rivosinc.com Wed Feb 14 22:43:55 2024 From: vineetg at rivosinc.com (Vineet Gupta) Date: Wed, 14 Feb 2024 14:43:55 -0800 Subject: [Buildroot] [PATCH] glibc: build: honor toplevel BR2_TARGET_OPTIMIZATION Message-ID: <20240214224355.551010-1-vineetg@rivosinc.com> glibc though part of toolchain is technically target binary and thus needs to be built with BR2_TARGET_OPTIMIZATION in case users want to force a certain build toogle from top level. Signed-off-by: Vineet Gupta --- package/glibc/glibc.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d198d6f04cb2..72031907c252 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -80,6 +80,9 @@ GLIBC_INSTALL_STAGING = YES GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install +# Seed with any special toggles user may have setup in config +GLIBC_EXTRA_CFLAGS = $(BR2_TARGET_OPTIMIZATION) + # Thumb build is broken, build in ARM mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) GLIBC_EXTRA_CFLAGS += -marm -- 2.34.1 From vineetg at rivosinc.com Wed Feb 14 23:01:14 2024 From: vineetg at rivosinc.com (Vineet Gupta) Date: Wed, 14 Feb 2024 15:01:14 -0800 Subject: [Buildroot] [PATCH v2] glibc: build: honor toplevel BR2_TARGET_OPTIMIZATION In-Reply-To: <20240214224355.551010-1-vineetg@rivosinc.com> References: <20240214224355.551010-1-vineetg@rivosinc.com> Message-ID: <20240214230114.551779-1-vineetg@rivosinc.com> glibc though part of toolchain is technically target binary and thus needs to be built with BR2_TARGET_OPTIMIZATION in case users want to force a certain build toogle from top level. Signed-off-by: Vineet Gupta --- Changes since v1: - Add to exisiting GLIBC_EXTRA_CFLAGS if any --- package/glibc/glibc.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d198d6f04cb2..ebcd7b2bdb21 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -80,6 +80,9 @@ GLIBC_INSTALL_STAGING = YES GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install +# Seed with any special toggles user may have setup in config +GLIBC_EXTRA_CFLAGS += $(BR2_TARGET_OPTIMIZATION) + # Thumb build is broken, build in ARM mode ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) GLIBC_EXTRA_CFLAGS += -marm -- 2.34.1 From kilian.zinnecker at mail.de Wed Feb 14 23:03:08 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Thu, 15 Feb 2024 00:03:08 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: References: <20240211120857.6622-1-kilian.zinnecker@mail.de> <20240211120857.6622-3-kilian.zinnecker@mail.de> Message-ID: <4868466.GXAFRqVoOG@laptop> Hello Giulio, all, [--SNIP--] > > a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > > b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > > new file mode 100644 > > index 0000000000..bcf5b965ce > > --- /dev/null > > +++ > > b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > > @@ -0,0 +1,30 @@ > > +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 > > +From: Kilian Zinnecker > > +Date: Mon, 21 Aug 2023 23:51:59 +0200 > > +Subject: [PATCH] Overwrite bootcmd by force > > + > > +This patch is a dirty hack: Trying to overwrite the bootcmd via the > > +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted > > +to some preset value and could not be changed easily. Therefore a > > +hook is used to force the bootcmd to be overwritten. > > This is strange because if so also the bootcmd content of uEnv.txt below > should be skipped, or maybe there is a bug in this u-boot that evaluates > bootcmd too early without taking into account environment variables. > But I'm also noticing that you have your Environment variables in Fat, > but it depends how u-boot deals with environment variables. Usually > you have to specificy an offset in memory where environment variables > live. > > But I see in your "make uboot-menuconfig" that CONFIG_ENV_IS_IN_FAT is > not enabled, but only CONFIG_ENV_IS_IN_MMC is and you have to specify: > CONFIG_ENV_OFFSET > CONFIG_ENV_SIZE > > So if you want to go with vfat way you need to enable > CONFIG_ENV_IS_IN_FAT and specify: > CONFIG_ENV_FAT_INTERFACE > CONFIG_ENV_FAT_DEVICE_AND_PART > and most of all: > CONFIG_ENV_FAT_FILE=uEnv.txt > in uboot.fragment below > > I would go with this last way instead of adding such dirty hack, can you > work on that? I tried, but so far I am not successful, maybe due to my lack of experience with uboot or maybe due to the customization of this particular uboot. I removed my custom-uboot patch and added the following configs to the uboot.fragment file, but it did not work yet: # CONFIG_ENV_IS_IN_MMC is not set CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" CONFIG_ENV_FAT_FILE="uEnv.txt" I also tried to use mainline uboot v2024.01, which features the Lichee Pi 4A, which features the same SoC, but this didn't work either. I had a look at the custom uboot source and it defines a lot of configs inside this header file: https://openbeagle.org/beaglev-ahead/beaglev-ahead-u-boot/-/blob/beaglev-v2020.01-1.1.2-ubuntu/include/configs/light-c910.h?ref_type=heads#L363-388 I tried to remove the hard-coded bootcmd from this header, but that also didn't work. I don't understand the inner workings of uboot well enough yet to get it properly working, so I appreciate all hints and any help here. However, I will already send a v4 of the patches, in which I try to address all the other issues. Thanks again for reviewing and best regards, Kilian From kilian.zinnecker at mail.de Wed Feb 14 23:30:25 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Thu, 15 Feb 2024 00:30:25 +0100 Subject: [Buildroot] [PATCH v4 0/3] Add board support for the BeagleV-Ahead Message-ID: <20240214233028.1226645-1-kilian.zinnecker@mail.de> This patch series adds board support for the BeagleV-Ahead. v3 -> v4: - Improved descriptions in commit messages - Patch to alphabetize own DEVELOPERS entry - Fix in package/xuantie-bins/Config.in: Spaces -> tabs - Github helper and removal of superfluous variables in xuantie-bins.mk - Added patch to disable CLOCK_ALLOW_WRITE_DEBUGFS in custom kernel v2 -> v3: - Added brief description what the xuantie bin binaries are for - Unrolled loop in XUANTIE_BINS_INSTALL_IMAGES_CMDS of package/xuantie-bins/xuantie-bins.mk - Added a second product page link to board's readme.txt - Added URL to the product page to git commit message - Dropped "_CUSTOM" from all "BR2_RISCV_ISA_*" in the board's defconfig - Add description to the board's readme.txt and defconfig why GCC v13 is chosen - Added BR2_PACKAGE_HOST_DOSFSTOOLS to board's defconfig v1 -> v2: - Added hash file for xuantie-bins package - Now uses uEnv.txt for actual boot commands - Removed extlinux.conf - Removed superflous comments inside config files Kilian Zinnecker (3): Fix alphabetical order of DEVELOPERS file entry package/xuantie-bins: new package configs/beaglev_ahead: new defconfig DEVELOPERS | 5 +- board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ board/beaglev-ahead/linux.fragment | 2 + ...01-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch | 30 +++++++ .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ board/beaglev-ahead/post-image.sh | 6 ++ board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ board/beaglev-ahead/uEnv.txt | 4 + board/beaglev-ahead/uboot.fragment | 2 + configs/beaglev_ahead_defconfig | 46 +++++++++++ package/Config.in | 1 + package/xuantie-bins/Config.in | 8 ++ package/xuantie-bins/xuantie-bins.hash | 2 + package/xuantie-bins/xuantie-bins.mk | 19 +++++ 14 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 board/beaglev-ahead/genimage.cfg create mode 100644 board/beaglev-ahead/linux.fragment create mode 100644 board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch create mode 100755 board/beaglev-ahead/post-image.sh create mode 100644 board/beaglev-ahead/readme.txt create mode 100644 board/beaglev-ahead/uEnv.txt create mode 100644 board/beaglev-ahead/uboot.fragment create mode 100644 configs/beaglev_ahead_defconfig create mode 100644 package/xuantie-bins/Config.in create mode 100644 package/xuantie-bins/xuantie-bins.hash create mode 100644 package/xuantie-bins/xuantie-bins.mk -- 2.34.1 From kilian.zinnecker at mail.de Wed Feb 14 23:30:26 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Thu, 15 Feb 2024 00:30:26 +0100 Subject: [Buildroot] [PATCH v4 1/3] Fix alphabetical order of DEVELOPERS file entry In-Reply-To: <20240214233028.1226645-1-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> Message-ID: <20240214233028.1226645-2-kilian.zinnecker@mail.de> Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..b75a92739a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1896,8 +1896,8 @@ F: package/libcamera/ N: Kilian Zinnecker F: board/avnet/rzboard_v2l/ F: board/radxa/rock5b/ -F: configs/rock5b_defconfig F: configs/avnet_rzboard_v2l_defconfig +F: configs/rock5b_defconfig F: package/rockchip-rkbin/ N: Klaus Heinrich Kiwi -- 2.34.1 From kilian.zinnecker at mail.de Wed Feb 14 23:30:27 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Thu, 15 Feb 2024 00:30:27 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/xuantie-bins: new package In-Reply-To: <20240214233028.1226645-1-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> Message-ID: <20240214233028.1226645-3-kilian.zinnecker@mail.de> This patch adds a package for Xuantie binary blobs. The binary blobs are needed for the BeagleV-Ahead's SoC (TH1520). They contain an FPGA binary for power management and a binary for the audio system. Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 1 + package/Config.in | 1 + package/xuantie-bins/Config.in | 8 ++++++++ package/xuantie-bins/xuantie-bins.hash | 2 ++ package/xuantie-bins/xuantie-bins.mk | 19 +++++++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/xuantie-bins/Config.in create mode 100644 package/xuantie-bins/xuantie-bins.hash create mode 100644 package/xuantie-bins/xuantie-bins.mk diff --git a/DEVELOPERS b/DEVELOPERS index b75a92739a..e9a9910d69 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1899,6 +1899,7 @@ F: board/radxa/rock5b/ F: configs/avnet_rzboard_v2l_defconfig F: configs/rock5b_defconfig F: package/rockchip-rkbin/ +F: package/xuantie-bins/ N: Klaus Heinrich Kiwi F: package/wqy-zenhei/ diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..b35cbc4038 100644 --- a/package/Config.in +++ b/package/Config.in @@ -656,6 +656,7 @@ endmenu source "package/wipe/Config.in" source "package/xorriso/Config.in" source "package/xr819-xradio/Config.in" + source "package/xuantie-bins/Config.in" endmenu menu "Interpreter languages and scripting" diff --git a/package/xuantie-bins/Config.in b/package/xuantie-bins/Config.in new file mode 100644 index 0000000000..18f5df1453 --- /dev/null +++ b/package/xuantie-bins/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_XUANTIE_BINS + bool "xuantie-bins" + depends on BR2_riscv + help + This package provides binary blobs, needed for the + BeagleV-Ahead's SoC (TH1520). They contain an FPGA binary + (light_aon_fpga.bin) for power management and a binary for + the audio system (light_c906_audio.bin). diff --git a/package/xuantie-bins/xuantie-bins.hash b/package/xuantie-bins/xuantie-bins.hash new file mode 100644 index 0000000000..5531a54617 --- /dev/null +++ b/package/xuantie-bins/xuantie-bins.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 92d2fee4688dc0598329d56cf7962f344d30b70e261a4cd9939b0912f06df26a xuantie-bins-1.2.1.tar.gz diff --git a/package/xuantie-bins/xuantie-bins.mk b/package/xuantie-bins/xuantie-bins.mk new file mode 100644 index 0000000000..bccfc9587d --- /dev/null +++ b/package/xuantie-bins/xuantie-bins.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# xuantie-bins +# +################################################################################ + +XUANTIE_BINS_VERSION = 1.2.1 +XUANTIE_BINS_SITE = $(call github,beagleboard,xuantie-ubuntu,beaglev-$(XUANTIE_BINS_VERSION)) +XUANTIE_BINS_LICENSE = PROPRIETARY + +XUANTIE_BINS_INSTALL_IMAGES = YES +XUANTIE_BINS_INSTALL_TARGET = NO + +define XUANTIE_BINS_INSTALL_IMAGES_CMDS + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/bins/light_aon_fpga.bin + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/bins/light_c906_audio.bin +endef + +$(eval $(generic-package)) -- 2.34.1 From kilian.zinnecker at mail.de Wed Feb 14 23:30:28 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Thu, 15 Feb 2024 00:30:28 +0100 Subject: [Buildroot] [PATCH v4 3/3] configs/beaglev_ahead: new defconfig In-Reply-To: <20240214233028.1226645-1-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> Message-ID: <20240214233028.1226645-4-kilian.zinnecker@mail.de> This patch adds board support for the BeagleV-Ahead. It uses a custom kernel for the board's SoC. As the SoC has an outdated and currently not supported version of the RISC-V vector extension, the vector extension is disabled. The used OpenSBI version for this board support does not define the neccessary flags for GCC 12 to activate the zicsr and zifencei extensions. Therefore this board support uses GCC 13. The boot command for the custom uboot to boot the kernel could not easily be changed. It seemed that a default boot command was persisent and any change to it by normal means (e.g., uboot config parameters like CONFIG_BOOT_COMMAND) did not have any effect. Hence a patch for the custom u-boot is introduced for now, to insert the proper boot command. The custom kernel has CLOCK_ALLOW_WRITE_DEBUGFS enabled by default. Therefore, this boards supports features a patch, which disables this again, as this option can be dangerous, if activated. https://www.beagleboard.org/boards/beaglev-ahead Signed-off-by: Kilian Zinnecker --- DEVELOPERS | 2 + board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ board/beaglev-ahead/linux.fragment | 2 + ...01-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch | 30 +++++++ .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ board/beaglev-ahead/post-image.sh | 6 ++ board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ board/beaglev-ahead/uEnv.txt | 4 + board/beaglev-ahead/uboot.fragment | 2 + configs/beaglev_ahead_defconfig | 46 +++++++++++ 10 files changed, 262 insertions(+) create mode 100644 board/beaglev-ahead/genimage.cfg create mode 100644 board/beaglev-ahead/linux.fragment create mode 100644 board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch create mode 100755 board/beaglev-ahead/post-image.sh create mode 100644 board/beaglev-ahead/readme.txt create mode 100644 board/beaglev-ahead/uEnv.txt create mode 100644 board/beaglev-ahead/uboot.fragment create mode 100644 configs/beaglev_ahead_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index e9a9910d69..adc6c09a7a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1895,8 +1895,10 @@ F: package/libcamera/ N: Kilian Zinnecker F: board/avnet/rzboard_v2l/ +F: board/beaglev-ahead/ F: board/radxa/rock5b/ F: configs/avnet_rzboard_v2l_defconfig +F: configs/beaglev_ahead_defconfig F: configs/rock5b_defconfig F: package/rockchip-rkbin/ F: package/xuantie-bins/ diff --git a/board/beaglev-ahead/genimage.cfg b/board/beaglev-ahead/genimage.cfg new file mode 100644 index 0000000000..080b169527 --- /dev/null +++ b/board/beaglev-ahead/genimage.cfg @@ -0,0 +1,62 @@ +# SD card image for BeagleV-Ahead + +image boot.vfat { + vfat { + files = { + "fw_dynamic.bin", + "Image", + "light_aon_fpga.bin", + "light-beagle.dtb", + "light_c906_audio.bin", + } + + file uEnv.txt { + image = "uEnv.txt" + } + + file overlays/BBORG_LOAD-00A2.dtbo { + image = "overlays/BBORG_LOAD-00A2.dtbo" + } + + file overlays/BBORG_RELAY-00A2.dtbo { + image = "overlays/BBORG_RELAY-00A2.dtbo" + } + + file overlays/BONE-LED_P8_03.dtbo { + image = "overlays/BONE-LED_P8_03.dtbo" + } + + file overlays/BONE-LED_P9_11.dtbo { + image = "overlays/BONE-LED_P9_11.dtbo" + } + + file overlays/BVA-MIKROBUS-0.dtbo { + image = "overlays/BVA-MIKROBUS-0.dtbo" + } + } + size = 48M +} + +image sdcard.img { + hdimage { + partition-table-type = "gpt" + gpt-location = 2M + } + + partition uboot { + in-partition-table = "false" + image = "u-boot-with-spl.bin" + offset = 0 + holes = {"(440; 1048576)"} + } + + partition boot { + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + image = "rootfs.ext2" + } +} + diff --git a/board/beaglev-ahead/linux.fragment b/board/beaglev-ahead/linux.fragment new file mode 100644 index 0000000000..00f93f39a4 --- /dev/null +++ b/board/beaglev-ahead/linux.fragment @@ -0,0 +1,2 @@ +# CONFIG_VECTOR is not set +# CONFIG_VECTOR_0_7 is not set diff --git a/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch b/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch new file mode 100644 index 0000000000..0487e43101 --- /dev/null +++ b/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch @@ -0,0 +1,30 @@ +From c82d614da43c3c2f7cdc7580c9ee24bd2ce203cd Mon Sep 17 00:00:00 2001 +From: Kilian Zinnecker +Date: Wed, 14 Feb 2024 20:54:37 +0100 +Subject: [PATCH] Disable CLOCK_ALLOW_WRITE_DEBUGFS + +CLOCK_ALLOW_WRITE_DEBUGFS is disabled as default, as it can be +very dangerous, see: + +https://lkml.org/lkml/2022/1/24/3382 + +Signed-off-by: Kilian Zinnecker +--- + drivers/clk/clk.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c +index 77774a8c701b..a6ba04ce0237 100644 +--- a/drivers/clk/clk.c ++++ b/drivers/clk/clk.c +@@ -3131,7 +3131,6 @@ static int clk_dump_show(struct seq_file *s, void *data) + } + DEFINE_SHOW_ATTRIBUTE(clk_dump); + +-#define CLOCK_ALLOW_WRITE_DEBUGFS + #ifdef CLOCK_ALLOW_WRITE_DEBUGFS + /* + * This can be dangerous, therefore don't provide any real compile time +-- +2.34.1 + diff --git a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch new file mode 100644 index 0000000000..bcf5b965ce --- /dev/null +++ b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch @@ -0,0 +1,30 @@ +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 +From: Kilian Zinnecker +Date: Mon, 21 Aug 2023 23:51:59 +0200 +Subject: [PATCH] Overwrite bootcmd by force + +This patch is a dirty hack: Trying to overwrite the bootcmd via the +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted +to some preset value and could not be changed easily. Therefore a +hook is used to force the bootcmd to be overwritten. + +Signed-off-by: Kilian Zinnecker +--- + board/thead/light-c910/light.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c +index 8d5478e916..1448db974e 100644 +--- a/board/thead/light-c910/light.c ++++ b/board/thead/light-c910/light.c +@@ -2282,6 +2282,7 @@ int board_late_init(void) + light_usb_boot_check(); + do_firmware_load(); + ap_peri_clk_disable(); ++ run_command("load mmc 1:1 $ramdisk_addr_r uEnv.txt; env import -t $ramdisk_addr_r $filesize; run uenvcmd", 0); + return 0; + } + +-- +2.34.1 + diff --git a/board/beaglev-ahead/post-image.sh b/board/beaglev-ahead/post-image.sh new file mode 100755 index 0000000000..9e16eeff3f --- /dev/null +++ b/board/beaglev-ahead/post-image.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -e + +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ ${BINARIES_DIR} +cp board/beaglev-ahead/uEnv.txt ${BINARIES_DIR}/ +support/scripts/genimage.sh -c board/beaglev-ahead/genimage.cfg diff --git a/board/beaglev-ahead/readme.txt b/board/beaglev-ahead/readme.txt new file mode 100644 index 0000000000..758082a792 --- /dev/null +++ b/board/beaglev-ahead/readme.txt @@ -0,0 +1,78 @@ +BeagleV-Ahead +============== +https://www.beagleboard.org/boards/beaglev-ahead +https://forum.beagleboard.org/c/beaglev/ + +The SoC (TH1520) of the BeagleV-Ahead implements an outdated and +currently not supported version of the RISC-V vector extension. Hence, +the vector extension is disabled. The used OpenSBI version for this +board support does not define the neccessary flags for GCC 12 to +activate the zicsr and zifencei extensions. Therefore this board +support uses GCC 13. + +Build: +====== + $ make beaglev_ahead_defconfig + $ make + +Files created in output directory +================================= + +output/images +. +??? boot.vfat +??? bootloader-JH7100-buildroot.bin.out +??? ddrinit-2133-buildroot.bin.out +??? fw_dynamic.bin +??? fw_dynamic.elf +??? fw_jump.bin +??? fw_jump.elf +??? fw_payload.bin +??? fw_payload.elf +??? Image +??? light-beagle.dtb +??? light_aon_fpga.bin +??? light_c906_audio.bin +??? overlays +??? rootfs.ext2 +??? rootfs.ext4 +??? rootfs.tar +??? sdcard.img +??? u-boot-with-spl.bin +??? u-boot.bin +??? uEnv.txt + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device. + +Booting: +======== + +SD card boot button: +-------------------- +To let the board boot from SD card, keep the "SD button" pressed during power +up / power cycle. The button is near the SD card slot. + +Serial console: +--------------- +The BeagleV-Ahead has a "Debug" GPIO header. Its layout can be seen here: +https://docs.beagleboard.org/latest/boards/beaglev/ahead/02-quick-start.html#access-uart-debug-console + +Note, that there are reported issues with some uart interface cables/dongles: +https://forum.beagleboard.org/t/beaglev-ahead-debug-terminal-problems/35331 + +Baudrate for this board is 115200. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +wiki link: +---------- +https://docs.beagleboard.org/latest/boards/beaglev/ahead/index.html diff --git a/board/beaglev-ahead/uEnv.txt b/board/beaglev-ahead/uEnv.txt new file mode 100644 index 0000000000..7e98ae5f81 --- /dev/null +++ b/board/beaglev-ahead/uEnv.txt @@ -0,0 +1,4 @@ +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} +uenvcmd=fatload mmc 1:1 ${kernel_addr_r} Image; fatload mmc 1:1 ${fdt_addr_r} light-beagle.dtb +bootargs=root=/dev/mmcblk1p2 rootfstype=ext4 rootwait ro console=ttyS0,115200 earlycon clk_ignore_unused net.ifnames=0 + diff --git a/board/beaglev-ahead/uboot.fragment b/board/beaglev-ahead/uboot.fragment new file mode 100644 index 0000000000..1f51cef106 --- /dev/null +++ b/board/beaglev-ahead/uboot.fragment @@ -0,0 +1,2 @@ +CONFIG_LEGACY_IMAGE_FORMAT=y +CONFIG_AUTOBOOT=y diff --git a/configs/beaglev_ahead_defconfig b/configs/beaglev_ahead_defconfig new file mode 100644 index 0000000000..9000b1f0ad --- /dev/null +++ b/configs/beaglev_ahead_defconfig @@ -0,0 +1,46 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_RVM=y +BR2_RISCV_ISA_RVA=y +BR2_RISCV_ISA_RVF=y +BR2_RISCV_ISA_RVD=y +BR2_RISCV_ISA_RVC=y +# Use GCC 13 for OpenSBI zicsr zifencei issue +BR2_GCC_VERSION_13_X=y +BR2_GLOBAL_PATCH_DIR="board/beaglev-ahead/patches" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglev-ahead/post-image.sh" +BR2_TARGET_GENERIC_HOSTNAME="BeagleV-Ahead" +BR2_TARGET_GENERIC_ISSUE="Welcome to the BeagleV-Ahead" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/linux/archive/refs/heads/beaglev-v5.10.113-1.1.2-ubuntu.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="beaglev" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/light-beagle" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/linux.fragment" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_BEAGLEV_DDRINIT=y +BR2_TARGET_BEAGLEV_SECONDBOOT=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-opensbi/archive/refs/heads/0.9-1.1.2-ubuntu.tar.gz" +BR2_TARGET_OPENSBI_PLAT="generic" +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-u-boot/archive/refs/heads/beaglev-v2020.01-1.1.2-ubuntu.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="light_beagle" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragment" +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_XUANTIE_BINS=y -- 2.34.1 From kadambini.nema at gmail.com Thu Feb 15 01:32:22 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Wed, 14 Feb 2024 17:32:22 -0800 Subject: [Buildroot] [PATCH 1/1] package/{tzdata, zic}: bump version to 2024a Message-ID: <20240215013222.2312466-1-kadambini.nema@gmail.com> Release notes - https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html Signed-off-by: Kadambini Nema --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 5488625ddd..d353bc4410 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html -sha512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 tzdata2023c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html +sha512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 tzdata2024a.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 33e296d7d7..e367205277 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2023c +TZDATA_VERSION = 2024a TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_SELINUX_MODULES = tzdata diff --git a/package/zic/zic.hash b/package/zic/zic.hash index a2720a27ba..80c96ed793 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html -sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html +sha512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c tzcode2024a.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index a915f6d256..95fa1eaa96 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2023c +ZIC_VERSION = 2024a ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 -- 2.25.1 From asd617140123 at gmail.com Thu Feb 15 05:57:29 2024 From: asd617140123 at gmail.com (eric) Date: Thu, 15 Feb 2024 13:57:29 +0800 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. In-Reply-To: <0e623797-b573-4604-b89e-737c7c503350@benettiengineering.com> References: <20240207030339.3910-1-asd617140123@gmail.com> <0e623797-b573-4604-b89e-737c7c503350@benettiengineering.com> Message-ID: Hi Giulio, > > Here you have to keep the previous tags when sending new version of > patches: I didn't get it, what is the previous tags? > > Reviewed-by: Giulio Benetti > [Build Tested] > Tested-by: Giulio Benetti > > > --- > > v1 -> v2 > > * Add BR2_cortex_a15_a7=y in buildroot defconfig. > > * Bump linux version to 6.6.8 > > * Using sunxi_defconfig in kernel. > > * Using "make savedefconfig" to save defconfig. > > * Remove boot.cmd. > > this patch had to be V3, but don't mind at this point. > I ask you when you send newer patches to set as superseded > the previous patch in patchwork: > https://patchwork.ozlabs.org/project/buildroot/list/ > > I just need to add v3 tag, right? or I need to add other tags, e.g., resend? > > --- > > DEVELOPERS | 4 +++ > > board/cubietech/cubieboard4/extlinux.conf | 5 +++ > > board/cubietech/cubieboard4/genimage.cfg | 38 ++++++++++++++++++++++ > > board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ > > configs/cubieboard4_defconfig | 39 +++++++++++++++++++++++ > > 5 files changed, 104 insertions(+) > > create mode 100644 board/cubietech/cubieboard4/extlinux.conf > > create mode 100644 board/cubietech/cubieboard4/genimage.cfg > > create mode 100755 board/cubietech/cubieboard4/post-image.sh > > create mode 100644 configs/cubieboard4_defconfig > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index a03018ab2b..bffb8f2069 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -3297,3 +3297,7 @@ F: package/quazip/ > > F: package/shapelib/ > > F: package/simple-mail/ > > F: package/tinc/ > > + > > +N: Nigel Wang > > +F: board/cubietech/cubieboard4/ > > +F: configs/cubieboard4_defconfig > > diff --git a/board/cubietech/cubieboard4/extlinux.conf > b/board/cubietech/cubieboard4/extlinux.conf > > new file mode 100644 > > index 0000000000..5084e2237b > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/extlinux.conf > > @@ -0,0 +1,5 @@ > > +label linux > > + kernel /boot/zImage > > + devicetree /sun9i-a80-cubieboard4.dtb > > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait > > + > > diff --git a/board/cubietech/cubieboard4/genimage.cfg > b/board/cubietech/cubieboard4/genimage.cfg > > new file mode 100644 > > index 0000000000..f1dee13923 > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/genimage.cfg > > @@ -0,0 +1,38 @@ > > +# Minimal SD card image for the Cubieboard2 > > +# Based in the Orange Pi genimage.cfg > > + > > +image boot.vfat { > > + vfat { > > + files = { > > + "zImage", > > + "sun9i-a80-cubieboard4.dtb", > > + "extlinux" > > + } > > + } > > + > > + size = 8M > > +} > > + > > +image sdcard.img { > > + hdimage { > > + } > > + > > + partition u-boot { > > + in-partition-table = "no" > > + image = "u-boot-sunxi-with-spl.bin" > > + offset = 8K > > + size = 1016K # 1MB - 8KB > > + } > > + > > + partition boot { > > + partition-type = 0xC > > + bootable = "true" > > + image = "boot.vfat" > > + } > > + > > + partition rootfs { > > + partition-type = 0x83 > > + image = "rootfs.ext4" > > + size = 512M > > + } > > +} > > diff --git a/board/cubietech/cubieboard4/post-image.sh > b/board/cubietech/cubieboard4/post-image.sh > > new file mode 100755 > > index 0000000000..e37b960a4d > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/post-image.sh > > @@ -0,0 +1,18 @@ > > +#!/bin/sh > > + > > +BOARD_DIR="$(dirname "$0")" > > +install -m 0644 -D $BOARD_DIR/extlinux.conf > $BINARIES_DIR/extlinux/extlinux.conf > > + > > +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > > + > > +rm -rf "${GENIMAGE_TMP}" > > + > > +genimage \ > > + --rootpath "${TARGET_DIR}" \ > > + --tmppath "${GENIMAGE_TMP}" \ > > + --inputpath "${BINARIES_DIR}" \ > > + --outputpath "${BINARIES_DIR}" \ > > + --config "${GENIMAGE_CFG}" > > + > > +exit $? > > diff --git a/configs/cubieboard4_defconfig > b/configs/cubieboard4_defconfig > > new file mode 100644 > > index 0000000000..0592fe4a2d > > --- /dev/null > > +++ b/configs/cubieboard4_defconfig > > @@ -0,0 +1,39 @@ > > +# Architecture > > +BR2_arm=y > > +BR2_cortex_a15_a7=y > > +BR2_ARM_FPU_NEON_VFPV4=y > > + > > +# System > > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" > > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" > > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" > > Here the option below is missing and it's needed otherwise the newest > Linux version will be picked and build will fail. > Now we don't see the problem because the latest version is exactly 6.6, > so need this: > > # Linux headers same as kernel, a 6.6 series > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > > > +# Kernel > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" > > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" > > + > > +# Filesystem > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > + > > +# Bootloader > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > +BR2_TARGET_UBOOT_SPL=y > > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > -- > > 2.34.1 > > > > This patch looks to me, except missing Linux header version. > > I've added that option and re-built successfully so I confirm my: > Reviewed-by: Giulio Benetti > [Build Tested] > Tested-by: Giulio Benetti > > Maybe a Maintainer can edit while committing, of if you can please send > a V3 with that missing line. > > Thank you! > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > -------------- next part -------------- An HTML attachment was scrubbed... URL: From kadambini.nema at gmail.com Thu Feb 15 06:08:14 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Wed, 14 Feb 2024 22:08:14 -0800 Subject: [Buildroot] [PATCH 1/1] package/bash: bump to version 5.2.21 Message-ID: <20240215060814.2618098-1-kadambini.nema@gmail.com> Build tested using the following config option: BR2_PACKAGE_BASH=y $ ./utils/test-pkg -c bash.config -p bash bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/bash/bash.hash | 4 ++-- package/bash/bash.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bash/bash.hash b/package/bash/bash.hash index e0a1ebac91..44c1c5ed50 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz.sig -sha256 13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c bash-5.2.15.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.2.21.tar.gz.sig +sha256 c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 bash-5.2.21.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 9a73ed8c36..9d173a5c7c 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.2.15 +BASH_VERSION = 5.2.21 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ -- 2.25.1 From kadambini.nema at gmail.com Thu Feb 15 07:00:11 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Wed, 14 Feb 2024 23:00:11 -0800 Subject: [Buildroot] [PATCH 1/1] package/iperf3: bump to version 3.16 Message-ID: <20240215070011.2668708-1-kadambini.nema@gmail.com> Release notes - https://github.com/esnet/iperf/releases/tag/3.16 Signed-off-by: Kadambini Nema --- package/iperf3/iperf3.hash | 4 ++-- package/iperf3/iperf3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 02ada0dcc6..a8634c4a7e 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.14.tar.gz.sha256 -sha256 723fcc430a027bc6952628fa2a3ac77584a1d0bd328275e573fc9b206c155004 iperf-3.14.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.16.tar.gz.sha256 +sha256 cc740c6bbea104398cc3e466befc515a25896ec85e44a662d5f4a767b9cf713e iperf-3.16.tar.gz # Locally computed sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index c00b16ce61..6d902c3b13 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.14 +IPERF3_VERSION = 3.16 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT -- 2.25.1 From david.picard at clermont.in2p3.fr Thu Feb 15 07:40:40 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Thu, 15 Feb 2024 08:40:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: Message-ID: <9e2b411e-276d-4e71-9e30-0f10b6ff79c5@clermont.in2p3.fr> Hi, I screwed up with the mailing list and posted the same patch 5 times. You can take any of them and discard the others. Sorry for the confusion... David Le 14/02/2024 ? 17:23, Romain Naour a ?crit?: > Hello David, > > Le 14/02/2024 ? 10:34, David Picard a ?crit?: >> Add a package for the Intel/Altera SoC FPGA hardware library. It is >> used to let the HPS and the FPGA fabric communicate with each other. > We received 4 thime the same patch on the mailing list: > > http://patchwork.ozlabs.org/project/buildroot/patch/20240214081921.4663-1-david.picard at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/2770b2ac-4cec-4d56-81e9-89dfd33f786a at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/abcd4153-41e2-45ce-a89a-e198e86ba337 at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/c90e4512-405c-40fb-b597-1a04d7449afa at clermont.in2p3.fr/ > > Which one should we review? > > Please, send patch using git send-email tool. > > (https://nightly.buildroot.org/manual.html#submitting-patches) > > Also, when you resend a patch, add the changelog info. > > https://nightly.buildroot.org/manual.html#_patch_revision_changelog > > >> Signed-off-by: David Picard >> --- >> package/Config.in | 1 + >> package/intel-socfpga-hwlib/Config.in | 12 ++++++ >> .../intel-socfpga-hwlib.hash | 2 + >> .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ >> 4 files changed, 54 insertions(+) >> create mode 100644 package/intel-socfpga-hwlib/Config.in >> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index bf0fe078b9..cd6c6bcaba 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -1736,6 +1736,7 @@ menu "Hardware handling" >> source "package/gnu-efi/Config.in" >> source "package/hackrf/Config.in" >> source "package/hidapi/Config.in" >> + source "package/intel-socfpga-hwlib/Config.in" >> source "package/jitterentropy-library/Config.in" >> source "package/lcdapi/Config.in" >> source "package/let-me-create/Config.in" >> diff --git a/package/intel-socfpga-hwlib/Config.in >> b/package/intel-socfpga-hwlib/Config.in >> new file mode 100644 >> index 0000000000..ced6483a59 >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/Config.in >> @@ -0,0 +1,12 @@ >> +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB >> + bool "intel-socfpga-hwlib" >> + depends on BR2_arm >> + help >> + This package provides the Intel SoC FPGA HWLIB for >> + Intel/Altera SoC FPGA chips. >> + This library allows to communicate with the FPGA fabric from >> + Linux, running on the HPS device. >> + The source code is not compiled. Instead, a symlink is added >> + to $(STAGING_DIR)/lib. >> + >> + https://github.com/altera-opensource/intel-socfpga-hwlib > Check the coding style with ./utils/check-package > >> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> new file mode 100644 >> index 0000000000..60efe9013e >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> @@ -0,0 +1,2 @@ >> +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 >> intel-socfpga-hwlib-23.12.02.tar.gz >> +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 >> License.txt >> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> new file mode 100644 >> index 0000000000..bf18c23560 >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> @@ -0,0 +1,39 @@ >> +################################################################################ >> +# >> +# intel-socfpga-hwlib >> +# >> +################################################################################ >> + >> +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 >> +INTEL_SOCFPGA_HWLIB_SITE = $(call >> github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) >> +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY > It's unexpected to find a PROPRIETARY tool in a gitbub accound with "opensource" > in their name :) > >> +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt > It look like a BSD-3-Clause license > > https://spdx.org/licenses/BSD-3-Clause.html > >> +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES >> +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES >> + >> +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS >> + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) >> $(STAGING_DIR)/lib/intel-socfpga-hwlib >> +endef > I don't think this is what you want to do. > >> + >> +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS >> +# mkdir -p $(BINARIES_DIR)/intel-ucode >> +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ >> +# $(@D)/intel-ucode/* >> +# endef >> +# >> +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) >> +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS >> +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode >> +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ >> +# $(@D)/intel-ucode/* >> +# endef >> +# else >> +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO >> +# endif >> + >> +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS >> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) >> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) >> +# endef > Please, don't add commended code. > > Best regards, > Romain > > >> + >> +$(eval $(generic-package)) >> From arnout at mind.be Thu Feb 15 07:53:33 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Thu, 15 Feb 2024 08:53:33 +0100 Subject: [Buildroot] [PATCH v2] glibc: build: honor toplevel BR2_TARGET_OPTIMIZATION In-Reply-To: <20240214230114.551779-1-vineetg@rivosinc.com> References: <20240214224355.551010-1-vineetg@rivosinc.com> <20240214230114.551779-1-vineetg@rivosinc.com> Message-ID: <2111ebed-d6b8-46d1-b109-9cd468be5ca0@mind.be> On 15/02/2024 00:01, Vineet Gupta wrote: > glibc though part of toolchain is technically target binary and thus > needs to be built with BR2_TARGET_OPTIMIZATION in case users want to > force a certain build toogle from top level. BR2_TARGET_OPTIMIZATION is encoded in the toolchain wrapper, and as far as I can see glibc is built with the toolchain wrapper... I haven't (re)tested it, but it should be the case... BR2_TARGET_OPTIMIZATION was added to the wrapper in commit b95e436ee0c9e4638dc79766da0d17927c6641ce in 2011. The wrapper was added to host-gcc-initial (which is used in the glibc build) in commit 919c06c28295f19ca49459b98d8954148b381360 in 2015. Regards, Arnout > > Signed-off-by: Vineet Gupta > --- > Changes since v1: > - Add to exisiting GLIBC_EXTRA_CFLAGS if any > --- > package/glibc/glibc.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk > index d198d6f04cb2..ebcd7b2bdb21 100644 > --- a/package/glibc/glibc.mk > +++ b/package/glibc/glibc.mk > @@ -80,6 +80,9 @@ GLIBC_INSTALL_STAGING = YES > > GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install > > +# Seed with any special toggles user may have setup in config > +GLIBC_EXTRA_CFLAGS += $(BR2_TARGET_OPTIMIZATION) > + > # Thumb build is broken, build in ARM mode > ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) > GLIBC_EXTRA_CFLAGS += -marm From alexander.sverdlin at gmail.com Thu Feb 15 10:13:21 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 11:13:21 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: > > This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > > > > This series start by adding U-boot binman support already submitted in the > > preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > > [1], with small improvements. > > See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > > > > With binman support, we can add the TI K3 j721e SoC support by > > providing all required firmware generated by the build. > > > > Add the new ti_j721e_sk_defconfig file to build a basic SD card image to > > boot the board (serial debug and ethernet working). > > > > Thanks to binman support, we can remove the ti-k3-image-gen tool from > > Buildroot. To do that, we have to update existing defconfig (am62, am64). > > > > Followup commits can improve TI K3 HS-FS devices based on binman instead > > of legacy core-secdev-k3 tool. > > > > [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html > > [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > > > > Best regards, > > Romain I have mixed feelings after testing the patchset on SK-AM62B... It doesn't quite boot, refer to the boot log [1]. Seems that U-Boot env is missing, maybe I'm missing some installation step, but I do not see it mentioned in the documetation (for instance of original commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig"). I'm not sure if this is a result of U-Boot update or if the current master is broken as well. I'll be retesting it today and will get back to you. Fortunately this patchset is actually about building the images differently and this part actually went smoothly, which is good. > > Dario Binacchi (5): > > ? package/python-attrs: add host variant > > ? package/python-rpds-py: add host variant > > ? package/python-referencing: add host variant > > ? package/python-jsonschema-specifications: add host variant > > ? package/python-jsonschema: add host variant > > > > Romain Naour (16): > > ? DEVELOPERS: add Romain Naour for am574x_idk_defconfig > > ? configs/ti_am62x_sk_defconfig: fix optee-os plateform > > ? configs/ti_am64x_sk_defconfig: fix optee-os plateform > > ? boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > > ? boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > ? boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to > > ??? BINARIES_DIR > > ? boot/ti-k3-boot-firmware: introduce > > ??? BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} > > ? boot/uboot: use DM firmware name defined by ti-k3-boot-firmware > > ??? package > > ? boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > > ? boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options > > ? boot/uboot: enable TI K3 Device Manager (DM) for j721e > > ? boot/ti-k3-boot-firmware: bump to version 09.02.00.004 > > ? configs/ti_j721e_sk_defconfig: new defconfig > > ? configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman > > ??? tool > > ? configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman > > ??? tool > > ? boot/ti-k3-image-gen: remove package > > > > ?Config.in.legacy????????????????????????????? |? 7 ++ > > ?DEVELOPERS??????????????????????????????????? |? 6 +- > > ?board/ti/j721e-sk/genimage.cfg??????????????? | 28 +++++++ > > ?board/ti/j721e-sk/post-build.sh?????????????? | 16 ++++ > > ?board/ti/j721e-sk/readme.txt????????????????? | 34 ++++++++ > > ?boot/Config.in??????????????????????????????? |? 1 - > > ?boot/ti-k3-boot-firmware/Config.in??????????? | 39 ++++++++++ > > ?.../ti-k3-boot-firmware.hash????????????????? |? 2 +- > > ?.../ti-k3-boot-firmware.mk??????????????????? | 16 ++-- > > ?boot/ti-k3-image-gen/Config.in??????????????? | 77 ------------------- > > ?boot/ti-k3-image-gen/ti-k3-image-gen.hash???? |? 3 - > > ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?????? | 54 ------------- > > ?boot/ti-k3-r5-loader/Config.in??????????????? |? 8 ++ > > ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk?????? | 23 ++++++ > > ?boot/uboot/Config.in????????????????????????? | 27 ++++--- > > ?boot/uboot/uboot.mk?????????????????????????? | 10 ++- > > ?configs/ti_am62x_sk_defconfig???????????????? | 14 ++-- > > ?configs/ti_am64x_sk_defconfig???????????????? | 14 ++-- > > ?...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- > > ?package/python-attrs/python-attrs.mk????????? |? 6 ++ > > ?.../python-jsonschema-specifications.mk?????? | 10 +++ > > ?.../python-jsonschema/python-jsonschema.mk??? | 14 ++++ > > ?.../python-referencing/python-referencing.mk? | 11 +++ > > ?package/python-rpds-py/python-rpds-py.mk????? |? 1 + > > ?24 files changed, 275 insertions(+), 180 deletions(-) > > ?create mode 100644 board/ti/j721e-sk/genimage.cfg > > ?create mode 100755 board/ti/j721e-sk/post-build.sh > > ?create mode 100644 board/ti/j721e-sk/readme.txt > > ?delete mode 100644 boot/ti-k3-image-gen/Config.in > > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > > ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk > > ?copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) > > > > -- > > 2.43.0 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot 1. Boot log: U-Boot SPL 2024.01 (Feb 15 2024 - 01:42:12 +0100) SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') SPL initial stack usage: 13400 bytes Trying to boot from MMC2 Authentication passed Authentication passed Authentication passed Authentication passed Authentication passed Starting ATF on ARM64 core... NOTICE: BL31: v2.10.0 (release):v2.10 NOTICE: BL31: Built : 01:28:38, Feb 15 2024 I/TC: I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1198-g18ff6d2643)) #1 Thu Feb 15 00:28:27 UTC 2024 aarch64 I/TC: WARNING: This OP-TEE configuration might be insecure! I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html I/TC: Primary CPU initializing I/TC: SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') I/TC: HUK Initialized I/TC: Activated SA2UL device I/TC: Enabled firewalls for SA2UL TRNG device I/TC: SA2UL TRNG initialized I/TC: SA2UL Drivers initialized I/TC: Primary CPU switching to normal world boot U-Boot SPL 2024.01 (Feb 15 2024 - 01:43:17 +0100) SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') SPL initial stack usage: 1872 bytes Trying to boot from MMC2 Authentication passed Authentication passed U-Boot 2024.01 (Feb 15 2024 - 01:43:17 +0100) SoC: AM62X SR1.0 HS-FS Model: Texas Instruments AM625 SK DRAM: 2 GiB Core: 56 devices, 23 uclasses, devicetree: separate MMC: mmc at fa10000: 0, mmc at fa00000: 1 Loading Environment from nowhere... OK In: serial at 2800000 Out: serial at 2800000 Err: serial at 2800000 Net: eth0: ethernet at 8000000port@1 Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc1 is current device SD/MMC found on device 1 Failed to load 'uEnv.txt' Scanning for bootflows in all bootdevs Seq Method State Uclass Part Name Filename --- ----------- ------ -------- ---- ------------------------ ---------------- Scanning global bootmeth 'efi_mgr': No EFI system partition No EFI system partition Failed to persist EFI variables Scanning bootdev 'mmc at fa00000.bootdev': Scanning bootdev 'mmc at fa10000.bootdev': Unknown uclass 'usb' in label link up on port 1, speed 100, full duplex BOOTP broadcast 1 BOOTP broadcast 2 BOOTP broadcast 3 BOOTP broadcast 4 BOOTP broadcast 5 BOOTP broadcast 6 BOOTP broadcast 7 BOOTP broadcast 8 BOOTP broadcast 9 BOOTP broadcast 10 BOOTP broadcast 11 BOOTP broadcast 12 BOOTP broadcast 13 BOOTP broadcast 14 BOOTP broadcast 15 BOOTP broadcast 16 BOOTP broadcast 17 Retry time exceeded; starting again -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Thu Feb 15 10:20:50 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 11:20:50 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240213172817.2872849-22-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> Message-ID: <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > -choice > - prompt "Security type" > - help > - ? The target SoC security type option for image gen.? Valid > - ? options are "gp" for General Purpose devices, "hs-fs" for > - ? High Security - Field Securable devices, or "hs" for High > - ? Security - Security Enforcing devices.? Note for all High > - ? Security device variants the TI_SECURE_DEV_PKG environmental > - ? variable must be defined at build time pointing to a valid > - ? core-secdev-k3 folder location, otherwise the build will > - ? fail, see > - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - bool "gp" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - bool "hs-fs" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > - bool "hs" > - > -endchoice another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y was the default, which didn't boot on my HS-FS SoC. You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the default for AM62x. I'm not sure if this is a problem, though. -- Alexander Sverdlin. From romain.naour at smile.fr Thu Feb 15 11:23:21 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 15 Feb 2024 12:23:21 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> Message-ID: <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> Hi Alexander, Le 15/02/2024 ? 11:13, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: >>> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. >>> >>> This series start by adding U-boot binman support already submitted in the >>> preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi >>> [1], with small improvements. >>> See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] >>> >>> With binman support, we can add the TI K3 j721e SoC support by >>> providing all required firmware generated by the build. >>> >>> Add the new ti_j721e_sk_defconfig file to build a basic SD card image to >>> boot the board (serial debug and ethernet working). >>> >>> Thanks to binman support, we can remove the ti-k3-image-gen tool from >>> Buildroot. To do that, we have to update existing defconfig (am62, am64). >>> >>> Followup commits can improve TI K3 HS-FS devices based on binman instead >>> of legacy core-secdev-k3 tool. >>> >>> [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html >>> [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf >>> >>> Best regards, >>> Romain > > I have mixed feelings after testing the patchset on SK-AM62B... > It doesn't quite boot, refer to the boot log [1]. > Seems that U-Boot env is missing, maybe I'm missing some installation > step, but I do not see it mentioned in the documetation (for instance > of original commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig"). > > I'm not sure if this is a result of U-Boot update or if the current > master is broken as well. I'll be retesting it today and will get back to > you. It seems you are testing on a HS-FS device "AM62X SR1.0 HS-FS" while I only runtime tested this series on a SK-TDA4VM (GP: general pupose). Also the ti_am62x_sk_defconfig is expecting a GP SoC so you may have to customize the image generated in a post-build script? Maybe you have to replace the tiboot3.bin binary included by genimage with the one for the HS-FS variant ? for j721e: 285449 13 f?vr. 17:27 tiboot3.bin 285449 13 f?vr. 17:27 tiboot3-j721e-gp-evm.bin 286224 13 f?vr. 17:27 tiboot3-j721e_sr1_1-hs-evm.bin 286224 13 f?vr. 17:27 tiboot3-j721e_sr2-hs-fs-evm.bin for am62x: tiboot3.bin << should be the gp variant by default tiboot3-am62x-gp-evm.bin tiboot3-am62x-hs-fs-evm.bin Also, did you have the ti-k3-core-secdev package locally, it seems it's required for HS-FS SoC but the package is currently missing: http://lists.busybox.net/pipermail/buildroot/2024-February/685383.html Is ti-k3-core-secdev really required fllowing the switch to binman? (binman should sign all firmware binaries itself). > > Fortunately this patchset is actually about building the images differently > and this part actually went smoothly, which is good. Thank you for testing, it help a lot! Maybe something is missing in this series to handle HS-FS device properly. > >>> Dario Binacchi (5): >>> ? package/python-attrs: add host variant >>> ? package/python-rpds-py: add host variant >>> ? package/python-referencing: add host variant >>> ? package/python-jsonschema-specifications: add host variant >>> ? package/python-jsonschema: add host variant >>> >>> Romain Naour (16): >>> ? DEVELOPERS: add Romain Naour for am574x_idk_defconfig >>> ? configs/ti_am62x_sk_defconfig: fix optee-os plateform >>> ? configs/ti_am64x_sk_defconfig: fix optee-os plateform >>> ? boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option >>> ? boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >>> ? boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to >>> ??? BINARIES_DIR >>> ? boot/ti-k3-boot-firmware: introduce >>> ??? BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} >>> ? boot/uboot: use DM firmware name defined by ti-k3-boot-firmware >>> ??? package >>> ? boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E >>> ? boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options >>> ? boot/uboot: enable TI K3 Device Manager (DM) for j721e >>> ? boot/ti-k3-boot-firmware: bump to version 09.02.00.004 >>> ? configs/ti_j721e_sk_defconfig: new defconfig >>> ? configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman >>> ??? tool >>> ? configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman >>> ??? tool >>> ? boot/ti-k3-image-gen: remove package >>> >>> ?Config.in.legacy????????????????????????????? |? 7 ++ >>> ?DEVELOPERS??????????????????????????????????? |? 6 +- >>> ?board/ti/j721e-sk/genimage.cfg??????????????? | 28 +++++++ >>> ?board/ti/j721e-sk/post-build.sh?????????????? | 16 ++++ >>> ?board/ti/j721e-sk/readme.txt????????????????? | 34 ++++++++ >>> ?boot/Config.in??????????????????????????????? |? 1 - >>> ?boot/ti-k3-boot-firmware/Config.in??????????? | 39 ++++++++++ >>> ?.../ti-k3-boot-firmware.hash????????????????? |? 2 +- >>> ?.../ti-k3-boot-firmware.mk??????????????????? | 16 ++-- >>> ?boot/ti-k3-image-gen/Config.in??????????????? | 77 ------------------- >>> ?boot/ti-k3-image-gen/ti-k3-image-gen.hash???? |? 3 - >>> ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?????? | 54 ------------- >>> ?boot/ti-k3-r5-loader/Config.in??????????????? |? 8 ++ >>> ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk?????? | 23 ++++++ >>> ?boot/uboot/Config.in????????????????????????? | 27 ++++--- >>> ?boot/uboot/uboot.mk?????????????????????????? | 10 ++- >>> ?configs/ti_am62x_sk_defconfig???????????????? | 14 ++-- >>> ?configs/ti_am64x_sk_defconfig???????????????? | 14 ++-- >>> ?...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- >>> ?package/python-attrs/python-attrs.mk????????? |? 6 ++ >>> ?.../python-jsonschema-specifications.mk?????? | 10 +++ >>> ?.../python-jsonschema/python-jsonschema.mk??? | 14 ++++ >>> ?.../python-referencing/python-referencing.mk? | 11 +++ >>> ?package/python-rpds-py/python-rpds-py.mk????? |? 1 + >>> ?24 files changed, 275 insertions(+), 180 deletions(-) >>> ?create mode 100644 board/ti/j721e-sk/genimage.cfg >>> ?create mode 100755 board/ti/j721e-sk/post-build.sh >>> ?create mode 100644 board/ti/j721e-sk/readme.txt >>> ?delete mode 100644 boot/ti-k3-image-gen/Config.in >>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash >>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk >>> ?copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) >>> >>> -- >>> 2.43.0 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot > > 1. Boot log: > > U-Boot SPL 2024.01 (Feb 15 2024 - 01:42:12 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > SPL initial stack usage: 13400 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Starting ATF on ARM64 core... > > NOTICE: BL31: v2.10.0 (release):v2.10 > NOTICE: BL31: Built : 01:28:38, Feb 15 2024 > I/TC: > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1198-g18ff6d2643)) #1 Thu Feb 15 00:28:27 UTC 2024 aarch64 > I/TC: WARNING: This OP-TEE configuration might be insecure! > I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html > I/TC: Primary CPU initializing > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > I/TC: HUK Initialized > I/TC: Activated SA2UL device > I/TC: Enabled firewalls for SA2UL TRNG device > I/TC: SA2UL TRNG initialized > I/TC: SA2UL Drivers initialized > I/TC: Primary CPU switching to normal world boot > > U-Boot SPL 2024.01 (Feb 15 2024 - 01:43:17 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > SPL initial stack usage: 1872 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > > > U-Boot 2024.01 (Feb 15 2024 - 01:43:17 +0100) > > SoC: AM62X SR1.0 HS-FS > Model: Texas Instruments AM625 SK > DRAM: 2 GiB > Core: 56 devices, 23 uclasses, devicetree: separate > MMC: mmc at fa10000: 0, mmc at fa00000: 1 > Loading Environment from nowhere... OK > In: serial at 2800000 > Out: serial at 2800000 > Err: serial at 2800000 > Net: eth0: ethernet at 8000000port@1 > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc1 is current device > SD/MMC found on device 1 > Failed to load 'uEnv.txt' Can you access to the mmc1 content manually ? I had to create a symlink due to "dtb" subdirectory expected by u-boot u-boot is looking at /boot/dtb/ti for devicetree. Best regards, Romain > Scanning for bootflows in all bootdevs > Seq Method State Uclass Part Name Filename > --- ----------- ------ -------- ---- ------------------------ ---------------- > Scanning global bootmeth 'efi_mgr': > No EFI system partition > No EFI system partition > Failed to persist EFI variables > Scanning bootdev 'mmc at fa00000.bootdev': > Scanning bootdev 'mmc at fa10000.bootdev': > Unknown uclass 'usb' in label > link up on port 1, speed 100, full duplex > BOOTP broadcast 1 > BOOTP broadcast 2 > BOOTP broadcast 3 > BOOTP broadcast 4 > BOOTP broadcast 5 > BOOTP broadcast 6 > BOOTP broadcast 7 > BOOTP broadcast 8 > BOOTP broadcast 9 > BOOTP broadcast 10 > BOOTP broadcast 11 > BOOTP broadcast 12 > BOOTP broadcast 13 > BOOTP broadcast 14 > BOOTP broadcast 15 > BOOTP broadcast 16 > BOOTP broadcast 17 > > Retry time exceeded; starting again > > > From romain.naour at smile.fr Thu Feb 15 11:26:52 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 15 Feb 2024 12:26:52 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> Message-ID: <7e253e56-25f4-494a-98d9-e0d908517acd@smile.fr> Hi Alexander, Le 15/02/2024 ? 11:20, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >> -choice >> - prompt "Security type" >> - help >> - ? The target SoC security type option for image gen.? Valid >> - ? options are "gp" for General Purpose devices, "hs-fs" for >> - ? High Security - Field Securable devices, or "hs" for High >> - ? Security - Security Enforcing devices.? Note for all High >> - ? Security device variants the TI_SECURE_DEV_PKG environmental >> - ? variable must be defined at build time pointing to a valid >> - ? core-secdev-k3 folder location, otherwise the build will >> - ? fail, see >> - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >> - >> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >> - bool "gp" >> - >> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >> - bool "hs-fs" >> - >> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >> - bool "hs" >> - >> -endchoice > > another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > was the default, which didn't boot on my HS-FS SoC. > > You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the > default for AM62x. I'm not sure if this is a problem, though. > I don't think so, the am62x defconfig should still be for GP SoC by default. Ok, maybe there is something to improve in this series but I don't have any HS/HS-FS SoC for testing... Best regards, Romain From dave.mehler at gmail.com Thu Feb 15 14:13:21 2024 From: dave.mehler at gmail.com (David Mehler) Date: Thu, 15 Feb 2024 09:13:21 -0500 Subject: [Buildroot] Headless setup, Raspberry Pi 4B and zero 2 w, Wi-Fi, Bluetooth, SSH? Message-ID: Hello, I'm using the latest buildroot and apparently I'm finding outdated information on these subjects because nothing I'm trying is working. I've got two Raspberry PIs, one a 4b the other a zero 2 w, on both I'm wanting to use them headlessly, so I'd like to do the following: 1. Get Wi-Fi going on boot and connect to a dedicated wireless network 2. Get bluetooth up and running (and set up a bluetooth serial console) 3. Enable ssh so that option is available 4. Install different custom packages for each unit, the 4 and the zero won't have the same packages aside from the Wi-Fi/bluetooth/ssh setup and in the case of the Zero 2 w: 5. Configure the camera module so it is up and running and ready to go Up to date information welcome. Thanks. Dave. From gilles.talis at gmail.com Thu Feb 15 14:24:06 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:06 -0400 Subject: [Buildroot] [PATCH] package/fdk-aac: bump to version 2.0.3 Message-ID: <20240215142413.451505-1-gilles.talis@gmail.com> Change log: https://github.com/mstorsjo/fdk-aac/blob/master/ChangeLog Signed-off-by: Gilles Talis --- package/fdk-aac/fdk-aac.hash | 5 +---- package/fdk-aac/fdk-aac.mk | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package/fdk-aac/fdk-aac.hash b/package/fdk-aac/fdk-aac.hash index b10d5f92b1..07c5561712 100644 --- a/package/fdk-aac/fdk-aac.hash +++ b/package/fdk-aac/fdk-aac.hash @@ -1,6 +1,3 @@ -# From https://sourceforge.net/projects/opencore-amr/files/fdk-aac/ -sha1 579b34e8174b4feb21a9c598695f5ff4a7ceef8c fdk-aac-2.0.2.tar.gz -md5 b41222194b31f570b3132bd622a9aef6 fdk-aac-2.0.2.tar.gz # Locally computed: -sha256 c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f fdk-aac-2.0.2.tar.gz +sha256 829b6b89eef382409cda6857fd82af84fabb63417b08ede9ea7a553f811cb79e fdk-aac-2.0.3.tar.gz sha256 95ec80da40b4af12ad4c4f3158c9cfb80f2479f3246e4260cb600827cc8c7836 NOTICE diff --git a/package/fdk-aac/fdk-aac.mk b/package/fdk-aac/fdk-aac.mk index c66f6df797..01a100fa94 100644 --- a/package/fdk-aac/fdk-aac.mk +++ b/package/fdk-aac/fdk-aac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FDK_AAC_VERSION = 2.0.2 +FDK_AAC_VERSION = 2.0.3 FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac FDK_AAC_LICENSE = fdk-aac license FDK_AAC_LICENSE_FILES = NOTICE -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:07 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:07 -0400 Subject: [Buildroot] [PATCH] package/iozone: bump to version 3.506 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-2-gilles.talis@gmail.com> Signed-off-by: Gilles Talis --- package/iozone/iozone.hash | 2 +- package/iozone/iozone.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index 9ecf1d1af8..c506b41db2 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 iozone3_493.tgz +sha256 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7 iozone3_506.tar diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 2df4a2aa84..7cce15c53d 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,8 +4,8 @@ # ################################################################################ -IOZONE_VERSION = 3.493 -IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz +IOZONE_VERSION = 3.506 +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) # IOzone license details can be found at: -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:08 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:08 -0400 Subject: [Buildroot] [PATCH] package/leptonica: bump to version 1.84.1 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-3-gilles.talis@gmail.com> Change log: http://www.leptonica.org/source/version-notes.html Signed-off-by: Gilles Talis --- package/leptonica/leptonica.hash | 2 +- package/leptonica/leptonica.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/leptonica/leptonica.hash b/package/leptonica/leptonica.hash index 6511d6b410..3416cfeb39 100644 --- a/package/leptonica/leptonica.hash +++ b/package/leptonica/leptonica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 8f18615e0743af7df7f50985c730dfcf0c93548073d1f56621e4156a8b54d3dd leptonica-1.83.1.tar.gz +sha256 2b3e1254b1cca381e77c819b59ca99774ff43530209b9aeb511e1d46588a64f6 leptonica-1.84.1.tar.gz sha256 87829abb5bbb00b55a107365da89e9a33f86c4250169e5a1e5588505be7d5806 leptonica-license.txt diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 4cb73296e8..0e902c6488 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEPTONICA_VERSION = 1.83.1 +LEPTONICA_VERSION = 1.84.1 LEPTONICA_SITE = https://github.com/DanBloomberg/leptonica/releases/download/$(LEPTONICA_VERSION) LEPTONICA_LICENSE = BSD-2-Clause LEPTONICA_LICENSE_FILES = leptonica-license.txt -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:09 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:09 -0400 Subject: [Buildroot] [PATCH] package/libolm: bump to version 3.2.16 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-4-gilles.talis@gmail.com> Change log: https://gitlab.matrix.org/matrix-org/olm/-/blob/master/CHANGELOG.rst Signed-off-by: Gilles Talis --- package/libolm/libolm.hash | 2 +- package/libolm/libolm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libolm/libolm.hash b/package/libolm/libolm.hash index 044bb24f06..a95115d2fe 100644 --- a/package/libolm/libolm.hash +++ b/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 614c0e4dc4721f57e56c3385bd8def2f71c6631f928a480efd0b4bd8e5435df9 olm-3.2.9.tar.gz +sha256 1e90f9891009965fd064be747616da46b232086fe270b77605ec9bda34272a68 olm-3.2.16.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 6f06686555..5c8bcd1f59 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.2.9 +LIBOLM_VERSION = 3.2.16 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:10 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:10 -0400 Subject: [Buildroot] [PATCH] package/ocrad: bump to version 0.29 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-5-gilles.talis@gmail.com> Signed-off-by: Gilles Talis --- package/ocrad/ocrad.hash | 2 +- package/ocrad/ocrad.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash index cd5b0039ea..736dd6ad4c 100644 --- a/package/ocrad/ocrad.hash +++ b/package/ocrad/ocrad.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e ocrad-0.28.tar.lz +sha256 11200cc6b0b7ba16884a72dccb58ef694f7aa26cd2b2041e555580f064d2d9e9 ocrad-0.29.tar.lz sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk index d62b7af351..2452070bcf 100644 --- a/package/ocrad/ocrad.mk +++ b/package/ocrad/ocrad.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCRAD_VERSION = 0.28 +OCRAD_VERSION = 0.29 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad OCRAD_LICENSE = GPL-2.0+ -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:11 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:11 -0400 Subject: [Buildroot] [PATCH] package/opencl-clhpp: bump to version 2023.12.14 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-6-gilles.talis@gmail.com> Change log: https://github.com/KhronosGroup/OpenCL-CLHPP/releases/tag/v2023.12.14 Signed-off-by: Gilles Talis --- package/opencl-clhpp/opencl-clhpp.hash | 2 +- package/opencl-clhpp/opencl-clhpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opencl-clhpp/opencl-clhpp.hash b/package/opencl-clhpp/opencl-clhpp.hash index 27b27cd80c..3f038d6340 100644 --- a/package/opencl-clhpp/opencl-clhpp.hash +++ b/package/opencl-clhpp/opencl-clhpp.hash @@ -1,3 +1,3 @@ # Locally Computed -sha256 869456032e60787eed9fceaeaf6c6cb4452bc0ff97e0f5a271510145a1c8f4d4 opencl-clhpp-2.0.16.tar.gz +sha256 9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82 opencl-clhpp-2023.12.14.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/opencl-clhpp/opencl-clhpp.mk b/package/opencl-clhpp/opencl-clhpp.mk index 933b40e3fe..93c25d0d66 100644 --- a/package/opencl-clhpp/opencl-clhpp.mk +++ b/package/opencl-clhpp/opencl-clhpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCL_CLHPP_VERSION = 2.0.16 +OPENCL_CLHPP_VERSION = 2023.12.14 OPENCL_CLHPP_SITE = $(call github,KhronosGroup,OpenCL-CLHPP,v$(OPENCL_CLHPP_VERSION)) OPENCL_CLHPP_LICENSE = Apache-2.0 OPENCL_CLHPP_LICENSE_FILES = LICENSE.txt -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:12 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:12 -0400 Subject: [Buildroot] [PATCH] package/tesseract-ocr: bump to version 5.3.4 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-7-gilles.talis@gmail.com> Changes since version 5.3.3: https://github.com/tesseract-ocr/tesseract/compare/5.3.3...5.3.4 Signed-off-by: Gilles Talis --- package/tesseract-ocr/tesseract-ocr.hash | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 45b9def27f..41c8498bec 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 dc4329f85f41191b2d813b71b528ba6047745813474e583ccce8795ff2ff5681 tesseract-ocr-5.3.3.tar.gz +sha256 141afc12b34a14bb691a939b4b122db0d51bd38feda7f41696822bacea7710c7 tesseract-ocr-5.3.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index d65111d468..0bc90f4871 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,7 +4,7 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 5.3.3 +TESSERACT_OCR_VERSION = 5.3.4 TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 -- 2.39.2 From gilles.talis at gmail.com Thu Feb 15 14:24:13 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Thu, 15 Feb 2024 10:24:13 -0400 Subject: [Buildroot] [PATCH] package/xapian: bump to version 1.4.24 In-Reply-To: <20240215142413.451505-1-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> Message-ID: <20240215142413.451505-8-gilles.talis@gmail.com> Change log: https://xapian.org/docs/xapian-core-1.4.24/NEWS Signed-off-by: Gilles Talis --- package/xapian/xapian.hash | 4 ++-- package/xapian/xapian.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index e570f7e2f2..16889b4559 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2022-January/009934.html -sha256 1fca48fca6cc3526cc4ba93dd194fe9c1326857b78edcfb37e68d086d714a9c3 xapian-core-1.4.19.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2023-November/010009.html +sha256 eda5ae6dcf6b0553a8676af64b1fd304e998cd20f779031ccaaf7ab9a373531a xapian-core-1.4.24.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 464e5478df..33c36a5a26 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.19 +XAPIAN_VERSION = 1.4.24 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ -- 2.39.2 From jubalh at iodoru.org Thu Feb 15 14:31:44 2024 From: jubalh at iodoru.org (Michael Vetter) Date: Thu, 15 Feb 2024 15:31:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/shadow: bump to version 4.14.5 Message-ID: <20240215143144.31911-1-jubalh@iodoru.org> Omit 4.14.4 since it was broken. Signed-off-by: Michael Vetter --- package/shadow/shadow.hash | 4 ++-- package/shadow/shadow.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash index 4689a994de..23c292d659 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.3/shadow-4.14.3.tar.xz.asc +# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.5/shadow-4.14.5.tar.xz.asc # with key A9348594CE31283A826FBDD8D57633D441E25BB5 -sha256 6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2 shadow-4.14.3.tar.xz +sha256 cba74bc7b05d89c015afe23131f9159ece38779d40a8af4cf162852e6e85ca23 shadow-4.14.5.tar.xz sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 03eb16a3f4..4b831908a2 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHADOW_VERSION = 4.14.3 +SHADOW_VERSION = 4.14.5 SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz SHADOW_LICENSE = BSD-3-Clause -- 2.35.3 From buildroot at bubu1.eu Thu Feb 15 14:42:41 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 15 Feb 2024 15:42:41 +0100 Subject: [Buildroot] [PATCH 1/3] package/libmbim: bump to 1.30.0 Message-ID: <20240215144243.3538255-1-buildroot@bubu1.eu> Explicitly disable newly introduced fuzzer build option. Changelog: https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/blob/mbim-1-30/NEWS Signed-off-by: Marcus Hoffmann --- package/libmbim/libmbim.hash | 2 +- package/libmbim/libmbim.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index 8e7633cb94..ebc37504c5 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 cf74682c56f4c34ca4aee86de3b8c425a89fc2c0782052815295faf6a8e0a9fb libmbim-1.28.2.tar.gz +sha256 cfc729d23b9bf699b23a7ef2f5d732d6eff96234e31fed36b778771a6e3d3ee5 libmbim-1.30.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-or-later.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 59f55a57bc..717c2396f7 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.28.2 +LIBMBIM_VERSION = 1.30.0 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) LIBMBIM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = \ @@ -13,7 +13,7 @@ LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES LIBMBIM_DEPENDENCIES = libglib2 -LIBMBIM_CONF_OPTS = -Dman=false +LIBMBIM_CONF_OPTS = -Dman=false -Dfuzzer=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBMBIM_DEPENDENCIES += gobject-introspection -- 2.34.1 From buildroot at bubu1.eu Thu Feb 15 14:42:42 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 15 Feb 2024 15:42:42 +0100 Subject: [Buildroot] [PATCH 2/3] package/libqmi: bump to version 1.34.0 In-Reply-To: <20240215144243.3538255-1-buildroot@bubu1.eu> References: <20240215144243.3538255-1-buildroot@bubu1.eu> Message-ID: <20240215144243.3538255-2-buildroot@bubu1.eu> Explicitly disable new fuzzer build option. Changelog: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/qmi-1-34/NEWS Signed-off-by: Marcus Hoffmann --- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 5036c1d3c0..7937f989a0 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 aec96bf2733a7b5ba27bb52346ce3a1ab54440800843f78001cc2a51213ce1b9 libqmi-1.32.2.tar.gz +sha256 8690d25b4d110b6df28b31da0a8bf16c7e966d31abcfeeb854f2753451e7a400 libqmi-1.34.0.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index eae41446e2..524333feba 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.32.2 +LIBQMI_VERSION = 1.34.0 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB @@ -12,7 +12,7 @@ LIBQMI_CPE_ID_VALID = YES LIBQMI_INSTALL_STAGING = YES LIBQMI_DEPENDENCIES = libglib2 -LIBQMI_CONF_OPTS = -Dman=false +LIBQMI_CONF_OPTS = -Dman=false -Dfuzzer=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBQMI_DEPENDENCIES += gobject-introspection -- 2.34.1 From buildroot at bubu1.eu Thu Feb 15 14:42:43 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 15 Feb 2024 15:42:43 +0100 Subject: [Buildroot] [PATCH 3/3] package/modem-manager: bump to 1.22.0 In-Reply-To: <20240215144243.3538255-1-buildroot@bubu1.eu> References: <20240215144243.3538255-1-buildroot@bubu1.eu> Message-ID: <20240215144243.3538255-3-buildroot@bubu1.eu> Explicitly disable newly introduced build options. Changelog: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/blob/mm-1-22/NEWS Signed-off-by: Marcus Hoffmann --- package/modem-manager/modem-manager.hash | 4 ++-- package/modem-manager/modem-manager.mk | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 4b8b795af7..fa81acd9dc 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ -#Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc -sha256 9c16b47547faac9515f2d03d1e8175de9c5e6769b1ee16b608ba6cfe6f04b03e ModemManager-1.20.4.tar.gz +#Locally calculated +sha256 6c8f8720737a3788e394c700f36236278c9de09d76069a079e6f1daaf08b2768 ModemManager-1.22.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 979a80a8e9..495dbcd258 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.20.4 +MODEM_MANAGER_VERSION = 1.22.0 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) @@ -13,6 +13,8 @@ MODEM_MANAGER_SELINUX_MODULES = modemmanager MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = \ + -Dbuiltin_plugins=false \ + -Dfuzzer=false \ -Dman=false \ -Dpowerd_suspend_resume=false \ -Dtests=false \ -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 15 17:10:56 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:10:56 +0100 Subject: [Buildroot] [PATCH v2] board/cubietech/cubieboard4 : Add config file for cubieboard4. In-Reply-To: References: <20240207030339.3910-1-asd617140123@gmail.com> <0e623797-b573-4604-b89e-737c7c503350@benettiengineering.com> Message-ID: <840786f7-f3a2-4dc1-8250-08135ac10c51@benettiengineering.com> Hi Eric, please use plan-text and not HTML e-mail, On 15/02/24 06:57, eric wrote: > Hi Giulio, > > > Here you have to keep the previous tags when sending new version of > patches: > > ? ?I didn't get it, what is the? previous tags? My Reviewed-by and Tested-by: you see below, > > > Reviewed-by: Giulio Benetti > > [Build Tested] > Tested-by: Giulio Benetti > > > > --- > > v1 -> v2 > > * Add BR2_cortex_a15_a7=y in buildroot defconfig. > > * Bump linux version to 6.6.8 > > * Using sunxi_defconfig in kernel. > > * Using "make savedefconfig" to save defconfig. > > * Remove boot.cmd. > > this patch had to be V3, but don't mind at this point. > I ask you when you send newer patches to set as superseded > the previous patch in patchwork: > https://patchwork.ozlabs.org/project/buildroot/list/ > > > I just need to add v3 tag, right? or I need to add other tags, e.g., resend? for the upcoming one yes, it must be V3, > > > --- > >? ?DEVELOPERS? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? |? 4 +++ > >? ?board/cubietech/cubieboard4/extlinux.conf |? 5 +++ > >? ?board/cubietech/cubieboard4/genimage.cfg? | 38 > ++++++++++++++++++++++ > >? ?board/cubietech/cubieboard4/post-image.sh | 18 +++++++++++ > >? ?configs/cubieboard4_defconfig? ? ? ? ? ? ?| 39 > +++++++++++++++++++++++ > >? ?5 files changed, 104 insertions(+) > >? ?create mode 100644 board/cubietech/cubieboard4/extlinux.conf > >? ?create mode 100644 board/cubietech/cubieboard4/genimage.cfg > >? ?create mode 100755 board/cubietech/cubieboard4/post-image.sh > >? ?create mode 100644 configs/cubieboard4_defconfig > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index a03018ab2b..bffb8f2069 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -3297,3 +3297,7 @@ F:? ? ? package/quazip/ > >? ?F:? package/shapelib/ > >? ?F:? package/simple-mail/ > >? ?F:? package/tinc/ > > + > > +N:? ?Nigel Wang > > > +F:? ?board/cubietech/cubieboard4/ > > +F:? ?configs/cubieboard4_defconfig > > diff --git a/board/cubietech/cubieboard4/extlinux.conf > b/board/cubietech/cubieboard4/extlinux.conf > > new file mode 100644 > > index 0000000000..5084e2237b > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/extlinux.conf > > @@ -0,0 +1,5 @@ > > +label linux > > +? ? kernel /boot/zImage > > +? ? devicetree /sun9i-a80-cubieboard4.dtb > > +? ? append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 > rootwait > > + > > diff --git a/board/cubietech/cubieboard4/genimage.cfg > b/board/cubietech/cubieboard4/genimage.cfg > > new file mode 100644 > > index 0000000000..f1dee13923 > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/genimage.cfg > > @@ -0,0 +1,38 @@ > > +# Minimal SD card image for the Cubieboard2 > > +# Based in the Orange Pi genimage.cfg > > + > > +image boot.vfat { > > +? ? ?vfat { > > +? ? ? ? ? ? ?files = { > > +? ? ? ? ? ? ? ? ? ? ?"zImage", > > +? ? ? ? ? ? ? ? ? ? ?"sun9i-a80-cubieboard4.dtb", > > +? ? ? ? ? ? ? ? ? ? ?"extlinux" > > +? ? ? ? ? ? ?} > > +? ? ?} > > + > > +? ? ?size = 8M > > +} > > + > > +image sdcard.img { > > +? ? ?hdimage { > > +? ? ?} > > + > > +? ? ?partition u-boot { > > +? ? ? ? ? ? ?in-partition-table = "no" > > +? ? ? ? ? ? ?image = "u-boot-sunxi-with-spl.bin" > > +? ? ? ? ? ? ?offset = 8K > > +? ? ? ? ? ? ?size = 1016K # 1MB - 8KB > > +? ? ?} > > + > > +? ? ?partition boot { > > +? ? ? ? ? ? ?partition-type = 0xC > > +? ? ? ? ? ? ?bootable = "true" > > +? ? ? ? ? ? ?image = "boot.vfat" > > +? ? ?} > > + > > +? ? ?partition rootfs { > > +? ? ? ? ? ? ?partition-type = 0x83 > > +? ? ? ? ? ? ?image = "rootfs.ext4" > > +? ? ? ? ? ? ?size = 512M > > +? ? ?} > > +} > > diff --git a/board/cubietech/cubieboard4/post-image.sh > b/board/cubietech/cubieboard4/post-image.sh > > new file mode 100755 > > index 0000000000..e37b960a4d > > --- /dev/null > > +++ b/board/cubietech/cubieboard4/post-image.sh > > @@ -0,0 +1,18 @@ > > +#!/bin/sh > > + > > +BOARD_DIR="$(dirname "$0")" > > +install -m 0644 -D $BOARD_DIR/extlinux.conf > $BINARIES_DIR/extlinux/extlinux.conf > > + > > +GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > > +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > > + > > +rm -rf "${GENIMAGE_TMP}" > > + > > +genimage? ? ? ? ? ? ? ? ? ? ? ? ? ?\ > > +? ? ?--rootpath "${TARGET_DIR}"? ? ?\ > > +? ? ?--tmppath "${GENIMAGE_TMP}"? ? \ > > +? ? ?--inputpath "${BINARIES_DIR}"? \ > > +? ? ?--outputpath "${BINARIES_DIR}" \ > > +? ? ?--config "${GENIMAGE_CFG}" > > + > > +exit $? > > diff --git a/configs/cubieboard4_defconfig > b/configs/cubieboard4_defconfig > > new file mode 100644 > > index 0000000000..0592fe4a2d > > --- /dev/null > > +++ b/configs/cubieboard4_defconfig > > @@ -0,0 +1,39 @@ > > +# Architecture > > +BR2_arm=y > > +BR2_cortex_a15_a7=y > > +BR2_ARM_FPU_NEON_VFPV4=y > > + > > +# System > > +BR2_TARGET_GENERIC_HOSTNAME="Cubieboard4" > > +BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard4!" > > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard4/post-image.sh" > > Here the option below is missing and it's needed otherwise the newest > Linux version will be picked and build will fail. > Now we don't see the problem because the latest version is exactly 6.6, > so need this: > > # Linux headers same as kernel, a 6.6 series > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y This ^^^ must be part of V3 patch and reported in patch changelog, > > > +# Kernel > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.8" > > +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun9i-a80-cubieboard4" > > + > > +# Filesystem > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > + > > +# Bootloader > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard4" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > +BR2_TARGET_UBOOT_SPL=y > > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > +BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > -- > > 2.34.1 > > > > This patch looks to me, except missing Linux header version. > > I've added that option and re-built successfully so I confirm my: > Reviewed-by: Giulio Benetti > > [Build Tested] > Tested-by: Giulio Benetti > > > Maybe a Maintainer can edit while committing, of if you can please send > a V3 with that missing line. > > Thank you! > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > While sending V3 with modifies listed above please add under your SoB also my: Reviewed-by: Giulio Benetti [Build Tested] Tested-by: Giulio Benetti Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From buildroot at bubu1.eu Thu Feb 15 17:13:42 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 15 Feb 2024 18:13:42 +0100 Subject: [Buildroot] [PATCH] package/python-hatchling: bump to 1.21.1 Message-ID: <20240215171343.1883561-1-buildroot@bubu1.eu> Changelog: https://hatch.pypa.io/dev/history/hatchling/#hatchling-v1.21.1 Signed-off-by: Marcus Hoffmann --- package/python-hatchling/python-hatchling.hash | 4 ++-- package/python-hatchling/python-hatchling.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index e1798e882c..df703088e4 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 21e5e7ed5fa6dd0618c5b66eb847f370 hatchling-1.21.0.tar.gz -sha256 5c086772357a50723b825fd5da5278ac7e3697cdf7797d07541a6c90b6ff754c hatchling-1.21.0.tar.gz +md5 d40aaea58a04a36a2b641f6efe99e362 hatchling-1.21.1.tar.gz +sha256 bba440453a224e7d4478457fa2e8d8c3633765bafa02975a6b53b9bf917980bc hatchling-1.21.1.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index d1ed4d23c2..550dbf0beb 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.21.0 +PYTHON_HATCHLING_VERSION = 1.21.1 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/fd/4a/8196e79c0d6e5eb10436dd2fcccc889a76af6ecf9bc35f87408159497d4d +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/d8/a1/7dd1caa87c0b15c04c6291e25112e5d082cce02ee87f221a8be1d594f857 PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 -- 2.34.1 From kazemi.ms at gmail.com Thu Feb 15 17:18:52 2024 From: kazemi.ms at gmail.com (Saeed Kazemi) Date: Thu, 15 Feb 2024 18:18:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/eza: bump to version 0.18.3 Message-ID: <20240215171852.226396-1-kazemi.ms@gmail.com> Release notes: https://github.com/eza-community/eza/releases/tag/v0.18.3 Signed-off-by: Saeed Kazemi --- package/eza/eza.hash | 2 +- package/eza/eza.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 64f46759d7..48c2fa8ffe 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11e6127a615744b52d52d66ebcdf9e5366f62746e8123b3eec00e35a057db988 eza-0.16.0.tar.gz +sha256 995a77848e75737a267b64613acaa6096ba8943f048676d5722c3ff238fb29f9 eza-0.18.3.tar.gz sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE diff --git a/package/eza/eza.mk b/package/eza/eza.mk index b11c1a1e7f..7ec3f127b4 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,7 +4,7 @@ # ################################################################################ -EZA_VERSION = 0.16.0 +EZA_VERSION = 0.18.3 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) EZA_LICENSE = MIT EZA_LICENSE_FILES = LICENCE -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 15 17:22:23 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:22:23 +0100 Subject: [Buildroot] [PATCH v3 2/2] configs/beaglev_ahead: new defconfig In-Reply-To: <4868466.GXAFRqVoOG@laptop> References: <20240211120857.6622-1-kilian.zinnecker@mail.de> <20240211120857.6622-3-kilian.zinnecker@mail.de> <4868466.GXAFRqVoOG@laptop> Message-ID: <2191bba4-462a-4168-bbbc-91997f1e108d@benettiengineering.com> Hi Kilian, On 15/02/24 00:03, kilian.zinnecker--- via buildroot wrote: > Hello Giulio, all, > > [--SNIP--] > >>> a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch >>> b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch >>> new file mode 100644 >>> index 0000000000..bcf5b965ce >>> --- /dev/null >>> +++ >>> b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch >>> @@ -0,0 +1,30 @@ >>> +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 >>> +From: Kilian Zinnecker >>> +Date: Mon, 21 Aug 2023 23:51:59 +0200 >>> +Subject: [PATCH] Overwrite bootcmd by force >>> + >>> +This patch is a dirty hack: Trying to overwrite the bootcmd via the >>> +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted >>> +to some preset value and could not be changed easily. Therefore a >>> +hook is used to force the bootcmd to be overwritten. >> >> This is strange because if so also the bootcmd content of uEnv.txt below >> should be skipped, or maybe there is a bug in this u-boot that evaluates >> bootcmd too early without taking into account environment variables. >> But I'm also noticing that you have your Environment variables in Fat, >> but it depends how u-boot deals with environment variables. Usually >> you have to specificy an offset in memory where environment variables >> live. >> >> But I see in your "make uboot-menuconfig" that CONFIG_ENV_IS_IN_FAT is >> not enabled, but only CONFIG_ENV_IS_IN_MMC is and you have to specify: >> CONFIG_ENV_OFFSET >> CONFIG_ENV_SIZE >> >> So if you want to go with vfat way you need to enable >> CONFIG_ENV_IS_IN_FAT and specify: >> CONFIG_ENV_FAT_INTERFACE >> CONFIG_ENV_FAT_DEVICE_AND_PART >> and most of all: >> CONFIG_ENV_FAT_FILE=uEnv.txt >> in uboot.fragment below >> >> I would go with this last way instead of adding such dirty hack, can you >> work on that? > > I tried, but so far I am not successful, maybe due to my lack of experience > with uboot or maybe due to the customization of this particular uboot. I > removed my custom-uboot patch and added the following configs to the > uboot.fragment file, but it did not work yet: > > # CONFIG_ENV_IS_IN_MMC is not set > CONFIG_ENV_IS_IN_FAT=y > CONFIG_ENV_FAT_INTERFACE="mmc" > CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" > CONFIG_ENV_FAT_FILE="uEnv.txt" First of all you have to give a try using ush(u-boot shell) to see if you can really access fat partition and read uEnv.txt file. Like: => fatload ... to a memory address If that works then you should also: => printenv and check if the variables you want to override look like expected > > I also tried to use mainline uboot v2024.01, which features the Lichee Pi 4A, > which features the same SoC, but this didn't work either. I had a look at the > custom uboot source and it defines a lot of configs inside this header file: > > https://openbeagle.org/beaglev-ahead/beaglev-ahead-u-boot/-/blob/beaglev-v2020.01-1.1.2-ubuntu/include/configs/light-c910.h?ref_type=heads#L363-388 This is a usual way for the these variables. You can dig into it or override them as you're trying to do. But you need to make sure uEnv.txt is really read from your sd-card. For example it could be a problem with CONFIG_ENV_FAT_INTERFACE name or CONFIG_ENV_FAT_DEVICE_AND_PART numbering. If you try using ush everything will be clearer. > > I tried to remove the hard-coded bootcmd from this header, but that also > didn't work. I don't understand the inner workings of uboot well enough yet to > get it properly working, so I appreciate all hints and any help here. Above there is some explanation. Anyway do all the tests without the uboot patch applied. > However, I will already send a v4 of the patches, in which I try to address > all the other issues. > Thanks again for reviewing and best regards, You're welcome, the goal is to make this patch looks the best it could. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 15 17:23:34 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:23:34 +0100 Subject: [Buildroot] [PATCH v4 0/3] Add board support for the BeagleV-Ahead In-Reply-To: <20240214233028.1226645-1-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> Message-ID: <8f65944f-3d15-4ef8-a53b-4b9c399537fc@benettiengineering.com> Hi Eric, On 15/02/24 00:30, Kilian Zinnecker wrote: > This patch series adds board support for the BeagleV-Ahead. > please report changes per patch, not in cover-letter. In cover-letter you can add like a summary but for patch-specific changelog it must be found in the patches Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > v3 -> v4: > - Improved descriptions in commit messages > - Patch to alphabetize own DEVELOPERS entry > - Fix in package/xuantie-bins/Config.in: Spaces -> tabs > - Github helper and removal of superfluous variables in xuantie-bins.mk > - Added patch to disable CLOCK_ALLOW_WRITE_DEBUGFS in custom kernel > > v2 -> v3: > > - Added brief description what the xuantie bin binaries are for > - Unrolled loop in XUANTIE_BINS_INSTALL_IMAGES_CMDS of > package/xuantie-bins/xuantie-bins.mk > - Added a second product page link to board's readme.txt > - Added URL to the product page to git commit message > - Dropped "_CUSTOM" from all "BR2_RISCV_ISA_*" in the board's > defconfig > - Add description to the board's readme.txt and defconfig why GCC > v13 is chosen > - Added BR2_PACKAGE_HOST_DOSFSTOOLS to board's defconfig > > v1 -> v2: > > - Added hash file for xuantie-bins package > - Now uses uEnv.txt for actual boot commands > - Removed extlinux.conf > - Removed superflous comments inside config files > > Kilian Zinnecker (3): > Fix alphabetical order of DEVELOPERS file entry > package/xuantie-bins: new package > configs/beaglev_ahead: new defconfig > > DEVELOPERS | 5 +- > board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ > board/beaglev-ahead/linux.fragment | 2 + > ...01-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch | 30 +++++++ > .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ > board/beaglev-ahead/post-image.sh | 6 ++ > board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ > board/beaglev-ahead/uEnv.txt | 4 + > board/beaglev-ahead/uboot.fragment | 2 + > configs/beaglev_ahead_defconfig | 46 +++++++++++ > package/Config.in | 1 + > package/xuantie-bins/Config.in | 8 ++ > package/xuantie-bins/xuantie-bins.hash | 2 + > package/xuantie-bins/xuantie-bins.mk | 19 +++++ > 14 files changed, 294 insertions(+), 1 deletion(-) > create mode 100644 board/beaglev-ahead/genimage.cfg > create mode 100644 board/beaglev-ahead/linux.fragment > create mode 100644 board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch > create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > create mode 100755 board/beaglev-ahead/post-image.sh > create mode 100644 board/beaglev-ahead/readme.txt > create mode 100644 board/beaglev-ahead/uEnv.txt > create mode 100644 board/beaglev-ahead/uboot.fragment > create mode 100644 configs/beaglev_ahead_defconfig > create mode 100644 package/xuantie-bins/Config.in > create mode 100644 package/xuantie-bins/xuantie-bins.hash > create mode 100644 package/xuantie-bins/xuantie-bins.mk > From giulio.benetti at benettiengineering.com Thu Feb 15 17:24:28 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:24:28 +0100 Subject: [Buildroot] [PATCH v4 1/3] Fix alphabetical order of DEVELOPERS file entry In-Reply-To: <20240214233028.1226645-2-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> <20240214233028.1226645-2-kilian.zinnecker@mail.de> Message-ID: On 15/02/24 00:30, Kilian Zinnecker wrote: > Signed-off-by: Kilian Zinnecker Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > --- > DEVELOPERS | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 0d12c3abcb..b75a92739a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1896,8 +1896,8 @@ F: package/libcamera/ > N: Kilian Zinnecker > F: board/avnet/rzboard_v2l/ > F: board/radxa/rock5b/ > -F: configs/rock5b_defconfig > F: configs/avnet_rzboard_v2l_defconfig > +F: configs/rock5b_defconfig > F: package/rockchip-rkbin/ > > N: Klaus Heinrich Kiwi From kazemi.ms at gmail.com Thu Feb 15 17:30:24 2024 From: kazemi.ms at gmail.com (Saeed Kazemi) Date: Thu, 15 Feb 2024 18:30:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/procs: bump to version 0.14.4 Message-ID: <20240215173024.286102-1-kazemi.ms@gmail.com> Release notes: https://github.com/dalance/procs/releases/tag/v0.14.4 Signed-off-by: Saeed Kazemi --- package/procs/procs.hash | 2 +- package/procs/procs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/procs/procs.hash b/package/procs/procs.hash index 19832e3897..a3ec5d2b75 100644 --- a/package/procs/procs.hash +++ b/package/procs/procs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2f9fdbcf7324952e22565ded58148fa40387b5a5f8723996620d6c4588925713 procs-0.14.3.tar.gz +sha256 22d9ef44bf06bbd6d0d463a40678a1560a9125fdc6e6fbb5db294e05a174ea01 procs-0.14.4.tar.gz sha256 feb87a2e0c305de3464cc44077da5393c52d8ca6362d37427157d04ec6f4510d LICENSE diff --git a/package/procs/procs.mk b/package/procs/procs.mk index 8567bf3da3..34e874a4f2 100644 --- a/package/procs/procs.mk +++ b/package/procs/procs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCS_VERSION = 0.14.3 +PROCS_VERSION = 0.14.4 PROCS_SITE = $(call github,dalance,procs,v$(PROCS_VERSION)) PROCS_LICENSE = MIT PROCS_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 15 17:57:42 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:57:42 +0100 Subject: [Buildroot] [PATCH v4 3/3] configs/beaglev_ahead: new defconfig In-Reply-To: <20240214233028.1226645-4-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> <20240214233028.1226645-4-kilian.zinnecker@mail.de> Message-ID: Hi Kilian, On 15/02/24 00:30, Kilian Zinnecker via buildroot wrote: > This patch adds board support for the BeagleV-Ahead. It uses a > custom kernel for the board's SoC. As the SoC has an outdated and > currently not supported version of the RISC-V vector extension, the > vector extension is disabled. The used OpenSBI version for this board > support does not define the neccessary flags for GCC 12 to activate > the zicsr and zifencei extensions. Therefore this board support uses > GCC 13. > > The boot command for the custom uboot to boot the kernel could not > easily be changed. It seemed that a default boot command was persisent > and any change to it by normal means (e.g., uboot config parameters > like CONFIG_BOOT_COMMAND) did not have any effect. Hence a patch for > the custom u-boot is introduced for now, to insert the proper boot > command. > > The custom kernel has CLOCK_ALLOW_WRITE_DEBUGFS enabled by default. > Therefore, this boards supports features a patch, which disables this > again, as this option can be dangerous, if activated. > > https://www.beagleboard.org/boards/beaglev-ahead > > Signed-off-by: Kilian Zinnecker > --- > DEVELOPERS | 2 + > board/beaglev-ahead/genimage.cfg | 62 +++++++++++++++ > board/beaglev-ahead/linux.fragment | 2 + > ...01-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch | 30 +++++++ > .../0001-Overwrite-bootcmd-by-force.patch | 30 +++++++ > board/beaglev-ahead/post-image.sh | 6 ++ > board/beaglev-ahead/readme.txt | 78 +++++++++++++++++++ > board/beaglev-ahead/uEnv.txt | 4 + > board/beaglev-ahead/uboot.fragment | 2 + > configs/beaglev_ahead_defconfig | 46 +++++++++++ > 10 files changed, 262 insertions(+) > create mode 100644 board/beaglev-ahead/genimage.cfg > create mode 100644 board/beaglev-ahead/linux.fragment > create mode 100644 board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch > create mode 100644 board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > create mode 100755 board/beaglev-ahead/post-image.sh > create mode 100644 board/beaglev-ahead/readme.txt > create mode 100644 board/beaglev-ahead/uEnv.txt > create mode 100644 board/beaglev-ahead/uboot.fragment > create mode 100644 configs/beaglev_ahead_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index e9a9910d69..adc6c09a7a 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1895,8 +1895,10 @@ F: package/libcamera/ > > N: Kilian Zinnecker > F: board/avnet/rzboard_v2l/ > +F: board/beaglev-ahead/ > F: board/radxa/rock5b/ > F: configs/avnet_rzboard_v2l_defconfig > +F: configs/beaglev_ahead_defconfig > F: configs/rock5b_defconfig > F: package/rockchip-rkbin/ > F: package/xuantie-bins/ > diff --git a/board/beaglev-ahead/genimage.cfg b/board/beaglev-ahead/genimage.cfg > new file mode 100644 > index 0000000000..080b169527 > --- /dev/null > +++ b/board/beaglev-ahead/genimage.cfg > @@ -0,0 +1,62 @@ > +# SD card image for BeagleV-Ahead > + > +image boot.vfat { > + vfat { > + files = { > + "fw_dynamic.bin", > + "Image", > + "light_aon_fpga.bin", > + "light-beagle.dtb", > + "light_c906_audio.bin", > + } > + > + file uEnv.txt { > + image = "uEnv.txt" > + } file uEnv.txt can be listed in files = {} group > + > + file overlays/BBORG_LOAD-00A2.dtbo { > + image = "overlays/BBORG_LOAD-00A2.dtbo" > + } > + > + file overlays/BBORG_RELAY-00A2.dtbo { > + image = "overlays/BBORG_RELAY-00A2.dtbo" > + } > + > + file overlays/BONE-LED_P8_03.dtbo { > + image = "overlays/BONE-LED_P8_03.dtbo" > + } > + > + file overlays/BONE-LED_P9_11.dtbo { > + image = "overlays/BONE-LED_P9_11.dtbo" > + } > + > + file overlays/BVA-MIKROBUS-0.dtbo { > + image = "overlays/BVA-MIKROBUS-0.dtbo" > + } same goes for the entire overlays folder like this: image boot.vfat { vfat { files = { "fw_dynamic.bin", "Image", "light_aon_fpga.bin", "light-beagle.dtb", "light_c906_audio.bin", "uEnv.txt", "overlays" } } size = 48M } you can check it works by mounting boot.vfat in images folder like this: $ cd output/images $ mkdir mnt $ sudo mount -o loop boot.vfat mnt/ $ cd mnt $ ls $ cd overlays $ ls you will see all the needed files there > + } > + size = 48M > +} > + > +image sdcard.img { > + hdimage { > + partition-table-type = "gpt" > + gpt-location = 2M > + } > + > + partition uboot { > + in-partition-table = "false" > + image = "u-boot-with-spl.bin" > + offset = 0 > + holes = {"(440; 1048576)"} > + } > + > + partition boot { > + bootable = "true" > + image = "boot.vfat" > + } > + > + partition rootfs { > + image = "rootfs.ext2" > + } > +} > + > diff --git a/board/beaglev-ahead/linux.fragment b/board/beaglev-ahead/linux.fragment > new file mode 100644 > index 0000000000..00f93f39a4 > --- /dev/null > +++ b/board/beaglev-ahead/linux.fragment > @@ -0,0 +1,2 @@ > +# CONFIG_VECTOR is not set > +# CONFIG_VECTOR_0_7 is not set > diff --git a/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch b/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch > new file mode 100644 > index 0000000000..0487e43101 > --- /dev/null > +++ b/board/beaglev-ahead/patches/linux/0001-Disable-CLOCK_ALLOW_WRITE_DEBUGFS.patch > @@ -0,0 +1,30 @@ > +From c82d614da43c3c2f7cdc7580c9ee24bd2ce203cd Mon Sep 17 00:00:00 2001 > +From: Kilian Zinnecker > +Date: Wed, 14 Feb 2024 20:54:37 +0100 > +Subject: [PATCH] Disable CLOCK_ALLOW_WRITE_DEBUGFS > + > +CLOCK_ALLOW_WRITE_DEBUGFS is disabled as default, as it can be > +very dangerous, see: > + > +https://lkml.org/lkml/2022/1/24/3382 > + > +Signed-off-by: Kilian Zinnecker > +--- > + drivers/clk/clk.c | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c > +index 77774a8c701b..a6ba04ce0237 100644 > +--- a/drivers/clk/clk.c > ++++ b/drivers/clk/clk.c > +@@ -3131,7 +3131,6 @@ static int clk_dump_show(struct seq_file *s, void *data) > + } > + DEFINE_SHOW_ATTRIBUTE(clk_dump); > + > +-#define CLOCK_ALLOW_WRITE_DEBUGFS > + #ifdef CLOCK_ALLOW_WRITE_DEBUGFS > + /* > + * This can be dangerous, therefore don't provide any real compile time > +-- > +2.34.1 > + > diff --git a/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > new file mode 100644 > index 0000000000..bcf5b965ce > --- /dev/null > +++ b/board/beaglev-ahead/patches/uboot/0001-Overwrite-bootcmd-by-force.patch > @@ -0,0 +1,30 @@ > +From 81db2d155db74192e127ae1d98dd4ec415f53dd3 Mon Sep 17 00:00:00 2001 > +From: Kilian Zinnecker > +Date: Mon, 21 Aug 2023 23:51:59 +0200 > +Subject: [PATCH] Overwrite bootcmd by force > + > +This patch is a dirty hack: Trying to overwrite the bootcmd via the > +usual BOOT_COMMAND had no effect: Upon boot the bootcmd defaulted > +to some preset value and could not be changed easily. Therefore a > +hook is used to force the bootcmd to be overwritten. > + > +Signed-off-by: Kilian Zinnecker > +--- > + board/thead/light-c910/light.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/board/thead/light-c910/light.c b/board/thead/light-c910/light.c > +index 8d5478e916..1448db974e 100644 > +--- a/board/thead/light-c910/light.c > ++++ b/board/thead/light-c910/light.c > +@@ -2282,6 +2282,7 @@ int board_late_init(void) > + light_usb_boot_check(); > + do_firmware_load(); > + ap_peri_clk_disable(); > ++ run_command("load mmc 1:1 $ramdisk_addr_r uEnv.txt; env import -t $ramdisk_addr_r $filesize; run uenvcmd", 0); as pointed in V3 this should be solved without this patch, please keep testing u-boot variables using uEnv.txt in VFAT and once it works, and it should because you've found the same problem using custom and mainline u-boot, please drop this patch. > + return 0; > + } > + > +-- > +2.34.1 > + > diff --git a/board/beaglev-ahead/post-image.sh b/board/beaglev-ahead/post-image.sh > new file mode 100755 > index 0000000000..9e16eeff3f > --- /dev/null > +++ b/board/beaglev-ahead/post-image.sh > @@ -0,0 +1,6 @@ > +#!/usr/bin/env bash > +set -e > + > +cp -r ${BUILD_DIR}/linux-custom/arch/riscv/boot/dts/thead/overlays/ ${BINARIES_DIR} > +cp board/beaglev-ahead/uEnv.txt ${BINARIES_DIR}/ > +support/scripts/genimage.sh -c board/beaglev-ahead/genimage.cfg > diff --git a/board/beaglev-ahead/readme.txt b/board/beaglev-ahead/readme.txt > new file mode 100644 > index 0000000000..758082a792 > --- /dev/null > +++ b/board/beaglev-ahead/readme.txt > @@ -0,0 +1,78 @@ > +BeagleV-Ahead > +============== > +https://www.beagleboard.org/boards/beaglev-ahead > +https://forum.beagleboard.org/c/beaglev/ > + > +The SoC (TH1520) of the BeagleV-Ahead implements an outdated and > +currently not supported version of the RISC-V vector extension. Hence, > +the vector extension is disabled. The used OpenSBI version for this > +board support does not define the neccessary flags for GCC 12 to > +activate the zicsr and zifencei extensions. Therefore this board > +support uses GCC 13. > + > +Build: > +====== > + $ make beaglev_ahead_defconfig > + $ make > + > +Files created in output directory > +================================= > + > +output/images > +. > +??? boot.vfat > +??? bootloader-JH7100-buildroot.bin.out > +??? ddrinit-2133-buildroot.bin.out > +??? fw_dynamic.bin > +??? fw_dynamic.elf > +??? fw_jump.bin > +??? fw_jump.elf > +??? fw_payload.bin > +??? fw_payload.elf > +??? Image > +??? light-beagle.dtb > +??? light_aon_fpga.bin > +??? light_c906_audio.bin > +??? overlays overlays/ > +??? rootfs.ext2 > +??? rootfs.ext4 > +??? rootfs.tar > +??? sdcard.img > +??? u-boot-with-spl.bin > +??? u-boot.bin > +??? uEnv.txt > + > +Creating bootable SD card: > +========================== > + > +Simply invoke (as root) > + > +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync > + > +Where X is your SD card device. > + > +Booting: > +======== > + > +SD card boot button: > +-------------------- > +To let the board boot from SD card, keep the "SD button" pressed during power > +up / power cycle. The button is near the SD card slot. > + > +Serial console: > +--------------- > +The BeagleV-Ahead has a "Debug" GPIO header. Its layout can be seen here: > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/02-quick-start.html#access-uart-debug-console > + > +Note, that there are reported issues with some uart interface cables/dongles: > +https://forum.beagleboard.org/t/beaglev-ahead-debug-terminal-problems/35331 > + > +Baudrate for this board is 115200. > + > +Login: > +------ > +Enter 'root' as login user, and the prompt is ready. > + > +wiki link: > +---------- > +https://docs.beagleboard.org/latest/boards/beaglev/ahead/index.html > diff --git a/board/beaglev-ahead/uEnv.txt b/board/beaglev-ahead/uEnv.txt > new file mode 100644 > index 0000000000..7e98ae5f81 > --- /dev/null > +++ b/board/beaglev-ahead/uEnv.txt > @@ -0,0 +1,4 @@ > +bootcmd=booti ${kernel_addr_r} - ${fdt_addr_r} > +uenvcmd=fatload mmc 1:1 ${kernel_addr_r} Image; fatload mmc 1:1 ${fdt_addr_r} light-beagle.dtb > +bootargs=root=/dev/mmcblk1p2 rootfstype=ext4 rootwait ro console=ttyS0,115200 earlycon clk_ignore_unused net.ifnames=0 > + > diff --git a/board/beaglev-ahead/uboot.fragment b/board/beaglev-ahead/uboot.fragment > new file mode 100644 > index 0000000000..1f51cef106 > --- /dev/null > +++ b/board/beaglev-ahead/uboot.fragment > @@ -0,0 +1,2 @@ > +CONFIG_LEGACY_IMAGE_FORMAT=y > +CONFIG_AUTOBOOT=y > diff --git a/configs/beaglev_ahead_defconfig b/configs/beaglev_ahead_defconfig > new file mode 100644 > index 0000000000..9000b1f0ad > --- /dev/null > +++ b/configs/beaglev_ahead_defconfig > @@ -0,0 +1,46 @@ > +BR2_riscv=y > +BR2_riscv_custom=y > +BR2_RISCV_ISA_RVM=y > +BR2_RISCV_ISA_RVA=y > +BR2_RISCV_ISA_RVF=y > +BR2_RISCV_ISA_RVD=y > +BR2_RISCV_ISA_RVC=y > +# Use GCC 13 for OpenSBI zicsr zifencei issue > +BR2_GCC_VERSION_13_X=y > +BR2_GLOBAL_PATCH_DIR="board/beaglev-ahead/patches" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglev-ahead/post-image.sh" > +BR2_TARGET_GENERIC_HOSTNAME="BeagleV-Ahead" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the BeagleV-Ahead" > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/linux/archive/refs/heads/beaglev-v5.10.113-1.1.2-ubuntu.tar.gz" > +BR2_LINUX_KERNEL_DEFCONFIG="beaglev" > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="thead/light-beagle" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/linux.fragment" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_BEAGLEV_DDRINIT=y > +BR2_TARGET_BEAGLEV_SECONDBOOT=y > +BR2_TARGET_OPENSBI=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y > +BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-opensbi/archive/refs/heads/0.9-1.1.2-ubuntu.tar.gz" > +BR2_TARGET_OPENSBI_PLAT="generic" > +BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/beagleboard/beaglev-ahead-u-boot/archive/refs/heads/beaglev-v2020.01-1.1.2-ubuntu.tar.gz" if I've understood correctly the board works using latest stable mainline u-boot. So please use that one instead of this that looks unmaintained. > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="light_beagle" > +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/beaglev-ahead/uboot.fragment" > +BR2_TARGET_UBOOT_FORMAT_BIN=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_XUANTIE_BINS=y Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Thu Feb 15 17:58:50 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 15 Feb 2024 18:58:50 +0100 Subject: [Buildroot] [PATCH v4 2/3] package/xuantie-bins: new package In-Reply-To: <20240214233028.1226645-3-kilian.zinnecker@mail.de> References: <20240214233028.1226645-1-kilian.zinnecker@mail.de> <20240214233028.1226645-3-kilian.zinnecker@mail.de> Message-ID: <67a04065-f77b-4846-b331-c5092f2b5afc@benettiengineering.com> Hi Kilian, On 15/02/24 00:30, Kilian Zinnecker wrote: > This patch adds a package for Xuantie binary blobs. The binary > blobs are needed for the BeagleV-Ahead's SoC (TH1520). They contain > an FPGA binary for power management and a binary for the audio > system. > > Signed-off-by: Kilian Zinnecker looks good to me: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > package/xuantie-bins/Config.in | 8 ++++++++ > package/xuantie-bins/xuantie-bins.hash | 2 ++ > package/xuantie-bins/xuantie-bins.mk | 19 +++++++++++++++++++ > 5 files changed, 31 insertions(+) > create mode 100644 package/xuantie-bins/Config.in > create mode 100644 package/xuantie-bins/xuantie-bins.hash > create mode 100644 package/xuantie-bins/xuantie-bins.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index b75a92739a..e9a9910d69 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1899,6 +1899,7 @@ F: board/radxa/rock5b/ > F: configs/avnet_rzboard_v2l_defconfig > F: configs/rock5b_defconfig > F: package/rockchip-rkbin/ > +F: package/xuantie-bins/ > > N: Klaus Heinrich Kiwi > F: package/wqy-zenhei/ > diff --git a/package/Config.in b/package/Config.in > index bf0fe078b9..b35cbc4038 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -656,6 +656,7 @@ endmenu > source "package/wipe/Config.in" > source "package/xorriso/Config.in" > source "package/xr819-xradio/Config.in" > + source "package/xuantie-bins/Config.in" > endmenu > > menu "Interpreter languages and scripting" > diff --git a/package/xuantie-bins/Config.in b/package/xuantie-bins/Config.in > new file mode 100644 > index 0000000000..18f5df1453 > --- /dev/null > +++ b/package/xuantie-bins/Config.in > @@ -0,0 +1,8 @@ > +config BR2_PACKAGE_XUANTIE_BINS > + bool "xuantie-bins" > + depends on BR2_riscv > + help > + This package provides binary blobs, needed for the > + BeagleV-Ahead's SoC (TH1520). They contain an FPGA binary > + (light_aon_fpga.bin) for power management and a binary for > + the audio system (light_c906_audio.bin). > diff --git a/package/xuantie-bins/xuantie-bins.hash b/package/xuantie-bins/xuantie-bins.hash > new file mode 100644 > index 0000000000..5531a54617 > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.hash > @@ -0,0 +1,2 @@ > +# Locally computed > +sha256 92d2fee4688dc0598329d56cf7962f344d30b70e261a4cd9939b0912f06df26a xuantie-bins-1.2.1.tar.gz > diff --git a/package/xuantie-bins/xuantie-bins.mk b/package/xuantie-bins/xuantie-bins.mk > new file mode 100644 > index 0000000000..bccfc9587d > --- /dev/null > +++ b/package/xuantie-bins/xuantie-bins.mk > @@ -0,0 +1,19 @@ > +################################################################################ > +# > +# xuantie-bins > +# > +################################################################################ > + > +XUANTIE_BINS_VERSION = 1.2.1 > +XUANTIE_BINS_SITE = $(call github,beagleboard,xuantie-ubuntu,beaglev-$(XUANTIE_BINS_VERSION)) > +XUANTIE_BINS_LICENSE = PROPRIETARY > + > +XUANTIE_BINS_INSTALL_IMAGES = YES > +XUANTIE_BINS_INSTALL_TARGET = NO > + > +define XUANTIE_BINS_INSTALL_IMAGES_CMDS > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/bins/light_aon_fpga.bin > + $(INSTALL) -D -m 0644 -t $(BINARIES_DIR) $(@D)/bins/light_c906_audio.bin > +endef > + > +$(eval $(generic-package)) From alexander.sverdlin at gmail.com Thu Feb 15 18:50:30 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 19:50:30 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <7e253e56-25f4-494a-98d9-e0d908517acd@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <7e253e56-25f4-494a-98d9-e0d908517acd@smile.fr> Message-ID: <4f2fdb3c732480061d815f9f898da9fea9b77387.camel@gmail.com> Hi Romain, On Thu, 2024-02-15 at 12:26 +0100, Romain Naour wrote: > > On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > > > -choice > > > - prompt "Security type" > > > - help > > > - ? The target SoC security type option for image gen.? Valid > > > - ? options are "gp" for General Purpose devices, "hs-fs" for > > > - ? High Security - Field Securable devices, or "hs" for High > > > - ? Security - Security Enforcing devices.? Note for all High > > > - ? Security device variants the TI_SECURE_DEV_PKG environmental > > > - ? variable must be defined at build time pointing to a valid > > > - ? core-secdev-k3 folder location, otherwise the build will > > > - ? fail, see > > > - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > > - bool "gp" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > > - bool "hs-fs" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > > - bool "hs" > > > - > > > -endchoice > > > > another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > > was the default, which didn't boot on my HS-FS SoC. > > > > You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the > > default for AM62x. I'm not sure if this is a problem, though. > > > > I don't think so, the am62x defconfig should still be for GP SoC by default. I'm pretty sure it's HS-FS by default, because GP (as of todays "master") >>> ti-k3-image-gen 08.06.00.007 Extracting gzip -d -c /home/alex/remote/buildroot/dl/ti-k3-image-gen/k3-image-gen-08.06.00.007.tar.gz | /home/alex/remote/buildroot/output/host/bin/tar --strip-components=1 -C /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007 -xf - >>> ti-k3-image-gen 08.06.00.007 Patching >>> ti-k3-image-gen 08.06.00.007 Configuring cp /home/alex/remote/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007 cp: cannot stat '/home/alex/remote/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin': No such file or directory make: *** [package/pkg-generic.mk:273: /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007/.stamp_configured] Error 1 So overall, for HS-FS it doesn't look as a regression with you patchset, but rather as improvement, even though it doesn't boot, but it builds at least... I can try to look what could be the problem with U-Boot environment... -- Alexander Sverdlin. From kadambini.nema at gmail.com Thu Feb 15 19:32:06 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Thu, 15 Feb 2024 11:32:06 -0800 Subject: [Buildroot] [PATCH 1/1] package/iptables: bump version to 1.8.10 Message-ID: <20240215193206.2884119-1-kadambini.nema@gmail.com> Change Log : https://netfilter.org/projects/iptables/files/changes-iptables-1.8.10.txt Build test results: iptables.config BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY=y BR2_PACKAGE_IPTABLES_NFTABLES=y $ ./utils/test-pkg -c iptables.config iptables bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/iptables/iptables.hash | 2 +- package/iptables/iptables.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index a908b9cbc1..be8b0df3d6 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f iptables-1.8.9.tar.xz +sha256 5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c iptables-1.8.10.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 561c82ca0b..6712136962 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.9 +IPTABLES_VERSION = 1.8.10 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.xz IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES -- 2.25.1 From kadambini.nema at gmail.com Thu Feb 15 20:31:21 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Thu, 15 Feb 2024 12:31:21 -0800 Subject: [Buildroot] [PATCH 1/1] package/libusb: bump version to 1.0.27 Message-ID: <20240215203121.2948032-1-kadambini.nema@gmail.com> Change Log : https://github.com/libusb/libusb/blob/d52e355daa09f17ce64819122cb067b8a2ee0d4b/ChangeLog#L4 Build test results: libusb.config BR2_PACKAGE_LIBUSB=y BR2_PACKAGE_LIBUSB_EXAMPLES=y BR2_PACKAGE_LIBUSB_COMPAT=y $./utils/test-pkg -k -c libusb.config -p libusb bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: SKIPPED 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/libusb/libusb.hash | 2 +- package/libusb/libusb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index bbb0ccf5b9..8ca68f03ba 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5 libusb-1.0.26.tar.bz2 +sha256 ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575 libusb-1.0.27.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 98a4a578b2..15649a2ab1 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).26 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).27 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ -- 2.25.1 From alexander.sverdlin at gmail.com Thu Feb 15 21:14:42 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 22:14:42 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> Message-ID: <1f1cca3eae4fc651a9f02e4e64407a355cb39f2e.camel@gmail.com> Hi Romain, On Thu, 2024-02-15 at 12:23 +0100, Romain Naour wrote: > Also the ti_am62x_sk_defconfig is expecting a GP SoC so you may have to > customize the image generated in a post-build script? > > Maybe you have to replace the tiboot3.bin binary included by genimage with the > one for the HS-FS variant ? > > for j721e: > ??? 285449 13 f?vr. 17:27 tiboot3.bin > ??? 285449 13 f?vr. 17:27 tiboot3-j721e-gp-evm.bin > ??? 286224 13 f?vr. 17:27 tiboot3-j721e_sr1_1-hs-evm.bin > ??? 286224 13 f?vr. 17:27 tiboot3-j721e_sr2-hs-fs-evm.bin > > for am62x: > ??? tiboot3.bin << should be the gp variant by default > ??? tiboot3-am62x-gp-evm.bin > ??? tiboot3-am62x-hs-fs-evm.bin That's not the case any more, after make clean; make ti_am62x_sk_defconfig; make I get: images]$ ls -l ... -rw-r--r-- 1 ... 282545 Feb 15 21:24 tiboot3-am62x-gp-evm.bin -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3-am62x-hs-evm.bin -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3-am62x-hs-fs-evm.bin -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3.bin But, well, this seems to be an upstream change in U-Boot. However, there seems to be no alternative to BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE, after removal of boot/ti-k3-image-gen package. People with SK-AM62 will find their boards silently broken (GP variants). -- Alexander Sverdlin. From kilian.zinnecker at mail.de Thu Feb 15 21:43:41 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Thu, 15 Feb 2024 22:43:41 +0100 Subject: [Buildroot] [PATCH] configs/rock5b_defconfig: switch to mainline linux Message-ID: <20240215214341.6137-1-kilian.zinnecker@mail.de> This patch switches the board support of the Radxa Rock 5B from using a custom kernel to mainline linux 6.7.4. Thereby patches, which became redundant, are removed, as well as device tree modifications. As kernel 6.7.4 is not buildroot's latest kernel version (as of creation of this patch), the hash for the kernel is added. Also the needed ethernet drivers are activated via the kernel config fragment file. Signed-off-by: Kilian Zinnecker --- board/radxa/rock5b/boot.cmd | 2 +- board/radxa/rock5b/linux.fragment | 5 +- ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- ...x-building-error-on-Werror-array-com.patch | 43 ------------- board/radxa/rock5b/patches/linux/linux.hash | 4 +- board/radxa/rock5b/readme.txt | 50 ++------------- board/radxa/rock5b/rock5b.dts | 12 ---- board/radxa/rock5b/rock5b.its | 2 +- configs/rock5b_defconfig | 10 ++- 9 files changed, 14 insertions(+), 178 deletions(-) delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch delete mode 100644 board/radxa/rock5b/rock5b.dts diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd index 9a3e73e003..28dd42974c 100644 --- a/board/radxa/rock5b/boot.cmd +++ b/board/radxa/rock5b/boot.cmd @@ -1,3 +1,3 @@ -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait +setenv bootargs root=/dev/mmcblk1p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait fatload mmc 1:1 ${loadaddr} image.itb bootm ${loadaddr} diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 28bb373ef2..90f2f291ba 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1,5 +1,2 @@ CONFIG_R8169=y -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set -# Disable Rockchip specific WiFi drivers, as the kernel -# code cannot be build with GCC 12 due to several Werrors -# CONFIG_WL_ROCKCHIP is not set +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch deleted file mode 100644 index 5632c5a627..0000000000 --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 -From: Kees Cook -Date: Sat, 12 Feb 2022 09:14:49 -0800 -Subject: etherdevice: Adjust ether_addr* prototypes to silence - -Wstringop-overead -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With GCC 12, -Wstringop-overread was warning about an implicit cast from -char[6] to char[8]. However, the extra 2 bytes are always thrown away, -alignment doesn't matter, and the risk of hitting the edge of unallocated -memory has been accepted, so this prototype can just be converted to a -regular char *. Silences: - -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], - | ^~~~~~~~~~~~~~~~~~~~~~~ - -Reported-by: Marc Kleine-Budde -Tested-by: Marc Kleine-Budde -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de -Cc: Jakub Kicinski -Cc: "David S. Miller" -Cc: netdev at vger.kernel.org -Signed-off-by: Kees Cook -Signed-off-by: David S. Miller -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd -Signed-off-by: Kilian Zinnecker ---- - include/linux/etherdevice.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h -index 2ad71cc90b37d..92b10e67d5f87 100644 ---- a/include/linux/etherdevice.h -+++ b/include/linux/etherdevice.h -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) - #endif - } - --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - #ifdef __BIG_ENDIAN -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. - */ - --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], -- const u8 addr2[6+2]) -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch deleted file mode 100644 index 10de6c72d3..0000000000 --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 -From: Xiongwei Song -Date: Fri, 14 Jan 2022 14:07:24 -0800 -Subject: mm: page_alloc: fix building error on -Werror=array-compare - -Arthur Marsh reported we would hit the error below when building kernel -with gcc-12: - - CC mm/page_alloc.o - mm/page_alloc.c: In function `mem_init_print_info': - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] - 8173 | if (start <= pos && pos < end && size > adj) \ - | - -In C++20, the comparision between arrays should be warned. - -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com -Signed-off-by: Xiongwei Song -Reported-by: Arthur Marsh -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f -Signed-off-by: Kilian Zinnecker ---- - mm/page_alloc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 806f317c2e7e2..c4ef450ac4428 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) - */ - #define adj_init_size(start, end, size, pos, adj) \ - do { \ -- if (start <= pos && pos < end && size > adj) \ -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ - size -= adj; \ - } while (0) - --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash index 95ad749554..fadbe578ad 100644 --- a/board/radxa/rock5b/patches/linux/linux.hash +++ b/board/radxa/rock5b/patches/linux/linux.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c08ae62f4052eb79d1c167e6e27c3e7513553d4cc687d3385fb2da1f3027e6d5 linux-6.7.4.tar.gz diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index b3eb06851a..7c1dd6bd49 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -12,22 +12,21 @@ Files created in output directory output/images . -??? Image -??? Image.gz ??? boot.scr ??? boot.vfat +??? Image +??? Image.gz ??? image.itb -??? rk3588-rock-5b.dtb ??? rk3588_bl31_v1.40.elf ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin -??? rock5b.dts +??? rk3588-rock-5b.dtb ??? rock5b.its ??? rootfs.ext2 ??? rootfs.ext4 ??? rootfs.tar ??? sdcard.img -??? u-boot-rockchip.bin -??? u-boot.bin +??? u-boot.bin +??? u-boot-rockchip.bin Creating bootable SD card: ========================== @@ -61,42 +60,3 @@ Enter 'root' as login user, and the prompt is ready. wiki link: ---------- https://forum.radxa.com/c/rock5 - -Issues: -======= - -WiFi ----- -The custom Radxa kernel provides custom code to support WiFi. However, -that code does not compile with GCC 12, which is the current default -version in buildroot. Hence, the WiFi kernel drivers are disabled, until -the issues get fixed (if ever). If they are desperately needed, one may -apply the following workaround, as long as buildroot still supports GCC -version 11: - -1. Set GCC version 11, by adding the following line to -configs/rock5b_defconfig: - -BR2_GCC_VERSION_11_X=y - -2. Re-enable custom WiFi drivers by removing the following line from -board/radxa/rock5b/linux.fragment: - -# CONFIG_WL_ROCKCHIP is not set - -Rockchip FIQ Debugger ---------------------- -The custom kernel used for this board features an FIQ debugger, which -can be activated by typing "fiq" on the serial interface. As this can be -annoying if a user wants to type these charakters and it is not needed -for most users, this board support disables the FIQ debugger by default. -To re-enable the FIQ debugger follow the steps: - -1. In board/radxa/rock5b/rock5b.dts set the status property of the -fiq_debugger node to "okay" and set the status property of the uart2 -node to "disabled" - -2. Re-enable the fiq debugger module by removing the following line -from board/radxa/rock5b/linux.fragment: - -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts deleted file mode 100644 index 71a4e42b5e..0000000000 --- a/board/radxa/rock5b/rock5b.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -#include "rockchip/rk3588-rock-5b.dts" - -&fiq_debugger { - status = "disabled"; -}; - -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; -}; diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its index 9ce235d041..d73659a56e 100644 --- a/board/radxa/rock5b/rock5b.its +++ b/board/radxa/rock5b/rock5b.its @@ -20,7 +20,7 @@ }; fdt { description = "Device Tree"; - data = /incbin/("rock5b.dtb"); + data = /incbin/("rk3588-rock-5b.dtb"); type = "flat_dt"; arch = "arm64"; compression = "none"; diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 7175aa66bf..7de1cfae88 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -9,13 +9,11 @@ BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_SYSTEM_DHCP="eth0" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.4.tar.gz" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" BR2_TARGET_ROOTFS_EXT2=y -- 2.34.1 From romain.naour at smile.fr Thu Feb 15 22:13:53 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 15 Feb 2024 23:13:53 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <1f1cca3eae4fc651a9f02e4e64407a355cb39f2e.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> <1f1cca3eae4fc651a9f02e4e64407a355cb39f2e.camel@gmail.com> Message-ID: Hello Alexander, Le 15/02/2024 ? 22:14, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Thu, 2024-02-15 at 12:23 +0100, Romain Naour wrote: >> Also the ti_am62x_sk_defconfig is expecting a GP SoC so you may have to >> customize the image generated in a post-build script? >> >> Maybe you have to replace the tiboot3.bin binary included by genimage with the >> one for the HS-FS variant ? >> >> for j721e: >> ??? 285449 13 f?vr. 17:27 tiboot3.bin >> ??? 285449 13 f?vr. 17:27 tiboot3-j721e-gp-evm.bin >> ??? 286224 13 f?vr. 17:27 tiboot3-j721e_sr1_1-hs-evm.bin >> ??? 286224 13 f?vr. 17:27 tiboot3-j721e_sr2-hs-fs-evm.bin >> >> for am62x: >> ??? tiboot3.bin << should be the gp variant by default >> ??? tiboot3-am62x-gp-evm.bin >> ??? tiboot3-am62x-hs-fs-evm.bin > > That's not the case any more, after > make clean; make ti_am62x_sk_defconfig; make > > I get: > > images]$ ls -l > ... > -rw-r--r-- 1 ... 282545 Feb 15 21:24 tiboot3-am62x-gp-evm.bin > -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3-am62x-hs-evm.bin > -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3-am62x-hs-fs-evm.bin > -rw-r--r-- 1 ... 285134 Feb 15 21:24 tiboot3.bin > > But, well, this seems to be an upstream change in U-Boot. Good catch! Indeed, there is an inconsistency between K3 SoC support in binman, the j721e by default is GP while other are hs-fs. It seems related to *-binman.dtsi file (notice were is placed the property symlink = "tiboot3.bin";) &binman { tiboot3-am62x-hs-fs-evm.bin { filename = "tiboot3-am62x-hs-fs-evm.bin"; symlink = "tiboot3.bin"; https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/arch/arm/dts/k3-am625-sk-binman.dtsi?ref_type=tags#L58 &binman { tiboot3-am64x_sr2-hs-fs-evm.bin { filename = "tiboot3-am64x_sr2-hs-fs-evm.bin"; symlink = "tiboot3.bin"; https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/arch/arm/dts/k3-am64x-binman.dtsi?ref_type=tags#L50 &binman { tiboot3-j721e-gp-evm.bin { filename = "tiboot3-j721e-gp-evm.bin"; symlink = "tiboot3.bin"; https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/arch/arm/dts/k3-j721e-binman.dtsi?ref_type=tags#L210 Maybe it would be a good idea to ignore the symlink created by uboot and create the symlink ourself in BINARIES_DIR. > > However, there seems to be no alternative to > > BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE, after removal of > boot/ti-k3-image-gen package. People with SK-AM62 will find > their boards silently broken (GP variants). > What about BR2_TARGET_TI_K3_R5_LOADER_SECTYPE option to select the default tiboot3.bin (and sysfw.itb if any)? Best regards, Romain From alexander.sverdlin at gmail.com Thu Feb 15 22:22:41 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 23:22:41 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> <1f1cca3eae4fc651a9f02e4e64407a355cb39f2e.camel@gmail.com> Message-ID: <8f672e0367301b1833218e71336002ffcf6eb4d9.camel@gmail.com> Hi Romain, On Thu, 2024-02-15 at 23:13 +0100, Romain Naour wrote: > Maybe it would be a good idea to ignore the symlink created by uboot and create > the symlink ourself in BINARIES_DIR. > > > > > However, there seems to be no alternative to > > > > BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE, after removal of > > boot/ti-k3-image-gen package. People with SK-AM62 will find > > their boards silently broken (GP variants). > > > > What about BR2_TARGET_TI_K3_R5_LOADER_SECTYPE option to select the default > tiboot3.bin (and sysfw.itb if any)? Makes sense to me. -- Alexander Sverdlin. From romain.naour at smile.fr Thu Feb 15 22:32:01 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 15 Feb 2024 23:32:01 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <4f2fdb3c732480061d815f9f898da9fea9b77387.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <7e253e56-25f4-494a-98d9-e0d908517acd@smile.fr> <4f2fdb3c732480061d815f9f898da9fea9b77387.camel@gmail.com> Message-ID: <4109841d-095a-471a-be39-1cf790a2b345@smile.fr> Hi Alexander, Le 15/02/2024 ? 19:50, Alexander Sverdlin a ?crit?: > Hi Romain, > > On Thu, 2024-02-15 at 12:26 +0100, Romain Naour wrote: >>> On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >>>> -choice >>>> - prompt "Security type" >>>> - help >>>> - ? The target SoC security type option for image gen.? Valid >>>> - ? options are "gp" for General Purpose devices, "hs-fs" for >>>> - ? High Security - Field Securable devices, or "hs" for High >>>> - ? Security - Security Enforcing devices.? Note for all High >>>> - ? Security device variants the TI_SECURE_DEV_PKG environmental >>>> - ? variable must be defined at build time pointing to a valid >>>> - ? core-secdev-k3 folder location, otherwise the build will >>>> - ? fail, see >>>> - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>> - bool "gp" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>> - bool "hs-fs" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>> - bool "hs" >>>> - >>>> -endchoice >>> >>> another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y >>> was the default, which didn't boot on my HS-FS SoC. >>> >>> You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the >>> default for AM62x. I'm not sure if this is a problem, though. >>> >> >> I don't think so, the am62x defconfig should still be for GP SoC by default. > > I'm pretty sure it's HS-FS by default, because GP (as of todays "master") > >>>> ti-k3-image-gen 08.06.00.007 Extracting > gzip -d -c /home/alex/remote/buildroot/dl/ti-k3-image-gen/k3-image-gen-08.06.00.007.tar.gz | /home/alex/remote/buildroot/output/host/bin/tar --strip-components=1 -C > /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007 -xf - >>>> ti-k3-image-gen 08.06.00.007 Patching >>>> ti-k3-image-gen 08.06.00.007 Configuring > cp /home/alex/remote/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007 > cp: cannot stat '/home/alex/remote/buildroot/output/images/ti-sysfw/ti-fs-firmware-am62x-hs-fs.bin': No such file or directory > make: *** [package/pkg-generic.mk:273: /home/alex/remote/buildroot/output/build/ti-k3-image-gen-08.06.00.007/.stamp_configured] Error 1 Weird, the gitlab-ci build fine with : BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_IMAGE_GEN=y # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX is not set # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X is not set BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X is not set BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y # BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS is not set # BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS is not set BR2_TARGET_TI_K3_IMAGE_GEN_SOC="am64x" BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE="ti-sci" BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE="gp" BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION=y AM64x: https://gitlab.com/buildroot.org/buildroot/-/jobs/6134305650 Same for AM62x: https://gitlab.com/buildroot.org/buildroot/-/jobs/6134305619 > > So overall, for HS-FS it doesn't look as a regression with you patchset, > but rather as improvement, even though it doesn't boot, but it builds > at least... > > I can try to look what could be the problem with U-Boot environment... > Yes please. Best regards, Romain From alexander.sverdlin at gmail.com Thu Feb 15 22:36:17 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Thu, 15 Feb 2024 23:36:17 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <4109841d-095a-471a-be39-1cf790a2b345@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <7e253e56-25f4-494a-98d9-e0d908517acd@smile.fr> <4f2fdb3c732480061d815f9f898da9fea9b77387.camel@gmail.com> <4109841d-095a-471a-be39-1cf790a2b345@smile.fr> Message-ID: <72a60f908081c7c060b35aa1911b721d0f664edc.camel@gmail.com> Hi Romain, On Thu, 2024-02-15 at 23:32 +0100, Romain Naour wrote: > Weird, the gitlab-ci build fine with : > > BR2_TARGET_TI_K3_BOOT_FIRMWARE=y > BR2_TARGET_TI_K3_IMAGE_GEN=y > # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX is not set > # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X is not set > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > # BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X is not set > BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > # BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS is not set right, I had to change from BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP to BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS for my HW, so the latter seems to be broken in "master". -- Alexander Sverdlin. From kadambini.nema at gmail.com Thu Feb 15 22:46:14 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Thu, 15 Feb 2024 14:46:14 -0800 Subject: [Buildroot] [PATCH 1/1] package/{libuv, uvw}: bump version to libuv 1.47.0 and uvw 3.3.0 Message-ID: <20240215224614.3028380-1-kadambini.nema@gmail.com> Change Log : https://github.com/libuv/libuv/blob/v1.x/ChangeLog#L92 https://github.com/skypjack/uvw/releases/tag/v3.3.0_libuv_v1.47 Build test results: libuv.config BR2_PACKAGE_LIBUV=y BR2_PACKAGE_UVW=y $./utils/test-pkg -k -c libuv.uvw.config -p uvw -p libuv bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: SKIPPED 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- package/uvw/uvw.hash | 4 ++-- package/uvw/uvw.mk | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 1fd286d9e9..3a2904f247 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094 libuv-v1.46.0-dist.tar.gz +sha256 72a187104662b47f2a2b204da39d2acb05cf22a4fcb13ceaebe3b0ed0c0e2e43 libuv-v1.47.0-dist.tar.gz sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 76316484e4..a794ac1c8a 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.46.0 +LIBUV_VERSION = 1.47.0 LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) LIBUV_DEPENDENCIES = host-pkgconf diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 2dc6e879e1..3f237d00f2 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd5aed741765950074b1ea2507291dce81e528abdf56c406991ad4a27d8d1714 uvw-3.2.0_libuv_v1.46.tar.gz -sha256 e2a4062818ab05e2a0908737ad49b7c01202247364e900167ac81105de8713f3 LICENSE +sha256 aabb17d3d8f0b3481b44e981c889dd4a2a6a3f1a96a4d01055e669f4b7d37d0e uvw-3.3.0_libuv_v1.47.tar.gz +sha256 5e439d0ad6e1b16f2f14023872c49cb2cf1b62a172c30b864cb45a5aa6533454 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 12149d43ca..23e5060c34 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 3.2.0_libuv_v1.46 +UVW_VERSION = 3.3.0_libuv_v1.47 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO -- 2.25.1 From giulio.benetti at benettiengineering.com Thu Feb 15 23:25:14 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 16 Feb 2024 00:25:14 +0100 Subject: [Buildroot] [PATCH] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <20240215214341.6137-1-kilian.zinnecker@mail.de> References: <20240215214341.6137-1-kilian.zinnecker@mail.de> Message-ID: <58E9CC6C-0DA1-42B9-AA17-3435786DCBDC@benettiengineering.com> Hi Kilian, > Il giorno 15 feb 2024, alle ore 22:44, Kilian Zinnecker via buildroot ha scritto: > > ?This patch switches the board support of the Radxa Rock 5B from > using a custom kernel to mainline linux 6.7.4. Very well! > Thereby patches, > which became redundant, are removed, as well as device tree > modifications. As kernel 6.7.4 is not buildroot's latest kernel > version (as of creation of this patch), the hash for the kernel is > added. There?s no need to add hash for specific mainline Linux version, you can drop that. Did it happen Buildroot to ask for it during building? > Also the needed ethernet drivers are activated via the > kernel config fragment file. > > Signed-off-by: Kilian Zinnecker > --- > board/radxa/rock5b/boot.cmd | 2 +- > board/radxa/rock5b/linux.fragment | 5 +- > ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- > ...x-building-error-on-Werror-array-com.patch | 43 ------------- > board/radxa/rock5b/patches/linux/linux.hash | 4 +- > board/radxa/rock5b/readme.txt | 50 ++------------- > board/radxa/rock5b/rock5b.dts | 12 ---- > board/radxa/rock5b/rock5b.its | 2 +- > configs/rock5b_defconfig | 10 ++- > 9 files changed, 14 insertions(+), 178 deletions(-) > delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > delete mode 100644 board/radxa/rock5b/rock5b.dts > > diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd > index 9a3e73e003..28dd42974c 100644 > --- a/board/radxa/rock5b/boot.cmd > +++ b/board/radxa/rock5b/boot.cmd > @@ -1,3 +1,3 @@ > -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait > +setenv bootargs root=/dev/mmcblk1p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait > fatload mmc 1:1 ${loadaddr} image.itb > bootm ${loadaddr} It would be great if you switch to extlinux that is easier for debugging and here you only override bootargs so you can add environment uboot variables file. > diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment > index 28bb373ef2..90f2f291ba 100644 > --- a/board/radxa/rock5b/linux.fragment > +++ b/board/radxa/rock5b/linux.fragment > @@ -1,5 +1,2 @@ > CONFIG_R8169=y > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > -# Disable Rockchip specific WiFi drivers, as the kernel > -# code cannot be build with GCC 12 due to several Werrors > -# CONFIG_WL_ROCKCHIP is not set > +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y > diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > deleted file mode 100644 > index 5632c5a627..0000000000 > --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 > -From: Kees Cook > -Date: Sat, 12 Feb 2022 09:14:49 -0800 > -Subject: etherdevice: Adjust ether_addr* prototypes to silence > - -Wstringop-overead > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -With GCC 12, -Wstringop-overread was warning about an implicit cast from > -char[6] to char[8]. However, the extra 2 bytes are always thrown away, > -alignment doesn't matter, and the risk of hitting the edge of unallocated > -memory has been accepted, so this prototype can just be converted to a > -regular char *. Silences: > - > -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] > - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); > - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? > - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > - | ^~~~~~~~~~~~~~~~~~~~~~~ > - > -Reported-by: Marc Kleine-Budde > -Tested-by: Marc Kleine-Budde > -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de > -Cc: Jakub Kicinski > -Cc: "David S. Miller" > -Cc: netdev at vger.kernel.org > -Signed-off-by: Kees Cook > -Signed-off-by: David S. Miller > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd > -Signed-off-by: Kilian Zinnecker > ---- > - include/linux/etherdevice.h | 5 ++--- > - 1 file changed, 2 insertions(+), 3 deletions(-) > - > -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h > -index 2ad71cc90b37d..92b10e67d5f87 100644 > ---- a/include/linux/etherdevice.h > -+++ b/include/linux/etherdevice.h > -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) > - #endif > - } > - > --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) > -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - #ifdef __BIG_ENDIAN > -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) > - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. > - */ > - > --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > -- const u8 addr2[6+2]) > -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > deleted file mode 100644 > index 10de6c72d3..0000000000 > --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 > -From: Xiongwei Song > -Date: Fri, 14 Jan 2022 14:07:24 -0800 > -Subject: mm: page_alloc: fix building error on -Werror=array-compare > - > -Arthur Marsh reported we would hit the error below when building kernel > -with gcc-12: > - > - CC mm/page_alloc.o > - mm/page_alloc.c: In function `mem_init_print_info': > - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] > - 8173 | if (start <= pos && pos < end && size > adj) \ > - | > - > -In C++20, the comparision between arrays should be warned. > - > -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com > -Signed-off-by: Xiongwei Song > -Reported-by: Arthur Marsh > -Signed-off-by: Andrew Morton > -Signed-off-by: Linus Torvalds > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f > -Signed-off-by: Kilian Zinnecker > ---- > - mm/page_alloc.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/mm/page_alloc.c b/mm/page_alloc.c > -index 806f317c2e7e2..c4ef450ac4428 100644 > ---- a/mm/page_alloc.c > -+++ b/mm/page_alloc.c > -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) > - */ > - #define adj_init_size(start, end, size, pos, adj) \ > - do { \ > -- if (start <= pos && pos < end && size > adj) \ > -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ > - size -= adj; \ > - } while (0) > - > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash > index 95ad749554..fadbe578ad 100644 > --- a/board/radxa/rock5b/patches/linux/linux.hash > +++ b/board/radxa/rock5b/patches/linux/linux.hash > @@ -1,2 +1,2 @@ > -# Locally calculated > -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz > +# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc > +sha256 c08ae62f4052eb79d1c167e6e27c3e7513553d4cc687d3385fb2da1f3027e6d5 linux-6.7.4.tar.gz So you can drop this and patch folder at this point > diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt > index b3eb06851a..7c1dd6bd49 100644 > --- a/board/radxa/rock5b/readme.txt > +++ b/board/radxa/rock5b/readme.txt > @@ -12,22 +12,21 @@ Files created in output directory > > output/images > . > -??? Image > -??? Image.gz > ??? boot.scr > ??? boot.vfat > +??? Image > +??? Image.gz > ??? image.itb > -??? rk3588-rock-5b.dtb > ??? rk3588_bl31_v1.40.elf > ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin > -??? rock5b.dts > +??? rk3588-rock-5b.dtb > ??? rock5b.its > ??? rootfs.ext2 > ??? rootfs.ext4 > ??? rootfs.tar > ??? sdcard.img > -??? u-boot-rockchip.bin > -??? u-boot.bin > +??? u-boot.bin > +??? u-boot-rockchip.bin > > Creating bootable SD card: > ========================== > @@ -61,42 +60,3 @@ Enter 'root' as login user, and the prompt is ready. > wiki link: > ---------- > https://forum.radxa.com/c/rock5 > - > -Issues: > -======= > - > -WiFi > ----- > -The custom Radxa kernel provides custom code to support WiFi. However, > -that code does not compile with GCC 12, which is the current default > -version in buildroot. Hence, the WiFi kernel drivers are disabled, until > -the issues get fixed (if ever). If they are desperately needed, one may > -apply the following workaround, as long as buildroot still supports GCC > -version 11: > - > -1. Set GCC version 11, by adding the following line to > -configs/rock5b_defconfig: > - > -BR2_GCC_VERSION_11_X=y > - > -2. Re-enable custom WiFi drivers by removing the following line from > -board/radxa/rock5b/linux.fragment: > - > -# CONFIG_WL_ROCKCHIP is not set > - > -Rockchip FIQ Debugger > ---------------------- > -The custom kernel used for this board features an FIQ debugger, which > -can be activated by typing "fiq" on the serial interface. As this can be > -annoying if a user wants to type these charakters and it is not needed > -for most users, this board support disables the FIQ debugger by default. > -To re-enable the FIQ debugger follow the steps: > - > -1. In board/radxa/rock5b/rock5b.dts set the status property of the > -fiq_debugger node to "okay" and set the status property of the uart2 > -node to "disabled" > - > -2. Re-enable the fiq debugger module by removing the following line > -from board/radxa/rock5b/linux.fragment: > - > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts > deleted file mode 100644 > index 71a4e42b5e..0000000000 > --- a/board/radxa/rock5b/rock5b.dts > +++ /dev/null > @@ -1,12 +0,0 @@ > -/dts-v1/; > - > -#include "rockchip/rk3588-rock-5b.dts" > - > -&fiq_debugger { > - status = "disabled"; > -}; > - > -&uart2 { > - pinctrl-0 = <&uart2m0_xfer>; > - status = "okay"; > -}; > diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its > index 9ce235d041..d73659a56e 100644 > --- a/board/radxa/rock5b/rock5b.its > +++ b/board/radxa/rock5b/rock5b.its > @@ -20,7 +20,7 @@ > }; > fdt { > description = "Device Tree"; > - data = /incbin/("rock5b.dtb"); > + data = /incbin/("rk3588-rock-5b.dtb"); > type = "flat_dt"; > arch = "arm64"; > compression = "none"; > diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig > index 7175aa66bf..7de1cfae88 100644 > --- a/configs/rock5b_defconfig > +++ b/configs/rock5b_defconfig > @@ -9,13 +9,11 @@ BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" > BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > BR2_SYSTEM_DHCP="eth0" > BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" > -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.4.tar.gz" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y No, please use BR2_LINUX_CUSTOM_VERSION here, not tarball, that?s why it asks for hash. And above please specify the header version for Linux 6_7 Take a look to the other defconfigs with Linux custom version and mimic them, you will see everything is easier. Also remember to drop patches folder variable. I?m on mobile so I?m not that precise, but I think you should manage it. Kind regards Giulio > BR2_LINUX_KERNEL_DTS_SUPPORT=y > -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set > -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" > BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" > BR2_TARGET_ROOTFS_EXT2=y > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From alexander.sverdlin at gmail.com Fri Feb 16 01:19:31 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Fri, 16 Feb 2024 02:19:31 +0100 Subject: [Buildroot] [PATCH 18/21] configs/ti_j721e_sk_defconfig: new defconfig In-Reply-To: <20240213172817.2872849-19-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-19-romain.naour@smile.fr> Message-ID: <6f7f293b44ddef1809b59ff0d17ec00c816dd7ba.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > --- /dev/null > +++ b/board/ti/j721e-sk/post-build.sh > @@ -0,0 +1,16 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" Unused variable? > + > +# u-boot is looking at /boot/dtb/ti for devicetree in the rootfs > +# partition while Buildroot install the kernel and its devicetree > +# in /boot (BR2_LINUX_KERNEL_INSTALL_TARGET enabled). > +# Enabling BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME allows to keep the > +# "ti" subdirectory but "dts" is still missing. > +# Make sure /boot/dtb/ti exist by creating a symlink in > +# ${TARGET_DIR}/boot > +# https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc?h=09.02.00.004#n13 > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/include/env/ti/mmc.env?ref_type=tags#L18 > +if [ -L ${TARGET_DIR}/boot/dtb ]; then > +??? rm ${TARGET_DIR}/boot/dtb > +??? ln -sf . ${TARGET_DIR}/boot/dtb > +fi The above only re-creates a link if there was already a link, but doesn't if it's a clean build. Should "ln -sf . ${TARGET_DIR}/boot/dtb" be outside the "if"? -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Fri Feb 16 01:44:19 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Fri, 16 Feb 2024 02:44:19 +0100 Subject: [Buildroot] [PATCH 18/21] configs/ti_j721e_sk_defconfig: new defconfig In-Reply-To: <20240213172817.2872849-19-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-19-romain.naour@smile.fr> Message-ID: <9a9b1138094021975bf0ef1a22485a37efeebc95.camel@gmail.com> Hi Romain, On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > --- /dev/null > +++ b/board/ti/j721e-sk/post-build.sh > @@ -0,0 +1,16 @@ > +#!/bin/sh > +BOARD_DIR="$(dirname $0)" > + > +# u-boot is looking at /boot/dtb/ti for devicetree in the rootfs > +# partition while Buildroot install the kernel and its devicetree > +# in /boot (BR2_LINUX_KERNEL_INSTALL_TARGET enabled). > +# Enabling BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME allows to keep the > +# "ti" subdirectory but "dts" is still missing. > +# Make sure /boot/dtb/ti exist by creating a symlink in > +# ${TARGET_DIR}/boot > +# https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc?h=09.02.00.004#n13 > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/include/env/ti/mmc.env?ref_type=tags#L18 > +if [ -L ${TARGET_DIR}/boot/dtb ]; then > +??? rm ${TARGET_DIR}/boot/dtb > +??? ln -sf . ${TARGET_DIR}/boot/dtb > +fi the above script (with corrections) and... > --- /dev/null > +++ b/configs/ti_j721e_sk_defconfig > @@ -0,0 +1,51 @@ > +BR2_aarch64=y > +BR2_cortex_a72=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/j721e-sk/post-build.sh" ... the hook in config and BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y seem to be necessary for all boardswhere you update U-Boot to >=v2023.10, because of U-Boot commits 014e013e784f ("environment: ti: Make get_fdt_mmc common") and d8ea68da6bf1 ("environment: ti: Prefix ARM64 DTB names with directory"), which lead to /boot/dts/ti requirement for all TI boards. But it's unfortunately still not enough and SK-AM62B still falls back to BOOTP instead of MMC boot... -- Alexander Sverdlin. From bernd at kuhls.net Fri Feb 16 05:33:55 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 16 Feb 2024 06:33:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 24.0.1 Message-ID: <20240216053355.12317-1-bernd@kuhls.net> Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000749.html Signed-off-by: Bernd Kuhls --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 1d006dbc91..f46dcac224 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 24.0.0 +MESA3D_HEADERS_VERSION = 24.0.1 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 49b42e2132..0a7692a20f 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html -sha256 dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 mesa-24.0.0.tar.xz -sha512 9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15 mesa-24.0.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000749.html +sha256 f387192b08c471c545590dd12230a2a343244804b5fe866fec6aea02eab57613 mesa-24.0.1.tar.xz +sha512 1eaff5dcff8dd314b2dfe249d25db68d530d3f0fb54e926999768d0a48aa34b67c31ec3587bb2a7d1969845b26e79a4d87aceb7a141fd2e811ae0c47c00b0963 mesa-24.0.1.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 2d13f7336f..4c3476ec3d 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 24.0.0 +MESA3D_VERSION = 24.0.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos -- 2.39.2 From bernd at kuhls.net Fri Feb 16 05:43:45 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 16 Feb 2024 06:43:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 20.6.1-Nexus Message-ID: <20240216054345.17403-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index c61c391825..286cff5cc4 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb21e185d1333a8696565138bc58df3d37970c9a3615193396e9f296a56a24c4 kodi-pvr-mythtv-20.5.10-Nexus.tar.gz +sha256 4c742a31ec6f4d2a427d05f70950cfd4e347cf1c0acdb1747c39eb68124be30a kodi-pvr-mythtv-20.6.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 66f1948741..312c8619be 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.5.10-Nexus +KODI_PVR_MYTHTV_VERSION = 20.6.1-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.39.2 From bernd at kuhls.net Fri Feb 16 05:53:43 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Fri, 16 Feb 2024 06:53:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.16 Message-ID: <20240216055343.24326-1-bernd@kuhls.net> Changelog: https://www.php.net/ChangeLog-8.php#8.2.16 Release notes: https://www.php.net/releases/8_2_16.php Updated license hash due to copyright year bump: https://github.com/php/php-src/commit/2575e6b88c3d3bbd53383fb65057c9b7b029e264 Signed-off-by: Bernd Kuhls --- package/php/php.hash | 4 ++-- package/php/php.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 7c8736e41c..4ce3616de3 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 php-8.2.15.tar.xz +sha256 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php-8.2.16.tar.xz # License file -sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE +sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c69abd5f31..4daf7f633d 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.15 +PHP_VERSION = 8.2.16 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES -- 2.39.2 From james.d.knight at live.com Fri Feb 16 05:57:57 2024 From: james.d.knight at live.com (James Knight) Date: Fri, 16 Feb 2024 00:57:57 -0500 Subject: [Buildroot] [PATCH 2/2] package/util-linux: adding cfdisk enablement comment In-Reply-To: <20240216055757.1588-1-james.d.knight@live.com> References: <20240216055757.1588-1-james.d.knight@live.com> Message-ID: This commit introduces a menu comment to users to indicate whether the `cfdisk` can be built, even when the basic set binaries option is enabled. For users wishing to support `fdisks` utilities (cfdisk, fdisk and sfdisk) in Buildroot, these utilities are enabled through a `BR2_PACKAGE_UTIL_LINUX_BINARIES` option. This option configures `all-programs`, which will default enable `fdisks` (along with other program options that do not have an explicit configuration). While a user can enable "all programs", there is no guarantee that the `cfdisk` utility will be built if neither ncurses or slang is enabled. Even if an explicit Buildroot menu option is added for `cfdisk` (where we can force select ncurses, if slang is not yet enabled), there is no specific configuration option in util-linux to toggle the enablement of `cfdisk` at this time. Signed-off-by: James Knight --- package/util-linux/Config.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 73fa11380e82fb42da170045e1c03cc3a5783637..e59072f039bf780df768bfa7e0d66fbb13ab743c 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -67,6 +67,14 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES The setarch utility also installs architecture-specific symlinks like linux32, linux64, uname26, i386 and x86_64. +if BR2_PACKAGE_UTIL_LINUX_BINARIES + +comment "cfdisk needs either ncurses or slang" + depends on !BR2_PACKAGE_NCURSES + depends on !BR2_PACKAGE_SLANG + +endif + config BR2_PACKAGE_UTIL_LINUX_AGETTY bool "agetty" depends on BR2_USE_MMU # fork() -- 2.40.1.windows.1 From james.d.knight at live.com Fri Feb 16 05:57:56 2024 From: james.d.knight at live.com (James Knight) Date: Fri, 16 Feb 2024 00:57:56 -0500 Subject: [Buildroot] [PATCH 1/2] package/util-linux: explicit slang dependency fallback for cfdisk Message-ID: The cfdisk utility (under `fdisks`; defaulted by `all-programs`) provides TUI capabilities from either using ncurses or slang. This package provides explicit configuration of enabling ncurses support, but not for slang. Updating the package to explicitly enable slang support if the slang package is available and we are not already using ncurses. Signed-off-by: James Knight --- package/util-linux/util-linux.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 72126adb005f8422a19ec303897b732f86dd22d2..8a162f179cf332b9d1bab8b42a5f6e6e652b2942 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -96,6 +96,14 @@ endif UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses endif +# if ncurses is not available for cfdisk, try to fallback onto slang +ifeq ($(BR2_PACKAGE_SLANG)x$(BR2_PACKAGE_NCURSES),yx) +UTIL_LINUX_DEPENDENCIES += slang +UTIL_LINUX_CONF_OPTS += --with-slang +else +UTIL_LINUX_CONF_OPTS += --without-slang +endif + # workaround for static_assert on uclibc-ng < 1.0.42 UTIL_LINUX_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -Dstatic_assert=_Static_assert" -- 2.40.1.windows.1 From buildroot at bubu1.eu Fri Feb 16 13:18:13 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Fri, 16 Feb 2024 14:18:13 +0100 Subject: [Buildroot] [PATCH 1/2] support/testing: remove hardcoded sleep from python-django test Message-ID: <20240216131815.318315-1-buildroot@bubu1.eu> Instead of waiting for a hardcoded time of 30s we check periodically every second if the server is already up. If it isn't up after the full timeout (which is the same as before) expired the test fails. We need to redirect all output of the background started task to /dev/null now as it otherwise confuses the emulator.run() exit code parsing logic (as it gets out of order messages from the emulator). Signed-off-by: Marcus Hoffmann --- .../tests/package/test_python_django.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py index e1ca50f6d8..0973467a2a 100644 --- a/support/testing/tests/package/test_python_django.py +++ b/support/testing/tests/package/test_python_django.py @@ -1,3 +1,5 @@ +import time + from tests.package.test_python import TestPythonPackageBase @@ -16,13 +18,17 @@ class TestPythonDjango(TestPythonPackageBase): self.assertIn("Operations to perform:", output[0]) self.assertEqual(exit_code, 0) - cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " - # give some time to setup the server - cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 > /dev/null 2>&1 & " self.assertRunOk(cmd, timeout=timeout) - - cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" - self.assertRunOk(cmd) + # give some time to setup the server + for attempt in range(30 * self.emulator.timeout_multiplier): + time.sleep(1) + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" + _, exit_code = self.emulator.run(cmd) + if exit_code == 0: + break + else: + self.assertTrue(False, "Timeout while waiting for django server") class TestPythonPy3Django(TestPythonDjango): -- 2.34.1 From buildroot at bubu1.eu Fri Feb 16 13:18:14 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Fri, 16 Feb 2024 14:18:14 +0100 Subject: [Buildroot] [PATCH 2/2] package/python-whitenoise: new package In-Reply-To: <20240216131815.318315-1-buildroot@bubu1.eu> References: <20240216131815.318315-1-buildroot@bubu1.eu> Message-ID: <20240216131815.318315-2-buildroot@bubu1.eu> The test is using the django integration of whitenoise as it's the most common setup and allows to model the test case after the django one as well. The setup we need to do is a bit more complicated though and follows the whitenoise getting started documentation [1]. We then request a .css file from the django admin app that is enabled by default in template project. Due to running django's development server with --nostatic we ensure that static file handling is taken over by whitenoise. [1] https://whitenoise.readthedocs.io/en/stable/django.html Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/python-whitenoise/Config.in | 7 ++++ .../python-whitenoise/python-whitenoise.hash | 5 +++ .../python-whitenoise/python-whitenoise.mk | 14 +++++++ .../tests/package/test_python_django.py | 1 + .../tests/package/test_python_whitenoise.py | 41 +++++++++++++++++++ 6 files changed, 69 insertions(+) create mode 100644 package/python-whitenoise/Config.in create mode 100644 package/python-whitenoise/python-whitenoise.hash create mode 100644 package/python-whitenoise/python-whitenoise.mk create mode 100644 support/testing/tests/package/test_python_whitenoise.py diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..7180aaea63 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1417,6 +1417,7 @@ menu "External python modules" source "package/python-websocket-client/Config.in" source "package/python-websockets/Config.in" source "package/python-werkzeug/Config.in" + source "package/python-whitenoise/Config.in" source "package/python-whoosh/Config.in" source "package/python-wrapt/Config.in" source "package/python-ws4py/Config.in" diff --git a/package/python-whitenoise/Config.in b/package/python-whitenoise/Config.in new file mode 100644 index 0000000000..47df3ad5bf --- /dev/null +++ b/package/python-whitenoise/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_WHITENOISE + bool "python-whitenoise" + help + Radically simplified static file serving for WSGI + applications. + + https://github.com/evansd/whitenoise diff --git a/package/python-whitenoise/python-whitenoise.hash b/package/python-whitenoise/python-whitenoise.hash new file mode 100644 index 0000000000..4e239f4ab1 --- /dev/null +++ b/package/python-whitenoise/python-whitenoise.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/whitenoise/json +md5 4926cee7317ac12533549c08043ee322 whitenoise-6.6.0.tar.gz +sha256 8998f7370973447fac1e8ef6e8ded2c5209a7b1f67c1012866dbcd09681c3251 whitenoise-6.6.0.tar.gz +# Locally computed sha256 checksums +sha256 ebfd469b4fb6b5adada547747e1e8da725ecf20595d54aced043275d4f4a3600 LICENSE diff --git a/package/python-whitenoise/python-whitenoise.mk b/package/python-whitenoise/python-whitenoise.mk new file mode 100644 index 0000000000..a601157491 --- /dev/null +++ b/package/python-whitenoise/python-whitenoise.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-whitenoise +# +################################################################################ + +PYTHON_WHITENOISE_VERSION = 6.6.0 +PYTHON_WHITENOISE_SOURCE = whitenoise-$(PYTHON_WHITENOISE_VERSION).tar.gz +PYTHON_WHITENOISE_SITE = https://files.pythonhosted.org/packages/16/e3/adddb43cf8eb924e18eca677d4e40d47348566224b724cb8d1eaf6a48d1b +PYTHON_WHITENOISE_SETUP_TYPE = setuptools +PYTHON_WHITENOISE_LICENSE = MIT +PYTHON_WHITENOISE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py index 0973467a2a..ac1dc81359 100644 --- a/support/testing/tests/package/test_python_django.py +++ b/support/testing/tests/package/test_python_django.py @@ -36,6 +36,7 @@ class TestPythonPy3Django(TestPythonDjango): config = TestPythonDjango.config + \ """ BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON3_PY_PYC=y BR2_PACKAGE_PYTHON_DJANGO=y BR2_PACKAGE_PYTHON3_SQLITE=y """ diff --git a/support/testing/tests/package/test_python_whitenoise.py b/support/testing/tests/package/test_python_whitenoise.py new file mode 100644 index 0000000000..ff9bcf5ee7 --- /dev/null +++ b/support/testing/tests/package/test_python_whitenoise.py @@ -0,0 +1,41 @@ +import time + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Whitenoise(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DJANGO=y + BR2_PACKAGE_PYTHON_WHITENOISE=y + BR2_PACKAGE_PYTHON3_SQLITE=y + """ + + def test_run(self): + self.login() + timeout = 35 + + cmd = "cd /opt && /usr/bin/django-admin startproject testsite" + self.assertRunOk(cmd, timeout=timeout) + # STATIC_ROOT needs to be set for 'collectstatic' to work. + self.emulator.run("echo 'STATIC_ROOT = BASE_DIR / \"staticfiles\"' >> /opt/testsite/testsite/settings.py") + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py collectstatic" + self.assertRunOk(cmd, timeout=timeout) + # whitenoise docs say it needs to be added directly after SecurityMiddleware, so we do this here with sed. + cmd = """sed -i -e /django.middleware.security.SecurityMiddleware/a\ \\"whitenoise.middleware.WhiteNoiseMiddleware\\", /opt/testsite/testsite/settings.py""" + self.assertRunOk(cmd, timeout=timeout) + # --nostatic ensures the builtin django server doesn't serve the static files, + # so we can test that whitenoise serves them + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver --nostatic 0.0.0.0:1234 > /dev/null 2>&1 & " + self.assertRunOk(cmd, timeout=timeout) + # give some time to setup the server + for attempt in range(30 * self.emulator.timeout_multiplier): + time.sleep(1) + cmd = "wget http://127.0.0.1:1234/static/admin/css/base.css" + _, exit_code = self.emulator.run(cmd) + if exit_code == 0: + break + else: + self.assertTrue(False, "Timeout while waiting for django server") -- 2.34.1 From buildroot at bubu1.eu Fri Feb 16 13:23:31 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Fri, 16 Feb 2024 14:23:31 +0100 Subject: [Buildroot] [PATCH 1/2] support/testing: remove hardcoded sleep from python-django test In-Reply-To: <20240216131815.318315-1-buildroot@bubu1.eu> References: <20240216131815.318315-1-buildroot@bubu1.eu> Message-ID: <10542b7e-f7d5-4197-ae19-ba94706c6595@bubu1.eu> On 16.02.24 14:18, Marcus Hoffmann via buildroot wrote: > Instead of waiting for a hardcoded time of 30s we check periodically every > second if the server is already up. If it isn't up after the full timeout > (which is the same as before) expired the test fails. > > We need to redirect all output of the background started task to > /dev/null now as it otherwise confuses the emulator.run() exit code > parsing logic (as it gets out of order messages from the emulator). > > Signed-off-by: Marcus Hoffmann > --- > .../tests/package/test_python_django.py | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py > index e1ca50f6d8..0973467a2a 100644 > --- a/support/testing/tests/package/test_python_django.py > +++ b/support/testing/tests/package/test_python_django.py > @@ -1,3 +1,5 @@ > +import time > + > from tests.package.test_python import TestPythonPackageBase > > > @@ -16,13 +18,17 @@ class TestPythonDjango(TestPythonPackageBase): > self.assertIn("Operations to perform:", output[0]) > self.assertEqual(exit_code, 0) > > - cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " > - # give some time to setup the server > - cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) > + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 > /dev/null 2>&1 & " > self.assertRunOk(cmd, timeout=timeout) > - > - cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" > - self.assertRunOk(cmd) > + # give some time to setup the server > + for attempt in range(30 * self.emulator.timeout_multiplier): > + time.sleep(1) > + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" > + _, exit_code = self.emulator.run(cmd) > + if exit_code == 0: > + break > + else: > + self.assertTrue(False, "Timeout while waiting for django server") > > > class TestPythonPy3Django(TestPythonDjango): The django test (and the whitenoise test introduced in the next patch) actually both currently fail because of a problem with django 5.0 and .pyc only installations. [1] This now has "release blocker" priority at django and a proposed patch (that I tested locally but hasn't been officially submitted to django yet) so hopefully this will be fixed with the next django point release in a couple of weeks. [1] https://code.djangoproject.com/ticket/35187 Marcus From fontaine.fabrice at gmail.com Fri Feb 16 18:14:15 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 16 Feb 2024 19:14:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/dash: fix static build Message-ID: <20240216181415.1188314-1-fontaine.fabrice@gmail.com> Drop -Wl,--fatal-warnings with --enable-static to avoid the following static build failure: configure:4778: checking for strtod configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c >&5 /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions collect2: error: ld returned 1 exit status [...] In file included from arith_yylex.c:44: system.h:74:22: error: static declaration of 'strtod' follows non-static declaration static inline double strtod(const char *nptr, char **endptr) ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c - http://autobuild.buildroot.org/results/a4287b86186bf0a1d5370cf53123b324ae65c1da Signed-off-by: Fabrice Fontaine --- ...-configure.ac-drop-Wl-fatal-warnings.patch | 45 +++++++++++++++++++ package/dash/dash.mk | 2 + 2 files changed, 47 insertions(+) create mode 100644 package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch diff --git a/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch b/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch new file mode 100644 index 0000000000..eaa5d6cc60 --- /dev/null +++ b/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch @@ -0,0 +1,45 @@ +From 7d07f683b83ef9fbdf258ce61b022b32f06f253a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Feb 2024 17:26:28 +0100 +Subject: [PATCH] configure.ac: drop -Wl,--fatal-warnings + +Drop -Wl,--fatal-warnings with --enable-static to avoid the following +static build failure: + +configure:4778: checking for strtod +configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c >&5 +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions +collect2: error: ld returned 1 exit status + +[...] + +In file included from arith_yylex.c:44: +system.h:74:22: error: static declaration of 'strtod' follows non-static declaration + static inline double strtod(const char *nptr, char **endptr) + ^~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c + +Signed-off-by: Fabrice Fontaine +Upstream: https://lore.kernel.org/dash/20240216163319.860768-1-fontaine.fabrice at gmail.com +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5524650..6993364 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,7 +34,7 @@ fi + AC_ARG_ENABLE(static, AS_HELP_STRING(--enable-static, \ + [Build statical linked program])) + if test "$enable_static" = "yes"; then +- export LDFLAGS="-static -Wl,--fatal-warnings" ++ export LDFLAGS="-static" + fi + + AC_ARG_ENABLE(fnmatch, AS_HELP_STRING(--disable-fnmatch, \ +-- +2.43.0 + diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 6efc71e568..aebfd28be8 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -8,6 +8,8 @@ DASH_VERSION = 0.5.11.5 DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c) DASH_LICENSE_FILES = COPYING +# We're patching configure.ac +DASH_AUTORECONF = YES # dash does not build in parallel DASH_MAKE = $(MAKE1) -- 2.43.0 From fontaine.fabrice at gmail.com Fri Feb 16 19:45:20 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 16 Feb 2024 20:45:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: deflate64 needs libzlib Message-ID: <20240216194520.1806313-1-fontaine.fabrice@gmail.com> deflate64 unconditionally uses FAR since its addition with https://github.com/OSGeo/gdal/commit/d6baebcc73ffc2ede6e9635846676b275b02bab3 resulting in the following build failure with zlib-ng since bump to version 3.8.2 in commit d2e349301b79ad3a1840083714ee396f4302b68a: In file included from /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/infback9.c:6: /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/minified_zutil.h:46:17: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'uchf' 46 | typedef uch FAR uchf; | ^~~~ Fixes: d2e349301b79ad3a1840083714ee396f4302b68a - http://autobuild.buildroot.org/results/8b55108dee4faa98c234d00a1a22b62ed948e8d3 Signed-off-by: Fabrice Fontaine --- package/gdal/gdal.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 3104332db9..247e13663c 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -124,6 +124,12 @@ else GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF endif +ifeq ($(BR2_PACKAGE_LIBZLIB),y) +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=ON +else +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON -- 2.43.0 From vineetg at rivosinc.com Fri Feb 16 20:09:33 2024 From: vineetg at rivosinc.com (Vineet Gupta) Date: Fri, 16 Feb 2024 12:09:33 -0800 Subject: [Buildroot] [PATCH v2] glibc: build: honor toplevel BR2_TARGET_OPTIMIZATION In-Reply-To: <2111ebed-d6b8-46d1-b109-9cd468be5ca0@mind.be> References: <20240214224355.551010-1-vineetg@rivosinc.com> <20240214230114.551779-1-vineetg@rivosinc.com> <2111ebed-d6b8-46d1-b109-9cd468be5ca0@mind.be> Message-ID: On 2/14/24 23:53, Arnout Vandecappelle wrote: > > On 15/02/2024 00:01, Vineet Gupta wrote: >> glibc though part of toolchain is technically target binary and thus >> needs to be built with BR2_TARGET_OPTIMIZATION in case users want to >> force a certain build toogle from top level. > BR2_TARGET_OPTIMIZATION is encoded in the toolchain wrapper, and as far as I > can see glibc is built with the toolchain wrapper... I haven't (re)tested it, > but it should be the case... Indeed the toggles are effectively being used in the build, even if not visible in the build logs, which is what tripped me up in the first place. And before sending the patch I did wonder how buildroot could have such an obvious deficiency for so long. In the past I've myself sent a few patches to defconfigs to affect such build toggles in first place ;-) ?? 2021-01-16 32113c8a25c0 configs/snps_archs38_hsdk_defconfig: use hard-float ? > BR2_TARGET_OPTIMIZATION was added to the wrapper in commit > b95e436ee0c9e4638dc79766da0d17927c6641ce in 2011. > > The wrapper was added to host-gcc-initial (which is used in the glibc build) > in commit 919c06c28295f19ca49459b98d8954148b381360 in 2015. I still think that an explicit comment such as below will help a poor lost soul of future going git grep. ----------> >From 5b82e169aa21916833b62fe5122c844cec62f486 Mon Sep 17 00:00:00 2001 From: Vineet Gupta Date: Fri, 16 Feb 2024 12:07:07 -0800 Subject: [PATCH] glibc: build: add comment about BR2_TARGET_OPTIMIZATION Signed-off-by: Vineet Gupta --- ?package/glibc/glibc.mk | 3 +++ ?1 file changed, 3 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d198d6f04cb2..facad0b29958 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -80,6 +80,9 @@ GLIBC_INSTALL_STAGING = YES ? ?GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install ? +# Note that BR2_TARGET_OPTIMIZATION toggles are implicitly passed +# here via the toolchain wrapper setup + ?# Thumb build is broken, build in ARM mode ?ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) ?GLIBC_EXTRA_CFLAGS += -marm -- From dannenberg at ti.com Fri Feb 16 20:13:01 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Fri, 16 Feb 2024 14:13:01 -0600 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> Message-ID: <20240216201301.ftcjsjgepmcvd3pm@dasso> On Thu, Feb 15, 2024 at 12:23:21PM +0100, Romain Naour wrote: > Hi Alexander, > > Le 15/02/2024 ? 11:13, Alexander Sverdlin a ?crit?: > > Hi Romain, > > > > On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: > >>> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > >>> > >>> This series start by adding U-boot binman support already submitted in the > >>> preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > >>> [1], with small improvements. > >>> See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > >>> > >>> With binman support, we can add the TI K3 j721e SoC support by > >>> providing all required firmware generated by the build. > >>> > >>> Add the new ti_j721e_sk_defconfig file to build a basic SD card image to > >>> boot the board (serial debug and ethernet working). > >>> > >>> Thanks to binman support, we can remove the ti-k3-image-gen tool from > >>> Buildroot. To do that, we have to update existing defconfig (am62, am64). > >>> > >>> Followup commits can improve TI K3 HS-FS devices based on binman instead > >>> of legacy core-secdev-k3 tool. > >>> > >>> [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html > >>> [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > >>> > >>> Best regards, > >>> Romain > > > > I have mixed feelings after testing the patchset on SK-AM62B... > > It doesn't quite boot, refer to the boot log [1]. > > Seems that U-Boot env is missing, maybe I'm missing some installation > > step, but I do not see it mentioned in the documetation (for instance > > of original commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig"). > > > > I'm not sure if this is a result of U-Boot update or if the current > > master is broken as well. I'll be retesting it today and will get back to > > you. > > It seems you are testing on a HS-FS device "AM62X SR1.0 HS-FS" while I only > runtime tested this series on a SK-TDA4VM (GP: general pupose). > > Also the ti_am62x_sk_defconfig is expecting a GP SoC so you may have to > customize the image generated in a post-build script? > > Maybe you have to replace the tiboot3.bin binary included by genimage with the > one for the HS-FS variant ? > > for j721e: > 285449 13 f?vr. 17:27 tiboot3.bin > 285449 13 f?vr. 17:27 tiboot3-j721e-gp-evm.bin > 286224 13 f?vr. 17:27 tiboot3-j721e_sr1_1-hs-evm.bin > 286224 13 f?vr. 17:27 tiboot3-j721e_sr2-hs-fs-evm.bin > > for am62x: > tiboot3.bin << should be the gp variant by default > tiboot3-am62x-gp-evm.bin > tiboot3-am62x-hs-fs-evm.bin > > Also, did you have the ti-k3-core-secdev package locally, it seems it's required > for HS-FS SoC but the package is currently missing: > > http://lists.busybox.net/pipermail/buildroot/2024-February/685383.html > > Is ti-k3-core-secdev really required fllowing the switch to binman? > (binman should sign all firmware binaries itself). We should see that we can remove/obsolete the ti-k3-core-secdev package alongside the ti-k3-image-gen package, those are no longer needed since we started using binman for the building the initial boot stage. -- Andreas Dannenberg Texas Instruments Inc > > > > > Fortunately this patchset is actually about building the images differently > > and this part actually went smoothly, which is good. > > Thank you for testing, it help a lot! > > Maybe something is missing in this series to handle HS-FS device properly. > > > > >>> Dario Binacchi (5): > >>> ? package/python-attrs: add host variant > >>> ? package/python-rpds-py: add host variant > >>> ? package/python-referencing: add host variant > >>> ? package/python-jsonschema-specifications: add host variant > >>> ? package/python-jsonschema: add host variant > >>> > >>> Romain Naour (16): > >>> ? DEVELOPERS: add Romain Naour for am574x_idk_defconfig > >>> ? configs/ti_am62x_sk_defconfig: fix optee-os plateform > >>> ? configs/ti_am64x_sk_defconfig: fix optee-os plateform > >>> ? boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > >>> ? boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > >>> ? boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to > >>> ??? BINARIES_DIR > >>> ? boot/ti-k3-boot-firmware: introduce > >>> ??? BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} > >>> ? boot/uboot: use DM firmware name defined by ti-k3-boot-firmware > >>> ??? package > >>> ? boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > >>> ? boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options > >>> ? boot/uboot: enable TI K3 Device Manager (DM) for j721e > >>> ? boot/ti-k3-boot-firmware: bump to version 09.02.00.004 > >>> ? configs/ti_j721e_sk_defconfig: new defconfig > >>> ? configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman > >>> ??? tool > >>> ? configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman > >>> ??? tool > >>> ? boot/ti-k3-image-gen: remove package > >>> > >>> ?Config.in.legacy????????????????????????????? |? 7 ++ > >>> ?DEVELOPERS??????????????????????????????????? |? 6 +- > >>> ?board/ti/j721e-sk/genimage.cfg??????????????? | 28 +++++++ > >>> ?board/ti/j721e-sk/post-build.sh?????????????? | 16 ++++ > >>> ?board/ti/j721e-sk/readme.txt????????????????? | 34 ++++++++ > >>> ?boot/Config.in??????????????????????????????? |? 1 - > >>> ?boot/ti-k3-boot-firmware/Config.in??????????? | 39 ++++++++++ > >>> ?.../ti-k3-boot-firmware.hash????????????????? |? 2 +- > >>> ?.../ti-k3-boot-firmware.mk??????????????????? | 16 ++-- > >>> ?boot/ti-k3-image-gen/Config.in??????????????? | 77 ------------------- > >>> ?boot/ti-k3-image-gen/ti-k3-image-gen.hash???? |? 3 - > >>> ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?????? | 54 ------------- > >>> ?boot/ti-k3-r5-loader/Config.in??????????????? |? 8 ++ > >>> ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk?????? | 23 ++++++ > >>> ?boot/uboot/Config.in????????????????????????? | 27 ++++--- > >>> ?boot/uboot/uboot.mk?????????????????????????? | 10 ++- > >>> ?configs/ti_am62x_sk_defconfig???????????????? | 14 ++-- > >>> ?configs/ti_am64x_sk_defconfig???????????????? | 14 ++-- > >>> ?...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- > >>> ?package/python-attrs/python-attrs.mk????????? |? 6 ++ > >>> ?.../python-jsonschema-specifications.mk?????? | 10 +++ > >>> ?.../python-jsonschema/python-jsonschema.mk??? | 14 ++++ > >>> ?.../python-referencing/python-referencing.mk? | 11 +++ > >>> ?package/python-rpds-py/python-rpds-py.mk????? |? 1 + > >>> ?24 files changed, 275 insertions(+), 180 deletions(-) > >>> ?create mode 100644 board/ti/j721e-sk/genimage.cfg > >>> ?create mode 100755 board/ti/j721e-sk/post-build.sh > >>> ?create mode 100644 board/ti/j721e-sk/readme.txt > >>> ?delete mode 100644 boot/ti-k3-image-gen/Config.in > >>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > >>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk > >>> ?copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) > >>> > >>> -- > >>> 2.43.0 > >>> > >>> _______________________________________________ > >>> buildroot mailing list > >>> buildroot at buildroot.org > >>> https://lists.buildroot.org/mailman/listinfo/buildroot > > > > 1. Boot log: > > > > U-Boot SPL 2024.01 (Feb 15 2024 - 01:42:12 +0100) > > SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > > SPL initial stack usage: 13400 bytes > > Trying to boot from MMC2 > > Authentication passed > > Authentication passed > > Authentication passed > > Authentication passed > > Authentication passed > > Starting ATF on ARM64 core... > > > > NOTICE: BL31: v2.10.0 (release):v2.10 > > NOTICE: BL31: Built : 01:28:38, Feb 15 2024 > > I/TC: > > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1198-g18ff6d2643)) #1 Thu Feb 15 00:28:27 UTC 2024 aarch64 > > I/TC: WARNING: This OP-TEE configuration might be insecure! > > I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html > > I/TC: Primary CPU initializing > > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > > I/TC: HUK Initialized > > I/TC: Activated SA2UL device > > I/TC: Enabled firewalls for SA2UL TRNG device > > I/TC: SA2UL TRNG initialized > > I/TC: SA2UL Drivers initialized > > I/TC: Primary CPU switching to normal world boot > > > > U-Boot SPL 2024.01 (Feb 15 2024 - 01:43:17 +0100) > > SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') > > SPL initial stack usage: 1872 bytes > > Trying to boot from MMC2 > > Authentication passed > > Authentication passed > > > > > > U-Boot 2024.01 (Feb 15 2024 - 01:43:17 +0100) > > > > SoC: AM62X SR1.0 HS-FS > > Model: Texas Instruments AM625 SK > > DRAM: 2 GiB > > Core: 56 devices, 23 uclasses, devicetree: separate > > MMC: mmc at fa10000: 0, mmc at fa00000: 1 > > Loading Environment from nowhere... OK > > In: serial at 2800000 > > Out: serial at 2800000 > > Err: serial at 2800000 > > Net: eth0: ethernet at 8000000port@1 > > Hit any key to stop autoboot: 0 > > switch to partitions #0, OK > > mmc1 is current device > > SD/MMC found on device 1 > > Failed to load 'uEnv.txt' > > Can you access to the mmc1 content manually ? > I had to create a symlink due to "dtb" subdirectory expected by u-boot > u-boot is looking at /boot/dtb/ti for devicetree. > > Best regards, > Romain > > > > Scanning for bootflows in all bootdevs > > Seq Method State Uclass Part Name Filename > > --- ----------- ------ -------- ---- ------------------------ ---------------- > > Scanning global bootmeth 'efi_mgr': > > No EFI system partition > > No EFI system partition > > Failed to persist EFI variables > > Scanning bootdev 'mmc at fa00000.bootdev': > > Scanning bootdev 'mmc at fa10000.bootdev': > > Unknown uclass 'usb' in label > > link up on port 1, speed 100, full duplex > > BOOTP broadcast 1 > > BOOTP broadcast 2 > > BOOTP broadcast 3 > > BOOTP broadcast 4 > > BOOTP broadcast 5 > > BOOTP broadcast 6 > > BOOTP broadcast 7 > > BOOTP broadcast 8 > > BOOTP broadcast 9 > > BOOTP broadcast 10 > > BOOTP broadcast 11 > > BOOTP broadcast 12 > > BOOTP broadcast 13 > > BOOTP broadcast 14 > > BOOTP broadcast 15 > > BOOTP broadcast 16 > > BOOTP broadcast 17 > > > > Retry time exceeded; starting again > > > > > > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From dannenberg at ti.com Fri Feb 16 20:06:35 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Fri, 16 Feb 2024 14:06:35 -0600 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> Message-ID: <20240216200635.crek5j23p3hybg2p@dasso> On Thu, Feb 15, 2024 at 11:20:50AM +0100, Alexander Sverdlin wrote: > Hi Romain, > > On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > > -choice > > - prompt "Security type" > > - help > > - ? The target SoC security type option for image gen.? Valid > > - ? options are "gp" for General Purpose devices, "hs-fs" for > > - ? High Security - Field Securable devices, or "hs" for High > > - ? Security - Security Enforcing devices.? Note for all High > > - ? Security device variants the TI_SECURE_DEV_PKG environmental > > - ? variable must be defined at build time pointing to a valid > > - ? core-secdev-k3 folder location, otherwise the build will > > - ? fail, see > > - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > - bool "gp" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > - bool "hs-fs" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > - bool "hs" > > - > > -endchoice > > another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > was the default, which didn't boot on my HS-FS SoC. > > You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the > default for AM62x. I'm not sure if this is a problem, though. HS-FS should be the default for all TI AM6x devices. This is our "production silicon" and what's used for (almost) all projects, especially new projects. This being said having support for GP device variants still is desirable for existing boards/projects, such as the current BeaglePlay boards (amongst earlier version of TI starter kit EVMs for AM6x). -- Andreas Dannenberg Texas Instruments Inc > > -- > Alexander Sverdlin. > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From giulio.benetti at benettiengineering.com Fri Feb 16 20:59:04 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 16 Feb 2024 21:59:04 +0100 Subject: [Buildroot] [PATCH] package/libnss: bump version to 3.98 Message-ID: <20240216205904.242339-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index fdfe9773d2..51701724ed 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_97_RTM/src/SHA256SUMS -sha256 078efb8393f32e40b1fb4bf6930fff7f1aabed01287fcc5fe58aba736765fa0a nss-3.97.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_98_RTM/src/SHA256SUMS +sha256 f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce nss-3.98.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 60a33456b0..90e66ca885 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.97 +LIBNSS_VERSION = 3.98 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 -- 2.34.1 From giulio.benetti at benettiengineering.com Fri Feb 16 21:13:21 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 16 Feb 2024 22:13:21 +0100 Subject: [Buildroot] [PATCH] package/libnvme: bump to version 1.8 Message-ID: <20240216211321.470283-1-giulio.benetti@benettiengineering.com> Signed-off-by: Giulio Benetti --- package/libnvme/libnvme.hash | 2 +- package/libnvme/libnvme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnvme/libnvme.hash b/package/libnvme/libnvme.hash index 69963578cd..469006d632 100644 --- a/package/libnvme/libnvme.hash +++ b/package/libnvme/libnvme.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 e9c3ad59c068788faf0f0af4296f92f8ce410d12749f0f35a541d6a21e630393 libnvme-1.7.1.tar.gz +sha256 d59939a280eec41eb7a716e1681d0d0c612099385204ffb55d07134a6be08d75 libnvme-1.8.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnvme/libnvme.mk b/package/libnvme/libnvme.mk index 813f7279e8..bf131d2a38 100644 --- a/package/libnvme/libnvme.mk +++ b/package/libnvme/libnvme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNVME_VERSION = 1.7.1 +LIBNVME_VERSION = 1.8 LIBNVME_SITE = $(call github,linux-nvme,libnvme,v$(LIBNVME_VERSION)) LIBNVME_LICENSE = LGPL-2.1 LIBNVME_LICENSE_FILES = COPYING -- 2.34.1 From raphael.melotte at mind.be Fri Feb 16 21:13:38 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:38 +0100 Subject: [Buildroot] [PATCH 0/5] package/python-pymupdf: bump to version 1.23.22 Message-ID: <20240216211344.1807353-1-raphael.melotte@mind.be> Hello, This series builds on the following series from James to update python-pymupdf: https://patchwork.ozlabs.org/project/buildroot/list/?series=389751&state=* Note that patch 1 fixes an issue that was present before the version bumps, so it could be applied separately or backported. Patch 3 could potentially be backported as well, but I did not test it with any other mupdf or python-pymupdf version. Kind regards, Rapha?l James Hilliard (2): package/mupdf: bump to version 1.23.9 package/python-pymupdf: bump to version 1.23.22 Rapha?l M?lotte (3): package: python-pymupdf: add missing python-zlib dependency support/testing: add new test for python-pymupdf package/mupdf: fix building shared libraries DEVELOPERS | 2 + ...issing-limits.h-include-for-UINT_MAX.patch | 70 ---------- package/mupdf/Config.in | 4 + package/mupdf/mupdf.hash | 4 +- package/mupdf/mupdf.mk | 9 +- ...w-providing-python-config-externally.patch | 125 ++++++++++++++++++ package/python-pymupdf/Config.in | 3 +- package/python-pymupdf/python-pymupdf.hash | 4 +- package/python-pymupdf/python-pymupdf.mk | 31 ++--- .../tests/package/sample_python_pymupdf.py | 17 +++ .../tests/package/test_python_pymupdf.py | 26 ++++ 11 files changed, 203 insertions(+), 92 deletions(-) delete mode 100644 package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch create mode 100644 package/python-pymupdf/0001-pipcl.py-allow-providing-python-config-externally.patch create mode 100644 support/testing/tests/package/sample_python_pymupdf.py create mode 100644 support/testing/tests/package/test_python_pymupdf.py -- 2.37.3 From raphael.melotte at mind.be Fri Feb 16 21:13:39 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:39 +0100 Subject: [Buildroot] [PATCH 1/5] package: python-pymupdf: add missing python-zlib dependency In-Reply-To: <20240216211344.1807353-1-raphael.melotte@mind.be> References: <20240216211344.1807353-1-raphael.melotte@mind.be> Message-ID: <20240216211344.1807353-2-raphael.melotte@mind.be> It turns out that python-pymupdf doesn't require zlib directly, but it does require the zlib python module. This fixes the following runtime error: Traceback (most recent call last): File "", line 1, in File "/usr/lib/python3.11/site-packages/fitz/__init__.py", line 22, in File "/usr/lib/python3.11/site-packages/fitz/fitz.py", line 3402, in File "/usr/lib/python3.11/gzip.py", line 9, in ModuleNotFoundError: No module named 'zlib' Signed-off-by: Rapha?l M?lotte --- package/python-pymupdf/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index ecaa5496b5..3831a25451 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF select BR2_PACKAGE_HOST_SWIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF - select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_PYTHON3_ZLIB # runtime help Python bindings for the PDF rendering library MuPDF. -- 2.37.3 From raphael.melotte at mind.be Fri Feb 16 21:13:40 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:40 +0100 Subject: [Buildroot] [PATCH 2/5] support/testing: add new test for python-pymupdf In-Reply-To: <20240216211344.1807353-1-raphael.melotte@mind.be> References: <20240216211344.1807353-1-raphael.melotte@mind.be> Message-ID: <20240216211344.1807353-3-raphael.melotte@mind.be> To give us a chance to catch runtime issues (such as missing dependencies) more easily, add a test that writes a sample PDF file, read it back and verify the text that was read. Like similar packages that lead to a big rootfs (e.g. python-botocore), this test requires a separate ext2 rootfs to avoid filling the default amount of RAM available entirely (which would cause missing files from the root filesystem and in turn, test failures). Signed-off-by: Rapha?l M?lotte --- DEVELOPERS | 2 ++ .../tests/package/sample_python_pymupdf.py | 17 ++++++++++++ .../tests/package/test_python_pymupdf.py | 26 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 support/testing/tests/package/sample_python_pymupdf.py create mode 100644 support/testing/tests/package/test_python_pymupdf.py diff --git a/DEVELOPERS b/DEVELOPERS index 1c6c84b05b..085f2fa234 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2599,9 +2599,11 @@ F: package/python-pymupdf/ F: package/python-rsa/ F: package/python-s3transfer/ F: support/testing/tests/package/sample_python_jmespath.py +F: support/testing/tests/package/sample_python_pymupdf.py F: support/testing/tests/package/sample_python_rsa.py F: support/testing/tests/package/sample_python_s3transfer.py F: support/testing/tests/package/test_python_jmespath.py +F: support/testing/tests/package/test_python_pymupdf.py F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py diff --git a/support/testing/tests/package/sample_python_pymupdf.py b/support/testing/tests/package/sample_python_pymupdf.py new file mode 100644 index 0000000000..574bd27965 --- /dev/null +++ b/support/testing/tests/package/sample_python_pymupdf.py @@ -0,0 +1,17 @@ +import fitz + +# Write a test PDF file +outfile = "python-pymupdf.pdf" +sample_text = "This is a test page for python-pymupdf." +doc = fitz.open() +page = doc.new_page() +p = fitz.Point(50, 72) +page.insert_text(p, sample_text) +doc.save(outfile) + +# Read back the file +with fitz.open(outfile) as d: # open document + read_text = chr(12).join([page.get_text() for page in d]) + +print(read_text) +assert(read_text == sample_text + "\n") diff --git a/support/testing/tests/package/test_python_pymupdf.py b/support/testing/tests/package/test_python_pymupdf.py new file mode 100644 index 0000000000..5e9d5a6912 --- /dev/null +++ b/support/testing/tests/package/test_python_pymupdf.py @@ -0,0 +1,26 @@ +import os +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3PyMuPDF(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_PYMUPDF=y + BR2_PACKAGE_XORG7=y + BR2_USE_WCHAR=y + BR2_INSTALL_LIBSTDCPP=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="250M" + """ + sample_scripts = ["tests/package/sample_python_pymupdf.py"] + timeout = 30 + + def login(self): + ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], + kernel_cmdline=["rootwait", "root=/dev/sda"]) + self.emulator.login() -- 2.37.3 From raphael.melotte at mind.be Fri Feb 16 21:13:41 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:41 +0100 Subject: [Buildroot] [PATCH 3/5] package/mupdf: fix building shared libraries In-Reply-To: <20240216211344.1807353-1-raphael.melotte@mind.be> References: <20240216211344.1807353-1-raphael.melotte@mind.be> Message-ID: <20240216211344.1807353-4-raphael.melotte@mind.be> By default mupdf generates static libraries, shared libraries must be enabled explicitely. The Makefile doesn't make it possible to build both static and shared libs, so add a 'depends on' accordingly. Signed-off-by: Rapha?l M?lotte --- package/mupdf/Config.in | 4 ++++ package/mupdf/mupdf.mk | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/package/mupdf/Config.in b/package/mupdf/Config.in index cf97711160..092e1d8ac6 100644 --- a/package/mupdf/Config.in +++ b/package/mupdf/Config.in @@ -1,9 +1,13 @@ +comment "MuPDF can build static or shared libs, but not both at the same time." + depends on BR2_SHARED_STATIC_LIBS + config BR2_PACKAGE_MUPDF bool "mupdf" depends on BR2_INSTALL_LIBSTDCPP # harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # harfbuzz depends on BR2_PACKAGE_XORG7 + depends on !BR2_SHARED_STATIC_LIBS select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_GUMBO_PARSER select BR2_PACKAGE_HARFBUZZ diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 08894d7980..d2105497be 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -50,6 +50,11 @@ MUPDF_MAKE_OPTS = \ HAVE_OBJCOPY=no \ prefix="/usr" +# The default in MuPDF is static libs +ifeq ($(BR2_SHARED_LIBS),y) +MUPDF_MAKE_OPTS += shared=yes +endif + ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MUPDF_DEPENDENCIES += libfreeglut else -- 2.37.3 From raphael.melotte at mind.be Fri Feb 16 21:13:42 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:42 +0100 Subject: [Buildroot] [PATCH 4/5] package/mupdf: bump to version 1.23.9 In-Reply-To: <20240216211344.1807353-1-raphael.melotte@mind.be> References: <20240216211344.1807353-1-raphael.melotte@mind.be> Message-ID: <20240216211344.1807353-5-raphael.melotte@mind.be> From: James Hilliard Drop patch which is now upstream. Signed-off-by: James Hilliard [bump to 1.23.9] Signed-off-by: Rapha?l M?lotte --- ...issing-limits.h-include-for-UINT_MAX.patch | 70 ------------------- package/mupdf/mupdf.hash | 4 +- package/mupdf/mupdf.mk | 2 +- 3 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch diff --git a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch deleted file mode 100644 index 95f2f86666..0000000000 --- a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch +++ /dev/null @@ -1,70 +0,0 @@ -From ebce9f1b129ebc8f2b17afa02a4ffcb9453c11d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= -Date: Mon, 24 Apr 2023 17:27:35 +0200 -Subject: [PATCH] Add missing limits.h include for UINT_MAX -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -encode-basic.c uses 'UINT_MAX', which is available in the 'limits.h' -header. - -In some configurations that build with zlib from [1], by chance -limits.h gets indirectly included when including 'z-imp.h' (the -includes are: 'z-imp.h' -> 'zlib.h' -> 'zconf.h' -> 'limits.h'), so -the build succeeds. - -When using other zlib implementations however (for example from [2]), -limits.h is not necessarily included indirectly, which leads to the -build failing in the following way: - -source/fitz/encode-basic.c: In function 'deflate_write': -source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function) - 343 | newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n); - | ^~~~~~~~ -source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header ''; did you forget to '#include '? - -Add the missing include, so that the build succeeds no matter if zlib -indirectly includes 'limit.h' or not. - -Similarly, also add it in output-ps.c where it's also missing. - -[1]: https://zlib.net/ -[2]: https://github.com/zlib-ng/zlib-ng - -Signed-off-by: Rapha?l M?lotte -Upstream: https://bugs.ghostscript.com/show_bug.cgi?id=706667 ---- - source/fitz/encode-basic.c | 2 ++ - source/fitz/output-ps.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/source/fitz/encode-basic.c b/source/fitz/encode-basic.c -index 03a4ff76b..84f0c35e6 100644 ---- a/source/fitz/encode-basic.c -+++ b/source/fitz/encode-basic.c -@@ -24,6 +24,8 @@ - - #include "z-imp.h" - -+#include -+ - struct ahx - { - fz_output *chain; -diff --git a/source/fitz/output-ps.c b/source/fitz/output-ps.c -index ef22c3cd6..3dc8ea17d 100644 ---- a/source/fitz/output-ps.c -+++ b/source/fitz/output-ps.c -@@ -24,6 +24,8 @@ - - #include "z-imp.h" - -+#include -+ - typedef struct ps_band_writer_s - { - fz_band_writer super; --- -2.39.1 - diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash index 1f636097ed..580235eeca 100644 --- a/package/mupdf/mupdf.hash +++ b/package/mupdf/mupdf.hash @@ -1,8 +1,8 @@ # From https://mupdf.com/downloads/index.html: -sha1 b9907729d604f0bf3846b45cd5891e10d7a66e24 mupdf-1.22.0-source.tar.lz +sha1 d79600bccd70ab9d0e8ee19dae4e275f2af95ced mupdf-1.23.9-source.tar.lz # Locally computed: -sha256 bed78a0abf8496b30c523497292de979db633eca57e02f6cd0f3c7c042551c3e mupdf-1.22.0-source.tar.lz +sha256 2c2f89deb9f425ba637dac226191d547f2b40975c4d21a340965f52c001e15c5 mupdf-1.23.9-source.tar.lz # Hash for license files: sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index d2105497be..17bd4320b9 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -5,7 +5,7 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -MUPDF_VERSION = 1.22.0 +MUPDF_VERSION = 1.23.9 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive MUPDF_LICENSE = AGPL-3.0+ -- 2.37.3 From raphael.melotte at mind.be Fri Feb 16 21:13:43 2024 From: raphael.melotte at mind.be (=?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?=) Date: Fri, 16 Feb 2024 22:13:43 +0100 Subject: [Buildroot] [PATCH 5/5] package/python-pymupdf: bump to version 1.23.22 In-Reply-To: <20240216211344.1807353-1-raphael.melotte@mind.be> References: <20240216211344.1807353-1-raphael.melotte@mind.be> Message-ID: <20240216211344.1807353-6-raphael.melotte@mind.be> From: James Hilliard The python-pymupdf and mupdf packages do not follow the exact same version numbers anymore. There is no specific mention of version compatibilities in the upstream package, so update our comment to just say that both should be "compatible" (to try to avoid one being updated without the other). Migrate to in tree pep517 based build backend. The hardcoded paths we used to remove from setup.py are no longer present, so the post-patch hook is removed. The new setup.py instead uses new environment variables which we now provide. The dependencies provided in the pyproject.toml are either not needed for us (for example, psutil is only needed to run one of the tests which we don't run), or are host dependencies already installed by buildroot (e.g. swig). Since the pep517 backend will check for them and fail, skip them all. This new python-pymupdf version fails at runtime when mupdf builds static libraries. This should not be possible as xorg anyway depends on !BR2_STATIC_LIBS, but let's be explicit and forbid python-pymupdf to be built with BR2_STATIC_LIBS as well. Note also that python-pymupdf is gradually switching to a new implementation that requires mupdf to be built with python bindings. For now, both implementations are still available but we only compile the old one. The runtime test is adapted accordingly as the legacy implementation has to be imported with "fitz_old". While at it, the dependencies are also split to one per line to make them easier to diff in the future. Signed-off-by: James Hilliard [Rapha?l: - fix cross-compilation - remove unneeded dependencies - update to 1.23.22 - update the commit message ] Signed-off-by: Rapha?l M?lotte --- package/mupdf/mupdf.mk | 2 +- ...w-providing-python-config-externally.patch | 125 ++++++++++++++++++ package/python-pymupdf/Config.in | 1 + package/python-pymupdf/python-pymupdf.hash | 4 +- package/python-pymupdf/python-pymupdf.mk | 31 ++--- .../tests/package/sample_python_pymupdf.py | 2 +- 6 files changed, 146 insertions(+), 19 deletions(-) create mode 100644 package/python-pymupdf/0001-pipcl.py-allow-providing-python-config-externally.patch diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 17bd4320b9..edc5bf7d3f 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -4,7 +4,7 @@ # ################################################################################ -# python-pymupdf's version must match mupdf's version +# python-pymupdf's version be compatible with mupdf's version MUPDF_VERSION = 1.23.9 MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive diff --git a/package/python-pymupdf/0001-pipcl.py-allow-providing-python-config-externally.patch b/package/python-pymupdf/0001-pipcl.py-allow-providing-python-config-externally.patch new file mode 100644 index 0000000000..2fd72c711e --- /dev/null +++ b/package/python-pymupdf/0001-pipcl.py-allow-providing-python-config-externally.patch @@ -0,0 +1,125 @@ +From ca3417b8d605ccdb2e6c516c5e0c79180381627c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Sun, 4 Feb 2024 16:13:45 +0100 +Subject: [PATCH] pipcl.py: allow providing python-config externally +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When cross-compiling (e.g. using Buildroot), the python-config +executable that resides next to the host python executable provides +incorrect includes (the ones for the host). + +Since the correct path to python-config cannot be guessed, add an +additional environment variable to allow setting the path to the +correct python-config executable externally. + +Signed-off-by: Rapha?l M?lotte +Upstream: https://github.com/pymupdf/PyMuPDF/pull/3173 +--- + pipcl.py | 72 +++++++++++++++++++++++++++++--------------------------- + setup.py | 3 +++ + 2 files changed, 40 insertions(+), 35 deletions(-) + +diff --git a/pipcl.py b/pipcl.py +index 209f660..c154774 100644 +--- a/pipcl.py ++++ b/pipcl.py +@@ -1789,43 +1789,45 @@ class PythonFlags: + self.ldflags = f'-L {_lib_dir}' + + else: +- # We use python-config which appears to work better than pkg-config +- # because it copes with multiple installed python's, e.g. +- # manylinux_2014's /opt/python/cp*-cp*/bin/python*. +- # +- # But... on non-macos it seems that we should not attempt to specify +- # libpython on the link command. The manylinux docker containers +- # don't actually contain libpython.so, and it seems that this +- # deliberate. And the link command runs ok. +- # +- python_exe = os.path.realpath( sys.executable) +- if darwin(): +- # Basic install of dev tools with `xcode-select --install` doesn't +- # seem to provide a `python3-config` or similar, but there is a +- # `python-config.py` accessible via sysconfig. ++ python_config = os.environ.get("PYMUPDF_PYTHON_CONFIG") ++ if not python_config: ++ # We use python-config which appears to work better than pkg-config ++ # because it copes with multiple installed python's, e.g. ++ # manylinux_2014's /opt/python/cp*-cp*/bin/python*. + # +- # We try different possibilities and use the last one that +- # works. ++ # But... on non-macos it seems that we should not attempt to specify ++ # libpython on the link command. The manylinux docker containers ++ # don't actually contain libpython.so, and it seems that this ++ # deliberate. And the link command runs ok. + # +- python_config = None +- for pc in ( +- f'python3-config', +- f'{sys.executable} {sysconfig.get_config_var("srcdir")}/python-config.py', +- f'{python_exe}-config', +- ): +- e = subprocess.run( +- f'{pc} --includes', +- shell=1, +- stdout=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- check=0, +- ).returncode +- log1(f'{e=} from {pc!r}.') +- if e == 0: +- python_config = pc +- assert python_config, f'Cannot find python-config' +- else: +- python_config = f'{python_exe}-config' ++ python_exe = os.path.realpath( sys.executable) ++ if darwin(): ++ # Basic install of dev tools with `xcode-select --install` doesn't ++ # seem to provide a `python3-config` or similar, but there is a ++ # `python-config.py` accessible via sysconfig. ++ # ++ # We try different possibilities and use the last one that ++ # works. ++ # ++ python_config = None ++ for pc in ( ++ f'python3-config', ++ f'{sys.executable} {sysconfig.get_config_var("srcdir")}/python-config.py', ++ f'{python_exe}-config', ++ ): ++ e = subprocess.run( ++ f'{pc} --includes', ++ shell=1, ++ stdout=subprocess.DEVNULL, ++ stderr=subprocess.DEVNULL, ++ check=0, ++ ).returncode ++ log1(f'{e=} from {pc!r}.') ++ if e == 0: ++ python_config = pc ++ assert python_config, f'Cannot find python-config' ++ else: ++ python_config = f'{python_exe}-config' + log1(f'Using {python_config=}.') + try: + self.includes = run( f'{python_config} --includes', capture=1).strip() +diff --git a/setup.py b/setup.py +index 23a5c78..4b3b5c7 100755 +--- a/setup.py ++++ b/setup.py +@@ -36,6 +36,9 @@ Environmental variables: + PYMUPDF_MUPDF_LIB + Directory containing MuPDF libraries, (libmupdf.so, + libmupdfcpp.so). ++ ++ PYMUPDF_PYTHON_CONFIG ++ Optional path to python-config. + + PYMUPDF_SETUP_IMPLEMENTATIONS + Must be one of 'a', 'b', 'ab'. If unset we use 'ab'. +-- +2.41.0 + diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index 3831a25451..cfdd38ebe4 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz depends on BR2_PACKAGE_XORG7 + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_HOST_SWIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash index 9fd8150088..341366d46f 100644 --- a/package/python-pymupdf/python-pymupdf.hash +++ b/package/python-pymupdf/python-pymupdf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymupdf/json -md5 468fe56375a1fca99e83fe0aa0b9f8bd PyMuPDF-1.22.0.tar.gz -sha256 6e1694e5c0cd8b92d503a506ee8e4ba1bed768528de586889d3ec90e9dc4a7d3 PyMuPDF-1.22.0.tar.gz +md5 5c219a0c4cb3d57b60e39cc901ebd220 PyMuPDF-1.23.22.tar.gz +sha256 c41cd91d83696cea67a4b6c65cc1951c2019ac0a561c5a3f543318ede30d3cd0 PyMuPDF-1.23.22.tar.gz # Locally computed sha256 checksums sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 639ce0e00e..0b26c925ea 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -4,26 +4,27 @@ # ################################################################################ -# python-pymupdf's version must match mupdf's version -PYTHON_PYMUPDF_VERSION = 1.22.0 +# python-pymupdf's version be compatible with mupdf's version +PYTHON_PYMUPDF_VERSION = 1.23.22 PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/28/ba/d6bb6fd678e8396d7b944870286fb25fd6f499b8cb599b5436c8f725adbf -PYTHON_PYMUPDF_SETUP_TYPE = setuptools +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/05/20/a0d1221d8f379afcc12b4d1687a8f4adb69eef659e835d781c3fa331ff46 +PYTHON_PYMUPDF_SETUP_TYPE = pep517 PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING # No license file included in pip, but it's present on github -PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib +PYTHON_PYMUPDF_DEPENDENCIES = \ + freetype \ + host-python-setuptools \ + host-swig \ + mupdf -PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" +PYTHON_PYMUPDF_BUILD_OPTS = --skip-dependency-check -# We need to remove the original paths as we provide them in the CFLAGS: -define PYTHON_PYMUPDF_REMOVE_PATHS - sed -i "/\/usr\/include\/mupdf/d" $(@D)/setup.py - sed -i "/\/usr\/include\/freetype2/d" $(@D)/setup.py - sed -i "/\/usr\/local\/include\/mupdf/d" $(@D)/setup.py - sed -i "/mupdf\/thirdparty\/freetype\/include/d" $(@D)/setup.py -endef - -PYTHON_PYMUPDF_POST_PATCH_HOOKS = PYTHON_PYMUPDF_REMOVE_PATHS +PYTHON_PYMUPDF_ENV = \ + PYMUPDF_INCLUDES="$(STAGING_DIR)/usr/include/freetype2:$(STAGING_DIR)/usr/include" \ + PYMUPDF_MUPDF_LIB="$(STAGING_DIR)/usr/lib" \ + PYMUPDF_PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config" \ + PYMUPDF_SETUP_IMPLEMENTATIONS=a \ + PYMUPDF_SETUP_MUPDF_BUILD= $(eval $(python-package)) diff --git a/support/testing/tests/package/sample_python_pymupdf.py b/support/testing/tests/package/sample_python_pymupdf.py index 574bd27965..ffcbfa1140 100644 --- a/support/testing/tests/package/sample_python_pymupdf.py +++ b/support/testing/tests/package/sample_python_pymupdf.py @@ -1,4 +1,4 @@ -import fitz +import fitz_old as fitz # Write a test PDF file outfile = "python-pymupdf.pdf" -- 2.37.3 From romain.naour at smile.fr Fri Feb 16 21:17:19 2024 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 16 Feb 2024 22:17:19 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <20240216201301.ftcjsjgepmcvd3pm@dasso> References: <20240213172817.2872849-1-romain.naour@smile.fr> <11856419bb18257086aaf4c5b45663cdae1292cc.camel@gmail.com> <63114771-4fb0-4b6f-bdac-e4363b4e9e52@smile.fr> <20240216201301.ftcjsjgepmcvd3pm@dasso> Message-ID: <721fd223-5b9e-4c71-9dd5-be7d850fd3fb@smile.fr> Hello Andreas, Le 16/02/2024 ? 21:13, Andreas Dannenberg a ?crit?: > On Thu, Feb 15, 2024 at 12:23:21PM +0100, Romain Naour wrote: >> Hi Alexander, >> >> Le 15/02/2024 ? 11:13, Alexander Sverdlin a ?crit?: >>> Hi Romain, >>> >>> On Tue, 2024-02-13 at 18:27 +0100, Romain Naour wrote: >>>>> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. >>>>> >>>>> This series start by adding U-boot binman support already submitted in the >>>>> preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi >>>>> [1], with small improvements. >>>>> See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] >>>>> >>>>> With binman support, we can add the TI K3 j721e SoC support by >>>>> providing all required firmware generated by the build. >>>>> >>>>> Add the new ti_j721e_sk_defconfig file to build a basic SD card image to >>>>> boot the board (serial debug and ethernet working). >>>>> >>>>> Thanks to binman support, we can remove the ti-k3-image-gen tool from >>>>> Buildroot. To do that, we have to update existing defconfig (am62, am64). >>>>> >>>>> Followup commits can improve TI K3 HS-FS devices based on binman instead >>>>> of legacy core-secdev-k3 tool. >>>>> >>>>> [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html >>>>> [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf >>>>> >>>>> Best regards, >>>>> Romain >>> >>> I have mixed feelings after testing the patchset on SK-AM62B... >>> It doesn't quite boot, refer to the boot log [1]. >>> Seems that U-Boot env is missing, maybe I'm missing some installation >>> step, but I do not see it mentioned in the documetation (for instance >>> of original commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig"). >>> >>> I'm not sure if this is a result of U-Boot update or if the current >>> master is broken as well. I'll be retesting it today and will get back to >>> you. >> >> It seems you are testing on a HS-FS device "AM62X SR1.0 HS-FS" while I only >> runtime tested this series on a SK-TDA4VM (GP: general pupose). >> >> Also the ti_am62x_sk_defconfig is expecting a GP SoC so you may have to >> customize the image generated in a post-build script? >> >> Maybe you have to replace the tiboot3.bin binary included by genimage with the >> one for the HS-FS variant ? >> >> for j721e: >> 285449 13 f?vr. 17:27 tiboot3.bin >> 285449 13 f?vr. 17:27 tiboot3-j721e-gp-evm.bin >> 286224 13 f?vr. 17:27 tiboot3-j721e_sr1_1-hs-evm.bin >> 286224 13 f?vr. 17:27 tiboot3-j721e_sr2-hs-fs-evm.bin >> >> for am62x: >> tiboot3.bin << should be the gp variant by default >> tiboot3-am62x-gp-evm.bin >> tiboot3-am62x-hs-fs-evm.bin >> >> Also, did you have the ti-k3-core-secdev package locally, it seems it's required >> for HS-FS SoC but the package is currently missing: >> >> http://lists.busybox.net/pipermail/buildroot/2024-February/685383.html >> >> Is ti-k3-core-secdev really required fllowing the switch to binman? >> (binman should sign all firmware binaries itself). > > We should see that we can remove/obsolete the ti-k3-core-secdev package > alongside the ti-k3-image-gen package, those are no longer needed since > we started using binman for the building the initial boot stage. Thank you for the clarification. Best regards, Romain > > -- > Andreas Dannenberg > Texas Instruments Inc > >> >>> >>> Fortunately this patchset is actually about building the images differently >>> and this part actually went smoothly, which is good. >> >> Thank you for testing, it help a lot! >> >> Maybe something is missing in this series to handle HS-FS device properly. >> >>> >>>>> Dario Binacchi (5): >>>>> ? package/python-attrs: add host variant >>>>> ? package/python-rpds-py: add host variant >>>>> ? package/python-referencing: add host variant >>>>> ? package/python-jsonschema-specifications: add host variant >>>>> ? package/python-jsonschema: add host variant >>>>> >>>>> Romain Naour (16): >>>>> ? DEVELOPERS: add Romain Naour for am574x_idk_defconfig >>>>> ? configs/ti_am62x_sk_defconfig: fix optee-os plateform >>>>> ? configs/ti_am64x_sk_defconfig: fix optee-os plateform >>>>> ? boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option >>>>> ? boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >>>>> ? boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to >>>>> ??? BINARIES_DIR >>>>> ? boot/ti-k3-boot-firmware: introduce >>>>> ??? BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} >>>>> ? boot/uboot: use DM firmware name defined by ti-k3-boot-firmware >>>>> ??? package >>>>> ? boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E >>>>> ? boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options >>>>> ? boot/uboot: enable TI K3 Device Manager (DM) for j721e >>>>> ? boot/ti-k3-boot-firmware: bump to version 09.02.00.004 >>>>> ? configs/ti_j721e_sk_defconfig: new defconfig >>>>> ? configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman >>>>> ??? tool >>>>> ? configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman >>>>> ??? tool >>>>> ? boot/ti-k3-image-gen: remove package >>>>> >>>>> ?Config.in.legacy????????????????????????????? |? 7 ++ >>>>> ?DEVELOPERS??????????????????????????????????? |? 6 +- >>>>> ?board/ti/j721e-sk/genimage.cfg??????????????? | 28 +++++++ >>>>> ?board/ti/j721e-sk/post-build.sh?????????????? | 16 ++++ >>>>> ?board/ti/j721e-sk/readme.txt????????????????? | 34 ++++++++ >>>>> ?boot/Config.in??????????????????????????????? |? 1 - >>>>> ?boot/ti-k3-boot-firmware/Config.in??????????? | 39 ++++++++++ >>>>> ?.../ti-k3-boot-firmware.hash????????????????? |? 2 +- >>>>> ?.../ti-k3-boot-firmware.mk??????????????????? | 16 ++-- >>>>> ?boot/ti-k3-image-gen/Config.in??????????????? | 77 ------------------- >>>>> ?boot/ti-k3-image-gen/ti-k3-image-gen.hash???? |? 3 - >>>>> ?boot/ti-k3-image-gen/ti-k3-image-gen.mk?????? | 54 ------------- >>>>> ?boot/ti-k3-r5-loader/Config.in??????????????? |? 8 ++ >>>>> ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk?????? | 23 ++++++ >>>>> ?boot/uboot/Config.in????????????????????????? | 27 ++++--- >>>>> ?boot/uboot/uboot.mk?????????????????????????? | 10 ++- >>>>> ?configs/ti_am62x_sk_defconfig???????????????? | 14 ++-- >>>>> ?configs/ti_am64x_sk_defconfig???????????????? | 14 ++-- >>>>> ?...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- >>>>> ?package/python-attrs/python-attrs.mk????????? |? 6 ++ >>>>> ?.../python-jsonschema-specifications.mk?????? | 10 +++ >>>>> ?.../python-jsonschema/python-jsonschema.mk??? | 14 ++++ >>>>> ?.../python-referencing/python-referencing.mk? | 11 +++ >>>>> ?package/python-rpds-py/python-rpds-py.mk????? |? 1 + >>>>> ?24 files changed, 275 insertions(+), 180 deletions(-) >>>>> ?create mode 100644 board/ti/j721e-sk/genimage.cfg >>>>> ?create mode 100755 board/ti/j721e-sk/post-build.sh >>>>> ?create mode 100644 board/ti/j721e-sk/readme.txt >>>>> ?delete mode 100644 boot/ti-k3-image-gen/Config.in >>>>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash >>>>> ?delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk >>>>> ?copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) >>>>> >>>>> -- >>>>> 2.43.0 >>>>> >>>>> _______________________________________________ >>>>> buildroot mailing list >>>>> buildroot at buildroot.org >>>>> https://lists.buildroot.org/mailman/listinfo/buildroot >>> >>> 1. Boot log: >>> >>> U-Boot SPL 2024.01 (Feb 15 2024 - 01:42:12 +0100) >>> SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') >>> SPL initial stack usage: 13400 bytes >>> Trying to boot from MMC2 >>> Authentication passed >>> Authentication passed >>> Authentication passed >>> Authentication passed >>> Authentication passed >>> Starting ATF on ARM64 core... >>> >>> NOTICE: BL31: v2.10.0 (release):v2.10 >>> NOTICE: BL31: Built : 01:28:38, Feb 15 2024 >>> I/TC: >>> I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1198-g18ff6d2643)) #1 Thu Feb 15 00:28:27 UTC 2024 aarch64 >>> I/TC: WARNING: This OP-TEE configuration might be insecure! >>> I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html >>> I/TC: Primary CPU initializing >>> I/TC: SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') >>> I/TC: HUK Initialized >>> I/TC: Activated SA2UL device >>> I/TC: Enabled firewalls for SA2UL TRNG device >>> I/TC: SA2UL TRNG initialized >>> I/TC: SA2UL Drivers initialized >>> I/TC: Primary CPU switching to normal world boot >>> >>> U-Boot SPL 2024.01 (Feb 15 2024 - 01:43:17 +0100) >>> SYSFW ABI: 3.1 (firmware rev 0x0009 '9.1.8--v09.01.08 (Kool Koala)') >>> SPL initial stack usage: 1872 bytes >>> Trying to boot from MMC2 >>> Authentication passed >>> Authentication passed >>> >>> >>> U-Boot 2024.01 (Feb 15 2024 - 01:43:17 +0100) >>> >>> SoC: AM62X SR1.0 HS-FS >>> Model: Texas Instruments AM625 SK >>> DRAM: 2 GiB >>> Core: 56 devices, 23 uclasses, devicetree: separate >>> MMC: mmc at fa10000: 0, mmc at fa00000: 1 >>> Loading Environment from nowhere... OK >>> In: serial at 2800000 >>> Out: serial at 2800000 >>> Err: serial at 2800000 >>> Net: eth0: ethernet at 8000000port@1 >>> Hit any key to stop autoboot: 0 >>> switch to partitions #0, OK >>> mmc1 is current device >>> SD/MMC found on device 1 >>> Failed to load 'uEnv.txt' >> >> Can you access to the mmc1 content manually ? >> I had to create a symlink due to "dtb" subdirectory expected by u-boot >> u-boot is looking at /boot/dtb/ti for devicetree. >> >> Best regards, >> Romain >> >> >>> Scanning for bootflows in all bootdevs >>> Seq Method State Uclass Part Name Filename >>> --- ----------- ------ -------- ---- ------------------------ ---------------- >>> Scanning global bootmeth 'efi_mgr': >>> No EFI system partition >>> No EFI system partition >>> Failed to persist EFI variables >>> Scanning bootdev 'mmc at fa00000.bootdev': >>> Scanning bootdev 'mmc at fa10000.bootdev': >>> Unknown uclass 'usb' in label >>> link up on port 1, speed 100, full duplex >>> BOOTP broadcast 1 >>> BOOTP broadcast 2 >>> BOOTP broadcast 3 >>> BOOTP broadcast 4 >>> BOOTP broadcast 5 >>> BOOTP broadcast 6 >>> BOOTP broadcast 7 >>> BOOTP broadcast 8 >>> BOOTP broadcast 9 >>> BOOTP broadcast 10 >>> BOOTP broadcast 11 >>> BOOTP broadcast 12 >>> BOOTP broadcast 13 >>> BOOTP broadcast 14 >>> BOOTP broadcast 15 >>> BOOTP broadcast 16 >>> BOOTP broadcast 17 >>> >>> Retry time exceeded; starting again >>> >>> >>> >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From fontaine.fabrice at gmail.com Fri Feb 16 21:18:13 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 16 Feb 2024 22:18:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/liburing: fix uclibc build Message-ID: <20240216211813.1846842-1-fontaine.fabrice@gmail.com> Fix the following build failure with uclibc-ng raised since bump to version 2.4 in commit 3cc1b539e7e9fd49f571441e395e7daa8597dbec and https://github.com/axboe/liburing/commit/c6bc86e2125bcd6fa10ff2b128cd86486acadff6: In file included from lib.h:12, from setup.c:4: arch/aarch64/lib.h:7:10: fatal error: sys/auxv.h: No such file or directory 7 | #include | ^~~~~~~~~~~~ Fixes: 3cc1b539e7e9fd49f571441e395e7daa8597dbec - http://autobuild.buildroot.org/results/cc44d714c9267dd7a98debeb8c81c4ee1efe4ebb Signed-off-by: Fabrice Fontaine --- ...01-src-arch-aarch64-fix-uclibc-build.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch diff --git a/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch b/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch new file mode 100644 index 0000000000..4468105e4f --- /dev/null +++ b/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch @@ -0,0 +1,39 @@ +From f03f8da34fe96ac35a916ca3058b0f41971eae3b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Feb 2024 18:59:42 +0100 +Subject: [PATCH] src/arch/aarch64: fix uclibc build + +Fix the following build failure with uclibc-ng raised since version 2.3 +and +https://github.com/axboe/liburing/commit/c6bc86e2125bcd6fa10ff2b128cd86486acadff6: + +In file included from lib.h:12, + from setup.c:4: +arch/aarch64/lib.h:7:10: fatal error: sys/auxv.h: No such file or directory + 7 | #include + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/cc44d714c9267dd7a98debeb8c81c4ee1efe4ebb + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/axboe/liburing/commit/32f9c27a76c43627f79bb77469d2da8583e4d3df +--- + src/arch/aarch64/lib.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/arch/aarch64/lib.h b/src/arch/aarch64/lib.h +index 3b701b1..41bcfc9 100644 +--- a/src/arch/aarch64/lib.h ++++ b/src/arch/aarch64/lib.h +@@ -4,7 +4,6 @@ + #define LIBURING_ARCH_AARCH64_LIB_H + + #include +-#include + #include "../../syscall.h" + + static inline long __get_page_size(void) +-- +2.43.0 + -- 2.43.0 From giulio.benetti at benettiengineering.com Fri Feb 16 21:25:43 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 16 Feb 2024 22:25:43 +0100 Subject: [Buildroot] [PATCH v2] package/attr: fix build failure on Microblaze architecture Message-ID: <20240216212543.474327-1-giulio.benetti@benettiengineering.com> On Microblaze architecture __has_attribute(__symver__) support is broken and always return true even if symver is not supported so let's add a local patch pending upstream to detect if symver is supported during autoreconf. Let's also add ATTR_AUTORECONF = YES to let patch to affect building. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Signed-off-by: Giulio Benetti --- V1->V2: * written commit log as suggested by Thomas(there was no commit log at all since this patch has been pointed during Buildroot Dev Days in IRC to me) * re-sent local patch to the correct maililng list and updated Upstream: URL --- ...dd-detection-of-symver-gcc-attribute.patch | 68 +++++++++++++++++++ package/attr/attr.mk | 3 + 2 files changed, 71 insertions(+) create mode 100644 package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch new file mode 100644 index 0000000000..ca773cf0fc --- /dev/null +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch @@ -0,0 +1,68 @@ +From 1be7c2251040f1152de9ceb5263e6e96fa5c3d75 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 15:33:15 +0100 +Subject: [PATCH] configure.ac: add detection of symver gcc attribute + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://lists.nongnu.org/archive/html/acl-devel/2024-02/msg00003.html + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Giulio Benetti +--- + configure.ac | 15 +++++++++++++++ + libattr/syscalls.c | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7e362e9..98477b5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,21 @@ AS_CASE([$host_os], + [linux*], [os_linux=yes]) + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) + ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, ++ gcc_cv_symver_attribute, ++ [cat > conftest.c </dev/null 2>&1; then \ ++ gcc_cv_symver_attribute=yes ++ fi ++ rm -f conftest.[cs] ++]) ++AS_IF([test $gcc_cv_symver_attribute = yes], ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) ++ + AC_CONFIG_COMMANDS([include/attr], + [dnl + rm -rf include/attr +diff --git a/libattr/syscalls.c b/libattr/syscalls.c +index 907560a..caa70bc 100644 +--- a/libattr/syscalls.c ++++ b/libattr/syscalls.c +@@ -32,7 +32,7 @@ + * fall back to traditional .symver asm directive otherwise. + */ + #ifdef __has_attribute +-# if __has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) + # elif __has_attribute(__no_reorder__) + /* +-- +2.43.0 + diff --git a/package/attr/attr.mk b/package/attr/attr.mk index d1397921ff..1d24144f46 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_CPE_ID_VALID = YES +# Flag added for patch dealing with symver in configure.ac +ATTR_AUTORECONF = YES + ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls -- 2.34.1 From romain.naour at smile.fr Fri Feb 16 21:38:42 2024 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 16 Feb 2024 22:38:42 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240216200635.crek5j23p3hybg2p@dasso> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <20240216200635.crek5j23p3hybg2p@dasso> Message-ID: Hello Andreas, Le 16/02/2024 ? 21:06, Andreas Dannenberg a ?crit?: > On Thu, Feb 15, 2024 at 11:20:50AM +0100, Alexander Sverdlin wrote: >> Hi Romain, >> >> On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >>> -choice >>> - prompt "Security type" >>> - help >>> - ? The target SoC security type option for image gen.? Valid >>> - ? options are "gp" for General Purpose devices, "hs-fs" for >>> - ? High Security - Field Securable devices, or "hs" for High >>> - ? Security - Security Enforcing devices.? Note for all High >>> - ? Security device variants the TI_SECURE_DEV_PKG environmental >>> - ? variable must be defined at build time pointing to a valid >>> - ? core-secdev-k3 folder location, otherwise the build will >>> - ? fail, see >>> - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >>> - >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>> - bool "gp" >>> - >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>> - bool "hs-fs" >>> - >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>> - bool "hs" >>> - >>> -endchoice >> >> another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y >> was the default, which didn't boot on my HS-FS SoC. >> >> You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the >> default for AM62x. I'm not sure if this is a problem, though. > > HS-FS should be the default for all TI AM6x devices. This is our > "production silicon" and what's used for (almost) all projects, > especially new projects. This being said having support for GP device > variants still is desirable for existing boards/projects, such as the > current BeaglePlay boards (amongst earlier version of TI starter kit > EVMs for AM6x). Thank you, I was not aware of this. I found your post in the TI forum about the recent switch from GP to HS-FS device in Yocto [1]. Currently existing am64/am62 defconfigs are still targeting GP devices but we should add additional commits to do the switch to HS-FS. What about other SoC of the K3 architecture? Is the DRA829/J721e device will also switch to HS-FS by default? >From the u-boot k3 documentation, it's not clear witch device type is used by default across all k3 SoC. By default I was expecting the GP type for all the k3 family (I was wrong). [1] https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto [2] https://source.denx.de/u-boot/u-boot/-/blob/master/doc/board/ti/k3.rst?ref_type=heads&plain=1#L108 Best regards, Romain > > -- > Andreas Dannenberg > Texas Instruments Inc > > >> >> -- >> Alexander Sverdlin. >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From romain.naour at smile.fr Fri Feb 16 21:52:21 2024 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 16 Feb 2024 22:52:21 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <20240216201903.lhhkjevrgzcp5msz@dasso> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240216201903.lhhkjevrgzcp5msz@dasso> Message-ID: <735636d6-c0f8-4226-ab8a-1576c2133189@smile.fr> Hello Andreas, Le 16/02/2024 ? 21:19, Andreas Dannenberg a ?crit?: > On Tue, Feb 13, 2024 at 06:27:56PM +0100, Romain Naour wrote: >> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. >> >> This series start by adding U-boot binman support already submitted in the >> preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi >> [1], with small improvements. >> See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > > Thanks Romain and Dario for all the work on this, and submitting this. > Will be spending some time over the next few days to see how I can help > out with this effort. I can already see many great improvements since > the last time I worked on AM62x/AM64x support last year. Your feed back on HS-FS devices is really helpful. Alexander Sverdlin also helped on AM62x. Maybe if you can also test on AM64x just to be sure the defconfig is working. For now, I need to rework AM64x/AM62x support since Alexander reported that his board doesn't boot the kernel. Best regards, Romain > > -- > Andreas Dannenberg > Texas Instruments Inc > > > >> >> With binman support, we can add the TI K3 j721e SoC support by >> providing all required firmware generated by the build. >> >> Add the new ti_j721e_sk_defconfig file to build a basic SD card image to >> boot the board (serial debug and ethernet working). >> >> Thanks to binman support, we can remove the ti-k3-image-gen tool from >> Buildroot. To do that, we have to update existing defconfig (am62, am64). >> >> Followup commits can improve TI K3 HS-FS devices based on binman instead >> of legacy core-secdev-k3 tool. >> >> [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html >> [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf >> >> Best regards, >> Romain >> >> Dario Binacchi (5): >> package/python-attrs: add host variant >> package/python-rpds-py: add host variant >> package/python-referencing: add host variant >> package/python-jsonschema-specifications: add host variant >> package/python-jsonschema: add host variant >> >> Romain Naour (16): >> DEVELOPERS: add Romain Naour for am574x_idk_defconfig >> configs/ti_am62x_sk_defconfig: fix optee-os plateform >> configs/ti_am64x_sk_defconfig: fix optee-os plateform >> boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option >> boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >> boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to >> BINARIES_DIR >> boot/ti-k3-boot-firmware: introduce >> BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} >> boot/uboot: use DM firmware name defined by ti-k3-boot-firmware >> package >> boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E >> boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options >> boot/uboot: enable TI K3 Device Manager (DM) for j721e >> boot/ti-k3-boot-firmware: bump to version 09.02.00.004 >> configs/ti_j721e_sk_defconfig: new defconfig >> configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman >> tool >> configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman >> tool >> boot/ti-k3-image-gen: remove package >> >> Config.in.legacy | 7 ++ >> DEVELOPERS | 6 +- >> board/ti/j721e-sk/genimage.cfg | 28 +++++++ >> board/ti/j721e-sk/post-build.sh | 16 ++++ >> board/ti/j721e-sk/readme.txt | 34 ++++++++ >> boot/Config.in | 1 - >> boot/ti-k3-boot-firmware/Config.in | 39 ++++++++++ >> .../ti-k3-boot-firmware.hash | 2 +- >> .../ti-k3-boot-firmware.mk | 16 ++-- >> boot/ti-k3-image-gen/Config.in | 77 ------------------- >> boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - >> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ------------- >> boot/ti-k3-r5-loader/Config.in | 8 ++ >> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 23 ++++++ >> boot/uboot/Config.in | 27 ++++--- >> boot/uboot/uboot.mk | 10 ++- >> configs/ti_am62x_sk_defconfig | 14 ++-- >> configs/ti_am64x_sk_defconfig | 14 ++-- >> ...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- >> package/python-attrs/python-attrs.mk | 6 ++ >> .../python-jsonschema-specifications.mk | 10 +++ >> .../python-jsonschema/python-jsonschema.mk | 14 ++++ >> .../python-referencing/python-referencing.mk | 11 +++ >> package/python-rpds-py/python-rpds-py.mk | 1 + >> 24 files changed, 275 insertions(+), 180 deletions(-) >> create mode 100644 board/ti/j721e-sk/genimage.cfg >> create mode 100755 board/ti/j721e-sk/post-build.sh >> create mode 100644 board/ti/j721e-sk/readme.txt >> delete mode 100644 boot/ti-k3-image-gen/Config.in >> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash >> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk >> copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) >> >> -- >> 2.43.0 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From kilian.zinnecker at mail.de Fri Feb 16 22:17:38 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Fri, 16 Feb 2024 23:17:38 +0100 Subject: [Buildroot] [PATCH v2] configs/rock5b_defconfig: switch to mainline linux Message-ID: <20240216221738.693818-1-kilian.zinnecker@mail.de> This patch switches the board support of the Radxa Rock 5B from using a custom kernel to mainline linux 6.7.4. Thereby patches, which became redundant, are removed, as well as device tree modifications and no longer needed hash files. The needed ethernet drivers are activated via the kernel config fragment file. Also the board support is switched from using a uboot script and a uEnv file to using extlinux. Signed-off-by: Kilian Zinnecker --- v1 -> v2: - removed unnecessary hash files (uboot, kernel) and removed hash enforcement (BR2_DOWNLOAD_FOCE_CHECK_HASHES) - bumped uboot from 2023.07 to latest version (currently 2024.01) - removed BR2_SYSTEM_DHCP as it is not needed for minimal config - specified kernel header version in defconfig - rearranged defconfig as in roc_pc_rk3399_defconfig - switched from uboot script + uEnv to extlinux.conf: removed fit image script, changed readme to list the correct output/image artifacts, removed post-image.sh, added post-build.sh, removed vfat partition from genimage.cfg, added extlinux.conf, removed boot.cmd board/radxa/rock5b/boot.cmd | 3 - board/radxa/rock5b/extlinux.conf | 4 ++ board/radxa/rock5b/genimage.cfg | 16 ----- board/radxa/rock5b/linux.fragment | 5 +- ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- ...x-building-error-on-Werror-array-com.patch | 43 ------------- board/radxa/rock5b/patches/linux/linux.hash | 2 - board/radxa/rock5b/patches/uboot/uboot.hash | 2 - board/radxa/rock5b/post-build.sh | 5 ++ board/radxa/rock5b/post-image.sh | 7 -- board/radxa/rock5b/readme.txt | 51 +-------------- board/radxa/rock5b/rock5b.dts | 12 ---- board/radxa/rock5b/rock5b.its | 46 ------------- configs/rock5b_defconfig | 60 ++++++++--------- 14 files changed, 44 insertions(+), 276 deletions(-) delete mode 100644 board/radxa/rock5b/boot.cmd create mode 100644 board/radxa/rock5b/extlinux.conf delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch delete mode 100644 board/radxa/rock5b/patches/linux/linux.hash delete mode 100644 board/radxa/rock5b/patches/uboot/uboot.hash create mode 100755 board/radxa/rock5b/post-build.sh delete mode 100755 board/radxa/rock5b/post-image.sh delete mode 100644 board/radxa/rock5b/rock5b.dts delete mode 100644 board/radxa/rock5b/rock5b.its diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd deleted file mode 100644 index 9a3e73e003..0000000000 --- a/board/radxa/rock5b/boot.cmd +++ /dev/null @@ -1,3 +0,0 @@ -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait -fatload mmc 1:1 ${loadaddr} image.itb -bootm ${loadaddr} diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf new file mode 100644 index 0000000000..a1a531f038 --- /dev/null +++ b/board/radxa/rock5b/extlinux.conf @@ -0,0 +1,4 @@ +label Radxa Rock 5b Linux + kernel /boot/Image + devicetree /boot/rk3588-rock-5b.dtb + append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait diff --git a/board/radxa/rock5b/genimage.cfg b/board/radxa/rock5b/genimage.cfg index 2943232fc3..138ec26e3a 100644 --- a/board/radxa/rock5b/genimage.cfg +++ b/board/radxa/rock5b/genimage.cfg @@ -1,15 +1,5 @@ # SD card image for Radxa Rock 5b -image boot.vfat { - vfat { - files = { - "image.itb", - "boot.scr" - } - } - size = 16M -} - image sdcard.img { hdimage { partition-table-type = "hybrid" @@ -21,12 +11,6 @@ image sdcard.img { offset = 32K } - partition boot { - partition-type = "0xC" - bootable = "true" - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext2" diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 28bb373ef2..90f2f291ba 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1,5 +1,2 @@ CONFIG_R8169=y -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set -# Disable Rockchip specific WiFi drivers, as the kernel -# code cannot be build with GCC 12 due to several Werrors -# CONFIG_WL_ROCKCHIP is not set +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch deleted file mode 100644 index 5632c5a627..0000000000 --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 -From: Kees Cook -Date: Sat, 12 Feb 2022 09:14:49 -0800 -Subject: etherdevice: Adjust ether_addr* prototypes to silence - -Wstringop-overead -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With GCC 12, -Wstringop-overread was warning about an implicit cast from -char[6] to char[8]. However, the extra 2 bytes are always thrown away, -alignment doesn't matter, and the risk of hitting the edge of unallocated -memory has been accepted, so this prototype can just be converted to a -regular char *. Silences: - -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], - | ^~~~~~~~~~~~~~~~~~~~~~~ - -Reported-by: Marc Kleine-Budde -Tested-by: Marc Kleine-Budde -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de -Cc: Jakub Kicinski -Cc: "David S. Miller" -Cc: netdev at vger.kernel.org -Signed-off-by: Kees Cook -Signed-off-by: David S. Miller -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd -Signed-off-by: Kilian Zinnecker ---- - include/linux/etherdevice.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h -index 2ad71cc90b37d..92b10e67d5f87 100644 ---- a/include/linux/etherdevice.h -+++ b/include/linux/etherdevice.h -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) - #endif - } - --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - #ifdef __BIG_ENDIAN -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. - */ - --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], -- const u8 addr2[6+2]) -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch deleted file mode 100644 index 10de6c72d3..0000000000 --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 -From: Xiongwei Song -Date: Fri, 14 Jan 2022 14:07:24 -0800 -Subject: mm: page_alloc: fix building error on -Werror=array-compare - -Arthur Marsh reported we would hit the error below when building kernel -with gcc-12: - - CC mm/page_alloc.o - mm/page_alloc.c: In function `mem_init_print_info': - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] - 8173 | if (start <= pos && pos < end && size > adj) \ - | - -In C++20, the comparision between arrays should be warned. - -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com -Signed-off-by: Xiongwei Song -Reported-by: Arthur Marsh -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f -Signed-off-by: Kilian Zinnecker ---- - mm/page_alloc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 806f317c2e7e2..c4ef450ac4428 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) - */ - #define adj_init_size(start, end, size, pos, adj) \ - do { \ -- if (start <= pos && pos < end && size > adj) \ -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ - size -= adj; \ - } while (0) - --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash deleted file mode 100644 index 95ad749554..0000000000 --- a/board/radxa/rock5b/patches/linux/linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash deleted file mode 100644 index efd629bd2f..0000000000 --- a/board/radxa/rock5b/patches/uboot/uboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 12e921b466ae731cdbc355e6832b7f22bc90b01aeceef9886f98aaba7b394300 u-boot-2023.07.tar.bz2 diff --git a/board/radxa/rock5b/post-build.sh b/board/radxa/rock5b/post-build.sh new file mode 100755 index 0000000000..d84a5da0b0 --- /dev/null +++ b/board/radxa/rock5b/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/board/radxa/rock5b/post-image.sh b/board/radxa/rock5b/post-image.sh deleted file mode 100755 index c706a5ee78..0000000000 --- a/board/radxa/rock5b/post-image.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -e - -gzip -fk "${BINARIES_DIR}/Image" -cp board/radxa/rock5b/rock5b.its "${BINARIES_DIR}" -(cd "${BINARIES_DIR}" && mkimage -f rock5b.its image.itb) -support/scripts/genimage.sh -c board/radxa/rock5b/genimage.cfg diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index b3eb06851a..441c28db25 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -13,21 +13,15 @@ Files created in output directory output/images . ??? Image -??? Image.gz -??? boot.scr -??? boot.vfat -??? image.itb -??? rk3588-rock-5b.dtb ??? rk3588_bl31_v1.40.elf ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin -??? rock5b.dts -??? rock5b.its +??? rk3588-rock-5b.dtb ??? rootfs.ext2 ??? rootfs.ext4 ??? rootfs.tar ??? sdcard.img -??? u-boot-rockchip.bin -??? u-boot.bin +??? u-boot.bin +??? u-boot-rockchip.bin Creating bootable SD card: ========================== @@ -61,42 +55,3 @@ Enter 'root' as login user, and the prompt is ready. wiki link: ---------- https://forum.radxa.com/c/rock5 - -Issues: -======= - -WiFi ----- -The custom Radxa kernel provides custom code to support WiFi. However, -that code does not compile with GCC 12, which is the current default -version in buildroot. Hence, the WiFi kernel drivers are disabled, until -the issues get fixed (if ever). If they are desperately needed, one may -apply the following workaround, as long as buildroot still supports GCC -version 11: - -1. Set GCC version 11, by adding the following line to -configs/rock5b_defconfig: - -BR2_GCC_VERSION_11_X=y - -2. Re-enable custom WiFi drivers by removing the following line from -board/radxa/rock5b/linux.fragment: - -# CONFIG_WL_ROCKCHIP is not set - -Rockchip FIQ Debugger ---------------------- -The custom kernel used for this board features an FIQ debugger, which -can be activated by typing "fiq" on the serial interface. As this can be -annoying if a user wants to type these charakters and it is not needed -for most users, this board support disables the FIQ debugger by default. -To re-enable the FIQ debugger follow the steps: - -1. In board/radxa/rock5b/rock5b.dts set the status property of the -fiq_debugger node to "okay" and set the status property of the uart2 -node to "disabled" - -2. Re-enable the fiq debugger module by removing the following line -from board/radxa/rock5b/linux.fragment: - -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts deleted file mode 100644 index 71a4e42b5e..0000000000 --- a/board/radxa/rock5b/rock5b.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -#include "rockchip/rk3588-rock-5b.dts" - -&fiq_debugger { - status = "disabled"; -}; - -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; -}; diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its deleted file mode 100644 index 9ce235d041..0000000000 --- a/board/radxa/rock5b/rock5b.its +++ /dev/null @@ -1,46 +0,0 @@ -/dts-v1/; - -/ { - description = "Rock 5B FIT Image"; - #address-cells = <1>; - - images { - kernel { - description = "Kernel"; - data = /incbin/("Image.gz"); - type = "kernel"; - arch = "arm64"; - os = "linux"; - compression = "gzip"; - load = <0x0a200000>; - entry = <0x0a200000>; - hash { - algo = "sha256"; - }; - }; - fdt { - description = "Device Tree"; - data = /incbin/("rock5b.dtb"); - type = "flat_dt"; - arch = "arm64"; - compression = "none"; - load = <0x0e000000>; - entry = <0x0e000000>; - hash { - algo = "sha256"; - }; - }; - }; - - configurations { - default = "standard"; - standard { - description = "Standard Boot"; - kernel = "kernel"; - fdt = "fdt"; - hash { - algo = "sha256"; - }; - }; - }; -}; diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 7175aa66bf..d4bc6cf29a 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -1,43 +1,45 @@ +# Architecture BR2_aarch64=y BR2_cortex_a76_a55=y -BR2_KERNEL_HEADERS_5_10=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="" -BR2_TARGET_GENERIC_HOSTNAME="rock5b" -BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" -BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_SYSTEM_DHCP="eth0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="250M" + +# Linux headers same as kernel, a 6.7 series +BR2_KERNEL_HEADERS_6_7=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" +BR2_TARGET_UBOOT_LATEST_VERSION=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7.4" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="rock5b" +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/radxa/rock5b/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_DTC=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_ROCKCHIP_RKBIN=y -BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" -BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock5b/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" -- 2.34.1 From dannenberg at ti.com Fri Feb 16 22:20:12 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Fri, 16 Feb 2024 16:20:12 -0600 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <735636d6-c0f8-4226-ab8a-1576c2133189@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240216201903.lhhkjevrgzcp5msz@dasso> <735636d6-c0f8-4226-ab8a-1576c2133189@smile.fr> Message-ID: <20240216222012.eaes5ktamizu6n5c@dasso> On Fri, Feb 16, 2024 at 10:52:21PM +0100, Romain Naour wrote: > Hello Andreas, > > Le 16/02/2024 ? 21:19, Andreas Dannenberg a ?crit?: > > On Tue, Feb 13, 2024 at 06:27:56PM +0100, Romain Naour wrote: > >> This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > >> > >> This series start by adding U-boot binman support already submitted in the > >> preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > >> [1], with small improvements. > >> See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > > > > Thanks Romain and Dario for all the work on this, and submitting this. > > Will be spending some time over the next few days to see how I can help > > out with this effort. I can already see many great improvements since > > the last time I worked on AM62x/AM64x support last year. > > Your feed back on HS-FS devices is really helpful. Alexander Sverdlin also > helped on AM62x. > > Maybe if you can also test on AM64x just to be sure the defconfig is working. I'm planning on testing the entire series here pretty soon and will provide feedback (I have access to any and all boards:) One of the things I'm trying to assess is what's still missing vs. the previous attempt I made upstreaming this. For example, AM62x graphics isn't there yet (ti-rogue-km / ti-rogue-um). -- Andreas Dannenberg Texas Instruments Inc > > For now, I need to rework AM64x/AM62x support since Alexander reported that his > board doesn't boot the kernel. > > Best regards, > Romain > > > > > > -- > > Andreas Dannenberg > > Texas Instruments Inc > > > > > > > >> > >> With binman support, we can add the TI K3 j721e SoC support by > >> providing all required firmware generated by the build. > >> > >> Add the new ti_j721e_sk_defconfig file to build a basic SD card image to > >> boot the board (serial debug and ethernet working). > >> > >> Thanks to binman support, we can remove the ti-k3-image-gen tool from > >> Buildroot. To do that, we have to update existing defconfig (am62, am64). > >> > >> Followup commits can improve TI K3 HS-FS devices based on binman instead > >> of legacy core-secdev-k3 tool. > >> > >> [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html > >> [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > >> > >> Best regards, > >> Romain > >> > >> Dario Binacchi (5): > >> package/python-attrs: add host variant > >> package/python-rpds-py: add host variant > >> package/python-referencing: add host variant > >> package/python-jsonschema-specifications: add host variant > >> package/python-jsonschema: add host variant > >> > >> Romain Naour (16): > >> DEVELOPERS: add Romain Naour for am574x_idk_defconfig > >> configs/ti_am62x_sk_defconfig: fix optee-os plateform > >> configs/ti_am64x_sk_defconfig: fix optee-os plateform > >> boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > >> boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > >> boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to > >> BINARIES_DIR > >> boot/ti-k3-boot-firmware: introduce > >> BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} > >> boot/uboot: use DM firmware name defined by ti-k3-boot-firmware > >> package > >> boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > >> boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options > >> boot/uboot: enable TI K3 Device Manager (DM) for j721e > >> boot/ti-k3-boot-firmware: bump to version 09.02.00.004 > >> configs/ti_j721e_sk_defconfig: new defconfig > >> configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman > >> tool > >> configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman > >> tool > >> boot/ti-k3-image-gen: remove package > >> > >> Config.in.legacy | 7 ++ > >> DEVELOPERS | 6 +- > >> board/ti/j721e-sk/genimage.cfg | 28 +++++++ > >> board/ti/j721e-sk/post-build.sh | 16 ++++ > >> board/ti/j721e-sk/readme.txt | 34 ++++++++ > >> boot/Config.in | 1 - > >> boot/ti-k3-boot-firmware/Config.in | 39 ++++++++++ > >> .../ti-k3-boot-firmware.hash | 2 +- > >> .../ti-k3-boot-firmware.mk | 16 ++-- > >> boot/ti-k3-image-gen/Config.in | 77 ------------------- > >> boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - > >> boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ------------- > >> boot/ti-k3-r5-loader/Config.in | 8 ++ > >> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 23 ++++++ > >> boot/uboot/Config.in | 27 ++++--- > >> boot/uboot/uboot.mk | 10 ++- > >> configs/ti_am62x_sk_defconfig | 14 ++-- > >> configs/ti_am64x_sk_defconfig | 14 ++-- > >> ...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- > >> package/python-attrs/python-attrs.mk | 6 ++ > >> .../python-jsonschema-specifications.mk | 10 +++ > >> .../python-jsonschema/python-jsonschema.mk | 14 ++++ > >> .../python-referencing/python-referencing.mk | 11 +++ > >> package/python-rpds-py/python-rpds-py.mk | 1 + > >> 24 files changed, 275 insertions(+), 180 deletions(-) > >> create mode 100644 board/ti/j721e-sk/genimage.cfg > >> create mode 100755 board/ti/j721e-sk/post-build.sh > >> create mode 100644 board/ti/j721e-sk/readme.txt > >> delete mode 100644 boot/ti-k3-image-gen/Config.in > >> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > >> delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk > >> copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) > >> > >> -- > >> 2.43.0 > >> > >> _______________________________________________ > >> buildroot mailing list > >> buildroot at buildroot.org > >> https://lists.buildroot.org/mailman/listinfo/buildroot > From kilian.zinnecker at mail.de Fri Feb 16 22:30:42 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Fri, 16 Feb 2024 23:30:42 +0100 Subject: [Buildroot] [PATCH] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <58E9CC6C-0DA1-42B9-AA17-3435786DCBDC@benettiengineering.com> References: <20240215214341.6137-1-kilian.zinnecker@mail.de> <58E9CC6C-0DA1-42B9-AA17-3435786DCBDC@benettiengineering.com> Message-ID: <1881605.CQOukoFCf9@laptop> Hello Giulio, thanks for reviewing! I made changes according to your comments and sent a v2 of the patch. [--SNIP--] > It would be great if you switch to extlinux that is easier for debugging and > here you only override bootargs so you can add environment uboot variables > file. Switching to extlinux played out very nicely: A lot of files became redundant and this decluttered the board support. Thanks! I have a question though: Is it possible to specify in extlinux.conf, that uboot shall fetch the kernel image and device tree via tftp? How would an example of such an extlinux.conf look like? Best regards, Kilian From giulio.benetti at benettiengineering.com Fri Feb 16 22:37:49 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 16 Feb 2024 23:37:49 +0100 Subject: [Buildroot] [PATCH v2] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <20240216221738.693818-1-kilian.zinnecker@mail.de> References: <20240216221738.693818-1-kilian.zinnecker@mail.de> Message-ID: <05ae161a-0e1c-4cd5-92d1-4fd5b7d8c798@benettiengineering.com> Hi Kilian, almost there, 2 comments below, On 16/02/24 23:17, Kilian Zinnecker via buildroot wrote: > This patch switches the board support of the Radxa Rock 5B from > using a custom kernel to mainline linux 6.7.4. Thereby patches, > which became redundant, are removed, as well as device tree > modifications and no longer needed hash files. The needed ethernet > drivers are activated via the kernel config fragment file. Also the > board support is switched from using a uboot script and a uEnv file > to using extlinux. > > Signed-off-by: Kilian Zinnecker > > --- > > v1 -> v2: > > - removed unnecessary hash files (uboot, kernel) and removed hash > enforcement (BR2_DOWNLOAD_FOCE_CHECK_HASHES) > - bumped uboot from 2023.07 to latest version (currently 2024.01) > - removed BR2_SYSTEM_DHCP as it is not needed for minimal config > - specified kernel header version in defconfig > - rearranged defconfig as in roc_pc_rk3399_defconfig > - switched from uboot script + uEnv to extlinux.conf: removed fit > image script, changed readme to list the correct output/image > artifacts, removed post-image.sh, added post-build.sh, removed > vfat partition from genimage.cfg, added extlinux.conf, removed > boot.cmd > > board/radxa/rock5b/boot.cmd | 3 - > board/radxa/rock5b/extlinux.conf | 4 ++ > board/radxa/rock5b/genimage.cfg | 16 ----- > board/radxa/rock5b/linux.fragment | 5 +- > ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- > ...x-building-error-on-Werror-array-com.patch | 43 ------------- > board/radxa/rock5b/patches/linux/linux.hash | 2 - > board/radxa/rock5b/patches/uboot/uboot.hash | 2 - > board/radxa/rock5b/post-build.sh | 5 ++ > board/radxa/rock5b/post-image.sh | 7 -- > board/radxa/rock5b/readme.txt | 51 +-------------- > board/radxa/rock5b/rock5b.dts | 12 ---- > board/radxa/rock5b/rock5b.its | 46 ------------- > configs/rock5b_defconfig | 60 ++++++++--------- > 14 files changed, 44 insertions(+), 276 deletions(-) > delete mode 100644 board/radxa/rock5b/boot.cmd > create mode 100644 board/radxa/rock5b/extlinux.conf > delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > delete mode 100644 board/radxa/rock5b/patches/linux/linux.hash > delete mode 100644 board/radxa/rock5b/patches/uboot/uboot.hash > create mode 100755 board/radxa/rock5b/post-build.sh > delete mode 100755 board/radxa/rock5b/post-image.sh > delete mode 100644 board/radxa/rock5b/rock5b.dts > delete mode 100644 board/radxa/rock5b/rock5b.its > > diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd > deleted file mode 100644 > index 9a3e73e003..0000000000 > --- a/board/radxa/rock5b/boot.cmd > +++ /dev/null > @@ -1,3 +0,0 @@ > -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait > -fatload mmc 1:1 ${loadaddr} image.itb > -bootm ${loadaddr} > diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf > new file mode 100644 > index 0000000000..a1a531f038 > --- /dev/null > +++ b/board/radxa/rock5b/extlinux.conf > @@ -0,0 +1,4 @@ > +label Radxa Rock 5b Linux > + kernel /boot/Image > + devicetree /boot/rk3588-rock-5b.dtb > + append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait > diff --git a/board/radxa/rock5b/genimage.cfg b/board/radxa/rock5b/genimage.cfg > index 2943232fc3..138ec26e3a 100644 > --- a/board/radxa/rock5b/genimage.cfg > +++ b/board/radxa/rock5b/genimage.cfg > @@ -1,15 +1,5 @@ > # SD card image for Radxa Rock 5b > > -image boot.vfat { > - vfat { > - files = { > - "image.itb", > - "boot.scr" > - } > - } > - size = 16M > -} > - > image sdcard.img { > hdimage { > partition-table-type = "hybrid" > @@ -21,12 +11,6 @@ image sdcard.img { > offset = 32K > } > > - partition boot { > - partition-type = "0xC" > - bootable = "true" > - image = "boot.vfat" > - } > - > partition rootfs { > partition-type = 0x83 > image = "rootfs.ext2" > diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment > index 28bb373ef2..90f2f291ba 100644 > --- a/board/radxa/rock5b/linux.fragment > +++ b/board/radxa/rock5b/linux.fragment > @@ -1,5 +1,2 @@ > CONFIG_R8169=y > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > -# Disable Rockchip specific WiFi drivers, as the kernel > -# code cannot be build with GCC 12 due to several Werrors > -# CONFIG_WL_ROCKCHIP is not set > +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y > diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > deleted file mode 100644 > index 5632c5a627..0000000000 > --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 > -From: Kees Cook > -Date: Sat, 12 Feb 2022 09:14:49 -0800 > -Subject: etherdevice: Adjust ether_addr* prototypes to silence > - -Wstringop-overead > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -With GCC 12, -Wstringop-overread was warning about an implicit cast from > -char[6] to char[8]. However, the extra 2 bytes are always thrown away, > -alignment doesn't matter, and the risk of hitting the edge of unallocated > -memory has been accepted, so this prototype can just be converted to a > -regular char *. Silences: > - > -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] > - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); > - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? > - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > - | ^~~~~~~~~~~~~~~~~~~~~~~ > - > -Reported-by: Marc Kleine-Budde > -Tested-by: Marc Kleine-Budde > -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de > -Cc: Jakub Kicinski > -Cc: "David S. Miller" > -Cc: netdev at vger.kernel.org > -Signed-off-by: Kees Cook > -Signed-off-by: David S. Miller > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd > -Signed-off-by: Kilian Zinnecker > ---- > - include/linux/etherdevice.h | 5 ++--- > - 1 file changed, 2 insertions(+), 3 deletions(-) > - > -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h > -index 2ad71cc90b37d..92b10e67d5f87 100644 > ---- a/include/linux/etherdevice.h > -+++ b/include/linux/etherdevice.h > -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) > - #endif > - } > - > --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) > -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - #ifdef __BIG_ENDIAN > -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) > - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. > - */ > - > --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > -- const u8 addr2[6+2]) > -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > deleted file mode 100644 > index 10de6c72d3..0000000000 > --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 > -From: Xiongwei Song > -Date: Fri, 14 Jan 2022 14:07:24 -0800 > -Subject: mm: page_alloc: fix building error on -Werror=array-compare > - > -Arthur Marsh reported we would hit the error below when building kernel > -with gcc-12: > - > - CC mm/page_alloc.o > - mm/page_alloc.c: In function `mem_init_print_info': > - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] > - 8173 | if (start <= pos && pos < end && size > adj) \ > - | > - > -In C++20, the comparision between arrays should be warned. > - > -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com > -Signed-off-by: Xiongwei Song > -Reported-by: Arthur Marsh > -Signed-off-by: Andrew Morton > -Signed-off-by: Linus Torvalds > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f > -Signed-off-by: Kilian Zinnecker > ---- > - mm/page_alloc.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/mm/page_alloc.c b/mm/page_alloc.c > -index 806f317c2e7e2..c4ef450ac4428 100644 > ---- a/mm/page_alloc.c > -+++ b/mm/page_alloc.c > -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) > - */ > - #define adj_init_size(start, end, size, pos, adj) \ > - do { \ > -- if (start <= pos && pos < end && size > adj) \ > -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ > - size -= adj; \ > - } while (0) > - > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash > deleted file mode 100644 > index 95ad749554..0000000000 > --- a/board/radxa/rock5b/patches/linux/linux.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Locally calculated > -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz > diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash > deleted file mode 100644 > index efd629bd2f..0000000000 > --- a/board/radxa/rock5b/patches/uboot/uboot.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Locally calculated > -sha256 12e921b466ae731cdbc355e6832b7f22bc90b01aeceef9886f98aaba7b394300 u-boot-2023.07.tar.bz2 > diff --git a/board/radxa/rock5b/post-build.sh b/board/radxa/rock5b/post-build.sh > new file mode 100755 > index 0000000000..d84a5da0b0 > --- /dev/null > +++ b/board/radxa/rock5b/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf > diff --git a/board/radxa/rock5b/post-image.sh b/board/radxa/rock5b/post-image.sh > deleted file mode 100755 > index c706a5ee78..0000000000 > --- a/board/radxa/rock5b/post-image.sh > +++ /dev/null > @@ -1,7 +0,0 @@ > -#!/usr/bin/env bash > -set -e > - > -gzip -fk "${BINARIES_DIR}/Image" > -cp board/radxa/rock5b/rock5b.its "${BINARIES_DIR}" > -(cd "${BINARIES_DIR}" && mkimage -f rock5b.its image.itb) > -support/scripts/genimage.sh -c board/radxa/rock5b/genimage.cfg > diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt > index b3eb06851a..441c28db25 100644 > --- a/board/radxa/rock5b/readme.txt > +++ b/board/radxa/rock5b/readme.txt > @@ -13,21 +13,15 @@ Files created in output directory > output/images > . > ??? Image > -??? Image.gz > -??? boot.scr > -??? boot.vfat > -??? image.itb > -??? rk3588-rock-5b.dtb > ??? rk3588_bl31_v1.40.elf > ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin > -??? rock5b.dts > -??? rock5b.its > +??? rk3588-rock-5b.dtb > ??? rootfs.ext2 > ??? rootfs.ext4 > ??? rootfs.tar > ??? sdcard.img > -??? u-boot-rockchip.bin > -??? u-boot.bin > +??? u-boot.bin > +??? u-boot-rockchip.bin > > Creating bootable SD card: > ========================== > @@ -61,42 +55,3 @@ Enter 'root' as login user, and the prompt is ready. > wiki link: > ---------- > https://forum.radxa.com/c/rock5 > - > -Issues: > -======= > - > -WiFi > ----- > -The custom Radxa kernel provides custom code to support WiFi. However, > -that code does not compile with GCC 12, which is the current default > -version in buildroot. Hence, the WiFi kernel drivers are disabled, until > -the issues get fixed (if ever). If they are desperately needed, one may > -apply the following workaround, as long as buildroot still supports GCC > -version 11: > - > -1. Set GCC version 11, by adding the following line to > -configs/rock5b_defconfig: > - > -BR2_GCC_VERSION_11_X=y > - > -2. Re-enable custom WiFi drivers by removing the following line from > -board/radxa/rock5b/linux.fragment: > - > -# CONFIG_WL_ROCKCHIP is not set > - > -Rockchip FIQ Debugger > ---------------------- > -The custom kernel used for this board features an FIQ debugger, which > -can be activated by typing "fiq" on the serial interface. As this can be > -annoying if a user wants to type these charakters and it is not needed > -for most users, this board support disables the FIQ debugger by default. > -To re-enable the FIQ debugger follow the steps: > - > -1. In board/radxa/rock5b/rock5b.dts set the status property of the > -fiq_debugger node to "okay" and set the status property of the uart2 > -node to "disabled" > - > -2. Re-enable the fiq debugger module by removing the following line > -from board/radxa/rock5b/linux.fragment: > - > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts > deleted file mode 100644 > index 71a4e42b5e..0000000000 > --- a/board/radxa/rock5b/rock5b.dts > +++ /dev/null > @@ -1,12 +0,0 @@ > -/dts-v1/; > - > -#include "rockchip/rk3588-rock-5b.dts" > - > -&fiq_debugger { > - status = "disabled"; > -}; > - > -&uart2 { > - pinctrl-0 = <&uart2m0_xfer>; > - status = "okay"; > -}; > diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its > deleted file mode 100644 > index 9ce235d041..0000000000 > --- a/board/radxa/rock5b/rock5b.its > +++ /dev/null > @@ -1,46 +0,0 @@ > -/dts-v1/; > - > -/ { > - description = "Rock 5B FIT Image"; > - #address-cells = <1>; > - > - images { > - kernel { > - description = "Kernel"; > - data = /incbin/("Image.gz"); > - type = "kernel"; > - arch = "arm64"; > - os = "linux"; > - compression = "gzip"; > - load = <0x0a200000>; > - entry = <0x0a200000>; > - hash { > - algo = "sha256"; > - }; > - }; > - fdt { > - description = "Device Tree"; > - data = /incbin/("rock5b.dtb"); > - type = "flat_dt"; > - arch = "arm64"; > - compression = "none"; > - load = <0x0e000000>; > - entry = <0x0e000000>; > - hash { > - algo = "sha256"; > - }; > - }; > - }; > - > - configurations { > - default = "standard"; > - standard { > - description = "Standard Boot"; > - kernel = "kernel"; > - fdt = "fdt"; > - hash { > - algo = "sha256"; > - }; > - }; > - }; > -}; > diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig > index 7175aa66bf..d4bc6cf29a 100644 > --- a/configs/rock5b_defconfig > +++ b/configs/rock5b_defconfig > @@ -1,43 +1,45 @@ > +# Architecture > BR2_aarch64=y > BR2_cortex_a76_a55=y > -BR2_KERNEL_HEADERS_5_10=y > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="" > -BR2_TARGET_GENERIC_HOSTNAME="rock5b" > -BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" > -BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" > -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > -BR2_SYSTEM_DHCP="eth0" > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" > -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set > -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" > -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > -BR2_TARGET_ROOTFS_EXT2_SIZE="250M" > + > +# Linux headers same as kernel, a 6.7 series > +BR2_KERNEL_HEADERS_6_7=y Here you have to specify: BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" > +BR2_TARGET_UBOOT_LATEST_VERSION=y Here ^^^ you have to specify: BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" Never rely on _LATEST because that changes while Buildroot advances. So today UBOOT_LATEST_VERSION means 2024.01, one day it will be 2024.04, but while providing defconfigs we need to create something reproducible, that's why we have to provide specific CUSTOM_VERSION. > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y > +BR2_PACKAGE_ROCKCHIP_RKBIN=y > +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" > +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7.4" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" > +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" > + > +# Filesystem > +BR2_TARGET_GENERIC_HOSTNAME="rock5b" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" > BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/radxa/rock5b/boot.cmd" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_DTC=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_ROCKCHIP_RKBIN=y > -BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" > -BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock5b/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" Also this ^^^ is a good practice IMHO. Good clean up! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From giulio.benetti at benettiengineering.com Fri Feb 16 23:09:08 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 17 Feb 2024 00:09:08 +0100 Subject: [Buildroot] [PATCH] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <1881605.CQOukoFCf9@laptop> References: <1881605.CQOukoFCf9@laptop> Message-ID: Hi Kilian, > Il giorno 16 feb 2024, alle ore 23:30, Kilian Zinnecker ha scritto: > > ?Hello Giulio, > > thanks for reviewing! I made changes according to your comments and sent a v2 > of the patch. > > [--SNIP--] > >> It would be great if you switch to extlinux that is easier for debugging and >> here you only override bootargs so you can add environment uboot variables >> file. > > Switching to extlinux played out very nicely: A lot of files became redundant > and this decluttered the board support. Exactly :-) > Thanks! No problem > > I have a question though: Is it possible to specify in extlinux.conf, that > uboot shall fetch the kernel image and device tree via tftp? How would an > example of such an extlinux.conf look like? Here [0] they explain pretty well the difference between extlinux and boot.cmd and they also point that they can be used together, of course depending on the uboot environment variables. Another chance is to specify: BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE=?uEnv.txt? And place the resulting uEnv.bin into genimage.cfg on a known address uboot will pick environment variables from. This is another way to get what you were trying to do before using uEnv.txt, but you need to find or specify the following 2 uboot options: CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xC0000 in a uboot.fragment This ^^^ is an example and so in genimage.cfg you add something like: partition uboot-env { image = "uboot-env.bin" offset = 768K size = 8K } That way in the resulting image at 0xC0000(768K) uboot will find the environment variables including the commands to run if you specify bootcmd. [0]: https://developer.toradex.com/linux-bsp/os-development/boot/distro-boot/#boot-sequence Best regards Giulio > > Best regards, > Kilian > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From dannenberg at ti.com Fri Feb 16 20:19:03 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Fri, 16 Feb 2024 14:19:03 -0600 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <20240213172817.2872849-1-romain.naour@smile.fr> References: <20240213172817.2872849-1-romain.naour@smile.fr> Message-ID: <20240216201903.lhhkjevrgzcp5msz@dasso> On Tue, Feb 13, 2024 at 06:27:56PM +0100, Romain Naour wrote: > This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > > This series start by adding U-boot binman support already submitted in the > preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > [1], with small improvements. > See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] Thanks Romain and Dario for all the work on this, and submitting this. Will be spending some time over the next few days to see how I can help out with this effort. I can already see many great improvements since the last time I worked on AM62x/AM64x support last year. -- Andreas Dannenberg Texas Instruments Inc > > With binman support, we can add the TI K3 j721e SoC support by > providing all required firmware generated by the build. > > Add the new ti_j721e_sk_defconfig file to build a basic SD card image to > boot the board (serial debug and ethernet working). > > Thanks to binman support, we can remove the ti-k3-image-gen tool from > Buildroot. To do that, we have to update existing defconfig (am62, am64). > > Followup commits can improve TI K3 HS-FS devices based on binman instead > of legacy core-secdev-k3 tool. > > [1] http://lists.busybox.net/pipermail/buildroot/2023-December/681139.html > [2] https://fosdem.org/2024/events/attachments/fosdem-2024-3067-standardizing-the-generation-and-signing-of-boot-images/slides/22808/FOSDEM24_Speaker_Slides_y7FsIKM.pdf > > Best regards, > Romain > > Dario Binacchi (5): > package/python-attrs: add host variant > package/python-rpds-py: add host variant > package/python-referencing: add host variant > package/python-jsonschema-specifications: add host variant > package/python-jsonschema: add host variant > > Romain Naour (16): > DEVELOPERS: add Romain Naour for am574x_idk_defconfig > configs/ti_am62x_sk_defconfig: fix optee-os plateform > configs/ti_am64x_sk_defconfig: fix optee-os plateform > boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to > BINARIES_DIR > boot/ti-k3-boot-firmware: introduce > BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_{AM62AX,AM62X,AM64X,AM65X} > boot/uboot: use DM firmware name defined by ti-k3-boot-firmware > package > boot/ti-k3-boot-firmware: add BR2_TARGET_TI_K3_BOOT_FIRMWARE_SOC_J721E > boot/uboot: replace ti-k3-image-gen options by ti-k3-firmware options > boot/uboot: enable TI K3 Device Manager (DM) for j721e > boot/ti-k3-boot-firmware: bump to version 09.02.00.004 > configs/ti_j721e_sk_defconfig: new defconfig > configs/ti_am62x_sk_defconfig: update to uboot 2024.01 to use binman > tool > configs/ti_am64x_sk_defconfig: update to uboot 2024.01 to use binman > tool > boot/ti-k3-image-gen: remove package > > Config.in.legacy | 7 ++ > DEVELOPERS | 6 +- > board/ti/j721e-sk/genimage.cfg | 28 +++++++ > board/ti/j721e-sk/post-build.sh | 16 ++++ > board/ti/j721e-sk/readme.txt | 34 ++++++++ > boot/Config.in | 1 - > boot/ti-k3-boot-firmware/Config.in | 39 ++++++++++ > .../ti-k3-boot-firmware.hash | 2 +- > .../ti-k3-boot-firmware.mk | 16 ++-- > boot/ti-k3-image-gen/Config.in | 77 ------------------- > boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ------------- > boot/ti-k3-r5-loader/Config.in | 8 ++ > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 23 ++++++ > boot/uboot/Config.in | 27 ++++--- > boot/uboot/uboot.mk | 10 ++- > configs/ti_am62x_sk_defconfig | 14 ++-- > configs/ti_am64x_sk_defconfig | 14 ++-- > ...62x_sk_defconfig => ti_j721e_sk_defconfig} | 34 ++++---- > package/python-attrs/python-attrs.mk | 6 ++ > .../python-jsonschema-specifications.mk | 10 +++ > .../python-jsonschema/python-jsonschema.mk | 14 ++++ > .../python-referencing/python-referencing.mk | 11 +++ > package/python-rpds-py/python-rpds-py.mk | 1 + > 24 files changed, 275 insertions(+), 180 deletions(-) > create mode 100644 board/ti/j721e-sk/genimage.cfg > create mode 100755 board/ti/j721e-sk/post-build.sh > create mode 100644 board/ti/j721e-sk/readme.txt > delete mode 100644 boot/ti-k3-image-gen/Config.in > delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash > delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk > copy configs/{ti_am62x_sk_defconfig => ti_j721e_sk_defconfig} (54%) > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From alexander.sverdlin at gmail.com Sat Feb 17 03:13:16 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 04:13:16 +0100 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <20240216222012.eaes5ktamizu6n5c@dasso> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240216201903.lhhkjevrgzcp5msz@dasso> <735636d6-c0f8-4226-ab8a-1576c2133189@smile.fr> <20240216222012.eaes5ktamizu6n5c@dasso> Message-ID: <3570b01e6a258bbafa2d6317ba8619ecb39f66ec.camel@gmail.com> Hello Andreas, On Fri, 2024-02-16 at 16:20 -0600, Andreas Dannenberg wrote: > On Fri, Feb 16, 2024 at 10:52:21PM +0100, Romain Naour wrote: > > Hello Andreas, > > > > Le 16/02/2024 ? 21:19, Andreas Dannenberg a ?crit?: > > > On Tue, Feb 13, 2024 at 06:27:56PM +0100, Romain Naour wrote: > > > > This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > > > > > > > > This series start by adding U-boot binman support already submitted in the > > > > preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > > > > [1], with small improvements. > > > > See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > > > > > > Thanks Romain and Dario for all the work on this, and submitting this. > > > Will be spending some time over the next few days to see how I can help > > > out with this effort. I can already see many great improvements since > > > the last time I worked on AM62x/AM64x support last year. > > > > Your feed back on HS-FS devices is really helpful. Alexander Sverdlin also > > helped on AM62x. > > > > Maybe if you can also test on AM64x just to be sure the defconfig is working. > > I'm planning on testing the entire series here pretty soon and will > provide feedback (I have access to any and all boards:) > > One of the things I'm trying to assess is what's still missing vs. the > previous attempt I made upstreaming this. For example, AM62x graphics > isn't there yet (ti-rogue-km / ti-rogue-um). maybe you could shed some light onto the AM62x situation. My conclusion is that since your initial buildroot BSP U-Boot has been switched to standard boot (CONFIG_BOOTSTD), refer to (U-Boot repo): commit 355c0afcd4b7c8c442c4d03e07649c24194b8e06 Author: Nishanth Menon Date: Fri Aug 25 13:02:52 2023 -0500 configs: am62x_evm_a53_defconfig: Switch to bootstd and commit ab54d9b28d8578cc43b214d39009e7b1def797e4 Author: Roger Quadros Date: Thu Oct 5 16:06:41 2023 +0300 board: ti: am62x: am62x.env: Fix boot_targets ti_mmc is not a valid boot_target for standard boot flow so I suppose TI's BSP still uses older U-Boot and is still not affected. Do we need uEnv.txt now? Do you have an idea which distro Nishanth may have tested with BOOTSTD change? -- Alexander Sverdlin. From kilian.zinnecker at mail.de Sat Feb 17 08:35:25 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sat, 17 Feb 2024 09:35:25 +0100 Subject: [Buildroot] [PATCH v3] configs/rock5b_defconfig: switch to mainline linux Message-ID: <20240217083525.561684-1-kilian.zinnecker@mail.de> This patch switches the board support of the Radxa Rock 5B from using a custom kernel to mainline linux 6.7.4. Thereby patches, which became redundant, are removed, as well as device tree modifications and no longer needed hash files. The needed ethernet drivers are activated via the kernel config fragment file. Also the board support is switched from using a uboot script and a uEnv file to using extlinux. Signed-off-by: Kilian Zinnecker --- v2 -> v3: - rock5b_defconfig: change BR2_KERNEL_HEADERS_6_7 to BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 - rock5b_defconfig: change uboot version from "latest" to fixed 2024.01 v1 -> v2: - removed unnecessary hash files (uboot, kernel) and removed hash enforcement (BR2_DOWNLOAD_FOCE_CHECK_HASHES) - bumped uboot from 2023.07 to latest version (currently 2024.01) - removed BR2_SYSTEM_DHCP as it is not needed for minimal config - specified kernel header version in defconfig - rearranged defconfig as in roc_pc_rk3399_defconfig - switched from uboot script + uEnv to extlinux.conf: removed fit image script, changed readme to list the correct output/image artifacts, removed post-image.sh, added post-build.sh, removed vfat partition from genimage.cfg, added extlinux.conf, removed boot.cmd board/radxa/rock5b/boot.cmd | 3 - board/radxa/rock5b/extlinux.conf | 4 ++ board/radxa/rock5b/genimage.cfg | 16 ----- board/radxa/rock5b/linux.fragment | 5 +- ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- ...x-building-error-on-Werror-array-com.patch | 43 ------------- board/radxa/rock5b/patches/linux/linux.hash | 2 - board/radxa/rock5b/patches/uboot/uboot.hash | 2 - board/radxa/rock5b/post-build.sh | 5 ++ board/radxa/rock5b/post-image.sh | 7 -- board/radxa/rock5b/readme.txt | 51 +-------------- board/radxa/rock5b/rock5b.dts | 12 ---- board/radxa/rock5b/rock5b.its | 46 ------------- configs/rock5b_defconfig | 59 +++++++++-------- 14 files changed, 44 insertions(+), 275 deletions(-) delete mode 100644 board/radxa/rock5b/boot.cmd create mode 100644 board/radxa/rock5b/extlinux.conf delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch delete mode 100644 board/radxa/rock5b/patches/linux/linux.hash delete mode 100644 board/radxa/rock5b/patches/uboot/uboot.hash create mode 100755 board/radxa/rock5b/post-build.sh delete mode 100755 board/radxa/rock5b/post-image.sh delete mode 100644 board/radxa/rock5b/rock5b.dts delete mode 100644 board/radxa/rock5b/rock5b.its diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd deleted file mode 100644 index 9a3e73e003..0000000000 --- a/board/radxa/rock5b/boot.cmd +++ /dev/null @@ -1,3 +0,0 @@ -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait -fatload mmc 1:1 ${loadaddr} image.itb -bootm ${loadaddr} diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf new file mode 100644 index 0000000000..a1a531f038 --- /dev/null +++ b/board/radxa/rock5b/extlinux.conf @@ -0,0 +1,4 @@ +label Radxa Rock 5b Linux + kernel /boot/Image + devicetree /boot/rk3588-rock-5b.dtb + append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait diff --git a/board/radxa/rock5b/genimage.cfg b/board/radxa/rock5b/genimage.cfg index 2943232fc3..138ec26e3a 100644 --- a/board/radxa/rock5b/genimage.cfg +++ b/board/radxa/rock5b/genimage.cfg @@ -1,15 +1,5 @@ # SD card image for Radxa Rock 5b -image boot.vfat { - vfat { - files = { - "image.itb", - "boot.scr" - } - } - size = 16M -} - image sdcard.img { hdimage { partition-table-type = "hybrid" @@ -21,12 +11,6 @@ image sdcard.img { offset = 32K } - partition boot { - partition-type = "0xC" - bootable = "true" - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext2" diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment index 28bb373ef2..90f2f291ba 100644 --- a/board/radxa/rock5b/linux.fragment +++ b/board/radxa/rock5b/linux.fragment @@ -1,5 +1,2 @@ CONFIG_R8169=y -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set -# Disable Rockchip specific WiFi drivers, as the kernel -# code cannot be build with GCC 12 due to several Werrors -# CONFIG_WL_ROCKCHIP is not set +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch deleted file mode 100644 index 5632c5a627..0000000000 --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 -From: Kees Cook -Date: Sat, 12 Feb 2022 09:14:49 -0800 -Subject: etherdevice: Adjust ether_addr* prototypes to silence - -Wstringop-overead -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With GCC 12, -Wstringop-overread was warning about an implicit cast from -char[6] to char[8]. However, the extra 2 bytes are always thrown away, -alignment doesn't matter, and the risk of hitting the edge of unallocated -memory has been accepted, so this prototype can just be converted to a -regular char *. Silences: - -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], - | ^~~~~~~~~~~~~~~~~~~~~~~ - -Reported-by: Marc Kleine-Budde -Tested-by: Marc Kleine-Budde -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de -Cc: Jakub Kicinski -Cc: "David S. Miller" -Cc: netdev at vger.kernel.org -Signed-off-by: Kees Cook -Signed-off-by: David S. Miller -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd -Signed-off-by: Kilian Zinnecker ---- - include/linux/etherdevice.h | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h -index 2ad71cc90b37d..92b10e67d5f87 100644 ---- a/include/linux/etherdevice.h -+++ b/include/linux/etherdevice.h -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) - #endif - } - --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - #ifdef __BIG_ENDIAN -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. - */ - --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], -- const u8 addr2[6+2]) -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) - { - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch deleted file mode 100644 index 10de6c72d3..0000000000 --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 -From: Xiongwei Song -Date: Fri, 14 Jan 2022 14:07:24 -0800 -Subject: mm: page_alloc: fix building error on -Werror=array-compare - -Arthur Marsh reported we would hit the error below when building kernel -with gcc-12: - - CC mm/page_alloc.o - mm/page_alloc.c: In function `mem_init_print_info': - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] - 8173 | if (start <= pos && pos < end && size > adj) \ - | - -In C++20, the comparision between arrays should be warned. - -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com -Signed-off-by: Xiongwei Song -Reported-by: Arthur Marsh -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f -Signed-off-by: Kilian Zinnecker ---- - mm/page_alloc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 806f317c2e7e2..c4ef450ac4428 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) - */ - #define adj_init_size(start, end, size, pos, adj) \ - do { \ -- if (start <= pos && pos < end && size > adj) \ -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ - size -= adj; \ - } while (0) - --- -cgit - diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash deleted file mode 100644 index 95ad749554..0000000000 --- a/board/radxa/rock5b/patches/linux/linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash deleted file mode 100644 index efd629bd2f..0000000000 --- a/board/radxa/rock5b/patches/uboot/uboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 12e921b466ae731cdbc355e6832b7f22bc90b01aeceef9886f98aaba7b394300 u-boot-2023.07.tar.bz2 diff --git a/board/radxa/rock5b/post-build.sh b/board/radxa/rock5b/post-build.sh new file mode 100755 index 0000000000..d84a5da0b0 --- /dev/null +++ b/board/radxa/rock5b/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf diff --git a/board/radxa/rock5b/post-image.sh b/board/radxa/rock5b/post-image.sh deleted file mode 100755 index c706a5ee78..0000000000 --- a/board/radxa/rock5b/post-image.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -e - -gzip -fk "${BINARIES_DIR}/Image" -cp board/radxa/rock5b/rock5b.its "${BINARIES_DIR}" -(cd "${BINARIES_DIR}" && mkimage -f rock5b.its image.itb) -support/scripts/genimage.sh -c board/radxa/rock5b/genimage.cfg diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt index b3eb06851a..441c28db25 100644 --- a/board/radxa/rock5b/readme.txt +++ b/board/radxa/rock5b/readme.txt @@ -13,21 +13,15 @@ Files created in output directory output/images . ??? Image -??? Image.gz -??? boot.scr -??? boot.vfat -??? image.itb -??? rk3588-rock-5b.dtb ??? rk3588_bl31_v1.40.elf ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin -??? rock5b.dts -??? rock5b.its +??? rk3588-rock-5b.dtb ??? rootfs.ext2 ??? rootfs.ext4 ??? rootfs.tar ??? sdcard.img -??? u-boot-rockchip.bin -??? u-boot.bin +??? u-boot.bin +??? u-boot-rockchip.bin Creating bootable SD card: ========================== @@ -61,42 +55,3 @@ Enter 'root' as login user, and the prompt is ready. wiki link: ---------- https://forum.radxa.com/c/rock5 - -Issues: -======= - -WiFi ----- -The custom Radxa kernel provides custom code to support WiFi. However, -that code does not compile with GCC 12, which is the current default -version in buildroot. Hence, the WiFi kernel drivers are disabled, until -the issues get fixed (if ever). If they are desperately needed, one may -apply the following workaround, as long as buildroot still supports GCC -version 11: - -1. Set GCC version 11, by adding the following line to -configs/rock5b_defconfig: - -BR2_GCC_VERSION_11_X=y - -2. Re-enable custom WiFi drivers by removing the following line from -board/radxa/rock5b/linux.fragment: - -# CONFIG_WL_ROCKCHIP is not set - -Rockchip FIQ Debugger ---------------------- -The custom kernel used for this board features an FIQ debugger, which -can be activated by typing "fiq" on the serial interface. As this can be -annoying if a user wants to type these charakters and it is not needed -for most users, this board support disables the FIQ debugger by default. -To re-enable the FIQ debugger follow the steps: - -1. In board/radxa/rock5b/rock5b.dts set the status property of the -fiq_debugger node to "okay" and set the status property of the uart2 -node to "disabled" - -2. Re-enable the fiq debugger module by removing the following line -from board/radxa/rock5b/linux.fragment: - -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts deleted file mode 100644 index 71a4e42b5e..0000000000 --- a/board/radxa/rock5b/rock5b.dts +++ /dev/null @@ -1,12 +0,0 @@ -/dts-v1/; - -#include "rockchip/rk3588-rock-5b.dts" - -&fiq_debugger { - status = "disabled"; -}; - -&uart2 { - pinctrl-0 = <&uart2m0_xfer>; - status = "okay"; -}; diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its deleted file mode 100644 index 9ce235d041..0000000000 --- a/board/radxa/rock5b/rock5b.its +++ /dev/null @@ -1,46 +0,0 @@ -/dts-v1/; - -/ { - description = "Rock 5B FIT Image"; - #address-cells = <1>; - - images { - kernel { - description = "Kernel"; - data = /incbin/("Image.gz"); - type = "kernel"; - arch = "arm64"; - os = "linux"; - compression = "gzip"; - load = <0x0a200000>; - entry = <0x0a200000>; - hash { - algo = "sha256"; - }; - }; - fdt { - description = "Device Tree"; - data = /incbin/("rock5b.dtb"); - type = "flat_dt"; - arch = "arm64"; - compression = "none"; - load = <0x0e000000>; - entry = <0x0e000000>; - hash { - algo = "sha256"; - }; - }; - }; - - configurations { - default = "standard"; - standard { - description = "Standard Boot"; - kernel = "kernel"; - fdt = "fdt"; - hash { - algo = "sha256"; - }; - }; - }; -}; diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 7175aa66bf..4014311a06 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -1,43 +1,46 @@ +# Architecture BR2_aarch64=y BR2_cortex_a76_a55=y -BR2_KERNEL_HEADERS_5_10=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="" -BR2_TARGET_GENERIC_HOSTNAME="rock5b" -BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" -BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_SYSTEM_DHCP="eth0" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="250M" + +# Linux headers same as kernel, a 6.7 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN=y +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7.4" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="rock5b" +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/radxa/rock5b/boot.cmd" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_DTC=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_ROCKCHIP_RKBIN=y -BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" -BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock5b/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" -- 2.34.1 From kilian.zinnecker at mail.de Sat Feb 17 08:37:27 2024 From: kilian.zinnecker at mail.de (Kilian Zinnecker) Date: Sat, 17 Feb 2024 09:37:27 +0100 Subject: [Buildroot] [PATCH v2] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <05ae161a-0e1c-4cd5-92d1-4fd5b7d8c798@benettiengineering.com> References: <20240216221738.693818-1-kilian.zinnecker@mail.de> <05ae161a-0e1c-4cd5-92d1-4fd5b7d8c798@benettiengineering.com> Message-ID: <2718217.mvXUDI8C0e@laptop> Hello Giulio, all, > Hi Kilian, > > almost there, 2 comments below, [--SNIP --] I addressed the 2 issues and send a v3. Thanks for reviewing! Best regards, Kilian From frank.vanbever at mind.be Sat Feb 17 09:24:13 2024 From: frank.vanbever at mind.be (Frank Vanbever) Date: Sat, 17 Feb 2024 10:24:13 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodsecurity: security bump to 3.0.12 Message-ID: <20240217092413.288309-1-frank.vanbever@mind.be> The project has been transferred from Trustwave (SpiderLabs) to OWASP, hence the change in URLs. The upstream CPE vendor ID will likely also change in the future but the upstream is still working on this [1]. - Fixes: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-1019 [1] https://github.com/owasp-modsecurity/ModSecurity/issues/3083 Signed-off-by: Frank Vanbever --- package/libmodsecurity/Config.in | 2 +- package/libmodsecurity/libmodsecurity.hash | 5 +++-- package/libmodsecurity/libmodsecurity.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index 69bb0494cc..da14b21669 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBMODSECURITY SecRules format and apply them to HTTP content provided by your application via Connectors. - https://github.com/SpiderLabs/ModSecurity + https://github.com/owasp-modsecurity/ModSecurity comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index b0a1bf33f3..2221a8a37d 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.11/modsecurity-v3.0.11.tar.gz.sha256 -sha256 070f46c779d30785b95eb1316b46e2e4e6f90fd94a96aaca4bd54cd94738b692 modsecurity-v3.0.11.tar.gz +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 +sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz + # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 548eeb8602..d8c10b98b2 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.11 +LIBMODSECURITY_VERSION = 3.0.12 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz -LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) +LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE -- 2.40.1 From christian at aperture.us Sat Feb 17 09:32:33 2024 From: christian at aperture.us (Christian Stewart) Date: Sat, 17 Feb 2024 01:32:33 -0800 Subject: [Buildroot] build failure on Ubuntu 22.04 LTS: TIME_BITS=64 is allowed only with FILE_OFFSET_BITS=64 Message-ID: On a fresh Ubuntu 22.04.4 LTS VM: git clone https://github.com/buildroot/buildroot cd buildroot # master as of this e-mail git checkout 6c455505eb5ed8ed5bbf090f2bfb6241c9f153a2 cat <> defconfig BR2_arm=y BR2_cortex_a7=y BR2_BINUTILS_VERSION_2_41_X=y BR2_GCC_VERSION_13_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_CCACHE=y BR2_PACKAGE_SUDO=y EOF make defconfig BR2_DEFCONFIG=defconfig # fails with error shown below make sudo I was able to fix it with this patch, but I'm not sure if this is the "correct" fix: >From 6dc2b9350ceffc808fe7d048ff9dbe585649c304 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 17 Feb 2024 01:16:09 -0800 Subject: [PATCH] package/Makefile.in: fix build failure on Ubuntu 22.04 LTS Add flags for 64 bit timestamps when building host packages. -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 Build failure fixed: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" Fixes: https://github.com/skiffos/SkiffOS/issues/306 Signed-off-by: Christian Stewart --- package/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index 3e276d23d6..82d3a435fd 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -246,7 +246,7 @@ UNZIP := $(shell which unzip || type -p unzip) -q APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s) -HOST_CPPFLAGS = -I$(HOST_DIR)/include +HOST_CPPFLAGS = -I$(HOST_DIR)/include -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 HOST_CFLAGS ?= -O2 HOST_CFLAGS += $(HOST_CPPFLAGS) HOST_CXXFLAGS += $(HOST_CFLAGS) -- 2.43.1 Thanks, Christian Stewart -------------- next part -------------- An HTML attachment was scrubbed... URL: From christian at aperture.us Sat Feb 17 10:28:25 2024 From: christian at aperture.us (Christian Stewart) Date: Sat, 17 Feb 2024 02:28:25 -0800 Subject: [Buildroot] build failure on Ubuntu 22.04 LTS: TIME_BITS=64 is allowed only with FILE_OFFSET_BITS=64 In-Reply-To: References: Message-ID: Hi, The fix I included in the e-mail below does not work in all cases. This works to specifically fix the sudo build failure on Ubuntu 22.04.4 LTS: On Sat, Feb 17, 2024 at 1:32?AM Christian Stewart wrote: > > On a fresh Ubuntu 22.04.4 LTS VM: > > git clone https://github.com/buildroot/buildroot > cd buildroot > > # master as of this e-mail > git checkout 6c455505eb5ed8ed5bbf090f2bfb6241c9f153a2 > > cat <> defconfig > BR2_arm=y > BR2_cortex_a7=y > BR2_BINUTILS_VERSION_2_41_X=y > BR2_GCC_VERSION_13_X=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_CCACHE=y > BR2_PACKAGE_SUDO=y > EOF > > make defconfig BR2_DEFCONFIG=defconfig > > # fails with error shown below > make sudo > Here is an alternative fix which patches Sudo specifically: >From 3e39260ea5ee16d95363f51d5684447636269096 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 17 Feb 2024 01:16:09 -0800 Subject: [PATCH] package/sudo: set FILE_OFFSET_BITS and TIME_BITS for host mksiglist Add flags for 64 bit timestamps when building host mksiglist. -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 Build failure fixed: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" Fixes: https://github.com/skiffos/SkiffOS/issues/306 Signed-off-by: Christian Stewart --- ...e.in-set-TIME_BITS-and-FILE_OFFSET_B.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/sudo/0001-lib-util-Makefile.in-set-TIME_BITS-and-FILE_OFFSET_B.patch diff --git a/package/sudo/0001-lib-util-Makefile.in-set-TIME_BITS-and-FILE_OFFSET_B.patch b/package/sudo/0001-lib-util-Makefile.in-set-TIME_BITS-and-FILE_OFFSET_B.patch new file mode 100644 index 0000000000..fb84002c24 --- /dev/null +++ b/package/sudo/0001-lib-util-Makefile.in-set-TIME_BITS-and-FILE_OFFSET_B.patch @@ -0,0 +1,28 @@ +From 7a0074a82248228062054476bd317b9a40af58dd Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Sat, 17 Feb 2024 02:22:46 -0800 +Subject: [PATCH] lib/util/Makefile.in: set TIME_BITS and FILE_OFFSET_BITS to + 64 + +Fixes a build failure building mksiglist on Ubuntu 22.04.4 LTS. + +Signed-off-by: Christian Stewart +--- + lib/util/Makefile.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in +index 05455f701..a8c84888b 100644 +--- a/lib/util/Makefile.in ++++ b/lib/util/Makefile.in +@@ -72,6 +72,7 @@ CPPDEFS = -D_PATH_SUDO_CONF=\"@sudo_conf@\" + CPPFLAGS = -I$(incdir) -I$(top_builddir) -I. -I$(srcdir) $(CPPDEFS) \ + @CPPFLAGS@ -DDEFAULT_TEXT_DOMAIN=\"@PACKAGE_NAME@\" + HOSTCPPFLAGS = -I$(incdir) -I$(top_builddir) -I. -I$(srcdir) $(CPPDEFS) \ ++ -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64 \ + @CPPFLAGS_FOR_BUILD@ -DDEFAULT_TEXT_DOMAIN=\"@PACKAGE_NAME@\" + + # Usually -O and/or -g +-- +2.43.1 + -- 2.43.1 ... again I am not sure if this is the right way to fix this. Best regards, Christian Stewart From yann.morin.1998 at free.fr Sat Feb 17 11:55:41 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 12:55:41 +0100 Subject: [Buildroot] build failure on Ubuntu 22.04 LTS: TIME_BITS=64 is allowed only with FILE_OFFSET_BITS=64 In-Reply-To: References: Message-ID: Christian, All, On 2024-02-17 01:32 -0800, Christian Stewart via buildroot spake thusly: > On a fresh Ubuntu 22.04.4 LTS VM: That also happens on Fedora 39. > cat <> defconfig > BR2_arm=y > BR2_cortex_a7=y > BR2_BINUTILS_VERSION_2_41_X=y > BR2_GCC_VERSION_13_X=y > BR2_TOOLCHAIN_BUILDROOT_CXX=y > BR2_CCACHE=y > BR2_PACKAGE_SUDO=y > EOF > > make defconfig BR2_DEFCONFIG=defconfig It would have been easier to debug if the full error message and the offending command were provided, so here it is: >>> sudo 1.9.15p5 Configuring [--SNIP--] /usr/bin/make \ PATH="/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/bin:....]:/usr/bin:/usr/sbin" [--SNIP--] AR="/usr/bin/ar" \ AS="/usr/bin/as" \ LD="/usr/bin/ld" \ NM="/usr/bin/nm" CC="/usr/bin/gcc" \ GCC="/usr/bin/gcc" \ CXX="/usr/bin/g++" \ CPP="/usr/bin/cpp" \ OBJCOPY="/usr/bin/objcopy" \ RANLIB="/usr/bin/ranlib" \ CPPFLAGS="-I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include" \ CFLAGS="-O2 -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include" \ CXXFLAGS="-O2 -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include" \ LDFLAGS="-L/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/lib -Wl,-rpath,/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/lib" \ CPPFLAGS="-I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include -I../../include -I../.." \ -C /home/ymorin/dev/buildroot/O/master/build/sudo-1.9.15p5/lib/util \ mksigname mksiglist /usr/bin/cpp \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -I../../include \ -I../.. \ ./sys_signame.h \ | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h In file included from /usr/include/features.h:394, from /usr/include/sys/types.h:25, from ./sys_signame.h:4: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ /usr/bin/gcc -I../../include -I../.. -I. -I. \ -D_PATH_SUDO_CONF=\"/etc/sudo.conf\" -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -DDEFAULT_TEXT_DOMAIN=\"sudo\" \ -O2 \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ ./mksigname.c -o mksigname In file included from /usr/include/features.h:394, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdlib.h:26, from ./mksigname.c:27: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ make[2]: *** [Makefile:263: mksigname] Error 1 In fact, there are *two* issues there. The first, which is the easiest to fix, is that the call to cpp is piped into a call to sed. cpp fails, but because of the pipe, its exit status is lost. The sed succeeds, though, so the rule as a whole succeeds. Then the call to gcc fails, which is fortunate, or we'd have missed the previous failure of cpp. This is trivial to fix: use a temp file for the output of cpp, and run the sed with that temp file as input, as a separate command in the same rule: --- lib/util/Makefile.orig 2024-02-17 12:25:13.554448884 +0100 +++ lib/util/Makefile 2024-02-17 12:26:20.727968989 +0100 @@ -273,10 +273,12 @@ fi mksiglist.h: $(srcdir)/sys_siglist.h - $(CPP) $(CPPFLAGS) $(srcdir)/sys_siglist.h | $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksiglist.h + $(CPP) $(CPPFLAGS) $(srcdir)/sys_siglist.h > mksiglist.h.tmp + $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < mksiglist.h.tmp > mksiglist.h mksigname.h: $(srcdir)/sys_signame.h - $(CPP) $(CPPFLAGS) $(srcdir)/sys_signame.h | $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h + $(CPP) $(CPPFLAGS) $(srcdir)/sys_signame.h > mksigname.h.tmp + $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < mksigname.h.tmp > mksigname.h closefrom_test: $(CLOSEFROM_TEST_OBJS) libsudo_util.la $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(CLOSEFROM_TEST_OBJS) libsudo_util.la $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(HARDENING_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) The second issue is quite more involved. Indeed, those are hapenning while running the SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST post-configure hook. It has been present for quite a while now, so let's revisit this. First, what hapenns for host-sudo? Well, we don't have it, so let's try a dirty hack with: @@ -87,3 +87,22 @@ endef SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_ENABLE_SUDO_GROUP_RULE $(eval $(autotools-package)) + +HOST_SUDO_CONF_OPTS = \ + --without-lecture \ + --without-sendmail \ + --without-umask \ + --with-logging=syslog \ + --without-interfaces \ + --with-env-editor \ + --without-pam \ + --disable-zlib \ + --without-ldap \ + --disable-openssl + +HOST_SUDO_INSTALL_OPTS = \ + INSTALL_OWNER="" \ + DESTDIR="$(HOST_DIR)" \ + install + +$(eval $(host-autotools-package)) $ make host-sudo-build 2>&1 |tee host-sudo.log [ succeeds ] $ grep -E 'mksig(list|name)' host-sudo.log [ empty ] So, a host build does not need to run those tools... Let's try to get rid of them in the target build as well... @@ -65,7 +65,7 @@ define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST -C $(@D)/lib/util mksigname mksiglist endef -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST +#SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST define SUDO_PERMISSIONS /usr/bin/sudo f 4755 0 0 - - - - - $ make sudo-build [ succeeds ] OK, so is that supperfluous at all nowadays? Can you further investigate, enabling PAM et al in turn and see if any optional dependency triggers a call to those two utilities? If not, can you look sunce when that is no longer needed and why? Oh, and could you work on my proposed fix and send iut upstream? Regards, Yann E. MORIN. > # fails with error shown below > make sudo > > I was able to fix it with this patch, but I'm not sure if this is the "correct" > fix: > > From 6dc2b9350ceffc808fe7d048ff9dbe585649c304 Mon Sep 17 00:00:00 2001 > From: Christian Stewart <[2]christian at aperture.us> > Date: Sat, 17 Feb 2024 01:16:09 -0800 > Subject: [PATCH] package/Makefile.in: fix build failure on Ubuntu 22.04 LTS > > Add flags for 64 bit timestamps when building host packages. > > -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > > Build failure fixed: > > /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed > only with _FILE_OFFSET_BITS=64" > ? ?26 | # ? error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > > Fixes: [3]https://github.com/skiffos/SkiffOS/issues/306 > > Signed-off-by: Christian Stewart <[4]christian at aperture.us> > --- > ?package/Makefile.in | 2 +- > ?1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/Makefile.in b/package/Makefile.in > index 3e276d23d6..82d3a435fd 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -246,7 +246,7 @@ UNZIP := $(shell which unzip || type -p unzip) -q > ? > ?APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $ > (if $(QUIET),-s) > ? > -HOST_CPPFLAGS ?= -I$(HOST_DIR)/include > +HOST_CPPFLAGS ?= -I$(HOST_DIR)/include -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 > ?HOST_CFLAGS ? ?= -O2 > ?HOST_CFLAGS ? += $(HOST_CPPFLAGS) > ?HOST_CXXFLAGS += $(HOST_CFLAGS) > -- > 2.43.1 > > Thanks, > Christian Stewart > > > References: > > [1] https://github.com/buildroot/buildroot > [2] mailto:christian at aperture.us > [3] https://github.com/skiffos/SkiffOS/issues/306 > [4] mailto:christian at aperture.us > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Sat Feb 17 14:14:24 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 17 Feb 2024 15:14:24 +0100 Subject: [Buildroot] [PATCH v3] configs/rock5b_defconfig: switch to mainline linux In-Reply-To: <20240217083525.561684-1-kilian.zinnecker@mail.de> References: <20240217083525.561684-1-kilian.zinnecker@mail.de> Message-ID: <8b75fd72-c3e4-4359-9691-2bf824904d45@benettiengineering.com> Hi Kilian, On 17/02/24 09:35, Kilian Zinnecker wrote: > This patch switches the board support of the Radxa Rock 5B from > using a custom kernel to mainline linux 6.7.4. Thereby patches, > which became redundant, are removed, as well as device tree > modifications and no longer needed hash files. The needed ethernet > drivers are activated via the kernel config fragment file. Also the > board support is switched from using a uboot script and a uEnv file > to using extlinux. > > Signed-off-by: Kilian Zinnecker it looks everything good to me now, so: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > > --- > > v2 -> v3: > > - rock5b_defconfig: change BR2_KERNEL_HEADERS_6_7 to > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 > - rock5b_defconfig: change uboot version from "latest" to fixed > 2024.01 > > v1 -> v2: > > - removed unnecessary hash files (uboot, kernel) and removed hash > enforcement (BR2_DOWNLOAD_FOCE_CHECK_HASHES) > - bumped uboot from 2023.07 to latest version (currently 2024.01) > - removed BR2_SYSTEM_DHCP as it is not needed for minimal config > - specified kernel header version in defconfig > - rearranged defconfig as in roc_pc_rk3399_defconfig > - switched from uboot script + uEnv to extlinux.conf: removed fit > image script, changed readme to list the correct output/image > artifacts, removed post-image.sh, added post-build.sh, removed > vfat partition from genimage.cfg, added extlinux.conf, removed > boot.cmd > > board/radxa/rock5b/boot.cmd | 3 - > board/radxa/rock5b/extlinux.conf | 4 ++ > board/radxa/rock5b/genimage.cfg | 16 ----- > board/radxa/rock5b/linux.fragment | 5 +- > ...st-ether_addr-prototypes-to-silence-.patch | 64 ------------------- > ...x-building-error-on-Werror-array-com.patch | 43 ------------- > board/radxa/rock5b/patches/linux/linux.hash | 2 - > board/radxa/rock5b/patches/uboot/uboot.hash | 2 - > board/radxa/rock5b/post-build.sh | 5 ++ > board/radxa/rock5b/post-image.sh | 7 -- > board/radxa/rock5b/readme.txt | 51 +-------------- > board/radxa/rock5b/rock5b.dts | 12 ---- > board/radxa/rock5b/rock5b.its | 46 ------------- > configs/rock5b_defconfig | 59 +++++++++-------- > 14 files changed, 44 insertions(+), 275 deletions(-) > delete mode 100644 board/radxa/rock5b/boot.cmd > create mode 100644 board/radxa/rock5b/extlinux.conf > delete mode 100644 board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > delete mode 100644 board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > delete mode 100644 board/radxa/rock5b/patches/linux/linux.hash > delete mode 100644 board/radxa/rock5b/patches/uboot/uboot.hash > create mode 100755 board/radxa/rock5b/post-build.sh > delete mode 100755 board/radxa/rock5b/post-image.sh > delete mode 100644 board/radxa/rock5b/rock5b.dts > delete mode 100644 board/radxa/rock5b/rock5b.its > > diff --git a/board/radxa/rock5b/boot.cmd b/board/radxa/rock5b/boot.cmd > deleted file mode 100644 > index 9a3e73e003..0000000000 > --- a/board/radxa/rock5b/boot.cmd > +++ /dev/null > @@ -1,3 +0,0 @@ > -setenv bootargs root=/dev/mmcblk0p2 rw rootfstype=ext4 clkin_hz=(25000000) earlycon clk_ignore_unused earlyprintk console=ttyS2,1500000n8 rootwait > -fatload mmc 1:1 ${loadaddr} image.itb > -bootm ${loadaddr} > diff --git a/board/radxa/rock5b/extlinux.conf b/board/radxa/rock5b/extlinux.conf > new file mode 100644 > index 0000000000..a1a531f038 > --- /dev/null > +++ b/board/radxa/rock5b/extlinux.conf > @@ -0,0 +1,4 @@ > +label Radxa Rock 5b Linux > + kernel /boot/Image > + devicetree /boot/rk3588-rock-5b.dtb > + append root=/dev/mmcblk1p1 rw rootfstype=ext4 earlycon rootwait > diff --git a/board/radxa/rock5b/genimage.cfg b/board/radxa/rock5b/genimage.cfg > index 2943232fc3..138ec26e3a 100644 > --- a/board/radxa/rock5b/genimage.cfg > +++ b/board/radxa/rock5b/genimage.cfg > @@ -1,15 +1,5 @@ > # SD card image for Radxa Rock 5b > > -image boot.vfat { > - vfat { > - files = { > - "image.itb", > - "boot.scr" > - } > - } > - size = 16M > -} > - > image sdcard.img { > hdimage { > partition-table-type = "hybrid" > @@ -21,12 +11,6 @@ image sdcard.img { > offset = 32K > } > > - partition boot { > - partition-type = "0xC" > - bootable = "true" > - image = "boot.vfat" > - } > - > partition rootfs { > partition-type = 0x83 > image = "rootfs.ext2" > diff --git a/board/radxa/rock5b/linux.fragment b/board/radxa/rock5b/linux.fragment > index 28bb373ef2..90f2f291ba 100644 > --- a/board/radxa/rock5b/linux.fragment > +++ b/board/radxa/rock5b/linux.fragment > @@ -1,5 +1,2 @@ > CONFIG_R8169=y > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > -# Disable Rockchip specific WiFi drivers, as the kernel > -# code cannot be build with GCC 12 due to several Werrors > -# CONFIG_WL_ROCKCHIP is not set > +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y > diff --git a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > deleted file mode 100644 > index 5632c5a627..0000000000 > --- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001 > -From: Kees Cook > -Date: Sat, 12 Feb 2022 09:14:49 -0800 > -Subject: etherdevice: Adjust ether_addr* prototypes to silence > - -Wstringop-overead > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -With GCC 12, -Wstringop-overread was warning about an implicit cast from > -char[6] to char[8]. However, the extra 2 bytes are always thrown away, > -alignment doesn't matter, and the risk of hitting the edge of unallocated > -memory has been accepted, so this prototype can just be converted to a > -regular char *. Silences: > - > -net/core/dev.c: In function ?bpf_prog_run_generic_xdp?: net/core/dev.c:4618:21: warning: ?ether_addr_equal_64bits? reading 8 bytes from a region of size 6 [-Wstringop-overread] > - 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); > - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > -net/core/dev.c:4618:21: note: referencing argument 1 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -net/core/dev.c:4618:21: note: referencing argument 2 of type ?const u8[8]? {aka ?const unsigned char[8]?} > -In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ?ether_addr_equal_64bits? > - 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > - | ^~~~~~~~~~~~~~~~~~~~~~~ > - > -Reported-by: Marc Kleine-Budde > -Tested-by: Marc Kleine-Budde > -Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73 at pengutronix.de > -Cc: Jakub Kicinski > -Cc: "David S. Miller" > -Cc: netdev at vger.kernel.org > -Signed-off-by: Kees Cook > -Signed-off-by: David S. Miller > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd > -Signed-off-by: Kilian Zinnecker > ---- > - include/linux/etherdevice.h | 5 ++--- > - 1 file changed, 2 insertions(+), 3 deletions(-) > - > -diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h > -index 2ad71cc90b37d..92b10e67d5f87 100644 > ---- a/include/linux/etherdevice.h > -+++ b/include/linux/etherdevice.h > -@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr) > - #endif > - } > - > --static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2]) > -+static inline bool is_multicast_ether_addr_64bits(const u8 *addr) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - #ifdef __BIG_ENDIAN > -@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) > - * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits. > - */ > - > --static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], > -- const u8 addr2[6+2]) > -+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2) > - { > - #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64 > - u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2); > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > deleted file mode 100644 > index 10de6c72d3..0000000000 > --- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001 > -From: Xiongwei Song > -Date: Fri, 14 Jan 2022 14:07:24 -0800 > -Subject: mm: page_alloc: fix building error on -Werror=array-compare > - > -Arthur Marsh reported we would hit the error below when building kernel > -with gcc-12: > - > - CC mm/page_alloc.o > - mm/page_alloc.c: In function `mem_init_print_info': > - mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare] > - 8173 | if (start <= pos && pos < end && size > adj) \ > - | > - > -In C++20, the comparision between arrays should be warned. > - > -Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean at me.com > -Signed-off-by: Xiongwei Song > -Reported-by: Arthur Marsh > -Signed-off-by: Andrew Morton > -Signed-off-by: Linus Torvalds > -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f > -Signed-off-by: Kilian Zinnecker > ---- > - mm/page_alloc.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/mm/page_alloc.c b/mm/page_alloc.c > -index 806f317c2e7e2..c4ef450ac4428 100644 > ---- a/mm/page_alloc.c > -+++ b/mm/page_alloc.c > -@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void) > - */ > - #define adj_init_size(start, end, size, pos, adj) \ > - do { \ > -- if (start <= pos && pos < end && size > adj) \ > -+ if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \ > - size -= adj; \ > - } while (0) > - > --- > -cgit > - > diff --git a/board/radxa/rock5b/patches/linux/linux.hash b/board/radxa/rock5b/patches/linux/linux.hash > deleted file mode 100644 > index 95ad749554..0000000000 > --- a/board/radxa/rock5b/patches/linux/linux.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Locally calculated > -sha256 a5eca7b8f929a1918125e2e4fbd7ab4ea5b3910b5ae4547e81c794b47373ffb5 linux-52f51a2b5ba178f331af62260d2da86d7472c14b-br1.tar.gz > diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash > deleted file mode 100644 > index efd629bd2f..0000000000 > --- a/board/radxa/rock5b/patches/uboot/uboot.hash > +++ /dev/null > @@ -1,2 +0,0 @@ > -# Locally calculated > -sha256 12e921b466ae731cdbc355e6832b7f22bc90b01aeceef9886f98aaba7b394300 u-boot-2023.07.tar.bz2 > diff --git a/board/radxa/rock5b/post-build.sh b/board/radxa/rock5b/post-build.sh > new file mode 100755 > index 0000000000..d84a5da0b0 > --- /dev/null > +++ b/board/radxa/rock5b/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$TARGET_DIR"/boot/extlinux/extlinux.conf > diff --git a/board/radxa/rock5b/post-image.sh b/board/radxa/rock5b/post-image.sh > deleted file mode 100755 > index c706a5ee78..0000000000 > --- a/board/radxa/rock5b/post-image.sh > +++ /dev/null > @@ -1,7 +0,0 @@ > -#!/usr/bin/env bash > -set -e > - > -gzip -fk "${BINARIES_DIR}/Image" > -cp board/radxa/rock5b/rock5b.its "${BINARIES_DIR}" > -(cd "${BINARIES_DIR}" && mkimage -f rock5b.its image.itb) > -support/scripts/genimage.sh -c board/radxa/rock5b/genimage.cfg > diff --git a/board/radxa/rock5b/readme.txt b/board/radxa/rock5b/readme.txt > index b3eb06851a..441c28db25 100644 > --- a/board/radxa/rock5b/readme.txt > +++ b/board/radxa/rock5b/readme.txt > @@ -13,21 +13,15 @@ Files created in output directory > output/images > . > ??? Image > -??? Image.gz > -??? boot.scr > -??? boot.vfat > -??? image.itb > -??? rk3588-rock-5b.dtb > ??? rk3588_bl31_v1.40.elf > ??? rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin > -??? rock5b.dts > -??? rock5b.its > +??? rk3588-rock-5b.dtb > ??? rootfs.ext2 > ??? rootfs.ext4 > ??? rootfs.tar > ??? sdcard.img > -??? u-boot-rockchip.bin > -??? u-boot.bin > +??? u-boot.bin > +??? u-boot-rockchip.bin > > Creating bootable SD card: > ========================== > @@ -61,42 +55,3 @@ Enter 'root' as login user, and the prompt is ready. > wiki link: > ---------- > https://forum.radxa.com/c/rock5 > - > -Issues: > -======= > - > -WiFi > ----- > -The custom Radxa kernel provides custom code to support WiFi. However, > -that code does not compile with GCC 12, which is the current default > -version in buildroot. Hence, the WiFi kernel drivers are disabled, until > -the issues get fixed (if ever). If they are desperately needed, one may > -apply the following workaround, as long as buildroot still supports GCC > -version 11: > - > -1. Set GCC version 11, by adding the following line to > -configs/rock5b_defconfig: > - > -BR2_GCC_VERSION_11_X=y > - > -2. Re-enable custom WiFi drivers by removing the following line from > -board/radxa/rock5b/linux.fragment: > - > -# CONFIG_WL_ROCKCHIP is not set > - > -Rockchip FIQ Debugger > ---------------------- > -The custom kernel used for this board features an FIQ debugger, which > -can be activated by typing "fiq" on the serial interface. As this can be > -annoying if a user wants to type these charakters and it is not needed > -for most users, this board support disables the FIQ debugger by default. > -To re-enable the FIQ debugger follow the steps: > - > -1. In board/radxa/rock5b/rock5b.dts set the status property of the > -fiq_debugger node to "okay" and set the status property of the uart2 > -node to "disabled" > - > -2. Re-enable the fiq debugger module by removing the following line > -from board/radxa/rock5b/linux.fragment: > - > -# CONFIG_ROCKCHIP_FIQ_DEBUGGER is not set > diff --git a/board/radxa/rock5b/rock5b.dts b/board/radxa/rock5b/rock5b.dts > deleted file mode 100644 > index 71a4e42b5e..0000000000 > --- a/board/radxa/rock5b/rock5b.dts > +++ /dev/null > @@ -1,12 +0,0 @@ > -/dts-v1/; > - > -#include "rockchip/rk3588-rock-5b.dts" > - > -&fiq_debugger { > - status = "disabled"; > -}; > - > -&uart2 { > - pinctrl-0 = <&uart2m0_xfer>; > - status = "okay"; > -}; > diff --git a/board/radxa/rock5b/rock5b.its b/board/radxa/rock5b/rock5b.its > deleted file mode 100644 > index 9ce235d041..0000000000 > --- a/board/radxa/rock5b/rock5b.its > +++ /dev/null > @@ -1,46 +0,0 @@ > -/dts-v1/; > - > -/ { > - description = "Rock 5B FIT Image"; > - #address-cells = <1>; > - > - images { > - kernel { > - description = "Kernel"; > - data = /incbin/("Image.gz"); > - type = "kernel"; > - arch = "arm64"; > - os = "linux"; > - compression = "gzip"; > - load = <0x0a200000>; > - entry = <0x0a200000>; > - hash { > - algo = "sha256"; > - }; > - }; > - fdt { > - description = "Device Tree"; > - data = /incbin/("rock5b.dtb"); > - type = "flat_dt"; > - arch = "arm64"; > - compression = "none"; > - load = <0x0e000000>; > - entry = <0x0e000000>; > - hash { > - algo = "sha256"; > - }; > - }; > - }; > - > - configurations { > - default = "standard"; > - standard { > - description = "Standard Boot"; > - kernel = "kernel"; > - fdt = "fdt"; > - hash { > - algo = "sha256"; > - }; > - }; > - }; > -}; > diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig > index 7175aa66bf..4014311a06 100644 > --- a/configs/rock5b_defconfig > +++ b/configs/rock5b_defconfig > @@ -1,43 +1,46 @@ > +# Architecture > BR2_aarch64=y > BR2_cortex_a76_a55=y > -BR2_KERNEL_HEADERS_5_10=y > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="" > -BR2_TARGET_GENERIC_HOSTNAME="rock5b" > -BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" > -BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches" > -BR2_DOWNLOAD_FORCE_CHECK_HASHES=y > -BR2_SYSTEM_DHCP="eth0" > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_GIT=y > -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/radxa/kernel.git" > -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="52f51a2b5ba178f331af62260d2da86d7472c14b" > -BR2_LINUX_KERNEL_DEFCONFIG="rockchip_linux" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -# BR2_LINUX_KERNEL_INTREE_DTS_NAME is not set > -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/radxa/rock5b/rock5b.dts" > -BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > -BR2_TARGET_ROOTFS_EXT2_SIZE="250M" > + > +# Linux headers same as kernel, a 6.7 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN=y > +BR2_PACKAGE_ROCKCHIP_RKBIN=y > +BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" > +BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7.4" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3588-rock-5b" > +BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/linux.fragment" > + > +# Filesystem > +BR2_TARGET_GENERIC_HOSTNAME="rock5b" > +BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="250M" > BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/radxa/rock5b/boot.cmd" > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_DTC=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > -BR2_PACKAGE_ROCKCHIP_RKBIN=y > -BR2_PACKAGE_ROCKCHIP_RKBIN_TPL_FILENAME="bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin" > -BR2_PACKAGE_ROCKCHIP_RKBIN_BL31_FILENAME="bin/rk35/rk3588_bl31_v1.40.elf" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rock5b/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rock5b/genimage.cfg" From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:24 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:24 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices Message-ID: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> The SK-AM62B-P1 is the newest version of SK-AM62 which includes high-security field-securable (HS-FS) silicon to optionally customize keys and encryption for security applications. This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, which, however, was buggy. This series fixes the errors and bumps the Linux kernel and U-Boot required for such a new device. This series, which in my humble opinion, should have been immediately considered to correct the compilation errors in case of HS-FS devcies, has seen an increase in patches in version 4 to remove the ti-k3-image-gen package thanks to Binman. Additionally, it shares some modifications and views on how to implement certain changes with the series https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. Therefore, I think it is necessary not to run them in parallel but to decide whether to merge one before the other or to consider a single series where the patches can be coherent with each other. I am available for both solutions. Let me know. Dario Binacchi (20): configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version boot/ti-k3-r5-loader: bump to version 2024.01 boot/ti-k3-core-secdev: new package boot/ti-k3-image-gen: manage HS hardware package/python-jsonschema: add host variant package/python-attrs: add host variant package/python-referencing: add host variant package/python-rpds-py: add host variant package/python-jsonschema-specifications: add host variant boot/ti-k3-r5-loader: set binman environment boot/uboot: set BINMAN_INDIRS for TI K3 DM configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 boot: move ti-k3-* packages to 'ti-k3' directory boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore DEVELOPERS | 1 + board/ti/am62x-sk/genimage.cfg | 7 +- board/ti/am62x-sk/post-build.sh | 49 ++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++ boot/Config.in | 4 +- boot/ti-k3-image-gen/Config.in | 77 ------------------- boot/ti-k3/Config.in | 59 ++++++++++++++ boot/ti-k3/common.mk | 1 + .../{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 .../ti-k3-boot-firmware.hash | 0 .../ti-k3-boot-firmware.mk | 0 boot/ti-k3/ti-k3-core-secdev/Config.in | 9 +++ .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 + .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 ++++++ boot/ti-k3/ti-k3-image-gen/Config.in | 25 ++++++ .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 .../ti-k3-image-gen/ti-k3-image-gen.mk | 20 ++++- boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 4 +- .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- .../ti-k3-r5-loader/ti-k3-r5-loader.mk | 16 +++- boot/uboot/Config.in | 7 +- boot/uboot/uboot.mk | 3 +- configs/ti_am62x_sk_defconfig | 23 +++--- configs/ti_am64x_sk_defconfig | 8 +- package/python-attrs/python-attrs.mk | 6 ++ .../python-jsonschema-specifications.mk | 5 ++ .../python-jsonschema/python-jsonschema.mk | 6 ++ .../python-referencing/python-referencing.mk | 5 ++ package/python-rpds-py/python-rpds-py.mk | 1 + 29 files changed, 263 insertions(+), 105 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh delete mode 100644 boot/ti-k3-image-gen/Config.in create mode 100644 boot/ti-k3/Config.in create mode 100644 boot/ti-k3/common.mk rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) create mode 100644 boot/ti-k3/ti-k3-core-secdev/Config.in create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk create mode 100644 boot/ti-k3/ti-k3-image-gen/Config.in rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (67%) rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (97%) rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (54%) rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (85%) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:25 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:25 +0100 Subject: [Buildroot] [PATCH v4 01/20] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-2-dario.binacchi@amarulasolutions.com> Checking the output of the command `git grep PLATFORM | grep k3`, we can found the proper settings for the optee-os package: .github/workflows/ci.yml: _make PLATFORM=k3-am62x .github/workflows/ci.yml: _make PLATFORM=k3-am62x CFG_ARM64_core=y ... core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- configs/ti_am62x_sk_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c68..fde6f8f5636a 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:26 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:26 +0100 Subject: [Buildroot] [PATCH v4 02/20] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-3-dario.binacchi@amarulasolutions.com> Checking the output of the command `git grep PLATFORM | grep k3`, we can found the proper settings for the optee-os package: .github/workflows/ci.yml: _make PLATFORM=k3-am64x .github/workflows/ci.yml: _make PLATFORM=k3-am64x CFG_ARM64_core=y ... core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- configs/ti_am64x_sk_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8d3..98476c88626b 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:27 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:27 +0100 Subject: [Buildroot] [PATCH v4 03/20] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-4-dario.binacchi@amarulasolutions.com> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index fde6f8f5636a..a4cffe09ce72 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -26,6 +26,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:28 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:28 +0100 Subject: [Buildroot] [PATCH v4 04/20] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-5-dario.binacchi@amarulasolutions.com> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 98476c88626b..5fd9653b5b8f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -26,6 +26,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:29 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:29 +0100 Subject: [Buildroot] [PATCH v4 05/20] boot/ti-k3-r5-loader: bump to version 2024.01 In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-6-dario.binacchi@amarulasolutions.com> All in-tree configs with the ti-k3-r5 bootloader use a custom version, so this patch is mostly for the menuconfig default version Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5a8..5f86c045c99f 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -16,7 +16,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2022.10" + bool "2024.01" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -60,7 +60,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index c5d1cb8e09f0..fbe5d215409d 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:30 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:30 +0100 Subject: [Buildroot] [PATCH v4 06/20] boot/ti-k3-core-secdev: new package In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> This is a security development package containing tools for High-Security(HS) TI K3 platform devices. Signed-off-by: Dario Binacchi --- Changes in v4: - Remove the trailing '/' at the end of the url in the help of Config.in - Fixed license issues - Use $(BINARIES_DIR)/ti-k3-core-secdev as the directory where to install files. Signed-off-by: Dario Binacchi --- DEVELOPERS | 1 + boot/Config.in | 1 + boot/ti-k3-core-secdev/Config.in | 9 ++++++++ boot/ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 +++ boot/ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 +++++++++++++++++++ 5 files changed, 36 insertions(+) create mode 100644 boot/ti-k3-core-secdev/Config.in create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb11..33d99ab2440f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -753,6 +753,7 @@ F: package/xinetd/ N: Dario Binacchi F: board/bsh/ F: board/stmicroelectronics/stm32f769-disco/ +F: boot/ti-k3-core-secdev/ F: configs/imx8mn_bsh_smm_s2_defconfig F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: configs/stm32f769_disco_sd_defconfig diff --git a/boot/Config.in b/boot/Config.in index e5fdf7ad439e..18a7d268f95a 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-boot-firmware/Config.in" +source "boot/ti-k3-core-secdev/Config.in" source "boot/ti-k3-image-gen/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in new file mode 100644 index 000000000000..f7b4e2962042 --- /dev/null +++ b/boot/ti-k3-core-secdev/Config.in @@ -0,0 +1,9 @@ +config BR2_TARGET_TI_K3_CORE_SECDEV + bool "ti-k3-core-secdev" + depends on BR2_aarch64 + help + This package downloads and installs development tools for + High-Security(HS) TI K3 platforms (which include AM62x, + AM64x, AM65x and more). + + https://git.ti.com/cgit/security-development-tools/core-secdev-k3 diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash new file mode 100644 index 000000000000..e3074a398d62 --- /dev/null +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06 core-secdev-k3-08.06.00.007.tar.xz +sha256 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369 manifest/k3-secdev-0.2-manifest.html diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk new file mode 100644 index 000000000000..f7655a0fefc8 --- /dev/null +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# ti-k3-core-secdev +# +################################################################################ + +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES +TI_K3_CORE_SECDEV_LICENSE = BSD-3-Clause +TI_K3_CORE_SECDEV_LICENSE_FILES = manifest/k3-secdev-0.2-manifest.html + +TI_K3_CORE_SECDEV_INSTALL_DIR = $(BINARIES_DIR)/ti-k3-core-secdev + +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS + mkdir -p $(TI_K3_CORE_SECDEV_INSTALL_DIR) + cp -dpfr $(@D)/keys $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ + cp -dpfr $(@D)/scripts $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ +endef + +$(eval $(generic-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:31 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:31 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> The patch sets the configurations required by TI HS systems. Some of these configurations (i. e. HS SYSFW image signing key, HS Software Revision) are provided by the ti-k3-core-secdev package in the binaries directory. Signed-off-by: Dario Binacchi --- no changes since v3: Signed-off-by: Dario Binacchi --- boot/ti-k3-image-gen/Config.in | 1 + boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e911..38d1598d9fc0 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN bool "ti-k3-image-gen" depends on BR2_TARGET_TI_K3_R5_LOADER select BR2_TARGET_TI_K3_BOOT_FIRMWARE + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS # We need FIT support in uboot-tools, which is why we select a # host package select BR2_PACKAGE_HOST_UBOOT_TOOLS diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk index 64be9a18f2c4..74b4fcb4bf89 100644 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) +TI_K3_IMAGE_GEN_SYSFW = \ + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin +else +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev + +TI_K3_IMAGE_GEN_SYSFW = \ + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin +endif define TI_K3_IMAGE_GEN_CONFIGURE_CMDS - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ + ) endef define TI_K3_IMAGE_GEN_BUILD_CMDS @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS $(BR2_MAKE) -C $(@D) \ SOC=$(TI_K3_IMAGE_GEN_SOC) \ SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ CONFIG=evm \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:32 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:32 +0100 Subject: [Buildroot] [PATCH v4 08/20] package/python-jsonschema: add host variant In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-9-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host Signed-off-by: Dario Binacchi --- package/python-jsonschema/python-jsonschema.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa7752..85fef7ad22ac 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,10 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:34 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:34 +0100 Subject: [Buildroot] [PATCH v4 10/20] package/python-referencing: add host variant In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-11-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- Changes in v4: - Drop host-python-attrs from PYTHON_REFERENCING_DEPENDENCIES Changes in v3: - Drop Config.in.host Signed-off-by: Dario Binacchi --- package/python-referencing/python-referencing.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e913a..f00a0efe73e8 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,9 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:33 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:33 +0100 Subject: [Buildroot] [PATCH v4 09/20] package/python-attrs: add host variant In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-10-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host Signed-off-by: Dario Binacchi --- package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc4402..fb1729e62fa2 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:35 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:35 +0100 Subject: [Buildroot] [PATCH v4 11/20] package/python-rpds-py: add host variant In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-12-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host Signed-off-by: Dario Binacchi --- package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4fde..cee2ff290a4e 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:36 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:36 +0100 Subject: [Buildroot] [PATCH v4 12/20] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-13-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host Signed-off-by: Dario Binacchi --- .../python-jsonschema-specifications.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9d4..b6e309ab2bc9 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,9 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:37 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:37 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. The patch set the BINMAN_INDIRS environment variable to provide the directory to search for binary blobs and select the packages required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- Changes in v4: - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Changes in v2: - Change commit message - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Select packages required by binman if BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled Signed-off-by: Dario Binacchi --- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f2e..2a10024aedaa 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python-attrs \ + host-python-jsonschema \ + host-python-jsonschema-specifications \ + host-python-pyyaml \ + host-python-referencing \ + host-python-rpds-py TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ $(BR2_BISON_HOST_DEPENDENCY) \ $(BR2_FLEX_HOST_DEPENDENCY) +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt +endif + ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + BINMAN_INDIRS=$(BINARIES_DIR) \ HOSTLDFLAGS="$(HOST_LDFLAGS)" define TI_K3_R5_LOADER_BUILD_CMDS -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:38 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:38 +0100 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> As explained in [1], adding support for AM62x LP SK in U-Boot, requires binman for building bootloader images. The BINMAN_INDIRS environment variable is used to provide a space-separated list of directories to search for binary blobs. [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ Signed-off-by: Dario Binacchi --- no changes since v1: Signed-off-by: Dario Binacchi --- boot/uboot/uboot.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a88059..cf70f86a4132 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -189,7 +189,8 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ + BINMAN_INDIRS=$(BINARIES_DIR) endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:39 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:39 +0100 Subject: [Buildroot] [PATCH v4 15/20] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-16-dario.binacchi@amarulasolutions.com> The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - The use of binman for building images. Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v4: - bump to 204.01 instead of 2023.10 - Update the commit message - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. Changes in v2: - Update the commit message - Drop Python options required by binman. - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically selects the Python modules required by binman. Signed-off-by: Dario Binacchi --- board/ti/am62x-sk/genimage.cfg | 7 ++++- board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++++++++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++++ configs/ti_am62x_sk_defconfig | 11 ++++---- 4 files changed, 66 insertions(+), 6 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg index 26304fe98f99..398209f4d831 100644 --- a/board/ti/am62x-sk/genimage.cfg +++ b/board/ti/am62x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh new file mode 100755 index 000000000000..0f1f98ef217a --- /dev/null +++ b/board/ti/am62x-sk/post-build.sh @@ -0,0 +1,49 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:r:x:' +O='console:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing argument" +[ -n "${ROOT}" ] || die "Missing argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label am62x-sk-buildroot + kernel /Image + fdtdir / + append ${append} + __HEADER_EOF diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh new file mode 100755 index 000000000000..34f732c091ad --- /dev/null +++ b/board/ti/am62x-sk/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh -x + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a4cffe09ce72..193301c8b941 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_TARGET_ROOTFS_EXT2=y @@ -27,14 +27,15 @@ BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:40 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:40 +0100 Subject: [Buildroot] [PATCH v4 16/20] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-17-dario.binacchi@amarulasolutions.com> Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v4 - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. no changes since v1 Signed-off-by: Dario Binacchi --- configs/ti_am62x_sk_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 193301c8b941..4de39fb897fd 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.1" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:41 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:41 +0100 Subject: [Buildroot] [PATCH v4 17/20] boot: move ti-k3-* packages to 'ti-k3' directory In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-18-dario.binacchi@amarulasolutions.com> Move all TI K3 packages to the directory ti-k3. This patch is preparatory for future developments. Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- boot/Config.in | 5 +---- boot/ti-k3/Config.in | 13 +++++++++++++ boot/ti-k3/common.mk | 1 + boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 .../ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 0 .../ti-k3-boot-firmware/ti-k3-boot-firmware.mk | 0 boot/{ => ti-k3}/ti-k3-core-secdev/Config.in | 0 .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 0 .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 0 boot/{ => ti-k3}/ti-k3-image-gen/Config.in | 0 .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk | 0 boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 0 .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 0 boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk | 0 configs/ti_am62x_sk_defconfig | 1 + configs/ti_am64x_sk_defconfig | 1 + 17 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 boot/ti-k3/Config.in create mode 100644 boot/ti-k3/common.mk rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) rename boot/{ => ti-k3}/ti-k3-core-secdev/Config.in (100%) rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.hash (100%) rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.mk (100%) rename boot/{ => ti-k3}/ti-k3-image-gen/Config.in (100%) rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (100%) rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (100%) rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (100%) rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (100%) diff --git a/boot/Config.in b/boot/Config.in index 18a7d268f95a..74a64a096afc 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -19,10 +19,7 @@ source "boot/opensbi/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" -source "boot/ti-k3-boot-firmware/Config.in" -source "boot/ti-k3-core-secdev/Config.in" -source "boot/ti-k3-image-gen/Config.in" -source "boot/ti-k3-r5-loader/Config.in" +source "boot/ti-k3/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in new file mode 100644 index 000000000000..06dda2f156a9 --- /dev/null +++ b/boot/ti-k3/Config.in @@ -0,0 +1,13 @@ +config BR2_TARGET_TI_K3 + bool "TI K3" + help + The TI K3 bootloaders and tools. + +if BR2_TARGET_TI_K3 + +source "boot/ti-k3/ti-k3-boot-firmware/Config.in" +source "boot/ti-k3/ti-k3-core-secdev/Config.in" +source "boot/ti-k3/ti-k3-image-gen/Config.in" +source "boot/ti-k3/ti-k3-r5-loader/Config.in" + +endif diff --git a/boot/ti-k3/common.mk b/boot/ti-k3/common.mk new file mode 100644 index 000000000000..18a1329baa4c --- /dev/null +++ b/boot/ti-k3/common.mk @@ -0,0 +1 @@ +include $(sort $(wildcard boot/ti-k3/*/*.mk)) diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3/ti-k3-boot-firmware/Config.in similarity index 100% rename from boot/ti-k3-boot-firmware/Config.in rename to boot/ti-k3/ti-k3-boot-firmware/Config.in diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash similarity index 100% rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk similarity index 100% rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3/ti-k3-core-secdev/Config.in similarity index 100% rename from boot/ti-k3-core-secdev/Config.in rename to boot/ti-k3/ti-k3-core-secdev/Config.in diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash similarity index 100% rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.hash rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk similarity index 100% rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.mk rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in similarity index 100% rename from boot/ti-k3-image-gen/Config.in rename to boot/ti-k3/ti-k3-image-gen/Config.in diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash similarity index 100% rename from boot/ti-k3-image-gen/ti-k3-image-gen.hash rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk similarity index 100% rename from boot/ti-k3-image-gen/ti-k3-image-gen.mk rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3/ti-k3-r5-loader/Config.in similarity index 100% rename from boot/ti-k3-r5-loader/Config.in rename to boot/ti-k3/ti-k3-r5-loader/Config.in diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash similarity index 100% rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.hash rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk similarity index 100% rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.mk rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 4de39fb897fd..cd26235342e4 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" +BR2_TARGET_TI_K3=y BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 5fd9653b5b8f..1befeb4ab96c 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" +BR2_TARGET_TI_K3=y BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:42 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:42 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot can use Binman to compile and sign the generated binaries, thus making the use of custom tools like ti-k3-image-gen no longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were configured and used outside of it. This patch allows setting such options even if the package is not enabled. --- Added in v4 Signed-off-by: Dario Binacchi --- boot/ti-k3/Config.in | 46 ++++++++++++++ boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- boot/uboot/Config.in | 7 +-- configs/ti_am62x_sk_defconfig | 2 +- configs/ti_am64x_sk_defconfig | 2 +- 6 files changed, 59 insertions(+), 67 deletions(-) diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in index 06dda2f156a9..9e508326c9c8 100644 --- a/boot/ti-k3/Config.in +++ b/boot/ti-k3/Config.in @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 if BR2_TARGET_TI_K3 +choice + prompt "SoC family" + +config BR2_TARGET_TI_K3_SOC_AM62AX + bool "am62ax" + +config BR2_TARGET_TI_K3_SOC_AM62X + bool "am62x" + +config BR2_TARGET_TI_K3_SOC_AM64X + bool "am64x" + +config BR2_TARGET_TI_K3_SOC_AM65X + bool "am65x" + +endchoice + +choice + prompt "Security type" + help + The target SoC security type option. + +config BR2_TARGET_TI_K3_SECTYPE_GP + bool "gp" + +config BR2_TARGET_TI_K3_SECTYPE_HS_FS + bool "hs-fs" + +config BR2_TARGET_TI_K3_SECTYPE_HS + bool "hs" + +endchoice + +config BR2_TARGET_TI_K3_SOC + string + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X + +config BR2_TARGET_TI_K3_SECTYPE + string + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS + source "boot/ti-k3/ti-k3-boot-firmware/Config.in" source "boot/ti-k3/ti-k3-core-secdev/Config.in" source "boot/ti-k3/ti-k3-image-gen/Config.in" diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in index 38d1598d9fc0..2d53d62dd4ee 100644 --- a/boot/ti-k3/ti-k3-image-gen/Config.in +++ b/boot/ti-k3/ti-k3-image-gen/Config.in @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN bool "ti-k3-image-gen" depends on BR2_TARGET_TI_K3_R5_LOADER select BR2_TARGET_TI_K3_BOOT_FIRMWARE - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS # We need FIT support in uboot-tools, which is why we select a # host package select BR2_PACKAGE_HOST_UBOOT_TOOLS @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X endif diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk index 74b4fcb4bf89..834d8f7d5cd5 100644 --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ $(BR2_MAKE_HOST_DEPENDENCY) TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) TI_K3_IMAGE_GEN_SYSFW = \ $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin else diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930db..1a9d21e7c6d1 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" # We use the SoC selection defined for the ti-k3-image-gen # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index cd26235342e4..cfefce0a77a4 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" BR2_TARGET_TI_K3=y +BR2_TARGET_TI_K3_SOC_AM62X=y BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 1befeb4ab96c..daf78dbffff8 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" BR2_TARGET_TI_K3=y +BR2_TARGET_TI_K3_SOC_AM64X=y BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:43 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:43 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot are capable of building tiboot3.bin using Binman. In this case, let's copy it to the binaries directory. Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk index 2a10024aedaa..643298a1e70a 100644 --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) + define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; endef $(eval $(kconfig-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 17 16:02:44 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 17 Feb 2024 17:02:44 +0100 Subject: [Buildroot] [PATCH v4 20/20] configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240217160244.1320482-21-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot are capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. Signed-off-by: Dario Binacchi --- Added in v4 Signed-off-by: Dario Binacchi --- configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index cfefce0a77a4..6259dec5985d 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,7 +25,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" BR2_TARGET_TI_K3=y BR2_TARGET_TI_K3_SOC_AM62X=y -BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" -- 2.43.0 From ju.o at free.fr Sat Feb 17 16:05:15 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 17 Feb 2024 17:05:15 +0100 Subject: [Buildroot] [PATCH] package/iozone: bump to version 3.506 In-Reply-To: <20240215142413.451505-2-gilles.talis@gmail.com> References: <20240215142413.451505-1-gilles.talis@gmail.com> <20240215142413.451505-2-gilles.talis@gmail.com> Message-ID: Hi Gilles, All, Thanks for the patch! I have few comments: Could you add a reference in commit log to the upstream change log? For example: """ For change log, see end of file: https://www.iozone.org/src/current/Changes.txt """ This helps a lot for later analyses/debugging. Also, the upstream archive of this new version seems to include the license file. So the comment can be removed, and the license file added (see later). Finally, could you add a comment in the commit log that: The upstream archive format changed from tgz to tar. (just to record this is not an arbitrary change). On 15/02/2024 15:24, Gilles Talis wrote: > Signed-off-by: Gilles Talis > --- > package/iozone/iozone.hash | 2 +- > package/iozone/iozone.mk | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash > index 9ecf1d1af8..c506b41db2 100644 > --- a/package/iozone/iozone.hash > +++ b/package/iozone/iozone.hash > @@ -1,2 +1,2 @@ > # Locally calculated > -sha256 > 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 > iozone3_493.tgz > +sha256 > 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7 > iozone3_506.tar The license file hash can be added here: sha256 bff7909fd698708d15613a4fb977a193cff98f44ef170c2dc1dd502974df75b2 docs/License.txt > diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk > index 2df4a2aa84..7cce15c53d 100644 > --- a/package/iozone/iozone.mk > +++ b/package/iozone/iozone.mk > @@ -4,8 +4,8 @@ > # > > ################################################################################ > > -IOZONE_VERSION = 3.493 > -IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz > +IOZONE_VERSION = 3.506 > +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar > IOZONE_SITE = http://www.iozone.org/src/current > IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) > # IOzone license details can be found at: The license comment can be removed here, and the license file added: IOZONE_LICENSE_FILES = docs/License.txt > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot Best regards, Julien. From alexander.sverdlin at gmail.com Sat Feb 17 17:06:05 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 18:06:05 +0100 Subject: [Buildroot] [PATCH v4 06/20] boot/ti-k3-core-secdev: new package In-Reply-To: <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > This is a security development package containing tools for > High-Security(HS) TI K3 platform devices. > > Signed-off-by: Dario Binacchi as I understand secdev package is not required for binman-based U-Boot deployments starting from v2023.10. So what is the point of introducing the package now if you update U-Boot to v2024.01? I belive it's as legacy as ti-k3-image-gen (which you are fixing) but Romain's patchset removed the package and, quite successfully, from the perspective of building for HS variants. > --- > > Changes in v4: > - Remove the trailing '/' at the end of the url in the help of > ? Config.in > - Fixed license issues > - Use $(BINARIES_DIR)/ti-k3-core-secdev as the directory where to > ? install files. > > Signed-off-by: Dario Binacchi > --- > ?DEVELOPERS??????????????????????????????????? |? 1 + > ?boot/Config.in??????????????????????????????? |? 1 + > ?boot/ti-k3-core-secdev/Config.in????????????? |? 9 ++++++++ > ?boot/ti-k3-core-secdev/ti-k3-core-secdev.hash |? 3 +++ > ?boot/ti-k3-core-secdev/ti-k3-core-secdev.mk?? | 22 +++++++++++++++++++ > ?5 files changed, 36 insertions(+) > ?create mode 100644 boot/ti-k3-core-secdev/Config.in > ?create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > ?create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 0d12c3abcb11..33d99ab2440f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -753,6 +753,7 @@ F: package/xinetd/ > ?N: Dario Binacchi > ?F: board/bsh/ > ?F: board/stmicroelectronics/stm32f769-disco/ > +F: boot/ti-k3-core-secdev/ > ?F: configs/imx8mn_bsh_smm_s2_defconfig > ?F: configs/imx8mn_bsh_smm_s2_pro_defconfig > ?F: configs/stm32f769_disco_sd_defconfig > diff --git a/boot/Config.in b/boot/Config.in > index e5fdf7ad439e..18a7d268f95a 100644 > --- a/boot/Config.in > +++ b/boot/Config.in > @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" > ?source "boot/shim/Config.in" > ?source "boot/syslinux/Config.in" > ?source "boot/ti-k3-boot-firmware/Config.in" > +source "boot/ti-k3-core-secdev/Config.in" > ?source "boot/ti-k3-image-gen/Config.in" > ?source "boot/ti-k3-r5-loader/Config.in" > ?source "boot/uboot/Config.in" > diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in > new file mode 100644 > index 000000000000..f7b4e2962042 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/Config.in > @@ -0,0 +1,9 @@ > +config BR2_TARGET_TI_K3_CORE_SECDEV > + bool "ti-k3-core-secdev" > + depends on BR2_aarch64 > + help > + ? This package downloads and installs development tools for > + ? High-Security(HS) TI K3 platforms (which include AM62x, > + ? AM64x, AM65x and more). > + > + ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > new file mode 100644 > index 000000000000..e3074a398d62 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256? b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06? core-secdev-k3-08.06.00.007.tar.xz > +sha256? 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369? manifest/k3-secdev-0.2-manifest.html > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > new file mode 100644 > index 000000000000..f7655a0fefc8 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# ti-k3-core-secdev > +# > +################################################################################ > + > +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 > +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot > +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz > +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES > +TI_K3_CORE_SECDEV_LICENSE = BSD-3-Clause > +TI_K3_CORE_SECDEV_LICENSE_FILES = manifest/k3-secdev-0.2-manifest.html > + > +TI_K3_CORE_SECDEV_INSTALL_DIR = $(BINARIES_DIR)/ti-k3-core-secdev > + > +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS > + mkdir -p $(TI_K3_CORE_SECDEV_INSTALL_DIR) > + cp -dpfr $(@D)/keys $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > + cp -dpfr $(@D)/scripts $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > +endef > + > +$(eval $(generic-package)) -- Alexander Sverdlin. From yann.morin.1998 at free.fr Sat Feb 17 17:08:40 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 18:08:40 +0100 Subject: [Buildroot] [PATCH] package/sudo: fix build with uClibc Message-ID: <20240217170840.3623044-1-yann.morin.1998@free.fr> uClibc lacks process_vm_readv(), and sudo fails to build: ./exec_ptrace.c: In function ?ptrace_write_vec?: ./exec_ptrace.c:895:9: error: ?nwritten? undeclared (first use in this function); did you mean ?pwrite?? 895 | nwritten = ptrace_write_string(pid, strtab, vec[i]); | ^~~~~~~~ | pwrite The fix is pretty trivial, and has been submitted upstream. Signed-off-by: Yann E. MORIN --- ...e-fix-build-without-precess_vm_readv.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch diff --git a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch new file mode 100644 index 0000000000..b1b18d610c --- /dev/null +++ b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch @@ -0,0 +1,41 @@ +From 3e765b6c5975077758e7b0a2a955dc7f7b2b94e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 17 Feb 2024 17:52:45 +0100 +Subject: [PATCH] src/exec_ptrace: fix build without precess_vm_readv() + +Commit 32f4b98f6b4a (sudo frontend: silence most -Wconversion warnings.) +broke the build on C libraries that miss process_vm_readv(), like +uClibc-ng. + +Indeed, the ssize_t nwritten is declared guarded by HAVE_PROCESS_VM_READV, +but is then re-assigned and used a few lines below, outside any guard. + +Fix that by always declaring the object, as it is always needed. + +Signed-off-by: Yann E. MORIN +Upstream: https://github.com/sudo-project/sudo/pull/359 +--- + src/exec_ptrace.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c +index 9dd36c275..3d44b82e2 100644 +--- a/src/exec_ptrace.c ++++ b/src/exec_ptrace.c +@@ -878,11 +878,12 @@ ptrace_write_vec(pid_t pid, struct sudo_ptrace_regs *regs, char **vec, + unsigned long addr, unsigned long strtab) + { + const unsigned long strtab0 = strtab; ++ ssize_t nwritten; + size_t i; + debug_decl(ptrace_write_vec, SUDO_DEBUG_EXEC); + + #ifdef HAVE_PROCESS_VM_READV +- ssize_t nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); ++ nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); + if (nwritten != -1 || errno != ENOSYS) + debug_return_ssize_t(nwritten); + #endif /* HAVE_PROCESS_VM_READV */ +-- +2.43.0 + -- 2.43.0 From alexander.sverdlin at gmail.com Sat Feb 17 17:28:35 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 18:28:35 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> Message-ID: <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. In this case, let's copy it to the binaries directory. > > Signed-off-by: Dario Binacchi https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-12-romain.naour at smile.fr/ looks more complete with sysfw.itb? > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > ?boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ > ?1 file changed, 3 insertions(+) > > diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 2a10024aedaa..643298a1e70a 100644 > --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS > ? $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > ?endef > ? > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > + > ?define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > ? cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > ?endef > ? > ?$(eval $(kconfig-package)) -- Alexander Sverdlin. From yann.morin.1998 at free.fr Sat Feb 17 17:29:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 18:29:23 +0100 Subject: [Buildroot] [PATCH] package/sudo: drop legacy, useless, and broken post-configure hook Message-ID: <20240217172923.3629905-1-yann.morin.1998@free.fr> Commit b9e89b340e27 (sudo: bump version) introduced the explicit build of mksigname and mksiglist as host tools, as they were required to run on the build machine, to generate C code then used to build the target program. This is now failing to build since the bump to sudo 1.9.15p5 in commit c87746afefe7 (package/sudo: security bump to version 1.9.15p5) (lines manually wrapped and slightly elided for ease of reviewing): /usr/bin/cpp \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -I../../include \ -I../.. \ ./sys_signame.h \ | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h In file included from /usr/include/features.h:394, from /usr/include/sys/types.h:25, from ./sys_signame.h:4: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ /usr/bin/gcc -I../../include -I../.. -I. -I. \ -D_PATH_SUDO_CONF=\"/etc/sudo.conf\" -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -DDEFAULT_TEXT_DOMAIN=\"sudo\" \ -O2 \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ ./mksigname.c -o mksigname In file included from /usr/include/features.h:394, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdlib.h:26, from ./mksigname.c:27: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ make[2]: *** [Makefile:263: mksigname] Error 1 The core of the issue has not been really identifie, but it turns out that neither mksiglist nor mksignames is used during the build. This has been tested with a minimal sudo with no option, and with a sudo with all options enabled (linux-pam, zlib, opensldap, and openssl), with the three types of C libraries (glibc, musl, and uClibc-ng). Digging in the sudo buildsystem did not reveal an obvious reason when those would be needed either. Drop the hook now it seems it is no longer used and is atually breasking the build. Fixes: http://autobuild.buildroot.org/results/72f/72ff18fb9b41394a29006f881ee1fbea67a66a09/ Note that there is a second issue in there: the call to the host cpp fails, but since it is on the LHS of a pipe, the error is lost, as the RHS of the pipe (the sed call) succeeds; a fix for that will be send in a separate patch. Reported-by: Christian Stewart Signed-off-by: Yann E. MORIN Cc: Peter Korsgaard --- package/sudo/sudo.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index a4e838dd94..7961a99002 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -58,15 +58,6 @@ else SUDO_CONF_OPTS += --disable-openssl endif -# mksigname/mksiglist needs to run on build host to generate source files -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - $(MAKE) $(HOST_CONFIGURE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ - -C $(@D)/lib/util mksigname mksiglist -endef - -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - define SUDO_PERMISSIONS /usr/bin/sudo f 4755 0 0 - - - - - endef -- 2.43.0 From yann.morin.1998 at free.fr Sat Feb 17 17:31:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 18:31:18 +0100 Subject: [Buildroot] build failure on Ubuntu 22.04 LTS: TIME_BITS=64 is allowed only with FILE_OFFSET_BITS=64 In-Reply-To: References: Message-ID: Christian, All, On 2024-02-17 12:55 +0100, Yann E. MORIN spake thusly: > On 2024-02-17 01:32 -0800, Christian Stewart via buildroot spake thusly: > > On a fresh Ubuntu 22.04.4 LTS VM: > That also happens on Fedora 39. [--SNIP--] > /usr/bin/cpp \ > -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ > -I../../include \ > -I../.. \ > ./sys_signame.h \ > | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h > In file included from /usr/include/features.h:394, > from /usr/include/sys/types.h:25, > from ./sys_signame.h:4: > /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > | ^~~~~ [--SNIP--] > @@ -65,7 +65,7 @@ define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > -C $(@D)/lib/util mksigname mksiglist > endef > > -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > +#SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > > define SUDO_PERMISSIONS > /usr/bin/sudo f 4755 0 0 - - - - - > > $ make sudo-build > [ succeeds ] > > OK, so is that supperfluous at all nowadays? > > Can you further investigate, enabling PAM et al in turn and see if any > optional dependency triggers a call to those two utilities? If not, can > you look sunce when that is no longer needed and why? I've now sent a patch for that: https://patchwork.ozlabs.org/project/buildroot/patch/20240217172923.3629905-1-yann.morin.1998 at free.fr/ Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From alexander.sverdlin at gmail.com Sat Feb 17 17:40:33 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 18:40:33 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <4a8d7f2252b46118554a9e22c49901822e461f2f.camel@gmail.com> Hi Dario! On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > This series, which in my humble opinion, should have been immediately > considered to correct the compilation errors in case of HS-FS devcies, has > seen an increase in patches in version 4 to remove the ti-k3-image-gen I wasn't aware of the preceeding versions, but... > package thanks to Binman. Additionally, it shares some modifications and > views on how to implement certain changes with the series > https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > Therefore, I think it is necessary not to run them in parallel but to decide > whether to merge one before the other or to consider a single series where > the patches can be coherent with each other. I am available for both solutions. > Let me know. ... as the broken HS-FS went unnoticed, seems there is no rush to fix the build now? I'd vote for a combined series, because yours and Romains do overlap here and there, but I personally would pick different parts from different series. I'd not introduce secdev package unless absolutely necessary, and I actually build HS-FS images with yocto with custom keys and using upstream U-Boot binman alone, so maybe I miss something, but I don't see the package as required. >From my side I can offer testing on SK-AM62x variants, both GP and HS-FS. I will definitely test your v4 because in contrast to Romain's U-Boot v2024.01 bump yours may actually boot... -- Alexander Sverdlin. From yann.morin.1998 at free.fr Sat Feb 17 17:46:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 18:46:27 +0100 Subject: [Buildroot] build failure on Ubuntu 22.04 LTS: TIME_BITS=64 is allowed only with FILE_OFFSET_BITS=64 In-Reply-To: References: Message-ID: Christian, All, On 2024-02-17 12:55 +0100, Yann E. MORIN spake thusly: [--SNIP--] > The first, which is the easiest to fix, is that the call to cpp is > piped into a call to sed. cpp fails, but because of the pipe, its exit > status is lost. The sed succeeds, though, so the rule as a whole > succeeds. Then the call to gcc fails, which is fortunate, or we'd have > missed the previous failure of cpp. This is trivial to fix: use a temp > file for the output of cpp, and run the sed with that temp file as > input, as a separate command in the same rule: > > --- lib/util/Makefile.orig 2024-02-17 12:25:13.554448884 +0100 > +++ lib/util/Makefile 2024-02-17 12:26:20.727968989 +0100 > @@ -273,10 +273,12 @@ > fi > > mksiglist.h: $(srcdir)/sys_siglist.h > - $(CPP) $(CPPFLAGS) $(srcdir)/sys_siglist.h | $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksiglist.h > + $(CPP) $(CPPFLAGS) $(srcdir)/sys_siglist.h > mksiglist.h.tmp > + $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < mksiglist.h.tmp > mksiglist.h > > mksigname.h: $(srcdir)/sys_signame.h > - $(CPP) $(CPPFLAGS) $(srcdir)/sys_signame.h | $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h > + $(CPP) $(CPPFLAGS) $(srcdir)/sys_signame.h > mksigname.h.tmp > + $(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < mksigname.h.tmp > mksigname.h > > closefrom_test: $(CLOSEFROM_TEST_OBJS) libsudo_util.la > $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(CLOSEFROM_TEST_OBJS) libsudo_util.la $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(HARDENING_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS) I've now sent a patch for that: https://github.com/sudo-project/sudo/pull/360 Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From ju.o at free.fr Sat Feb 17 18:45:20 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 17 Feb 2024 19:45:20 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add mariadb runtime test Message-ID: <20240217184521.298639-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_mariadb.py | 195 ++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 support/testing/tests/package/test_mariadb.py diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..cf6e4c51d4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1814,6 +1814,7 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_mariadb.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py diff --git a/support/testing/tests/package/test_mariadb.py b/support/testing/tests/package/test_mariadb.py new file mode 100644 index 0000000000..523f075db1 --- /dev/null +++ b/support/testing/tests/package/test_mariadb.py @@ -0,0 +1,195 @@ +import os + +import infra.basetest + + +class TestMariaDB(infra.basetest.BRTest): + # We use a specific configuration for: + # - using Aarch64, to have more than 256MB memory, + # - to have an ext4 rootfs image exposed as a virtio storage + # (rather than cpio initrd). This will save some memory, as the + # rootfs image is big. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.78" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_MYSQL=y + BR2_PACKAGE_MARIADB=y + BR2_PACKAGE_MARIADB_SERVER=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="512M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + # Configuration for the test + db_adminuser = "root" + db_admin = "mysql" + db_user = "br_user" + db_name = "br_database" + backup_file = "dump.sql" + + def run_user_db_query(self, user, database, query, opts=None): + cmd = f"mariadb --user={user} --database={database}" + cmd += f' --execute="{query}"' + if opts is not None: + cmd += " " + opts + self.assertRunOk(cmd) + + def run_admin_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_adminuser, self.db_admin, query, opts) + + def run_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_user, self.db_name, query, opts) + + def cleanup_database(self): + # This cleanup is useful when run-test -k is used. It makes + # this test idempotent. Since the drive storage is preserved + # between reboots, this cleanup will prevent errors during the + # user/db creation. + + # Drop the test database, if it exists. + sql_query = f"DROP USER IF EXISTS {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + # Drop the test user, if it exists. + sql_query = f"DROP DATABASE IF EXISTS {self.db_name};" + self.run_admin_sql_query(sql_query) + + def create_tables(self): + sql_query = "CREATE TABLE fruits (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE colors (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE fruit_colors (" + sql_query += "fruit_id integer REFERENCES fruits(id), " + sql_query += "color_id integer REFERENCES colors(id), " + sql_query += "UNIQUE (fruit_id, color_id));" + self.run_sql_query(sql_query) + + def insert_data(self): + fruits = ["Banana", "Blueberry", "Orange", "Raspberry"] + fruit_id = 1 + for fruit in fruits: + sql_query = "INSERT INTO fruits (id, name) " + sql_query += f"VALUES ({fruit_id}, '{fruit}');" + self.run_sql_query(sql_query) + fruit_id += 1 + + colors = ["Blue", "Orange", "Red", "Yellow"] + color_id = 1 + for color in colors: + sql_query = "INSERT INTO colors (id, name) " + sql_query += f"VALUES ({color_id}, '{color}');" + self.run_sql_query(sql_query) + color_id += 1 + + fruit_colors = [(1, 4), (2, 1), (3, 2), (4, 3)] + for fruit_color in fruit_colors: + fruit_id, color_id = fruit_color + sql_query = "INSERT INTO fruit_colors (fruit_id, color_id) " + sql_query += f"VALUES ({fruit_id}, {color_id});" + self.run_sql_query(sql_query) + + def query_database(self): + sql_query = "SELECT " + sql_query += "fruits.name AS fruit, colors.name AS color " + sql_query += "FROM fruits, colors, fruit_colors " + sql_query += "WHERE fruits.id = fruit_colors.fruit_id " + sql_query += "AND colors.id = fruit_colors.color_id " + sql_query += "ORDER BY fruit;" + self.run_sql_query(sql_query) + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "2G", + "-smp", "2", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Check the server binary can execute. + self.assertRunOk("mariadbd --version") + + # Check the client binary can execute. + self.assertRunOk("mariadb --version") + + # Check the server is ready. + self.assertRunOk("mariadb-admin ping") + + # Query the server version from the client. + sql_query = "SELECT version();" + self.run_admin_sql_query(sql_query, opts="-N -s") + + self.cleanup_database() + + # Create a new user. + sql_query = f"CREATE USER {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + # Create a new database. + sql_query = f"CREATE DATABASE {self.db_name}" + sql_query += " COMMENT = 'Test Database for Buildroot Test';" + self.run_admin_sql_query(sql_query) + + # Grant all permission on this new database to our test user. + sql_query = "GRANT ALL PRIVILEGES" + sql_query += f" ON {self.db_name}.*" + sql_query += f" TO {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + self.create_tables() + + self.insert_data() + + self.query_database() + + # Update a table. + sql_query = "UPDATE fruits SET name = 'Lemon' WHERE id = 1;" + self.run_sql_query(sql_query) + + # Backup the test database. + cmd = f"mariadb-dump --user={self.db_user}" + cmd += f" {self.db_name} > {self.backup_file}" + self.assertRunOk(cmd) + + # Drop all the tables. + sql_query = "DROP TABLE fruit_colors, fruits, colors;" + self.run_sql_query(sql_query) + + # Query the server status. + self.assertRunOk("mariadb-admin status") + + # Stop the server. + self.assertRunOk("/etc/init.d/S97mysqld stop") + + # Check the server is stopped. + _, exit_code = self.emulator.run("mariadb-admin ping") + self.assertNotEqual(exit_code, 0) + + # Restart the server. + self.assertRunOk("/etc/init.d/S97mysqld start") + + # Restore the backup. + cmd = f"mariadb --user={self.db_user} --database={self.db_name}" + cmd += f" < {self.backup_file}" + self.assertRunOk(cmd) + + # Query one last time our data, to check the backup + # restoration succeeded. + self.query_database() -- 2.43.2 From yann.morin.1998 at free.fr Sat Feb 17 19:17:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 20:17:51 +0100 Subject: [Buildroot] [git commit] package/sudo: fix build with uClibc Message-ID: <20240217191831.1AEE987845@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0f0117ad942070717e495ac88af943a3b1f8fcec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master uClibc lacks process_vm_readv(), and sudo fails to build since commit c87746afefe7 (package/sudo: security bump to version 1.9.15p5), with errors such as: ./exec_ptrace.c: In function ???ptrace_write_vec???: ./exec_ptrace.c:895:9: error: ???nwritten??? undeclared (first use in this function); did you mean ???pwrite???? 895 | nwritten = ptrace_write_string(pid, strtab, vec[i]); | ^~~~~~~~ | pwrite Backport an upstream commit to fix the issue. Signed-off-by: Yann E. MORIN --- ...ptrace-fix-build-without-precess_vm_readv.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch new file mode 100644 index 0000000000..446f1d1797 --- /dev/null +++ b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch @@ -0,0 +1,41 @@ +From 5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 17 Feb 2024 17:52:45 +0100 +Subject: [PATCH] src/exec_ptrace: fix build without precess_vm_readv() + +Commit 32f4b98f6b4a (sudo frontend: silence most -Wconversion warnings.) +broke the build on C libraries that miss process_vm_readv(), like +uClibc-ng. + +Indeed, the ssize_t nwritten is declared guarded by HAVE_PROCESS_VM_READV, +but is then re-assigned and used a few lines below, outside any guard. + +Fix that by always declaring the object, as it is always needed. + +Signed-off-by: Yann E. MORIN +Upstream: https://github.com/sudo-project/sudo/commit/5bbfaa8e68b5ee6f27d4fbfa3c4e789341724f9c +--- + src/exec_ptrace.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c +index 9dd36c275..3d44b82e2 100644 +--- a/src/exec_ptrace.c ++++ b/src/exec_ptrace.c +@@ -878,11 +878,12 @@ ptrace_write_vec(pid_t pid, struct sudo_ptrace_regs *regs, char **vec, + unsigned long addr, unsigned long strtab) + { + const unsigned long strtab0 = strtab; ++ ssize_t nwritten; + size_t i; + debug_decl(ptrace_write_vec, SUDO_DEBUG_EXEC); + + #ifdef HAVE_PROCESS_VM_READV +- ssize_t nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); ++ nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); + if (nwritten != -1 || errno != ENOSYS) + debug_return_ssize_t(nwritten); + #endif /* HAVE_PROCESS_VM_READV */ +-- +2.43.0 + From yann.morin.1998 at free.fr Sat Feb 17 19:19:51 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sat, 17 Feb 2024 20:19:51 +0100 Subject: [Buildroot] [PATCH] package/sudo: fix build with uClibc In-Reply-To: <20240217170840.3623044-1-yann.morin.1998@free.fr> References: <20240217170840.3623044-1-yann.morin.1998@free.fr> Message-ID: All, On 2024-02-17 18:08 +0100, Yann E. MORIN spake thusly: > uClibc lacks process_vm_readv(), and sudo fails to build: > > ./exec_ptrace.c: In function ?ptrace_write_vec?: > ./exec_ptrace.c:895:9: error: ?nwritten? undeclared (first use in this function); did you mean ?pwrite?? > 895 | nwritten = ptrace_write_string(pid, strtab, vec[i]); > | ^~~~~~~~ > | pwrite > > The fix is pretty trivial, and has been submitted upstream. The patch has been accepted upstream now. > Signed-off-by: Yann E. MORIN Applied to master, after tweaking the commit log explaining since when the issue occurs, and making the patch an actual backport, thanks. Regards, Yann E. MORIN. > --- > ...e-fix-build-without-precess_vm_readv.patch | 41 +++++++++++++++++++ > 1 file changed, 41 insertions(+) > create mode 100644 package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch > > diff --git a/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch > new file mode 100644 > index 0000000000..b1b18d610c > --- /dev/null > +++ b/package/sudo/0001-src-exec_ptrace-fix-build-without-precess_vm_readv.patch > @@ -0,0 +1,41 @@ > +From 3e765b6c5975077758e7b0a2a955dc7f7b2b94e7 Mon Sep 17 00:00:00 2001 > +From: "Yann E. MORIN" > +Date: Sat, 17 Feb 2024 17:52:45 +0100 > +Subject: [PATCH] src/exec_ptrace: fix build without precess_vm_readv() > + > +Commit 32f4b98f6b4a (sudo frontend: silence most -Wconversion warnings.) > +broke the build on C libraries that miss process_vm_readv(), like > +uClibc-ng. > + > +Indeed, the ssize_t nwritten is declared guarded by HAVE_PROCESS_VM_READV, > +but is then re-assigned and used a few lines below, outside any guard. > + > +Fix that by always declaring the object, as it is always needed. > + > +Signed-off-by: Yann E. MORIN > +Upstream: https://github.com/sudo-project/sudo/pull/359 > +--- > + src/exec_ptrace.c | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/src/exec_ptrace.c b/src/exec_ptrace.c > +index 9dd36c275..3d44b82e2 100644 > +--- a/src/exec_ptrace.c > ++++ b/src/exec_ptrace.c > +@@ -878,11 +878,12 @@ ptrace_write_vec(pid_t pid, struct sudo_ptrace_regs *regs, char **vec, > + unsigned long addr, unsigned long strtab) > + { > + const unsigned long strtab0 = strtab; > ++ ssize_t nwritten; > + size_t i; > + debug_decl(ptrace_write_vec, SUDO_DEBUG_EXEC); > + > + #ifdef HAVE_PROCESS_VM_READV > +- ssize_t nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); > ++ nwritten = ptrace_writev_vec(pid, regs, vec, addr, strtab); > + if (nwritten != -1 || errno != ENOSYS) > + debug_return_ssize_t(nwritten); > + #endif /* HAVE_PROCESS_VM_READV */ > +-- > +2.43.0 > + > -- > 2.43.0 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From alexander.sverdlin at gmail.com Sat Feb 17 20:06:21 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:06:21 +0100 Subject: [Buildroot] [PATCH v4 01/20] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240217160244.1320482-2-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-2-dario.binacchi@amarulasolutions.com> Message-ID: Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Checking the output of the command `git grep PLATFORM | grep k3`, we can > found the proper settings for the optee-os package: > > .github/workflows/ci.yml:????????? _make PLATFORM=k3-am62x > .github/workflows/ci.yml:????????? _make PLATFORM=k3-am62x CFG_ARM64_core=y > ... > core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) > > Suggested-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > ?configs/ti_am62x_sk_defconfig | 3 ++- > ?1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index f88252a89c68..fde6f8f5636a 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -21,7 +21,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > ?BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y this looks even more complete than https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-3-romain.naour at smile.fr/ Reviewed-by: Alexander Sverdlin -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:08:14 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:08:14 +0100 Subject: [Buildroot] [PATCH v4 02/20] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240217160244.1320482-3-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-3-dario.binacchi@amarulasolutions.com> Message-ID: <69a15ccedfcde5649a770aff60752f5ecc3ece88.camel@gmail.com> Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Checking the output of the command `git grep PLATFORM | grep k3`, we can > found the proper settings for the optee-os package: > > .github/workflows/ci.yml:????????? _make PLATFORM=k3-am64x > .github/workflows/ci.yml:????????? _make PLATFORM=k3-am64x CFG_ARM64_core=y > ... > core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) > > Suggested-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > ?configs/ti_am64x_sk_defconfig | 3 ++- > ?1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 4bfd31f0c8d3..98476c88626b 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -21,7 +21,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > ?BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > ?BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > ?BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y again, more complete than https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-4-romain.naour at smile.fr/ Reviewed-by: Alexander Sverdlin -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:20:22 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:20:22 +0100 Subject: [Buildroot] [PATCH v4 15/20] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240217160244.1320482-16-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-16-dario.binacchi@amarulasolutions.com> Message-ID: <73868728d467604fa82ada93e652c23eca4afaa6.camel@gmail.com> On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > The 2024.01 version of U-Boot for the am62x-sk board has introduced two > major changes: > - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in > ? /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET > ? and the use of extlinux.conf for the proper loading of the device tree. > ? Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to > ? auto-generate the extlinux.conf file so that developers can change the > ? kernel loading options by modifying the .config. > - The use of binman for building images. > > Tested on SK-AM62B-P1. > > Signed-off-by: Dario Binacchi [] > @@ -27,14 +27,15 @@ BR2_TARGET_TI_K3_IMAGE_GEN=y > ?BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y > ?BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" Is patch 3/20 really required in this case? Is custom version required if you set the same version as default in patch 5/20? -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:27:36 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:27:36 +0100 Subject: [Buildroot] [PATCH v4 16/20] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 In-Reply-To: <20240217160244.1320482-17-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-17-dario.binacchi@amarulasolutions.com> Message-ID: Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Tested on SK-AM62B-P1. > > Signed-off-by: Dario Binacchi > > --- > > Changes in v4 > - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. > > no changes since v1 > > Signed-off-by: Dario Binacchi > --- > ?configs/ti_am62x_sk_defconfig | 4 ++-- > ?1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 193301c8b941..4de39fb897fd 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,11 +1,11 @@ > ?BR2_aarch64=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > ?BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > ?BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > ?BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > ?BR2_LINUX_KERNEL=y > ?BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.1" Could be updated to v6.6.17 if you re-spin? > ?BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > ?BR2_LINUX_KERNEL_DTS_SUPPORT=y > ?BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:33:19 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:33:19 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> Message-ID: Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Recent versions of U-Boot can use Binman to compile and sign the generated > binaries, thus making the use of custom tools like ti-k3-image-gen no > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > configured and used outside of it. This patch allows setting such options > even if the package is not enabled. Missing SoB? The patch looks more complete to me than https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-13-romain.naour at smile.fr/ because of SECTYPE variables. Reviewed-by: Alexander Sverdlin > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > ?boot/ti-k3/Config.in????????????????????????? | 46 ++++++++++++++ > ?boot/ti-k3/ti-k3-image-gen/Config.in????????? | 63 ++----------------- > ?boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk |? 6 +- > ?boot/uboot/Config.in????????????????????????? |? 7 +-- > ?configs/ti_am62x_sk_defconfig???????????????? |? 2 +- > ?configs/ti_am64x_sk_defconfig???????????????? |? 2 +- > ?6 files changed, 59 insertions(+), 67 deletions(-) > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > index 06dda2f156a9..9e508326c9c8 100644 > --- a/boot/ti-k3/Config.in > +++ b/boot/ti-k3/Config.in > @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > ? > ?if BR2_TARGET_TI_K3 > ? > +choice > + prompt "SoC family" > + > +config BR2_TARGET_TI_K3_SOC_AM62AX > + bool "am62ax" > + > +config BR2_TARGET_TI_K3_SOC_AM62X > + bool "am62x" > + > +config BR2_TARGET_TI_K3_SOC_AM64X > + bool "am64x" > + > +config BR2_TARGET_TI_K3_SOC_AM65X > + bool "am65x" > + > +endchoice > + > +choice > + prompt "Security type" > + help > + ? The target SoC security type option. > + > +config BR2_TARGET_TI_K3_SECTYPE_GP > + bool "gp" > + > +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > + bool "hs-fs" > + > +config BR2_TARGET_TI_K3_SECTYPE_HS > + bool "hs" > + > +endchoice > + > +config BR2_TARGET_TI_K3_SOC > + string > + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > + default "am62x"? if BR2_TARGET_TI_K3_SOC_AM62X > + default "am64x"? if BR2_TARGET_TI_K3_SOC_AM64X > + default "am65x"? if BR2_TARGET_TI_K3_SOC_AM65X > + > +config BR2_TARGET_TI_K3_SECTYPE > + string > + default "gp"??? if BR2_TARGET_TI_K3_SECTYPE_GP > + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > + default "hs"??? if BR2_TARGET_TI_K3_SECTYPE_HS > + > ?source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > ?source "boot/ti-k3/ti-k3-core-secdev/Config.in" > ?source "boot/ti-k3/ti-k3-image-gen/Config.in" > diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > index 38d1598d9fc0..2d53d62dd4ee 100644 > --- a/boot/ti-k3/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > ? bool "ti-k3-image-gen" > ? depends on BR2_TARGET_TI_K3_R5_LOADER > ? select BR2_TARGET_TI_K3_BOOT_FIRMWARE > - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > ? # We need FIT support in uboot-tools, which is why we select a > ? # host package > ? select BR2_PACKAGE_HOST_UBOOT_TOOLS > @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > ? ? https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > ? > ?if BR2_TARGET_TI_K3_IMAGE_GEN > -choice > - prompt "SoC family" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - bool "am62ax" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - bool "am62x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - bool "am64x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - bool "am65x" > - > -endchoice > - > -choice > - prompt "Security type" > - help > - ? The target SoC security type option for image gen.? Valid > - ? options are "gp" for General Purpose devices, "hs-fs" for > - ? High Security - Field Securable devices, or "hs" for High > - ? Security - Security Enforcing devices.? Note for all High > - ? Security device variants the TI_SECURE_DEV_PKG environmental > - ? variable must be defined at build time pointing to a valid > - ? core-secdev-k3 folder location, otherwise the build will > - ? fail, see > - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - bool "gp" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - bool "hs-fs" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > - bool "hs" > - > -endchoice > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > - string > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62x"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "am64x"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "am65x"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > ? > ?config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > ? string > - default "ti-fs"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "ti-fs"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > - string > - default "gp"??? if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - default "hs"??? if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + default "ti-fs"? if BR2_TARGET_TI_K3_SOC_AM62AX > + default "ti-fs"? if BR2_TARGET_TI_K3_SOC_AM62X > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > ? > ?endif > diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > index 74b4fcb4bf89..834d8f7d5cd5 100644 > --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > ? $(BR2_MAKE_HOST_DEPENDENCY) > ? > ?TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > ? > -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > ?TI_K3_IMAGE_GEN_SYSFW = \ > ? $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > ?else > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index beafb38930db..1a9d21e7c6d1 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > ? bool "U-Boot needs TI K3 Device Manager (DM)" > ? # We use the SoC selection defined for the ti-k3-image-gen > ? # package > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > ? help > ? ? Some TI K3 devices need the Device Manager (DM) firmware to > ? ? be available for the U-Boot build. > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > ? > ?config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > ? string > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62xx"? if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > + default "am62xx"? if BR2_TARGET_TI_K3_SOC_AM62X > ? > ?endif > ? > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index cd26235342e4..cfefce0a77a4 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > ?BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > ?BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > ?BR2_TARGET_TI_K3=y > +BR2_TARGET_TI_K3_SOC_AM62X=y > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y > ?BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > ?BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 1befeb4ab96c..daf78dbffff8 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > ?BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > ?BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > ?BR2_TARGET_TI_K3=y > +BR2_TARGET_TI_K3_SOC_AM64X=y > ?BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > ?BR2_TARGET_TI_K3_R5_LOADER=y > ?BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > ?BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:38:22 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:38:22 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Message-ID: Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > The patch set the BINMAN_INDIRS environment variable to provide the > directory to search for binary blobs and select the packages required by > binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi I personally do not see why binman usage should be configurable as in https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ your patch looks simpler, Reviewed-by: Alexander Sverdlin > --- > > Changes in v4: > - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > Changes in v2: > - Change commit message > - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > - Select packages required by binman if > ? BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > > Signed-off-by: Dario Binacchi > --- > ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- > ?1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0ffcb8235f2e..2a10024aedaa 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ > ? host-pkgconf \ > ? $(BR2_MAKE_HOST_DEPENDENCY) \ > ? host-arm-gnu-toolchain \ > - host-openssl > + host-openssl \ > + host-python-attrs \ > + host-python-jsonschema \ > + host-python-jsonschema-specifications \ > + host-python-pyyaml \ > + host-python-referencing \ > + host-python-rpds-py > ? > ?TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > ?TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ > ? $(BR2_BISON_HOST_DEPENDENCY) \ > ? $(BR2_FLEX_HOST_DEPENDENCY) > ? > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) > +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt > +endif > + > ?ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) > ?TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig > ?else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) > @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > ? CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ? ARCH=arm \ > ? HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > + BINMAN_INDIRS=$(BINARIES_DIR) \ > ? HOSTLDFLAGS="$(HOST_LDFLAGS)" > ? > ?define TI_K3_R5_LOADER_BUILD_CMDS -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 20:44:29 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 21:44:29 +0100 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> Message-ID: <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > As explained in [1], adding support for AM62x LP SK in U-Boot, requires > binman for building bootloader images. The BINMAN_INDIRS environment > variable is used to provide a space-separated list of directories to > search for binary blobs. > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > Signed-off-by: Dario Binacchi > > --- > > no changes since v1: > > Signed-off-by: Dario Binacchi > --- > ?boot/uboot/uboot.mk | 3 ++- > ?1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dda606a88059..cf70f86a4132 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -189,7 +189,8 @@ endif > ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > ?UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > ?UBOOT_DEPENDENCIES += ti-k3-boot-firmware > -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ Is the above actually still required with binman? The names are hardcoded in U-Boot in arch/arm/dts/k3-am625-sk-binman.dtsi > + BINMAN_INDIRS=$(BINARIES_DIR) This seems to be the only required part. > ?endif > ? > ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) -- Alexander Sverdlin. From francois.perrad at gadz.org Sat Feb 17 21:05:10 2024 From: francois.perrad at gadz.org (=?UTF-8?Q?Fran=C3=A7ois_Perrad?=) Date: Sat, 17 Feb 2024 22:05:10 +0100 Subject: [Buildroot] [PATCH v4 17/20] boot: move ti-k3-* packages to 'ti-k3' directory In-Reply-To: <20240217160244.1320482-18-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-18-dario.binacchi@amarulasolutions.com> Message-ID: Le sam. 17 f?vr. 2024 ? 17:03, Dario Binacchi < dario.binacchi at amarulasolutions.com> a ?crit : > Move all TI K3 packages to the directory ti-k3. > The Buildroot documentation states that "New subdirectories are discouraged". See https://buildroot.org/downloads/manual/manual.html#_package_directory Fran?ois > This patch is preparatory for future developments. > > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > boot/Config.in | 5 +---- > boot/ti-k3/Config.in | 13 +++++++++++++ > boot/ti-k3/common.mk | 1 + > boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 > .../ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 0 > .../ti-k3-boot-firmware/ti-k3-boot-firmware.mk | 0 > boot/{ => ti-k3}/ti-k3-core-secdev/Config.in | 0 > .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 0 > .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 0 > boot/{ => ti-k3}/ti-k3-image-gen/Config.in | 0 > .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 > boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk | 0 > boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 0 > .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 0 > boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk | 0 > configs/ti_am62x_sk_defconfig | 1 + > configs/ti_am64x_sk_defconfig | 1 + > 17 files changed, 17 insertions(+), 4 deletions(-) > create mode 100644 boot/ti-k3/Config.in > create mode 100644 boot/ti-k3/common.mk > rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > (100%) > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) > rename boot/{ => ti-k3}/ti-k3-core-secdev/Config.in (100%) > rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.hash (100%) > rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.mk (100%) > rename boot/{ => ti-k3}/ti-k3-image-gen/Config.in (100%) > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (100%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (100%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (100%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (100%) > > diff --git a/boot/Config.in b/boot/Config.in > index 18a7d268f95a..74a64a096afc 100644 > --- a/boot/Config.in > +++ b/boot/Config.in > @@ -19,10 +19,7 @@ source "boot/opensbi/Config.in" > source "boot/s500-bootloader/Config.in" > source "boot/shim/Config.in" > source "boot/syslinux/Config.in" > -source "boot/ti-k3-boot-firmware/Config.in" > -source "boot/ti-k3-core-secdev/Config.in" > -source "boot/ti-k3-image-gen/Config.in" > -source "boot/ti-k3-r5-loader/Config.in" > +source "boot/ti-k3/Config.in" > source "boot/uboot/Config.in" > source "boot/vexpress-firmware/Config.in" > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > new file mode 100644 > index 000000000000..06dda2f156a9 > --- /dev/null > +++ b/boot/ti-k3/Config.in > @@ -0,0 +1,13 @@ > +config BR2_TARGET_TI_K3 > + bool "TI K3" > + help > + The TI K3 bootloaders and tools. > + > +if BR2_TARGET_TI_K3 > + > +source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > +source "boot/ti-k3/ti-k3-core-secdev/Config.in" > +source "boot/ti-k3/ti-k3-image-gen/Config.in" > +source "boot/ti-k3/ti-k3-r5-loader/Config.in" > + > +endif > diff --git a/boot/ti-k3/common.mk b/boot/ti-k3/common.mk > new file mode 100644 > index 000000000000..18a1329baa4c > --- /dev/null > +++ b/boot/ti-k3/common.mk > @@ -0,0 +1 @@ > +include $(sort $(wildcard boot/ti-k3/*/*.mk)) > diff --git a/boot/ti-k3-boot-firmware/Config.in > b/boot/ti-k3/ti-k3-boot-firmware/Config.in > similarity index 100% > rename from boot/ti-k3-boot-firmware/Config.in > rename to boot/ti-k3/ti-k3-boot-firmware/Config.in > diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > similarity index 100% > rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash > diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > similarity index 100% > rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk > diff --git a/boot/ti-k3-core-secdev/Config.in > b/boot/ti-k3/ti-k3-core-secdev/Config.in > similarity index 100% > rename from boot/ti-k3-core-secdev/Config.in > rename to boot/ti-k3/ti-k3-core-secdev/Config.in > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash > similarity index 100% > rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk > similarity index 100% > rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk > diff --git a/boot/ti-k3-image-gen/Config.in > b/boot/ti-k3/ti-k3-image-gen/Config.in > similarity index 100% > rename from boot/ti-k3-image-gen/Config.in > rename to boot/ti-k3/ti-k3-image-gen/Config.in > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash > b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash > similarity index 100% > rename from boot/ti-k3-image-gen/ti-k3-image-gen.hash > rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > similarity index 100% > rename from boot/ti-k3-image-gen/ti-k3-image-gen.mk > rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > diff --git a/boot/ti-k3-r5-loader/Config.in > b/boot/ti-k3/ti-k3-r5-loader/Config.in > similarity index 100% > rename from boot/ti-k3-r5-loader/Config.in > rename to boot/ti-k3/ti-k3-r5-loader/Config.in > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash > b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash > similarity index 100% > rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.hash > rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > similarity index 100% > rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 4de39fb897fd..cd26235342e4 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > +BR2_TARGET_TI_K3=y > BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 5fd9653b5b8f..1befeb4ab96c 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > +BR2_TARGET_TI_K3=y > BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > BR2_TARGET_TI_K3_R5_LOADER=y > -- > 2.43.0 > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alexander.sverdlin at gmail.com Sat Feb 17 21:14:29 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sat, 17 Feb 2024 22:14:29 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <50656de7f9f23a436adeafeb47b13412904c7b17.camel@gmail.com> Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > high-security field-securable (HS-FS) silicon to optionally customize keys > and encryption for security applications. > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > which, however, was buggy. This series fixes the errors and bumps the Linux > kernel and U-Boot required for such a new device. > > This series, which in my humble opinion, should have been immediately > considered to correct the compilation errors in case of HS-FS devcies, has > seen an increase in patches in version 4 to remove the ti-k3-image-gen > package thanks to Binman. Additionally, it shares some modifications and > views on how to implement certain changes with the series > https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > Therefore, I think it is necessary not to run them in parallel but to decide > whether to merge one before the other or to consider a single series where > the patches can be coherent with each other. I am available for both solutions. > Let me know. > > Dario Binacchi (20): > ? configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > ??? setting > ? configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > ??? setting > ? configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > ??? version > ? configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > ??? version > ? boot/ti-k3-r5-loader: bump to version 2024.01 > ? boot/ti-k3-core-secdev: new package > ? boot/ti-k3-image-gen: manage HS hardware > ? package/python-jsonschema: add host variant > ? package/python-attrs: add host variant > ? package/python-referencing: add host variant > ? package/python-rpds-py: add host variant > ? package/python-jsonschema-specifications: add host variant > ? boot/ti-k3-r5-loader: set binman environment > ? boot/uboot: set BINMAN_INDIRS for TI K3 DM > ? configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > ? configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 > ? boot: move ti-k3-* packages to 'ti-k3' directory > ? boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > ? boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > ? configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore the series: - builds and starts on SK-AM62B (HS-FS) - builds for am62x GP Tested-by: Alexander Sverdlin -- Alexander Sverdlin. From alexander.sverdlin at gmail.com Sat Feb 17 23:45:47 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Sun, 18 Feb 2024 00:45:47 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> Message-ID: <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> Hi Dario, On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > The patch sets the configurations required by TI HS systems. Some of these > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > are provided by the ti-k3-core-secdev package in the binaries directory. > > Signed-off-by: Dario Binacchi so for test I've reverted the previous "boot/ti-k3-core-secdev: new package" commit, then... > --- > > no changes since v3: > > Signed-off-by: Dario Binacchi > --- > ?boot/ti-k3-image-gen/Config.in????????? |? 1 + > ?boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > ?2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > index d76cef82e911..38d1598d9fc0 100644 > --- a/boot/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3-image-gen/Config.in > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > ? bool "ti-k3-image-gen" > ? depends on BR2_TARGET_TI_K3_R5_LOADER > ? select BR2_TARGET_TI_K3_BOOT_FIRMWARE > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS ... removed this, ... > ? # We need FIT support in uboot-tools, which is why we select a > ? # host package > ? select BR2_PACKAGE_HOST_UBOOT_TOOLS > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > index 64be9a18f2c4..74b4fcb4bf89 100644 > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > ?TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > ?TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > ? > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +else > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev ... the above line, ... > + > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > +endif > ? > ?define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > + ) > ?endef > ? > ?define TI_K3_IMAGE_GEN_BUILD_CMDS > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > ? $(BR2_MAKE) -C $(@D) \ > ? SOC=$(TI_K3_IMAGE_GEN_SOC) \ > ? SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ ... and this line... > ? CONFIG=evm \ > ? CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ? SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ ... and everything still builds and boots fine on SK-AM62B (HS-FS): U-Boot SPL 2024.01 (Feb 18 2024 - 00:02:43 +0100) SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') SPL initial stack usage: 13400 bytes Trying to boot from MMC2 Authentication passed Authentication passed Authentication passed Authentication passed Authentication passed Starting ATF on ARM64 core... NOTICE: BL31: v2.7(release):v2.7 NOTICE: BL31: Built : 23:57:43, Feb 17 2024 I/TC: I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1199-g470b2069e4)) #1 Sat Feb 17 22:57:38 UTC 2024 aarch64 I/TC: WARNING: This OP-TEE configuration might be insecure! I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html I/TC: Primary CPU initializing I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') I/TC: HUK Initialized I/TC: Activated SA2UL device I/TC: Enabled firewalls for SA2UL TRNG device I/TC: SA2UL TRNG initialized I/TC: SA2UL Drivers initialized I/TC: Primary CPU switching to normal world boot U-Boot SPL 2024.01 (Feb 18 2024 - 00:03:30 +0100) SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') SPL initial stack usage: 1872 bytes Trying to boot from MMC2 Authentication passed Authentication passed U-Boot 2024.01 (Feb 18 2024 - 00:03:30 +0100) SoC: AM62X SR1.0 HS-FS Model: Texas Instruments AM625 SK DRAM: 2 GiB Core: 56 devices, 23 uclasses, devicetree: separate MMC: mmc at fa10000: 0, mmc at fa00000: 1 Loading Environment from nowhere... OK In: serial at 2800000 Out: serial at 2800000 Err: serial at 2800000 Net: eth0: ethernet at 8000000port@1 Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc1 is current device SD/MMC found on device 1 Failed to load 'uEnv.txt' Scanning for bootflows in all bootdevs Seq Method State Uclass Part Name Filename --- ----------- ------ -------- ---- ------------------------ ---------------- Scanning global bootmeth 'efi_mgr': No EFI system partition No EFI system partition Failed to persist EFI variables Scanning bootdev 'mmc at fa00000.bootdev': 0 extlinux ready mmc 1 mmc at fa00000.bootdev.part_ /extlinux/extlinux.conf ** Booting bootflow 'mmc at fa00000.bootdev.part_1' with extlinux 1: am62x-sk-buildroot Retrieving file: /Image append: console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 Retrieving file: /k3-am62x.dtb ## Flattened Device Tree blob at ffb14700 Booting using the fdt blob at 0xffb14700 Working FDT set to ffb14700 Loading Device Tree to 000000008ffed000, end 000000008ffff687 ... OK Working FDT set to 8ffed000 Starting kernel ... [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] [ 0.000000] Linux version 6.6.1 (...) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1199-g470b2069e4) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Sun Feb 18 00:37:47 CET 2024 -- Alexander Sverdlin. From gael.portay at rtone.fr Sun Feb 18 01:11:17 2024 From: gael.portay at rtone.fr (=?UTF-8?q?Ga=C3=ABl=20PORTAY?=) Date: Sun, 18 Feb 2024 02:11:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/musl: enable on s390x Message-ID: <20240218011118.1077002-1-gael.portay@rtone.fr> Add s390x musl supported archs. Upstream musl already supports s390x[1]. Tested with qemu_s390s_defconfig: $ output/host/bin/qemu-system-s390x -M s390-ccw-virtio -cpu max,zpci=on -m 4G -smp 2 -kernel output/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "rootwait root=/dev/vda net.ifnames=0 biosdevname=0" -display none -serial mon:stdio -net nic,model=virtio -net user (...) Welcome to Buildroot buildroot login: root # uname -a Linux buildroot 6.1.44 #2 SMP Sun Feb 18 01:33:42 CET 2024 s390x GNU/Linux # /lib/ld-musl-s390x.so.1 musl libc (s390x) Version 1.2.4 Dynamic Program Loader Usage: /lib/ld-musl-s390x.so.1 [options] [--] pathname [args] [1]: https://git.musl-libc.org/cgit/musl/commit/?id=15094943050eb9a564f409323070e50b40f78816 Signed-off-by: Ga?l PORTAY --- package/musl/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/musl/Config.in b/package/musl/Config.in index 89f41d2ff1..44654eff34 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_MUSL_ARCH_SUPPORTS default y if BR2_powerpc64 default y if BR2_powerpc64le default y if BR2_RISCV_64 + default y if BR2_s390x default y if BR2_sh default y if BR2_x86_64 depends on !BR2_POWERPC_CPU_HAS_SPE # not supported, build breaks -- 2.43.2 From kadambini.nema at gmail.com Sun Feb 18 01:16:53 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 17 Feb 2024 17:16:53 -0800 Subject: [Buildroot] [PATCH 1/1] package/google-breakpad: fix missing include error Message-ID: <20240218011653.790820-1-kadambini.nema@gmail.com> src/common/module.cc: In member function ?bool google_breakpad::Module::AddFunction(Function*)?: src/common/module.cc:194:52: error: ?find_if? is not a member of ?std?; did you mean ?find?? 194 | FunctionSet::iterator existing_function = std::find_if( | ^~~~~~~ | find Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed This error is seen on gcc-14. related links: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch Signed-off-by: Kadambini Nema --- ...ixed-missing-include-for-std-find_if.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch new file mode 100644 index 0000000000..80eab723b3 --- /dev/null +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch @@ -0,0 +1,24 @@ +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 +From: Nathan Moinvaziri +Date: Tue, 19 Dec 2023 14:35:05 -0800 +Subject: [PATCH] Fixed missing include for std::find_if. + +Throws an error when compiling on Windows. + +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 +Reviewed-by: Ivan Penkov +--- + +diff --git a/src/common/module.cc b/src/common/module.cc +index 0eb5aad..b6f5da7 100644 +--- a/src/common/module.cc ++++ b/src/common/module.cc +@@ -42,6 +42,7 @@ + #include + #include + ++#include + #include + #include + #include -- 2.25.1 From kadambini.nema at gmail.com Sun Feb 18 01:33:53 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 17 Feb 2024 17:33:53 -0800 Subject: [Buildroot] [PATCH 1/1] package dhcpdump: bump to version 1.9 Message-ID: <20240218013353.798627-1-kadambini.nema@gmail.com> - Change the site to a well maintained - https://github.com/bbonev/dhcpdump - Fix some of the reported build failures - autobuild.buildroot.org/?reason=dhcpdump-1.8 - Build test results ./utils/test-pkg -d br_test -k -c dhcpdump.config -p dhcpdump bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- ...Fix-build-with-gcc4.8-use-br-fortify.patch | 10 ++++++++ .../0001-use-non-bsd-structures.patch | 23 ------------------- package/dhcpdump/Config.in | 2 +- package/dhcpdump/dhcpdump.hash | 2 +- package/dhcpdump/dhcpdump.mk | 5 ++-- 5 files changed, 15 insertions(+), 27 deletions(-) create mode 100644 package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch diff --git a/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch new file mode 100644 index 0000000000..a5c1218c99 --- /dev/null +++ b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch @@ -0,0 +1,10 @@ +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2024-02-17 13:57:08.166161973 -0800 ++++ b/Makefile 2024-02-17 13:57:45.055153969 -0800 +@@ -1,5 +1,5 @@ + CFLAGS+=${CPPFLAGS} +-CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -g -O3 -fPIE ++CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -g -O3 -fPIE + LDFLAGS+=-g -Wl,-z,relro -Wl,-z,now -fPIE -pie + LIBS+=-lpcap + diff --git a/package/dhcpdump/0001-use-non-bsd-structures.patch b/package/dhcpdump/0001-use-non-bsd-structures.patch deleted file mode 100644 index 40115fb640..0000000000 --- a/package/dhcpdump/0001-use-non-bsd-structures.patch +++ /dev/null @@ -1,23 +0,0 @@ -The udphdr structure has uh_* fields when _FAVOR_BSD is -defined. Otherwise, the fields are just named source, dest, len and -check. See . - -Signed-off-by: Thomas Petazzoni - -Index: dhcpdump-1.8/dhcpdump.c -=================================================================== ---- dhcpdump-1.8.orig/dhcpdump.c 2011-05-17 20:20:46.506980003 +0200 -+++ dhcpdump-1.8/dhcpdump.c 2011-05-17 20:20:59.338979999 +0200 -@@ -163,10 +163,10 @@ - strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src)); - strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst)); - -- if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen))) -+ if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len))) - return; - -- printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen)); -+ printdata((u_char *)(sp + offset), ntohs(udp->len)); - } - - // check for matching CHADDR (Peter Apian-Bennewitz ) diff --git a/package/dhcpdump/Config.in b/package/dhcpdump/Config.in index e0abe040fc..30e42928e4 100644 --- a/package/dhcpdump/Config.in +++ b/package/dhcpdump/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_DHCPDUMP help A tool for monitoring dhcp requests using tcpdump. - http://www.mavetju.org/unix/general.php + https://github.com/bbonev/dhcpdump diff --git a/package/dhcpdump/dhcpdump.hash b/package/dhcpdump/dhcpdump.hash index a24db5b275..fdf3243ad1 100644 --- a/package/dhcpdump/dhcpdump.hash +++ b/package/dhcpdump/dhcpdump.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz +sha256 3658ac21cc33e79e72bed070454e49c543017991cb6c37f4253c85e9176869d1 dhcpdump-1.9.tar.xz sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk index ec9571c0af..4ce5047b2e 100644 --- a/package/dhcpdump/dhcpdump.mk +++ b/package/dhcpdump/dhcpdump.mk @@ -4,8 +4,9 @@ # ################################################################################ -DHCPDUMP_VERSION = 1.8 -DHCPDUMP_SITE = http://www.mavetju.org/download +DHCPDUMP_VERSION = 1.9 +DHCPDUMP_SITE = https://github.com/bbonev/dhcpdump/releases/download/v$(DHCPDUMP_VERSION) +DHCPDUMP_SOURCE = dhcpdump-$(DHCPDUMP_VERSION).tar.xz DHCPDUMP_DEPENDENCIES = libpcap DHCPDUMP_LICENSE = BSD-2-Clause DHCPDUMP_LICENSE_FILES = LICENSE -- 2.25.1 From kadambini.nema at gmail.com Sun Feb 18 06:16:52 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 17 Feb 2024 22:16:52 -0800 Subject: [Buildroot] [PATCH 1/1] package/dos2unix: bump version to 7.5.2 Message-ID: <20240218061652.1048008-1-kadambini.nema@gmail.com> Changelog: https://waterlan.home.xs4all.nl/dos2unix/ChangeLog.txt $ ./utils/test-pkg -d br_test -k -c dos2unix.config -p dos2unix bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/dos2unix/dos2unix.hash | 6 +++--- package/dos2unix/dos2unix.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash index 032c8ea2d2..d4d682cd0c 100644 --- a/package/dos2unix/dos2unix.hash +++ b/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 6d1e70cf26..e30fc999d4 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.5.0 +DOS2UNIX_VERSION = 7.5.2 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt -- 2.25.1 From kadambini.nema at gmail.com Sun Feb 18 06:22:39 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 17 Feb 2024 22:22:39 -0800 Subject: [Buildroot] [PATCH 1/1] package {sysrepo, libyang}: bump to version 2.2.150 (sysrepo), 2.1.148 (libyang) Message-ID: <20240218062239.1052785-1-kadambini.nema@gmail.com> Release notes: https://github.com/sysrepo/sysrepo/releases https://github.com/CESNET/libyang/releases/tag/v2.1.148 $ ./utils/test-pkg -d br_test -k -c sysrepo.config sysrepo bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index 3658b20e4e..e03278adfd 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3e52b922fcf371933ad7de1686ad83504e3358236e7817b5af795b0db52fa221 libyang-2.1.111.tar.gz +sha256 77a0aaaeb3df720aeb70d6896e32e2c2be099d48df73e3cfb52567051af3e44b libyang-2.1.148.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 5533c7c68e..fca0cd63f8 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.111 +LIBYANG_VERSION = 2.1.148 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index 6a5e98f41b..056f70787d 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz +sha256 467efed8d0f62c26a0d200602b911096eb2d67858e620937ab68f96b316fa9b7 sysrepo-2.2.150.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 6b031ae6f9..7f2570bd7d 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.2.36 +SYSREPO_VERSION = 2.2.150 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause -- 2.25.1 From kadambini.nema at gmail.com Sun Feb 18 06:27:07 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Sat, 17 Feb 2024 22:27:07 -0800 Subject: [Buildroot] [PATCH 1/1] package/sysstat: bump version to 12.7.5 Message-ID: <20240218062707.1056854-1-kadambini.nema@gmail.com> Release notes: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html ./utils/test-pkg -c sysstat.config -p sysstat bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema --- package/sysstat/sysstat.hash | 6 +++--- package/sysstat/sysstat.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index b47f000e57..31821d9e3f 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ -# From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 a730982e0c2d4964a0022c1509f3ea0a345402bc sysstat-12.6.1.tar.xz +# From: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html +sha1 f329edff36f462385a7c20d2a136b667ab8db735 sysstat-12.7.5.tar.xz # Locally calculated -sha256 18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342 sysstat-12.6.1.tar.xz +sha256 57664040a549d33bb06a1121c7124d4cadd9b8b35f815856c194393047cd4d6b sysstat-12.7.5.tar.xz sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index f77a60b1da..cfa97834c3 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 12.6.1 +SYSSTAT_VERSION = 12.7.5 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr -- 2.25.1 From giulio.benetti at benettiengineering.com Sun Feb 18 08:09:16 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 09:09:16 +0100 Subject: [Buildroot] [PATCH 1/1] package {sysrepo, libyang}: bump to version 2.2.150 (sysrepo), 2.1.148 (libyang) In-Reply-To: <20240218062239.1052785-1-kadambini.nema@gmail.com> References: <20240218062239.1052785-1-kadambini.nema@gmail.com> Message-ID: Hello Nema, thank you for contributing! Can you please split this into 2 patches? If one package version requires another package minimum version then please point it in the commit log. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas On 18/02/24 07:22, Kadambini Nema wrote: > Release notes: https://github.com/sysrepo/sysrepo/releases > https://github.com/CESNET/libyang/releases/tag/v2.1.148 > > $ ./utils/test-pkg -d br_test -k -c sysrepo.config sysrepo > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: SKIPPED > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: SKIPPED > sourcery-arm [6/6]: OK > 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > Signed-off-by: Kadambini Nema > --- > package/libyang/libyang.hash | 2 +- > package/libyang/libyang.mk | 2 +- > package/sysrepo/sysrepo.hash | 2 +- > package/sysrepo/sysrepo.mk | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash > index 3658b20e4e..e03278adfd 100644 > --- a/package/libyang/libyang.hash > +++ b/package/libyang/libyang.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 3e52b922fcf371933ad7de1686ad83504e3358236e7817b5af795b0db52fa221 libyang-2.1.111.tar.gz > +sha256 77a0aaaeb3df720aeb70d6896e32e2c2be099d48df73e3cfb52567051af3e44b libyang-2.1.148.tar.gz > sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE > diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk > index 5533c7c68e..fca0cd63f8 100644 > --- a/package/libyang/libyang.mk > +++ b/package/libyang/libyang.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBYANG_VERSION = 2.1.111 > +LIBYANG_VERSION = 2.1.148 > LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) > LIBYANG_LICENSE = BSD-3-Clause > LIBYANG_LICENSE_FILES = LICENSE > diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash > index 6a5e98f41b..056f70787d 100644 > --- a/package/sysrepo/sysrepo.hash > +++ b/package/sysrepo/sysrepo.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz > +sha256 467efed8d0f62c26a0d200602b911096eb2d67858e620937ab68f96b316fa9b7 sysrepo-2.2.150.tar.gz > sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE > diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk > index 6b031ae6f9..7f2570bd7d 100644 > --- a/package/sysrepo/sysrepo.mk > +++ b/package/sysrepo/sysrepo.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SYSREPO_VERSION = 2.2.36 > +SYSREPO_VERSION = 2.2.150 > SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) > SYSREPO_INSTALL_STAGING = YES > SYSREPO_LICENSE = BSD-3-Clause From giulio.benetti at benettiengineering.com Sun Feb 18 08:20:12 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 09:20:12 +0100 Subject: [Buildroot] [PATCH v3] package/attr: fix build failure on Microblaze architecture Message-ID: <20240218082012.3425825-1-giulio.benetti@benettiengineering.com> On Microblaze architecture __has_attribute(__symver__) support is broken and always return true even if symver is not supported so let's add an upstream patch to detect if symver is supported during autoreconf. Let's also add ATTR_AUTORECONF = YES to let patch to affect building. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Signed-off-by: Giulio Benetti --- V1->V2: * written commit log as suggested by Thomas(there was no commit log at all since this patch has been pointed during Buildroot Dev Days in IRC to me) * re-sent local patch to the correct maililng list and updated Upstream: URL V2->V3: * since patch has been upstreamed after a little rework, use it and point upstream commit URL --- ...dd-detection-of-symver-gcc-attribute.patch | 75 +++++++++++++++++++ package/attr/attr.mk | 3 + 2 files changed, 78 insertions(+) create mode 100644 package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch new file mode 100644 index 0000000000..ee029e9735 --- /dev/null +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch @@ -0,0 +1,75 @@ +From 365426c28f8bf73d34d77cc06b7d5ffeae17f13a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 15:33:15 +0100 +Subject: [PATCH] configure.ac: add detection of symver gcc attribute + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=943c776089dbb24ebbfb7432ba9841f1845bf95a + +Signed-off-by: Thomas Petazzoni +[Giulio: rework local patch for #if nesting] +Signed-off-by: Giulio Benetti +--- + configure.ac | 15 +++++++++++++++ + libattr/syscalls.c | 8 ++++---- + 2 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7e362e9..98477b5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,21 @@ AS_CASE([$host_os], + [linux*], [os_linux=yes]) + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) + ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, ++ gcc_cv_symver_attribute, ++ [cat > conftest.c </dev/null 2>&1; then \ ++ gcc_cv_symver_attribute=yes ++ fi ++ rm -f conftest.[cs] ++]) ++AS_IF([test $gcc_cv_symver_attribute = yes], ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) ++ + AC_CONFIG_COMMANDS([include/attr], + [dnl + rm -rf include/attr +diff --git a/libattr/syscalls.c b/libattr/syscalls.c +index 907560a..7ee6d39 100644 +--- a/libattr/syscalls.c ++++ b/libattr/syscalls.c +@@ -31,10 +31,10 @@ + * prefer symver attribute if available (since gcc 10), + * fall back to traditional .symver asm directive otherwise. + */ +-#ifdef __has_attribute +-# if __has_attribute(__symver__) +-# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) +-# elif __has_attribute(__no_reorder__) ++#if defined(HAVE_SYMVER_ATTRIBUTE) ++# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) ++#elif defined(__has_attribute) ++# if __has_attribute(__no_reorder__) + /* + * Avoid wrong partitioning with older gcc and LTO. May not work reliably + * with all versions; use -flto-partition=none if you encounter problems. +-- +2.34.1 + diff --git a/package/attr/attr.mk b/package/attr/attr.mk index d1397921ff..1d24144f46 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_CPE_ID_VALID = YES +# Flag added for patch dealing with symver in configure.ac +ATTR_AUTORECONF = YES + ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls -- 2.34.1 From gilles.talis at gmail.com Sun Feb 18 11:13:36 2024 From: gilles.talis at gmail.com (Gilles Talis) Date: Sun, 18 Feb 2024 07:13:36 -0400 Subject: [Buildroot] [PATCH] package/iozone: bump to version 3.506 In-Reply-To: References: <20240215142413.451505-1-gilles.talis@gmail.com> <20240215142413.451505-2-gilles.talis@gmail.com> Message-ID: Hi Julien, Thanks a lot for the review! Le sam. 17 f?vr. 2024 ? 12:05, Julien Olivain a ?crit : > > Hi Gilles, All, > > Thanks for the patch! > > I have few comments: > > Could you add a reference in commit log to the upstream change log? > For example: > """ > For change log, see end of file: > https://www.iozone.org/src/current/Changes.txt > """ > This helps a lot for later analyses/debugging. Yes, did not realize it was added. Will change that. > > Also, the upstream archive of this new version seems to include > the license file. So the comment can be removed, and the license > file added (see later). OK. Will change that too. > > Finally, could you add a comment in the commit log that: > The upstream archive format changed from tgz to tar. > (just to record this is not an arbitrary change). Well noted. Will also change that. > > On 15/02/2024 15:24, Gilles Talis wrote: > > Signed-off-by: Gilles Talis > > --- > > package/iozone/iozone.hash | 2 +- > > package/iozone/iozone.mk | 4 ++-- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash > > index 9ecf1d1af8..c506b41db2 100644 > > --- a/package/iozone/iozone.hash > > +++ b/package/iozone/iozone.hash > > @@ -1,2 +1,2 @@ > > # Locally calculated > > -sha256 > > 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 > > iozone3_493.tgz > > +sha256 > > 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7 > > iozone3_506.tar > > The license file hash can be added here: > sha256 bff7909fd698708d15613a4fb977a193cff98f44ef170c2dc1dd502974df75b2 > docs/License.txt > > > diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk > > index 2df4a2aa84..7cce15c53d 100644 > > --- a/package/iozone/iozone.mk > > +++ b/package/iozone/iozone.mk > > @@ -4,8 +4,8 @@ > > # > > > > ################################################################################ > > > > -IOZONE_VERSION = 3.493 > > -IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz > > +IOZONE_VERSION = 3.506 > > +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar > > IOZONE_SITE = http://www.iozone.org/src/current > > IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) > > # IOzone license details can be found at: > > The license comment can be removed here, and the license file added: > IOZONE_LICENSE_FILES = docs/License.txt > > > -- > > 2.39.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > Best regards, > > Julien. thanks Gilles. From dario.binacchi at amarulasolutions.com Sun Feb 18 13:20:44 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:20:44 +0100 Subject: [Buildroot] [PATCH v4 06/20] boot/ti-k3-core-secdev: new package In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> Message-ID: Hello Alexander, On Sat, Feb 17, 2024 at 6:06?PM Alexander Sverdlin wrote: > > Hello Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > This is a security development package containing tools for > > High-Security(HS) TI K3 platform devices. > > > > Signed-off-by: Dario Binacchi > > as I understand secdev package is not required for binman-based > U-Boot deployments starting from v2023.10. > > So what is the point of introducing the package now if you update > U-Boot to v2024.01? > > I belive it's as legacy as ti-k3-image-gen (which you are fixing) > but Romain's patchset removed the package and, quite successfully, > from the perspective of building for HS variants. The series is a continuation of what I submitted for the first time at the end of November when I still didn't know that Binman made it possible to do without external tools. I haven't removed it just to give a complete overview of the patches available from then until now. In the next version, I will remove them, or perhaps, in the event that a single version with Romain's patches is chosen, they will not be selected. Thanks and regards, Dario > > > --- > > > > Changes in v4: > > - Remove the trailing '/' at the end of the url in the help of > > Config.in > > - Fixed license issues > > - Use $(BINARIES_DIR)/ti-k3-core-secdev as the directory where to > > install files. > > > > Signed-off-by: Dario Binacchi > > --- > > DEVELOPERS | 1 + > > boot/Config.in | 1 + > > boot/ti-k3-core-secdev/Config.in | 9 ++++++++ > > boot/ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 +++ > > boot/ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 +++++++++++++++++++ > > 5 files changed, 36 insertions(+) > > create mode 100644 boot/ti-k3-core-secdev/Config.in > > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 0d12c3abcb11..33d99ab2440f 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -753,6 +753,7 @@ F: package/xinetd/ > > N: Dario Binacchi > > F: board/bsh/ > > F: board/stmicroelectronics/stm32f769-disco/ > > +F: boot/ti-k3-core-secdev/ > > F: configs/imx8mn_bsh_smm_s2_defconfig > > F: configs/imx8mn_bsh_smm_s2_pro_defconfig > > F: configs/stm32f769_disco_sd_defconfig > > diff --git a/boot/Config.in b/boot/Config.in > > index e5fdf7ad439e..18a7d268f95a 100644 > > --- a/boot/Config.in > > +++ b/boot/Config.in > > @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" > > source "boot/shim/Config.in" > > source "boot/syslinux/Config.in" > > source "boot/ti-k3-boot-firmware/Config.in" > > +source "boot/ti-k3-core-secdev/Config.in" > > source "boot/ti-k3-image-gen/Config.in" > > source "boot/ti-k3-r5-loader/Config.in" > > source "boot/uboot/Config.in" > > diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in > > new file mode 100644 > > index 000000000000..f7b4e2962042 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/Config.in > > @@ -0,0 +1,9 @@ > > +config BR2_TARGET_TI_K3_CORE_SECDEV > > + bool "ti-k3-core-secdev" > > + depends on BR2_aarch64 > > + help > > + This package downloads and installs development tools for > > + High-Security(HS) TI K3 platforms (which include AM62x, > > + AM64x, AM65x and more). > > + > > + https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > new file mode 100644 > > index 000000000000..e3074a398d62 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > @@ -0,0 +1,3 @@ > > +# Locally calculated > > +sha256 b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06 core-secdev-k3-08.06.00.007.tar.xz > > +sha256 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369 manifest/k3-secdev-0.2-manifest.html > > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > new file mode 100644 > > index 000000000000..f7655a0fefc8 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > @@ -0,0 +1,22 @@ > > +################################################################################ > > +# > > +# ti-k3-core-secdev > > +# > > +################################################################################ > > + > > +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 > > +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot > > +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz > > +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES > > +TI_K3_CORE_SECDEV_LICENSE = BSD-3-Clause > > +TI_K3_CORE_SECDEV_LICENSE_FILES = manifest/k3-secdev-0.2-manifest.html > > + > > +TI_K3_CORE_SECDEV_INSTALL_DIR = $(BINARIES_DIR)/ti-k3-core-secdev > > + > > +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS > > + mkdir -p $(TI_K3_CORE_SECDEV_INSTALL_DIR) > > + cp -dpfr $(@D)/keys $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > > + cp -dpfr $(@D)/scripts $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > > +endef > > + > > +$(eval $(generic-package)) > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:30:16 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:30:16 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 6:28?PM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > Signed-off-by: Dario Binacchi > > https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-12-romain.naour at smile.fr/ > > looks more complete with sysfw.itb? In my use case, there was no need as it was necessary to enable ti-k3-boot-firmware: define TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES_CMDS cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ cp -dpfr $(@D)/ti-dm $(BINARIES_DIR)/ endef > > > --- > > > > Added in v4 > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index 2a10024aedaa..643298a1e70a 100644 > > --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > > endef > > > > $(eval $(kconfig-package)) > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:38:53 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:38:53 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 6:28?PM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > Signed-off-by: Dario Binacchi > > https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-12-romain.naour at smile.fr/ > > looks more complete with sysfw.itb? In my use case, there was no need as it was necessary to enable ti-k3-boot-firmware: define TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES_CMDS cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ cp -dpfr $(@D)/ti-dm $(BINARIES_DIR)/ endef I also wonder whether it is necessary to remove the cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ to avoid conflicts. Alternatively, as happened with ti-k3-hen-image, one day we may no longer need ti-k3-boot-firmware, and therefore we could add a copy of sysfw.itb from ti-k3-r5-loader. I am awaiting suggestions. However, my patch does not require modifying the genimage.cfg file. In any case, I would try to ensure this also for sysfw.itb. Thanks and regards, Dario > > > --- > > > > Added in v4 > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index 2a10024aedaa..643298a1e70a 100644 > > --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > > endef > > > > $(eval $(kconfig-package)) > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:49:06 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:49:06 +0100 Subject: [Buildroot] [PATCH v4 15/20] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <73868728d467604fa82ada93e652c23eca4afaa6.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-16-dario.binacchi@amarulasolutions.com> <73868728d467604fa82ada93e652c23eca4afaa6.camel@gmail.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 9:20?PM Alexander Sverdlin wrote: > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > The 2024.01 version of U-Boot for the am62x-sk board has introduced two > > major changes: > > - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in > > /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET > > and the use of extlinux.conf for the proper loading of the device tree. > > Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to > > auto-generate the extlinux.conf file so that developers can change the > > kernel loading options by modifying the .config. > > - The use of binman for building images. > > > > Tested on SK-AM62B-P1. > > > > Signed-off-by: Dario Binacchi > > [] > > > @@ -27,14 +27,15 @@ BR2_TARGET_TI_K3_IMAGE_GEN=y > > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > > BR2_TARGET_TI_K3_R5_LOADER=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > > Is patch 3/20 really required in this case? > Is custom version required if you set the same version as default in patch > 5/20? > > -- > Alexander Sverdlin. > Romain asked me to update the default version for ti-k3-r5-loader to 2024.01. Therefore, I wanted this change not to improperly advance the version for the ti_am6{2,4}x_sk_defconfig configuration. Additionally, I wanted to put these patches before the ones I had already submitted in version 3, to have a more readable separation between before and after. Thanks and regards, Dario -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:50:26 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:50:26 +0100 Subject: [Buildroot] [PATCH v4 16/20] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-17-dario.binacchi@amarulasolutions.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 9:27?PM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > Tested on SK-AM62B-P1. > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v4 > > - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. > > > > no changes since v1 > > > > Signed-off-by: Dario Binacchi > > --- > > configs/ti_am62x_sk_defconfig | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > > index 193301c8b941..4de39fb897fd 100644 > > --- a/configs/ti_am62x_sk_defconfig > > +++ b/configs/ti_am62x_sk_defconfig > > @@ -1,11 +1,11 @@ > > BR2_aarch64=y > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > > BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.1" > > Could be updated to v6.6.17 if you re-spin? Of course. Thanks and regards, Dario > > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:52:45 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:52:45 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 9:33?PM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > Recent versions of U-Boot can use Binman to compile and sign the generated > > binaries, thus making the use of custom tools like ti-k3-image-gen no > > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > > configured and used outside of it. This patch allows setting such options > > even if the package is not enabled. > > Missing SoB? Good catch, Thanks and regards, Dario > > The patch looks more complete to me than https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-13-romain.naour at smile.fr/ > because of SECTYPE variables. > > Reviewed-by: Alexander Sverdlin > > > --- > > > > Added in v4 > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3/Config.in | 46 ++++++++++++++ > > boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > > boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > > boot/uboot/Config.in | 7 +-- > > configs/ti_am62x_sk_defconfig | 2 +- > > configs/ti_am64x_sk_defconfig | 2 +- > > 6 files changed, 59 insertions(+), 67 deletions(-) > > > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > > index 06dda2f156a9..9e508326c9c8 100644 > > --- a/boot/ti-k3/Config.in > > +++ b/boot/ti-k3/Config.in > > @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > > > > if BR2_TARGET_TI_K3 > > > > +choice > > + prompt "SoC family" > > + > > +config BR2_TARGET_TI_K3_SOC_AM62AX > > + bool "am62ax" > > + > > +config BR2_TARGET_TI_K3_SOC_AM62X > > + bool "am62x" > > + > > +config BR2_TARGET_TI_K3_SOC_AM64X > > + bool "am64x" > > + > > +config BR2_TARGET_TI_K3_SOC_AM65X > > + bool "am65x" > > + > > +endchoice > > + > > +choice > > + prompt "Security type" > > + help > > + The target SoC security type option. > > + > > +config BR2_TARGET_TI_K3_SECTYPE_GP > > + bool "gp" > > + > > +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > > + bool "hs-fs" > > + > > +config BR2_TARGET_TI_K3_SECTYPE_HS > > + bool "hs" > > + > > +endchoice > > + > > +config BR2_TARGET_TI_K3_SOC > > + string > > + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > > + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > > + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > > + > > +config BR2_TARGET_TI_K3_SECTYPE > > + string > > + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > > + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > > + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > > + > > source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > > source "boot/ti-k3/ti-k3-core-secdev/Config.in" > > source "boot/ti-k3/ti-k3-image-gen/Config.in" > > diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > > index 38d1598d9fc0..2d53d62dd4ee 100644 > > --- a/boot/ti-k3/ti-k3-image-gen/Config.in > > +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > > @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > bool "ti-k3-image-gen" > > depends on BR2_TARGET_TI_K3_R5_LOADER > > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > > # We need FIT support in uboot-tools, which is why we select a > > # host package > > select BR2_PACKAGE_HOST_UBOOT_TOOLS > > @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > > > if BR2_TARGET_TI_K3_IMAGE_GEN > > -choice > > - prompt "SoC family" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - bool "am62ax" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - bool "am62x" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - bool "am64x" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > - bool "am65x" > > - > > -endchoice > > - > > -choice > > - prompt "Security type" > > - help > > - The target SoC security type option for image gen. Valid > > - options are "gp" for General Purpose devices, "hs-fs" for > > - High Security - Field Securable devices, or "hs" for High > > - Security - Security Enforcing devices. Note for all High > > - Security device variants the TI_SECURE_DEV_PKG environmental > > - variable must be defined at build time pointing to a valid > > - core-secdev-k3 folder location, otherwise the build will > > - fail, see > > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > - bool "gp" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > - bool "hs-fs" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > - bool "hs" > > - > > -endchoice > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > > - string > > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > > string > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > > - string > > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > > > > endif > > diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > index 74b4fcb4bf89..834d8f7d5cd5 100644 > > --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > > $(BR2_MAKE_HOST_DEPENDENCY) > > > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > > > -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > > TI_K3_IMAGE_GEN_SYSFW = \ > > $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > else > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > > index beafb38930db..1a9d21e7c6d1 100644 > > --- a/boot/uboot/Config.in > > +++ b/boot/uboot/Config.in > > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > bool "U-Boot needs TI K3 Device Manager (DM)" > > # We use the SoC selection defined for the ti-k3-image-gen > > # package > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > > help > > Some TI K3 devices need the Device Manager (DM) firmware to > > be available for the U-Boot build. > > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > > > config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > > string > > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > > > > endif > > > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > > index cd26235342e4..cfefce0a77a4 100644 > > --- a/configs/ti_am62x_sk_defconfig > > +++ b/configs/ti_am62x_sk_defconfig > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > > BR2_TARGET_TI_K3=y > > +BR2_TARGET_TI_K3_SOC_AM62X=y > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > > BR2_TARGET_TI_K3_R5_LOADER=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > > index 1befeb4ab96c..daf78dbffff8 100644 > > --- a/configs/ti_am64x_sk_defconfig > > +++ b/configs/ti_am64x_sk_defconfig > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > > BR2_TARGET_TI_K3=y > > +BR2_TARGET_TI_K3_SOC_AM64X=y > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > > BR2_TARGET_TI_K3_R5_LOADER=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:55:39 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:55:39 +0100 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> Message-ID: Hi Alexander, On Sat, Feb 17, 2024 at 9:44?PM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > As explained in [1], adding support for AM62x LP SK in U-Boot, requires > > binman for building bootloader images. The BINMAN_INDIRS environment > > variable is used to provide a space-separated list of directories to > > search for binary blobs. > > > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > > Signed-off-by: Dario Binacchi > > > > --- > > > > no changes since v1: > > > > Signed-off-by: Dario Binacchi > > --- > > boot/uboot/uboot.mk | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > > index dda606a88059..cf70f86a4132 100644 > > --- a/boot/uboot/uboot.mk > > +++ b/boot/uboot/uboot.mk > > @@ -189,7 +189,8 @@ endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > > UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > > UBOOT_DEPENDENCIES += ti-k3-boot-firmware > > -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > > +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ > > Is the above actually still required with binman? > The names are hardcoded in U-Boot in arch/arm/dts/k3-am625-sk-binman.dtsi I will verify with some tests, Thanks and regards Dario > > > + BINMAN_INDIRS=$(BINARIES_DIR) > > This seems to be the only required part. > > > endif > > > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 13:59:50 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 14:59:50 +0100 Subject: [Buildroot] [PATCH v4 17/20] boot: move ti-k3-* packages to 'ti-k3' directory In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-18-dario.binacchi@amarulasolutions.com> Message-ID: Hi Fran?ois, On Sat, Feb 17, 2024 at 10:05?PM Fran?ois Perrad wrote: > > > > Le sam. 17 f?vr. 2024 ? 17:03, Dario Binacchi a ?crit : >> >> Move all TI K3 packages to the directory ti-k3. > > > The Buildroot documentation states that "New subdirectories are discouraged". > See https://buildroot.org/downloads/manual/manual.html#_package_directory This patch is preliminary to the next one. That is, I wanted to decouple the SECTYPE and SOC configurations from a specific package since they are general parameters for the ti-k3 platform. This seemed to me the best solution. Any alternative suggestions are welcome. Thanks and regards, Dario > > Fran?ois > >> >> This patch is preparatory for future developments. >> >> Signed-off-by: Dario Binacchi >> >> --- >> >> Added in v4 >> >> Signed-off-by: Dario Binacchi >> --- >> boot/Config.in | 5 +---- >> boot/ti-k3/Config.in | 13 +++++++++++++ >> boot/ti-k3/common.mk | 1 + >> boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 >> .../ti-k3-boot-firmware/ti-k3-boot-firmware.hash | 0 >> .../ti-k3-boot-firmware/ti-k3-boot-firmware.mk | 0 >> boot/{ => ti-k3}/ti-k3-core-secdev/Config.in | 0 >> .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 0 >> .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 0 >> boot/{ => ti-k3}/ti-k3-image-gen/Config.in | 0 >> .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 >> boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk | 0 >> boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 0 >> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 0 >> boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk | 0 >> configs/ti_am62x_sk_defconfig | 1 + >> configs/ti_am64x_sk_defconfig | 1 + >> 17 files changed, 17 insertions(+), 4 deletions(-) >> create mode 100644 boot/ti-k3/Config.in >> create mode 100644 boot/ti-k3/common.mk >> rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) >> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) >> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) >> rename boot/{ => ti-k3}/ti-k3-core-secdev/Config.in (100%) >> rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.hash (100%) >> rename boot/{ => ti-k3}/ti-k3-core-secdev/ti-k3-core-secdev.mk (100%) >> rename boot/{ => ti-k3}/ti-k3-image-gen/Config.in (100%) >> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) >> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (100%) >> rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (100%) >> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (100%) >> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (100%) >> >> diff --git a/boot/Config.in b/boot/Config.in >> index 18a7d268f95a..74a64a096afc 100644 >> --- a/boot/Config.in >> +++ b/boot/Config.in >> @@ -19,10 +19,7 @@ source "boot/opensbi/Config.in" >> source "boot/s500-bootloader/Config.in" >> source "boot/shim/Config.in" >> source "boot/syslinux/Config.in" >> -source "boot/ti-k3-boot-firmware/Config.in" >> -source "boot/ti-k3-core-secdev/Config.in" >> -source "boot/ti-k3-image-gen/Config.in" >> -source "boot/ti-k3-r5-loader/Config.in" >> +source "boot/ti-k3/Config.in" >> source "boot/uboot/Config.in" >> source "boot/vexpress-firmware/Config.in" >> >> diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in >> new file mode 100644 >> index 000000000000..06dda2f156a9 >> --- /dev/null >> +++ b/boot/ti-k3/Config.in >> @@ -0,0 +1,13 @@ >> +config BR2_TARGET_TI_K3 >> + bool "TI K3" >> + help >> + The TI K3 bootloaders and tools. >> + >> +if BR2_TARGET_TI_K3 >> + >> +source "boot/ti-k3/ti-k3-boot-firmware/Config.in" >> +source "boot/ti-k3/ti-k3-core-secdev/Config.in" >> +source "boot/ti-k3/ti-k3-image-gen/Config.in" >> +source "boot/ti-k3/ti-k3-r5-loader/Config.in" >> + >> +endif >> diff --git a/boot/ti-k3/common.mk b/boot/ti-k3/common.mk >> new file mode 100644 >> index 000000000000..18a1329baa4c >> --- /dev/null >> +++ b/boot/ti-k3/common.mk >> @@ -0,0 +1 @@ >> +include $(sort $(wildcard boot/ti-k3/*/*.mk)) >> diff --git a/boot/ti-k3-boot-firmware/Config.in b/boot/ti-k3/ti-k3-boot-firmware/Config.in >> similarity index 100% >> rename from boot/ti-k3-boot-firmware/Config.in >> rename to boot/ti-k3/ti-k3-boot-firmware/Config.in >> diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash >> similarity index 100% >> rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.hash >> rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.hash >> diff --git a/boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk b/boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk >> similarity index 100% >> rename from boot/ti-k3-boot-firmware/ti-k3-boot-firmware.mk >> rename to boot/ti-k3/ti-k3-boot-firmware/ti-k3-boot-firmware.mk >> diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3/ti-k3-core-secdev/Config.in >> similarity index 100% >> rename from boot/ti-k3-core-secdev/Config.in >> rename to boot/ti-k3/ti-k3-core-secdev/Config.in >> diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash >> similarity index 100% >> rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.hash >> rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash >> diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk >> similarity index 100% >> rename from boot/ti-k3-core-secdev/ti-k3-core-secdev.mk >> rename to boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk >> diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in >> similarity index 100% >> rename from boot/ti-k3-image-gen/Config.in >> rename to boot/ti-k3/ti-k3-image-gen/Config.in >> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash >> similarity index 100% >> rename from boot/ti-k3-image-gen/ti-k3-image-gen.hash >> rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.hash >> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >> similarity index 100% >> rename from boot/ti-k3-image-gen/ti-k3-image-gen.mk >> rename to boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >> diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3/ti-k3-r5-loader/Config.in >> similarity index 100% >> rename from boot/ti-k3-r5-loader/Config.in >> rename to boot/ti-k3/ti-k3-r5-loader/Config.in >> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash >> similarity index 100% >> rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.hash >> rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.hash >> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk >> similarity index 100% >> rename from boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >> rename to boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk >> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >> index 4de39fb897fd..cd26235342e4 100644 >> --- a/configs/ti_am62x_sk_defconfig >> +++ b/configs/ti_am62x_sk_defconfig >> @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y >> BR2_TARGET_OPTEE_OS=y >> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" >> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" >> +BR2_TARGET_TI_K3=y >> BR2_TARGET_TI_K3_IMAGE_GEN=y >> BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y >> BR2_TARGET_TI_K3_R5_LOADER=y >> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig >> index 5fd9653b5b8f..1befeb4ab96c 100644 >> --- a/configs/ti_am64x_sk_defconfig >> +++ b/configs/ti_am64x_sk_defconfig >> @@ -23,6 +23,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y >> BR2_TARGET_OPTEE_OS=y >> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" >> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" >> +BR2_TARGET_TI_K3=y >> BR2_TARGET_TI_K3_IMAGE_GEN=y >> BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y >> BR2_TARGET_TI_K3_R5_LOADER=y >> -- >> 2.43.0 >> -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Sun Feb 18 14:01:58 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sun, 18 Feb 2024 15:01:58 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> Message-ID: Hi Alexander, On Sun, Feb 18, 2024 at 12:45?AM Alexander Sverdlin wrote: > > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > The patch sets the configurations required by TI HS systems. Some of these > > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > > are provided by the ti-k3-core-secdev package in the binaries directory. > > > > Signed-off-by: Dario Binacchi > > so for test I've reverted the previous "boot/ti-k3-core-secdev: new package" > commit, then... > > > --- > > > > no changes since v3: > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3-image-gen/Config.in | 1 + > > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > > 2 files changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > > index d76cef82e911..38d1598d9fc0 100644 > > --- a/boot/ti-k3-image-gen/Config.in > > +++ b/boot/ti-k3-image-gen/Config.in > > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > bool "ti-k3-image-gen" > > depends on BR2_TARGET_TI_K3_R5_LOADER > > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > ... removed this, ... > > > # We need FIT support in uboot-tools, which is why we select a > > # host package > > select BR2_PACKAGE_HOST_UBOOT_TOOLS > > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > index 64be9a18f2c4..74b4fcb4bf89 100644 > > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > > > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +else > > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > > ... the above line, ... > > > + > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > > +endif > > > > define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > > + ) > > endef > > > > define TI_K3_IMAGE_GEN_BUILD_CMDS > > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > > $(BR2_MAKE) -C $(@D) \ > > SOC=$(TI_K3_IMAGE_GEN_SOC) \ > > SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > > + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ > > ... and this line... > > > CONFIG=evm \ > > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > > SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > > ... and everything still builds and boots fine on SK-AM62B (HS-FS): Thanks for your info, I will consider them for version 5. Thanks and regards, Dario > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:02:43 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 13400 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Starting ATF on ARM64 core... > > NOTICE: BL31: v2.7(release):v2.7 > NOTICE: BL31: Built : 23:57:43, Feb 17 2024 > I/TC: > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1199-g470b2069e4)) #1 Sat Feb 17 22:57:38 UTC 2024 aarch64 > I/TC: WARNING: This OP-TEE configuration might be insecure! > I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html > I/TC: Primary CPU initializing > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > I/TC: HUK Initialized > I/TC: Activated SA2UL device > I/TC: Enabled firewalls for SA2UL TRNG device > I/TC: SA2UL TRNG initialized > I/TC: SA2UL Drivers initialized > I/TC: Primary CPU switching to normal world boot > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:03:30 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 1872 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > > > U-Boot 2024.01 (Feb 18 2024 - 00:03:30 +0100) > > SoC: AM62X SR1.0 HS-FS > Model: Texas Instruments AM625 SK > DRAM: 2 GiB > Core: 56 devices, 23 uclasses, devicetree: separate > MMC: mmc at fa10000: 0, mmc at fa00000: 1 > Loading Environment from nowhere... OK > In: serial at 2800000 > Out: serial at 2800000 > Err: serial at 2800000 > Net: eth0: ethernet at 8000000port@1 > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc1 is current device > SD/MMC found on device 1 > Failed to load 'uEnv.txt' > Scanning for bootflows in all bootdevs > Seq Method State Uclass Part Name Filename > --- ----------- ------ -------- ---- ------------------------ ---------------- > Scanning global bootmeth 'efi_mgr': > No EFI system partition > No EFI system partition > Failed to persist EFI variables > Scanning bootdev 'mmc at fa00000.bootdev': > 0 extlinux ready mmc 1 mmc at fa00000.bootdev.part_ /extlinux/extlinux.conf > ** Booting bootflow 'mmc at fa00000.bootdev.part_1' with extlinux > 1: am62x-sk-buildroot > Retrieving file: /Image > append: console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 > Retrieving file: /k3-am62x.dtb > ## Flattened Device Tree blob at ffb14700 > Booting using the fdt blob at 0xffb14700 > Working FDT set to ffb14700 > Loading Device Tree to 000000008ffed000, end 000000008ffff687 ... OK > Working FDT set to 8ffed000 > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] > [ 0.000000] Linux version 6.6.1 (...) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1199-g470b2069e4) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Sun Feb 18 > 00:37:47 CET 2024 > > > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From ju.o at free.fr Sun Feb 18 17:25:47 2024 From: ju.o at free.fr (Julien Olivain) Date: Sun, 18 Feb 2024 18:25:47 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add sox runtime test Message-ID: <20240218172547.262368-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 1 + support/testing/tests/package/test_sox.py | 74 +++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 support/testing/tests/package/test_sox.py diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..34dc87e98f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1848,6 +1848,7 @@ F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py +F: support/testing/tests/package/test_sox.py F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py diff --git a/support/testing/tests/package/test_sox.py b/support/testing/tests/package/test_sox.py new file mode 100644 index 0000000000..74f784a36f --- /dev/null +++ b/support/testing/tests/package/test_sox.py @@ -0,0 +1,74 @@ +import math +import os + +import infra.basetest + + +class TestSox(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_AUBIO=y + BR2_PACKAGE_SOX=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def note_from_freq(self, freq): + """Return a note number from the input frequency in Hertz.""" + return round((12 * math.log(freq / 440) / math.log(2)) + 69) + + def check_audio_note(self, input_file, expected_note): + """Check the input_file include the expected_note.""" + out, ret = self.emulator.run(f"aubionotes {input_file}", timeout=20) + self.assertEqual(ret, 0) + note_found = False + for line in out: + values = line.split() + if len(values) == 3: + note = round(float(values[0])) + if note == expected_note: + note_found = True + self.assertTrue(note_found, "The expected note was not found") + + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("sox --version") + + freq = 440 # General Midi note A3 + expected_note = self.note_from_freq(freq) + wav_file = "ref.wav" + tmpwav_file = "tmp.wav" + + # Generate a sinusoidal tone. + cmd = "sox -V -r 48000 -n -b 16 -c 1" + cmd += f" {wav_file} synth 3 sin {freq} vol -10dB" + self.assertRunOk(cmd) + + # Compute statistics on the generated file. + self.assertRunOk(f"sox {wav_file} -n stat") + + # We check the generated wave file includes the expected note. + self.check_audio_note(wav_file, expected_note) + + # We resample the reference file. + cmd = f"sox -V {wav_file} -r 22050 {tmpwav_file}" + self.assertRunOk(cmd) + + # We should still detect our expected note. + self.check_audio_note(tmpwav_file, expected_note) + + # We convert the file by changing the speed by a factor. + speed_factor = 2 + cmd = f"sox -V {wav_file} {tmpwav_file} speed {speed_factor}" + self.assertRunOk(cmd) + + # We compute the new expected note from this test controller + # side, and check we detect this new note in the audio file. + new_expected_note = self.note_from_freq(freq * speed_factor) + self.check_audio_note(tmpwav_file, new_expected_note) -- 2.43.2 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:32 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:32 +0100 Subject: [Buildroot] [PATCH 4/8] package/libcamera: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-5-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/libcamera/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index ccb5281b4b..e84b8d342e 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS default y # Invalid packing size of ControlValue struct on m68k depends on !BR2_m68k - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 menuconfig BR2_PACKAGE_LIBCAMERA bool "libcamera" -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:31 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:31 +0100 Subject: [Buildroot] [PATCH 3/8] package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-4-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/kf5/kf5-kcoreaddons/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/kf5/kf5-kcoreaddons/Config.in b/package/kf5/kf5-kcoreaddons/Config.in index 02bd38e395..88fda03ee0 100644 --- a/package/kf5/kf5-kcoreaddons/Config.in +++ b/package/kf5/kf5-kcoreaddons/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KF5_KCOREADDONS bool "kf5-kcoreaddons" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES select BR2_PACKAGE_QT5TOOLS select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:28 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:28 +0100 Subject: [Buildroot] [PATCH 0/8] Patch and remove Nios2 binutils bug 27597 Message-ID: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> This patchset add backported patches for Buildroot Nios2 binutils bug 27597 and drop packages dependency on it. Doing this the external toolchain will fail building those packages, so I'm not that sure how to deal with this situation. The same happened for OpenRisc and as far as I remember the first patch of the series has been applied, then Bootlin toolchains have been patched and rebuilt/ redeployed, in the end the remaining patches have been applied. But here we also have Sourcery CodeBench Nios-II 2018.05 toolchain that contain the bug, so I don't know how to deal with this situation to avoid build failures. Any ideas? Thank you! Best regards Giulio Giulio Benetti (8): package/binutils: add local patches to fix Nios2 bug 27597 package/gdal: drop nios2 binutils bug 27597 dependency package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency package/libcamera: drop nios2 binutils bug 27597 dependency package/libgeos: drop nios2 binutils bug 27597 dependency package/pistache: drop nios2 binutils bug 27597 dependency package/postgis: drop nios2 binutils bug 27597 dependency toolchain: remove binutils bug 27597 ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ package/gdal/Config.in | 4 +- package/kf5/kf5-kcoreaddons/Config.in | 1 - package/libcamera/Config.in | 1 - package/libgeos/Config.in | 6 +- package/pistache/Config.in | 6 +- package/postgis/Config.in | 6 +- toolchain/Config.in | 6 - 10 files changed, 382 insertions(+), 23 deletions(-) create mode 100644 package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:30 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:30 +0100 Subject: [Buildroot] [PATCH 2/8] package/gdal: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-3-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/gdal/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/gdal/Config.in b/package/gdal/Config.in index 24a1f06af2..839a1bd7ea 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GDAL # configure can't find proj, when linking statically depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 depends on BR2_TOOLCHAIN_HAS_THREADS # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_GIFLIB @@ -26,9 +25,8 @@ config BR2_PACKAGE_GDAL https://gdal.org/ -comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar" +comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:33 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:33 +0100 Subject: [Buildroot] [PATCH 5/8] package/libgeos: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-6-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/libgeos/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 2a27c6f2a4..76cbb9bdcd 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the JTS Topology Suite (JTS). It aims to contain the complete @@ -14,8 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads not binutils bug 27597" +comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:29 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:29 +0100 Subject: [Buildroot] [PATCH 1/8] package/binutils: add local patches to fix Nios2 bug 27597 In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-2-giulio.benetti@benettiengineering.com> These backported patches fix Nios2 linker bug 27597 that affects packages gdal, kf5-kcoreaddons, libgeos, libcamera, pistache. Signed-off-by: Giulio Benetti --- ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ 3 files changed, 375 insertions(+) create mode 100644 package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch diff --git a/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + diff --git a/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + diff --git a/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:34 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:34 +0100 Subject: [Buildroot] [PATCH 6/8] package/pistache: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-7-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/pistache/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 3acf1f53f0..ca2d2833cd 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PISTACHE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_RAPIDJSON help Pistache is a modern and elegant HTTP and REST framework @@ -13,9 +12,8 @@ config BR2_PACKAGE_PISTACHE https://github.com/oktal/pistache -comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" +comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_USE_WCHAR -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:36 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:36 +0100 Subject: [Buildroot] [PATCH 8/8] toolchain: remove binutils bug 27597 In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-9-giulio.benetti@benettiengineering.com> Binutils bug 27597 is not present anymore in Buildroot so let's remove it. Signed-off-by: Giulio Benetti --- toolchain/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 407a03c42e..9e6cff1950 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=27597 -# Affect toolchains built with binutils 2.36.1, still not fixed. -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 - bool - default y if BR2_nios2 - # https://sourceware.org/bugzilla/show_bug.cgi?id=30730 # Affect toolchains built with binutils 2.40, still not fixed. config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 -- 2.34.1 From giulio.benetti at benettiengineering.com Sun Feb 18 18:45:35 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 19:45:35 +0100 Subject: [Buildroot] [PATCH 7/8] package/postgis: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218184536.1922309-8-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/postgis/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 7d42390677..78569d63be 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_POSTGIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS select BR2_PACKAGE_PROJ select BR2_PACKAGE_LIBXML2 @@ -18,7 +17,6 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9, not binutils bug 27597" +comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR -- 2.34.1 From yann.morin.1998 at free.fr Sun Feb 18 19:13:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 20:13:12 +0100 Subject: [Buildroot] [PATCH 2/8] package/gdal: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-3-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> <20240218184536.1922309-3-giulio.benetti@benettiengineering.com> Message-ID: Giulio, All, On 2024-02-18 19:45 +0100, Giulio Benetti spake thusly: > Now that binutils patch has been backported to every Buildroot binutils > version we can drop nios2 binutils bug 27597 dependency. What about external pre-built toolchains? Comment valid for all the patches in this series... Regards, Yann E. MORIN. > Signed-off-by: Giulio Benetti > --- > package/gdal/Config.in | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/package/gdal/Config.in b/package/gdal/Config.in > index 24a1f06af2..839a1bd7ea 100644 > --- a/package/gdal/Config.in > +++ b/package/gdal/Config.in > @@ -5,7 +5,6 @@ config BR2_PACKAGE_GDAL > # configure can't find proj, when linking statically > depends on !BR2_STATIC_LIBS > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj > - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 > depends on BR2_TOOLCHAIN_HAS_THREADS # proj > depends on BR2_USE_WCHAR # proj > select BR2_PACKAGE_GIFLIB > @@ -26,9 +25,8 @@ config BR2_PACKAGE_GDAL > > https://gdal.org/ > > -comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar" > +comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" > depends on BR2_TOOLCHAIN_HAS_SYNC_4 > depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ > - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ > !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 19:26:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 20:26:58 +0100 Subject: [Buildroot] [PATCH 0/8] Patch and remove Nios2 binutils bug 27597 In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: Giulio, All, On 2024-02-18 19:45 +0100, Giulio Benetti spake thusly: > This patchset add backported patches for Buildroot Nios2 binutils bug 27597 and > drop packages dependency on it. Doing this the external toolchain will fail > building those packages, so I'm not that sure how to deal with this situation. > The same happened for OpenRisc and as far as I remember the first patch of the > series has been applied, then Bootlin toolchains have been patched and rebuilt/ > redeployed, in the end the remaining patches have been applied. But here we also > have Sourcery CodeBench Nios-II 2018.05 toolchain that contain the bug, so I > don't know how to deal with this situation to avoid build failures. My suggestion: - keep BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 - make the sourcery toolchain select it. For "soon" after BR 2024.02 release:: - drop the sourcery toolchain: it is going to be 6 years old when BR 2024.05, so it's going to be time to drop it. Regards, Yann E. MORIN. > Any ideas? > > Thank you! > > Best regards > Giulio > > Giulio Benetti (8): > package/binutils: add local patches to fix Nios2 bug 27597 > package/gdal: drop nios2 binutils bug 27597 dependency > package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency > package/libcamera: drop nios2 binutils bug 27597 dependency > package/libgeos: drop nios2 binutils bug 27597 dependency > package/pistache: drop nios2 binutils bug 27597 dependency > package/postgis: drop nios2 binutils bug 27597 dependency > toolchain: remove binutils bug 27597 > > ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ > ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ > ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ > package/gdal/Config.in | 4 +- > package/kf5/kf5-kcoreaddons/Config.in | 1 - > package/libcamera/Config.in | 1 - > package/libgeos/Config.in | 6 +- > package/pistache/Config.in | 6 +- > package/postgis/Config.in | 6 +- > toolchain/Config.in | 6 - > 10 files changed, 382 insertions(+), 23 deletions(-) > create mode 100644 package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch > create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch > create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch > > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From nunog at fr24.com Sun Feb 18 19:30:55 2024 From: nunog at fr24.com (=?UTF-8?q?Nuno=20Gon=C3=A7alves?=) Date: Sun, 18 Feb 2024 19:30:55 +0000 Subject: [Buildroot] [PATCH] package/google-breakpad: fix tools option identation in menuconfig Message-ID: <20240218193112.1048370-1-nunog@fr24.com> Move comment in Config.in to end of file so that BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS is properly idented. Signed-off-by: Nuno Gon?alves --- package/google-breakpad/Config.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 0d21fd2e5c..5c7f4bb7ba 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -35,14 +35,6 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD https://chromium.googlesource.com/breakpad/breakpad -comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" - depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - if BR2_PACKAGE_GOOGLE_BREAKPAD config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS @@ -52,3 +44,11 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS minidump_stackwalk and microdump_stackwalk. endif + +comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" + depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 -- 2.43.2 From yann.morin.1998 at free.fr Sun Feb 18 19:44:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 20:44:25 +0100 Subject: [Buildroot] [PATCH 8/8] toolchain: remove binutils bug 27597 In-Reply-To: <20240218184536.1922309-9-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> <20240218184536.1922309-9-giulio.benetti@benettiengineering.com> Message-ID: Giulio, all, On 2024-02-18 19:45 +0100, Giulio Benetti spake thusly: > Binutils bug 27597 is not present anymore in Buildroot so let's remove it. > > Signed-off-by: Giulio Benetti > --- > toolchain/Config.in | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/toolchain/Config.in b/toolchain/Config.in > index 407a03c42e..9e6cff1950 100644 > --- a/toolchain/Config.in > +++ b/toolchain/Config.in > @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" > > comment "Toolchain Generic Options" > > -# https://sourceware.org/bugzilla/show_bug.cgi?id=27597 > -# Affect toolchains built with binutils 2.36.1, still not fixed. > -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 > - bool > - default y if BR2_nios2 As I suggested in the cover letter, and that I'll duplicate here so it is recorded with Patchwork, don't remove the symbol. Instead, just drop the default, and have the sourceery niosII toolchain select it. Regards, Yann E. MORIN. > # https://sourceware.org/bugzilla/show_bug.cgi?id=30730 > # Affect toolchains built with binutils 2.40, still not fixed. > config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 19:44:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 20:44:34 +0100 Subject: [Buildroot] [git commit] package/google-breakpad: fix tools option identation in menuconfig Message-ID: <20240218194940.8574A87847@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=2c6dc1fed354696a706fe5ecc93c4089b8bd64bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Move comment in Config.in to end of file so that BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS is properly idented. Signed-off-by: Nuno Gon??alves Signed-off-by: Yann E. MORIN --- package/google-breakpad/Config.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 0d21fd2e5c..5c7f4bb7ba 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -35,14 +35,6 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD https://chromium.googlesource.com/breakpad/breakpad -comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" - depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - if BR2_PACKAGE_GOOGLE_BREAKPAD config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS @@ -52,3 +44,11 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS minidump_stackwalk and microdump_stackwalk. endif + +comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" + depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 From yann.morin.1998 at free.fr Sun Feb 18 19:50:29 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 20:50:29 +0100 Subject: [Buildroot] [PATCH] package/google-breakpad: fix tools option identation in menuconfig In-Reply-To: <20240218193112.1048370-1-nunog@fr24.com> References: <20240218193112.1048370-1-nunog@fr24.com> Message-ID: Nuno, All, On 2024-02-18 19:30 +0000, Nuno Gon?alves via buildroot spake thusly: > Move comment in Config.in to end of file so that > BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS is properly idented. Ah yes, it was bothering me the other day, but I did not get to it... > Signed-off-by: Nuno Gon?alves Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/google-breakpad/Config.in | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in > index 0d21fd2e5c..5c7f4bb7ba 100644 > --- a/package/google-breakpad/Config.in > +++ b/package/google-breakpad/Config.in > @@ -35,14 +35,6 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD > > https://chromium.googlesource.com/breakpad/breakpad > > -comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" > - depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS > - depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS > - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > - !BR2_TOOLCHAIN_HAS_THREADS || \ > - !BR2_TOOLCHAIN_USES_GLIBC || \ > - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > - > if BR2_PACKAGE_GOOGLE_BREAKPAD > > config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS > @@ -52,3 +44,11 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS > minidump_stackwalk and microdump_stackwalk. > > endif > + > +comment "google-breakpad requires a glibc toolchain w/ wchar, thread, C++, gcc >= 4.8" > + depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS > + depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS > + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > + !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_TOOLCHAIN_USES_GLIBC || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > -- > 2.43.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 20:12:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 21:12:15 +0100 Subject: [Buildroot] [git commit] package/attr: fix build failure on Microblaze architecture Message-ID: <20240218201238.B8B5A87876@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4b34b8ccfa5159d643ecbac12c42c638e3b27e5e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master On Microblaze architecture __has_attribute(__symver__) support is broken and always return true even if symver is not supported so let's add an upstream patch to detect if symver is supported during autoreconf. Let's also add ATTR_AUTORECONF = YES to let patch to affect building. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN --- ....ac-add-detection-of-symver-gcc-attribute.patch | 75 ++++++++++++++++++++++ package/attr/attr.mk | 3 + 2 files changed, 78 insertions(+) diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch new file mode 100644 index 0000000000..ee029e9735 --- /dev/null +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch @@ -0,0 +1,75 @@ +From 365426c28f8bf73d34d77cc06b7d5ffeae17f13a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Feb 2024 15:33:15 +0100 +Subject: [PATCH] configure.ac: add detection of symver gcc attribute + +On non-ELF platforms, such as microblaze, builds will fail when trying +to add symver information because __attribute__((symver ..)) is not +supported even though __has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=943c776089dbb24ebbfb7432ba9841f1845bf95a + +Signed-off-by: Thomas Petazzoni +[Giulio: rework local patch for #if nesting] +Signed-off-by: Giulio Benetti +--- + configure.ac | 15 +++++++++++++++ + libattr/syscalls.c | 8 ++++---- + 2 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7e362e9..98477b5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,6 +57,21 @@ AS_CASE([$host_os], + [linux*], [os_linux=yes]) + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) + ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, ++ gcc_cv_symver_attribute, ++ [cat > conftest.c </dev/null 2>&1; then \ ++ gcc_cv_symver_attribute=yes ++ fi ++ rm -f conftest.[cs] ++]) ++AS_IF([test $gcc_cv_symver_attribute = yes], ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) ++ + AC_CONFIG_COMMANDS([include/attr], + [dnl + rm -rf include/attr +diff --git a/libattr/syscalls.c b/libattr/syscalls.c +index 907560a..7ee6d39 100644 +--- a/libattr/syscalls.c ++++ b/libattr/syscalls.c +@@ -31,10 +31,10 @@ + * prefer symver attribute if available (since gcc 10), + * fall back to traditional .symver asm directive otherwise. + */ +-#ifdef __has_attribute +-# if __has_attribute(__symver__) +-# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) +-# elif __has_attribute(__no_reorder__) ++#if defined(HAVE_SYMVER_ATTRIBUTE) ++# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) ++#elif defined(__has_attribute) ++# if __has_attribute(__no_reorder__) + /* + * Avoid wrong partitioning with older gcc and LTO. May not work reliably + * with all versions; use -flto-partition=none if you encounter problems. +-- +2.34.1 + diff --git a/package/attr/attr.mk b/package/attr/attr.mk index d1397921ff..1d24144f46 100644 --- a/package/attr/attr.mk +++ b/package/attr/attr.mk @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL ATTR_CPE_ID_VALID = YES +# Flag added for patch dealing with symver in configure.ac +ATTR_AUTORECONF = YES + ATTR_INSTALL_STAGING = YES ATTR_CONF_OPTS = --disable-nls From yann.morin.1998 at free.fr Sun Feb 18 20:12:56 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 21:12:56 +0100 Subject: [Buildroot] [PATCH v3] package/attr: fix build failure on Microblaze architecture In-Reply-To: <20240218082012.3425825-1-giulio.benetti@benettiengineering.com> References: <20240218082012.3425825-1-giulio.benetti@benettiengineering.com> Message-ID: giulio, all, On 2024-02-18 09:20 +0100, Giulio Benetti spake thusly: > On Microblaze architecture __has_attribute(__symver__) support is broken > and always return true even if symver is not supported so let's add an > upstream patch to detect if symver is supported during autoreconf. Let's > also add ATTR_AUTORECONF = YES to let patch to affect building. > > Fixes: > http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a > > Signed-off-by: Giulio Benetti Applied to master, thanks. Regards, Yann E. MORIN. > --- > V1->V2: > * written commit log as suggested by Thomas(there was no commit log at all > since this patch has been pointed during Buildroot Dev Days in IRC to me) > * re-sent local patch to the correct maililng list and updated Upstream: > URL > V2->V3: > * since patch has been upstreamed after a little rework, use it and point > upstream commit URL > --- > ...dd-detection-of-symver-gcc-attribute.patch | 75 +++++++++++++++++++ > package/attr/attr.mk | 3 + > 2 files changed, 78 insertions(+) > create mode 100644 package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch > > diff --git a/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch > new file mode 100644 > index 0000000000..ee029e9735 > --- /dev/null > +++ b/package/attr/0002-configure.ac-add-detection-of-symver-gcc-attribute.patch > @@ -0,0 +1,75 @@ > +From 365426c28f8bf73d34d77cc06b7d5ffeae17f13a Mon Sep 17 00:00:00 2001 > +From: Thomas Petazzoni > +Date: Tue, 6 Feb 2024 15:33:15 +0100 > +Subject: [PATCH] configure.ac: add detection of symver gcc attribute > + > +On non-ELF platforms, such as microblaze, builds will fail when trying > +to add symver information because __attribute__((symver ..)) is not > +supported even though __has_attribute(__symver__) returns true. > + > +Support for symver needs to be detected via a compile test since > +__has_attribute can report false positives [0]. > + > +Add a configure compile check for __attribute__((symver ..)) to ensure > +it is supported and define a variable to advertise support. > + > +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 > + > +Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=943c776089dbb24ebbfb7432ba9841f1845bf95a > + > +Signed-off-by: Thomas Petazzoni > +[Giulio: rework local patch for #if nesting] > +Signed-off-by: Giulio Benetti > +--- > + configure.ac | 15 +++++++++++++++ > + libattr/syscalls.c | 8 ++++---- > + 2 files changed, 19 insertions(+), 4 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 7e362e9..98477b5 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -57,6 +57,21 @@ AS_CASE([$host_os], > + [linux*], [os_linux=yes]) > + AM_CONDITIONAL([OS_LINUX], [test "x$os_linux" = "xyes"]) > + > ++AC_CACHE_CHECK(whether __attribute__((__symver__())) is supported, > ++ gcc_cv_symver_attribute, > ++ [cat > conftest.c < ++void foo (void) {} > ++__typeof(foo) foo __attribute__ ((__symver__("foo at foo"))); > ++EOF > ++ gcc_cv_symver_attribute=no > ++ if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then \ > ++ gcc_cv_symver_attribute=yes > ++ fi > ++ rm -f conftest.[cs] > ++]) > ++AS_IF([test $gcc_cv_symver_attribute = yes], > ++ [AC_DEFINE(HAVE_SYMVER_ATTRIBUTE, [], [GCC supports symver attribute])]) > ++ > + AC_CONFIG_COMMANDS([include/attr], > + [dnl > + rm -rf include/attr > +diff --git a/libattr/syscalls.c b/libattr/syscalls.c > +index 907560a..7ee6d39 100644 > +--- a/libattr/syscalls.c > ++++ b/libattr/syscalls.c > +@@ -31,10 +31,10 @@ > + * prefer symver attribute if available (since gcc 10), > + * fall back to traditional .symver asm directive otherwise. > + */ > +-#ifdef __has_attribute > +-# if __has_attribute(__symver__) > +-# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) > +-# elif __has_attribute(__no_reorder__) > ++#if defined(HAVE_SYMVER_ATTRIBUTE) > ++# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((__symver__(vn))) > ++#elif defined(__has_attribute) > ++# if __has_attribute(__no_reorder__) > + /* > + * Avoid wrong partitioning with older gcc and LTO. May not work reliably > + * with all versions; use -flto-partition=none if you encounter problems. > +-- > +2.34.1 > + > diff --git a/package/attr/attr.mk b/package/attr/attr.mk > index d1397921ff..1d24144f46 100644 > --- a/package/attr/attr.mk > +++ b/package/attr/attr.mk > @@ -11,6 +11,9 @@ ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) > ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL > ATTR_CPE_ID_VALID = YES > > +# Flag added for patch dealing with symver in configure.ac > +ATTR_AUTORECONF = YES > + > ATTR_INSTALL_STAGING = YES > > ATTR_CONF_OPTS = --disable-nls > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 21:03:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 22:03:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/google-breakpad: fix missing include error In-Reply-To: <20240218011653.790820-1-kadambini.nema@gmail.com> References: <20240218011653.790820-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-17 17:16 -0800, Kadambini Nema spake thusly: > src/common/module.cc: In member function ?bool google_breakpad::Module::AddFunction(Function*)?: > src/common/module.cc:194:52: error: ?find_if? is not a member of ?std?; did you mean ?find?? > 194 | FunctionSet::iterator existing_function = std::find_if( > | ^~~~~~~ > | find > Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed > > This error is seen on gcc-14. > > related links: > https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 > https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch > > Signed-off-by: Kadambini Nema > --- > ...ixed-missing-include-for-std-find_if.patch | 24 +++++++++++++++++++ > 1 file changed, 24 insertions(+) > create mode 100644 package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > > diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > new file mode 100644 > index 0000000000..80eab723b3 > --- /dev/null > +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > @@ -0,0 +1,24 @@ > +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 > +From: Nathan Moinvaziri > +Date: Tue, 19 Dec 2023 14:35:05 -0800 > +Subject: [PATCH] Fixed missing include for std::find_if. > + > +Throws an error when compiling on Windows. > + > +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 > +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 > +Reviewed-by: Ivan Penkov $ ./utils/docker-run make check-package package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch:0: missing Signed-off-by in the header (https://nightly.buildroot.org/#_format_and_licensing_of_the_package_patches) package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) Although I could have fixed the Uptream tag issue, I can't add your SoB line. Could you please respin with: - your Signed-off-by: tag - the Upstream: tag, that points to the upstream commit, i.e.: https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d Regards, Yann E. MORIN. > +--- > + > +diff --git a/src/common/module.cc b/src/common/module.cc > +index 0eb5aad..b6f5da7 100644 > +--- a/src/common/module.cc > ++++ b/src/common/module.cc > +@@ -42,6 +42,7 @@ > + #include > + #include > + > ++#include > + #include > + #include > + #include > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Sun Feb 18 21:07:35 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 18 Feb 2024 22:07:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/tio: needs threads Message-ID: <20240218210735.50128-1-fontaine.fabrice@gmail.com> tio needs threads since version 2.4 and https://github.com/tio/tio/commit/93e6efc00153e625e4ceb8a51e01b324247d312a resulting in the following build failure since bump to version 2.7 in commit 4b33d7a47dd41fed5364a398320c2b7d0687ba5e: In file included from /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, from ../src/tty.c:23: /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] 218 | # warning requested reentrant code, but thread support was disabled | ^~~~~~~ ../src/tty.c:43:10: fatal error: pthread.h: No such file or directory 43 | #include | ^~~~~~~~~~~ Fixes: 4b33d7a47dd41fed5364a398320c2b7d0687ba5e - http://autobuild.buildroot.org/results/9b20ff06a0ad24b7e7f4750ebe64e2077e36164a Signed-off-by: Fabrice Fontaine --- package/tio/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/tio/Config.in b/package/tio/Config.in index a84daf8a24..e4241fa5e1 100644 --- a/package/tio/Config.in +++ b/package/tio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TIO bool "tio" depends on !BR2_sparc64 && !BR2_sparc + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_INIH help "tio" is a simple TTY terminal application which features a @@ -14,3 +15,7 @@ config BR2_PACKAGE_TIO # fix or workaround for now comment "tio is disabled for sparc and sparc64 architectures" depends on BR2_sparc64 || BR2_sparc + +comment "tio needs a toolchain w/ threads" + depends on !BR2_sparc64 && !BR2_sparc + depends on !BR2_TOOLCHAIN_HAS_THREADS -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 18 21:27:04 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 22:27:04 +0100 Subject: [Buildroot] [PATCH 1/1] package dhcpdump: bump to version 1.9 In-Reply-To: <20240218013353.798627-1-kadambini.nema@gmail.com> References: <20240218013353.798627-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-17 17:33 -0800, Kadambini Nema spake thusly: > - Change the site to a well maintained - https://github.com/bbonev/dhcpdump At least Fedora 39 is using that fork, so I guess it is OK to switch ot it. Maybe then we should also update the homepage in the Config.in? > - Fix some of the reported build failures - autobuild.buildroot.org/?reason=dhcpdump-1.8 The last build failiure was in 2022-06-18, almost two years ago now... Also, we need pointers to actual failures, like: http://autobuild.buildroot.org/results/a34/a347363cbc611080d2a0f7f4882802d15f587250/ > - Build test results > ./utils/test-pkg -d br_test -k -c dhcpdump.config -p dhcpdump > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: OK > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: OK > sourcery-arm [6/6]: OK > 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > Signed-off-by: Kadambini Nema > --- > ...Fix-build-with-gcc4.8-use-br-fortify.patch | 10 ++++++++ > .../0001-use-non-bsd-structures.patch | 23 ------------------- > package/dhcpdump/Config.in | 2 +- > package/dhcpdump/dhcpdump.hash | 2 +- > package/dhcpdump/dhcpdump.mk | 5 ++-- > 5 files changed, 15 insertions(+), 27 deletions(-) > create mode 100644 package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch > delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch > > diff --git a/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch > new file mode 100644 > index 0000000000..a5c1218c99 This new patch needs to be git-formatted, with an actual commit log, your SoB line, and an upstream status. If you got that from somewhere else, then we also need that to be recorded in the patch too. Regards, Yann E. MORIN. > --- /dev/null > +++ b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch > @@ -0,0 +1,10 @@ > +diff -Naur a/Makefile b/Makefile > +--- a/Makefile 2024-02-17 13:57:08.166161973 -0800 > ++++ b/Makefile 2024-02-17 13:57:45.055153969 -0800 > +@@ -1,5 +1,5 @@ > + CFLAGS+=${CPPFLAGS} > +-CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -g -O3 -fPIE > ++CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -g -O3 -fPIE > + LDFLAGS+=-g -Wl,-z,relro -Wl,-z,now -fPIE -pie > + LIBS+=-lpcap > + > diff --git a/package/dhcpdump/0001-use-non-bsd-structures.patch b/package/dhcpdump/0001-use-non-bsd-structures.patch > deleted file mode 100644 > index 40115fb640..0000000000 > --- a/package/dhcpdump/0001-use-non-bsd-structures.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -The udphdr structure has uh_* fields when _FAVOR_BSD is > -defined. Otherwise, the fields are just named source, dest, len and > -check. See . > - > -Signed-off-by: Thomas Petazzoni > - > -Index: dhcpdump-1.8/dhcpdump.c > -=================================================================== > ---- dhcpdump-1.8.orig/dhcpdump.c 2011-05-17 20:20:46.506980003 +0200 > -+++ dhcpdump-1.8/dhcpdump.c 2011-05-17 20:20:59.338979999 +0200 > -@@ -163,10 +163,10 @@ > - strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src)); > - strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst)); > - > -- if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen))) > -+ if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len))) > - return; > - > -- printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen)); > -+ printdata((u_char *)(sp + offset), ntohs(udp->len)); > - } > - > - // check for matching CHADDR (Peter Apian-Bennewitz ) > diff --git a/package/dhcpdump/Config.in b/package/dhcpdump/Config.in > index e0abe040fc..30e42928e4 100644 > --- a/package/dhcpdump/Config.in > +++ b/package/dhcpdump/Config.in > @@ -4,4 +4,4 @@ config BR2_PACKAGE_DHCPDUMP > help > A tool for monitoring dhcp requests using tcpdump. > > - http://www.mavetju.org/unix/general.php > + https://github.com/bbonev/dhcpdump > diff --git a/package/dhcpdump/dhcpdump.hash b/package/dhcpdump/dhcpdump.hash > index a24db5b275..fdf3243ad1 100644 > --- a/package/dhcpdump/dhcpdump.hash > +++ b/package/dhcpdump/dhcpdump.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz > +sha256 3658ac21cc33e79e72bed070454e49c543017991cb6c37f4253c85e9176869d1 dhcpdump-1.9.tar.xz > sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE > diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk > index ec9571c0af..4ce5047b2e 100644 > --- a/package/dhcpdump/dhcpdump.mk > +++ b/package/dhcpdump/dhcpdump.mk > @@ -4,8 +4,9 @@ > # > ################################################################################ > > -DHCPDUMP_VERSION = 1.8 > -DHCPDUMP_SITE = http://www.mavetju.org/download > +DHCPDUMP_VERSION = 1.9 > +DHCPDUMP_SITE = https://github.com/bbonev/dhcpdump/releases/download/v$(DHCPDUMP_VERSION) > +DHCPDUMP_SOURCE = dhcpdump-$(DHCPDUMP_VERSION).tar.xz > DHCPDUMP_DEPENDENCIES = libpcap > DHCPDUMP_LICENSE = BSD-2-Clause > DHCPDUMP_LICENSE_FILES = LICENSE > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 21:31:44 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 22:31:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/dos2unix: bump version to 7.5.2 In-Reply-To: <20240218061652.1048008-1-kadambini.nema@gmail.com> References: <20240218061652.1048008-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-17 22:16 -0800, Kadambini Nema spake thusly: > Changelog: https://waterlan.home.xs4all.nl/dos2unix/ChangeLog.txt > > $ ./utils/test-pkg -d br_test -k -c dos2unix.config -p dos2unix > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: OK > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: OK > sourcery-arm [6/6]: OK > 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Thanks for reporting the test you run, that's good thing. However, they do not belong to the commit log, but to a post-commit note, i.e. [0] > Signed-off-by: Kadambini Nema > --- [0] here, after the --- line. > package/dos2unix/dos2unix.hash | 6 +++--- > package/dos2unix/dos2unix.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash > index 032c8ea2d2..d4d682cd0c 100644 > --- a/package/dos2unix/dos2unix.hash > +++ b/package/dos2unix/dos2unix.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc > -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz > -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt > +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc > +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz > +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt We track the hash of the license files, because we want to know when the licensing terms change. So, a change in the hash of the license files must be explained in the commit log. Sometimes, it's just about achange in years; in such a case, the commit log would just need a note like: Copyright years updated in license file. Can you check that part, and respin, please? Regards, Yann E. MORIN. > diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk > index 6d1e70cf26..e30fc999d4 100644 > --- a/package/dos2unix/dos2unix.mk > +++ b/package/dos2unix/dos2unix.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DOS2UNIX_VERSION = 7.5.0 > +DOS2UNIX_VERSION = 7.5.2 > DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix > DOS2UNIX_LICENSE = BSD-2-Clause > DOS2UNIX_LICENSE_FILES = COPYING.txt > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 18 21:33:09 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 22:33:09 +0100 Subject: [Buildroot] [git commit] package/sysstat: bump version to 12.7.5 Message-ID: <20240218213412.EE00A878EE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=df5594644ff0fa2ed9128e2a9e9daefd305b795b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html ./utils/test-pkg -c sysstat.config -p sysstat bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema Signed-off-by: Yann E. MORIN --- package/sysstat/sysstat.hash | 6 +++--- package/sysstat/sysstat.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index b47f000e57..31821d9e3f 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ -# From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 a730982e0c2d4964a0022c1509f3ea0a345402bc sysstat-12.6.1.tar.xz +# From: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html +sha1 f329edff36f462385a7c20d2a136b667ab8db735 sysstat-12.7.5.tar.xz # Locally calculated -sha256 18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342 sysstat-12.6.1.tar.xz +sha256 57664040a549d33bb06a1121c7124d4cadd9b8b35f815856c194393047cd4d6b sysstat-12.7.5.tar.xz sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index f77a60b1da..cfa97834c3 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 12.6.1 +SYSSTAT_VERSION = 12.7.5 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr From yann.morin.1998 at free.fr Sun Feb 18 21:34:43 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 18 Feb 2024 22:34:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/sysstat: bump version to 12.7.5 In-Reply-To: <20240218062707.1056854-1-kadambini.nema@gmail.com> References: <20240218062707.1056854-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-17 22:27 -0800, Kadambini Nema spake thusly: > Release notes: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html > > ./utils/test-pkg -c sysstat.config -p sysstat > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: SKIPPED > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: OK > sourcery-arm [6/6]: OK > 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > Signed-off-by: Kadambini Nema Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/sysstat/sysstat.hash | 6 +++--- > package/sysstat/sysstat.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash > index b47f000e57..31821d9e3f 100644 > --- a/package/sysstat/sysstat.hash > +++ b/package/sysstat/sysstat.hash > @@ -1,5 +1,5 @@ > -# From: http://sebastien.godard.pagesperso-orange.fr/download.html > -sha1 a730982e0c2d4964a0022c1509f3ea0a345402bc sysstat-12.6.1.tar.xz > +# From: https://sysstat.github.io/2023/12/17/sysstat-12.7.5.html > +sha1 f329edff36f462385a7c20d2a136b667ab8db735 sysstat-12.7.5.tar.xz > # Locally calculated > -sha256 18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342 sysstat-12.6.1.tar.xz > +sha256 57664040a549d33bb06a1121c7124d4cadd9b8b35f815856c194393047cd4d6b sysstat-12.7.5.tar.xz > sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING > diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk > index f77a60b1da..cfa97834c3 100644 > --- a/package/sysstat/sysstat.mk > +++ b/package/sysstat/sysstat.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SYSSTAT_VERSION = 12.6.1 > +SYSSTAT_VERSION = 12.7.5 > SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz > SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages > SYSSTAT_CONF_OPTS = --disable-file-attr > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Sun Feb 18 22:05:24 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Sun, 18 Feb 2024 23:05:24 +0100 Subject: [Buildroot] [PATCH 0/8] Patch and remove Nios2 binutils bug 27597 In-Reply-To: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> Message-ID: <20240218230524.639348e6@windsurf> Hello, On Sun, 18 Feb 2024 19:45:28 +0100 Giulio Benetti wrote: > This patchset add backported patches for Buildroot Nios2 binutils bug 27597 and > drop packages dependency on it. Doing this the external toolchain will fail > building those packages, so I'm not that sure how to deal with this situation. > The same happened for OpenRisc and as far as I remember the first patch of the > series has been applied, then Bootlin toolchains have been patched and rebuilt/ > redeployed, in the end the remaining patches have been applied. But here we also > have Sourcery CodeBench Nios-II 2018.05 toolchain that contain the bug, so I > don't know how to deal with this situation to avoid build failures. First of all, thanks for following up on this, I'm really happy to see that we are not always *adding* more GCC/binutils bug options, but sometimes *removing* some of them. Regarding the CodeBench NIOSII toolchain from 2018.05, I think we could simply delete it. It makes sense to support old toolchains to some extent, but NIOSII is a very confidential architecture, and almost 6 years old toolchain is really ancient. So I would be entirely fine with dropping this toolchain. Best regards, Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From giulio.benetti at benettiengineering.com Sun Feb 18 22:28:34 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 18 Feb 2024 23:28:34 +0100 Subject: [Buildroot] [PATCH 0/8] Patch and remove Nios2 binutils bug 27597 In-Reply-To: <20240218230524.639348e6@windsurf> References: <20240218230524.639348e6@windsurf> Message-ID: <43992C45-375D-4FF4-9EE4-F7FD15BB8DE1@benettiengineering.com> Hi Thomas, Yann, Vincent, All, > Il giorno 18 feb 2024, alle ore 23:05, Thomas Petazzoni ha scritto: > > ?Hello, > >> On Sun, 18 Feb 2024 19:45:28 +0100 >> Giulio Benetti wrote: >> >> This patchset add backported patches for Buildroot Nios2 binutils bug 27597 and >> drop packages dependency on it. Doing this the external toolchain will fail >> building those packages, so I'm not that sure how to deal with this situation. >> The same happened for OpenRisc and as far as I remember the first patch of the >> series has been applied, then Bootlin toolchains have been patched and rebuilt/ >> redeployed, in the end the remaining patches have been applied. But here we also >> have Sourcery CodeBench Nios-II 2018.05 toolchain that contain the bug, so I >> don't know how to deal with this situation to avoid build failures. > > First of all, thanks for following up on this, I'm really happy to see > that we are not always *adding* more GCC/binutils bug options, but > sometimes *removing* some of them. It would be great if some Microblaze or Sh4 bug could be patched too. There?s a patch proposed by Vincent for a Microblaze gcc ICE. Vincent, it would be great if you provide a patchset similar to this for gcc, or I can deal with it. > > Regarding the CodeBench NIOSII toolchain from 2018.05, I think we could > simply delete it. It makes sense to support old toolchains to some > extent, but NIOSII is a very confidential architecture, and almost 6 > years old toolchain is really ancient. So I would be entirely fine with > dropping this toolchain. It sounds good to me and it?s similat suggestion of Yann. One thing is left out to deal with, Bootlin toolchains that need to be patched/rebuilt/redeployed. So I can give a respin to this series adding another patch dropping Sourcery external toolchain and you can apply it only after updating Bootlin Nios2 toolchain(this should be sufficient since the bug shows up only on Nios2). That way Buildroot will be bug 27597 free. Thanks for commenting! Best regards Giulio > > Best regards, > > Thomas > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com From christian at aperture.us Sun Feb 18 23:23:48 2024 From: christian at aperture.us (Christian Stewart) Date: Sun, 18 Feb 2024 15:23:48 -0800 Subject: [Buildroot] [PATCH] package/sudo: drop legacy, useless, and broken post-configure hook In-Reply-To: <20240217172923.3629905-1-yann.morin.1998@free.fr> References: <20240217172923.3629905-1-yann.morin.1998@free.fr> Message-ID: LGTM On Sat, Feb 17, 2024 at 9:29?AM Yann E. MORIN wrote: > Reported-by: Christian Stewart > Signed-off-by: Yann E. MORIN > Cc: Peter Korsgaard > --- > package/sudo/sudo.mk | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk > index a4e838dd94..7961a99002 100644 > --- a/package/sudo/sudo.mk > +++ b/package/sudo/sudo.mk > @@ -58,15 +58,6 @@ else > SUDO_CONF_OPTS += --disable-openssl > endif > > -# mksigname/mksiglist needs to run on build host to generate source files > -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > - $(MAKE) $(HOST_CONFIGURE_OPTS) \ > - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ > - -C $(@D)/lib/util mksigname mksiglist > -endef > - > -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > - > define SUDO_PERMISSIONS > /usr/bin/sudo f 4755 0 0 - - - - - > endef > -- > 2.43.0 > Reviewed-by: Christian Stewart From vfazio at gmail.com Mon Feb 19 01:20:39 2024 From: vfazio at gmail.com (Vincent Fazio) Date: Sun, 18 Feb 2024 19:20:39 -0600 Subject: [Buildroot] [PATCH 0/8] Patch and remove Nios2 binutils bug 27597 In-Reply-To: <43992C45-375D-4FF4-9EE4-F7FD15BB8DE1@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <43992C45-375D-4FF4-9EE4-F7FD15BB8DE1@benettiengineering.com> Message-ID: All, On Sun, Feb 18, 2024 at 4:28?PM Giulio Benetti < giulio.benetti at benettiengineering.com> wrote: > Hi Thomas, Yann, Vincent, All, > > > Il giorno 18 feb 2024, alle ore 23:05, Thomas Petazzoni < > thomas.petazzoni at bootlin.com> ha scritto: > > > > ?Hello, > > > >> On Sun, 18 Feb 2024 19:45:28 +0100 > >> Giulio Benetti wrote: > >> > >> This patchset add backported patches for Buildroot Nios2 binutils bug > 27597 and > >> drop packages dependency on it. Doing this the external toolchain will > fail > >> building those packages, so I'm not that sure how to deal with this > situation. > >> The same happened for OpenRisc and as far as I remember the first patch > of the > >> series has been applied, then Bootlin toolchains have been patched and > rebuilt/ > >> redeployed, in the end the remaining patches have been applied. But > here we also > >> have Sourcery CodeBench Nios-II 2018.05 toolchain that contain the bug, > so I > >> don't know how to deal with this situation to avoid build failures. > > > > First of all, thanks for following up on this, I'm really happy to see > > that we are not always *adding* more GCC/binutils bug options, but > > sometimes *removing* some of them. > > It would be great if some Microblaze or Sh4 bug could be patched too. > There?s a patch proposed by Vincent for a Microblaze gcc ICE. > Vincent, it would be great if you provide a patchset similar to this for > gcc, or I can deal with it. > > I can certainly post the patch for BR. I've been a bit busy recently so haven't done so and I'm a bit concerned with push back when trying to upstream it, so don't know if it's worth submitting it without an upstream submission. > > > > Regarding the CodeBench NIOSII toolchain from 2018.05, I think we could > > simply delete it. It makes sense to support old toolchains to some > > extent, but NIOSII is a very confidential architecture, and almost 6 > > years old toolchain is really ancient. So I would be entirely fine with > > dropping this toolchain. > > It sounds good to me and it?s similat suggestion of Yann. > > Any patch for the MicroBlaze stuff (and other fixes) will have to slowly bleed into BR. As may have already been brought up, there are external toolchains that we do _not_ control which make it difficult to drop these types of flags. I don't want to get too far off topic, but some of the things I brought up in https://bugs.buildroot.org/show_bug.cgi?id=15943 seem at least quasi-related. Basically, it may behoove us to be very specific about what toolchains _must_ have in order to be supported by a specific version of BR, such as: * Minimum version of kernel headers * Minimum libc + other tool versions * Prequisite patches This would largely push consumers to vetted external toolchains such as the pre-created Bootlin toolchains that meet these requirements or to use BR generated toolchains. Otherwise, we'll be "supporting" a hodge-podge of toolchains with various mixtures of software indefinitely. One thing is left out to deal with, Bootlin toolchains that need to be > patched/rebuilt/redeployed. > > So I can give a respin to this series adding another patch dropping > Sourcery external toolchain and you can apply it only after updating > Bootlin Nios2 toolchain(this should be sufficient since the bug shows up > only on Nios2). > That way Buildroot will be bug 27597 free. > > Thanks for commenting! > > Best regards > Giulio > > > > > Best regards, > > > > Thomas > > -- > > Thomas Petazzoni, co-owner and CEO, Bootlin > > Embedded Linux and Kernel engineering and training > > https://bootlin.com > > -Vincent -------------- next part -------------- An HTML attachment was scrubbed... URL: From fido_max at inbox.ru Mon Feb 19 05:47:49 2024 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 19 Feb 2024 08:47:49 +0300 Subject: [Buildroot] [PATCH 2/8] package/gdal: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-3-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> <20240218184536.1922309-3-giulio.benetti@benettiengineering.com> Message-ID: On 18.02.2024 21:45, Giulio Benetti wrote: > Now that binutils patch has been backported to every Buildroot binutils > version we can drop nios2 binutils bug 27597 dependency. > > Signed-off-by: Giulio Benetti > --- Reviewed-by: Maxim Kochetkov From fido_max at inbox.ru Mon Feb 19 05:48:15 2024 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 19 Feb 2024 08:48:15 +0300 Subject: [Buildroot] [PATCH 5/8] package/libgeos: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-6-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> <20240218184536.1922309-6-giulio.benetti@benettiengineering.com> Message-ID: <93af9a25-e8d6-46d8-b68c-86cc20b81608@inbox.ru> On 18.02.2024 21:45, Giulio Benetti wrote: > Now that binutils patch has been backported to every Buildroot binutils > version we can drop nios2 binutils bug 27597 dependency. > > Signed-off-by: Giulio Benetti > --- Reviewed-by: Maxim Kochetkov From fido_max at inbox.ru Mon Feb 19 05:48:44 2024 From: fido_max at inbox.ru (Maxim Kochetkov) Date: Mon, 19 Feb 2024 08:48:44 +0300 Subject: [Buildroot] [PATCH 7/8] package/postgis: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240218184536.1922309-8-giulio.benetti@benettiengineering.com> References: <20240218184536.1922309-1-giulio.benetti@benettiengineering.com> <20240218184536.1922309-8-giulio.benetti@benettiengineering.com> Message-ID: <25648b48-d657-4696-96c5-28c61c41b15b@inbox.ru> On 18.02.2024 21:45, Giulio Benetti wrote: > Now that binutils patch has been backported to every Buildroot binutils > version we can drop nios2 binutils bug 27597 dependency. > > Signed-off-by: Giulio Benetti > --- Reviewed-by: Maxim Kochetkov From romain.naour at smile.fr Mon Feb 19 09:30:15 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 10:30:15 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> Message-ID: <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > high-security field-securable (HS-FS) silicon to optionally customize keys > and encryption for security applications. > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > which, however, was buggy. This series fixes the errors and bumps the Linux > kernel and U-Boot required for such a new device. > > This series, which in my humble opinion, should have been immediately > considered to correct the compilation errors in case of HS-FS devcies, has > seen an increase in patches in version 4 to remove the ti-k3-image-gen > package thanks to Binman. Additionally, it shares some modifications and > views on how to implement certain changes with the series > https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > Therefore, I think it is necessary not to run them in parallel but to decide > whether to merge one before the other or to consider a single series where > the patches can be coherent with each other. I am available for both solutions. > Let me know. Thanks for this new version. I beleive both series should be merged into one since we want to follow u-boot switch to binman, add more TI K3 SoC support and keeping exising am62x ans am64x working in GP or HS/HS-FS. My main concern is to avoid adding a new package for a tool that is already deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html Best regards, Romain > > Dario Binacchi (20): > configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > setting > configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > setting > configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > version > configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > version > boot/ti-k3-r5-loader: bump to version 2024.01 > boot/ti-k3-core-secdev: new package > boot/ti-k3-image-gen: manage HS hardware > package/python-jsonschema: add host variant > package/python-attrs: add host variant > package/python-referencing: add host variant > package/python-rpds-py: add host variant > package/python-jsonschema-specifications: add host variant > boot/ti-k3-r5-loader: set binman environment > boot/uboot: set BINMAN_INDIRS for TI K3 DM > configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 > boot: move ti-k3-* packages to 'ti-k3' directory > boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore > > DEVELOPERS | 1 + > board/ti/am62x-sk/genimage.cfg | 7 +- > board/ti/am62x-sk/post-build.sh | 49 ++++++++++++ > board/ti/am62x-sk/post-image.sh | 5 ++ > boot/Config.in | 4 +- > boot/ti-k3-image-gen/Config.in | 77 ------------------- > boot/ti-k3/Config.in | 59 ++++++++++++++ > boot/ti-k3/common.mk | 1 + > .../{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 > .../ti-k3-boot-firmware.hash | 0 > .../ti-k3-boot-firmware.mk | 0 > boot/ti-k3/ti-k3-core-secdev/Config.in | 9 +++ > .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 + > .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 ++++++ > boot/ti-k3/ti-k3-image-gen/Config.in | 25 ++++++ > .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 > .../ti-k3-image-gen/ti-k3-image-gen.mk | 20 ++++- > boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 4 +- > .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- > .../ti-k3-r5-loader/ti-k3-r5-loader.mk | 16 +++- > boot/uboot/Config.in | 7 +- > boot/uboot/uboot.mk | 3 +- > configs/ti_am62x_sk_defconfig | 23 +++--- > configs/ti_am64x_sk_defconfig | 8 +- > package/python-attrs/python-attrs.mk | 6 ++ > .../python-jsonschema-specifications.mk | 5 ++ > .../python-jsonschema/python-jsonschema.mk | 6 ++ > .../python-referencing/python-referencing.mk | 5 ++ > package/python-rpds-py/python-rpds-py.mk | 1 + > 29 files changed, 263 insertions(+), 105 deletions(-) > create mode 100755 board/ti/am62x-sk/post-build.sh > create mode 100755 board/ti/am62x-sk/post-image.sh > delete mode 100644 boot/ti-k3-image-gen/Config.in > create mode 100644 boot/ti-k3/Config.in > create mode 100644 boot/ti-k3/common.mk > rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) > create mode 100644 boot/ti-k3/ti-k3-core-secdev/Config.in > create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash > create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk > create mode 100644 boot/ti-k3/ti-k3-image-gen/Config.in > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (67%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (97%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (54%) > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (85%) > From romain.naour at smile.fr Mon Feb 19 09:36:56 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 10:36:56 +0100 Subject: [Buildroot] [PATCH v4 01/20] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240217160244.1320482-2-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-2-dario.binacchi@amarulasolutions.com> Message-ID: <6b3561ef-a245-4bb4-baa3-c41864aa8b61@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > Checking the output of the command `git grep PLATFORM | grep k3`, we can > found the proper settings for the optee-os package: > > .github/workflows/ci.yml: _make PLATFORM=k3-am62x > .github/workflows/ci.yml: _make PLATFORM=k3-am62x CFG_ARM64_core=y > ... > core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) Setting BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR doesn't seems necessary since optee-os Makefile can extract it from BR2_TARGET_OPTEE_OS_PLATFORM [1]. [1] https://git.yoctoproject.org/meta-ti/commit/?id=912983dd562ba5f009a4db34e8abe3810c8ed7ac Best regards, Romain > > Suggested-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > configs/ti_am62x_sk_defconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index f88252a89c68..fde6f8f5636a 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -21,7 +21,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > +BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y From romain.naour at smile.fr Mon Feb 19 09:48:59 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 10:48:59 +0100 Subject: [Buildroot] [PATCH v4 06/20] boot/ti-k3-core-secdev: new package In-Reply-To: <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> Message-ID: <5f007c47-0c4c-438b-8978-4fe6e2515db1@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > This is a security development package containing tools for > High-Security(HS) TI K3 platform devices. Note: this tool can also handle TI "legacy" platform such AM57xx or AM43xx (not sure we really want do that). Can you try without this package when using binman? This tool doesn't seems "future proof". http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html Best regards, Romain > > Signed-off-by: Dario Binacchi > > --- > > Changes in v4: > - Remove the trailing '/' at the end of the url in the help of > Config.in > - Fixed license issues > - Use $(BINARIES_DIR)/ti-k3-core-secdev as the directory where to > install files. > > Signed-off-by: Dario Binacchi > --- > DEVELOPERS | 1 + > boot/Config.in | 1 + > boot/ti-k3-core-secdev/Config.in | 9 ++++++++ > boot/ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 +++ > boot/ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 +++++++++++++++++++ > 5 files changed, 36 insertions(+) > create mode 100644 boot/ti-k3-core-secdev/Config.in > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 0d12c3abcb11..33d99ab2440f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -753,6 +753,7 @@ F: package/xinetd/ > N: Dario Binacchi > F: board/bsh/ > F: board/stmicroelectronics/stm32f769-disco/ > +F: boot/ti-k3-core-secdev/ > F: configs/imx8mn_bsh_smm_s2_defconfig > F: configs/imx8mn_bsh_smm_s2_pro_defconfig > F: configs/stm32f769_disco_sd_defconfig > diff --git a/boot/Config.in b/boot/Config.in > index e5fdf7ad439e..18a7d268f95a 100644 > --- a/boot/Config.in > +++ b/boot/Config.in > @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" > source "boot/shim/Config.in" > source "boot/syslinux/Config.in" > source "boot/ti-k3-boot-firmware/Config.in" > +source "boot/ti-k3-core-secdev/Config.in" > source "boot/ti-k3-image-gen/Config.in" > source "boot/ti-k3-r5-loader/Config.in" > source "boot/uboot/Config.in" > diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in > new file mode 100644 > index 000000000000..f7b4e2962042 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/Config.in > @@ -0,0 +1,9 @@ > +config BR2_TARGET_TI_K3_CORE_SECDEV > + bool "ti-k3-core-secdev" > + depends on BR2_aarch64 > + help > + This package downloads and installs development tools for > + High-Security(HS) TI K3 platforms (which include AM62x, > + AM64x, AM65x and more). > + > + https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > new file mode 100644 > index 000000000000..e3074a398d62 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > @@ -0,0 +1,3 @@ > +# Locally calculated > +sha256 b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06 core-secdev-k3-08.06.00.007.tar.xz > +sha256 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369 manifest/k3-secdev-0.2-manifest.html > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > new file mode 100644 > index 000000000000..f7655a0fefc8 > --- /dev/null > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# ti-k3-core-secdev > +# > +################################################################################ > + > +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 > +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot > +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz > +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES > +TI_K3_CORE_SECDEV_LICENSE = BSD-3-Clause > +TI_K3_CORE_SECDEV_LICENSE_FILES = manifest/k3-secdev-0.2-manifest.html > + > +TI_K3_CORE_SECDEV_INSTALL_DIR = $(BINARIES_DIR)/ti-k3-core-secdev > + > +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS > + mkdir -p $(TI_K3_CORE_SECDEV_INSTALL_DIR) > + cp -dpfr $(@D)/keys $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > + cp -dpfr $(@D)/scripts $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > +endef > + > +$(eval $(generic-package)) From anaumann at ultratronik.de Mon Feb 19 09:51:53 2024 From: anaumann at ultratronik.de (Andreas Naumann) Date: Mon, 19 Feb 2024 10:51:53 +0100 Subject: [Buildroot] [PATCH 0/2] Fix flutter build failure Message-ID: <20240219095155.2758428-1-anaumann@ultratronik.de> Hello Adam, all, I was motivated to give flutter a spin after your talk at FOSDEM, however the recent bump to Python 3.12.1 broke some script during the flutter-engine configure step. Fortunately now a new major stable version has been released 3.19.0, which contains a patch for this. After bumping engine and sdk they successfully build again, as does creating the flutter bundles which you provided in https://github.com/aduskett/buildroot-fosdem2024-flutter-demos I have not yet been able to run them using ivi-homescreen, but that's probably due to my target display/wayland setup. However, the flutter-gallery no longer builds with 3.19, even after bumping to the main HEAD. Their github README says "NOTE: The Flutter Gallery is now deprecated, and no longer being active maintained." I thought about including a patch for removal of the gallery package, but that would leave us with no example for how to create a flutter bundle. regards, Andreas Andreas Naumann (2): package/flutter-engine: bump to version 3.19.0 package/flutter-sdk-bin: bump to version 3.19.0 package/flutter-engine/flutter-engine.mk | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.34.1 From anaumann at ultratronik.de Mon Feb 19 09:51:54 2024 From: anaumann at ultratronik.de (Andreas Naumann) Date: Mon, 19 Feb 2024 10:51:54 +0100 Subject: [Buildroot] [PATCH 1/2] package/flutter-engine: bump to version 3.19.0 In-Reply-To: <20240219095155.2758428-1-anaumann@ultratronik.de> References: <20240219095155.2758428-1-anaumann@ultratronik.de> Message-ID: <20240219095155.2758428-2-anaumann@ultratronik.de> This also fixes an error during configure due to 3.16.8 not being compatible to Python 3.12 (which we lately bumped to) Signed-off-by: Andreas Naumann --- package/flutter-engine/flutter-engine.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index d08274f546..0d719e29eb 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -21,7 +21,7 @@ # # There is no hash provided, as the gn binary (used for configuration) relies # on the .git directories. As such, a reproducible tarball is not possible. -FLUTTER_ENGINE_VERSION = 3.16.8 +FLUTTER_ENGINE_VERSION = 3.19.0 # There is nothing for Buildroot to download. This is handled by gclient. FLUTTER_ENGINE_SITE = -- 2.34.1 From anaumann at ultratronik.de Mon Feb 19 09:51:55 2024 From: anaumann at ultratronik.de (Andreas Naumann) Date: Mon, 19 Feb 2024 10:51:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/flutter-sdk-bin: bump to version 3.19.0 In-Reply-To: <20240219095155.2758428-1-anaumann@ultratronik.de> References: <20240219095155.2758428-1-anaumann@ultratronik.de> Message-ID: <20240219095155.2758428-3-anaumann@ultratronik.de> Signed-off-by: Andreas Naumann --- package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash index 48c9c7d7e3..9200972eb9 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7cb12032cf615a92a7bc9042100f3f2af62df7df3ca3bee27f4b153fe218b239 flutter_linux_3.16.8-stable.tar.xz +sha256 4cc1706fbd6e2a5c0ee34a6f8de875aae20904c9f47e18c88d2fcb25d9ea1a79 flutter_linux_3.19.0-stable.tar.xz sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index 0d9a44596d..7215b45460 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_SDK_BIN_VERSION = 3.16.8 +FLUTTER_SDK_BIN_VERSION = 3.19.0 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause -- 2.34.1 From romain.naour at smile.fr Mon Feb 19 09:58:26 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 10:58:26 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> Message-ID: <8dca9e04-832f-4ffc-b6b0-d1deed31259b@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > The patch sets the configurations required by TI HS systems. Some of these > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > are provided by the ti-k3-core-secdev package in the binaries directory. Such keys has been added to u-boot v2023.10: https://git.ti.com/cgit/security-development-tools/core-secdev-k3/tree/keys https://source.denx.de/u-boot/u-boot/-/commit/d5b1ef30d7ffabb9f57d5c62b9f0608837af0f4f Do we need something else from ti-k3-core-secdev package that is not already provided by u-boot? Best regards, Romain > > Signed-off-by: Dario Binacchi > > --- > > no changes since v3: > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3-image-gen/Config.in | 1 + > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > index d76cef82e911..38d1598d9fc0 100644 > --- a/boot/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3-image-gen/Config.in > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > bool "ti-k3-image-gen" > depends on BR2_TARGET_TI_K3_R5_LOADER > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > # We need FIT support in uboot-tools, which is why we select a > # host package > select BR2_PACKAGE_HOST_UBOOT_TOOLS > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > index 64be9a18f2c4..74b4fcb4bf89 100644 > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > +else > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > + > +TI_K3_IMAGE_GEN_SYSFW = \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > +endif > > define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > + ) > endef > > define TI_K3_IMAGE_GEN_BUILD_CMDS > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > $(BR2_MAKE) -C $(@D) \ > SOC=$(TI_K3_IMAGE_GEN_SOC) \ > SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ > CONFIG=evm \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ From romain.naour at smile.fr Mon Feb 19 10:03:35 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:03:35 +0100 Subject: [Buildroot] [PATCH v4 08/20] package/python-jsonschema: add host variant In-Reply-To: <20240217160244.1320482-9-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-9-dario.binacchi@amarulasolutions.com> Message-ID: <7bbbe31b-210f-49c4-8344-05f2f09b18de@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. This package is required by binman. I did some improvement about host-python package you need for binam. Indeed, host-python-jsonschema has some runtime dependencies, but we don't have the concept of runtime dependencies for host packages. Due to thoses runtime dependencies you can't add python-jsonschema host variant before adding host-python-attrs, host-python-jsonschema-specifications, host-python-referencing and host-python-rpds-py. Best regards, Romain > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi > > --- > > no changes since v3 > > Changes in v3: > - Drop Config.in.host > > Signed-off-by: Dario Binacchi > --- > package/python-jsonschema/python-jsonschema.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk > index 512c92aa7752..85fef7ad22ac 100644 > --- a/package/python-jsonschema/python-jsonschema.mk > +++ b/package/python-jsonschema/python-jsonschema.mk > @@ -15,4 +15,10 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ > host-python-hatch-fancy-pypi-readme \ > host-python-hatch-vcs > > +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ > + host-python-hatchling \ > + host-python-hatch-fancy-pypi-readme \ > + host-python-hatch-vcs > + > $(eval $(python-package)) > +$(eval $(host-python-package)) From romain.naour at smile.fr Mon Feb 19 10:15:30 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:15:30 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > The patch set the BINMAN_INDIRS environment variable to provide the > directory to search for binary blobs and select the packages required by > binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi > > --- > > Changes in v4: > - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > Changes in v2: > - Change commit message > - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > - Select packages required by binman if > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0ffcb8235f2e..2a10024aedaa 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ > host-pkgconf \ > $(BR2_MAKE_HOST_DEPENDENCY) \ > host-arm-gnu-toolchain \ > - host-openssl > + host-openssl \ > + host-python-attrs \ > + host-python-jsonschema \ > + host-python-jsonschema-specifications \ > + host-python-pyyaml \ > + host-python-referencing \ > + host-python-rpds-py Most of theses new dependencies are not ti-k3-r5-loader dependencies but host-python-jsonschema runtime dependencies. Note: host-python-jsonschema depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS due to its runtime dependency on host-python-rpds-py. > > TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ > $(BR2_BISON_HOST_DEPENDENCY) \ > $(BR2_FLEX_HOST_DEPENDENCY) > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) It's a u-boot package config option. just add host-python-pylibfdt the dependency. > +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt > +endif > + > ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) > TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig > else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) > @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ARCH=arm \ > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > + BINMAN_INDIRS=$(BINARIES_DIR) \ I suggested to add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN but indeed we should use binman unconditionally for ti-k3-r5-loader package. http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ Best regards, Romain > HOSTLDFLAGS="$(HOST_LDFLAGS)" > > define TI_K3_R5_LOADER_BUILD_CMDS From romain.naour at smile.fr Mon Feb 19 10:19:50 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:19:50 +0100 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> Message-ID: <345794c9-c917-4157-b614-67501e9597ab@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > As explained in [1], adding support for AM62x LP SK in U-Boot, requires > binman for building bootloader images. The BINMAN_INDIRS environment > variable is used to provide a space-separated list of directories to > search for binary blobs. Binman is not a tool specific to TI K3 SoC and may be used by any other SoC vendor. I believe we should add a new u-boot option for it (BR2_TARGET_UBOOT_USE_BINMAN) and not depend on BR2_TARGET_UBOOT_NEEDS_TI_K3_DM being enabled. http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-10-romain.naour at smile.fr/ > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > Signed-off-by: Dario Binacchi > > --- > > no changes since v1: > > Signed-off-by: Dario Binacchi > --- > boot/uboot/uboot.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dda606a88059..cf70f86a4132 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -189,7 +189,8 @@ endif > ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > UBOOT_DEPENDENCIES += ti-k3-boot-firmware > -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ > + BINMAN_INDIRS=$(BINARIES_DIR) > endif Binman dependencies are missing. Best regards, Romain > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) From romain.naour at smile.fr Mon Feb 19 10:28:59 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:28:59 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> Message-ID: <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > Recent versions of U-Boot can use Binman to compile and sign the generated > binaries, thus making the use of custom tools like ti-k3-image-gen no > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > configured and used outside of it. This patch allows setting such options > even if the package is not enabled. I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. Best regards, Romain > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3/Config.in | 46 ++++++++++++++ > boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > boot/uboot/Config.in | 7 +-- > configs/ti_am62x_sk_defconfig | 2 +- > configs/ti_am64x_sk_defconfig | 2 +- > 6 files changed, 59 insertions(+), 67 deletions(-) > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > index 06dda2f156a9..9e508326c9c8 100644 > --- a/boot/ti-k3/Config.in > +++ b/boot/ti-k3/Config.in > @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > > if BR2_TARGET_TI_K3 > > +choice > + prompt "SoC family" > + > +config BR2_TARGET_TI_K3_SOC_AM62AX > + bool "am62ax" > + > +config BR2_TARGET_TI_K3_SOC_AM62X > + bool "am62x" > + > +config BR2_TARGET_TI_K3_SOC_AM64X > + bool "am64x" > + > +config BR2_TARGET_TI_K3_SOC_AM65X > + bool "am65x" > + > +endchoice > + > +choice > + prompt "Security type" > + help > + The target SoC security type option. > + > +config BR2_TARGET_TI_K3_SECTYPE_GP > + bool "gp" > + > +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > + bool "hs-fs" > + > +config BR2_TARGET_TI_K3_SECTYPE_HS > + bool "hs" > + > +endchoice > + > +config BR2_TARGET_TI_K3_SOC > + string > + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > + > +config BR2_TARGET_TI_K3_SECTYPE > + string > + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > + > source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > source "boot/ti-k3/ti-k3-core-secdev/Config.in" > source "boot/ti-k3/ti-k3-image-gen/Config.in" > diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > index 38d1598d9fc0..2d53d62dd4ee 100644 > --- a/boot/ti-k3/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > bool "ti-k3-image-gen" > depends on BR2_TARGET_TI_K3_R5_LOADER > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > # We need FIT support in uboot-tools, which is why we select a > # host package > select BR2_PACKAGE_HOST_UBOOT_TOOLS > @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > if BR2_TARGET_TI_K3_IMAGE_GEN > -choice > - prompt "SoC family" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - bool "am62ax" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - bool "am62x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - bool "am64x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - bool "am65x" > - > -endchoice > - > -choice > - prompt "Security type" > - help > - The target SoC security type option for image gen. Valid > - options are "gp" for General Purpose devices, "hs-fs" for > - High Security - Field Securable devices, or "hs" for High > - Security - Security Enforcing devices. Note for all High > - Security device variants the TI_SECURE_DEV_PKG environmental > - variable must be defined at build time pointing to a valid > - core-secdev-k3 folder location, otherwise the build will > - fail, see > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - bool "gp" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - bool "hs-fs" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > - bool "hs" > - > -endchoice > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > - string > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > string > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > - string > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > > endif > diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > index 74b4fcb4bf89..834d8f7d5cd5 100644 > --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > $(BR2_MAKE_HOST_DEPENDENCY) > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > TI_K3_IMAGE_GEN_SYSFW = \ > $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > else > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index beafb38930db..1a9d21e7c6d1 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > bool "U-Boot needs TI K3 Device Manager (DM)" > # We use the SoC selection defined for the ti-k3-image-gen > # package > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > help > Some TI K3 devices need the Device Manager (DM) firmware to > be available for the U-Boot build. > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > string > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > > endif > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index cd26235342e4..cfefce0a77a4 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > BR2_TARGET_TI_K3=y > +BR2_TARGET_TI_K3_SOC_AM62X=y > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 1befeb4ab96c..daf78dbffff8 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > BR2_TARGET_TI_K3=y > +BR2_TARGET_TI_K3_SOC_AM64X=y > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" From romain.naour at smile.fr Mon Feb 19 10:31:18 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:31:18 +0100 Subject: [Buildroot] [PATCH v4 20/20] configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore In-Reply-To: <20240217160244.1320482-21-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-21-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. So it's no longer necessary to use custom tools like > ti-k3-image-gen. > > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > configs/ti_am62x_sk_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index cfefce0a77a4..6259dec5985d 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -25,7 +25,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > BR2_TARGET_TI_K3=y > BR2_TARGET_TI_K3_SOC_AM62X=y > -BR2_TARGET_TI_K3_IMAGE_GEN=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" The am64x defconfig should do the same, then the ti-k3-boot-firmware can be removed. Best regards, Romain From romain.naour at smile.fr Mon Feb 19 10:35:44 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:35:44 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <4a8d7f2252b46118554a9e22c49901822e461f2f.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <4a8d7f2252b46118554a9e22c49901822e461f2f.camel@gmail.com> Message-ID: Hello Alexander, Le 17/02/2024 ? 18:40, Alexander Sverdlin a ?crit?: > Hi Dario! > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: >> This series, which in my humble opinion, should have been immediately >> considered to correct the compilation errors in case of HS-FS devcies, has >> seen an increase in patches in version 4 to remove the ti-k3-image-gen > > I wasn't aware of the preceeding versions, but... > >> package thanks to Binman. Additionally, it shares some modifications and >> views on how to implement certain changes with the series >> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. >> Therefore, I think it is necessary not to run them in parallel but to decide >> whether to merge one before the other or to consider a single series where >> the patches can be coherent with each other. I am available for both solutions. >> Let me know. > > ... as the broken HS-FS went unnoticed, seems there is no rush to fix the > build now? I'd vote for a combined series, because yours and Romains do > overlap here and there, but I personally would pick different parts from > different series. I'd not introduce secdev package unless absolutely > necessary, and I actually build HS-FS images with yocto with custom keys > and using upstream U-Boot binman alone, so maybe I miss something, but > I don't see the package as required. > > From my side I can offer testing on SK-AM62x variants, both GP and HS-FS. > I will definitely test your v4 because in contrast to Romain's U-Boot > v2024.01 bump yours may actually boot... > Can you merge Dario changes (extlinux.conf and post-build.sh) and try again? Best regards, Romain From romain.naour at smile.fr Mon Feb 19 10:40:12 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:40:12 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Message-ID: <9f0b5e0e-b766-4995-a7de-32ea7d5a66bf@smile.fr> Hello Alexander, Le 17/02/2024 ? 21:38, Alexander Sverdlin a ?crit?: > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: >> Recent version of U-Boot use binman to provide a mechanism for building >> images, from simple SPL + U-Boot combinations, to more complex >> arrangements with many parts. >> >> The patch set the BINMAN_INDIRS environment variable to provide the >> directory to search for binary blobs and select the packages required by >> binman. >> >> Co-developed-by: Michael Trimarchi >> Signed-off-by: Michael Trimarchi >> Signed-off-by: Dario Binacchi > > I personally do not see why binman usage should be configurable as in > https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ > your patch looks simpler, Agree, the binman must be mandatory for ti-k3-r5-loader package. The intend was to take care of the existing am64x am62x defconfig that was working without binman. As soon as all TI K3 defconfig switched to binman, this option can be removed. Best regards, Romain > > Reviewed-by: Alexander Sverdlin > >> --- >> >> Changes in v4: >> - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >> >> Changes in v2: >> - Change commit message >> - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >> - Select packages required by binman if >> ? BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled >> >> Signed-off-by: Dario Binacchi >> --- >> ?boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- >> ?1 file changed, 12 insertions(+), 1 deletion(-) >> >> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >> index 0ffcb8235f2e..2a10024aedaa 100644 >> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >> @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ >> ? host-pkgconf \ >> ? $(BR2_MAKE_HOST_DEPENDENCY) \ >> ? host-arm-gnu-toolchain \ >> - host-openssl >> + host-openssl \ >> + host-python-attrs \ >> + host-python-jsonschema \ >> + host-python-jsonschema-specifications \ >> + host-python-pyyaml \ >> + host-python-referencing \ >> + host-python-rpds-py >> ? >> ?TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) >> ?TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) >> @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ >> ? $(BR2_BISON_HOST_DEPENDENCY) \ >> ? $(BR2_FLEX_HOST_DEPENDENCY) >> ? >> +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) >> +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt >> +endif >> + >> ?ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) >> ?TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig >> ?else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) >> @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ >> ? CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ >> ? ARCH=arm \ >> ? HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ >> + BINMAN_INDIRS=$(BINARIES_DIR) \ >> ? HOSTLDFLAGS="$(HOST_LDFLAGS)" >> ? >> ?define TI_K3_R5_LOADER_BUILD_CMDS > From romain.naour at smile.fr Mon Feb 19 10:42:40 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:42:40 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> Message-ID: <829fe158-b695-41d1-8261-6d20d39f7381@smile.fr> Hello Alexander, Le 18/02/2024 ? 00:45, Alexander Sverdlin a ?crit?: > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: >> The patch sets the configurations required by TI HS systems. Some of these >> configurations (i. e. HS SYSFW image signing key, HS Software Revision) >> are provided by the ti-k3-core-secdev package in the binaries directory. >> >> Signed-off-by: Dario Binacchi > > so for test I've reverted the previous "boot/ti-k3-core-secdev: new package" > commit, then... Thanks for testing! To be sure, I would recommend to do a build from scratch before testing. Best regards, Romain > >> --- >> >> no changes since v3: >> >> Signed-off-by: Dario Binacchi >> --- >> ?boot/ti-k3-image-gen/Config.in????????? |? 1 + >> ?boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- >> ?2 files changed, 15 insertions(+), 2 deletions(-) >> >> diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in >> index d76cef82e911..38d1598d9fc0 100644 >> --- a/boot/ti-k3-image-gen/Config.in >> +++ b/boot/ti-k3-image-gen/Config.in >> @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >> ? bool "ti-k3-image-gen" >> ? depends on BR2_TARGET_TI_K3_R5_LOADER >> ? select BR2_TARGET_TI_K3_BOOT_FIRMWARE >> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > ... removed this, ... > >> ? # We need FIT support in uboot-tools, which is why we select a >> ? # host package >> ? select BR2_PACKAGE_HOST_UBOOT_TOOLS >> diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> index 64be9a18f2c4..74b4fcb4bf89 100644 >> --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk >> @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) >> ?TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) >> ?TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) >> ? >> -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >> +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) >> +TI_K3_IMAGE_GEN_SYSFW = \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >> +else >> +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > > ... the above line, ... > >> + >> +TI_K3_IMAGE_GEN_SYSFW = \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ >> + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin >> +endif >> ? >> ?define TI_K3_IMAGE_GEN_CONFIGURE_CMDS >> - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) >> + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ >> + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ >> + ) >> ?endef >> ? >> ?define TI_K3_IMAGE_GEN_BUILD_CMDS >> @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS >> ? $(BR2_MAKE) -C $(@D) \ >> ? SOC=$(TI_K3_IMAGE_GEN_SOC) \ >> ? SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ >> + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ > > ... and this line... > >> ? CONFIG=evm \ >> ? CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ >> ? SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > > ... and everything still builds and boots fine on SK-AM62B (HS-FS): > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:02:43 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 13400 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Starting ATF on ARM64 core... > > NOTICE: BL31: v2.7(release):v2.7 > NOTICE: BL31: Built : 23:57:43, Feb 17 2024 > I/TC: > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1199-g470b2069e4)) #1 Sat Feb 17 22:57:38 UTC 2024 aarch64 > I/TC: WARNING: This OP-TEE configuration might be insecure! > I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html > I/TC: Primary CPU initializing > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > I/TC: HUK Initialized > I/TC: Activated SA2UL device > I/TC: Enabled firewalls for SA2UL TRNG device > I/TC: SA2UL TRNG initialized > I/TC: SA2UL Drivers initialized > I/TC: Primary CPU switching to normal world boot > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:03:30 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 1872 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > > > U-Boot 2024.01 (Feb 18 2024 - 00:03:30 +0100) > > SoC: AM62X SR1.0 HS-FS > Model: Texas Instruments AM625 SK > DRAM: 2 GiB > Core: 56 devices, 23 uclasses, devicetree: separate > MMC: mmc at fa10000: 0, mmc at fa00000: 1 > Loading Environment from nowhere... OK > In: serial at 2800000 > Out: serial at 2800000 > Err: serial at 2800000 > Net: eth0: ethernet at 8000000port@1 > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc1 is current device > SD/MMC found on device 1 > Failed to load 'uEnv.txt' > Scanning for bootflows in all bootdevs > Seq Method State Uclass Part Name Filename > --- ----------- ------ -------- ---- ------------------------ ---------------- > Scanning global bootmeth 'efi_mgr': > No EFI system partition > No EFI system partition > Failed to persist EFI variables > Scanning bootdev 'mmc at fa00000.bootdev': > 0 extlinux ready mmc 1 mmc at fa00000.bootdev.part_ /extlinux/extlinux.conf > ** Booting bootflow 'mmc at fa00000.bootdev.part_1' with extlinux > 1: am62x-sk-buildroot > Retrieving file: /Image > append: console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 > Retrieving file: /k3-am62x.dtb > ## Flattened Device Tree blob at ffb14700 > Booting using the fdt blob at 0xffb14700 > Working FDT set to ffb14700 > Loading Device Tree to 000000008ffed000, end 000000008ffff687 ... OK > Working FDT set to 8ffed000 > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] > [ 0.000000] Linux version 6.6.1 (...) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1199-g470b2069e4) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Sun Feb 18 > 00:37:47 CET 2024 > > > From alexander.sverdlin at gmail.com Mon Feb 19 10:47:05 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Mon, 19 Feb 2024 11:47:05 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <829fe158-b695-41d1-8261-6d20d39f7381@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> <829fe158-b695-41d1-8261-6d20d39f7381@smile.fr> Message-ID: <893883be1cb49fda2c733465135b6f80f61e4f22.camel@gmail.com> Hi Romain, On Mon, 2024-02-19 at 11:42 +0100, Romain Naour wrote: > > > The patch sets the configurations required by TI HS systems. Some of these > > > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > > > are provided by the ti-k3-core-secdev package in the binaries directory. > > > > > > Signed-off-by: Dario Binacchi > > > > so for test I've reverted the previous "boot/ti-k3-core-secdev: new package" > > commit, then... > > Thanks for testing! > To be sure, I would recommend to do a build from scratch before testing. indeed it was a clean build. -- Alexander Sverdlin. From romain.naour at smile.fr Mon Feb 19 10:47:23 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 11:47:23 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> <8662a0c59b8cea111c15cabb121c6b598d5a1d04.camel@gmail.com> Message-ID: <89254b90-c849-4be3-b77b-f076b0439b4d@smile.fr> Hello Dario, Le 18/02/2024 ? 14:38, Dario Binacchi a ?crit?: > Hi Alexander, > > On Sat, Feb 17, 2024 at 6:28?PM Alexander Sverdlin > wrote: >> >> Hi Dario, >> >> On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: >>> Recent versions of U-Boot are capable of building tiboot3.bin using >>> Binman. In this case, let's copy it to the binaries directory. >>> >>> Signed-off-by: Dario Binacchi >> >> https://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-12-romain.naour at smile.fr/ >> >> looks more complete with sysfw.itb? > > In my use case, there was no need as it was necessary to enable > ti-k3-boot-firmware: > > define TI_K3_BOOT_FIRMWARE_INSTALL_IMAGES_CMDS > cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ > cp -dpfr $(@D)/ti-dm $(BINARIES_DIR)/ > endef > > I also wonder whether it is necessary to remove the > cp -dpfr $(@D)/ti-sysfw $(BINARIES_DIR)/ > to avoid conflicts. > > Alternatively, as happened with ti-k3-hen-image, one day we may no > longer need ti-k3-boot-firmware, > and therefore we could add a copy of sysfw.itb from ti-k3-r5-loader. I > am awaiting suggestions. > However, my patch does not require modifying the genimage.cfg file. In > any case, I would try to ensure > this also for sysfw.itb. sysfw.itb is build by ti-k3-r5-loader and it's not provided by ti-k3-boot-firmware. This file depends on the TI K3 "Split binary" boot flow [1]: - Split binary with a combined firmware: (eg: AM65) - Combined binary with a combined firmware: (eg: AM64) - Split binary with a split firmware: (eg: J721E) - Combined binary with a split firmware: (eg: AM62) [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst Best regards, Romain > > Thanks and regards, > Dario > >> >>> --- >>> >>> Added in v4 >>> >>> Signed-off-by: Dario Binacchi >>> --- >>> boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ >>> 1 file changed, 3 insertions(+) >>> >>> diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> index 2a10024aedaa..643298a1e70a 100644 >>> --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS >>> $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) >>> endef >>> >>> +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) >>> + >>> define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS >>> cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin >>> + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; >>> endef >>> >>> $(eval $(kconfig-package)) >> >> -- >> Alexander Sverdlin. >> > > From michael at amarulasolutions.com Mon Feb 19 11:02:54 2024 From: michael at amarulasolutions.com (Michael Nazzareno Trimarchi) Date: Mon, 19 Feb 2024 12:02:54 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> Message-ID: Hi Romain On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: > > Hello Dario, > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > > high-security field-securable (HS-FS) silicon to optionally customize keys > > and encryption for security applications. > > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > > which, however, was buggy. This series fixes the errors and bumps the Linux > > kernel and U-Boot required for such a new device. > > > > This series, which in my humble opinion, should have been immediately > > considered to correct the compilation errors in case of HS-FS devcies, has > > seen an increase in patches in version 4 to remove the ti-k3-image-gen > > package thanks to Binman. Additionally, it shares some modifications and > > views on how to implement certain changes with the series > > https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > > Therefore, I think it is necessary not to run them in parallel but to decide > > whether to merge one before the other or to consider a single series where > > the patches can be coherent with each other. I am available for both solutions. > > Let me know. > > Thanks for this new version. I beleive both series should be merged into one > since we want to follow u-boot switch to binman, add more TI K3 SoC support and > keeping exising am62x ans am64x working in GP or HS/HS-FS. > Because the Dario patchset was sent before (end of November), it's reasonable to review and adjust that one and apply your changes for ti_j721e_sk on top of it. It think that is a standard way to make people happy about their work and contribution. Michael > My main concern is to avoid adding a new package for a tool that is already > deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. > > Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". > > [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html > > Best regards, > Romain > > > > > Dario Binacchi (20): > > configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > setting > > configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > setting > > configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > > version > > configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > > version > > boot/ti-k3-r5-loader: bump to version 2024.01 > > boot/ti-k3-core-secdev: new package > > boot/ti-k3-image-gen: manage HS hardware > > package/python-jsonschema: add host variant > > package/python-attrs: add host variant > > package/python-referencing: add host variant > > package/python-rpds-py: add host variant > > package/python-jsonschema-specifications: add host variant > > boot/ti-k3-r5-loader: set binman environment > > boot/uboot: set BINMAN_INDIRS for TI K3 DM > > configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > > configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 > > boot: move ti-k3-* packages to 'ti-k3' directory > > boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > > boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > > configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore > > > > DEVELOPERS | 1 + > > board/ti/am62x-sk/genimage.cfg | 7 +- > > board/ti/am62x-sk/post-build.sh | 49 ++++++++++++ > > board/ti/am62x-sk/post-image.sh | 5 ++ > > boot/Config.in | 4 +- > > boot/ti-k3-image-gen/Config.in | 77 ------------------- > > boot/ti-k3/Config.in | 59 ++++++++++++++ > > boot/ti-k3/common.mk | 1 + > > .../{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 > > .../ti-k3-boot-firmware.hash | 0 > > .../ti-k3-boot-firmware.mk | 0 > > boot/ti-k3/ti-k3-core-secdev/Config.in | 9 +++ > > .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 + > > .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 ++++++ > > boot/ti-k3/ti-k3-image-gen/Config.in | 25 ++++++ > > .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 > > .../ti-k3-image-gen/ti-k3-image-gen.mk | 20 ++++- > > boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 4 +- > > .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- > > .../ti-k3-r5-loader/ti-k3-r5-loader.mk | 16 +++- > > boot/uboot/Config.in | 7 +- > > boot/uboot/uboot.mk | 3 +- > > configs/ti_am62x_sk_defconfig | 23 +++--- > > configs/ti_am64x_sk_defconfig | 8 +- > > package/python-attrs/python-attrs.mk | 6 ++ > > .../python-jsonschema-specifications.mk | 5 ++ > > .../python-jsonschema/python-jsonschema.mk | 6 ++ > > .../python-referencing/python-referencing.mk | 5 ++ > > package/python-rpds-py/python-rpds-py.mk | 1 + > > 29 files changed, 263 insertions(+), 105 deletions(-) > > create mode 100755 board/ti/am62x-sk/post-build.sh > > create mode 100755 board/ti/am62x-sk/post-image.sh > > delete mode 100644 boot/ti-k3-image-gen/Config.in > > create mode 100644 boot/ti-k3/Config.in > > create mode 100644 boot/ti-k3/common.mk > > rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) > > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) > > rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) > > create mode 100644 boot/ti-k3/ti-k3-core-secdev/Config.in > > create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash > > create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk > > create mode 100644 boot/ti-k3/ti-k3-image-gen/Config.in > > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) > > rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (67%) > > rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (97%) > > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (54%) > > rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (85%) > > > From romain.naour at smile.fr Mon Feb 19 11:24:52 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 12:24:52 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> Message-ID: Hello Michael, Le 19/02/2024 ? 12:02, Michael Nazzareno Trimarchi a ?crit?: > Hi Romain > > On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: >> >> Hello Dario, >> >> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes >>> high-security field-securable (HS-FS) silicon to optionally customize keys >>> and encryption for security applications. >>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, >>> which, however, was buggy. This series fixes the errors and bumps the Linux >>> kernel and U-Boot required for such a new device. >>> >>> This series, which in my humble opinion, should have been immediately >>> considered to correct the compilation errors in case of HS-FS devcies, has >>> seen an increase in patches in version 4 to remove the ti-k3-image-gen >>> package thanks to Binman. Additionally, it shares some modifications and >>> views on how to implement certain changes with the series >>> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. >>> Therefore, I think it is necessary not to run them in parallel but to decide >>> whether to merge one before the other or to consider a single series where >>> the patches can be coherent with each other. I am available for both solutions. >>> Let me know. >> >> Thanks for this new version. I beleive both series should be merged into one >> since we want to follow u-boot switch to binman, add more TI K3 SoC support and >> keeping exising am62x ans am64x working in GP or HS/HS-FS. >> > > Because the Dario patchset was sent before (end of November), it's > reasonable to review and adjust that one > and apply your changes for ti_j721e_sk on top of it. It think that is > a standard way to make people happy about > their work and contribution. Actually, the two series are about the same topic: TI K3 SoC support (GP, HS, HS-FS) not only AM62x-SK HS-FS devices But due to the complexity of the BSP, the boot flow (4 way to boot!) and the switch from custom tool to binman... this series is really difficult to review without having a good understanding of TI K3 architecture peculiarity and having one of each TI evaluation boards ? The series (based on Dario's work) about ti_j721e_sk suggested to remove TI custom tools replaced by binman along with other improvements. I'll way for v5 and rebase the ti_j721e_sk on top of it. Best regards, Romain > > Michael > >> My main concern is to avoid adding a new package for a tool that is already >> deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. >> >> Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". >> >> [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html >> >> Best regards, >> Romain >> >>> >>> Dario Binacchi (20): >>> configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM >>> setting >>> configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM >>> setting >>> configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader >>> version >>> configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader >>> version >>> boot/ti-k3-r5-loader: bump to version 2024.01 >>> boot/ti-k3-core-secdev: new package >>> boot/ti-k3-image-gen: manage HS hardware >>> package/python-jsonschema: add host variant >>> package/python-attrs: add host variant >>> package/python-referencing: add host variant >>> package/python-rpds-py: add host variant >>> package/python-jsonschema-specifications: add host variant >>> boot/ti-k3-r5-loader: set binman environment >>> boot/uboot: set BINMAN_INDIRS for TI K3 DM >>> configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 >>> configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 >>> boot: move ti-k3-* packages to 'ti-k3' directory >>> boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope >>> boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin >>> configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore >>> >>> DEVELOPERS | 1 + >>> board/ti/am62x-sk/genimage.cfg | 7 +- >>> board/ti/am62x-sk/post-build.sh | 49 ++++++++++++ >>> board/ti/am62x-sk/post-image.sh | 5 ++ >>> boot/Config.in | 4 +- >>> boot/ti-k3-image-gen/Config.in | 77 ------------------- >>> boot/ti-k3/Config.in | 59 ++++++++++++++ >>> boot/ti-k3/common.mk | 1 + >>> .../{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 >>> .../ti-k3-boot-firmware.hash | 0 >>> .../ti-k3-boot-firmware.mk | 0 >>> boot/ti-k3/ti-k3-core-secdev/Config.in | 9 +++ >>> .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 + >>> .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 ++++++ >>> boot/ti-k3/ti-k3-image-gen/Config.in | 25 ++++++ >>> .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 >>> .../ti-k3-image-gen/ti-k3-image-gen.mk | 20 ++++- >>> boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 4 +- >>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- >>> .../ti-k3-r5-loader/ti-k3-r5-loader.mk | 16 +++- >>> boot/uboot/Config.in | 7 +- >>> boot/uboot/uboot.mk | 3 +- >>> configs/ti_am62x_sk_defconfig | 23 +++--- >>> configs/ti_am64x_sk_defconfig | 8 +- >>> package/python-attrs/python-attrs.mk | 6 ++ >>> .../python-jsonschema-specifications.mk | 5 ++ >>> .../python-jsonschema/python-jsonschema.mk | 6 ++ >>> .../python-referencing/python-referencing.mk | 5 ++ >>> package/python-rpds-py/python-rpds-py.mk | 1 + >>> 29 files changed, 263 insertions(+), 105 deletions(-) >>> create mode 100755 board/ti/am62x-sk/post-build.sh >>> create mode 100755 board/ti/am62x-sk/post-image.sh >>> delete mode 100644 boot/ti-k3-image-gen/Config.in >>> create mode 100644 boot/ti-k3/Config.in >>> create mode 100644 boot/ti-k3/common.mk >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/Config.in >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk >>> create mode 100644 boot/ti-k3/ti-k3-image-gen/Config.in >>> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) >>> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (67%) >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (97%) >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (54%) >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (85%) >>> >> From buildroot at bubu1.eu Mon Feb 19 11:30:27 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 19 Feb 2024 12:30:27 +0100 Subject: [Buildroot] [PATCH] package/python-django: add patch to fix crash with .pyc-only builds Message-ID: <20240219113028.607141-1-buildroot@bubu1.eu> Backport an upstream patch that fixes django auth and admin apps not working in .pyc only builds. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6148209453 Signed-off-by: Marcus Hoffmann --- ...d-sensitive_variables-sensitive_post.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch diff --git a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch new file mode 100644 index 0000000000..90dc9c7dd0 --- /dev/null +++ b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch @@ -0,0 +1,45 @@ +From d294b7679f2cb51c7231d6a7fb22e76eb74e49ec Mon Sep 17 00:00:00 2001 +From: Mariusz Felisiak +Date: Sat, 17 Feb 2024 08:15:59 +0100 +Subject: [PATCH] Fixed #35187 -- Fixed + @sensitive_variables/sensitive_post_parameters decorators crash with + .pyc-only builds. + +Thanks Jon Janzen for the implementation idea. + +Thanks Marcus Hoffmann for the report. + +Regression in 38e391e95fe5258bc6d2467332dc9cd44ce6ba52. +Backport of d1be05b3e9209fd0787841c71a95819d81061187 from main + +Signed-off-by: Marcus Hoffmann +Upstream: https://github.com/django/django/commit/41a4bba817f139f3cfd94f04e728e046560c9a18 +--- + django/views/decorators/debug.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py +index 7ea8a540de..6540fc0651 100644 +--- a/django/views/decorators/debug.py ++++ b/django/views/decorators/debug.py +@@ -47,7 +47,6 @@ def sensitive_variables(*variables): + + try: + file_path = inspect.getfile(wrapped_func) +- _, first_file_line = inspect.getsourcelines(wrapped_func) + except TypeError: # Raises for builtins or native functions. + raise ValueError( + f"{func.__name__} cannot safely be wrapped by " +@@ -55,7 +54,8 @@ def sensitive_variables(*variables): + "Python file (not a builtin or from a native extension)." + ) + else: +- key = hash(f"{file_path}:{first_file_line}") ++ first_line_number = wrapped_func.__code__.co_firstlineno ++ key = hash(f"{file_path}:{first_line_number}") + + if variables: + coroutine_functions_to_sensitive_variables[key] = variables +-- +2.34.1 + -- 2.34.1 From buildroot at bubu1.eu Mon Feb 19 14:52:19 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 19 Feb 2024 15:52:19 +0100 Subject: [Buildroot] [PATCH] package/util-linux: bump to version 2.39.3 In-Reply-To: <20240211222706.2959549-1-thomas.petazzoni@bootlin.com> References: <20240211222706.2959549-1-thomas.petazzoni@bootlin.com> Message-ID: <82397d49-8d5a-4349-aef5-50e83e5a9b40@bubu1.eu> Hi Thomas, On 11.02.24 23:27, Thomas Petazzoni via buildroot wrote: > Changes between 2.39.2 and 2.39.3: > > 2da5c904e18fdcffd2b252d641e6f76374c7b406 build-sys: release++ (v2.39.3) > 03c939edda81c5a4d6e5f5c1cb896e79c1e82e16 docs: update v2.39.3-ReleaseNotes > dafb120ef79c878cfd1b65c1d1c46497f17a7f7e docs: update AUTHORS file > bfc9691ce5d964b87f6c02cc236361b4772456d0 po-man: merge changes > d2232b60963a6e4e43fd359d1a4b552c4291b327 po: merge changes > 4ab356c1c02c34cd3935e1bb0aa47ed6e27cfe3c po: add ro.po (from translationproject.org) > 7e147d16c06f14b3f760b620d4f359cef12fe4ad po: update es.po (from translationproject.org) > e8cb61f07430d5f1d624245a219c2e21694c5f52 lsfd: fix memory leak in append_filter_expr() > 192d8aaa07e088e44fcb78736a53baae1ead7ccd lsfd: avoid undefined behavior > 756588f8c8b2ed93c124ca15cfb3f0efc4a0f9f6 lsfd: (man) fix the form for the optional argument of --inet option > 8d78c1306d1a9d5ebf9ec058344685da0360b87b Add Phytium FTC310 & FTC664 support > b75322cdb13c6c0b3789ff8fc19dcd017c069784 Add Phytium FTC862 cpu model. fix:#2486 > ec1b0eb36bd6c5a5079293ab03241163f61a8bf4 libmount: accept '\' as escape for options separator > 2e5f5c8d85338811595d321a77647a40e12321c9 tests: add ts_skip_docker > 0b3254cac3a275bbe32af57c6037cd29c21324d7 Merge branch 'stable-2.39/bcachefs-fixes' of https://github.com/t-8ch/util-linux into PR/stable-v2.39.3 > 6498439340a16e6acee54987df016c6b7928b17a tests: skip broken tests on docker > fa9b5365861934faab9ba73bd405095f56f02e45 libblkid: (bcachefs) add support for sub-device labels > 3c5d991b0323b33816e661e52da5d6f5402f47b5 libblkid: (bcachefs) adapt to major.minor version > ece194082fb318d0fa3fec31193ce6f61b97c67a libuuid: avoid truncate clocks.txt to improve performance > 84a62c1a5a614bde2530544bf2558c73f0179d42 libuuid/src/gen_uuid.c: fix cs_min declaration > 93239aa7869ddd236db8e5a28b4e6873ce6e0f22 libmount: fix possible NULL dereference [coverity scan] > a6def815e21d50db7a99ec74080c3fd7eb64e934 meson: install wall executable with group 'tty' > c6c1c69c3e83606eced938d841af03c1acef03a0 meson: install write executable with group 'tty' > bf2cd1d5a6eb273fbb11931b86ae165e7da5a397 libmount: improve mnt_table_next_child_fs() > c14f5bf37adf681c378fc004f0996e0bcfd30ce0 docs: add SPDX to boilerplate.c > fdd9f11f5e38b044617d3bc5f6c00789096b233f disk-utils: add SPDX and Copyright notices > e7dbe9c788da98b86f8cf87bc20ec74e32206451 include/audit-arch: add missing SPDX > 5ec7b14a72d9893d2a8d8c7f40cd45b44c9575c9 setterm: avoid restoring flags from uninitialized memory > 64d2300e6443c311219f187433046751a86ed18e Fix man page for col to correct documentation error > 7cc2c962567fe40daa9b12481224e5a0e6f96c47 Update col.c to fix option mistake > 122d7e7afb44d8a823e362673b0d2d1e31f7d478 umount: handle bindmounts during --recursive > da18b31ff1cb504e3d288f77d1f1d1179c39e4d8 lscpu: fix caches separator for --parse= > 3a5c9c1dd6935fb16f15f210b80ce9c5228e6a19 Use empty libuser config file. > 7058d793def09c3d4645e9efd1d8a5d212e839b0 libblkid: exfat: fix fail to find volume label > d065ff00a36b7244842f743372099837bc61328b blkpr: store return value of getopt_long in int > 9ca6f1712a5803e32e26e065e32e99837ba8b5d2 lib/path: Set errno in case of fgets failure > e2f0aa5c25c0295ef6187d3c53c2801fe17385e5 autotools: fix AC_DEFINE_UNQUOTED() use > cefd05c479e5456af8db2a86fabad165d247176b autotools: fix librtas check > f27fbafb24bdcefaa2463d47abc18491c3497451 lib/path: fix typos > f8ab70477e2ca7ac050fd4e2337b76a1972c8aa3 lib/path: set errno in case of error > 5ec30a362a5dd91c018c04a64fd1a481029dc4c6 lib/path: fix possible out of boundary access > edc723cd3341ff3d3e660051525dca40a2af6b3b libblkid: reset errno before calling probefuncs > 8de89778b945d552796f09576925310810ce798b setpriv: fix group argument completion > 41599054c7248f12c8a54d02f7161d0aff4275a9 libfdisk: reset errno before calling read() > cce4e44059405f3170b166fbf1774bf4b89c11c4 blkid: fix call to err_exclusive_options > b718f985cb6cc3bc65618649e9f231ecafcf81fb docs: use HTTPS for GitHub clone URLs > 2bddfa6928af328675b2ffbfc9b6546e9ee81722 libblkid: (probe) handle probe without chain gracefully > 3d31216787d6725fed361d27f0f01aff6ef46981 lib/idcache: always gracefully handle null cache > 368521e45e1c9cb44145fc72c04d1cc903a883e8 script-playutils: close filestream in case ignore_line() fails > 087b0d2383b8ab1ee4564d692d5f797ac781896f libblkid: (vxfs) report endianness > 7e5056f33bdfd867ce6f1a642f560fdf0b402c1e libblkid: (ntfs) validate that sector_size is a power of two > f368ccc759f9684338da723a93449764d0a8e312 libsmartcols: handle nameless tables in export format > f5cace8da07291c94b76b5cf80da1f921be67419 ldattach: don't call exit() from signal handler > 03c12a34c58d2550c6c718275950866d387d33f5 lslogins: fix realloc() loop allocation size > 83ba179b12d3c6c5f400bf78f2f742b1cc7ce256 lib/env: avoid underflow of read_all_alloc() return value > 813851fba28cb3ecde6a7f0c90a7e343920cd8c7 libblkid: avoid memory leak of cachefile path > 4459623cde42a5d021a6d71e38fcdfd4fff3e171 libmount: gracefully handle NULL path in mnt_resolve_target() > dbde7a537f27b23d64a8d3f583af472357de7192 more: avoid out-of-bound access > c26badd5d4295d52e987c75e69113edfb407fb27 libfdisk: handle allocation failure in fdisk_new_partition > 5c250aa6425fc3e35c07bce019eb4b7fa34bf722 login: Use pid_t for child_pid > be3f1712ee2e1e43d9b82b7cf4987c8a609a81ef login: move comment > 98be90b5bafa66d98655f8639efb3ffa984fc530 build-sys: fix libmount/src/hooks.c use > a711af02d32c0a0a31f1bbb943ffff2e94203e86 lscpu: Use 4K buffer size instead of BUFSIZ > 45c6136cba5f7607cca08c5aaab8e9b22ef87c25 autotools: fix typos > aa98c4ecc938a3459ffb759a444a8a585a9d0a3a libmount: make.stx_mnt_id use more robust > c697c2bb69f55aa24b6c0e2e752548f823c53796 libmount: report statx in features list > 13711f3ab79dfa92e8815eb9b752ec2bf4832d80 libmount: fix statx() includes > e9ed5a2b80bf8a76924caf8cd93b4cfff4d210a7 libblkid: (vfat) avoid modifying shared buffer > d2cadf0992cce589bfffeb603325c3c2fe54a991 libblkid: (jmicron_raid) use checksum APIs > c54c99efd0c3fc7f1e8db8b7191a6e1e3b295f1f libblkid: (jmicron_raid) avoid modifying shared buffer > 64418c52bc594abf01fc4ae8148e7aa93e4b3f22 libblkid: (zonefs) avoid modifying shared buffer > b66da7ce4a04d6c960817a56fe82498c4e7dea44 losetup: fix JSON MAJ:MIN > 44d7bf2c8d1c6d34a40416807d16db6c07ac4916 lslogins: (man) fix -y option formatting > 7d6c71e51ed3c5f8505c67962b6d03490738a879 include: add DragonFlyBSD GPT partition types > 6b9fda87c4e5d0c6f945d7565197f157b9fa3d5f libblkid: (bcachefs) fix size validation > acbf17ae8f8ee0f941fe98ed12f115f2b349bba8 libblkid: (bcachefs) fix compiler warning [-Werror=sign-compare] > 1ec71634aa4ef5ddca23d65c8a296f3614231e8a libblkid: (bcachefs) fix not detecting large superblocks > 68564ebb50f8afab5a9527c534417e247cca0b27 libmount: Fix regression when mounting with atime > > We can drop 0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch > as it was backported by upstream to the 2.39.x branch, and included in > 2.39.3. > > Signed-off-by: Thomas Petazzoni > --- > ...rc-gen_uuid.c-fix-cs_min-declaration.patch | 80 ------------------- > package/util-linux/util-linux.hash | 2 +- > package/util-linux/util-linux.mk | 2 +- > 3 files changed, 2 insertions(+), 82 deletions(-) > delete mode 100644 package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch > > diff --git a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch > deleted file mode 100644 > index bba4d54619..0000000000 > --- a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch > +++ /dev/null > @@ -1,80 +0,0 @@ > -From bcd11dece7d278bb0b76b138d08dedea80fa8262 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine > -Date: Tue, 7 Nov 2023 18:43:57 +0100 > -Subject: [PATCH] libuuid/src/gen_uuid.c: fix cs_min declaration > - > -Define cs_min through a define and not a const int to avoid the > -following build failure with -O0 raised since version 2.39 and > -https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: > - > -libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': > -libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant > - THREAD_LOCAL int cache_size = cs_min; > - ^~~~~~ > - > -For consistency, also use define for cs_max and cs_factor > - > -Fixes: > - - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 > - > -Signed-off-by: Fabrice Fontaine > -Upstream: https://github.com/util-linux/util-linux/commit/07e5c29d501c19e7af84fecb5915e0f9f94cb49f > ---- > - libuuid/src/gen_uuid.c | 19 ++++++++++--------- > - 1 file changed, 10 insertions(+), 9 deletions(-) > - > -diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c > -index 619ef0131..db793c374 100644 > ---- a/libuuid/src/gen_uuid.c > -+++ b/libuuid/src/gen_uuid.c > -@@ -518,6 +518,10 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) > - return __uuid_generate_time_internal(out, num, cont_offset); > - } > - > -+#define CS_MIN (1<<6) > -+#define CS_MAX (1<<18) > -+#define CS_FACTOR 2 > -+ > - /* > - * Generate time-based UUID and store it to @out > - * > -@@ -529,11 +533,8 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) > - static int uuid_generate_time_generic(uuid_t out) { > - #ifdef HAVE_TLS > - /* thread local cache for uuidd based requests */ > -- const int cs_min = (1<<6); > -- const int cs_max = (1<<18); > -- const int cs_factor = 2; > - THREAD_LOCAL int num = 0; > -- THREAD_LOCAL int cache_size = cs_min; > -+ THREAD_LOCAL int cache_size = CS_MIN; > - THREAD_LOCAL int last_used = 0; > - THREAD_LOCAL struct uuid uu; > - THREAD_LOCAL time_t last_time = 0; > -@@ -552,10 +553,10 @@ static int uuid_generate_time_generic(uuid_t out) { > - * Start with a small cache size to cover short running applications > - * and adjust the cache size over the runntime. > - */ > -- if ((last_used == cache_size) && (cache_size < cs_max)) > -- cache_size *= cs_factor; > -- else if ((last_used < (cache_size / cs_factor)) && (cache_size > cs_min)) > -- cache_size /= cs_factor; > -+ if ((last_used == cache_size) && (cache_size < CS_MAX)) > -+ cache_size *= CS_FACTOR; > -+ else if ((last_used < (cache_size / CS_FACTOR)) && (cache_size > CS_MIN)) > -+ cache_size /= CS_FACTOR; > - > - num = cache_size; > - > -@@ -568,7 +569,7 @@ static int uuid_generate_time_generic(uuid_t out) { > - } > - /* request to daemon failed, reset cache */ > - num = 0; > -- cache_size = cs_min; > -+ cache_size = CS_MIN; > - } > - if (num > 0) { /* serve uuid from cache */ > - uu.time_low++; > --- > -2.43.0 > - > diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash > index 1638cd9967..480f82d751 100644 > --- a/package/util-linux/util-linux.hash > +++ b/package/util-linux/util-linux.hash > @@ -1,5 +1,5 @@ > # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc > -sha256 87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f util-linux-2.39.2.tar.xz > +sha256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f util-linux-2.39.3.tar.xz > # License files, locally calculated > sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing This fails make legal-info now: >>> util-linux 2.39.3 Collecting legal info ERROR: README.licensing has wrong sha256 hash: ERROR: expected: 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 ERROR: got : 13f0ea46d12d798c095a6ad39d7ddc988e2e4d274c6494115f6b463f7bc4f702 ERROR: Incomplete download, or man-in-the-middle (MITM) attack Likely due to https://github.com/util-linux/util-linux/commit/fdd9f11f5e38b044617d3bc5f6c00789096b233f Which as far as I read it doesn't change any licensing but clarifies in the top level license readme that part of the code base (fdisk.c) is GPL-1.0-or-later licensed which wasn't mentioned before. The file in question already had correct license information before. > sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk > index 72126adb00..a9e5b0bf68 100644 > --- a/package/util-linux/util-linux.mk > +++ b/package/util-linux/util-linux.mk > @@ -8,7 +8,7 @@ > # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. > > UTIL_LINUX_VERSION_MAJOR = 2.39 > -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 > +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 > UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz > UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) > Best, Marcus From buildroot at bubu1.eu Mon Feb 19 18:26:04 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 19 Feb 2024 19:26:04 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 254.9 Message-ID: <20240219182604.1287000-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index c0f4638803..e5588f06a2 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 1e1e42c597b4f992679aa964a0c5c23d970c58fed47aed65c11878b332dc5b23 systemd-254.6.tar.gz +sha256 3d23003ea886dbffa5bc84ad72c6edcbde62d32dbdec506e308624e1da509cb0 systemd-254.9.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 528fe60b1d..c6b006d1fb 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 254.6 +SYSTEMD_VERSION = 254.9 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ -- 2.34.1 From buildroot at bubu1.eu Mon Feb 19 18:38:27 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 19 Feb 2024 19:38:27 +0100 Subject: [Buildroot] [PATCH] package/systemd: needs sulogin for emergency target support Message-ID: <20240219183828.1289275-1-buildroot@bubu1.eu> systemd invokes util-linux' sulogin via systemd-sulogin-shell[1] via emergency.service/emergency.target[2]. [1] https://github.com/systemd/systemd/blob/main/src/sulogin-shell/sulogin-shell.c [2] https://github.com/systemd/systemd/blob/main/units/emergency.service.in#L23 Signed-off-by: Marcus Hoffmann --- package/systemd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 859332d9e4..58b4e51c6d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -34,6 +34,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_FSCK + select BR2_PACKAGE_UTIL_LINUX_SULOGIN # emergency target select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools select BR2_PACKAGE_KMOD_TOOLS -- 2.34.1 From raphael.pavlidis at gmail.com Mon Feb 19 18:48:27 2024 From: raphael.pavlidis at gmail.com (Raphael Pavlidis) Date: Mon, 19 Feb 2024 18:48:27 +0000 Subject: [Buildroot] [PATCH v1 1/1] package/slirp4netns: bump to version 1.2.3 Message-ID: <20240219184827.790288-1-raphael.pavlidis@gmail.com> Signed-off-by: Raphael Pavlidis --- package/slirp4netns/slirp4netns.hash | 2 +- package/slirp4netns/slirp4netns.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/slirp4netns/slirp4netns.hash b/package/slirp4netns/slirp4netns.hash index e3115c1be0..e310da1af2 100644 --- a/package/slirp4netns/slirp4netns.hash +++ b/package/slirp4netns/slirp4netns.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b584edde686d3cfbac210cbdb93c4b0ba5d8cc0a6a4d92b9dfc3c5baec99c727 slirp4netns-1.2.0.tar.gz +sha256 acce648fab8fe5f113c41a8fd6d20177708519b4ddaa60f845e1998a17b22ca5 slirp4netns-1.2.3.tar.gz sha256 58db3cfabf8ec806bc060e54ab5466a31de4a3ae80fe4a8aa02fb6b1c053c93f COPYING diff --git a/package/slirp4netns/slirp4netns.mk b/package/slirp4netns/slirp4netns.mk index 7ff594cc44..7fa992af6d 100644 --- a/package/slirp4netns/slirp4netns.mk +++ b/package/slirp4netns/slirp4netns.mk @@ -4,7 +4,7 @@ # ################################################################################ -SLIRP4NETNS_VERSION = 1.2.0 +SLIRP4NETNS_VERSION = 1.2.3 SLIRP4NETNS_SITE = $(call github,rootless-containers,slirp4netns,v$(SLIRP4NETNS_VERSION)) SLIRP4NETNS_LICENSE = GPL-2.0 SLIRP4NETNS_LICENSE_FILES = COPYING -- 2.43.2 From kadambini.nema at gmail.com Mon Feb 19 19:19:34 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 11:19:34 -0800 Subject: [Buildroot] [PATCH 1/1] package/dos2unix: bump to version 7.5.2 In-Reply-To: References: Message-ID: <20240219191934.41982-1-kadambini.nema@gmail.com> - Update hash of the COPYING.txt (update in year) Signed-off-by: Kadambini Nema --- Changelog: https://waterlan.home.xs4all.nl/dos2unix/ChangeLog.txt $ ./utils/test-pkg -d br_test -k -c dos2unix.config -p dos2unix bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed package/dos2unix/dos2unix.hash | 6 +++--- package/dos2unix/dos2unix.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash index 032c8ea2d2..d4d682cd0c 100644 --- a/package/dos2unix/dos2unix.hash +++ b/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 6d1e70cf26..e30fc999d4 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.5.0 +DOS2UNIX_VERSION = 7.5.2 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt -- 2.25.1 From bernd at kuhls.net Mon Feb 19 19:25:41 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Mon, 19 Feb 2024 20:25:41 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240219192541.3773864-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 773cb4fbb5..8e889af802 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.17" 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 52fb480af2..db9b2d8a11 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz -sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz +sha256 ee7650996ba75aa29fe66f309b413097f249a03e7001f2a41128c7c95205226a linux-6.6.17.tar.xz +sha256 65206b969831236849c9906eba267e715734a93808e9909fd9b4f12eea10d689 linux-6.1.78.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 69857566e3..537de85ad8 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.77" if BR2_KERNEL_HEADERS_6_1 - default "6.6.16" if BR2_KERNEL_HEADERS_6_6 + default "6.1.78" if BR2_KERNEL_HEADERS_6_1 + default "6.6.17" if BR2_KERNEL_HEADERS_6_6 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 \ -- 2.39.2 From bernd at kuhls.net Mon Feb 19 19:27:24 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Mon, 19 Feb 2024 20:27:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 20.6.4-Nexus Message-ID: <20240219192724.3776282-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 286cff5cc4..b4e6f30685 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4c742a31ec6f4d2a427d05f70950cfd4e347cf1c0acdb1747c39eb68124be30a kodi-pvr-mythtv-20.6.1-Nexus.tar.gz +sha256 da7cdc514ce48992e7c2575735c4bd9d22891ba3c12169ae42163b159517b8c9 kodi-pvr-mythtv-20.6.4-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 312c8619be..57ddf3af10 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.6.1-Nexus +KODI_PVR_MYTHTV_VERSION = 20.6.4-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.39.2 From dannenberg at ti.com Mon Feb 19 19:42:07 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 13:42:07 -0600 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <20240216200635.crek5j23p3hybg2p@dasso> Message-ID: <20240219194207.pfonekdap7jagk3d@dasso> Hi Romain, On Fri, Feb 16, 2024 at 10:38:42PM +0100, Romain Naour wrote: > Hello Andreas, > > Le 16/02/2024 ? 21:06, Andreas Dannenberg a ?crit?: > > On Thu, Feb 15, 2024 at 11:20:50AM +0100, Alexander Sverdlin wrote: > >> Hi Romain, > >> > >> On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: > >>> -choice > >>> - prompt "Security type" > >>> - help > >>> - ? The target SoC security type option for image gen.? Valid > >>> - ? options are "gp" for General Purpose devices, "hs-fs" for > >>> - ? High Security - Field Securable devices, or "hs" for High > >>> - ? Security - Security Enforcing devices.? Note for all High > >>> - ? Security device variants the TI_SECURE_DEV_PKG environmental > >>> - ? variable must be defined at build time pointing to a valid > >>> - ? core-secdev-k3 folder location, otherwise the build will > >>> - ? fail, see > >>> - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > >>> - > >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > >>> - bool "gp" > >>> - > >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > >>> - bool "hs-fs" > >>> - > >>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>> - bool "hs" > >>> - > >>> -endchoice > >> > >> another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y > >> was the default, which didn't boot on my HS-FS SoC. > >> > >> You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the > >> default for AM62x. I'm not sure if this is a problem, though. > > > > HS-FS should be the default for all TI AM6x devices. This is our > > "production silicon" and what's used for (almost) all projects, > > especially new projects. This being said having support for GP device > > variants still is desirable for existing boards/projects, such as the > > current BeaglePlay boards (amongst earlier version of TI starter kit > > EVMs for AM6x). > > Thank you, I was not aware of this. > > I found your post in the TI forum about the recent switch from GP to HS-FS > device in Yocto [1]. > > Currently existing am64/am62 defconfigs are still targeting GP devices but we > should add additional commits to do the switch to HS-FS. > > What about other SoC of the K3 architecture? > Is the DRA829/J721e device will also switch to HS-FS by default? I needed to double-check with the team, since I'm only intimately involved with AM62/AM64/AM65 type devices. All the others are managed by a different group in TI. So based on what I found out here's the full context accross TI's K3 platform of devices and their associated TI EVMs / Starter Kits: * All "Sitara"-brand SoCs (AM62x, AM64, AM65x) are HS-FS first * All "Jacinto"-brand industrial SoCs (AM68, AM69 and AM67) are also HS-FS first * All new "Jacinto"-brand automotive/other SoCs (J7AEN onwards) are HS-FS first * All existing "Jacinto"-brand SoCs (TDA4, J721E, J7200, J721S2 and J784S4) are GP by default So while there are still boards out there with GP silicon (last bullet) those are probably not the typical target platforms for Buildroot, being very complex and high-end multi-core SoCs, mostly used in automotive applications. The one exception here that has more weight in my oppinion is the current BeaglePlay board (AM62x-based), those also have GP devices on those boards. All this being being said, I stand by my previous comment that HS-FS should be the default. As for the BeaglePlay board (which is a very nice community board) and potentially selected Jacinto-based boards this could potentially be handled with a dedicated defconfig or some other Kconfig magic to enable a seamless and easy out of box experience. -- Andreas Dannenberg Texas Instruments Inc > > From the u-boot k3 documentation, it's not clear witch device type is used by > default across all k3 SoC. By default I was expecting the GP type for all the k3 > family (I was wrong). > > [1] > https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto > > [2] > https://source.denx.de/u-boot/u-boot/-/blob/master/doc/board/ti/k3.rst?ref_type=heads&plain=1#L108 > > Best regards, > Romain > > > > > -- > > Andreas Dannenberg > > Texas Instruments Inc > > > > > >> > >> -- > >> Alexander Sverdlin. > >> > >> _______________________________________________ > >> buildroot mailing list > >> buildroot at buildroot.org > >> https://lists.buildroot.org/mailman/listinfo/buildroot > From kadambini.nema at gmail.com Mon Feb 19 19:59:10 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 11:59:10 -0800 Subject: [Buildroot] [PATCH 1/2] package/libyang: bump version to 2.1.148 In-Reply-To: References: Message-ID: <20240219195911.43452-1-kadambini.nema@gmail.com> Signed-off-by: Kadambini Nema --- package/libyang/libyang.hash | 2 +- package/libyang/libyang.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index 3658b20e4e..e03278adfd 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3e52b922fcf371933ad7de1686ad83504e3358236e7817b5af795b0db52fa221 libyang-2.1.111.tar.gz +sha256 77a0aaaeb3df720aeb70d6896e32e2c2be099d48df73e3cfb52567051af3e44b libyang-2.1.148.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 5533c7c68e..fca0cd63f8 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.1.111 +LIBYANG_VERSION = 2.1.148 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE -- 2.25.1 From kadambini.nema at gmail.com Mon Feb 19 19:59:11 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 11:59:11 -0800 Subject: [Buildroot] [PATCH 2/2] package/sysrepo: bump version to 2.2.150 In-Reply-To: <20240219195911.43452-1-kadambini.nema@gmail.com> References: <20240219195911.43452-1-kadambini.nema@gmail.com> Message-ID: <20240219195911.43452-2-kadambini.nema@gmail.com> Note: This release depends on libyang (v2.1.148) (https://github.com/sysrepo/sysrepo/releases/tag/v2.2.150) Signed-off-by: Kadambini Nema --- package/sysrepo/sysrepo.hash | 2 +- package/sysrepo/sysrepo.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index 6a5e98f41b..056f70787d 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz +sha256 467efed8d0f62c26a0d200602b911096eb2d67858e620937ab68f96b316fa9b7 sysrepo-2.2.150.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index 6b031ae6f9..7f2570bd7d 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.2.36 +SYSREPO_VERSION = 2.2.150 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause -- 2.25.1 From dannenberg at ti.com Mon Feb 19 19:59:24 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 13:59:24 -0600 Subject: [Buildroot] [PATCH 00/21] Add ti_j721e_sk_defconfig In-Reply-To: <3570b01e6a258bbafa2d6317ba8619ecb39f66ec.camel@gmail.com> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240216201903.lhhkjevrgzcp5msz@dasso> <735636d6-c0f8-4226-ab8a-1576c2133189@smile.fr> <20240216222012.eaes5ktamizu6n5c@dasso> <3570b01e6a258bbafa2d6317ba8619ecb39f66ec.camel@gmail.com> Message-ID: <20240219195924.smciairp2ts3655m@dasso> Hi Alexander, On Sat, Feb 17, 2024 at 04:13:16AM +0100, Alexander Sverdlin wrote: > Hello Andreas, > > On Fri, 2024-02-16 at 16:20 -0600, Andreas Dannenberg wrote: > > On Fri, Feb 16, 2024 at 10:52:21PM +0100, Romain Naour wrote: > > > Hello Andreas, > > > > > > Le 16/02/2024 ? 21:19, Andreas Dannenberg a ?crit?: > > > > On Tue, Feb 13, 2024 at 06:27:56PM +0100, Romain Naour wrote: > > > > > This series aim to add the SK-TDA4VM board support based on TI K3 j721e SoC. > > > > > > > > > > This series start by adding U-boot binman support already submitted in the > > > > > preview series "Add support for AM62x-SK HS-FS devices" from Dario Binacchi > > > > > [1], with small improvements. > > > > > See the FOSDEM 2024 talk "Standardizing the generation and signing of boot images" [2] > > > > > > > > Thanks Romain and Dario for all the work on this, and submitting this. > > > > Will be spending some time over the next few days to see how I can help > > > > out with this effort. I can already see many great improvements since > > > > the last time I worked on AM62x/AM64x support last year. > > > > > > Your feed back on HS-FS devices is really helpful. Alexander Sverdlin also > > > helped on AM62x. > > > > > > Maybe if you can also test on AM64x just to be sure the defconfig is working. > > > > I'm planning on testing the entire series here pretty soon and will > > provide feedback (I have access to any and all boards:) > > > > One of the things I'm trying to assess is what's still missing vs. the > > previous attempt I made upstreaming this. For example, AM62x graphics > > isn't there yet (ti-rogue-km / ti-rogue-um). > > maybe you could shed some light onto the AM62x situation. My conclusion > is that since your initial buildroot BSP U-Boot has been switched > to standard boot (CONFIG_BOOTSTD), refer to (U-Boot repo): > > commit 355c0afcd4b7c8c442c4d03e07649c24194b8e06 > Author: Nishanth Menon > Date: Fri Aug 25 13:02:52 2023 -0500 > > configs: am62x_evm_a53_defconfig: Switch to bootstd > > and > > commit ab54d9b28d8578cc43b214d39009e7b1def797e4 > Author: Roger Quadros > Date: Thu Oct 5 16:06:41 2023 +0300 > > board: ti: am62x: am62x.env: Fix boot_targets > > ti_mmc is not a valid boot_target for standard boot flow so > > I suppose TI's BSP still uses older U-Boot and is still not affected. > Do we need uEnv.txt now? Do you have an idea which distro Nishanth may > have tested with BOOTSTD change? I wasn't aware of those changes but I just looked at some of them. Looks like most of the effort was targeted around the BeaglePlay board. And this was tested with Debian. You can find one of Nishanth's boot logs here [1]. It was referenced in the cover letter [2] of the U-Boot series that introduced the 'Switch to bootstd' change you pointed out. If this indeed causes some widespread breakage including Buildroot we need to understand and think about how to best resolve this. Will dig into this some more as I'm trying to get back into helping with the Buildroot effort here. Thanks, Andreas [1] https://gist.github.com/nmenon/c74acb3a895053e05623e886df77c8fe [2] https://lore.kernel.org/all/20230824031101.3460411-1-nm at ti.com/ > > -- > Alexander Sverdlin. > From bernd at kuhls.net Mon Feb 19 20:04:12 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Mon, 19 Feb 2024 21:04:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: bump to version 3.0.17 References: <20240211214935.1603160-1-ju.o__4871.99223586998$1707688208$gmane$org@free.fr> Message-ID: Am Sun, 11 Feb 2024 22:49:35 +0100 schrieb Julien Olivain: > For commit logs, see: > https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ Hi Julien, this bump breaks building syslinux (not yet caught by the autobuilders): https://bugs.gentoo.org/921597 Regards, Bernd From dannenberg at ti.com Mon Feb 19 20:15:31 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 14:15:31 -0600 Subject: [Buildroot] [PATCH v4 06/20] boot/ti-k3-core-secdev: new package In-Reply-To: <5f007c47-0c4c-438b-8978-4fe6e2515db1@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-7-dario.binacchi@amarulasolutions.com> <5f007c47-0c4c-438b-8978-4fe6e2515db1@smile.fr> Message-ID: <20240219201531.bekohv6hmfkdftct@dasso> Hi Romain, All, On Mon, Feb 19, 2024 at 10:48:59AM +0100, Romain Naour wrote: > Hello Dario, > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > > This is a security development package containing tools for > > High-Security(HS) TI K3 platform devices. > > Note: this tool can also handle TI "legacy" platform such AM57xx or AM43xx (not > sure we really want do that). While there are secure variants of those older platforms, it is very much controlled/restricted and not something readily available. So not something somebody easily can obtain to test, etc. Either way the secure dev source package associated with 'ti-k3-core-secdev' here is also only for K3 generation of devices and won't compatible with AM57xx or AM43xx anyways. > > Can you try without this package when using binman? > This tool doesn't seems "future proof". > > http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html Yes we should drop the package. Thanks, Andreas > Best regards, > Romain > > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v4: > > - Remove the trailing '/' at the end of the url in the help of > > Config.in > > - Fixed license issues > > - Use $(BINARIES_DIR)/ti-k3-core-secdev as the directory where to > > install files. > > > > Signed-off-by: Dario Binacchi > > --- > > DEVELOPERS | 1 + > > boot/Config.in | 1 + > > boot/ti-k3-core-secdev/Config.in | 9 ++++++++ > > boot/ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 +++ > > boot/ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 +++++++++++++++++++ > > 5 files changed, 36 insertions(+) > > create mode 100644 boot/ti-k3-core-secdev/Config.in > > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > create mode 100644 boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > > > diff --git a/DEVELOPERS b/DEVELOPERS > > index 0d12c3abcb11..33d99ab2440f 100644 > > --- a/DEVELOPERS > > +++ b/DEVELOPERS > > @@ -753,6 +753,7 @@ F: package/xinetd/ > > N: Dario Binacchi > > F: board/bsh/ > > F: board/stmicroelectronics/stm32f769-disco/ > > +F: boot/ti-k3-core-secdev/ > > F: configs/imx8mn_bsh_smm_s2_defconfig > > F: configs/imx8mn_bsh_smm_s2_pro_defconfig > > F: configs/stm32f769_disco_sd_defconfig > > diff --git a/boot/Config.in b/boot/Config.in > > index e5fdf7ad439e..18a7d268f95a 100644 > > --- a/boot/Config.in > > +++ b/boot/Config.in > > @@ -20,6 +20,7 @@ source "boot/s500-bootloader/Config.in" > > source "boot/shim/Config.in" > > source "boot/syslinux/Config.in" > > source "boot/ti-k3-boot-firmware/Config.in" > > +source "boot/ti-k3-core-secdev/Config.in" > > source "boot/ti-k3-image-gen/Config.in" > > source "boot/ti-k3-r5-loader/Config.in" > > source "boot/uboot/Config.in" > > diff --git a/boot/ti-k3-core-secdev/Config.in b/boot/ti-k3-core-secdev/Config.in > > new file mode 100644 > > index 000000000000..f7b4e2962042 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/Config.in > > @@ -0,0 +1,9 @@ > > +config BR2_TARGET_TI_K3_CORE_SECDEV > > + bool "ti-k3-core-secdev" > > + depends on BR2_aarch64 > > + help > > + This package downloads and installs development tools for > > + High-Security(HS) TI K3 platforms (which include AM62x, > > + AM64x, AM65x and more). > > + > > + https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > new file mode 100644 > > index 000000000000..e3074a398d62 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.hash > > @@ -0,0 +1,3 @@ > > +# Locally calculated > > +sha256 b6d3bca0d561d055c6869c5564b06f2fb1b9f67e4ef180c2baf8a14a6a6afa06 core-secdev-k3-08.06.00.007.tar.xz > > +sha256 3e5cf4f5ab9f0333f46cd68fabede3f21e55de1a9e3c6ad673f241f4514d8369 manifest/k3-secdev-0.2-manifest.html > > diff --git a/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > new file mode 100644 > > index 000000000000..f7655a0fefc8 > > --- /dev/null > > +++ b/boot/ti-k3-core-secdev/ti-k3-core-secdev.mk > > @@ -0,0 +1,22 @@ > > +################################################################################ > > +# > > +# ti-k3-core-secdev > > +# > > +################################################################################ > > + > > +TI_K3_CORE_SECDEV_VERSION = 08.06.00.007 > > +TI_K3_CORE_SECDEV_SITE = https://git.ti.com/cgit/security-development-tools/core-secdev-k3/snapshot > > +TI_K3_CORE_SECDEV_SOURCE = core-secdev-k3-$(TI_K3_CORE_SECDEV_VERSION).tar.xz > > +TI_K3_CORE_SECDEV_INSTALL_IMAGES = YES > > +TI_K3_CORE_SECDEV_LICENSE = BSD-3-Clause > > +TI_K3_CORE_SECDEV_LICENSE_FILES = manifest/k3-secdev-0.2-manifest.html > > + > > +TI_K3_CORE_SECDEV_INSTALL_DIR = $(BINARIES_DIR)/ti-k3-core-secdev > > + > > +define TI_K3_CORE_SECDEV_INSTALL_IMAGES_CMDS > > + mkdir -p $(TI_K3_CORE_SECDEV_INSTALL_DIR) > > + cp -dpfr $(@D)/keys $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > > + cp -dpfr $(@D)/scripts $(TI_K3_CORE_SECDEV_INSTALL_DIR)/ > > +endef > > + > > +$(eval $(generic-package)) > From dannenberg at ti.com Mon Feb 19 20:19:08 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 14:19:08 -0600 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <8dca9e04-832f-4ffc-b6b0-d1deed31259b@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8dca9e04-832f-4ffc-b6b0-d1deed31259b@smile.fr> Message-ID: <20240219201908.zqxhfa5bewy6lohx@dasso> On Mon, Feb 19, 2024 at 10:58:26AM +0100, Romain Naour wrote: > Hello Dario, > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > > The patch sets the configurations required by TI HS systems. Some of these > > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > > are provided by the ti-k3-core-secdev package in the binaries directory. > > Such keys has been added to u-boot v2023.10: > > https://git.ti.com/cgit/security-development-tools/core-secdev-k3/tree/keys > > https://source.denx.de/u-boot/u-boot/-/commit/d5b1ef30d7ffabb9f57d5c62b9f0608837af0f4f > > Do we need something else from ti-k3-core-secdev package that is not already > provided by u-boot? No, we don't need anything from that. If you look at TI's current SDKs/Yocto builds this package is not used at all. The TI goal is to do things in a standard upstream way (in upstream) as much as possible, hence we are trying to move away from all these "vendor quirks" however possible. Regards, Andreas > > Best regards, > Romain > > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > no changes since v3: > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3-image-gen/Config.in | 1 + > > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > > 2 files changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > > index d76cef82e911..38d1598d9fc0 100644 > > --- a/boot/ti-k3-image-gen/Config.in > > +++ b/boot/ti-k3-image-gen/Config.in > > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > bool "ti-k3-image-gen" > > depends on BR2_TARGET_TI_K3_R5_LOADER > > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > # We need FIT support in uboot-tools, which is why we select a > > # host package > > select BR2_PACKAGE_HOST_UBOOT_TOOLS > > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > index 64be9a18f2c4..74b4fcb4bf89 100644 > > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > > > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +else > > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > > + > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > > +endif > > > > define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > > + ) > > endef > > > > define TI_K3_IMAGE_GEN_BUILD_CMDS > > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > > $(BR2_MAKE) -C $(@D) \ > > SOC=$(TI_K3_IMAGE_GEN_SOC) \ > > SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > > + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ > > CONFIG=evm \ > > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > > SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > From dannenberg at ti.com Mon Feb 19 20:36:56 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 14:36:56 -0600 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> Message-ID: <20240219203656.5rb7xelxunbxwkka@dasso> Hi Alexander, On Sun, Feb 18, 2024 at 12:45:47AM +0100, Alexander Sverdlin wrote: > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > The patch sets the configurations required by TI HS systems. Some of these > > configurations (i. e. HS SYSFW image signing key, HS Software Revision) > > are provided by the ti-k3-core-secdev package in the binaries directory. > > > > Signed-off-by: Dario Binacchi > > so for test I've reverted the previous "boot/ti-k3-core-secdev: new package" > commit, then... > > > --- > > > > no changes since v3: > > > > Signed-off-by: Dario Binacchi > > --- > > ?boot/ti-k3-image-gen/Config.in????????? |? 1 + > > ?boot/ti-k3-image-gen/ti-k3-image-gen.mk | 16 ++++++++++++++-- > > ?2 files changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > > index d76cef82e911..38d1598d9fc0 100644 > > --- a/boot/ti-k3-image-gen/Config.in > > +++ b/boot/ti-k3-image-gen/Config.in > > @@ -2,6 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > ? bool "ti-k3-image-gen" > > ? depends on BR2_TARGET_TI_K3_R5_LOADER > > ? select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > ... removed this, ... > > > ? # We need FIT support in uboot-tools, which is why we select a > > ? # host package > > ? select BR2_PACKAGE_HOST_UBOOT_TOOLS > > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > index 64be9a18f2c4..74b4fcb4bf89 100644 > > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > > @@ -29,10 +29,21 @@ TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > ?TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > ?TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > ? > > -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > +else > > +TI_K3_IMAGE_GEN_DEPENDENCIES += ti-k3-core-secdev > > ... the above line, ... > > > + > > +TI_K3_IMAGE_GEN_SYSFW = \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-enc.bin \ > > + $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE)-cert.bin > > +endif > > ? > > ?define TI_K3_IMAGE_GEN_CONFIGURE_CMDS > > - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) > > + $(foreach t,$(TI_K3_IMAGE_GEN_SYSFW),\ > > + cp $(BINARIES_DIR)/ti-sysfw/$(t) $(@D)/ > > + ) > > ?endef > > ? > > ?define TI_K3_IMAGE_GEN_BUILD_CMDS > > @@ -40,6 +51,7 @@ define TI_K3_IMAGE_GEN_BUILD_CMDS > > ? $(BR2_MAKE) -C $(@D) \ > > ? SOC=$(TI_K3_IMAGE_GEN_SOC) \ > > ? SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ > > + TI_SECURE_DEV_PKG=$(BINARIES_DIR)/ti-k3-core-secdev \ > > ... and this line... > > > ? CONFIG=evm \ > > ? CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > > ? SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ > > ... and everything still builds and boots fine on SK-AM62B (HS-FS): > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:02:43 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 13400 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Authentication passed > Starting ATF on ARM64 core... > > NOTICE: BL31: v2.7(release):v2.7 > NOTICE: BL31: Built : 23:57:43, Feb 17 2024 > I/TC: > I/TC: OP-TEE version: Unknown_4.0 (gcc version 12.3.0 (Buildroot 2023.11-1199-g470b2069e4)) #1 Sat Feb 17 22:57:38 UTC 2024 aarch64 > I/TC: WARNING: This OP-TEE configuration might be insecure! > I/TC: WARNING: Please check https://optee.readthedocs.io/en/latest/architecture/porting_guidelines.html > I/TC: Primary CPU initializing > I/TC: SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > I/TC: HUK Initialized > I/TC: Activated SA2UL device > I/TC: Enabled firewalls for SA2UL TRNG device > I/TC: SA2UL TRNG initialized > I/TC: SA2UL Drivers initialized > I/TC: Primary CPU switching to normal world boot > > U-Boot SPL 2024.01 (Feb 18 2024 - 00:03:30 +0100) > SYSFW ABI: 3.1 (firmware rev 0x0008 '8.6.4--v08.06.04 (Chill Capybar') > SPL initial stack usage: 1872 bytes > Trying to boot from MMC2 > Authentication passed > Authentication passed > > > U-Boot 2024.01 (Feb 18 2024 - 00:03:30 +0100) > > SoC: AM62X SR1.0 HS-FS > Model: Texas Instruments AM625 SK > DRAM: 2 GiB > Core: 56 devices, 23 uclasses, devicetree: separate > MMC: mmc at fa10000: 0, mmc at fa00000: 1 > Loading Environment from nowhere... OK > In: serial at 2800000 > Out: serial at 2800000 > Err: serial at 2800000 > Net: eth0: ethernet at 8000000port@1 > Hit any key to stop autoboot: 0 > switch to partitions #0, OK > mmc1 is current device > SD/MMC found on device 1 > Failed to load 'uEnv.txt' > Scanning for bootflows in all bootdevs > Seq Method State Uclass Part Name Filename > --- ----------- ------ -------- ---- ------------------------ ---------------- > Scanning global bootmeth 'efi_mgr': > No EFI system partition > No EFI system partition > Failed to persist EFI variables > Scanning bootdev 'mmc at fa00000.bootdev': > 0 extlinux ready mmc 1 mmc at fa00000.bootdev.part_ /extlinux/extlinux.conf > ** Booting bootflow 'mmc at fa00000.bootdev.part_1' with extlinux > 1: am62x-sk-buildroot > Retrieving file: /Image > append: console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 > Retrieving file: /k3-am62x.dtb > ## Flattened Device Tree blob at ffb14700 > Booting using the fdt blob at 0xffb14700 > Working FDT set to ffb14700 > Loading Device Tree to 000000008ffed000, end 000000008ffff687 ... OK > Working FDT set to 8ffed000 > > Starting kernel ... > > [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] Just wanting to double-check one quick detail. Did you have to make any additional modifications to boot-mode related U-Boot settings or ENV variables? Or did the "new normal" of CONFIG_BOOTSTD just work for you? -- Andreas Dannenberg Texas Instruments Inc > [ 0.000000] Linux version 6.6.1 (...) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1199-g470b2069e4) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Sun Feb 18 > 00:37:47 CET 2024 > > > > -- > Alexander Sverdlin. > From kadambini.nema at gmail.com Mon Feb 19 20:40:54 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 12:40:54 -0800 Subject: [Buildroot] [PATCH 1/1] package/google-breakpad: fix missing include error In-Reply-To: <--in-reply-to> References: <--in-reply-to> Message-ID: <20240219204054.57774-1-kadambini.nema@gmail.com> src/common/module.cc: In member function ?bool google_breakpad::Module::AddFunction(Function*)?: src/common/module.cc:194:52: error: ?find_if? is not a member of ?std?; did you mean ?find?? 194 | FunctionSet::iterator existing_function = std::find_if( | ^~~~~~~ | find Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed This error is seen on gcc-14. https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch Signed-off-by: Kadambini Nema --- ...ixed-missing-include-for-std-find_if.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch new file mode 100644 index 0000000000..141e12b613 --- /dev/null +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch @@ -0,0 +1,26 @@ +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 +From: Nathan Moinvaziri +Date: Tue, 19 Dec 2023 14:35:05 -0800 +Subject: [PATCH] Fixed missing include for std::find_if. + +Throws an error when compiling on Windows. + +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 +Reviewed-by: Ivan Penkov +Upstream: https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d +Signed-off-by: Kadambini Nema +--- + +diff --git a/src/common/module.cc b/src/common/module.cc +index 0eb5aad..b6f5da7 100644 +--- a/src/common/module.cc ++++ b/src/common/module.cc +@@ -42,6 +42,7 @@ + #include + #include + ++#include + #include + #include + #include -- 2.25.1 From alexander.sverdlin at gmail.com Mon Feb 19 20:42:44 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Mon, 19 Feb 2024 21:42:44 +0100 Subject: [Buildroot] [PATCH v4 07/20] boot/ti-k3-image-gen: manage HS hardware In-Reply-To: <20240219203656.5rb7xelxunbxwkka@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-8-dario.binacchi@amarulasolutions.com> <8e9c142cd6c74585b1545fd3a3f5e0b7fe221917.camel@gmail.com> <20240219203656.5rb7xelxunbxwkka@dasso> Message-ID: <6948b9c91559db56060b09baa9e686761d589d62.camel@gmail.com> Hi Andreas! On Mon, 2024-02-19 at 14:36 -0600, Andreas Dannenberg wrote: > > ?? 0? extlinux???? ready?? mmc????????? 1? mmc at fa00000.bootdev.part_ /extlinux/extlinux.conf > > ** Booting bootflow 'mmc at fa00000.bootdev.part_1' with extlinux > > 1:????? am62x-sk-buildroot > > Retrieving file: /Image > > append: console=ttyS2,115200n8 root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x02800000 > > Retrieving file: /k3-am62x.dtb > > ## Flattened Device Tree blob at ffb14700 > > ??? Booting using the fdt blob at 0xffb14700 > > Working FDT set to ffb14700 > > ??? Loading Device Tree to 000000008ffed000, end 000000008ffff687 ... OK > > Working FDT set to 8ffed000 > > > > Starting kernel ... > > > > [??? 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034] > > Just wanting to double-check one quick detail. Did you have to make any > additional modifications to boot-mode related U-Boot settings or ENV > variables? Or did the "new normal" of CONFIG_BOOTSTD just work for you? No changes in U-Boot whatsoever, patchset from Dario works as-is, seems that the extlinux.conf visible in the log above did the trick. -- Alexander Sverdlin. From dannenberg at ti.com Mon Feb 19 20:51:57 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 14:51:57 -0600 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> Message-ID: <20240219205157.5ukm426gmzbvn33f@dasso> On Sat, Feb 17, 2024 at 09:44:29PM +0100, Alexander Sverdlin wrote: > Hi Dario, > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > As explained in [1], adding support for AM62x LP SK in U-Boot, requires > > binman for building bootloader images. The BINMAN_INDIRS environment > > variable is used to provide a space-separated list of directories to > > search for binary blobs. > > > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > > Signed-off-by: Dario Binacchi > > > > --- > > > > no changes since v1: > > > > Signed-off-by: Dario Binacchi > > --- > > ?boot/uboot/uboot.mk | 3 ++- > > ?1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > > index dda606a88059..cf70f86a4132 100644 > > --- a/boot/uboot/uboot.mk > > +++ b/boot/uboot/uboot.mk > > @@ -189,7 +189,8 @@ endif > > ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > > ?UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > > ?UBOOT_DEPENDENCIES += ti-k3-boot-firmware > > -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > > +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ > > Is the above actually still required with binman? > The names are hardcoded in U-Boot in arch/arm/dts/k3-am625-sk-binman.dtsi > > > + BINMAN_INDIRS=$(BINARIES_DIR) > > This seems to be the only required part. Correct. 'DM=' is no longer used, also see the official U-Boot build instructions for TI platforms in the SDK documentation [1] (technically speaking this documentation is for the U-Boot vendor tree, but the same principle applies to upstream U-Boot builds). Reviewed-by: Andreas Dannenberg [1] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html > > > ?endif > > ? > > ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > > -- > Alexander Sverdlin. > From yann.morin.1998 at free.fr Mon Feb 19 20:52:34 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 21:52:34 +0100 Subject: [Buildroot] [git commit] package/python-django: add patch to fix crash with .pyc-only builds Message-ID: <20240219205309.850AE87912@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=85d1c86acabb07f7d8ace564ae68a64eb6335a62 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Backport an upstream patch that fixes django auth and admin apps not working in .pyc only builds. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6148209453 Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- ...-Fixed-sensitive_variables-sensitive_post.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch new file mode 100644 index 0000000000..90dc9c7dd0 --- /dev/null +++ b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch @@ -0,0 +1,45 @@ +From d294b7679f2cb51c7231d6a7fb22e76eb74e49ec Mon Sep 17 00:00:00 2001 +From: Mariusz Felisiak +Date: Sat, 17 Feb 2024 08:15:59 +0100 +Subject: [PATCH] Fixed #35187 -- Fixed + @sensitive_variables/sensitive_post_parameters decorators crash with + .pyc-only builds. + +Thanks Jon Janzen for the implementation idea. + +Thanks Marcus Hoffmann for the report. + +Regression in 38e391e95fe5258bc6d2467332dc9cd44ce6ba52. +Backport of d1be05b3e9209fd0787841c71a95819d81061187 from main + +Signed-off-by: Marcus Hoffmann +Upstream: https://github.com/django/django/commit/41a4bba817f139f3cfd94f04e728e046560c9a18 +--- + django/views/decorators/debug.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py +index 7ea8a540de..6540fc0651 100644 +--- a/django/views/decorators/debug.py ++++ b/django/views/decorators/debug.py +@@ -47,7 +47,6 @@ def sensitive_variables(*variables): + + try: + file_path = inspect.getfile(wrapped_func) +- _, first_file_line = inspect.getsourcelines(wrapped_func) + except TypeError: # Raises for builtins or native functions. + raise ValueError( + f"{func.__name__} cannot safely be wrapped by " +@@ -55,7 +54,8 @@ def sensitive_variables(*variables): + "Python file (not a builtin or from a native extension)." + ) + else: +- key = hash(f"{file_path}:{first_file_line}") ++ first_line_number = wrapped_func.__code__.co_firstlineno ++ key = hash(f"{file_path}:{first_line_number}") + + if variables: + coroutine_functions_to_sensitive_variables[key] = variables +-- +2.34.1 + From yann.morin.1998 at free.fr Mon Feb 19 20:53:56 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 21:53:56 +0100 Subject: [Buildroot] [PATCH] package/python-django: add patch to fix crash with .pyc-only builds In-Reply-To: <20240219113028.607141-1-buildroot@bubu1.eu> References: <20240219113028.607141-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-19 12:30 +0100, Marcus Hoffmann via buildroot spake thusly: > Backport an upstream patch that fixes django auth and admin apps not > working in .pyc only builds. > > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6148209453 > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Thanks for handling the report with upstream! ? Regards, Yann E. MORIN. > --- > ...d-sensitive_variables-sensitive_post.patch | 45 +++++++++++++++++++ > 1 file changed, 45 insertions(+) > create mode 100644 package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch > > diff --git a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch > new file mode 100644 > index 0000000000..90dc9c7dd0 > --- /dev/null > +++ b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch > @@ -0,0 +1,45 @@ > +From d294b7679f2cb51c7231d6a7fb22e76eb74e49ec Mon Sep 17 00:00:00 2001 > +From: Mariusz Felisiak > +Date: Sat, 17 Feb 2024 08:15:59 +0100 > +Subject: [PATCH] Fixed #35187 -- Fixed > + @sensitive_variables/sensitive_post_parameters decorators crash with > + .pyc-only builds. > + > +Thanks Jon Janzen for the implementation idea. > + > +Thanks Marcus Hoffmann for the report. > + > +Regression in 38e391e95fe5258bc6d2467332dc9cd44ce6ba52. > +Backport of d1be05b3e9209fd0787841c71a95819d81061187 from main > + > +Signed-off-by: Marcus Hoffmann > +Upstream: https://github.com/django/django/commit/41a4bba817f139f3cfd94f04e728e046560c9a18 > +--- > + django/views/decorators/debug.py | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py > +index 7ea8a540de..6540fc0651 100644 > +--- a/django/views/decorators/debug.py > ++++ b/django/views/decorators/debug.py > +@@ -47,7 +47,6 @@ def sensitive_variables(*variables): > + > + try: > + file_path = inspect.getfile(wrapped_func) > +- _, first_file_line = inspect.getsourcelines(wrapped_func) > + except TypeError: # Raises for builtins or native functions. > + raise ValueError( > + f"{func.__name__} cannot safely be wrapped by " > +@@ -55,7 +54,8 @@ def sensitive_variables(*variables): > + "Python file (not a builtin or from a native extension)." > + ) > + else: > +- key = hash(f"{file_path}:{first_file_line}") > ++ first_line_number = wrapped_func.__code__.co_firstlineno > ++ key = hash(f"{file_path}:{first_line_number}") > + > + if variables: > + coroutine_functions_to_sensitive_variables[key] = variables > +-- > +2.34.1 > + > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 19 20:55:02 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 21:55:02 +0100 Subject: [Buildroot] [git commit] package/systemd: needs sulogin for emergency target support Message-ID: <20240219210500.4CBC787950@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=613c817aefbaf5f62bf75437da61752a30348e8b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master systemd invokes util-linux' sulogin via systemd-sulogin-shell[1] via emergency.service/emergency.target[2]. [1] https://github.com/systemd/systemd/blob/main/src/sulogin-shell/sulogin-shell.c [2] https://github.com/systemd/systemd/blob/main/units/emergency.service.in#L23 Signed-off-by: Marcus Hoffmann [yann.morin.1998 at free.fr: drop superfluous dependency comment] Signed-off-by: Yann E. MORIN --- package/systemd/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 859332d9e4..aa5143d484 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -34,6 +34,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_FSCK + select BR2_PACKAGE_UTIL_LINUX_SULOGIN select BR2_PACKAGE_KMOD select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools select BR2_PACKAGE_KMOD_TOOLS From yann.morin.1998 at free.fr Mon Feb 19 21:06:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 22:06:19 +0100 Subject: [Buildroot] [PATCH] package/systemd: needs sulogin for emergency target support In-Reply-To: <20240219183828.1289275-1-buildroot@bubu1.eu> References: <20240219183828.1289275-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-19 19:38 +0100, Marcus Hoffmann via buildroot spake thusly: > systemd invokes util-linux' sulogin via systemd-sulogin-shell[1] via > emergency.service/emergency.target[2]. > > [1] https://github.com/systemd/systemd/blob/main/src/sulogin-shell/sulogin-shell.c > [2] https://github.com/systemd/systemd/blob/main/units/emergency.service.in#L23 I thinks that, technically, it could be content with sulogin from busybox, but since we already select a lot of util-linux' tools, adding sulogin is not goign to add much to the target size. Applied to master, thanks. Regards, Yann E. MORIN. > Signed-off-by: Marcus Hoffmann > --- > package/systemd/Config.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 859332d9e4..58b4e51c6d 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -34,6 +34,7 @@ menuconfig BR2_PACKAGE_SYSTEMD > select BR2_PACKAGE_UTIL_LINUX_AGETTY > select BR2_PACKAGE_UTIL_LINUX_MOUNT > select BR2_PACKAGE_UTIL_LINUX_FSCK > + select BR2_PACKAGE_UTIL_LINUX_SULOGIN # emergency target > select BR2_PACKAGE_KMOD > select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools > select BR2_PACKAGE_KMOD_TOOLS > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 19 21:06:44 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 22:06:44 +0100 Subject: [Buildroot] [git commit] package/systemd: bump to version 254.9 Message-ID: <20240219210711.8404F87956@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8ea853b8c923103a32fbc5f5b4ec5e46407cd33 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index c0f4638803..e5588f06a2 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 1e1e42c597b4f992679aa964a0c5c23d970c58fed47aed65c11878b332dc5b23 systemd-254.6.tar.gz +sha256 3d23003ea886dbffa5bc84ad72c6edcbde62d32dbdec506e308624e1da509cb0 systemd-254.9.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 528fe60b1d..c6b006d1fb 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -19,7 +19,7 @@ # - Diff sysusers.d with the previous version # - Diff factory/etc/nsswitch.conf with the previous version # (details are often sprinkled around in README and manpages) -SYSTEMD_VERSION = 254.6 +SYSTEMD_VERSION = 254.9 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ From yann.morin.1998 at free.fr Mon Feb 19 21:14:52 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 22:14:52 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 254.9 In-Reply-To: <20240219182604.1287000-1-buildroot@bubu1.eu> References: <20240219182604.1287000-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-19 19:26 +0100, Marcus Hoffmann via buildroot spake thusly: > Signed-off-by: Marcus Hoffmann Ideally, a little blurb about what changed would be nice, to highlight critical fixes, or to just mention random fixes. I looked and there were no report of security fixes... I initially did not plan on pushing, but I forgot I had it applied localy, so it went in... I could have reverted, but that's a minor version bump with no report of security fixes, so it is good to have, I hope. Please watch the gitlab pipeline for any failure of the runtimet tests, just in case this minor version bump breaks anything. Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/systemd/systemd.hash | 2 +- > package/systemd/systemd.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash > index c0f4638803..e5588f06a2 100644 > --- a/package/systemd/systemd.hash > +++ b/package/systemd/systemd.hash > @@ -1,5 +1,5 @@ > # sha256 locally computed > -sha256 1e1e42c597b4f992679aa964a0c5c23d970c58fed47aed65c11878b332dc5b23 systemd-254.6.tar.gz > +sha256 3d23003ea886dbffa5bc84ad72c6edcbde62d32dbdec506e308624e1da509cb0 systemd-254.9.tar.gz > sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 > sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index 528fe60b1d..c6b006d1fb 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -19,7 +19,7 @@ > # - Diff sysusers.d with the previous version > # - Diff factory/etc/nsswitch.conf with the previous version > # (details are often sprinkled around in README and manpages) > -SYSTEMD_VERSION = 254.6 > +SYSTEMD_VERSION = 254.9 > SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) > SYSTEMD_LICENSE = \ > LGPL-2.1+, \ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Mon Feb 19 21:23:32 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Mon, 19 Feb 2024 22:23:32 +0100 Subject: [Buildroot] [PATCH 0/2] Fix flutter build failure In-Reply-To: <20240219095155.2758428-1-anaumann@ultratronik.de> References: <20240219095155.2758428-1-anaumann@ultratronik.de> Message-ID: Andreas, All, On 2024-02-19 10:51 +0100, Andreas Naumann spake thusly: > Hello Adam, all, > I was motivated to give flutter a spin after your talk at FOSDEM, > however the recent bump to Python 3.12.1 broke some script during > the flutter-engine configure step. > Fortunately now a new major stable version has been released 3.19.0, > which contains a patch for this. > > After bumping engine and sdk they successfully build again, as does > creating the flutter bundles which you provided in > https://github.com/aduskett/buildroot-fosdem2024-flutter-demos > > I have not yet been able to run them using ivi-homescreen, but that's > probably due to my target display/wayland setup. > > However, the flutter-gallery no longer builds with 3.19, even after > bumping to the main HEAD. Their github README says > "NOTE: The Flutter Gallery is now deprecated, and no longer being active > maintained." > I thought about including a patch for removal of the gallery package, > but that would leave us with no example for how to create a flutter > bundle. The upstream repository has also been "archived", which means it is frozen and will never get fixed, ever. That's a bit unfortunate indeed, but we don't have much choice going forward: we'll have to drop that package in the near future, but not now: we're still considering reverting the python 3.12 version bump for 2024.02, as it still causes issues in the target==build case, which means we'd be able to keep the current flutter stack for 2024.02 LTS. Then, we can reintroduce python3, the flutter-engine bumps in this series, and drop flutter-gfallery, hopefully introducing another package as an example on how to build flutter packages... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From buildroot at bubu1.eu Mon Feb 19 21:30:36 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 19 Feb 2024 22:30:36 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 254.9 In-Reply-To: References: <20240219182604.1287000-1-buildroot@bubu1.eu> Message-ID: <04a28a98-2699-44b6-b5d5-697a1a6fe893@bubu1.eu> Hi Yann, On 19.02.24 22:14, Yann E. MORIN wrote: > Marcus, All, > > On 2024-02-19 19:26 +0100, Marcus Hoffmann via buildroot spake thusly: >> Signed-off-by: Marcus Hoffmann > > Ideally, a little blurb about what changed would be nice, to highlight > critical fixes, or to just mention random fixes. I looked and there were > no report of security fixes... I looked through the commits as well... on one hand there were too many to sensibly list them in the commit message (232 commits in total, IIRC) and on the other hand nothing really stood out besides "a random bunch of fixes", so I didn't know what to write :D. > > I initially did not plan on pushing, but I forgot I had it applied > localy, so it went in... I could have reverted, but that's a minor > version bump with no report of security fixes, so it is good to have, > I hope. > > Please watch the gitlab pipeline for any failure of the runtimet tests, > just in case this minor version bump breaks anything. So if I understood that correctly I can add myself as a maintainer of the runtime test files and I'll get an email when that test fails? Or is that not how it works? > > Applied to master, thanks. > > Regards, > Yann E. MORIN. Best, Marcus > >> --- >> package/systemd/systemd.hash | 2 +- >> package/systemd/systemd.mk | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash >> index c0f4638803..e5588f06a2 100644 >> --- a/package/systemd/systemd.hash >> +++ b/package/systemd/systemd.hash >> @@ -1,5 +1,5 @@ >> # sha256 locally computed >> -sha256 1e1e42c597b4f992679aa964a0c5c23d970c58fed47aed65c11878b332dc5b23 systemd-254.6.tar.gz >> +sha256 3d23003ea886dbffa5bc84ad72c6edcbde62d32dbdec506e308624e1da509cb0 systemd-254.9.tar.gz >> sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 >> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 >> sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt >> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk >> index 528fe60b1d..c6b006d1fb 100644 >> --- a/package/systemd/systemd.mk >> +++ b/package/systemd/systemd.mk >> @@ -19,7 +19,7 @@ >> # - Diff sysusers.d with the previous version >> # - Diff factory/etc/nsswitch.conf with the previous version >> # (details are often sprinkled around in README and manpages) >> -SYSTEMD_VERSION = 254.6 >> +SYSTEMD_VERSION = 254.9 >> SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) >> SYSTEMD_LICENSE = \ >> LGPL-2.1+, \ >> -- >> 2.34.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From a.fatoum at pengutronix.de Mon Feb 19 21:06:28 2024 From: a.fatoum at pengutronix.de (Ahmad Fatoum) Date: Mon, 19 Feb 2024 22:06:28 +0100 Subject: [Buildroot] [PATCH] boot/barebox: install all barebox images if none were specified Message-ID: <20240219210628.407423-1-a.fatoum@pengutronix.de> When selecting barebox in menuconfig, BR2_TARGET_BAREBOX_IMAGE_FILE will be empty by default, which causes Buildroot to install whatever the barebox-flash-image symlink points at for barebox versions >= v2012.10.0. This is an outdated fallback, because barebox-flash-image is only valid when the barebox build produces a single binary. Virtually all new defconfigs added in the last couple of years are multiconfig (CONFIG_PBL_IMAGE=y) however, meaning that a single imx_v7_defconfig or multi_v8_defconfig will produce many images that support different boards or even platforms. As there is no single valid target for barebox-flash-image to point at in this case, this symlink will point at a non-existing 'multi-image-build' to alert the user to this fact. As replacement for barebox-flash-image, barebox commit 550cf79c216a ("Make list of flash images and fix link all single image cases") first released with v2015.12.0 creates a barebox-flash-images file with a list of all images built by barebox. Have buildroot use that file as a fallback before trying barebox-flash-image to have a fallback that works for any recent barebox defconfig as well. Signed-off-by: Ahmad Fatoum --- boot/barebox/barebox-aux/Config.in | 9 +++++++-- boot/barebox/barebox.mk | 2 ++ boot/barebox/barebox/Config.in | 9 +++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/boot/barebox/barebox-aux/Config.in b/boot/barebox/barebox-aux/Config.in index d39d24f763e0..4b0201ea6758 100644 --- a/boot/barebox/barebox-aux/Config.in +++ b/boot/barebox/barebox-aux/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_AUX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_AUX_CUSTOM_ENV bool "Generate an environment image" diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 4c9df8d6180b..fe366989b9d8 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -151,6 +151,8 @@ $(1)_IMAGE_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE)) define $(1)_INSTALL_IMAGES_CMDS if test -n "$$($(1)_IMAGE_FILES)"; then \ cp -L $$(foreach image,$$($(1)_IMAGE_FILES),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ + elif test -e $$(@D)/barebox-flash-images ; then \ + cp -L $$(foreach image,$$(shell cat $$(@D)/barebox-flash-images),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ elif test -h $$(@D)/barebox-flash-image ; then \ cp -L $$(@D)/barebox-flash-image $$(BINARIES_DIR)/barebox.bin ; \ else \ diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in index 958e294e40b6..2fd70a84aec3 100644 --- a/boot/barebox/barebox/Config.in +++ b/boot/barebox/barebox/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_BAREBOXENV bool "bareboxenv tool in target" -- 2.39.2 From kadambini.nema at gmail.com Mon Feb 19 21:34:02 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 13:34:02 -0800 Subject: [Buildroot] [PATCH 1/1] package/ustreamer: new package In-Reply-To: <20240212002607.12158-1-kadambini.nema@gmail.com> References: <20240212002607.12158-1-kadambini.nema@gmail.com> Message-ID: <20240219213402.186876-1-kadambini.nema@gmail.com> Lightweight and fast MJPEG-HTTP streamer (https://github.com/pikvm/ustreamer/tree/master#%C2%B5streamer) Signed-off-by: Kadambini Nema --- Changes v1 -> v2: - Fix 'make legal-info' with ustreamer package enabled. Changes v2 -> v3: - Fix a build failure with uclibc. (https://github.com/pikvm/ustreamer/commit/13af11a3a64cf9f08014e89f35e52e001fb10cad) - Upgrade to the latest version - 5.51 --- $ ./utils/test-pkg -k -c ustreamer.config -p ustreamer bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: SKIPPED 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- Signed-off-by: Kadambini Nema --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/ustreamer/Config.in | 17 +++++++++++++++++ package/ustreamer/ustreamer.hash | 3 +++ package/ustreamer/ustreamer.mk | 25 +++++++++++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 package/ustreamer/Config.in create mode 100644 package/ustreamer/ustreamer.hash create mode 100644 package/ustreamer/ustreamer.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..a6182777c0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1875,6 +1875,9 @@ F: package/easy-rsa/ N: Justin Maggard F: package/dtach/ +N: Kadambini Nema +F: package/ustreamer/ + N: Kamel Bouhara F: package/libodb-boost/ F: package/libodb-mysql/ diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..479c8b6657 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2595,6 +2595,7 @@ endif source "package/uredir/Config.in" source "package/ushare/Config.in" source "package/ussp-push/Config.in" + source "package/ustreamer/Config.in" source "package/vde2/Config.in" source "package/vdr/Config.in" source "package/vdr-plugin-vnsiserver/Config.in" diff --git a/package/ustreamer/Config.in b/package/ustreamer/Config.in new file mode 100644 index 0000000000..52c511e22d --- /dev/null +++ b/package/ustreamer/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_USTREAMER + bool "ustreamer" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 # V4L2_EVENT_SOURCE_CHANGE + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_ATOMIC + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBBSD + select BR2_PACKAGE_LIBGPIOD + help + Lightweight and fast MJPEG-HTTP streamer + + https://github.com/pikvm/ustreamer + +comment "ustreamer needs a toolchain w/ threads, headers >= 3.16, dynamic library" diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash new file mode 100644 index 0000000000..a8cb1695e5 --- /dev/null +++ b/package/ustreamer/ustreamer.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 88f107e02a0b5c6493d55ed1bce0c85f66ce83d2bc0271ff6319ad593c6584bc v5.51.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk new file mode 100644 index 0000000000..71de097a22 --- /dev/null +++ b/package/ustreamer/ustreamer.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# ustreamer +# +################################################################################ + +USTREAMER_VERSION = 5.51 +USTREAMER_SITE = $(call github,pikvm,ustreamer,refs/tags) +USTREAMER_SOURCE = v$(USTREAMER_VERSION).tar.gz +USTREAMER_SUBDIR = ustreamer +USTREAMER_LICENSE = GPL-3.0-or-later +USTREAMER_LICENSE_FILES = LICENSE +USTREAMER_DEPENDENCIES = jpeg libevent libbsd libgpiod +USTREAMER_CONF_ENV = "CFLAGS=$(TARGET_CFLAGS)" + +define USTREAMER_BUILD_CMDS + $(MAKE) $(if $(BR2_PACKAGE_SYSTEMD),WITH_SYSTEMD=1, ) WITH_PTHREAD_NP=1 WITH_SETPROCTITLE=1 HAS_PDEATHSIG=1 $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define USTREAMER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/ustreamer $(TARGET_DIR)/usr/bin/ustreamer + $(INSTALL) -D -m 0755 $(@D)/ustreamer-dump $(TARGET_DIR)/usr/bin/ustreamer-dump +endef + +$(eval $(generic-package)) -- 2.25.1 From romain.naour at smile.fr Mon Feb 19 21:34:52 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 22:34:52 +0100 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240219205157.5ukm426gmzbvn33f@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> <20240219205157.5ukm426gmzbvn33f@dasso> Message-ID: <63d28259-ff96-4450-bdc5-e1bc209d8e59@smile.fr> Hello Andreas, Le 19/02/2024 ? 21:51, Andreas Dannenberg a ?crit?: > On Sat, Feb 17, 2024 at 09:44:29PM +0100, Alexander Sverdlin wrote: >> Hi Dario, >> >> On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: >>> As explained in [1], adding support for AM62x LP SK in U-Boot, requires >>> binman for building bootloader images. The BINMAN_INDIRS environment >>> variable is used to provide a space-separated list of directories to >>> search for binary blobs. >>> >>> [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ >>> Signed-off-by: Dario Binacchi >>> >>> --- >>> >>> no changes since v1: >>> >>> Signed-off-by: Dario Binacchi >>> --- >>> ?boot/uboot/uboot.mk | 3 ++- >>> ?1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk >>> index dda606a88059..cf70f86a4132 100644 >>> --- a/boot/uboot/uboot.mk >>> +++ b/boot/uboot/uboot.mk >>> @@ -189,7 +189,8 @@ endif >>> ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) >>> ?UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) >>> ?UBOOT_DEPENDENCIES += ti-k3-boot-firmware >>> -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f >>> +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ >> >> Is the above actually still required with binman? >> The names are hardcoded in U-Boot in arch/arm/dts/k3-am625-sk-binman.dtsi >> >>> + BINMAN_INDIRS=$(BINARIES_DIR) >> >> This seems to be the only required part. > > Correct. 'DM=' is no longer used, also see the official U-Boot build > instructions for TI platforms in the SDK documentation [1] (technically > speaking this documentation is for the U-Boot vendor tree, but the same > principle applies to upstream U-Boot builds). > > Reviewed-by: Andreas Dannenberg > > [1] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html It means that we can remove BR2_TARGET_UBOOT_NEEDS_TI_K3_DM and UBOOT_TI_K3_DM_SOCNAME too. meta-ti still use DM= but probably to support u-boot-ti-staging_2023.04 that is still available [1]. The u-boot documentation also contains a similar note [2]. In the end we only need an option to select which SoC type we want to use (GP,HS,HS-FS). [1] https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc?h=cicd.master.202402130100#n52 [2] https://gitlab.com/u-boot/u-boot/-/blob/master/doc/board/ti/k3.rst?ref_type=heads&plain=1#L372 Best regards, Romain > > > >> >>> ?endif >>> ? >>> ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) >> >> -- >> Alexander Sverdlin. >> From kadambini.nema at gmail.com Mon Feb 19 21:54:58 2024 From: kadambini.nema at gmail.com (Kadambini Nema) Date: Mon, 19 Feb 2024 13:54:58 -0800 Subject: [Buildroot] [PATCH 1/1] package dhcpdump: bump to version 1.9 In-Reply-To: References: Message-ID: <20240219215458.187716-1-kadambini.nema@gmail.com> - Change the site to a well maintained fork - https://github.com/bbonev/dhcpdump Signed-off-by: Kadambini Nema --- - Build test results ./utils/test-pkg -d br_test -k -c dhcpdump.config -p dhcpdump bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- Signed-off-by: Kadambini Nema --- ...Fix-build-with-gcc4.8-use-br-fortify.patch | 12 ++++++++++ .../0001-use-non-bsd-structures.patch | 23 ------------------- package/dhcpdump/Config.in | 2 +- package/dhcpdump/dhcpdump.hash | 2 +- package/dhcpdump/dhcpdump.mk | 5 ++-- 5 files changed, 17 insertions(+), 27 deletions(-) create mode 100644 package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch diff --git a/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch new file mode 100644 index 0000000000..c48d28c23d --- /dev/null +++ b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch @@ -0,0 +1,12 @@ +Upstream: None +Signed-off-by: Kadambini Nema +diff -Naur a/Makefile b/Makefile +--- a/Makefile 2024-02-17 13:57:08.166161973 -0800 ++++ b/Makefile 2024-02-17 13:57:45.055153969 -0800 +@@ -1,5 +1,5 @@ + CFLAGS+=${CPPFLAGS} +-CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -g -O3 -fPIE ++CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -g -O3 -fPIE + LDFLAGS+=-g -Wl,-z,relro -Wl,-z,now -fPIE -pie + LIBS+=-lpcap + diff --git a/package/dhcpdump/0001-use-non-bsd-structures.patch b/package/dhcpdump/0001-use-non-bsd-structures.patch deleted file mode 100644 index 40115fb640..0000000000 --- a/package/dhcpdump/0001-use-non-bsd-structures.patch +++ /dev/null @@ -1,23 +0,0 @@ -The udphdr structure has uh_* fields when _FAVOR_BSD is -defined. Otherwise, the fields are just named source, dest, len and -check. See . - -Signed-off-by: Thomas Petazzoni - -Index: dhcpdump-1.8/dhcpdump.c -=================================================================== ---- dhcpdump-1.8.orig/dhcpdump.c 2011-05-17 20:20:46.506980003 +0200 -+++ dhcpdump-1.8/dhcpdump.c 2011-05-17 20:20:59.338979999 +0200 -@@ -163,10 +163,10 @@ - strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src)); - strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst)); - -- if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen))) -+ if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len))) - return; - -- printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen)); -+ printdata((u_char *)(sp + offset), ntohs(udp->len)); - } - - // check for matching CHADDR (Peter Apian-Bennewitz ) diff --git a/package/dhcpdump/Config.in b/package/dhcpdump/Config.in index e0abe040fc..30e42928e4 100644 --- a/package/dhcpdump/Config.in +++ b/package/dhcpdump/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_DHCPDUMP help A tool for monitoring dhcp requests using tcpdump. - http://www.mavetju.org/unix/general.php + https://github.com/bbonev/dhcpdump diff --git a/package/dhcpdump/dhcpdump.hash b/package/dhcpdump/dhcpdump.hash index a24db5b275..fdf3243ad1 100644 --- a/package/dhcpdump/dhcpdump.hash +++ b/package/dhcpdump/dhcpdump.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz +sha256 3658ac21cc33e79e72bed070454e49c543017991cb6c37f4253c85e9176869d1 dhcpdump-1.9.tar.xz sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk index ec9571c0af..4ce5047b2e 100644 --- a/package/dhcpdump/dhcpdump.mk +++ b/package/dhcpdump/dhcpdump.mk @@ -4,8 +4,9 @@ # ################################################################################ -DHCPDUMP_VERSION = 1.8 -DHCPDUMP_SITE = http://www.mavetju.org/download +DHCPDUMP_VERSION = 1.9 +DHCPDUMP_SITE = https://github.com/bbonev/dhcpdump/releases/download/v$(DHCPDUMP_VERSION) +DHCPDUMP_SOURCE = dhcpdump-$(DHCPDUMP_VERSION).tar.xz DHCPDUMP_DEPENDENCIES = libpcap DHCPDUMP_LICENSE = BSD-2-Clause DHCPDUMP_LICENSE_FILES = LICENSE -- 2.25.1 From ju.o at free.fr Mon Feb 19 22:14:58 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 19 Feb 2024 23:14:58 +0100 Subject: [Buildroot] [PATCH 1/1] package/highway: bump to version 1.1.0 Message-ID: <20240219221458.831078-1-ju.o@free.fr> For release note, see [1]. This commit removes the package patch, as it is now included in this new release. LICENSE-BSD3 hash changed, due to reformatting. See [2]. [1] https://github.com/google/highway/releases/tag/1.1.0 [2] https://github.com/google/highway/commit/edc35d14c77cb24dc1163989c762d69694e0e955 Signed-off-by: Julien Olivain --- ...1-add-required-RISC-V-flags-to-CMake.patch | 42 ------------------- package/highway/highway.hash | 4 +- package/highway/highway.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/highway/0001-add-required-RISC-V-flags-to-CMake.patch diff --git a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch b/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch deleted file mode 100644 index bfcbfb055cb..00000000000 --- a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5d58d233fbcec0c6a39df8186a877329147324b3 Mon Sep 17 00:00:00 2001 -From: Mathieu Malaterre -Date: Wed, 13 Sep 2023 08:37:54 +0200 -Subject: [PATCH] Add an option to opt-out of HWY_RISCV - -Fixes #1740 - -Upstream: https://github.com/google/highway/commit/5d58d233fbcec0c6a39df8186a877329147324b3 -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c2bf57b3f5..be639c945f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,6 +61,9 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4 - # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. - set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?") - -+# Currently this will compile the entire codebase with `-march=rv64gcv1p0`: -+set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?") -+ - # Unconditionally adding -Werror risks breaking the build when new warnings - # arise due to compiler/platform changes. Enable this in CI/tests. - set(HWY_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Add -Werror flag?") -@@ -260,9 +263,11 @@ else() - # gcc(13) and recent clang both support V, but not yet runtime dispatch, so - # we add the gcv compiler flag, which then requires the CPU (now when using - # either compiler) to support V. -- list(APPEND HWY_FLAGS -march=rv64gcv1p0) -- if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -- list(APPEND HWY_FLAGS -menable-experimental-extensions) -+ if(HWY_CMAKE_RVV) -+ list(APPEND HWY_FLAGS -march=rv64gcv1p0) -+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -+ list(APPEND HWY_FLAGS -menable-experimental-extensions) -+ endif() - endif() - endif() - diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3cb497f20a7..270131134ec 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5 highway-1.0.7.tar.gz +sha256 354a8b4539b588e70b98ec70844273e3f2741302c4c377bcc4e81b3d1866f7c9 highway-1.1.0.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE -sha256 6dcc159f448e3aca73a15e355d0a6735ca3fd224abe637e0b7437dce2d24f765 LICENSE-BSD3 +sha256 d25e82e26acd42ca3ccc9993622631163425b869b9e16284226d534cff6470f2 LICENSE-BSD3 diff --git a/package/highway/highway.mk b/package/highway/highway.mk index b45fa8df74d..3eb0d7a4aa2 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.7 +HIGHWAY_VERSION = 1.1.0 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 or BSD-3-Clause HIGHWAY_LICENSE_FILES = LICENSE LICENSE-BSD3 -- 2.43.2 From romain.naour at smile.fr Mon Feb 19 22:27:41 2024 From: romain.naour at smile.fr (Romain Naour) Date: Mon, 19 Feb 2024 23:27:41 +0100 Subject: [Buildroot] [PATCH 21/21] boot/ti-k3-image-gen: remove package In-Reply-To: <20240219194207.pfonekdap7jagk3d@dasso> References: <20240213172817.2872849-1-romain.naour@smile.fr> <20240213172817.2872849-22-romain.naour@smile.fr> <8981fdd9313957b6f0174ac03006db1063b395f7.camel@gmail.com> <20240216200635.crek5j23p3hybg2p@dasso> <20240219194207.pfonekdap7jagk3d@dasso> Message-ID: <3dac4749-be3c-403a-9867-e7229f5dbf49@smile.fr> Hi Andreas, Le 19/02/2024 ? 20:42, Andreas Dannenberg a ?crit?: > Hi Romain, > > On Fri, Feb 16, 2024 at 10:38:42PM +0100, Romain Naour wrote: >> Hello Andreas, >> >> Le 16/02/2024 ? 21:06, Andreas Dannenberg a ?crit?: >>> On Thu, Feb 15, 2024 at 11:20:50AM +0100, Alexander Sverdlin wrote: >>>> Hi Romain, >>>> >>>> On Tue, 2024-02-13 at 18:28 +0100, Romain Naour wrote: >>>>> -choice >>>>> - prompt "Security type" >>>>> - help >>>>> - ? The target SoC security type option for image gen.? Valid >>>>> - ? options are "gp" for General Purpose devices, "hs-fs" for >>>>> - ? High Security - Field Securable devices, or "hs" for High >>>>> - ? Security - Security Enforcing devices.? Note for all High >>>>> - ? Security device variants the TI_SECURE_DEV_PKG environmental >>>>> - ? variable must be defined at build time pointing to a valid >>>>> - ? core-secdev-k3 folder location, otherwise the build will >>>>> - ? fail, see >>>>> - ? https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >>>>> - >>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>>> - bool "gp" >>>>> - >>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>>> - bool "hs-fs" >>>>> - >>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>>> - bool "hs" >>>>> - >>>>> -endchoice >>>> >>>> another observation I made just now: previously BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP=y >>>> was the default, which didn't boot on my HS-FS SoC. >>>> >>>> You patchset started out-of-the-box, which, I conclude, means, HS-FS is now the >>>> default for AM62x. I'm not sure if this is a problem, though. >>> >>> HS-FS should be the default for all TI AM6x devices. This is our >>> "production silicon" and what's used for (almost) all projects, >>> especially new projects. This being said having support for GP device >>> variants still is desirable for existing boards/projects, such as the >>> current BeaglePlay boards (amongst earlier version of TI starter kit >>> EVMs for AM6x). >> >> Thank you, I was not aware of this. >> >> I found your post in the TI forum about the recent switch from GP to HS-FS >> device in Yocto [1]. >> >> Currently existing am64/am62 defconfigs are still targeting GP devices but we >> should add additional commits to do the switch to HS-FS. >> >> What about other SoC of the K3 architecture? >> Is the DRA829/J721e device will also switch to HS-FS by default? > > I needed to double-check with the team, since I'm only intimately > involved with AM62/AM64/AM65 type devices. All the others are managed by > a different group in TI. > > So based on what I found out here's the full context accross TI's K3 > platform of devices and their associated TI EVMs / Starter Kits: > > * All "Sitara"-brand SoCs (AM62x, AM64, AM65x) are HS-FS first > * All "Jacinto"-brand industrial SoCs (AM68, AM69 and AM67) are also HS-FS first > * All new "Jacinto"-brand automotive/other SoCs (J7AEN onwards) are HS-FS first > * All existing "Jacinto"-brand SoCs (TDA4, J721E, J7200, J721S2 and J784S4) are GP by default > > So while there are still boards out there with GP silicon (last bullet) > those are probably not the typical target platforms for Buildroot, being > very complex and high-end multi-core SoCs, mostly used in automotive > applications. The one exception here that has more weight in my oppinion > is the current BeaglePlay board (AM62x-based), those also have GP devices > on those boards. I'm curently working on a j721e SoC based custom board bringup involving IPC communication with one DSP (C66x). While it was possible to build the DSP firmware within Yocto (dunfell), it required to package the TI-PDK to provide headers and libraries for the DSP project. We endup by building the DSP firmware outside of Yocto (it would be the same with Buildroot). If the SoC is available and can run Linux, the the rootfs can be build by Buildroot. And what about the Beagleboard-AI64 (J721e) ? https://beagleboard.org/ai-64 > > All this being being said, I stand by my previous comment that HS-FS > should be the default. As for the BeaglePlay board (which is a very nice > community board) and potentially selected Jacinto-based boards this > could potentially be handled with a dedicated defconfig or some other > Kconfig magic to enable a seamless and easy out of box experience. Patch welcome then :) I don't have one but it would go hand in hand with my (old) beagleboard rev C2 (omap3530)! Best regards, Romain > > > -- > Andreas Dannenberg > Texas Instruments Inc > > > > > > > >> >> From the u-boot k3 documentation, it's not clear witch device type is used by >> default across all k3 SoC. By default I was expecting the GP type for all the k3 >> family (I was wrong). >> >> [1] >> https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto >> >> [2] >> https://source.denx.de/u-boot/u-boot/-/blob/master/doc/board/ti/k3.rst?ref_type=heads&plain=1#L108 >> >> Best regards, >> Romain >> >>> >>> -- >>> Andreas Dannenberg >>> Texas Instruments Inc >>> >>> >>>> >>>> -- >>>> Alexander Sverdlin. >>>> >>>> _______________________________________________ >>>> buildroot mailing list >>>> buildroot at buildroot.org >>>> https://lists.buildroot.org/mailman/listinfo/buildroot >> From patrick.oppenlander at gmail.com Mon Feb 19 22:42:07 2024 From: patrick.oppenlander at gmail.com (Patrick Oppenlander) Date: Tue, 20 Feb 2024 09:42:07 +1100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <4a8d7f2252b46118554a9e22c49901822e461f2f.camel@gmail.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <4a8d7f2252b46118554a9e22c49901822e461f2f.camel@gmail.com> Message-ID: On Sun, 18 Feb 2024 at 04:40, Alexander Sverdlin wrote: > > Hi Dario! > > On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > > This series, which in my humble opinion, should have been immediately > > considered to correct the compilation errors in case of HS-FS devcies, has > > seen an increase in patches in version 4 to remove the ti-k3-image-gen > > I wasn't aware of the preceeding versions, but... > > > package thanks to Binman. Additionally, it shares some modifications and > > views on how to implement certain changes with the series > > https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > > Therefore, I think it is necessary not to run them in parallel but to decide > > whether to merge one before the other or to consider a single series where > > the patches can be coherent with each other. I am available for both solutions. > > Let me know. > > ... as the broken HS-FS went unnoticed, seems there is no rush to fix the > build now? I noticed, and hacked in some am64x specific fixes here: https://github.com/relectrify/buildroot/commits/2023.11.1_relectrify. I was going to submit a cleaned up version of the patches, but I got distracted by fixing encrypted boot (see below) and never got back to cleaning them up. Sorry about that. Apparently TI don't support encrypted boot in their Linux SDK (yet?), only in the MCU SDK. There's a python script in the MCU SDK (rom_image_gen.py) which kinda works once you teach it how to read ascii keys as generated by the keywriter package. Except, it changes the size of the plaintext because it aligns it to 16-bytes and appends 32 random bytes, which causes a boot failure somewhere early on in U-Boot. I hacked around that by sticking the original binary size into some of those random bytes (it's not part of the X509 cert..) and teaching U-Boot to detect the encrypted image (https://github.com/relectrify/u-boot/commit/d16b4705ffebb0881633dfd5300bf4ac8490e75c) and doing a fixup. Once you do that, and change all the right places to run rom_image_gen.py it works, but it's pretty painful to get there. Hopefully this situation is a bit better in the binman version. Patrick From dannenberg at ti.com Tue Feb 20 00:41:00 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 18:41:00 -0600 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> Message-ID: <20240220004100.3yzqapeplx6olarz@dasso> On Mon, Feb 19, 2024 at 12:24:52PM +0100, Romain Naour wrote: > Hello Michael, > > Le 19/02/2024 ? 12:02, Michael Nazzareno Trimarchi a ?crit?: > > Hi Romain > > > > On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: > >> > >> Hello Dario, > >> > >> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > >>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes > >>> high-security field-securable (HS-FS) silicon to optionally customize keys > >>> and encryption for security applications. > >>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > >>> which, however, was buggy. This series fixes the errors and bumps the Linux > >>> kernel and U-Boot required for such a new device. > >>> > >>> This series, which in my humble opinion, should have been immediately > >>> considered to correct the compilation errors in case of HS-FS devcies, has > >>> seen an increase in patches in version 4 to remove the ti-k3-image-gen > >>> package thanks to Binman. Additionally, it shares some modifications and > >>> views on how to implement certain changes with the series > >>> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > >>> Therefore, I think it is necessary not to run them in parallel but to decide > >>> whether to merge one before the other or to consider a single series where > >>> the patches can be coherent with each other. I am available for both solutions. > >>> Let me know. > >> > >> Thanks for this new version. I beleive both series should be merged into one > >> since we want to follow u-boot switch to binman, add more TI K3 SoC support and > >> keeping exising am62x ans am64x working in GP or HS/HS-FS. > >> > > > > Because the Dario patchset was sent before (end of November), it's > > reasonable to review and adjust that one > > and apply your changes for ti_j721e_sk on top of it. It think that is > > a standard way to make people happy about > > their work and contribution. > > Actually, the two series are about the same topic: TI K3 SoC support (GP, HS, > HS-FS) not only AM62x-SK HS-FS devices > > But due to the complexity of the BSP, the boot flow (4 way to boot!) and the > switch from custom tool to binman... this series is really difficult to review > without having a good understanding of TI K3 architecture peculiarity and having > one of each TI evaluation boards ? Although I helped conceive some of this and the associated tooling early on, some of the what may look strange architectural decisions were driven by different use cases and requirements for the different devices (especially around automotive fast/early boot, but also security) in combination with limited on-chip SRAM... So this where we are at now. A future AM6x device variant will have yet another boot flow, but I can already say it will be very much simplified over what we have today :) > The series (based on Dario's work) about ti_j721e_sk suggested to remove TI > custom tools replaced by binman along with other improvements. > > I'll way for v5 and rebase the ti_j721e_sk on top of it. Thank you Romain for your buy-in. Let's focus on getting Dario's series in good shape and then move onto yours. I'd also like to re-introduce graphics (I had that working before) but I need to wait for all the "baseline" stuff to settle first. -- Andreas Dannenberg Texas Instruments Inc > > Best regards, > Romain > > > > > > Michael > > > >> My main concern is to avoid adding a new package for a tool that is already > >> deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. > >> > >> Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". > >> > >> [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html > >> > >> Best regards, > >> Romain > >> > >>> > >>> Dario Binacchi (20): > >>> configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > >>> setting > >>> configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > >>> setting > >>> configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > >>> version > >>> configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > >>> version > >>> boot/ti-k3-r5-loader: bump to version 2024.01 > >>> boot/ti-k3-core-secdev: new package > >>> boot/ti-k3-image-gen: manage HS hardware > >>> package/python-jsonschema: add host variant > >>> package/python-attrs: add host variant > >>> package/python-referencing: add host variant > >>> package/python-rpds-py: add host variant > >>> package/python-jsonschema-specifications: add host variant > >>> boot/ti-k3-r5-loader: set binman environment > >>> boot/uboot: set BINMAN_INDIRS for TI K3 DM > >>> configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > >>> configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.1 > >>> boot: move ti-k3-* packages to 'ti-k3' directory > >>> boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > >>> boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > >>> configs/ti_am62x_sk_defconfig: don't use ti-k3-image-gen anymore > >>> > >>> DEVELOPERS | 1 + > >>> board/ti/am62x-sk/genimage.cfg | 7 +- > >>> board/ti/am62x-sk/post-build.sh | 49 ++++++++++++ > >>> board/ti/am62x-sk/post-image.sh | 5 ++ > >>> boot/Config.in | 4 +- > >>> boot/ti-k3-image-gen/Config.in | 77 ------------------- > >>> boot/ti-k3/Config.in | 59 ++++++++++++++ > >>> boot/ti-k3/common.mk | 1 + > >>> .../{ => ti-k3}/ti-k3-boot-firmware/Config.in | 0 > >>> .../ti-k3-boot-firmware.hash | 0 > >>> .../ti-k3-boot-firmware.mk | 0 > >>> boot/ti-k3/ti-k3-core-secdev/Config.in | 9 +++ > >>> .../ti-k3-core-secdev/ti-k3-core-secdev.hash | 3 + > >>> .../ti-k3-core-secdev/ti-k3-core-secdev.mk | 22 ++++++ > >>> boot/ti-k3/ti-k3-image-gen/Config.in | 25 ++++++ > >>> .../ti-k3-image-gen/ti-k3-image-gen.hash | 0 > >>> .../ti-k3-image-gen/ti-k3-image-gen.mk | 20 ++++- > >>> boot/{ => ti-k3}/ti-k3-r5-loader/Config.in | 4 +- > >>> .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- > >>> .../ti-k3-r5-loader/ti-k3-r5-loader.mk | 16 +++- > >>> boot/uboot/Config.in | 7 +- > >>> boot/uboot/uboot.mk | 3 +- > >>> configs/ti_am62x_sk_defconfig | 23 +++--- > >>> configs/ti_am64x_sk_defconfig | 8 +- > >>> package/python-attrs/python-attrs.mk | 6 ++ > >>> .../python-jsonschema-specifications.mk | 5 ++ > >>> .../python-jsonschema/python-jsonschema.mk | 6 ++ > >>> .../python-referencing/python-referencing.mk | 5 ++ > >>> package/python-rpds-py/python-rpds-py.mk | 1 + > >>> 29 files changed, 263 insertions(+), 105 deletions(-) > >>> create mode 100755 board/ti/am62x-sk/post-build.sh > >>> create mode 100755 board/ti/am62x-sk/post-image.sh > >>> delete mode 100644 boot/ti-k3-image-gen/Config.in > >>> create mode 100644 boot/ti-k3/Config.in > >>> create mode 100644 boot/ti-k3/common.mk > >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/Config.in (100%) > >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.hash (100%) > >>> rename boot/{ => ti-k3}/ti-k3-boot-firmware/ti-k3-boot-firmware.mk (100%) > >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/Config.in > >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.hash > >>> create mode 100644 boot/ti-k3/ti-k3-core-secdev/ti-k3-core-secdev.mk > >>> create mode 100644 boot/ti-k3/ti-k3-image-gen/Config.in > >>> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.hash (100%) > >>> rename boot/{ => ti-k3}/ti-k3-image-gen/ti-k3-image-gen.mk (67%) > >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/Config.in (97%) > >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.hash (54%) > >>> rename boot/{ => ti-k3}/ti-k3-r5-loader/ti-k3-r5-loader.mk (85%) > >>> > >> > From dannenberg at ti.com Tue Feb 20 01:28:48 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 19:28:48 -0600 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> Message-ID: <20240220012848.76amyog5pecsgld4@dasso> Romain, Dario, On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: > Hello Dario, > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit?: > > Recent versions of U-Boot can use Binman to compile and sign the generated > > binaries, thus making the use of custom tools like ti-k3-image-gen no > > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > > configured and used outside of it. This patch allows setting such options > > even if the package is not enabled. > > I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux > kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. There were discussions/suggestions around this before by Yann E Morin [1] and Thomas Petazzoni [2]. I think the gist of it was to move the selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing all the K3 SoC specific selections. And then other packages and Kconfig menues can depend on it more cleanly. Like it's currently done with package/freescale-imx/Config.in. This would also bring some consistency in how those NXP and TI device families are managed, which will make for a better end-user experience I think. -- Andreas Dannenberg Texas Instruments Inc [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html > > Best regards, > Romain > > > > > > --- > > > > Added in v4 > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3/Config.in | 46 ++++++++++++++ > > boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > > boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > > boot/uboot/Config.in | 7 +-- > > configs/ti_am62x_sk_defconfig | 2 +- > > configs/ti_am64x_sk_defconfig | 2 +- > > 6 files changed, 59 insertions(+), 67 deletions(-) > > > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > > index 06dda2f156a9..9e508326c9c8 100644 > > --- a/boot/ti-k3/Config.in > > +++ b/boot/ti-k3/Config.in > > @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > > > > if BR2_TARGET_TI_K3 > > > > +choice > > + prompt "SoC family" > > + > > +config BR2_TARGET_TI_K3_SOC_AM62AX > > + bool "am62ax" > > + > > +config BR2_TARGET_TI_K3_SOC_AM62X > > + bool "am62x" > > + > > +config BR2_TARGET_TI_K3_SOC_AM64X > > + bool "am64x" > > + > > +config BR2_TARGET_TI_K3_SOC_AM65X > > + bool "am65x" > > + > > +endchoice > > + > > +choice > > + prompt "Security type" > > + help > > + The target SoC security type option. > > + > > +config BR2_TARGET_TI_K3_SECTYPE_GP > > + bool "gp" > > + > > +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > > + bool "hs-fs" > > + > > +config BR2_TARGET_TI_K3_SECTYPE_HS > > + bool "hs" > > + > > +endchoice > > + > > +config BR2_TARGET_TI_K3_SOC > > + string > > + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > > + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > > + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > > + > > +config BR2_TARGET_TI_K3_SECTYPE > > + string > > + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > > + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > > + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > > + > > source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > > source "boot/ti-k3/ti-k3-core-secdev/Config.in" > > source "boot/ti-k3/ti-k3-image-gen/Config.in" > > diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > > index 38d1598d9fc0..2d53d62dd4ee 100644 > > --- a/boot/ti-k3/ti-k3-image-gen/Config.in > > +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > > @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > bool "ti-k3-image-gen" > > depends on BR2_TARGET_TI_K3_R5_LOADER > > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > > # We need FIT support in uboot-tools, which is why we select a > > # host package > > select BR2_PACKAGE_HOST_UBOOT_TOOLS > > @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > > > if BR2_TARGET_TI_K3_IMAGE_GEN > > -choice > > - prompt "SoC family" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - bool "am62ax" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - bool "am62x" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - bool "am64x" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > - bool "am65x" > > - > > -endchoice > > - > > -choice > > - prompt "Security type" > > - help > > - The target SoC security type option for image gen. Valid > > - options are "gp" for General Purpose devices, "hs-fs" for > > - High Security - Field Securable devices, or "hs" for High > > - Security - Security Enforcing devices. Note for all High > > - Security device variants the TI_SECURE_DEV_PKG environmental > > - variable must be defined at build time pointing to a valid > > - core-secdev-k3 folder location, otherwise the build will > > - fail, see > > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > - bool "gp" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > - bool "hs-fs" > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > - bool "hs" > > - > > -endchoice > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > > - string > > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > > string > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > - > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > > - string > > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > > > > endif > > diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > index 74b4fcb4bf89..834d8f7d5cd5 100644 > > --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > > $(BR2_MAKE_HOST_DEPENDENCY) > > > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > > > -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > > TI_K3_IMAGE_GEN_SYSFW = \ > > $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > else > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > > index beafb38930db..1a9d21e7c6d1 100644 > > --- a/boot/uboot/Config.in > > +++ b/boot/uboot/Config.in > > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > bool "U-Boot needs TI K3 Device Manager (DM)" > > # We use the SoC selection defined for the ti-k3-image-gen > > # package > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > > help > > Some TI K3 devices need the Device Manager (DM) firmware to > > be available for the U-Boot build. > > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > > > config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > > string > > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > > + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > > > > endif > > > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > > index cd26235342e4..cfefce0a77a4 100644 > > --- a/configs/ti_am62x_sk_defconfig > > +++ b/configs/ti_am62x_sk_defconfig > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > > BR2_TARGET_TI_K3=y > > +BR2_TARGET_TI_K3_SOC_AM62X=y > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > > BR2_TARGET_TI_K3_R5_LOADER=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > > index 1befeb4ab96c..daf78dbffff8 100644 > > --- a/configs/ti_am64x_sk_defconfig > > +++ b/configs/ti_am64x_sk_defconfig > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > > BR2_TARGET_TI_K3=y > > +BR2_TARGET_TI_K3_SOC_AM64X=y > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > > BR2_TARGET_TI_K3_R5_LOADER=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > From dannenberg at ti.com Tue Feb 20 02:00:11 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Mon, 19 Feb 2024 20:00:11 -0600 Subject: [Buildroot] [PATCH v4 14/20] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <63d28259-ff96-4450-bdc5-e1bc209d8e59@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-15-dario.binacchi@amarulasolutions.com> <95a8a71f608575339cd61ba5ed09b93d8714c01c.camel@gmail.com> <20240219205157.5ukm426gmzbvn33f@dasso> <63d28259-ff96-4450-bdc5-e1bc209d8e59@smile.fr> Message-ID: <20240220020011.x7mfxcs5oxbr5s3d@dasso> On Mon, Feb 19, 2024 at 10:34:52PM +0100, Romain Naour wrote: > Hello Andreas, > > Le 19/02/2024 ? 21:51, Andreas Dannenberg a ?crit?: > > On Sat, Feb 17, 2024 at 09:44:29PM +0100, Alexander Sverdlin wrote: > >> Hi Dario, > >> > >> On Sat, 2024-02-17 at 17:02 +0100, Dario Binacchi wrote: > >>> As explained in [1], adding support for AM62x LP SK in U-Boot, requires > >>> binman for building bootloader images. The BINMAN_INDIRS environment > >>> variable is used to provide a space-separated list of directories to > >>> search for binary blobs. > >>> > >>> [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > >>> Signed-off-by: Dario Binacchi > >>> > >>> --- > >>> > >>> no changes since v1: > >>> > >>> Signed-off-by: Dario Binacchi > >>> --- > >>> ?boot/uboot/uboot.mk | 3 ++- > >>> ?1 file changed, 2 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > >>> index dda606a88059..cf70f86a4132 100644 > >>> --- a/boot/uboot/uboot.mk > >>> +++ b/boot/uboot/uboot.mk > >>> @@ -189,7 +189,8 @@ endif > >>> ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > >>> ?UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > >>> ?UBOOT_DEPENDENCIES += ti-k3-boot-firmware > >>> -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > >>> +UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f \ > >> > >> Is the above actually still required with binman? > >> The names are hardcoded in U-Boot in arch/arm/dts/k3-am625-sk-binman.dtsi > >> > >>> + BINMAN_INDIRS=$(BINARIES_DIR) > >> > >> This seems to be the only required part. > > > > Correct. 'DM=' is no longer used, also see the official U-Boot build > > instructions for TI platforms in the SDK documentation [1] (technically > > speaking this documentation is for the U-Boot vendor tree, but the same > > principle applies to upstream U-Boot builds). > > > > Reviewed-by: Andreas Dannenberg > > > > [1] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html > > It means that we can remove BR2_TARGET_UBOOT_NEEDS_TI_K3_DM and > UBOOT_TI_K3_DM_SOCNAME too. > > meta-ti still use DM= but probably to support u-boot-ti-staging_2023.04 that is > still available [1]. > > The u-boot documentation also contains a similar note [2]. Yes you are right, this option is still available as an override. But best will be to standardize on the new way of doing things, which is BINMAN_INDIRS. > In the end we only need an option to select which SoC type we want to use > (GP,HS,HS-FS). Yes. There's one small twist to that, technically for HS devices (a.k.a. "HS-SE" devices), which is what an HS-FS device turns into _after_ the fuses are burned with a custom key, the end user will need to provide their own key for signing the boot image, which will then be used instead of './board/ti/keys/custMpk.pem' in the U-Boot tree. Let me think about some more if there isn't a good way that can be done through Builroot, based on how actual end customers manage their private keys (which can be very elaborate, even involving HSMs in some cases). It might be helpful to expose such an override using a config option that can be used to point to an external key. Anyways just food for thought, this shouldn't gate anything on Dario's series here. -- Andreas Dannenberg Texas Instruments Inc > > [1] > https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc?h=cicd.master.202402130100#n52 > > [2] > https://gitlab.com/u-boot/u-boot/-/blob/master/doc/board/ti/k3.rst?ref_type=heads&plain=1#L372 > > Best regards, > Romain > > > > > > > > >> > >>> ?endif > >>> ? > >>> ?ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > >> > >> -- > >> Alexander Sverdlin. > >> > From jan.kraval at gmail.com Tue Feb 20 05:19:25 2024 From: jan.kraval at gmail.com (Jan Kraval) Date: Tue, 20 Feb 2024 06:19:25 +0100 Subject: [Buildroot] [PATCH 1/2] board/orangepi/orangepi-lite: switch to extlinux Message-ID: <20240220051926.68559-1-jan.kraval@gmail.com> Switch to extlinux instead of U-Boot boot script. Drop custom boot script and genimage config. Instead use common orangepi files from board/orangepi/common. Signed-off-by: Jan Kraval --- board/orangepi/orangepi-lite/boot.cmd | 8 ----- board/orangepi/orangepi-lite/genimage.cfg | 37 ----------------------- configs/orangepi_lite_defconfig | 12 +++----- 3 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 board/orangepi/orangepi-lite/boot.cmd delete mode 100644 board/orangepi/orangepi-lite/genimage.cfg diff --git a/board/orangepi/orangepi-lite/boot.cmd b/board/orangepi/orangepi-lite/boot.cmd deleted file mode 100644 index 5c29dabfe8..0000000000 --- a/board/orangepi/orangepi-lite/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-lite.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-lite/genimage.cfg b/board/orangepi/orangepi-lite/genimage.cfg deleted file mode 100644 index b422a751a8..0000000000 --- a/board/orangepi/orangepi-lite/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi Lite -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-lite.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - size = 512M - } -} diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index e834816456..eff5af938b 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -4,6 +4,9 @@ BR2_ARM_FPU_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" @@ -11,6 +14,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-lite/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-lite" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RTL8189FS=y BR2_PACKAGE_WIRELESS_TOOLS=y @@ -25,15 +29,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-lite/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite/genimage.cfg" -- 2.39.2 From jan.kraval at gmail.com Tue Feb 20 05:19:26 2024 From: jan.kraval at gmail.com (Jan Kraval) Date: Tue, 20 Feb 2024 06:19:26 +0100 Subject: [Buildroot] [PATCH 2/2] configs/orangepi_lite: bump kernel and u-boot versions In-Reply-To: <20240220051926.68559-1-jan.kraval@gmail.com> References: <20240220051926.68559-1-jan.kraval@gmail.com> Message-ID: <20240220051926.68559-2-jan.kraval@gmail.com> Bump Linux to 6.6 and U-Boot to 2024.01. Signed-off-by: Jan Kraval --- configs/orangepi_lite_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig index eff5af938b..1bb1bf3ad1 100644 --- a/configs/orangepi_lite_defconfig +++ b/configs/orangepi_lite_defconfig @@ -1,7 +1,7 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite" BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" @@ -9,11 +9,11 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.16" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-lite/linux-extras.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-lite" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h3-orangepi-lite" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_RTL8189FS=y @@ -26,7 +26,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -- 2.39.2 From martink at posteo.de Tue Feb 20 07:32:51 2024 From: martink at posteo.de (Martin Kepplinger) Date: Tue, 20 Feb 2024 07:32:51 +0000 Subject: [Buildroot] [PATCH 1/1] package/tslib: bump version to 1.23 Message-ID: <20240220073251.251521-1-martink@posteo.de> Release notes from https://github.com/libts/tslib/releases : This release includes libts version 0.10.5 and the following changes: * new filter module: module crop * some build and security fixes * improved release procedure Signed-off-by: Martin Kepplinger --- package/tslib/tslib.hash | 4 ++-- package/tslib/tslib.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index 762fbebb26..6fe35633aa 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,5 +1,5 @@ -# https://github.com/libts/tslib/releases/download/1.22/tslib-1.22.tar.xz.sha256 -sha256 aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a tslib-1.22.tar.xz +# https://github.com/libts/tslib/releases/download/1.23/tslib-1.23.tar.xz.sha256 +sha256 9b489a54d48006201f2fe955a88c3f857535ac93b6cf8e5a16c7b166c8991dac tslib-1.23.tar.xz # Locally computed sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 45e29808bd..e8eb3beeaf 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.22 +TSLIB_VERSION = 1.23 TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) @@ -29,7 +29,8 @@ TSLIB_CONF_OPTS += \ --enable-skip=static \ --enable-lowpass=static \ --enable-invert=static \ - --enable-evthres=static + --enable-evthres=static \ + --enable-crop=static endif $(eval $(autotools-package)) -- 2.39.2 From arnout at mind.be Fri Feb 16 19:55:22 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Fri, 16 Feb 2024 20:55:22 +0100 Subject: [Buildroot] [PATCH 1/2] support/testing: remove hardcoded sleep from python-django test In-Reply-To: <10542b7e-f7d5-4197-ae19-ba94706c6595@bubu1.eu> References: <20240216131815.318315-1-buildroot@bubu1.eu> <10542b7e-f7d5-4197-ae19-ba94706c6595@bubu1.eu> Message-ID: <90a0135a-90ad-4379-8f76-8f23cc009176@mind.be> On 16/02/2024 14:23, Marcus Hoffmann via buildroot wrote: > On 16.02.24 14:18, Marcus Hoffmann via buildroot wrote: >> Instead of waiting for a hardcoded time of 30s we check periodically every >> second if the server is already up. If it isn't up after the full timeout >> (which is the same as before) expired the test fails. >> >> We need to redirect all output of the background started task to >> /dev/null now as it otherwise confuses the emulator.run() exit code >> parsing logic (as it gets out of order messages from the emulator). >> >> Signed-off-by: Marcus Hoffmann >> --- >> ? .../tests/package/test_python_django.py??????? | 18 ++++++++++++------ >> ? 1 file changed, 12 insertions(+), 6 deletions(-) >> >> diff --git a/support/testing/tests/package/test_python_django.py >> b/support/testing/tests/package/test_python_django.py >> index e1ca50f6d8..0973467a2a 100644 >> --- a/support/testing/tests/package/test_python_django.py >> +++ b/support/testing/tests/package/test_python_django.py >> @@ -1,3 +1,5 @@ >> +import time >> + >> ? from tests.package.test_python import TestPythonPackageBase >> @@ -16,13 +18,17 @@ class TestPythonDjango(TestPythonPackageBase): >> ????????? self.assertIn("Operations to perform:", output[0]) >> ????????? self.assertEqual(exit_code, 0) >> -??????? cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py >> runserver 0.0.0.0:1234 & " >> -??????? # give some time to setup the server >> -??????? cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) >> +??????? cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py >> runserver 0.0.0.0:1234 > /dev/null 2>&1 & " >> ????????? self.assertRunOk(cmd, timeout=timeout) >> - >> -??????? cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" >> -??????? self.assertRunOk(cmd) >> +??????? # give some time to setup the server >> +??????? for attempt in range(30 * self.emulator.timeout_multiplier): >> +??????????? time.sleep(1) >> +??????????? cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" >> +??????????? _, exit_code = self.emulator.run(cmd) >> +??????????? if exit_code == 0: >> +??????????????? break >> +??????? else: >> +??????????? self.assertTrue(False, "Timeout while waiting for django server") >> ? class TestPythonPy3Django(TestPythonDjango): > > The django test (and the whitenoise test introduced in the next patch) actually > both currently fail because of a problem with django 5.0 and .pyc only > installations. [1] > > This now has "release blocker" priority at django and a proposed patch (that I > tested locally but hasn't been officially submitted to django yet) so hopefully > this will be fixed with the next django point release in a couple of weeks. Ugh, and we're cutting 2024.02-rc1 right about now... I guess you can submit that patch directly to Buildroot then? Or is the point release going to be a minor one that we can still apply to the master branch in the rc period? Regards, Arnout > > [1] https://code.djangoproject.com/ticket/35187 > > Marcus > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From dario.binacchi at amarulasolutions.com Tue Feb 20 09:05:34 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 20 Feb 2024 10:05:34 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240220012848.76amyog5pecsgld4@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> <20240220012848.76amyog5pecsgld4@dasso> Message-ID: Hi Andreas, Romain, All On Tue, Feb 20, 2024 at 2:28?AM Andreas Dannenberg wrote: > > Romain, Dario, > > On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: > > Hello Dario, > > > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > > > Recent versions of U-Boot can use Binman to compile and sign the generated > > > binaries, thus making the use of custom tools like ti-k3-image-gen no > > > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > > > configured and used outside of it. This patch allows setting such options > > > even if the package is not enabled. > > > > I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux > > kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. > > There were discussions/suggestions around this before by Yann E Morin > [1] and Thomas Petazzoni [2]. I think the gist of it was to move the > selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing > all the K3 SoC specific selections. And then other packages and Kconfig > menues can depend on it more cleanly. Like it's currently done with > package/freescale-imx/Config.in. This would also bring some consistency > in how those NXP and TI device families are managed, which will make for > a better end-user experience I think. If I'm not mistaken, I think the patches: [18/20] boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope [17/20] boot: move ti-k3-* packages to 'ti-k3' directory Are heading in the direction of what we find in package/freescale-imx/, with the only difference being that in our case, we're under boot. So, can I consider these two patches correct? Thanks and regards, Dario > > > > -- > Andreas Dannenberg > Texas Instruments Inc > > [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html > [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html > > > > > > Best regards, > > Romain > > > > > > > > > > --- > > > > > > Added in v4 > > > > > > Signed-off-by: Dario Binacchi > > > --- > > > boot/ti-k3/Config.in | 46 ++++++++++++++ > > > boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > > > boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > > > boot/uboot/Config.in | 7 +-- > > > configs/ti_am62x_sk_defconfig | 2 +- > > > configs/ti_am64x_sk_defconfig | 2 +- > > > 6 files changed, 59 insertions(+), 67 deletions(-) > > > > > > diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > > > index 06dda2f156a9..9e508326c9c8 100644 > > > --- a/boot/ti-k3/Config.in > > > +++ b/boot/ti-k3/Config.in > > > @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > > > > > > if BR2_TARGET_TI_K3 > > > > > > +choice > > > + prompt "SoC family" > > > + > > > +config BR2_TARGET_TI_K3_SOC_AM62AX > > > + bool "am62ax" > > > + > > > +config BR2_TARGET_TI_K3_SOC_AM62X > > > + bool "am62x" > > > + > > > +config BR2_TARGET_TI_K3_SOC_AM64X > > > + bool "am64x" > > > + > > > +config BR2_TARGET_TI_K3_SOC_AM65X > > > + bool "am65x" > > > + > > > +endchoice > > > + > > > +choice > > > + prompt "Security type" > > > + help > > > + The target SoC security type option. > > > + > > > +config BR2_TARGET_TI_K3_SECTYPE_GP > > > + bool "gp" > > > + > > > +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > > > + bool "hs-fs" > > > + > > > +config BR2_TARGET_TI_K3_SECTYPE_HS > > > + bool "hs" > > > + > > > +endchoice > > > + > > > +config BR2_TARGET_TI_K3_SOC > > > + string > > > + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > > > + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > > > + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > > > + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > > > + > > > +config BR2_TARGET_TI_K3_SECTYPE > > > + string > > > + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > > > + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > > > + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > > > + > > > source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > > > source "boot/ti-k3/ti-k3-core-secdev/Config.in" > > > source "boot/ti-k3/ti-k3-image-gen/Config.in" > > > diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > > > index 38d1598d9fc0..2d53d62dd4ee 100644 > > > --- a/boot/ti-k3/ti-k3-image-gen/Config.in > > > +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > > > @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > > bool "ti-k3-image-gen" > > > depends on BR2_TARGET_TI_K3_R5_LOADER > > > select BR2_TARGET_TI_K3_BOOT_FIRMWARE > > > - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > > + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > > > # We need FIT support in uboot-tools, which is why we select a > > > # host package > > > select BR2_PACKAGE_HOST_UBOOT_TOOLS > > > @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > > > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > > > > > if BR2_TARGET_TI_K3_IMAGE_GEN > > > -choice > > > - prompt "SoC family" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > > - bool "am62ax" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > > - bool "am62x" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > > - bool "am64x" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > > - bool "am65x" > > > - > > > -endchoice > > > - > > > -choice > > > - prompt "Security type" > > > - help > > > - The target SoC security type option for image gen. Valid > > > - options are "gp" for General Purpose devices, "hs-fs" for > > > - High Security - Field Securable devices, or "hs" for High > > > - Security - Security Enforcing devices. Note for all High > > > - Security device variants the TI_SECURE_DEV_PKG environmental > > > - variable must be defined at build time pointing to a valid > > > - core-secdev-k3 folder location, otherwise the build will > > > - fail, see > > > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > > - bool "gp" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > > - bool "hs-fs" > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > > - bool "hs" > > > - > > > -endchoice > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > > > - string > > > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > > > > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > > > string > > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > > > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > > - > > > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > > > - string > > > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > > > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > > > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > > > + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > > > + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > > > > > > endif > > > diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > > index 74b4fcb4bf89..834d8f7d5cd5 100644 > > > --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > > +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > > > @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > > > $(BR2_MAKE_HOST_DEPENDENCY) > > > > > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > > > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > > > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > > > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > > > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > > > > > -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > > > +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > > > TI_K3_IMAGE_GEN_SYSFW = \ > > > $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > > else > > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > > > index beafb38930db..1a9d21e7c6d1 100644 > > > --- a/boot/uboot/Config.in > > > +++ b/boot/uboot/Config.in > > > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > > bool "U-Boot needs TI K3 Device Manager (DM)" > > > # We use the SoC selection defined for the ti-k3-image-gen > > > # package > > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > > > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > > + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > > > help > > > Some TI K3 devices need the Device Manager (DM) firmware to > > > be available for the U-Boot build. > > > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > > > > > config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > > > string > > > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > > > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > > > + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > > > + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > > > > > > endif > > > > > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > > > index cd26235342e4..cfefce0a77a4 100644 > > > --- a/configs/ti_am62x_sk_defconfig > > > +++ b/configs/ti_am62x_sk_defconfig > > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > > > BR2_TARGET_TI_K3=y > > > +BR2_TARGET_TI_K3_SOC_AM62X=y > > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > > > BR2_TARGET_TI_K3_R5_LOADER=y > > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > > > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > > > index 1befeb4ab96c..daf78dbffff8 100644 > > > --- a/configs/ti_am64x_sk_defconfig > > > +++ b/configs/ti_am64x_sk_defconfig > > > @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > > > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > > > BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > > > BR2_TARGET_TI_K3=y > > > +BR2_TARGET_TI_K3_SOC_AM64X=y > > > BR2_TARGET_TI_K3_IMAGE_GEN=y > > > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > > > BR2_TARGET_TI_K3_R5_LOADER=y > > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > > > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From romain.naour at smile.fr Tue Feb 20 09:32:14 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 10:32:14 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> <20240220012848.76amyog5pecsgld4@dasso> Message-ID: Hi Dario, Le 20/02/2024 ? 10:05, Dario Binacchi a ?crit?: > Hi Andreas, Romain, All > > On Tue, Feb 20, 2024 at 2:28?AM Andreas Dannenberg wrote: >> >> Romain, Dario, >> >> On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: >>> Hello Dario, >>> >>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>>> Recent versions of U-Boot can use Binman to compile and sign the generated >>>> binaries, thus making the use of custom tools like ti-k3-image-gen no >>>> longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were >>>> configured and used outside of it. This patch allows setting such options >>>> even if the package is not enabled. >>> >>> I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux >>> kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. >> >> There were discussions/suggestions around this before by Yann E Morin >> [1] and Thomas Petazzoni [2]. I think the gist of it was to move the >> selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing >> all the K3 SoC specific selections. And then other packages and Kconfig >> menues can depend on it more cleanly. Like it's currently done with >> package/freescale-imx/Config.in. This would also bring some consistency >> in how those NXP and TI device families are managed, which will make for >> a better end-user experience I think. > > If I'm not mistaken, I think the patches: > [18/20] boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > [17/20] boot: move ti-k3-* packages to 'ti-k3' directory > Are heading in the direction of what we find in > package/freescale-imx/, with the only difference being > that in our case, we're under boot. > So, can I consider these two patches correct? Yes, can you try to move ti-k3 to package directory in V5 ? It would also be used later by the GPU rogue firmwares. Please add a comment in the commit log that we make an exception to the rule "no subdirectory in package directory". Thanks! Best regards, Romain > > Thanks and regards, > Dario > >> >> >> >> -- >> Andreas Dannenberg >> Texas Instruments Inc >> >> [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html >> [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html >> >> >>> >>> Best regards, >>> Romain >>> >>> >>>> >>>> --- >>>> >>>> Added in v4 >>>> >>>> Signed-off-by: Dario Binacchi >>>> --- >>>> boot/ti-k3/Config.in | 46 ++++++++++++++ >>>> boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- >>>> boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- >>>> boot/uboot/Config.in | 7 +-- >>>> configs/ti_am62x_sk_defconfig | 2 +- >>>> configs/ti_am64x_sk_defconfig | 2 +- >>>> 6 files changed, 59 insertions(+), 67 deletions(-) >>>> >>>> diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in >>>> index 06dda2f156a9..9e508326c9c8 100644 >>>> --- a/boot/ti-k3/Config.in >>>> +++ b/boot/ti-k3/Config.in >>>> @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 >>>> >>>> if BR2_TARGET_TI_K3 >>>> >>>> +choice >>>> + prompt "SoC family" >>>> + >>>> +config BR2_TARGET_TI_K3_SOC_AM62AX >>>> + bool "am62ax" >>>> + >>>> +config BR2_TARGET_TI_K3_SOC_AM62X >>>> + bool "am62x" >>>> + >>>> +config BR2_TARGET_TI_K3_SOC_AM64X >>>> + bool "am64x" >>>> + >>>> +config BR2_TARGET_TI_K3_SOC_AM65X >>>> + bool "am65x" >>>> + >>>> +endchoice >>>> + >>>> +choice >>>> + prompt "Security type" >>>> + help >>>> + The target SoC security type option. >>>> + >>>> +config BR2_TARGET_TI_K3_SECTYPE_GP >>>> + bool "gp" >>>> + >>>> +config BR2_TARGET_TI_K3_SECTYPE_HS_FS >>>> + bool "hs-fs" >>>> + >>>> +config BR2_TARGET_TI_K3_SECTYPE_HS >>>> + bool "hs" >>>> + >>>> +endchoice >>>> + >>>> +config BR2_TARGET_TI_K3_SOC >>>> + string >>>> + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX >>>> + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X >>>> + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X >>>> + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X >>>> + >>>> +config BR2_TARGET_TI_K3_SECTYPE >>>> + string >>>> + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP >>>> + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS >>>> + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS >>>> + >>>> source "boot/ti-k3/ti-k3-boot-firmware/Config.in" >>>> source "boot/ti-k3/ti-k3-core-secdev/Config.in" >>>> source "boot/ti-k3/ti-k3-image-gen/Config.in" >>>> diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in >>>> index 38d1598d9fc0..2d53d62dd4ee 100644 >>>> --- a/boot/ti-k3/ti-k3-image-gen/Config.in >>>> +++ b/boot/ti-k3/ti-k3-image-gen/Config.in >>>> @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >>>> bool "ti-k3-image-gen" >>>> depends on BR2_TARGET_TI_K3_R5_LOADER >>>> select BR2_TARGET_TI_K3_BOOT_FIRMWARE >>>> - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS >>>> # We need FIT support in uboot-tools, which is why we select a >>>> # host package >>>> select BR2_PACKAGE_HOST_UBOOT_TOOLS >>>> @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >>>> https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ >>>> >>>> if BR2_TARGET_TI_K3_IMAGE_GEN >>>> -choice >>>> - prompt "SoC family" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>> - bool "am62ax" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>> - bool "am62x" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>> - bool "am64x" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>> - bool "am65x" >>>> - >>>> -endchoice >>>> - >>>> -choice >>>> - prompt "Security type" >>>> - help >>>> - The target SoC security type option for image gen. Valid >>>> - options are "gp" for General Purpose devices, "hs-fs" for >>>> - High Security - Field Securable devices, or "hs" for High >>>> - Security - Security Enforcing devices. Note for all High >>>> - Security device variants the TI_SECURE_DEV_PKG environmental >>>> - variable must be defined at build time pointing to a valid >>>> - core-secdev-k3 folder location, otherwise the build will >>>> - fail, see >>>> - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>> - bool "gp" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>> - bool "hs-fs" >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>> - bool "hs" >>>> - >>>> -endchoice >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC >>>> - string >>>> - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>> - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>> - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>> - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>> >>>> config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE >>>> string >>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>> - >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE >>>> - string >>>> - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>> - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>> - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX >>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X >>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X >>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X >>>> >>>> endif >>>> diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>> index 74b4fcb4bf89..834d8f7d5cd5 100644 >>>> --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>> +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>> @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ >>>> $(BR2_MAKE_HOST_DEPENDENCY) >>>> >>>> TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) >>>> -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) >>>> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) >>>> +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) >>>> +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) >>>> >>>> -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) >>>> +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) >>>> TI_K3_IMAGE_GEN_SYSFW = \ >>>> $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >>>> else >>>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in >>>> index beafb38930db..1a9d21e7c6d1 100644 >>>> --- a/boot/uboot/Config.in >>>> +++ b/boot/uboot/Config.in >>>> @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM >>>> bool "U-Boot needs TI K3 Device Manager (DM)" >>>> # We use the SoC selection defined for the ti-k3-image-gen >>>> # package >>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN >>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>> + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X >>>> help >>>> Some TI K3 devices need the Device Manager (DM) firmware to >>>> be available for the U-Boot build. >>>> @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM >>>> >>>> config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME >>>> string >>>> - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>> - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>> + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX >>>> + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X >>>> >>>> endif >>>> >>>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >>>> index cd26235342e4..cfefce0a77a4 100644 >>>> --- a/configs/ti_am62x_sk_defconfig >>>> +++ b/configs/ti_am62x_sk_defconfig >>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y >>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" >>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" >>>> BR2_TARGET_TI_K3=y >>>> +BR2_TARGET_TI_K3_SOC_AM62X=y >>>> BR2_TARGET_TI_K3_IMAGE_GEN=y >>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y >>>> BR2_TARGET_TI_K3_R5_LOADER=y >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" >>>> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig >>>> index 1befeb4ab96c..daf78dbffff8 100644 >>>> --- a/configs/ti_am64x_sk_defconfig >>>> +++ b/configs/ti_am64x_sk_defconfig >>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y >>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" >>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" >>>> BR2_TARGET_TI_K3=y >>>> +BR2_TARGET_TI_K3_SOC_AM64X=y >>>> BR2_TARGET_TI_K3_IMAGE_GEN=y >>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y >>>> BR2_TARGET_TI_K3_R5_LOADER=y >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" >>> > > > From romain.naour at smile.fr Tue Feb 20 10:03:54 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 11:03:54 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240220004100.3yzqapeplx6olarz@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> <20240220004100.3yzqapeplx6olarz@dasso> Message-ID: <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> Hello Andreas, Le 20/02/2024 ? 01:41, Andreas Dannenberg a ?crit?: > On Mon, Feb 19, 2024 at 12:24:52PM +0100, Romain Naour wrote: >> Hello Michael, >> >> Le 19/02/2024 ? 12:02, Michael Nazzareno Trimarchi a ?crit?: >>> Hi Romain >>> >>> On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: >>>> >>>> Hello Dario, >>>> >>>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>>>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes >>>>> high-security field-securable (HS-FS) silicon to optionally customize keys >>>>> and encryption for security applications. >>>>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, >>>>> which, however, was buggy. This series fixes the errors and bumps the Linux >>>>> kernel and U-Boot required for such a new device. >>>>> >>>>> This series, which in my humble opinion, should have been immediately >>>>> considered to correct the compilation errors in case of HS-FS devcies, has >>>>> seen an increase in patches in version 4 to remove the ti-k3-image-gen >>>>> package thanks to Binman. Additionally, it shares some modifications and >>>>> views on how to implement certain changes with the series >>>>> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. >>>>> Therefore, I think it is necessary not to run them in parallel but to decide >>>>> whether to merge one before the other or to consider a single series where >>>>> the patches can be coherent with each other. I am available for both solutions. >>>>> Let me know. >>>> >>>> Thanks for this new version. I beleive both series should be merged into one >>>> since we want to follow u-boot switch to binman, add more TI K3 SoC support and >>>> keeping exising am62x ans am64x working in GP or HS/HS-FS. >>>> >>> >>> Because the Dario patchset was sent before (end of November), it's >>> reasonable to review and adjust that one >>> and apply your changes for ti_j721e_sk on top of it. It think that is >>> a standard way to make people happy about >>> their work and contribution. >> >> Actually, the two series are about the same topic: TI K3 SoC support (GP, HS, >> HS-FS) not only AM62x-SK HS-FS devices >> >> But due to the complexity of the BSP, the boot flow (4 way to boot!) and the >> switch from custom tool to binman... this series is really difficult to review >> without having a good understanding of TI K3 architecture peculiarity and having >> one of each TI evaluation boards ? > > Although I helped conceive some of this and the associated tooling early > on, some of the what may look strange architectural decisions were driven > by different use cases and requirements for the different devices > (especially around automotive fast/early boot, but also security) in > combination with limited on-chip SRAM... So this where we are at now. A > future AM6x device variant will have yet another boot flow, but I can > already say it will be very much simplified over what we have today :) About existing boot flow, I found two recent commit in u-boot that state that the "Split binary" (that requires sysfw.itb) is already a legacy boot flow: arm: dts: k3-binman: Add support for FIT templates Add templates for FIT images used extensively across K3 boards with most of the code common. This includes the FIT portions of: - tispl.bin - u-boot.img - sysfw.itb (in case of legacy boot flow) https://gitlab.com/u-boot/u-boot/-/commit/b153bad0f14168d5fcc02ba6bf1a2cd98daba9b5 arm: dts: k3-*-binman: Move to using templated FITs Reduce redundancy in code by using templates to generate the A72 boot binaries (tispl.bin and u-boot.img) as well as R5 boot binary sysfw.itb (for legacy boot following devices J721E and AM65x). https://gitlab.com/u-boot/u-boot/-/commit/4509b9ff0b8cb26907f9e9c3571b43565c859275 Which one should be recommended or avoided for a new design? Best regards, Romain > >> The series (based on Dario's work) about ti_j721e_sk suggested to remove TI >> custom tools replaced by binman along with other improvements. >> >> I'll way for v5 and rebase the ti_j721e_sk on top of it. > > Thank you Romain for your buy-in. Let's focus on getting Dario's series > in good shape and then move onto yours. I'd also like to re-introduce > graphics (I had that working before) but I need to wait for all the > "baseline" stuff to settle first. > > > -- > Andreas Dannenberg > Texas Instruments Inc > > > >> >> Best regards, >> Romain >> >> >>> >>> Michael >>> >>>> My main concern is to avoid adding a new package for a tool that is already >>>> deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. >>>> >>>> Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". >>>> >>>> [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html >>>> >>>> Best regards, >>>> Romain >>>> >>>>> From bugzilla at busybox.net Tue Feb 20 11:33:44 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 20 Feb 2024 11:33:44 +0000 Subject: [Buildroot] [Bug 15952] New: Grub fails to load large rootfs files Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15952 Bug ID: 15952 Summary: Grub fails to load large rootfs files Product: buildroot Version: 2023.11.1 Hardware: PC OS: Linux Status: NEW Severity: critical Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: ian_ormshaw at waters.com CC: buildroot at uclibc.org Target Milestone: --- Created attachment 9715 --> https://bugs.busybox.net/attachment.cgi?id=9715&action=edit Patch file In some systems grub fails to load the rootfs.cpio as an initrd if it is too large. On the system I am currently testing a 61MB file load successfully while a 174MB file does not. With the larger file grub outputs an out of memory error. The attached patch file allows the system to boot successfully. -- You are receiving this mail because: You are on the CC list for the bug. From bugzilla at busybox.net Tue Feb 20 11:36:00 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 20 Feb 2024 11:36:00 +0000 Subject: [Buildroot] [Bug 15952] Grub fails to load large rootfs files In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15952 Dr I J Ormshaw changed: What |Removed |Added ---------------------------------------------------------------------------- Host| |x86_64 Target| |x86_64 -- You are receiving this mail because: You are on the CC list for the bug. From buildroot at bubu1.eu Tue Feb 20 13:20:28 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 20 Feb 2024 14:20:28 +0100 Subject: [Buildroot] [PATCH 0/2] Fix flutter build failure In-Reply-To: References: <20240219095155.2758428-1-anaumann@ultratronik.de> Message-ID: Hi Andreas, Yann, all On 19.02.24 22:23, Yann E. MORIN wrote: > Andreas, All, > > On 2024-02-19 10:51 +0100, Andreas Naumann spake thusly: >> Hello Adam, all, >> I was motivated to give flutter a spin after your talk at FOSDEM, >> however the recent bump to Python 3.12.1 broke some script during >> the flutter-engine configure step. >> Fortunately now a new major stable version has been released 3.19.0, >> which contains a patch for this. >> >> After bumping engine and sdk they successfully build again, as does >> creating the flutter bundles which you provided in >> https://github.com/aduskett/buildroot-fosdem2024-flutter-demos >> >> I have not yet been able to run them using ivi-homescreen, but that's >> probably due to my target display/wayland setup. >> >> However, the flutter-gallery no longer builds with 3.19, even after >> bumping to the main HEAD. Their github README says >> "NOTE: The Flutter Gallery is now deprecated, and no longer being active >> maintained." >> I thought about including a patch for removal of the gallery package, >> but that would leave us with no example for how to create a flutter >> bundle. > > The upstream repository has also been "archived", which means it is > frozen and will never get fixed, ever. > > That's a bit unfortunate indeed, but we don't have much choice going > forward: we'll have to drop that package in the near future, but not > now: we're still considering reverting the python 3.12 version bump for > 2024.02, as it still causes issues in the target==build case, which > means we'd be able to keep the current flutter stack for 2024.02 LTS. > > Then, we can reintroduce python3, the flutter-engine bumps in this > series, and drop flutter-gfallery, hopefully introducing another package > as an example on how to build flutter packages... The archived repo page links to https://github.com/gskinnerTeam/flutter-wonderous-app and https://github.com/flutter/samples/tree/main/material_3_demo as replacement showcases. I wonder how long these will last... :-/. Marcus From buildroot at bubu1.eu Tue Feb 20 15:19:30 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Tue, 20 Feb 2024 16:19:30 +0100 Subject: [Buildroot] [PATCH] package/c-ares: bump to version 1.26.0 Message-ID: <20240220151931.2141682-1-buildroot@bubu1.eu> Changelog: https://c-ares.org/changelog.html#1_26_0 Signed-off-by: Marcus Hoffmann --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index c2897f6e44..ee097a53c9 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 de24a314844cb157909730828560628704f4f896d167dd7da0fa2fb93ea18b10 c-ares-1.20.1.tar.gz +sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz # Hash for license file sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 586fde9afb..29da6baa4b 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.20.1 +C_ARES_VERSION = 1.26.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom -- 2.34.1 From bugzilla at busybox.net Tue Feb 20 16:27:14 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Tue, 20 Feb 2024 16:27:14 +0000 Subject: [Buildroot] [Bug 15952] Grub fails to load large rootfs files In-Reply-To: References: Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15952 Yann E. MORIN changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |INVALID CC| |yann.morin.1998 at free.fr Status|NEW |RESOLVED --- Comment #1 from Yann E. MORIN --- Dr I J Ormshaw, All, This is a grub limitation, so please work with grub upstream to lift that limitation. Once they have accepted a fix, then we can see whether we can backport it or not. Regards, Yann E. MORIN. -- You are receiving this mail because: You are on the CC list for the bug. From yann.morin.1998 at free.fr Tue Feb 20 16:44:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 17:44:18 +0100 Subject: [Buildroot] [git commit] support/testing: remove hardcoded sleep from python-django test Message-ID: <20240220164504.ED86387965@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dc3f1faa8b8339a72da45efeeb3085045002ca28 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Instead of waiting for a hardcoded time of 30s we check periodically every second if the server is already up. If it isn't up after the full timeout (which is the same as before) expired the test fails. We need to redirect all output of the background started task to /dev/null now as it otherwise confuses the emulator.run() exit code parsing logic (as it gets out of order messages from the emulator). Signed-off-by: Marcus Hoffmann yann.morin.1998 at free.fr: simplify assert test] Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_python_django.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py index e1ca50f6d8..29e8ee0b2e 100644 --- a/support/testing/tests/package/test_python_django.py +++ b/support/testing/tests/package/test_python_django.py @@ -1,3 +1,5 @@ +import time + from tests.package.test_python import TestPythonPackageBase @@ -16,13 +18,16 @@ class TestPythonDjango(TestPythonPackageBase): self.assertIn("Operations to perform:", output[0]) self.assertEqual(exit_code, 0) - cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " - # give some time to setup the server - cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 > /dev/null 2>&1 & " self.assertRunOk(cmd, timeout=timeout) - - cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" - self.assertRunOk(cmd) + # give some time to setup the server + for attempt in range(30 * self.emulator.timeout_multiplier): + time.sleep(1) + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" + _, exit_code = self.emulator.run(cmd) + if exit_code == 0: + break + self.assertEqual(exit_code, 0, "Timeout while waiting for django server") class TestPythonPy3Django(TestPythonDjango): From yann.morin.1998 at free.fr Tue Feb 20 16:46:49 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 17:46:49 +0100 Subject: [Buildroot] [PATCH 1/2] support/testing: remove hardcoded sleep from python-django test In-Reply-To: <20240216131815.318315-1-buildroot@bubu1.eu> References: <20240216131815.318315-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-16 14:18 +0100, Marcus Hoffmann via buildroot spake thusly: > Instead of waiting for a hardcoded time of 30s we check periodically every > second if the server is already up. If it isn't up after the full timeout > (which is the same as before) expired the test fails. > > We need to redirect all output of the background started task to > /dev/null now as it otherwise confuses the emulator.run() exit code > parsing logic (as it gets out of order messages from the emulator). > > Signed-off-by: Marcus Hoffmann > --- > .../tests/package/test_python_django.py | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py > index e1ca50f6d8..0973467a2a 100644 > --- a/support/testing/tests/package/test_python_django.py > +++ b/support/testing/tests/package/test_python_django.py > @@ -1,3 +1,5 @@ > +import time > + > from tests.package.test_python import TestPythonPackageBase > > > @@ -16,13 +18,17 @@ class TestPythonDjango(TestPythonPackageBase): > self.assertIn("Operations to perform:", output[0]) > self.assertEqual(exit_code, 0) > > - cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " > - # give some time to setup the server > - cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) > + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 > /dev/null 2>&1 & " > self.assertRunOk(cmd, timeout=timeout) > - > - cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" > - self.assertRunOk(cmd) > + # give some time to setup the server > + for attempt in range(30 * self.emulator.timeout_multiplier): > + time.sleep(1) > + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" > + _, exit_code = self.emulator.run(cmd) > + if exit_code == 0: > + break > + else: > + self.assertTrue(False, "Timeout while waiting for django server") I was not very happy that we test success against a constant that we know is false; this does not look great.. Instead, I've slightly simplified the test: I dropped the else clause of the for-loop, and added an asserEqual that the exit_code is indeed 0 after the loop. Applied to master, thanks. Regards, Yann E. MORIN. > > class TestPythonPy3Django(TestPythonDjango): > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From bernd at kuhls.net Tue Feb 20 18:02:24 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Tue, 20 Feb 2024 19:02:24 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Bernd Kuhls to dnsmasq In-Reply-To: <20240220180224.42576-1-bernd@kuhls.net> References: <20240220180224.42576-1-bernd@kuhls.net> Message-ID: <20240220180224.42576-2-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index ba18d830d2..b9ca7eb647 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -350,6 +350,7 @@ F: package/bitcoin/ F: package/clamav/ F: package/dav1d/ F: package/dht/ +F: package/dnsmasq/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ -- 2.39.2 From bernd at kuhls.net Tue Feb 20 18:02:23 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Tue, 20 Feb 2024 19:02:23 +0100 Subject: [Buildroot] [PATCH 1/2] package/dnsmasq: security bump version to 2.90 Message-ID: <20240220180224.42576-1-bernd@kuhls.net> Changelog: https://thekelleys.org.uk/dnsmasq/CHANGELOG Release notes: https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q1/017430.html Fixes CVE 2023-50387 and CVE 2023-50868. Removed patch which is included in this release. Switched _SITE to https. Signed-off-by: Bernd Kuhls --- ...default-maximum-dns-udp-package-size.patch | 64 ------------------- package/dnsmasq/dnsmasq.hash | 4 +- package/dnsmasq/dnsmasq.mk | 4 +- 3 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch deleted file mode 100644 index 4dd17ec069..0000000000 --- a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch +++ /dev/null @@ -1,64 +0,0 @@ -From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Tue, 7 Mar 2023 22:07:46 +0000 -Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. -Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 - -http://www.dnsflagday.net/2020/ refers. - -Thanks to Xiang Li for the prompt. - -[dalang at gmx.at: backport from upstream] -Signed-off-by: Daniel Lang ---- - CHANGELOG | 9 ++++++++ - man/dnsmasq.8 | 3 ++- - src/config.h | 2 +- - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 3af20cf..52d8678 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -1,3 +1,12 @@ version 2.90 -+version 2.90 -+ Set the default maximum DNS UDP packet sice to 1232. This -+ has been the recommended value since 2020 because it's the -+ largest value that avoid fragmentation, and fragmentation -+ is just not reliable on the modern internet, especially -+ for IPv6. It's still possible to override this with -+ --edns-packet-max for special circumstances. -+ -+ - version 2.89 - Fix bug introduced in 2.88 (commit fe91134b) which can result - in corruption of the DNS cache internal data structures and -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 41e2e04..5acb935 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. - .TP - .B \-P, --edns-packet-max= - Specify the largest EDNS.0 UDP packet which is supported by the DNS --forwarder. Defaults to 4096, which is the RFC5625-recommended size. -+forwarder. Defaults to 1232, which is the recommended size following the -+DNS flag day in 2020. Only increase if you know what you are doing. - .TP - .B \-Q, --query-port= - Send outbound DNS queries from, and listen for their replies on, the -diff --git a/src/config.h b/src/config.h -index 1e7b30f..37b374e 100644 ---- a/src/config.h -+++ b/src/config.h -@@ -19,7 +19,7 @@ - #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ - #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ - #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ --#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ -+#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ - #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ - #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ - #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ --- -2.20.1 diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 02ffb2656b..d11e8af590 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc -sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc +sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 9c05857f22..9f342cb049 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,9 +4,9 @@ # ################################################################################ -DNSMASQ_VERSION = 2.89 +DNSMASQ_VERSION = 2.90 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz -DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq +DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ -- 2.39.2 From bernd at kuhls.net Tue Feb 20 18:07:08 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Tue, 20 Feb 2024 19:07:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/unbound: security bump version to 1.19.1 Message-ID: <20240220180708.55442-1-bernd@kuhls.net> Release notes: https://nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ Fixes CVE-2023-50387 & CVE-2023-50868. Signed-off-by: Bernd Kuhls --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 91e1d82dd2..843026abc7 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 -sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 +sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index fa7884e937..5128d0e420 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.17.1 +UNBOUND_VERSION = 1.19.1 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl -- 2.39.2 From bernd at kuhls.net Tue Feb 20 18:50:30 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Tue, 20 Feb 2024 19:50:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/bind: security bump version to 9.16.48 Message-ID: <20240220185030.92016-1-bernd@kuhls.net> Changelog: https://ftp.isc.org/isc/bind9/9.16.48/CHANGES Version 9.16.46 fixes - CVE-2023-4408 - CVE-2023-5517 - CVE-2023-5679 - CVE-2023-6516 Version 9.16.47 fixes CVE-2023-50387. Signed-off-by: Bernd Kuhls --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index d500b61128..482b046c8d 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.44/bind-9.16.44.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 cfaa953c36d5ca42d9584fcf9653d07c85527b59687e7c4d4cb8071272db6754 bind-9.16.44.tar.xz +sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 03ffcbec42..0d81ffabd6 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.44 +BIND_VERSION = 9.16.48 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. -- 2.39.2 From fontaine.fabrice at gmail.com Tue Feb 20 19:05:53 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 20 Feb 2024 20:05:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/ltris: drop unrecognized option Message-ID: <20240220190553.3237-1-fontaine.fabrice@gmail.com> --enable-sound has been dropped since version 1.2.4 and https://sourceforge.net/p/lgames/code/432: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-static, --disable-shared, --enable-sound Fixes: 61848605cd26d29f54c16de862aedba7cf334be4 Signed-off-by: Fabrice Fontaine --- package/ltris/ltris.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index 98902de44c..b34ac142ce 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -18,12 +18,9 @@ LTRIS_CONF_ENV = \ ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y) LTRIS_DEPENDENCIES += sdl_mixer host-pkgconf -LTRIS_CONF_OPTS += --enable-sound # configure script does NOT use pkg-config to figure out how to link # with sdl_mixer, breaking static linking as sdl_mixer can use libmad LTRIS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs SDL_mixer` -else -LTRIS_CONF_OPTS += --disable-sound endif $(eval $(autotools-package)) -- 2.43.0 From fontaine.fabrice at gmail.com Tue Feb 20 19:50:07 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Tue, 20 Feb 2024 20:50:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/uacme: fix build Message-ID: <20240220195007.380433-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump to version 1.7.5 in commit b7ee5f3b0e3ef703bafd007cc99da10312d99b9e and https://github.com/ndilieto/uacme/commit/fe826f4b1931ae508047d8b2693b5b6ac2cb21fd: checking if mmap(MAP_ANON|MAP_SHARED) works... configure: error: in `/home/autobuild/autobuild/instance-9/output-1/build/uacme-1.7.5': configure: error: cannot run test program while cross compiling Fixes: b7ee5f3b0e3ef703bafd007cc99da10312d99b9e - http://autobuild.buildroot.org/results/9715ade98f4894c07b640d151daa41813d2bec3a Signed-off-by: Fabrice Fontaine --- .../uacme/0001-Fix-cross-compilation.patch | 29 +++++++++++++++++++ package/uacme/uacme.mk | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 package/uacme/0001-Fix-cross-compilation.patch diff --git a/package/uacme/0001-Fix-cross-compilation.patch b/package/uacme/0001-Fix-cross-compilation.patch new file mode 100644 index 0000000000..cc384f2c36 --- /dev/null +++ b/package/uacme/0001-Fix-cross-compilation.patch @@ -0,0 +1,29 @@ +From cdf63e24dc475a558400c68714e32d32904e4c57 Mon Sep 17 00:00:00 2001 +From: Nicola Di Lieto +Date: Tue, 20 Feb 2024 01:05:00 +0100 +Subject: [PATCH] Fix cross compilation + +Commit fe826f4b1931ae508047d8b2693b5b6ac2cb21fd broke cross compilation + +Closes https://github.com/ndilieto/uacme/issues/79 + +Upstream: https://github.com/ndilieto/uacme/commit/cdf63e24dc475a558400c68714e32d32904e4c57 +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 77d1230..3bec75b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -355,7 +355,8 @@ if test "x$OPT_UALPN" != "xno"; then + AC_DEFINE(HAVE_MAP_DEVZERO, 1, [if mmap("/dev/zero", MAP_SHARED) works]) + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([ualpn requires MAP_ANON or mmap("/dev/zero", MAP_SHARED)])), ++ AC_MSG_ERROR([ualpn requires MAP_ANON or mmap("/dev/zero", MAP_SHARED)])) ++ ], [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include + int main() {return mmap(0, 4096, PROT_READ|PROT_WRITE, + MAP_ANON|MAP_SHARED, -1, 0) == MAP_FAILED;}])], diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index f02e522761..cd670ee951 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -12,6 +12,8 @@ UACME_SITE = $(call github,ndilieto,uacme,upstream/$(UACME_VERSION)) UACME_LICENSE = GPL-3.0+ UACME_LICENSE_FILES = COPYING UACME_DEPENDENCIES = libcurl +# We're patching configure.ac +UACME_AUTORECONF = YES UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBS="$(UACME_LIBS)" -- 2.43.0 From dannenberg at ti.com Tue Feb 20 20:04:14 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Tue, 20 Feb 2024 14:04:14 -0600 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> <20240220004100.3yzqapeplx6olarz@dasso> <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> Message-ID: <20240220200414.2bsvqvaeltqhsulc@dasso> Hi Romain, On Tue, Feb 20, 2024 at 11:03:54AM +0100, Romain Naour wrote: > Hello Andreas, > > Le 20/02/2024 ? 01:41, Andreas Dannenberg a ?crit?: > > On Mon, Feb 19, 2024 at 12:24:52PM +0100, Romain Naour wrote: > >> Hello Michael, > >> > >> Le 19/02/2024 ? 12:02, Michael Nazzareno Trimarchi a ?crit?: > >>> Hi Romain > >>> > >>> On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: > >>>> > >>>> Hello Dario, > >>>> > >>>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > >>>>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes > >>>>> high-security field-securable (HS-FS) silicon to optionally customize keys > >>>>> and encryption for security applications. > >>>>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > >>>>> which, however, was buggy. This series fixes the errors and bumps the Linux > >>>>> kernel and U-Boot required for such a new device. > >>>>> > >>>>> This series, which in my humble opinion, should have been immediately > >>>>> considered to correct the compilation errors in case of HS-FS devcies, has > >>>>> seen an increase in patches in version 4 to remove the ti-k3-image-gen > >>>>> package thanks to Binman. Additionally, it shares some modifications and > >>>>> views on how to implement certain changes with the series > >>>>> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. > >>>>> Therefore, I think it is necessary not to run them in parallel but to decide > >>>>> whether to merge one before the other or to consider a single series where > >>>>> the patches can be coherent with each other. I am available for both solutions. > >>>>> Let me know. > >>>> > >>>> Thanks for this new version. I beleive both series should be merged into one > >>>> since we want to follow u-boot switch to binman, add more TI K3 SoC support and > >>>> keeping exising am62x ans am64x working in GP or HS/HS-FS. > >>>> > >>> > >>> Because the Dario patchset was sent before (end of November), it's > >>> reasonable to review and adjust that one > >>> and apply your changes for ti_j721e_sk on top of it. It think that is > >>> a standard way to make people happy about > >>> their work and contribution. > >> > >> Actually, the two series are about the same topic: TI K3 SoC support (GP, HS, > >> HS-FS) not only AM62x-SK HS-FS devices > >> > >> But due to the complexity of the BSP, the boot flow (4 way to boot!) and the > >> switch from custom tool to binman... this series is really difficult to review > >> without having a good understanding of TI K3 architecture peculiarity and having > >> one of each TI evaluation boards ? > > > > Although I helped conceive some of this and the associated tooling early > > on, some of the what may look strange architectural decisions were driven > > by different use cases and requirements for the different devices > > (especially around automotive fast/early boot, but also security) in > > combination with limited on-chip SRAM... So this where we are at now. A > > future AM6x device variant will have yet another boot flow, but I can > > already say it will be very much simplified over what we have today :) > > About existing boot flow, I found two recent commit in u-boot that state that > the "Split binary" (that requires sysfw.itb) is already a legacy boot flow: It's called "legacy boot flow" because it was the boot flow used on the first K3 devices that were released (AM65x, J721E). This boot flow was not used on follow-on devices. The characteristics of this boot flow is that the initial FW image that gets loaded (tiboot3.bin) doesn't contain any device firmwares, but only a bootloader (such as U-Boot SPL). Then this boot loader will load the System Firmware firmware + config data blob (sysfw.itb) into the dedicated core (called "DMSC" = Device Manager and Security Controller). And then addiitonal boot stages will be loaded. These devices require this boot flow, and with this it is required to be supported by U-Boot (and any Linux distribution or build systems that build on that). TI is still making/selling those "legacy boot flow" devices, and will continue to do so for a very long time. One promiment community incarnation that you are probably aware of is the BeagleBone AI-64. > arm: dts: k3-binman: Add support for FIT templates > > Add templates for FIT images used extensively across K3 boards with most > of the code common. This includes the FIT portions of: > - tispl.bin > - u-boot.img > - sysfw.itb (in case of legacy boot flow) > > https://gitlab.com/u-boot/u-boot/-/commit/b153bad0f14168d5fcc02ba6bf1a2cd98daba9b5 > > arm: dts: k3-*-binman: Move to using templated FITs > > Reduce redundancy in code by using templates to generate the A72 boot > binaries (tispl.bin and u-boot.img) as well as R5 boot binary sysfw.itb > (for legacy boot following devices J721E and AM65x). > > https://gitlab.com/u-boot/u-boot/-/commit/4509b9ff0b8cb26907f9e9c3571b43565c859275 > > Which one should be recommended or avoided for a new design? Those commits are just a simplification to reduce duplication. As per earlier comment the "legacy boot flow" is something we continue needing to support. It isn't supposed to imply that those devices are about to disappear. Not sure if this answered your question; please let me know. -- Andreas Dannenberg Texas Instruments Inc > > Best regards, > Romain > > > > > >> The series (based on Dario's work) about ti_j721e_sk suggested to remove TI > >> custom tools replaced by binman along with other improvements. > >> > >> I'll way for v5 and rebase the ti_j721e_sk on top of it. > > > > Thank you Romain for your buy-in. Let's focus on getting Dario's series > > in good shape and then move onto yours. I'd also like to re-introduce > > graphics (I had that working before) but I need to wait for all the > > "baseline" stuff to settle first. > > > > > > -- > > Andreas Dannenberg > > Texas Instruments Inc > > > > > > > >> > >> Best regards, > >> Romain > >> > >> > >>> > >>> Michael > >>> > >>>> My main concern is to avoid adding a new package for a tool that is already > >>>> deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. > >>>> > >>>> Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". > >>>> > >>>> [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html > >>>> > >>>> Best regards, > >>>> Romain > >>>> > >>>>> > From dannenberg at ti.com Tue Feb 20 20:32:00 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Tue, 20 Feb 2024 14:32:00 -0600 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> <20240220012848.76amyog5pecsgld4@dasso> Message-ID: <20240220203200.uq2dpvky2rbv6tcw@dasso> Dear Romain, Dario, Thomas: On Tue, Feb 20, 2024 at 10:32:14AM +0100, Romain Naour wrote: > Hi Dario, > > Le 20/02/2024 ? 10:05, Dario Binacchi a ?crit?: > > Hi Andreas, Romain, All > > > > On Tue, Feb 20, 2024 at 2:28?AM Andreas Dannenberg wrote: > >> > >> Romain, Dario, > >> > >> On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: > >>> Hello Dario, > >>> > >>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > >>>> Recent versions of U-Boot can use Binman to compile and sign the generated > >>>> binaries, thus making the use of custom tools like ti-k3-image-gen no > >>>> longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > >>>> configured and used outside of it. This patch allows setting such options > >>>> even if the package is not enabled. > >>> > >>> I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux > >>> kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. > >> > >> There were discussions/suggestions around this before by Yann E Morin > >> [1] and Thomas Petazzoni [2]. I think the gist of it was to move the > >> selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing > >> all the K3 SoC specific selections. And then other packages and Kconfig > >> menues can depend on it more cleanly. Like it's currently done with > >> package/freescale-imx/Config.in. This would also bring some consistency > >> in how those NXP and TI device families are managed, which will make for > >> a better end-user experience I think. > > > > If I'm not mistaken, I think the patches: > > [18/20] boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > > [17/20] boot: move ti-k3-* packages to 'ti-k3' directory > > Are heading in the direction of what we find in > > package/freescale-imx/, with the only difference being > > that in our case, we're under boot. > > So, can I consider these two patches correct? Yes the general direction those are headed is a good... > Yes, can you try to move ti-k3 to package directory in V5 ? > It would also be used later by the GPU rogue firmwares. ...and yes, for alignment sake with IMX it would be even better to have it in package/, while also keeping some alignment with the naming of the CONFIG options (hence my comment with 'BR2_PACKAGE_TI_K3_PLATFORM'). Hi Thomas, assuming we create a new package called 'package/ti-k3' I was trying to figure out what would be the best way to name the associated CONFIG options that control device security settings and can be used to determine which device is being used (for later uses in context of GPU drivers and other device capabilities)? I see different naming conventions being used, like this: 1) BR2_PACKAGE_* 2) BR2_TARGET_* 3) BR2_BOOT_* Seems like BR2_TARGET_* what we have now would be most appropriate, but then the IMX stuff uses BR2_PACKAGE_*, which *seems* to be reserved for "userspace" (non-boot) packages as far as I can tell from my poor-man's research. While I'd like to align things, the use of the BR2_PACKAGE_* prefix may or may not be appropriate for our new additions here? Just was hoping to get some guidance here so we don't need to re-work this too many times. -- Andreas Dannenberg Texas Instruments Inc > > Please add a comment in the commit log that we make an exception to the rule "no > subdirectory in package directory". > > Thanks! > > Best regards, > Romain > > > > > > Thanks and regards, > > Dario > > > >> > >> > >> > >> -- > >> Andreas Dannenberg > >> Texas Instruments Inc > >> > >> [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html > >> [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html > >> > >> > >>> > >>> Best regards, > >>> Romain > >>> > >>> > >>>> > >>>> --- > >>>> > >>>> Added in v4 > >>>> > >>>> Signed-off-by: Dario Binacchi > >>>> --- > >>>> boot/ti-k3/Config.in | 46 ++++++++++++++ > >>>> boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > >>>> boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > >>>> boot/uboot/Config.in | 7 +-- > >>>> configs/ti_am62x_sk_defconfig | 2 +- > >>>> configs/ti_am64x_sk_defconfig | 2 +- > >>>> 6 files changed, 59 insertions(+), 67 deletions(-) > >>>> > >>>> diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > >>>> index 06dda2f156a9..9e508326c9c8 100644 > >>>> --- a/boot/ti-k3/Config.in > >>>> +++ b/boot/ti-k3/Config.in > >>>> @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > >>>> > >>>> if BR2_TARGET_TI_K3 > >>>> > >>>> +choice > >>>> + prompt "SoC family" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SOC_AM62AX > >>>> + bool "am62ax" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SOC_AM62X > >>>> + bool "am62x" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SOC_AM64X > >>>> + bool "am64x" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SOC_AM65X > >>>> + bool "am65x" > >>>> + > >>>> +endchoice > >>>> + > >>>> +choice > >>>> + prompt "Security type" > >>>> + help > >>>> + The target SoC security type option. > >>>> + > >>>> +config BR2_TARGET_TI_K3_SECTYPE_GP > >>>> + bool "gp" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > >>>> + bool "hs-fs" > >>>> + > >>>> +config BR2_TARGET_TI_K3_SECTYPE_HS > >>>> + bool "hs" > >>>> + > >>>> +endchoice > >>>> + > >>>> +config BR2_TARGET_TI_K3_SOC > >>>> + string > >>>> + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>> + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > >>>> + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > >>>> + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > >>>> + > >>>> +config BR2_TARGET_TI_K3_SECTYPE > >>>> + string > >>>> + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > >>>> + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > >>>> + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > >>>> + > >>>> source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > >>>> source "boot/ti-k3/ti-k3-core-secdev/Config.in" > >>>> source "boot/ti-k3/ti-k3-image-gen/Config.in" > >>>> diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > >>>> index 38d1598d9fc0..2d53d62dd4ee 100644 > >>>> --- a/boot/ti-k3/ti-k3-image-gen/Config.in > >>>> +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > >>>> @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > >>>> bool "ti-k3-image-gen" > >>>> depends on BR2_TARGET_TI_K3_R5_LOADER > >>>> select BR2_TARGET_TI_K3_BOOT_FIRMWARE > >>>> - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > >>>> # We need FIT support in uboot-tools, which is why we select a > >>>> # host package > >>>> select BR2_PACKAGE_HOST_UBOOT_TOOLS > >>>> @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > >>>> https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > >>>> > >>>> if BR2_TARGET_TI_K3_IMAGE_GEN > >>>> -choice > >>>> - prompt "SoC family" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>> - bool "am62ax" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>> - bool "am62x" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>> - bool "am64x" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>> - bool "am65x" > >>>> - > >>>> -endchoice > >>>> - > >>>> -choice > >>>> - prompt "Security type" > >>>> - help > >>>> - The target SoC security type option for image gen. Valid > >>>> - options are "gp" for General Purpose devices, "hs-fs" for > >>>> - High Security - Field Securable devices, or "hs" for High > >>>> - Security - Security Enforcing devices. Note for all High > >>>> - Security device variants the TI_SECURE_DEV_PKG environmental > >>>> - variable must be defined at build time pointing to a valid > >>>> - core-secdev-k3 folder location, otherwise the build will > >>>> - fail, see > >>>> - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > >>>> - bool "gp" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > >>>> - bool "hs-fs" > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>> - bool "hs" > >>>> - > >>>> -endchoice > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > >>>> - string > >>>> - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>> - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>> - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>> - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>> > >>>> config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > >>>> string > >>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>> - > >>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > >>>> - string > >>>> - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > >>>> - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > >>>> - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > >>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > >>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > >>>> > >>>> endif > >>>> diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>> index 74b4fcb4bf89..834d8f7d5cd5 100644 > >>>> --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>> +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>> @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > >>>> $(BR2_MAKE_HOST_DEPENDENCY) > >>>> > >>>> TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > >>>> -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > >>>> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > >>>> +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > >>>> +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > >>>> > >>>> -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > >>>> +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > >>>> TI_K3_IMAGE_GEN_SYSFW = \ > >>>> $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > >>>> else > >>>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > >>>> index beafb38930db..1a9d21e7c6d1 100644 > >>>> --- a/boot/uboot/Config.in > >>>> +++ b/boot/uboot/Config.in > >>>> @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > >>>> bool "U-Boot needs TI K3 Device Manager (DM)" > >>>> # We use the SoC selection defined for the ti-k3-image-gen > >>>> # package > >>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN > >>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>> + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > >>>> help > >>>> Some TI K3 devices need the Device Manager (DM) firmware to > >>>> be available for the U-Boot build. > >>>> @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > >>>> > >>>> config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > >>>> string > >>>> - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>> - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>> + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>> + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > >>>> > >>>> endif > >>>> > >>>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > >>>> index cd26235342e4..cfefce0a77a4 100644 > >>>> --- a/configs/ti_am62x_sk_defconfig > >>>> +++ b/configs/ti_am62x_sk_defconfig > >>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > >>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > >>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > >>>> BR2_TARGET_TI_K3=y > >>>> +BR2_TARGET_TI_K3_SOC_AM62X=y > >>>> BR2_TARGET_TI_K3_IMAGE_GEN=y > >>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > >>>> BR2_TARGET_TI_K3_R5_LOADER=y > >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > >>>> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > >>>> index 1befeb4ab96c..daf78dbffff8 100644 > >>>> --- a/configs/ti_am64x_sk_defconfig > >>>> +++ b/configs/ti_am64x_sk_defconfig > >>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > >>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > >>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > >>>> BR2_TARGET_TI_K3=y > >>>> +BR2_TARGET_TI_K3_SOC_AM64X=y > >>>> BR2_TARGET_TI_K3_IMAGE_GEN=y > >>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > >>>> BR2_TARGET_TI_K3_R5_LOADER=y > >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > >>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > >>> > > > > > > > From yann.morin.1998 at free.fr Tue Feb 20 20:44:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:44:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/uacme: fix build In-Reply-To: <20240220195007.380433-1-fontaine.fabrice@gmail.com> References: <20240220195007.380433-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-20 20:50 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump to version 1.7.5 in > commit b7ee5f3b0e3ef703bafd007cc99da10312d99b9e and > https://github.com/ndilieto/uacme/commit/fe826f4b1931ae508047d8b2693b5b6ac2cb21fd: > > checking if mmap(MAP_ANON|MAP_SHARED) works... configure: error: in `/home/autobuild/autobuild/instance-9/output-1/build/uacme-1.7.5': > configure: error: cannot run test program while cross compiling > > Fixes: b7ee5f3b0e3ef703bafd007cc99da10312d99b9e > - http://autobuild.buildroot.org/results/9715ade98f4894c07b640d151daa41813d2bec3a > > Signed-off-by: Fabrice Fontaine [--SNIP--] > diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk > index f02e522761..cd670ee951 100644 > --- a/package/uacme/uacme.mk > +++ b/package/uacme/uacme.mk > @@ -12,6 +12,8 @@ UACME_SITE = $(call github,ndilieto,uacme,upstream/$(UACME_VERSION)) > UACME_LICENSE = GPL-3.0+ > UACME_LICENSE_FILES = COPYING > UACME_DEPENDENCIES = libcurl > +# We're patching configure.ac I've slightly reworded this comment to reference the patch filename, so that's it is easier to notice when the patch is dropped that we should also drop autoreconf. Applied to master, thanks. Regards, Yann E. MORIN. > +UACME_AUTORECONF = YES > > UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBS="$(UACME_LIBS)" > > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 20:43:00 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:43:00 +0100 Subject: [Buildroot] [git commit] package/uacme: fix build Message-ID: <20240220204638.7A82987981@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3e48306a43ed8f21dbd2c1899e0ca02e7e460801 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump to version 1.7.5 in commit b7ee5f3b0e3ef703bafd007cc99da10312d99b9e and https://github.com/ndilieto/uacme/commit/fe826f4b1931ae508047d8b2693b5b6ac2cb21fd: checking if mmap(MAP_ANON|MAP_SHARED) works... configure: error: in `/home/autobuild/autobuild/instance-9/output-1/build/uacme-1.7.5': configure: error: cannot run test program while cross compiling Fixes: b7ee5f3b0e3ef703bafd007cc99da10312d99b9e - http://autobuild.buildroot.org/results/9715ade98f4894c07b640d151daa41813d2bec3a Signed-off-by: Fabrice Fontaine [yann.morin.1998 at free.fr: reference patch in comment] Signed-off-by: Yann E. MORIN --- package/uacme/0001-Fix-cross-compilation.patch | 29 ++++++++++++++++++++++++++ package/uacme/uacme.mk | 3 +++ 2 files changed, 32 insertions(+) diff --git a/package/uacme/0001-Fix-cross-compilation.patch b/package/uacme/0001-Fix-cross-compilation.patch new file mode 100644 index 0000000000..cc384f2c36 --- /dev/null +++ b/package/uacme/0001-Fix-cross-compilation.patch @@ -0,0 +1,29 @@ +From cdf63e24dc475a558400c68714e32d32904e4c57 Mon Sep 17 00:00:00 2001 +From: Nicola Di Lieto +Date: Tue, 20 Feb 2024 01:05:00 +0100 +Subject: [PATCH] Fix cross compilation + +Commit fe826f4b1931ae508047d8b2693b5b6ac2cb21fd broke cross compilation + +Closes https://github.com/ndilieto/uacme/issues/79 + +Upstream: https://github.com/ndilieto/uacme/commit/cdf63e24dc475a558400c68714e32d32904e4c57 +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 77d1230..3bec75b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -355,7 +355,8 @@ if test "x$OPT_UALPN" != "xno"; then + AC_DEFINE(HAVE_MAP_DEVZERO, 1, [if mmap("/dev/zero", MAP_SHARED) works]) + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([ualpn requires MAP_ANON or mmap("/dev/zero", MAP_SHARED)])), ++ AC_MSG_ERROR([ualpn requires MAP_ANON or mmap("/dev/zero", MAP_SHARED)])) ++ ], [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include + int main() {return mmap(0, 4096, PROT_READ|PROT_WRITE, + MAP_ANON|MAP_SHARED, -1, 0) == MAP_FAILED;}])], diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index f02e522761..0fcb5c5c34 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -13,6 +13,9 @@ UACME_LICENSE = GPL-3.0+ UACME_LICENSE_FILES = COPYING UACME_DEPENDENCIES = libcurl +# 0001-Fix-cross-compilation.patch touches configure.ac +UACME_AUTORECONF = YES + UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBS="$(UACME_LIBS)" ifeq ($(BR2_PACKAGE_GNUTLS),y) From yann.morin.1998 at free.fr Tue Feb 20 20:46:44 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:46:44 +0100 Subject: [Buildroot] [git commit] package/ltris: drop unrecognized option Message-ID: <20240220204905.26ABD87989@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9af20d6e1e1139e59ed3dd9aaf015e72f1e2db8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master --enable-sound has been dropped since version 1.2.4 and https://sourceforge.net/p/lgames/code/432: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-static, --disable-shared, --enable-sound Fixes: 61848605cd26d29f54c16de862aedba7cf334be4 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ltris/ltris.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index 98902de44c..b34ac142ce 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -18,12 +18,9 @@ LTRIS_CONF_ENV = \ ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y) LTRIS_DEPENDENCIES += sdl_mixer host-pkgconf -LTRIS_CONF_OPTS += --enable-sound # configure script does NOT use pkg-config to figure out how to link # with sdl_mixer, breaking static linking as sdl_mixer can use libmad LTRIS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs SDL_mixer` -else -LTRIS_CONF_OPTS += --disable-sound endif $(eval $(autotools-package)) From yann.morin.1998 at free.fr Tue Feb 20 20:49:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:49:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/ltris: drop unrecognized option In-Reply-To: <20240220190553.3237-1-fontaine.fabrice@gmail.com> References: <20240220190553.3237-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-20 20:05 +0100, Fabrice Fontaine spake thusly: > --enable-sound has been dropped since version 1.2.4 and > https://sourceforge.net/p/lgames/code/432: > > configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-static, --disable-shared, --enable-sound > > Fixes: 61848605cd26d29f54c16de862aedba7cf334be4 > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/ltris/ltris.mk | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk > index 98902de44c..b34ac142ce 100644 > --- a/package/ltris/ltris.mk > +++ b/package/ltris/ltris.mk > @@ -18,12 +18,9 @@ LTRIS_CONF_ENV = \ > > ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y) > LTRIS_DEPENDENCIES += sdl_mixer host-pkgconf > -LTRIS_CONF_OPTS += --enable-sound > # configure script does NOT use pkg-config to figure out how to link > # with sdl_mixer, breaking static linking as sdl_mixer can use libmad > LTRIS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs SDL_mixer` > -else > -LTRIS_CONF_OPTS += --disable-sound > endif > > $(eval $(autotools-package)) > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 20:59:26 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:59:26 +0100 Subject: [Buildroot] [PATCH 1/2] package/dnsmasq: security bump version to 2.90 In-Reply-To: <20240220180224.42576-1-bernd@kuhls.net> References: <20240220180224.42576-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-20 19:02 +0100, Bernd Kuhls spake thusly: > Changelog: https://thekelleys.org.uk/dnsmasq/CHANGELOG > > Release notes: > https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q1/017430.html > > Fixes CVE 2023-50387 and CVE 2023-50868. > > Removed patch which is included in this release. > Switched _SITE to https. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...default-maximum-dns-udp-package-size.patch | 64 ------------------- > package/dnsmasq/dnsmasq.hash | 4 +- > package/dnsmasq/dnsmasq.mk | 4 +- > 3 files changed, 4 insertions(+), 68 deletions(-) > delete mode 100644 package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch > > diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch > deleted file mode 100644 > index 4dd17ec069..0000000000 > --- a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch > +++ /dev/null > @@ -1,64 +0,0 @@ > -From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 > -From: Simon Kelley > -Date: Tue, 7 Mar 2023 22:07:46 +0000 > -Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. > -Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 > - > -http://www.dnsflagday.net/2020/ refers. > - > -Thanks to Xiang Li for the prompt. > - > -[dalang at gmx.at: backport from upstream] > -Signed-off-by: Daniel Lang > ---- > - CHANGELOG | 9 ++++++++ > - man/dnsmasq.8 | 3 ++- > - src/config.h | 2 +- > - 3 files changed, 12 insertions(+), 2 deletions(-) > - > -diff --git a/CHANGELOG b/CHANGELOG > -index 3af20cf..52d8678 100644 > ---- a/CHANGELOG > -+++ b/CHANGELOG > -@@ -1,3 +1,12 @@ version 2.90 > -+version 2.90 > -+ Set the default maximum DNS UDP packet sice to 1232. This > -+ has been the recommended value since 2020 because it's the > -+ largest value that avoid fragmentation, and fragmentation > -+ is just not reliable on the modern internet, especially > -+ for IPv6. It's still possible to override this with > -+ --edns-packet-max for special circumstances. > -+ > -+ > - version 2.89 > - Fix bug introduced in 2.88 (commit fe91134b) which can result > - in corruption of the DNS cache internal data structures and > -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 > -index 41e2e04..5acb935 100644 > ---- a/man/dnsmasq.8 > -+++ b/man/dnsmasq.8 > -@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. > - .TP > - .B \-P, --edns-packet-max= > - Specify the largest EDNS.0 UDP packet which is supported by the DNS > --forwarder. Defaults to 4096, which is the RFC5625-recommended size. > -+forwarder. Defaults to 1232, which is the recommended size following the > -+DNS flag day in 2020. Only increase if you know what you are doing. > - .TP > - .B \-Q, --query-port= > - Send outbound DNS queries from, and listen for their replies on, the > -diff --git a/src/config.h b/src/config.h > -index 1e7b30f..37b374e 100644 > ---- a/src/config.h > -+++ b/src/config.h > -@@ -19,7 +19,7 @@ > - #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ > - #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ > - #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ > --#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ > -+#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ > - #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ > - #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ > - #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ > --- > -2.20.1 > diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash > index 02ffb2656b..d11e8af590 100644 > --- a/package/dnsmasq/dnsmasq.hash > +++ b/package/dnsmasq/dnsmasq.hash > @@ -1,6 +1,6 @@ > # Locally calculated after checking pgp signature > -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc > -sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz > +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc > +sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz > # Locally calculated > sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 > diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk > index 9c05857f22..9f342cb049 100644 > --- a/package/dnsmasq/dnsmasq.mk > +++ b/package/dnsmasq/dnsmasq.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -DNSMASQ_VERSION = 2.89 > +DNSMASQ_VERSION = 2.90 > DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz > -DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq > +DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq > DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" > DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" > DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 20:51:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:51:14 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Bernd Kuhls to dnsmasq Message-ID: <20240220205958.6692F87988@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0dab037e14813b2f262dbde6b85b42d98b00c120 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..f0e16af162 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -350,6 +350,7 @@ F: package/bitcoin/ F: package/clamav/ F: package/dav1d/ F: package/dht/ +F: package/dnsmasq/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ From yann.morin.1998 at free.fr Tue Feb 20 20:51:18 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:51:18 +0100 Subject: [Buildroot] [git commit] package/unbound: security bump version to 1.19.1 Message-ID: <20240220205958.735D0879A4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9175bf264909cefa942d26deea9035553246ecad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ Fixes CVE-2023-50387 & CVE-2023-50868. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 91e1d82dd2..843026abc7 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 -sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 +sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index fa7884e937..5128d0e420 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.17.1 +UNBOUND_VERSION = 1.19.1 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl From yann.morin.1998 at free.fr Tue Feb 20 20:51:22 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:51:22 +0100 Subject: [Buildroot] [git commit] package/bind: security bump version to 9.16.48 Message-ID: <20240220205958.8102D879A5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7ca60941b748d8d16796de22400fbe6d7e678b04 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://ftp.isc.org/isc/bind9/9.16.48/CHANGES Version 9.16.46 fixes - CVE-2023-4408 - CVE-2023-5517 - CVE-2023-5679 - CVE-2023-6516 Version 9.16.47 fixes CVE-2023-50387. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index d500b61128..482b046c8d 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.44/bind-9.16.44.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 cfaa953c36d5ca42d9584fcf9653d07c85527b59687e7c4d4cb8071272db6754 bind-9.16.44.tar.xz +sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 03ffcbec42..0d81ffabd6 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.44 +BIND_VERSION = 9.16.48 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From yann.morin.1998 at free.fr Tue Feb 20 20:51:10 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 21:51:10 +0100 Subject: [Buildroot] [git commit] package/dnsmasq: security bump version to 2.90 Message-ID: <20240220205958.5BECF879A2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=213cfb34358d86a65deecdb9f5b11a20ad0895d1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://thekelleys.org.uk/dnsmasq/CHANGELOG Release notes: https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q1/017430.html Fixes CVE 2023-50387 and CVE 2023-50868. Removed patch which is included in this release. Switched _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...-set-default-maximum-dns-udp-package-size.patch | 64 ---------------------- package/dnsmasq/dnsmasq.hash | 4 +- package/dnsmasq/dnsmasq.mk | 4 +- 3 files changed, 4 insertions(+), 68 deletions(-) diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch deleted file mode 100644 index 4dd17ec069..0000000000 --- a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch +++ /dev/null @@ -1,64 +0,0 @@ -From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Tue, 7 Mar 2023 22:07:46 +0000 -Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. -Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 - -http://www.dnsflagday.net/2020/ refers. - -Thanks to Xiang Li for the prompt. - -[dalang at gmx.at: backport from upstream] -Signed-off-by: Daniel Lang ---- - CHANGELOG | 9 ++++++++ - man/dnsmasq.8 | 3 ++- - src/config.h | 2 +- - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 3af20cf..52d8678 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -1,3 +1,12 @@ version 2.90 -+version 2.90 -+ Set the default maximum DNS UDP packet sice to 1232. This -+ has been the recommended value since 2020 because it's the -+ largest value that avoid fragmentation, and fragmentation -+ is just not reliable on the modern internet, especially -+ for IPv6. It's still possible to override this with -+ --edns-packet-max for special circumstances. -+ -+ - version 2.89 - Fix bug introduced in 2.88 (commit fe91134b) which can result - in corruption of the DNS cache internal data structures and -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 41e2e04..5acb935 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. - .TP - .B \-P, --edns-packet-max= - Specify the largest EDNS.0 UDP packet which is supported by the DNS --forwarder. Defaults to 4096, which is the RFC5625-recommended size. -+forwarder. Defaults to 1232, which is the recommended size following the -+DNS flag day in 2020. Only increase if you know what you are doing. - .TP - .B \-Q, --query-port= - Send outbound DNS queries from, and listen for their replies on, the -diff --git a/src/config.h b/src/config.h -index 1e7b30f..37b374e 100644 ---- a/src/config.h -+++ b/src/config.h -@@ -19,7 +19,7 @@ - #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ - #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ - #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ --#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ -+#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ - #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ - #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ - #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ --- -2.20.1 diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 02ffb2656b..d11e8af590 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc -sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc +sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 9c05857f22..9f342cb049 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,9 +4,9 @@ # ################################################################################ -DNSMASQ_VERSION = 2.89 +DNSMASQ_VERSION = 2.90 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz -DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq +DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ From yann.morin.1998 at free.fr Tue Feb 20 21:00:12 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:00:12 +0100 Subject: [Buildroot] [PATCH 2/2] DEVELOPERS: add Bernd Kuhls to dnsmasq In-Reply-To: <20240220180224.42576-2-bernd@kuhls.net> References: <20240220180224.42576-1-bernd@kuhls.net> <20240220180224.42576-2-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-20 19:02 +0100, Bernd Kuhls spake thusly: > Signed-off-by: Bernd Kuhls Thank you for adopting it! ? Applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index ba18d830d2..b9ca7eb647 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -350,6 +350,7 @@ F: package/bitcoin/ > F: package/clamav/ > F: package/dav1d/ > F: package/dht/ > +F: package/dnsmasq/ > F: package/dovecot/ > F: package/dovecot-pigeonhole/ > F: package/dtv-scan-tables/ > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:00:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:00:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/unbound: security bump version to 1.19.1 In-Reply-To: <20240220180708.55442-1-bernd@kuhls.net> References: <20240220180708.55442-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-20 19:07 +0100, Bernd Kuhls spake thusly: > Release notes: > https://nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ > > Fixes CVE-2023-50387 & CVE-2023-50868. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/unbound/unbound.hash | 4 ++-- > package/unbound/unbound.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash > index 91e1d82dd2..843026abc7 100644 > --- a/package/unbound/unbound.hash > +++ b/package/unbound/unbound.hash > @@ -1,5 +1,5 @@ > -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 > -sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz > +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 > +sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz > > # Locally calculated > sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE > diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk > index fa7884e937..5128d0e420 100644 > --- a/package/unbound/unbound.mk > +++ b/package/unbound/unbound.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UNBOUND_VERSION = 1.17.1 > +UNBOUND_VERSION = 1.19.1 > UNBOUND_SITE = https://www.unbound.net/downloads > UNBOUND_INSTALL_STAGING = YES > UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:00:41 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:00:41 +0100 Subject: [Buildroot] [PATCH 1/1] package/bind: security bump version to 9.16.48 In-Reply-To: <20240220185030.92016-1-bernd@kuhls.net> References: <20240220185030.92016-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-20 19:50 +0100, Bernd Kuhls spake thusly: > Changelog: https://ftp.isc.org/isc/bind9/9.16.48/CHANGES > > Version 9.16.46 fixes > - CVE-2023-4408 > - CVE-2023-5517 > - CVE-2023-5679 > - CVE-2023-6516 > > Version 9.16.47 fixes CVE-2023-50387. > > Signed-off-by: Bernd Kuhls Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/bind/bind.hash | 4 ++-- > package/bind/bind.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/bind/bind.hash b/package/bind/bind.hash > index d500b61128..482b046c8d 100644 > --- a/package/bind/bind.hash > +++ b/package/bind/bind.hash > @@ -1,4 +1,4 @@ > -# Verified from https://ftp.isc.org/isc/bind9/9.16.44/bind-9.16.44.tar.xz.asc > +# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc > # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD > -sha256 cfaa953c36d5ca42d9584fcf9653d07c85527b59687e7c4d4cb8071272db6754 bind-9.16.44.tar.xz > +sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz > sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT > diff --git a/package/bind/bind.mk b/package/bind/bind.mk > index 03ffcbec42..0d81ffabd6 100644 > --- a/package/bind/bind.mk > +++ b/package/bind/bind.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -BIND_VERSION = 9.16.44 > +BIND_VERSION = 9.16.48 > BIND_SOURCE= bind-$(BIND_VERSION).tar.xz > BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) > # bind does not support parallel builds. > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:03:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:03:58 +0100 Subject: [Buildroot] [git commit] package/tslib: bump version to 1.23 Message-ID: <20240220211035.E6DCF879B0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb4f154dad9ddc054763abcacfde120d16ca201a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes from https://github.com/libts/tslib/releases : This release includes libts version 0.10.5 and the following changes: * new filter module: module crop * some build and security fixes * improved release procedure Signed-off-by: Martin Kepplinger Signed-off-by: Yann E. MORIN --- package/tslib/tslib.hash | 4 ++-- package/tslib/tslib.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index 762fbebb26..6fe35633aa 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,5 +1,5 @@ -# https://github.com/libts/tslib/releases/download/1.22/tslib-1.22.tar.xz.sha256 -sha256 aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a tslib-1.22.tar.xz +# https://github.com/libts/tslib/releases/download/1.23/tslib-1.23.tar.xz.sha256 +sha256 9b489a54d48006201f2fe955a88c3f857535ac93b6cf8e5a16c7b166c8991dac tslib-1.23.tar.xz # Locally computed sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 45e29808bd..e8eb3beeaf 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.22 +TSLIB_VERSION = 1.23 TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) @@ -29,7 +29,8 @@ TSLIB_CONF_OPTS += \ --enable-skip=static \ --enable-lowpass=static \ --enable-invert=static \ - --enable-evthres=static + --enable-evthres=static \ + --enable-crop=static endif $(eval $(autotools-package)) From yann.morin.1998 at free.fr Tue Feb 20 21:04:02 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:04:02 +0100 Subject: [Buildroot] [git commit] package/c-ares: bump to version 1.26.0 Message-ID: <20240220211036.01D92879B1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=43ae599c9eeba74f4c9941435d9f8137723b86ec branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://c-ares.org/changelog.html#1_26_0 Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index c2897f6e44..ee097a53c9 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 de24a314844cb157909730828560628704f4f896d167dd7da0fa2fb93ea18b10 c-ares-1.20.1.tar.gz +sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz # Hash for license file sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 586fde9afb..29da6baa4b 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.20.1 +C_ARES_VERSION = 1.26.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From yann.morin.1998 at free.fr Tue Feb 20 21:12:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:12:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/tslib: bump version to 1.23 In-Reply-To: <20240220073251.251521-1-martink@posteo.de> References: <20240220073251.251521-1-martink@posteo.de> Message-ID: Martin, All, On 2024-02-20 07:32 +0000, Martin Kepplinger spake thusly: > Release notes from https://github.com/libts/tslib/releases : > > This release includes libts version 0.10.5 and the following changes: > > * new filter module: module crop > * some build and security fixes > * improved release procedure > > Signed-off-by: Martin Kepplinger Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/tslib/tslib.hash | 4 ++-- > package/tslib/tslib.mk | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash > index 762fbebb26..6fe35633aa 100644 > --- a/package/tslib/tslib.hash > +++ b/package/tslib/tslib.hash > @@ -1,5 +1,5 @@ > -# https://github.com/libts/tslib/releases/download/1.22/tslib-1.22.tar.xz.sha256 > -sha256 aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a tslib-1.22.tar.xz > +# https://github.com/libts/tslib/releases/download/1.23/tslib-1.23.tar.xz.sha256 > +sha256 9b489a54d48006201f2fe955a88c3f857535ac93b6cf8e5a16c7b166c8991dac tslib-1.23.tar.xz > > # Locally computed > sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING > diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk > index 45e29808bd..e8eb3beeaf 100644 > --- a/package/tslib/tslib.mk > +++ b/package/tslib/tslib.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -TSLIB_VERSION = 1.22 > +TSLIB_VERSION = 1.23 > TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) > TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz > TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) > @@ -29,7 +29,8 @@ TSLIB_CONF_OPTS += \ > --enable-skip=static \ > --enable-lowpass=static \ > --enable-invert=static \ > - --enable-evthres=static > + --enable-evthres=static \ > + --enable-crop=static > endif > > $(eval $(autotools-package)) > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:12:29 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:12:29 +0100 Subject: [Buildroot] [PATCH] package/c-ares: bump to version 1.26.0 In-Reply-To: <20240220151931.2141682-1-buildroot@bubu1.eu> References: <20240220151931.2141682-1-buildroot@bubu1.eu> Message-ID: Marcus, All, On 2024-02-20 16:19 +0100, Marcus Hoffmann via buildroot spake thusly: > Changelog: https://c-ares.org/changelog.html#1_26_0 > > Signed-off-by: Marcus Hoffmann Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/c-ares/c-ares.hash | 2 +- > package/c-ares/c-ares.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash > index c2897f6e44..ee097a53c9 100644 > --- a/package/c-ares/c-ares.hash > +++ b/package/c-ares/c-ares.hash > @@ -1,5 +1,5 @@ > # Locally calculated after checking pgp signature > -sha256 de24a314844cb157909730828560628704f4f896d167dd7da0fa2fb93ea18b10 c-ares-1.20.1.tar.gz > +sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz > > # Hash for license file > sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md > diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk > index 586fde9afb..29da6baa4b 100644 > --- a/package/c-ares/c-ares.mk > +++ b/package/c-ares/c-ares.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -C_ARES_VERSION = 1.20.1 > +C_ARES_VERSION = 1.26.0 > C_ARES_SITE = http://c-ares.haxx.se/download > C_ARES_INSTALL_STAGING = YES > C_ARES_CONF_OPTS = --with-random=/dev/urandom > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:15:24 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:15:24 +0100 Subject: [Buildroot] [git commit] package/dos2unix: bump to version 7.5.2 Message-ID: <20240220211650.E165E879B6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c86121d8865d41c40ed17d0ca6b07d36a940a2e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Update hash of the COPYING.txt (update in year) Signed-off-by: Kadambini Nema Signed-off-by: Yann E. MORIN --- package/dos2unix/dos2unix.hash | 6 +++--- package/dos2unix/dos2unix.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash index 032c8ea2d2..d4d682cd0c 100644 --- a/package/dos2unix/dos2unix.hash +++ b/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 6d1e70cf26..e30fc999d4 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.5.0 +DOS2UNIX_VERSION = 7.5.2 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt From yann.morin.1998 at free.fr Tue Feb 20 21:17:01 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:17:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/dos2unix: bump to version 7.5.2 In-Reply-To: <20240219191934.41982-1-kadambini.nema@gmail.com> References: <20240219191934.41982-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-19 11:19 -0800, Kadambini Nema spake thusly: > - Update hash of the COPYING.txt (update in year) > > Signed-off-by: Kadambini Nema Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changelog: https://waterlan.home.xs4all.nl/dos2unix/ChangeLog.txt > > $ ./utils/test-pkg -d br_test -k -c dos2unix.config -p dos2unix > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: OK > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: OK > sourcery-arm [6/6]: OK > 6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > package/dos2unix/dos2unix.hash | 6 +++--- > package/dos2unix/dos2unix.mk | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash > index 032c8ea2d2..d4d682cd0c 100644 > --- a/package/dos2unix/dos2unix.hash > +++ b/package/dos2unix/dos2unix.hash > @@ -1,4 +1,4 @@ > # Locally calculated after checking pgp signature > -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc > -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz > -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt > +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc > +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz > +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt > diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk > index 6d1e70cf26..e30fc999d4 100644 > --- a/package/dos2unix/dos2unix.mk > +++ b/package/dos2unix/dos2unix.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -DOS2UNIX_VERSION = 7.5.0 > +DOS2UNIX_VERSION = 7.5.2 > DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix > DOS2UNIX_LICENSE = BSD-2-Clause > DOS2UNIX_LICENSE_FILES = COPYING.txt > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:17:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:17:39 +0100 Subject: [Buildroot] [git commit] package/google-breakpad: fix missing include error Message-ID: <20240220211811.A6495879C1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=59e2a8ed5ab9712c602fe64f0ae5f0ae48c0b6c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master src/common/module.cc: In member function ???bool google_breakpad::Module::AddFunction(Function*)???: src/common/module.cc:194:52: error: ???find_if??? is not a member of ???std???; did you mean ???find???? 194 | FunctionSet::iterator existing_function = std::find_if( | ^~~~~~~ | find Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed This error is seen on gcc-14. https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch Signed-off-by: Kadambini Nema Signed-off-by: Yann E. MORIN --- ...001-Fixed-missing-include-for-std-find_if.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch new file mode 100644 index 0000000000..141e12b613 --- /dev/null +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch @@ -0,0 +1,26 @@ +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 +From: Nathan Moinvaziri +Date: Tue, 19 Dec 2023 14:35:05 -0800 +Subject: [PATCH] Fixed missing include for std::find_if. + +Throws an error when compiling on Windows. + +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 +Reviewed-by: Ivan Penkov +Upstream: https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d +Signed-off-by: Kadambini Nema +--- + +diff --git a/src/common/module.cc b/src/common/module.cc +index 0eb5aad..b6f5da7 100644 +--- a/src/common/module.cc ++++ b/src/common/module.cc +@@ -42,6 +42,7 @@ + #include + #include + ++#include + #include + #include + #include From david.picard at clermont.in2p3.fr Tue Feb 20 21:18:12 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Tue, 20 Feb 2024 22:18:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: Message-ID: Hi, I checked my subscription options, but I don't receive the messages I send to the list. My comments are in the text. Le 14/02/2024 ? 17:23, Romain Naour a ?crit?: > Hello David, > > Le 14/02/2024 ? 10:34, David Picard a ?crit?: >> Add a package for the Intel/Altera SoC FPGA hardware library. It is >> used to let the HPS and the FPGA fabric communicate with each other. > We received 4 thime the same patch on the mailing list: > > http://patchwork.ozlabs.org/project/buildroot/patch/20240214081921.4663-1-david.picard at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/2770b2ac-4cec-4d56-81e9-89dfd33f786a at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/abcd4153-41e2-45ce-a89a-e198e86ba337 at clermont.in2p3.fr/ > > http://patchwork.ozlabs.org/project/buildroot/patch/c90e4512-405c-40fb-b597-1a04d7449afa at clermont.in2p3.fr/ > > Which one should we review? > > Please, send patch using git send-email tool. > > (https://nightly.buildroot.org/manual.html#submitting-patches) > > Also, when you resend a patch, add the changelog info. > > https://nightly.buildroot.org/manual.html#_patch_revision_changelog > > >> Signed-off-by: David Picard >> --- >> package/Config.in | 1 + >> package/intel-socfpga-hwlib/Config.in | 12 ++++++ >> .../intel-socfpga-hwlib.hash | 2 + >> .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ >> 4 files changed, 54 insertions(+) >> create mode 100644 package/intel-socfpga-hwlib/Config.in >> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> >> diff --git a/package/Config.in b/package/Config.in >> index bf0fe078b9..cd6c6bcaba 100644 >> --- a/package/Config.in >> +++ b/package/Config.in >> @@ -1736,6 +1736,7 @@ menu "Hardware handling" >> source "package/gnu-efi/Config.in" >> source "package/hackrf/Config.in" >> source "package/hidapi/Config.in" >> + source "package/intel-socfpga-hwlib/Config.in" >> source "package/jitterentropy-library/Config.in" >> source "package/lcdapi/Config.in" >> source "package/let-me-create/Config.in" >> diff --git a/package/intel-socfpga-hwlib/Config.in >> b/package/intel-socfpga-hwlib/Config.in >> new file mode 100644 >> index 0000000000..ced6483a59 >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/Config.in >> @@ -0,0 +1,12 @@ >> +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB >> + bool "intel-socfpga-hwlib" >> + depends on BR2_arm >> + help >> + This package provides the Intel SoC FPGA HWLIB for >> + Intel/Altera SoC FPGA chips. >> + This library allows to communicate with the FPGA fabric from >> + Linux, running on the HPS device. >> + The source code is not compiled. Instead, a symlink is added >> + to $(STAGING_DIR)/lib. >> + >> + https://github.com/altera-opensource/intel-socfpga-hwlib > Check the coding style with ./utils/check-package > >> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> new file mode 100644 >> index 0000000000..60efe9013e >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >> @@ -0,0 +1,2 @@ >> +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 >> intel-socfpga-hwlib-23.12.02.tar.gz >> +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 >> License.txt >> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> new file mode 100644 >> index 0000000000..bf18c23560 >> --- /dev/null >> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >> @@ -0,0 +1,39 @@ >> +################################################################################ >> +# >> +# intel-socfpga-hwlib >> +# >> +################################################################################ >> + >> +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 >> +INTEL_SOCFPGA_HWLIB_SITE = $(call >> github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) >> +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY > It's unexpected to find a PROPRIETARY tool in a gitbub accound with "opensource" > in their name :) I think "Intel" is the best match : https://spdx.org/licenses/Intel.html > >> +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt > It look like a BSD-3-Clause license > > https://spdx.org/licenses/BSD-3-Clause.html > >> +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES >> +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES >> + >> +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS >> + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) >> $(STAGING_DIR)/lib/intel-socfpga-hwlib >> +endef > I don't think this is what you want to do. I did it on purpose. This package is called a library, but it really is a bunch of C files. You only use a subset, depending on your hardware. This code was made to be compiled in the application, not as a conventional library. I could copy the files to STAGING, but cleaning would be more complicated and it would waste some disk space. > >> + >> +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS >> +# mkdir -p $(BINARIES_DIR)/intel-ucode >> +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ >> +# $(@D)/intel-ucode/* >> +# endef >> +# >> +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) >> +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS >> +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode >> +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ >> +# $(@D)/intel-ucode/* >> +# endef >> +# else >> +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO >> +# endif >> + >> +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS >> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) >> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) >> +# endef > Please, don't add commended code. Of course not. I'll clean it. Thanks for reviewing, David > > Best regards, > Romain > > >> + >> +$(eval $(generic-package)) >> From yann.morin.1998 at free.fr Tue Feb 20 21:18:16 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:18:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/google-breakpad: fix missing include error In-Reply-To: <20240219204054.57774-1-kadambini.nema@gmail.com> References: <--in-reply-to> <20240219204054.57774-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-19 12:40 -0800, Kadambini Nema spake thusly: > src/common/module.cc: In member function ?bool google_breakpad::Module::AddFunction(Function*)?: > src/common/module.cc:194:52: error: ?find_if? is not a member of ?std?; did you mean ?find?? > 194 | FunctionSet::iterator existing_function = std::find_if( > | ^~~~~~~ > | find > Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed > > This error is seen on gcc-14. > > https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 > https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch > > Signed-off-by: Kadambini Nema Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...ixed-missing-include-for-std-find_if.patch | 26 +++++++++++++++++++ > 1 file changed, 26 insertions(+) > create mode 100644 package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > > diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > new file mode 100644 > index 0000000000..141e12b613 > --- /dev/null > +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch > @@ -0,0 +1,26 @@ > +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 > +From: Nathan Moinvaziri > +Date: Tue, 19 Dec 2023 14:35:05 -0800 > +Subject: [PATCH] Fixed missing include for std::find_if. > + > +Throws an error when compiling on Windows. > + > +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 > +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 > +Reviewed-by: Ivan Penkov > +Upstream: https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d > +Signed-off-by: Kadambini Nema > +--- > + > +diff --git a/src/common/module.cc b/src/common/module.cc > +index 0eb5aad..b6f5da7 100644 > +--- a/src/common/module.cc > ++++ b/src/common/module.cc > +@@ -42,6 +42,7 @@ > + #include > + #include > + > ++#include > + #include > + #include > + #include > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Tue Feb 20 21:35:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Tue, 20 Feb 2024 22:35:33 +0100 Subject: [Buildroot] [PATCH 1/1] package dhcpdump: bump to version 1.9 In-Reply-To: <20240219215458.187716-1-kadambini.nema@gmail.com> References: <20240219215458.187716-1-kadambini.nema@gmail.com> Message-ID: Kadambini, All, On 2024-02-19 13:54 -0800, Kadambini Nema spake thusly: > - Change the site to a well maintained fork - https://github.com/bbonev/dhcpdump You could also add a blurb that Fedora 39, at least, also uses that as an upstream. > Signed-off-by: Kadambini Nema [--SNIP--] > delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch $ ./utils/docker-run make check-package .checkpackageignore:290: ignored file package/dhcpdump/0001-use-non-bsd-structures.patch is missing Since the file is no longer present, there is no longer any need to exclude it from being checked. > diff --git a/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch > new file mode 100644 > index 0000000000..c48d28c23d > --- /dev/null > +++ b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch > @@ -0,0 +1,12 @@ > +Upstream: None Why? Ideally, we want patches to be submitted upstream, so that they get applied there, and so we can drop them in the future when we bump to a future version that carries that patch. Also, as I explained in my previous review: patches should be git-formatted (at least when the upstream is git-hosted), with a proper commit log. Having such a commit log will help make an argument for upstream to accept the patch, or to sucggest an alternative. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Tue Feb 20 21:36:51 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 22:36:51 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240220200414.2bsvqvaeltqhsulc@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> <20240220004100.3yzqapeplx6olarz@dasso> <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> <20240220200414.2bsvqvaeltqhsulc@dasso> Message-ID: <1a7ab8e6-bd43-4191-ad95-12e40f3a5c51@smile.fr> Hi Andreas, Le 20/02/2024 ? 21:04, Andreas Dannenberg a ?crit?: > Hi Romain, > > On Tue, Feb 20, 2024 at 11:03:54AM +0100, Romain Naour wrote: >> Hello Andreas, >> >> Le 20/02/2024 ? 01:41, Andreas Dannenberg a ?crit?: >>> On Mon, Feb 19, 2024 at 12:24:52PM +0100, Romain Naour wrote: >>>> Hello Michael, >>>> >>>> Le 19/02/2024 ? 12:02, Michael Nazzareno Trimarchi a ?crit?: >>>>> Hi Romain >>>>> >>>>> On Mon, Feb 19, 2024 at 10:30?AM Romain Naour wrote: >>>>>> >>>>>> Hello Dario, >>>>>> >>>>>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>>>>>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes >>>>>>> high-security field-securable (HS-FS) silicon to optionally customize keys >>>>>>> and encryption for security applications. >>>>>>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, >>>>>>> which, however, was buggy. This series fixes the errors and bumps the Linux >>>>>>> kernel and U-Boot required for such a new device. >>>>>>> >>>>>>> This series, which in my humble opinion, should have been immediately >>>>>>> considered to correct the compilation errors in case of HS-FS devcies, has >>>>>>> seen an increase in patches in version 4 to remove the ti-k3-image-gen >>>>>>> package thanks to Binman. Additionally, it shares some modifications and >>>>>>> views on how to implement certain changes with the series >>>>>>> https://patchwork.ozlabs.org/project/buildroot/list/?series=394840. >>>>>>> Therefore, I think it is necessary not to run them in parallel but to decide >>>>>>> whether to merge one before the other or to consider a single series where >>>>>>> the patches can be coherent with each other. I am available for both solutions. >>>>>>> Let me know. >>>>>> >>>>>> Thanks for this new version. I beleive both series should be merged into one >>>>>> since we want to follow u-boot switch to binman, add more TI K3 SoC support and >>>>>> keeping exising am62x ans am64x working in GP or HS/HS-FS. >>>>>> >>>>> >>>>> Because the Dario patchset was sent before (end of November), it's >>>>> reasonable to review and adjust that one >>>>> and apply your changes for ti_j721e_sk on top of it. It think that is >>>>> a standard way to make people happy about >>>>> their work and contribution. >>>> >>>> Actually, the two series are about the same topic: TI K3 SoC support (GP, HS, >>>> HS-FS) not only AM62x-SK HS-FS devices >>>> >>>> But due to the complexity of the BSP, the boot flow (4 way to boot!) and the >>>> switch from custom tool to binman... this series is really difficult to review >>>> without having a good understanding of TI K3 architecture peculiarity and having >>>> one of each TI evaluation boards ? >>> >>> Although I helped conceive some of this and the associated tooling early >>> on, some of the what may look strange architectural decisions were driven >>> by different use cases and requirements for the different devices >>> (especially around automotive fast/early boot, but also security) in >>> combination with limited on-chip SRAM... So this where we are at now. A >>> future AM6x device variant will have yet another boot flow, but I can >>> already say it will be very much simplified over what we have today :) >> >> About existing boot flow, I found two recent commit in u-boot that state that >> the "Split binary" (that requires sysfw.itb) is already a legacy boot flow: > > It's called "legacy boot flow" because it was the boot flow used on the > first K3 devices that were released (AM65x, J721E). This boot flow was > not used on follow-on devices. The characteristics of this boot flow is > that the initial FW image that gets loaded (tiboot3.bin) doesn't contain > any device firmwares, but only a bootloader (such as U-Boot SPL). Then > this boot loader will load the System Firmware firmware + config data > blob (sysfw.itb) into the dedicated core (called "DMSC" = Device Manager > and Security Controller). And then addiitonal boot stages will be > loaded. These devices require this boot flow, and with this it is > required to be supported by U-Boot (and any Linux distribution or build > systems that build on that). > > TI is still making/selling those "legacy boot flow" devices, and will > continue to do so for a very long time. One promiment community > incarnation that you are probably aware of is the BeagleBone AI-64. Thank you for the detailed explanation! I previouly worked on a AM57xx SoC that is nowaday legacy SoC, the latest ti-kernel 6.1 doesn't support some of the driver that where available in ti-kernel 5.10 (prueth 100M, RPMsg Sockets over virtio-rpmsg transport (use for ARM-DSP IPC3.x), TI-RTOS (the csl-common package was also removed from meta-ti)). Also the TI SDK on this plateform doesn't seems very active [1]. So, I'm worried when I read "legacy" :) [1] https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1290197/processor-sdk-am57x-legacy-processor-s-linux-update-plan > >> arm: dts: k3-binman: Add support for FIT templates >> >> Add templates for FIT images used extensively across K3 boards with most >> of the code common. This includes the FIT portions of: >> - tispl.bin >> - u-boot.img >> - sysfw.itb (in case of legacy boot flow) >> >> https://gitlab.com/u-boot/u-boot/-/commit/b153bad0f14168d5fcc02ba6bf1a2cd98daba9b5 >> >> arm: dts: k3-*-binman: Move to using templated FITs >> >> Reduce redundancy in code by using templates to generate the A72 boot >> binaries (tispl.bin and u-boot.img) as well as R5 boot binary sysfw.itb >> (for legacy boot following devices J721E and AM65x). >> >> https://gitlab.com/u-boot/u-boot/-/commit/4509b9ff0b8cb26907f9e9c3571b43565c859275 >> >> Which one should be recommended or avoided for a new design? > > Those commits are just a simplification to reduce duplication. As per > earlier comment the "legacy boot flow" is something we continue needing > to support. It isn't supposed to imply that those devices are about to > disappear. > > Not sure if this answered your question; please let me know. Yes, thank you. Best regards, Romain > > -- > Andreas Dannenberg > Texas Instruments Inc > > >> >> Best regards, >> Romain >> >> >>> >>>> The series (based on Dario's work) about ti_j721e_sk suggested to remove TI >>>> custom tools replaced by binman along with other improvements. >>>> >>>> I'll way for v5 and rebase the ti_j721e_sk on top of it. >>> >>> Thank you Romain for your buy-in. Let's focus on getting Dario's series >>> in good shape and then move onto yours. I'd also like to re-introduce >>> graphics (I had that working before) but I need to wait for all the >>> "baseline" stuff to settle first. >>> >>> >>> -- >>> Andreas Dannenberg >>> Texas Instruments Inc >>> >>> >>> >>>> >>>> Best regards, >>>> Romain >>>> >>>> >>>>> >>>>> Michael >>>>> >>>>>> My main concern is to avoid adding a new package for a tool that is already >>>>>> deprecated ti-k3-image-gen (not sure if ti-k3-core-secdev is really deprecated) [1]. >>>>>> >>>>>> Also the topic is not only "AM62x-SK HS-FS devices" but "TI K3 HS-FS devices". >>>>>> >>>>>> [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685820.html >>>>>> >>>>>> Best regards, >>>>>> Romain >>>>>> >>>>>>> >> From romain.naour at smile.fr Tue Feb 20 22:06:26 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 23:06:26 +0100 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240220203200.uq2dpvky2rbv6tcw@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> <20240220012848.76amyog5pecsgld4@dasso> <20240220203200.uq2dpvky2rbv6tcw@dasso> Message-ID: Hi Andreas, Le 20/02/2024 ? 21:32, Andreas Dannenberg a ?crit?: > Dear Romain, Dario, Thomas: > > On Tue, Feb 20, 2024 at 10:32:14AM +0100, Romain Naour wrote: >> Hi Dario, >> >> Le 20/02/2024 ? 10:05, Dario Binacchi a ?crit?: >>> Hi Andreas, Romain, All >>> >>> On Tue, Feb 20, 2024 at 2:28?AM Andreas Dannenberg wrote: >>>> >>>> Romain, Dario, >>>> >>>> On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: >>>>> Hello Dario, >>>>> >>>>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>>>>> Recent versions of U-Boot can use Binman to compile and sign the generated >>>>>> binaries, thus making the use of custom tools like ti-k3-image-gen no >>>>>> longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were >>>>>> configured and used outside of it. This patch allows setting such options >>>>>> even if the package is not enabled. >>>>> >>>>> I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux >>>>> kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. >>>> >>>> There were discussions/suggestions around this before by Yann E Morin >>>> [1] and Thomas Petazzoni [2]. I think the gist of it was to move the >>>> selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing >>>> all the K3 SoC specific selections. And then other packages and Kconfig >>>> menues can depend on it more cleanly. Like it's currently done with >>>> package/freescale-imx/Config.in. This would also bring some consistency >>>> in how those NXP and TI device families are managed, which will make for >>>> a better end-user experience I think. >>> >>> If I'm not mistaken, I think the patches: >>> [18/20] boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope >>> [17/20] boot: move ti-k3-* packages to 'ti-k3' directory >>> Are heading in the direction of what we find in >>> package/freescale-imx/, with the only difference being >>> that in our case, we're under boot. >>> So, can I consider these two patches correct? > > Yes the general direction those are headed is a good... > >> Yes, can you try to move ti-k3 to package directory in V5 ? >> It would also be used later by the GPU rogue firmwares. > > ...and yes, for alignment sake with IMX it would be even better to have > it in package/, while also keeping some alignment with the naming of the > CONFIG options (hence my comment with 'BR2_PACKAGE_TI_K3_PLATFORM'). > > > Hi Thomas, > assuming we create a new package called 'package/ti-k3' I was trying to > figure out what would be the best way to name the associated CONFIG > options that control device security settings and can be used to > determine which device is being used (for later uses in context of GPU > drivers and other device capabilities)? > > I see different naming conventions being used, like this: > > 1) BR2_PACKAGE_* > 2) BR2_TARGET_* Well, it seems we use BR2_TARGET_* for package in boot/ directory instead of BR2_BOOT_* for "legacy" reason :) At some point in the history of Buildroot the target/ directory existed and was used to package bootloaders: https://gitlab.com/buildroot.org/buildroot/-/commit/d7d57699ef83cce36d87bef73c9e1fbdc765a64c But BR2_TARGET_* symbol was keep for packages (like grub) when booloaders was moved to boot/. > 3) BR2_BOOT_* So, there is no such BR2_BOOT_* option. > > Seems like BR2_TARGET_* what we have now would be most appropriate, but > then the IMX stuff uses BR2_PACKAGE_*, which *seems* to be reserved for > "userspace" (non-boot) packages as far as I can tell from my poor-man's > research. While I'd like to align things, the use of the BR2_PACKAGE_* > prefix may or may not be appropriate for our new additions here? BR2_PACKAGE_* is appropriate here. We still have BR2_TARGET_* in Buildroot since some Kconfig symbol are really old and it is not easy to replace them without breaking existing defconfig (especially the out of tree one). > > Just was hoping to get some guidance here so we don't need to re-work > this too many times. It seems ok for me, lets see the upcoming V5 from Dario. Best regards, Romain > > > -- > Andreas Dannenberg > Texas Instruments Inc > > > >> >> Please add a comment in the commit log that we make an exception to the rule "no >> subdirectory in package directory". >> >> Thanks! >> >> Best regards, >> Romain >> >> >>> >>> Thanks and regards, >>> Dario >>> >>>> >>>> >>>> >>>> -- >>>> Andreas Dannenberg >>>> Texas Instruments Inc >>>> >>>> [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html >>>> [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html >>>> >>>> >>>>> >>>>> Best regards, >>>>> Romain >>>>> >>>>> >>>>>> >>>>>> --- >>>>>> >>>>>> Added in v4 >>>>>> >>>>>> Signed-off-by: Dario Binacchi >>>>>> --- >>>>>> boot/ti-k3/Config.in | 46 ++++++++++++++ >>>>>> boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- >>>>>> boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- >>>>>> boot/uboot/Config.in | 7 +-- >>>>>> configs/ti_am62x_sk_defconfig | 2 +- >>>>>> configs/ti_am64x_sk_defconfig | 2 +- >>>>>> 6 files changed, 59 insertions(+), 67 deletions(-) >>>>>> >>>>>> diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in >>>>>> index 06dda2f156a9..9e508326c9c8 100644 >>>>>> --- a/boot/ti-k3/Config.in >>>>>> +++ b/boot/ti-k3/Config.in >>>>>> @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 >>>>>> >>>>>> if BR2_TARGET_TI_K3 >>>>>> >>>>>> +choice >>>>>> + prompt "SoC family" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SOC_AM62AX >>>>>> + bool "am62ax" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SOC_AM62X >>>>>> + bool "am62x" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SOC_AM64X >>>>>> + bool "am64x" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SOC_AM65X >>>>>> + bool "am65x" >>>>>> + >>>>>> +endchoice >>>>>> + >>>>>> +choice >>>>>> + prompt "Security type" >>>>>> + help >>>>>> + The target SoC security type option. >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_GP >>>>>> + bool "gp" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_HS_FS >>>>>> + bool "hs-fs" >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_HS >>>>>> + bool "hs" >>>>>> + >>>>>> +endchoice >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SOC >>>>>> + string >>>>>> + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX >>>>>> + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X >>>>>> + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X >>>>>> + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X >>>>>> + >>>>>> +config BR2_TARGET_TI_K3_SECTYPE >>>>>> + string >>>>>> + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP >>>>>> + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS >>>>>> + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS >>>>>> + >>>>>> source "boot/ti-k3/ti-k3-boot-firmware/Config.in" >>>>>> source "boot/ti-k3/ti-k3-core-secdev/Config.in" >>>>>> source "boot/ti-k3/ti-k3-image-gen/Config.in" >>>>>> diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in >>>>>> index 38d1598d9fc0..2d53d62dd4ee 100644 >>>>>> --- a/boot/ti-k3/ti-k3-image-gen/Config.in >>>>>> +++ b/boot/ti-k3/ti-k3-image-gen/Config.in >>>>>> @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >>>>>> bool "ti-k3-image-gen" >>>>>> depends on BR2_TARGET_TI_K3_R5_LOADER >>>>>> select BR2_TARGET_TI_K3_BOOT_FIRMWARE >>>>>> - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>>>> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS >>>>>> # We need FIT support in uboot-tools, which is why we select a >>>>>> # host package >>>>>> select BR2_PACKAGE_HOST_UBOOT_TOOLS >>>>>> @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN >>>>>> https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ >>>>>> >>>>>> if BR2_TARGET_TI_K3_IMAGE_GEN >>>>>> -choice >>>>>> - prompt "SoC family" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>>>> - bool "am62ax" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>>>> - bool "am62x" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>>>> - bool "am64x" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>>>> - bool "am65x" >>>>>> - >>>>>> -endchoice >>>>>> - >>>>>> -choice >>>>>> - prompt "Security type" >>>>>> - help >>>>>> - The target SoC security type option for image gen. Valid >>>>>> - options are "gp" for General Purpose devices, "hs-fs" for >>>>>> - High Security - Field Securable devices, or "hs" for High >>>>>> - Security - Security Enforcing devices. Note for all High >>>>>> - Security device variants the TI_SECURE_DEV_PKG environmental >>>>>> - variable must be defined at build time pointing to a valid >>>>>> - core-secdev-k3 folder location, otherwise the build will >>>>>> - fail, see >>>>>> - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>>>> - bool "gp" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>>>> - bool "hs-fs" >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>>>> - bool "hs" >>>>>> - >>>>>> -endchoice >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC >>>>>> - string >>>>>> - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>>>> - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>>>> - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>>>> - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>>>> >>>>>> config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE >>>>>> string >>>>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X >>>>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X >>>>>> - >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE >>>>>> - string >>>>>> - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP >>>>>> - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS >>>>>> - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS >>>>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX >>>>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X >>>>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X >>>>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X >>>>>> >>>>>> endif >>>>>> diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>>>> index 74b4fcb4bf89..834d8f7d5cd5 100644 >>>>>> --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>>>> +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk >>>>>> @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ >>>>>> $(BR2_MAKE_HOST_DEPENDENCY) >>>>>> >>>>>> TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) >>>>>> -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) >>>>>> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) >>>>>> +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) >>>>>> +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) >>>>>> >>>>>> -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) >>>>>> +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) >>>>>> TI_K3_IMAGE_GEN_SYSFW = \ >>>>>> $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin >>>>>> else >>>>>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in >>>>>> index beafb38930db..1a9d21e7c6d1 100644 >>>>>> --- a/boot/uboot/Config.in >>>>>> +++ b/boot/uboot/Config.in >>>>>> @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM >>>>>> bool "U-Boot needs TI K3 Device Manager (DM)" >>>>>> # We use the SoC selection defined for the ti-k3-image-gen >>>>>> # package >>>>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN >>>>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>>>> + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X >>>>>> help >>>>>> Some TI K3 devices need the Device Manager (DM) firmware to >>>>>> be available for the U-Boot build. >>>>>> @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM >>>>>> >>>>>> config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME >>>>>> string >>>>>> - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX >>>>>> - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X >>>>>> + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX >>>>>> + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X >>>>>> >>>>>> endif >>>>>> >>>>>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >>>>>> index cd26235342e4..cfefce0a77a4 100644 >>>>>> --- a/configs/ti_am62x_sk_defconfig >>>>>> +++ b/configs/ti_am62x_sk_defconfig >>>>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" >>>>>> BR2_TARGET_TI_K3=y >>>>>> +BR2_TARGET_TI_K3_SOC_AM62X=y >>>>>> BR2_TARGET_TI_K3_IMAGE_GEN=y >>>>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" >>>>>> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig >>>>>> index 1befeb4ab96c..daf78dbffff8 100644 >>>>>> --- a/configs/ti_am64x_sk_defconfig >>>>>> +++ b/configs/ti_am64x_sk_defconfig >>>>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" >>>>>> BR2_TARGET_TI_K3=y >>>>>> +BR2_TARGET_TI_K3_SOC_AM64X=y >>>>>> BR2_TARGET_TI_K3_IMAGE_GEN=y >>>>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" >>>>> >>> >>> >>> >> From ju.o at free.fr Tue Feb 20 22:07:20 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 20 Feb 2024 23:07:20 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add make runtime test Message-ID: <20240220220720.166829-1-ju.o@free.fr> Signed-off-by: Julien Olivain --- DEVELOPERS | 2 + support/testing/tests/package/test_make.py | 82 +++++++++++++++++++ .../test_make/rootfs-overlay/root/Makefile | 23 ++++++ 3 files changed, 107 insertions(+) create mode 100644 support/testing/tests/package/test_make.py create mode 100644 support/testing/tests/package/test_make/rootfs-overlay/root/Makefile diff --git a/DEVELOPERS b/DEVELOPERS index f0e16af1623..6c8d07d4761 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1815,6 +1815,8 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_make.py +F: support/testing/tests/package/test_make/ F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py diff --git a/support/testing/tests/package/test_make.py b/support/testing/tests/package/test_make.py new file mode 100644 index 00000000000..d549cca37d8 --- /dev/null +++ b/support/testing/tests/package/test_make.py @@ -0,0 +1,82 @@ +import os + +import infra.basetest + + +class TestMake(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_make/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_MAKE=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def gen_expected_str(self, count): + """Return the expected string generated by the test Makefile""" + return "".join(map(lambda x: str(x), range(1,count+1))) + + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("make --version") + + # We touch the Makefile to set its modification time to the + # current system time. This is to avoid warnings from Make + # about having files with timestamps in the future. This is + # because the minimal system running in the emulator might not + # set the clock to the real time, and the Makefile has a + # correct timestamp from the build host (which is likely at + # the correct time). + self.assertRunOk("touch Makefile") + + # We test the "message" target and check we get the expected + # string. + out, ret = self.emulator.run("make message") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello Buildroot!") + + # We redo the same test, this time by passing a new message + # with a variable. + msg = "This is Another Message..." + out, ret = self.emulator.run(f"make message MESSAGE='{msg}'") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) + + # We run a simple "make" invocation, using the defaults. + self.assertRunOk("make") + + # We check the generated output contains the expected string. + expected_str = self.gen_expected_str(10) + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_str) + + # Clean the previous invocation. + self.assertRunOk("make clean") + + # We check a output generated file is no longer present. + self.assertRunOk("test ! -e output.txt") + + # We run an invocation with a larger COUNT value. GNU Make + # version 4.4 introduced the --shuffle option, which shuffle + # rules. We use it with a constant seed, in order to have a + # stable reshuffling in all test runs. We also include in this + # execution a request for parallel jobs. + count = 50 + seed = 123456 + self.assertRunOk(f"make -j10 --shuffle={seed} COUNT={count}") + + # Despite the pseudo-randomization in the previous invocation, + # the expected output should be correctly ordered. + expected_str = self.gen_expected_str(count) + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_str) diff --git a/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile b/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile new file mode 100644 index 00000000000..7ac86945a5e --- /dev/null +++ b/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile @@ -0,0 +1,23 @@ +MESSAGE ?= "Hello Buildroot!" +COUNT ?= 10 + +LIST = $(shell seq $(COUNT)) +INPUTS = $(addsuffix .in.txt,$(LIST)) +OUTPUT = output.txt + +.PHONY: all +all: $(OUTPUT) + +.PHONY: clean +clean: + $(RM) $(OUTPUT) *.in.txt + +.PHONY: message +message: + @echo $(MESSAGE) + +%.in.txt: + echo $(subst .in.txt,,$@) > $@ + +$(OUTPUT): $(INPUTS) + (cat $? | tr -d '\n' ; echo) > $@ -- 2.43.2 From romain.naour at smile.fr Tue Feb 20 22:26:36 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 23:26:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: Message-ID: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> Hello David, Le 20/02/2024 ? 22:18, David Picard a ?crit?: > Hi, > > I checked my subscription options, but I don't receive the messages I send to > the list. > > My comments are in the text. > > Le 14/02/2024 ? 17:23, Romain Naour a ?crit?: >> Hello David, >> >> Le 14/02/2024 ? 10:34, David Picard a ?crit?: >>> Add a package for the Intel/Altera SoC FPGA hardware library. It is >>> used to let the HPS and the FPGA fabric communicate with each other. >> We received 4 thime the same patch on the mailing list: >> >> http://patchwork.ozlabs.org/project/buildroot/patch/20240214081921.4663-1-david.picard at clermont.in2p3.fr/ >> >> http://patchwork.ozlabs.org/project/buildroot/patch/2770b2ac-4cec-4d56-81e9-89dfd33f786a at clermont.in2p3.fr/ >> >> http://patchwork.ozlabs.org/project/buildroot/patch/abcd4153-41e2-45ce-a89a-e198e86ba337 at clermont.in2p3.fr/ >> >> http://patchwork.ozlabs.org/project/buildroot/patch/c90e4512-405c-40fb-b597-1a04d7449afa at clermont.in2p3.fr/ >> >> Which one should we review? >> >> Please, send patch using git send-email tool. >> >> (https://nightly.buildroot.org/manual.html#submitting-patches) >> >> Also, when you resend a patch, add the changelog info. >> >> https://nightly.buildroot.org/manual.html#_patch_revision_changelog >> >> >>> Signed-off-by: David Picard >>> --- >>> package/Config.in | 1 + >>> package/intel-socfpga-hwlib/Config.in | 12 ++++++ >>> .../intel-socfpga-hwlib.hash | 2 + >>> .../intel-socfpga-hwlib.mk | 39 +++++++++++++++++++ >>> 4 files changed, 54 insertions(+) >>> create mode 100644 package/intel-socfpga-hwlib/Config.in >>> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >>> create mode 100644 package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >>> >>> diff --git a/package/Config.in b/package/Config.in >>> index bf0fe078b9..cd6c6bcaba 100644 >>> --- a/package/Config.in >>> +++ b/package/Config.in >>> @@ -1736,6 +1736,7 @@ menu "Hardware handling" >>> source "package/gnu-efi/Config.in" >>> source "package/hackrf/Config.in" >>> source "package/hidapi/Config.in" >>> + source "package/intel-socfpga-hwlib/Config.in" >>> source "package/jitterentropy-library/Config.in" >>> source "package/lcdapi/Config.in" >>> source "package/let-me-create/Config.in" >>> diff --git a/package/intel-socfpga-hwlib/Config.in >>> b/package/intel-socfpga-hwlib/Config.in >>> new file mode 100644 >>> index 0000000000..ced6483a59 >>> --- /dev/null >>> +++ b/package/intel-socfpga-hwlib/Config.in >>> @@ -0,0 +1,12 @@ >>> +config BR2_PACKAGE_INTEL_SOCFPGA_HWLIB >>> + bool "intel-socfpga-hwlib" >>> + depends on BR2_arm >>> + help >>> + This package provides the Intel SoC FPGA HWLIB for >>> + Intel/Altera SoC FPGA chips. >>> + This library allows to communicate with the FPGA fabric from >>> + Linux, running on the HPS device. >>> + The source code is not compiled. Instead, a symlink is added >>> + to $(STAGING_DIR)/lib. >>> + >>> + https://github.com/altera-opensource/intel-socfpga-hwlib >> Check the coding style with ./utils/check-package >> >>> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >>> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >>> new file mode 100644 >>> index 0000000000..60efe9013e >>> --- /dev/null >>> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.hash >>> @@ -0,0 +1,2 @@ >>> +sha256 bbf0767facfdf18ca3dbead66b1e98090c4e9731e2b87cf35c3bf13db0c315e4 >>> intel-socfpga-hwlib-23.12.02.tar.gz >>> +sha256 2ed04f9cc773f88c8d52c05c04bb3d28f376c082bf99b6a3cb5590b1627ad484 >>> License.txt >>> diff --git a/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >>> b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >>> new file mode 100644 >>> index 0000000000..bf18c23560 >>> --- /dev/null >>> +++ b/package/intel-socfpga-hwlib/intel-socfpga-hwlib.mk >>> @@ -0,0 +1,39 @@ >>> +################################################################################ >>> +# >>> +# intel-socfpga-hwlib >>> +# >>> +################################################################################ >>> + >>> +INTEL_SOCFPGA_HWLIB_VERSION = 23.12.02 >>> +INTEL_SOCFPGA_HWLIB_SITE = $(call >>> github,altera-opensource,intel-socfpga-hwlib,rel_master_$(INTEL_SOCFPGA_HWLIB_VERSION)_pr) >>> +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY >> It's unexpected to find a PROPRIETARY tool in a gitbub accound with "opensource" >> in their name :) > I think "Intel" is the best match : https://spdx.org/licenses/Intel.html The two are really close indeed, but the Intel one contains "EXPORT LAWS" part at the end that is missing in the intel-socfpga-hwlib license file. Also, the Intel use bullet point while BSD use a number (not sure it's really significant) >> >>> +INTEL_SOCFPGA_HWLIB_LICENSE_FILES = License.txt >> It look like a BSD-3-Clause license >> >> https://spdx.org/licenses/BSD-3-Clause.html >> >>> +INTEL_SOCFPGA_HWLIB_REDISTRIBUTE = YES >>> +INTEL_SOCFPGA_HWLIB_INSTALL_STAGING = YES >>> + >>> +define INTEL_SOCFPGA_HWLIB_INSTALL_STAGING_CMDS >>> + ln -s $(BUILD_DIR)/intel-socfpga-hwlib-$(INTEL_SOCFPGA_HWLIB_VERSION) >>> $(STAGING_DIR)/lib/intel-socfpga-hwlib >>> +endef >> I don't think this is what you want to do. > I did it on purpose. This package is called a library, but it really is a bunch > of C files. You only use a subset, depending on your hardware. This code was > made to be compiled in the application, not as a conventional library. > I could copy the files to STAGING, but cleaning would be more complicated and it > would waste some disk space. Ok, maybe is should not be packaged in Buildroot then. When a package is build by Buildroot, it can generate a binary, a library or provide some header files. If your application doesn't bundle intel-socfpga-hwlib sources but it requires it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra download step. > >> >>> + >>> +# define INTEL_SOCFPGA_HWLIB_INSTALL_IMAGES_CMDS >>> +# mkdir -p $(BINARIES_DIR)/intel-ucode >>> +# $(INSTALL) -m 0644 -t $(BINARIES_DIR)/intel-ucode \ >>> +# $(@D)/intel-ucode/* >>> +# endef >>> +# >>> +# ifeq ($(BR2_PACKAGE_INTEL_SOCFPGA_HWLIB_INSTALL_TARGET),y) >>> +# define INTEL_SOCFPGA_HWLIB_INSTALL_TARGET_CMDS >>> +# mkdir -p $(TARGET_DIR)/lib/firmware/intel-ucode >>> +# $(INSTALL) -m 0644 -t $(TARGET_DIR)/lib/firmware/intel-ucode \ >>> +# $(@D)/intel-ucode/* >>> +# endef >>> +# else >>> +# INTEL_SOCFPGA_HWLIB_INSTALL_TARGET = NO >>> +# endif >>> + >>> +# define INTEL_SOCFPGA_HWLIB_LINUX_CONFIG_FIXUPS >>> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE) >>> +# $(call KCONFIG_ENABLE_OPT,CONFIG_MICROCODE_INTEL) >>> +# endef >> Please, don't add commended code. > Of course not. I'll clean it. > > Thanks for reviewing, > David Best regards, Romain >> >> Best regards, >> Romain >> >> >>> + >>> +$(eval $(generic-package)) >>> > From dannenberg at ti.com Tue Feb 20 22:34:23 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Tue, 20 Feb 2024 16:34:23 -0600 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> Message-ID: <20240220223423.bnrqouwcuuxhw43f@dasso> Hi Dario, On Sat, Feb 17, 2024 at 05:02:43PM +0100, Dario Binacchi wrote: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. In this case, let's copy it to the binaries directory. > > Signed-off-by: Dario Binacchi > > --- > > Added in v4 > > Signed-off-by: Dario Binacchi > --- > boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 2a10024aedaa..643298a1e70a 100644 > --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > endef > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > + > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > endef I like how this picks/renames the tiboot3.bin corresponding to the device security type, this way allowing to generate a tailored and readily bootable image depending on GP, HS-FS, HS device type. However the find/copy approach may not always work as intended. Consider the build output of R5 U-Boot SPL for AM64x for example: $ ll tiboot3-*.bin -rw-rw-r-- 1 a0797059 a0797059 304431 Feb 20 15:34 tiboot3-am64x-gp-evm.bin -rw-rw-r-- 1 a0797059 a0797059 532270 Feb 20 15:34 tiboot3-am64x_sr2-hs-evm.bin -rw-rw-r-- 1 a0797059 a0797059 532270 Feb 20 15:34 tiboot3-am64x_sr2-hs-fs-evm.bin Note how there's a '_sr2' (Silicon Revision 2.0) in the filename of some of the boot binaries. I did look at the different K3 devices supported in U-Boot at the moment, and it looks like currently this will not be an issue that will manifest itself as the device security type happens to be unique enough to also pick the right silicon revision. But of course this doesn't mean it'll always stay like this.... So it might be better to leverage BR2_TARGET_TI_K3_SOC to be more specific in that find/copy operation and use this to replace the asterisk in "tiboot3-*". So then somebody can use "am64x" or "am64x_sr2" for example as BR2_TARGET_TI_K3_SOC, and you would guarantee the right file gets used to populate the final tiboot3.bin. -- Andreas Dannenberg Texas Instruments Inc > > $(eval $(kconfig-package)) > -- > 2.43.0 > From romain.naour at smile.fr Tue Feb 20 22:50:24 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 23:50:24 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Romain Naour for am574x_idk_defconfig Message-ID: <20240220225025.781466-1-romain.naour@smile.fr> The DEVELOPERS entry was missing. Fixes: 35eb74c634 ("configs/am574x_idk_defconfig: new defconfig") Signed-off-by: Romain Naour --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb..ff44741f9f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2667,7 +2667,9 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ +F: board/ti/am574x-idk/ F: configs/qemu_* +F: configs/am574x_idk_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ -- 2.43.0 From romain.naour at smile.fr Tue Feb 20 22:50:25 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 20 Feb 2024 23:50:25 +0100 Subject: [Buildroot] [PATCH] configs/lepotato_defconfig: new defconfig In-Reply-To: <20240220225025.781466-1-romain.naour@smile.fr> References: <20240220225025.781466-1-romain.naour@smile.fr> Message-ID: <20240220225025.781466-2-romain.naour@smile.fr> Add basic support for the Libre Computer "Le Potato" SBC. https://libre.computer/products/aml-s905x-cc Signed-off-by: Romain Naour --- DEVELOPERS | 2 + board/librecomputer/lepotato/extlinux.conf | 4 ++ board/librecomputer/lepotato/genimage.cfg | 33 +++++++++ board/librecomputer/lepotato/post-build.sh | 5 ++ board/librecomputer/lepotato/post-image.sh | 23 ++++++ board/librecomputer/lepotato/readme.txt | 82 ++++++++++++++++++++++ configs/lepotato_defconfig | 50 +++++++++++++ 7 files changed, 199 insertions(+) create mode 100644 board/librecomputer/lepotato/extlinux.conf create mode 100644 board/librecomputer/lepotato/genimage.cfg create mode 100755 board/librecomputer/lepotato/post-build.sh create mode 100755 board/librecomputer/lepotato/post-image.sh create mode 100644 board/librecomputer/lepotato/readme.txt create mode 100644 configs/lepotato_defconfig diff --git a/DEVELOPERS b/DEVELOPERS index ff44741f9f..b44246ee5c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2667,9 +2667,11 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ +F: board/librecomputer/lepotato/ F: board/ti/am574x-idk/ F: configs/qemu_* F: configs/am574x_idk_defconfig +F: configs/lepotato_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ diff --git a/board/librecomputer/lepotato/extlinux.conf b/board/librecomputer/lepotato/extlinux.conf new file mode 100644 index 0000000000..e0fea6c7aa --- /dev/null +++ b/board/librecomputer/lepotato/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /Image + devicetree /meson-gxl-s905x-libretech-cc.dtb + append console=ttyAML0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait diff --git a/board/librecomputer/lepotato/genimage.cfg b/board/librecomputer/lepotato/genimage.cfg new file mode 100644 index 0000000000..b10e5d9440 --- /dev/null +++ b/board/librecomputer/lepotato/genimage.cfg @@ -0,0 +1,33 @@ +image boot.vfat { + vfat { + files = { + "Image", + "meson-gxl-s905x-libretech-cc.dtb", + "extlinux" + } + + label = "boot" + } + + size = 64M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image="boot.vfat" + size = 64M + offset = 2M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + size = 128M + offset = 0 + } +} diff --git a/board/librecomputer/lepotato/post-build.sh b/board/librecomputer/lepotato/post-build.sh new file mode 100755 index 0000000000..8dae08a47c --- /dev/null +++ b/board/librecomputer/lepotato/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "$BOARD_DIR"/extlinux.conf "$BINARIES_DIR"/extlinux/extlinux.conf diff --git a/board/librecomputer/lepotato/post-image.sh b/board/librecomputer/lepotato/post-image.sh new file mode 100755 index 0000000000..69fb382dc1 --- /dev/null +++ b/board/librecomputer/lepotato/post-image.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" + +AMLOGIC_DIR=${BINARIES_DIR}/amlogic-boot-fip +FIP_DIR=${BINARIES_DIR}/fip + +mkdir -p "${FIP_DIR}" + +(cd "${AMLOGIC_DIR}" && \ + ./build-fip.sh lepotato \ + "${BINARIES_DIR}"/u-boot.bin \ + "${FIP_DIR}") + +dd if="${FIP_DIR}"/u-boot.bin.sd.bin \ + of="${BINARIES_DIR}"/sdcard.img \ + conv=fsync,notrunc bs=1 count=444 + +dd if="${FIP_DIR}"/u-boot.bin.sd.bin \ + of="${BINARIES_DIR}"/sdcard.img \ + conv=fsync,notrunc bs=512 skip=1 seek=1 diff --git a/board/librecomputer/lepotato/readme.txt b/board/librecomputer/lepotato/readme.txt new file mode 100644 index 0000000000..391b030e1f --- /dev/null +++ b/board/librecomputer/lepotato/readme.txt @@ -0,0 +1,82 @@ +Libre Computer Le Potato (AML-S905X-CC) + +Intro +===== + +Libre Computer "Le Potato" is a low cost SBC based around an Amlogic +s905x SoC (quad A53), 2GB DDR3, Mali-450: + +https://libre.computer/products/aml-s905x-cc/ + +How to build it +=============== + +Configure Buildroot: + + $ make lepotato_defconfig + +Then you can edit the build options using + + $ make menuconfig + +Compile everything and build rootfs image: + + $ make + +Note: you will need to have access to the network, since Buildroot +will download the packages' sources. + +Result of the build +------------------- + +After building, you should obtain this tree: + +output/images/ ++-- amlogic-boot-fip ++ +-- axg.inc ++ +-- build-fip.sh ++ +-- g12a.inc ++ +-- gxbb.inc ++ +-- gxl.inc ++ `-- lepotato ++ +-- acs.bin ++ +-- acs_tool.py ++ +-- aml_encrypt_gxl ++ +-- bl21.bin ++ +-- bl2.bin ++ +-- bl301.bin ++ +-- bl30.bin ++ +-- bl31.img ++ +-- blx_fix.sh ++ `-- Makefile ++-- boot.vfat ++-- extlinux ++ `-- extlinux.conf ++-- fip ++ +-- u-boot.bin ++ +-- u-boot.bin.sd.bin ++ +-- u-boot.bin.usb.bl2 ++ `-- u-boot.bin.usb.tpl ++-- Image ++-- meson-gxl-s905x-libretech-cc.dtb ++-- rootfs.ext2 ++-- rootfs.ext4 -> rootfs.ext2 ++-- rootfs.tar ++-- sdcard.img +`-- u-boot.bin + +The post-image script uses the files in the amlogic-boot-fip folder to sign +the bootloader image before integrating it into the sdcard image. + +How to write the SD card or eMMC +================================ + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card or eMMC with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + +Insert the micro SDcard into your Le Potato and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/lepotato_defconfig b/configs/lepotato_defconfig new file mode 100644 index 0000000000..e144fd5197 --- /dev/null +++ b/configs/lepotato_defconfig @@ -0,0 +1,50 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/librecomputer/lepotato/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/librecomputer/lepotato/post-image.sh" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxl-s905x-libretech-cc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# For kernel modules autoloading +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="libretech-cc" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y + +# Required tool to sign the bootloader image +BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP=y +BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP_DEVICE="lepotato" + +# Required tools to create the SD image +BR2_PACKAGE_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y -- 2.43.0 From wilfred.mallawa at wdc.com Wed Feb 21 00:44:00 2024 From: wilfred.mallawa at wdc.com (Wilfred Mallawa) Date: Wed, 21 Feb 2024 10:44:00 +1000 Subject: [Buildroot] [PATCH 1/1] package/libspdm: bump version to 3.2.0 Message-ID: <20240221004400.27429-1-wilfred.mallawa@wdc.com> Additionally, add an upstream patch that fixes the configuration for "NONE" toolchain variant in libspdm. That is, where the build environment provides compile/link options. Signed-off-by: Wilfred Mallawa --- ...eLists-remove-fixed-options-for-NONE.patch | 51 +++++++++++++++++++ package/libspdm/libspdm.hash | 2 +- package/libspdm/libspdm.mk | 2 +- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch new file mode 100644 index 0000000000..0d1287a769 --- /dev/null +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch @@ -0,0 +1,51 @@ +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 +From: Wilfred Mallawa +Date: Mon, 19 Feb 2024 09:56:14 +1000 +Subject: [PATCH] CMakeLists: remove fixed options for NONE + +The use of the NONE toolchain option is such that we can provide at the +build project level (buildroot etc...). However, the changes introduced +in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker +option that does not comply with the definition of the options as +specified in [1]. This change removes those options. + +[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments + +Signed-off-by: Wilfred Mallawa +--- + CMakeLists.txt | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c300cc817..f6cf17d269 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(CMAKE_EXE_LINKER_FLAGS "") + + SET(CMAKE_C_LINK_EXECUTABLE "") +- +- elseif(TOOLCHAIN STREQUAL "NONE") +- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") +- ADD_COMPILE_OPTIONS(-g) +- endif() +- if(GCOV STREQUAL "ON") +- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) +- endif() +- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) +- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) +- +- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) +- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) +- if(GCOV STREQUAL "ON") +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") +- endif() +- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") +- + endif() + + if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") +-- +2.43.2 + diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash index 23faba1c4b..32415bcfce 100644 --- a/package/libspdm/libspdm.hash +++ b/package/libspdm/libspdm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183 libspdm-3.1.1.tar.gz +sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk index 34dbb457c4..2ec35be0ac 100644 --- a/package/libspdm/libspdm.mk +++ b/package/libspdm/libspdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPDM_VERSION = 3.1.1 +LIBSPDM_VERSION = 3.2.0 LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) LIBSPDM_LICENSE = BSD-3-Clause LIBSPDM_LICENSE_FILES = LICENSE.md -- 2.43.2 From alistair23 at gmail.com Wed Feb 21 01:42:03 2024 From: alistair23 at gmail.com (Alistair Francis) Date: Wed, 21 Feb 2024 11:42:03 +1000 Subject: [Buildroot] [PATCH 1/1] package/libspdm: bump version to 3.2.0 In-Reply-To: <20240221004400.27429-1-wilfred.mallawa@wdc.com> References: <20240221004400.27429-1-wilfred.mallawa@wdc.com> Message-ID: On Wed, Feb 21, 2024 at 10:52?AM Wilfred Mallawa via buildroot wrote: > > Additionally, add an upstream patch that fixes the configuration for > "NONE" toolchain variant in libspdm. That is, where the build > environment provides compile/link options. > > Signed-off-by: Wilfred Mallawa Reviewed-by: Alistair Francis Alistair > --- > ...eLists-remove-fixed-options-for-NONE.patch | 51 +++++++++++++++++++ > package/libspdm/libspdm.hash | 2 +- > package/libspdm/libspdm.mk | 2 +- > 3 files changed, 53 insertions(+), 2 deletions(-) > create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > > diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > new file mode 100644 > index 0000000000..0d1287a769 > --- /dev/null > +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > @@ -0,0 +1,51 @@ > +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 > +From: Wilfred Mallawa > +Date: Mon, 19 Feb 2024 09:56:14 +1000 > +Subject: [PATCH] CMakeLists: remove fixed options for NONE > + > +The use of the NONE toolchain option is such that we can provide at the > +build project level (buildroot etc...). However, the changes introduced > +in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker > +option that does not comply with the definition of the options as > +specified in [1]. This change removes those options. > + > +[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments > + > +Signed-off-by: Wilfred Mallawa > +--- > + CMakeLists.txt | 19 ------------------- > + 1 file changed, 19 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 9c300cc817..f6cf17d269 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") > + SET(CMAKE_EXE_LINKER_FLAGS "") > + > + SET(CMAKE_C_LINK_EXECUTABLE "") > +- > +- elseif(TOOLCHAIN STREQUAL "NONE") > +- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) > +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") > +- ADD_COMPILE_OPTIONS(-g) > +- endif() > +- if(GCOV STREQUAL "ON") > +- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) > +- endif() > +- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) > +- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) > +- > +- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) > +- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) > +- if(GCOV STREQUAL "ON") > +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") > +- endif() > +- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") > +- > + endif() > + > + if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") > +-- > +2.43.2 > + > diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash > index 23faba1c4b..32415bcfce 100644 > --- a/package/libspdm/libspdm.hash > +++ b/package/libspdm/libspdm.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183 libspdm-3.1.1.tar.gz > +sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz > sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md > diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk > index 34dbb457c4..2ec35be0ac 100644 > --- a/package/libspdm/libspdm.mk > +++ b/package/libspdm/libspdm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSPDM_VERSION = 3.1.1 > +LIBSPDM_VERSION = 3.2.0 > LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) > LIBSPDM_LICENSE = BSD-3-Clause > LIBSPDM_LICENSE_FILES = LICENSE.md > -- > 2.43.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From dave.mehler at gmail.com Wed Feb 21 03:05:34 2024 From: dave.mehler at gmail.com (David Mehler) Date: Tue, 20 Feb 2024 22:05:34 -0500 Subject: [Buildroot] iwd, buildroot, sets Wi-Fi to AutoConnect disabled Message-ID: Hello, I've created a file /var/lib/iwd/NetworkName.psk but it's AutoConnect status keeps getting set to false, I manually edit the file on the built-host and it reverts to a false setting, and a wireless connection is not made. Any ideas? Thanks. Dave. From yann.morin.1998 at free.fr Wed Feb 21 06:28:20 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 07:28:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> References: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> Message-ID: Romain, David, All, On 2024-02-20 23:26 +0100, Romain Naour spake thusly: > Le 20/02/2024 ? 22:18, David Picard a ?crit?: [--SNIP--] > >>> +INTEL_SOCFPGA_HWLIB_LICENSE = PROPRIETARY > >> It's unexpected to find a PROPRIETARY tool in a gitbub accound with "opensource" > >> in their name :) It's not common, but we do already have a bunch of such packages: $ git grep -E 'PROPRIETARY\>' package/ boot/ |wc -l 13 [--SNIP--] > > I did it on purpose. This package is called a library, but it really is a bunch > > of C files. You only use a subset, depending on your hardware. This code was > > made to be compiled in the application, not as a conventional library. > > I could copy the files to STAGING, but cleaning would be more complicated and it > > would waste some disk space. > Ok, maybe is should not be packaged in Buildroot then. > When a package is build by Buildroot, it can generate a binary, a library or > provide some header files. > If your application doesn't bundle intel-socfpga-hwlib sources but it requires > it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra > download step. I agree with Romain. It does not make miuch sense IMHO to just drop source files like that. And the _EXTRA_DOWNLOADS mechanism is exactly tailored to such cases. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From david.picard at clermont.in2p3.fr Wed Feb 21 08:36:28 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 21 Feb 2024 09:36:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> Message-ID: So, should I submit a package, using the LIBFOO_EXTRA_DOWNLOADS feature ? What value would you recommend for LIBFOO_DL_DIR ? David Le 21/02/2024 ? 07:28, Yann E. MORIN a ?crit?: >>> I did it on purpose. This package is called a library, but it really is a bunch >>> of C files. You only use a subset, depending on your hardware. This code was >>> made to be compiled in the application, not as a conventional library. >>> I could copy the files to STAGING, but cleaning would be more complicated and it >>> would waste some disk space. >> Ok, maybe is should not be packaged in Buildroot then. >> When a package is build by Buildroot, it can generate a binary, a library or >> provide some header files. >> If your application doesn't bundle intel-socfpga-hwlib sources but it requires >> it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra >> download step. > I agree with Romain. It does not make miuch sense IMHO to just drop > source files like that. And the _EXTRA_DOWNLOADS mechanism is exactly > tailored to such cases. -------------- next part -------------- An HTML attachment was scrubbed... URL: From dario.binacchi at amarulasolutions.com Wed Feb 21 10:19:50 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 21 Feb 2024 11:19:50 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Message-ID: Hi Romain, On Mon, Feb 19, 2024 at 11:15?AM Romain Naour wrote: > > Hello Dario, > > Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > > Recent version of U-Boot use binman to provide a mechanism for building > > images, from simple SPL + U-Boot combinations, to more complex > > arrangements with many parts. > > > > The patch set the BINMAN_INDIRS environment variable to provide the > > directory to search for binary blobs and select the packages required by > > binman. > > > > Co-developed-by: Michael Trimarchi > > Signed-off-by: Michael Trimarchi > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v4: > > - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > > > Changes in v2: > > - Change commit message > > - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > - Select packages required by binman if > > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- > > 1 file changed, 12 insertions(+), 1 deletion(-) > > > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index 0ffcb8235f2e..2a10024aedaa 100644 > > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ > > host-pkgconf \ > > $(BR2_MAKE_HOST_DEPENDENCY) \ > > host-arm-gnu-toolchain \ > > - host-openssl > > + host-openssl \ > > + host-python-attrs \ > > + host-python-jsonschema \ > > + host-python-jsonschema-specifications \ > > + host-python-pyyaml \ > > + host-python-referencing \ > > + host-python-rpds-py > > Most of theses new dependencies are not ti-k3-r5-loader dependencies but > host-python-jsonschema runtime dependencies. I removed the runtime dependencies and tried to modify the patch based on your indications and your patch (http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/), but I'm encountering compilation errors specifically on the Python modules that you indicated as runtime dependencies. I tried to compile ti_am62x_sk_defconfig on your series (i. e. "Add ti_j721e_sk_defconfig"), but it seems like the HSFS option has disappeared. So I need to add the runtime dependencies as well to compile correctly. Thanks and regards, Dario > > Note: host-python-jsonschema depends on > BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS due to its runtime dependency on > host-python-rpds-py. > > > > > TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > > TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > > @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ > > $(BR2_BISON_HOST_DEPENDENCY) \ > > $(BR2_FLEX_HOST_DEPENDENCY) > > > > +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) > > It's a u-boot package config option. just add host-python-pylibfdt the dependency. > > > +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt > > +endif > > + > > ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) > > TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig > > else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) > > @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > > ARCH=arm \ > > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > > + BINMAN_INDIRS=$(BINARIES_DIR) \ > > I suggested to add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN but indeed we should > use binman unconditionally for ti-k3-r5-loader package. > > http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ > > Best regards, > Romain > > > > HOSTLDFLAGS="$(HOST_LDFLAGS)" > > > > define TI_K3_R5_LOADER_BUILD_CMDS > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From david.picard at clermont.in2p3.fr Wed Feb 21 12:25:48 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Wed, 21 Feb 2024 13:25:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> Message-ID: Or should I add LIBFOO_EXTRA_DOWNLOADS to my application package ? Le 21/02/2024 ? 09:36, David Picard a ?crit?: > So, should I submit a package, using the LIBFOO_EXTRA_DOWNLOADS > feature ? What value would you recommend for LIBFOO_DL_DIR ? > > David > > Le 21/02/2024 ? 07:28, Yann E. MORIN a ?crit?: >>>> I did it on purpose. This package is called a library, but it really is a bunch >>>> of C files. You only use a subset, depending on your hardware. This code was >>>> made to be compiled in the application, not as a conventional library. >>>> I could copy the files to STAGING, but cleaning would be more complicated and it >>>> would waste some disk space. >>> Ok, maybe is should not be packaged in Buildroot then. >>> When a package is build by Buildroot, it can generate a binary, a library or >>> provide some header files. >>> If your application doesn't bundle intel-socfpga-hwlib sources but it requires >>> it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra >>> download step. >> I agree with Romain. It does not make miuch sense IMHO to just drop >> source files like that. And the _EXTRA_DOWNLOADS mechanism is exactly >> tailored to such cases. > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From antoine.coutant at smile.fr Wed Feb 21 13:26:10 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Wed, 21 Feb 2024 14:26:10 +0100 Subject: [Buildroot] [PATCH v4 4/7] package/opencl-headers: new package In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-5-antoine.coutant@smile.fr> Message-ID: Yann, All, On 12/02/2024 14:44, Antoine Coutant wrote: > > Yann, All, > > On 07/02/2024 16:58, Yann E. MORIN wrote: >> Antoine, All, >> >> On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >>> From: Sebastian Weyer >>> >>> These headers provide the C language API bindings. It is a complement to >>> the C++ bindings already available in opencl-clhpp. This package is >>> required to build opencl-icd-loader: >>> >>> https://github.com/KhronosGroup/OpenCL-ICD-Loader#dependencies >>> >>> Signed-off-by: Sebastian Weyer >>> Signed-off-by: Antoine Coutant >>> --- >> [--SNIP--] >>> diff --git a/package/opencl-headers/Config.in b/package/opencl-headers/Config.in >>> new file mode 100644 >>> index 0000000000..092d8a2a4d >>> --- /dev/null >>> +++ b/package/opencl-headers/Config.in >>> @@ -0,0 +1,7 @@ >>> +config BR2_PACKAGE_OPENCL_HEADERS >>> + bool "opencl-headers" >>> + depends on BR2_PACKAGE_HAS_LIBOPENCL >> BR2_PACKAGE_HAS_LIBOPENCL can be set by mesa3d when BR2_PACKAGE_MESA3D_OPENCL >> is enabled. In this case, will mesa3d install its own headers? If so, >> that will generate a conflict. > > BR2_PACKAGE_HAS_LIBOPENCL doesn't guarantee that CL headers > > will be installed. Mesa3d install headers if Clover is enabled and > > opencl-icd is disabled [1]. So you are right, it will generate conflict in > > case OpenCL-Headers and Clover are built without icd mode. > >> Furthermore, this will also conflict with mesa3d-headers, and it also >> installs CL headers. > Yes, this will generate the same conflict here... Besides, the Mesa build system does not install headers if icd option is enabled. I think the reason is that OpenCL-ICD-Loader explicitly depends on OpenCL-Headers [1]. Thus, mesa lets users install the headers that match opencl-icd-loader version. Mesa build system is designed to not install CL headers when they are installed by ICD Loader. However, Buildroot package mesa3d-headers does not check this condition and install CL headers as soon as libopencl is present. Thus, I think that I will add a dependency to prevent mesa3d-headers from installing headers when OpenCL-Headers package is selected. [1]: https://github.com/KhronosGroup/OpenCL-ICD-Loader?tab=readme-ov-file#dependencies >> So, why do we need opencl-headers and can't rely on the existing >> mesa3d-headers package? > > The problem is that the headers installed by mesa differ from those > > in the OpenCL-Headers package. > > $ diff -q OpenCL-Headers/CL/cl_icd.h mesa/include/CL/cl_icd.h > Files OpenCL-Headers/CL/cl_icd.h and mesa/include/CL/cl_icd.h differ > > This diff was performed using OpenCL-Headers v2023.12.14 and > > mesa-23.3.4. Moreover, cl_layer.h, cl_half.h and cl_function_types.h > files are > > missing from mesa headers. These differences causes errors when building > > opencl-icd-loader: > > ... > > ./build/opencl-icd-loader-2023.12.14/loader/icd.c:23:10: fatal error: > CL/cl_layer.h: No such file or directory > > ???23 | #include > > | ^~~~~~~~~~~~~~~ > > compilation terminated. > > ./build/opencl-icd-loader-2023.12.14/loader/icd_dispatch.c:26:8: > error: unknown type name ?clGetICDLoaderInfoOCLICD_t? > > ???26 | static clGetICDLoaderInfoOCLICD_t clGetICDLoaderInfoOCLICD; > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > ... > > This is why we cannot rely on mesa3d headers and why OpenCL-Headers > > package is required. > >> Regards, >> Yann E. MORIN. > > I will add guards to prevent conflicts in the v5. And add some lines > > in the commit log to explain why mesa3d headers can't be used to > > build OpenCL-ICD-Loader. > > > Thanks for your feedback ! > > > [1]: > https://gitlab.freedesktop.org/mesa/mesa/-/blob/23.3/include/meson.build?ref_type=heads#L135 > > > Regards, > > Antoine Coutant > -------------- next part -------------- An HTML attachment was scrubbed... URL: From jubalh at iodoru.org Wed Feb 21 14:30:01 2024 From: jubalh at iodoru.org (Michael Vetter) Date: Wed, 21 Feb 2024 15:30:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.13.1 Message-ID: <20240221143001.30174-1-jubalh@iodoru.org> Signed-off-by: Michael Vetter --- package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index e284e8cca6..ec5a55985a 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz +sha256 86c0abd348ae66feb40b6886f2c7f04525f1d5b20a48c10d4db4ed532dc63f22 libstrophe-0.13.1.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index 257593bbec..42d582fe9c 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.13.0 +LIBSTROPHE_VERSION = 0.13.1 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf -- 2.35.3 From romain.naour at smile.fr Wed Feb 21 15:29:22 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 21 Feb 2024 16:29:22 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> Message-ID: <7c4ef18e-774f-4a65-8e51-7a016ed89649@smile.fr> Hello Dario, Le 21/02/2024 ? 11:19, Dario Binacchi a ?crit?: > Hi Romain, > > On Mon, Feb 19, 2024 at 11:15?AM Romain Naour wrote: >> >> Hello Dario, >> >> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : >>> Recent version of U-Boot use binman to provide a mechanism for building >>> images, from simple SPL + U-Boot combinations, to more complex >>> arrangements with many parts. >>> >>> The patch set the BINMAN_INDIRS environment variable to provide the >>> directory to search for binary blobs and select the packages required by >>> binman. >>> >>> Co-developed-by: Michael Trimarchi >>> Signed-off-by: Michael Trimarchi >>> Signed-off-by: Dario Binacchi >>> >>> --- >>> >>> Changes in v4: >>> - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >>> >>> Changes in v2: >>> - Change commit message >>> - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option >>> - Select packages required by binman if >>> BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled >>> >>> Signed-off-by: Dario Binacchi >>> --- >>> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- >>> 1 file changed, 12 insertions(+), 1 deletion(-) >>> >>> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> index 0ffcb8235f2e..2a10024aedaa 100644 >>> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ >>> host-pkgconf \ >>> $(BR2_MAKE_HOST_DEPENDENCY) \ >>> host-arm-gnu-toolchain \ >>> - host-openssl >>> + host-openssl \ >>> + host-python-attrs \ >>> + host-python-jsonschema \ >>> + host-python-jsonschema-specifications \ >>> + host-python-pyyaml \ >>> + host-python-referencing \ >>> + host-python-rpds-py >> >> Most of theses new dependencies are not ti-k3-r5-loader dependencies but >> host-python-jsonschema runtime dependencies. > > I removed the runtime dependencies and tried to modify the patch based > on your indications and your patch > (http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/), > but I'm encountering compilation errors specifically on the Python > modules that you indicated as runtime > dependencies. What's the issue? Make sure to take host-python changes from my series, some of them was updated with their own runtime dependencies: For example: http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-7-romain.naour at smile.fr/ I tried to compile ti_am62x_sk_defconfig on your series > (i. e. "Add ti_j721e_sk_defconfig"), > but it seems like the HSFS option has disappeared. Indeed, this is something we need to improve. > So I need to add the runtime dependencies as well to compile correctly. Can you try with only patch 4/21 (package/python-attrs: add host variant) to patch 10/21 (boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option). Maybe update the last patch 10/21 since it was suggested to remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option to make binman use mandatory for ti-k3-r5-loader package. Best regards, Romain > > Thanks and regards, > Dario > >> >> Note: host-python-jsonschema depends on >> BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS due to its runtime dependency on >> host-python-rpds-py. >> >>> >>> TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) >>> TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) >>> @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ >>> $(BR2_BISON_HOST_DEPENDENCY) \ >>> $(BR2_FLEX_HOST_DEPENDENCY) >>> >>> +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) >> >> It's a u-boot package config option. just add host-python-pylibfdt the dependency. >> >>> +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt >>> +endif >>> + >>> ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) >>> TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig >>> else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) >>> @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ >>> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ >>> ARCH=arm \ >>> HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ >>> + BINMAN_INDIRS=$(BINARIES_DIR) \ >> >> I suggested to add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN but indeed we should >> use binman unconditionally for ti-k3-r5-loader package. >> >> http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ >> >> Best regards, >> Romain >> >> >>> HOSTLDFLAGS="$(HOST_LDFLAGS)" >>> >>> define TI_K3_R5_LOADER_BUILD_CMDS >> > > From romain.naour at smile.fr Wed Feb 21 15:33:05 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 21 Feb 2024 16:33:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: References: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> Message-ID: <8a008e9a-410f-406a-8e8c-0ce1724c1643@smile.fr> Hello David, Le 21/02/2024 ? 13:25, David Picard a ?crit?: > Or should I add LIBFOO_EXTRA_DOWNLOADS to my application package ? See an example how to use _EXTRA_DOWNLOADS: https://gitlab.com/buildroot.org/buildroot/-/blob/master/package/tesseract-ocr/tesseract-ocr.mk?ref_type=heads#L58 Best regards, Romain > > Le 21/02/2024 ? 09:36, David Picard a ?crit?: >> So, should I submit a package, using the LIBFOO_EXTRA_DOWNLOADS feature ? What >> value would you recommend for LIBFOO_DL_DIR ? >> >> David >> >> Le 21/02/2024 ? 07:28, Yann E. MORIN a ?crit?: >>>>> I did it on purpose. This package is called a library, but it really is a bunch >>>>> of C files. You only use a subset, depending on your hardware. This code was >>>>> made to be compiled in the application, not as a conventional library. >>>>> I could copy the files to STAGING, but cleaning would be more complicated and it >>>>> would waste some disk space. >>>> Ok, maybe is should not be packaged in Buildroot then. >>>> When a package is build by Buildroot, it can generate a binary, a library or >>>> provide some header files. >>>> If your application doesn't bundle intel-socfpga-hwlib sources but it requires >>>> it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra >>>> download step. >>> I agree with Romain. It does not make miuch sense IMHO to just drop >>> source files like that. And the _EXTRA_DOWNLOADS mechanism is exactly >>> tailored to such cases. >> >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From dannenberg at ti.com Wed Feb 21 15:48:47 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Wed, 21 Feb 2024 09:48:47 -0600 Subject: [Buildroot] [PATCH v4 18/20] boot/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-19-dario.binacchi@amarulasolutions.com> <3aa236a2-d78d-42aa-881d-72747eaffe70@smile.fr> <20240220012848.76amyog5pecsgld4@dasso> <20240220203200.uq2dpvky2rbv6tcw@dasso> Message-ID: <20240221154847.wnv5jkzibejbh3wv@dasso> On Tue, Feb 20, 2024 at 11:06:26PM +0100, Romain Naour wrote: > Hi Andreas, > > Le 20/02/2024 ? 21:32, Andreas Dannenberg a ?crit?: > > Dear Romain, Dario, Thomas: > > > > On Tue, Feb 20, 2024 at 10:32:14AM +0100, Romain Naour wrote: > >> Hi Dario, > >> > >> Le 20/02/2024 ? 10:05, Dario Binacchi a ?crit?: > >>> Hi Andreas, Romain, All > >>> > >>> On Tue, Feb 20, 2024 at 2:28?AM Andreas Dannenberg wrote: > >>>> > >>>> Romain, Dario, > >>>> > >>>> On Mon, Feb 19, 2024 at 11:28:59AM +0100, Romain Naour wrote: > >>>>> Hello Dario, > >>>>> > >>>>> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > >>>>>> Recent versions of U-Boot can use Binman to compile and sign the generated > >>>>>> binaries, thus making the use of custom tools like ti-k3-image-gen no > >>>>>> longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > >>>>>> configured and used outside of it. This patch allows setting such options > >>>>>> even if the package is not enabled. > >>>>> > >>>>> I'm agree that Buildroot doesn't provide any "Platform selection" as the Linux > >>>>> kernel and I'm not sure where those TI_K3_{SECTYPE,SOC} should belong. > >>>> > >>>> There were discussions/suggestions around this before by Yann E Morin > >>>> [1] and Thomas Petazzoni [2]. I think the gist of it was to move the > >>>> selection to a new package like BR2_PACKAGE_TI_K3_PLATFORM containing > >>>> all the K3 SoC specific selections. And then other packages and Kconfig > >>>> menues can depend on it more cleanly. Like it's currently done with > >>>> package/freescale-imx/Config.in. This would also bring some consistency > >>>> in how those NXP and TI device families are managed, which will make for > >>>> a better end-user experience I think. > >>> > >>> If I'm not mistaken, I think the patches: > >>> [18/20] boot/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > >>> [17/20] boot: move ti-k3-* packages to 'ti-k3' directory > >>> Are heading in the direction of what we find in > >>> package/freescale-imx/, with the only difference being > >>> that in our case, we're under boot. > >>> So, can I consider these two patches correct? > > > > Yes the general direction those are headed is a good... > > > >> Yes, can you try to move ti-k3 to package directory in V5 ? > >> It would also be used later by the GPU rogue firmwares. > > > > ...and yes, for alignment sake with IMX it would be even better to have > > it in package/, while also keeping some alignment with the naming of the > > CONFIG options (hence my comment with 'BR2_PACKAGE_TI_K3_PLATFORM'). > > > > > > Hi Thomas, > > assuming we create a new package called 'package/ti-k3' I was trying to > > figure out what would be the best way to name the associated CONFIG > > options that control device security settings and can be used to > > determine which device is being used (for later uses in context of GPU > > drivers and other device capabilities)? > > > > I see different naming conventions being used, like this: > > > > 1) BR2_PACKAGE_* > > 2) BR2_TARGET_* > > Well, it seems we use BR2_TARGET_* for package in boot/ directory instead of > BR2_BOOT_* for "legacy" reason :) > > At some point in the history of Buildroot the target/ directory existed and was > used to package bootloaders: > > https://gitlab.com/buildroot.org/buildroot/-/commit/d7d57699ef83cce36d87bef73c9e1fbdc765a64c > > But BR2_TARGET_* symbol was keep for packages (like grub) when booloaders was > moved to boot/. > > > 3) BR2_BOOT_* > > So, there is no such BR2_BOOT_* option. > Ok, thanks for the additional historic context. > > > > Seems like BR2_TARGET_* what we have now would be most appropriate, but > > then the IMX stuff uses BR2_PACKAGE_*, which *seems* to be reserved for > > "userspace" (non-boot) packages as far as I can tell from my poor-man's > > research. While I'd like to align things, the use of the BR2_PACKAGE_* > > prefix may or may not be appropriate for our new additions here? > > BR2_PACKAGE_* is appropriate here. > > We still have BR2_TARGET_* in Buildroot since some Kconfig symbol are really old > and it is not easy to replace them without breaking existing defconfig > (especially the out of tree one). Understood & glad we are discussing this. -- Andreas Dannenberg Texas Instruments Inc > > > > > Just was hoping to get some guidance here so we don't need to re-work > > this too many times. > > It seems ok for me, lets see the upcoming V5 from Dario. > > Best regards, > Romain > > > > > > > > -- > > Andreas Dannenberg > > Texas Instruments Inc > > > > > > > >> > >> Please add a comment in the commit log that we make an exception to the rule "no > >> subdirectory in package directory". > >> > >> Thanks! > >> > >> Best regards, > >> Romain > >> > >> > >>> > >>> Thanks and regards, > >>> Dario > >>> > >>>> > >>>> > >>>> > >>>> -- > >>>> Andreas Dannenberg > >>>> Texas Instruments Inc > >>>> > >>>> [1] http://lists.busybox.net/pipermail/buildroot/2023-June/669342.html > >>>> [2] http://lists.busybox.net/pipermail/buildroot/2023-August/673292.html > >>>> > >>>> > >>>>> > >>>>> Best regards, > >>>>> Romain > >>>>> > >>>>> > >>>>>> > >>>>>> --- > >>>>>> > >>>>>> Added in v4 > >>>>>> > >>>>>> Signed-off-by: Dario Binacchi > >>>>>> --- > >>>>>> boot/ti-k3/Config.in | 46 ++++++++++++++ > >>>>>> boot/ti-k3/ti-k3-image-gen/Config.in | 63 ++----------------- > >>>>>> boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk | 6 +- > >>>>>> boot/uboot/Config.in | 7 +-- > >>>>>> configs/ti_am62x_sk_defconfig | 2 +- > >>>>>> configs/ti_am64x_sk_defconfig | 2 +- > >>>>>> 6 files changed, 59 insertions(+), 67 deletions(-) > >>>>>> > >>>>>> diff --git a/boot/ti-k3/Config.in b/boot/ti-k3/Config.in > >>>>>> index 06dda2f156a9..9e508326c9c8 100644 > >>>>>> --- a/boot/ti-k3/Config.in > >>>>>> +++ b/boot/ti-k3/Config.in > >>>>>> @@ -5,6 +5,52 @@ config BR2_TARGET_TI_K3 > >>>>>> > >>>>>> if BR2_TARGET_TI_K3 > >>>>>> > >>>>>> +choice > >>>>>> + prompt "SoC family" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SOC_AM62AX > >>>>>> + bool "am62ax" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SOC_AM62X > >>>>>> + bool "am62x" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SOC_AM64X > >>>>>> + bool "am64x" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SOC_AM65X > >>>>>> + bool "am65x" > >>>>>> + > >>>>>> +endchoice > >>>>>> + > >>>>>> +choice > >>>>>> + prompt "Security type" > >>>>>> + help > >>>>>> + The target SoC security type option. > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_GP > >>>>>> + bool "gp" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_HS_FS > >>>>>> + bool "hs-fs" > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SECTYPE_HS > >>>>>> + bool "hs" > >>>>>> + > >>>>>> +endchoice > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SOC > >>>>>> + string > >>>>>> + default "am62ax" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>>>> + default "am62x" if BR2_TARGET_TI_K3_SOC_AM62X > >>>>>> + default "am64x" if BR2_TARGET_TI_K3_SOC_AM64X > >>>>>> + default "am65x" if BR2_TARGET_TI_K3_SOC_AM65X > >>>>>> + > >>>>>> +config BR2_TARGET_TI_K3_SECTYPE > >>>>>> + string > >>>>>> + default "gp" if BR2_TARGET_TI_K3_SECTYPE_GP > >>>>>> + default "hs-fs" if BR2_TARGET_TI_K3_SECTYPE_HS_FS > >>>>>> + default "hs" if BR2_TARGET_TI_K3_SECTYPE_HS > >>>>>> + > >>>>>> source "boot/ti-k3/ti-k3-boot-firmware/Config.in" > >>>>>> source "boot/ti-k3/ti-k3-core-secdev/Config.in" > >>>>>> source "boot/ti-k3/ti-k3-image-gen/Config.in" > >>>>>> diff --git a/boot/ti-k3/ti-k3-image-gen/Config.in b/boot/ti-k3/ti-k3-image-gen/Config.in > >>>>>> index 38d1598d9fc0..2d53d62dd4ee 100644 > >>>>>> --- a/boot/ti-k3/ti-k3-image-gen/Config.in > >>>>>> +++ b/boot/ti-k3/ti-k3-image-gen/Config.in > >>>>>> @@ -2,7 +2,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > >>>>>> bool "ti-k3-image-gen" > >>>>>> depends on BR2_TARGET_TI_K3_R5_LOADER > >>>>>> select BR2_TARGET_TI_K3_BOOT_FIRMWARE > >>>>>> - select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS || BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>>>> + select BR2_TARGET_TI_K3_CORE_SECDEV if BR2_TARGET_TI_K3_SECTYPE_HS_FS || BR2_TARGET_TI_K3_SECTYPE_HS > >>>>>> # We need FIT support in uboot-tools, which is why we select a > >>>>>> # host package > >>>>>> select BR2_PACKAGE_HOST_UBOOT_TOOLS > >>>>>> @@ -14,65 +14,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > >>>>>> https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > >>>>>> > >>>>>> if BR2_TARGET_TI_K3_IMAGE_GEN > >>>>>> -choice > >>>>>> - prompt "SoC family" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>>>> - bool "am62ax" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>>>> - bool "am62x" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>>>> - bool "am64x" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>>>> - bool "am65x" > >>>>>> - > >>>>>> -endchoice > >>>>>> - > >>>>>> -choice > >>>>>> - prompt "Security type" > >>>>>> - help > >>>>>> - The target SoC security type option for image gen. Valid > >>>>>> - options are "gp" for General Purpose devices, "hs-fs" for > >>>>>> - High Security - Field Securable devices, or "hs" for High > >>>>>> - Security - Security Enforcing devices. Note for all High > >>>>>> - Security device variants the TI_SECURE_DEV_PKG environmental > >>>>>> - variable must be defined at build time pointing to a valid > >>>>>> - core-secdev-k3 folder location, otherwise the build will > >>>>>> - fail, see > >>>>>> - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > >>>>>> - bool "gp" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > >>>>>> - bool "hs-fs" > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>>>> - bool "hs" > >>>>>> - > >>>>>> -endchoice > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > >>>>>> - string > >>>>>> - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>>>> - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>>>> - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>>>> - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>>>> > >>>>>> config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > >>>>>> string > >>>>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>>>> - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > >>>>>> - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > >>>>>> - > >>>>>> -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > >>>>>> - string > >>>>>> - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > >>>>>> - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > >>>>>> - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > >>>>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>>>> + default "ti-fs" if BR2_TARGET_TI_K3_SOC_AM62X > >>>>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM64X > >>>>>> + default "ti-sci" if BR2_TARGET_TI_K3_SOC_AM65X > >>>>>> > >>>>>> endif > >>>>>> diff --git a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>>>> index 74b4fcb4bf89..834d8f7d5cd5 100644 > >>>>>> --- a/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>>>> +++ b/boot/ti-k3/ti-k3-image-gen/ti-k3-image-gen.mk > >>>>>> @@ -26,10 +26,10 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > >>>>>> $(BR2_MAKE_HOST_DEPENDENCY) > >>>>>> > >>>>>> TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > >>>>>> -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > >>>>>> -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > >>>>>> +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_SOC)) > >>>>>> +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > >>>>>> > >>>>>> -ifeq ($(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP),y) > >>>>>> +ifeq ($(BR2_TARGET_TI_K3_SECTYPE_GP),y) > >>>>>> TI_K3_IMAGE_GEN_SYSFW = \ > >>>>>> $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > >>>>>> else > >>>>>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > >>>>>> index beafb38930db..1a9d21e7c6d1 100644 > >>>>>> --- a/boot/uboot/Config.in > >>>>>> +++ b/boot/uboot/Config.in > >>>>>> @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > >>>>>> bool "U-Boot needs TI K3 Device Manager (DM)" > >>>>>> # We use the SoC selection defined for the ti-k3-image-gen > >>>>>> # package > >>>>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN > >>>>>> - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>>>> + depends on BR2_TARGET_TI_K3_SOC_AM62AX || BR2_TARGET_TI_K3_SOC_AM62X > >>>>>> help > >>>>>> Some TI K3 devices need the Device Manager (DM) firmware to > >>>>>> be available for the U-Boot build. > >>>>>> @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > >>>>>> > >>>>>> config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > >>>>>> string > >>>>>> - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > >>>>>> - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > >>>>>> + default "am62axx" if BR2_TARGET_TI_K3_SOC_AM62AX > >>>>>> + default "am62xx" if BR2_TARGET_TI_K3_SOC_AM62X > >>>>>> > >>>>>> endif > >>>>>> > >>>>>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > >>>>>> index cd26235342e4..cfefce0a77a4 100644 > >>>>>> --- a/configs/ti_am62x_sk_defconfig > >>>>>> +++ b/configs/ti_am62x_sk_defconfig > >>>>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am62x" > >>>>>> BR2_TARGET_TI_K3=y > >>>>>> +BR2_TARGET_TI_K3_SOC_AM62X=y > >>>>>> BR2_TARGET_TI_K3_IMAGE_GEN=y > >>>>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > >>>>>> diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > >>>>>> index 1befeb4ab96c..daf78dbffff8 100644 > >>>>>> --- a/configs/ti_am64x_sk_defconfig > >>>>>> +++ b/configs/ti_am64x_sk_defconfig > >>>>>> @@ -24,8 +24,8 @@ BR2_TARGET_OPTEE_OS=y > >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > >>>>>> BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR="am64x" > >>>>>> BR2_TARGET_TI_K3=y > >>>>>> +BR2_TARGET_TI_K3_SOC_AM64X=y > >>>>>> BR2_TARGET_TI_K3_IMAGE_GEN=y > >>>>>> -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > >>>>>> BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > >>>>> > >>> > >>> > >>> > >> > From romain.naour at smile.fr Wed Feb 21 16:19:09 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 21 Feb 2024 17:19:09 +0100 Subject: [Buildroot] [PATCH] support/testing: TestCheckPackage: update expected strings Message-ID: <20240221161909.40317-1-romain.naour@smile.fr> Commit dfed5acb56 ("utils/check-package: use https for the manual URL") replaced the default url to the Buildroot manual while it was used by TestCheckPackage test. Update TestCheckPackage with https url. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243484 Cc: Yann E. MORIN Signed-off-by: Romain Naour --- support/testing/tests/utils/test_check_package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 9aa117d211..2125b34170 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -200,13 +200,13 @@ class TestCheckPackage(unittest.TestCase): self.WITH_UTILS_IN_PATH, abs_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) w, m = call_script(["check-package", "-b", abs_file], self.WITH_UTILS_IN_PATH, infra.basepath()) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) # br2-external with ignore list topdir_path = infra.filepath("tests/utils/br2-external") -- 2.43.0 From antoine.coutant at smile.fr Wed Feb 21 16:55:36 2024 From: antoine.coutant at smile.fr (Antoine Coutant) Date: Wed, 21 Feb 2024 17:55:36 +0100 Subject: [Buildroot] [PATCH v4 4/7] package/opencl-headers: new package In-Reply-To: References: <20240202093625.1409559-1-antoine.coutant@smile.fr> <20240202093625.1409559-5-antoine.coutant@smile.fr> Message-ID: Yann, All, On 12/02/2024 14:44, Antoine Coutant wrote: > > Yann, All, > > On 07/02/2024 16:58, Yann E. MORIN wrote: >> Antoine, All, >> >> On 2024-02-02 10:36 +0100, Antoine Coutant spake thusly: >>> From: Sebastian Weyer >>> >>> These headers provide the C language API bindings. It is a complement to >>> the C++ bindings already available in opencl-clhpp. This package is >>> required to build opencl-icd-loader: >>> >>> https://github.com/KhronosGroup/OpenCL-ICD-Loader#dependencies >>> >>> Signed-off-by: Sebastian Weyer >>> Signed-off-by: Antoine Coutant >>> --- [--SNIP--] >> So, why do we need opencl-headers and can't rely on the existing >> mesa3d-headers package? > > The problem is that the headers installed by mesa differ from those > > in the OpenCL-Headers package. > > $ diff -q OpenCL-Headers/CL/cl_icd.h mesa/include/CL/cl_icd.h > Files OpenCL-Headers/CL/cl_icd.h and mesa/include/CL/cl_icd.h differ > > This diff was performed using OpenCL-Headers v2023.12.14 and > > mesa-23.3.4. Moreover, cl_layer.h, cl_half.h and cl_function_types.h > files are > > missing from mesa headers. These differences causes errors when building > > opencl-icd-loader: > > ... > > ./build/opencl-icd-loader-2023.12.14/loader/icd.c:23:10: fatal error: > CL/cl_layer.h: No such file or directory > > ???23 | #include > > | ^~~~~~~~~~~~~~~ > > compilation terminated. > > ./build/opencl-icd-loader-2023.12.14/loader/icd_dispatch.c:26:8: > error: unknown type name ?clGetICDLoaderInfoOCLICD_t? > > ???26 | static clGetICDLoaderInfoOCLICD_t clGetICDLoaderInfoOCLICD; > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > > ... > > This is why we cannot rely on mesa3d headers and why OpenCL-Headers > > package is required. > Besides, mesa3d CL headers regroups headers from OpenCL-Headers and OpenCL-CLHPP [1][2][3]. The opencl-clhpp package already exist. It have been added in commit 2ae78f1c794c145486baf5c39703443207fead4c [4] when adding clpeak. Indeed, clpeak was downloading opencl-clhpp during the configuration phase [5]. It appears that nothing prevent conflicts between opencl-clhpp headers and mesa3d headers (installed by mesa3d-headers and mesa3d packages). Moreover, both files are different: $ md5sum OpenCL-CLHPP/include/CL/opencl.hpp 784d2b2283d605b30ad6c663a08ff71f OpenCL-CLHPP/include/CL/opencl.hpp $ md5sum mesa/include/CL/opencl.hpp 6afa428040ec96709fc009fe514ef750? mesa/include/CL/opencl.hpp With opencl-clhpp v2.0.16 and mesa-23.3.5 (versions used in buildroot when this mail is sent). I will check if it is possible to rely on mesa3d headers. If it's possible I will remove this package (only used by clpeak) and rely on mesa3d headers. If it's not possible, i will add guards to prevent the conflict. [1]: https://gitlab.freedesktop.org/mesa/mesa/-/tree/24.0/include/CL [2]: https://github.com/KhronosGroup/OpenCL-Headers/tree/v2023.12.14/CL [3]: https://github.com/KhronosGroup/OpenCL-CLHPP/tree/v2023.12.14/include/CL [4]: http://patchwork.ozlabs.org/project/buildroot/patch/20220116175320.453041-1-gilles.talis at gmail.com/ [5]: http://patchwork.ozlabs.org/project/buildroot/patch/20211024113654.88720-1-gilles.talis at gmail.com/ >> Regards, >> Yann E. MORIN. > > I will add guards to prevent conflicts in the v5. And add some lines > > in the commit log to explain why mesa3d headers can't be used to > > build OpenCL-ICD-Loader. > > > Thanks for your feedback ! > > > [1]: > https://gitlab.freedesktop.org/mesa/mesa/-/blob/23.3/include/meson.build?ref_type=heads#L135 > > > Regards, > > Antoine Coutant > >>> + help >>> + C language headers for the OpenCL API >>> + >>> + https://github.com/KhronosGroup/OpenCL-Headers >>> diff --git a/package/opencl-headers/opencl-headers.hash b/package/opencl-headers/opencl-headers.hash >>> new file mode 100644 >>> index 0000000000..802ed05450 >>> --- /dev/null >>> +++ b/package/opencl-headers/opencl-headers.hash >>> @@ -0,0 +1,3 @@ >>> +#Locally generated >>> +sha256 407d5e109a70ec1b6cd3380ce357c21e3d3651a91caae6d0d8e1719c69a1791d OpenCL-Headers-2023.12.14.tar.gz >>> +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE >>> diff --git a/package/opencl-headers/opencl-headers.mk b/package/opencl-headers/opencl-headers.mk >>> new file mode 100644 >>> index 0000000000..7aa0e0d168 >>> --- /dev/null >>> +++ b/package/opencl-headers/opencl-headers.mk >>> @@ -0,0 +1,22 @@ >>> +################################################################################ >>> +# >>> +# opencl-headers >>> +# >>> +################################################################################ >>> + >>> +OPENCL_HEADERS_VERSION = 2023.12.14 >>> +OPENCL_HEADERS_SOURCE = OpenCL-Headers-$(OPENCL_HEADERS_VERSION).tar.gz >>> +OPENCL_HEADERS_SITE = $(call github,KhronosGroup,OpenCL-Headers,v$(OPENCL_HEADERS_VERSION)) >>> +OPENCL_HEADERS_LICENSE = Apache-2.0 >>> +OPENCL_HEADERS_LICENSE_FILES = LICENSE >>> +OPENCL_HEADERS_INSTALL_STAGING = YES >>> + >>> +OPENCL_HEADERS_INSTALL_TARGET = NO >>> + >>> +define OPENCL_HEADERS_INSTALL_STAGING_CMDS >>> + mkdir -p $(STAGING_DIR)/usr/include/CL >>> + $(INSTALL) -D -m 0644 $(@D)/CL/* \ >>> + $(STAGING_DIR)/usr/include/CL >>> +endef >>> + >>> +$(eval $(generic-package)) >>> -- >>> 2.25.1 >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: From yann.morin.1998 at free.fr Wed Feb 21 17:04:43 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:04:43 +0100 Subject: [Buildroot] [git commit] support/testing: TestCheckPackage: update expected strings Message-ID: <20240221170456.A71E6879D4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9990552eb8b88647104bbec82555b2c407aa6be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit dfed5acb56 ("utils/check-package: use https for the manual URL") replaced the default url to the Buildroot manual while it was used by TestCheckPackage test. Update TestCheckPackage with https url. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243484 Cc: Yann E. MORIN Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/testing/tests/utils/test_check_package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 9aa117d211..2125b34170 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -200,13 +200,13 @@ class TestCheckPackage(unittest.TestCase): self.WITH_UTILS_IN_PATH, abs_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) w, m = call_script(["check-package", "-b", abs_file], self.WITH_UTILS_IN_PATH, infra.basepath()) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) # br2-external with ignore list topdir_path = infra.filepath("tests/utils/br2-external") From yann.morin.1998 at free.fr Wed Feb 21 17:05:15 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:05:15 +0100 Subject: [Buildroot] [PATCH] support/testing: TestCheckPackage: update expected strings In-Reply-To: <20240221161909.40317-1-romain.naour@smile.fr> References: <20240221161909.40317-1-romain.naour@smile.fr> Message-ID: Romain, All, On 2024-02-21 17:19 +0100, Romain Naour spake thusly: > Commit dfed5acb56 ("utils/check-package: use https for the manual URL") > replaced the default url to the Buildroot manual while it was used > by TestCheckPackage test. > > Update TestCheckPackage with https url. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243484 > > Cc: Yann E. MORIN > Signed-off-by: Romain Naour Applied to master, thanks for fixing my mess! Regards, Yann E. MORIN. > --- > support/testing/tests/utils/test_check_package.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py > index 9aa117d211..2125b34170 100644 > --- a/support/testing/tests/utils/test_check_package.py > +++ b/support/testing/tests/utils/test_check_package.py > @@ -200,13 +200,13 @@ class TestCheckPackage(unittest.TestCase): > self.WITH_UTILS_IN_PATH, abs_path) > self.assert_file_was_processed(m) > self.assert_warnings_generated_for_file(m) > - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) > + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) > > w, m = call_script(["check-package", "-b", abs_file], > self.WITH_UTILS_IN_PATH, infra.basepath()) > self.assert_file_was_processed(m) > self.assert_warnings_generated_for_file(m) > - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) > + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) > > # br2-external with ignore list > topdir_path = infra.filepath("tests/utils/br2-external") > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:08:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:08:14 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 254.9 In-Reply-To: <04a28a98-2699-44b6-b5d5-697a1a6fe893@bubu1.eu> References: <20240219182604.1287000-1-buildroot@bubu1.eu> <04a28a98-2699-44b6-b5d5-697a1a6fe893@bubu1.eu> Message-ID: Marcus, All, +Thomas On 2024-02-19 22:30 +0100, Marcus Hoffmann via buildroot spake thusly: > On 19.02.24 22:14, Yann E. MORIN wrote: > > Please watch the gitlab pipeline for any failure of the runtimet tests, > > just in case this minor version bump breaks anything. > So if I understood that correctly I can add myself as a maintainer of the > runtime test files and I'll get an email when that test fails? Or is that > not how it works? As far as I understand, yes, this is what should happen. Thomas has some scripting (somewhere!) that sends the daily emails, so he'd have the authoritative answer. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:09:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:09:35 +0100 Subject: [Buildroot] [git commit] package/libmodsecurity: security bump to 3.0.12 Message-ID: <20240221171350.112C3879E5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4b065e35c47efa9a347abad0a8cfbf024a12e60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The project has been transferred from Trustwave (SpiderLabs) to OWASP, hence the change in URLs. The upstream CPE vendor ID will likely also change in the future but the upstream is still working on this [1]. - Fixes: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-1019 [1] https://github.com/owasp-modsecurity/ModSecurity/issues/3083 Signed-off-by: Frank Vanbever Signed-off-by: Yann E. MORIN --- package/libmodsecurity/Config.in | 2 +- package/libmodsecurity/libmodsecurity.hash | 5 +++-- package/libmodsecurity/libmodsecurity.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index 69bb0494cc..da14b21669 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBMODSECURITY SecRules format and apply them to HTTP content provided by your application via Connectors. - https://github.com/SpiderLabs/ModSecurity + https://github.com/owasp-modsecurity/ModSecurity comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index b0a1bf33f3..2221a8a37d 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.11/modsecurity-v3.0.11.tar.gz.sha256 -sha256 070f46c779d30785b95eb1316b46e2e4e6f90fd94a96aaca4bd54cd94738b692 modsecurity-v3.0.11.tar.gz +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 +sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz + # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 548eeb8602..d8c10b98b2 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.11 +LIBMODSECURITY_VERSION = 3.0.12 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz -LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) +LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE From yann.morin.1998 at free.fr Wed Feb 21 17:14:06 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:14:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libmodsecurity: security bump to 3.0.12 In-Reply-To: <20240217092413.288309-1-frank.vanbever@mind.be> References: <20240217092413.288309-1-frank.vanbever@mind.be> Message-ID: Frank, All, On 2024-02-17 10:24 +0100, Frank Vanbever via buildroot spake thusly: > The project has been transferred from Trustwave (SpiderLabs) to OWASP, hence the > change in URLs. The upstream CPE vendor ID will likely also change in the future > but the upstream is still working on this [1]. > > - Fixes: > https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-1019 > > [1] https://github.com/owasp-modsecurity/ModSecurity/issues/3083 > > Signed-off-by: Frank Vanbever Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libmodsecurity/Config.in | 2 +- > package/libmodsecurity/libmodsecurity.hash | 5 +++-- > package/libmodsecurity/libmodsecurity.mk | 4 ++-- > 3 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in > index 69bb0494cc..da14b21669 100644 > --- a/package/libmodsecurity/Config.in > +++ b/package/libmodsecurity/Config.in > @@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBMODSECURITY > SecRules format and apply them to HTTP content > provided by your application via Connectors. > > - https://github.com/SpiderLabs/ModSecurity > + https://github.com/owasp-modsecurity/ModSecurity > > comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" > depends on !BR2_INSTALL_LIBSTDCPP || \ > diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash > index b0a1bf33f3..2221a8a37d 100644 > --- a/package/libmodsecurity/libmodsecurity.hash > +++ b/package/libmodsecurity/libmodsecurity.hash > @@ -1,4 +1,5 @@ > -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.11/modsecurity-v3.0.11.tar.gz.sha256 > -sha256 070f46c779d30785b95eb1316b46e2e4e6f90fd94a96aaca4bd54cd94738b692 modsecurity-v3.0.11.tar.gz > +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 > +sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz > + > # Localy calculated > sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE > diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk > index 548eeb8602..d8c10b98b2 100644 > --- a/package/libmodsecurity/libmodsecurity.mk > +++ b/package/libmodsecurity/libmodsecurity.mk > @@ -4,9 +4,9 @@ > # > ################################################################################ > > -LIBMODSECURITY_VERSION = 3.0.11 > +LIBMODSECURITY_VERSION = 3.0.12 > LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz > -LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) > +LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) > LIBMODSECURITY_INSTALL_STAGING = YES > LIBMODSECURITY_LICENSE = Apache-2.0 > LIBMODSECURITY_LICENSE_FILES = LICENSE > -- > 2.40.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:19:52 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:19:52 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: security bump to version 2.42.5 Message-ID: <20240221172050.1A94A879FD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5275e141259c95b03fc288035c128224a1405646 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: https://wpewebkit.org/security/WSA-2024-0001.html - CVE-2024-23222: Processing maliciously crafted web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been exploited. Description: A type confusion issue was addressed with improved checks. - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint the user. Description: An access issue was addressed with improved access restrictions. - CVE-2024-23213: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. Add an upstream post-2.42.5 patch to fix an issue with an invalid backport causing a build issue. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- ...LowLevelInterpreter.cpp-339-21-error-t6-w.patch | 39 ++++++++++++++++++++++ package/wpewebkit/wpewebkit.hash | 6 ++-- package/wpewebkit/wpewebkit.mk | 3 +- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 0000000000..a15d9e647f --- /dev/null +++ b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Adrian Perez de Castro +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.43.1 + diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 322e494c36..71e41bb1dd 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,6 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums -sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz -sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums +sha1 50a18f43452520e9f34f84c04bc0166af655ffff wpewebkit-2.42.5.tar.xz +sha256 4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532 wpewebkit-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 13143efb38..442709848a 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,8 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.42.4 +# The middle number is even for stable releases, odd for development ones. +WPEWEBKIT_VERSION = 2.42.5 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From yann.morin.1998 at free.fr Wed Feb 21 17:20:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:20:07 +0100 Subject: [Buildroot] [git commit] package/wpewebkit: update ARM NEON patch for 2.42.x Message-ID: <20240221172050.2FA51879FE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a7a7f3d1392d34a14acc7739525dc7fc13920d8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Update patch to compile correctly with newer versions of GCC, which has gotten stricter about the placement of the alignas() attribute. Signed-off-by: Adrian Perez de Castro [yann.morin.1998 at free.fr: update .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...NEON.cpp-fails-to-build-NEON-fast-path-se.patch | 105 +++++++++++---------- 2 files changed, 57 insertions(+), 49 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 05a9241962..4967d749fa 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1376,7 +1376,6 @@ package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patc package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch Upstream package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch Upstream package/wpa_supplicant/ifupdown.sh Shellcheck -package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch Upstream package/x11r7/xapp_luit/0001-posix-openpt.patch Upstream package/x11r7/xapp_xdm/S99xdm Indent Variables package/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch Upstream diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch index ea1676abb6..17d4957657 100644 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -1,4 +1,4 @@ -From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 +From 5ba2d275457c4fdf1efdcca8351792400bda5679 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -33,38 +33,47 @@ left for a follow-up fix. * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: Signed-off-by: Adrian Perez de Castro -[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] +Upstream: https://bugs.webkit.org/show_bug.cgi?id=241182 --- Source/WebCore/Sources.txt | 1 + - .../cpu/arm/filters/FELightingNEON.cpp | 4 +- + .../cpu/arm/filters/FELightingNEON.cpp | 6 +-- .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 8 files changed, 58 insertions(+), 36 deletions(-) + 8 files changed, 59 insertions(+), 37 deletions(-) diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt -index 8ce3510fe1a8..efd56bcb8746 100644 +index 9ca28a7b2bc0..ed2c7f9f41ee 100644 --- a/Source/WebCore/Sources.txt +++ b/Source/WebCore/Sources.txt -@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp - platform/graphics/WOFFFileFormat.cpp - platform/graphics/WidthIterator.cpp +@@ -2303,6 +2303,7 @@ platform/graphics/controls/MeterPart.cpp + platform/graphics/controls/ProgressBarPart.cpp + platform/graphics/controls/SliderTrackPart.cpp platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp +platform/graphics/cpu/arm/filters/FELightingNEON.cpp platform/graphics/displaylists/DisplayList.cpp platform/graphics/displaylists/DisplayListDrawingContext.cpp platform/graphics/displaylists/DisplayListItems.cpp diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp -index f6ff8c20a5a8..42a97ffc5372 100644 +index f6ff8c20a5a8..dced3d55eb4e 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +@@ -35,7 +35,7 @@ namespace WebCore { + // ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D + + +-static alignas(16) short s_FELightingConstantsForNeon[] = { ++alignas(16) static short s_FELightingConstantsForNeon[] = { + // Alpha coefficients. + -2, 1, 0, -1, 2, 1, 0, -1, + 0, -1, -2, -1, 0, 1, 2, 1, @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() return s_FELightingConstantsForNeon; } - + -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) { @@ -73,26 +82,26 @@ index f6ff8c20a5a8..42a97ffc5372 100644 @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL "b .lightStrengthCalculated" NL ); // NOLINT - + -int FELighting::getPowerCoefficients(float exponent) +int FELightingSoftwareApplier::getPowerCoefficients(float exponent) { // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..c6d17f573eca 100644 +index b17c603d40d3..fd23e31cce29 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + -#ifndef FELightingNEON_h -#define FELightingNEON_h +#pragma once - + #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - + -#include "FELighting.h" +#include "FELightingSoftwareApplier.h" +#include "ImageBuffer.h" @@ -100,19 +109,19 @@ index b17c603d40d3..c6d17f573eca 100644 #include "SpotLightSource.h" +#include #include - + namespace WebCore { @@ -93,14 +94,14 @@ extern "C" { void neonDrawLighting(FELightingPaintingDataForNeon*); } - + -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { - data.pixels->data(), -+ WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; ++ alignas(16) WebCore::FELightingFloatArgumentsForNeon floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { + data.pixels->bytes(), 1, @@ -126,15 +135,15 @@ index b17c603d40d3..c6d17f573eca 100644 @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set light source arguments. floatArguments.constOne = 1; - + - auto color = m_lightingColor.toColorTypeLossy>().resolved(); + auto color = data.lightingColor.toColorTypeLossy>().resolved(); - + floatArguments.colorRed = color.red; floatArguments.colorGreen = color.green; floatArguments.colorBlue = color.blue; floatArguments.padding4 = 0; - + - if (m_lightSource->type() == LS_POINT) { + if (data.lightSource->type() == LS_POINT) { neonData.flags |= FLAG_POINT_LIGHT; @@ -181,7 +190,7 @@ index b17c603d40d3..c6d17f573eca 100644 } if (floatArguments.diffuseConstant == 1) neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; - + - int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; + static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs + int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; @@ -189,7 +198,7 @@ index b17c603d40d3..c6d17f573eca 100644 // Initialize parallel jobs - ParallelJobs parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); + ParallelJobs parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); - + // Fill the parameter array int job = parallelJobs.numberOfJobs(); if (job > 1) { @@ -213,42 +222,42 @@ index b17c603d40d3..c6d17f573eca 100644 return; @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS } // namespace WebCore - + #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) - -#endif // FELightingNEON_h diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -index 0660143fc1cf..2b1e86d99fa4 100644 +index 70f583b36e2c..7d5d27e5ccf8 100644 --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -@@ -25,6 +25,10 @@ - #include "LightSource.h" +@@ -26,6 +26,10 @@ + #include #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class DistantLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h -index 0c073bc13f8c..e0db00545c17 100644 +index 179edf6dba24..694d712d56fd 100644 --- a/Source/WebCore/platform/graphics/filters/FELighting.h +++ b/Source/WebCore/platform/graphics/filters/FELighting.h @@ -35,8 +35,6 @@ - + namespace WebCore { - + -struct FELightingPaintingDataForNeon; - class FELighting : public FilterEffect { public: - const Color& lightingColor() const { return m_lightingColor; } -@@ -67,11 +65,6 @@ protected: - + bool operator==(const FELighting&) const; +@@ -68,11 +66,6 @@ protected: + std::unique_ptr createSoftwareApplier() const override; - + -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - static int getPowerCoefficients(float exponent); - inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); @@ -258,34 +267,34 @@ index 0c073bc13f8c..e0db00545c17 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 126b3b2350f6..d906db21aa9c 100644 +index a8cfdab895a9..34f867bba237 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 641b205f986d..64380d9b6eb8 100644 +index 6404467a5b6f..5cac38f22362 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h index c974d92115ff..e2896660cfbd 100644 @@ -293,14 +302,14 @@ index c974d92115ff..e2896660cfbd 100644 +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ namespace WebCore { - + class FELighting; +struct FELightingPaintingDataForNeon; - + class FELightingSoftwareApplier final : public FilterEffectConcreteApplier { WTF_MAKE_FAST_ALLOCATED; @@ -132,8 +133,23 @@ private: - + static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); static void applyPlatformGenericWorker(ApplyParameters*); + @@ -319,10 +328,10 @@ index c974d92115ff..e2896660cfbd 100644 + static void applyPlatform(const LightingData&); }; - + } // namespace WebCore + +#include "FELightingNEON.h" --- -2.37.3 +-- +2.43.1 From yann.morin.1998 at free.fr Wed Feb 21 17:20:50 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:20:50 +0100 Subject: [Buildroot] [PATCH 1/2] package/wpewebkit: security bump to version 2.42.5 In-Reply-To: <20240212143222.1555220-2-aperez@igalia.com> References: <20240212143222.1555220-1-aperez@igalia.com> <20240212143222.1555220-2-aperez@igalia.com> Message-ID: Adrian, All, On 2024-02-12 16:32 +0200, Adrian Perez de Castro spake thusly: > Fixes the following security issues: > > https://wpewebkit.org/security/WSA-2024-0001.html > > - CVE-2024-23222: Processing maliciously crafted web content may lead to > arbitrary code execution. Apple is aware of a report that this issue > may have been exploited. Description: A type confusion issue was > addressed with improved checks. > > - CVE-2024-23206: A maliciously crafted webpage may be able to > fingerprint the user. Description: An access issue was addressed with > improved access restrictions. > > - CVE-2024-23213: Processing web content may lead to arbitrary code > execution. Description: The issue was addressed with improved memory > handling. > > Add an upstream post-2.42.5 patch to fix an issue with an invalid > backport causing a build issue. > > Signed-off-by: Adrian Perez de Castro Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++ > package/wpewebkit/wpewebkit.hash | 6 +-- > package/wpewebkit/wpewebkit.mk | 3 +- > 3 files changed, 44 insertions(+), 4 deletions(-) > create mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > > diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > new file mode 100644 > index 0000000000..a15d9e647f > --- /dev/null > +++ b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch > @@ -0,0 +1,39 @@ > +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 > +From: Michael Catanzaro > +Date: Mon, 5 Feb 2024 11:00:49 -0600 > +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= > + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= > + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= > + =?UTF-8?q?=3D268739?= > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Unreviewed build fix. Seems a backport went badly, and we didn't notice > +because the code is architecture-specific. > + > +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: > +(JSC::CLoop::execute): > + > +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff > +Signed-off-by: Adrian Perez de Castro > +--- > + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- > + 1 file changed, 2 deletions(-) > + > +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > +index 5064ead6cd2e..9a2e2653b121 100644 > +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp > +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, > + UNUSED_VARIABLE(t2); > + UNUSED_VARIABLE(t3); > + UNUSED_VARIABLE(t5); > +- UNUSED_VARIABLE(t6); > +- UNUSED_VARIABLE(t7); > + > + struct StackPointerScope { > + StackPointerScope(CLoopStack& stack) > +-- > +2.43.1 > + > diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash > index 322e494c36..71e41bb1dd 100644 > --- a/package/wpewebkit/wpewebkit.hash > +++ b/package/wpewebkit/wpewebkit.hash > @@ -1,6 +1,6 @@ > -# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums > -sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz > -sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz > +# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums > +sha1 50a18f43452520e9f34f84c04bc0166af655ffff wpewebkit-2.42.5.tar.xz > +sha256 4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532 wpewebkit-2.42.5.tar.xz > > # Hashes for license files: > sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE > diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk > index e54ec2952f..60a45b13b1 100644 > --- a/package/wpewebkit/wpewebkit.mk > +++ b/package/wpewebkit/wpewebkit.mk > @@ -4,7 +4,8 @@ > # > ################################################################################ > > -WPEWEBKIT_VERSION = 2.42.4 > +# The middle number is even for stable releases, odd for development ones. > +WPEWEBKIT_VERSION = 2.42.5 > WPEWEBKIT_SITE = https://wpewebkit.org/releases > WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz > WPEWEBKIT_INSTALL_STAGING = YES > -- > 2.43.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:21:37 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:21:37 +0100 Subject: [Buildroot] [PATCH 2/2] package/wpewebkit: update ARM NEON patch for 2.42.x In-Reply-To: <20240212143222.1555220-3-aperez@igalia.com> References: <20240212143222.1555220-1-aperez@igalia.com> <20240212143222.1555220-3-aperez@igalia.com> Message-ID: On 2024-02-12 16:32 +0200, Adrian Perez de Castro spake thusly: > Update patch to compile correctly with newer versions of GCC, which > has gotten stricter about the placement of the alignas() attribute. > > Signed-off-by: Adrian Perez de Castro > --- > ...cpp-fails-to-build-NEON-fast-path-se.patch | 105 ++++++++++-------- $ ./utils/docker-run make check-package package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch:0: Upstream was expected to fail, did you fix the file and forget to update .checkpackageignore? Applied to master, with the above fixed, thanks. Regards, Yann E. MORIN. > 1 file changed, 57 insertions(+), 48 deletions(-) > > diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch > index ea1676abb6..17d4957657 100644 > --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch > +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch > @@ -1,4 +1,4 @@ > -From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 > +From 5ba2d275457c4fdf1efdcca8351792400bda5679 Mon Sep 17 00:00:00 2001 > From: Adrian Perez de Castro > Date: Thu, 2 Jun 2022 11:19:06 +0300 > Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems > @@ -33,38 +33,47 @@ left for a follow-up fix. > * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: > > Signed-off-by: Adrian Perez de Castro > -[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] > +Upstream: https://bugs.webkit.org/show_bug.cgi?id=241182 > --- > Source/WebCore/Sources.txt | 1 + > - .../cpu/arm/filters/FELightingNEON.cpp | 4 +- > + .../cpu/arm/filters/FELightingNEON.cpp | 6 +-- > .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- > .../graphics/filters/DistantLightSource.h | 4 ++ > .../platform/graphics/filters/FELighting.h | 7 --- > .../graphics/filters/PointLightSource.h | 4 ++ > .../graphics/filters/SpotLightSource.h | 4 ++ > .../software/FELightingSoftwareApplier.h | 16 ++++++ > - 8 files changed, 58 insertions(+), 36 deletions(-) > + 8 files changed, 59 insertions(+), 37 deletions(-) > > diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt > -index 8ce3510fe1a8..efd56bcb8746 100644 > +index 9ca28a7b2bc0..ed2c7f9f41ee 100644 > --- a/Source/WebCore/Sources.txt > +++ b/Source/WebCore/Sources.txt > -@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp > - platform/graphics/WOFFFileFormat.cpp > - platform/graphics/WidthIterator.cpp > +@@ -2303,6 +2303,7 @@ platform/graphics/controls/MeterPart.cpp > + platform/graphics/controls/ProgressBarPart.cpp > + platform/graphics/controls/SliderTrackPart.cpp > platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp > +platform/graphics/cpu/arm/filters/FELightingNEON.cpp > platform/graphics/displaylists/DisplayList.cpp > platform/graphics/displaylists/DisplayListDrawingContext.cpp > platform/graphics/displaylists/DisplayListItems.cpp > diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp > -index f6ff8c20a5a8..42a97ffc5372 100644 > +index f6ff8c20a5a8..dced3d55eb4e 100644 > --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp > +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp > +@@ -35,7 +35,7 @@ namespace WebCore { > + // ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D > + > + > +-static alignas(16) short s_FELightingConstantsForNeon[] = { > ++alignas(16) static short s_FELightingConstantsForNeon[] = { > + // Alpha coefficients. > + -2, 1, 0, -1, 2, 1, 0, -1, > + 0, -1, -2, -1, 0, 1, 2, 1, > @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() > return s_FELightingConstantsForNeon; > } > - > + > -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) > +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) > { > @@ -73,26 +82,26 @@ index f6ff8c20a5a8..42a97ffc5372 100644 > @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL > "b .lightStrengthCalculated" NL > ); // NOLINT > - > + > -int FELighting::getPowerCoefficients(float exponent) > +int FELightingSoftwareApplier::getPowerCoefficients(float exponent) > { > // Calling a powf function from the assembly code would require to save > // and reload a lot of NEON registers. Since the base is in range [0..1] > diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h > -index b17c603d40d3..c6d17f573eca 100644 > +index b17c603d40d3..fd23e31cce29 100644 > --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h > +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h > @@ -24,14 +24,15 @@ > * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > - > + > -#ifndef FELightingNEON_h > -#define FELightingNEON_h > +#pragma once > - > + > #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) > - > + > -#include "FELighting.h" > +#include "FELightingSoftwareApplier.h" > +#include "ImageBuffer.h" > @@ -100,19 +109,19 @@ index b17c603d40d3..c6d17f573eca 100644 > #include "SpotLightSource.h" > +#include > #include > - > + > namespace WebCore { > @@ -93,14 +94,14 @@ extern "C" { > void neonDrawLighting(FELightingPaintingDataForNeon*); > } > - > + > -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) > +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) > { > - alignas(16) FELightingFloatArgumentsForNeon floatArguments; > - FELightingPaintingDataForNeon neonData = { > - data.pixels->data(), > -+ WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; > ++ alignas(16) WebCore::FELightingFloatArgumentsForNeon floatArguments; > + WebCore::FELightingPaintingDataForNeon neonData = { > + data.pixels->bytes(), > 1, > @@ -126,15 +135,15 @@ index b17c603d40d3..c6d17f573eca 100644 > @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS > // Set light source arguments. > floatArguments.constOne = 1; > - > + > - auto color = m_lightingColor.toColorTypeLossy>().resolved(); > + auto color = data.lightingColor.toColorTypeLossy>().resolved(); > - > + > floatArguments.colorRed = color.red; > floatArguments.colorGreen = color.green; > floatArguments.colorBlue = color.blue; > floatArguments.padding4 = 0; > - > + > - if (m_lightSource->type() == LS_POINT) { > + if (data.lightSource->type() == LS_POINT) { > neonData.flags |= FLAG_POINT_LIGHT; > @@ -181,7 +190,7 @@ index b17c603d40d3..c6d17f573eca 100644 > } > if (floatArguments.diffuseConstant == 1) > neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; > - > + > - int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; > + static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs > + int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; > @@ -189,7 +198,7 @@ index b17c603d40d3..c6d17f573eca 100644 > // Initialize parallel jobs > - ParallelJobs parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); > + ParallelJobs parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); > - > + > // Fill the parameter array > int job = parallelJobs.numberOfJobs(); > if (job > 1) { > @@ -213,42 +222,42 @@ index b17c603d40d3..c6d17f573eca 100644 > return; > @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS > } // namespace WebCore > - > + > #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) > - > -#endif // FELightingNEON_h > diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h > -index 0660143fc1cf..2b1e86d99fa4 100644 > +index 70f583b36e2c..7d5d27e5ccf8 100644 > --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h > +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h > -@@ -25,6 +25,10 @@ > - #include "LightSource.h" > +@@ -26,6 +26,10 @@ > + #include > #include > - > + > +namespace WTF { > +class TextStream; > +} // namespace WTF > + > namespace WebCore { > - > + > class DistantLightSource : public LightSource { > diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h > -index 0c073bc13f8c..e0db00545c17 100644 > +index 179edf6dba24..694d712d56fd 100644 > --- a/Source/WebCore/platform/graphics/filters/FELighting.h > +++ b/Source/WebCore/platform/graphics/filters/FELighting.h > @@ -35,8 +35,6 @@ > - > + > namespace WebCore { > - > + > -struct FELightingPaintingDataForNeon; > - > class FELighting : public FilterEffect { > public: > - const Color& lightingColor() const { return m_lightingColor; } > -@@ -67,11 +65,6 @@ protected: > - > + bool operator==(const FELighting&) const; > +@@ -68,11 +66,6 @@ protected: > + > std::unique_ptr createSoftwareApplier() const override; > - > + > -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) > - static int getPowerCoefficients(float exponent); > - inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); > @@ -258,34 +267,34 @@ index 0c073bc13f8c..e0db00545c17 100644 > float m_surfaceScale; > float m_diffuseConstant; > diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h > -index 126b3b2350f6..d906db21aa9c 100644 > +index a8cfdab895a9..34f867bba237 100644 > --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h > +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h > @@ -26,6 +26,10 @@ > #include "LightSource.h" > #include > - > + > +namespace WTF { > +class TextStream; > +} // namespace WTF > + > namespace WebCore { > - > + > class PointLightSource : public LightSource { > diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h > -index 641b205f986d..64380d9b6eb8 100644 > +index 6404467a5b6f..5cac38f22362 100644 > --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h > +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h > @@ -26,6 +26,10 @@ > #include "LightSource.h" > #include > - > + > +namespace WTF { > +class TextStream; > +} // namespace WTF > + > namespace WebCore { > - > + > class SpotLightSource : public LightSource { > diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h > index c974d92115ff..e2896660cfbd 100644 > @@ -293,14 +302,14 @@ index c974d92115ff..e2896660cfbd 100644 > +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h > @@ -36,6 +36,7 @@ > namespace WebCore { > - > + > class FELighting; > +struct FELightingPaintingDataForNeon; > - > + > class FELightingSoftwareApplier final : public FilterEffectConcreteApplier { > WTF_MAKE_FAST_ALLOCATED; > @@ -132,8 +133,23 @@ private: > - > + > static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); > static void applyPlatformGenericWorker(ApplyParameters*); > + > @@ -319,10 +328,10 @@ index c974d92115ff..e2896660cfbd 100644 > + > static void applyPlatform(const LightingData&); > }; > - > + > } // namespace WebCore > + > +#include "FELightingNEON.h" > --- > -2.37.3 > +-- > +2.43.1 > > -- > 2.43.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:22:07 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:22:07 +0100 Subject: [Buildroot] [git commit] boot/shim: security bump to version 15.8 Message-ID: <20240221172326.0624F87A04@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f42004a046313cf73ae707d43632109c36398dc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issues: CVE-2023-40546 mok: fix LogError() invocation CVE-2023-40547 - avoid incorrectly trusting HTTP headers CVE-2023-40548 Fix integer overflow on SBAT section size on 32-bit system CVE-2023-40549 Authenticode: verify that the signature header is in bounds. CVE-2023-40550 pe: Fix an out-of-bound read in verify_buffer_sbat() CVE-2023-40551: pe-relocate: Fix bounds check for MZ binaries https://github.com/rhboot/shim/tree/15.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- boot/shim/shim.hash | 2 +- boot/shim/shim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/shim/shim.hash b/boot/shim/shim.hash index c9c489fd2f..5aa4ca06e8 100644 --- a/boot/shim/shim.hash +++ b/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 eab91644a3efe91a666399f5d8eb3eed0e04d04f79d4b6c0b278ef7747a239a5 shim-15.6.tar.bz2 +sha256 a79f0a9b89f3681ab384865b1a46ab3f79d88b11b4ca59aa040ab03fffae80a9 shim-15.8.tar.bz2 sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index bbef81cfc4..19b11f4086 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHIM_VERSION = 15.6 +SHIM_VERSION = 15.8 SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION) SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2 SHIM_LICENSE = BSD-2-Clause From fontaine.fabrice at gmail.com Wed Feb 21 17:39:16 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 21 Feb 2024 18:39:16 +0100 Subject: [Buildroot] [PATCH 1/1] package/cegui: fix build with libxml2 >= 2.12 Message-ID: <20240221173916.1095723-1-fontaine.fabrice@gmail.com> Fix the following build failure raised since bump of libxml2 to version 2.12.1 in commit d8ac52108c12f0fcc9641b63e7922009270f96c6: /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp: In member function 'virtual void CEGUI::LibxmlParser::parseXML(CEGUI::XMLHandler&, const CEGUI::RawDataContainer&, const CEGUI::String&, bool)': /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp:111:40: error: invalid conversion from 'const xmlError*' {aka 'const _xmlError*'} to 'xmlError*' {aka '_xmlError*'} [-fpermissive] 111 | xmlError* err = xmlGetLastError(); | ~~~~~~~~~~~~~~~^~ | | | const xmlError* {aka const _xmlError*} Fixes: d8ac52108c12f0fcc9641b63e7922009270f96c6 - http://autobuild.buildroot.org/results/b239b7b03542311e311e4612e9b811c154302a6e Signed-off-by: Fabrice Fontaine --- ...-of-xmlGetLastError-for-libxml2-2-12.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch diff --git a/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch new file mode 100644 index 0000000000..9091062e28 --- /dev/null +++ b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch @@ -0,0 +1,29 @@ +From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sun, 18 Feb 2024 14:16:21 -0800 +Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12 + +https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7 + +Upstream: https://github.com/cegui/cegui/commit/285ba5a2c0c435ed865c6e86afe314a822fd1e3f +Signed-off-by: Fabrice Fontaine +--- + cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +index 74a3dbddd..a408f9305 100644 +--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp ++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler, + + if (!doc) + { ++#if LIBXML_VERSION >= 21200 ++ const xmlError* err = xmlGetLastError(); ++#else + xmlError* err = xmlGetLastError(); ++#endif + + throw GenericException( + String("xmlParseMemory failed in file: '") + -- 2.43.0 From yann.morin.1998 at free.fr Wed Feb 21 17:41:48 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:41:48 +0100 Subject: [Buildroot] [git commit] package/cegui: fix build with libxml2 >= 2.12 Message-ID: <20240221174201.E2A8E87A0E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3b2bea40abd1d6092f5fd7d201ad1580e7f629d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following build failure raised since bump of libxml2 to version 2.12.1 in commit d8ac52108c12f0fcc9641b63e7922009270f96c6: /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp: In member function 'virtual void CEGUI::LibxmlParser::parseXML(CEGUI::XMLHandler&, const CEGUI::RawDataContainer&, const CEGUI::String&, bool)': /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp:111:40: error: invalid conversion from 'const xmlError*' {aka 'const _xmlError*'} to 'xmlError*' {aka '_xmlError*'} [-fpermissive] 111 | xmlError* err = xmlGetLastError(); | ~~~~~~~~~~~~~~~^~ | | | const xmlError* {aka const _xmlError*} Fixes: d8ac52108c12f0fcc9641b63e7922009270f96c6 - http://autobuild.buildroot.org/results/b239b7b03542311e311e4612e9b811c154302a6e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-type-of-xmlGetLastError-for-libxml2-2-12.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch new file mode 100644 index 0000000000..9091062e28 --- /dev/null +++ b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch @@ -0,0 +1,29 @@ +From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sun, 18 Feb 2024 14:16:21 -0800 +Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12 + +https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7 + +Upstream: https://github.com/cegui/cegui/commit/285ba5a2c0c435ed865c6e86afe314a822fd1e3f +Signed-off-by: Fabrice Fontaine +--- + cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +index 74a3dbddd..a408f9305 100644 +--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp ++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler, + + if (!doc) + { ++#if LIBXML_VERSION >= 21200 ++ const xmlError* err = xmlGetLastError(); ++#else + xmlError* err = xmlGetLastError(); ++#endif + + throw GenericException( + String("xmlParseMemory failed in file: '") + From yann.morin.1998 at free.fr Wed Feb 21 17:42:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:42:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/cegui: fix build with libxml2 >= 2.12 In-Reply-To: <20240221173916.1095723-1-fontaine.fabrice@gmail.com> References: <20240221173916.1095723-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-21 18:39 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure raised since bump of libxml2 to version > 2.12.1 in commit d8ac52108c12f0fcc9641b63e7922009270f96c6: > > /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp: In member function 'virtual void CEGUI::LibxmlParser::parseXML(CEGUI::XMLHandler&, const CEGUI::RawDataContainer&, const CEGUI::String&, bool)': > /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp:111:40: error: invalid conversion from 'const xmlError*' {aka 'const _xmlError*'} to 'xmlError*' {aka '_xmlError*'} [-fpermissive] > 111 | xmlError* err = xmlGetLastError(); > | ~~~~~~~~~~~~~~~^~ > | | > | const xmlError* {aka const _xmlError*} > > Fixes: d8ac52108c12f0fcc9641b63e7922009270f96c6 > - http://autobuild.buildroot.org/results/b239b7b03542311e311e4612e9b811c154302a6e > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...-of-xmlGetLastError-for-libxml2-2-12.patch | 29 +++++++++++++++++++ > 1 file changed, 29 insertions(+) > create mode 100644 package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch > > diff --git a/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch > new file mode 100644 > index 0000000000..9091062e28 > --- /dev/null > +++ b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch > @@ -0,0 +1,29 @@ > +From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001 > +From: oreo639 > +Date: Sun, 18 Feb 2024 14:16:21 -0800 > +Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12 > + > +https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7 > + > +Upstream: https://github.com/cegui/cegui/commit/285ba5a2c0c435ed865c6e86afe314a822fd1e3f > +Signed-off-by: Fabrice Fontaine > +--- > + cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++ > + 1 file changed, 4 insertions(+) > + > +diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp > +index 74a3dbddd..a408f9305 100644 > +--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp > ++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp > +@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler, > + > + if (!doc) > + { > ++#if LIBXML_VERSION >= 21200 > ++ const xmlError* err = xmlGetLastError(); > ++#else > + xmlError* err = xmlGetLastError(); > ++#endif > + > + throw GenericException( > + String("xmlParseMemory failed in file: '") + > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From thomas.petazzoni at bootlin.com Wed Feb 21 17:45:12 2024 From: thomas.petazzoni at bootlin.com (Thomas Petazzoni) Date: Wed, 21 Feb 2024 18:45:12 +0100 Subject: [Buildroot] [PATCH] package/systemd: bump to version 254.9 In-Reply-To: References: <20240219182604.1287000-1-buildroot@bubu1.eu> <04a28a98-2699-44b6-b5d5-697a1a6fe893@bubu1.eu> Message-ID: <20240221184512.204b88c0@windsurf> On Wed, 21 Feb 2024 18:08:14 +0100 "Yann E. MORIN" wrote: > On 2024-02-19 22:30 +0100, Marcus Hoffmann via buildroot spake thusly: > > On 19.02.24 22:14, Yann E. MORIN wrote: > > > Please watch the gitlab pipeline for any failure of the runtimet tests, > > > just in case this minor version bump breaks anything. > > So if I understood that correctly I can add myself as a maintainer of the > > runtime test files and I'll get an email when that test fails? Or is that > > not how it works? > > As far as I understand, yes, this is what should happen. Thomas has some > scripting (somewhere!) that sends the daily emails, so he'd have the > authoritative answer. Absolutely correct. If someone is registered as a developer/maintainer for a test case in the DEVELOPERS file, this person will receive an e-mail when the test fails in our CI. Please note that runtime tests are not run every day in our CI, but only on a weekly basis. Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com From yann.morin.1998 at free.fr Wed Feb 21 17:50:25 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:50:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/libspdm: bump version to 3.2.0 In-Reply-To: <20240221004400.27429-1-wilfred.mallawa@wdc.com> References: <20240221004400.27429-1-wilfred.mallawa@wdc.com> Message-ID: Wilfred, All, On 2024-02-21 10:44 +1000, Wilfred Mallawa via buildroot spake thusly: > Additionally, add an upstream patch that fixes the configuration for > "NONE" toolchain variant in libspdm. That is, where the build > environment provides compile/link options. > > Signed-off-by: Wilfred Mallawa > --- > ...eLists-remove-fixed-options-for-NONE.patch | 51 +++++++++++++++++++ > package/libspdm/libspdm.hash | 2 +- > package/libspdm/libspdm.mk | 2 +- > 3 files changed, 53 insertions(+), 2 deletions(-) > create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > > diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > new file mode 100644 > index 0000000000..0d1287a769 > --- /dev/null > +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch > @@ -0,0 +1,51 @@ > +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 > +From: Wilfred Mallawa > +Date: Mon, 19 Feb 2024 09:56:14 +1000 > +Subject: [PATCH] CMakeLists: remove fixed options for NONE > + > +The use of the NONE toolchain option is such that we can provide at the > +build project level (buildroot etc...). However, the changes introduced > +in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker > +option that does not comply with the definition of the options as > +specified in [1]. This change removes those options. > + > +[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments > + > +Signed-off-by: Wilfred Mallawa $ ./utils/docker-run make check-package package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch:0: missing Upstream in the header (https://nightly.buildroot.org/#_additional_patch_documentation) So you need to add: Upstream: https://github.com/DMTF/libspdm/commit/d4d6b138d727e484fa9d0fef476ca181681d0695 Also, as I understand it, NONE is thus no longer a valid value for -DTOOLCHAIN, so you should drop that from libspdm.mk as well, right? Regards, Yann E. MORIN. > +--- > + CMakeLists.txt | 19 ------------------- > + 1 file changed, 19 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index 9c300cc817..f6cf17d269 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") > + SET(CMAKE_EXE_LINKER_FLAGS "") > + > + SET(CMAKE_C_LINK_EXECUTABLE "") > +- > +- elseif(TOOLCHAIN STREQUAL "NONE") > +- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) > +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") > +- ADD_COMPILE_OPTIONS(-g) > +- endif() > +- if(GCOV STREQUAL "ON") > +- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) > +- endif() > +- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) > +- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) > +- > +- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) > +- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) > +- if(GCOV STREQUAL "ON") > +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") > +- endif() > +- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") > +- > + endif() > + > + if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") > +-- > +2.43.2 > + > diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash > index 23faba1c4b..32415bcfce 100644 > --- a/package/libspdm/libspdm.hash > +++ b/package/libspdm/libspdm.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183 libspdm-3.1.1.tar.gz > +sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz > sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md > diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk > index 34dbb457c4..2ec35be0ac 100644 > --- a/package/libspdm/libspdm.mk > +++ b/package/libspdm/libspdm.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSPDM_VERSION = 3.1.1 > +LIBSPDM_VERSION = 3.2.0 > LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) > LIBSPDM_LICENSE = BSD-3-Clause > LIBSPDM_LICENSE_FILES = LICENSE.md > -- > 2.43.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 17:57:14 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:57:14 +0100 Subject: [Buildroot] [git commit] package/libstrophe: bump to version 0.13.1 Message-ID: <20240221175758.45C8387A16@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c32cdd545767337616f94d076212c6273e59f44 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Michael Vetter Signed-off-by: Yann E. MORIN --- package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index e284e8cca6..ec5a55985a 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz +sha256 86c0abd348ae66feb40b6886f2c7f04525f1d5b20a48c10d4db4ed532dc63f22 libstrophe-0.13.1.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index 257593bbec..42d582fe9c 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.13.0 +LIBSTROPHE_VERSION = 0.13.1 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf From yann.morin.1998 at free.fr Wed Feb 21 17:59:46 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 18:59:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.13.1 In-Reply-To: <20240221143001.30174-1-jubalh@iodoru.org> References: <20240221143001.30174-1-jubalh@iodoru.org> Message-ID: Michael, All, On 2024-02-21 15:30 +0100, Michael Vetter spake thusly: > Signed-off-by: Michael Vetter Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/libstrophe/libstrophe.hash | 2 +- > package/libstrophe/libstrophe.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash > index e284e8cca6..ec5a55985a 100644 > --- a/package/libstrophe/libstrophe.hash > +++ b/package/libstrophe/libstrophe.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz > +sha256 86c0abd348ae66feb40b6886f2c7f04525f1d5b20a48c10d4db4ed532dc63f22 libstrophe-0.13.1.tar.xz > sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt > sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt > diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk > index 257593bbec..42d582fe9c 100644 > --- a/package/libstrophe/libstrophe.mk > +++ b/package/libstrophe/libstrophe.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -LIBSTROPHE_VERSION = 0.13.0 > +LIBSTROPHE_VERSION = 0.13.1 > LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz > LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) > LIBSTROPHE_DEPENDENCIES = host-pkgconf > -- > 2.35.3 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 18:00:58 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 19:00:58 +0100 Subject: [Buildroot] [git commit] DEVELOPERS: add Romain Naour for am574x_idk_defconfig Message-ID: <20240221180112.1702487A19@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec344d60134e4db8e1d54a84697ba73756bd57d2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master The DEVELOPERS entry was missing. Fixes: 35eb74c634 ("configs/am574x_idk_defconfig: new defconfig") Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f0e16af162..0f065bfafb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2668,7 +2668,9 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ +F: board/ti/am574x-idk/ F: configs/qemu_* +F: configs/am574x_idk_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ From yann.morin.1998 at free.fr Wed Feb 21 18:01:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 19:01:33 +0100 Subject: [Buildroot] [PATCH] DEVELOPERS: add Romain Naour for am574x_idk_defconfig In-Reply-To: <20240220225025.781466-1-romain.naour@smile.fr> References: <20240220225025.781466-1-romain.naour@smile.fr> Message-ID: Romain, All, On 2024-02-20 23:50 +0100, Romain Naour spake thusly: > The DEVELOPERS entry was missing. > > Fixes: 35eb74c634 ("configs/am574x_idk_defconfig: new defconfig") Tsss... ;-) > Signed-off-by: Romain Naour Applied to master, thanks. Regards, Yann E. MORIN. > --- > DEVELOPERS | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/DEVELOPERS b/DEVELOPERS > index 0d12c3abcb..ff44741f9f 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -2667,7 +2667,9 @@ F: package/vnstat/ > > N: Romain Naour > F: board/qemu/ > +F: board/ti/am574x-idk/ > F: configs/qemu_* > +F: configs/am574x_idk_defconfig > F: package/alure/ > F: package/aubio/ > F: package/binutils/ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 18:02:22 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 19:02:22 +0100 Subject: [Buildroot] [git commit] package/highway: bump to version 1.1.0 Message-ID: <20240221180301.B32B687A23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a2e08963a2c45e6036566687788b812383e80820 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master For release note, see [1]. This commit removes the package patch, as it is now included in this new release. LICENSE-BSD3 hash changed, due to reformatting. See [2]. [1] https://github.com/google/highway/releases/tag/1.1.0 [2] https://github.com/google/highway/commit/edc35d14c77cb24dc1163989c762d69694e0e955 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- .../0001-add-required-RISC-V-flags-to-CMake.patch | 42 ---------------------- package/highway/highway.hash | 4 +-- package/highway/highway.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch b/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch deleted file mode 100644 index bfcbfb055c..0000000000 --- a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5d58d233fbcec0c6a39df8186a877329147324b3 Mon Sep 17 00:00:00 2001 -From: Mathieu Malaterre -Date: Wed, 13 Sep 2023 08:37:54 +0200 -Subject: [PATCH] Add an option to opt-out of HWY_RISCV - -Fixes #1740 - -Upstream: https://github.com/google/highway/commit/5d58d233fbcec0c6a39df8186a877329147324b3 -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c2bf57b3f5..be639c945f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,6 +61,9 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4 - # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. - set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?") - -+# Currently this will compile the entire codebase with `-march=rv64gcv1p0`: -+set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?") -+ - # Unconditionally adding -Werror risks breaking the build when new warnings - # arise due to compiler/platform changes. Enable this in CI/tests. - set(HWY_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Add -Werror flag?") -@@ -260,9 +263,11 @@ else() - # gcc(13) and recent clang both support V, but not yet runtime dispatch, so - # we add the gcv compiler flag, which then requires the CPU (now when using - # either compiler) to support V. -- list(APPEND HWY_FLAGS -march=rv64gcv1p0) -- if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -- list(APPEND HWY_FLAGS -menable-experimental-extensions) -+ if(HWY_CMAKE_RVV) -+ list(APPEND HWY_FLAGS -march=rv64gcv1p0) -+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -+ list(APPEND HWY_FLAGS -menable-experimental-extensions) -+ endif() - endif() - endif() - diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3cb497f20a..270131134e 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5 highway-1.0.7.tar.gz +sha256 354a8b4539b588e70b98ec70844273e3f2741302c4c377bcc4e81b3d1866f7c9 highway-1.1.0.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE -sha256 6dcc159f448e3aca73a15e355d0a6735ca3fd224abe637e0b7437dce2d24f765 LICENSE-BSD3 +sha256 d25e82e26acd42ca3ccc9993622631163425b869b9e16284226d534cff6470f2 LICENSE-BSD3 diff --git a/package/highway/highway.mk b/package/highway/highway.mk index b45fa8df74..3eb0d7a4aa 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.7 +HIGHWAY_VERSION = 1.1.0 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 or BSD-3-Clause HIGHWAY_LICENSE_FILES = LICENSE LICENSE-BSD3 From yann.morin.1998 at free.fr Wed Feb 21 18:03:27 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 19:03:27 +0100 Subject: [Buildroot] [PATCH 1/1] package/highway: bump to version 1.1.0 In-Reply-To: <20240219221458.831078-1-ju.o@free.fr> References: <20240219221458.831078-1-ju.o@free.fr> Message-ID: Julien, All, On 2024-02-19 23:14 +0100, Julien Olivain spake thusly: > For release note, see [1]. > > This commit removes the package patch, as it is now included in this new > release. > > LICENSE-BSD3 hash changed, due to reformatting. See [2]. > > [1] https://github.com/google/highway/releases/tag/1.1.0 > [2] https://github.com/google/highway/commit/edc35d14c77cb24dc1163989c762d69694e0e955 > > Signed-off-by: Julien Olivain Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...1-add-required-RISC-V-flags-to-CMake.patch | 42 ------------------- > package/highway/highway.hash | 4 +- > package/highway/highway.mk | 2 +- > 3 files changed, 3 insertions(+), 45 deletions(-) > delete mode 100644 package/highway/0001-add-required-RISC-V-flags-to-CMake.patch > > diff --git a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch b/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch > deleted file mode 100644 > index bfcbfb055cb..00000000000 > --- a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -From 5d58d233fbcec0c6a39df8186a877329147324b3 Mon Sep 17 00:00:00 2001 > -From: Mathieu Malaterre > -Date: Wed, 13 Sep 2023 08:37:54 +0200 > -Subject: [PATCH] Add an option to opt-out of HWY_RISCV > - > -Fixes #1740 > - > -Upstream: https://github.com/google/highway/commit/5d58d233fbcec0c6a39df8186a877329147324b3 > -Signed-off-by: Fabrice Fontaine > ---- > - CMakeLists.txt | 11 ++++++++--- > - 1 file changed, 8 insertions(+), 3 deletions(-) > - > -diff --git a/CMakeLists.txt b/CMakeLists.txt > -index c2bf57b3f5..be639c945f 100644 > ---- a/CMakeLists.txt > -+++ b/CMakeLists.txt > -@@ -61,6 +61,9 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4 > - # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. > - set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?") > - > -+# Currently this will compile the entire codebase with `-march=rv64gcv1p0`: > -+set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?") > -+ > - # Unconditionally adding -Werror risks breaking the build when new warnings > - # arise due to compiler/platform changes. Enable this in CI/tests. > - set(HWY_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Add -Werror flag?") > -@@ -260,9 +263,11 @@ else() > - # gcc(13) and recent clang both support V, but not yet runtime dispatch, so > - # we add the gcv compiler flag, which then requires the CPU (now when using > - # either compiler) to support V. > -- list(APPEND HWY_FLAGS -march=rv64gcv1p0) > -- if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") > -- list(APPEND HWY_FLAGS -menable-experimental-extensions) > -+ if(HWY_CMAKE_RVV) > -+ list(APPEND HWY_FLAGS -march=rv64gcv1p0) > -+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") > -+ list(APPEND HWY_FLAGS -menable-experimental-extensions) > -+ endif() > - endif() > - endif() > - > diff --git a/package/highway/highway.hash b/package/highway/highway.hash > index 3cb497f20a7..270131134ec 100644 > --- a/package/highway/highway.hash > +++ b/package/highway/highway.hash > @@ -1,4 +1,4 @@ > # Locally computed: > -sha256 5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5 highway-1.0.7.tar.gz > +sha256 354a8b4539b588e70b98ec70844273e3f2741302c4c377bcc4e81b3d1866f7c9 highway-1.1.0.tar.gz > sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE > -sha256 6dcc159f448e3aca73a15e355d0a6735ca3fd224abe637e0b7437dce2d24f765 LICENSE-BSD3 > +sha256 d25e82e26acd42ca3ccc9993622631163425b869b9e16284226d534cff6470f2 LICENSE-BSD3 > diff --git a/package/highway/highway.mk b/package/highway/highway.mk > index b45fa8df74d..3eb0d7a4aa2 100644 > --- a/package/highway/highway.mk > +++ b/package/highway/highway.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -HIGHWAY_VERSION = 1.0.7 > +HIGHWAY_VERSION = 1.1.0 > HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) > HIGHWAY_LICENSE = Apache-2.0 or BSD-3-Clause > HIGHWAY_LICENSE_FILES = LICENSE LICENSE-BSD3 > -- > 2.43.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 18:05:38 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 19:05:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 20.6.4-Nexus In-Reply-To: <20240219192724.3776282-1-bernd@kuhls.net> References: <20240219192724.3776282-1-bernd@kuhls.net> Message-ID: Bernd, All, On 2024-02-19 20:27 +0100, Bernd Kuhls spake thusly: > Signed-off-by: Bernd Kuhls > --- > package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- > package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash > index 286cff5cc4..b4e6f30685 100644 > --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash > +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 4c742a31ec6f4d2a427d05f70950cfd4e347cf1c0acdb1747c39eb68124be30a kodi-pvr-mythtv-20.6.1-Nexus.tar.gz > +sha256 da7cdc514ce48992e7c2575735c4bd9d22891ba3c12169ae42163b159517b8c9 kodi-pvr-mythtv-20.6.4-Nexus.tar.gz > sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md > diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk > index 312c8619be..57ddf3af10 100644 > --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk > +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -KODI_PVR_MYTHTV_VERSION = 20.6.1-Nexus AFAICS, we only have 20.5.10-Nexus in master... Regards, Yann E. MORIN. > +KODI_PVR_MYTHTV_VERSION = 20.6.4-Nexus > KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) > KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ > KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From fontaine.fabrice at gmail.com Wed Feb 21 18:14:39 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 21 Feb 2024 19:14:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: disable cargo Message-ID: <20240221181439.1113724-1-fontaine.fabrice@gmail.com> Set HAVE_CARGO=0 to avoid the following build failures raised since bump to version 2.29.0 in commit 68df20336664d4d0b1a9d8d0285d23eba631845a and https://github.com/ibm-s390-linux/s390-tools/commit/e6add997ebbcd967734391da8a8987c7926e168f: error: could not compile `pvsecret` (bin "pvsecret") due to previous error [...] ERROR: architecture for "/usr/bin/pvsecret" is "AArch64", should be "IBM S/390" Fixes: 68df20336664d4d0b1a9d8d0285d23eba631845a - http://autobuild.buildroot.org/results/22035cb4d8e251f9930a7d529b91b128919252bb - http://autobuild.buildroot.org/results/99be6d3b2bab7c952ce02853f54924c5219aecc1 Signed-off-by: Fabrice Fontaine --- package/s390-tools/s390-tools.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index bc39a9bd19..04d193a467 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -12,7 +12,8 @@ S390_TOOLS_DEPENDENCIES = zlib S390_TOOLS_MAKE_OPTS = \ ARCH=$(BR2_ARCH) \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + HAVE_CARGO=0 ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) S390_TOOLS_DEPENDENCIES += libcurl -- 2.43.0 From fontaine.fabrice at gmail.com Wed Feb 21 18:16:50 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 21 Feb 2024 19:16:50 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/zlib-ng: fix arm build Message-ID: <20240221181650.1115046-1-fontaine.fabrice@gmail.com> zlib-ng usage uses CMAKE_C_COMPILER_TARGET which is non-standard and is not supposed to be used by the CMakeLists.txt machinery of a particular package. Indeed, [1] specifies that: Some compiler drivers are inherently cross-compilers, such as clang and QNX qcc. These compiler drivers support a command-line argument to specify the target to cross-compile for. buildroot is not using clang nor QNX qcc. [2] also refers to this variable only for clang [3] and QNX [4]. Therefore, zlib-ng's usage of this variable is a bit of a hack, and it's actually why it works when passed as an argument, because they are in fact not supposed to use this variable. So set CMAKE_C_COMPILER_TARGET to BR2_ARCH to fix the following arm build failure raised since bump to version 2.0.6 in commit d2249821d3f30202ca2a35ad24918378d9a0a0e8: -- Detecting C compile features - done -- Arch not recognized, falling back to cmake arch: 'l' -- Basearch 'l' not recognized, defaulting to 'x86'. -- Basearch of 'l' has been detected as: 'x86' [...] /home/buildroot/autobuild/instance-0/output-1/build/zlib-ng-2.1.3/arch/x86/x86_features.c:17:12: fatal error: cpuid.h: No such file or directory 17 | # include | ^~~~~~~~~ [1] https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_TARGET.html [2] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html [3] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-using-clang [4] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-qnx Fixes: d2249821d3f30202ca2a35ad24918378d9a0a0e8 - http://autobuild.buildroot.org/results/1551aa69be19239a8d8e081f033e4027d679ab8f - http://autobuild.buildroot.org/results/075d704c0f11710353bac43478e4501addcd747d Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Thomas Petazzoni and Peter Korsgaard): - Update commit message package/zlib-ng/zlib-ng.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index fbb906503a..33e8754c9d 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -13,6 +13,7 @@ ZLIB_NG_PROVIDES = zlib # Build with zlib compatible API, gzFile support and optimizations on ZLIB_NG_CONF_OPTS += \ + -DCMAKE_C_COMPILER_TARGET=$(BR2_ARCH) \ -DWITH_GZFILEOP=1 \ -DWITH_OPTIM=1 \ -DZLIB_COMPAT=1 \ -- 2.43.0 From bernd at kuhls.net Wed Feb 21 18:17:47 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Wed, 21 Feb 2024 19:17:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/kodi-pvr-mythtv: bump version to 20.6.4-Nexus Message-ID: <20240221181747.41773-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index c61c391825..b4e6f30685 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb21e185d1333a8696565138bc58df3d37970c9a3615193396e9f296a56a24c4 kodi-pvr-mythtv-20.5.10-Nexus.tar.gz +sha256 da7cdc514ce48992e7c2575735c4bd9d22891ba3c12169ae42163b159517b8c9 kodi-pvr-mythtv-20.6.4-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 66f1948741..57ddf3af10 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.5.10-Nexus +KODI_PVR_MYTHTV_VERSION = 20.6.4-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.39.2 From james.hilliard1 at gmail.com Wed Feb 21 18:23:04 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Wed, 21 Feb 2024 11:23:04 -0700 Subject: [Buildroot] [PATCH 1/1] package/swupdate: bump to version 2023.12.1 Message-ID: <20240221182304.647302-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index c19a82304f..19ef3a2724 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ce24032300e2b6a6faa3d22e49f981fd90f04ac6f5d7e802166824b0cd5ca669 swupdate-2023.12.tar.gz +sha256 89ec8926d66627255fe689ed96ad8d30f5c539315956dacf9890e308095dee3b swupdate-2023.12.1.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index ca8c140886..3b78c160f8 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2023.12 +SWUPDATE_VERSION = 2023.12.1 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ -- 2.34.1 From bernd at kuhls.net Wed Feb 21 19:55:20 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Wed, 21 Feb 2024 20:55:20 +0100 Subject: [Buildroot] [PATCH 1/1] package/libffi: bump version to 3.4.6 Message-ID: <20240221195520.1762497-1-bernd@kuhls.net> Removed patch 0001 and instead added new configure option --disable-multi-os-directory which was added upstream: https://github.com/libffi/libffi/commit/877ea9bf9ac2c98cb858c12f5a6aeeec13cf978f Removed patch 0003 due to various upstream fixes for mips soft-float support since its addition in 2016: https://github.com/libffi/libffi/commits/master/src/mips Renumbered remaining patch. Updated license hash due to copyright year bump: https://github.com/libffi/libffi/commit/91739a1a912476adbf1e0e4dcb091b9a2c5007d9 Signed-off-by: Bernd Kuhls --- Build-tested using this defconfig: BR2_PACKAGE_LIBFFI=y Please note that the build failure with bootlin-armv7m-uclibc is expected: http://lists.busybox.net/pipermail/buildroot/2019-October/566384.html The remaining patch 0001 is still needed, builds with sourcery-mips* toolchains failed without it. arm-aarch64 [ 1/45]: OK bootlin-aarch64-glibc [ 2/45]: OK bootlin-arcle-hs38-uclibc [ 3/45]: OK bootlin-armv5-uclibc [ 4/45]: OK bootlin-armv7-glibc [ 5/45]: OK bootlin-armv7m-uclibc [ 6/45]: FAILED bootlin-armv7-musl [ 7/45]: OK bootlin-m68k-5208-uclibc [ 8/45]: OK bootlin-m68k-68040-uclibc [ 9/45]: OK bootlin-microblazeel-uclibc [10/45]: OK bootlin-mipsel32r6-glibc [11/45]: OK bootlin-mipsel-uclibc [12/45]: OK bootlin-nios2-glibc [13/45]: OK bootlin-openrisc-uclibc [14/45]: OK bootlin-powerpc64le-power8-glibc [15/45]: OK bootlin-powerpc-e500mc-uclibc [16/45]: OK bootlin-riscv32-glibc [17/45]: OK bootlin-riscv64-glibc [18/45]: OK bootlin-riscv64-musl [19/45]: OK bootlin-s390x-z13-glibc [20/45]: OK bootlin-sh4-uclibc [21/45]: OK bootlin-sparc64-glibc [22/45]: OK bootlin-sparc-uclibc [23/45]: OK bootlin-x86-64-glibc [24/45]: OK bootlin-x86-64-musl [25/45]: OK bootlin-x86-64-uclibc [26/45]: OK bootlin-xtensa-uclibc [27/45]: OK br-arm-basic [28/45]: OK br-arm-full-nothread [29/45]: SKIPPED br-arm-full-static [30/45]: OK br-i386-pentium4-full [31/45]: OK br-i386-pentium-mmx-musl [32/45]: OK br-mips64-n64-full [33/45]: OK br-mips64r6-el-hf-glibc [34/45]: OK br-powerpc-603e-basic-cpp [35/45]: OK br-powerpc64-power7-glibc [36/45]: OK linaro-aarch64-be [37/45]: OK linaro-aarch64 [38/45]: OK linaro-arm [39/45]: OK sourcery-arm-armv4t [40/45]: OK sourcery-arm [41/45]: OK sourcery-arm-thumb2 [42/45]: OK sourcery-mips64 [43/45]: OK sourcery-mips [44/45]: OK sourcery-nios2 [45/45]: OK 45 builds, 1 skipped, 1 build failed, 0 legal-info failed, 0 show-info failed ...-Fix-installation-location-of-libffi.patch | 55 ------------------- ...ix-use-of-compact-eh-frames-on-MIPS.patch} | 4 +- ...-hardfloat-in-the-MIPS-assembly-code.patch | 44 --------------- package/libffi/libffi.hash | 4 +- package/libffi/libffi.mk | 7 ++- 5 files changed, 9 insertions(+), 105 deletions(-) delete mode 100644 package/libffi/0001-Fix-installation-location-of-libffi.patch rename package/libffi/{0002-Fix-use-of-compact-eh-frames-on-MIPS.patch => 0001-Fix-use-of-compact-eh-frames-on-MIPS.patch} (94%) delete mode 100644 package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch diff --git a/package/libffi/0001-Fix-installation-location-of-libffi.patch b/package/libffi/0001-Fix-installation-location-of-libffi.patch deleted file mode 100644 index 6ac9123730..0000000000 --- a/package/libffi/0001-Fix-installation-location-of-libffi.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 580f46a7bc6e9fea3a2227b5268cc3aed1d60e3b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 7 Feb 2013 22:26:56 +0100 -Subject: [PATCH] Fix installation location of libffi -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The libffi is currently declared as toolexeclib_LTLIBRARIES. In many -cases, toolexeclib libraries will be installed in /usr/lib, so it -doesn't make any difference. - -However, with multilib toolchains, they get installed in a -subdirectory of /usr/lib/. For example, with a Sourcery CodeBench -PowerPC toolchain, if the e500mc multilib variant is used, the libffi -library gets installed in /usr/lib/te500mc/. This is due to the -following code in the configure script: - - multi_os_directory=`$CC -print-multi-os-directory` - case $multi_os_directory in - .) ;; # Avoid trailing /. - *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; - esac - -Once the library is installed in /usr/lib/te500mc/, nothing works -because this installation location is inconsistent with the -installation location declared in libffi.pc. - -So, instead of using this bizarre toolexeclib_LTLIBRARIES, simply use -the more standard lib_LTLIBRARIES, which ensures that the libffi -library is always installed in /usr/lib. - -Signed-off-by: Thomas Petazzoni -[unfuzz for 3.2.1] -Signed-off-by: J?rg Krause ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 0e40451..309474c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -104,7 +104,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) - - MAKEOVERRIDES= - --toolexeclib_LTLIBRARIES = libffi.la -+lib_LTLIBRARIES = libffi.la - noinst_LTLIBRARIES = libffi_convenience.la - - libffi_la_SOURCES = src/prep_cif.c src/types.c \ --- -2.5.3 - diff --git a/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch b/package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch similarity index 94% rename from package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch rename to package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch index c19e395f90..7786b984a2 100644 --- a/package/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch +++ b/package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch @@ -15,6 +15,8 @@ Mips and compiler support it. Signed-off-by: J?r?me Pouiller [unfuzz for 3.2.1] Signed-off-by: J?rg Krause +[rebased for 3.4.6] +Signed-off-by: Bernd Kuhls --- configure.ac | 10 ++++++++++ 1 file changed, 10 insertions(+) @@ -23,7 +25,7 @@ diff --git a/configure.ac b/configure.ac index a7bf5ee..36cd0d4 100644 --- a/configure.ac +++ b/configure.ac -@@ -469,6 +469,16 @@ esac +@@ -238,6 +238,16 @@ esac AM_CONDITIONAL(FFI_EXEC_TRAMPOLINE_TABLE, test x$FFI_EXEC_TRAMPOLINE_TABLE = x1) AC_SUBST(FFI_EXEC_TRAMPOLINE_TABLE) diff --git a/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch b/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch deleted file mode 100644 index 168972a871..0000000000 --- a/package/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 48bc37fabbc685b1e3293055bd33ca66c619305e Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Wed, 13 Jan 2016 14:49:59 +0000 -Subject: [PATCH] libffi: enable hardfloat in the MIPS assembly code - -This way it will be possible to build it for soft-float. This is only a -temporary fix. The package needs to be fixed properly. - -Signed-off-by: Vicente Olivert Riera -[Update for 3.3-rc0] -Signed-off-by: Fabrice Fontaine ---- - src/mips/n32.S | 1 + - src/mips/o32.S | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/mips/n32.S b/src/mips/n32.S -index c6985d3..dc842d5 100644 ---- a/src/mips/n32.S -+++ b/src/mips/n32.S -@@ -44,6 +44,7 @@ - #endif - #if !defined(__mips_isa_rev) || (__mips_isa_rev<6) - .set mips4 - #endif -+ .set hardfloat - .text - .align 2 - .globl ffi_call_N32 -diff --git a/src/mips/o32.S b/src/mips/o32.S -index eb27981..b653daf 100644 ---- a/src/mips/o32.S -+++ b/src/mips/o32.S -@@ -42,6 +42,7 @@ - #define RA_OFF (SIZEOF_FRAME - 1 * FFI_SIZEOF_ARG) - - .abicalls -+ .set hardfloat - .text - .align 2 - .globl ffi_call_O32 --- -2.4.10 - diff --git a/package/libffi/libffi.hash b/package/libffi/libffi.hash index 8d2349ec21..c2ef588f6b 100644 --- a/package/libffi/libffi.hash +++ b/package/libffi/libffi.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676 libffi-3.4.4.tar.gz +sha256 b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e libffi-3.4.6.tar.gz # License files, locally calculated -sha256 2c9c2acb9743e6b007b91350475308aee44691d96aa20eacef8e199988c8c388 LICENSE +sha256 67894089811f93fca47a76f85e017da6f8582d4ba0905963c6e0f1ad6df7a195 LICENSE diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 6249023eae..9c47cf3973 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -4,19 +4,20 @@ # ################################################################################ -LIBFFI_VERSION = 3.4.4 +LIBFFI_VERSION = 3.4.6 LIBFFI_SITE = \ https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION) LIBFFI_LICENSE = MIT LIBFFI_LICENSE_FILES = LICENSE LIBFFI_CPE_ID_VALID = YES LIBFFI_INSTALL_STAGING = YES -# We're patching Makefile.am +# We're patching configure.ac LIBFFI_AUTORECONF = YES +LIBFFI_CONF_OPTS = --disable-multi-os-directory # The static exec trampolines is enabled by default since # libffi 3.4.2. However it doesn't work with gobject-introspection. -LIBFFI_CONF_OPTS = --disable-exec-static-tramp +LIBFFI_CONF_OPTS += --disable-exec-static-tramp $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.39.2 From dario.binacchi at amarulasolutions.com Wed Feb 21 20:09:38 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 21 Feb 2024 21:09:38 +0100 Subject: [Buildroot] [PATCH v4 13/20] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <7c4ef18e-774f-4a65-8e51-7a016ed89649@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-14-dario.binacchi@amarulasolutions.com> <7c4ef18e-774f-4a65-8e51-7a016ed89649@smile.fr> Message-ID: Hello Romain, On Wed, Feb 21, 2024 at 4:29?PM Romain Naour wrote: > > Hello Dario, > > Le 21/02/2024 ? 11:19, Dario Binacchi a ?crit : > > Hi Romain, > > > > On Mon, Feb 19, 2024 at 11:15?AM Romain Naour wrote: > >> > >> Hello Dario, > >> > >> Le 17/02/2024 ? 17:02, Dario Binacchi a ?crit : > >>> Recent version of U-Boot use binman to provide a mechanism for building > >>> images, from simple SPL + U-Boot combinations, to more complex > >>> arrangements with many parts. > >>> > >>> The patch set the BINMAN_INDIRS environment variable to provide the > >>> directory to search for binary blobs and select the packages required by > >>> binman. > >>> > >>> Co-developed-by: Michael Trimarchi > >>> Signed-off-by: Michael Trimarchi > >>> Signed-off-by: Dario Binacchi > >>> > >>> --- > >>> > >>> Changes in v4: > >>> - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > >>> > >>> Changes in v2: > >>> - Change commit message > >>> - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > >>> - Select packages required by binman if > >>> BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > >>> > >>> Signed-off-by: Dario Binacchi > >>> --- > >>> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 ++++++++++++- > >>> 1 file changed, 12 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > >>> index 0ffcb8235f2e..2a10024aedaa 100644 > >>> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > >>> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > >>> @@ -39,7 +39,13 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ > >>> host-pkgconf \ > >>> $(BR2_MAKE_HOST_DEPENDENCY) \ > >>> host-arm-gnu-toolchain \ > >>> - host-openssl > >>> + host-openssl \ > >>> + host-python-attrs \ > >>> + host-python-jsonschema \ > >>> + host-python-jsonschema-specifications \ > >>> + host-python-pyyaml \ > >>> + host-python-referencing \ > >>> + host-python-rpds-py > >> > >> Most of theses new dependencies are not ti-k3-r5-loader dependencies but > >> host-python-jsonschema runtime dependencies. > > > > I removed the runtime dependencies and tried to modify the patch based > > on your indications and your patch > > (http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/), > > but I'm encountering compilation errors specifically on the Python > > modules that you indicated as runtime > > dependencies. > > What's the issue? > > Make sure to take host-python changes from my series, some of them was updated > with their own runtime dependencies: The problem was this. I hadn't noticed the changes you had applied to my patches. I'm doing the final tests, I'll submit v5 as soon as possible. Many thanks! Regards, Dario > > For example: > http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-7-romain.naour at smile.fr/ > > I tried to compile ti_am62x_sk_defconfig on your series > > (i. e. "Add ti_j721e_sk_defconfig"), > > but it seems like the HSFS option has disappeared. > > Indeed, this is something we need to improve. > > > So I need to add the runtime dependencies as well to compile correctly. > > Can you try with only patch 4/21 (package/python-attrs: add host variant) to > patch 10/21 (boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN > option). > > Maybe update the last patch 10/21 since it was suggested to remove > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option to make binman use mandatory for > ti-k3-r5-loader package. > > Best regards, > Romain > > > > > Thanks and regards, > > Dario > > > >> > >> Note: host-python-jsonschema depends on > >> BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS due to its runtime dependency on > >> host-python-rpds-py. > >> > >>> > >>> TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > >>> TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > >>> @@ -49,6 +55,10 @@ TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ > >>> $(BR2_BISON_HOST_DEPENDENCY) \ > >>> $(BR2_FLEX_HOST_DEPENDENCY) > >>> > >>> +ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) > >> > >> It's a u-boot package config option. just add host-python-pylibfdt the dependency. > >> > >>> +TI_K3_R5_LOADER_DEPENDENCIES += host-python-pylibfdt > >>> +endif > >>> + > >>> ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) > >>> TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig > >>> else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) > >>> @@ -58,6 +68,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > >>> CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > >>> ARCH=arm \ > >>> HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > >>> + BINMAN_INDIRS=$(BINARIES_DIR) \ > >> > >> I suggested to add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN but indeed we should > >> use binman unconditionally for ti-k3-r5-loader package. > >> > >> http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-11-romain.naour at smile.fr/ > >> > >> Best regards, > >> Romain > >> > >> > >>> HOSTLDFLAGS="$(HOST_LDFLAGS)" > >>> > >>> define TI_K3_R5_LOADER_BUILD_CMDS > >> > > > > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From yann.morin.1998 at free.fr Wed Feb 21 20:08:23 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 21:08:23 +0100 Subject: [Buildroot] [git commit] package/sudo: drop legacy, useless, and broken post-configure hook Message-ID: <20240221201046.A9D0C87A2B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5aade5ced5edc40a4ad848cd276813d273d2d04e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit b9e89b340e27 (sudo: bump version) introduced the explicit build of mksigname and mksiglist as host tools, as they were required to run on the build machine, to generate C code then used to build the target program. This is now failing to build since the bump to sudo 1.9.15p5 in commit c87746afefe7 (package/sudo: security bump to version 1.9.15p5) (lines manually wrapped and slightly elided for ease of reviewing): /usr/bin/cpp \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -I../../include \ -I../.. \ ./sys_signame.h \ | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h In file included from /usr/include/features.h:394, from /usr/include/sys/types.h:25, from ./sys_signame.h:4: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ /usr/bin/gcc -I../../include -I../.. -I. -I. \ -D_PATH_SUDO_CONF=\"/etc/sudo.conf\" -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -DDEFAULT_TEXT_DOMAIN=\"sudo\" \ -O2 \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ ./mksigname.c -o mksigname In file included from /usr/include/features.h:394, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdlib.h:26, from ./mksigname.c:27: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ make[2]: *** [Makefile:263: mksigname] Error 1 The core of the issue has not been really identified, but it turns out that neither mksiglist nor mksignames is used during the build. This has been tested with a minimal sudo with no option, and with a sudo with all options enabled (linux-pam, zlib, opensldap, and openssl), with the three types of C libraries (glibc, musl, and uClibc-ng). Digging in the sudo buildsystem did not reveal an obvious reason when those would be needed either. Drop the hook now it seems it is no longer used and is atually breaking the build. Fixes: http://autobuild.buildroot.org/results/72f/72ff18fb9b41394a29006f881ee1fbea67a66a09/ Note that there is a second issue in there: the call to the host cpp fails, but since it is on the LHS of a pipe, the error is lost, as the RHS of the pipe (the sed call) succeeds; a fix for that will be sent in a separate patch. Reported-by: Christian Stewart Signed-off-by: Yann E. MORIN Cc: Peter Korsgaard Reviewed-by: Christian Stewart --- package/sudo/sudo.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index a4e838dd94..7961a99002 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -58,15 +58,6 @@ else SUDO_CONF_OPTS += --disable-openssl endif -# mksigname/mksiglist needs to run on build host to generate source files -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - $(MAKE) $(HOST_CONFIGURE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ - -C $(@D)/lib/util mksigname mksiglist -endef - -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - define SUDO_PERMISSIONS /usr/bin/sudo f 4755 0 0 - - - - - endef From dario.binacchi at amarulasolutions.com Wed Feb 21 20:11:04 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 21 Feb 2024 21:11:04 +0100 Subject: [Buildroot] [PATCH v4 19/20] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240220223423.bnrqouwcuuxhw43f@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <20240217160244.1320482-20-dario.binacchi@amarulasolutions.com> <20240220223423.bnrqouwcuuxhw43f@dasso> Message-ID: Hi Andreas, On Tue, Feb 20, 2024 at 11:34?PM Andreas Dannenberg wrote: > > Hi Dario, > > On Sat, Feb 17, 2024 at 05:02:43PM +0100, Dario Binacchi wrote: > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Added in v4 > > > > Signed-off-by: Dario Binacchi > > --- > > boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index 2a10024aedaa..643298a1e70a 100644 > > --- a/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -75,8 +75,11 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_SECTYPE)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + find $(@D) -name "tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > > endef > > I like how this picks/renames the tiboot3.bin corresponding to the > device security type, this way allowing to generate a tailored and > readily bootable image depending on GP, HS-FS, HS device type. > > However the find/copy approach may not always work as intended. Consider > the build output of R5 U-Boot SPL for AM64x for example: > > $ ll tiboot3-*.bin > -rw-rw-r-- 1 a0797059 a0797059 304431 Feb 20 15:34 tiboot3-am64x-gp-evm.bin > -rw-rw-r-- 1 a0797059 a0797059 532270 Feb 20 15:34 tiboot3-am64x_sr2-hs-evm.bin > -rw-rw-r-- 1 a0797059 a0797059 532270 Feb 20 15:34 tiboot3-am64x_sr2-hs-fs-evm.bin > > Note how there's a '_sr2' (Silicon Revision 2.0) in the filename of some > of the boot binaries. I did look at the different K3 devices supported > in U-Boot at the moment, and it looks like currently this will not be an > issue that will manifest itself as the device security type happens to > be unique enough to also pick the right silicon revision. But of course > this doesn't mean it'll always stay like this.... > > So it might be better to leverage BR2_TARGET_TI_K3_SOC to be more > specific in that find/copy operation and use this to replace the > asterisk in "tiboot3-*". So then somebody can use "am64x" or "am64x_sr2" > for example as BR2_TARGET_TI_K3_SOC, and you would guarantee the right > file gets used to populate the final tiboot3.bin. Thanks for the suggestion! I will add it to v5. Thanks and regards, Dario > > > -- > Andreas Dannenberg > Texas Instruments Inc > > > > > > > > > > $(eval $(kconfig-package)) > > -- > > 2.43.0 > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From yann.morin.1998 at free.fr Wed Feb 21 20:12:33 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 21:12:33 +0100 Subject: [Buildroot] [PATCH] package/sudo: drop legacy, useless, and broken post-configure hook In-Reply-To: <20240217172923.3629905-1-yann.morin.1998@free.fr> References: <20240217172923.3629905-1-yann.morin.1998@free.fr> Message-ID: All, On 2024-02-17 18:29 +0100, Yann E. MORIN spake thusly: > Commit b9e89b340e27 (sudo: bump version) introduced the explicit build > of mksigname and mksiglist as host tools, as they were required to run > on the build machine, to generate C code then used to build the target > program. > > This is now failing to build since the bump to sudo 1.9.15p5 in commit > c87746afefe7 (package/sudo: security bump to version 1.9.15p5) > (lines manually wrapped and slightly elided for ease of reviewing): > > /usr/bin/cpp \ > -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ > -I../../include \ > -I../.. \ > ./sys_signame.h \ > | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h > In file included from /usr/include/features.h:394, > from /usr/include/sys/types.h:25, > from ./sys_signame.h:4: > /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > | ^~~~~ > /usr/bin/gcc -I../../include -I../.. -I. -I. \ > -D_PATH_SUDO_CONF=\"/etc/sudo.conf\" > -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ > -DDEFAULT_TEXT_DOMAIN=\"sudo\" \ > -O2 \ > -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ > ./mksigname.c -o mksigname > In file included from /usr/include/features.h:394, > from /usr/include/bits/libc-header-start.h:33, > from /usr/include/stdlib.h:26, > from ./mksigname.c:27: > /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" > | ^~~~~ > make[2]: *** [Makefile:263: mksigname] Error 1 > > The core of the issue has not been really identifie, but it turns out / Typo fixed when applying --------------------------' > that neither mksiglist nor mksignames is used during the build. This has > been tested with a minimal sudo with no option, and with a sudo with all > options enabled (linux-pam, zlib, opensldap, and openssl), with the > three types of C libraries (glibc, musl, and uClibc-ng). > > Digging in the sudo buildsystem did not reveal an obvious reason when > those would be needed either. > > Drop the hook now it seems it is no longer used and is atually breasking / Typo fixed when applying -------------------------------------------' > the build. > > Fixes: http://autobuild.buildroot.org/results/72f/72ff18fb9b41394a29006f881ee1fbea67a66a09/ > > Note that there is a second issue in there: the call to the host cpp > fails, but since it is on the LHS of a pipe, the error is lost, as the > RHS of the pipe (the sed call) succeeds; a fix for that will be send > in a separate patch. > > Reported-by: Christian Stewart > Signed-off-by: Yann E. MORIN > Cc: Peter Korsgaard Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/sudo/sudo.mk | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk > index a4e838dd94..7961a99002 100644 > --- a/package/sudo/sudo.mk > +++ b/package/sudo/sudo.mk > @@ -58,15 +58,6 @@ else > SUDO_CONF_OPTS += --disable-openssl > endif > > -# mksigname/mksiglist needs to run on build host to generate source files > -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > - $(MAKE) $(HOST_CONFIGURE_OPTS) \ > - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ > - -C $(@D)/lib/util mksigname mksiglist > -endef > - > -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST > - > define SUDO_PERMISSIONS > /usr/bin/sudo f 4755 0 0 - - - - - > endef > -- > 2.43.0 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Wed Feb 21 20:15:39 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 21:15:39 +0100 Subject: [Buildroot] [git commit] package/zlib-ng: fix arm build Message-ID: <20240221201908.5D2E387A31@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=900bd80e9bfde5f1bb6c2dc746a9149a467f1f09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master zlib-ng usage uses CMAKE_C_COMPILER_TARGET which is non-standard and is not supposed to be used by the CMakeLists.txt machinery of a particular package. Indeed, [1] specifies that: Some compiler drivers are inherently cross-compilers, such as clang and QNX qcc. These compiler drivers support a command-line argument to specify the target to cross-compile for. buildroot is not using clang nor QNX qcc. [2] also refers to this variable only for clang [3] and QNX [4]. Therefore, zlib-ng's usage of this variable is a bit of a hack, and it's actually why it works when passed as an argument, because they are in fact not supposed to use this variable. So set CMAKE_C_COMPILER_TARGET to BR2_ARCH to fix the following arm build failure raised since bump to version 2.0.6 in commit d2249821d3f30202ca2a35ad24918378d9a0a0e8: -- Detecting C compile features - done -- Arch not recognized, falling back to cmake arch: 'l' -- Basearch 'l' not recognized, defaulting to 'x86'. -- Basearch of 'l' has been detected as: 'x86' [...] /home/buildroot/autobuild/instance-0/output-1/build/zlib-ng-2.1.3/arch/x86/x86_features.c:17:12: fatal error: cpuid.h: No such file or directory 17 | # include | ^~~~~~~~~ [1] https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_TARGET.html [2] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html [3] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-using-clang [4] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-qnx Fixes: d2249821d3f30202ca2a35ad24918378d9a0a0e8 - http://autobuild.buildroot.org/results/1551aa69be19239a8d8e081f033e4027d679ab8f - http://autobuild.buildroot.org/results/075d704c0f11710353bac43478e4501addcd747d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zlib-ng/zlib-ng.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index fbb906503a..33e8754c9d 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -13,6 +13,7 @@ ZLIB_NG_PROVIDES = zlib # Build with zlib compatible API, gzFile support and optimizations on ZLIB_NG_CONF_OPTS += \ + -DCMAKE_C_COMPILER_TARGET=$(BR2_ARCH) \ -DWITH_GZFILEOP=1 \ -DWITH_OPTIM=1 \ -DZLIB_COMPAT=1 \ From yann.morin.1998 at free.fr Wed Feb 21 20:19:19 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 21 Feb 2024 21:19:19 +0100 Subject: [Buildroot] [PATCH v2,1/1] package/zlib-ng: fix arm build In-Reply-To: <20240221181650.1115046-1-fontaine.fabrice@gmail.com> References: <20240221181650.1115046-1-fontaine.fabrice@gmail.com> Message-ID: Fabrice, All, On 2024-02-21 19:16 +0100, Fabrice Fontaine spake thusly: > zlib-ng usage uses CMAKE_C_COMPILER_TARGET which is non-standard and > is not supposed to be used by the CMakeLists.txt machinery of a > particular package. > > Indeed, [1] specifies that: > > Some compiler drivers are inherently cross-compilers, such as clang > and QNX qcc. These compiler drivers support a command-line argument > to specify the target to cross-compile for. > > buildroot is not using clang nor QNX qcc. > [2] also refers to this variable only for clang [3] and QNX [4]. > > Therefore, zlib-ng's usage of this variable is a bit of a hack, and it's > actually why it works when passed as an argument, because they are in > fact not supposed to use this variable. > > So set CMAKE_C_COMPILER_TARGET to BR2_ARCH to fix the following arm > build failure raised since bump to version 2.0.6 in commit > d2249821d3f30202ca2a35ad24918378d9a0a0e8: > > -- Detecting C compile features - done > -- Arch not recognized, falling back to cmake arch: 'l' > -- Basearch 'l' not recognized, defaulting to 'x86'. > -- Basearch of 'l' has been detected as: 'x86' > > [...] > > /home/buildroot/autobuild/instance-0/output-1/build/zlib-ng-2.1.3/arch/x86/x86_features.c:17:12: fatal error: cpuid.h: No such file or directory > 17 | # include > | ^~~~~~~~~ > > [1] https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_TARGET.html > [2] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html > [3] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-using-clang > [4] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-qnx > > Fixes: d2249821d3f30202ca2a35ad24918378d9a0a0e8 > - http://autobuild.buildroot.org/results/1551aa69be19239a8d8e081f033e4027d679ab8f > - http://autobuild.buildroot.org/results/075d704c0f11710353bac43478e4501addcd747d > > Signed-off-by: Fabrice Fontaine Applied to master, thanks. Regards, Yann E. MORIN. > --- > Changes v1 -> v2 (after review of Thomas Petazzoni and Peter Korsgaard): > - Update commit message > > package/zlib-ng/zlib-ng.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk > index fbb906503a..33e8754c9d 100644 > --- a/package/zlib-ng/zlib-ng.mk > +++ b/package/zlib-ng/zlib-ng.mk > @@ -13,6 +13,7 @@ ZLIB_NG_PROVIDES = zlib > > # Build with zlib compatible API, gzFile support and optimizations on > ZLIB_NG_CONF_OPTS += \ > + -DCMAKE_C_COMPILER_TARGET=$(BR2_ARCH) \ > -DWITH_GZFILEOP=1 \ > -DWITH_OPTIM=1 \ > -DZLIB_COMPAT=1 \ > -- > 2.43.0 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From kilian.zinnecker at mail.de Wed Feb 21 20:27:33 2024 From: kilian.zinnecker at mail.de (kilian.zinnecker at mail.de) Date: Wed, 21 Feb 2024 21:27:33 +0100 Subject: [Buildroot] [PATCH] configs/lepotato_defconfig: new defconfig In-Reply-To: <20240220225025.781466-2-romain.naour@smile.fr> References: <20240220225025.781466-1-romain.naour@smile.fr> <20240220225025.781466-2-romain.naour@smile.fr> Message-ID: <5755205.DvuYhMxLoT@laptop> Hi Romain, Am Dienstag, 20. Februar 2024, 23:50:25 CET schrieb Romain Naour: > Add basic support for the Libre Computer "Le Potato" SBC. > > https://libre.computer/products/aml-s905x-cc > > Signed-off-by: Romain Naour Tested-by: Kilian Zinnecker Build test only (as I don't have the board), with ./utils/docker-run Best regards, Kilian From bernd at kuhls.net Wed Feb 21 20:31:53 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Wed, 21 Feb 2024 21:31:53 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.19.5 Message-ID: <20240221203153.3428611-1-bernd@kuhls.net> Release notes: https://www.samba.org/samba/history/samba-4.19.5.html Signed-off-by: Bernd Kuhls --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 3353221959..4e74e07bd0 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc -sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.5.tar.asc +sha256 0e2405b4cec29d0459621f4340a1a74af771ec7cffedff43250cad7f1f87605e samba-4.19.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 78c5db308d..0980d03175 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.4 +SAMBA4_VERSION = 4.19.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES -- 2.39.2 From giulio.benetti at benettiengineering.com Wed Feb 21 20:43:24 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 21:43:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/swupdate: bump to version 2023.12.1 In-Reply-To: <20240221182304.647302-1-james.hilliard1@gmail.com> References: <20240221182304.647302-1-james.hilliard1@gmail.com> Message-ID: Hi James, On 21/02/24 19:23, James Hilliard wrote: > Signed-off-by: James Hilliard thank you, Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > --- > package/swupdate/swupdate.hash | 2 +- > package/swupdate/swupdate.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash > index c19a82304f..19ef3a2724 100644 > --- a/package/swupdate/swupdate.hash > +++ b/package/swupdate/swupdate.hash > @@ -1,5 +1,5 @@ > # Locally calculated > -sha256 ce24032300e2b6a6faa3d22e49f981fd90f04ac6f5d7e802166824b0cd5ca669 swupdate-2023.12.tar.gz > +sha256 89ec8926d66627255fe689ed96ad8d30f5c539315956dacf9890e308095dee3b swupdate-2023.12.1.tar.gz > sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt > sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt > sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt > diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk > index ca8c140886..3b78c160f8 100644 > --- a/package/swupdate/swupdate.mk > +++ b/package/swupdate/swupdate.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -SWUPDATE_VERSION = 2023.12 > +SWUPDATE_VERSION = 2023.12.1 > SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) > SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 > SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:02 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:02 +0100 Subject: [Buildroot] [PATCH v2 6/9] package/libgeos: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-7-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov --- package/libgeos/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/libgeos/Config.in b/package/libgeos/Config.in index 2a27c6f2a4..76cbb9bdcd 100644 --- a/package/libgeos/Config.in +++ b/package/libgeos/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_LIBGEOS depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 help GEOS (Geometry Engine - Open Source) is a C++ port of the JTS Topology Suite (JTS). It aims to contain the complete @@ -14,8 +13,7 @@ config BR2_PACKAGE_LIBGEOS https://trac.osgeo.org/geos -comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads not binutils bug 27597" +comment "libgeos needs a toolchain w/ C++, wchar, gcc >= 4.9, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:01 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:01 +0100 Subject: [Buildroot] [PATCH v2 5/9] package/libcamera: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-6-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/libcamera/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index ccb5281b4b..e84b8d342e 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS default y # Invalid packing size of ControlValue struct on m68k depends on !BR2_m68k - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 menuconfig BR2_PACKAGE_LIBCAMERA bool "libcamera" -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:00 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:00 +0100 Subject: [Buildroot] [PATCH v2 4/9] package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-5-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/kf5/kf5-kcoreaddons/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/kf5/kf5-kcoreaddons/Config.in b/package/kf5/kf5-kcoreaddons/Config.in index 02bd38e395..88fda03ee0 100644 --- a/package/kf5/kf5-kcoreaddons/Config.in +++ b/package/kf5/kf5-kcoreaddons/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_KF5_KCOREADDONS bool "kf5-kcoreaddons" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_KF5_EXTRA_CMAKE_MODULES select BR2_PACKAGE_QT5TOOLS select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:03 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:03 +0100 Subject: [Buildroot] [PATCH v2 7/9] package/pistache: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-8-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti --- package/pistache/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 3acf1f53f0..ca2d2833cd 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_PISTACHE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_RAPIDJSON help Pistache is a modern and elegant HTTP and REST framework @@ -13,9 +12,8 @@ config BR2_PACKAGE_PISTACHE https://github.com/oktal/pistache -comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" +comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_USE_WCHAR -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:39:57 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:39:57 +0100 Subject: [Buildroot] [PATCH v2 1/9] toolchain/toolchain-external: drop external codesourcery niosII toolchain In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-2-giulio.benetti@benettiengineering.com> This toolchain is pretty old and unlikely used. It's also affected by binutils bug 27597, so let's remove it. Signed-off-by: Giulio Benetti --- toolchain/toolchain-external/Config.in | 6 ------ .../toolchain-external/pkg-toolchain-external.mk | 2 +- .../Config.in | 16 ---------------- .../Config.in.options | 9 --------- .../toolchain-external-codesourcery-niosII.hash | 6 ------ .../toolchain-external-codesourcery-niosII.mk | 13 ------------- 6 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index c1c159cb8e..cb678b7886 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -33,9 +33,6 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in" source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in" -# NIOSII -source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in" - # Bootlin toolchains, available for virtually all architectures source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in" @@ -137,9 +134,6 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options" source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options" -# NIOSII -source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options" - # Bootlin toolchains source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options" diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index ddf1d70ab4..aa5365b5bd 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -13,7 +13,7 @@ # * Toolchains provided by Linaro for the ARM and AArch64 # architectures # * Sourcery CodeBench toolchains (from Mentor Graphics) for the ARM, -# MIPS, PowerPC, x86_64 and NIOS 2 architectures. For the MIPS +# MIPS, PowerPC, and x86_64 architectures. For the MIPS # toolchain, the -muclibc variant isn't supported yet, only the # default glibc-based variant is. # * Synopsys DesignWare toolchains for ARC cores diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in deleted file mode 100644 index cf3ce69a68..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - bool "Sourcery CodeBench Nios-II 2018.05" - depends on BR2_nios2 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 - select BR2_TOOLCHAIN_GCC_AT_LEAST_7 - help - Sourcery CodeBench toolchain for the Nios-II architecture, - from Mentor Graphics. It uses gcc 7.3, binutils 2.28, - glibc 2.27, gdb 8.0.1 and kernel headers 4.15.5. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options deleted file mode 100644 index 07cc5ede94..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "nios2-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-niosII" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash deleted file mode 100644 index 47893ab7e2..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From https://sourcery.mentor.com/GNUToolchain/release3374 -md5 4f536b3b9b4e00f483e82e304c0a27ae sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -md5 be42ab83da2e8db7b73dc890c2549570 sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 -# Locally calculated -sha256 c19afb432b5b23f8d5d639831d3a423a3ea3c9cc62e0015020d20ea2eb36dd1b sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 d73a6364106dd62352711f932d3be8e97fdaaa548995678b5d38d9f21e22437a sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk deleted file mode 100644 index cb0fe760ff..0000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-niosII -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2018.05-5 - -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SOURCE = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_ACTUAL_SOURCE_TARBALL = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package)) -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:39:59 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:39:59 +0100 Subject: [Buildroot] [PATCH v2 3/9] package/gdal: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-4-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov --- package/gdal/Config.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/gdal/Config.in b/package/gdal/Config.in index 24a1f06af2..839a1bd7ea 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_GDAL # configure can't find proj, when linking statically depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 depends on BR2_TOOLCHAIN_HAS_THREADS # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_GIFLIB @@ -26,9 +25,8 @@ config BR2_PACKAGE_GDAL https://gdal.org/ -comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar" +comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:04 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:04 +0100 Subject: [Buildroot] [PATCH v2 8/9] package/postgis: drop nios2 binutils bug 27597 dependency In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-9-giulio.benetti@benettiengineering.com> Now that binutils patch has been backported to every Buildroot binutils version we can drop nios2 binutils bug 27597 dependency. Signed-off-by: Giulio Benetti Reviewed-by: Maxim Kochetkov --- package/postgis/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 7d42390677..78569d63be 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_POSTGIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj depends on BR2_USE_WCHAR # libgeos, proj - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS select BR2_PACKAGE_PROJ select BR2_PACKAGE_LIBXML2 @@ -18,7 +17,6 @@ config BR2_PACKAGE_POSTGIS https://postgis.net/ -comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9, not binutils bug 27597" +comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:39:56 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:39:56 +0100 Subject: [Buildroot] [PATCH v2 0/9] Patch and remove Nios2 binutils bug 27597 In-Reply-To: <20240218230524.639348e6@windsurf> References: <20240218230524.639348e6@windsurf> Message-ID: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> This patchset: * add backported patches for Buildroot Nios2 binutils bug 27597 * remove Codesourcery Nios2 external toolchain that is affected from bug above (I've tried to update to latest 2023.09-5 just for testing and yes, it's still affected by that bug, maybe once they will release toolchain based on latest binutils 2.42 that has patch applied to fix bug 27597 we can add it back) * HERE we need Bootlin Nios2 Toolchain to be patched, rebuilt and updated. I've opened a PR with binutils patches for bug 27597: https://github.com/bootlin/buildroot-toolchains/pull/2 * drop all bug 27597 bug depencies * drop the bug 27597 itself Best regards Giulio Giulio Benetti (9): toolchain/toolchain-external: drop external codesourcery niosII toolchain package/binutils: add local patches to fix Nios2 bug 27597 package/gdal: drop nios2 binutils bug 27597 dependency package/kf5/kf5-kcoreaddons: drop nios2 binutils bug 27597 dependency package/libcamera: drop nios2 binutils bug 27597 dependency package/libgeos: drop nios2 binutils bug 27597 dependency package/pistache: drop nios2 binutils bug 27597 dependency package/postgis: drop nios2 binutils bug 27597 dependency toolchain: remove binutils bug 27597 ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ package/gdal/Config.in | 4 +- package/kf5/kf5-kcoreaddons/Config.in | 1 - package/libcamera/Config.in | 1 - package/libgeos/Config.in | 6 +- package/pistache/Config.in | 6 +- package/postgis/Config.in | 6 +- toolchain/Config.in | 6 - toolchain/toolchain-external/Config.in | 6 - .../pkg-toolchain-external.mk | 2 +- .../Config.in | 16 --- .../Config.in.options | 9 -- ...oolchain-external-codesourcery-niosII.hash | 6 - .../toolchain-external-codesourcery-niosII.mk | 13 -- 16 files changed, 383 insertions(+), 74 deletions(-) create mode 100644 package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:40:05 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:40:05 +0100 Subject: [Buildroot] [PATCH v2 9/9] toolchain: remove binutils bug 27597 In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-10-giulio.benetti@benettiengineering.com> Binutils bug 27597 is not present anymore in Buildroot so let's remove it. Signed-off-by: Giulio Benetti --- toolchain/Config.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 407a03c42e..9e6cff1950 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -71,12 +71,6 @@ source "package/gdb/Config.in.host" comment "Toolchain Generic Options" -# https://sourceware.org/bugzilla/show_bug.cgi?id=27597 -# Affect toolchains built with binutils 2.36.1, still not fixed. -config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 - bool - default y if BR2_nios2 - # https://sourceware.org/bugzilla/show_bug.cgi?id=30730 # Affect toolchains built with binutils 2.40, still not fixed. config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 -- 2.34.1 From giulio.benetti at benettiengineering.com Wed Feb 21 21:39:58 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Wed, 21 Feb 2024 22:39:58 +0100 Subject: [Buildroot] [PATCH v2 2/9] package/binutils: add local patches to fix Nios2 bug 27597 In-Reply-To: <20240221214005.176433-1-giulio.benetti@benettiengineering.com> References: <20240218230524.639348e6@windsurf> <20240221214005.176433-1-giulio.benetti@benettiengineering.com> Message-ID: <20240221214005.176433-3-giulio.benetti@benettiengineering.com> These backported patches fix Nios2 linker bug 27597 that affects packages gdal, kf5-kcoreaddons, libgeos, libcamera, pistache. Signed-off-by: Giulio Benetti --- ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ ...ertion-fail-in-nios2_elf32_install_i.patch | 125 ++++++++++++++++++ 3 files changed, 375 insertions(+) create mode 100644 package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch create mode 100644 package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch diff --git a/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.39/0004-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + diff --git a/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.40/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + diff --git a/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch b/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch new file mode 100644 index 0000000000..4753ae13c4 --- /dev/null +++ b/package/binutils/2.41/0003-PR27597-nios-assertion-fail-in-nios2_elf32_install_i.patch @@ -0,0 +1,125 @@ +From 900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Fri, 16 Feb 2024 22:33:29 +1030 +Subject: [PATCH] PR27597, nios: assertion fail in nios2_elf32_install_imm16 + +The assertion in nios2_elf32_install_imm16 triggers when the PLT is +twice the maximum allowable size for a branch from PLTn to reach +.PLTresolve, and on no other call to nios2_elf32_install_imm16. That +makes the assertion completely useless. We can handle a PIC PLT +exceeding 0x8000 in size by bouncing branches that won't reach through +previous branches. + + PR 27597 + * elf32-nios2.c (nios2_elf32_install_imm16): Delete BFD_ASSERT. + (nios2_build_one_stub): Don't bother masking value passed to + nios2_elf32_install_imm16. + (nios2_elf32_finish_dynamic_symbol): Likewise. Handle overflow + of PLTn branch to .PLTresolve by bouncing through prior branches. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=900c0f0aa3d78cd9e67ccd26fbc86224cef4c5b1 + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-nios2.c | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c +index bebf4239958..7f61e2f8507 100644 +--- a/bfd/elf32-nios2.c ++++ b/bfd/elf32-nios2.c +@@ -1878,8 +1878,6 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) + { + bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); + +- BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); +- + bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), + sec->contents + offset); + } +@@ -2518,7 +2516,7 @@ nios2_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg ATTRIBUTE_U + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset, + hiadj (sym_value)); + nios2_elf32_install_imm16 (stub_sec, hsh->stub_offset + 4, +- (sym_value & 0xffff)); ++ sym_value); + stub_sec->size += 12; + break; + default: +@@ -4986,16 +4984,28 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + /* Emit the PLT entry. */ + if (bfd_link_pic (info)) + { ++ bfd_vma br_offset; ++ + nios2_elf32_install_data (splt, nios2_so_plt_entry, h->plt.offset, + 3); + plt_index = (h->plt.offset - 24) / 12; + got_offset = (plt_index + 3) * 4; + nios2_elf32_install_imm16 (splt, h->plt.offset, +- hiadj(plt_index * 4)); ++ hiadj (plt_index * 4)); + nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- (plt_index * 4) & 0xffff); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 8, +- 0xfff4 - h->plt.offset); ++ plt_index * 4); ++ br_offset = -(h->plt.offset + 12); ++ /* If this plt entry is too far away from the start of .plt ++ for the "br" to reach .PLTresolve, bounce through one or ++ more of the previous "br" instructions. */ ++ if (br_offset < (bfd_vma) -32768) ++ { ++ br_offset += 32768 / 12 * 12 - 4; ++ while (br_offset < (bfd_vma) -32768) ++ br_offset += 32768 / 12 * 12; ++ } ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 8, br_offset); ++ + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); + +@@ -5014,9 +5024,8 @@ nios2_elf32_finish_dynamic_symbol (bfd *output_bfd, + nios2_elf32_install_data (splt, nios2_plt_entry, h->plt.offset, 3); + got_address = (sgotplt->output_section->vma + sgotplt->output_offset + + got_offset); +- nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj(got_address)); +- nios2_elf32_install_imm16 (splt, h->plt.offset + 4, +- got_address & 0xffff); ++ nios2_elf32_install_imm16 (splt, h->plt.offset, hiadj (got_address)); ++ nios2_elf32_install_imm16 (splt, h->plt.offset + 4, got_address); + + /* Fill in the entry in the global offset table. */ + bfd_put_32 (output_bfd, +@@ -5217,8 +5226,8 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + BFD_ASSERT ((got_pcrel & 0xf) == 0); + nios2_elf32_install_data (splt, nios2_so_plt0_entry, 0, 6); + nios2_elf32_install_imm16 (splt, 4, hiadj (got_pcrel)); +- nios2_elf32_install_imm16 (splt, 12, got_pcrel & 0xffff); +- nios2_elf32_install_imm16 (splt, 16, (got_pcrel + 4) & 0xffff); ++ nios2_elf32_install_imm16 (splt, 12, got_pcrel); ++ nios2_elf32_install_imm16 (splt, 16, got_pcrel + 4); + } + else + { +@@ -5240,14 +5249,13 @@ nios2_elf32_finish_dynamic_sections (bfd *output_bfd, + + nios2_elf32_install_data (splt, nios2_plt0_entry, res_size, 7); + nios2_elf32_install_imm16 (splt, res_size, hiadj (res_start)); +- nios2_elf32_install_imm16 (splt, res_size + 4, +- res_start & 0xffff); ++ nios2_elf32_install_imm16 (splt, res_size + 4, res_start); + nios2_elf32_install_imm16 (splt, res_size + 12, + hiadj (got_address)); + nios2_elf32_install_imm16 (splt, res_size + 16, +- (got_address + 4) & 0xffff); ++ got_address + 4); + nios2_elf32_install_imm16 (splt, res_size + 20, +- (got_address + 8) & 0xffff); ++ got_address + 8); + } + } + } +-- +2.34.1 + -- 2.34.1 From fontaine.fabrice at gmail.com Wed Feb 21 22:03:43 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 21 Feb 2024 23:03:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: security bump to version 20.11.1 Message-ID: <20240221220343.1228278-1-fontaine.fabrice@gmail.com> - Fix CVE-2024-21892, CVE-2024-22019, CVE-2024-21896, CVE-2024-22017, CVE-2023-46809, CVE-2024-21891, CVE-2024-21890 and CVE-2024-22025 - LICENSE hash changed due to two things: * c-ares vendored dependency license got updated [1]. This is unused by buildroot though anyway * base64 vendored library license updated copyright years and sorted contributor names [2], [3] - This bump will fix the following build failure raised since bump of python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14 thanks to https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6 https://github.com/nodejs/node/commit/6557c1c9b1206a85bb7d8e7450e8c3a4cff7c84b: Traceback (most recent call last): File "/home/autobuild/autobuild/instance-2/output-1/build/host-nodejs-src-20.9.0/configure.py", line 17, in from distutils.version import StrictVersion ModuleNotFoundError: No module named 'distutils' https://github.com/nodejs/node/blob/v20.11.1/CHANGELOG.md [1] https://github.com/c-ares/c-ares/pull/556 [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 - http://autobuild.buildroot.org/results/8b38bc4b7879a0349c1305e2fcb458a0cfd04a93 Signed-off-by: Fabrice Fontaine --- package/nodejs/nodejs.hash | 14 +++++++------- package/nodejs/nodejs.mk | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2d60437a7c..ddab345e0a 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.9.0/SHASUMS256.txt.asc -sha256 ced3ecece4b7c3a664bca3d9e34a0e3b9a31078525283a6fdb7ea2de8ca5683b node-v20.9.0-linux-arm64.tar.xz -sha256 64099d7e62bdbb8efd52c216a6759b3cdd77c38aa993096fdee9f875d95b2d8e node-v20.9.0-linux-armv7l.tar.xz -sha256 3c6cea5d614cfbb95d92de43fbc2f8ecd66e431502fe5efc4f3c02637897bd45 node-v20.9.0-linux-ppc64le.tar.xz -sha256 9033989810bf86220ae46b1381bdcdc6c83a0294869ba2ad39e1061f1e69217a node-v20.9.0-linux-x64.tar.xz -sha256 a23d96810abf0455426b349d47ce5310f33095b7bc0571b9cc510f481c3a4519 node-v20.9.0.tar.xz +# From https://nodejs.org/dist/v20.11.1/SHASUMS256.txt.asc +sha256 c957f29eb4e341903520caf362534f0acd1db7be79c502ae8e283994eed07fe1 node-v20.11.1-linux-arm64.tar.xz +sha256 28e0120d2d150a8f41717899d33167b8b32053778665583d49ff971bfd188d1b node-v20.11.1-linux-armv7l.tar.xz +sha256 51343cacf5cdf5c4b5e93e919d19dd373d6ef43d5f2c666eae299f26e31d08b5 node-v20.11.1-linux-ppc64le.tar.xz +sha256 d8dab549b09672b03356aa2257699f3de3b58c96e74eb26a8b495fbdc9cf6fbe node-v20.11.1-linux-x64.tar.xz +sha256 77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e node-v20.11.1.tar.xz # Locally calculated -sha256 93ac846282ce6c5255e00fada2fd2e7e292255239fe58d5502b0a554859e6a3e LICENSE +sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9806a64d38..858c6a86f5 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.9.0 +NODEJS_COMMON_VERSION = 20.11.1 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) -- 2.43.0 From fontaine.fabrice at gmail.com Wed Feb 21 22:46:17 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 21 Feb 2024 23:46:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/libxmlpp: bump to version 5.2.0 Message-ID: <20240221224617.1672544-1-fontaine.fabrice@gmail.com> Drop patch (already in version) https://github.com/libxmlplusplus/libxmlplusplus/blob/5.2.0/NEWS Signed-off-by: Fabrice Fontaine --- ...e-it-compatible-with-libxml2--2-12-0.patch | 145 ------------------ package/libxmlpp/libxmlpp.hash | 4 +- package/libxmlpp/libxmlpp.mk | 4 +- 3 files changed, 4 insertions(+), 149 deletions(-) delete mode 100644 package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch diff --git a/package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch b/package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch deleted file mode 100644 index b9100b4966..0000000000 --- a/package/libxmlpp/0001-Make-it-compatible-with-libxml2--2-12-0.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 49471812d57adfb22dcce3cbea1a8956658731b9 Mon Sep 17 00:00:00 2001 -From: Kjell Ahlstedt -Date: Sat, 18 Nov 2023 18:34:07 +0100 -Subject: [PATCH] Make it compatible with libxml2 >= 2.12.0 - -* libxml++/document.cc: -* libxml++/dtd.cc: -* libxml++/nodes/entitydeclaration.cc: -* libxml++/nodes/entityreference.cc: -* libxml++/validators/relaxngvalidator.cc: Modify #include directives. -* libxml++/keepblanks.cc: Ignore deprecation of xmlKeepBlanksDefault(). -* tests/saxparser_chunk_parsing_inconsistent_state/main.cc: -Accept that MySaxParser::on_start_document() can be called before -MySaxParser::on_error(). - -Upstream: https://github.com/libxmlplusplus/libxmlplusplus/commit/49471812d57adfb22dcce3cbea1a8956658731b9 -Signed-off-by: Fabrice Fontaine ---- - libxml++/document.cc | 1 + - libxml++/dtd.cc | 2 +- - libxml++/keepblanks.cc | 5 ++++- - libxml++/nodes/entitydeclaration.cc | 2 +- - libxml++/nodes/entityreference.cc | 2 +- - libxml++/validators/relaxngvalidator.cc | 1 + - .../saxparser_chunk_parsing_inconsistent_state/main.cc | 10 +++++++++- - 7 files changed, 18 insertions(+), 5 deletions(-) - -diff --git a/libxml++/document.cc b/libxml++/document.cc -index da0a8f5..d5476c6 100644 ---- a/libxml++/document.cc -+++ b/libxml++/document.cc -@@ -16,6 +16,7 @@ - - #include - #include -+#include - #include // XML_PARSE_NOXINCNODE, XML_PARSE_NOBASEFIX - - #include -diff --git a/libxml++/dtd.cc b/libxml++/dtd.cc -index 238b3a0..8014c07 100644 ---- a/libxml++/dtd.cc -+++ b/libxml++/dtd.cc -@@ -8,7 +8,7 @@ - #include - #include - --#include -+#include - - #include - -diff --git a/libxml++/keepblanks.cc b/libxml++/keepblanks.cc -index 4228b8d..56b00cf 100644 ---- a/libxml++/keepblanks.cc -+++ b/libxml++/keepblanks.cc -@@ -5,8 +5,11 @@ - * included with libxml++ as the file COPYING. - */ - --#include -+// xmlKeepBlanksDefault() is deprecated since libxml2 2.12.0. -+// Ignore deprecations here. -+#define XML_DEPRECATED - -+#include - #include - - namespace xmlpp -diff --git a/libxml++/nodes/entitydeclaration.cc b/libxml++/nodes/entitydeclaration.cc -index 0a6390e..d5bfa75 100644 ---- a/libxml++/nodes/entitydeclaration.cc -+++ b/libxml++/nodes/entitydeclaration.cc -@@ -5,7 +5,7 @@ - */ - - #include --#include -+#include - - namespace xmlpp - { -diff --git a/libxml++/nodes/entityreference.cc b/libxml++/nodes/entityreference.cc -index 19b1b22..278a126 100644 ---- a/libxml++/nodes/entityreference.cc -+++ b/libxml++/nodes/entityreference.cc -@@ -6,7 +6,7 @@ - - #include - --#include -+#include - - namespace xmlpp - { -diff --git a/libxml++/validators/relaxngvalidator.cc b/libxml++/validators/relaxngvalidator.cc -index 9bb10c2..68a814c 100644 ---- a/libxml++/validators/relaxngvalidator.cc -+++ b/libxml++/validators/relaxngvalidator.cc -@@ -22,6 +22,7 @@ - #include "libxml++/parsers/domparser.h" - #include "libxml++/relaxngschema.h" - -+#include - #include - - namespace xmlpp -diff --git a/tests/saxparser_chunk_parsing_inconsistent_state/main.cc b/tests/saxparser_chunk_parsing_inconsistent_state/main.cc -index 07cc3ef..53f55b3 100644 ---- a/tests/saxparser_chunk_parsing_inconsistent_state/main.cc -+++ b/tests/saxparser_chunk_parsing_inconsistent_state/main.cc -@@ -24,10 +24,14 @@ - - class MySaxParser : public xmlpp::SaxParser - { -+public: -+ bool throw_on_start_doc = true; -+ - protected: - void on_start_document() override - { -- throw std::runtime_error("some custom runtime exception"); -+ if (throw_on_start_doc) -+ throw std::runtime_error("some custom runtime exception"); - } - void on_error(const xmlpp::ustring& /* text */) override - { -@@ -43,6 +47,9 @@ int main() - bool exceptionThrown = false; - try - { -+ // Depending on the libxml2 version, MySaxParser::on_start_document() -+ // may or may not be called before MySaxParser::on_error(). -+ parser.throw_on_start_doc = false; - parser.parse_chunk(""); - parser.parse_stream(ss); - } diff --git a/package/libxmlpp/libxmlpp.hash b/package/libxmlpp/libxmlpp.hash index 1c1342a105..84084b1e35 100644 --- a/package/libxmlpp/libxmlpp.hash +++ b/package/libxmlpp/libxmlpp.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libxml++/5.0/libxml++-5.0.2.sha256sum -sha256 7c17cc3e5a2214314dee5a1354f4b436f266ded6185232a0534f352a76240d5a libxml++-5.0.2.tar.xz +# From https://download.gnome.org/sources/libxml++/5.2/libxml++-5.2.0.sha256sum +sha256 e41b8eae55210511585ae638615f00db7f982c0edea94699865f582daf03b44f libxml++-5.2.0.tar.xz # Hash for license file sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/libxmlpp/libxmlpp.mk b/package/libxmlpp/libxmlpp.mk index dacd5c1eae..e8fbb75b61 100644 --- a/package/libxmlpp/libxmlpp.mk +++ b/package/libxmlpp/libxmlpp.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBXMLPP_VERSION_MAJOR = 5.0 -LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).2 +LIBXMLPP_VERSION_MAJOR = 5.2 +LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).0 LIBXMLPP_LICENSE = LGPL-2.1 (library), LGPL-2.0+ (examples) LIBXMLPP_LICENSE_FILES = COPYING LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz -- 2.43.0 From fontaine.fabrice at gmail.com Wed Feb 21 23:01:17 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 22 Feb 2024 00:01:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/udpxy: bump to version 1.0-25.1 Message-ID: <20240221230117.1688400-1-fontaine.fabrice@gmail.com> - Switch site to get latest release - Set ALL_CFLAGS to drop -Werror - Update hash of README (changes not related to license) Signed-off-by: Fabrice Fontaine --- package/udpxy/Config.in | 2 +- package/udpxy/udpxy.hash | 4 ++-- package/udpxy/udpxy.mk | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/udpxy/Config.in b/package/udpxy/Config.in index f442a2f2fe..84a754bed4 100644 --- a/package/udpxy/Config.in +++ b/package/udpxy/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_UDPXY forwards UDP traffic from a given multicast subscription to the requesting HTTP client. - http://www.udpxy.com/ + https://github.com/pcherenkov/udpxy/ diff --git a/package/udpxy/udpxy.hash b/package/udpxy/udpxy.hash index 8455fcdb1a..e0dbd06a35 100644 --- a/package/udpxy/udpxy.hash +++ b/package/udpxy/udpxy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6ce33b1d14a1aeab4bd2566aca112e41943df4d002a7678d9a715108e6b714bd udpxy.1.0.23-9-prod.tar.gz -sha256 60ead3913246c7cd930fe653c0053aba1af2cd9f82b266befdbbd6e0b8ecb750 README +sha256 a1a16e60895c6b2fd151321db47f5d5373843116f1b98ed9749e6c25a6c44497 udpxy-1.0-25.1.tar.gz +sha256 aac36b21c5afa931fd0e5d796814e29102a3b1f2742fb8694a26ef135aebf943 README diff --git a/package/udpxy/udpxy.mk b/package/udpxy/udpxy.mk index 22467948a5..787f6e58ed 100644 --- a/package/udpxy/udpxy.mk +++ b/package/udpxy/udpxy.mk @@ -4,19 +4,19 @@ # ################################################################################ -UDPXY_VERSION = 1.0.23-9-prod -UDPXY_SOURCE = udpxy.$(UDPXY_VERSION).tar.gz -UDPXY_SITE = http://www.udpxy.com/download/1_23 +UDPXY_VERSION = 1.0-25.1 +UDPXY_SITE = $(call github,pcherenkov,udpxy,$(UDPXY_VERSION)) UDPXY_LICENSE = GPL-3.0+ UDPXY_LICENSE_FILES = README define UDPXY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + ALL_CFLAGS="$(TARGET_CFLAGS)" -C $(@D)/chipmunk endef define UDPXY_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr \ - -C $(@D) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/chipmunk DESTDIR=$(TARGET_DIR) \ + PREFIX=/usr -C $(@D)/chipmunk install endef $(eval $(generic-package)) -- 2.43.0 From david.picard at clermont.in2p3.fr Thu Feb 22 10:09:12 2024 From: david.picard at clermont.in2p3.fr (David Picard) Date: Thu, 22 Feb 2024 11:09:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/intel-socfpga-hwlib: add new package In-Reply-To: <8a008e9a-410f-406a-8e8c-0ce1724c1643@smile.fr> References: <643b99fe-655d-45b9-80dd-f47bb53efcb2@smile.fr> <8a008e9a-410f-406a-8e8c-0ce1724c1643@smile.fr> Message-ID: <29a0ee9e-f370-4bbd-9901-72c0206bcc4d@clermont.in2p3.fr> OK, thanks. So I guess my patch can just be discarded. Can I do it my self on Patchwork ? If so, to what status should it be changed ? Le 21/02/2024 ? 16:33, Romain Naour a ?crit?: > Hello David, > > Le 21/02/2024 ? 13:25, David Picard a ?crit?: >> Or should I add LIBFOO_EXTRA_DOWNLOADS to my application package ? > See an example how to use _EXTRA_DOWNLOADS: > > https://gitlab.com/buildroot.org/buildroot/-/blob/master/package/tesseract-ocr/tesseract-ocr.mk?ref_type=heads#L58 > > Best regards, > Romain > > >> Le 21/02/2024 ? 09:36, David Picard a ?crit?: >>> So, should I submit a package, using the LIBFOO_EXTRA_DOWNLOADS feature ? What >>> value would you recommend for LIBFOO_DL_DIR ? >>> >>> David >>> >>> Le 21/02/2024 ? 07:28, Yann E. MORIN a ?crit?: >>>>>> I did it on purpose. This package is called a library, but it really is a bunch >>>>>> of C files. You only use a subset, depending on your hardware. This code was >>>>>> made to be compiled in the application, not as a conventional library. >>>>>> I could copy the files to STAGING, but cleaning would be more complicated and it >>>>>> would waste some disk space. >>>>> Ok, maybe is should not be packaged in Buildroot then. >>>>> When a package is build by Buildroot, it can generate a binary, a library or >>>>> provide some header files. >>>>> If your application doesn't bundle intel-socfpga-hwlib sources but it requires >>>>> it to build in Buildroot, you can use LIBFOO_EXTRA_DOWNLOADS to add an extra >>>>> download step. >>>> I agree with Romain. It does not make miuch sense IMHO to just drop >>>> source files like that. And the _EXTRA_DOWNLOADS mechanism is exactly >>>> tailored to such cases. >>> >>> _______________________________________________ >>> buildroot mailing list >>> buildroot at buildroot.org >>> https://lists.buildroot.org/mailman/listinfo/buildroot >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:01 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:01 +0100 Subject: [Buildroot] [PATCH v5 00/16] Add support for AM62x-SK HS-FS devices Message-ID: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> The SK-AM62B-P1 is the newest version of SK-AM62 which includes high-security field-securable (HS-FS) silicon to optionally customize keys and encryption for security applications. This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, which, however, was buggy. This series fixes the errors and bumps the Linux kernel and U-Boot required for such a new device. Changes in v5: - Drop patches: - [v4,06/20] boot/ti-k3-core-secdev: new package - [v4,07/20] boot/ti-k3-image-gen: manage HS hardware - Reorder the patches - [08/20] package/python-jsonschema: add host variant - [09/20] package/python-attrs: add host variant - [10/20] package/python-referencing: add host variant - [11/20] package/python-rpds-py: add host variant - [12/20] package/python-jsonschema-specifications: add host variant according to the sequence used by Romain Naour in the series "Add ti_j721e_sk_defconfig" - The other changes are found in the changelog of each individual patch. Dario Binacchi (16): configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version boot/ti-k3-r5-loader: bump to version 2024.01 package/python-attrs: add host variant package/python-rpds-py: add host variant package/python-referencing: add host variant package/python-jsonschema-specifications: add host variant package/python-jsonschema: add host variant boot/ti-k3-r5-loader: set binman environment boot/uboot: set BINMAN_INDIRS for TI K3 DM package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 board/ti/am62x-sk/genimage.cfg | 7 ++- board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++ boot/ti-k3-image-gen/Config.in | 61 ++----------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/ti-k3-r5-loader/Config.in | 5 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 12 +++- boot/uboot/Config.in | 7 +-- boot/uboot/uboot.mk | 2 +- configs/ti_am62x_sk_defconfig | 22 ++++--- configs/ti_am64x_sk_defconfig | 7 ++- package/Config.in | 1 + package/python-attrs/python-attrs.mk | 6 ++ .../python-jsonschema-specifications.mk | 5 ++ .../python-jsonschema/python-jsonschema.mk | 14 +++++ .../python-referencing/python-referencing.mk | 11 ++++ package/python-rpds-py/python-rpds-py.mk | 1 + package/ti-k3/Config.in | 54 ++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 20 files changed, 202 insertions(+), 80 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:02 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:02 +0100 Subject: [Buildroot] [PATCH v5 01/16] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-2-dario.binacchi@amarulasolutions.com> Checking the output of the command `git grep PLATFORM | grep k3`, we can found the proper settings for the optee-os package: .github/workflows/ci.yml: _make PLATFORM=k3-am62x .github/workflows/ci.yml: _make PLATFORM=k3-am62x CFG_ARM64_core=y ... core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5 - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c68..c3ad555a8184 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:03 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:03 +0100 Subject: [Buildroot] [PATCH v5 02/16] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-3-dario.binacchi@amarulasolutions.com> Checking the output of the command `git grep PLATFORM | grep k3`, we can found the proper settings for the optee-os package: .github/workflows/ci.yml: _make PLATFORM=k3-am64x .github/workflows/ci.yml: _make PLATFORM=k3-am64x CFG_ARM64_core=y ... core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5 - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8d3..097175bd8f39 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:04 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:04 +0100 Subject: [Buildroot] [PATCH v5 03/16] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-4-dario.binacchi@amarulasolutions.com> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a8184..a129e216d25b 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:05 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:05 +0100 Subject: [Buildroot] [PATCH v5 04/16] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-5-dario.binacchi@amarulasolutions.com> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f39..26195194c7d6 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:06 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:06 +0100 Subject: [Buildroot] [PATCH v5 05/16] boot/ti-k3-r5-loader: bump to version 2024.01 In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-6-dario.binacchi@amarulasolutions.com> All in-tree configs with the ti-k3-r5 bootloader use a custom version, so this patch is mostly for the menuconfig default version Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5a8..5f86c045c99f 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -16,7 +16,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2022.10" + bool "2024.01" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -60,7 +60,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index c5d1cb8e09f0..fbe5d215409d 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:07 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:07 +0100 Subject: [Buildroot] [PATCH v5 06/16] package/python-attrs: add host variant In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-7-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc4402..fb1729e62fa2 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:08 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:08 +0100 Subject: [Buildroot] [PATCH v5 07/16] package/python-rpds-py: add host variant In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-8-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4fde..cee2ff290a4e 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:09 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:09 +0100 Subject: [Buildroot] [PATCH v5 08/16] package/python-referencing: add host variant In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-9-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-referencing/python-referencing.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e913a..66d59ed8091a 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_REFERENCING_DEPENDENCIES += \ + host-python-attrs \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:10 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:10 +0100 Subject: [Buildroot] [PATCH v5 09/16] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-10-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-jsonschema-specifications.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9d4..b6e309ab2bc9 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,9 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:11 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:11 +0100 Subject: [Buildroot] [PATCH v5 10/16] package/python-jsonschema: add host variant In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-11-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa7752..9e8b6e18b876 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \ + host-python-attrs \ + host-python-jsonschema-specifications \ + host-python-referencing \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:12 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:12 +0100 Subject: [Buildroot] [PATCH v5 11/16] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-12-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. The patch set the BINMAN_INDIRS environment variable to provide the directory to search for binary blobs and select the packages required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - Drop runtime dependecies - Add host-python-pylibfdt dependency without requiring BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration - Add host-python3 and host-python-setuptools dependencies - Add SOB and COB tags of Romain Naour Changes in v4: - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Changes in v2: - Change commit message - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Select packages required by binman if BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled boot/ti-k3-r5-loader/Config.in | 1 + boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f86c045c99f..fc71337e80cc 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema help Separate U-Boot SPL build for R5 core on TI's K3 processors. Usually used to build tiboot3.bin with k3-image-gen. diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f2e..fdb058f3b72a 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python-jsonschema \ + host-python-pyyaml \ + host-python3 \ + host-python-setuptools \ + host-python-pylibfdt TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -58,6 +63,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + BINMAN_INDIRS=$(BINARIES_DIR) \ HOSTLDFLAGS="$(HOST_LDFLAGS)" define TI_K3_R5_LOADER_BUILD_CMDS -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:14 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:14 +0100 Subject: [Buildroot] [PATCH v5 13/16] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-14-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot can use Binman to compile and sign the generated binaries, thus making the use of custom tools like ti-k3-image-gen no longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were configured and used outside of it. This patch allows setting such options even if the package is not enabled. The patch makes an exception to the Buildroot rule "no subdirectory in package directory". Signed-off-by: Dario Binacchi --- Changes in v5: - Add SOB tag - Move the new ti-k3 from boot to package Added in v4 boot/ti-k3-image-gen/Config.in | 61 ++----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/uboot/Config.in | 7 ++- configs/ti_am62x_sk_defconfig | 3 +- configs/ti_am64x_sk_defconfig | 3 +- package/Config.in | 1 + package/ti-k3/Config.in | 54 ++++++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 8 files changed, 75 insertions(+), 65 deletions(-) create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e911..a57319f4be6d 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk index 64be9a18f2c4..aca29bcf1bd4 100644 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ $(BR2_MAKE_HOST_DEPENDENCY) TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930db..c7ebe2652001 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" # We use the SoC selection defined for the ti-k3-image-gen # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a129e216d25b..2835404a57df 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM62X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 26195194c7d6..566cbbe4824f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM64X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/package/Config.in b/package/Config.in index bf0fe078b955..6d3ed34e121b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -629,6 +629,7 @@ endmenu source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" + source "package/ti-k3/Config.in" source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" source "package/ti-sgx-um/Config.in" diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in new file mode 100644 index 000000000000..01d88c8e1643 --- /dev/null +++ b/package/ti-k3/Config.in @@ -0,0 +1,54 @@ +config BR2_PACKAGE_TI_K3 + bool "TI K3" + help + The TI K3 SOC specific selections. + +if BR2_PACKAGE_TI_K3 + +choice + prompt "SoC family" + +config BR2_PACKAGE_TI_K3_SOC_AM62AX + bool "am62ax" + +config BR2_PACKAGE_TI_K3_SOC_AM62X + bool "am62x" + +config BR2_PACKAGE_TI_K3_SOC_AM64X + bool "am64x" + +config BR2_PACKAGE_TI_K3_SOC_AM65X + bool "am65x" + +endchoice + +choice + prompt "Security type" + help + The target SoC security type option. + +config BR2_PACKAGE_TI_K3_SECTYPE_GP + bool "gp" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + bool "hs-fs" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS + bool "hs" + +endchoice + +config BR2_PACKAGE_TI_K3_SOC + string + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X + +config BR2_PACKAGE_TI_K3_SECTYPE + string + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS + +endif diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk new file mode 100644 index 000000000000..a2da29f5148c --- /dev/null +++ b/package/ti-k3/ti-k3.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# ti-k3 +# +################################################################################ + +include $(sort $(wildcard package/ti-k3/*/*.mk)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:13 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:13 +0100 Subject: [Buildroot] [PATCH v5 12/16] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-13-dario.binacchi@amarulasolutions.com> As explained in [1], adding support for AM62x LP SK in U-Boot, requires binman for building bootloader images. The BINMAN_INDIRS environment variable is used to provide a space-separated list of directories to search for binary blobs. In this way, the previous setting becomes unnecessary, so let's remove it. [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ Signed-off-by: Dario Binacchi --- Changes in v5: - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" from UBOOT_MAKE_OPTS. no changes since v1: boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a88059..70982a87719f 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -189,7 +189,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:15 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:15 +0100 Subject: [Buildroot] [PATCH v5 14/16] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-15-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot are capable of building tiboot3.bin using Binman. In this case, let's copy it to the binaries directory. Signed-off-by: Dario Binacchi --- Changes in v5: - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin Added in v4 boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index fdb058f3b72a..e0c4c92bd4cc 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) + define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + find $(@D) -name "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; endef $(eval $(kconfig-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:16 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:16 +0100 Subject: [Buildroot] [PATCH v5 15/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-16-dario.binacchi@amarulasolutions.com> The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v5: - Update commit message. Changes in v4: - bump to 204.01 instead of 2023.10 - Update the commit message - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. Changes in v2: - Update the commit message - Drop Python options required by binman. - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically selects the Python modules required by binman. board/ti/am62x-sk/genimage.cfg | 7 ++++- board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++++++++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++++ configs/ti_am62x_sk_defconfig | 13 +++++---- 4 files changed, 67 insertions(+), 7 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg index 26304fe98f99..398209f4d831 100644 --- a/board/ti/am62x-sk/genimage.cfg +++ b/board/ti/am62x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh new file mode 100755 index 000000000000..0f1f98ef217a --- /dev/null +++ b/board/ti/am62x-sk/post-build.sh @@ -0,0 +1,49 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:r:x:' +O='console:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing argument" +[ -n "${ROOT}" ] || die "Missing argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label am62x-sk-buildroot + kernel /Image + fdtdir / + append ${append} + __HEADER_EOF diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh new file mode 100755 index 000000000000..34f732c091ad --- /dev/null +++ b/board/ti/am62x-sk/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh -x + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 2835404a57df..be01c696b170 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_PACKAGE_TI_K3=y @@ -24,17 +24,18 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" -BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Thu Feb 22 10:16:17 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 22 Feb 2024 11:16:17 +0100 Subject: [Buildroot] [PATCH v5 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240222101617.18422-17-dario.binacchi@amarulasolutions.com> Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v5 - Bump to 6.6.17 from 6.6.1 - Update commit message Changes in v4 - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. no changes since v1 configs/ti_am62x_sk_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index be01c696b170..e0377591a349 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -- 2.43.0 From fancp2007 at gmail.com Thu Feb 22 10:47:04 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Thu, 22 Feb 2024 18:47:04 +0800 Subject: [Buildroot] [PATCH v6] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20231208003746.9505-1-fancp2007@gmail.com> References: <20231208003746.9505-1-fancp2007@gmail.com> Message-ID: <20240222104709.10503-1-fancp2007@gmail.com> Add support for the FriendlyARM NanoPi NEO2 with mainline components: - U-Boot 2024.01 - Linux 6.6.17 Board's wiki page: - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 Signed-off-by: Scott Fan --- Changes v1 -> v2: - Fix issues from 'utils/docker-run make check-package' - Add atf custom version in the defconfig - No need for sudo to run sync Changes v2 -> v3: - Update patch file, add the upstream tag Changes v3 -> v4: - Use a single integrated image file (u-boot-sunxi-with-spl.bin) - Remove patch file for uboot, switch to binman - Merge boot partition into rootfs partition - Bump kernel version to 6.1.61 Changes v4 -> v5: - Bump kernel version to 6.1.65 Changes v5 -> v6: - Bump kernel version to 6.6.17 - Bump uboot version to 2024.01 - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y Signed-off-by: Scott Fan --- board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++++ configs/friendlyarm_nanopi_neo2_defconfig | 49 +++++++++++++++++++++ 5 files changed, 108 insertions(+) create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf new file mode 100644 index 0000000000..482a069f74 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf @@ -0,0 +1,4 @@ +label friendlyarm-nanopi-buildroot + kernel /boot/Image + devicetree /boot/sun50i-h5-nanopi-neo2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg new file mode 100644 index 0000000000..67e4e5efdb --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + } +} diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh new file mode 100755 index 0000000000..c7ec875068 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt new file mode 100644 index 0000000000..c896a57525 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi NEO2. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Wiki link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_neo2_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sync + +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig new file mode 100644 index 0000000000..a60aba06d9 --- /dev/null +++ b/configs/friendlyarm_nanopi_neo2_defconfig @@ -0,0 +1,49 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" -- 2.34.1 From giulio.benetti at benettiengineering.com Thu Feb 22 12:28:57 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 22 Feb 2024 13:28:57 +0100 Subject: [Buildroot] [PATCH v6] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240222104709.10503-1-fancp2007@gmail.com> References: <20240222104709.10503-1-fancp2007@gmail.com> Message-ID: Hi Scott, > Il giorno 22 feb 2024, alle ore 11:47, Scott Fan ha scritto: > > ?Add support for the FriendlyARM NanoPi NEO2 with mainline components: > - U-Boot 2024.01 > - Linux 6.6.17 > > Board's wiki page: > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > Signed-off-by: Scott Fan Reviewed-by: Giulio Benetti [Only build-tested using docker-run] Tested-by: Giulio Benetti see below, > > --- > Changes v1 -> v2: > - Fix issues from 'utils/docker-run make check-package' > - Add atf custom version in the defconfig > - No need for sudo to run sync > > Changes v2 -> v3: > - Update patch file, add the upstream tag > > Changes v3 -> v4: > - Use a single integrated image file (u-boot-sunxi-with-spl.bin) > - Remove patch file for uboot, switch to binman > - Merge boot partition into rootfs partition > - Bump kernel version to 6.1.61 > > Changes v4 -> v5: > - Bump kernel version to 6.1.65 > > Changes v5 -> v6: > - Bump kernel version to 6.6.17 > - Bump uboot version to 2024.01 > - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > Signed-off-by: Scott Fan No need your SoB here since it won?t be part of commit log. Best regards Giulio > --- > board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ > board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ > board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ > board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++++ > configs/friendlyarm_nanopi_neo2_defconfig | 49 +++++++++++++++++++++ > 5 files changed, 108 insertions(+) > create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf > create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg > create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh > create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt > create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig > > diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf > new file mode 100644 > index 0000000000..482a069f74 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf > @@ -0,0 +1,4 @@ > +label friendlyarm-nanopi-buildroot > + kernel /boot/Image > + devicetree /boot/sun50i-h5-nanopi-neo2.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg > new file mode 100644 > index 0000000000..67e4e5efdb > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot-tpl-spl-dtb { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + offset = 1M > + } > +} > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh > new file mode 100755 > index 0000000000..c7ec875068 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt > new file mode 100644 > index 0000000000..c896a57525 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/readme.txt > @@ -0,0 +1,34 @@ > +Intro > +===== > + > +This default configuration will allow you to start experimenting with the > +buildroot environment for the NanoPi NEO2. With the current configuration > +it will bring-up the board, and allow access through the serial console. > + > +Wiki link: > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > + > +This configuration uses U-Boot mainline and kernel mainline. > + > +How to build > +============ > + > + $ make friendlyarm_nanopi_neo2_defconfig > + $ make > + > +Note: you will need access to the internet to download the required > +sources. > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > + $ sync > + > +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console > +is on the serial line, 115200 8N1. > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig > new file mode 100644 > index 0000000000..a60aba06d9 > --- /dev/null > +++ b/configs/friendlyarm_nanopi_neo2_defconfig > @@ -0,0 +1,49 @@ > +BR2_aarch64=y > +BR2_cortex_a53=y > +BR2_ARM_FPU_VFPV4=y > + > +# Linux headers same as kernel, a 6.6 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > + > +# Firmware > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" > -- > 2.34.1 > From fancp2007 at gmail.com Thu Feb 22 13:07:15 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Thu, 22 Feb 2024 21:07:15 +0800 Subject: [Buildroot] [PATCH v6] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20231208003746.9505-1-fancp2007@gmail.com> References: <20231208003746.9505-1-fancp2007@gmail.com> Message-ID: <20240222130716.1311432-1-fancp2007@gmail.com> Add support for the FriendlyARM NanoPi NEO2 with mainline components: - U-Boot 2024.01 - Linux 6.6.17 Board's wiki page: - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 Signed-off-by: Scott Fan --- Changes v1 -> v2: - Fix issues from 'utils/docker-run make check-package' - Add atf custom version in the defconfig - No need for sudo to run sync Changes v2 -> v3: - Update patch file, add the upstream tag Changes v3 -> v4: - Use a single integrated image file (u-boot-sunxi-with-spl.bin) - Remove patch file for uboot, switch to binman - Merge boot partition into rootfs partition - Bump kernel version to 6.1.61 Changes v4 -> v5: - Bump kernel version to 6.1.65 Changes v5 -> v6: - Bump kernel version to 6.6.17 - Bump uboot version to 2024.01 - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y --- board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++++ configs/friendlyarm_nanopi_neo2_defconfig | 49 +++++++++++++++++++++ 5 files changed, 108 insertions(+) create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf new file mode 100644 index 0000000000..482a069f74 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf @@ -0,0 +1,4 @@ +label friendlyarm-nanopi-buildroot + kernel /boot/Image + devicetree /boot/sun50i-h5-nanopi-neo2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg new file mode 100644 index 0000000000..67e4e5efdb --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + } +} diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh new file mode 100755 index 0000000000..c7ec875068 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt new file mode 100644 index 0000000000..c896a57525 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi NEO2. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Wiki link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_neo2_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sync + +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig new file mode 100644 index 0000000000..a60aba06d9 --- /dev/null +++ b/configs/friendlyarm_nanopi_neo2_defconfig @@ -0,0 +1,49 @@ +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" -- 2.34.1 From buildroot at bubu1.eu Thu Feb 22 13:07:23 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 22 Feb 2024 14:07:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: security bump to version 20.11.1 In-Reply-To: <20240221220343.1228278-1-fontaine.fabrice@gmail.com> References: <20240221220343.1228278-1-fontaine.fabrice@gmail.com> Message-ID: <2b8930e5-63af-452a-89f2-a19f28d21c99@bubu1.eu> On 21.02.24 23:03, Fabrice Fontaine wrote: > - Fix CVE-2024-21892, CVE-2024-22019, CVE-2024-21896, CVE-2024-22017, > CVE-2023-46809, CVE-2024-21891, CVE-2024-21890 and CVE-2024-22025 > > - LICENSE hash changed due to two things: > * c-ares vendored dependency license got updated [1]. This is unused > by buildroot though anyway > * base64 vendored library license updated copyright years and sorted > contributor names [2], [3] > > - This bump will fix the following build failure raised since bump of > python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14 > thanks to > https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6 > https://github.com/nodejs/node/commit/6557c1c9b1206a85bb7d8e7450e8c3a4cff7c84b: > > Traceback (most recent call last): > File "/home/autobuild/autobuild/instance-2/output-1/build/host-nodejs-src-20.9.0/configure.py", line 17, in > from distutils.version import StrictVersion > ModuleNotFoundError: No module named 'distutils' > > https://github.com/nodejs/node/blob/v20.11.1/CHANGELOG.md > > [1] https://github.com/c-ares/c-ares/pull/556 > [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd > [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b > > Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 > - http://autobuild.buildroot.org/results/8b38bc4b7879a0349c1305e2fcb458a0cfd04a93 > > Signed-off-by: Fabrice Fontaine Thanks! Reviewed-By: Marcus Hoffmann > --- > package/nodejs/nodejs.hash | 14 +++++++------- > package/nodejs/nodejs.mk | 2 +- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash > index 2d60437a7c..ddab345e0a 100644 > --- a/package/nodejs/nodejs.hash > +++ b/package/nodejs/nodejs.hash > @@ -1,8 +1,8 @@ > -# From https://nodejs.org/dist/v20.9.0/SHASUMS256.txt.asc > -sha256 ced3ecece4b7c3a664bca3d9e34a0e3b9a31078525283a6fdb7ea2de8ca5683b node-v20.9.0-linux-arm64.tar.xz > -sha256 64099d7e62bdbb8efd52c216a6759b3cdd77c38aa993096fdee9f875d95b2d8e node-v20.9.0-linux-armv7l.tar.xz > -sha256 3c6cea5d614cfbb95d92de43fbc2f8ecd66e431502fe5efc4f3c02637897bd45 node-v20.9.0-linux-ppc64le.tar.xz > -sha256 9033989810bf86220ae46b1381bdcdc6c83a0294869ba2ad39e1061f1e69217a node-v20.9.0-linux-x64.tar.xz > -sha256 a23d96810abf0455426b349d47ce5310f33095b7bc0571b9cc510f481c3a4519 node-v20.9.0.tar.xz > +# From https://nodejs.org/dist/v20.11.1/SHASUMS256.txt.asc > +sha256 c957f29eb4e341903520caf362534f0acd1db7be79c502ae8e283994eed07fe1 node-v20.11.1-linux-arm64.tar.xz > +sha256 28e0120d2d150a8f41717899d33167b8b32053778665583d49ff971bfd188d1b node-v20.11.1-linux-armv7l.tar.xz > +sha256 51343cacf5cdf5c4b5e93e919d19dd373d6ef43d5f2c666eae299f26e31d08b5 node-v20.11.1-linux-ppc64le.tar.xz > +sha256 d8dab549b09672b03356aa2257699f3de3b58c96e74eb26a8b495fbdc9cf6fbe node-v20.11.1-linux-x64.tar.xz > +sha256 77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e node-v20.11.1.tar.xz > # Locally calculated > -sha256 93ac846282ce6c5255e00fada2fd2e7e292255239fe58d5502b0a554859e6a3e LICENSE > +sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE > diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk > index 9806a64d38..858c6a86f5 100644 > --- a/package/nodejs/nodejs.mk > +++ b/package/nodejs/nodejs.mk > @@ -5,7 +5,7 @@ > ################################################################################ > > # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything > -NODEJS_COMMON_VERSION = 20.9.0 > +NODEJS_COMMON_VERSION = 20.11.1 > NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz > NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) > From giulio.benetti at benettiengineering.com Thu Feb 22 13:12:31 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 22 Feb 2024 14:12:31 +0100 Subject: [Buildroot] [PATCH v6] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240222130716.1311432-1-fancp2007@gmail.com> References: <20231208003746.9505-1-fancp2007@gmail.com> <20240222130716.1311432-1-fancp2007@gmail.com> Message-ID: <9f844f84-2566-4de6-9e85-7490f3633c11@benettiengineering.com> Hi Scott, no need to resend, and... On 22/02/24 14:07, Scott Fan wrote: > Add support for the FriendlyARM NanoPi NEO2 with mainline components: > - U-Boot 2024.01 > - Linux 6.6.17 > > Board's wiki page: > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > Signed-off-by: Scott Fan ... if you resend please keep my: Reviewed-by: Giulio Benetti [Only build-tested using docker-run] Tested-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > > --- > Changes v1 -> v2: > - Fix issues from 'utils/docker-run make check-package' > - Add atf custom version in the defconfig > - No need for sudo to run sync > > Changes v2 -> v3: > - Update patch file, add the upstream tag > > Changes v3 -> v4: > - Use a single integrated image file (u-boot-sunxi-with-spl.bin) > - Remove patch file for uboot, switch to binman > - Merge boot partition into rootfs partition > - Bump kernel version to 6.1.61 > > Changes v4 -> v5: > - Bump kernel version to 6.1.65 > > Changes v5 -> v6: > - Bump kernel version to 6.6.17 > - Bump uboot version to 2024.01 > - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > --- > board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ > board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ > board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ > board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++++ > configs/friendlyarm_nanopi_neo2_defconfig | 49 +++++++++++++++++++++ > 5 files changed, 108 insertions(+) > create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf > create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg > create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh > create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt > create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig > > diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf > new file mode 100644 > index 0000000000..482a069f74 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf > @@ -0,0 +1,4 @@ > +label friendlyarm-nanopi-buildroot > + kernel /boot/Image > + devicetree /boot/sun50i-h5-nanopi-neo2.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg > new file mode 100644 > index 0000000000..67e4e5efdb > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot-tpl-spl-dtb { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + offset = 1M > + } > +} > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh > new file mode 100755 > index 0000000000..c7ec875068 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt > new file mode 100644 > index 0000000000..c896a57525 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/readme.txt > @@ -0,0 +1,34 @@ > +Intro > +===== > + > +This default configuration will allow you to start experimenting with the > +buildroot environment for the NanoPi NEO2. With the current configuration > +it will bring-up the board, and allow access through the serial console. > + > +Wiki link: > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > + > +This configuration uses U-Boot mainline and kernel mainline. > + > +How to build > +============ > + > + $ make friendlyarm_nanopi_neo2_defconfig > + $ make > + > +Note: you will need access to the internet to download the required > +sources. > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > + $ sync > + > +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console > +is on the serial line, 115200 8N1. > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig > new file mode 100644 > index 0000000000..a60aba06d9 > --- /dev/null > +++ b/configs/friendlyarm_nanopi_neo2_defconfig > @@ -0,0 +1,49 @@ > +BR2_aarch64=y > +BR2_cortex_a53=y > +BR2_ARM_FPU_VFPV4=y > + > +# Linux headers same as kernel, a 6.6 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > + > +# Firmware > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" From buildroot at bubu1.eu Thu Feb 22 13:16:27 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 22 Feb 2024 14:16:27 +0100 Subject: [Buildroot] [PATCH] package/libuv: security bump to version 1.48 Message-ID: <20240222131628.3479059-1-buildroot@bubu1.eu> Fixes: CVE-2024-24806 / GHSA-f74f-cvh7-c6q6 [1] Release Notes: https://github.com/libuv/libuv/releases/tag/v1.48.0 Full Changelog: https://github.com/libuv/libuv/blob/v1.48.0/ChangeLog [1]: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6 Signed-off-by: Marcus Hoffmann --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 1fd286d9e9..2ca8f64a80 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094 libuv-v1.46.0-dist.tar.gz +sha256 c593139feb9061699fdd2f7fde47bb6c1ca77761ae9ec04f052083f1ef46c13b libuv-v1.48.0-dist.tar.gz sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 76316484e4..5f96e98a98 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.46.0 +LIBUV_VERSION = 1.48.0 LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) LIBUV_DEPENDENCIES = host-pkgconf -- 2.34.1 From fancp2007 at gmail.com Thu Feb 22 13:17:23 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Thu, 22 Feb 2024 21:17:23 +0800 Subject: [Buildroot] [PATCH v6] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <9f844f84-2566-4de6-9e85-7490f3633c11@benettiengineering.com> References: <20231208003746.9505-1-fancp2007@gmail.com> <20240222130716.1311432-1-fancp2007@gmail.com> <9f844f84-2566-4de6-9e85-7490f3633c11@benettiengineering.com> Message-ID: Hi Giulio, I removed the unnecessary line, then resend the patch. Thanks for your reminder. Scott Fan On Thu, Feb 22, 2024 at 9:12?PM Giulio Benetti wrote: > > Hi Scott, > > no need to resend, and... > > On 22/02/24 14:07, Scott Fan wrote: > > Add support for the FriendlyARM NanoPi NEO2 with mainline components: > > - U-Boot 2024.01 > > - Linux 6.6.17 > > > > Board's wiki page: > > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > > > Signed-off-by: Scott Fan > > ... if you resend please keep my: > Reviewed-by: Giulio Benetti > [Only build-tested using docker-run] > Tested-by: Giulio Benetti > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > > > > --- > > Changes v1 -> v2: > > - Fix issues from 'utils/docker-run make check-package' > > - Add atf custom version in the defconfig > > - No need for sudo to run sync > > > > Changes v2 -> v3: > > - Update patch file, add the upstream tag > > > > Changes v3 -> v4: > > - Use a single integrated image file (u-boot-sunxi-with-spl.bin) > > - Remove patch file for uboot, switch to binman > > - Merge boot partition into rootfs partition > > - Bump kernel version to 6.1.61 > > > > Changes v4 -> v5: > > - Bump kernel version to 6.1.65 > > > > Changes v5 -> v6: > > - Bump kernel version to 6.6.17 > > - Bump uboot version to 2024.01 > > - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > --- > > board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ > > board/friendlyarm/nanopi-neo2/genimage.cfg | 16 +++++++ > > board/friendlyarm/nanopi-neo2/post-build.sh | 5 +++ > > board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++++ > > configs/friendlyarm_nanopi_neo2_defconfig | 49 +++++++++++++++++++++ > > 5 files changed, 108 insertions(+) > > create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf > > create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg > > create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh > > create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt > > create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig > > > > diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf > > new file mode 100644 > > index 0000000000..482a069f74 > > --- /dev/null > > +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf > > @@ -0,0 +1,4 @@ > > +label friendlyarm-nanopi-buildroot > > + kernel /boot/Image > > + devicetree /boot/sun50i-h5-nanopi-neo2.dtb > > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > > diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg > > new file mode 100644 > > index 0000000000..67e4e5efdb > > --- /dev/null > > +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg > > @@ -0,0 +1,16 @@ > > +image sdcard.img { > > + hdimage { > > + } > > + > > + partition u-boot-tpl-spl-dtb { > > + in-partition-table = "no" > > + image = "u-boot-sunxi-with-spl.bin" > > + offset = 8K > > + } > > + > > + partition rootfs { > > + partition-type = 0x83 > > + image = "rootfs.ext4" > > + offset = 1M > > + } > > +} > > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh > > new file mode 100755 > > index 0000000000..c7ec875068 > > --- /dev/null > > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh > > @@ -0,0 +1,5 @@ > > +#!/bin/sh > > + > > +BOARD_DIR="$(dirname "$0")" > > + > > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt > > new file mode 100644 > > index 0000000000..c896a57525 > > --- /dev/null > > +++ b/board/friendlyarm/nanopi-neo2/readme.txt > > @@ -0,0 +1,34 @@ > > +Intro > > +===== > > + > > +This default configuration will allow you to start experimenting with the > > +buildroot environment for the NanoPi NEO2. With the current configuration > > +it will bring-up the board, and allow access through the serial console. > > + > > +Wiki link: > > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > + > > +This configuration uses U-Boot mainline and kernel mainline. > > + > > +How to build > > +============ > > + > > + $ make friendlyarm_nanopi_neo2_defconfig > > + $ make > > + > > +Note: you will need access to the internet to download the required > > +sources. > > + > > +How to write the SD card > > +======================== > > + > > +Once the build process is finished you will have an image called "sdcard.img" > > +in the output/images/ directory. > > + > > +Copy the bootable "sdcard.img" onto an SD card with "dd": > > + > > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > > + $ sync > > + > > +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console > > +is on the serial line, 115200 8N1. > > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig > > new file mode 100644 > > index 0000000000..a60aba06d9 > > --- /dev/null > > +++ b/configs/friendlyarm_nanopi_neo2_defconfig > > @@ -0,0 +1,49 @@ > > +BR2_aarch64=y > > +BR2_cortex_a53=y > > +BR2_ARM_FPU_VFPV4=y > > + > > +# Linux headers same as kernel, a 6.6 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > > + > > +# Firmware > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > > + > > +# Bootloader > > +BR2_TARGET_UBOOT=y > > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" > > +BR2_TARGET_UBOOT_NEEDS_DTC=y > > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > +BR2_TARGET_UBOOT_SPL=y > > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > > + > > +# Kernel > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" > > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > + > > +# Filesystem > > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" > From buildroot at bubu1.eu Thu Feb 22 13:20:02 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Thu, 22 Feb 2024 14:20:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/{libuv, uvw}: bump version to libuv 1.47.0 and uvw 3.3.0 In-Reply-To: <20240215224614.3028380-1-kadambini.nema@gmail.com> References: <20240215224614.3028380-1-kadambini.nema@gmail.com> Message-ID: <552ccb1d-1be8-4ec0-8ea4-70d2de771cdb@bubu1.eu> Hi Kadambini, On 15.02.24 23:46, Kadambini Nema wrote: > Change Log : https://github.com/libuv/libuv/blob/v1.x/ChangeLog#L92 > https://github.com/skypjack/uvw/releases/tag/v3.3.0_libuv_v1.47 I think one patch per package update is preferred for buildroot. If one update depends on another one, these should be send in one series, but still as separate patches. I've just send another libuv update to 1.48, which contains a security fix. I didn't know what to do with the uvw as I don't know how it works with libuv compatibility, there was no explicit version for libuv 1.48. > > Build test results: > libuv.config > BR2_PACKAGE_LIBUV=y > BR2_PACKAGE_UVW=y > > $./utils/test-pkg -k -c libuv.uvw.config -p uvw -p libuv > bootlin-armv5-uclibc [1/6]: OK > bootlin-armv7-glibc [2/6]: OK > bootlin-armv7m-uclibc [3/6]: SKIPPED > bootlin-x86-64-musl [4/6]: OK > br-arm-full-static [5/6]: SKIPPED > sourcery-arm [6/6]: SKIPPED > 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed > > Signed-off-by: Kadambini Nema > --- > package/libuv/libuv.hash | 2 +- > package/libuv/libuv.mk | 2 +- > package/uvw/uvw.hash | 4 ++-- > package/uvw/uvw.mk | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash > index 1fd286d9e9..3a2904f247 100644 > --- a/package/libuv/libuv.hash > +++ b/package/libuv/libuv.hash > @@ -1,4 +1,4 @@ > # Locally calculated > -sha256 94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094 libuv-v1.46.0-dist.tar.gz > +sha256 72a187104662b47f2a2b204da39d2acb05cf22a4fcb13ceaebe3b0ed0c0e2e43 libuv-v1.47.0-dist.tar.gz > sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE > sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra > diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk > index 76316484e4..a794ac1c8a 100644 > --- a/package/libuv/libuv.mk > +++ b/package/libuv/libuv.mk > @@ -6,7 +6,7 @@ > > # When bumping libuv, check if a new version of uvw is available > # and bump it too. > -LIBUV_VERSION = 1.46.0 > +LIBUV_VERSION = 1.47.0 > LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz > LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) > LIBUV_DEPENDENCIES = host-pkgconf > diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash > index 2dc6e879e1..3f237d00f2 100644 > --- a/package/uvw/uvw.hash > +++ b/package/uvw/uvw.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 bd5aed741765950074b1ea2507291dce81e528abdf56c406991ad4a27d8d1714 uvw-3.2.0_libuv_v1.46.tar.gz > -sha256 e2a4062818ab05e2a0908737ad49b7c01202247364e900167ac81105de8713f3 LICENSE > +sha256 aabb17d3d8f0b3481b44e981c889dd4a2a6a3f1a96a4d01055e669f4b7d37d0e uvw-3.3.0_libuv_v1.47.tar.gz > +sha256 5e439d0ad6e1b16f2f14023872c49cb2cf1b62a172c30b864cb45a5aa6533454 LICENSE > diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk > index 12149d43ca..23e5060c34 100644 > --- a/package/uvw/uvw.mk > +++ b/package/uvw/uvw.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -UVW_VERSION = 3.2.0_libuv_v1.46 > +UVW_VERSION = 3.3.0_libuv_v1.47 > UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) > UVW_INSTALL_STAGING = YES > UVW_INSTALL_TARGET = NO Best, Marcus From vfazio at gmail.com Thu Feb 22 13:55:50 2024 From: vfazio at gmail.com (Vincent Fazio) Date: Thu, 22 Feb 2024 07:55:50 -0600 Subject: [Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch Message-ID: <20240222135550.3428952-1-vfazio@gmail.com> Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was merged and introduced a patch to 10.4.0 that was not accounted for by the patch that dropped 10.4.0 support. Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x") Signed-off-by: Vincent Fazio --- ...ine-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch deleted file mode 100644 index 7e9714e9cb..0000000000 --- a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Thu, 29 Sep 2022 15:32:39 +0100 -Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS - -This was found when testing buildroot with linuxthreads enabled. In -this case, the build passes --disable-tls to the toolchain during -configuration. After building the OpenRISC toolchain it was still -generating TLS code sequences and causing linker failures such as: - - ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl - ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' - -This patch fixes this by disabling tls for the OpenRISC target when requested -via --disable-tls. - -gcc/ChangeLog: - - * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if - HAVE_AS_TLS is defined. - -Tested-by: Yann E. MORIN - -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 - -[Bernd: backported to 10.4.0] -Signed-off-by: Bernd Kuhls ---- - gcc/config/or1k/or1k.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c -index da2f59062ba..0ce7b234417 100644 ---- a/gcc/config/or1k/or1k.c -+++ b/gcc/config/or1k/or1k.c -@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, - #undef TARGET_LEGITIMATE_ADDRESS_P - #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p - -+#ifdef HAVE_AS_TLS - #undef TARGET_HAVE_TLS - #define TARGET_HAVE_TLS true -+#endif - - #undef TARGET_HAVE_SPECULATION_SAFE_VALUE - #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed --- -2.39.3 - -- 2.34.1 From romain.naour at smile.fr Thu Feb 22 14:11:31 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 15:11:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch In-Reply-To: <20240222135550.3428952-1-vfazio@gmail.com> References: <20240222135550.3428952-1-vfazio@gmail.com> Message-ID: <18c5c62e-ac9c-476a-9792-b523c2ee1470@smile.fr> Hello Vincent, Le 22/02/2024 ? 14:55, Vincent Fazio a ?crit?: > Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was > merged and introduced a patch to 10.4.0 that was not accounted for by > the patch that dropped 10.4.0 support. Well, this is unfortunate. The patch removing GCC 10.4.0 was pending in patchwork when the patch was introduced. I can't remove a file that doesn't exist yet :p Reviewed-by: Romain Naour Best regards, Romain > > Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x") > Signed-off-by: Vincent Fazio > --- > ...ine-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 ------------------- > 1 file changed, 49 deletions(-) > delete mode 100644 package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch > > diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch > deleted file mode 100644 > index 7e9714e9cb..0000000000 > --- a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 > -From: Stafford Horne > -Date: Thu, 29 Sep 2022 15:32:39 +0100 > -Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS > - > -This was found when testing buildroot with linuxthreads enabled. In > -this case, the build passes --disable-tls to the toolchain during > -configuration. After building the OpenRISC toolchain it was still > -generating TLS code sequences and causing linker failures such as: > - > - ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl > - ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' > - > -This patch fixes this by disabling tls for the OpenRISC target when requested > -via --disable-tls. > - > -gcc/ChangeLog: > - > - * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if > - HAVE_AS_TLS is defined. > - > -Tested-by: Yann E. MORIN > - > -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 > - > -[Bernd: backported to 10.4.0] > -Signed-off-by: Bernd Kuhls > ---- > - gcc/config/or1k/or1k.c | 2 ++ > - 1 file changed, 2 insertions(+) > - > -diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c > -index da2f59062ba..0ce7b234417 100644 > ---- a/gcc/config/or1k/or1k.c > -+++ b/gcc/config/or1k/or1k.c > -@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, > - #undef TARGET_LEGITIMATE_ADDRESS_P > - #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p > - > -+#ifdef HAVE_AS_TLS > - #undef TARGET_HAVE_TLS > - #define TARGET_HAVE_TLS true > -+#endif > - > - #undef TARGET_HAVE_SPECULATION_SAFE_VALUE > - #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed > --- > -2.39.3 > - From noreplysdesk at busybox.net Thu Feb 22 14:50:20 2024 From: noreplysdesk at busybox.net (Administrator) Date: 22 Feb 2024 06:50:20 -0800 Subject: [Buildroot] Server Administrator | IT Support buildroot@busybox.net Message-ID: <20240222065020.C2D2355E17DB0880@busybox.net> An HTML attachment was scrubbed... URL: From neal.frager at amd.com Thu Feb 22 16:35:21 2024 From: neal.frager at amd.com (Frager, Neal) Date: Thu, 22 Feb 2024 16:35:21 +0000 Subject: [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware In-Reply-To: References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-6-neal.frager@amd.com> Message-ID: Hello everyone, Just a friendly reminder. Any updates? > Now that the toolchain-bare-metal-buildroot has been applied, do you have any > feedback regarding the remainder of the patch set? > One open question I have is regarding the patches for zynqmp-firmware and > versal-firmware. These patches are no longer neeeded since being applied to > release version xilinx_v2023.2. I kept them with the idea that users may > still be using older versions of software, so the patches enable users to > work with versions as old as 2022.2 for zynqmp and 2023.1 for versal. > Do you agree with keeping the patches or do you think it is better not to > include them and to say that support begins starting with version > xilinx_v2023.2? What are your thoughts? > create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch > create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch Best regards, Neal Frager AMD From romain.naour at smile.fr Thu Feb 22 21:25:58 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 22:25:58 +0100 Subject: [Buildroot] [PATCH v5 01/16] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240222101617.18422-2-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-2-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > Checking the output of the command `git grep PLATFORM | grep k3`, we can > found the proper settings for the optee-os package: > > .github/workflows/ci.yml: _make PLATFORM=k3-am62x > .github/workflows/ci.yml: _make PLATFORM=k3-am62x CFG_ARM64_core=y > ... > core/arch/arm/plat-k3/conf.mk:ifneq (,$(filter ${PLATFORM_FLAVOR},am65x j721e j784s4 am64x am62x)) I believe the commit log needs to explain the issue with the current optee PLATFORM setting. Indeed, using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os Makefile [1] # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Best regards, Romain > > Suggested-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Changes in v5 > - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option > > Added in v4 > > configs/ti_am62x_sk_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index f88252a89c68..c3ad555a8184 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > -BR2_TARGET_OPTEE_OS_PLATFORM="k3" > +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y From romain.naour at smile.fr Thu Feb 22 21:36:04 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 22:36:04 +0100 Subject: [Buildroot] [PATCH v5 09/16] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240222101617.18422-10-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-10-dario.binacchi@amarulasolutions.com> Message-ID: <2a97a88a-a173-4fc0-a13a-97dfebcbe87f@smile.fr> Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. This package is required by binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Signed-off-by: Dario Binacchi > > --- > > no changes since v3 > > Changes in v3: > - Drop Config.in.host > > package/python-jsonschema-specifications.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk > index 40879898c9d4..b6e309ab2bc9 100644 > --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk > +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk > @@ -14,4 +14,9 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ > host-python-hatchling \ > host-python-hatch-vcs > > +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ > + host-python-hatchling \ > + host-python-hatch-vcs > + python-jsonschema-specifications depends on host-python-referencing due to a runtime dependency. Notice the "select BR2_PACKAGE_PYTHON_REFERENCING # runtime" in Config.in for the target variant. http://patchwork.ozlabs.org/project/buildroot/patch/20240213172817.2872849-8-romain.naour at smile.fr/ Best regards, Romain > $(eval $(python-package)) > +$(eval $(host-python-package)) From romain.naour at smile.fr Thu Feb 22 22:04:09 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 23:04:09 +0100 Subject: [Buildroot] [PATCH v5 11/16] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240222101617.18422-12-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-12-dario.binacchi@amarulasolutions.com> Message-ID: <8233b0af-d9be-4b36-b190-201e3095d870@smile.fr> Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > The patch set the BINMAN_INDIRS environment variable to provide the > directory to search for binary blobs and select the packages required by > binman. > > Co-developed-by: Michael Trimarchi > Signed-off-by: Michael Trimarchi > Co-developed-by: Romain Naour > Signed-off-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Changes in v5: > - Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS > - Drop runtime dependecies > - Add host-python-pylibfdt dependency without requiring > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration > - Add host-python3 and host-python-setuptools dependencies > - Add SOB and COB tags of Romain Naour > > Changes in v4: > - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > > Changes in v2: > - Change commit message > - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option > - Select packages required by binman if > BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled > > boot/ti-k3-r5-loader/Config.in | 1 + > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 8 +++++++- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in > index 5f86c045c99f..fc71337e80cc 100644 > --- a/boot/ti-k3-r5-loader/Config.in > +++ b/boot/ti-k3-r5-loader/Config.in > @@ -1,6 +1,7 @@ > config BR2_TARGET_TI_K3_R5_LOADER > bool "ti-k3-r5-loader" > depends on BR2_aarch64 > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema > help > Separate U-Boot SPL build for R5 core on TI's K3 processors. > Usually used to build tiboot3.bin with k3-image-gen. > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index 0ffcb8235f2e..fdb058f3b72a 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ > host-pkgconf \ > $(BR2_MAKE_HOST_DEPENDENCY) \ > host-arm-gnu-toolchain \ > - host-openssl > + host-openssl \ > + host-python-jsonschema \ > + host-python-pyyaml \ > + host-python3 \ > + host-python-setuptools \ > + host-python-pylibfdt The dependency of binman is not really easy to follow. First we have the packages list from binman.rst [1] then we have to install additional python modules [2]. I'm not sure if we also need host-lzma and host-lz4 in dependency. Maybe add a comment to retrieve this package list? [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Best regards, Romain > > TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) > TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) > @@ -58,6 +63,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ > CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ > ARCH=arm \ > HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ > + BINMAN_INDIRS=$(BINARIES_DIR) \ > HOSTLDFLAGS="$(HOST_LDFLAGS)" > > define TI_K3_R5_LOADER_BUILD_CMDS From romain.naour at smile.fr Thu Feb 22 22:09:51 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 23:09:51 +0100 Subject: [Buildroot] [PATCH v5 12/16] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: <20240222101617.18422-13-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-13-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > As explained in [1], adding support for AM62x LP SK in U-Boot, requires > binman for building bootloader images. The BINMAN_INDIRS environment > variable is used to provide a space-separated list of directories to > search for binary blobs. > > In this way, the previous setting becomes unnecessary, so let's remove > it. > > [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ > Signed-off-by: Dario Binacchi > > --- > > Changes in v5: > - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" > from UBOOT_MAKE_OPTS. > > no changes since v1: > > boot/uboot/uboot.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dda606a88059..70982a87719f 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -189,7 +189,7 @@ endif > ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > UBOOT_DEPENDENCIES += ti-k3-boot-firmware > -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) Binman tool is not specific to TI K3 platform, see my previous comment [1] [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685949.html Best regards, Romain > endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) From romain.naour at smile.fr Thu Feb 22 22:31:57 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 23:31:57 +0100 Subject: [Buildroot] [PATCH v5 13/16] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240222101617.18422-14-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-14-dario.binacchi@amarulasolutions.com> Message-ID: <0f4a4a71-f197-4e11-9592-0d60f26d29cc@smile.fr> Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > Recent versions of U-Boot can use Binman to compile and sign the generated > binaries, thus making the use of custom tools like ti-k3-image-gen no > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > configured and used outside of it. This patch allows setting such options > even if the package is not enabled. > > The patch makes an exception to the Buildroot rule "no subdirectory in > package directory". > > Signed-off-by: Dario Binacchi > > --- > > Changes in v5: > - Add SOB tag > - Move the new ti-k3 from boot to package > > Added in v4 > > boot/ti-k3-image-gen/Config.in | 61 ++----------------------- > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- > boot/uboot/Config.in | 7 ++- > configs/ti_am62x_sk_defconfig | 3 +- > configs/ti_am64x_sk_defconfig | 3 +- > package/Config.in | 1 + > package/ti-k3/Config.in | 54 ++++++++++++++++++++++ > package/ti-k3/ti-k3.mk | 7 +++ > 8 files changed, 75 insertions(+), 65 deletions(-) > create mode 100644 package/ti-k3/Config.in > create mode 100644 package/ti-k3/ti-k3.mk > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > index d76cef82e911..a57319f4be6d 100644 > --- a/boot/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3-image-gen/Config.in > @@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > if BR2_TARGET_TI_K3_IMAGE_GEN > -choice > - prompt "SoC family" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - bool "am62ax" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - bool "am62x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - bool "am64x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - bool "am65x" > - > -endchoice > - > -choice > - prompt "Security type" > - help > - The target SoC security type option for image gen. Valid > - options are "gp" for General Purpose devices, "hs-fs" for > - High Security - Field Securable devices, or "hs" for High > - Security - Security Enforcing devices. Note for all High > - Security device variants the TI_SECURE_DEV_PKG environmental > - variable must be defined at build time pointing to a valid > - core-secdev-k3 folder location, otherwise the build will > - fail, see > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - bool "gp" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - bool "hs-fs" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > - bool "hs" > - > -endchoice > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > - string > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > string > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > - string > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X > + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X > + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X > > endif > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > index 64be9a18f2c4..aca29bcf1bd4 100644 > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > $(BR2_MAKE_HOST_DEPENDENCY) > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > > TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index beafb38930db..c7ebe2652001 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -244,8 +244,7 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > bool "U-Boot needs TI K3 Device Manager (DM)" > # We use the SoC selection defined for the ti-k3-image-gen > # package > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X > help > Some TI K3 devices need the Device Manager (DM) firmware to > be available for the U-Boot build. > @@ -254,8 +253,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > > config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > string > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X TI_K3_DM_SOCNAME should also move to ti-k3 package. > > endif > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index a129e216d25b..2835404a57df 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > +BR2_PACKAGE_TI_K3=y > +BR2_PACKAGE_TI_K3_SOC_AM62X=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="256M" > @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 26195194c7d6..566cbbe4824f 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > +BR2_PACKAGE_TI_K3=y > +BR2_PACKAGE_TI_K3_SOC_AM64X=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > diff --git a/package/Config.in b/package/Config.in > index bf0fe078b955..6d3ed34e121b 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -629,6 +629,7 @@ endmenu > source "package/sysstat/Config.in" > source "package/targetcli-fb/Config.in" > source "package/ti-gfx/Config.in" > + source "package/ti-k3/Config.in" > source "package/ti-sgx-demos/Config.in" > source "package/ti-sgx-km/Config.in" > source "package/ti-sgx-um/Config.in" > diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in > new file mode 100644 > index 000000000000..01d88c8e1643 > --- /dev/null > +++ b/package/ti-k3/Config.in > @@ -0,0 +1,54 @@ > +config BR2_PACKAGE_TI_K3 > + bool "TI K3" > + help > + The TI K3 SOC specific selections. > + > +if BR2_PACKAGE_TI_K3 > + > +choice > + prompt "SoC family" > + > +config BR2_PACKAGE_TI_K3_SOC_AM62AX > + bool "am62ax" > + > +config BR2_PACKAGE_TI_K3_SOC_AM62X > + bool "am62x" > + > +config BR2_PACKAGE_TI_K3_SOC_AM64X > + bool "am64x" > + > +config BR2_PACKAGE_TI_K3_SOC_AM65X > + bool "am65x" > + > +endchoice > + > +choice > + prompt "Security type" > + help > + The target SoC security type option. > + > +config BR2_PACKAGE_TI_K3_SECTYPE_GP > + bool "gp" > + > +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS > + bool "hs-fs" Not related to your serie but it seems that some TI K3 SoC variant doesn't provide all SECTYPE. For example: AM65 can by only GP or HS, there is no HS-FS (yet?) This can be checked in meta-ti: meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" So BR2_PACKAGE_TI_K3_SECTYPE_HS_FS must not be selected if BR2_PACKAGE_TI_K3_SOC_AM65X is used. > + > +config BR2_PACKAGE_TI_K3_SECTYPE_HS > + bool "hs" > + > +endchoice > + > +config BR2_PACKAGE_TI_K3_SOC > + string > + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X > + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X > + default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X > + > +config BR2_PACKAGE_TI_K3_SECTYPE > + string > + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP > + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS > + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS move BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME here (BR2_PACKAGE_TI_K3_DM). Best regards, Romain > + > +endif > diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk > new file mode 100644 > index 000000000000..a2da29f5148c > --- /dev/null > +++ b/package/ti-k3/ti-k3.mk > @@ -0,0 +1,7 @@ > +################################################################################ > +# > +# ti-k3 > +# > +################################################################################ > + > +include $(sort $(wildcard package/ti-k3/*/*.mk)) From romain.naour at smile.fr Thu Feb 22 22:35:03 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 23:35:03 +0100 Subject: [Buildroot] [PATCH v5 12/16] boot/uboot: set BINMAN_INDIRS for TI K3 DM In-Reply-To: References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-13-dario.binacchi@amarulasolutions.com> Message-ID: Le 22/02/2024 ? 23:09, Romain Naour a ?crit?: > Hello Dario, > > Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: >> As explained in [1], adding support for AM62x LP SK in U-Boot, requires >> binman for building bootloader images. The BINMAN_INDIRS environment >> variable is used to provide a space-separated list of directories to >> search for binary blobs. >> >> In this way, the previous setting becomes unnecessary, so let's remove >> it. >> >> [1] https://patchwork.ozlabs.org/project/uboot/patch/20231030110138.1347603-3-n-yadav at ti.com/ >> Signed-off-by: Dario Binacchi >> >> --- >> >> Changes in v5: >> - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" >> from UBOOT_MAKE_OPTS. >> >> no changes since v1: >> >> boot/uboot/uboot.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk >> index dda606a88059..70982a87719f 100644 >> --- a/boot/uboot/uboot.mk >> +++ b/boot/uboot/uboot.mk >> @@ -189,7 +189,7 @@ endif >> ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) >> UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_TI_K3_DM_SOCNAME is not used anymore With the ti-k3 package introduced in the followup patch, it can be simplifed to (along the separate binman uboot option) ifeq ($(BR2_PACKAGE_TI_K3),y) UBOOT_DEPENDENCIES += ti-k3-boot-firmware endif >> UBOOT_DEPENDENCIES += ti-k3-boot-firmware >> -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f >> +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) > > Binman tool is not specific to TI K3 platform, see my previous comment [1] > > [1] http://lists.busybox.net/pipermail/buildroot/2024-February/685949.html > > Best regards, > Romain > > >> endif >> >> ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > From adam.duskett at amarulasolutions.com Thu Feb 22 22:43:15 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Thu, 22 Feb 2024 15:43:15 -0700 Subject: [Buildroot] [PATCH 0/2] Fix flutter build failure In-Reply-To: References: <20240219095155.2758428-1-anaumann@ultratronik.de> Message-ID: Hello; Sorry for the late reply, I have been quite sick the last week and didn't want to do anything but lay in the bed and sleep! :) On Tue, Feb 20, 2024 at 6:20?AM Marcus Hoffmann wrote: > > Hi Andreas, Yann, all > > On 19.02.24 22:23, Yann E. MORIN wrote: > > Andreas, All, > > > > On 2024-02-19 10:51 +0100, Andreas Naumann spake thusly: > >> Hello Adam, all, > >> I was motivated to give flutter a spin after your talk at FOSDEM, Wonderful! > >> however the recent bump to Python 3.12.1 broke some script during > >> the flutter-engine configure step. That's quite unfortunate! > >> Fortunately, now a new major stable version has been released 3.19.0, > >> which contains a patch for this. > >> > >> After bumping engine and sdk they successfully build again, as does > >> creating the flutter bundles which you provided in > >> https://github.com/aduskett/buildroot-fosdem2024-flutter-demos > >> > >> I have not yet been able to run them using ivi-homescreen, but that's > >> probably due to my target display/wayland setup. > >> The x86_64 defconfig has a wayland demo. You can run `start_sway` to run sway, hit `windows + enter` to open a terminal. > >> However, the flutter-gallery no longer builds with 3.19, even after > >> bumping to the main HEAD. Their github README says > >> "NOTE: The Flutter Gallery is now deprecated, and no longer being active > >> maintained." Yes, I think I would like to switch to the flutter-packages repository found here: https://github.com/flutter/packages I have several of them ported already found here: https://github.com/aduskett/buildroot-fosdem2024-flutter-demos/tree/2023.11.1/fosdem/package/flutter-packages Although I am not sure if the maintainers would want such a package... especially how it is laid out in the above directory. > >> I thought about including a patch for removal of the gallery package, > >> but that would leave us with no example for how to create a flutter > >> bundle. > > Yeah, see above. > > The upstream repository has also been "archived", which means it is > > frozen and will never get fixed, ever. > > > > That's a bit unfortunate indeed, but we don't have much choice going > > forward: we'll have to drop that package in the near future, but not > > now: we're still considering reverting the python 3.12 version bump for > > 2024.02, as it still causes issues in the target==build case, which > > means we'd be able to keep the current flutter stack for 2024.02 LTS. > > > > Then, we can reintroduce python3, the flutter-engine bumps in this > > series, and drop flutter-gfallery, hopefully introducing another package > > as an example on how to build flutter packages... > > The archived repo page links to > https://github.com/gskinnerTeam/flutter-wonderous-app and > https://github.com/flutter/samples/tree/main/material_3_demo as > replacement showcases. > > I wonder how long these will last... :-/. > > Marcus From romain.naour at smile.fr Thu Feb 22 22:49:12 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 22 Feb 2024 23:49:12 +0100 Subject: [Buildroot] [PATCH v5 14/16] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240222101617.18422-15-dario.binacchi@amarulasolutions.com> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-15-dario.binacchi@amarulasolutions.com> Message-ID: <62b63f26-4e2e-4538-a422-bc7f7e131fb9@smile.fr> Hello Dario, Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit?: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. In this case, let's copy it to the binaries directory. > > Signed-off-by: Dario Binacchi > > --- > > Changes in v5: > - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with > tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > > Added in v4 > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index fdb058f3b72a..e0c4c92bd4cc 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > endef > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > + > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + find $(@D) -name "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; I don't think "find" is needed here since we should copy only one file to $(BINARIES_DIR)/tiboot3.bin > endef > > $(eval $(kconfig-package)) From dario.binacchi at amarulasolutions.com Fri Feb 23 11:12:53 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Fri, 23 Feb 2024 12:12:53 +0100 Subject: [Buildroot] [PATCH v5 14/16] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <62b63f26-4e2e-4538-a422-bc7f7e131fb9@smile.fr> References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-15-dario.binacchi@amarulasolutions.com> <62b63f26-4e2e-4538-a422-bc7f7e131fb9@smile.fr> Message-ID: Hi Romain, On Thu, Feb 22, 2024 at 11:49?PM Romain Naour wrote: > > Hello Dario, > > Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit : > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v5: > > - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with > > tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > > > > Added in v4 > > > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index fdb058f3b72a..e0c4c92bd4cc 100644 > > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + find $(@D) -name "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > > I don't think "find" is needed here since we should copy only one file to > $(BINARIES_DIR)/tiboot3.bin Can it be ok? - find $(@D) -name "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin I tested it and It works. Thanks and Regards, Dario > > > > > endef > > > > $(eval $(kconfig-package)) > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From fancp2007 at gmail.com Fri Feb 23 13:15:52 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Fri, 23 Feb 2024 21:15:52 +0800 Subject: [Buildroot] [PATCH v7] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240222130716.1311432-1-fancp2007@gmail.com> References: <20240222130716.1311432-1-fancp2007@gmail.com> Message-ID: <20240223131603.2313178-1-fancp2007@gmail.com> Add support for the FriendlyARM NanoPi NEO2 with mainline components: - U-Boot 2024.01 - Linux 6.6.18 Board's wiki page: - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 Signed-off-by: Scott Fan --- Changes v1 -> v2: - Fix issues from 'utils/docker-run make check-package' - Add atf custom version in the defconfig - No need for sudo to run sync Changes v2 -> v3: - Update patch file, add the upstream tag Changes v3 -> v4: - Use a single integrated image file (u-boot-sunxi-with-spl.bin) - Remove patch file for uboot, switch to binman - Merge boot partition into rootfs partition - Bump kernel version to 6.1.61 Changes v4 -> v5: - Bump kernel version to 6.1.65 Changes v5 -> v6: - Bump kernel version to 6.6.17 - Bump uboot version to 2024.01 - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y Changes v6 -> v7: - Bump kernel version to 6.6.18 - Add option BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - Resort sections in the defconfig --- board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ board/friendlyarm/nanopi-neo2/genimage.cfg | 16 ++++++ board/friendlyarm/nanopi-neo2/post-build.sh | 5 ++ board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++ configs/friendlyarm_nanopi_neo2_defconfig | 57 +++++++++++++++++++++ 5 files changed, 116 insertions(+) create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf new file mode 100644 index 0000000000..482a069f74 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf @@ -0,0 +1,4 @@ +label friendlyarm-nanopi-buildroot + kernel /boot/Image + devicetree /boot/sun50i-h5-nanopi-neo2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg new file mode 100644 index 0000000000..67e4e5efdb --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + } +} diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh new file mode 100755 index 0000000000..c7ec875068 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt new file mode 100644 index 0000000000..c896a57525 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi NEO2. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Wiki link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_neo2_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sync + +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig new file mode 100644 index 0000000000..3118d45625 --- /dev/null +++ b/configs/friendlyarm_nanopi_neo2_defconfig @@ -0,0 +1,57 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# System +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.34.1 From romain.naour at smile.fr Fri Feb 23 13:18:56 2024 From: romain.naour at smile.fr (Romain Naour) Date: Fri, 23 Feb 2024 14:18:56 +0100 Subject: [Buildroot] [PATCH v5 14/16] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: References: <20240222101617.18422-1-dario.binacchi@amarulasolutions.com> <20240222101617.18422-15-dario.binacchi@amarulasolutions.com> <62b63f26-4e2e-4538-a422-bc7f7e131fb9@smile.fr> Message-ID: <6fbbc25d-8502-453e-9b57-1145244e29d9@smile.fr> Hi Dario, Le 23/02/2024 ? 12:12, Dario Binacchi a ?crit?: > Hi Romain, > > On Thu, Feb 22, 2024 at 11:49?PM Romain Naour wrote: >> >> Hello Dario, >> >> Le 22/02/2024 ? 11:16, Dario Binacchi a ?crit : >>> Recent versions of U-Boot are capable of building tiboot3.bin using >>> Binman. In this case, let's copy it to the binaries directory. >>> >>> Signed-off-by: Dario Binacchi >>> >>> --- >>> >>> Changes in v5: >>> - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with >>> tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin >>> >>> Added in v4 >>> >>> boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ >>> 1 file changed, 4 insertions(+) >>> >>> diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> index fdb058f3b72a..e0c4c92bd4cc 100644 >>> --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk >>> @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS >>> $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) >>> endef >>> >>> +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) >>> +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) >>> + >>> define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS >>> cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin >>> + find $(@D) -name "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; >> >> I don't think "find" is needed here since we should copy only one file to >> $(BINARIES_DIR)/tiboot3.bin > > Can it be ok? > > - find $(@D) -name > "tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin" > -type f -exec cp {} $(BINARIES_DIR)/tiboot3.bin \; > + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > $(BINARIES_DIR)/tiboot3.bin > > I tested it and It works. Looks good, thanks! Best regards, Romain > > Thanks and Regards, > Dario > >> >> >> >>> endef >>> >>> $(eval $(kconfig-package)) >> > > From giulio.benetti at benettiengineering.com Fri Feb 23 16:24:06 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Fri, 23 Feb 2024 17:24:06 +0100 Subject: [Buildroot] [PATCH v7] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240223131603.2313178-1-fancp2007@gmail.com> References: <20240222130716.1311432-1-fancp2007@gmail.com> <20240223131603.2313178-1-fancp2007@gmail.com> Message-ID: <197750aa-c25f-44d9-89ac-872053953422@benettiengineering.com> Hi Scott, On 23/02/24 14:15, Scott Fan wrote: [ SNIP ] > + > +# System > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y What do you need MDEV by default for? Is there some peripheral that needs to show up automatically otherwise the basic functionality is compromised? Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From flavio.tapajos at newtesc.com.br Fri Feb 23 16:57:47 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Fri, 23 Feb 2024 13:57:47 -0300 Subject: [Buildroot] [PATCH 1/1] configs/asus_tinker-s_rk3288_defconfig: bump kernel to 6.1.79 Message-ID: <20240223165747.1231616-1-flavio.tapajos@newtesc.com.br> latest kernel LTS (6.6.x) is facing problems with the sdcard Signed-off-by: Fl?vio Tapaj?s --- configs/asus_tinker-s_rk3288_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/asus_tinker-s_rk3288_defconfig b/configs/asus_tinker-s_rk3288_defconfig index de03336cbb..2ed2c4f712 100644 --- a/configs/asus_tinker-s_rk3288_defconfig +++ b/configs/asus_tinker-s_rk3288_defconfig @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.72" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.79" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker-s" -- 2.43.2 From flavio.tapajos at newtesc.com.br Fri Feb 23 17:05:58 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Fri, 23 Feb 2024 14:05:58 -0300 Subject: [Buildroot] [PATCH 1/2] package/python-sqlalchemy: bump version to 2.0.27 Message-ID: <20240223170559.1252564-1-flavio.tapajos@newtesc.com.br> Signed-off-by: Fl?vio Tapaj?s --- package/python-sqlalchemy/python-sqlalchemy.hash | 4 ++-- package/python-sqlalchemy/python-sqlalchemy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index 7951a32978..ff83f160a4 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.hash +++ b/package/python-sqlalchemy/python-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlalchemy/json -md5 7abfc2972d7e16315c8b7492ea0e0fdb SQLAlchemy-2.0.25.tar.gz -sha256 a2c69a7664fb2d54b8682dd774c3b54f67f84fa123cf84dda2a5f40dcaa04e08 SQLAlchemy-2.0.25.tar.gz +md5 0e7a957cdd0bb80de501e763270bcdc8 SQLAlchemy-2.0.27.tar.gz +sha256 86a6ed69a71fe6b88bf9331594fa390a2adda4a49b5c06f98e47bf0d392534f8 SQLAlchemy-2.0.27.tar.gz # Locally computed sha256 checksums sha256 3c0f59ab887d041de6a4e52ffe3e9edb5d9522de909fae9a6cd7adb6e7be3293 LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 400ad92f63..177e7f8a38 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 2.0.25 +PYTHON_SQLALCHEMY_VERSION = 2.0.27 PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/7b/bb/85bd8e211f54983e927c7cd9b2ad66773fbef507957156fc72e481a62681 +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/b9/fc/327f0072d1f5231d61c715ad52cb7819ec60f0ac80dc1e507bc338919caa PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE -- 2.43.2 From flavio.tapajos at newtesc.com.br Fri Feb 23 17:05:59 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Fri, 23 Feb 2024 14:05:59 -0300 Subject: [Buildroot] [PATCH 2/2] package/python-sqlalchemy: add cython for python-sqlalchemy In-Reply-To: <20240223170559.1252564-1-flavio.tapajos@newtesc.com.br> References: <20240223170559.1252564-1-flavio.tapajos@newtesc.com.br> Message-ID: <20240223170559.1252564-2-flavio.tapajos@newtesc.com.br> From: James Hilliard When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for python-sqlalchemy. Signed-off-by: James Hilliard Tested-By: Fl?vio Tapaj?s --- package/python-sqlalchemy/python-sqlalchemy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 177e7f8a38..1fcda338d3 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -12,5 +12,6 @@ PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE PYTHON_SQLALCHEMY_CPE_ID_VENDOR = sqlalchemy PYTHON_SQLALCHEMY_CPE_ID_PRODUCT = sqlalchemy +PYTHON_SQLALCHEMY_DEPENDENCIES = host-python-cython $(eval $(python-package)) -- 2.43.2 From james.hilliard1 at gmail.com Fri Feb 23 17:10:22 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 10:10:22 -0700 Subject: [Buildroot] [PATCH 1/2] package/python-grpclib: new package Message-ID: <20240223171023.2907242-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-grpclib/Config.in | 6 ++++++ package/python-grpclib/python-grpclib.hash | 5 +++++ package/python-grpclib/python-grpclib.mk | 14 ++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-grpclib/Config.in create mode 100644 package/python-grpclib/python-grpclib.hash create mode 100644 package/python-grpclib/python-grpclib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..2ddaadae69 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1114,6 +1114,7 @@ menu "External python modules" source "package/python-grpc-requests/Config.in" source "package/python-grpcio/Config.in" source "package/python-grpcio-reflection/Config.in" + source "package/python-grpclib/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h11/Config.in" source "package/python-h2/Config.in" diff --git a/package/python-grpclib/Config.in b/package/python-grpclib/Config.in new file mode 100644 index 0000000000..2c4a5e20be --- /dev/null +++ b/package/python-grpclib/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_GRPCLIB + bool "python-grpclib" + help + Pure-Python gRPC implementation for asyncio. + + https://github.com/vmagamedov/grpclib diff --git a/package/python-grpclib/python-grpclib.hash b/package/python-grpclib/python-grpclib.hash new file mode 100644 index 0000000000..cc65209138 --- /dev/null +++ b/package/python-grpclib/python-grpclib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/grpclib/json +md5 60ce203e5b9f95de3d7e5721dbce2bd9 grpclib-0.4.7.tar.gz +sha256 2988ef57c02b22b7a2e8e961792c41ccf97efc2ace91ae7a5b0de03c363823c3 grpclib-0.4.7.tar.gz +# Locally computed sha256 checksums +sha256 6c7fa8cf9b94ad5043a6b550a0ffb98356e66100b69dd1cb8e1f82606b436e8e LICENSE.txt diff --git a/package/python-grpclib/python-grpclib.mk b/package/python-grpclib/python-grpclib.mk new file mode 100644 index 0000000000..0bec0a1879 --- /dev/null +++ b/package/python-grpclib/python-grpclib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-grpclib +# +################################################################################ + +PYTHON_GRPCLIB_VERSION = 0.4.7 +PYTHON_GRPCLIB_SOURCE = grpclib-$(PYTHON_GRPCLIB_VERSION).tar.gz +PYTHON_GRPCLIB_SITE = https://files.pythonhosted.org/packages/79/b9/55936e462a5925190d7427e880b3033601d1effd13809b483d13a926061a +PYTHON_GRPCLIB_SETUP_TYPE = setuptools +PYTHON_GRPCLIB_LICENSE = BSD-3-Clause +PYTHON_GRPCLIB_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 23 17:10:23 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 10:10:23 -0700 Subject: [Buildroot] [PATCH 2/2] package/python-betterproto: new package In-Reply-To: <20240223171023.2907242-1-james.hilliard1@gmail.com> References: <20240223171023.2907242-1-james.hilliard1@gmail.com> Message-ID: <20240223171023.2907242-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-betterproto/Config.in | 7 +++++++ package/python-betterproto/python-betterproto.hash | 5 +++++ package/python-betterproto/python-betterproto.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-betterproto/Config.in create mode 100644 package/python-betterproto/python-betterproto.hash create mode 100644 package/python-betterproto/python-betterproto.mk diff --git a/package/Config.in b/package/Config.in index 2ddaadae69..f49c3543b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1006,6 +1006,7 @@ menu "External python modules" source "package/python-backcall/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" + source "package/python-betterproto/Config.in" source "package/python-bidict/Config.in" source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" diff --git a/package/python-betterproto/Config.in b/package/python-betterproto/Config.in new file mode 100644 index 0000000000..9ed72dd39b --- /dev/null +++ b/package/python-betterproto/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_BETTERPROTO + bool "python-betterproto" + select BR2_PACKAGE_PYTHON_GRPCLIB # runtime + help + A better Protobuf / gRPC generator & library. + + http://github.com/danielgtaylor/python-betterproto diff --git a/package/python-betterproto/python-betterproto.hash b/package/python-betterproto/python-betterproto.hash new file mode 100644 index 0000000000..8d23d2ae56 --- /dev/null +++ b/package/python-betterproto/python-betterproto.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/betterproto/json +md5 bd4192c2997959100097479c34ff87e6 betterproto-2.0.0b6.tar.gz +sha256 720ae92697000f6fcf049c69267d957f0871654c8b0d7458906607685daee784 betterproto-2.0.0b6.tar.gz +# Locally computed sha256 checksums +sha256 a5b8df75467e4b57a308a94cce5fdae84808a83ee6cd5af7e175c6b9784a753f LICENSE.md diff --git a/package/python-betterproto/python-betterproto.mk b/package/python-betterproto/python-betterproto.mk new file mode 100644 index 0000000000..95caf0945a --- /dev/null +++ b/package/python-betterproto/python-betterproto.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-betterproto +# +################################################################################ + +PYTHON_BETTERPROTO_VERSION = 2.0.0b6 +PYTHON_BETTERPROTO_SOURCE = betterproto-$(PYTHON_BETTERPROTO_VERSION).tar.gz +PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/45/43/4c44efd75f2ef48a16b458c2fe2cff7aa74bab8fcadf2653bb5110a87f97 +PYTHON_BETTERPROTO_SETUP_TYPE = setuptools +PYTHON_BETTERPROTO_LICENSE = MIT +PYTHON_BETTERPROTO_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) -- 2.34.1 From fontaine.fabrice at gmail.com Fri Feb 23 17:28:50 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Fri, 23 Feb 2024 18:28:50 +0100 Subject: [Buildroot] [PATCH 1/1] package/c-ares: security bump to version 1.27.0 Message-ID: <20240223172850.559363-1-fontaine.fabrice@gmail.com> Fix CVE-2024-25629: Reading malformatted /etc/resolv.conf, /etc/nsswitch.conf or the HOSTALIASES file could result in a crash. https://github.com/c-ares/c-ares/security/advisories/GHSA-mg26-v6qh-x48q https://github.com/c-ares/c-ares/releases/tag/cares-1_27_0 Signed-off-by: Fabrice Fontaine --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index ee097a53c9..9a2b69c731 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz +sha256 0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b c-ares-1.27.0.tar.gz # Hash for license file sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 29da6baa4b..c4441255a2 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.26.0 +C_ARES_VERSION = 1.27.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom -- 2.43.0 From james.hilliard1 at gmail.com Fri Feb 23 17:35:18 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 10:35:18 -0700 Subject: [Buildroot] [PATCH v2 1/2] package/python-grpclib: new package Message-ID: <20240223173519.2958847-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - add missing h2/multidict runtime dependencies --- package/Config.in | 1 + package/python-grpclib/Config.in | 8 ++++++++ package/python-grpclib/python-grpclib.hash | 5 +++++ package/python-grpclib/python-grpclib.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-grpclib/Config.in create mode 100644 package/python-grpclib/python-grpclib.hash create mode 100644 package/python-grpclib/python-grpclib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..2ddaadae69 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1114,6 +1114,7 @@ menu "External python modules" source "package/python-grpc-requests/Config.in" source "package/python-grpcio/Config.in" source "package/python-grpcio-reflection/Config.in" + source "package/python-grpclib/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h11/Config.in" source "package/python-h2/Config.in" diff --git a/package/python-grpclib/Config.in b/package/python-grpclib/Config.in new file mode 100644 index 0000000000..42cc011097 --- /dev/null +++ b/package/python-grpclib/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_GRPCLIB + bool "python-grpclib" + select BR2_PACKAGE_PYTHON_H2 # runtime + select BR2_PACKAGE_PYTHON_MULTIDICT # runtime + help + Pure-Python gRPC implementation for asyncio. + + https://github.com/vmagamedov/grpclib diff --git a/package/python-grpclib/python-grpclib.hash b/package/python-grpclib/python-grpclib.hash new file mode 100644 index 0000000000..cc65209138 --- /dev/null +++ b/package/python-grpclib/python-grpclib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/grpclib/json +md5 60ce203e5b9f95de3d7e5721dbce2bd9 grpclib-0.4.7.tar.gz +sha256 2988ef57c02b22b7a2e8e961792c41ccf97efc2ace91ae7a5b0de03c363823c3 grpclib-0.4.7.tar.gz +# Locally computed sha256 checksums +sha256 6c7fa8cf9b94ad5043a6b550a0ffb98356e66100b69dd1cb8e1f82606b436e8e LICENSE.txt diff --git a/package/python-grpclib/python-grpclib.mk b/package/python-grpclib/python-grpclib.mk new file mode 100644 index 0000000000..0bec0a1879 --- /dev/null +++ b/package/python-grpclib/python-grpclib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-grpclib +# +################################################################################ + +PYTHON_GRPCLIB_VERSION = 0.4.7 +PYTHON_GRPCLIB_SOURCE = grpclib-$(PYTHON_GRPCLIB_VERSION).tar.gz +PYTHON_GRPCLIB_SITE = https://files.pythonhosted.org/packages/79/b9/55936e462a5925190d7427e880b3033601d1effd13809b483d13a926061a +PYTHON_GRPCLIB_SETUP_TYPE = setuptools +PYTHON_GRPCLIB_LICENSE = BSD-3-Clause +PYTHON_GRPCLIB_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 23 17:35:19 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 10:35:19 -0700 Subject: [Buildroot] [PATCH v2 2/2] package/python-betterproto: new package In-Reply-To: <20240223173519.2958847-1-james.hilliard1@gmail.com> References: <20240223173519.2958847-1-james.hilliard1@gmail.com> Message-ID: <20240223173519.2958847-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- package/Config.in | 1 + package/python-betterproto/Config.in | 7 +++++++ package/python-betterproto/python-betterproto.hash | 5 +++++ package/python-betterproto/python-betterproto.mk | 14 ++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 package/python-betterproto/Config.in create mode 100644 package/python-betterproto/python-betterproto.hash create mode 100644 package/python-betterproto/python-betterproto.mk diff --git a/package/Config.in b/package/Config.in index 2ddaadae69..f49c3543b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1006,6 +1006,7 @@ menu "External python modules" source "package/python-backcall/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" + source "package/python-betterproto/Config.in" source "package/python-bidict/Config.in" source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" diff --git a/package/python-betterproto/Config.in b/package/python-betterproto/Config.in new file mode 100644 index 0000000000..9ed72dd39b --- /dev/null +++ b/package/python-betterproto/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_BETTERPROTO + bool "python-betterproto" + select BR2_PACKAGE_PYTHON_GRPCLIB # runtime + help + A better Protobuf / gRPC generator & library. + + http://github.com/danielgtaylor/python-betterproto diff --git a/package/python-betterproto/python-betterproto.hash b/package/python-betterproto/python-betterproto.hash new file mode 100644 index 0000000000..8d23d2ae56 --- /dev/null +++ b/package/python-betterproto/python-betterproto.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/betterproto/json +md5 bd4192c2997959100097479c34ff87e6 betterproto-2.0.0b6.tar.gz +sha256 720ae92697000f6fcf049c69267d957f0871654c8b0d7458906607685daee784 betterproto-2.0.0b6.tar.gz +# Locally computed sha256 checksums +sha256 a5b8df75467e4b57a308a94cce5fdae84808a83ee6cd5af7e175c6b9784a753f LICENSE.md diff --git a/package/python-betterproto/python-betterproto.mk b/package/python-betterproto/python-betterproto.mk new file mode 100644 index 0000000000..95caf0945a --- /dev/null +++ b/package/python-betterproto/python-betterproto.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-betterproto +# +################################################################################ + +PYTHON_BETTERPROTO_VERSION = 2.0.0b6 +PYTHON_BETTERPROTO_SOURCE = betterproto-$(PYTHON_BETTERPROTO_VERSION).tar.gz +PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/45/43/4c44efd75f2ef48a16b458c2fe2cff7aa74bab8fcadf2653bb5110a87f97 +PYTHON_BETTERPROTO_SETUP_TYPE = setuptools +PYTHON_BETTERPROTO_LICENSE = MIT +PYTHON_BETTERPROTO_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 23 18:05:32 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 11:05:32 -0700 Subject: [Buildroot] [PATCH v3 1/2] package/python-grpclib: new package Message-ID: <20240223180533.3011424-1-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v1 -> v2: - add missing h2/multidict runtime dependencies --- package/Config.in | 1 + package/python-grpclib/Config.in | 8 ++++++++ package/python-grpclib/python-grpclib.hash | 5 +++++ package/python-grpclib/python-grpclib.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-grpclib/Config.in create mode 100644 package/python-grpclib/python-grpclib.hash create mode 100644 package/python-grpclib/python-grpclib.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..2ddaadae69 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1114,6 +1114,7 @@ menu "External python modules" source "package/python-grpc-requests/Config.in" source "package/python-grpcio/Config.in" source "package/python-grpcio-reflection/Config.in" + source "package/python-grpclib/Config.in" source "package/python-gunicorn/Config.in" source "package/python-h11/Config.in" source "package/python-h2/Config.in" diff --git a/package/python-grpclib/Config.in b/package/python-grpclib/Config.in new file mode 100644 index 0000000000..42cc011097 --- /dev/null +++ b/package/python-grpclib/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_GRPCLIB + bool "python-grpclib" + select BR2_PACKAGE_PYTHON_H2 # runtime + select BR2_PACKAGE_PYTHON_MULTIDICT # runtime + help + Pure-Python gRPC implementation for asyncio. + + https://github.com/vmagamedov/grpclib diff --git a/package/python-grpclib/python-grpclib.hash b/package/python-grpclib/python-grpclib.hash new file mode 100644 index 0000000000..cc65209138 --- /dev/null +++ b/package/python-grpclib/python-grpclib.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/grpclib/json +md5 60ce203e5b9f95de3d7e5721dbce2bd9 grpclib-0.4.7.tar.gz +sha256 2988ef57c02b22b7a2e8e961792c41ccf97efc2ace91ae7a5b0de03c363823c3 grpclib-0.4.7.tar.gz +# Locally computed sha256 checksums +sha256 6c7fa8cf9b94ad5043a6b550a0ffb98356e66100b69dd1cb8e1f82606b436e8e LICENSE.txt diff --git a/package/python-grpclib/python-grpclib.mk b/package/python-grpclib/python-grpclib.mk new file mode 100644 index 0000000000..0bec0a1879 --- /dev/null +++ b/package/python-grpclib/python-grpclib.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-grpclib +# +################################################################################ + +PYTHON_GRPCLIB_VERSION = 0.4.7 +PYTHON_GRPCLIB_SOURCE = grpclib-$(PYTHON_GRPCLIB_VERSION).tar.gz +PYTHON_GRPCLIB_SITE = https://files.pythonhosted.org/packages/79/b9/55936e462a5925190d7427e880b3033601d1effd13809b483d13a926061a +PYTHON_GRPCLIB_SETUP_TYPE = setuptools +PYTHON_GRPCLIB_LICENSE = BSD-3-Clause +PYTHON_GRPCLIB_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) -- 2.34.1 From james.hilliard1 at gmail.com Fri Feb 23 18:05:33 2024 From: james.hilliard1 at gmail.com (James Hilliard) Date: Fri, 23 Feb 2024 11:05:33 -0700 Subject: [Buildroot] [PATCH v3 2/2] package/python-betterproto: new package In-Reply-To: <20240223180533.3011424-1-james.hilliard1@gmail.com> References: <20240223180533.3011424-1-james.hilliard1@gmail.com> Message-ID: <20240223180533.3011424-2-james.hilliard1@gmail.com> Signed-off-by: James Hilliard --- Changes v2 -> v3: - add missing python-datetime runtime dependency --- package/Config.in | 1 + package/python-betterproto/Config.in | 8 ++++++++ package/python-betterproto/python-betterproto.hash | 5 +++++ package/python-betterproto/python-betterproto.mk | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-betterproto/Config.in create mode 100644 package/python-betterproto/python-betterproto.hash create mode 100644 package/python-betterproto/python-betterproto.mk diff --git a/package/Config.in b/package/Config.in index 2ddaadae69..f49c3543b2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1006,6 +1006,7 @@ menu "External python modules" source "package/python-backcall/Config.in" source "package/python-bcrypt/Config.in" source "package/python-beautifulsoup4/Config.in" + source "package/python-betterproto/Config.in" source "package/python-bidict/Config.in" source "package/python-bitarray/Config.in" source "package/python-bitstring/Config.in" diff --git a/package/python-betterproto/Config.in b/package/python-betterproto/Config.in new file mode 100644 index 0000000000..8548fd43ba --- /dev/null +++ b/package/python-betterproto/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_BETTERPROTO + bool "python-betterproto" + select BR2_PACKAGE_PYTHON_DATEUTIL # runtime + select BR2_PACKAGE_PYTHON_GRPCLIB # runtime + help + A better Protobuf / gRPC generator & library. + + http://github.com/danielgtaylor/python-betterproto diff --git a/package/python-betterproto/python-betterproto.hash b/package/python-betterproto/python-betterproto.hash new file mode 100644 index 0000000000..8d23d2ae56 --- /dev/null +++ b/package/python-betterproto/python-betterproto.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/betterproto/json +md5 bd4192c2997959100097479c34ff87e6 betterproto-2.0.0b6.tar.gz +sha256 720ae92697000f6fcf049c69267d957f0871654c8b0d7458906607685daee784 betterproto-2.0.0b6.tar.gz +# Locally computed sha256 checksums +sha256 a5b8df75467e4b57a308a94cce5fdae84808a83ee6cd5af7e175c6b9784a753f LICENSE.md diff --git a/package/python-betterproto/python-betterproto.mk b/package/python-betterproto/python-betterproto.mk new file mode 100644 index 0000000000..95caf0945a --- /dev/null +++ b/package/python-betterproto/python-betterproto.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-betterproto +# +################################################################################ + +PYTHON_BETTERPROTO_VERSION = 2.0.0b6 +PYTHON_BETTERPROTO_SOURCE = betterproto-$(PYTHON_BETTERPROTO_VERSION).tar.gz +PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/45/43/4c44efd75f2ef48a16b458c2fe2cff7aa74bab8fcadf2653bb5110a87f97 +PYTHON_BETTERPROTO_SETUP_TYPE = setuptools +PYTHON_BETTERPROTO_LICENSE = MIT +PYTHON_BETTERPROTO_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) -- 2.34.1 From Noreply at busybox.net Fri Feb 23 18:42:57 2024 From: Noreply at busybox.net (Noreply at busybox.net) Date: 23 Feb 2024 10:42:57 -0800 Subject: [Buildroot] E-mail Account Verification For buildroot@busybox.net !!! Message-ID: <20240223104256.E69E2BCB2D2FE7FE@busybox.net> An HTML attachment was scrubbed... URL: From dannenberg at ti.com Fri Feb 23 19:31:36 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Fri, 23 Feb 2024 13:31:36 -0600 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <1a7ab8e6-bd43-4191-ad95-12e40f3a5c51@smile.fr> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> <20240220004100.3yzqapeplx6olarz@dasso> <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> <20240220200414.2bsvqvaeltqhsulc@dasso> <1a7ab8e6-bd43-4191-ad95-12e40f3a5c51@smile.fr> Message-ID: <20240223193136.sod3vx4t3pkqfcqd@dasso> Hi Romain, On Tue, Feb 20, 2024 at 10:36:51PM +0100, Romain Naour wrote: > >> About existing boot flow, I found two recent commit in u-boot that state that > >> the "Split binary" (that requires sysfw.itb) is already a legacy boot flow: > > > > It's called "legacy boot flow" because it was the boot flow used on the > > first K3 devices that were released (AM65x, J721E). This boot flow was > > not used on follow-on devices. The characteristics of this boot flow is > > that the initial FW image that gets loaded (tiboot3.bin) doesn't contain > > any device firmwares, but only a bootloader (such as U-Boot SPL). Then > > this boot loader will load the System Firmware firmware + config data > > blob (sysfw.itb) into the dedicated core (called "DMSC" = Device Manager > > and Security Controller). And then addiitonal boot stages will be > > loaded. These devices require this boot flow, and with this it is > > required to be supported by U-Boot (and any Linux distribution or build > > systems that build on that). > > > > TI is still making/selling those "legacy boot flow" devices, and will > > continue to do so for a very long time. One promiment community > > incarnation that you are probably aware of is the BeagleBone AI-64. > > Thank you for the detailed explanation! > > I previouly worked on a AM57xx SoC that is nowaday legacy SoC, the latest > ti-kernel 6.1 doesn't support some of the driver that where available in > ti-kernel 5.10 (prueth 100M, RPMsg Sockets over virtio-rpmsg transport (use for > ARM-DSP IPC3.x), TI-RTOS (the csl-common package was also removed from meta-ti)). > > Also the TI SDK on this plateform doesn't seems very active [1]. since you brought this up I wanted to add some additional context here. Older devices like AM57xx (AM335x and AM437x fall into the same bucket) will get what we call "LTS refresh SDKs" every year, rather than multiple drops per year as we do for the more recent devices. As for AM57xx specifically that refresh is currently targeted for e/o March 2024 and will be known as "SDK 9.2". There shouldn't be any feature regressions, and the only "new" thing (in addition to an all-refreshed SW baseline with 6.1 kernel and 2023.04 U-Boot) will be some Y2K38 issue fix on Linux. TI will be making and selling those devices for a very long time to come, and the annual refresh is seen as a good compromise between keeping things refreshed periodically and up to date while limiting the amount of repeat work/effort. -- Andreas Dannenberg Texas Instruments Inc From flavio.tapajos at newtesc.com.br Fri Feb 23 20:13:53 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Fri, 23 Feb 2024 17:13:53 -0300 Subject: [Buildroot] =?utf-8?q?=5BPATCH_1/2=5D_DEVELOPERS=3A_add_Fl=C3=A1?= =?utf-8?q?vio_Tapaj=C3=B3s_for_python-paho-mqtt?= Message-ID: <20240223201354.478070-1-flavio.tapajos@newtesc.com.br> Signed-off-by: Fl?vio Tapaj?s --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0f065bfafb..e0484c04b0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1077,6 +1077,7 @@ F: package/python-pymodbus/ N: Fl?vio Tapaj?s F: configs/asus_tinker-s_rk3288_defconfig F: board/asus/tinker-s/ +F: package/python-paho-mqtt/ F: package/python-sqlalchemy/ F: package/rsyslog/ -- 2.43.2 From flavio.tapajos at newtesc.com.br Fri Feb 23 20:13:54 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Fri, 23 Feb 2024 17:13:54 -0300 Subject: [Buildroot] [PATCH 2/2] package/python-paho-mqtt: bump version to 2.0.0 In-Reply-To: <20240223201354.478070-1-flavio.tapajos@newtesc.com.br> References: <20240223201354.478070-1-flavio.tapajos@newtesc.com.br> Message-ID: <20240223201354.478070-2-flavio.tapajos@newtesc.com.br> Signed-off-by: Fl?vio Tapaj?s --- package/python-paho-mqtt/python-paho-mqtt.hash | 2 +- package/python-paho-mqtt/python-paho-mqtt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-paho-mqtt/python-paho-mqtt.hash b/package/python-paho-mqtt/python-paho-mqtt.hash index 81b9dda81d..29d4dfc77d 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.hash +++ b/package/python-paho-mqtt/python-paho-mqtt.hash @@ -1,5 +1,5 @@ # locally computed -sha256 6e35c1be242a901fc9c00bad7d37b5cc4a497f398dfceb4ed0d8018a959be650 python-paho-mqtt-1.6.1.tar.gz +sha256 63e9f2f9f2e3a6345b2a50010ecdbbcfda6cb1f5cff73a2f39528dac8debd1d0 python-paho-mqtt-2.0.0.tar.gz sha256 66408b049249c3bdb0ba1ed285f5422ce67e371d40151bebd4d806af454ffe7c LICENSE.txt sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 sha256 8c349f80764d0648e645f41ef23772a70c995a0924b5235f735f4a3d09df127c epl-v20 diff --git a/package/python-paho-mqtt/python-paho-mqtt.mk b/package/python-paho-mqtt/python-paho-mqtt.mk index f255a7847d..b9180e3ba0 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.mk +++ b/package/python-paho-mqtt/python-paho-mqtt.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PAHO_MQTT_VERSION = 1.6.1 +PYTHON_PAHO_MQTT_VERSION = 2.0.0 PYTHON_PAHO_MQTT_SITE = $(call github,eclipse,paho.mqtt.python,v$(PYTHON_PAHO_MQTT_VERSION)) PYTHON_PAHO_MQTT_LICENSE = EPL-2.0, EDLv1.0 PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 -- 2.43.2 From kazemi.ms at gmail.com Fri Feb 23 20:30:31 2024 From: kazemi.ms at gmail.com (Saeed Kazemi) Date: Fri, 23 Feb 2024 21:30:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/fd: new package Message-ID: <20240223203031.825112-1-kazemi.ms@gmail.com> A simple, fast and user-friendly alternative to 'find' https://github.com/sharkdp/fd.git Signed-off-by: Saeed Kazemi --- DEVELOPERS | 1 + package/Config.in | 1 + package/fd/Config.in | 12 ++++++++++++ package/fd/fd.hash | 4 ++++ package/fd/fd.mk | 12 ++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/fd/Config.in create mode 100644 package/fd/fd.hash create mode 100644 package/fd/fd.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0f065bfafb..bf022512a5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2731,6 +2731,7 @@ F: package/biosdevname/ N: Saeed Kazemi F: package/eza/ +F: package/fd/ F: package/procs/ N: Sam Lancia diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..090fa80a29 100644 --- a/package/Config.in +++ b/package/Config.in @@ -182,6 +182,7 @@ menu "Development tools" source "package/diffutils/Config.in" source "package/dos2unix/Config.in" source "package/findutils/Config.in" + source "package/fd/Config.in" source "package/flex/Config.in" source "package/gawk/Config.in" source "package/gettext/Config.in" diff --git a/package/fd/Config.in b/package/fd/Config.in new file mode 100644 index 0000000000..10f295cb20 --- /dev/null +++ b/package/fd/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_FD + bool "fd" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + fd is a program to find entries in your filesystem. It is a + simple, fast and user-friendly alternative to find. While it + does not aim to support all of find's powerful functionality, + it provides sensible (opinionated) defaults for a majority of + use cases. + + https://github.com/sharkdp/fd.git diff --git a/package/fd/fd.hash b/package/fd/fd.hash new file mode 100644 index 0000000000..7950055efa --- /dev/null +++ b/package/fd/fd.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 49d57704f1a75b20a770d50538818ec003f42a5c19a39a682639b5e72e72ee7d fd-9.0.0.tar.gz +sha256 73c83c60d817e7df1943cb3f0af81e4939a8352c9a96c2fd00451b1116fa635c LICENSE-APACHE +sha256 322cfc7aa0c774d0eca3b2610f1d414de3ddbd7d8dd4b9dea941a13a6eb07455 LICENSE-MIT diff --git a/package/fd/fd.mk b/package/fd/fd.mk new file mode 100644 index 0000000000..316da418ea --- /dev/null +++ b/package/fd/fd.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# fd +# +################################################################################ + +FD_VERSION = 9.0.0 +FD_SITE = $(call github,sharkdp,fd,v$(FD_VERSION)) +FD_LICENSE = Apache-2.0 or MIT +FD_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) -- 2.34.1 From wilfred.mallawa at wdc.com Sat Feb 24 00:28:44 2024 From: wilfred.mallawa at wdc.com (Wilfred Mallawa) Date: Sat, 24 Feb 2024 10:28:44 +1000 Subject: [Buildroot] [PATCH 1/1] package/spdm-utils: new package Message-ID: <20240224002843.16382-2-wilfred.mallawa@wdc.com> Signed-off-by: Alistair Francis Signed-off-by: Wilfred Mallawa --- package/Config.in | 1 + package/spdm-utils/Config.in | 20 ++++++++++++++++++ package/spdm-utils/spdm-utils.hash | 2 ++ package/spdm-utils/spdm-utils.mk | 34 ++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 package/spdm-utils/Config.in create mode 100644 package/spdm-utils/spdm-utils.hash create mode 100644 package/spdm-utils/spdm-utils.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..11075d08c3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2697,6 +2697,7 @@ comment "Utilities" source "package/screenfetch/Config.in" source "package/sexpect/Config.in" source "package/sudo/Config.in" + source "package/spdm-utils/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" source "package/tini/Config.in" diff --git a/package/spdm-utils/Config.in b/package/spdm-utils/Config.in new file mode 100644 index 0000000000..6729cbde90 --- /dev/null +++ b/package/spdm-utils/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SPDM_UTILS + bool "spdm-utils" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_USE_WCHAR # eudev + depends on !BR2_STATIC_LIBS + depends on BR2_USE_MMU # eudev + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_EUDEV + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_LIBSPDM + help + SPDM-Utils is a Linux application designed to support, + test and develop SPDM requesters and responders. + SPDM-Utils uses libspdm as the backend to perform SPDM + communication. SPDM-Utils currently supports the + PCIe Data Object Exchange (DOE) Capability. + + https://github.com/westerndigitalcorporation/spdm-utils \ No newline at end of file diff --git a/package/spdm-utils/spdm-utils.hash b/package/spdm-utils/spdm-utils.hash new file mode 100644 index 0000000000..0b4e5d2eea --- /dev/null +++ b/package/spdm-utils/spdm-utils.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4bb5ac80ccac3928a6b6d15266e260bbc103d07c543b054664aac42a5472b7a6 spdm-utils-0.1.1.tar.gz diff --git a/package/spdm-utils/spdm-utils.mk b/package/spdm-utils/spdm-utils.mk new file mode 100644 index 0000000000..7574ea9b11 --- /dev/null +++ b/package/spdm-utils/spdm-utils.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# spdm-utils +# +################################################################################ + +SPDM_UTILS_VERSION = 0.1.1 +SPDM_UTILS_SITE = $(call github,westerndigitalcorporation,spdm-utils,v$(SPDM_UTILS_VERSION)) +SPDM_UTILS_LICENSE = Apache-2.0 or MIT +SPDM_UTILS_POST_INSTALL_TARGET_HOOKS += SPDM_UTILS_INSTALL_CERTS +SPDM_UTILS_DEPENDENCIES += pciutils libspdm openssl + +# Force PyO3 to configure as a cross-compilation +export PYO3_CROSS=1 + +define SPDM_UTILS_INSTALL_CERTS + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/certs + cp -r $(@D)/certs/generate_certs.sh $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/openssl-alias.cnf $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/openssl.cnf $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/setup_certs.sh $(TARGET_DIR)/root/certs/ + + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/immutable.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.cert.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.key $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/param.pem $(TARGET_DIR)/root/certs/slot0 + + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/manifest + cp $(@D)/manifest/manifest.out.cbor $(TARGET_DIR)/root/manifest +endef + +$(eval $(cargo-package)) -- 2.43.2 From wilfred.mallawa at wdc.com Sat Feb 24 00:39:59 2024 From: wilfred.mallawa at wdc.com (Wilfred Mallawa) Date: Sat, 24 Feb 2024 10:39:59 +1000 Subject: [Buildroot] [PATCH v2 1/1] package/spdm-utils: new package Message-ID: <20240224003958.21174-2-wilfred.mallawa@wdc.com> Signed-off-by: Alistair Francis Signed-off-by: Wilfred Mallawa --- Changes in V2: - Fixes errors found by `check-package` --- package/Config.in | 1 + package/spdm-utils/Config.in | 20 ++++++++++++++++++ package/spdm-utils/spdm-utils.hash | 2 ++ package/spdm-utils/spdm-utils.mk | 34 ++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+) create mode 100644 package/spdm-utils/Config.in create mode 100644 package/spdm-utils/spdm-utils.hash create mode 100644 package/spdm-utils/spdm-utils.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..337c68725f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2696,6 +2696,7 @@ comment "Utilities" source "package/screen/Config.in" source "package/screenfetch/Config.in" source "package/sexpect/Config.in" + source "package/spdm-utils/Config.in" source "package/sudo/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" diff --git a/package/spdm-utils/Config.in b/package/spdm-utils/Config.in new file mode 100644 index 0000000000..97dbc51c6d --- /dev/null +++ b/package/spdm-utils/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SPDM_UTILS + bool "spdm-utils" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_USE_WCHAR # eudev + depends on !BR2_STATIC_LIBS + depends on BR2_USE_MMU # eudev + select BR2_PACKAGE_HOST_RUSTC + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_EUDEV + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_LIBSPDM + help + SPDM-Utils is a Linux application designed to support, + test and develop SPDM requesters and responders. + SPDM-Utils uses libspdm as the backend to perform SPDM + communication. SPDM-Utils currently supports the + PCIe Data Object Exchange (DOE) Capability. + + https://github.com/westerndigitalcorporation/spdm-utils diff --git a/package/spdm-utils/spdm-utils.hash b/package/spdm-utils/spdm-utils.hash new file mode 100644 index 0000000000..0d424913f2 --- /dev/null +++ b/package/spdm-utils/spdm-utils.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4bb5ac80ccac3928a6b6d15266e260bbc103d07c543b054664aac42a5472b7a6 spdm-utils-0.1.1.tar.gz diff --git a/package/spdm-utils/spdm-utils.mk b/package/spdm-utils/spdm-utils.mk new file mode 100644 index 0000000000..7574ea9b11 --- /dev/null +++ b/package/spdm-utils/spdm-utils.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# spdm-utils +# +################################################################################ + +SPDM_UTILS_VERSION = 0.1.1 +SPDM_UTILS_SITE = $(call github,westerndigitalcorporation,spdm-utils,v$(SPDM_UTILS_VERSION)) +SPDM_UTILS_LICENSE = Apache-2.0 or MIT +SPDM_UTILS_POST_INSTALL_TARGET_HOOKS += SPDM_UTILS_INSTALL_CERTS +SPDM_UTILS_DEPENDENCIES += pciutils libspdm openssl + +# Force PyO3 to configure as a cross-compilation +export PYO3_CROSS=1 + +define SPDM_UTILS_INSTALL_CERTS + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/certs + cp -r $(@D)/certs/generate_certs.sh $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/openssl-alias.cnf $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/openssl.cnf $(TARGET_DIR)/root/certs/ + cp -r $(@D)/certs/setup_certs.sh $(TARGET_DIR)/root/certs/ + + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/immutable.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.cert.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.der $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/device.key $(TARGET_DIR)/root/certs/slot0 + cp $(@D)/certs/slot0/param.pem $(TARGET_DIR)/root/certs/slot0 + + $(INSTALL) -d -m 0755 $(TARGET_DIR)/root/manifest + cp $(@D)/manifest/manifest.out.cbor $(TARGET_DIR)/root/manifest +endef + +$(eval $(cargo-package)) -- 2.43.2 From bernd at kuhls.net Sat Feb 24 08:03:00 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 09:03:00 +0100 Subject: [Buildroot] [PATCH 3/3] package/kodi-inputstream-adaptive: bump version to 20.3.18-Nexus In-Reply-To: <20240224080300.23278-1-bernd@kuhls.net> References: <20240224080300.23278-1-bernd@kuhls.net> Message-ID: <20240224080300.23278-3-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- .../kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash | 2 +- package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index e38191c0c4..3de6886ffd 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 f67cfef057f8842716db4521a8cd3966c37a1da8fc3fb297527f6f25be20688a kodi-inputstream-adaptive-20.3.17-Nexus.tar.gz +sha256 0755b27612d44d372bfe2b9fa32e47af616008287998d4b77ae70bcfb782cef9 kodi-inputstream-adaptive-20.3.18-Nexus.tar.gz sha256 48632d57fbb6ab8f50cbf4deced5c91e733fa7ff292687c4816b77f28e483df9 LICENSE.md sha256 02f864f3e07456785625968022ce811c5640301bfd2ae70963efea89d306790a LICENSES/README.md sha256 0b7f5dcb3d2c28ff78d999786028930e762df0baa2f52955782e378ec5b636a8 LICENSES/BSD-2-Clause-Views diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index ba4f6de61a..c721df07d1 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.17-Nexus +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 20.3.18-Nexus KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = \ BSD-2-Clause-Views \ -- 2.39.2 From bernd at kuhls.net Sat Feb 24 08:02:58 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 09:02:58 +0100 Subject: [Buildroot] [PATCH 1/3] package/kodi-pvr-hts: bump version to 20.7.1-Nexus Message-ID: <20240224080300.23278-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index a268940b0e..facfbecc37 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 15d68d928e0794fb42fd0f3483403fb0290c5c94aa3d3b648a8a2f8e8316dfff kodi-pvr-hts-20.7.0-Nexus.tar.gz +sha256 d4aa99a8490f6743e950f9ff60522203458f85c86f7d58f54de7144f525e45af kodi-pvr-hts-20.7.1-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index c56d0e0546..2415b151c3 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 20.7.0-Nexus +KODI_PVR_HTS_VERSION = 20.7.1-Nexus KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md -- 2.39.2 From bernd at kuhls.net Sat Feb 24 08:02:59 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 09:02:59 +0100 Subject: [Buildroot] [PATCH 2/3] package/kodi-pvr-mythtv: bump version to 20.6.8-Nexus In-Reply-To: <20240224080300.23278-1-bernd@kuhls.net> References: <20240224080300.23278-1-bernd@kuhls.net> Message-ID: <20240224080300.23278-2-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index c61c391825..77c4274843 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb21e185d1333a8696565138bc58df3d37970c9a3615193396e9f296a56a24c4 kodi-pvr-mythtv-20.5.10-Nexus.tar.gz +sha256 64358b8af46d44e98da4bc111eacc294e679abc96662a2c5f14728f097f31f86 kodi-pvr-mythtv-20.6.8-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 66f1948741..7598f064e8 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.5.10-Nexus +KODI_PVR_MYTHTV_VERSION = 20.6.8-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md -- 2.39.2 From bernd at kuhls.net Sat Feb 24 08:23:12 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 09:23:12 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240224082312.33187-1-bernd@kuhls.net> Signed-off-by: Bernd Kuhls --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 773cb4fbb5..07d6b2b5ec 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.18" 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 52fb480af2..15c0dc8d3d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz -sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz +sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz +sha256 faa49ca22fb55ed4d5ca2a55e07dd10e4e171cfc3b92568a631453cd2068b39b linux-6.1.79.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz -sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz -sha256 afc8aca6cb56fea489f6508bc24357df1cf8a8f3d7dcfbcccd94b7f968492620 linux-5.4.268.tar.xz +sha256 bd84809a367eb400eb04e0e70294e6ba12fc03b6bfb5a7dfaca548f8947501b0 linux-5.15.149.tar.xz +sha256 4ea63c5a90fdc3c459ab35c11ee8c93d2364a7cdbfb101100f8cab70d490ef6d linux-5.10.210.tar.xz +sha256 ff54bec6d053c7994f3bb8c45021de2858ff9f740d2ccbbcf072b87821a918cf linux-5.4.269.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 b91be40fa61ff7d42958e2154a4b7602dc071982128b9b58b6d911dec111be19 linux-4.19.306.tar.xz +sha256 83eeff613405d0045d0f717c6ac14c178678fe0a163c41d9dd8878ac0f73e352 linux-4.19.307.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 69857566e3..63e82c49df 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.306" if BR2_KERNEL_HEADERS_4_19 - default "5.4.268" if BR2_KERNEL_HEADERS_5_4 - default "5.10.209" if BR2_KERNEL_HEADERS_5_10 - default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.77" if BR2_KERNEL_HEADERS_6_1 - default "6.6.16" if BR2_KERNEL_HEADERS_6_6 + default "4.19.307" if BR2_KERNEL_HEADERS_4_19 + default "5.4.269" if BR2_KERNEL_HEADERS_5_4 + default "5.10.210" if BR2_KERNEL_HEADERS_5_10 + default "5.15.149" if BR2_KERNEL_HEADERS_5_15 + default "6.1.79" if BR2_KERNEL_HEADERS_6_1 + default "6.6.18" if BR2_KERNEL_HEADERS_6_6 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 \ -- 2.39.2 From peter at korsgaard.com Sat Feb 24 10:13:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:13:43 +0100 Subject: [Buildroot] [PATCH 1/1] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series In-Reply-To: <20240224082312.33187-1-bernd@kuhls.net> (Bernd Kuhls's message of "Sat, 24 Feb 2024 09:23:12 +0100") References: <20240224082312.33187-1-bernd@kuhls.net> Message-ID: <87msrquq3s.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:13:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:13:55 +0100 Subject: [Buildroot] [PATCH] package/libuv: security bump to version 1.48 In-Reply-To: <20240222131628.3479059-1-buildroot@bubu1.eu> (Marcus Hoffmann via buildroot's message of "Thu, 22 Feb 2024 14:16:27 +0100") References: <20240222131628.3479059-1-buildroot@bubu1.eu> Message-ID: <87il2euq3g.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Fixes: CVE-2024-24806 / GHSA-f74f-cvh7-c6q6 [1] > Release Notes: https://github.com/libuv/libuv/releases/tag/v1.48.0 > Full Changelog: https://github.com/libuv/libuv/blob/v1.48.0/ChangeLog > [1]: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6 > Signed-off-by: Marcus Hoffmann Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:14:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:14:43 +0100 Subject: [Buildroot] [PATCH 1/1] package/gcc: remove orphaned 10.4.0 patch In-Reply-To: <20240222135550.3428952-1-vfazio@gmail.com> (Vincent Fazio's message of "Thu, 22 Feb 2024 07:55:50 -0600") References: <20240222135550.3428952-1-vfazio@gmail.com> Message-ID: <87edd2uq24.fsf@48ers.dk> >>>>> "Vincent" == Vincent Fazio writes: > Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was > merged and introduced a patch to 10.4.0 that was not accounted for by > the patch that dropped 10.4.0 support. > Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x") > Signed-off-by: Vincent Fazio Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:15:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:15:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/c-ares: security bump to version 1.27.0 In-Reply-To: <20240223172850.559363-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 23 Feb 2024 18:28:50 +0100") References: <20240223172850.559363-1-fontaine.fabrice@gmail.com> Message-ID: <87a5nquq0r.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2024-25629: Reading malformatted /etc/resolv.conf, > /etc/nsswitch.conf or the HOSTALIASES file could result in a crash. > https://github.com/c-ares/c-ares/security/advisories/GHSA-mg26-v6qh-x48q > https://github.com/c-ares/c-ares/releases/tag/cares-1_27_0 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:16:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:16:15 +0100 Subject: [Buildroot] [PATCH 1/1] package/nodejs: security bump to version 20.11.1 In-Reply-To: <20240221220343.1228278-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 21 Feb 2024 23:03:43 +0100") References: <20240221220343.1228278-1-fontaine.fabrice@gmail.com> Message-ID: <875xyeupzk.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2024-21892, CVE-2024-22019, CVE-2024-21896, CVE-2024-22017, > CVE-2023-46809, CVE-2024-21891, CVE-2024-21890 and CVE-2024-22025 > - LICENSE hash changed due to two things: > * c-ares vendored dependency license got updated [1]. This is unused > by buildroot though anyway > * base64 vendored library license updated copyright years and sorted > contributor names [2], [3] > - This bump will fix the following build failure raised since bump of > python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14 > thanks to > https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6 > https://github.com/nodejs/node/commit/6557c1c9b1206a85bb7d8e7450e8c3a4cff7c84b: > Traceback (most recent call last): > File "/home/autobuild/autobuild/instance-2/output-1/build/host-nodejs-src-20.9.0/configure.py", line 17, in > from distutils.version import StrictVersion > ModuleNotFoundError: No module named 'distutils' > https://github.com/nodejs/node/blob/v20.11.1/CHANGELOG.md > [1] https://github.com/c-ares/c-ares/pull/556 > [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd > [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b > Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 > - http://autobuild.buildroot.org/results/8b38bc4b7879a0349c1305e2fcb458a0cfd04a93 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:17:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:17:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/samba4: bump version to 4.19.5 In-Reply-To: <20240221203153.3428611-1-bernd@kuhls.net> (Bernd Kuhls's message of "Wed, 21 Feb 2024 21:31:53 +0100") References: <20240221203153.3428611-1-bernd@kuhls.net> Message-ID: <871q92upxs.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Release notes: https://www.samba.org/samba/history/samba-4.19.5.html > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:12:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:12:27 +0100 Subject: [Buildroot] [git commit] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240224101749.1E3DB87A11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05ca551c3b4b88c7a97cfc7a8dc3971ecd33c7de branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 773cb4fbb5..07d6b2b5ec 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.18" 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 52fb480af2..15c0dc8d3d 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz -sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz +sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz +sha256 faa49ca22fb55ed4d5ca2a55e07dd10e4e171cfc3b92568a631453cd2068b39b linux-6.1.79.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz -sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz -sha256 afc8aca6cb56fea489f6508bc24357df1cf8a8f3d7dcfbcccd94b7f968492620 linux-5.4.268.tar.xz +sha256 bd84809a367eb400eb04e0e70294e6ba12fc03b6bfb5a7dfaca548f8947501b0 linux-5.15.149.tar.xz +sha256 4ea63c5a90fdc3c459ab35c11ee8c93d2364a7cdbfb101100f8cab70d490ef6d linux-5.10.210.tar.xz +sha256 ff54bec6d053c7994f3bb8c45021de2858ff9f740d2ccbbcf072b87821a918cf linux-5.4.269.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 b91be40fa61ff7d42958e2154a4b7602dc071982128b9b58b6d911dec111be19 linux-4.19.306.tar.xz +sha256 83eeff613405d0045d0f717c6ac14c178678fe0a163c41d9dd8878ac0f73e352 linux-4.19.307.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 69857566e3..63e82c49df 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.306" if BR2_KERNEL_HEADERS_4_19 - default "5.4.268" if BR2_KERNEL_HEADERS_5_4 - default "5.10.209" if BR2_KERNEL_HEADERS_5_10 - default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.77" if BR2_KERNEL_HEADERS_6_1 - default "6.6.16" if BR2_KERNEL_HEADERS_6_6 + default "4.19.307" if BR2_KERNEL_HEADERS_4_19 + default "5.4.269" if BR2_KERNEL_HEADERS_5_4 + default "5.10.210" if BR2_KERNEL_HEADERS_5_10 + default "5.15.149" if BR2_KERNEL_HEADERS_5_15 + default "6.1.79" if BR2_KERNEL_HEADERS_6_1 + default "6.6.18" if BR2_KERNEL_HEADERS_6_6 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 \ From peter at korsgaard.com Sat Feb 24 10:12:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:12:53 +0100 Subject: [Buildroot] [git commit] package/libuv: security bump to version 1.48 Message-ID: <20240224101749.5485787A17@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd2f99246c253739a3d44d8345f2fbb5362b3fb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes: CVE-2024-24806 / GHSA-f74f-cvh7-c6q6 [1] Release Notes: https://github.com/libuv/libuv/releases/tag/v1.48.0 Full Changelog: https://github.com/libuv/libuv/blob/v1.48.0/ChangeLog [1]: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6 Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 1fd286d9e9..2ca8f64a80 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094 libuv-v1.46.0-dist.tar.gz +sha256 c593139feb9061699fdd2f7fde47bb6c1ca77761ae9ec04f052083f1ef46c13b libuv-v1.48.0-dist.tar.gz sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 76316484e4..5f96e98a98 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.46.0 +LIBUV_VERSION = 1.48.0 LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) LIBUV_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Sat Feb 24 10:17:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:17:08 +0100 Subject: [Buildroot] [git commit] package/samba4: bump version to 4.19.5 Message-ID: <20240224101749.5590587A0C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a4a0ecaceabb7982abb0ed0cae9d468c286ddd12 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Release notes: https://www.samba.org/samba/history/samba-4.19.5.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 3353221959..4e74e07bd0 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc -sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.5.tar.asc +sha256 0e2405b4cec29d0459621f4340a1a74af771ec7cffedff43250cad7f1f87605e samba-4.19.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 78c5db308d..0980d03175 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.4 +SAMBA4_VERSION = 4.19.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From peter at korsgaard.com Sat Feb 24 10:13:25 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:13:25 +0100 Subject: [Buildroot] [git commit] package/gcc: remove orphaned 10.4.0 patch Message-ID: <20240224101749.330A287A09@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fbedcfa221bc8826536a39b01eccf0626ab89bf1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was merged and introduced a patch to 10.4.0 that was not accounted for by the patch that dropped 10.4.0 support. Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x") Signed-off-by: Vincent Fazio Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...y-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 ---------------------- 1 file changed, 49 deletions(-) diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch deleted file mode 100644 index 7e9714e9cb..0000000000 --- a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Thu, 29 Sep 2022 15:32:39 +0100 -Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS - -This was found when testing buildroot with linuxthreads enabled. In -this case, the build passes --disable-tls to the toolchain during -configuration. After building the OpenRISC toolchain it was still -generating TLS code sequences and causing linker failures such as: - - ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl - ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' - -This patch fixes this by disabling tls for the OpenRISC target when requested -via --disable-tls. - -gcc/ChangeLog: - - * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if - HAVE_AS_TLS is defined. - -Tested-by: Yann E. MORIN - -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 - -[Bernd: backported to 10.4.0] -Signed-off-by: Bernd Kuhls ---- - gcc/config/or1k/or1k.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c -index da2f59062ba..0ce7b234417 100644 ---- a/gcc/config/or1k/or1k.c -+++ b/gcc/config/or1k/or1k.c -@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, - #undef TARGET_LEGITIMATE_ADDRESS_P - #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p - -+#ifdef HAVE_AS_TLS - #undef TARGET_HAVE_TLS - #define TARGET_HAVE_TLS true -+#endif - - #undef TARGET_HAVE_SPECULATION_SAFE_VALUE - #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed --- -2.39.3 - From peter at korsgaard.com Sat Feb 24 10:15:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:15:51 +0100 Subject: [Buildroot] [git commit] package/nodejs: security bump to version 20.11.1 Message-ID: <20240224101749.43FE187A15@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02ecb096ad874a1fecfc3a87ca7d547befb16d8f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master - Fix CVE-2024-21892, CVE-2024-22019, CVE-2024-21896, CVE-2024-22017, CVE-2023-46809, CVE-2024-21891, CVE-2024-21890 and CVE-2024-22025 - LICENSE hash changed due to two things: * c-ares vendored dependency license got updated [1]. This is unused by buildroot though anyway * base64 vendored library license updated copyright years and sorted contributor names [2], [3] - This bump will fix the following build failure raised since bump of python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14 thanks to https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6 https://github.com/nodejs/node/commit/6557c1c9b1206a85bb7d8e7450e8c3a4cff7c84b: Traceback (most recent call last): File "/home/autobuild/autobuild/instance-2/output-1/build/host-nodejs-src-20.9.0/configure.py", line 17, in from distutils.version import StrictVersion ModuleNotFoundError: No module named 'distutils' https://github.com/nodejs/node/blob/v20.11.1/CHANGELOG.md [1] https://github.com/c-ares/c-ares/pull/556 [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 - http://autobuild.buildroot.org/results/8b38bc4b7879a0349c1305e2fcb458a0cfd04a93 Signed-off-by: Fabrice Fontaine Reviewed-By: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 14 +++++++------- package/nodejs/nodejs.mk | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2d60437a7c..ddab345e0a 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.9.0/SHASUMS256.txt.asc -sha256 ced3ecece4b7c3a664bca3d9e34a0e3b9a31078525283a6fdb7ea2de8ca5683b node-v20.9.0-linux-arm64.tar.xz -sha256 64099d7e62bdbb8efd52c216a6759b3cdd77c38aa993096fdee9f875d95b2d8e node-v20.9.0-linux-armv7l.tar.xz -sha256 3c6cea5d614cfbb95d92de43fbc2f8ecd66e431502fe5efc4f3c02637897bd45 node-v20.9.0-linux-ppc64le.tar.xz -sha256 9033989810bf86220ae46b1381bdcdc6c83a0294869ba2ad39e1061f1e69217a node-v20.9.0-linux-x64.tar.xz -sha256 a23d96810abf0455426b349d47ce5310f33095b7bc0571b9cc510f481c3a4519 node-v20.9.0.tar.xz +# From https://nodejs.org/dist/v20.11.1/SHASUMS256.txt.asc +sha256 c957f29eb4e341903520caf362534f0acd1db7be79c502ae8e283994eed07fe1 node-v20.11.1-linux-arm64.tar.xz +sha256 28e0120d2d150a8f41717899d33167b8b32053778665583d49ff971bfd188d1b node-v20.11.1-linux-armv7l.tar.xz +sha256 51343cacf5cdf5c4b5e93e919d19dd373d6ef43d5f2c666eae299f26e31d08b5 node-v20.11.1-linux-ppc64le.tar.xz +sha256 d8dab549b09672b03356aa2257699f3de3b58c96e74eb26a8b495fbdc9cf6fbe node-v20.11.1-linux-x64.tar.xz +sha256 77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e node-v20.11.1.tar.xz # Locally calculated -sha256 93ac846282ce6c5255e00fada2fd2e7e292255239fe58d5502b0a554859e6a3e LICENSE +sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9806a64d38..858c6a86f5 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.9.0 +NODEJS_COMMON_VERSION = 20.11.1 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) From peter at korsgaard.com Sat Feb 24 10:15:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:15:20 +0100 Subject: [Buildroot] [git commit] package/c-ares: security bump to version 1.27.0 Message-ID: <20240224101749.3448487A0D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=66cfd29e97a00d5210da38fe45ea2effe23bea94 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix CVE-2024-25629: Reading malformatted /etc/resolv.conf, /etc/nsswitch.conf or the HOSTALIASES file could result in a crash. https://github.com/c-ares/c-ares/security/advisories/GHSA-mg26-v6qh-x48q https://github.com/c-ares/c-ares/releases/tag/cares-1_27_0 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index ee097a53c9..9a2b69c731 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz +sha256 0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b c-ares-1.27.0.tar.gz # Hash for license file sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 29da6baa4b..c4441255a2 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.26.0 +C_ARES_VERSION = 1.27.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From fancp2007 at gmail.com Sat Feb 24 10:31:41 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Sat, 24 Feb 2024 18:31:41 +0800 Subject: [Buildroot] [PATCH v7] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <197750aa-c25f-44d9-89ac-872053953422@benettiengineering.com> References: <20240222130716.1311432-1-fancp2007@gmail.com> <20240223131603.2313178-1-fancp2007@gmail.com> <197750aa-c25f-44d9-89ac-872053953422@benettiengineering.com> Message-ID: Hi Giulio, The BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is for the ethernet port on the board. Without the config, the eth0 interface will be not accessible. The `ifconfig eth0` command will report error: Device not found Scott Fan On Sat, Feb 24, 2024 at 12:24?AM Giulio Benetti wrote: > > Hi Scott, > > On 23/02/24 14:15, Scott Fan wrote: > > [ SNIP ] > > > + > > +# System > > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > > What do you need MDEV by default for? Is there some peripheral that > needs to show up automatically otherwise the basic functionality is > compromised? > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas From fancp2007 at gmail.com Sat Feb 24 10:33:53 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Sat, 24 Feb 2024 18:33:53 +0800 Subject: [Buildroot] [PATCH] configs/friendlyarm_nanopi_r2s: bump Linux to 6.6.18 and U-Boot to 2024.01 Message-ID: <20240224103354.7763-1-fancp2007@gmail.com> The ATF firmware also bumps to version 2.7, and the bootloader image only needs the u-boot-rockchip.bin file. This commit adds support for internal ethernet port (RTL8211E), and also adds USB 3.0 ethernet port firmware for RTL8153B chip on the board. The associated board files are also updated, notes for the NEO3 board is removed from the readme file. The .checkpackageignore file is updated accordingly (the entry for post-build.sh is removed). Tested on the NanoPi R2S board. Wiki link for the board: https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S Signed-off-by: Scott Fan --- .checkpackageignore | 1 - board/friendlyarm/nanopi-r2s/extlinux.conf | 4 +-- board/friendlyarm/nanopi-r2s/genimage.cfg | 10 ++---- board/friendlyarm/nanopi-r2s/post-build.sh | 4 +-- board/friendlyarm/nanopi-r2s/readme.txt | 20 ++++------- configs/friendlyarm_nanopi_r2s_defconfig | 39 +++++++++++++++++----- 6 files changed, 43 insertions(+), 35 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 4967d749fa..08188dc23e 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -33,7 +33,6 @@ board/cubietech/cubieboard2/post-image.sh Shellcheck board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck board/freescale/common/mxs/post-image.sh Shellcheck board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch Upstream -board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck board/hardkernel/odroidc2/post-image.sh Shellcheck board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables board/hardkernel/odroidxu4/post-image.sh EmptyLastLine Shellcheck diff --git a/board/friendlyarm/nanopi-r2s/extlinux.conf b/board/friendlyarm/nanopi-r2s/extlinux.conf index 1ea0cdd8a5..b2897dea8b 100644 --- a/board/friendlyarm/nanopi-r2s/extlinux.conf +++ b/board/friendlyarm/nanopi-r2s/extlinux.conf @@ -1,4 +1,4 @@ -label NanoPi R2S linux +label friendlyarm-nanopi-buildroot kernel /boot/Image devicetree /boot/rk3328-nanopi-r2s.dtb - append root=/dev/mmcblk0p1 rw rootwait + append console=ttyS2,1500000 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/friendlyarm/nanopi-r2s/genimage.cfg b/board/friendlyarm/nanopi-r2s/genimage.cfg index a686b4f14e..98e96a7ddd 100644 --- a/board/friendlyarm/nanopi-r2s/genimage.cfg +++ b/board/friendlyarm/nanopi-r2s/genimage.cfg @@ -4,19 +4,13 @@ image sdcard.img { partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "idbloader.img" + image = "u-boot-rockchip.bin" offset = 32K } - partition u-boot-dtb { - in-partition-table = "no" - image = "u-boot.itb" - offset = 8M - } - partition rootfs { partition-type = 0x83 - offset = 16M image = "rootfs.ext4" + offset = 10M } } diff --git a/board/friendlyarm/nanopi-r2s/post-build.sh b/board/friendlyarm/nanopi-r2s/post-build.sh index 1f5ff6a611..c7ec875068 100755 --- a/board/friendlyarm/nanopi-r2s/post-build.sh +++ b/board/friendlyarm/nanopi-r2s/post-build.sh @@ -1,5 +1,5 @@ #!/bin/sh -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" diff --git a/board/friendlyarm/nanopi-r2s/readme.txt b/board/friendlyarm/nanopi-r2s/readme.txt index 6d291cdd60..d43008b620 100644 --- a/board/friendlyarm/nanopi-r2s/readme.txt +++ b/board/friendlyarm/nanopi-r2s/readme.txt @@ -2,11 +2,11 @@ Intro ===== This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi R2S. With the current configuration +buildroot environment for the NanoPi R2S. With the current configuration it will bring-up the board, and allow access through the serial console. -Nanopi R2S link: -https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 +Wiki link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S This configuration uses ATF, U-Boot mainline and kernel mainline. @@ -25,9 +25,6 @@ Files created in output directory output/images ??? bl31.elf -??? boot.vfat -??? extlinux -??? idbloader.img ??? Image ??? rk3328-nanopi-r2s.dtb ??? rootfs.ext2 @@ -35,7 +32,7 @@ output/images ??? rootfs.tar ??? sdcard.img ??? u-boot.bin -??? u-boot.itb +??? u-boot-rockchip.bin How to write the SD card ======================== @@ -46,12 +43,7 @@ in the output/images/ directory. Copy the bootable "sdcard.img" onto an SD card with "dd": $ sudo dd if=output/images/sdcard.img of=/dev/sdX - $ sudo sync + $ sync -Insert the micro SDcard in your Nanopi R2S and power it up. The console +Insert the micro SDcard in your NanoPi R2S and power it up. The console is on the serial line, 1500000 8N1. - -Notes -===== - -This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board. diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index 284b28ec31..76806e76e7 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -1,42 +1,65 @@ +# Architecture BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# System BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# Image BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" + +# Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y + +# Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" +BR2_TARGET_UBOOT_SPL_NAME="u-boot-rockchip.bin" + +# Ethernet firmware for RTL8153B +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.34.1 From fancp2007 at gmail.com Sat Feb 24 10:55:53 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Sat, 24 Feb 2024 18:55:53 +0800 Subject: [Buildroot] [PATCH] configs/beaglebone_defconfig: bump Linux to 6.1.69-ti-r25 and U-Boot to 2024.01 Message-ID: <20240224105554.17996-1-fancp2007@gmail.com> Tested on beaglebone black. [1] https://github.com/beagleboard/linux/releases/tag/6.1.69-ti-r25 Signed-off-by: Scott Fan --- configs/beaglebone_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index e2d67019b1..cdd6591f6d 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.46-ti-r13)/linux-6.1.46-ti-r13.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.69-ti-r25)/linux-6.1.69-ti-r25.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bb.org" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" @@ -31,7 +31,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y -- 2.34.1 From bernd at kuhls.net Sat Feb 24 11:59:22 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 12:59:22 +0100 Subject: [Buildroot] [PATCH 1/1] package/cmake: bump version to 3.28.3 Message-ID: <20240224115922.234596-1-bernd@kuhls.net> Release notes: https://www.kitware.com/cmake-3-28-3-available-for-download/ https://www.kitware.com/cmake-3-28-2-available-for-download/ Signed-off-by: Bernd Kuhls --- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 51fff6c3ef..74b4a0a3a8 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.28/cmake-3.28.1-SHA-256.txt -sha256 15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad cmake-3.28.1.tar.gz +# From https://cmake.org/files/v3.28/cmake-3.28.3-SHA-256.txt +sha256 72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1 cmake-3.28.3.tar.gz # Locally calculated sha256 4a01ccf2dc580ba570d02bc015bbe0ec92f1f318717aae9540ba841ba7946756 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 23d00b95c5..49d1f9fea5 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -6,7 +6,7 @@ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y CMAKE_VERSION_MAJOR = 3.28 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt -- 2.39.2 From bernd at kuhls.net Sat Feb 24 12:10:07 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 13:10:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/ccache: bump version to 4.9.1 Message-ID: <20240224121007.435474-1-bernd@kuhls.net> Removed patch which is included in this release. Updated license hash due to various version and copyright year bumps: https://github.com/ccache/ccache/commits/master/LICENSE.adoc Release notes: https://ccache.dev/releasenotes.html#_ccache_4_9_1 Signed-off-by: Bernd Kuhls --- ...-fix-Work-around-GCC-12.3-bug-109241.patch | 29 ------------------- package/ccache/ccache.hash | 4 +-- package/ccache/ccache.mk | 2 +- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch diff --git a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch deleted file mode 100644 index 42872597cd..0000000000 --- a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001 -From: Joel Rosdahl -Date: Tue, 1 Aug 2023 12:30:12 +0200 -Subject: [PATCH] fix: Work around GCC 12.3 bug 109241 - -See also #1289. - -Upstream: https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5 - -Signed-off-by: Bernd Kuhls ---- - src/storage/local/LocalStorage.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp -index 3e5abe5074..d0a904e553 100644 ---- a/src/storage/local/LocalStorage.cpp -+++ b/src/storage/local/LocalStorage.cpp -@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional level, - auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index); - l2_content_lock.make_long_lived(lock_manager); - if (!l2_content_lock.acquire()) { -- LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index); -+ // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241 -+ LOG_RAW(fmt::format( -+ "Failed to acquire content lock for {}/{}", l1_index, l2_index)); - return; - } - diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 736122e0ab..a2537077b6 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49 ccache-4.8.2.tar.xz +sha256 4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25 ccache-4.9.1.tar.xz sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt -sha256 55ce274f2b898dad70d3695ab13f82656fd455bd8fb6d1c85d6f7c453bef0b2e LICENSE.adoc +sha256 a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84 LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index ac4bc4aba5..1ac825439b 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCACHE_VERSION = 4.8.2 +CCACHE_VERSION = 4.9.1 CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz CCACHE_LICENSE = GPL-3.0+, others -- 2.39.2 From fontaine.fabrice at gmail.com Sat Feb 24 13:57:17 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 24 Feb 2024 14:57:17 +0100 Subject: [Buildroot] [PATCH 1/1] package/prboom: fix build with autoconf >= 2.72 Message-ID: <20240224135717.635374-1-fontaine.fabrice@gmail.com> Set ac_cv_type_gid_t=yes to avoid the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: In file included from i_network.c:37: ../../config.h:207:15: error: two or more data types in declaration specifiers 207 | #define gid_t int | ^~~ Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/0d74517129130e6f26dc8c8aacae175ed8bd4b54 Signed-off-by: Fabrice Fontaine --- package/prboom/prboom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk index 36692d29a3..c1ba05ff70 100644 --- a/package/prboom/prboom.mk +++ b/package/prboom/prboom.mk @@ -6,7 +6,7 @@ PRBOOM_VERSION = 2.5.0 PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION) -PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes +PRBOOM_CONF_ENV = ac_cv_type_gid_t=yes ac_cv_type_uid_t=yes PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer PRBOOM_LICENSE = GPL-2.0+ PRBOOM_LICENSE_FILES = COPYING -- 2.43.0 From peter at korsgaard.com Sat Feb 24 13:58:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 14:58:23 +0100 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 In-Reply-To: <20240206233318.593730bd@windsurf> (Thomas Petazzoni via buildroot's message of "Tue, 6 Feb 2024 23:33:18 +0100") References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> <20240206233318.593730bd@windsurf> Message-ID: <87wmqut14w.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > Hello Adam, > On Mon, 18 Dec 2023 15:04:56 -0700 > Adam Duskett wrote: >> Python 3.12.1 has removed distutils support. As such, we remove the distutils >> option from pkg-python.mk as well. >> >> Tested on Fedora 39, and Debian 11. All 68 package tests pass. >> >> Signed-off-by: Adam Duskett >> --- >> v3 -> v4: >> - Drop distutils in pkg-python.mk >> - 3.12.0 -> 3.12.1 > I applied, but after doing a number of changes. The most important one > is that I had to reintroduce some of our --disable options: for > ncurses, sqlite and expat. Indeed, without these, you ended up with the > Python code installed, but not the correspond native library (the > py_cv_module__=n/a only disables building the native > library). > I split up the pkg-python.mk change into a separate commit, which is > made before the python 3.12 bump. Indeed, it's semantically separate. > Finally, I updated the Buildroot manual to no longer mention distutils > support. And I did a separate commit to update the Buildroot manual > with other _SETUP_TYPE values that we support. We unfortunately are still having a number of build failures because of this, E.G. for target == host or packages using the imp module and we are very late for 2024.02.x, so I have reverted this again. We can apply it again 2024.05.x after the release and work on the remaining issues. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 10:34:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:34:40 +0100 Subject: [Buildroot] [git commit] Revert "package/python3: bump version to 3.12.1" Message-ID: <20240224135841.4C97387A06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=fb6274f5defc1acacd906ee6cd0b12684a866b92 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 36e635d2d5c0166476858aa239ccbe78e8f2af14. Python 3.12 is still causing too many build failures, so revert for 2024.02. Signed-off-by: Peter Korsgaard --- .checkpackageignore | 44 ++++++--- ...1-Make-the-build-of-pyc-files-conditional.patch | 32 +++--- ...gy_getaddrinfo-configure-test-when-cross-.patch | 8 +- ...ructure-to-disable-the-build-of-certain-e.patch | 108 +++++++++++++++++++++ ...brary-header-paths-for-cross-compilation.patch} | 37 ++++--- ...n-t-look-in-usr-lib-termcap-for-libraries.patch | 31 ++++++ .../0006-Add-an-option-to-disable-pydoc.patch | 84 ---------------- .../python3/0006-Don-t-add-multiarch-paths.patch | 37 +++++++ .../0007-Abort-on-failed-module-build.patch | 30 ++++++ ...nd.patch => 0008-Serial-ioctl-workaround.patch} | 6 +- ...st-the-shebang-of-Python-scripts-for-cros.patch | 35 +++++++ ...config.sh.in-ensure-sed-invocations-only.patch} | 6 +- ...e.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch | 44 --------- .../0011-Add-an-option-to-disable-pydoc.patch | 100 +++++++++++++++++++ ...=> 0012-Add-an-option-to-disable-lib2to3.patch} | 94 ++++++++++-------- ...12-Add-an-option-to-disable-the-tk-module.patch | 79 --------------- ...Add-option-to-disable-the-sqlite3-module.patch} | 35 +++---- ...14-Add-an-option-to-disable-the-tk-module.patch | 77 +++++++++++++++ ...d-an-option-to-disable-the-curses-module.patch} | 39 ++++---- ...h => 0016-Add-an-option-to-disable-expat.patch} | 59 ++++++----- .../0017-Add-an-option-to-disable-CJK-codecs.patch | 30 ++++++ .../0018-Add-an-option-to-disable-NIS.patch | 33 +++++++ ...0019-Add-an-option-to-disable-unicodedata.patch | 30 ++++++ ...ch => 0020-Add-an-option-to-disable-IDLE.patch} | 63 ++++++------ .../0021-Add-an-option-to-disable-decimal.patch | 54 +++++++++++ ...-option-to-disable-the-ossaudiodev-module.patch | 30 ++++++ ...-Add-an-option-to-disable-openssl-support.patch | 30 ++++++ ...-an-option-to-disable-the-readline-module.patch | 30 ++++++ ...ions-to-disable-zlib-bzip2-and-xz-modules.patch | 42 ++++++++ ...6-python-config.sh-don-t-reassign-prefix.patch} | 6 +- ...0027-Add-an-option-to-disable-uuid-module.patch | 33 +++++++ ...0028-fix-building-on-older-distributions.patch} | 16 ++- ...-fixup-CC-print-multiarch-output-for-mus.patch} | 8 +- ...n-option-to-disable-the-berkeleydb-module.patch | 30 ++++++ ...libc-ng-doesn-t-set-errno-when-encryptio.patch} | 6 +- package/python3/python3.hash | 6 +- package/python3/python3.mk | 62 +++++------- 37 files changed, 1038 insertions(+), 456 deletions(-) Patch is too large, so refusing to show it From peter at korsgaard.com Sat Feb 24 10:33:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 11:33:11 +0100 Subject: [Buildroot] [git commit] Revert "package/python3: fix install when tk is disabled" Message-ID: <20240224135841.2F1D387A2A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7bae4ea6eebda089eb0f7dc4a5a6dfefcea25573 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This reverts commit 687b96db4d3518eadd16f74f7defdc05b1cfb736. Python 3.12 is still causing too many build failures, so revert for 2024.02. Signed-off-by: Peter Korsgaard --- package/python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 08617241a6..7fafbedddb 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,8 +70,6 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) -+AS_IF([test "$TK" = "no"], -+ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) From peter at korsgaard.com Sat Feb 24 17:12:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:12:54 +0100 Subject: [Buildroot] [PATCH 1/1] package/tio: needs threads In-Reply-To: <20240218210735.50128-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 18 Feb 2024 22:07:35 +0100") References: <20240218210735.50128-1-fontaine.fabrice@gmail.com> Message-ID: <87sf1hu6p5.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > tio needs threads since version 2.4 and > https://github.com/tio/tio/commit/93e6efc00153e625e4ceb8a51e01b324247d312a > resulting in the following build failure since bump to version 2.7 in > commit 4b33d7a47dd41fed5364a398320c2b7d0687ba5e: > In file included from /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, > from ../src/tty.c:23: > /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] > 218 | # warning requested reentrant code, but thread support was disabled > | ^~~~~~~ > ../src/tty.c:43:10: fatal error: pthread.h: No such file or directory > 43 | #include > | ^~~~~~~~~~~ > Fixes: 4b33d7a47dd41fed5364a398320c2b7d0687ba5e > - http://autobuild.buildroot.org/results/9b20ff06a0ad24b7e7f4750ebe64e2077e36164a > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 17:14:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:14:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/s390-tools: disable cargo In-Reply-To: <20240221181439.1113724-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 21 Feb 2024 19:14:39 +0100") References: <20240221181439.1113724-1-fontaine.fabrice@gmail.com> Message-ID: <87o7c5u6mh.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set HAVE_CARGO=0 to avoid the following build failures raised since bump > to version 2.29.0 in commit 68df20336664d4d0b1a9d8d0285d23eba631845a and > https://github.com/ibm-s390-linux/s390-tools/commit/e6add997ebbcd967734391da8a8987c7926e168f: > error: could not compile `pvsecret` (bin "pvsecret") due to previous error > [...] > ERROR: architecture for "/usr/bin/pvsecret" is "AArch64", should be "IBM S/390" > Fixes: 68df20336664d4d0b1a9d8d0285d23eba631845a > - http://autobuild.buildroot.org/results/22035cb4d8e251f9930a7d529b91b128919252bb > - http://autobuild.buildroot.org/results/99be6d3b2bab7c952ce02853f54924c5219aecc1 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 17:15:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:15:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/prboom: fix build with autoconf >= 2.72 In-Reply-To: <20240224135717.635374-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 24 Feb 2024 14:57:17 +0100") References: <20240224135717.635374-1-fontaine.fabrice@gmail.com> Message-ID: <87jzmtu6kj.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Set ac_cv_type_gid_t=yes to avoid the following build failure raised > since bump of autoconf to version 2.72 in commit > 524f3536029dace3ce9aa154d3ca4685582e1955: > In file included from i_network.c:37: > ../../config.h:207:15: error: two or more data types in declaration specifiers > 207 | #define gid_t int > | ^~~ > Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 > - http://autobuild.buildroot.org/results/0d74517129130e6f26dc8c8aacae175ed8bd4b54 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sat Feb 24 17:15:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:15:31 +0100 Subject: [Buildroot] [git commit] package/prboom: fix build with autoconf >= 2.72 Message-ID: <20240224171605.8505E87A5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd00f0072c490c49c6aadd9f0c43d210144a806e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set ac_cv_type_gid_t=yes to avoid the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: In file included from i_network.c:37: ../../config.h:207:15: error: two or more data types in declaration specifiers 207 | #define gid_t int | ^~~ Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/0d74517129130e6f26dc8c8aacae175ed8bd4b54 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/prboom/prboom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk index 36692d29a3..c1ba05ff70 100644 --- a/package/prboom/prboom.mk +++ b/package/prboom/prboom.mk @@ -6,7 +6,7 @@ PRBOOM_VERSION = 2.5.0 PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION) -PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes +PRBOOM_CONF_ENV = ac_cv_type_gid_t=yes ac_cv_type_uid_t=yes PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer PRBOOM_LICENSE = GPL-2.0+ PRBOOM_LICENSE_FILES = COPYING From peter at korsgaard.com Sat Feb 24 17:11:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:11:10 +0100 Subject: [Buildroot] [git commit] package/tio: needs threads Message-ID: <20240224171605.760AC87A5C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=01f24d041d36c9d132a7888b7fefe8055b4ad321 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master tio needs threads since version 2.4 and https://github.com/tio/tio/commit/93e6efc00153e625e4ceb8a51e01b324247d312a resulting in the following build failure since bump to version 2.7 in commit 4b33d7a47dd41fed5364a398320c2b7d0687ba5e: In file included from /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, from ../src/tty.c:23: /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] 218 | # warning requested reentrant code, but thread support was disabled | ^~~~~~~ ../src/tty.c:43:10: fatal error: pthread.h: No such file or directory 43 | #include | ^~~~~~~~~~~ Fixes: 4b33d7a47dd41fed5364a398320c2b7d0687ba5e - http://autobuild.buildroot.org/results/9b20ff06a0ad24b7e7f4750ebe64e2077e36164a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tio/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/tio/Config.in b/package/tio/Config.in index a84daf8a24..e4241fa5e1 100644 --- a/package/tio/Config.in +++ b/package/tio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TIO bool "tio" depends on !BR2_sparc64 && !BR2_sparc + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_INIH help "tio" is a simple TTY terminal application which features a @@ -14,3 +15,7 @@ config BR2_PACKAGE_TIO # fix or workaround for now comment "tio is disabled for sparc and sparc64 architectures" depends on BR2_sparc64 || BR2_sparc + +comment "tio needs a toolchain w/ threads" + depends on !BR2_sparc64 && !BR2_sparc + depends on !BR2_TOOLCHAIN_HAS_THREADS From peter at korsgaard.com Sat Feb 24 17:14:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sat, 24 Feb 2024 18:14:09 +0100 Subject: [Buildroot] [git commit] package/s390-tools: disable cargo Message-ID: <20240224171605.7E53C87A26@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=120cb19056dc22b11d921714dc4e2ac94b84242f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Set HAVE_CARGO=0 to avoid the following build failures raised since bump to version 2.29.0 in commit 68df20336664d4d0b1a9d8d0285d23eba631845a and https://github.com/ibm-s390-linux/s390-tools/commit/e6add997ebbcd967734391da8a8987c7926e168f: error: could not compile `pvsecret` (bin "pvsecret") due to previous error [...] ERROR: architecture for "/usr/bin/pvsecret" is "AArch64", should be "IBM S/390" Fixes: 68df20336664d4d0b1a9d8d0285d23eba631845a - http://autobuild.buildroot.org/results/22035cb4d8e251f9930a7d529b91b128919252bb - http://autobuild.buildroot.org/results/99be6d3b2bab7c952ce02853f54924c5219aecc1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/s390-tools/s390-tools.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index bc39a9bd19..04d193a467 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -12,7 +12,8 @@ S390_TOOLS_DEPENDENCIES = zlib S390_TOOLS_MAKE_OPTS = \ ARCH=$(BR2_ARCH) \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + HAVE_CARGO=0 ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) S390_TOOLS_DEPENDENCIES += libcurl From bernd at kuhls.net Sat Feb 24 19:01:16 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Sat, 24 Feb 2024 20:01:16 +0100 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> <20240206233318.593730bd@windsurf> <87wmqut14w.fsf__36507.8827760712$1708783134$gmane$org@48ers.dk> Message-ID: Am Sat, 24 Feb 2024 14:58:23 +0100 schrieb Peter Korsgaard: > We unfortunately are still having a number of build failures because of > this, E.G. for target == host Hi, ftr, the host == target problem is solved by using a patch from here: https://github.com/python/cpython/issues/115382#issuecomment-1952936367 Regards, Bernd From ju.o at free.fr Sat Feb 24 19:27:32 2024 From: ju.o at free.fr (Julien Olivain) Date: Sat, 24 Feb 2024 20:27:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/xz: bump to version 5.6.0 Message-ID: <20240224192732.1298236-1-ju.o@free.fr> This commit changes the version branch from 5.4.x to 5.6.x. This old stable 5.4.x branch is expected to be end-of-life. The release note mention in [1]: """ There currently are no plans to maintain the 5.4.x branch, but releases could be made if there is community interest. """ For a change log since 5.4.5, see [2]. The COPYING licence file hash has changed. Most public domain files are now licensed under the Zero-Clause BSD license. This release explicitly set the XZ logo under the CC-by-SA-4.0 license. Due to those changes, the new license files COPYING.0BSD and COPYING.CC-BY-SA-4.0 are added to _LICENSE_FILES and in the hash file. The package homepage URL https://tukaani.org/xz/ now redirects to https://xz.tukaani.org/xz-utils/. This commit updates the homepage URL accordingly in Config.in. Finally, the package download URL moved to Github. This commit changes the _SITE to reflect that change. [1] https://github.com/tukaani-project/xz/releases/tag/v5.6.0 [2] https://github.com/tukaani-project/xz/blob/v5.6.0/NEWS Signed-off-by: Julien Olivain --- Patch tested on branch master at commit fb6274f with commands: make check-package ... 0 warnings generated support/testing/run-tests \ -d dl -o output_folder \ tests.package.test_xz ... OK utils/test-pkg -a -p xz ... 45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed --- package/xz/Config.in | 2 +- package/xz/xz.hash | 8 +++++--- package/xz/xz.mk | 14 ++++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/package/xz/Config.in b/package/xz/Config.in index 687bd554821..7130fa5e8e4 100644 --- a/package/xz/Config.in +++ b/package/xz/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_XZ invoked via appropriate symlinks will emulate the behavior of the commands in the lzma package. - https://tukaani.org/xz/ + https://xz.tukaani.org/xz-utils/ diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3d93ad6b5ee..46edd336bc9 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,9 +1,11 @@ # Locally calculated after checking pgp signature -# https://tukaani.org/xz/xz-5.4.5.tar.bz2.sig -sha256 8ccf5fff868c006f29522e386fb4c6a1b66463fbca65a4cfc3c4bd596e895e79 xz-5.4.5.tar.bz2 +# https://github.com/tukaani-project/xz/releases/download/v5.6.0/xz-5.6.0.tar.bz2.sig +sha256 88c8631cefba91664fdc47b14bb753e1876f4964a07db650821d203992b1e1ea xz-5.6.0.tar.bz2 # Hash for license files -sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING +sha256 0864e508475f20b43a2393957fdb5a966558099ffa8fed1e3e73fe2b3eebb145 COPYING +sha256 0b01625d853911cd0e2e088dcfb743261034a091bb379246cb25a14cc4c74bf1 COPYING.0BSD +sha256 23ee78c8bae49cf08ea2f0c84945c66b987ebe4520881fb51b3dad4fb43d07c2 COPYING.CC-BY-SA-4.0 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING.GPLv3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 547959c743d..88c79254943 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,13 +4,19 @@ # ################################################################################ -XZ_VERSION = 5.4.5 +XZ_VERSION = 5.6.0 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 -XZ_SITE = https://tukaani.org/xz +XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ -XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 +XZ_LICENSE = Public Domain, 0BSD, CC-BY-SA-4.0 (logo), GPL-2.0+, GPL-3.0+, LGPL-2.1+ +XZ_LICENSE_FILES = \ + COPYING \ + COPYING.0BSD \ + COPYING.CC-BY-SA-4.0 \ + COPYING.GPLv2 \ + COPYING.GPLv3 \ + COPYING.LGPLv2.1 XZ_CPE_ID_VENDOR = tukaani ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -- 2.43.2 From giulio.benetti at benettiengineering.com Sat Feb 24 20:02:09 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 24 Feb 2024 21:02:09 +0100 Subject: [Buildroot] [PATCH v7] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: References: <20240222130716.1311432-1-fancp2007@gmail.com> <20240223131603.2313178-1-fancp2007@gmail.com> <197750aa-c25f-44d9-89ac-872053953422@benettiengineering.com> Message-ID: Hi Scott, On 24/02/24 11:31, Scott Fan wrote: > Hi Giulio, > > The BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is for the ethernet port > on the board. > Without the config, the eth0 interface will be not accessible. > The `ifconfig eth0` command will report error: Device not found Ok, sounds good. So can you please report it in the commit log and.. > > Scott Fan > > On Sat, Feb 24, 2024 at 12:24?AM Giulio Benetti > wrote: >> >> Hi Scott, >> >> On 23/02/24 14:15, Scott Fan wrote: >> >> [ SNIP ] >> >>> + >>> +# System >>> +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" ...in a comment here? >>> +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y >> >> What do you need MDEV by default for? Is there some peripheral that >> needs to show up automatically otherwise the basic functionality is >> compromised? Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:37 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:37 +0100 Subject: [Buildroot] [PATCH v6 00/16] Add support for AM62x-SK HS-FS devices Message-ID: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> The SK-AM62B-P1 is the newest version of SK-AM62 which includes high-security field-securable (HS-FS) silicon to optionally customize keys and encryption for security applications. This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, which, however, was buggy. This series fixes the errors and bumps the Linux kernel and U-Boot required for such a new device. Dario Binacchi (16): configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version boot/ti-k3-r5-loader: bump to version 2024.01 package/python-attrs: add host variant package/python-rpds-py: add host variant package/python-referencing: add host variant package/python-jsonschema-specifications: add host variant package/python-jsonschema: add host variant boot/ti-k3-r5-loader: set binman environment boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 board/ti/am62x-sk/genimage.cfg | 7 ++- board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++ boot/ti-k3-image-gen/Config.in | 61 ++----------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/ti-k3-r5-loader/Config.in | 5 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 12 +++- boot/uboot/Config.in | 23 +++---- boot/uboot/uboot.mk | 12 +++- configs/ti_am62x_sk_defconfig | 22 ++++--- configs/ti_am64x_sk_defconfig | 7 ++- package/Config.in | 1 + package/python-attrs/python-attrs.mk | 6 ++ .../python-jsonschema-specifications.mk | 10 +++ .../python-jsonschema/python-jsonschema.mk | 14 +++++ .../python-referencing/python-referencing.mk | 11 ++++ package/python-rpds-py/python-rpds-py.mk | 1 + package/ti-k3/Config.in | 60 ++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 20 files changed, 232 insertions(+), 87 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:38 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:38 +0100 Subject: [Buildroot] [PATCH v6 01/16] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-2-dario.binacchi@amarulasolutions.com> Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update commit message Changes in v5: - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c68..c3ad555a8184 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:39 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:39 +0100 Subject: [Buildroot] [PATCH v6 02/16] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-3-dario.binacchi@amarulasolutions.com> Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am64x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am64x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update commit message Changes in v5: - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8d3..097175bd8f39 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:40 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:40 +0100 Subject: [Buildroot] [PATCH v6 03/16] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-4-dario.binacchi@amarulasolutions.com> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a8184..a129e216d25b 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:41 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:41 +0100 Subject: [Buildroot] [PATCH v6 04/16] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-5-dario.binacchi@amarulasolutions.com> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f39..26195194c7d6 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:43 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:43 +0100 Subject: [Buildroot] [PATCH v6 06/16] package/python-attrs: add host variant In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-7-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc4402..fb1729e62fa2 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:42 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:42 +0100 Subject: [Buildroot] [PATCH v6 05/16] boot/ti-k3-r5-loader: bump to version 2024.01 In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-6-dario.binacchi@amarulasolutions.com> All in-tree configs with the ti-k3-r5 bootloader use a custom version, so this patch is mostly for the menuconfig default version Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5a8..5f86c045c99f 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -16,7 +16,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2022.10" + bool "2024.01" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -60,7 +60,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index c5d1cb8e09f0..fbe5d215409d 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:44 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:44 +0100 Subject: [Buildroot] [PATCH v6 07/16] package/python-rpds-py: add host variant In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-8-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4fde..cee2ff290a4e 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:45 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:45 +0100 Subject: [Buildroot] [PATCH v6 08/16] package/python-referencing: add host variant In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-9-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-referencing/python-referencing.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e913a..66d59ed8091a 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_REFERENCING_DEPENDENCIES += \ + host-python-attrs \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:46 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:46 +0100 Subject: [Buildroot] [PATCH v6 09/16] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-10-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes since v3 Changes in v3: - Drop Config.in.host package/python-jsonschema-specifications.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9d4..653c839bb450 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,14 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES += \ + host-python-referencing + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:47 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:47 +0100 Subject: [Buildroot] [PATCH v6 10/16] package/python-jsonschema: add host variant In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-11-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa7752..9e8b6e18b876 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \ + host-python-attrs \ + host-python-jsonschema-specifications \ + host-python-referencing \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:48 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:48 +0100 Subject: [Buildroot] [PATCH v6 11/16] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-12-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. The patch set the BINMAN_INDIRS environment variable to provide the directory to search for binary blobs and select the packages required by binman. The dependency of binman is not really easy to follow. First we have the packages list from binman.rst [1] then we have to install additional python modules [2]. Maybe in the future it will be necessary to add host-lzma and host-lz4 in the dependencies list. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update the commit message adding the links of requirements. Changes in v5: - Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - Drop runtime dependecies - Add host-python-pylibfdt dependency without requiring BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration - Add host-python3 and host-python-setuptools dependencies - Add SOB and COB tags of Romain Naour Changes in v4: - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Changes in v2: - Change commit message - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Select packages required by binman if BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled boot/ti-k3-r5-loader/Config.in | 1 + boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f86c045c99f..fc71337e80cc 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema help Separate U-Boot SPL build for R5 core on TI's K3 processors. Usually used to build tiboot3.bin with k3-image-gen. diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f2e..fdb058f3b72a 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python-jsonschema \ + host-python-pyyaml \ + host-python3 \ + host-python-setuptools \ + host-python-pylibfdt TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -58,6 +63,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + BINMAN_INDIRS=$(BINARIES_DIR) \ HOSTLDFLAGS="$(HOST_LDFLAGS)" define TI_K3_R5_LOADER_BUILD_CMDS -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:49 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:49 +0100 Subject: [Buildroot] [PATCH v6 12/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-13-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. The binman requirement is directly included in buildman dependency (tools/buildman/requirements.txt) since within U-Boot, binman is invoked by the build system, here buildman [1]. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - BR2_TARGET_UBOOT_USE_BINMAN - Binman tool is not specific to TI K3 platform, so add an option to specify the use of Binman in U-Boot. - Add runtime dependencies - Update commit message - Add SOB and COB tags of Romain Naour Changes in v5: - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" from UBOOT_MAKE_OPTS. no changes since v1: boot/uboot/Config.in | 11 +++++++++++ boot/uboot/uboot.mk | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930db..e6e7956adccb 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -290,6 +290,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN This option makes sure that the needed binary blobs are copied into the U-Boot source directory. +config BR2_TARGET_UBOOT_USE_BINMAN + bool "U-Boot use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a88059..9157a4b738c3 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -187,10 +187,12 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware +ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif +endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) UBOOT_DEPENDENCIES += opensbi @@ -269,6 +271,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) UBOOT_DEPENDENCIES += host-vim endif +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +UBOOT_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:50 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:50 +0100 Subject: [Buildroot] [PATCH v6 13/16] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-14-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot can use Binman to compile and sign the generated binaries, thus making the use of custom tools like ti-k3-image-gen no longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were configured and used outside of it. This patch allows setting such options even if the package is not enabled. The patch makes an exception to the Buildroot rule "no subdirectory in package directory". Signed-off-by: Dario Binacchi --- Changes in v6: - Move BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME to ti-k3 (BR2_PACKAGE_TI_K3_DM). - Disable BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X Changes in v5: - Add SOB tag - Move the new ti-k3 from boot to package Added in v4 boot/ti-k3-image-gen/Config.in | 61 ++----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/uboot/Config.in | 12 +---- boot/uboot/uboot.mk | 2 +- configs/ti_am62x_sk_defconfig | 3 +- configs/ti_am64x_sk_defconfig | 3 +- package/Config.in | 1 + package/ti-k3/Config.in | 60 ++++++++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 9 files changed, 80 insertions(+), 73 deletions(-) create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e911..a57319f4be6d 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk index 64be9a18f2c4..aca29bcf1bd4 100644 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ $(BR2_MAKE_HOST_DEPENDENCY) TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index e6e7956adccb..821854d08acc 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -244,21 +244,11 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" # We use the SoC selection defined for the ti-k3-image-gen # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM - -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME - string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - -endif - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 9157a4b738c3..c21fe7c99fc1 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -189,7 +189,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) UBOOT_DEPENDENCIES += ti-k3-boot-firmware ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_PACKAGE_TI_K3_DM_SOCNAME)) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a129e216d25b..2835404a57df 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM62X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 26195194c7d6..566cbbe4824f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM64X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/package/Config.in b/package/Config.in index bf0fe078b955..6d3ed34e121b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -629,6 +629,7 @@ endmenu source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" + source "package/ti-k3/Config.in" source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" source "package/ti-sgx-um/Config.in" diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in new file mode 100644 index 000000000000..b8545b7bca62 --- /dev/null +++ b/package/ti-k3/Config.in @@ -0,0 +1,60 @@ +config BR2_PACKAGE_TI_K3 + bool "TI K3" + help + The TI K3 SOC specific selections. + +if BR2_PACKAGE_TI_K3 + +choice + prompt "SoC family" + +config BR2_PACKAGE_TI_K3_SOC_AM62AX + bool "am62ax" + +config BR2_PACKAGE_TI_K3_SOC_AM62X + bool "am62x" + +config BR2_PACKAGE_TI_K3_SOC_AM64X + bool "am64x" + +config BR2_PACKAGE_TI_K3_SOC_AM65X + bool "am65x" + +endchoice + +choice + prompt "Security type" + help + The target SoC security type option. + +config BR2_PACKAGE_TI_K3_SECTYPE_GP + bool "gp" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + bool "hs-fs" + depends on !BR2_PACKAGE_TI_K3_SOC_AM65X + +config BR2_PACKAGE_TI_K3_SECTYPE_HS + bool "hs" + +endchoice + +config BR2_PACKAGE_TI_K3_SOC + string + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X + +config BR2_PACKAGE_TI_K3_SECTYPE + string + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS + +config BR2_PACKAGE_TI_K3_DM_SOCNAME + string + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X + +endif diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk new file mode 100644 index 000000000000..a2da29f5148c --- /dev/null +++ b/package/ti-k3/ti-k3.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# ti-k3 +# +################################################################################ + +include $(sort $(wildcard package/ti-k3/*/*.mk)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:51 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:51 +0100 Subject: [Buildroot] [PATCH v6 14/16] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-15-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot are capable of building tiboot3.bin using Binman. In this case, let's copy it to the binaries directory. Signed-off-by: Dario Binacchi --- Changes in v6: - Replace `find' command with `cp' one. Changes in v5: - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin Added in v4 boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index fdb058f3b72a..cbdb653278f8 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) + define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin endef $(eval $(kconfig-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:52 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:52 +0100 Subject: [Buildroot] [PATCH v6 15/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-16-dario.binacchi@amarulasolutions.com> The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v6: - Enable BR2_TARGET_UBOOT_USE_BINMAN option Changes in v5: - Update commit message. Changes in v4: - bump to 204.01 instead of 2023.10 - Update the commit message - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. Changes in v2: - Update the commit message - Drop Python options required by binman. - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically selects the Python modules required by binman. board/ti/am62x-sk/genimage.cfg | 7 ++++- board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++++++++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++++ configs/ti_am62x_sk_defconfig | 13 +++++---- 4 files changed, 67 insertions(+), 7 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg index 26304fe98f99..398209f4d831 100644 --- a/board/ti/am62x-sk/genimage.cfg +++ b/board/ti/am62x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh new file mode 100755 index 000000000000..0f1f98ef217a --- /dev/null +++ b/board/ti/am62x-sk/post-build.sh @@ -0,0 +1,49 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:r:x:' +O='console:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing argument" +[ -n "${ROOT}" ] || die "Missing argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label am62x-sk-buildroot + kernel /Image + fdtdir / + append ${append} + __HEADER_EOF diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh new file mode 100755 index 000000000000..34f732c091ad --- /dev/null +++ b/board/ti/am62x-sk/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh -x + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 2835404a57df..484f9feb8c61 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_PACKAGE_TI_K3=y @@ -24,20 +24,21 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" -BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Sat Feb 24 20:56:53 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Sat, 24 Feb 2024 21:56:53 +0100 Subject: [Buildroot] [PATCH v6 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v5: - Bump to 6.6.17 from 6.6.1 - Update commit message Changes in v4: - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. no changes since v1 configs/ti_am62x_sk_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 484f9feb8c61..8c962b4a9494 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -- 2.43.0 From fontaine.fabrice at gmail.com Sat Feb 24 21:30:08 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 24 Feb 2024 22:30:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: fix linux-pam select Message-ID: <20240224213008.670294-1-fontaine.fabrice@gmail.com> Commit 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb forgot to handle linux-pam dependencies resulting in the following build failure: WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=y] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=y] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] [...] configure: error: in `/home/autobuild/autobuild/instance-12/output-1/build/linux-pam-1.6.0': configure: error: failed to find dlopen Fixes: 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb - http://autobuild.buildroot.org/results/c0aac8bed08850e07cb94f501d754c3c64cdfe07 Signed-off-by: Fabrice Fontaine --- package/openssh/Config.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index a3038ba01f..c108569547 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_OPENSSH bool "openssh" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION + select BR2_PACKAGE_LINUX_PAM if \ + BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION && \ + BR2_ENABLE_LOCALE && BR2_USE_WCHAR && \ + !BR2_STATIC_LIBS && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help -- 2.43.0 From giulio.benetti at benettiengineering.com Sat Feb 24 21:41:13 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 24 Feb 2024 22:41:13 +0100 Subject: [Buildroot] [PATCH] package/mongoose: bump to version 7.13 Message-ID: <20240224214113.58103-1-giulio.benetti@benettiengineering.com> https://github.com/cesanta/mongoose/releases/tag/7.13 Signed-off-by: Giulio Benetti --- package/mongoose/mongoose.hash | 2 +- package/mongoose/mongoose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index ed5db5ebf6..716833eeed 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 91e719e164816b349be3cb71293927f3f6abbe3fb02187e2d9b5e56f542c2063 mongoose-7.12.tar.gz +sha256 5c9dc8d1d1762ef483b6d2fbf5234e421ca944b722225bb533d2d0507b118a0f mongoose-7.13.tar.gz sha256 4ba646f5a7012d8b52f3a74398e446f56960dde0572f7241a2215430da5dd5a2 LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 74594ff48c..e2e3be790a 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.12 +MONGOOSE_VERSION = 7.13 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE -- 2.34.1 From fontaine.fabrice at gmail.com Sat Feb 24 21:46:01 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 24 Feb 2024 22:46:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/redis-plus-plus: needs threads Message-ID: <20240224214601.680607-1-fontaine.fabrice@gmail.com> redis-plus-plus unconditonally uses mutex and so needs threads since its addition in commit c46df9de21e718a9ed6a2df2bb945c386695d3bf and https://github.com/sewenew/redis-plus-plus/commit/1fa8f6bbfb24c8f328aa23ee1dd3c3f99c1b4caf: In file included from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.h:27, from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.cpp:17: /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/sentinel.h:95:10: error: 'mutex' in namespace 'std' does not name a type 95 | std::mutex _mutex; | ^~~~~ Fixes: c46df9de21e718a9ed6a2df2bb945c386695d3bf - http://autobuild.buildroot.org/results/cc4c54134e8a522b4c028aab4266f47cf862e2a9 Signed-off-by: Fabrice Fontaine --- package/redis-plus-plus/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/redis-plus-plus/Config.in b/package/redis-plus-plus/Config.in index 6a21aee2b3..64a84102d4 100644 --- a/package/redis-plus-plus/Config.in +++ b/package/redis-plus-plus/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_REDIS_PLUS_PLUS bool "redis-plus-plus" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_HIREDIS help Redis client written in C++ @@ -11,5 +12,5 @@ config BR2_PACKAGE_REDIS_PLUS_PLUS https://github.com/sewenew/redis-plus-plus -comment "redis-plus-plus needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "redis-plus-plus needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS -- 2.43.0 From giulio.benetti at benettiengineering.com Sat Feb 24 21:59:55 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 24 Feb 2024 22:59:55 +0100 Subject: [Buildroot] [PATCH] configs/friendlyarm_nanopi_r2s: bump Linux to 6.6.18 and U-Boot to 2024.01 In-Reply-To: <20240224103354.7763-1-fancp2007@gmail.com> References: <20240224103354.7763-1-fancp2007@gmail.com> Message-ID: <5e4c1a0f-7b41-4510-b87d-2392c832f3c1@benettiengineering.com> Hi Scott, please read all before changing, On 24/02/24 11:33, Scott Fan wrote: > The ATF firmware also bumps to version 2.7, and the bootloader image only > needs the u-boot-rockchip.bin file. > > This commit adds support for internal ethernet port (RTL8211E), and also > adds USB 3.0 ethernet port firmware for RTL8153B chip on the board. > > The associated board files are also updated, notes for the NEO3 board is > removed from the readme file. > > The .checkpackageignore file is updated accordingly (the entry for > post-build.sh is removed). > > Tested on the NanoPi R2S board. > Can you please list all the points using "*" like below? This commit: * bump u-boot version to 2024.01 * bump Linux version to 6.6.18 * update ATF version to 2.7 * switch u-boot image to u-boot-rockchip.bin since ATF 2.7 requires it * ... etc. This way everything is clearer > Wiki link for the board: > https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S > > Signed-off-by: Scott Fan > --- > .checkpackageignore | 1 - > board/friendlyarm/nanopi-r2s/extlinux.conf | 4 +-- > board/friendlyarm/nanopi-r2s/genimage.cfg | 10 ++---- > board/friendlyarm/nanopi-r2s/post-build.sh | 4 +-- > board/friendlyarm/nanopi-r2s/readme.txt | 20 ++++------- > configs/friendlyarm_nanopi_r2s_defconfig | 39 +++++++++++++++++----- > 6 files changed, 43 insertions(+), 35 deletions(-) > > diff --git a/.checkpackageignore b/.checkpackageignore > index 4967d749fa..08188dc23e 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -33,7 +33,6 @@ board/cubietech/cubieboard2/post-image.sh Shellcheck > board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck > board/freescale/common/mxs/post-image.sh Shellcheck > board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch Upstream > -board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck > board/hardkernel/odroidc2/post-image.sh Shellcheck > board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables > board/hardkernel/odroidxu4/post-image.sh EmptyLastLine Shellcheck > diff --git a/board/friendlyarm/nanopi-r2s/extlinux.conf b/board/friendlyarm/nanopi-r2s/extlinux.conf > index 1ea0cdd8a5..b2897dea8b 100644 > --- a/board/friendlyarm/nanopi-r2s/extlinux.conf > +++ b/board/friendlyarm/nanopi-r2s/extlinux.conf > @@ -1,4 +1,4 @@ > -label NanoPi R2S linux > +label friendlyarm-nanopi-buildroot Please add this change to commit log(* update extlinux.conf label name to friendlyarm-nanopi-buildroot). > kernel /boot/Image > devicetree /boot/rk3328-nanopi-r2s.dtb > - append root=/dev/mmcblk0p1 rw rootwait > + append console=ttyS2,1500000 earlyprintk root=/dev/mmcblk0p1 rootwait why is console required now? Please add it to commit log > diff --git a/board/friendlyarm/nanopi-r2s/genimage.cfg b/board/friendlyarm/nanopi-r2s/genimage.cfg > index a686b4f14e..98e96a7ddd 100644 > --- a/board/friendlyarm/nanopi-r2s/genimage.cfg > +++ b/board/friendlyarm/nanopi-r2s/genimage.cfg > @@ -4,19 +4,13 @@ image sdcard.img { > > partition u-boot-tpl-spl-dtb { > in-partition-table = "no" > - image = "idbloader.img" > + image = "u-boot-rockchip.bin" > offset = 32K > } > > - partition u-boot-dtb { > - in-partition-table = "no" > - image = "u-boot.itb" > - offset = 8M > - } > - > partition rootfs { > partition-type = 0x83 > - offset = 16M > image = "rootfs.ext4" > + offset = 10M Please keep the offset position the same and document the reason in commit log > } > } > diff --git a/board/friendlyarm/nanopi-r2s/post-build.sh b/board/friendlyarm/nanopi-r2s/post-build.sh > index 1f5ff6a611..c7ec875068 100755 > --- a/board/friendlyarm/nanopi-r2s/post-build.sh > +++ b/board/friendlyarm/nanopi-r2s/post-build.sh > @@ -1,5 +1,5 @@ > #!/bin/sh > > -BOARD_DIR="$(dirname $0)" > +BOARD_DIR="$(dirname "$0")" Is this mandatory? What changed compared to previous version? > > -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" Same here for "..." Please update commit log with it. > diff --git a/board/friendlyarm/nanopi-r2s/readme.txt b/board/friendlyarm/nanopi-r2s/readme.txt > index 6d291cdd60..d43008b620 100644 > --- a/board/friendlyarm/nanopi-r2s/readme.txt > +++ b/board/friendlyarm/nanopi-r2s/readme.txt > @@ -2,11 +2,11 @@ Intro > ===== > > This default configuration will allow you to start experimenting with the > -buildroot environment for the Nanopi R2S. With the current configuration > +buildroot environment for the NanoPi R2S. With the current configuration Here the same > it will bring-up the board, and allow access through the serial console. > > -Nanopi R2S link: > -https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 > +Wiki link: > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S This too: * update board URL in readme.txt > > This configuration uses ATF, U-Boot mainline and kernel mainline. > > @@ -25,9 +25,6 @@ Files created in output directory > output/images > > ??? bl31.elf > -??? boot.vfat > -??? extlinux > -??? idbloader.img > ??? Image > ??? rk3328-nanopi-r2s.dtb > ??? rootfs.ext2 > @@ -35,7 +32,7 @@ output/images > ??? rootfs.tar > ??? sdcard.img > ??? u-boot.bin > -??? u-boot.itb > +??? u-boot-rockchip.bin > > How to write the SD card > ======================== > @@ -46,12 +43,7 @@ in the output/images/ directory. > Copy the bootable "sdcard.img" onto an SD card with "dd": > > $ sudo dd if=output/images/sdcard.img of=/dev/sdX > - $ sudo sync > + $ sync Ditto > > -Insert the micro SDcard in your Nanopi R2S and power it up. The console > +Insert the micro SDcard in your NanoPi R2S and power it up. The console Ditto but you can group this with 2 points above without adding a dedicated one > is on the serial line, 1500000 8N1. > - > -Notes > -===== > - > -This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board. > diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig > index 284b28ec31..76806e76e7 100644 > --- a/configs/friendlyarm_nanopi_r2s_defconfig > +++ b/configs/friendlyarm_nanopi_r2s_defconfig > @@ -1,42 +1,65 @@ > +# Architecture > BR2_aarch64=y > BR2_cortex_a53=y > BR2_ARM_FPU_VFPV4=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > + > +# Linux headers same as kernel, a 6.6 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > + > +# System > BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" > BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > + > +# Image > BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" > + > +# Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Firmware > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y > + > +# Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" > BR2_TARGET_UBOOT_SPL=y > -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-rockchip.bin" > + > +# Ethernet firmware for RTL8153B > +BR2_PACKAGE_LINUX_FIRMWARE=y > +BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > +BR2_PACKAGE_HOST_MTOOLS=y I think you should split this patch into 2: 1) the versions bumps 2) the beautify of the code This is because there are many changes and it's difficult to check them, for me at least. Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas From fontaine.fabrice at gmail.com Sat Feb 24 22:06:36 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sat, 24 Feb 2024 23:06:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libpsl static build Message-ID: <20240224220636.742198-1-fontaine.fabrice@gmail.com> Fix the following static build failure with libpsl raised since bump to version 8.6.0 in commit 5cee6b6be6524e443012d130e09b0e6983b0ff90: configure:28830: /home/autobuild/autobuild/instance-6/output-1/host/bin/aarch64_be-buildroot-linux-musl-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -static -Werror-implicit-function-declaration -Wno-system-headers -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include -static -L/home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib -L/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/lib conftest.c -lpsl -lmbedtls -lmbedx509 -lmbedcrypto -lz -latomic >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/aarch64_be-buildroot-linux-musl/11.4.0/../../../../aarch64_be-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib/libpsl.a(psl.c.o): in function `is_public_suffix': psl.c:(.text+0x2a8): undefined reference to `idn2_lookup_u8' [...] checking for library containing psl_builtin... no configure: error: libpsl was not found Fixes: 5cee6b6be6524e443012d130e09b0e6983b0ff90 - http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 Signed-off-by: Fabrice Fontaine --- ...igure.ac-find-libpsl-with-pkg-config.patch | 109 ++++++++++++++++++ package/libcurl/libcurl.mk | 2 + 2 files changed, 111 insertions(+) create mode 100644 package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch diff --git a/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch new file mode 100644 index 0000000000..46df1e36a2 --- /dev/null +++ b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch @@ -0,0 +1,109 @@ +From 9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Feb 2024 20:59:25 +0100 +Subject: [PATCH] configure.ac: find libpsl with pkg-config + +Find libpsl with pkg-config to avoid static build failures. + +Ref: http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 + +Signed-off-by: Fabrice Fontaine +Closes #12947 + +Upstream: https://github.com/curl/curl/commit/9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 +--- + configure.ac | 79 ++++++++++++++++++++++++++++++++++++++++++++-------- + docs/TODO | 7 ----- + 2 files changed, 67 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cd0e2d07d8d164..09d5364f4de575 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2075,19 +2075,74 @@ dnl ********************************************************************** + dnl Check for libpsl + dnl ********************************************************************** + +-AC_ARG_WITH(libpsl, +- AS_HELP_STRING([--without-libpsl], +- [disable support for libpsl]), +- with_libpsl=$withval, +- with_libpsl=yes) +-curl_psl_msg="no (libpsl disabled)" +-if test $with_libpsl != "no"; then +- AC_SEARCH_LIBS(psl_builtin, psl, +- [curl_psl_msg="enabled"; +- AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled]) +- ], +- [AC_MSG_ERROR([libpsl was not found]) ] ++dnl Default to compiler & linker defaults for LIBPSL files & libraries. ++OPT_LIBPSL=off ++AC_ARG_WITH(libpsl,dnl ++AS_HELP_STRING([--with-libpsl=PATH],[Where to look for libpsl, PATH points to the LIBPSL installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]) ++AS_HELP_STRING([--without-libpsl], [disable LIBPSL]), ++ OPT_LIBPSL=$withval) ++ ++if test X"$OPT_LIBPSL" != Xno; then ++ dnl backup the pre-libpsl variables ++ CLEANLDFLAGS="$LDFLAGS" ++ CLEANCPPFLAGS="$CPPFLAGS" ++ CLEANLIBS="$LIBS" ++ ++ case "$OPT_LIBPSL" in ++ yes) ++ dnl --with-libpsl (without path) used ++ CURL_CHECK_PKGCONFIG(libpsl) ++ ++ if test "$PKGCONFIG" != "no" ; then ++ LIB_PSL=`$PKGCONFIG --libs-only-l libpsl` ++ LD_PSL=`$PKGCONFIG --libs-only-L libpsl` ++ CPP_PSL=`$PKGCONFIG --cflags-only-I libpsl` ++ else ++ dnl no libpsl pkg-config found ++ LIB_PSL="-lpsl" ++ fi ++ ++ ;; ++ off) ++ dnl no --with-libpsl option given, just check default places ++ LIB_PSL="-lpsl" ++ ;; ++ *) ++ dnl use the given --with-libpsl spot ++ LIB_PSL="-lpsl" ++ PREFIX_PSL=$OPT_LIBPSL ++ ;; ++ esac ++ ++ dnl if given with a prefix, we set -L and -I based on that ++ if test -n "$PREFIX_PSL"; then ++ LD_PSL=-L${PREFIX_PSL}/lib$libsuff ++ CPP_PSL=-I${PREFIX_PSL}/include ++ fi ++ ++ LDFLAGS="$LDFLAGS $LD_PSL" ++ CPPFLAGS="$CPPFLAGS $CPP_PSL" ++ LIBS="$LIB_PSL $LIBS" ++ ++ AC_CHECK_LIB(psl, psl_builtin, ++ [ ++ AC_CHECK_HEADERS(libpsl.h, ++ curl_psl_msg="enabled" ++ LIBPSL_ENABLED=1 ++ AC_DEFINE(USE_LIBPSL, 1, [if libpsl is in use]) ++ AC_SUBST(USE_LIBPSL, [1]) ++ ) ++ ], ++ dnl not found, revert back to clean variables ++ LDFLAGS=$CLEANLDFLAGS ++ CPPFLAGS=$CLEANCPPFLAGS ++ LIBS=$CLEANLIBS + ) ++ ++ if test X"$OPT_LIBPSL" != Xoff && ++ test "$LIBPSL_ENABLED" != "1"; then ++ AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!]) ++ fi + fi + AM_CONDITIONAL([USE_LIBPSL], [test "$curl_psl_msg" = "enabled"]) + diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 9dafe90c82..4281cfabb1 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -14,6 +14,8 @@ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_INSTALL_STAGING = YES +# 0001-configure.ac-find-libpsl-with-pkg-config.patch +LIBCURL_AUTORECONF = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') # support because it uses fork(), which doesn't work on non-MMU platforms. -- 2.43.0 From giulio.benetti at benettiengineering.com Sat Feb 24 22:21:17 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sat, 24 Feb 2024 23:21:17 +0100 Subject: [Buildroot] [PATCH] configs/beaglebone_defconfig: bump Linux to 6.1.69-ti-r25 and U-Boot to 2024.01 In-Reply-To: <20240224105554.17996-1-fancp2007@gmail.com> References: <20240224105554.17996-1-fancp2007@gmail.com> Message-ID: <4adf0b79-816e-45cb-b363-0ed25b59b6d0@benettiengineering.com> Hi Scott, On 24/02/24 11:55, Scott Fan wrote: > Tested on beaglebone black. > > [1] https://github.com/beagleboard/linux/releases/tag/6.1.69-ti-r25 > > Signed-off-by: Scott Fan It looks good to me and I've built successfully using docker-run so: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > --- > configs/beaglebone_defconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig > index e2d67019b1..cdd6591f6d 100644 > --- a/configs/beaglebone_defconfig > +++ b/configs/beaglebone_defconfig > @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" > # Kernel > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.46-ti-r13)/linux-6.1.46-ti-r13.tar.gz" > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.69-ti-r25)/linux-6.1.69-ti-r25.tar.gz" > BR2_LINUX_KERNEL_DEFCONFIG="bb.org" > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" > @@ -31,7 +31,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From peter at korsgaard.com Sun Feb 25 07:39:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:39:34 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.16 In-Reply-To: <20240216055343.24326-1-bernd@kuhls.net> (Bernd Kuhls's message of "Fri, 16 Feb 2024 06:53:43 +0100") References: <20240216055343.24326-1-bernd@kuhls.net> Message-ID: <87edd1t2kp.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.2.16 > Release notes: https://www.php.net/releases/8_2_16.php > Updated license hash due to copyright year bump: > https://github.com/php/php-src/commit/2575e6b88c3d3bbd53383fb65057c9b7b029e264 > Signed-off-by: Bernd Kuhls Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:41:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:41:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: deflate64 needs libzlib In-Reply-To: <20240216194520.1806313-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 16 Feb 2024 20:45:20 +0100") References: <20240216194520.1806313-1-fontaine.fabrice@gmail.com> Message-ID: <87a5npt2h1.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > deflate64 unconditionally uses FAR since its addition with > https://github.com/OSGeo/gdal/commit/d6baebcc73ffc2ede6e9635846676b275b02bab3 > resulting in the following build failure with zlib-ng since bump to > version 3.8.2 in commit d2e349301b79ad3a1840083714ee396f4302b68a: > In file included from /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/infback9.c:6: > /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/minified_zutil.h:46:17: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'uchf' > 46 | typedef uch FAR uchf; > | ^~~~ > Fixes: d2e349301b79ad3a1840083714ee396f4302b68a > - http://autobuild.buildroot.org/results/8b55108dee4faa98c234d00a1a22b62ed948e8d3 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:44:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:44:30 +0100 Subject: [Buildroot] [PATCH 1/1] support/testing: add sox runtime test In-Reply-To: <20240218172547.262368-1-ju.o@free.fr> (Julien Olivain's message of "Sun, 18 Feb 2024 18:25:47 +0100") References: <20240218172547.262368-1-ju.o@free.fr> Message-ID: <875xydt2ch.fsf@48ers.dk> >>>>> "Julien" == Julien Olivain writes: > Signed-off-by: Julien Olivain Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:48:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:48:53 +0100 Subject: [Buildroot] [PATCH] boot/barebox: install all barebox images if none were specified In-Reply-To: <20240219210628.407423-1-a.fatoum@pengutronix.de> (Ahmad Fatoum's message of "Mon, 19 Feb 2024 22:06:28 +0100") References: <20240219210628.407423-1-a.fatoum@pengutronix.de> Message-ID: <871q91t256.fsf@48ers.dk> >>>>> "Ahmad" == Ahmad Fatoum writes: > When selecting barebox in menuconfig, BR2_TARGET_BAREBOX_IMAGE_FILE will > be empty by default, which causes Buildroot to install whatever the > barebox-flash-image symlink points at for barebox versions >= v2012.10.0. > This is an outdated fallback, because barebox-flash-image is only valid > when the barebox build produces a single binary. Virtually all new > defconfigs added in the last couple of years are multiconfig > (CONFIG_PBL_IMAGE=y) however, meaning that a single imx_v7_defconfig > or multi_v8_defconfig will produce many images that support different > boards or even platforms. > As there is no single valid target for barebox-flash-image to point at > in this case, this symlink will point at a non-existing > 'multi-image-build' to alert the user to this fact. > As replacement for barebox-flash-image, barebox commit 550cf79c216a > ("Make list of flash images and fix link all single image cases") first > released with v2015.12.0 creates a barebox-flash-images file with a list > of all images built by barebox. > Have buildroot use that file as a fallback before trying > barebox-flash-image to have a fallback that works for any recent barebox > defconfig as well. > Signed-off-by: Ahmad Fatoum Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:53:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:53:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/redis-plus-plus: needs threads In-Reply-To: <20240224214601.680607-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 24 Feb 2024 22:46:01 +0100") References: <20240224214601.680607-1-fontaine.fabrice@gmail.com> Message-ID: <87wmqtrndv.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > redis-plus-plus unconditonally uses mutex and so needs threads since its > addition in commit c46df9de21e718a9ed6a2df2bb945c386695d3bf and > https://github.com/sewenew/redis-plus-plus/commit/1fa8f6bbfb24c8f328aa23ee1dd3c3f99c1b4caf: > In file included from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.h:27, > from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.cpp:17: > /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/sentinel.h:95:10: error: 'mutex' in namespace 'std' does not name a type > 95 | std::mutex _mutex; > | ^~~~~ > Fixes: c46df9de21e718a9ed6a2df2bb945c386695d3bf > - http://autobuild.buildroot.org/results/cc4c54134e8a522b4c028aab4266f47cf862e2a9 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:55:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:55:19 +0100 Subject: [Buildroot] [PATCH 1/1] package/libcurl: fix libpsl static build In-Reply-To: <20240224220636.742198-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 24 Feb 2024 23:06:36 +0100") References: <20240224220636.742198-1-fontaine.fabrice@gmail.com> Message-ID: <87sf1hrna0.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following static build failure with libpsl raised since bump to > version 8.6.0 in commit 5cee6b6be6524e443012d130e09b0e6983b0ff90: > configure:28830: > /home/autobuild/autobuild/instance-6/output-1/host/bin/aarch64_be-buildroot-linux-musl-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -O3 -g0 -static > -Werror-implicit-function-declaration -Wno-system-headers > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -I/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include > -static > -L/home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib > -L/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/lib > conftest.c -lpsl -lmbedtls -lmbedx509 -lmbedcrypto -lz -latomic >&5 > /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/aarch64_be-buildroot-linux-musl/11.4.0/../../../../aarch64_be-buildroot-linux-musl/bin/ld: > /home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib/libpsl.a(psl.c.o): > in function `is_public_suffix': > psl.c:(.text+0x2a8): undefined reference to `idn2_lookup_u8' > [...] > checking for library containing psl_builtin... no > configure: error: libpsl was not found > Fixes: 5cee6b6be6524e443012d130e09b0e6983b0ff90 > - http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 08:02:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 09:02:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: fix linux-pam select In-Reply-To: <20240224213008.670294-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 24 Feb 2024 22:30:08 +0100") References: <20240224213008.670294-1-fontaine.fabrice@gmail.com> Message-ID: <87o7c5rmyn.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb forgot to handle > linux-pam dependencies resulting in the following build failure: > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM > Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=y] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] > Selected by [y]: > - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM > Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=y] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] > Selected by [y]: > - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] > [...] > configure: error: in `/home/autobuild/autobuild/instance-12/output-1/build/linux-pam-1.6.0': > configure: error: failed to find dlopen > Fixes: 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb > - http://autobuild.buildroot.org/results/c0aac8bed08850e07cb94f501d754c3c64cdfe07 > Signed-off-by: Fabrice Fontaine > --- > package/openssh/Config.in | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > diff --git a/package/openssh/Config.in b/package/openssh/Config.in > index a3038ba01f..c108569547 100644 > --- a/package/openssh/Config.in > +++ b/package/openssh/Config.in > @@ -1,7 +1,10 @@ > config BR2_PACKAGE_OPENSSH > bool "openssh" > depends on BR2_USE_MMU # fork() > - select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION > + select BR2_PACKAGE_LINUX_PAM if \ > + BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION && \ > + BR2_ENABLE_LOCALE && BR2_USE_WCHAR && \ > + !BR2_STATIC_LIBS && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 This stops kconfig from complaining, but does a openssh + refpolicy build without (E.G. ) locale support then actually work? Judging from: commit 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb Author: Adam Duskett Date: Mon Oct 9 16:34:40 2023 +0200 package/openssh: select linux-pam if refpolicy upstream is selected linux-pam is required to login via OpenSSH if the upstream refpolicy for SELinux is enaabled, as linux-pam handles changing user contexts. If a user wants to make their own policy and use a refpolicy via git, we of course should let them do so. As such, only select linux-pam if the upstream version of refpolicy is selected. I am not sure what the proper solution is for situations where pam is not available? Adam? -- Bye, Peter Korsgaard From peter at korsgaard.com Sun Feb 25 07:41:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:41:34 +0100 Subject: [Buildroot] [git commit] package/gdal: deflate64 needs libzlib Message-ID: <20240225080241.5693887A59@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4350d485a441b31ebb1ccb5124f081fda9104132 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master deflate64 unconditionally uses FAR since its addition with https://github.com/OSGeo/gdal/commit/d6baebcc73ffc2ede6e9635846676b275b02bab3 resulting in the following build failure with zlib-ng since bump to version 3.8.2 in commit d2e349301b79ad3a1840083714ee396f4302b68a: In file included from /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/infback9.c:6: /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/minified_zutil.h:46:17: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'uchf' 46 | typedef uch FAR uchf; | ^~~~ Fixes: d2e349301b79ad3a1840083714ee396f4302b68a - http://autobuild.buildroot.org/results/8b55108dee4faa98c234d00a1a22b62ed948e8d3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gdal/gdal.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 3104332db9..247e13663c 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -124,6 +124,12 @@ else GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF endif +ifeq ($(BR2_PACKAGE_LIBZLIB),y) +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=ON +else +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON From peter at korsgaard.com Sun Feb 25 07:52:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:52:46 +0100 Subject: [Buildroot] [git commit] package/redis-plus-plus: needs threads Message-ID: <20240225080241.73E1287A8E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=044752f5631a6fdb330ad57b8c8a5827c6b2bc86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master redis-plus-plus unconditonally uses mutex and so needs threads since its addition in commit c46df9de21e718a9ed6a2df2bb945c386695d3bf and https://github.com/sewenew/redis-plus-plus/commit/1fa8f6bbfb24c8f328aa23ee1dd3c3f99c1b4caf: In file included from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.h:27, from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.cpp:17: /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/sentinel.h:95:10: error: 'mutex' in namespace 'std' does not name a type 95 | std::mutex _mutex; | ^~~~~ Fixes: c46df9de21e718a9ed6a2df2bb945c386695d3bf - http://autobuild.buildroot.org/results/cc4c54134e8a522b4c028aab4266f47cf862e2a9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/redis-plus-plus/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/redis-plus-plus/Config.in b/package/redis-plus-plus/Config.in index 6a21aee2b3..64a84102d4 100644 --- a/package/redis-plus-plus/Config.in +++ b/package/redis-plus-plus/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_REDIS_PLUS_PLUS bool "redis-plus-plus" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_HIREDIS help Redis client written in C++ @@ -11,5 +12,5 @@ config BR2_PACKAGE_REDIS_PLUS_PLUS https://github.com/sewenew/redis-plus-plus -comment "redis-plus-plus needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "redis-plus-plus needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS From peter at korsgaard.com Sun Feb 25 07:53:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:53:34 +0100 Subject: [Buildroot] [git commit] package/libcurl: fix libpsl static build Message-ID: <20240225080241.8061187A90@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bedcd1cd39c7654d1243e2cb0f4a68870f67782c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fix the following static build failure with libpsl raised since bump to version 8.6.0 in commit 5cee6b6be6524e443012d130e09b0e6983b0ff90: configure:28830: /home/autobuild/autobuild/instance-6/output-1/host/bin/aarch64_be-buildroot-linux-musl-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -static -Werror-implicit-function-declaration -Wno-system-headers -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include -static -L/home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib -L/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/lib conftest.c -lpsl -lmbedtls -lmbedx509 -lmbedcrypto -lz -latomic >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/aarch64_be-buildroot-linux-musl/11.4.0/../../../../aarch64_be-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib/libpsl.a(psl.c.o): in function `is_public_suffix': psl.c:(.text+0x2a8): undefined reference to `idn2_lookup_u8' [...] checking for library containing psl_builtin... no configure: error: libpsl was not found Fixes: 5cee6b6be6524e443012d130e09b0e6983b0ff90 - http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...-configure.ac-find-libpsl-with-pkg-config.patch | 109 +++++++++++++++++++++ package/libcurl/libcurl.mk | 2 + 2 files changed, 111 insertions(+) diff --git a/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch new file mode 100644 index 0000000000..46df1e36a2 --- /dev/null +++ b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch @@ -0,0 +1,109 @@ +From 9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Feb 2024 20:59:25 +0100 +Subject: [PATCH] configure.ac: find libpsl with pkg-config + +Find libpsl with pkg-config to avoid static build failures. + +Ref: http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 + +Signed-off-by: Fabrice Fontaine +Closes #12947 + +Upstream: https://github.com/curl/curl/commit/9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 +--- + configure.ac | 79 ++++++++++++++++++++++++++++++++++++++++++++-------- + docs/TODO | 7 ----- + 2 files changed, 67 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cd0e2d07d8d164..09d5364f4de575 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2075,19 +2075,74 @@ dnl ********************************************************************** + dnl Check for libpsl + dnl ********************************************************************** + +-AC_ARG_WITH(libpsl, +- AS_HELP_STRING([--without-libpsl], +- [disable support for libpsl]), +- with_libpsl=$withval, +- with_libpsl=yes) +-curl_psl_msg="no (libpsl disabled)" +-if test $with_libpsl != "no"; then +- AC_SEARCH_LIBS(psl_builtin, psl, +- [curl_psl_msg="enabled"; +- AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled]) +- ], +- [AC_MSG_ERROR([libpsl was not found]) ] ++dnl Default to compiler & linker defaults for LIBPSL files & libraries. ++OPT_LIBPSL=off ++AC_ARG_WITH(libpsl,dnl ++AS_HELP_STRING([--with-libpsl=PATH],[Where to look for libpsl, PATH points to the LIBPSL installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]) ++AS_HELP_STRING([--without-libpsl], [disable LIBPSL]), ++ OPT_LIBPSL=$withval) ++ ++if test X"$OPT_LIBPSL" != Xno; then ++ dnl backup the pre-libpsl variables ++ CLEANLDFLAGS="$LDFLAGS" ++ CLEANCPPFLAGS="$CPPFLAGS" ++ CLEANLIBS="$LIBS" ++ ++ case "$OPT_LIBPSL" in ++ yes) ++ dnl --with-libpsl (without path) used ++ CURL_CHECK_PKGCONFIG(libpsl) ++ ++ if test "$PKGCONFIG" != "no" ; then ++ LIB_PSL=`$PKGCONFIG --libs-only-l libpsl` ++ LD_PSL=`$PKGCONFIG --libs-only-L libpsl` ++ CPP_PSL=`$PKGCONFIG --cflags-only-I libpsl` ++ else ++ dnl no libpsl pkg-config found ++ LIB_PSL="-lpsl" ++ fi ++ ++ ;; ++ off) ++ dnl no --with-libpsl option given, just check default places ++ LIB_PSL="-lpsl" ++ ;; ++ *) ++ dnl use the given --with-libpsl spot ++ LIB_PSL="-lpsl" ++ PREFIX_PSL=$OPT_LIBPSL ++ ;; ++ esac ++ ++ dnl if given with a prefix, we set -L and -I based on that ++ if test -n "$PREFIX_PSL"; then ++ LD_PSL=-L${PREFIX_PSL}/lib$libsuff ++ CPP_PSL=-I${PREFIX_PSL}/include ++ fi ++ ++ LDFLAGS="$LDFLAGS $LD_PSL" ++ CPPFLAGS="$CPPFLAGS $CPP_PSL" ++ LIBS="$LIB_PSL $LIBS" ++ ++ AC_CHECK_LIB(psl, psl_builtin, ++ [ ++ AC_CHECK_HEADERS(libpsl.h, ++ curl_psl_msg="enabled" ++ LIBPSL_ENABLED=1 ++ AC_DEFINE(USE_LIBPSL, 1, [if libpsl is in use]) ++ AC_SUBST(USE_LIBPSL, [1]) ++ ) ++ ], ++ dnl not found, revert back to clean variables ++ LDFLAGS=$CLEANLDFLAGS ++ CPPFLAGS=$CLEANCPPFLAGS ++ LIBS=$CLEANLIBS + ) ++ ++ if test X"$OPT_LIBPSL" != Xoff && ++ test "$LIBPSL_ENABLED" != "1"; then ++ AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!]) ++ fi + fi + AM_CONDITIONAL([USE_LIBPSL], [test "$curl_psl_msg" = "enabled"]) + diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 9dafe90c82..4281cfabb1 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -14,6 +14,8 @@ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_INSTALL_STAGING = YES +# 0001-configure.ac-find-libpsl-with-pkg-config.patch +LIBCURL_AUTORECONF = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') # support because it uses fork(), which doesn't work on non-MMU platforms. From peter at korsgaard.com Sun Feb 25 07:44:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:44:22 +0100 Subject: [Buildroot] [git commit] support/testing: add sox runtime test Message-ID: <20240225080241.591B387A8C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9047058cd8addca8aedf274f2836f1f639c27eef branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_sox.py | 74 +++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0f065bfafb..0bfe91f064 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1849,6 +1849,7 @@ F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py +F: support/testing/tests/package/test_sox.py F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py diff --git a/support/testing/tests/package/test_sox.py b/support/testing/tests/package/test_sox.py new file mode 100644 index 0000000000..74f784a36f --- /dev/null +++ b/support/testing/tests/package/test_sox.py @@ -0,0 +1,74 @@ +import math +import os + +import infra.basetest + + +class TestSox(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_AUBIO=y + BR2_PACKAGE_SOX=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def note_from_freq(self, freq): + """Return a note number from the input frequency in Hertz.""" + return round((12 * math.log(freq / 440) / math.log(2)) + 69) + + def check_audio_note(self, input_file, expected_note): + """Check the input_file include the expected_note.""" + out, ret = self.emulator.run(f"aubionotes {input_file}", timeout=20) + self.assertEqual(ret, 0) + note_found = False + for line in out: + values = line.split() + if len(values) == 3: + note = round(float(values[0])) + if note == expected_note: + note_found = True + self.assertTrue(note_found, "The expected note was not found") + + 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]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("sox --version") + + freq = 440 # General Midi note A3 + expected_note = self.note_from_freq(freq) + wav_file = "ref.wav" + tmpwav_file = "tmp.wav" + + # Generate a sinusoidal tone. + cmd = "sox -V -r 48000 -n -b 16 -c 1" + cmd += f" {wav_file} synth 3 sin {freq} vol -10dB" + self.assertRunOk(cmd) + + # Compute statistics on the generated file. + self.assertRunOk(f"sox {wav_file} -n stat") + + # We check the generated wave file includes the expected note. + self.check_audio_note(wav_file, expected_note) + + # We resample the reference file. + cmd = f"sox -V {wav_file} -r 22050 {tmpwav_file}" + self.assertRunOk(cmd) + + # We should still detect our expected note. + self.check_audio_note(tmpwav_file, expected_note) + + # We convert the file by changing the speed by a factor. + speed_factor = 2 + cmd = f"sox -V {wav_file} {tmpwav_file} speed {speed_factor}" + self.assertRunOk(cmd) + + # We compute the new expected note from this test controller + # side, and check we detect this new note in the audio file. + new_expected_note = self.note_from_freq(freq * speed_factor) + self.check_audio_note(tmpwav_file, new_expected_note) From peter at korsgaard.com Sun Feb 25 07:38:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:38:17 +0100 Subject: [Buildroot] [git commit] package/php: bump version to 8.2.16 Message-ID: <20240225080241.4C92B87A8D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d8982b02b6e875d39ffb78a3200b266650e3addc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Changelog: https://www.php.net/ChangeLog-8.php#8.2.16 Release notes: https://www.php.net/releases/8_2_16.php Updated license hash due to copyright year bump: https://github.com/php/php-src/commit/2575e6b88c3d3bbd53383fb65057c9b7b029e264 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/php/php.hash | 4 ++-- package/php/php.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 7c8736e41c..4ce3616de3 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 php-8.2.15.tar.xz +sha256 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php-8.2.16.tar.xz # License file -sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE +sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c69abd5f31..4daf7f633d 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.15 +PHP_VERSION = 8.2.16 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Sun Feb 25 07:47:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 08:47:21 +0100 Subject: [Buildroot] [git commit] boot/barebox: install all barebox images if none were specified Message-ID: <20240225080241.67A4787A8F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b89648b4d0d1c3ca985d5d97015990caf04e46ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master When selecting barebox in menuconfig, BR2_TARGET_BAREBOX_IMAGE_FILE will be empty by default, which causes Buildroot to install whatever the barebox-flash-image symlink points at for barebox versions >= v2012.10.0. This is an outdated fallback, because barebox-flash-image is only valid when the barebox build produces a single binary. Virtually all new defconfigs added in the last couple of years are multiconfig (CONFIG_PBL_IMAGE=y) however, meaning that a single imx_v7_defconfig or multi_v8_defconfig will produce many images that support different boards or even platforms. As there is no single valid target for barebox-flash-image to point at in this case, this symlink will point at a non-existing 'multi-image-build' to alert the user to this fact. As replacement for barebox-flash-image, barebox commit 550cf79c216a ("Make list of flash images and fix link all single image cases") first released with v2015.12.0 creates a barebox-flash-images file with a list of all images built by barebox. Have buildroot use that file as a fallback before trying barebox-flash-image to have a fallback that works for any recent barebox defconfig as well. Signed-off-by: Ahmad Fatoum Signed-off-by: Peter Korsgaard --- boot/barebox/barebox-aux/Config.in | 9 +++++++-- boot/barebox/barebox.mk | 2 ++ boot/barebox/barebox/Config.in | 9 +++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/boot/barebox/barebox-aux/Config.in b/boot/barebox/barebox-aux/Config.in index d39d24f763..4b0201ea67 100644 --- a/boot/barebox/barebox-aux/Config.in +++ b/boot/barebox/barebox-aux/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_AUX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_AUX_CUSTOM_ENV bool "Generate an environment image" diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 4c9df8d618..fe366989b9 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -151,6 +151,8 @@ $(1)_IMAGE_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE)) define $(1)_INSTALL_IMAGES_CMDS if test -n "$$($(1)_IMAGE_FILES)"; then \ cp -L $$(foreach image,$$($(1)_IMAGE_FILES),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ + elif test -e $$(@D)/barebox-flash-images ; then \ + cp -L $$(foreach image,$$(shell cat $$(@D)/barebox-flash-images),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ elif test -h $$(@D)/barebox-flash-image ; then \ cp -L $$(@D)/barebox-flash-image $$(BINARIES_DIR)/barebox.bin ; \ else \ diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in index 958e294e40..2fd70a84ae 100644 --- a/boot/barebox/barebox/Config.in +++ b/boot/barebox/barebox/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_BAREBOXENV bool "bareboxenv tool in target" From yann.morin.1998 at free.fr Sun Feb 25 09:04:59 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 10:04:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: fix linux-pam select In-Reply-To: <87o7c5rmyn.fsf@48ers.dk> References: <20240224213008.670294-1-fontaine.fabrice@gmail.com> <87o7c5rmyn.fsf@48ers.dk> Message-ID: Peter, Fabrice, All, On 2024-02-25 09:02 +0100, Peter Korsgaard spake thusly: > >>>>> "Fabrice" == Fabrice Fontaine writes: > > Commit 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb forgot to handle > > linux-pam dependencies resulting in the following build failure: [--SNIP--] > This stops kconfig from complaining, but does a openssh + refpolicy build > without (E.G. ) locale support then actually work? Judging from: > commit 2c5a82a29ceb382d53ccb08ffd34a92c142cadbb [--SNIP--] > I am not sure what the proper solution is for situations where pam is > not available? Adam? I already sent a fix for this a while back, and we discussed it with Thomas back at the last dev-days, summarised there: https://lore.kernel.org/buildroot/20240207122726.2aa4be3c at windsurf/ I'll need to send that new iteration soon... Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 25 09:24:21 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 10:24:21 +0100 Subject: [Buildroot] [PATCH] package/openssh: fix dependencies with refpolicy Message-ID: <20240225092421.1468140-1-yann.morin.1998@free.fr> Commit 2c5a82a29ceb (package/openssh: select linux-pam if refpolicy upstream is selected) did not account for the linux-pam dependencies before selecting it, causing unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0xCF227CF4 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] 2c5a82a29ceb made the choice of having openssl bear the responsibility to select linux-pam when the upstream refpolicy version was enabled. Semantically however, the responsibility really lies within refpolicy itself, since that's what imposes linux-pam to openssh. Move the select to refpolicy and drop it from openssh. Then, ensure that linux-pam is only selected when it is available. That means that one may get an openssh that is not linked against linux-pam, when the linux-pam dependencies are not met; refpolicy (by way of libsepol) also has a more stringent requirement on gcc version than linux-pam, so most probably the missing dependencies would be locale, wchar, or a static build. We consider that situation to be a corner case that we do not want to address. In the future, we may have more similar situations, whereby refpolicy would impose other packages be linked with otherwise optional dependencies. If (when) that were (will be) the case, then the proposed mechanism would quickly become ugly; we could then re-assess a nicer way to do that. Until then, this is good ebough. Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Thomas Petazzoni Cc: Fabrice Fontaine --- Changes v1 -> v2: - simplify the logic: have refpolicy bear the select --- package/openssh/Config.in | 1 - package/refpolicy/Config.in | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index a3038ba01f..08d3c7d391 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_OPENSSH bool "openssh" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 0e72b895df..8ae8f0448d 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -36,6 +36,14 @@ choice config BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION bool "Upstream version" + # Consider reworking the following when adding new entries: + # Upstream refpolicy for openssh expects linux-pam to be used + select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_OPENSSH \ + && BR2_USE_MMU \ + && BR2_ENABLE_LOCALE \ + && BR2_USE_WCHAR \ + && !BR2_STATIC_LIBS \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 help Use the refpolicy as provided by Buildroot. -- 2.43.2 From fontaine.fabrice at gmail.com Sun Feb 25 09:24:25 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 25 Feb 2024 10:24:25 +0100 Subject: [Buildroot] [PATCH 1/1] package/gdal: add openssl optional dependency Message-ID: <20240225092425.783094-1-fontaine.fabrice@gmail.com> Signed-off-by: Fabrice Fontaine --- package/gdal/gdal.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 247e13663c..77ffb514c2 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -46,7 +46,6 @@ GDAL_CONF_OPTS = \ -DGDAL_USE_BLOSC=OFF \ -DGDAL_USE_BRUNSLI=OFF \ -DGDAL_USE_CFITSIO=OFF \ - -DGDAL_USE_OPENSSL=OFF \ -DGDAL_USE_CRYPTOPP=OFF \ -DGDAL_USE_CRNLIB=OFF \ -DGDAL_USE_ECW=OFF \ @@ -130,6 +129,13 @@ else GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +GDAL_DEPENDENCIES += openssl +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=ON +else +GDAL_CONF_OPTS += -DGDAL_USE_OPENSSL=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 25 11:21:45 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 12:21:45 +0100 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 In-Reply-To: References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> <20240206233318.593730bd@windsurf> <87wmqut14w.fsf__36507.8827760712$1708783134$gmane$org@48ers.dk> Message-ID: Bernd, All, On 2024-02-24 20:01 +0100, Bernd Kuhls spake thusly: > Am Sat, 24 Feb 2024 14:58:23 +0100 schrieb Peter Korsgaard: > > > We unfortunately are still having a number of build failures because of > > this, E.G. for target == host > > Hi, > > ftr, the host == target problem is solved by using a patch from here: > https://github.com/python/cpython/issues/115382#issuecomment-1952936367 The issue with that, is that none of the upstream maintainers have chimed in to express their view on whether this is the correct approach, or to suggest something else. If we go and carry that patch without upstream feedback, we risk carrying forever without the issue ever being fixed upstream. What happens in other buildsystems, like OE or openWRT? Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From romain.naour at smile.fr Sun Feb 25 11:44:13 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 12:44:13 +0100 Subject: [Buildroot] [PATCH 1/2] configs/qemu_microblaze{be, el}: remove xilinx xemaclite patch needed for qemu < 2.2.0 Message-ID: <20240225114414.2556543-1-romain.naour@smile.fr> We carried a patch for xilinx xemaclite that was made initially for qemu < 2.2.0 [1]. Indeed, between Qemu 0.11.0 and 2.2.0 the devicetree binary blob petalogix-s3adsp1800.dtb (bundled in Qemu sources) used a compatible string 'xlnx,xps-ethernetlite-2.00.b' that was not supported by the Linux kernel [2]. Theses patches could have been removed since Buildroot 2015.02 when this defconfig was tested with Qemu 2.2.0 [3]. [1] https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 [2] https://gitlab.com/qemu-project/qemu/-/commit/c21fd2c79e1fcaf45582f2dd4deb491c257aa9f2 [3] https://gitlab.com/buildroot.org/buildroot/-/commit/312990555c4d7d1cccd26e0728ad0d4ec86820a7 Cc: Waldemar Brodkorb Signed-off-by: Romain Naour --- ...xilinx-xemaclite-add-2.00.b-revision.patch | 34 ------------------- ...xilinx-xemaclite-add-2.00.b-revision.patch | 34 ------------------- configs/qemu_microblazebe_mmu_defconfig | 1 - configs/qemu_microblazeel_mmu_defconfig | 1 - 4 files changed, 70 deletions(-) delete mode 100644 board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch delete mode 100644 board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch diff --git a/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f858..0000000000 --- a/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f858..0000000000 --- a/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index e02b8dae2f..a93ef3564d 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 146bbb67de..0b00b58b4e 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y -- 2.43.0 From peter at korsgaard.com Sun Feb 25 11:43:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 12:43:07 +0100 Subject: [Buildroot] [git commit] Update for 2024.02-rc1 Message-ID: <20240225114420.CBF5887A9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7a9ba7a71e49f11e2c8d28a578ddef3a1ad96064 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Peter Korsgaard --- CHANGES | 59 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 ++++++++--------- docs/website/news.html | 21 +++++++++++++++++ 4 files changed, 93 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index f3c38e7d03..3abd4b2281 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,62 @@ +2024.02-rc1, released February 25th, 2024 + + Fixes all over the tree and new features. + + Toolchain: + + - GDB: Add version 14.1, default to 13.2. + + - uClibc-ng updated to 1.0.45 + + - Bootlin external toolchains updated to 2023.11-1, moving the + stable toolchains to GCC 12.3 / binutils 2.40 / GDB 13.2 / + glibc 2.38 / musl 1.2.4 / uClibc-ng 1.0.45 + + - Add support for building a bare metal toolchain suitable for + building firmware for certain (co-)processors, possibly + using a different CPU architecture than the main Buildroot + configuration. + + Default optimization level changed from optimize for size + (-Os) to optimize for speed (-O2). + + Support: Use the Fraunhofer FKIE JSON files for CVE matching + now that NVD is about to deprecate its feeds. + + New defconfigs: AMD Zynqmp kria kd240 and kr260, zcu104, Avnet + RZBoard V2L, Mangopi MQ1RDW2, NXP i.MX 93 11x11 EVK, QEMU + Riscv64 virt-efi, TI AM574x Industrial Development Kit + + Removed defconfigs: Zynq qmtech + + New packages: binutils-bare-metal, dmenu-wayland, fcft, foot, + firmware-ele-imx, ivi-homescreen, libjwt, libtraceevent, + libtracefs, libutempter, lua-ansicolors, lua-argparse, + lua-conciseserialization, lua-ubjson, minisign, + newlib-bare-metal, python-aiosqlite, python-annotated-types, + python-anyio, python-asyncssh, python-bitarray, + python-cachetools, python-contourpy, python-decouple, + python-fastapi-sessions, python-fastapi, + python-google-api-core, python-google-auth, + python-googleapis-common-protos, python-grpc-requests, + python-grpcio-reflection, python-grpcio, python-httpcore, + python-httpx, python-matplotlib-inline, python-ml-dtypes, + python-multipart, python-pydantic-core, python-pypng, + python-starlette, python-tcolorpy, python-trafaret, + python-urwid-readline, python-uvicorn, rlwrap, tllist + + Removed packages: davinci-bootcount (renamed to + uboot-bootcount), flickcurl, gmpc, libmpd, micropython-lib, + python-crossbar, python-pygame, tinymembench + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpanelr2_.. + #15889: please update meson + #15898: Unable to boot syslinux.efi produced by buildroot (EFI 64-.. + #15910: USB keyboard is not working by default "raspberrypicm4io_.. + #15952: Grub fails to load large rootfs files + 2023.11.1, released January 15th, 2024 Important / security related fixes. diff --git a/Makefile b/Makefile index ac625152c6..dc1271825e 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02-git +export BR2_VERSION := 2024.02-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1701677000 +BR2_VERSION_EPOCH = 1708860000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index e13d94cc5a..ece22e409d 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -75,41 +75,41 @@

    PGP signature

    - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
    diff --git a/docs/website/news.html b/docs/website/news.html index e052c99803..89dc740699 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

    News

      +
    • +
      +
      +
      +

      2024.02-rc1 released

      +

      25 February 2024

      +
      +
      +

      We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

      + +

      Go to the downloads page to pick up the + 2024.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

      +
      +
      +
    • +
    • From romain.naour at smile.fr Sun Feb 25 11:44:14 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 12:44:14 +0100 Subject: [Buildroot] [PATCH 2/2] configs/qemu: update defconfigs to Linux 6.6.18 In-Reply-To: <20240225114414.2556543-1-romain.naour@smile.fr> References: <20240225114414.2556543-1-romain.naour@smile.fr> Message-ID: <20240225114414.2556543-2-romain.naour@smile.fr> Update all qemu defconfigs to the latest Kernel LTS version. Remove m68k kernel patches already in v6.6.x. Signed-off-by: Romain Naour --- ...001-m68k-Fix-invalid-.section-syntax.patch | 97 ------------------- ...001-m68k-Fix-invalid-.section-syntax.patch | 97 ------------------- configs/qemu_aarch64_ebbr_defconfig | 2 +- configs/qemu_aarch64_sbsa_defconfig | 4 +- configs/qemu_aarch64_virt_defconfig | 4 +- configs/qemu_arm_ebbr_defconfig | 2 +- configs/qemu_arm_versatile_defconfig | 4 +- configs/qemu_arm_vexpress_defconfig | 4 +- configs/qemu_arm_vexpress_tz_defconfig | 4 +- configs/qemu_m68k_mcf5208_defconfig | 5 +- configs/qemu_m68k_q800_defconfig | 5 +- configs/qemu_microblazebe_mmu_defconfig | 4 +- configs/qemu_microblazeel_mmu_defconfig | 4 +- configs/qemu_mips32r2_malta_defconfig | 4 +- configs/qemu_mips32r2el_malta_defconfig | 4 +- configs/qemu_mips32r6_malta_defconfig | 4 +- configs/qemu_mips32r6el_malta_defconfig | 4 +- configs/qemu_mips64_malta_defconfig | 4 +- configs/qemu_mips64el_malta_defconfig | 4 +- configs/qemu_mips64r6_malta_defconfig | 4 +- configs/qemu_mips64r6el_malta_defconfig | 4 +- configs/qemu_nios2_10m50_defconfig | 4 +- configs/qemu_or1k_defconfig | 4 +- configs/qemu_ppc64_e5500_defconfig | 4 +- configs/qemu_ppc64_pseries_defconfig | 4 +- configs/qemu_ppc64le_powernv8_defconfig | 4 +- configs/qemu_ppc64le_pseries_defconfig | 4 +- configs/qemu_ppc_bamboo_defconfig | 4 +- configs/qemu_ppc_e500mc_defconfig | 4 +- configs/qemu_ppc_g3beige_defconfig | 4 +- configs/qemu_ppc_mac99_defconfig | 4 +- configs/qemu_ppc_mpc8544ds_defconfig | 4 +- configs/qemu_riscv32_virt_defconfig | 4 +- configs/qemu_riscv64_nommu_virt_defconfig | 4 +- configs/qemu_riscv64_virt_defconfig | 4 +- configs/qemu_riscv64_virt_efi_defconfig | 4 +- configs/qemu_s390x_defconfig | 4 +- configs/qemu_sh4_r2d_defconfig | 4 +- configs/qemu_sh4eb_r2d_defconfig | 4 +- configs/qemu_sparc64_sun4u_defconfig | 4 +- configs/qemu_x86_64_defconfig | 4 +- configs/qemu_x86_defconfig | 4 +- configs/qemu_xtensa_lx60_defconfig | 4 +- configs/qemu_xtensa_lx60_nommu_defconfig | 4 +- 44 files changed, 82 insertions(+), 278 deletions(-) delete mode 100644 board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch delete mode 100644 board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch diff --git a/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch b/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch deleted file mode 100644 index 1f1ed75ae0..0000000000 --- a/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0bb6b7477f5dcfafbdd76eea9c7aa7a5f78d7613 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Fri, 16 Jun 2023 17:36:10 +0200 -Subject: [PATCH] m68k: Fix invalid .section syntax - -gas supports several different forms for .section for ELF targets, -including: - .section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]] -and: - .section "NAME"[, #FLAGS...] - -In several places we use a mix of these two forms: - .section NAME, #FLAGS... - -A current development snapshot of binutils (2.40.50.20230611) treats -this mixed syntax as an error. - -Change to consistently use: - .section NAME, "FLAGS" -as is used elsewhere in the kernel. - -Link: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=m68k&ver=6.4%7Erc6-1%7Eexp1&stamp=1686907300&raw=1 -Signed-off-by: Ben Hutchings -Tested-by: Jan-Benedict Glaw -Link: https://lore.kernel.org/r/ZIyBaueWT9jnTwRC at decadent.org.uk -Signed-off-by: Geert Uytterhoeven -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=922a9bd138101e3e5718f0f4d40dba68ef89bb43 -Signed-off-by: Thomas Petazzoni ---- - arch/m68k/fpsp040/skeleton.S | 4 ++-- - arch/m68k/ifpsp060/os.S | 4 ++-- - arch/m68k/kernel/relocate_kernel.S | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S -index 439395aa6fb4..081922c72daa 100644 ---- a/arch/m68k/fpsp040/skeleton.S -+++ b/arch/m68k/fpsp040/skeleton.S -@@ -499,13 +499,13 @@ in_ea: - dbf %d0,morein - rts - -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: - jbsr fpsp040_die - jbra .Lnotkern - -- .section __ex_table,#alloc -+ .section __ex_table,"a" - .align 4 - - .long in_ea,1b -diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S -index 7a0d6e428066..89e2ec224ab6 100644 ---- a/arch/m68k/ifpsp060/os.S -+++ b/arch/m68k/ifpsp060/os.S -@@ -379,11 +379,11 @@ _060_real_access: - - - | Execption handling for movs access to illegal memory -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: moveq #-1,%d1 - rts --.section __ex_table,#alloc -+.section __ex_table,"a" - .align 4 - .long dmrbuae,1b - .long dmrwuae,1b -diff --git a/arch/m68k/kernel/relocate_kernel.S b/arch/m68k/kernel/relocate_kernel.S -index ab0f1e7d4653..f7667079e08e 100644 ---- a/arch/m68k/kernel/relocate_kernel.S -+++ b/arch/m68k/kernel/relocate_kernel.S -@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcopy),%a4 - 2: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 2b+2 - .previous - -@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcont040),%a4 - 5: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 5b+2 - .previous - --- -2.41.0 - diff --git a/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch b/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch deleted file mode 100644 index 1f1ed75ae0..0000000000 --- a/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0bb6b7477f5dcfafbdd76eea9c7aa7a5f78d7613 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Fri, 16 Jun 2023 17:36:10 +0200 -Subject: [PATCH] m68k: Fix invalid .section syntax - -gas supports several different forms for .section for ELF targets, -including: - .section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]] -and: - .section "NAME"[, #FLAGS...] - -In several places we use a mix of these two forms: - .section NAME, #FLAGS... - -A current development snapshot of binutils (2.40.50.20230611) treats -this mixed syntax as an error. - -Change to consistently use: - .section NAME, "FLAGS" -as is used elsewhere in the kernel. - -Link: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=m68k&ver=6.4%7Erc6-1%7Eexp1&stamp=1686907300&raw=1 -Signed-off-by: Ben Hutchings -Tested-by: Jan-Benedict Glaw -Link: https://lore.kernel.org/r/ZIyBaueWT9jnTwRC at decadent.org.uk -Signed-off-by: Geert Uytterhoeven -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=922a9bd138101e3e5718f0f4d40dba68ef89bb43 -Signed-off-by: Thomas Petazzoni ---- - arch/m68k/fpsp040/skeleton.S | 4 ++-- - arch/m68k/ifpsp060/os.S | 4 ++-- - arch/m68k/kernel/relocate_kernel.S | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S -index 439395aa6fb4..081922c72daa 100644 ---- a/arch/m68k/fpsp040/skeleton.S -+++ b/arch/m68k/fpsp040/skeleton.S -@@ -499,13 +499,13 @@ in_ea: - dbf %d0,morein - rts - -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: - jbsr fpsp040_die - jbra .Lnotkern - -- .section __ex_table,#alloc -+ .section __ex_table,"a" - .align 4 - - .long in_ea,1b -diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S -index 7a0d6e428066..89e2ec224ab6 100644 ---- a/arch/m68k/ifpsp060/os.S -+++ b/arch/m68k/ifpsp060/os.S -@@ -379,11 +379,11 @@ _060_real_access: - - - | Execption handling for movs access to illegal memory -- .section .fixup,#alloc,#execinstr -+ .section .fixup,"ax" - .even - 1: moveq #-1,%d1 - rts --.section __ex_table,#alloc -+.section __ex_table,"a" - .align 4 - .long dmrbuae,1b - .long dmrwuae,1b -diff --git a/arch/m68k/kernel/relocate_kernel.S b/arch/m68k/kernel/relocate_kernel.S -index ab0f1e7d4653..f7667079e08e 100644 ---- a/arch/m68k/kernel/relocate_kernel.S -+++ b/arch/m68k/kernel/relocate_kernel.S -@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcopy),%a4 - 2: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 2b+2 - .previous - -@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel) - lea %pc@(.Lcont040),%a4 - 5: addl #0x00000000,%a4 /* virt_to_phys() */ - -- .section ".m68k_fixup","aw" -+ .section .m68k_fixup,"aw" - .long M68K_FIXUP_MEMOFFSET, 5b+2 - .previous - --- -2.41.0 - diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index 75a892f798..84ab60a60b 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -11,7 +11,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 5acfaea777..06cce72b6e 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-sbsa/a BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-sbsa/genimage.cfg" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_aarch64_virt_defconfig b/configs/qemu_aarch64_virt_defconfig index 1167060308..fedefd6d79 100644 --- a/configs/qemu_aarch64_virt_defconfig +++ b/configs/qemu_aarch64_virt_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index a0520edcf4..ea732721ad 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -12,7 +12,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 7c93ae3e7e..2c73090d5d 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="versatile" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index ccbcc8ea4e..12ec33ed7a 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -20,12 +20,12 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2_SIZE="64M" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index 11a5c98174..76e2431f28 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -17,12 +17,12 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragment" diff --git a/configs/qemu_m68k_mcf5208_defconfig b/configs/qemu_m68k_mcf5208_defconfig index 0c95756a8e..64b906b2e5 100644 --- a/configs/qemu_m68k_mcf5208_defconfig +++ b/configs/qemu_m68k_mcf5208_defconfig @@ -14,15 +14,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config" -BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_m68k_q800_defconfig b/configs/qemu_m68k_q800_defconfig index a3a09ef775..83f3d03c60 100644 --- a/configs/qemu_m68k_q800_defconfig +++ b/configs/qemu_m68k_q800_defconfig @@ -14,15 +14,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config" -BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch" BR2_LINUX_KERNEL_VMLINUX=y # Serial port config diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index a93ef3564d..9266b3e4aa 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 0b00b58b4e..bef418fd51 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips32r2_malta_defconfig b/configs/qemu_mips32r2_malta_defconfig index 1fdc588998..29ab718748 100644 --- a/configs/qemu_mips32r2_malta_defconfig +++ b/configs/qemu_mips32r2_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r2el_malta_defconfig b/configs/qemu_mips32r2el_malta_defconfig index 35d071010d..9f963d26df 100644 --- a/configs/qemu_mips32r2el_malta_defconfig +++ b/configs/qemu_mips32r2el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6_malta_defconfig b/configs/qemu_mips32r6_malta_defconfig index a57347d2a6..b3fa5f5e11 100644 --- a/configs/qemu_mips32r6_malta_defconfig +++ b/configs/qemu_mips32r6_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips32r6el_malta_defconfig b/configs/qemu_mips32r6el_malta_defconfig index 9fb82a76d2..ef98362b5b 100644 --- a/configs/qemu_mips32r6el_malta_defconfig +++ b/configs/qemu_mips32r6el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index f314b123a8..d645f2ffdd 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64el_malta_defconfig b/configs/qemu_mips64el_malta_defconfig index 672c416a09..b64b577abe 100644 --- a/configs/qemu_mips64el_malta_defconfig +++ b/configs/qemu_mips64el_malta_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6_malta_defconfig b/configs/qemu_mips64r6_malta_defconfig index 15dba14cc6..5f7bc13b84 100644 --- a/configs/qemu_mips64r6_malta_defconfig +++ b/configs/qemu_mips64r6_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips64r6el_malta_defconfig b/configs/qemu_mips64r6el_malta_defconfig index 39b9c73bcd..500ec39658 100644 --- a/configs/qemu_mips64r6el_malta_defconfig +++ b/configs/qemu_mips64r6el_malta_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_nios2_10m50_defconfig b/configs/qemu_nios2_10m50_defconfig index 698ff68e5e..327fd99196 100644 --- a/configs/qemu_nios2_10m50_defconfig +++ b/configs/qemu_nios2_10m50_defconfig @@ -1,7 +1,7 @@ BR2_nios2=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="10m50" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux.fragment" BR2_TARGET_ROOTFS_INITRAMFS=y @@ -11,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel needs mkimage BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/qemu_or1k_defconfig b/configs/qemu_or1k_defconfig index 4f1030b35f..3cbe89ce5f 100644 --- a/configs/qemu_or1k_defconfig +++ b/configs/qemu_or1k_defconfig @@ -13,12 +13,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 8e68fae3c2..1f34a50b74 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet64_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc64-e5500/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc64_pseries_defconfig b/configs/qemu_ppc64_pseries_defconfig index 4bc9534166..8c58fec24f 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index 4975a90bc6..23ad5772c2 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index 1cca03053b..207e5f5b40 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index 284982cf2c..1ebd2be5dc 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="44x/bamboo" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-bamboo/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_e500mc_defconfig b/configs/qemu_ppc_e500mc_defconfig index e50484f5a3..75833000e4 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="corenet32_smp" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-e500mc/linux.fragment" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 6c14a1ca90..0234827092 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mac99_defconfig b/configs/qemu_ppc_mac99_defconfig index 33b9ec0d63..b03378b34f 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -6,12 +6,12 @@ BR2_powerpc_7400=y BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="pmac32" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/ppc-mac99/linux.fragment" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index efbc5fc81d..9ae10a9577 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 74a67400ea..56341c768e 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index 9999bcf7f3..34dd1c88ba 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -4,7 +4,7 @@ BR2_RISCV_64=y # BR2_RISCV_USE_MMU is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System BR2_TARGET_GENERIC_GETTY=y @@ -19,7 +19,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 52ad87fa7c..93c65b2727 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y diff --git a/configs/qemu_riscv64_virt_efi_defconfig b/configs/qemu_riscv64_virt_efi_defconfig index 79aadf78ca..0818b8f3aa 100644 --- a/configs/qemu_riscv64_virt_efi_defconfig +++ b/configs/qemu_riscv64_virt_efi_defconfig @@ -1,11 +1,11 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/riscv64-virt-efi/assemble-flash-images support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/riscv64-virt-efi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.69" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 39dae4be2a..a768ca3053 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -13,12 +13,12 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 038a9763c3..e5570dcbab 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sh4eb_r2d_defconfig b/configs/qemu_sh4eb_r2d_defconfig index a8988d4446..468d6567ae 100644 --- a/configs/qemu_sh4eb_r2d_defconfig +++ b/configs/qemu_sh4eb_r2d_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4eb-r2d/linux.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_sparc64_sun4u_defconfig b/configs/qemu_sparc64_sun4u_defconfig index 8a61155411..213083c142 100644 --- a/configs/qemu_sparc64_sun4u_defconfig +++ b/configs/qemu_sparc64_sun4u_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux.config" diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 9e99d9d2b2..030818199b 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 5c6bebd3e3..92764c9852 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 8dcdced01b..d315f2604d 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -16,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index d1d59b9525..16a323db94 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -17,12 +17,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-nommu.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y -- 2.43.0 From fontaine.fabrice at gmail.com Sun Feb 25 13:38:18 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 25 Feb 2024 14:38:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/libpthsem: fix build with autoconf >= 2.72 Message-ID: <20240225133818.1364667-1-fontaine.fabrice@gmail.com> Move fi statement where it belongs to fix the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: checking for stack setup via makecontext... ./configure: line 15863: syntax error near unexpected token `;;' Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/013e0d3f72582ce3675f65786c014518682d703b Signed-off-by: Fabrice Fontaine --- ...lude.m4-fix-build-with-autoconf-2.72.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch diff --git a/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch b/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch new file mode 100644 index 0000000000..0c66482c3a --- /dev/null +++ b/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch @@ -0,0 +1,36 @@ +From 3ec1a1c22142c547bc7f44622291bf0abdc322f1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 25 Feb 2024 14:33:02 +0100 +Subject: [PATCH] acinclude.m4: fix build with autoconf >= 2.72 + +Move fi statement where it belongs to fix the following build failure +with autoconf >= 2.72: + +checking for stack setup via makecontext... ./configure: line 15863: syntax error near unexpected token `;;' + +Fixes: + - http://autobuild.buildroot.org/results/013e0d3f72582ce3675f65786c014518682d703b + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linknx/pthsem/pull/1 +--- + acinclude.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 03b42de..d74889f 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1426,8 +1426,8 @@ ac_cv_stacksetup_$1='guessed:(skaddr),(sksize)' + ]) + dnl # restore original compile environment + CFLAGS="$OCFLAGS" +-])dnl + fi ++])dnl + dnl # extract result ingredients of single cached result value + type=`echo $ac_cv_stacksetup_$1 | sed -e 's;:.*$;;'` + addr=`echo $ac_cv_stacksetup_$1 | sed -e 's;^.*:;;' -e 's;,.*$;;'` +-- +2.43.0 + -- 2.43.0 From fancp2007 at gmail.com Sun Feb 25 14:04:33 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Sun, 25 Feb 2024 22:04:33 +0800 Subject: [Buildroot] [PATCH v8] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240223131603.2313178-1-fancp2007@gmail.com> References: <20240223131603.2313178-1-fancp2007@gmail.com> Message-ID: <20240225140434.7310-1-fancp2007@gmail.com> Add support for the FriendlyARM NanoPi NEO2 with mainline components: - ATF v2.7 - U-Boot 2024.01 - Linux 6.6.18 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV allows the ethernet driver to be automatically loaded on boot. Otherwise, it will report the 'device not found' error while run the 'ifconfig eth0' command. Board's wiki page: - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 Signed-off-by: Scott Fan --- Changes v1 -> v2: - Fix issues from 'utils/docker-run make check-package' - Add atf custom version in the defconfig - No need for sudo to run sync Changes v2 -> v3: - Update patch file, add the upstream tag Changes v3 -> v4: - Use a single integrated image file (u-boot-sunxi-with-spl.bin) - Remove patch file for uboot, switch to binman - Merge boot partition into rootfs partition - Bump kernel version to 6.1.61 Changes v4 -> v5: - Bump kernel version to 6.1.65 Changes v5 -> v6: - Bump kernel version to 6.6.17 - Bump uboot version to 2024.01 - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y Changes v6 -> v7: - Bump kernel version to 6.6.18 - Add option BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y - Resort sections in the defconfig Changes v7 -> v8: - Update commit log to add ATF version - Update commit log to add explanation for the MDEV config --- board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ board/friendlyarm/nanopi-neo2/genimage.cfg | 16 ++++++ board/friendlyarm/nanopi-neo2/post-build.sh | 5 ++ board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++ configs/friendlyarm_nanopi_neo2_defconfig | 57 +++++++++++++++++++++ 5 files changed, 116 insertions(+) create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf new file mode 100644 index 0000000000..482a069f74 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf @@ -0,0 +1,4 @@ +label friendlyarm-nanopi-buildroot + kernel /boot/Image + devicetree /boot/sun50i-h5-nanopi-neo2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg new file mode 100644 index 0000000000..67e4e5efdb --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg @@ -0,0 +1,16 @@ +image sdcard.img { + hdimage { + } + + partition u-boot-tpl-spl-dtb { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + offset = 1M + } +} diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh new file mode 100755 index 0000000000..c7ec875068 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt new file mode 100644 index 0000000000..c896a57525 --- /dev/null +++ b/board/friendlyarm/nanopi-neo2/readme.txt @@ -0,0 +1,34 @@ +Intro +===== + +This default configuration will allow you to start experimenting with the +buildroot environment for the NanoPi NEO2. With the current configuration +it will bring-up the board, and allow access through the serial console. + +Wiki link: +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 + +This configuration uses U-Boot mainline and kernel mainline. + +How to build +============ + + $ make friendlyarm_nanopi_neo2_defconfig + $ make + +Note: you will need access to the internet to download the required +sources. + +How to write the SD card +======================== + +Once the build process is finished you will have an image called "sdcard.img" +in the output/images/ directory. + +Copy the bootable "sdcard.img" onto an SD card with "dd": + + $ sudo dd if=output/images/sdcard.img of=/dev/sdX + $ sync + +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console +is on the serial line, 115200 8N1. diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig new file mode 100644 index 0000000000..3118d45625 --- /dev/null +++ b/configs/friendlyarm_nanopi_neo2_defconfig @@ -0,0 +1,57 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a53=y +BR2_ARM_FPU_VFPV4=y + +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y + +# System +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y + +# Image +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y -- 2.34.1 From fancp2007 at gmail.com Sun Feb 25 14:25:40 2024 From: fancp2007 at gmail.com (Scott Fan) Date: Sun, 25 Feb 2024 22:25:40 +0800 Subject: [Buildroot] [PATCH] configs/friendlyarm_nanopi_r2s: bump Linux to 6.6.18 and U-Boot to 2024.01 In-Reply-To: <5e4c1a0f-7b41-4510-b87d-2392c832f3c1@benettiengineering.com> References: <20240224103354.7763-1-fancp2007@gmail.com> <5e4c1a0f-7b41-4510-b87d-2392c832f3c1@benettiengineering.com> Message-ID: Hi Giulio, I'll follow your advice in the next few days. Scott Fan On Sun, Feb 25, 2024 at 5:59?AM Giulio Benetti wrote: > > Hi Scott, > > please read all before changing, > > On 24/02/24 11:33, Scott Fan wrote: > > The ATF firmware also bumps to version 2.7, and the bootloader image only > > needs the u-boot-rockchip.bin file. > > > > This commit adds support for internal ethernet port (RTL8211E), and also > > adds USB 3.0 ethernet port firmware for RTL8153B chip on the board. > > > > The associated board files are also updated, notes for the NEO3 board is > > removed from the readme file. > > > > The .checkpackageignore file is updated accordingly (the entry for > > post-build.sh is removed). > > > > Tested on the NanoPi R2S board. > > > > Can you please list all the points using "*" like below? > > This commit: > * bump u-boot version to 2024.01 > * bump Linux version to 6.6.18 > * update ATF version to 2.7 > * switch u-boot image to u-boot-rockchip.bin since ATF 2.7 requires it > * ... > etc. > > This way everything is clearer > > > Wiki link for the board: > > https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S > > > > Signed-off-by: Scott Fan > > --- > > .checkpackageignore | 1 - > > board/friendlyarm/nanopi-r2s/extlinux.conf | 4 +-- > > board/friendlyarm/nanopi-r2s/genimage.cfg | 10 ++---- > > board/friendlyarm/nanopi-r2s/post-build.sh | 4 +-- > > board/friendlyarm/nanopi-r2s/readme.txt | 20 ++++------- > > configs/friendlyarm_nanopi_r2s_defconfig | 39 +++++++++++++++++----- > > 6 files changed, 43 insertions(+), 35 deletions(-) > > > > diff --git a/.checkpackageignore b/.checkpackageignore > > index 4967d749fa..08188dc23e 100644 > > --- a/.checkpackageignore > > +++ b/.checkpackageignore > > @@ -33,7 +33,6 @@ board/cubietech/cubieboard2/post-image.sh Shellcheck > > board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck > > board/freescale/common/mxs/post-image.sh Shellcheck > > board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch Upstream > > -board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck > > board/hardkernel/odroidc2/post-image.sh Shellcheck > > board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck Variables > > board/hardkernel/odroidxu4/post-image.sh EmptyLastLine Shellcheck > > diff --git a/board/friendlyarm/nanopi-r2s/extlinux.conf b/board/friendlyarm/nanopi-r2s/extlinux.conf > > index 1ea0cdd8a5..b2897dea8b 100644 > > --- a/board/friendlyarm/nanopi-r2s/extlinux.conf > > +++ b/board/friendlyarm/nanopi-r2s/extlinux.conf > > @@ -1,4 +1,4 @@ > > -label NanoPi R2S linux > > +label friendlyarm-nanopi-buildroot > > Please add this change to commit log(* update extlinux.conf label name > to friendlyarm-nanopi-buildroot). > > > kernel /boot/Image > > devicetree /boot/rk3328-nanopi-r2s.dtb > > - append root=/dev/mmcblk0p1 rw rootwait > > + append console=ttyS2,1500000 earlyprintk root=/dev/mmcblk0p1 rootwait > > why is console required now? Please add it to commit log > > > diff --git a/board/friendlyarm/nanopi-r2s/genimage.cfg b/board/friendlyarm/nanopi-r2s/genimage.cfg > > index a686b4f14e..98e96a7ddd 100644 > > --- a/board/friendlyarm/nanopi-r2s/genimage.cfg > > +++ b/board/friendlyarm/nanopi-r2s/genimage.cfg > > @@ -4,19 +4,13 @@ image sdcard.img { > > > > partition u-boot-tpl-spl-dtb { > > in-partition-table = "no" > > - image = "idbloader.img" > > + image = "u-boot-rockchip.bin" > > offset = 32K > > } > > > > - partition u-boot-dtb { > > - in-partition-table = "no" > > - image = "u-boot.itb" > > - offset = 8M > > - } > > - > > partition rootfs { > > partition-type = 0x83 > > - offset = 16M > > image = "rootfs.ext4" > > + offset = 10M > > Please keep the offset position the same and document the reason in > commit log > > > } > > } > > diff --git a/board/friendlyarm/nanopi-r2s/post-build.sh b/board/friendlyarm/nanopi-r2s/post-build.sh > > index 1f5ff6a611..c7ec875068 100755 > > --- a/board/friendlyarm/nanopi-r2s/post-build.sh > > +++ b/board/friendlyarm/nanopi-r2s/post-build.sh > > @@ -1,5 +1,5 @@ > > #!/bin/sh > > > > -BOARD_DIR="$(dirname $0)" > > +BOARD_DIR="$(dirname "$0")" > > Is this mandatory? What changed compared to previous version? > > > > > -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf > > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > > Same here for "..." > > Please update commit log with it. > > > diff --git a/board/friendlyarm/nanopi-r2s/readme.txt b/board/friendlyarm/nanopi-r2s/readme.txt > > index 6d291cdd60..d43008b620 100644 > > --- a/board/friendlyarm/nanopi-r2s/readme.txt > > +++ b/board/friendlyarm/nanopi-r2s/readme.txt > > @@ -2,11 +2,11 @@ Intro > > ===== > > > > This default configuration will allow you to start experimenting with the > > -buildroot environment for the Nanopi R2S. With the current configuration > > +buildroot environment for the NanoPi R2S. With the current configuration > > Here the same > > > it will bring-up the board, and allow access through the serial console. > > > > -Nanopi R2S link: > > -https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282 > > +Wiki link: > > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R2S > > This too: * update board URL in readme.txt > > > > > This configuration uses ATF, U-Boot mainline and kernel mainline. > > > > @@ -25,9 +25,6 @@ Files created in output directory > > output/images > > > > ??? bl31.elf > > -??? boot.vfat > > -??? extlinux > > -??? idbloader.img > > ??? Image > > ??? rk3328-nanopi-r2s.dtb > > ??? rootfs.ext2 > > @@ -35,7 +32,7 @@ output/images > > ??? rootfs.tar > > ??? sdcard.img > > ??? u-boot.bin > > -??? u-boot.itb > > +??? u-boot-rockchip.bin > > > > How to write the SD card > > ======================== > > @@ -46,12 +43,7 @@ in the output/images/ directory. > > Copy the bootable "sdcard.img" onto an SD card with "dd": > > > > $ sudo dd if=output/images/sdcard.img of=/dev/sdX > > - $ sudo sync > > + $ sync > > Ditto > > > > > -Insert the micro SDcard in your Nanopi R2S and power it up. The console > > +Insert the micro SDcard in your NanoPi R2S and power it up. The console > > Ditto but you can group this with 2 points above without adding a > dedicated one > > > is on the serial line, 1500000 8N1. > > - > > -Notes > > -===== > > - > > -This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board. > > diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig > > index 284b28ec31..76806e76e7 100644 > > --- a/configs/friendlyarm_nanopi_r2s_defconfig > > +++ b/configs/friendlyarm_nanopi_r2s_defconfig > > @@ -1,42 +1,65 @@ > > +# Architecture > > BR2_aarch64=y > > BR2_cortex_a53=y > > BR2_ARM_FPU_VFPV4=y > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y > > + > > +# Linux headers same as kernel, a 6.6 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > > + > > +# System > > BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s" > > BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328" > > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > > + > > +# Image > > BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r2s/genimage.cfg" > > + > > +# Kernel > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16" > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-nanopi-r2s" > > BR2_LINUX_KERNEL_INSTALL_TARGET=y > > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > + > > +# Filesystem > > BR2_TARGET_ROOTFS_EXT2=y > > BR2_TARGET_ROOTFS_EXT2_4=y > > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > + > > +# Firmware > > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3328" > > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" > > BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y > > + > > +# Bootloader > > BR2_TARGET_UBOOT=y > > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" > > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328" > > BR2_TARGET_UBOOT_NEEDS_DTC=y > > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > > +BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y > > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > > BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y > > -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y > > -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" > > BR2_TARGET_UBOOT_SPL=y > > -BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" > > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-rockchip.bin" > > + > > +# Ethernet firmware for RTL8153B > > +BR2_PACKAGE_LINUX_FIRMWARE=y > > +BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y > > + > > +# Required tools to create the SD image > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > BR2_PACKAGE_HOST_GENIMAGE=y > > -BR2_PACKAGE_HOST_UBOOT_TOOLS=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > I think you should split this patch into 2: > 1) the versions bumps > 2) the beautify of the code > > This is because there are many changes and it's difficult to check them, > for me at least. > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas From peter at korsgaard.com Sun Feb 25 14:26:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Sun, 25 Feb 2024 15:26:01 +0100 Subject: [Buildroot] Buildroot 2024.02-rc1 released Message-ID: <87jzmssjra.fsf@48ers.dk> Hi, Somewhat later than hoped, but: Buildroot 2024.02-rc1 is released - Go download it at: http://buildroot.net/downloads/buildroot-2024.02-rc1.tar.gz or http://buildroot.net/downloads/buildroot-2024.02-rc1.tar.xz Or get it from Git: git://git.buildroot.net/buildroot Please give it a spin and report any problems to the mailing list or bug tracker. Againg a fairly busy development cycle, with more than 1200 changes from 104 unique contributors! Of noteworthy new features/changes we have: - Toolchain: - GDB: Add version 14.1, default to 13.2. - uClibc-ng updated to 1.0.45 - Bootlin external toolchains updated to 2023.11-1, moving the stable toolchains to GCC 12.3 / binutils 2.40 / GDB 13.2 / glibc 2.38 / musl 1.2.4 / uClibc-ng 1.0.45 - Add support for building a bare metal toolchain suitable for building firmware for certain (co-)processors, possibly using a different CPU architecture than the main Buildroot configuration. - Default optimization level changed from optimize for size (-Os) to optimize for speed (-O2). - Support: Use the Fraunhofer FKIE JSON files for CVE matching now that NVD is about to deprecate its feeds. - A large number of new runtime tests - New defconfigs: AMD Zynqmp kria kd240 and kr260, zcu104, Avnet RZBoard V2L, Mangopi MQ1RDW2, NXP i.MX 93 11x11 EVK, QEMU Riscv64 virt-efi, TI AM574x Industrial Development Kit - New packages: binutils-bare-metal, dmenu-wayland, fcft, foot, firmware-ele-imx, ivi-homescreen, libjwt, libtraceevent, libtracefs, libutempter, lua-ansicolors, lua-argparse, lua-conciseserialization, lua-ubjson, minisign, newlib-bare-metal, python-aiosqlite, python-annotated-types, python-anyio, python-asyncssh, python-bitarray, python-cachetools, python-contourpy, python-decouple, python-fastapi-sessions, python-fastapi, python-google-api-core, python-google-auth, python-googleapis-common-protos, python-grpc-requests, python-grpcio-reflection, python-grpcio, python-httpcore, python-httpx, python-matplotlib-inline, python-ml-dtypes, python-multipart, python-pydantic-core, python-pypng, python-starlette, python-tcolorpy, python-trafaret, python-urwid-readline, python-uvicorn, rlwrap, tllist And the usual package version updates and bug fixes. See the CHANGES file for details: http://git.buildroot.net/buildroot/plain/CHANGES?id=2023.11-rc1 Many thanks to the people contributing to this release: git shortlog -s -n 2023.11.. 313 Fabrice Fontaine 178 James Hilliard 90 Bernd Kuhls 79 Peter Korsgaard 69 Julien Olivain 58 Adam Duskett 38 Francois Perrad 33 Giulio Benetti 28 Yann E. MORIN 27 Thomas Petazzoni 22 Marcus Hoffmann 17 Romain Naour 14 Arnout Vandecappelle 14 Neal Frager 12 Michael Nosthoff 11 Fl?vio Tapaj?s 9 Antoine Coutant 9 Dario Binacchi 9 Petr Vorel 8 Christian Stewart 7 Adrian Perez de Castro 7 Marleen Vos 7 Maxim Kochetkov 7 Thomas Devoogdt 6 Baruch Siach 6 Christian Hitz 6 Peter Seiderer 6 S?bastien Szymanski 5 Alexey Brodkin 5 Kadambini Nema 5 Kilian Zinnecker 5 Sergey Matyukevich 4 Ga?l PORTAY 4 Jan ?erm?k 4 Maxime Chevallier 4 Waldemar Brodkorb 3 Alexander Egorenkov 3 Fabio Estevam 3 Ismael Luceno 3 Joachim Wiberg 3 Marcus Folkesson 3 Peter Macleod Thompson 3 Rafa? Mi?ecki 3 Sergio Prado 3 Xiangyu Chen 2 Andreas Naumann 2 Bram Oosterhuis 2 Frank Vanbever 2 Heiko Thiery 2 Jesse Taube 2 Marcin Niestroj 2 Michael Vetter 2 Reza Arbab 2 Saeed Kazemi 2 Sebastian Weyer 2 Woodrow Douglass 2 Yang Li 1 Abilio Marques 1 Ahmad Fatoum 1 Aleksandr Makarov 1 Atsushi Nemoto 1 Bagas Sanjaya 1 Brandon Maier 1 Charles Hardin 1 Colin Foster 1 David Barbion 1 Dimitar Tomov 1 Dmitry Rokosov 1 Edgar Bonet 1 Francis Laniel 1 Geoff Levand 1 Graeme Smecher 1 Grant Nichol 1 Hudson Ayers 1 James Knight 1 Jos? Luis Salvador Rufo 1 Juan Carrano 1 Kalpesh Panchal 1 Kevin Cui 1 Kieran Bingham 1 Kory Maincent 1 Kris Bahnsen 1 Louis Chauvet 1 Ludwig Kormann 1 Martin Kepplinger 1 Martin Kurbanov 1 Matt Silva 1 Maximilian Senftleben 1 Nicola Di Lieto 1 Nuno Gon?alves 1 Patrick Oppenlander 1 Ralf Dragon 1 Raphael Pavlidis 1 Robert Marko 1 Roy Kollen Svendsen 1 Scott Fan 1 Sebastian Bauer 1 Sen Hastings 1 Thomas Huth 1 Titouan Christophe 1 Uladzimir Bely 1 Vincent Fazio 1 Vincent Stehl? 1 Yair Ben-Avraham And a special thanks to our patch reviewers: git log 2023.11.. | grep -Ei '(reviewed|acked)-by:' | \ sed 's/.*by: //' | sort | uniq -c | sort -n -r 7 Marcus Hoffmann 7 Giulio Benetti 6 Adrian Perez de Castro 5 Antoine Coutant 4 Marcus Hoffmann 3 Maxim Kochetkov 3 Gary Bisson 3 Adam Duskett 2 Yegor Yefremov 2 Marcin Niestroj 2 Luca Ceresoli 2 Julien Olivain 1 Yann E. MORIN 1 S?bastien Szymanski 1 Romain Naour 1 Marcus Hoffmann 1 Petr Vorel 1 Michael Nosthoff 1 Laurent Vivier 1 James Hilliard 1 Fabio Estevam 1 Dario Binacchi 1 Christian Stewart 1 Adam Duskett -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Sun Feb 25 15:23:13 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 25 Feb 2024 16:23:13 +0100 Subject: [Buildroot] [PATCH 1/1] utils/genrandconfig: fix BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH Message-ID: <20240225152313.1422787-1-fontaine.fabrice@gmail.com> Commit b7232c51dd402afb361d7c310855e0bf5666958d added default setting for bare-metal toolchain arch but unfortunately it used configlines.add instead of configlines.append resulting in the following build failure: /bin/sh: line 8: /home/autobuild/autobuild/instance-1/output-1/per-package/host-gcc-bare-metal/host/bin/-ar: No such file or directory While at it, also append /n for consistency Fixes: b7232c51dd402afb361d7c310855e0bf5666958d - http://autobuild.buildroot.org/results/95ac565653ddb5c14ec71470c32a34ad10b048cb Signed-off-by: Fabrice Fontaine --- utils/genrandconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index 68cc003b70..9eeb66a595 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -315,9 +315,9 @@ def fixup_config(sysinfo, configfile): 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: return False - if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y' in configlines: - configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""') - configlines.add('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"') + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y\n' in configlines: + configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""\n') + configlines.append('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"\n') if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: -- 2.43.0 From romain.naour at smile.fr Sun Feb 25 16:06:08 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 17:06:08 +0100 Subject: [Buildroot] [PATCH v6 12/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option In-Reply-To: <20240224205654.1546744-13-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-13-dario.binacchi@amarulasolutions.com> Message-ID: <8d3bb106-cae8-4271-87e9-200c879de7f1@smile.fr> Hello Dario, Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit?: > Recent version of U-Boot use binman to provide a mechanism for building > images, from simple SPL + U-Boot combinations, to more complex > arrangements with many parts. > > This tool uses additional host python modules that must be provided by > Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to > add additional host packages in U-Boot build dependency to use binman. > > The binman requirement is directly included in buildman dependency > (tools/buildman/requirements.txt) since within U-Boot, binman is > invoked by the build system, here buildman [1]. > > [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot > > Co-developed-by: Romain Naour > Signed-off-by: Romain Naour > Signed-off-by: Dario Binacchi > > --- > > Changes in v6: > - BR2_TARGET_UBOOT_USE_BINMAN > - Binman tool is not specific to TI K3 platform, so add an option to specify > the use of Binman in U-Boot. > - Add runtime dependencies > - Update commit message > - Add SOB and COB tags of Romain Naour > > Changes in v5: > - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" > from UBOOT_MAKE_OPTS. > > no changes since v1: > > boot/uboot/Config.in | 11 +++++++++++ > boot/uboot/uboot.mk | 12 +++++++++++- > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index beafb38930db..e6e7956adccb 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -290,6 +290,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN > This option makes sure that the needed binary blobs are copied > into the U-Boot source directory. > > +config BR2_TARGET_UBOOT_USE_BINMAN > + bool "U-Boot use binman" > + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema > + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 > + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS > + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT > + help > + Use binman tool for generation and signing of boot images. > + > + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html > + > menu "U-Boot binary format" > > config BR2_TARGET_UBOOT_FORMAT_AIS > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index dda606a88059..9157a4b738c3 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -187,10 +187,12 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf > endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > UBOOT_DEPENDENCIES += ti-k3-boot-firmware > +ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) Usually we prefer the "positive" logic: ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),) > +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f Looking at the commit log, It's not obvious why DM= is no needed with binman. We had the explanation from Andreas: http://lists.busybox.net/pipermail/buildroot/2024-February/685977.html "BINMAN_INDIRS is used to fetch the DM binary from /ti-dm/ and SYSFW binaries from /ti-sysfw/." Best regards, Romain > endif > +endif > > ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) > UBOOT_DEPENDENCIES += opensbi > @@ -269,6 +271,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) > UBOOT_DEPENDENCIES += host-vim > endif > > +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) > +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt > +UBOOT_DEPENDENCIES += \ > + host-python-jsonschema \ > + host-python-pyyaml > +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) > +endif > + > # prior to u-boot 2013.10 the license info was in COPYING. Copy it so > # legal-info finds it > define UBOOT_COPY_OLD_LICENSE_FILE From romain.naour at smile.fr Sun Feb 25 16:14:46 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 17:14:46 +0100 Subject: [Buildroot] [PATCH v6 13/16] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240224205654.1546744-14-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-14-dario.binacchi@amarulasolutions.com> Message-ID: <1cbc66f9-8e0a-4ed3-9c13-e7154447c46d@smile.fr> Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit?: > Recent versions of U-Boot can use Binman to compile and sign the generated > binaries, thus making the use of custom tools like ti-k3-image-gen no > longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were > configured and used outside of it. This patch allows setting such options > even if the package is not enabled. > > The patch makes an exception to the Buildroot rule "no subdirectory in > package directory". > > Signed-off-by: Dario Binacchi > > --- > > Changes in v6: > - Move BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME to ti-k3 (BR2_PACKAGE_TI_K3_DM). > - Disable BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X > > Changes in v5: > - Add SOB tag > - Move the new ti-k3 from boot to package > > Added in v4 > > boot/ti-k3-image-gen/Config.in | 61 ++----------------------- > boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- > boot/uboot/Config.in | 12 +---- > boot/uboot/uboot.mk | 2 +- > configs/ti_am62x_sk_defconfig | 3 +- > configs/ti_am64x_sk_defconfig | 3 +- > package/Config.in | 1 + > package/ti-k3/Config.in | 60 ++++++++++++++++++++++++ > package/ti-k3/ti-k3.mk | 7 +++ > 9 files changed, 80 insertions(+), 73 deletions(-) > create mode 100644 package/ti-k3/Config.in > create mode 100644 package/ti-k3/ti-k3.mk > > diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in > index d76cef82e911..a57319f4be6d 100644 > --- a/boot/ti-k3-image-gen/Config.in > +++ b/boot/ti-k3-image-gen/Config.in > @@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN > https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ > > if BR2_TARGET_TI_K3_IMAGE_GEN > -choice > - prompt "SoC family" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - bool "am62ax" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - bool "am62x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - bool "am64x" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - bool "am65x" > - > -endchoice > - > -choice > - prompt "Security type" > - help > - The target SoC security type option for image gen. Valid > - options are "gp" for General Purpose devices, "hs-fs" for > - High Security - Field Securable devices, or "hs" for High > - Security - Security Enforcing devices. Note for all High > - Security device variants the TI_SECURE_DEV_PKG environmental > - variable must be defined at build time pointing to a valid > - core-secdev-k3 folder location, otherwise the build will > - fail, see > - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - bool "gp" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - bool "hs-fs" > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > - bool "hs" > - > -endchoice > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC > - string > - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > > config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE > string > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X > - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X > - > -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE > - string > - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP > - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS > - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS > + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X > + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X > + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X > > endif > diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > index 64be9a18f2c4..aca29bcf1bd4 100644 > --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk > +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk > @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ > $(BR2_MAKE_HOST_DEPENDENCY) > > TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) > -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) > -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) > +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > > TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin > > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index e6e7956adccb..821854d08acc 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -244,21 +244,11 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > bool "U-Boot needs TI K3 Device Manager (DM)" > # We use the SoC selection defined for the ti-k3-image-gen > # package > - depends on BR2_TARGET_TI_K3_IMAGE_GEN > - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X > help > Some TI K3 devices need the Device Manager (DM) firmware to > be available for the U-Boot build. > > -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM > - > -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME > - string > - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX > - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X > - > -endif > - > config BR2_TARGET_UBOOT_NEEDS_OPENSBI > bool "U-Boot needs OpenSBI" > depends on BR2_TARGET_OPENSBI > diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk > index 9157a4b738c3..c21fe7c99fc1 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -189,7 +189,7 @@ endif > ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) > UBOOT_DEPENDENCIES += ti-k3-boot-firmware > ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) > -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) > +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_PACKAGE_TI_K3_DM_SOCNAME)) > UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f > endif > endif > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index a129e216d25b..2835404a57df 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > +BR2_PACKAGE_TI_K3=y > +BR2_PACKAGE_TI_K3_SOC_AM62X=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="256M" > @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig > index 26195194c7d6..566cbbe4824f 100644 > --- a/configs/ti_am64x_sk_defconfig > +++ b/configs/ti_am64x_sk_defconfig > @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > +BR2_PACKAGE_TI_K3=y > +BR2_PACKAGE_TI_K3_SOC_AM64X=y > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" > BR2_TARGET_TI_K3_IMAGE_GEN=y > -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > diff --git a/package/Config.in b/package/Config.in > index bf0fe078b955..6d3ed34e121b 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -629,6 +629,7 @@ endmenu > source "package/sysstat/Config.in" > source "package/targetcli-fb/Config.in" > source "package/ti-gfx/Config.in" > + source "package/ti-k3/Config.in" > source "package/ti-sgx-demos/Config.in" > source "package/ti-sgx-km/Config.in" > source "package/ti-sgx-um/Config.in" > diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in > new file mode 100644 > index 000000000000..b8545b7bca62 > --- /dev/null > +++ b/package/ti-k3/Config.in > @@ -0,0 +1,60 @@ > +config BR2_PACKAGE_TI_K3 > + bool "TI K3" > + help > + The TI K3 SOC specific selections. > + > +if BR2_PACKAGE_TI_K3 > + > +choice > + prompt "SoC family" > + > +config BR2_PACKAGE_TI_K3_SOC_AM62AX > + bool "am62ax" > + > +config BR2_PACKAGE_TI_K3_SOC_AM62X > + bool "am62x" > + > +config BR2_PACKAGE_TI_K3_SOC_AM64X > + bool "am64x" > + > +config BR2_PACKAGE_TI_K3_SOC_AM65X > + bool "am65x" > + > +endchoice > + > +choice > + prompt "Security type" > + help > + The target SoC security type option. > + > +config BR2_PACKAGE_TI_K3_SECTYPE_GP > + bool "gp" > + > +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS > + bool "hs-fs" > + depends on !BR2_PACKAGE_TI_K3_SOC_AM65X This was an existing issue with ti-k3-image-gen and it should go in a separate patch. Also, add in the commit log how this infomation was retrieved. http://lists.busybox.net/pipermail/buildroot/2024-February/686144.html Best regards, Romain > + > +config BR2_PACKAGE_TI_K3_SECTYPE_HS > + bool "hs" > + > +endchoice > + > +config BR2_PACKAGE_TI_K3_SOC > + string > + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X > + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X > + default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X > + > +config BR2_PACKAGE_TI_K3_SECTYPE > + string > + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP > + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS > + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS > + > +config BR2_PACKAGE_TI_K3_DM_SOCNAME > + string > + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX > + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X > + > +endif > diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk > new file mode 100644 > index 000000000000..a2da29f5148c > --- /dev/null > +++ b/package/ti-k3/ti-k3.mk > @@ -0,0 +1,7 @@ > +################################################################################ > +# > +# ti-k3 > +# > +################################################################################ > + > +include $(sort $(wildcard package/ti-k3/*/*.mk)) From romain.naour at smile.fr Sun Feb 25 16:39:30 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 17:39:30 +0100 Subject: [Buildroot] [PATCH v6 15/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240224205654.1546744-16-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-16-dario.binacchi@amarulasolutions.com> Message-ID: <4275a446-20ac-4479-97e9-6bf790fe3976@smile.fr> Hello Dario, Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit?: > The 2024.01 version of U-Boot for the am62x-sk board has introduced two > major changes: > - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in > /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET > and the use of extlinux.conf for the proper loading of the device tree. > Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to > auto-generate the extlinux.conf file so that developers can change the > kernel loading options by modifying the .config. The main issue here come from the mmc.env used on TI platform [1], indded it requires to install the dtb into a subdirectory in /boot. This is handled by meta-ti with KERNEL_DTBDEST [2] but Buildroot doesn't support such feature. # Tell the kernel class to install the DTBs in the same directory structure as # the kernel. KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb" Instead, we can create a symblink "ln -sf . ${TARGET_DIR}/boot/dtb", see [3]. But I'm fine too with the generated extlinux.conf. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/include/env/ti/mmc.env?ref_type=tags#L18 [2] https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc?h=09.02.00.004#n13 [3] http://lists.busybox.net/pipermail/buildroot/2024-February/685672.html > - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer > necessary to use custom tools like ti-k3-image-gen. > > Tested on SK-AM62B-P1. > > Signed-off-by: Dario Binacchi > > --- > > Changes in v6: > - Enable BR2_TARGET_UBOOT_USE_BINMAN option > > Changes in v5: > - Update commit message. > > Changes in v4: > - bump to 204.01 instead of 2023.10 > - Update the commit message > - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs > in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. > > Changes in v2: > - Update the commit message > - Drop Python options required by binman. > - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically > selects the Python modules required by binman. > > board/ti/am62x-sk/genimage.cfg | 7 ++++- > board/ti/am62x-sk/post-build.sh | 49 +++++++++++++++++++++++++++++++++ > board/ti/am62x-sk/post-image.sh | 5 ++++ > configs/ti_am62x_sk_defconfig | 13 +++++---- > 4 files changed, 67 insertions(+), 7 deletions(-) > create mode 100755 board/ti/am62x-sk/post-build.sh > create mode 100755 board/ti/am62x-sk/post-image.sh > > diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg > index 26304fe98f99..398209f4d831 100644 > --- a/board/ti/am62x-sk/genimage.cfg > +++ b/board/ti/am62x-sk/genimage.cfg > @@ -4,10 +4,15 @@ image boot.vfat { > "tiboot3.bin", > "tispl.bin", > "u-boot.img", > + "k3-am625-sk.dtb", > + "Image" > + } > + file extlinux/extlinux.conf { > + image = extlinux.conf > } > } > > - size = 16M > + size = 64M > } > > image sdcard.img { > diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh > new file mode 100755 > index 000000000000..0f1f98ef217a > --- /dev/null > +++ b/board/ti/am62x-sk/post-build.sh > @@ -0,0 +1,49 @@ > +#!/bin/sh -x > + > +# genimage will need to find the extlinux.conf > +# in the binaries directory > + > +die() { > + cat <&2 > +Error: $@ > + > +Usage: ${0} -c -r [-x ] > +EOF > + exit 1 > +} > + > +o='c:r:x:' > +O='console:,root:,extra-args:' > +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" > +eval set -- "${opts}" > +while [ ${#} -gt 0 ]; do > + case "${1}" in > + (-c|--console) > + CONSOLE="${2}"; shift 2 > + ;; > + (-r|--root) > + ROOT="${2}"; shift 2 > + ;; > + (-x|--extra-args) > + EXTRA_ARGS="${2}"; shift 2 > + ;; > + (--) > + shift 1; break > + ;; > + esac > +done > + > +[ -n "${CONSOLE}" ] || die "Missing argument" > +[ -n "${ROOT}" ] || die "Missing argument" > +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" > +if [ -n "${EXTRA_ARGS}" ]; then > + append="${append} ${EXTRA_ARGS}" > +fi > + > +mkdir -p "${BINARIES_DIR}" > +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" > + label am62x-sk-buildroot > + kernel /Image devicetree entry seems missing. We had an issue on another board [1] due to this. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/d6d0f73a2eaa4904ee0842a01941b01306d97be6 Best regards, Romain > + fdtdir / > + append ${append} > + __HEADER_EOF > diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh > new file mode 100755 > index 000000000000..34f732c091ad > --- /dev/null > +++ b/board/ti/am62x-sk/post-image.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh -x > + > +BOARD_DIR="$(dirname "$0")" > + > +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 2835404a57df..484f9feb8c61 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,14 +1,14 @@ > BR2_aarch64=y > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > -BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_PACKAGE_LINUX_FIRMWARE=y > BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y > BR2_PACKAGE_TI_K3=y > @@ -24,20 +24,21 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" > BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y > BR2_TARGET_OPTEE_OS=y > BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" > -BR2_TARGET_TI_K3_IMAGE_GEN=y > +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y > BR2_TARGET_TI_K3_R5_LOADER=y > BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y > -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y > +BR2_TARGET_UBOOT_USE_BINMAN=y > # BR2_TARGET_UBOOT_FORMAT_BIN is not set > BR2_TARGET_UBOOT_FORMAT_IMG=y > BR2_TARGET_UBOOT_SPL=y From romain.naour at smile.fr Sun Feb 25 16:43:39 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 17:43:39 +0100 Subject: [Buildroot] [PATCH v6 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> Message-ID: <383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr> Hello Dario, Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit?: > Tested on SK-AM62B-P1. You could complete your series by updating the ti_am64x_sk_defconfig too and remove ti-k3-image-gen. Except for minor improvement, this series is ok for me. Best regards, Romain > > Signed-off-by: Dario Binacchi > > --- > > Changes in v5: > - Bump to 6.6.17 from 6.6.1 > - Update commit message > > Changes in v4: > - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. > > no changes since v1 > > configs/ti_am62x_sk_defconfig | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > index 484f9feb8c61..8c962b4a9494 100644 > --- a/configs/ti_am62x_sk_defconfig > +++ b/configs/ti_am62x_sk_defconfig > @@ -1,11 +1,11 @@ > BR2_aarch64=y > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" From romain.naour at smile.fr Sun Feb 25 16:58:10 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 17:58:10 +0100 Subject: [Buildroot] [PATCH v4 00/20] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240223193136.sod3vx4t3pkqfcqd@dasso> References: <20240217160244.1320482-1-dario.binacchi@amarulasolutions.com> <90dd167b-bceb-4e42-86c3-255caf825f41@smile.fr> <20240220004100.3yzqapeplx6olarz@dasso> <0b6dbe1f-2591-4290-b620-880d63eee7d0@smile.fr> <20240220200414.2bsvqvaeltqhsulc@dasso> <1a7ab8e6-bd43-4191-ad95-12e40f3a5c51@smile.fr> <20240223193136.sod3vx4t3pkqfcqd@dasso> Message-ID: <6de87cae-230d-4a3e-b854-0e327f651f0a@smile.fr> Hi Andreas, Le 23/02/2024 ? 20:31, Andreas Dannenberg a ?crit?: > Hi Romain, > > On Tue, Feb 20, 2024 at 10:36:51PM +0100, Romain Naour wrote: > > > >>>> About existing boot flow, I found two recent commit in u-boot that state that >>>> the "Split binary" (that requires sysfw.itb) is already a legacy boot flow: >>> >>> It's called "legacy boot flow" because it was the boot flow used on the >>> first K3 devices that were released (AM65x, J721E). This boot flow was >>> not used on follow-on devices. The characteristics of this boot flow is >>> that the initial FW image that gets loaded (tiboot3.bin) doesn't contain >>> any device firmwares, but only a bootloader (such as U-Boot SPL). Then >>> this boot loader will load the System Firmware firmware + config data >>> blob (sysfw.itb) into the dedicated core (called "DMSC" = Device Manager >>> and Security Controller). And then addiitonal boot stages will be >>> loaded. These devices require this boot flow, and with this it is >>> required to be supported by U-Boot (and any Linux distribution or build >>> systems that build on that). >>> >>> TI is still making/selling those "legacy boot flow" devices, and will >>> continue to do so for a very long time. One promiment community >>> incarnation that you are probably aware of is the BeagleBone AI-64. >> >> Thank you for the detailed explanation! >> >> I previouly worked on a AM57xx SoC that is nowaday legacy SoC, the latest >> ti-kernel 6.1 doesn't support some of the driver that where available in >> ti-kernel 5.10 (prueth 100M, RPMsg Sockets over virtio-rpmsg transport (use for >> ARM-DSP IPC3.x), TI-RTOS (the csl-common package was also removed from meta-ti)). >> >> Also the TI SDK on this plateform doesn't seems very active [1]. > > since you brought this up I wanted to add some additional context here. > Older devices like AM57xx (AM335x and AM437x fall into the same bucket) > will get what we call "LTS refresh SDKs" every year, rather than > multiple drops per year as we do for the more recent devices. As for > AM57xx specifically that refresh is currently targeted for e/o March > 2024 and will be known as "SDK 9.2". There shouldn't be any feature > regressions, and the only "new" thing (in addition to an all-refreshed > SW baseline with 6.1 kernel and 2023.04 U-Boot) will be some Y2K38 issue > fix on Linux. TI will be making and selling those devices for a very > long time to come, and the annual refresh is seen as a good compromise > between keeping things refreshed periodically and up to date while > limiting the amount of repeat work/effort. Ok, thanks for the information. I'm looking forward this new SDK release. Best regards, Romain > > -- > Andreas Dannenberg > Texas Instruments Inc > From fontaine.fabrice at gmail.com Sun Feb 25 17:11:49 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Sun, 25 Feb 2024 18:11:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: disable utest Message-ID: <20240225171149.1447606-1-fontaine.fabrice@gmail.com> Disable utest to avoid the following build failure raised since the addition of the package in commit b1dbd3f679e6660325472e3fdca72127d74e6929 if cunit is found: ../utest/tracefs-utest.c: In function 'test_uprobes_instance': ../utest/tracefs-utest.c:2492:19: error: 'PATH_MAX' undeclared (first use in this function) 2492 | char self[PATH_MAX] = { 0 }; | ^~~~~~~~ Fixes: b1dbd3f679e6660325472e3fdca72127d74e6929 - http://autobuild.buildroot.org/results/1a01883231dbc8a7688de26db9a08751165fe8fe Signed-off-by: Fabrice Fontaine --- .../0002-meson-add-utest-option.patch | 40 +++++++++++++++++++ package/libtracefs/libtracefs.mk | 3 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 package/libtracefs/0002-meson-add-utest-option.patch diff --git a/package/libtracefs/0002-meson-add-utest-option.patch b/package/libtracefs/0002-meson-add-utest-option.patch new file mode 100644 index 0000000000..90f73a7ea0 --- /dev/null +++ b/package/libtracefs/0002-meson-add-utest-option.patch @@ -0,0 +1,40 @@ +From 7a09e2d414959075e2177c50ef1d4bf606b9ccdc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Feb 2024 21:20:29 +0100 +Subject: [PATCH] meson: add utest option + +Add utest option to allow the user to disable utest + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/rostedt/libtracefs/pull/2 +--- + meson.build | 2 +- + meson_options.txt | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3156f1c..d4cfd53 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,7 +35,7 @@ incdir = include_directories(['include']) + + subdir('src') + subdir('include') +-if cunit_dep.found() ++if get_option('utest') and cunit_dep.found() + subdir('utest') + endif + if get_option('samples') +diff --git a/meson_options.txt b/meson_options.txt +index 8450992..a48efea 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -18,3 +18,5 @@ option('doc', type : 'boolean', value: true, + description : 'produce documentation') + option('samples', type : 'boolean', value: true, + description : 'build samples') ++option('utest', type : 'boolean', value: true, ++ description : 'build utest') +-- +2.43.0 + diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk index ed45fcbc50..21cb8e84e3 100644 --- a/package/libtracefs/libtracefs.mk +++ b/package/libtracefs/libtracefs.mk @@ -14,6 +14,7 @@ LIBTRACEFS_DEPENDENCIES = host-bison host-flex host-pkgconf libtraceevent LIBTRACEFS_CONF_OPTS = \ -Ddoc=false \ - -Dsamples=false + -Dsamples=false \ + -Dutest=false $(eval $(meson-package)) -- 2.43.0 From yann.morin.1998 at free.fr Sun Feb 25 17:45:32 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 18:45:32 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: make current version cell scrollable Message-ID: <20240225175139.2EA2987AB3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4533e42622e46f2b8e0ce4d1936c6534393d3aa1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Currently, when the version string is "too long", it is arbitrarily truncated. This works well for commit hashes, because usually the truncation is long enough to provide a short hash that is still unique in the upstream VCS. However, there are non-hash-like versions strings that get truncated and wihch the discriminant part is toward the end. Yet, adapting the version cell to the widest versions string (most probably a git hash) is not very interesting; the table is already very large. Make the cell with the version string scrollable: we get to keep the best of both worlds: a narrow version cell, and a full-length version string that can be copy-pasted if needed. Signed-off-by: Sen Hastings [yann.morin.1998 at free.fr: reword commit log] Signed-off-by: Yann E. MORIN --- support/scripts/pkg-stats | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7835cb3d62..9307992d29 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -845,6 +845,13 @@ function expandField(fieldId){ .centered { text-align: center; } + + .current_version { + overflow: scroll; + width: 21ch; + padding: 10px 2px 10px 2px; + } + .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { background: #d2ffc4; } @@ -964,10 +971,7 @@ def dump_html_pkg(f, pkg): # Current version data_field_id = f'current_version__{pkg_css_class}' - if len(pkg.current_version) > 20: - current_version = pkg.current_version[:20] + "..." - else: - current_version = pkg.current_version + current_version = pkg.current_version f.write(f'
      {current_version}
      \n') From yann.morin.1998 at free.fr Sun Feb 25 17:53:00 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 18:53:00 +0100 Subject: [Buildroot] [PATCH 1/1] support/scripts/pkg-stats: make current version cell scrollable In-Reply-To: <20240213120714.393026-1-sen@hastings.org> References: <20240213120714.393026-1-sen@hastings.org> Message-ID: Sen, All, On 2024-02-13 12:07 +0000, Sen Hastings spake thusly: > *Resubmitted to mailing list because I messed up the subject line.* > > I realized that instead of truncating the version number, > we could simply make the cell horizontally scrollable. > This of course allows us to have a fixed cell width, > while preserving the full version number. > > A demo is available here: > https://sen-h.codeberg.page/pkg-stats-demos/@pages/make-current-version-cell-scrollable.html I've entirely reworded the commit log with more explanations, and a neutral tone. > Signed-off-by: Sen Hastings Applied to master, thanks. Regards, Yann E. MORIN. > --- > support/scripts/pkg-stats | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index 7835cb3d62..9307992d29 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -845,6 +845,13 @@ function expandField(fieldId){ > .centered { > text-align: center; > } > + > + .current_version { > + overflow: scroll; > + width: 21ch; > + padding: 10px 2px 10px 2px; > + } > + > .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { > background: #d2ffc4; > } > @@ -964,10 +971,7 @@ def dump_html_pkg(f, pkg): > > # Current version > data_field_id = f'current_version__{pkg_css_class}' > - if len(pkg.current_version) > 20: > - current_version = pkg.current_version[:20] + "..." > - else: > - current_version = pkg.current_version > + current_version = pkg.current_version > f.write(f'
      class="centered current_version data _{pkg_css_class}">{current_version}
      \n') > > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Sun Feb 25 19:23:52 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 25 Feb 2024 20:23:52 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: disable utest In-Reply-To: <20240225171149.1447606-1-fontaine.fabrice@gmail.com> References: <20240225171149.1447606-1-fontaine.fabrice@gmail.com> Message-ID: Hi Fabrice, thanks a lot for the patch, On 25/02/24 18:11, Fabrice Fontaine wrote: > Disable utest to avoid the following build failure raised since the > addition of the package in commit > b1dbd3f679e6660325472e3fdca72127d74e6929 if cunit is found: > > ../utest/tracefs-utest.c: In function 'test_uprobes_instance': > ../utest/tracefs-utest.c:2492:19: error: 'PATH_MAX' undeclared (first use in this function) > 2492 | char self[PATH_MAX] = { 0 }; > | ^~~~~~~~ > > Fixes: b1dbd3f679e6660325472e3fdca72127d74e6929 > - http://autobuild.buildroot.org/results/1a01883231dbc8a7688de26db9a08751165fe8fe > > Signed-off-by: Fabrice Fontaine > --- > .../0002-meson-add-utest-option.patch | 40 +++++++++++++++++++ > package/libtracefs/libtracefs.mk | 3 +- > 2 files changed, 42 insertions(+), 1 deletion(-) > create mode 100644 package/libtracefs/0002-meson-add-utest-option.patch > > diff --git a/package/libtracefs/0002-meson-add-utest-option.patch b/package/libtracefs/0002-meson-add-utest-option.patch > new file mode 100644 > index 0000000000..90f73a7ea0 > --- /dev/null > +++ b/package/libtracefs/0002-meson-add-utest-option.patch > @@ -0,0 +1,40 @@ > +From 7a09e2d414959075e2177c50ef1d4bf606b9ccdc Mon Sep 17 00:00:00 2001 > +From: Fabrice Fontaine > +Date: Thu, 15 Feb 2024 21:20:29 +0100 > +Subject: [PATCH] meson: add utest option > + > +Add utest option to allow the user to disable utest > + > +Signed-off-by: Fabrice Fontaine > +Upstream: https://github.com/rostedt/libtracefs/pull/2 For this project you have to git send-email the patch to: linux-trace-devel at vger.kernel.org as documented in: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/tree/README#n45 Can you do that? Otherwise I can send the patch. Thank you! Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > +--- > + meson.build | 2 +- > + meson_options.txt | 2 ++ > + 2 files changed, 3 insertions(+), 1 deletion(-) > + > +diff --git a/meson.build b/meson.build > +index 3156f1c..d4cfd53 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -35,7 +35,7 @@ incdir = include_directories(['include']) > + > + subdir('src') > + subdir('include') > +-if cunit_dep.found() > ++if get_option('utest') and cunit_dep.found() > + subdir('utest') > + endif > + if get_option('samples') > +diff --git a/meson_options.txt b/meson_options.txt > +index 8450992..a48efea 100644 > +--- a/meson_options.txt > ++++ b/meson_options.txt > +@@ -18,3 +18,5 @@ option('doc', type : 'boolean', value: true, > + description : 'produce documentation') > + option('samples', type : 'boolean', value: true, > + description : 'build samples') > ++option('utest', type : 'boolean', value: true, > ++ description : 'build utest') > +-- > +2.43.0 > + > diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk > index ed45fcbc50..21cb8e84e3 100644 > --- a/package/libtracefs/libtracefs.mk > +++ b/package/libtracefs/libtracefs.mk > @@ -14,6 +14,7 @@ LIBTRACEFS_DEPENDENCIES = host-bison host-flex host-pkgconf libtraceevent > > LIBTRACEFS_CONF_OPTS = \ > -Ddoc=false \ > - -Dsamples=false > + -Dsamples=false \ > + -Dutest=false > > $(eval $(meson-package)) From giulio.benetti at benettiengineering.com Sun Feb 25 19:54:35 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Sun, 25 Feb 2024 20:54:35 +0100 Subject: [Buildroot] [PATCH v8] configs/friendlyarm_nanopi_neo2_defconfig: new board In-Reply-To: <20240225140434.7310-1-fancp2007@gmail.com> References: <20240223131603.2313178-1-fancp2007@gmail.com> <20240225140434.7310-1-fancp2007@gmail.com> Message-ID: Hi Scott, On 25/02/24 15:04, Scott Fan wrote: > Add support for the FriendlyARM NanoPi NEO2 with mainline components: > - ATF v2.7 > - U-Boot 2024.01 > - Linux 6.6.18 > > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV allows the ethernet driver > to be automatically loaded on boot. Otherwise, it will report the > 'device not found' error while run the 'ifconfig eth0' command. > > Board's wiki page: > - https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > > Signed-off-by: Scott Fan looks good to me: Reviewed-by: Giulio Benetti Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > > --- > Changes v1 -> v2: > - Fix issues from 'utils/docker-run make check-package' > - Add atf custom version in the defconfig > - No need for sudo to run sync > > Changes v2 -> v3: > - Update patch file, add the upstream tag > > Changes v3 -> v4: > - Use a single integrated image file (u-boot-sunxi-with-spl.bin) > - Remove patch file for uboot, switch to binman > - Merge boot partition into rootfs partition > - Bump kernel version to 6.1.61 > > Changes v4 -> v5: > - Bump kernel version to 6.1.65 > > Changes v5 -> v6: > - Bump kernel version to 6.6.17 > - Bump uboot version to 2024.01 > - Add option BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > > Changes v6 -> v7: > - Bump kernel version to 6.6.18 > - Add option BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > - Resort sections in the defconfig > > Changes v7 -> v8: > - Update commit log to add ATF version > - Update commit log to add explanation for the MDEV config > --- > board/friendlyarm/nanopi-neo2/extlinux.conf | 4 ++ > board/friendlyarm/nanopi-neo2/genimage.cfg | 16 ++++++ > board/friendlyarm/nanopi-neo2/post-build.sh | 5 ++ > board/friendlyarm/nanopi-neo2/readme.txt | 34 ++++++++++++ > configs/friendlyarm_nanopi_neo2_defconfig | 57 +++++++++++++++++++++ > 5 files changed, 116 insertions(+) > create mode 100644 board/friendlyarm/nanopi-neo2/extlinux.conf > create mode 100644 board/friendlyarm/nanopi-neo2/genimage.cfg > create mode 100755 board/friendlyarm/nanopi-neo2/post-build.sh > create mode 100644 board/friendlyarm/nanopi-neo2/readme.txt > create mode 100644 configs/friendlyarm_nanopi_neo2_defconfig > > diff --git a/board/friendlyarm/nanopi-neo2/extlinux.conf b/board/friendlyarm/nanopi-neo2/extlinux.conf > new file mode 100644 > index 0000000000..482a069f74 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/extlinux.conf > @@ -0,0 +1,4 @@ > +label friendlyarm-nanopi-buildroot > + kernel /boot/Image > + devicetree /boot/sun50i-h5-nanopi-neo2.dtb > + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait > diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg > new file mode 100644 > index 0000000000..67e4e5efdb > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/genimage.cfg > @@ -0,0 +1,16 @@ > +image sdcard.img { > + hdimage { > + } > + > + partition u-boot-tpl-spl-dtb { > + in-partition-table = "no" > + image = "u-boot-sunxi-with-spl.bin" > + offset = 8K > + } > + > + partition rootfs { > + partition-type = 0x83 > + image = "rootfs.ext4" > + offset = 1M > + } > +} > diff --git a/board/friendlyarm/nanopi-neo2/post-build.sh b/board/friendlyarm/nanopi-neo2/post-build.sh > new file mode 100755 > index 0000000000..c7ec875068 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/post-build.sh > @@ -0,0 +1,5 @@ > +#!/bin/sh > + > +BOARD_DIR="$(dirname "$0")" > + > +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${TARGET_DIR}/boot/extlinux/extlinux.conf" > diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt > new file mode 100644 > index 0000000000..c896a57525 > --- /dev/null > +++ b/board/friendlyarm/nanopi-neo2/readme.txt > @@ -0,0 +1,34 @@ > +Intro > +===== > + > +This default configuration will allow you to start experimenting with the > +buildroot environment for the NanoPi NEO2. With the current configuration > +it will bring-up the board, and allow access through the serial console. > + > +Wiki link: > +https://wiki.friendlyelec.com/wiki/index.php/NanoPi_NEO2 > + > +This configuration uses U-Boot mainline and kernel mainline. > + > +How to build > +============ > + > + $ make friendlyarm_nanopi_neo2_defconfig > + $ make > + > +Note: you will need access to the internet to download the required > +sources. > + > +How to write the SD card > +======================== > + > +Once the build process is finished you will have an image called "sdcard.img" > +in the output/images/ directory. > + > +Copy the bootable "sdcard.img" onto an SD card with "dd": > + > + $ sudo dd if=output/images/sdcard.img of=/dev/sdX > + $ sync > + > +Insert the micro SDcard in your NanoPi NEO2 and power it up. The console > +is on the serial line, 115200 8N1. > diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig > new file mode 100644 > index 0000000000..3118d45625 > --- /dev/null > +++ b/configs/friendlyarm_nanopi_neo2_defconfig > @@ -0,0 +1,57 @@ > +# Architecture > +BR2_aarch64=y > +BR2_cortex_a53=y > +BR2_ARM_FPU_VFPV4=y > + > +# Linux headers same as kernel, a 6.6 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > + > +# System > +BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM NanoPi NEO2" > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > + > +# Image > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo2/post-build.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" > +BR2_LINUX_KERNEL_INSTALL_TARGET=y > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > + > +# Firmware > +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > + > +# Bootloader > +BR2_TARGET_UBOOT=y > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" > +BR2_TARGET_UBOOT_NEEDS_DTC=y > +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y > +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y > +BR2_TARGET_UBOOT_SPL=y > +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" > +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > + > +# Required tools to create the SD image > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > +BR2_PACKAGE_HOST_GENIMAGE=y > +BR2_PACKAGE_HOST_MTOOLS=y From yann.morin.1998 at free.fr Sun Feb 25 22:05:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 23:05:35 +0100 Subject: [Buildroot] [PATCH 0/3] support/scripts/pkg-stats: fix CVE identification (branch yem/pkgstat-cve) Message-ID: Hello All! Since we switched to the FKIE CVE feed (as the NVD JSON feed are oing extinct soon-ish), we missed the fact that the new feeds did not have the same layout as the former ones, breaking CVE reporting. As a consequence of having no CVE reported, w emissed the fact that the CVEs were not sorted in the new feeds, while they were in the formers. This series fixes both issus, and introduces a minor fixup for a python deprecation warning. Regards, Yann E. MORIN. ---------------------------------------------------------------- Yann E. MORIN (3): support/scripts/pkg-stats: fix datetime deprecation warning support/scripts/pkg-stats: fkie json format support/scripts/pkg-stats: sort CVEs in HTML output support/scripts/cve.py | 26 +++++++++++++++++--------- support/scripts/pkg-stats | 6 +++--- 2 files changed, 20 insertions(+), 12 deletions(-) -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From yann.morin.1998 at free.fr Sun Feb 25 22:05:35 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 23:05:35 +0100 Subject: [Buildroot] [PATCH 1/3] support/scripts/pkg-stats: fix datetime deprecation warning In-Reply-To: References: Message-ID: <9b7aaaa3b968342ac2f0d6d723ecbe721dbbaa4b.1708898731.git.yann.morin.1998@free.fr> Abide by the warning reported with python 3.12: .../support/scripts/pkg-stats:1289: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC). Signed-off-by: Yann E. MORIN --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7835cb3d62..00d1eef09a 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1286,7 +1286,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.utcnow() + date = datetime.datetime.now(datetime.UTC) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() -- 2.43.2 From yann.morin.1998 at free.fr Sun Feb 25 22:05:36 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 23:05:36 +0100 Subject: [Buildroot] [PATCH 2/3] support/scripts/pkg-stats: fkie json format In-Reply-To: References: Message-ID: <002f11dfd177512376508c9b129721afde9f0011.1708898731.git.yann.morin.1998@free.fr> Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) missed the fact that the layout of the FKIE data files are different from the NVD ones. Most differences are relatively trivial fields renaming, and those are easily spotted in this patch. There is however one key difference in the layout of the configurations. Where the NVD had "configurations" as an object with a "nodes" key, the FKIE has a "configurations" as a list of objects with a single "nodes" key; i.e. it is one-level deeper. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/cve.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index f12a8048cd..747ad881c9 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -128,7 +128,7 @@ class CVE: filename = CVE.download_nvd_year(nvd_dir, year) try: uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'CVE_Items.item') + content = ijson.items(uncompressed, 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise @@ -155,11 +155,11 @@ class CVE: for parsed_node in self.parse_node(child): yield parsed_node - for cpe in node.get('cpe_match', ()): + for cpe in node.get('cpeMatch', ()): if not cpe['vulnerable']: return - product = cpe_product(cpe['cpe23Uri']) - version = cpe_version(cpe['cpe23Uri']) + product = cpe_product(cpe['criteria']) + version = cpe_version(cpe['criteria']) # ignore when product is '-', which means N/A if product == '-': return @@ -191,7 +191,7 @@ class CVE: v_end = cpe['versionEndExcluding'] yield { - 'id': cpe['cpe23Uri'], + 'id': cpe['criteria'], 'v_start': v_start, 'op_start': op_start, 'v_end': v_end, @@ -199,14 +199,15 @@ class CVE: } def each_cpe(self): - for node in self.nvd_cve['configurations']['nodes']: - for cpe in self.parse_node(node): - yield cpe + for nodes in self.nvd_cve.get('configurations', []): + for node in nodes['nodes']: + for cpe in self.parse_node(node): + yield cpe @property def identifier(self): """The CVE unique identifier""" - return self.nvd_cve['cve']['CVE_data_meta']['ID'] + return self.nvd_cve['id'] @property def affected_products(self): -- 2.43.2 From yann.morin.1998 at free.fr Sun Feb 25 22:05:37 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Sun, 25 Feb 2024 23:05:37 +0100 Subject: [Buildroot] [PATCH 3/3] support/scripts/pkg-stats: sort CVEs in HTML output In-Reply-To: References: Message-ID: <23692da67b6987d5ea453d0d254628b6c2eb5582.1708898731.git.yann.morin.1998@free.fr> While the old NVD JSON feed provided data files where the CVEs were sorted by ID, the new feed from FKIE does not have sorted CVEs. Add a method to sort a list of CVE IDs (i.e. CVE ID strings, not CVE objects!), and use that when emiting the HTML output. The JSON output need not be sorted, because it is supposed to be used for post-processing, and we do not care about the ordering there; a consumer interested in sorting should sort on their side. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/cve.py | 7 +++++++ support/scripts/pkg-stats | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 747ad881c9..1a3c307e12 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -117,6 +117,13 @@ class CVE: open(path_metaf, "w").write(page_meta.text) return path_jsonf_xz + @staticmethod + def sort_id(cve_ids): + def cve_key(cve_id): + year, id_ = cve_id.split('-')[1:] + return (int(year), int(id_)) + return sorted(cve_ids, key=cve_key) + @classmethod def read_nvd_dir(cls, nvd_dir): """ diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 00d1eef09a..7eefd92a22 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1051,9 +1051,9 @@ def dump_html_pkg(f, pkg): f.write(f'
      see all ({cve_total}) ▾
      \n') if pkg.is_status_error("cve"): - for cve in pkg.cves: + for cve in cvecheck.CVE.sort_id(pkg.cves): f.write(f' {cve}
      \n') - for cve in pkg.unsure_cves: + for cve in cvecheck.CVE.sort_id(pkg.unsure_cves): f.write(f' {cve} (unsure)
      \n') elif pkg.is_status_na("cve"): f.write(f""" {pkg.status['cve'][1]}""") -- 2.43.2 From sen at hastings.org Sun Feb 25 22:05:44 2024 From: sen at hastings.org (Sen Hastings) Date: Sun, 25 Feb 2024 14:05:44 -0800 Subject: [Buildroot] [PATCH 1/1] support/scripts/pkg-stats: fix bug when sorting by hashfile Message-ID: <20240225220544.754965-1-sen@hastings.org> Because the div_class variable was not reassigned a value, cells in the latest_version column were still being assigned hash_file classes and so were being picked up as elements in the hash_file sort. This lead to execessive grid gap elements stacking up and creating huge blank spaces at the top of the page. This is very noticable on pages with a large number of packages, like the ones the autobuilder creates. original behaviour(click the "Hash file" column label twice): http://autobuild.buildroot.org/stats/master.html demo of fixed behaviour: https://sen-h.codeberg.page/pkg-stats-demos/@pages/fix-bug-when-sorting-by-hash-file.html Signed-off-by: Sen Hastings --- support/scripts/pkg-stats | 1 + 1 file changed, 1 insertion(+) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9307992d29..9ba356cb7c 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -977,6 +977,7 @@ def dump_html_pkg(f, pkg): # Latest version data_field_id = f'latest_version__{pkg_css_class}' + div_class = ["centered"] div_class.append(f'_{pkg_css_class}') div_class.append("latest_version data") if pkg.latest_version['status'] == RM_API_STATUS_ERROR: -- 2.25.1 From romain.naour at smile.fr Sun Feb 25 22:57:28 2024 From: romain.naour at smile.fr (Romain Naour) Date: Sun, 25 Feb 2024 23:57:28 +0100 Subject: [Buildroot] [PATCH] package/dracut: fix dracut_wrapper Message-ID: <20240225225728.2949216-1-romain.naour@smile.fr> As reported by Thierry Bultel [1], dracut doesn't work since the version bump to version 059. Further investigation by Andreas Naumann [2] reported that the issue come from this commit d010fa0 refactor(dracut-install): fork() instead of popen(), sanitise line reading [3]. The issue come from our dracut_wrapper and how DRACUT_LDD is defined. Indeed dracut expect DRACUT_LDD=ldd or a single binary (without arguments) but we are using "prelink-rtld --root='${sysroot}'". With the change introduced by [3], our DRACUT_LDD is used directly by execlp() leading to an error: execlp(ldd, ldd, fullsrcpath, (char *)NULL); Use mktemp to generate a temporary dracut-ldd script using prelink-rtld --root='${sysroot}' ${1} execute dracut.real in a subshell to cleanup the temporary file at the end of the dracut wrapper script. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243423 [tests.fs.test_cpio.TestCpioDracutGlibcMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243434 [tests.fs.test_cpio.TestCpioDracutMuslMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243567 [tests.fs.test_cpio.TestCpioDracutUclibcMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243559 [tests.fs.test_cpio.TestCpioDracutGlibc] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243504 [tests.fs.test_cpio.TestCpioDracutUclibc] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243498 [tests.fs.test_cpio.TestCpioDracutMusl] [1] http://lists.busybox.net/pipermail/buildroot/2024-February/684145.html [2] http://lists.busybox.net/pipermail/buildroot/2024-February/684503.html [3] https://github.com/dracutdevs/dracut/commit/d010fa0d7f8ef42ad31729d027d2e4be6dd6e588 Fixes: 145f01ded5 ("package/dracut: bump to version 059") Reported-by: Thierry Bultel Signed-off-by: Romain Naour --- package/dracut/dracut_wrapper | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/package/dracut/dracut_wrapper b/package/dracut/dracut_wrapper index 0464db17fe..889322d1c6 100644 --- a/package/dracut/dracut_wrapper +++ b/package/dracut/dracut_wrapper @@ -31,8 +31,18 @@ if [ -z "${sysroot}" ]; then fi topdir="$(dirname "$(realpath "$(dirname "${0}")")")" -export DRACUT_LDD="${topdir}/sbin/prelink-rtld --root='${sysroot}'" +DRACUT_LDD="$(mktemp /tmp/dracut-ldd.XXXXXX)" +cat >"${DRACUT_LDD}" < References: <20240221004400.27429-1-wilfred.mallawa@wdc.com> Message-ID: On Wed, 2024-02-21 at 18:50 +0100, Yann E. MORIN wrote: > Wilfred, All, > > On 2024-02-21 10:44 +1000, Wilfred Mallawa via buildroot spake > thusly: > > Additionally, add an upstream patch that fixes the configuration > > for > > "NONE" toolchain variant in libspdm. That is, where the build > > environment provides compile/link options. > > > > Signed-off-by: Wilfred Mallawa > > --- > > ?...eLists-remove-fixed-options-for-NONE.patch | 51 > > +++++++++++++++++++ > > ?package/libspdm/libspdm.hash????????????????? |? 2 +- > > ?package/libspdm/libspdm.mk??????????????????? |? 2 +- > > ?3 files changed, 53 insertions(+), 2 deletions(-) > > ?create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed- > > options-for-NONE.patch > > > > diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options- > > for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed- > > options-for-NONE.patch > > new file mode 100644 > > index 0000000000..0d1287a769 > > --- /dev/null > > +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for- > > NONE.patch > > @@ -0,0 +1,51 @@ > > +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 > > 2001 > > +From: Wilfred Mallawa > > +Date: Mon, 19 Feb 2024 09:56:14 +1000 > > +Subject: [PATCH] CMakeLists: remove fixed options for NONE > > + > > +The use of the NONE toolchain option is such that we can provide > > at the > > +build project level (buildroot etc...). However, the changes > > introduced > > +in 811f2b596def04b3a36368cf2098546d7907767f set certain > > compiler/linker > > +option that does not comply with the definition of the options as > > +specified in [1]. This change removes those options. > > + > > +[1] > > https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments > > + > > +Signed-off-by: Wilfred Mallawa > > ??? $ ./utils/docker-run make check-package > ??? package/libspdm/0001-CMakeLists-remove-fixed-options-for- > NONE.patch:0: missing Upstream in the header > (https://nightly.buildroot.org/#_additional_patch_documentation) > > So you need to add: > ??? Upstream: > https://github.com/DMTF/libspdm/commit/d4d6b138d727e484fa9d0fef476ca181681d0695 > Ah thanks, will fix this and send a V2 > Also, as I understand it, NONE is thus no longer a valid value for > -DTOOLCHAIN, so you should drop that from libspdm.mk as well, right? > NONE is still a valid option, this commit just partially reverts options that were incorrectly up-streamed for the NONE option. Regards, Wilfred > Regards, > Yann E. MORIN. > > > +--- > > + CMakeLists.txt | 19 ------------------- > > + 1 file changed, 19 deletions(-) > > + > > +diff --git a/CMakeLists.txt b/CMakeLists.txt > > +index 9c300cc817..f6cf17d269 100644 > > +--- a/CMakeLists.txt > > ++++ b/CMakeLists.txt > > +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") > > +???????? SET(CMAKE_EXE_LINKER_FLAGS "") > > + > > +???????? SET(CMAKE_C_LINK_EXECUTABLE "") > > +- > > +-??? elseif(TOOLCHAIN STREQUAL "NONE") > > +-??????? ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing - > > Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections > > -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables - > > flto -DUSING_LTO? -Wno-maybe-uninitialized -Wno-uninitialized? - > > Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror- > > implicit-function-declaration) > > +-??????? if(CMAKE_BUILD_TYPE STREQUAL "Debug") > > +-??????????? ADD_COMPILE_OPTIONS(-g) > > +-??????? endif() > > +-??????? if(GCOV STREQUAL "ON") > > +-??????? ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest- > > coverage) > > +-??????? endif() > > +-??????? SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe- > > uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but- > > set-variable -Wno-cast-qual -Wno-error=implicit-function- > > declaration) > > +-??????? SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow - > > Wmissing-prototypes -Wcast-align -Werror=address -Wstrict- > > prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write- > > strings -Werror-implicit-function-declaration -Wpointer-arith - > > Werror=pointer-arith -Wdeclaration-after-statement - > > Werror=declaration-after-statement -Wreturn-type -Werror=return- > > type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow > > -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field- > > initializers -Wformat-security -Werror=format-security -fno-common > > -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) > > +- > > +-??????? SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) > > +-??????? SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) > > +-??????? if(GCOV STREQUAL "ON") > > +-??????? SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}? -- > > coverage -lgcov -fprofile-arcs -ftest-coverage") > > +-??????? endif() > > +-??????? SET(CMAKE_C_LINK_EXECUTABLE " > > -o -Wl,-- > > start-group -Wl,--end-group") > > +- > > +???? endif() > > + > > +???? if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") > > +-- > > +2.43.2 > > + > > diff --git a/package/libspdm/libspdm.hash > > b/package/libspdm/libspdm.hash > > index 23faba1c4b..32415bcfce 100644 > > --- a/package/libspdm/libspdm.hash > > +++ b/package/libspdm/libspdm.hash > > @@ -1,3 +1,3 @@ > > ?# Locally calculated > > -sha256? > > 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183? > > libspdm-3.1.1.tar.gz > > +sha256? > > 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95? > > libspdm-3.2.0.tar.gz > > ?sha256? > > 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779? > > LICENSE.md > > diff --git a/package/libspdm/libspdm.mk > > b/package/libspdm/libspdm.mk > > index 34dbb457c4..2ec35be0ac 100644 > > --- a/package/libspdm/libspdm.mk > > +++ b/package/libspdm/libspdm.mk > > @@ -4,7 +4,7 @@ > > ?# > > ?################################################################## > > ############## > > ? > > -LIBSPDM_VERSION = 3.1.1 > > +LIBSPDM_VERSION = 3.2.0 > > ?LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) > > ?LIBSPDM_LICENSE = BSD-3-Clause > > ?LIBSPDM_LICENSE_FILES = LICENSE.md > > -- > > 2.43.2 > > > > _______________________________________________ > > buildroot mailing list > > buildroot at buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > From wilfred.mallawa at wdc.com Sun Feb 25 23:09:04 2024 From: wilfred.mallawa at wdc.com (Wilfred Mallawa) Date: Mon, 26 Feb 2024 09:09:04 +1000 Subject: [Buildroot] [PATCH v2 1/1] package/libspdm: bump version to 3.2.0 Message-ID: <20240225230903.22005-2-wilfred.mallawa@wdc.com> Additionally, add an upstream patch that fixes the configuration for "NONE" toolchain variant in libspdm. That is, where the build environment provides compile/link options. Reviewed-by: Alistair Francis Signed-off-by: Wilfred Mallawa --- Changes in V2: - Added missing "Upstream" URL to libspdm patch --- ...eLists-remove-fixed-options-for-NONE.patch | 52 +++++++++++++++++++ package/libspdm/libspdm.hash | 2 +- package/libspdm/libspdm.mk | 2 +- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch new file mode 100644 index 0000000000..0de0ad0079 --- /dev/null +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch @@ -0,0 +1,52 @@ +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 +From: Wilfred Mallawa +Date: Mon, 19 Feb 2024 09:56:14 +1000 +Subject: [PATCH] CMakeLists: remove fixed options for NONE + +The use of the NONE toolchain option is such that we can provide at the +build project level (buildroot etc...). However, the changes introduced +in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker +option that does not comply with the definition of the options as +specified in [1]. This change removes those options. + +[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments + +Upstream: https://github.com/DMTF/libspdm/commit/d4d6b138d727e484fa9d0fef476ca181681d0695 +Signed-off-by: Wilfred Mallawa +--- + CMakeLists.txt | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c300cc817..f6cf17d269 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(CMAKE_EXE_LINKER_FLAGS "") + + SET(CMAKE_C_LINK_EXECUTABLE "") +- +- elseif(TOOLCHAIN STREQUAL "NONE") +- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") +- ADD_COMPILE_OPTIONS(-g) +- endif() +- if(GCOV STREQUAL "ON") +- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) +- endif() +- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) +- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) +- +- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) +- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) +- if(GCOV STREQUAL "ON") +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") +- endif() +- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") +- + endif() + + if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") +-- +2.43.2 + diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash index 23faba1c4b..32415bcfce 100644 --- a/package/libspdm/libspdm.hash +++ b/package/libspdm/libspdm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183 libspdm-3.1.1.tar.gz +sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk index 34dbb457c4..2ec35be0ac 100644 --- a/package/libspdm/libspdm.mk +++ b/package/libspdm/libspdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPDM_VERSION = 3.1.1 +LIBSPDM_VERSION = 3.2.0 LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) LIBSPDM_LICENSE = BSD-3-Clause LIBSPDM_LICENSE_FILES = LICENSE.md -- 2.43.2 From fontaine.fabrice at gmail.com Mon Feb 26 06:52:11 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 26 Feb 2024 07:52:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: disable utest In-Reply-To: References: <20240225171149.1447606-1-fontaine.fabrice@gmail.com> Message-ID: Hello Giulio, Le dim. 25 f?vr. 2024 ? 20:23, Giulio Benetti a ?crit : > > Hi Fabrice, > > thanks a lot for the patch, > > On 25/02/24 18:11, Fabrice Fontaine wrote: > > Disable utest to avoid the following build failure raised since the > > addition of the package in commit > > b1dbd3f679e6660325472e3fdca72127d74e6929 if cunit is found: > > > > ../utest/tracefs-utest.c: In function 'test_uprobes_instance': > > ../utest/tracefs-utest.c:2492:19: error: 'PATH_MAX' undeclared (first use in this function) > > 2492 | char self[PATH_MAX] = { 0 }; > > | ^~~~~~~~ > > > > Fixes: b1dbd3f679e6660325472e3fdca72127d74e6929 > > - http://autobuild.buildroot.org/results/1a01883231dbc8a7688de26db9a08751165fe8fe > > > > Signed-off-by: Fabrice Fontaine > > --- > > .../0002-meson-add-utest-option.patch | 40 +++++++++++++++++++ > > package/libtracefs/libtracefs.mk | 3 +- > > 2 files changed, 42 insertions(+), 1 deletion(-) > > create mode 100644 package/libtracefs/0002-meson-add-utest-option.patch > > > > diff --git a/package/libtracefs/0002-meson-add-utest-option.patch b/package/libtracefs/0002-meson-add-utest-option.patch > > new file mode 100644 > > index 0000000000..90f73a7ea0 > > --- /dev/null > > +++ b/package/libtracefs/0002-meson-add-utest-option.patch > > @@ -0,0 +1,40 @@ > > +From 7a09e2d414959075e2177c50ef1d4bf606b9ccdc Mon Sep 17 00:00:00 2001 > > +From: Fabrice Fontaine > > +Date: Thu, 15 Feb 2024 21:20:29 +0100 > > +Subject: [PATCH] meson: add utest option > > + > > +Add utest option to allow the user to disable utest > > + > > +Signed-off-by: Fabrice Fontaine > > +Upstream: https://github.com/rostedt/libtracefs/pull/2 > > For this project you have to git send-email the patch to: > linux-trace-devel at vger.kernel.org > > as documented in: > https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/tree/README#n45 > > Can you do that? Otherwise I can send the patch. Done: https://lore.kernel.org/linux-trace-devel/20240225204759.3263-1-fontaine.fabrice at gmail.com/T/#u > > Thank you! > > Best regards > -- > Giulio Benetti > CEO&CTO at Benetti Engineering sas > > > +--- > > + meson.build | 2 +- > > + meson_options.txt | 2 ++ > > + 2 files changed, 3 insertions(+), 1 deletion(-) > > + > > +diff --git a/meson.build b/meson.build > > +index 3156f1c..d4cfd53 100644 > > +--- a/meson.build > > ++++ b/meson.build > > +@@ -35,7 +35,7 @@ incdir = include_directories(['include']) > > + > > + subdir('src') > > + subdir('include') > > +-if cunit_dep.found() > > ++if get_option('utest') and cunit_dep.found() > > + subdir('utest') > > + endif > > + if get_option('samples') > > +diff --git a/meson_options.txt b/meson_options.txt > > +index 8450992..a48efea 100644 > > +--- a/meson_options.txt > > ++++ b/meson_options.txt > > +@@ -18,3 +18,5 @@ option('doc', type : 'boolean', value: true, > > + description : 'produce documentation') > > + option('samples', type : 'boolean', value: true, > > + description : 'build samples') > > ++option('utest', type : 'boolean', value: true, > > ++ description : 'build utest') > > +-- > > +2.43.0 > > + > > diff --git a/package/libtracefs/libtracefs.mk b/package/libtracefs/libtracefs.mk > > index ed45fcbc50..21cb8e84e3 100644 > > --- a/package/libtracefs/libtracefs.mk > > +++ b/package/libtracefs/libtracefs.mk > > @@ -14,6 +14,7 @@ LIBTRACEFS_DEPENDENCIES = host-bison host-flex host-pkgconf libtraceevent > > > > LIBTRACEFS_CONF_OPTS = \ > > -Ddoc=false \ > > - -Dsamples=false > > + -Dsamples=false \ > > + -Dutest=false > > > > $(eval $(meson-package)) > Best Regards, Fabrice From buildroot at bubu1.eu Mon Feb 26 09:41:22 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Mon, 26 Feb 2024 10:41:22 +0100 Subject: [Buildroot] [PATCH] package/fastapi: bump to 0.110.0 Message-ID: <20240226094122.22631-1-buildroot@bubu1.eu> Changelog: https://github.com/tiangolo/fastapi/releases/tag/0.110.0 Signed-off-by: Marcus Hoffmann --- package/python-fastapi/python-fastapi.hash | 4 ++-- package/python-fastapi/python-fastapi.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-fastapi/python-fastapi.hash b/package/python-fastapi/python-fastapi.hash index c16b7d22de..224eccbccd 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 b48191c0322fb5479773925af005b2c1 fastapi-0.109.2.tar.gz -sha256 f3817eac96fe4f65a2ebb4baa000f394e55f5fccdaf7f75250804bc58f354f73 fastapi-0.109.2.tar.gz +md5 5e9226e70e1553a630599cf584ed53de fastapi-0.110.0.tar.gz +sha256 266775f0dcc95af9d3ef39bad55cff525329a931d5fd51930aadd4f428bf7ff3 fastapi-0.110.0.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 a2191c73b7..c1844960b9 100644 --- a/package/python-fastapi/python-fastapi.mk +++ b/package/python-fastapi/python-fastapi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FASTAPI_VERSION = 0.109.2 +PYTHON_FASTAPI_VERSION = 0.110.0 PYTHON_FASTAPI_SOURCE = fastapi-$(PYTHON_FASTAPI_VERSION).tar.gz -PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/01/d5/33a8992fe0e811211cd1cbc219cefa4732f9fb0555921346a59d1fec0040 +PYTHON_FASTAPI_SITE = https://files.pythonhosted.org/packages/61/53/326977db62bf34bbdfc64acb9414e1881af7ea14e8a062fd1c11a8697616 PYTHON_FASTAPI_SETUP_TYPE = pep517 PYTHON_FASTAPI_LICENSE = MIT PYTHON_FASTAPI_LICENSE_FILES = LICENSE -- 2.34.1 From giulio.benetti at benettiengineering.com Mon Feb 26 11:38:01 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Mon, 26 Feb 2024 12:38:01 +0100 Subject: [Buildroot] [PATCH 1/1] package/libtracefs: disable utest In-Reply-To: References: Message-ID: An HTML attachment was scrubbed... URL: From gael.portay at rtone.fr Mon Feb 26 11:43:30 2024 From: gael.portay at rtone.fr (=?utf-8?q?Ga=C3=ABl_PORTAY?=) Date: Mon, 26 Feb 2024 12:43:30 +0100 Subject: [Buildroot] [PATCH v3 1/1] configs: add raspberrypi 5 defconfig In-Reply-To: References: <20240209204545.86221-1-gael.portay@rtone.fr> Message-ID: Yann, all, Any chance to get it merged for the upcomming release? No offence :) Regards, Ga?l On Fri Feb 9, 2024 at 9:50 PM CET, Ga?l PORTAY wrote: > Sorry for that double post. > > On Fri Feb 9, 2024 at 9:45 PM CET, Ga?l PORTAY wrote: > > This configuration builds an image for the RaspberryPi 5. > > > > Cc: Adam Duskett > > Cc: Yann E. MORIN > > Signed-off-by: Ga?l PORTAY > > --- > > Dear maintainers, > > > > That change adds the raspberrypi5_defconfig for the Raspberry Pi 5 > > 64-bit. > > > > It uses the defconfig bcm2712_defconfig[2] and the device-tree source > > bcm2712-rpi-5-b.dts[3]. > > > > Note: The kernel defconfig defaults to 16k page-size; a kernel fragment > > is added to use a 4k page-size to compile and run using all toolchains. > > > > The Raspberry Pi 5 has now a dedicated debug UART connector[4] (it is > > always active and enabled; there is no more need to enable_uart=1 in the > > file config.txt). > > > > The UART device name changes to ttyAMA10 and the command line has to be > > updated in the file cmdline.txt. > > > > The Raspberry Pi 5 only supports 64-bit kernel[5]. > > > > Tested on internal toolchain: > > > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.11-1117-g95a905918c) 12.3.0, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Fri Feb 9 20:09:08 CET 2024 > > (...) > > # grep PageSize /proc/1/smaps | sort -u > > KernelPageSize: 4 kB > > MMUPageSize: 4 kB > > > > Tested on external Bootlin toolchain: > > > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-linux-gcc.br_real (Buildroot 2021.11-10014-g6257e8c) 13.2.0, GNU ld (GNU Binutils) 2.41) #1 SMP PREEMPT Fri Feb 9 20:54:08 CET 2024 > > (...) > > # grep PageSize /proc/1/smaps | sort -u > > KernelPageSize: 4 kB > > MMUPageSize: 4 kB > > > > Tested on external ARM toolchain: > > > > [ 0.000000] Linux version 6.1.61-v8_16k (gportay at archlinux) (aarch64-none-linux-gnu-gcc (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 13.2.1 20231009, GNU ld (Arm GNU Toolchain 13.2.rel1 (Build arm-13.7)) 2.41.0.20231009) #1 SMP PREEMPT Fri Feb 9 21:00:24 CET 2024 > > (...) > > # grep PageSize /proc/1/smaps | sort -u > > KernelPageSize: 4 kB > > MMUPageSize: 4 kB > > > > Changes since RFC: > > - Update README to add model Pi 5 B > > - Add support for 64K MMU page-size for ARM64 and Raspberry Pi 5 > > - Add Raspberry Pi 5 specific cmdline_5.txt to set its console on its > > debug uart (ttyAMA10 instead of ttyAMA0) > > - Remove 32-bit variant since Raspberry Pi 5 supports booting a 64-bit > > kernel only > > - Remove the property arm_64bit=1 from config_5_64bit.txt > > - Remove the _64bit suffix > > - Remove unecessary Pi 5 variant from package rpi-firmware > > > > Changes since v1: > > - Rebase on top of master > > - Remove the bumps for the rpi-firmware and linux packages > > - Bump the kernel to linux-17f135b742c4edb340afb365873c3a574f7e16cb > > (6.1.61, i.e. the same version as the other raspberrypi defconfigs) > > > > Changes since v2: > > - Rebase on top of master (remove applied patch) > > - Add a kernel fragment to force 4k page-size > > - Remove BR2_ARM64_PAGE_SIZE_16K from the board's defconfig > > > > [0]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#introduction > > [1]: https://www.raspberrypi.com/documentation/computers/config_txt.html#kernel > > [2]: https://github.com/raspberrypi/linux/commit/9cfb379147f803b0362b0fe249e5b145d232bea3 > > [3]: https://github.com/raspberrypi/linux/commit/1196bf1a7736ff0ab79f5012fa84082e298031a7 > > [4]: https://www.raspberrypi.com/documentation/computers/raspberry-pi-5.html#uart-connector > > [5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#arm_64bit > > > > Kind Regards, > > Ga?l PORTAY > > > > board/raspberrypi/cmdline_5.txt | 1 + > > board/raspberrypi/config_5.txt | 14 ++++++ > > board/raspberrypi/linux-4k-page-size.fragment | 1 + > > board/raspberrypi/readme.txt | 6 +++ > > board/raspberrypi5 | 1 + > > configs/raspberrypi5_defconfig | 47 +++++++++++++++++++ > > 6 files changed, 70 insertions(+) > > create mode 100644 board/raspberrypi/cmdline_5.txt > > create mode 100644 board/raspberrypi/config_5.txt > > create mode 100644 board/raspberrypi/linux-4k-page-size.fragment > > create mode 120000 board/raspberrypi5 > > create mode 100644 configs/raspberrypi5_defconfig > > > > diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt > > new file mode 100644 > > index 0000000000..ac457353e2 > > --- /dev/null > > +++ b/board/raspberrypi/cmdline_5.txt > > @@ -0,0 +1 @@ > > +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 > > diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt > > new file mode 100644 > > index 0000000000..bbed19fe46 > > --- /dev/null > > +++ b/board/raspberrypi/config_5.txt > > @@ -0,0 +1,14 @@ > > +# Please note that this is only a sample, we recommend you to change it to fit > > +# your needs. > > +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. > > +# See http://buildroot.org/manual.html#rootfs-custom > > +# and http://elinux.org/RPiconfig for a description of config.txt syntax > > + > > +kernel=Image > > + > > +# To use an external initramfs file > > +#initramfs rootfs.cpio.gz > > + > > +# Disable overscan assuming the display supports displaying the full resolution > > +# If the text shown on the screen disappears off the edge, comment this out > > +disable_overscan=1 > > diff --git a/board/raspberrypi/linux-4k-page-size.fragment b/board/raspberrypi/linux-4k-page-size.fragment > > new file mode 100644 > > index 0000000000..5df91df1aa > > --- /dev/null > > +++ b/board/raspberrypi/linux-4k-page-size.fragment > > @@ -0,0 +1 @@ > > +CONFIG_ARM64_4K_PAGES=y > > diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt > > index 9202b5ff37..aa6421ea01 100644 > > --- a/board/raspberrypi/readme.txt > > +++ b/board/raspberrypi/readme.txt > > @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: > > - the model B3 (aka Raspberry Pi 3). > > - the model B4 (aka Raspberry Pi 4). > > - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). > > + - the model B5 (aka Raspberry Pi 5). > > > > How to build it > > =============== > > @@ -64,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): > > > > $ make raspberrypicm4io_64_defconfig > > > > +For model 5 B: > > + > > + $ make raspberrypi5_defconfig > > + > > Build the rootfs > > ---------------- > > > > @@ -94,6 +99,7 @@ After building, you should obtain this tree: > > +-- bcm2710-rpi-cm3.dtb [1] > > +-- bcm2711-rpi-4-b.dtb [1] > > +-- bcm2711-rpi-cm4.dtb [1] > > + +-- bcm2712-rpi-5-b.dtb [1] > > +-- bcm2837-rpi-3-b.dtb [1] > > +-- boot.vfat > > +-- rootfs.ext4 > > diff --git a/board/raspberrypi5 b/board/raspberrypi5 > > new file mode 120000 > > index 0000000000..fcdafc81ed > > --- /dev/null > > +++ b/board/raspberrypi5 > > @@ -0,0 +1 @@ > > +raspberrypi > > \ No newline at end of file > > diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig > > new file mode 100644 > > index 0000000000..d0760824bd > > --- /dev/null > > +++ b/configs/raspberrypi5_defconfig > > @@ -0,0 +1,47 @@ > > +BR2_aarch64=y > > +BR2_cortex_a76_a55=y > > +BR2_ARM_FPU_VFPV4=y > > + > > +BR2_TOOLCHAIN_BUILDROOT_CXX=y > > + > > +BR2_SYSTEM_DHCP="eth0" > > + > > +# Linux headers same as kernel, a 6.1 series > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > > + > > +BR2_LINUX_KERNEL=y > > +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > > +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" > > +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" > > + > > +# Build the DTB from the kernel sources > > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" > > + > > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > > + > > +BR2_PACKAGE_RPI_FIRMWARE=y > > +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" > > +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" > > +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set > > + > > +# Required tools to create the SD image > > +BR2_PACKAGE_HOST_DOSFSTOOLS=y > > +BR2_PACKAGE_HOST_GENIMAGE=y > > +BR2_PACKAGE_HOST_MTOOLS=y > > + > > +# Filesystem / image > > +BR2_TARGET_ROOTFS_EXT2=y > > +BR2_TARGET_ROOTFS_EXT2_4=y > > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > > +# BR2_TARGET_ROOTFS_TAR is not set > > +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" > > +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" > > + > > +# Enable compressed kernel module support > > +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y > > +BR2_PACKAGE_KMOD_TOOLS=y > > +BR2_PACKAGE_XZ=y > > +BR2_PACKAGE_KMOD=y > > +BR2_PACKAGE_HOST_KMOD_XZ=y > > -- > > 2.43.0 From laurentbadel at eaton.com Mon Feb 26 09:19:04 2024 From: laurentbadel at eaton.com (Laurent Badel) Date: Mon, 26 Feb 2024 09:19:04 +0000 Subject: [Buildroot] [PATCH 1/1] package/micropython: update PCRE dependency to PCRE2 Message-ID: <20240226091904.14928-1-laurentbadel@eaton.com> micropython-lib/unix-ffi/re/re.py uses libpcre2-8 since commit d8e163b. Thus, update micropython package to select the PCRE2 package instead of PCRE. Signed-off-by: Laurent Badel --- package/micropython/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 26a00baa..849a5452 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -13,7 +13,7 @@ if BR2_PACKAGE_MICROPYTHON config BR2_PACKAGE_MICROPYTHON_LIB bool "micropython-lib" - select BR2_PACKAGE_PCRE # runtime + select BR2_PACKAGE_PCRE2 # runtime help Core Python libraries ported to MicroPython. -- 2.17.1 From arnout at mind.be Mon Feb 26 14:02:15 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Mon, 26 Feb 2024 15:02:15 +0100 Subject: [Buildroot] [PATCH v4 3/3] package/python3: bump version to 3.12.1 In-Reply-To: References: <20231218220457.1705749-1-adam.duskett@amarulasolutions.com> <20231218220457.1705749-3-adam.duskett@amarulasolutions.com> <20240206233318.593730bd@windsurf> <87wmqut14w.fsf__36507.8827760712$1708783134$gmane$org@48ers.dk> Message-ID: On 25/02/2024 12:21, Yann E. MORIN wrote: > Bernd, All, > > On 2024-02-24 20:01 +0100, Bernd Kuhls spake thusly: >> Am Sat, 24 Feb 2024 14:58:23 +0100 schrieb Peter Korsgaard: >> >>> We unfortunately are still having a number of build failures because of >>> this, E.G. for target == host >> >> Hi, >> >> ftr, the host == target problem is solved by using a patch from here: >> https://github.com/python/cpython/issues/115382#issuecomment-1952936367 > > The issue with that, is that none of the upstream maintainers have > chimed in to express their view on whether this is the correct approach, > or to suggest something else. > > If we go and carry that patch without upstream feedback, we risk > carrying forever without the issue ever being fixed upstream. > > What happens in other buildsystems, like OE or openWRT? My colleague Benoit (not on the list, but added in Cc) ran into this Python issue himself, so I asked him to investigate a little. Here are his conclusions. OpenWRT uses currently python 3.11.7 on the master branch as it can be seen here: https://github.com/openwrt/packages/blob/master/lang/python/python3-version.mk They updated from python 3.11.6 to 3.11.7 on dec 13 2023 I see no issues, PR, nor commit regarding an update to python 3.12 Regarding OpenEmbedded, here are the latest python version that are used: dunfell (3.1 LTS) 3.8.18 kirkstone (4.0 LTS) 3.10.13 nanbield (4.3) 3.11.5 Scarthgap (5.0 - Release date : April 2024): 3.12.1 python: update 3.11.5 -> 3.12.1: https://git.openembedded.org/openembedded-core/commit/?h=scarthgap&id=716d82352545d3667a658b69d65d6127678dd150 From the moment they have updated from 3.10.6 (f10cdc155e47af5627ee999c57e1d083f9382a91), I don't see any new major patch... I (Arnout) think that they don't have the problem because since 2019 they're carrying the following patch. From 5b66463c10fec1440e977d5a21a0167862d6d79c Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Date: Tue, 18 Nov 2014 03:35:33 -0500 Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for PYTHON_FOR_BUILD When building x86->x86 the system will try to execute .so and related items from the default PYTHONPATH. This will fail if the target CPU contains instructions that the host CPU does not have, add CROSSPYTHONPATH into PYTHONPATH so we can prepend the list to find correct libs. Upstream-Status: Inappropriate [OE-Core integration specific] Credits-to: Mark Hatle Credits-to: Jackie Huang Signed-off-by: Ricardo Ribalda (CROSSPYTHONPATH points to the equivalent of our host/lib/python3.X). Regards, Arnout > > Regards, > Yann E. MORIN. > From fontaine.fabrice at gmail.com Mon Feb 26 17:32:02 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 26 Feb 2024 18:32:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/poco: bump to version 1.13.2 Message-ID: <20240226173202.1032744-1-fontaine.fabrice@gmail.com> This bump will fix the following build failure raised since bump of expat to version 2.6.0 in commit 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 thanks to https://github.com/pocoproject/poco/commit/75f7042b70092e79c6b770b18d033a061c84e2c5: src/ParserEngine.cpp: In member function 'void Poco::XML::ParserEngine::init()': src/ParserEngine.cpp:510:17: error: 'XML_SetBillionLaughsAttackProtectionMaximumAmplification' was not declared in this scope; did you mean 'setBillionLaughsAttackProtectionMaximumAmplification'? 510 | XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/pocoproject/poco/blob/poco-1.13.2-release/CHANGELOG Fixes: 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 - http://autobuild.buildroot.org/results/7fad881f85d3b89abdee35388088965f05ead277 Signed-off-by: Fabrice Fontaine --- package/poco/poco.hash | 2 +- package/poco/poco.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 9a7981171a..0a1e900b3f 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 71ef96c35fced367d6da74da294510ad2c912563f12cd716ab02b6ed10a733ef poco-1.12.4.tar.gz +sha256 c01221870aa9bccedf1de39890279699207848fe61a0cfb6aeec7c5942c4627f poco-1.13.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 2d0233a8ce..f8c2a658de 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.12.4 +POCO_VERSION = 1.13.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE -- 2.43.0 From fontaine.fabrice at gmail.com Mon Feb 26 17:36:44 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Mon, 26 Feb 2024 18:36:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/erlang: fix build with autoconf 2.72 Message-ID: <20240226173644.1077579-1-fontaine.fabrice@gmail.com> Use ERLANG_FIX_AUTOCONF_VERSION to fix the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: ERROR: autoconf of version 2.72 found in path! You need to have autoconf of version 2.71 in path. Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/c9e8df3427fca9e8e75488e32bca18e81009238c Signed-off-by: Fabrice Fontaine --- package/erlang/erlang.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 1600b59381..84d2f4e898 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -17,14 +17,22 @@ ERLANG_CPE_ID_VENDOR = erlang ERLANG_CPE_ID_PRODUCT = erlang\/otp ERLANG_INSTALL_STAGING = YES +define ERLANG_FIX_AUTOCONF_VERSION + $(SED) "s/USE_AUTOCONF_VERSION=.*/USE_AUTOCONF_VERSION=$(AUTOCONF_VERSION)/" $(@D)/otp_build +endef + # Patched erts/aclocal.m4 define ERLANG_RUN_AUTOCONF cd $(@D) && PATH=$(BR_PATH) ./otp_build update_configure --no-commit endef ERLANG_DEPENDENCIES += host-autoconf -ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF HOST_ERLANG_DEPENDENCIES += host-autoconf -HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +HOST_ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF # Return the EIV (Erlang Interface Version, EI_VSN) # $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr -- 2.43.0 From ju.o at free.fr Mon Feb 26 20:35:32 2024 From: ju.o at free.fr (Julien Olivain) Date: Mon, 26 Feb 2024 21:35:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/mysql: change default implementation to mariadb Message-ID: <20240226203532.12112-1-ju.o@free.fr> The mysql package is a virtual package with two implementations: oracle-mysql (the initial project), and mariadb (the fork of mysql). This virtual package was introduced in commit [1] (2016). The last version bump of oracle-mysql was in commit [2] (2014). This mysql version 5.1.73 dates from 2013 [3]. Package statistics at [4] reports 177 CVEs on this oracle-mysql version (as of Buildroot tag 2024.02-rc1). Finally, oracle-mysql has 12 package patches accumulated over the time and there is nobody registered in the DEVELOPER file for it. On the other hand, the Buildroot mariadb package seems to be in a better shape: the package version is more recent, and received frequent updates, since its introduction. There is several packages selecting BR2_PACKAGE_MYSQL, which will use the old oracle-mysql without the user knowing it (other than generating the CVE list with "make pkg-stats"). In the meantime oracle-mysql receive a major update, this commits changes the default implementation of the mysql virtual package from oracle-mysql to mariadb. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/3d707d2b4fa6362cb37754f6c5fbb06240f5faf5 [2] https://gitlab.com/buildroot.org/buildroot/-/commit/42c56751fc554503a03d4a914ce2e814eeaf5a41 [3] https://github.com/mysql/mysql-server/releases/tag/mysql-5.1.73 [4] http://autobuild.buildroot.org/stats/master.html Signed-off-by: Julien Olivain --- Patch tested on branch master at commit 7a9ba7a with commands: make check-package ... 0 warnings generated # Build packages using mysql cat > .config < Signed-off-by: Adam Duskett --- package/libsepol/libsepol.hash | 2 +- package/libsepol/libsepol.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsepol/libsepol.hash b/package/libsepol/libsepol.hash index c243aaae2b..1369d820e1 100644 --- a/package/libsepol/libsepol.hash +++ b/package/libsepol/libsepol.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 78fdaf69924db780bac78546e43d9c44074bad798c2c415d0b9bb96d065ee8a2 libsepol-3.5.tar.gz +sha256 c9dc585ea94903d784d597c861cd5dce6459168f95e22b31a0eab1cdd800975a libsepol-3.6.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk index f7782542ec..6361cc66bc 100644 --- a/package/libsepol/libsepol.mk +++ b/package/libsepol/libsepol.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEPOL_VERSION = 3.5 +LIBSEPOL_VERSION = 3.6 LIBSEPOL_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEPOL_VERSION) LIBSEPOL_LICENSE = LGPL-2.1+ LIBSEPOL_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:38 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:38 -0700 Subject: [Buildroot] [PATCH 2/9] package/libsemanage: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-2-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- package/libsemanage/libsemanage.hash | 2 +- package/libsemanage/libsemanage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libsemanage/libsemanage.hash b/package/libsemanage/libsemanage.hash index 73df34bde9..862e49f52e 100644 --- a/package/libsemanage/libsemanage.hash +++ b/package/libsemanage/libsemanage.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 f53534e50247538280ed0d76c6ce81d8fb3939bd64cadb89da10dba42e40dd9c libsemanage-3.5.tar.gz +sha256 41138f46222439e1242f27c1587e95cf54a059259aaf1681db642cc30c4e0d60 libsemanage-3.6.tar.gz # Hash for license file sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk index 0fbdc5ae8d..7742e7060c 100644 --- a/package/libsemanage/libsemanage.mk +++ b/package/libsemanage/libsemanage.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSEMANAGE_VERSION = 3.5 +LIBSEMANAGE_VERSION = 3.6 LIBSEMANAGE_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSEMANAGE_VERSION) LIBSEMANAGE_LICENSE = LGPL-2.1+ LIBSEMANAGE_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:39 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:39 -0700 Subject: [Buildroot] [PATCH 3/9] package/libselinux: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-3-adam.duskett@amarulasolutions.com> Remove upstreamed patches Signed-off-by: Adam Duskett --- package/libselinux/0001-fix-musl-build.patch | 38 -------------- ...T-and-rely-on-the-installed-file-nam.patch | 50 ------------------- ...inux-set-CFLAGS-for-pip-installation.patch | 43 ---------------- package/libselinux/libselinux.hash | 2 +- package/libselinux/libselinux.mk | 2 +- 5 files changed, 2 insertions(+), 133 deletions(-) delete mode 100644 package/libselinux/0001-fix-musl-build.patch delete mode 100644 package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch delete mode 100644 package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch diff --git a/package/libselinux/0001-fix-musl-build.patch b/package/libselinux/0001-fix-musl-build.patch deleted file mode 100644 index b8b16be26f..0000000000 --- a/package/libselinux/0001-fix-musl-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 78f7f09028fdd6a5e8e4e4b584749621eaef412f Mon Sep 17 00:00:00 2001 -From: Yann E. MORIN" -Date: Sat, 7 Dec 2019 17:24:50 -0800 -Subject: [PATCH] fix undefined macros in musl - -musl does not define glibc-specific macros, so use a simple version of -the macro when it is not defined. - -This is very inefficient, however, but copying the code from glibc is -not really possible because it is LGPL while libselinux in Public -Domain, and we want to avoid license propagation, so this macro is -completely written from scratch, and non-optimal. - -Signed-off-by: "Yann E. MORIN" -[Updated for 3.5] -Signed-off-by: Adam Duskett -diff --git a/src/booleans.c b/src/booleans.c -index ffa8d26..8569002 100644 ---- a/src/booleans.c -+++ b/src/booleans.c -@@ -64,6 +64,14 @@ int security_get_boolean_names(char ***names, int *len) - goto bad; - } - -+/* Simple (but inefficient) version of _D_ALLOC_NAMLEN when -+ * building with a C library that misses it (e.g. musl). -+ * Note: glibc does a strlen on (d)->d_name, so assume it is safe. -+ */ -+#ifndef _D_ALLOC_NAMLEN -+#define _D_ALLOC_NAMLEN(d) (strlen((d)->d_name)+1) -+#endif -+ - for (i = 0; i < *len; i++) { - n[i] = strdup(namelist[i]->d_name); - if (!n[i]) { --- -2.23.0 - diff --git a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch b/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch deleted file mode 100644 index c744ca4069..0000000000 --- a/package/libselinux/0002-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c26495025ab1a2597e5433b67a3bf793d3ce1e08 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 25 Oct 2019 13:37:14 +0200 -Subject: [PATCH] Do not use PYCEXT, and rely on the installed file name - -PYCEXT is computed by asking the Python intrepreter what is the -file extension used for native Python modules. - -Unfortunately, when cross-compiling, the host Python doesn't give the -proper result: it gives the result matching the build machine, and not -the target machine. Due to this, the symlink has an incorrect name, -and doesn't point to the .so file that was actually built/installed. - -To address this and keep things simple, this patch just changes the ln -invocation to rely on the name of the _selinux*.so Python module that -was installed. - -Signed-off-by: Antoine Tenart -[Refreshed for 3.1] -Signed-off-by: Thomas Petazzoni -[Refreshed for 3.5] -Signed-off-by: Adam Duskett ---- - src/Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 190016e2af34..7ee22fd35da3 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -15,7 +15,6 @@ INCLUDEDIR ?= $(PREFIX)/include - PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX)) - PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX)) - PYTHONLIBDIR ?= $(shell $(PYTHON) -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '$(PREFIX)', 'base': '$(PREFIX)'}))") --PYCEXT ?= $(shell $(PYTHON) -c 'import importlib.machinery;print(importlib.machinery.EXTENSION_SUFFIXES[0])') - RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]') - RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]') - RUBYINSTALL ?= $(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]') -@@ -189,7 +188,7 @@ install: all - install-pywrap: pywrap - $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . - install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py -- ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) -+ ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux*.so $(DESTDIR)$(PYTHONLIBDIR)/ - - install-rubywrap: rubywrap - test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL) --- -2.26.2 - diff --git a/package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch b/package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch deleted file mode 100644 index c08529c44f..0000000000 --- a/package/libselinux/0003-libselinux-set-CFLAGS-for-pip-installation.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c9b3cbb654ca1e834d47f52af9f170b9f38c857a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= -Date: Thu, 20 Apr 2023 18:27:00 +0200 -Subject: [PATCH] libselinux: set CFLAGS for pip installation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Explicitly set CFLAGS for the pip install command, similar to calling -setup.py, to ignore known compiler warnings treated as errors, e.g.: - - selinuxswig_python_wrap.c:3593:19: error: 'sidget' is deprecated [-Werror,-Wdeprecated-declarations] - result = (int)sidget(arg1); - ^ - selinuxswig_python_wrap.c:15024:1: error: no previous prototype for function 'PyInit__selinux' [-Werror,-Wmissing-prototypes] - SWIG_init(void) { - ^ - -Signed-off-by: Christian G?ttsche -Acked-by: Petr Lautrbach -Upstream: https://github.com/SELinuxProject/selinux/commit/c9b3cbb654ca1e834d47f52af9f170b9f38c857a -[yann.morin.1998 at free.fr: backport from upstream] -Signed-off-by: Yann E. MORIN ---- - libselinux/src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile -index 36d57122..f9a1e5f5 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -187,7 +187,7 @@ install: all - ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET) - - install-pywrap: pywrap -- $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . -+ CFLAGS="$(CFLAGS) $(SWIG_CFLAGS)" $(PYTHON) -m pip install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR) --ignore-installed --no-deps` $(PYTHON_SETUP_ARGS) . - install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py - ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT) - --- -2.25.1 - diff --git a/package/libselinux/libselinux.hash b/package/libselinux/libselinux.hash index 14bc627a80..4e0a2ca317 100644 --- a/package/libselinux/libselinux.hash +++ b/package/libselinux/libselinux.hash @@ -1,5 +1,5 @@ # From: https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 9a3a3705ac13a2ccca2de6d652b6356fead10f36fb33115c185c5ccdf29eec19 libselinux-3.5.tar.gz +sha256 ba4e0ef34b270e7672a5e5f1b523fe2beab3a40bb33d9389f4ad3a8728f21b52 libselinux-3.6.tar.gz # Hash for license file sha256 86657b4c0fe868d7cbd977cb04c63b6c667e08fa51595a7bc846ad4bed8fc364 LICENSE diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 601038e46f..97671f1cca 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSELINUX_VERSION = 3.5 +LIBSELINUX_VERSION = 3.6 LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(LIBSELINUX_VERSION) LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:40 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:40 -0700 Subject: [Buildroot] [PATCH 4/9] package/policycoreutils: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-4-adam.duskett@amarulasolutions.com> setsebool/Makefile now unconditionally links against libsepol. As such, it is now a new dependency. Signed-off-by: Adam Duskett --- package/policycoreutils/Config.in | 1 + package/policycoreutils/policycoreutils.hash | 2 +- package/policycoreutils/policycoreutils.mk | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/policycoreutils/Config.in b/package/policycoreutils/Config.in index 3201c8fede..46a367129a 100644 --- a/package/policycoreutils/Config.in +++ b/package/policycoreutils/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_POLICYCOREUTILS depends on !BR2_STATIC_LIBS # libsemanage depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsemanage -> libselinux -> libsepol select BR2_PACKAGE_LIBSEMANAGE + select BR2_PACKAGE_LIBSEPOL select BR2_PACKAGE_LIBCAP_NG help Policycoreutils is a collection of policy utilities diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index e29d192b13..ea45116912 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 78453e1529fbbf800e88860094d555e781ce1fba11a7ef77b5aabb43e1173276 policycoreutils-3.5.tar.gz +sha256 a76ac431ea40a35a83164ce9007909c1c6c12fd1056627f622144e4a705c0a2c policycoreutils-3.6.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 61d91066d4..773cd4626b 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -4,13 +4,13 @@ # ################################################################################ -POLICYCOREUTILS_VERSION = 3.5 +POLICYCOREUTILS_VERSION = 3.6 POLICYCOREUTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(POLICYCOREUTILS_VERSION) POLICYCOREUTILS_LICENSE = GPL-2.0 POLICYCOREUTILS_LICENSE_FILES = LICENSE POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject -POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) +POLICYCOREUTILS_DEPENDENCIES = libsemanage libsepol libcap-ng $(TARGET_NLS_DEPENDENCIES) POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:41 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:41 -0700 Subject: [Buildroot] [PATCH 5/9] package/checkpolicy: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-5-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- package/checkpolicy/checkpolicy.hash | 2 +- package/checkpolicy/checkpolicy.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/checkpolicy/checkpolicy.hash b/package/checkpolicy/checkpolicy.hash index fcfd81c554..d2ecc7265a 100644 --- a/package/checkpolicy/checkpolicy.hash +++ b/package/checkpolicy/checkpolicy.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 7aa48ab2222a0b9881111d6d7f70c3014d3d9338827d9e02df105a68c0df5dbc checkpolicy-3.5.tar.gz +sha256 1b346b3cdd4f8a78a157627bad64a3b3479c67b6a19d15e6d5c8694620eadbc1 checkpolicy-3.6.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index 024d306233..109aaf6072 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKPOLICY_VERSION = 3.5 +CHECKPOLICY_VERSION = 3.6 CHECKPOLICY_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(CHECKPOLICY_VERSION) CHECKPOLICY_LICENSE = GPL-2.0 CHECKPOLICY_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:42 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:42 -0700 Subject: [Buildroot] [PATCH 6/9] package/restorecond: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-6-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- package/restorecond/restorecond.hash | 2 +- package/restorecond/restorecond.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/restorecond/restorecond.hash b/package/restorecond/restorecond.hash index 215c9192f4..5b86afdcc0 100644 --- a/package/restorecond/restorecond.hash +++ b/package/restorecond/restorecond.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 f00d8caddb6aba2793c65e69154d04671b52f3d37e081b0e96c1b443fe23c2fe restorecond-3.5.tar.gz +sha256 8f8aa2c6c66bcc6d91c6edd63913e5d738de6428928f27d1019d89c31cf347b1 restorecond-3.6.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index cd40905230..4e9a66c592 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -4,7 +4,7 @@ # ################################################################################ -RESTORECOND_VERSION = 3.5 +RESTORECOND_VERSION = 3.6 RESTORECOND_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(RESTORECOND_VERSION) RESTORECOND_LICENSE = GPL-2.0 RESTORECOND_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:43 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:43 -0700 Subject: [Buildroot] [PATCH 7/9] package/semodule-utils: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-7-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- package/semodule-utils/semodule-utils.hash | 2 +- package/semodule-utils/semodule-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/semodule-utils/semodule-utils.hash b/package/semodule-utils/semodule-utils.hash index ac3357d3fa..5e7d698f3b 100644 --- a/package/semodule-utils/semodule-utils.hash +++ b/package/semodule-utils/semodule-utils.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 c9a550a737051ebaf2c102f665c7ec2f85e7232870980aa0067998459b414283 semodule-utils-3.5.tar.gz +sha256 eedb88f2b2124e538f2d614be063c0d9ac3eacc0c51a4da44500ca1ed1ba16f4 semodule-utils-3.6.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/semodule-utils/semodule-utils.mk b/package/semodule-utils/semodule-utils.mk index 9a0f084128..b58f7535f1 100644 --- a/package/semodule-utils/semodule-utils.mk +++ b/package/semodule-utils/semodule-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEMODULE_UTILS_VERSION = 3.5 +SEMODULE_UTILS_VERSION = 3.6 SEMODULE_UTILS_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SEMODULE_UTILS_VERSION) SEMODULE_UTILS_LICENSE = GPL-2.0 SEMODULE_UTILS_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:44 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:44 -0700 Subject: [Buildroot] [PATCH 8/9] package/selinux-python: bump version to 3.6 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-8-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- package/selinux-python/selinux-python.hash | 2 +- package/selinux-python/selinux-python.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/selinux-python/selinux-python.hash b/package/selinux-python/selinux-python.hash index 3592540703..96be214fd3 100644 --- a/package/selinux-python/selinux-python.hash +++ b/package/selinux-python/selinux-python.hash @@ -1,5 +1,5 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 8245bb4dae59333461f19ca0c79a829081f07972fa5e3ad4c2b2b917dd71d96b selinux-python-3.5.tar.gz +sha256 e2867d4cd26f9869c55216cc20ca7d10442491a0fbf256116ade99ec39426ec0 selinux-python-3.6.tar.gz # Hash for license file sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/selinux-python/selinux-python.mk b/package/selinux-python/selinux-python.mk index 7505474aa4..84fc9cbc22 100644 --- a/package/selinux-python/selinux-python.mk +++ b/package/selinux-python/selinux-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -SELINUX_PYTHON_VERSION = 3.5 +SELINUX_PYTHON_VERSION = 3.6 SELINUX_PYTHON_SITE = https://github.com/SELinuxProject/selinux/releases/download/$(SELINUX_PYTHON_VERSION) SELINUX_PYTHON_LICENSE = GPL-2.0 SELINUX_PYTHON_LICENSE_FILES = LICENSE -- 2.43.2 From adam.duskett at amarulasolutions.com Mon Feb 26 20:54:45 2024 From: adam.duskett at amarulasolutions.com (Adam Duskett) Date: Mon, 26 Feb 2024 13:54:45 -0700 Subject: [Buildroot] [PATCH 9/9] package/setools: bump version to 4.4.4 In-Reply-To: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> References: <20240226205446.842600-1-adam.duskett@amarulasolutions.com> Message-ID: <20240226205446.842600-9-adam.duskett@amarulasolutions.com> Signed-off-by: Adam Duskett --- ...1-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch | 2 +- package/setools/setools.hash | 2 +- package/setools/setools.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch b/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch index 36063a4e13..67c306e99c 100644 --- a/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch +++ b/package/setools/0001-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch @@ -59,7 +59,7 @@ index 5f4e764..a27b781 100755 import argparse import sys import logging -@@ -91,8 +92,8 @@ elif args.booleans is not None: +@@ -94,8 +95,8 @@ elif args.booleans is not None: try: p = setools.SELinuxPolicy(args.policy) m = setools.PermissionMap(args.map) diff --git a/package/setools/setools.hash b/package/setools/setools.hash index 6a61fc2809..bb98231de9 100644 --- a/package/setools/setools.hash +++ b/package/setools/setools.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 29f5e7d98764a6942b2e32c8aa44da6a618882818c79599ade967ece0cf1dace setools-4.4.3.tar.gz +sha256 92afeea2f2433cbb981ff47f6ce4e2485d9202b530842f7f5d95f905b2ddaea4 setools-4.4.4.tar.gz sha256 0e58d74751e394f39748c7b7b4039d6a883b5def9711160668ba962b52e69e01 COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/setools/setools.mk b/package/setools/setools.mk index efb3869e5b..1ffc2852d2 100644 --- a/package/setools/setools.mk +++ b/package/setools/setools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SETOOLS_VERSION = 4.4.3 +SETOOLS_VERSION = 4.4.4 SETOOLS_SITE = $(call github,SELinuxProject,setools,$(SETOOLS_VERSION)) SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-python-cython host-swig SETOOLS_INSTALL_STAGING = YES -- 2.43.2 From bobrofon at gmail.com Tue Feb 27 12:01:23 2024 From: bobrofon at gmail.com (Sergey Bobrenok) Date: Tue, 27 Feb 2024 15:01:23 +0300 Subject: [Buildroot] [PATCH 1/1] package/sdbus-cpp: bump to version 1.5.0 Message-ID: <20240227120123.405763-1-bobrofon@gmail.com> Changelog: https://github.com/Kistler-Group/sdbus-cpp/releases/tag/v1.5.0 Signed-off-by: Sergey Bobrenok --- package/sdbus-cpp/sdbus-cpp.hash | 2 +- package/sdbus-cpp/sdbus-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index f4336228af..b5ca7ecdff 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ca7405c7f0f9ae3023dcfa37bc68974c4b8a1c9ea2909b970e0aedc3e8657ee6 sdbus-cpp-1.4.0.tar.gz +sha256 577986929f911320fb9ef6a3e2badd464dc38411ebc25d2966f5cb85c39f0897 sdbus-cpp-1.5.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING sha256 a1c9e75e25d8f2ce18017c88978edab2f0dbc7814ad0697d4ff2e5e59959f657 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 9ffaeb26d2..18fc6a88a9 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDBUS_CPP_VERSION = 1.4.0 +SDBUS_CPP_VERSION = 1.5.0 SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd -- 2.43.2 From romain.naour at smile.fr Tue Feb 27 12:58:59 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 27 Feb 2024 13:58:59 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: bump to version 3.0.17 In-Reply-To: References: <20240211214935.1603160-1-ju.o__4871.99223586998$1707688208$gmane$org@free.fr> Message-ID: Hello Julien, Bernd, All, Le 19/02/2024 ? 21:04, Bernd Kuhls a ?crit?: > Am Sun, 11 Feb 2024 22:49:35 +0100 schrieb Julien Olivain: > >> For commit logs, see: >> https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ > > Hi Julien, > > this bump breaks building syslinux (not yet caught by the autobuilders): > https://bugs.gentoo.org/921597 Not by autobuilders but by the gitlab-ci: https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 The issue was introduced in gnu-efi 3.0.16 [1] that seems wrong/incomplete if we compare with inttypes.h header from glibc [2]. Julien, can you have a look? Thanks! [1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d [2] https://sourceware.org/git/?p=glibc.git;a=blob;f=stdlib/inttypes.h;h=cfda146aa9b956dc9f462bd65fb828e5929bc90b;hb=HEAD#l29 Best regards, Romain > > Regards, Bernd > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From flavio.tapajos at newtesc.com.br Tue Feb 27 15:38:15 2024 From: flavio.tapajos at newtesc.com.br (=?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?=) Date: Tue, 27 Feb 2024 12:38:15 -0300 Subject: [Buildroot] [PATCH 1/1] package/rsyslog: bump version to 8.2402.0 Message-ID: <20240227153815.583392-1-flavio.tapajos@newtesc.com.br> Signed-off-by: Fl?vio Tapaj?s --- package/rsyslog/rsyslog.hash | 2 +- package/rsyslog/rsyslog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 9c00365355..212a1accea 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 774032006128a896437f5913e132aa27dbfb937cd8847e449522d5a12d63d03e rsyslog-8.2312.0.tar.gz +sha256 acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba rsyslog-8.2402.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 1919863f4f..ad4cfa24a7 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2312.0 +RSYSLOG_VERSION = 8.2402.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 -- 2.44.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:02 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:02 +0100 Subject: [Buildroot] [PATCH v7 00/17] Add support for AM62x-SK HS-FS devices Message-ID: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> The SK-AM62B-P1 is the newest version of SK-AM62 which includes high-security field-securable (HS-FS) silicon to optionally customize keys and encryption for security applications. This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, which, however, was buggy. This series fixes the errors and bumps the Linux kernel and U-Boot required for such a new device. Dario Binacchi (17): configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version boot/ti-k3-r5-loader: bump to version 2024.01 package/python-attrs: add host variant package/python-rpds-py: add host variant package/python-referencing: add host variant package/python-jsonschema-specifications: add host variant package/python-jsonschema: add host variant boot/ti-k3-r5-loader: set binman environment boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope package/ti-k3: disable HS-FS for AM65 SOC boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 board/ti/am62x-sk/genimage.cfg | 7 ++- board/ti/am62x-sk/post-build.sh | 54 ++++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 ++ boot/ti-k3-image-gen/Config.in | 61 ++----------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/ti-k3-r5-loader/Config.in | 5 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 12 +++- boot/uboot/Config.in | 23 +++---- boot/uboot/uboot.mk | 12 +++- configs/ti_am62x_sk_defconfig | 22 ++++--- configs/ti_am64x_sk_defconfig | 7 ++- package/Config.in | 1 + package/python-attrs/python-attrs.mk | 6 ++ .../python-jsonschema-specifications.mk | 10 +++ .../python-jsonschema/python-jsonschema.mk | 14 +++++ .../python-referencing/python-referencing.mk | 11 ++++ package/python-rpds-py/python-rpds-py.mk | 1 + package/ti-k3/Config.in | 60 ++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 20 files changed, 237 insertions(+), 87 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:03 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:03 +0100 Subject: [Buildroot] [PATCH v7 01/17] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-2-dario.binacchi@amarulasolutions.com> Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update commit message Changes in v5 - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c68..c3ad555a8184 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:05 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:05 +0100 Subject: [Buildroot] [PATCH v7 03/17] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-4-dario.binacchi@amarulasolutions.com> Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a8184..a129e216d25b 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:04 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:04 +0100 Subject: [Buildroot] [PATCH v7 02/17] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-3-dario.binacchi@amarulasolutions.com> Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am64x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am64x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update commit message Changes in v5: - Drop BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR option Added in v4 configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8d3..097175bd8f39 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:06 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:06 +0100 Subject: [Buildroot] [PATCH v7 04/17] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-5-dario.binacchi@amarulasolutions.com> Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f39..26195194c7d6 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:07 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:07 +0100 Subject: [Buildroot] [PATCH v7 05/17] boot/ti-k3-r5-loader: bump to version 2024.01 In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-6-dario.binacchi@amarulasolutions.com> All in-tree configs with the ti-k3-r5 bootloader use a custom version, so this patch is mostly for the menuconfig default version Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- no changes since v4 Added in v4 boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5a8..5f86c045c99f 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -16,7 +16,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2022.10" + bool "2024.01" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -60,7 +60,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index c5d1cb8e09f0..fbe5d215409d 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:08 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:08 +0100 Subject: [Buildroot] [PATCH v7 06/17] package/python-attrs: add host variant In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-7-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc4402..fb1729e62fa2 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:09 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:09 +0100 Subject: [Buildroot] [PATCH v7 07/17] package/python-rpds-py: add host variant In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-8-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- no changes since v3 Changes in v3: - Drop Config.in.host package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4fde..cee2ff290a4e 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:10 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:10 +0100 Subject: [Buildroot] [PATCH v7 08/17] package/python-referencing: add host variant In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-9-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-referencing/python-referencing.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e913a..66d59ed8091a 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_REFERENCING_DEPENDENCIES += \ + host-python-attrs \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:11 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:11 +0100 Subject: [Buildroot] [PATCH v7 09/17] package/python-jsonschema-specifications: add host variant In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-10-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes since v3 Changes in v3: - Drop Config.in.host package/python-jsonschema-specifications.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9d4..653c839bb450 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,14 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES += \ + host-python-referencing + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:12 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:12 +0100 Subject: [Buildroot] [PATCH v7 10/17] package/python-jsonschema: add host variant In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-11-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v5: - Add runtime dependencies - Add SOB and COB tags of Romain Naour no changes in v4 Changes in v3: - Drop Config.in.host package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa7752..9e8b6e18b876 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \ + host-python-attrs \ + host-python-jsonschema-specifications \ + host-python-referencing \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:13 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:13 +0100 Subject: [Buildroot] [PATCH v7 11/17] boot/ti-k3-r5-loader: set binman environment In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-12-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. The patch set the BINMAN_INDIRS environment variable to provide the directory to search for binary blobs and select the packages required by binman. The dependency of binman is not really easy to follow. First we have the packages list from binman.rst [1] then we have to install additional python modules [2]. Maybe in the future it will be necessary to add host-lzma and host-lz4 in the dependencies list. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v6: - Update the commit message adding the links of requirements. Changes in v5: - Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - Drop runtime dependecies - Add host-python-pylibfdt dependency without requiring BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration - Add host-python3 and host-python-setuptools dependencies - Add SOB and COB tags of Romain Naour Changes in v4: - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Changes in v2: - Change commit message - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Select packages required by binman if BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled boot/ti-k3-r5-loader/Config.in | 1 + boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f86c045c99f..fc71337e80cc 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema help Separate U-Boot SPL build for R5 core on TI's K3 processors. Usually used to build tiboot3.bin with k3-image-gen. diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f2e..fdb058f3b72a 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -39,7 +39,12 @@ TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python-jsonschema \ + host-python-pyyaml \ + host-python3 \ + host-python-setuptools \ + host-python-pylibfdt TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -58,6 +63,7 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + BINMAN_INDIRS=$(BINARIES_DIR) \ HOSTLDFLAGS="$(HOST_LDFLAGS)" define TI_K3_R5_LOADER_BUILD_CMDS -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:14 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:14 +0100 Subject: [Buildroot] [PATCH v7 12/17] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-13-dario.binacchi@amarulasolutions.com> Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. The binman requirement is directly included in buildman dependency (tools/buildman/requirements.txt) since within U-Boot, binman is invoked by the build system, here buildman [1]. Furthermore, the use of Binman no longer makes it necessary to set `UBOOT_MAKE_OPTS += DM=...'. We had the explanation from [2]: BINMAN_INDIRS is used to fetch the DM binary from /ti-dm/ and SYSFW binaries from /ti-sysfw/. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot [2] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi --- Changes in v7: - Replace ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) with ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),). - Update the commit message Changes in v6: - BR2_TARGET_UBOOT_USE_BINMAN - Binman tool is not specific to TI K3 platform, so add an option to specify the use of Binman in U-Boot. - Add runtime dependencies - Update commit message - Add SOB and COB tags of Romain Naour Changes in v5: - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" from UBOOT_MAKE_OPTS. no changes since v1: boot/uboot/Config.in | 11 +++++++++++ boot/uboot/uboot.mk | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930db..e6e7956adccb 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -290,6 +290,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN This option makes sure that the needed binary blobs are copied into the U-Boot source directory. +config BR2_TARGET_UBOOT_USE_BINMAN + bool "U-Boot use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a88059..35a41d96a12d 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -187,10 +187,12 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif +endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) UBOOT_DEPENDENCIES += opensbi @@ -269,6 +271,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) UBOOT_DEPENDENCIES += host-vim endif +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +UBOOT_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:15 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:15 +0100 Subject: [Buildroot] [PATCH v7 13/17] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-14-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot can use Binman to compile and sign the generated binaries, thus making the use of custom tools like ti-k3-image-gen no longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were configured and used outside of it. This patch allows setting such options even if the package is not enabled. The patch makes an exception to the Buildroot rule "no subdirectory in package directory". Signed-off-by: Dario Binacchi --- Changes in v7: - Revert change disabling BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X. The change is moved in a separate patch. Changes in v6: - Move BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME to ti-k3 (BR2_PACKAGE_TI_K3_DM). - Disable BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X Changes in v5: - Add SOB tag - Move the new ti-k3 from boot to package Added in v4 boot/ti-k3-image-gen/Config.in | 61 ++----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/uboot/Config.in | 12 +---- boot/uboot/uboot.mk | 2 +- configs/ti_am62x_sk_defconfig | 3 +- configs/ti_am64x_sk_defconfig | 3 +- package/Config.in | 1 + package/ti-k3/Config.in | 59 ++++++++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 9 files changed, 79 insertions(+), 73 deletions(-) create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e911..a57319f4be6d 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -13,65 +13,12 @@ config BR2_TARGET_TI_K3_IMAGE_GEN https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk index 64be9a18f2c4..aca29bcf1bd4 100644 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ $(BR2_MAKE_HOST_DEPENDENCY) TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) +TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) +TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index e6e7956adccb..821854d08acc 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -244,21 +244,11 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" # We use the SoC selection defined for the ti-k3-image-gen # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM - -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME - string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - -endif - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 35a41d96a12d..7cd4636aa292 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -189,7 +189,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) UBOOT_DEPENDENCIES += ti-k3-boot-firmware ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_PACKAGE_TI_K3_DM_SOCNAME)) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a129e216d25b..2835404a57df 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM62X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 26195194c7d6..566cbbe4824f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -11,6 +11,8 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y +BR2_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM64X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" @@ -23,7 +25,6 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" diff --git a/package/Config.in b/package/Config.in index bf0fe078b955..6d3ed34e121b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -629,6 +629,7 @@ endmenu source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" + source "package/ti-k3/Config.in" source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" source "package/ti-sgx-um/Config.in" diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in new file mode 100644 index 000000000000..2a51b1531487 --- /dev/null +++ b/package/ti-k3/Config.in @@ -0,0 +1,59 @@ +config BR2_PACKAGE_TI_K3 + bool "TI K3" + help + The TI K3 SOC specific selections. + +if BR2_PACKAGE_TI_K3 + +choice + prompt "SoC family" + +config BR2_PACKAGE_TI_K3_SOC_AM62AX + bool "am62ax" + +config BR2_PACKAGE_TI_K3_SOC_AM62X + bool "am62x" + +config BR2_PACKAGE_TI_K3_SOC_AM64X + bool "am64x" + +config BR2_PACKAGE_TI_K3_SOC_AM65X + bool "am65x" + +endchoice + +choice + prompt "Security type" + help + The target SoC security type option. + +config BR2_PACKAGE_TI_K3_SECTYPE_GP + bool "gp" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + bool "hs-fs" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS + bool "hs" + +endchoice + +config BR2_PACKAGE_TI_K3_SOC + string + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X + +config BR2_PACKAGE_TI_K3_SECTYPE + string + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS + +config BR2_PACKAGE_TI_K3_DM_SOCNAME + string + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X + +endif diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk new file mode 100644 index 000000000000..a2da29f5148c --- /dev/null +++ b/package/ti-k3/ti-k3.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# ti-k3 +# +################################################################################ + +include $(sort $(wildcard package/ti-k3/*/*.mk)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:16 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:16 +0100 Subject: [Buildroot] [PATCH v7 14/17] package/ti-k3: disable HS-FS for AM65 SOC In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-15-dario.binacchi@amarulasolutions.com> It seems that some TI K3 SoC variant doesn't provide all SECTYPE. For example: AM65 provide only GP or HS, there is no HS-FS. This can be checked in meta-ti: meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" So BR2_PACKAGE_TI_K3_SECTYPE_HS_FS must not be selected if BR2_PACKAGE_TI_K3_SOC_AM65X is used. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi --- Added in v7 package/ti-k3/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in index 2a51b1531487..b8545b7bca62 100644 --- a/package/ti-k3/Config.in +++ b/package/ti-k3/Config.in @@ -32,6 +32,7 @@ config BR2_PACKAGE_TI_K3_SECTYPE_GP config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS bool "hs-fs" + depends on !BR2_PACKAGE_TI_K3_SOC_AM65X config BR2_PACKAGE_TI_K3_SECTYPE_HS bool "hs" -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:17 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:17 +0100 Subject: [Buildroot] [PATCH v7 15/17] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-16-dario.binacchi@amarulasolutions.com> Recent versions of U-Boot are capable of building tiboot3.bin using Binman. In this case, let's copy it to the binaries directory. Signed-off-by: Dario Binacchi --- Changes in v6: - Replace `find' command with `cp' one. Changes in v5: - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin Added in v4 boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index fdb058f3b72a..cbdb653278f8 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) + define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin endef $(eval $(kconfig-package)) -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:18 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:18 +0100 Subject: [Buildroot] [PATCH v7 16/17] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-17-dario.binacchi@amarulasolutions.com> The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v7: - Add devicetree k3-am625-sk.dtb to extlinux.conf - Improve error messages in post-build.sh script Changes in v6: - Enable BR2_TARGET_UBOOT_USE_BINMAN option Changes in v5: - Update commit message. Changes in v4: - bump to 204.01 instead of 2023.10 - Update the commit message - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. Changes in v2: - Update the commit message - Drop Python options required by binman. - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically selects the Python modules required by binman. board/ti/am62x-sk/genimage.cfg | 7 ++++- board/ti/am62x-sk/post-build.sh | 54 +++++++++++++++++++++++++++++++++ board/ti/am62x-sk/post-image.sh | 5 +++ configs/ti_am62x_sk_defconfig | 13 ++++---- 4 files changed, 72 insertions(+), 7 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh create mode 100755 board/ti/am62x-sk/post-image.sh diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg index 26304fe98f99..398209f4d831 100644 --- a/board/ti/am62x-sk/genimage.cfg +++ b/board/ti/am62x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh new file mode 100755 index 000000000000..4f19f4d6cf91 --- /dev/null +++ b/board/ti/am62x-sk/post-build.sh @@ -0,0 +1,54 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:d:r:x:' +O='console:,devicetree:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-d|--devicetree) + DEVICETREE="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing \`console' argument" +[ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument" +[ -n "${ROOT}" ] || die "Missing \`root' argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label am62x-sk-buildroot + kernel /Image + fdtdir / + devicetree /${DEVICETREE} + append ${append} + __HEADER_EOF diff --git a/board/ti/am62x-sk/post-image.sh b/board/ti/am62x-sk/post-image.sh new file mode 100755 index 000000000000..34f732c091ad --- /dev/null +++ b/board/ti/am62x-sk/post-image.sh @@ -0,0 +1,5 @@ +#!/bin/sh -x + +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 2835404a57df..7d9912024a16 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_PACKAGE_TI_K3=y @@ -24,20 +24,21 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" -BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:30:19 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:30:19 +0100 Subject: [Buildroot] [PATCH v7 17/17] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <20240227163019.2876942-18-dario.binacchi@amarulasolutions.com> Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi --- Changes in v5 - Bump to 6.6.17 from 6.6.1 - Update commit message Changes in v4 - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. no changes since v1 configs/ti_am62x_sk_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 7d9912024a16..db30bf10e2dc 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -- 2.43.0 From dario.binacchi at amarulasolutions.com Tue Feb 27 16:40:12 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 17:40:12 +0100 Subject: [Buildroot] [PATCH v6 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> <383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr> Message-ID: Hi Romain, On Sun, Feb 25, 2024 at 5:43?PM Romain Naour wrote: > > Hello Dario, > > Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit : > > Tested on SK-AM62B-P1. > > You could complete your series by updating the ti_am64x_sk_defconfig too and > remove ti-k3-image-gen. I preferred to submit version 7 without the patches for updating the ti_am64x_sk_defconfig and the removal of the ti-k3-image-gen package. This is because I do not have the am64x_sk board to test the changes on. However, I am available to submit a separate series for applying the changes to ti_am64x_sk_defconfig if there is someone who can test the configuration for me. Please let me know. Thanks and regards, Dario > > Except for minor improvement, this series is ok for me. > > Best regards, > Romain > > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v5: > > - Bump to 6.6.17 from 6.6.1 > > - Update commit message > > > > Changes in v4: > > - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. > > > > no changes since v1 > > > > configs/ti_am62x_sk_defconfig | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > > index 484f9feb8c61..8c962b4a9494 100644 > > --- a/configs/ti_am62x_sk_defconfig > > +++ b/configs/ti_am62x_sk_defconfig > > @@ -1,11 +1,11 @@ > > BR2_aarch64=y > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > > BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > > BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > > BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > > BR2_LINUX_KERNEL=y > > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > > BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > > BR2_LINUX_KERNEL_DTS_SUPPORT=y > > BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From sairon at sairon.cz Tue Feb 27 17:48:23 2024 From: sairon at sairon.cz (=?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?=) Date: Tue, 27 Feb 2024 18:48:23 +0100 Subject: [Buildroot] [PATCH] linux-firmware: add options for missing Intel b/g/n cards Message-ID: <20240227174823.3504777-1-sairon@sairon.cz> Add firmware files for missing cards from the 802.11bgn product list in the Linux Firmware Wiki [1]. So far only Wireless-N 130 and 1030 were supported, which use the 6000G2B microcode. [1] https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi#supported_devices Signed-off-by: Jan ?erm?k --- package/linux-firmware/Config.in | 36 ++++++++++++++++++++++++ package/linux-firmware/linux-firmware.mk | 30 ++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 920c0a2ef1..80e489bbe4 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -195,6 +195,42 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX help Firmware files for the Cypress cyw54xxx FullMAC. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_100 + bool "Intel iwlwifi 100" + help + Firmware files for the Intel Wifi 100 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_105 + bool "Intel iwlwifi 105" + help + Firmware files for the Intel Wifi 105 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_135 + bool "Intel iwlwifi 135" + help + Firmware files for the Intel Wifi 135 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_1000 + bool "Intel iwlwifi 135" + help + Firmware files for the Intel Wifi 1000 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2000 + bool "Intel iwlwifi 2000" + help + Firmware files for the Intel Wifi 2000 devices supported by + the iwlwifi kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2030 + bool "Intel iwlwifi 2030" + help + Firmware files for the Intel Wifi 2030 devices supported by + the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000 bool "Intel iwlwifi 22000" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 60e8861abe..b25c972634 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -486,6 +486,36 @@ LINUX_FIRMWARE_FILES += wil6210.* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_100),y) +LINUX_FIRMWARE_FILES += iwlwifi-100-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_105),y) +LINUX_FIRMWARE_FILES += iwlwifi-105-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_135),y) +LINUX_FIRMWARE_FILES += iwlwifi-135-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_1000),y) +LINUX_FIRMWARE_FILES += iwlwifi-1000-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2000),y) +LINUX_FIRMWARE_FILES += iwlwifi-2000-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_2030),y) +LINUX_FIRMWARE_FILES += iwlwifi-2030-*.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode iwlwifi-Qu-*.ucode LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -- 2.34.1 From alexander.sverdlin at gmail.com Tue Feb 27 19:49:53 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Tue, 27 Feb 2024 20:49:53 +0100 Subject: [Buildroot] [PATCH v6 00/16] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: Hello Dario, On Sat, 2024-02-24 at 21:56 +0100, Dario Binacchi wrote: > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > high-security field-securable (HS-FS) silicon to optionally customize keys > and encryption for security applications. > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > which, however, was buggy. This series fixes the errors and bumps the Linux > kernel and U-Boot required for such a new device. in contrast to your tests and my last tests on SK-AM62B this time I've tried on GP board (SK-AM62) and the build (for GP) didn't boot out of the box. I've briefly checked tiboo3.bin and it's the smaller one of all, so this part looks correct. Maybe we need to check if the Firmware blobs are correct in GP case... -- Alexander Sverdlin. From dario.binacchi at amarulasolutions.com Tue Feb 27 20:41:04 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Tue, 27 Feb 2024 21:41:04 +0100 Subject: [Buildroot] [PATCH v6 00/16] Add support for AM62x-SK HS-FS devices In-Reply-To: References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: Hi Alexander, On Tue, Feb 27, 2024 at 8:49?PM Alexander Sverdlin wrote: > > Hello Dario, > > On Sat, 2024-02-24 at 21:56 +0100, Dario Binacchi wrote: > > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > > high-security field-securable (HS-FS) silicon to optionally customize keys > > and encryption for security applications. > > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > > which, however, was buggy. This series fixes the errors and bumps the Linux > > kernel and U-Boot required for such a new device. > > in contrast to your tests and my last tests on SK-AM62B this time I've tried > on GP board (SK-AM62) and the build (for GP) didn't boot out of the box. > > I've briefly checked tiboo3.bin and it's the smaller one of all, so this > part looks correct. Maybe we need to check if the Firmware blobs are correct > in GP case... I have tested all 7 versions on SK-AM62B successfully, but I don't have a GP board. Could it be an option for you to find out which is the latest version that also works for GP? A sort of series bisect? Thanks and regards, Dario > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From ju.o at free.fr Tue Feb 27 21:35:17 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 27 Feb 2024 22:35:17 +0100 Subject: [Buildroot] [PATCH 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 Message-ID: <20240227213517.241837-1-ju.o@free.fr> Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated gnu-efi. This update introduced syslinux build failure, as reported in [1]. This commit adds a package patch to fix this issue. For technical details of the issue, see the package patch commit log. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html Signed-off-by: Julien Olivain --- .checkpackageignore | 1 + ...stddef.h-add-wchar_t-type-definition.patch | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch diff --git a/.checkpackageignore b/.checkpackageignore index a6cc58c448c..a98a53fbf36 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -118,6 +118,7 @@ boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch Upstream boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch Upstream boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch Upstream boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch Upstream +boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch Upstream package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch Upstream package/4th/0001-avoid-regen-during-install.patch Upstream diff --git a/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch new file mode 100644 index 00000000000..ac98c47dfdc --- /dev/null +++ b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch @@ -0,0 +1,58 @@ +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Tue, 27 Feb 2024 21:09:15 +0100 +Subject: [PATCH] stddef.h: add wchar_t type definition + +Syslinux fail to build with gnu-efi >= 3.0.16 with error: + + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, + from /build/syslinux-6.03/efi/efi.h:23, + from /build/syslinux-6.03/efi/adv.h:4, + from /build/syslinux-6.03/efi/adv.c:29: + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' + typedef wchar_t CHAR16; + ^~~~~~~ + +This is because gnu-efi started to use the "wchar_t" type from the +toolchain's header, in commit [1]. Before this commit, +gnu-efi was defining the type as "short". + +Syslinux is including its own minimal stddef.h file, which masks the +one provided by the toolchain. See [2]. This file does not have a type +definition for "wchar_t". + +Finally, the POSIX header is supposed to provide this +"wchar_t" type definition. See [3]. + +This commit fixes the issue by adding the "wchar_t" type definition in +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This +also follow the previous gnu-efi < 3.0.16 behavior. + +This issue was seen in Buildroot Linux, in [5]. + +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html + +Signed-off-by: Julien Olivain +--- + com32/include/stddef.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/com32/include/stddef.h b/com32/include/stddef.h +index f52d62f3..437b11f2 100644 +--- a/com32/include/stddef.h ++++ b/com32/include/stddef.h +@@ -29,4 +29,6 @@ + */ + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) + ++typedef short wchar_t; ++ + #endif /* _STDDEF_H */ +-- +2.44.0 + -- 2.44.0 From ju.o at free.fr Tue Feb 27 21:39:14 2024 From: ju.o at free.fr (Julien Olivain) Date: Tue, 27 Feb 2024 22:39:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/gnu-efi: bump to version 3.0.17 In-Reply-To: References: <20240211214935.1603160-1-ju.o__4871.99223586998$1707688208$gmane$org@free.fr> Message-ID: <67dfa900e0a60574bc4cb3137d8b7c82@free.fr> Hi, Romain, Bernd, On 27/02/2024 13:58, Romain Naour wrote: > Hello Julien, Bernd, All, > > Le 19/02/2024 ? 21:04, Bernd Kuhls a ?crit?: >> Am Sun, 11 Feb 2024 22:49:35 +0100 schrieb Julien Olivain: >> >>> For commit logs, see: >>> https://sourceforge.net/p/gnu-efi/code/ci/3.0.17/log/ >> >> Hi Julien, >> >> this bump breaks building syslinux (not yet caught by the >> autobuilders): >> https://bugs.gentoo.org/921597 > > Not by autobuilders but by the gitlab-ci: > > https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 > https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 > > The issue was introduced in gnu-efi 3.0.16 [1] that seems > wrong/incomplete if we > compare with inttypes.h header from glibc [2]. > > Julien, can you have a look? > Thanks! Thanks for pointing that out. I proposed the following patch to fix the issue: https://patchwork.ozlabs.org/project/buildroot/patch/20240227213517.241837-1-ju.o at free.fr/ Best regards, Julien. > [1] > https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d > [2] > https://sourceware.org/git/?p=glibc.git;a=blob;f=stdlib/inttypes.h;h=cfda146aa9b956dc9f462bd65fb828e5929bc90b;hb=HEAD#l29 > > Best regards, > Romain > > >> >> Regards, Bernd >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot From bernd at kuhls.net Tue Feb 27 22:02:31 2024 From: bernd at kuhls.net (Bernd Kuhls) Date: Tue, 27 Feb 2024 23:02:31 +0100 Subject: [Buildroot] [PATCH 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 References: <20240227213517.241837-1-ju.o__3983.49413169257$1709069754$gmane$org@free.fr> Message-ID: Am Tue, 27 Feb 2024 22:35:17 +0100 schrieb Julien Olivain: > Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated > gnu-efi. This update introduced syslinux build failure, as reported in > [1]. > > This commit adds a package patch to fix this issue. For technical > details of the issue, see the package patch commit log. Tested-by: Bernd Kuhls [patch fixes the build error I saw with my usual defconfig] From romain.naour at smile.fr Tue Feb 27 22:17:28 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 27 Feb 2024 23:17:28 +0100 Subject: [Buildroot] [PATCH v6 00/16] Add support for AM62x-SK HS-FS devices In-Reply-To: References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> Message-ID: <422f5b14-1eb5-4c20-af28-b063f9957b28@smile.fr> Hi Alexander, Dario, All, Le 27/02/2024 ? 21:41, Dario Binacchi a ?crit?: > Hi Alexander, > > On Tue, Feb 27, 2024 at 8:49?PM Alexander Sverdlin > wrote: >> >> Hello Dario, >> >> On Sat, 2024-02-24 at 21:56 +0100, Dario Binacchi wrote: >>> The SK-AM62B-P1 is the newest version of SK-AM62 which includes >>> high-security field-securable (HS-FS) silicon to optionally customize keys >>> and encryption for security applications. >>> This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, >>> which, however, was buggy. This series fixes the errors and bumps the Linux >>> kernel and U-Boot required for such a new device. >> >> in contrast to your tests and my last tests on SK-AM62B this time I've tried >> on GP board (SK-AM62) and the build (for GP) didn't boot out of the box. >> >> I've briefly checked tiboo3.bin and it's the smaller one of all, so this >> part looks correct. Maybe we need to check if the Firmware blobs are correct >> in GP case... I checked the tiboot3.bin between v7 and v5 of this series: v7: -rw-r--r--. 1 romnao romnao 282545 27 f?vr. 22:23 tiboot3.bin v5 -rw-r--r--. 1 romnao romnao 282545 13 f?vr. 15:57 tiboot3-am62x-gp-evm.bin -rw-r--r--. 1 romnao romnao 285134 13 f?vr. 15:57 tiboot3-am62x-hs-evm.bin -rw-r--r--. 1 romnao romnao 285134 13 f?vr. 15:57 tiboot3-am62x-hs-fs-evm.bin Note, we copy the tiboot3 firmware using the complete file name, we don't use the tiboot3.bin symlink generated by binman tool. cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin Verify if your AM62 device is really a GP one. > > I have tested all 7 versions on SK-AM62B successfully, but I don't > have a GP board. > Could it be an option for you to find out which is the latest version > that also works for GP? > A sort of series bisect? I don't see any obvious issue. Please share your boot log and your defconfig. Best regards, Romain > > Thanks and regards, > Dario >> >> -- >> Alexander Sverdlin. >> > > From peter at korsgaard.com Tue Feb 27 22:23:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:23:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/micropython: update PCRE dependency to PCRE2 In-Reply-To: <20240226091904.14928-1-laurentbadel@eaton.com> (Laurent Badel via buildroot's message of "Mon, 26 Feb 2024 09:19:04 +0000") References: <20240226091904.14928-1-laurentbadel@eaton.com> Message-ID: <87zfvlr1h5.fsf@48ers.dk> >>>>> "Laurent" == Laurent Badel via buildroot writes: > micropython-lib/unix-ffi/re/re.py uses libpcre2-8 since commit d8e163b. > Thus, update micropython package to select the PCRE2 package instead of PCRE. > Signed-off-by: Laurent Badel Committed, thanks. -- Bye, Peter Korsgaard From romain.naour at smile.fr Tue Feb 27 22:23:13 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 27 Feb 2024 23:23:13 +0100 Subject: [Buildroot] [PATCH v6 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> <383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr> Message-ID: <28040f8a-c68e-4966-9e81-804f723f2100@smile.fr> Hi Dario, Le 27/02/2024 ? 17:40, Dario Binacchi a ?crit?: > Hi Romain, > > On Sun, Feb 25, 2024 at 5:43?PM Romain Naour wrote: >> >> Hello Dario, >> >> Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit : >>> Tested on SK-AM62B-P1. >> >> You could complete your series by updating the ti_am64x_sk_defconfig too and >> remove ti-k3-image-gen. > > I preferred to submit version 7 without the patches for updating the > ti_am64x_sk_defconfig and the removal of the ti-k3-image-gen package. > This is because I do not have the am64x_sk board to test the changes > on. However, I am available to submit a separate series for applying > the changes to ti_am64x_sk_defconfig if there is someone who can test > the configuration for me. > Please let me know. Maybe you can ask to Andreas Dannenberg for the am64x_sk? > Maybe if you can also test on AM64x just to be sure the defconfig is working. I'm planning on testing the entire series here pretty soon and will provide feedback (I have access to any and all boards:) http://lists.busybox.net/pipermail/buildroot/2024-February/685836.html Best regards, Romain > > Thanks and regards, > Dario > >> >> Except for minor improvement, this series is ok for me. >> >> Best regards, >> Romain >> >>> >>> Signed-off-by: Dario Binacchi >>> >>> --- >>> >>> Changes in v5: >>> - Bump to 6.6.17 from 6.6.1 >>> - Update commit message >>> >>> Changes in v4: >>> - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. >>> >>> no changes since v1 >>> >>> configs/ti_am62x_sk_defconfig | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig >>> index 484f9feb8c61..8c962b4a9494 100644 >>> --- a/configs/ti_am62x_sk_defconfig >>> +++ b/configs/ti_am62x_sk_defconfig >>> @@ -1,11 +1,11 @@ >>> BR2_aarch64=y >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y >>> BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" >>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" >>> BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" >>> BR2_LINUX_KERNEL=y >>> BR2_LINUX_KERNEL_CUSTOM_VERSION=y >>> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" >>> BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y >>> BR2_LINUX_KERNEL_DTS_SUPPORT=y >>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" >> > > From peter at korsgaard.com Tue Feb 27 22:23:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:23:40 +0100 Subject: [Buildroot] [PATCH 1/1] package/poco: bump to version 1.13.2 In-Reply-To: <20240226173202.1032744-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 26 Feb 2024 18:32:02 +0100") References: <20240226173202.1032744-1-fontaine.fabrice@gmail.com> Message-ID: <87v869r1g3.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > This bump will fix the following build failure raised since bump of > expat to version 2.6.0 in commit > 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 thanks to > https://github.com/pocoproject/poco/commit/75f7042b70092e79c6b770b18d033a061c84e2c5: > src/ParserEngine.cpp: In member function 'void Poco::XML::ParserEngine::init()': > src/ParserEngine.cpp:510:17: error: 'XML_SetBillionLaughsAttackProtectionMaximumAmplification' was not declared in this scope; did you mean 'setBillionLaughsAttackProtectionMaximumAmplification'? > 510 | XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > https://github.com/pocoproject/poco/blob/poco-1.13.2-release/CHANGELOG > Fixes: 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 > - http://autobuild.buildroot.org/results/7fad881f85d3b89abdee35388088965f05ead277 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 27 22:24:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:24:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/erlang: fix build with autoconf 2.72 In-Reply-To: <20240226173644.1077579-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 26 Feb 2024 18:36:44 +0100") References: <20240226173644.1077579-1-fontaine.fabrice@gmail.com> Message-ID: <87r0gxr1ev.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Use ERLANG_FIX_AUTOCONF_VERSION to fix the following build failure > raised since bump of autoconf to version 2.72 in commit > 524f3536029dace3ce9aa154d3ca4685582e1955: > ERROR: autoconf of version 2.72 found in path! You need to have autoconf of version 2.71 in path. > Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 > - http://autobuild.buildroot.org/results/c9e8df3427fca9e8e75488e32bca18e81009238c > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Tue Feb 27 22:24:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:24:05 +0100 Subject: [Buildroot] [git commit] package/erlang: fix build with autoconf 2.72 Message-ID: <20240227222447.1B7E687B3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13083cf8c0edb0ac1cae4895505720658e8dd75d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Use ERLANG_FIX_AUTOCONF_VERSION to fix the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: ERROR: autoconf of version 2.72 found in path! You need to have autoconf of version 2.71 in path. Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/c9e8df3427fca9e8e75488e32bca18e81009238c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/erlang/erlang.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 1600b59381..84d2f4e898 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -17,14 +17,22 @@ ERLANG_CPE_ID_VENDOR = erlang ERLANG_CPE_ID_PRODUCT = erlang\/otp ERLANG_INSTALL_STAGING = YES +define ERLANG_FIX_AUTOCONF_VERSION + $(SED) "s/USE_AUTOCONF_VERSION=.*/USE_AUTOCONF_VERSION=$(AUTOCONF_VERSION)/" $(@D)/otp_build +endef + # Patched erts/aclocal.m4 define ERLANG_RUN_AUTOCONF cd $(@D) && PATH=$(BR_PATH) ./otp_build update_configure --no-commit endef ERLANG_DEPENDENCIES += host-autoconf -ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF HOST_ERLANG_DEPENDENCIES += host-autoconf -HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +HOST_ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF # Return the EIV (Erlang Interface Version, EI_VSN) # $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr From peter at korsgaard.com Tue Feb 27 22:23:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:23:31 +0100 Subject: [Buildroot] [git commit] package/poco: bump to version 1.13.2 Message-ID: <20240227222447.1014F87AB2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=433c4fd38b15efcf74b410e5068e2e51eeba6e46 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bump will fix the following build failure raised since bump of expat to version 2.6.0 in commit 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 thanks to https://github.com/pocoproject/poco/commit/75f7042b70092e79c6b770b18d033a061c84e2c5: src/ParserEngine.cpp: In member function 'void Poco::XML::ParserEngine::init()': src/ParserEngine.cpp:510:17: error: 'XML_SetBillionLaughsAttackProtectionMaximumAmplification' was not declared in this scope; did you mean 'setBillionLaughsAttackProtectionMaximumAmplification'? 510 | XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/pocoproject/poco/blob/poco-1.13.2-release/CHANGELOG Fixes: 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 - http://autobuild.buildroot.org/results/7fad881f85d3b89abdee35388088965f05ead277 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/poco/poco.hash | 2 +- package/poco/poco.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 9a7981171a..0a1e900b3f 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 71ef96c35fced367d6da74da294510ad2c912563f12cd716ab02b6ed10a733ef poco-1.12.4.tar.gz +sha256 c01221870aa9bccedf1de39890279699207848fe61a0cfb6aeec7c5942c4627f poco-1.13.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 2d0233a8ce..f8c2a658de 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.12.4 +POCO_VERSION = 1.13.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE From peter at korsgaard.com Tue Feb 27 22:22:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Tue, 27 Feb 2024 23:22:57 +0100 Subject: [Buildroot] [git commit] package/micropython: update PCRE dependency to PCRE2 Message-ID: <20240227222447.07AE987B3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67f6d1dad2d4dd2af64a9eae6935e75147cd7bd2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master micropython-lib/unix-ffi/re/re.py uses libpcre2-8 since commit d8e163b. Thus, update micropython package to select the PCRE2 package instead of PCRE. Signed-off-by: Laurent Badel Signed-off-by: Peter Korsgaard --- package/micropython/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 26a00baab0..849a5452f4 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -13,7 +13,7 @@ if BR2_PACKAGE_MICROPYTHON config BR2_PACKAGE_MICROPYTHON_LIB bool "micropython-lib" - select BR2_PACKAGE_PCRE # runtime + select BR2_PACKAGE_PCRE2 # runtime help Core Python libraries ported to MicroPython. From romain.naour at smile.fr Tue Feb 27 22:31:08 2024 From: romain.naour at smile.fr (Romain Naour) Date: Tue, 27 Feb 2024 23:31:08 +0100 Subject: [Buildroot] [PATCH 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 In-Reply-To: <20240227213517.241837-1-ju.o@free.fr> References: <20240227213517.241837-1-ju.o@free.fr> Message-ID: <90f5d326-0b04-495e-9b6d-d25ebfa59cb4@smile.fr> Hi Julien, Le 27/02/2024 ? 22:35, Julien Olivain a ?crit?: > Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated > gnu-efi. This update introduced syslinux build failure, as reported > in [1]. > > This commit adds a package patch to fix this issue. For technical > details of the issue, see the package patch commit log. > > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 > > [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html > > Signed-off-by: Julien Olivain > --- > .checkpackageignore | 1 + > ...stddef.h-add-wchar_t-type-definition.patch | 58 +++++++++++++++++++ > 2 files changed, 59 insertions(+) > create mode 100644 boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > > diff --git a/.checkpackageignore b/.checkpackageignore > index a6cc58c448c..a98a53fbf36 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -118,6 +118,7 @@ boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch Upstream > boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch Upstream > boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch Upstream > boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch Upstream > +boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch We want to remove .checkpackageignore in a not too far future, please add an upstream status tag in the patch 0019-stddef.h-add-wchar_t-type-definition.patch itself. Even if upstream is not very active (last commit is 5 years ago). > linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch Upstream > package/18xx-ti-utils/0001-plt.h-fix-build-with-gcc-10.patch Upstream > package/4th/0001-avoid-regen-during-install.patch Upstream > diff --git a/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > new file mode 100644 > index 00000000000..ac98c47dfdc > --- /dev/null > +++ b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > @@ -0,0 +1,58 @@ > +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 > +From: Julien Olivain > +Date: Tue, 27 Feb 2024 21:09:15 +0100 > +Subject: [PATCH] stddef.h: add wchar_t type definition > + > +Syslinux fail to build with gnu-efi >= 3.0.16 with error: > + > + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, > + from /build/syslinux-6.03/efi/efi.h:23, > + from /build/syslinux-6.03/efi/adv.h:4, > + from /build/syslinux-6.03/efi/adv.c:29: > + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' > + typedef wchar_t CHAR16; > + ^~~~~~~ > + > +This is because gnu-efi started to use the "wchar_t" type from the > +toolchain's header, in commit [1]. Before this commit, > +gnu-efi was defining the type as "short". > + > +Syslinux is including its own minimal stddef.h file, which masks the > +one provided by the toolchain. See [2]. This file does not have a type > +definition for "wchar_t". Nice catch, didn't noticed this stddef.h provided by syslinux. Best regards, Romain > + > +Finally, the POSIX header is supposed to provide this > +"wchar_t" type definition. See [3]. > + > +This commit fixes the issue by adding the "wchar_t" type definition in > +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" > +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This > +also follow the previous gnu-efi < 3.0.16 behavior. > + > +This issue was seen in Buildroot Linux, in [5]. > + > +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d > +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h > +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html > +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 > +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html > + > +Signed-off-by: Julien Olivain > +--- > + com32/include/stddef.h | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/com32/include/stddef.h b/com32/include/stddef.h > +index f52d62f3..437b11f2 100644 > +--- a/com32/include/stddef.h > ++++ b/com32/include/stddef.h > +@@ -29,4 +29,6 @@ > + */ > + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) > + > ++typedef short wchar_t; > ++ > + #endif /* _STDDEF_H */ > +-- > +2.44.0 > + From alexander.sverdlin at gmail.com Wed Feb 28 00:06:36 2024 From: alexander.sverdlin at gmail.com (Alexander Sverdlin) Date: Wed, 28 Feb 2024 01:06:36 +0100 Subject: [Buildroot] [PATCH v7 00/17] Add support for AM62x-SK HS-FS devices In-Reply-To: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> Message-ID: <066a576a350d384c6547dc27b55e75c8044ed9e8.camel@gmail.com> Hello Dario, Romain! On Tue, 2024-02-27 at 17:30 +0100, Dario Binacchi wrote: > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > high-security field-securable (HS-FS) silicon to optionally customize keys > and encryption for security applications. > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > which, however, was buggy. This series fixes the errors and bumps the Linux > kernel and U-Boot required for such a new device. > > Dario Binacchi (17): > ? configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > ??? setting > ? configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > ??? setting > ? configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > ??? version > ? configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > ??? version > ? boot/ti-k3-r5-loader: bump to version 2024.01 > ? package/python-attrs: add host variant > ? package/python-rpds-py: add host variant > ? package/python-referencing: add host variant > ? package/python-jsonschema-specifications: add host variant > ? package/python-jsonschema: add host variant > ? boot/ti-k3-r5-loader: set binman environment > ? boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > ? package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > ? package/ti-k3: disable HS-FS for AM65 SOC > ? boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > ? configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > ? configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 I'm sorry for misleading you with the results with v6. I've built v7 series for GP and it runs fine on SK-AM62 (GP). Seems I've messed up either boot dip switches initially or the serial console. Thanks for your efforts! Tested-by: Alexander Sverdlin -- Alexander Sverdlin. From dario.binacchi at amarulasolutions.com Wed Feb 28 08:07:44 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 28 Feb 2024 09:07:44 +0100 Subject: [Buildroot] [PATCH v7 00/17] Add support for AM62x-SK HS-FS devices In-Reply-To: <066a576a350d384c6547dc27b55e75c8044ed9e8.camel@gmail.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> <066a576a350d384c6547dc27b55e75c8044ed9e8.camel@gmail.com> Message-ID: Hi Alexander, On Wed, Feb 28, 2024 at 1:06?AM Alexander Sverdlin wrote: > > Hello Dario, Romain! > > On Tue, 2024-02-27 at 17:30 +0100, Dario Binacchi wrote: > > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > > high-security field-securable (HS-FS) silicon to optionally customize keys > > and encryption for security applications. > > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > > which, however, was buggy. This series fixes the errors and bumps the Linux > > kernel and U-Boot required for such a new device. > > > > Dario Binacchi (17): > > configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > setting > > configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > setting > > configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > > version > > configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > > version > > boot/ti-k3-r5-loader: bump to version 2024.01 > > package/python-attrs: add host variant > > package/python-rpds-py: add host variant > > package/python-referencing: add host variant > > package/python-jsonschema-specifications: add host variant > > package/python-jsonschema: add host variant > > boot/ti-k3-r5-loader: set binman environment > > boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > > package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > > package/ti-k3: disable HS-FS for AM65 SOC > > boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > > configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > > configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 > > I'm sorry for misleading you with the results with v6. > I've built v7 series for GP and it runs fine on SK-AM62 (GP). > Seems I've messed up either boot dip switches initially or the serial > console. Thanks for your efforts! Nice! Thank you for your tests. Thanks and regards, Dario > > Tested-by: Alexander Sverdlin > > -- > Alexander Sverdlin. > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From dario.binacchi at amarulasolutions.com Wed Feb 28 08:28:00 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Wed, 28 Feb 2024 09:28:00 +0100 Subject: [Buildroot] [PATCH v6 16/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 In-Reply-To: <28040f8a-c68e-4966-9e81-804f723f2100@smile.fr> References: <20240224205654.1546744-1-dario.binacchi@amarulasolutions.com> <20240224205654.1546744-17-dario.binacchi@amarulasolutions.com> <383a2418-fa99-44f6-935c-8423cf9c22b3@smile.fr> <28040f8a-c68e-4966-9e81-804f723f2100@smile.fr> Message-ID: Hi Romain, On Tue, Feb 27, 2024 at 11:23?PM Romain Naour wrote: > > Hi Dario, > > Le 27/02/2024 ? 17:40, Dario Binacchi a ?crit : > > Hi Romain, > > > > On Sun, Feb 25, 2024 at 5:43?PM Romain Naour wrote: > >> > >> Hello Dario, > >> > >> Le 24/02/2024 ? 21:56, Dario Binacchi a ?crit : > >>> Tested on SK-AM62B-P1. > >> > >> You could complete your series by updating the ti_am64x_sk_defconfig too and > >> remove ti-k3-image-gen. > > > > I preferred to submit version 7 without the patches for updating the > > ti_am64x_sk_defconfig and the removal of the ti-k3-image-gen package. > > This is because I do not have the am64x_sk board to test the changes > > on. However, I am available to submit a separate series for applying > > the changes to ti_am64x_sk_defconfig if there is someone who can test > > the configuration for me. > > Please let me know. > > Maybe you can ask to Andreas Dannenberg for the am64x_sk? > > > Maybe if you can also test on AM64x just to be sure the defconfig is working. > Ok, I'll get to work and try to modify the configuration based on my experience with am62x. The idea is to submit the changes over the weekend. Thanks and regards, Dario > I'm planning on testing the entire series here pretty soon and will > provide feedback (I have access to any and all boards:) > > http://lists.busybox.net/pipermail/buildroot/2024-February/685836.html > > Best regards, > Romain > > > > > > Thanks and regards, > > Dario > > > >> > >> Except for minor improvement, this series is ok for me. > >> > >> Best regards, > >> Romain > >> > >>> > >>> Signed-off-by: Dario Binacchi > >>> > >>> --- > >>> > >>> Changes in v5: > >>> - Bump to 6.6.17 from 6.6.1 > >>> - Update commit message > >>> > >>> Changes in v4: > >>> - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. > >>> > >>> no changes since v1 > >>> > >>> configs/ti_am62x_sk_defconfig | 4 ++-- > >>> 1 file changed, 2 insertions(+), 2 deletions(-) > >>> > >>> diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig > >>> index 484f9feb8c61..8c962b4a9494 100644 > >>> --- a/configs/ti_am62x_sk_defconfig > >>> +++ b/configs/ti_am62x_sk_defconfig > >>> @@ -1,11 +1,11 @@ > >>> BR2_aarch64=y > >>> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y > >>> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y > >>> BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" > >>> BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/am62x-sk/post-image.sh" > >>> BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" > >>> BR2_LINUX_KERNEL=y > >>> BR2_LINUX_KERNEL_CUSTOM_VERSION=y > >>> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" > >>> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.17" > >>> BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > >>> BR2_LINUX_KERNEL_DTS_SUPPORT=y > >>> BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" > >> > > > > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From peter at korsgaard.com Wed Feb 28 11:25:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:25:17 +0100 Subject: [Buildroot] [PATCH] package/openssh: fix dependencies with refpolicy In-Reply-To: <20240225092421.1468140-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Sun, 25 Feb 2024 10:24:21 +0100") References: <20240225092421.1468140-1-yann.morin.1998@free.fr> Message-ID: <87msrkrftu.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Commit 2c5a82a29ceb (package/openssh: select linux-pam if refpolicy > upstream is selected) did not account for the linux-pam dependencies > before selecting it, causing unmet dependencies warnings (unfortunately, > not errors), such as: > $ KCONFIG_SEED=0xCF227CF4 make randconfig > WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM > Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] > Selected by [y]: > - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] > 2c5a82a29ceb made the choice of having openssl bear the responsibility > to select linux-pam when the upstream refpolicy version was enabled. > Semantically however, the responsibility really lies within refpolicy > itself, since that's what imposes linux-pam to openssh. > Move the select to refpolicy and drop it from openssh. Then, ensure that > linux-pam is only selected when it is available. > That means that one may get an openssh that is not linked against > linux-pam, when the linux-pam dependencies are not met; refpolicy (by > way of libsepol) also has a more stringent requirement on gcc version > than linux-pam, so most probably the missing dependencies would be > locale, wchar, or a static build. We consider that situation to be a > corner case that we do not want to address. > In the future, we may have more similar situations, whereby refpolicy > would impose other packages be linked with otherwise optional > dependencies. If (when) that were (will be) the case, then the proposed > mechanism would quickly become ugly; we could then re-assess a nicer way > to do that. Until then, this is good ebough. > Signed-off-by: Yann E. MORIN > Cc: Adam Duskett > Cc: Thomas Petazzoni > Cc: Fabrice Fontaine > --- > Changes v1 -> v2: > - simplify the logic: have refpolicy bear the select Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 11:23:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:23:57 +0100 Subject: [Buildroot] [git commit] package/openssh: fix dependencies with refpolicy Message-ID: <20240228112543.E82C887B49@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c20b2ae4ece10e07eeb80fcdd706a474d3be1475 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 2c5a82a29ceb (package/openssh: select linux-pam if refpolicy upstream is selected) did not account for the linux-pam dependencies before selecting it, causing unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0xCF227CF4 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] 2c5a82a29ceb made the choice of having openssl bear the responsibility to select linux-pam when the upstream refpolicy version was enabled. Semantically however, the responsibility really lies within refpolicy itself, since that's what imposes linux-pam to openssh. Move the select to refpolicy and drop it from openssh. Then, ensure that linux-pam is only selected when it is available. That means that one may get an openssh that is not linked against linux-pam, when the linux-pam dependencies are not met; refpolicy (by way of libsepol) also has a more stringent requirement on gcc version than linux-pam, so most probably the missing dependencies would be locale, wchar, or a static build. We consider that situation to be a corner case that we do not want to address. In the future, we may have more similar situations, whereby refpolicy would impose other packages be linked with otherwise optional dependencies. If (when) that were (will be) the case, then the proposed mechanism would quickly become ugly; we could then re-assess a nicer way to do that. Until then, this is good ebough. Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Thomas Petazzoni Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openssh/Config.in | 1 - package/refpolicy/Config.in | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index a3038ba01f..08d3c7d391 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_OPENSSH bool "openssh" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 0e72b895df..8ae8f0448d 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -36,6 +36,14 @@ choice config BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION bool "Upstream version" + # Consider reworking the following when adding new entries: + # Upstream refpolicy for openssh expects linux-pam to be used + select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_OPENSSH \ + && BR2_USE_MMU \ + && BR2_ENABLE_LOCALE \ + && BR2_USE_WCHAR \ + && !BR2_STATIC_LIBS \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 help Use the refpolicy as provided by Buildroot. From peter at korsgaard.com Wed Feb 28 11:45:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:45:46 +0100 Subject: [Buildroot] [PATCH 1/1] package/xterm: bump to version 389 In-Reply-To: <20240122221934.475430-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 22 Jan 2024 23:19:34 +0100") References: <20240122221934.475430-1-fontaine.fabrice@gmail.com> Message-ID: <87il28revp.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Update hash of COPYING (update in year) > - This bump will fix the following musl build failure raised since bump > to version 384 in commit 164d635f3782522c324c710b767ef21c598228c4: > ./main.c:802:34: error: 'TAB3' undeclared here (not in a function); did you mean 'TAB0'? > 802 | { -1, XTTYMODE__tabs, TAB3 }, > | ^~~~ > | TAB0 > https://invisible-island.net/xterm/xterm.log.html#xterm_389 > Fixes: > - http://autobuild.buildroot.org/results/51f98577b851bdbb0a0ab93c9ef94977776c1b1b > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 11:45:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:45:07 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240228114602.E80CF8730B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8c37a00e2d740d981d722c268805d8336d36c5b4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 02692b723a0140196f40e00f47c6a307954c09dd) [Peter: drop 6.6.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 10 +++++----- package/linux-headers/Config.in.host | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index e9f5ffe9e4..a410b1395d 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.72" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.74" 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 ec86d5fe5c..a0d8a5769f 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 98dce69077c35cffca799dcdbbd32a02242aad6b0950eb931936bb2ef69f0926 linux-6.1.72.tar.xz +sha256 b7fbd1d79faed2ce3570ef79dc1223e4e19c868b86326b14a435db56ebbb2022 linux-6.1.74.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192 linux-5.15.146.tar.xz -sha256 86ace9892296bf1534d574894edd27614b68de4085c03fd3f60121751a334f1b linux-5.10.207.tar.xz -sha256 da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6 linux-5.4.266.tar.xz +sha256 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 linux-5.15.147.tar.xz +sha256 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e linux-5.10.208.tar.xz +sha256 42d28def2cc1502251edbfeaca3b25ee764ad1e471b6c703ccb2267f38471c43 linux-5.4.267.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598 linux-4.19.304.tar.xz +sha256 da82425c7410623dfb2405915347ee9617fc0e33a63ca821c33aeed160cddae8 linux-4.19.305.tar.xz sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8c30ce2e78..a3e9659d5c 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -385,11 +385,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.336" if BR2_KERNEL_HEADERS_4_14 - default "4.19.304" if BR2_KERNEL_HEADERS_4_19 - default "5.4.266" if BR2_KERNEL_HEADERS_5_4 - default "5.10.207" if BR2_KERNEL_HEADERS_5_10 - default "5.15.146" if BR2_KERNEL_HEADERS_5_15 - default "6.1.72" if BR2_KERNEL_HEADERS_6_1 + default "4.19.305" if BR2_KERNEL_HEADERS_4_19 + default "5.4.267" if BR2_KERNEL_HEADERS_5_4 + default "5.10.208" if BR2_KERNEL_HEADERS_5_10 + default "5.15.147" if BR2_KERNEL_HEADERS_5_15 + default "6.1.74" if BR2_KERNEL_HEADERS_6_1 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 \ From peter at korsgaard.com Wed Feb 28 11:39:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:39:21 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/xterm: bump to version 389 Message-ID: <20240228114602.D807087B5B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=33d1faaa6d27c4d1b725ed463aeaefab4aed9e3b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x - Update hash of COPYING (update in year) - This bump will fix the following musl build failure raised since bump to version 384 in commit 164d635f3782522c324c710b767ef21c598228c4: ./main.c:802:34: error: 'TAB3' undeclared here (not in a function); did you mean 'TAB0'? 802 | { -1, XTTYMODE__tabs, TAB3 }, | ^~~~ | TAB0 https://invisible-island.net/xterm/xterm.log.html#xterm_389 Fixes: - http://autobuild.buildroot.org/results/51f98577b851bdbb0a0ab93c9ef94977776c1b1b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 6a49c394925da19aa933a8f60a6b5ad750710b41) Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 1a2ad8fea0..e0fdcfe66e 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 31ef870740ceae020c3c4b4a9601c7f47bfd46672c1aaf2d213a565d64cbc373 xterm-384.tgz +sha256 1cd5763d94d9370fed10d804e831a089b2ace0e7a74b6f56ef5a16a766bde7be xterm-389.tgz # Locally calculated -sha256 98d02d0b7f7b8aabb742b05e6960caaa9ae20e26d2f0d0dc57808362f2ac79bc COPYING +sha256 e38de4a0780954b5a7e69b5fa6c571daa8a1bfbacb4f2c5b2f07099e1a1d7c93 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 2fc2f734c8..c2c97dd318 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 384 +XTERM_VERSION = 389 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From peter at korsgaard.com Wed Feb 28 11:46:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:46:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/php: bump version to 8.2.15 In-Reply-To: <20240120155008.3148748-1-bernd@kuhls.net> (Bernd Kuhls's message of "Sat, 20 Jan 2024 16:50:08 +0100") References: <20240120155008.3148748-1-bernd@kuhls.net> Message-ID: <87edcwreub.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Changelog: https://www.php.net/ChangeLog-8.php#8.2.15 > Release notes: https://www.php.net/releases/8_2_15.php > Signed-off-by: Bernd Kuhls Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 11:39:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:39:54 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/xterm: bump to version 389 Message-ID: <20240228114724.0F45B87B66@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f0d9bc0fd00150b0bbddb544705856c4e031b3bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x - Update hash of COPYING (update in year) - This bump will fix the following musl build failure raised since bump to version 384 in commit 164d635f3782522c324c710b767ef21c598228c4: ./main.c:802:34: error: 'TAB3' undeclared here (not in a function); did you mean 'TAB0'? 802 | { -1, XTTYMODE__tabs, TAB3 }, | ^~~~ | TAB0 https://invisible-island.net/xterm/xterm.log.html#xterm_389 Fixes: - http://autobuild.buildroot.org/results/51f98577b851bdbb0a0ab93c9ef94977776c1b1b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 6a49c394925da19aa933a8f60a6b5ad750710b41) Signed-off-by: Peter Korsgaard --- package/xterm/xterm.hash | 4 ++-- package/xterm/xterm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 1a2ad8fea0..e0fdcfe66e 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 31ef870740ceae020c3c4b4a9601c7f47bfd46672c1aaf2d213a565d64cbc373 xterm-384.tgz +sha256 1cd5763d94d9370fed10d804e831a089b2ace0e7a74b6f56ef5a16a766bde7be xterm-389.tgz # Locally calculated -sha256 98d02d0b7f7b8aabb742b05e6960caaa9ae20e26d2f0d0dc57808362f2ac79bc COPYING +sha256 e38de4a0780954b5a7e69b5fa6c571daa8a1bfbacb4f2c5b2f07099e1a1d7c93 COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 2fc2f734c8..c2c97dd318 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 384 +XTERM_VERSION = 389 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz XTERM_SITE = http://invisible-mirror.net/archives/xterm XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf From peter at korsgaard.com Wed Feb 28 11:43:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:43:39 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240228114724.1EB0187B67@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=963d79affe3dda6243aef08119ac08a250f3728b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 02692b723a0140196f40e00f47c6a307954c09dd) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 9f9cf55d96..ed865c6f5b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.13" 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 2605e4e201..f41ed0a270 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 afe2e5a661bb886d762684ebea71607d1ee8cb9dd100279d2810ba20d9671e52 linux-6.6.11.tar.xz +sha256 88b89e7dd41ead4e3ab1e411c8bb8d592575acf815cf1df3c0dc57e2e882c0bc linux-6.6.13.tar.xz sha256 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 linux-6.5.13.tar.xz -sha256 98dce69077c35cffca799dcdbbd32a02242aad6b0950eb931936bb2ef69f0926 linux-6.1.72.tar.xz +sha256 b7fbd1d79faed2ce3570ef79dc1223e4e19c868b86326b14a435db56ebbb2022 linux-6.1.74.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 5a807a5fa2a80ada957d8079681dfb5cc196ec26f43244d1c8a4fd7af592d192 linux-5.15.146.tar.xz -sha256 86ace9892296bf1534d574894edd27614b68de4085c03fd3f60121751a334f1b linux-5.10.207.tar.xz -sha256 da072f7e6fe719c01e517cac1fa9988b2f5fa87d62a8501b7dc16d3b62b2acb6 linux-5.4.266.tar.xz +sha256 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 linux-5.15.147.tar.xz +sha256 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e linux-5.10.208.tar.xz +sha256 42d28def2cc1502251edbfeaca3b25ee764ad1e471b6c703ccb2267f38471c43 linux-5.4.267.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 cdc6a5d51aaff7c50bfe4ac4adf5cc3727043a24641145dc268e858db2a4b598 linux-4.19.304.tar.xz +sha256 da82425c7410623dfb2405915347ee9617fc0e33a63ca821c33aeed160cddae8 linux-4.19.305.tar.xz sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a18c954c78..1fad05b899 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -413,13 +413,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.336" if BR2_KERNEL_HEADERS_4_14 - default "4.19.304" if BR2_KERNEL_HEADERS_4_19 - default "5.4.266" if BR2_KERNEL_HEADERS_5_4 - default "5.10.207" if BR2_KERNEL_HEADERS_5_10 - default "5.15.146" if BR2_KERNEL_HEADERS_5_15 - default "6.1.72" if BR2_KERNEL_HEADERS_6_1 + default "4.19.305" if BR2_KERNEL_HEADERS_4_19 + default "5.4.267" if BR2_KERNEL_HEADERS_5_4 + default "5.10.208" if BR2_KERNEL_HEADERS_5_10 + default "5.15.147" if BR2_KERNEL_HEADERS_5_15 + default "6.1.74" if BR2_KERNEL_HEADERS_6_1 default "6.5.13" if BR2_KERNEL_HEADERS_6_5 - default "6.6.11" if BR2_KERNEL_HEADERS_6_6 + default "6.6.13" if BR2_KERNEL_HEADERS_6_6 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 \ From peter at korsgaard.com Wed Feb 28 11:47:33 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:47:33 +0100 Subject: [Buildroot] [PATCH] package/refpolicy: move patch to version subdir for custom git support In-Reply-To: <87zfws4i00.fsf@48ers.dk> (Peter Korsgaard's message of "Fri, 26 Jan 2024 09:27:11 +0100") References: <20240116085546.3624229-1-peter@korsgaard.com> <87zfws4i00.fsf@48ers.dk> Message-ID: <87a5nkresq.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Peter" == Peter Korsgaard writes: >> Commit e88823d667cf0 (package/refpolicy: fix build with smartmontools) added >> a 0001-policy-modules-services-smartmon.te-make-fstools-opt.patch patch, but >> forgot to put it in the version specific sub directory - Breaking builds >> using BR2_PACKAGE_REFPOLICY_CUSTOM_GIT as shown by the TestSELinuxCustomGit >> test: >>>>> refpolicy RELEASE_2_20200818 Extracting >> gzip -d -c >> /builds/buildroot.org/buildroot/test-dl/refpolicy/refpolicy-RELEASE_2_20200818-br1.tar.gz >> | tar --strip-components=1 -C >> /builds/buildroot.org/buildroot/test-output/TestSELinuxCustomGit/build/refpolicy-RELEASE_2_20200818 >> -xf - >>>>> refpolicy RELEASE_2_20200818 Patching >> Applying 0001-policy-modules-services-smartmon.te-make-fstools-opt.patch using patch: >> patching file policy/modules/services/smartmon.te >> Hunk #1 FAILED at 143. >> 1 out of 1 hunk FAILED -- saving rejects to file policy/modules/services/smartmon.te.rej >> make[1]: *** [package/pkg-generic.mk:241: >> /builds/buildroot.org/buildroot/test-output/TestSELinuxCustomGit/build/refpolicy-RELEASE_2_20200818/.stamp_patched] >> Error 1 >> https://gitlab.com/buildroot.org/buildroot/-/jobs/5929796183 >> Fix it by moving the patch to a versioned sub directory. >> Signed-off-by: Peter Korsgaard > Committed, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 11:46:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:46:22 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/php: bump version to 8.2.15 Message-ID: <20240228114846.4A83F87B71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3e0c97e51b2467fb803de11be9ce7ccdbb95adc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Changelog: https://www.php.net/ChangeLog-8.php#8.2.15 Release notes: https://www.php.net/releases/8_2_15.php Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ed7335d256f0327666168416b6278cfa4811faed) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 3759852a9b..7c8736e41c 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583 php-8.2.14.tar.xz +sha256 eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 php-8.2.15.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 87b8199f3b..6bb9a78065 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.14 +PHP_VERSION = 8.2.15 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 11:46:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:46:14 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/php: bump version to 8.2.15 Message-ID: <20240228114855.599CE87B71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b448305ae61ac2a447d1b1892b0c344c3b9deed7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Changelog: https://www.php.net/ChangeLog-8.php#8.2.15 Release notes: https://www.php.net/releases/8_2_15.php Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ed7335d256f0327666168416b6278cfa4811faed) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 3759852a9b..7c8736e41c 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 763ecd39fcf51c3815af6ef6e43fa9aa0d0bd8e5a615009e5f4780c92705f583 php-8.2.14.tar.xz +sha256 eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 php-8.2.15.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 63fcfd8634..c69abd5f31 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.14 +PHP_VERSION = 8.2.15 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 11:47:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 12:47:20 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/refpolicy: move patch to version subdir for custom git support Message-ID: <20240228114855.6590087B73@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bb42e170d4247dc097df08b692a72b4410324c4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit e88823d667cf0 (package/refpolicy: fix build with smartmontools) added a 0001-policy-modules-services-smartmon.te-make-fstools-opt.patch patch, but forgot to put it in the version specific sub directory - Breaking builds using BR2_PACKAGE_REFPOLICY_CUSTOM_GIT as shown by the TestSELinuxCustomGit test: >>> refpolicy RELEASE_2_20200818 Extracting gzip -d -c /builds/buildroot.org/buildroot/test-dl/refpolicy/refpolicy-RELEASE_2_20200818-br1.tar.gz | tar --strip-components=1 -C /builds/buildroot.org/buildroot/test-output/TestSELinuxCustomGit/build/refpolicy-RELEASE_2_20200818 -xf - >>> refpolicy RELEASE_2_20200818 Patching Applying 0001-policy-modules-services-smartmon.te-make-fstools-opt.patch using patch: patching file policy/modules/services/smartmon.te Hunk #1 FAILED at 143. 1 out of 1 hunk FAILED -- saving rejects to file policy/modules/services/smartmon.te.rej make[1]: *** [package/pkg-generic.mk:241: /builds/buildroot.org/buildroot/test-output/TestSELinuxCustomGit/build/refpolicy-RELEASE_2_20200818/.stamp_patched] Error 1 https://gitlab.com/buildroot.org/buildroot/-/jobs/5929796183 Fix it by moving the patch to a versioned sub directory. Signed-off-by: Peter Korsgaard (cherry picked from commit bde468127c9d131de380d0dd2849527597ecf5e0) Signed-off-by: Peter Korsgaard --- .../0001-policy-modules-services-smartmon.te-make-fstools-opt.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch b/package/refpolicy/2.20231002/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch similarity index 100% rename from package/refpolicy/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch rename to package/refpolicy/2.20231002/0001-policy-modules-services-smartmon.te-make-fstools-opt.patch From peter at korsgaard.com Wed Feb 28 13:36:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:36:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/xwayland: security bump to version 23.2.4 In-Reply-To: <20240125222140.1805844-1-peter@korsgaard.com> References: <20240125222140.1805844-1-peter@korsgaard.com> Message-ID: <083f7261-3cb5-4083-96bf-7b1a432d0890@korsgaard.com> On 25/01/2024 23.21, Peter Korsgaard wrote: > Fixes the following security issues: > > 1) CVE-2023-6816 can be triggered by passing an invalid array index to > DeviceFocusEvent or ProcXIQueryPointer. > > 2) CVE-2024-0229 can be triggered if a device has both a button and a > key class and zero buttons. > > 3) CVE-2024-21885 can be triggered if a device with a given ID was > removed and a new device with the same ID added both in the same > operation. > > 4) CVE-2024-21886 can be triggered by disabling a master device with > disabled slave devices. > > 5) CVE-2024-0409 can be triggered by enabling SELinux > xserver_object_manager and running a client. > > 6) CVE-2024-0408 can be triggered by enabling SELinux > xserver_object_manager and creating a GLX PBuffer. > > For details, see the advisory: > https://lists.x.org/archives/xorg-announce/2024-January/003444.html > > Signed-off-by: Peter Korsgaard Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 13:36:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:36:55 +0100 Subject: [Buildroot] [PATCH 2/2] package/xserver_xorg-server: security bump to version 21.1.11 In-Reply-To: <20240125222140.1805844-2-peter@korsgaard.com> References: <20240125222140.1805844-1-peter@korsgaard.com> <20240125222140.1805844-2-peter@korsgaard.com> Message-ID: <49afb437-6c82-4f49-b308-2f36b0768bb0@korsgaard.com> On 25/01/2024 23.21, Peter Korsgaard wrote: > Fixes the following security issues: > > 1) CVE-2023-6816 can be triggered by passing an invalid array index to > DeviceFocusEvent or ProcXIQueryPointer. > > 2) CVE-2024-0229 can be triggered if a device has both a button and a > key class and zero buttons. > > 3) CVE-2024-21885 can be triggered if a device with a given ID was > removed and a new device with the same ID added both in the same > operation. > > 4) CVE-2024-21886 can be triggered by disabling a master device with > disabled slave devices. > > 5) CVE-2024-0409 can be triggered by enabling SELinux > xserver_object_manager and running a client. > > 6) CVE-2024-0408 can be triggered by enabling SELinux > xserver_object_manager and creating a GLX PBuffer. > > For details, see the advisory: > https://lists.x.org/archives/xorg-announce/2024-January/003444.html > > Switch to .tar.gz as the announcement mail only contained hashes for that: > https://lists.x.org/archives/xorg-announce/2024-January/003442.html > > Signed-off-by: Peter Korsgaard Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 13:38:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:38:06 +0100 Subject: [Buildroot] [PATCH] package/cog: bump to version 0.18.2 In-Reply-To: <20240116192102.4148440-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Tue, 16 Jan 2024 21:21:01 +0200") References: <20240116192102.4148440-1-aperez@igalia.com> Message-ID: <875xy8r9oh.fsf@48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > This is a small bugfix release, with a fix for a crash in the DRM/KMS > module that affects i.MX6 boards and probably others. Release notes: > https://wpewebkit.org/release/cog-0.18.2.html > Signed-off-by: Adrian Perez de Castro Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 13:39:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:39:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/faad2: force arm mode instead of Thumb mode In-Reply-To: <20240126173215.1630553-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 26 Jan 2024 18:32:15 +0100") References: <20240126173215.1630553-1-fontaine.fabrice@gmail.com> Message-ID: <871q8wr9m4.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure in Thumb mode: > /tmp/ccfzn6FH.s:36: Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode > Fixes: > - http://autobuild.buildroot.org/results/838808b4751244ee01cde6b8261212b49e511a32 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 13:34:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:34:42 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/xwayland: security bump to version 23.2.4 Message-ID: <20240228133943.B52CE87B84@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=93385c55a7786eec975a04491033b2588babd1c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following security issues: 1) CVE-2023-6816 can be triggered by passing an invalid array index to DeviceFocusEvent or ProcXIQueryPointer. 2) CVE-2024-0229 can be triggered if a device has both a button and a key class and zero buttons. 3) CVE-2024-21885 can be triggered if a device with a given ID was removed and a new device with the same ID added both in the same operation. 4) CVE-2024-21886 can be triggered by disabling a master device with disabled slave devices. 5) CVE-2024-0409 can be triggered by enabling SELinux xserver_object_manager and running a client. 6) CVE-2024-0408 can be triggered by enabling SELinux xserver_object_manager and creating a GLX PBuffer. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2024-January/003444.html Signed-off-by: Peter Korsgaard (cherry picked from commit b8d9e75eb89898fac1a8200e78bca084635eefbc) Signed-off-by: Peter Korsgaard --- package/x11r7/xwayland/xwayland.hash | 6 +++--- package/x11r7/xwayland/xwayland.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash index 533ef9de86..5bb26bf17e 100644 --- a/package/x11r7/xwayland/xwayland.hash +++ b/package/x11r7/xwayland/xwayland.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-December/003437.html -sha256 eb9d9aa7232c47412c8835ec15a97c575f03563726c787754ff0c019bd07e302 xwayland-23.2.3.tar.xz -sha512 37198aa2f06313a0cb2add51cc78f81b26a42f2c9d55a0d3eecf958777107ea5560961c128f2d0af055f7460ba10fadb1b9050251c2c50f2251b40ab517e79cd xwayland-23.2.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003443.html +sha256 a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b xwayland-23.2.4.tar.xz +sha512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187 xwayland-23.2.4.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 8f4bcd8117..c66dd471ac 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -XWAYLAND_VERSION = 23.2.3 +XWAYLAND_VERSION = 23.2.4 XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT From peter at korsgaard.com Wed Feb 28 13:39:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:39:05 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/faad2: force arm mode instead of Thumb mode Message-ID: <20240228133943.D7DD487B86@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e51bb2ced96c8826dcdce7ea46338d63a1ada2bf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fix the following build failure in Thumb mode: /tmp/ccfzn6FH.s:36: Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/838808b4751244ee01cde6b8261212b49e511a32 Signed-off-by: Fabrice Fontaine [Peter: reword comment slightly] Signed-off-by: Peter Korsgaard (cherry picked from commit a33827760823b1455326e0fc8cf6089a3081e782) Signed-off-by: Peter Korsgaard --- package/faad2/faad2.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index 686e5045c0..0b249b3450 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -12,4 +12,11 @@ FAAD2_CPE_ID_VENDOR = audiocoding FAAD2_CPE_ID_PRODUCT = freeware_advanced_audio_decoder_2 FAAD2_INSTALL_STAGING = YES +# faad2 contains assembly routines using ARM instructions not present in thumb1 mode: +# Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode +# so force ARM mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FAAD2_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -marm" +endif + $(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 28 13:35:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:35:13 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/xserver_xorg-server: security bump to version 21.1.11 Message-ID: <20240228133943.C732087B70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3a7b549b8c2352ed68bc9887ceac4bfe30dd9931 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following security issues: 1) CVE-2023-6816 can be triggered by passing an invalid array index to DeviceFocusEvent or ProcXIQueryPointer. 2) CVE-2024-0229 can be triggered if a device has both a button and a key class and zero buttons. 3) CVE-2024-21885 can be triggered if a device with a given ID was removed and a new device with the same ID added both in the same operation. 4) CVE-2024-21886 can be triggered by disabling a master device with disabled slave devices. 5) CVE-2024-0409 can be triggered by enabling SELinux xserver_object_manager and running a client. 6) CVE-2024-0408 can be triggered by enabling SELinux xserver_object_manager and creating a GLX PBuffer. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2024-January/003444.html Switch to .tar.gz as the announcement mail only contained hashes for that: https://lists.x.org/archives/xorg-announce/2024-January/003442.html Signed-off-by: Peter Korsgaard (cherry picked from commit 219178ef3eed5b3f4a5da0fe4af751e79d77e432) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index de93b11927..be636936e2 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-December/003436.html -sha256 ceb0b3a2efc57ac3ccf388d3dc88b97615068639fb284d469689ae3d105611d0 xorg-server-21.1.10.tar.xz -sha512 8135d9b7c0c71f427ba0a3b80741fee4f6ae195779399b73261a00858882f3516e367a08e2da1403734b04eacabae9aa231e5375eff23b57a3ff764e9caf8926 xorg-server-21.1.10.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003442.html +sha256 1aa0ee1adad0b2db7f291f3823a4ab240c7f4aea710e89f5ef4aa232b6833403 xorg-server-21.1.11.tar.gz +sha512 e41bf71955691e66084a67fc20643632087f0326d5eddc31e6edd118d05005b8ab536738c181f4c352f331ec8fc8f23ae1b45f237592fa5d7eddbffe43638b08 xorg-server-21.1.11.tar.gz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 4ac4283e4b..4a05582583 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,8 +4,8 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.10 -XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz +XSERVER_XORG_SERVER_VERSION = 21.1.11 +XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 13:34:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:34:38 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/xwayland: security bump to version 23.2.4 Message-ID: <20240228134102.AF3E587BA1@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2bc7c3e8a92607d02bca0089b3f529cc155dfdd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following security issues: 1) CVE-2023-6816 can be triggered by passing an invalid array index to DeviceFocusEvent or ProcXIQueryPointer. 2) CVE-2024-0229 can be triggered if a device has both a button and a key class and zero buttons. 3) CVE-2024-21885 can be triggered if a device with a given ID was removed and a new device with the same ID added both in the same operation. 4) CVE-2024-21886 can be triggered by disabling a master device with disabled slave devices. 5) CVE-2024-0409 can be triggered by enabling SELinux xserver_object_manager and running a client. 6) CVE-2024-0408 can be triggered by enabling SELinux xserver_object_manager and creating a GLX PBuffer. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2024-January/003444.html Signed-off-by: Peter Korsgaard (cherry picked from commit b8d9e75eb89898fac1a8200e78bca084635eefbc) Signed-off-by: Peter Korsgaard --- package/x11r7/xwayland/xwayland.hash | 6 +++--- package/x11r7/xwayland/xwayland.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash index 533ef9de86..5bb26bf17e 100644 --- a/package/x11r7/xwayland/xwayland.hash +++ b/package/x11r7/xwayland/xwayland.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-December/003437.html -sha256 eb9d9aa7232c47412c8835ec15a97c575f03563726c787754ff0c019bd07e302 xwayland-23.2.3.tar.xz -sha512 37198aa2f06313a0cb2add51cc78f81b26a42f2c9d55a0d3eecf958777107ea5560961c128f2d0af055f7460ba10fadb1b9050251c2c50f2251b40ab517e79cd xwayland-23.2.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003443.html +sha256 a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b xwayland-23.2.4.tar.xz +sha512 ac3ff208cbef5bbe4637c335cfda226489c93b0a3768f2f4fb0201c588485ede38262fbce77ef1425b3d2a0be61b6580df53341c7b95e6072c8b6371ad29d187 xwayland-23.2.4.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk index 8f4bcd8117..c66dd471ac 100644 --- a/package/x11r7/xwayland/xwayland.mk +++ b/package/x11r7/xwayland/xwayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -XWAYLAND_VERSION = 23.2.3 +XWAYLAND_VERSION = 23.2.4 XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver XWAYLAND_LICENSE = MIT From peter at korsgaard.com Wed Feb 28 13:37:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:37:19 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/cog: bump to version 0.18.2 Message-ID: <20240228134102.CC40487BA4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9a46e9e1718f3e8ba764a6233f39bf2338609c93 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x This is a small bugfix release, with a fix for a crash in the DRM/KMS module that affects i.MX6 boards and probably others. Release notes: https://wpewebkit.org/release/cog-0.18.2.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit afe633d6beef29b05514e2272414b6db6a727cb8) Signed-off-by: Peter Korsgaard --- package/cog/cog.hash | 8 ++++---- package/cog/cog.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 177113bb42..387666969a 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.18.1.tar.xz.sums -md5 204ae9353ed828e4ac39b1dd4c5c35dd cog-0.18.1.tar.xz -sha1 f0f0ebcd279170f427be0ad57fd356faff1a2732 cog-0.18.1.tar.xz -sha256 72e3a84052b459e2d53d0e8b947f20e27bf5d8049766c4c1594eb9c6b6cf7ab3 cog-0.18.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.18.2.tar.xz.sums +md5 7fbfc2e19304132be0d73f5e5512151c cog-0.18.2.tar.xz +sha1 045294f7fa878db86e4b8a617ee4ac056a71cb75 cog-0.18.2.tar.xz +sha256 3c4237cff6323b8c3eaf52c6f3f6415b898a22c0127c6c396c1eaa6eef46c279 cog-0.18.2.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index bd34f124c5..e96909f779 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.18.1 +COG_VERSION = 0.18.2 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 13:38:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:38:54 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/faad2: force arm mode instead of Thumb mode Message-ID: <20240228134102.D9AF187BA2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a07d1795ff504441b4df2b390e1b4e79051618b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix the following build failure in Thumb mode: /tmp/ccfzn6FH.s:36: Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/838808b4751244ee01cde6b8261212b49e511a32 Signed-off-by: Fabrice Fontaine [Peter: reword comment slightly] Signed-off-by: Peter Korsgaard (cherry picked from commit a33827760823b1455326e0fc8cf6089a3081e782) Signed-off-by: Peter Korsgaard --- package/faad2/faad2.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index 686e5045c0..0b249b3450 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -12,4 +12,11 @@ FAAD2_CPE_ID_VENDOR = audiocoding FAAD2_CPE_ID_PRODUCT = freeware_advanced_audio_decoder_2 FAAD2_INSTALL_STAGING = YES +# faad2 contains assembly routines using ARM instructions not present in thumb1 mode: +# Error: selected processor does not support `smull r2,r3,r1,r0' in Thumb mode +# so force ARM mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FAAD2_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -marm" +endif + $(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 28 13:35:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:35:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/xserver_xorg-server: security bump to version 21.1.11 Message-ID: <20240228134102.BE4C587B5A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8667430da27b9c07ab0bb78a96dc0c3957041e64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following security issues: 1) CVE-2023-6816 can be triggered by passing an invalid array index to DeviceFocusEvent or ProcXIQueryPointer. 2) CVE-2024-0229 can be triggered if a device has both a button and a key class and zero buttons. 3) CVE-2024-21885 can be triggered if a device with a given ID was removed and a new device with the same ID added both in the same operation. 4) CVE-2024-21886 can be triggered by disabling a master device with disabled slave devices. 5) CVE-2024-0409 can be triggered by enabling SELinux xserver_object_manager and running a client. 6) CVE-2024-0408 can be triggered by enabling SELinux xserver_object_manager and creating a GLX PBuffer. For details, see the advisory: https://lists.x.org/archives/xorg-announce/2024-January/003444.html Switch to .tar.gz as the announcement mail only contained hashes for that: https://lists.x.org/archives/xorg-announce/2024-January/003442.html Signed-off-by: Peter Korsgaard (cherry picked from commit 219178ef3eed5b3f4a5da0fe4af751e79d77e432) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index de93b11927..be636936e2 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-December/003436.html -sha256 ceb0b3a2efc57ac3ccf388d3dc88b97615068639fb284d469689ae3d105611d0 xorg-server-21.1.10.tar.xz -sha512 8135d9b7c0c71f427ba0a3b80741fee4f6ae195779399b73261a00858882f3516e367a08e2da1403734b04eacabae9aa231e5375eff23b57a3ff764e9caf8926 xorg-server-21.1.10.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-January/003442.html +sha256 1aa0ee1adad0b2db7f291f3823a4ab240c7f4aea710e89f5ef4aa232b6833403 xorg-server-21.1.11.tar.gz +sha512 e41bf71955691e66084a67fc20643632087f0326d5eddc31e6edd118d05005b8ab536738c181f4c352f331ec8fc8f23ae1b45f237592fa5d7eddbffe43638b08 xorg-server-21.1.11.tar.gz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 4ac4283e4b..4a05582583 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,8 +4,8 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.10 -XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz +XSERVER_XORG_SERVER_VERSION = 21.1.11 +XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 13:42:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:42:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/falcosecurity-libs: drop FALCOSECURITY_LIBS_CPE_ID_VENDOR In-Reply-To: <20240126173059.1629666-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 26 Jan 2024 18:30:58 +0100") References: <20240126173059.1629666-1-fontaine.fabrice@gmail.com> Message-ID: <87wmqopuwa.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > FALCOSECURITY_LIBS_CPE_ID_VENDOR is plain wrong since the addition of > the package in commit a15e35c4ebc52f29f65372c8e86cefa874aa4aaf, indeed > falco:falcosecurity-libs is not a valid CPE ID: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:falco:falcosecurity-libs > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From christian at klarinett.li Wed Feb 28 14:50:11 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:50:11 +0100 Subject: [Buildroot] [PATCH 3/3] package/googlefontdirectory: allow generating static fonts In-Reply-To: <20240228145013.411919-1-christian@klarinett.li> References: <20240228145013.411919-1-christian@klarinett.li> Message-ID: <20240228145013.411919-3-christian@klarinett.li> From: Christian Hitz Google's fontdirecty started to include variable fonts. Some components (notably Qt) do not (yet) support these variable fonts. In order to still use these fonts they can be converted to static fonts at build time. This conversion is enabled by setting BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC=y. The static font configuration is then selected by setting BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC_WEIGHTS_WIDTHS. Signed-off-by: Christian Hitz --- package/googlefontdirectory/Config.in | 17 ++++++++++ .../googlefontdirectory.mk | 31 +++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/package/googlefontdirectory/Config.in b/package/googlefontdirectory/Config.in index cf2814d88f..f2d3e18511 100644 --- a/package/googlefontdirectory/Config.in +++ b/package/googlefontdirectory/Config.in @@ -16,4 +16,21 @@ config BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS Font directory code base. For example: ufl/ubuntu, apache/kranky or ofl/gleego. +config BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC + bool "Convert variable fonts to static" + default "false" + help + Convert the selected fonts to static fonts. + +if BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC + +config BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC_WEIGHTS_WIDTHS + string "List of font variants to generate" + default "Regular:400:100 Bold:700:100" + help + Specify a space-separated list of Name:Weight:Width tuples + describing the requested static font variants. + +endif + endif diff --git a/package/googlefontdirectory/googlefontdirectory.mk b/package/googlefontdirectory/googlefontdirectory.mk index b0e5b6e532..71ccdf3fc6 100644 --- a/package/googlefontdirectory/googlefontdirectory.mk +++ b/package/googlefontdirectory/googlefontdirectory.mk @@ -27,6 +27,35 @@ endif GOOGLEFONTDIRECTORY_LICENSE = $(subst $(space),$(comma)$(space),$(GOOGLEFONTDIRECTORY_ALL_LICENSES)) +ifeq ($(BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC),y) +GOOGLEFONTDIRECTORY_DEPENDENCIES += host-python-fonttools +GOOGLEFONTDIRECTORY_FONT_VARIANTS = \ + $(call qstrip,$(BR2_PACKAGE_GOOGLEFONTDIRECTORY_CREATE_STATIC_WEIGHTS_WIDTHS)) + +elementFromColonTuple = $(word $2,$(subst :, ,$1)) +define GOOGLEFONTDIRECTORY_BUILD_CMDS + $(foreach f,$(GOOGLEFONTDIRECTORY_FONTS), \ + $(foreach v,$(GOOGLEFONTDIRECTORY_FONT_VARIANTS), \ + $(foreach d,$(wildcard $(@D)/$(f)/*.ttf), \ + $(HOST_DIR)/bin/fonttools varLib.mutator -q --output=$(@D)/temp.ttf $(d) wght=$(call elementFromColonTuple,$v,2) wdth=$(call elementFromColonTuple,$v,3) + $(HOST_DIR)/bin/ttx -q $(@D)/temp.ttf + $(SED) "s/Regular/$(call elementFromColonTuple,$v,1)/g" $(@D)/temp.ttx + $(HOST_DIR)/bin/ttx -q -o $(@D)/$(basename $(notdir $f))-$(call LOWERCASE,$(call elementFromColonTuple,$v,1)).ttf $(@D)/temp.ttx + $(RM) $(@D)/temp.ttf $(@D)/temp.ttx + ) + ) + ) +endef + +define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS + $(foreach d,$(GOOGLEFONTDIRECTORY_FONTS), \ + mkdir -p $(TARGET_DIR)/usr/share/fonts/$(notdir $(d)) + -$(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/share/fonts/$(notdir $(d)) $(@D)/$(basename $(notdir $d))-*.ttf + ) +endef + +else + define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS $(foreach d,$(GOOGLEFONTDIRECTORY_FONTS), \ mkdir -p $(TARGET_DIR)/usr/share/fonts/$(notdir $(d)) @@ -34,4 +63,6 @@ define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS ) endef +endif + $(eval $(generic-package)) -- 2.43.0 From christian at klarinett.li Wed Feb 28 14:50:09 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:50:09 +0100 Subject: [Buildroot] [PATCH 1/3] package/python-fonttools: enable host-package Message-ID: <20240228145013.411919-1-christian@klarinett.li> From: Christian Hitz The fonttools are used to generate static fonts from variable fonts at build time. Signed-off-by: Christian Hitz --- package/python-fonttools/Config.in.host | 6 ++++++ package/python-fonttools/python-fonttools.mk | 1 + 2 files changed, 7 insertions(+) create mode 100644 package/python-fonttools/Config.in.host diff --git a/package/python-fonttools/Config.in.host b/package/python-fonttools/Config.in.host new file mode 100644 index 0000000000..641efb1cfb --- /dev/null +++ b/package/python-fonttools/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_PYTHON_FONTTOOLS + bool "host-python-fonttools" + help + Tools to manipulate font files. + + https://github.com/fonttools/fonttools diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index e2472aa184..682a453ab4 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -14,3 +14,4 @@ PYTHON_FONTTOOLS_DEPENDENCIES = host-python-cython PYTHON_FONTTOOLS_ENV = FONTTOOLS_WITH_CYTHON=1 $(eval $(python-package)) +$(eval $(host-python-package)) -- 2.43.0 From christian at klarinett.li Wed Feb 28 14:50:10 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:50:10 +0100 Subject: [Buildroot] [PATCH 2/3] package/googlefontdirectory: bump to 2125bc9b447971543caaa132530b828e5e682819 In-Reply-To: <20240228145013.411919-1-christian@klarinett.li> References: <20240228145013.411919-1-christian@klarinett.li> Message-ID: <20240228145013.411919-2-christian@klarinett.li> From: Christian Hitz This is the current version on main branch. Signed-off-by: Christian Hitz --- .../googlefontdirectory.hash | 2551 +++++++++++------ .../googlefontdirectory.mk | 2 +- 2 files changed, 1618 insertions(+), 935 deletions(-) diff --git a/package/googlefontdirectory/googlefontdirectory.hash b/package/googlefontdirectory/googlefontdirectory.hash index 10f3bf60b1..24967b0490 100644 --- a/package/googlefontdirectory/googlefontdirectory.hash +++ b/package/googlefontdirectory/googlefontdirectory.hash @@ -1,994 +1,1677 @@ # Locally calculated -sha256 ec2ddbeee673cce1b0796e3b20fbff5fd836ce9ba6d88deed8b59154fa255f06 googlefontdirectory-94dff3eaa9301b6640cccc63c56d6ff33d82882c.tar.gz +sha256 c911d284cb6ff255f25298123f33aaf96039664dcf3de22e66ca9f2af7019a08 googlefontdirectory-2125bc9b447971543caaa132530b828e5e682819.tar.gz # Locally calculated with -# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt') ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotocondensed/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanscondensed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/walterturncoat/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/fontdinerswanky/LICENSE.txt +# for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt' | sort) ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/aclonica/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/sunshiney/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/ultra/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/unkempt/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/slackey/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/satisfy/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensans/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/montez/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kranky/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/arimo/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrew/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/tinos/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrewcondensed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/justanotherhand/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotoslab/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/homemadeapple/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/calligraffitti/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cherrycreamsoda/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/chewy/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/comingsoon/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cousine/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/craftygirls/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/creepstercaps/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/crushed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotomono/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/fontdinerswanky/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/homemadeapple/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/irishgrover/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/justanotherhand/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kosugi/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kosugimaru/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kranky/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/luckiestguy/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/maidenorange/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/roboto/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rochester/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rocksalt/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/creepstercaps/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/nokora/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/montez/LICENSE.txt sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/mountainsofchristmas/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cousine/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/syncopate/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/specialelite/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/luckiestguy/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrewcondensed/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrew/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/permanentmarker/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rancho/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/smokum/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/redressed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/irishgrover/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/comingsoon/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cherrycreamsoda/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotomono/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotoslab/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rochester/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rocksalt/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/satisfy/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/schoolbell/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/slackey/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/smokum/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/specialelite/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/sunshiney/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/syncopate/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/tinos/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/ultra/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/unkempt/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/walterturncoat/LICENSE.txt sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/yellowtail/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/calligraffitti/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/permanentmarker/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/chewy/LICENSE.txt -sha256 0fc8e6675568c02aac6b41dd3cccaf2264fc5969601effe68e09b26635879b2c ofl/ranchers/OFL.txt -sha256 ff72e4d89860e64ee38ccf8a5a7e9dc085d5e36115b096a6c7f8bc988e9bec61 ofl/kumarone/OFL.txt -sha256 643c63caf03855ae29be68035d8888e95eadc767a1d92f163d686da1b0a1cd3c ofl/cantarell/OFL.txt -sha256 1d242ab6fbb2dfbba2e7119b00a6328bc59cb2faf7299b844e9b92a2f12c0d8b ofl/adventpro/OFL.txt -sha256 01af2625d6247ecd2430d1d1603c579f85989d43b2d9129e08e0ac0df8909918 ofl/tienne/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaina/OFL.txt -sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustina/OFL.txt -sha256 69c34ca1873308c667ddde663cbf59c0d1cf14cbb945ad010f71d21264249e24 ofl/aubrey/OFL.txt -sha256 4febcc8d6e539db3e0c652da87bc8704f6d48e71e07f8ddb0974094a3de8da81 ofl/flavors/OFL.txt -sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktavaani/OFL.txt -sha256 ab5499b975c2dc82f533c6f13c5fca589df4d57c7c400db5f6ca8565ad9c2fd3 ofl/butchermancaps/OFL.txt -sha256 6a28d4d5d8b4d1ea89ace5a047ac6e0de182acdb8bfa22897bf7702102094f69 ofl/shadowsintolighttwo/OFL.txt -sha256 7a1d085067cd589026b256dd85af1eaa1087fa0f3d468192724c5138cc14d894 ofl/copse/OFL.txt -sha256 fd17f80dc48ff767d91d0dd9f821eebfd8b73ee82f55537a9052b6b0107622c8 ofl/voces/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowsemicondensed/OFL.txt -sha256 4aa1da66597f4c5cfde67790992ee55926ef6aaa87b9a10d529ab35e8b91070c ofl/asapcondensed/OFL.txt +sha256 f0376d04eb58fb19e9f1690a99a1eb37380ad0246f7d503f2abd8e8a74ed12be ofl/abeezee/OFL.txt +sha256 4f4bc3806a1e55789c6ef75ca5fc628297b05292f74966474dc0d40324abc609 ofl/abel/OFL.txt +sha256 fe9183a0b7c1ae626b14004cd533c89ec7c192aba017f81ab71ede910256abb2 ofl/abhayalibre/OFL.txt +sha256 da0971c73aa1773b791926b81530f3cec50c94031912f162a320263488805ef8 ofl/aboreto/OFL.txt +sha256 aba8997e16b1e3888c6e855ba883c70d96bd4375bff8cb9c7ce0f097200f74b8 ofl/abrilfatface/OFL.txt +sha256 09686a4f466a3e8e277078fa304509fca618670fc6334f7180439ef2d5ebb18f ofl/abyssinicasil/OFL.txt +sha256 e5ccbfc32e4d7fae98b467a9af310ac8d2efd5d90e684426cd24f3eb36090a2c ofl/acme/OFL.txt +sha256 c1bcd16ffc9d095822fd6b7fa1a24c7918b24815ed05711421f804293d2efa62 ofl/actor/OFL.txt +sha256 16a8be6ac4b009ba1dd1e17cea48762f4915609ea5dca1303f716cf63998739d ofl/adamina/OFL.txt +sha256 657961e80b42febe82f70a56a4ffe6bbd1dba06aec6338f002f729e637fdb902 ofl/adlamdisplay/OFL.txt +sha256 794d72ffdd25e8f7ca8e1d68db088c30ddbf2fdb369b6cc8217d4fa5fa6dc62f ofl/adobeblank/OFL.txt +sha256 c8d52b6a6c2a6c46193a48d4e6dc7368896bc7d4c069f33abca0728476957aec ofl/adventpro/OFL.txt +sha256 a65e37f173d58cab5d4f8eb6373f4e24ee79ad6c80235dbe845a117917af2d99 ofl/afacad/OFL.txt +sha256 e338828ef7e0686999d6e041d8b2020a952e537179c4bec70a43cf04000f1202 ofl/agbalumo/OFL.txt +sha256 5a5df9eeb233115038bb9bbe00d37897195864802cb889fe755697ba7736d518 ofl/agdasima/OFL.txt +sha256 520a0c239d39b379b61c4de5f8e3b02db20b0dfc137481843eac01f02c41f4a2 ofl/aguafinascript/OFL.txt +sha256 570f2e9653614183d28503a9fb25ec5d3d31cde064b617e853e71d8dba629085 ofl/akatab/OFL.txt +sha256 ca8b6e93436590a2e4efe58431345c0d5c00a43f1f4412c7cbac650215933ad9 ofl/akayakanadaka/OFL.txt +sha256 c9fe51b84ce71b4e8bd90eee48812942694c46f8b8c89207c0fc5579727d595e ofl/akayatelivigala/OFL.txt +sha256 f15a9a3a9a665c2d17655b8fedad86d9a8f30081d46bb91236beb1bc7294a589 ofl/akronim/OFL.txt +sha256 c39e284759a441660d4c4d852c537e271d0fd5c301fe46d065a972b6ee144ba8 ofl/aksarabaligalang/OFL.txt +sha256 f177d40332e5a3f1b76d1d19821102173f30aab9dc58329db20ed1ab42ac7ec1 ofl/akshar/OFL.txt +sha256 aac8f0cda6159b7251d1034651bcb42e07611495bc8cd764c89d22f3123032f8 ofl/aladin/OFL.txt +sha256 def1327fad7ddbec8a64701518aa5b8b8e3fc657559c4a6ce43a9163c3ceb6bb ofl/alata/OFL.txt +sha256 82d8db016c47218bd20ebd5db171d896d6e42d6edb7dcb59feb54523bf07495d ofl/alatsi/OFL.txt +sha256 5c856c086e8743b84932aae46ced424729a703932b601e9eb8aaeac15a617ec6 ofl/albertsans/OFL.txt +sha256 de985adf63cff6b1bcb7c5cb55f1c5850fb1d36289d20a0e26d97a281bfcf956 ofl/aldrich/OFL.txt +sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alef/OFL.txt +sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreya/OFL.txt +sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasans/OFL.txt +sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasanssc/OFL.txt +sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreyasc/OFL.txt +sha256 f13013bb1f4887b67240ec2ec5754ef968a3753ada1e538b598eae375cf74273 ofl/aleo/OFL.txt +sha256 56372aed19c2701f50e6e784110af55bf8796ed51648805324ad1adb0a3860bb ofl/alexandria/OFL.txt +sha256 0ee34ce7c99b0deb7f7332bca0a4950d3796c23c00de77ada8aa29a4b55ff2c2 ofl/alexbrush/OFL.txt +sha256 e315abc82a78710c7242e2f2e6529651fd631d4d50e6ad98ea194f9b54c3d701 ofl/alfaslabone/OFL.txt +sha256 ef643b6b82fb5c2ce056e27b6bf6908433a785bbb6ee6dc23c4739743f063e54 ofl/alice/OFL.txt +sha256 fb5d6a8310a52ccc2036f1c98db07ece3a9f167d9b3138e13452fefc4c865fd9 ofl/alikeangular/OFL.txt +sha256 9c63835765bcc42b59fab82a211b61a8cea32f2abd7e8bf288d4c84463adace0 ofl/alike/OFL.txt +sha256 ff805fd2cff5f5f7e8890323702f4cd461c179a76bb6016c93031338f49af3d4 ofl/alkalami/OFL.txt +sha256 5985658cc7672eb25b95427a485ce922402908c90d9feaca2a88930cd98e54d9 ofl/alkatra/OFL.txt +sha256 ab721b35816e470fb11619ad3705f75d08dccd0864505e3d782e94fd937f6620 ofl/allan/OFL.txt +sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allerta/OFL.txt +sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allertastencil/OFL.txt +sha256 75db6ecda0911c52cc92b7aca4b7eb33120333e664851ec2b57fc6330f9fd84e ofl/allison/OFL.txt +sha256 c8cb4c94a558b6cb82ac5dc981a73a0b8aee35a5c52c8a7832fc0280c289ad49 ofl/allura/OFL.txt +sha256 142e053c374dd465a92bd7378116b517e344dbc662361308130fc2566db30c2a ofl/almarai/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendradisplay/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendra/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendrasc/OFL.txt +sha256 2b0ed87071361caf613d6362b46d7289037f1001af3b11ab747905692f87025e ofl/alumnisanscollegiateone/OFL.txt +sha256 e7ae596600908a4ba9634d03b8096fe3a5445fe692b3f420d7490512ca0e8521 ofl/alumnisansinlineone/OFL.txt +sha256 08e1c6fa00b198f9cf90fd8c7f540ce400892063234d5a3b38dcae9f659c977f ofl/alumnisans/OFL.txt +sha256 855c8e5b459dfa20361af32b393bab0c18f67f888ee7bd69d54318cbefcaa7fe ofl/alumnisanspinstripe/OFL.txt +sha256 89bf0833b785c49b0f271273ab440bdc20c85bf0322537dc901df940bf1579da ofl/amarante/OFL.txt +sha256 5eca89cdd576df5e4b7c694e0425b126a9ca839aa067df85fab33904a8187076 ofl/amaranth/OFL.txt sha256 301f77908df2b00141b4dcea50cc1a586c3afcee78843bd811088e8263623f9d ofl/amaticsc/OFL.txt -sha256 6b6c6721a30480a323cf33acf6a7703dfce46b846827a65f8ee96230060e3c3e ofl/homenaje/OFL.txt -sha256 393d494f9ebb5db6a3552ffa03a4c6f3746c22808b40d011b391681da55ca3f6 ofl/kellyslab/OFL.txt -sha256 ca19ac21c7656f493189093eca52b4239fcc5eacc15ab2e3d67cfbfc0e6e443b ofl/sirinstencil/OFL.txt -sha256 980c2b058d331f3c5ca4a1223e549511b71630e4f4a5533879d436d583cb5665 ofl/arbutus/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsans/OFL.txt -sha256 7527e73a61f742a0dd050ab2fc7333de71ac7886023c100bca66a0a93b37498e ofl/headlandone/OFL.txt -sha256 39b26527bf9ed27b4c85b86341eceea0579f3550bcf448cf06345eaadf947ec9 ofl/rugeboogie/OFL.txt +sha256 ca424122f42a8d8442bc4cfd902f5f027ea67b5417705f5af1d1235927781720 ofl/amethysta/OFL.txt +sha256 bd8323cd1d2b6bbdfbbf99cb41ec1156d0352ced170de4aa3a96d95e6e20bf5b ofl/amiko/OFL.txt +sha256 72598f78a098644c6b4ac04665e0bad7a69841c0dc504e81a8399d963a23e50d ofl/amiri/OFL.txt +sha256 b73b7b5ef4da8d6f83c93bbcad4d2a8d13be8fb44f3eeb3305b7e6d1f0c5a0c9 ofl/amiriquran/OFL.txt +sha256 0dd8e32457e18621737b593ab0fac49905cd948a078ed0e64f4890df714a1dfb ofl/amita/OFL.txt +sha256 06c79c896894160a5810d869a822fa7d02a0e2ccffd97920b8cf3b880380f6e5 ofl/amstelvaralpha/OFL.txt sha256 2ac164969308ac200eefc516151934701044f0db5695ae2acc15df2a8d22e5cb ofl/anaheim/OFL.txt -sha256 88d3abd47414e7912d0d2eb44ca89e0b1bd7c43cc2ebe58a8a75281ad75a0f60 ofl/stardosstencil/OFL.txt -sha256 01003114b77326df223f291c48cdf12e95f6a5937437f164347919f2bbde12d4 ofl/josefinslab/OFL.txt -sha256 83aa5adca2418f091b732a19cc7c30dcb5c00c217051a58f34f5eecb19be0cd3 ofl/average/OFL.txt -sha256 585c6d2da8bcd8ffa651e0016f2e992a6891b625143a46a1dacf00699a817d9a ofl/monoton/OFL.txt -sha256 96e65d9c227a972e38035b849bba1e8b7879eecbb52f278be1e71dd481187f02 ofl/domine/OFL.txt -sha256 d1bf0acea511ad1f4de53e942cffb8ab0e67c03c6203d6f390d71105d52c33f0 ofl/missfajardose/OFL.txt -sha256 131d19126a0e7ddd25540fd6bee219cebbc8aee7e8374882998ee6c2f4ff6cf4 ofl/mergeone/OFL.txt -sha256 042a570b306ab893c6168be7e6e79bbceae46097141357ad0af7ef8bb179ed7b ofl/goblinone/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexserif/OFL.txt +sha256 34f84fc4cafb1090f253e429fcdd72e9adb059864edd5ba3ba19ff4f0586769e ofl/andadapro/OFL.txt +sha256 43ee152fcd7be0c6eb3468f3012e776cb75bf88f5dec548be0aa4619bf438f9e ofl/andika/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekbangla/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekdevanagari/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekgujarati/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekgurmukhi/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekkannada/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/aneklatin/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekmalayalam/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anekodia/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anektamil/OFL.txt +sha256 de62be758bba267e653a5f457dfebb4680957e2c343eb3e7de15aff4746bed05 ofl/anektelugu/OFL.txt +sha256 ffa0191e03e3d94d2269bcdcdbaa31cd5c7dc6aa189ec531de939ffd2a3a5f09 ofl/angkor/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/annieuseyourtelescope/OFL.txt +sha256 8594350034ab1cb85a1946ef8852e69290255816c311450a66fed6eeda9d6292 ofl/anonymouspro/OFL.txt +sha256 b9ced72fbc4812b7dd2a67fe4df3ecbc0a75a7f43c0ffc4f0873a198d8b8431d ofl/anta/OFL.txt +sha256 60ddc0ee6e443b78940b5f92bcbab76c98ec6965e0da9fbdaf267383ab72bba8 ofl/anticdidone/OFL.txt +sha256 c1f8e0feb0babaacf774b971bcfd791e44125b9d61ff074e4c20924e9661556e ofl/antic/OFL.txt +sha256 22d1914919d3fe08b179dc31169fc743ca7eede7827b91a5d48c23c8cdc7cb81 ofl/anticslab/OFL.txt +sha256 ae9a754b006df720bb6721e7b78c04990df734f87195c6033140fceab60bebf6 ofl/antonio/OFL.txt +sha256 ee67e6ee22790b7929f1a3769ca2801d565c64b5a9096942c1adf5596de9c9e4 ofl/anton/OFL.txt +sha256 cbc57ac0dddda1b70f246a16358fc3c2a32628a23a6d10ef64f746141d3fb159 ofl/anuphan/OFL.txt +sha256 7f0313b042b462fcae1934436cc747f9fd4433e3b08fd6459a4a5104b0bbd5db ofl/anybody/OFL.txt +sha256 c0093b62824cfa8786df613c00a316fa483bdcb7ccd11ba5faca006bb692f68d ofl/aoboshione/OFL.txt +sha256 cf6dd07485d67d20f105afb9981dffdb6b180b59af45a228839cf3fb0277c9fb ofl/arapey/OFL.txt +sha256 980c2b058d331f3c5ca4a1223e549511b71630e4f4a5533879d436d583cb5665 ofl/arbutus/OFL.txt +sha256 1c023b4aca0e441c55c45c86cdff57fa524a96778f291d9a29a4ad777b70e2e3 ofl/arbutusslab/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/architectsdaughter/OFL.txt +sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivoblack/OFL.txt +sha256 b2087ef3fb91248e346600d19021249152a9688efea72905aa1996bb16a4c8de ofl/archivonarrow/OFL.txt +sha256 108b4e57c9c796d3d38d0428ca7ee39de47ad93187302718d9b2d8864b9b716b ofl/archivo/OFL.txt +sha256 c5211cc6a0eb32a23608076d74585942dc4d9a738357cfe40b7dddcee1442f33 ofl/arefruqaaink/OFL.txt +sha256 41ac14451a624c69490e24b9aaaaa1f65dc9dc17c3f6f38172fc43d5ba654a1b ofl/arefruqaa/OFL.txt +sha256 424875d518bd5175f201a74349796121c959f9c095f960b9d57521612a77ec7a ofl/areyouserious/OFL.txt +sha256 aae6749568fe746a578b16cb6ca8ca9a22729b0c738254e17c21b23a61972bd0 ofl/arima/OFL.txt +sha256 a525f5a38671cd1a5e0071968fe39c8a135b4f42d412a92ab9cf970923332430 ofl/arizonia/OFL.txt +sha256 47a0b7e315bc56ca0326fca46302d87d48a61e3528d4196e966b62f5bf0243f2 ofl/armata/OFL.txt +sha256 c1bec22a6baf0cc6365b3f049694559f171a92ffa6eef2ddb26b0950ff6a4693 ofl/aronesans/OFL.txt +sha256 a94cfd8d1f5c33f9a7506def359b907f3313f7008bb57fc893985963cd342f8f ofl/arsenal/OFL.txt +sha256 3cb7c635ce885c1410af5cbe934d1a89b05055635a53a0a5971db5edc77a4ac1 ofl/artifika/OFL.txt +sha256 359671bf16c00cae69cb66d041296b2adc7a4becd73a463cb8c5e101d97c7986 ofl/arvo/OFL.txt +sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/arya/OFL.txt +sha256 a6f4d778db0d2a87c2c6e560f71eb018b4253505b2f23c108724dea5d4d74ed0 ofl/asapcondensed/OFL.txt +sha256 a6f4d778db0d2a87c2c6e560f71eb018b4253505b2f23c108724dea5d4d74ed0 ofl/asap/OFL.txt +sha256 223fa23e8419ee762c662e0faf912dfcf386fa7093ac9ff690e380ce1993ba55 ofl/asar/OFL.txt +sha256 14313e23f0e8f72849f29306b73e878001a77bf3a22fef14352f9800357a3827 ofl/asset/OFL.txt +sha256 7eaf6282cfab122b99ffd62a122fc27b6c3c8f2c65b56ff9b3a25badbc64887d ofl/assistant/OFL.txt +sha256 4e69611ba5017f1fde74c31d342f5c85604814b1b45387b9ab46205996dec38e ofl/astloch/OFL.txt +sha256 ea274e87939d38032b31fb741af75bff9fa3f8d4a8b652265f9e0ce1ad7e9f80 ofl/asul/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/athiti/OFL.txt +sha256 f32d22b3908fcad2c86a74000614ec22e6a7f66ea7e867e616026a27aebdc143 ofl/atkinsonhyperlegible/OFL.txt +sha256 96d82a96abc02fb457ddde0227833dbde9d1d02876c91f0a4e27845ca0d692fa ofl/atomicage/OFL.txt +sha256 071a0917e2aca3f11ebb24ec0a01b85315d3d07787b1e273033708f5faa67fd2 ofl/aubrey/OFL.txt +sha256 4fe01b13ffb41faa8f030d84843a95dab32792dfeeca7c072abbfd3f4d6896ad ofl/audiowide/OFL.txt +sha256 793891edf1f4f4f35b52fcc9706b03f779c7ea18ab8e9e441242d63ef0279488 ofl/autourone/OFL.txt +sha256 b8397dc8f7ede718fda9a553018d3dc2e90db99da53a85cb644204ce4e629844 ofl/average/OFL.txt +sha256 37d5360d8d2433689e78302a93cd88e9add8a2294046476625edada2d4328deb ofl/averagesans/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiagruesalibre/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averialibre/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiasanslibre/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiaseriflibre/OFL.txt +sha256 2a0fd31798d131b38a9fe730a260bc9a1d85452e36cdf79e5fcaf937bf4d9f86 ofl/azeretmono/OFL.txt +sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612mono/OFL.txt +sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612/OFL.txt +sha256 213ab761dccc1d47421dd9b88c38b317f8cb35452655db4cf023886b78b76418 ofl/babylonica/OFL.txt +sha256 9c44c9cf5f348a3069f350ed032a55069532d66fb0d7cf958d09012667a88fbe ofl/bacasimeantique/OFL.txt +sha256 d38acce513eccb51d7ac34ca47be279e1fcfdeca1ed088bdd2d281dc6ca939ee ofl/badscript/OFL.txt +sha256 4f40ab196ccf674056fed8b0e6d4f918eea183a149be8a67bff1239413ebada9 ofl/bagelfatone/OFL.txt +sha256 e3ed3ad6cb257e16dc1789900707c5cd1cdef2d60d155389342604991cf693f9 ofl/bahiana/OFL.txt +sha256 d33d42f346e4c706291b3373b8120bfe5fa74377c6c858b0626e5dc4f5c29245 ofl/bahianita/OFL.txt +sha256 fe5e822667a4b2e083b8fdd7a37546163f26f6481b58742236abffdcfb3e6c71 ofl/baijamjuree/OFL.txt +sha256 f2f87c78860447f0bba5f99a1ff7c7e53cc39ead09bc7f130432e58df66be8ff ofl/bakbakone/OFL.txt +sha256 f916a0e34635667d5b9828401c10d461bb29780beddd45c30c5dc25c037dffbd ofl/ballet/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloo2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloobhai2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloobhaijaan2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloobhaina2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloochettan2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/balooda2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloopaaji2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/balootamma2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/balootammudu2/OFL.txt +sha256 ad09b05dc8bc678c9daf7c4c5f7ef1f55e5726127f4330b2e98e40b9dffcb860 ofl/baloothambi2/OFL.txt +sha256 0e82859672e549fd39554e2bfa97b5511e81f4f89394f2e696666d36b5d52144 ofl/balsamiqsans/OFL.txt +sha256 876db27db250a9b9c03fc2ef30a5efe1f37c2ed2686d368c3779583bdf746912 ofl/balthazar/OFL.txt +sha256 630dd5a307c0657b094d324e069b390edf90182fe5003639e06c02a0e5769af7 ofl/bangers/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowcondensed/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlow/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowsemicondensed/OFL.txt +sha256 d90fb3bcba8c59ffd661fe1973eb4d39d9b70da666343bdd584d4b09e12e5204 ofl/barriecito/OFL.txt +sha256 e2f2dc7a667954c16a919acff5351e8ea89813d10f5a7504e1f4668fffbfa14b ofl/barrio/OFL.txt +sha256 9a51726e5f247cb1f07bb8f49c163bc3e9ddee5f367bb5a1871d09b854ed1b7c ofl/basic/OFL.txt +sha256 7cded5db7bf3c281f9364469d5f89a1f836736f61d8bd47693d7fb037b24ab6b ofl/baskervville/OFL.txt +sha256 b7e7aaa1d798762d14374256ee62450bd6585f1ec9490a95368e90a90e425d7d ofl/battambang/OFL.txt sha256 bc80ea18223ea0db2ed73ab5bfd0cd601906a2b7a163183c6c4ea333be309ce4 ofl/baumans/OFL.txt -sha256 5f5dbf452c1657370d9280b50d647212a53c80acae6d78e0b5e8c2b26dc62b09 ofl/puritan/OFL.txt -sha256 90bd333a5cf0ed09264fc3e559d44979373f6c3d983b0f65cc46e952b4eb61f0 ofl/contrailone/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/taviraj/OFL.txt -sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlock/OFL.txt -sha256 75798d56e448ba4d2aec3ef5f3c2d805d9c6fe2ba688cd3d7162b2dd31e9cf48 ofl/textmeone/OFL.txt -sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedansc/OFL.txt -sha256 466aaa3bbd245e4c91c4e82c0828efe9fcfd913f5b020d75f0918516c2540fa8 ofl/spicyrice/OFL.txt -sha256 88ac81fcd30e64f6e6b91b61b159c9b700bb3dd59012b72ec61629abcfc7fba1 ofl/medulaone/OFL.txt -sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redactedscript/OFL.txt -sha256 ce78cc8de3f6edd2738e8c02f2079db7086c9a74314baa5854675f83c33954ff ofl/kenia/OFL.txt -sha256 76af3e9e5d8768b17647813a443fcf5df3eb3ced017ee285796625e714d5ea2c ofl/ruslandisplay/OFL.txt -sha256 6e54fc004ebeb61322ecab1d86334ebf69e7051632d48eca489beee505d70762 ofl/hermeneusone/OFL.txt -sha256 8586a7e75681c7297af4cc0641eb2b29e882c5187fe189a1160eceb4e95d4163 ofl/fenix/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusunicase/OFL.txt -sha256 197c3f48cff4df3d768230e0bbdbc4305d8b8b9041ea6fb5e00872af66adc5ae ofl/novamono/OFL.txt -sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allerta/OFL.txt -sha256 af88d31020bb48a1f78f4384249814d04a44d22feeede2ff4ae79fbb4fcf74da ofl/rammettoone/OFL.txt -sha256 397e83b05703a4240be51e2c3a2be1d0d7693d7a2d8b1ff367c26a2b9afc013e ofl/singleday/OFL.txt +sha256 1fb43cb6d1df2ba95e6757c4abe9037c9736f87127aded80d41e7ba82119f488 ofl/bayon/OFL.txt +sha256 072b20402dd2e98e819b7469e9ffc0f5e3cc42224e3ccd012494a8080198f516 ofl/beaurivage/OFL.txt +sha256 72082f6cb4d04be2ecf7cc7d9e1e7d73787f0af8a5a278a47cade70c16b78341 ofl/bebasneue/OFL.txt +sha256 b2c0e5c91cc2a0e0b9594ceae858c9bf0cf41dca3c1d7d0f3c508d41db6752a9 ofl/belanosima/OFL.txt +sha256 284a5a26e6db9a04259a5690ad57d52c56a4c515ca2ece1943d950f99e709dcd ofl/belgrano/OFL.txt +sha256 2348c4852e6322105d130aa2addbe24c962e330094ad6dfbfd9fbd2281d76b0b ofl/bellefair/OFL.txt +sha256 355326d5707ff94ffe27711c7ae26217b63e93de6d5b3413292174fda5f5f9d8 ofl/belleza/OFL.txt +sha256 92938e2734b9280a9d4428c0fe4421b3e501641f78dafc7438fc19c0fc625c07 ofl/bellota/OFL.txt +sha256 92938e2734b9280a9d4428c0fe4421b3e501641f78dafc7438fc19c0fc625c07 ofl/bellotatext/OFL.txt +sha256 460966d12f306a007930575c3b8bc336fe0c32f880d622af6d3b745a06ca79a4 ofl/benchnine/OFL.txt +sha256 d4a77174d44252b564b086e4003b9e84c7a4f52859ea3b316c1242d813bbc5c4 ofl/benne/OFL.txt +sha256 4a7d2f227b91046ef7a54f8f735668d86e45f4fd4089268de292a6e9de108253 ofl/bentham/OFL.txt +sha256 d941aa56e280b4f204272c4b1add01a8ebc7af3e8e69ba8ba9118aa2a5306dde ofl/berkshireswash/OFL.txt +sha256 e8d81ba3b06080b764626d4385f319344e102ddf2c08bb4209412ac22d695f69 ofl/besley/OFL.txt +sha256 b54f3a872628c8b350ffe6b069078936cc23d9d3d020f886ea5867a000c2e2ce ofl/bethellen/OFL.txt +sha256 578f12281f17e7dd88c9e553240243b29f4240043eef22093d32c043c4ab6dc0 ofl/bevan/OFL.txt +sha256 6b7f8f73609a25ea78c891e34cf37b06f8a676b7ea986e941e43b009110f2a85 ofl/bevietnampro/OFL.txt +sha256 012b1870f81b0d97ca756edd9eea315c7fc22657ac2f1cbdfcb6772fed3e20f3 ofl/bhavuka/OFL.txt +sha256 653b14a843954678d2ebcfbbc211d59edf10ea912a953ae00704230536e702f4 ofl/bhutukaexpandedone/OFL.txt +sha256 0409c6582424508453ce41648067efaacf0c790622918493d8f1d934bc5329a0 ofl/bigelowrules/OFL.txt +sha256 0d5fa0cce86012de872273700eef4fd162459e7c24a6a314911380627391071b ofl/bigshotone/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshouldersdisplay/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshouldersinlinedisplay/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshouldersinlinetext/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshouldersstencildisplay/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshouldersstenciltext/OFL.txt +sha256 338f9c050f19daeda1d597243faf79f3a3d437c338af58cb7047617d0ce08771 ofl/bigshoulderstext/OFL.txt +sha256 89ccbb54444cd2fa0ee25cceb2e67d3453d56250a561bd176983b169cdaf47bf ofl/bilbo/OFL.txt +sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilboswashcaps/OFL.txt +sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhymeexpanded/OFL.txt +sha256 b14f883330579c3373e41c7c0acdfde91b2e812edfe1e6c5af91bd32a5fa7d13 ofl/biorhyme/OFL.txt +sha256 8214d2621f5a4113dd0eba60863e3e88916cd639444b519c87f6b6b652543072 ofl/birthstonebounce/OFL.txt +sha256 ae70628cbdffc3f7178e05a6c5ef0f94253e72eaa9c4bf109d50187151d16b12 ofl/birthstone/OFL.txt +sha256 505bb8f3c30f2006b4e02d250fda31ed94b651a35f1124a201ca1c405ce989af ofl/biryani/OFL.txt +sha256 b49fc895c04ec3e9cd31077f2539979da8065e2747037b1bb9c6548787050db4 ofl/bitter/OFL.txt +sha256 e753d7155d53c747d037a445e584c8ecfca6dd79846db610417e282a736b28bc ofl/bizudgothic/OFL.txt +sha256 ef0ed524b3bd012f37015e986809eed6f67905456ebfc1ebd7fcc2765282ee01 ofl/bizudmincho/OFL.txt +sha256 e753d7155d53c747d037a445e584c8ecfca6dd79846db610417e282a736b28bc ofl/bizudpgothic/OFL.txt +sha256 ef0ed524b3bd012f37015e986809eed6f67905456ebfc1ebd7fcc2765282ee01 ofl/bizudpmincho/OFL.txt +sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/blackandwhitepicture/OFL.txt +sha256 a02e8715fcdf3325c474b7209399f50230897bfa828fe4eea2639ced1a1d574b ofl/blackhansans/OFL.txt +sha256 f67ca4a200424868ee8fcd5464d7b35ac1cbf7723f6bfdbd19a8524689fab9a8 ofl/blackopsone/OFL.txt +sha256 94b5d5a52420a96f2b4f427bc6f56133f6ddbdfaffa17fdd29049811fc9fd64c ofl/blakahollow/OFL.txt +sha256 94b5d5a52420a96f2b4f427bc6f56133f6ddbdfaffa17fdd29049811fc9fd64c ofl/blakaink/OFL.txt +sha256 94b5d5a52420a96f2b4f427bc6f56133f6ddbdfaffa17fdd29049811fc9fd64c ofl/blaka/OFL.txt +sha256 1d084d2a6ecdadb969f9dbff4c834a8625e4c4625acd5c64f5e95809e4a3e0c2 ofl/bodonimoda/OFL.txt +sha256 3793a376255d457c0571e009846e92b4fca702756e6f28d43b54e71bff40e380 ofl/bokor/OFL.txt +sha256 38f7dca74a98bbcc13858c9f56e9c7d86e12b4242f2a5ccbecf6e9277c9fd363 ofl/bonanova/OFL.txt +sha256 d13a278247ce39695f5ea6b721103faa668083022c5280b78c6392263e473929 ofl/bonbon/OFL.txt +sha256 c130db0ae064ae91ddfa3f73c766d6998895cf4138f37d85398fc14ff62d555e ofl/bonheurroyale/OFL.txt +sha256 4653c63a4bab99aa50de5190853fa21ea6c0a25d69d49f5a42cd51f0f67665e0 ofl/boogaloo/OFL.txt +sha256 a44737231b1272dda0ff794086a02be2967de9a83db7eeb0265007c9667cbd12 ofl/borel/OFL.txt +sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyone/OFL.txt +sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyonesc/OFL.txt +sha256 005dd8f296dfe349f4da0da2ab29fb730a1be2b16c760197740b133680c85769 ofl/braahone/OFL.txt +sha256 6bb89ebc3087ca384513615bd4faee0a636fde0934718263257a13b7eabf83ea ofl/brawler/OFL.txt +sha256 fbe0442a6b1ce162c95e241df76cab5ef2daf6a5ac84ae1a7a6749f32c051098 ofl/breeserif/OFL.txt +sha256 4b5a7d8f37f5602621c8a8d7358a6a2e71317e6c231c661e15aef0275d3e07ba ofl/bricolagegrotesque/OFL.txt +sha256 0818bff7217e2a147826e6f18f6b4c5094f7415fcc61298883dde2fded9b4411 ofl/brunoace/OFL.txt +sha256 0818bff7217e2a147826e6f18f6b4c5094f7415fcc61298883dde2fded9b4411 ofl/brunoacesc/OFL.txt +sha256 733ac89b598ee093fe094927a8e66a988423a61b745c62233a2b0d6e2a159e58 ofl/brygada1918/OFL.txt +sha256 26daffa24723bb188643085cfc5423f9d78d22a395df4a7928380e430545a201 ofl/bubblegumsans/OFL.txt +sha256 39602407e30d466bf169f46d690aaae4f5f039258e5642f91a80bb132ce6e14a ofl/bubblerone/OFL.txt +sha256 a9ef1db03f660130790beeb3b5d91b68536a44a98ec2db3097d02a1c5f91c599 ofl/buda/OFL.txt +sha256 3bbcf1617d93d3a949a10da78ae91c58be536fb04567ab4b5b9fd207126f1db5 ofl/buenard/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeecolor/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeehairline/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeinline/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungee/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeoutline/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeshade/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeespice/OFL.txt +sha256 a0369b1d5f654110f2fe101db56a02d02806f1e609ab233368bc573ec45050e5 ofl/butcherman/OFL.txt +sha256 d64c91b0306b53fabed08762068eea8b918d654fb0721c288f13cefa4aaf088c ofl/butterflykids/OFL.txt +sha256 a20db45220b6c4dc9776f24c77dc9ec7a98977d8b3c65b03aabe66b2d08e0791 ofl/cabincondensed/OFL.txt +sha256 965bf33673aec648a3b399185639e502b58e52693d004fc03f6bbdf21b1a0094 ofl/cabin/OFL.txt +sha256 f6fc9fbae062e4efc1b0306e27715d43cd64a48b8ffba81c22034b8efee4fce2 ofl/cabinsketch/OFL.txt +sha256 bcb0bda74430ccc281a616a81d0a287fed5a423815b00b222e0b7f603f85b26f ofl/caesardressing/OFL.txt +sha256 c0a8947de199b422d30c16137e4decd5362e3a1d504422880d69c02bd6046dac ofl/cagliostro/OFL.txt +sha256 a4554e1799d42e1405924b61eb0e0722ae1623b1f1f07f995348f96c496362a9 ofl/cairo/OFL.txt +sha256 a4554e1799d42e1405924b61eb0e0722ae1623b1f1f07f995348f96c496362a9 ofl/cairoplay/OFL.txt +sha256 ccdab61d371d8c8683a128a92cd7d498dbdb1d37689f7cb21f1bf6b16658d213 ofl/caladea/OFL.txt +sha256 c25166066fc22ae04c4c5076d67e2c839fa796aa6da4ba8cbc550a16ee2fff87 ofl/calistoga/OFL.txt +sha256 846e8cc6dc69bf685d2db14cfa758ff3d9d771d54c9e0d3b511f0ecb97ac0e8a ofl/cambay/OFL.txt +sha256 5454dc5cf2f46a2005f42f13ee2a998c7d0afd7f556f32fda208c72b266f7adc ofl/cambo/OFL.txt +sha256 f0be7437bbb8b91ad4a4f7a5f3d0020368e494a803d892df03e8886d51f2db3a ofl/candal/OFL.txt +sha256 3d916878ddf8e33ecddd57b8cadfb4c3cf84760cf9c1d66ed3e0654c20403d6e ofl/cantarell/OFL.txt +sha256 f8fbefb5b1004615e6d1e84b1c75e68520d91196f600cb1b07620dd2748eff64 ofl/cantataone/OFL.txt +sha256 867b506cb023eae20c1accde77b2e0abf7d8a9e2620da8dbebac9f7b1117ca0b ofl/cantoraone/OFL.txt +sha256 755d165efdbad1ad4a7840aa1f2484b0111627993e162bdcfb25fb2c277db955 ofl/caprasimo/OFL.txt +sha256 13e862ac3f67130f58bd4bebb61c588d147b5a555b1ac6959570799c4f648cd0 ofl/capriola/OFL.txt +sha256 3acada615ba300875cf2b4fada3873b8fc93ee099682059782ab25a08e29a6b3 ofl/caramel/OFL.txt +sha256 c83b38a64847eb1a4583a044f001c82c52df49e77f0a40edf4d0d2aa9c3ef9f9 ofl/carattere/OFL.txt +sha256 8e28b778b6e1a7ff9ca72f4dee2d53120aa2856dc1bfd0be44307e365b0e45bb ofl/cardo/OFL.txt +sha256 58402f82a7c332a700294988fe7554fbb0a63a8d27ccc1ee3bbc640311990a00 ofl/carlito/OFL.txt +sha256 806cb93632b8091cd36554642a96b2752bab50015da6a2b456d786c1f9aef5a5 ofl/carme/OFL.txt +sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothic/OFL.txt +sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothicsc/OFL.txt +sha256 c4afe82f49c05689c40dd4e262803b29c6e611e7b4efd3a0418f574b2be79d9a ofl/carterone/OFL.txt +sha256 336c6a25afd535f9019824e419f5b507d31360a2fb1c87c6e1a663dc74c3b248 ofl/castoro/OFL.txt +sha256 336c6a25afd535f9019824e419f5b507d31360a2fb1c87c6e1a663dc74c3b248 ofl/castorotitling/OFL.txt +sha256 c88333734ad7cd30540ec6614d12aa829a0395715de30e336d22ddfa3005db42 ofl/catamaran/OFL.txt +sha256 1e5bf8207a40678bc401e2e5456d0db1f2a183b550a30976b48dcdd6a4e4c46c ofl/caudex/OFL.txt +sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveatbrush/OFL.txt +sha256 1f9d81d094273d82f3898a1ee8b598a717d050ecbf5ff7bede105b704880157b ofl/caveat/OFL.txt sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/cedarvillecursive/OFL.txt +sha256 9a33b452a3107542c35fc5fcee80e4d8798c82aca071c2f6f58a0f8dc5ad61fe ofl/cevicheone/OFL.txt +sha256 13831d02389d917d22fcfa6c79f98f8acbf61d230add0e73a4d4dc5f3bfb9e56 ofl/chakrapetch/OFL.txt +sha256 6b12c8d417bb766fa017d1161c7ca050392817a7eecbf3110fc2a8616564b956 ofl/changa/OFL.txt +sha256 67261c7ceb3e627da5c94d6617dac6da29bf36b910bee304a7680ad62e2c8b46 ofl/changaone/OFL.txt +sha256 e98ce988fba1c138f4e7c0c5120809706ab1b24a3c29638ca83ab2ff082e08db ofl/chango/OFL.txt +sha256 0acda775b4dedaf980821f590206a692779ee495170018ee2b9caf1c50fc136a ofl/charissil/OFL.txt +sha256 41423e9e1d0ea79d0e78bd5fe9e0b27f4c23140706f5dfbfe116839c83aae91c ofl/charm/OFL.txt +sha256 23b896f4937eac954a383340c92dfcac1c6e05ec21cc08ec6de47d30ad8496a3 ofl/charmonman/OFL.txt +sha256 8c495ddd455def58a45310376a747bb61bf86e4b071cc527b3618bccd3ef00fa ofl/chauphilomeneone/OFL.txt +sha256 5d3457831b42632d958fe1a14a09706d8acb006486a5ca5b2b419cd61cb22e32 ofl/chelaone/OFL.txt +sha256 ae6de2f6fc00f76cc7eb0d97c1ae5e0b7ec734f20ad7f58cf4c74738dc822d21 ofl/chelseamarket/OFL.txt +sha256 bb8fac04b8535d39fb9851c9d886248d25bc0c82000066c92dd577c3369f512b ofl/chenla/OFL.txt +sha256 09fc82b47c15731fa66cc812d5110e00879c75209ab76d68bb813eff5ccc182d ofl/cherish/OFL.txt +sha256 0e04cbdaa14fc3e98b6ad1c9156b04d952cbdd0d31845766bae4cb543a71bcba ofl/cherrybombone/OFL.txt sha256 d416bc9437e1d7d8aba0613395ee49c95ce72d680672e910c6205b545cfcbad8 ofl/cherryswash/OFL.txt -sha256 513346ac60af1dde9d4a7bcfad3f39909d5697373a8aa1a6ee4376e6d22d3cdf ofl/niramit/OFL.txt +sha256 f27cbf1055db7b9dd80bce5cd12b462f2d9ed7313d84dd8bfef1ddd2b61bdfc5 ofl/chicle/OFL.txt +sha256 f7516c3dde20383922ee27750d432cc2b95b4ba275204d374b7305ef95ed2d14 ofl/chilanka/OFL.txt +sha256 c9b69fa18c372df2b187b49efc57b1ea643b86a938e5af32f6b5a7af1017c891 ofl/chivomono/OFL.txt +sha256 c9b69fa18c372df2b187b49efc57b1ea643b86a938e5af32f6b5a7af1017c891 ofl/chivo/OFL.txt +sha256 55270f3e221dc526d84c2833e512cc0f399bcd2b4b1746f63d532345b23fae56 ofl/chokokutai/OFL.txt +sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/chonburi/OFL.txt +sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzeldecorative/OFL.txt +sha256 f2b3029aba64c378bf0963b62945eee15e564fe4330b934c8f2eb058282b5e83 ofl/cinzel/OFL.txt +sha256 ec1d7de447a90e4b6d8f2b4f95c7f89a70e315fdb41969bc716059e4f2461fa4 ofl/clickerscript/OFL.txt +sha256 4630b4e729101fd951afba1ed560f54d446b2eaaab7e7df07ed2f4955c909b79 ofl/climatecrisis/OFL.txt sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/coda/OFL.txt -sha256 2a7b0a41ef401e4e0e955280b07c0a2698932d56aad3181089bdbbaad5760491 ofl/habibi/OFL.txt -sha256 2d62278530348951887211d79d1dba04acebd6ed3b1c413f6154702efea3ea62 ofl/iceberg/OFL.txt -sha256 a20db45220b6c4dc9776f24c77dc9ec7a98977d8b3c65b03aabe66b2d08e0791 ofl/cabincondensed/OFL.txt -sha256 fc1e501d419d84a8f1a800adae092045002d7141241f498237611dbb8ea763d7 ofl/stintultracondensed/OFL.txt -sha256 9a51726e5f247cb1f07bb8f49c163bc3e9ddee5f367bb5a1871d09b854ed1b7c ofl/basic/OFL.txt -sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomatasc/OFL.txt -sha256 e30f893523e50ebbe07acd783ae29c7d604e6208cae7646d993e8528ce13e35a ofl/federo/OFL.txt -sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/sharetechmono/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiasanslibre/OFL.txt -sha256 5951473ab31533bfe1452bbcece47f237a5546c7e7d45ff1aec0289619623294 ofl/fugazone/OFL.txt -sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltonian/OFL.txt -sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenpro/OFL.txt -sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/yrsa/OFL.txt -sha256 5bbeae56b9db61a9bf85b64d5ed9a74cfcf9ee3e9b005bc2906859ddecd5eaa1 ofl/esteban/OFL.txt -sha256 7b826efb1b74a50b1c1aef0a1ba4530925b993ceadc3016d1d787c68a61649dd ofl/tenorsans/OFL.txt -sha256 28c6d2887c3dfa42488c5418c6c16ead580d33ff0afe60c05159689201f9ec63 ofl/jollylodger/OFL.txt -sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomata/OFL.txt -sha256 8f2e5a9b52cf355023104413827e17dd7126c5a3656492d45eaa1ceb270aa4f1 ofl/yantramanav/OFL.txt -sha256 fe079cdbbad0f6520eb0a8235bce65b21596dd0c4c5a2694b3325cc87313b618 ofl/shortstack/OFL.txt -sha256 018d17b5e04c0a217a21979fa6b6d77bd5a143a5f06ea2ea102e427abd1ebfa2 ofl/tradewinds/OFL.txt -sha256 31c59bcdd538c113ef5c048f56827439facb12b7e5cfd158b04c83727edc453b ofl/salsa/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumpenscript/OFL.txt -sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserifcaption/OFL.txt -sha256 c867d1a613bebc4932cf28c060fefb3bcfba3be56ed498b873c79f4eb786af1d ofl/librebaskerville/OFL.txt -sha256 694282197de3d750a43689dc64a8116cd19578cd516e7b2490c7b5362c064dbe ofl/kameron/OFL.txt -sha256 cb30d3086a8b3ce0b9e3690bf48d6620402b61160bc658076f95180ccd9e9dae ofl/sourcecodepro/OFL.txt -sha256 a40c3a6d0c968d3a10b17a2614606de6f20178deccc2447305f31fb106a57fb0 ofl/fresca/OFL.txt -sha256 5d3457831b42632d958fe1a14a09706d8acb006486a5ca5b2b419cd61cb22e32 ofl/chelaone/OFL.txt -sha256 6b53fb03a50914cc382f4d025ee595c17c43f24ae870f840bc51969d3e316c7e ofl/limelight/OFL.txt +sha256 35dca6122235851d236bd861124f4a893d409eba021cd8c6a292a19df0f4640d ofl/codystar/OFL.txt +sha256 5c289da4a19f054ace8e31a144a6a254601898cd7faf9eaa301141afda0adbbe ofl/coiny/OFL.txt sha256 574430e571a6928624f4bdf044420f7547a26309b7ebf6962296d33294e0a1e0 ofl/combo/OFL.txt -sha256 fd20b82eb12d16ec31a58fc44f7e6c533b14b425b569d83f616a1f7a9a401e75 ofl/gochihand/OFL.txt -sha256 0e74984817cdd51dbfbd8309022aa75f733e80dff0cb1d26ad2157e90446ba97 ofl/enriqueta/OFL.txt -sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserif/OFL.txt -sha256 4e69611ba5017f1fde74c31d342f5c85604814b1b45387b9ab46205996dec38e ofl/astloch/OFL.txt -sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostarfill/OFL.txt -sha256 14b3fbd06078a869cf2ba96e6dacb852d373703c86ca7ad54a4cdd6e20fbab19 ofl/knewave/OFL.txt +sha256 bc85bae0b512b799bbfb2b916e4d0a34cfd963d09778cd783e248b479e67760a ofl/comfortaa/OFL.txt +sha256 8a4fe79803bade3a40c58d2ab69586f20b841f143e4ea60fd2bf7d98b29a8489 ofl/comforterbrush/OFL.txt +sha256 abc9cc1c5d7dc6005ebffb703055380ad7b39a159f690e16233d80f78262f82b ofl/comforter/OFL.txt +sha256 7c38a22e5878e60fe423360553e63dd7be23d29f1f60336034935dbfc96e8320 ofl/comicneue/OFL.txt +sha256 2685ed3cc823fdf9c1f91e59ede79bc8823a1b5e5d654e10072bc6d310277065 ofl/comme/OFL.txt +sha256 4a7d88c77b4bc39ff84f2e058ba8f015636c50ce33588a86d9da97defe519933 ofl/commissioner/OFL.txt +sha256 162a3b5c72cba845280a6f887c11d02984540b924510138c8b1eb473bcdafb6a ofl/concertone/OFL.txt +sha256 2492bb8645caaf622bdc3e880cdc9b069921e7341346d7b193666c866a1935d0 ofl/condiment/OFL.txt +sha256 08a12877eda24767239f26b527bfce0c515efaf623c66da6baad92a6d5315e9a ofl/content/OFL.txt +sha256 90bd333a5cf0ed09264fc3e559d44979373f6c3d983b0f65cc46e952b4eb61f0 ofl/contrailone/OFL.txt +sha256 354b4be0340cd58e381fdf58793a108897bf944a7f8faf9e877c476ed6c730d1 ofl/convergence/OFL.txt +sha256 c832a4230a713d080aa2f2544d9a298ed911f689b2c48f7f276a0196b16d2b8a ofl/cookie/OFL.txt +sha256 7a1d085067cd589026b256dd85af1eaa1087fa0f3d468192724c5138cc14d894 ofl/copse/OFL.txt +sha256 aad1e82802172d4c1d22dd015a5b8b4275e5665a49c1df54ed64716fca7ae194 ofl/corben/OFL.txt +sha256 93c4a947d0c82b6838675aeb6090b7e9e7534b9655b2aeec1874149290a58bbf ofl/corinthia/OFL.txt +sha256 60700d351cac4650c51f3f9db318d2a420f8b45052dba2715eb5fec41f0f6956 ofl/cormorantgaramond/OFL.txt +sha256 60700d351cac4650c51f3f9db318d2a420f8b45052dba2715eb5fec41f0f6956 ofl/cormorantinfant/OFL.txt +sha256 60700d351cac4650c51f3f9db318d2a420f8b45052dba2715eb5fec41f0f6956 ofl/cormorant/OFL.txt +sha256 60700d351cac4650c51f3f9db318d2a420f8b45052dba2715eb5fec41f0f6956 ofl/cormorantsc/OFL.txt +sha256 60700d351cac4650c51f3f9db318d2a420f8b45052dba2715eb5fec41f0f6956 ofl/cormorantunicase/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantupright/OFL.txt +sha256 0836fd874230b17f840efcf7d3bb529f5a7b5befbfeef94478519cfe2d8551c2 ofl/courgette/OFL.txt +sha256 9a755af092b494944c99f471be6fddd19b006a448fefdc4717e4ee0aa09a97b0 ofl/courierprime/OFL.txt +sha256 c972795e48b096b6d4e3a947b0bb21c1baf1922a6e07ff9ada587c058f228740 ofl/coustard/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/coveredbyyourgrace/OFL.txt +sha256 c09e3b81d9cfeec46bc29a3374000e8ad013d694bdf24a288088491dd4cd5c69 ofl/creepster/OFL.txt +sha256 4938e917ac54665be1dd862f54634d991b39c5d1eef69345d66a5089e401bfb4 ofl/creteround/OFL.txt +sha256 1820869bd5baa1c2d88fa87c89eea532cf9442d841008acab720654b7f82823d ofl/crimsonpro/OFL.txt +sha256 50fd67cddc097377a5c871e8452b778bc5aedfa3480a705cb27c5e3a078218df ofl/crimsontext/OFL.txt +sha256 eba176d3ae86af6b41e9b744e4d18fb56e2a6ad671381bddb61fabb86b1d39c1 ofl/croissantone/OFL.txt +sha256 af74fe3bf28777e8b7df9f7ed718b15f92e14d60448f36d7dd21ada6caeca33a ofl/cuprum/OFL.txt +sha256 1a2debd5ad8e656b26bb3b29213caa8f7e557a2f31454b11ebb6c3e3b59aa5d4 ofl/cutefont/OFL.txt +sha256 bc4c7eb365ea342b1a027fb8417fb0152f5d482a2e31c012fbfa29b668827b04 ofl/cutivemono/OFL.txt +sha256 1404cc9279d4ad713a372a5e1e1d20d7b9b000d2397c8529aeb3df5402446600 ofl/cutive/OFL.txt +sha256 58e2ecc7d7147a7c8268553c1bed2354331c2003829396fa6f9506852144e46e ofl/daibannasil/OFL.txt +sha256 a21fa252efb7a1ff84de6a36df4386959668aa046f28161b4047829f7d9cd1b5 ofl/damion/OFL.txt +sha256 6f090277c00af96651ce6dbcc38ff1591047a3bffef486e80b6a32e8276a8201 ofl/dancingscript/OFL.txt +sha256 4a89bc6c8bb9f144683714d67dd3098400f90e194176c31f429fe23a08713ec7 ofl/dangrek/OFL.txt +sha256 60eab011e210601f85e18474c5a191838c95a9acce0cc6da1c646ac9e3683cd9 ofl/darkergrotesque/OFL.txt +sha256 bd898c86fb555f060ee9e5d318d631bbdcd196b98ae8019e0077421f46da132f ofl/darumadropone/OFL.txt +sha256 b67325cbf8ec07e72162e8dc06abcf0599411483a0fc35c55c2908900a4bc585 ofl/davidlibre/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/dawningofanewday/OFL.txt +sha256 cacad5bf45bf5c81f4b6cbd114261bc8a08f6110b66a4c6fad8bbc16618a3096 ofl/daysone/OFL.txt +sha256 64ecb0c6bf5cd80c3da76035c00671272966afbd32ffbdbcad95a8b56501fb08 ofl/decovaralpha/OFL.txt +sha256 f139d6f43d2a63a8fb3ded48b8ec747d9d59a7fbb13d077d9b96ac88580bc1ad ofl/dekko/OFL.txt +sha256 3fa395232efa6d42e5af84de2503875c895b24a9299bb84aa54633c74bf8a0d2 ofl/delicioushandrawn/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/delius/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusswashcaps/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusunicase/OFL.txt +sha256 19e186a088a50835b38b59409a76b8df2d0252ce114a99e79e306231bbe253b7 ofl/dellarespira/OFL.txt +sha256 9224862f76f6ffc1a12abf2ae4310e584cfdd2a475c503f74d1e0c0e8bee5ed0 ofl/denkone/OFL.txt +sha256 bac36a7fcafc5702d9d928bb81c7de9f8739eaa820e546c3d2cc52730b652af4 ofl/devonshire/OFL.txt +sha256 9e53298e3629e00ae4c31531cca09051ddaa654a5de4f7b55e596132fff86e1f ofl/dhurjati/OFL.txt +sha256 00a6fe8dfdc48d6206bcc4f10a765515a73433dfba7255eff966963beb26facb ofl/dhyana/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/didactgothic/OFL.txt +sha256 cdf5fc4014abe91588666a9592ec86200e5a4d743b4b6e05d28d47e850bbe5fa ofl/digitalnumbers/OFL.txt +sha256 9279f4143833810493f74b4520c8b8fce2526d9df2da9564ffe897e065e1d461 ofl/diphylleia/OFL.txt +sha256 f4e8602be4b69bc44e3ce17d026622722b992a07b1aab0db23da48b0155b289e ofl/diplomata/OFL.txt +sha256 f4e8602be4b69bc44e3ce17d026622722b992a07b1aab0db23da48b0155b289e ofl/diplomatasc/OFL.txt +sha256 2bada5ea45c3c63b7f1ea1f88ce9672c9e4f0c42b2c3b7378949084fe55a3066 ofl/dmmono/OFL.txt +sha256 9af36190332437f5ecd09974de43c1f7c77a310a996cdd8ceb25628b458840e1 ofl/dmsans/OFL.txt +sha256 a3e5cdd67d4571dd0a24fcc968de0efde7ae97ef752daf0906e4767619dd7231 ofl/dmserifdisplay/OFL.txt +sha256 a3e5cdd67d4571dd0a24fcc968de0efde7ae97ef752daf0906e4767619dd7231 ofl/dmseriftext/OFL.txt +sha256 de5ff32211a4340b01477af39ee339d639438955e409f79b666d4b9207f3c92c ofl/dohyeon/OFL.txt +sha256 dcc832bd71ea62cbf97f06327a1b5442905b49ea446801421d71f7d1362db215 ofl/dokdo/OFL.txt +sha256 4931b601cf50f9e6ee749ae76778a067fb2e0df4296f08d095ef38afc526a5e4 ofl/domine/OFL.txt +sha256 8aa063e3a1299c5e1821f386f5ca8bc157ac561bd12c739ffa81c6f0821450c0 ofl/donegalone/OFL.txt +sha256 f9e59049e824264bffd626d0901cfcaac9d5ba756988b904d3e3e0e233493607 ofl/dongle/OFL.txt +sha256 4342add6f0f2261f8579f31c10a55938930559703eed18be4a33b74eb749d298 ofl/doppioone/OFL.txt +sha256 92f750829545386017c3418d890769778b76fd01dfb41c62fcbb0d42ba0303eb ofl/dorsa/OFL.txt +sha256 6dfa3951f0c829518b284608fcc1acb196cba1536b1ae1713a49deccde1ccc53 ofl/dosis/OFL.txt +sha256 b6630c61ea078cacd7fabe37d14ffe557a0b45b06683374a9aa9e24262993e33 ofl/dotgothic16/OFL.txt +sha256 3621f156cc7a26e0a9cb413332e0bb35a0e76b36dbfe0b1c885b565a7bf3051e ofl/drsugiyama/OFL.txt +sha256 9df0700fcd0ef48abd74459a8650d35f59397fbaa00c5b00527e57cc155689c0 ofl/durusans/OFL.txt +sha256 ee2c069b30f3e9a5aaf52357117ee3443ee27f17c29a2ec68861db283379905c ofl/dynalight/OFL.txt +sha256 ad0bc2ae83f6dbf6f3edde26752324260c2fbaf9cc021748d363a879dd5b749c ofl/dynapuff/OFL.txt +sha256 3184f6a99f589c78740fbff6ddaaabb43b8cc2f3852da36e60aeb024ea8d6f00 ofl/eaglelake/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/eastseadokdo/OFL.txt +sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eater/OFL.txt +sha256 6f9e3a1c51f617e7b110862426204ec7a56d8c6d2f731373b5de6b8d069099b6 ofl/ebgaramond/OFL.txt +sha256 1b3b78123c94dcbc9fd4ec174317336c8c93423da62dc946b8852553cb13ddee ofl/economica/OFL.txt +sha256 003e3a0675b0b5d38cb6a188039d33a8d747a84effec32e7f8aa6e25cf6d3e2d ofl/eczar/OFL.txt +sha256 9c50bb9d2dbfd864553688da113bf817a294f3721b7a35ac6569c63bb939a998 ofl/edunswactfoundation/OFL.txt +sha256 9c50bb9d2dbfd864553688da113bf817a294f3721b7a35ac6569c63bb939a998 ofl/eduqldbeginner/OFL.txt +sha256 9c50bb9d2dbfd864553688da113bf817a294f3721b7a35ac6569c63bb939a998 ofl/edusabeginner/OFL.txt +sha256 9c50bb9d2dbfd864553688da113bf817a294f3721b7a35ac6569c63bb939a998 ofl/edutasbeginner/OFL.txt +sha256 9c50bb9d2dbfd864553688da113bf817a294f3721b7a35ac6569c63bb939a998 ofl/eduvicwantbeginner/OFL.txt +sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/ekmukta/OFL.txt +sha256 c4955dfe15a5db10326aa58ef767460c42cd12a3acdb3e698eee2704eb373d94 ofl/electrolize/OFL.txt +sha256 b69113722df50071b68ea377ad261919f08fd0dd6672f68b8868445586a30770 ofl/elmessiri/OFL.txt +sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsie/OFL.txt +sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsieswashcaps/OFL.txt +sha256 8f94e5901c371537043e0c762c827ce33963e7bd186fbea0abafc035ef7120a7 ofl/emblemaone/OFL.txt +sha256 0623888cc2391c6c9853c04eafa7f687fef1a8328bbb848feab05d9e2a98764d ofl/emilyscandy/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanscondensed/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesansexpanded/OFL.txt +sha256 b47f4d635e8c592a37e98f751627cad0a81694c56aecc603b33819a908ea9625 ofl/encodesans/OFL.txt +sha256 b47f4d635e8c592a37e98f751627cad0a81694c56aecc603b33819a908ea9625 ofl/encodesanssc/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemicondensed/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemiexpanded/OFL.txt +sha256 ef0bdccd20de76d517fb3939161d05ecd5808382fb8fa82cde5fcdb3adcb8029 ofl/engagement/OFL.txt sha256 a8103c045a88bf9b28dcd7eb60a6662008f49afc0f3721bc46aaf761fc0409e7 ofl/englebert/OFL.txt -sha256 bd22e766af8f8e58eb520cb4fa73538826d04f7371b45e82295d22d1e32a4e58 ofl/gidugu/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/justmeagaindownhere/OFL.txt -sha256 5fba78215eb4e42aed6cb0b5c5df52e0f71246281a866cd4493dfcfcbcab9518 ofl/playball/OFL.txt -sha256 e75230ee246a04912366cd8d759d081200d80fb0756766c96dd52f73e8b40bed ofl/romanesco/OFL.txt +sha256 0e74984817cdd51dbfbd8309022aa75f733e80dff0cb1d26ad2157e90446ba97 ofl/enriqueta/OFL.txt +sha256 6160853a95e0826f3d9dd21d26b7518b86e50a3469f19a62c3f4ce1ab1ed5573 ofl/ephesis/OFL.txt +sha256 95ebd6a2e4035b8398c83928fb85297b48441f27f405398c29b59aae899fc747 ofl/epilogue/OFL.txt +sha256 d484e0dce424a9e360adabb568b6773db5f1566df71ce3e9dcd66a6cc2c38d33 ofl/ericaone/OFL.txt +sha256 5bbeae56b9db61a9bf85b64d5ed9a74cfcf9ee3e9b005bc2906859ddecd5eaa1 ofl/esteban/OFL.txt +sha256 b3a14dd814e7e5158a1869fd89094e213f1ab9abc62e1e1730b751cc93fef3a3 ofl/estonia/OFL.txt +sha256 58bbdbe5c48dd1d7cfd658425a455c29811181873d3a46a4932c29e5b0ec16e6 ofl/euphoriascript/OFL.txt +sha256 9bc1eb1c679510b32d2e3f5f4f3b47726b1657aa121494aa68ba0b124a3c3a53 ofl/ewert/OFL.txt +sha256 cecc43de8bf5449d88fb03a6d33b0b569df304545d3b57760863e833a6434d45 ofl/exo2/OFL.txt +sha256 1159ea72ed1f7e7541cea35a0dece48d2abb0317d7c70f75a482f94932382a77 ofl/exo/OFL.txt +sha256 6cc3a1a3e60a0db4f824c16d42e7db461a939abb0759a740a4135074001eaba5 ofl/expletussans/OFL.txt +sha256 b8ed61f16fe601a8d20fa9c8ea979f4a7424c324596ce3cacdebb19353e1d808 ofl/explora/OFL.txt +sha256 f2c0dfa02d6f5c444b4babd7bc0b43be77ea85706e8524342516bc41e43c2f01 ofl/fahkwang/OFL.txt +sha256 9708dd560d1f8aa1f006461aa447a31fda7b9aff662d152837654a388e0eb2ee ofl/familjengrotesk/OFL.txt +sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/fanwoodtext/OFL.txt +sha256 2f9d46ed4ff595fe040cfcd11d41f80cd6b31b72c8e1b4ac793db50382cd3154 ofl/farro/OFL.txt +sha256 afc1cda4eedcfe27c8cf30fe3e9879587cb43cc2882d4cb91dd3e3fc9eecd0bf ofl/farsan/OFL.txt +sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinateinline/OFL.txt +sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinate/OFL.txt +sha256 4da248dc81a7ea4cf5b23f9cf7a0f8cad900875b3f52a928befb5c51e82e9438 ofl/fasterone/OFL.txt +sha256 896b66a47308af2d268b0d93c59bb4c9e82870f63565b819e84f789c0825d992 ofl/fasthand/OFL.txt +sha256 69ac34f1c6fd163d5d01cea262da6cfa34fee1310283a116a0db8e14116b40d1 ofl/faunaone/OFL.txt +sha256 2d8f6a7be96a15fd2deaa8e6b5320cec6c253216b5a8f7e1becccfc51147b877 ofl/faustina/OFL.txt +sha256 17d7a7f5d9f0139535ecec516988c4c73a2ec0f225987288f3fd6ee2622d4450 ofl/federant/OFL.txt +sha256 e30f893523e50ebbe07acd783ae29c7d604e6208cae7646d993e8528ce13e35a ofl/federo/OFL.txt +sha256 75c7ccf4f537a7a3ebbedd299c1d2542e13d3b27aaf76a0a2d9fa91a2a8fcd3a ofl/felipa/OFL.txt +sha256 8586a7e75681c7297af4cc0641eb2b29e882c5187fe189a1160eceb4e95d4163 ofl/fenix/OFL.txt +sha256 9185cdf29ddad3ff97f5f07094345937c33f01ea232827a9ef9af9d88ae4b6a8 ofl/festive/OFL.txt +sha256 140d37233e7f3ce7313798befa9600893bcceaf41a55fa0fa5ad52f7f657a268 ofl/figtree/OFL.txt +sha256 d336c098ea798bf14de111cd90dff7d6bc340852405246511345d0f8564fe76e ofl/fingerpaint/OFL.txt +sha256 0a55f40011bdfbdd4a07ef363fdc054d92ca3a5f0fc66381aac82344bd9cec2c ofl/finlandica/OFL.txt +sha256 926041dac670e6922505e35ac1661a4e8d20f1ffeabbbcb5edb5544370702369 ofl/firacode/OFL.txt +sha256 d1829ff3455bbf3b9d13dfb0a57758a863107c9108aab48558f26f37f1094180 ofl/firamono/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasanscondensed/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasansextracondensed/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasans/OFL.txt +sha256 047c204476dacfeddbf93d33ab3d43ba82fb7e66e398fdacfce8e815e9a5c270 ofl/fjallaone/OFL.txt +sha256 df9fcd8f62ae79aba7fa5b0563a08dfede1fa0909d668287d70c395d88f5fe02 ofl/fjordone/OFL.txt +sha256 e3ea566dbf689a9110b2094f9f2e5d16d7ec31720147651efc1005ca20420dd4 ofl/flamenco/OFL.txt +sha256 4febcc8d6e539db3e0c652da87bc8704f6d48e71e07f8ddb0974094a3de8da81 ofl/flavors/OFL.txt +sha256 bb3ee29bfc75dc1ac4407831b665c92e9e58fb5e2e07022f6f731d8e063e37f8 ofl/fleurdeleah/OFL.txt +sha256 54665278a85e00842c5a261c2bc51c4735082f0164edcd95da27ed11e253e604 ofl/flowblock/OFL.txt +sha256 54665278a85e00842c5a261c2bc51c4735082f0164edcd95da27ed11e253e604 ofl/flowcircular/OFL.txt +sha256 54665278a85e00842c5a261c2bc51c4735082f0164edcd95da27ed11e253e604 ofl/flowrounded/OFL.txt +sha256 b0daefd86530f48f6f57e90770276e42e63b3daadc9cdcf0cfd4cb16a7499946 ofl/foldit/OFL.txt +sha256 382232d1add5623ba5b06394afa071f4eeecccb6d2b2bd02cfecff4a8a45065a ofl/fondamento/OFL.txt +sha256 1bfe7d2aca99042eabf37079152fef8abdda2c36dad454ae89b858a3cb1078c5 ofl/forum/OFL.txt +sha256 ef14426248ca0404eae1ae65e61802b1627b5ec33aab117fb36edf401a81636e ofl/fragmentmono/OFL.txt +sha256 09685e225ba9b697b2ccd2d4098cac5ecbed0679960605258a271af60749887b ofl/francoisone/OFL.txt +sha256 59b8e1b6cb49d339b729a924fb3c2d892e5729a712f7540e2337d0db3bdfcca4 ofl/frankruhllibre/OFL.txt +sha256 bdf4c22802eaf804f998195871c6b8938aac2ac14b2d78a8bd66a6f1eced833b ofl/fraunces/OFL.txt +sha256 60fea3a0da19167a3efb9c3792a3a15dc9235405d01bbec1233fdf3e79c74296 ofl/freckleface/OFL.txt +sha256 f8e2b58dd7a8c8e21e5d744b45876bce7e010a647c071c1ed42ff0e618d4ea59 ofl/frederickathegreat/OFL.txt +sha256 5c9e7eee5c6b25f4b05b8d53b2e470ea4962f9ced742d044a98f7d95d1375bab ofl/fredoka/OFL.txt +sha256 eb42d30e111024646a167f47f3e85c5c2df21ceb36a3a279a6f19e2584b00ec8 ofl/freehand/OFL.txt +sha256 a40c3a6d0c968d3a10b17a2614606de6f20178deccc2447305f31fb106a57fb0 ofl/fresca/OFL.txt +sha256 c2368518f12463a93cfed44e1460f36085dc60df06f415ee9b0319809987ccce ofl/frijole/OFL.txt +sha256 c0cd6d3807663a19c2d4a96f17b90a71a06e78bb329d45ad77c6798c89f761d9 ofl/fruktur/OFL.txt +sha256 5951473ab31533bfe1452bbcece47f237a5546c7e7d45ff1aec0289619623294 ofl/fugazone/OFL.txt +sha256 22e37052104e101981fa0ea905457948f4f01bd31c7fde0502ff25c586801fa1 ofl/fuggles/OFL.txt +sha256 373164fa83991434f3fcfb9ef3cd0d8d4ffc44407841c08d9d6a43c07ffab978 ofl/fuzzybubbles/OFL.txt +sha256 21506cc7106bbfd4aa1c40371f33f9f4296182a8e4bb46658e99af24feb4bfca ofl/gabarito/OFL.txt +sha256 c5478a76bd760eed7b741678b71d9dfe1062e7399739a3b6da8ebe00d19715d1 ofl/gabriela/OFL.txt +sha256 53a9ce47085d9fef613c7ecb3730dc80d25962510bbea231b89564f58240f251 ofl/gaegu/OFL.txt +sha256 eb6c70cb6b575ad22df022d454df7a20582915e6e8da19b579c6cbef37a26bb5 ofl/gafata/OFL.txt +sha256 4e9a7cb5e08ca48e87b31184036b705690828000e1b5e8777f9ec01dce84aba6 ofl/gajrajone/OFL.txt +sha256 6a809aeba8af2115ca4b4c3597b1fbeb836a45f0489070f330f9c2dff870da8d ofl/galada/OFL.txt +sha256 d102f22055cfa31a9659228483de3c726010f0b3b416b78e3cbefcb54816e812 ofl/galdeano/OFL.txt +sha256 117fa195cff980e3b10fd8e8e21658c6ec954b0886647970a03c9694d3553b69 ofl/galindo/OFL.txt sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/gamjaflower/OFL.txt -sha256 244ca4ef7b106d8c660e9a00cecf5d581b6a222f447d7d59a8f61711b2ad3400 ofl/uncialantiqua/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/didactgothic/OFL.txt +sha256 4d95bf0e5a54632046323a75fb31f8e2af4071119482c02978746ddcd3866248 ofl/gantari/OFL.txt +sha256 a13e353470a9abc44e015067bc353fd3ebc3ea010dea68a00d56f961ebe8f7a9 ofl/gasoekone/OFL.txt +sha256 b2cc52a7162f0c8f71924211d040de37b19894f563a0190a75c017e2dc28d08a ofl/gayathri/OFL.txt +sha256 af98a2aec12e0ff6aeee941693221ddbfdb86ae4486949e1d54cbedf2422f994 ofl/gelasio/OFL.txt +sha256 9f1dccdd6211e2bbb679318dba3717d9eb1e3edc6fcab54beed05679d83a72b5 ofl/gemunulibre/OFL.txt +sha256 c29a3fd5e7962b626fcbcf6713d47ae4656fded06335b607d14f03a4a25cb82b ofl/genos/OFL.txt +sha256 c309a440be606e283ccacc746662d714b9c5b5a7a0a10dd2514b90206b55ddfe ofl/gentiumbookplus/OFL.txt +sha256 c309a440be606e283ccacc746662d714b9c5b5a7a0a10dd2514b90206b55ddfe ofl/gentiumplus/OFL.txt +sha256 778186245840aea0e60bec6a46e7fb1442e0cd78e41afeadffcd3e8824b379e0 ofl/geologica/OFL.txt +sha256 cd059851dc2abcd2865ae318e8b949736f958794210acb90316530fd100fc904 ofl/geo/OFL.txt +sha256 e913854957b9c1aca0c81b29fca565827185ddee0f5a039319e0e45e1b7b3079 ofl/georama/OFL.txt +sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostarfill/OFL.txt +sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostar/OFL.txt +sha256 b7574cd4c76770e5e3915d16bd93f09663bd77cb041a4ec09d824c52b540529a ofl/germaniaone/OFL.txt +sha256 9e19c0d2e7e7adcbe9dfd0749e34dda41e7e356e0f2cc082d61d2fc9b6e0cef7 ofl/gfsdidot/OFL.txt +sha256 bfc205682f5454b42a732ec857b665293ab8bc6f0ee901a0967219ba7ffdb190 ofl/gfsneohellenic/OFL.txt +sha256 c72eaa495a68969eb124218d20d3a6092e8f23ac1d25b9315d1014c5438f43e1 ofl/gideonroman/OFL.txt +sha256 bd22e766af8f8e58eb520cb4fa73538826d04f7371b45e82295d22d1e32a4e58 ofl/gidugu/OFL.txt +sha256 e8d94225bdcfecfb5a6e14bc0e2bb26fe48670f28ac46a7d676d9a90d8bfbe24 ofl/gildadisplay/OFL.txt +sha256 5a8469d3fe72117eb9b630747cfd9f50a31d81b7d18c112cfc9fb368509fe739 ofl/girassol/OFL.txt sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/giveyouglory/OFL.txt +sha256 2950994bcfb8e903f0539d28a8ec4af077e0aa1fa7946c33c912d2d6969c2971 ofl/glassantiqua/OFL.txt sha256 638774cdf8233b5ddaf9ebee1821e9de1d5d59c335d8ee3ba0b47fb17833b502 ofl/glegoo/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsan/OFL.txt -sha256 a10a07aaa150c147fa3cb22e845013f38e6c2b45fe5ba32a74ed1be9d4c417ae ofl/odormeanchey/OFL.txt -sha256 a74380bba78a364ec70b3a5fb6a1161b83cb05cc3e75a0910afbd1b5aff4f9c8 ofl/jaldi/OFL.txt -sha256 9b8405bf5f503f92401fc990f372b34d469670ab60041d5298d1015d3d0b45f8 ofl/thabit/OFL.txt -sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asap/OFL.txt -sha256 ca9fe3a0e10bbb082f83ecdc07f5f04845c4bd689c46456da3e6bae23e11aae2 ofl/inder/OFL.txt -sha256 5b158abb3406e69b7408b562b7199f6ff55a41ea56e260b87176d693b0095e47 ofl/piedra/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendradisplay/OFL.txt -sha256 87b7d831a81fe8b37e7e6c672937493f710ff81883eee3adec7b5423297efd16 ofl/sharetech/OFL.txt -sha256 4ec46c3e4469afa19f0156bac6917472974f9c85c189f9220cf8735d3e810401 ofl/kristi/OFL.txt -sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilbo/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindcolombo/OFL.txt -sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothicsc/OFL.txt -sha256 930fed5b06a415736dc3b4e5f4f01585523b672717564bf677f93966bcd57636 ofl/lustria/OFL.txt -sha256 9a536e5a3b55c2605b0a553eed383cd3efa42ba48dc45cc6f0635b3c53ee791e ofl/warnes/OFL.txt -sha256 879ec56fcc9a961937fd24d542b3b7b3f2b8cb3236b7351e62d16719e25de14c ofl/griffy/OFL.txt -sha256 29cca754098468057880970c604e55c4e2bcb8479742e4130c94f2ddc0363f9c ofl/sixcaps/OFL.txt -sha256 67261c7ceb3e627da5c94d6617dac6da29bf36b910bee304a7680ad62e2c8b46 ofl/changaone/OFL.txt -sha256 327bac41d89cf9f32e0efe353228018e1661cff458a5d4905714958514df7bd5 ofl/lalezar/OFL.txt -sha256 525411e604e7a1d85a4cd42641869f94388f04a6ed77829d6c4edd7fd740ceab ofl/ramaraja/OFL.txt -sha256 3d08baba63f1f2427fd96dee8da30b1ef6c1421b3be0e1f07cc2a78abb27c91d ofl/seaweedscript/OFL.txt +sha256 321e28d45a430e017d9d1d6a47ef1fd261aad354723b014cf1933a765036c311 ofl/gloock/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/gloriahallelujah/OFL.txt +sha256 9a1f7cf2f267af05d4816ea6340087454ea1d237bd9f29a76ef3932ec4055da7 ofl/glory/OFL.txt +sha256 9bf9f51b4e1279bc28c6cf78b4d3d0a07b254435a79e6597ad244defa6df1882 ofl/gluten/OFL.txt +sha256 042a570b306ab893c6168be7e6e79bbceae46097141357ad0af7ef8bb179ed7b ofl/goblinone/OFL.txt +sha256 fd20b82eb12d16ec31a58fc44f7e6c533b14b425b569d83f616a1f7a9a401e75 ofl/gochihand/OFL.txt +sha256 bb7828b16438c97ca84b53e2fbd2c3bd9dcf2a86ccda6806ec9ae955a1814d29 ofl/goldman/OFL.txt +sha256 ff532f9e8789f09a9fdffc3c0954eedfb0a48be77b2e2eb90f5f82e4f347f50c ofl/golostext/OFL.txt +sha256 860cbfdc9dbc3f0e8d35af80c31e8f20945bff393d4f483dfc157469e01d321c ofl/gorditas/OFL.txt +sha256 ed95c33f80ccca002e3a360b683c43368f9c5eb024e5b992abb51af3c10b59bc ofl/gothica1/OFL.txt +sha256 159eb46ed0b08f8b9678d6f22f54cc614452d4ab0fb670b568f7a5f315afe511 ofl/gotu/OFL.txt +sha256 58bdc69f4c6177125c6e7cdbc78f710f5f9952f11bba7bd5b17bd7ef169d731f ofl/goudybookletter1911/OFL.txt +sha256 49a57cc769fa9affd6eefb9070a61e3d3f6b757c97cafb15848bc6d1c81acc78 ofl/gowunbatang/OFL.txt +sha256 a7c73f9521cd646bbdfb6684c99a62311bbd7bce11898dc11ef0b3c69eda1aca ofl/gowundodum/OFL.txt +sha256 742a6a4386db47a2987c7c3b4aeedfb5adedfb3356c118de450a664735686535 ofl/graduate/OFL.txt sha256 4c0a1150a363b42bd8681ff4a00315ac49510a944c4c9978237ff8b90a8920a5 ofl/grandhotel/OFL.txt -sha256 bc4c7eb365ea342b1a027fb8417fb0152f5d482a2e31c012fbfa29b668827b04 ofl/cutivemono/OFL.txt -sha256 1818771d183d203703c4b134f028527b535810e2a0666c8fe2785354ddbef686 ofl/battambang/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendra/OFL.txt -sha256 9e0d3db586ba0abf5ca398683809dacdf4c81b2960f592bd085fbf206a67ddb0 ofl/sansitaone/OFL.txt -sha256 fb1dbf3725bbdd389b2c569e0eed5091d8d10eed2833ec7efacfc3542e408615 ofl/scheherazade/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorant/OFL.txt -sha256 156ea6985861158c7dea63ecaac4c78ab0ed737d168ddffc3e34c687985a033b ofl/sansation/OFL.txt -sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/blackandwhitepicture/OFL.txt -sha256 5fe7f3c9410c29534ddd9dfaf64d3994ed4236096d0d543ae69eacc3b25632b1 ofl/bitter/OFL.txt -sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreya/OFL.txt -sha256 e88691a5e0a8a3f788f31db959701ec90a1d5e7505f1cc53c5663180a7d23c81 ofl/lohitbengali/OFL.txt -sha256 ac55580be2df22a06d29a47501e2ae11e1d399620f5a779e17a66f016ba6d5ff ofl/portersansblock/OFL.txt -sha256 27d9af34210253e7ca1251fbace86c6f65b40031d6ce1a75493a1b2093631298 ofl/vt323/OFL.txt -sha256 9452ef55386e77bd284ca466587d72802337621d7f10aa700e449753883b3397 ofl/trocchi/OFL.txt -sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/stylish/OFL.txt +sha256 4d0bb797c98a0840faec0952153a4030442f263fcf08b906e38837ea8f401808 ofl/grandifloraone/OFL.txt +sha256 c98642ce049ee94f1868c47db44dbdc69e1800e2cf3edb539f030ac4abc22ceb ofl/grandstander/OFL.txt +sha256 5818012656b5ba904c83dad6a0011bd25071d840231f83d69ba34eebd5e510e7 ofl/grapenuts/OFL.txt +sha256 9860b97028024085855e503e32c1971bfd603374641cd018c136433ebcf5a338 ofl/gravitasone/OFL.txt +sha256 54d54b13619520d57d399e3d4057563a5a4c54b69d8f7d1598aedb1aaeaab240 ofl/greatvibes/OFL.txt +sha256 350eba96ff4c979070566cd24d068784c482a65d1485dc14e3ccb56f06594972 ofl/grechenfuemen/OFL.txt +sha256 bca29af2c3c9e142d11f523f414902ab8fb9ab8ffa3c34c63b6b72aa4e7d6acc ofl/grenzegotisch/OFL.txt +sha256 5070d4334d60972881020a5453b9832a090843e904cf013f40b6ebdfe9b871ca ofl/grenze/OFL.txt +sha256 1bd29b2ddae760a1f7014c59fedefb0b110f91110d25080615bcdadad83dbb87 ofl/greyqo/OFL.txt +sha256 879ec56fcc9a961937fd24d542b3b7b3f2b8cb3236b7351e62d16719e25de14c ofl/griffy/OFL.txt +sha256 513de41f10e2a9e374fc23ac57dd0bcea4070ad7aaeaeec2e16656e025a2e19a ofl/gruppo/OFL.txt +sha256 315a576cbc7ab61c9e347b5725893bc8498fdcb8fc10831793c6864bc2cefba8 ofl/gudea/OFL.txt +sha256 391ac3126dacc95b92a8f3408467879edb3245344bc411530a30d5aada52df92 ofl/gugi/OFL.txt +sha256 42d665be2bd66ea6445e0a37cb6f80eb4ac10d56cd0503efa0c6d6d6ebe86de2 ofl/gulzar/OFL.txt +sha256 d11742efedc994c84a152639a76098e3de6c097d77c06e3c4155b8ac00ae9328 ofl/gupter/OFL.txt +sha256 2bd35914efa381c80f9fb62d6ea7d736d3c0739196a3783c3122593c3408392c ofl/gurajada/OFL.txt +sha256 469761758d333ff4ab9f69759dbb8576d23077097862654c2e4d1fc6f19d090d ofl/gwendolyn/OFL.txt +sha256 2a7b0a41ef401e4e0e955280b07c0a2698932d56aad3181089bdbbaad5760491 ofl/habibi/OFL.txt +sha256 8d3c434650e84f42ddb33e9b5929089ea51c39b231b798dacb33087d5f05d9f1 ofl/hachimarupop/OFL.txt +sha256 ddadb10d28a303e3ef3b1f7ec55d3027903b9ec566d2f87d3ee03f3c87c91711 ofl/hahmlet/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/halant/OFL.txt +sha256 b43e2530c7af69fe1800f180d210b6d2745915ed4e0e404495038c861bb6dbf7 ofl/hammersmithone/OFL.txt +sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanaleifill/OFL.txt +sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanalei/OFL.txt +sha256 934a45d3b43276e1f857301e9cb07e00b829cca3d0c13e8e6f8c6790dd6c8a2c ofl/handjet/OFL.txt +sha256 5f1f5510eff7922864bf326ffa1d4a62f01add5193e9367b542378e5a808b500 ofl/handlee/OFL.txt +sha256 e02ccb89a86839b22feff7872ff5cc355cc0f58318d29eee20e2cf83a612f16d ofl/hankengrotesk/OFL.txt +sha256 d724dea493d89a7a9681186e2fb462b7cd551674960ee4142ae6b325261b5115 ofl/hanna/OFL.txt +sha256 de2246895f0ac21fe05b095d586d36cbc9f987ebcaed1e050c61e69667caf1c6 ofl/hannari/OFL.txt +sha256 5d7825ce858a13f5ce7a5149479be33700de83925ae6f610c7e31fced67f05ce ofl/hanuman/OFL.txt +sha256 bff4e5087ece354afccd073621197bbb7dd9349943b5ee6aa12b1adf0b133081 ofl/happymonkey/OFL.txt +sha256 dac9251efc01f872318d95e90988bb9995b1c31a9f6bc70c9831b104703191d9 ofl/harmattan/OFL.txt +sha256 7527e73a61f742a0dd050ab2fc7333de71ac7886023c100bca66a0a93b37498e ofl/headlandone/OFL.txt +sha256 2a603f9fb5d68c3a67b3ab5d79e685fbc0c0585a9a478e5b89b2edab135cc1f6 ofl/hedvigletterssans/OFL.txt +sha256 2a603f9fb5d68c3a67b3ab5d79e685fbc0c0585a9a478e5b89b2edab135cc1f6 ofl/hedviglettersserif/OFL.txt +sha256 866747cbccae229433e946b90fcfc457b81c33ac89e593855770851354f9e6c3 ofl/heebo/OFL.txt +sha256 2d83a49d05906b5e23285168e72c0d019fc15e3ad110376f640feeeda34c27d1 ofl/hennypenny/OFL.txt +sha256 66f19a3655694659983eab355b8833b54e17d34f653d5ae5b86cb90c0550a4de ofl/heptaslab/OFL.txt +sha256 6e54fc004ebeb61322ecab1d86334ebf69e7051632d48eca489beee505d70762 ofl/hermeneusone/OFL.txt +sha256 50265d2b41f8ad2dd350532d2286509aa694021b4aa0490b06f0068e4ed78c27 ofl/herrvonmuellerhoff/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/himelody/OFL.txt +sha256 3e9b0ddf2dd1ed6ada1bc29977601095102505d11dae646df1f6b1d59572f4ba ofl/hinamincho/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindcolombo/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindguntur/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindjalandhar/OFL.txt sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindkochi/OFL.txt -sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivoblack/OFL.txt -sha256 c832a4230a713d080aa2f2544d9a298ed911f689b2c48f7f276a0196b16d2b8a ofl/cookie/OFL.txt -sha256 ae28423a5e63cb65e651ccf62c9091b322fff1d2d4e87ad9f98b1096c2e7abb5 ofl/metrophobic/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmadurai/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmysuru/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/hind/OFL.txt sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindsiliguri/OFL.txt -sha256 8c22fb3866eaebd77a2cb8e8ecbb095381ff32300db57758326fef35a26132f5 ofl/ranga/OFL.txt -sha256 d2875ded3e44e9ae53ea2b35e825dafffa19e82c5d14addb9f1150fcd7a3463d ofl/mina/OFL.txt -sha256 8242e7737bce317f7a7f2b887ac87f5bb21305ab96bee92aadc3febac16c35bf ofl/voltaire/OFL.txt -sha256 fca01a37b10879d7685c7d03fc5a04086b15cdb2cb4f870cb687aa5a9a0a1361 ofl/jimnightshade/OFL.txt -sha256 2492bb8645caaf622bdc3e880cdc9b069921e7341346d7b193666c866a1935d0 ofl/condiment/OFL.txt -sha256 e6ac721b16f309c89fb443680afda427ea34968bad190a80edf281d01d65fa99 ofl/andadasc/OFL.txt -sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzeldecorative/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/coveredbyyourgrace/OFL.txt sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindvadodara/OFL.txt -sha256 5c36e7ec460b285185ea23847aa1f508708d9ce15d5c055279defd022972f836 ofl/rakkas/OFL.txt -sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhyme/OFL.txt -sha256 c54957d55e7c9e66c28e474cd39de75dc044e8f69056788cae44eb78841ceef1 ofl/montserratsubrayada/OFL.txt -sha256 fccf4916b5f84ef5f88d93fec464421aaf4121d11d4be8d74ee2d032f7661d6c ofl/padauk/OFL.txt -sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/prociono/OFL.txt -sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsie/OFL.txt -sha256 0d5fa0cce86012de872273700eef4fd162459e7c24a6a314911380627391071b ofl/bigshotone/OFL.txt -sha256 ca64dee162bf239c7b92d854d388bcd30552edc3ae1ef5e31714acda34c988db ofl/jomhuria/OFL.txt -sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbookbasic/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeehairline/OFL.txt -sha256 9c56b4e2e4e922cc37e19e1a9e2e1128beaa17a812e1b67c8ac371b0fb57ae03 ofl/kopubbatang/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/tillana/OFL.txt +sha256 ac987f9cbc5b18d3239d88adb57a4e134049811d24ddda2f6383faa589fd2727 ofl/holtwoodonesc/OFL.txt +sha256 6b6c6721a30480a323cf33acf6a7703dfce46b846827a65f8ee96230060e3c3e ofl/homenaje/OFL.txt +sha256 0bc7e93bd50c78f58e981cab4d452566f70a425815b7a3a7331f8d9c85ff0e26 ofl/honk/OFL.txt +sha256 0f3199eac4dcfc512e37593730841da3da6a937ac633c3f0f61d13355d3744d3 ofl/hubballi/OFL.txt +sha256 064358800fe0bce38e0f0c75f748649b702b221dba298bd9de2e6b4026df45b8 ofl/hurricane/OFL.txt +sha256 a642565cd75e9535acc67679fdc6a8a99115fb437b764e86b4d82b03d8b17945 ofl/ibarrarealnova/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexmono/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsansarabic/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsanscondensed/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsansdevanagari/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsanshebrew/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsansjp/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsanskr/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsans/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsansthailooped/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexsansthai/OFL.txt +sha256 7e6b2818edbd8f6a01ae80641cc8f16a51080d08fb4e532be3a0b6f74adb07da ofl/ibmplexserif/OFL.txt +sha256 2d62278530348951887211d79d1dba04acebd6ed3b1c413f6154702efea3ea62 ofl/iceberg/OFL.txt +sha256 518962c41d4a5e96b0016bd8d8acc965413ea1a0102467e4955931e702b14a0d ofl/iceland/OFL.txt +sha256 6bedaf6a91cc0f23c61b1be288107e7aab97913447575c6f59f395e4e04b4588 ofl/imbue/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepica/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepicasc/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpica/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpicasc/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglish/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglishsc/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanon/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanonsc/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimer/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimersc/OFL.txt +sha256 42b758018a3f0fa429f9aaf7cafaa273ce922ea7dfba30f50cc828b8aa3e1717 ofl/imperialscript/OFL.txt +sha256 6afcd25837be87e7c564f594d20ee009b4bfa540c4eb2d274992e2b1483fa3c9 ofl/imprima/OFL.txt +sha256 0690e0819628a20c5ee68388a7bae621e5c3e53be57276169decd00111d8f2cf ofl/inclusivesans/OFL.txt +sha256 29bd0cfd0fb2a45f9b057c834a057724bae1f63b525a8ac83d3e7525706d9f80 ofl/inconsolata/OFL.txt +sha256 ca9fe3a0e10bbb082f83ecdc07f5f04845c4bd689c46456da3e6bae23e11aae2 ofl/inder/OFL.txt +sha256 d9cdb075679d15a99bab2a8541b9c4fdc71347502111fbe9affd1d462219d96b ofl/indieflower/OFL.txt +sha256 8cf345e9566428f6171371bbd5bcc7f8ebe443712b9349267dc59391b7d4aeb1 ofl/ingriddarling/OFL.txt +sha256 3169e7e0e87168908218f11d660a52c0b81b5952fd73918a596e70721d68d3e5 ofl/inika/OFL.txt +sha256 16f8621a8dda01f044b8a58489334dbaadfad44ef2fa1d5ce0864cc2f309df01 ofl/inknutantiqua/OFL.txt +sha256 2609587542b75aef638a6bcf9bb1d528595fa093f1a8b905e85f9dd77b6f3487 ofl/inriasans/OFL.txt +sha256 17ce133cf770fd000edafa607ae2a41dc6ce5a4f30fe82f777fa242929e76714 ofl/inriaserif/OFL.txt +sha256 ce7d437b6ae0e923abd1947c7a5f4d2171f60d932ec525a37c5daaa521e59683 ofl/inspiration/OFL.txt +sha256 9e27a72ed30eb49a08678f6a5d6ed98ec7ba5368f541637ee0683ec9134ef966 ofl/instrumentsans/OFL.txt +sha256 129ed7618959716959f2941fdd5b49e0ad6e6c1d78726761786a00253d865521 ofl/instrumentserif/OFL.txt +sha256 5b9321a4298cfeb6b34354164a1c3afc3db114569984c502b9b35d988fd58c57 ofl/inter/OFL.txt +sha256 50240ab035cf1b6b3307940235481d515c4b6de3ab1fa843dbe59e7892cb9d58 ofl/intertight/OFL.txt +sha256 e8697c6fe444e393a33ff5b9f929483db7a782b404f82453589782500298a22c ofl/islandmoments/OFL.txt +sha256 1e511bb01d29562932157365418c02d954d8faeef794bcd54729177fb2b03db0 ofl/istokweb/OFL.txt sha256 486c4d5b9baf0d0ba5546ef3c43fcfe22c062299ab6948045a43efffe4b0f74b ofl/italiana/OFL.txt -sha256 4539710406c656519f8ddc789056a7cd6f4fe66b44cc2f52ebca6e251bb26e13 ofl/imprima/OFL.txt -sha256 7f55affd2bce8ed9be13297ba8df1a4a7e9835c2a006126dc2a1eb4ce75a7943 ofl/muli/OFL.txt -sha256 867b506cb023eae20c1accde77b2e0abf7d8a9e2620da8dbebac9f7b1117ca0b ofl/cantoraone/OFL.txt -sha256 aa72b0185d828cb2fafa62a154e84bd3e20c88ada30326089bb20542b6363aaa ofl/manuale/OFL.txt -sha256 4664e83780a263c53dbab95d3590a5a9db914aeb9a3c78f7e7ad451f9151c998 ofl/spacemono/OFL.txt -sha256 fc59ca3cd3bcb47bd4df597519111ec130c25cabcc57a8808dd2d243cdcec6ae ofl/oldenburg/OFL.txt -sha256 43c372f43d145c22e654781860506a75cb85b086dc76028a62a28a446506d253 ofl/italianno/OFL.txt -sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinateinline/OFL.txt -sha256 d13a278247ce39695f5ea6b721103faa668083022c5280b78c6392263e473929 ofl/bonbon/OFL.txt -sha256 f0be7437bbb8b91ad4a4f7a5f3d0020368e494a803d892df03e8886d51f2db3a ofl/candal/OFL.txt -sha256 a68d8ec6bea7f277053ae93bf563d4b97c233f09f8e79f86ffe5db66f31fdddf ofl/prozalibre/OFL.txt -sha256 b00c646b7d04a6da1665a148815b8c589c1e05ed7e1febf7ccbd91758747cb03 ofl/quattrocentosans/OFL.txt -sha256 a3deaae17ab9a15dc3c2778126aa6f80d41d567741853f84b16a9e1318ed799a ofl/koulen/OFL.txt -sha256 50f7b09af5ff677f611a96cdf5eb916307c59b29f2e8144942718cb432a9bf6f ofl/margarine/OFL.txt -sha256 72a22b6dd29b6b0cdcc98de30701b46532c9f7314ee095df3063d10775dd70c3 ofl/trochut/OFL.txt -sha256 325e890b8b26fe0a683c3ba24c506d902bdd7034d9c47bd7fa2bb72b5433b9c9 ofl/shrikhand/OFL.txt -sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlocksc/OFL.txt -sha256 d941aa56e280b4f204272c4b1add01a8ebc7af3e8e69ba8ba9118aa2a5306dde ofl/berkshireswash/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantsc/OFL.txt -sha256 36c285c5472c625901d4a13da7e31c5ea6126678d31d56cf95572c49f27c8950 ofl/passionone/OFL.txt -sha256 fbc351e1b5428e4f45834647dc23a5f8aaa3e744e2f4117ca03c44f640b9a3a2 ofl/stintultraexpanded/OFL.txt -sha256 021d5f1df697848da51620394659187be77cbe382ff2f896bc84ffb89c0c2d52 ofl/portlligatsans/OFL.txt -sha256 85b700bfba1250a6f8bdf930cd7113faf3d8e9dc52cd89eb98c3ac8a038a4aa9 ofl/londrinasketch/OFL.txt -sha256 c972795e48b096b6d4e3a947b0bb21c1baf1922a6e07ff9ada587c058f228740 ofl/coustard/OFL.txt -sha256 eb4a7a082fb0e7dde0a8f975d33f02907ccbe40751c8115e790cf3679787d01c ofl/strait/OFL.txt -sha256 9b1cfccef4a7e19f90e2901f808f3aec4335d3cc81f978453ad0c8ded14447a0 ofl/novascript/OFL.txt -sha256 43c89012c2b640187aae7e0c83d5ffa8381a0368c00e8426594358d44d3811e3 ofl/nunitosans/OFL.txt -sha256 fdecdad755f4e5e95bee491c7521f31625dc08283562ea8579543c90430eb269 ofl/karlatamilinclined/OFL.txt -sha256 5e80642a11aff2ead815949a8a929aff3fb7b9b6a24391406068a1b204dcc8ba ofl/abeezee/OFL.txt -sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbasic/OFL.txt -sha256 f2fcbde4b8968400d661e7dcc23052b1885815c8e3b45323b26cbb833352f5de ofl/timmana/OFL.txt -sha256 c8af073a60e30b55ef5d0e4f80cea168e06dd65bdee7ec18c1ea8de8f7228780 ofl/strong/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeinline/OFL.txt -sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostar/OFL.txt -sha256 e55c615ed00ce0054bd356041a41e5942b4a8cadceac1e32696ba2ef5f06f748 ofl/andika/OFL.txt -sha256 4705fc9bceb299b2a951d23c321d31f3679871bb99ceadb978907704d211f4f2 ofl/pacifico/OFL.txt +sha256 bce79721f0203586872bbd7016922baf449980bdd1c44550a821112a3b547185 ofl/italianno/OFL.txt +sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/itim/OFL.txt sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancois/OFL.txt -sha256 99d67fff016522688b8f913377f8ae9f6da6ffeae42cf67c0e5e87cfb0928d33 ofl/unna/OFL.txt -sha256 bba4a13f03d0fd5b476cc148feda6895dd8d65f34b2107ba9d010ad9539d6c0a ofl/faunaone/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangang/OFL.txt -sha256 58bbdbe5c48dd1d7cfd658425a455c29811181873d3a46a4932c29e5b0ec16e6 ofl/euphoriascript/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/laila/OFL.txt -sha256 17b90cece30db64934b7299fd76b033a3774c8a990e78badc74c59a5be8e0727 ofl/cairo/OFL.txt -sha256 5f8ff4a3f951c104e99245bdb952be08c73369222048bbf19fa3bf7170d10949 ofl/sanchez/OFL.txt -sha256 8eb1c1019fe7fe6d0b6e7d7bbbba1d9cbdd969d8c5f26455708f6cfb8a77284c ofl/nanummyeongjo/OFL.txt -sha256 942d51cf079299e83e9dd7a9a37eb92260524e8d1d576b2f0b3f7ca207c53f8e ofl/newrocker/OFL.txt -sha256 117fa195cff980e3b10fd8e8e21658c6ec954b0886647970a03c9694d3553b69 ofl/galindo/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/athiti/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/annieuseyourtelescope/OFL.txt -sha256 f2ab7e5c5c750fa03a8d8f64c72a089ed86fbd3dc172440fcc704b27816d5957 ofl/noticiatext/OFL.txt -sha256 9a33b452a3107542c35fc5fcee80e4d8798c82aca071c2f6f58a0f8dc5ad61fe ofl/cevicheone/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootammudu/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasansextracondensed/OFL.txt -sha256 746b384383888d9325ed2fa9c40d2456b458aa190dd2b8c515ed4f02a1075bb7 ofl/magra/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasanscondensed/OFL.txt -sha256 fe9183a0b7c1ae626b14004cd533c89ec7c192aba017f81ab71ede910256abb2 ofl/abhayalibre/OFL.txt -sha256 876db27db250a9b9c03fc2ef30a5efe1f37c2ed2686d368c3779583bdf746912 ofl/balthazar/OFL.txt -sha256 4342add6f0f2261f8579f31c10a55938930559703eed18be4a33b74eb749d298 ofl/doppioone/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusswashcaps/OFL.txt -sha256 16a8be6ac4b009ba1dd1e17cea48762f4915609ea5dca1303f716cf63998739d ofl/adamina/OFL.txt -sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redacted/OFL.txt -sha256 866669fde730bf2785f44905ec162f05f2b8d9f6dcf366aca99360fedbfe502c ofl/dancingscript/OFL.txt -sha256 008445a4d53fbd71bff9cf733bdfd841a1b15fb58ef3473f7bab4c456e3b2930 ofl/ovo/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendrasc/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimersc/OFL.txt -sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivo/OFL.txt -sha256 3747fdcbfe4f51d6a2f101c35105bacde3715b3c32b34b6b03e5fb37983f89fc ofl/quando/OFL.txt -sha256 38a83f1f8b6efc3ab354b8b6eed22e8524dc71280844dc24811d95ae27b34952 ofl/khyay/OFL.txt -sha256 b8fb5cd1bafb52e652c733fdb75ee20c763e97acb0398f6b4bbe1d8ada0c07e5 ofl/misssaintdelafield/OFL.txt -sha256 a3b0977c5c25101d45054cf9199b9127b05fddc79d4da7dcf400821824e5a6d0 ofl/radley/OFL.txt -sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserratalternates/OFL.txt -sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asapvfbeta/OFL.txt -sha256 d3909465d5838d9d1c72b975ff1ed4f410a85dccd43801be525bf2b2bde89f92 ofl/snippet/OFL.txt -sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/mukta/OFL.txt -sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickavedisplay/OFL.txt -sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedan/OFL.txt -sha256 4281c00ab5b8f672fc8d686f48cb886ffbe900c8c9ee22473ca7e72e7cef8fbe ofl/wellfleet/OFL.txt -sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabinvfbeta/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangdon/OFL.txt -sha256 399b33eb38cdfc76b8665defa5f81d52e8193d630ad5858c893db6bc20031bc9 ofl/rye/OFL.txt -sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltoniantattoo/OFL.txt -sha256 8594350034ab1cb85a1946ef8852e69290255816c311450a66fed6eeda9d6292 ofl/anonymouspro/OFL.txt -sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzel/OFL.txt -sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillsjaffna/OFL.txt -sha256 64a73da7af818283168543e24bd214aded1bfec06f013bf9cebc20064a8560c5 ofl/elmessiri/OFL.txt -sha256 4fece81b541808b40293b0cd3f5b1990274e1100e1c20455dc2987cd96639d3f ofl/metamorphous/OFL.txt -sha256 8d325681662a30f58f57c92ab656dcbc9679deb78a493e4c0eab75321b2df6c3 ofl/worksans/OFL.txt sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancoisshadow/OFL.txt -sha256 aac8f0cda6159b7251d1034651bcb42e07611495bc8cd764c89d22f3123032f8 ofl/aladin/OFL.txt -sha256 81d0973236b5b5709a80a217a330db36eabedf57bf4031de46b4660b69901234 ofl/leaguescript/OFL.txt -sha256 5454dc5cf2f46a2005f42f13ee2a998c7d0afd7f556f32fda208c72b266f7adc ofl/cambo/OFL.txt -sha256 b2d4b0c773afce947728ab99fca43b242b7edb0da26fe29f60c7c2d5094ec23e ofl/suwannaphum/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/labelleaurore/OFL.txt +sha256 a74380bba78a364ec70b3a5fb6a1161b83cb05cc3e75a0910afbd1b5aff4f9c8 ofl/jaldi/OFL.txt +sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejugothic/OFL.txt +sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejuhallasan/OFL.txt sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejumyeongjo/OFL.txt -sha256 cbdf9d35f32a9a2f02fb23c8b89c115a5a8e45feaaa2266920c4594c83dd5ed4 ofl/tenaliramakrishna/OFL.txt -sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivovfbeta/OFL.txt -sha256 967d75b89eef1f8a0ba1f5ee7dfb13427621f9116c6e7878ca04da8c9aa8641b ofl/mrssheppards/OFL.txt -sha256 8af83da84dd4299842f871285a88049352ab301ffa1f233d2595b29506158635 ofl/blackopsone/OFL.txt -sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquin/OFL.txt +sha256 b2fe5e8987594e9ffd1d2ca52a2f5d73eb8335243893c5d6254b5ad69269591d ofl/jetbrainsmono/OFL.txt +sha256 fca01a37b10879d7685c7d03fc5a04086b15cdb2cb4f870cb687aa5a9a0a1361 ofl/jimnightshade/OFL.txt +sha256 1a7bee2a10dc98def83076f719360f7db6a7760e0f5401046877a415ffc1abfa ofl/joan/OFL.txt sha256 c4cd9f38c3246ee6a68c264f017320dc1af09677d386166d8cda806d9a12e0d2 ofl/jockeyone/OFL.txt -sha256 a36ab46c8b1a74a480a1c51d6a5af08b643e870c6d247f233bc97c97c8ad2098 ofl/tuffy/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/nothingyoucoulddo/OFL.txt -sha256 b5c776129b160163c84620b35fd45dea45edf49789cda5a94c2290c230581e0b ofl/scopeone/OFL.txt -sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/sintony/OFL.txt -sha256 8928e999ff156e35852ab41d7a906598a8285acd3bcd81dff67213a6cd98d43e ofl/mallanna/OFL.txt -sha256 473c5e3123102434d05c66a9fc8b19cf285a3bf71cd8a91a41acef44d1448e62 ofl/sevillana/OFL.txt -sha256 22d1914919d3fe08b179dc31169fc743ca7eede7827b91a5d48c23c8cdc7cb81 ofl/anticslab/OFL.txt -sha256 026610186158060ad351fb20cd1452def5d35b2531634c090ce8cd1d9e9aeaf2 ofl/michroma/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/shadowsintolight/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/architectsdaughter/OFL.txt -sha256 61056041809e0ba18bf8b9d637a375ab1c725025428533d74d668d88b2cb8b89 ofl/simonetta/OFL.txt -sha256 0a852a06f0256a6684662663ccb1d8e08d131abd1f70cf8d972a344cf31aa381 ofl/scada/OFL.txt -sha256 f46c3ea04f38ea73c0731d73dfba3d7361d4b38970feb31a3558bd1b75e0656a ofl/lobstertwo/OFL.txt -sha256 f30a7045e4e21201182b2b9fc4e4b96189aaeaceb2c8e9b68d8bd3dc4e3c5a27 ofl/greatvibes/OFL.txt -sha256 9bc1eb1c679510b32d2e3f5f4f3b47726b1657aa121494aa68ba0b124a3c3a53 ofl/ewert/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39/OFL.txt -sha256 359671bf16c00cae69cb66d041296b2adc7a4becd73a463cb8c5e101d97c7986 ofl/arvo/OFL.txt -sha256 c09e3b81d9cfeec46bc29a3374000e8ad013d694bdf24a288088491dd4cd5c69 ofl/creepster/OFL.txt -sha256 29bd0cfd0fb2a45f9b057c834a057724bae1f63b525a8ac83d3e7525706d9f80 ofl/inconsolata/OFL.txt -sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siamreap/OFL.txt -sha256 223fa23e8419ee762c662e0faf912dfcf386fa7093ac9ff690e380ce1993ba55 ofl/asar/OFL.txt -sha256 a0369b1d5f654110f2fe101db56a02d02806f1e609ab233368bc573ec45050e5 ofl/butcherman/OFL.txt -sha256 4f8b437578b20bff261adfe6c02f63bcf7dbb6a45ab37804b3547e5d5f44927b ofl/nosifercaps/OFL.txt -sha256 793891edf1f4f4f35b52fcc9706b03f779c7ea18ab8e9e441242d63ef0279488 ofl/autourone/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangangcondensed/OFL.txt -sha256 1c023b4aca0e441c55c45c86cdff57fa524a96778f291d9a29a4ad777b70e2e3 ofl/arbutusslab/OFL.txt -sha256 de61c87e08286ad3215398340e9403125ab03c91b33bdf29de6d3e8a386d2d28 ofl/dangrek/OFL.txt -sha256 53ad6a474f68ddfc3fe72449de3ede4d3f033b2f24b77833b1d56edf505486d2 ofl/sura/OFL.txt -sha256 247edbf968c0a5b8defd6a9e420080a8bbca6ea002bfb326d12a472a6f95637b ofl/cuprum/OFL.txt -sha256 0623888cc2391c6c9853c04eafa7f687fef1a8328bbb848feab05d9e2a98764d ofl/emilyscandy/OFL.txt -sha256 1c43e70c49ef7a9b35fcb3758fec8ec5969ff1274c4834b4466b9014f3b9f55f ofl/volkhov/OFL.txt -sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karlatamilupright/OFL.txt -sha256 cd354a6084383c50398fae709ebe3a5dd98b947c486c1fe9de5f89caf81f980c ofl/snowburstone/OFL.txt -sha256 8a59454b7f1cc0b1fa29805781769047e5c269aa629e3422c2d7fc04b89e5c1f ofl/rosarivo/OFL.txt -sha256 de71817dafdecfee21268b8c4f106146e1d00988c4fd6546b10445eb26b24cc0 ofl/expletussans/OFL.txt -sha256 d1829ff3455bbf3b9d13dfb0a57758a863107c9108aab48558f26f37f1094180 ofl/firamono/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rajdhani/OFL.txt -sha256 26e4c39c4905bd7f1068b0bab008f5a4a9b945e2d7fda31e52719fc5aa9655bf ofl/vibur/OFL.txt -sha256 49f2a11271968a2ce019a43bf5401d1593652a18f27ea59037ff5e39856d2df7 ofl/changa/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/maitree/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsanscaption/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmadurai/OFL.txt -sha256 f354ef1e7256644b320c5e1d9a07a819c2e2b930166003c96680894f9fba81be ofl/mrssaintdelafield/OFL.txt -sha256 5c289da4a19f054ace8e31a144a6a254601898cd7faf9eaa301141afda0adbbe ofl/coiny/OFL.txt -sha256 0886960207bb5bcf81a46ce663bab6c52a742dad80ee2cff5cbcda6f1df88568 ofl/rhodiumlibre/OFL.txt -sha256 8f94e5901c371537043e0c762c827ce33963e7bd186fbea0abafc035ef7120a7 ofl/emblemaone/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/gloriahallelujah/OFL.txt -sha256 24af1fb3ab8dfeddc83162b7f3b6c1104149b6c3022f1aa948ef4f8ff7e6bf7c ofl/poetsenone/OFL.txt -sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyone/OFL.txt -sha256 70f664de65e7bb62e1ac728f20a9bb28de7fdc18be594186137a9e15ce9dcee5 ofl/niconne/OFL.txt -sha256 e604b133509815768e6ec4738bb04844ce9a23e80099d2b61e5d75ef46acbeb0 ofl/ruluko/OFL.txt -sha256 42ad5a49e171bec80308a1c9e8e66b03e638b3ea65af7fafa6fc0e42f45e7626 ofl/suravaram/OFL.txt -sha256 4fe81901e6f84cfce1145c715e931352a9a12aa7ac75cc193eb523c0cb0e5eb5 ofl/lohitdevanagari/OFL.txt -sha256 2937c7789b0e4fdeda6eafe93164a2ab36e20386704c4cb6f87b1deb620ec0da ofl/leckerlione/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexmono/OFL.txt -sha256 fce9f9e2fb268507a89fceea0b3eccc044f39fc3492968a04fd9e04df5ae95fa ofl/sourcesanspro/OFL.txt -sha256 e12a3e737fa75c0ee072d965b6185710f35e38a4f7a0793ebc66ba14a216109b ofl/meiescript/OFL.txt -sha256 d2f9c74aba2716333b0a3d283083f9fdc93b2e060c5ae094c79e97e8cba9d7e6 ofl/squadaone/OFL.txt -sha256 5d6517d497bea6116ed35079b30374043f6d90b19c8d97fc4e5ec48520d1e08b ofl/zcoolkuaile/OFL.txt -sha256 f8a20490ee8ad3adb2205ea44b279b19099a3a1d6b62849e90b4db20a77deeb8 ofl/brunoace/OFL.txt -sha256 75b2a5f39a53b4cf9286eb3d2cc1f895a8f3442680013c77124121bc347a6448 ofl/lemonada/OFL.txt -sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellus/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128text/OFL.txt -sha256 eba176d3ae86af6b41e9b744e4d18fb56e2a6ad671381bddb61fabb86b1d39c1 ofl/croissantone/OFL.txt -sha256 12404fcefccc3cb964cb2406510ba679b30f7d7ae689db08df5b455ae24b3feb ofl/paytoneone/OFL.txt -sha256 e2a176ce310235bf281f1124454e21331390ae1b4c429a2d80ae642d333a5a7f ofl/frankruhllibre/OFL.txt -sha256 2d83a49d05906b5e23285168e72c0d019fc15e3ad110376f640feeeda34c27d1 ofl/hennypenny/OFL.txt -sha256 d7d8074c2dd46804990c184e25849947ab76c5ac7607fbf3966543455769bb73 ofl/yeonsung/OFL.txt -sha256 13831d02389d917d22fcfa6c79f98f8acbf61d230add0e73a4d4dc5f3bfb9e56 ofl/chakrapetch/OFL.txt -sha256 c39e284759a441660d4c4d852c537e271d0fd5c301fe46d065a972b6ee144ba8 ofl/aksarabaligalang/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmysuru/OFL.txt -sha256 0da6a3e5b24a9fa04085c20a2a1d3101eeb1e0bff56a2291f407187e1b2adcf2 ofl/mrdafoe/OFL.txt -sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612/OFL.txt -sha256 e2f2dc7a667954c16a919acff5351e8ea89813d10f5a7504e1f4668fffbfa14b ofl/barrio/OFL.txt -sha256 8c495ddd455def58a45310376a747bb61bf86e4b071cc527b3618bccd3ef00fa ofl/chauphilomeneone/OFL.txt -sha256 b687f920fe20fe48d8f7709421e5deeb4becea295c80ce62aadcffc54132fa1b ofl/stalinone/OFL.txt -sha256 a90a8ebe28f3c2905a44557166010a3d219ffcce1703c3c3280ea8728d5e2ebd ofl/heebo/OFL.txt -sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alefhebrew/OFL.txt -sha256 2cd51b11e821dad2fb7acc54d68bd9a139fc7a1207e17c432ba9ce49bba3d493 ofl/fasterone/OFL.txt -sha256 ca424122f42a8d8442bc4cfd902f5f027ea67b5417705f5af1d1235927781720 ofl/amethysta/OFL.txt -sha256 bb8fac04b8535d39fb9851c9d886248d25bc0c82000066c92dd577c3369f512b ofl/chenla/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/lovedbytheking/OFL.txt -sha256 53a9ce47085d9fef613c7ecb3730dc80d25962510bbea231b89564f58240f251 ofl/gaegu/OFL.txt -sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/share/OFL.txt -sha256 9465823369fbe1ae0b5a3065021d53ef8c56e113e664229455dc80b237fa6a07 ofl/nobile/OFL.txt -sha256 0dd8e32457e18621737b593ab0fac49905cd948a078ed0e64f4890df714a1dfb ofl/amita/OFL.txt -sha256 791936b10381b512512317572fb5eee91bf503344d52c37335e402fc1cf19992 ofl/reemkufi/OFL.txt -sha256 898a9cf80636e86d6b6009b96795fda29e431ee701c28c36f274a7e8a7d8246b ofl/rubik/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloothambi/OFL.txt -sha256 382232d1add5623ba5b06394afa071f4eeecccb6d2b2bd02cfecff4a8a45065a ofl/fondamento/OFL.txt -sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsieswashcaps/OFL.txt -sha256 d849309d514833fe3d7a610e10f6cd5d99b4f9552bfa304969acbf89c66e4422 ofl/smythe/OFL.txt -sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkorn/OFL.txt +sha256 28c6d2887c3dfa42488c5418c6c16ead580d33ff0afe60c05159689201f9ec63 ofl/jollylodger/OFL.txt +sha256 ca64dee162bf239c7b92d854d388bcd30552edc3ae1ef5e31714acda34c988db ofl/jomhuria/OFL.txt +sha256 49b9214f7b40024abec2fc89a32bdda380f2174ba7005d7636e6ea340157c5a6 ofl/jomolhari/OFL.txt +sha256 aee5a4081e8a52f80428b30f178b719d115f18dad3e1fa15a986163e1078a85b ofl/josefinsans/OFL.txt +sha256 40be94683ce097454926ce71af843ceebf8a5eb01dc196f58063d65951cc5dae ofl/josefinslab/OFL.txt +sha256 1af3438a4d5f0ed2bdbc5751a5a67ebf6d537334161184b7fbb68503ef0ea0c5 ofl/jost/OFL.txt +sha256 9ec5fb9facd0c46e43b4d6a309c4bc7aa6c8423c898ed9543b3c9c4133b9e01e ofl/jotione/OFL.txt +sha256 44a7c6e4c5572392ae122d3b1d8c6ba6fd640a7797e675384585d947f2773e3c ofl/jua/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/judson/OFL.txt +sha256 6b7242e4ff02ed5bc24ddd655bc1fec1ab7cd4a86335ffef1d197561264cd0e7 ofl/julee/OFL.txt +sha256 955655cafa13f187f45a79dcf451942fd1118a8426abc5a25ffc5dbb00709da6 ofl/juliussansone/OFL.txt sha256 a1077580b649c7b0e05ea0e9369d48687b4ab1c585573bf86b0dcce7dde177c0 ofl/junge/OFL.txt -sha256 a9b40759b5821a0c2ad07cbd2c2a61dca4b3e222e6370a7d5bfb6b373bf4fb10 ofl/sunflower/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindguntur/OFL.txt -sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsans/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/dawningofanewday/OFL.txt -sha256 f27cbf1055db7b9dd80bce5cd12b462f2d9ed7313d84dd8bfef1ddd2b61bdfc5 ofl/chicle/OFL.txt -sha256 aba8997e16b1e3888c6e855ba883c70d96bd4375bff8cb9c7ce0f097200f74b8 ofl/abrilfatface/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasans/OFL.txt -sha256 d484e0dce424a9e360adabb568b6773db5f1566df71ce3e9dcd66a6cc2c38d33 ofl/ericaone/OFL.txt -sha256 1b3b78123c94dcbc9fd4ec174317336c8c93423da62dc946b8852553cb13ddee ofl/economica/OFL.txt -sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/kanit/OFL.txt -sha256 a6a74417db7c37f69495da556a3eb86a22a784ffb0131e3e0a5a47ce8d7fa5fb ofl/shanti/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepicasc/OFL.txt -sha256 963f283b5410c7df62067a35cd7def0802c583a880e7cd7e326832ec3985ec87 ofl/spectral/OFL.txt -sha256 11bdf9c7abd81f46a88b0b017d78a0e51f451e9dc0c2272813aa9f456ee886ca ofl/kiteone/OFL.txt +sha256 54d85ef76f1fcf89671e196a9bca6b02683c68277caa89d89ff1b63a5fe9c421 ofl/jura/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/justmeagaindownhere/OFL.txt +sha256 869e4c29978c318b33c2e5c7c8f24d2e947f249071bb1471620036a9d1ba87ad ofl/k2d/OFL.txt +sha256 f993b906272c2c0f13f12bc8fef1367a39164853dc69fc808fd26ec343fe58e8 ofl/kablammo/OFL.txt +sha256 b01cec9e5e2035b70a6aeb61c673d1f6d5c91539845be07733bd9880fddeb9f0 ofl/kadwa/OFL.txt +sha256 6c5445d4febbf6d84025b874a85c51e7e4bfa7495279eccdb4c317a6de857b46 ofl/kaiseidecol/OFL.txt +sha256 6c5445d4febbf6d84025b874a85c51e7e4bfa7495279eccdb4c317a6de857b46 ofl/kaiseiharunoumi/OFL.txt +sha256 6c5445d4febbf6d84025b874a85c51e7e4bfa7495279eccdb4c317a6de857b46 ofl/kaiseiopti/OFL.txt +sha256 6c5445d4febbf6d84025b874a85c51e7e4bfa7495279eccdb4c317a6de857b46 ofl/kaiseitokumin/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/kalam/OFL.txt +sha256 46eec4220309d801b70628d371aeff217e5151dfaad11606a71f2af5f1396f7a ofl/kalnia/OFL.txt +sha256 3105b49207b8deaef9efa249489df8eff9d76b331d46a433e15cc4685932dff7 ofl/kameron/OFL.txt +sha256 eb998cc5a685b240cdb46a0b5747e70334c8c57bbd7b1f6b044d75719358df67 ofl/kanit/OFL.txt +sha256 7b300b8a1e2e9d7cddb68859551f1ad54a05019eff28da02e3be811c1257f0a7 ofl/kantumruypro/OFL.txt +sha256 89c5e961d4a259af9f3a187be51aa1e095a6fca13a7ad20b40a1d690be7cdc0a ofl/kapakana/OFL.txt +sha256 d2dcb5c24a68a08bc55e2416d13cd32b077c9637044dd40f3863a0aa90aa228b ofl/karantina/OFL.txt +sha256 edf2c840acb9570fe02f40721126aa0da4e4011a0030cc6dce30780569f609b6 ofl/karla/OFL.txt +sha256 fdecdad755f4e5e95bee491c7521f31625dc08283562ea8579543c90430eb269 ofl/karlatamilinclined/OFL.txt +sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karlatamilupright/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/karma/OFL.txt +sha256 251f65282ff48a7e8ef3fb661fc99254d9b3b0c368427c98b1edbfe4ca66e888 ofl/katibeh/OFL.txt +sha256 3336bf5d4e7eedba48ecb831f37bf676e901c39f2e6a422cceadd9d2ffa55be8 ofl/kaushanscript/OFL.txt +sha256 0acef93ca37cf19eeb83a1c6a29b78b08377a211c8d80cd27626e210176828da ofl/kavivanar/OFL.txt +sha256 82831e8f12ecb6deb2f4d9919a04049895b4619e0301fa6b699c861bd7311c54 ofl/kavoon/OFL.txt +sha256 1968df42d8d640e1680750aaea7e81ef3f45aaa514eff4df2ef0c9174a2e3fda ofl/kayphodu/OFL.txt +sha256 355d9d22e809d67010fc5decd3d9ea6ba201fa8ed410a0207977a329e456b1eb ofl/kdamthmorpro/OFL.txt +sha256 ca13e9cd1faaa6afb9e43dcb534a8984cec3218993fb4b436468a79a1657ee19 ofl/keaniaone/OFL.txt +sha256 393d494f9ebb5db6a3552ffa03a4c6f3746c22808b40d011b391681da55ca3f6 ofl/kellyslab/OFL.txt +sha256 ce78cc8de3f6edd2738e8c02f2079db7086c9a74314baa5854675f83c33954ff ofl/kenia/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/khand/OFL.txt sha256 6827fa45930d5847fca5b3d3898b3d87a229fba772a5b6c5bc33bf73ec83478d ofl/khmer/OFL.txt -sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedfort/OFL.txt -sha256 34b8afbcab7508bea23847288332a8c05a507364ca6f0c8756ce560d7d59d506 ofl/mada/OFL.txt -sha256 b67eed9578defb59cc4ff4b58428fb816786e499e84cdeafca54723b055c169e ofl/viga/OFL.txt -sha256 afc1cda4eedcfe27c8cf30fe3e9879587cb43cc2882d4cb91dd3e3fc9eecd0bf ofl/farsan/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanscondensed/OFL.txt +sha256 2171558d2482764644a2f793696fa2e48c361730ecc87686b9a29082d6daeb10 ofl/khula/OFL.txt +sha256 38a83f1f8b6efc3ab354b8b6eed22e8524dc71280844dc24811d95ae27b34952 ofl/khyay/OFL.txt +sha256 72fe43ef3efbc44903674b7b21a19c6e14ef5e4217bc922662320554ffcfb77a ofl/kings/OFL.txt +sha256 7e896665d0863d2a17a671001dbe2528a5f9302f1dff9222af8b0834e9088d0c ofl/kiranghaerang/OFL.txt +sha256 ea54eb4bd4d5a57ec47417d02855ba011af5d917303461617fe01a5688e0525d ofl/kiteone/OFL.txt +sha256 07ceae7a6e3294cbbd0fdf6e35226550566a1cce9fd226d0f8a57f3d34c664fe ofl/kiwimaru/OFL.txt +sha256 e376b0df8e8a2345a9533db6f0a5333a1107975569ad9d1973a7ee557161ca38 ofl/kleeone/OFL.txt +sha256 14b3fbd06078a869cf2ba96e6dacb852d373703c86ca7ad54a4cdd6e20fbab19 ofl/knewave/OFL.txt +sha256 b1958132ff727bd74409aa37ec0abbe4be13b1b379e1210e6fb77fc608c607d5 ofl/kodchasan/OFL.txt +sha256 0878e7d6e842bc3c45154059a1c2812de0d31dca343fe6bc16abc9afdee3e3de ofl/koho/OFL.txt +sha256 65f03a12dedb8d9b1d032393334c3978818966fa72251089bed66a3fe3f56dfb ofl/kohsantepheap/OFL.txt +sha256 d3711c90a7deda6210d30e41b945f16bdaa00662b30ee0b7c36abfee82525bfe ofl/kokoro/OFL.txt +sha256 8045c0c155e0da96ced6c6fd049214ef420575c047ede767d88fd02e31b9aa2f ofl/kolkerbrush/OFL.txt +sha256 d4577dd4b58d06011490a6715de2e17d6808d65fb68f4f3b95a68e9c7c929469 ofl/konkhmersleokchher/OFL.txt +sha256 9c56b4e2e4e922cc37e19e1a9e2e1128beaa17a812e1b67c8ac371b0fb57ae03 ofl/kopubbatang/OFL.txt +sha256 e39d6ec64a37ed1523a59940695a61ea5e7882d9bbe0e7eb11653fda4b04fc79 ofl/kottaone/OFL.txt +sha256 d5e231771c466695f0aea212a3c18ae4e34ea2503f1fc0751f04b0c7610c6735 ofl/koulen/OFL.txt +sha256 bec72f4e6e1f29541d7295ed2ed14fc868695673051b940352200d1ffc4095e3 ofl/kreon/OFL.txt +sha256 4ec46c3e4469afa19f0156bac6917472974f9c85c189f9220cf8735d3e810401 ofl/kristi/OFL.txt +sha256 6c181f5a0045e8f414e1c232c35972ab83ea084ac44825f517ba001628d97b21 ofl/kronaone/OFL.txt +sha256 8f187da1eb4f23e3fe7ba68b1cb2e92881a415dd34c46489698454517e273c4f ofl/krub/OFL.txt +sha256 2b79a19d4c611849e232c3471fca0355e909526a2ed8e04acab933d5168a01f1 ofl/kufam/OFL.txt +sha256 ff72e4d89860e64ee38ccf8a5a7e9dc085d5e36115b096a6c7f8bc988e9bec61 ofl/kumarone/OFL.txt +sha256 b7057fc68425720a92830bbd18b39f070d784a4551de7b0b7e1ad3cc6747d3fc ofl/kumbhsans/OFL.txt +sha256 b712dacdda5da76c0213f8478886f893b855665c1153ae438bc3e55a7dc525ef ofl/kurale/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/labelleaurore/OFL.txt +sha256 b1a62ca897c597c0a0f01be8cb50c0d8370579acd1eadc3f2cc43093d6bbd142 ofl/labrada/OFL.txt +sha256 7dcb8031db2b0f39d41c3ec93a3cd77ccc53fb4ab3f691095ca6c51a06a52cb6 ofl/lacquer/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/laila/OFL.txt +sha256 b5c3d12a3085b96011fee65555234bb9d31fa7444cf6f8d5ae6b1f5771394399 ofl/lakkireddy/OFL.txt +sha256 327bac41d89cf9f32e0efe353228018e1661cff458a5d4905714958514df7bd5 ofl/lalezar/OFL.txt +sha256 d51f3341fd7b3dfa1114d3ef0bdabbe57f60eef86a1458019e0077d676fa1fcb ofl/lancelot/OFL.txt +sha256 ade15f17ac8ff3a726d08ef8708242c78312d946dcb834a8811706d281e45cad ofl/langar/OFL.txt +sha256 911d554d974b49592d825bafefef1b52835f7f0502b5daeff5e292395ea25ad2 ofl/lateef/OFL.txt +sha256 74ba064d03f1f1c4a952da936c3eb71866c34404916734de3cae73b34357e59e ofl/lato/OFL.txt +sha256 f679d25307d193d34ed36afedde50715c97f155a3c720d90d39e7e5d468e0092 ofl/lavishlyyours/OFL.txt +sha256 44778c339892f79188c60b7471485dd5af92c59351c7f9629a00fc625c6cae5d ofl/leaguegothic/OFL.txt +sha256 81d0973236b5b5709a80a217a330db36eabedf57bf4031de46b4660b69901234 ofl/leaguescript/OFL.txt +sha256 41c9980cacc325ccd1afa6553bcae038cc6c74fa519aff60bacb99e3854292ce ofl/leaguespartan/OFL.txt +sha256 2937c7789b0e4fdeda6eafe93164a2ab36e20386704c4cb6f87b1deb620ec0da ofl/leckerlione/OFL.txt +sha256 ba01480319f922ecebbc73f1a523e7f8876e92b16553a32c494bcd3f6f5a27fa ofl/ledger/OFL.txt +sha256 3fa0ceff4b9a2d28dde43bc63cde3acfb5e6e92d13a53e484ca0e501e18c7e2e ofl/lekton/OFL.txt +sha256 d8a8801a55cbc8eeaab7dc9396c4491d60cc7e4ecb2501c6f8282754d743fc2a ofl/lemonada/OFL.txt +sha256 e317ef2e8f152eea3bd96bfad4868cc406625cc4336087fd645e10a5f2b859f3 ofl/lemon/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexenddeca/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendexa/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendgiga/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendmega/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexend/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendpeta/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendtera/OFL.txt +sha256 5da8505887d0fa7fe963445fd58852707fda34adfeb65af25c99d152bab285bd ofl/lexendzetta/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode128/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode128text/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode39extended/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode39extendedtext/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode39/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcode39text/OFL.txt +sha256 a4b7ccd1bda3269afba7d6d9293a7161e699d2f4f1f280dd8a8535c569388de9 ofl/librebarcodeean13text/OFL.txt +sha256 de719ceea028324610230b3573688949768aa30c0b693fb5661691cf36f6ae89 ofl/librebaskerville/OFL.txt +sha256 7ce3bf8e8087bf7495a3e1ed2044e83439db990c778d61b128fd09b7876d0420 ofl/librebodoni/OFL.txt +sha256 9cc8cef15f5e8bcbe99a13ee8d268f6f6f6a5811cd1ed05056ef4608c9b16fd1 ofl/librecaslondisplay/OFL.txt +sha256 a294245c822c5aa9fd9a9f3189418e99415428be5fecadf797793d5d8f6a3ad3 ofl/librecaslontext/OFL.txt +sha256 556704a4cfb5af042e30284e314124779c82ba3854d9393cf3681e5f4575ff71 ofl/librefranklin/OFL.txt +sha256 5ee90951ba3cf079b5c79ec17029e073a72bea1ca08f03ee4b289773a5744ddd ofl/licorice/OFL.txt +sha256 aa36087ecd7e9085e5a1439b0a6d0ee35966e8cd2ccaa649bebe62cae5815e82 ofl/lifesavers/OFL.txt +sha256 255d5debbb80eb2ea762644311f266a279e8778f00156655a516e2b7781a63e1 ofl/lilitaone/OFL.txt +sha256 878aec7282ab41d058cedbf90e14512bcb4fbd0658496de8c2dfc592ed1f0cd0 ofl/lilyscriptone/OFL.txt +sha256 6b53fb03a50914cc382f4d025ee595c17c43f24ae870f840bc51969d3e316c7e ofl/limelight/OFL.txt sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/lindenhill/OFL.txt -sha256 a89ac8075be60f2beba79bed3fa253415a373dbdc3bb108b23f4854d0dd495b8 ofl/pathwaygothicone/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindjalandhar/OFL.txt -sha256 f22a2beea88d631a620b15683fd03e79f13ad3297ad97fa5e42283c0b1a3a038 ofl/marckscript/OFL.txt -sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/terminaldosis/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimer/OFL.txt -sha256 d2f87f90d108a947f98c030d9d8e4bf27e761ce83f222453b9a7230c5fb309e1 ofl/novaflat/OFL.txt -sha256 2da0fa5707f1fab1c802969b098fd1b92ca0b3b233a80e27fca416647c064dfc ofl/exo/OFL.txt -sha256 f9e5dfcdb2947c0db70465668706b0617cd052b6f86e582dff8741d9e5cded0a ofl/yinmar/OFL.txt -sha256 bcb0bda74430ccc281a616a81d0a287fed5a423815b00b222e0b7f603f85b26f ofl/caesardressing/OFL.txt -sha256 a94cfd8d1f5c33f9a7506def359b907f3313f7008bb57fc893985963cd342f8f ofl/arsenal/OFL.txt -sha256 52caec7d90533523fa7da64e95faf90ea32a663ce21847a39234b61e18d25044 ofl/bokor/OFL.txt -sha256 ef0bdccd20de76d517fb3939161d05ecd5808382fb8fa82cde5fcdb3adcb8029 ofl/engagement/OFL.txt -sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondo/OFL.txt -sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/matesc/OFL.txt -sha256 a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad ofl/merriweather/OFL.txt -sha256 010cb216e8f3fbb2836fa3f38787a412b749352de546797f57c03c3bcfe46b1f ofl/nunito/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsans/OFL.txt -sha256 cb8bbf7a86eefa8c146f24ae5be74fffa887ba83719ab3c87036be8e3d0191e2 ofl/montaga/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/overtherainbow/OFL.txt -sha256 3621f156cc7a26e0a9cb413332e0bb35a0e76b36dbfe0b1c885b565a7bf3051e ofl/drsugiyama/OFL.txt -sha256 fbb941b371c6348ee2572ce8c78fb66128a61885f960dec1906c4e44ca4b4d3c ofl/reeniebeanie/OFL.txt -sha256 9e19c0d2e7e7adcbe9dfd0749e34dda41e7e356e0f2cc082d61d2fc9b6e0cef7 ofl/gfsdidot/OFL.txt -sha256 812fc4af0c63d31e0e81cc153af74e397407b0630e918b8b965bcbb192bc0656 ofl/artifika/OFL.txt -sha256 e8ad3f3de5baeff6bac6e711d8c406e0a6b8a61d2944741532d8965d893a2681 ofl/pirataone/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantupright/OFL.txt +sha256 cab4ad0d72d01c3e4d539e8bd4c1b4fca51718538db77e3802550a173329e617 ofl/linefont/OFL.txt +sha256 bfa22e938e1c9844e5126461e9fcd12315007cae3d9442e940e4ab322403ce9f ofl/lisubosa/OFL.txt +sha256 8742963604cd89dc81437811a850018fc03b2bfad686d7422c8235967c87614e ofl/literata/OFL.txt +sha256 ff56684b0212481e7c3886c26d5a655de9b211c8119e5ccc756138a97b066acc ofl/liujianmaocao/OFL.txt +sha256 0d0630b8fb51f80905ba9298e69ce7f3f0c080e019158b6aca469dded731ee1e ofl/livvic/OFL.txt +sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b ofl/lobster/OFL.txt +sha256 f46c3ea04f38ea73c0731d73dfba3d7361d4b38970feb31a3558bd1b75e0656a ofl/lobstertwo/OFL.txt +sha256 e88691a5e0a8a3f788f31db959701ec90a1d5e7505f1cc53c5663180a7d23c81 ofl/lohitbengali/OFL.txt +sha256 4fe81901e6f84cfce1145c715e931352a9a12aa7ac75cc193eb523c0cb0e5eb5 ofl/lohitdevanagari/OFL.txt +sha256 c87702d8b70f714fbefb554660e8ca57a43ef62a59089d11cbf0c6bd51d56928 ofl/lohittamil/OFL.txt +sha256 9551ade371e7bcb1f6d9959273bbf1fed3bdf398efb5c57cc1fd85d6a13e9e5e ofl/londrinaoutline/OFL.txt +sha256 819e3b25f9b50f12299a3db1638be3813efc6b938f2b86693a218d20ec4e3209 ofl/londrinashadow/OFL.txt +sha256 85b700bfba1250a6f8bdf930cd7113faf3d8e9dc52cd89eb98c3ac8a038a4aa9 ofl/londrinasketch/OFL.txt +sha256 66b5c49d384cba754806a891ebd52f2ca08dd05c0eb3c56170192da466a00a20 ofl/londrinasolid/OFL.txt +sha256 603546b7219a94bb59bf8294458194a5010119486354092b66a09a3fd61aeacc ofl/longcang/OFL.txt +sha256 1d9a970809ac804b582a6ce7f0ebc4e7fefcbfd7ff6299cad35ee656a21be716 ofl/lora/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/lovedbytheking/OFL.txt +sha256 aa90c61f2e9a4e55cc6fba56a8c37dc97921010bb4d6d1cf0377fd8f8982fe59 ofl/lovelight/OFL.txt +sha256 9686eb9a16c2f004dab33197b49645d96bad806621659819e36ad6924d405568 ofl/loversquarrel/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/loveyalikeasister/OFL.txt +sha256 d028940636b0acee45c302e6de8eee8e1ec66a6c59280a5f5f2b0c06a6681428 ofl/lugrasimo/OFL.txt +sha256 a2c9113a30ba080cec4de37032f54c5fb761c0c73c7ecba96f38555b4e1037d4 ofl/lumanosimo/OFL.txt +sha256 07384f69fe8c6045a0e9f05a689a966a4e086e604987d902d5647a0802996f54 ofl/lunasima/OFL.txt sha256 65f43260cf7e66b57ddca8d148384a6602e2c06edd389a8b3cf388045127b47d ofl/lusitana/OFL.txt -sha256 518962c41d4a5e96b0016bd8d8acc965413ea1a0102467e4955931e702b14a0d ofl/iceland/OFL.txt -sha256 2171558d2482764644a2f793696fa2e48c361730ecc87686b9a29082d6daeb10 ofl/khula/OFL.txt -sha256 d336c098ea798bf14de111cd90dff7d6bc340852405246511345d0f8564fe76e ofl/fingerpaint/OFL.txt -sha256 ea274e87939d38032b31fb741af75bff9fa3f8d4a8b652265f9e0ce1ad7e9f80 ofl/asul/OFL.txt -sha256 eb1992aec1cf892ec94ffc116d79b62c7cb03dc108141b94a57a4195d210b514 ofl/meddon/OFL.txt -sha256 9b584984f9db0ee30347391a76eff9c0a6b03dc450c3c6afe3757a2cb3a4db87 ofl/tajawal/OFL.txt -sha256 1dd84b611f4bed7f9ff9089e76a96337b187e6f283a4ab33bcb987f844f2c4db ofl/parisienne/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/hind/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpica/OFL.txt -sha256 de08ff7a460541753999b1208f1254f1d31f16b421312aca4d4b8179d997de38 ofl/aleo/OFL.txt -sha256 7706a84d7e49e2273877106334a1eded8ae89fb5839fb81e0f2bb27c846f667e ofl/lora/OFL.txt -sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karla/OFL.txt -sha256 0409c6582424508453ce41648067efaacf0c790622918493d8f1d934bc5329a0 ofl/bigelowrules/OFL.txt -sha256 9e2d92fb24b4a548ab030c509ba88267e224f2523728ee9bb35cf334811106bd ofl/exo2/OFL.txt -sha256 f480fd19e7018942ecaf460f7a4ab9ccee0aec579abcb07d559dbede913864c6 ofl/alikeangular/OFL.txt -sha256 6ea7a3ef1d07feb592693f3f22c26d0b09321ff81814292b49be99888d0da9d7 ofl/ponnala/OFL.txt -sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhymeexpanded/OFL.txt -sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveat/OFL.txt -sha256 adadb8d5d34fe2218dca0f4a4919a9b6f81dfaebb289e5446ac7b3063d6965e9 ofl/tangerine/OFL.txt -sha256 16741ac498178f645283cfb45b7a487b6d361b5de5730c5ea729f056f414f6b0 ofl/ropasans/OFL.txt -sha256 1e5bf8207a40678bc401e2e5456d0db1f2a183b550a30976b48dcdd6a4e4c46c ofl/caudex/OFL.txt -sha256 6f9e3a1c51f617e7b110862426204ec7a56d8c6d2f731373b5de6b8d069099b6 ofl/ebgaramond/OFL.txt -sha256 c2368518f12463a93cfed44e1460f36085dc60df06f415ee9b0319809987ccce ofl/frijole/OFL.txt -sha256 5f247fad3e8a86b6c0779dff09277047c1ce2b0b7580a1093347a8af755352ba ofl/sawarabigothic/OFL.txt -sha256 6627b9c2c8ff8e0c6ef23f1b0125dd5b293320c10c916d402fef64916c296d0e ofl/kreon/OFL.txt -sha256 723764a50d4e6985dfcbd75fcb40dbd3abab37ba25ae626486d4a32084854487 ofl/kdamthmor/OFL.txt +sha256 930fed5b06a415736dc3b4e5f4f01585523b672717564bf677f93966bcd57636 ofl/lustria/OFL.txt +sha256 b0c6f67b9ee530515e627d9909c8de84dfd30995a8c9802279beed28c740c4e9 ofl/luxuriousroman/OFL.txt +sha256 0d53601eaba9a6f5dbf7ee43e26edbb37ea5fb7f3f170052ca5dc8d51704a5ea ofl/luxuriousscript/OFL.txt +sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondo/OFL.txt +sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondoswashcaps/OFL.txt +sha256 e15f74b13b1a30c878f162b2ce10aff4668d0e8ec8dae41dc61c1c12aa6d9eb9 ofl/mada/OFL.txt +sha256 746b384383888d9325ed2fa9c40d2456b458aa190dd2b8c515ed4f02a1075bb7 ofl/magra/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/maitree/OFL.txt +sha256 616e75d879831bedfa7725c078e09bb56f8a17f40b194e16691b12251bb42b3e ofl/majormonodisplay/OFL.txt +sha256 5e13aac27147fa739af42e7314d48c7ed92d7986cb1fe5d84f32c09377ad8a7d ofl/mako/OFL.txt +sha256 bc1175730d609233043cde47e48f69831f012e85537c5ec1a2cf4836757c1540 ofl/mali/OFL.txt +sha256 8928e999ff156e35852ab41d7a906598a8285acd3bcd81dff67213a6cd98d43e ofl/mallanna/OFL.txt +sha256 1b8eef90c567309fef17962cc969dd9ed1de69176517238e744018bb983e7c1c ofl/mandali/OFL.txt +sha256 2e144823e28b854ff5e1d41db9a2180fdb1d8e44a71c2ae4fca5c4b2a5adde4c ofl/manjari/OFL.txt +sha256 e01b637272e0cbdfb240184dd98ea5cc671556d9894dae2668d92ab2c906787c ofl/manrope/OFL.txt +sha256 14ac0a5413a923c9ad11b6f541df17207fb7a0e0725e43eb29c88eb04c3ea2aa ofl/mansalva/OFL.txt +sha256 6f5869d0892d8c06cabcccce3726cacc849bd0a96b83bef5850402ab2b9fce71 ofl/manuale/OFL.txt +sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellus/OFL.txt +sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellussc/OFL.txt +sha256 f22a2beea88d631a620b15683fd03e79f13ad3297ad97fa5e42283c0b1a3a038 ofl/marckscript/OFL.txt +sha256 50f7b09af5ff677f611a96cdf5eb916307c59b29f2e8144942718cb432a9bf6f ofl/margarine/OFL.txt +sha256 096744f008d418398e0b72ce8d4c46f195c036600a7a48df256ac95e026a79dc ofl/marhey/OFL.txt +sha256 6e7f259edf178c70b2ee36acfcc934b76d1cd56bb58d2c8f2ab8b5dded8bd430 ofl/markazitext/OFL.txt +sha256 a345b13576140008a697ac66ca8c76cd63b1dd076712bc30a0f5e97dcc53cc83 ofl/markoone/OFL.txt +sha256 b0a0977df31de3ec1e62bb819c410feda2944bcdab999a9aac2468e715cc99e1 ofl/marmelad/OFL.txt +sha256 f177d98c67b84250ec87a03ca6ad161e84cab15b435e960039b971797a065f4a ofl/martel/OFL.txt +sha256 5641212407f956b828bf632afc4bbb3344f461f82255ab56756d9e3e8604c7b1 ofl/martelsans/OFL.txt +sha256 ddafd2c3f37ef1d83ef284ca63e159befd3820850c5e9eded14ca52eee92c256 ofl/martianmono/OFL.txt +sha256 6cca1abc09d677cf00a55674ce2775e0eeb6dc5c0137b0401816680b9e500f81 ofl/marvel/OFL.txt +sha256 d7bdb1cee215b689e23c2f95672a6084c790542170648267a55114103d756a08 ofl/mashanzheng/OFL.txt +sha256 171b5e77742daf0aaa952ad9a9fc4afd78b3f3e80170a49a510ef849f4b915fb ofl/mate/OFL.txt +sha256 171b5e77742daf0aaa952ad9a9fc4afd78b3f3e80170a49a510ef849f4b915fb ofl/matesc/OFL.txt +sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenpro/OFL.txt +sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenprovfbeta/OFL.txt sha256 846ce83956a732edd57b74d9ba988d58abc8c8e6d0926859559318ce6aed139d ofl/mclaren/OFL.txt -sha256 ba01480319f922ecebbc73f1a523e7f8876e92b16553a32c494bcd3f6f5a27fa ofl/ledger/OFL.txt -sha256 c3bfad2900a83f571d5c984d490d51c56aef14806c28dde38125593e1e71daca ofl/mrdehaviland/OFL.txt -sha256 12af42b715a3901bfa7add1351e45b6ce22f3061555d52db45e963274c349360 ofl/arimamadurai/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/miriamlibre/OFL.txt -sha256 3169e7e0e87168908218f11d660a52c0b81b5952fd73918a596e70721d68d3e5 ofl/inika/OFL.txt -sha256 e711c816f7de931244976f51166baa15446fc307e5d0ea04fdca1bc2c04afb1c ofl/nixieone/OFL.txt -sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signika/OFL.txt -sha256 b01cec9e5e2035b70a6aeb61c673d1f6d5c91539845be07733bd9880fddeb9f0 ofl/kadwa/OFL.txt -sha256 d7577acbab1d70f2e6bd1b21d8f61db189d6aabe6375bc2d96564b8d94031664 ofl/stalemate/OFL.txt -sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eatercaps/OFL.txt -sha256 ae6de2f6fc00f76cc7eb0d97c1ae5e0b7ec734f20ad7f58cf4c74738dc822d21 ofl/chelseamarket/OFL.txt -sha256 860cbfdc9dbc3f0e8d35af80c31e8f20945bff393d4f483dfc157469e01d321c ofl/gorditas/OFL.txt -sha256 9a2d8c5a3de0a6e62432322115dce136139948411dba33cd86525c0a02749fb8 ofl/unicaone/OFL.txt -sha256 4fe01b13ffb41faa8f030d84843a95dab32792dfeeca7c072abbfd3f4d6896ad ofl/audiowide/OFL.txt -sha256 173ea2d0bdda981829719623c35699e8c0e4aa508e0af12817ad7ccbfa4c6137 ofl/originalsurfer/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/trirong/OFL.txt -sha256 58bdc69f4c6177125c6e7cdbc78f710f5f9952f11bba7bd5b17bd7ef169d731f ofl/goudybookletter1911/OFL.txt -sha256 2950994bcfb8e903f0539d28a8ec4af077e0aa1fa7946c33c912d2d6969c2971 ofl/glassantiqua/OFL.txt -sha256 7344b8b8c97c4f88c0ff8bb72bb024bba72f404be1c740b6596a73ed15d28df3 ofl/vampiroone/OFL.txt -sha256 cacad5bf45bf5c81f4b6cbd114261bc8a08f6110b66a4c6fad8bbc16618a3096 ofl/daysone/OFL.txt -sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasanssc/OFL.txt -sha256 c8155eb9337078a9ea9f1e576ac813a03030ca43e2694593e90cd4fee6fce937 ofl/sumana/OFL.txt -sha256 95803fae1b063e592c67b5867f1f36df1df526e5ebf33c6cd4d4afa31a9d5586 ofl/sitara/OFL.txt -sha256 c254ae01c407f4a2bd0ad163e4c1a795d57ddfa8967c21b8a28c250b44d13963 ofl/sawarabimincho/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanon/OFL.txt -sha256 25995bcf8e8ddea1aafa5449870567cbbeae7e26b27ba30aca5642f2c02e9757 ofl/quantico/OFL.txt -sha256 455755e2e7ce9dbac6beb3729c97c57d6f74a638dcb5be548ec953021fbdbfb3 ofl/ntr/OFL.txt -sha256 ad6f73fa3edb7aea340aadbc63c0d7ef7663abed82664432ae09a6b377fa313f ofl/librefranklin/OFL.txt -sha256 581f08727777cb2a1a1ec95c0f981ce64fb1ad4354f78a0ac4f3481afa605577 ofl/moulpali/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangkhong/OFL.txt -sha256 08fdc7cbd92b9bbc4d41d0945ae7f25450d91c5fc8c66c68df331af3505e4ec3 ofl/rougescript/OFL.txt -sha256 694d5c15c1dac5e26653e18b94394d911e471549ec9b7d6247ade62e486b4915 ofl/asset/OFL.txt -sha256 bddfe669338d0dbc24c15ccd31dbf5c101a213da38049c24baca9ccb7fde45a4 ofl/wallpoet/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsansnarrow/OFL.txt -sha256 3cbf579238e4eacd90ad67883d971aa346ce8990d658635f78f98d608a6830a2 ofl/zillaslabhighlight/OFL.txt -sha256 87000f71a897c8c130c7777d058c5868f84316f99a32644b3bf595cd11edeb12 ofl/sancreek/OFL.txt -sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allertastencil/OFL.txt -sha256 9608d22ae5c586628c9904e773b7c6a6520fc16e1492ebcb5ea55d9523399964 ofl/anton/OFL.txt -sha256 f3758ee70600ecd5450f01ea373204b202e048d0454c9db2d1175c5a5dd1e92f ofl/vesperlibre/OFL.txt -sha256 e43f121c788cca4a14049e58864e28021174b055710ba38e0964e816dbf905af ofl/fruktur/OFL.txt -sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserif/OFL.txt -sha256 a1580ba69a8d706bd95e1e72ee0b5cfda0a478fbbab6a4af13b4a9e1b28faac0 ofl/revalia/OFL.txt -sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickave/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanonsc/OFL.txt -sha256 0836fd874230b17f840efcf7d3bb529f5a7b5befbfeef94478519cfe2d8551c2 ofl/courgette/OFL.txt -sha256 e3ed3ad6cb257e16dc1789900707c5cd1cdef2d60d155389342604991cf693f9 ofl/bahiana/OFL.txt -sha256 391ac3126dacc95b92a8f3408467879edb3245344bc411530a30d5aada52df92 ofl/gugi/OFL.txt -sha256 88dcde7d08e509a3eec64886292a36cbd58ed9bb52f37f91f55656fb9d21ddb8 ofl/supermercadoone/OFL.txt -sha256 41423e9e1d0ea79d0e78bd5fe9e0b27f4c23140706f5dfbfe116839c83aae91c ofl/charm/OFL.txt -sha256 43186c592361336474683e302dcc988831a53857bef188c4466f6b45dc238f84 ofl/fredokaone/OFL.txt -sha256 a21fa252efb7a1ff84de6a36df4386959668aa046f28161b4047829f7d9cd1b5 ofl/damion/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsancondensed/OFL.txt -sha256 bfc205682f5454b42a732ec857b665293ab8bc6f0ee901a0967219ba7ffdb190 ofl/gfsneohellenic/OFL.txt -sha256 59b91c9912b80714852a43897cbc9414d6457e22072dc99a4cea6e2bb4f3c65c ofl/freehand/OFL.txt -sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabin/OFL.txt -sha256 b598b7fddfd578950aa1fe6e0e2607b779abfaa686b83af8ec65c860f646b2cd ofl/rumraisin/OFL.txt -sha256 2bd35914efa381c80f9fb62d6ea7d736d3c0739196a3783c3122593c3408392c ofl/gurajada/OFL.txt -sha256 5625e91bd7c2a45c8b9f59106d587bd025470b462ea901df691defe0099621e1 ofl/taprom/OFL.txt -sha256 37d5360d8d2433689e78302a93cd88e9add8a2294046476625edada2d4328deb ofl/averagesans/OFL.txt -sha256 f8e2b58dd7a8c8e21e5d744b45876bce7e010a647c071c1ed42ff0e618d4ea59 ofl/frederickathegreat/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootamma/OFL.txt -sha256 09685e225ba9b697b2ccd2d4098cac5ecbed0679960605258a271af60749887b ofl/francoisone/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/himelody/OFL.txt -sha256 08a12877eda24767239f26b527bfce0c515efaf623c66da6baad92a6d5315e9a ofl/content/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/saira/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/delius/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/pridi/OFL.txt -sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/rasa/OFL.txt -sha256 4e66943af352059c059dd658774f25fbc831f1ad478f9f0890c06ecc2dd324c7 ofl/metalmania/OFL.txt -sha256 f5b03ea0b27c7f5afb9702771ee57679ae8ba6b471b6ba9e62d985d3256f1929 ofl/playfairdisplay/OFL.txt -sha256 593f0bc55c75b673772b378eaee314f128283745c4bb1cfdb9b8012a3b6c46fe ofl/skranji/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiagruesalibre/OFL.txt -sha256 14d28541780d90f6577bb7abcc6f005bf6969614294e75c82abb8758a696ad46 ofl/quicksand/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloochettan/OFL.txt -sha256 35dca6122235851d236bd861124f4a893d409eba021cd8c6a292a19df0f4640d ofl/codystar/OFL.txt -sha256 ab721b35816e470fb11619ad3705f75d08dccd0864505e3d782e94fd937f6620 ofl/allan/OFL.txt -sha256 d9cdb075679d15a99bab2a8541b9c4fdc71347502111fbe9affd1d462219d96b ofl/indieflower/OFL.txt -sha256 1313ae342eae4e1810304b6cd32f6815dd11b8e45812a2af98e58b6960684fa0 ofl/petrona/OFL.txt -sha256 1e4015251ca58d4f349b4ac930259c6f3d6381ce68f8b4b27d54d53f8f63f972 ofl/angkor/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averialibre/OFL.txt -sha256 8e28b778b6e1a7ff9ca72f4dee2d53120aa2856dc1bfd0be44307e365b0e45bb ofl/cardo/OFL.txt -sha256 a02e8715fcdf3325c474b7209399f50230897bfa828fe4eea2639ced1a1d574b ofl/blackhansans/OFL.txt +sha256 bcc0945e23c5ea0269327a87b443443a15d2867f4bf6791f3c01c32245880849 ofl/meaculpa/OFL.txt +sha256 eb1992aec1cf892ec94ffc116d79b62c7cb03dc108141b94a57a4195d210b514 ofl/meddon/OFL.txt +sha256 45b1f44d2cb859ea4b7be2f322c57b8ff7be55075c336744e62b5550cd0a97eb ofl/medievalsharp/OFL.txt +sha256 88ac81fcd30e64f6e6b91b61b159c9b700bb3dd59012b72ec61629abcfc7fba1 ofl/medulaone/OFL.txt sha256 d530c14e9cc263c567b47742ef20df2a41374f00732ba4f290f52adad428b1a2 ofl/meerainimai/OFL.txt -sha256 2e2fe5f1d8916a5160060594a96c1a5116406d26847afdbd09618481e2abd6fc ofl/denkone/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/megrim/OFL.txt +sha256 e12a3e737fa75c0ee072d965b6185710f35e38a4f7a0793ebc66ba14a216109b ofl/meiescript/OFL.txt +sha256 712916eb364418dc1d6f916bc504ac80be4e16d5e7126822fcf483f82f9ae6f6 ofl/meowscript/OFL.txt +sha256 131d19126a0e7ddd25540fd6bee219cebbc8aee7e8374882998ee6c2f4ff6cf4 ofl/mergeone/OFL.txt +sha256 61470db03bfdf0616932a086346acf8eddaddbdffbac9c468f0d88ac72ccb151 ofl/merienda/OFL.txt +sha256 a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad ofl/merriweather/OFL.txt +sha256 e07e715e58eb63bd8d4ccf2b2e7d0a5d3ef5d93f596431f6dc3aed42ac1a2304 ofl/merriweathersans/OFL.txt +sha256 2f871c2e81de6d0c72c981615002c30bc9f1637003d6d3d4c3f0149886b70569 ofl/mervalescript/OFL.txt +sha256 4e66943af352059c059dd658774f25fbc831f1ad478f9f0890c06ecc2dd324c7 ofl/metalmania/OFL.txt +sha256 6ec397700f08afddd3f46421e1a2fe59c5e3c1480183b1ab161793f1e901f159 ofl/metal/OFL.txt +sha256 4fece81b541808b40293b0cd3f5b1990274e1100e1c20455dc2987cd96639d3f ofl/metamorphous/OFL.txt +sha256 4eaa1fae0ddbce35cfbc42ec1079f7fd78e4146b1d322630600af07a1e3212a9 ofl/metrophobic/OFL.txt +sha256 6958d8c61b6b223f81bdc2109941e5d0004996dde61e197d628e0293f4f1bc58 ofl/miama/OFL.txt +sha256 33c39ce59a45bfb0dae3280e98bdb46be59d6d68efc62d4dc5fae90a26d2f393 ofl/michroma/OFL.txt +sha256 3997621a219c7758e31dbafdd3cbd2bcb0b6144a41d1ca068d04dbcc4bafcde6 ofl/milonga/OFL.txt +sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltonian/OFL.txt +sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltoniantattoo/OFL.txt +sha256 d2875ded3e44e9ae53ea2b35e825dafffa19e82c5d14addb9f1150fcd7a3463d ofl/mina/OFL.txt +sha256 b632b20bfdec8a8b1247cc8624c4954641db3f1def485b91c91ec1590478e693 ofl/mingzat/OFL.txt sha256 56c4ff36faaaf336bc5fee659ff6fab2413d67499cc22acc29079b3892d8931b ofl/miniver/OFL.txt -sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondoswashcaps/OFL.txt -sha256 742a6a4386db47a2987c7c3b4aeedfb5adedfb3356c118de450a664735686535 ofl/graduate/OFL.txt -sha256 9e53298e3629e00ae4c31531cca09051ddaa654a5de4f7b55e596132fff86e1f ofl/dhurjati/OFL.txt -sha256 df9fcd8f62ae79aba7fa5b0563a08dfede1fa0909d668287d70c395d88f5fe02 ofl/fjordone/OFL.txt -sha256 02faa476b17db0044d0c502a3ce12fdc81eeeb9bd618e6a005407c79d6081bbb ofl/monofett/OFL.txt -sha256 1edecf3f971a11dcfd777cbda6f08c0f9a77bf57a0a2a89d8142fb933894ce16 ofl/amiri/OFL.txt -sha256 6e6efa9b0556d100cfe60690cff5d9be7144df77adabfd2c278dbfee451351ea ofl/phetsarath/OFL.txt -sha256 2348c4852e6322105d130aa2addbe24c962e330094ad6dfbfd9fbd2281d76b0b ofl/bellefair/OFL.txt -sha256 3bbcf1617d93d3a949a10da78ae91c58be536fb04567ab4b5b9fd207126f1db5 ofl/buenard/OFL.txt -sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/dosis/OFL.txt -sha256 3ac1301549523d9861fedca12871f24e575fbd26d520632fc00ba849b471d275 ofl/russoone/OFL.txt -sha256 44b51296985184d9b27fc2c8e5b317906c5d65d9dc834e81c07902d3e5e1cf1a ofl/brawler/OFL.txt -sha256 afb8c471158619593df0fb501453bd39fda42396e2cc3911e2a0a471c11b863c ofl/sarala/OFL.txt -sha256 de985adf63cff6b1bcb7c5cb55f1c5850fb1d36289d20a0e26d97a281bfcf956 ofl/aldrich/OFL.txt -sha256 194e25172d0144f29aff4b6fb2931ff0be0139448a5cd867db37863c9179330a ofl/stalinistone/OFL.txt -sha256 ae05f8781a5ef38380ef3efe8cad86783610b6a780c6c278d7472f95310fccee ofl/oswald/OFL.txt -sha256 2dab153a33dcb2101bba3f194d27d953c848a0fabf2e336650a81f84a0c33b3f ofl/pragatinarrow/OFL.txt -sha256 9d61931b909f9a738964f8fb311eb8fa40dba1ef9f1688b36039ebb15ee1805e ofl/questrial/OFL.txt -sha256 e315abc82a78710c7242e2f2e6529651fd631d4d50e6ad98ea194f9b54c3d701 ofl/alfaslabone/OFL.txt -sha256 4653c63a4bab99aa50de5190853fa21ea6c0a25d69d49f5a42cd51f0f67665e0 ofl/boogaloo/OFL.txt -sha256 bd8323cd1d2b6bbdfbbf99cb41ec1156d0352ced170de4aa3a96d95e6e20bf5b ofl/amiko/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/sueellenfrancisco/OFL.txt -sha256 ed93e9833f18acc2775380a28139fd88d3ebf82df7cb814042498467be3463bb ofl/lemon/OFL.txt -sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/itim/OFL.txt -sha256 fa28ba897eb819768d6bc00c30aa03ef560e80e5f6fb872eaea089c66992f502 ofl/notable/OFL.txt -sha256 96199bf9ff12dd471a66911dee95440737b437e7f5a6fd30e9e950c16d66e8df ofl/unifrakturmaguntia/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/judson/OFL.txt -sha256 ad4f6ede2e8a017255822a6abee8d10717f1d34c20223de80285ff59e28a1cba ofl/bangers/OFL.txt -sha256 f8779e6871bbab04e0a1ddd9997f4d8173b56792a1e7f8b9d691d967a49c7dc3 ofl/andada/OFL.txt -sha256 49b9214f7b40024abec2fc89a32bdda380f2174ba7005d7636e6ea340157c5a6 ofl/jomolhari/OFL.txt -sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612mono/OFL.txt -sha256 5eca89cdd576df5e4b7c694e0425b126a9ca839aa067df85fab33904a8187076 ofl/amaranth/OFL.txt -sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenprovfbeta/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/miriamlibre/OFL.txt +sha256 d1bf0acea511ad1f4de53e942cffb8ab0e67c03c6203d6f390d71105d52c33f0 ofl/missfajardose/OFL.txt +sha256 76be26178f13ef82866cf6a5c54272191bb583c203ad7035021c7681c9043558 ofl/mochiypopone/OFL.txt +sha256 76be26178f13ef82866cf6a5c54272191bb583c203ad7035021c7681c9043558 ofl/mochiypoppone/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/modak/OFL.txt +sha256 3e908f3a95680bdf3c8456bfbf76392605b34cb3fba109e46441056ab966cb35 ofl/modernantiqua/OFL.txt +sha256 039b820470ad522dc92e98b3aeaea5d53f7e19a1e9d0248ff5df00b426868aa0 ofl/mohave/OFL.txt +sha256 0f2daa61cee069893d44ba24f3bdddbba18ac33b011fd8944e8682dbf347c61d ofl/moiraione/OFL.txt +sha256 4dee45deee99672fbe342b2f4b7aa75b0cd12de18a68f9732c77f096bab47e0e ofl/molengo/OFL.txt +sha256 af9b97696048d509e3d70f8108b7c4381084f95c8fedd97acaa76b0b287668be ofl/molle/OFL.txt +sha256 6ccb3c94ae8f9ddf4954c8981a1a624204087e940b941c580d3738f8c09de9dd ofl/monda/OFL.txt +sha256 a6695ce9e8a5a86bfa3a55b65c3be569a0eca8dbf4c38bae323ac2433008916b ofl/monofett/OFL.txt +sha256 0e7bc933f607a0fe98e2635cef0df76dc9b6a0198a7a7ad035e8a2b8d329e137 ofl/monomaniacone/OFL.txt +sha256 585c6d2da8bcd8ffa651e0016f2e992a6891b625143a46a1dacf00699a817d9a ofl/monoton/OFL.txt +sha256 a5fc033225d145b43fd7391482ae7689825414ce29a01614d651a3012b57c81e ofl/monsieurladoulaise/OFL.txt +sha256 cb8bbf7a86eefa8c146f24ae5be74fffa887ba83719ab3c87036be8e3d0191e2 ofl/montaga/OFL.txt +sha256 3b00031e7de1fd7d8cce0a7a4638a38a8988e16a8950210ebf8e57f688b14c4d ofl/montaguslab/OFL.txt +sha256 1431e4458b02d3fba371726627ce93269fc26440cebacdf0c4965ea4a3cb5cb3 ofl/montecarlo/OFL.txt +sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserratalternates/OFL.txt +sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserrat/OFL.txt +sha256 c54957d55e7c9e66c28e474cd39de75dc044e8f69056788cae44eb78841ceef1 ofl/montserratsubrayada/OFL.txt +sha256 3cd47b38fdc04ceae502892dfa59788e57a27b73a4cd2d521d660c76298b5853 ofl/moolahlah/OFL.txt +sha256 12c5c11cf37c77a574ef3964fd27f117aa1e1dc4c1569b723cfe45c3d474306e ofl/mooli/OFL.txt +sha256 8e032df9af3acefbcf2c02d5a868ecaf2233005014bdb00caba05c14dd279be5 ofl/moondance/OFL.txt +sha256 993860a6b21dbb0eb98c7e07490f07d24c919d4ad4fed04a1b34f1663d9d53e3 ofl/moul/OFL.txt +sha256 9268f8a3b23f0ab8ad964478b4ad5e0ac534a4835b8409cd208bcc846d096bef ofl/moulpali/OFL.txt +sha256 81d6c3788a6b641cb9f543389d9d5c0cd3bf94fbb5639be19c102b9274c34291 ofl/mousememoirs/OFL.txt +sha256 04971e3fcee60b247395150d93b3616f6a0b092572332c96187b472976553abc ofl/mplus1code/OFL.txt +sha256 04971e3fcee60b247395150d93b3616f6a0b092572332c96187b472976553abc ofl/mplus1/OFL.txt +sha256 da15da6b1496d4de18f97e2ad1b722ef8a1c121149c2c93b2cf7eac6ac27b35c ofl/mplus1p/OFL.txt +sha256 04971e3fcee60b247395150d93b3616f6a0b092572332c96187b472976553abc ofl/mplus2/OFL.txt +sha256 04971e3fcee60b247395150d93b3616f6a0b092572332c96187b472976553abc ofl/mpluscodelatin/OFL.txt +sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedfort/OFL.txt +sha256 0da6a3e5b24a9fa04085c20a2a1d3101eeb1e0bff56a2291f407187e1b2adcf2 ofl/mrdafoe/OFL.txt +sha256 c3bfad2900a83f571d5c984d490d51c56aef14806c28dde38125593e1e71daca ofl/mrdehaviland/OFL.txt +sha256 f354ef1e7256644b320c5e1d9a07a819c2e2b930166003c96680894f9fba81be ofl/mrssaintdelafield/OFL.txt +sha256 967d75b89eef1f8a0ba1f5ee7dfb13427621f9116c6e7878ca04da8c9aa8641b ofl/mrssheppards/OFL.txt +sha256 1f3ddf9e7c9ac7445b046a89d9b420fb4a3861f1d62091a85357179db73ebd12 ofl/msmadi/OFL.txt +sha256 46751a31966477e3f038d1e5ff1146a33234a3a523a0e6a21be3221cba082a34 ofl/muktamahee/OFL.txt +sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktamalar/OFL.txt +sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/mukta/OFL.txt +sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktavaani/OFL.txt +sha256 097e9ac414d9251c8580c073a13f8899798c66db746de60662148789ca693f19 ofl/mulish/OFL.txt +sha256 7d9f69e9be971aaa0caf64555545b3d34d23204d53ee88085790866ee21c75f9 ofl/murecho/OFL.txt +sha256 a1da98a568fa3e62fbf76b7f4d735da7da0aa2ed055600937b15356bab5ff118 ofl/museomoderno/OFL.txt +sha256 b9d592c3bf421197d9b7e353416b8e2ec81584988824b43d38c86d997a08b868 ofl/myanmarsanspro/OFL.txt +sha256 b4f46a426751128d9415c0b36a3a652dd21a116039e5926ac1890762a223713d ofl/mynerve/OFL.txt +sha256 5d9c0715f247ead158013109a3c7a053d044ab58d74cbae50594f648189ac550 ofl/mysoul/OFL.txt +sha256 965bd2c907f7bb6f36da4f85e83f29aea8b2f720783deebd7ed7b40678e67672 ofl/mysteryquest/OFL.txt +sha256 999d3ace5ea7f04761689794a9c877b0a5fc8b22a469518ffad78b4facb2e61b ofl/nabla/OFL.txt +sha256 d3474845766e4361040178d2ddd0683efbd7117b4faf19ea99fc1574ecc51e7c ofl/namdhinggo/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumbrushscript/OFL.txt sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothiccoding/OFL.txt -sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extended/OFL.txt -sha256 3670ddaf348c62ada22a2f606158dedcd9ca5fd5422a6173d6593204a8f53d4f ofl/varta/OFL.txt -sha256 ab592d1abca19428b89d851706fa7815ec25139c6affb45d366577ca63fb91b7 ofl/yesevaone/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothic/OFL.txt +sha256 8eb1c1019fe7fe6d0b6e7d7bbbba1d9cbdd969d8c5f26455708f6cfb8a77284c ofl/nanummyeongjo/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumpenscript/OFL.txt +sha256 1bd2ca2cf8853076508e6cd1bb187541b52fc24f80fceab5074b32229dd394db ofl/narnoor/OFL.txt +sha256 c0a7efe98e77cbfcf1a5ca43e874e25cf53d9185c56295bc3b5c407f95dae638 ofl/nats/OFL.txt +sha256 1b6b1362683d5bb1f864615e723b4323a3c05de5dd020e0e448546135bab75de ofl/neonderthaw/OFL.txt +sha256 dc7c4ee52985271463f5ad27e06e87a5c5c9de1f9edd04d5a9ca7b76486fc2a6 ofl/nerkoone/OFL.txt +sha256 656a20870fbcb8f559f1c6308c1df90ac93d7cd0279aab49b43a43b5e58534e6 ofl/neucha/OFL.txt +sha256 636d62f04d7bda9fcf9354f258f6244e7e18288cae036b95122e204f1acbec80 ofl/neuton/OFL.txt +sha256 942d51cf079299e83e9dd7a9a37eb92260524e8d1d576b2f0b3f7ca207c53f8e ofl/newrocker/OFL.txt +sha256 7729f005b7a087368e2cf61fc4b65cdc85988e47d0e6e38c93a72de345e86b41 ofl/newscycle/OFL.txt +sha256 fdfad38143ec470553cae82a1e45320bdd1b9ec70415d37bd0171051d8a4ded8 ofl/newsreader/OFL.txt +sha256 448df04b698cb1101857b61c7d1b4187beb59d3a0fb5edbd834d308758cda95e ofl/newtegomin/OFL.txt +sha256 6aa923334ec515d26b1a61bb978a0bb5bd8884de7529add1625beef2f4a53f74 ofl/nicomoji/OFL.txt +sha256 70f664de65e7bb62e1ac728f20a9bb28de7fdc18be594186137a9e15ce9dcee5 ofl/niconne/OFL.txt +sha256 f9f28345ffcd6cea6e3c6699e4579cd1948053d80fe89a6a5a2ecb269afc95f8 ofl/nikukyu/OFL.txt +sha256 513346ac60af1dde9d4a7bcfad3f39909d5697373a8aa1a6ee4376e6d22d3cdf ofl/niramit/OFL.txt +sha256 e711c816f7de931244976f51166baa15446fc307e5d0ea04fdca1bc2c04afb1c ofl/nixieone/OFL.txt +sha256 9465823369fbe1ae0b5a3065021d53ef8c56e113e664229455dc80b237fa6a07 ofl/nobile/OFL.txt +sha256 3fe944228254901b015c1c39178dac2e4217eba07118294b84dca34d28d4b2ee ofl/nokora/OFL.txt +sha256 b7ac0199d926980457302e0486f9561c61c0d2f84f3ba170fcd8e0f9d3956a4c ofl/norican/OFL.txt +sha256 4f8b437578b20bff261adfe6c02f63bcf7dbb6a45ab37804b3547e5d5f44927b ofl/nosifercaps/OFL.txt +sha256 b41b99f35b507564e54f6b2f5162ad1c21f94a16837c632da6632b376a341f42 ofl/nosifer/OFL.txt +sha256 fa28ba897eb819768d6bc00c30aa03ef560e80e5f6fb872eaea089c66992f502 ofl/notable/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/nothingyoucoulddo/OFL.txt +sha256 f2ab7e5c5c750fa03a8d8f64c72a089ed86fbd3dc172440fcc704b27816d5957 ofl/noticiatext/OFL.txt +sha256 531b0954400dc0026fd55302be06c665c895d2795819d1d18a642652afee1a7a ofl/notocoloremojicompattest/OFL.txt +sha256 ac564676d10054a8445923dfc2dfb13c042d97888bd27c1b6ec6dfe89a9d8d62 ofl/notocoloremoji/OFL.txt +sha256 500bb1ccf43df7bbb522112f9133a52b16e1c35e809632f5d8609b179152de5b ofl/notoemoji/OFL.txt +sha256 2481cfe088b756d7e841ecdff6e3ec6efa9486a711b06a74a464f3fcc986e0ef ofl/notokufiarabic/OFL.txt +sha256 1679cb60544990b4c2445320c6d5298e4bb0c08ff00dbb5a526f3793fdaa1e6f ofl/notomusic/OFL.txt +sha256 07fc70bfeb985cc1a87a8587d0a0c80bab11c86c9dc3fd95b6f0cb332f983e96 ofl/notonaskharabic/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notonaskharabicui/OFL.txt +sha256 e90279e3fb2003c4d54f8685e25274bd7838b1b21c891520d71dbdb1d4a98907 ofl/notonastaliqurdu/OFL.txt +sha256 9b9fe028b5ba74d231659a1bbaf0ed09b11e759d1ca6a070999e16d151616b47 ofl/notorashihebrew/OFL.txt +sha256 0e86b3990089b054d8e6a29520589ac7ff3926738e2868e20d1b7f137d337d14 ofl/notosansadlam/OFL.txt +sha256 0e86b3990089b054d8e6a29520589ac7ff3926738e2868e20d1b7f137d337d14 ofl/notosansadlamunjoined/OFL.txt +sha256 38a991a0d87537daefe1a2332edcffdb599bf9670533badbbfc98f881b8f817c ofl/notosansanatolianhieroglyphs/OFL.txt +sha256 07fc70bfeb985cc1a87a8587d0a0c80bab11c86c9dc3fd95b6f0cb332f983e96 ofl/notosansarabic/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansarabicui/OFL.txt +sha256 0468358b316f69f405b55cadf8a8314e16e3610b8feaad96772bd5d968112d02 ofl/notosansarmenian/OFL.txt +sha256 3554a83d7ac9f12aefb36a548e6c88fe1a71711d5c57f86001305c78a5c03152 ofl/notosansavestan/OFL.txt +sha256 11bc477b31ec9e66f86bf6f64c060dde84b34ed49582d881657b472c33c4e1e9 ofl/notosansbalinese/OFL.txt +sha256 3dd4cce0a3d3405f7b690bc10bc2c78f2d2feb448c8f88b604bed2f33892d892 ofl/notosansbamum/OFL.txt +sha256 287edd17552fbfffb8b695582889adad29672599d654cf53d820aace29208256 ofl/notosansbassavah/OFL.txt +sha256 ff0723191d946fd4c7e53effb67b3b5b25b1c3f3aa85f5244230fa2580a8fc1b ofl/notosansbatak/OFL.txt +sha256 754f0e221aa7d5a915489f3bf1f20fe53ddc35ab2834a4d91656d78f9622de70 ofl/notosansbengali/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansbengaliui/OFL.txt +sha256 55acad617cc72f630484d7cef2c12074a818df03eea7d89d6d595c663fc92fc5 ofl/notosansbhaiksuki/OFL.txt +sha256 46d6caa05a24bda40dd8c1d073c3857b69738b856a8b644238104a62bf2cd6d1 ofl/notosansbrahmi/OFL.txt +sha256 1b63982dfebd74eab553a4aa303bc18811d9f136f82e20c37df7262ce3125bca ofl/notosansbuginese/OFL.txt +sha256 6c127a87daaa23faca73b3607879fe6f86799e3948d07275800b54b805610294 ofl/notosansbuhid/OFL.txt +sha256 507cc466e43d021662b9e9320a55a81798d293ed6a4a80c8d519f917bd90fdeb ofl/notosanscanadianaboriginal/OFL.txt +sha256 8d161a6467a3b032c852f311d23a8df336d2152ca9e4b236c8b6e2ed49199068 ofl/notosanscarian/OFL.txt +sha256 9fcb74e139ee491def8fd25fb9a651310594a0dd232616030fc8d304a7c9d0c0 ofl/notosanscaucasianalbanian/OFL.txt +sha256 4f95be0c30353cefed3d98051bb6762754893267ddbe123783cf92e8aa6f787f ofl/notosanschakma/OFL.txt +sha256 dcbc971844d8db052a5fe3adfb8bce4e56788986fee96f9c7bfbf56ef519b9c9 ofl/notosanscham/OFL.txt +sha256 d7f9ca0cf1b9bcb7e94697bce31b2ec7a5571c51deb8f1f2f411ddf9a67859dd ofl/notosanscherokee/OFL.txt +sha256 9154669974b25a4694c515f835bcc6a354291df78a57fa167ac8b3946a8c2ce0 ofl/notosanschorasmian/OFL.txt +sha256 322570ceef6e9935b2422470682e42481903eb444fc416455c32c2c3c888c78c ofl/notosanscoptic/OFL.txt +sha256 83e16aed35737ea80911a82938ad4bfe762fde24928010c2c80d21ece07bec14 ofl/notosanscuneiform/OFL.txt +sha256 18f3c4770aae15b8f60a8d4e5a7d7e7065fbcca195d6fa8ca23fd10374647b0a ofl/notosanscypriot/OFL.txt +sha256 d3350b235b681746db9ca902f656cadf122769738f3cef76bc999df7d52bbd77 ofl/notosanscyprominoan/OFL.txt +sha256 cdfc75eeec8b7d71279b2412798808f2b7c5d70fe672ad624c3418b58ccd1c42 ofl/notosansdeseret/OFL.txt +sha256 a216f6f8d85c7228093e0ee5e258d9d377e6671f68acb4db1930b29583d0f331 ofl/notosansdevanagari/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansdevanagariui/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansdisplay/OFL.txt +sha256 b1b12c372165b0a2cf7533c7fa8b6568b8981d2e207a15d7bf631bd1910c4fe0 ofl/notosansduployan/OFL.txt +sha256 dc8114a49f5bb53bad3d99ee52cbb245e98076438d59428a258720258494de68 ofl/notosansegyptianhieroglyphs/OFL.txt +sha256 6abb98eea47fde30d4d334fc50f1ee26048e77f1e7f66172c682df8f8fd52a94 ofl/notosanselbasan/OFL.txt +sha256 bdfb572fad1e0d80331b02e52d9f2184a4e5b2b3991427eff95c1d816fbd2a77 ofl/notosanselymaic/OFL.txt +sha256 72606b23f312cb25973958f2892d4d2c2012deabadbf0f763232624a9649fc69 ofl/notosansethiopic/OFL.txt +sha256 8c02263c5d73d40544f9ed91e30c4e947407057a3cc430d7b786189aeceff6df ofl/notosansgeorgian/OFL.txt +sha256 246cab0cc2102b5f601447ab1d48f79d2ca2b23cc72ed7968efcbaa9bf9cccfe ofl/notosansglagolitic/OFL.txt +sha256 f7107137477d250fc49410833110c25ffd8b96a78b1a25e1f1b967e876070949 ofl/notosansgothic/OFL.txt +sha256 57ddd5a347bbe5f83d47a5a63679af4a3eb7f609f5a3d5c059ad12fd1fa29e21 ofl/notosansgrantha/OFL.txt +sha256 c0b88977aa18b5e4fd05d646d560da89fde61b6581fa4507cb00dd90bd1bf7d4 ofl/notosansgujarati/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansgujaratiui/OFL.txt +sha256 08143215e0afaca5ccf91aae3f575029f918b9177d5bc18e0c49dd838a5ba5f4 ofl/notosansgunjalagondi/OFL.txt +sha256 3f7451b7e2c8381be0c5712f7b0dd5c2d75fe787ae16a99f18b7fa45627a0fde ofl/notosansgurmukhi/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansgurmukhiui/OFL.txt +sha256 addc4a900f32e670a401766f144d6a1fc1bc7dffed87350e310ef1d68ba404f8 ofl/notosanshanifirohingya/OFL.txt +sha256 1d243377ac4633a4b10bb66cc07695c8432e93a611433fb5e91a2009cbd2616f ofl/notosanshanunoo/OFL.txt +sha256 910456012f8244afa9af0d21863a0d637e62b20af4d935350b8635c9664860c0 ofl/notosanshatran/OFL.txt +sha256 9b9fe028b5ba74d231659a1bbaf0ed09b11e759d1ca6a070999e16d151616b47 ofl/notosanshebrew/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notosanshk/OFL.txt +sha256 965a8053ceb55292d06262810224e7e283015545a73bcb0e0c5931bdcc982aa7 ofl/notosansimperialaramaic/OFL.txt +sha256 5bc7346cabfde1fbca124566f67198f154d5d356e022639f2406f087def374f2 ofl/notosansindicsiyaqnumbers/OFL.txt +sha256 0e246b748c637c88e8e0c34d5c1d27fe46bf477738653e46055df5c015c24ded ofl/notosansinscriptionalpahlavi/OFL.txt +sha256 34db797c6a8f7bba182a70971aa9191af6265864ec804339f7a4d2a05afed33e ofl/notosansinscriptionalparthian/OFL.txt +sha256 8a5665bd3b16a64f953b24a71f12e298f5233be8a4ed17424129c5524a397892 ofl/notosansjavanese/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notosansjp/OFL.txt +sha256 319dab1a833d34ed8b4bedcb9076c53bc0c9e5bc48c011b93eb294d3631d6d65 ofl/notosanskaithi/OFL.txt +sha256 9d49a4e56df9b36403b139f48bf07fd87cc5e716cb3203c54b04b674adb16238 ofl/notosanskannada/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosanskannadaui/OFL.txt +sha256 13a37d6fb70d8c4c04f2b8452731029208427934ba4151dd1e8221f006950e3d ofl/notosanskawi/OFL.txt +sha256 e053c471ccf7602350e2f9f77bb479dfadc040173ce4e50309dba9ce1ae7e09a ofl/notosanskayahli/OFL.txt +sha256 b3928e46f902b1d6d7108c8e9d5c08599b1c5c3e02bdec8a2e21a184c9a19e13 ofl/notosanskharoshthi/OFL.txt +sha256 be0407f060aea48787ff9e75d8d3aedef70aef113b3ce9aca26fdaacd10b1870 ofl/notosanskhmer/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosanskhmerui/OFL.txt +sha256 82ead5cfe70167960007329171dcffe99886373b3159619e596e84f08890234c ofl/notosanskhojki/OFL.txt +sha256 fc41afc2ff35b773da629641500b5b99d8243f121571c10b54cceabe516330b3 ofl/notosanskhudawadi/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notosanskr/OFL.txt +sha256 a42993999944845fb5af693ea678a372a053db1f0981d55e911dcfa9d330f279 ofl/notosanslaolooped/OFL.txt +sha256 a42993999944845fb5af693ea678a372a053db1f0981d55e911dcfa9d330f279 ofl/notosanslao/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosanslaoui/OFL.txt +sha256 d6a4fe388105d6738b6f56eae2b43368a58e6191d5d62d9e9440b38b4d32547f ofl/notosanslepcha/OFL.txt +sha256 9745259e135d9de74a122c6498a830a1e45c59b75677821f42e11691e769deec ofl/notosanslimbu/OFL.txt +sha256 a67a01aefe12fa20a386b1dcd45b36a82b9c71c27cbef6b4b359ff9c9a816ded ofl/notosanslineara/OFL.txt +sha256 bc7112fdaa4a03fd869deca0d0454cd34fa575663a194cec9578da5489f713b3 ofl/notosanslinearb/OFL.txt +sha256 1f65bfdc26d6bd6e57249c60a86ea355761fb9150694e50206175d3fa8d3c166 ofl/notosanslisu/OFL.txt +sha256 43ade220daeb7c8f610c4ca136304710e4eb910f64627d6010ddf9fe2fe18cf8 ofl/notosanslycian/OFL.txt +sha256 3a4d46fda7223bbdc698882822b43b3650432f8895b9b62c7f01bbf889990aa0 ofl/notosanslydian/OFL.txt +sha256 3c695b36fef73588d0a192dad666b2956d15582f66289a85a3d55705e4cd454a ofl/notosansmahajani/OFL.txt +sha256 1df18163a0bf60f02131401ba1609df90051f40c4047684dda1c8a2e9586f7f2 ofl/notosansmalayalam/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansmalayalamui/OFL.txt +sha256 0a3a51e5b087d142502e86b8003f78e82ed7bbb3f232e8d45f202591b29dc119 ofl/notosansmandaic/OFL.txt +sha256 b1d3bb52a18917b0fe332721a4cd438d601fe9439d4359e36cc33d90c29c39d6 ofl/notosansmanichaean/OFL.txt +sha256 60359568c6c75e3337f971f8af1d9d025d111d001707206b1fb1c64017378ae5 ofl/notosansmarchen/OFL.txt +sha256 4fa8727beab4099775b4e6e67a636c423755679e54bc23208e323897e1f34e88 ofl/notosansmasaramgondi/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansmath/OFL.txt +sha256 4ea975c31fc83692252a4c19382bbd539e7a06afa2eaacdad4ef433132cf64bc ofl/notosansmayannumerals/OFL.txt +sha256 47755a5e817c401cdca376815aae527195d333688277cce00a542b83ed532fa7 ofl/notosansmedefaidrin/OFL.txt +sha256 5dbbaac416c9c5021f3409d1157419c0bfe5089ef39a373c49a632eefdc639d8 ofl/notosansmeeteimayek/OFL.txt +sha256 e87457c702ba140cd0c6b319e75eac02c1e74c80c2f522cbc7b9ea5315b98ecd ofl/notosansmendekikakui/OFL.txt +sha256 1dfb3d4b1c7a31bf3de390189cf46f30eef4a45f43523437d09c1339e6b3a194 ofl/notosansmeroitic/OFL.txt +sha256 8d8b751f6af44eae099f1debc858a93646e88d9d6a0a43573e9785383fcb3bdb ofl/notosansmiao/OFL.txt +sha256 fc8470520ea4c92c2430e6cb57b6d92bc1aabff954292ce8f20db2c5465d4a25 ofl/notosansmodi/OFL.txt +sha256 b0158b3c0b16c20e22ea662850503a7980111c5c704501e942cc1a7ed12dc011 ofl/notosansmongolian/OFL.txt +sha256 cee9892f9f0cc8fe882c9e9537ee6a89621d86ee7ceaf70b02e2b2b1c25c061a ofl/notosansmono/OFL.txt +sha256 4db1c3aa73647bb9ad9b0137917e3e335ed1e7286c1764db707e3f5836a766d1 ofl/notosansmro/OFL.txt +sha256 a1b3ca46173087cac8b37010a23bd72edab3fd104ea8ef6cc0ff282078df52e4 ofl/notosansmultani/OFL.txt +sha256 246a75859267af7da466823969d2e2b407ed8455ee5f74f4c8d63d8783be9b57 ofl/notosansmyanmar/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansmyanmarui/OFL.txt +sha256 d1d3fa924183e4c4f14d17fd5bdd2b1ab3e433c898bb2cb6074b5cf331c22485 ofl/notosansnabataean/OFL.txt +sha256 76011376f7892fb18a4eb84f662483b112270a1dcf0be20d4041ec19490f6fd2 ofl/notosansnagmundari/OFL.txt +sha256 1b03662d65f124e6333ccf45d389154e42028c8eee158b28ccba7ce344723b80 ofl/notosansnandinagari/OFL.txt +sha256 39b6d4531cfac5e6004bf5f34668bf1ce50ef3b1f2cbe0b2ecc432949a45c6dd ofl/notosansnewa/OFL.txt +sha256 c689158356ee339a27b56c95a802dc5980b7d654586fa44b5ccdd3d5c7230c2f ofl/notosansnewtailue/OFL.txt +sha256 ddddb5913f75b8f4af1e50386b5ecdfa909b58685994f120b116a3ae5a1c8c48 ofl/notosansnko/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansnko_todelist/OFL.txt +sha256 ddddb5913f75b8f4af1e50386b5ecdfa909b58685994f120b116a3ae5a1c8c48 ofl/notosansnkounjoined/OFL.txt +sha256 1cabb5c007be074c36e1a390b591265c31fa910d20d73af57e13093928f8cac0 ofl/notosansnushu/OFL.txt +sha256 cee9892f9f0cc8fe882c9e9537ee6a89621d86ee7ceaf70b02e2b2b1c25c061a ofl/notosans/OFL.txt +sha256 d5e3e9b305ff13448c11cb348dce7f180eb42c961a53325c1339fdeeaec4e239 ofl/notosansogham/OFL.txt +sha256 b30754bbe6bea30b666a60d513ae80435a197979c9500e8380f83acd99dc763b ofl/notosansolchiki/OFL.txt +sha256 8b78300a14978656a55fac2ee73466ece7d6e9e9d8a4ba770f81ed92f3ec8af4 ofl/notosansoldhungarian/OFL.txt +sha256 9c4cef96698c8ecda3a659bd973b4880420afd9e105731e30631d62a0a75a482 ofl/notosansolditalic/OFL.txt +sha256 5f57555b16c41ca7ff067efefdb3eadfcb601d3d96263f5ba13ac017c770dc1b ofl/notosansoldnortharabian/OFL.txt +sha256 368ec41388919a8214a906db7ab1491a8b3588b81938d2c33225e607c8b5c564 ofl/notosansoldpermic/OFL.txt +sha256 002443fcdf6acb8cf7467b678bfba924396bbd47c64522500a48ba86fdc295d3 ofl/notosansoldpersian/OFL.txt +sha256 16ed6acd7df2afc8c37ef5bc269bcd17f8ef4878ec2ca4a7fe507660b3bdeb62 ofl/notosansoldsogdian/OFL.txt +sha256 22aac2446e3aa2fb1e02eb6aecde823aa7e13e3fbd89ed3bd8595905e1d37671 ofl/notosansoldsoutharabian/OFL.txt +sha256 7a86be07750ab3c83800ca157a5fcb7fb5642fdee16c4b5e2a8d75b9d8ac622e ofl/notosansoldturkic/OFL.txt +sha256 c90ff15ade263a49148e35af34e9c177c6d56881e81260b29f10123e9e227eca ofl/notosansoriya/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansoriyaui/OFL.txt +sha256 46683544b3fae35c1716ad6deead57b7363edfc369aabcd8d159250e3fce57ae ofl/notosansosage/OFL.txt +sha256 a912228f344a47ecb6e7f00c96f70a62033e18c028304bd0b23ce77c929621f4 ofl/notosansosmanya/OFL.txt +sha256 55c7d320c0be6098bd42e7665397f2f15b46ba6b1fad2708969bf073402d012e ofl/notosanspahawhhmong/OFL.txt +sha256 387a4cccbc74240911059aad6db9ab13be0c72a8d7cd98c94a63d6c3ece8f5e0 ofl/notosanspalmyrene/OFL.txt +sha256 ab62d184e7353d161ddea97e3aa400f9251a653b055dd5b030b07fede3bb546e ofl/notosanspaucinhau/OFL.txt +sha256 36c78621f9338739cd29fc770253fbb867be8934d36d6a172afc6bd56da4c138 ofl/notosansphagspa/OFL.txt +sha256 ff3760ba038fb0498a3cbfd3454fc983babefe2a0318a660cd7e70c9bcc3eece ofl/notosansphoenician/OFL.txt +sha256 14747a4aba5fd7a925205eb6b322d05dce2c3975ea44107b182df03978906058 ofl/notosanspsalterpahlavi/OFL.txt +sha256 6f14737b51d3231847a92f992f416ed1e2017235d6ac3c6e9e46ef2f9288a160 ofl/notosansrejang/OFL.txt +sha256 b0fbcb9eaf0f5f415358bfefa5999ee75e18cde4a275b78285b2140a9e381865 ofl/notosansrunic/OFL.txt +sha256 b5077d717d6cd64f06e8e4500eb103b0cb51dd95965d562e2ba3a0684e6c966f ofl/notosanssamaritan/OFL.txt +sha256 aef66e1a5ca98031d65b2284c24de0e66158703fe84a0bf339ac600c8e355c1a ofl/notosanssaurashtra/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notosanssc/OFL.txt +sha256 110e682353242abfe1529151fda818b381cb722b4d5a46388c13f55225e21b1b ofl/notosanssharada/OFL.txt +sha256 ce9ffedf88a403a1de82c6a58869ff84e7371453d844247babe40336de5f613b ofl/notosansshavian/OFL.txt +sha256 85610e60cd4cfa1395c27ada1f15ac5ba10b7b9f1eb343a66532105682d2c830 ofl/notosanssiddham/OFL.txt +sha256 5cd389912c5b7f1d1ae7c341968109343697a7bdabf69c0dabafb5b6b8cc5477 ofl/notosanssignwriting/OFL.txt +sha256 2d6f7c43bce61f4b1919379f901bc613484f5285f520b6d29bb7c1f31b17e841 ofl/notosanssinhala/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosanssinhalaui/OFL.txt +sha256 ade8e858dd1b48cae4781855440ae9ba83358a7f4f1ac8eadfb0ad90644b1775 ofl/notosanssogdian/OFL.txt +sha256 a95dc9b1eab6e384e5f14d125074cddac6108c30a829190cfedc973d571a59cf ofl/notosanssorasompeng/OFL.txt +sha256 a5f1c842c6b33865210dda255cbbc8257ce6f05e861129af3d45b887147cdcc3 ofl/notosanssoyombo/OFL.txt +sha256 2d42ae3d7f3522cfd45fcd4daffa698a1d7b5c13b2512593d0f993633fa428fa ofl/notosanssundanese/OFL.txt +sha256 5533f0addd3fcdfc8d784db3aeec631bb04f570961831ea2c384a4dbf2fcfc13 ofl/notosanssylotinagri/OFL.txt +sha256 b118dd41337806a5d4797052c77caf3bd096aed783e5eb21b4d11154351e1ac0 ofl/notosanssymbols2/OFL.txt +sha256 b118dd41337806a5d4797052c77caf3bd096aed783e5eb21b4d11154351e1ac0 ofl/notosanssymbols/OFL.txt +sha256 6442860dad2700aabece2ac7252680b1a5bfc0987cec1ca0c3d605ab8f0b7975 ofl/notosanssyriaceastern/OFL.txt +sha256 6442860dad2700aabece2ac7252680b1a5bfc0987cec1ca0c3d605ab8f0b7975 ofl/notosanssyriac/OFL.txt +sha256 34e8361b8799f1e37b199f0260a66a38f4359f42ed0f2dcf96e3650f6bff2cd9 ofl/notosanstagalog/OFL.txt +sha256 3c2f7990d23f5f5150ea8c8eab653a197ca191934cccbf09514afdae76b559b1 ofl/notosanstagbanwa/OFL.txt +sha256 01950566b02c4f25f237a1619129650852da6f664110f7bdaccdc60ba51b1b06 ofl/notosanstaile/OFL.txt +sha256 8cf7ad1fbb6cd4a3b1596f813d6e0d57f919f612a72c2e2603506489f9dbebc6 ofl/notosanstaitham/OFL.txt +sha256 12353b96af2837abbe42f486d99c487836d8d9778b058c37d920ca2ec0cc83a3 ofl/notosanstaiviet/OFL.txt +sha256 7289a413acc7fa6ec0a40f1c92652e02178fe3a36e2fee2f98af8ceada41b0a4 ofl/notosanstakri/OFL.txt +sha256 f8ff8ce7d0a81bf8d5e121c635ef027250c531f2fd37d5988b8dd6e45f19d7f1 ofl/notosanstamil/OFL.txt +sha256 f8ff8ce7d0a81bf8d5e121c635ef027250c531f2fd37d5988b8dd6e45f19d7f1 ofl/notosanstamilsupplement/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosanstamilui/OFL.txt +sha256 b4c6eab864c1283a5c1846d7b5467e70cdc58fac872123aeac0b966a9ab3169b ofl/notosanstangsa/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notosanstc/OFL.txt +sha256 481c72a8f1b4f645a7e6b10326be41b2da2c15cb470ff48a07fab773eed00102 ofl/notosanstelugu/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansteluguui/OFL.txt +sha256 5de6fbfe9ca25509fd60e47be3fab3cc236abe20bc1b123a5c2bd12f067fd13c ofl/notosansthaana/OFL.txt +sha256 2e98fd23a52d253db8612cd5942c8f2ff4111b21d2367050fdca91d8ccc374a0 ofl/notosansthailooped/OFL.txt +sha256 2e98fd23a52d253db8612cd5942c8f2ff4111b21d2367050fdca91d8ccc374a0 ofl/notosansthai/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosansthaiui/OFL.txt +sha256 030b53206585ee108e261d15e3674ea3f8969cd59bbeccbd0028027a0eb22d6a ofl/notosanstifinagh/OFL.txt +sha256 9bf9c1ab9b7837bb65fb40dd7f6b706a28199cd633b80dcebe532bddc56594cb ofl/notosanstirhuta/OFL.txt +sha256 1c95c4c9e705f165c9577063a49b5e86914e2f38d62db454143b261bfee674c1 ofl/notosansugaritic/OFL.txt +sha256 765206100bc8ad011be3a0976323394c28f335c69c49de152c3bd8bd27cdb803 ofl/notosansvai/OFL.txt +sha256 d6269b9dcf2275996a5dbf660e3d2dda3cf0d74e9b470629e474c4adfe42f969 ofl/notosansvithkuqi/OFL.txt +sha256 50f044fdaa382fa03de22849f2b31906a56139df0dad90215fa60413dbc255e8 ofl/notosanswancho/OFL.txt +sha256 a97d2d7a91aa60fe67b6c9b77ff562fd0d29e1c27f667c650bd52f322ab0be88 ofl/notosanswarangciti/OFL.txt +sha256 e231e5bdb5cea3b5a3a9055d3ddc8ea9225dd9eb46db6404a8cd8b0cb5b0c4dc ofl/notosansyi/OFL.txt +sha256 bb3dc754adff0b5baa523c96e6ecc424df94b406b1f32ac19630905230ff0739 ofl/notosanszanabazarsquare/OFL.txt +sha256 33941759eab10afc82c8a166212be569a1e0bf40aa42f9987bdcabb2907c08ee ofl/notoserifahom/OFL.txt +sha256 0468358b316f69f405b55cadf8a8314e16e3610b8feaad96772bd5d968112d02 ofl/notoserifarmenian/OFL.txt +sha256 11bc477b31ec9e66f86bf6f64c060dde84b34ed49582d881657b472c33c4e1e9 ofl/notoserifbalinese/OFL.txt +sha256 754f0e221aa7d5a915489f3bf1f20fe53ddc35ab2834a4d91656d78f9622de70 ofl/notoserifbengali/OFL.txt +sha256 a216f6f8d85c7228093e0ee5e258d9d377e6671f68acb4db1930b29583d0f331 ofl/notoserifdevanagari/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifdisplay/OFL.txt +sha256 5e67c5a885cfcfd6ce8c2807e440c07091e3ea5432b2557b13611e3ce5b0691b ofl/notoserifdogra/OFL.txt +sha256 72606b23f312cb25973958f2892d4d2c2012deabadbf0f763232624a9649fc69 ofl/notoserifethiopic/OFL.txt +sha256 8c02263c5d73d40544f9ed91e30c4e947407057a3cc430d7b786189aeceff6df ofl/notoserifgeorgian/OFL.txt +sha256 57ddd5a347bbe5f83d47a5a63679af4a3eb7f609f5a3d5c059ad12fd1fa29e21 ofl/notoserifgrantha/OFL.txt +sha256 c0b88977aa18b5e4fd05d646d560da89fde61b6581fa4507cb00dd90bd1bf7d4 ofl/notoserifgujarati/OFL.txt +sha256 3f7451b7e2c8381be0c5712f7b0dd5c2d75fe787ae16a99f18b7fa45627a0fde ofl/notoserifgurmukhi/OFL.txt +sha256 9b9fe028b5ba74d231659a1bbaf0ed09b11e759d1ca6a070999e16d151616b47 ofl/notoserifhebrew/OFL.txt +sha256 1c05c68c34f9708415aada51f17e1b0092d2cea709bf4a94cd38114f9e73d7d9 ofl/notoserifhk/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifjp/OFL.txt +sha256 9d49a4e56df9b36403b139f48bf07fd87cc5e716cb3203c54b04b674adb16238 ofl/notoserifkannada/OFL.txt +sha256 58068590e3e02b923b3c8b7e94d3668aeeac58e9d7ecc05f3e5243c2ae385e55 ofl/notoserifkhitansmallscript/OFL.txt +sha256 be0407f060aea48787ff9e75d8d3aedef70aef113b3ce9aca26fdaacd10b1870 ofl/notoserifkhmer/OFL.txt +sha256 82ead5cfe70167960007329171dcffe99886373b3159619e596e84f08890234c ofl/notoserifkhojki/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifkr/OFL.txt +sha256 a42993999944845fb5af693ea678a372a053db1f0981d55e911dcfa9d330f279 ofl/notoseriflao/OFL.txt +sha256 d8f80a299c629ef4b73009b9e89c7ef4eee08c2a2ae5f595d81cf5db64c4af9b ofl/notoserifmakasar/OFL.txt +sha256 1df18163a0bf60f02131401ba1609df90051f40c4047684dda1c8a2e9586f7f2 ofl/notoserifmalayalam/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifmyanmar/OFL.txt +sha256 e13fc63364c2d60d1933e3a20c74a265d949f1e2321155db2b0df103f78d539e ofl/notoserifnphmong/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifnyiakengpuachuehmong/OFL.txt +sha256 cee9892f9f0cc8fe882c9e9537ee6a89621d86ee7ceaf70b02e2b2b1c25c061a ofl/notoserif/OFL.txt +sha256 ffa5a817150c87cb62d776029ac3773ae634f61b189d5c5cc352adf006000781 ofl/notoserifolduyghur/OFL.txt +sha256 c90ff15ade263a49148e35af34e9c177c6d56881e81260b29f10123e9e227eca ofl/notoseriforiya/OFL.txt +sha256 7f6a7ae1130aa5931a54f4a2bcfa63596178353391aaeae143a29d5f7101deaf ofl/notoserifottomansiyaq/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserifsc/OFL.txt +sha256 2d6f7c43bce61f4b1919379f901bc613484f5285f520b6d29bb7c1f31b17e841 ofl/notoserifsinhala/OFL.txt +sha256 f8ff8ce7d0a81bf8d5e121c635ef027250c531f2fd37d5988b8dd6e45f19d7f1 ofl/notoseriftamil/OFL.txt +sha256 bd8b32c064be2225d55f878a689063c6f169ccd9e2792d7051f0d74cf4816f1b ofl/notoseriftangut/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoseriftc/OFL.txt +sha256 481c72a8f1b4f645a7e6b10326be41b2da2c15cb470ff48a07fab773eed00102 ofl/notoseriftelugu/OFL.txt +sha256 2e98fd23a52d253db8612cd5942c8f2ff4111b21d2367050fdca91d8ccc374a0 ofl/notoserifthai/OFL.txt +sha256 0077789fc3cb20f358278ba4c6437eb14ade97d4d3e3281eaa42853efcd9dc8b ofl/notoseriftibetan/OFL.txt +sha256 96d0164554d7c701933793a594fd0616f7b1a6d492262139876f96f91de59081 ofl/notoseriftoto/OFL.txt +sha256 d6269b9dcf2275996a5dbf660e3d2dda3cf0d74e9b470629e474c4adfe42f969 ofl/notoserifvithkuqi/OFL.txt +sha256 e54b92f7047e9de3276849387c4109fe77718bf608408ac2f9826188af442dfb ofl/notoserifyezidi/OFL.txt +sha256 1cabb5c007be074c36e1a390b591265c31fa910d20d73af57e13093928f8cac0 ofl/nototraditionalnushu/OFL.txt +sha256 b1b08ef05bc4e6e9bc16bc372e2a980d437aafa4de86c33baba37ba2651e9a90 ofl/notoznamennymusicalnotation/OFL.txt +sha256 5505d1a010ee0f2eeecdf624984d2a6170480adab3091170abbcedd85361f1b9 ofl/novacut/OFL.txt +sha256 d2f87f90d108a947f98c030d9d8e4bf27e761ce83f222453b9a7230c5fb309e1 ofl/novaflat/OFL.txt +sha256 197c3f48cff4df3d768230e0bbdbc4305d8b8b9041ea6fb5e00872af66adc5ae ofl/novamono/OFL.txt +sha256 bb655534b6c7bf3e547c1368a68a5b1032d0e96fd08b5cc75f3d7a78528784ef ofl/novaoval/OFL.txt +sha256 f1ef4c3ef43322403f5c30e4fb46496969cb5c34a2a6e7247b507254b69caa6a ofl/novaround/OFL.txt +sha256 9b1cfccef4a7e19f90e2901f808f3aec4335d3cc81f978453ad0c8ded14447a0 ofl/novascript/OFL.txt +sha256 42e7b456fee0d0dc86927579b3d2626d42bb0f4cc9778f3a92ca8ada4e46348e ofl/novaslim/OFL.txt +sha256 c0bcb72e68dd416db0bb9fcec7a7fa62321b0147cde00d8c8f82748e33aefd34 ofl/novasquare/OFL.txt +sha256 455755e2e7ce9dbac6beb3729c97c57d6f74a638dcb5be548ec953021fbdbfb3 ofl/ntr/OFL.txt +sha256 760fb433c515570f6b77ebc60299c2c91d5f03848c659452a9d2458b28935768 ofl/numans/OFL.txt +sha256 580df76c95a1ec5ab878ceb25bb3d85c6a076804e9c970c8c6972aea775fdf65 ofl/nunito/OFL.txt +sha256 efbb0c9e864cef973982d9a17567e6be5c3d1759695574586f3f18c7ecca064b ofl/nunitosans/OFL.txt +sha256 4a90b22c5b61d15805fc786aa22592a4e8b52c4ff5774a4bb2c1ae0cb79b083a ofl/nuosusil/OFL.txt +sha256 c8f4a6ae0810a3ad10e484b29b6a6d4bb6c6e60d900266970789c54227713fe2 ofl/odibeesans/OFL.txt +sha256 3f747f7502101ae1e66f6e794e1a37aa2967580239dc5b9d6a28fd7c0f3495e3 ofl/odormeanchey/OFL.txt +sha256 270ab96983ada2aace07b48f216b8e229b747a2d0fc1f8b32dc4d506c1058993 ofl/offside/OFL.txt +sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/oflsortsmillgoudytt/OFL.txt +sha256 053326baf9314c746e170e100766517d85ad78f5c9311123787e7d82b0ee7341 ofl/oi/OFL.txt +sha256 fc59ca3cd3bcb47bd4df597519111ec130c25cabcc57a8808dd2d243cdcec6ae ofl/oldenburg/OFL.txt +sha256 4faa2d9e2ce0a4b5b37e62ee6fafe474a539b31578f7214ed97cc3503aeb8ebd ofl/oldstandardtt/OFL.txt +sha256 1e535087b6db508ffce476d197d5198deede7a5e5eb5f3ada8c68f864e98c7f5 ofl/ole/OFL.txt +sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscript/OFL.txt +sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscriptswashcaps/OFL.txt +sha256 071195d8806e226faeee60259c28ca67b458227af5195a73f5cfcab06e3003bc ofl/onest/OFL.txt +sha256 a768f4c2b04f8e960236f9854c8afeb3626fb34927f25aa66aa7f1cc8cea715e ofl/ooohbaby/OFL.txt +sha256 fbbbcfef55318de350562559b671360de6d597112ecc5c73881b05092db89602 ofl/opensans/OFL.txt +sha256 d941c5b788d47aa469ee54e30f4c12d6a43c45a295f10c568bdf9772f2893b7b ofl/oranienbaum/OFL.txt +sha256 00f1783a4e7a52d945c0c4de689571b2db896493362651db2706b40c6fc1c330 ofl/orbit/OFL.txt +sha256 ab609b0e110d622435ff337cdf233288556e011bbf9bd0550be98846c0630819 ofl/orbitron/OFL.txt +sha256 96b7bc175186cd0153a9682a1c9bb1da7103ab13a83abef8026bc64582ca616f ofl/oregano/OFL.txt +sha256 14c21a0a12187e4d5e83914ffb2c976cc0f616ce1e0da80cb1f5a80f6a9b8709 ofl/orelegaone/OFL.txt +sha256 781433e63668e8f766a755b3df5e1a7100850d3a2fecaf5bc6d01d87888fb354 ofl/orienta/OFL.txt +sha256 173ea2d0bdda981829719623c35699e8c0e4aa508e0af12817ad7ccbfa4c6137 ofl/originalsurfer/OFL.txt +sha256 0fd731a904b729a4e02eaf5e8ebd06783edd9abe400e8882760160230675b652 ofl/oswald/OFL.txt +sha256 906375346809a46416faa9de00683ddf70dca62d2a9798acf9f75b2578898ae2 ofl/otomanopeeone/OFL.txt +sha256 c676351bf8576b9aba743cd5eaa8c0e7ee0d51f805d720447b4df4ddb6a2e416 ofl/outfit/OFL.txt +sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlock/OFL.txt +sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlocksc/OFL.txt +sha256 86e5ff25c701ec446d20b1a85b02ee6d36de8503a7288a4c948f5459809af1f0 ofl/overpassmono/OFL.txt +sha256 86e5ff25c701ec446d20b1a85b02ee6d36de8503a7288a4c948f5459809af1f0 ofl/overpass/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/overtherainbow/OFL.txt +sha256 008445a4d53fbd71bff9cf733bdfd841a1b15fb58ef3473f7bab4c456e3b2930 ofl/ovo/OFL.txt +sha256 fe17c0f2581d71b4e1ea7e636e7f4877c29223e11bb1dd1a871e8c3f2a86336b ofl/oxanium/OFL.txt +sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygenmono/OFL.txt +sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygen/OFL.txt +sha256 a47e5daeda73568969395c656823102678f2eefb0d7d7ecb47aac4cc17e42204 ofl/pacifico/OFL.txt +sha256 95449a2d36ed919703ee09d3d802e8321b489f20efa1bb375d140f0bb45c98aa ofl/padauk/OFL.txt +sha256 34553405dce90b2a0e6c5a544e3a17a40105473456c1dd028dcce1dc511a099e ofl/padyakkeexpandedone/OFL.txt +sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquindark/OFL.txt +sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquin/OFL.txt +sha256 3c1a085f9dbd44877f73b0e1e1917ab084eb79828328fba74323c3bcd4171c6a ofl/palettemosaic/OFL.txt +sha256 b4fc1d55ce610f255c5712f8169543f9610536d002deb99bbc99bfbba9f8a560 ofl/pangolin/OFL.txt +sha256 96c9adf4335fee2c0b8028009d85d6bf59e6bde8d378fe589f188b7390eae9ce ofl/paprika/OFL.txt +sha256 1dd84b611f4bed7f9ff9089e76a96337b187e6f283a4ab33bcb987f844f2c4db ofl/parisienne/OFL.txt +sha256 5802c9e3509199c7aa9a13ea410ae27febbc0cdea184bf7d227170fac703bba8 ofl/passeroone/OFL.txt +sha256 36c285c5472c625901d4a13da7e31c5ea6126678d31d56cf95572c49f27c8950 ofl/passionone/OFL.txt +sha256 06d7dd50c2cc2a10cf2b690511b139266051c5cc96548e9c32b4ca5eab3c0e7a ofl/passionsconflict/OFL.txt +sha256 66a018bdb4174781a473d6b26c9873a8b8ed5f5c8086bc18f1532f850f61cacd ofl/pathwayextreme/OFL.txt +sha256 ad4275c6aa3ddcf5ed3f0a788732e13ba57799b1d8deb00de3fc2a928ea70ea2 ofl/pathwaygothicone/OFL.txt +sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhand/OFL.txt +sha256 b554a7f57d54db7857d4d9b8dc56ebd347dc4f857fb4f1ce1a25c332dfbf484c ofl/patrickhandsc/OFL.txt +sha256 72060253bd481a8dc18664bb9117072dc07c0f0270a40617c230654821774850 ofl/pattaya/OFL.txt +sha256 cd2dea62cd4b0c5fb335cf07ff04fd5c4bacb49b8d6c2bbbef9766c663d79b1c ofl/patuaone/OFL.txt +sha256 75a77451968e55a1ab404bd953bd8778983e21116d507b890fbcf838e58c8e8b ofl/pavanam/OFL.txt +sha256 12404fcefccc3cb964cb2406510ba679b30f7d7ae689db08df5b455ae24b3feb ofl/paytoneone/OFL.txt +sha256 9263f9488a9ed1d5f4218581b642e0f054f9a20d208f1a53c19c9f7dbd27eaf2 ofl/peddana/OFL.txt sha256 e8dd8f53b2fa502ace0636debbe7e357c4888d8d02b8b41d6a9a22d3058a63dc ofl/peralta/OFL.txt -sha256 cdf5fc4014abe91588666a9592ec86200e5a4d743b4b6e05d28d47e850bbe5fa ofl/digitalnumbers/OFL.txt -sha256 f8c2225a5fdb50e2e75f98cf6e69f198571f605f1b7f6f7eacc0947e2fcdbe8d ofl/sreekrushnadevaraya/OFL.txt -sha256 a80ee908b60f5bec9c10b135d3da93730e2194107d1f7fd3f61bd8c1a97b3e0c ofl/yesteryear/OFL.txt +sha256 e8ed3488dac3452e67746a5ebac23bf5cf72a614b606a1f80a81ade4e0e6b03f ofl/petemoss/OFL.txt +sha256 cf5c4103b0ecf3c38e7c26768b5caf05e1b3e16d4d87b32d859b3c19ce7c216c ofl/petitformalscript/OFL.txt +sha256 a889ff77b75be8bcd1456ff147eb9dac647f3eb217fad50fb4877496884f6dcb ofl/petrona/OFL.txt +sha256 6e6efa9b0556d100cfe60690cff5d9be7144df77adabfd2c278dbfee451351ea ofl/phetsarath/OFL.txt +sha256 331c71cbd8f1d8a70cd6eec3d55553b64e6261a9bb0982fa12e6e48baca827c5 ofl/philosopher/OFL.txt +sha256 907fa104d1ab720c2d698e51035593f5e6ea5283bd34a6c7cbdad5d6715e68de ofl/phudu/OFL.txt +sha256 eb54463ef24368895c812c9117e677a59bd2379f80da85515e19b473f310e4ed ofl/piazzolla/OFL.txt +sha256 5b158abb3406e69b7408b562b7199f6ff55a41ea56e260b87176d693b0095e47 ofl/piedra/OFL.txt +sha256 26a2c5433d20b9bffb8b7314d2a91eb0f55492385b66b148559affbe03b6e462 ofl/pinyonscript/OFL.txt +sha256 e8ad3f3de5baeff6bac6e711d8c406e0a6b8a61d2944741532d8965d893a2681 ofl/pirataone/OFL.txt +sha256 b66ba46f511a851ab09998b5a5a9fdbb102545a3864cb993095e1745996873a7 ofl/pixelifysans/OFL.txt +sha256 2400b30a72d2b1555255b81625576dfb552584a19a9c85ad8d43ff77bceab13b ofl/plaster/OFL.txt +sha256 271ad2688ff6199bc86135839c27a980d4cb3d2fae3a68ec01e98cb8b529d953 ofl/playball/OFL.txt +sha256 566be814f8e96e93dfa16101331557eb6b5467e9e03f627c0910fe93ca12300e ofl/playfairdisplay/OFL.txt +sha256 e414e07f7a4da16ed47ebec80d52dd79f21d3ca42bc92385a755d8078a038814 ofl/playfairdisplaysc/OFL.txt +sha256 0d93adc203a3ad4cddc53e18b8241333a92c13ca796b21ef786b9057a6b51978 ofl/playfair/OFL.txt sha256 6d216cec166b6e139adaa599053dd49720c053e1f2adb4845de3cc9c3704344d ofl/play/OFL.txt -sha256 46751a31966477e3f038d1e5ff1146a33234a3a523a0e6a21be3221cba082a34 ofl/muktamahee/OFL.txt -sha256 505bb8f3c30f2006b4e02d250fda31ed94b651a35f1124a201ca1c405ce989af ofl/biryani/OFL.txt -sha256 5641212407f956b828bf632afc4bbb3344f461f82255ab56756d9e3e8604c7b1 ofl/martelsans/OFL.txt -sha256 1ed119b01f03187dbe2f5f89c95431b9a4ca46db604fd263164d8b4055189f46 ofl/lateef/OFL.txt -sha256 4938e917ac54665be1dd862f54634d991b39c5d1eef69345d66a5089e401bfb4 ofl/creteround/OFL.txt -sha256 9263f9488a9ed1d5f4218581b642e0f054f9a20d208f1a53c19c9f7dbd27eaf2 ofl/peddana/OFL.txt -sha256 e75ed24435d1711de0bebfaa621c3eb5564798c88cc0c1d1f8d529bbaae703a9 ofl/yanonekaffeesatz/OFL.txt +sha256 fe3f3a0bf33f5c06566d2d1192b36c7e364243d7b8ecd8f8a2715760d050a563 ofl/playpensans/OFL.txt +sha256 28f224e2db47301516a1e0839d2ae5bfc0249a40761116dbf0f0b731429143a1 ofl/playwriteco/OFL.txt +sha256 28f224e2db47301516a1e0839d2ae5bfc0249a40761116dbf0f0b731429143a1 ofl/playwritefrtrad/OFL.txt +sha256 28f224e2db47301516a1e0839d2ae5bfc0249a40761116dbf0f0b731429143a1 ofl/playwritegbs/OFL.txt +sha256 995c7199cab65954f545996326755daee7b63cc6b42b06c13da1f9502ab08a99 ofl/plusjakartasans/OFL.txt +sha256 7076d4436e0908702b4dcd94974cdedb01770649b9cc4a13030ea8fb20889d0b ofl/podkova/OFL.txt +sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkovavfbeta/OFL.txt +sha256 24af1fb3ab8dfeddc83162b7f3b6c1104149b6c3022f1aa948ef4f8ff7e6bf7c ofl/poetsenone/OFL.txt sha256 708e33bed791c40638926a7577bcef8ff8748f84045f3825277540cbb8d483ba ofl/poiretone/OFL.txt -sha256 f1d1a3536fa4b9c71d04fe4c8d8bbfc0cc5c457d6883f45086b04d0bc07ed12d ofl/vastshadow/OFL.txt -sha256 f9f28345ffcd6cea6e3c6699e4579cd1948053d80fe89a6a5a2ecb269afc95f8 ofl/nikukyu/OFL.txt -sha256 c1bcd16ffc9d095822fd6b7fa1a24c7918b24815ed05711421f804293d2efa62 ofl/actor/OFL.txt -sha256 ae629d13b06d9afc5cf3c07d585f3192b89b7decaffc5c4dfcfa7ce11a2a2b11 ofl/raviprakash/OFL.txt +sha256 de318dcb99e332a746edb9f83180ee206fc3bce74ff96ad7d1cb219967ec74af ofl/pollerone/OFL.txt +sha256 21f7082f0893d6029ff6a2240e047b0f6ed8e8d54d7d1ff5dd947c9f469fbb07 ofl/poltawskinowy/OFL.txt +sha256 56edbe5fff7981dae6f6eff32f61ba04cd54324e5abfa44b1257b2a307ea561c ofl/poly/OFL.txt sha256 bdce62dd98db969b73f93f8e8e2151004c20ad871ceb15ad9bfcbdf2cf939dba ofl/pompiere/OFL.txt +sha256 6ea7a3ef1d07feb592693f3f22c26d0b09321ff81814292b49be99888d0da9d7 ofl/ponnala/OFL.txt +sha256 a247e9c11f1d488e94c40190b162ac871064dc639c0eae4ebc28013c89b599ec ofl/pontanosans/OFL.txt sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/poorstory/OFL.txt -sha256 757f49d04406c93c40d1781e7867fd85a1f9fdfbfe03a5ae332900da802fffc6 ofl/harmattan/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/khand/OFL.txt -sha256 74ba064d03f1f1c4a952da936c3eb71866c34404916734de3cae73b34357e59e ofl/lato/OFL.txt -sha256 94625b91cba99cf9c8e580febf5e738b2e3c7cde9034a16bcfb7538b672137e5 ofl/zcoolxiaowei/OFL.txt -sha256 3e908f3a95680bdf3c8456bfbf76392605b34cb3fba109e46441056ab966cb35 ofl/modernantiqua/OFL.txt -sha256 6a809aeba8af2115ca4b4c3597b1fbeb836a45f0489070f330f9c2dff870da8d ofl/galada/OFL.txt -sha256 2c3737ea83b48d48624068d1bbd1d9f8049eb7cf2e1f67435e420375c42e0686 ofl/spirax/OFL.txt -sha256 92f750829545386017c3418d890769778b76fd01dfb41c62fcbb0d42ba0303eb ofl/dorsa/OFL.txt -sha256 656a20870fbcb8f559f1c6308c1df90ac93d7cd0279aab49b43a43b5e58534e6 ofl/neucha/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/zeyada/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laosanspro/OFL.txt -sha256 33e3a83e377c6a41149044bd919f50d9a971d801052d4e0c0a98cb417b42ae38 ofl/risque/OFL.txt -sha256 b4fc1d55ce610f255c5712f8169543f9610536d002deb99bbc99bfbba9f8a560 ofl/pangolin/OFL.txt -sha256 511125dc85198375795fdbc109d088654d3b7f9dbd3ccb7bf93d844aef0b153c ofl/ptmono/OFL.txt -sha256 819e3b25f9b50f12299a3db1638be3813efc6b938f2b86693a218d20ec4e3209 ofl/londrinashadow/OFL.txt -sha256 e3ea566dbf689a9110b2094f9f2e5d16d7ec31720147651efc1005ca20420dd4 ofl/flamenco/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowcondensed/OFL.txt +sha256 6be04893d770899a015649c7aa3b582f871b272f8747a92b78b17c3e5c8b2573 ofl/poppins/OFL.txt +sha256 ac55580be2df22a06d29a47501e2ae11e1d399620f5a779e17a66f016ba6d5ff ofl/portersansblock/OFL.txt +sha256 021d5f1df697848da51620394659187be77cbe382ff2f896bc84ffb89c0c2d52 ofl/portlligatsans/OFL.txt +sha256 e37fcc467040ecd81bf4cf59c99ef56b20f57918995e82b3de1d5b4e931bc2e6 ofl/portlligatslab/OFL.txt +sha256 fe55933bcfad354914050fe0e7c879bd666a623f1e363a651198ac40c271cd26 ofl/pottaone/OFL.txt +sha256 2dab153a33dcb2101bba3f194d27d953c848a0fabf2e336650a81f84a0c33b3f ofl/pragatinarrow/OFL.txt +sha256 2988632106d61639fba8e4a6310da2c4c9376795c9c2e84ad24e23031bf40ecf ofl/praise/OFL.txt +sha256 d10e72fe42afb7abab9185139f761074897e5cfe8d1e1d503ac6cd8dc02fbddf ofl/preahvihear/OFL.txt sha256 705960c3281a5765ecc0b59bd4ed7ca59eed165748076bc2fc3e8fdbfeb944b0 ofl/pressstart2p/OFL.txt -sha256 7e896665d0863d2a17a671001dbe2528a5f9302f1dff9222af8b0834e9088d0c ofl/kiranghaerang/OFL.txt -sha256 5f1f5510eff7922864bf326ffa1d4a62f01add5193e9367b542378e5a808b500 ofl/handlee/OFL.txt -sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivonarrow/OFL.txt -sha256 82831e8f12ecb6deb2f4d9919a04049895b4619e0301fa6b699c861bd7311c54 ofl/kavoon/OFL.txt -sha256 1a5e3792a425687a523fc7c0f8ab5d01d58bf853149d57f3dec4b4fc6932fcf6 ofl/hanuman/OFL.txt -sha256 7f91d7d8854e5cb4fc630807c0f4d57c07777769dc597173fe0aef5e58f0992c ofl/qwigley/OFL.txt -sha256 354b4be0340cd58e381fdf58793a108897bf944a7f8faf9e877c476ed6c730d1 ofl/convergence/OFL.txt -sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygenmono/OFL.txt -sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinate/OFL.txt -sha256 4dbbe5c21b46f2647d227dde69b971a1b46de1435e0752a9eda1ce120725a93c ofl/norican/OFL.txt -sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanalei/OFL.txt -sha256 56edbe5fff7981dae6f6eff32f61ba04cd54324e5abfa44b1257b2a307ea561c ofl/poly/OFL.txt -sha256 59bda6b53e28d388de5eac7bbb8f3e65889dc8489be3d922f95a525354110c0e ofl/tharlon/OFL.txt -sha256 3fa0ceff4b9a2d28dde43bc63cde3acfb5e6e92d13a53e484ca0e501e18c7e2e ofl/lekton/OFL.txt -sha256 ad9ce814ff266b57d3c4698d3fadca4b41a6f942a0ddd215db5cc66abf92d668 ofl/mako/OFL.txt -sha256 c4afe82f49c05689c40dd4e262803b29c6e611e7b4efd3a0418f574b2be79d9a ofl/carterone/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/karma/OFL.txt -sha256 d38acce513eccb51d7ac34ca47be279e1fcfdeca1ed088bdd2d281dc6ca939ee ofl/badscript/OFL.txt -sha256 31eb7046f4c80e0f96944c4b40b0772de68b34783b794fc13aab3f54c2ef6d9b ofl/thasadith/OFL.txt -sha256 06c79c896894160a5810d869a822fa7d02a0e2ccffd97920b8cf3b880380f6e5 ofl/amstelvaralpha/OFL.txt -sha256 4faa2d9e2ce0a4b5b37e62ee6fafe474a539b31578f7214ed97cc3503aeb8ebd ofl/oldstandardtt/OFL.txt -sha256 1e511bb01d29562932157365418c02d954d8faeef794bcd54729177fb2b03db0 ofl/istokweb/OFL.txt -sha256 846e8cc6dc69bf685d2db14cfa758ff3d9d771d54c9e0d3b511f0ecb97ac0e8a ofl/cambay/OFL.txt -sha256 6c181f5a0045e8f414e1c232c35972ab83ea084ac44825f517ba001628d97b21 ofl/kronaone/OFL.txt -sha256 d7f96801a28ea11eaa51bc4a9c87fd91f2133bc298068e6e2847a15ddda23089 ofl/librecaslontext/OFL.txt -sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/sriracha/OFL.txt -sha256 22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276 ofl/merriweathersans/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39text/OFL.txt -sha256 5b26c88d163b1430561f53fd3d9021d6057f3c67d25534a5d8d232cfbf8ee2a4 ofl/wireone/OFL.txt -sha256 57f8d60cfe9212b971f07253e303746128edd06b21e3a0e4e188308e569f03e5 ofl/orienta/OFL.txt -sha256 c87702d8b70f714fbefb554660e8ca57a43ef62a59089d11cbf0c6bd51d56928 ofl/lohittamil/OFL.txt -sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejuhallasan/OFL.txt -sha256 9437c26410bcd543607a6775e7d0e359c1df3926d68c92dbaceb26ce79cc0fd3 ofl/bevan/OFL.txt -sha256 50265d2b41f8ad2dd350532d2286509aa694021b4aa0490b06f0068e4ed78c27 ofl/herrvonmuellerhoff/OFL.txt -sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeyemarrow/OFL.txt -sha256 1fac7a3e4e43b091c2d31aef7a375d2b969c42b2d5fce8e2d40b5f7b1233ddb7 ofl/moul/OFL.txt -sha256 331c71cbd8f1d8a70cd6eec3d55553b64e6261a9bb0982fa12e6e48baca827c5 ofl/philosopher/OFL.txt -sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygen/OFL.txt -sha256 89418a3c7b5726c3f8828a7b7c3f1cad661cf5b7a1be3d2bd9ea243f8d9890c8 ofl/sniglet/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balooda/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/pridi/OFL.txt +sha256 3f0f27931c92453994176af3b1e7954f9aac39fe145374d6d08c47c822e82e59 ofl/princesssofia/OFL.txt +sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/prociono/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/prompt/OFL.txt +sha256 7039124ec9c84f9d637637da9f80158f0d3681c82d4e6a811053467f7c33d587 ofl/prostoone/OFL.txt +sha256 6828e2435964f939c9276ba052ff55b4ccd155b5fbbae9a16c53b1691531fccf ofl/protestguerrilla/OFL.txt +sha256 6828e2435964f939c9276ba052ff55b4ccd155b5fbbae9a16c53b1691531fccf ofl/protestrevolution/OFL.txt +sha256 6828e2435964f939c9276ba052ff55b4ccd155b5fbbae9a16c53b1691531fccf ofl/protestriot/OFL.txt +sha256 6828e2435964f939c9276ba052ff55b4ccd155b5fbbae9a16c53b1691531fccf ofl/proteststrike/OFL.txt +sha256 a68d8ec6bea7f277053ae93bf563d4b97c233f09f8e79f86ffe5db66f31fdddf ofl/prozalibre/OFL.txt +sha256 511125dc85198375795fdbc109d088654d3b7f9dbd3ccb7bf93d844aef0b153c ofl/ptmono/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsanscaption/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsansnarrow/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsans/OFL.txt +sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserifcaption/OFL.txt +sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserif/OFL.txt +sha256 157a9e77f7580246e97c769490e2e977ae94399f9d30f4556015c41fe8c28bac ofl/publicsans/OFL.txt +sha256 fdc9b4ddc3c811c2ece4c4a11a2126115bc087ec0e1ffbca5f379865a9aa18c9 ofl/puppiesplay/OFL.txt +sha256 5f5dbf452c1657370d9280b50d647212a53c80acae6d78e0b5e8c2b26dc62b09 ofl/puritan/OFL.txt sha256 89d9d01291eeb91074ccf1f7ce07e7a1d9d421ec1191f8e84d440cb50830ed92 ofl/purplepurse/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloopaaji/OFL.txt -sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeye/OFL.txt -sha256 f938d4076b66a13cf984ce88d92a07ff9802e8ae5e1f4a28cdc43fad122ae611 ofl/spinnaker/OFL.txt -sha256 89bf0833b785c49b0f271273ab440bdc20c85bf0322537dc901df940bf1579da ofl/amarante/OFL.txt -sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhand/OFL.txt +sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b ofl/pushster/OFL.txt +sha256 0f1071ef57cf3ed05972b47cc979ed6bb9ce323342f4a07dfd188e49efae3190 ofl/qahiri/OFL.txt +sha256 3747fdcbfe4f51d6a2f101c35105bacde3715b3c32b34b6b03e5fb37983f89fc ofl/quando/OFL.txt +sha256 25995bcf8e8ddea1aafa5449870567cbbeae7e26b27ba30aca5642f2c02e9757 ofl/quantico/OFL.txt sha256 684ef102ca4c5ff61cf1c1e5c2c6326f3c26f848446f98b8862dcca716a87601 ofl/quattrocento/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rozhaone/OFL.txt -sha256 61be7c29f4835e2be7243db12213d75d53ff028f29f4b493212a1688b1d3a1ba ofl/titanone/OFL.txt -sha256 9df0700fcd0ef48abd74459a8650d35f59397fbaa00c5b00527e57cc155689c0 ofl/durusans/OFL.txt -sha256 b1958132ff727bd74409aa37ec0abbe4be13b1b379e1210e6fb77fc608c607d5 ofl/kodchasan/OFL.txt -sha256 f1888ed385b528866a472d02f4e06ef0873aca5b3c63ff1f6116cbb150dc9a13 ofl/metal/OFL.txt -sha256 e36d420a3b382b337c386338d8abc3635e10de5dfca7f822fc63ac659a0dcfc3 ofl/amaticasc/OFL.txt -sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscript/OFL.txt -sha256 60ddc0ee6e443b78940b5f92bcbab76c98ec6965e0da9fbdaf267383ab72bba8 ofl/anticdidone/OFL.txt -sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothic/OFL.txt -sha256 3184f6a99f589c78740fbff6ddaaabb43b8cc2f3852da36e60aeb024ea8d6f00 ofl/eaglelake/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/halant/OFL.txt -sha256 9a9f089005f389717106bb3ba427cda9bd51b8a477078644566543f2a60ca85d ofl/rambla/OFL.txt -sha256 99d2f30e282d6174af8ff68597f58bb53c0dcb2b104a4c1b8d19da49021d00d3 ofl/unifrakturcook/OFL.txt -sha256 2bb0c0200723d923f8e20d08b8bd1c7af7f5cef8bb2d63ce44bd268b54334621 ofl/fjallaone/OFL.txt -sha256 72afba97d1ac9409a9fd3bb91a02a639427ca1988977909dad273e293a508d7e ofl/staatliches/OFL.txt -sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b ofl/lobster/OFL.txt -sha256 955655cafa13f187f45a79dcf451942fd1118a8426abc5a25ffc5dbb00709da6 ofl/juliussansone/OFL.txt -sha256 9e1c955538817c3fab7160cb3110501e73ce109eeb58c4992a14e8323d900849 ofl/pecita/OFL.txt -sha256 96d82a96abc02fb457ddde0227833dbde9d1d02876c91f0a4e27845ca0d692fa ofl/atomicage/OFL.txt -sha256 7729f005b7a087368e2cf61fc4b65cdc85988e47d0e6e38c93a72de345e86b41 ofl/newscycle/OFL.txt -sha256 336fab6956d78eb34b50cd7bc6b16116c44735fbd0bf9f4def769ca4d8e218a9 ofl/sofia/OFL.txt -sha256 b26cae1321380296ba8311b632a397d5eac11b47197f9d0aa0b9310f1531ad60 ofl/sarabun/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/suezone/OFL.txt -sha256 d3711c90a7deda6210d30e41b945f16bdaa00662b30ee0b7c36abfee82525bfe ofl/kokoro/OFL.txt -sha256 513b7871a360a6eccd426bab59743fbff36764588f47381423f04ad6b3d821d9 ofl/alexbrush/OFL.txt -sha256 67f64c5509e5151796599e3ad47c3131cbe0c80c4f9430b90236a1249c2eacc9 ofl/roundedmplus1c/OFL.txt -sha256 4a7d2f227b91046ef7a54f8f735668d86e45f4fd4089268de292a6e9de108253 ofl/bentham/OFL.txt -sha256 3c187c861dc291b9f7f96f655656f9ac2d57b33da425bd5962810be728344f57 ofl/brunoacesc/OFL.txt -sha256 869e4c29978c318b33c2e5c7c8f24d2e947f249071bb1471620036a9d1ba87ad ofl/k2d/OFL.txt -sha256 6383249ddffbd87f2bbd7878ceba2dee0f1a2193cd7a4f41c00aaceb8e6d8b5b ofl/meriendaone/OFL.txt -sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/sortsmillgoudy/OFL.txt -sha256 d64c91b0306b53fabed08762068eea8b918d654fb0721c288f13cefa4aaf088c ofl/butterflykids/OFL.txt -sha256 bc1175730d609233043cde47e48f69831f012e85537c5ec1a2cf4836757c1540 ofl/mali/OFL.txt -sha256 fe5e822667a4b2e083b8fdd7a37546163f26f6481b58742236abffdcfb3e6c71 ofl/baijamjuree/OFL.txt -sha256 b0316f404a7b291e40921c605160181065791a5010a2d2d5691fc7e28cdbdff2 ofl/underdog/OFL.txt -sha256 c026db4c1a557cae47e6930876965f9cbc05758eb1f5d6f59b6b61c8f342a57f ofl/alice/OFL.txt -sha256 aad1e82802172d4c1d22dd015a5b8b4275e5665a49c1df54ed64716fca7ae194 ofl/corben/OFL.txt -sha256 878aec7282ab41d058cedbf90e14512bcb4fbd0658496de8c2dfc592ed1f0cd0 ofl/lilyscriptone/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglishsc/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/sarpanch/OFL.txt -sha256 aff3cea99bf300b4b29f4dc04867cf9b49d83de8c5ecaf991c446d506b56173e ofl/wendyone/OFL.txt -sha256 b054962de0af1397d5350fddb4d6bb20f5f2e073b543eeeb694c7c3b27144fc5 ofl/chivo/OFL.txt -sha256 19849b33c59d0cffeaad0dbdc38db767e95e03cd36fbbfe6b67a9878aa5758df ofl/fasthand/OFL.txt -sha256 a57810cbca0b4715ae8610dd7a268260cebbdd4fd76d304e371517f828150669 ofl/stoke/OFL.txt -sha256 47a0b7e315bc56ca0326fca46302d87d48a61e3528d4196e966b62f5bf0243f2 ofl/armata/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothic/OFL.txt -sha256 616e75d879831bedfa7725c078e09bb56f8a17f40b194e16691b12251bb42b3e ofl/majormonodisplay/OFL.txt -sha256 75c7ccf4f537a7a3ebbedd299c1d2542e13d3b27aaf76a0a2d9fa91a2a8fcd3a ofl/felipa/OFL.txt -sha256 ee2c069b30f3e9a5aaf52357117ee3443ee27f17c29a2ec68861db283379905c ofl/dynalight/OFL.txt -sha256 fbe0442a6b1ce162c95e241df76cab5ef2daf6a5ac84ae1a7a6749f32c051098 ofl/breeserif/OFL.txt -sha256 43d530580461a574f6dfed9e15af6a74e95f7c04d9bfa1174a63ff036e8eee07 ofl/rubikmonoone/OFL.txt -sha256 40bd3f35477284c021978816e9d3b8723ff2283fd7065fafaa5bb3004e41b237 ofl/songmyung/OFL.txt -sha256 460966d12f306a007930575c3b8bc336fe0c32f880d622af6d3b745a06ca79a4 ofl/benchnine/OFL.txt -sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreyasc/OFL.txt -sha256 0c922e2d65050677c26ae8dc501bc9ad3e0059c4b10df2fc9717d7bdacdfeb6d ofl/ramabhadra/OFL.txt -sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquindark/OFL.txt -sha256 e39d6ec64a37ed1523a59940695a61ea5e7882d9bbe0e7eb11653fda4b04fc79 ofl/kottaone/OFL.txt -sha256 1bfe7d2aca99042eabf37079152fef8abdda2c36dad454ae89b858a3cb1078c5 ofl/forum/OFL.txt -sha256 5505d1a010ee0f2eeecdf624984d2a6170480adab3091170abbcedd85361f1b9 ofl/novacut/OFL.txt -sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellussc/OFL.txt +sha256 b00c646b7d04a6da1665a148815b8c589c1e05ed7e1febf7ccbd91758747cb03 ofl/quattrocentosans/OFL.txt +sha256 c9bcf9bea97a216657d25325f418f0fe7fd0bc847b3dbb3f1b5a05b207370608 ofl/questrial/OFL.txt +sha256 14d28541780d90f6577bb7abcc6f005bf6969614294e75c82abb8758a696ad46 ofl/quicksand/OFL.txt sha256 0786594992757ea0290ae4a490ab9249728f372adb13959c0c8ae4fec83057ff ofl/quintessential/OFL.txt -sha256 ca13e9cd1faaa6afb9e43dcb534a8984cec3218993fb4b436468a79a1657ee19 ofl/keaniaone/OFL.txt -sha256 760fb433c515570f6b77ebc60299c2c91d5f03848c659452a9d2458b28935768 ofl/numans/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantunicase/OFL.txt -sha256 1d1b7f3480c8d9b65c26d205e41dcbfa85731588d6ea50bccfa78e91f242d629 ofl/loversquarrel/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/prompt/OFL.txt -sha256 eb6c70cb6b575ad22df022d454df7a20582915e6e8da19b579c6cbef37a26bb5 ofl/gafata/OFL.txt -sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilboswashcaps/OFL.txt -sha256 4579982a484a9745864de2cda666fd7b5017f9182b74dbb4cd53d84c1d1b2231 ofl/gruppo/OFL.txt -sha256 cd059851dc2abcd2865ae318e8b949736f958794210acb90316530fd100fc904 ofl/geo/OFL.txt -sha256 af9b97696048d509e3d70f8108b7c4381084f95c8fedd97acaa76b0b287668be ofl/molle/OFL.txt -sha256 6958d8c61b6b223f81bdc2109941e5d0004996dde61e197d628e0293f4f1bc58 ofl/miama/OFL.txt -sha256 7e98b49a12b51240c85b04eb0d9919a6fec7dbd491bef6cbddc22d3f851bd1f1 ofl/marmelad/OFL.txt -sha256 b9d592c3bf421197d9b7e353416b8e2ec81584988824b43d38c86d997a08b868 ofl/myanmarsanspro/OFL.txt -sha256 e414e07f7a4da16ed47ebec80d52dd79f21d3ca42bc92385a755d8078a038814 ofl/playfairdisplaysc/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairaextracondensed/OFL.txt -sha256 bc85bae0b512b799bbfb2b916e4d0a34cfd963d09778cd783e248b479e67760a ofl/comfortaa/OFL.txt -sha256 caa697668c3cf3e622753fb202c6c2e29648b94a3499dc7b869a14192e38c553 ofl/sourceserifpro/OFL.txt -sha256 81d6c3788a6b641cb9f543389d9d5c0cd3bf94fbb5639be19c102b9274c34291 ofl/mousememoirs/OFL.txt -sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/arya/OFL.txt -sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkornsc/OFL.txt -sha256 6506b2fa2a14259a8859608a6148a4591d67bbaef4d8e1948b43c4078561b0e5 ofl/tauri/OFL.txt -sha256 6cca1abc09d677cf00a55674ce2775e0eeb6dc5c0137b0401816680b9e500f81 ofl/marvel/OFL.txt -sha256 e98ce988fba1c138f4e7c0c5120809706ab1b24a3c29638ca83ab2ff082e08db ofl/chango/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairasemicondensed/OFL.txt -sha256 42e7b456fee0d0dc86927579b3d2626d42bb0f4cc9778f3a92ca8ada4e46348e ofl/novaslim/OFL.txt -sha256 1b8eef90c567309fef17962cc969dd9ed1de69176517238e744018bb983e7c1c ofl/mandali/OFL.txt -sha256 9e262d6d7fb789aab6a8ecc53fc9c78387eeb9f935dcd289282d8e751b6bf743 ofl/antonio/OFL.txt -sha256 07dbf75115edfc1fd75580aa19c4c730201a099e8f86a9869887dfbed0547266 ofl/offside/OFL.txt -sha256 f177d98c67b84250ec87a03ca6ad161e84cab15b435e960039b971797a065f4a ofl/martel/OFL.txt -sha256 bb3e8082faf86b1474a6b042125ef0f83669d28110b72f70416a7587b7b9f144 ofl/unlock/OFL.txt -sha256 c4955dfe15a5db10326aa58ef767460c42cd12a3acdb3e698eee2704eb373d94 ofl/electrolize/OFL.txt -sha256 cf6dd07485d67d20f105afb9981dffdb6b180b59af45a228839cf3fb0277c9fb ofl/arapey/OFL.txt -sha256 87e8d9aca71dbe0481ba8611fc90d7e3aebfa3e2546420c403e7078898b0c484 ofl/allura/OFL.txt -sha256 55e13d77a4457aa9c60f10c5b97baea3343d3bac30960d49554a033cb9eaff7c ofl/sail/OFL.txt +sha256 bff9838fb62b99b45b3b976fdd842f5aa43b02b5f84bd28e949834096c5fffb7 ofl/qwigley/OFL.txt +sha256 893e23589ddf2536380e3ad01f2780c726919566440915971d58faef5247161f ofl/qwitchergrypen/OFL.txt +sha256 cdcc959c42ab255b4cea4bd82f2db5c24a2da7ecabe615d02d5a5dba3716e446 ofl/racingsansone/OFL.txt +sha256 86b4932ef0e19f8fd573ec941c3e121ae80771187ad1b854ae2b52525d452544 ofl/radiocanada/OFL.txt +sha256 a3b0977c5c25101d45054cf9199b9127b05fddc79d4da7dcf400821824e5a6d0 ofl/radley/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rajdhani/OFL.txt +sha256 5c36e7ec460b285185ea23847aa1f508708d9ce15d5c055279defd022972f836 ofl/rakkas/OFL.txt +sha256 e31de7000a2a13b2e54ad01e788fd29e979fe05ea1fded44d6e71cc06e33bb2b ofl/ralewaydots/OFL.txt +sha256 7e946cf1171784d1015279e7dc35f827957a6b5d1f1f659ae0c98e5f5e37ed9b ofl/raleway/OFL.txt +sha256 0c922e2d65050677c26ae8dc501bc9ad3e0059c4b10df2fc9717d7bdacdfeb6d ofl/ramabhadra/OFL.txt +sha256 525411e604e7a1d85a4cd42641869f94388f04a6ed77829d6c4edd7fd740ceab ofl/ramaraja/OFL.txt +sha256 9a9f089005f389717106bb3ba427cda9bd51b8a477078644566543f2a60ca85d ofl/rambla/OFL.txt +sha256 af88d31020bb48a1f78f4384249814d04a44d22feeede2ff4ae79fbb4fcf74da ofl/rammettoone/OFL.txt +sha256 1286896706738557c1fb98f0f66006d4ca675e475d681ca85976fd0da9daa353 ofl/rampartone/OFL.txt +sha256 0fc8e6675568c02aac6b41dd3cccaf2264fc5969601effe68e09b26635879b2c ofl/ranchers/OFL.txt +sha256 8c22fb3866eaebd77a2cb8e8ecbb095381ff32300db57758326fef35a26132f5 ofl/ranga/OFL.txt +sha256 27d2d3c15cded787be66c6f51c4b24bea99863f4f162961b5088e4521c2e2bd5 ofl/rasa/OFL.txt +sha256 064539f87826887d2062b7823b2b97b7625d68b642f6c945c99c0b8dc8084195 ofl/rationale/OFL.txt +sha256 ae629d13b06d9afc5cf3c07d585f3192b89b7decaffc5c4dfcfa7ce11a2a2b11 ofl/raviprakash/OFL.txt +sha256 b41267a3903a45955f77b44596e080480c577fb7221df59672d0bc8cd8cd4b6f ofl/readexpro/OFL.txt +sha256 f9f539cf7549bd417159dbdb9c400943a5b60a7366c2c6fbde9f095173d82479 ofl/recursive/OFL.txt +sha256 ed836da2ff14b9b2d04001057e03c0531afdd2626bf66a612b17124589f58efa ofl/redacted/OFL.txt +sha256 ed836da2ff14b9b2d04001057e03c0531afdd2626bf66a612b17124589f58efa ofl/redactedscript/OFL.txt +sha256 e3477c603c48733e1be829b7611199427e8ec580401635011e59aa29e7277bc7 ofl/redditsans/OFL.txt +sha256 4f1417e27511207cd217656c964f1b0d8b0c4a30156a1a699cf16dc5eba0dff6 ofl/redhatdisplay/OFL.txt +sha256 4f1417e27511207cd217656c964f1b0d8b0c4a30156a1a699cf16dc5eba0dff6 ofl/redhatmono/OFL.txt +sha256 4f1417e27511207cd217656c964f1b0d8b0c4a30156a1a699cf16dc5eba0dff6 ofl/redhattext/OFL.txt +sha256 bb33f381066f9c041fa2266fb634a00b64caedd8301ce80926ba361d9a481464 ofl/redrose/OFL.txt +sha256 fedb204ccadda62524c5467136cef4968b6b67efdc6ca3e8752c1248d81e7f4e ofl/reemkufifun/OFL.txt +sha256 fedb204ccadda62524c5467136cef4968b6b67efdc6ca3e8752c1248d81e7f4e ofl/reemkufiink/OFL.txt +sha256 fedb204ccadda62524c5467136cef4968b6b67efdc6ca3e8752c1248d81e7f4e ofl/reemkufi/OFL.txt +sha256 fbb941b371c6348ee2572ce8c78fb66128a61885f960dec1906c4e44ca4b4d3c ofl/reeniebeanie/OFL.txt +sha256 2756c3dcd85ad997b742330f91332fb478afad302708d4149f7bcd4600543ce2 ofl/reggaeone/OFL.txt +sha256 2366789d24196c55c9a79058d3a56a3e659f0629cad97f47df83ace26396d7d6 ofl/rem/OFL.txt +sha256 453da5aa5ad479f38cfec84f83ea03fa89106e728e286272db8a4198d681a9db ofl/rethinksans/OFL.txt +sha256 a1580ba69a8d706bd95e1e72ee0b5cfda0a478fbbab6a4af13b4a9e1b28faac0 ofl/revalia/OFL.txt +sha256 0886960207bb5bcf81a46ce663bab6c52a742dad80ee2cff5cbcda6f1df88568 ofl/rhodiumlibre/OFL.txt +sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeyemarrow/OFL.txt +sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeye/OFL.txt sha256 1c5bc055869d5e9151ec7774082727db720ec4293c65be67f91a4bdcaeb02998 ofl/righteous/OFL.txt -sha256 de5ff32211a4340b01477af39ee339d639438955e409f79b666d4b9207f3c92c ofl/dohyeon/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/waitingforthesunrise/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglish/OFL.txt -sha256 44a7c6e4c5572392ae122d3b1d8c6ba6fd640a7797e675384585d947f2773e3c ofl/jua/OFL.txt -sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signikanegative/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantgaramond/OFL.txt -sha256 9ee6b2ec20a06c599a07412690876eb457bf192c10e886e60d8bdffb80bc21a3 ofl/sahitya/OFL.txt -sha256 dcc832bd71ea62cbf97f06327a1b5442905b49ea446801421d71f7d1362db215 ofl/dokdo/OFL.txt -sha256 8aa063e3a1299c5e1821f386f5ca8bc157ac561bd12c739ffa81c6f0821450c0 ofl/donegalone/OFL.txt -sha256 e588abf45ca2b19c340c4b27349c9b6b6e5e198316fd965128ed9f4422942cbe ofl/raleway/OFL.txt -sha256 9860b97028024085855e503e32c1971bfd603374641cd018c136433ebcf5a338 ofl/gravitasone/OFL.txt -sha256 ee9d043332991eb6bf2bd56fb04db3c558c1ee2f0cb9aa7b18366c77e34fef30 ofl/jura/OFL.txt -sha256 15b1a21c3fa37a475ba6b0c0cfe289c7952548caf6e432068ddaf98d139ce419 ofl/belleza/OFL.txt -sha256 c5a77946a56488790364d060628385d51226da62a18f30d2be0181d82ee62b00 ofl/suranna/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/megrim/OFL.txt -sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extendedtext/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/teko/OFL.txt -sha256 d324289a26909a519fb16c3d468a56ab909ad6d9070cac5742e5d59ad9bd9815 ofl/gildadisplay/OFL.txt -sha256 c0bcb72e68dd416db0bb9fcec7a7fa62321b0147cde00d8c8f82748e33aefd34 ofl/novasquare/OFL.txt -sha256 794d72ffdd25e8f7ca8e1d68db088c30ddbf2fdb369b6cc8217d4fa5fa6dc62f ofl/adobeblank/OFL.txt -sha256 806cb93632b8091cd36554642a96b2752bab50015da6a2b456d786c1f9aef5a5 ofl/carme/OFL.txt -sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasans/OFL.txt -sha256 08b6f5cceaefcf2881eb009adeb78edd0fabf9c8f0eaf8b88f07a690222227e6 ofl/varelaround/OFL.txt -sha256 3f0f27931c92453994176af3b1e7954f9aac39fe145374d6d08c47c822e82e59 ofl/princesssofia/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeoutline/OFL.txt -sha256 455397ca15d39e9178bbbf4b485a29187751d60f7ceb7829980a521d5ab6848d ofl/sofadione/OFL.txt -sha256 b7574cd4c76770e5e3915d16bd93f09663bd77cb041a4ec09d824c52b540529a ofl/germaniaone/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/eastseadokdo/OFL.txt -sha256 520a0c239d39b379b61c4de5f8e3b02db20b0dfc137481843eac01f02c41f4a2 ofl/aguafinascript/OFL.txt -sha256 ffaf7bc750bdaa0b95b09eb80e419748bfaf46268c6612860f0a5e19e17abb12 ofl/orbitron/OFL.txt -sha256 c6b9c7322fe0203d4d8a0f98541136d8d76da76b92c79d206b09991b98338cc8 ofl/gemunulibre/OFL.txt -sha256 2f871c2e81de6d0c72c981615002c30bc9f1637003d6d3d4c3f0149886b70569 ofl/mervalescript/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaijaan/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsanvertical/OFL.txt -sha256 00a6fe8dfdc48d6206bcc4f10a765515a73433dfba7255eff966963beb26facb ofl/dhyana/OFL.txt -sha256 cd2dea62cd4b0c5fb335cf07ff04fd5c4bacb49b8d6c2bbbef9766c663d79b1c ofl/patuaone/OFL.txt -sha256 c0a8947de199b422d30c16137e4decd5362e3a1d504422880d69c02bd6046dac ofl/cagliostro/OFL.txt -sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alef/OFL.txt -sha256 2cc926050c4c6ccd9a0288b7792e2fcf93e5629ee6269e35986f092275e5a1b9 ofl/sarina/OFL.txt -sha256 f1bce31b817dee01c1e4ef8bc45d8ecb95f01f4abbf0a985007cb3cd0fd8123d ofl/zcoolqingkehuangyou/OFL.txt +sha256 33e3a83e377c6a41149044bd919f50d9a971d801052d4e0c0a98cb417b42ae38 ofl/risque/OFL.txt +sha256 b926569d7ff2c695dab9d771f3d9c3ded162f7a5bbac4aaf390d89f1ce0e1a5c ofl/roadrage/OFL.txt +sha256 0e4cc6ece88573545be2ed25835363662a6182ba4a4c1b5c8feda52add30e8a6 ofl/robotocondensed/OFL.txt +sha256 9cbaed04b20c853f99840efe5dc96956f6f6120ed83a0ade35f9281a2b63e5d0 ofl/robotoflex/OFL.txt +sha256 9fb77dcb5cfef0de20f4b1ba296e3127320bcd7cc408ded5f61cd884f7bbb4dc ofl/roboto/OFL.txt +sha256 34dbfbb43e0b4fdeef445d77b9ac0b988e5ad7a9bbf16808c97b66c66d51f553 ofl/robotoserif/OFL.txt +sha256 91595b148d8e476851147257a1234aa4a1dba722424fcdbdfca8965450fb48ad ofl/rock3d/OFL.txt +sha256 b2f42a005a6a48ead81e369021e300184f0cbecb48aee6f831e46c7897f6055b ofl/rocknrollone/OFL.txt +sha256 31501a9490dce395cdb40015237d3684186b79f81dd6a31442d669eb7da81066 ofl/rokkitt/OFL.txt +sha256 e75230ee246a04912366cd8d759d081200d80fb0756766c96dd52f73e8b40bed ofl/romanesco/OFL.txt +sha256 16741ac498178f645283cfb45b7a487b6d361b5de5730c5ea729f056f414f6b0 ofl/ropasans/OFL.txt +sha256 944998f475ee63b332a19137840d9e334c94ec6300f8091a5049a647798ca33a ofl/rosario/OFL.txt +sha256 8a59454b7f1cc0b1fa29805781769047e5c269aa629e3422c2d7fc04b89e5c1f ofl/rosarivo/OFL.txt +sha256 08fdc7cbd92b9bbc4d41d0945ae7f25450d91c5fc8c66c68df331af3505e4ec3 ofl/rougescript/OFL.txt +sha256 67f64c5509e5151796599e3ad47c3131cbe0c80c4f9430b90236a1249c2eacc9 ofl/roundedmplus1c/OFL.txt +sha256 c585309492415154b9ad6401a9e0c5d9e3f9b2e92b71146d968e5bd4305ac74b ofl/rowdies/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rozhaone/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubik80sfade/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikbeastly/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikbrokenfax/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikbubbles/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikburned/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikdirt/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikdistressed/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikdoodleshadow/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikdoodletriangles/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikgemstones/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikglitch/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikglitchpop/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikiso/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubiklines/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikmaps/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikmarkerhatch/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikmaze/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikmicrobe/OFL.txt +sha256 43d530580461a574f6dfed9e15af6a74e95f7c04d9bfa1174a63ff036e8eee07 ofl/rubikmonoone/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikmoonrocks/OFL.txt +sha256 472cbe7c25441df63e9c7864b43eb3c0f4b3df950c66a76224e6cfe1eae843fb ofl/rubik/OFL.txt sha256 9788e3b3e67f22ab5846a0bb867a230e7df2468c3cd20f730a5d9c34e673d090 ofl/rubikone/OFL.txt -sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustinavfbeta/OFL.txt -sha256 ee81f11dd1970e9749afd2a572256f8eefce65532872762a4d7a3d5daa0812c8 ofl/shojumaru/OFL.txt -sha256 4f4bc3806a1e55789c6ef75ca5fc628297b05292f74966474dc0d40324abc609 ofl/abel/OFL.txt -sha256 064539f87826887d2062b7823b2b97b7625d68b642f6c945c99c0b8dc8084195 ofl/rationale/OFL.txt -sha256 a345b13576140008a697ac66ca8c76cd63b1dd076712bc30a0f5e97dcc53cc83 ofl/markoone/OFL.txt -sha256 203693528d6d2e8dc5e639c6ea42b3e825b59dd6447294e37b306fe734650091 ofl/arizonia/OFL.txt -sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/fanwoodtext/OFL.txt -sha256 3997621a219c7758e31dbafdd3cbd2bcb0b6144a41d1ca068d04dbcc4bafcde6 ofl/milonga/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeshade/OFL.txt -sha256 162a3b5c72cba845280a6f887c11d02984540b924510138c8b1eb473bcdafb6a ofl/concertone/OFL.txt -sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveatbrush/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlow/OFL.txt -sha256 9551ade371e7bcb1f6d9959273bbf1fed3bdf398efb5c57cc1fd85d6a13e9e5e ofl/londrinaoutline/OFL.txt -sha256 f15a9a3a9a665c2d17655b8fedad86d9a8f30081d46bb91236beb1bc7294a589 ofl/akronim/OFL.txt -sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo13px/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikpixels/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikpuddles/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikscribble/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikspraypaint/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikstorm/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikvinyl/OFL.txt +sha256 f9e2d4498ea80d38bac7b8841d68af68c132fa67e1552e7c05717e6987de1d74 ofl/rubikwetpaint/OFL.txt +sha256 1ac58be64e921818878e02adb0712060d51991cc3341228748ee6055885662aa ofl/ruda/OFL.txt +sha256 ce1108854c91696a8549bb21459f1dc74e8a1ec11664d712c3868c40042f1a8a ofl/rufina/OFL.txt +sha256 028e6aff42d008b81b231919bd68a5508b4b5ba53cab9344ec6eb2cbffc1721c ofl/rugeboogie/OFL.txt +sha256 e604b133509815768e6ec4738bb04844ce9a23e80099d2b61e5d75ef46acbeb0 ofl/ruluko/OFL.txt +sha256 b598b7fddfd578950aa1fe6e0e2607b779abfaa686b83af8ec65c860f646b2cd ofl/rumraisin/OFL.txt +sha256 0dd28b488490429f3037082a331fca8a07d19f2218272f6c4260b196fbffdee1 ofl/ruslandisplay/OFL.txt +sha256 3ac1301549523d9861fedca12871f24e575fbd26d520632fc00ba849b471d275 ofl/russoone/OFL.txt +sha256 b044afdd80638da6bb25da192efe7e72e5d2c0944862d2ecd19f21fc95371199 ofl/ruthie/OFL.txt +sha256 2abc42812053bb5fd07d5f49c98311fef1471c2ff108c372abbbd44cdd4c7759 ofl/ruwudu/OFL.txt +sha256 399b33eb38cdfc76b8665defa5f81d52e8193d630ad5858c893db6bc20031bc9 ofl/rye/OFL.txt +sha256 2e2cb5a98da665f2ab82a9fd01fb18c2337f845761b0c163f690ed65f3b94677 ofl/sacramento/OFL.txt +sha256 9ee6b2ec20a06c599a07412690876eb457bf192c10e886e60d8bdffb80bc21a3 ofl/sahitya/OFL.txt +sha256 55e13d77a4457aa9c60f10c5b97baea3343d3bac30960d49554a033cb9eaff7c ofl/sail/OFL.txt sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairacondensed/OFL.txt -sha256 96b7bc175186cd0153a9682a1c9bb1da7103ab13a83abef8026bc64582ca616f ofl/oregano/OFL.txt -sha256 6fc386ac48a529b85c21f90a6c8d2111c6271b3063f9ddd78e92645db5259510 ofl/tulpenone/OFL.txt -sha256 13e862ac3f67130f58bd4bebb61c588d147b5a555b1ac6959570799c4f648cd0 ofl/capriola/OFL.txt -sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktamalar/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairaextracondensed/OFL.txt +sha256 f2665d4718b452b3818a877191355ac884a6b9b419d35408fe7ee487e9e8f30f ofl/saira/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairasemicondensed/OFL.txt +sha256 fc7c16a0d286a351a7de245a0bd661275e9d393de8955c7fa37ef3c8b85b7e3e ofl/sairastencilone/OFL.txt +sha256 31c59bcdd538c113ef5c048f56827439facb12b7e5cfd158b04c83727edc453b ofl/salsa/OFL.txt +sha256 5f8ff4a3f951c104e99245bdb952be08c73369222048bbf19fa3bf7170d10949 ofl/sanchez/OFL.txt +sha256 69f01b79c1be37a734736a94a12c55cb28d09ee93e4febc9db109cec608f9ae7 ofl/sancreek/OFL.txt +sha256 156ea6985861158c7dea63ecaac4c78ab0ed737d168ddffc3e34c687985a033b ofl/sansation/OFL.txt +sha256 0cf28cdcf1cdfd35054352816b2d8c81bd6d6f73632198b61507f26dd4dcbeea ofl/sansita/OFL.txt +sha256 9e0d3db586ba0abf5ca398683809dacdf4c81b2960f592bd085fbf206a67ddb0 ofl/sansitaone/OFL.txt +sha256 e0513f56a7710b94b459ccb7ef77bb7a464e24c777fb2f7023b78af8915dbb86 ofl/sansitaswashed/OFL.txt +sha256 b26cae1321380296ba8311b632a397d5eac11b47197f9d0aa0b9310f1531ad60 ofl/sarabun/OFL.txt +sha256 afb8c471158619593df0fb501453bd39fda42396e2cc3911e2a0a471c11b863c ofl/sarala/OFL.txt +sha256 2cc926050c4c6ccd9a0288b7792e2fcf93e5629ee6269e35986f092275e5a1b9 ofl/sarina/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/sarpanch/OFL.txt +sha256 4c28e5c8e904020d010057646481259101cc0d10a6a8e204d8d796f083ecb4c7 ofl/sassyfrass/OFL.txt +sha256 5f247fad3e8a86b6c0779dff09277047c1ce2b0b7580a1093347a8af755352ba ofl/sawarabigothic/OFL.txt +sha256 c254ae01c407f4a2bd0ad163e4c1a795d57ddfa8967c21b8a28c250b44d13963 ofl/sawarabimincho/OFL.txt +sha256 0a852a06f0256a6684662663ccb1d8e08d131abd1f70cf8d972a344cf31aa381 ofl/scada/OFL.txt +sha256 206ce51bc8843a6f95d64ea4c14f24ceaf4dfe199153debc5532b87d1d945d8b ofl/scheherazadenew/OFL.txt +sha256 3b4f3063b6ac7c1e403e2c4a5e8ef3a58190ff83ed7b15af66511858699139ce ofl/schibstedgrotesk/OFL.txt +sha256 b5c776129b160163c84620b35fd45dea45edf49789cda5a94c2290c230581e0b ofl/scopeone/OFL.txt +sha256 3d08baba63f1f2427fd96dee8da30b1ef6c1421b3be0e1f07cc2a78abb27c91d ofl/seaweedscript/OFL.txt +sha256 0b27313ffedb61d9941c5ba17c8b9ef5d2724c6e9aff41cd1ece24baed059eae ofl/secularone/OFL.txt +sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedan/OFL.txt +sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedansc/OFL.txt +sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickavedisplay/OFL.txt +sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickave/OFL.txt +sha256 a07b444918d700ed5d2e5ca153d3e55035874c24f8ed7a30ee9be026b03a719a ofl/sendflowers/OFL.txt +sha256 1d37e58d4bc1383c5141211bbd5bf123d80aa1d26d5b09dfcbac2bfc2fffb826 ofl/sen/OFL.txt +sha256 473c5e3123102434d05c66a9fc8b19cf285a3bf71cd8a91a41acef44d1448e62 ofl/sevillana/OFL.txt +sha256 444798d79ed7957dd04526095a94b3070f163fe0850e9cf2ec497c758d288bfe ofl/seymourone/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/shadowsintolight/OFL.txt +sha256 6a28d4d5d8b4d1ea89ace5a047ac6e0de182acdb8bfa22897bf7702102094f69 ofl/shadowsintolighttwo/OFL.txt +sha256 5f23f1b25bbc73e5886ee2c0863dfc4f3ecb18cb65092bab8e4e8403e3e679e5 ofl/shalimar/OFL.txt +sha256 ebfce7d104d597c385b71e9fbf8f0e2034e73320f857086105dc265b82c05caa ofl/shantellsans/OFL.txt +sha256 bab5a06fe5d0b7ef84a169bc67a6ca90f65e9a13877b84ce564a60b19142ee0c ofl/shanti/OFL.txt +sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/share/OFL.txt +sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/sharetechmono/OFL.txt +sha256 87b7d831a81fe8b37e7e6c672937493f710ff81883eee3adec7b5423297efd16 ofl/sharetech/OFL.txt +sha256 9ad629515fb62dfc2a831187b260bb53b4fcae1494dd4cb94c2b30da2466da51 ofl/shipporiantiqueb1/OFL.txt +sha256 9ad629515fb62dfc2a831187b260bb53b4fcae1494dd4cb94c2b30da2466da51 ofl/shipporiantique/OFL.txt +sha256 41fba056279be5f45ff9a99e44b7b53897b42732f5806d8e666e0ab49ac6bd38 ofl/shipporiminchob1/OFL.txt +sha256 41fba056279be5f45ff9a99e44b7b53897b42732f5806d8e666e0ab49ac6bd38 ofl/shipporimincho/OFL.txt +sha256 82e1f1ecc4c04924c6490b5a3f03c39feacb81337a45911daa30b758c69df788 ofl/shizuru/OFL.txt +sha256 ee81f11dd1970e9749afd2a572256f8eefce65532872762a4d7a3d5daa0812c8 ofl/shojumaru/OFL.txt +sha256 fe079cdbbad0f6520eb0a8235bce65b21596dd0c4c5a2694b3325cc87313b618 ofl/shortstack/OFL.txt +sha256 325e890b8b26fe0a683c3ba24c506d902bdd7034d9c47bd7fa2bb72b5433b9c9 ofl/shrikhand/OFL.txt sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siemreap/OFL.txt -sha256 f76c1013cffb3e0de0e7dad19ee5b4b7849c7ab10b67218515e39cfd87e554a7 ofl/julee/OFL.txt -sha256 c264f64bb2b91ca0dfdeab75d71719120271fa6a30035396416af235ef481c1e ofl/merienda/OFL.txt -sha256 d102f22055cfa31a9659228483de3c726010f0b3b416b78e3cbefcb54816e812 ofl/galdeano/OFL.txt +sha256 75ff072c71b85d17c237e06104b5ff6648095cd62229a321b3bb5750f18df49d ofl/sigmar/OFL.txt sha256 2db02cb5d05d5f8a003ffefce36a32a16520ad4cab9ed90635ff953b583e4e82 ofl/sigmarone/OFL.txt -sha256 cdcc959c42ab255b4cea4bd82f2db5c24a2da7ecabe615d02d5a5dba3716e446 ofl/racingsansone/OFL.txt -sha256 c88333734ad7cd30540ec6614d12aa829a0395715de30e336d22ddfa3005db42 ofl/catamaran/OFL.txt -sha256 26daffa24723bb188643085cfc5423f9d78d22a395df4a7928380e430545a201 ofl/bubblegumsans/OFL.txt -sha256 de2246895f0ac21fe05b095d586d36cbc9f987ebcaed1e050c61e69667caf1c6 ofl/hannari/OFL.txt -sha256 b54d54664cddcbf05f5b4ea3aec7e89317eb917cf465920969e7b22361e0f4a5 ofl/seymourone/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiaseriflibre/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsanscondensed/OFL.txt -sha256 5802c9e3509199c7aa9a13ea410ae27febbc0cdea184bf7d227170fac703bba8 ofl/passeroone/OFL.txt -sha256 2400b30a72d2b1555255b81625576dfb552584a19a9c85ad8d43ff77bceab13b ofl/plaster/OFL.txt -sha256 4bed7eaae70cab1bdf2bcf9b1cb562fcd9cc26d1c3533c4ade0ec70516dfb3a4 ofl/trykker/OFL.txt -sha256 45b1f44d2cb859ea4b7be2f322c57b8ff7be55075c336744e62b5550cd0a97eb ofl/medievalsharp/OFL.txt -sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpass/OFL.txt -sha256 ff1f38ac4e694a4ad5bd3d7a5146cd8bd73fd57aae794ced76a24b0d68e41206 ofl/pinyonscript/OFL.txt -sha256 6aa923334ec515d26b1a61bb978a0bb5bd8884de7529add1625beef2f4a53f74 ofl/nicomoji/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesansexpanded/OFL.txt -sha256 38fab5a643fa935a4e11edae2d7b2bbe9866b4f4828c2be2f41451b3f27cb67a ofl/paprika/OFL.txt -sha256 a5fc033225d145b43fd7391482ae7689825414ce29a01614d651a3012b57c81e ofl/monsieurladoulaise/OFL.txt -sha256 ecc91fac753ad9ba5bb7e7819a5c59ee1e3cf89032133c6b4b0318d63c35933b ofl/alike/OFL.txt -sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejugothic/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepica/OFL.txt -sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/mate/OFL.txt -sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillscolombo/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/secularone/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesans/OFL.txt -sha256 136a256d6050ed32bbf96736d70b9099c6359e83dabeb6847cdf6b8ef84319cc ofl/kantumruy/OFL.txt -sha256 72060253bd481a8dc18664bb9117072dc07c0f0270a40617c230654821774850 ofl/pattaya/OFL.txt -sha256 56d9c3529facf93873a2a1626dd038054d244b3af30a1e3ffe0e78bbda1c7622 ofl/preahvihear/OFL.txt -sha256 1a2debd5ad8e656b26bb3b29213caa8f7e557a2f31454b11ebb6c3e3b59aa5d4 ofl/cutefont/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/kalam/OFL.txt -sha256 d941c5b788d47aa469ee54e30f4c12d6a43c45a295f10c568bdf9772f2893b7b ofl/oranienbaum/OFL.txt -sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosans/OFL.txt -sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedford/OFL.txt -sha256 0acef93ca37cf19eeb83a1c6a29b78b08377a211c8d80cd27626e210176828da ofl/kavivanar/OFL.txt -sha256 c0562e066174197902a4a10606673d189f067970ef89c6013943b9cf182aadbc ofl/titilliumweb/OFL.txt -sha256 f8fbefb5b1004615e6d1e84b1c75e68520d91196f600cb1b07620dd2748eff64 ofl/cantataone/OFL.txt -sha256 2e2cb5a98da665f2ab82a9fd01fb18c2337f845761b0c163f690ed65f3b94677 ofl/sacramento/OFL.txt -sha256 251f65282ff48a7e8ef3fb661fc99254d9b3b0c368427c98b1edbfe4ca66e888 ofl/katibeh/OFL.txt -sha256 31bc966c36352bfd33717382786d0458c38ecf540628ab134e0ce35fde801d28 ofl/poppins/OFL.txt -sha256 f016385cb4b360e7698d22a48c6b58c0634b1ed5c9c17df78515d43887511df6 ofl/yaldevicolombo/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/swankyandmoomoo/OFL.txt -sha256 b712dacdda5da76c0213f8478886f893b855665c1153ae438bc3e55a7dc525ef ofl/kurale/OFL.txt -sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/chonburi/OFL.txt -sha256 8f187da1eb4f23e3fe7ba68b1cb2e92881a415dd34c46489698454517e273c4f ofl/krub/OFL.txt -sha256 3336bf5d4e7eedba48ecb831f37bf676e901c39f2e6a422cceadd9d2ffa55be8 ofl/kaushanscript/OFL.txt -sha256 bb655534b6c7bf3e547c1368a68a5b1032d0e96fd08b5cc75f3d7a78528784ef ofl/novaoval/OFL.txt -sha256 04b895d77ccec5034191e953e8e5884637269be15fe0675fc25039014eb46349 ofl/monda/OFL.txt -sha256 d724dea493d89a7a9681186e2fb462b7cd551674960ee4142ae6b325261b5115 ofl/hanna/OFL.txt -sha256 64ecb0c6bf5cd80c3da76035c00671272966afbd32ffbdbcad95a8b56501fb08 ofl/decovaralpha/OFL.txt -sha256 0cf28cdcf1cdfd35054352816b2d8c81bd6d6f73632198b61507f26dd4dcbeea ofl/sansita/OFL.txt -sha256 d69bcd35f4a121b312a64f7e8eb15bed61c9056e9e9cdaa8d513366142c8e005 ofl/rosario/OFL.txt -sha256 b4cff421cb89d1e32036e818f291f8ab0d3294ada70b5883d5bcc6470b869702 ofl/eczar/OFL.txt -sha256 ecb52bab55d8d6185712fe8fd2fd98300f5c8c07fad0d0a97b1e579462b0dd3f ofl/bayon/OFL.txt -sha256 ed95c33f80ccca002e3a360b683c43368f9c5eb024e5b992abb51af3c10b59bc ofl/gothica1/OFL.txt -sha256 66b5c49d384cba754806a891ebd52f2ca08dd05c0eb3c56170192da466a00a20 ofl/londrinasolid/OFL.txt -sha256 284a5a26e6db9a04259a5690ad57d52c56a4c515ca2ece1943d950f99e709dcd ofl/belgrano/OFL.txt +sha256 225fa26a24e27536ac01342419a0aa812469f5f2eaf0d79693a5f92904e86571 ofl/signikanegative/OFL.txt +sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signikanegativesc/OFL.txt +sha256 225fa26a24e27536ac01342419a0aa812469f5f2eaf0d79693a5f92904e86571 ofl/signika/OFL.txt +sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signikasc/OFL.txt +sha256 86c5e9c9382cdcc5948704fdfe60f2aa164a719746931219a42736ecd9cefbd3 ofl/silkscreen/OFL.txt +sha256 61056041809e0ba18bf8b9d637a375ab1c725025428533d74d668d88b2cb8b89 ofl/simonetta/OFL.txt +sha256 397e83b05703a4240be51e2c3a2be1d0d7693d7a2d8b1ff367c26a2b9afc013e ofl/singleday/OFL.txt +sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/sintony/OFL.txt +sha256 ca19ac21c7656f493189093eca52b4239fcc5eacc15ab2e3d67cfbfc0e6e443b ofl/sirinstencil/OFL.txt +sha256 95803fae1b063e592c67b5867f1f36df1df526e5ebf33c6cd4d4afa31a9d5586 ofl/sitara/OFL.txt +sha256 29cca754098468057880970c604e55c4e2bcb8479742e4130c94f2ddc0363f9c ofl/sixcaps/OFL.txt +sha256 a5ef1337c7efa6a7dfb4f23ada5dc9319653b60acb34601ed734608608fee39d ofl/sixtyfour/OFL.txt +sha256 593f0bc55c75b673772b378eaee314f128283745c4bb1cfdb9b8012a3b6c46fe ofl/skranji/OFL.txt +sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo13px/OFL.txt +sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo27px/OFL.txt +sha256 7d4c49f4c5e195125c1bbec7b8c6b884b616555cdf7c7101b98b39a766f88945 ofl/slacksideone/OFL.txt +sha256 dc894a2b7d8000fbda9998744f7d47e1fd1b2ab53609c1fb8461d5b3a7d027b8 ofl/smooch/OFL.txt +sha256 fa0b71e1cd04a0ba1b95f17b45dbb2d9072a9a1e7760935dfbde8a3fe8f0402c ofl/smoochsans/OFL.txt +sha256 d849309d514833fe3d7a610e10f6cd5d99b4f9552bfa304969acbf89c66e4422 ofl/smythe/OFL.txt +sha256 89418a3c7b5726c3f8828a7b7c3f1cad661cf5b7a1be3d2bd9ea243f8d9890c8 ofl/sniglet/OFL.txt +sha256 d3909465d5838d9d1c72b975ff1ed4f410a85dccd43801be525bf2b2bde89f92 ofl/snippet/OFL.txt +sha256 cd354a6084383c50398fae709ebe3a5dd98b947c486c1fe9de5f89caf81f980c ofl/snowburstone/OFL.txt +sha256 455397ca15d39e9178bbbf4b485a29187751d60f7ceb7829980a521d5ab6848d ofl/sofadione/OFL.txt +sha256 336fab6956d78eb34b50cd7bc6b16116c44735fbd0bf9f4def769ca4d8e218a9 ofl/sofia/OFL.txt +sha256 3e824d5099202de2c98cbd8e5ecba54da7d220c1ad851330726e65f3e60842d1 ofl/sofiasanscondensed/OFL.txt +sha256 3e824d5099202de2c98cbd8e5ecba54da7d220c1ad851330726e65f3e60842d1 ofl/sofiasansextracondensed/OFL.txt +sha256 3e824d5099202de2c98cbd8e5ecba54da7d220c1ad851330726e65f3e60842d1 ofl/sofiasans/OFL.txt +sha256 3e824d5099202de2c98cbd8e5ecba54da7d220c1ad851330726e65f3e60842d1 ofl/sofiasanssemicondensed/OFL.txt +sha256 5c1dd86fa761f43e8337de5ebe63ad75504423635de752c63a2f1fa93fcfc80c ofl/solitreo/OFL.txt +sha256 00730ae6eab82c336c89e1b9ad751540b032a54c822cc26a0268161fd200b16f ofl/solway/OFL.txt +sha256 495a16e8214dd38dec1b569224d3a740c8f646336877794c492638e3172e8e9c ofl/sometypemono/OFL.txt +sha256 40bd3f35477284c021978816e9d3b8723ff2283fd7065fafaa5bb3004e41b237 ofl/songmyung/OFL.txt +sha256 19d06d19f1720e1873105ce859318099f1a5322361007ce8f5a2b48463c33ad7 ofl/sono/OFL.txt sha256 6cbe0f55c154b5dee71ca4f2418d69e4e916448ef2ab52dc4541197b292efa24 ofl/sonsieone/OFL.txt -sha256 255d5debbb80eb2ea762644311f266a279e8778f00156655a516e2b7781a63e1 ofl/lilitaone/OFL.txt -sha256 490b8f3acbce2331adc9b9d3e75ee6fe07946fb29af429a300c7d066b1250b2d ofl/crimsontext/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumbrushscript/OFL.txt -sha256 f2c0dfa02d6f5c444b4babd7bc0b43be77ea85706e8524342516bc41e43c2f01 ofl/fahkwang/OFL.txt -sha256 4398885e6b303830d81eea03444aae6fb08a44f41b6acd193c88a2f8cd17606e ofl/srisakdi/OFL.txt -sha256 c1f8e0feb0babaacf774b971bcfd791e44125b9d61ff074e4c20924e9661556e ofl/antic/OFL.txt -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 ofl/notosanstamil/OFL.txt -sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/codacaption/OFL.txt -sha256 b41b99f35b507564e54f6b2f5162ad1c21f94a16837c632da6632b376a341f42 ofl/nosifer/OFL.txt +sha256 ba0b9729c9428ba79a0459ab8ec575791b51509dbec213e383d0316d37fec299 ofl/sora/OFL.txt +sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/sortsmillgoudy/OFL.txt sha256 e8d0118fa9d640543e7f6848d1d93f47313c7f56b64f73f37291d859cd5932bf ofl/souliyo/OFL.txt -sha256 bff4e5087ece354afccd073621197bbb7dd9349943b5ee6aa12b1adf0b133081 ofl/happymonkey/OFL.txt -sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanaleifill/OFL.txt -sha256 03082243ebc53e2090bc59987f693982ccee83b30516457b11f6a2349b78f5f8 ofl/rokkitt/OFL.txt -sha256 1152ca18eaa6159634f1eb209c60df360c1c09a52991e392f8033702036634d4 ofl/assistant/OFL.txt -sha256 012b1870f81b0d97ca756edd9eea315c7fc22657ac2f1cbdfcb6772fed3e20f3 ofl/bhavuka/OFL.txt -sha256 ce1108854c91696a8549bb21459f1dc74e8a1ec11664d712c3868c40042f1a8a ofl/rufina/OFL.txt -sha256 bac36a7fcafc5702d9d928bb81c7de9f8739eaa820e546c3d2cc52730b652af4 ofl/devonshire/OFL.txt -sha256 ac987f9cbc5b18d3239d88adb57a4e134049811d24ddda2f6383faa589fd2727 ofl/holtwoodonesc/OFL.txt -sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyonesc/OFL.txt -sha256 965bd2c907f7bb6f36da4f85e83f29aea8b2f720783deebd7ed7b40678e67672 ofl/mysteryquest/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemiexpanded/OFL.txt -sha256 19e186a088a50835b38b59409a76b8df2d0252ce114a99e79e306231bbe253b7 ofl/dellarespira/OFL.txt -sha256 aa36087ecd7e9085e5a1439b0a6d0ee35966e8cd2ccaa649bebe62cae5815e82 ofl/lifesavers/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpicasc/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/loveyalikeasister/OFL.txt -sha256 a9ef1db03f660130790beeb3b5d91b68536a44a98ec2db3097d02a1c5f91c599 ofl/buda/OFL.txt -sha256 de318dcb99e332a746edb9f83180ee206fc3bce74ff96ad7d1cb219967ec74af ofl/pollerone/OFL.txt -sha256 315a576cbc7ab61c9e347b5725893bc8498fdcb8fc10831793c6864bc2cefba8 ofl/gudea/OFL.txt -sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserrat/OFL.txt -sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkovavfbeta/OFL.txt -sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhandsc/OFL.txt -sha256 ec1d7de447a90e4b6d8f2b4f95c7f89a70e315fdb41969bc716059e4f2461fa4 ofl/clickerscript/OFL.txt -sha256 7039124ec9c84f9d637637da9f80158f0d3681c82d4e6a811053467f7c33d587 ofl/prostoone/OFL.txt -sha256 16f8621a8dda01f044b8a58489334dbaadfad44ef2fa1d5ce0864cc2f309df01 ofl/inknutantiqua/OFL.txt -sha256 ae30055f1e31d12f6235802c25a8872bb7053fca8ed4a604c530f4b2ee83e572 ofl/pontanosans/OFL.txt -sha256 f1ef4c3ef43322403f5c30e4fb46496969cb5c34a2a6e7247b507254b69caa6a ofl/novaround/OFL.txt -sha256 cf5c4103b0ecf3c38e7c26768b5caf05e1b3e16d4d87b32d859b3c19ce7c216c ofl/petitformalscript/OFL.txt -sha256 ed80dd9539708a531313f98fb081aeeaa395ab5726931a433845d667b019c855 ofl/abyssinicasil/OFL.txt -sha256 1404cc9279d4ad713a372a5e1e1d20d7b9b000d2397c8529aeb3df5402446600 ofl/cutive/OFL.txt -sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpassmono/OFL.txt -sha256 0878e7d6e842bc3c45154059a1c2812de0d31dca343fe6bc16abc9afdee3e3de ofl/koho/OFL.txt -sha256 636d62f04d7bda9fcf9354f258f6244e7e18288cae036b95122e204f1acbec80 ofl/neuton/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloo/OFL.txt -sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkova/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungee/OFL.txt -sha256 dc35123e99a857674b3e8807e9d7df82220d298423d9fc50ce084fbcdecf602d ofl/jotione/OFL.txt -sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo27px/OFL.txt -sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/oflsortsmillgoudytt/OFL.txt -sha256 d7b108fc1f23fb016a47bb40c63d6f6e04cc35a1edfb991638d7f03621bf7f33 ofl/terminaldosislight/OFL.txt -sha256 71e5222c549d85a1403b6e709b4328b81d7b51ba021b8bd20df89550da80c087 ofl/yatraone/OFL.txt -sha256 f139d6f43d2a63a8fb3ded48b8ec747d9d59a7fbb13d077d9b96ac88580bc1ad ofl/dekko/OFL.txt -sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsansstdlight/OFL.txt -sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscriptswashcaps/OFL.txt -sha256 64dc6a7e2a77aa340c49c3e0829703f540f8d64afa506f44eaa6741580716d0f ofl/gabriela/OFL.txt -sha256 17d7a7f5d9f0139535ecec516988c4c73a2ec0f225987288f3fd6ee2622d4450 ofl/federant/OFL.txt -sha256 c0a7efe98e77cbfcf1a5ca43e874e25cf53d9185c56295bc3b5c407f95dae638 ofl/nats/OFL.txt -sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/ekmukta/OFL.txt -sha256 e5ccbfc32e4d7fae98b467a9af310ac8d2efd5d90e684426cd24f3eb36090a2c ofl/acme/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/modak/OFL.txt -sha256 75a77451968e55a1ab404bd953bd8778983e21116d507b890fbcf838e58c8e8b ofl/pavanam/OFL.txt -sha256 36931b77dd81fa96fffad91b6acb54931e600845eb81f91ecf1b4459012c621a ofl/vidaloka/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhai/OFL.txt -sha256 1c45059cea5c6798c8591b0a17961a30328747d44214ff9b8f9c62a683bd6598 ofl/ruda/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/thegirlnextdoor/OFL.txt -sha256 4dee45deee99672fbe342b2f4b7aa75b0cd12de18a68f9732c77f096bab47e0e ofl/molengo/OFL.txt +sha256 cb30d3086a8b3ce0b9e3690bf48d6620402b61160bc658076f95180ccd9e9dae ofl/sourcecodepro/OFL.txt +sha256 09746787287a289323b0ec3cff4d1a4a801331b82b7207c1e186f5d26619a392 ofl/sourcesans3/OFL.txt +sha256 564ce565c371c5e5bbf286006565a7c9aa55a9f56e7ca58d56e05d649dd61a72 ofl/spacegrotesk/OFL.txt +sha256 4664e83780a263c53dbab95d3590a5a9db914aeb9a3c78f7e7ad451f9151c998 ofl/spacemono/OFL.txt +sha256 963f283b5410c7df62067a35cd7def0802c583a880e7cd7e326832ec3985ec87 ofl/spectral/OFL.txt +sha256 466aaa3bbd245e4c91c4e82c0828efe9fcfd913f5b020d75f0918516c2540fa8 ofl/spicyrice/OFL.txt +sha256 f938d4076b66a13cf984ce88d92a07ff9802e8ae5e1f4a28cdc43fad122ae611 ofl/spinnaker/OFL.txt +sha256 2c3737ea83b48d48624068d1bbd1d9f8049eb7cf2e1f67435e420375c42e0686 ofl/spirax/OFL.txt +sha256 e2740ec5a5949bf65af5771f0537bf26cc1ec3020782b0e43fd961973a730775 ofl/splash/OFL.txt +sha256 4abb88162e4c0c5f9fc6c2f15d7085f7b7e27fd89f541a13488e1bcb829bde3f ofl/splinesansmono/OFL.txt +sha256 45b2aa0796f435bd620d864b6b44ff08855dc575524f23ffb43161e69cb5dbfc ofl/splinesans/OFL.txt +sha256 d2f9c74aba2716333b0a3d283083f9fdc93b2e060c5ae094c79e97e8cba9d7e6 ofl/squadaone/OFL.txt +sha256 0dbdce2f23073469bc0047c323e259399a76cfec756aa5f0bd1a58f34f438220 ofl/squarepeg/OFL.txt +sha256 f8c2225a5fdb50e2e75f98cf6e69f198571f605f1b7f6f7eacc0947e2fcdbe8d ofl/sreekrushnadevaraya/OFL.txt +sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/sriracha/OFL.txt +sha256 4398885e6b303830d81eea03444aae6fb08a44f41b6acd193c88a2f8cd17606e ofl/srisakdi/OFL.txt +sha256 72afba97d1ac9409a9fd3bb91a02a639427ca1988977909dad273e293a508d7e ofl/staatliches/OFL.txt +sha256 d7577acbab1d70f2e6bd1b21d8f61db189d6aabe6375bc2d96564b8d94031664 ofl/stalemate/OFL.txt +sha256 194e25172d0144f29aff4b6fb2931ff0be0139448a5cd867db37863c9179330a ofl/stalinistone/OFL.txt +sha256 88d3abd47414e7912d0d2eb44ca89e0b1bd7c43cc2ebe58a8a75281ad75a0f60 ofl/stardosstencil/OFL.txt +sha256 3800c4515b765a7a1baadb91335aa56ed58d58c86e09ff27a1186902d520b964 ofl/sticknobills/OFL.txt +sha256 35187dd015d0c0006d57f99815fb3f81304c4445f04c3fa35bc533a7a4b00676 ofl/stick/OFL.txt +sha256 fc1e501d419d84a8f1a800adae092045002d7141241f498237611dbb8ea763d7 ofl/stintultracondensed/OFL.txt +sha256 fbc351e1b5428e4f45834647dc23a5f8aaa3e744e2f4117ca03c44f640b9a3a2 ofl/stintultraexpanded/OFL.txt +sha256 0c8825913b60d858aacdb33c4ca6660a7d64b0d6464702efbb19313f5765861a ofl/stixtwomath/OFL.txt +sha256 62c0967a997b9691326d35b1f90baf085a557327b711618bc4161325ce1bb1b2 ofl/stixtwotext/OFL.txt +sha256 a57810cbca0b4715ae8610dd7a268260cebbdd4fd76d304e371517f828150669 ofl/stoke/OFL.txt +sha256 a97ad9dd8228fbe25532616c7f12169501a5445ee33eaa233a5c69c595dfcc97 ofl/strait/OFL.txt +sha256 c8af073a60e30b55ef5d0e4f80cea168e06dd65bdee7ec18c1ea8de8f7228780 ofl/strong/OFL.txt +sha256 47d3c6fc003cb3231297530b79ca108aaa4e504c0008a80fa3dc2ee4a3e8c4a6 ofl/stylescript/OFL.txt +sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/stylish/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/sueellenfrancisco/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/suezone/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/sulphurpoint/OFL.txt +sha256 c8155eb9337078a9ea9f1e576ac813a03030ca43e2694593e90cd4fee6fce937 ofl/sumana/OFL.txt +sha256 a9b40759b5821a0c2ad07cbd2c2a61dca4b3e222e6370a7d5bfb6b373bf4fb10 ofl/sunflower/OFL.txt +sha256 88dcde7d08e509a3eec64886292a36cbd58ed9bb52f37f91f55656fb9d21ddb8 ofl/supermercadoone/OFL.txt +sha256 c5a77946a56488790364d060628385d51226da62a18f30d2be0181d82ee62b00 ofl/suranna/OFL.txt +sha256 53ad6a474f68ddfc3fe72449de3ede4d3f033b2f24b77833b1d56edf505486d2 ofl/sura/OFL.txt +sha256 42ad5a49e171bec80308a1c9e8e66b03e638b3ea65af7fafa6fc0e42f45e7626 ofl/suravaram/OFL.txt +sha256 f0e7cf380f1f4665979058b18a2f3d7bd4155dffc52dcecf2a6e82f5bd1f46f9 ofl/suwannaphum/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/swankyandmoomoo/OFL.txt +sha256 c80622543840e2bc72670a00daef3a6cb1af6fad522d15b9a5d9410733c878b5 ofl/synemono/OFL.txt +sha256 cc43cdce6f91c57989af8459341c276655e34224e954fa69c2ad700831a742d8 ofl/syne/OFL.txt +sha256 c80622543840e2bc72670a00daef3a6cb1af6fad522d15b9a5d9410733c878b5 ofl/synetactile/OFL.txt +sha256 268fac20d46709abff409b4be3847359f30c3ee4c4b7f7e5aa6dd29a4db29f49 ofl/taiheritagepro/OFL.txt +sha256 9b584984f9db0ee30347391a76eff9c0a6b03dc450c3c6afe3757a2cb3a4db87 ofl/tajawal/OFL.txt +sha256 adadb8d5d34fe2218dca0f4a4919a9b6f81dfaebb289e5446ac7b3063d6965e9 ofl/tangerine/OFL.txt +sha256 ade4b61436a9ec043fcb4b2ee823e05d9f6ae38b4aa0e130f62d785805b486fd ofl/tapestry/OFL.txt +sha256 0180c4c3f63f09bf7e740453bc1be09d40583f3884f2f4341facc8af2caf188e ofl/taprom/OFL.txt +sha256 6506b2fa2a14259a8859608a6148a4591d67bbaef4d8e1948b43c4078561b0e5 ofl/tauri/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/taviraj/OFL.txt +sha256 4a193c54e911c1e8194d4db657423f2527f54a1239f24cb67ecb09128dc9f065 ofl/teko/OFL.txt +sha256 ff4bb37f716836feb5038e1bf5c47e5a1946717fcfabb175086ed49f85ea47fd ofl/tektur/OFL.txt sha256 5a5cf278190adf8be3e9905c2b21460241cb376c600bdfd6eb7aceb66036c4bf ofl/telex/OFL.txt -sha256 bb49cbf811dafcb11e0de081efcdc8385e45ccc85a5bfc3231ec4861d444dc42 ofl/ruthie/OFL.txt -sha256 b5c3d12a3085b96011fee65555234bb9d31fa7444cf6f8d5ae6b1f5771394399 ofl/lakkireddy/OFL.txt -sha256 23b896f4937eac954a383340c92dfcac1c6e05ec21cc08ec6de47d30ad8496a3 ofl/charmonman/OFL.txt -sha256 39602407e30d466bf169f46d690aaae4f5f039258e5642f91a80bb132ce6e14a ofl/bubblerone/OFL.txt -sha256 e31de7000a2a13b2e54ad01e788fd29e979fe05ea1fded44d6e71cc06e33bb2b ofl/ralewaydots/OFL.txt -sha256 8218df19bcd9786311bf1126815e8d591027aaf7611ef031af5a31c3fd66e928 ofl/arefruqaa/OFL.txt -sha256 e37fcc467040ecd81bf4cf59c99ef56b20f57918995e82b3de1d5b4e931bc2e6 ofl/portlligatslab/OFL.txt -sha256 60fea3a0da19167a3efb9c3792a3a15dc9235405d01bbec1233fdf3e79c74296 ofl/freckleface/OFL.txt -sha256 da15da6b1496d4de18f97e2ad1b722ef8a1c121149c2c93b2cf7eac6ac27b35c ofl/mplus1p/OFL.txt -sha256 d51f3341fd7b3dfa1114d3ef0bdabbe57f60eef86a1458019e0077d676fa1fcb ofl/lancelot/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantinfant/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemicondensed/OFL.txt -sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eater/OFL.txt -sha256 b43e2530c7af69fe1800f180d210b6d2745915ed4e0e404495038c861bb6dbf7 ofl/hammersmithone/OFL.txt +sha256 cbdf9d35f32a9a2f02fb23c8b89c115a5a8e45feaaa2266920c4594c83dd5ed4 ofl/tenaliramakrishna/OFL.txt +sha256 7b826efb1b74a50b1c1aef0a1ba4530925b993ceadc3016d1d787c68a61649dd ofl/tenorsans/OFL.txt +sha256 75798d56e448ba4d2aec3ef5f3c2d805d9c6fe2ba688cd3d7162b2dd31e9cf48 ofl/textmeone/OFL.txt +sha256 631ba6504ec2454e472196173aea91c423295787d2128f3732e73fb07a9ea1e0 ofl/texturina/OFL.txt +sha256 9b8405bf5f503f92401fc990f372b34d469670ab60041d5298d1015d3d0b45f8 ofl/thabit/OFL.txt +sha256 59bda6b53e28d388de5eac7bbb8f3e65889dc8489be3d922f95a525354110c0e ofl/tharlon/OFL.txt +sha256 31eb7046f4c80e0f96944c4b40b0772de68b34783b794fc13aab3f54c2ef6d9b ofl/thasadith/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/thegirlnextdoor/OFL.txt +sha256 ed90d1f988ede9fa1db0ed42f25db2cf7b47d8f411832205a073c6553d44f98b ofl/thenautigal/OFL.txt +sha256 01af2625d6247ecd2430d1d1603c579f85989d43b2d9129e08e0ac0df8909918 ofl/tienne/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/tillana/OFL.txt +sha256 97941703cd5fb1d5e86a062c9463ed12a613dbfbab9961c333699bdb2d277321 ofl/tiltneon/OFL.txt +sha256 97941703cd5fb1d5e86a062c9463ed12a613dbfbab9961c333699bdb2d277321 ofl/tiltprism/OFL.txt +sha256 97941703cd5fb1d5e86a062c9463ed12a613dbfbab9961c333699bdb2d277321 ofl/tiltwarp/OFL.txt +sha256 f2fcbde4b8968400d661e7dcc23052b1885815c8e3b45323b26cbb833352f5de ofl/timmana/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirobangla/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirodevanagarihindi/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirodevanagarimarathi/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirodevanagarisanskrit/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirogurmukhi/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirokannada/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirotamil/OFL.txt +sha256 2ed6051706542c5d6d96480318152b17900bb6d4dbadb11d7d5d6464d8b3e0dd ofl/tirotelugu/OFL.txt +sha256 61be7c29f4835e2be7243db12213d75d53ff028f29f4b493212a1688b1d3a1ba ofl/titanone/OFL.txt +sha256 c0562e066174197902a4a10606673d189f067970ef89c6013943b9cf182aadbc ofl/titilliumweb/OFL.txt +sha256 1dd4eaacd1da1bfb7e1d14dd5af0279c17d4503fde55abc628bdaccc63ae9eca ofl/tomorrow/OFL.txt +sha256 8e4050fb74972d5c2021517f5c9bb7d60af585a36e967fa61762225ed77abae1 ofl/tourney/OFL.txt +sha256 018d17b5e04c0a217a21979fa6b6d77bd5a143a5f06ea2ea102e427abd1ebfa2 ofl/tradewinds/OFL.txt +sha256 709f9689eabbab61e913ddc288187e7e3d09550339f7df894a909548f90af814 ofl/trainone/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/trirong/OFL.txt +sha256 50fc74eff3191af1c918c047600d1e7f15324eb13f7c7c1cbbe43949bb261536 ofl/trispace/OFL.txt +sha256 b5b48b6baf1a46fbe309af924841891869f4aeddda039943b20c623028b6c726 ofl/trocchi/OFL.txt +sha256 72a22b6dd29b6b0cdcc98de30701b46532c9f7314ee095df3063d10775dd70c3 ofl/trochut/OFL.txt +sha256 d4c3f10bf7997331b75c76d40535898729361c589b7301507120fa5582c827f3 ofl/truculenta/OFL.txt +sha256 4bed7eaae70cab1bdf2bcf9b1cb562fcd9cc26d1c3533c4ade0ec70516dfb3a4 ofl/trykker/OFL.txt +sha256 0d268d55bd00b6518d3f136afb63e7f01f49c922b06c4e55dd4a2841d3bd66e6 ofl/tsukimirounded/OFL.txt +sha256 a36ab46c8b1a74a480a1c51d6a5af08b643e870c6d247f233bc97c97c8ad2098 ofl/tuffy/OFL.txt +sha256 6fc386ac48a529b85c21f90a6c8d2111c6271b3063f9ddd78e92645db5259510 ofl/tulpenone/OFL.txt +sha256 b479f3aee0d64914d4d8575bb8d7b901ffbcf9badf0c4ae0cef89ff2df394115 ofl/turretroad/OFL.txt +sha256 bbb2d117979266df4a2178e2ed7d6d03df765bd3a8763733b8446350f109533f ofl/twinklestar/OFL.txt +sha256 44a89ff5fd62cee611cf9c6134ce7db219aeb90703b19db2361dcde648d73918 ofl/uchen/OFL.txt +sha256 31e5d4e83955e7103c34570dd49b0570ef490800bd65b42923c0dd02445263b3 ofl/unbounded/OFL.txt +sha256 244ca4ef7b106d8c660e9a00cecf5d581b6a222f447d7d59a8f61711b2ad3400 ofl/uncialantiqua/OFL.txt +sha256 b0316f404a7b291e40921c605160181065791a5010a2d2d5691fc7e28cdbdff2 ofl/underdog/OFL.txt +sha256 05f4462985eece49ebd278c13ac1011b546e0a9a4675c542b7239edc90df55d4 ofl/unicaone/OFL.txt +sha256 99d2f30e282d6174af8ff68597f58bb53c0dcb2b104a4c1b8d19da49021d00d3 ofl/unifrakturcook/OFL.txt +sha256 96199bf9ff12dd471a66911dee95440737b437e7f5a6fd30e9e950c16d66e8df ofl/unifrakturmaguntia/OFL.txt +sha256 c1cf7f8c4f87824f85386000ea0edd60aa7d4d1a07b87a6e9627149fc9705511 ofl/unlock/OFL.txt +sha256 99d67fff016522688b8f913377f8ae9f6da6ffeae42cf67c0e5e87cfb0928d33 ofl/unna/OFL.txt +sha256 b658a65a9462d5204aaebb6804efacbb0fced61b2d03f7a321f7173aa114b7ab ofl/updock/OFL.txt +sha256 ee1221b1c2d08920e5f9ca764eb228dafa5c8090df9cf665373c2287b9cb8f49 ofl/urbanist/OFL.txt +sha256 7344b8b8c97c4f88c0ff8bb72bb024bba72f404be1c740b6596a73ed15d28df3 ofl/vampiroone/OFL.txt sha256 5a8751bef5a4fc867ae015099267905034345260f14060fa276aac4051ddd8b4 ofl/varela/OFL.txt -sha256 f6fc9fbae062e4efc1b0306e27715d43cd64a48b8ffba81c22034b8efee4fce2 ofl/cabinsketch/OFL.txt +sha256 45446732635812510428bf1bad902a8b133f3c7348ad8593ecca90895595b278 ofl/varelaround/OFL.txt +sha256 291cdb55bc64894f58739446a46e19687574662722ab110c1a2b7e5d435171e0 ofl/varta/OFL.txt +sha256 f1d1a3536fa4b9c71d04fe4c8d8bbfc0cc5c457d6883f45086b04d0bc07ed12d ofl/vastshadow/OFL.txt +sha256 17e355067c8284f47743a1ee3b1ef7ff684ff0601eda357f9353b10b3016ab31 ofl/vazirmatn/OFL.txt +sha256 f3758ee70600ecd5450f01ea373204b202e048d0454c9db2d1175c5a5dd1e92f ofl/vesperlibre/OFL.txt +sha256 1cd4dc67e3c5a349d0121e0d91837cec083559fb94ebf70a8a31601a787f42e3 ofl/viaodalibre/OFL.txt +sha256 34ef6e0045e0798577c79d0ff774efa624e362e7154faa3a5f8ebc93299fd0ab ofl/vibes/OFL.txt +sha256 26e4c39c4905bd7f1068b0bab008f5a4a9b945e2d7fda31e52719fc5aa9655bf ofl/vibur/OFL.txt +sha256 493589852331b4ea83f1d6b0cbdc157b002ffdb995cf2429acf0c9863bc8f3df ofl/victormono/OFL.txt +sha256 36931b77dd81fa96fffad91b6acb54931e600845eb81f91ecf1b4459012c621a ofl/vidaloka/OFL.txt +sha256 b67eed9578defb59cc4ff4b58428fb816786e499e84cdeafca54723b055c169e ofl/viga/OFL.txt +sha256 dc64ddaa4fd815621dc18f538446e7a234e611817f48064dc5f6bfafefc3ed6d ofl/vinasans/OFL.txt +sha256 fd17f80dc48ff767d91d0dd9f821eebfd8b73ee82f55537a9052b6b0107622c8 ofl/voces/OFL.txt +sha256 1c43e70c49ef7a9b35fcb3758fec8ec5969ff1274c4834b4466b9014f3b9f55f ofl/volkhov/OFL.txt +sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkorn/OFL.txt +sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkornsc/OFL.txt +sha256 433e2b7a293f2a47811d032fe45d4f6e20a00bfc676d56e5a1524e4a76ab3b71 ofl/voltaire/OFL.txt +sha256 27d9af34210253e7ca1251fbace86c6f65b40031d6ce1a75493a1b2093631298 ofl/vt323/OFL.txt +sha256 e609059f5600ecaa921d782de1f5072f92c08e5b4868de63be7c98abfd9b4061 ofl/vujahdayscript/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/waitingforthesunrise/OFL.txt +sha256 bddfe669338d0dbc24c15ccd31dbf5c101a213da38049c24baca9ccb7fde45a4 ofl/wallpoet/OFL.txt +sha256 11739fc270dbd2ff3d726f5177d2402132fc1bb1455f886e4f084bc13eda665c ofl/warnes/OFL.txt +sha256 eaa2e23b59eb264d9f982126f5d6cb7594b00a6a5e3684d916ecbf0c31004610 ofl/waterbrush/OFL.txt +sha256 d842d4d8ea0c1010050a83d51ed7a5594d55a4a988e89646470454af14e9f624 ofl/waterfall/OFL.txt +sha256 739f76be0415d6176ad32a2ce489350c8e8ccc6862728d9dfacddb9b26054ccd ofl/wavefont/OFL.txt +sha256 4281c00ab5b8f672fc8d686f48cb886ffbe900c8c9ee22473ca7e72e7cef8fbe ofl/wellfleet/OFL.txt +sha256 aff3cea99bf300b4b29f4dc04867cf9b49d83de8c5ecaf991c446d506b56173e ofl/wendyone/OFL.txt +sha256 5a5681c41a0eb58eebe8ce4bad1bc8a088335a362c5d4fe02ca572dcadaae98f ofl/whisper/OFL.txt +sha256 6f375e7f24ae282137aff041b3aa4b8efd8234187f9448b91f436b958cd8edc7 ofl/windsong/OFL.txt +sha256 87b05b85d41a2de76f04dd8efd0f5781db8a498556a6c5d320478903e2329b32 ofl/wireone/OFL.txt +sha256 6ea47aed4703a072a5011bf429f998c718ff7c3ae57598f7e78c2d3fa1e25c33 ofl/wixmadefordisplay/OFL.txt +sha256 6ea47aed4703a072a5011bf429f998c718ff7c3ae57598f7e78c2d3fa1e25c33 ofl/wixmadefortext/OFL.txt +sha256 c46bda9181c8f01cf430e8b4d769a2fa8b19369f9f01b947c0d400939147e700 ofl/workbench/OFL.txt +sha256 749aca05078664ce682dce1b1b10096ac397cb088c1a6df4e1bb56f0092a9272 ofl/worksans/OFL.txt +sha256 ca75fb29ae8e2aa30b8d0a0de74842769cd204634059629521134e2baf791fab ofl/xanhmono/OFL.txt +sha256 f016385cb4b360e7698d22a48c6b58c0634b1ed5c9c17df78515d43887511df6 ofl/yaldevicolombo/OFL.txt +sha256 9d8a27215d55e25527a33cc90f0dfd32e382454cf3b5d8f815f303c9030b42d1 ofl/yaldevi/OFL.txt +sha256 9efbe6f8570e8c3d8b000914bd1da07ff4977d1325cc2d046180e05f40677f01 ofl/yanonekaffeesatz/OFL.txt +sha256 8f2e5a9b52cf355023104413827e17dd7126c5a3656492d45eaa1ceb270aa4f1 ofl/yantramanav/OFL.txt +sha256 71e5222c549d85a1403b6e709b4328b81d7b51ba021b8bd20df89550da80c087 ofl/yatraone/OFL.txt +sha256 d7d8074c2dd46804990c184e25849947ab76c5ac7607fbf3966543455769bb73 ofl/yeonsung/OFL.txt +sha256 ab592d1abca19428b89d851706fa7815ec25139c6affb45d366577ca63fb91b7 ofl/yesevaone/OFL.txt +sha256 a80ee908b60f5bec9c10b135d3da93730e2194107d1f7fd3f61bd8c1a97b3e0c ofl/yesteryear/OFL.txt +sha256 f9e5dfcdb2947c0db70465668706b0617cd052b6f86e582dff8741d9e5cded0a ofl/yinmar/OFL.txt +sha256 de2f50189ab7b6a3ff3563ce680d0984b16942a21a5cef051dd9e7701ea035e1 ofl/yomogi/OFL.txt +sha256 737d8d343b674c6894f373de71a044b6782c130f2aebf180933d63ddf7a3dc19 ofl/youngserif/OFL.txt +sha256 27d2d3c15cded787be66c6f51c4b24bea99863f4f162961b5088e4521c2e2bd5 ofl/yrsa/OFL.txt +sha256 1343b9162a2d24f685767766ea23a75a80b88ba13ba421244e65b72210578b78 ofl/ysabeauinfant/OFL.txt +sha256 1343b9162a2d24f685767766ea23a75a80b88ba13ba421244e65b72210578b78 ofl/ysabeauoffice/OFL.txt +sha256 1343b9162a2d24f685767766ea23a75a80b88ba13ba421244e65b72210578b78 ofl/ysabeau/OFL.txt +sha256 1343b9162a2d24f685767766ea23a75a80b88ba13ba421244e65b72210578b78 ofl/ysabeausc/OFL.txt +sha256 ef7c85c72ae94381c8bc4832ae4e6fbabdeafa2bb8a31313cd75dce95a690256 ofl/yujiboku/OFL.txt +sha256 ef7c85c72ae94381c8bc4832ae4e6fbabdeafa2bb8a31313cd75dce95a690256 ofl/yujihentaiganaakari/OFL.txt +sha256 ef7c85c72ae94381c8bc4832ae4e6fbabdeafa2bb8a31313cd75dce95a690256 ofl/yujihentaiganaakebono/OFL.txt +sha256 ef7c85c72ae94381c8bc4832ae4e6fbabdeafa2bb8a31313cd75dce95a690256 ofl/yujimai/OFL.txt +sha256 ef7c85c72ae94381c8bc4832ae4e6fbabdeafa2bb8a31313cd75dce95a690256 ofl/yujisyuku/OFL.txt +sha256 c74e8c47951ddd9c902f07097761cfa0457993e28d8e1e946e273c0250be77c9 ofl/yuseimagic/OFL.txt +sha256 5d6517d497bea6116ed35079b30374043f6d90b19c8d97fc4e5ec48520d1e08b ofl/zcoolkuaile/OFL.txt +sha256 f1bce31b817dee01c1e4ef8bc45d8ecb95f01f4abbf0a985007cb3cd0fd8123d ofl/zcoolqingkehuangyou/OFL.txt +sha256 a094514ca57cf8f9c5e8d8d1adab5d8cd3a377297ff016f9df2c05b3ecd77f0a ofl/zcoolxiaowei/OFL.txt +sha256 c76594cc8f4af2ea35d1e05278b1911b22cc6227bc3b0ad404f68be03fe3f107 ofl/zenantique/OFL.txt +sha256 c76594cc8f4af2ea35d1e05278b1911b22cc6227bc3b0ad404f68be03fe3f107 ofl/zenantiquesoft/OFL.txt +sha256 31b461a9de7f5b4ceb988b01d6ce4d9318180394cb5dacff5bf08c557f3cb7a0 ofl/zendots/OFL.txt +sha256 0fac78a235c98d640cb06332eb5362c211d86fa03c011df438c35005d22ad2c7 ofl/zenkakugothicantique/OFL.txt +sha256 0fac78a235c98d640cb06332eb5362c211d86fa03c011df438c35005d22ad2c7 ofl/zenkakugothicnew/OFL.txt +sha256 fdfcb596ac910b447e482f42d4d1e5df3cfcb71c681a9f10e7f2d0126b274111 ofl/zenkurenaido/OFL.txt +sha256 5f08909b75e1705f0e0d73b64654f5f1a649f523cad91f58c6777098fc46bf40 ofl/zenloop/OFL.txt +sha256 2a20cf7ce1909d8ee1e949095d340f7d7656705f7c810a2d6faf56800ad0cb3d ofl/zenmarugothic/OFL.txt +sha256 469d214f9842809659c827b7f2adaf40ec0df6efdd5fe18b7127665c32aafaec ofl/zenoldmincho/OFL.txt +sha256 0fe0292d3dc4551c19ea5774d325f5bf434e910d97c8e7eeb47fb7bac6c3a5d1 ofl/zentokyozoo/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/zeyada/OFL.txt +sha256 10947328199e369a3e6b4a67e8e5507ed99d5bbb264a1f156415aa9b665e4d15 ofl/zhimangxing/OFL.txt +sha256 3cbf579238e4eacd90ad67883d971aa346ce8990d658635f78f98d608a6830a2 ofl/zillaslabhighlight/OFL.txt +sha256 240b385d3ec8c8d5c1d4af2bbba6ac72bac0309a80c1a8ff112c168643cc6811 ofl/zillaslab/OFL.txt sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntucondensed/LICENCE.txt -sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntumono/LICENCE.txt sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntu/LICENCE.txt +sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntumono/LICENCE.txt diff --git a/package/googlefontdirectory/googlefontdirectory.mk b/package/googlefontdirectory/googlefontdirectory.mk index 8773390f0c..b0e5b6e532 100644 --- a/package/googlefontdirectory/googlefontdirectory.mk +++ b/package/googlefontdirectory/googlefontdirectory.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOOGLEFONTDIRECTORY_VERSION = 94dff3eaa9301b6640cccc63c56d6ff33d82882c +GOOGLEFONTDIRECTORY_VERSION = 2125bc9b447971543caaa132530b828e5e682819 GOOGLEFONTDIRECTORY_SITE = $(call github,google,fonts,$(GOOGLEFONTDIRECTORY_VERSION)) GOOGLEFONTDIRECTORY_FONTS = \ -- 2.43.0 From christian at klarinett.li Wed Feb 28 14:56:40 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:56:40 +0100 Subject: [Buildroot] [PATCH 1/2] package/zic: add hash for existing patch Message-ID: <20240228145642.436509-1-christian@klarinett.li> From: Christian Hitz Signed-off-by: Christian Hitz --- package/zic/zic.hash | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zic/zic.hash b/package/zic/zic.hash index a2720a27ba..f2a48b1d2e 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -2,3 +2,4 @@ sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE +sha256 9e3c665b2cf8ad1eeb3458ec736e644e3d0c86a5e2fa8bcc4f34d72317511958 0001-remove-dependency-check-on-version-file.patch -- 2.43.0 From christian at klarinett.li Wed Feb 28 14:56:41 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:56:41 +0100 Subject: [Buildroot] [PATCH 2/2] package/zic: enable installation on target In-Reply-To: <20240228145642.436509-1-christian@klarinett.li> References: <20240228145642.436509-1-christian@klarinett.li> Message-ID: <20240228145642.436509-2-christian@klarinett.li> From: Christian Hitz Signed-off-by: Christian Hitz --- package/Config.in | 1 + package/zic/Config.in | 6 ++++++ package/zic/zic.mk | 14 ++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 package/zic/Config.in diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..909b716f16 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2237,6 +2237,7 @@ endif source "package/uvw/Config.in" source "package/volk/Config.in" source "package/xapian/Config.in" + source "package/zic/Config.in" endmenu menu "Security" diff --git a/package/zic/Config.in b/package/zic/Config.in new file mode 100644 index 0000000000..11a8c99a66 --- /dev/null +++ b/package/zic/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_ZIC + bool "zic" + help + timezone information compiler (zic) + + https://www.iana.org/time-zones diff --git a/package/zic/zic.mk b/package/zic/zic.mk index a915f6d256..12bb9e9943 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -10,6 +10,19 @@ ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 ZIC_LICENSE = Public domain ZIC_LICENSE_FILES = LICENSE +ZIC_INSTALL_STAGING = YES + +define ZIC_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) zic +endef + +define ZIC_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 644 $(@D)/tzfile.h $(TARGET_DIR)/usr/include/tzfile.h +endef + +define ZIC_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/zic $(TARGET_DIR)/usr/sbin/zic +endef define HOST_ZIC_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) zic @@ -20,6 +33,7 @@ define HOST_ZIC_INSTALL_CMDS $(INSTALL) -D -m 644 $(@D)/tzfile.h $(HOST_DIR)/include/tzfile.h endef +$(eval $(generic-package)) $(eval $(host-generic-package)) ZIC = $(HOST_DIR)/sbin/zic -- 2.43.0 From christian at klarinett.li Wed Feb 28 14:51:29 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 15:51:29 +0100 Subject: [Buildroot] [PATCH] package/arm-trusted-firmware: add ARM_TRUSTED_FIRMWARE_CPE_ID_* Message-ID: <20240228145129.416828-1-christian@klarinett.li> From: Christian Hitz cpe:2.3:o:arm:arm-trusted-firmware:2.4:-:*:*:*:*:*:* is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/78601535-610A-45A5-A5F0-AFC6A27A7F83 Signed-off-by: Christian Hitz --- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 2d554c1da8..ebb9b8e9f6 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -24,6 +24,8 @@ ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause ARM_TRUSTED_FIRMWARE_LICENSE_FILES = docs/license.rst endif endif +ARM_TRUSTED_FIRMWARE_CPE_ID_VENDOR = arm +ARM_TRUSTED_FIRMWARE_CPE_ID_PREFIX = cpe:2.3:o ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE):$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL)$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y:y) BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE) -- 2.43.0 From christian at klarinett.li Wed Feb 28 15:01:46 2024 From: christian at klarinett.li (Christian Hitz) Date: Wed, 28 Feb 2024 16:01:46 +0100 Subject: [Buildroot] [PATCH] package/freetype: use correct license format for dual licensed package Message-ID: <20240228150146.455494-1-christian@klarinett.li> From: Christian Hitz Signed-off-by: Christian Hitz --- package/freetype/freetype.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 1f4bcaf341..5032414d63 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -9,7 +9,7 @@ FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" -FREETYPE_LICENSE = Dual FTL/GPL-2.0+ +FREETYPE_LICENSE = FTL or GPL-2.0+ FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf -- 2.43.0 From bugzilla at busybox.net Wed Feb 28 15:46:20 2024 From: bugzilla at busybox.net (bugzilla at busybox.net) Date: Wed, 28 Feb 2024 15:46:20 +0000 Subject: [Buildroot] [Bug 15961] New: empty file statistic on partial build Message-ID: https://bugs.busybox.net/show_bug.cgi?id=15961 Bug ID: 15961 Summary: empty file statistic on partial build Product: buildroot Version: 2023.11 Hardware: PC OS: Linux Status: NEW Severity: minor Priority: P5 Component: Other Assignee: unassigned at buildroot.uclibc.org Reporter: laurentbadel at eaton.com CC: buildroot at uclibc.org Target Milestone: --- There seems to be a problem with the package statistics in pkg-generic.mk. As I understand the files-lists* files are used to track which files were installed in which directories during the installations steps. I have found this quite helpful to keep track version numbers of packages in my final rootfs, for example, but it seems that this functionality is now partly broken and produces only empty files in case of a partial build. Looking at pkg-generic.mk, the logic seems to be that we collect lists of files after the configuration step, and store these lists in files-list*.before. Then, at the end of the installation step, we generate new lists of files in files-list*.after, which we compare with the .before files generated earlier, and extract the entries that are present only in the .after file. The problem is that this does not work when using -rebuild or -reinstall targets, because (i) the .before files are deleted after the first installation, and (ii) the contents of the .before file might not be up-to-date anyway since other stuff may have been installed in-between. It seems to me that moving the calls to pkg_size_before into the .stamp_*_installed targets themselves would solve the problem. In this way, the state of the directories just before, and just after, the package installation, will be compared, producing the expected results. I have tested this with the below patch, and the results were as I expected. I would gladly submit it directly, but I am unsure if my understanding of the purpose and contents of these files is correct, and I'd rather not spam the entire list with nonsense. I am using the 2023.11 tag but I don't see any recent patch indicating that this might have been fixed. Thank you very much in advance, Laurent >From 99421a92a8dce34385c4ec3d51ee4a1c54327a54 Mon Sep 17 00:00:00 2001 From: Laurent Badel Date: Wed, 28 Feb 2024 15:39:29 +0000 Subject: [PATCH] package/pkg-generic: fix file statistics for partial builds Signed-off-by: Laurent Badel --- package/pkg-generic.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 577a148c..db5cc81a 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -265,10 +265,6 @@ $(BUILD_DIR)/%/.stamp_configured: $(Q)mkdir -p $(HOST_DIR) $(TARGET_DIR) $(STAGING_DIR) $(BINARIES_DIR) $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES)) $(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep)) - @$(call pkg_size_before,$(TARGET_DIR)) - @$(call pkg_size_before,$(STAGING_DIR),-staging) - @$(call pkg_size_before,$(BINARIES_DIR),-images) - @$(call pkg_size_before,$(HOST_DIR),-host) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) @@ -289,6 +285,7 @@ $(BUILD_DIR)/%/.stamp_built:: $(BUILD_DIR)/%/.stamp_host_installed: @$(call step_start,install-host) @$(call MESSAGE,"Installing to host directory") + @$(call pkg_size_before,$(TARGET_DIR)) $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) @@ -318,6 +315,7 @@ $(BUILD_DIR)/%/.stamp_host_installed: $(BUILD_DIR)/%/.stamp_staging_installed: @$(call step_start,install-staging) @$(call MESSAGE,"Installing to staging directory") + @$(call pkg_size_before,$(TARGET_DIR)) $(foreach hook,$($(PKG)_PRE_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_STAGING_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) @@ -360,6 +358,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed: $(BUILD_DIR)/%/.stamp_images_installed: @$(call step_start,install-image) @$(call MESSAGE,"Installing to images directory") + @$(call pkg_size_before,$(BINARIES_DIR),-images) $(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_IMAGES_CMDS) $(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) @@ -370,6 +369,7 @@ $(BUILD_DIR)/%/.stamp_images_installed: $(BUILD_DIR)/%/.stamp_target_installed: @$(call step_start,install-target) @$(call MESSAGE,"Installing to target") + @$(call pkg_size_before,$(TARGET_DIR)) $(foreach hook,$($(PKG)_PRE_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) +$($(PKG)_INSTALL_TARGET_CMDS) $(if $(BR2_INIT_SYSTEMD),\ -- 2.17.1 -- You are receiving this mail because: You are on the CC list for the bug. From peter at korsgaard.com Wed Feb 28 16:14:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:14:31 +0100 Subject: [Buildroot] [PATCH] package/wpewebkit: security bump to version 2.42.4 In-Reply-To: <20240123085419.1761894-1-aperez@igalia.com> (Adrian Perez de Castro's message of "Tue, 23 Jan 2024 10:54:17 +0200") References: <20240123085419.1761894-1-aperez@igalia.com> Message-ID: <87sf1cpnvc.fsf@48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > The minimum GCC version is changed to 10.x, conditionals added for > USE_JPEGXL and USE_GBM. Both are optional and will be automatically > enabled if the relevent packages have been enabled. GBM is recommended > for performance, is it avoids a buffer copy on each frame rendered by > WebKit. > Release notes: > - https://wpewebkit.org/release/wpewebkit-2.40.4.html > - https://wpewebkit.org/release/wpewebkit-2.40.5.html > - https://wpewebkit.org/release/wpewebkit-2.42.0.html > - https://wpewebkit.org/release/wpewebkit-2.42.1.html > - https://wpewebkit.org/release/wpewebkit-2.42.2.html > - https://wpewebkit.org/release/wpewebkit-2.42.3.html > - https://wpewebkit.org/release/wpewebkit-2.42.4.html > This update covers fixes for CVE-2023-37450, CVE-2023-38133, > CVE-2023-38572, CVE-2023-38592, CVE-2023-38594, CVE-2023-38595, > CVE-2023-38597, CVE-2023-38599, CVE-2023-38600, CVE-2023-38611, > CVE-2023-40397, CVE-2023-39928, CVE-2023-39434, CVE-2023-40451, > CVE-2023-41074, CVE-2023-41993, CVE-2023-32359, CVE-2023-41983, > CVE-2023-42852, CVE-2023-42916, CVE-2023-42917, CVE-2023-42883, > and CVE-2023-42890. > Relevant security advisories: > - https://wpewebkit.org/security/WSA-2023-0006.html > - https://wpewebkit.org/security/WSA-2023-0007.html > - https://wpewebkit.org/security/WSA-2023-0008.html > - https://wpewebkit.org/security/WSA-2023-0009.html > - https://wpewebkit.org/security/WSA-2023-0010.html > - https://wpewebkit.org/security/WSA-2023-0011.html > - https://wpewebkit.org/security/WSA-2023-0012.html > Signed-off-by: Adrian Perez de Castro Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:19:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:19:20 +0100 Subject: [Buildroot] [PATCH v5 2/3] package/webkitgtk: select wpebackend-fdo if wayland target is enabled In-Reply-To: <20231114150725.GD1974649@igalia.com> (Adrian Perez de Castro's message of "Tue, 14 Nov 2023 15:07:25 +0200") References: <20231001165218.1960930-3-thomas.devoogdt@barco.com> <20231110164617.569602-1-thomas@devoogdt.com> <20231110164617.569602-2-thomas@devoogdt.com> <20231114150725.GD1974649@igalia.com> Message-ID: <87o7c0pnnb.fsf@48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > On Fri, 10 Nov 2023 17:46:16 +0100 Thomas Devoogdt wrote: >> libwep & wpebackend-fdo are mandatory if ENABLE_WAYLAND_TARGET and EGL_FOUND >> https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L388-L400 >> >> egl is mandatory if ENABLE_WAYLAND_TARGET >> https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L462-L473 >> >> So wpebackend-fdo (-> libwpe) has to be selected if BR2_PACKAGE_LIBGTK3_WAYLAND. >> >> Signed-off-by: Thomas Devoogdt > Tested-By: Adrian Perez de Castro Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:19:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:19:27 +0100 Subject: [Buildroot] [PATCH v5 1/3] package/webkitgtk: make gbm support optional In-Reply-To: <20231114150652.GB1974649@igalia.com> (Adrian Perez de Castro's message of "Tue, 14 Nov 2023 15:06:52 +0200") References: <20231001165218.1960930-3-thomas.devoogdt@barco.com> <20231110164617.569602-1-thomas@devoogdt.com> <20231114150652.GB1974649@igalia.com> Message-ID: <87jzmopnn4.fsf@48ers.dk> >>>>> "Adrian" == Adrian Perez de Castro writes: > On Fri, 10 Nov 2023 17:46:15 +0100 Thomas Devoogdt wrote: >> This was added upstream in commit: >> >> https://github.com/WebKit/WebKit/commit/22e4c0386605d84f42f2d46fd20bdc46e3078498 >> >> The 'USE_OPENGL_OR_ES' flag is default ON, which will enable 'USE_GBM', >> so ensure that we unset 'USE_GBM' if we don't have libgbm. >> >> Signed-off-by: Thomas Devoogdt > Tested-by: Adrian Perez de Castro Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:24:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:24:41 +0100 Subject: [Buildroot] [PATCH v5 3/3] package/webkitgtk: bump to version 2.42.2 In-Reply-To: <20231110164617.569602-3-thomas@devoogdt.com> References: <20231110164617.569602-1-thomas@devoogdt.com> <20231110164617.569602-3-thomas@devoogdt.com> Message-ID: <08ec51d4-8aad-40e8-81f0-33b8ac66299d@korsgaard.com> On 10/11/2023 17.46, Thomas Devoogdt wrote: > Update to a new major release. > > Release notes: > > https://webkitgtk.org/2023/09/15/webkitgtk2.42.0-released.html > https://webkitgtk.org/2023/09/27/webkitgtk2.42.1-released.html > https://webkitgtk.org/2023/11/10/webkitgtk2.42.2-released.html > > Security notes: > > https://webkitgtk.org/security/WSA-2023-0008.html > > - USE_JPEGXL is enabled by default now [1], so add a libjxl if used. > > - ENABLE_GLES2 has been dropped, so drop it also here [2]. > Instead, enable USE_OPENGL_OR_ES if libgles is present. Beware that also > libegl is needed for USE_OPENGL_OR_ES, but that one is most of the time a > dependency for libgles, so leave it out here. > > - Also raise the minimal GCC version to 10.2, which is required since webkitgtk-2.42.x [3]. > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, > we do check on >= GCC 10, because we can't check on >= GCC 10.2. > > [1] https://github.com/WebKit/WebKit/commit/93865414f33190c57e293a80492e10edc461d7f0 > [2] https://github.com/WebKit/WebKit/commit/cfe917fec45bf72c371087ece034feee8454f1b4 > [3] https://github.com/WebKit/WebKit/commit/133498aaee8f44443d9e3b2a08be4a4b77b93fc9 > > Signed-off-by: Thomas Devoogdt > --- > v2: n/a > v3: > - replace for package/webkitgtk: add a USE_OPENGL_OR_ES config option > - 2.42.0 needs an extra bunch of patches, so bump to immediately to 2.42.1 > v4: > - fixed incomplete git massage (a ____ line splits the git message apparently) > - re-added patches with upstream cherry-pick and hash > v5: > - 2.42.1 needs an extra bunch of patches, so bump to immediately to 2.42.2 Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:29:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:29:03 +0100 Subject: [Buildroot] [PATCH] package/hiredis: do not install nuget packaging file In-Reply-To: <20240120132840.3274187-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Sat, 20 Jan 2024 14:28:40 +0100") References: <20240120132840.3274187-1-yann.morin.1998@free.fr> Message-ID: <87frxcpn74.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > The NuGet packaging description file is installed as: > $(DEST_DIR)/build/native/hiredis.targets > This is a sprurious file that has nothing to do on a Linux system, > whether that be in host/, staging/, or target/. > Signed-off-by: Yann E. MORIN > Cc: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:38:51 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:38:51 +0100 Subject: [Buildroot] [PATCH] boot/syslinux: carry fix for build failures with binutils 2.31+ In-Reply-To: <20231223213800.348426-1-yann.morin.1998@free.fr> References: <20231223213800.348426-1-yann.morin.1998@free.fr> Message-ID: <3da3fab9-dd42-4cd7-ad82-3ee8ea166334@korsgaard.com> On 23/12/2023 22.38, Yann E. MORIN wrote: > From a report on the syslinux mailing list [0]: > > The GNU linker now writes two segments of type PT_LOAD into the > program header. However, this is not supported by the wrapper > script that converts the shared object to an .efi executable. > As per comment in that file: > > (...) Although there may be several LOAD program headers, > only one is currently copied. > > A simple workaround I've found to work is to ask the linker to put > everything into one PT_LOAD program header. > > The issue is ackowledged in the syslinux wiki page about building > syslinux [1]. This page refers to various resources, of which a Debian > patch [2]. > > This information is also referenced in #11861. > > Fixes: #11861 > > [0] https://www.syslinux.org/archives/2018-August/026167.html > [1] https://wiki.syslinux.org/wiki/index.php?title=Building > [2] https://salsa.debian.org/images-team/syslinux/-/blob/debian/master/debian/patches/0017-single-load-segment.patch > > Reported-by: Sam Lancia > Reported-by: Meliodas > Signed-off-by: Yann E. MORIN > > --- > Sam, Meliodas: I have no test-case to validate this change, so it would > be nice if you could report on whether the above does indeed fixes the > issue you reported. Bonus point: it would be even better if we could > improve on the existing runtime test: support/testing/tests/boot/test_syslinux.py > It currently only does a test build, so it does not catch the issue; the > grub2 test we have does run, so we can catch failures. It would be nice > to also have a runtime test for syslinux... Committed to 2023.02.x and 2023.11.x, thanks -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:40:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:40:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/weston: fix build without gbm In-Reply-To: <20240122211451.3591-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 22 Jan 2024 22:14:51 +0100") References: <20240122211451.3591-1-fontaine.fabrice@gmail.com> Message-ID: <87bk80pmoo.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure without gbm raised since commit > 534c22dd606e200969fce49b8d23b27902dec94e: > Message: dmabuf-feedback requires gbm which was not found. If you > rather not build this, drop "dmabuf-feedback" from simple-clients > option. > Fixes: > - http://autobuild.buildroot.org/results/ebbba1d73ceeaacee17fde0c6c853415cd316091 > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:41:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:41:36 +0100 Subject: [Buildroot] [git commit] package/environment-setup: do not export GIT_DIR In-Reply-To: <20240127200855.3B760865AE@busybox.osuosl.org> (Yann E. MORIN's message of "Sat, 27 Jan 2024 21:07:46 +0100") References: <20240127200855.3B760865AE@busybox.osuosl.org> Message-ID: <877ciopmm7.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > commit: https://git.buildroot.net/buildroot/commit/?id=48874afb9d03cb02b0207fd53bf2cdf0c37c8fa0 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > Commit c07aafa08792 (package/Makefile.in: set GIT_DIR=. in {HOST, > TARGET}_MAKE_ENV) added GIT_DIR=. to TARGET_MAKE_ENV (which is included in > TARGET_CONFIGURE_OPTS) to work around issues with packages getting confused > when building in a subdir of the Buildroot git repo. > This unfortunately also causes git commands to fail when > output/host/environment-setup is sourced: > git status > fatal: not a git repository: '.' > So strip GIT_DIR= from TARGET_CONFIGURE_OPTS when generating > environment-setup. > Reported-by: Mircea Gliga > Signed-off-by: Peter Korsgaard > Signed-off-by: Yann E. MORIN Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:42:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:42:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/mbedtls: security bump to version 2.28.7 In-Reply-To: (Yann E. MORIN's message of "Sat, 27 Jan 2024 21:15:34 +0100") References: <20240126222324.1790975-1-fontaine.fabrice@gmail.com> Message-ID: <8734tcpml7.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Fabrice, All, > On 2024-01-26 23:23 +0100, Fabrice Fontaine spake thusly: >> - Fix CVE-2024-23170 and CVE-2024-23775 >> - Mbed TLS is now released under a dual Apache-2.0 OR GPL-2.0-or-later >> license. Users may choose which license they take the code under: >> https://github.com/Mbed-TLS/mbedtls/commit/f429557c5900d3b90bd10a21b228f719e80f81a2 >> >> https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-1/ >> https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-2/ >> https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.6 >> https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.7 >> >> Signed-off-by: Fabrice Fontaine > Applied to master, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 16:43:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:43:20 +0100 Subject: [Buildroot] [PATCH] package/darkhttpd: security bump to version 1.15 In-Reply-To: <87wmrtzy9i.fsf@48ers.dk> (Peter Korsgaard's message of "Sun, 28 Jan 2024 08:56:57 +0100") References: <20240126135747.2407552-1-peter@korsgaard.com> <87wmrtzy9i.fsf@48ers.dk> Message-ID: <87y1b4o7yv.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Yann" == Yann E MORIN writes: >> Peter, All, >> On 2024-01-26 14:57 +0100, Peter Korsgaard spake thusly: >>> Fixes the following security issues: >>> >>> CVE-2024-23770: Local Leak of Authentication Parameter in Process List >>> >>> CVE-2024-23771: Basic Auth Timing Attack >>> >>> https://security.opensuse.org/2024/01/22/darkhttpd-basic-auth-issues.html >>> >>> Notice that CVE-2024-23770 is only documented as a known weakness, not >>> fixed. >>> >>> Also change the license logic to use the dedicated COPYING file available >>> since 1.14: >>> >>> https://github.com/emikulic/darkhttpd/commit/a8ae2b1de069588cad23d79a5392445ee9590fcd >>> >>> This license is ISC, not MIT - So adjust DARKHTTPD_LICENSE to match. >> This means the licensing stuff should be backported to the maintenance >> branches, and should thus have been a separate patch prior to the >> version bump. >> But since this is a security fix, I guess you'll want to backport the >> version bump too. And since the odlest stable, 2023.02, already had >> darkhttpd 1.14, it is possibe to backport the version bump to all >> maintenance branches. >> Thus, I considered splitting, got slightly cat-distracted, and pushed >> without splitting. > Hehe ;) That was indeed also the reason why I didn't do the effort to > split it in multiple patches. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 13:42:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:42:02 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/falcosecurity-libs: drop FALCOSECURITY_LIBS_CPE_ID_VENDOR Message-ID: <20240228164337.BFE0587BD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0e54bc8af8b3e4bfd6f88dc7360e36180c7c68cc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x FALCOSECURITY_LIBS_CPE_ID_VENDOR is plain wrong since the addition of the package in commit a15e35c4ebc52f29f65372c8e86cefa874aa4aaf, indeed falco:falcosecurity-libs is not a valid CPE ID: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:falco:falcosecurity-libs Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 9b36995c2c205fc46824c556f8c97d461c1c6bb8) Signed-off-by: Peter Korsgaard --- package/falcosecurity-libs/falcosecurity-libs.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk index 92d5c61832..4245f9581a 100644 --- a/package/falcosecurity-libs/falcosecurity-libs.mk +++ b/package/falcosecurity-libs/falcosecurity-libs.mk @@ -8,7 +8,6 @@ FALCOSECURITY_LIBS_VERSION = e5c53d648f3c4694385bbe488e7d47eaa36c229a FALCOSECURITY_LIBS_SITE = $(call github,falcosecurity,libs,$(FALCOSECURITY_LIBS_VERSION)) FALCOSECURITY_LIBS_LICENSE = Apache-2.0 (userspace), MIT or GPL-2.0 (driver) FALCOSECURITY_LIBS_LICENSE_FILES = COPYING driver/MIT.txt driver/GPL2.txt -FALCOSECURITY_LIBS_CPE_ID_VENDOR = falco FALCOSECURITY_LIBS_DEPENDENCIES = \ c-ares \ From peter at korsgaard.com Wed Feb 28 16:20:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:20:38 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/webkitgtk: make gbm support optional Message-ID: <20240228164337.F3FEC87BD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=05292fbfdba2b1a8897e1ea94e8277ca6abc9a60 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x This was added upstream in commit: https://github.com/WebKit/WebKit/commit/22e4c0386605d84f42f2d46fd20bdc46e3078498 The 'USE_OPENGL_OR_ES' flag is default ON, which will enable 'USE_GBM', so ensure that we unset 'USE_GBM' if we don't have libgbm. Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit c06c0197f95c3ae3408469f7e0702a00d788feb6) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 4a3f9e61c1..b14a4d16ce 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -86,6 +86,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF endif +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) +WEBKITGTK_CONF_OPTS += -DUSE_GBM=ON +WEBKITGTK_DEPENDENCIES += libgbm +else +WEBKITGTK_CONF_OPTS += -DUSE_GBM=OFF +endif + ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ From peter at korsgaard.com Wed Feb 28 16:17:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:17:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/webkitgtk: select wpebackend-fdo if wayland target is enabled Message-ID: <20240228164337.D5F9087B82@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f94f04a957ae8ff247571d505741faece7ef0ae6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x libwep & wpebackend-fdo are mandatory if ENABLE_WAYLAND_TARGET and EGL_FOUND https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L388-L400 egl is mandatory if ENABLE_WAYLAND_TARGET https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L462-L473 So wpebackend-fdo (-> libwpe) has to be selected if BR2_PACKAGE_LIBGTK3_WAYLAND. Signed-off-by: Thomas Devoogdt Tested-By: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit b9c0e48f68ffb3ffa5ffc9d23edafc89c6a4d41f) Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 1 + package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index d47d6a8c1b..dee13f8ea6 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -53,6 +53,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_WOFF2 + select BR2_PACKAGE_WPEBACKEND_FDO if BR2_PACKAGE_LIBGTK3_WAYLAND select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index d5e983e403..881c2df07b 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -106,7 +106,7 @@ WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON endif endif -ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND)$(BR2_PACKAGE_WPEBACKEND_FDO),yy) +ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=ON WEBKITGTK_DEPENDENCIES += wpebackend-fdo else From peter at korsgaard.com Wed Feb 28 16:21:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:21:39 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/webkitgtk: bump to version 2.42.2 Message-ID: <20240228164338.0AF3987BD9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54be12aaed13dc1e1ea7eb8c7c1173c47ba6a9cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Update to a new major release. Release notes: https://webkitgtk.org/2023/09/15/webkitgtk2.42.0-released.html https://webkitgtk.org/2023/09/27/webkitgtk2.42.1-released.html https://webkitgtk.org/2023/11/10/webkitgtk2.42.2-released.html Security notes: https://webkitgtk.org/security/WSA-2023-0008.html - USE_JPEGXL is enabled by default now [1], so add a libjxl if used. - ENABLE_GLES2 has been dropped, so drop it also here [2]. Instead, enable USE_OPENGL_OR_ES if libgles is present. Beware that also libegl is needed for USE_OPENGL_OR_ES, but that one is most of the time a dependency for libgles, so leave it out here. - Also raise the minimal GCC version to 10.2, which is required since webkitgtk-2.42.x [3]. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 10, because we can't check on >= GCC 10.2. [1] https://github.com/WebKit/WebKit/commit/93865414f33190c57e293a80492e10edc461d7f0 [2] https://github.com/WebKit/WebKit/commit/cfe917fec45bf72c371087ece034feee8454f1b4 [3] https://github.com/WebKit/WebKit/commit/133498aaee8f44443d9e3b2a08be4a4b77b93fc9 Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit c4abff80b0fc0001e5804e43d32cbeb67d3d2009) Signed-off-by: Peter Korsgaard --- ...ailure-when-gstreamer-support-is-disabled.patch | 36 ---------------------- package/webkitgtk/Config.in | 6 ++-- package/webkitgtk/webkitgtk.hash | 6 ++-- package/webkitgtk/webkitgtk.mk | 16 +++++++--- 4 files changed, 17 insertions(+), 47 deletions(-) diff --git a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch b/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch deleted file mode 100644 index 3fa23b215b..0000000000 --- a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9b31965cdf362768e86f7e592e59e68fb3351261 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Tue, 8 Aug 2023 16:51:25 -0700 -Subject: [PATCH] Fix build failure when gstreamer support is disabled - https://bugs.webkit.org/show_bug.cgi?id=259931 https://bugs.gentoo.org/911663 - -Reviewed by Carlos Alberto Lopez Perez. - -* Source/WebCore/loader/MixedContentChecker.cpp: - -Canonical link: https://commits.webkit.org/260527.429 at fix-build - -(cherry picked from commit f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732) - -Upstream: https://github.com/WebKit/WebKit/commit/f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732 -Signed-off-by: Thomas Devoogdt ---- - Source/WebCore/loader/MixedContentChecker.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/WebCore/loader/MixedContentChecker.cpp b/Source/WebCore/loader/MixedContentChecker.cpp -index 9b4c7fe62020..ac4733bc08bc 100644 ---- a/Source/WebCore/loader/MixedContentChecker.cpp -+++ b/Source/WebCore/loader/MixedContentChecker.cpp -@@ -33,6 +33,8 @@ - #include "ContentSecurityPolicy.h" - #include "Document.h" - #include "Frame.h" -+#include "FrameLoader.h" -+#include "FrameLoaderClient.h" - #include "SecurityOrigin.h" - - namespace WebCore { --- -2.42.0 - diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index dee13f8ea6..2a72cb0841 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 9, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7f50f1aa7b..59782732c3 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.40.5.tar.xz.sums -sha1 2f4d06b021115eb4106177f7d5f534f45b5d3b2e webkitgtk-2.40.5.tar.xz -sha256 7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f webkitgtk-2.40.5.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.2.tar.xz.sums +sha1 05bec6a824e46f043b865478735bc8395249510e webkitgtk-2.42.2.tar.xz +sha256 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 webkitgtk-2.42.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index b14a4d16ce..ce507dc271 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.40.5 +WEBKITGTK_VERSION = 2.42.2 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -71,6 +71,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF endif +ifeq ($(BR2_PACKAGE_LIBJXL),y) +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON +WEBKITGTK_DEPENDENCIES += libjxl +else +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=OFF +endif + ifeq ($(BR2_PACKAGE_LIBMANETTE),y) WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=ON WEBKITGTK_DEPENDENCIES += libmanette @@ -78,12 +85,11 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -# Use GLES if available and desktop GL is not. -ifeq ($(BR2_PACKAGE_HAS_LIBGL):$(BR2_PACKAGE_HAS_LIBGLES),:y) -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=ON WEBKITGTK_DEPENDENCIES += libgles else -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=OFF endif ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) From peter at korsgaard.com Wed Feb 28 16:42:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:42:00 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/mbedtls: security bump to version 2.28.7 Message-ID: <20240228164338.2C2CE87BD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e057ff46e1e53e10cc533a8ade7bf4868af580e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x - Fix CVE-2024-23170 and CVE-2024-23775 - Mbed TLS is now released under a dual Apache-2.0 OR GPL-2.0-or-later license. Users may choose which license they take the code under: https://github.com/Mbed-TLS/mbedtls/commit/f429557c5900d3b90bd10a21b228f719e80f81a2 https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-1/ https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-2/ https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.6 https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 52fd4753fe64208bfc25dc8a298f067da5c4c4b4) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 6 +++--- package/mbedtls/mbedtls.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index d0cd0b2105..3ec151a859 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.4: -sha256 849e86b626e42ded6bf67197b64aa771daa54e2a7e2868dc67e1e4711959e5e3 mbedtls-2.28.5.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.7: +sha256 1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a mbedtls-2.28.7.tar.gz # Locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 1b941e04f4..cdb4aef4f4 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.5 +MBEDTLS_VERSION = 2.28.7 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ @@ -12,7 +12,7 @@ MBEDTLS_CONF_OPTS = \ -DENABLE_TESTING=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF MBEDTLS_INSTALL_STAGING = YES -MBEDTLS_LICENSE = Apache-2.0 +MBEDTLS_LICENSE = Apache-2.0 or GPL-2.0+ MBEDTLS_LICENSE_FILES = LICENSE MBEDTLS_CPE_ID_VENDOR = arm MBEDTLS_CPE_ID_PRODUCT = mbed_tls From peter at korsgaard.com Wed Feb 28 16:20:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:20:28 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/webkitgtk: allow both X11 and Wayland Message-ID: <20240228164337.E8F8E87BD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0617a0191a515edfa72fb4aaba185bd33ea2d691 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Allow enabling support for both the X11 and Wayland backends. This in turn needs reorganizing how desktop GL or OpenGL ES is chosen, as it no longer can depend on whether Wayland support is enabled: the BR2_PACKAGE_HAS_LIBGL and BR2_PACKAGE_HAS_LIBGLES variables are both checked, and ENABLE_GLES2 is set only if the package providing OpenGL claims only GLES is supported; otherwise desktop GL is preferred. This matches the existing logic. The existing comment indicating that only one of both windowing systems can be enabled was wrong: the same WebKitGTK build can target both X11 and Wayland at the same time, as long as GTK itself has been built accordingly. Enabling both is the approach taken by most Linux distributions, and has been supported for years. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Devoogdt Signed-off-by: Yann E. MORIN (cherry picked from commit a23251d3f738b44eab40375fc8822e0358d70517) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 881c2df07b..4a3f9e61c1 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -78,32 +78,32 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -# Only one target platform can be built, assume X11 > Wayland +# Use GLES if available and desktop GL is not. +ifeq ($(BR2_PACKAGE_HAS_LIBGL):$(BR2_PACKAGE_HAS_LIBGLES),:y) +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON +WEBKITGTK_DEPENDENCIES += libgles +else +WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +endif -# GTK3-X11 target gives OpenGL from newer libgtk3 versions -# Consider this better than EGL + maybe GLESv2 since both can't be built -# 2D CANVAS acceleration requires OpenGL proper with cairo-gl ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=OFF \ - -DENABLE_X11_TARGET=ON +WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt -else # !X11 -# GTK3-BROADWAY/WAYLAND needs at least EGL -WEBKITGTK_DEPENDENCIES += libegl -# GLESv2 support is optional though -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON -WEBKITGTK_DEPENDENCIES += libgles else -# Disable general OpenGL (shading) if there's no GLESv2 -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=OFF endif -# We must explicitly state the wayland target + ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON +WEBKITGTK_DEPENDENCIES += libegl +else +WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=OFF endif + +# If only the GTK Broadway backend is enabled, EGL is still needed. +ifeq ($(BR2_PACKAGE_LIBGTK3_X11):$(BR2_PACKAGE_LIBGTK3_WAYLAND):$(BR2_PACKAGE_LIBGTK3_BROADWAY),::y) +WEBKITGTK_DEPENDENCIES += libegl endif ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) From peter at korsgaard.com Wed Feb 28 13:45:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:45:00 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/wpewebkit: security bump to version 2.42.4 Message-ID: <20240228164337.CB42587BD6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a3c246ef728125c1d43aaabc16e534cbd494f205 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The minimum GCC version is changed to 10.x, conditionals added for USE_JPEGXL and USE_GBM. Both are optional and will be automatically enabled if the relevent packages have been enabled. GBM is recommended for performance, is it avoids a buffer copy on each frame rendered by WebKit. Release notes: - https://wpewebkit.org/release/wpewebkit-2.40.4.html - https://wpewebkit.org/release/wpewebkit-2.40.5.html - https://wpewebkit.org/release/wpewebkit-2.42.0.html - https://wpewebkit.org/release/wpewebkit-2.42.1.html - https://wpewebkit.org/release/wpewebkit-2.42.2.html - https://wpewebkit.org/release/wpewebkit-2.42.3.html - https://wpewebkit.org/release/wpewebkit-2.42.4.html This update covers fixes for CVE-2023-37450, CVE-2023-38133, CVE-2023-38572, CVE-2023-38592, CVE-2023-38594, CVE-2023-38595, CVE-2023-38597, CVE-2023-38599, CVE-2023-38600, CVE-2023-38611, CVE-2023-40397, CVE-2023-39928, CVE-2023-39434, CVE-2023-40451, CVE-2023-41074, CVE-2023-41993, CVE-2023-32359, CVE-2023-41983, CVE-2023-42852, CVE-2023-42916, CVE-2023-42917, CVE-2023-42883, and CVE-2023-42890. Relevant security advisories: - https://wpewebkit.org/security/WSA-2023-0006.html - https://wpewebkit.org/security/WSA-2023-0007.html - https://wpewebkit.org/security/WSA-2023-0008.html - https://wpewebkit.org/security/WSA-2023-0009.html - https://wpewebkit.org/security/WSA-2023-0010.html - https://wpewebkit.org/security/WSA-2023-0011.html - https://wpewebkit.org/security/WSA-2023-0012.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit 7a8c112df7a15426c602bc04eb720c762ba8bc98) Signed-off-by: Peter Korsgaard --- package/wpewebkit/Config.in | 6 +++--- package/wpewebkit/wpewebkit.hash | 6 +++--- package/wpewebkit/wpewebkit.mk | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index ea2159945d..ed2821697f 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 9, host gcc >= 4.9" +comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ || !BR2_HOST_GCC_AT_LEAST_4_9 comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" @@ -37,7 +37,7 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index aaeea2bcda..322e494c36 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,6 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.40.3.tar.xz.sums -sha1 c840bd76b2c86cb8ca0d68b56598cb0abbafc727 wpewebkit-2.40.3.tar.xz -sha256 05b6a9cb1d7d03485e0dc41b2a8e6f99a36aea23d32ba3ecb38d0d6860747ada wpewebkit-2.40.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums +sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz +sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index c13a7201e6..17775524c1 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.40.3 +WPEWEBKIT_VERSION = 2.42.4 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -83,6 +83,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF endif +ifeq ($(BR2_PACKAGE_LIBJXL),y) +WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=ON +WPEWEBKIT_DEPENDENCIES += libjxl +else +WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=OFF +endif + ifeq ($(BR2_INIT_SYSTEMD),y) WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=ON WPEWEBKIT_DEPENDENCIES += systemd @@ -90,6 +97,13 @@ else WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=OFF endif +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) +WPEWEBKIT_CONF_OPTS += -DUSE_GBM=ON +WPEWEBKIT_DEPENDENCIES += libgbm +else +WPEWEBKIT_CONF_OPTS += -DUSE_GBM=OFF +endif + # JIT is not supported for MIPS r6, but the WebKit build system does not # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. From peter at korsgaard.com Wed Feb 28 16:41:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:41:22 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/environment-setup: do not export GIT_DIR Message-ID: <20240228164338.228F387BD5@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6c8d4ea2edec358ae68d4c463402ce81f4d8f603 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit c07aafa08792 (package/Makefile.in: set GIT_DIR=. in {HOST, TARGET}_MAKE_ENV) added GIT_DIR=. to TARGET_MAKE_ENV (which is included in TARGET_CONFIGURE_OPTS) to work around issues with packages getting confused when building in a subdir of the Buildroot git repo. This unfortunately also causes git commands to fail when output/host/environment-setup is sourced: git status fatal: not a git repository: '.' So strip GIT_DIR= from TARGET_CONFIGURE_OPTS when generating environment-setup. Reported-by: Mircea Gliga Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 48874afb9d03cb02b0207fd53bf2cdf0c37c8fa0) Signed-off-by: Peter Korsgaard --- package/environment-setup/environment-setup.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk index 29ec5a9a95..069ee25f9f 100644 --- a/package/environment-setup/environment-setup.mk +++ b/package/environment-setup/environment-setup.mk @@ -8,7 +8,7 @@ ENVIRONMENT_SETUP_FILE = $(HOST_DIR)/environment-setup define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS cp package/environment-setup/environment-setup $(ENVIRONMENT_SETUP_FILE) - for var in $(TARGET_CONFIGURE_OPTS); do \ + for var in $(filter-out GIT_DIR=%,$(TARGET_CONFIGURE_OPTS)); do \ printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ done printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) From peter at korsgaard.com Wed Feb 28 16:37:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:37:11 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] boot/syslinux: carry fix for build failures with binutils 2.31+ Message-ID: <20240228164338.1686687BD6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e8f374db5c7c9df6190f3014b49e4839acb8eb09 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x >From a report on the syslinux mailing list [0]: The GNU linker now writes two segments of type PT_LOAD into the program header. However, this is not supported by the wrapper script that converts the shared object to an .efi executable. As per comment in that file: (...) Although there may be several LOAD program headers, only one is currently copied. A simple workaround I've found to work is to ask the linker to put everything into one PT_LOAD program header. The issue is ackowledged in the syslinux wiki page about building syslinux [1]. This page refers to various resources, of which a Debian patch [2]. This information is also referenced in #11861. Fixes: #11861 [0] https://www.syslinux.org/archives/2018-August/026167.html [1] https://wiki.syslinux.org/wiki/index.php?title=Building [2] https://salsa.debian.org/images-team/syslinux/-/blob/debian/master/debian/patches/0017-single-load-segment.patch Reported-by: Sam Lancia Reported-by: Meliodas Signed-off-by: Yann E. MORIN (cherry picked from commit e53a8593b4edf5df1771692df6764b3bc385c6f4) Signed-off-by: Peter Korsgaard --- boot/syslinux/0018-single-load-segment.patch | 313 +++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) diff --git a/boot/syslinux/0018-single-load-segment.patch b/boot/syslinux/0018-single-load-segment.patch new file mode 100644 index 0000000000..11d73c31a4 --- /dev/null +++ b/boot/syslinux/0018-single-load-segment.patch @@ -0,0 +1,313 @@ +From: Lukas Schwaighofer +Date: Sat, 18 Aug 2018 16:56:35 +0200 +Subject: Force the linker to put all sections into a single PT_LOAD segment + +This is required when using binutils >= 2.31 which writes two PT_LOAD segments +by default. This is not supported by the wrapper.c script used to convert the +shared object into an elf binary. + +Forwarded: https://www.syslinux.org/archives/2018-August/026167.html +[yann.morin.1998 at free.fr: + - grab from the Debian package + - https://salsa.debian.org/images-team/syslinux/-/blob/fa1349f1f8e5f5d6307e589f02c0a679031d1c7f/debian/patches/0017-single-load-segment.patch +] +Signed-off-by: Yann E. MORIN +Upstream: reported https://www.syslinux.org/archives/2018-August/026167.html +Upstream: acknowledged https://wiki.syslinux.org/wiki/index.php?title=Building +--- + efi/i386/syslinux.ld | 37 +++++++++++++++++++++---------------- + efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++---------------- + 2 files changed, 42 insertions(+), 32 deletions(-) + +diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld +index bab3fc7..19c1647 100644 +--- a/efi/i386/syslinux.ld ++++ b/efi/i386/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") + OUTPUT_ARCH(i386) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + +diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld +index 450641c..a2c124f 100644 +--- a/efi/x86_64/syslinux.ld ++++ b/efi/x86_64/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") + OUTPUT_ARCH(i386:x86-64) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + From peter at korsgaard.com Wed Feb 28 16:42:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:42:57 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/darkhttpd: security bump to version 1.15 Message-ID: <20240228164338.3617787BD6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1ed1ff4c43ee243fd46402aa37873f061370026f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following security issues: CVE-2024-23770: Local Leak of Authentication Parameter in Process List CVE-2024-23771: Basic Auth Timing Attack https://security.opensuse.org/2024/01/22/darkhttpd-basic-auth-issues.html Notice that CVE-2024-23770 is only documented as a known weakness, not fixed. Also change the license logic to use the dedicated COPYING file available since 1.14: https://github.com/emikulic/darkhttpd/commit/a8ae2b1de069588cad23d79a5392445ee9590fcd This license is ISC, not MIT - So adjust DARKHTTPD_LICENSE to match. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 0c7fd35947d91f84cff994bfb5c85b31b956d006) Signed-off-by: Peter Korsgaard --- package/darkhttpd/darkhttpd.hash | 4 ++-- package/darkhttpd/darkhttpd.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/darkhttpd/darkhttpd.hash b/package/darkhttpd/darkhttpd.hash index 188afff767..84a787eeba 100644 --- a/package/darkhttpd/darkhttpd.hash +++ b/package/darkhttpd/darkhttpd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 e063de9efa5635260c8def00a4d41ec6145226a492d53fa1dac436967670d195 darkhttpd-1.14.tar.gz -sha256 f002944c9a8516e3346002d39c3e13681306833358c0f3c7781dff1fdb639710 darkhttpd.c +sha256 ea48cedafbf43186f4a8d1afc99b33b671adee99519658446022e6f63bd9eda9 darkhttpd-1.15.tar.gz +sha256 1ecf63e8f84fd60ac7215e04195b9a61dcb47176ea65df26547582027f6c1dee COPYING diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index bda08899b8..e13f8f7770 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -4,10 +4,10 @@ # ################################################################################ -DARKHTTPD_VERSION = 1.14 +DARKHTTPD_VERSION = 1.15 DARKHTTPD_SITE = $(call github,emikulic,darkhttpd,v$(DARKHTTPD_VERSION)) -DARKHTTPD_LICENSE = MIT -DARKHTTPD_LICENSE_FILES = darkhttpd.c +DARKHTTPD_LICENSE = ISC +DARKHTTPD_LICENSE_FILES = COPYING DARKHTTPD_CPE_ID_VENDOR = darkhttpd_project define DARKHTTPD_BUILD_CMDS From peter at korsgaard.com Wed Feb 28 13:41:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:41:35 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/falcosecurity-libs: drop FALCOSECURITY_LIBS_CPE_ID_VENDOR Message-ID: <20240228164457.4789287BFA@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=817f16ca02256d16d7218e9fbf5f64fb47bec848 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x FALCOSECURITY_LIBS_CPE_ID_VENDOR is plain wrong since the addition of the package in commit a15e35c4ebc52f29f65372c8e86cefa874aa4aaf, indeed falco:falcosecurity-libs is not a valid CPE ID: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:falco:falcosecurity-libs Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 9b36995c2c205fc46824c556f8c97d461c1c6bb8) Signed-off-by: Peter Korsgaard --- package/falcosecurity-libs/falcosecurity-libs.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk index 92d5c61832..4245f9581a 100644 --- a/package/falcosecurity-libs/falcosecurity-libs.mk +++ b/package/falcosecurity-libs/falcosecurity-libs.mk @@ -8,7 +8,6 @@ FALCOSECURITY_LIBS_VERSION = e5c53d648f3c4694385bbe488e7d47eaa36c229a FALCOSECURITY_LIBS_SITE = $(call github,falcosecurity,libs,$(FALCOSECURITY_LIBS_VERSION)) FALCOSECURITY_LIBS_LICENSE = Apache-2.0 (userspace), MIT or GPL-2.0 (driver) FALCOSECURITY_LIBS_LICENSE_FILES = COPYING driver/MIT.txt driver/GPL2.txt -FALCOSECURITY_LIBS_CPE_ID_VENDOR = falco FALCOSECURITY_LIBS_DEPENDENCIES = \ c-ares \ From peter at korsgaard.com Wed Feb 28 16:15:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:15:48 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/webkitgtk: select wpebackend-fdo if wayland target is enabled Message-ID: <20240228164457.62DC087BFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4848edca0d566482887465b7d7e1e89c3378cd89 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x libwep & wpebackend-fdo are mandatory if ENABLE_WAYLAND_TARGET and EGL_FOUND https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L388-L400 egl is mandatory if ENABLE_WAYLAND_TARGET https://github.com/WebKit/WebKit/blob/2e35890b1fa9da39ffaa88e0acd973beb55d4ad2/Source/cmake/OptionsGTK.cmake#L462-L473 So wpebackend-fdo (-> libwpe) has to be selected if BR2_PACKAGE_LIBGTK3_WAYLAND. Signed-off-by: Thomas Devoogdt Tested-By: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit b9c0e48f68ffb3ffa5ffc9d23edafc89c6a4d41f) Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 1 + package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 927792b1e4..cb10784133 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -53,6 +53,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX select BR2_PACKAGE_WOFF2 + select BR2_PACKAGE_WPEBACKEND_FDO if BR2_PACKAGE_LIBGTK3_WAYLAND select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index bb6df3d592..cb7461ccbc 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -108,7 +108,7 @@ ifeq ($(BR2_PACKAGE_LIBGTK3_X11):$(BR2_PACKAGE_LIBGTK3_WAYLAND):$(BR2_PACKAGE_LI WEBKITGTK_DEPENDENCIES += libegl endif -ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND)$(BR2_PACKAGE_WPEBACKEND_FDO),yy) +ifeq ($(BR2_PACKAGE_WPEBACKEND_FDO),y) WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=ON WEBKITGTK_DEPENDENCIES += wpebackend-fdo else From peter at korsgaard.com Wed Feb 28 13:43:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 14:43:22 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/wpewebkit: security bump to version 2.42.4 Message-ID: <20240228164457.5643187BFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b9b7b9cf6f39f8766196dce8cfaaaef56effc206 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The minimum GCC version is changed to 10.x, conditionals added for USE_JPEGXL and USE_GBM. Both are optional and will be automatically enabled if the relevent packages have been enabled. GBM is recommended for performance, is it avoids a buffer copy on each frame rendered by WebKit. Release notes: - https://wpewebkit.org/release/wpewebkit-2.40.4.html - https://wpewebkit.org/release/wpewebkit-2.40.5.html - https://wpewebkit.org/release/wpewebkit-2.42.0.html - https://wpewebkit.org/release/wpewebkit-2.42.1.html - https://wpewebkit.org/release/wpewebkit-2.42.2.html - https://wpewebkit.org/release/wpewebkit-2.42.3.html - https://wpewebkit.org/release/wpewebkit-2.42.4.html This update covers fixes for CVE-2023-37450, CVE-2023-38133, CVE-2023-38572, CVE-2023-38592, CVE-2023-38594, CVE-2023-38595, CVE-2023-38597, CVE-2023-38599, CVE-2023-38600, CVE-2023-38611, CVE-2023-40397, CVE-2023-39928, CVE-2023-39434, CVE-2023-40451, CVE-2023-41074, CVE-2023-41993, CVE-2023-32359, CVE-2023-41983, CVE-2023-42852, CVE-2023-42916, CVE-2023-42917, CVE-2023-42883, and CVE-2023-42890. Relevant security advisories: - https://wpewebkit.org/security/WSA-2023-0006.html - https://wpewebkit.org/security/WSA-2023-0007.html - https://wpewebkit.org/security/WSA-2023-0008.html - https://wpewebkit.org/security/WSA-2023-0009.html - https://wpewebkit.org/security/WSA-2023-0010.html - https://wpewebkit.org/security/WSA-2023-0011.html - https://wpewebkit.org/security/WSA-2023-0012.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit 7a8c112df7a15426c602bc04eb720c762ba8bc98) Signed-off-by: Peter Korsgaard --- package/wpewebkit/Config.in | 6 +++--- package/wpewebkit/wpewebkit.hash | 6 +++--- package/wpewebkit/wpewebkit.mk | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 81b66f8429..432aa4c3a3 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 9, host gcc >= 4.9" +comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_9 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ || !BR2_HOST_GCC_AT_LEAST_4_9 comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" @@ -37,7 +37,7 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index aaeea2bcda..322e494c36 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,6 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.40.3.tar.xz.sums -sha1 c840bd76b2c86cb8ca0d68b56598cb0abbafc727 wpewebkit-2.40.3.tar.xz -sha256 05b6a9cb1d7d03485e0dc41b2a8e6f99a36aea23d32ba3ecb38d0d6860747ada wpewebkit-2.40.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums +sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz +sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index bf0b095372..13143efb38 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.40.3 +WPEWEBKIT_VERSION = 2.42.4 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES @@ -84,6 +84,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF endif +ifeq ($(BR2_PACKAGE_LIBJXL),y) +WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=ON +WPEWEBKIT_DEPENDENCIES += libjxl +else +WPEWEBKIT_CONF_OPTS += -DUSE_JPEGXL=OFF +endif + ifeq ($(BR2_INIT_SYSTEMD),y) WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=ON WPEWEBKIT_DEPENDENCIES += systemd @@ -91,6 +98,13 @@ else WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=OFF endif +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) +WPEWEBKIT_CONF_OPTS += -DUSE_GBM=ON +WPEWEBKIT_DEPENDENCIES += libgbm +else +WPEWEBKIT_CONF_OPTS += -DUSE_GBM=OFF +endif + # JIT is not supported for MIPS r6, but the WebKit build system does not # have a check for these processors. The same goes for ARMv5 and ARMv6. # Disable JIT forcibly here and use the CLoop interpreter instead. From peter at korsgaard.com Wed Feb 28 16:16:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:16:04 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/webkitgtk: make gbm support optional Message-ID: <20240228164457.6F59F87BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e83664d4de09389ba48d2b2ba0618f48c36dc66 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x This was added upstream in commit: https://github.com/WebKit/WebKit/commit/22e4c0386605d84f42f2d46fd20bdc46e3078498 The 'USE_OPENGL_OR_ES' flag is default ON, which will enable 'USE_GBM', so ensure that we unset 'USE_GBM' if we don't have libgbm. Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit c06c0197f95c3ae3408469f7e0702a00d788feb6) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index cb7461ccbc..9c68fe73cf 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -88,6 +88,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF endif +ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) +WEBKITGTK_CONF_OPTS += -DUSE_GBM=ON +WEBKITGTK_DEPENDENCIES += libgbm +else +WEBKITGTK_CONF_OPTS += -DUSE_GBM=OFF +endif + ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ From peter at korsgaard.com Wed Feb 28 16:39:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:39:37 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/weston: fix build without gbm Message-ID: <20240228164457.A7EF487BFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=90c05d1abfef4f42e7e576601b3964b8b5d2b57f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix the following build failure without gbm raised since commit 534c22dd606e200969fce49b8d23b27902dec94e: Message: dmabuf-feedback requires gbm which was not found. If you rather not build this, drop "dmabuf-feedback" from simple-clients option. Move the option assignment further down, below all the simple-clients lists; in Makefile, and because we are usign simply expanded variables, this is not necessary, but it is easier on us humans when we review the code. Also add a comment explaining why the initial list is incomplete. Fixes: - http://autobuild.buildroot.org/results/ebbba1d73ceeaacee17fde0c6c853415cd316091 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 611c0cb198041f518f2be3e0f5236d5c6ef93f58) Signed-off-by: Peter Korsgaard --- package/weston/weston.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 6a5c0e57f5..b07e798765 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -23,11 +23,9 @@ WESTON_CONF_OPTS = \ -Dtools=calibrator,debug,info,terminal,touch-calibrator ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) +# Note: some clients are conditional, see further for the others. WESTON_SIMPLE_CLIENTS = \ damage \ - dmabuf-egl \ - dmabuf-feedback \ - egl \ im \ shm \ touch @@ -38,8 +36,6 @@ WESTON_SIMPLE_CLIENTS += dmabuf-v4l endif endif # BR2_PACKAGE_WESTON_SIMPLE_CLIENTS -WESTON_CONF_OPTS += -Dsimple-clients=$(subst $(space),$(comma),$(strip $(WESTON_SIMPLE_CLIENTS))) - ifeq ($(BR2_PACKAGE_JPEG),y) WESTON_CONF_OPTS += -Dimage-jpeg=true WESTON_DEPENDENCIES += jpeg @@ -57,6 +53,9 @@ endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGBM)$(BR2_PACKAGE_HAS_LIBGLES),yyy) WESTON_CONF_OPTS += -Drenderer-gl=true WESTON_DEPENDENCIES += libegl libgbm libgles +ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) +WESTON_SIMPLE_CLIENTS += dmabuf-egl dmabuf-feedback egl +endif ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy) WESTON_CONF_OPTS += -Dpipewire=true -Dbackend-pipewire=true WESTON_DEPENDENCIES += pipewire @@ -70,6 +69,8 @@ WESTON_CONF_OPTS += \ -Dbackend-pipewire=false endif +WESTON_CONF_OPTS += -Dsimple-clients=$(subst $(space),$(comma),$(strip $(WESTON_SIMPLE_CLIENTS))) + ifeq ($(BR2_PACKAGE_WESTON_RDP),y) WESTON_DEPENDENCIES += freerdp WESTON_CONF_OPTS += -Dbackend-rdp=true From peter at korsgaard.com Wed Feb 28 16:42:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:42:03 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/mbedtls: security bump to version 2.28.7 Message-ID: <20240228164457.BEDCB87BFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=72a06fb11d906f74ff3bdd48b848454d2a12519d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x - Fix CVE-2024-23170 and CVE-2024-23775 - Mbed TLS is now released under a dual Apache-2.0 OR GPL-2.0-or-later license. Users may choose which license they take the code under: https://github.com/Mbed-TLS/mbedtls/commit/f429557c5900d3b90bd10a21b228f719e80f81a2 https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-1/ https://mbed-tls.readthedocs.io/en/latest/security-advisories/mbedtls-security-advisory-2024-01-2/ https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.6 https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 52fd4753fe64208bfc25dc8a298f067da5c4c4b4) Signed-off-by: Peter Korsgaard --- package/mbedtls/mbedtls.hash | 6 +++--- package/mbedtls/mbedtls.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index d0cd0b2105..3ec151a859 100644 --- a/package/mbedtls/mbedtls.hash +++ b/package/mbedtls/mbedtls.hash @@ -1,4 +1,4 @@ -# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.4: -sha256 849e86b626e42ded6bf67197b64aa771daa54e2a7e2868dc67e1e4711959e5e3 mbedtls-2.28.5.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.7: +sha256 1df6073f0cf6a4e1953890bf5e0de2a8c7e6be50d6d6c69fa9fefcb1d14e981a mbedtls-2.28.7.tar.gz # Locally calculated -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 9b405ef4c89342f5eae1dd828882f931747f71001cfba7d114801039b52ad09b LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 1b941e04f4..cdb4aef4f4 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.5 +MBEDTLS_VERSION = 2.28.7 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ @@ -12,7 +12,7 @@ MBEDTLS_CONF_OPTS = \ -DENABLE_TESTING=OFF \ -DMBEDTLS_FATAL_WARNINGS=OFF MBEDTLS_INSTALL_STAGING = YES -MBEDTLS_LICENSE = Apache-2.0 +MBEDTLS_LICENSE = Apache-2.0 or GPL-2.0+ MBEDTLS_LICENSE_FILES = LICENSE MBEDTLS_CPE_ID_VENDOR = arm MBEDTLS_CPE_ID_PRODUCT = mbed_tls From peter at korsgaard.com Wed Feb 28 16:25:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:25:13 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/hiredis: do not install nuget packaging file Message-ID: <20240228164457.87C4987BFD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1e7fb7c7a68781bb38dd09acf39eb25476e1d97a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The NuGet packaging description file is installed as: $(DEST_DIR)/build/native/hiredis.targets This is a sprurious file that has nothing to do on a Linux system, whether that be in host/, staging/, or target/. Backport an upstream patch to get rid of it. Signed-off-by: Yann E. MORIN Cc: Fabrice Fontaine (cherry picked from commit 52f3793d46e4185951ce0e7254a35fba23959346) Signed-off-by: Peter Korsgaard --- ...add-option-to-not-install-NuGet-packaging.patch | 51 ++++++++++++++++++++++ package/hiredis/hiredis.mk | 4 +- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/package/hiredis/0001-CMakeList-add-option-to-not-install-NuGet-packaging.patch b/package/hiredis/0001-CMakeList-add-option-to-not-install-NuGet-packaging.patch new file mode 100644 index 0000000000..dbe8bc0ae6 --- /dev/null +++ b/package/hiredis/0001-CMakeList-add-option-to-not-install-NuGet-packaging.patch @@ -0,0 +1,51 @@ +From ff7a064490e0aacf718a5263b25b2ddaad0d245e Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sat, 20 Jan 2024 13:53:39 +0100 +Subject: [PATCH] CMakeList: add option to not install NuGet packaging + +The NuGet hiredis.target packaging description file is of no use on +systems that are not using NuGet, like Linux systems, and the spurious +presence of that file is not "clean". + +Add a cmake option to allow users to disable installation of that file. +As some people may have relied on that file to be installed, continue to +install it by default. + +Signed-off-by: Yann E. MORIN +Upstream: https://github.com/redis/hiredis/commit/ff7a064490e0aacf718a5263b25b2ddaad0d245e +--- + CMakeLists.txt | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b7d6ee8..0fcf29b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,9 @@ OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) + OPTION(ENABLE_SSL_TESTS "Should we test SSL connections" OFF) + OPTION(ENABLE_EXAMPLES "Enable building hiredis examples" OFF) + OPTION(ENABLE_ASYNC_TESTS "Should we run all asynchronous API tests" OFF) ++# Historically, the NuGet file was always install; default ++# to ON for those who rely on that historical behaviour. ++OPTION(ENABLE_NUGET "Install NuGET packaging details" ON) + + MACRO(getVersionBit name) + SET(VERSION_REGEX "^#define ${name} (.+)$") +@@ -105,9 +108,11 @@ if (MSVC AND BUILD_SHARED_LIBS) + CONFIGURATIONS Debug RelWithDebInfo) + endif() + +-# For NuGet packages +-INSTALL(FILES hiredis.targets +- DESTINATION build/native) ++if (ENABLE_NUGET) ++ # For NuGet packages ++ INSTALL(FILES hiredis.targets ++ DESTINATION build/native) ++endif() + + INSTALL(FILES hiredis.h read.h sds.h async.h alloc.h sockcompat.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hiredis) +-- +2.43.0 + diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index a7a6d639e6..476b079336 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -12,8 +12,8 @@ HIREDIS_LICENSE_FILES = COPYING HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES -HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON -HOST_HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON -DENABLE_SSL=OFF +HIREDIS_CONF_OPTS = -DENABLE_NUGET=OFF -DDISABLE_TESTS=ON +HOST_HIREDIS_CONF_OPTS = -DENABLE_NUGET=OFF -DDISABLE_TESTS=ON -DENABLE_SSL=OFF # Set CMAKE_BUILD_TYPE to Release or the libraries will be suffixed with "d" # resulting in build failures when linking. From peter at korsgaard.com Wed Feb 28 16:19:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:19:57 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/webkitgtk: bump to version 2.42.2 Message-ID: <20240228164457.7CC3F87BFB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd202dde79987898f3deb7cd6fbdff1217659dda branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Update to a new major release. Release notes: https://webkitgtk.org/2023/09/15/webkitgtk2.42.0-released.html https://webkitgtk.org/2023/09/27/webkitgtk2.42.1-released.html https://webkitgtk.org/2023/11/10/webkitgtk2.42.2-released.html Security notes: https://webkitgtk.org/security/WSA-2023-0008.html - USE_JPEGXL is enabled by default now [1], so add a libjxl if used. - ENABLE_GLES2 has been dropped, so drop it also here [2]. Instead, enable USE_OPENGL_OR_ES if libgles is present. Beware that also libegl is needed for USE_OPENGL_OR_ES, but that one is most of the time a dependency for libgles, so leave it out here. - Also raise the minimal GCC version to 10.2, which is required since webkitgtk-2.42.x [3]. Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4, we do check on >= GCC 10, because we can't check on >= GCC 10.2. [1] https://github.com/WebKit/WebKit/commit/93865414f33190c57e293a80492e10edc461d7f0 [2] https://github.com/WebKit/WebKit/commit/cfe917fec45bf72c371087ece034feee8454f1b4 [3] https://github.com/WebKit/WebKit/commit/133498aaee8f44443d9e3b2a08be4a4b77b93fc9 Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Acked-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit c4abff80b0fc0001e5804e43d32cbeb67d3d2009) Signed-off-by: Peter Korsgaard --- ...ailure-when-gstreamer-support-is-disabled.patch | 36 ---------------------- package/webkitgtk/Config.in | 6 ++-- package/webkitgtk/webkitgtk.hash | 6 ++-- package/webkitgtk/webkitgtk.mk | 16 +++++++--- 4 files changed, 17 insertions(+), 47 deletions(-) diff --git a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch b/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch deleted file mode 100644 index 3fa23b215b..0000000000 --- a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9b31965cdf362768e86f7e592e59e68fb3351261 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Tue, 8 Aug 2023 16:51:25 -0700 -Subject: [PATCH] Fix build failure when gstreamer support is disabled - https://bugs.webkit.org/show_bug.cgi?id=259931 https://bugs.gentoo.org/911663 - -Reviewed by Carlos Alberto Lopez Perez. - -* Source/WebCore/loader/MixedContentChecker.cpp: - -Canonical link: https://commits.webkit.org/260527.429 at fix-build - -(cherry picked from commit f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732) - -Upstream: https://github.com/WebKit/WebKit/commit/f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732 -Signed-off-by: Thomas Devoogdt ---- - Source/WebCore/loader/MixedContentChecker.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/WebCore/loader/MixedContentChecker.cpp b/Source/WebCore/loader/MixedContentChecker.cpp -index 9b4c7fe62020..ac4733bc08bc 100644 ---- a/Source/WebCore/loader/MixedContentChecker.cpp -+++ b/Source/WebCore/loader/MixedContentChecker.cpp -@@ -33,6 +33,8 @@ - #include "ContentSecurityPolicy.h" - #include "Document.h" - #include "Frame.h" -+#include "FrameLoader.h" -+#include "FrameLoaderClient.h" - #include "SecurityOrigin.h" - - namespace WebCore { --- -2.42.0 - diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index cb10784133..ace1b8739f 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -16,12 +16,12 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 9, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9" depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 7f50f1aa7b..59782732c3 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.40.5.tar.xz.sums -sha1 2f4d06b021115eb4106177f7d5f534f45b5d3b2e webkitgtk-2.40.5.tar.xz -sha256 7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f webkitgtk-2.40.5.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.42.2.tar.xz.sums +sha1 05bec6a824e46f043b865478735bc8395249510e webkitgtk-2.42.2.tar.xz +sha256 5720aa3e8627f1b9f63252187d4df0f8233ae71d697b1796ebfbe5ca750bd118 webkitgtk-2.42.2.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 9c68fe73cf..611d7f65d3 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.40.5 +WEBKITGTK_VERSION = 2.42.2 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -73,6 +73,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF endif +ifeq ($(BR2_PACKAGE_LIBJXL),y) +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=ON +WEBKITGTK_DEPENDENCIES += libjxl +else +WEBKITGTK_CONF_OPTS += -DUSE_JPEGXL=OFF +endif + ifeq ($(BR2_PACKAGE_LIBMANETTE),y) WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=ON WEBKITGTK_DEPENDENCIES += libmanette @@ -80,12 +87,11 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF endif -# Use GLES if available and desktop GL is not. -ifeq ($(BR2_PACKAGE_HAS_LIBGL):$(BR2_PACKAGE_HAS_LIBGLES),:y) -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=ON WEBKITGTK_DEPENDENCIES += libgles else -WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF +WEBKITGTK_CONF_OPTS += -DUSE_OPENGL_OR_ES=OFF endif ifeq ($(BR2_PACKAGE_HAS_LIBGBM),y) From peter at korsgaard.com Wed Feb 28 16:37:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:37:18 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] boot/syslinux: carry fix for build failures with binutils 2.31+ Message-ID: <20240228164457.9C83987BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=39ae2f26f30a908fe6bb93dd3247f6afb5fc5cc9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x >From a report on the syslinux mailing list [0]: The GNU linker now writes two segments of type PT_LOAD into the program header. However, this is not supported by the wrapper script that converts the shared object to an .efi executable. As per comment in that file: (...) Although there may be several LOAD program headers, only one is currently copied. A simple workaround I've found to work is to ask the linker to put everything into one PT_LOAD program header. The issue is ackowledged in the syslinux wiki page about building syslinux [1]. This page refers to various resources, of which a Debian patch [2]. This information is also referenced in #11861. Fixes: #11861 [0] https://www.syslinux.org/archives/2018-August/026167.html [1] https://wiki.syslinux.org/wiki/index.php?title=Building [2] https://salsa.debian.org/images-team/syslinux/-/blob/debian/master/debian/patches/0017-single-load-segment.patch Reported-by: Sam Lancia Reported-by: Meliodas Signed-off-by: Yann E. MORIN (cherry picked from commit e53a8593b4edf5df1771692df6764b3bc385c6f4) Signed-off-by: Peter Korsgaard --- boot/syslinux/0018-single-load-segment.patch | 313 +++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) diff --git a/boot/syslinux/0018-single-load-segment.patch b/boot/syslinux/0018-single-load-segment.patch new file mode 100644 index 0000000000..11d73c31a4 --- /dev/null +++ b/boot/syslinux/0018-single-load-segment.patch @@ -0,0 +1,313 @@ +From: Lukas Schwaighofer +Date: Sat, 18 Aug 2018 16:56:35 +0200 +Subject: Force the linker to put all sections into a single PT_LOAD segment + +This is required when using binutils >= 2.31 which writes two PT_LOAD segments +by default. This is not supported by the wrapper.c script used to convert the +shared object into an elf binary. + +Forwarded: https://www.syslinux.org/archives/2018-August/026167.html +[yann.morin.1998 at free.fr: + - grab from the Debian package + - https://salsa.debian.org/images-team/syslinux/-/blob/fa1349f1f8e5f5d6307e589f02c0a679031d1c7f/debian/patches/0017-single-load-segment.patch +] +Signed-off-by: Yann E. MORIN +Upstream: reported https://www.syslinux.org/archives/2018-August/026167.html +Upstream: acknowledged https://wiki.syslinux.org/wiki/index.php?title=Building +--- + efi/i386/syslinux.ld | 37 +++++++++++++++++++++---------------- + efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++---------------- + 2 files changed, 42 insertions(+), 32 deletions(-) + +diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld +index bab3fc7..19c1647 100644 +--- a/efi/i386/syslinux.ld ++++ b/efi/i386/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") + OUTPUT_ARCH(i386) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + +diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld +index 450641c..a2c124f 100644 +--- a/efi/x86_64/syslinux.ld ++++ b/efi/x86_64/syslinux.ld +@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") + OUTPUT_ARCH(i386:x86-64) + ENTRY(_start) + ++PHDRS ++{ ++ all PT_LOAD ; ++} ++ + SECTIONS + { + . = 0; +@@ -31,7 +36,7 @@ SECTIONS + *(.text) + *(.text.*) + __text_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -40,7 +45,7 @@ SECTIONS + *(.rodata) + *(.rodata.*) + __rodata_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -49,14 +54,14 @@ SECTIONS + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + __ctors_end = .; +- } ++ } :all + + .dtors : { + __dtors_start = .; + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + __dtors_end = .; +- } ++ } :all + + . = ALIGN(4096); + .rel : { +@@ -64,7 +69,7 @@ SECTIONS + *(.rel.data) + *(.rel.data.*) + *(.rel.ctors) +- } ++ } :all + + . = ALIGN(4); + +@@ -72,14 +77,14 @@ SECTIONS + __gnu_hash_start = .; + *(.gnu.hash) + __gnu_hash_end = .; +- } ++ } :all + + + .dynsym : { + __dynsym_start = .; + *(.dynsym) + __dynsym_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -87,7 +92,7 @@ SECTIONS + __dynstr_start = .; + *(.dynstr) + __dynstr_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -104,7 +109,7 @@ SECTIONS + KEEP (*(.got.plt)) + KEEP (*(.got)) + __got_end = .; +- } ++ } :all + + . = ALIGN(4); + +@@ -112,7 +117,7 @@ SECTIONS + __dynamic_start = .; + *(.dynamic) + __dynamic_end = .; +- } ++ } :all + + . = ALIGN(16); + +@@ -122,19 +127,19 @@ SECTIONS + *(.data.*) + *(.lowmem) + __data_end = .; +- } ++ } :all + + .reloc : { + *(.reloc) +- } ++ } :all + + .symtab : { + *(.symtab) +- } ++ } :all + + .strtab : { + *(.strtab) +- } ++ } :all + + .bss (NOLOAD) : { + /* the EFI loader doesn't seem to like a .bss section, +@@ -148,7 +153,7 @@ SECTIONS + __bss_end = .; + *(.sbss) + *(.scommon) +- } ++ } :all + __bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start); + __bss_dwords = (__bss_len + 3) >> 2; + +@@ -161,7 +166,7 @@ SECTIONS + *(.hugebss) + *(.hugebss.*) + __hugebss_end = .; +- } ++ } :all + + _end = .; + From peter at korsgaard.com Wed Feb 28 16:41:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:41:14 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/environment-setup: do not export GIT_DIR Message-ID: <20240228164457.B3AB687BFC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=087993b9ae0a655b567e8ecbc41c4f8fafd94229 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit c07aafa08792 (package/Makefile.in: set GIT_DIR=. in {HOST, TARGET}_MAKE_ENV) added GIT_DIR=. to TARGET_MAKE_ENV (which is included in TARGET_CONFIGURE_OPTS) to work around issues with packages getting confused when building in a subdir of the Buildroot git repo. This unfortunately also causes git commands to fail when output/host/environment-setup is sourced: git status fatal: not a git repository: '.' So strip GIT_DIR= from TARGET_CONFIGURE_OPTS when generating environment-setup. Reported-by: Mircea Gliga Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 48874afb9d03cb02b0207fd53bf2cdf0c37c8fa0) Signed-off-by: Peter Korsgaard --- package/environment-setup/environment-setup.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/environment-setup/environment-setup.mk b/package/environment-setup/environment-setup.mk index 29ec5a9a95..069ee25f9f 100644 --- a/package/environment-setup/environment-setup.mk +++ b/package/environment-setup/environment-setup.mk @@ -8,7 +8,7 @@ ENVIRONMENT_SETUP_FILE = $(HOST_DIR)/environment-setup define HOST_ENVIRONMENT_SETUP_INSTALL_CMDS cp package/environment-setup/environment-setup $(ENVIRONMENT_SETUP_FILE) - for var in $(TARGET_CONFIGURE_OPTS); do \ + for var in $(filter-out GIT_DIR=%,$(TARGET_CONFIGURE_OPTS)); do \ printf "export \"$$var\"\n" >> $(ENVIRONMENT_SETUP_FILE); \ done printf "export \"ARCH=$(NORMALIZED_ARCH)\"\n" >> $(ENVIRONMENT_SETUP_FILE) From peter at korsgaard.com Wed Feb 28 16:42:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 17:42:37 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/darkhttpd: security bump to version 1.15 Message-ID: <20240228164457.CA2E587BA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e6a17598588d040f84a4a7ee459f4d6f9eb1637d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following security issues: CVE-2024-23770: Local Leak of Authentication Parameter in Process List CVE-2024-23771: Basic Auth Timing Attack https://security.opensuse.org/2024/01/22/darkhttpd-basic-auth-issues.html Notice that CVE-2024-23770 is only documented as a known weakness, not fixed. Also change the license logic to use the dedicated COPYING file available since 1.14: https://github.com/emikulic/darkhttpd/commit/a8ae2b1de069588cad23d79a5392445ee9590fcd This license is ISC, not MIT - So adjust DARKHTTPD_LICENSE to match. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 0c7fd35947d91f84cff994bfb5c85b31b956d006) Signed-off-by: Peter Korsgaard --- package/darkhttpd/darkhttpd.hash | 4 ++-- package/darkhttpd/darkhttpd.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/darkhttpd/darkhttpd.hash b/package/darkhttpd/darkhttpd.hash index 188afff767..84a787eeba 100644 --- a/package/darkhttpd/darkhttpd.hash +++ b/package/darkhttpd/darkhttpd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 e063de9efa5635260c8def00a4d41ec6145226a492d53fa1dac436967670d195 darkhttpd-1.14.tar.gz -sha256 f002944c9a8516e3346002d39c3e13681306833358c0f3c7781dff1fdb639710 darkhttpd.c +sha256 ea48cedafbf43186f4a8d1afc99b33b671adee99519658446022e6f63bd9eda9 darkhttpd-1.15.tar.gz +sha256 1ecf63e8f84fd60ac7215e04195b9a61dcb47176ea65df26547582027f6c1dee COPYING diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index bda08899b8..e13f8f7770 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -4,10 +4,10 @@ # ################################################################################ -DARKHTTPD_VERSION = 1.14 +DARKHTTPD_VERSION = 1.15 DARKHTTPD_SITE = $(call github,emikulic,darkhttpd,v$(DARKHTTPD_VERSION)) -DARKHTTPD_LICENSE = MIT -DARKHTTPD_LICENSE_FILES = darkhttpd.c +DARKHTTPD_LICENSE = ISC +DARKHTTPD_LICENSE_FILES = COPYING DARKHTTPD_CPE_ID_VENDOR = darkhttpd_project define DARKHTTPD_BUILD_CMDS From vfazio at gmail.com Wed Feb 28 16:53:00 2024 From: vfazio at gmail.com (Vincent Fazio) Date: Wed, 28 Feb 2024 10:53:00 -0600 Subject: [Buildroot] [PATCH 1/1] package/gcc: add symver attribute support to MicroBlaze Message-ID: <20240228165300.4158751-1-vfazio@gmail.com> While the MicroBlaze architecture does generate ELFs, it does not leverage elfos.h to define common attributes; symver being one of them. By adding symver support, there should no longer be any need to patch packages to account for this architecture quirk. Fixes: http://autobuild.buildroot.org/results/29c76e02becedf922bd7dc0533338c078bf77d2a Fixes: http://autobuild.buildroot.net/results/1e9/1e965d83d75615f35308440c5db044314a349357 Signed-off-by: Vincent Fazio --- Tested by: * revert 4b34b8ccfa5159d643ecbac12c42c638e3b27e5e * make qemu_microblazeel_mmu_defconfig * add CONFIG_TMPFS_XATTR=y to kernel config ~/development/buildroot $ ./output/host/bin/microblazeel-buildroot-linux-gnu-readelf -W --dyn-syms output/target/usr/lib/libattr.so | grep "@ATTR" 43: 0000355c 824 FUNC GLOBAL DEFAULT 12 attr_listf@@ATTR_1.2 44: 00002bf4 340 FUNC GLOBAL DEFAULT 12 attr_getf@@ATTR_1.0 45: 00002a80 372 FUNC GLOBAL DEFAULT 12 attr_get@@ATTR_1.0 46: 00001a20 1716 FUNC GLOBAL DEFAULT 12 attr_copy_fd@@ATTR_1.1 47: 00002fe8 272 FUNC GLOBAL DEFAULT 12 attr_remove@@ATTR_1.0 48: 00003894 340 FUNC GLOBAL DEFAULT 12 attr_multi@@ATTR_1.0 49: 000020d4 1708 FUNC GLOBAL DEFAULT 12 attr_copy_file@@ATTR_1.1 50: 00003cb0 72 FUNC GLOBAL DEFAULT 12 fgetxattr at ATTR_1.0 51: 00003dc4 64 FUNC GLOBAL DEFAULT 12 removexattr at ATTR_1.0 52: 00003b88 76 FUNC GLOBAL DEFAULT 12 lsetxattr at ATTR_1.0 53: 00003cf8 68 FUNC GLOBAL DEFAULT 12 listxattr at ATTR_1.0 54: 000030f8 240 FUNC GLOBAL DEFAULT 12 attr_removef@@ATTR_1.0 56: 00002ea8 320 FUNC GLOBAL DEFAULT 12 attr_setf@@ATTR_1.0 57: 00003bd4 76 FUNC GLOBAL DEFAULT 12 fsetxattr at ATTR_1.0 60: 000039e8 340 FUNC GLOBAL DEFAULT 12 attr_multif@@ATTR_1.0 61: 00003c20 72 FUNC GLOBAL DEFAULT 12 getxattr at ATTR_1.0 63: 0000195c 196 FUNC GLOBAL DEFAULT 12 attr_copy_check_permissions@@ATTR_1.1 64: 00003e04 64 FUNC GLOBAL DEFAULT 12 lremovexattr at ATTR_1.0 65: 00003d3c 68 FUNC GLOBAL DEFAULT 12 llistxattr at ATTR_1.0 66: 00002d48 352 FUNC GLOBAL DEFAULT 12 attr_set@@ATTR_1.0 67: 00003b3c 76 FUNC GLOBAL DEFAULT 12 setxattr at ATTR_1.0 68: 00001448 1300 FUNC GLOBAL DEFAULT 12 attr_copy_action@@ATTR_1.3 69: 00003c68 72 FUNC GLOBAL DEFAULT 12 lgetxattr at ATTR_1.0 70: 000031e8 884 FUNC GLOBAL DEFAULT 12 attr_list@@ATTR_1.2 71: 00003d80 68 FUNC GLOBAL DEFAULT 12 flistxattr at ATTR_1.0 72: 00003e44 64 FUNC GLOBAL DEFAULT 12 fremovexattr at ATTR_1.0 # touch /tmp/file.txt # attr -S -s "someattr" -V "value" /tmp/file.txt Attribute "someattr" set to a 5 byte value for /tmp/file.txt: value # attr -l /tmp/file.txt Attribute "someattr" has a 5 byte value for /tmp/file.txt # getfattr -dm - /tmp/file.txt getfattr: Removing leading '/' from absolute path names # file: tmp/file.txt security.someattr="value" --- ...e-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch | 57 +++++++++++++++++++ ...e-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch | 57 +++++++++++++++++++ ...e-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch | 57 +++++++++++++++++++ 3 files changed, 171 insertions(+) create mode 100644 package/gcc/11.4.0/0008-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch create mode 100644 package/gcc/12.3.0/0004-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch create mode 100644 package/gcc/13.2.0/0003-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch diff --git a/package/gcc/11.4.0/0008-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch b/package/gcc/11.4.0/0008-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch new file mode 100644 index 0000000000..ade50e512d --- /dev/null +++ b/package/gcc/11.4.0/0008-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch @@ -0,0 +1,57 @@ +From 99873bdc294aabd19861786f51c6be01ecaee59c Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 20 Feb 2024 16:49:06 -0600 +Subject: [PATCH] microblaze: define ASM_OUTPUT_SYMVER_DIRECTIVE + +The MicroBlaze target architecture generates ELF binary objects, however +it does not leverage elfos.h like other ELF generating architectures +(see gcc/config.gcc). + +Due to this quirk, the architecture does not receive "free" updates for +new features that get added for ELF objects. One such feature being +symver support [0]. + +Now, the macro necessary to emit symver directives is defined. + +Packages such as attr, xz, libkcapi, et al which use this directive +should now compile on MicroBlaze without needing a patch to account +for this lack of support. + +This patch has not been submitted upstream as discussion [1] around +the approach has leaned toward a full migration to elfos.h which is +non-trivial. + +[0]: https://github.com/gcc-mirror/gcc/commit/d7ddfbcb7 +[1]: https://gcc.gnu.org/pipermail/gcc/2023-February/240752.html +Upstream-bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766 +Upstream: Not Submitted +Signed-off-by: Vincent Fazio +--- + gcc/config/microblaze/microblaze.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 2ecec750526..e4452acddb9 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -833,6 +833,17 @@ do { \ + fputc ('\n', FILE); \ + } while (0) + ++#define ASM_OUTPUT_SYMVER_DIRECTIVE(FILE, NAME, NAME2) \ ++ do \ ++ { \ ++ fputs ("\t.symver\t", (FILE)); \ ++ assemble_name ((FILE), (NAME)); \ ++ fputs (", ", (FILE)); \ ++ assemble_name ((FILE), (NAME2)); \ ++ fputc ('\n', (FILE)); \ ++ } \ ++ while (0) ++ + #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) + #undef UNIQUE_SECTION_P + #define UNIQUE_SECTION_P(DECL) (DECL_ONE_ONLY (DECL)) +-- +2.34.1 + diff --git a/package/gcc/12.3.0/0004-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch b/package/gcc/12.3.0/0004-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch new file mode 100644 index 0000000000..ade50e512d --- /dev/null +++ b/package/gcc/12.3.0/0004-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch @@ -0,0 +1,57 @@ +From 99873bdc294aabd19861786f51c6be01ecaee59c Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 20 Feb 2024 16:49:06 -0600 +Subject: [PATCH] microblaze: define ASM_OUTPUT_SYMVER_DIRECTIVE + +The MicroBlaze target architecture generates ELF binary objects, however +it does not leverage elfos.h like other ELF generating architectures +(see gcc/config.gcc). + +Due to this quirk, the architecture does not receive "free" updates for +new features that get added for ELF objects. One such feature being +symver support [0]. + +Now, the macro necessary to emit symver directives is defined. + +Packages such as attr, xz, libkcapi, et al which use this directive +should now compile on MicroBlaze without needing a patch to account +for this lack of support. + +This patch has not been submitted upstream as discussion [1] around +the approach has leaned toward a full migration to elfos.h which is +non-trivial. + +[0]: https://github.com/gcc-mirror/gcc/commit/d7ddfbcb7 +[1]: https://gcc.gnu.org/pipermail/gcc/2023-February/240752.html +Upstream-bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766 +Upstream: Not Submitted +Signed-off-by: Vincent Fazio +--- + gcc/config/microblaze/microblaze.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 2ecec750526..e4452acddb9 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -833,6 +833,17 @@ do { \ + fputc ('\n', FILE); \ + } while (0) + ++#define ASM_OUTPUT_SYMVER_DIRECTIVE(FILE, NAME, NAME2) \ ++ do \ ++ { \ ++ fputs ("\t.symver\t", (FILE)); \ ++ assemble_name ((FILE), (NAME)); \ ++ fputs (", ", (FILE)); \ ++ assemble_name ((FILE), (NAME2)); \ ++ fputc ('\n', (FILE)); \ ++ } \ ++ while (0) ++ + #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) + #undef UNIQUE_SECTION_P + #define UNIQUE_SECTION_P(DECL) (DECL_ONE_ONLY (DECL)) +-- +2.34.1 + diff --git a/package/gcc/13.2.0/0003-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch b/package/gcc/13.2.0/0003-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch new file mode 100644 index 0000000000..ade50e512d --- /dev/null +++ b/package/gcc/13.2.0/0003-microblaze-define-ASM_OUTPUT_SYMVER_DIRECTIVE.patch @@ -0,0 +1,57 @@ +From 99873bdc294aabd19861786f51c6be01ecaee59c Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Tue, 20 Feb 2024 16:49:06 -0600 +Subject: [PATCH] microblaze: define ASM_OUTPUT_SYMVER_DIRECTIVE + +The MicroBlaze target architecture generates ELF binary objects, however +it does not leverage elfos.h like other ELF generating architectures +(see gcc/config.gcc). + +Due to this quirk, the architecture does not receive "free" updates for +new features that get added for ELF objects. One such feature being +symver support [0]. + +Now, the macro necessary to emit symver directives is defined. + +Packages such as attr, xz, libkcapi, et al which use this directive +should now compile on MicroBlaze without needing a patch to account +for this lack of support. + +This patch has not been submitted upstream as discussion [1] around +the approach has leaned toward a full migration to elfos.h which is +non-trivial. + +[0]: https://github.com/gcc-mirror/gcc/commit/d7ddfbcb7 +[1]: https://gcc.gnu.org/pipermail/gcc/2023-February/240752.html +Upstream-bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766 +Upstream: Not Submitted +Signed-off-by: Vincent Fazio +--- + gcc/config/microblaze/microblaze.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 2ecec750526..e4452acddb9 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -833,6 +833,17 @@ do { \ + fputc ('\n', FILE); \ + } while (0) + ++#define ASM_OUTPUT_SYMVER_DIRECTIVE(FILE, NAME, NAME2) \ ++ do \ ++ { \ ++ fputs ("\t.symver\t", (FILE)); \ ++ assemble_name ((FILE), (NAME)); \ ++ fputs (", ", (FILE)); \ ++ assemble_name ((FILE), (NAME2)); \ ++ fputc ('\n', (FILE)); \ ++ } \ ++ while (0) ++ + #define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) + #undef UNIQUE_SECTION_P + #define UNIQUE_SECTION_P(DECL) (DECL_ONE_ONLY (DECL)) +-- +2.34.1 + -- 2.34.1 From peter at korsgaard.com Wed Feb 28 17:28:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:58 +0100 Subject: [Buildroot] [PATCH 01/12] package/gstreamer1: bump to version 1.22.9 In-Reply-To: <20240126113636.2371665-1-peter@korsgaard.com> (Peter Korsgaard's message of "Fri, 26 Jan 2024 12:36:24 +0100") References: <20240126113636.2371665-1-peter@korsgaard.com> Message-ID: <87ttlso5ut.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > Signed-off-by: Peter Korsgaard Committed series to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 17:30:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:30:42 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xserver_xorg-server: add CPE variables In-Reply-To: <20240128110544.2449102-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 28 Jan 2024 12:05:44 +0100") References: <20240128110544.2449102-1-fontaine.fabrice@gmail.com> Message-ID: <87plwgo5rx.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:x.org:xorg-server is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/79A86C02-31A5-4F25-8CA6-7C4A8CD92B7B > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 17:28:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-plugins-good: bump to version 1.22.9 Message-ID: <20240228173111.4F8B787C3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=11a1d35fec5b35c94d24235a715f6258af950807 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 3407703f2c95f40ec8fe71862c99b730c8ce9890) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index b810115bb9..4410da6ef4 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.8.tar.xz.sha256sum -sha256 e305b9f07f52743ca481da0a4e0c76c35efd60adaf1b0694eb3bb021e2137e39 gst-plugins-good-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.9.tar.xz.sha256sum +sha256 26959fcfebfff637d4ea08ef40316baf31b61bb7729820b0684e800c3a1478b6 gst-plugins-good-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index b93978d2d1..77cb9080ec 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.22.8 +GST1_PLUGINS_GOOD_VERSION = 1.22.9 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 17:28:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:16 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-plugins-base: bump to version 1.22.9 Message-ID: <20240228173111.42B4C87BF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c20e83d0a8f09ae6b3082545a497bb70ffba05f8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6b7db1bf64f50c59abe2aee387f7f7943d00a807) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index c637cf9a7f..060a871b95 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.8.tar.xz.sha256sum -sha256 eb6792e5c73c6defb9159c36ea6e4b78a2f8af6512678b4bd3b02c8d2d492acf gst-plugins-base-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.9.tar.xz.sha256sum +sha256 fac3e0dd2d8e9370388b34bf8c21b89d5f63bc3cfc12cd7fdc8fc6c1cba03334 gst-plugins-base-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 59c5e220ea..512e3fdee2 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.22.8 +GST1_PLUGINS_BASE_VERSION = 1.22.9 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:18 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-plugins-ugly: bump to version 1.22.9 Message-ID: <20240228173111.6606887BF9@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=956863493322d10f764ead0c69a29801bd730d76 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit ca65df3da287964acf2bffd66f35f7384f4d296e) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 7b85301280..20394619b0 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.8.tar.xz.sha256sum -sha256 0761d96ba508e01c0271881b26828c2bffd7d8afd50872219f088f755b252ca7 gst-plugins-ugly-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.9.tar.xz.sha256sum +sha256 0bf685d66015a01dd3fc1671b64a1c8acb321dd9d4ab9e05a29ab19782aa6236 gst-plugins-ugly-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 90be791e0c..7bb95dd1d0 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.22.8 +GST1_PLUGINS_UGLY_VERSION = 1.22.9 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 17:28:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:19 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-devtools: bump to version 1.22.9 Message-ID: <20240228173111.73F1487C3F@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5c40af09b5e1899066c5173d7596a0da1cd34a85 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 74c32bfa5d615cea3c23d5133c7e4fc8329579aa) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 823812114b..6cf7c9597f 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.8.tar.xz.sha256sum -sha256 cd634056fcb16d035b3df5953ec85ae8bd56c68f29920b720ef920ca71ea76a7 gst-devtools-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.9.tar.xz.sha256sum +sha256 02e29400b44e9cc603aa6444dee5726b57edabef6455e6d0921ffed6f13840ee gst-devtools-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 21d7253d91..0c085b8b42 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.22.8 +GST1_DEVTOOLS_VERSION = 1.22.9 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:18 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-plugins-bad: security bump to version 1.22.9 Message-ID: <20240228173111.5B4D787C3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a47236d33e32900c1bb729bee202827c2a94feb3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following security issue: CVE-2024-0444: Heap-based buffer overflow in the AV1 codec parser when handling certain malformed streams before GStreamer 1.22.9 https://gstreamer.freedesktop.org/security/sa-2024-0001.html Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 3ee1148b0009f62d6d19007778d491ac318c97d7) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index bf4abd3c2f..174c4ad572 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.8.tar.xz.sha256sum -sha256 458783f8236068991e3e296edd671c8eddb8be6fac933c1c2e1503462864ea0f gst-plugins-bad-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.9.tar.xz.sha256sum +sha256 1bc65d0fd5f53a3636564efd3fcf318c3edcdec39c4109a503c1fc8203840a1d gst-plugins-bad-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac1328b7e2..a61038376f 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.22.8 +GST1_PLUGINS_BAD_VERSION = 1.22.9 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:21 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-rtsp-server: bump to version 1.22.9 Message-ID: <20240228173111.9560087C3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e7015c3cf72b57abadfc03bd628ca05478dbbf6a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 88a6cfefbf1e03eb133afb0b6d957acc73a923eb) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 3ddea4e744..21f380378c 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.8.tar.xz.sha256sum -sha256 705177051c229976f171adcd7ab9762ae6bcc4bb77dc308a0bd80a63da6c337f gst-rtsp-server-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.9.tar.xz.sha256sum +sha256 808af148f89404ff74850f8ca5272bed4bfe67f9620231dc4514fd07eb26d0a4 gst-rtsp-server-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 13e5a369da..87e6413d00 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.22.8 +GST1_RTSP_SERVER_VERSION = 1.22.9 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:15 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gstreamer1: bump to version 1.22.9 Message-ID: <20240228173111.3907687C3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e79b73744ce99372119445f314cddaca77b1ef90 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit e81d29d55181c73c38a80152a39955b921cdc84c) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 89cc25674e..b6ed001eb3 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.8.tar.xz.sha256sum -sha256 ad4e3db1771139b1db17b1afa7c05db083ae0100bd4da244b71f162dcce41bfc gstreamer-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.9.tar.xz.sha256sum +sha256 1e7124d347e8cdc80f08ec1d370c201be513002af1102bb20e83c5279cb48ebd gstreamer-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 88c528d4b5..5b9125e62a 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.8 +GSTREAMER1_VERSION = 1.22.9 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:23 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst-omx: bump to version 1.22.9 Message-ID: <20240228173111.B0E2987C3A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ced0540e61304c59903809f1743adfd04db29a1f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9f342e4a676dc687e30908c954fd066f4b5c9d1f) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 528ebb99c2..86f8c772c9 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.8.tar.xz.sha256sum -sha256 94df10e7713618f0c8a4223f6e047f2d8f0ccecba1d585618e791f13037762df gst-omx-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.9.tar.xz.sha256sum +sha256 9362d6117985d09dcf6e27bdaef377dc08efb7df01d00101d04fb644addac61e gst-omx-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 472f929189..32891bafa6 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.22.8 +GST_OMX_VERSION = 1.22.9 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Wed Feb 28 17:28:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:20 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-libav: bump to version 1.22.9 Message-ID: <20240228173111.7FE3A87C3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cf19efa53d99f29c42035b96e96e5b0557cb05a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit db9b4f3b0ca4524fcead56b46b53bff268ec1964) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 7d27929cab..b5bc84d672 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.8.tar.xz.sha256sum -sha256 be39349bc07ab4cdbd9a5fd6ea9848c601c7560ba5a0577ad5200b83bd424981 gst-libav-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.9.tar.xz.sha256sum +sha256 192f7d27d21c1e7c72c339a2647a9b0c247fedc62ea5029115f8c3e22ebb87d8 gst-libav-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 5017cda01a..1b872b7fa9 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.22.8 +GST1_LIBAV_VERSION = 1.22.9 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:22 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-vaapi: bump to version 1.22.9 Message-ID: <20240228173111.A2E4587C3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1dbda0dc13e89faf27815651af5788fd233b63b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6f28c463cf06d929789dc4c4c37cd8bdbfa0d60a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 9a7b7df520..ec23ae7c6b 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.8.tar.xz.sha256sum -sha256 1298ba347a70c42b88cdebf91b659fea02b1bb7269eabf8e29e3c0bd58278928 gstreamer-vaapi-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.9.tar.xz.sha256sum +sha256 8ba20da8c4cbf5b2953dba904672c4275d0053e1528f97fdf8e59942c7883ca8 gstreamer-vaapi-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 0a2f35c8ce..4b04d1bb72 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.22.8 +GST1_VAAPI_VERSION = 1.22.9 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:23 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gstreamer1-editing-services: bump to version 1.22.9 Message-ID: <20240228173111.BE8B987C3D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=377fac9f577de30d88b08579c5db0aae1e381362 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit c55c1263ab213685a496702f56e3284db5578d96) Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 70f7e574e3..2ea29dae61 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.8.tar.xz.sha256sum -sha256 d1d5e75e190eb0be3fd49409e41a3aa8e68cfb4deaa7353488554674956cd1df gst-editing-services-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.9.tar.xz.sha256sum +sha256 3553ad3802dccde0c0ef1461881acd9b55bddf8adf751de4cb51b7f8cb50440d gst-editing-services-1.22.9.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 1d59e8ffde..e2c0f1ccf8 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.8 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.9 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 28 17:28:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:21 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gst1-python: bump to version 1.22.9 Message-ID: <20240228173111.8A5B287C3E@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62909338f1941fc768580ab347c556d72f73513d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d948714037e78c54b676879aae487725988a092a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 5c42a0ca08..2f352df92e 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.8.tar.xz.sha256sum -sha256 d5cb8f144054a2a110e6672bd512e4b15d5b1b8d9879c192b9723535efb70b8f gst-python-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.9.tar.xz.sha256sum +sha256 3f9d5c6ffefda268703744b592a6b3983aa6723273b1220ecbcb62c2a5800009 gst-python-1.22.9.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index df53efaa99..f843e37052 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.22.8 +GST1_PYTHON_VERSION = 1.22.9 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:29:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:29:32 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/x11r7/xserver_xorg-server: add CPE variables Message-ID: <20240228173111.CE4EA87C3B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e149a7a994e10ec503e9401b077f099a8584b214 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:x.org:xorg-server is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/79A86C02-31A5-4F25-8CA6-7C4A8CD92B7B Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit b80705800a5a4f5dfd1a1edccca001a3a0a4ef3a) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 4a05582583..1d0807ffec 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,6 +9,8 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING +XSERVER_XORG_SERVER_CPE_ID_VENDOR = x.org +XSERVER_XORG_SERVER_CPE_ID_PRODUCT = xorg-server XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:32 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-plugins-good: bump to version 1.22.9 Message-ID: <20240228173219.2EBBD87C99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b8cab7e50fc1f6fc6cb7496b9741e3cd004bb19e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 3407703f2c95f40ec8fe71862c99b730c8ce9890) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index b810115bb9..4410da6ef4 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.8.tar.xz.sha256sum -sha256 e305b9f07f52743ca481da0a4e0c76c35efd60adaf1b0694eb3bb021e2137e39 gst-plugins-good-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.9.tar.xz.sha256sum +sha256 26959fcfebfff637d4ea08ef40316baf31b61bb7729820b0684e800c3a1478b6 gst-plugins-good-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index d2ba737b45..fea35c6470 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.22.8 +GST1_PLUGINS_GOOD_VERSION = 1.22.9 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 17:28:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:31 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gstreamer1: bump to version 1.22.9 Message-ID: <20240228173219.1A7C687C97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3880eba082ec97ceedc0e890e026a9834d74d709 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit e81d29d55181c73c38a80152a39955b921cdc84c) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index 89cc25674e..b6ed001eb3 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.8.tar.xz.sha256sum -sha256 ad4e3db1771139b1db17b1afa7c05db083ae0100bd4da244b71f162dcce41bfc gstreamer-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.9.tar.xz.sha256sum +sha256 1e7124d347e8cdc80f08ec1d370c201be513002af1102bb20e83c5279cb48ebd gstreamer-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 88c528d4b5..5b9125e62a 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.8 +GSTREAMER1_VERSION = 1.22.9 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:33 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:33 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-plugins-ugly: bump to version 1.22.9 Message-ID: <20240228173219.43C8687C97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=53c2b299f119449e0d441852103bc0d2a8f74889 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit ca65df3da287964acf2bffd66f35f7384f4d296e) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 7b85301280..20394619b0 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.8.tar.xz.sha256sum -sha256 0761d96ba508e01c0271881b26828c2bffd7d8afd50872219f088f755b252ca7 gst-plugins-ugly-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.9.tar.xz.sha256sum +sha256 0bf685d66015a01dd3fc1671b64a1c8acb321dd9d4ab9e05a29ab19782aa6236 gst-plugins-ugly-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 90be791e0c..7bb95dd1d0 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.22.8 +GST1_PLUGINS_UGLY_VERSION = 1.22.9 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 17:28:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:35 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-libav: bump to version 1.22.9 Message-ID: <20240228173219.57D0787C9B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b249e43d690e27833b8b4c286a30b7965c8f7d86 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit db9b4f3b0ca4524fcead56b46b53bff268ec1964) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 7d27929cab..b5bc84d672 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.8.tar.xz.sha256sum -sha256 be39349bc07ab4cdbd9a5fd6ea9848c601c7560ba5a0577ad5200b83bd424981 gst-libav-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.9.tar.xz.sha256sum +sha256 192f7d27d21c1e7c72c339a2647a9b0c247fedc62ea5029115f8c3e22ebb87d8 gst-libav-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index 5017cda01a..1b872b7fa9 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.22.8 +GST1_LIBAV_VERSION = 1.22.9 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:31 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-plugins-base: bump to version 1.22.9 Message-ID: <20240228173219.24DAD87C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bf4c7f70f3b441b29a8f8876bb5db7f5955a6e4f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6b7db1bf64f50c59abe2aee387f7f7943d00a807) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index c637cf9a7f..060a871b95 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.8.tar.xz.sha256sum -sha256 eb6792e5c73c6defb9159c36ea6e4b78a2f8af6512678b4bd3b02c8d2d492acf gst-plugins-base-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.9.tar.xz.sha256sum +sha256 fac3e0dd2d8e9370388b34bf8c21b89d5f63bc3cfc12cd7fdc8fc6c1cba03334 gst-plugins-base-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 59c5e220ea..512e3fdee2 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.22.8 +GST1_PLUGINS_BASE_VERSION = 1.22.9 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:35 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-python: bump to version 1.22.9 Message-ID: <20240228173219.64E4587BD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5c728ad23f3b9fac07b54a052e6763c391f2b63 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit d948714037e78c54b676879aae487725988a092a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 5c42a0ca08..2f352df92e 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.8.tar.xz.sha256sum -sha256 d5cb8f144054a2a110e6672bd512e4b15d5b1b8d9879c192b9723535efb70b8f gst-python-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.9.tar.xz.sha256sum +sha256 3f9d5c6ffefda268703744b592a6b3983aa6723273b1220ecbcb62c2a5800009 gst-python-1.22.9.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index df53efaa99..f843e37052 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.22.8 +GST1_PYTHON_VERSION = 1.22.9 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:37 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst-omx: bump to version 1.22.9 Message-ID: <20240228173219.87AA187C9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b1e0f9341688cc0c3796d63fcad0e4802bdc0d0c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 9f342e4a676dc687e30908c954fd066f4b5c9d1f) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 528ebb99c2..86f8c772c9 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.8.tar.xz.sha256sum -sha256 94df10e7713618f0c8a4223f6e047f2d8f0ccecba1d585618e791f13037762df gst-omx-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.9.tar.xz.sha256sum +sha256 9362d6117985d09dcf6e27bdaef377dc08efb7df01d00101d04fb644addac61e gst-omx-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 472f929189..32891bafa6 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.22.8 +GST_OMX_VERSION = 1.22.9 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From peter at korsgaard.com Wed Feb 28 17:28:33 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:33 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-plugins-bad: security bump to version 1.22.9 Message-ID: <20240228173219.390D387C9A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0b8eb25c54fd910afac58f614a1963275950e42b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following security issue: CVE-2024-0444: Heap-based buffer overflow in the AV1 codec parser when handling certain malformed streams before GStreamer 1.22.9 https://gstreamer.freedesktop.org/security/sa-2024-0001.html Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 3ee1148b0009f62d6d19007778d491ac318c97d7) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index bf4abd3c2f..174c4ad572 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.8.tar.xz.sha256sum -sha256 458783f8236068991e3e296edd671c8eddb8be6fac933c1c2e1503462864ea0f gst-plugins-bad-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.9.tar.xz.sha256sum +sha256 1bc65d0fd5f53a3636564efd3fcf318c3edcdec39c4109a503c1fc8203840a1d gst-plugins-bad-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac1328b7e2..a61038376f 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.22.8 +GST1_PLUGINS_BAD_VERSION = 1.22.9 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:28:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:34 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-devtools: bump to version 1.22.9 Message-ID: <20240228173219.4DA7687C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c88c6a132046bfba445e8c6f0f7376343a19bcc7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 74c32bfa5d615cea3c23d5133c7e4fc8329579aa) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 823812114b..6cf7c9597f 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.8.tar.xz.sha256sum -sha256 cd634056fcb16d035b3df5953ec85ae8bd56c68f29920b720ef920ca71ea76a7 gst-devtools-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.9.tar.xz.sha256sum +sha256 02e29400b44e9cc603aa6444dee5726b57edabef6455e6d0921ffed6f13840ee gst-devtools-1.22.9.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 21d7253d91..0c085b8b42 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.22.8 +GST1_DEVTOOLS_VERSION = 1.22.9 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:38 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gstreamer1-editing-services: bump to version 1.22.9 Message-ID: <20240228173219.938AC87BD4@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=78fb608576ce2954b28baf267241e8751ac38092 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit c55c1263ab213685a496702f56e3284db5578d96) Signed-off-by: Peter Korsgaard --- .../gstreamer1-editing-services/gstreamer1-editing-services.hash | 4 ++-- .../gstreamer1-editing-services/gstreamer1-editing-services.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 70f7e574e3..2ea29dae61 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.8.tar.xz.sha256sum -sha256 d1d5e75e190eb0be3fd49409e41a3aa8e68cfb4deaa7353488554674956cd1df gst-editing-services-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.9.tar.xz.sha256sum +sha256 3553ad3802dccde0c0ef1461881acd9b55bddf8adf751de4cb51b7f8cb50440d gst-editing-services-1.22.9.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 1d59e8ffde..e2c0f1ccf8 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.8 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.9 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From peter at korsgaard.com Wed Feb 28 17:28:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:37 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-vaapi: bump to version 1.22.9 Message-ID: <20240228173219.7E0C387C99@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9fd9fa154306fceb5baaff1bf9c78e1703c40858 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 6f28c463cf06d929789dc4c4c37cd8bdbfa0d60a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 9a7b7df520..ec23ae7c6b 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.8.tar.xz.sha256sum -sha256 1298ba347a70c42b88cdebf91b659fea02b1bb7269eabf8e29e3c0bd58278928 gstreamer-vaapi-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.9.tar.xz.sha256sum +sha256 8ba20da8c4cbf5b2953dba904672c4275d0053e1528f97fdf8e59942c7883ca8 gstreamer-vaapi-1.22.9.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 0a2f35c8ce..4b04d1bb72 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.22.8 +GST1_VAAPI_VERSION = 1.22.9 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:28:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:28:36 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gst1-rtsp-server: bump to version 1.22.9 Message-ID: <20240228173219.72DC987C97@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a31c7735fbce68e73e01fc3f0b18976fe9d5612b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 88a6cfefbf1e03eb133afb0b6d957acc73a923eb) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index 3ddea4e744..21f380378c 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.8.tar.xz.sha256sum -sha256 705177051c229976f171adcd7ab9762ae6bcc4bb77dc308a0bd80a63da6c337f gst-rtsp-server-1.22.8.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.9.tar.xz.sha256sum +sha256 808af148f89404ff74850f8ca5272bed4bfe67f9620231dc4514fd07eb26d0a4 gst-rtsp-server-1.22.9.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 13e5a369da..87e6413d00 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.22.8 +GST1_RTSP_SERVER_VERSION = 1.22.9 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ From peter at korsgaard.com Wed Feb 28 17:29:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:29:28 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/x11r7/xserver_xorg-server: add CPE variables Message-ID: <20240228173219.9F12887C98@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eb15ce67f51cd776c5fd1cd49153b1871e430fb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:x.org:xorg-server is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/79A86C02-31A5-4F25-8CA6-7C4A8CD92B7B Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit b80705800a5a4f5dfd1a1edccca001a3a0a4ef3a) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 4a05582583..1d0807ffec 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,6 +9,8 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.gz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT XSERVER_XORG_SERVER_LICENSE_FILES = COPYING +XSERVER_XORG_SERVER_CPE_ID_VENDOR = x.org +XSERVER_XORG_SERVER_CPE_ID_PRODUCT = xorg-server XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES From peter at korsgaard.com Wed Feb 28 17:35:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:35:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/tor: Fix build with libressl >= 3.8.1 In-Reply-To: <20240128164151.283361-1-bernd@kuhls.net> (Bernd Kuhls's message of "Sun, 28 Jan 2024 17:41:51 +0100") References: <20240128164151.283361-1-bernd@kuhls.net> Message-ID: <87le74o5kp.fsf@48ers.dk> >>>>> "Bernd" == Bernd Kuhls writes: > Fixes: > http://autobuild.buildroot.net/results/85c/85cde3bcd12fb5adafb94c85d5fa636e1b5b9068/ > Signed-off-by: Bernd Kuhls Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 17:35:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:35:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: security bump to version 8.5.4 In-Reply-To: <20240127225657.2427657-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 27 Jan 2024 23:56:57 +0100") References: <20240127225657.2427657-1-fontaine.fabrice@gmail.com> Message-ID: <87h6hso5k9.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2023-38802, CVE-2023-41360, CVE-2023-46752, CVE-2023-46753, > CVE-2023-47234 and CVE-2023-47235 > https://frrouting.org/security/ > https://frrouting.org/release/8.5.4/ > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 17:34:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:34:21 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/frr: security bump to version 8.5.4 Message-ID: <20240228173549.CB8AC87C9D@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=edfc7436427779ed7f2a2095f0d023df56950afc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix CVE-2023-38802, CVE-2023-41360, CVE-2023-46752, CVE-2023-46753, CVE-2023-47234 and CVE-2023-47235 https://frrouting.org/security/ https://frrouting.org/release/8.5.4/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c3cf06e0a8957e7ea6e6a01e4bbc3efb6f042d12) Signed-off-by: Peter Korsgaard --- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 836f130b93..4a61084bae 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8a6b0e0fa1e89493ba84cf176674e55c7a814821fd02a7188095b76c37c3935f frr-8.4.2.tar.gz +sha256 7ae9d8bafc65bb5d0f21061ac61dbc6cf93b2b05a5dae9e5eec72ed42388551e frr-8.5.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index abae784c40..19f346fd7b 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.4.2 +FRR_VERSION = 8.5.4 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING From peter at korsgaard.com Wed Feb 28 17:34:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:34:48 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/tor: Fix build with libressl >= 3.8.1 Message-ID: <20240228173549.D54B987C39@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=096eec5b39e610a4ccbbbe544d34874db2efb976 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes: http://autobuild.buildroot.net/results/85c/85cde3bcd12fb5adafb94c85d5fa636e1b5b9068/ Signed-off-by: Bernd Kuhls [yann.morin.1998 at free.fr: fix Upstream tag] Signed-off-by: Yann E. MORIN (cherry picked from commit 2fbeacf91f985df5834968e7ce95d5c0340b7fab) Signed-off-by: Peter Korsgaard --- ...sl_mgt-define-DISABLE_ENGINES-after-OPENS.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/package/tor/0001-crypt_openssl_mgt-define-DISABLE_ENGINES-after-OPENS.patch b/package/tor/0001-crypt_openssl_mgt-define-DISABLE_ENGINES-after-OPENS.patch new file mode 100644 index 0000000000..f8ad803203 --- /dev/null +++ b/package/tor/0001-crypt_openssl_mgt-define-DISABLE_ENGINES-after-OPENS.patch @@ -0,0 +1,58 @@ +From 48f8d6918977673125d53a85d19d709136106739 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Thu, 31 Aug 2023 14:35:52 -0700 +Subject: [PATCH] crypt_openssl_mgt: define DISABLE_ENGINES after + OPENSSL_NO_ENGINE + +With LibreSSL-3.8.1 these engines are no long available causing a build +failure, but LibreSSL correctly defines OPENSSL_NO_ENGINE as part of its +opensslfeatures.h. However Tor includes crypto_openssl_mgt.h before any +of the openssl includes which would define OPENSSL_NO_ENGINE and then +fails to define DISABLE_ENGINES. + +As the define is used in only a single .c file it is best to move it +there. + +Signed-off-by: orbea +Upstream: https://gitlab.torproject.org/tpo/core/tor/-/commit/48f8d6918977673125d53a85d19d709136106739 +Signed-off-by: Bernd Kuhls +--- + src/lib/crypt_ops/crypto_openssl_mgt.c | 5 +++++ + src/lib/crypt_ops/crypto_openssl_mgt.h | 5 ----- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c +index 6c01cb6aa8..ca12a82518 100644 +--- a/src/lib/crypt_ops/crypto_openssl_mgt.c ++++ b/src/lib/crypt_ops/crypto_openssl_mgt.c +@@ -40,6 +40,11 @@ ENABLE_GCC_WARNING("-Wredundant-decls") + + #include + ++#ifdef OPENSSL_NO_ENGINE ++/* Android's OpenSSL seems to have removed all of its Engine support. */ ++#define DISABLE_ENGINES ++#endif ++ + #ifndef NEW_THREAD_API + /** A number of preallocated mutexes for use by OpenSSL. */ + static tor_mutex_t **openssl_mutexes_ = NULL; +diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.h b/src/lib/crypt_ops/crypto_openssl_mgt.h +index 96a37721dd..eac0ec1977 100644 +--- a/src/lib/crypt_ops/crypto_openssl_mgt.h ++++ b/src/lib/crypt_ops/crypto_openssl_mgt.h +@@ -49,11 +49,6 @@ + #define OPENSSL_V_SERIES(a,b,c) \ + OPENSSL_VER((a),(b),(c),0,0) + +-#ifdef OPENSSL_NO_ENGINE +-/* Android's OpenSSL seems to have removed all of its Engine support. */ +-#define DISABLE_ENGINES +-#endif +- + #if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5) + /* OpenSSL as of 1.1.0pre4 has an "new" thread API, which doesn't require + * setting up various callbacks. +-- +GitLab + From peter at korsgaard.com Wed Feb 28 17:34:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 18:34:16 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/frr: security bump to version 8.5.4 Message-ID: <20240228173657.9F84287CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b4dee60f609cbfa5e7e44dcf0a3a8b291ca9f1fb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fix CVE-2023-38802, CVE-2023-41360, CVE-2023-46752, CVE-2023-46753, CVE-2023-47234 and CVE-2023-47235 https://frrouting.org/security/ https://frrouting.org/release/8.5.4/ Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c3cf06e0a8957e7ea6e6a01e4bbc3efb6f042d12) Signed-off-by: Peter Korsgaard --- package/frr/frr.hash | 2 +- package/frr/frr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/frr/frr.hash b/package/frr/frr.hash index 836f130b93..4a61084bae 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8a6b0e0fa1e89493ba84cf176674e55c7a814821fd02a7188095b76c37c3935f frr-8.4.2.tar.gz +sha256 7ae9d8bafc65bb5d0f21061ac61dbc6cf93b2b05a5dae9e5eec72ed42388551e frr-8.5.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index abae784c40..19f346fd7b 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.4.2 +FRR_VERSION = 8.5.4 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING From fontaine.fabrice at gmail.com Wed Feb 28 17:47:21 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Wed, 28 Feb 2024 18:47:21 +0100 Subject: [Buildroot] [PATCH 1/1] package/libheif: fix libjpeg build Message-ID: <20240228174721.1141838-1-fontaine.fabrice@gmail.com> libheif raises the following build failure with libjpeg since bump to version 1.17.5 in commit 5714126edac88e3adc043a482b262b319a907dd3 and https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); | ^~~~~~~~~~ | | | long unsigned int* Fixes: - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 Signed-off-by: Fabrice Fontaine --- ...ns-encoder_jpeg.cc-fix-libjpeg-build.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch diff --git a/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch new file mode 100644 index 0000000000..5245327fe7 --- /dev/null +++ b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch @@ -0,0 +1,47 @@ +From 33eb948240365434c845b618854403e82a229012 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 31 Jan 2024 21:04:37 +0100 +Subject: [PATCH] libheif/plugins/encoder_jpeg.cc: fix libjpeg build + +Fix the following libjpeg build failure raised since version 1.17.0 and +https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 +because third argument of jpeg_mem_dest is defined as size_t* on libjpeg +instead of unsigned long* on jpeg-turbo: + +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] + 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); + | ^~~~~~~~~~ + | | + | long unsigned int* + +Fix #1008 and #1086 + +Fixes: + - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/strukturag/libheif/pull/1120 +--- + libheif/plugins/encoder_jpeg.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libheif/plugins/encoder_jpeg.cc b/libheif/plugins/encoder_jpeg.cc +index d6c7854..21a5541 100644 +--- a/libheif/plugins/encoder_jpeg.cc ++++ b/libheif/plugins/encoder_jpeg.cc +@@ -360,7 +360,11 @@ struct heif_error jpeg_encode_image(void* encoder_raw, const struct heif_image* + } + + uint8_t* outbuffer = nullptr; ++#ifdef LIBJPEG_TURBO_VERSION + unsigned long outlength = 0; ++#else ++ size_t outlength = 0; ++#endif + + jpeg_create_compress(&cinfo); + jpeg_mem_dest(&cinfo, &outbuffer, &outlength); +-- +2.43.0 + -- 2.43.0 From peter at korsgaard.com Wed Feb 28 18:14:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 19:14:18 +0100 Subject: [Buildroot] [PATCH] package/python3: security bump to 3.12.2 In-Reply-To: <20240212095514.11656-1-buildroot@bubu1.eu> (Marcus Hoffmann via buildroot's message of "Mon, 12 Feb 2024 10:55:14 +0100") References: <20240212095514.11656-1-buildroot@bubu1.eu> Message-ID: <87cysgo3r9.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Fixes the following security issue: > * Skip .pth files with names starting with a dot or hidden file > attribute. [1] > [1] https://docs.python.org/release/3.12.2/whatsnew/changelog.html#security I have in the man time reverted the 3.12.x bump for now because of issues, so I have instead applied a bump to 3.11.8, which contains the same security fix. -- Bye, Peter Korsgaard From ju.o at free.fr Wed Feb 28 18:14:11 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 28 Feb 2024 19:14:11 +0100 Subject: [Buildroot] [PATCH v2 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 Message-ID: <20240228181411.10174-1-ju.o@free.fr> Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated gnu-efi. This update introduced syslinux build failure, as reported in [1]. This commit adds a package patch to fix this issue. For technical details of the issue, see the package patch commit log. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html Signed-off-by: Julien Olivain --- Changes v1 -> v2: - Removed .checkpackageignore entry for the patch - Added Upstream: tag with upstream proposal URL in the patch --- ...stddef.h-add-wchar_t-type-definition.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch diff --git a/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch new file mode 100644 index 00000000000..65d9463a6f6 --- /dev/null +++ b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch @@ -0,0 +1,59 @@ +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Tue, 27 Feb 2024 21:09:15 +0100 +Subject: [PATCH] stddef.h: add wchar_t type definition + +Syslinux fail to build with gnu-efi >= 3.0.16 with error: + + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, + from /build/syslinux-6.03/efi/efi.h:23, + from /build/syslinux-6.03/efi/adv.h:4, + from /build/syslinux-6.03/efi/adv.c:29: + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' + typedef wchar_t CHAR16; + ^~~~~~~ + +This is because gnu-efi started to use the "wchar_t" type from the +toolchain's header, in commit [1]. Before this commit, +gnu-efi was defining the type as "short". + +Syslinux is including its own minimal stddef.h file, which masks the +one provided by the toolchain. See [2]. This file does not have a type +definition for "wchar_t". + +Finally, the POSIX header is supposed to provide this +"wchar_t" type definition. See [3]. + +This commit fixes the issue by adding the "wchar_t" type definition in +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This +also follow the previous gnu-efi < 3.0.16 behavior. + +This issue was seen in Buildroot Linux, in [5]. + +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html + +Upstream: Proposed: https://www.syslinux.org/archives/2024-February/026903.html +Signed-off-by: Julien Olivain +--- + com32/include/stddef.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/com32/include/stddef.h b/com32/include/stddef.h +index f52d62f3..437b11f2 100644 +--- a/com32/include/stddef.h ++++ b/com32/include/stddef.h +@@ -29,4 +29,6 @@ + */ + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) + ++typedef short wchar_t; ++ + #endif /* _STDDEF_H */ +-- +2.44.0 + -- 2.44.0 From peter at korsgaard.com Wed Feb 28 18:09:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 19:09:32 +0100 Subject: [Buildroot] [git commit] package/python3: security bump to version 3.11.8 Message-ID: <20240228181437.867B287CA7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c7b52c3ccf4828cd848b6a98206dbe712f84e49b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Fixes the following security issue: gh-113659: Skip .pth files with names starting with a dot or hidden file attribute https://github.com/python/cpython/issues/113659 Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 6 +++--- package/python3/python3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 39a16c1f71..962d32b5d9 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3116/ -md5 d0c5a1a31efe879723e51addf56dd206 Python-3.11.6.tar.xz +# From https://www.python.org/downloads/release/python-3118/ +md5 b353b8433e560e1af2b130f56dfbd973 Python-3.11.8.tar.xz # Locally computed -sha256 0fab78fa7f133f4f38210c6260d90d7c0d5c7198446419ce057ec7ac2e6f5f38 Python-3.11.6.tar.xz +sha256 9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 Python-3.11.8.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 7a704d81e0..5d9d77af50 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).6 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).8 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From sairon at sairon.cz Wed Feb 28 18:14:08 2024 From: sairon at sairon.cz (=?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?=) Date: Wed, 28 Feb 2024 19:14:08 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: only install fsidd binary and unit file with enabled nfsd Message-ID: <20240228181409.3756293-1-sairon@sairon.cz> Unit file for the FSID daemon depends on the nfs-server.service, which is removed without BR2_PACKAGE_NFS_UTILS_RPC_NFSD enabled. Also don't install the fsidd service binary without nfsd enabled. Signed-off-by: Jan ?erm?k --- package/nfs-utils/nfs-utils.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 4f2b41c782..b757e3e51d 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -42,7 +42,8 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \ - usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service + usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service \ + usr/sbin/fsidd usr/lib/systemd/system/fsidd.service ifeq ($(BR2_PACKAGE_NFS_UTILS_NFSV4),y) NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41 -- 2.34.1 From sairon at sairon.cz Wed Feb 28 18:23:21 2024 From: sairon at sairon.cz (=?UTF-8?B?SmFuIMSMZXJtw6Fr?=) Date: Wed, 28 Feb 2024 19:23:21 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: only install fsidd binary and unit file with enabled nfsd In-Reply-To: <20240228181409.3756293-1-sairon@sairon.cz> References: <20240228181409.3756293-1-sairon@sairon.cz> Message-ID: <5951f2b8-0ade-484a-97c0-0b59936e253d@sairon.cz> On 28. 02. 24 19:14, Jan ?erm?k wrote: > Unit file for the FSID daemon depends on the nfs-server.service, which is > removed without BR2_PACKAGE_NFS_UTILS_RPC_NFSD enabled. Also don't install > the fsidd service binary without nfsd enabled. Also, I *think* that sqlite (and libevent?) dependencies could be dropped in the case when nfsd (or nfsdcld/nfsdcltrack) is not installed. But there are no configure flags for this scenario in the upstream, nfsd is simply removed after the install in BR, so this would either need bit more elaborate patching or upstream coordination. Maybe Giulio or Petr can give some insights here. Anyway, let me know what you think and if it's worth pursuing this. Cheers, Jan From ju.o at free.fr Wed Feb 28 18:27:25 2024 From: ju.o at free.fr (Julien Olivain) Date: Wed, 28 Feb 2024 19:27:25 +0100 Subject: [Buildroot] [PATCH 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 In-Reply-To: <90f5d326-0b04-495e-9b6d-d25ebfa59cb4@smile.fr> References: <20240227213517.241837-1-ju.o@free.fr> <90f5d326-0b04-495e-9b6d-d25ebfa59cb4@smile.fr> Message-ID: Hi Romain, On 27/02/2024 23:31, Romain Naour wrote: > Hi Julien, > > Le 27/02/2024 ? 22:35, Julien Olivain a ?crit?: >> Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated >> gnu-efi. This update introduced syslinux build failure, as reported >> in [1]. >> >> This commit adds a package patch to fix this issue. For technical >> details of the issue, see the package patch commit log. >> >> Fixes: >> - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 >> - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 >> >> [1] >> https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html >> >> Signed-off-by: Julien Olivain >> --- >> .checkpackageignore | 1 + >> ...stddef.h-add-wchar_t-type-definition.patch | 58 >> +++++++++++++++++++ >> 2 files changed, 59 insertions(+) >> create mode 100644 >> boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch >> >> diff --git a/.checkpackageignore b/.checkpackageignore >> index a6cc58c448c..a98a53fbf36 100644 >> --- a/.checkpackageignore >> +++ b/.checkpackageignore >> @@ -118,6 +118,7 @@ >> boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch Upstream >> >> boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch >> Upstream >> >> boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch >> Upstream >> >> boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch >> Upstream >> +boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > > We want to remove .checkpackageignore in a not too far future, please > add an > upstream status tag in the patch > 0019-stddef.h-add-wchar_t-type-definition.patch > itself. Even if upstream is not very active (last commit is 5 years > ago). I sent a v2 fixing that: https://patchwork.ozlabs.org/project/buildroot/patch/20240228181411.10174-1-ju.o at free.fr/ I initially set an exclusion because my registration to the list was slow. I also noted the somewhat slow activity of the project. What would be your recommendation for the "Upstream:" tag, in the case a patch does apply upstream, but the first time submission takes a bit longer? Something like "Upstream: Applicable (but not proposed yet)"? Best regards, Julien. From arnout at mind.be Wed Feb 28 19:16:54 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 28 Feb 2024 20:16:54 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: sort CVEs in HTML output Message-ID: <20240228193247.A4FEF87CD8@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75a3562324bd64d4d02edbcf840809863d4c266f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master While the old NVD JSON feed provided data files where the CVEs were sorted by ID, the new feed from FKIE does not have sorted CVEs. Add a method to sort a list of CVE IDs (i.e. CVE ID strings, not CVE objects!), and use that when emiting the HTML output. The JSON output need not be sorted, because it is supposed to be used for post-processing, and we do not care about the ordering there; a consumer interested in sorting should sort on their side. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 7 +++++++ support/scripts/pkg-stats | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 747ad881c9..1a3c307e12 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -117,6 +117,13 @@ class CVE: open(path_metaf, "w").write(page_meta.text) return path_jsonf_xz + @staticmethod + def sort_id(cve_ids): + def cve_key(cve_id): + year, id_ = cve_id.split('-')[1:] + return (int(year), int(id_)) + return sorted(cve_ids, key=cve_key) + @classmethod def read_nvd_dir(cls, nvd_dir): """ diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index afb746704a..9a4a3ccad5 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1055,9 +1055,9 @@ def dump_html_pkg(f, pkg): f.write(f'
      see all ({cve_total}) ▾
      \n') if pkg.is_status_error("cve"): - for cve in pkg.cves: + for cve in cvecheck.CVE.sort_id(pkg.cves): f.write(f' {cve}
      \n') - for cve in pkg.unsure_cves: + for cve in cvecheck.CVE.sort_id(pkg.unsure_cves): f.write(f' {cve} (unsure)
      \n') elif pkg.is_status_na("cve"): f.write(f""" {pkg.status['cve'][1]}""") From arnout at mind.be Wed Feb 28 19:12:08 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 28 Feb 2024 20:12:08 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: adapt to NVD v2 json format Message-ID: <20240228193247.9833087CA6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=54f8d97c913e3c38073d6a31ed3ff02dd71cf9cb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) missed the fact that the layout of the FKIE data files are different from the original NVD ones. They are formatted according to the NVD v2 API. Most differences are relatively trivial fields renaming, and those are easily spotted in this patch. There is however one key difference in the layout of the configurations. Where the NVD had "configurations" as an object with a "nodes" key, the FKIE has a "configurations" as a list of objects with a single "nodes" key; i.e. it is one-level deeper. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index f12a8048cd..747ad881c9 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -128,7 +128,7 @@ class CVE: filename = CVE.download_nvd_year(nvd_dir, year) try: uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'CVE_Items.item') + content = ijson.items(uncompressed, 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise @@ -155,11 +155,11 @@ class CVE: for parsed_node in self.parse_node(child): yield parsed_node - for cpe in node.get('cpe_match', ()): + for cpe in node.get('cpeMatch', ()): if not cpe['vulnerable']: return - product = cpe_product(cpe['cpe23Uri']) - version = cpe_version(cpe['cpe23Uri']) + product = cpe_product(cpe['criteria']) + version = cpe_version(cpe['criteria']) # ignore when product is '-', which means N/A if product == '-': return @@ -191,7 +191,7 @@ class CVE: v_end = cpe['versionEndExcluding'] yield { - 'id': cpe['cpe23Uri'], + 'id': cpe['criteria'], 'v_start': v_start, 'op_start': op_start, 'v_end': v_end, @@ -199,14 +199,15 @@ class CVE: } def each_cpe(self): - for node in self.nvd_cve['configurations']['nodes']: - for cpe in self.parse_node(node): - yield cpe + for nodes in self.nvd_cve.get('configurations', []): + for node in nodes['nodes']: + for cpe in self.parse_node(node): + yield cpe @property def identifier(self): """The CVE unique identifier""" - return self.nvd_cve['cve']['CVE_data_meta']['ID'] + return self.nvd_cve['id'] @property def affected_products(self): From arnout at mind.be Wed Feb 28 19:11:13 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 28 Feb 2024 20:11:13 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: fix datetime deprecation warning Message-ID: <20240228193247.8DA9587CD7@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f71d9f49e5466f31b53bb2cdc0201182104c86c0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Abide by the warning reported with python 3.12: .../support/scripts/pkg-stats:1289: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC). Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9307992d29..afb746704a 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1290,7 +1290,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.utcnow() + date = datetime.datetime.now(datetime.UTC) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() From arnout at mind.be Wed Feb 28 19:34:45 2024 From: arnout at mind.be (Arnout Vandecappelle) Date: Wed, 28 Feb 2024 20:34:45 +0100 Subject: [Buildroot] [PATCH 0/3] support/scripts/pkg-stats: fix CVE identification (branch yem/pkgstat-cve) In-Reply-To: References: Message-ID: <65c2613d-781f-42ab-acd8-6e72fbadd5b9@mind.be> On 25/02/2024 23:05, Yann E. MORIN wrote: > Hello All! > > Since we switched to the FKIE CVE feed (as the NVD JSON feed are oing > extinct soon-ish), we missed the fact that the new feeds did not have > the same layout as the former ones, breaking CVE reporting. > > As a consequence of having no CVE reported, w emissed the fact that the > CVEs were not sorted in the new feeds, while they were in the formers. > > This series fixes both issus, and introduces a minor fixup for a python > deprecation warning. > > Regards, > Yann E. MORIN. Series applied to master, thanks! When I was working on it, I thought something needed to change in parse_node itself (because that was done in the other NVDv2 series), but apparently not. That said, we currently do make some sweeping assumptions about how a configuration is specified.... Regards, Arnout > > > ---------------------------------------------------------------- > Yann E. MORIN (3): > support/scripts/pkg-stats: fix datetime deprecation warning > support/scripts/pkg-stats: fkie json format > support/scripts/pkg-stats: sort CVEs in HTML output > > support/scripts/cve.py | 26 +++++++++++++++++--------- > support/scripts/pkg-stats | 6 +++--- > 2 files changed, 20 insertions(+), 12 deletions(-) > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' From buildroot at bubu1.eu Wed Feb 28 19:53:31 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 20:53:31 +0100 Subject: [Buildroot] [PATCH 1/2] package/pico-sdk: new package Message-ID: <20240228195333.712751-1-buildroot@bubu1.eu> Add the pi-pico sdk as a dependency for picotool. This is a bit of a weird package, because you normally clone the git repository and point the picotool (or rp2040 firmware project) build to it. For picotool specifically, only headers are used from the sdk, for building a firmware project, it is included as source files via cmake, so this pretty much has the same semantics for that as well. Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/pico-sdk/Config.in | 9 +++++++++ package/pico-sdk/pico-sdk.hash | 3 +++ package/pico-sdk/pico-sdk.mk | 20 ++++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/pico-sdk/Config.in create mode 100644 package/pico-sdk/pico-sdk.hash create mode 100644 package/pico-sdk/pico-sdk.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..b01024ae04 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1785,6 +1785,7 @@ menu "Hardware handling" source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" + source "package/pico-sdk/Config.in" source "package/rpi-rgb-led-matrix/Config.in" source "package/tslib/Config.in" source "package/uhd/Config.in" diff --git a/package/pico-sdk/Config.in b/package/pico-sdk/Config.in new file mode 100644 index 0000000000..962139925c --- /dev/null +++ b/package/pico-sdk/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PICO_SDK + bool "pico-sdk" + help + Raspberry Pi Pico SDK. Provides the headers, libraries + and build system necessary to write programs for the + RP2040-based devices such as the Raspberry Pi Pico in + C, C++ or assembly language. + + https://github.com/raspberrypi/pico-sdk diff --git a/package/pico-sdk/pico-sdk.hash b/package/pico-sdk/pico-sdk.hash new file mode 100644 index 0000000000..5db7e8bdb4 --- /dev/null +++ b/package/pico-sdk/pico-sdk.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 95f5e522be3919e36a47975ffd3b208c38880c14468bd489ac672cfe3cec803c pico-sdk-1.5.1.tar.gz +sha256 483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6 LICENSE.TXT diff --git a/package/pico-sdk/pico-sdk.mk b/package/pico-sdk/pico-sdk.mk new file mode 100644 index 0000000000..0c475d8aa1 --- /dev/null +++ b/package/pico-sdk/pico-sdk.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# pico-sdk +# +################################################################################ + +PICO_SDK_VERSION = 1.5.1 +PICO_SDK_SITE = $(call github,raspberrypi,pico-sdk,$(PICO_SDK_VERSION)) +PICO_SDK_LICENSE = BSD-3-Clause +PICO_SDK_LICENSE_FILES = LICENSE.TXT +PICO_SDK_INSTALL_STAGING = YES +# Header-only lib, as far as buildroot is concerned +PICO_SDK_INSTALL_TARGET = NO + +define PICO_SDK_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/pico-sdk + cp -r $(@D)/* $(STAGING_DIR)/usr/include/pico-sdk +endef + +$(eval $(generic-package)) -- 2.34.1 From buildroot at bubu1.eu Wed Feb 28 19:53:32 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 20:53:32 +0100 Subject: [Buildroot] [PATCH 2/2] package/picotool: new package In-Reply-To: <20240228195333.712751-1-buildroot@bubu1.eu> References: <20240228195333.712751-1-buildroot@bubu1.eu> Message-ID: <20240228195333.712751-2-buildroot@bubu1.eu> Add the raspberry pi picotool for interacting with rp2040 binaries and devices. Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/picotool/Config.in | 16 ++++++++++++++++ package/picotool/picotool.hash | 3 +++ package/picotool/picotool.mk | 15 +++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 package/picotool/Config.in create mode 100644 package/picotool/picotool.hash create mode 100644 package/picotool/picotool.mk diff --git a/package/Config.in b/package/Config.in index b01024ae04..2d4559036b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -583,6 +583,7 @@ endmenu source "package/pciutils/Config.in" source "package/pdbg/Config.in" source "package/picocom/Config.in" + source "package/picotool/Config.in" source "package/pifmrds/Config.in" source "package/pigpio/Config.in" source "package/powertop/Config.in" diff --git a/package/picotool/Config.in b/package/picotool/Config.in new file mode 100644 index 0000000000..03772bb116 --- /dev/null +++ b/package/picotool/Config.in @@ -0,0 +1,16 @@ +comment "picotool needs a toolchain w/ C++ and gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_9 + +config BR2_PACKAGE_PICOTOOL + bool "picotool" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_HOST_GCC_AT_LEAST_4_9 # libusb + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_PICO_SDK + help + picotool is a tool for inspecting rp2040 binaries and interacting + with rp2040 devices when they are in bootsel mode or devices USB + stdio support from the Raspberry Pi Pico SDK. + + https://github.com/raspberrypi/picotool + diff --git a/package/picotool/picotool.hash b/package/picotool/picotool.hash new file mode 100644 index 0000000000..b573ada09e --- /dev/null +++ b/package/picotool/picotool.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f1746ead7815c13be1152f0645db8ea3b277628eb0110d42a0a186db37d40a91 1.1.2.tar.gz +sha256 483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6 LICENSE.TXT diff --git a/package/picotool/picotool.mk b/package/picotool/picotool.mk new file mode 100644 index 0000000000..c98284c491 --- /dev/null +++ b/package/picotool/picotool.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# picotool +# +################################################################################ + +PICOTOOL_VERSION = 1.1.2 +PICOTOOL_SITE = https://github.com/raspberrypi/picotool/archive/refs/tags +PICOTOOL_SOURCE = $(PICOTOOL_VERSION).tar.gz +PICOTOOL_CONF_OPTS = -DPICO_SDK_PATH=$(STAGING_DIR)/usr/include/pico-sdk +PICOTOOL_DEPENDENCIES = libusb pico-sdk +PICOTOOL_LICENSE = BSD-3-Clause +PICOTOOL_LICENSE_FILES = LICENSE.TXT + +$(eval $(cmake-package)) -- 2.34.1 From buildroot at bubu1.eu Wed Feb 28 19:57:32 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 20:57:32 +0100 Subject: [Buildroot] [PATCH 1/1] package/ccache: bump version to 4.9.1 In-Reply-To: <20240224121007.435474-1-bernd@kuhls.net> References: <20240224121007.435474-1-bernd@kuhls.net> Message-ID: <2637d00b-2a67-4e72-9db6-d7ecd1631b79@bubu1.eu> On 24.02.24 13:10, Bernd Kuhls wrote: > Removed patch which is included in this release. > > Updated license hash due to various version and copyright year bumps: > https://github.com/ccache/ccache/commits/master/LICENSE.adoc > > Release notes: https://ccache.dev/releasenotes.html#_ccache_4_9_1 > > Signed-off-by: Bernd Kuhls Tested-by: Marcus Hoffman > --- > ...-fix-Work-around-GCC-12.3-bug-109241.patch | 29 ------------------- > package/ccache/ccache.hash | 4 +-- > package/ccache/ccache.mk | 2 +- > 3 files changed, 3 insertions(+), 32 deletions(-) > delete mode 100644 package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch > > diff --git a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch > deleted file mode 100644 > index 42872597cd..0000000000 > --- a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001 > -From: Joel Rosdahl > -Date: Tue, 1 Aug 2023 12:30:12 +0200 > -Subject: [PATCH] fix: Work around GCC 12.3 bug 109241 > - > -See also #1289. > - > -Upstream: https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5 > - > -Signed-off-by: Bernd Kuhls > ---- > - src/storage/local/LocalStorage.cpp | 4 +++- > - 1 file changed, 3 insertions(+), 1 deletion(-) > - > -diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp > -index 3e5abe5074..d0a904e553 100644 > ---- a/src/storage/local/LocalStorage.cpp > -+++ b/src/storage/local/LocalStorage.cpp > -@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional level, > - auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index); > - l2_content_lock.make_long_lived(lock_manager); > - if (!l2_content_lock.acquire()) { > -- LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index); > -+ // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241 > -+ LOG_RAW(fmt::format( > -+ "Failed to acquire content lock for {}/{}", l1_index, l2_index)); > - return; > - } > - > diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash > index 736122e0ab..a2537077b6 100644 > --- a/package/ccache/ccache.hash > +++ b/package/ccache/ccache.hash > @@ -1,4 +1,4 @@ > # sha256 computed locally > -sha256 3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49 ccache-4.8.2.tar.xz > +sha256 4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25 ccache-4.9.1.tar.xz > sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt > -sha256 55ce274f2b898dad70d3695ab13f82656fd455bd8fb6d1c85d6f7c453bef0b2e LICENSE.adoc > +sha256 a6aea7358a30ded3f8abbff979219bdbe7b7a9aa489a8c70030afd96a83caf84 LICENSE.adoc > diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk > index ac4bc4aba5..1ac825439b 100644 > --- a/package/ccache/ccache.mk > +++ b/package/ccache/ccache.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -CCACHE_VERSION = 4.8.2 > +CCACHE_VERSION = 4.9.1 > CCACHE_SITE = https://github.com/ccache/ccache/releases/download/v$(CCACHE_VERSION) > CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz > CCACHE_LICENSE = GPL-3.0+, others From buildroot at bubu1.eu Wed Feb 28 20:02:16 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 21:02:16 +0100 Subject: [Buildroot] [PATCH] package/ccache: disable building tests Message-ID: <20240228200216.715455-1-buildroot@bubu1.eu> Signed-off-by: Marcus Hoffmann --- package/ccache/ccache.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index ac4bc4aba5..96b1b65c5c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -16,7 +16,8 @@ HOST_CCACHE_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER \ -DZSTD_FROM_INTERNET=OFF \ - -DHIREDIS_FROM_INTERNET=OFF + -DHIREDIS_FROM_INTERNET=OFF \ + -DENABLE_TESTING=OFF # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR -- 2.34.1 From peter at korsgaard.com Wed Feb 28 20:02:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:02:37 +0100 Subject: [Buildroot] [PATCH] package/python3: security bump to 3.12.2 In-Reply-To: <87cysgo3r9.fsf@48ers.dk> (Peter Korsgaard's message of "Wed, 28 Feb 2024 19:14:18 +0100") References: <20240212095514.11656-1-buildroot@bubu1.eu> <87cysgo3r9.fsf@48ers.dk> Message-ID: <878r34nyqq.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: >> Fixes the following security issue: >> * Skip .pth files with names starting with a dot or hidden file >> attribute. [1] >> [1] https://docs.python.org/release/3.12.2/whatsnew/changelog.html#security > I have in the man time reverted the 3.12.x bump for now because of s/man/mean/ naturally. -- Bye, Peter Korsgaard From buildroot at bubu1.eu Wed Feb 28 20:24:13 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 21:24:13 +0100 Subject: [Buildroot] [PATCH v2 2/2] package/picotool: new package In-Reply-To: <20240228202414.719244-1-buildroot@bubu1.eu> References: <20240228202414.719244-1-buildroot@bubu1.eu> Message-ID: <20240228202414.719244-2-buildroot@bubu1.eu> Add the raspberry pi picotool for interacting with rp2040 binaries and devices. Signed-off-by: Marcus Hoffmann --- Changes v1 -> v2: - fix check-package package/Config.in | 1 + package/picotool/Config.in | 16 ++++++++++++++++ package/picotool/picotool.hash | 3 +++ package/picotool/picotool.mk | 15 +++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 package/picotool/Config.in create mode 100644 package/picotool/picotool.hash create mode 100644 package/picotool/picotool.mk diff --git a/package/Config.in b/package/Config.in index b01024ae04..2d4559036b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -583,6 +583,7 @@ endmenu source "package/pciutils/Config.in" source "package/pdbg/Config.in" source "package/picocom/Config.in" + source "package/picotool/Config.in" source "package/pifmrds/Config.in" source "package/pigpio/Config.in" source "package/powertop/Config.in" diff --git a/package/picotool/Config.in b/package/picotool/Config.in new file mode 100644 index 0000000000..0046f8ad61 --- /dev/null +++ b/package/picotool/Config.in @@ -0,0 +1,16 @@ +comment "picotool needs a toolchain w/ C++ and gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_9 + +config BR2_PACKAGE_PICOTOOL + bool "picotool" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_HOST_GCC_AT_LEAST_4_9 # libusb + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_PICO_SDK + help + picotool is a tool for inspecting rp2040 binaries and + interacting with rp2040 devices when they are in bootsel + mode or devices USBstdio support from the Raspberry Pi Pico + SDK. + + https://github.com/raspberrypi/picotool diff --git a/package/picotool/picotool.hash b/package/picotool/picotool.hash new file mode 100644 index 0000000000..b573ada09e --- /dev/null +++ b/package/picotool/picotool.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f1746ead7815c13be1152f0645db8ea3b277628eb0110d42a0a186db37d40a91 1.1.2.tar.gz +sha256 483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6 LICENSE.TXT diff --git a/package/picotool/picotool.mk b/package/picotool/picotool.mk new file mode 100644 index 0000000000..c98284c491 --- /dev/null +++ b/package/picotool/picotool.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# picotool +# +################################################################################ + +PICOTOOL_VERSION = 1.1.2 +PICOTOOL_SITE = https://github.com/raspberrypi/picotool/archive/refs/tags +PICOTOOL_SOURCE = $(PICOTOOL_VERSION).tar.gz +PICOTOOL_CONF_OPTS = -DPICO_SDK_PATH=$(STAGING_DIR)/usr/include/pico-sdk +PICOTOOL_DEPENDENCIES = libusb pico-sdk +PICOTOOL_LICENSE = BSD-3-Clause +PICOTOOL_LICENSE_FILES = LICENSE.TXT + +$(eval $(cmake-package)) -- 2.34.1 From buildroot at bubu1.eu Wed Feb 28 20:24:12 2024 From: buildroot at bubu1.eu (Marcus Hoffmann) Date: Wed, 28 Feb 2024 21:24:12 +0100 Subject: [Buildroot] [PATCH v2 1/2] package/pico-sdk: new package Message-ID: <20240228202414.719244-1-buildroot@bubu1.eu> Add the pi-pico sdk as a dependency for picotool. This is a bit of a weird package, because you normally clone the git repository and point the picotool (or rp2040 firmware project) build to it. For picotool specifically, only headers are used from the sdk, for building a firmware project, it is included as source files via cmake, so this pretty much has the same semantics for that as well. Signed-off-by: Marcus Hoffmann --- package/Config.in | 1 + package/pico-sdk/Config.in | 9 +++++++++ package/pico-sdk/pico-sdk.hash | 3 +++ package/pico-sdk/pico-sdk.mk | 20 ++++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 package/pico-sdk/Config.in create mode 100644 package/pico-sdk/pico-sdk.hash create mode 100644 package/pico-sdk/pico-sdk.mk diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..b01024ae04 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1785,6 +1785,7 @@ menu "Hardware handling" source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" + source "package/pico-sdk/Config.in" source "package/rpi-rgb-led-matrix/Config.in" source "package/tslib/Config.in" source "package/uhd/Config.in" diff --git a/package/pico-sdk/Config.in b/package/pico-sdk/Config.in new file mode 100644 index 0000000000..962139925c --- /dev/null +++ b/package/pico-sdk/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PICO_SDK + bool "pico-sdk" + help + Raspberry Pi Pico SDK. Provides the headers, libraries + and build system necessary to write programs for the + RP2040-based devices such as the Raspberry Pi Pico in + C, C++ or assembly language. + + https://github.com/raspberrypi/pico-sdk diff --git a/package/pico-sdk/pico-sdk.hash b/package/pico-sdk/pico-sdk.hash new file mode 100644 index 0000000000..5db7e8bdb4 --- /dev/null +++ b/package/pico-sdk/pico-sdk.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 95f5e522be3919e36a47975ffd3b208c38880c14468bd489ac672cfe3cec803c pico-sdk-1.5.1.tar.gz +sha256 483f865953435b66c443dee7558debe3cc3cf8fcbb6a112fd9fc6a795d53f1f6 LICENSE.TXT diff --git a/package/pico-sdk/pico-sdk.mk b/package/pico-sdk/pico-sdk.mk new file mode 100644 index 0000000000..0c475d8aa1 --- /dev/null +++ b/package/pico-sdk/pico-sdk.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# pico-sdk +# +################################################################################ + +PICO_SDK_VERSION = 1.5.1 +PICO_SDK_SITE = $(call github,raspberrypi,pico-sdk,$(PICO_SDK_VERSION)) +PICO_SDK_LICENSE = BSD-3-Clause +PICO_SDK_LICENSE_FILES = LICENSE.TXT +PICO_SDK_INSTALL_STAGING = YES +# Header-only lib, as far as buildroot is concerned +PICO_SDK_INSTALL_TARGET = NO + +define PICO_SDK_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/pico-sdk + cp -r $(@D)/* $(STAGING_DIR)/usr/include/pico-sdk +endef + +$(eval $(generic-package)) -- 2.34.1 From peter at korsgaard.com Wed Feb 28 20:53:21 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:53:21 +0100 Subject: [Buildroot] [PATCH 1/1] package: dhcpcd: bump to 10.0.5 In-Reply-To: <20240128000256.328107-1-davidb@230ruedubac.fr> (David Barbion's message of "Sun, 28 Jan 2024 01:02:56 +0100") References: <20240128000256.328107-1-davidb@230ruedubac.fr> Message-ID: <874jdsnwe6.fsf@48ers.dk> >>>>> "David" == David Barbion writes: > This version contains a fix for aarch64 based systems. > Signed-off-by: David Barbion Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 20:53:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:53:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/joe: add JOE_CPE_ID_VENDOR In-Reply-To: <20240130204239.49546-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 30 Jan 2024 21:42:39 +0100") References: <20240130204239.49546-1-fontaine.fabrice@gmail.com> Message-ID: <87zfvkmhsz.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:joseph_allen:joe is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/5F530947-2060-4842-92B9-5BC61D9C5430 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:00:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:00:39 +0100 Subject: [Buildroot] [PATCH 1/1] package/lynx: fix openssl static build In-Reply-To: <20240121100023.316551-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 21 Jan 2024 11:00:23 +0100") References: <20240121100023.316551-1-fontaine.fabrice@gmail.com> Message-ID: <87v868mhhk.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Use LDFLAGS instead of LIBS to fix the following openssl static build > failure raised because lynx filters out duplicates (i.e. -lz) in > CF_ADD_LIBS: > configure:12958: checking for inet_ntoa > configure:12995: > /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX > -static conftest.c > -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 > -lssl > -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 > -lz -pthread -lcrypto -lz -pthread >&5 > configure:12998: $? = 0 > configure:13001: test -s conftest > configure:13004: $? = 0 > configure:13014: result: yes > configure:13095: checking for gethostbyname > configure:13151: result: yes > configure:13232: checking for strcasecmp > configure:13288: result: yes > configure:13401: checking for inet_aton function > configure:13443: > /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc > -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE > -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX > -static conftest.c > -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 > -lssl -lz -pthread -lcrypto >&5 > [...] > /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc > -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" -I. -I.. -Ichrtrans > -I./chrtrans -I.. -I../src -I.././WWW/Library/Implementation > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -D_GNU_SOURCE -DLINUX > -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include > -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/openssl > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 > -Ofast -g0 -static > -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 > -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib > -L/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib > -static -o lynx LYebcdic.o LYClean.o LYShowInfo.o LYEdit.o L > YStrings.o LYMail.o HTAlert.o GridText.o LYGetFile.o LYMain.o > LYMainLoop.o LYCurses.o LYBookmark.o LYmktime.o LYUtils.o LYOptions.o > LYReadCFG.o LYSearch.o LYHistory.o LYForms.o LYPrint.o LYrcFile.o > LYDownload.o LYNews.o LYKeymap.o HTML.o HTFWriter.o HTInit.o > DefaultStyle.o LYUpload.o LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o > LYTraversal.o LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o > LYCookie.o LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o parsdate.o > UCdomap.o UCAux.o UCAuto.o LYSession.o LYLocal.o > .././WWW/Library/Implementation/libwww.a -lz -static -lncurses -lssl > -lcrypto > -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 > -pthread > /home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: > /home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(libcrypto-lib-c_zlib.o): > in function `zlib_oneshot_expand_block': > c_zlib.c:(.text+0xb8b): undefined reference to `uncompress' > Patching aclocal.m4 is not possible as autoreconf fails due to missing > AC_DIVERT_HELP macro. > This build failure is only raised by autobuilders since 2024 for an > unknown reason. > Fixes: > - http://autobuild.buildroot.org/results/6d4119b54fc6b6111a03f81e131e83bae0d844d1 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:01:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:01:23 +0100 Subject: [Buildroot] [PATCH 1/1] docs/manual/contribute.txt: fix typo In-Reply-To: <20240123092226.476-1-sebastien.szymanski@armadeus.com> (=?utf-8?Q?=22S=C3=A9bastien?= Szymanski"'s message of "Tue, 23 Jan 2024 10:22:26 +0100") References: <20240123092226.476-1-sebastien.szymanski@armadeus.com> Message-ID: <87r0gwmhgc.fsf@48ers.dk> >>>>> "S?bastien" == S?bastien Szymanski writes: > "who sponsored who sponsored" -> "who sponsored" > Signed-off-by: S?bastien Szymanski Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:02:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:02:10 +0100 Subject: [Buildroot] [PATCH] package/syslog-ng: needs pcre2, not pcre In-Reply-To: <722e1fda-9abb-45af-98e5-16914325932e@korsgaard.com> (Peter Korsgaard's message of "Wed, 31 Jan 2024 21:25:07 +0100") References: <20240130164930.3909227-1-peter@korsgaard.com> <722e1fda-9abb-45af-98e5-16914325932e@korsgaard.com> Message-ID: <87msrkmhf1.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > On 30/01/2024 17.49, Peter Korsgaard wrote: >> Syslog-ng-uses pcre2 instead of pcre since 4.3.0 with: >> https://github.com/syslog-ng/syslog-ng/commit/cb6de08dc9078644d48ca536b5660e406b1a50d6 >> No autobuilder failures, as pcre2 is implicitly available through >> libglib2. >> Signed-off-by: Peter Korsgaard > Committed, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:02:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:02:50 +0100 Subject: [Buildroot] [PATCH 1/2] package/glibc: add CVE ignore for CVE-2023-4806 In-Reply-To: <93dd1849-3725-4bf1-b411-55f175e40471@korsgaard.com> (Peter Korsgaard's message of "Thu, 1 Feb 2024 12:02:36 +0100") References: <20240131081254.175261-1-peter@korsgaard.com> <93dd1849-3725-4bf1-b411-55f175e40471@korsgaard.com> Message-ID: <87il28mhdx.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > On 31/01/2024 09.12, Peter Korsgaard wrote: >> Commit 8519de517e22 (package/{glibc, localedef}: security bump to version >> glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701) correctly mentioned >> CVE-2023-4806 in the commit message, but forgot to add an ignore for it. >> Fix that. >> Signed-off-by: Peter Korsgaard > Committed, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:05:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:05:46 +0100 Subject: [Buildroot] [PATCH 2/2] package/{glibc, localedef}: security bump to version glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 In-Reply-To: <9a26b0d0-120f-4ff9-b72f-7b99edbca93c@korsgaard.com> (Peter Korsgaard's message of "Thu, 1 Feb 2024 12:02:53 +0100") References: <20240131081254.175261-1-peter@korsgaard.com> <20240131081254.175261-2-peter@korsgaard.com> <9a26b0d0-120f-4ff9-b72f-7b99edbca93c@korsgaard.com> Message-ID: <87edcwmh91.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: > On 31/01/2024 09.12, Peter Korsgaard wrote: >> Fixed the following security issues: >> CVE-2023-6246: syslog: Fix heap buffer overflow in >> __vsyslog_internal >> https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD >> CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal >> https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD >> CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal >> https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD >> For details, see the Qualys advisory: >> https://www.openwall.com/lists/oss-security/2024/01/30/6 >> Signed-off-by: Peter Korsgaard > Committed, thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:07:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:07:37 +0100 Subject: [Buildroot] [PATCH 1/1] package/cpio: fix tar.bz2 hash In-Reply-To: <20240131211939.2222338-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 22:19:39 +0100") References: <20240131211939.2222338-1-fontaine.fabrice@gmail.com> Message-ID: <87a5nkmh5y.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit b0306d94b29d6f5e08735db0448019f9f4e4234b forgot to update > cpio-2.13.tar.bz2 to cpio-2.14.tar.bz2 > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:09:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:09:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/freerdp: security bump to version 2.11.5 In-Reply-To: <20240131210645.2212414-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 22:06:45 +0100") References: <20240131210645.2212414-1-fontaine.fabrice@gmail.com> Message-ID: <875xy8mh39.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > - Fix CVE-2024-22211 > - Update Upstream tag in patches > https://github.com/FreeRDP/FreeRDP/blob/2.11.5/ChangeLog > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:12:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:12:12 +0100 Subject: [Buildroot] [PATCH 1/1] package/crda: drop CRDA_CPE_ID_VENDOR In-Reply-To: <20240201174641.183601-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:46:41 +0100") References: <20240201174641.183601-1-fontaine.fabrice@gmail.com> Message-ID: <871q8wmgyb.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:kernel:crda added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:12:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:12:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/depot-tools: drop DEPOT_TOOLS_CPE_ID_VENDOR In-Reply-To: <20240201174829.184788-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:48:29 +0100") References: <20240201174829.184788-1-fontaine.fabrice@gmail.com> Message-ID: <87wmqol2co.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:google:depot-tools added by commit > 48730a1a9d882a7c56146bd2955e074aed790dcb has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:google:depot-tools > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:13:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:18 +0100 Subject: [Buildroot] [PATCH 1/1] package/mpfr: fix CPE variables In-Reply-To: <20240201175202.186929-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:52:02 +0100") References: <20240201175202.186929-1-fontaine.fabrice@gmail.com> Message-ID: <87sf1cl2c1.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:gnu:mpfr added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE > identifier for this package > cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:13:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/lvm2: fix CPE variable In-Reply-To: <20240201214304.301544-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 22:43:04 +0100") References: <20240201214304.301544-1-fontaine.fabrice@gmail.com> Message-ID: <87o7c0l2ba.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set > LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:14:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:14:08 +0100 Subject: [Buildroot] [PATCH 1/1] package/minizip: fix CPE variables In-Reply-To: <20240201221659.320957-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 23:16:59 +0100") References: <20240201221659.320957-1-fontaine.fabrice@gmail.com> Message-ID: <87jzmol2an.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:minizip_project:minizip added by commit > 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier > for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: > https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:14:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:14:49 +0100 Subject: [Buildroot] [PATCH 1/1] package/libvips: update LIBVIPS_CPE_ID_VENDOR In-Reply-To: <20240201172051.165994-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:20:51 +0100") References: <20240201172051.165994-1-fontaine.fabrice@gmail.com> Message-ID: <87frxcl29i.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:libvips_project:libvips has been deprecated in favor of > cpe:2.3:a:libvips:libvips in September 2023: > > libvips Project libvips 8.10.6 - > Project > Change Log > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:15:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:11 +0100 Subject: [Buildroot] [PATCH 1/1] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR In-Reply-To: <20240201174205.180556-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:42:05 +0100") References: <20240201174205.180556-1-fontaine.fabrice@gmail.com> Message-ID: <87bk80l28w.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:kernel:wireless-regdb added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:16:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:16:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/rauc-hawkbit-updater: drop RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR In-Reply-To: <20240203103501.41738-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 11:35:01 +0100") References: <20240203103501.41738-1-fontaine.fabrice@gmail.com> Message-ID: <8734tcl27e.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:pengutronix:rauc-hawkbit-updater added by commit > 928b7219cd7079864eadadc66dbff21c5cd72804 has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:pengutronix:rauc-hawkbit-updater > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:15:33 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:33 +0100 Subject: [Buildroot] [PATCH 1/1] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR In-Reply-To: <20240201174432.182161-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Thu, 1 Feb 2024 18:44:32 +0100") References: <20240201174432.182161-1-fontaine.fabrice@gmail.com> Message-ID: <877ciol28a.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:kernel:linux-firmware added by commit > 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID > for this package: > https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:16:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:16:45 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-wheel: add CPE variables In-Reply-To: <20240121213513.2636195-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 21 Jan 2024 22:35:13 +0100") References: <20240121213513.2636195-1-fontaine.fabrice@gmail.com> Message-ID: <87y1b4jnlu.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:wheel_project:wheel is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/402C4B59-237A-4399-8189-CC9FC1B4BF39 > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:17:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:17:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: update NETATALK_CPE_ID_VENDOR In-Reply-To: <20240203180247.143487-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:02:47 +0100") References: <20240203180247.143487-1-fontaine.fabrice@gmail.com> Message-ID: <87ttlsjnl6.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of > cpe:2.3:a:netatalk:netatalk in September 2023: > > Version > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:17:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:17:31 +0100 Subject: [Buildroot] [PATCH 1/1] package/x11r7/xlib_libXpm: update XLIB_LIBXPM_CPE_ID_VENDOR In-Reply-To: <20240203180810.146553-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:08:10 +0100") References: <20240203180810.146553-1-fontaine.fabrice@gmail.com> Message-ID: <87plwgjnkk.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:libxpm_project:libxpm has been deprecated in favor of > cpe:2.3:a:x.org:libxpm in October 2023: > > Libxpm Project Libxpm 3.5.15 > Version > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:20:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/json-c: update JSON_C_CPE_ID_VENDOR In-Reply-To: <20240203181507.150528-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:15:07 +0100") References: <20240203181507.150528-1-fontaine.fabrice@gmail.com> Message-ID: <87le74jnfg.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:json-c_project:json-c has been deprecated in favor of > cpe:2.3:a:json-c:json-c in September 2023: > > JSON-C Project JSON-C 0.14 > Version > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:21:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:07 +0100 Subject: [Buildroot] [PATCH 1/1] package/flex: update FLEX_CPE_ID_VENDOR In-Reply-To: <20240203182845.158531-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:28:45 +0100") References: <20240203182845.158531-1-fontaine.fabrice@gmail.com> Message-ID: <87h6hsjnek.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:flex_project:flex has been deprecated in favor of > cpe:2.3:a:westes:flex in October 2023: > > Flex Fast Lexical Analyser 2.6.4 > Version > Product > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:21:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: fix CPE variables In-Reply-To: <20240203183533.162251-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:35:33 +0100") References: <20240203183533.162251-1-fontaine.fabrice@gmail.com> Message-ID: <87cysgjned.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:d-bus_project:d-bus has been deprecated in favor of > cpe:2.3:a:freedesktop:dbus in December 2023: > > D-Bus Project D-Bus 1.15.6 > Version > Advisory > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:21:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:36 +0100 Subject: [Buildroot] [PATCH 1/1] package/c-ares: update C_ARES_CPE_ID_VENDOR In-Reply-To: <20240203184231.166287-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:42:31 +0100") References: <20240203184231.166287-1-fontaine.fabrice@gmail.com> Message-ID: <878r34jndr.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:c-ares_project:c-ares has been deprecated in favor of > cpe:2.3:a:c-ares:c-ares in September 2023: > > C-ares Project C-ares 1.17.1 > Change Log > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 21:22:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:22:02 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-aiohttp: update PYTHON_AIOHTTP_CPE_ID_VENDOR In-Reply-To: <20240203184637.168548-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sat, 3 Feb 2024 19:46:37 +0100") References: <20240203184637.168548-1-fontaine.fabrice@gmail.com> Message-ID: <874jdsjnd1.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:aiohttp_project:aiohttp has been deprecated in favor of > cpe:2.3:a:aiohttp:aiohttp in November 2023: > > Aiohttp Project Aiohttp 3.8.0 Beta 0 > Change Log > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Wed Feb 28 20:53:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:53:39 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/joe: add JOE_CPE_ID_VENDOR Message-ID: <20240228212548.8E17187CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e2cc7eb278208a39bd4086e7e6d7b89f3f540d37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:joseph_allen:joe is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/5F530947-2060-4842-92B9-5BC61D9C5430 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2953cd264489229adaef5f0a1f307900dcc3e425) Signed-off-by: Peter Korsgaard --- package/joe/joe.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/joe/joe.mk b/package/joe/joe.mk index f0cac402e1..9346ec1fd3 100644 --- a/package/joe/joe.mk +++ b/package/joe/joe.mk @@ -8,6 +8,7 @@ JOE_VERSION = 4.6 JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION) JOE_LICENSE = GPL-2.0+ JOE_LICENSE_FILES = COPYING +JOE_CPE_ID_VENDOR = joseph_allen ifeq ($(BR2_PACKAGE_NCURSES),y) JOE_DEPENDENCIES += ncurses From peter at korsgaard.com Wed Feb 28 21:11:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:11:58 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/crda: drop CRDA_CPE_ID_VENDOR Message-ID: <20240228212548.DD82787CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=535bac39d5bded456bf16d4c5239a0c824234208 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:kernel:crda added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 85d300f1021df905e60e704407b68dbed75ba430) Signed-off-by: Peter Korsgaard --- package/crda/crda.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/crda/crda.mk b/package/crda/crda.mk index a73c9aa26d..8043260cfc 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -9,7 +9,6 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE -CRDA_CPE_ID_VENDOR = kernel define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ From peter at korsgaard.com Wed Feb 28 21:08:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:08:44 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/freerdp: security bump to version 2.11.5 Message-ID: <20240228212548.C4D8587CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2f446133de49c69f87143ebbaa782d590a265be branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x - Fix CVE-2024-22211 - Update Upstream tag in patches https://github.com/FreeRDP/FreeRDP/blob/2.11.5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit dbe037dc9998155373b0a96687c55982f9c1a536) Signed-off-by: Peter Korsgaard --- package/freerdp/0001-Fix-variable-declaration-in-loop.patch | 3 +-- package/freerdp/0002-Fixed-variable-declaration-in-loop.patch | 3 +-- .../freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch | 2 +- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch index a391e42ee6..799a92734b 100644 --- a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch +++ b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: Armin Novak Date: Wed, 16 Sep 2020 09:30:37 +0200 Subject: [PATCH] Fix variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 3 ++- diff --git a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch index 14e1d6c8f4..1a4e899430 100644 --- a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch +++ b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: akallabeth Date: Tue, 22 Sep 2020 07:43:56 +0200 Subject: [PATCH] Fixed variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 4 ++-- diff --git a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch index d8dfe13d1b..63434e58f7 100644 --- a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch +++ b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/31e770a330158035e24b7b952bec0030138482b7 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FreeRDP/FreeRDP/pull/7205] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/0976cce458f2281cef6e8c417daf4bbd22bcc087 --- winpr/include/winpr/file.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 02268f55ea..daf933e0af 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.0.tar.gz.sha256 -sha256 8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e freerdp-2.11.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.5.tar.gz.sha256 +sha256 70785ad9934d75aed1734f8918a05aff95788e58e53081e84651106b24303dc2 freerdp-2.11.5.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 6f71ef796f..29b33f61c3 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.0 +FREERDP_VERSION = 2.11.5 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From peter at korsgaard.com Wed Feb 28 21:00:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:00:24 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/lynx: fix openssl static build Message-ID: <20240228212548.A682C87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=b348beb3585336ce601f6bec69c6d0567186153d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Use LDFLAGS instead of LIBS to fix the following openssl static build failure raised because lynx filters out duplicates (i.e. -lz) in CF_ADD_LIBS: configure:12958: checking for inet_ntoa configure:12995: /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -static conftest.c -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lssl -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lz -pthread -lcrypto -lz -pthread >&5 configure:12998: $? = 0 configure:13001: test -s conftest configure:13004: $? = 0 configure:13014: result: yes configure:13095: checking for gethostbyname configure:13151: result: yes configure:13232: checking for strcasecmp configure:13288: result: yes configure:13401: checking for inet_aton function configure:13443: /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -static conftest.c -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lssl -lz -pthread -lcrypto >&5 [...] /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" -I. -I.. -Ichrtrans -I./chrtrans -I.. -I../src -I.././WWW/Library/Implementation -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/openssl -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib -L/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib -static -o lynx LYebcdic.o LYClean.o LYShowInfo.o LYEdit.o L YStrings.o LYMail.o HTAlert.o GridText.o LYGetFile.o LYMain.o LYMainLoop.o LYCurses.o LYBookmark.o LYmktime.o LYUtils.o LYOptions.o LYReadCFG.o LYSearch.o LYHistory.o LYForms.o LYPrint.o LYrcFile.o LYDownload.o LYNews.o LYKeymap.o HTML.o HTFWriter.o HTInit.o DefaultStyle.o LYUpload.o LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o parsdate.o UCdomap.o UCAux.o UCAuto.o LYSession.o LYLocal.o .././WWW/Library/Implementation/libwww.a -lz -static -lncurses -lssl -lcrypto -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -pthread /home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(libcrypto-lib-c_zlib.o): in function `zlib_oneshot_expand_block': c_zlib.c:(.text+0xb8b): undefined reference to `uncompress' Patching aclocal.m4 is not possible as autoreconf fails due to missing AC_DIVERT_HELP macro. This build failure is only raised by autobuilders since 2024 for an unknown reason. Fixes: - http://autobuild.buildroot.org/results/6d4119b54fc6b6111a03f81e131e83bae0d844d1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ef5d3327a1f030924cb5f000d568fc69f7e7ec53) Signed-off-by: Peter Korsgaard --- package/lynx/lynx.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index 3f62f4f5b7..b441eacef7 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -53,6 +53,8 @@ LYNX_DEPENDENCIES += libidn LYNX_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libidn` endif -LYNX_CONF_ENV = LIBS="$(LYNX_LIBS)" CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" +LYNX_CONF_ENV = \ + LDFLAGS="$(TARGET_LDFLAGS) $(LYNX_LIBS)" \ + CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" $(eval $(autotools-package)) From peter at korsgaard.com Wed Feb 28 20:56:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:56:08 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240228212548.99D8587CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c6767e03ba69fe7bf8e74cc2b43664b2ddf18673 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 44292dabc09bc14df033e7be9d12429353ceaac7) [Peter: drop 6.6.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 10 +++++----- package/linux-headers/Config.in.host | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index a410b1395d..ee8263ff4f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.74" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.75" 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 a0d8a5769f..cfa5437777 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b7fbd1d79faed2ce3570ef79dc1223e4e19c868b86326b14a435db56ebbb2022 linux-6.1.74.tar.xz +sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 linux-5.15.147.tar.xz -sha256 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e linux-5.10.208.tar.xz -sha256 42d28def2cc1502251edbfeaca3b25ee764ad1e471b6c703ccb2267f38471c43 linux-5.4.267.tar.xz +sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz +sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz +sha256 afc8aca6cb56fea489f6508bc24357df1cf8a8f3d7dcfbcccd94b7f968492620 linux-5.4.268.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 da82425c7410623dfb2405915347ee9617fc0e33a63ca821c33aeed160cddae8 linux-4.19.305.tar.xz +sha256 b91be40fa61ff7d42958e2154a4b7602dc071982128b9b58b6d911dec111be19 linux-4.19.306.tar.xz sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index a3e9659d5c..8e63f47bcd 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -385,11 +385,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.336" if BR2_KERNEL_HEADERS_4_14 - default "4.19.305" if BR2_KERNEL_HEADERS_4_19 - default "5.4.267" if BR2_KERNEL_HEADERS_5_4 - default "5.10.208" if BR2_KERNEL_HEADERS_5_10 - default "5.15.147" if BR2_KERNEL_HEADERS_5_15 - default "6.1.74" if BR2_KERNEL_HEADERS_6_1 + default "4.19.306" if BR2_KERNEL_HEADERS_4_19 + default "5.4.268" if BR2_KERNEL_HEADERS_5_4 + default "5.10.209" if BR2_KERNEL_HEADERS_5_10 + default "5.15.148" if BR2_KERNEL_HEADERS_5_15 + default "6.1.75" if BR2_KERNEL_HEADERS_6_1 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 \ From peter at korsgaard.com Wed Feb 28 21:13:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:39 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/lvm2: fix CPE variable Message-ID: <20240228212549.063B787CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5e5a8f73837e66bb1a234791eebd225812d79517 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 8c0d9795a7a75a36574a7cc89107d71cb32fd20e) Signed-off-by: Peter Korsgaard --- package/lvm2/lvm2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 474ea30bdc..810d668ec2 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB -LVM2_CPE_ID_PRODUCT = redhat +LVM2_CPE_ID_VENDOR = redhat # parallel build issues LVM2_MAKE = $(MAKE1) From peter at korsgaard.com Wed Feb 28 21:15:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:00 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR Message-ID: <20240228212549.27C3B87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ac90d5aecd800cf08b81d2e0bd0cd6ef7cf72f3d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:kernel:wireless-regdb added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 05617160dd0bc4aef6cc91930d7985009e854142) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index e9003ce2e6..5c8ef96398 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -9,7 +9,6 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE -WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS From peter at korsgaard.com Wed Feb 28 21:15:25 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:25 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR Message-ID: <20240228212549.327F087CE3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=caf50ae7504a3bba9d90ed9aa6096d42f2737c6f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:kernel:linux-firmware added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 380d4a75f5e3c2ae52ebc1afd409713fdb6ced37) Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 9d9d12bd5f..fa4804dd2e 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel - # Intel SST DSP ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master From peter at korsgaard.com Wed Feb 28 21:20:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:15 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/json-c: update JSON_C_CPE_ID_VENDOR Message-ID: <20240228212549.53FE787CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ab793d11dbff02c982f335f237adf420b676dcb1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:json-c_project:json-c has been deprecated in favor of cpe:2.3:a:json-c:json-c in September 2023: JSON-C Project JSON-C 0.14 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 63118fbb55d3be3fc182470f02fcf7c221ba5ae4) Signed-off-by: Peter Korsgaard --- package/json-c/json-c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 9af7f9a83e..e4a2170f87 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VENDOR = json-c_project +JSON_C_CPE_ID_VENDOR = json-c JSON_C_CONF_OPTS = -DDISABLE_EXTRA_LIBS=ON $(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 28 21:01:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:01:02 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] docs/manual/contribute.txt: fix typo Message-ID: <20240228212548.B40B587CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a643262322436a4cb4dd63cbfceed22a0794683b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x "who sponsored who sponsored" -> "who sponsored" Signed-off-by: S??bastien Szymanski Signed-off-by: Peter Korsgaard (cherry picked from commit f24e85238f67eb65ec5dc7ebde7f0c7cfd3c396b) Signed-off-by: Peter Korsgaard --- docs/manual/contribute.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 15fe36aef0..2b90d13b41 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -259,7 +259,7 @@ separated from it by a plus `+` sign. E.g.: + `Your-Name Your-Surname ` -* for an individual who sponsored who sponsored the submitted work, use +* for an individual who sponsored the submitted work, use their name and surname: + `Your-Name Your-Surname ` From peter at korsgaard.com Wed Feb 28 21:11:22 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:11:22 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240228212548.D132C87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=92a53b90625c0e4d76db44713527ca50d8cee418 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 52a15667b122575919bd7207a16872e8eb229bfd) [Peter: drop 6.6.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 2 +- package/linux-headers/Config.in.host | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index ee8263ff4f..52ca6bc808 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.75" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.76" 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 cfa5437777..5bf9b9401c 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz +sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8e63f47bcd..71ba85b289 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -389,7 +389,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.75" if BR2_KERNEL_HEADERS_6_1 + default "6.1.76" if BR2_KERNEL_HEADERS_6_1 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 \ From peter at korsgaard.com Wed Feb 28 21:21:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:29 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/c-ares: update C_ARES_CPE_ID_VENDOR Message-ID: <20240228212549.7598F87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=801051154b62c21b3e8014cf2544ca51dcb14ee7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:c-ares_project:c-ares has been deprecated in favor of cpe:2.3:a:c-ares:c-ares in September 2023: C-ares Project C-ares 1.17.1 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ae2baf1771cbbebae65e32397480deec6bf879e4) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 46b8acd673..d9bf583b9b 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -10,7 +10,7 @@ C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md -C_ARES_CPE_ID_VENDOR = c-ares_project +C_ARES_CPE_ID_VENDOR = c-ares $(eval $(autotools-package)) $(eval $(host-autotools-package)) From peter at korsgaard.com Wed Feb 28 21:17:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:17:19 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/x11r7/xlib_libXpm: update XLIB_LIBXPM_CPE_ID_VENDOR Message-ID: <20240228212549.4920987CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=713753e81e7523be4bbcdec819d0327cbccde554 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:libxpm_project:libxpm has been deprecated in favor of cpe:2.3:a:x.org:libxpm in October 2023: Libxpm Project Libxpm 3.5.15 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 03a9171cced41f2ee94850d6237bcc54fdda0b1a) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 0bba3ea946..1239ba0d4d 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -9,7 +9,7 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT -XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_VENDOR = x.org XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ From peter at korsgaard.com Wed Feb 28 20:59:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:59:19 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Message-ID: <20240228212551.DD3B987CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f24d68dde05e83f3baa5e56c50fcd6cfaf699caa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 44292dabc09bc14df033e7be9d12429353ceaac7) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index ed865c6f5b..662bd09162 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.13" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.14" 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 f41ed0a270..8bdead2a5e 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 88b89e7dd41ead4e3ab1e411c8bb8d592575acf815cf1df3c0dc57e2e882c0bc linux-6.6.13.tar.xz +sha256 fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584 linux-6.6.14.tar.xz sha256 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 linux-6.5.13.tar.xz -sha256 b7fbd1d79faed2ce3570ef79dc1223e4e19c868b86326b14a435db56ebbb2022 linux-6.1.74.tar.xz +sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 56c1e65625d201db431efda7a3816e7b424071e7cb0245b2ba594d15b1fdfcd4 linux-5.15.147.tar.xz -sha256 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e linux-5.10.208.tar.xz -sha256 42d28def2cc1502251edbfeaca3b25ee764ad1e471b6c703ccb2267f38471c43 linux-5.4.267.tar.xz +sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz +sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz +sha256 afc8aca6cb56fea489f6508bc24357df1cf8a8f3d7dcfbcccd94b7f968492620 linux-5.4.268.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 da82425c7410623dfb2405915347ee9617fc0e33a63ca821c33aeed160cddae8 linux-4.19.305.tar.xz +sha256 b91be40fa61ff7d42958e2154a4b7602dc071982128b9b58b6d911dec111be19 linux-4.19.306.tar.xz sha256 0820fdb7971c6974338081c11fbf2dc869870501e7bdcac4d0ed58ba1f57b61c linux-4.14.336.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1fad05b899..3aaff00a0f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -413,13 +413,13 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.336" if BR2_KERNEL_HEADERS_4_14 - default "4.19.305" if BR2_KERNEL_HEADERS_4_19 - default "5.4.267" if BR2_KERNEL_HEADERS_5_4 - default "5.10.208" if BR2_KERNEL_HEADERS_5_10 - default "5.15.147" if BR2_KERNEL_HEADERS_5_15 - default "6.1.74" if BR2_KERNEL_HEADERS_6_1 + default "4.19.306" if BR2_KERNEL_HEADERS_4_19 + default "5.4.268" if BR2_KERNEL_HEADERS_5_4 + default "5.10.209" if BR2_KERNEL_HEADERS_5_10 + default "5.15.148" if BR2_KERNEL_HEADERS_5_15 + default "6.1.75" if BR2_KERNEL_HEADERS_6_1 default "6.5.13" if BR2_KERNEL_HEADERS_6_5 - default "6.6.13" if BR2_KERNEL_HEADERS_6_6 + default "6.6.14" if BR2_KERNEL_HEADERS_6_6 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 \ From peter at korsgaard.com Wed Feb 28 21:20:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:56 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/dbus: fix CPE variables Message-ID: <20240228212549.69C9A87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d991169988f58b2548383b8675bec07cc0ba9f4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:d-bus_project:d-bus has been deprecated in favor of cpe:2.3:a:freedesktop:dbus in December 2023: D-Bus Project D-Bus 1.15.6 Version Advisory Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 99d2c4301c..b4d1cdc6b6 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -10,8 +10,8 @@ DBUS_VERSION = 1.12.28 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -DBUS_CPE_ID_VENDOR = d-bus_project -DBUS_CPE_ID_PRODUCT = d-bus +DBUS_CPE_ID_VENDOR = freedesktop +DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From peter at korsgaard.com Wed Feb 28 21:01:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:01:53 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/syslog-ng: needs pcre2, not pcre Message-ID: <20240228212552.0C12087CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=1c93f28c12154478143e2c1757aa44e8f428c172 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Syslog-ng-uses pcre2 instead of pcre since 4.3.0 with: https://github.com/syslog-ng/syslog-ng/commit/cb6de08dc9078644d48ca536b5660e406b1a50d6 No autobuilder failures, as pcre2 is implicitly available through libglib2. Signed-off-by: Peter Korsgaard (cherry picked from commit d932f84d9fed1fca22c7bcd1eea382d7c9ea6735) Signed-off-by: Peter Korsgaard --- package/syslog-ng/Config.in | 2 +- package/syslog-ng/syslog-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/syslog-ng/Config.in b/package/syslog-ng/Config.in index 30ad54a4bf..aa1e71d225 100644 --- a/package/syslog-ng/Config.in +++ b/package/syslog-ng/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_SYSLOG_NG depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_OPENSSL help syslog-ng is an enhanced log daemon, supporting a wide range diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index ff5aaee429..dd02a6e3af 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -12,7 +12,7 @@ SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules) SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt SYSLOG_NG_CPE_ID_VENDOR = oneidentity SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \ - libglib2 openssl pcre + libglib2 openssl pcre2 # We're patching configure.ac SYSLOG_NG_AUTORECONF = YES SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \ From peter at korsgaard.com Wed Feb 28 21:13:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:02 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/mpfr: fix CPE variables Message-ID: <20240228212548.EDAA887CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ed4b9473c35ebd615cec745a2927365ad4eb842f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:gnu:mpfr added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE identifier for this package cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 186883f497cf1c3985c9b802435ddd3b6c431167) Signed-off-by: Peter Korsgaard --- package/mpfr/mpfr.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 8d12c7502b..c0c8c04646 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -9,7 +9,8 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER -MPFR_CPE_ID_VENDOR = gnu +MPFR_CPE_ID_VENDOR = mpfr +MPFR_CPE_ID_PRODUCT = gnu_mpfr MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp From peter at korsgaard.com Wed Feb 28 21:02:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:02:40 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/glibc: add CVE ignore for CVE-2023-4806 Message-ID: <20240228212552.18D9A87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=efa40febd9bb7dbbd6cd86cbdde5c3d0ffec3947 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 8519de517e22 (package/{glibc, localedef}: security bump to version glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701) correctly mentioned CVE-2023-4806 in the commit message, but forgot to add an ignore for it. Fix that. Signed-off-by: Peter Korsgaard (cherry picked from commit 62b767fd3ed27d245937066f77ec53bd0b1e9329) Signed-off-by: Peter Korsgaard --- package/glibc/glibc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 596697bb8f..d49da6457c 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -28,6 +28,10 @@ GLIBC_CPE_ID_VERSION = $(word 1, $(subst -,$(space),$(GLIBC_VERSION))) # 2.38 and the version we're really using GLIBC_IGNORE_CVES += CVE-2023-4527 +# Fixed by 5ee59ca371b99984232d7584fe2b1a758b4421d3, which is between +# 2.38 and the version we're really using +GLIBC_IGNORE_CVES += CVE-2023-4806 + # Fixed by 750a45a783906a19591fb8ff6b7841470f1f5710, which is between # 2.38 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-4911 From peter at korsgaard.com Wed Feb 28 21:07:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:07:02 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/cpio: fix tar.bz2 hash Message-ID: <20240228212552.35F9187CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=563aed5287bef4f5af2661af00d476355d72fb0a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit b0306d94b29d6f5e08735db0448019f9f4e4234b forgot to update cpio-2.13.tar.bz2 to cpio-2.14.tar.bz2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0694cef47b4942447fa8532f55e11e5fcae48f2b) Signed-off-by: Peter Korsgaard --- package/cpio/cpio.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cpio/cpio.hash b/package/cpio/cpio.hash index 20fd9392e7..c67fbc1f61 100644 --- a/package/cpio/cpio.hash +++ b/package/cpio/cpio.hash @@ -1,6 +1,6 @@ # From https://lists.gnu.org/archive/html/info-gnu/2023-05/msg00001.html sha1 cbac50a61079b6f3bdcf9ffe42171d9257cfe877 cpio-2.14.tar.bz2 # Locally calculated after checking pgp signature -sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.13.tar.bz2 +sha256 fcdc15d60f7267a6fc7efcd6b9db7b6c8966c4f2fbbb964c24d41336fd3f2c12 cpio-2.14.tar.bz2 # Locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING From peter at korsgaard.com Wed Feb 28 20:52:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:52:49 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/dhcpcd: bump to version 10.0.5 Message-ID: <20240228212551.C486987CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dcc89720bf1a643a88b04fb4f5dcb78e6c3fcfed branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x This version contains a fix for aarch64 based systems. On such systems, dhcpcd would crash without setting any IP addresses. See https://github.com/NetworkConfiguration/dhcpcd/commit/6a36f96740f8fb9f9b615b157962505f1ad8a00c and https://github.com/NetworkConfiguration/dhcpcd/issues/260 for more details. Signed-off-by: David Barbion Signed-off-by: Peter Korsgaard (cherry picked from commit 1dfa4c56fe5dd1b584791b3c0c61dcf0b623aad5) Signed-off-by: Peter Korsgaard --- package/dhcpcd/dhcpcd.hash | 2 +- package/dhcpcd/dhcpcd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dhcpcd/dhcpcd.hash b/package/dhcpcd/dhcpcd.hash index b015dce4ac..fb4f6064bc 100644 --- a/package/dhcpcd/dhcpcd.hash +++ b/package/dhcpcd/dhcpcd.hash @@ -1,4 +1,4 @@ # sha256 from https://github.com/NetworkConfiguration/dhcpcd/releases/tag/v10.0.4 -sha256 ced5bbde8da3726eac77b9e77e4f31a89c9849d811ef8a2c749664fc5f55a718 dhcpcd-10.0.4.tar.xz +sha256 eb1f3cfef3069781ff8c896d7cea922639964afe22db28c069dc3f37f57eb428 dhcpcd-10.0.5.tar.xz # Locally calculated sha256 a7d6da3a202cdd38eaab0bcea4d25f60d002980f3785b3e896d9bf387f093ac8 LICENSE diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk index ba1481e83d..ab3f98dd5a 100644 --- a/package/dhcpcd/dhcpcd.mk +++ b/package/dhcpcd/dhcpcd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DHCPCD_VERSION = 10.0.4 +DHCPCD_VERSION = 10.0.5 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz DHCPCD_SITE = https://github.com/NetworkConfiguration/dhcpcd/releases/download/v$(DHCPCD_VERSION) DHCPCD_DEPENDENCIES = host-pkgconf From peter at korsgaard.com Wed Feb 28 21:16:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:16:56 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/netatalk: update NETATALK_CPE_ID_VENDOR Message-ID: <20240228212549.3E18F87CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d4262cf2a8fe5157a495e58e4098c3c57a6191a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of cpe:2.3:a:netatalk:netatalk in September 2023: Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 5ae38ec621f4821dd3eaf7ad3b0174cad21116ff) Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index a47bfa7e84..40e64dabeb 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -12,7 +12,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT -NETATALK_CPE_ID_VENDOR = netatalk_project +NETATALK_CPE_ID_VENDOR = netatalk # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ From peter at korsgaard.com Wed Feb 28 21:01:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:01:09 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] docs/manual/contribute.txt: fix typo Message-ID: <20240228212551.F3E0187CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=47960afe4f47a759cb6a07a7f53e07a085890b51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x "who sponsored who sponsored" -> "who sponsored" Signed-off-by: S??bastien Szymanski Signed-off-by: Peter Korsgaard (cherry picked from commit f24e85238f67eb65ec5dc7ebde7f0c7cfd3c396b) Signed-off-by: Peter Korsgaard --- docs/manual/contribute.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/contribute.adoc b/docs/manual/contribute.adoc index 15fe36aef0..2b90d13b41 100644 --- a/docs/manual/contribute.adoc +++ b/docs/manual/contribute.adoc @@ -259,7 +259,7 @@ separated from it by a plus `+` sign. E.g.: + `Your-Name Your-Surname ` -* for an individual who sponsored who sponsored the submitted work, use +* for an individual who sponsored the submitted work, use their name and surname: + `Your-Name Your-Surname ` From peter at korsgaard.com Wed Feb 28 21:13:11 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:11 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/mpfr: fix CPE variables Message-ID: <20240228212552.70AB187CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a5f721dca6e9682f665a5fb94801b73f37daaf7d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:gnu:mpfr added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE identifier for this package cpe:2.3:a:mpfr:gnu_mpfr is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/7B981E0A-5BAC-4A80-A734-5FD4B51B04EF Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 186883f497cf1c3985c9b802435ddd3b6c431167) Signed-off-by: Peter Korsgaard --- package/mpfr/mpfr.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 8d12c7502b..c0c8c04646 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -9,7 +9,8 @@ MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ MPFR_LICENSE_FILES = COPYING.LESSER -MPFR_CPE_ID_VENDOR = gnu +MPFR_CPE_ID_VENDOR = mpfr +MPFR_CPE_ID_PRODUCT = gnu_mpfr MPFR_INSTALL_STAGING = YES MPFR_DEPENDENCIES = gmp HOST_MPFR_DEPENDENCIES = host-gmp From peter at korsgaard.com Wed Feb 28 21:14:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:14:30 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/libvips: update LIBVIPS_CPE_ID_VENDOR Message-ID: <20240228212549.1CB1A87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=50834a50e172847ab35be918c4b92a2fb2d46f39 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:libvips_project:libvips has been deprecated in favor of cpe:2.3:a:libvips:libvips in September 2023: libvips Project libvips 8.10.6 - Project Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5e4eba64140eea6adea87234d9736ae211bd352e) Signed-off-by: Peter Korsgaard --- package/libvips/libvips.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index f7b15e8e06..328f1cfc76 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -9,7 +9,7 @@ LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -LIBVIPS_CPE_ID_VENDOR = libvips_project +LIBVIPS_CPE_ID_VENDOR = libvips # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported From peter at korsgaard.com Wed Feb 28 21:10:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:10:20 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] {linux, linux-headers}: bump 6.{1, 6}.x series Message-ID: <20240228212552.4EE8587CE6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8518173cd411a353958986351e2c551156ee53d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 52a15667b122575919bd7207a16872e8eb229bfd) Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 662bd09162..da22b439e3 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.15" 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 8bdead2a5e..416e34bc27 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584 linux-6.6.14.tar.xz +sha256 ab290c7f8687f2f8af96e14abd0700ba8b282426151873690f51621d8d5f5faa linux-6.6.15.tar.xz sha256 78fbd43822f4c56bc16e89e8874767f592532e1a0ffcd1af4dd279559b5fcbb5 linux-6.5.13.tar.xz -sha256 6cd19410330c13ec4c18fd28a83d3e40fc12a152815fb7c3e1b0764329093a56 linux-6.1.75.tar.xz +sha256 0580cc0e81ff9aee245f79531d8c1c5c7d711eee227cd4cf52d1ff335727b1fd linux-6.1.76.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 3aaff00a0f..5bd4ad8a61 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -417,9 +417,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.268" if BR2_KERNEL_HEADERS_5_4 default "5.10.209" if BR2_KERNEL_HEADERS_5_10 default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.75" if BR2_KERNEL_HEADERS_6_1 + default "6.1.76" if BR2_KERNEL_HEADERS_6_1 default "6.5.13" if BR2_KERNEL_HEADERS_6_5 - default "6.6.14" if BR2_KERNEL_HEADERS_6_6 + default "6.6.15" if BR2_KERNEL_HEADERS_6_6 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 \ From peter at korsgaard.com Wed Feb 28 21:09:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:09:04 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/freerdp: security bump to version 2.11.5 Message-ID: <20240228212552.433D987CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d4e11c319d2d8107636072bff1da3f69d6954a0d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x - Fix CVE-2024-22211 - Update Upstream tag in patches https://github.com/FreeRDP/FreeRDP/blob/2.11.5/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit dbe037dc9998155373b0a96687c55982f9c1a536) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 --- package/freerdp/0001-Fix-variable-declaration-in-loop.patch | 3 +-- package/freerdp/0002-Fixed-variable-declaration-in-loop.patch | 3 +-- .../freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch | 2 +- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0554ffde5b..47074570f8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -428,9 +428,6 @@ package/flite/0001-fix-alsa-static.patch Upstream package/fltk/0001-disable-tests.patch Upstream package/fluxbox/0001-fixes-bug-1138.patch Upstream package/freeradius-client/0001-fix-for-nettle.patch Upstream -package/freerdp/0001-Fix-variable-declaration-in-loop.patch Upstream -package/freerdp/0002-Fixed-variable-declaration-in-loop.patch Upstream -package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch Upstream package/freescale-imx/imx-kobs/0001-Fix-musl-build.patch Upstream package/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch Upstream package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables diff --git a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch index a391e42ee6..799a92734b 100644 --- a/package/freerdp/0001-Fix-variable-declaration-in-loop.patch +++ b/package/freerdp/0001-Fix-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: Armin Novak Date: Wed, 16 Sep 2020 09:30:37 +0200 Subject: [PATCH] Fix variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/ddde652460350b962d32036981ff8ed77ed2f1ed Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 3 ++- diff --git a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch index 14e1d6c8f4..1a4e899430 100644 --- a/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch +++ b/package/freerdp/0002-Fixed-variable-declaration-in-loop.patch @@ -3,8 +3,7 @@ From: akallabeth Date: Tue, 22 Sep 2020 07:43:56 +0200 Subject: [PATCH] Fixed variable declaration in loop -[Retrieved from: -https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/4f8a48d96e472e43a5f856c449f61669792ce9fa Signed-off-by: Fabrice Fontaine --- client/X11/xf_graphics.c | 4 ++-- diff --git a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch index d8dfe13d1b..63434e58f7 100644 --- a/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch +++ b/package/freerdp/0003-winpr-include-winpr-file.h-fix-build-on-uclibc.patch @@ -16,7 +16,7 @@ Fixes: - http://autobuild.buildroot.org/results/31e770a330158035e24b7b952bec0030138482b7 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FreeRDP/FreeRDP/pull/7205] +Upstream: https://github.com/FreeRDP/FreeRDP/commit/0976cce458f2281cef6e8c417daf4bbd22bcc087 --- winpr/include/winpr/file.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 02268f55ea..daf933e0af 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.0.tar.gz.sha256 -sha256 8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e freerdp-2.11.0.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.5.tar.gz.sha256 +sha256 70785ad9934d75aed1734f8918a05aff95788e58e53081e84651106b24303dc2 freerdp-2.11.5.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 6f71ef796f..29b33f61c3 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.0 +FREERDP_VERSION = 2.11.5 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From peter at korsgaard.com Wed Feb 28 21:20:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:50 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/flex: update FLEX_CPE_ID_VENDOR Message-ID: <20240228212549.5FBA787CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=51cf6919d02043d57970a5ebe084868547550756 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:flex_project:flex has been deprecated in favor of cpe:2.3:a:westes:flex in October 2023: Flex Fast Lexical Analyser 2.6.4 Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c438422d4972f41c0c59d1b701eefd3028abee43) Signed-off-by: Peter Korsgaard --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 85da5ddae8..f2261f2da4 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VENDOR = flex_project +FLEX_CPE_ID_VENDOR = westes # bug does not cause stack overflows in the generated code and has been # noted upstream as a bug in the code generator FLEX_IGNORE_CVES = CVE-2019-6293 From peter at korsgaard.com Wed Feb 28 21:03:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:03:09 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/{glibc, localedef}: security bump to version glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 Message-ID: <20240228212552.288D387CE3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=decf0cd91bc77242426fe91cb75975a68c5b9376 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following security issues: CVE-2023-6246: syslog: Fix heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0001;hb=HEAD CVE-2023-6779: syslog: Heap buffer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0002;hb=HEAD CVE-2023-6780: syslog: Integer overflow in __vsyslog_internal https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=advisories/GLIBC-SA-2024-0003;hb=HEAD For details, see the Qualys advisory: https://www.openwall.com/lists/oss-security/2024/01/30/6 Signed-off-by: Peter Korsgaard (cherry picked from commit 75e7c7ba8cddb2644350a7f59c943f5c4e99b3b0) Signed-off-by: Peter Korsgaard --- package/glibc/glibc.hash | 2 +- package/glibc/glibc.mk | 14 +++++++++++++- package/localedef/localedef.mk | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 00d9f1c985..15ae55b9e6 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 fd991e43997ff6e4994264c3cbc23fa87fa28b1b3c446eda8fc2d1d3834a2cfb glibc-2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701.tar.gz +sha256 e38f4284d6909c6b5db7d79c6e450daeaf136a67e547290eec0b063a55eaaa42 glibc-2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d49da6457c..d198d6f04c 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # Generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- # When updating the version, please also update localedef -GLIBC_VERSION = 2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701 +GLIBC_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -40,6 +40,18 @@ GLIBC_IGNORE_CVES += CVE-2023-4911 # 2.38 and the version we're really using. GLIBC_IGNORE_CVES += CVE-2023-5156 +# Fixed by 23514c72b780f3da097ecf33a793b7ba9c2070d2, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6246 + +# Fixed by d0338312aace5bbfef85e03055e1212dd0e49578, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6779 + +# Fixed by d37c2b20a4787463d192b32041c3406c2bd91de0, which is between +# 2.38 and the version we're really using. +GLIBC_IGNORE_CVES += CVE-2023-6780 + # All these CVEs are considered as not being security issues by # upstream glibc: # https://security-tracker.debian.org/tracker/CVE-2010-4756 diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index ed6d4b4968..c017c0e00e 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -7,7 +7,7 @@ # Use the same VERSION and SITE as target glibc # As in glibc.mk, generate version string using: # git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- -LOCALEDEF_VERSION = 2.38-27-g750a45a783906a19591fb8ff6b7841470f1f5701 +LOCALEDEF_VERSION = 2.38-44-gd37c2b20a4787463d192b32041c3406c2bd91de0 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc From peter at korsgaard.com Wed Feb 28 21:00:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:00:08 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/lynx: fix openssl static build Message-ID: <20240228212551.E91D087CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=111c2eeef14de20a3b3b1e9ebc2247346cb5b855 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Use LDFLAGS instead of LIBS to fix the following openssl static build failure raised because lynx filters out duplicates (i.e. -lz) in CF_ADD_LIBS: configure:12958: checking for inet_ntoa configure:12995: /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -static conftest.c -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lssl -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lz -pthread -lcrypto -lz -pthread >&5 configure:12998: $? = 0 configure:13001: test -s conftest configure:13004: $? = 0 configure:13014: result: yes configure:13095: checking for gethostbyname configure:13151: result: yes configure:13232: checking for strcasecmp configure:13288: result: yes configure:13401: checking for inet_aton function configure:13443: /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -static conftest.c -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -lssl -lz -pthread -lcrypto >&5 [...] /home/autobuild/autobuild/instance-7/output-1/host/bin/x86_64-buildroot-linux-uclibc-gcc -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" -I. -I.. -Ichrtrans -I./chrtrans -I.. -I../src -I.././WWW/Library/Implementation -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLINUX -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include -I/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/openssl -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -Wl,-rpath,/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib -L/home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib -static -o lynx LYebcdic.o LYClean.o LYShowInfo.o LYEdit.o L YStrings.o LYMail.o HTAlert.o GridText.o LYGetFile.o LYMain.o LYMainLoop.o LYCurses.o LYBookmark.o LYmktime.o LYUtils.o LYOptions.o LYReadCFG.o LYSearch.o LYHistory.o LYForms.o LYPrint.o LYrcFile.o LYDownload.o LYNews.o LYKeymap.o HTML.o HTFWriter.o HTInit.o DefaultStyle.o LYUpload.o LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYStyle.o LYHash.o LYPrettySrc.o TRSTable.o parsdate.o UCdomap.o UCAux.o UCAuto.o LYSession.o LYLocal.o .././WWW/Library/Implementation/libwww.a -lz -static -lncurses -lssl -lcrypto -L/home/autobuild/autobuild/instance-7/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib64 -pthread /home/autobuild/autobuild/instance-7/output-1/host/lib/gcc/x86_64-buildroot-linux-uclibc/11.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-7/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(libcrypto-lib-c_zlib.o): in function `zlib_oneshot_expand_block': c_zlib.c:(.text+0xb8b): undefined reference to `uncompress' Patching aclocal.m4 is not possible as autoreconf fails due to missing AC_DIVERT_HELP macro. This build failure is only raised by autobuilders since 2024 for an unknown reason. Fixes: - http://autobuild.buildroot.org/results/6d4119b54fc6b6111a03f81e131e83bae0d844d1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ef5d3327a1f030924cb5f000d568fc69f7e7ec53) Signed-off-by: Peter Korsgaard --- package/lynx/lynx.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lynx/lynx.mk b/package/lynx/lynx.mk index 3f62f4f5b7..b441eacef7 100644 --- a/package/lynx/lynx.mk +++ b/package/lynx/lynx.mk @@ -53,6 +53,8 @@ LYNX_DEPENDENCIES += libidn LYNX_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libidn` endif -LYNX_CONF_ENV = LIBS="$(LYNX_LIBS)" CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" +LYNX_CONF_ENV = \ + LDFLAGS="$(TARGET_LDFLAGS) $(LYNX_LIBS)" \ + CFLAGS="$(TARGET_CFLAGS) $(LYNX_CFLAGS)" $(eval $(autotools-package)) From peter at korsgaard.com Wed Feb 28 21:13:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:57 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/minizip: fix CPE variables Message-ID: <20240228212549.1171A87CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c3203317ec6c751d51fe48ad69456316a3f6f7ea branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:minizip_project:minizip added by commit 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit f1e05a8199514310443777bc4dce1e2a6d2b69c0) Signed-off-by: Peter Korsgaard --- package/minizip/minizip.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index c74c0df8d1..8587508752 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -14,7 +14,8 @@ MINIZIP_CONF_OPTS = \ -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project +MINIZIP_CPE_ID_VENDOR = zlib-ng +MINIZIP_CPE_ID_PRODUCT = minizip-ng ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 From peter at korsgaard.com Wed Feb 28 21:12:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:12:03 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/crda: drop CRDA_CPE_ID_VENDOR Message-ID: <20240228212552.5A39F87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=89aed0df34750153eaad2a19ae9dfb165ced441e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:kernel:crda added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:crda Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 85d300f1021df905e60e704407b68dbed75ba430) Signed-off-by: Peter Korsgaard --- package/crda/crda.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/crda/crda.mk b/package/crda/crda.mk index a73c9aa26d..8043260cfc 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -9,7 +9,6 @@ CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snap CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC CRDA_LICENSE_FILES = LICENSE -CRDA_CPE_ID_VENDOR = kernel define CRDA_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ From peter at korsgaard.com Wed Feb 28 21:12:40 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:12:40 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/depot-tools: drop DEPOT_TOOLS_CPE_ID_VENDOR Message-ID: <20240228212552.6544387CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29095831f2f4f350349d901d14685d05e069c768 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:google:depot-tools added by commit 48730a1a9d882a7c56146bd2955e074aed790dcb has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:google:depot-tools Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 27fafa94a729b2c59d5eb0aec0bedbaf9dce5abb) Signed-off-by: Peter Korsgaard --- package/depot-tools/depot-tools.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/depot-tools/depot-tools.mk b/package/depot-tools/depot-tools.mk index 634258ffbb..a53afa14d6 100644 --- a/package/depot-tools/depot-tools.mk +++ b/package/depot-tools/depot-tools.mk @@ -9,7 +9,6 @@ DEPOT_TOOLS_SITE = https://chromium.googlesource.com/chromium/tools/depot_tools DEPOT_TOOLS_SITE_METHOD = git DEPOT_TOOLS_LICENSE = BSD-3-Clause DEPOT_TOOLS_LICENSE_FILES = LICENSE -DEPOT_TOOLS_CPE_ID_VENDOR = google HOST_DEPOT_TOOLS_DEPENDENCIES = \ host-python3 \ From peter at korsgaard.com Wed Feb 28 21:21:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:45 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-aiohttp: update PYTHON_AIOHTTP_CPE_ID_VENDOR Message-ID: <20240228212549.8418087CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f2145c0848e9114bbd5412285cd300d802d7a0f branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:aiohttp_project:aiohttp has been deprecated in favor of cpe:2.3:a:aiohttp:aiohttp in November 2023: Aiohttp Project Aiohttp 3.8.0 Beta 0 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a01deb6617ff38914f649f88c71e7c0c5ee71b01) Signed-off-by: Peter Korsgaard --- package/python-aiohttp/python-aiohttp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 8b0b15f13b..8944b5f77f 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -10,7 +10,7 @@ PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/ff/4f/62d9859b7d4e PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp_project +PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp PYTHON_AIOHTTP_CPE_ID_PRODUCT = aiohttp $(eval $(python-package)) From peter at korsgaard.com Wed Feb 28 21:14:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:14:24 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/libvips: update LIBVIPS_CPE_ID_VENDOR Message-ID: <20240228212552.9203287CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=876a47e0f4b60e45d7f771771ba61795a1cc045c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:libvips_project:libvips has been deprecated in favor of cpe:2.3:a:libvips:libvips in September 2023: libvips Project libvips 8.10.6 - Project Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5e4eba64140eea6adea87234d9736ae211bd352e) Signed-off-by: Peter Korsgaard --- package/libvips/libvips.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 1a0f9d5ead..8eb1f0964e 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -9,7 +9,7 @@ LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz LIBVIPS_SITE = https://github.com/libvips/libvips/releases/download/v$(LIBVIPS_VERSION) LIBVIPS_LICENSE = LGPL-2.1+ LIBVIPS_LICENSE_FILES = COPYING -LIBVIPS_CPE_ID_VENDOR = libvips_project +LIBVIPS_CPE_ID_VENDOR = libvips # Sparc64 compile fails, for all optimization levels except -O0. To # fix the problem, use -O0 with no optimization instead. Bug reported From peter at korsgaard.com Wed Feb 28 21:14:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:14:02 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/minizip: fix CPE variables Message-ID: <20240228212552.86E7387CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a307edcfcc0f40c37ae21be6d54e1ee0e0f2491 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:minizip_project:minizip added by commit 425339dcdfb2d4fa16ee11231752a5cc8250e78f is not a valid CPE identifier for this package, cpe:2.3:a:zlib-ng:minizip-ng is the correct one: https://nvd.nist.gov/products/cpe/detail/64E392F1-65DD-42E5-B618-AD893BA37FB3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit f1e05a8199514310443777bc4dce1e2a6d2b69c0) Signed-off-by: Peter Korsgaard --- package/minizip/minizip.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 5a4d920369..819b33b701 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -14,7 +14,8 @@ MINIZIP_CONF_OPTS = \ -DMZ_FETCH_LIBS=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -MINIZIP_CPE_ID_VENDOR = minizip_project +MINIZIP_CPE_ID_VENDOR = zlib-ng +MINIZIP_CPE_ID_PRODUCT = minizip-ng ifeq ($(BR2_PACKAGE_BZIP2),y) MINIZIP_DEPENDENCIES += bzip2 From peter at korsgaard.com Wed Feb 28 21:15:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:04 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/wireless-regdb: drop WIRELESS_REGDB_CPE_ID_VENDOR Message-ID: <20240228212552.9CFBF87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8dedc1329fe28b59c6a8014cc81ed6e40d86b13b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:kernel:wireless-regdb added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:kernel:wireless-regdb Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 05617160dd0bc4aef6cc91930d7985009e854142) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index e9003ce2e6..5c8ef96398 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -9,7 +9,6 @@ WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE -WIRELESS_REGDB_CPE_ID_VENDOR = kernel ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS From peter at korsgaard.com Wed Feb 28 21:13:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:13:32 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/lvm2: fix CPE variable Message-ID: <20240228212552.7B11587CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=783f8284705770e082b1094a2f1413c6b2b486c5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit d70da0be78779699a296e21532665ee149a2a3b8 wrongly set LVM2_CPE_ID_PRODUCT instead of LVM2_CPE_ID_VENDOR Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 8c0d9795a7a75a36574a7cc89107d71cb32fd20e) Signed-off-by: Peter Korsgaard --- package/lvm2/lvm2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 474ea30bdc..810d668ec2 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -10,7 +10,7 @@ LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB -LVM2_CPE_ID_PRODUCT = redhat +LVM2_CPE_ID_VENDOR = redhat # parallel build issues LVM2_MAKE = $(MAKE1) From peter at korsgaard.com Wed Feb 28 20:53:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 21:53:34 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/joe: add JOE_CPE_ID_VENDOR Message-ID: <20240228212551.D0AFC87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8ab2a93204968e939f3345f4c867b203afbf6a4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:joseph_allen:joe is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/5F530947-2060-4842-92B9-5BC61D9C5430 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 2953cd264489229adaef5f0a1f307900dcc3e425) Signed-off-by: Peter Korsgaard --- package/joe/joe.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/joe/joe.mk b/package/joe/joe.mk index f0cac402e1..9346ec1fd3 100644 --- a/package/joe/joe.mk +++ b/package/joe/joe.mk @@ -8,6 +8,7 @@ JOE_VERSION = 4.6 JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION) JOE_LICENSE = GPL-2.0+ JOE_LICENSE_FILES = COPYING +JOE_CPE_ID_VENDOR = joseph_allen ifeq ($(BR2_PACKAGE_NCURSES),y) JOE_DEPENDENCIES += ncurses From peter at korsgaard.com Wed Feb 28 21:17:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:17:15 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/x11r7/xlib_libXpm: update XLIB_LIBXPM_CPE_ID_VENDOR Message-ID: <20240228212552.D6F9287CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=6cc9ab7d55c1b0b202f93d6c7d324fe353cf8d37 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:libxpm_project:libxpm has been deprecated in favor of cpe:2.3:a:x.org:libxpm in October 2023: Libxpm Project Libxpm 3.5.15 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 03a9171cced41f2ee94850d6237bcc54fdda0b1a) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 0bba3ea946..1239ba0d4d 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -9,7 +9,7 @@ XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT -XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project +XLIB_LIBXPM_CPE_ID_VENDOR = x.org XLIB_LIBXPM_CPE_ID_PRODUCT = libxpm XLIB_LIBXPM_INSTALL_STAGING = YES XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ From peter at korsgaard.com Wed Feb 28 21:15:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:19 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/linux-firmware: drop LINUX_FIRMWARE_CPE_ID_VENDOR Message-ID: <20240228212552.A896D87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e480566f8069a3a08863e65f8a6200aff6bf7da8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:kernel:linux-firmware added by commit 63332c33aa0771532807fd2684d4eee4eb952435 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:kernel:linux-firmware Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 380d4a75f5e3c2ae52ebc1afd409713fdb6ced37) Signed-off-by: Peter Korsgaard --- package/linux-firmware/linux-firmware.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index c2cf0fec19..cc3624e59e 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -9,8 +9,6 @@ LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES -LINUX_FIRMWARE_CPE_ID_VENDOR = kernel - # Intel SST DSP ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master From peter at korsgaard.com Wed Feb 28 21:15:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:15:57 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/rauc-hawkbit-updater: drop RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR Message-ID: <20240228212552.B473187CA0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9c4cb225d3c1a1535420cbc8adaa2f8858491986 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:pengutronix:rauc-hawkbit-updater added by commit 928b7219cd7079864eadadc66dbff21c5cd72804 has never been a valid CPE ID for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:pengutronix:rauc-hawkbit-updater Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ed40db6dfba553df8571fcb96c29b8f20dc43dca) Signed-off-by: Peter Korsgaard --- package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index 10ba91abbb..a453f75a28 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -9,7 +9,6 @@ RAUC_HAWKBIT_UPDATER_SITE = https://github.com/rauc/rauc-hawkbit-updater/release RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSION).tar.xz RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE -RAUC_HAWKBIT_UPDATER_CPE_ID_VENDOR = pengutronix RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl $(eval $(meson-package)) From peter at korsgaard.com Wed Feb 28 21:17:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:17:00 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/netatalk: update NETATALK_CPE_ID_VENDOR Message-ID: <20240228212552.CBD8E87CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=3f0c6bf49fa1a415c64d59e8589cc8e5a3b86fd3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:netatalk_project:netatalk has been deprecated in favor of cpe:2.3:a:netatalk:netatalk in September 2023: Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 5ae38ec621f4821dd3eaf7ad3b0174cad21116ff) Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index a47bfa7e84..40e64dabeb 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -12,7 +12,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT -NETATALK_CPE_ID_VENDOR = netatalk_project +NETATALK_CPE_ID_VENDOR = netatalk # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ From peter at korsgaard.com Wed Feb 28 21:21:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:01 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/dbus: fix CPE variables Message-ID: <20240228212553.0740087CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=08dfcc690d107aff06046d02dea091fe4ee5a3d6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:d-bus_project:d-bus has been deprecated in favor of cpe:2.3:a:freedesktop:dbus in December 2023: D-Bus Project D-Bus 1.15.6 Version Advisory Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index c41fbcb4dd..d610846ddb 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -11,8 +11,8 @@ DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.xz DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING -DBUS_CPE_ID_VENDOR = d-bus_project -DBUS_CPE_ID_PRODUCT = d-bus +DBUS_CPE_ID_VENDOR = freedesktop +DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From peter at korsgaard.com Wed Feb 28 21:20:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:23 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/json-c: update JSON_C_CPE_ID_VENDOR Message-ID: <20240228212552.E11BC87CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c2c908f0c7e3f74df72683121693d045d51dc6f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:json-c_project:json-c has been deprecated in favor of cpe:2.3:a:json-c:json-c in September 2023: JSON-C Project JSON-C 0.14 Version Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 63118fbb55d3be3fc182470f02fcf7c221ba5ae4) Signed-off-by: Peter Korsgaard --- package/json-c/json-c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 517acee4db..68401433b4 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VENDOR = json-c_project +JSON_C_CPE_ID_VENDOR = json-c JSON_C_CONF_OPTS = -DBUILD_APPS=OFF -DDISABLE_EXTRA_LIBS=ON $(eval $(cmake-package)) From peter at korsgaard.com Wed Feb 28 21:16:20 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:16:20 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-wheel: add CPE variables Message-ID: <20240228212552.BFC1C87CE2@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=038845825dc7798f5f6ec2111738ea6a3a5debb5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:wheel_project:wheel is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/402C4B59-237A-4399-8189-CC9FC1B4BF39 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 92f3f04146654f77add9fc14c18d054783006108) Signed-off-by: Peter Korsgaard --- package/python-wheel/python-wheel.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-wheel/python-wheel.mk b/package/python-wheel/python-wheel.mk index 159598fd1e..320995521e 100644 --- a/package/python-wheel/python-wheel.mk +++ b/package/python-wheel/python-wheel.mk @@ -10,5 +10,7 @@ PYTHON_WHEEL_SITE = https://files.pythonhosted.org/packages/fc/ef/0335f7217dd1e8 PYTHON_WHEEL_SETUP_TYPE = flit PYTHON_WHEEL_LICENSE = MIT PYTHON_WHEEL_LICENSE_FILES = LICENSE.txt +PYTHON_WHEEL_CPE_ID_VENDOR = wheel_project +PYTHON_WHEEL_CPE_ID_PRODUCT = wheel $(eval $(host-python-package)) From peter at korsgaard.com Wed Feb 28 21:21:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:54 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-aiohttp: update PYTHON_AIOHTTP_CPE_ID_VENDOR Message-ID: <20240228212553.1CC1787CDC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67c3c1894343323aea4f6ce6e65fcfb34cefb621 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:aiohttp_project:aiohttp has been deprecated in favor of cpe:2.3:a:aiohttp:aiohttp in November 2023: Aiohttp Project Aiohttp 3.8.0 Beta 0 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit a01deb6617ff38914f649f88c71e7c0c5ee71b01) Signed-off-by: Peter Korsgaard --- package/python-aiohttp/python-aiohttp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index e814fc9224..70c8fcdfe8 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -10,7 +10,7 @@ PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/fd/01/f180d3192375 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt -PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp_project +PYTHON_AIOHTTP_CPE_ID_VENDOR = aiohttp PYTHON_AIOHTTP_CPE_ID_PRODUCT = aiohttp $(eval $(python-package)) From peter at korsgaard.com Wed Feb 28 21:20:42 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:20:42 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/flex: update FLEX_CPE_ID_VENDOR Message-ID: <20240228212552.F04A087CDB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=885708480740d1a8ec71dcdfc5397c6f915f2502 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:flex_project:flex has been deprecated in favor of cpe:2.3:a:westes:flex in October 2023: Flex Fast Lexical Analyser 2.6.4 Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit c438422d4972f41c0c59d1b701eefd3028abee43) Signed-off-by: Peter Korsgaard --- package/flex/flex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index f1e731ce2e..c6417fea83 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VENDOR = flex_project +FLEX_CPE_ID_VENDOR = westes # bug does not cause stack overflows in the generated code and has been # noted upstream as a bug in the code generator FLEX_IGNORE_CVES = CVE-2019-6293 From peter at korsgaard.com Wed Feb 28 21:21:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Wed, 28 Feb 2024 22:21:24 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/c-ares: update C_ARES_CPE_ID_VENDOR Message-ID: <20240228212553.1164687CE3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=164e1ecd9af059a0d579046d4e7730f40fe4ef1e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:c-ares_project:c-ares has been deprecated in favor of cpe:2.3:a:c-ares:c-ares in September 2023: C-ares Project C-ares 1.17.1 Change Log Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit ae2baf1771cbbebae65e32397480deec6bf879e4) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 7a49b2639a..586fde9afb 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -10,7 +10,7 @@ C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom C_ARES_LICENSE = MIT C_ARES_LICENSE_FILES = LICENSE.md -C_ARES_CPE_ID_VENDOR = c-ares_project +C_ARES_CPE_ID_VENDOR = c-ares $(eval $(autotools-package)) $(eval $(host-autotools-package)) From romain.naour at smile.fr Wed Feb 28 21:38:28 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 28 Feb 2024 22:38:28 +0100 Subject: [Buildroot] [PATCH 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 In-Reply-To: References: <20240227213517.241837-1-ju.o@free.fr> <90f5d326-0b04-495e-9b6d-d25ebfa59cb4@smile.fr> Message-ID: <7badbd15-343d-4ebb-80f7-e143ad6e5c47@smile.fr> Hello Julien, Le 28/02/2024 ? 19:27, Julien Olivain a ?crit?: > Hi Romain, > > On 27/02/2024 23:31, Romain Naour wrote: >> Hi Julien, >> >> Le 27/02/2024 ? 22:35, Julien Olivain a ?crit?: >>> Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated >>> gnu-efi. This update introduced syslinux build failure, as reported >>> in [1]. >>> >>> This commit adds a package patch to fix this issue. For technical >>> details of the issue, see the package patch commit log. >>> >>> Fixes: >>> - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 >>> - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 >>> >>> [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html >>> >>> Signed-off-by: Julien Olivain >>> --- >>> ?.checkpackageignore?????????????????????????? |? 1 + >>> ?...stddef.h-add-wchar_t-type-definition.patch | 58 +++++++++++++++++++ >>> ?2 files changed, 59 insertions(+) >>> ?create mode 100644 >>> boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch >>> >>> diff --git a/.checkpackageignore b/.checkpackageignore >>> index a6cc58c448c..a98a53fbf36 100644 >>> --- a/.checkpackageignore >>> +++ b/.checkpackageignore >>> @@ -118,6 +118,7 @@ >>> boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch Upstream >>> ? >>> boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch >>> Upstream >>> ? >>> boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch >>> Upstream >>> ? >>> boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch >>> Upstream >>> +boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch >> >> We want to remove .checkpackageignore in a not too far future, please add an >> upstream status tag in the patch 0019-stddef.h-add-wchar_t-type-definition.patch >> itself. Even if upstream is not very active (last commit is 5 years ago). > > I sent a v2 fixing that: > https://patchwork.ozlabs.org/project/buildroot/patch/20240228181411.10174-1-ju.o at free.fr/ > > I initially set an exclusion because my registration to the list was slow. I > also noted > the somewhat slow activity of the project. What would be your recommendation for > the > "Upstream:" tag, in the case a patch does apply upstream, but the first time > submission > takes a bit longer?? Something like "Upstream: Applicable (but not proposed yet)"? The text after the "Upstream:" tag is a free format it seems. Upstream: I'll send it to upstream, I promise :) Maybe just: Upstream: Best regards, Romain > > Best regards, > > Julien. From romain.naour at smile.fr Wed Feb 28 21:39:32 2024 From: romain.naour at smile.fr (Romain Naour) Date: Wed, 28 Feb 2024 22:39:32 +0100 Subject: [Buildroot] [PATCH v2 1/1] boot/syslinux: fix build with gnu-efi >= 3.0.16 In-Reply-To: <20240228181411.10174-1-ju.o@free.fr> References: <20240228181411.10174-1-ju.o@free.fr> Message-ID: <5da91e8f-c095-4f6f-bf96-f3da4bc52162@smile.fr> Hello Julien, Le 28/02/2024 ? 19:14, Julien Olivain a ?crit?: > Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated > gnu-efi. This update introduced syslinux build failure, as reported > in [1]. > > This commit adds a package patch to fix this issue. For technical > details of the issue, see the package patch commit log. > > Fixes: > - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 > - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 > > [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html > > Signed-off-by: Julien Olivain Reviewed-by: Romain Naour Best regards, Romain > --- > Changes v1 -> v2: > - Removed .checkpackageignore entry for the patch > - Added Upstream: tag with upstream proposal URL in the patch > --- > ...stddef.h-add-wchar_t-type-definition.patch | 59 +++++++++++++++++++ > 1 file changed, 59 insertions(+) > create mode 100644 boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > > diff --git a/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > new file mode 100644 > index 00000000000..65d9463a6f6 > --- /dev/null > +++ b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch > @@ -0,0 +1,59 @@ > +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 > +From: Julien Olivain > +Date: Tue, 27 Feb 2024 21:09:15 +0100 > +Subject: [PATCH] stddef.h: add wchar_t type definition > + > +Syslinux fail to build with gnu-efi >= 3.0.16 with error: > + > + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, > + from /build/syslinux-6.03/efi/efi.h:23, > + from /build/syslinux-6.03/efi/adv.h:4, > + from /build/syslinux-6.03/efi/adv.c:29: > + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' > + typedef wchar_t CHAR16; > + ^~~~~~~ > + > +This is because gnu-efi started to use the "wchar_t" type from the > +toolchain's header, in commit [1]. Before this commit, > +gnu-efi was defining the type as "short". > + > +Syslinux is including its own minimal stddef.h file, which masks the > +one provided by the toolchain. See [2]. This file does not have a type > +definition for "wchar_t". > + > +Finally, the POSIX header is supposed to provide this > +"wchar_t" type definition. See [3]. > + > +This commit fixes the issue by adding the "wchar_t" type definition in > +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" > +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This > +also follow the previous gnu-efi < 3.0.16 behavior. > + > +This issue was seen in Buildroot Linux, in [5]. > + > +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d > +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h > +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html > +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 > +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html > + > +Upstream: Proposed: https://www.syslinux.org/archives/2024-February/026903.html > +Signed-off-by: Julien Olivain > +--- > + com32/include/stddef.h | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/com32/include/stddef.h b/com32/include/stddef.h > +index f52d62f3..437b11f2 100644 > +--- a/com32/include/stddef.h > ++++ b/com32/include/stddef.h > +@@ -29,4 +29,6 @@ > + */ > + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) > + > ++typedef short wchar_t; > ++ > + #endif /* _STDDEF_H */ > +-- > +2.44.0 > + From yann.morin.1998 at free.fr Wed Feb 28 22:37:36 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 28 Feb 2024 23:37:36 +0100 Subject: [Buildroot] [PATCH] support/scripts/cve: fix running on older ijson versions Message-ID: <20240228223736.2376826-1-yann.morin.1998@free.fr> Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) had to change the decompressor from gz to xz, as the new location is using xz compression. That commit mentioned that it was spawning an external xz process to do the decompression, on the pretence that "there is no xz decompressor in Python stdlib." ijson started to accept bytes() (and str()) only with version 3.1, and using a subprocess means we are now passing bytes() to ijson, which it is not expecting as input on such older versions, casuing build failures such as: [...] File "/usr/lib/python3/dist-packages/ijson/backends/python.py", line 25, in Lexer if type(f.read(0)) == bytetype: AttributeError: 'bytes' object has no attribute 'read' Ubuntu 20.04, on which the pkg-stats run to generate the daily report, only has ijson 2.3. More recent distros have more recent versions of ijson, like Fedora 39 that has 3.2.3, recent enough to supoprt being fed bytes(). However, the reasonining in 22b69455526f is wrong: there *is* the lzma module, at least since python 3.3, that is, aeons ago, which is able to read xz-compressed files; it also has an API similar to the gzip module, and can provide a file-like object that exposes the decompressed data. So, do just that: provide an lzma-wrapped file-like object to ijson, so that we can eventually recover our daily reports that everything is broken! :-] Note that this construct still works on recent versions! Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) --- support/scripts/cve.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 1a3c307e12..7167ecbc6a 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -21,8 +21,8 @@ import datetime import os import requests # URL checking import distutils.version +import lzma import time -import subprocess import sys import operator @@ -134,8 +134,7 @@ class CVE: for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'cve_items.item') + content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise -- 2.43.2 From yann.morin.1998 at free.fr Wed Feb 28 22:44:59 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Wed, 28 Feb 2024 23:44:59 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: fix running on older python versions Message-ID: <20240228224459.2383336-1-yann.morin.1998@free.fr> Commit f71d9f49e546 (support/scripts/pkg-stats: fix datetime deprecation warning) forgot to consider that the datetime.UTC suggested by python 3.12, was only introduced with python 3.11. However, we are still generating the daily report on a python 3.8 version, which fails at runtime: AttributeError: module 'datetime' has no attribute 'UTC' It turns out that datetime.UTC is just an alias for datetime.timezone.utc, which seems to have existed since before python3... Use datetime.timezone.utc instead of its alias. Signed-off-by: Yann E. MORIN --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9a4a3ccad5..53898a36f2 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1290,7 +1290,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.now(datetime.UTC) + date = datetime.datetime.now(datetime.timezone.utc) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() -- 2.43.2 From dannenberg at ti.com Thu Feb 29 02:22:22 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Wed, 28 Feb 2024 20:22:22 -0600 Subject: [Buildroot] [PATCH v7 15/17] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240227163019.2876942-16-dario.binacchi@amarulasolutions.com> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> <20240227163019.2876942-16-dario.binacchi@amarulasolutions.com> Message-ID: <20240229022222.exmx2cgijdjrtnwp@dasso> Hi Dario, On Tue, Feb 27, 2024 at 05:30:17PM +0100, Dario Binacchi wrote: > Recent versions of U-Boot are capable of building tiboot3.bin using > Binman. In this case, let's copy it to the binaries directory. > > Signed-off-by: Dario Binacchi > > --- > > Changes in v6: > - Replace `find' command with `cp' one. > > Changes in v5: > - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with > tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > > Added in v4 > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > index fdb058f3b72a..cbdb653278f8 100644 > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > endef > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > + > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin Have you tried doing a clean build of ti_am64x_sk_defconfig? When I do that the change above breaks the build... >>> ti-k3-r5-loader 2022.10 Installing to images directory cp /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/spl/u-boot-spl.bin /home/a0797059/git/buildroot/output/images/r5-u-boot-spl .bin cp /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/tiboot3-am64x-gp-*.bin /home/a0797059/git/buildroot/output/images/tiboot3.b in cp: cannot stat '/home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/tiboot3-am64x-gp-*.bin': No such file or directory make[1]: *** [package/pkg-generic.mk:364: /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/.stamp_images_installed] Error 1 make: *** [Makefile:82: _all] Error 2 Looks like the tiboot3.bin file is already there, and nothing needs to be copied or renamed. Not sure what is best way to manage this dependency as this is the behavior of the older U-Boot. I'd probably just migrate the am64x_sk support to binman too also using the same/newer U-Boot you are already using for AM62x, making everything equivalent of the am62x_sk support you are focused on with this series. -- Andreas Dannenberg Texas Instruments Inc > endef > > $(eval $(kconfig-package)) > -- > 2.43.0 > From dannenberg at ti.com Thu Feb 29 03:28:20 2024 From: dannenberg at ti.com (Andreas Dannenberg) Date: Wed, 28 Feb 2024 21:28:20 -0600 Subject: [Buildroot] [PATCH v7 00/17] Add support for AM62x-SK HS-FS devices In-Reply-To: References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> <066a576a350d384c6547dc27b55e75c8044ed9e8.camel@gmail.com> Message-ID: <20240229032820.x275rawclrilgamn@dasso> Hi Dario, I just tested you v7 series on top of Buildroot commit... 75a3562324 ("support/scripts/pkg-stats: sort CVEs in HTML output") ...on both GP and HS-FS variants of the SK-AM62 board doing an SD Card-based boot. Everything seems to work without issues, the entire boot log looks clean as far as I can tell, and even networking works. Also thanks for all your efforts upstreaming this, I know it's a ton of work. Tested-by: Andreas Dannenberg On Wed, Feb 28, 2024 at 09:07:44AM +0100, Dario Binacchi wrote: > Hi Alexander, > > On Wed, Feb 28, 2024 at 1:06?AM Alexander Sverdlin > wrote: > > > > Hello Dario, Romain! > > > > On Tue, 2024-02-27 at 17:30 +0100, Dario Binacchi wrote: > > > The SK-AM62B-P1 is the newest version of SK-AM62 which includes > > > high-security field-securable (HS-FS) silicon to optionally customize keys > > > and encryption for security applications. > > > This requires enabling the BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS option, > > > which, however, was buggy. This series fixes the errors and bumps the Linux > > > kernel and U-Boot required for such a new device. > > > > > > Dario Binacchi (17): > > > configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > > setting > > > configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM > > > setting > > > configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader > > > version > > > configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader > > > version > > > boot/ti-k3-r5-loader: bump to version 2024.01 > > > package/python-attrs: add host variant > > > package/python-rpds-py: add host variant > > > package/python-referencing: add host variant > > > package/python-jsonschema-specifications: add host variant > > > package/python-jsonschema: add host variant > > > boot/ti-k3-r5-loader: set binman environment > > > boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option > > > package/ti-k3: move TI_K3_{SECTYPE,SOC} out of the image-gen scope > > > package/ti-k3: disable HS-FS for AM65 SOC > > > boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin > > > configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 > > > configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.17 > > > > I'm sorry for misleading you with the results with v6. > > I've built v7 series for GP and it runs fine on SK-AM62 (GP). > > Seems I've messed up either boot dip switches initially or the serial > > console. Thanks for your efforts! > > Nice! > Thank you for your tests. > > Thanks and regards, > Dario > > > > > Tested-by: Alexander Sverdlin > > > > -- > > Alexander Sverdlin. > > > > > -- > > Dario Binacchi > > Senior Embedded Linux Developer > > dario.binacchi at amarulasolutions.com > > __________________________________ > > > Amarula Solutions SRL > > Via Le Canevare 30, 31100 Treviso, Veneto, IT > > T. +39 042 243 5310 > info at amarulasolutions.com > > www.amarulasolutions.com From nisargjhaveri at gmail.com Thu Feb 29 05:04:54 2024 From: nisargjhaveri at gmail.com (Nisarg Jhaveri) Date: Thu, 29 Feb 2024 10:34:54 +0530 Subject: [Buildroot] [PATCH 1/1] package/brcmfmac_sdio-firmware-rpi: bump version to 26ff205 Message-ID: The current version is more than 2 years old. Update to the latest. A lot of the files are symlinked. Instead of individually restoring the links, using `cp --remove-destination --no-dereference` and `chmod` instead of `install`. Signed-off-by: Nisarg Jhaveri --- .../brcmfmac_sdio-firmware-rpi.hash | 4 +-- .../brcmfmac_sdio-firmware-rpi.mk | 27 +++++++------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index a12e92cbac..aa1043518b 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356 brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz +sha256 ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599 LICENCE diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index 5332bf53d7..7860de3ef7 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -4,33 +4,26 @@ # ################################################################################ -BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5 BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY -BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/synaptics + cp --remove-destination --no-dereference $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/synaptics/*.hcd $(TARGET_DIR)/lib/firmware/synaptics + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/synaptics/*.hcd endef endif ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm - ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin - ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt - ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin - ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress - $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/cypress + cp --remove-destination --no-dereference $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/cypress/cyfmac* endef endif -- 2.38.1.vfs.0.0 From nisargjhaveri at gmail.com Thu Feb 29 05:14:00 2024 From: nisargjhaveri at gmail.com (Nisarg Jhaveri) Date: Thu, 29 Feb 2024 10:44:00 +0530 Subject: [Buildroot] [PATCH v2 1/1] package/brcmfmac_sdio-firmware-rpi: bump version to 26ff205 Message-ID: The current version is more than 2 years old. Update to the latest. A lot of the file are symlinked. Instead of individually restoring the links, using `cp --remove-destination --no-dereference` and `chmod` instead of `install`. Signed-off-by: Nisarg Jhaveri --- Changes v1 -> v2: - Attempt to fix patch formatting --- .../brcmfmac_sdio-firmware-rpi.hash | 4 +-- .../brcmfmac_sdio-firmware-rpi.mk | 27 +++++++------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index a12e92cbac..aa1043518b 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356 brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz +sha256 ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599 LICENCE diff --git a/package/brcmfmac_sdio-firmware-rpi/ brcmfmac_sdio-firmware-rpi.mk b/package/brcmfmac_sdio-firmware-rpi/ brcmfmac_sdio-firmware-rpi.mk index 5332bf53d7..7860de3ef7 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -4,33 +4,26 @@ # ################################################################################ -BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5 BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY -BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/synaptics + cp --remove-destination --no-dereference $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/synaptics/*.hcd $(TARGET_DIR)/lib/firmware/synaptics + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/synaptics/*.hcd endef endif ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm - ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin - ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt - ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin - ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress - $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/cypress + cp --remove-destination --no-dereference $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/cypress/cyfmac* endef endif -- 2.38.1.vfs.0.0 -------------- next part -------------- An HTML attachment was scrubbed... URL: From nisargjhaveri at gmail.com Thu Feb 29 05:22:36 2024 From: nisargjhaveri at gmail.com (Nisarg Jhaveri) Date: Thu, 29 Feb 2024 10:52:36 +0530 Subject: [Buildroot] [PATCH v3 1/1] package/brcmfmac_sdio-firmware-rpi: bump version to 26ff205 In-Reply-To: References: Message-ID: <20240229052236.50171-1-nisargjhaveri@gmail.com> The current version is more than 2 years old. Update to the latest. A lot of the files are symlinked. Instead of individually restoring the links, using `cp --remove-destination --no-dereference` and `chmod` instead of `install`. Signed-off-by: Nisarg Jhaveri --- Changes v2 -> v3: - Attempt to fix patch formatting Changes v1 -> v2: - Attempt to fix patch formatting --- .../brcmfmac_sdio-firmware-rpi.hash | 4 +-- .../brcmfmac_sdio-firmware-rpi.mk | 27 +++++++------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash index a12e92cbac..aa1043518b 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e51b717c2a60ca29fcdd8e04e07c00996226cb48fa56a8ad1934b5f4ddee2e3d brcmfmac_sdio-firmware-rpi-ea9963f3f77b4bb6cd280577eb115152bdd67e8d.tar.gz -sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx +sha256 2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356 brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz +sha256 ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599 LICENCE diff --git a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk index 5332bf53d7..7860de3ef7 100644 --- a/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk +++ b/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk @@ -4,33 +4,26 @@ # ################################################################################ -BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = ea9963f3f77b4bb6cd280577eb115152bdd67e8d +BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5 BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION)) BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY -BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE.broadcom_bcm43xx +BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENCE ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/synaptics + cp --remove-destination --no-dereference $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/synaptics/*.hcd $(TARGET_DIR)/lib/firmware/synaptics + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/synaptics/*.hcd endef endif ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y) define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm - $(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm - ln -sf ../cypress/cyfmac43430-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.bin - ln -sf ../cypress/cyfmac43430-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - ln -sf brcmfmac43430-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt - ln -sf ../cypress/cyfmac43455-sdio.bin $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.bin - ln -sf ../cypress/cyfmac43455-sdio.clm_blob $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - ln -sf brcmfmac43455-sdio.txt $(TARGET_DIR)/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - $(INSTALL) -d $(TARGET_DIR)/lib/firmware/cypress - $(INSTALL) -m 0644 $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + $(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/cypress + cp --remove-destination --no-dereference $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm + cp --remove-destination --no-dereference $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress + chmod 644 $(TARGET_DIR)/lib/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/cypress/cyfmac* endef endif -- 2.38.1.vfs.0.0 From luca.ceresoli at bootlin.com Thu Feb 29 09:29:25 2024 From: luca.ceresoli at bootlin.com (Luca Ceresoli) Date: Thu, 29 Feb 2024 10:29:25 +0100 Subject: [Buildroot] [PATCH v9 06/11] boot/zynqmp-firmware: new boot firmware In-Reply-To: References: <20240131112223.2175855-1-neal.frager@amd.com> <20240131112223.2175855-6-neal.frager@amd.com> Message-ID: <20240229102925.62a9ecbf@booty> Hello Neal, On Thu, 22 Feb 2024 16:35:21 +0000 "Frager, Neal" wrote: > Hello everyone, > > Just a friendly reminder. Any updates? > > > Now that the toolchain-bare-metal-buildroot has been applied, do you have any > > feedback regarding the remainder of the patch set? > > > One open question I have is regarding the patches for zynqmp-firmware and > > versal-firmware. These patches are no longer neeeded since being applied to > > release version xilinx_v2023.2. I kept them with the idea that users may > > still be using older versions of software, so the patches enable users to > > work with versions as old as 2022.2 for zynqmp and 2023.1 for versal. > > > Do you agree with keeping the patches or do you think it is better not to > > include them and to say that support begins starting with version > > xilinx_v2023.2? > > What are your thoughts? > > > create mode 120000 boot/zynqmp-firmware/xilinx_v2022.2/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch > > create mode 100644 boot/zynqmp-firmware/xilinx_v2023.1/0001-pmufw-misc-Makefile-specify-sequential-Makefiles.patch Apologies for the late reply... I think we should not put any effort in encouraging the practice of using old and perhaps not-maintained-anymore software that some proprietary tools tend to enforce. We do have a mainline pmufw that works without needing any patches thank to your (very appreciated!) effort, so let's just support the latest and greatest pmufw version and be happy. Your patches are there in this series anyway, and will be, so whoever wants to use an old version can do some research and find them. So, I vote to not have these patches in Buildroot. Luca -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com From peter at korsgaard.com Thu Feb 29 10:50:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 11:50:58 +0100 Subject: [Buildroot] [PATCH] support/scripts/cve: fix running on older ijson versions In-Reply-To: <20240228223736.2376826-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 28 Feb 2024 23:37:36 +0100") References: <20240228223736.2376826-1-yann.morin.1998@free.fr> Message-ID: <87v867ilwt.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for > the JSON files) had to change the decompressor from gz to xz, as the new > location is using xz compression. > That commit mentioned that it was spawning an external xz process to do > the decompression, on the pretence that "there is no xz decompressor in > Python stdlib." > ijson started to accept bytes() (and str()) only with version 3.1, and > using a subprocess means we are now passing bytes() to ijson, which it > is not expecting as input on such older versions, casuing build failures > such as: > [...] > File "/usr/lib/python3/dist-packages/ijson/backends/python.py", line 25, in Lexer > if type(f.read(0)) == bytetype: > AttributeError: 'bytes' object has no attribute 'read' > Ubuntu 20.04, on which the pkg-stats run to generate the daily report, > only has ijson 2.3. More recent distros have more recent versions of > ijson, like Fedora 39 that has 3.2.3, recent enough to supoprt being fed > bytes(). > However, the reasonining in 22b69455526f is wrong: there *is* the lzma > module, at least since python 3.3, that is, aeons ago, which is able to > read xz-compressed files; it also has an API similar to the gzip module, > and can provide a file-like object that exposes the decompressed data. > So, do just that: provide an lzma-wrapped file-like object to ijson, so > that we can eventually recover our daily reports that everything is > broken! :-] > Note that this construct still works on recent versions! > Reported-by: Thomas Petazzoni > Signed-off-by: Yann E. MORIN > Cc: Arnout Vandecappelle (Essensium/Mind) > --- > support/scripts/cve.py | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > diff --git a/support/scripts/cve.py b/support/scripts/cve.py > index 1a3c307e12..7167ecbc6a 100755 > --- a/support/scripts/cve.py > +++ b/support/scripts/cve.py > @@ -21,8 +21,8 @@ import datetime > import os > import requests # URL checking > import distutils.version > +import lzma > import time > -import subprocess > import sys > import operator > @@ -134,8 +134,7 @@ class CVE: > for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): > filename = CVE.download_nvd_year(nvd_dir, year) > try: > - uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) > - content = ijson.items(uncompressed, 'cve_items.item') > + content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') Are you sure this provides str()? xz GPL-2.0 python3 Python 3.11.2 (main, Mar 13 2023, 12:18:29) [GCC 12.2.0] on linux Type "help", "copyright", "credits" or "license" for more information. >>> import lzma >>> lzma.LZMAFile('GPL-2.0.xz').read(100) b'Valid-License-Identifier: GPL-2.0\nValid-License-Identifier: GPL-2.0-only\nValid-License-Identifier: G' Whereas lzma.open() accepts a 'rt' mode: >>> lzma.open('GPL-2.0.xz', mode='rt').read(100) 'Valid-License-Identifier: GPL-2.0\nValid-License-Identifier: GPL-2.0-only\nValid-License-Identifier: G' -- Bye, Peter Korsgaard From dario.binacchi at amarulasolutions.com Thu Feb 29 11:37:57 2024 From: dario.binacchi at amarulasolutions.com (Dario Binacchi) Date: Thu, 29 Feb 2024 12:37:57 +0100 Subject: [Buildroot] [PATCH v7 15/17] boot/ti-k3/ti-k3-r5-loader: install tiboot3.bin In-Reply-To: <20240229022222.exmx2cgijdjrtnwp@dasso> References: <20240227163019.2876942-1-dario.binacchi@amarulasolutions.com> <20240227163019.2876942-16-dario.binacchi@amarulasolutions.com> <20240229022222.exmx2cgijdjrtnwp@dasso> Message-ID: Hi Andreas, On Thu, Feb 29, 2024 at 3:22?AM Andreas Dannenberg wrote: > > Hi Dario, > > On Tue, Feb 27, 2024 at 05:30:17PM +0100, Dario Binacchi wrote: > > Recent versions of U-Boot are capable of building tiboot3.bin using > > Binman. In this case, let's copy it to the binaries directory. > > > > Signed-off-by: Dario Binacchi > > > > --- > > > > Changes in v6: > > - Replace `find' command with `cp' one. > > > > Changes in v5: > > - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with > > tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin > > > > Added in v4 > > > > boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > index fdb058f3b72a..cbdb653278f8 100644 > > --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk > > @@ -70,8 +70,12 @@ define TI_K3_R5_LOADER_BUILD_CMDS > > $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) > > endef > > > > +TI_K3_R5_LOADER_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_SECTYPE)) > > +TI_K3_R5_LOADER_SOC = $(call qstrip,$(BR2_PACKAGE_TI_K3_SOC)) > > + > > define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS > > cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin > > + cp $(@D)/tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin $(BINARIES_DIR)/tiboot3.bin > > Have you tried doing a clean build of ti_am64x_sk_defconfig? When I do > that the change above breaks the build... > > > >>> ti-k3-r5-loader 2022.10 Installing to images directory > cp /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/spl/u-boot-spl.bin /home/a0797059/git/buildroot/output/images/r5-u-boot-spl > .bin > cp /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/tiboot3-am64x-gp-*.bin /home/a0797059/git/buildroot/output/images/tiboot3.b > in > cp: cannot stat '/home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/tiboot3-am64x-gp-*.bin': No such file or directory > make[1]: *** [package/pkg-generic.mk:364: /home/a0797059/git/buildroot/output/build/ti-k3-r5-loader-2022.10/.stamp_images_installed] Error 1 > make: *** [Makefile:82: _all] Error 2 > > > Looks like the tiboot3.bin file is already there, and nothing needs to > be copied or renamed. Not sure what is best way to manage this > dependency as this is the behavior of the older U-Boot. I'd probably > just migrate the am64x_sk support to binman too also using the > same/newer U-Boot you are already using for AM62x, making everything > equivalent of the am62x_sk support you are focused on with this series. I am modifying the configuration ti_am64x_sk_defconfig so that, similarly to what was done for ti_am62x_sk_defconfig, it uses a U-Boot 2024.01 that makes use of binman: https://patchwork.ozlabs.org/project/buildroot/patch/20240224205654.1546744-17-dario.binacchi at amarulasolutions.com/ Thanks and regards, Dario > > -- > Andreas Dannenberg > Texas Instruments Inc > > > > > > > endef > > > > $(eval $(kconfig-package)) > > -- > > 2.43.0 > > -- Dario Binacchi Senior Embedded Linux Developer dario.binacchi at amarulasolutions.com __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 info at amarulasolutions.com www.amarulasolutions.com From romain.naour at smile.fr Thu Feb 29 13:11:07 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 14:11:07 +0100 Subject: [Buildroot] [PATCH 1/2] package/rust: use host libraries from HOST_DIR Message-ID: <20240229131108.363533-1-romain.naour@smile.fr> host-rust package depends on several host packages to provide tools and libraries but it doesn't take into account HOST_DIR while building rustc compiler. Indeed, rustc needs zlib and fail to link if zlib is not installed on the host. error: could not compile `rustc_driver` (lib) due to previous error If zlib is installed on the host, we can notice it with ldd tool (while it should be linked with the one provided by Buildroot host-zlib). ldd [...]TestRust/host/bin/rustc libz.so.1 => /lib64/libz.so.1 Provide HOST_LDFLAGS using llvm.ldflags in config.toml. (HOST_LDFLAGS provide -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib) With that fixed, rustc_driver link with libz from HOST_DIR but the host-rust build still fail later due to another issue. error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545 http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0 Signed-off-by: Romain Naour --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index f7a5c0fcd5..c464e77f4f 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -64,6 +64,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ echo 'ninja = false'; \ + echo 'ldflags = "$(HOST_LDFLAGS)"'; \ ) > $(@D)/config.toml endef -- 2.43.2 From romain.naour at smile.fr Thu Feb 29 13:11:08 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 14:11:08 +0100 Subject: [Buildroot] [PATCH 2/2] package/rust: provide RUSTFLAGS for cargo In-Reply-To: <20240229131108.363533-1-romain.naour@smile.fr> References: <20240229131108.363533-1-romain.naour@smile.fr> Message-ID: <20240229131108.363533-2-romain.naour@smile.fr> While building the rust toolchain, the build system endup using cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo) to build some tool like rustdoc-tool. But the host-rust package doesn't use the cargo infractructure (since it provide cargo binary) and some cargo environment varialble [1] is not set to crosscompile cargo packages in the rust toolchain. For exemple, we usually set RUSTFLAGS="-C link-arg=-Wl,-rpath,$(HOST_DIR)/lib" to force cargo using libraries provided by Buildroot in $(HOST_DIR)/lib. RUSTFLAGS is actually needed to find zlib library (host-zlib) to link rustdoc-tool when zlib is not installed on the host. Fixes: error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.02-rc1/package/pkg-cargo.mk?ref_type=tags#L167 Signed-off-by: Romain Naour --- package/rust/rust.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index c464e77f4f..cbe79cd8e3 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -69,7 +69,9 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build + cd $(@D); $(HOST_MAKE_ENV) \ + RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \ + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef HOST_RUST_INSTALL_OPTS = \ -- 2.43.2 From yann.morin at orange.com Thu Feb 29 13:35:08 2024 From: yann.morin at orange.com (yann.morin at orange.com) Date: Thu, 29 Feb 2024 14:35:08 +0100 Subject: [Buildroot] [PATCH 1/2] package/rust: use host libraries from HOST_DIR In-Reply-To: <20240229131108.363533-1-romain.naour@smile.fr> References: <20240229131108.363533-1-romain.naour@smile.fr> Message-ID: romain, All, On 2024-02-29 14:11 +0100, Romain Naour spake thusly: > host-rust package depends on several host packages to provide tools and > libraries but it doesn't take into account HOST_DIR while building rustc > compiler. Indeed, rustc needs zlib and fail to link if zlib is not > installed on the host. > > error: could not compile `rustc_driver` (lib) due to previous error > > If zlib is installed on the host, we can notice it with ldd tool (while > it should be linked with the one provided by Buildroot host-zlib). > > ldd [...]TestRust/host/bin/rustc > libz.so.1 => /lib64/libz.so.1 > > Provide HOST_LDFLAGS using llvm.ldflags in config.toml. > (HOST_LDFLAGS provide -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib) > > With that fixed, rustc_driver link with libz from HOST_DIR but the > host-rust build still fail later due to another issue. > > error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545 > http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0 > > Signed-off-by: Romain Naour > --- > package/rust/rust.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/rust/rust.mk b/package/rust/rust.mk > index f7a5c0fcd5..c464e77f4f 100644 > --- a/package/rust/rust.mk > +++ b/package/rust/rust.mk > @@ -64,6 +64,7 @@ define HOST_RUST_CONFIGURE_CMDS > echo 'cc = "$(TARGET_CROSS)gcc"'; \ > echo '[llvm]'; \ > echo 'ninja = false'; \ > + echo 'ldflags = "$(HOST_LDFLAGS)"'; \ But then, we would also need to add host-zlib to HOST_RUST_DEPENDENCIES, no? Regards, Yann E. MORIN. > ) > $(@D)/config.toml > endef > > -- > 2.43.2 > > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- ____________ .-----------------.--------------------: _ :------------------. | Yann E. MORIN | Real-Time Embedded | __/ ) | /"\ ASCII RIBBON | | | Software Designer | _/ - /' | \ / CAMPAIGN | | +33 638.411.245 '--------------------: (_ `--, | X AGAINST | | yann.morin (at) orange.com |_=" ,--' | / \ HTML MAIL | '--------------------------------------:______/_____:------------------' ____________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. From romain.naour at smile.fr Thu Feb 29 13:43:47 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 14:43:47 +0100 Subject: [Buildroot] [PATCH 1/2] package/rust: use host libraries from HOST_DIR In-Reply-To: References: <20240229131108.363533-1-romain.naour@smile.fr> Message-ID: Le 29/02/2024 ? 14:35, yann.morin at orange.com a ?crit?: > romain, All, > > On 2024-02-29 14:11 +0100, Romain Naour spake thusly: >> host-rust package depends on several host packages to provide tools and >> libraries but it doesn't take into account HOST_DIR while building rustc >> compiler. Indeed, rustc needs zlib and fail to link if zlib is not >> installed on the host. >> >> error: could not compile `rustc_driver` (lib) due to previous error >> >> If zlib is installed on the host, we can notice it with ldd tool (while >> it should be linked with the one provided by Buildroot host-zlib). >> >> ldd [...]TestRust/host/bin/rustc >> libz.so.1 => /lib64/libz.so.1 >> >> Provide HOST_LDFLAGS using llvm.ldflags in config.toml. >> (HOST_LDFLAGS provide -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib) >> >> With that fixed, rustc_driver link with libz from HOST_DIR but the >> host-rust build still fail later due to another issue. >> >> error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error >> >> Fixes: >> https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545 >> http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0 >> >> Signed-off-by: Romain Naour >> --- >> package/rust/rust.mk | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/package/rust/rust.mk b/package/rust/rust.mk >> index f7a5c0fcd5..c464e77f4f 100644 >> --- a/package/rust/rust.mk >> +++ b/package/rust/rust.mk >> @@ -64,6 +64,7 @@ define HOST_RUST_CONFIGURE_CMDS >> echo 'cc = "$(TARGET_CROSS)gcc"'; \ >> echo '[llvm]'; \ >> echo 'ninja = false'; \ >> + echo 'ldflags = "$(HOST_LDFLAGS)"'; \ > > But then, we would also need to add host-zlib to > HOST_RUST_DEPENDENCIES, no? Indeed but in practice host-zlib is already an "indirect" dependency of host-rust due to host-openssl (host-libopenssl) dependency. HOST_LIBOPENSSL_DEPENDENCIES = host-zlib I noticed the missing dependency but forgot to add it in HOST_RUST_DEPENDENCIES. Best regards, Romain > > Regards, > Yann E. MORIN. > >> ) > $(@D)/config.toml >> endef >> >> -- >> 2.43.2 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > From peter at korsgaard.com Thu Feb 29 14:19:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:19:03 +0100 Subject: [Buildroot] [PATCH 1/1] package/dbus: drop DBUS_CPE_ID_PRODUCT In-Reply-To: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 4 Feb 2024 11:32:04 +0100") References: <20240204103204.1415592-1-fontaine.fabrice@gmail.com> Message-ID: <87r0gvica0.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT > to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the > package name (i.e. dbus) by default > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 14:19:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:19:14 +0100 Subject: [Buildroot] [PATCH 1/1] package/yasm: add YASM_CPE_ID_VENDOR In-Reply-To: <20240204182514.1663508-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 4 Feb 2024 19:25:14 +0100") References: <20240204182514.1663508-1-fontaine.fabrice@gmail.com> Message-ID: <87il27ic9p.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 14:19:09 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:19:09 +0100 Subject: [Buildroot] [PATCH 1/1] package/opus: set OPUS_CPE_ID_VENDOR In-Reply-To: <20240204181435.1657162-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 4 Feb 2024 19:14:35 +0100") References: <20240204181435.1657162-1-fontaine.fabrice@gmail.com> Message-ID: <87msrjic9u.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 14:21:34 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:21:34 +0100 Subject: [Buildroot] [PATCH v2] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' In-Reply-To: <20240204201657.33079-2-aleksandr.o.makarov@gmail.com> (Aleksandr Makarov's message of "Sun, 4 Feb 2024 22:16:57 +0200") References: <20240204201657.33079-1-aleksandr.o.makarov@gmail.com> <20240204201657.33079-2-aleksandr.o.makarov@gmail.com> Message-ID: <87edcvic5t.fsf@48ers.dk> >>>>> "Aleksandr" == Aleksandr Makarov writes: > Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS > which were internally set by the haproxy Makefile. > Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and > and then running the program results in runtime error: > $ haproxy > FATAL ERROR: invalid code detected -- cannot go further, please recompile! > ... > To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead > of CFLAGS in haproxy.mk. > --- > Changes v1 -> v2 > - Drop patch for haproxy program Makefile, make changes to haproxy.mk instead Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 14:18:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:18:18 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/yasm: add YASM_CPE_ID_VENDOR Message-ID: <20240229142228.55DD287CD6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=158395a46d36c5ec948a223905e7b3399e30410b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 17dac57e3ebfe8e2371100a632cca4fb11ed9bac) Signed-off-by: Peter Korsgaard --- package/yasm/yasm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index b294bd3aee..cdb8e15bee 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 YASM_SITE = http://www.tortall.net/projects/yasm/releases YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 +YASM_CPE_ID_VENDOR = tortall # This sed prevents it compiling 2 programs (vsyasm and ytasm) # that are only of use on Microsoft Windows. From peter at korsgaard.com Thu Feb 29 14:17:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:17:56 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/dbus: drop DBUS_CPE_ID_PRODUCT Message-ID: <20240229142228.459E687D07@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8778f7b6b6ff6b9ac992d69f09ccfc074f7bb9b7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the package name (i.e. dbus) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit b878e7bbbc7041c8fd0ce2e410cc7fc9428bb93d) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index b4d1cdc6b6..7ddeb0e325 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -11,7 +11,6 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING DBUS_CPE_ID_VENDOR = freedesktop -DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From peter at korsgaard.com Thu Feb 29 14:20:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:20:56 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' Message-ID: <20240229142228.619F987D06@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d3657f363f662c028089c4aeaf6f78f13563c7df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS which were internally set by the haproxy Makefile. Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and and then running the program results in runtime error: $ haproxy FATAL ERROR: invalid code detected -- cannot go further, please recompile! ... To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead of CFLAGS in haproxy.mk. Signed-off-by: Yann E. MORIN (cherry picked from commit 9b90ef61784d314147ace4972f9bdc0cb4fcce77) Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 63a92090f3..61a9ebebe4 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -82,7 +82,7 @@ endif define HAPROXY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) endef define HAPROXY_INSTALL_TARGET_CMDS From peter at korsgaard.com Thu Feb 29 14:18:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:18:15 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/opus: set OPUS_CPE_ID_VENDOR Message-ID: <20240229142228.5DC7487D08@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ec070357149fc4c53dd3ef46e48e01aa6f5f76df branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 302175353a920402d27d4f7cf23dd78c5a792428) Signed-off-by: Peter Korsgaard --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index d8e0623e15..611b0e1da0 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -8,6 +8,7 @@ OPUS_VERSION = 1.3.1 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING +OPUS_CPE_ID_VENDOR = opus-codec OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) From peter at korsgaard.com Thu Feb 29 14:17:43 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:17:43 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/opus: set OPUS_CPE_ID_VENDOR Message-ID: <20240229142434.91C1487D13@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d353bf971974f35f13c48add3313e33a16fb26b8 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:opus-codec:opus is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/6C4EA9AB-4801-48FF-9737-A7C3B368C41B Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 302175353a920402d27d4f7cf23dd78c5a792428) Signed-off-by: Peter Korsgaard --- package/opus/opus.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 15531b521a..cbc07a091b 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -8,6 +8,7 @@ OPUS_VERSION = 1.4 OPUS_SITE = https://downloads.xiph.org/releases/opus OPUS_LICENSE = BSD-3-Clause OPUS_LICENSE_FILES = COPYING +OPUS_CPE_ID_VENDOR = opus-codec OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) From peter at korsgaard.com Thu Feb 29 14:20:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:20:50 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/haproxy: fix runtime 'FATAL ERROR: invalid code detected -- cannot go further' Message-ID: <20240229142434.A630287D15@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=29f2034b2c6d2aa1b2060b5198644e637ae604d3 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Setting HAPROXY_CFLAGS on the haproxy build command line overrides CFLAGS which were internally set by the haproxy Makefile. Among those omitted CFLAGS is -fwrapv. Compiling haproxy without it and and then running the program results in runtime error: $ haproxy FATAL ERROR: invalid code detected -- cannot go further, please recompile! ... To address this issue, include HAPROXY_CFLAGS in the DEFINE variable instead of CFLAGS in haproxy.mk. Signed-off-by: Yann E. MORIN (cherry picked from commit 9b90ef61784d314147ace4972f9bdc0cb4fcce77) Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 63a92090f3..61a9ebebe4 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -82,7 +82,7 @@ endif define HAPROXY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(HAPROXY_MAKE_OPTS) CFLAGS="$(HAPROXY_CFLAGS)" -C $(@D) + $(HAPROXY_MAKE_OPTS) DEFINE="$(HAPROXY_CFLAGS)" -C $(@D) endef define HAPROXY_INSTALL_TARGET_CMDS From peter at korsgaard.com Thu Feb 29 14:17:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:17:35 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/dbus: drop DBUS_CPE_ID_PRODUCT Message-ID: <20240229142434.8796D87D12@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0bce31469d27e90e14b63ec21e5e32c9a34b91e9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 363b4ebf1aaf4821c0c49713eba71937bd5639ca set DBUS_CPE_ID_PRODUCT to dbus but this is not needed as DBUS_CPE_ID_PRODUCT will be set to the package name (i.e. dbus) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit b878e7bbbc7041c8fd0ce2e410cc7fc9428bb93d) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index d610846ddb..097b89205e 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -12,7 +12,6 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING DBUS_CPE_ID_VENDOR = freedesktop -DBUS_CPE_ID_PRODUCT = dbus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS From peter at korsgaard.com Thu Feb 29 14:17:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 15:17:48 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/yasm: add YASM_CPE_ID_VENDOR Message-ID: <20240229142434.9C05387D14@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=611b139e76e82e6b635a0bf77383a6508904eace branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:tortall:yasm is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/2E6C9C2F-A057-4083-BC90-095403EF138E Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 17dac57e3ebfe8e2371100a632cca4fb11ed9bac) Signed-off-by: Peter Korsgaard --- package/yasm/yasm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk index b294bd3aee..cdb8e15bee 100644 --- a/package/yasm/yasm.mk +++ b/package/yasm/yasm.mk @@ -8,6 +8,7 @@ YASM_VERSION = 1.3.0 YASM_SITE = http://www.tortall.net/projects/yasm/releases YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 +YASM_CPE_ID_VENDOR = tortall # This sed prevents it compiling 2 programs (vsyasm and ytasm) # that are only of use on Microsoft Windows. From peter at korsgaard.com Thu Feb 29 15:14:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:14:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/libressl: don't export arc4random In-Reply-To: <20240121202422.1598129-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 21 Jan 2024 21:24:22 +0100") References: <20240121202422.1598129-1-fontaine.fabrice@gmail.com> Message-ID: <87a5nji9q9.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Don't export arc4random to fix the following libcurl build failure > raised since bump of libcurl to version 8.5.0 in commit > aaa9438b96f88b1ecbf5eb9a1aebef8010835b8d and > https://github.com/curl/curl/commit/7925ba431b9a099daee1fa21d36c21887f787ad5: > rand.c: In function 'randit': > rand.c:146:26: error: implicit declaration of function 'arc4random'; > did you mean 'srandom'? [-Werror=implicit-function-declaration] > 146 | *rnd = (unsigned int)arc4random(); > | ^~~~~~~~~~ > | srandom > cc1: some warnings being treated as errors > Fixes: > - http://autobuild.buildroot.org/results/8b7988629f1887be15c97b8c511d25443ba110d8 > Signed-off-by: Fabrice Fontaine Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:15:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:15:44 +0100 Subject: [Buildroot] [PATCH 1/1] package/rdma-core: fix mips4 build In-Reply-To: <20240122212121.7805-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 22 Jan 2024 22:21:21 +0100") References: <20240122212121.7805-1-fontaine.fabrice@gmail.com> Message-ID: <875xy7i9nj.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > The 'sync' instruction for MIPS was defined in MIPS-II as taking no > operands. MIPS32 extended the define of 'sync' as taking an optional > unsigned 5 bit immediate. > As a result, replace "sync 0" by "sync" to fix the following build > failure on mips4 raised since the addition of the package in commit > ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 and > https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: > /tmp/ccrBy9fV.s: Assembler messages: > /tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' > Fixes: > - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 > - http://autobuild.buildroot.org/results/2df58f9b98aacf00960932f53510b29199393461 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:17:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:17:24 +0100 Subject: [Buildroot] [PATCH 1/1] package/frr: drop libnl dependency In-Reply-To: <20240128215205.3690716-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 28 Jan 2024 22:52:05 +0100") References: <20240128215205.3690716-1-fontaine.fabrice@gmail.com> Message-ID: <871q8vi9kr.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libnl is not needed to build frr since the addition of the package in > commit 26d82d006ba15777d19892b327bde343d82a9ff5 > No mention of libnl found in https://github.com/FRRouting/frr or > https://docs.frrouting.org/projects/dev-guide/en/latest/building.html > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:18:18 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:18:18 +0100 Subject: [Buildroot] [PATCH] package/sysstat: do not autodetect sa_lib_dir In-Reply-To: <87le7zt9qd.fsf@48ers.dk> (Peter Korsgaard's message of "Mon, 05 Feb 2024 12:46:02 +0100") References: <78273b30-5659-4cc0-91f8-23a8775fedf2@sord.co.jp> <87le7zt9qd.fsf@48ers.dk> Message-ID: <87wmqnguyt.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Atsushi" == Atsushi Nemoto writes: >> The configure script of sysstat package checks host's /usr/lib64 >> directory for default sa_lib_dir. >> Specify sa_lib_dir exclicitly to avoid host dependency. >> Signed-off-by: Atsushi Nemoto > Committed, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:20:13 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:20:13 +0100 Subject: [Buildroot] [git commit] package/libzenoh-pico: disable on or1k In-Reply-To: <20240205132229.6521F86C15@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Mon, 5 Feb 2024 14:22:21 +0100") References: <20240205132229.6521F86C15@busybox.osuosl.org> Message-ID: <87sf1bguvm.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=ead797bef768a7f3da7a76dd8510eef48181bb6a > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The upstream libzenoh-pico code uses asm("nop"), which is completely > bogus, and actually breaks build on or1k as the instruction does not > exist. > In upstream commit > https://github.com/eclipse-zenoh/zenoh-pico/commit/7d79a14addcea972e801709413f5c9a5226e3ad3 > they made the asm("nop") thing "configurable" with ZP_ASM_NOP, but > still that requires some special handling for or1k. The whole thing is > a complete mess, and upstream should have to use any of that. Rather > than stacking piles of bogus stuff on more bogus stuff, let's simply > disable this package for or1k for now. > Thanks a lot to Fabrice for all the investigation, and interaction > with upstream. See > https://patchwork.ozlabs.org/project/buildroot/patch/20240110215515.1263859-1-fontaine.fabrice at gmail.com/ > for example. > Fixes: > - http://autobuild.buildroot.org/results/fd0b2c666a1dc1537162d15b27743abd270243ed > Signed-off-by: Thomas Petazzoni Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:21:24 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:21:24 +0100 Subject: [Buildroot] [git commit] package/sysstat: update upstream location In-Reply-To: <20240205142727.38F9D86C99@busybox.osuosl.org> (Thomas Petazzoni via buildroot's message of "Mon, 5 Feb 2024 15:27:05 +0100") References: <20240205142727.38F9D86C99@busybox.osuosl.org> Message-ID: <87o7bzgutn.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > commit: https://git.buildroot.net/buildroot/commit/?id=35a2cb02277acae94f018a0d22138dc9de005fdf > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master > The http://pagesperso-orange.fr service being down, > http://pagesperso-orange.fr/sebastien.godard/ is no longer > accessible (or more precisely serves some HTML junk), meaning that we > currently cannot download the tarball of sysstat from the official > upstream location, and we always fallback to sources.buildroot.net. > This commit therefore updates to use the new upstream location on > github.io. The 12.6.1 release is available there, with the same hash, > so we can just point to the new upstream location. > Fixes: > ERROR: while checking hashes from package/sysstat//sysstat.hash > ERROR: sysstat-12.6.1.tar.xz has wrong sha1 hash: > ERROR: expected: a730982e0c2d4964a0022c1509f3ea0a345402bc > ERROR: got : d64a079729f2ff5b304294d68fbc041a46c4966d > ERROR: Incomplete download, or man-in-the-middle (MITM) attack > Signed-off-by: Thomas Petazzoni Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:22:46 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:22:46 +0100 Subject: [Buildroot] [PATCH buildroot] package/python-minimalmodbus: fix empty package In-Reply-To: <170712853287.18164.6368517214119629150-0@git.sr.ht> (bubu@git.sr.ht's message of "Thu, 21 Sep 2023 22:39:44 +0200") References: <170712853287.18164.6368517214119629150-0@git.sr.ht> Message-ID: <87jzmngurd.fsf@48ers.dk> >>>>> "~bubu" == ~bubu writes: > From: Marcus Hoffmann > Calling `setup.py` build builds and installs an empty package > after upstream changed their packaging. Calling setuptools via > `python -m build` builds the package correctly. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:23:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:23:55 +0100 Subject: [Buildroot] [PATCH] configs/imx8mpevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL In-Reply-To: <20240115105827.3179346-1-festevam@gmail.com> (Fabio Estevam's message of "Mon, 15 Jan 2024 07:58:27 -0300") References: <20240115105827.3179346-1-festevam@gmail.com> Message-ID: <87frxbgupg.fsf@48ers.dk> >>>>> "Fabio" == Fabio Estevam writes: > Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build > error: > include/image.h:1394:12: fatal error: openssl/evp.h: No such file or directory > 1394 | # include > Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180070 > Signed-off-by: Fabio Estevam Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:24:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:24:38 +0100 Subject: [Buildroot] [PATCH 1/1] package/domoticz: drop fmt dependency In-Reply-To: <20240116220258.1003073-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 16 Jan 2024 23:02:58 +0100") References: <20240116220258.1003073-1-fontaine.fabrice@gmail.com> Message-ID: <87bk7zguo9.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > fmt is not a dependency since bump to version 2022.1 in commit > adca60540f4fd271dda48b9a121986492700e73a and > https://github.com/domoticz/domoticz/commit/82043c4d5c79003792379be79b931eb85ab890c8 > https://github.com/domoticz/domoticz/commit/9e02d9a79c70c36db180d3242cbd03ff9b63e3cc > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:21:03 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:21:03 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/sysstat: update upstream location Message-ID: <20240229153304.CFFD087D71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=75faae5b6bcffa81d44a743d3ae8cea308be81b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The http://pagesperso-orange.fr service being down, http://pagesperso-orange.fr/sebastien.godard/ is no longer accessible (or more precisely serves some HTML junk), meaning that we currently cannot download the tarball of sysstat from the official upstream location, and we always fallback to sources.buildroot.net. This commit therefore updates to use the new upstream location on github.io. The 12.6.1 release is available there, with the same hash, so we can just point to the new upstream location. Fixes: ERROR: while checking hashes from package/sysstat//sysstat.hash ERROR: sysstat-12.6.1.tar.xz has wrong sha1 hash: ERROR: expected: a730982e0c2d4964a0022c1509f3ea0a345402bc ERROR: got : d64a079729f2ff5b304294d68fbc041a46c4966d ERROR: Incomplete download, or man-in-the-middle (MITM) attack Signed-off-by: Thomas Petazzoni (cherry picked from commit 35a2cb02277acae94f018a0d22138dc9de005fdf) Signed-off-by: Peter Korsgaard --- package/sysstat/Config.in | 2 +- package/sysstat/sysstat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in index 442b787684..efb640fd43 100644 --- a/package/sysstat/Config.in +++ b/package/sysstat/Config.in @@ -36,4 +36,4 @@ config BR2_PACKAGE_SYSSTAT * TTY device activity * Power management statistics - http://pagesperso-orange.fr/sebastien.godard/ + https://sysstat.github.io/ diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index ca05ec50d8..ec0c666157 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -6,7 +6,7 @@ SYSSTAT_VERSION = 12.6.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz -SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard +SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ From peter at korsgaard.com Thu Feb 29 15:27:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:27:08 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/leptonica: affected by gcc bug 101737 Message-ID: <20240229153304.EB28687D72@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9bea8aa5cc6456d911cfcf9f73add4b6b5839325 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x leptonica is affected by gcc bug 101737 resulting in the following build failure since at least bump to version 1.82.0 in commit 81a961c545cc9f240841b75d6c21f13b334bc274: sh4eb-buildroot-linux-gnu-gcc.br_real: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source (by using -freport-bug). See for instructions. Fixes: - http://autobuild.buildroot.org/results/f18979454399d9c728f9e017e4cc3a1b27458f5b - http://autobuild.buildroot.org/results/f3c803892175b3bb2ce68e3140c879b4a4d4b302 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 31b488337921d57c14893c34766ac22c53e5382b) Signed-off-by: Peter Korsgaard --- package/leptonica/leptonica.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 8791b0c4c2..569d2829c3 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -14,6 +14,10 @@ LEPTONICA_DEPENDENCIES = host-pkgconf LEPTONICA_CONF_OPTS += --disable-programs +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +LEPTONICA_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -O0" +endif + ifeq ($(BR2_PACKAGE_GIFLIB),y) LEPTONICA_DEPENDENCIES += giflib LEPTONICA_CONF_OPTS += --with-giflib From peter at korsgaard.com Thu Feb 29 15:17:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:17:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/frr: drop libnl dependency Message-ID: <20240229153304.A75D287D71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=02fa1029773d508a6b6ddb02d48b6477bf92136a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x libnl is not needed to build frr since the addition of the package in commit 26d82d006ba15777d19892b327bde343d82a9ff5 No mention of libnl found in https://github.com/FRRouting/frr or https://docs.frrouting.org/projects/dev-guide/en/latest/building.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit efa955ac415e2b50f63710e4fc1de8fd3e0dc099) Signed-off-by: Peter Korsgaard --- package/frr/Config.in | 1 - package/frr/frr.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/frr/Config.in b/package/frr/Config.in index c2e9577a27..f6c058e6df 100644 --- a/package/frr/Config.in +++ b/package/frr/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_FRR select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_LIBYANG - select BR2_PACKAGE_LIBNL select BR2_PACKAGE_READLINE select BR2_PACKAGE_JSON_C help diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 19f346fd7b..a4b4bccaf9 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -12,7 +12,7 @@ FRR_CPE_ID_VENDOR = linuxfoundation FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES -FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ +FRR_DEPENDENCIES = host-frr readline json-c libyang \ $(if $(BR2_PACKAGE_C_ARES),c-ares) HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 From peter at korsgaard.com Thu Feb 29 15:24:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:24:23 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/domoticz: drop fmt dependency Message-ID: <20240229153304.DD3C387D70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ccf4a64464790d211800fd17fb8bd6b392d14ea0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x fmt is not a dependency since bump to version 2022.1 in commit adca60540f4fd271dda48b9a121986492700e73a and https://github.com/domoticz/domoticz/commit/82043c4d5c79003792379be79b931eb85ab890c8 https://github.com/domoticz/domoticz/commit/9e02d9a79c70c36db180d3242cbd03ff9b63e3cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit dc3609c53f927289a9681f30ab283d190cb34e09) Signed-off-by: Peter Korsgaard --- package/domoticz/Config.in | 1 - package/domoticz/domoticz.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 85361eecf0..a0e69a7601 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -16,7 +16,6 @@ config BR2_PACKAGE_DOMOTICZ select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_CEREAL - select BR2_PACKAGE_FMT select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_MINIZIP_ZLIB diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 451021150b..4668ad8646 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -12,7 +12,6 @@ DOMOTICZ_CPE_ID_VENDOR = domoticz DOMOTICZ_DEPENDENCIES = \ boost \ cereal \ - fmt \ host-pkgconf \ jsoncpp \ libcurl \ @@ -36,7 +35,6 @@ DOMOTICZ_CONF_OPTS += \ # jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ - -DUSE_BUILTIN_LIBFMT=OFF \ -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF From peter at korsgaard.com Thu Feb 29 15:29:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:29:23 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/ngrep: fix build with libnet Message-ID: <20240229153305.0457D87D73@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=891a18201a2189c38a6e1ee12fb03680414d24bd branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Use pkg-config to find libnet and avoid the following build failure raised since commit 100ba8351c088fd764effdcaba848cfd92de79dd if libnet-config is found on the host: /home/autobuild/autobuild/instance-4/output-1/host/bin/mips64el-buildroot-linux-gnu-gcc -s -o ngrep ngrep.o tcpkill.o -lpcap -lnet -lpcre -L/usr/lib -lnet mips64el-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' While at it, format Upstream tag of other patches Fixes: - http://autobuild.buildroot.org/results/05c916162b9c1027cf53f1699a1f5653151098ed Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 14c0c37eaf0f91ef61a88b3085c15028f566a394) Signed-off-by: Peter Korsgaard --- ...in-configure-in-when-testing-for-use_pcre.patch | 3 +- ...002-Check-for-libnet_init-in-configure-in.patch | 3 +- package/ngrep/0003-fix-disable-tcpkill.patch | 2 +- ...onfigure.in-use-pkg-config-to-find-libnet.patch | 38 ++++++++++++++++++++++ package/ngrep/ngrep.mk | 2 +- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch index 69c5c887e8..c7f0dec360 100644 --- a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch +++ b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch @@ -4,8 +4,7 @@ Date: Mon, 1 Jan 2018 18:00:34 +0100 Subject: [PATCH] Fix typo in configure.in when testing for use_pcre Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe] +Upstream: https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch index 22b18ab7ee..7fa2e2f3bc 100644 --- a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch +++ b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch @@ -7,8 +7,7 @@ libnet_init_packet was the old libnet 1.0 function which is now long deprecated. Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5] +Upstream: https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0003-fix-disable-tcpkill.patch b/package/ngrep/0003-fix-disable-tcpkill.patch index 1264fd7e3b..894cd95b0f 100644 --- a/package/ngrep/0003-fix-disable-tcpkill.patch +++ b/package/ngrep/0003-fix-disable-tcpkill.patch @@ -9,7 +9,7 @@ found on the system. To fix this, move AC_CHECK_LIB to found libnet outside AC_ARG_ENABLE Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/jpr5/ngrep/pull/15] +Upstream: https://github.com/jpr5/ngrep/pull/15 --- configure.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch new file mode 100644 index 0000000000..71550da943 --- /dev/null +++ b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch @@ -0,0 +1,38 @@ +From 4788988827bf4c0d996d3e1e3b6ac52a23b97941 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 9 Jan 2024 21:15:47 +0100 +Subject: [PATCH] configure.in: use pkg-config to find libnet + +libnet-config is deprecated: +https://github.com/libnet/libnet/commit/1ec4a6e7d1d23811f0a14ecb51e46489a0175727 + +Signed-off-by: Fabrice Fontaine +Upstream: unsent (upstream seems dead, no commit since 5 years +--- + configure.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 7c3dd43..882ff86 100644 +--- a/configure.in ++++ b/configure.in +@@ -176,12 +176,14 @@ AC_ARG_ENABLE(tcpkill, + [ use_tcpkill="$enableval" ], + [ use_tcpkill="no" ]) + ++PKG_PROG_PKG_CONFIG + if test $use_tcpkill = yes; then + AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit) + USE_TCPKILL="1" + EXTRA_OBJS="$EXTRA_OBJS tcpkill.o" +- EXTRA_DEFINES="$EXTRA_DEFINES $(libnet-config --defines)" +- EXTRA_LIBS="$EXTRA_LIBS $(libnet-config --libs)" ++ PKG_CHECK_MODULES(LIBNET, libnet) ++ EXTRA_DEFINES="$EXTRA_DEFINES $LIBNET_CFLAGS" ++ EXTRA_LIBS="$EXTRA_LIBS $LIBNET_LIBS" + else + USE_TCPKILL="0" + fi +-- +2.43.0 + diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk index c4750f7504..dc69a34235 100644 --- a/package/ngrep/ngrep.mk +++ b/package/ngrep/ngrep.mk @@ -22,7 +22,7 @@ NGREP_CONF_OPTS = \ --disable-dropprivs \ --disable-pcap-restart -NGREP_DEPENDENCIES = libpcap pcre +NGREP_DEPENDENCIES = host-pkgconf libpcap pcre ifeq ($(BR2_PACKAGE_LIBNET),y) NGREP_DEPENDENCIES += libnet From peter at korsgaard.com Thu Feb 29 15:30:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:30:57 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/openssh: fix build error on powerpc Message-ID: <20240229153305.10E1C87D71@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=c4a0b4f3925ccf18fa93e3e2bbca7b0f38e221d4 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fixes the following error message introducted by OpenSSH v9.6p1. sshkey.c: In function 'sshkey_set_filename': sshkey.c:3705:1: sorry, unimplemented: '-fzero-call-used-regs' not supported on this target 3705 | } Fixes: http://autobuild.buildroot.org/results/ec7/ec780aed5b1c4fdf9b91f6e7be99e8d4c42efa58 Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 325fe1aecfd20d2653cce6bc189824c6fdfcafec) Signed-off-by: Peter Korsgaard --- ...-detection-of-broken-fzero-call-used-regs.patch | 57 ++++++++++++++++++++++ package/openssh/openssh.mk | 3 ++ 2 files changed, 60 insertions(+) diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch new file mode 100644 index 0000000000..5c056033a9 --- /dev/null +++ b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch @@ -0,0 +1,57 @@ +From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Fri, 22 Dec 2023 17:56:26 +1100 +Subject: [PATCH] better detection of broken -fzero-call-used-regs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gcc 13.2.0 on ppc64le refuses to compile some function, including +cipher.c:compression_alg_list() with an error: + +> sorry, unimplemented: argument ???used??? is not supportedcw +> for ???-fzero-call-used-regs??? on this target + +This extends the autoconf will-it-work test with a similarly- +structured function that seems to catch this. + +Spotted/tested by Colin Watson; bz3645 + +Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch +Signed-off-by: Brandon Maier +--- + m4/openssh.m4 | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 5d4c56280fc..033df501c3d 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,18 +20,24 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++const char *f3(int s) { ++ return s ? "good" : "gooder"; ++} + int main(int argc, char **argv) { +- (void)argv; + char b[256], *cp; ++ const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ (void)argv; + f(1); +- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ s = f3(f(2)); ++ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); +- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); ++ if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ec9e6613b0..ef530cc850 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,6 +13,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE +# 0001-better-detection-of-broken-fzero-call-used-regs.patch +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From peter at korsgaard.com Thu Feb 29 15:38:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:38:06 +0100 Subject: [Buildroot] [PATCH] host-python-numpy: correct implied host-lapack/host-blas dependency. In-Reply-To: (Yann E. MORIN's message of "Mon, 5 Feb 2024 19:04:30 +0100") References: <20240129204032.1980414-1-gsmecher@threespeedlogic.com> Message-ID: <87ttlrffhd.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Graeme, All, > On 2024-01-29 12:40 -0800, gsmecher at threespeedlogic.com spake thusly: >> From: Graeme Smecher >> >> Before this patch, host-python-numpy attempted (and failed) to detect >> OpenBLAS as follows: >> >> buildroot$ make >> >>> host-python-numpy 1.25.0 Configuring >> [...] >> Run-time dependency openblas found: NO (tried pkgconfig and cmake) >> WARNING: CMake Toolchain: Failed to determine CMake compilers state >> Run-time dependency openblas found: YES 0.3.21 >> Dependency openblas found: YES 0.3.21 (cached) >> Program _build_utils/process_src_template.py found: YES >> (/path/to/buildroot/output/host/bin/python3 >> /path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/process_src_template.py) >> Program _build_utils/tempita.py found: YES >> (/path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/tempita.py) >> >> output/build/host-python-numpy-1.25.0/numpy/meson.build:201:44: >> ERROR: Could not get cmake variable and no default provided for >> >> [...] > So I dug in the Numpy git history, and before we bumped to 1.25, it was > using distutils, which would only warn and disable BLAS support if not > found, but the meson switch made the default to fail. >> Two obvious ways to correct this: >> >> - Add some kind of host-lapack / host-openblas dependency to >> host-python-numpy, or >> - Tell host-python-numpy not to look for (or rely on) external code. >> >> Because the host numpy environment shouldn't be doing any numerical >> heavy lifting, we opt for the latter here. >> >> Signed-off-by: Graeme Smecher > Applied to master, with an extended commit log about the history, > thanks. Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:40:02 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:40:02 +0100 Subject: [Buildroot] [PATCH 1/2] package/wlroot: vulkan renderer depends on vulkan loader In-Reply-To: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> (Adam Duskett's message of "Sun, 21 Jan 2024 13:42:51 -0700") References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> Message-ID: <87plwfffe5.fsf@48ers.dk> >>>>> "Adam" == Adam Duskett writes: > Without the vulkan-loader package present, the configure step fails with the > following error message: > ``` > Run-time dependency vulkan found: NO (tried pkgconfig and system) > Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it. > ``` > The above error is due to the lack of the vulkan.pc file provided by the > vulkan-loader package. A search of autobuild failures containing > BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build > failures. However, the failure reasons happened before wlroots could compile. > One for gerbera-1.10.0 and another for host-rust-1.64.0. > Add a dependency on the vulkan-loader package to resolve the above issue. > Signed-off-by: Adam Duskett Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:40:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:40:23 +0100 Subject: [Buildroot] [PATCH 2/2] package/wlroots: Update patch with upstream status In-Reply-To: <20240121204252.152952-2-adam.duskett@amarulasolutions.com> (Adam Duskett's message of "Sun, 21 Jan 2024 13:42:52 -0700") References: <20240121204252.152952-1-adam.duskett@amarulasolutions.com> <20240121204252.152952-2-adam.duskett@amarulasolutions.com> Message-ID: <87le73ffdk.fsf@48ers.dk> >>>>> "Adam" == Adam Duskett writes: > package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been > rejected upstream, and the initial pull request was moved to the > freedesktop gitlab. Update the patch to reflect these changes. > Signed-off-by: Adam Duskett Committed to 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:41:35 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:41:35 +0100 Subject: [Buildroot] [PATCH 1/1] package/brltty: disable emacs and lua bindings In-Reply-To: <20240126172920.1628617-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Fri, 26 Jan 2024 18:29:20 +0100") References: <20240126172920.1628617-1-fontaine.fabrice@gmail.com> Message-ID: <87h6hrffbk.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Disable lua bindings to avoid the following build failure if host-lua > and lua are built before brltty raised since bump to version 6.5 in > commit 82c6e87d5eaaf5b32aa340ab384f88539238cbe1 and > https://github.com/brltty/brltty/commit/42bf48ca010d9163652cb0a014662fa243132736: > configure: lua package: lua > configure: lua includes: > configure: lua libs: > -L/home/autobuild/autobuild/instance-0/output-1/host/bin/../sparc64-buildroot-linux-gnu/sysroot/usr/lib > -llua -lm -ldl > checking for lua5.4... no > checking for lua... /home/autobuild/autobuild/instance-0/output-1/host/bin/lua > configure: Lua shell: /home/autobuild/autobuild/instance-0/output-1/host/bin/lua > configure: Lua library directory: /home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > [...] > /usr/bin/install -c -d > /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > /usr/bin/install -c -s --strip-program /bin/true brlapi.so > /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 > make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/brltty-6.6/Bindings/Lua' > [...] > brltty: installs files in /home/autobuild/autobuild/instance-0/output-1/target//home/autobuild/autobuild/instance-0/output-1 > While at it, disable emacs bindings which have also been added in > version 6.5 with > https://github.com/brltty/brltty/commit/64a487e29941df54796645229a872ecbe2a06bfe > Fixes: > - http://autobuild.buildroot.org/results/f424e6727bbe61ea4b7703e93aae6fcab7506898 > - http://autobuild.buildroot.org/results/bf4a161fc66fb99a24f08bea3436b13738f2e383 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:42:15 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:15 +0100 Subject: [Buildroot] [PATCH] package/pkg-utils: add missing licensing data to show-info In-Reply-To: <20240205223906.39e92f87@windsurf> (Thomas Petazzoni via buildroot's message of "Mon, 5 Feb 2024 22:39:06 +0100") References: <20240127163807.233065-1-yann.morin.1998@free.fr> <20240205223906.39e92f87@windsurf> Message-ID: <87cysfffag.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Sat, 27 Jan 2024 17:38:07 +0100 > "Yann E. MORIN" wrote: >> While the list of licenses is present in the show-info output, the list >> of license files and the redistributable status were missing. Add them. >> >> Signed-off-by: Yann E. MORIN >> --- >> package/pkg-utils.mk | 4 ++++ >> 1 file changed, 4 insertions(+) > Applied to master, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:43:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:43:01 +0100 Subject: [Buildroot] [PATCH 1/3] package/containerd: drop CONTAINERD_CPE_ID_VENDOR In-Reply-To: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 4 Feb 2024 14:35:55 +0100") References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> Message-ID: <878r33ff96.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 35af2bb8011ea57642777acf5613afa244d325d7 set > CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as > CONTAINERD_CPE_ID_PRODUCT will be set to the package name > (i.e. containerd) by default > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:43:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:43:05 +0100 Subject: [Buildroot] [PATCH 2/3] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT In-Reply-To: <20240204133557.1512951-2-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Sun, 4 Feb 2024 14:35:56 +0100") References: <20240204133557.1512951-1-fontaine.fabrice@gmail.com> <20240204133557.1512951-2-fontaine.fabrice@gmail.com> Message-ID: <874jdrff92.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set > LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as > LIBCURL_CPE_ID_PRODUCT will be set to the package name > (i.e. libcurl) by default > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:44:27 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:44:27 +0100 Subject: [Buildroot] [PATCH] package/sqlite: use SPDX identifier for license In-Reply-To: <87plxa8rhp.fsf@48ers.dk> (Peter Korsgaard's message of "Mon, 05 Feb 2024 23:40:18 +0100") References: <20240110165111.3937223-1-christian@klarinett.li> <87plxa8rhp.fsf@48ers.dk> Message-ID: <87zfvje0mc.fsf@48ers.dk> >>>>> "Peter" == Peter Korsgaard writes: >>>>> "Christian" == Christian Hitz via buildroot writes: >> From: Christian Hitz >> Signed-off-by: Christian Hitz > Committed, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:45:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:45:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/lua-http: set CPE variables In-Reply-To: <20240205204146.284303-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:41:46 +0100") References: <20240205204146.284303-1-fontaine.fabrice@gmail.com> Message-ID: <87v867e0la.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this > package: > https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:45:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:45:30 +0100 Subject: [Buildroot] [PATCH 1/1] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR In-Reply-To: <20240205201342.2995-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 5 Feb 2024 21:13:42 +0100") References: <20240205201342.2995-1-fontaine.fabrice@gmail.com> Message-ID: <87r0gve0kl.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:green_end:sftpserver has been deprecated in favor of > cpe:2.3:a:greenend:sftpserver in December 2022: > > Version > Product > > > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:27:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:27:23 +0100 Subject: [Buildroot] [PATCH 1/1] package/leptonica: affected by gcc bug 101737 In-Reply-To: <20240115211427.4291-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Mon, 15 Jan 2024 22:14:27 +0100") References: <20240115211427.4291-1-fontaine.fabrice@gmail.com> Message-ID: <877cingujo.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > leptonica is affected by gcc bug 101737 resulting in the following build > failure since at least bump to version 1.82.0 in commit > 81a961c545cc9f240841b75d6c21f13b334bc274: > sh4eb-buildroot-linux-gnu-gcc.br_real: internal compiler error: Segmentation fault signal terminated program cc1 > Please submit a full bug report, with preprocessed source (by using -freport-bug). > See for instructions. > Fixes: > - http://autobuild.buildroot.org/results/f18979454399d9c728f9e017e4cc3a1b27458f5b > - http://autobuild.buildroot.org/results/f3c803892175b3bb2ce68e3140c879b4a4d4b302 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:29:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:29:47 +0100 Subject: [Buildroot] [PATCH 1/1] package/ngrep: fix build with libnet In-Reply-To: <20240205184839.3f230f02@windsurf> (Thomas Petazzoni via buildroot's message of "Mon, 5 Feb 2024 18:48:39 +0100") References: <20240109211801.565524-1-fontaine.fabrice@gmail.com> <20240205184839.3f230f02@windsurf> Message-ID: <8734tbgufo.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Tue, 9 Jan 2024 22:18:01 +0100 > Fabrice Fontaine wrote: >> Use pkg-config to find libnet and avoid the following build failure >> raised since commit 100ba8351c088fd764effdcaba848cfd92de79dd if >> libnet-config is found on the host: >> >> /home/autobuild/autobuild/instance-4/output-1/host/bin/mips64el-buildroot-linux-gnu-gcc >> -s -o ngrep ngrep.o tcpkill.o -lpcap -lnet -lpcre -L/usr/lib -lnet >> mips64el-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' >> >> While at it, format Upstream tag of other patches >> >> Fixes: >> - http://autobuild.buildroot.org/results/05c916162b9c1027cf53f1699a1f5653151098ed >> >> Signed-off-by: Fabrice Fontaine >> --- >> .checkpackageignore | 3 -- >> ...nfigure-in-when-testing-for-use_pcre.patch | 3 +- >> ...heck-for-libnet_init-in-configure-in.patch | 3 +- >> package/ngrep/0003-fix-disable-tcpkill.patch | 2 +- >> ...ure.in-use-pkg-config-to-find-libnet.patch | 38 +++++++++++++++++++ >> package/ngrep/ngrep.mk | 2 +- >> 6 files changed, 42 insertions(+), 9 deletions(-) >> create mode 100644 package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch > Applied to master, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:31:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:31:06 +0100 Subject: [Buildroot] [PATCH 1/1] package/openssh: fix build error on powerpc In-Reply-To: <20240205185616.13fb5202@windsurf> (Thomas Petazzoni via buildroot's message of "Mon, 5 Feb 2024 18:56:16 +0100") References: <20240118222310.62234-1-brandon.maier@collins.com> <20240205185616.13fb5202@windsurf> Message-ID: <87y1b3fft1.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Thu, 18 Jan 2024 22:23:01 +0000 > Brandon Maier via buildroot wrote: >> Fixes the following error message introducted by OpenSSH v9.6p1. >> >> sshkey.c: In function 'sshkey_set_filename': >> sshkey.c:3705:1: sorry, unimplemented: '-fzero-call-used-regs' not supported on this target >> 3705 | } >> >> Fixes: >> http://autobuild.buildroot.org/results/ec7/ec780aed5b1c4fdf9b91f6e7be99e8d4c42efa58 >> >> Signed-off-by: Brandon Maier >> --- >> ...ction-of-broken-fzero-call-used-regs.patch | 57 +++++++++++++++++++ >> package/openssh/openssh.mk | 3 + >> 2 files changed, 60 insertions(+) >> create mode 100644 package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch > Applied to master, thanks. Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:18:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:18:10 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/sysstat: do not autodetect sa_lib_dir Message-ID: <20240229153159.C19EC87D11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5249686eb772a3db506c7540d33e1a075abb9e10 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The configure script of sysstat package checks host's /usr/lib64 directory for default sa_lib_dir. Specify sa_lib_dir exclicitly to avoid host dependency. Signed-off-by: Atsushi Nemoto Signed-off-by: Peter Korsgaard (cherry picked from commit eef5c297e765bb1414d6d6c629ce8e690c6370d4) Signed-off-by: Peter Korsgaard --- package/sysstat/sysstat.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 377396d986..ca05ec50d8 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -20,5 +20,7 @@ SYSSTAT_CONF_OPTS += --enable-sensors else SYSSTAT_CONF_OPTS += --disable-sensors endif +# do not look at host's /usr/lib64 +SYSSTAT_CONF_OPTS += sa_lib_dir=/usr/lib/sa $(eval $(autotools-package)) From peter at korsgaard.com Thu Feb 29 15:09:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:09:01 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/libressl: don't export arc4random Message-ID: <20240229153159.97B7787D42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d6fc939b85cd25dedec544edc050dce75815d4eb branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Don't export arc4random to fix the following libcurl build failure raised since bump of libcurl to version 8.5.0 in commit aaa9438b96f88b1ecbf5eb9a1aebef8010835b8d and https://github.com/curl/curl/commit/7925ba431b9a099daee1fa21d36c21887f787ad5: rand.c: In function 'randit': rand.c:146:26: error: implicit declaration of function 'arc4random'; did you mean 'srandom'? [-Werror=implicit-function-declaration] 146 | *rnd = (unsigned int)arc4random(); | ^~~~~~~~~~ | srandom cc1: some warnings being treated as errors Fixes: - http://autobuild.buildroot.org/results/8b7988629f1887be15c97b8c511d25443ba110d8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 7f1e3841f5c2da36e1833068ba948c52a58c07ae) Signed-off-by: Peter Korsgaard --- .../0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch | 133 +++++++++++++++++++++ ...Prefix-some-compat-symbols-with-libressl_.patch | 130 ++++++++++++++++++++ 2 files changed, 263 insertions(+) diff --git a/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch new file mode 100644 index 0000000000..411132ff20 --- /dev/null +++ b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch @@ -0,0 +1,133 @@ +From c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Mon, 11 Dec 2023 17:56:33 +0100 +Subject: [PATCH] Fix a few symbols in EXTRA_EXPORT + +I thought we stopped doing this, but that's for a separate thread. + +Upstream: https://github.com/libressl/portable/commit/c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd +Signed-off-by: Fabrice Fontaine +--- + crypto/CMakeLists.txt | 37 +++++++++++++++++++------------------ + 1 file changed, 19 insertions(+), 18 deletions(-) + +diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt +index 605647151..8046efe87 100644 +--- a/crypto/CMakeLists.txt ++++ b/crypto/CMakeLists.txt +@@ -767,13 +767,13 @@ endif() + + if(NOT HAVE_ASPRINTF) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/bsd-asprintf.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} asprintf) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} vasprintf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_asprintf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_vasprintf) + endif() + + if(NOT HAVE_FREEZERO) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/freezero.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} freezero) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_freezero) + endif() + + if(NOT HAVE_GETOPT) +@@ -799,46 +799,46 @@ endif() + + if(NOT HAVE_REALLOCARRAY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_reallocarray) + endif() + + if(NOT HAVE_RECALLOCARRAY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/recallocarray.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} recallocarray) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_recallocarray) + endif() + + if(NOT HAVE_STRCASECMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strcasecmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strcasecmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strcasecmp) + endif() + + if(NOT HAVE_STRLCAT) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcat.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcat) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcat) + endif() + + if(NOT HAVE_STRLCPY) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcpy.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcpy) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcpy) + endif() + + if(NOT HAVE_STRNDUP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strndup.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strndup) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strndup) + if(NOT HAVE_STRNLEN) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strnlen.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strnlen) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strnlen) + endif() + endif() + + if(NOT HAVE_STRSEP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strsep.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strsep) + endif() + + if(NOT HAVE_STRTONUM) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/strtonum.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} strtonum) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strtonum) + endif() + + if(NOT HAVE_SYSLOG_R) +@@ -857,15 +857,15 @@ if(NOT HAVE_EXPLICIT_BZERO) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) + set_source_files_properties(compat/explicit_bzero.c PROPERTIES COMPILE_FLAGS -O0) + endif() +- set(EXTRA_EXPORT ${EXTRA_EXPORT} explicit_bzero) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_explicit_bzero) + endif() + + if(NOT HAVE_ARC4RANDOM_BUF) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_buf) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_uniform) + + if(NOT HAVE_GETENTROPY) + if(WIN32) +@@ -891,12 +891,12 @@ endif() + + if(NOT HAVE_TIMINGSAFE_BCMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_bcmp) + endif() + + if(NOT HAVE_TIMINGSAFE_MEMCMP) + set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c) +- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_memcmp) ++ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_memcmp) + endif() + + if(NOT ENABLE_ASM) +@@ -919,6 +919,7 @@ foreach(SYM IN LISTS CRYPTO_UNEXPORT) + string(REPLACE "${SYM}\n" "" SYMS ${SYMS}) + endforeach() + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym ${SYMS}) ++# XXX should we still be doing this? + if(EXTRA_EXPORT) + list(SORT EXTRA_EXPORT) + foreach(SYM IN LISTS EXTRA_EXPORT) diff --git a/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch new file mode 100644 index 0000000000..42fbbe9069 --- /dev/null +++ b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch @@ -0,0 +1,130 @@ +From 0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Sat, 18 Nov 2023 10:53:09 +0100 +Subject: [PATCH] Prefix some compat symbols with libressl_ + +See #928. This isn't a full fix, but should remove much of the friction +already. + +Upstream: https://github.com/libressl/portable/pull/961/commits/0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 +Signed-off-by: Fabrice Fontaine +--- + include/compat/stdio.h | 2 ++ + include/compat/stdlib.h | 10 ++++++++++ + include/compat/string.h | 11 +++++++++++ + 3 files changed, 23 insertions(+) + +diff --git a/include/compat/stdio.h b/include/compat/stdio.h +index d5725c9ac9..4ddd63aee1 100644 +--- a/include/compat/stdio.h ++++ b/include/compat/stdio.h +@@ -20,7 +20,9 @@ + + #ifndef HAVE_ASPRINTF + #include ++#define vasprintf libressl_vasprintf + int vasprintf(char **str, const char *fmt, va_list ap); ++#define asprintf libressl_asprintf + int asprintf(char **str, const char *fmt, ...); + #endif + +diff --git a/include/compat/stdlib.h b/include/compat/stdlib.h +index 2eaea244c0..76dc07c35a 100644 +--- a/include/compat/stdlib.h ++++ b/include/compat/stdlib.h +@@ -20,26 +20,36 @@ + #include + + #ifndef HAVE_ARC4RANDOM_BUF ++#define arc4random libressl_arc4random + uint32_t arc4random(void); ++#define arc4random_buf libressl_arc4random_buf + void arc4random_buf(void *_buf, size_t n); ++#define arc4random_uniform libressl_arc4random_uniform + uint32_t arc4random_uniform(uint32_t upper_bound); + #endif + + #ifndef HAVE_FREEZERO ++#define freezero libressl_freezero + void freezero(void *ptr, size_t sz); + #endif + + #ifndef HAVE_GETPROGNAME ++#define getprogname libressl_getprogname + const char * getprogname(void); + #endif + ++#ifndef HAVE_REALLOCARRAY ++#define reallocarray libressl_reallocarray + void *reallocarray(void *, size_t, size_t); ++#endif + + #ifndef HAVE_RECALLOCARRAY ++#define recallocarray libressl_recallocarray + void *recallocarray(void *, size_t, size_t, size_t); + #endif + + #ifndef HAVE_STRTONUM ++#define strtonum libressl_strtonum + long long strtonum(const char *nptr, long long minval, + long long maxval, const char **errstr); + #endif +diff --git a/include/compat/string.h b/include/compat/string.h +index 4bf7519b5b..6a82793f62 100644 +--- a/include/compat/string.h ++++ b/include/compat/string.h +@@ -27,43 +27,54 @@ + #endif + + #ifndef HAVE_STRCASECMP ++#define strcasecmp libressl_strcasecmp + int strcasecmp(const char *s1, const char *s2); ++#define strncasecmp libressl_strncasecmp + int strncasecmp(const char *s1, const char *s2, size_t len); + #endif + + #ifndef HAVE_STRLCPY ++#define strlcpy libressl_strlcpy + size_t strlcpy(char *dst, const char *src, size_t siz); + #endif + + #ifndef HAVE_STRLCAT ++#define strlcat libressl_strlcat + size_t strlcat(char *dst, const char *src, size_t siz); + #endif + + #ifndef HAVE_STRNDUP ++#define strndup libressl_strndup + char * strndup(const char *str, size_t maxlen); + /* the only user of strnlen is strndup, so only build it if needed */ + #ifndef HAVE_STRNLEN ++#define strnlen libressl_strnlen + size_t strnlen(const char *str, size_t maxlen); + #endif + #endif + + #ifndef HAVE_STRSEP ++#define strsep libressl_strsep + char *strsep(char **stringp, const char *delim); + #endif + + #ifndef HAVE_EXPLICIT_BZERO ++#define explicit_bzero libressl_explicit_bzero + void explicit_bzero(void *, size_t); + #endif + + #ifndef HAVE_TIMINGSAFE_BCMP ++#define timingsafe_bcmp libressl_timingsafe_bcmp + int timingsafe_bcmp(const void *b1, const void *b2, size_t n); + #endif + + #ifndef HAVE_TIMINGSAFE_MEMCMP ++#define timingsafe_memcmp libressl_timingsafe_memcmp + int timingsafe_memcmp(const void *b1, const void *b2, size_t len); + #endif + + #ifndef HAVE_MEMMEM ++#define memmem libressl_memmem + void * memmem(const void *big, size_t big_len, const void *little, + size_t little_len); + #endif From peter at korsgaard.com Thu Feb 29 15:14:56 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:14:56 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/rdma-core: fix mips4 build Message-ID: <20240229153159.A545D87D45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=68b48580592bd520ed218bdab196c8ce889bcdfa branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The 'sync' instruction for MIPS was defined in MIPS-II as taking no operands. MIPS32 extended the define of 'sync' as taking an optional unsigned 5 bit immediate. As a result, replace "sync 0" by "sync" to fix the following build failure on mips4 raised since the addition of the package in commit ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 and https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: /tmp/ccrBy9fV.s: Assembler messages: /tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' Fixes: - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 - http://autobuild.buildroot.org/results/2df58f9b98aacf00960932f53510b29199393461 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7e5a90f1b75e59aa5707394f3c707fbbf03204b7) Signed-off-by: Peter Korsgaard --- .../0001-util-udma_barrier.h-fix-mips4-build.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch new file mode 100644 index 0000000000..6dfb476faa --- /dev/null +++ b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch @@ -0,0 +1,56 @@ +From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jan 2024 18:55:34 +0100 +Subject: [PATCH] util/udma_barrier.h: fix mips4 build + +The 'sync' instruction for MIPS was defined in MIPS-II as taking no +operands. MIPS32 extended the define of 'sync' as taking an optional +unsigned 5 bit immediate. + +As a result, replace "sync 0" by "sync" to fix the following build +failure on mips4 raised since version 43.0 and +https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: + +/tmp/ccrBy9fV.s: Assembler messages: +/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' + +Fixes: + - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 +--- + util/udma_barrier.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/util/udma_barrier.h b/util/udma_barrier.h +index 0a1f8a45b..3793d2f18 100644 +--- a/util/udma_barrier.h ++++ b/util/udma_barrier.h +@@ -101,7 +101,7 @@ + #elif defined(__riscv) + #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") + #elif defined(__mips__) +-#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_to_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -139,7 +139,7 @@ + #elif defined(__riscv) + #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") + #elif defined(__mips__) +-#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_from_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -212,7 +212,7 @@ + #include "s390_mmio_insn.h" + #define mmio_flush_writes() s390_pciwb() + #elif defined(__mips__) +-#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") ++#define mmio_flush_writes() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif From peter at korsgaard.com Thu Feb 29 15:19:58 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:19:58 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/libzenoh-pico: disable on or1k Message-ID: <20240229153159.CECC987D42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=610a82f7a079bfac19cc637166b05802e00c42d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The upstream libzenoh-pico code uses asm("nop"), which is completely bogus, and actually breaks build on or1k as the instruction does not exist. In upstream commit https://github.com/eclipse-zenoh/zenoh-pico/commit/7d79a14addcea972e801709413f5c9a5226e3ad3 they made the asm("nop") thing "configurable" with ZP_ASM_NOP, but still that requires some special handling for or1k. The whole thing is a complete mess, and upstream should have to use any of that. Rather than stacking piles of bogus stuff on more bogus stuff, let's simply disable this package for or1k for now. Thanks a lot to Fabrice for all the investigation, and interaction with upstream. See https://patchwork.ozlabs.org/project/buildroot/patch/20240110215515.1263859-1-fontaine.fabrice at gmail.com/ for example. Fixes: - http://autobuild.buildroot.org/results/fd0b2c666a1dc1537162d15b27743abd270243ed Signed-off-by: Thomas Petazzoni (cherry picked from commit ead797bef768a7f3da7a76dd8510eef48181bb6a) Signed-off-by: Peter Korsgaard --- package/libzenoh-pico/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libzenoh-pico/Config.in b/package/libzenoh-pico/Config.in index 5f7e91c9f6..9dbb260c52 100644 --- a/package/libzenoh-pico/Config.in +++ b/package/libzenoh-pico/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_LIBZENOH_PICO bool "libzenoh-pico" + # upstream hardcodes using asm("nop"), which is bogus and + # doesn't work on or1k + depends on !BR2_or1k depends on BR2_TOOLCHAIN_HAS_THREADS help zenoh-pico is the Eclipse zenoh implementation that targets @@ -11,4 +14,5 @@ config BR2_PACKAGE_LIBZENOH_PICO https://github.com/eclipse-zenoh/zenoh-pico comment "libzenoh-pico needs a toolchain w/ threads" + depends on !BR2_or1k depends on !BR2_TOOLCHAIN_HAS_THREADS From peter at korsgaard.com Thu Feb 29 15:17:07 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:17:07 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/frr: drop libnl dependency Message-ID: <20240229153159.B57E787790@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=d69475afc96f8524d9a087437fbb09a0080a9bc0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x libnl is not needed to build frr since the addition of the package in commit 26d82d006ba15777d19892b327bde343d82a9ff5 No mention of libnl found in https://github.com/FRRouting/frr or https://docs.frrouting.org/projects/dev-guide/en/latest/building.html Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit efa955ac415e2b50f63710e4fc1de8fd3e0dc099) Signed-off-by: Peter Korsgaard --- package/frr/Config.in | 1 - package/frr/frr.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/frr/Config.in b/package/frr/Config.in index c2e9577a27..f6c058e6df 100644 --- a/package/frr/Config.in +++ b/package/frr/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_FRR select BR2_PACKAGE_BASH select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_LIBYANG - select BR2_PACKAGE_LIBNL select BR2_PACKAGE_READLINE select BR2_PACKAGE_JSON_C help diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 19f346fd7b..a4b4bccaf9 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -12,7 +12,7 @@ FRR_CPE_ID_VENDOR = linuxfoundation FRR_CPE_ID_PRODUCT = free_range_routing FRR_AUTORECONF = YES -FRR_DEPENDENCIES = host-frr readline json-c libyang libnl \ +FRR_DEPENDENCIES = host-frr readline json-c libyang \ $(if $(BR2_PACKAGE_C_ARES),c-ares) HOST_FRR_DEPENDENCIES = host-flex host-bison host-elfutils host-python3 From peter at korsgaard.com Thu Feb 29 15:21:57 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:21:57 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-minimalmodbus: fix empty package Message-ID: <20240229153159.E762987790@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8a8a5622720899c08be4d29dccefcb1e72988e45 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Calling `setup.py` build builds and installs an empty package after upstream changed their packaging. Calling setuptools via `python -m build` builds the package correctly. Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN (cherry picked from commit d7e45215a4faaef8d6eb993b38d5a70ad7d309b1) Signed-off-by: Peter Korsgaard --- package/python-minimalmodbus/python-minimalmodbus.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk index 5a6e7733be..cb8a0d8cc9 100644 --- a/package/python-minimalmodbus/python-minimalmodbus.mk +++ b/package/python-minimalmodbus/python-minimalmodbus.mk @@ -7,7 +7,8 @@ PYTHON_MINIMALMODBUS_VERSION = 2.1.1 PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/37/fc/8a58f7bcdece751f16a4a9aac780acd1288aa8ac6adbffdd764c88fb71c6 -PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools +PYTHON_MINIMALMODBUS_DEPENDENCIES = host-python-setuptools +PYTHON_MINIMALMODBUS_SETUP_TYPE = pep517 PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE From peter at korsgaard.com Thu Feb 29 15:29:36 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:29:36 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/ngrep: fix build with libnet Message-ID: <20240229153200.2520D87D45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=63bf07c42614b085c95916d045f75a4623ad8f3e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Use pkg-config to find libnet and avoid the following build failure raised since commit 100ba8351c088fd764effdcaba848cfd92de79dd if libnet-config is found on the host: /home/autobuild/autobuild/instance-4/output-1/host/bin/mips64el-buildroot-linux-gnu-gcc -s -o ngrep ngrep.o tcpkill.o -lpcap -lnet -lpcre -L/usr/lib -lnet mips64el-buildroot-linux-gnu-gcc: ERROR: unsafe header/library path used in cross-compilation: '-L/usr/lib' While at it, format Upstream tag of other patches Fixes: - http://autobuild.buildroot.org/results/05c916162b9c1027cf53f1699a1f5653151098ed Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 14c0c37eaf0f91ef61a88b3085c15028f566a394) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 -- ...in-configure-in-when-testing-for-use_pcre.patch | 3 +- ...002-Check-for-libnet_init-in-configure-in.patch | 3 +- package/ngrep/0003-fix-disable-tcpkill.patch | 2 +- ...onfigure.in-use-pkg-config-to-find-libnet.patch | 38 ++++++++++++++++++++++ package/ngrep/ngrep.mk | 2 +- 6 files changed, 42 insertions(+), 9 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 47074570f8..94b24b2545 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -929,9 +929,6 @@ package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch Up package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch Upstream package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch Upstream package/nginx/S50nginx Indent Variables -package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch Upstream -package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch Upstream -package/ngrep/0003-fix-disable-tcpkill.patch Upstream package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch Upstream package/nmap/0001-libdnet-wrapper-configure.patch Upstream package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch Upstream diff --git a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch index 69c5c887e8..c7f0dec360 100644 --- a/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch +++ b/package/ngrep/0001-Fix-typo-in-configure-in-when-testing-for-use_pcre.patch @@ -4,8 +4,7 @@ Date: Mon, 1 Jan 2018 18:00:34 +0100 Subject: [PATCH] Fix typo in configure.in when testing for use_pcre Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe] +Upstream: https://github.com/jpr5/ngrep/commit/b8b1e9751e1d074af0dd77c2554c1b25fd8f7abe --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch index 22b18ab7ee..7fa2e2f3bc 100644 --- a/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch +++ b/package/ngrep/0002-Check-for-libnet_init-in-configure-in.patch @@ -7,8 +7,7 @@ libnet_init_packet was the old libnet 1.0 function which is now long deprecated. Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5] +Upstream: https://github.com/jpr5/ngrep/commit/0a51c8bc62c7b49b8d67a360daa6b1957256f4f5 --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ngrep/0003-fix-disable-tcpkill.patch b/package/ngrep/0003-fix-disable-tcpkill.patch index 1264fd7e3b..894cd95b0f 100644 --- a/package/ngrep/0003-fix-disable-tcpkill.patch +++ b/package/ngrep/0003-fix-disable-tcpkill.patch @@ -9,7 +9,7 @@ found on the system. To fix this, move AC_CHECK_LIB to found libnet outside AC_ARG_ENABLE Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/jpr5/ngrep/pull/15] +Upstream: https://github.com/jpr5/ngrep/pull/15 --- configure.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch new file mode 100644 index 0000000000..71550da943 --- /dev/null +++ b/package/ngrep/0004-configure.in-use-pkg-config-to-find-libnet.patch @@ -0,0 +1,38 @@ +From 4788988827bf4c0d996d3e1e3b6ac52a23b97941 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 9 Jan 2024 21:15:47 +0100 +Subject: [PATCH] configure.in: use pkg-config to find libnet + +libnet-config is deprecated: +https://github.com/libnet/libnet/commit/1ec4a6e7d1d23811f0a14ecb51e46489a0175727 + +Signed-off-by: Fabrice Fontaine +Upstream: unsent (upstream seems dead, no commit since 5 years +--- + configure.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index 7c3dd43..882ff86 100644 +--- a/configure.in ++++ b/configure.in +@@ -176,12 +176,14 @@ AC_ARG_ENABLE(tcpkill, + [ use_tcpkill="$enableval" ], + [ use_tcpkill="no" ]) + ++PKG_PROG_PKG_CONFIG + if test $use_tcpkill = yes; then + AC_CHECK_LIB(net, libnet_init,,echo !!! error: tcpkill feature enabled but no libnet found; exit) + USE_TCPKILL="1" + EXTRA_OBJS="$EXTRA_OBJS tcpkill.o" +- EXTRA_DEFINES="$EXTRA_DEFINES $(libnet-config --defines)" +- EXTRA_LIBS="$EXTRA_LIBS $(libnet-config --libs)" ++ PKG_CHECK_MODULES(LIBNET, libnet) ++ EXTRA_DEFINES="$EXTRA_DEFINES $LIBNET_CFLAGS" ++ EXTRA_LIBS="$EXTRA_LIBS $LIBNET_LIBS" + else + USE_TCPKILL="0" + fi +-- +2.43.0 + diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk index c4750f7504..dc69a34235 100644 --- a/package/ngrep/ngrep.mk +++ b/package/ngrep/ngrep.mk @@ -22,7 +22,7 @@ NGREP_CONF_OPTS = \ --disable-dropprivs \ --disable-pcap-restart -NGREP_DEPENDENCIES = libpcap pcre +NGREP_DEPENDENCIES = host-pkgconf libpcap pcre ifeq ($(BR2_PACKAGE_LIBNET),y) NGREP_DEPENDENCIES += libnet From peter at korsgaard.com Thu Feb 29 15:21:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:21:14 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/sysstat: update upstream location Message-ID: <20240229153159.DAD6487D45@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=09898aeaab7276aa2317d8e416416eccc8c3080c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The http://pagesperso-orange.fr service being down, http://pagesperso-orange.fr/sebastien.godard/ is no longer accessible (or more precisely serves some HTML junk), meaning that we currently cannot download the tarball of sysstat from the official upstream location, and we always fallback to sources.buildroot.net. This commit therefore updates to use the new upstream location on github.io. The 12.6.1 release is available there, with the same hash, so we can just point to the new upstream location. Fixes: ERROR: while checking hashes from package/sysstat//sysstat.hash ERROR: sysstat-12.6.1.tar.xz has wrong sha1 hash: ERROR: expected: a730982e0c2d4964a0022c1509f3ea0a345402bc ERROR: got : d64a079729f2ff5b304294d68fbc041a46c4966d ERROR: Incomplete download, or man-in-the-middle (MITM) attack Signed-off-by: Thomas Petazzoni (cherry picked from commit 35a2cb02277acae94f018a0d22138dc9de005fdf) Signed-off-by: Peter Korsgaard --- package/sysstat/Config.in | 2 +- package/sysstat/sysstat.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in index 442b787684..efb640fd43 100644 --- a/package/sysstat/Config.in +++ b/package/sysstat/Config.in @@ -36,4 +36,4 @@ config BR2_PACKAGE_SYSSTAT * TTY device activity * Power management statistics - http://pagesperso-orange.fr/sebastien.godard/ + https://sysstat.github.io/ diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index ca05ec50d8..ec0c666157 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -6,7 +6,7 @@ SYSSTAT_VERSION = 12.6.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz -SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard +SYSSTAT_SITE = https://sysstat.github.io/sysstat-packages SYSSTAT_CONF_OPTS = --disable-file-attr SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES) SYSSTAT_LICENSE = GPL-2.0+ From peter at korsgaard.com Thu Feb 29 15:24:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:24:31 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/domoticz: drop fmt dependency Message-ID: <20240229153200.0B7D787D42@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56075f2f3d9327f0d9c1530ae48ea1a4ba85dfdc branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x fmt is not a dependency since bump to version 2022.1 in commit adca60540f4fd271dda48b9a121986492700e73a and https://github.com/domoticz/domoticz/commit/82043c4d5c79003792379be79b931eb85ab890c8 https://github.com/domoticz/domoticz/commit/9e02d9a79c70c36db180d3242cbd03ff9b63e3cc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit dc3609c53f927289a9681f30ab283d190cb34e09) Signed-off-by: Peter Korsgaard --- package/domoticz/Config.in | 1 - package/domoticz/domoticz.mk | 2 -- 2 files changed, 3 deletions(-) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 85361eecf0..a0e69a7601 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -16,7 +16,6 @@ config BR2_PACKAGE_DOMOTICZ select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_CEREAL - select BR2_PACKAGE_FMT select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_MINIZIP_ZLIB diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 3fbff5f4d8..03776e3040 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -12,7 +12,6 @@ DOMOTICZ_CPE_ID_VENDOR = domoticz DOMOTICZ_DEPENDENCIES = \ boost \ cereal \ - fmt \ host-pkgconf \ jsoncpp \ libcurl \ @@ -36,7 +35,6 @@ DOMOTICZ_CONF_OPTS += \ # jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ - -DUSE_BUILTIN_LIBFMT=OFF \ -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF From peter at korsgaard.com Thu Feb 29 15:23:39 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:23:39 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] configs/imx8mpevk: select BR2_TARGET_UBOOT_NEEDS_OPENSSL Message-ID: <20240229153159.F2EDE87D11@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=608bd4d0ccdac416d84927f1fb064c42b5b518f7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Select BR2_TARGET_UBOOT_NEEDS_OPENSSL to fix the following build error: include/image.h:1394:12: fatal error: openssl/evp.h: No such file or directory 1394 | # include Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/5858180070 Signed-off-by: Fabio Estevam Tested-By: S??bastien Szymanski Signed-off-by: Yann E. MORIN (cherry picked from commit bce4fe6d1bc8a71918e3d862ebf85d342bf535b0) Signed-off-by: Peter Korsgaard --- configs/freescale_imx8mpevk_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 82ed68c5a9..2aed048482 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -29,6 +29,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.1 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 +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y From peter at korsgaard.com Thu Feb 29 15:30:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:30:44 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/openssh: fix build error on powerpc Message-ID: <20240229153200.340B980162@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e5ad7256596a5459d0ce558144dff4792a06eb8e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fixes the following error message introducted by OpenSSH v9.6p1. sshkey.c: In function 'sshkey_set_filename': sshkey.c:3705:1: sorry, unimplemented: '-fzero-call-used-regs' not supported on this target 3705 | } Fixes: http://autobuild.buildroot.org/results/ec7/ec780aed5b1c4fdf9b91f6e7be99e8d4c42efa58 Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 325fe1aecfd20d2653cce6bc189824c6fdfcafec) Signed-off-by: Peter Korsgaard --- ...-detection-of-broken-fzero-call-used-regs.patch | 57 ++++++++++++++++++++++ package/openssh/openssh.mk | 3 ++ 2 files changed, 60 insertions(+) diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch new file mode 100644 index 0000000000..5c056033a9 --- /dev/null +++ b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch @@ -0,0 +1,57 @@ +From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 +From: Damien Miller +Date: Fri, 22 Dec 2023 17:56:26 +1100 +Subject: [PATCH] better detection of broken -fzero-call-used-regs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gcc 13.2.0 on ppc64le refuses to compile some function, including +cipher.c:compression_alg_list() with an error: + +> sorry, unimplemented: argument ???used??? is not supportedcw +> for ???-fzero-call-used-regs??? on this target + +This extends the autoconf will-it-work test with a similarly- +structured function that seems to catch this. + +Spotted/tested by Colin Watson; bz3645 + +Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch +Signed-off-by: Brandon Maier +--- + m4/openssh.m4 | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 5d4c56280fc..033df501c3d 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -20,18 +20,24 @@ char *f2(char *s, ...) { + va_end(args); + return strdup(ret); + } ++const char *f3(int s) { ++ return s ? "good" : "gooder"; ++} + int main(int argc, char **argv) { +- (void)argv; + char b[256], *cp; ++ const char *s; + /* Some math to catch -ftrapv problems in the toolchain */ + int i = 123 * argc, j = 456 + argc, k = 789 - argc; + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ (void)argv; + f(1); +- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ s = f3(f(2)); ++ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); + if (write(1, b, 0) == -1) exit(0); +- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); ++ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); ++ if (write(1, cp, 0) == -1) exit(0); + free(cp); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ec9e6613b0..ef530cc850 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,6 +13,9 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE +# 0001-better-detection-of-broken-fzero-call-used-regs.patch +OPENSSH_AUTORECONF = YES + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From peter at korsgaard.com Thu Feb 29 15:26:47 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:26:47 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/leptonica: affected by gcc bug 101737 Message-ID: <20240229153200.16F7B87790@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=49df708cde6598602cc4a7828c2ccbbef78825f1 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x leptonica is affected by gcc bug 101737 resulting in the following build failure since at least bump to version 1.82.0 in commit 81a961c545cc9f240841b75d6c21f13b334bc274: sh4eb-buildroot-linux-gnu-gcc.br_real: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source (by using -freport-bug). See for instructions. Fixes: - http://autobuild.buildroot.org/results/f18979454399d9c728f9e017e4cc3a1b27458f5b - http://autobuild.buildroot.org/results/f3c803892175b3bb2ce68e3140c879b4a4d4b302 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 31b488337921d57c14893c34766ac22c53e5382b) Signed-off-by: Peter Korsgaard --- package/leptonica/leptonica.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 8791b0c4c2..569d2829c3 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -14,6 +14,10 @@ LEPTONICA_DEPENDENCIES = host-pkgconf LEPTONICA_CONF_OPTS += --disable-programs +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +LEPTONICA_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -O0" +endif + ifeq ($(BR2_PACKAGE_GIFLIB),y) LEPTONICA_DEPENDENCIES += giflib LEPTONICA_CONF_OPTS += --with-giflib From peter at korsgaard.com Thu Feb 29 15:18:04 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:18:04 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/sysstat: do not autodetect sa_lib_dir Message-ID: <20240229153304.BC86B87D70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f807faa33250aae48b883404d5adf52fd4bc96e5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The configure script of sysstat package checks host's /usr/lib64 directory for default sa_lib_dir. Specify sa_lib_dir exclicitly to avoid host dependency. Signed-off-by: Atsushi Nemoto Signed-off-by: Peter Korsgaard (cherry picked from commit eef5c297e765bb1414d6d6c629ce8e690c6370d4) Signed-off-by: Peter Korsgaard --- package/sysstat/sysstat.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 377396d986..ca05ec50d8 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -20,5 +20,7 @@ SYSSTAT_CONF_OPTS += --enable-sensors else SYSSTAT_CONF_OPTS += --disable-sensors endif +# do not look at host's /usr/lib64 +SYSSTAT_CONF_OPTS += sa_lib_dir=/usr/lib/sa $(eval $(autotools-package)) From peter at korsgaard.com Thu Feb 29 15:15:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:15:23 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/rdma-core: fix mips4 build Message-ID: <20240229153304.93E5687D70@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5d06ac104a38c55426ed0a04a95d82c94cfc5a41 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The 'sync' instruction for MIPS was defined in MIPS-II as taking no operands. MIPS32 extended the define of 'sync' as taking an optional unsigned 5 bit immediate. As a result, replace "sync 0" by "sync" to fix the following build failure on mips4 raised since the addition of the package in commit ea47e177f093d7378e8e8e1f50d6f4e3fce0a088 and https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: /tmp/ccrBy9fV.s: Assembler messages: /tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' Fixes: - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 - http://autobuild.buildroot.org/results/2df58f9b98aacf00960932f53510b29199393461 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 7e5a90f1b75e59aa5707394f3c707fbbf03204b7) Signed-off-by: Peter Korsgaard --- .../0001-util-udma_barrier.h-fix-mips4-build.patch | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch new file mode 100644 index 0000000000..6dfb476faa --- /dev/null +++ b/package/rdma-core/0001-util-udma_barrier.h-fix-mips4-build.patch @@ -0,0 +1,56 @@ +From 1b1ca539f6e1f0b774e989f1022477686e4fc77f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Jan 2024 18:55:34 +0100 +Subject: [PATCH] util/udma_barrier.h: fix mips4 build + +The 'sync' instruction for MIPS was defined in MIPS-II as taking no +operands. MIPS32 extended the define of 'sync' as taking an optional +unsigned 5 bit immediate. + +As a result, replace "sync 0" by "sync" to fix the following build +failure on mips4 raised since version 43.0 and +https://github.com/linux-rdma/rdma-core/commit/b7c428344ea96d446f6ffe31c620a238a7f25c9e: + +/tmp/ccrBy9fV.s: Assembler messages: +/tmp/ccrBy9fV.s:994: Error: invalid operands `sync 0' + +Fixes: + - http://autobuild.buildroot.org/results/2ab22a3ec4287fc15ff6a90d8715b4897b32a933 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linux-rdma/rdma-core/commit/f3f0c06014c6de845032e6fe9f152674919b3ec6 +--- + util/udma_barrier.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/util/udma_barrier.h b/util/udma_barrier.h +index 0a1f8a45b..3793d2f18 100644 +--- a/util/udma_barrier.h ++++ b/util/udma_barrier.h +@@ -101,7 +101,7 @@ + #elif defined(__riscv) + #define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") + #elif defined(__mips__) +-#define udma_to_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_to_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -139,7 +139,7 @@ + #elif defined(__riscv) + #define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") + #elif defined(__mips__) +-#define udma_from_device_barrier() asm volatile("sync 0" ::: "memory") ++#define udma_from_device_barrier() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif +@@ -212,7 +212,7 @@ + #include "s390_mmio_insn.h" + #define mmio_flush_writes() s390_pciwb() + #elif defined(__mips__) +-#define mmio_flush_writes() asm volatile("sync 0" ::: "memory") ++#define mmio_flush_writes() asm volatile("sync" ::: "memory") + #else + #error No architecture specific memory barrier defines found! + #endif From peter at korsgaard.com Thu Feb 29 15:46:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:46:54 +0100 Subject: [Buildroot] [PATCH] docs/manual: extend makedev syntax section In-Reply-To: <20240206115300.0bd8b584@windsurf> (Thomas Petazzoni via buildroot's message of "Tue, 6 Feb 2024 11:53:00 +0100") References: <20240206115300.0bd8b584@windsurf> Message-ID: <87msrje0i9.fsf@48ers.dk> >>>>> "Thomas" == Thomas Petazzoni via buildroot writes: > On Thu, 18 Jan 2024 17:08:50 +0100 > wrote: >> From: "Yann E. MORIN" >> >> The section of the manual describing the makedev syntax is not >> up-to-date with the current features, and does not properly describe >> existing ones. >> >> - extend the list of types with the requirements on the existence of >> the target file or directory; for 'c', 'b', and 'p', the existence >> requirement is inherited from mknod(2): >> >> ERRORS >> ... >> ENOENT A directory component in pathname does not exist or is a >> dangling symbolic link. >> >> for the other types, the existence requirements are extracted from >> the source of makedev.c; >> >> - format the types fags, so they are rendered in monospace; >> >> - extend the 'mode' description, as it can be set to -1 for 'f', 'd', >> or 'r', so that only the uid and gid are set. This is most useful >> for 'r', where setting the same mode recursively for all the >> sub-directories and files alike does not really make sense; indeed >> in this case, the modes are usually set correctly when the package >> (or rootfs overlay) installs the files, and only the uid and gid are >> interesting to set; >> >> - extend and update the examples to show-case the -1 mode use-case. >> >> Signed-off-by: Yann E. MORIN >> --- >> docs/manual/makedev-syntax.adoc | 33 +++++++++++++++++++-------------- >> 1 file changed, 19 insertions(+), 14 deletions(-) > Applied to master (with the typo in the commit log fixed), thanks! Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 15:42:49 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:49 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT Message-ID: <20240229154802.9D63387DAE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=e35929fd1e19692010c8fa80824c065a86cc6ac5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as LIBCURL_CPE_ID_PRODUCT will be set to the package name (i.e. libcurl) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant (cherry picked from commit 61295f5ced0749db34095bfbe8b34ed86a692828) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 3ecc587a52..83845b8e87 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') From peter at korsgaard.com Thu Feb 29 15:42:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:05 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/pkg-utils: add missing licensing data to show-info Message-ID: <20240229154802.865E587DAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ebaca432f126843eea35ea578437f179f9394851 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x While the list of licenses is present in the show-info output, the list of license files and the redistributable status were missing. Add them. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 5647d5c1900bde13cedd36efd09404ea5763c0fb) Signed-off-by: Peter Korsgaard --- package/pkg-utils.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 059e86ae0a..723bbe4e24 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -157,6 +157,10 @@ endef define _json-info-pkg-details "version": $(call mk-json-str,$($(1)_DL_VERSION)), "licenses": $(call mk-json-str,$($(1)_LICENSE)), + "license_files": [ + $(foreach f, $($(1)_LICENSE_FILES),$(call mk-json-str,$(f))$(comma)) + ], + "redistributable": $(if $(filter NO,$($(1)_REDISTRIBUTE)),false,true), "dl_dir": $(call mk-json-str,$($(1)_DL_SUBDIR)), "downloads": [ $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), From peter at korsgaard.com Thu Feb 29 15:44:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:44:55 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/lua-http: set CPE variables Message-ID: <20240229154802.BE55987DAE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=13b9d086cd7e04b2382c052535cfcb42dd6ceda0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0ccf4048e43b022feba225b976e55ed3e503d424) Signed-off-by: Peter Korsgaard --- package/lua-http/lua-http.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index 7fbb09038e..df3e2c0059 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -10,5 +10,7 @@ LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_LICENSE = MIT LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md +LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) +LUA_HTTP_CPE_ID_VENDOR = daurnimator $(eval $(luarocks-package)) From peter at korsgaard.com Thu Feb 29 15:40:17 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:40:17 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/wlroots: update patch with upstream status Message-ID: <20240229154802.7142C87DAE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=56a3517ba139380cd611c40ca1bd498dbae8f260 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch has been rejected upstream, and the initial pull request was moved to the freedesktop gitlab. Update the patch to reflect these changes. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 840849afff07f91668f88570c5055eaf6687deb2) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 94b24b2545..44ba7494d4 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1440,7 +1440,6 @@ package/wilc-driver/0005-Fix-cast-warnings.patch Upstream package/wipe/0001-musl.patch Upstream package/wireless_tools/0001-remove-bzero.patch Upstream package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patch Upstream -package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch Upstream package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch Upstream package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch Upstream package/wpa_supplicant/ifupdown.sh Shellcheck diff --git a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch b/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch index 0ba078708a..0e1ae9d87a 100644 --- a/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch +++ b/package/wlroots/0001-Add-feature-macros-to-more-C-files-.patch @@ -5,8 +5,10 @@ Subject: [PATCH] Add feature macros to more C files These source files use "struct timespec", which is POSIX 1993.09. -Signed-off-by: Paul Cercueil +Upstream: Rejected (Upstream does not want these workarounds) +see: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2493 +Signed-off-by: Paul Cercueil [Retrieved from: https://github.com/swaywm/wlroots/pull/2493] Signed-off-by: Fabrice Fontaine --- From peter at korsgaard.com Thu Feb 29 15:41:06 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:41:06 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/brltty: disable emacs and lua bindings Message-ID: <20240229154802.7AC9D87DAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=8e47248d3817440f3ce06265d096b7d9f4e94158 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Disable lua bindings to avoid the following build failure if host-lua and lua are built before brltty raised since bump to version 6.5 in commit 82c6e87d5eaaf5b32aa340ab384f88539238cbe1 and https://github.com/brltty/brltty/commit/42bf48ca010d9163652cb0a014662fa243132736: configure: lua package: lua configure: lua includes: configure: lua libs: -L/home/autobuild/autobuild/instance-0/output-1/host/bin/../sparc64-buildroot-linux-gnu/sysroot/usr/lib -llua -lm -ldl checking for lua5.4... no checking for lua... /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua shell: /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua library directory: /home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 [...] /usr/bin/install -c -d /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 /usr/bin/install -c -s --strip-program /bin/true brlapi.so /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/brltty-6.6/Bindings/Lua' [...] brltty: installs files in /home/autobuild/autobuild/instance-0/output-1/target//home/autobuild/autobuild/instance-0/output-1 While at it, disable emacs bindings which have also been added in version 6.5 with https://github.com/brltty/brltty/commit/64a487e29941df54796645229a872ecbe2a06bfe Fixes: - http://autobuild.buildroot.org/results/f424e6727bbe61ea4b7703e93aae6fcab7506898 - http://autobuild.buildroot.org/results/bf4a161fc66fb99a24f08bea3436b13738f2e383 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 19f06441e8b616159d45a552beac6e1fe05bc42a) Signed-off-by: Peter Korsgaard --- package/brltty/brltty.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index f00a18cc6f..22d58ebd00 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -23,8 +23,10 @@ BRLTTY_CONF_ENV = \ PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf BRLTTY_CONF_OPTS = \ + --disable-emacs-bindings \ --disable-java-bindings \ --disable-lisp-bindings \ + --disable-lua-bindings \ --disable-ocaml-bindings \ --disable-python-bindings \ --disable-tcl-bindings \ From peter at korsgaard.com Thu Feb 29 15:37:45 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:37:45 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] host-python-numpy: correct implied host-lapack/host-blas dependency. Message-ID: <20240229154802.5588A87DAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0412998ea51527982cc2e938f4efefcccb7d9663 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Before commit ca63464e3777 (package/python-numpy: bump to version 1.25.0), numpy was using python distuils. Then, the default for BLAS and LAPACK detection was to disable support if they were not found, even when OPENBLAS is installed on the host system. Commit ca63464e3777 switched python-numpy to use the meson-package infrastructure, where the default has changed, and now fails when the host system does have OPENBLAS installed: buildroot$ make >>> host-python-numpy 1.25.0 Configuring [...] Run-time dependency openblas found: NO (tried pkgconfig and cmake) WARNING: CMake Toolchain: Failed to determine CMake compilers state Run-time dependency openblas found: YES 0.3.21 Dependency openblas found: YES 0.3.21 (cached) Program _build_utils/process_src_template.py found: YES (/path/to/buildroot/output/host/bin/python3 /path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/process_src_template.py) Program _build_utils/tempita.py found: YES (/path/to/buildroot/output/build/host-python-numpy-1.25.0/numpy/_build_utils/tempita.py) output/build/host-python-numpy-1.25.0/numpy/meson.build:201:44: ERROR: Could not get cmake variable and no default provided for [...] Two obvious ways to correct this: - Add some kind of host-lapack / host-openblas dependency to host-python-numpy, or - Tell host-python-numpy not to look for (or rely on) external code. Because the host numpy environment shouldn't be doing any numerical heavy lifting, we opt for the latter here. Signed-off-by: Graeme Smecher [yann.morin.1998 at free.fr: - explain why the issue was not found before ] Signed-off-by: Yann E. MORIN (cherry picked from commit f6c33f3e89f7f26e5b7613a757c82c9efc62654a) Signed-off-by: Peter Korsgaard --- package/python-numpy/python-numpy.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 383135f9fe..200fac20a1 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -38,6 +38,10 @@ else PYTHON_NUMPY_CONF_OPTS += -Dblas="" endif +# Rather than add a host-blas or host-lapack dependencies, just use unoptimized, +# in-tree code. +HOST_PYTHON_NUMPY_CONF_OPTS = -Dblas="" -Dlapack="" + # Fixup the npymath.ini prefix path with actual target staging area where # numpy core was built. Without this, target builds using numpy distutils # extensions like python-scipy, python-numba cannot find -lnpymath since From peter at korsgaard.com Thu Feb 29 15:43:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:43:38 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/sqlite: use SPDX identifier for license Message-ID: <20240229154802.A97B187DAC@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5debf1ba6883d1dd931e61000ce24631d459d147 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The SPDX identifier for the sqlite license is "blessing": https://spdx.org/licenses/blessing.html Signed-off-by: Christian Hitz Signed-off-by: Peter Korsgaard (cherry picked from commit ddd257ca23e6bcf60676bcd292035fe99e6cbf62) Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index f69097f3b7..9c2070ecdc 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -8,7 +8,7 @@ SQLITE_VERSION = 3.43.1 SQLITE_TAR_VERSION = 3430100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2023 -SQLITE_LICENSE = Public domain +SQLITE_LICENSE = blessing SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite SQLITE_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 29 15:42:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:30 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/containerd: drop CONTAINERD_CPE_ID_VENDOR Message-ID: <20240229154802.9251F87DB0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0a908e31303703e9fb782b7f3cd241cf02728501 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Commit 35af2bb8011ea57642777acf5613afa244d325d7 set CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as CONTAINERD_CPE_ID_PRODUCT will be set to the package name (i.e. containerd) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant (cherry picked from commit 6ed73df9ee774e007432fbf9b6c19b22233f2bfd) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 61a8472ddd..d3ca102797 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd From peter at korsgaard.com Thu Feb 29 15:44:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:44:48 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR Message-ID: <20240229154802.B3BD387DAF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=dbf74002deaad62ea5b4b3b699c27089d354c002 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:green_end:sftpserver has been deprecated in favor of cpe:2.3:a:greenend:sftpserver in December 2022: Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4adc8b3d24708f180bcbf68df1d0723dc058f68e) Signed-off-by: Peter Korsgaard --- package/gesftpserver/gesftpserver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 5a3ab0536c..5a7106d707 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -12,7 +12,7 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors -GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_VENDOR = greenend GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling From peter at korsgaard.com Thu Feb 29 15:46:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:46:44 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] docs/manual: extend makedev syntax section Message-ID: <20240229154802.C758287DAD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=a9c5e028edb648de8a9ce355d93973dd6c95fbd7 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x The section of the manual describing the makedev syntax is not up-to-date with the current features, and does not properly describe existing ones. - extend the list of types with the requirements on the existence of the target file or directory; for 'c', 'b', and 'p', the existence requirement is inherited from mknod(2): ERRORS ... ENOENT A directory component in pathname does not exist or is a dangling symbolic link. for the other types, the existence requirements are extracted from the source of makedev.c; - format the types flags, so they are rendered in monospace; - extend the 'mode' description, as it can be set to -1 for 'f', 'd', or 'r', so that only the uid and gid are set. This is most useful for 'r', where setting the same mode recursively for all the sub-directories and files alike does not really make sense; indeed in this case, the modes are usually set correctly when the package (or rootfs overlay) installs the files, and only the uid and gid are interesting to set; - extend and update the examples to show-case the -1 mode use-case. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 738fb6dfa48b19f39e4a8df38ac9dcc0b37e0aa4) Signed-off-by: Peter Korsgaard --- docs/manual/makedev-syntax.adoc | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/docs/manual/makedev-syntax.adoc b/docs/manual/makedev-syntax.adoc index d6efb31d42..e63c9233eb 100644 --- a/docs/manual/makedev-syntax.adoc +++ b/docs/manual/makedev-syntax.adoc @@ -22,14 +22,19 @@ There are a few non-trivial blocks: - +name+ is the path to the file you want to create/modify - +type+ is the type of the file, being one of: - * f: a regular file - * d: a directory - * r: a directory recursively - * c: a character device file - * b: a block device file - * p: a named pipe + * `f`: a regular file, which must already exist + * `F`: a regular file, which is ignored and not created if missing + * `d`: a directory, which is created, as well as its parents, if missing + * `r`: a directory recursively, which must already exist + * `c`: a character device file, which parent directory must exist + * `b`: a block device file, which parent directory must exist + * `p`: a named pipe, which parent directory must exist - +mode+ are the usual permissions settings (only numerical values - are allowed) + are allowed); + for type `d`, the mode of existing parents is not changed, but the mode + of created parents is set; + for types `f`, `F`, and `r`, +mode+ can also be set to +-1+ to not + change the mode (and only change uid and gid) - +uid+ and +gid+ are the UID and GID to set on this file; can be either numerical values or actual names - +major+ and +minor+ are here for device files, set to +-+ for other @@ -38,22 +43,22 @@ There are a few non-trivial blocks: of files, and can be reduced to a loop, beginning at +start+, incrementing its counter by +inc+ until it reaches +count+ -Let's say you want to change the permissions of a given file; using -this syntax, you will need to write: +Let's say you want to change the ownership and permissions of a given +file; using this syntax, you will need to write: ---- /usr/bin/foo f 755 0 0 - - - - - /usr/bin/bar f 755 root root - - - - - /data/buz f 644 buz-user buz-group - - - - - +/data/baz f -1 baz-user baz-group - - - - - ---- -Alternatively, if you want to change owner/permission of a directory -recursively, you can write (to set UID to foo, GID to bar and access -rights to rwxr-x--- for the directory /usr/share/myapp and all files -and directories below it): +Alternatively, if you want to change owner of a directory recursively, +you can write (to set UID to `foo` and GID to `bar` for the directory +`/usr/share/myapp` and all files and directories below it): ---- -/usr/share/myapp r 750 foo bar - - - - - +/usr/share/myapp r -1 foo bar - - - - - ---- On the other hand, if you want to create the device file +/dev/hda+ From peter at korsgaard.com Thu Feb 29 15:39:31 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:39:31 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/wlroots: vulkan renderer depends on vulkan loader Message-ID: <20240229154802.63BB787D41@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=489015b033db39133a82610d723a1980ba6593af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Without the vulkan-loader package present, the configure step fails with the following error message: ``` Run-time dependency vulkan found: NO (tried pkgconfig and system) Message: Install "vulkan" or pass "-Dvulkan=disabled" to disable it. ``` The above error is due to the lack of the vulkan.pc file provided by the vulkan-loader package. A search of autobuild failures containing BR2_PACKAGE_WLROOTS=y and BR2_PACKAGE_MESA3D_VULKAN_DRIVER=y shows two build failures. However, the failure reasons happened before wlroots could compile. One for gerbera-1.10.0 and another for host-rust-1.64.0. Add a dependency on the vulkan-loader package to resolve the above issue. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit f27b0322a5019c4016d2800ccc1b586eb6af7bd5) Signed-off-by: Peter Korsgaard --- package/wlroots/wlroots.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index bb5c8f497d..fdd2fb8250 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -41,9 +41,9 @@ else WLROOTS_CONF_OPTS += -Dxwayland=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y) +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER)$(BR2_PACKAGE_VULKAN_LOADER),yy) WLROOTS_RENDERERS += vulkan -WLROOTS_DEPENDENCIES += mesa3d +WLROOTS_DEPENDENCIES += mesa3d vulkan-loader endif WLROOTS_CONF_OPTS += \ From peter at korsgaard.com Thu Feb 29 15:42:41 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:41 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/libcurl: drop LIBCURL_CPE_ID_PRODUCT Message-ID: <20240229155011.3EE8187DD0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=326b77d6dfb2f8dd771796a18ded886e22b40d6e branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit 4b6202f721f2f5ab36153ba44de65286f7811ef9 set LIBCURL_CPE_ID_PRODUCT to libcurl but this is not needed as LIBCURL_CPE_ID_PRODUCT will be set to the package name (i.e. libcurl) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant (cherry picked from commit 61295f5ced0749db34095bfbe8b34ed86a692828) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 9ef8586bb2..0bac8656b8 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -13,7 +13,6 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') From peter at korsgaard.com Thu Feb 29 15:41:23 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:41:23 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/brltty: disable emacs and lua bindings Message-ID: <20240229155011.05BD287DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=34b7f3ab9acd18b94d9f830c785d710f728154c2 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Disable lua bindings to avoid the following build failure if host-lua and lua are built before brltty raised since bump to version 6.5 in commit 82c6e87d5eaaf5b32aa340ab384f88539238cbe1 and https://github.com/brltty/brltty/commit/42bf48ca010d9163652cb0a014662fa243132736: configure: lua package: lua configure: lua includes: configure: lua libs: -L/home/autobuild/autobuild/instance-0/output-1/host/bin/../sparc64-buildroot-linux-gnu/sysroot/usr/lib -llua -lm -ldl checking for lua5.4... no checking for lua... /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua shell: /home/autobuild/autobuild/instance-0/output-1/host/bin/lua configure: Lua library directory: /home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 [...] /usr/bin/install -c -d /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 /usr/bin/install -c -s --strip-program /bin/true brlapi.so /home/autobuild/autobuild/instance-0/output-1/target/home/autobuild/autobuild/instance-0/output-1/host/lib/lua/5.3 make[3]: Leaving directory '/home/autobuild/autobuild/instance-0/output-1/build/brltty-6.6/Bindings/Lua' [...] brltty: installs files in /home/autobuild/autobuild/instance-0/output-1/target//home/autobuild/autobuild/instance-0/output-1 While at it, disable emacs bindings which have also been added in version 6.5 with https://github.com/brltty/brltty/commit/64a487e29941df54796645229a872ecbe2a06bfe Fixes: - http://autobuild.buildroot.org/results/f424e6727bbe61ea4b7703e93aae6fcab7506898 - http://autobuild.buildroot.org/results/bf4a161fc66fb99a24f08bea3436b13738f2e383 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 19f06441e8b616159d45a552beac6e1fe05bc42a) Signed-off-by: Peter Korsgaard --- package/brltty/brltty.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index dc5a38cddb..4cab635b0c 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -23,8 +23,10 @@ BRLTTY_CONF_ENV = \ PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf BRLTTY_CONF_OPTS = \ + --disable-emacs-bindings \ --disable-java-bindings \ --disable-lisp-bindings \ + --disable-lua-bindings \ --disable-ocaml-bindings \ --disable-python-bindings \ --disable-tcl-bindings \ From peter at korsgaard.com Thu Feb 29 15:41:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:41:55 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/pkg-utils: add missing licensing data to show-info Message-ID: <20240229155011.1891A87DCF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=62279f8592cfc4d67771e3df2b5e0c8e1a5b37f9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x While the list of licenses is present in the show-info output, the list of license files and the redistributable status were missing. Add them. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 5647d5c1900bde13cedd36efd09404ea5763c0fb) Signed-off-by: Peter Korsgaard --- package/pkg-utils.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 059e86ae0a..723bbe4e24 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -157,6 +157,10 @@ endef define _json-info-pkg-details "version": $(call mk-json-str,$($(1)_DL_VERSION)), "licenses": $(call mk-json-str,$($(1)_LICENSE)), + "license_files": [ + $(foreach f, $($(1)_LICENSE_FILES),$(call mk-json-str,$(f))$(comma)) + ], + "redistributable": $(if $(filter NO,$($(1)_REDISTRIBUTE)),false,true), "dl_dir": $(call mk-json-str,$($(1)_DL_SUBDIR)), "downloads": [ $(foreach dl,$(sort $($(1)_ALL_DOWNLOADS)), From peter at korsgaard.com Thu Feb 29 15:44:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:44:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/sqlite: use SPDX identifier for license Message-ID: <20240229155011.516BF87DCF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=7081e827b213db3db9ea39c1e6714a854d02920b branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The SPDX identifier for the sqlite license is "blessing": https://spdx.org/licenses/blessing.html Signed-off-by: Christian Hitz Signed-off-by: Peter Korsgaard (cherry picked from commit ddd257ca23e6bcf60676bcd292035fe99e6cbf62) Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index 789eddfa0a..3e35959120 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -8,7 +8,7 @@ SQLITE_VERSION = 3.40.1 SQLITE_TAR_VERSION = 3400100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 -SQLITE_LICENSE = Public domain +SQLITE_LICENSE = blessing SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite SQLITE_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 29 15:42:37 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:42:37 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/containerd: drop CONTAINERD_CPE_ID_VENDOR Message-ID: <20240229155011.2ABC787DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=98b4832b4417dd3eb3e2d20625c19fba0b34ccf9 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Commit 35af2bb8011ea57642777acf5613afa244d325d7 set CONTAINERD_CPE_ID_PRODUCT to containerd but this is not needed as CONTAINERD_CPE_ID_PRODUCT will be set to the package name (i.e. containerd) by default Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN Reviewed-by: Antoine Coutant (cherry picked from commit 6ed73df9ee774e007432fbf9b6c19b22233f2bfd) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index c4a6d854c3..68213c60be 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -9,7 +9,6 @@ CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE CONTAINERD_CPE_ID_VENDOR = linuxfoundation -CONTAINERD_CPE_ID_PRODUCT = containerd CONTAINERD_GOMOD = github.com/containerd/containerd From peter at korsgaard.com Thu Feb 29 15:44:44 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:44:44 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/gesftpserver: update GESFTPSERVER_CPE_ID_VENDOR Message-ID: <20240229155011.63FA187DD3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=67b29df77cd2d7f07d3e41dfba12dc12b283b556 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:green_end:sftpserver has been deprecated in favor of cpe:2.3:a:greenend:sftpserver in December 2022: Version Product Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 4adc8b3d24708f180bcbf68df1d0723dc058f68e) Signed-off-by: Peter Korsgaard --- package/gesftpserver/gesftpserver.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 5a3ab0536c..5a7106d707 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -12,7 +12,7 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors -GESFTPSERVER_CPE_ID_VENDOR = green_end +GESFTPSERVER_CPE_ID_VENDOR = greenend GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling From peter at korsgaard.com Thu Feb 29 15:45:19 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:45:19 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/lua-http: set CPE variables Message-ID: <20240229155011.7942C7FD96@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=f2426d4094ddcc1acb7c95786f0441e9b8c7fd51 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:daurnimator:lua-http is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/F210C8BC-78BB-4D10-BAB7-AC624543764E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 0ccf4048e43b022feba225b976e55ed3e503d424) Signed-off-by: Peter Korsgaard --- package/lua-http/lua-http.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/lua-http/lua-http.mk b/package/lua-http/lua-http.mk index 7fbb09038e..df3e2c0059 100644 --- a/package/lua-http/lua-http.mk +++ b/package/lua-http/lua-http.mk @@ -10,5 +10,7 @@ LUA_HTTP_NAME_UPSTREAM = http LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM) LUA_HTTP_LICENSE = MIT LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md +LUA_HTTP_CPE_ID_VERSION = $(LUA_HTTP_VERSION_UPSTREAM) +LUA_HTTP_CPE_ID_VENDOR = daurnimator $(eval $(luarocks-package)) From peter at korsgaard.com Thu Feb 29 15:46:38 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 16:46:38 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] docs/manual: extend makedev syntax section Message-ID: <20240229155011.9124587DCE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=eada744ed0e993fc32e25823b102c684ede74464 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x The section of the manual describing the makedev syntax is not up-to-date with the current features, and does not properly describe existing ones. - extend the list of types with the requirements on the existence of the target file or directory; for 'c', 'b', and 'p', the existence requirement is inherited from mknod(2): ERRORS ... ENOENT A directory component in pathname does not exist or is a dangling symbolic link. for the other types, the existence requirements are extracted from the source of makedev.c; - format the types flags, so they are rendered in monospace; - extend the 'mode' description, as it can be set to -1 for 'f', 'd', or 'r', so that only the uid and gid are set. This is most useful for 'r', where setting the same mode recursively for all the sub-directories and files alike does not really make sense; indeed in this case, the modes are usually set correctly when the package (or rootfs overlay) installs the files, and only the uid and gid are interesting to set; - extend and update the examples to show-case the -1 mode use-case. Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni (cherry picked from commit 738fb6dfa48b19f39e4a8df38ac9dcc0b37e0aa4) Signed-off-by: Peter Korsgaard --- docs/manual/makedev-syntax.txt | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/docs/manual/makedev-syntax.txt b/docs/manual/makedev-syntax.txt index d6efb31d42..e63c9233eb 100644 --- a/docs/manual/makedev-syntax.txt +++ b/docs/manual/makedev-syntax.txt @@ -22,14 +22,19 @@ There are a few non-trivial blocks: - +name+ is the path to the file you want to create/modify - +type+ is the type of the file, being one of: - * f: a regular file - * d: a directory - * r: a directory recursively - * c: a character device file - * b: a block device file - * p: a named pipe + * `f`: a regular file, which must already exist + * `F`: a regular file, which is ignored and not created if missing + * `d`: a directory, which is created, as well as its parents, if missing + * `r`: a directory recursively, which must already exist + * `c`: a character device file, which parent directory must exist + * `b`: a block device file, which parent directory must exist + * `p`: a named pipe, which parent directory must exist - +mode+ are the usual permissions settings (only numerical values - are allowed) + are allowed); + for type `d`, the mode of existing parents is not changed, but the mode + of created parents is set; + for types `f`, `F`, and `r`, +mode+ can also be set to +-1+ to not + change the mode (and only change uid and gid) - +uid+ and +gid+ are the UID and GID to set on this file; can be either numerical values or actual names - +major+ and +minor+ are here for device files, set to +-+ for other @@ -38,22 +43,22 @@ There are a few non-trivial blocks: of files, and can be reduced to a loop, beginning at +start+, incrementing its counter by +inc+ until it reaches +count+ -Let's say you want to change the permissions of a given file; using -this syntax, you will need to write: +Let's say you want to change the ownership and permissions of a given +file; using this syntax, you will need to write: ---- /usr/bin/foo f 755 0 0 - - - - - /usr/bin/bar f 755 root root - - - - - /data/buz f 644 buz-user buz-group - - - - - +/data/baz f -1 baz-user baz-group - - - - - ---- -Alternatively, if you want to change owner/permission of a directory -recursively, you can write (to set UID to foo, GID to bar and access -rights to rwxr-x--- for the directory /usr/share/myapp and all files -and directories below it): +Alternatively, if you want to change owner of a directory recursively, +you can write (to set UID to `foo` and GID to `bar` for the directory +`/usr/share/myapp` and all files and directories below it): ---- -/usr/share/myapp r 750 foo bar - - - - - +/usr/share/myapp r -1 foo bar - - - - - ---- On the other hand, if you want to create the device file +/dev/hda+ From peter at korsgaard.com Thu Feb 29 16:05:14 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:05:14 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: fix running on older python versions In-Reply-To: <20240228224459.2383336-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 28 Feb 2024 23:44:59 +0100") References: <20240228224459.2383336-1-yann.morin.1998@free.fr> Message-ID: <87il27dznp.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Commit f71d9f49e546 (support/scripts/pkg-stats: fix datetime deprecation > warning) forgot to consider that the datetime.UTC suggested by python > 3.12, was only introduced with python 3.11. > However, we are still generating the daily report on a python 3.8 > version, which fails at runtime: > AttributeError: module 'datetime' has no attribute 'UTC' > It turns out that datetime.UTC is just an alias for datetime.timezone.utc, > which seems to have existed since before python3... > Use datetime.timezone.utc instead of its alias. > Signed-off-by: Yann E. MORIN Committed, thanks. > --- > support/scripts/pkg-stats | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index 9a4a3ccad5..53898a36f2 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -1290,7 +1290,7 @@ def __main__(): > package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) > else: > package_list = None > - date = datetime.datetime.now(datetime.UTC) > + date = datetime.datetime.now(datetime.timezone.utc) > commit = subprocess.check_output(['git', '-C', brpath, > 'rev-parse', > 'HEAD']).splitlines()[0].decode() > -- > 2.43.2 > _______________________________________________ > buildroot mailing list > buildroot at buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 16:05:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:05:29 +0100 Subject: [Buildroot] [PATCH] support/scripts/pkg-stats: fix running on older python versions In-Reply-To: <20240228224459.2383336-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Wed, 28 Feb 2024 23:44:59 +0100") References: <20240228224459.2383336-1-yann.morin.1998@free.fr> Message-ID: <87h6hrdzna.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Commit f71d9f49e546 (support/scripts/pkg-stats: fix datetime deprecation > warning) forgot to consider that the datetime.UTC suggested by python > 3.12, was only introduced with python 3.11. > However, we are still generating the daily report on a python 3.8 > version, which fails at runtime: > AttributeError: module 'datetime' has no attribute 'UTC' > It turns out that datetime.UTC is just an alias for datetime.timezone.utc, > which seems to have existed since before python3... > Use datetime.timezone.utc instead of its alias. > Signed-off-by: Yann E. MORIN Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 16:06:08 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:06:08 +0100 Subject: [Buildroot] [PATCH] package/ccache: disable building tests In-Reply-To: <20240228200216.715455-1-buildroot@bubu1.eu> (Marcus Hoffmann via buildroot's message of "Wed, 28 Feb 2024 21:02:16 +0100") References: <20240228200216.715455-1-buildroot@bubu1.eu> Message-ID: <87cysfdzm7.fsf@48ers.dk> >>>>> "Marcus" == Marcus Hoffmann via buildroot writes: > Signed-off-by: Marcus Hoffmann Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 16:07:55 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:07:55 +0100 Subject: [Buildroot] [PATCH 1/1] package/libheif: fix libjpeg build In-Reply-To: <20240228174721.1141838-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 28 Feb 2024 18:47:21 +0100") References: <20240228174721.1141838-1-fontaine.fabrice@gmail.com> Message-ID: <878r33dzj8.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > libheif raises the following build failure with libjpeg since bump to > version 1.17.5 in commit 5714126edac88e3adc043a482b262b319a907dd3 and > https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 > /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: > In function 'heif_error jpeg_encode_image(void*, const heif_image*, > heif_image_input_class)': > /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: > error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka > 'unsigned int*'} [-fpermissive] > 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); > | ^~~~~~~~~~ > | | > | long unsigned int* > Fixes: > - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 > Signed-off-by: Fabrice Fontaine Committed, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 16:05:59 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:05:59 +0100 Subject: [Buildroot] [git commit] package/ccache: disable building tests Message-ID: <20240229160814.86DDC87DDF@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aa443e82513d6f094ecf89f97d34f877c49c8167 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/ccache/ccache.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index ac4bc4aba5..96b1b65c5c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -16,7 +16,8 @@ HOST_CCACHE_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER \ -DZSTD_FROM_INTERNET=OFF \ - -DHIREDIS_FROM_INTERNET=OFF + -DHIREDIS_FROM_INTERNET=OFF \ + -DENABLE_TESTING=OFF # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR From peter at korsgaard.com Thu Feb 29 16:04:29 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:04:29 +0100 Subject: [Buildroot] [git commit] support/scripts/pkg-stats: fix running on older python versions Message-ID: <20240229160814.7BF7187DDE@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=4983f9e73e17c162b85fa4ed55fc5ff13d491130 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit f71d9f49e546 (support/scripts/pkg-stats: fix datetime deprecation warning) forgot to consider that the datetime.UTC suggested by python 3.12, was only introduced with python 3.11. However, we are still generating the daily report on a python 3.8 version, which fails at runtime: AttributeError: module 'datetime' has no attribute 'UTC' It turns out that datetime.UTC is just an alias for datetime.timezone.utc, which seems to have existed since before python3... Use datetime.timezone.utc instead of its alias. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9a4a3ccad5..53898a36f2 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1290,7 +1290,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.now(datetime.UTC) + date = datetime.datetime.now(datetime.timezone.utc) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() From peter at korsgaard.com Thu Feb 29 16:07:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 17:07:16 +0100 Subject: [Buildroot] [git commit] package/libheif: fix libjpeg build Message-ID: <20240229160814.91DB887DE0@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=bd5d1f5b6ae8d9765520728e4995897940c86b05 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libheif raises the following build failure with libjpeg since bump to version 1.17.5 in commit 5714126edac88e3adc043a482b262b319a907dd3 and https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); | ^~~~~~~~~~ | | | long unsigned int* Fixes: - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...plugins-encoder_jpeg.cc-fix-libjpeg-build.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch new file mode 100644 index 0000000000..5245327fe7 --- /dev/null +++ b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch @@ -0,0 +1,47 @@ +From 33eb948240365434c845b618854403e82a229012 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 31 Jan 2024 21:04:37 +0100 +Subject: [PATCH] libheif/plugins/encoder_jpeg.cc: fix libjpeg build + +Fix the following libjpeg build failure raised since version 1.17.0 and +https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 +because third argument of jpeg_mem_dest is defined as size_t* on libjpeg +instead of unsigned long* on jpeg-turbo: + +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] + 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); + | ^~~~~~~~~~ + | | + | long unsigned int* + +Fix #1008 and #1086 + +Fixes: + - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/strukturag/libheif/pull/1120 +--- + libheif/plugins/encoder_jpeg.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libheif/plugins/encoder_jpeg.cc b/libheif/plugins/encoder_jpeg.cc +index d6c7854..21a5541 100644 +--- a/libheif/plugins/encoder_jpeg.cc ++++ b/libheif/plugins/encoder_jpeg.cc +@@ -360,7 +360,11 @@ struct heif_error jpeg_encode_image(void* encoder_raw, const struct heif_image* + } + + uint8_t* outbuffer = nullptr; ++#ifdef LIBJPEG_TURBO_VERSION + unsigned long outlength = 0; ++#else ++ size_t outlength = 0; ++#endif + + jpeg_create_compress(&cinfo); + jpeg_mem_dest(&cinfo, &outbuffer, &outlength); +-- +2.43.0 + From gsmecher at threespeedlogic.com Thu Feb 29 16:53:10 2024 From: gsmecher at threespeedlogic.com (Graeme Smecher) Date: Thu, 29 Feb 2024 08:53:10 -0800 Subject: [Buildroot] [PATCH v2] linux.mk: Allow wildcards in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH In-Reply-To: References: Message-ID: <20240229165310.1453209-1-gsmecher@threespeedlogic.com> There are a few config/ entries where wildcards are already present: $ grep -rle 'BR2_LINUX_KERNEL_CUSTOM_DTS_PATH=.*\*' configs/ configs/octavo_osd32mp1_brk_defconfig configs/octavo_osd32mp1_red_defconfig ...however, while the copy-in step of device tree compilation works correctly, these wildcards are not converted to DTC build targets in the kernel build. As a result, this configuration line alone is not enough to generate DTCs. It should be. This patch adds a $(wildcard) expansion step into generation of DTB compilation targets (the LINUX_DTB_NAME variable). As a result, wildcards behave correctly. Signed-off-by: Graeme Smecher Reviewed-by: Alexander Sverdlin --- linux/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/linux.mk b/linux/linux.mk index 1db5c6046d..80881597ad 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -195,7 +195,7 @@ LINUX_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)) # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be # copied to arch//boot/dts, but only the .dts files will # actually be generated as .dtb. -LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH))))) +LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(wildcard $(call qstrip, $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))) LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME)) -- 2.39.2 From yann.morin.1998 at free.fr Thu Feb 29 17:12:57 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 29 Feb 2024 18:12:57 +0100 Subject: [Buildroot] [PATCHv2] support/scripts/cve: fix running on older ijson versions Message-ID: <20240229171302.2565579-1-yann.morin.1998@free.fr> Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) had to change the decompressor from gz to xz, as the new location is using xz compression. That commit mentioned that it was spawning an external xz process to do the decompression, on the pretence that "there is no xz decompressor in Python stdlib." Before version 3.1, ijson.items() only accepted a file-like object as input (that file-like object could yield bytes() or str(), both were supported). Starting with version 3.1, ijson.items() also accepts that it be directly passed bytesd() or str() directly. subprocess.check_output() means we are now passing bytes() to ijson.items(), so it fails on ijson versions before 3.1, with failures such as: [...] File "/usr/lib/python3/dist-packages/ijson/backends/python.py", line 25, in Lexer if type(f.read(0)) == bytetype: AttributeError: 'bytes' object has no attribute 'read' Ubuntu 20.04, on which the pkg-stats run to generate the daily report, only has ijson 2.3. More recent distros have more recent versions of ijson, like Fedora 39 that has 3.2.3, recent enough to support being fed bytes(). Commit 22b69455526f was tested on Fedora 39, so did not catch the issue. However, the reasoning in 22b69455526f is wrong: there *is* the lzma module, at least since python 3.3 (that is, aeons ago), which is able to read xz-compressed files; it also has an API similar to the gzip module, and can provide a file-like object that exposes the decompressed data. So, do just that: provide an lzma-wrapped file-like object to ijson, so that we can eventually recover our daily reports that everything is broken! :-] Note that this construct still works on recent versions! Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) --- Changes v1 -> v2: - reword commit log to explain that bytes() and str() can be passed direclty, and that it is not about whether the file-like object returns either --- support/scripts/cve.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 1a3c307e12..7167ecbc6a 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -21,8 +21,8 @@ import datetime import os import requests # URL checking import distutils.version +import lzma import time -import subprocess import sys import operator @@ -134,8 +134,7 @@ class CVE: for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'cve_items.item') + content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise -- 2.43.2 From peter at korsgaard.com Thu Feb 29 17:48:30 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 18:48:30 +0100 Subject: [Buildroot] [PATCHv2] support/scripts/cve: fix running on older ijson versions In-Reply-To: <20240229171302.2565579-1-yann.morin.1998@free.fr> (Yann E. MORIN's message of "Thu, 29 Feb 2024 18:12:57 +0100") References: <20240229171302.2565579-1-yann.morin.1998@free.fr> Message-ID: <874jdrduvl.fsf@48ers.dk> >>>>> "Yann" == Yann E MORIN writes: > Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for > the JSON files) had to change the decompressor from gz to xz, as the new > location is using xz compression. > That commit mentioned that it was spawning an external xz process to do > the decompression, on the pretence that "there is no xz decompressor in > Python stdlib." > Before version 3.1, ijson.items() only accepted a file-like object as > input (that file-like object could yield bytes() or str(), both were > supported). Starting with version 3.1, ijson.items() also accepts that > it be directly passed bytesd() or str() directly. subprocess.check_output() s/bytesd/bytes/. Committed with that fixed, thanks! -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 17:47:16 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 18:47:16 +0100 Subject: [Buildroot] [git commit] support/scripts/cve: fix running on older ijson versions Message-ID: <20240229174906.0907B87CC6@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=5f253e3e04e57d72f470eead8591a2606f98d396 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) had to change the decompressor from gz to xz, as the new location is using xz compression. That commit mentioned that it was spawning an external xz process to do the decompression, on the pretence that "there is no xz decompressor in Python stdlib." Before version 3.1, ijson.items() only accepted a file-like object as input (that file-like object could yield bytes() or str(), both were supported). Starting with version 3.1, ijson.items() also accepts that it be directly passed bytes() or str() directly. subprocess.check_output() means we are now passing bytes() to ijson.items(), so it fails on ijson versions before 3.1, with failures such as: [...] File "/usr/lib/python3/dist-packages/ijson/backends/python.py", line 25, in Lexer if type(f.read(0)) == bytetype: AttributeError: 'bytes' object has no attribute 'read' Ubuntu 20.04, on which the pkg-stats run to generate the daily report, only has ijson 2.3. More recent distros have more recent versions of ijson, like Fedora 39 that has 3.2.3, recent enough to support being fed bytes(). Commit 22b69455526f was tested on Fedora 39, so did not catch the issue. However, the reasoning in 22b69455526f is wrong: there *is* the lzma module, at least since python 3.3 (that is, aeons ago), which is able to read xz-compressed files; it also has an API similar to the gzip module, and can provide a file-like object that exposes the decompressed data. So, do just that: provide an lzma-wrapped file-like object to ijson, so that we can eventually recover our daily reports that everything is broken! :-] Note that this construct still works on recent versions! Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- support/scripts/cve.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 1a3c307e12..7167ecbc6a 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -21,8 +21,8 @@ import datetime import os import requests # URL checking import distutils.version +import lzma import time -import subprocess import sys import operator @@ -134,8 +134,7 @@ class CVE: for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'cve_items.item') + content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise From bobrofon at gmail.com Thu Feb 29 19:21:38 2024 From: bobrofon at gmail.com (Sergey Bobrenok) Date: Thu, 29 Feb 2024 22:21:38 +0300 Subject: [Buildroot] [PATCH 1/1] package/basu: new package Message-ID: <20240229192138.21843-1-bobrofon@gmail.com> basu is the sd-bus library, extracted from systemd. Some projects rely on the sd-bus library for DBus support. However not all systems have systemd or elogind installed. This library provides just sd-bus (and the busctl utility). Signed-off-by: Sergey Bobrenok --- DEVELOPERS | 1 + package/Config.in | 1 + ...ble-stack-protection-for-Buildroot-p.patch | 39 +++++++++++++++++++ ...-F_ADD_SEALS-definition-from-missing.patch | 34 ++++++++++++++++ package/basu/Config.in | 23 +++++++++++ package/basu/basu.hash | 4 ++ package/basu/basu.mk | 28 +++++++++++++ 7 files changed, 130 insertions(+) create mode 100644 package/basu/0001-meson.build-Disable-stack-protection-for-Buildroot-p.patch create mode 100644 package/basu/0002-memfd-util.c-Use-F_ADD_SEALS-definition-from-missing.patch create mode 100644 package/basu/Config.in create mode 100644 package/basu/basu.hash create mode 100644 package/basu/basu.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0bfe91f064..a869c7b42d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2779,6 +2779,7 @@ F: package/systemd F: support/scripts/pkg-stats N: Sergey Bobrenok +F: package/basu/ F: package/sdbus-cpp/ N: Sergey Matyukevich diff --git a/package/Config.in b/package/Config.in index bf0fe078b9..5b89d895d0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2086,6 +2086,7 @@ menu "Other" source "package/armadillo/Config.in" source "package/atf/Config.in" source "package/avro-c/Config.in" + source "package/basu/Config.in" source "package/bctoolbox/Config.in" source "package/bdwgc/Config.in" source "package/belr/Config.in" diff --git a/package/basu/0001-meson.build-Disable-stack-protection-for-Buildroot-p.patch b/package/basu/0001-meson.build-Disable-stack-protection-for-Buildroot-p.patch new file mode 100644 index 0000000000..34dd3b16b9 --- /dev/null +++ b/package/basu/0001-meson.build-Disable-stack-protection-for-Buildroot-p.patch @@ -0,0 +1,39 @@ +From 6133c87299bce32c13dcf1692842ea5f2890c5ad Mon Sep 17 00:00:00 2001 +From: Sergey Bobrenok +Date: Wed, 28 Feb 2024 16:29:17 +0300 +Subject: [PATCH] meson.build: Disable stack protection for Buildroot packaging + +In Buildroot, the SSP flags are passed via the wrapper, and only flags +supported by the toolchain will be used. So the SSP flags can be +safely removed from the build files. + +Fixes: + src/basic/libbasic.a.p/log.c.o: in function `write_to_console.isra.0': + log.c:(.text.write_to_console.isra.0+0x154): undefined reference to `__stack_chk_fail_local' + +Upstream: N/A [Buildroot specific] + +Signed-off-by: Sergey Bobrenok +--- + meson.build | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 6f79707..51fd400 100644 +--- a/meson.build ++++ b/meson.build +@@ -75,9 +75,6 @@ possible_cc_flags = [ + '-fdiagnostics-show-option', + '-fno-strict-aliasing', + '-fvisibility=hidden', +- '-fstack-protector', +- '-fstack-protector-strong', +- '--param=ssp-buffer-size=4', + ] + + # --as-needed and --no-undefined are provided by meson by default, + +base-commit: 684a41d68cfbb05e38aacb60a8548e21ddfbecdb +-- +2.43.2 + diff --git a/package/basu/0002-memfd-util.c-Use-F_ADD_SEALS-definition-from-missing.patch b/package/basu/0002-memfd-util.c-Use-F_ADD_SEALS-definition-from-missing.patch new file mode 100644 index 0000000000..69e899279f --- /dev/null +++ b/package/basu/0002-memfd-util.c-Use-F_ADD_SEALS-definition-from-missing.patch @@ -0,0 +1,34 @@ +From 8e4960e8b9d11d9be96e83b02bd3b08178ddce1b Mon Sep 17 00:00:00 2001 +From: Sergey Bobrenok +Date: Wed, 28 Feb 2024 20:42:19 +0300 +Subject: [PATCH basu] memfd-util.c: Use F_ADD_SEALS definition from missing.h + +uClibc and glibc (until version 2.27, 2018) implementations don't +support F_ADD_SEALS and other F_SEAL_xxx flags. +'missing.h' was removed from 'memfd-util.c' in 37dbb2fcb ("Remove +useless includes"). + +Upstream: https://lists.sr.ht/~emersion/public-inbox/patches/49899 + +Signed-off-by: Sergey Bobrenok +--- + src/basic/memfd-util.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c +index 89893ba..7e535c6 100644 +--- a/src/basic/memfd-util.c ++++ b/src/basic/memfd-util.c +@@ -7,6 +7,7 @@ + + #include "alloc-util.h" + #include "memfd-util.h" ++#include "missing.h" + + int memfd_set_sealed(int fd) { + #if defined(__FreeBSD__) && __FreeBSD__ < 13 + +base-commit: 684a41d68cfbb05e38aacb60a8548e21ddfbecdb +-- +2.44.0 + diff --git a/package/basu/Config.in b/package/basu/Config.in new file mode 100644 index 0000000000..5875aa7775 --- /dev/null +++ b/package/basu/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_BASU + bool "basu" + depends on BR2_USE_MMU # dbus + depends on BR2_USE_WCHAR # uchar.h + depends on BR2_ENABLE_LOCALE # locale_t + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_add_and_fetch + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # F_ADD_SEALS + select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime + help + basu is the sd-bus library, extracted from systemd. + + Some projects rely on the sd-bus library for DBus support. + However not all systems have systemd or elogind installed. + This library provides just sd-bus (and the busctl utility). + + https://git.sr.ht/~emersion/basu + +comment "basu needs a toolchain w/ wchar, locale, threads, headers >= 3.17" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 diff --git a/package/basu/basu.hash b/package/basu/basu.hash new file mode 100644 index 0000000000..f369286337 --- /dev/null +++ b/package/basu/basu.hash @@ -0,0 +1,4 @@ +# From https://git.sr.ht/~emersion/basu/refs/v0.2.1 +sha256 d9b373a9fcb5d5eb5f6c1c56355f76edb7f2f52bc744570e80604e83455a19bd basu-0.2.1.tar.gz +# Locally computed: +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/basu/basu.mk b/package/basu/basu.mk new file mode 100644 index 0000000000..7bd1923646 --- /dev/null +++ b/package/basu/basu.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# basu +# +################################################################################ + +BASU_VERSION = 0.2.1 +BASU_SITE = https://git.sr.ht/~emersion/basu/refs/download/v$(BASU_VERSION) +BASU_INSTALL_STAGING = YES +BASU_LICENSE = LGPL-2.1+ +BASU_LICENSE_FILES = LICENSE.LGPL2.1 +BASU_DEPENDENCIES = host-gperf + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +BASU_DEPENDENCIES += libcap +BASU_CONF_OPTS += -Dlibcap=enabled +else +BASU_CONF_OPTS += -Dlibcap=disabled +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +BASU_DEPENDENCIES += audit +BASU_CONF_OPTS += -Daudit=enabled +else +BASU_CONF_OPTS += -Daudit=disabled +endif + +$(eval $(meson-package)) -- 2.44.0 From yann.morin.1998 at free.fr Thu Feb 29 19:22:13 2024 From: yann.morin.1998 at free.fr (Yann E. MORIN) Date: Thu, 29 Feb 2024 20:22:13 +0100 Subject: [Buildroot] [PATCH 1/2] package/rust: use host libraries from HOST_DIR In-Reply-To: References: <20240229131108.363533-1-romain.naour@smile.fr> Message-ID: Romain, All, On 2024-02-29 14:43 +0100, Romain Naour spake thusly: > Le 29/02/2024 ? 14:35, yann.morin at orange.com a ?crit?: > > On 2024-02-29 14:11 +0100, Romain Naour spake thusly: > >> host-rust package depends on several host packages to provide tools and > >> libraries but it doesn't take into account HOST_DIR while building rustc > >> compiler. Indeed, rustc needs zlib and fail to link if zlib is not > >> installed on the host. [--SNIP--] > > But then, we would also need to add host-zlib to > > HOST_RUST_DEPENDENCIES, no? > Indeed but in practice host-zlib is already an "indirect" dependency of > host-rust due to host-openssl (host-libopenssl) dependency. When a package has a dependency on a library for itself, we must add an explicit dependency in that package, even if it is transitively brought by another, like is the case here. So we do want that host-rust depends on host-zlib explicitly. > HOST_LIBOPENSSL_DEPENDENCIES = host-zlib > > I noticed the missing dependency but forgot to add it in HOST_RUST_DEPENDENCIES. Mark this patch as Changes-requested, then! ;-) Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' From giulio.benetti at benettiengineering.com Thu Feb 29 21:31:15 2024 From: giulio.benetti at benettiengineering.com (Giulio Benetti) Date: Thu, 29 Feb 2024 22:31:15 +0100 Subject: [Buildroot] [PATCH] package/nfs-utils: only install fsidd binary and unit file with enabled nfsd In-Reply-To: <20240228181409.3756293-1-sairon@sairon.cz> References: <20240228181409.3756293-1-sairon@sairon.cz> Message-ID: <5d375ded-707c-4d56-a5af-f7f769083014@benettiengineering.com> Hi Jan, thank you for the contribution, On 28/02/24 19:14, Jan ?erm?k wrote: > Unit file for the FSID daemon depends on the nfs-server.service, which is > removed without BR2_PACKAGE_NFS_UTILS_RPC_NFSD enabled. Also don't install > the fsidd service binary without nfsd enabled. regarding the commit log(I'm not that good at it but I give a try) what about: ``` FSID daemon and its systemd unit file both depend on BR2_PACKAGE_NFS_UTILS_RPC_NFSD at the moment they are installed in any case. So let's remove them both when BR2_PACKAGE_NFS_UTILS_RPC_NFSD is disabled. ``` > > Signed-off-by: Jan ?erm?k For the rest it looks good to me, I've build tested it and it works as expected so: Reviewed-by: Giulio Benetti Can you please send a V2 with improved commit log? Thank you Best regards -- Giulio Benetti CEO&CTO at Benetti Engineering sas > --- > package/nfs-utils/nfs-utils.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk > index 4f2b41c782..b757e3e51d 100644 > --- a/package/nfs-utils/nfs-utils.mk > +++ b/package/nfs-utils/nfs-utils.mk > @@ -42,7 +42,8 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug > NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd > NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad > NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_NFSD) += usr/sbin/exportfs \ > - usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service > + usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/lib/systemd/system/nfs-server.service \ > + usr/sbin/fsidd usr/lib/systemd/system/fsidd.service > > ifeq ($(BR2_PACKAGE_NFS_UTILS_NFSV4),y) > NFS_UTILS_CONF_OPTS += --enable-nfsv4 --enable-nfsv41 From peter at korsgaard.com Thu Feb 29 21:56:05 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:56:05 +0100 Subject: [Buildroot] [PATCH 1/1] package/sdl2: force arm mode instead of Thumb mode In-Reply-To: <20240131203739.2092971-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Wed, 31 Jan 2024 21:37:39 +0100") References: <20240131203739.2092971-1-fontaine.fabrice@gmail.com> Message-ID: <87zfvjc4ui.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix the following build failure in Thumb mode: > /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers > 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers > | ^~~~~ > Fixes: > - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e > - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From fontaine.fabrice at gmail.com Thu Feb 29 21:56:41 2024 From: fontaine.fabrice at gmail.com (Fabrice Fontaine) Date: Thu, 29 Feb 2024 22:56:41 +0100 Subject: [Buildroot] [PATCH 1/1] boot/shim: force arm mode instead of Thumb mode Message-ID: <20240229215641.330203-1-fontaine.fabrice@gmail.com> Use OPTIMIZATIONS parameter to pass -marm to fix the following build failure in Thumb mode: /tmp/ccEjPM4h.s:941: Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode CFLAGS can't be overridden as it is defined as: CFLAGS = $(FEATUREFLAGS) \ $(OPTIMIZATIONS) \ $(WARNFLAGS) \ $(if $(findstring clang,$(CC)),$(CLANG_WARNINGS)) \ $(ARCH_CFLAGS) \ $(WERRFLAGS) \ $(INCLUDES) \ $(DEFINES) Fixes: - http://autobuild.buildroot.org/results/580156f89cfd72122fef07aa2fe37b4fdd4c316b - http://autobuild.buildroot.org/results/8980c0f422516c7263d8d0c9cc6123f30c4b7ee4 Signed-off-by: Fabrice Fontaine --- boot/shim/shim.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index 19b11f4086..ae57677320 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -13,10 +13,19 @@ SHIM_CPE_ID_VENDOR = redhat SHIM_INSTALL_TARGET = NO SHIM_INSTALL_IMAGES = YES +SHIM_CFLAGS = $(TARGET_CFLAGS) SHIM_MAKE_OPTS = \ ARCH="$(GNU_EFI_PLATFORM)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - DASHJ="-j$(PARALLEL_JOBS)" + DASHJ="-j$(PARALLEL_JOBS)" \ + OPTIMIZATIONS="$(SHIM_CFLAGS)" + +# shim has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SHIM_CFLAGS += -marm +endif define SHIM_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(SHIM_MAKE_OPTS) -- 2.43.0 From peter at korsgaard.com Thu Feb 29 21:57:28 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:57:28 +0100 Subject: [Buildroot] [PATCH 1/1] package/netatalk: security bump to version 3.1.18 In-Reply-To: <20240206203031.851666-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 21:30:31 +0100") References: <20240206203031.851666-1-fontaine.fabrice@gmail.com> Message-ID: <87v867c4s7.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP > in their default configuration allows the arbitrary writing of files. By > exploiting these combination of primitives, an attacker can execute > arbitrary code. > https://netatalk.io/CVE-2022-22995 > https://netatalk.io/3.1/ReleaseNotes3.1.18 > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 21:57:10 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:57:10 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/netatalk: security bump to version 3.1.18 Message-ID: <20240229215745.058DA87DCD@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=771af4d22973e4dc6d33c6ee75718ab10e94f0d5 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP in their default configuration allows the arbitrary writing of files. By exploiting these combination of primitives, an attacker can execute arbitrary code. https://netatalk.io/CVE-2022-22995 https://netatalk.io/3.1/ReleaseNotes3.1.18 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 1e472e0872a71395cf8a3541b5883081e929bc11) Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.hash | 8 ++++---- package/netatalk/netatalk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index a35e6bc36c..9ab5d604a8 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.17/ -md5 a6429a28948f85b69c9012fb437dd9c2 netatalk-3.1.17.tar.xz -sha1 bc6578d9fa874b3816fd4ddd60a30a8f3aadc71d netatalk-3.1.17.tar.xz +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ +md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz +sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz # Locally computed -sha256 8c208e2c94bf3047db33cdbc3ce4325d2b80db61d6cc527f18f9dbd8e95b5cff netatalk-3.1.17.tar.xz +sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 40e64dabeb..53cd53876a 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.17 +NETATALK_VERSION = 3.1.18 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config From peter at korsgaard.com Thu Feb 29 21:54:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:54:12 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/sdl2: force arm mode instead of Thumb mode Message-ID: <20240229215744.E93ED87DF3@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=ff6150db0a3c7aa342c9a308942745632657798a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Fix the following build failure in Thumb mode: /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ecedc4ae8c0632cdd9ba0bf63a64a51e67a1525b) Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 5f2e1e0ed1..4e7494b3d2 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -54,6 +54,10 @@ SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SDL2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) SDL2_DEPENDENCIES += udev SDL2_CONF_OPTS += --enable-libudev @@ -76,7 +80,7 @@ endif ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config +SDL2_CONF_ENV += ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config else SDL2_CONF_OPTS += --disable-video-directfb endif From peter at korsgaard.com Thu Feb 29 21:53:50 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:53:50 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/sdl2: force arm mode instead of Thumb mode Message-ID: <20240229215915.256EF87B4A@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=9d8292c2291e6ba2741ccc3a166b572a8db64a0c branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix the following build failure in Thumb mode: /home/autobuild/autobuild/instance-12/output-1/build/sdl2-2.28.5/src/atomic/SDL_atomic.c:292:2: error: #error This file should be built in arm mode so the mcr instruction is available for memory barriers 292 | #error This file should be built in arm mode so the mcr instruction is available for memory barriers | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/70587e7c2452563d655d054a7623bb2fd969862e - http://autobuild.buildroot.org/results/2cb11b1f3c013c1f49e2b5383a11ba3f1db6a24c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit ecedc4ae8c0632cdd9ba0bf63a64a51e67a1525b) Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 4646e7d1f8..42b4a433e8 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -54,6 +54,10 @@ SDL2_POST_INSTALL_STAGING_HOOKS += SDL2_FIX_SDL2_CONFIG_CMAKE # We must enable static build to get compilation successful. SDL2_CONF_OPTS += --enable-static +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SDL2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) SDL2_DEPENDENCIES += udev SDL2_CONF_OPTS += --enable-libudev @@ -76,7 +80,7 @@ endif ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) SDL2_DEPENDENCIES += directfb SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config +SDL2_CONF_ENV += ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config else SDL2_CONF_OPTS += --disable-video-directfb endif From peter at korsgaard.com Thu Feb 29 21:56:53 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:56:53 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/netatalk: security bump to version 3.1.18 Message-ID: <20240229215915.2F90387DAB@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=0ab4ea64fed369877c65532714e717eedf197a2a branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Fix CVE-2022-22995: The combination of primitives offered by SMB and AFP in their default configuration allows the arbitrary writing of files. By exploiting these combination of primitives, an attacker can execute arbitrary code. https://netatalk.io/CVE-2022-22995 https://netatalk.io/3.1/ReleaseNotes3.1.18 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 1e472e0872a71395cf8a3541b5883081e929bc11) Signed-off-by: Peter Korsgaard --- package/netatalk/netatalk.hash | 8 ++++---- package/netatalk/netatalk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index a35e6bc36c..9ab5d604a8 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.17/ -md5 a6429a28948f85b69c9012fb437dd9c2 netatalk-3.1.17.tar.xz -sha1 bc6578d9fa874b3816fd4ddd60a30a8f3aadc71d netatalk-3.1.17.tar.xz +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.18/ +md5 b1caff4e1da534d8ca57d688c7fa3ce1 netatalk-3.1.18.tar.xz +sha1 cbd92c95d04cfd4a9f49977970501a623310c2d9 netatalk-3.1.18.tar.xz # Locally computed -sha256 8c208e2c94bf3047db33cdbc3ce4325d2b80db61d6cc527f18f9dbd8e95b5cff netatalk-3.1.17.tar.xz +sha256 3941effcc2c4e0dceecabc763fbb8478a2f2fbe0af4a6314983cfea452df8d47 netatalk-3.1.18.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 40e64dabeb..53cd53876a 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.17 +NETATALK_VERSION = 3.1.18 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config From peter at korsgaard.com Thu Feb 29 22:00:48 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 23:00:48 +0100 Subject: [Buildroot] [PATCH 1/1] package/python-esptool: add CPE variables In-Reply-To: <20240206210641.878279-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 22:06:41 +0100") References: <20240206210641.878279-1-fontaine.fabrice@gmail.com> Message-ID: <87r0gvc4mn.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: > https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 22:01:00 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 23:01:00 +0100 Subject: [Buildroot] [PATCH 1/1] package/expat: security bump to version 2.6.0 In-Reply-To: <20240206204209.864622-1-fontaine.fabrice@gmail.com> (Fabrice Fontaine's message of "Tue, 6 Feb 2024 21:42:08 +0100") References: <20240206204209.864622-1-fontaine.fabrice@gmail.com> Message-ID: <87msrjc4mb.fsf@48ers.dk> >>>>> "Fabrice" == Fabrice Fontaine writes: > Security fixes: > - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can > cause denial of service, in partial where dealing with compressed XML > input. Applications that parsed a document in one go -- a single call > to functions XML_Parse or XML_ParseBuffer -- were not affected. The > smaller the chunks/buffers you use for parsing previously, the bigger > the problem prior to the fix. > - CVE-2023-52426: Fix billion laughs attacks for users compiling > *without* XML_DTD defined (which is not common). Users with XML_DTD > defined have been protected since Expat >=2.4.0 (and that was > CVE-2013-0340 back then). > https://blog.hartwork.org/posts/expat-2-6-0-released/ > Signed-off-by: Fabrice Fontaine Committed to 2023.02.x and 2023.11.x, thanks. -- Bye, Peter Korsgaard From peter at korsgaard.com Thu Feb 29 22:00:01 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 23:00:01 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/python-esptool: add CPE variables Message-ID: <20240229220114.CA51287E1C@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=82969b61891b66ee272940000592682127748eaf branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 81fab735aee5d052e02a1304fb537b001c7d69c4) Signed-off-by: Peter Korsgaard --- package/python-esptool/python-esptool.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index c0709c64b1..cefed065a4 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -10,5 +10,7 @@ PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/a3/63/c757f50b6069 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE +PYTHON_ESPTOOL_CPE_ID_VENDOR = espressif +PYTHON_ESPTOOL_CPE_ID_PRODUCT = esptool $(eval $(python-package)) From peter at korsgaard.com Thu Feb 29 21:59:12 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:59:12 +0100 Subject: [Buildroot] [git commit branch/2023.11.x] package/expat: security bump to version 2.6.0 Message-ID: <20240229220114.B6F2A87E1B@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=aef9df6cacbf0e2e266d73ed49ae0c51dc569c64 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.11.x Security fixes: - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can cause denial of service, in partial where dealing with compressed XML input. Applications that parsed a document in one go -- a single call to functions XML_Parse or XML_ParseBuffer -- were not affected. The smaller the chunks/buffers you use for parsing previously, the bigger the problem prior to the fix. - CVE-2023-52426: Fix billion laughs attacks for users compiling *without* XML_DTD defined (which is not common). Users with XML_DTD defined have been protected since Expat >=2.4.0 (and that was CVE-2013-0340 back then). https://blog.hartwork.org/posts/expat-2-6-0-released/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 9dad5e7d7f7bc03e648621b9be6974e7ae39a467) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index c6c25aa3e0..043501378b 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.5.0/ -md5 ac6677b6d1b95d209ab697ce8b688704 expat-2.5.0.tar.xz -sha1 5178e13c1e34f4643d5118d5758babfe0e836fe2 expat-2.5.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.0/ +md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz +sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz # Locally calculated -sha256 ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 6f22024cc0..5f4016e0d1 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.5.0 +EXPAT_VERSION = 2.6.0 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 29 21:59:32 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:59:32 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/expat: security bump to version 2.6.0 Message-ID: <20240229220220.9DC7987E23@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=631ed7b7be884e218bc175e00bf096e4fb411c4d branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x Security fixes: - CVE-2023-52425: Fix quadratic runtime issues with big tokens that can cause denial of service, in partial where dealing with compressed XML input. Applications that parsed a document in one go -- a single call to functions XML_Parse or XML_ParseBuffer -- were not affected. The smaller the chunks/buffers you use for parsing previously, the bigger the problem prior to the fix. - CVE-2023-52426: Fix billion laughs attacks for users compiling *without* XML_DTD defined (which is not common). Users with XML_DTD defined have been protected since Expat >=2.4.0 (and that was CVE-2013-0340 back then). https://blog.hartwork.org/posts/expat-2-6-0-released/ Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 9dad5e7d7f7bc03e648621b9be6974e7ae39a467) Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index c6c25aa3e0..043501378b 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.5.0/ -md5 ac6677b6d1b95d209ab697ce8b688704 expat-2.5.0.tar.xz -sha1 5178e13c1e34f4643d5118d5758babfe0e836fe2 expat-2.5.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.0/ +md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz +sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz # Locally calculated -sha256 ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 6f22024cc0..5f4016e0d1 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.5.0 +EXPAT_VERSION = 2.6.0 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From peter at korsgaard.com Thu Feb 29 21:59:54 2024 From: peter at korsgaard.com (Peter Korsgaard) Date: Thu, 29 Feb 2024 22:59:54 +0100 Subject: [Buildroot] [git commit branch/2023.02.x] package/python-esptool: add CPE variables Message-ID: <20240229220220.A94EC87E24@busybox.osuosl.org> commit: https://git.buildroot.net/buildroot/commit/?id=cb7360f760a0f7d5ecfb85fe51c54c0233822c16 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2023.02.x cpe:2.3:a:espressif:esptool is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/AC284820-5731-4100-91BC-F50FE078848E Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 81fab735aee5d052e02a1304fb537b001c7d69c4) Signed-off-by: Peter Korsgaard --- package/python-esptool/python-esptool.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index 0a71e1a78b..a8b3cbc1d6 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -10,5 +10,7 @@ PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/8b/4c/82d7fe5fa064 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE +PYTHON_ESPTOOL_CPE_ID_VENDOR = espressif +PYTHON_ESPTOOL_CPE_ID_PRODUCT = esptool $(eval $(python-package)) From romain.naour at smile.fr Thu Feb 29 22:41:20 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 23:41:20 +0100 Subject: [Buildroot] [PATCH v2 1/3] package/rust/rust.mk: add missing host-zlib dependency Message-ID: <20240229224122.1085300-1-romain.naour@smile.fr> Several rust tool are linking against zlib, so add the depedency explicitely in HOST_RUST_DEPENDENCIES. For now, host-rust build system is not able to find provided by Buildroot in HOST_DIR due to at least two issues that will be fixed in followup commits. Signed-off-by: Romain Naour --- v2: new commit --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index f7a5c0fcd5..16a397407f 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -20,6 +20,7 @@ HOST_RUST_DEPENDENCIES = \ host-python3 \ host-rust-bin \ host-openssl \ + host-zlib \ $(BR2_CMAKE_HOST_DEPENDENCY) HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) -- 2.43.2 From romain.naour at smile.fr Thu Feb 29 22:41:21 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 23:41:21 +0100 Subject: [Buildroot] [PATCH v2 2/3] package/rust: use host libraries from HOST_DIR In-Reply-To: <20240229224122.1085300-1-romain.naour@smile.fr> References: <20240229224122.1085300-1-romain.naour@smile.fr> Message-ID: <20240229224122.1085300-2-romain.naour@smile.fr> host-rust package depends on several host packages to provide tools and libraries but it doesn't take into account HOST_DIR while building rustc compiler. Indeed, rustc needs zlib and fail to link if zlib is not installed on the host. error: could not compile `rustc_driver` (lib) due to previous error If zlib is installed on the host, we can notice it with ldd tool (while it should be linked with the one provided by Buildroot host-zlib). ldd [...]TestRust/host/bin/rustc libz.so.1 => /lib64/libz.so.1 Provide HOST_LDFLAGS using llvm.ldflags in config.toml. (HOST_LDFLAGS provide -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib) With that fixed, rustc_driver link with libz from HOST_DIR but the host-rust build still fail later due to another issue. error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545 http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0 Signed-off-by: Romain Naour --- v2: no change --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 16a397407f..4903060368 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -65,6 +65,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ echo 'ninja = false'; \ + echo 'ldflags = "$(HOST_LDFLAGS)"'; \ ) > $(@D)/config.toml endef -- 2.43.2 From romain.naour at smile.fr Thu Feb 29 22:41:22 2024 From: romain.naour at smile.fr (Romain Naour) Date: Thu, 29 Feb 2024 23:41:22 +0100 Subject: [Buildroot] [PATCH v2 3/3] package/rust: provide RUSTFLAGS for cargo In-Reply-To: <20240229224122.1085300-1-romain.naour@smile.fr> References: <20240229224122.1085300-1-romain.naour@smile.fr> Message-ID: <20240229224122.1085300-3-romain.naour@smile.fr> While building the rust toolchain, the build system endup using cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo) to build some tool like rustdoc-tool. But the host-rust package doesn't use the cargo infractructure (since it provide cargo binary) and some cargo environment varialble [1] is not set to crosscompile cargo packages in the rust toolchain. For exemple, we usually set RUSTFLAGS="-C link-arg=-Wl,-rpath,$(HOST_DIR)/lib" to force cargo using libraries provided by Buildroot in $(HOST_DIR)/lib. RUSTFLAGS is actually needed to find zlib library (host-zlib) to link rustdoc-tool when zlib is not installed on the host. Fixes: error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.02-rc1/package/pkg-cargo.mk?ref_type=tags#L167 Signed-off-by: Romain Naour --- v2: no change --- package/rust/rust.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 4903060368..394fbfa4ca 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -70,7 +70,9 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build + cd $(@D); $(HOST_MAKE_ENV) \ + RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \ + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef HOST_RUST_INSTALL_OPTS = \ -- 2.43.2